From 26a40e30e3a452a8f11590bea4417754841f3655 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting.fr>
Date: Wed, 23 Dec 2020 14:46:07 +0100
Subject: [PATCH 001/928] multicurrency update online and change some behaviors

---
 htdocs/multicurrency/multicurrency_rate.php | 185 +++++++++-----------
 1 file changed, 82 insertions(+), 103 deletions(-)

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index eae788b0587..376269c0806 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -46,7 +46,8 @@ $confirm			= GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $id_rate_selected = GETPOST('id_rate', 'int');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_date_sync = GETPOST('search_date_sync', 'alpha');
+$search_date_sync = dol_mktime(0, 0, 0, GETPOST('search_date_syncmonth', 'int'), GETPOST('search_date_syncday', 'int'), GETPOST('search_date_syncyear', 'int'));
+$search_date_sync_end	= dol_mktime(0, 0, 0, GETPOST('search_date_sync_endmonth', 'int'), GETPOST('search_date_sync_endday', 'int'), GETPOST('search_date_sync_endyear', 'int'));
 $search_rate		= GETPOST('search_rate', 'alpha');
 $search_code		= GETPOST('search_code', 'alpha');
 $multicurrency_code = GETPOST('multicurrency_code', 'alpha');
@@ -58,12 +59,13 @@ $sortfield 			= GETPOST("sortfield", 'alpha');
 $sortorder 			= GETPOST("sortorder", 'alpha');
 $page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 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;
 if (!$sortfield) $sortfield = "cr.date_sync";
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortorder) $sortorder = "ASC";
 
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
@@ -200,6 +202,7 @@ if (empty($reshook))
 	{
 		$sall = "";
 		$search_date_sync = "";
+        $search_date_sync_end="";
 		$search_rate = "";
 		$search_code = "";
 		$search_array_options = array();
@@ -233,7 +236,7 @@ print dol_get_fiche_head($head, 'ratelist', $langs->trans("ModuleSetup"), -1, "m
 
 // ACTION
 
-if ($action != "updateRate") {
+if (!in_array( $action, array("updateRate", "deleteRate"))) {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("FormCreateRate").'</td>'."\n";
@@ -243,15 +246,15 @@ if ($action != "updateRate") {
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	print '<table><tr>';
+	print '<table class="noborder centpercent"><tr>';
 
 	print ' <td>'.$langs->trans('Date').'</td>';
 	print ' <td>';
-	print $form->selectDate($dateinput, 'dateinput');
+	print $form->selectDate($dateinput, 'dateinput', 0, 0, 1);
 	print '</td>';
 
 	print '<td> '.$langs->trans('Currency').'</td>';
-	print '<td>'.$form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ? GETPOST('multicurrency_code', 'alpha') : $multicurrency_code), 'multicurrency_code', 0, " code != '".$conf->currency."'", true).'</td>';
+	print '<td>'.$form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ? GETPOST('multicurrency_code', 'alpha') : $multicurrency_code), 'multicurrency_code', 1, " code != '".$conf->currency."'", true).'</td>';
 
 	print ' <td>'.$langs->trans('Rate').'</td>';
 	print ' <td><input type="number" min="0" step="any" class="maxwidth75" name="rateinput" value="'.dol_escape_htmltag($rateinput).'"></td>';
@@ -267,54 +270,7 @@ if ($action != "updateRate") {
 	print '<br>';
 }
 
-if ($action == "updateRate") {
-	$current_rate = new CurrencyRate($db);
-	$current_rate->fetch(intval($id_rate_selected));
 
-	if ($current_rate) {
-		$curr = new MultiCurrency($db);
-		$resultcurrentCurrency = $curr->fetch($current_rate->fk_multicurrency);
-
-		if ($resultcurrentCurrency) {
-			$currency_code = $curr->code;
-		} else {
-			$currency_code = '';
-		}
-
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("FormUpdateRate").'</td>'."\n";
-		print '</tr></table>';
-
-		$form = new Form($db);
-		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formtoupdaterate">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-
-		print '<table><tr>';
-		print ' <td>'.$langs->trans('Date').'</td>';
-		print '<td>';
-		print $form->selectDate($current_rate->date_sync, 'dateinput');
-		print '</td>';
-
-		print '<td> '.$langs->trans('Currency').'</td>';
-		print '<td>'.$form->selectMultiCurrency($currency_code, 'multicurrency_code', 0, " code != '".$conf->currency."'", true).'</td>';
-
-		print '<td>'.$langs->trans('Rate').'</td>';
-		print '<td><input class="minwidth200" name="rateinput" value="'.dol_escape_htmltag($current_rate->rate).'" type="text"></td>';
-
-		print '<td>';
-		print '<input type="hidden" name="action" value="update">';
-		print '<input type="hidden" name="id_rate" value="'.$current_rate->id.'">';
-		print '<input type="submit" class="butAction" name="btnupdateCurrencyRate" value="'.$langs->trans('UpdateRate').'">';
-		print '<a href="'.$_SERVER["PHP_SELF"].'" class="butAction">'.$langs->trans('CancelUpdate').'</a>';
-
-		print '</td>';
-		print '</tr></table>';
-		print '</form>';
-	} else {
-		dol_syslog("currency_rate:list:update", LOG_WARNING);
-	}
-}
 
 
 $sql = 'SELECT cr.rowid, cr.date_sync, cr.rate, cr.entity, m.code, m.name ';
@@ -325,7 +281,11 @@ $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."multicurrency AS m ON cr.fk_multicurrency = m.rowid";
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($search_date_sync) $sql .= natural_search('cr.date_sync', $search_date_sync);
+if ($search_date_sync && $search_date_sync_end ){
+    $sql .= " AND (cr.date_sync BETWEEN '".$db->idate($search_date_sync)."' AND '".$db->idate($search_date_sync_end)."')";
+} elseif ($search_date_sync && !$search_date_sync_end) {
+    $sql .= natural_search('cr.date_sync', $db->idate($search_date_sync));
+}
 if ($search_rate) $sql .= natural_search('cr.rate', $search_rate);
 if ($search_code) $sql .= natural_search('m.code', $search_code);
 $sql .= " WHERE m.code <> '".$db->escape($conf->currency)."'";
@@ -374,9 +334,10 @@ if ($resql)
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($sall) $param .= "&sall=".urlencode($sall);
 
-	if ($search_date_sync) $param = "&search_date_sync=".urlencode($search_date_sync);
+	if ($search_date_sync) $param = "&search_date_sync=".$search_date_sync;
+    if ($search_date_sync_end) $param="&search_date_sync_end=".$search_date_sync_end;
 	if ($search_rate) $param = "&search_rate=".urlencode($search_rate);
-	if ($search_code != '') $param .= "&search_code=".urlencode($search_code);
+    if ($search_code != '') $param.="&search_code=".urlencode($search_code);
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -426,7 +387,7 @@ if ($resql)
 	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<table class="tagtable centpercent liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Lines with input filters
 	print '<tr class="liste_titre_filter">';
@@ -435,14 +396,15 @@ if ($resql)
 	if (!empty($arrayfields['cr.date_sync']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" name="search_date_sync" size="8" value="'.dol_escape_htmltag($search_date_sync).'">';
+		print $form->selectDate($search_date_sync, 'search_date_sync', 0, 0, 1);
+        print $form->selectDate($search_date_sync_end, 'search_date_sync_end', 0, 0, 1);
 		print '</td>';
 	}
 	// code
 	if (!empty($arrayfields['m.code']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" name="search_code" size="12" value="'.dol_escape_htmltag($search_code).'">';
+        print  $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
 		print '</td>';
 	}
 	// rate
@@ -486,52 +448,69 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 
-		// date_sync
-		if (!empty($arrayfields['cr.date_sync']['checked']))
-		{
-			print '<td class="tdoverflowmax200">';
-			print $obj->date_sync;
-			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+        // USER REQUEST UPDATE FOR THIS LINE
+        if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
+            //  var_dump($obj);
+            print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
+            print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
+            print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
+
+            print '<td class="center nowrap ">';
+            print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
+            print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
+            print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
+            print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
+            print '</td>';
+        }
+        else {
+            // date_sync
+            if (!empty($arrayfields['cr.date_sync']['checked']))
+            {
+                print '<td class="tdoverflowmax200">';
+                print $obj->date_sync;
+                print "</td>\n";
+                if (!$i) $totalarray['nbfield']++;
+            }
+
+            // code
+            if (! empty($arrayfields['m.code']['checked']))
+            {
+                print '<td class="tdoverflowmax200">';
+                print $obj->code." ".$obj->name;
+                print "</td>\n";
+
+                if (! $i) $totalarray['nbfield']++;
+            }
+
+            // rate
+            if (! empty($arrayfields['cr.rate']['checked']))
+            {
+                print '<td class="tdoverflowmax200">';
+                print $obj->rate;
+                print "</td>\n";
+                if (! $i) $totalarray['nbfield']++;
+            }
+
+
+            // Fields from hook
+            $parameters = ['arrayfields' => $arrayfields, 'obj' => $obj];
+            $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
+
+            // Action
+            print '<td class="nowrap " >';
+            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 '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
+                print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
+                print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+            }
+            print '</td>';
+            if (!$i) $totalarray['nbfield']++;
 		}
 
-		// code
-		if (!empty($arrayfields['m.code']['checked']))
-		{
-			print '<td class="tdoverflowmax200">';
-			print $obj->code." ".$obj->name;
-			print "</td>\n";
-
-			if (!$i) $totalarray['nbfield']++;
-		}
-
-		// rate
-		if (!empty($arrayfields['cr.rate']['checked']))
-		{
-			print '<td class="tdoverflowmax200">';
-			print $obj->rate;
-			print "</td>\n";
-			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;
-
-		// Action
-		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 '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
-			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
-
 		print "</tr>\n";
 		$i++;
 	}

From a37bb4c6f23c506b176d2c977a8e5a947294b582 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 23 Dec 2020 13:51:13 +0000
Subject: [PATCH 002/928] Fixing style errors.

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 376269c0806..b8aaf0064c8 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -236,7 +236,7 @@ print dol_get_fiche_head($head, 'ratelist', $langs->trans("ModuleSetup"), -1, "m
 
 // ACTION
 
-if (!in_array( $action, array("updateRate", "deleteRate"))) {
+if (!in_array($action, array("updateRate", "deleteRate"))) {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("FormCreateRate").'</td>'."\n";

From 367a038a1555b464ca5527be645f5947e9d59b20 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting.fr>
Date: Thu, 24 Dec 2020 09:55:09 +0100
Subject: [PATCH 003/928] hotfix : idate on create currency

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 376269c0806..a7bf7f2c7f7 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -109,7 +109,7 @@ if ($action == "create") {
 
 		$currencyRate_static->fk_multicurrency = $fk_currency;
 		$currencyRate_static->entity = $conf->entity;
-		$currencyRate_static->date_sync = $dateinput;
+		$currencyRate_static->date_sync = $db->idate($dateinput);
 		$currencyRate_static->rate = $rateinput;
 
 		$result = $currencyRate_static->create(intval($fk_currency));

From 20720ae0dd50ad9036f1b1f6103130fe1de77f4f Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting.fr>
Date: Mon, 11 Jan 2021 14:06:21 +0100
Subject: [PATCH 004/928] remove idate

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 69d471c62dd..b8aaf0064c8 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -109,7 +109,7 @@ if ($action == "create") {
 
 		$currencyRate_static->fk_multicurrency = $fk_currency;
 		$currencyRate_static->entity = $conf->entity;
-		$currencyRate_static->date_sync = $db->idate($dateinput);
+		$currencyRate_static->date_sync = $dateinput;
 		$currencyRate_static->rate = $rateinput;
 
 		$result = $currencyRate_static->create(intval($fk_currency));

From 6b451bd870a55c33a40b5b55b5116d35d55018aa Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting.fr>
Date: Mon, 1 Feb 2021 09:31:30 +0100
Subject: [PATCH 005/928] use form->selectdate

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index b8aaf0064c8..21d64734f8b 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -396,8 +396,8 @@ if ($resql)
 	if (!empty($arrayfields['cr.date_sync']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
-		print $form->selectDate($search_date_sync, 'search_date_sync', 0, 0, 1);
-        print $form->selectDate($search_date_sync_end, 'search_date_sync_end', 0, 0, 1);
+		print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d" ), 'search_date_sync', 0, 0, 1);
+        print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
 		print '</td>';
 	}
 	// code
@@ -503,7 +503,7 @@ if ($resql)
             {
                 $selected = 0;
                 if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-                print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
+                print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'&amp;page='.$page.'&amp;sortorder='.$sortorder.'&amp;sortfield='.$sortfield.'&amp;search_code='.$search_code.'&amp;search_rate='.$search_rate.'&amp;search_date_sync='.dol_print_date($search_date_sync, "%Y-%m-%d") .'&amp;search_date_sync_end='.dol_print_date($search_date_sync_end, "%Y-%m-%d") .'&amp;edit_mode='. '1'.  '">'.img_picto('edit', 'edit').'</a>';
                 print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
                 print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
             }

From 7966c6ed6d7d9291e2f6c01fbaa03ddb74a83ab8 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 1 Feb 2021 08:34:12 +0000
Subject: [PATCH 006/928] Fixing style errors.

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 21d64734f8b..09749ae612e 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -396,7 +396,7 @@ if ($resql)
 	if (!empty($arrayfields['cr.date_sync']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
-		print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d" ), 'search_date_sync', 0, 0, 1);
+		print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d"), 'search_date_sync', 0, 0, 1);
         print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
 		print '</td>';
 	}

From 6c8293612d807d6eae8b9fd8daa45f7d962d96c1 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 26 Mar 2021 16:41:48 +0100
Subject: [PATCH 007/928] 13.0

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 371c8be2f5e..18ae79180a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,10 @@ htdocs/includes/squizlabs/
 htdocs/includes/webmozart/
 htdocs/.well-known/apple-developer-merchantid-domain-association
 
+
+cyberoffice/
+mycyberoffice/
+
 # Node Modules
 build/yarn-error.log
 build/node_modules/

From 7c0d3d4d142b9aedcf7e177a08041622257ee6fb Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 8 Apr 2021 18:03:46 +0200
Subject: [PATCH 008/928] create custom masks in product cards

---
 htdocs/product/card.php                | 23 +++++++++++++++++++++--
 htdocs/product/class/product.class.php | 13 ++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 094ce8670a9..26ee8c5c186 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -307,6 +307,8 @@ if (empty($reshook)) {
 			$object->status             	 = GETPOST('statut');
 			$object->status_buy            = GETPOST('statut_buy');
 			$object->status_batch = GETPOST('status_batch');
+			$object->batch_mask = GETPOST('batch_mask', 'alpha');
+
 
 			$object->barcode_type          = GETPOST('fk_barcode_type');
 			$object->barcode = GETPOST('barcode');
@@ -475,6 +477,7 @@ if (empty($reshook)) {
 				$object->status                 = GETPOST('statut', 'int');
 				$object->status_buy             = GETPOST('statut_buy', 'int');
 				$object->status_batch = GETPOST('status_batch', 'aZ09');
+				$object->batch_mask = GETPOST('batch_mask', 'alpha');
 				$object->fk_default_warehouse   = GETPOST('fk_default_warehouse');
 				// removed from update view so GETPOST always empty
 				/*
@@ -1545,10 +1548,26 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Batch number managment
 			if ($conf->productbatch->enabled) {
 				if ($object->isProduct() || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-					print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';
+					print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
 					$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"), '2' => $langs->trans("ProductStatusOnSerial"));
 					print $form->selectarray('status_batch', $statutarray, $object->status_batch);
-					print '</td></tr>';
+					print '</td>';
+					if ($object->status_batch !== '0' 
+					&& (($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') 
+					|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
+						$inherited_mask = $object->status_batch == '1' ? $conf->global->LOT_ADVANCED_MASK : $conf->global->SN_ADVANCED_MASK;
+						print '<td>'.$langs->trans("ManageLotMask").'</td>';
+						$mask = !is_empty($object->batch_mask) ? $object->batch_mask : $inherited_mask;
+						$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
+						$tooltip .= $langs->trans("GenericMaskCodes2");
+						$tooltip .= $langs->trans("GenericMaskCodes3");
+						$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
+						$tooltip .= $langs->trans("GenericMaskCodes5");
+						print '<td>';
+						print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask" value="'.$mask.'">', $tooltip, 1, 1);
+						print '</td>';
+					}
+					print '</tr>';
 				}
 			}
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 16bbc508ac9..bcfaee9c0dc 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -264,6 +264,13 @@ class Product extends CommonObject
 	 */
 	public $status_batch = 0;
 
+	/**
+	 * If allowed, we can edit batch or serial number mask for each product
+	 *
+	 * @var string
+	 */
+	public $batch_mask = '';
+
 	/**
 	 * Customs code
 	 *
@@ -698,6 +705,7 @@ class Product extends CommonObject
 					$sql .= ", '".$this->db->escape($this->canvas)."'";
 					$sql .= ", ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? 'null' : (int) $this->finished);
 					$sql .= ", ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : $this->status_batch);
+					$sql .= ", '".$this->db->escape($this->batch_mask)."'";
 					$sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 					$sql .= ")";
 
@@ -1059,6 +1067,8 @@ class Product extends CommonObject
 			$sql .= ", tosell = ".(int) $this->status;
 			$sql .= ", tobuy = ".(int) $this->status_buy;
 			$sql .= ", tobatch = ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : (int) $this->status_batch);
+			$sql .= ", batch_mask = '".$this->db->escape($this->batch_mask)."'";
+
 			$sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? "null" : (int) $this->finished);
 			$sql .= ", net_measure = ".($this->net_measure != '' ? "'".$this->db->escape($this->net_measure)."'" : 'null');
 			$sql .= ", net_measure_units = ".($this->net_measure_units != '' ? "'".$this->db->escape($this->net_measure_units)."'" : 'null');
@@ -2170,7 +2180,7 @@ class Product extends CommonObject
 		} else {
 			$sql .= " pa.accountancy_code_buy, pa.accountancy_code_buy_intra, pa.accountancy_code_buy_export, pa.accountancy_code_sell, pa.accountancy_code_sell_intra, pa.accountancy_code_sell_export,";
 		}
-		$sql .= " p.stock,p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.fk_unit,";
+		$sql .= " p.stock,p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
@@ -2210,6 +2220,7 @@ class Product extends CommonObject
 				$this->status                        = $obj->tosell;
 				$this->status_buy                    = $obj->tobuy;
 				$this->status_batch                    = $obj->tobatch;
+				$this->batch_mask                    = $obj->batch_mask;
 
 				$this->customcode                    = $obj->customcode;
 				$this->country_id                    = $obj->fk_country;

From 000342c2d8fb6677260a2761515419fe9eca69e6 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Fri, 9 Apr 2021 13:40:37 +0200
Subject: [PATCH 009/928] custom masks : create, edit and display

---
 htdocs/langs/en_US/productbatch.lang   |  3 ++-
 htdocs/langs/fr_FR/productbatch.lang   |  3 ++-
 htdocs/product/card.php                | 29 ++++++++++++++++++++++++--
 htdocs/product/class/product.class.php |  1 +
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index a63442d4b74..26dc9650308 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -27,4 +27,5 @@ StockDetailPerBatch=Stock detail per lot
 SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
\ No newline at end of file
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index eed5a063318..81551a38dca 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -27,4 +27,5 @@ StockDetailPerBatch=Stock détaillé par lot
 SerialNumberAlreadyInUse=Le numéro de série %s est déjà utilisé pour le produit %s
 TooManyQtyForSerialNumber=Vous ne pouvez avoir qu'un produit %s avec le numéro de série %s
 BatchLotNumberingModules=Modèle de génération et contrôle des numéros de lot
-BatchSerialNumberingModules=Modèle de génération et contrôle des numéros de série
\ No newline at end of file
+BatchSerialNumberingModules=Modèle de génération et contrôle des numéros de série
+ManageLotMask=Masque personnalisé
\ No newline at end of file
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 26ee8c5c186..7754a84926b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1086,10 +1086,28 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Batch number management
 		if (!empty($conf->productbatch->enabled)) {
-			print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
 			$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"), '2' => $langs->trans("ProductStatusOnSerial"));
 			print $form->selectarray('status_batch', $statutarray, GETPOST('status_batch'));
-			print '</td></tr>';
+			print '</td>';
+			// Product specific batch number management
+			$status_batch = GETPOST('status_batch');
+			if ($status_batch !== '0' 
+			&& (($status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') 
+			|| ($status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
+				$inherited_mask = $object->status_batch == '1' ? $conf->global->LOT_ADVANCED_MASK : $conf->global->SN_ADVANCED_MASK;
+				print '<td>'.$langs->trans("ManageLotMask").'</td>';
+				$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
+				$tooltip .= $langs->trans("GenericMaskCodes2");
+				$tooltip .= $langs->trans("GenericMaskCodes3");
+				$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
+				$tooltip .= $langs->trans("GenericMaskCodes5");
+				print '<td>';
+				print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask" value="'.$inherited_mask.'">', $tooltip, 1, 1);
+				print '</td>';
+			}
+			print '</tr>';
+
 		}
 
 		$showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
@@ -2055,6 +2073,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
 					print $object->getLibStatut(0, 2);
 					print '</td></tr>';
+					if ((($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') 
+					|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
+						print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td colspan="2">';
+						print $object->batch_mask;
+						print '</td></tr>';
+	
+					}
 				}
 			}
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bcfaee9c0dc..4fc6f378d11 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -678,6 +678,7 @@ class Product extends CommonObject
 					$sql .= ", canvas";
 					$sql .= ", finished";
 					$sql .= ", tobatch";
+					$sql .= ", batch_mask";
 					$sql .= ", fk_unit";
 					$sql .= ") VALUES (";
 					$sql .= "'".$this->db->idate($now)."'";

From eef5b9514d3f1ca219ef807e23aa633bd6547225 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 9 Apr 2021 16:55:54 +0200
Subject: [PATCH 010/928] wip

---
 .../eventorganization/attendee_subscription.php     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 885058d34bb..2e49ad131d9 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -263,6 +263,19 @@ if (empty($reshook) && $action == 'add') {
 
 	if (!$error) {
 		$db->commit();
+		
+		$project = new Project($db);
+		$resultproject = $project->fetch($object->fk_project);
+		if ($resultproject < 0){
+		    $error++;
+		    $errmsg .= $project->error;
+		} else {
+		    if (!empty($project->price_registration)){
+		        // @todo traiter invoice et payment page
+		    }
+		}
+		
+		// invoice
 		//Header("Location: ".$urlback);
 		//exit;
 	} else {

From ebd5f292318c538e88709fffc2681f7f87e2c0c0 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 12 Apr 2021 15:44:25 +0200
Subject: [PATCH 011/928] invoice OK except price, wip on the payment page

---
 .../attendee_subscription.php                 | 47 +++++++++++++------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index b044ad2e914..172e6cee798 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -66,6 +66,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 // Init vars
@@ -78,6 +80,12 @@ $action = GETPOST('action', 'aZ09');
 $key = 'DV3PH';
 $id = dol_decode(GETPOST('id'), $key);
 
+$conference = new ConferenceOrBooth($db);
+$resultconf = $conference->fetch($id);
+if ($resultconf < 0) {
+    setEventMessages(null, $object->errors, "errors");
+}
+
 // Securekey check
 $securekey = GETPOST('securekey', 'alpha');
 if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY) {
@@ -258,22 +266,39 @@ if (empty($reshook) && $action == 'add') {
 			}
 		}
 	}
-
 	if (!$error) {
 		$db->commit();
-		
 		$project = new Project($db);
-		$resultproject = $project->fetch($object->fk_project);
-		if ($resultproject < 0){
+		$resultproject = $project->fetch($conference->fk_project);
+		if ($resultproject < 0){	    
 		    $error++;
 		    $errmsg .= $project->error;
 		} else {
-		    if (!empty($project->price_registration)){
-		        // @todo traiter invoice et payment page
+		    var_dump($project->price_registration);
+		    if (!empty(floatval($project->price_registration))){
+		        $facture = new Facture($db);
+		        //$facture->rowid = ;
+		        //$facture->ref = ;
+		        //$facture->entity = ;
+		        $facture->type = 0;
+		        $facture->socid = $thirdparty->id;
+		        $facture->paye = 0;
+		        //$facture->fk_user_modif = ;
+		        //$facture->fk_cond_reglement = ;
+		        //$facture->tms = ;
+		        //$facture->fk_statut = ;
+		        $facture->date = dol_now();
+		        $resultfacture = $facture->create($user);	
+		    } else {
+		        // No price has been set
+		        // Validating the subscription
+		        $confattendee->setStatut(1);
+		        global $dolibarr_main_url_root;
+		        $redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
+		        Header("Location: ".$redirection);
+		        exit;
 		    }
 		}
-		
-		// invoice
 		//Header("Location: ".$urlback);
 		//exit;
 	} else {
@@ -289,12 +314,6 @@ if (empty($reshook) && $action == 'add') {
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 
-$conference = new ConferenceOrBooth($db);
-$resultconf = $conference->fetch($id);
-if ($resultconf < 0) {
-	setEventMessages(null, $object->errors, "errors");
-}
-
 llxHeaderVierge($langs->trans("NewSubscription"));
 
 

From 15d103e957f94e63d1b9b50fd80bd7fcff69ad4f Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 12 Apr 2021 15:52:49 +0200
Subject: [PATCH 012/928] subs validation for free conferences added

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

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 03fb460d6b9..302790f91f0 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -98,3 +98,7 @@ MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
 EvntOrgStartDuration = This conference starts on 
 EvntOrgEndDuration =  and ends on
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated

From e1fb368d3a40662623f02199f528540a073055b7 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 12 Apr 2021 16:50:56 +0200
Subject: [PATCH 013/928] wip

---
 .../public/eventorganization/attendee_subscription.php   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 172e6cee798..0adf783ee05 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -274,7 +274,7 @@ if (empty($reshook) && $action == 'add') {
 		    $error++;
 		    $errmsg .= $project->error;
 		} else {
-		    var_dump($project->price_registration);
+		    global $dolibarr_main_url_root;
 		    if (!empty(floatval($project->price_registration))){
 		        $facture = new Facture($db);
 		        //$facture->rowid = ;
@@ -288,12 +288,15 @@ if (empty($reshook) && $action == 'add') {
 		        //$facture->tms = ;
 		        //$facture->fk_statut = ;
 		        $facture->date = dol_now();
-		        $resultfacture = $facture->create($user);	
+		        $resultfacture = $facture->create($user);
+		        //@todo rediriger page paiement
+		        $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
+		        Header("Location: ".$redirection);
+		        exit;
 		    } else {
 		        // No price has been set
 		        // Validating the subscription
 		        $confattendee->setStatut(1);
-		        global $dolibarr_main_url_root;
 		        $redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
 		        Header("Location: ".$redirection);
 		        exit;

From 0965f28bf74fc02948a4b9332a947cf0d0f2ebd6 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Mon, 12 Apr 2021 17:56:57 +0200
Subject: [PATCH 014/928] a pinch of jquery to display only what we need when
 we need it

---
 htdocs/product/card.php | 90 ++++++++++++++++++++++++++++++++---------
 1 file changed, 71 insertions(+), 19 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 7754a84926b..e6b3adb7439 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -307,8 +307,10 @@ if (empty($reshook)) {
 			$object->status             	 = GETPOST('statut');
 			$object->status_buy            = GETPOST('statut_buy');
 			$object->status_batch = GETPOST('status_batch');
-			$object->batch_mask = GETPOST('batch_mask', 'alpha');
-
+			if ($object->status_batch !== 0) {
+				$object->batch_mask = GETPOST('batch_mask');
+			}
+			else $object->batch_mask = '';
 
 			$object->barcode_type          = GETPOST('fk_barcode_type');
 			$object->barcode = GETPOST('barcode');
@@ -477,7 +479,10 @@ if (empty($reshook)) {
 				$object->status                 = GETPOST('statut', 'int');
 				$object->status_buy             = GETPOST('statut_buy', 'int');
 				$object->status_batch = GETPOST('status_batch', 'aZ09');
-				$object->batch_mask = GETPOST('batch_mask', 'alpha');
+				if ($object->status_batch !== 0) {
+					$object->batch_mask = GETPOST('batch_mask', 'alpha');
+				}
+				else $object->batch_mask = '';
 				$object->fk_default_warehouse   = GETPOST('fk_default_warehouse');
 				// removed from update view so GETPOST always empty
 				/*
@@ -1092,20 +1097,40 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td>';
 			// Product specific batch number management
 			$status_batch = GETPOST('status_batch');
-			if ($status_batch !== '0' 
-			&& (($status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') 
-			|| ($status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
-				$inherited_mask = $object->status_batch == '1' ? $conf->global->LOT_ADVANCED_MASK : $conf->global->SN_ADVANCED_MASK;
-				print '<td>'.$langs->trans("ManageLotMask").'</td>';
+			if ($status_batch !== '0') {
 				$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
 				$tooltip .= $langs->trans("GenericMaskCodes2");
 				$tooltip .= $langs->trans("GenericMaskCodes3");
 				$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
 				$tooltip .= $langs->trans("GenericMaskCodes5");
-				print '<td>';
-				print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask" value="'.$inherited_mask.'">', $tooltip, 1, 1);
-				print '</td>';
+				print '<td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
+				if (($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') || ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced')) {
+					$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
+					$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
+					print '<td id="field_mask">';
+					print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask_input">', $tooltip, 1, 1);
+					print '</td>';
+				}
+				print '<script type="text/javascript">
+							$(document).ready(function() {
+								$("#field_mask, #mask_option").addClass("hideobject");
+								$("#status_batch").on("change", function () {
+									var optionSelected = $("option:selected", this);
+									var valueSelected = this.value;
+									$("#field_mask, #mask_option").addClass("hideobject");
+									if (this.value == 1) {
+										$("#field_mask, #mask_option").toggleClass("hideobject");
+										$("#batch_mask_input").val("'.$inherited_mask_lot.'");
+									}
+									if (this.value == 2) {
+										$("#field_mask, #mask_option").toggleClass("hideobject");
+										$("#batch_mask_input").val("'.$inherited_mask_sn.'");
+									}
+								})
+							})
+						</script>';
 			}
+
 			print '</tr>';
 
 		}
@@ -1570,20 +1595,47 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"), '2' => $langs->trans("ProductStatusOnSerial"));
 					print $form->selectarray('status_batch', $statutarray, $object->status_batch);
 					print '</td>';
-					if ($object->status_batch !== '0' 
-					&& (($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') 
-					|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
-						$inherited_mask = $object->status_batch == '1' ? $conf->global->LOT_ADVANCED_MASK : $conf->global->SN_ADVANCED_MASK;
-						print '<td>'.$langs->trans("ManageLotMask").'</td>';
-						$mask = !is_empty($object->batch_mask) ? $object->batch_mask : $inherited_mask;
+					if ($object->status_batch !== '0') {
 						$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
 						$tooltip .= $langs->trans("GenericMaskCodes2");
 						$tooltip .= $langs->trans("GenericMaskCodes3");
 						$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
 						$tooltip .= $langs->trans("GenericMaskCodes5");
-						print '<td>';
-						print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask" value="'.$mask.'">', $tooltip, 1, 1);
+						print '<td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
+						if ($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
+							$mask = !is_empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
+						}
+						if ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
+							$mask = !is_empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
+						}
+						$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
+						$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;	
+						print '<td id="field_mask">';
+						print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask_input" value="'.$mask.'">', $tooltip, 1, 1);
 						print '</td>';
+					
+						print '<script type="text/javascript">
+						$(document).ready(function() {
+							$("#field_mask, #mask_option").addClass("hideobject");
+							var preselect = $("#status_batch option:selected");
+							if (preselect !== "0") {
+								$("#field_mask, #mask_option").toggleClass("hideobject");
+							}
+							$("#status_batch").on("change", function () {
+								var optionSelected = $("option:selected", this);
+								var valueSelected = this.value;
+								$("#field_mask, #mask_option").addClass("hideobject");
+								if (this.value == 1) {
+									$("#field_mask, #mask_option").toggleClass("hideobject");
+									$("#batch_mask_input").val("'.$inherited_mask_lot.'");
+								}
+								if (this.value == 2) {
+									$("#field_mask, #mask_option").toggleClass("hideobject");
+									$("#batch_mask_input").val("'.$inherited_mask_sn.'");
+								}
+							})
+						})
+					</script>';
 					}
 					print '</tr>';
 				}

From bb74a8b1b52f4e4a5f52a0f27a47e4d0876f4a08 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 12 Apr 2021 22:01:46 +0200
Subject: [PATCH 015/928] NEW: Add constant MAIN_BUGTRACK_URL to add
 possibility to redirect to other service

---
 htdocs/main.inc.php | 67 +++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index a4c54275041..3b60747bd01 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2743,38 +2743,41 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-			$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';
-			$bugbaseurl .= '&title=';
-			$bugbaseurl .= urlencode("Bug: ");
-			$bugbaseurl .= '&body=';
-			$bugbaseurl .= urlencode("# Instructions\n");
-			$bugbaseurl .= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");
-			$bugbaseurl .= urlencode("*Please:*\n");
-			$bugbaseurl .= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");
-			$bugbaseurl .= urlencode("- *remove any unused sub-section*\n");
-			$bugbaseurl .= urlencode("\n");
-			$bugbaseurl .= urlencode("\n");
-			$bugbaseurl .= urlencode("# Bug\n");
-			$bugbaseurl .= urlencode("[*Short description*]\n");
-			$bugbaseurl .= urlencode("\n");
-			$bugbaseurl .= urlencode("## Environment\n");
-			$bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
-			$bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
-			$bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
-			$bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
-			$bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
-			$bugbaseurl .= urlencode("- **URL(s)**: ".$_SERVER["REQUEST_URI"]."\n");
-			$bugbaseurl .= urlencode("\n");
-			$bugbaseurl .= urlencode("## Expected and actual behavior\n");
-			$bugbaseurl .= urlencode("[*Verbose description*]\n");
-			$bugbaseurl .= urlencode("\n");
-			$bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");
-			$bugbaseurl .= urlencode("[*Verbose description*]\n");
-			$bugbaseurl .= urlencode("\n");
-			$bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
-			$bugbaseurl .= urlencode("[*Files*]\n");
-			$bugbaseurl .= urlencode("\n");
-
+			if (!empty($conf->global->MAIN_BUGTRACK_URL)) {
+				$bugbaseurl = $conf->global->MAIN_BUGTRACK_URL;
+			} else {
+				$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';
+				$bugbaseurl .= '&title=';
+				$bugbaseurl .= urlencode("Bug: ");
+				$bugbaseurl .= '&body=';
+				$bugbaseurl .= urlencode("# Instructions\n");
+				$bugbaseurl .= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");
+				$bugbaseurl .= urlencode("*Please:*\n");
+				$bugbaseurl .= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");
+				$bugbaseurl .= urlencode("- *remove any unused sub-section*\n");
+				$bugbaseurl .= urlencode("\n");
+				$bugbaseurl .= urlencode("\n");
+				$bugbaseurl .= urlencode("# Bug\n");
+				$bugbaseurl .= urlencode("[*Short description*]\n");
+				$bugbaseurl .= urlencode("\n");
+				$bugbaseurl .= urlencode("## Environment\n");
+				$bugbaseurl .= urlencode("- **Version**: " . DOL_VERSION . "\n");
+				$bugbaseurl .= urlencode("- **OS**: " . php_uname('s') . "\n");
+				$bugbaseurl .= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
+				$bugbaseurl .= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
+				$bugbaseurl .= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
+				$bugbaseurl .= urlencode("- **URL(s)**: " . $_SERVER["REQUEST_URI"] . "\n");
+				$bugbaseurl .= urlencode("\n");
+				$bugbaseurl .= urlencode("## Expected and actual behavior\n");
+				$bugbaseurl .= urlencode("[*Verbose description*]\n");
+				$bugbaseurl .= urlencode("\n");
+				$bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");
+				$bugbaseurl .= urlencode("[*Verbose description*]\n");
+				$bugbaseurl .= urlencode("\n");
+				$bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
+				$bugbaseurl .= urlencode("[*Files*]\n");
+				$bugbaseurl .= urlencode("\n");
+			}
 
 			// Execute hook printBugtrackInfo
 			$parameters = array('bugbaseurl'=>$bugbaseurl);

From 0d136d68068b1f2b4028c895ad50c73b07634aff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Apr 2021 12:08:56 +0200
Subject: [PATCH 016/928] Enhance barcode scanner tool

---
 htdocs/langs/en_US/productbatch.lang   |  3 +-
 htdocs/product/inventory/inventory.php | 40 ++++++++++++--------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 26dc9650308..879368e624b 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -28,4 +28,5 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
-ManageLotMask=Custom mask
\ No newline at end of file
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+ManageLotMask=Custom mask
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 8d3378fb779..8efc5b75bb6 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -265,22 +265,9 @@ if (empty($reshook)) {
 $form = new Form($db);
 $formproduct = new FormProduct($db);
 
-llxHeader('', $langs->trans('Inventory'), '');
+$help_url = '';
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
+llxHeader('', $langs->trans('Inventory'), $help_url);
 
 
 // Part to show record
@@ -335,7 +322,7 @@ if ($object->id > 0) {
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.DOL_URL_ROOT.'/product/inventory/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/inventory/list.php">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	/*
@@ -472,26 +459,37 @@ if ($object->id > 0) {
 	}
 
 
+	// Popup for mass barcode scanning
 	if ($action == 'updatebyscaning') {
+		print '<form name="barcodescanner" method="POST">';
+		print '<!-- Popup for mass barcode scanning -->'."\n";
 		print '<div class="div-for-modal-topright" style="padding: 15px">';
 		print '<center><strong>Barcode scanner tool...</strong></center><br>';
 
-		print 'Scan a product barcode<br>';
-		print '<input type="text" name="barcodeproduct" class="width200" autofocus> &nbsp; &nbsp; Qty <input type="text" name="barcodeproductqty" class="width50 right" value="1"><br>';
+		print '<input type="checkbox" name="barcodeforautodetect" checked="checked"> Autodetect if we scan a product barcode or a lot/serial barcode<br>';
+		print '<input type="checkbox" name="barcodeforproduct"> Scan a product barcode<br>';
+		print '<input type="checkbox" name="barcodeforlotserial"> Scan a product lot or serial number<br>';
 
-		print '<br>'.$langs->trans("or").'<br>';
+		print $langs->trans("QtyToAddAfterBarcodeScan").' <input type="text" name="barcodeproductqty" class="width50 right" value="1"><br>';
+		print '<textarea type="text" name="barcodelist" class="centpercent" autofocus rows="'.ROWS_3.'"></textarea>';
+
+		/*print '<br>'.$langs->trans("or").'<br>';
 
 		print '<br>';
 
-		print 'Scan a product lot or serial number<br>';
 		print '<input type="text" name="barcodelotserial" class="width200"> &nbsp; &nbsp; Qty <input type="text" name="barcodelotserialqty" class="width50 right" value="1"><br>';
-
+		*/
 		print '<br>';
+		print '<center>';
+		print '<input type="submit" class="button" value="'.$langs->trans("Add").'"><br>';
+
 		print '<span class="opacitymedium">'.$langs->trans("FeatureNotYetAvailable").'</span>';
 
 		// TODO Add javascript so each scan will add qty into the inventory page + an ajax save.
 
+		print '</center>';
 		print '</div>';
+		print '</form>';
 	}
 
 

From f69ccbbab85af033f24f4c297c49b5f116150e71 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 13 Apr 2021 10:31:24 +0200
Subject: [PATCH 017/928] remove empty line

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

diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 879368e624b..b51fed15820 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -29,4 +29,4 @@ TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-ManageLotMask=Custom mask
+ManageLotMask=Custom mask
\ No newline at end of file

From a95911e096979641785314229ca0e0c2e09ed91f Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 13 Apr 2021 11:21:41 +0200
Subject: [PATCH 018/928] stickler corrections

---
 htdocs/product/card.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index e6b3adb7439..79857364158 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -309,8 +309,7 @@ if (empty($reshook)) {
 			$object->status_batch = GETPOST('status_batch');
 			if ($object->status_batch !== 0) {
 				$object->batch_mask = GETPOST('batch_mask');
-			}
-			else $object->batch_mask = '';
+			} else $object->batch_mask = '';
 
 			$object->barcode_type          = GETPOST('fk_barcode_type');
 			$object->barcode = GETPOST('barcode');
@@ -481,8 +480,7 @@ if (empty($reshook)) {
 				$object->status_batch = GETPOST('status_batch', 'aZ09');
 				if ($object->status_batch !== 0) {
 					$object->batch_mask = GETPOST('batch_mask', 'alpha');
-				}
-				else $object->batch_mask = '';
+				} else $object->batch_mask = '';
 				$object->fk_default_warehouse   = GETPOST('fk_default_warehouse');
 				// removed from update view so GETPOST always empty
 				/*
@@ -1132,7 +1130,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			print '</tr>';
-
 		}
 
 		$showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
@@ -1609,11 +1606,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 							$mask = !is_empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
 						}
 						$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
-						$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;	
+						$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
 						print '<td id="field_mask">';
 						print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask_input" value="'.$mask.'">', $tooltip, 1, 1);
 						print '</td>';
-					
+
 						print '<script type="text/javascript">
 						$(document).ready(function() {
 							$("#field_mask, #mask_option").addClass("hideobject");
@@ -2125,12 +2122,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
 					print $object->getLibStatut(0, 2);
 					print '</td></tr>';
-					if ((($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') 
+					if ((($object->status_batch == '1' &&$conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
 					|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
 						print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td colspan="2">';
 						print $object->batch_mask;
-						print '</td></tr>';
-	
+						print '</td></tr>';	
 					}
 				}
 			}

From 14c93d14e493950d767c5d8c3936cbd9f991871f Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 13 Apr 2021 11:39:12 +0200
Subject: [PATCH 019/928] whitespace correction

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 79857364158..f036797ed47 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2126,7 +2126,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
 						print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td colspan="2">';
 						print $object->batch_mask;
-						print '</td></tr>';	
+						print '</td></tr>';
 					}
 				}
 			}

From db8dfb219cbea1814ba6f7f951e91fe9dcff06e9 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 13 Apr 2021 14:10:20 +0200
Subject: [PATCH 020/928] addition of the subscriptionok page when the
 subscription price is not set or 0

---
 .../eventorganization/subscriptionok.php      | 156 ++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 htdocs/public/eventorganization/subscriptionok.php

diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
new file mode 100644
index 00000000000..c12c1053e97
--- /dev/null
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -0,0 +1,156 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2021		Waël Almoman			<info@almoman.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/payment/paymentok.php
+ *		\ingroup    core
+ *		\brief      File to show page after a successful payment
+ *                  This page is called by payment system with url provided to it completed with parameter TOKEN=xxx
+ *                  This token can be used to get more informations.
+ */
+
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
+}
+if (!defined('NOCSRFCHECK')) {
+	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
+$entity = (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 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';
+
+if (!empty($conf->paypal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
+}
+
+$langs->loadLangs(array("main", "companies", "install", "other", "eventorganization"));
+
+$object = new stdClass(); // For triggers
+
+$error = 0;
+
+
+/*
+ * Actions
+ */
+
+
+
+/*
+ * View
+ */
+
+$now = dol_now();
+
+dol_syslog("Callback url when a 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, '_payment');
+
+$tracepost = "";
+foreach ($_POST as $k => $v) {
+	$tracepost .= "{$k} - {$v}\n";
+}
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
+
+$head = '';
+if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
+
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
+
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+
+
+// Show message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" class="center">'."\n";
+
+
+// Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
+// Define logo and logosmall
+$logosmall = $mysoc->logo_small;
+$logo = $mysoc->logo;
+$paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
+if (!empty($conf->global->$paramlogo)) {
+	$logosmall = $conf->global->$paramlogo;
+} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
+	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
+}
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo = '';
+$urllogofull = '';
+if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+}
+
+// Output html code for logo
+if ($urllogo) {
+	print '<div class="backgreypublicpayment">';
+	print '<div class="logopublicpayment">';
+	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+	print '>';
+	print '</div>';
+	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+	}
+	print '</div>';
+}
+
+
+print '<br><br><br>';
+
+print $langs->trans("SubscriptionOk");
+
+print "\n</div>\n";
+
+
+htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
+
+
+// Clean session variables to avoid duplicate actions if post is resent
+unset($_SESSION["FinalPaymentAmt"]);
+unset($_SESSION["TRANSACTIONID"]);
+
+
+llxFooter('', 'public');
+
+$db->close();
\ No newline at end of file

From 633a3d39c6bbfecf3df67edf3e13fbeebf9234b4 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 13 Apr 2021 14:32:17 +0200
Subject: [PATCH 021/928] wip on adding taxes and price to invoice

---
 .../attendee_subscription.php                 | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index ba52057b796..1887754bf23 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -284,7 +284,7 @@ if (empty($reshook) && $action == 'add') {
 	}
 
 	if (!$error) {
-		$db->commit();
+		$db->commit();	
 		$project = new Project($db);
 		$resultproject = $project->fetch($conference->fk_project);
 		if ($resultproject < 0){	    
@@ -294,22 +294,22 @@ if (empty($reshook) && $action == 'add') {
 		    global $dolibarr_main_url_root;
 		    if (!empty(floatval($project->price_registration))){
 		        $facture = new Facture($db);
-		        //$facture->rowid = ;
-		        //$facture->ref = ;
-		        //$facture->entity = ;
 		        $facture->type = 0;
 		        $facture->socid = $thirdparty->id;
 		        $facture->paye = 0;
-		        //$facture->fk_user_modif = ;
-		        //$facture->fk_cond_reglement = ;
-		        //$facture->tms = ;
-		        //$facture->fk_statut = ;
+		        //@todo price and taxes to add
+		        $tva = get_default_tva($mysoc, $thirdparty);
+		        
 		        $facture->date = dol_now();
 		        $resultfacture = $facture->create($user);
-		        //@todo rediriger page paiement
-		        $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
-		        Header("Location: ".$redirection);
-		        exit;
+		        if ($resultfacture < 0){
+		            $error++;
+		            $errmsg .= $facture->error;
+		        } else {
+		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
+		            Header("Location: ".$redirection);
+		            exit;
+		        }
 		    } else {
 		        // No price has been set
 		        // Validating the subscription

From a3e75c587c425a908b81b898061e570873b887af Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 13 Apr 2021 15:07:15 +0200
Subject: [PATCH 022/928] adding amount and source to redirection url to
 newpayment

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 1887754bf23..f5efd274edf 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -306,7 +306,7 @@ if (empty($reshook) && $action == 'add') {
 		            $error++;
 		            $errmsg .= $facture->error;
 		        } else {
-		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
+		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?amount='.$project->price_registration.'&source=conferenceattendeesubscription';
 		            Header("Location: ".$redirection);
 		            exit;
 		        }

From 339596f13410f7358ffce6b7bd74c92aae404e13 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 13 Apr 2021 15:30:28 +0200
Subject: [PATCH 023/928] ref add in redirection url to payment page

---
 htdocs/public/eventorganization/attendee_subscription.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index f5efd274edf..a47a93557d3 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -306,7 +306,8 @@ if (empty($reshook) && $action == 'add') {
 		            $error++;
 		            $errmsg .= $facture->error;
 		        } else {
-		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?amount='.$project->price_registration.'&source=conferenceattendeesubscription';
+		            $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
+		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?amount='.$project->price_registration.'&source=conferenceattendeesubscription&ref='.$thirdparty->ref;
 		            Header("Location: ".$redirection);
 		            exit;
 		        }

From ee1693edf0eaf8bbc4f4c9c6fa601b01b3985c42 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 13 Apr 2021 16:13:57 +0200
Subject: [PATCH 024/928] colspans and inconditional GETPOST

---
 htdocs/product/card.php | 46 ++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index f036797ed47..93bb3c65d0e 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -307,9 +307,7 @@ if (empty($reshook)) {
 			$object->status             	 = GETPOST('statut');
 			$object->status_buy            = GETPOST('statut_buy');
 			$object->status_batch = GETPOST('status_batch');
-			if ($object->status_batch !== 0) {
-				$object->batch_mask = GETPOST('batch_mask');
-			} else $object->batch_mask = '';
+			$object->batch_mask = GETPOST('batch_mask');
 
 			$object->barcode_type          = GETPOST('fk_barcode_type');
 			$object->barcode = GETPOST('barcode');
@@ -478,9 +476,7 @@ if (empty($reshook)) {
 				$object->status                 = GETPOST('statut', 'int');
 				$object->status_buy             = GETPOST('statut_buy', 'int');
 				$object->status_batch = GETPOST('status_batch', 'aZ09');
-				if ($object->status_batch !== 0) {
-					$object->batch_mask = GETPOST('batch_mask', 'alpha');
-				} else $object->batch_mask = '';
+				$object->batch_mask = GETPOST('batch_mask', 'alpha');
 				$object->fk_default_warehouse   = GETPOST('fk_default_warehouse');
 				// removed from update view so GETPOST always empty
 				/*
@@ -1108,25 +1104,27 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<td id="field_mask">';
 					print $form->textwithpicto('<input type="text" class="flat" size="24" name="batch_mask" id="batch_mask_input">', $tooltip, 1, 1);
 					print '</td>';
-				}
-				print '<script type="text/javascript">
-							$(document).ready(function() {
-								$("#field_mask, #mask_option").addClass("hideobject");
-								$("#status_batch").on("change", function () {
-									var optionSelected = $("option:selected", this);
-									var valueSelected = this.value;
+					print '<script type="text/javascript">
+								$(document).ready(function() {
 									$("#field_mask, #mask_option").addClass("hideobject");
-									if (this.value == 1) {
-										$("#field_mask, #mask_option").toggleClass("hideobject");
-										$("#batch_mask_input").val("'.$inherited_mask_lot.'");
-									}
-									if (this.value == 2) {
-										$("#field_mask, #mask_option").toggleClass("hideobject");
-										$("#batch_mask_input").val("'.$inherited_mask_sn.'");
-									}
+									$("#status_batch").on("change", function () {
+										var optionSelected = $("option:selected", this);
+										var valueSelected = this.value;
+										$("#field_mask, #mask_option").addClass("hideobject");
+										if (this.value == 1) {
+											$("#field_mask, #mask_option").toggleClass("hideobject");
+											$("#batch_mask_input").val("'.$inherited_mask_lot.'");
+										}
+										if (this.value == 2) {
+											$("#field_mask, #mask_option").toggleClass("hideobject");
+											$("#batch_mask_input").val("'.$inherited_mask_sn.'");
+										}
+									})
 								})
-							})
-						</script>';
+							</script>';
+				} else {
+					print '<td colspan="2"></td>';
+				}
 			}
 
 			print '</tr>';
@@ -1633,6 +1631,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 							})
 						})
 					</script>';
+					} else {
+						print '<td colspan="2"></td>';
 					}
 					print '</tr>';
 				}

From bc78b870208932174df02f485ddb567a4ae3d569 Mon Sep 17 00:00:00 2001
From: Givriz <damien375@outlook.fr>
Date: Tue, 13 Apr 2021 16:32:19 +0200
Subject: [PATCH 025/928] pvpv8 continuous integration

---
 htdocs/admin/mails_senderprofile_list.php |  12 +--
 htdocs/admin/mails_templates.php          | 102 +++++++++++-----------
 htdocs/core/tpl/list_print_total.tpl.php  |   2 +-
 3 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 8f781318995..ae190db715c 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -88,7 +88,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -102,7 +102,7 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
+if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
 			$arrayfields["ef.".$key] = array(
@@ -240,7 +240,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
 if ($object->ismultientitymanaged == 1) {
@@ -497,11 +497,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], empty($search[$key]) ? '' : $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]).'">';
 		}
 		print '</td>';
 	}
@@ -552,7 +552,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+if (!empty($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
 		if (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index cdb9c10ec87..73ebcc1d4be 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -45,10 +45,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 // Load translation files required by the page
 $langsArray=array("errors", "admin", "mails", "languages");
 
-if ($conf->adherent->enabled) {
+if (!empty($conf->adherent->enabled)) {
 	$langsArray[]='members';
 }
-if ($conf->eventorganization->enabled) {
+if (!empty($conf->eventorganization->enabled)) {
 	$langsArray[]='eventorganization';
 }
 
@@ -181,55 +181,55 @@ $elementList = array();
 $elementList['all'] = '-- '.dol_escape_htmltag($langs->trans("All")).' --';
 $elementList['none'] = '-- '.dol_escape_htmltag($langs->trans("None")).' --';
 $elementList['user'] = img_picto('', 'user', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToUser'));
-if ($conf->adherent->enabled && $user->rights->adherent->lire) {
+if (!empty($conf->adherent->enabled) && !empty($user->rights->adherent->lire)) {
 	$elementList['member'] = img_picto('', 'object_member', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToMember'));
 }
-if ($conf->recruitment->enabled && $user->rights->recruitment->recruitmentjobposition->read) {
+if (!empty($conf->recruitment->enabled) && !empty($user->rights->recruitment->recruitmentjobposition->read)) {
 	$elementList['recruitmentcandidature_send'] = img_picto('', 'recruitmentcandidature', 'class="paddingright"').dol_escape_htmltag($langs->trans('RecruitmentCandidatures'));
 }
-if ($conf->societe->enabled && $user->rights->societe->lire) {
+if (!empty($conf->societe->enabled) && !empty($user->rights->societe->lire)) {
 	$elementList['thirdparty'] = img_picto('', 'company', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToThirdparty'));
 }
-if ($conf->projet->enabled) {
+if (!empty($conf->projet->enabled)) {
 	$elementList['project'] = img_picto('', 'project', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToProject'));
 }
-if ($conf->propal->enabled && $user->rights->propal->lire) {
+if (!empty($conf->propal->enabled) && !empty($user->rights->propal->lire)) {
 	$elementList['propal_send'] = img_picto('', 'propal', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendProposal'));
 }
-if ($conf->commande->enabled && $user->rights->commande->lire) {
+if (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire)) {
 	$elementList['order_send'] = img_picto('', 'order', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendOrder'));
 }
-if ($conf->facture->enabled && $user->rights->facture->lire) {
+if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 	$elementList['facture_send'] = img_picto('', 'bill', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendInvoice'));
 }
-if ($conf->expedition->enabled) {
+if (!empty($conf->expedition->enabled)) {
 	$elementList['shipping_send'] = img_picto('', 'dolly', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendShipment'));
 }
-if ($conf->reception->enabled) {
+if (!empty($conf->reception->enabled)) {
 	$elementList['reception_send'] = img_picto('', 'dolly', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendReception'));
 }
-if ($conf->ficheinter->enabled) {
+if (!empty($conf->ficheinter->enabled)) {
 	$elementList['fichinter_send'] = img_picto('', 'intervention', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendIntervention'));
 }
-if ($conf->supplier_proposal->enabled) {
+if (!empty($conf->supplier_proposal->enabled)) {
 	$elementList['supplier_proposal_send'] = img_picto('', 'propal', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierRequestForQuotation'));
 }
-if (($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_order->enabled && $user->rights->supplier_order->lire)) {
+if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->commande->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && !empty($user->rights->supplier_order->lire))) {
 	$elementList['order_supplier_send'] = img_picto('', 'order', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierOrder'));
 }
-if (($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_invoice->enabled && $user->rights->supplier_invoice->lire)) {
+if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->facture->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->supplier_invoice->lire))) {
 	$elementList['invoice_supplier_send'] = img_picto('', 'bill', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierInvoice'));
 }
-if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+if (!empty($conf->contrat->enabled) && !empty($user->rights->contrat->lire)) {
 	$elementList['contract'] = img_picto('', 'contract', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendContract'));
 }
-if ($conf->ticket->enabled && $user->rights->ticket->read) {
+if (!empty($conf->ticket->enabled) && !empty($user->rights->ticket->read)) {
 	$elementList['ticket_send'] = img_picto('', 'ticket', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToTicket'));
 }
-if ($conf->agenda->enabled) {
+if (!empty($conf->agenda->enabled)) {
 	$elementList['actioncomm_send'] = img_picto('', 'action', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendEventPush'));
 }
-if ($conf->eventorganization->enabled && $user->rights->eventorganization->read) {
+if (!empty($conf->eventorganization->enabled) && !empty($user->rights->eventorganization->read)) {
 	$elementList['eventorganization_send'] = img_picto('', 'action', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendEventOrganization'));
 }
 
@@ -254,7 +254,7 @@ if (GETPOST('cancel', 'alpha')) {
 	$action = 'list';
 	$massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+if (!GETPOST('confirmmassaction', 'alpha') && !empty($massaction) && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -1178,98 +1178,98 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 	$formadmin = new FormAdmin($db);
 
 	foreach ($fieldlist as $field => $value) {
-		if ($fieldlist[$field] == 'fk_user') {
+		if ($value == 'fk_user') {
 			print '<td>';
 			if ($user->admin) {
-				print $form->select_dolusers($obj->{$fieldlist[$field]}, 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 1, '', 0, '', 'maxwidth200');
+				print $form->select_dolusers(empty($obj->{$value}) ? '' : $obj->{$value}, 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 1, '', 0, '', 'maxwidth200');
 			} else {
 				if ($context == 'add') {	// I am not admin and we show the add form
 					print $user->getNomUrl(1); // Me
 					$forcedvalue = $user->id;
 				} else {
-					if ($obj && !empty($obj->{$fieldlist[$field]}) && $obj->{$fieldlist[$field]} > 0) {
+					if ($obj && !empty($obj->{$value}) && $obj->{$value} > 0) {
 						$fuser = new User($db);
-						$fuser->fetch($obj->{$fieldlist[$field]});
+						$fuser->fetch($obj->{$value});
 						print $fuser->getNomUrl(1);
 						$forcedvalue = $fuser->id;
 					} else {
-						$forcedvalue = $obj->{$fieldlist[$field]};
+						$forcedvalue = $obj->{$value};
 					}
 				}
-				$keyname = $fieldlist[$field];
+				$keyname = $value;
 				print '<input type="hidden" value="'.$forcedvalue.'" name="'.$keyname.'">';
 			}
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'lang') {
+		} elseif ($value == 'lang') {
 			print '<td>';
 			if (!empty($conf->global->MAIN_MULTILANGS)) {
 				$selectedlang = GETPOSTISSET('langcode') ?GETPOST('langcode', 'aZ09') : $langs->defaultlang;
 				if ($context == 'edit') {
-					$selectedlang = $obj->{$fieldlist[$field]};
+					$selectedlang = $obj->{$value};
 				}
 				print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1, 0, 0, 'maxwidth150');
 			} else {
-				if (!empty($obj->{$fieldlist[$field]})) {
-					print $obj->{$fieldlist[$field]}.' - '.$langs->trans('Language_'.$obj->{$fieldlist[$field]});
+				if (!empty($obj->{$value})) {
+					print $obj->{$value}.' - '.$langs->trans('Language_'.$obj->{$value});
 				}
-				$keyname = $fieldlist[$field];
+				$keyname = $value;
 				if ($keyname == 'lang') {
 					$keyname = 'langcode'; // Avoid conflict with lang param
 				}
-				print '<input type="hidden" value="'.$obj->{$fieldlist[$field]}.'" name="'.$keyname.'">';
+				print '<input type="hidden" value="'.(empty($obj->{$value}) ? '' : $obj->{$value}).'" name="'.$keyname.'">';
 			}
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'type_template') {
+		} elseif ($value == 'type_template') {
 			// Le type de template
 			print '<td class="center">';
-			if ($context == 'edit' && !empty($obj->{$fieldlist[$field]}) && !in_array($obj->{$fieldlist[$field]}, array_keys($elementList))) {
+			if ($context == 'edit' && !empty($obj->{$value}) && !in_array($obj->{$value}, array_keys($elementList))) {
 				// Current template type is an unknown type, so we must keep it as it is.
-				print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
-				print $obj->{$fieldlist[$field]};
+				print '<input type="hidden" name="type_template" value="'.$obj->{$value}.'">';
+				print $obj->{$value};
 			} else {
-				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1, '', 0, 1);
+				print $form->selectarray('type_template', $elementList, (!empty($obj->{$value}) ? $obj->{$value}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1, '', 0, 1);
 			}
 			print '</td>';
-		} elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) {
+		} elseif ($context == 'add' && in_array($value, array('topic', 'joinfiles', 'content', 'content_lines'))) {
 			continue;
-		} elseif ($context == 'edit' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) {
+		} elseif ($context == 'edit' && in_array($value, array('topic', 'joinfiles', 'content', 'content_lines'))) {
 			continue;
-		} elseif ($context == 'hide' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) {
+		} elseif ($context == 'hide' && in_array($value, array('topic', 'joinfiles', 'content', 'content_lines'))) {
 			continue;
 		} else {
 			$size = ''; $class = ''; $classtd = '';
-			if ($fieldlist[$field] == 'code') {
+			if ($value == 'code') {
 				$class = 'maxwidth100';
 			}
-			if ($fieldlist[$field] == 'label') {
+			if ($value == 'label') {
 				$class = 'maxwidth200';
 			}
-			if ($fieldlist[$field] == 'private') {
+			if ($value == 'private') {
 				$class = 'maxwidth50'; $classtd = 'center';
 			}
-			if ($fieldlist[$field] == 'position') {
+			if ($value == 'position') {
 				$class = 'maxwidth50'; $classtd = 'center';
 			}
-			if ($fieldlist[$field] == 'libelle') {
+			if ($value == 'libelle') {
 				$class = 'quatrevingtpercent';
 			}
-			if ($fieldlist[$field] == 'topic') {
+			if ($value == 'topic') {
 				$class = 'quatrevingtpercent';
 			}
-			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') {
+			if ($value == 'sortorder' || $value == 'sens' || $value == 'category_type') {
 				$size = 'size="2" ';
 			}
 
 			print '<td'.($classtd ? ' class="'.$classtd.'"' : '').'>';
-			if ($fieldlist[$field] == 'private') {
+			if ($value == 'private') {
 				if (empty($user->admin)) {
-					print $form->selectyesno($fieldlist[$field], '1', 1);
+					print $form->selectyesno($value, '1', 1);
 				} else {
 					//print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="1" name="'.$fieldlist[$field].'">';
-					print $form->selectyesno($fieldlist[$field], (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
+					print $form->selectyesno($value, (isset($obj->{$value}) ? $obj->{$value}:''), 1);
 				}
 			} else {
-				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$value}) ? $obj->{$value}:'').'" name="'. $value .'">';
 			}
 			print '</td>';
 		}
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index d7252f891ae..62052b82cec 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -1,6 +1,6 @@
 <?php
 // Move fields of totalizable into the common array pos and val
-if (is_array($totalarray['totalizable'])) {
+if (!empty($totalarray['totalizable']) && is_array($totalarray['totalizable'])) {
 	foreach ($totalarray['totalizable'] as $keytotalizable => $valtotalizable) {
 		$totalarray['pos'][$valtotalizable['pos']] = $keytotalizable;
 		$totalarray['val'][$keytotalizable] = $valtotalizable['total'];

From 2e297b575350483a00457af2ed36d5c532ec49aa Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 13 Apr 2021 17:02:58 +0200
Subject: [PATCH 026/928] one more print

---
 htdocs/product/card.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 93bb3c65d0e..64e5b844cb0 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1123,10 +1123,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 								})
 							</script>';
 				} else {
-					print '<td colspan="2"></td>';
+					print '<td></td>';
 				}
+			} else {
+				print '<td colspan="2"></td>';
 			}
-
 			print '</tr>';
 		}
 

From 6814488d86cf2435aaa335a5143f697771289f7d Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Wed, 14 Apr 2021 00:51:19 +0200
Subject: [PATCH 027/928] Update list.php

---
 htdocs/commande/list.php | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index db6bba130b1..d345bd033be 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -274,7 +274,15 @@ if (empty($reshook)) {
 	$objectclass = 'Commande';
 	$objectlabel = 'Orders';
 	$permissiontoread = $user->rights->commande->lire;
+	$permissiontoadd = $user->rights->commande->creer;
 	$permissiontodelete = $user->rights->commande->supprimer;
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)){
+		$permissiontovalidate = $user->rights->commande->order_advance->validate;
+		$permissiontoclose = $user->rights->commande->order_advance->close;
+	}else{
+		$permissiontovalidate = $user->rights->commande->creer;
+		$permissiontoclose = $user->rights->commande->creer;
+	}
 	$uploaddir = $conf->commande->multidir_output[$conf->entity];
 	$triggersendname = 'ORDER_SENTBYMAIL';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
@@ -700,16 +708,21 @@ if ($resql) {
 
 	// List of mass actions available
 	$arrayofmassactions = array(
-		'generate_doc'=>$langs->trans("ReGeneratePDF"),
-		'builddoc'=>$langs->trans("PDFMerge"),
-		'cancelorders'=>$langs->trans("Cancel"),
-		'presend'=>$langs->trans("SendByMail"),
+		'generate_doc'=>img_picto('', 'pdf').'&ensp;'.$langs->trans("ReGeneratePDF"),
+		'builddoc'=>img_picto('', 'pdf').'&ensp;'.$langs->trans("PDFMerge"),
+		'cancelorders'=>img_picto('', 'close_title').'&ensp;'.$langs->trans("Cancel"),
+		'presend'=>img_picto('', 'email').'&ensp;'.$langs->trans("SendByMail"),
 	);
 	if ($user->rights->facture->creer) {
-		$arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisCustomer");
+		$arrayofmassactions['createbills'] = img_picto('', 'bill').'&ensp;'.$langs->trans("CreateInvoiceForThisCustomer");
 	}
-	if ($user->rights->commande->supprimer) {
-		$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	if ($conf->global->MAIN_FEATURES_LEVEL == '2'){ //BB2A
+		if ($permissiontoclose) {
+			$arrayofmassactions['setbilled'] = img_picto('', 'bill').'&ensp;'.$langs->trans("ClassifyBilled");
+		}
+	}
+	if ($permissiontodelete) {
+		$arrayofmassactions['predelete'] = img_picto('', 'delete').'&ensp;'.$langs->trans("Delete");
 	}
 	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
 		$arrayofmassactions = array();
@@ -720,7 +733,7 @@ if ($resql) {
 	if (!empty($socid)) {
 		$url .= '&socid='.$socid;
 	}
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $contextpage == 'orderlist' && $user->rights->commande->creer);
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $contextpage == 'orderlist' && $permissiontoadd);
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -1740,8 +1753,8 @@ if ($resql) {
 	$urlsource .= str_replace('&amp;', '&', $param);
 
 	$filedir = $diroutputmassaction;
-	$genallowed = $user->rights->commande->lire;
-	$delallowed = $user->rights->commande->creer;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
 
 	print $formfile->showdocuments('massfilesarea_orders', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 } else {

From 25ac8bed68b3b512d68c54e5686b223ec0dde8e7 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Wed, 14 Apr 2021 01:54:30 +0200
Subject: [PATCH 028/928] Update list.php

---
 htdocs/commande/list.php | 86 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index d345bd033be..4c1a06a9a5d 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018       Charlene Benke	        <charlie@patas-monkey.com>
+ * Copyright (C) 2021	   	Anthony Berton			<anthony.berton@bb2a.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -279,15 +280,83 @@ if (empty($reshook)) {
 	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)){
 		$permissiontovalidate = $user->rights->commande->order_advance->validate;
 		$permissiontoclose = $user->rights->commande->order_advance->close;
+		$permissiontocancel = $user->rights->commande->order_advance->annuler;
+		$permissiontosendbymail = $user->rights->commande->order_advance->send;
 	}else{
 		$permissiontovalidate = $user->rights->commande->creer;
 		$permissiontoclose = $user->rights->commande->creer;
+		$permissiontocancel = $user->rights->commande->creer;
+		$permissiontosendbymail = $user->rights->commande->creer;
 	}
 	$uploaddir = $conf->commande->multidir_output[$conf->entity];
 	$triggersendname = 'ORDER_SENTBYMAIL';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
+if ($action == 'validate' && $permissiontoadd) {
+	if (GETPOST('confirm') == 'yes') {
+		$objecttmp = new $objectclass($db);
+		$db->begin();
+		$error = 0;
+		foreach ($toselect as $checked) {
+			if ($objecttmp->fetch($checked)) {
+				if ($objecttmp->statut == 0) {
+					if ($objecttmp->valid($user)) {
+						setEventMessage($objecttmp->ref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');
+					} else {
+						setEventMessage($langs->trans('CantBeValidated'), 'errors');
+						$error++;
+					}
+				} else {
+					setEventMessage($objecttmp->ref." ".$langs->trans('IsNotADraft'), 'errors');
+					$error++;
+				}
+			}else{
+				dol_print_error($db);
+				$error++;
+			}
+		}
+		if ($error) {
+			$db->rollback();
+		} else {
+			$db->commit();
+		}
+	}
+}
+// Closed records
+if (!$error && $massaction === 'setbilled' && $permissiontoclose) {
+	$db->begin();
 
+	$objecttmp = new $objectclass($db);
+	$nbok = 0;
+	foreach ($toselect as $toselectid) {
+		$result = $objecttmp->fetch($toselectid);
+		if ($result > 0) {
+			$result = $objecttmp->classifyBilled($user, 0);
+			if ($result <= 0) {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			} else {
+				$nbok++;
+			}
+		} else {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
+
+	if (!$error) {
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		}
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
+}
 
 /*
  * View
@@ -710,9 +779,18 @@ if ($resql) {
 	$arrayofmassactions = array(
 		'generate_doc'=>img_picto('', 'pdf').'&ensp;'.$langs->trans("ReGeneratePDF"),
 		'builddoc'=>img_picto('', 'pdf').'&ensp;'.$langs->trans("PDFMerge"),
-		'cancelorders'=>img_picto('', 'close_title').'&ensp;'.$langs->trans("Cancel"),
-		'presend'=>img_picto('', 'email').'&ensp;'.$langs->trans("SendByMail"),
 	);
+	if ($conf->global->MAIN_FEATURES_LEVEL == '2'){ //BB2A
+		if ($permissiontovalidate) {
+			$arrayofmassactions['prevalidate'] = img_picto('', 'check').'&ensp;'.$langs->trans("Validate");
+		}
+	}
+	if ($permissiontosendbymail) {
+		$arrayofmassactions['presend'] = img_picto('', 'email').'&ensp;'.$langs->trans("SendByMail");
+	}
+	if ($permissiontocancel) {
+		$arrayofmassactions['cancelorders'] = img_picto('', 'close_title').'&ensp;'.$langs->trans("Cancel");
+	}
 	if ($user->rights->facture->creer) {
 		$arrayofmassactions['createbills'] = img_picto('', 'bill').'&ensp;'.$langs->trans("CreateInvoiceForThisCustomer");
 	}
@@ -757,6 +835,10 @@ if ($resql) {
 	$trackid = 'ord'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+	if ($massaction == 'prevalidate') {
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
+	}
+
 	if ($massaction == 'createbills') {
 		//var_dump($_REQUEST);
 		print '<input type="hidden" name="massaction" value="confirm_createbills">';

From 92ca59d20b2d51bfc2e0f6510dbb03799f28008c Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Wed, 14 Apr 2021 02:23:23 +0200
Subject: [PATCH 029/928] Update list.php

---
 htdocs/commande/list.php | 55 +++++++++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 4c1a06a9a5d..78adb797b88 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -300,7 +300,42 @@ if ($action == 'validate' && $permissiontoadd) {
 		foreach ($toselect as $checked) {
 			if ($objecttmp->fetch($checked)) {
 				if ($objecttmp->statut == 0) {
-					if ($objecttmp->valid($user)) {
+					if (!empty($objecttmp->fk_warehouse)){
+						$idwarehouse = $objecttmp->fk_warehouse;
+					}else{
+						$idwarehouse = 0;
+					}
+					if ($objecttmp->valid($user, $idwarehouse)) {
+						setEventMessage($objecttmp->ref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');
+					} else {
+						setEventMessage($langs->trans('CantBeValidated'), 'errors');
+						$error++;
+					}
+				} else {
+					setEventMessage($objecttmp->ref." ".$langs->trans('IsNotADraft'), 'errors');
+					$error++;
+				}
+			}else{
+				dol_print_error($db);
+				$error++;
+			}
+		}
+		if ($error) {
+			$db->rollback();
+		} else {
+			$db->commit();
+		}
+	}
+}
+if ($action == 'shipped' && $permissiontoadd) {
+	if (GETPOST('confirm') == 'yes') {
+		$objecttmp = new $objectclass($db);
+		$db->begin();
+		$error = 0;
+		foreach ($toselect as $checked) {
+			if ($objecttmp->fetch($checked)) {
+				if ($objecttmp->statut == 1) {
+					if ($objecttmp->cloture($user)) {
 						setEventMessage($objecttmp->ref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');
 					} else {
 						setEventMessage($langs->trans('CantBeValidated'), 'errors');
@@ -780,24 +815,23 @@ if ($resql) {
 		'generate_doc'=>img_picto('', 'pdf').'&ensp;'.$langs->trans("ReGeneratePDF"),
 		'builddoc'=>img_picto('', 'pdf').'&ensp;'.$langs->trans("PDFMerge"),
 	);
-	if ($conf->global->MAIN_FEATURES_LEVEL == '2'){ //BB2A
-		if ($permissiontovalidate) {
-			$arrayofmassactions['prevalidate'] = img_picto('', 'check').'&ensp;'.$langs->trans("Validate");
-		}
+	if ($permissiontovalidate) {
+		$arrayofmassactions['prevalidate'] = img_picto('', 'check').'&ensp;'.$langs->trans("Validate");
 	}
 	if ($permissiontosendbymail) {
 		$arrayofmassactions['presend'] = img_picto('', 'email').'&ensp;'.$langs->trans("SendByMail");
 	}
+	if ($permissiontoclose) {
+		$arrayofmassactions['preshipped'] = img_picto('', 'dollyrevert').'&ensp;'.$langs->trans("ClassifyShipped");
+	}
 	if ($permissiontocancel) {
 		$arrayofmassactions['cancelorders'] = img_picto('', 'close_title').'&ensp;'.$langs->trans("Cancel");
 	}
 	if ($user->rights->facture->creer) {
 		$arrayofmassactions['createbills'] = img_picto('', 'bill').'&ensp;'.$langs->trans("CreateInvoiceForThisCustomer");
 	}
-	if ($conf->global->MAIN_FEATURES_LEVEL == '2'){ //BB2A
-		if ($permissiontoclose) {
-			$arrayofmassactions['setbilled'] = img_picto('', 'bill').'&ensp;'.$langs->trans("ClassifyBilled");
-		}
+	if ($permissiontoclose) {
+		$arrayofmassactions['setbilled'] = img_picto('', 'bill').'&ensp;'.$langs->trans("ClassifyBilled");
 	}
 	if ($permissiontodelete) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete').'&ensp;'.$langs->trans("Delete");
@@ -838,6 +872,9 @@ if ($resql) {
 	if ($massaction == 'prevalidate') {
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
 	}
+	if ($massaction == 'preshipped') {
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("CloseOrder"), $langs->trans("ConfirmCloseOrder"), "shipped", null, '', 0, 200, 500, 1);
+	}
 
 	if ($massaction == 'createbills') {
 		//var_dump($_REQUEST);

From 632487921506e589004ebb769b25bad36a7a6db2 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 14 Apr 2021 00:25:05 +0000
Subject: [PATCH 030/928] Fixing style errors.

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 78adb797b88..954c0e95a6d 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -277,12 +277,12 @@ if (empty($reshook)) {
 	$permissiontoread = $user->rights->commande->lire;
 	$permissiontoadd = $user->rights->commande->creer;
 	$permissiontodelete = $user->rights->commande->supprimer;
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)){
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 		$permissiontovalidate = $user->rights->commande->order_advance->validate;
 		$permissiontoclose = $user->rights->commande->order_advance->close;
 		$permissiontocancel = $user->rights->commande->order_advance->annuler;
 		$permissiontosendbymail = $user->rights->commande->order_advance->send;
-	}else{
+	} else {
 		$permissiontovalidate = $user->rights->commande->creer;
 		$permissiontoclose = $user->rights->commande->creer;
 		$permissiontocancel = $user->rights->commande->creer;
@@ -300,9 +300,9 @@ if ($action == 'validate' && $permissiontoadd) {
 		foreach ($toselect as $checked) {
 			if ($objecttmp->fetch($checked)) {
 				if ($objecttmp->statut == 0) {
-					if (!empty($objecttmp->fk_warehouse)){
+					if (!empty($objecttmp->fk_warehouse)) {
 						$idwarehouse = $objecttmp->fk_warehouse;
-					}else{
+					} else {
 						$idwarehouse = 0;
 					}
 					if ($objecttmp->valid($user, $idwarehouse)) {
@@ -315,7 +315,7 @@ if ($action == 'validate' && $permissiontoadd) {
 					setEventMessage($objecttmp->ref." ".$langs->trans('IsNotADraft'), 'errors');
 					$error++;
 				}
-			}else{
+			} else {
 				dol_print_error($db);
 				$error++;
 			}
@@ -345,7 +345,7 @@ if ($action == 'shipped' && $permissiontoadd) {
 					setEventMessage($objecttmp->ref." ".$langs->trans('IsNotADraft'), 'errors');
 					$error++;
 				}
-			}else{
+			} else {
 				dol_print_error($db);
 				$error++;
 			}

From 2f31720896b94ac235e9a4ad7082959a0cdf6c79 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 14 Apr 2021 04:45:17 +0200
Subject: [PATCH 031/928] Maxi debug of societe/product per entity

---
 htdocs/accountancy/admin/productaccount.php   | 12 +--
 htdocs/accountancy/customer/card.php          |  4 +-
 htdocs/accountancy/customer/index.php         | 12 +--
 htdocs/accountancy/customer/lines.php         |  6 +-
 htdocs/accountancy/customer/list.php          | 16 ++--
 .../accountancy/journal/purchasesjournal.php  | 10 ++-
 htdocs/accountancy/journal/sellsjournal.php   |  4 +-
 htdocs/accountancy/supplier/card.php          | 12 ++-
 htdocs/accountancy/supplier/index.php         | 29 ++++++--
 htdocs/accountancy/supplier/lines.php         | 17 ++++-
 htdocs/accountancy/supplier/list.php          | 14 ++--
 htdocs/compta/journal/sellsjournal.php        |  4 +-
 htdocs/core/modules/modFacture.class.php      |  4 +-
 htdocs/core/modules/modProduct.class.php      |  6 +-
 htdocs/core/modules/modService.class.php      |  4 +-
 htdocs/product/class/product.class.php        |  8 +-
 htdocs/product/list.php                       |  8 +-
 htdocs/societe/class/societe.class.php        | 73 ++++++++++++++++---
 18 files changed, 170 insertions(+), 73 deletions(-)

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 2013b0c7295..dd60c33a2e6 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -270,8 +270,8 @@ if (empty($pcgvercode)) {
 
 $sql = "SELECT p.rowid, p.ref, p.label, p.description, p.tosell, p.tobuy, p.tva_tx,";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " pa.accountancy_code_sell, pa.accountancy_code_sell_intra, pa.accountancy_code_sell_export,";
-	$sql .= " pa.accountancy_code_buy, pa.accountancy_code_buy_intra, pa.accountancy_code_buy_export,";
+	$sql .= " ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export,";
+	$sql .= " ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export,";
 } else {
 	$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
 	$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export,";
@@ -280,14 +280,14 @@ $sql .= " p.tms, p.fk_product_type as product_type,";
 $sql .= " aa.rowid as aaid";
 $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = pa." . $accountancy_field_name . " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'";
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = ppe." . $accountancy_field_name . " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'";
 } else {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = p." . $accountancy_field_name . " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'";
 }
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if (strlen(trim($search_current_account))) {
-	$sql .= natural_search((empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p." : "pa.") . $accountancy_field_name, $search_current_account);
+	$sql .= natural_search((empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p." : "ppe.") . $accountancy_field_name, $search_current_account);
 }
 if ($search_current_account_valid == 'withoutvalidaccount') {
 	$sql .= " AND aa.account_number IS NULL";
@@ -466,7 +466,7 @@ if ($result) {
 	} else {
 		print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
-	print_liste_field_titre("CurrentDedicatedAccountingAccount", $_SERVER["PHP_SELF"], (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p." : "pa.") . $accountancy_field_name, "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("CurrentDedicatedAccountingAccount", $_SERVER["PHP_SELF"], (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p." : "ppe.") . $accountancy_field_name, "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("AssignDedicatedAccountingAccount");
 	$clickpitco = $form->showCheckAddButtons('checkforselect', 1);
 	print_liste_field_titre($clickpitco, '', '', '', '', '', '', '', 'center ');
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index f0bcd9f7a49..b3ce892b235 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -102,7 +102,7 @@ if (!empty($id)) {
 	$sql = "SELECT f.ref, f.rowid as facid, l.fk_product, l.description, l.price,";
 	$sql .= " l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice,";
 	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-		$sql .= " pa.accountancy_code_sell as code_sell,";
+		$sql .= " ppe.accountancy_code_sell as code_sell,";
 	} else {
 		$sql .= " p.accountancy_code_sell as code_sell,";
 	}
@@ -110,7 +110,7 @@ if (!empty($id)) {
 	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as l";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 	}
 	$sql .= " LEFT JOIN ".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";
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 0b32e2802c4..755d03bbb3a 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -126,15 +126,15 @@ if ($action == 'validatehistory') {
 	$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
 	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tva_tx as tva_tx_prod,";
 	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-		$sql .= " pa.accountancy_code_sell as code_sell, pa.accountancy_code_sell_intra as code_sell_intra, pa.accountancy_code_sell_export as code_sell_export,";
+		$sql .= " ppe.accountancy_code_sell as code_sell, ppe.accountancy_code_sell_intra as code_sell_intra, ppe.accountancy_code_sell_export as code_sell_export,";
 	} else {
 		$sql .= " p.accountancy_code_sell as code_sell, p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
 	}
 	$sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export, aa4.rowid as aarowid_thirdparty,";
 	$sql .= " co.code as country_code, co.label as country_label,";
 	$sql .= " s.tva_intra,";
-	if (!empty($conf->global->ACCOUNTANCY_COMPANY_SHARED)) {
-		$sql .= " sa.accountancy_code_sell as company_code_sell";
+	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+		$sql .= " spe.accountancy_code_sell as company_code_sell";
 	} else {
 		$sql .= " s.accountancy_code_sell as company_code_sell";
 	}
@@ -145,10 +145,10 @@ if ($action == 'validatehistory') {
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as l ON f.rowid = l.fk_facture";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 	}
-	$alias_societe_perentity = empty($conf->global->ACCOUNTANCY_COMPANY_SHARED) ? "s" : "sa";
-	$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "pa";
+	$alias_societe_perentity = empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED) ? "s" : "spe";
+	$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON " . $alias_product_perentity . ".accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON " . $alias_product_perentity . ".accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON " . $alias_product_perentity . ".accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 6f522750398..b8cc34c3cae 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -184,9 +184,9 @@ $sql .= " fd.rowid, fd.description, fd.product_type as line_type, fd.total_ht, f
 $sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
 $sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label,";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " pa.accountancy_code_sell,";
+	$sql .= " ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export,";
 } else {
-	$sql .= " p.accountancy_code_sell,";
+	$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
 }
 $sql .= " aa.rowid as fk_compte, aa.account_number, aa.label as label_account, aa.labelshort as labelshort_account,";
 $sql .= " fd.situation_percent,";
@@ -198,7 +198,7 @@ $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 }
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index de160fe2b93..4052ed51fdd 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -219,8 +219,8 @@ $sql = "SELECT f.rowid as facid, f.ref, f.datef, f.type as ftype,";
 $sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tva_tx as tva_tx_prod,";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " pa.accountancy_code_sell as code_sell, pa.accountancy_code_sell_intra as code_sell_intra, pa.accountancy_code_sell_export as code_sell_export,";
-	$sql .= " pa.accountancy_code_buy as code_buy, pa.accountancy_code_buy_intra as code_buy_intra, pa.accountancy_code_buy_export as code_buy_export,";
+	$sql .= " ppe.accountancy_code_sell as code_sell, ppe.accountancy_code_sell_intra as code_sell_intra, ppe.accountancy_code_sell_export as code_sell_export,";
+	$sql .= " ppe.accountancy_code_buy as code_buy, ppe.accountancy_code_buy_intra as code_buy_intra, ppe.accountancy_code_buy_export as code_buy_export,";
 } else {
 	$sql .= " p.accountancy_code_sell as code_sell, p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
 	$sql .= " p.accountancy_code_buy as code_buy, p.accountancy_code_buy_intra as code_buy_intra, p.accountancy_code_buy_export as code_buy_export,";
@@ -229,8 +229,8 @@ $sql .= " p.tosell as status, p.tobuy as status_buy,";
 $sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export, aa4.rowid as aarowid_thirdparty,";
 $sql .= " co.code as country_code, co.label as country_label,";
 $sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,";
-if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " sa.accountancy_code_sell as company_code_sell";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " spe.accountancy_code_sell as company_code_sell";
 } else {
 	$sql .= " s.accountancy_code_sell as company_code_sell";
 }
@@ -240,16 +240,16 @@ $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as sa ON sa.fk_soc = s.rowid AND sa.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as l ON f.rowid = l.fk_facture";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 }
-$alias_societe_perentity = empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED) ? "s" : "sa";
-$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "pa";
+$alias_societe_perentity = empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED) ? "s" : "spe";
+$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON " . $alias_product_perentity . ".accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON " . $alias_product_perentity . ".accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON " . $alias_product_perentity . ".accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index bf950182798..018cba4ca89 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -106,9 +106,17 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 $sql = "SELECT f.rowid, f.ref as ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlf, f.close_code,";
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-$sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+	$sql .= " ppe.accountancy_code_buy,";
+} else {
+	$sql .= " p.accountancy_code_buy,";
+}
+$sql .= " aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
+if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+}
 $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";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 1904631775d..a9b6f17a9bd 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -110,14 +110,14 @@ $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tot
 $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, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " pa.accountancy_code_sell";
+	$sql .= " ppe.accountancy_code_sell";
 } else {
 	$sql .= " p.accountancy_code_sell";
 }
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".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";
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index cd17df33776..1e7887c1bdc 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -101,10 +101,18 @@ $formaccounting = new FormAccounting($db);
 
 if (!empty($id)) {
 	$sql = "SELECT f.ref as ref, f.rowid as facid, l.fk_product, l.description, l.rowid, l.fk_code_ventilation, ";
-	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label";
-	$sql .= ", aa.account_number, aa.label";
+	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label,";
+	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+		$sql .= " ppe.accountancy_code_buy as code_buy,";
+	} else {
+		$sql .= " p.accountancy_code_buy as code_buy,";
+	}
+	$sql .= " aa.account_number, aa.label";
 	$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";
+	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	}
 	$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 = ".((int) $id);
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 392551708de..ff09479ad03 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -132,20 +132,35 @@ if ($action == 'validatehistory') {
 	// Supplier Invoice Lines (must be same request than into page list.php for manual binding)
 	$sql = "SELECT f.rowid as facid, f.ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.type as ftype,";
 	$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
-	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type,";
-	$sql .= " p.accountancy_code_buy as code_buy, p.accountancy_code_buy_intra as code_buy_intra, p.accountancy_code_buy_export as code_buy_export, p.tva_tx as tva_tx_prod,";
+	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tva_tx as tva_tx_prod,";
+	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+		$sql .= " ppe.accountancy_code_buy as code_buy, ppe.accountancy_code_buy_intra as code_buy_intra, ppe.accountancy_code_buy_export as code_buy_export,";
+	} else {
+		$sql .= " p.accountancy_code_buy as code_buy, p.accountancy_code_buy_intra as code_buy_intra, p.accountancy_code_buy_export as code_buy_export,";
+	}
 	$sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export, aa4.rowid as aarowid_thirdparty,";
 	$sql .= " co.code as country_code, co.label as country_label,";
-	$sql .= " s.tva_intra, s.accountancy_code_buy as company_code_buy";
+	$sql .= " s.tva_intra,";
+	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+		$sql .= " spe.accountancy_code_buy as company_code_buy";
+	} else {
+		$sql .= " s.accountancy_code_buy as company_code_buy";
+	}
+
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON s.accountancy_code_buy = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
+	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	}
+	$alias_societe_perentity = empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED) ? "s" : "spe";
+	$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON " . $alias_product_perentity . ".accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON " . $alias_product_perentity . ".accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON " . $alias_product_perentity . ".accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_product_perentity . ".accountancy_code_buy = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
 	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 	$sql .= " AND l.product_type <= 2";
 
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 1f81a5d7e2c..deed1299fd5 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-2020 Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2021 Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * 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>
@@ -94,6 +94,9 @@ if (empty($user->rights->accounting->mouvements->lire)) {
 }
 
 
+$formaccounting = new FormAccounting($db);
+
+
 /*
  * Actions
  */
@@ -116,7 +119,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_tvaintra = '';
 }
 
-if (is_array($changeaccount) && count($changeaccount) > 0) {
+if (is_array($changeaccount) && count($changeaccount) > 0 && $user->rights->accounting->bind->write) {
 	$error = 0;
 
 	if (!(GETPOST('account_parent', 'int') >= 0)) {
@@ -124,7 +127,6 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
 
-
 	if (!$error) {
 		$db->begin();
 
@@ -184,7 +186,11 @@ $sql = "SELECT f.rowid as facid, f.ref as ref, f.ref_supplier, f.libelle as invo
 $sql .= " l.rowid, l.fk_product, l.product_type as line_type, l.description, l.total_ht , l.qty, l.tva_tx, l.vat_src_code,";
 $sql .= " aa.label, aa.labelshort, aa.account_number,";
 $sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tobuy, p.tosell,";
-$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export,";
+if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+	$sql .= " ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export,";
+} else {
+	$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export,";
+}
 $sql .= " co.code as country_code, co.label as country,";
 $sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur";
 $parameters = array();
@@ -192,6 +198,9 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 $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";
+if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+}
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_facture_fourn";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 1dcd17ea074..f70ae669204 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -224,8 +224,8 @@ $sql = "SELECT f.rowid as facid, f.ref, f.ref_supplier, f.libelle as invoice_lab
 $sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tva_tx as tva_tx_prod,";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " pa.accountancy_code_sell as code_sell, pa.accountancy_code_sell_intra as code_sell_intra, pa.accountancy_code_sell_export as code_sell_export,";
-	$sql .= " pa.accountancy_code_buy as code_buy, pa.accountancy_code_buy_intra as code_buy_intra, pa.accountancy_code_buy_export as code_buy_export,";
+	$sql .= " ppe.accountancy_code_sell as code_sell, ppe.accountancy_code_sell_intra as code_sell_intra, ppe.accountancy_code_sell_export as code_sell_export,";
+	$sql .= " ppe.accountancy_code_buy as code_buy, ppe.accountancy_code_buy_intra as code_buy_intra, ppe.accountancy_code_buy_export as code_buy_export,";
 } else {
 	$sql .= " p.accountancy_code_sell as code_sell, p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
 	$sql .= " p.accountancy_code_buy as code_buy, p.accountancy_code_buy_intra as code_buy_intra, p.accountancy_code_buy_export as code_buy_export,";
@@ -235,7 +235,7 @@ $sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_
 $sql .= " co.code as country_code, co.label as country_label,";
 $sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-	$sql .= " sa.accountancy_code_buy as company_code_buy";
+	$sql .= " spe.accountancy_code_buy as company_code_buy";
 } else {
 	$sql .= " s.accountancy_code_buy as company_code_buy";
 }
@@ -245,16 +245,16 @@ $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as sa ON sa.fk_soc = s.rowid AND sa.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 }
-$alias_societe_perentity = empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED) ? "s" : "sa";
-$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "pa";
+$alias_societe_perentity = empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED) ? "s" : "spe";
+$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON " . $alias_product_perentity . ".accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON " . $alias_product_perentity . ".accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON " . $alias_product_perentity . ".accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 9fa4168ea0a..367ffffbdea 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -113,7 +113,7 @@ $sql .= " fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc, f
 $sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.client,";
 $sql .= " p.rowid as pid, p.ref as pref,";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " pa.accountancy_code_sell,";
+	$sql .= " ppe.accountancy_code_sell,";
 } else {
 	$sql .= " p.accountancy_code_sell,";
 }
@@ -121,7 +121,7 @@ $sql .= " ct.accountancy_code_sell as account_tva, ct.recuperableonly";
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 }
 $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";
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index d1ad993af68..9cc05e5d6f2 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -207,7 +207,7 @@ class modFacture extends DolibarrModules
 		//--------
 		$r = 1;
 
-		$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "pa";
+		$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
 		$this->export_label[$r] = 'CustomersInvoicesAndInvoiceLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r] = 'invoice';
@@ -296,7 +296,7 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet_extrafields as extra2 on fd.rowid = extra2.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-			$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+			$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
 		$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';
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index fd1c7cceca0..344af868b69 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -176,7 +176,7 @@ class modProduct extends DolibarrModules
 		//--------
 		$r = 0;
 
-		$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "pa";
+		$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
 
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -296,7 +296,7 @@ class modProduct extends DolibarrModules
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-			$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+			$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
 		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_categorie = cat.rowid';
@@ -447,7 +447,7 @@ class modProduct extends DolibarrModules
 			$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 			$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 			if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-				$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+				$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 			}
 			$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';
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 3b21cf046c8..40bb2667741 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -143,7 +143,7 @@ class modService extends DolibarrModules
 		//--------
 		$r = 0;
 
-		$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "pa";
+		$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
 
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -259,7 +259,7 @@ class modService extends DolibarrModules
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-			$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+			$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
 		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_categorie = cat.rowid';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 16bbc508ac9..224f03fdda1 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -725,6 +725,8 @@ class Product extends CommonObject
 
 							// update accountancy for this entity
 							if (!$error && !empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+								$this->db->query("DELETE FROM " . MAIN_DB_PREFIX . "product_perentity WHERE fk_product = " . $this->id . " AND entity = " . $conf->entity);
+
 								$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_perentity (";
 								$sql .= " fk_product";
 								$sql .= ", entity";
@@ -2168,13 +2170,13 @@ class Product extends CommonObject
 		if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 			$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
 		} else {
-			$sql .= " pa.accountancy_code_buy, pa.accountancy_code_buy_intra, pa.accountancy_code_buy_export, pa.accountancy_code_sell, pa.accountancy_code_sell_intra, pa.accountancy_code_sell_export,";
+			$sql .= " ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export, ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export,";
 		}
 		$sql .= " p.stock,p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.fk_unit,";
 		$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
 		if ($id) {
 			$sql .= " WHERE p.rowid = ".((int) $id);
@@ -2256,7 +2258,7 @@ class Product extends CommonObject
 				$this->barcode_type                    = $obj->fk_barcode_type;
 
 				$this->accountancy_code_buy				= $obj->accountancy_code_buy;
-				$this->accountancy_code_buy_intra = $obj->accountancy_code_buy_intra;
+				$this->accountancy_code_buy_intra		= $obj->accountancy_code_buy_intra;
 				$this->accountancy_code_buy_export		= $obj->accountancy_code_buy_export;
 				$this->accountancy_code_sell			= $obj->accountancy_code_sell;
 				$this->accountancy_code_sell_intra		= $obj->accountancy_code_sell_intra;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index dc035187f30..e649179bb5e 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -191,7 +191,7 @@ if (empty($conf->global->PRODUIT_MULTIPRICES)) {
 
 $isInEEC = isInEEC($mysoc);
 
-$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "pa";
+$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
 
 // Definition of fields for lists
 $arrayfields = array(
@@ -364,7 +364,7 @@ $sql .= ' p.tobatch,';
 if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 	$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export,";
 } else {
-	$sql .= " pa.accountancy_code_sell, pa.accountancy_code_sell_intra, pa.accountancy_code_sell_export, pa.accountancy_code_buy, pa.accountancy_code_buy_intra, pa.accountancy_code_buy_export,";
+	$sql .= " ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export, ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export,";
 }
 $sql .= ' p.datec as date_creation, p.tms as date_update, p.pmp, p.stock, p.cost_price,';
 $sql .= ' p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units, fk_country, fk_state,';
@@ -387,7 +387,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 }
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields as ef on (p.rowid = ef.fk_object)";
@@ -523,7 +523,7 @@ $sql .= ' p.datec, p.tms, p.entity, p.tobatch, p.pmp, p.cost_price, p.stock,';
 if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 	$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export,";
 } else {
-	$sql .= " pa.accountancy_code_sell, pa.accountancy_code_sell_intra, pa.accountancy_code_sell_export, pa.accountancy_code_buy, pa.accountancy_code_buy_intra, pa.accountancy_code_buy_export,";
+    $sql .= " ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export, ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export,";
 }
 $sql .= ' p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units, p.fk_country, p.fk_state';
 if (!empty($conf->global->PRODUCT_USE_UNITS)) {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9d449922dd2..29e125de321 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -879,8 +879,10 @@ class Societe extends CommonObject
 			$sql .= ", import_key";
 			$sql .= ", fk_multicurrency";
 			$sql .= ", multicurrency_code";
-			$sql .= ", accountancy_code_buy";
-			$sql .= ", accountancy_code_sell";
+			if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				$sql .= ", accountancy_code_buy";
+				$sql .= ", accountancy_code_sell";
+			}
 			$sql .= ") VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
 			$sql .= ", ".(!empty($user->id) ? ((int) $user->id) : "null");
 			$sql .= ", ".(!empty($this->typent_id) ? ((int) $this->typent_id) : "null");
@@ -893,8 +895,10 @@ class Societe extends CommonObject
 			$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
 			$sql .= ", ".(int) $this->fk_multicurrency;
 			$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-			$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
-			$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
+			if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
+				$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
+			}
 			$sql .= ")";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -904,6 +908,28 @@ class Societe extends CommonObject
 
 				$ret = $this->update($this->id, $user, 0, 1, 1, 'add');
 
+				// update accountancy for this entity
+				if (!$error && !empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+					$this->db->query("DELETE FROM " . MAIN_DB_PREFIX . "societe_perentity WHERE fk_soc = " . $this->id . " AND entity = " . $conf->entity);
+
+					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_perentity (";
+					$sql .= " fk_soc";
+					$sql .= ", entity";
+					$sql .= ", accountancy_code_buy";
+					$sql .= ", accountancy_code_sell";
+					$sql .= ") VALUES (";
+					$sql .= $this->id;
+					$sql .= ", " . $conf->entity;
+					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
+					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
+					$sql .= ")";
+					$result = $this->db->query($sql);
+					if (!$result) {
+						$error++;
+						$this->error = 'ErrorFailedToUpdateAccountancyForEntity';
+					}
+				}
+
 				// Ajout du commercial affecte
 				if ($this->commercial_id != '' && $this->commercial_id != -1) {
 					$this->add_commercial($user, $this->commercial_id);
@@ -1414,10 +1440,10 @@ class Societe extends CommonObject
 			$sql .= ",order_min_amount= ".($this->order_min_amount != '' ? $this->order_min_amount : 'null');
 			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
 			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
-
-			$sql.= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy)."'";
-			$sql.= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell)."'";
-
+			if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				$sql .= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy) . "'";
+				$sql .= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell) . "'";
+			}
 			$sql .= ",webservices_url = ".(!empty($this->webservices_url) ? "'".$this->db->escape($this->webservices_url)."'" : "null");
 			$sql .= ",webservices_key = ".(!empty($this->webservices_key) ? "'".$this->db->escape($this->webservices_key)."'" : "null");
 
@@ -1499,6 +1525,28 @@ class Societe extends CommonObject
 
 				$action = 'update';
 
+				// update accountancy for this entity
+				if (!$error && !empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+					$this->db->query("DELETE FROM " . MAIN_DB_PREFIX . "societe_perentity WHERE fk_soc = " . $this->id . " AND entity = " . $conf->entity);
+
+					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_perentity (";
+					$sql .= " fk_soc";
+					$sql .= ", entity";
+					$sql .= ", accountancy_code_buy";
+					$sql .= ", accountancy_code_sell";
+					$sql .= ") VALUES (";
+					$sql .= $this->id;
+					$sql .= ", " . $conf->entity;
+					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
+					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
+					$sql .= ")";
+					$result = $this->db->query($sql);
+					if (!$result) {
+						$error++;
+						$this->error = 'ErrorFailedToUpdateAccountancyForEntity';
+					}
+				}
+
 				// Actions on extra fields
 				if (!$error) {
 					$result = $this->insertExtraFields();
@@ -1589,7 +1637,11 @@ class Societe extends CommonObject
 		$sql .= ', s.fk_effectif as effectif_id';
 		$sql .= ', s.fk_forme_juridique as forme_juridique_code';
 		$sql .= ', s.webservices_url, s.webservices_key';
-		$sql .= ', s.accountancy_code_buy, s.accountancy_code_sell';
+		if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			$sql .= ', s.accountancy_code_buy, s.accountancy_code_sell';
+		} else {
+			$sql .= ', spe.accountancy_code_buy, spe.accountancy_code_sell';
+		}
 		$sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
 		$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.transport_mode';
 		$sql .= ', s.fk_account, s.tva_assuj';
@@ -1609,6 +1661,9 @@ class Societe extends CommonObject
 		$sql .= ', i.libelle as label_incoterms';
 		$sql .= ', sr.remise_client, model_pdf';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+		}
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';

From 69fd2cf24ca3bb6a52de1924686d0af25636d14e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 14 Apr 2021 02:50:23 +0000
Subject: [PATCH 032/928] Fixing style errors.

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index e649179bb5e..735c0f6481f 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -523,7 +523,7 @@ $sql .= ' p.datec, p.tms, p.entity, p.tobatch, p.pmp, p.cost_price, p.stock,';
 if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 	$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export,";
 } else {
-    $sql .= " ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export, ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export,";
+	$sql .= " ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export, ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export,";
 }
 $sql .= ' p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units, p.fk_country, p.fk_state';
 if (!empty($conf->global->PRODUCT_USE_UNITS)) {

From c83819bd90796d0f185e9ff11ef7c7071666527d Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrienraze@gmail.com>
Date: Wed, 14 Apr 2021 09:44:01 +0200
Subject: [PATCH 033/928] NEW : Add possibility to exports userGroups fields on
 user exports

---
 htdocs/core/modules/modUser.class.php | 33 +++++++++++++++------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index e84998635ff..6298e5d01e9 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -231,7 +231,8 @@ class modUser extends DolibarrModules
 			'u.birth'=>'DateOfBirth',
 			'u.datec'=>"DateCreation", 'u.tms'=>"DateLastModification",
 			'u.admin'=>"Administrator", 'u.statut'=>'Status', 'u.datelastlogin'=>'LastConnexion', 'u.datepreviouslogin'=>'PreviousConnexion',
-			'u.fk_socpeople'=>"IdContact", 'u.fk_soc'=>"IdCompany", 'u.fk_member'=>"MemberId"
+			'u.fk_socpeople'=>"IdContact", 'u.fk_soc'=>"IdCompany", 'u.fk_member'=>"MemberId",
+			'g.nom'=>"Group"
 		);
 		$this->export_TypeFields_array[$r] = array(
 			'u.rowid'=>'Numeric', 'u.login'=>"Text", 'u.lastname'=>"Text", 'u.firstname'=>"Text", 'u.employee'=>'Boolean', 'u.job'=>'Text',
@@ -239,22 +240,24 @@ class modUser extends DolibarrModules
 			'u.address'=>"Text", 'u.zip'=>"Text", 'u.town'=>"Text",
 			'u.office_phone'=>'Text', 'u.user_mobile'=>'Text', 'u.office_fax'=>'Text',
 			'u.email'=>'Text', 'u.datec'=>"Date", 'u.tms'=>"Date", 'u.admin'=>"Boolean", 'u.statut'=>'Status', 'u.note'=>"Text", 'u.datelastlogin'=>'Date',
-			'u.fk_user'=>"List:user:login",
-			'u.birth'=>'Date',
-			'u.datepreviouslogin'=>'Date', 'u.fk_soc'=>"List:societe:nom:rowid", 'u.fk_member'=>"List:adherent:firstname"
+		    'u.fk_user'=>"List:user:login",
+		    'u.birth'=>'Date',
+		    'u.datepreviouslogin'=>'Date', 'u.fk_soc'=>"List:societe:nom:rowid", 'u.fk_member'=>"List:adherent:firstname",
+			'g.nom'=>"Text"
 		);
 		$this->export_entities_array[$r] = array(
 			'u.rowid'=>"user", 'u.login'=>"user", 'u.lastname'=>"user", 'u.firstname'=>"user", 'u.employee'=>'user', 'u.job'=>'user', 'u.gender'=>'user',
-			'u.accountancy_code'=>'user',
-			'u.address'=>"user", 'u.zip'=>"user", 'u.town'=>"user",
-			'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
-			'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
-			'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
-			'u.dateemployment'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
-			'u.birth'=>'user',
-			'u.datec'=>"user", 'u.tms'=>"user",
-			'u.admin'=>"user", 'u.statut'=>'user', 'u.datelastlogin'=>'user', 'u.datepreviouslogin'=>'user',
-			'u.fk_socpeople'=>"contact", 'u.fk_soc'=>"company", 'u.fk_member'=>"member"
+		    'u.accountancy_code'=>'user',
+		    'u.address'=>"user", 'u.zip'=>"user", 'u.town'=>"user",
+		    'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
+		    'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
+		    'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
+		    'u.dateemployment'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
+		    'u.birth'=>'user',
+		    'u.datec'=>"user", 'u.tms'=>"user",
+		    'u.admin'=>"user", 'u.statut'=>'user', 'u.datelastlogin'=>'user', 'u.datepreviouslogin'=>'user',
+		    'u.fk_socpeople'=>"contact", 'u.fk_soc'=>"company", 'u.fk_member'=>"member",
+			'g.nom'=>"Group"
 		);
 		$keyforselect = 'user';
 		$keyforelement = 'user';
@@ -267,6 +270,8 @@ 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] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user_extrafields as extra ON u.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'usergroup_user as ug ON u.rowid = ug.fk_user';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'usergroup as g ON ug.fk_usergroup = g.rowid';
 		$this->export_sql_end[$r] .= ' WHERE u.entity IN ('.getEntity('user').')';
 
 		// Imports

From bcab8d5164e055be9a8e2af70a146626389559d1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 14 Apr 2021 07:49:18 +0000
Subject: [PATCH 034/928] Fixing style errors.

---
 htdocs/core/modules/modUser.class.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 6298e5d01e9..01303892435 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -240,23 +240,23 @@ class modUser extends DolibarrModules
 			'u.address'=>"Text", 'u.zip'=>"Text", 'u.town'=>"Text",
 			'u.office_phone'=>'Text', 'u.user_mobile'=>'Text', 'u.office_fax'=>'Text',
 			'u.email'=>'Text', 'u.datec'=>"Date", 'u.tms'=>"Date", 'u.admin'=>"Boolean", 'u.statut'=>'Status', 'u.note'=>"Text", 'u.datelastlogin'=>'Date',
-		    'u.fk_user'=>"List:user:login",
-		    'u.birth'=>'Date',
-		    'u.datepreviouslogin'=>'Date', 'u.fk_soc'=>"List:societe:nom:rowid", 'u.fk_member'=>"List:adherent:firstname",
+			'u.fk_user'=>"List:user:login",
+			'u.birth'=>'Date',
+			'u.datepreviouslogin'=>'Date', 'u.fk_soc'=>"List:societe:nom:rowid", 'u.fk_member'=>"List:adherent:firstname",
 			'g.nom'=>"Text"
 		);
 		$this->export_entities_array[$r] = array(
 			'u.rowid'=>"user", 'u.login'=>"user", 'u.lastname'=>"user", 'u.firstname'=>"user", 'u.employee'=>'user', 'u.job'=>'user', 'u.gender'=>'user',
-		    'u.accountancy_code'=>'user',
-		    'u.address'=>"user", 'u.zip'=>"user", 'u.town'=>"user",
-		    'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
-		    'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
-		    'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
-		    'u.dateemployment'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
-		    'u.birth'=>'user',
-		    'u.datec'=>"user", 'u.tms'=>"user",
-		    'u.admin'=>"user", 'u.statut'=>'user', 'u.datelastlogin'=>'user', 'u.datepreviouslogin'=>'user',
-		    'u.fk_socpeople'=>"contact", 'u.fk_soc'=>"company", 'u.fk_member'=>"member",
+			'u.accountancy_code'=>'user',
+			'u.address'=>"user", 'u.zip'=>"user", 'u.town'=>"user",
+			'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
+			'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
+			'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
+			'u.dateemployment'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
+			'u.birth'=>'user',
+			'u.datec'=>"user", 'u.tms'=>"user",
+			'u.admin'=>"user", 'u.statut'=>'user', 'u.datelastlogin'=>'user', 'u.datepreviouslogin'=>'user',
+			'u.fk_socpeople'=>"contact", 'u.fk_soc'=>"company", 'u.fk_member'=>"member",
 			'g.nom'=>"Group"
 		);
 		$keyforselect = 'user';

From 55afc59db25c55839a8df10dcdd267d9a763ed60 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 14 Apr 2021 14:33:11 +0200
Subject: [PATCH 035/928] removed useless fetch, moved link to the fetch method
 of the conferenceorbooth class, wip on service to use on the invoice

---
 htdocs/admin/eventorganization.php            | 19 +++++++++++++++++++
 .../class/conferenceorbooth.class.php         | 12 ++++++++++++
 .../conferenceorbooth_card.php                | 12 +-----------
 htdocs/langs/en_US/eventorganization.lang     |  2 ++
 .../attendee_subscription.php                 |  4 ++--
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index b6a964d8617..c76d9a5c188 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -61,6 +61,8 @@ $arrayofparameters = array(
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
 	'EVENTORGANIZATION_SECUREKEY'=>array('type'=>'securekey', 'enabled'=>1),
+    'SERVICE_BOOTH_LOCATION'=>array('type'=>'product', 'enabled'=>1),
+    'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION'=>array('type'=>'product', 'enabled'=>1),
 );
 
 $error = 0;
@@ -276,6 +278,23 @@ if ($action == 'edit') {
                     });';
     			    print '</script>';
     			}
+			} elseif ($var['type'] == 'product') {
+			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+			        print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+			        print '<td>';
+			        $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+			        $form->select_produits($selected, $constname, '', 0);
+			        print '</td>';
+			        print "</tr>\n";
+			    }
+			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+			            print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+			            print '<td>';
+			            $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+			            $form->select_produits($selected, $constname, '', 0);
+			            print '</td>';
+			    }
+			    print "</tr>\n";
 			} else {
 				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
 			}
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 41fe4ebd94d..b859c10a98d 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -237,7 +237,19 @@ class ConferenceOrBooth extends ActionComm
 	 */
 	public function fetch($id, $ref = null, $ref_ext = '', $email_msgid = '')
 	{
+	    global $dolibarr_main_url_root, $dolibarr_main_instance_unique_id, $conf, $langs;
+	    
 		$result = parent::fetch($id, $ref, $ref_ext, $email_msgid);
+		
+		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
+		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$encodedid;
+		
+		$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
+		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
+		
+		$this->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
+		$this->pubregister = $link_subscription;
+		
 		$this->getActionCommFields();
 		return $result;
 	}
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 15b52eda038..fc232406ce9 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -493,18 +493,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
-	global $dolibarr_main_url_root;
-
-	$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
-	$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$encodedid;
-
-	$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
-	$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
-
-	$object->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
-	$object->pubregister = $link_subscription;
 	$keyforbreak='pubregister';
-
+	
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 	//var_dump($object);
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index fbee3de4e3d..3fc655b92e9 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -82,6 +82,8 @@ EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index a47a93557d3..9aa1ca7d2e0 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -299,14 +299,14 @@ if (empty($reshook) && $action == 'add') {
 		        $facture->paye = 0;
 		        //@todo price and taxes to add
 		        $tva = get_default_tva($mysoc, $thirdparty);
-		        
 		        $facture->date = dol_now();
+		        
 		        $resultfacture = $facture->create($user);
 		        if ($resultfacture < 0){
 		            $error++;
 		            $errmsg .= $facture->error;
 		        } else {
-		            $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
+		            // @todo corriger la réf qui est surement celle de la facture au lieu du client
 		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?amount='.$project->price_registration.'&source=conferenceattendeesubscription&ref='.$thirdparty->ref;
 		            Header("Location: ".$redirection);
 		            exit;

From a91a9256a34f8a7d59d5d9cae36ff531d4471941 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Wed, 14 Apr 2021 13:49:26 +0100
Subject: [PATCH 036/928] Fix extrafields in list

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

diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 408b7355ab1..e03ed536806 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -266,7 +266,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
 	}
 }
 // Add fields from hooks

From 4e45011e45bc44f41434d19396fca77b7c413fb6 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Wed, 14 Apr 2021 13:59:38 +0100
Subject: [PATCH 037/928] Manage Partnership for third-party

---
 htdocs/core/modules/modPartnership.class.php  |   4 +-
 htdocs/langs/en_US/partnership.lang           |   1 +
 htdocs/partnership/admin/setup.php            |   4 +-
 .../partnership/class/partnership.class.php   | 154 ++++-
 .../class/partnershiputils.class.php          |   2 +-
 htdocs/partnership/partnership_card.php       |  22 +-
 htdocs/societe/partnership.php                | 614 ++++++++++++++++++
 7 files changed, 743 insertions(+), 58 deletions(-)
 create mode 100644 htdocs/societe/partnership.php

diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index 442e01b56f6..9f8c1437eee 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -180,10 +180,10 @@ class modPartnership extends DolibarrModules
 		$tabtoadd = ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 'member' : 'thirdparty';
 
 		if ($tabtoadd == 'member') {
-			$this->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
+			$this->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/adherents/partnership.php?socid=__ID__');
 			$fk_mainmenu = "members";
 		} else {
-			$this->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
+			$this->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/societe/partnership.php?socid=__ID__');
 			$fk_mainmenu = "companies";
 		}
 
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 63b3bec0bb6..e9fb30d1fd6 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -37,6 +37,7 @@ PartnershipAboutPage = Partnership about page
 #
 # Object
 #
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party	
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
 
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index d55daab2347..6ba689cbd00 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -91,10 +91,10 @@ if ($action == 'setting') {
 
 	$partnership->tabs = array();
 	if ($modulemenu == 'member') {
-		$partnership->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
+		$partnership->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/adherents/partnership.php?socid=__ID__');
 		$fk_mainmenu = "members";
 	} else {
-		$partnership->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
+		$partnership->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/societe/partnership.php?socid=__ID__');
 		$fk_mainmenu = "companies";
 	}
 
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 019d72a6012..6a676bf24e9 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -100,26 +100,7 @@ class Partnership extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1,),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Accept&eacute;', '2'=>'Refus&eacute;', '9'=>'Annul&eacute;'),),
-		'fk_member' => array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>51, 'notnull'=>-1, 'visible'=>1, 'index'=>1,),
-		'date_partnership_start' => array('type'=>'datetime', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
-		'date_partnership_end' => array('type'=>'datetime', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>1, 'visible'=>1,),
-		'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>63, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
-		'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
-	);
+	public $fields=array();
 	public $rowid;
 	public $ref;
 	public $fk_soc;
@@ -188,12 +169,37 @@ class Partnership extends CommonObject
 
 		$this->db = $db;
 
+		$fk_soc_visible 	= ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 0 : 1;
+		$fk_member_visible 	= ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 1 : 0;
+
+		$this->fields=array(
+			'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+			'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
+			'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>$fk_soc_visible, 'index'=>1,),
+			'fk_member' => array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>51, 'notnull'=>-1, 'visible'=>$fk_member_visible, 'index'=>1,),
+			'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+			'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
+			'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
+			'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
+			'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
+			'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
+			'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+			'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
+			'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+			'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
+			'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>0, 'visible'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Accept&eacute;', '2'=>'Refus&eacute;', '9'=>'Annul&eacute;'),),
+			'date_partnership_start' => array('type'=>'date', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
+			'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>1, 'visible'=>1,),
+			'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>63, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
+			'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
+		);
+
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
-			$this->fields['entity']['enabled'] = 0;
-		}
+		// if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		// 	$this->fields['entity']['enabled'] = 0;
+		// }
 
 		// Example to show how to set values of fields definition dynamically
 		/*if ($user->rights->partnership->read) {
@@ -229,6 +235,7 @@ class Partnership extends CommonObject
 	 */
 	public function create(User $user, $notrigger = false)
 	{
+		$this->status = 0;
 		return $this->createCommon($user, $notrigger);
 	}
 
@@ -333,20 +340,97 @@ class Partnership extends CommonObject
 
 	/**
 	 * Load object in memory from the database
+	 * Get object from database. Get also lines.
 	 *
-	 * @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 of object to load
+	 * 	@param		string		$ref					Ref of object
+	 * 	@param 		int 		$fk_soc_or_member  		fk_soc or fk_member
+	 *	@return     int         						>0 if OK, <0 if KO, 0 if not found
 	 */
-	public function fetch($id, $ref = null)
+	public function fetch($id, $ref = null, $fk_soc_or_member = null)
 	{
-		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) {
-			$this->fetchLines();
+		global $conf;
+
+		// Check parameters
+		if (empty($id) && empty($ref) && empty($fk_soc_or_member)) {
+			return -1;
+		}
+
+		$sql = 'SELECT p.rowid, p.ref, p.fk_soc, p.fk_member, p.status';
+		$sql .= ', p.entity, p.date_partnership_start, p.date_partnership_end, p.date_creation';
+		$sql .= ', p.fk_user_creat, p.tms, p.fk_user_modif, p.fk_user_modif';
+		$sql .= ', p.note_private, p.note_public';
+		$sql .= ', p.last_main_doc, p.count_last_url_check_error, p.reason_decline_or_cancel';
+		$sql .= ', p.import_key, p.model_pdf';
+
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'partnership as p';
+
+		if ($id) {
+			$sql .= " WHERE p.rowid=".$id;
+		} else {
+			$sql .= " WHERE p.entity IN (0,".getEntity('partnership').")"; // Dont't use entity if you use rowid
+		}
+
+		if ($ref) {
+			$sql .= " AND p.ref='".$this->db->escape($ref)."'";
+		}
+		
+		if($fk_soc_or_member){
+			$sql .= ' AND';
+			if($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member')
+				$sql .= ' p.fk_member = ';
+			else
+				$sql .= ' p.fk_soc = ';
+			$sql .= $fk_soc_or_member;
+			$sql .= ' ORDER BY p.date_partnership_end DESC';
+		}
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			if ($obj) {
+				$this->id 							= $obj->rowid;
+				$this->entity 						= $obj->entity;
+				$this->rowid 						= $obj->rowid;
+				$this->ref 							= $obj->ref;
+				$this->fk_soc 						= $obj->fk_soc;
+				$this->fk_member 					= $obj->fk_member;
+				$this->status 						= $obj->status;
+				$this->date_partnership_start		= $this->db->jdate($obj->date_partnership_start);
+				$this->date_partnership_end			= $this->db->jdate($obj->date_partnership_end);
+				$this->date_creation 				= $this->db->jdate($obj->date_creation);
+				$this->fk_user_creat 				= $obj->fk_user_creat;
+				$this->tms 							= $obj->tms;
+				$this->fk_user_modif 				= $obj->fk_user_modif;
+				$this->note_private 				= $obj->note_private;
+				$this->note_public 					= $obj->note_public;
+				$this->last_main_doc 				= $obj->last_main_doc;
+				$this->count_last_url_check_error	= $obj->count_last_url_check_error;
+				$this->reason_decline_or_cancel 	= $obj->reason_decline_or_cancel;
+				$this->import_key 					= $obj->import_key;
+				$this->model_pdf 					= $obj->model_pdf;
+
+				$this->lines = array();
+
+				// Retrieve all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
+
+				$this->db->free($result);
+
+				return 1;
+			} else {
+				$this->error = 'Partnership with id '.$id.' not found sql='.$sql;
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
 		}
-		return $result;
 	}
 
+
 	/**
 	 * Load object lines in memory from the database
 	 *
@@ -768,9 +852,9 @@ class Partnership extends CommonObject
 	public function refused($user, $notrigger = '')
 	{
 		// Protection
-		// if ($this->status != self::STATUS_DRAFT) {
-		// 	return 0;
-		// }
+		if ($this->status == self::STATUS_REFUSED) {
+			return 0;
+		}
 
 		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership->write))
 		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership_advance->validate))))
@@ -816,7 +900,7 @@ class Partnership extends CommonObject
 	public function reopen($user, $notrigger = 0)
 	{
 		// Protection
-		if ($this->status != self::STATUS_CANCELED) {
+		if ($this->status != self::STATUS_CANCELED && $this->status != self::STATUS_REFUSED) {
 			return 0;
 		}
 
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 61659e6075c..08c61b3454c 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -35,7 +35,7 @@ dol_include_once('partnership/lib/partnership.lib.php');
 class PartnershipUtils
 {
 	public $db;							//!< To store db handler
-	public $error;							//!< To return error code (or message)
+	public $error;						//!< To return error code (or message)
 	public $errors=array();				//!< To return several error codes (or messages)
 
 
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index dbf889137d8..c44174af52c 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -108,9 +108,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member')
-	unset($object->fields['fk_soc']);
-else unset($object->fields['fk_member']);
+
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha')) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
@@ -581,7 +579,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			// Back to draft
-			if ($object->status == $object::STATUS_ACCEPTED) {
+			if ($object->status != $object::STATUS_DRAFT) {
 				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes', '', $permissiontoadd);
 			}
 
@@ -598,23 +596,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				}
 			}
 
-			// Clone
-			// print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
-
-
-			// if ($permissiontoadd) {
-			// 	if ($object->status == $object::STATUS_ENABLED) {
-			// 		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
-			// 	} else {
-			// 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
-			// 	}
-			// }
-
 			// Cancel
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ACCEPTED) {
 					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes&token='.newToken(), '', $permissiontoadd);
-				} elseif ($object->status == $object::STATUS_CANCELED) {
+				} elseif ($object->status > $object::STATUS_ACCEPTED) {
 					// print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Re-Open").'</a>'."\n";
 					print dolGetButtonAction($langs->trans('Re-Open'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken(), '', $permissiontoadd);
 				}
@@ -622,7 +608,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Refuse
 			if ($permissiontoadd) {
-				if ($object->status != $object::STATUS_CANCELED) {
+				if ($object->status != $object::STATUS_CANCELED && $object->status != $object::STATUS_REFUSED) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse&token='.newToken().'">'.$langs->trans("Refuse").'</a>'."\n";
 				}
 			}
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
new file mode 100644
index 00000000000..2484936f686
--- /dev/null
+++ b/htdocs/societe/partnership.php
@@ -0,0 +1,614 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2021 NextGestion 			<contact@nextgestion.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       partnership_card.php
+ *		\ingroup    partnership
+ *		\brief      Page to create/edit/view partnership
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+dol_include_once('/partnership/class/partnership.class.php');
+dol_include_once('/partnership/lib/partnership.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("companies","partnership@partnership", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'partnershipcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+//$lineid   = GETPOST('lineid', 'int');
+
+// Security check
+$socid = GETPOST('socid', 'int');
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
+
+$societe = new Societe($db);
+if ($socid > 0) {
+	$societe->fetch($socid);
+}
+
+// Initialize technical objects
+$object 		= new Partnership($db);
+$extrafields 	= new ExtraFields($db);
+$diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('partnershipthirdparty', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+}
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+$permissiontoread 		= $user->rights->partnership->read;
+$permissiontoadd 		= $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete 	= $user->rights->partnership->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote 		= $user->rights->partnership->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink 		= $user->rights->partnership->write; // Used by the include of actions_dellink.inc.php
+$usercanclose 			= $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$upload_dir 			= $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+
+if (empty($conf->partnership->enabled)) accessforbidden();
+if (empty($permissiontoread)) accessforbidden();
+if ($action == 'edit' && empty($permissiontoadd)) accessforbidden();
+
+$partnershipid = $object->fetch(0, "", $socid);
+if(empty($action) && empty($partnershipid)){
+	$action = 'create';
+}
+if (($action == 'update' || $action == 'edit') && $object->status != $object::STATUS_DRAFT && !empty($user->socid)) accessforbidden();
+
+if(empty($socid) && $object){
+	$socid = $object->fk_soc;
+}
+/*
+ * 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');
+}
+
+$date_start = dol_mktime(0, 0, 0, GETPOST('date_partnership_startmonth', 'int'), GETPOST('date_partnership_startday', 'int'), GETPOST('date_partnership_startyear', 'int'));
+$date_end = dol_mktime(0, 0, 0, GETPOST('date_partnership_endmonth', 'int'), GETPOST('date_partnership_endday', 'int'), GETPOST('date_partnership_endyear', 'int'));
+
+if (empty($reshook)) {
+	$error = 0;
+
+	$backtopage = dol_buildpath('/partnership/partnership.php', 1).'?socid='.($socid > 0 ? $socid : '__ID__');
+
+	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	if ($action == 'add' && $permissiontoread) {
+		$error = 0;
+
+		$db->begin();
+
+		$now = dol_now();
+
+		if (!$error) {
+			$old_start_date = $object->date_partnership_start;
+
+			$object->fk_soc           			= $socid;
+			$object->date_partnership_start   	= (!GETPOST('date_partnership_start')) ? '' : $date_start;
+			$object->date_partnership_end     	= (!GETPOST('date_partnership_end')) ? '' : $date_end;
+			$object->date_creation 				= $now;
+			$object->fk_user_creat 				= $user->id;
+			$object->entity 					= $conf->entity;
+
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			$result = $object->create($user);
+			if ($result < 0) {
+				$error++;
+				if ($result == -4) {
+					setEventMessages($langs->trans("ErrorRefAlreadyExists"), null, 'errors');
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		}
+
+		if ($error) {
+			$db->rollback();
+			$action = 'edit';
+		} else {
+			$db->commit();
+		}
+	} elseif ($action == 'update' && $permissiontoread) {
+		$error = 0;
+
+		$db->begin();
+
+		$now = dol_now();
+
+		if (!$error) {
+			$object->oldcopy = clone $object;
+
+			$old_start_date = $object->date_partnership_start;
+
+			$object->date_partnership_start   	= (!GETPOST('date_partnership_start')) ? '' : $date_start;
+			$object->date_partnership_end     	= (!GETPOST('date_partnership_end')) ? '' : $date_end;
+			$object->fk_user_creat 				= $user->id;
+			$object->fk_user_modif 				= $user->id;
+
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			$result = $object->update($user);
+			if ($result < 0) {
+				$error++;
+				if ($result == -4) {
+					setEventMessages($langs->trans("ErrorRefAlreadyExists"), null, 'errors');
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		}
+
+		if ($error) {
+			$db->rollback();
+			$action = 'edit';
+		} else {
+			$db->commit();
+		}
+	} elseif ($action == 'confirm_close' || $action == 'update_extras') {
+		include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+		header("Location: ".$_SERVER['PHP_SELF']."?socid=".$socid);
+		exit;
+	}
+	
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+
+	// // Actions to send emails
+	// $triggersendname = 'PARTNERSHIP_SENTBYMAIL';
+	// $autocopy = 'MAIN_MAIL_AUTOCOPY_PARTNERSHIP_TO';
+	// $trackid = 'partnership'.$object->id;
+	// include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+}
+
+
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
+
+$title = $langs->trans("Partnership");
+llxHeader('', $title);
+
+$form = new Form($db);
+
+if ($socid) {
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+
+	$langs->load("companies");
+
+	$societe = new Societe($db);
+	$result = $societe->fetch($socid);
+
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
+	$head = societe_prepare_head($societe);
+
+	print dol_get_fiche_head($head, 'partnership', $langs->trans("ThirdParty"), -1, 'company');
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($societe, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
+
+	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$societe->prefix_comm.'</td></tr>';
+	}
+
+	if ($societe->client) {
+		print '<tr><td class="titlefield">';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print showValueWithClipboardCPButton(dol_escape_htmltag($societe->code_client));
+		$tmpcheck = $societe->check_codeclient();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
+		print '</td></tr>';
+	}
+
+	if ($societe->fournisseur) {
+		print '<tr><td class="titlefield">';
+		print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		print showValueWithClipboardCPButton(dol_escape_htmltag($societe->code_fournisseur));
+		$tmpcheck = $societe->check_codefournisseur();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		}
+		print '</td></tr>';
+	}
+
+	print '</table>';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+	$params = '';
+
+	$newcardbutton .= dolGetButtonTitle($langs->trans("NewProject"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$societe->id.'&amp;backtopage='.urlencode($backtopage), '', 1, $params);
+
+	print '<br>';
+	
+} else {
+	dol_print_error('', 'Parameter socid not defined');
+}
+
+$object->fields['fk_soc']['visible'] = 0;
+
+// Part to create
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Partnership")), '', '');
+
+	$backtopageforcancel = DOL_URL_ROOT.'/partnership/partnership.php?socid='.$socid;
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="socid" value="'.$socid.'">';
+	print '<input type="hidden" name="fk_soc" value="'.$socid.'">';
+
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
+
+	print dol_get_fiche_head(array(), '');
+
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>'."\n";
+
+	print dol_get_fiche_end();
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Validate")).'">';
+	print '&nbsp; ';
+	// print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '</div>';
+
+	print '</form>';
+}
+
+// Part to edit record
+if (($partnershipid || $ref) && $action == 'edit') {
+	print load_fiche_titre($langs->trans("Partnership"), '', '');
+
+	$backtopageforcancel = DOL_URL_ROOT.'/partnership/partnership.php?socid='.$socid;
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="socid" value="'.$socid.'">';
+	print '<input type="hidden" name="fk_soc" value="'.$socid.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
+
+	print dol_get_fiche_head();
+
+	print '<table class="border centpercent tableforfieldedit">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
+
+	print '</table>';
+
+	print dol_get_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+
+
+	print load_fiche_titre($langs->trans("PartnershipDedicatedToThisThirdParty", $langs->transnoentitiesnoconv("Partnership")), '', '');
+
+	$res = $object->fetch_optionals();
+
+	// $head = partnershipPrepareHead($object);
+	// print dol_get_fiche_head($head, 'card', $langs->trans("Partnership"), -1, $object->picto);
+
+	$linkback = '';
+	dol_banner_tab($object, 'id', $linkback, 0, 'rowid', 'ref');
+
+	$formconfirm = '';
+
+	// Close confirmation
+	if ($action == 'close') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClose'), $langs->trans('ConfirmCloseAsk', $object->ref), 'confirm_close', $formquestion, 'yes', 1);
+	}
+	// Reopon confirmation
+	if ($action == 'reopen') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToReopon'), $langs->trans('ConfirmReoponAsk', $object->ref), 'confirm_reopen', $formquestion, 'yes', 1);
+	}
+
+	// Refuse confirmatio
+	if ($action == 'refuse') {
+		//Form to close proposal (signed or not)
+		$formquestion = array(
+			array('type' => 'text', 'name' => 'reason_decline_or_cancel', 'label' => $langs->trans("Note"), 'morecss' => 'reason_decline_or_cancel', 'value' => '')				// Field to complete private note (not replace)
+		);
+
+		// if (!empty($conf->notification->enabled)) {
+		// 	require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
+		// 	$notify = new Notify($db);
+		// 	$formquestion = array_merge($formquestion, array(
+		// 		array('type' => 'onecolumn', 'value' => $notify->confirmMessage('PROPAL_CLOSE_SIGNED', $object->socid, $object)),
+		// 	));
+		// }
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReasonDecline'), $text, 'confirm_refuse', $formquestion, '', 1, 250);
+	}
+
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
+
+	// Print form confirm
+	print $formconfirm;
+
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/partnership/partnership_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">'."\n";
+
+	// Common attributes
+	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
+	//unset($object->fields['fk_project']);				// Hide field already shown in banner
+	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	print '</table>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+	// Buttons for actions
+
+	if ($action != 'presend') {
+		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 ($object->status == $object::STATUS_DRAFT) {
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?socid='.$socid.'&action=edit', '', $permissiontoadd);
+			}
+
+			// Cancel
+			if ($permissiontoadd) {
+				if ($object->status == $object::STATUS_ACCEPTED) {
+					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
+				}
+			}
+		}
+		print '</div>'."\n";
+	}
+
+
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	// if ($action != 'presend') {
+	// 	print '<div class="fichecenter"><div class="fichehalfleft">';
+	// 	print '<a name="builddoc"></a>'; // ancre
+
+	// 	$includedocgeneration = 0;
+
+	// 	// Documents
+	// 	if ($includedocgeneration) {
+	// 		$objref = dol_sanitizeFileName($object->ref);
+	// 		$relativepath = $objref.'/'.$objref.'.pdf';
+	// 		$filedir = $conf->partnership->dir_output.'/'.$object->element.'/'.$objref;
+	// 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+	// 		$genallowed = $user->rights->partnership->read; // If you can read, you can build the PDF to read content
+	// 		$delallowed = $user->rights->partnership->write; // If you can create/edit, you can remove a file on card
+	// 		print $formfile->showdocuments('partnership:Partnership', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+	// 	}
+
+	// 	// Show links to link elements
+	// 	$linktoelem = $form->showLinkToObjectBlock($object, null, array('partnership'));
+	// 	$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+	// 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+	// 	$MAXEVENT = 10;
+
+	// 	$morehtmlright = '<a href="'.dol_buildpath('/partnership/partnership_agenda.php', 1).'?id='.$object->id.'">';
+	// 	$morehtmlright .= $langs->trans("SeeAll");
+	// 	$morehtmlright .= '</a>';
+
+	// 	// List of actions on element
+	// 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	// 	$formactions = new FormActions($db);
+	// 	$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+
+	// 	print '</div></div></div>';
+	// }
+
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	// Presend form
+	$modelmail = 'partnership';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->partnership->dir_output;
+	$trackid = 'partnership'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();

From 6238ff0321db496a52195fbc2e052f6647876d8b Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 14 Apr 2021 15:52:46 +0200
Subject: [PATCH 038/928] wip on asking for the company name only if price is
 set

---
 .../eventorganization/attendee_subscription.php    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 3d1ee6272cc..a18912da4ef 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -81,6 +81,9 @@ $email = GETPOST("email");
 $encodedid = GETPOST('id');
 $id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
 
+$project = new Project($db);
+
+
 // Getting 'securekey'.'id' from Post and decoding it
 $encodedsecurekeyandid = GETPOST('securekey', 'alpha');
 $securekeyandid = dol_decode($encodedsecurekeyandid, $dolibarr_main_instance_unique_id);
@@ -193,10 +196,11 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
 	}
-	/*if (!GETPOST("societe")) {
+	// If the price has been set, name is required for the invoice
+	if (!GETPOST("societe") && !empty(floatval($project->price_registration))) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Societe"))."<br>\n";
-	}*/
+	}
 	if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
 		$error++;
 		$langs->load("errors");
@@ -350,7 +354,11 @@ print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."
 // Email
 print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
+if(!empty(floatval($project->price_registration))){
+    print '<FONT COLOR="red">*</FONT>';
+}
+print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
 print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";

From 2f3f2509b29b3c85f5d91d7f390bcff4b3994787 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 14 Apr 2021 15:54:21 +0200
Subject: [PATCH 039/928] wip on asking for the company name only if price is
 set v2

---
 .../eventorganization/attendee_subscription.php      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index a18912da4ef..e40ad552b5c 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -81,8 +81,18 @@ $email = GETPOST("email");
 $encodedid = GETPOST('id');
 $id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
 
-$project = new Project($db);
+$conference = new ConferenceOrBooth($db);
+$resultconf = $conference->fetch($id);
+if ($resultconf < 0) {
+    setEventMessages(null, $object->errors, "errors");
+}
 
+$project = new Project($db);
+$resultproject = $project->fetch($conference->fk_project);
+if ($resultproject < 0){
+    $error++;
+    $errmsg .= $project->error;
+}
 
 // Getting 'securekey'.'id' from Post and decoding it
 $encodedsecurekeyandid = GETPOST('securekey', 'alpha');

From 3d5e439d9253fd5e28115922a3af039e19165dcd Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 14 Apr 2021 15:55:59 +0200
Subject: [PATCH 040/928] company name is now required if price is set

---
 htdocs/public/eventorganization/attendee_subscription.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index e40ad552b5c..3084de3f416 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -66,6 +66,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 // Init vars

From a596424328dd79f0312a675ee82820a5187c3c41 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 14 Apr 2021 16:01:48 +0200
Subject: [PATCH 041/928] FIX : Rebuild sequence for postgres only after query
 "INSERT INTO llx_salary(rowid

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

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 3f17d23b51f..27f3f08ae15 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -423,4 +423,7 @@ ALTER TABLE llx_facture_fourn ADD COLUMN date_closing datetime DEFAULT NULL afte
 
 ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_closing integer DEFAULT NULL after fk_user_valid;
 
-ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity; -- project associated to warehouse if any
\ No newline at end of file
+ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity; -- project associated to warehouse if any
+
+-- Rebuild sequence for postgres only after query "INSERT INTO llx_salary(rowid, ..."
+-- VPGSQL8.2 SELECT dol_util_rebuild_sequences();

From 6f0f527a890458f2c50664e71b5b5885c3fda4c5 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 14 Apr 2021 14:04:33 +0000
Subject: [PATCH 042/928] Fixing style errors.

---
 .../eventorganization/attendee_subscription.php      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 3084de3f416..d3f9e6f06bd 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -85,14 +85,14 @@ $id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
 $conference = new ConferenceOrBooth($db);
 $resultconf = $conference->fetch($id);
 if ($resultconf < 0) {
-    setEventMessages(null, $object->errors, "errors");
+	setEventMessages(null, $object->errors, "errors");
 }
 
 $project = new Project($db);
 $resultproject = $project->fetch($conference->fk_project);
-if ($resultproject < 0){
-    $error++;
-    $errmsg .= $project->error;
+if ($resultproject < 0) {
+	$error++;
+	$errmsg .= $project->error;
 }
 
 // Getting 'securekey'.'id' from Post and decoding it
@@ -366,8 +366,8 @@ print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."
 print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
-if(!empty(floatval($project->price_registration))){
-    print '<FONT COLOR="red">*</FONT>';
+if (!empty(floatval($project->price_registration))) {
+	print '<FONT COLOR="red">*</FONT>';
 }
 print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address

From 9b668959458171d1de5493c0a8be81edc9eb050f Mon Sep 17 00:00:00 2001
From: Givriz <damien375@outlook.fr>
Date: Wed, 14 Apr 2021 16:06:53 +0200
Subject: [PATCH 043/928] Update mails_templates.php

---
 htdocs/admin/mails_templates.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 73ebcc1d4be..86f1cc00063 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -55,6 +55,7 @@ if (!empty($conf->eventorganization->enabled)) {
 $langs->loadLangs($langsArray);
 
 $action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
+$massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
 
 $id = GETPOST('id', 'int');
@@ -254,7 +255,7 @@ if (GETPOST('cancel', 'alpha')) {
 	$action = 'list';
 	$massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && !empty($massaction) && $massaction != 'presend' && $massaction != 'confirm_presend') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 

From 4d643db4e6772dec06ad6c46d8f93c0864ff0e20 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 14 Apr 2021 16:14:03 +0200
Subject: [PATCH 044/928] FIX : travis

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 27f3f08ae15..c2489042f5f 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -425,5 +425,5 @@ ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_closing integer DEFAULT NULL af
 
 ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity; -- project associated to warehouse if any
 
--- Rebuild sequence for postgres only after query "INSERT INTO llx_salary(rowid, ..."
+-- Rebuild sequence for postgres only after query INSERT INTO llx_salary(rowid, ...
 -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();

From 4700fd467f43ab20aa76f7bd2c7aad5d8f4c3e9b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 14 Apr 2021 14:14:39 +0000
Subject: [PATCH 045/928] Fixing style errors.

---
 htdocs/partnership/class/partnership.class.php |  9 ++++-----
 htdocs/societe/partnership.php                 | 10 +++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 6a676bf24e9..395a3893b7d 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -374,13 +374,12 @@ class Partnership extends CommonObject
 		if ($ref) {
 			$sql .= " AND p.ref='".$this->db->escape($ref)."'";
 		}
-		
-		if($fk_soc_or_member){
+
+		if ($fk_soc_or_member) {
 			$sql .= ' AND';
-			if($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member')
+			if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member')
 				$sql .= ' p.fk_member = ';
-			else
-				$sql .= ' p.fk_soc = ';
+			else $sql .= ' p.fk_soc = ';
 			$sql .= $fk_soc_or_member;
 			$sql .= ' ORDER BY p.date_partnership_end DESC';
 		}
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index 2484936f686..2576c2348c5 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -144,12 +144,12 @@ if (empty($permissiontoread)) accessforbidden();
 if ($action == 'edit' && empty($permissiontoadd)) accessforbidden();
 
 $partnershipid = $object->fetch(0, "", $socid);
-if(empty($action) && empty($partnershipid)){
+if (empty($action) && empty($partnershipid)) {
 	$action = 'create';
 }
 if (($action == 'update' || $action == 'edit') && $object->status != $object::STATUS_DRAFT && !empty($user->socid)) accessforbidden();
 
-if(empty($socid) && $object){
+if (empty($socid) && $object) {
 	$socid = $object->fk_soc;
 }
 /*
@@ -262,7 +262,7 @@ if (empty($reshook)) {
 		header("Location: ".$_SERVER['PHP_SELF']."?socid=".$socid);
 		exit;
 	}
-	
+
 	// Actions when linking object each other
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
@@ -352,7 +352,6 @@ if ($socid) {
 	$newcardbutton .= dolGetButtonTitle($langs->trans("NewProject"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$societe->id.'&amp;backtopage='.urlencode($backtopage), '', 1, $params);
 
 	print '<br>';
-	
 } else {
 	dol_print_error('', 'Parameter socid not defined');
 }
@@ -442,8 +441,6 @@ if (($partnershipid || $ref) && $action == 'edit') {
 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
-
-
 	print load_fiche_titre($langs->trans("PartnershipDedicatedToThisThirdParty", $langs->transnoentitiesnoconv("Partnership")), '', '');
 
 	$res = $object->fetch_optionals();
@@ -536,7 +533,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		if (empty($reshook)) {
-
 			if ($object->status == $object::STATUS_DRAFT) {
 				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?socid='.$socid.'&action=edit', '', $permissiontoadd);
 			}

From caf74fe1cb3452c93146ac8a00a89786afaededd Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 14 Apr 2021 16:20:05 +0200
Subject: [PATCH 046/928] pull problem corrected

---
 .../attendee_subscription.php                 | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index faff3d40712..cdb848ed28c 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -293,6 +293,33 @@ if (empty($reshook) && $action == 'add') {
 
 	if (!$error) {
 		$db->commit();
+	    global $dolibarr_main_url_root;
+	    if (!empty(floatval($project->price_registration))){
+	        $facture = new Facture($db);
+	        $facture->type = 0;
+	        $facture->socid = $thirdparty->id;
+	        $facture->paye = 0;
+	        //@todo price and taxes to add
+	        $tva = get_default_tva($mysoc, $thirdparty);
+	        $facture->date = dol_now();
+	        $resultfacture = $facture->create($user); 
+	        if ($resultfacture < 0){
+                $error++;
+	            $errmsg .= $facture->error;
+	        } else {
+	            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
+	            Header("Location: ".$redirection);
+	            exit;
+	        }
+
+	    } else {
+	        // No price has been set
+	        // Validating the subscription
+	        $confattendee->setStatut(1);
+	        $redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
+	        Header("Location: ".$redirection);
+	        exit;
+		}
 		//Header("Location: ".$urlback);
 		//exit;
 	} else {

From 03a944edf5fdab56c91362f10ec859af9f6acf7f Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Wed, 14 Apr 2021 16:32:23 +0100
Subject: [PATCH 047/928] Manage membership expiration

---
 htdocs/partnership/partnership_list.php | 89 +++++++++++++++++++++++--
 htdocs/societe/partnership.php          |  4 +-
 2 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index e03ed536806..e1820d7c8c9 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -77,6 +77,7 @@ if (!$res) {
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 // load partnership libraries
 require_once __DIR__.'/class/partnership.class.php';
@@ -112,8 +113,9 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 // Initialize technical objects
-$object = new Partnership($db);
-$extrafields = new ExtraFields($db);
+$object 		= new Partnership($db);
+$extrafields 	= new ExtraFields($db);
+$adherent 		= new Adherent($db);
 $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('partnershiplist')); // Note that conf->hooks_modules contains array
 
@@ -123,9 +125,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member')
-	unset($object->fields['fk_soc']);
-else unset($object->fields['fk_member']);
+$managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
+
+if($managedfor != 'member' && $sortfield == 'd.datefin') $sortfield = '';
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
@@ -148,6 +150,11 @@ foreach ($object->fields as $key => $val) {
 		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
 	}
 }
+$search_filter = GETPOST("search_filter", 'alpha');
+$filter = GETPOST("filter", 'alpha');
+if ($filter) {
+	$search_filter = $filter; // For backward compatibility
+}
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
@@ -229,6 +236,7 @@ if (empty($reshook)) {
 		}
 		$toselect = '';
 		$search_array_options = array();
+		$search_filter = "";
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
 		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
@@ -263,6 +271,9 @@ $morecss = array();
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 $sql .= $object->getFieldList('t');
+if ($managedfor == 'member'){
+	$sql .= ', d.datefin, d.fk_adherent_type, dty.subscription';
+}
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -278,6 +289,10 @@ $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
+if ($managedfor == 'member'){
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d on (d.rowid = t.fk_member)";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as dty on (dty.rowid = d.fk_adherent_type)";
+}
 // Add table from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -287,6 +302,10 @@ if ($object->ismultientitymanaged == 1) {
 } else {
 	$sql .= " WHERE 1 = 1";
 }
+if ($managedfor == 'member')
+	$sql .= " AND fk_member > 0";
+else 
+	$sql .= " AND fk_soc > 0";
 foreach ($search as $key => $val) {
 	if (array_key_exists($key, $object->fields)) {
 		if ($key == 'status' && $search[$key] == -1) {
@@ -316,6 +335,17 @@ foreach ($search as $key => $val) {
 		}
 	}
 }
+if ($managedfor == 'member'){
+	if ($search_filter == 'withoutsubscription') {
+		$sql .= " AND (d.datefin IS NULL OR dty.subscription = 0)";
+	}
+	if ($search_filter == 'uptodate') {
+		$sql .= " AND (d.datefin >= '".$db->idate($now)."' OR dty.subscription = 0)";
+	}
+	if ($search_filter == 'outofdate') {
+		$sql .= " AND (d.datefin < '".$db->idate($now)."' AND dty.subscription = 1)";
+	}
+}
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
@@ -422,6 +452,9 @@ foreach ($search as $key => $val) {
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
+if ($search_filter && $search_filter != '-1') {
+	$param .= "&search_filter=".urlencode($search_filter);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // Add $param from hooks
@@ -500,6 +533,12 @@ print '<div class="div-table-responsive">'; // You can use div-table-responsive-
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
+if ($managedfor == 'member'){
+	$arrayfields['t.fk_member']['checked'] = 1;
+}
+else {
+	$arrayfields['t.fk_soc']['checked'] = 1;
+}
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
@@ -533,6 +572,13 @@ foreach ($object->fields as $key => $val) {
 		print '</td>';
 	}
 }
+// End of subscription date
+if ($managedfor == 'member'){
+	print '<td class="liste_titre center">';
+	$selectarray = array('-1'=>'', 'withoutsubscription'=>$langs->trans("WithoutSubscription"), 'uptodate'=>$langs->trans("UpToDate"), 'outofdate'=>$langs->trans("OutOfDate"));
+	print $form->selectarray('search_filter', $selectarray, $search_filter);
+	print '</td>';
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
@@ -566,6 +612,12 @@ foreach ($object->fields as $key => $val) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 	}
 }
+// End of subscription date
+if ($managedfor == 'member'){
+	$key = 'datefin';
+	$cssforfield = 'center';
+	print getTitleFieldOfList('SubscriptionEndDate', 0, $_SERVER['PHP_SELF'], 'd.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
@@ -641,6 +693,33 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			}
 		}
 	}
+	// End of subscription date
+	if ($managedfor == 'member'){
+		print '<td class="nowrap center">';
+		$result = $adherent->fetch($object->fk_member);
+		if($result){
+			$datefin = $adherent->datefin;
+			if ($datefin) {
+				print dol_print_date($datefin, 'day');
+				if ($adherent->hasDelay()) {
+					$textlate .= ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24).' '.$langs->trans("days").')';
+					print " ".img_warning($langs->trans("SubscriptionLate").$textlate);
+				}
+				print '</td>';
+			} else {
+				print '<td class="nowrap left">';
+				if ($adherent->subscription == 'yes') {
+					print $langs->trans("SubscriptionNotReceived");
+					if ($adherent->statut > 0) {
+						print " ".img_warning();
+					}
+				} else {
+					print '&nbsp;';
+				}
+			}
+		}
+		print '</td>';
+	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index 2576c2348c5..90071846531 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -139,6 +139,7 @@ $usercanclose 			= $user->rights->partnership->write; // Used by the include of
 $upload_dir 			= $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
+if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') accessforbidden();
 if (empty($conf->partnership->enabled)) accessforbidden();
 if (empty($permissiontoread)) accessforbidden();
 if ($action == 'edit' && empty($permissiontoadd)) accessforbidden();
@@ -283,7 +284,6 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-$formproject = new FormProjets($db);
 
 $title = $langs->trans("Partnership");
 llxHeader('', $title);
@@ -349,8 +349,6 @@ if ($socid) {
 
 	$params = '';
 
-	$newcardbutton .= dolGetButtonTitle($langs->trans("NewProject"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$societe->id.'&amp;backtopage='.urlencode($backtopage), '', 1, $params);
-
 	print '<br>';
 } else {
 	dol_print_error('', 'Parameter socid not defined');

From 5d404836f751afedda3906137b7a571af74f6448 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 14 Apr 2021 16:35:19 +0000
Subject: [PATCH 048/928] Fixing style errors.

---
 htdocs/partnership/partnership_list.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index e1820d7c8c9..8cd0cf79fd7 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -127,7 +127,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 $managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
 
-if($managedfor != 'member' && $sortfield == 'd.datefin') $sortfield = '';
+if ($managedfor != 'member' && $sortfield == 'd.datefin') $sortfield = '';
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
@@ -271,7 +271,7 @@ $morecss = array();
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 $sql .= $object->getFieldList('t');
-if ($managedfor == 'member'){
+if ($managedfor == 'member') {
 	$sql .= ', d.datefin, d.fk_adherent_type, dty.subscription';
 }
 // Add fields from extrafields
@@ -289,7 +289,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
-if ($managedfor == 'member'){
+if ($managedfor == 'member') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d on (d.rowid = t.fk_member)";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as dty on (dty.rowid = d.fk_adherent_type)";
 }
@@ -304,8 +304,7 @@ if ($object->ismultientitymanaged == 1) {
 }
 if ($managedfor == 'member')
 	$sql .= " AND fk_member > 0";
-else 
-	$sql .= " AND fk_soc > 0";
+else $sql .= " AND fk_soc > 0";
 foreach ($search as $key => $val) {
 	if (array_key_exists($key, $object->fields)) {
 		if ($key == 'status' && $search[$key] == -1) {
@@ -335,7 +334,7 @@ foreach ($search as $key => $val) {
 		}
 	}
 }
-if ($managedfor == 'member'){
+if ($managedfor == 'member') {
 	if ($search_filter == 'withoutsubscription') {
 		$sql .= " AND (d.datefin IS NULL OR dty.subscription = 0)";
 	}
@@ -533,10 +532,9 @@ print '<div class="div-table-responsive">'; // You can use div-table-responsive-
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
-if ($managedfor == 'member'){
+if ($managedfor == 'member') {
 	$arrayfields['t.fk_member']['checked'] = 1;
-}
-else {
+} else {
 	$arrayfields['t.fk_soc']['checked'] = 1;
 }
 // Fields title search
@@ -573,7 +571,7 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 // End of subscription date
-if ($managedfor == 'member'){
+if ($managedfor == 'member') {
 	print '<td class="liste_titre center">';
 	$selectarray = array('-1'=>'', 'withoutsubscription'=>$langs->trans("WithoutSubscription"), 'uptodate'=>$langs->trans("UpToDate"), 'outofdate'=>$langs->trans("OutOfDate"));
 	print $form->selectarray('search_filter', $selectarray, $search_filter);
@@ -613,7 +611,7 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 // End of subscription date
-if ($managedfor == 'member'){
+if ($managedfor == 'member') {
 	$key = 'datefin';
 	$cssforfield = 'center';
 	print getTitleFieldOfList('SubscriptionEndDate', 0, $_SERVER['PHP_SELF'], 'd.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
@@ -694,10 +692,10 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		}
 	}
 	// End of subscription date
-	if ($managedfor == 'member'){
+	if ($managedfor == 'member') {
 		print '<td class="nowrap center">';
 		$result = $adherent->fetch($object->fk_member);
-		if($result){
+		if ($result) {
 			$datefin = $adherent->datefin;
 			if ($datefin) {
 				print dol_print_date($datefin, 'day');

From 9ca67b81f8b5856e7ae13a97deb96dc98e716ded Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 14 Apr 2021 18:49:21 +0200
Subject: [PATCH 049/928] FIX : correction migration queries for postgres

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index c2489042f5f..ead63c44675 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -273,15 +273,15 @@ create table llx_salary
   fk_user_modif   integer                     -- user making last change
 ) ENGINE=innodb;
 
-ALTER TABLE llx_payment_salary CHANGE COLUMN fk_user fk_user integer NULL;
+-- VMYSQL4.1 ALTER TABLE llx_payment_salary CHANGE COLUMN fk_user fk_user integer NULL;
+-- VPGSQL8.2 ALTER TABLE llx_payment_salary ALTER COLUMN fk_user DROP NOT NULL;
 ALTER TABLE llx_payment_salary ADD COLUMN fk_salary integer;
 
 INSERT INTO llx_salary (rowid, ref, fk_user, amount, fk_projet, fk_typepayment, label, datesp, dateep, entity, note, fk_bank, paye) SELECT ps.rowid, ps.rowid, ps.fk_user, ps.amount, ps.fk_projet, ps.fk_typepayment, ps.label, ps.datesp, ps.dateep, ps.entity, ps.note, ps.fk_bank, 1 FROM llx_payment_salary ps WHERE ps.fk_salary IS NULL;
 UPDATE llx_payment_salary SET fk_salary = rowid WHERE fk_salary IS NULL;
 UPDATE llx_payment_salary SET ref = rowid WHERE ref IS NULL;
 
-ALTER TABLE llx_salary CHANGE paye paye smallint default 0 NOT NULL;
-
+ALTER TABLE llx_salary ALTER COLUMN paye set default 0;
 
 DELETE FROM llx_boxes WHERE box_id IN (SELECT rowid FROM llx_boxes_def WHERE file IN ('box_graph_ticket_by_severity', 'box_ticket_by_severity.php', 'box_nb_ticket_last_x_days.php', 'box_nb_tickets_type.php', 'box_new_vs_close_ticket.php'));
 DELETE FROM llx_boxes_def WHERE file IN ('box_graph_ticket_by_severity', 'box_ticket_by_severity.php', 'box_nb_ticket_last_x_days.php', 'box_nb_tickets_type.php', 'box_new_vs_close_ticket.php');

From 377c73036381d27b3197a0c5615724fe37d59397 Mon Sep 17 00:00:00 2001
From: Pierre Payet <pierre.p@synergies-france.fr>
Date: Wed, 14 Apr 2021 21:27:53 +0200
Subject: [PATCH 050/928] add missing group by hook in fichinter list

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

diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index d054f5e5bcc..b142613f051 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -259,6 +259,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
+// Add GroupBy from hooks
+$parameters = array('all' => $all, 'fieldstosearchall' => $fieldstosearchall);
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records

From 140f098c79263e505f28f084799ce7a2e5c721c2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 14 Apr 2021 23:16:30 +0200
Subject: [PATCH 051/928] NEW: Add constant MAIN_BUGTRACK_URL to add
 possibility to redirect to other service

---
 htdocs/admin/ihm.php                             |  6 +++---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql |  4 +++-
 htdocs/langs/en_US/admin.lang                    |  2 +-
 htdocs/main.inc.php                              | 15 +++++++++------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 8b799c9c7de..8c504426195 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -211,11 +211,12 @@ if ($action == 'update') {
 	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", GETPOST("MAIN_DEFAULT_WORKING_DAYS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", GETPOST("MAIN_DEFAULT_WORKING_HOURS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
+	dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK", GETPOST("MAIN_BUGTRACK_ENABLELINK", 'alpha'), 'chaine', 0, '', $conf->entity);
+
 	dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", GETPOST("MAIN_FIRSTNAME_NAME_POSITION", 'aZ09'), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr(GETPOST("main_motd", 'restricthtml')), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr(GETPOST("main_home", 'restricthtml')), 'chaine', 0, '', $conf->entity);
-	//dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK", GETPOST('MAIN_BUGTRACK_ENABLELINK', 'aZ09'), 'chaine', 0, '', $conf->entity);
 	//dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", GETPOST("MAIN_HELP_DISABLELINK", 'aZ09'), 'chaine', 0, '', 0); // Param for all entities
 
 	$varforimage = 'imagebackground'; $dirforimage = $conf->mycompany->dir_output.'/logos/';
@@ -401,8 +402,7 @@ print '</tr>';
 
 // Show bugtrack link
 print '<tr class="oddeven"><td>'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
-print ajax_constantonoff("MAIN_BUGTRACK_ENABLELINK", array(), $conf->entity, 0, 0, 1, 0);
-//print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK', $conf->global->MAIN_BUGTRACK_ENABLELINK, 1);
+print '<input type="text" name="MAIN_BUGTRACK_ENABLELINK" size="32" value="'.(isset($conf->global->MAIN_BUGTRACK_ENABLELINK) ? $conf->global->MAIN_BUGTRACK_ENABLELINK : '').'">';
 print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 3f17d23b51f..df64b9915bf 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -423,4 +423,6 @@ ALTER TABLE llx_facture_fourn ADD COLUMN date_closing datetime DEFAULT NULL afte
 
 ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_closing integer DEFAULT NULL after fk_user_valid;
 
-ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity; -- project associated to warehouse if any
\ No newline at end of file
+ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity; -- project associated to warehouse if any
+
+UPDATE llx_const SET value = 'github' WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d52bfb0a6ee..6862a8b0384 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1159,7 +1159,7 @@ 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>"
+ShowBugTrackLink=Define link "<strong>%s</strong> (empty to not display the link / 'github' for the link to the Dolibarr project)
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 3032fc33170..0e13a072a39 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2743,9 +2743,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-			if (!empty($conf->global->MAIN_BUGTRACK_URL)) {
-				$bugbaseurl = $conf->global->MAIN_BUGTRACK_URL;
-			} else {
+			if ($conf->global->MAIN_BUGTRACK_ENABLELINK == 'github') {
 				$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';
 				$bugbaseurl .= '&title=';
 				$bugbaseurl .= urlencode("Bug: ");
@@ -2777,10 +2775,17 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 				$bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
 				$bugbaseurl .= urlencode("[*Files*]\n");
 				$bugbaseurl .= urlencode("\n");
+
+				$bugbaseurl .= urlencode("\n");
+				$bugbaseurl .= urlencode("## Report\n");
+			} elseif (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) {
+				$bugbaseurl = $conf->global->MAIN_BUGTRACK_ENABLELINK;
+			} else {
+				$bugbaseurl = "";
 			}
 
 			// Execute hook printBugtrackInfo
-			$parameters = array('bugbaseurl'=>$bugbaseurl);
+			$parameters = array('bugbaseurl' => $bugbaseurl);
 			$reshook = $hookmanager->executeHooks('printBugtrackInfo', $parameters); // Note that $action and $object may have been modified by some hooks
 			if (empty($reshook)) {
 				$bugbaseurl .= $hookmanager->resPrint;
@@ -2788,8 +2793,6 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 				$bugbaseurl = $hookmanager->resPrint;
 			}
 
-			$bugbaseurl .= urlencode("\n");
-			$bugbaseurl .= urlencode("## Report\n");
 			print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
 			print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
 			print '</div>';

From 957968eea2df7a92d01996d07c4e3a54b8fbfc45 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 14 Apr 2021 23:17:26 +0200
Subject: [PATCH 052/928] typo

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6862a8b0384..252067ee538 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1159,7 +1159,7 @@ DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Define link "<strong>%s</strong> (empty to not display the link / 'github' for the link to the Dolibarr project)
+ShowBugTrackLink=Define link "<strong>%s</strong>" (empty to not display the link / 'github' for the link to the Dolibarr project)
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.

From b2a1b0673682e4f752992840fc477aadd1d02b8c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 14 Apr 2021 23:19:10 +0200
Subject: [PATCH 053/928] text

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 252067ee538..553a011514c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1159,7 +1159,7 @@ DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Define link "<strong>%s</strong>" (empty to not display the link / 'github' for the link to the Dolibarr project)
+ShowBugTrackLink=Define link "<strong>%s</strong>" (empty to not display the link, 'github' for the link to the Dolibarr project of define an url)
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.

From 1be8bfe5c01fd9bda4948ac0f1c74d5e884c3e2e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 15 Apr 2021 06:08:41 +0200
Subject: [PATCH 054/928] Text

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 553a011514c..d1596ded0d3 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1159,7 +1159,7 @@ DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Define link "<strong>%s</strong>" (empty to not display the link, 'github' for the link to the Dolibarr project of define an url)
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.

From dd7c09582fdc7b19bdaac710e765f9e1f4cf39e2 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 10:45:44 +0200
Subject: [PATCH 055/928] payment page structure ok, still need to confirm the
 attendee after the payment

---
 htdocs/admin/eventorganization.php            |  57 ++++----
 htdocs/langs/en_US/eventorganization.lang     |   4 +
 .../attendee_subscription.php                 |  64 ++++-----
 htdocs/public/payment/newpayment.php          | 133 ++++++++++++++++++
 4 files changed, 193 insertions(+), 65 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index c76d9a5c188..58f09786e23 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -61,8 +61,8 @@ $arrayofparameters = array(
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
 	'EVENTORGANIZATION_SECUREKEY'=>array('type'=>'securekey', 'enabled'=>1),
-    'SERVICE_BOOTH_LOCATION'=>array('type'=>'product', 'enabled'=>1),
-    'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION'=>array('type'=>'product', 'enabled'=>1),
+	'SERVICE_BOOTH_LOCATION'=>array('type'=>'product', 'enabled'=>1),
+	'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION'=>array('type'=>'product', 'enabled'=>1),
 );
 
 $error = 0;
@@ -209,12 +209,12 @@ if ($action == 'edit') {
 	print '<tr class="liste_titre"><td class="titlefieldcreate">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($arrayofparameters as $constname => $val) {
-	    if ($val['enabled']==1) {
-	        $setupnotempty++;
-	        print '<tr class="oddeven"><td>';
-	        $tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
-	        print '<span id="helplink'.$constname.'" class="spanforparamtooltip">'.$form->textwithpicto($langs->trans($constname), $tooltiphelp, 1, 'info', '', 0, 3, 'tootips'.$constname).'</span>';
-	        print '</td><td>';
+		if ($val['enabled']==1) {
+			$setupnotempty++;
+			print '<tr class="oddeven"><td>';
+			$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
+			print '<span id="helplink'.$constname.'" class="spanforparamtooltip">'.$form->textwithpicto($langs->trans($constname), $tooltiphelp, 1, 'info', '', 0, 3, 'tootips'.$constname).'</span>';
+			print '</td><td>';
 
 			if ($val['type'] == 'textarea') {
 				print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
@@ -259,13 +259,13 @@ if ($action == 'edit') {
 				$formcompany = new FormCompany($db);
 				print $formcompany->selectProspectCustomerType($conf->global->{$constname}, $constname);
 			} elseif ($val['type'] == 'securekey') {
-    			print '<input required="required" type="text" class="flat" id="'.$constname.'" name="'.$constname.'" value="'.(GETPOST($constname, 'alpha') ?GETPOST($constname, 'alpha') : $conf->global->{$constname}).'" size="40">';
-    			if (!empty($conf->use_javascript_ajax)) {
-    			    print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token'.$constname.'" class="linkobject"');
-    			}
-    			if (!empty($conf->use_javascript_ajax)) {
-    			    print "\n".'<script type="text/javascript">';
-    			    print '$(document).ready(function () {
+				print '<input required="required" type="text" class="flat" id="'.$constname.'" name="'.$constname.'" value="'.(GETPOST($constname, 'alpha') ?GETPOST($constname, 'alpha') : $conf->global->{$constname}).'" size="40">';
+				if (!empty($conf->use_javascript_ajax)) {
+					print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token'.$constname.'" class="linkobject"');
+				}
+				if (!empty($conf->use_javascript_ajax)) {
+					print "\n".'<script type="text/javascript">';
+					print '$(document).ready(function () {
                         $("#generate_token'.$constname.'").click(function() {
                 	        $.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
                 		      action: \'getrandompassword\',
@@ -276,25 +276,16 @@ if ($action == 'edit') {
             				});
                          });
                     });';
-    			    print '</script>';
-    			}
+					print '</script>';
+				}
 			} elseif ($var['type'] == 'product') {
-			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-			        print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
-			        print '<td>';
-			        $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
-			        $form->select_produits($selected, $constname, '', 0);
-			        print '</td>';
-			        print "</tr>\n";
-			    }
-			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-			            print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
-			            print '<td>';
-			            $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
-			            $form->select_produits($selected, $constname, '', 0);
-			            print '</td>';
-			    }
-			    print "</tr>\n";
+				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+					print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+					print '<td>';
+					$selected = (empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) ? '' : $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+					$form->select_produits($selected, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', '', 0);
+					print '</td>';
+				}
 			} else {
 				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
 			}
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 3fc655b92e9..6cb7613bf06 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -105,3 +105,7 @@ EvntOrgEndDuration =  and ends on
 # SubscriptionOk page
 #
 SubscriptionOk = Your subscription to this conference has been validated
+#
+# Payment page
+#
+PaymentConferenceAttendee = Paiement de participation à une conférence
\ No newline at end of file
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index cdb848ed28c..3af50ecd8a2 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -86,15 +86,16 @@ $id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
 $conference = new ConferenceOrBooth($db);
 $resultconf = $conference->fetch($id);
 if ($resultconf < 0) {
-    setEventMessages(null, $object->errors, "errors");
+	setEventMessages(null, $object->errors, "errors");
 }
 
 $project = new Project($db);
 $resultproject = $project->fetch($conference->fk_project);
-if ($resultproject < 0){
-    $error++;
-    $errmsg .= $project->error;
+if ($resultproject < 0) {
+	$error++;
+	$errmsg .= $project->error;
 }
+var_dump($conference->fk_project);
 
 // Getting 'securekey'.'id' from Post and decoding it
 $encodedsecurekeyandid = GETPOST('securekey', 'alpha');
@@ -293,32 +294,31 @@ if (empty($reshook) && $action == 'add') {
 
 	if (!$error) {
 		$db->commit();
-	    global $dolibarr_main_url_root;
-	    if (!empty(floatval($project->price_registration))){
-	        $facture = new Facture($db);
-	        $facture->type = 0;
-	        $facture->socid = $thirdparty->id;
-	        $facture->paye = 0;
-	        //@todo price and taxes to add
-	        $tva = get_default_tva($mysoc, $thirdparty);
-	        $facture->date = dol_now();
-	        $resultfacture = $facture->create($user); 
-	        if ($resultfacture < 0){
-                $error++;
-	            $errmsg .= $facture->error;
-	        } else {
-	            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
-	            Header("Location: ".$redirection);
-	            exit;
-	        }
-
-	    } else {
-	        // No price has been set
-	        // Validating the subscription
-	        $confattendee->setStatut(1);
-	        $redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
-	        Header("Location: ".$redirection);
-	        exit;
+		global $dolibarr_main_url_root;
+		if (!empty(floatval($project->price_registration))) {
+			$facture = new Facture($db);
+			$facture->type = 0;
+			$facture->socid = $thirdparty->id;
+			$facture->paye = 0;
+			//@todo price and taxes to add
+			$tva = get_default_tva($mysoc, $thirdparty);
+			$facture->date = dol_now();
+			$resultfacture = $facture->create($user);
+			if ($resultfacture < 0) {
+				$error++;
+				$errmsg .= $facture->error;
+			} else {
+				$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.$confattendee->id;
+				Header("Location: ".$redirection);
+				exit;
+			}
+		} else {
+			// No price has been set
+			// Validating the subscription
+			$confattendee->setStatut(1);
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
+			Header("Location: ".$redirection);
+			exit;
 		}
 		//Header("Location: ".$urlback);
 		//exit;
@@ -394,8 +394,8 @@ print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."
 print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
-if(!empty(floatval($project->price_registration))){
-    print '<FONT COLOR="red">*</FONT>';
+if (!empty(floatval($project->price_registration))) {
+	print '<FONT COLOR="red">*</FONT>';
 }
 print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 8931ce1ceed..53b75b0b3a1 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -61,6 +61,9 @@ 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';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 // Hook to be used by external payment modules (ie Payzen, ...)
 include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $hookmanager = new HookManager($db);
@@ -1724,6 +1727,136 @@ if ($source == 'donation') {
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
+if ($source == 'conferencesubscription') {
+	// @todo cas paiement de conferenceattendee
+	$found = true;
+	$langs->load("members");
+
+	// Finding the Attendee
+	$attendee = new ConferenceOrBoothAttendee($db);
+	$result = $attendee->fetch('', $ref);
+	if ($result <= 0) {
+		$mesg = $attendee->error;
+		$error++;
+	}
+	$object = $attendee;
+
+	// Finding the thirdparty associated to the Attendee
+	$thirdparty = new Societe($db);
+	$resultthirdparty = $thirdparty->fetch($attendee->fk_soc);
+	if ($resultthirdparty <= 0) {
+		$mesg = $thirdparty->error;
+		$error++;
+	}
+
+	// Finding the conference
+	$conference = new ConferenceOrBooth($db);
+	$resultconf = $conference->fetch($attendee->fk_actioncomm);
+	if ($resultconf <= 0) {
+		$mesg = $conference->error;
+		$error++;
+	}
+
+	// Finding the project
+	$project = new Project($db);
+	$resultproj = $project->fetch($conference->fk_project);
+	if ($resultproj <= 0) {
+		$mesg = $project->error;
+		$error++;
+	}
+
+	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
+		$amount = $project->price_registration;
+		if (GETPOST("amount", 'alpha')) {
+			$amount = GETPOST("amount", 'alpha');
+		}
+		$amount = price2num($amount, 'MT');
+	}
+
+	if (GETPOST('fulltag', 'alpha')) {
+		$fulltag = GETPOST('fulltag', 'alpha');
+	} else {
+		$fulltag = 'MEM='.$member->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+		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>';
+	print $thirdparty->name;
+	print '</b>';
+	print '</td></tr>'."\n";
+
+	// Object
+	$text = '<b>'.$langs->trans("PaymentConferenceAttendee").'</b>';
+	if (GETPOST('desc', 'alpha')) {
+		$text = '<b>'.$langs->trans(GETPOST('desc', 'alpha')).'</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="'.dol_escape_htmltag($source).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($member->ref).'">';
+	print '</td></tr>'."\n";
+
+	// Amount
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	$valtoshow = $project->price_registration;
+	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";
+
+	// 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 style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+	// Shipping address
+	$shipToName = $thirdparty->getFullName($langs);
+	$shipToStreet = $thirdparty->address;
+	$shipToCity = $thirdparty->town;
+	$shipToState = $thirdparty->state_code;
+	$shipToCountryCode = $thirdparty->country_code;
+	$shipToZip = $thirdparty->zip;
+	$shipToStreet2 = '';
+	$phoneNum = $thirdparty->phone;
+	if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip) {
+		print '<!-- Shipping address information -->';
+		print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+		print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+		print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+		print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+		print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+	} else {
+		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+	}
+	print '<input type="hidden" name="thirdparty_id" value="'.$thirdparty->id.'">'."\n";
+	print '<input type="hidden" name="email" value="'.$thirdparty->email.'">'."\n";
+	$labeldesc = $langs->trans("PaymentSubscription");
+	if (GETPOST('desc', 'alpha')) {
+		$labeldesc = GETPOST('desc', 'alpha');
+	}
+	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
+}
 
 if (!$found && !$mesg) {
 	$mesg = $langs->trans("ErrorBadParameters");

From 880d763abe6ae151868a34045065ea4a6b51f65e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 11:55:28 +0200
Subject: [PATCH 056/928] wip on payment page

---
 .../attendee_subscription.php                 |  1 -
 htdocs/public/payment/newpayment.php          | 72 ++++++++++---------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 3af50ecd8a2..a40c836f0b3 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -95,7 +95,6 @@ if ($resultproject < 0) {
 	$error++;
 	$errmsg .= $project->error;
 }
-var_dump($conference->fk_project);
 
 // Getting 'securekey'.'id' from Post and decoding it
 $encodedsecurekeyandid = GETPOST('securekey', 'alpha');
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 53b75b0b3a1..9fba38962b4 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -109,6 +109,41 @@ if (!$action) {
 	}
 }
 
+if ($source == 'conferencesubscription') {
+	// Finding the Attendee
+	$attendee = new ConferenceOrBoothAttendee($db);
+	$result = $attendee->fetch('', $ref);
+	if ($result <= 0) {
+		$mesg = $attendee->error;
+		$error++;
+	}
+	$object = $attendee;
+
+	// Finding the thirdparty associated to the Attendee
+	$thirdparty = new Societe($db);
+	$resultthirdparty = $thirdparty->fetch($attendee->fk_soc);
+	if ($resultthirdparty <= 0) {
+		$mesg = $thirdparty->error;
+		$error++;
+	}
+
+	// Finding the conference
+	$conference = new ConferenceOrBooth($db);
+	$resultconf = $conference->fetch($attendee->fk_actioncomm);
+	if ($resultconf <= 0) {
+		$mesg = $conference->error;
+		$error++;
+	}
+
+	// Finding the project
+	$project = new Project($db);
+	$resultproj = $project->fetch($conference->fk_project);
+	if ($resultproj <= 0) {
+		$mesg = $project->error;
+		$error++;
+	}
+}
+
 
 $paymentmethod = GETPOST('paymentmethod', 'alphanohtml') ?GETPOST('paymentmethod', 'alphanohtml') : ''; // Empty in most cases. Defined when a payment mode is forced
 $validpaymentmethod = array();
@@ -712,6 +747,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		header("Location: ".$urlko);
 		exit;
 	} else {
+		$attendee->setStatut(1);
 		header("Location: ".$urlok);
 		exit;
 	}
@@ -1728,43 +1764,9 @@ if ($source == 'donation') {
 }
 
 if ($source == 'conferencesubscription') {
-	// @todo cas paiement de conferenceattendee
 	$found = true;
 	$langs->load("members");
 
-	// Finding the Attendee
-	$attendee = new ConferenceOrBoothAttendee($db);
-	$result = $attendee->fetch('', $ref);
-	if ($result <= 0) {
-		$mesg = $attendee->error;
-		$error++;
-	}
-	$object = $attendee;
-
-	// Finding the thirdparty associated to the Attendee
-	$thirdparty = new Societe($db);
-	$resultthirdparty = $thirdparty->fetch($attendee->fk_soc);
-	if ($resultthirdparty <= 0) {
-		$mesg = $thirdparty->error;
-		$error++;
-	}
-
-	// Finding the conference
-	$conference = new ConferenceOrBooth($db);
-	$resultconf = $conference->fetch($attendee->fk_actioncomm);
-	if ($resultconf <= 0) {
-		$mesg = $conference->error;
-		$error++;
-	}
-
-	// Finding the project
-	$project = new Project($db);
-	$resultproj = $project->fetch($conference->fk_project);
-	if ($resultproj <= 0) {
-		$mesg = $project->error;
-		$error++;
-	}
-
 	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
 		$amount = $project->price_registration;
 		if (GETPOST("amount", 'alpha')) {
@@ -1804,7 +1806,7 @@ if ($source == 'conferencesubscription') {
 	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="'.dol_escape_htmltag($source).'">';
-	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($member->ref).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($attendee->ref).'">';
 	print '</td></tr>'."\n";
 
 	// Amount

From 98c622446eabdf468b76d482a8f4eb5dca1d3c57 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 12:14:34 +0200
Subject: [PATCH 057/928] dynamic selector of service/product used for the
 invoice added

---
 htdocs/admin/eventorganization.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 58f09786e23..4e8d19d4590 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -278,16 +278,13 @@ if ($action == 'edit') {
                     });';
 					print '</script>';
 				}
-			} elseif ($var['type'] == 'product') {
+			} elseif ($val['type'] == 'product') {
 				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-					print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
-					print '<td>';
-					$selected = (empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) ? '' : $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
-					$form->select_produits($selected, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', '', 0);
-					print '</td>';
+					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+					$form->select_produits($selected, $constname, '', 0);
 				}
 			} else {
-				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
+				print '<input name="'.ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS}.'">';
 			}
 			print '</td></tr>';
 		}

From e8fc6fe293356be3777d17133edadf0468098e63 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Thu, 15 Apr 2021 11:21:33 +0100
Subject: [PATCH 058/928] Code optimization

---
 htdocs/langs/en_US/partnership.lang |  2 +-
 htdocs/partnership/admin/setup.php  | 19 +------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index e9fb30d1fd6..3848ffca987 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -32,7 +32,7 @@ ListOfPartnerships = List of partnership
 PartnershipSetup = Partnership setup
 PartnershipAbout = About Partnership
 PartnershipAboutPage = Partnership about page
-
+PartnershipManagedFor = Partnership managed for
 
 #
 # Object
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 6ba689cbd00..77edba1f21f 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -81,30 +81,13 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'setting') {
 	require_once DOL_DOCUMENT_ROOT."/core/modules/modPartnership.class.php";
-	$partnership = new modPartnership($db);
 
 	$value = GETPOST('managed_for', 'alpha');
 
-
 	$modulemenu = ($value == 'member') ? 'member' : 'thirdparty';
 	$res = dolibarr_set_const($db, "PARTNERSHIP_IS_MANAGED_FOR", $modulemenu, 'chaine', 0, '', $conf->entity);
 
-	$partnership->tabs = array();
-	if ($modulemenu == 'member') {
-		$partnership->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/adherents/partnership.php?socid=__ID__');
-		$fk_mainmenu = "members";
-	} else {
-		$partnership->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/societe/partnership.php?socid=__ID__');
-		$fk_mainmenu = "companies";
-	}
-
-	foreach ($partnership->menu as $key => $menu) {
-		$partnership->menu[$key]['mainmenu'] = $fk_mainmenu;
-
-		if ($menu['leftmenu'] == 'partnership')
-			$partnership->menu[$key]['fk_menu'] = 'fk_mainmenu='.$fk_mainmenu;
-		else $partnership->menu[$key]['fk_menu'] = 'fk_mainmenu='.$fk_mainmenu.',fk_leftmenu=partnership';
-	}
+	$partnership = new modPartnership($db);
 
 	$error += $partnership->delete_tabs();
 	$error += $partnership->insert_tabs();

From 764d984ebfec35d21e636b03b39fd4eed8ac0cfd Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 12:28:53 +0200
Subject: [PATCH 059/928] fix on dynamic selector

---
 htdocs/admin/eventorganization.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 4e8d19d4590..c1c0f8234ac 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -283,8 +283,6 @@ if ($action == 'edit') {
 					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
 					$form->select_produits($selected, $constname, '', 0);
 				}
-			} else {
-				print '<input name="'.ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS}.'">';
 			}
 			print '</td></tr>';
 		}

From 12a796fd8e67456016ba4be0433dacf760100574 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 12:57:19 +0200
Subject: [PATCH 060/928] dynamic selector print improved, now using ref
 instead of id

---
 htdocs/admin/eventorganization.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index c1c0f8234ac..b4b6604b118 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -351,6 +351,14 @@ if ($action == 'edit') {
 					} elseif ($conf->global->{$constname}==0) {
 						print $langs->trans("NorProspectNorCustomer");
 					}
+				} elseif ($val['type'] == 'product') {
+					$product = new Product($db);
+					$resprod = $product->fetch($conf->global->{$constname});
+					if ($resprod > 0) {
+						print $product->ref;
+					} elseif ($resprod < 0) {
+						setEventMessages(null, $object->errors, "errors");
+					}
 				} else {
 					print  $conf->global->{$constname};
 				}

From 208478906c6aca9909383830b4bbf407db0167dc Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 16:10:01 +0200
Subject: [PATCH 061/928] add type product in modulebuilder

---
 htdocs/modulebuilder/template/admin/setup.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 97d04336ee6..96f4d831261 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -82,6 +82,7 @@ $arrayofparameters = array(
 	//'MYMODULE_MYPARAM5'=>array('type'=>'yesno', 'enabled'=>1),
 	//'MYMODULE_MYPARAM5'=>array('type'=>'thirdparty_type', 'enabled'=>1),
     //'MYMODULE_MYPARAM6'=>array('type'=>'securekey', 'enabled'=>1),
+    //'MYMODULE_MYPARAM7'=>array('type'=>'product', 'enabled'=>1),
 );
 
 $error = 0;
@@ -297,6 +298,11 @@ if ($action == 'edit') {
                     });';
 			        print '</script>';
 			    }
+			} elseif ($val['type'] == 'product') {
+			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+			        $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+			        $form->select_produits($selected, $constname, '', 0);
+			    }
 			} else {
 				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
 			}
@@ -363,8 +369,16 @@ if ($action == 'edit') {
 					} elseif ($conf->global->{$constname}==0) {
 						print $langs->trans("NorProspectNorCustomer");
 					}
+				} elseif ($val['type'] == 'product') {
+				    $product = new Product($db);
+				    $resprod = $product->fetch($conf->global->{$constname});
+				    if ($resprod > 0) {
+				        print $product->ref;
+				    } elseif ($resprod < 0) {
+				        setEventMessages(null, $object->errors, "errors");
+				    }
 				} else {
-					print  $conf->global->{$constname};
+					print $conf->global->{$constname};
 				}
 				print '</td></tr>';
 			}

From ae69cc93be21bb6d106c628af58bb9fc5bde351f Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 16:16:45 +0200
Subject: [PATCH 062/928] wip on payment page

---
 .../attendee_subscription.php                 | 38 ++++++++++++-------
 htdocs/public/payment/newpayment.php          | 14 ++++++-
 htdocs/public/payment/paymentok.php           | 17 +++++++++
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index a40c836f0b3..a7f68a7ddab 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -86,7 +86,7 @@ $id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
 $conference = new ConferenceOrBooth($db);
 $resultconf = $conference->fetch($id);
 if ($resultconf < 0) {
-	setEventMessages(null, $object->errors, "errors");
+	setEventMessages(null, $conference->errors, "errors");
 }
 
 $project = new Project($db);
@@ -295,21 +295,31 @@ if (empty($reshook) && $action == 'add') {
 		$db->commit();
 		global $dolibarr_main_url_root;
 		if (!empty(floatval($project->price_registration))) {
-			$facture = new Facture($db);
-			$facture->type = 0;
-			$facture->socid = $thirdparty->id;
-			$facture->paye = 0;
-			//@todo price and taxes to add
-			$tva = get_default_tva($mysoc, $thirdparty);
-			$facture->date = dol_now();
-			$resultfacture = $facture->create($user);
-			if ($resultfacture < 0) {
+			$productforinvoicerow = new Product($db);
+			$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION);
+			if ($resultprod < 0) {
 				$error++;
-				$errmsg .= $facture->error;
+				$errmsg .= $productforinvoicerow->error;
 			} else {
-				$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.$confattendee->id;
-				Header("Location: ".$redirection);
-				exit;
+				$facture = new Facture($db);
+				$facture->type = 0;
+				$facture->socid = $thirdparty->id;
+				$facture->paye = 0;
+				// @todo complete
+				//$baseprice = $productforinvoicerow->
+				$facture->total_ht = 10;
+				$facture->total_vat = $productforinvoicerow->tva_tx*10;
+				$facture->total_ttc =  $facture->total_ht + $facture->total_ttc;
+				$facture->date = dol_now();
+				$resultfacture = $facture->create($user);
+				if ($resultfacture < 0) {
+					$error++;
+					$errmsg .= $facture->error;
+				} else {
+					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.$confattendee->id;
+					Header("Location: ".$redirection);
+					exit;
+				}
 			}
 		} else {
 			// No price has been set
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 9fba38962b4..d4bf295db10 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -69,6 +69,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $hookmanager = new HookManager($db);
 $hookmanager->initHooks(array('newpayment'));
 
+// For encryption
+global $dolibarr_main_instance_unique_id;
+
 // Load translation files
 $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
 
@@ -375,6 +378,9 @@ if ($action == 'dopayment') {
 			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
 
 			// A redirect is added if API call successfull
+			if ($source == 'conferencesubscription') {
+				$PAYPAL_API_OK .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
 			// If we are here, it means the Paypal redirect was not done, so we show error message
@@ -393,6 +399,10 @@ if ($action == 'dopayment') {
 		$urlok = preg_replace('/securekey=[^&]+/', '', $urlok);
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
+		if ($source == 'conferencesubscription') {
+			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+		}
+
 		$mesg = '';
 		if (empty($PRICE) || !is_numeric($PRICE)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
@@ -747,7 +757,9 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		header("Location: ".$urlko);
 		exit;
 	} else {
-		$attendee->setStatut(1);
+		if ($source == 'conferencesubscription') {
+			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+		}
 		header("Location: ".$urlok);
 		exit;
 	}
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 1942635001f..7e11944c243 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -56,6 +56,8 @@ if (!empty($conf->paypal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 }
 
+global $dolibarr_main_instance_unique_id;
+
 $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal"));
 
 // Clean parameters
@@ -105,6 +107,21 @@ $ref = GETPOST('ref');
 $suffix = GETPOST("suffix", 'aZ09');
 $membertypeid = GETPOST("membertypeid", 'int');
 
+$conferencesubscription = GETPOST('conferencesubscription');
+$uncryptedconferencesubscription = dol_decode($conferencesubscription, $dolibarr_main_instance_unique_id);
+$subscription = substr($uncryptedconferencesubscription, 0, strlen($uncryptedconferencesubscription)-strlen($ref));
+$reffrompayment = substr($uncryptedconferencesubscription, -strlen($ref), strlen($ref));
+
+// Validation of an attendee after his payment
+if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
+	$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+	$resultattendee = $attendeetovalidate->fetch($ref);
+	if ($resultattendee < 0) {
+		setEventMessages(null, $attendeetovalidate->errors, "errors");
+	} else {
+		$attendeetovalidate->setStatut(1);
+	}
+}
 
 // Detect $paymentmethod
 $paymentmethod = '';

From 2cbe5b188ec29937f1e5a7b45a89129378a90ccb Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 16:57:41 +0200
Subject: [PATCH 063/928] wip invoice

---
 htdocs/langs/en_US/eventorganization.lang     |  1 +
 .../attendee_subscription.php                 | 46 ++++++++++++++++---
 htdocs/public/payment/newpayment.php          |  2 +-
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 6cb7613bf06..f486a64dac1 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -108,4 +108,5 @@ SubscriptionOk = Your subscription to this conference has been validated
 #
 # Payment page
 #
+Attendee = Participant
 PaymentConferenceAttendee = Paiement de participation à une conférence
\ No newline at end of file
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index a7f68a7ddab..ade545c23c7 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -68,6 +68,7 @@ require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 // Init vars
@@ -189,6 +190,7 @@ function llxFooterVierge()
 /*
  * Actions
  */
+global $mysoc;
 $parameters = array();
 // Note that $action and $object may have been modified by some hooks
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
@@ -302,16 +304,48 @@ if (empty($reshook) && $action == 'add') {
 				$errmsg .= $productforinvoicerow->error;
 			} else {
 				$facture = new Facture($db);
-				$facture->type = 0;
+				$facture->type = Facture::TYPE_STANDARD;
 				$facture->socid = $thirdparty->id;
 				$facture->paye = 0;
-				// @todo complete
-				//$baseprice = $productforinvoicerow->
-				$facture->total_ht = 10;
-				$facture->total_vat = $productforinvoicerow->tva_tx*10;
-				$facture->total_ttc =  $facture->total_ht + $facture->total_ttc;
 				$facture->date = dol_now();
+				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
+				if (empty($facture->cond_reglement_id)) {
+					$paymenttermstatic = new PaymentTerm($confattendee->db);
+					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
+					if (empty($facture->cond_reglement_id)) {
+						$error++;
+						$confattendee->error = 'ErrorNoPaymentTermRECEPFound';
+						$confattendee->errors[] = $confattendee->error;
+					}
+				}
+
 				$resultfacture = $facture->create($user);
+				if ($resultfacture <= 0) {
+					$confattendee->error = $facture->error;
+					$confattendee->errors = $facture->errors;
+					$error++;
+				}
+			}
+
+			if (!$error) {
+				// Add line to draft invoice
+				$idprodsubscription = 0;
+				if (!empty($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
+					$idprodsubscription = $conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION;
+				}
+
+				$vattouse = get_default_tva($mysoc, $thirdparty, $idprodsubscription);
+
+				$result = $facture->addline($label, 0, 1, $vattouse, 0, 0, $idprodsubscription, 0, $datesubscription, '', 0, 0, '', 'TTC', $amount, 1);
+				if ($result <= 0) {
+					$confattendee->error = $confattendee->error;
+					$confattendee->errors = $confattendee->errors;
+					$error++;
+				}
+				var_dump('a');
+				$resultfacture = $facture->create($user);
+				var_dump('b');
+				var_dump($resultfacture);
 				if ($resultfacture < 0) {
 					$error++;
 					$errmsg .= $facture->error;
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index d4bf295db10..546a7ee0e11 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1804,7 +1804,7 @@ if ($source == 'conferencesubscription') {
 	print '</td></tr>'."\n";
 
 	// Debitor
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Member");
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Attendee");
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>';
 	print $thirdparty->name;
 	print '</b>';

From db6ca73882866d7d590089e0959aa0ced321e956 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 17:00:53 +0200
Subject: [PATCH 064/928] deletion of vardumps and correction in the invoice
 creation

---
 htdocs/public/eventorganization/attendee_subscription.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index ade545c23c7..1572f667697 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -338,14 +338,11 @@ if (empty($reshook) && $action == 'add') {
 
 				$result = $facture->addline($label, 0, 1, $vattouse, 0, 0, $idprodsubscription, 0, $datesubscription, '', 0, 0, '', 'TTC', $amount, 1);
 				if ($result <= 0) {
-					$confattendee->error = $confattendee->error;
-					$confattendee->errors = $confattendee->errors;
+					$confattendee->error = $facture->error;
+					$confattendee->errors = $facture->errors;
 					$error++;
 				}
-				var_dump('a');
 				$resultfacture = $facture->create($user);
-				var_dump('b');
-				var_dump($resultfacture);
 				if ($resultfacture < 0) {
 					$error++;
 					$errmsg .= $facture->error;

From ed857481a23859e98fce1267bed48a8e5d0c819b Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 17:09:26 +0200
Subject: [PATCH 065/928] typo

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 1572f667697..159fdfd0daf 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -435,7 +435,7 @@ print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><in
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
 if (!empty(floatval($project->price_registration))) {
-	print '<FONT COLOR="red">*</FONT>';
+	print '<FONT COLOR="red"> *</FONT>';
 }
 print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address

From 71befd15f9fc1c49c112ade32a53b12183c33a05 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 17:10:11 +0200
Subject: [PATCH 066/928] typo v2

---
 htdocs/public/eventorganization/attendee_subscription.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 159fdfd0daf..2f7d3e59478 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -431,11 +431,11 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Email
-print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
 if (!empty(floatval($project->price_registration))) {
-	print '<FONT COLOR="red"> *</FONT>';
+	print '<FONT COLOR="red">*</FONT>';
 }
 print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address

From 38f54d058267d9b69f31c8ec2fd814388c3930c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Apr 2021 10:26:35 +0200
Subject: [PATCH 067/928] FIX Missing extrafields into export of agenda record

---
 htdocs/core/extrafieldsinexport.inc.php | 4 ++++
 htdocs/core/modules/modAgenda.class.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index cef5f74d172..8b7cf3c81cc 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -1,5 +1,9 @@
 <?php
 
+// $keyforselect = name of main table
+// keyforelement = name of picto
+// $keyforaliasextra = a key to avoid conflict with extrafields of other objects
+
 if (empty($keyforselect) || empty($keyforelement) || empty($keyforaliasextra))
 {
 	//print $keyforselet.' - '.$keyforelement.' - '.$keyforaliasextra;
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 559260a77c2..07078044385 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -454,8 +454,12 @@ class modAgenda extends DolibarrModules
 			'p.ref' => 'project',
 		);
 
+		$keyforselect = 'actioncomm'; $keyforelement = 'action'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM  '.MAIN_DB_PREFIX.'actioncomm as ac';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_extrafields as extra ON ac.id = extra.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id';
 		if (!empty($user) && empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_resources acr on ac.id = acr.fk_actioncomm';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp on ac.fk_contact = sp.rowid';

From 0cd567f256cf5bb98610457fd014556e29522d02 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 16 Apr 2021 10:37:42 +0200
Subject: [PATCH 068/928] fix double test

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

diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 559260a77c2..d3a78d01d90 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -413,7 +413,7 @@ class modAgenda extends DolibarrModules
 			'langs' => 'agenda',
 			'position' => 170,
 			'perms' => '$user->rights->agenda->allactions->read',
-			'enabled' => '$conf->categorie->enabled&&$conf->categorie->enabled',
+			'enabled' => '$conf->categorie->enabled',
 			'target' => '',
 			'user' => 2
 		);

From 9304b3c474daf932993df278ab188cd9ef4ce10e Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Fri, 16 Apr 2021 09:54:11 +0100
Subject: [PATCH 069/928] Manage mass action "Send email" for Partnership
 module

---
 htdocs/core/actions_massactions.inc.php       | 10 ++++
 htdocs/core/tpl/card_presend.tpl.php          |  4 ++
 htdocs/core/tpl/massactions_pre.tpl.php       |  4 ++
 .../install/mysql/migration/13.0.0-14.0.0.sql |  5 +-
 htdocs/langs/en_US/partnership.lang           | 34 +++++++-----
 .../partnership/class/partnership.class.php   | 13 ++---
 htdocs/partnership/partnership_card.php       | 53 +++++++++++++------
 htdocs/partnership/partnership_list.php       | 46 +++++++++++++---
 8 files changed, 129 insertions(+), 40 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 13cb7126769..f111f4f55e2 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -90,6 +90,9 @@ if (!$error && $massaction == 'confirm_presend') {
 		if ($objecttmp->element == 'expensereport') {
 			$thirdparty = new User($db);
 		}
+		if ($objecttmp->element == 'partnership' && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+			$thirdparty = new Adherent($db);
+		}
 		if ($objecttmp->element == 'holiday') {
 			$thirdparty = new User($db);
 		}
@@ -107,6 +110,9 @@ if (!$error && $massaction == 'confirm_presend') {
 				if ($objecttmp->element == 'expensereport') {
 					$thirdpartyid = $objecttmp->fk_user_author;
 				}
+				if ($objecttmp->element == 'partnership' && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+					$thirdpartyid = $objecttmp->fk_member;
+				}
 				if ($objecttmp->element == 'holiday') {
 					$thirdpartyid = $objecttmp->fk_user;
 				}
@@ -250,6 +256,10 @@ if (!$error && $massaction == 'confirm_presend') {
 						$fuser = new User($db);
 						$fuser->fetch($objectobj->fk_user_author);
 						$sendto = $fuser->email;
+					} elseif ($objectobj->element == 'partnership' && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+						$fadherent = new Adherent($db);
+						$fadherent->fetch($objectobj->fk_member);
+						$sendto = $fadherent->email;
 					} elseif ($objectobj->element == 'holiday') {
 						$fuser = new User($db);
 						$fuser->fetch($objectobj->fk_user);
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index de10465a736..62aafc2fdb5 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -151,6 +151,10 @@ if ($action == 'presend') {
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_author);
 		$liste['thirdparty'] = $fuser->getFullName($outputlangs)." <".$fuser->email.">";
+	} elseif ($object->element == 'partnership' && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+		$fadherent = new Adherent($db);
+		$fadherent->fetch($object->fk_member);
+		$liste['member'] = $fadherent->getFullName($outputlangs)." <".$fadherent->email.">";
 	} elseif ($object->element == 'societe') {
 		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
 			$liste[$key] = $value;
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 79b00f01590..2848bd3d48c 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -127,6 +127,10 @@ if ($massaction == 'presend') {
 			$fuser = new User($db);
 			$fuser->fetch($thirdpartyid);
 			$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
+		} elseif ($objecttmp->element == 'partnership' && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+			$fadherent = new Adherent($db);
+			$fadherent->fetch($objecttmp->fk_member);
+			$liste['member'] = $fadherent->getFullName($langs)." &lt;".$fadherent->email."&gt;";
 		} else {
 			$soc = new Societe($db);
 			$soc->fetch($thirdpartyid);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 9b97aa475cf..18714962058 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -411,7 +411,10 @@ create table llx_partnership_extrafields
 
 ALTER TABLE llx_partnership_extrafields ADD INDEX idx_partnership_fk_object(fk_object);
 
-INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'member', '(AlertStatusPartnershipExpiration)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourMembershipWillSoonExpireTopic)__', 0, '<body>\n <p>Dear __MEMBER_FULLNAME__,<br><br>\n__(YourMembershipWillSoonExpireContent)__</p>\n<br />\n\n            __(Sincerely)__ <br />\n            __[PARTNERSHIP_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipWillExpire)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipWillSoonExpireTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipWillSoonExpireContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipRefused)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipCanceled)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipCanceledTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+ALTER TABLE llx_adherent ADD COLUMN website varchar(255) NULL AFTER email;
 ALTER TABLE llx_facture_fourn ADD COLUMN date_closing datetime DEFAULT NULL after date_valid;
 
 ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_closing integer DEFAULT NULL after fk_user_valid;
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 3848ffca987..758a44546fb 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -16,23 +16,23 @@
 #
 # Generic
 #
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
 PartnershipDescriptionLong= Module Partnership management
 
 #
 # Menu
 #
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
 
 #
 # Admin page
 #
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-PartnershipManagedFor = Partnership managed for
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+PartnershipManagedFor=Partnership managed for
 
 #
 # Object
@@ -44,12 +44,22 @@ DatePartnershipEnd=End date
 #
 # Template Mail
 #
+SendingEmailOnPartnershipWillExpire=Partnership will expire
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipCanceled=Partnership canceled
 
+YourPartnershipWillSoonExpireTopic=Partnership expiration
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonExpireContent=We inform you that your partnership will soon expire.
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
 # Status
 #
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
\ No newline at end of file
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
\ No newline at end of file
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 395a3893b7d..54a878f4e1f 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -169,14 +169,9 @@ class Partnership extends CommonObject
 
 		$this->db = $db;
 
-		$fk_soc_visible 	= ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 0 : 1;
-		$fk_member_visible 	= ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 1 : 0;
-
 		$this->fields=array(
 			'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 			'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
-			'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>$fk_soc_visible, 'index'=>1,),
-			'fk_member' => array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>51, 'notnull'=>-1, 'visible'=>$fk_member_visible, 'index'=>1,),
 			'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
 			'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
 			'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
@@ -187,13 +182,19 @@ class Partnership extends CommonObject
 			'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
 			'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
 			'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-			'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>0, 'visible'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Accept&eacute;', '2'=>'Refus&eacute;', '9'=>'Annul&eacute;'),),
 			'date_partnership_start' => array('type'=>'date', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
 			'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>1, 'visible'=>1,),
+			'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>2, 'index'=>1, 'arrayofkeyval'=>array('-1'=>'','0'=>$langs->trans('Draft'), '1'=>$langs->trans('Accepted'), '2'=>$langs->trans('Refused'), '9'=>$langs->trans('Canceled')),),
 			'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>63, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
 			'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
 		);
 
+		if($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member'){
+			$this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1,);
+		} else {
+			$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1,);
+		}
+
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index c44174af52c..cb082dc640d 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -123,21 +123,18 @@ if (empty($action) && empty($id) && empty($ref)) {
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 
-$permissiontoread = $user->rights->partnership->read;
-$permissiontoadd = $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->partnership->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$permissionnote = $user->rights->partnership->write; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->partnership->write; // Used by the include of actions_dellink.inc.php
-$upload_dir = $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
-
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
-//if (empty($conf->partnership->enabled)) accessforbidden();
-//if (empty($permissiontoread)) accessforbidden();
+$permissiontoread 		= $user->rights->partnership->read;
+$permissiontoadd 		= $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete 	= $user->rights->partnership->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote 		= $user->rights->partnership->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink 		= $user->rights->partnership->write; // Used by the include of actions_dellink.inc.php
+$upload_dir 			= $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
+$managedfor 			= $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
 
+if (empty($conf->partnership->enabled)) accessforbidden();
+if (empty($permissiontoread)) accessforbidden();
+if ($object->id > 0 && $object->fk_member > 0 && $managedfor != 'member') accessforbidden();
+if ($object->id > 0 && $object->fk_soc > 0 && $managedfor != 'thirdparty') accessforbidden();
 
 /*
  * Actions
@@ -502,6 +499,32 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
+	// End of subscription date
+	if ($managedfor == 'member') {
+		$fadherent = new Adherent($db);
+		$fadherent->fetch($object->fk_member);
+		print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
+		if ($fadherent->datefin) {
+			print dol_print_date($fadherent->datefin, 'day');
+			if ($fadherent->hasDelay()) {
+				print " ".img_warning($langs->trans("Late"));
+			}
+		} else {
+			if (!$adht->subscription) {
+				print $langs->trans("SubscriptionNotRecorded");
+				if ($fadherent->statut > 0) {
+					print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+				}
+			} else {
+				print $langs->trans("SubscriptionNotReceived");
+				if ($fadherent->statut > 0) {
+					print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+				}
+			}
+		}
+		print '</td></tr>';
+	}
+
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
@@ -669,7 +692,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Presend form
-	$modelmail = 'partnership';
+	$modelmail = 'partnership_send';
 	$defaulttopic = 'InformationMessage';
 	$diroutput = $conf->partnership->dir_output;
 	$trackid = 'partnership'.$object->id;
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 8cd0cf79fd7..d5c28ee9a72 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -86,7 +86,7 @@ require_once __DIR__.'/class/partnership.class.php';
 //dol_include_once('/othermodule/class/otherobject.class.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("partnership@partnership", "other"));
+$langs->loadLangs(array("partnership", "members", "other"));
 
 $action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
@@ -185,8 +185,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-$permissiontoread = $user->rights->partnership->read;
-$permissiontoadd = $user->rights->partnership->write;
+$permissiontoread 	= $user->rights->partnership->read;
+$permissiontoadd 	= $user->rights->partnership->write;
 $permissiontodelete = $user->rights->partnership->delete;
 
 // Security check
@@ -248,6 +248,38 @@ if (empty($reshook)) {
 	$objectlabel = 'Partnership';
 	$uploaddir = $conf->partnership->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+	// Cancel partnership
+	if ($massaction == 'cancel' && $permissiontoadd) {
+		$db->begin();
+
+		$objecttmp = new $objectclass($db);
+		$nbok = 0;
+		foreach ($toselect as $toselectid) {
+			$result = $objecttmp->fetch($toselectid);
+			if ($result > 0) {
+				$result = $objecttmp->cancel($user, 3);
+				if ($result <= 0) {
+					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+					$error++;
+					break;
+				} else {
+					$nbok++;
+				}
+			} else {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			}
+		}
+
+		if (!$error) {
+			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
 }
 
 
@@ -466,7 +498,7 @@ $arrayofmassactions = array(
 	'cancel'=>$langs->trans("Cancel"),
 	//'generate_doc'=>$langs->trans("ReGeneratePDF"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
-	'presend'=>$langs->trans("SendByMail"),
+	'presend'=>$langs->trans("SendMail"),
 );
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
@@ -493,9 +525,9 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail = "SendPartnershipRef";
-$modelmail = "partnership";
+$modelmail = "partnership_send";
 $objecttmp = new Partnership($db);
-$trackid = 'xxxx'.$object->id;
+$trackid = 'partnership'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
@@ -742,6 +774,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	$i++;
 }
+$totalarray['nbfield']++; // End of subscription date
 
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
@@ -754,6 +787,7 @@ if ($num == 0) {
 			$colspan++;
 		}
 	}
+	$colspan++; // End of subscription date
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 

From 49ba11625aa9eab219eb9671301fcb90374e94e9 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 16 Apr 2021 09:58:16 +0000
Subject: [PATCH 070/928] Fixing style errors.

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

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 54a878f4e1f..c772ff47326 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -189,7 +189,7 @@ class Partnership extends CommonObject
 			'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
 		);
 
-		if($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member'){
+		if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
 			$this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1,);
 		} else {
 			$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1,);

From ba93ccaa0148283aa28eff5e51b94144483d7da9 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Fri, 16 Apr 2021 10:56:01 +0100
Subject: [PATCH 071/928] Decline reason for partnership management

---
 htdocs/langs/en_US/partnership.lang           |  2 ++
 htdocs/partnership/admin/about.php            |  4 ++--
 .../partnership/class/partnership.class.php   | 19 +++++++++++--------
 htdocs/partnership/partnership_card.php       |  8 ++++++--
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 758a44546fb..3ac04a5bae0 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -40,6 +40,8 @@ PartnershipManagedFor=Partnership managed for
 PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party	
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
 
 #
 # Template Mail
diff --git a/htdocs/partnership/admin/about.php b/htdocs/partnership/admin/about.php
index 2d5f17b1877..c8a01516ed6 100644
--- a/htdocs/partnership/admin/about.php
+++ b/htdocs/partnership/admin/about.php
@@ -87,13 +87,13 @@ llxHeader('', $langs->trans($page_name));
 // Subheader
 $linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_partnership@partnership');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 // Configuration header
 $head = partnershipAdminPrepareHead();
 print dol_get_fiche_head($head, 'about', '', 0, 'partnership@partnership');
 
-dol_include_once('/partnership/core/modules/modPartnership.class.php');
+require_once DOL_DOCUMENT_ROOT.'/core/modules/modPartnership.class.php';
 $tmpmodule = new modPartnership($db);
 print $tmpmodule->getDescLong();
 
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index c772ff47326..fd0233d3fef 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -849,21 +849,24 @@ class Partnership extends CommonObject
 	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
 	 */
-	public function refused($user, $notrigger = '')
+	public function refused($user, $reasondeclinenote = '', $notrigger = 0)
 	{
 		// Protection
 		if ($this->status == self::STATUS_REFUSED) {
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership_advance->validate))))
-		 {
-		 $this->error='Permission denied';
-		 return -1;
-		 }*/
+		$this->status 					= self::STATUS_REFUSED;
+		$this->reason_decline_or_cancel = $reasondeclinenote;
 
-		return $this->setStatusCommon($user, self::STATUS_REFUSED, $notrigger, 'PARTNERSHIP_REFUSE');
+		$result = $this->update($user);
+
+		if ($result) {
+			$this->reason_decline_or_cancel = $reasondeclinenote;
+			return 1;
+		}
+
+		return -1;
 	}
 
 	/**
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index cb082dc640d..2e6e43ac47e 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -209,10 +209,13 @@ if (empty($reshook)) {
 			if ($object->statut != $object::STATUS_REFUSED) {
 				$db->begin();
 
-				$result = $object->refused($user, GETPOST('reason_decline_or_cancel', 'alpha'));
+				$result = $object->refused($user, GETPOST('reason_decline_or_cancel', 'restricthtml'));
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
+				} else {
+					$object->reason_decline_or_cancel = GETPOST('reason_decline_or_cancel', 'restricthtml');
+					
 				}
 
 				if (!$error) {
@@ -249,6 +252,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
+if ($object->id > 0 && $object->status == $object::STATUS_REFUSED) $object->fields['reason_decline_or_cancel']['visible'] = 3;
 
 
 
@@ -400,7 +404,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($action == 'refuse') {
 		//Form to close proposal (signed or not)
 		$formquestion = array(
-			array('type' => 'text', 'name' => 'reason_decline_or_cancel', 'label' => $langs->trans("Note"), 'morecss' => 'reason_decline_or_cancel', 'value' => '')				// Field to complete private note (not replace)
+			array('type' => 'text', 'name' => 'reason_decline_or_cancel', 'label' => $langs->trans("Note"), 'morecss' => 'reason_decline_or_cancel minwidth400', 'value' => '')				// Field to complete private note (not replace)
 		);
 
 		// if (!empty($conf->notification->enabled)) {

From 5a445d92de4841d7365294527da0fb7d4b0d1377 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 16 Apr 2021 12:10:02 +0200
Subject: [PATCH 072/928] vat ok

---
 .../attendee_subscription.php                 | 35 +++++++------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 2f7d3e59478..9ce8c0470bd 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -241,15 +241,14 @@ if (empty($reshook) && $action == 'add') {
 			} else {
 				$thirdparty->name        = $email;
 			}
-
-			$thirdparty->address     = GETPOST("address");
-			$thirdparty->zip         = GETPOST("zipcode");
-			$thirdparty->town        = GETPOST("town");
-			$thirdparty->client      = 2;
-			$thirdparty->fournisseur = 0;
-			$thirdparty->country_id  = GETPOST("country_id", 'int');
-			$thirdparty->state_id    = GETPOST("state_id", 'int');
-			$thirdparty->email       = $email;
+			$thirdparty->address      = GETPOST("address");
+			$thirdparty->zip          = GETPOST("zipcode");
+			$thirdparty->town         = GETPOST("town");
+			$thirdparty->client       = 2;
+			$thirdparty->fournisseur  = 0;
+			$thirdparty->country_id   = GETPOST("country_id", 'int');
+			$thirdparty->state_id     = GETPOST("state_id", 'int');
+			$thirdparty->email        = $email;
 
 			// Load object modCodeTiers
 			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
@@ -270,6 +269,8 @@ if (empty($reshook) && $action == 'add') {
 			}
 			$thirdparty->code_client = $tmpcode;
 			$readythirdparty = $thirdparty->create($user);
+			$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
+			$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
 		} else {
 			// We have an existing thirdparty ready to use
 			$readythirdparty = 1;
@@ -329,24 +330,14 @@ if (empty($reshook) && $action == 'add') {
 
 			if (!$error) {
 				// Add line to draft invoice
-				$idprodsubscription = 0;
-				if (!empty($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
-					$idprodsubscription = $conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION;
-				}
-
-				$vattouse = get_default_tva($mysoc, $thirdparty, $idprodsubscription);
-
-				$result = $facture->addline($label, 0, 1, $vattouse, 0, 0, $idprodsubscription, 0, $datesubscription, '', 0, 0, '', 'TTC', $amount, 1);
+				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
+				$result = $facture->addline($label, 0, 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'TTC', floatval($project->price_registration), 1);
 				if ($result <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;
 					$error++;
 				}
-				$resultfacture = $facture->create($user);
-				if ($resultfacture < 0) {
-					$error++;
-					$errmsg .= $facture->error;
-				} else {
+				if (!$error) {
 					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.$confattendee->id;
 					Header("Location: ".$redirection);
 					exit;

From 2d7913322848e65a835f911bea9699a31bcef9f9 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 16 Apr 2021 12:15:23 +0200
Subject: [PATCH 073/928] now using ht instead or ttc

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 9ce8c0470bd..28c3375a62f 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -331,7 +331,7 @@ if (empty($reshook) && $action == 'add') {
 			if (!$error) {
 				// Add line to draft invoice
 				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-				$result = $facture->addline($label, 0, 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'TTC', floatval($project->price_registration), 1);
+				$result = $facture->addline($label, floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
 				if ($result <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;

From 22ec79d03ce781d7eff42e5337969ff4845fb595 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Fri, 16 Apr 2021 12:10:26 +0100
Subject: [PATCH 074/928] Code optimisation

---
 htdocs/langs/en_US/main.lang            |  1 +
 htdocs/langs/en_US/partnership.lang     |  3 +
 htdocs/partnership/partnership_card.php | 22 ++++++-
 htdocs/societe/partnership.php          | 79 ++++---------------------
 4 files changed, 35 insertions(+), 70 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index dc2a83f2015..51d4d99bd8c 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1070,6 +1070,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=To close
+ToRefuse=To refuse
 ToProcess=To process
 ToApprove=To approve
 GlobalOpenedElemView=Global view
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 3ac04a5bae0..3e176afdf8f 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -42,6 +42,9 @@ DatePartnershipStart=Start date
 DatePartnershipEnd=End date
 ReasonDecline=Decline reason
 ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ShowPartnership=Show partnership
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
 
 #
 # Template Mail
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 2e6e43ac47e..f46b608d603 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -161,6 +161,17 @@ if (empty($reshook)) {
 		}
 	}
 
+	$fk_soc = GETPOST('fk_soc', 'int');
+	if ($action == 'add' || ($action == 'update' && $object->fk_soc != $fk_soc)) {
+		$fpartnership = new Partnership($db);
+
+		$partnershipid = $fpartnership->fetch(0, "", $fk_soc);
+		if($partnershipid > 0){
+			setEventMessages($langs->trans('PartnershipAlreadyExist').' : '.$fpartnership->getNomUrl(0,'',1), '', 'errors');
+			$action = ($action == 'add') ? 'create' : 'edit';
+		}
+	}
+
 	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
 
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
@@ -250,6 +261,11 @@ if (empty($reshook)) {
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_PARTNERSHIP_TO';
 	$trackid = 'partnership'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
+	if(!empty($id) && !empty(GETPOST('confirm'))){
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+		exit;
+	}
 }
 
 if ($object->id > 0 && $object->status == $object::STATUS_REFUSED) $object->fields['reason_decline_or_cancel']['visible'] = 3;
@@ -391,7 +407,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($action == 'close') {
 		// Create an array for form
 		$formquestion = array();
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClose'), $langs->trans('ConfirmCloseAsk', $object->ref), 'confirm_close', $formquestion, 'yes', 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClose'), $langs->trans('ConfirmClosePartnershipAsk', $object->ref), 'confirm_close', $formquestion, 'yes', 1);
 	}
 	// Reopon confirmation
 	if ($action == 'reopen') {
@@ -415,7 +431,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// 	));
 		// }
 
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReasonDecline'), $text, 'confirm_refuse', $formquestion, '', 1, 250);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToRefuse'), $text, 'confirm_refuse', $formquestion, '', 1, 250);
 	}
 
 	// Confirmation of action xxxx
@@ -626,7 +642,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Cancel
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ACCEPTED) {
-					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes&token='.newToken(), '', $permissiontoadd);
+					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
 				} elseif ($object->status > $object::STATUS_ACCEPTED) {
 					// print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Re-Open").'</a>'."\n";
 					print dolGetButtonAction($langs->trans('Re-Open'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken(), '', $permissiontoadd);
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index 90071846531..0cb18930030 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -186,6 +186,7 @@ if (empty($reshook)) {
 			$object->fk_soc           			= $socid;
 			$object->date_partnership_start   	= (!GETPOST('date_partnership_start')) ? '' : $date_start;
 			$object->date_partnership_end     	= (!GETPOST('date_partnership_end')) ? '' : $date_end;
+			$object->note_public     			= GETPOST('note_public', 'restricthtml');
 			$object->date_creation 				= $now;
 			$object->fk_user_creat 				= $user->id;
 			$object->entity 					= $conf->entity;
@@ -229,6 +230,7 @@ if (empty($reshook)) {
 
 			$object->date_partnership_start   	= (!GETPOST('date_partnership_start')) ? '' : $date_start;
 			$object->date_partnership_end     	= (!GETPOST('date_partnership_end')) ? '' : $date_end;
+			$object->note_public     			= GETPOST('note_public', 'restricthtml');
 			$object->fk_user_creat 				= $user->id;
 			$object->fk_user_modif 				= $user->id;
 
@@ -266,15 +268,11 @@ if (empty($reshook)) {
 
 	// Actions when linking object each other
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
-
-	// // Actions to send emails
-	// $triggersendname = 'PARTNERSHIP_SENTBYMAIL';
-	// $autocopy = 'MAIN_MAIL_AUTOCOPY_PARTNERSHIP_TO';
-	// $trackid = 'partnership'.$object->id;
-	// include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
-
+$object->fields['fk_soc']['visible'] = 0;
+if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) $object->fields['reason_decline_or_cancel']['visible'] = 1;
+$object->fields['note_public']['visible'] = 1;
 
 /*
  * View
@@ -354,8 +352,6 @@ if ($socid) {
 	dol_print_error('', 'Parameter socid not defined');
 }
 
-$object->fields['fk_soc']['visible'] = 0;
-
 // Part to create
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Partnership")), '', '');
@@ -455,7 +451,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($action == 'close') {
 		// Create an array for form
 		$formquestion = array();
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClose'), $langs->trans('ConfirmCloseAsk', $object->ref), 'confirm_close', $formquestion, 'yes', 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClose'), $langs->trans('ConfirmClosePartnershipAsk', $object->ref), 'confirm_close', $formquestion, 'yes', 1);
 	}
 	// Reopon confirmation
 	if ($action == 'reopen') {
@@ -535,72 +531,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?socid='.$socid.'&action=edit', '', $permissiontoadd);
 			}
 
+			// Show
+			if ($permissiontoadd) {
+				print dolGetButtonAction($langs->trans('ShowPartnership'), '', 'default', dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$object->id, '', $permissiontoadd);
+			}
+			
 			// Cancel
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ACCEPTED) {
 					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
 				}
 			}
+
 		}
 		print '</div>'."\n";
 	}
-
-
-	// Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-
-	// if ($action != 'presend') {
-	// 	print '<div class="fichecenter"><div class="fichehalfleft">';
-	// 	print '<a name="builddoc"></a>'; // ancre
-
-	// 	$includedocgeneration = 0;
-
-	// 	// Documents
-	// 	if ($includedocgeneration) {
-	// 		$objref = dol_sanitizeFileName($object->ref);
-	// 		$relativepath = $objref.'/'.$objref.'.pdf';
-	// 		$filedir = $conf->partnership->dir_output.'/'.$object->element.'/'.$objref;
-	// 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-	// 		$genallowed = $user->rights->partnership->read; // If you can read, you can build the PDF to read content
-	// 		$delallowed = $user->rights->partnership->write; // If you can create/edit, you can remove a file on card
-	// 		print $formfile->showdocuments('partnership:Partnership', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
-	// 	}
-
-	// 	// Show links to link elements
-	// 	$linktoelem = $form->showLinkToObjectBlock($object, null, array('partnership'));
-	// 	$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
-
-	// 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-	// 	$MAXEVENT = 10;
-
-	// 	$morehtmlright = '<a href="'.dol_buildpath('/partnership/partnership_agenda.php', 1).'?id='.$object->id.'">';
-	// 	$morehtmlright .= $langs->trans("SeeAll");
-	// 	$morehtmlright .= '</a>';
-
-	// 	// List of actions on element
-	// 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	// 	$formactions = new FormActions($db);
-	// 	$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
-
-	// 	print '</div></div></div>';
-	// }
-
-	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-
-	// Presend form
-	$modelmail = 'partnership';
-	$defaulttopic = 'InformationMessage';
-	$diroutput = $conf->partnership->dir_output;
-	$trackid = 'partnership'.$object->id;
-
-	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 // End of page

From 1324f3d375d9e7b4eed864ac848e2211abcb9f9b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 16 Apr 2021 12:13:05 +0000
Subject: [PATCH 075/928] Fixing style errors.

---
 htdocs/partnership/partnership_card.php | 7 +++----
 htdocs/societe/partnership.php          | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index f46b608d603..d387f0197a9 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -166,8 +166,8 @@ if (empty($reshook)) {
 		$fpartnership = new Partnership($db);
 
 		$partnershipid = $fpartnership->fetch(0, "", $fk_soc);
-		if($partnershipid > 0){
-			setEventMessages($langs->trans('PartnershipAlreadyExist').' : '.$fpartnership->getNomUrl(0,'',1), '', 'errors');
+		if ($partnershipid > 0) {
+			setEventMessages($langs->trans('PartnershipAlreadyExist').' : '.$fpartnership->getNomUrl(0, '', 1), '', 'errors');
 			$action = ($action == 'add') ? 'create' : 'edit';
 		}
 	}
@@ -226,7 +226,6 @@ if (empty($reshook)) {
 					$error++;
 				} else {
 					$object->reason_decline_or_cancel = GETPOST('reason_decline_or_cancel', 'restricthtml');
-					
 				}
 
 				if (!$error) {
@@ -262,7 +261,7 @@ if (empty($reshook)) {
 	$trackid = 'partnership'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-	if(!empty($id) && !empty(GETPOST('confirm'))){
+	if (!empty($id) && !empty(GETPOST('confirm'))) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
 	}
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index 0cb18930030..1ee013f985c 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -535,14 +535,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($permissiontoadd) {
 				print dolGetButtonAction($langs->trans('ShowPartnership'), '', 'default', dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$object->id, '', $permissiontoadd);
 			}
-			
+
 			// Cancel
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ACCEPTED) {
 					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
 				}
 			}
-
 		}
 		print '</div>'."\n";
 	}

From ae07e511f7b37134909e77160ce3d1f7f59d9985 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Fri, 16 Apr 2021 12:44:39 +0100
Subject: [PATCH 076/928] Fix Errors

---
 htdocs/partnership/partnership_card.php | 10 +++++++---
 htdocs/partnership/partnership_list.php |  6 ++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index d387f0197a9..37f2163382b 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -161,11 +161,13 @@ if (empty($reshook)) {
 		}
 	}
 
-	$fk_soc = GETPOST('fk_soc', 'int');
-	if ($action == 'add' || ($action == 'update' && $object->fk_soc != $fk_soc)) {
+	$fk_partner 	= ($managedfor == 'member') ? GETPOST('fk_member', 'int') : GETPOST('fk_soc', 'int');
+	$obj_partner 	= ($managedfor == 'member') ? $object->fk_member : $object->fk_soc;
+	
+	if ($action == 'add' || ($action == 'update' && $obj_partner != $fk_partner)) {
 		$fpartnership = new Partnership($db);
 
-		$partnershipid = $fpartnership->fetch(0, "", $fk_soc);
+		$partnershipid = $fpartnership->fetch(0, "", $fk_partner);
 		if ($partnershipid > 0) {
 			setEventMessages($langs->trans('PartnershipAlreadyExist').' : '.$fpartnership->getNomUrl(0, '', 1), '', 'errors');
 			$action = ($action == 'add') ? 'create' : 'edit';
@@ -503,6 +505,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 }*/
 	$morehtmlref .= '</div>';
 
+	if ($managedfor == 'member') $npfilter .= " AND te.fk_member > 0 "; else $npfilter .= " AND te.fk_soc > 0 ";
+	$object->next_prev_filter = $npfilter;
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 7e924334f7e..88616599a67 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -735,9 +735,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 					$textlate .= ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24).' '.$langs->trans("days").')';
 					print " ".img_warning($langs->trans("SubscriptionLate").$textlate);
 				}
-				print '</td>';
 			} else {
-				print '<td class="nowrap left">';
 				if ($adherent->subscription == 'yes') {
 					print $langs->trans("SubscriptionNotReceived");
 					if ($adherent->statut > 0) {
@@ -774,7 +772,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	$i++;
 }
-$totalarray['nbfield']++; // End of subscription date
+if ($managedfor != 'member') $totalarray['nbfield']++; // End of subscription date
 
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
@@ -787,7 +785,7 @@ if ($num == 0) {
 			$colspan++;
 		}
 	}
-	$colspan++; // End of subscription date
+	if ($managedfor != 'member') $colspan++; // End of subscription date
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 

From 54c2f26c5cf409fd58e559423ef32b535e286c47 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 16 Apr 2021 12:47:39 +0000
Subject: [PATCH 077/928] Fixing style errors.

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

diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 37f2163382b..828a621d4d6 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -163,7 +163,7 @@ if (empty($reshook)) {
 
 	$fk_partner 	= ($managedfor == 'member') ? GETPOST('fk_member', 'int') : GETPOST('fk_soc', 'int');
 	$obj_partner 	= ($managedfor == 'member') ? $object->fk_member : $object->fk_soc;
-	
+
 	if ($action == 'add' || ($action == 'update' && $obj_partner != $fk_partner)) {
 		$fpartnership = new Partnership($db);
 

From f784114176de712204b8597a4c3133220ce02996 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Fri, 16 Apr 2021 13:53:12 +0100
Subject: [PATCH 078/928] Add email template for accepted partnership

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 3 ++-
 htdocs/langs/en_US/partnership.lang              | 3 +++
 htdocs/partnership/partnership_list.php          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index fed2bf56ec2..97ee2b751ae 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -421,8 +421,9 @@ create table llx_partnership_extrafields
 ALTER TABLE llx_partnership_extrafields ADD INDEX idx_partnership_fk_object(fk_object);
 
 INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipWillExpire)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipWillSoonExpireTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipWillSoonExpireContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
-INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipRefused)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
 INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipCanceled)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipCanceledTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipRefused)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipAccepted)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipAcceptedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipAcceptedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
 ALTER TABLE llx_adherent ADD COLUMN website varchar(255) NULL AFTER email;
 ALTER TABLE llx_facture_fourn ADD COLUMN date_closing datetime DEFAULT NULL after date_valid;
 
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 3e176afdf8f..4d5b518431f 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -51,14 +51,17 @@ ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
 #
 SendingEmailOnPartnershipWillExpire=Partnership will expire
 SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
 SendingEmailOnPartnershipCanceled=Partnership canceled
 
 YourPartnershipWillSoonExpireTopic=Partnership expiration
 YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
 YourPartnershipCanceledTopic=Partnership canceled
 
 YourPartnershipWillSoonExpireContent=We inform you that your partnership will soon expire.
 YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
 YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
 
 #
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 88616599a67..1ae90d0d4cf 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -725,7 +725,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	}
 	// End of subscription date
 	if ($managedfor == 'member') {
-		print '<td class="nowrap center">';
+		print '<td class="nowrap center endofsubscriptiondate">';
 		$result = $adherent->fetch($object->fk_member);
 		if ($result) {
 			$datefin = $adherent->datefin;

From e52531114242a754b3437c1f76217849cf5c5e3a Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 16 Apr 2021 14:54:07 +0200
Subject: [PATCH 079/928] now using the invoice id as ref in url passed to
 newpayment page, for conference subscriptions

---
 .../attendee_subscription.php                 |  2 +-
 htdocs/public/payment/newpayment.php          | 48 +++++++------------
 2 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 28c3375a62f..1121248e048 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -338,7 +338,7 @@ if (empty($reshook) && $action == 'add') {
 					$error++;
 				}
 				if (!$error) {
-					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.$confattendee->id;
+					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.dol_encode($facture->id, $dolibarr_main_instance_unique_id);
 					Header("Location: ".$redirection);
 					exit;
 				}
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 546a7ee0e11..d03f004f317 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -61,8 +61,7 @@ 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';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 // Hook to be used by external payment modules (ie Payzen, ...)
 include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
@@ -114,36 +113,21 @@ if (!$action) {
 
 if ($source == 'conferencesubscription') {
 	// Finding the Attendee
-	$attendee = new ConferenceOrBoothAttendee($db);
-	$result = $attendee->fetch('', $ref);
-	if ($result <= 0) {
-		$mesg = $attendee->error;
-		$error++;
-	}
-	$object = $attendee;
-
-	// Finding the thirdparty associated to the Attendee
-	$thirdparty = new Societe($db);
-	$resultthirdparty = $thirdparty->fetch($attendee->fk_soc);
-	if ($resultthirdparty <= 0) {
-		$mesg = $thirdparty->error;
-		$error++;
-	}
-
-	// Finding the conference
-	$conference = new ConferenceOrBooth($db);
-	$resultconf = $conference->fetch($attendee->fk_actioncomm);
-	if ($resultconf <= 0) {
-		$mesg = $conference->error;
-		$error++;
-	}
-
-	// Finding the project
-	$project = new Project($db);
-	$resultproj = $project->fetch($conference->fk_project);
-	if ($resultproj <= 0) {
-		$mesg = $project->error;
+	$decodedinvoiceid = dol_decode(GETPOST('ref'), $dolibarr_main_instance_unique_id);
+	$invoice = new Facture($db);
+	$resultinvoice = $invoice->fetch($decodedinvoiceid);
+	if ($resultinvoice <= 0) {
+		$mesg = $invoice->error;
 		$error++;
+	} else {
+		// Finding the thirdparty associated to the Attendee
+		$thirdparty = new Societe($db);
+		$resultthirdparty = $thirdparty->fetch($invoice->socid);
+		if ($resultthirdparty <= 0) {
+			$mesg = $thirdparty->error;
+			$error++;
+		}
+		$object = $thirdparty;
 	}
 }
 
@@ -1824,7 +1808,7 @@ if ($source == 'conferencesubscription') {
 	// Amount
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
-	$valtoshow = $project->price_registration;
+	$valtoshow = $invoice->total_ttc;
 	print '<b>'.price($valtoshow).'</b>';
 	print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 	print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';

From 63d7698b43b7ffd2be954bfbd0930428b6030481 Mon Sep 17 00:00:00 2001
From: Robin <yann.robin@batiactugroupe.com>
Date: Fri, 16 Apr 2021 15:26:29 +0200
Subject: [PATCH 080/928] ADD company option for disable Workforce

---
 htdocs/societe/card.php | 43 ++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 66b5f68564e..512c66f9ddd 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1459,15 +1459,22 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Type - Workforce/Staff
-		print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'."\n";
+		print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.( ($conf->browser->layout == 'phone' || !empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) ? ' colspan="3"' : '').'>'."\n";
 		$sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 		print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
 		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		print '</td>';
-		if ($conf->browser->layout == 'phone') print '</tr><tr>';
-		print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
-		print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
-		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) 
+		{
+			print '</td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
+			print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
+		else 
+		{
+			print '<input type="hidden" name="effectif_id" id="effectif_id" value="'.$object->effectif_id.'">';
+		}
 		print '</td></tr>';
 
 		// Legal Form
@@ -2081,14 +2088,21 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</tr>';
 
 			// Type - Workforce/Staff
-			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
+			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.( ($conf->browser->layout == 'phone' || !empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) ? ' colspan="3"' : '').'>';
 			print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-			print '</td>';
-			if ($conf->browser->layout == 'phone') print '</tr><tr>';
-			print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
-			print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) 
+			{
+				print '</td>';
+				if ($conf->browser->layout == 'phone') print '</tr><tr>';
+				print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
+				print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
+			else 
+			{
+				print '<input type="hidden" name="effectif_id" id="effectif_id" value="'.$object->effectif_id.'">';
+			}
 			print '</td></tr>';
 
 			// Juridical type
@@ -2494,7 +2508,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		// Workforce/Staff
-		print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
+		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) 
+		{
+			print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
+		}
 
 		print '</table>';
 		print '</div>';

From f8fcf7c16b68fa4fe4bc80820be42808b5826df3 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Fri, 16 Apr 2021 16:55:19 +0200
Subject: [PATCH 081/928] FIX : type link extrafield case for advanced target
 emailing

---
 htdocs/comm/mailing/class/advtargetemailing.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 6987a27dacd..ff2e056344c 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -640,6 +640,10 @@ class AdvanceTargetingMailing extends CommonObject
 						if ($arrayquery['options_'.$key]!=''){
 							$sqlwhere[]= " (te.".$key." = ".$arrayquery['options_'.$key].")";
 						}
+					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
+						if ($arrayquery['options_'.$key] > 0){
+                                                        $sqlwhere[]= " (te.".$key." = ".$arrayquery['options_'.$key].")";
+                                                }
 					} else {
 						if (is_array($arrayquery['options_'.$key])) {
 							$sqlwhere[]= " (te.".$key." IN ('".implode("','", $arrayquery['options_'.$key])."'))";
@@ -666,7 +670,6 @@ class AdvanceTargetingMailing extends CommonObject
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-
 					$this->thirdparty_lines[$i] = $obj->rowid;
 
 					$i++;

From 37f44f4a07d05bd25de1e7d4aa6a776ec52c9d9f Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 16 Apr 2021 14:58:57 +0000
Subject: [PATCH 082/928] Fixing style errors.

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

diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index ff2e056344c..3a8a9396d29 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -643,7 +643,7 @@ class AdvanceTargetingMailing extends CommonObject
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
 						if ($arrayquery['options_'.$key] > 0){
                                                         $sqlwhere[]= " (te.".$key." = ".$arrayquery['options_'.$key].")";
-                                                }
+						}
 					} else {
 						if (is_array($arrayquery['options_'.$key])) {
 							$sqlwhere[]= " (te.".$key." IN ('".implode("','", $arrayquery['options_'.$key])."'))";

From b9f0bc454be5899c9dbcaa7009faf70ae5f0c063 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 16 Apr 2021 17:00:10 +0200
Subject: [PATCH 083/928] Update llx_20_c_departements.sql

Tunisia
---
 .../mysql/data/llx_20_c_departements.sql      | 55 ++++++++++---------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index c00b0e009f3..1f3de968346 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -55,7 +55,8 @@
 -- Luxembourg
 -- Netherlands
 -- (Moroco)
--- Romania 
+-- Romania
+-- Tunisia
 
 
 
@@ -803,31 +804,33 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (18801, 'VN', '', 0, '', 'Vrancea');
 
 
--- Provinces Tunisia (id country=10)
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN01', 1001, '', 0, '', 'Ariana', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN02', 1001, '', 0, '', 'Béja', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN03', 1001, '', 0, '', 'Ben Arous', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN04', 1001, '', 0, '', 'Bizerte', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN05', 1001, '', 0, '', 'Gabès', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN06', 1001, '', 0, '', 'Gafsa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN07', 1001, '', 0, '', 'Jendouba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN08', 1001, '', 0, '', 'Kairouan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN09', 1001, '', 0, '', 'Kasserine', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN10', 1001, '', 0, '', 'Kébili', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN11', 1001, '', 0, '', 'La Manouba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN12', 1001, '', 0, '', 'Le Kef', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN13', 1001, '', 0, '', 'Mahdia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN14', 1001, '', 0, '', 'Médenine', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN15', 1001, '', 0, '', 'Monastir', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN16', 1001, '', 0, '', 'Nabeul', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN17', 1001, '', 0, '', 'Sfax', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN18', 1001, '', 0, '', 'Sidi Bouzid', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN19', 1001, '', 0, '', 'Siliana', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN20', 1001, '', 0, '', 'Sousse', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN21', 1001, '', 0, '', 'Tataouine', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN22', 1001, '', 0, '', 'Tozeur', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN23', 1001, '', 0, '', 'Tunis', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('TN24', 1001, '', 0, '', 'Zaghouan', 1);
+-- Tunisia Governorates / Provinces / Wilaya (id country=10)
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN01', '', 0, '', 'Ariana');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN02', '', 0, '', 'Béja');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN03', '', 0, '', 'Ben Arous');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN04', '', 0, '', 'Bizerte');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN05', '', 0, '', 'Gabès');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN06', '', 0, '', 'Gafsa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN07', '', 0, '', 'Jendouba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN08', '', 0, '', 'Kairouan');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN09', '', 0, '', 'Kasserine');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN10', '', 0, '', 'Kébili');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN11', '', 0, '', 'La Manouba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN12', '', 0, '', 'Le Kef');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN13', '', 0, '', 'Mahdia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN14', '', 0, '', 'Médenine');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN15', '', 0, '', 'Monastir');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN16', '', 0, '', 'Nabeul');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN17', '', 0, '', 'Sfax');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN18', '', 0, '', 'Sidi Bouzid');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN19', '', 0, '', 'Siliana');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN20', '', 0, '', 'Sousse');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN21', '', 0, '', 'Tataouine');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN22', '', 0, '', 'Tozeur');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN23', '', 0, '', 'Tunis');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN24', '', 0, '', 'Zaghouan');
+
+
 
 
 -- Provinces Bolivia (id country=52)

From af9c2384ef3832e837fefffcbedad8833df6e254 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Apr 2021 19:14:01 +0200
Subject: [PATCH 084/928] Add warning

---
 htdocs/comm/mailing/cibles.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index bcf1e9c1e3b..fe3f4a76d96 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -689,6 +689,7 @@ if ($object->fetch($id) >= 0)
 
 				// Search Icon
 				print '<td class="right">';
+				print '<!-- ID mailing_cibles = '.$obj->rowid.' -->';
 				if ($obj->statut == 0)	// Not sent yet
 				{
 					if ($user->rights->mailing->creer && $allowaddtarget) {

From 712e1c4e7c27643b6584526b0705ba776fb8c728 Mon Sep 17 00:00:00 2001
From: "jove@bisquerra.com" <jove@bisquerra.com>
Date: Sat, 17 Apr 2021 01:06:30 +0200
Subject: [PATCH 085/928] NEW Edit sales lines rights in TakePOS

---
 htdocs/core/modules/modTakePos.class.php | 14 ++++++++++++++
 htdocs/langs/en_US/admin.lang            |  2 ++
 htdocs/takepos/invoice.php               |  9 ++++++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index d34213f062c..7a1384a2de5 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -202,6 +202,20 @@ class modTakePos extends DolibarrModules
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'run';
+		
+		$r++;
+		$this->rights[$r][0] = 50152;
+		$this->rights[$r][1] = 'Edit sales lines';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'editlines';
+		
+		$r++;
+		$this->rights[$r][0] = 50153;
+		$this->rights[$r][1] = 'Edit ordered sales lines';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'editorderedlines';
 
 
 		// Main menu entries
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b103d0082ba..d81b2fc6e9d 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -964,6 +964,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index c7a01e5d8bc..273d8ec5a6b 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -631,7 +631,8 @@ if ($action == "delete") {
 if ($action == "updateqty") {
 	foreach ($invoice->lines as $line) {
 		if ($line->id == $idline) {
-			$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+			if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+			else $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 		}
 	}
 
@@ -653,7 +654,8 @@ if ($action == "updateprice") {
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($line->remise_percent) / 100) < price2num($price_min)))) {
 				echo $langs->trans("CantBeLessThanMinPrice");
 			} else {
-				$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+				if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+				else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 			}
 		}
 	}
@@ -675,7 +677,8 @@ if ($action == "updatereduction") {
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->multicurrency_subprice) * (1 - price2num($number) / 100) < price2num($price_min)))) {
 				echo $langs->trans("CantBeLessThanMinPrice");
 			} else {
-				$result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+				if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+				else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 			}
 		}
 	}

From 83da58b85f4d5c33d82c259d5ebbd18c98eb3e33 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sat, 17 Apr 2021 01:17:48 +0200
Subject: [PATCH 086/928] Fix travis

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

diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 7a1384a2de5..84810e80a53 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -202,14 +202,14 @@ class modTakePos extends DolibarrModules
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'run';
-		
+
 		$r++;
 		$this->rights[$r][0] = 50152;
 		$this->rights[$r][1] = 'Edit sales lines';
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'editlines';
-		
+
 		$r++;
 		$this->rights[$r][0] = 50153;
 		$this->rights[$r][1] = 'Edit ordered sales lines';

From 78dbf4f7ffdedb0eaf3b104618cc80536146f4c2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 17 Apr 2021 07:49:19 +0200
Subject: [PATCH 087/928] Split mod fournisseur

---
 htdocs/comm/action/class/cactioncomm.class.php | 4 ++--
 htdocs/comm/index.php                          | 4 ++--
 htdocs/compta/accounting-files.php             | 2 +-
 htdocs/compta/index.php                        | 2 +-
 htdocs/contact/consumption.php                 | 4 ++--
 htdocs/core/ajax/selectsearchbox.php           | 2 +-
 htdocs/core/lib/product.lib.php                | 2 +-
 htdocs/core/menus/standard/eldy.lib.php        | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 8483839b944..66586cff4a3 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -201,10 +201,10 @@ class CActionComm
 						if ($obj->module == 'propal' && empty($conf->propal->enabled)  && empty($user->propale->lire)) {
 							$qualified = 0;
 						}
-						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || empty($conf->supplier_invoice->enabled)) && empty($user->fournisseur->facture->lire)) {
+						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($user->rights->fournisseur->facture->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (empty($conf->supplier_invoice->enabled) && empty($user->rights->supplier_invoice->lire)))) {
 							$qualified = 0;
 						}
-						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || empty($conf->supplier_order->enabled)) && empty($user->fournisseur->commande->lire)) {
+						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($user->rights->fournisseur->commande->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (empty($conf->supplier_order->enabled) && empty($user->rights->supplier_order->lire)))) {
 							$qualified = 0;
 						}
 						if ($obj->module == 'shipping' && empty($conf->expedition->enabled) && empty($user->expedition->lire)) {
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index a3826fa7dcd..8b763243bf1 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -588,7 +588,7 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
 /*
  * Last suppliers
  */
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->societe->lire) {
+if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->societe->lire) {
 	$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 	$sql .= ", s.code_client, s.code_compta, s.client";
 	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
@@ -647,7 +647,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				{
 					$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
 				}*/
-				if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur) {
+				if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur) {
 					$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
 				}
 				print $s;
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 68c73c84090..9ce9dfb6f8b 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -128,7 +128,7 @@ $error = 0;
 
 $listofchoices = array(
 	'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills', 'enabled' => !empty($conf->facture->enabled), 'perms' => !empty($user->rights->facture->lire)),
-	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => !empty($conf->supplier_invoice->enabled), 'perms' => !empty($user->rights->fournisseur->facture->lire)),
+	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => !empty($conf->supplier_invoice->enabled), 'perms' => (!empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->supplier_invoice->lire)),
 	'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips', 'enabled' => !empty($conf->expensereport->enabled), 'perms' => !empty($user->rights->expensereport->lire)),
 	'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation', 'enabled' => !empty($conf->don->enabled), 'perms' => !empty($user->rights->don->lire)),
 	'selectsocialcontributions'=>array('label'=>'SocialContributions', 'enabled' => !empty($conf->tax->enabled), 'perms' => !empty($user->rights->tax->charges->lire)),
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 4d46f04a136..e208fce3539 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -258,7 +258,7 @@ if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 
 
 // Last modified supplier invoices
-if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
+if (((!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire))) {
 	$langs->load("boxes");
 	$facstatic = new FactureFournisseur($db);
 
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index b87a73e8cc2..f421d287299 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -167,10 +167,10 @@ if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) {
 
 if ($object->thirdparty->fournisseur) {
 	$thirdTypeArray['supplier'] = $langs->trans("supplier");
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
+	if ((!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) {
 		$elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
 	}
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) {
+	if ((!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->lire)) {
 		$elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
 	}
 
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index d10324ef620..5d81f4b250d 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -115,7 +115,7 @@ if (!empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARC
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) {
 	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
+if ((!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED)) || (!empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire)) {
 	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index e8ce515317f..d054c8d5569 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -58,7 +58,7 @@ function product_prepare_head($object)
 	}
 
 	if (!empty($object->status_buy) || (!empty($conf->margin->enabled) && !empty($object->status))) {   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
-		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
+		if ((((!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)))
 		|| (!empty($conf->margin->enabled) && $user->rights->margin->liretous)
 		) {
 			$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 7e815523283..5e63dc4d081 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -281,7 +281,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			) ? 1 : 0,
 		'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire)
 			|| !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read)
-			|| !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),
+			|| !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->supplier_invoice->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),
 		'module'=>'facture|supplier_invoice|don|tax|salaries|loan'
 	);
 	$menu_arr[] = array(

From 89d960f6dd67f857ca134603b73621703a2cf211 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 17 Apr 2021 08:13:59 +0200
Subject: [PATCH 088/928] Field tva is deprecated

---
 htdocs/fourn/class/fournisseur.facture.class.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 4a19e4bdc81..fca16305047 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -177,7 +177,13 @@ class FactureFournisseur extends CommonInvoice
 
 	public $amount = 0;
 	public $remise = 0;
+
+	/**
+	 * @var float tva
+	 * @deprecated Use $total_tva
+	 */
 	public $tva = 0;
+
 	public $localtax1;
 	public $localtax2;
 	public $total_ht = 0;
@@ -703,7 +709,7 @@ class FactureFournisseur extends CommonInvoice
 				$this->remise				= $obj->remise;
 				$this->close_code			= $obj->close_code;
 				$this->close_note			= $obj->close_note;
-				$this->tva = $obj->tva;
+				$this->tva					= $obj->tva;
 				$this->total_localtax1		= $obj->localtax1;
 				$this->total_localtax2		= $obj->localtax2;
 				$this->total_ht				= $obj->total_ht;

From f7b1ee9abade9eae9b7e8944ecd8b4e22e4055aa Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Sat, 17 Apr 2021 13:15:16 +0100
Subject: [PATCH 089/928] Add property "website" on the member card

---
 htdocs/adherents/card.php                        | 15 +++++++++++++++
 htdocs/adherents/class/adherent.class.php        | 11 ++++++++++-
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 9b28cc6473e..f247af3a2ee 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -284,6 +284,7 @@ if (empty($reshook)) {
 			$object->phone_perso = trim(GETPOST("phone_perso", 'alpha'));
 			$object->phone_mobile = trim(GETPOST("phone_mobile", 'alpha'));
 			$object->email       = preg_replace('/\s+/', '', GETPOST("member_email", 'alpha'));
+			$object->url 		 = trim(GETPOST('member_url', 'custom', 0, FILTER_SANITIZE_URL));
 			$object->socialnetworks = array();
 			foreach ($socialnetworks as $key => $value) {
 				if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
@@ -431,6 +432,7 @@ if (empty($reshook)) {
 		// $facebook=GETPOST("member_facebook", 'alpha');
 		// $linkedin=GETPOST("member_linkedin", 'alpha');
 		$email = preg_replace('/\s+/', '', GETPOST("member_email", 'alpha'));
+		$url   = trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
 		$login = GETPOST("member_login", 'alphanohtml');
 		$pass = GETPOST("password", 'alpha');
 		$photo = GETPOST("photo", 'alpha');
@@ -469,6 +471,7 @@ if (empty($reshook)) {
 		// $object->linkedin    = $linkedin;
 
 		$object->email       = $email;
+		$object->url       	 = $url;
 		$object->login       = $login;
 		$object->pass        = $pass;
 		$object->birth       = $birthdate;
@@ -537,6 +540,10 @@ if (empty($reshook)) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorBadEMail", $email), null, 'errors');
 		}
+		if (!empty($object->url) && !isValidUrl($object->url)) {
+			$langs->load("errors");
+			setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
+		}
 		$public = 0;
 		if (isset($public)) {
 			$public = 1;
@@ -1031,6 +1038,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED ? '<span class="fieldrequired">' : '').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED ? '</span>' : '').'</td>';
 		print '<td>'.img_picto('', 'object_email').' <input type="text" name="member_email" class="minwidth300" maxlength="255" value="'.(GETPOSTISSET('member_email') ? GETPOST('member_email', 'alpha') : $object->email).'"></td></tr>';
 
+		// Website
+		print '<tr><td>'.$form->editfieldkey('Web', 'member_url', '', $object, 0).'</td>';
+		print '<td>'.img_picto('', 'globe').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="member_url" id="member_url" value="'.$object->url.'"></td></tr>';
+
 		// Address
 		print '<tr><td class="tdtop">'.$langs->trans("Address").'</td><td>';
 		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(GETPOSTISSET('address') ?GETPOST('address', 'alphanohtml') : $object->address).'</textarea>';
@@ -1278,6 +1289,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED ? '<span class="fieldrequired">' : '').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED ? '</span>' : '').'</td>';
 		print '<td>'.img_picto('', 'object_email').' <input type="text" name="member_email" class="minwidth300" maxlength="255" value="'.(GETPOSTISSET("member_email") ? GETPOST("member_email", '', 2) : $object->email).'"></td></tr>';
 
+		// Website
+		print '<tr><td>'.$form->editfieldkey('Web', 'member_url', GETPOST('member_url', 'alpha'), $object, 0).'</td>';
+			print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="member_url" id="member_url" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx " value="'.(GETPOSTISSET('member_url') ?GETPOST('member_url', 'alpha') : $object->url).'"></td></tr>';
+
 		// Address
 		print '<tr><td>'.$langs->trans("Address").'</td><td>';
 		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_2.'">'.(GETPOSTISSET("address") ? GETPOST("address", 'alphanohtml', 2) : $object->address).'</textarea>';
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 0299b32663c..bd9613d0645 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -141,6 +141,11 @@ class Adherent extends CommonObject
 	 */
 	public $email;
 
+	/**
+	 * @var string url
+	 */
+	public $url;
+
 	/**
 	 * @var array array of socialnetworks
 	 */
@@ -309,6 +314,7 @@ class Adherent extends CommonObject
 		'state_id' => array('type' => 'integer', 'label' => 'State id', 'enabled' => 1, 'visible' => -1, 'position' => 90),
 		'country' => array('type' => 'integer:Ccountry:core/class/ccountry.class.php', 'label' => 'Country', 'enabled' => 1, 'visible' => -1, 'position' => 95),
 		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'enabled' => 1, 'visible' => -1, 'position' => 100),
+		'url' =>array('type'=>'varchar(255)', 'label'=>'Url', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
 		'socialnetworks' => array('type' => 'text', 'label' => 'Socialnetworks', 'enabled' => 1, 'visible' => -1, 'position' => 105),
 		'phone' => array('type' => 'varchar(30)', 'label' => 'Phone', 'enabled' => 1, 'visible' => -1, 'position' => 115),
 		'phone_perso' => array('type' => 'varchar(30)', 'label' => 'Phone perso', 'enabled' => 1, 'visible' => -1, 'position' => 120),
@@ -645,6 +651,7 @@ class Adherent extends CommonObject
 		$this->setUpperOrLowerCase();
 		$this->note_public = ($this->note_public ? $this->note_public : $this->note_public);
 		$this->note_private = ($this->note_private ? $this->note_private : $this->note_private);
+		$this->url = $this->url ?clean_url($this->url, 0) : '';
 
 		// Check parameters
 		if (!empty($conf->global->ADHERENT_MAIL_REQUIRED) && !isValidEMail($this->email)) {
@@ -670,6 +677,7 @@ class Adherent extends CommonObject
 		$sql .= ", country = ".($this->country_id > 0 ? $this->db->escape($this->country_id) : "null");
 		$sql .= ", state_id = ".($this->state_id > 0 ? $this->db->escape($this->state_id) : "null");
 		$sql .= ", email = '".$this->db->escape($this->email)."'";
+		$sql .= ", url = ".(!empty($this->url) ? "'".$this->db->escape($this->url)."'" : "null");
 		$sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
 		$sql .= ", phone = ".($this->phone ? "'".$this->db->escape($this->phone)."'" : "null");
 		$sql .= ", phone_perso = ".($this->phone_perso ? "'".$this->db->escape($this->phone_perso)."'" : "null");
@@ -1282,7 +1290,7 @@ class Adherent extends CommonObject
 		$sql = "SELECT d.rowid, d.ref, d.ref_ext, d.civility as civility_code, d.gender, d.firstname, d.lastname,";
 		$sql .= " d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note_private,";
 		$sql .= " d.note_public,";
-		$sql .= " d.email, d.socialnetworks, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,";
+		$sql .= " d.email, d.url, d.socialnetworks, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,";
 		$sql .= " d.photo, d.fk_adherent_type, d.morphy, d.entity,";
 		$sql .= " d.datec as datec,";
 		$sql .= " d.tms as datem,";
@@ -1361,6 +1369,7 @@ class Adherent extends CommonObject
 				$this->phone_perso = $obj->phone_perso;
 				$this->phone_mobile = $obj->phone_mobile;
 				$this->email = $obj->email;
+				$this->url = $obj->url;
 
 				$this->socialnetworks = (array) json_decode($obj->socialnetworks, true);
 
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 97ee2b751ae..c1e75bbe353 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -424,7 +424,7 @@ INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,positi
 INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipCanceled)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipCanceledTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
 INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipRefused)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
 INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipAccepted)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipAcceptedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipAcceptedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
-ALTER TABLE llx_adherent ADD COLUMN website varchar(255) NULL AFTER email;
+ALTER TABLE llx_adherent ADD COLUMN url varchar(255) NULL AFTER email;
 ALTER TABLE llx_facture_fourn ADD COLUMN date_closing datetime DEFAULT NULL after date_valid;
 
 ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_closing integer DEFAULT NULL after fk_user_valid;

From 17f84c4edc1e4b98b524190c4e5265bb8a1fbd04 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 17 Apr 2021 14:18:42 +0200
Subject: [PATCH 090/928] Fix new member form use getpost instead FORCEXXX

## Fix use FORCETYPE, FORCECOUNTRYCODE, FORCEMORPHY even if GETPOST bas value
## Fix code style : typeid is note type
## Fix reset amount when $amount is set by script or by hook
## Fix some code style
---
 htdocs/public/members/new.php | 82 +++++++++++++++++------------------
 1 file changed, 40 insertions(+), 42 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index e6b7a3e7a38..19fa23af080 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -201,12 +201,12 @@ if (empty($reshook) && $action == 'add') {
 			$langs->load("errors");
 			$errmsg .= $langs->trans("ErrorPasswordsMustMatch")."<br>\n";
 		}
-		if (!GETPOST("email")) {
+		if (!GETPOST('email')) {
 			$error++;
 			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("EMail"))."<br>\n";
 		}
 	}
-	if (GETPOST('type') <= 0) {
+	if (GETPOST('typeid') <= 0) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."<br>\n";
 	}
@@ -214,21 +214,21 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('Nature'))."<br>\n";
 	}
-	if (!GETPOST("lastname")) {
+	if (!GETPOST('lastname')) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
 	}
-	if (!GETPOST("firstname")) {
+	if (!GETPOST('firstname') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
 	}
-	if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
+	if (GETPOST('email') && !isValidEmail(GETPOST('email'))) {
 		$error++;
 		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
+		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST('email'))."<br>\n";
 	}
-	$birthday = dol_mktime(GETPOST("birthhour", 'int'), GETPOST("birthmin", 'int'), GETPOST("birthsec", 'int'), GETPOST("birthmonth", 'int'), GETPOST("birthday", 'int'), GETPOST("birthyear", 'int'));
-	if (GETPOSTISSET("birthmonth") && empty($birthday)) {
+	$birthday = dol_mktime(GETPOST("birthhour", 'int'), GETPOST('birthmin', 'int'), GETPOST('birthsec', 'int'), GETPOST('birthmonth', 'int'), GETPOST('birthday', 'int'), GETPOST('birthyear', 'int'));
+	if GETPOSTISSET('birthmonth') && empty($birthday)) {
 		$error++;
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
@@ -240,36 +240,32 @@ if (empty($reshook) && $action == 'add') {
 		}
 	}
 
-	if (GETPOSTISSET('public')) {
-		$public = 1;
-	} else {
-		$public = 0;
-	}
+	$public = GETPOSTISSET('public') ? 1 : 0;
 
 	if (!$error) {
 		// email a peu pres correct et le login n'existe pas
 		$adh = new Adherent($db);
 		$adh->statut      = -1;
 		$adh->public      = $public;
-		$adh->firstname   = GETPOST("firstname");
-		$adh->lastname    = GETPOST("lastname");
-		$adh->gender      = GETPOST("gender");
-		$adh->civility_id = GETPOST("civility_id");
-		$adh->societe     = GETPOST("societe");
-		$adh->address     = GETPOST("address");
-		$adh->zip         = GETPOST("zipcode");
-		$adh->town        = GETPOST("town");
-		$adh->email       = GETPOST("email");
+		$adh->firstname   = GETPOST('firstname');
+		$adh->lastname    = GETPOST('lastname');
+		$adh->gender      = GETPOST('gender');
+		$adh->civility_id = GETPOST('civility_id');
+		$adh->societe     = GETPOST('societe');
+		$adh->address     = GETPOST('address');
+		$adh->zip         = GETPOST('zipcode');
+		$adh->town        = GETPOST('town');
+		$adh->email       = GETPOST('email');
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-			$adh->login       = GETPOST("login");
-			$adh->pass        = GETPOST("pass1");
+			$adh->login       = GETPOST('login');
+			$adh->pass        = GETPOST('pass1');
 		}
-		$adh->photo       = GETPOST("photo");
-		$adh->country_id  = GETPOST("country_id", 'int');
-		$adh->state_id    = GETPOST("state_id", 'int');
-		$adh->typeid      = GETPOST("type", 'int');
-		$adh->note_private = GETPOST("note_private");
-		$adh->morphy      = GETPOST("morphy");
+		$adh->photo       = GETPOST('photo');
+		$adh->country_id  = $conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE ? $conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE : GETPOST('country_id', 'int');
+		$adh->state_id    = GETPOST('state_id', 'int');
+		$adh->typeid      = $conf->global->MEMBER_NEWFORM_FORCETYPE ? $conf->global->MEMBER_NEWFORM_FORCETYPE : GETPOST('typeid', 'int');
+		$adh->note_private = GETPOST('note_private');
+		$adh->morphy      = $conf->global->MEMBER_NEWFORM_FORCEMORPHY ? $conf->global->MEMBER_NEWFORM_FORCEMORPHY : GETPOST('morphy');
 		$adh->birth       = $birthday;
 
 
@@ -562,11 +558,11 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
 		$isempty = 0;
 	}
 	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 $form->selectarray("typeid", $adht->liste_array(), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
 	print '</td></tr>'."\n";
 } else {
 	$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
-	print '<input type="hidden" id="type" name="type" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
+	print '<input type="hidden" id="typeid" name="typeid" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
 }
 // Moral/Physic attribute
 $morphys["phy"] = $langs->trans("Physical");
@@ -628,8 +624,6 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($country_code) {
 		print $formcompany->select_state(GETPOST("state_id"), $country_code);
-	} else {
-		print '';
 	}
 	print '</td></tr>';
 }
@@ -650,7 +644,7 @@ print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="ph
 // Public
 print '<tr><td>'.$langs->trans("Public").'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
 // Other attributes
-$tpl_context = 'public'; // define templae context to public
+$tpl_context = 'public'; // define template context to public
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 // Comments
 print '<tr>';
@@ -675,11 +669,11 @@ if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
                 if (jQuery("#budget").val() > 0) { jQuery(".amount").val(jQuery("#budget").val()); }
                 else { jQuery("#budget").val(\'\'); }
         });
-        /*jQuery("#type").change(function() {
-            if (jQuery("#type").val()==1) { jQuery("#morphy").val(\'mor\'); }
-            if (jQuery("#type").val()==2) { jQuery("#morphy").val(\'phy\'); }
-            if (jQuery("#type").val()==3) { jQuery("#morphy").val(\'mor\'); }
-            if (jQuery("#type").val()==4) { jQuery("#morphy").val(\'mor\'); }
+        /*jQuery("#typeid").change(function() {
+            if (jQuery("#typeid").val()==1) { jQuery("#morphy").val(\'mor\'); }
+            if (jQuery("#typeid").val()==2) { jQuery("#morphy").val(\'phy\'); }
+            if (jQuery("#typeid").val()==3) { jQuery("#morphy").val(\'mor\'); }
+            if (jQuery("#typeid").val()==4) { jQuery("#morphy").val(\'mor\'); }
             initturnover();
         });*/
         function initturnover() {
@@ -702,14 +696,18 @@ if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
 	print '</td></tr>'."\n";
 }
 if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
+  
 	// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
-	$amount = 0;
+
+	// Set amount for the subscription	
+    $amount = isset($amount) ? $amount : 0;
+  
 	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
 	}
 
 	if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
-		$amount = GETPOST('amount') ?GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT;
+		$amount = $amount ? $amount : (GETPOST('amount') ? GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT);
 	}
 	// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
 	print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';

From fcbea36605cc16f51715a9bb8036f2b4164d48d0 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 17 Apr 2021 12:21:40 +0000
Subject: [PATCH 091/928] Fixing style errors.

---
 htdocs/public/members/new.php | 305 +++++++++++++++++-----------------
 1 file changed, 152 insertions(+), 153 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 19fa23af080..0920e5976b1 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -221,12 +221,12 @@ if (empty($reshook) && $action == 'add') {
 	if (!GETPOST('firstname') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
-	}
-	if (GETPOST('email') && !isValidEmail(GETPOST('email'))) {
-		$error++;
-		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST('email'))."<br>\n";
-	}
+}
+if (GETPOST('email') && !isValidEmail(GETPOST('email'))) {
+	$error++;
+	$langs->load("errors");
+	$errmsg .= $langs->trans("ErrorBadEMail", GETPOST('email'))."<br>\n";
+}
 	$birthday = dol_mktime(GETPOST("birthhour", 'int'), GETPOST('birthmin', 'int'), GETPOST('birthsec', 'int'), GETPOST('birthmonth', 'int'), GETPOST('birthday', 'int'), GETPOST('birthyear', 'int'));
 	if GETPOSTISSET('birthmonth') && empty($birthday)) {
 		$error++;
@@ -545,121 +545,121 @@ jQuery(document).ready(function () {
 </script>';
 
 
-print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
+	print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
-// Type
-if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
-	$listoftype = $adht->liste_array();
-	$tmp = array_keys($listoftype);
-	$defaulttype = '';
-	$isempty = 1;
-	if (count($listoftype) == 1) {
-		$defaulttype = $tmp[0];
-		$isempty = 0;
+	// Type
+	if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
+		$listoftype = $adht->liste_array();
+		$tmp = array_keys($listoftype);
+		$defaulttype = '';
+		$isempty = 1;
+		if (count($listoftype) == 1) {
+			$defaulttype = $tmp[0];
+			$isempty = 0;
+		}
+		print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
+		print $form->selectarray("typeid", $adht->liste_array(), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
+		print '</td></tr>'."\n";
+	} else {
+		$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
+		print '<input type="hidden" id="typeid" name="typeid" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
 	}
-	print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
-	print $form->selectarray("typeid", $adht->liste_array(), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
-	print '</td></tr>'."\n";
-} else {
-	$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
-	print '<input type="hidden" id="typeid" name="typeid" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
-}
-// Moral/Physic attribute
-$morphys["phy"] = $langs->trans("Physical");
-$morphys["mor"] = $langs->trans("Moral");
-if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
-	print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
-	print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
-	print '</td></tr>'."\n";
-} else {
-	print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
-	print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
-}
-// Civility
-print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
-print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'</td></tr>'."\n";
-// Lastname
-print '<tr><td>'.$langs->trans("Lastname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
-// Firstname
-print '<tr><td>'.$langs->trans("Firstname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
-// Gender
-print '<tr><td>'.$langs->trans("Gender").'</td>';
-print '<td>';
-$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
-print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1);
-print '</td></tr>';
-// Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
-// Address
-print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
-print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
-// Zip / Town
-print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
-print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
-print ' / ';
-print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
-print '</td></tr>';
-// Country
-print '<tr><td>'.$langs->trans('Country').'</td><td>';
-$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)) {
-	$country_code = dol_user_country();
-	//print $country_code;
-	if ($country_code) {
-		$new_country_id = getCountry($country_code, 3, $db, $langs);
-		//print 'xxx'.$country_code.' - '.$new_country_id;
-		if ($new_country_id) {
-			$country_id = $new_country_id;
+	// Moral/Physic attribute
+	$morphys["phy"] = $langs->trans("Physical");
+	$morphys["mor"] = $langs->trans("Moral");
+	if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
+		print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
+		print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
+		print '</td></tr>'."\n";
+	} else {
+		print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
+		print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
+	}
+	// Civility
+	print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
+	print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'</td></tr>'."\n";
+	// Lastname
+	print '<tr><td>'.$langs->trans("Lastname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+	// Firstname
+	print '<tr><td>'.$langs->trans("Firstname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
+	// Gender
+	print '<tr><td>'.$langs->trans("Gender").'</td>';
+	print '<td>';
+	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
+	print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1);
+	print '</td></tr>';
+	// Company
+	print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
+	// Address
+	print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
+	print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+	// Zip / Town
+	print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
+	print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
+	print ' / ';
+	print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
+	print '</td></tr>';
+	// Country
+	print '<tr><td>'.$langs->trans('Country').'</td><td>';
+	$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)) {
+		$country_code = dol_user_country();
+		//print $country_code;
+		if ($country_code) {
+			$new_country_id = getCountry($country_code, 3, $db, $langs);
+			//print 'xxx'.$country_code.' - '.$new_country_id;
+			if ($new_country_id) {
+				$country_id = $new_country_id;
+			}
 		}
 	}
-}
-$country_code = getCountry($country_id, 2, $db, $langs);
-print $form->select_country($country_id, 'country_id');
-print '</td></tr>';
-// State
-if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
-	print '<tr><td>'.$langs->trans('State').'</td><td>';
-	if ($country_code) {
-		print $formcompany->select_state(GETPOST("state_id"), $country_code);
-	}
+	$country_code = getCountry($country_id, 2, $db, $langs);
+	print $form->select_country($country_id, 'country_id');
 	print '</td></tr>';
-}
-// EMail
-print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
-// Login
-if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-	print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
-	print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1").'"></td></tr>'."\n";
-	print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2").'"></td></tr>'."\n";
-}
-// Birthday
-print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateOfBirth").'</td><td>';
-print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0);
-print '</td></tr>'."\n";
-// Photo
-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";
-// Other attributes
-$tpl_context = 'public'; // define template context to public
-include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
-// Comments
-print '<tr>';
-print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
-print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private', 'restricthtml'), 0, 1).'</textarea></td>';
-print '</tr>'."\n";
+	// State
+	if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+		print '<tr><td>'.$langs->trans('State').'</td><td>';
+		if ($country_code) {
+			print $formcompany->select_state(GETPOST("state_id"), $country_code);
+		}
+		print '</td></tr>';
+	}
+	// EMail
+	print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+	// Login
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+		print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
+		print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1").'"></td></tr>'."\n";
+		print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2").'"></td></tr>'."\n";
+	}
+	// Birthday
+	print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateOfBirth").'</td><td>';
+	print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0);
+	print '</td></tr>'."\n";
+	// Photo
+	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";
+	// Other attributes
+	$tpl_context = 'public'; // define template context to public
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+	// Comments
+	print '<tr>';
+	print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
+	print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private', 'restricthtml'), 0, 1).'</textarea></td>';
+	print '</tr>'."\n";
 
-// Add specific fields used by Dolibarr foundation for example
-if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
-	$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
-	print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
-	print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
-	print ' € or $';
+	// Add specific fields used by Dolibarr foundation for example
+	if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
+		$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
+		print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
+		print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
+		print ' € or $';
 
-	print '<script type="text/javascript">
+		print '<script type="text/javascript">
     jQuery(document).ready(function () {
         initturnover();
         jQuery("#morphy").click(function() {
@@ -693,51 +693,50 @@ if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
         }
     });
     </script>';
-	print '</td></tr>'."\n";
-}
-if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
-  
-	// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
-
-	// Set amount for the subscription	
-    $amount = isset($amount) ? $amount : 0;
-  
-	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
+		print '</td></tr>'."\n";
 	}
+	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
+		// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
 
-	if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
-		$amount = $amount ? $amount : (GETPOST('amount') ? GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT);
+		// Set amount for the subscription
+		$amount = isset($amount) ? $amount : 0;
+
+		if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+			$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
+		}
+
+		if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
+			$amount = $amount ? $amount : (GETPOST('amount') ? GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT);
+		}
+		// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
+		print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
+		if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
+			print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
+		} else {
+			print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">';
+			print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
+		}
+		print ' '.$langs->trans("Currency".$conf->currency);
+		print '</td></tr>';
 	}
-	// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
-	print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
-	if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
-		print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
-	} else {
-		print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">';
-		print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
+	print "</table>\n";
+
+	print dol_get_fiche_end();
+
+	// Save
+	print '<div class="center">';
+	print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
+	if (!empty($backtopage)) {
+		print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
 	}
-	print ' '.$langs->trans("Currency".$conf->currency);
-	print '</td></tr>';
-}
-print "</table>\n";
-
-print dol_get_fiche_end();
-
-// Save
-print '<div class="center">';
-print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
-if (!empty($backtopage)) {
-	print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
-}
-print '</div>';
+	print '</div>';
 
 
-print "</form>\n";
-print "<br>";
-print '</div></div>';
+	print "</form>\n";
+	print "<br>";
+	print '</div></div>';
 
 
-llxFooterVierge();
+	llxFooterVierge();
 
-$db->close();
+	$db->close();

From 5a8742b3ebe313c14565e0944527777e1b100df9 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Sat, 17 Apr 2021 13:25:28 +0100
Subject: [PATCH 092/928] Cancel Partnership For Expired Members & Warning of
 partnership if Dolibarr backlink not found on partner website

---
 htdocs/core/modules/modPartnership.class.php  |   6 +-
 .../install/mysql/migration/13.0.0-14.0.0.sql |  13 +-
 htdocs/langs/en_US/partnership.lang           |   6 +-
 htdocs/partnership/admin/setup.php            |  59 ++-
 .../partnership/class/partnership.class.php   |   5 +-
 .../class/partnershiputils.class.php          | 420 +++++++++++++++++-
 htdocs/partnership/partnership_list.php       |   6 +-
 7 files changed, 474 insertions(+), 41 deletions(-)

diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index ae5886e589c..0d5d6dce7ca 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -177,7 +177,7 @@ class modPartnership extends DolibarrModules
 		// Array to add new pages in new tabs
 		$this->tabs = array();
 
-		$tabtoadd = (!empty(getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR')) && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') ? 'member' : 'thirdparty';
+		$tabtoadd = ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 'member' : 'thirdparty';
 
 		if ($tabtoadd == 'member') {
 			$this->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/adherents/partnership.php?socid=__ID__');
@@ -253,12 +253,12 @@ class modPartnership extends DolibarrModules
 		// Cronjobs (List of cron jobs entries to add when module is enabled)
 		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
 
-		$statusatinstall=0;
 		$arraydate=dol_getdate(dol_now());
 		$datestart=dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 
 		$this->cronjobs = array(
-			0	=> array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfPartnership', 'parameters'=>'',      'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>$statusatinstall, 'test'=>'$conf->partnership->enabled', 'datestart'=>$datestart),
+			0	=> array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfMemberPartnership', 'parameters'=>'',      'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>1, 'test'=>'$conf->partnership->enabled', 'datestart'=>$datestart),
+			1	=> array('priority'=>61, 'label'=>'WarningOfPartnershipIfDolibarrBacklinkNotfound', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'',      'comment'=>'Warning of partnership if Dolibarr backlink not found on partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'$conf->partnership->enabled', 'datestart'=>$datestart),
 		);
 
 		// Permissions provided by this module
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index c1e75bbe353..d0375349880 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -398,8 +398,9 @@ CREATE TABLE llx_partnership(
 	note_private text, 
 	note_public text, 
 	last_main_doc varchar(255), 
-	count_last_url_check_error integer DEFAULT '0', 
-	import_key varchar(14), 
+	count_last_url_check_error integer DEFAULT '0',
+	last_check_backlink datetime NULL,
+	import_key varchar(14),
 	model_pdf varchar(255)
 ) ENGINE=innodb;
 
@@ -420,10 +421,10 @@ create table llx_partnership_extrafields
 
 ALTER TABLE llx_partnership_extrafields ADD INDEX idx_partnership_fk_object(fk_object);
 
-INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipWillExpire)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipWillSoonExpireTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipWillSoonExpireContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
-INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipCanceled)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipCanceledTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
-INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipRefused)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
-INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipAccepted)', NULL, 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipAcceptedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipAcceptedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipWillExpire)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipWillSoonExpireTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipWillSoonExpireContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipCanceled)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipCanceledTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipRefused)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipAccepted)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipAcceptedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipAcceptedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
 ALTER TABLE llx_adherent ADD COLUMN url varchar(255) NULL AFTER email;
 ALTER TABLE llx_facture_fourn ADD COLUMN date_closing datetime DEFAULT NULL after date_valid;
 
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 4d5b518431f..2da278dd36c 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -32,7 +32,10 @@ ListOfPartnerships=List of partnership
 PartnershipSetup=Partnership setup
 PartnershipAbout=About Partnership
 PartnershipAboutPage=Partnership about page
-PartnershipManagedFor=Partnership managed for
+partnershipforthirdpartyormember=Partnership is for a 'thirdparty' or for a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancel status of partnership
 
 #
 # Object
@@ -44,6 +47,7 @@ ReasonDecline=Decline reason
 ReasonDeclineOrCancel=Decline reason
 PartnershipAlreadyExist=Partnership already exist
 ShowPartnership=Show partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
 ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
 
 #
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 77edba1f21f..4cd5fe5f387 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -82,9 +82,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 if ($action == 'setting') {
 	require_once DOL_DOCUMENT_ROOT."/core/modules/modPartnership.class.php";
 
-	$value = GETPOST('managed_for', 'alpha');
-
-	$modulemenu = ($value == 'member') ? 'member' : 'thirdparty';
+	$modulemenu = (GETPOST('PARTNERSHIP_IS_MANAGED_FOR', 'alpha') == 'member') ? 'member' : 'thirdparty';
 	$res = dolibarr_set_const($db, "PARTNERSHIP_IS_MANAGED_FOR", $modulemenu, 'chaine', 0, '', $conf->entity);
 
 	$partnership = new modPartnership($db);
@@ -94,6 +92,10 @@ if ($action == 'setting') {
 
 	$error += $partnership->delete_menus();
 	$error += $partnership->insert_menus();
+
+	if(GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL",'int'))
+		dolibarr_set_const($db, "PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL",'int'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "PARTNERSHIP_BACKLINKS_TO_CHECK", GETPOST("PARTNERSHIP_BACKLINKS_TO_CHECK"), 'chaine', 0, '', $conf->entity);
 }
 
 if ($action) {
@@ -102,6 +104,8 @@ if ($action) {
 	} else {
 		setEventMessages($langs->trans("SetupNotError"), null, 'errors');
 	}
+	header("Location: ".$_SERVER['PHP_SELF']);
+	exit;
 }
 
 /*
@@ -137,19 +141,48 @@ print '<input type="hidden" name="page_y" value="">';
 
 print '<table class="noborder centpercent">';
 
-// Default partnership price base type
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("PartnershipManagedFor").'</td>';
-print '<td class="right">';
-	print '<select class="flat minwidth100" id="select_managed_for" name="managed_for">';
-		print '<option value="thirdparty" '.(($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'thirdparty') ? 'selected' : '').'>'.$langs->trans("ThirdParty").'</option>';
-		print '<option value="member" '.(($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 'selected' : '').'>'.$langs->trans("Members").'</option>';
-	print '</select>';
-print '</td>';
+
+print '<tr class="liste_titre">';
+print '<td class="titlefield">'.$langs->trans("Setting").'</td>';
+print '<td class="left">'.$langs->trans("Value").'</td>';
+print '<td class="left">'.$langs->trans("Examples").'</td>';
 print '</tr>';
 
-print '</table>';
 
+print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_IS_MANAGED_FOR").'</td>';
+print '<td>';
+print '<select class="flat minwidth100" id="select_PARTNERSHIP_IS_MANAGED_FOR" name="PARTNERSHIP_IS_MANAGED_FOR">';
+print '<option value="thirdparty" '.(($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'thirdparty') ? 'selected' : '').'>'.$langs->trans("ThirdParty").'</option>';
+print '<option value="member" '.(($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 'selected' : '').'>'.$langs->trans("Members").'</option>';
+print '</select>';
+print '</td>';
+print '<td><span class="opacitymedium">'.$langs->trans("partnershipforthirdpartyormember").'</span></td>';
+print '</tr>';
+
+
+if($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member'){
+	print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL").'</td>';
+	print '<td>';
+	$dnbdays 	= '7';
+	$backlinks 	= (!empty($conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL)) ? $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL : $dnbdays;
+	print '<input class="maxwidth50" type="text" name="PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL" value="'.$backlinks.'">';
+	print '</td>';
+	print '<td><span class="opacitymedium">'.$dnbdays.'</span></td>';
+	print '</tr>';
+}
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_BACKLINKS_TO_CHECK").'</td>';
+print '<td>';
+$dbacklinks = 'dolibarr.org|dolibarr.fr|dolibarr.es';
+$backlinks 	= (!empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK)) ? $conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK : $dbacklinks;
+print '<input class="minwidth400" type="text" name="PARTNERSHIP_BACKLINKS_TO_CHECK" value="'.$backlinks.'">';
+print '</td>';
+print '<td><span class="opacitymedium">'.$dbacklinks.'</span></td>';
+print '</tr>';
+
+
+print '</table>';
 print '<div class="center">';
 print '<input type="submit" class="button reposition" value="'.$langs->trans("Modify").'">';
 print '</div>';
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index fd0233d3fef..6bf84ba38cc 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -118,6 +118,7 @@ class Partnership extends CommonObject
 	public $date_partnership_start;
 	public $date_partnership_end;
 	public $count_last_url_check_error;
+	public $last_check_backlink;
 	public $reason_decline_or_cancel;
 	// END MODULEBUILDER PROPERTIES
 
@@ -186,6 +187,7 @@ class Partnership extends CommonObject
 			'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>1, 'visible'=>1,),
 			'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>2, 'index'=>1, 'arrayofkeyval'=>array('-1'=>'','0'=>$langs->trans('Draft'), '1'=>$langs->trans('Accepted'), '2'=>$langs->trans('Refused'), '9'=>$langs->trans('Canceled')),),
 			'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>63, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
+			'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>-2,),
 			'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
 		);
 
@@ -361,7 +363,7 @@ class Partnership extends CommonObject
 		$sql .= ', p.entity, p.date_partnership_start, p.date_partnership_end, p.date_creation';
 		$sql .= ', p.fk_user_creat, p.tms, p.fk_user_modif, p.fk_user_modif';
 		$sql .= ', p.note_private, p.note_public';
-		$sql .= ', p.last_main_doc, p.count_last_url_check_error, p.reason_decline_or_cancel';
+		$sql .= ', p.last_main_doc, p.count_last_url_check_error, p.last_check_backlink, p.reason_decline_or_cancel';
 		$sql .= ', p.import_key, p.model_pdf';
 
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'partnership as p';
@@ -407,6 +409,7 @@ class Partnership extends CommonObject
 				$this->note_public 					= $obj->note_public;
 				$this->last_main_doc 				= $obj->last_main_doc;
 				$this->count_last_url_check_error	= $obj->count_last_url_check_error;
+				$this->last_check_backlink			= $this->db->jdate($obj->last_check_backlink);
 				$this->reason_decline_or_cancel 	= $obj->reason_decline_or_cancel;
 				$this->import_key 					= $obj->import_key;
 				$this->model_pdf 					= $obj->model_pdf;
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 08c61b3454c..64fd0f62431 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -26,9 +26,13 @@
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
 dol_include_once('partnership/lib/partnership.lib.php');
+dol_include_once('/partnership/class/partnership.class.php');
 
-
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 /**
  *	Class with cron tasks of Partnership module
  */
@@ -49,34 +53,422 @@ class PartnershipUtils
 		$this->db = $db;
 		return 1;
 	}
-
-
+	
 	/**
-	 * Action executed by scheduler to cancel status of partnership when subscription is expired + x days. (Max number of cancel per call = $conf->global->PARTNERSHIP_MAX_CANCEL_PER_CALL)
+	 * Action executed by scheduler to cancel status of partnership when subscription is expired + x days. (Max number of action batch per call = $conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL)
 	 *
 	 * CAN BE A CRON TASK
 	 *
 	 * @return  int                 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
 	 */
-	public function doCancelStatusOfPartnership()
+	public function doCancelStatusOfMemberPartnership()
 	{
 		global $conf, $langs, $user;
 
-		$langs->load("agenda");
+        $managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
 
-		$MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_CANCEL_PER_CALL) ? 100 : $conf->global->PARTNERSHIP_MAX_CANCEL_PER_CALL);       // Limit to 100 per call
+		if($managedfor != 'member'){
+			return 0; // If option 'PARTNERSHIP_IS_MANAGED_FOR' = 'thirdparty', this cron job does nothing.
+		}
 
-		$error = 0;
-		$this->output = '';
-		$this->error='';
+        $partnership = new Partnership($this->db);
+        $MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL) ? 25 : $conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL);       // Limit to 25 per call
+
+        $langs->loadLangs(array("partnership", "member"));
+
+        $error 			= 0;
+        $erroremail 	= '';
+        $this->output 	= '';
+        $this->error 	= '';
+        $partnershipsprocessed = array();
+
+       	$gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
+        if ($gracedelay < 1)
+        {
+            $this->error='BadValueForDelayBeforeCancelCheckSetup';
+            return -1;
+        }
+
+        dol_syslog(get_class($this)."::doCancelStatusOfMemberPartnership cancel expired partnerships with grace delay of ".$gracedelay);
+
+        $now = dol_now();
+        $datetotest = dol_time_plus_duree($now, -1 * abs($gracedelay), 'd');
+
+        $this->db->begin();
+
+        $sql = "SELECT p.rowid, p.fk_member, p.status";
+        $sql .= ", d.datefin, d.fk_adherent_type, dty.subscription";
+        $sql .= " FROM ".MAIN_DB_PREFIX."partnership as p";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d on (d.rowid = p.fk_member)";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as dty on (dty.rowid = d.fk_adherent_type)";
+		$sql .= " WHERE fk_member > 0";
+		$sql .= " AND (d.datefin < '".$this->db->idate($datetotest)."' AND dty.subscription = 1)";
+        $sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
+        $sql .= $this->db->order('d.rowid','ASC');
+        // Limit is managed into loop later
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $numofexpiredmembers = $this->db->num_rows($resql);
+
+            $somethingdoneonpartnership = 0;
+            $ifetchpartner = 0;
+            while ($ifetchpartner < $numofexpiredmembers)
+            {
+                $ifetchpartner++;
+
+                $obj = $this->db->fetch_object($resql);
+                if ($obj)
+                {
+                    if (! empty($partnershipsprocessed[$obj->rowid])) continue;
+
+                    if ($somethingdoneonpartnership >= $MAXPERCALL)
+                    {
+                        dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doCancelStatusOfMemberPartnership to avoid to reach email quota.", LOG_WARNING);
+                        break;
+                    }
+
+                    $object = new Partnership($this->db);
+                    $object->fetch($obj->rowid);
+
+                    // Get expiration date
+                    $expirationdate = $obj->datefin;
+
+                    if ($expirationdate && $expirationdate < $now)  // If contract expired (we already had a test into main select, this is a security)
+                    {
+                        $somethingdoneonpartnership++;
+
+                        $result = $object->cancel($user, 0);
+                        // $conf->global->noapachereload = null;  
+                        if ($result < 0)
+                        {
+                            $error++;
+                            $this->error = $object->error;
+                            if (is_array($object->errors) && count($object->errors)) {
+                                if (is_array($this->errors)) $this->errors = array_merge($this->errors, $object->errors);
+                                else $this->errors = $object->errors;
+                            }
+                        }
+                        else
+                        {
+                            $partnershipsprocessed[$object->id]=$object->ref;
+
+                            // Send an email to inform member
+                            $labeltemplate = '(SendingEmailOnPartnershipCanceled)';
+
+                            dol_syslog("Now we will send an email to member id=".$object->fk_member." with label ".$labeltemplate);
+
+                            // Send deployment email
+                            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                            include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+                            $formmail=new FormMail($this->db);
+
+                            // Define output language
+                            $outputlangs = $langs;
+                            $newlang = '';
+                            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+                            if (! empty($newlang)) {
+                                $outputlangs = new Translate("", $conf);
+                                $outputlangs->setDefaultLang($newlang);
+                                $outputlangs->loadLangs(array('main','member','partnership'));
+                            }
+
+                            $arraydefaultmessage=$formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
+
+                            $substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
+                            complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+                            $subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
+                            $msg     = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
+                            $from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+
+                            $adherent = new Adherent($this->db);
+                            $adherent->fetch($object->fk_member);
+                            $to = $adherent->email;
+
+                            $cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
+                            $result = $cmail->sendfile();
+                            if (! $result || $cmail->error)
+                            {
+                                $erroremail .= ($erroremail ? ', ' : '').$cmail->error;
+                                $this->errors[] = $cmail->error;
+                                if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+                            }
+                        }
+                        
+                    }
+                }
+            }
+        }
+        else
+        {
+            $error++;
+            $this->error = $this->db->lasterror();
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            $this->output = $numofexpiredmembers.' expired partnership members found'."\n";
+            if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail;
+        }
+        else
+        {
+            $this->db->rollback();
+            $this->output = "Rollback after error\n";
+            $this->output.= $numofexpiredmembers.' expired partnership members found'."\n";
+            if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail;
+        }
+
+        return ($error ? 1: 0);
+	}
 
 
-		dol_syslog(__METHOD__." we cancel status of partnership ", LOG_DEBUG);
+	/**
+	 * Action executed by scheduler to check if Dolibarr backlink not found on partner website. (Max number of action batch per call = $conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL)
+	 *
+	 * CAN BE A CRON TASK
+	 *
+	 * @return  int                 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doWarningOfPartnershipIfDolibarrBacklinkNotfound()
+	{
+		global $conf, $langs, $user;
 
-		$now = dol_now();
+        $managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
 
-		// En cours de traitement ...
+        $partnership = new Partnership($this->db);
+        $MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL) ? 10 : $conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL);       // Limit to 10 per call
 
-		return ($error ? 1: 0);
+        $langs->loadLangs(array("partnership", "member"));
+
+        $error 			= 0;
+        $erroremail 	= '';
+        $this->output 	= '';
+        $this->error 	= '';
+        $partnershipsprocessed = array();
+
+       	$gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
+        if ($gracedelay < 1)
+        {
+            $this->error='BadValueForDelayBeforeCancelCheckSetup';
+            return -1;
+        }
+
+        $fk_partner = ($managedfor == 'member') ? 'fk_member' : 'fk_soc';
+
+        dol_syslog(get_class($this)."::doWarningOfPartnershipIfDolibarrBacklinkNotfound Warning of partnership");
+
+        $now = dol_now();
+        $datetotest = dol_time_plus_duree($now, -1 * abs($gracedelay), 'd');
+
+        $this->db->begin();
+
+        $sql = "SELECT p.rowid, p.status, p.".$fk_partner;
+        $sql .= ", p.last_check_backlink";
+
+        $sql .= ', partner.url, partner.email';
+
+        $sql .= " FROM ".MAIN_DB_PREFIX."partnership as p";
+
+        if ($managedfor == 'member') {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as partner on (partner.rowid = p.fk_member)";
+		} else {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as partner on (partner.rowid = p.fk_soc)";
+		}
+
+		$sql .= " WHERE 1 = 1";
+		$sql .= " AND p.".$fk_partner." > 0";
+        $sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
+        $sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 7 * 24 * 3600)."')"; // Every week, check that website contains a link to dolibarr.
+        $sql .= $this->db->order('p.rowid','ASC');
+        // Limit is managed into loop later
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $numofexpiredmembers 		= $this->db->num_rows($resql);
+            $somethingdoneonpartnership = 0;
+            $ifetchpartner 				= 0;
+            while ($ifetchpartner < $numofexpiredmembers)
+            {
+                $ifetchpartner++;
+
+                $obj = $this->db->fetch_object($resql);
+                if ($obj)
+                {
+                    if (! empty($partnershipsprocessed[$obj->rowid])) continue;
+
+                    if ($somethingdoneonpartnership >= $MAXPERCALL)
+                    {
+                        dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doWarningOfPartnershipIfDolibarrBacklinkNotfound to avoid to reach email quota.", LOG_WARNING);
+                        break;
+                    }
+
+                    $backlinkfound = 0;
+
+                    $object = new Partnership($this->db);
+                    $object->fetch($obj->rowid);
+
+                    if($managedfor == 'member'){
+	                	$fk_partner = $object->fk_member;
+	                }else{
+	                	$fk_partner = $object->fk_soc;
+	                }
+
+                    $website = $obj->url;
+
+                	if(empty($website)){
+                		$websitenotfound .= ($websitenotfound ? ', ' : '').'Website not found for id="'.$fk_partner.'"'."\n";
+                	} else {
+                    	$backlinkfound = $this->checkDolibarrBacklink($website);
+                	}
+
+                	if(!$backlinkfound){
+                		$tmpcount = $object->count_last_url_check_error + 1;
+
+                		if($tmpcount == 3){ // Send Warning Email
+
+                			if (!empty($obj->email)){
+                				$emailnotfound .= ($emailnotfound ? ', ' : '').'Email not found for id="'.$fk_partner.'"'."\n";
+
+                			} else {
+
+	                			$labeltemplate = '(SendingEmailOnPartnershipWillExpire)';
+
+	                            dol_syslog("Now we will send an email to partner id=".$fk_partner." with label ".$labeltemplate);
+
+	                            // Send deployment email
+	                            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+	                            include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+	                            $formmail=new FormMail($this->db);
+
+	                            // Define output language
+	                            $outputlangs = $langs;
+	                            $newlang = '';
+	                            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+	                            if (! empty($newlang)) {
+	                                $outputlangs = new Translate("", $conf);
+	                                $outputlangs->setDefaultLang($newlang);
+	                                $outputlangs->loadLangs(array('main','member','partnership'));
+	                            }
+
+	                            $arraydefaultmessage=$formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
+
+	                            $substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
+	                            complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+	                            $subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
+	                            $msg     = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
+	                            $from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+
+			            		$to = $obj->email;
+
+	                            $cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
+	                            $result = $cmail->sendfile();
+	                            if (! $result || $cmail->error)
+	                            {
+	                                $erroremail .= ($erroremail ? ', ' : '').$cmail->error;
+	                                $this->errors[] = $cmail->error;
+	                                if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+	                            }
+                			}
+
+
+                		} elseif($tmpcount > 4) { // Cancel Partnership
+                			$object->status = $object::STATUS_CANCELED;
+                			$object->reason_decline_or_cancel = $langs->trans('BacklinkNotFoundOnPartnerWebsite');
+                		}
+
+                		$object->count_last_url_check_error = $tmpcount;
+
+                	} else {
+                		$object->count_last_url_check_error = 0;
+                		$object->reason_decline_or_cancel = '';
+                	}
+
+                	$partnershipsprocessed[$object->id]=$object->ref;
+
+            		$object->last_check_backlink = $this->db->idate($now);
+
+                	$object->update($user);
+                }
+            }
+        }
+        else
+        {
+            $error++;
+            $this->error = $this->db->lasterror();
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            $this->output = $numofexpiredmembers.' partnership checked'."\n";
+            if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n";
+            if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n";
+            if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n";
+        }
+        else
+        {
+            $this->db->rollback();
+            $this->output = "Rollback after error\n";
+            $this->output.= $numofexpiredmembers.' partnership checked'."\n";
+            if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n";
+            if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n";
+            if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n";
+        }
+
+        return ($error ? 1: 0);
+	}
+
+	/**
+	 * Action to check if Dolibarr backlink not found on partner website
+	 *
+	 * CAN BE A CRON TASK
+	 *
+	 * @return  int                 0 if KO, 1 if OK
+	 */
+	public function checkDolibarrBacklink($website = null)
+	{
+		global $conf, $langs, $user;
+
+		$found 		= 0;
+		$error 		= 0;
+		$webcontent = '';
+
+		// $website = 'https://nextgestion.com/'; // For Test
+        $tmpgeturl = getURLContent($website);
+        if ($tmpgeturl['curl_error_no']) {
+			$error++;
+			dol_syslog('Error getting '.$website.': '.$tmpgeturl['curl_error_msg']);
+		} elseif ($tmpgeturl['http_code'] != '200') {
+			$error++;
+			dol_syslog('Error getting '.$website.': '.$tmpgeturl['curl_error_msg']);
+		} else {
+			$urlContent = $tmpgeturl['content'];
+			$dom = new DOMDocument();
+			@$dom->loadHTML($urlContent);
+
+			$xpath = new DOMXPath($dom);
+			$hrefs = $xpath->evaluate("//a");
+
+			for($i = 0; $i < $hrefs->length; $i++){
+			    $href = $hrefs->item($i);
+			    $url = $href->getAttribute('href');
+			    $url = filter_var($url, FILTER_SANITIZE_URL);
+			    if(!filter_var($url, FILTER_VALIDATE_URL) === false){
+			    	$webcontent .= $url;
+			    }
+			}
+        }
+		
+		if ($webcontent && !empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK) && preg_match('/'.$conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK.'/', $webcontent))
+		{
+		    $found = 1;
+		}
+
+		return $found;
 	}
 }
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 5ded7ae0047..1ae90d0d4cf 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -496,9 +496,9 @@ $param .= $hookmanager->resPrint;
 // List of mass actions available
 $arrayofmassactions = array(
 'cancel'=>img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel"),
-	//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
-	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+	//'generate_doc'=>img_picto('', 'pdf').$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>img_picto('', 'pdf').$langs->trans("PDFMerge"),
+	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendMail"),
 );
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");

From d6085fb68a1214dcfd116fe8bbf8bcb80dc0f99b Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 17 Apr 2021 14:29:02 +0200
Subject: [PATCH 093/928] Update new.php

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 0920e5976b1..dcf64ed7634 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -218,7 +218,7 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
 	}
-	if (!GETPOST('firstname') {
+	if (!GETPOST('firstname')) ä{
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
 }

From d23e74660912b0b712f249d6eadc8c5089ba2e08 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 17 Apr 2021 12:29:23 +0000
Subject: [PATCH 094/928] Fixing style errors.

---
 htdocs/public/members/new.php | 172 +++++++++++++++++-----------------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index dcf64ed7634..13705796ad5 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -218,17 +218,17 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
 	}
-	if (!GETPOST('firstname')) ä{
+	if (!GETPOST('firstname')) { ä
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
-}
-if (GETPOST('email') && !isValidEmail(GETPOST('email'))) {
-	$error++;
-	$langs->load("errors");
-	$errmsg .= $langs->trans("ErrorBadEMail", GETPOST('email'))."<br>\n";
-}
+	}
+	if (GETPOST('email') && !isValidEmail(GETPOST('email'))) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST('email'))."<br>\n";
+	}
 	$birthday = dol_mktime(GETPOST("birthhour", 'int'), GETPOST('birthmin', 'int'), GETPOST('birthsec', 'int'), GETPOST('birthmonth', 'int'), GETPOST('birthday', 'int'), GETPOST('birthyear', 'int'));
-	if GETPOSTISSET('birthmonth') && empty($birthday)) {
+	if GETPOSTISSET('birthmonth') { && empty($birthday))
 		$error++;
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
@@ -548,33 +548,33 @@ jQuery(document).ready(function () {
 	print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 	// Type
-	if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
-		$listoftype = $adht->liste_array();
-		$tmp = array_keys($listoftype);
-		$defaulttype = '';
-		$isempty = 1;
-		if (count($listoftype) == 1) {
-			$defaulttype = $tmp[0];
-			$isempty = 0;
-		}
-		print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
-		print $form->selectarray("typeid", $adht->liste_array(), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
-		print '</td></tr>'."\n";
-	} else {
-		$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
-		print '<input type="hidden" id="typeid" name="typeid" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
+if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
+	$listoftype = $adht->liste_array();
+	$tmp = array_keys($listoftype);
+	$defaulttype = '';
+	$isempty = 1;
+	if (count($listoftype) == 1) {
+		$defaulttype = $tmp[0];
+		$isempty = 0;
 	}
+	print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
+	print $form->selectarray("typeid", $adht->liste_array(), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
+	print '</td></tr>'."\n";
+} else {
+	$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
+	print '<input type="hidden" id="typeid" name="typeid" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
+}
 	// Moral/Physic attribute
 	$morphys["phy"] = $langs->trans("Physical");
 	$morphys["mor"] = $langs->trans("Moral");
-	if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
-		print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
-		print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
-		print '</td></tr>'."\n";
-	} else {
-		print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
-		print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
-	}
+if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
+	print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
+	print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
+	print '</td></tr>'."\n";
+} else {
+	print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
+	print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
+}
 	// Civility
 	print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
 	print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'</td></tr>'."\n";
@@ -602,39 +602,39 @@ jQuery(document).ready(function () {
 	// Country
 	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)) {
-		$country_code = dol_user_country();
-		//print $country_code;
-		if ($country_code) {
-			$new_country_id = getCountry($country_code, 3, $db, $langs);
-			//print 'xxx'.$country_code.' - '.$new_country_id;
-			if ($new_country_id) {
-				$country_id = $new_country_id;
-			}
+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)) {
+	$country_code = dol_user_country();
+	//print $country_code;
+	if ($country_code) {
+		$new_country_id = getCountry($country_code, 3, $db, $langs);
+		//print 'xxx'.$country_code.' - '.$new_country_id;
+		if ($new_country_id) {
+			$country_id = $new_country_id;
 		}
 	}
+}
 	$country_code = getCountry($country_id, 2, $db, $langs);
 	print $form->select_country($country_id, 'country_id');
 	print '</td></tr>';
 	// State
-	if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
-		print '<tr><td>'.$langs->trans('State').'</td><td>';
-		if ($country_code) {
-			print $formcompany->select_state(GETPOST("state_id"), $country_code);
-		}
-		print '</td></tr>';
+if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+	print '<tr><td>'.$langs->trans('State').'</td><td>';
+	if ($country_code) {
+		print $formcompany->select_state(GETPOST("state_id"), $country_code);
 	}
+	print '</td></tr>';
+}
 	// EMail
 	print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 	// Login
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-		print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
-		print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1").'"></td></tr>'."\n";
-		print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2").'"></td></tr>'."\n";
-	}
+if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+	print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
+	print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1").'"></td></tr>'."\n";
+	print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2").'"></td></tr>'."\n";
+}
 	// Birthday
 	print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateOfBirth").'</td><td>';
 	print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0);
@@ -653,13 +653,13 @@ jQuery(document).ready(function () {
 	print '</tr>'."\n";
 
 	// Add specific fields used by Dolibarr foundation for example
-	if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
-		$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
-		print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
-		print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
-		print ' € or $';
+if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
+	$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
+	print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
+	print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
+	print ' € or $';
 
-		print '<script type="text/javascript">
+	print '<script type="text/javascript">
     jQuery(document).ready(function () {
         initturnover();
         jQuery("#morphy").click(function() {
@@ -693,32 +693,32 @@ jQuery(document).ready(function () {
         }
     });
     </script>';
-		print '</td></tr>'."\n";
+	print '</td></tr>'."\n";
+}
+if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
+	// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
+
+	// Set amount for the subscription
+	$amount = isset($amount) ? $amount : 0;
+
+	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
 	}
-	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
-		// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
 
-		// Set amount for the subscription
-		$amount = isset($amount) ? $amount : 0;
-
-		if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-			$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
-		}
-
-		if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
-			$amount = $amount ? $amount : (GETPOST('amount') ? GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT);
-		}
-		// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
-		print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
-		if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
-			print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
-		} else {
-			print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">';
-			print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
-		}
-		print ' '.$langs->trans("Currency".$conf->currency);
-		print '</td></tr>';
+	if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
+		$amount = $amount ? $amount : (GETPOST('amount') ? GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT);
 	}
+	// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
+	print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
+	if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
+		print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
+	} else {
+		print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">';
+		print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
+	}
+	print ' '.$langs->trans("Currency".$conf->currency);
+	print '</td></tr>';
+}
 	print "</table>\n";
 
 	print dol_get_fiche_end();
@@ -726,9 +726,9 @@ jQuery(document).ready(function () {
 	// Save
 	print '<div class="center">';
 	print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
-	if (!empty($backtopage)) {
-		print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
-	}
+if (!empty($backtopage)) {
+	print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
+}
 	print '</div>';
 
 

From 973ea370e8d23a95c091fc4312e2f3b88831af34 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Sat, 17 Apr 2021 13:38:23 +0100
Subject: [PATCH 095/928] Fixing errors

---
 htdocs/core/modules/modPartnership.class.php        | 4 ++--
 htdocs/partnership/class/partnershiputils.class.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index 0d5d6dce7ca..d70b626a99b 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -177,7 +177,7 @@ class modPartnership extends DolibarrModules
 		// Array to add new pages in new tabs
 		$this->tabs = array();
 
-		$tabtoadd = ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 'member' : 'thirdparty';
+		$tabtoadd = (!empty(getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR')) && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') ? 'member' : 'thirdparty';
 
 		if ($tabtoadd == 'member') {
 			$this->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/adherents/partnership.php?socid=__ID__');
@@ -258,7 +258,7 @@ class modPartnership extends DolibarrModules
 
 		$this->cronjobs = array(
 			0	=> array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfMemberPartnership', 'parameters'=>'',      'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>1, 'test'=>'$conf->partnership->enabled', 'datestart'=>$datestart),
-			1	=> array('priority'=>61, 'label'=>'WarningOfPartnershipIfDolibarrBacklinkNotfound', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'',      'comment'=>'Warning of partnership if Dolibarr backlink not found on partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'$conf->partnership->enabled', 'datestart'=>$datestart),
+			1	=> array('priority'=>61, 'label'=>'CheckDolibarrBacklink', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'',      'comment'=>'Warning of partnership if Dolibarr backlink not found on partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'$conf->partnership->enabled', 'datestart'=>$datestart),
 		);
 
 		// Permissions provided by this module
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 64fd0f62431..6ed76518b42 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -427,7 +427,7 @@ class PartnershipUtils
 	 * Action to check if Dolibarr backlink not found on partner website
 	 *
 	 * CAN BE A CRON TASK
-	 *
+	 * @param  $website      Partner's website
 	 * @return  int                 0 if KO, 1 if OK
 	 */
 	public function checkDolibarrBacklink($website = null)

From 48dffaaa537474399ddf631c6b90bebfd0482d20 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 17 Apr 2021 13:30:56 +0000
Subject: [PATCH 096/928] Fixing style errors.

---
 htdocs/partnership/admin/setup.php            |   6 +-
 .../class/partnershiputils.class.php          | 530 ++++++++----------
 2 files changed, 251 insertions(+), 285 deletions(-)

diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 4cd5fe5f387..f388c184517 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -93,8 +93,8 @@ if ($action == 'setting') {
 	$error += $partnership->delete_menus();
 	$error += $partnership->insert_menus();
 
-	if(GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL",'int'))
-		dolibarr_set_const($db, "PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL",'int'), 'chaine', 0, '', $conf->entity);
+	if (GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", 'int'))
+		dolibarr_set_const($db, "PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", 'int'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "PARTNERSHIP_BACKLINKS_TO_CHECK", GETPOST("PARTNERSHIP_BACKLINKS_TO_CHECK"), 'chaine', 0, '', $conf->entity);
 }
 
@@ -160,7 +160,7 @@ print '<td><span class="opacitymedium">'.$langs->trans("partnershipforthirdparty
 print '</tr>';
 
 
-if($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member'){
+if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
 	print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL").'</td>';
 	print '<td>';
 	$dnbdays 	= '7';
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 64fd0f62431..13616c32804 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 dol_include_once('partnership/lib/partnership.lib.php');
 dol_include_once('/partnership/class/partnership.class.php');
 
-require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
+require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 /**
  *	Class with cron tasks of Partnership module
@@ -53,7 +53,7 @@ class PartnershipUtils
 		$this->db = $db;
 		return 1;
 	}
-	
+
 	/**
 	 * Action executed by scheduler to cancel status of partnership when subscription is expired + x days. (Max number of action batch per call = $conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL)
 	 *
@@ -65,163 +65,147 @@ class PartnershipUtils
 	{
 		global $conf, $langs, $user;
 
-        $managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
+		$managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
 
-		if($managedfor != 'member'){
+		if ($managedfor != 'member') {
 			return 0; // If option 'PARTNERSHIP_IS_MANAGED_FOR' = 'thirdparty', this cron job does nothing.
 		}
 
-        $partnership = new Partnership($this->db);
-        $MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL) ? 25 : $conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL);       // Limit to 25 per call
+		$partnership = new Partnership($this->db);
+		$MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL) ? 25 : $conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL);       // Limit to 25 per call
 
-        $langs->loadLangs(array("partnership", "member"));
+		$langs->loadLangs(array("partnership", "member"));
 
-        $error 			= 0;
-        $erroremail 	= '';
-        $this->output 	= '';
-        $this->error 	= '';
-        $partnershipsprocessed = array();
+		$error 			= 0;
+		$erroremail 	= '';
+		$this->output 	= '';
+		$this->error 	= '';
+		$partnershipsprocessed = array();
 
-       	$gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
-        if ($gracedelay < 1)
-        {
-            $this->error='BadValueForDelayBeforeCancelCheckSetup';
-            return -1;
-        }
+		$gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
+		if ($gracedelay < 1) {
+			$this->error='BadValueForDelayBeforeCancelCheckSetup';
+			return -1;
+		}
 
-        dol_syslog(get_class($this)."::doCancelStatusOfMemberPartnership cancel expired partnerships with grace delay of ".$gracedelay);
+		dol_syslog(get_class($this)."::doCancelStatusOfMemberPartnership cancel expired partnerships with grace delay of ".$gracedelay);
 
-        $now = dol_now();
-        $datetotest = dol_time_plus_duree($now, -1 * abs($gracedelay), 'd');
+		$now = dol_now();
+		$datetotest = dol_time_plus_duree($now, -1 * abs($gracedelay), 'd');
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "SELECT p.rowid, p.fk_member, p.status";
-        $sql .= ", d.datefin, d.fk_adherent_type, dty.subscription";
-        $sql .= " FROM ".MAIN_DB_PREFIX."partnership as p";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d on (d.rowid = p.fk_member)";
+		$sql = "SELECT p.rowid, p.fk_member, p.status";
+		$sql .= ", d.datefin, d.fk_adherent_type, dty.subscription";
+		$sql .= " FROM ".MAIN_DB_PREFIX."partnership as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d on (d.rowid = p.fk_member)";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as dty on (dty.rowid = d.fk_adherent_type)";
 		$sql .= " WHERE fk_member > 0";
 		$sql .= " AND (d.datefin < '".$this->db->idate($datetotest)."' AND dty.subscription = 1)";
-        $sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
-        $sql .= $this->db->order('d.rowid','ASC');
-        // Limit is managed into loop later
+		$sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
+		$sql .= $this->db->order('d.rowid', 'ASC');
+		// Limit is managed into loop later
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $numofexpiredmembers = $this->db->num_rows($resql);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numofexpiredmembers = $this->db->num_rows($resql);
 
-            $somethingdoneonpartnership = 0;
-            $ifetchpartner = 0;
-            while ($ifetchpartner < $numofexpiredmembers)
-            {
-                $ifetchpartner++;
+			$somethingdoneonpartnership = 0;
+			$ifetchpartner = 0;
+			while ($ifetchpartner < $numofexpiredmembers) {
+				$ifetchpartner++;
 
-                $obj = $this->db->fetch_object($resql);
-                if ($obj)
-                {
-                    if (! empty($partnershipsprocessed[$obj->rowid])) continue;
+				$obj = $this->db->fetch_object($resql);
+				if ($obj) {
+					if (! empty($partnershipsprocessed[$obj->rowid])) continue;
 
-                    if ($somethingdoneonpartnership >= $MAXPERCALL)
-                    {
-                        dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doCancelStatusOfMemberPartnership to avoid to reach email quota.", LOG_WARNING);
-                        break;
-                    }
+					if ($somethingdoneonpartnership >= $MAXPERCALL) {
+						dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doCancelStatusOfMemberPartnership to avoid to reach email quota.", LOG_WARNING);
+						break;
+					}
 
-                    $object = new Partnership($this->db);
-                    $object->fetch($obj->rowid);
+					$object = new Partnership($this->db);
+					$object->fetch($obj->rowid);
 
-                    // Get expiration date
-                    $expirationdate = $obj->datefin;
+					// Get expiration date
+					$expirationdate = $obj->datefin;
 
-                    if ($expirationdate && $expirationdate < $now)  // If contract expired (we already had a test into main select, this is a security)
-                    {
-                        $somethingdoneonpartnership++;
+					if ($expirationdate && $expirationdate < $now) {  // If contract expired (we already had a test into main select, this is a security)
+						$somethingdoneonpartnership++;
 
-                        $result = $object->cancel($user, 0);
-                        // $conf->global->noapachereload = null;  
-                        if ($result < 0)
-                        {
-                            $error++;
-                            $this->error = $object->error;
-                            if (is_array($object->errors) && count($object->errors)) {
-                                if (is_array($this->errors)) $this->errors = array_merge($this->errors, $object->errors);
-                                else $this->errors = $object->errors;
-                            }
-                        }
-                        else
-                        {
-                            $partnershipsprocessed[$object->id]=$object->ref;
+						$result = $object->cancel($user, 0);
+						// $conf->global->noapachereload = null;
+						if ($result < 0) {
+							$error++;
+							$this->error = $object->error;
+							if (is_array($object->errors) && count($object->errors)) {
+								if (is_array($this->errors)) $this->errors = array_merge($this->errors, $object->errors);
+								else $this->errors = $object->errors;
+							}
+						} else {
+							$partnershipsprocessed[$object->id]=$object->ref;
 
-                            // Send an email to inform member
-                            $labeltemplate = '(SendingEmailOnPartnershipCanceled)';
+							// Send an email to inform member
+							$labeltemplate = '(SendingEmailOnPartnershipCanceled)';
 
-                            dol_syslog("Now we will send an email to member id=".$object->fk_member." with label ".$labeltemplate);
+							dol_syslog("Now we will send an email to member id=".$object->fk_member." with label ".$labeltemplate);
 
-                            // Send deployment email
-                            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-                            include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-                            $formmail=new FormMail($this->db);
+							// Send deployment email
+							include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+							include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+							$formmail=new FormMail($this->db);
 
-                            // Define output language
-                            $outputlangs = $langs;
-                            $newlang = '';
-                            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-                            if (! empty($newlang)) {
-                                $outputlangs = new Translate("", $conf);
-                                $outputlangs->setDefaultLang($newlang);
-                                $outputlangs->loadLangs(array('main','member','partnership'));
-                            }
+							// Define output language
+							$outputlangs = $langs;
+							$newlang = '';
+							if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+							if (! empty($newlang)) {
+								$outputlangs = new Translate("", $conf);
+								$outputlangs->setDefaultLang($newlang);
+								$outputlangs->loadLangs(array('main','member','partnership'));
+							}
 
-                            $arraydefaultmessage=$formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
+							$arraydefaultmessage=$formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
 
-                            $substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
-                            complete_substitutions_array($substitutionarray, $outputlangs, $object);
+							$substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
+							complete_substitutions_array($substitutionarray, $outputlangs, $object);
 
-                            $subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
-                            $msg     = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
-                            $from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+							$subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
+							$msg     = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
+							$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
 
-                            $adherent = new Adherent($this->db);
-                            $adherent->fetch($object->fk_member);
-                            $to = $adherent->email;
+							$adherent = new Adherent($this->db);
+							$adherent->fetch($object->fk_member);
+							$to = $adherent->email;
 
-                            $cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
-                            $result = $cmail->sendfile();
-                            if (! $result || $cmail->error)
-                            {
-                                $erroremail .= ($erroremail ? ', ' : '').$cmail->error;
-                                $this->errors[] = $cmail->error;
-                                if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
-                            }
-                        }
-                        
-                    }
-                }
-            }
-        }
-        else
-        {
-            $error++;
-            $this->error = $this->db->lasterror();
-        }
+							$cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
+							$result = $cmail->sendfile();
+							if (! $result || $cmail->error) {
+								$erroremail .= ($erroremail ? ', ' : '').$cmail->error;
+								$this->errors[] = $cmail->error;
+								if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+							}
+						}
+					}
+				}
+			}
+		} else {
+			$error++;
+			$this->error = $this->db->lasterror();
+		}
 
-        if (! $error)
-        {
-            $this->db->commit();
-            $this->output = $numofexpiredmembers.' expired partnership members found'."\n";
-            if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail;
-        }
-        else
-        {
-            $this->db->rollback();
-            $this->output = "Rollback after error\n";
-            $this->output.= $numofexpiredmembers.' expired partnership members found'."\n";
-            if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail;
-        }
+		if (! $error) {
+			$this->db->commit();
+			$this->output = $numofexpiredmembers.' expired partnership members found'."\n";
+			if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail;
+		} else {
+			$this->db->rollback();
+			$this->output = "Rollback after error\n";
+			$this->output.= $numofexpiredmembers.' expired partnership members found'."\n";
+			if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail;
+		}
 
-        return ($error ? 1: 0);
+		return ($error ? 1: 0);
 	}
 
 
@@ -236,43 +220,42 @@ class PartnershipUtils
 	{
 		global $conf, $langs, $user;
 
-        $managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
+		$managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
 
-        $partnership = new Partnership($this->db);
-        $MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL) ? 10 : $conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL);       // Limit to 10 per call
+		$partnership = new Partnership($this->db);
+		$MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL) ? 10 : $conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL);       // Limit to 10 per call
 
-        $langs->loadLangs(array("partnership", "member"));
+		$langs->loadLangs(array("partnership", "member"));
 
-        $error 			= 0;
-        $erroremail 	= '';
-        $this->output 	= '';
-        $this->error 	= '';
-        $partnershipsprocessed = array();
+		$error 			= 0;
+		$erroremail 	= '';
+		$this->output 	= '';
+		$this->error 	= '';
+		$partnershipsprocessed = array();
 
-       	$gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
-        if ($gracedelay < 1)
-        {
-            $this->error='BadValueForDelayBeforeCancelCheckSetup';
-            return -1;
-        }
+		$gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
+		if ($gracedelay < 1) {
+			$this->error='BadValueForDelayBeforeCancelCheckSetup';
+			return -1;
+		}
 
-        $fk_partner = ($managedfor == 'member') ? 'fk_member' : 'fk_soc';
+		$fk_partner = ($managedfor == 'member') ? 'fk_member' : 'fk_soc';
 
-        dol_syslog(get_class($this)."::doWarningOfPartnershipIfDolibarrBacklinkNotfound Warning of partnership");
+		dol_syslog(get_class($this)."::doWarningOfPartnershipIfDolibarrBacklinkNotfound Warning of partnership");
 
-        $now = dol_now();
-        $datetotest = dol_time_plus_duree($now, -1 * abs($gracedelay), 'd');
+		$now = dol_now();
+		$datetotest = dol_time_plus_duree($now, -1 * abs($gracedelay), 'd');
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "SELECT p.rowid, p.status, p.".$fk_partner;
-        $sql .= ", p.last_check_backlink";
+		$sql = "SELECT p.rowid, p.status, p.".$fk_partner;
+		$sql .= ", p.last_check_backlink";
 
-        $sql .= ', partner.url, partner.email';
+		$sql .= ', partner.url, partner.email';
 
-        $sql .= " FROM ".MAIN_DB_PREFIX."partnership as p";
+		$sql .= " FROM ".MAIN_DB_PREFIX."partnership as p";
 
-        if ($managedfor == 'member') {
+		if ($managedfor == 'member') {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as partner on (partner.rowid = p.fk_member)";
 		} else {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as partner on (partner.rowid = p.fk_soc)";
@@ -280,147 +263,131 @@ class PartnershipUtils
 
 		$sql .= " WHERE 1 = 1";
 		$sql .= " AND p.".$fk_partner." > 0";
-        $sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
-        $sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 7 * 24 * 3600)."')"; // Every week, check that website contains a link to dolibarr.
-        $sql .= $this->db->order('p.rowid','ASC');
-        // Limit is managed into loop later
+		$sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
+		$sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 7 * 24 * 3600)."')"; // Every week, check that website contains a link to dolibarr.
+		$sql .= $this->db->order('p.rowid', 'ASC');
+		// Limit is managed into loop later
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $numofexpiredmembers 		= $this->db->num_rows($resql);
-            $somethingdoneonpartnership = 0;
-            $ifetchpartner 				= 0;
-            while ($ifetchpartner < $numofexpiredmembers)
-            {
-                $ifetchpartner++;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numofexpiredmembers 		= $this->db->num_rows($resql);
+			$somethingdoneonpartnership = 0;
+			$ifetchpartner 				= 0;
+			while ($ifetchpartner < $numofexpiredmembers) {
+				$ifetchpartner++;
 
-                $obj = $this->db->fetch_object($resql);
-                if ($obj)
-                {
-                    if (! empty($partnershipsprocessed[$obj->rowid])) continue;
+				$obj = $this->db->fetch_object($resql);
+				if ($obj) {
+					if (! empty($partnershipsprocessed[$obj->rowid])) continue;
 
-                    if ($somethingdoneonpartnership >= $MAXPERCALL)
-                    {
-                        dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doWarningOfPartnershipIfDolibarrBacklinkNotfound to avoid to reach email quota.", LOG_WARNING);
-                        break;
-                    }
+					if ($somethingdoneonpartnership >= $MAXPERCALL) {
+						dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doWarningOfPartnershipIfDolibarrBacklinkNotfound to avoid to reach email quota.", LOG_WARNING);
+						break;
+					}
 
-                    $backlinkfound = 0;
+					$backlinkfound = 0;
 
-                    $object = new Partnership($this->db);
-                    $object->fetch($obj->rowid);
+					$object = new Partnership($this->db);
+					$object->fetch($obj->rowid);
 
-                    if($managedfor == 'member'){
-	                	$fk_partner = $object->fk_member;
-	                }else{
-	                	$fk_partner = $object->fk_soc;
-	                }
+					if ($managedfor == 'member') {
+						$fk_partner = $object->fk_member;
+					} else {
+						$fk_partner = $object->fk_soc;
+					}
 
-                    $website = $obj->url;
+					$website = $obj->url;
 
-                	if(empty($website)){
-                		$websitenotfound .= ($websitenotfound ? ', ' : '').'Website not found for id="'.$fk_partner.'"'."\n";
-                	} else {
-                    	$backlinkfound = $this->checkDolibarrBacklink($website);
-                	}
+					if (empty($website)) {
+						$websitenotfound .= ($websitenotfound ? ', ' : '').'Website not found for id="'.$fk_partner.'"'."\n";
+					} else {
+						$backlinkfound = $this->checkDolibarrBacklink($website);
+					}
 
-                	if(!$backlinkfound){
-                		$tmpcount = $object->count_last_url_check_error + 1;
+					if (!$backlinkfound) {
+						$tmpcount = $object->count_last_url_check_error + 1;
 
-                		if($tmpcount == 3){ // Send Warning Email
+						if ($tmpcount == 3) { // Send Warning Email
+							if (!empty($obj->email)) {
+								$emailnotfound .= ($emailnotfound ? ', ' : '').'Email not found for id="'.$fk_partner.'"'."\n";
+							} else {
+								$labeltemplate = '(SendingEmailOnPartnershipWillExpire)';
 
-                			if (!empty($obj->email)){
-                				$emailnotfound .= ($emailnotfound ? ', ' : '').'Email not found for id="'.$fk_partner.'"'."\n";
+								dol_syslog("Now we will send an email to partner id=".$fk_partner." with label ".$labeltemplate);
 
-                			} else {
+								// Send deployment email
+								include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+								include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+								$formmail=new FormMail($this->db);
 
-	                			$labeltemplate = '(SendingEmailOnPartnershipWillExpire)';
+								// Define output language
+								$outputlangs = $langs;
+								$newlang = '';
+								if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+								if (! empty($newlang)) {
+									$outputlangs = new Translate("", $conf);
+									$outputlangs->setDefaultLang($newlang);
+									$outputlangs->loadLangs(array('main','member','partnership'));
+								}
 
-	                            dol_syslog("Now we will send an email to partner id=".$fk_partner." with label ".$labeltemplate);
+								$arraydefaultmessage=$formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
 
-	                            // Send deployment email
-	                            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	                            include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	                            $formmail=new FormMail($this->db);
+								$substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
+								complete_substitutions_array($substitutionarray, $outputlangs, $object);
 
-	                            // Define output language
-	                            $outputlangs = $langs;
-	                            $newlang = '';
-	                            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-	                            if (! empty($newlang)) {
-	                                $outputlangs = new Translate("", $conf);
-	                                $outputlangs->setDefaultLang($newlang);
-	                                $outputlangs->loadLangs(array('main','member','partnership'));
-	                            }
+								$subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
+								$msg     = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
+								$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
 
-	                            $arraydefaultmessage=$formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
+								$to = $obj->email;
 
-	                            $substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
-	                            complete_substitutions_array($substitutionarray, $outputlangs, $object);
+								$cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
+								$result = $cmail->sendfile();
+								if (! $result || $cmail->error) {
+									$erroremail .= ($erroremail ? ', ' : '').$cmail->error;
+									$this->errors[] = $cmail->error;
+									if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+								}
+							}
+						} elseif ($tmpcount > 4) { // Cancel Partnership
+							$object->status = $object::STATUS_CANCELED;
+							$object->reason_decline_or_cancel = $langs->trans('BacklinkNotFoundOnPartnerWebsite');
+						}
 
-	                            $subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
-	                            $msg     = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
-	                            $from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+						$object->count_last_url_check_error = $tmpcount;
+					} else {
+						$object->count_last_url_check_error = 0;
+						$object->reason_decline_or_cancel = '';
+					}
 
-			            		$to = $obj->email;
+					$partnershipsprocessed[$object->id]=$object->ref;
 
-	                            $cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
-	                            $result = $cmail->sendfile();
-	                            if (! $result || $cmail->error)
-	                            {
-	                                $erroremail .= ($erroremail ? ', ' : '').$cmail->error;
-	                                $this->errors[] = $cmail->error;
-	                                if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
-	                            }
-                			}
+					$object->last_check_backlink = $this->db->idate($now);
 
+					$object->update($user);
+				}
+			}
+		} else {
+			$error++;
+			$this->error = $this->db->lasterror();
+		}
 
-                		} elseif($tmpcount > 4) { // Cancel Partnership
-                			$object->status = $object::STATUS_CANCELED;
-                			$object->reason_decline_or_cancel = $langs->trans('BacklinkNotFoundOnPartnerWebsite');
-                		}
+		if (! $error) {
+			$this->db->commit();
+			$this->output = $numofexpiredmembers.' partnership checked'."\n";
+			if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n";
+			if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n";
+			if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n";
+		} else {
+			$this->db->rollback();
+			$this->output = "Rollback after error\n";
+			$this->output.= $numofexpiredmembers.' partnership checked'."\n";
+			if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n";
+			if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n";
+			if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n";
+		}
 
-                		$object->count_last_url_check_error = $tmpcount;
-
-                	} else {
-                		$object->count_last_url_check_error = 0;
-                		$object->reason_decline_or_cancel = '';
-                	}
-
-                	$partnershipsprocessed[$object->id]=$object->ref;
-
-            		$object->last_check_backlink = $this->db->idate($now);
-
-                	$object->update($user);
-                }
-            }
-        }
-        else
-        {
-            $error++;
-            $this->error = $this->db->lasterror();
-        }
-
-        if (! $error)
-        {
-            $this->db->commit();
-            $this->output = $numofexpiredmembers.' partnership checked'."\n";
-            if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n";
-            if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n";
-            if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n";
-        }
-        else
-        {
-            $this->db->rollback();
-            $this->output = "Rollback after error\n";
-            $this->output.= $numofexpiredmembers.' partnership checked'."\n";
-            if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n";
-            if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n";
-            if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n";
-        }
-
-        return ($error ? 1: 0);
+		return ($error ? 1: 0);
 	}
 
 	/**
@@ -439,8 +406,8 @@ class PartnershipUtils
 		$webcontent = '';
 
 		// $website = 'https://nextgestion.com/'; // For Test
-        $tmpgeturl = getURLContent($website);
-        if ($tmpgeturl['curl_error_no']) {
+		$tmpgeturl = getURLContent($website);
+		if ($tmpgeturl['curl_error_no']) {
 			$error++;
 			dol_syslog('Error getting '.$website.': '.$tmpgeturl['curl_error_msg']);
 		} elseif ($tmpgeturl['http_code'] != '200') {
@@ -454,19 +421,18 @@ class PartnershipUtils
 			$xpath = new DOMXPath($dom);
 			$hrefs = $xpath->evaluate("//a");
 
-			for($i = 0; $i < $hrefs->length; $i++){
-			    $href = $hrefs->item($i);
-			    $url = $href->getAttribute('href');
-			    $url = filter_var($url, FILTER_SANITIZE_URL);
-			    if(!filter_var($url, FILTER_VALIDATE_URL) === false){
-			    	$webcontent .= $url;
-			    }
+			for ($i = 0; $i < $hrefs->length; $i++) {
+				$href = $hrefs->item($i);
+				$url = $href->getAttribute('href');
+				$url = filter_var($url, FILTER_SANITIZE_URL);
+				if (!filter_var($url, FILTER_VALIDATE_URL) === false) {
+					$webcontent .= $url;
+				}
 			}
-        }
-		
-		if ($webcontent && !empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK) && preg_match('/'.$conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK.'/', $webcontent))
-		{
-		    $found = 1;
+		}
+
+		if ($webcontent && !empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK) && preg_match('/'.$conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK.'/', $webcontent)) {
+			$found = 1;
 		}
 
 		return $found;

From 16dfde112806d813c9c5718d2a63bb0756fa88fa Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 17 Apr 2021 14:39:14 +0200
Subject: [PATCH 097/928] Update new.php

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 13705796ad5..fa9c844288f 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -218,7 +218,7 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
 	}
-	if (!GETPOST('firstname')) { ä
+	if (!GETPOST('firstname')) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
 	}

From b96d3cebda23f09b1581a56ca17143ccf01df672 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 17 Apr 2021 14:51:05 +0200
Subject: [PATCH 098/928] Update new.php

---
 htdocs/public/members/new.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index fa9c844288f..677e1e1b906 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -227,8 +227,8 @@ if (empty($reshook) && $action == 'add') {
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST('email'))."<br>\n";
 	}
-	$birthday = dol_mktime(GETPOST("birthhour", 'int'), GETPOST('birthmin', 'int'), GETPOST('birthsec', 'int'), GETPOST('birthmonth', 'int'), GETPOST('birthday', 'int'), GETPOST('birthyear', 'int'));
-	if GETPOSTISSET('birthmonth') { && empty($birthday))
+	$birthday = dol_mktime(GETPOST('birthhour', 'int'), GETPOST('birthmin', 'int'), GETPOST('birthsec', 'int'), GETPOST('birthmonth', 'int'), GETPOST('birthday', 'int'), GETPOST('birthyear', 'int'));
+	if (GETPOSTISSET('birthmonth') && empty($birthday)) {
 		$error++;
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";

From 17c2b4f0e8336731713250497adba37872da1f36 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 17 Apr 2021 23:58:00 +0200
Subject: [PATCH 099/928] Fix warning wrong date format for new member form

Fix warning wrong date format for new member form when new membre submit no birthdate
---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index e6b7a3e7a38..349943c7978 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -228,7 +228,7 @@ if (empty($reshook) && $action == 'add') {
 		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
 	}
 	$birthday = dol_mktime(GETPOST("birthhour", 'int'), GETPOST("birthmin", 'int'), GETPOST("birthsec", 'int'), GETPOST("birthmonth", 'int'), GETPOST("birthday", 'int'), GETPOST("birthyear", 'int'));
-	if (GETPOSTISSET("birthmonth") && empty($birthday)) {
+	if (GETPOST("birthmonth") && empty($birthday)) {
 		$error++;
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";

From 7794927a64218d67849f0738557b4a6a6bec345d Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 18 Apr 2021 20:12:24 +0200
Subject: [PATCH 100/928] New check update for modules

---
 htdocs/admin/modules.php                      | 33 ++++++-----
 htdocs/core/lib/functions.lib.php             | 17 +++++-
 htdocs/core/modules/DolibarrModules.class.php | 58 ++++++++++++++++++-
 htdocs/langs/en_US/admin.lang                 |  5 +-
 htdocs/langs/en_US/errors.lang                |  1 +
 htdocs/theme/eldy/btn.inc.php                 |  5 ++
 htdocs/theme/eldy/info-box.inc.php            |  8 ++-
 htdocs/theme/md/info-box.inc.php              |  4 +-
 8 files changed, 106 insertions(+), 25 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index fbe1ae98619..8380756bee5 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -518,11 +518,13 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 	print $deschelp;
 
-	$moreforfilter = '<div class="valignmiddle">';
+	$moreforfilter = '<div class="valignmiddle ">';
 
-	$moreforfilter .= '<div class="floatright right pagination"><ul><li>';
-	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', 1, array('morecss'=>'reposition'.($mode == 'common' ? '' : ' btnTitleSelected')));
-	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', 1, array('morecss'=>'reposition'.($mode == 'commonkanban' ? '' : ' btnTitleSelected')));
+	$moreforfilter .= '<div class="floatright right pagination --module-list"><ul><li>';
+	$moreforfilter .= dolGetButtonTitle($langs->trans('CheckForModuleUpdate'), $langs->trans('CheckForModuleUpdateHelp'), 'fa fa-check-double ', $_SERVER["PHP_SELF"].'?action=checklastversion&token='.newToken().'&mode='.$mode.$param, '', 1, array('morecss'=>'reposition'));
+	$moreforfilter .= '</li><li>'.dolGetButtonTitleSeparator();
+	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', ($mode == 'commonkanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', ($mode == 'common' ? 2 : 1), array('morecss'=>'reposition'));
 	$moreforfilter .= '</li></ul></div>';
 
 	//$moreforfilter .= '<div class="floatright center marginrightonly hideonsmartphone" style="padding-top: 3px"><span class="paddingright">'.$moreinfo.'</span> '.$moreinfo2.'</div>';
@@ -583,7 +585,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 	// Show list of modules
 	$oldfamily = '';
 	$linenum = 0;
-
+	$numOfModuleToUpdate = 0;
 	foreach ($orders as $key => $value) {
 		$linenum++;
 		$tab = explode('_', $value);
@@ -591,6 +593,8 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		$module_position = $tab[2];
 
 		$modName = $filename[$key];
+
+		/** @var DolibarrModules $objMod */
 		$objMod = $modules[$modName];
 
 		//print $objMod->name." - ".$key." - ".$objMod->version."<br>";
@@ -856,7 +860,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 		if ($mode == 'commonkanban') {
 			// Output Kanban
-			print $objMod->getKanbanView($codeenabledisable, $codetoconfig);
+			print $objMod->getKanbanView($codeenabledisable, $codetoconfig, $action == 'checklastversion'?1:0);
 		} else {
 			print '<tr class="oddeven">'."\n";
 			if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
@@ -894,15 +898,14 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			// Version
 			print '<td class="center nowrap" width="120px">';
 			print $versiontrans;
-			if (!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE)) {	// This is a bad practice to activate a synch external access during building of a page. 1 external module can hang the application.
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-				if (!empty($objMod->url_last_version)) {
-					$newversion = getURLContent($objMod->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
-					if (isset($newversion['content'])) {
-						if (version_compare($newversion['content'], $versiontrans) > 0) {
-							print "&nbsp;<span class='butAction' title='".$langs->trans('LastStableVersion')."'>".$newversion['content']."</span>";
-						}
-					}
+			if (!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE) || $action == 'checklastversion') {	// This is a bad practice to activate a synch external access during building of a page. 1 external module can hang the application.
+				$checkRes = $objMod->checkForUpdate();
+				if ($checkRes > 0) {
+					setEventMessage($objMod->getName().' : '.$versiontrans.' -> '.$objMod->lastVersion);
+					print '&nbsp;<span class="badge badge-success" title="'.dol_escape_htmltag($langs->trans('LastStableVersion')).'">'.$objMod->lastVersion.'</span>';
+				}
+				elseif ($checkRes < 0) {
+					setEventMessage($objMod->getName().' '.$langs->trans('CheckVersionFail'), 'warnings');
 				}
 			}
 			print "</td>\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ce3b89d7805..1b12dd75d4d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9710,6 +9710,16 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 	return '<div class="inline-block divButAction"><'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'></div>';
 }
 
+/**
+ * Add space between dolGetButtonTitle
+ *
+ * @return string html of title separator
+ */
+function dolGetButtonTitleSeparator($moreClass = "")
+{
+	return '<span class="button-title-separator '.$moreClass.'" ></span>';
+}
+
 /**
  * Function dolGetButtonTitle : this kind of buttons are used in title in list
  *
@@ -9718,7 +9728,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
  * @param string    $iconClass  class for icon element (Example: 'fa fa-file')
  * @param string    $url        the url for link
  * @param string    $id         attribute id of button
- * @param int       $status     0 no user rights, 1 active, -1 Feature Disabled, -2 disable Other reason use helpText as tooltip
+ * @param int       $status     0 no user rights, 1 active, 2 current action or selected, -1 Feature Disabled, -2 disable Other reason use helpText as tooltip
  * @param array     $params     various params for future : recommended rather than adding more function arguments
  * @return string               html button
  */
@@ -9753,7 +9763,10 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 		$useclassfortooltip = 0;
 	}
 
-	if ($status <= 0) {
+	if ($status == 2) {
+		$attr['class'] .= ' btnTitleSelected';
+	}
+	elseif ($status <= 0) {
 		$attr['class'] .= ' refused';
 
 		$attr['href'] = '';
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index b92937cdada..44fc64e0fd8 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -192,6 +192,18 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 */
 	public $version;
 
+	/**
+	 * Module last version
+	 * @var string $lastVersion
+	 */
+	public $lastVersion = '';
+
+	/**
+	 * true indicate this module need update
+	 * @var bool $needUpdate
+	 */
+	public $needUpdate = false;
+
 	/**
 	 * @var string Module description (short text)
 	 *
@@ -2215,10 +2227,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 * @param	string	$codetoconfig			HTML code to go to config page
 	 * @return 	string							HTML code of Kanban view
 	 */
-	public function getKanbanView($codeenabledisable = '', $codetoconfig = '')
+	public function getKanbanView($codeenabledisable = '', $codetoconfig = '', $checkUpdate = false)
 	{
 		global $conf, $langs;
 
+		if ($this->isCoreOrExternalModule() == 'external' && $checkUpdate) {
+			$this->checkForUpdate();
+		}
+
 		// Define imginfo
 		$imginfo = "info";
 		if ($this->isCoreOrExternalModule() == 'external') {
@@ -2239,8 +2255,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			$versiontrans .= 'warning';
 		}
 
+		$versiontrans .= ' --need-update classfortooltip';
 		print '
-    	<div class="box-flex-item info-box-module'.(empty($conf->global->$const_name) ? ' info-box-module-disabled' : '').($this->isCoreOrExternalModule() == 'external' ? ' info-box-module-external' : '').'">
+    	<div class="box-flex-item info-box-module'
+			.(empty($conf->global->$const_name) ? ' --disabled' : '')
+			.($this->isCoreOrExternalModule() == 'external' ? ' --external' : '')
+			.($this->needUpdate ? ' --need-update' : '')
+			.'">
 	    <div class="info-box info-box-sm info-box-module">
 	    <div class="info-box-icon'.(empty($conf->global->$const_name) ? '' : ' info-box-icon-module-enabled'.($versiontrans ? ' info-box-icon-module-warning' : '')).'">';
 
@@ -2258,7 +2279,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		}
 
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
-			print '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').'" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
+
+			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
+			if ($this->needUpdate){
+				$versionTitle.= '<br/>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
+			}
+
+			print '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').'" title="'.dol_escape_js($versionTitle).'" >';
 			print $this->getVersion(1);
 			print '</span>';
 		}
@@ -2287,4 +2314,29 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	    </div><!-- /.info-box -->
 	    </div>';
 	}
+
+	/**
+	 * check for module update
+	 * @return int <0 if Error, 0 == no update needed,  >0 if need update
+	 */
+	function checkForUpdate(){
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+		if (!empty($this->url_last_version)) {
+			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
+			if (isset($lastVersion['content'])) {
+				$this->lastVersion = $lastVersion['content'];
+				if (version_compare($lastVersion['content'], $this->version) > 0) {
+					$this->needUpdate = true;
+					return 1;
+				}else{
+					$this->needUpdate = false;
+					return 0;
+				}
+			}
+			else{
+				return -1;
+			}
+		}
+		return 0;
+	}
 }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b103d0082ba..7f37655012c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2121,4 +2121,7 @@ YouShouldDisablePHPFunctions=You should disable PHP functions
 IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
\ No newline at end of file
+ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for modules updates
+CheckForModuleUpdateHelp=Check for modules updates.<br/>This action will connect to modules editors to check if a new version is available.
+ModuleUpdateAvailable=An update is available for this module
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 002aa63fa62..89aa9b77662 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -296,3 +296,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 3e3ab1d3b01..92715b774ce 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -279,6 +279,11 @@ div.pagination li:first-child a.btnTitle{
 	margin-left: 10px;
 }
 
+.button-title-separator{
+	display: inline-block;
+	clear: both;
+	width: 20px;
+}
 
 .imgforviewmode {
 	color: #aaa;
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 3eda0c40ee7..dc2dbb3f4d3 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -9,10 +9,14 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
  * -------------------
  */
 
-.info-box-module-external span.info-box-icon-version {
+.info-box-module.--external span.info-box-icon-version {
 	background: #bbb;
 }
 
+.info-box-module.--external.--need-update span.info-box-icon-version{
+	background: #bc9525;
+}
+
 .info-box {
 	display: block;
 	position: relative;
@@ -153,7 +157,7 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	-webkit-transition: opacity 0.5s, visibility 0s 0.5s;
 	transition: opacity 0.5s, visibility 0s 0.5s;
 }
-.box-flex-item.info-box-module.info-box-module-disabled {
+.box-flex-item.info-box-module.--disabled {
 	/* opacity: 0.6; */
 }
 
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 0946315391a..a363475c409 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -119,7 +119,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 }
 
 
-.info-box-module-external span.info-box-icon-version {
+.info-box-module.--external span.info-box-icon-version {
 	background: #bbb;
 }
 
@@ -250,7 +250,7 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	transition: opacity 0.5s, visibility 0s 0.5s;
 }
 
-.box-flex-item.info-box-module.info-box-module-disabled {
+.box-flex-item.info-box-module.--disabled {
 	/* opacity: 0.6; */
 }
 

From da11ac42ac6aeb47f0dcc72932160fbfd957c0f5 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 18 Apr 2021 22:13:37 +0200
Subject: [PATCH 101/928] New check update for modules

---
 htdocs/admin/modules.php                      | 36 ++++++++++++-------
 htdocs/core/modules/DolibarrModules.class.php | 16 ++++-----
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 8380756bee5..eda3ae775a3 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -585,7 +585,6 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 	// Show list of modules
 	$oldfamily = '';
 	$linenum = 0;
-	$numOfModuleToUpdate = 0;
 	foreach ($orders as $key => $value) {
 		$linenum++;
 		$tab = explode('_', $value);
@@ -723,6 +722,23 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			$versiontrans .= $objMod->getVersion(1);
 		}
 
+		if ($objMod->isCoreOrExternalModule() == 'external'
+			&& (
+				$action == 'checklastversion'
+				// This is a bad practice to activate a synch external access during building of a page. 1 external module can hang the application.
+				// Adding a cron job could be a good idea see DolibarrModules::checkForUpdate()
+				|| 	!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE)
+			)
+		) {
+			$checkRes = $objMod->checkForUpdate();
+			if ($checkRes > 0) {
+				setEventMessage($objMod->getName().' : '.$versiontrans.' -> '.$objMod->lastVersion);
+			}
+			elseif ($checkRes < 0) {
+				setEventMessage($objMod->getName().' '.$langs->trans('CheckVersionFail'), 'warnings');
+			}
+		}
+
 		// Define imginfo
 		$imginfo = "info";
 		if ($objMod->isCoreOrExternalModule() == 'external') {
@@ -860,7 +876,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 		if ($mode == 'commonkanban') {
 			// Output Kanban
-			print $objMod->getKanbanView($codeenabledisable, $codetoconfig, $action == 'checklastversion'?1:0);
+			print $objMod->getKanbanView($codeenabledisable, $codetoconfig);
 		} else {
 			print '<tr class="oddeven">'."\n";
 			if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
@@ -897,16 +913,12 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 			// Version
 			print '<td class="center nowrap" width="120px">';
-			print $versiontrans;
-			if (!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE) || $action == 'checklastversion') {	// This is a bad practice to activate a synch external access during building of a page. 1 external module can hang the application.
-				$checkRes = $objMod->checkForUpdate();
-				if ($checkRes > 0) {
-					setEventMessage($objMod->getName().' : '.$versiontrans.' -> '.$objMod->lastVersion);
-					print '&nbsp;<span class="badge badge-success" title="'.dol_escape_htmltag($langs->trans('LastStableVersion')).'">'.$objMod->lastVersion.'</span>';
-				}
-				elseif ($checkRes < 0) {
-					setEventMessage($objMod->getName().' '.$langs->trans('CheckVersionFail'), 'warnings');
-				}
+			if ($objMod->needUpdate) {
+				$versionTitle = $langs->trans('ModuleUpdateAvailable').' : '.$objMod->lastVersion;
+				print '<span class="badge badge-warning classfortooltip" title="'.dol_escape_htmltag($versionTitle).'">'.$versiontrans.'</span>';
+			}
+			else{
+				print $versiontrans;
 			}
 			print "</td>\n";
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 44fc64e0fd8..1cc2fbe4444 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2227,14 +2227,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 * @param	string	$codetoconfig			HTML code to go to config page
 	 * @return 	string							HTML code of Kanban view
 	 */
-	public function getKanbanView($codeenabledisable = '', $codetoconfig = '', $checkUpdate = false)
+	public function getKanbanView($codeenabledisable = '', $codetoconfig = '')
 	{
 		global $conf, $langs;
 
-		if ($this->isCoreOrExternalModule() == 'external' && $checkUpdate) {
-			$this->checkForUpdate();
-		}
-
 		// Define imginfo
 		$imginfo = "info";
 		if ($this->isCoreOrExternalModule() == 'external') {
@@ -2317,15 +2313,19 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 	/**
 	 * check for module update
+	 * TODO : store results for $this->url_last_version and $this->needUpdate
+	 *  Add a cron task to monitor for updates
+	 *
 	 * @return int <0 if Error, 0 == no update needed,  >0 if need update
 	 */
 	function checkForUpdate(){
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (!empty($this->url_last_version)) {
 			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
-			if (isset($lastVersion['content'])) {
-				$this->lastVersion = $lastVersion['content'];
-				if (version_compare($lastVersion['content'], $this->version) > 0) {
+			if (isset($lastVersion['content']) && strlen($lastVersion['content']) < 30) {
+				// Security warning :  be careful with remote data content, the module editor could be hacked (or evil) so limit to a-z A-Z 0-9 _ . -
+				$this->lastVersion = preg_replace("/[^a-zA-Z0-9_\.\-]+/", "", $lastVersion['content']);
+				if (version_compare($this->lastVersion, $this->version) > 0) {
 					$this->needUpdate = true;
 					return 1;
 				}else{

From fb922d9a5ae88a0abfaab3dbac2d841c67ca10ed Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 18 Apr 2021 22:26:27 +0200
Subject: [PATCH 102/928] remove space

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

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index eda3ae775a3..f79f4ba1c32 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -518,7 +518,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 	print $deschelp;
 
-	$moreforfilter = '<div class="valignmiddle ">';
+	$moreforfilter = '<div class="valignmiddle">';
 
 	$moreforfilter .= '<div class="floatright right pagination --module-list"><ul><li>';
 	$moreforfilter .= dolGetButtonTitle($langs->trans('CheckForModuleUpdate'), $langs->trans('CheckForModuleUpdateHelp'), 'fa fa-check-double ', $_SERVER["PHP_SELF"].'?action=checklastversion&token='.newToken().'&mode='.$mode.$param, '', 1, array('morecss'=>'reposition'));

From fff358f040a5ea25e03b5c1240f582dc27dc6708 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 18 Apr 2021 20:28:36 +0000
Subject: [PATCH 103/928] Fixing style errors.

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

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index f79f4ba1c32..84bf924139c 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -733,8 +733,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			$checkRes = $objMod->checkForUpdate();
 			if ($checkRes > 0) {
 				setEventMessage($objMod->getName().' : '.$versiontrans.' -> '.$objMod->lastVersion);
-			}
-			elseif ($checkRes < 0) {
+			} elseif ($checkRes < 0) {
 				setEventMessage($objMod->getName().' '.$langs->trans('CheckVersionFail'), 'warnings');
 			}
 		}
@@ -916,8 +915,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			if ($objMod->needUpdate) {
 				$versionTitle = $langs->trans('ModuleUpdateAvailable').' : '.$objMod->lastVersion;
 				print '<span class="badge badge-warning classfortooltip" title="'.dol_escape_htmltag($versionTitle).'">'.$versiontrans.'</span>';
-			}
-			else{
+			} else {
 				print $versiontrans;
 			}
 			print "</td>\n";

From 781756913b1bc89beba65322924494d28f45037e Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 18 Apr 2021 22:38:18 +0200
Subject: [PATCH 104/928] Fix code Stickler

---
 htdocs/core/lib/functions.lib.php             | 4 ++--
 htdocs/core/modules/DolibarrModules.class.php | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1b12dd75d4d..69cd1ed911c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9713,6 +9713,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 /**
  * Add space between dolGetButtonTitle
  *
+ * @param string $moreClass more css class label
  * @return string html of title separator
  */
 function dolGetButtonTitleSeparator($moreClass = "")
@@ -9765,8 +9766,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 
 	if ($status == 2) {
 		$attr['class'] .= ' btnTitleSelected';
-	}
-	elseif ($status <= 0) {
+	} elseif ($status <= 0) {
 		$attr['class'] .= ' refused';
 
 		$attr['href'] = '';
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 1cc2fbe4444..c1f03b9c989 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2277,7 +2277,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
 
 			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
-			if ($this->needUpdate){
+			if ($this->needUpdate) {
 				$versionTitle.= '<br/>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
 			}
 
@@ -2318,7 +2318,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 *
 	 * @return int <0 if Error, 0 == no update needed,  >0 if need update
 	 */
-	function checkForUpdate(){
+	public function checkForUpdate(){
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (!empty($this->url_last_version)) {
 			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
@@ -2328,12 +2328,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				if (version_compare($this->lastVersion, $this->version) > 0) {
 					$this->needUpdate = true;
 					return 1;
-				}else{
+				} else {
 					$this->needUpdate = false;
 					return 0;
 				}
-			}
-			else{
+			} else {
 				return -1;
 			}
 		}

From 8ab117a62f5cb9b284405d200d3c71e5c90e9fd7 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 18 Apr 2021 20:40:34 +0000
Subject: [PATCH 105/928] Fixing style errors.

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

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index c1f03b9c989..6c7a062b0a1 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2275,7 +2275,6 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		}
 
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
-
 			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
 			if ($this->needUpdate) {
 				$versionTitle.= '<br/>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
@@ -2318,7 +2317,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 *
 	 * @return int <0 if Error, 0 == no update needed,  >0 if need update
 	 */
-	public function checkForUpdate(){
+	public function checkForUpdate()
+	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (!empty($this->url_last_version)) {
 			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only

From b3374225767be636072d482fa31c8901a704ef68 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 18 Apr 2021 22:50:34 +0200
Subject: [PATCH 106/928] Remove ctrl+v

---
 htdocs/core/modules/DolibarrModules.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index c1f03b9c989..02077646983 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2251,7 +2251,6 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			$versiontrans .= 'warning';
 		}
 
-		$versiontrans .= ' --need-update classfortooltip';
 		print '
     	<div class="box-flex-item info-box-module'
 			.(empty($conf->global->$const_name) ? ' --disabled' : '')
@@ -2281,7 +2280,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				$versionTitle.= '<br/>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
 			}
 
-			print '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').'" title="'.dol_escape_js($versionTitle).'" >';
+			print '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
 			print $this->getVersion(1);
 			print '</span>';
 		}

From 5b6439ca5eb742a41d13a40fbe1f33b00a5817f2 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 19 Apr 2021 09:15:47 +0200
Subject: [PATCH 107/928] FIX : cast int

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

diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index ff2e056344c..730ca263f1d 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -638,7 +638,7 @@ class AdvanceTargetingMailing extends CommonObject
 						}
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'boolean') {
 						if ($arrayquery['options_'.$key]!=''){
-							$sqlwhere[]= " (te.".$key." = ".$arrayquery['options_'.$key].")";
+							$sqlwhere[]= " (te.".$key." = ".((int)$arrayquery['options_'.$key]).")";
 						}
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
 						if ($arrayquery['options_'.$key] > 0){

From 8c428081ab94113a19ae70e0b1d8b8be4eeab84c Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 19 Apr 2021 09:17:33 +0200
Subject: [PATCH 108/928] FIX : test on link type

---
 htdocs/comm/mailing/class/advtargetemailing.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 4356039d080..bb472753204 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -638,11 +638,11 @@ class AdvanceTargetingMailing extends CommonObject
 						}
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'boolean') {
 						if ($arrayquery['options_'.$key]!=''){
-							$sqlwhere[]= " (te.".$key." = ".((int)$arrayquery['options_'.$key]).")";
+							$sqlwhere[]= " (te.".$key." = ".$arrayquery['options_'.$key].")";
 						}
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
 						if ($arrayquery['options_'.$key] > 0){
-                                                        $sqlwhere[]= " (te.".$key." = ".$arrayquery['options_'.$key].")";
+                                                        $sqlwhere[]= " (te.".$key." = ".((int)$arrayquery['options_'.$key]).")";
 						}
 					} else {
 						if (is_array($arrayquery['options_'.$key])) {

From 318a783237afa2c4c06226d282f28bcaf1cb7e31 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 19 Apr 2021 07:19:45 +0000
Subject: [PATCH 109/928] Fixing style errors.

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

diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index bb472753204..cb539768cf9 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -642,7 +642,7 @@ class AdvanceTargetingMailing extends CommonObject
 						}
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
 						if ($arrayquery['options_'.$key] > 0){
-                                                        $sqlwhere[]= " (te.".$key." = ".((int)$arrayquery['options_'.$key]).")";
+                                                        $sqlwhere[]= " (te.".$key." = ".((int) $arrayquery['options_'.$key]).")";
 						}
 					} else {
 						if (is_array($arrayquery['options_'.$key])) {

From 701b53773b4e619d82d72a3224459241f4e7f29e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 09:54:29 +0200
Subject: [PATCH 110/928] added description of the line in the invoice, problem
 with dates that are int

---
 htdocs/langs/en_US/eventorganization.lang                 | 1 +
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index f486a64dac1..037a74076fe 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -101,6 +101,7 @@ MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
 EvntOrgStartDuration = This conference starts on 
 EvntOrgEndDuration =  and ends on
+ConferenceAttendeeFee = Conference attendee fee
 #
 # SubscriptionOk page
 #
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 1121248e048..b477d644dc7 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -331,7 +331,7 @@ if (empty($reshook) && $action == 'add') {
 			if (!$error) {
 				// Add line to draft invoice
 				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-				$result = $facture->addline($label, floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+				$result = $facture->addline($langs->trans("ConferenceAttendeeFee").' for the event : \''.$conference->label.'\' occuring from '.$conference->datep.' to '.$conference->datep2, floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
 				if ($result <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;

From 0325f023680258309230b08f39833d54247da5ed Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 10:09:19 +0200
Subject: [PATCH 111/928] timestamp converted to get date of start and end on
 the invoice

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index b477d644dc7..9f3115e56f4 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -331,7 +331,7 @@ if (empty($reshook) && $action == 'add') {
 			if (!$error) {
 				// Add line to draft invoice
 				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-				$result = $facture->addline($langs->trans("ConferenceAttendeeFee").' for the event : \''.$conference->label.'\' occuring from '.$conference->datep.' to '.$conference->datep2, floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+				$result = $facture->addline($langs->trans("ConferenceAttendeeFee").' for the event : \''.$conference->label.'\' occuring from '.dol_print_date($conference->datep, '%d/%m/%y %H:%M:%S').' to '.dol_print_date($conference->datep2, '%d/%m/%y %H:%M:%S'), floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
 				if ($result <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;

From a6c6f9eb08443c2dd4e0c4e7568573ed08002521 Mon Sep 17 00:00:00 2001
From: Pierre Payet <pierre.p@synergies-france.fr>
Date: Mon, 19 Apr 2021 10:20:51 +0200
Subject: [PATCH 112/928] add missing printFieldListFrom hook

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

diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index d054f5e5bcc..d690feb7407 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -223,6 +223,10 @@ if (!empty($conf->contrat->enabled)) {
 }
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (f.rowid = ef.fk_object)";
 if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if (!$user->rights->societe->client->voir && empty($socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
 $sql .= " WHERE f.entity IN (".getEntity('intervention').")";

From 4329b6b99b6399be3e7a1bf13cdf78e5aaabefde Mon Sep 17 00:00:00 2001
From: JC Prieto <jcprieto@virtual20.com>
Date: Mon, 19 Apr 2021 11:04:50 +0200
Subject: [PATCH 113/928] Update bonprelevement.class.php

Change facture reference by supplier reference
---
 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 92f9c320acd..1045f5f8ea1 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1597,7 +1597,7 @@ class BonPrelevement extends CommonObject
 
 				$sql = "SELECT soc.rowid as socid, 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.ref as fac, pf.fk_facture_fourn as idfac,";
+				$sql .= " f.ref as fac, pf.fk_facture_fourn as idfac, f.ref_supplier as fac_sup,";
 				$sql .= " rib.rowid, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum";
 				$sql .= " FROM";
 				$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
@@ -1633,7 +1633,7 @@ class BonPrelevement extends CommonObject
 						$cachearraytotestduplicate[$obj->idfac] = $obj->rowid;
 
 						$daterum = (!empty($obj->date_rum)) ? $this->db->jdate($obj->date_rum) : $this->db->jdate($obj->datec);
-						$fileCrediteurSection .= $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, $daterum, $obj->drum, $obj->rum, $type);
+						$fileCrediteurSection .= $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_sup, $obj->idfac, $obj->iban, $obj->bic, $daterum, $obj->drum, $obj->rum, $type);
 						$this->total = $this->total + $obj->somme;
 						$i++;
 					}

From a4eb4aa80258f3707c37f53071b075f983678cc4 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Mon, 19 Apr 2021 10:08:35 +0100
Subject: [PATCH 114/928] Code optimisation.

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

diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 05a76ae19d2..f3f398e0676 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -307,7 +307,7 @@ class PartnershipUtils
 					if (!$backlinkfound) {
 						$tmpcount = $object->count_last_url_check_error + 1;
 
-						if ($tmpcount == 3) { // Send Warning Email
+						if ($tmpcount > 2 && $tmpcount <= 4) { // Send Warning Email
 							if (!empty($obj->email)) {
 								$emailnotfound .= ($emailnotfound ? ', ' : '').'Email not found for id="'.$fk_partner.'"'."\n";
 							} else {

From 584c09d62c3ec64162d4212dc143000997ceb131 Mon Sep 17 00:00:00 2001
From: x <x@x.x>
Date: Mon, 19 Apr 2021 11:50:03 +0200
Subject: [PATCH 115/928] shorten link to 509 lenght Stickler CI / stickler-ci

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index fb597b2e07c..ca3ee91703c 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -535,8 +535,8 @@ if ($resql) {
             {
                 $selected = 0;
                 if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-                $atag = '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'&amp;page='.$page.'&amp;sortorder='.$sortorder.'&amp;sortfield='.$sortfield.'&amp;search_code='.$search_code.'&amp;search_rate='.$search_rate.'&amp;search_date_sync='.dol_print_date($search_date_sync, "%Y-%m-%d") .'&amp;search_date_sync_end='.dol_print_date($search_date_sync_end, "%Y-%m-%d") .'&amp;edit_mode='. '1'.  '">'.img_picto('edit', 'edit').'</a>'
-                print $atag ;
+                $par = '&amp;id_rate='.$obj->rowid.'&amp;page='.$page.'&amp;sortorder='.$sortorder.'&amp;sortfield='.$sortfield.'&amp;search_code='.$search_code.'&amp;search_rate='.$search_rate.'&amp;search_date_sync='.dol_print_date($search_date_sync, "%Y-%m-%d") .'&amp;search_date_sync_end='.dol_print_date($search_date_sync_end, "%Y-%m-%d") .'&amp;edit_mode=1';
+                print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate'. $par .  '">'.img_picto('edit', 'edit').'</a>';
                 print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
                 print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
             }

From 08787cf40fb883122265704b7a06c72518fadc5c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 19 Apr 2021 09:52:17 +0000
Subject: [PATCH 116/928] Fixing style errors.

---
 htdocs/multicurrency/multicurrency_rate.php | 121 ++++++++++----------
 1 file changed, 58 insertions(+), 63 deletions(-)

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index ca3ee91703c..8a31a34b1f3 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -217,7 +217,7 @@ if (empty($reshook)) {
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$sall = "";
 		$search_date_sync = "";
-        $search_date_sync_end="";
+		$search_date_sync_end="";
 		$search_rate = "";
 		$search_code = "";
 		$search_array_options = array();
@@ -298,10 +298,10 @@ $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."multicurrency AS m ON cr.fk_multicurrency = m.rowid";
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($search_date_sync && $search_date_sync_end ){
-    $sql .= " AND (cr.date_sync BETWEEN '".$db->idate($search_date_sync)."' AND '".$db->idate($search_date_sync_end)."')";
+if ($search_date_sync && $search_date_sync_end ) {
+	$sql .= " AND (cr.date_sync BETWEEN '".$db->idate($search_date_sync)."' AND '".$db->idate($search_date_sync_end)."')";
 } elseif ($search_date_sync && !$search_date_sync_end) {
-    $sql .= natural_search('cr.date_sync', $db->idate($search_date_sync));
+	$sql .= natural_search('cr.date_sync', $db->idate($search_date_sync));
 }
 if ($search_rate) $sql .= natural_search('cr.rate', $search_rate);
 if ($search_code) $sql .= natural_search('m.code', $search_code);
@@ -355,9 +355,9 @@ if ($resql) {
 	}
 
 	if ($search_date_sync) $param = "&search_date_sync=".$search_date_sync;
-    if ($search_date_sync_end) $param="&search_date_sync_end=".$search_date_sync_end;
+	if ($search_date_sync_end) $param="&search_date_sync_end=".$search_date_sync_end;
 	if ($search_rate) $param = "&search_rate=".urlencode($search_rate);
-    if ($search_code != '') $param.="&search_code=".urlencode($search_code);
+	if ($search_code != '') $param.="&search_code=".urlencode($search_code);
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -427,13 +427,13 @@ if ($resql) {
 	if (!empty($arrayfields['cr.date_sync']['checked'])) {
 		print '<td class="liste_titre" align="left">';
 		print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d"), 'search_date_sync', 0, 0, 1);
-        print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
+		print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
 		print '</td>';
 	}
 	// code
 	if (!empty($arrayfields['m.code']['checked'])) {
 		print '<td class="liste_titre" align="left">';
-        print  $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
+		print  $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
 		print '</td>';
 	}
 	// rate
@@ -481,67 +481,62 @@ if ($resql) {
 
 		print '<tr class="oddeven">';
 
-        // USER REQUEST UPDATE FOR THIS LINE
-        if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
-            //  var_dump($obj);
-            print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
-            print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
-            print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
+		// USER REQUEST UPDATE FOR THIS LINE
+		if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
+			//  var_dump($obj);
+			print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
+			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
+			print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
 
-            print '<td class="center nowrap ">';
-            print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
-            print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
-            print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
-            print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
-            print '</td>';
-        }
-        else {
-            // date_sync
-            if (!empty($arrayfields['cr.date_sync']['checked']))
-            {
-                print '<td class="tdoverflowmax200">';
-                print $obj->date_sync;
-                print "</td>\n";
-                if (!$i) $totalarray['nbfield']++;
-            }
+			print '<td class="center nowrap ">';
+			print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
+			print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
+			print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
+			print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
+			print '</td>';
+		} else {
+			// date_sync
+			if (!empty($arrayfields['cr.date_sync']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->date_sync;
+				print "</td>\n";
+				if (!$i) $totalarray['nbfield']++;
+			}
 
-            // code
-            if (! empty($arrayfields['m.code']['checked']))
-            {
-                print '<td class="tdoverflowmax200">';
-                print $obj->code." ".$obj->name;
-                print "</td>\n";
+			// code
+			if (! empty($arrayfields['m.code']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->code." ".$obj->name;
+				print "</td>\n";
 
-                if (! $i) $totalarray['nbfield']++;
-            }
+				if (! $i) $totalarray['nbfield']++;
+			}
 
-            // rate
-            if (! empty($arrayfields['cr.rate']['checked']))
-            {
-                print '<td class="tdoverflowmax200">';
-                print $obj->rate;
-                print "</td>\n";
-                if (! $i) $totalarray['nbfield']++;
-            }
+			// rate
+			if (! empty($arrayfields['cr.rate']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->rate;
+				print "</td>\n";
+				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;
+			// 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;
 
-            // Action
-            print '<td class="nowrap " >';
-            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;
-                $par = '&amp;id_rate='.$obj->rowid.'&amp;page='.$page.'&amp;sortorder='.$sortorder.'&amp;sortfield='.$sortfield.'&amp;search_code='.$search_code.'&amp;search_rate='.$search_rate.'&amp;search_date_sync='.dol_print_date($search_date_sync, "%Y-%m-%d") .'&amp;search_date_sync_end='.dol_print_date($search_date_sync_end, "%Y-%m-%d") .'&amp;edit_mode=1';
-                print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate'. $par .  '">'.img_picto('edit', 'edit').'</a>';
-                print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
-                print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-            }
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
+			// Action
+			print '<td class="nowrap " >';
+			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;
+				$par = '&amp;id_rate='.$obj->rowid.'&amp;page='.$page.'&amp;sortorder='.$sortorder.'&amp;sortfield='.$sortfield.'&amp;search_code='.$search_code.'&amp;search_rate='.$search_rate.'&amp;search_date_sync='.dol_print_date($search_date_sync, "%Y-%m-%d") .'&amp;search_date_sync_end='.dol_print_date($search_date_sync_end, "%Y-%m-%d") .'&amp;edit_mode=1';
+				print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate'. $par .  '">'.img_picto('edit', 'edit').'</a>';
+				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		print "</tr>\n";

From 8f1046fcb3096525c685f1f90d6906e4e9cc81f2 Mon Sep 17 00:00:00 2001
From: x <x@x.x>
Date: Mon, 19 Apr 2021 11:56:37 +0200
Subject: [PATCH 117/928] use form->selectDate instead of html input type date

---
 htdocs/multicurrency/multicurrency_rate.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index ca3ee91703c..6a553fc5abf 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -484,7 +484,10 @@ if ($resql) {
         // USER REQUEST UPDATE FOR THIS LINE
         if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
             //  var_dump($obj);
-            print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
+			$form = new Form($db);
+			print '<td>' . $form->selectDate($obj->date_sync, 'dateinput', 0, 0, 1).'</td>';
+
+
             print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
             print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
 

From e78f6e3001a2ab55659d4cab6fe1192ba4af00fc Mon Sep 17 00:00:00 2001
From: x <x@x.x>
Date: Mon, 19 Apr 2021 12:03:52 +0200
Subject: [PATCH 118/928] replace urlencode

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 9f0a6af576b..0de0d0c458b 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -354,7 +354,7 @@ if ($resql) {
 		$param .= "&sall=".urlencode($sall);
 	}
 
-	if ($search_date_sync) $param = "&search_date_sync=".$search_date_sync;
+	if ($search_date_sync) $param = "&search_date_sync=".urlencode($search_date_sync);
 	if ($search_date_sync_end) $param="&search_date_sync_end=".$search_date_sync_end;
 	if ($search_rate) $param = "&search_rate=".urlencode($search_rate);
 	if ($search_code != '') $param.="&search_code=".urlencode($search_code);

From f71b15ac8ee9e665e6709194f48d3b513fcf19f8 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 19 Apr 2021 10:05:56 +0000
Subject: [PATCH 119/928] Fixing style errors.

---
 htdocs/multicurrency/multicurrency_rate.php | 104 +++++++++-----------
 1 file changed, 49 insertions(+), 55 deletions(-)

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 0de0d0c458b..7445a6ed274 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -482,71 +482,65 @@ if ($resql) {
 		print '<tr class="oddeven">';
 
 
-        // USER REQUEST UPDATE FOR THIS LINE
-        if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
-            //  var_dump($obj);
+		// USER REQUEST UPDATE FOR THIS LINE
+		if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
+			//  var_dump($obj);
 			$form = new Form($db);
 			print '<td>' . $form->selectDate($obj->date_sync, 'dateinput', 0, 0, 1).'</td>';
 
 
-            print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
-            print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
+			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
+			print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
 
-            print '<td class="center nowrap ">';
-            print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
-            print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
-            print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
-            print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
-            print '</td>';
-        }
-        else {
-            // date_sync
-            if (!empty($arrayfields['cr.date_sync']['checked']))
-            {
-                print '<td class="tdoverflowmax200">';
-                print $obj->date_sync;
-                print "</td>\n";
-                if (!$i) $totalarray['nbfield']++;
-            }
+			print '<td class="center nowrap ">';
+			print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
+			print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
+			print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
+			print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
+			print '</td>';
+		} else {
+			// date_sync
+			if (!empty($arrayfields['cr.date_sync']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->date_sync;
+				print "</td>\n";
+				if (!$i) $totalarray['nbfield']++;
+			}
 
-            // code
-            if (! empty($arrayfields['m.code']['checked']))
-            {
-                print '<td class="tdoverflowmax200">';
-                print $obj->code." ".$obj->name;
-                print "</td>\n";
+			// code
+			if (! empty($arrayfields['m.code']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->code." ".$obj->name;
+				print "</td>\n";
 
-                if (! $i) $totalarray['nbfield']++;
-            }
+				if (! $i) $totalarray['nbfield']++;
+			}
 
-            // rate
-            if (! empty($arrayfields['cr.rate']['checked']))
-            {
-                print '<td class="tdoverflowmax200">';
-                print $obj->rate;
-                print "</td>\n";
-                if (! $i) $totalarray['nbfield']++;
-            }
+			// rate
+			if (! empty($arrayfields['cr.rate']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->rate;
+				print "</td>\n";
+				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;
-
-            // Action
-            print '<td class="nowrap " >';
-            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;
-                $par = '&amp;id_rate='.$obj->rowid.'&amp;page='.$page.'&amp;sortorder='.$sortorder.'&amp;sortfield='.$sortfield.'&amp;search_code='.$search_code.'&amp;search_rate='.$search_rate.'&amp;search_date_sync='.dol_print_date($search_date_sync, "%Y-%m-%d") .'&amp;search_date_sync_end='.dol_print_date($search_date_sync_end, "%Y-%m-%d") .'&amp;edit_mode=1';
-                print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate'. $par .  '">'.img_picto('edit', 'edit').'</a>';
-                print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
-                print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-            }
-            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;
 
+			// Action
+			print '<td class="nowrap " >';
+			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;
+				$par = '&amp;id_rate='.$obj->rowid.'&amp;page='.$page.'&amp;sortorder='.$sortorder.'&amp;sortfield='.$sortfield.'&amp;search_code='.$search_code.'&amp;search_rate='.$search_rate.'&amp;search_date_sync='.dol_print_date($search_date_sync, "%Y-%m-%d") .'&amp;search_date_sync_end='.dol_print_date($search_date_sync_end, "%Y-%m-%d") .'&amp;edit_mode=1';
+				print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate'. $par .  '">'.img_picto('edit', 'edit').'</a>';
+				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		print "</tr>\n";

From 62d71028407dd94e6d580bdf0a180769a8321f61 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Mon, 19 Apr 2021 12:22:31 +0200
Subject: [PATCH 120/928] commit git config

---
 htdocs/multicurrency/multicurrency_rate.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 0de0d0c458b..5ed206aa8dc 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -487,8 +487,6 @@ if ($resql) {
             //  var_dump($obj);
 			$form = new Form($db);
 			print '<td>' . $form->selectDate($obj->date_sync, 'dateinput', 0, 0, 1).'</td>';
-
-
             print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
             print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
 

From e678091b1269994552b3b1e6f3c1eb602baa8cde Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Mon, 19 Apr 2021 13:09:53 +0200
Subject: [PATCH 121/928] Update contact.php

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

diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 3125f81bc01..0ba4485361d 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -78,7 +78,7 @@ if ($action == 'addcontact' && $permissiontoedit) {
 	if ($object->fetch($id)) {
 		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
 	} else {
-		dol_print_error($db);
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 } elseif ($action == 'deletecontact' && $permissiontoedit) {
 	// Deleting a contact
@@ -89,7 +89,7 @@ if ($action == 'addcontact' && $permissiontoedit) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
-		dol_print_error($db);
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 

From 2c4e6da36a68f1e6da880585e3dc4ee2535a7d25 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Mon, 19 Apr 2021 14:02:46 +0200
Subject: [PATCH 122/928] add escape to date

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 7445a6ed274..373d2a23304 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -299,7 +299,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."multicurrency AS m ON cr.fk_multicurrency = m.rowid";
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 if ($search_date_sync && $search_date_sync_end ) {
-	$sql .= " AND (cr.date_sync BETWEEN '".$db->idate($search_date_sync)."' AND '".$db->idate($search_date_sync_end)."')";
+	$sql .= " AND (cr.date_sync BETWEEN '".$db->escape($db->idate($search_date_sync))."' AND '".$db->escape($db->idate($search_date_sync_end))."')";
 } elseif ($search_date_sync && !$search_date_sync_end) {
 	$sql .= natural_search('cr.date_sync', $db->idate($search_date_sync));
 }

From 6116e22ed5c61553183a0e614362b44bfd109f4c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 14:15:16 +0200
Subject: [PATCH 123/928] Update agenda.php

$wikihelp  =>  $help_url
---
 htdocs/admin/agenda.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 9829be288a5..a3d725bee93 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -112,8 +112,11 @@ if ($action == "save" && empty($cancel)) {
  * View
  */
 
-$wikihelp = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda';
-llxHeader('', $langs->trans("AgendaSetup"), $wikihelp);
+// $wikihelp = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda';
+
+$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda';
+
+llxHeader('', $langs->trans("AgendaSetup"), $help_url);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("AgendaSetup"), $linkback, 'title_setup');

From 379f105e4ce3215f6ee2a399ab99fe34556806e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 14:18:41 +0200
Subject: [PATCH 124/928] Trans

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b103d0082ba..d7851847f6c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2121,4 +2121,5 @@ YouShouldDisablePHPFunctions=You should disable PHP functions
 IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
\ No newline at end of file
+ARestrictedPath=A restricted path
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
\ No newline at end of file

From 263e110ca3aebbb74f1430211479335465c23348 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Mon, 19 Apr 2021 13:19:32 +0100
Subject: [PATCH 125/928] Enhance module Member

---
 htdocs/adherents/admin/member.php   |  6 +++++
 htdocs/adherents/list.php           | 39 +++++++++++++++++++++++++++++
 htdocs/core/lib/functions.lib.php   |  2 ++
 htdocs/langs/en_US/admin.lang       |  1 +
 htdocs/langs/en_US/main.lang        |  1 +
 htdocs/langs/en_US/members.lang     |  1 +
 htdocs/public/payment/paymentok.php | 21 ++++++++++++++++
 7 files changed, 71 insertions(+)

diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index 62291791fc5..b3c7646689b 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -107,6 +107,7 @@ if ($action == 'set_default') {
 	$res1 = dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha') ? 0 : 1, 'chaine', 0, '', $conf->entity);
 	$res2 = dolibarr_set_const($db, 'ADHERENT_MAIL_REQUIRED', GETPOST('ADHERENT_MAIL_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res3 = dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res3 = dolibarr_set_const($db, 'ADHERENT_CREATE_EXTERNAL_USER_LOGIN', GETPOST('ADHERENT_CREATE_EXTERNAL_USER_LOGIN', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res4 = dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
 	// Use vat for invoice creation
 	if ($conf->facture->enabled) {
@@ -219,6 +220,11 @@ print '<tr class="oddeven"><td>'.$langs->trans("MemberSendInformationByMailByDef
 print $form->selectyesno('ADHERENT_DEFAULT_SENDINFOBYMAIL', (!empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL) ? $conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL : 0), 1);
 print "</td></tr>\n";
 
+// Create an external user login for each new member subscription validated
+print '<tr class="oddeven"><td>'.$langs->trans("MemberCreateAnExternalUserForSubscriptionValidated").'</td><td>';
+print $form->selectyesno('ADHERENT_CREATE_EXTERNAL_USER_LOGIN', (!empty($conf->global->ADHERENT_CREATE_EXTERNAL_USER_LOGIN) ? $conf->global->ADHERENT_CREATE_EXTERNAL_USER_LOGIN : 0), 1);
+print "</td></tr>\n";
+
 // Insert subscription into bank account
 print '<tr class="oddeven"><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
 $arraychoices = array('0'=>$langs->trans("None"));
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 9560a284e2a..5dd0e1e5d74 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -247,6 +247,42 @@ if (empty($reshook)) {
 		}
 	}
 
+	// Create external user
+	if ($massaction == 'createexternaluser' && $user->rights->adherent->creer && $user->rights->user->user->creer) {
+		$tmpmember = new Adherent($db);
+		$error = 0;
+		$nbcreated = 0;
+
+		$db->begin();
+
+		foreach ($toselect as $idtoclose) {
+			$tmpmember->fetch($idtoclose);
+
+			if(!empty($tmpmember->fk_soc)){
+				$nuser = new User($db);
+				$tmpuser = dol_clone($tmpmember);
+
+				$result = $nuser->create_from_member($tmpuser, $tmpmember->login);
+
+				if ($result < 0 && !count($tmpmember->errors)) {
+					setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
+				} else {
+					if ($result > 0) {
+						$nbcreated++;
+					}
+				}
+			}
+		}
+
+		if (!$error) {
+			setEventMessages($langs->trans("XExternalUserCreated", $nbcreated), null, 'mesgs');
+
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+
 	// Mass actions
 	$objectclass = 'Adherent';
 	$objectlabel = 'Members';
@@ -555,6 +591,9 @@ if ($user->rights->adherent->supprimer) {
 if ($user->rights->societe->creer) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
+if ($user->rights->adherent->creer && $user->rights->user->user->creer) {
+	$arrayofmassactions['createexternaluser'] = img_picto('', 'user', 'class="pictofixedwidth"').$langs->trans("CreateExternalUser");
+}
 if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
 	$arrayofmassactions = array();
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2b981530834..7f2d7eff7a8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6835,6 +6835,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__MEMBER_CIVILITY__'] = '__MEMBER_CIVILITY__';
 				$substitutionarray['__MEMBER_FIRSTNAME__'] = '__MEMBER_FIRSTNAME__';
 				$substitutionarray['__MEMBER_LASTNAME__'] = '__MEMBER_LASTNAME__';
+				$substitutionarray['__MEMBER_USER_LOGIN_INFORMATION__'] = 'Login and pass of the external user account';
 				/*$substitutionarray['__MEMBER_NOTE_PUBLIC__'] = '__MEMBER_NOTE_PUBLIC__';
 				$substitutionarray['__MEMBER_NOTE_PRIVATE__'] = '__MEMBER_NOTE_PRIVATE__';*/
 			}
@@ -6910,6 +6911,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				}
 				$substitutionarray['__MEMBER_FIRSTNAME__'] = (isset($object->firstname) ? $object->firstname : '');
 				$substitutionarray['__MEMBER_LASTNAME__'] = (isset($object->lastname) ? $object->lastname : '');
+				$substitutionarray['__MEMBER_USER_LOGIN_INFORMATION__'] = '';
 				if (method_exists($object, 'getFullName')) {
 					$substitutionarray['__MEMBER_FULLNAME__'] = $object->getFullName($outputlangs);
 				}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b103d0082ba..7a35efb30e1 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1431,6 +1431,7 @@ MemberMainOptions=Main options
 AdherentLoginRequired= Manage a Login for each member
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 51d4d99bd8c..4dca585538a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1125,6 +1125,7 @@ UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
 AffectTag=Affect Tag
+CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 2ab2fb87270..52bc295c974 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -213,3 +213,4 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 1942635001f..d61bb4d20d1 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -623,6 +623,27 @@ if ($ispaymentok) {
 						}
 
 						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+
+						// Create external user
+						if(!empty($conf->global->ADHERENT_CREATE_EXTERNAL_USER_LOGIN)){
+							$infouserlogin = '';
+							$nuser = new User($db);
+							$tmpuser = dol_clone($object);
+							
+							$result = $nuser->create_from_member($tmpuser, $object->login);
+							$newpassword = $nuser->setPassword($user, '');
+
+							if ($result < 0) {
+								$outputlangs->load("errors");
+								$postactionmessages[] = 'Error in create external user : '.$nuser->error;
+							} else {
+								$infouserlogin .= $outputlangs->trans("Login").': '.$nuser->login."<br>"."\n";
+								$infouserlogin .= $outputlangs->trans("Password").': '.$newpassword;
+								$postactionmessages[] = $langs->trans("NewUserCreated", $nuser->login);
+							}
+							$substitutionarray['__MEMBER_USER_LOGIN_INFORMATION__'] = $infouserlogin;
+						}
+
 						complete_substitutions_array($substitutionarray, $outputlangs, $object);
 						$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
 						$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);

From 31a3c623f436db634dc6e12667c3a040947d9390 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Mon, 19 Apr 2021 14:24:56 +0200
Subject: [PATCH 126/928] remove ->escape

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 373d2a23304..7445a6ed274 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -299,7 +299,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."multicurrency AS m ON cr.fk_multicurrency = m.rowid";
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 if ($search_date_sync && $search_date_sync_end ) {
-	$sql .= " AND (cr.date_sync BETWEEN '".$db->escape($db->idate($search_date_sync))."' AND '".$db->escape($db->idate($search_date_sync_end))."')";
+	$sql .= " AND (cr.date_sync BETWEEN '".$db->idate($search_date_sync)."' AND '".$db->idate($search_date_sync_end)."')";
 } elseif ($search_date_sync && !$search_date_sync_end) {
 	$sql .= natural_search('cr.date_sync', $db->idate($search_date_sync));
 }

From d8f387938c41e6b105e402d27b5d0e7e94d01502 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 14:30:09 +0200
Subject: [PATCH 127/928] Try to use 2 different names for operation

---
 htdocs/api/class/api_login.class.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 5209cc51157..df5b9945a76 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -52,6 +52,28 @@ class Login
 	 * @throws RestException 500 System error
 	 *
 	 * @url GET /
+	 */
+	public function loginUnsecured($login, $password, $entity = '', $reset = 0)
+	{
+		return $this->index($login, $password, $entity, $reset);
+	}
+
+	/**
+	 * Login
+	 *
+	 * Request the API token for a couple username / password.
+	 * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
+	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API token (DOLAPIKEY) can be found/set on the user page.
+	 *
+	 * @param   string  $login			User login
+	 * @param   string  $password		User password
+	 * @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 403 Access denied
+	 * @throws RestException 500 System error
+	 *
 	 * @url POST /
 	 */
 	public function index($login, $password, $entity = '', $reset = 0)

From 6f32b2edda76e1bffd51c47294562a2ae4dbbfc9 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 19 Apr 2021 13:23:36 +0000
Subject: [PATCH 128/928] Fixing style errors.

---
 htdocs/adherents/list.php           | 2 +-
 htdocs/public/payment/paymentok.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 5dd0e1e5d74..ef32b64e513 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -258,7 +258,7 @@ if (empty($reshook)) {
 		foreach ($toselect as $idtoclose) {
 			$tmpmember->fetch($idtoclose);
 
-			if(!empty($tmpmember->fk_soc)){
+			if (!empty($tmpmember->fk_soc)) {
 				$nuser = new User($db);
 				$tmpuser = dol_clone($tmpmember);
 
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index d61bb4d20d1..c0eb195199e 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -625,11 +625,11 @@ if ($ispaymentok) {
 						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 
 						// Create external user
-						if(!empty($conf->global->ADHERENT_CREATE_EXTERNAL_USER_LOGIN)){
+						if (!empty($conf->global->ADHERENT_CREATE_EXTERNAL_USER_LOGIN)) {
 							$infouserlogin = '';
 							$nuser = new User($db);
 							$tmpuser = dol_clone($object);
-							
+
 							$result = $nuser->create_from_member($tmpuser, $object->login);
 							$newpassword = $nuser->setPassword($user, '');
 

From f396160bb867562c620d551253b71e63449d080b Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Mon, 19 Apr 2021 13:39:50 +0100
Subject: [PATCH 129/928] Fixing error.

---
 htdocs/public/payment/paymentok.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index c0eb195199e..bdafc704f30 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -637,7 +637,7 @@ if ($ispaymentok) {
 								$outputlangs->load("errors");
 								$postactionmessages[] = 'Error in create external user : '.$nuser->error;
 							} else {
-								$infouserlogin .= $outputlangs->trans("Login").': '.$nuser->login."<br>"."\n";
+								$infouserlogin = $outputlangs->trans("Login").': '.$nuser->login."<br>"."\n";
 								$infouserlogin .= $outputlangs->trans("Password").': '.$newpassword;
 								$postactionmessages[] = $langs->trans("NewUserCreated", $nuser->login);
 							}

From ea97cf5bafdf6d7312f5039733d3de23706c4698 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Mon, 19 Apr 2021 13:46:21 +0100
Subject: [PATCH 130/928] Change translate file

---
 htdocs/langs/en_US/partnership.lang | 2 +-
 htdocs/public/payment/paymentok.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 2da278dd36c..ab51d2136e0 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -35,7 +35,7 @@ PartnershipAboutPage=Partnership about page
 partnershipforthirdpartyormember=Partnership is for a 'thirdparty' or for a 'member'
 PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
 PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancel status of partnership
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancel status of partnership when subscription is expired
 
 #
 # Object
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index bdafc704f30..aeb27dc5a55 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -637,8 +637,7 @@ if ($ispaymentok) {
 								$outputlangs->load("errors");
 								$postactionmessages[] = 'Error in create external user : '.$nuser->error;
 							} else {
-								$infouserlogin = $outputlangs->trans("Login").': '.$nuser->login."<br>"."\n";
-								$infouserlogin .= $outputlangs->trans("Password").': '.$newpassword;
+								$infouserlogin = $outputlangs->trans("Login").': '.$nuser->login."<br>"."\n".$outputlangs->trans("Password").': '.$newpassword;
 								$postactionmessages[] = $langs->trans("NewUserCreated", $nuser->login);
 							}
 							$substitutionarray['__MEMBER_USER_LOGIN_INFORMATION__'] = $infouserlogin;

From da0067ff6c8043042e790a279131e55ddc4f76b2 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Mon, 19 Apr 2021 13:51:50 +0100
Subject: [PATCH 131/928] Fixing error

---
 htdocs/public/payment/paymentok.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index aeb27dc5a55..e97b9bd073f 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -637,7 +637,7 @@ if ($ispaymentok) {
 								$outputlangs->load("errors");
 								$postactionmessages[] = 'Error in create external user : '.$nuser->error;
 							} else {
-								$infouserlogin = $outputlangs->trans("Login").': '.$nuser->login."<br>"."\n".$outputlangs->trans("Password").': '.$newpassword;
+								$infouserlogin = $outputlangs->trans("Login").': '.$nuser->login.' '."\n".$outputlangs->trans("Password").': '.$newpassword;
 								$postactionmessages[] = $langs->trans("NewUserCreated", $nuser->login);
 							}
 							$substitutionarray['__MEMBER_USER_LOGIN_INFORMATION__'] = $infouserlogin;

From 238e8a17b051b35e4d202ce70fa1995515533357 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 14:54:58 +0200
Subject: [PATCH 132/928] Better error message

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

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 689e87cca2a..75a37d81769 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1681,7 +1681,7 @@ class Setup extends DolibarrApi
 				//print "xmlfilestart".$xmlfile."endxmlfile";
 				$xml = simplexml_load_string($xmlfile);
 			} else {
-				$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
+				$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].(($xmlarray['http_code'] == 400 && $xmlarray['content']) ? ' '.$xmlarray['content'] : '').' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
 				throw new RestException(500, $errormsg);
 			}
 		}

From 08ded970e288d24efd8a63a1dc1aceb1848c497d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 15:01:36 +0200
Subject: [PATCH 133/928] NEW Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP

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

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 6042226e828..d3f40418269 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -193,19 +193,24 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 					$info['content'] = 'Error bad hostname IP (IP is a local IP). Must be an external URL.';
 					break;
 				}
-				if (in_array($iptocheck, array('100.100.100.200'))) {
+				if (!empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) && in_array($iptocheck, explode(',', $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP))) {
 					$info['http_code'] = 400;
-					$info['content'] = 'Error bad hostname IP (Used by Alibaba metadata). Must be an external URL.';
+					$info['content'] = 'Error bad hostname IP (IP is a local IP defined into MAIN_SECURITY_SERVER_IP). Must be an external URL.';
 					break;
 				}
-			}
-			if ($localurl == 1) {	// Only local url allowed (dangerous, may allow to get metadata on server or make internal port scanning)
+			} else {				// Only local url allowed (dangerous, may allow to get metadata on server or make internal port scanning)
 				if (filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
 					$info['http_code'] = 400;
 					$info['content'] = 'Error bad hostname. Must be a local URL.';
 					break;
 				}
 			}
+			// Common check (local and external)
+			if (in_array($iptocheck, array('100.100.100.200'))) {
+				$info['http_code'] = 400;
+				$info['content'] = 'Error bad hostname IP (Used by Alibaba metadata). Must be an external URL.';
+				break;
+			}
 
 			// Set CURLOPT_CONNECT_TO so curl will not try another resolution that may give a different result
 			curl_setopt($ch, CURLOPT_CONNECT_TO, $iptocheck);

From de4d5f38881d1a3e5ffb7130bf878cb4d9e31003 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 15:07:07 +0200
Subject: [PATCH 134/928] Check file name end with .xml

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

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 75a37d81769..81927f65bae 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1661,10 +1661,14 @@ class Setup extends DolibarrApi
 		if (empty($xmlremote)) {
 			$xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
 		}
-		if ($xmlremote && !preg_match('/^https?:\/\//', $xmlremote)) {
+		if ($xmlremote && !preg_match('/^https?:\/\//i', $xmlremote)) {
 			$langs->load("errors");
 			throw new RestException(500, $langs->trans("ErrorURLMustStartWithHttp", $xmlremote));
 		}
+		if ($xmlremote && !preg_match('/\.xml$/', $xmlremote)) {
+			$langs->load("errors");
+			throw new RestException(500, $langs->trans("ErrorURLMustEndWith", '.xml'));
+		}
 
 		if ($target == 'local') {
 			if (dol_is_file($xmlfile)) {

From 2cd9289de1bb9e977683b062b275c97c43edb119 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 15:09:13 +0200
Subject: [PATCH 135/928] Fix error message

---
 htdocs/api/class/api_setup.class.php | 2 +-
 htdocs/langs/en_US/errors.lang       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 81927f65bae..ca716712189 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1667,7 +1667,7 @@ class Setup extends DolibarrApi
 		}
 		if ($xmlremote && !preg_match('/\.xml$/', $xmlremote)) {
 			$langs->load("errors");
-			throw new RestException(500, $langs->trans("ErrorURLMustEndWith", '.xml'));
+			throw new RestException(500, $langs->trans("ErrorURLMustEndWith", $xmlremote, '.xml'));
 		}
 
 		if ($target == 'local') {
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 002aa63fa62..7b2bb4ebf5c 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used

From a8187af8ef74a3f863f5127ea08157097b9f9461 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 15:16:00 +0200
Subject: [PATCH 136/928] Use MAIN_SECURITY_ANTI_SSRF_SERVER_IP as whitelist
 for local IP.

---
 htdocs/core/lib/geturl.lib.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index d3f40418269..81ff51f00c7 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -204,6 +204,11 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 					$info['content'] = 'Error bad hostname. Must be a local URL.';
 					break;
 				}
+				if (!empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) && !in_array($iptocheck, explode(',', '127.0.0.1,::1,'.$conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP))) {
+					$info['http_code'] = 400;
+					$info['content'] = 'Error bad hostname IP (IP is not a local IP defined into list MAIN_SECURITY_SERVER_IP). Must be a local URL in allowed list.';
+					break;
+				}
 			}
 			// Common check (local and external)
 			if (in_array($iptocheck, array('100.100.100.200'))) {

From 8a43dac46d51c691b9208c4580aa05fbd1937ef7 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 15:21:16 +0200
Subject: [PATCH 137/928] now giving the invoice id to the payment validation
 page so it can validate the payment

---
 htdocs/public/payment/newpayment.php |  6 ++---
 htdocs/public/payment/paymentok.php  | 33 +++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index d03f004f317..75d72b4bbea 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -363,7 +363,7 @@ if ($action == 'dopayment') {
 
 			// A redirect is added if API call successfull
 			if ($source == 'conferencesubscription') {
-				$PAYPAL_API_OK .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+				$PAYPAL_API_OK .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
@@ -384,7 +384,7 @@ if ($action == 'dopayment') {
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 
 		$mesg = '';
@@ -742,7 +742,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		exit;
 	} else {
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 		header("Location: ".$urlok);
 		exit;
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 7e11944c243..d9cfdc28b69 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -103,6 +103,7 @@ if (empty($FULLTAG)) {
 }
 $source = GETPOST('s', 'alpha') ? GETPOST('s', 'alpha') : GETPOST('source', 'alpha');
 $ref = GETPOST('ref');
+$invoiceref = GETPOST('invoice');
 
 $suffix = GETPOST("suffix", 'aZ09');
 $membertypeid = GETPOST("membertypeid", 'int');
@@ -112,15 +113,35 @@ $uncryptedconferencesubscription = dol_decode($conferencesubscription, $dolibarr
 $subscription = substr($uncryptedconferencesubscription, 0, strlen($uncryptedconferencesubscription)-strlen($ref));
 $reffrompayment = substr($uncryptedconferencesubscription, -strlen($ref), strlen($ref));
 
-// Validation of an attendee after his payment
+// After a conference attendee payment
 if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
-	$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-	$resultattendee = $attendeetovalidate->fetch($ref);
-	if ($resultattendee < 0) {
-		setEventMessages(null, $attendeetovalidate->errors, "errors");
+	// Looking for the invoice to which add a payment
+	$paidinvoice = new Facture($db);
+	$resultinvoice = $paidinvoice->fetch($invoiceref);
+	if ($resultinvoice < 0) {
+		setEventMessages(null, $paidinvoice->errors, "errors");
 	} else {
-		$attendeetovalidate->setStatut(1);
+		// Creation of payment line
+		$paiement = new Paiement($db);
+		$paiement->datepaye     = dol_now();
+		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
+		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
+		$paiement->note_private = GETPOST('comment', 'alpha');
+
+		// Validating the attendee
+		$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+		$resultattendee = $attendeetovalidate->fetch($ref);
+		if ($resultattendee < 0) {
+			setEventMessages(null, $attendeetovalidate->errors, "errors");
+		} else {
+			$attendeetovalidate->setStatut(1);
+		}
 	}
+
+
+
 }
 
 // Detect $paymentmethod

From e43b180e1b65e2a913e970412a5ec1aff1ece637 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 15:22:07 +0200
Subject: [PATCH 138/928] Update index.php

add comments
// init API
// init PHPUnit
// init ExtraFields
// init Hook
// init Trigger
// init Widget
// init CSS
// init JS
// init CLI
// init Doc
// add Language
// remove/delete File
---
 htdocs/modulebuilder/index.php | 152 +++++++++++++++++++++++++--------
 1 file changed, 116 insertions(+), 36 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 572fff42369..013a0a85913 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -340,7 +340,10 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 	}
 }
 
-if ($dirins && $action == 'initapi' && !empty($module)) {
+
+// init API
+if ($dirins && $action == 'initapi' && !empty($module)) 
+{
 	$modulename = ucfirst($module); // Force first letter in uppercase
 	$objectname = $tabobj;
 
@@ -351,7 +354,8 @@ if ($dirins && $action == 'initapi' && !empty($module)) {
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) {
+	if ($result > 0) 
+	{
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
 			'mymodule'=>strtolower($modulename),
@@ -369,12 +373,18 @@ if ($dirins && $action == 'initapi' && !empty($module)) {
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} else {
+	} 
+	else 
+	{
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initphpunit' && !empty($module)) {
+
+
+// init PHPUnit
+if ($dirins && $action == 'initphpunit' && !empty($module)) 
+{
 	$modulename = ucfirst($module); // Force first letter in uppercase
 	$objectname = $tabobj;
 
@@ -384,7 +394,8 @@ if ($dirins && $action == 'initphpunit' && !empty($module)) {
 	$destfile = $dirins.'/'.strtolower($module).'/test/phpunit/'.strtolower($objectname).'Test.php';
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) {
+	if ($result > 0) 
+	{
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
 			'mymodule'=>strtolower($modulename),
@@ -402,12 +413,18 @@ if ($dirins && $action == 'initphpunit' && !empty($module)) {
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} else {
+	} 
+	else 
+	{
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initsqlextrafields' && !empty($module)) {
+
+
+// init ExtraFields
+if ($dirins && $action == 'initsqlextrafields' && !empty($module)) 
+{
 	$modulename = ucfirst($module); // Force first letter in uppercase
 	$objectname = $tabobj;
 
@@ -422,7 +439,8 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module)) {
 	//var_dump($srcfile);var_dump($destfile);
 	$result2 = dol_copy($srcfile2, $destfile2, 0, 0);
 
-	if ($result1 > 0 && $result2 > 0) {
+	if ($result1 > 0 && $result2 > 0) 
+	{
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -444,13 +462,19 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module)) {
 
 		dolReplaceInFile($destfile1, $arrayreplacement);
 		dolReplaceInFile($destfile2, $arrayreplacement);
-	} else {
+	} 
+	else 
+	{
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', ''), null, 'errors');
 	}
 	// TODO Enable in class the property $isextrafieldmanaged = 1
 }
-if ($dirins && $action == 'inithook' && !empty($module)) {
+
+
+// init Hook
+if ($dirins && $action == 'inithook' && !empty($module)) 
+{
 	dol_mkdir($dirins.'/'.strtolower($module).'/class');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/class/actions_mymodule.class.php';
@@ -458,7 +482,8 @@ if ($dirins && $action == 'inithook' && !empty($module)) {
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) {
+	if ($result > 0) 
+	{
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -475,12 +500,18 @@ if ($dirins && $action == 'inithook' && !empty($module)) {
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} else {
+	} 
+	else 
+	{
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'inittrigger' && !empty($module)) {
+
+
+// init Trigger
+if ($dirins && $action == 'inittrigger' && !empty($module)) 
+{
 	dol_mkdir($dirins.'/'.strtolower($module).'/core/triggers');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php';
@@ -488,7 +519,8 @@ if ($dirins && $action == 'inittrigger' && !empty($module)) {
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) {
+	if ($result > 0) 
+	{
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -505,12 +537,18 @@ if ($dirins && $action == 'inittrigger' && !empty($module)) {
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} else {
+	} 
+	else 
+	{
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initwidget' && !empty($module)) {
+
+
+// init Widget
+if ($dirins && $action == 'initwidget' && !empty($module)) 
+{
 	dol_mkdir($dirins.'/'.strtolower($module).'/core/boxes');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/core/boxes/mymodulewidget1.php';
@@ -518,7 +556,8 @@ if ($dirins && $action == 'initwidget' && !empty($module)) {
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) {
+	if ($result > 0) 
+	{
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -535,12 +574,18 @@ if ($dirins && $action == 'initwidget' && !empty($module)) {
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} else {
+	} 
+	else 
+	{
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initcss' && !empty($module)) {
+
+
+// init CSS
+if ($dirins && $action == 'initcss' && !empty($module)) 
+{
 	dol_mkdir($dirins.'/'.strtolower($module).'/css');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/css/mymodule.css.php';
@@ -548,7 +593,8 @@ if ($dirins && $action == 'initcss' && !empty($module)) {
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) {
+	if ($result > 0) 
+	{
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -570,13 +616,18 @@ if ($dirins && $action == 'initcss' && !empty($module)) {
 		$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/css/'.strtolower($module).'.css.php', '/').'\'/' => '\'/'.strtolower($module).'/css/'.strtolower($module).'.css.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-	} else {
+	} 
+	else 
+	{
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
 
-if ($dirins && $action == 'initjs' && !empty($module)) {
+
+// init JS
+if ($dirins && $action == 'initjs' && !empty($module)) 
+{
 	dol_mkdir($dirins.'/'.strtolower($module).'/js');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/js/mymodule.js.php';
@@ -584,7 +635,8 @@ if ($dirins && $action == 'initjs' && !empty($module)) {
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) {
+	if ($result > 0) 
+	{
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -606,12 +658,18 @@ if ($dirins && $action == 'initjs' && !empty($module)) {
 		$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/js/'.strtolower($module).'.js.php', '/').'\'/' => '\'/'.strtolower($module).'/js/'.strtolower($module).'.js.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-	} else {
+	} 
+	else 
+	{
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initcli' && !empty($module)) {
+
+
+// init CLI
+if ($dirins && $action == 'initcli' && !empty($module)) 
+{
 	dol_mkdir($dirins.'/'.strtolower($module).'/scripts');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/scripts/mymodule.php';
@@ -641,12 +699,18 @@ if ($dirins && $action == 'initcli' && !empty($module)) {
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} else {
+	} 
+	else 
+	{
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initdoc' && !empty($module)) {
+
+
+// init Doc
+if ($dirins && $action == 'initdoc' && !empty($module)) 
+{
 	dol_mkdir($dirins.'/'.strtolower($module).'/doc');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/doc/Documentation.asciidoc';
@@ -654,7 +718,8 @@ if ($dirins && $action == 'initdoc' && !empty($module)) {
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) {
+	if ($result > 0) 
+	{
 		$modulename = ucfirst($module); // Force first letter in uppercase
 		$modulelowercase = strtolower($module);
 
@@ -688,36 +753,50 @@ if ($dirins && $action == 'initdoc' && !empty($module)) {
 
 		dol_delete_file($outputfiledoc, 0, 0, 0, null, false, 0);
 		dol_delete_file($outputfiledocpdf, 0, 0, 0, null, false, 0);
-	} else {
+	} 
+	else 
+	{
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
 
-if ($dirins && $action == 'addlanguage' && !empty($module)) {
+
+// add Language
+if ($dirins && $action == 'addlanguage' && !empty($module)) 
+{
 	$newlangcode = GETPOST('newlangcode', 'aZ09');
 	$srcfile = $dirins.'/'.strtolower($module).'/langs/en_US';
 	$destfile = $dirins.'/'.strtolower($module).'/langs/'.$newlangcode;
 	$result = dolCopyDir($srcfile, $destfile, 0, 0);
 }
 
-if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
+
+// remove/delete File 
+if ($dirins && $action == 'confirm_removefile' && !empty($module)) 
+{
 	$relativefilename = dol_sanitizePathName(GETPOST('file', 'none'));
-	if ($relativefilename) {
+	if ($relativefilename) 
+	{
 		$dirnametodelete = dirname($relativefilename);
 		$filetodelete = $dirins.'/'.$relativefilename;
 		$dirtodelete  = $dirins.'/'.$dirnametodelete;
 
 		$result = dol_delete_file($filetodelete);
-		if (!$result) {
+		if (!$result) 
+		{
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", basename($filetodelete)), null, 'errors');
-		} else {
-			if (dol_is_dir_empty($dirtodelete)) {
+		} 
+		else 
+		{
+			if (dol_is_dir_empty($dirtodelete)) 
+			{
 				dol_delete_dir($dirtodelete);
 			}
 
 			// Update descriptor file to comment file
-			if (in_array($tab, array('css', 'js'))) {
+			if (in_array($tab, array('css', 'js'))) 
+			{
 				$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 				$arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m'=>'                // \'/'.$relativefilename.'\',');
 				dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
@@ -726,6 +805,7 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
 	}
 }
 
+
 // Build the $fields array from SQL table (initfromtablename)
 if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray', 'alpha')) {
 	$tablename = GETPOST('initfromtablename', 'alpha');

From 1d27bc461ad57df78c69ada4e50ca460da11ca20 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 19 Apr 2021 13:24:14 +0000
Subject: [PATCH 139/928] Fixing style errors.

---
 htdocs/modulebuilder/index.php | 121 ++++++++++-----------------------
 1 file changed, 37 insertions(+), 84 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 013a0a85913..c4c0aceed3a 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -342,8 +342,7 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 
 
 // init API
-if ($dirins && $action == 'initapi' && !empty($module)) 
-{
+if ($dirins && $action == 'initapi' && !empty($module)) {
 	$modulename = ucfirst($module); // Force first letter in uppercase
 	$objectname = $tabobj;
 
@@ -354,8 +353,7 @@ if ($dirins && $action == 'initapi' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) 
-	{
+	if ($result > 0) {
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
 			'mymodule'=>strtolower($modulename),
@@ -373,9 +371,7 @@ if ($dirins && $action == 'initapi' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} 
-	else 
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -383,8 +379,7 @@ if ($dirins && $action == 'initapi' && !empty($module))
 
 
 // init PHPUnit
-if ($dirins && $action == 'initphpunit' && !empty($module)) 
-{
+if ($dirins && $action == 'initphpunit' && !empty($module)) {
 	$modulename = ucfirst($module); // Force first letter in uppercase
 	$objectname = $tabobj;
 
@@ -394,8 +389,7 @@ if ($dirins && $action == 'initphpunit' && !empty($module))
 	$destfile = $dirins.'/'.strtolower($module).'/test/phpunit/'.strtolower($objectname).'Test.php';
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) 
-	{
+	if ($result > 0) {
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
 			'mymodule'=>strtolower($modulename),
@@ -413,9 +407,7 @@ if ($dirins && $action == 'initphpunit' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} 
-	else 
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -423,8 +415,7 @@ if ($dirins && $action == 'initphpunit' && !empty($module))
 
 
 // init ExtraFields
-if ($dirins && $action == 'initsqlextrafields' && !empty($module)) 
-{
+if ($dirins && $action == 'initsqlextrafields' && !empty($module)) {
 	$modulename = ucfirst($module); // Force first letter in uppercase
 	$objectname = $tabobj;
 
@@ -439,8 +430,7 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result2 = dol_copy($srcfile2, $destfile2, 0, 0);
 
-	if ($result1 > 0 && $result2 > 0) 
-	{
+	if ($result1 > 0 && $result2 > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -462,9 +452,7 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module))
 
 		dolReplaceInFile($destfile1, $arrayreplacement);
 		dolReplaceInFile($destfile2, $arrayreplacement);
-	} 
-	else 
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', ''), null, 'errors');
 	}
@@ -473,8 +461,7 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module))
 
 
 // init Hook
-if ($dirins && $action == 'inithook' && !empty($module)) 
-{
+if ($dirins && $action == 'inithook' && !empty($module)) {
 	dol_mkdir($dirins.'/'.strtolower($module).'/class');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/class/actions_mymodule.class.php';
@@ -482,8 +469,7 @@ if ($dirins && $action == 'inithook' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) 
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -500,9 +486,7 @@ if ($dirins && $action == 'inithook' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} 
-	else 
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -510,8 +494,7 @@ if ($dirins && $action == 'inithook' && !empty($module))
 
 
 // init Trigger
-if ($dirins && $action == 'inittrigger' && !empty($module)) 
-{
+if ($dirins && $action == 'inittrigger' && !empty($module)) {
 	dol_mkdir($dirins.'/'.strtolower($module).'/core/triggers');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php';
@@ -519,8 +502,7 @@ if ($dirins && $action == 'inittrigger' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) 
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -537,9 +519,7 @@ if ($dirins && $action == 'inittrigger' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} 
-	else 
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -547,8 +527,7 @@ if ($dirins && $action == 'inittrigger' && !empty($module))
 
 
 // init Widget
-if ($dirins && $action == 'initwidget' && !empty($module)) 
-{
+if ($dirins && $action == 'initwidget' && !empty($module)) {
 	dol_mkdir($dirins.'/'.strtolower($module).'/core/boxes');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/core/boxes/mymodulewidget1.php';
@@ -556,8 +535,7 @@ if ($dirins && $action == 'initwidget' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) 
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -574,9 +552,7 @@ if ($dirins && $action == 'initwidget' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} 
-	else 
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -584,8 +560,7 @@ if ($dirins && $action == 'initwidget' && !empty($module))
 
 
 // init CSS
-if ($dirins && $action == 'initcss' && !empty($module)) 
-{
+if ($dirins && $action == 'initcss' && !empty($module)) {
 	dol_mkdir($dirins.'/'.strtolower($module).'/css');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/css/mymodule.css.php';
@@ -593,8 +568,7 @@ if ($dirins && $action == 'initcss' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) 
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -616,9 +590,7 @@ if ($dirins && $action == 'initcss' && !empty($module))
 		$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/css/'.strtolower($module).'.css.php', '/').'\'/' => '\'/'.strtolower($module).'/css/'.strtolower($module).'.css.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-	} 
-	else 
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -626,8 +598,7 @@ if ($dirins && $action == 'initcss' && !empty($module))
 
 
 // init JS
-if ($dirins && $action == 'initjs' && !empty($module)) 
-{
+if ($dirins && $action == 'initjs' && !empty($module)) {
 	dol_mkdir($dirins.'/'.strtolower($module).'/js');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/js/mymodule.js.php';
@@ -635,8 +606,7 @@ if ($dirins && $action == 'initjs' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) 
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -658,9 +628,7 @@ if ($dirins && $action == 'initjs' && !empty($module))
 		$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/js/'.strtolower($module).'.js.php', '/').'\'/' => '\'/'.strtolower($module).'/js/'.strtolower($module).'.js.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-	} 
-	else 
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -668,8 +636,7 @@ if ($dirins && $action == 'initjs' && !empty($module))
 
 
 // init CLI
-if ($dirins && $action == 'initcli' && !empty($module)) 
-{
+if ($dirins && $action == 'initcli' && !empty($module)) {
 	dol_mkdir($dirins.'/'.strtolower($module).'/scripts');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/scripts/mymodule.php';
@@ -699,9 +666,7 @@ if ($dirins && $action == 'initcli' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	} 
-	else 
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -709,8 +674,7 @@ if ($dirins && $action == 'initcli' && !empty($module))
 
 
 // init Doc
-if ($dirins && $action == 'initdoc' && !empty($module)) 
-{
+if ($dirins && $action == 'initdoc' && !empty($module)) {
 	dol_mkdir($dirins.'/'.strtolower($module).'/doc');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/doc/Documentation.asciidoc';
@@ -718,8 +682,7 @@ if ($dirins && $action == 'initdoc' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0) 
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 		$modulelowercase = strtolower($module);
 
@@ -753,9 +716,7 @@ if ($dirins && $action == 'initdoc' && !empty($module))
 
 		dol_delete_file($outputfiledoc, 0, 0, 0, null, false, 0);
 		dol_delete_file($outputfiledocpdf, 0, 0, 0, null, false, 0);
-	} 
-	else 
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -763,8 +724,7 @@ if ($dirins && $action == 'initdoc' && !empty($module))
 
 
 // add Language
-if ($dirins && $action == 'addlanguage' && !empty($module)) 
-{
+if ($dirins && $action == 'addlanguage' && !empty($module)) {
 	$newlangcode = GETPOST('newlangcode', 'aZ09');
 	$srcfile = $dirins.'/'.strtolower($module).'/langs/en_US';
 	$destfile = $dirins.'/'.strtolower($module).'/langs/'.$newlangcode;
@@ -772,31 +732,24 @@ if ($dirins && $action == 'addlanguage' && !empty($module))
 }
 
 
-// remove/delete File 
-if ($dirins && $action == 'confirm_removefile' && !empty($module)) 
-{
+// remove/delete File
+if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
 	$relativefilename = dol_sanitizePathName(GETPOST('file', 'none'));
-	if ($relativefilename) 
-	{
+	if ($relativefilename) {
 		$dirnametodelete = dirname($relativefilename);
 		$filetodelete = $dirins.'/'.$relativefilename;
 		$dirtodelete  = $dirins.'/'.$dirnametodelete;
 
 		$result = dol_delete_file($filetodelete);
-		if (!$result) 
-		{
+		if (!$result) {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", basename($filetodelete)), null, 'errors');
-		} 
-		else 
-		{
-			if (dol_is_dir_empty($dirtodelete)) 
-			{
+		} else {
+			if (dol_is_dir_empty($dirtodelete)) {
 				dol_delete_dir($dirtodelete);
 			}
 
 			// Update descriptor file to comment file
-			if (in_array($tab, array('css', 'js'))) 
-			{
+			if (in_array($tab, array('css', 'js'))) {
 				$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 				$arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m'=>'                // \'/'.$relativefilename.'\',');
 				dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);

From 474bf5cfd9f11d3b4b7b9eea76d3a663a363ca0c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 15:26:24 +0200
Subject: [PATCH 140/928] Show MAIN_SECURITY_ANTI_SSRF_SERVER_IP option into
 security page

---
 htdocs/admin/system/security.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index c9a652cd4e4..de59957f5c9 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -243,10 +243,13 @@ print '<br>';
 print load_fiche_titre($langs->trans("Menu").' '.$langs->trans("SecuritySetup"), '', 'folder');
 
 //print '<strong>'.$langs->trans("PasswordEncryption").'</strong>: ';
-print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.(empty($conf->global->MAIN_SECURITY_HASH_ALGO) ? $langs->trans("Undefined") : '')." &nbsp; ";
-print '<span class="opacitymedium"> &nbsp; &nbsp; If unset: \'md5\'</span><br>';
+print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.(empty($conf->global->MAIN_SECURITY_HASH_ALGO) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_HASH_ALGO)." &nbsp; ";
+if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
+	print '<span class="opacitymedium"> &nbsp; &nbsp; If unset: \'md5\'</span>';
+}
+print '<br>';
 if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
-	print '<strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? $langs->trans("Undefined") : $conf->global->MAIN_SECURITY_SALT).'<br>';
+	print '<strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_SALT).'<br>';
 }
 if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
 	print '<div class="info">The recommanded value for MAIN_SECURITY_HASH_ALGO is now \'password_hash\' but setting it now will make ALL existing passwords of all users not valid, so update is not possible.<br>';
@@ -258,6 +261,11 @@ if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
 }
 print '<br>';
 
+
+print '<strong>MAIN_SECURITY_ANTI_SSRF_SERVER_IP</strong> = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."<br>";
+print '<br>';
+
+
 print '<strong>'.$langs->trans("AntivirusEnabledOnUpload").'</strong>: ';
 print empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? '' : img_picto('', 'tick').' ';
 print yn($conf->global->MAIN_ANTIVIRUS_COMMAND ? 1 : 0);
@@ -292,9 +300,10 @@ if (!empty($eventstolog) && is_array($eventstolog)) {
 		}
 	}
 } else {
-	print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Audit"));
+	print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Audit")).'<br>';
 }
 
+print '<br><br>';
 
 // End of page
 llxFooter();

From 634c38e9483508593a071e861a7d9f172f5a6b41 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 15:28:49 +0200
Subject: [PATCH 141/928] Fix escape

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

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 6e3f0113432..ef50a1701d7 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1092,8 +1092,8 @@ class Website extends CommonObject
 		}
 
 		$line .= "\n-- For Dolibarr v14+ --\n";
-		$line .= "UPDATE llx_website SET fk_default_lang = '".$this->fk_default_lang."' WHERE rowid = __WEBSITE_ID__;\n";
-		$line .= "UPDATE llx_website SET otherlang = '".$this->otherlang."' WHERE rowid = __WEBSITE_ID__;\n";
+		$line .= "UPDATE llx_website SET fk_default_lang = '".$this->db->escape($this->fk_default_lang)."' WHERE rowid = __WEBSITE_ID__;\n";
+		$line .= "UPDATE llx_website SET otherlang = '".$this->db->escape($this->otherlang)."' WHERE rowid = __WEBSITE_ID__;\n";
 		$line .= "\n";
 		fputs($fp, $line);
 

From b5868acf18f73ac3516acafa08293001be2a9ee8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 15:30:30 +0200
Subject: [PATCH 142/928] Fix phpcs

---
 htdocs/salaries/card.php | 6 ++++--
 htdocs/website/index.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 5b6134d192d..8e2188123db 100755
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -525,10 +525,12 @@ if ($action == 'create') {
 	}
 
 	// Bouton Save payment
-/*	print '<tr class="hide_if_no_auto_create_payment"><td>';
+	/*
+	print '<tr class="hide_if_no_auto_create_payment"><td>';
 	print $langs->trans("ClosePaidSalaryAutomatically");
 	print '</td><td><input type="checkbox" checked value="1" name="closepaidsalary"></td></tr>';
-*/
+	*/
+
 	// Other attributes
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index f992a4ba0d0..547f6ac217a 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2256,7 +2256,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 	$domtree = new DOMDocument('1.0', 'UTF-8');
 
 	$root = $domtree->createElementNS('http://www.sitemaps.org/schemas/sitemap/0.9', 'urlset');
-	$root->setAttributeNS('http://www.w3.org/2000/xmlns/' ,'xmlns:xhtml', 'http://www.w3.org/1999/xhtml');
+	$root->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xhtml', 'http://www.w3.org/1999/xhtml');
 
 	$domtree->formatOutput = true;
 

From 0f0bd34d292713356f51773493a359fcfaf79759 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 15:38:44 +0200
Subject: [PATCH 143/928] Update llx_10_c_regions.sql

-- Mauritius
-- Venezuela
-- United Arab Emirates
-- Portugal
-- Slovenia (correction fk_pays)
---
 .../install/mysql/data/llx_10_c_regions.sql   | 135 ++++++++++--------
 1 file changed, 73 insertions(+), 62 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index f2f1048cf19..5f94ece4720 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -71,17 +71,22 @@
 -- Indonesia -> for Departmements
 -- Italy
 -- Luxembourg
--- Morocco
+-- Mauritius
 -- Mexique -> for Departmements
+-- Morocco
 -- Netherlands -> for Departmements
 -- Panama -> for Departmements
+-- Portugal
 -- Romania -> for Departmements
 -- San Salvador
+-- Slovenia
 -- Spain
 -- Switzerland/Suisse -> for Departmements/Cantons
 -- Tunesia
+-- United Arab Emirates -> for Departmements
 -- United Kingdom
 -- USA -> for Departmements
+-- Venezuela
 
 
 
@@ -260,6 +265,25 @@ INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 140, 14003, '', 0, 'Luxembourg');
 
 
+-- Mauritius Regions (id country=152)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15201, '', 0, 'Rivière Noire');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15202, '', 0, 'Flacq');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15203, '', 0, 'Grand Port');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15204, '', 0, 'Moka');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15205, '', 0, 'Pamplemousses');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15206, '', 0, 'Plaines Wilhems');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15207, '', 0, 'Port-Louis');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15208, '', 0, 'Rivière du Rempart');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15209, '', 0, 'Savanne');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15210, '', 0, 'Rodrigues');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15211, '', 0, 'Les îles Agaléga');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 152, 15212, '', 0, 'Les écueils des Cargados Carajos');
+
+
+-- Mexique Regions (id country=154)
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 154, 15401, '', 0, 'Mexique');
+
+
 -- Morocco / Maroc - Regions (id country=12)
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1201, '', 0, 'Tanger-Tétouan');
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1202, '', 0, 'Gharb-Chrarda-Beni Hssen');
@@ -279,10 +303,6 @@ INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1216, '', 0, 'Oued Ed-Dahab Lagouira');
 
 
--- Mexique Regions (id country=154)
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 154, 15401, '', 0, 'Mexique');
-
-
 -- Netherlands Regions (id country=17)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 17, 1701, '', 0,'Provincies van Nederland ');
 
@@ -291,6 +311,11 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 1
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 178, 17801, '', 0, 'Panama');
 
 
+-- Portugal Regions (rowid country=25)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 25, 15001, 'PT', NULL, 'Portugal');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 25, 15002, 'PT9', NULL, 'Azores-Madeira');
+
+
 -- Romania Regions (id country=188) 
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 188, 18801, '', 0, 'Romania');
 
@@ -301,6 +326,11 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 8
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 86, 8603, NULL, NULL, 'Occidental');
 
 
+-- Slovenia Regions (rowid country=202)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 202, '20203', 'SI03', NULL, 'East Slovenia');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 202, '20204', 'SI04', NULL, 'West Slovenia');
+
+
 -- Spain  Regions (id country=4)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 4, 401, '', 0, 'Andalucia');
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 4, 402, '', 0, 'Aragón');
@@ -329,30 +359,34 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 6
 
 
 -- Tunisia Regions (id country=10)
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1001, '',0,'Ariana');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1002, '',0,'Béja');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1003, '',0,'Ben Arous');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1004, '',0,'Bizerte');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1005, '',0,'Gabès');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1006, '',0,'Gafsa');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1007, '',0,'Jendouba');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1008, '',0,'Kairouan');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1009, '',0,'Kasserine');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1010, '',0,'Kébili');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1011, '',0,'La Manouba');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1012, '',0,'Le Kef');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1013, '',0,'Mahdia');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1014, '',0,'Médenine');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1015, '',0,'Monastir');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1016, '',0,'Nabeul');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1017, '',0,'Sfax');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1018, '',0,'Sidi Bouzid');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1019, '',0,'Siliana');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1020, '',0,'Sousse');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1021, '',0,'Tataouine');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1022, '',0,'Tozeur');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1023, '',0,'Tunis');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1024, '',0,'Zaghouan');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1001, '', 0, 'Ariana');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1002, '', 0, 'Béja');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1003, '', 0, 'Ben Arous');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1004, '', 0, 'Bizerte');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1005, '', 0, 'Gabès');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1006, '', 0, 'Gafsa');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1007, '', 0, 'Jendouba');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1008, '', 0, 'Kairouan');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1009, '', 0, 'Kasserine');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1010, '', 0, 'Kébili');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1011, '', 0, 'La Manouba');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1012, '', 0, 'Le Kef');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1013, '', 0, 'Mahdia');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1014, '', 0, 'Médenine');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1015, '', 0, 'Monastir');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1016, '', 0, 'Nabeul');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1017, '', 0, 'Sfax');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1018, '', 0, 'Sidi Bouzid');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1019, '', 0, 'Siliana');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1020, '', 0, 'Sousse');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1021, '', 0, 'Tataouine');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1022, '', 0, 'Tozeur');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1023, '', 0, 'Tunis');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1024, '', 0, 'Zaghouan');
+
+
+-- United Arab Emirates (UAE) Regions (rowid country=227)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 227, 22701, '', 0, 'United Arab Emirates');
 
 
 -- UK United Kingdom Regions (id_country=7)
@@ -366,34 +400,21 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 7
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 11, 1101, '', 0, 'United-States');
 
 
+-- Venezuela Regions (id country=232)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23201, '', 0, 'Los Andes');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23202, '', 0, 'Capital');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23203, '', 0, 'Central');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23204, '', 0, 'Cento Occidental');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23205, '', 0, 'Guayana');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23206, '', 0, 'Insular');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23207, '', 0, 'Los Llanos');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23208, '', 0, 'Nor-Oriental');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23209, '', 0, 'Zuliana');
 
 
 
--- Regions Mauritius (id country=152)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15201, '', 0, 'Rivière Noire', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15202, '', 0, 'Flacq', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15203, '', 0, 'Grand Port', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15204, '', 0, 'Moka', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15205, '', 0, 'Pamplemousses', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15206, '', 0, 'Plaines Wilhems', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15207, '', 0, 'Port-Louis', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15208, '', 0, 'Rivière du Rempart', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15209, '', 0, 'Savanne', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15210, '', 0, 'Rodrigues', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15211, '', 0, 'Les îles Agaléga', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15212, '', 0, 'Les écueils des Cargados Carajos', 1);
 
 
--- Regions Venezuela (id country=232)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23201, '', 0, 'Los Andes', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23202, '', 0, 'Capital', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23203, '', 0, 'Central', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23204, '', 0, 'Cento Occidental', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23205, '', 0, 'Guayana', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23206, '', 0, 'Insular', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23207, '', 0, 'Los Llanos', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23208, '', 0, 'Nor-Oriental', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23209, '', 0, 'Zuliana', 1);
 
 -- Regions Peru (id country=181)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18101, '', 0, 'Amazonas', 1);
@@ -425,10 +446,6 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) va
 
 
 
--- Regions United Arab Emirates (rowid country=227)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  227, 22701, '', 0, 'United Arab Emirates', 1);
-
-
 -- Regions Hungary (rowid country=18)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18, 183100, 'HU31', NULL, 'Northern Hungary');
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18, 183200, 'HU32', NULL, 'Northern Great Plain');
@@ -438,13 +455,7 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18, 182200, 'HU22', NULL, 'Western Transdanubia');
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18, 182300, 'HU23', NULL, 'Southern Transdanubia');
 
--- Regions Portugal (rowid country=25)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (25, 15001, 'PT', NULL, 'Portugal');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (25, 15002, 'PT9', NULL, 'Azores-Madeira');
 
--- Regions Slovenia (rowid country=202)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ('202', '20203', 'SI03', NULL, 'East Slovenia');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ('202', '20204', 'SI04', NULL, 'West Slovenia');
 
 -- Regions China (rowid country=9)
 insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 901, '京',0,'北京市');

From 9a325269385005ec73aff5f15c759d159723ba4a Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 15:49:51 +0200
Subject: [PATCH 144/928] added space for the link to the conference/booth
 registration page

---
 htdocs/eventorganization/conferenceorbooth_list.php | 11 +++++++++++
 htdocs/langs/en_US/eventorganization.lang           |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 814a61ae894..feb202de663 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -39,6 +39,8 @@ if ($conf->categorie->enabled) {
 // Load translation files required by the page
 $langs->loadLangs(array("eventorganization", "other"));
 
+global $dolibarr_main_url_root, $dolibarr_main_instance_unique_id;
+
 $action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
@@ -360,6 +362,15 @@ if ($projectid > 0) {
 	}
 	print '</td></tr>';
 
+	// Link to the vote/register page
+	print '<tr><td>'.$langs->trans("RegisterPage").'</td><td>';
+	$encodedid = dol_encode($project->id, $dolibarr_main_instance_unique_id);
+	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$encodedid;
+	$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
+	$linkregister .= '&securekey='.urlencode($encodedsecurekey);
+	print '<a href="'.$linkregister.'">'.$linkregister.'</a>';
+	print '</td></tr>';
+
 	// Other attributes
 	$cols = 2;
 	$objectconf=$object;
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 037a74076fe..157fc1c8a99 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -96,6 +96,7 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+RegisterPage = Page for conferences or booth
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
@@ -110,4 +111,4 @@ SubscriptionOk = Your subscription to this conference has been validated
 # Payment page
 #
 Attendee = Participant
-PaymentConferenceAttendee = Paiement de participation à une conférence
\ No newline at end of file
+PaymentConferenceAttendee = Paiement de participation à une conférence

From 74345c4f2156175434a2447e3966c86ac8b553fe Mon Sep 17 00:00:00 2001
From: atm-greg <gregory.blemand@atm-consulting.fr>
Date: Mon, 19 Apr 2021 16:03:22 +0200
Subject: [PATCH 145/928] fix warehouse label field edition

---
 htdocs/product/stock/card.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 6279b17d21a..1f53d3491fa 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -98,6 +98,7 @@ if (empty($reshook))
 		$object->ref         = GETPOST("ref");
 		$object->fk_parent   = GETPOST("fk_parent");
 		$object->libelle     = GETPOST("libelle");
+		$object->label     	 = GETPOST("libelle");
 		$object->description = GETPOST("desc");
 		$object->statut      = GETPOST("statut");
 		$object->lieu        = GETPOST("lieu");
@@ -105,8 +106,8 @@ if (empty($reshook))
 		$object->zip         = GETPOST("zipcode");
 		$object->town        = GETPOST("town");
 		$object->country_id  = GETPOST("country_id");
-		$object->phone = GETPOST("phone");
-		$object->fax = GETPOST("fax");
+		$object->phone 		 = GETPOST("phone");
+		$object->fax 		 = GETPOST("fax");
 
 		if (!empty($object->libelle))
 		{
@@ -168,6 +169,7 @@ if (empty($reshook))
 		if ($object->fetch($id))
 		{
 			$object->libelle     = GETPOST("libelle");
+			$object->label 		 = GETPOST("libelle");
 			$object->fk_parent   = GETPOST("fk_parent");
 			$object->description = GETPOST("desc");
 			$object->statut      = GETPOST("statut");
@@ -176,8 +178,8 @@ if (empty($reshook))
 			$object->zip         = GETPOST("zipcode");
 			$object->town        = GETPOST("town");
 			$object->country_id  = GETPOST("country_id");
-			$object->phone = GETPOST("phone");
-			$object->fax = GETPOST("fax");
+			$object->phone 		 = GETPOST("phone");
+			$object->fax 		 = GETPOST("fax");
 
 	        // Fill array 'array_options' with data from add form
 	        $ret = $extrafields->setOptionalsFromPost(null, $object);

From 1b947a6e9a0e525e7d440b97b4b1bf1cb7463356 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 16:17:11 +0200
Subject: [PATCH 146/928] added index page for the booth/conference
 registration

---
 htdocs/public/project/index.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 htdocs/public/project/index.php

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
new file mode 100644
index 00000000000..e69de29bb2d

From 7cab4dd19d4990a8d8b2f1a0efee81a0cee8f814 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Mon, 19 Apr 2021 15:17:57 +0100
Subject: [PATCH 147/928] Manage partnership for members & code optimisation

---
 htdocs/adherents/partnership.php              | 558 ++++++++++++++++++
 htdocs/core/modules/modPartnership.class.php  |   2 +-
 .../install/mysql/migration/13.0.0-14.0.0.sql |   2 +-
 htdocs/langs/en_US/partnership.lang           |   8 +-
 .../partnership/class/partnership.class.php   |   2 +-
 .../class/partnershiputils.class.php          |   2 +-
 htdocs/societe/partnership.php                |   6 +-
 7 files changed, 570 insertions(+), 10 deletions(-)
 create mode 100644 htdocs/adherents/partnership.php

diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
new file mode 100644
index 00000000000..3cd70de3228
--- /dev/null
+++ b/htdocs/adherents/partnership.php
@@ -0,0 +1,558 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2021 NextGestion 			<contact@nextgestion.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       partnership_card.php
+ *		\ingroup    partnership
+ *		\brief      Page to create/edit/view partnership
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+dol_include_once('/partnership/class/partnership.class.php');
+dol_include_once('/partnership/lib/partnership.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("companies","members","partnership", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$memberid = GETPOST('rowid', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'partnershipcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+//$lineid   = GETPOST('lineid', 'int');
+
+$member = new Adherent($db);
+if ($memberid > 0) {
+	$member->fetch($memberid);
+}
+
+// Initialize technical objects
+$object 		= new Partnership($db);
+$extrafields 	= new ExtraFields($db);
+$adht 			= new AdherentType($db);
+$diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('partnershipthirdparty', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+}
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+$permissiontoread 		= $user->rights->partnership->read;
+$permissiontoadd 		= $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete 	= $user->rights->partnership->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote 		= $user->rights->partnership->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink 		= $user->rights->partnership->write; // Used by the include of actions_dellink.inc.php
+$usercanclose 			= $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$upload_dir 			= $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+
+if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR != 'member') accessforbidden();
+if (empty($conf->partnership->enabled)) accessforbidden();
+if (empty($permissiontoread)) accessforbidden();
+if ($action == 'edit' && empty($permissiontoadd)) accessforbidden();
+
+$partnershipid = $object->fetch(0, "", $memberid);
+if (empty($action) && empty($partnershipid)) {
+	$action = 'create';
+}
+if (($action == 'update' || $action == 'edit') && $object->status != $object::STATUS_DRAFT) accessforbidden();
+
+if (empty($memberid) && $object) {
+	$memberid = $object->fk_member;
+}
+/*
+ * 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');
+}
+
+$date_start = dol_mktime(0, 0, 0, GETPOST('date_partnership_startmonth', 'int'), GETPOST('date_partnership_startday', 'int'), GETPOST('date_partnership_startyear', 'int'));
+$date_end = dol_mktime(0, 0, 0, GETPOST('date_partnership_endmonth', 'int'), GETPOST('date_partnership_endday', 'int'), GETPOST('date_partnership_endyear', 'int'));
+
+if (empty($reshook)) {
+	$error = 0;
+
+	$backtopage = dol_buildpath('/partnership/partnership.php', 1).'?rowid='.($memberid > 0 ? $memberid : '__ID__');
+
+	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	if ($action == 'add' && $permissiontoread) {
+		$error = 0;
+
+		$db->begin();
+
+		$now = dol_now();
+
+		if (!$error) {
+			$old_start_date = $object->date_partnership_start;
+
+			$object->fk_member           		= $memberid;
+			$object->date_partnership_start   	= (!GETPOST('date_partnership_start')) ? '' : $date_start;
+			$object->date_partnership_end     	= (!GETPOST('date_partnership_end')) ? '' : $date_end;
+			$object->note_public     			= GETPOST('note_public', 'restricthtml');
+			$object->date_creation 				= $now;
+			$object->fk_user_creat 				= $user->id;
+			$object->entity 					= $conf->entity;
+
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			$result = $object->create($user);
+			if ($result < 0) {
+				$error++;
+				if ($result == -4) {
+					setEventMessages($langs->trans("ErrorRefAlreadyExists"), null, 'errors');
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		}
+
+		if ($error) {
+			$db->rollback();
+			$action = 'create';
+		} else {
+			$db->commit();
+		}
+	} elseif ($action == 'update' && $permissiontoread) {
+		$error = 0;
+
+		$db->begin();
+
+		$now = dol_now();
+
+		if (!$error) {
+			$object->oldcopy = clone $object;
+
+			$old_start_date = $object->date_partnership_start;
+
+			$object->date_partnership_start   	= (!GETPOST('date_partnership_start')) ? '' : $date_start;
+			$object->date_partnership_end     	= (!GETPOST('date_partnership_end')) ? '' : $date_end;
+			$object->note_public     			= GETPOST('note_public', 'restricthtml');
+			$object->fk_user_creat 				= $user->id;
+			$object->fk_user_modif 				= $user->id;
+
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			$result = $object->update($user);
+			if ($result < 0) {
+				$error++;
+				if ($result == -4) {
+					setEventMessages($langs->trans("ErrorRefAlreadyExists"), null, 'errors');
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		}
+
+		if ($error) {
+			$db->rollback();
+			$action = 'edit';
+		} else {
+			$db->commit();
+		}
+	} elseif ($action == 'confirm_close' || $action == 'update_extras') {
+		include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+		header("Location: ".$_SERVER['PHP_SELF']."?rowid=".$memberid);
+		exit;
+	}
+
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+}
+
+$object->fields['fk_member']['visible'] = 0;
+if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) $object->fields['reason_decline_or_cancel']['visible'] = 1;
+$object->fields['note_public']['visible'] = 1;
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+$title = $langs->trans("Partnership");
+llxHeader('', $title);
+
+$form = new Form($db);
+
+if ($memberid) {
+	$langs->load("members");
+
+	$member = new Adherent($db);
+	$result = $member->fetch($memberid);
+
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
+
+	$adht->fetch($object->typeid);
+
+	$head = member_prepare_head($member);
+
+	print dol_get_fiche_head($head, 'partnership', $langs->trans("ThirdParty"), -1, 'user');
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($member, 'rowid', $linkback);
+
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
+
+	// Login
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+		print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$member->login.'&nbsp;</td></tr>';
+	}
+
+	// Type
+	print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
+
+	// Morphy
+	print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$member->getmorphylib().'</td>';
+	print '</tr>';
+
+	// Company
+	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$member->company.'</td></tr>';
+
+	// Civility
+	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$member->getCivilityLabel().'&nbsp;</td>';
+	print '</tr>';
+
+	print '</table>';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+	$params = '';
+
+	print '<br>';
+} else {
+	dol_print_error('', 'Parameter rowid not defined');
+}
+
+// Part to create
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Partnership")), '', '');
+
+	$backtopageforcancel = DOL_URL_ROOT.'/partnership/partnership.php?rowid='.$memberid;
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="rowid" value="'.$memberid.'">';
+	print '<input type="hidden" name="fk_member" value="'.$memberid.'">';
+
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
+
+	print dol_get_fiche_head(array(), '');
+
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>'."\n";
+
+	print dol_get_fiche_end();
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Validate")).'">';
+	print '&nbsp; ';
+	// print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '</div>';
+
+	print '</form>';
+}
+
+// Part to edit record
+if (($partnershipid || $ref) && $action == 'edit') {
+	print load_fiche_titre($langs->trans("Partnership"), '', '');
+
+	$backtopageforcancel = DOL_URL_ROOT.'/partnership/partnership.php?rowid='.$memberid;
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="rowid" value="'.$memberid.'">';
+	print '<input type="hidden" name="fk_member" value="'.$memberid.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
+
+	print dol_get_fiche_head();
+
+	print '<table class="border centpercent tableforfieldedit">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
+
+	print '</table>';
+
+	print dol_get_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	print load_fiche_titre($langs->trans("PartnershipDedicatedToThisMember", $langs->transnoentitiesnoconv("Partnership")), '', '');
+
+	$res = $object->fetch_optionals();
+
+	// $head = partnershipPrepareHead($object);
+	// print dol_get_fiche_head($head, 'card', $langs->trans("Partnership"), -1, $object->picto);
+
+	$linkback = '';
+	dol_banner_tab($object, 'id', $linkback, 0, 'rowid', 'ref');
+
+	$formconfirm = '';
+
+	// Close confirmation
+	if ($action == 'close') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClose'), $langs->trans('ConfirmClosePartnershipAsk', $object->ref), 'confirm_close', $formquestion, 'yes', 1);
+	}
+	// Reopon confirmation
+	if ($action == 'reopen') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToReopon'), $langs->trans('ConfirmReoponAsk', $object->ref), 'confirm_reopen', $formquestion, 'yes', 1);
+	}
+
+	// Refuse confirmatio
+	if ($action == 'refuse') {
+		//Form to close proposal (signed or not)
+		$formquestion = array(
+			array('type' => 'text', 'name' => 'reason_decline_or_cancel', 'label' => $langs->trans("Note"), 'morecss' => 'reason_decline_or_cancel', 'value' => '')				// Field to complete private note (not replace)
+		);
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReasonDecline'), $text, 'confirm_refuse', $formquestion, '', 1, 250);
+	}
+
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
+
+	// Print form confirm
+	print $formconfirm;
+
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/partnership/partnership_list.php', 1).'?restore_lastsearch_values=1'.(!empty($memberid) ? '&rowid='.$memberid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">'."\n";
+
+	// Common attributes
+	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
+	//unset($object->fields['fk_project']);				// Hide field already shown in banner
+	//unset($object->fields['fk_member']);					// Hide field already shown in banner
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+	// End of subscription date
+	$fadherent = new Adherent($db);
+	$fadherent->fetch($object->fk_member);
+	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
+	if ($fadherent->datefin) {
+		print dol_print_date($fadherent->datefin, 'day');
+		if ($fadherent->hasDelay()) {
+			print " ".img_warning($langs->trans("Late"));
+		}
+	} else {
+		if (!$adht->subscription) {
+			print $langs->trans("SubscriptionNotRecorded");
+			if ($fadherent->statut > 0) {
+				print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+			}
+		} else {
+			print $langs->trans("SubscriptionNotReceived");
+			if ($fadherent->statut > 0) {
+				print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+			}
+		}
+	}
+	print '</td></tr>';
+
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	print '</table>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+	// Buttons for actions
+
+	if ($action != 'presend') {
+		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 ($object->status == $object::STATUS_DRAFT) {
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?rowid='.$memberid.'&action=edit', '', $permissiontoadd);
+			}
+
+			// Show
+			if ($permissiontoadd) {
+				print dolGetButtonAction($langs->trans('ShowPartnership'), '', 'default', dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$object->id, '', $permissiontoadd);
+			}
+
+			// Cancel
+			if ($permissiontoadd) {
+				if ($object->status == $object::STATUS_ACCEPTED) {
+					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
+				}
+			}
+		}
+		print '</div>'."\n";
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index d70b626a99b..3bfd8d4aeab 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -180,7 +180,7 @@ class modPartnership extends DolibarrModules
 		$tabtoadd = (!empty(getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR')) && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') ? 'member' : 'thirdparty';
 
 		if ($tabtoadd == 'member') {
-			$this->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/adherents/partnership.php?socid=__ID__');
+			$this->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/adherents/partnership.php?rowid=__ID__');
 			$fk_mainmenu = "members";
 		} else {
 			$this->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/societe/partnership.php?socid=__ID__');
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index d0375349880..69b3eb1a818 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -421,7 +421,7 @@ create table llx_partnership_extrafields
 
 ALTER TABLE llx_partnership_extrafields ADD INDEX idx_partnership_fk_object(fk_object);
 
-INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipWillExpire)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipWillSoonExpireTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipWillSoonExpireContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipWillSoonBeCanceled)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipWillSoonBeCanceledTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipWillSoonBeCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
 INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipCanceled)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipCanceledTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
 INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipRefused)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
 INSERT INTO llx_c_email_templates (entity,module,type_template,label,lang,position,topic,joinfiles,content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipAccepted)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipAcceptedTopic)__', 0, '<body>\n <p>Hello,<br><br>\n__(YourPartnershipAcceptedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index ab51d2136e0..3e63acc92f6 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -40,7 +40,9 @@ PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cance
 #
 # Object
 #
+DeletePartnership=Delete a partnership
 PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party	
+PartnershipDedicatedToThisMember=Partnership dedicated to this member	
 DatePartnershipStart=Start date
 DatePartnershipEnd=End date
 ReasonDecline=Decline reason
@@ -53,17 +55,17 @@ ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillExpire=Partnership will expire
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
 SendingEmailOnPartnershipRefused=Partnership refused
 SendingEmailOnPartnershipAccepted=Partnership accepted
 SendingEmailOnPartnershipCanceled=Partnership canceled
 
-YourPartnershipWillSoonExpireTopic=Partnership expiration
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
 YourPartnershipRefusedTopic=Partnership refused
 YourPartnershipAcceptedTopic=Partnership accepted
 YourPartnershipCanceledTopic=Partnership canceled
 
-YourPartnershipWillSoonExpireContent=We inform you that your partnership will soon expire.
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
 YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
 YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
 YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 6bf84ba38cc..b211e9c5323 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -424,7 +424,7 @@ class Partnership extends CommonObject
 
 				return 1;
 			} else {
-				$this->error = 'Partnership with id '.$id.' not found sql='.$sql;
+				// $this->error = 'Partnership with id '.$id.' not found sql='.$sql;
 				return 0;
 			}
 		} else {
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index f3f398e0676..992fca2703e 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -311,7 +311,7 @@ class PartnershipUtils
 							if (!empty($obj->email)) {
 								$emailnotfound .= ($emailnotfound ? ', ' : '').'Email not found for id="'.$fk_partner.'"'."\n";
 							} else {
-								$labeltemplate = '(SendingEmailOnPartnershipWillExpire)';
+								$labeltemplate = '(SendingEmailOnPartnershipWillSoonBeCanceled)';
 
 								dol_syslog("Now we will send an email to partner id=".$fk_partner." with label ".$labeltemplate);
 
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index 1ee013f985c..0a5205799a9 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -82,7 +82,7 @@ dol_include_once('/partnership/class/partnership.class.php');
 dol_include_once('/partnership/lib/partnership.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("companies","partnership@partnership", "other"));
+$langs->loadLangs(array("companies","partnership", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -139,7 +139,7 @@ $usercanclose 			= $user->rights->partnership->write; // Used by the include of
 $upload_dir 			= $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
-if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') accessforbidden();
+if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR != 'thirdparty') accessforbidden();
 if (empty($conf->partnership->enabled)) accessforbidden();
 if (empty($permissiontoread)) accessforbidden();
 if ($action == 'edit' && empty($permissiontoadd)) accessforbidden();
@@ -212,7 +212,7 @@ if (empty($reshook)) {
 
 		if ($error) {
 			$db->rollback();
-			$action = 'edit';
+			$action = 'create';
 		} else {
 			$db->commit();
 		}

From 18d16d95092f04a81f743377f46a857e6416dfde Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 16:26:45 +0200
Subject: [PATCH 148/928] moved attendee validation after the payment method
 search

---
 htdocs/public/payment/paymentok.php | 57 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index d9cfdc28b69..a52ddb5fbcc 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -113,36 +113,6 @@ $uncryptedconferencesubscription = dol_decode($conferencesubscription, $dolibarr
 $subscription = substr($uncryptedconferencesubscription, 0, strlen($uncryptedconferencesubscription)-strlen($ref));
 $reffrompayment = substr($uncryptedconferencesubscription, -strlen($ref), strlen($ref));
 
-// After a conference attendee payment
-if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
-	// Looking for the invoice to which add a payment
-	$paidinvoice = new Facture($db);
-	$resultinvoice = $paidinvoice->fetch($invoiceref);
-	if ($resultinvoice < 0) {
-		setEventMessages(null, $paidinvoice->errors, "errors");
-	} else {
-		// Creation of payment line
-		$paiement = new Paiement($db);
-		$paiement->datepaye     = dol_now();
-		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
-		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
-		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
-		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
-		$paiement->note_private = GETPOST('comment', 'alpha');
-
-		// Validating the attendee
-		$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-		$resultattendee = $attendeetovalidate->fetch($ref);
-		if ($resultattendee < 0) {
-			setEventMessages(null, $attendeetovalidate->errors, "errors");
-		} else {
-			$attendeetovalidate->setStatut(1);
-		}
-	}
-
-
-
-}
 
 // Detect $paymentmethod
 $paymentmethod = '';
@@ -186,6 +156,33 @@ $object = new stdClass(); // For triggers
 
 $error = 0;
 
+// After a conference attendee payment
+if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
+	// Looking for the invoice to which add a payment
+	$paidinvoice = new Facture($db);
+	$resultinvoice = $paidinvoice->fetch($invoiceref);
+	if ($resultinvoice < 0) {
+		setEventMessages(null, $paidinvoice->errors, "errors");
+	} else {
+		// Creation of payment line
+		$paiement = new Paiement($db);
+		$paiement->datepaye     = dol_now();
+		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
+		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
+		$paiement->note_private = GETPOST('comment', 'alpha');
+
+		// Validating the attendee
+		$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+		$resultattendee = $attendeetovalidate->fetch($ref);
+		if ($resultattendee < 0) {
+			setEventMessages(null, $attendeetovalidate->errors, "errors");
+		} else {
+			$attendeetovalidate->setStatut(1);
+		}
+	}
+}
 
 /*
  * Actions

From ac8ddd88315db36f1e1058c1a54678559fa8a01e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 16:52:08 +0200
Subject: [PATCH 149/928] removed redundant fetch

---
 htdocs/public/eventorganization/attendee_subscription.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 9f3115e56f4..b5ae6b0ba01 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -366,12 +366,6 @@ if (empty($reshook) && $action == 'add') {
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 
-$conference = new ConferenceOrBooth($db);
-$resultconf = $conference->fetch($id);
-if ($resultconf < 0) {
-	setEventMessages(null, $object->errors, "errors");
-}
-
 llxHeaderVierge($langs->trans("NewSubscription"));
 
 

From 4d916f3c9f83d58c91a269657f9297eec12b6f91 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 17:23:16 +0200
Subject: [PATCH 150/928] Fix perm

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

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 94dc6aa05c9..d073139a533 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -35,16 +35,23 @@ $langs->loadLangs(array("compta", "bills", "other", "accountancy", "loans", "ban
 $hookmanager->initHooks(array('accountancyindex'));
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if ($user->socid > 0) {
 	accessforbidden();
 }
-if ($user->socid > 0) {
+/*
+if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
 if (empty($user->rights->accounting->mouvements->lire)) {
 	accessforbidden();
 }
-
+*/
+if (empty($conf->comptabilite->enabled) && empty($conf->accounting->enabled) && empty($conf->asset->enabled) && empty($conf->intracommreport->enabled)) {
+	accessforbidden();
+}
+if (empty($user->rights->compta->resultat->lire) && empty($user->rights->accounting->mouvements->lire) && empty($user->rights->asset->read) && empty($user->rights->intracommreport->read)) {
+	accessforbidden();
+}
 
 
 /*

From 128dcb2e2bd2b68fdf1eba7f05234e45aeef2600 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 17:26:01 +0200
Subject: [PATCH 151/928] public registration page for booths and conferences
 created, wip

---
 htdocs/langs/en_US/eventorganization.lang |   5 +
 htdocs/public/project/index.php           | 829 ++++++++++++++++++++++
 2 files changed, 834 insertions(+)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 157fc1c8a99..9e2df362467 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -97,6 +97,11 @@ EvntOrgCancelled = Cancelled
 # Public page
 #
 RegisterPage = Page for conferences or booth
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationHelpMessage = Here, you can suggest a new conference or a new booth for the project
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index e69de29bb2d..9b04890084e 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -0,0 +1,829 @@
+<?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@inodbox.com>
+ * Copyright (C) 2018	    Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2018-2019	Thibault FOUCART	    <support@ptibogxiv.net>
+ * Copyright (C) 2021		Waël Almoman	    	<info@almoman.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * For Paypal test: https://developer.paypal.com/
+ * For Paybox test: ???
+ * For Stripe test: Use credit card 4242424242424242 .More example on https://stripe.com/docs/testing
+ *
+ * Variants:
+ * - When option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on, we use the new PaymentIntent API
+ * - When option STRIPE_USE_NEW_CHECKOUT is on, we use the new checkout API
+ * - If no option set, we use old APIS (charge)
+ */
+
+/**
+ *     	\file       htdocs/public/payment/newpayment.php
+ *		\ingroup    core
+ *		\brief      File to offer a way to make a payment for a particular Dolibarr object
+ */
+
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
+}
+if (!defined('NOCSRFCHECK')) {
+	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and get of entity must be done before including main.inc.php
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 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';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+// Hook to be used by external payment modules (ie Payzen, ...)
+include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+$hookmanager = new HookManager($db);
+$hookmanager->initHooks(array('newpayment'));
+
+// For encryption
+global $dolibarr_main_instance_unique_id;
+
+// Load translation files
+$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
+
+// Security check
+// No check on module enabled. Done later according to $validpaymentmethod
+
+$action = GETPOST('action', 'aZ09');
+$id = dol_decode(GETPOST('id'), $dolibarr_main_instance_unique_id);
+
+// 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.
+
+
+/*
+ * Actions
+ */
+
+
+/*
+ * View
+ */
+
+$head = '';
+if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
+
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
+
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+
+
+// Show sandbox warning
+if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled) && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'int'))) {		// We can force sand box with param 'forcesandbox'
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Paypal'), '', 'warning');
+}
+if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'int'))) {
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
+}
+
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+print '<input type="hidden" name="action" value="dopayment">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.dol_escape_htmltag($suffix).'">'."\n";
+print '<input type="hidden" name="securekey" value="'.dol_escape_htmltag($SECUREKEY).'">'."\n";
+print '<input type="hidden" name="e" value="'.$entity.'" />';
+print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
+print "\n";
+
+
+// Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
+// Define logo and logosmall
+$logosmall = $mysoc->logo_small;
+$logo = $mysoc->logo;
+$paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
+if (!empty($conf->global->$paramlogo)) {
+	$logosmall = $conf->global->$paramlogo;
+} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
+	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
+}
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo = '';
+$urllogofull = '';
+if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+}
+
+// Output html code for logo
+if ($urllogo) {
+	print '<div class="backgreypublicpayment">';
+	print '<div class="logopublicpayment">';
+	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+	print '>';
+	print '</div>';
+	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+	}
+	print '</div>';
+}
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+// Output introduction text
+$text = '';
+if (!empty($conf->global->PAYMENT_NEWFORM_TEXT)) {
+	$langs->load("members");
+	if (preg_match('/^\((.*)\)$/', $conf->global->PAYMENT_NEWFORM_TEXT, $reg)) {
+		$text .= $langs->trans($reg[1])."<br>\n";
+	} else {
+		$text .= $conf->global->PAYMENT_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("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+}
+print $text;
+
+// Output payment summary form
+print '<tr><td align="center">';
+
+$found = false;
+$error = 0;
+$var = false;
+
+$object = null;
+
+
+// Free payment
+if (!$source) {
+	$found = true;
+	$tag = GETPOST("tag", 'alpha');
+	if (GETPOST('fulltag', 'alpha')) {
+		$fulltag = GETPOST('fulltag', 'alpha');
+	} else {
+		$fulltag = "TAG=".$tag;
+	}
+
+}
+
+
+// Payment on customer order
+if ($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);
+	}
+	$object = $order;
+
+	if (GETPOST('fulltag', 'alpha')) {
+		$fulltag = GETPOST('fulltag', 'alpha');
+	} else {
+		$fulltag = 'ORD='.$order->id.'.CUS='.$order->thirdparty->id;
+		if (!empty($TAG)) {
+			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+		}
+	}
+	$fulltag = dol_string_unaccent($fulltag);
+}
+
+
+// Payment on customer invoice
+if ($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);
+	}
+	$object = $invoice;
+
+	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
+		$amount = price2num($invoice->total_ttc - ($invoice->getSommePaiement() + $invoice->getSumCreditNotesUsed() + $invoice->getSumDepositsUsed()));
+		if (GETPOST("amount", 'alpha')) {
+			$amount = GETPOST("amount", 'alpha');
+		}
+		$amount = price2num($amount);
+	}
+
+	if (GETPOST('fulltag', 'alpha')) {
+		$fulltag = GETPOST('fulltag', 'alpha');
+	} else {
+		$fulltag = 'INV='.$invoice->id.'.CUS='.$invoice->thirdparty->id;
+		if (!empty($TAG)) {
+			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+		}
+	}
+	$fulltag = dol_string_unaccent($fulltag);
+
+	$labeldesc = $langs->trans("Invoice").' '.$invoice->ref;
+	if (GETPOST('desc', 'alpha')) {
+		$labeldesc = GETPOST('desc', 'alpha');
+	}
+	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
+}
+
+if (!$found && !$mesg) {
+	$mesg = $langs->trans("ErrorBadParameters");
+}
+
+if ($mesg) {
+	print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
+}
+
+print "\n";
+
+
+// Show all payment mode buttons (Stripe, Paypal, ...)
+print '<br>';
+print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
+print '<br><br>';
+print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">';
+print '<br><br>';
+print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
+
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+
+// Add more content on page for some services
+if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payment mode
+	// Stripe
+	if (GETPOST('dopayment_stripe', 'alpha')) {
+		// Personalized checkout
+		print '<style>
+	    /**
+	     * The CSS shown here will not be introduced in the Quickstart guide, but shows
+	     * how you can use CSS to style your Element s container.
+	     */
+	    .StripeElement {
+	        background-color: white;
+	        padding: 8px 12px;
+	        border-radius: 4px;
+	        border: 1px solid transparent;
+	        box-shadow: 0 1px 3px 0 #e6ebf1;
+	        -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>';
+
+		print '<!-- Form payment-form STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = '.$conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION.' STRIPE_USE_NEW_CHECKOUT = '.$conf->global->STRIPE_USE_NEW_CHECKOUT.' -->'."\n";
+		print '<form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">'."\n";
+
+		print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+		print '<input type="hidden" name="dopayment_stripe" value="1">'."\n";
+		print '<input type="hidden" name="action" value="charge">'."\n";
+		print '<input type="hidden" name="tag" value="'.$TAG.'">'."\n";
+		print '<input type="hidden" name="s" value="'.$source.'">'."\n";
+		print '<input type="hidden" name="ref" value="'.$REF.'">'."\n";
+		print '<input type="hidden" name="fulltag" value="'.$FULLTAG.'">'."\n";
+		print '<input type="hidden" name="suffix" value="'.$suffix.'">'."\n";
+		print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+		print '<input type="hidden" name="e" value="'.$entity.'" />';
+		print '<input type="hidden" name="amount" value="'.$amount.'">'."\n";
+		print '<input type="hidden" name="currency" value="'.$currency.'">'."\n";
+		print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
+		print '<input type="hidden" name="email" value="'.GETPOST('email', 'alpha').'" />';
+		print '<input type="hidden" name="thirdparty_id" value="'.GETPOST('thirdparty_id', 'int').'" />';
+
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || !empty($conf->global->STRIPE_USE_NEW_CHECKOUT)) {	// Use a SCA ready method
+			require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+
+			$service = 'StripeLive';
+			$servicestatus = 1;
+			if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')) {
+				$service = 'StripeTest';
+				$servicestatus = 0;
+			}
+
+			$stripe = new Stripe($db);
+			$stripeacc = $stripe->getStripeAccount($service);
+			$stripecu = null;
+			if (is_object($object) && is_object($object->thirdparty)) {
+				$stripecu = $stripe->customerStripe($object->thirdparty, $stripeacc, $servicestatus, 1);
+			}
+
+			if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+				$noidempotency_key = (GETPOSTISSET('noidempotency') ? GETPOST('noidempotency', 'int') : 0); // By default noidempotency is unset, so we must use a different tag/ref for each payment. If set, we can pay several times the same tag/ref.
+				$paymentintent = $stripe->getPaymentIntent($amount, $currency, $tag, 'Stripe payment: '.$fulltag.(is_object($object) ? ' ref='.$object->ref : ''), $object, $stripecu, $stripeacc, $servicestatus, 0, 'automatic', false, null, 0, $noidempotency_key);
+				// The paymentintnent has status 'requires_payment_method' (even if paymentintent was already paid)
+				//var_dump($paymentintent);
+				if ($stripe->error) {
+					setEventMessages($stripe->error, null, 'errors');
+				}
+			}
+		}
+
+		//if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent))
+		//{
+		print '
+        <table id="dolpaymenttable" summary="Payment form" class="center">
+        <tbody><tr><td class="textpublicpayment">';
+
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+			print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
+		}
+
+		print '<div class="form-row left">';
+		print '<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>';
+
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+			print '<br><input id="cardholder-name" class="marginbottomonly" name="cardholder-name" value="" type="text" placeholder="'.$langs->trans("CardOwner").'" autocomplete="off" autofocus required>';
+		}
+
+		print '<div id="card-element">
+        <!-- a Stripe Element will be inserted here. -->
+        </div>';
+
+		print '<!-- Used to display form errors -->
+        <div id="card-errors" role="alert"></div>
+        </div>';
+
+		print '<br>';
+		print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';
+		print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif">';
+
+		print '</td></tr></tbody>';
+		print '</table>';
+		//}
+
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+			if (empty($paymentintent)) {
+				print '<center>'.$langs->trans("Error").'</center>';
+			} else {
+				print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
+				//$_SESSION["paymentintent_id"] = $paymentintent->id;
+			}
+		}
+
+		print '</form>'."\n";
+
+
+		// JS Code for Stripe
+		if (empty($stripearrayofkeys['publishable_key'])) {
+			$langs->load("errors");
+			print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
+		} else {
+			print '<!-- JS Code for Stripe components -->';
+			print '<script src="https://js.stripe.com/v3/"></script>'."\n";
+			print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
+
+			// Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
+			print '<script type="text/javascript" language="javascript">'."\n";
+
+			if (!empty($conf->global->STRIPE_USE_NEW_CHECKOUT)) {
+				$amountstripe = $amount;
+
+				// Correct the amount according to unit of currency
+				// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
+				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+				if (!in_array($currency, $arrayzerounitcurrency)) {
+					$amountstripe = $amountstripe * 100;
+				}
+
+				$ipaddress = getUserRemoteIP();
+				$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
+				if (is_object($object)) {
+					$metadata['dol_type'] = $object->element;
+					$metadata['dol_id'] = $object->id;
+
+					$ref = $object->ref;
+				}
+
+				try {
+					$arrayforpaymentintent = array(
+						'description'=>'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
+						"metadata" => $metadata
+					);
+					if ($TAG) {
+						$arrayforpaymentintent["statement_descriptor"] = dol_trunc($TAG, 10, 'right', 'UTF-8', 1); // 22 chars that appears on bank receipt (company + description)
+					}
+
+					$arrayforcheckout = array(
+						'payment_method_types' => array('card'),
+						'line_items' => array(array(
+							'name' => $langs->transnoentitiesnoconv("Payment").' '.$TAG, // Label of product line
+							'description' => 'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
+							'amount' => $amountstripe,
+							'currency' => $currency,
+							//'images' => array($urllogofull),
+							'quantity' => 1,
+						)),
+						'client_reference_id' => $FULLTAG,
+						'success_url' => $urlok,
+						'cancel_url' => $urlko,
+						'payment_intent_data' => $arrayforpaymentintent
+					);
+					if ($stripecu) {
+						$arrayforcheckout['customer'] = $stripecu;
+					} elseif (GETPOST('email', 'alpha') && isValidEmail(GETPOST('email', 'alpha'))) {
+						$arrayforcheckout['customer_email'] = GETPOST('email', 'alpha');
+					}
+					$sessionstripe = \Stripe\Checkout\Session::create($arrayforcheckout);
+
+					$remoteip = getUserRemoteIP();
+
+					// Save some data for the paymentok
+					$_SESSION["currencyCodeType"] = $currency;
+					$_SESSION["paymentType"] = '';
+					$_SESSION["FinalPaymentAmt"] = $amount;
+					$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
+					$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
+					$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
+				} catch (Exception $e) {
+					print $e->getMessage();
+				}
+				?>
+				// Code for payment with option STRIPE_USE_NEW_CHECKOUT set
+
+				// Create a Stripe client.
+				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+
+				// 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 = {
+				base: {
+				color: '#32325d',
+				lineHeight: '24px',
+				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+				fontSmoothing: 'antialiased',
+				fontSize: '16px',
+				'::placeholder': {
+				color: '#aab7c4'
+				}
+				},
+				invalid: {
+				color: '#fa755a',
+				iconColor: '#fa755a'
+				}
+				};
+
+				var cardElement = elements.create('card', {style: style});
+
+				// Comment this to avoid the redirect
+				stripe.redirectToCheckout({
+				// Make the id field from the Checkout Session creation API response
+				// available to this file, so you can provide it as parameter here
+				// instead of the {{CHECKOUT_SESSION_ID}} placeholder.
+				sessionId: '<?php print $sessionstripe->id; ?>'
+				}).then(function (result) {
+				// If `redirectToCheckout` fails due to a browser or network
+				// error, display the localized error message to your customer
+				// using `result.error.message`.
+				});
+
+
+				<?php
+			} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+				?>
+				// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
+
+				// Create a Stripe client.
+				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+
+				// 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 = {
+				base: {
+				color: '#32325d',
+				lineHeight: '24px',
+				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+				fontSmoothing: 'antialiased',
+				fontSize: '16px',
+				'::placeholder': {
+				color: '#aab7c4'
+				}
+				},
+				invalid: {
+				color: '#fa755a',
+				iconColor: '#fa755a'
+				}
+				};
+
+				var cardElement = elements.create('card', {style: style});
+
+				// Add an instance of the card Element into the `card-element` <div>
+				cardElement.mount('#card-element');
+
+				// Handle real-time validation errors from the card Element.
+				cardElement.addEventListener('change', function(event) {
+				var displayError = document.getElementById('card-errors');
+				if (event.error) {
+				console.log("Show event error (like 'Incorrect card number', ...)");
+				displayError.textContent = event.error.message;
+				} else {
+				console.log("Reset error message");
+				displayError.textContent = '';
+				}
+				});
+
+				// Handle form submission
+				var cardholderName = document.getElementById('cardholder-name');
+				var cardButton = document.getElementById('buttontopay');
+				var clientSecret = cardButton.dataset.secret;
+
+				cardButton.addEventListener('click', function(event) {
+				console.log("We click on buttontopay");
+				event.preventDefault();
+
+				if (cardholderName.value == '')
+				{
+				console.log("Field Card holder is empty");
+				var displayError = document.getElementById('card-errors');
+				displayError.textContent = '<?php print dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardOwner"))); ?>';
+				}
+				else
+				{
+				/* Disable button to pay and show hourglass cursor */
+				jQuery('#hourglasstopay').show();
+				jQuery('#buttontopay').hide();
+
+				stripe.handleCardPayment(
+				clientSecret, cardElement, {
+				payment_method_data: {
+				billing_details: {
+				name: cardholderName.value
+				<?php if (GETPOST('email', 'alpha') || (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->email))) {
+					?>, email: '<?php echo dol_escape_js(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $object->thirdparty->email); ?>'<?php
+				} ?>
+				<?php if (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->phone)) {
+					?>, phone: '<?php echo dol_escape_js($object->thirdparty->phone); ?>'<?php
+				} ?>
+				<?php if (is_object($object) && is_object($object->thirdparty)) {
+					?>, address: {
+					city: '<?php echo dol_escape_js($object->thirdparty->town); ?>',
+					<?php if ($object->thirdparty->country_code) {
+						?>country: '<?php echo dol_escape_js($object->thirdparty->country_code); ?>',<?php
+					} ?>
+					line1: '<?php echo dol_escape_js(preg_replace('/\s\s+/', ' ', $object->thirdparty->address)); ?>',
+					postal_code: '<?php echo dol_escape_js($object->thirdparty->zip); ?>'
+					}
+				<?php } ?>
+				}
+				},
+				save_payment_method:<?php if ($stripecu) {
+					print 'true';
+				} else {
+					print 'false';
+				} ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
+				}
+				).then(function(result) {
+				console.log(result);
+				if (result.error) {
+				console.log("Error on result of handleCardPayment");
+				jQuery('#buttontopay').show();
+				jQuery('#hourglasstopay').hide();
+				// Inform the user if there was an error
+				var errorElement = document.getElementById('card-errors');
+				errorElement.textContent = result.error.message;
+				} else {
+				// The payment has succeeded. Display a success message.
+				console.log("No error on result of handleCardPayment, so we submit the form");
+				// Submit the form
+				jQuery('#buttontopay').hide();
+				jQuery('#hourglasstopay').show();
+				// Send form (action=charge that will do nothing)
+				jQuery('#payment-form').submit();
+				}
+				});
+				}
+				});
+
+				<?php
+			} else {
+				// Old method (not SCA ready)
+				?>
+				// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
+
+				// Create a Stripe client.
+				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+
+				// 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 = {
+				base: {
+				color: '#32325d',
+				lineHeight: '24px',
+				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+				fontSmoothing: 'antialiased',
+				fontSize: '16px',
+				'::placeholder': {
+				color: '#aab7c4'
+				}
+				},
+				invalid: {
+				color: '#fa755a',
+				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');
+				if (event.error) {
+				displayError.textContent = event.error.message;
+				} else {
+				displayError.textContent = '';
+				}
+				});
+
+				// Handle form submission
+				var form = document.getElementById('payment-form');
+				console.log(form);
+				form.addEventListener('submit', function(event) {
+				event.preventDefault();
+				<?php
+				if (empty($conf->global->STRIPE_USE_3DSECURE)) {	// Ask credit card directly, no 3DS test
+					?>
+					/* Use token */
+					stripe.createToken(card).then(function(result) {
+					if (result.error) {
+					// Inform the user if there was an error
+					var errorElement = document.getElementById('card-errors');
+					errorElement.textContent = result.error.message;
+					} else {
+					// Send the token to your server
+					stripeTokenHandler(result.token);
+					}
+					});
+					<?php
+				} else // Ask credit card with 3DS test
+				{
+					?>
+					/* Use 3DS source */
+					stripe.createSource(card).then(function(result) {
+					if (result.error) {
+					// Inform the user if there was an error
+					var errorElement = document.getElementById('card-errors');
+					errorElement.textContent = result.error.message;
+					} else {
+					// Send the source to your server
+					stripeSourceHandler(result.source);
+					}
+					});
+					<?php
+				}
+				?>
+				});
+
+
+				/* Insert the Token into the form so it gets submitted to the server */
+				function stripeTokenHandler(token) {
+				// Insert the token ID into the form so it gets submitted to the server
+				var form = document.getElementById('payment-form');
+
+				var hiddenInput = document.createElement('input');
+				hiddenInput.setAttribute('type', 'hidden');
+				hiddenInput.setAttribute('name', 'stripeToken');
+				hiddenInput.setAttribute('value', token.id);
+				form.appendChild(hiddenInput);
+
+				var hiddenInput2 = document.createElement('input');
+				hiddenInput2.setAttribute('type', 'hidden');
+				hiddenInput2.setAttribute('name', 'token');
+				hiddenInput2.setAttribute('value', '<?php echo newToken(); ?>');
+				form.appendChild(hiddenInput2);
+
+				// Submit the form
+				jQuery('#buttontopay').hide();
+				jQuery('#hourglasstopay').show();
+				console.log("submit token");
+				form.submit();
+				}
+
+				/* Insert the Source into the form so it gets submitted to the server */
+				function stripeSourceHandler(source) {
+				// Insert the source ID into the form so it gets submitted to the server
+				var form = document.getElementById('payment-form');
+
+				var hiddenInput = document.createElement('input');
+				hiddenInput.setAttribute('type', 'hidden');
+				hiddenInput.setAttribute('name', 'stripeSource');
+				hiddenInput.setAttribute('value', source.id);
+				form.appendChild(hiddenInput);
+
+				var hiddenInput2 = document.createElement('input');
+				hiddenInput2.setAttribute('type', 'hidden');
+				hiddenInput2.setAttribute('name', 'token');
+				hiddenInput2.setAttribute('value', '<?php echo newToken(); ?>');
+				form.appendChild(hiddenInput2);
+
+				// Submit the form
+				jQuery('#buttontopay').hide();
+				jQuery('#hourglasstopay').show();
+				console.log("submit source");
+				form.submit();
+				}
+
+				<?php
+			}
+
+			print '</script>';
+		}
+	}
+	// This hook is used to show the embedded form to make payments with external payment modules (ie Payzen, ...)
+	$parameters = [
+		'paymentmethod' => $paymentmethod,
+		'amount' => price2num(GETPOST("newamount"), 'MT'),
+		'tag' => GETPOST("tag", 'alpha'),
+		'dopayment' => GETPOST('dopayment', 'alpha')
+	];
+	$reshook = $hookmanager->executeHooks('doPayment', $parameters, $object, $action);
+}
+
+
+htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
+
+llxFooter('', 'public');
+
+$db->close();

From 8fc3f9c91987d1784fa3719ac112ee2ac7f11516 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:28:13 +0200
Subject: [PATCH 152/928] Update document.php

$helpurl  =>  $help_url

$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
---
 htdocs/expensereport/document.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 37206815cbf..147f0842e4c 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -110,8 +110,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 $form = new Form($db);
 
 $title = $langs->trans("ExpenseReport")." - ".$langs->trans("Documents");
-$helpurl = "EN:Module_Expense_Reports";
-llxHeader("", $title, $helpurl);
+$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
+
+llxHeader("", $title, $help_url);
 
 if ($object->id) {
 	$object->fetch_thirdparty();

From e7ee46049ff20f68818099b49c5e4a96724a5d44 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:29:52 +0200
Subject: [PATCH 153/928] Update index.php

$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
---
 htdocs/expensereport/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index f9792d5b68c..50ccd03ef73 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -75,8 +75,8 @@ $tripandexpense_static = new ExpenseReport($db);
 $childids = $user->getAllChildIds();
 $childids[] = $user->id;
 
-//$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones';
-$help_url = '';
+$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais"; 
+
 llxHeader('', $langs->trans("ListOfFees"), $help_url);
 
 

From d9db752339430a434163f6d560b749f1b3486f2c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 19 Apr 2021 15:32:00 +0000
Subject: [PATCH 154/928] Fixing style errors.

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

diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 50ccd03ef73..be8c735edc1 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -75,7 +75,7 @@ $tripandexpense_static = new ExpenseReport($db);
 $childids = $user->getAllChildIds();
 $childids[] = $user->id;
 
-$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais"; 
+$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
 
 llxHeader('', $langs->trans("ListOfFees"), $help_url);
 

From 9b9ddc2c3c66f90e08b7a84d02d743d247a4eee0 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:37:08 +0200
Subject: [PATCH 155/928] Update list.php

$xxxx_start / $xxxx_end :   " "  =>  ' '
---
 htdocs/expensereport/list.php | 37 +++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index ae4261990f4..e83899d28d1 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -80,10 +80,10 @@ $diroutputmassaction = $conf->expensereport->dir_output.'/temp/massgeneration/'.
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield	= GETPOST('sortfield', 'aZ09comma');
+$sortorder	= GETPOST('sortorder', 'aZ09comma');
+$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -98,19 +98,22 @@ if (!$sortfield) {
 }
 
 
-$sall         = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_ref   = GETPOST('search_ref', 'alpha');
-$search_user  = GETPOST('search_user', 'int');
-$search_amount_ht = GETPOST('search_amount_ht', 'alpha');
-$search_amount_vat = GETPOST('search_amount_vat', 'alpha');
-$search_amount_ttc = GETPOST('search_amount_ttc', 'alpha');
-$search_status = (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
-$month_start  = GETPOST("month_start", "int");
-$year_start   = GETPOST("year_start", "int");
-$day_start    = GETPOST("day_start", "int");
-$day_end      = GETPOST("day_end", "int");
-$month_end    = GETPOST("month_end", "int");
-$year_end     = GETPOST("year_end", "int");
+$sall			= trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+
+$search_ref			= GETPOST('search_ref', 'alpha');
+$search_user		= GETPOST('search_user', 'int');
+$search_amount_ht	= GETPOST('search_amount_ht', 'alpha');
+$search_amount_vat	= GETPOST('search_amount_vat', 'alpha');
+$search_amount_ttc	= GETPOST('search_amount_ttc', 'alpha');
+$search_status		= (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
+
+$year_start   = GETPOST('year_start', 'int');
+$month_start  = GETPOST('month_start', 'int');
+$day_start    = GETPOST('day_start', 'int');
+$year_end     = GETPOST('year_end', 'int');
+$month_end    = GETPOST('month_end', 'int');
+$day_end      = GETPOST('day_end', 'int');
+
 $optioncss    = GETPOST('optioncss', 'alpha');
 
 if ($search_status == '') {

From 333fb2d8813c0bf440258f8ea40bf6b48598d968 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:40:23 +0200
Subject: [PATCH 156/928] Update mo_card.php

$title = $langs->trans('Mo')." - ".$langs->trans("Card");
---
 htdocs/mrp/mo_card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index dd45d306e1f..093604df9a1 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -194,7 +194,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formproject = new FormProjets($db);
 
-$title = $langs->trans('Mo');
+$title = $langs->trans('Mo')." - ".$langs->trans("Card");
 
 llxHeader('', $title, '');
 

From 38d7143392706700888b1bc478daa0a9c64a8e35 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:46:20 +0200
Subject: [PATCH 157/928] Update mo_movements.php

$help_url = 'EN:Module_Manufacturing_Orders|FR:Module_Ordres_de_Fabrication';
---
 htdocs/mrp/mo_movements.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 59b4b07fe82..140bbc08fce 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -252,7 +252,9 @@ $productlot = new ProductLot($db);
 $warehousestatic = new Entrepot($db);
 $userstatic = new User($db);
 
-llxHeader('', $langs->trans('Mo'), '');
+$help_url = 'EN:Module_Manufacturing_Orders|FR:Module_Ordres_de_Fabrication';
+
+llxHeader('', $langs->trans('Mo'), '$help_url');
 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {

From ec97c5aa09acef852d57f32d5de8d24c3e6c038a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:50:13 +0200
Subject: [PATCH 158/928] Update index.php

$title = $langs->trans('HRMArea');

llxHeader('', $title, '');
---
 htdocs/hrm/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index f169ce60b37..09485357956 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -84,7 +84,9 @@ if (!empty($conf->holiday->enabled) && !empty($setupcompanynotcomplete)) {
 $childids = $user->getAllChildIds();
 $childids[] = $user->id;
 
-llxHeader('', $langs->trans('HRMArea'));
+$title = $langs->trans('HRMArea');
+
+llxHeader('', $title, '');
 
 print load_fiche_titre($langs->trans("HRMArea"), '', 'hrm');
 

From f2781ee01728511b452a200810aeeb6d241f8314 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:51:52 +0200
Subject: [PATCH 159/928] Update admin_establishment.php

$title = $langs->trans('Establishments');

llxHeader('', $title, '');
---
 htdocs/hrm/admin/admin_establishment.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 2772137284b..f5baeee4027 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -55,7 +55,9 @@ if (empty($permissiontoread)) accessforbidden();
 $form = new Form($db);
 $establishmenttmp = new Establishment($db);
 
-llxHeader('', $langs->trans("Establishments"));
+$title = $langs->trans('Establishments');
+
+llxHeader('', $title, '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortorder     = GETPOST("sortorder", 'alpha');

From 985dc83b8ca7e968580bfe6ae897f3088c8d414d Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:53:29 +0200
Subject: [PATCH 160/928] Update admin_hrm.php

$title = $langs->trans('Parameters');

llxHeader('', $title, '');
---
 htdocs/hrm/admin/admin_hrm.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index d19b15e3499..455035a6b53 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -73,7 +73,10 @@ if ($action == 'update') {
  * View
  */
 
-llxHeader('', $langs->trans('Parameters'));
+
+$title = $langs->trans('Parameters');
+
+llxHeader('', $title, '');
 
 $form = new Form($db);
 

From 00eda15ac6d68681b0505b2be1a32577f5d819a8 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:58:14 +0200
Subject: [PATCH 161/928] Update comment.php

$title = $langs->trans('CommentPage');

llxHeader('', $title, '');
---
 htdocs/projet/comment.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index f4b7d8226d0..2aa8f473cb4 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -80,8 +80,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_comments.inc.php';
  * View
 */
 
+$title = $langs->trans('CommentPage');
 
-llxHeader('', $langs->trans("CommentPage"));
+llxHeader('', $title, '');
 
 $form = new Form($db);
 $formother = new FormOther($db);

From a886725b1ce534e1f1dc2f4d3ae5970871a385d0 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 18:05:18 +0200
Subject: [PATCH 162/928] Update contact.php

$title / $help_url    " "  =>  ' '
add   DE:Modul_Projekte
---
 htdocs/projet/contact.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 92f4e4e3b15..bcfd90ab23d 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -239,11 +239,14 @@ if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->pr
  * View
  */
 
-$title = $langs->trans("ProjectContact").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
-	$title = $object->ref.' '.$object->name.' - '.$langs->trans("ProjectContact");
+$title = $langs->trans('ProjectContact').' - '.$object->ref.' '.$object->name;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) 
+{
+	$title = $object->ref.' '.$object->name.' - '.$langs->trans('ProjectContact');
 }
-$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
+
+$help_url = 'EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos|DE:Modul_Projekte';
+
 llxHeader('', $title, $help_url);
 
 $form = new Form($db);

From 6fff8baac53f13744f75813c8f1185644389700c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 19 Apr 2021 16:07:19 +0000
Subject: [PATCH 163/928] Fixing style errors.

---
 htdocs/projet/contact.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index bcfd90ab23d..1af3488bf5c 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -240,8 +240,7 @@ if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->pr
  */
 
 $title = $langs->trans('ProjectContact').' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) 
-{
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans('ProjectContact');
 }
 

From b78f85b9597e62c653c4e5c5991f01a912637d3b Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 18:08:36 +0200
Subject: [PATCH 164/928] Update document.php

$title / $help_url " " => ' '
add  DE:Modul_Projekte
---
 htdocs/projet/document.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index a069e7bf162..e9a088537b1 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -37,7 +37,7 @@ $action		= GETPOST('action', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
 $id			= GETPOST('id', 'int');
 $ref		= GETPOST('ref', 'alpha');
-$mine = (GETPOST('mode', 'alpha') == 'mine' ? 1 : 0);
+$mine 		= (GETPOST('mode', 'alpha') == 'mine' ? 1 : 0);
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
 // Security check
@@ -57,10 +57,10 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield	= GETPOST("sortfield", 'alpha');
+$sortorder	= GETPOST("sortorder", 'alpha');
+$page		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -95,11 +95,13 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  * View
  */
 
-$title = $langs->trans("Project").' - '.$langs->trans("Document").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
-	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Document");
+$title = $langs->trans('Project').' - '.$langs->trans('Document').' - '.$object->ref.' '.$object->name;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) 
+{
+	$title = $object->ref.' '.$object->name.' - '.$langs->trans('Document');
 }
-$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
+
+$help_url = 'EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos|DE:Modul_Projekte';
 
 llxHeader('', $title, $help_url);
 

From 8db9b5bb22d739ec1f6d2a3f3d6ba326a4f7db21 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 19 Apr 2021 16:10:55 +0000
Subject: [PATCH 165/928] Fixing style errors.

---
 htdocs/projet/document.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index e9a088537b1..3f9ec04d437 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -96,8 +96,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  */
 
 $title = $langs->trans('Project').' - '.$langs->trans('Document').' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) 
-{
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans('Document');
 }
 

From 0f8ef61d349e2c89f7299c2f26c390579d5a80aa Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 18:13:06 +0200
Subject: [PATCH 166/928] Update element.php

$title / $help_url / llxHeader   " " => ' '
add  DE:Modul_Projekte
llxHeader('', $title, $help_url);
---
 htdocs/projet/element.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 31f33529774..e5d2bad8fbb 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -187,12 +187,15 @@ $hookmanager->initHooks(array('projectOverview'));
  *	View
  */
 
-$title = $langs->trans("ProjectReferers").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
-	$title = $object->ref.' '.$object->name.' - '.$langs->trans("ProjectReferers");
+$title = $langs->trans('ProjectReferers').' - '.$object->ref.' '.$object->name;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) 
+{
+	$title = $object->ref.' '.$object->name.' - '.$langs->trans('ProjectReferers');
 }
-$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
-llxHeader("", $langs->trans("Referers"), $help_url);
+
+$help_url = 'EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos|DE:Modul_Projekte';
+
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 $formproject = new FormProjets($db);

From 8437761bb6c5dc5b03af4d340f0fb30c99d142bf Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 19 Apr 2021 16:15:07 +0000
Subject: [PATCH 167/928] Fixing style errors.

---
 htdocs/projet/element.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index e5d2bad8fbb..95c348a7e09 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -188,8 +188,7 @@ $hookmanager->initHooks(array('projectOverview'));
  */
 
 $title = $langs->trans('ProjectReferers').' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) 
-{
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans('ProjectReferers');
 }
 

From b8fbfd50780c90ff16339207ba95e4a4bb7d2e69 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 19 Apr 2021 18:24:19 +0200
Subject: [PATCH 168/928] Update index.php

new:  $help_url
add  DE:Modul_Projekte
" " => ' '
llxHeader('', $title, $help_url);
---
 htdocs/projet/index.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index c464cf1694b..d8c875d2933 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -95,9 +95,14 @@ $projectset = ($mine ? $mine : (empty($user->rights->projet->all->lire) ? 0 : 2)
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, $projectset, 1);
 //var_dump($projectsListId);
 
-llxHeader("", $langs->trans("Projects"), "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos");
 
-$title = $langs->trans("ProjectsArea");
+$title = $langs->trans('ProjectsArea');
+
+$help_url = 'EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos|DE:Modul_Projekte';
+
+llxHeader('', $title, $help_url);
+
+
 //if ($mine) $title=$langs->trans("MyProjectsArea");
 
 

From 1adffc4b0578911818f5e6a5bfcfa9e04db87651 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 20:20:23 +0200
Subject: [PATCH 169/928] Update mo_movements.php

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

diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 140bbc08fce..b4b777f7b49 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -254,7 +254,7 @@ $userstatic = new User($db);
 
 $help_url = 'EN:Module_Manufacturing_Orders|FR:Module_Ordres_de_Fabrication';
 
-llxHeader('', $langs->trans('Mo'), '$help_url');
+llxHeader('', $langs->trans('Mo'), $help_url);
 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {

From 2578eb276c70b1e7a47afdf01fc340f66c39943c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 20:25:22 +0200
Subject: [PATCH 170/928] Fix phpunit

---
 test/phpunit/SecurityTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 01cd3343877..5c5274c0437 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -614,9 +614,9 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($genpass2, '');
 
 		$conf->global->USER_PASSWORD_GENERATED='Standard';
-		$genpass3=getRandomPassword(false);				// Should return a password of 10 chars
+		$genpass3=getRandomPassword(false);				// Should return a password of 12 chars
 		print __METHOD__." genpass3=".$genpass3."\n";
-		$this->assertEquals(strlen($genpass3), 10);
+		$this->assertEquals(strlen($genpass3), 12);
 
 		return 0;
 	}

From 3df79dd3c81f0067598f515aba89bd8ffb7247b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 20:49:31 +0200
Subject: [PATCH 171/928] Avoid error on PHP 5.6

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

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 81ff51f00c7..0d729e6c762 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -217,8 +217,10 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 				break;
 			}
 
-			// Set CURLOPT_CONNECT_TO so curl will not try another resolution that may give a different result
-			curl_setopt($ch, CURLOPT_CONNECT_TO, $iptocheck);
+			// Set CURLOPT_CONNECT_TO so curl will not try another resolution that may give a different result. Possible only on PHP v7+
+			if (defined('CURLOPT_CONNECT_TO')) {
+				curl_setopt($ch, CURLOPT_CONNECT_TO, $iptocheck);
+			}
 		}
 
 		// Getting response from server

From 7988aaf88fc5a9c1b29f9546d9d8f1e75b29e8e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 21:02:29 +0200
Subject: [PATCH 172/928] 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 1045f5f8ea1..3675369ed88 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1597,7 +1597,7 @@ class BonPrelevement extends CommonObject
 
 				$sql = "SELECT soc.rowid as socid, 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.ref as fac, pf.fk_facture_fourn as idfac, f.ref_supplier as fac_sup,";
+				$sql .= " f.ref as fac, pf.fk_facture_fourn as idfac, f.ref_supplier as fac_ref_supplier,";
 				$sql .= " rib.rowid, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum";
 				$sql .= " FROM";
 				$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
@@ -1633,7 +1633,7 @@ class BonPrelevement extends CommonObject
 						$cachearraytotestduplicate[$obj->idfac] = $obj->rowid;
 
 						$daterum = (!empty($obj->date_rum)) ? $this->db->jdate($obj->date_rum) : $this->db->jdate($obj->datec);
-						$fileCrediteurSection .= $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_sup, $obj->idfac, $obj->iban, $obj->bic, $daterum, $obj->drum, $obj->rum, $type);
+						$fileCrediteurSection .= $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_ref_supplier, $obj->idfac, $obj->iban, $obj->bic, $daterum, $obj->drum, $obj->rum, $type);
 						$this->total = $this->total + $obj->somme;
 						$i++;
 					}

From d6df32eee9d356a1a36f2ccfa2ac31ccd03d634d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 21:10:53 +0200
Subject: [PATCH 173/928] Add invoice id into EndToEnd to guarantee unicity of
 value.

---
 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 92f9c320acd..988f24e1efc 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1897,7 +1897,7 @@ class BonPrelevement extends CommonObject
 			$XML_DEBITOR .= '			<DrctDbtTxInf>'.$CrLf;
 			$XML_DEBITOR .= '				<PmtId>'.$CrLf;
 			// Add EndToEndId. Must be a unique ID for each payment (for example by including bank, buyer or seller, date, checksum)
-			$XML_DEBITOR .= '					<EndToEndId>'.(($conf->global->PRELEVEMENT_END_TO_END != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('AS-'.dol_trunc($row_ref, 20)).'-'.$Rowing).'</EndToEndId>'.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
+			$XML_DEBITOR .= '					<EndToEndId>'.(($conf->global->PRELEVEMENT_END_TO_END != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('DD-'.dol_trunc($row_idfac.'-'.$row_ref, 20)).'-'.$Rowing).'</EndToEndId>'.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
 			$XML_DEBITOR .= '				</PmtId>'.$CrLf;
 			$XML_DEBITOR .= '				<InstdAmt Ccy="EUR">'.round($row_somme, 2).'</InstdAmt>'.$CrLf;
 			$XML_DEBITOR .= '				<DrctDbtTx>'.$CrLf;
@@ -1943,7 +1943,7 @@ class BonPrelevement extends CommonObject
 			$XML_CREDITOR .= '			<CdtTrfTxInf>'.$CrLf;
 			$XML_CREDITOR .= '				<PmtId>'.$CrLf;
 			// Add EndToEndId. Must be a unique ID for each payment (for example by including bank, buyer or seller, date, checksum)
-			$XML_CREDITOR .= '					<EndToEndId>'.(($conf->global->PRELEVEMENT_END_TO_END != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('AS-'.dol_trunc($row_ref, 20)).'-'.$Rowing).'</EndToEndId>'.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
+			$XML_CREDITOR .= '					<EndToEndId>'.(($conf->global->PRELEVEMENT_END_TO_END != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('CT-'.dol_trunc($row_idfac.'-'.$row_ref, 20)).'-'.$Rowing).'</EndToEndId>'.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
 			$XML_CREDITOR .= '				</PmtId>'.$CrLf;
 			$XML_CREDITOR .= '				<Amt>'.$CrLf;
 			$XML_CREDITOR .= '					<InstdAmt Ccy="EUR">'.round($row_somme, 2).'</InstdAmt>'.$CrLf;

From 3836481a1e67cb7b6cc3399da6e7a2d9a64fb41e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 21:15:09 +0200
Subject: [PATCH 174/928] Update multicurrency_rate.php

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 7445a6ed274..78600c6b327 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -530,7 +530,7 @@ if ($resql) {
 			print $hookmanager->resPrint;
 
 			// Action
-			print '<td class="nowrap " >';
+			print '<td class="nowraponall">';
 			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;

From e71e5d533d19e63164acd96106dd05f362faa9b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 21:30:25 +0200
Subject: [PATCH 175/928] Fix HTML5

---
 htdocs/accountancy/admin/productaccount.php          | 2 +-
 htdocs/accountancy/expensereport/list.php            | 2 +-
 htdocs/accountancy/supplier/list.php                 | 2 +-
 htdocs/admin/dolistore/class/dolistore.class.php     | 2 +-
 htdocs/admin/taxes.php                               | 2 +-
 htdocs/admin/tools/dolibarr_export.php               | 2 +-
 htdocs/cashdesk/include/keypad.php                   | 6 +++---
 htdocs/core/class/commondocgenerator.class.php       | 4 ++--
 htdocs/core/class/dolgraph.class.php                 | 2 +-
 htdocs/core/modules/DolibarrModules.class.php        | 2 +-
 htdocs/core/tpl/bloc_comment.tpl.php                 | 4 ++--
 htdocs/datapolicy/class/actions_datapolicy.class.php | 2 +-
 htdocs/expedition/card.php                           | 2 +-
 htdocs/langs/en_US/admin.lang                        | 2 +-
 htdocs/langs/en_US/modulebuilder.lang                | 2 +-
 htdocs/product/stock/movement_card.php               | 2 +-
 htdocs/projet/admin/project.php                      | 4 ++--
 htdocs/public/agenda/agendaexport.php                | 2 +-
 htdocs/stripe/admin/stripe.php                       | 2 +-
 19 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 2013b0c7295..ecd77560597 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -183,7 +183,7 @@ if ($action == 'update') {
 				}
 				if ($result <= 0) {
 					// setEventMessages(null, $accounting->errors, 'errors');
-					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Product").' '.$productid.' '.$langs->trans("NotVentilatedinAccount").' : id='.$accounting_account_id.'<br/> <pre>'.$sql.'</pre></span></div>';
+					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Product").' '.$productid.' '.$langs->trans("NotVentilatedinAccount").' : id='.$accounting_account_id.'<br> <pre>'.$sql.'</pre></span></div>';
 					$ko++;
 				} else {
 					$db->begin();
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 4d2d5f7b88a..810f65c68df 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -164,7 +164,7 @@ if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
 					$msg .= '<div><span style="color:green">'.$langs->trans("LineOfExpenseReport").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</span></div>';
 					$ok++;
 				} else {
-					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br/> <pre>'.$sql.'</pre></span></div>';
+					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br> <pre>'.$sql.'</pre></span></div>';
 					$ko++;
 				}
 			}
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 414cd624bee..a1841654d3f 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -188,7 +188,7 @@ if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
 					$msg .= '<div><span style="color:green">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</span></div>';
 					$ok++;
 				} else {
-					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br/> <pre>'.$sql.'</pre></span></div>';
+					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br> <pre>'.$sql.'</pre></span></div>';
 					$ko++;
 				}
 			}
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index ea7c7bed042..9e5a1e8bce1 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -322,7 +322,7 @@ class Dolistore
 			$html .= '<tr class="app oddeven '.$compatible.'">
                 <td class="center" width="210"><div class="newAppParent">'.$newapp.$images.'</div></td>
                 <td class="margeCote"><h2 class="appTitle">'.$product->name->language[$this->lang - 1]
-						.'<br/><small>'.$version.'</small></h2>
+						.'<br><small>'.$version.'</small></h2>
                     <small> '.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.$product->reference.' - '.$langs->trans('Id').': '.$product->id.'</small><br><br>'.$product->description_short->language[$this->lang - 1].'</td>';
 			// do not load if display none
 			//$html .= '<td style="display:none;" class="long_description">'.$product->description->language[$this->lang - 1].'</td>';
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 0b553c8a8aa..a3b3a7f1d91 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -260,7 +260,7 @@ print "<br>\n";
 
 print '<div class="center">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="button">';
-print '<br/><br/>';
+print '<br><br>';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 108fe6a8e70..0d4f60f3851 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -239,7 +239,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 	print '<label for="checkbox_use_quick">';
 	print $form->textwithpicto($langs->trans('ExportUseMySQLQuickParameter'), $langs->trans('ExportUseMySQLQuickParameterHelp'));
 	print '</label>';
-	print '<br/>';
+	print '<br>';
 
 	print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
 	print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
diff --git a/htdocs/cashdesk/include/keypad.php b/htdocs/cashdesk/include/keypad.php
index 165dbd72b75..6e4c9c874d6 100644
--- a/htdocs/cashdesk/include/keypad.php
+++ b/htdocs/cashdesk/include/keypad.php
@@ -37,15 +37,15 @@ function genkeypad($keypadname, $formname)
 	$sz .= '<div id="keypad'.$keypadname.'" style="position:absolute;z-index:90;display:none; background:#AAA; vertical-align:top;">'."\n";
 	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 7 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',7);"/>'."\n";
 	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 8 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',8);"/>'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 9 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',9);"/><br/>'."\n";
+	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 9 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',9);"/><br>'."\n";
 
 	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 4 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',4);"/>'."\n";
 	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 5 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',5);"/>'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 6 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',6);"/><br/>'."\n";
+	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 6 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',6);"/><br>'."\n";
 
 	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 1 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',1);"/>'."\n";
 	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 2 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',2);"/>'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 3 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',3);"/><br/>'."\n";
+	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 3 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',3);"/><br>'."\n";
 
 	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 0 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',0);"/>'."\n";
 	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value="&larr;" ';
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 3e947c518c2..30ea40fbbb2 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1301,7 +1301,7 @@ abstract class CommonDocGenerator
 			),
 
 			'list'         => array(
-				'separator' => '<br/>'
+				'separator' => '<br>'
 			),
 
 			'auto'         => array(
@@ -1392,7 +1392,7 @@ abstract class CommonDocGenerator
 				$itemsInRow = 0;
 				$maxItemsInRow = $params['table']['maxItemsInRow'];
 				foreach ($fields as $field) {
-					//$html.= !empty($html)?'<br/>':'';
+					//$html.= !empty($html)?'<br>':'';
 					if ($itemsInRow >= $maxItemsInRow) {
 						// start a new line
 						$html .= "</tr><tr>";
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 921c102fd43..31c230f8d78 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -882,7 +882,7 @@ class DolGraph
 			$this->stringtoshow .= '\'+';
 			$this->stringtoshow .= ($showlegend ? '' : 'label+\' \'+'); // Hide label if already shown in legend
 			$this->stringtoshow .= ($showpointvalue ? 'number+' : '');
-			$this->stringtoshow .= ($showpercent ? '\'<br/>\'+percent+\'%\'+' : '');
+			$this->stringtoshow .= ($showpercent ? '\'<br>\'+percent+\'%\'+' : '');
 			$this->stringtoshow .= '\'';
 			if ($urltemp) {
 				$this->stringtoshow .= '</a>';
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 6c6a755ae55..056be705f9e 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2276,7 +2276,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
 			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
 			if ($this->needUpdate) {
-				$versionTitle.= '<br/>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
+				$versionTitle.= '<br>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
 			}
 
 			print '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php
index bf148c2124f..f30bb0c5c61 100644
--- a/htdocs/core/tpl/bloc_comment.tpl.php
+++ b/htdocs/core/tpl/bloc_comment.tpl.php
@@ -80,9 +80,9 @@ if (!empty($object->comments)) {
 		print '<div class="width75p float comment comment-table" style="background-color:#'.$TColors[$fk_user]['bgcolor'].'">';
 		print '<div class="comment-info comment-cell">';
 		if (!empty($user->photo)) {
-			print Form::showphoto('userphoto', $userstatic, 80, 0, 0, '', 'small', 0, 1).'<br/>';
+			print Form::showphoto('userphoto', $userstatic, 80, 0, 0, '', 'small', 0, 1).'<br>';
 		}
-		print $langs->trans('User').' : '.$userstatic->getNomUrl().'<br/>';
+		print $langs->trans('User').' : '.$userstatic->getNomUrl().'<br>';
 		print $langs->trans('Date').' : '.dol_print_date($comment->datec, 'dayhoursec');
 		print '</div>'; // End comment-info
 
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index 8dcfcdadb1c..cbcaceec743 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -117,7 +117,7 @@ class ActionsDatapolicy
 				$object->state_id = '';
 				$object->skype = '';
 				$object->country_id = '';
-				$object->note_private = $object->note_private.'<br/>'.$langs->trans('ANONYMISER_AT', dol_print_date(time()));
+				$object->note_private = $object->note_private.'<br>'.$langs->trans('ANONYMISER_AT', dol_print_date(time()));
 
 				if ($object->update($object->id, $user, 0)) {
 					// On supprime les contacts associé
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 675372273f0..c204afcef72 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2216,7 +2216,7 @@ if ($action == 'create') {
 								if ($detail_entrepot->entrepot_id > 0) {
 									$entrepot = new Entrepot($db);
 									$entrepot->fetch($detail_entrepot->entrepot_id);
-									$detail .= $langs->trans("DetailWarehouseFormat", $entrepot->libelle, $detail_entrepot->qty_shipped).'<br/>';
+									$detail .= $langs->trans("DetailWarehouseFormat", $entrepot->libelle, $detail_entrepot->qty_shipped).'<br>';
 								}
 							}
 							print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"), $detail);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 26501e858d8..8e2fd940da0 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2123,6 +2123,6 @@ NoWritableFilesFoundIntoRootDir=No writable files or directories of the common p
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for modules updates
-CheckForModuleUpdateHelp=Check for modules updates.<br/>This action will connect to modules editors to check if a new version is available.
+CheckForModuleUpdateHelp=Check for modules updates.<br>This action will connect to modules editors to check if a new version is available.
 ModuleUpdateAvailable=An update is available for this module
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 3221c23aa8d..b6d5ae78407 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -1179,7 +1179,7 @@ if ($resql) {
 $modulepart = 'movement';
 
 if ($action != 'create' && $action != 'edit' && $action != 'delete' && $id > 0) {
-	print '<br/>';
+	print '<br>';
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 	print '<a name="builddoc"></a>'; // ancre
 
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index e0018aa0e4b..288e2282a40 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -611,7 +611,7 @@ foreach ($dirmodels as $reldir) {
 	}
 }
 
-print '</table><br/>';
+print '</table><br>';
 
 
 
@@ -750,7 +750,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 		}
 	}
 
-	print '</table><br/>';
+	print '</table><br>';
 }
 
 
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index d1441a4a98c..d40d75c0acf 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -153,7 +153,7 @@ $reshook = $hookmanager->executeHooks('doActions', $filters); // Note that $acti
 if ($reshook < 0) {
 	llxHeaderVierge();
 	if (!empty($hookmanager->errors) && is_array($hookmanager->errors)) {
-		print '<div class="error">'.implode('<br/>', $hookmanager->errors).'</div>';
+		print '<div class="error">'.implode('<br>', $hookmanager->errors).'</div>';
 	} else {
 		print '<div class="error">'.$hookmanager->error.'</div>';
 	}
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 1e4e2ae9c1d..e6cfb8a1533 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -260,7 +260,7 @@ if (empty($conf->stripeconnect->enabled)) {
 	print'</td></tr>';
 } else {
 	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
-	print '<td><b>'.$langs->trans("StripeConnect_Mode").'</b><br/>';
+	print '<td><b>'.$langs->trans("StripeConnect_Mode").'</b><br>';
 	print $langs->trans("STRIPE_APPLICATION_FEE_PLATFORM").' ';
 	print price($conf->global->STRIPE_APPLICATION_FEE_PERCENT);
 	print '% + ';

From 9acf0e880e09b35d35f9ce0f4d0fefa12fbd16ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 21:37:33 +0200
Subject: [PATCH 176/928] Fix ident

---
 htdocs/public/members/new.php | 132 +++++++++++++++++-----------------
 1 file changed, 67 insertions(+), 65 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 677e1e1b906..1b0adea71dd 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -545,7 +545,7 @@ jQuery(document).ready(function () {
 </script>';
 
 
-	print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
+print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 	// Type
 if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
@@ -564,9 +564,10 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
 	$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
 	print '<input type="hidden" id="typeid" name="typeid" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
 }
-	// Moral/Physic attribute
-	$morphys["phy"] = $langs->trans("Physical");
-	$morphys["mor"] = $langs->trans("Moral");
+
+// Moral/Physic attribute
+$morphys["phy"] = $langs->trans("Physical");
+$morphys["mor"] = $langs->trans("Moral");
 if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
 	print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
 	print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
@@ -575,33 +576,34 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
 	print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
 	print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
 }
-	// Civility
-	print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
-	print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'</td></tr>'."\n";
-	// Lastname
-	print '<tr><td>'.$langs->trans("Lastname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
-	// Firstname
-	print '<tr><td>'.$langs->trans("Firstname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
-	// Gender
-	print '<tr><td>'.$langs->trans("Gender").'</td>';
-	print '<td>';
-	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
-	print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1);
-	print '</td></tr>';
-	// Company
-	print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
-	// Address
-	print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
-	print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
-	// Zip / Town
-	print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
-	print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
-	print ' / ';
-	print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
-	print '</td></tr>';
-	// Country
-	print '<tr><td>'.$langs->trans('Country').'</td><td>';
-	$country_id = GETPOST('country_id');
+
+// Civility
+print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
+print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'</td></tr>'."\n";
+// Lastname
+print '<tr><td>'.$langs->trans("Lastname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+// Firstname
+print '<tr><td>'.$langs->trans("Firstname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
+// Gender
+print '<tr><td>'.$langs->trans("Gender").'</td>';
+print '<td>';
+$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
+print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1);
+print '</td></tr>';
+// Company
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
+// Address
+print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
+print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+// Zip / Town
+print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
+print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
+print ' / ';
+print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
+print '</td></tr>';
+// Country
+print '<tr><td>'.$langs->trans('Country').'</td><td>';
+$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);
 }
@@ -616,10 +618,10 @@ if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
 		}
 	}
 }
-	$country_code = getCountry($country_id, 2, $db, $langs);
-	print $form->select_country($country_id, 'country_id');
-	print '</td></tr>';
-	// State
+$country_code = getCountry($country_id, 2, $db, $langs);
+print $form->select_country($country_id, 'country_id');
+print '</td></tr>';
+// State
 if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($country_code) {
@@ -627,30 +629,30 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	}
 	print '</td></tr>';
 }
-	// EMail
-	print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
-	// Login
+// EMail
+print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+// Login
 if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 	print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
 	print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1").'"></td></tr>'."\n";
 	print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2").'"></td></tr>'."\n";
 }
-	// Birthday
-	print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateOfBirth").'</td><td>';
-	print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0);
-	print '</td></tr>'."\n";
-	// Photo
-	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";
-	// Other attributes
-	$tpl_context = 'public'; // define template context to public
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
-	// Comments
-	print '<tr>';
-	print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
-	print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private', 'restricthtml'), 0, 1).'</textarea></td>';
-	print '</tr>'."\n";
+// Birthday
+print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateOfBirth").'</td><td>';
+print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0);
+print '</td></tr>'."\n";
+// Photo
+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";
+// Other attributes
+$tpl_context = 'public'; // define template context to public
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+// Comments
+print '<tr>';
+print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
+print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private', 'restricthtml'), 0, 1).'</textarea></td>';
+print '</tr>'."\n";
 
 	// Add specific fields used by Dolibarr foundation for example
 if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
@@ -719,24 +721,24 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 	print ' '.$langs->trans("Currency".$conf->currency);
 	print '</td></tr>';
 }
-	print "</table>\n";
+print "</table>\n";
 
-	print dol_get_fiche_end();
+print dol_get_fiche_end();
 
-	// Save
-	print '<div class="center">';
-	print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
+// Save
+print '<div class="center">';
+print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
 if (!empty($backtopage)) {
 	print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
 }
-	print '</div>';
+print '</div>';
 
 
-	print "</form>\n";
-	print "<br>";
-	print '</div></div>';
+print "</form>\n";
+print "<br>";
+print '</div></div>';
 
 
-	llxFooterVierge();
+llxFooterVierge();
 
-	$db->close();
+$db->close();

From d294bd544d58a4aa6d80671c5a1be7b524576fef Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Mon, 19 Apr 2021 22:42:38 +0200
Subject: [PATCH 177/928] Update list.php

---
 htdocs/commande/list.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 954c0e95a6d..09c8cc3c0b7 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -812,29 +812,29 @@ if ($resql) {
 
 	// List of mass actions available
 	$arrayofmassactions = array(
-		'generate_doc'=>img_picto('', 'pdf').'&ensp;'.$langs->trans("ReGeneratePDF"),
-		'builddoc'=>img_picto('', 'pdf').'&ensp;'.$langs->trans("PDFMerge"),
+		'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	);
 	if ($permissiontovalidate) {
-		$arrayofmassactions['prevalidate'] = img_picto('', 'check').'&ensp;'.$langs->trans("Validate");
+		$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
 	}
 	if ($permissiontosendbymail) {
-		$arrayofmassactions['presend'] = img_picto('', 'email').'&ensp;'.$langs->trans("SendByMail");
+		$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
 	}
 	if ($permissiontoclose) {
-		$arrayofmassactions['preshipped'] = img_picto('', 'dollyrevert').'&ensp;'.$langs->trans("ClassifyShipped");
+		$arrayofmassactions['preshipped'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').$langs->trans("ClassifyShipped");
 	}
 	if ($permissiontocancel) {
-		$arrayofmassactions['cancelorders'] = img_picto('', 'close_title').'&ensp;'.$langs->trans("Cancel");
+		$arrayofmassactions['cancelorders'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel");
 	}
 	if ($user->rights->facture->creer) {
-		$arrayofmassactions['createbills'] = img_picto('', 'bill').'&ensp;'.$langs->trans("CreateInvoiceForThisCustomer");
+		$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomer");
 	}
 	if ($permissiontoclose) {
-		$arrayofmassactions['setbilled'] = img_picto('', 'bill').'&ensp;'.$langs->trans("ClassifyBilled");
+		$arrayofmassactions['setbilled'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
 	}
 	if ($permissiontodelete) {
-		$arrayofmassactions['predelete'] = img_picto('', 'delete').'&ensp;'.$langs->trans("Delete");
+		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	}
 	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
 		$arrayofmassactions = array();

From ea97992c3d3093716ed1516ab7e6943b44780aef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Apr 2021 22:52:13 +0200
Subject: [PATCH 178/928] css

---
 htdocs/accountancy/admin/accountmodel.php    |  4 +--
 htdocs/accountancy/admin/categories_list.php |  4 +--
 htdocs/accountancy/admin/journals_list.php   |  4 +--
 htdocs/admin/dict.php                        |  4 +--
 htdocs/admin/mails_templates.php             | 29 ++++++++++++--------
 htdocs/admin/website.php                     |  4 +--
 6 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 0ebba6c18a4..7c05a9a0da4 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -54,8 +54,8 @@ $code = GETPOST('code', 'alpha');
 
 $acts[0] = "activate";
 $acts[1] = "disable";
-$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off');
-$actl[1] = img_picto($langs->trans("Activated"), 'switch_on');
+$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"');
+$actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'int') > 0 ?GETPOST('listlimit', 'int') : 1000;
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 549bd942524..c5091ef4207 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -48,8 +48,8 @@ if (empty($user->rights->accounting->chartofaccount)) {
 
 $acts[0] = "activate";
 $acts[1] = "disable";
-$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off');
-$actl[1] = img_picto($langs->trans("Activated"), 'switch_on');
+$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"');
+$actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'int') > 0 ?GETPOST('listlimit', 'int') : 1000;
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 7aecfaada49..9ba9d8a6e20 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -51,8 +51,8 @@ if (empty($user->rights->accounting->chartofaccount)) {
 
 $acts[0] = "activate";
 $acts[1] = "disable";
-$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off');
-$actl[1] = img_picto($langs->trans("Activated"), 'switch_on');
+$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"');
+$actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'int') > 0 ?GETPOST('listlimit', 'int') : 1000;
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2e4b88c2287..636278dd6fb 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -70,8 +70,8 @@ if (!$allowed) {
 $acts = array(); $actl = array();
 $acts[0] = "activate";
 $acts[1] = "disable";
-$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off');
-$actl[1] = img_picto($langs->trans("Activated"), 'switch_on');
+$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"');
+$actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset');
 $listlimit = GETPOST('listlimit') > 0 ?GETPOST('listlimit') : 1000; // To avoid too long dictionaries
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index cdb9c10ec87..b5374bd5bba 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -73,8 +73,8 @@ $acts = array();
 $actl = array();
 $acts[0] = "activate";
 $acts[1] = "disable";
-$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off');
-$actl[1] = img_picto($langs->trans("Activated"), 'switch_on');
+$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"');
+$actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'alpha') > 0 ?GETPOST('listlimit', 'alpha') : 1000;
@@ -1002,7 +1002,7 @@ if ($resql) {
 				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
 
 				$tmpaction = 'view';
-				$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 				$reshook = $hookmanager->executeHooks('viewEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 				$error = $hookmanager->error; $errors = $hookmanager->errors;
@@ -1015,6 +1015,7 @@ if ($resql) {
 						$showfield = 1;
 						$align = "";
 						$class = "tddict";
+						$title = '';
 						$valuetoshow = $obj->{$fieldlist[$field]};
 						if ($value == 'label' || $value == 'topic') {
 							if ($langs->trans($valuetoshow) != $valuetoshow) {
@@ -1024,11 +1025,10 @@ if ($resql) {
 						}
 						if ($value == 'label') {
 							$class .= ' tdoverflowmax100';
-							$valuetoshow = '<span title="'.$valuetoshow.'">'.$valuetoshow.'</span>';
 						}
-						/*if ($value == 'topic') {
-							$class .= ' tdoverflowmax300';
-						}*/
+						if ($value == 'topic') {
+							$class .= 'tdoverflowmax200 small';
+						}
 						if ($value == 'type_template') {
 							$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
 							$align = "center";
@@ -1069,7 +1069,13 @@ if ($resql) {
 						// Show value for field
 						if ($showfield) {
 							print '<!-- '.$fieldlist[$field].' -->';
-							print '<td class="'.$class.'">'.$valuetoshow.'</td>';
+							print '<td class="'.$class.'"';
+							if ($value == 'topic') {
+								print ' title="'.$valuetoshow.'"';
+							}
+							print '>';
+							print $valuetoshow;
+							print '</td>';
 						}
 					}
 				}
@@ -1086,12 +1092,11 @@ if ($resql) {
 				if ($param) {
 					$url .= '&'.$param;
 				}
-				$url .= '&';
 
 				// Status / Active
 				print '<td class="center nowrap">';
 				if ($canbedisabled) {
-					print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+					print '<a href="'.$url.'&action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
 				} else {
 					print '<span class="opacitymedium">'.$actl[$obj->active].'</span>';
 				}
@@ -1100,10 +1105,10 @@ if ($resql) {
 				// Modify link / Delete link
 				print '<td class="center nowraponall" width="64">';
 				if ($canbemodified) {
-					print '<a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a>';
+					print '<a class="reposition editfielda" href="'.$url.'&action=edit&token='.newToken().'">'.img_edit().'</a>';
 				}
 				if ($iserasable) {
-					print '<a class="marginleftonly" href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+					print '<a class="marginleftonly" href="'.$url.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
 					//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 				}
 				print '</td>';
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index f55f432ed5a..864bb39798b 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -48,8 +48,8 @@ if (!$user->admin) {
 
 $acts[0] = "activate";
 $acts[1] = "disable";
-$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off');
-$actl[1] = img_picto($langs->trans("Activated"), 'switch_on');
+$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"');
+$actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;

From 39654260d69f402acca6388900238290e11db455 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Apr 2021 00:45:48 +0200
Subject: [PATCH 179/928] Sync transifex

---
 htdocs/langs/am_ET/accountancy.lang       |   26 +-
 htdocs/langs/am_ET/admin.lang             |   57 +-
 htdocs/langs/am_ET/banks.lang             |    3 +-
 htdocs/langs/am_ET/bills.lang             |   30 +-
 htdocs/langs/am_ET/boxes.lang             |   11 +-
 htdocs/langs/am_ET/categories.lang        |    6 +-
 htdocs/langs/am_ET/companies.lang         |   24 +-
 htdocs/langs/am_ET/compta.lang            |   26 +-
 htdocs/langs/am_ET/ecm.lang               |    4 +
 htdocs/langs/am_ET/errors.lang            |    9 +
 htdocs/langs/am_ET/externalsite.lang      |    2 +-
 htdocs/langs/am_ET/main.lang              |   19 +-
 htdocs/langs/am_ET/margins.lang           |    2 +-
 htdocs/langs/am_ET/members.lang           |    9 +
 htdocs/langs/am_ET/modulebuilder.lang     |    4 +-
 htdocs/langs/am_ET/orders.lang            |    2 +
 htdocs/langs/am_ET/other.lang             |    2 +
 htdocs/langs/am_ET/productbatch.lang      |   15 +-
 htdocs/langs/am_ET/products.lang          |    3 +-
 htdocs/langs/am_ET/projects.lang          |    5 +
 htdocs/langs/am_ET/propal.lang            |    3 +-
 htdocs/langs/am_ET/stocks.lang            |   35 +-
 htdocs/langs/am_ET/suppliers.lang         |    1 +
 htdocs/langs/am_ET/ticket.lang            |   20 +-
 htdocs/langs/am_ET/users.lang             |    9 +-
 htdocs/langs/am_ET/website.lang           |   12 +-
 htdocs/langs/am_ET/zapier.lang            |   14 +-
 htdocs/langs/ar_EG/admin.lang             |    6 +-
 htdocs/langs/ar_EG/bills.lang             |   12 +-
 htdocs/langs/ar_EG/boxes.lang             |    1 -
 htdocs/langs/ar_EG/companies.lang         |    2 -
 htdocs/langs/ar_EG/main.lang              |    5 +-
 htdocs/langs/ar_EG/orders.lang            |    7 -
 htdocs/langs/ar_EG/products.lang          |    2 -
 htdocs/langs/ar_EG/suppliers.lang         |   18 +-
 htdocs/langs/ar_EG/zapier.lang            |    2 +-
 htdocs/langs/ar_IQ/accountancy.lang       |  430 ++++
 htdocs/langs/ar_IQ/admin.lang             | 2124 +++++++++++++++++++
 htdocs/langs/ar_IQ/agenda.lang            |  170 ++
 htdocs/langs/ar_IQ/assets.lang            |   67 +
 htdocs/langs/ar_IQ/banks.lang             |  184 ++
 htdocs/langs/ar_IQ/bills.lang             |  591 ++++++
 htdocs/langs/ar_IQ/blockedlog.lang        |   54 +
 htdocs/langs/ar_IQ/bookmarks.lang         |   21 +
 htdocs/langs/ar_IQ/boxes.lang             |  120 ++
 htdocs/langs/ar_IQ/cashdesk.lang          |  129 ++
 htdocs/langs/ar_IQ/categories.lang        |   99 +
 htdocs/langs/ar_IQ/commercial.lang        |   81 +
 htdocs/langs/ar_IQ/companies.lang         |  477 +++++
 htdocs/langs/ar_IQ/compta.lang            |  288 +++
 htdocs/langs/ar_IQ/contracts.lang         |  104 +
 htdocs/langs/ar_IQ/cron.lang              |   91 +
 htdocs/langs/ar_IQ/deliveries.lang        |   32 +
 htdocs/langs/ar_IQ/dict.lang              |  359 ++++
 htdocs/langs/ar_IQ/donations.lang         |   35 +
 htdocs/langs/ar_IQ/ecm.lang               |   47 +
 htdocs/langs/ar_IQ/errors.lang            |  298 +++
 htdocs/langs/ar_IQ/exports.lang           |  136 ++
 htdocs/langs/ar_IQ/externalsite.lang      |    5 +
 htdocs/langs/ar_IQ/ftp.lang               |   14 +
 htdocs/langs/ar_IQ/help.lang              |   23 +
 htdocs/langs/ar_IQ/holiday.lang           |  134 ++
 htdocs/langs/ar_IQ/hrm.lang               |   19 +
 htdocs/langs/ar_IQ/install.lang           |  217 ++
 htdocs/langs/ar_IQ/interventions.lang     |   68 +
 htdocs/langs/ar_IQ/intracommreport.lang   |   40 +
 htdocs/langs/ar_IQ/languages.lang         |  105 +
 htdocs/langs/ar_IQ/ldap.lang              |   27 +
 htdocs/langs/ar_IQ/link.lang              |   11 +
 htdocs/langs/ar_IQ/loan.lang              |   34 +
 htdocs/langs/ar_IQ/mailmanspip.lang       |   27 +
 htdocs/langs/ar_IQ/mails.lang             |  179 ++
 htdocs/langs/ar_IQ/main.lang              | 1131 ++++++++++
 htdocs/langs/ar_IQ/margins.lang           |   45 +
 htdocs/langs/ar_IQ/members.lang           |  215 ++
 htdocs/langs/ar_IQ/modulebuilder.lang     |  145 ++
 htdocs/langs/ar_IQ/mrp.lang               |  102 +
 htdocs/langs/ar_IQ/multicurrency.lang     |   38 +
 htdocs/langs/ar_IQ/oauth.lang             |   32 +
 htdocs/langs/ar_IQ/opensurvey.lang        |   61 +
 htdocs/langs/ar_IQ/orders.lang            |  191 ++
 htdocs/langs/ar_IQ/other.lang             |  292 +++
 htdocs/langs/ar_IQ/paybox.lang            |   30 +
 htdocs/langs/ar_IQ/paypal.lang            |   36 +
 htdocs/langs/ar_IQ/printing.lang          |   54 +
 htdocs/langs/ar_IQ/productbatch.lang      |   35 +
 htdocs/langs/ar_IQ/products.lang          |  398 ++++
 htdocs/langs/ar_IQ/projects.lang          |  275 +++
 htdocs/langs/ar_IQ/propal.lang            |   92 +
 htdocs/langs/ar_IQ/receiptprinter.lang    |   82 +
 htdocs/langs/ar_IQ/receptions.lang        |   47 +
 htdocs/langs/ar_IQ/recruitment.lang       |   76 +
 htdocs/langs/ar_IQ/resource.lang          |   39 +
 htdocs/langs/ar_IQ/salaries.lang          |   24 +
 htdocs/langs/ar_IQ/sendings.lang          |   76 +
 htdocs/langs/ar_IQ/sms.lang               |   51 +
 htdocs/langs/ar_IQ/stocks.lang            |  257 +++
 htdocs/langs/ar_IQ/stripe.lang            |   71 +
 htdocs/langs/ar_IQ/supplier_proposal.lang |   58 +
 htdocs/langs/ar_IQ/suppliers.lang         |   49 +
 htdocs/langs/ar_IQ/ticket.lang            |  316 +++
 htdocs/langs/ar_IQ/trips.lang             |  151 ++
 htdocs/langs/ar_IQ/users.lang             |  125 ++
 htdocs/langs/ar_IQ/website.lang           |  147 ++
 htdocs/langs/ar_IQ/withdrawals.lang       |  153 ++
 htdocs/langs/ar_IQ/workflow.lang          |   25 +
 htdocs/langs/ar_IQ/zapier.lang            |   21 +
 htdocs/langs/ar_SA/accountancy.lang       |  606 +++---
 htdocs/langs/ar_SA/admin.lang             |  217 +-
 htdocs/langs/ar_SA/banks.lang             |   93 +-
 htdocs/langs/ar_SA/bills.lang             |  754 +++----
 htdocs/langs/ar_SA/boxes.lang             |  217 +-
 htdocs/langs/ar_SA/categories.lang        |    6 +-
 htdocs/langs/ar_SA/companies.lang         |  542 ++---
 htdocs/langs/ar_SA/compta.lang            |   40 +-
 htdocs/langs/ar_SA/ecm.lang               |    4 +
 htdocs/langs/ar_SA/errors.lang            |    9 +
 htdocs/langs/ar_SA/externalsite.lang      |    2 +-
 htdocs/langs/ar_SA/main.lang              | 1291 ++++++------
 htdocs/langs/ar_SA/margins.lang           |    9 +-
 htdocs/langs/ar_SA/members.lang           |    9 +
 htdocs/langs/ar_SA/modulebuilder.lang     |    4 +-
 htdocs/langs/ar_SA/orders.lang            |  295 +--
 htdocs/langs/ar_SA/other.lang             |    2 +
 htdocs/langs/ar_SA/productbatch.lang      |   15 +-
 htdocs/langs/ar_SA/products.lang          |    7 +-
 htdocs/langs/ar_SA/projects.lang          |    9 +-
 htdocs/langs/ar_SA/propal.lang            |    9 +-
 htdocs/langs/ar_SA/stocks.lang            |   35 +-
 htdocs/langs/ar_SA/suppliers.lang         |   93 +-
 htdocs/langs/ar_SA/ticket.lang            |   30 +-
 htdocs/langs/ar_SA/users.lang             |    9 +-
 htdocs/langs/ar_SA/website.lang           |   14 +-
 htdocs/langs/ar_SA/zapier.lang            |   14 +-
 htdocs/langs/az_AZ/accountancy.lang       |   26 +-
 htdocs/langs/az_AZ/admin.lang             |   57 +-
 htdocs/langs/az_AZ/banks.lang             |    3 +-
 htdocs/langs/az_AZ/bills.lang             |   30 +-
 htdocs/langs/az_AZ/boxes.lang             |   11 +-
 htdocs/langs/az_AZ/categories.lang        |    6 +-
 htdocs/langs/az_AZ/companies.lang         |   24 +-
 htdocs/langs/az_AZ/compta.lang            |   26 +-
 htdocs/langs/az_AZ/ecm.lang               |    4 +
 htdocs/langs/az_AZ/errors.lang            |    9 +
 htdocs/langs/az_AZ/externalsite.lang      |    2 +-
 htdocs/langs/az_AZ/main.lang              |   19 +-
 htdocs/langs/az_AZ/margins.lang           |    2 +-
 htdocs/langs/az_AZ/members.lang           |    9 +
 htdocs/langs/az_AZ/modulebuilder.lang     |    4 +-
 htdocs/langs/az_AZ/orders.lang            |    2 +
 htdocs/langs/az_AZ/other.lang             |    2 +
 htdocs/langs/az_AZ/productbatch.lang      |   15 +-
 htdocs/langs/az_AZ/products.lang          |    3 +-
 htdocs/langs/az_AZ/projects.lang          |    5 +
 htdocs/langs/az_AZ/propal.lang            |    7 +-
 htdocs/langs/az_AZ/stocks.lang            |   35 +-
 htdocs/langs/az_AZ/suppliers.lang         |    1 +
 htdocs/langs/az_AZ/ticket.lang            |   20 +-
 htdocs/langs/az_AZ/users.lang             |    9 +-
 htdocs/langs/az_AZ/website.lang           |   12 +-
 htdocs/langs/az_AZ/zapier.lang            |   14 +-
 htdocs/langs/bg_BG/accountancy.lang       |   26 +-
 htdocs/langs/bg_BG/admin.lang             |   57 +-
 htdocs/langs/bg_BG/banks.lang             |    3 +-
 htdocs/langs/bg_BG/bills.lang             |   24 +-
 htdocs/langs/bg_BG/boxes.lang             |   11 +-
 htdocs/langs/bg_BG/categories.lang        |    6 +-
 htdocs/langs/bg_BG/companies.lang         |   24 +-
 htdocs/langs/bg_BG/compta.lang            |   26 +-
 htdocs/langs/bg_BG/ecm.lang               |    4 +
 htdocs/langs/bg_BG/errors.lang            |    9 +
 htdocs/langs/bg_BG/externalsite.lang      |    2 +-
 htdocs/langs/bg_BG/main.lang              |   19 +-
 htdocs/langs/bg_BG/margins.lang           |    2 +-
 htdocs/langs/bg_BG/members.lang           |    9 +
 htdocs/langs/bg_BG/modulebuilder.lang     |    4 +-
 htdocs/langs/bg_BG/orders.lang            |    2 +
 htdocs/langs/bg_BG/other.lang             |    2 +
 htdocs/langs/bg_BG/productbatch.lang      |   15 +-
 htdocs/langs/bg_BG/products.lang          |    3 +-
 htdocs/langs/bg_BG/projects.lang          |    5 +
 htdocs/langs/bg_BG/propal.lang            |    7 +-
 htdocs/langs/bg_BG/stocks.lang            |   35 +-
 htdocs/langs/bg_BG/suppliers.lang         |    1 +
 htdocs/langs/bg_BG/ticket.lang            |   20 +-
 htdocs/langs/bg_BG/users.lang             |    9 +-
 htdocs/langs/bg_BG/website.lang           |   12 +-
 htdocs/langs/bg_BG/zapier.lang            |   14 +-
 htdocs/langs/bn_BD/accountancy.lang       |   26 +-
 htdocs/langs/bn_BD/admin.lang             |   57 +-
 htdocs/langs/bn_BD/banks.lang             |    3 +-
 htdocs/langs/bn_BD/bills.lang             |   30 +-
 htdocs/langs/bn_BD/boxes.lang             |   11 +-
 htdocs/langs/bn_BD/categories.lang        |    6 +-
 htdocs/langs/bn_BD/companies.lang         |   24 +-
 htdocs/langs/bn_BD/compta.lang            |   26 +-
 htdocs/langs/bn_BD/ecm.lang               |    4 +
 htdocs/langs/bn_BD/errors.lang            |    9 +
 htdocs/langs/bn_BD/externalsite.lang      |    2 +-
 htdocs/langs/bn_BD/main.lang              |   19 +-
 htdocs/langs/bn_BD/margins.lang           |    9 +-
 htdocs/langs/bn_BD/members.lang           |    9 +
 htdocs/langs/bn_BD/modulebuilder.lang     |    4 +-
 htdocs/langs/bn_BD/orders.lang            |    5 +-
 htdocs/langs/bn_BD/other.lang             |    2 +
 htdocs/langs/bn_BD/productbatch.lang      |   15 +-
 htdocs/langs/bn_BD/products.lang          |    3 +-
 htdocs/langs/bn_BD/projects.lang          |    5 +
 htdocs/langs/bn_BD/propal.lang            |    7 +-
 htdocs/langs/bn_BD/stocks.lang            |   35 +-
 htdocs/langs/bn_BD/suppliers.lang         |    1 +
 htdocs/langs/bn_BD/ticket.lang            |   20 +-
 htdocs/langs/bn_BD/users.lang             |    9 +-
 htdocs/langs/bn_BD/website.lang           |   12 +-
 htdocs/langs/bn_BD/zapier.lang            |   14 +-
 htdocs/langs/bn_IN/accountancy.lang       |   26 +-
 htdocs/langs/bn_IN/admin.lang             |   57 +-
 htdocs/langs/bn_IN/banks.lang             |    3 +-
 htdocs/langs/bn_IN/bills.lang             |   30 +-
 htdocs/langs/bn_IN/boxes.lang             |   11 +-
 htdocs/langs/bn_IN/categories.lang        |    6 +-
 htdocs/langs/bn_IN/companies.lang         |   24 +-
 htdocs/langs/bn_IN/compta.lang            |   26 +-
 htdocs/langs/bn_IN/ecm.lang               |    4 +
 htdocs/langs/bn_IN/errors.lang            |    9 +
 htdocs/langs/bn_IN/externalsite.lang      |    2 +-
 htdocs/langs/bn_IN/main.lang              |   19 +-
 htdocs/langs/bn_IN/margins.lang           |    2 +-
 htdocs/langs/bn_IN/members.lang           |    9 +
 htdocs/langs/bn_IN/modulebuilder.lang     |    4 +-
 htdocs/langs/bn_IN/orders.lang            |    2 +
 htdocs/langs/bn_IN/other.lang             |    2 +
 htdocs/langs/bn_IN/productbatch.lang      |   15 +-
 htdocs/langs/bn_IN/products.lang          |    3 +-
 htdocs/langs/bn_IN/projects.lang          |    5 +
 htdocs/langs/bn_IN/propal.lang            |    7 +-
 htdocs/langs/bn_IN/stocks.lang            |   35 +-
 htdocs/langs/bn_IN/suppliers.lang         |    1 +
 htdocs/langs/bn_IN/ticket.lang            |   20 +-
 htdocs/langs/bn_IN/users.lang             |    9 +-
 htdocs/langs/bn_IN/website.lang           |   12 +-
 htdocs/langs/bn_IN/zapier.lang            |   14 +-
 htdocs/langs/bs_BA/accountancy.lang       |   26 +-
 htdocs/langs/bs_BA/admin.lang             |   59 +-
 htdocs/langs/bs_BA/banks.lang             |    3 +-
 htdocs/langs/bs_BA/bills.lang             |   28 +-
 htdocs/langs/bs_BA/boxes.lang             |   11 +-
 htdocs/langs/bs_BA/categories.lang        |    6 +-
 htdocs/langs/bs_BA/companies.lang         |   24 +-
 htdocs/langs/bs_BA/compta.lang            |   26 +-
 htdocs/langs/bs_BA/ecm.lang               |    4 +
 htdocs/langs/bs_BA/errors.lang            |    9 +
 htdocs/langs/bs_BA/externalsite.lang      |    2 +-
 htdocs/langs/bs_BA/main.lang              |   19 +-
 htdocs/langs/bs_BA/margins.lang           |   17 +-
 htdocs/langs/bs_BA/members.lang           |    9 +
 htdocs/langs/bs_BA/modulebuilder.lang     |    4 +-
 htdocs/langs/bs_BA/orders.lang            |    5 +-
 htdocs/langs/bs_BA/other.lang             |    2 +
 htdocs/langs/bs_BA/productbatch.lang      |   17 +-
 htdocs/langs/bs_BA/products.lang          |    3 +-
 htdocs/langs/bs_BA/projects.lang          |    5 +
 htdocs/langs/bs_BA/propal.lang            |    7 +-
 htdocs/langs/bs_BA/stocks.lang            |   35 +-
 htdocs/langs/bs_BA/suppliers.lang         |    1 +
 htdocs/langs/bs_BA/ticket.lang            |   20 +-
 htdocs/langs/bs_BA/users.lang             |    9 +-
 htdocs/langs/bs_BA/website.lang           |   12 +-
 htdocs/langs/bs_BA/zapier.lang            |   14 +-
 htdocs/langs/ca_ES/accountancy.lang       |   26 +-
 htdocs/langs/ca_ES/admin.lang             |  279 +--
 htdocs/langs/ca_ES/banks.lang             |    3 +-
 htdocs/langs/ca_ES/bills.lang             |   39 +-
 htdocs/langs/ca_ES/boxes.lang             |   11 +-
 htdocs/langs/ca_ES/categories.lang        |    6 +-
 htdocs/langs/ca_ES/companies.lang         |   26 +-
 htdocs/langs/ca_ES/compta.lang            |   32 +-
 htdocs/langs/ca_ES/ecm.lang               |    4 +
 htdocs/langs/ca_ES/errors.lang            |   47 +-
 htdocs/langs/ca_ES/externalsite.lang      |    2 +-
 htdocs/langs/ca_ES/main.lang              |   35 +-
 htdocs/langs/ca_ES/margins.lang           |    4 +-
 htdocs/langs/ca_ES/members.lang           |   29 +-
 htdocs/langs/ca_ES/modulebuilder.lang     |   24 +-
 htdocs/langs/ca_ES/orders.lang            |    6 +-
 htdocs/langs/ca_ES/other.lang             |   12 +-
 htdocs/langs/ca_ES/productbatch.lang      |   15 +-
 htdocs/langs/ca_ES/products.lang          |   17 +-
 htdocs/langs/ca_ES/projects.lang          |   13 +-
 htdocs/langs/ca_ES/propal.lang            |    7 +-
 htdocs/langs/ca_ES/stocks.lang            |   37 +-
 htdocs/langs/ca_ES/suppliers.lang         |    3 +-
 htdocs/langs/ca_ES/ticket.lang            |   28 +-
 htdocs/langs/ca_ES/users.lang             |    8 +-
 htdocs/langs/ca_ES/website.lang           |   24 +-
 htdocs/langs/ca_ES/zapier.lang            |   16 +-
 htdocs/langs/cs_CZ/accountancy.lang       |   26 +-
 htdocs/langs/cs_CZ/admin.lang             |   57 +-
 htdocs/langs/cs_CZ/banks.lang             |    3 +-
 htdocs/langs/cs_CZ/bills.lang             |   30 +-
 htdocs/langs/cs_CZ/boxes.lang             |   11 +-
 htdocs/langs/cs_CZ/categories.lang        |    6 +-
 htdocs/langs/cs_CZ/companies.lang         |   24 +-
 htdocs/langs/cs_CZ/compta.lang            |   26 +-
 htdocs/langs/cs_CZ/ecm.lang               |    4 +
 htdocs/langs/cs_CZ/errors.lang            |    9 +
 htdocs/langs/cs_CZ/externalsite.lang      |    2 +-
 htdocs/langs/cs_CZ/main.lang              |   19 +-
 htdocs/langs/cs_CZ/margins.lang           |    2 +-
 htdocs/langs/cs_CZ/members.lang           |    9 +
 htdocs/langs/cs_CZ/modulebuilder.lang     |    4 +-
 htdocs/langs/cs_CZ/orders.lang            |    2 +
 htdocs/langs/cs_CZ/other.lang             |    2 +
 htdocs/langs/cs_CZ/productbatch.lang      |   49 +-
 htdocs/langs/cs_CZ/products.lang          |    3 +-
 htdocs/langs/cs_CZ/projects.lang          |    5 +
 htdocs/langs/cs_CZ/propal.lang            |    7 +-
 htdocs/langs/cs_CZ/stocks.lang            |   35 +-
 htdocs/langs/cs_CZ/suppliers.lang         |    1 +
 htdocs/langs/cs_CZ/ticket.lang            |   20 +-
 htdocs/langs/cs_CZ/users.lang             |   11 +-
 htdocs/langs/cs_CZ/website.lang           |   12 +-
 htdocs/langs/cs_CZ/zapier.lang            |   14 +-
 htdocs/langs/da_DK/accountancy.lang       |   76 +-
 htdocs/langs/da_DK/admin.lang             |   59 +-
 htdocs/langs/da_DK/banks.lang             |    3 +-
 htdocs/langs/da_DK/bills.lang             |   25 +-
 htdocs/langs/da_DK/boxes.lang             |   11 +-
 htdocs/langs/da_DK/categories.lang        |    2 +-
 htdocs/langs/da_DK/companies.lang         |   22 +-
 htdocs/langs/da_DK/compta.lang            |   26 +-
 htdocs/langs/da_DK/ecm.lang               |   10 +-
 htdocs/langs/da_DK/errors.lang            |    9 +
 htdocs/langs/da_DK/externalsite.lang      |    8 +-
 htdocs/langs/da_DK/main.lang              |   23 +-
 htdocs/langs/da_DK/margins.lang           |    2 +-
 htdocs/langs/da_DK/members.lang           |   23 +-
 htdocs/langs/da_DK/modulebuilder.lang     |    4 +-
 htdocs/langs/da_DK/orders.lang            |    2 +
 htdocs/langs/da_DK/other.lang             |    2 +
 htdocs/langs/da_DK/productbatch.lang      |   15 +-
 htdocs/langs/da_DK/products.lang          |   25 +-
 htdocs/langs/da_DK/projects.lang          |    5 +
 htdocs/langs/da_DK/propal.lang            |    1 +
 htdocs/langs/da_DK/stocks.lang            |   33 +-
 htdocs/langs/da_DK/suppliers.lang         |    3 +-
 htdocs/langs/da_DK/ticket.lang            |   20 +-
 htdocs/langs/da_DK/users.lang             |   11 +-
 htdocs/langs/da_DK/website.lang           |   12 +-
 htdocs/langs/da_DK/zapier.lang            |   16 +-
 htdocs/langs/de_AT/accountancy.lang       |    1 -
 htdocs/langs/de_AT/admin.lang             |    3 +-
 htdocs/langs/de_AT/bills.lang             |    2 +-
 htdocs/langs/de_AT/externalsite.lang      |    1 -
 htdocs/langs/de_AT/modulebuilder.lang     |    2 +
 htdocs/langs/de_AT/orders.lang            |    1 +
 htdocs/langs/de_AT/products.lang          |    1 -
 htdocs/langs/de_AT/propal.lang            |    1 +
 htdocs/langs/de_AT/withdrawals.lang       |    1 -
 htdocs/langs/de_CH/accountancy.lang       |    2 -
 htdocs/langs/de_CH/admin.lang             |    9 +-
 htdocs/langs/de_CH/bills.lang             |    4 +
 htdocs/langs/de_CH/boxes.lang             |    1 -
 htdocs/langs/de_CH/categories.lang        |    1 -
 htdocs/langs/de_CH/companies.lang         |    7 +-
 htdocs/langs/de_CH/compta.lang            |    1 -
 htdocs/langs/de_CH/main.lang              |    9 +-
 htdocs/langs/de_CH/margins.lang           |    4 +
 htdocs/langs/de_CH/modulebuilder.lang     |    2 +
 htdocs/langs/de_CH/orders.lang            |    3 +-
 htdocs/langs/de_CH/other.lang             |    3 +
 htdocs/langs/de_CH/productbatch.lang      |    5 +
 htdocs/langs/de_CH/products.lang          |    1 -
 htdocs/langs/de_CH/propal.lang            |    3 +
 htdocs/langs/de_CH/stocks.lang            |    1 +
 htdocs/langs/de_CH/users.lang             |    2 +-
 htdocs/langs/de_CH/withdrawals.lang       |    1 -
 htdocs/langs/de_DE/accountancy.lang       |   26 +-
 htdocs/langs/de_DE/admin.lang             |   87 +-
 htdocs/langs/de_DE/banks.lang             |    3 +-
 htdocs/langs/de_DE/bills.lang             |   21 +-
 htdocs/langs/de_DE/boxes.lang             |   11 +-
 htdocs/langs/de_DE/categories.lang        |    6 +-
 htdocs/langs/de_DE/companies.lang         |   34 +-
 htdocs/langs/de_DE/compta.lang            |   26 +-
 htdocs/langs/de_DE/ecm.lang               |    4 +
 htdocs/langs/de_DE/errors.lang            |    9 +
 htdocs/langs/de_DE/externalsite.lang      |    2 +-
 htdocs/langs/de_DE/main.lang              |   35 +-
 htdocs/langs/de_DE/margins.lang           |    2 +-
 htdocs/langs/de_DE/members.lang           |    9 +
 htdocs/langs/de_DE/modulebuilder.lang     |    6 +-
 htdocs/langs/de_DE/orders.lang            |    6 +-
 htdocs/langs/de_DE/other.lang             |   12 +-
 htdocs/langs/de_DE/productbatch.lang      |   19 +-
 htdocs/langs/de_DE/products.lang          |    3 +-
 htdocs/langs/de_DE/projects.lang          |    5 +
 htdocs/langs/de_DE/propal.lang            |    5 +-
 htdocs/langs/de_DE/stocks.lang            |   77 +-
 htdocs/langs/de_DE/suppliers.lang         |    1 +
 htdocs/langs/de_DE/ticket.lang            |   20 +-
 htdocs/langs/de_DE/trips.lang             |    4 +-
 htdocs/langs/de_DE/users.lang             |   13 +-
 htdocs/langs/de_DE/website.lang           |   12 +-
 htdocs/langs/de_DE/withdrawals.lang       |    3 +-
 htdocs/langs/de_DE/workflow.lang          |    2 +-
 htdocs/langs/de_DE/zapier.lang            |   14 +-
 htdocs/langs/el_CY/admin.lang             |    1 +
 htdocs/langs/el_CY/modulebuilder.lang     |    2 +
 htdocs/langs/el_GR/accountancy.lang       |   26 +-
 htdocs/langs/el_GR/admin.lang             |   57 +-
 htdocs/langs/el_GR/banks.lang             |    3 +-
 htdocs/langs/el_GR/bills.lang             |   30 +-
 htdocs/langs/el_GR/boxes.lang             |   11 +-
 htdocs/langs/el_GR/categories.lang        |    6 +-
 htdocs/langs/el_GR/companies.lang         |   24 +-
 htdocs/langs/el_GR/compta.lang            |   26 +-
 htdocs/langs/el_GR/ecm.lang               |    4 +
 htdocs/langs/el_GR/errors.lang            |    9 +
 htdocs/langs/el_GR/externalsite.lang      |    2 +-
 htdocs/langs/el_GR/main.lang              |   19 +-
 htdocs/langs/el_GR/margins.lang           |    2 +-
 htdocs/langs/el_GR/members.lang           |    9 +
 htdocs/langs/el_GR/modulebuilder.lang     |    4 +-
 htdocs/langs/el_GR/orders.lang            |    5 +-
 htdocs/langs/el_GR/other.lang             |    2 +
 htdocs/langs/el_GR/productbatch.lang      |   15 +-
 htdocs/langs/el_GR/products.lang          |    3 +-
 htdocs/langs/el_GR/projects.lang          |    5 +
 htdocs/langs/el_GR/propal.lang            |    7 +-
 htdocs/langs/el_GR/stocks.lang            |   35 +-
 htdocs/langs/el_GR/suppliers.lang         |    1 +
 htdocs/langs/el_GR/ticket.lang            |   20 +-
 htdocs/langs/el_GR/users.lang             |    9 +-
 htdocs/langs/el_GR/website.lang           |   12 +-
 htdocs/langs/el_GR/zapier.lang            |   14 +-
 htdocs/langs/en_AU/accountancy.lang       |    2 -
 htdocs/langs/en_AU/admin.lang             |    3 +-
 htdocs/langs/en_AU/modulebuilder.lang     |    2 +
 htdocs/langs/en_AU/products.lang          |    2 -
 htdocs/langs/en_AU/website.lang           |    3 +
 htdocs/langs/en_AU/withdrawals.lang       |    2 -
 htdocs/langs/en_CA/accountancy.lang       |    2 -
 htdocs/langs/en_CA/admin.lang             |    3 +-
 htdocs/langs/en_CA/modulebuilder.lang     |    2 +
 htdocs/langs/en_CA/products.lang          |    2 -
 htdocs/langs/en_CA/website.lang           |    3 +
 htdocs/langs/en_CA/withdrawals.lang       |    2 -
 htdocs/langs/en_GB/accountancy.lang       |    2 -
 htdocs/langs/en_GB/admin.lang             |    5 +-
 htdocs/langs/en_GB/bills.lang             |    2 -
 htdocs/langs/en_GB/modulebuilder.lang     |    2 +
 htdocs/langs/en_GB/orders.lang            |    1 -
 htdocs/langs/en_GB/products.lang          |    1 -
 htdocs/langs/en_GB/website.lang           |    2 +
 htdocs/langs/en_GB/withdrawals.lang       |    1 -
 htdocs/langs/en_IN/accountancy.lang       |    2 -
 htdocs/langs/en_IN/admin.lang             |    3 +-
 htdocs/langs/en_IN/modulebuilder.lang     |    2 +
 htdocs/langs/en_IN/products.lang          |    2 -
 htdocs/langs/en_IN/website.lang           |    3 +
 htdocs/langs/en_IN/withdrawals.lang       |    2 -
 htdocs/langs/en_SG/accountancy.lang       |    2 -
 htdocs/langs/en_SG/admin.lang             |    3 +-
 htdocs/langs/en_SG/modulebuilder.lang     |    2 +
 htdocs/langs/en_SG/products.lang          |    2 -
 htdocs/langs/en_SG/website.lang           |    3 +
 htdocs/langs/en_SG/withdrawals.lang       |    2 -
 htdocs/langs/es_AR/accountancy.lang       |    1 -
 htdocs/langs/es_AR/admin.lang             |    7 +-
 htdocs/langs/es_AR/bills.lang             |    2 +
 htdocs/langs/es_AR/companies.lang         |    1 -
 htdocs/langs/es_AR/main.lang              |    6 -
 htdocs/langs/es_AR/margins.lang           |    1 -
 htdocs/langs/es_AR/modulebuilder.lang     |    2 +
 htdocs/langs/es_AR/orders.lang            |    2 +
 htdocs/langs/es_AR/productbatch.lang      |    1 -
 htdocs/langs/es_AR/products.lang          |    1 -
 htdocs/langs/es_AR/stocks.lang            |    2 +
 htdocs/langs/es_AR/suppliers.lang         |    1 +
 htdocs/langs/es_AR/website.lang           |    2 +
 htdocs/langs/es_AR/withdrawals.lang       |    1 -
 htdocs/langs/es_AR/zapier.lang            |    2 +-
 htdocs/langs/es_BO/accountancy.lang       |    2 -
 htdocs/langs/es_BO/admin.lang             |    3 +-
 htdocs/langs/es_BO/modulebuilder.lang     |    2 +
 htdocs/langs/es_BO/products.lang          |    2 -
 htdocs/langs/es_BO/website.lang           |    3 +
 htdocs/langs/es_BO/withdrawals.lang       |    2 -
 htdocs/langs/es_CL/accountancy.lang       |    1 -
 htdocs/langs/es_CL/admin.lang             |   40 +-
 htdocs/langs/es_CL/bills.lang             |    9 +-
 htdocs/langs/es_CL/categories.lang        |    1 -
 htdocs/langs/es_CL/companies.lang         |    1 -
 htdocs/langs/es_CL/compta.lang            |    3 -
 htdocs/langs/es_CL/main.lang              |    3 -
 htdocs/langs/es_CL/margins.lang           |    1 -
 htdocs/langs/es_CL/modulebuilder.lang     |    1 +
 htdocs/langs/es_CL/orders.lang            |    2 +-
 htdocs/langs/es_CL/productbatch.lang      |    1 -
 htdocs/langs/es_CL/products.lang          |    2 -
 htdocs/langs/es_CL/stocks.lang            |    2 -
 htdocs/langs/es_CL/suppliers.lang         |    1 +
 htdocs/langs/es_CL/ticket.lang            |    2 -
 htdocs/langs/es_CL/website.lang           |    4 +-
 htdocs/langs/es_CL/withdrawals.lang       |    1 -
 htdocs/langs/es_CO/accountancy.lang       |    1 -
 htdocs/langs/es_CO/admin.lang             |    8 -
 htdocs/langs/es_CO/bills.lang             |    7 +-
 htdocs/langs/es_CO/compta.lang            |    4 -
 htdocs/langs/es_CO/main.lang              |    4 -
 htdocs/langs/es_CO/modulebuilder.lang     |    2 +
 htdocs/langs/es_CO/orders.lang            |    1 -
 htdocs/langs/es_CO/productbatch.lang      |    1 -
 htdocs/langs/es_CO/products.lang          |    2 -
 htdocs/langs/es_CO/suppliers.lang         |    1 +
 htdocs/langs/es_CO/website.lang           |    3 +
 htdocs/langs/es_CO/withdrawals.lang       |    1 -
 htdocs/langs/es_DO/accountancy.lang       |    2 -
 htdocs/langs/es_DO/admin.lang             |    3 +-
 htdocs/langs/es_DO/modulebuilder.lang     |    2 +
 htdocs/langs/es_DO/products.lang          |    2 -
 htdocs/langs/es_DO/website.lang           |    3 +
 htdocs/langs/es_DO/withdrawals.lang       |    2 -
 htdocs/langs/es_EC/accountancy.lang       |    1 -
 htdocs/langs/es_EC/admin.lang             |   13 -
 htdocs/langs/es_EC/bills.lang             |    8 +-
 htdocs/langs/es_EC/categories.lang        |    1 -
 htdocs/langs/es_EC/companies.lang         |    1 -
 htdocs/langs/es_EC/compta.lang            |    3 -
 htdocs/langs/es_EC/main.lang              |    2 -
 htdocs/langs/es_EC/margins.lang           |    1 -
 htdocs/langs/es_EC/orders.lang            |    1 +
 htdocs/langs/es_EC/productbatch.lang      |    1 -
 htdocs/langs/es_EC/products.lang          |    2 -
 htdocs/langs/es_EC/stocks.lang            |    1 -
 htdocs/langs/es_EC/suppliers.lang         |    1 +
 htdocs/langs/es_EC/ticket.lang            |    2 -
 htdocs/langs/es_EC/users.lang             |    1 -
 htdocs/langs/es_EC/website.lang           |    4 +-
 htdocs/langs/es_EC/withdrawals.lang       |    1 -
 htdocs/langs/es_ES/accountancy.lang       |   26 +-
 htdocs/langs/es_ES/admin.lang             |   57 +-
 htdocs/langs/es_ES/banks.lang             |    3 +-
 htdocs/langs/es_ES/bills.lang             |   23 +-
 htdocs/langs/es_ES/boxes.lang             |   11 +-
 htdocs/langs/es_ES/categories.lang        |    6 +-
 htdocs/langs/es_ES/companies.lang         |   18 +-
 htdocs/langs/es_ES/compta.lang            |   26 +-
 htdocs/langs/es_ES/ecm.lang               |    4 +
 htdocs/langs/es_ES/errors.lang            |    9 +
 htdocs/langs/es_ES/externalsite.lang      |    2 +-
 htdocs/langs/es_ES/main.lang              |   19 +-
 htdocs/langs/es_ES/margins.lang           |    2 +-
 htdocs/langs/es_ES/members.lang           |    9 +
 htdocs/langs/es_ES/modulebuilder.lang     |    4 +-
 htdocs/langs/es_ES/orders.lang            |    2 +
 htdocs/langs/es_ES/other.lang             |    2 +
 htdocs/langs/es_ES/productbatch.lang      |   15 +-
 htdocs/langs/es_ES/products.lang          |    3 +-
 htdocs/langs/es_ES/projects.lang          |    7 +-
 htdocs/langs/es_ES/propal.lang            |    1 +
 htdocs/langs/es_ES/stocks.lang            |   35 +-
 htdocs/langs/es_ES/suppliers.lang         |    1 +
 htdocs/langs/es_ES/ticket.lang            |   20 +-
 htdocs/langs/es_ES/users.lang             |    2 +-
 htdocs/langs/es_ES/website.lang           |   12 +-
 htdocs/langs/es_ES/zapier.lang            |   14 +-
 htdocs/langs/es_GT/accountancy.lang       |    2 -
 htdocs/langs/es_GT/admin.lang             |    3 +-
 htdocs/langs/es_GT/modulebuilder.lang     |    2 +
 htdocs/langs/es_GT/products.lang          |    2 -
 htdocs/langs/es_GT/website.lang           |    3 +
 htdocs/langs/es_GT/withdrawals.lang       |    2 -
 htdocs/langs/es_HN/accountancy.lang       |    2 -
 htdocs/langs/es_HN/admin.lang             |    3 +-
 htdocs/langs/es_HN/modulebuilder.lang     |    2 +
 htdocs/langs/es_HN/products.lang          |    2 -
 htdocs/langs/es_HN/website.lang           |    3 +
 htdocs/langs/es_HN/withdrawals.lang       |    2 -
 htdocs/langs/es_MX/accountancy.lang       |    1 -
 htdocs/langs/es_MX/admin.lang             |    6 +-
 htdocs/langs/es_MX/bills.lang             |   21 +-
 htdocs/langs/es_MX/bookmarks.lang         |   11 +
 htdocs/langs/es_MX/boxes.lang             |    4 +-
 htdocs/langs/es_MX/categories.lang        |    2 +
 htdocs/langs/es_MX/companies.lang         |    2 -
 htdocs/langs/es_MX/main.lang              |    7 +-
 htdocs/langs/es_MX/modulebuilder.lang     |    1 +
 htdocs/langs/es_MX/orders.lang            |   45 +-
 htdocs/langs/es_MX/productbatch.lang      |    1 +
 htdocs/langs/es_MX/products.lang          |    1 -
 htdocs/langs/es_MX/suppliers.lang         |    1 +
 htdocs/langs/es_MX/website.lang           |    2 +
 htdocs/langs/es_MX/withdrawals.lang       |    1 -
 htdocs/langs/es_PA/accountancy.lang       |    2 -
 htdocs/langs/es_PA/admin.lang             |    3 +-
 htdocs/langs/es_PA/modulebuilder.lang     |    2 +
 htdocs/langs/es_PA/products.lang          |    2 -
 htdocs/langs/es_PA/website.lang           |    3 +
 htdocs/langs/es_PA/withdrawals.lang       |    2 -
 htdocs/langs/es_PE/accountancy.lang       |    1 -
 htdocs/langs/es_PE/admin.lang             |    3 +-
 htdocs/langs/es_PE/bills.lang             |    1 +
 htdocs/langs/es_PE/main.lang              |    1 -
 htdocs/langs/es_PE/modulebuilder.lang     |    2 +
 htdocs/langs/es_PE/products.lang          |    2 +-
 htdocs/langs/es_PE/stocks.lang            |    8 +
 htdocs/langs/es_PE/website.lang           |    2 +
 htdocs/langs/es_PE/withdrawals.lang       |    2 -
 htdocs/langs/es_PY/accountancy.lang       |    2 -
 htdocs/langs/es_PY/admin.lang             |    3 +-
 htdocs/langs/es_PY/modulebuilder.lang     |    2 +
 htdocs/langs/es_PY/products.lang          |    2 -
 htdocs/langs/es_PY/website.lang           |    3 +
 htdocs/langs/es_PY/withdrawals.lang       |    2 -
 htdocs/langs/es_PY/zapier.lang            |    2 +-
 htdocs/langs/es_US/accountancy.lang       |    2 -
 htdocs/langs/es_US/admin.lang             |    3 +-
 htdocs/langs/es_US/modulebuilder.lang     |    2 +
 htdocs/langs/es_US/products.lang          |    2 -
 htdocs/langs/es_US/website.lang           |    3 +
 htdocs/langs/es_US/withdrawals.lang       |    2 -
 htdocs/langs/es_UY/accountancy.lang       |    2 -
 htdocs/langs/es_UY/admin.lang             |    3 +-
 htdocs/langs/es_UY/modulebuilder.lang     |    2 +
 htdocs/langs/es_UY/products.lang          |    2 -
 htdocs/langs/es_UY/website.lang           |    3 +
 htdocs/langs/es_UY/withdrawals.lang       |    2 -
 htdocs/langs/es_VE/accountancy.lang       |    2 -
 htdocs/langs/es_VE/admin.lang             |    2 -
 htdocs/langs/es_VE/modulebuilder.lang     |    2 +
 htdocs/langs/es_VE/orders.lang            |    1 -
 htdocs/langs/es_VE/products.lang          |    1 -
 htdocs/langs/es_VE/website.lang           |    3 +
 htdocs/langs/es_VE/withdrawals.lang       |    1 -
 htdocs/langs/et_EE/accountancy.lang       |   26 +-
 htdocs/langs/et_EE/admin.lang             |   57 +-
 htdocs/langs/et_EE/banks.lang             |    3 +-
 htdocs/langs/et_EE/bills.lang             |   28 +-
 htdocs/langs/et_EE/boxes.lang             |   11 +-
 htdocs/langs/et_EE/categories.lang        |    6 +-
 htdocs/langs/et_EE/companies.lang         |   24 +-
 htdocs/langs/et_EE/compta.lang            |   26 +-
 htdocs/langs/et_EE/ecm.lang               |    4 +
 htdocs/langs/et_EE/errors.lang            |    9 +
 htdocs/langs/et_EE/externalsite.lang      |    2 +-
 htdocs/langs/et_EE/main.lang              |   19 +-
 htdocs/langs/et_EE/margins.lang           |    9 +-
 htdocs/langs/et_EE/members.lang           |    9 +
 htdocs/langs/et_EE/modulebuilder.lang     |    4 +-
 htdocs/langs/et_EE/orders.lang            |    5 +-
 htdocs/langs/et_EE/other.lang             |    2 +
 htdocs/langs/et_EE/productbatch.lang      |   15 +-
 htdocs/langs/et_EE/products.lang          |    3 +-
 htdocs/langs/et_EE/projects.lang          |    5 +
 htdocs/langs/et_EE/propal.lang            |    7 +-
 htdocs/langs/et_EE/stocks.lang            |   35 +-
 htdocs/langs/et_EE/suppliers.lang         |    1 +
 htdocs/langs/et_EE/ticket.lang            |   20 +-
 htdocs/langs/et_EE/users.lang             |    9 +-
 htdocs/langs/et_EE/website.lang           |   12 +-
 htdocs/langs/et_EE/zapier.lang            |   14 +-
 htdocs/langs/eu_ES/accountancy.lang       |   26 +-
 htdocs/langs/eu_ES/admin.lang             |   57 +-
 htdocs/langs/eu_ES/banks.lang             |    3 +-
 htdocs/langs/eu_ES/bills.lang             |   30 +-
 htdocs/langs/eu_ES/boxes.lang             |   11 +-
 htdocs/langs/eu_ES/categories.lang        |    6 +-
 htdocs/langs/eu_ES/companies.lang         |   24 +-
 htdocs/langs/eu_ES/compta.lang            |   26 +-
 htdocs/langs/eu_ES/ecm.lang               |    4 +
 htdocs/langs/eu_ES/errors.lang            |    9 +
 htdocs/langs/eu_ES/externalsite.lang      |    2 +-
 htdocs/langs/eu_ES/main.lang              |   19 +-
 htdocs/langs/eu_ES/margins.lang           |    9 +-
 htdocs/langs/eu_ES/members.lang           |    9 +
 htdocs/langs/eu_ES/modulebuilder.lang     |    4 +-
 htdocs/langs/eu_ES/orders.lang            |    5 +-
 htdocs/langs/eu_ES/other.lang             |    2 +
 htdocs/langs/eu_ES/productbatch.lang      |   15 +-
 htdocs/langs/eu_ES/products.lang          |    3 +-
 htdocs/langs/eu_ES/projects.lang          |    5 +
 htdocs/langs/eu_ES/propal.lang            |    7 +-
 htdocs/langs/eu_ES/stocks.lang            |   35 +-
 htdocs/langs/eu_ES/suppliers.lang         |    1 +
 htdocs/langs/eu_ES/ticket.lang            |   20 +-
 htdocs/langs/eu_ES/users.lang             |    9 +-
 htdocs/langs/eu_ES/website.lang           |   12 +-
 htdocs/langs/eu_ES/zapier.lang            |   14 +-
 htdocs/langs/fa_IR/accountancy.lang       |   26 +-
 htdocs/langs/fa_IR/admin.lang             |   57 +-
 htdocs/langs/fa_IR/banks.lang             |    3 +-
 htdocs/langs/fa_IR/bills.lang             |   30 +-
 htdocs/langs/fa_IR/boxes.lang             |   11 +-
 htdocs/langs/fa_IR/categories.lang        |    6 +-
 htdocs/langs/fa_IR/companies.lang         |   24 +-
 htdocs/langs/fa_IR/compta.lang            |   26 +-
 htdocs/langs/fa_IR/ecm.lang               |    4 +
 htdocs/langs/fa_IR/errors.lang            |    9 +
 htdocs/langs/fa_IR/externalsite.lang      |    2 +-
 htdocs/langs/fa_IR/main.lang              |   19 +-
 htdocs/langs/fa_IR/margins.lang           |    5 +-
 htdocs/langs/fa_IR/members.lang           |    9 +
 htdocs/langs/fa_IR/modulebuilder.lang     |    4 +-
 htdocs/langs/fa_IR/orders.lang            |    5 +-
 htdocs/langs/fa_IR/other.lang             |    2 +
 htdocs/langs/fa_IR/productbatch.lang      |   15 +-
 htdocs/langs/fa_IR/products.lang          |    3 +-
 htdocs/langs/fa_IR/projects.lang          |    5 +
 htdocs/langs/fa_IR/propal.lang            |    7 +-
 htdocs/langs/fa_IR/stocks.lang            |   35 +-
 htdocs/langs/fa_IR/suppliers.lang         |    1 +
 htdocs/langs/fa_IR/ticket.lang            |   20 +-
 htdocs/langs/fa_IR/users.lang             |    9 +-
 htdocs/langs/fa_IR/website.lang           |   12 +-
 htdocs/langs/fa_IR/zapier.lang            |   14 +-
 htdocs/langs/fi_FI/accountancy.lang       |   26 +-
 htdocs/langs/fi_FI/admin.lang             |  495 ++---
 htdocs/langs/fi_FI/banks.lang             |    3 +-
 htdocs/langs/fi_FI/bills.lang             |   23 +-
 htdocs/langs/fi_FI/boxes.lang             |   11 +-
 htdocs/langs/fi_FI/categories.lang        |    6 +-
 htdocs/langs/fi_FI/companies.lang         |   24 +-
 htdocs/langs/fi_FI/compta.lang            |   26 +-
 htdocs/langs/fi_FI/ecm.lang               |    4 +
 htdocs/langs/fi_FI/errors.lang            |    9 +
 htdocs/langs/fi_FI/externalsite.lang      |    2 +-
 htdocs/langs/fi_FI/main.lang              |   19 +-
 htdocs/langs/fi_FI/margins.lang           |    2 +-
 htdocs/langs/fi_FI/members.lang           |    9 +
 htdocs/langs/fi_FI/modulebuilder.lang     |    4 +-
 htdocs/langs/fi_FI/orders.lang            |   95 +-
 htdocs/langs/fi_FI/other.lang             |    2 +
 htdocs/langs/fi_FI/productbatch.lang      |   15 +-
 htdocs/langs/fi_FI/products.lang          |    3 +-
 htdocs/langs/fi_FI/projects.lang          |    5 +
 htdocs/langs/fi_FI/propal.lang            |    7 +-
 htdocs/langs/fi_FI/stocks.lang            |   35 +-
 htdocs/langs/fi_FI/suppliers.lang         |    1 +
 htdocs/langs/fi_FI/ticket.lang            |   20 +-
 htdocs/langs/fi_FI/users.lang             |    9 +-
 htdocs/langs/fi_FI/website.lang           |   12 +-
 htdocs/langs/fi_FI/zapier.lang            |   14 +-
 htdocs/langs/fr_BE/accountancy.lang       |    1 -
 htdocs/langs/fr_BE/admin.lang             |    3 +-
 htdocs/langs/fr_BE/bills.lang             |    2 -
 htdocs/langs/fr_BE/modulebuilder.lang     |    2 +
 htdocs/langs/fr_BE/products.lang          |    2 -
 htdocs/langs/fr_BE/withdrawals.lang       |    1 -
 htdocs/langs/fr_CA/accountancy.lang       |    1 -
 htdocs/langs/fr_CA/admin.lang             |    5 +-
 htdocs/langs/fr_CA/bills.lang             |    4 +-
 htdocs/langs/fr_CA/categories.lang        |    1 -
 htdocs/langs/fr_CA/compta.lang            |    3 -
 htdocs/langs/fr_CA/main.lang              |    1 -
 htdocs/langs/fr_CA/margins.lang           |    2 -
 htdocs/langs/fr_CA/modulebuilder.lang     |    1 +
 htdocs/langs/fr_CA/productbatch.lang      |    1 -
 htdocs/langs/fr_CA/products.lang          |    2 -
 htdocs/langs/fr_CA/stocks.lang            |    1 -
 htdocs/langs/fr_CA/withdrawals.lang       |    1 -
 htdocs/langs/fr_CH/accountancy.lang       |    2 -
 htdocs/langs/fr_CH/admin.lang             |    3 +-
 htdocs/langs/fr_CH/modulebuilder.lang     |    2 +
 htdocs/langs/fr_CH/products.lang          |    2 -
 htdocs/langs/fr_CH/withdrawals.lang       |    2 -
 htdocs/langs/fr_CI/accountancy.lang       |    2 -
 htdocs/langs/fr_CI/admin.lang             |    3 +-
 htdocs/langs/fr_CI/modulebuilder.lang     |    2 +
 htdocs/langs/fr_CI/products.lang          |    2 -
 htdocs/langs/fr_CI/withdrawals.lang       |    2 -
 htdocs/langs/fr_CM/accountancy.lang       |    2 -
 htdocs/langs/fr_CM/admin.lang             |    3 +-
 htdocs/langs/fr_CM/modulebuilder.lang     |    2 +
 htdocs/langs/fr_CM/products.lang          |    2 -
 htdocs/langs/fr_CM/withdrawals.lang       |    2 -
 htdocs/langs/fr_FR/accountancy.lang       |   28 +-
 htdocs/langs/fr_FR/admin.lang             |   80 +-
 htdocs/langs/fr_FR/agenda.lang            |    7 +-
 htdocs/langs/fr_FR/assets.lang            |    2 +
 htdocs/langs/fr_FR/banks.lang             |    3 +-
 htdocs/langs/fr_FR/bills.lang             |   26 +-
 htdocs/langs/fr_FR/boxes.lang             |   15 +-
 htdocs/langs/fr_FR/cashdesk.lang          |    7 +-
 htdocs/langs/fr_FR/categories.lang        |    6 +-
 htdocs/langs/fr_FR/commercial.lang        |    1 +
 htdocs/langs/fr_FR/companies.lang         |   18 +-
 htdocs/langs/fr_FR/compta.lang            |   26 +-
 htdocs/langs/fr_FR/donations.lang         |    2 +-
 htdocs/langs/fr_FR/ecm.lang               |    4 +
 htdocs/langs/fr_FR/errors.lang            |   11 +-
 htdocs/langs/fr_FR/externalsite.lang      |    2 +-
 htdocs/langs/fr_FR/holiday.lang           |    6 +-
 htdocs/langs/fr_FR/mails.lang             |    4 +-
 htdocs/langs/fr_FR/main.lang              |   27 +-
 htdocs/langs/fr_FR/margins.lang           |    2 +-
 htdocs/langs/fr_FR/members.lang           |   14 +-
 htdocs/langs/fr_FR/modulebuilder.lang     |    9 +-
 htdocs/langs/fr_FR/mrp.lang               |   12 +-
 htdocs/langs/fr_FR/orders.lang            |    5 +-
 htdocs/langs/fr_FR/other.lang             |    1 +
 htdocs/langs/fr_FR/products.lang          |    3 +-
 htdocs/langs/fr_FR/projects.lang          |   10 +-
 htdocs/langs/fr_FR/propal.lang            |   25 +-
 htdocs/langs/fr_FR/salaries.lang          |    6 +-
 htdocs/langs/fr_FR/stocks.lang            |   42 +-
 htdocs/langs/fr_FR/supplier_proposal.lang |    4 +
 htdocs/langs/fr_FR/suppliers.lang         |    1 +
 htdocs/langs/fr_FR/ticket.lang            |   18 +-
 htdocs/langs/fr_FR/trips.lang             |   10 +-
 htdocs/langs/fr_FR/users.lang             |    9 +-
 htdocs/langs/fr_FR/website.lang           |   14 +-
 htdocs/langs/fr_FR/withdrawals.lang       |   10 +-
 htdocs/langs/fr_FR/zapier.lang            |   14 +-
 htdocs/langs/fr_GA/accountancy.lang       |    2 -
 htdocs/langs/fr_GA/admin.lang             |    3 +-
 htdocs/langs/fr_GA/modulebuilder.lang     |    2 +
 htdocs/langs/fr_GA/products.lang          |    2 -
 htdocs/langs/fr_GA/withdrawals.lang       |    2 -
 htdocs/langs/gl_ES/accountancy.lang       |   64 +-
 htdocs/langs/gl_ES/admin.lang             |   81 +-
 htdocs/langs/gl_ES/agenda.lang            |   11 +-
 htdocs/langs/gl_ES/banks.lang             |    3 +-
 htdocs/langs/gl_ES/bills.lang             |   23 +-
 htdocs/langs/gl_ES/boxes.lang             |   13 +-
 htdocs/langs/gl_ES/categories.lang        |    8 +-
 htdocs/langs/gl_ES/companies.lang         |   22 +-
 htdocs/langs/gl_ES/compta.lang            |   46 +-
 htdocs/langs/gl_ES/ecm.lang               |    4 +
 htdocs/langs/gl_ES/errors.lang            |   35 +-
 htdocs/langs/gl_ES/exports.lang           |    4 +-
 htdocs/langs/gl_ES/externalsite.lang      |    2 +-
 htdocs/langs/gl_ES/main.lang              |   41 +-
 htdocs/langs/gl_ES/margins.lang           |    2 +-
 htdocs/langs/gl_ES/members.lang           |   13 +-
 htdocs/langs/gl_ES/modulebuilder.lang     |    8 +-
 htdocs/langs/gl_ES/orders.lang            |   18 +-
 htdocs/langs/gl_ES/other.lang             |   10 +-
 htdocs/langs/gl_ES/productbatch.lang      |   15 +-
 htdocs/langs/gl_ES/products.lang          |    5 +-
 htdocs/langs/gl_ES/projects.lang          |    5 +
 htdocs/langs/gl_ES/propal.lang            |   13 +-
 htdocs/langs/gl_ES/salaries.lang          |    5 +-
 htdocs/langs/gl_ES/stocks.lang            |   41 +-
 htdocs/langs/gl_ES/suppliers.lang         |    1 +
 htdocs/langs/gl_ES/ticket.lang            |   20 +-
 htdocs/langs/gl_ES/users.lang             |    2 +-
 htdocs/langs/gl_ES/website.lang           |   16 +-
 htdocs/langs/gl_ES/zapier.lang            |   16 +-
 htdocs/langs/he_IL/accountancy.lang       |   26 +-
 htdocs/langs/he_IL/admin.lang             |   57 +-
 htdocs/langs/he_IL/banks.lang             |    3 +-
 htdocs/langs/he_IL/bills.lang             |   30 +-
 htdocs/langs/he_IL/boxes.lang             |   11 +-
 htdocs/langs/he_IL/categories.lang        |    6 +-
 htdocs/langs/he_IL/companies.lang         |   24 +-
 htdocs/langs/he_IL/compta.lang            |   26 +-
 htdocs/langs/he_IL/ecm.lang               |    4 +
 htdocs/langs/he_IL/errors.lang            |    9 +
 htdocs/langs/he_IL/externalsite.lang      |    2 +-
 htdocs/langs/he_IL/main.lang              |   19 +-
 htdocs/langs/he_IL/margins.lang           |    9 +-
 htdocs/langs/he_IL/members.lang           |    9 +
 htdocs/langs/he_IL/modulebuilder.lang     |    4 +-
 htdocs/langs/he_IL/orders.lang            |    5 +-
 htdocs/langs/he_IL/other.lang             |    2 +
 htdocs/langs/he_IL/productbatch.lang      |   15 +-
 htdocs/langs/he_IL/products.lang          |    3 +-
 htdocs/langs/he_IL/projects.lang          |    5 +
 htdocs/langs/he_IL/propal.lang            |    7 +-
 htdocs/langs/he_IL/stocks.lang            |   35 +-
 htdocs/langs/he_IL/suppliers.lang         |    1 +
 htdocs/langs/he_IL/ticket.lang            |   20 +-
 htdocs/langs/he_IL/users.lang             |    9 +-
 htdocs/langs/he_IL/website.lang           |   12 +-
 htdocs/langs/he_IL/zapier.lang            |   14 +-
 htdocs/langs/hi_IN/accountancy.lang       |   26 +-
 htdocs/langs/hi_IN/admin.lang             |   57 +-
 htdocs/langs/hi_IN/banks.lang             |    3 +-
 htdocs/langs/hi_IN/bills.lang             |   30 +-
 htdocs/langs/hi_IN/boxes.lang             |   11 +-
 htdocs/langs/hi_IN/categories.lang        |    6 +-
 htdocs/langs/hi_IN/companies.lang         |   24 +-
 htdocs/langs/hi_IN/compta.lang            |   26 +-
 htdocs/langs/hi_IN/ecm.lang               |    4 +
 htdocs/langs/hi_IN/errors.lang            |    9 +
 htdocs/langs/hi_IN/externalsite.lang      |    2 +-
 htdocs/langs/hi_IN/main.lang              |   19 +-
 htdocs/langs/hi_IN/margins.lang           |    2 +-
 htdocs/langs/hi_IN/members.lang           |    9 +
 htdocs/langs/hi_IN/modulebuilder.lang     |    4 +-
 htdocs/langs/hi_IN/orders.lang            |    2 +
 htdocs/langs/hi_IN/other.lang             |    2 +
 htdocs/langs/hi_IN/productbatch.lang      |   15 +-
 htdocs/langs/hi_IN/products.lang          |    3 +-
 htdocs/langs/hi_IN/projects.lang          |    5 +
 htdocs/langs/hi_IN/propal.lang            |    7 +-
 htdocs/langs/hi_IN/stocks.lang            |   35 +-
 htdocs/langs/hi_IN/suppliers.lang         |    1 +
 htdocs/langs/hi_IN/ticket.lang            |   20 +-
 htdocs/langs/hi_IN/users.lang             |    9 +-
 htdocs/langs/hi_IN/website.lang           |   12 +-
 htdocs/langs/hi_IN/zapier.lang            |   14 +-
 htdocs/langs/hr_HR/accountancy.lang       |   28 +-
 htdocs/langs/hr_HR/admin.lang             |   75 +-
 htdocs/langs/hr_HR/banks.lang             |    3 +-
 htdocs/langs/hr_HR/bills.lang             |   26 +-
 htdocs/langs/hr_HR/boxes.lang             |   11 +-
 htdocs/langs/hr_HR/categories.lang        |    6 +-
 htdocs/langs/hr_HR/companies.lang         |   24 +-
 htdocs/langs/hr_HR/compta.lang            |   26 +-
 htdocs/langs/hr_HR/dict.lang              |   52 +-
 htdocs/langs/hr_HR/donations.lang         |    3 +-
 htdocs/langs/hr_HR/ecm.lang               |    4 +
 htdocs/langs/hr_HR/errors.lang            |    9 +
 htdocs/langs/hr_HR/externalsite.lang      |    2 +-
 htdocs/langs/hr_HR/interventions.lang     |   11 +-
 htdocs/langs/hr_HR/loan.lang              |    4 +-
 htdocs/langs/hr_HR/main.lang              |   23 +-
 htdocs/langs/hr_HR/margins.lang           |    5 +-
 htdocs/langs/hr_HR/members.lang           |   13 +-
 htdocs/langs/hr_HR/modulebuilder.lang     |    4 +-
 htdocs/langs/hr_HR/orders.lang            |    2 +
 htdocs/langs/hr_HR/other.lang             |    2 +
 htdocs/langs/hr_HR/productbatch.lang      |   25 +-
 htdocs/langs/hr_HR/products.lang          |    3 +-
 htdocs/langs/hr_HR/projects.lang          |    5 +
 htdocs/langs/hr_HR/propal.lang            |    7 +-
 htdocs/langs/hr_HR/stocks.lang            |   35 +-
 htdocs/langs/hr_HR/suppliers.lang         |    1 +
 htdocs/langs/hr_HR/ticket.lang            |   20 +-
 htdocs/langs/hr_HR/users.lang             |    9 +-
 htdocs/langs/hr_HR/website.lang           |   12 +-
 htdocs/langs/hr_HR/zapier.lang            |   14 +-
 htdocs/langs/hu_HU/accountancy.lang       |   26 +-
 htdocs/langs/hu_HU/admin.lang             |   57 +-
 htdocs/langs/hu_HU/banks.lang             |    3 +-
 htdocs/langs/hu_HU/bills.lang             |   30 +-
 htdocs/langs/hu_HU/boxes.lang             |   11 +-
 htdocs/langs/hu_HU/categories.lang        |    6 +-
 htdocs/langs/hu_HU/companies.lang         |   24 +-
 htdocs/langs/hu_HU/compta.lang            |   26 +-
 htdocs/langs/hu_HU/ecm.lang               |    4 +
 htdocs/langs/hu_HU/errors.lang            |    9 +
 htdocs/langs/hu_HU/externalsite.lang      |    2 +-
 htdocs/langs/hu_HU/main.lang              |   19 +-
 htdocs/langs/hu_HU/margins.lang           |    9 +-
 htdocs/langs/hu_HU/members.lang           |    9 +
 htdocs/langs/hu_HU/modulebuilder.lang     |    4 +-
 htdocs/langs/hu_HU/orders.lang            |    7 +-
 htdocs/langs/hu_HU/other.lang             |    2 +
 htdocs/langs/hu_HU/productbatch.lang      |   15 +-
 htdocs/langs/hu_HU/products.lang          |    3 +-
 htdocs/langs/hu_HU/projects.lang          |    5 +
 htdocs/langs/hu_HU/propal.lang            |    7 +-
 htdocs/langs/hu_HU/stocks.lang            |   35 +-
 htdocs/langs/hu_HU/suppliers.lang         |    1 +
 htdocs/langs/hu_HU/ticket.lang            |   20 +-
 htdocs/langs/hu_HU/users.lang             |    9 +-
 htdocs/langs/hu_HU/website.lang           |   12 +-
 htdocs/langs/hu_HU/zapier.lang            |   14 +-
 htdocs/langs/id_ID/accountancy.lang       |  104 +-
 htdocs/langs/id_ID/admin.lang             |   59 +-
 htdocs/langs/id_ID/agenda.lang            |   12 +-
 htdocs/langs/id_ID/banks.lang             |    3 +-
 htdocs/langs/id_ID/bills.lang             |   30 +-
 htdocs/langs/id_ID/boxes.lang             |   11 +-
 htdocs/langs/id_ID/categories.lang        |   12 +-
 htdocs/langs/id_ID/commercial.lang        |    5 +-
 htdocs/langs/id_ID/companies.lang         |   34 +-
 htdocs/langs/id_ID/compta.lang            |   24 +-
 htdocs/langs/id_ID/cron.lang              |    6 +-
 htdocs/langs/id_ID/dict.lang              |    2 +-
 htdocs/langs/id_ID/ecm.lang               |    4 +
 htdocs/langs/id_ID/errors.lang            |   13 +-
 htdocs/langs/id_ID/externalsite.lang      |    2 +-
 htdocs/langs/id_ID/ftp.lang               |   18 +-
 htdocs/langs/id_ID/holiday.lang           |   30 +-
 htdocs/langs/id_ID/mails.lang             |   12 +-
 htdocs/langs/id_ID/main.lang              |  177 +-
 htdocs/langs/id_ID/margins.lang           |    2 +-
 htdocs/langs/id_ID/members.lang           |    9 +
 htdocs/langs/id_ID/modulebuilder.lang     |    4 +-
 htdocs/langs/id_ID/orders.lang            |    2 +
 htdocs/langs/id_ID/other.lang             |    2 +
 htdocs/langs/id_ID/productbatch.lang      |   15 +-
 htdocs/langs/id_ID/products.lang          |    9 +-
 htdocs/langs/id_ID/projects.lang          |    5 +
 htdocs/langs/id_ID/propal.lang            |    7 +-
 htdocs/langs/id_ID/recruitment.lang       |   90 +-
 htdocs/langs/id_ID/stocks.lang            |   35 +-
 htdocs/langs/id_ID/suppliers.lang         |    1 +
 htdocs/langs/id_ID/ticket.lang            |   20 +-
 htdocs/langs/id_ID/users.lang             |    9 +-
 htdocs/langs/id_ID/website.lang           |   12 +-
 htdocs/langs/id_ID/zapier.lang            |   14 +-
 htdocs/langs/is_IS/accountancy.lang       |   26 +-
 htdocs/langs/is_IS/admin.lang             |   57 +-
 htdocs/langs/is_IS/banks.lang             |    3 +-
 htdocs/langs/is_IS/bills.lang             |   30 +-
 htdocs/langs/is_IS/boxes.lang             |   11 +-
 htdocs/langs/is_IS/categories.lang        |    6 +-
 htdocs/langs/is_IS/companies.lang         |   24 +-
 htdocs/langs/is_IS/compta.lang            |   26 +-
 htdocs/langs/is_IS/ecm.lang               |    4 +
 htdocs/langs/is_IS/errors.lang            |    9 +
 htdocs/langs/is_IS/externalsite.lang      |    2 +-
 htdocs/langs/is_IS/main.lang              |   19 +-
 htdocs/langs/is_IS/margins.lang           |    9 +-
 htdocs/langs/is_IS/members.lang           |    9 +
 htdocs/langs/is_IS/modulebuilder.lang     |    4 +-
 htdocs/langs/is_IS/orders.lang            |    5 +-
 htdocs/langs/is_IS/other.lang             |    2 +
 htdocs/langs/is_IS/productbatch.lang      |   15 +-
 htdocs/langs/is_IS/products.lang          |    3 +-
 htdocs/langs/is_IS/projects.lang          |    5 +
 htdocs/langs/is_IS/propal.lang            |    7 +-
 htdocs/langs/is_IS/stocks.lang            |   35 +-
 htdocs/langs/is_IS/suppliers.lang         |    1 +
 htdocs/langs/is_IS/ticket.lang            |   20 +-
 htdocs/langs/is_IS/users.lang             |    9 +-
 htdocs/langs/is_IS/website.lang           |   12 +-
 htdocs/langs/is_IS/zapier.lang            |   14 +-
 htdocs/langs/it_CH/admin.lang             |    1 +
 htdocs/langs/it_CH/modulebuilder.lang     |    2 +
 htdocs/langs/it_CH/products.lang          |    2 -
 htdocs/langs/it_IT/accountancy.lang       |   26 +-
 htdocs/langs/it_IT/admin.lang             |   77 +-
 htdocs/langs/it_IT/banks.lang             |    3 +-
 htdocs/langs/it_IT/bills.lang             |   35 +-
 htdocs/langs/it_IT/boxes.lang             |   11 +-
 htdocs/langs/it_IT/categories.lang        |    6 +-
 htdocs/langs/it_IT/companies.lang         |   34 +-
 htdocs/langs/it_IT/compta.lang            |   26 +-
 htdocs/langs/it_IT/ecm.lang               |    4 +
 htdocs/langs/it_IT/errors.lang            |   11 +-
 htdocs/langs/it_IT/externalsite.lang      |    2 +-
 htdocs/langs/it_IT/main.lang              |   27 +-
 htdocs/langs/it_IT/margins.lang           |    2 +-
 htdocs/langs/it_IT/members.lang           |    9 +
 htdocs/langs/it_IT/modulebuilder.lang     |    4 +-
 htdocs/langs/it_IT/orders.lang            |   10 +-
 htdocs/langs/it_IT/other.lang             |    2 +
 htdocs/langs/it_IT/productbatch.lang      |   15 +-
 htdocs/langs/it_IT/products.lang          |    5 +-
 htdocs/langs/it_IT/projects.lang          |    5 +
 htdocs/langs/it_IT/propal.lang            |    1 +
 htdocs/langs/it_IT/stocks.lang            |   43 +-
 htdocs/langs/it_IT/suppliers.lang         |    1 +
 htdocs/langs/it_IT/ticket.lang            |   70 +-
 htdocs/langs/it_IT/users.lang             |    4 +-
 htdocs/langs/it_IT/website.lang           |   22 +-
 htdocs/langs/it_IT/zapier.lang            |   14 +-
 htdocs/langs/ja_JP/accountancy.lang       |   32 +-
 htdocs/langs/ja_JP/admin.lang             |   67 +-
 htdocs/langs/ja_JP/banks.lang             |    7 +-
 htdocs/langs/ja_JP/bills.lang             |   17 +-
 htdocs/langs/ja_JP/boxes.lang             |   11 +-
 htdocs/langs/ja_JP/categories.lang        |    2 +-
 htdocs/langs/ja_JP/companies.lang         |   28 +-
 htdocs/langs/ja_JP/compta.lang            |   24 +-
 htdocs/langs/ja_JP/dict.lang              |   20 +-
 htdocs/langs/ja_JP/ecm.lang               |    4 +
 htdocs/langs/ja_JP/errors.lang            |   11 +-
 htdocs/langs/ja_JP/externalsite.lang      |    2 +-
 htdocs/langs/ja_JP/install.lang           |   18 +-
 htdocs/langs/ja_JP/languages.lang         |    6 +-
 htdocs/langs/ja_JP/main.lang              |   43 +-
 htdocs/langs/ja_JP/margins.lang           |    2 +-
 htdocs/langs/ja_JP/members.lang           |   13 +-
 htdocs/langs/ja_JP/modulebuilder.lang     |    6 +-
 htdocs/langs/ja_JP/orders.lang            |   18 +-
 htdocs/langs/ja_JP/other.lang             |   20 +-
 htdocs/langs/ja_JP/productbatch.lang      |   57 +-
 htdocs/langs/ja_JP/products.lang          |   15 +-
 htdocs/langs/ja_JP/projects.lang          |    7 +-
 htdocs/langs/ja_JP/propal.lang            |    3 +-
 htdocs/langs/ja_JP/stocks.lang            |   29 +-
 htdocs/langs/ja_JP/suppliers.lang         |    3 +-
 htdocs/langs/ja_JP/ticket.lang            |   22 +-
 htdocs/langs/ja_JP/users.lang             |    4 +-
 htdocs/langs/ja_JP/website.lang           |   16 +-
 htdocs/langs/ja_JP/zapier.lang            |   20 +-
 htdocs/langs/ka_GE/accountancy.lang       |   26 +-
 htdocs/langs/ka_GE/admin.lang             |   57 +-
 htdocs/langs/ka_GE/banks.lang             |    3 +-
 htdocs/langs/ka_GE/bills.lang             |   30 +-
 htdocs/langs/ka_GE/boxes.lang             |   11 +-
 htdocs/langs/ka_GE/categories.lang        |    6 +-
 htdocs/langs/ka_GE/companies.lang         |   24 +-
 htdocs/langs/ka_GE/compta.lang            |   26 +-
 htdocs/langs/ka_GE/ecm.lang               |    4 +
 htdocs/langs/ka_GE/errors.lang            |    9 +
 htdocs/langs/ka_GE/externalsite.lang      |    2 +-
 htdocs/langs/ka_GE/main.lang              |   19 +-
 htdocs/langs/ka_GE/margins.lang           |    9 +-
 htdocs/langs/ka_GE/members.lang           |    9 +
 htdocs/langs/ka_GE/modulebuilder.lang     |    4 +-
 htdocs/langs/ka_GE/orders.lang            |    5 +-
 htdocs/langs/ka_GE/other.lang             |    2 +
 htdocs/langs/ka_GE/productbatch.lang      |   15 +-
 htdocs/langs/ka_GE/products.lang          |    3 +-
 htdocs/langs/ka_GE/projects.lang          |    5 +
 htdocs/langs/ka_GE/propal.lang            |    7 +-
 htdocs/langs/ka_GE/stocks.lang            |   35 +-
 htdocs/langs/ka_GE/suppliers.lang         |    1 +
 htdocs/langs/ka_GE/ticket.lang            |   20 +-
 htdocs/langs/ka_GE/users.lang             |    9 +-
 htdocs/langs/ka_GE/website.lang           |   12 +-
 htdocs/langs/ka_GE/zapier.lang            |   14 +-
 htdocs/langs/km_KH/accountancy.lang       |   26 +-
 htdocs/langs/km_KH/admin.lang             |   57 +-
 htdocs/langs/km_KH/banks.lang             |    3 +-
 htdocs/langs/km_KH/bills.lang             |   30 +-
 htdocs/langs/km_KH/boxes.lang             |   11 +-
 htdocs/langs/km_KH/categories.lang        |    6 +-
 htdocs/langs/km_KH/companies.lang         |   24 +-
 htdocs/langs/km_KH/compta.lang            |   26 +-
 htdocs/langs/km_KH/ecm.lang               |    4 +
 htdocs/langs/km_KH/errors.lang            |    9 +
 htdocs/langs/km_KH/externalsite.lang      |    2 +-
 htdocs/langs/km_KH/main.lang              |   19 +-
 htdocs/langs/km_KH/margins.lang           |    2 +-
 htdocs/langs/km_KH/members.lang           |    9 +
 htdocs/langs/km_KH/modulebuilder.lang     |    4 +-
 htdocs/langs/km_KH/orders.lang            |    2 +
 htdocs/langs/km_KH/other.lang             |    2 +
 htdocs/langs/km_KH/productbatch.lang      |   15 +-
 htdocs/langs/km_KH/products.lang          |    3 +-
 htdocs/langs/km_KH/projects.lang          |    5 +
 htdocs/langs/km_KH/propal.lang            |    7 +-
 htdocs/langs/km_KH/stocks.lang            |   35 +-
 htdocs/langs/km_KH/suppliers.lang         |    1 +
 htdocs/langs/km_KH/ticket.lang            |   20 +-
 htdocs/langs/km_KH/users.lang             |    9 +-
 htdocs/langs/km_KH/website.lang           |   12 +-
 htdocs/langs/km_KH/zapier.lang            |   14 +-
 htdocs/langs/kn_IN/accountancy.lang       |   26 +-
 htdocs/langs/kn_IN/admin.lang             |   57 +-
 htdocs/langs/kn_IN/banks.lang             |    3 +-
 htdocs/langs/kn_IN/bills.lang             |   30 +-
 htdocs/langs/kn_IN/boxes.lang             |   11 +-
 htdocs/langs/kn_IN/categories.lang        |    6 +-
 htdocs/langs/kn_IN/companies.lang         |   24 +-
 htdocs/langs/kn_IN/compta.lang            |   26 +-
 htdocs/langs/kn_IN/ecm.lang               |    4 +
 htdocs/langs/kn_IN/errors.lang            |    9 +
 htdocs/langs/kn_IN/externalsite.lang      |    2 +-
 htdocs/langs/kn_IN/main.lang              |   19 +-
 htdocs/langs/kn_IN/margins.lang           |    9 +-
 htdocs/langs/kn_IN/members.lang           |    9 +
 htdocs/langs/kn_IN/modulebuilder.lang     |    4 +-
 htdocs/langs/kn_IN/orders.lang            |    5 +-
 htdocs/langs/kn_IN/other.lang             |    2 +
 htdocs/langs/kn_IN/productbatch.lang      |   15 +-
 htdocs/langs/kn_IN/products.lang          |    3 +-
 htdocs/langs/kn_IN/projects.lang          |    5 +
 htdocs/langs/kn_IN/propal.lang            |    7 +-
 htdocs/langs/kn_IN/stocks.lang            |   35 +-
 htdocs/langs/kn_IN/suppliers.lang         |    1 +
 htdocs/langs/kn_IN/ticket.lang            |   20 +-
 htdocs/langs/kn_IN/users.lang             |    9 +-
 htdocs/langs/kn_IN/website.lang           |   12 +-
 htdocs/langs/kn_IN/zapier.lang            |   14 +-
 htdocs/langs/ko_KR/accountancy.lang       |   26 +-
 htdocs/langs/ko_KR/admin.lang             |   57 +-
 htdocs/langs/ko_KR/banks.lang             |    3 +-
 htdocs/langs/ko_KR/bills.lang             |   28 +-
 htdocs/langs/ko_KR/boxes.lang             |   11 +-
 htdocs/langs/ko_KR/categories.lang        |    6 +-
 htdocs/langs/ko_KR/companies.lang         |   24 +-
 htdocs/langs/ko_KR/compta.lang            |   26 +-
 htdocs/langs/ko_KR/ecm.lang               |    4 +
 htdocs/langs/ko_KR/errors.lang            |    9 +
 htdocs/langs/ko_KR/externalsite.lang      |    2 +-
 htdocs/langs/ko_KR/main.lang              |   19 +-
 htdocs/langs/ko_KR/margins.lang           |    9 +-
 htdocs/langs/ko_KR/members.lang           |    9 +
 htdocs/langs/ko_KR/modulebuilder.lang     |    4 +-
 htdocs/langs/ko_KR/orders.lang            |    5 +-
 htdocs/langs/ko_KR/other.lang             |    2 +
 htdocs/langs/ko_KR/productbatch.lang      |   15 +-
 htdocs/langs/ko_KR/products.lang          |    3 +-
 htdocs/langs/ko_KR/projects.lang          |    5 +
 htdocs/langs/ko_KR/propal.lang            |    3 +-
 htdocs/langs/ko_KR/stocks.lang            |   35 +-
 htdocs/langs/ko_KR/suppliers.lang         |    1 +
 htdocs/langs/ko_KR/ticket.lang            |   20 +-
 htdocs/langs/ko_KR/users.lang             |    9 +-
 htdocs/langs/ko_KR/website.lang           |   12 +-
 htdocs/langs/ko_KR/zapier.lang            |   14 +-
 htdocs/langs/lo_LA/accountancy.lang       |   26 +-
 htdocs/langs/lo_LA/admin.lang             |   57 +-
 htdocs/langs/lo_LA/banks.lang             |    3 +-
 htdocs/langs/lo_LA/bills.lang             |   30 +-
 htdocs/langs/lo_LA/boxes.lang             |   11 +-
 htdocs/langs/lo_LA/categories.lang        |    6 +-
 htdocs/langs/lo_LA/companies.lang         |   24 +-
 htdocs/langs/lo_LA/compta.lang            |   26 +-
 htdocs/langs/lo_LA/ecm.lang               |    4 +
 htdocs/langs/lo_LA/errors.lang            |    9 +
 htdocs/langs/lo_LA/externalsite.lang      |    2 +-
 htdocs/langs/lo_LA/main.lang              |   19 +-
 htdocs/langs/lo_LA/margins.lang           |    9 +-
 htdocs/langs/lo_LA/members.lang           |    9 +
 htdocs/langs/lo_LA/modulebuilder.lang     |    4 +-
 htdocs/langs/lo_LA/orders.lang            |    5 +-
 htdocs/langs/lo_LA/other.lang             |    2 +
 htdocs/langs/lo_LA/productbatch.lang      |   15 +-
 htdocs/langs/lo_LA/products.lang          |    3 +-
 htdocs/langs/lo_LA/projects.lang          |    5 +
 htdocs/langs/lo_LA/propal.lang            |    7 +-
 htdocs/langs/lo_LA/stocks.lang            |   35 +-
 htdocs/langs/lo_LA/suppliers.lang         |    1 +
 htdocs/langs/lo_LA/ticket.lang            |   20 +-
 htdocs/langs/lo_LA/users.lang             |    9 +-
 htdocs/langs/lo_LA/website.lang           |   12 +-
 htdocs/langs/lo_LA/zapier.lang            |   14 +-
 htdocs/langs/lt_LT/accountancy.lang       |   26 +-
 htdocs/langs/lt_LT/admin.lang             |   57 +-
 htdocs/langs/lt_LT/banks.lang             |    3 +-
 htdocs/langs/lt_LT/bills.lang             |   30 +-
 htdocs/langs/lt_LT/boxes.lang             |   11 +-
 htdocs/langs/lt_LT/categories.lang        |    6 +-
 htdocs/langs/lt_LT/companies.lang         |   24 +-
 htdocs/langs/lt_LT/compta.lang            |   26 +-
 htdocs/langs/lt_LT/ecm.lang               |    4 +
 htdocs/langs/lt_LT/errors.lang            |    9 +
 htdocs/langs/lt_LT/externalsite.lang      |    2 +-
 htdocs/langs/lt_LT/main.lang              |   19 +-
 htdocs/langs/lt_LT/margins.lang           |    9 +-
 htdocs/langs/lt_LT/members.lang           |    9 +
 htdocs/langs/lt_LT/modulebuilder.lang     |    4 +-
 htdocs/langs/lt_LT/orders.lang            |    5 +-
 htdocs/langs/lt_LT/other.lang             |    2 +
 htdocs/langs/lt_LT/productbatch.lang      |   15 +-
 htdocs/langs/lt_LT/products.lang          |    3 +-
 htdocs/langs/lt_LT/projects.lang          |    5 +
 htdocs/langs/lt_LT/propal.lang            |    7 +-
 htdocs/langs/lt_LT/stocks.lang            |   35 +-
 htdocs/langs/lt_LT/suppliers.lang         |    1 +
 htdocs/langs/lt_LT/ticket.lang            |   20 +-
 htdocs/langs/lt_LT/users.lang             |    9 +-
 htdocs/langs/lt_LT/website.lang           |   12 +-
 htdocs/langs/lt_LT/zapier.lang            |   14 +-
 htdocs/langs/lv_LV/accountancy.lang       |   58 +-
 htdocs/langs/lv_LV/admin.lang             |  139 +-
 htdocs/langs/lv_LV/banks.lang             |    9 +-
 htdocs/langs/lv_LV/bills.lang             |   25 +-
 htdocs/langs/lv_LV/boxes.lang             |   21 +-
 htdocs/langs/lv_LV/categories.lang        |   32 +-
 htdocs/langs/lv_LV/companies.lang         |   40 +-
 htdocs/langs/lv_LV/compta.lang            |   34 +-
 htdocs/langs/lv_LV/ecm.lang               |    6 +-
 htdocs/langs/lv_LV/errors.lang            |   31 +-
 htdocs/langs/lv_LV/externalsite.lang      |    2 +-
 htdocs/langs/lv_LV/main.lang              |   49 +-
 htdocs/langs/lv_LV/margins.lang           |    2 +-
 htdocs/langs/lv_LV/members.lang           |   13 +-
 htdocs/langs/lv_LV/modulebuilder.lang     |   10 +-
 htdocs/langs/lv_LV/orders.lang            |    2 +
 htdocs/langs/lv_LV/other.lang             |    8 +-
 htdocs/langs/lv_LV/productbatch.lang      |   37 +-
 htdocs/langs/lv_LV/products.lang          |   17 +-
 htdocs/langs/lv_LV/projects.lang          |    7 +-
 htdocs/langs/lv_LV/propal.lang            |    7 +-
 htdocs/langs/lv_LV/stocks.lang            |   45 +-
 htdocs/langs/lv_LV/suppliers.lang         |    3 +-
 htdocs/langs/lv_LV/ticket.lang            |   22 +-
 htdocs/langs/lv_LV/users.lang             |    2 +-
 htdocs/langs/lv_LV/website.lang           |   18 +-
 htdocs/langs/lv_LV/zapier.lang            |   16 +-
 htdocs/langs/mk_MK/accountancy.lang       |   26 +-
 htdocs/langs/mk_MK/admin.lang             |   57 +-
 htdocs/langs/mk_MK/banks.lang             |    3 +-
 htdocs/langs/mk_MK/bills.lang             |   30 +-
 htdocs/langs/mk_MK/boxes.lang             |   11 +-
 htdocs/langs/mk_MK/categories.lang        |    6 +-
 htdocs/langs/mk_MK/companies.lang         |   24 +-
 htdocs/langs/mk_MK/compta.lang            |   26 +-
 htdocs/langs/mk_MK/ecm.lang               |    4 +
 htdocs/langs/mk_MK/errors.lang            |    9 +
 htdocs/langs/mk_MK/externalsite.lang      |    2 +-
 htdocs/langs/mk_MK/main.lang              |   19 +-
 htdocs/langs/mk_MK/margins.lang           |   63 +-
 htdocs/langs/mk_MK/members.lang           |    9 +
 htdocs/langs/mk_MK/modulebuilder.lang     |    4 +-
 htdocs/langs/mk_MK/orders.lang            |    5 +-
 htdocs/langs/mk_MK/other.lang             |    2 +
 htdocs/langs/mk_MK/productbatch.lang      |   15 +-
 htdocs/langs/mk_MK/products.lang          |    3 +-
 htdocs/langs/mk_MK/projects.lang          |    5 +
 htdocs/langs/mk_MK/propal.lang            |    7 +-
 htdocs/langs/mk_MK/stocks.lang            |   35 +-
 htdocs/langs/mk_MK/suppliers.lang         |    1 +
 htdocs/langs/mk_MK/ticket.lang            |   20 +-
 htdocs/langs/mk_MK/users.lang             |    9 +-
 htdocs/langs/mk_MK/website.lang           |   12 +-
 htdocs/langs/mk_MK/zapier.lang            |   14 +-
 htdocs/langs/mn_MN/accountancy.lang       |   26 +-
 htdocs/langs/mn_MN/admin.lang             |   57 +-
 htdocs/langs/mn_MN/banks.lang             |    3 +-
 htdocs/langs/mn_MN/bills.lang             |   30 +-
 htdocs/langs/mn_MN/boxes.lang             |   11 +-
 htdocs/langs/mn_MN/categories.lang        |    6 +-
 htdocs/langs/mn_MN/companies.lang         |   24 +-
 htdocs/langs/mn_MN/compta.lang            |   26 +-
 htdocs/langs/mn_MN/ecm.lang               |    4 +
 htdocs/langs/mn_MN/errors.lang            |    9 +
 htdocs/langs/mn_MN/externalsite.lang      |    2 +-
 htdocs/langs/mn_MN/main.lang              |   19 +-
 htdocs/langs/mn_MN/margins.lang           |    9 +-
 htdocs/langs/mn_MN/members.lang           |    9 +
 htdocs/langs/mn_MN/modulebuilder.lang     |    4 +-
 htdocs/langs/mn_MN/orders.lang            |    5 +-
 htdocs/langs/mn_MN/other.lang             |    2 +
 htdocs/langs/mn_MN/productbatch.lang      |   15 +-
 htdocs/langs/mn_MN/products.lang          |    3 +-
 htdocs/langs/mn_MN/projects.lang          |    5 +
 htdocs/langs/mn_MN/propal.lang            |    7 +-
 htdocs/langs/mn_MN/stocks.lang            |   35 +-
 htdocs/langs/mn_MN/suppliers.lang         |    1 +
 htdocs/langs/mn_MN/ticket.lang            |   20 +-
 htdocs/langs/mn_MN/users.lang             |    9 +-
 htdocs/langs/mn_MN/website.lang           |   12 +-
 htdocs/langs/mn_MN/zapier.lang            |   14 +-
 htdocs/langs/nb_NO/accountancy.lang       |   26 +-
 htdocs/langs/nb_NO/admin.lang             |   59 +-
 htdocs/langs/nb_NO/banks.lang             |    3 +-
 htdocs/langs/nb_NO/bills.lang             |   23 +-
 htdocs/langs/nb_NO/boxes.lang             |   11 +-
 htdocs/langs/nb_NO/categories.lang        |    6 +-
 htdocs/langs/nb_NO/companies.lang         |   24 +-
 htdocs/langs/nb_NO/compta.lang            |   26 +-
 htdocs/langs/nb_NO/ecm.lang               |    4 +
 htdocs/langs/nb_NO/errors.lang            |    9 +
 htdocs/langs/nb_NO/externalsite.lang      |    2 +-
 htdocs/langs/nb_NO/main.lang              |   19 +-
 htdocs/langs/nb_NO/margins.lang           |    4 +-
 htdocs/langs/nb_NO/members.lang           |    9 +
 htdocs/langs/nb_NO/modulebuilder.lang     |    4 +-
 htdocs/langs/nb_NO/orders.lang            |    5 +-
 htdocs/langs/nb_NO/other.lang             |    2 +
 htdocs/langs/nb_NO/productbatch.lang      |   17 +-
 htdocs/langs/nb_NO/products.lang          |    3 +-
 htdocs/langs/nb_NO/projects.lang          |    5 +
 htdocs/langs/nb_NO/propal.lang            |    1 +
 htdocs/langs/nb_NO/salaries.lang          |    5 +-
 htdocs/langs/nb_NO/stocks.lang            |   35 +-
 htdocs/langs/nb_NO/suppliers.lang         |    1 +
 htdocs/langs/nb_NO/ticket.lang            |   20 +-
 htdocs/langs/nb_NO/users.lang             |    2 +-
 htdocs/langs/nb_NO/website.lang           |   12 +-
 htdocs/langs/nb_NO/zapier.lang            |   16 +-
 htdocs/langs/ne_NP/accountancy.lang       |   26 +-
 htdocs/langs/ne_NP/admin.lang             |   57 +-
 htdocs/langs/ne_NP/banks.lang             |    3 +-
 htdocs/langs/ne_NP/bills.lang             |   30 +-
 htdocs/langs/ne_NP/boxes.lang             |   11 +-
 htdocs/langs/ne_NP/categories.lang        |    6 +-
 htdocs/langs/ne_NP/companies.lang         |   24 +-
 htdocs/langs/ne_NP/compta.lang            |   26 +-
 htdocs/langs/ne_NP/ecm.lang               |    4 +
 htdocs/langs/ne_NP/errors.lang            |    9 +
 htdocs/langs/ne_NP/externalsite.lang      |    2 +-
 htdocs/langs/ne_NP/main.lang              |   19 +-
 htdocs/langs/ne_NP/margins.lang           |    2 +-
 htdocs/langs/ne_NP/members.lang           |    9 +
 htdocs/langs/ne_NP/modulebuilder.lang     |    4 +-
 htdocs/langs/ne_NP/orders.lang            |    2 +
 htdocs/langs/ne_NP/other.lang             |    2 +
 htdocs/langs/ne_NP/productbatch.lang      |   15 +-
 htdocs/langs/ne_NP/products.lang          |    3 +-
 htdocs/langs/ne_NP/projects.lang          |    5 +
 htdocs/langs/ne_NP/propal.lang            |    7 +-
 htdocs/langs/ne_NP/stocks.lang            |   35 +-
 htdocs/langs/ne_NP/suppliers.lang         |    1 +
 htdocs/langs/ne_NP/ticket.lang            |   20 +-
 htdocs/langs/ne_NP/users.lang             |    9 +-
 htdocs/langs/ne_NP/website.lang           |   12 +-
 htdocs/langs/ne_NP/zapier.lang            |   14 +-
 htdocs/langs/nl_BE/accountancy.lang       |    1 -
 htdocs/langs/nl_BE/admin.lang             |    3 +-
 htdocs/langs/nl_BE/bills.lang             |    2 +
 htdocs/langs/nl_BE/boxes.lang             |    1 -
 htdocs/langs/nl_BE/categories.lang        |    1 -
 htdocs/langs/nl_BE/companies.lang         |    2 -
 htdocs/langs/nl_BE/compta.lang            |    2 -
 htdocs/langs/nl_BE/externalsite.lang      |    1 -
 htdocs/langs/nl_BE/main.lang              |    2 +-
 htdocs/langs/nl_BE/margins.lang           |    1 -
 htdocs/langs/nl_BE/modulebuilder.lang     |    2 +
 htdocs/langs/nl_BE/ticket.lang            |    2 -
 htdocs/langs/nl_BE/withdrawals.lang       |    2 -
 htdocs/langs/nl_NL/accountancy.lang       |   38 +-
 htdocs/langs/nl_NL/admin.lang             |   61 +-
 htdocs/langs/nl_NL/banks.lang             |    5 +-
 htdocs/langs/nl_NL/bills.lang             |   25 +-
 htdocs/langs/nl_NL/boxes.lang             |   15 +-
 htdocs/langs/nl_NL/categories.lang        |    6 +-
 htdocs/langs/nl_NL/companies.lang         |   24 +-
 htdocs/langs/nl_NL/compta.lang            |   26 +-
 htdocs/langs/nl_NL/ecm.lang               |    4 +
 htdocs/langs/nl_NL/errors.lang            |    9 +
 htdocs/langs/nl_NL/externalsite.lang      |    2 +-
 htdocs/langs/nl_NL/main.lang              |   21 +-
 htdocs/langs/nl_NL/margins.lang           |    2 +-
 htdocs/langs/nl_NL/members.lang           |    9 +
 htdocs/langs/nl_NL/modulebuilder.lang     |    4 +-
 htdocs/langs/nl_NL/orders.lang            |    2 +
 htdocs/langs/nl_NL/other.lang             |    2 +
 htdocs/langs/nl_NL/productbatch.lang      |   15 +-
 htdocs/langs/nl_NL/products.lang          |    5 +-
 htdocs/langs/nl_NL/projects.lang          |    5 +
 htdocs/langs/nl_NL/propal.lang            |    1 +
 htdocs/langs/nl_NL/stocks.lang            |   35 +-
 htdocs/langs/nl_NL/suppliers.lang         |    1 +
 htdocs/langs/nl_NL/ticket.lang            |   20 +-
 htdocs/langs/nl_NL/users.lang             |    2 +-
 htdocs/langs/nl_NL/website.lang           |   12 +-
 htdocs/langs/nl_NL/zapier.lang            |   14 +-
 htdocs/langs/pl_PL/accountancy.lang       |  404 ++--
 htdocs/langs/pl_PL/admin.lang             | 1539 +++++++-------
 htdocs/langs/pl_PL/banks.lang             |  107 +-
 htdocs/langs/pl_PL/bills.lang             |  498 ++---
 htdocs/langs/pl_PL/boxes.lang             |  127 +-
 htdocs/langs/pl_PL/categories.lang        |   50 +-
 htdocs/langs/pl_PL/companies.lang         |  170 +-
 htdocs/langs/pl_PL/compta.lang            |  264 +--
 htdocs/langs/pl_PL/ecm.lang               |   34 +-
 htdocs/langs/pl_PL/errors.lang            |  271 +--
 htdocs/langs/pl_PL/externalsite.lang      |    2 +-
 htdocs/langs/pl_PL/main.lang              |  455 ++--
 htdocs/langs/pl_PL/margins.lang           |   13 +-
 htdocs/langs/pl_PL/members.lang           |  157 +-
 htdocs/langs/pl_PL/modulebuilder.lang     |  272 +--
 htdocs/langs/pl_PL/orders.lang            |   73 +-
 htdocs/langs/pl_PL/other.lang             |  254 +--
 htdocs/langs/pl_PL/productbatch.lang      |   17 +-
 htdocs/langs/pl_PL/products.lang          |  257 +--
 htdocs/langs/pl_PL/projects.lang          |  273 +--
 htdocs/langs/pl_PL/propal.lang            |   41 +-
 htdocs/langs/pl_PL/stocks.lang            |  205 +-
 htdocs/langs/pl_PL/suppliers.lang         |   23 +-
 htdocs/langs/pl_PL/ticket.lang            |  432 ++--
 htdocs/langs/pl_PL/users.lang             |   41 +-
 htdocs/langs/pl_PL/website.lang           |   56 +-
 htdocs/langs/pl_PL/zapier.lang            |   20 +-
 htdocs/langs/pt_AO/admin.lang             |    2 +
 htdocs/langs/pt_BR/accountancy.lang       |    7 +-
 htdocs/langs/pt_BR/admin.lang             |  127 +-
 htdocs/langs/pt_BR/agenda.lang            |    1 -
 htdocs/langs/pt_BR/banks.lang             |    8 +
 htdocs/langs/pt_BR/bills.lang             |   11 +-
 htdocs/langs/pt_BR/boxes.lang             |   17 +
 htdocs/langs/pt_BR/categories.lang        |   15 +-
 htdocs/langs/pt_BR/companies.lang         |    5 +-
 htdocs/langs/pt_BR/compta.lang            |    6 +-
 htdocs/langs/pt_BR/ecm.lang               |    4 +
 htdocs/langs/pt_BR/externalsite.lang      |    1 +
 htdocs/langs/pt_BR/main.lang              |    8 +-
 htdocs/langs/pt_BR/margins.lang           |    2 +-
 htdocs/langs/pt_BR/modulebuilder.lang     |    1 -
 htdocs/langs/pt_BR/orders.lang            |    3 +-
 htdocs/langs/pt_BR/productbatch.lang      |   10 +-
 htdocs/langs/pt_BR/products.lang          |    1 -
 htdocs/langs/pt_BR/propal.lang            |    4 +
 htdocs/langs/pt_BR/stocks.lang            |   19 +-
 htdocs/langs/pt_BR/suppliers.lang         |    1 +
 htdocs/langs/pt_BR/ticket.lang            |    4 -
 htdocs/langs/pt_BR/users.lang             |    3 +-
 htdocs/langs/pt_BR/website.lang           |    1 -
 htdocs/langs/pt_BR/zapier.lang            |    3 +-
 htdocs/langs/pt_PT/accountancy.lang       |   26 +-
 htdocs/langs/pt_PT/admin.lang             |   63 +-
 htdocs/langs/pt_PT/agenda.lang            |   42 +-
 htdocs/langs/pt_PT/banks.lang             |    3 +-
 htdocs/langs/pt_PT/bills.lang             |   23 +-
 htdocs/langs/pt_PT/boxes.lang             |   11 +-
 htdocs/langs/pt_PT/categories.lang        |    6 +-
 htdocs/langs/pt_PT/companies.lang         |   50 +-
 htdocs/langs/pt_PT/compta.lang            |   26 +-
 htdocs/langs/pt_PT/ecm.lang               |    4 +
 htdocs/langs/pt_PT/errors.lang            |    9 +
 htdocs/langs/pt_PT/externalsite.lang      |    4 +-
 htdocs/langs/pt_PT/interventions.lang     |    4 +-
 htdocs/langs/pt_PT/main.lang              |   19 +-
 htdocs/langs/pt_PT/margins.lang           |    7 +-
 htdocs/langs/pt_PT/members.lang           |    9 +
 htdocs/langs/pt_PT/modulebuilder.lang     |    4 +-
 htdocs/langs/pt_PT/orders.lang            |    5 +-
 htdocs/langs/pt_PT/other.lang             |    2 +
 htdocs/langs/pt_PT/productbatch.lang      |   15 +-
 htdocs/langs/pt_PT/products.lang          |    3 +-
 htdocs/langs/pt_PT/projects.lang          |    5 +
 htdocs/langs/pt_PT/propal.lang            |    7 +-
 htdocs/langs/pt_PT/stocks.lang            |   35 +-
 htdocs/langs/pt_PT/suppliers.lang         |    1 +
 htdocs/langs/pt_PT/ticket.lang            |   20 +-
 htdocs/langs/pt_PT/users.lang             |    9 +-
 htdocs/langs/pt_PT/website.lang           |   12 +-
 htdocs/langs/pt_PT/zapier.lang            |   14 +-
 htdocs/langs/ro_RO/accountancy.lang       |  304 +--
 htdocs/langs/ro_RO/admin.lang             | 2333 +++++++++++----------
 htdocs/langs/ro_RO/banks.lang             |  165 +-
 htdocs/langs/ro_RO/bills.lang             |  259 +--
 htdocs/langs/ro_RO/boxes.lang             |   77 +-
 htdocs/langs/ro_RO/categories.lang        |   20 +-
 htdocs/langs/ro_RO/companies.lang         |  266 +--
 htdocs/langs/ro_RO/compta.lang            |  284 +--
 htdocs/langs/ro_RO/ecm.lang               |   38 +-
 htdocs/langs/ro_RO/errors.lang            |  339 +--
 htdocs/langs/ro_RO/externalsite.lang      |    4 +-
 htdocs/langs/ro_RO/main.lang              |  447 ++--
 htdocs/langs/ro_RO/margins.lang           |   34 +-
 htdocs/langs/ro_RO/members.lang           |  261 +--
 htdocs/langs/ro_RO/modulebuilder.lang     |   98 +-
 htdocs/langs/ro_RO/orders.lang            |  164 +-
 htdocs/langs/ro_RO/other.lang             |  326 +--
 htdocs/langs/ro_RO/productbatch.lang      |   17 +-
 htdocs/langs/ro_RO/products.lang          |  379 ++--
 htdocs/langs/ro_RO/projects.lang          |  313 +--
 htdocs/langs/ro_RO/propal.lang            |   91 +-
 htdocs/langs/ro_RO/stocks.lang            |  267 +--
 htdocs/langs/ro_RO/suppliers.lang         |   61 +-
 htdocs/langs/ro_RO/ticket.lang            |  234 ++-
 htdocs/langs/ro_RO/trips.lang             |  118 +-
 htdocs/langs/ro_RO/users.lang             |  101 +-
 htdocs/langs/ro_RO/website.lang           |  132 +-
 htdocs/langs/ro_RO/zapier.lang            |   16 +-
 htdocs/langs/ru_RU/accountancy.lang       |   26 +-
 htdocs/langs/ru_RU/admin.lang             |   57 +-
 htdocs/langs/ru_RU/banks.lang             |    3 +-
 htdocs/langs/ru_RU/bills.lang             |   30 +-
 htdocs/langs/ru_RU/boxes.lang             |   11 +-
 htdocs/langs/ru_RU/categories.lang        |    6 +-
 htdocs/langs/ru_RU/companies.lang         |   24 +-
 htdocs/langs/ru_RU/compta.lang            |   26 +-
 htdocs/langs/ru_RU/ecm.lang               |    4 +
 htdocs/langs/ru_RU/errors.lang            |    9 +
 htdocs/langs/ru_RU/externalsite.lang      |    2 +-
 htdocs/langs/ru_RU/main.lang              |   19 +-
 htdocs/langs/ru_RU/margins.lang           |    9 +-
 htdocs/langs/ru_RU/members.lang           |    9 +
 htdocs/langs/ru_RU/modulebuilder.lang     |    4 +-
 htdocs/langs/ru_RU/orders.lang            |    5 +-
 htdocs/langs/ru_RU/other.lang             |    2 +
 htdocs/langs/ru_RU/productbatch.lang      |   15 +-
 htdocs/langs/ru_RU/products.lang          |    3 +-
 htdocs/langs/ru_RU/projects.lang          |    5 +
 htdocs/langs/ru_RU/propal.lang            |    7 +-
 htdocs/langs/ru_RU/stocks.lang            |   35 +-
 htdocs/langs/ru_RU/suppliers.lang         |    1 +
 htdocs/langs/ru_RU/ticket.lang            |   20 +-
 htdocs/langs/ru_RU/users.lang             |    9 +-
 htdocs/langs/ru_RU/website.lang           |   12 +-
 htdocs/langs/ru_RU/zapier.lang            |   14 +-
 htdocs/langs/ru_UA/admin.lang             |    2 +
 htdocs/langs/sk_SK/accountancy.lang       |   26 +-
 htdocs/langs/sk_SK/admin.lang             |   57 +-
 htdocs/langs/sk_SK/banks.lang             |    3 +-
 htdocs/langs/sk_SK/bills.lang             |   30 +-
 htdocs/langs/sk_SK/boxes.lang             |   11 +-
 htdocs/langs/sk_SK/categories.lang        |    6 +-
 htdocs/langs/sk_SK/companies.lang         |   24 +-
 htdocs/langs/sk_SK/compta.lang            |   26 +-
 htdocs/langs/sk_SK/ecm.lang               |    4 +
 htdocs/langs/sk_SK/errors.lang            |    9 +
 htdocs/langs/sk_SK/externalsite.lang      |    2 +-
 htdocs/langs/sk_SK/main.lang              |   19 +-
 htdocs/langs/sk_SK/margins.lang           |    9 +-
 htdocs/langs/sk_SK/members.lang           |    9 +
 htdocs/langs/sk_SK/modulebuilder.lang     |    4 +-
 htdocs/langs/sk_SK/orders.lang            |    5 +-
 htdocs/langs/sk_SK/other.lang             |    2 +
 htdocs/langs/sk_SK/productbatch.lang      |   15 +-
 htdocs/langs/sk_SK/products.lang          |    3 +-
 htdocs/langs/sk_SK/projects.lang          |    5 +
 htdocs/langs/sk_SK/propal.lang            |    7 +-
 htdocs/langs/sk_SK/stocks.lang            |   35 +-
 htdocs/langs/sk_SK/suppliers.lang         |    1 +
 htdocs/langs/sk_SK/ticket.lang            |   20 +-
 htdocs/langs/sk_SK/users.lang             |    9 +-
 htdocs/langs/sk_SK/website.lang           |   12 +-
 htdocs/langs/sk_SK/zapier.lang            |   14 +-
 htdocs/langs/sl_SI/accountancy.lang       |   26 +-
 htdocs/langs/sl_SI/admin.lang             |   57 +-
 htdocs/langs/sl_SI/banks.lang             |    3 +-
 htdocs/langs/sl_SI/bills.lang             |   26 +-
 htdocs/langs/sl_SI/boxes.lang             |   11 +-
 htdocs/langs/sl_SI/categories.lang        |    6 +-
 htdocs/langs/sl_SI/companies.lang         |   24 +-
 htdocs/langs/sl_SI/compta.lang            |   26 +-
 htdocs/langs/sl_SI/ecm.lang               |    4 +
 htdocs/langs/sl_SI/errors.lang            |    9 +
 htdocs/langs/sl_SI/externalsite.lang      |    2 +-
 htdocs/langs/sl_SI/main.lang              |   19 +-
 htdocs/langs/sl_SI/margins.lang           |    9 +-
 htdocs/langs/sl_SI/members.lang           |    9 +
 htdocs/langs/sl_SI/modulebuilder.lang     |    4 +-
 htdocs/langs/sl_SI/orders.lang            |    2 +
 htdocs/langs/sl_SI/other.lang             |    2 +
 htdocs/langs/sl_SI/productbatch.lang      |   15 +-
 htdocs/langs/sl_SI/products.lang          |    3 +-
 htdocs/langs/sl_SI/projects.lang          |    5 +
 htdocs/langs/sl_SI/propal.lang            |    7 +-
 htdocs/langs/sl_SI/stocks.lang            |   35 +-
 htdocs/langs/sl_SI/suppliers.lang         |    1 +
 htdocs/langs/sl_SI/ticket.lang            |   20 +-
 htdocs/langs/sl_SI/users.lang             |    9 +-
 htdocs/langs/sl_SI/website.lang           |   12 +-
 htdocs/langs/sl_SI/zapier.lang            |   14 +-
 htdocs/langs/sq_AL/accountancy.lang       |   26 +-
 htdocs/langs/sq_AL/admin.lang             |   57 +-
 htdocs/langs/sq_AL/banks.lang             |    3 +-
 htdocs/langs/sq_AL/bills.lang             |   30 +-
 htdocs/langs/sq_AL/boxes.lang             |   11 +-
 htdocs/langs/sq_AL/categories.lang        |    6 +-
 htdocs/langs/sq_AL/companies.lang         |   24 +-
 htdocs/langs/sq_AL/compta.lang            |   26 +-
 htdocs/langs/sq_AL/ecm.lang               |    4 +
 htdocs/langs/sq_AL/errors.lang            |    9 +
 htdocs/langs/sq_AL/externalsite.lang      |    2 +-
 htdocs/langs/sq_AL/main.lang              |   19 +-
 htdocs/langs/sq_AL/margins.lang           |    9 +-
 htdocs/langs/sq_AL/members.lang           |    9 +
 htdocs/langs/sq_AL/modulebuilder.lang     |    4 +-
 htdocs/langs/sq_AL/orders.lang            |    5 +-
 htdocs/langs/sq_AL/other.lang             |    2 +
 htdocs/langs/sq_AL/productbatch.lang      |   15 +-
 htdocs/langs/sq_AL/products.lang          |    3 +-
 htdocs/langs/sq_AL/projects.lang          |    5 +
 htdocs/langs/sq_AL/propal.lang            |    7 +-
 htdocs/langs/sq_AL/stocks.lang            |   35 +-
 htdocs/langs/sq_AL/suppliers.lang         |    1 +
 htdocs/langs/sq_AL/ticket.lang            |   20 +-
 htdocs/langs/sq_AL/users.lang             |    9 +-
 htdocs/langs/sq_AL/website.lang           |   12 +-
 htdocs/langs/sq_AL/zapier.lang            |   14 +-
 htdocs/langs/sr_RS/accountancy.lang       |   26 +-
 htdocs/langs/sr_RS/admin.lang             |   57 +-
 htdocs/langs/sr_RS/banks.lang             |    3 +-
 htdocs/langs/sr_RS/bills.lang             |   30 +-
 htdocs/langs/sr_RS/boxes.lang             |   11 +-
 htdocs/langs/sr_RS/categories.lang        |    6 +-
 htdocs/langs/sr_RS/companies.lang         |   24 +-
 htdocs/langs/sr_RS/compta.lang            |   26 +-
 htdocs/langs/sr_RS/ecm.lang               |    4 +
 htdocs/langs/sr_RS/errors.lang            |    9 +
 htdocs/langs/sr_RS/externalsite.lang      |    2 +-
 htdocs/langs/sr_RS/main.lang              |   19 +-
 htdocs/langs/sr_RS/margins.lang           |    9 +-
 htdocs/langs/sr_RS/members.lang           |    9 +
 htdocs/langs/sr_RS/modulebuilder.lang     |    4 +-
 htdocs/langs/sr_RS/orders.lang            |    5 +-
 htdocs/langs/sr_RS/other.lang             |    2 +
 htdocs/langs/sr_RS/productbatch.lang      |   15 +-
 htdocs/langs/sr_RS/products.lang          |    3 +-
 htdocs/langs/sr_RS/projects.lang          |    5 +
 htdocs/langs/sr_RS/propal.lang            |    7 +-
 htdocs/langs/sr_RS/stocks.lang            |   35 +-
 htdocs/langs/sr_RS/suppliers.lang         |    1 +
 htdocs/langs/sr_RS/ticket.lang            |   20 +-
 htdocs/langs/sr_RS/users.lang             |    9 +-
 htdocs/langs/sr_RS/website.lang           |   12 +-
 htdocs/langs/sr_RS/zapier.lang            |   14 +-
 htdocs/langs/sv_SE/accountancy.lang       |   26 +-
 htdocs/langs/sv_SE/admin.lang             |   57 +-
 htdocs/langs/sv_SE/banks.lang             |    3 +-
 htdocs/langs/sv_SE/bills.lang             |   30 +-
 htdocs/langs/sv_SE/boxes.lang             |   11 +-
 htdocs/langs/sv_SE/categories.lang        |    6 +-
 htdocs/langs/sv_SE/companies.lang         |   24 +-
 htdocs/langs/sv_SE/compta.lang            |   26 +-
 htdocs/langs/sv_SE/ecm.lang               |    4 +
 htdocs/langs/sv_SE/errors.lang            |    9 +
 htdocs/langs/sv_SE/externalsite.lang      |    2 +-
 htdocs/langs/sv_SE/main.lang              |   19 +-
 htdocs/langs/sv_SE/margins.lang           |    5 +-
 htdocs/langs/sv_SE/members.lang           |    9 +
 htdocs/langs/sv_SE/modulebuilder.lang     |    4 +-
 htdocs/langs/sv_SE/orders.lang            |    5 +-
 htdocs/langs/sv_SE/other.lang             |    2 +
 htdocs/langs/sv_SE/productbatch.lang      |   17 +-
 htdocs/langs/sv_SE/products.lang          |    3 +-
 htdocs/langs/sv_SE/projects.lang          |    5 +
 htdocs/langs/sv_SE/propal.lang            |    7 +-
 htdocs/langs/sv_SE/stocks.lang            |   35 +-
 htdocs/langs/sv_SE/suppliers.lang         |    1 +
 htdocs/langs/sv_SE/ticket.lang            |   20 +-
 htdocs/langs/sv_SE/users.lang             |    9 +-
 htdocs/langs/sv_SE/website.lang           |   12 +-
 htdocs/langs/sv_SE/zapier.lang            |   14 +-
 htdocs/langs/sw_SW/accountancy.lang       |   26 +-
 htdocs/langs/sw_SW/admin.lang             |   57 +-
 htdocs/langs/sw_SW/banks.lang             |    3 +-
 htdocs/langs/sw_SW/bills.lang             |   30 +-
 htdocs/langs/sw_SW/boxes.lang             |   11 +-
 htdocs/langs/sw_SW/categories.lang        |    6 +-
 htdocs/langs/sw_SW/companies.lang         |   24 +-
 htdocs/langs/sw_SW/compta.lang            |   26 +-
 htdocs/langs/sw_SW/ecm.lang               |    4 +
 htdocs/langs/sw_SW/errors.lang            |    9 +
 htdocs/langs/sw_SW/externalsite.lang      |    2 +-
 htdocs/langs/sw_SW/main.lang              |   19 +-
 htdocs/langs/sw_SW/margins.lang           |    9 +-
 htdocs/langs/sw_SW/members.lang           |    9 +
 htdocs/langs/sw_SW/modulebuilder.lang     |    4 +-
 htdocs/langs/sw_SW/orders.lang            |    5 +-
 htdocs/langs/sw_SW/other.lang             |    2 +
 htdocs/langs/sw_SW/productbatch.lang      |   15 +-
 htdocs/langs/sw_SW/products.lang          |    3 +-
 htdocs/langs/sw_SW/projects.lang          |    5 +
 htdocs/langs/sw_SW/propal.lang            |    7 +-
 htdocs/langs/sw_SW/stocks.lang            |   35 +-
 htdocs/langs/sw_SW/suppliers.lang         |    1 +
 htdocs/langs/sw_SW/ticket.lang            |   20 +-
 htdocs/langs/sw_SW/users.lang             |    9 +-
 htdocs/langs/sw_SW/website.lang           |   12 +-
 htdocs/langs/sw_SW/zapier.lang            |   14 +-
 htdocs/langs/th_TH/accountancy.lang       |   26 +-
 htdocs/langs/th_TH/admin.lang             |   57 +-
 htdocs/langs/th_TH/banks.lang             |    3 +-
 htdocs/langs/th_TH/bills.lang             |   30 +-
 htdocs/langs/th_TH/boxes.lang             |   11 +-
 htdocs/langs/th_TH/categories.lang        |    6 +-
 htdocs/langs/th_TH/companies.lang         |   24 +-
 htdocs/langs/th_TH/compta.lang            |   26 +-
 htdocs/langs/th_TH/ecm.lang               |    4 +
 htdocs/langs/th_TH/errors.lang            |    9 +
 htdocs/langs/th_TH/externalsite.lang      |    2 +-
 htdocs/langs/th_TH/main.lang              |   19 +-
 htdocs/langs/th_TH/margins.lang           |    9 +-
 htdocs/langs/th_TH/members.lang           |    9 +
 htdocs/langs/th_TH/modulebuilder.lang     |    4 +-
 htdocs/langs/th_TH/orders.lang            |    5 +-
 htdocs/langs/th_TH/other.lang             |    2 +
 htdocs/langs/th_TH/productbatch.lang      |   15 +-
 htdocs/langs/th_TH/products.lang          |    3 +-
 htdocs/langs/th_TH/projects.lang          |    5 +
 htdocs/langs/th_TH/propal.lang            |    7 +-
 htdocs/langs/th_TH/stocks.lang            |   35 +-
 htdocs/langs/th_TH/suppliers.lang         |    1 +
 htdocs/langs/th_TH/ticket.lang            |   20 +-
 htdocs/langs/th_TH/users.lang             |    9 +-
 htdocs/langs/th_TH/website.lang           |   12 +-
 htdocs/langs/th_TH/zapier.lang            |   14 +-
 htdocs/langs/tr_TR/accountancy.lang       |   26 +-
 htdocs/langs/tr_TR/admin.lang             |   57 +-
 htdocs/langs/tr_TR/banks.lang             |    3 +-
 htdocs/langs/tr_TR/bills.lang             |   28 +-
 htdocs/langs/tr_TR/boxes.lang             |   11 +-
 htdocs/langs/tr_TR/categories.lang        |    6 +-
 htdocs/langs/tr_TR/companies.lang         |   24 +-
 htdocs/langs/tr_TR/compta.lang            |   26 +-
 htdocs/langs/tr_TR/ecm.lang               |    4 +
 htdocs/langs/tr_TR/errors.lang            |    9 +
 htdocs/langs/tr_TR/externalsite.lang      |    2 +-
 htdocs/langs/tr_TR/main.lang              |   21 +-
 htdocs/langs/tr_TR/margins.lang           |    5 +-
 htdocs/langs/tr_TR/members.lang           |    9 +
 htdocs/langs/tr_TR/modulebuilder.lang     |    4 +-
 htdocs/langs/tr_TR/orders.lang            |    4 +-
 htdocs/langs/tr_TR/other.lang             |    2 +
 htdocs/langs/tr_TR/productbatch.lang      |   17 +-
 htdocs/langs/tr_TR/products.lang          |    3 +-
 htdocs/langs/tr_TR/projects.lang          |    5 +
 htdocs/langs/tr_TR/propal.lang            |    7 +-
 htdocs/langs/tr_TR/stocks.lang            |   35 +-
 htdocs/langs/tr_TR/suppliers.lang         |    1 +
 htdocs/langs/tr_TR/ticket.lang            |   20 +-
 htdocs/langs/tr_TR/users.lang             |    9 +-
 htdocs/langs/tr_TR/website.lang           |   12 +-
 htdocs/langs/tr_TR/zapier.lang            |   14 +-
 htdocs/langs/uk_UA/accountancy.lang       |   26 +-
 htdocs/langs/uk_UA/admin.lang             |   57 +-
 htdocs/langs/uk_UA/banks.lang             |    3 +-
 htdocs/langs/uk_UA/bills.lang             |   30 +-
 htdocs/langs/uk_UA/boxes.lang             |   11 +-
 htdocs/langs/uk_UA/categories.lang        |    6 +-
 htdocs/langs/uk_UA/companies.lang         |   24 +-
 htdocs/langs/uk_UA/compta.lang            |   26 +-
 htdocs/langs/uk_UA/ecm.lang               |    4 +
 htdocs/langs/uk_UA/errors.lang            |    9 +
 htdocs/langs/uk_UA/externalsite.lang      |    2 +-
 htdocs/langs/uk_UA/main.lang              |   19 +-
 htdocs/langs/uk_UA/margins.lang           |    9 +-
 htdocs/langs/uk_UA/members.lang           |    9 +
 htdocs/langs/uk_UA/modulebuilder.lang     |    4 +-
 htdocs/langs/uk_UA/orders.lang            |    2 +
 htdocs/langs/uk_UA/other.lang             |    2 +
 htdocs/langs/uk_UA/productbatch.lang      |   15 +-
 htdocs/langs/uk_UA/products.lang          |    3 +-
 htdocs/langs/uk_UA/projects.lang          |    5 +
 htdocs/langs/uk_UA/propal.lang            |    7 +-
 htdocs/langs/uk_UA/stocks.lang            |   35 +-
 htdocs/langs/uk_UA/suppliers.lang         |    1 +
 htdocs/langs/uk_UA/ticket.lang            |   20 +-
 htdocs/langs/uk_UA/users.lang             |    9 +-
 htdocs/langs/uk_UA/website.lang           |   12 +-
 htdocs/langs/uk_UA/zapier.lang            |   14 +-
 htdocs/langs/uz_UZ/accountancy.lang       |   26 +-
 htdocs/langs/uz_UZ/admin.lang             |   57 +-
 htdocs/langs/uz_UZ/banks.lang             |    3 +-
 htdocs/langs/uz_UZ/bills.lang             |   30 +-
 htdocs/langs/uz_UZ/boxes.lang             |   11 +-
 htdocs/langs/uz_UZ/categories.lang        |    6 +-
 htdocs/langs/uz_UZ/companies.lang         |   24 +-
 htdocs/langs/uz_UZ/compta.lang            |   26 +-
 htdocs/langs/uz_UZ/ecm.lang               |    4 +
 htdocs/langs/uz_UZ/errors.lang            |    9 +
 htdocs/langs/uz_UZ/externalsite.lang      |    2 +-
 htdocs/langs/uz_UZ/main.lang              |   19 +-
 htdocs/langs/uz_UZ/margins.lang           |    9 +-
 htdocs/langs/uz_UZ/members.lang           |    9 +
 htdocs/langs/uz_UZ/modulebuilder.lang     |    4 +-
 htdocs/langs/uz_UZ/orders.lang            |    5 +-
 htdocs/langs/uz_UZ/other.lang             |    2 +
 htdocs/langs/uz_UZ/productbatch.lang      |   15 +-
 htdocs/langs/uz_UZ/products.lang          |    3 +-
 htdocs/langs/uz_UZ/projects.lang          |    5 +
 htdocs/langs/uz_UZ/propal.lang            |    7 +-
 htdocs/langs/uz_UZ/stocks.lang            |   35 +-
 htdocs/langs/uz_UZ/suppliers.lang         |    1 +
 htdocs/langs/uz_UZ/ticket.lang            |   20 +-
 htdocs/langs/uz_UZ/users.lang             |    9 +-
 htdocs/langs/uz_UZ/website.lang           |   12 +-
 htdocs/langs/uz_UZ/zapier.lang            |   14 +-
 htdocs/langs/vi_VN/accountancy.lang       |   26 +-
 htdocs/langs/vi_VN/admin.lang             |   57 +-
 htdocs/langs/vi_VN/banks.lang             |    3 +-
 htdocs/langs/vi_VN/bills.lang             |   24 +-
 htdocs/langs/vi_VN/boxes.lang             |   11 +-
 htdocs/langs/vi_VN/categories.lang        |    6 +-
 htdocs/langs/vi_VN/companies.lang         |   24 +-
 htdocs/langs/vi_VN/compta.lang            |   26 +-
 htdocs/langs/vi_VN/ecm.lang               |    4 +
 htdocs/langs/vi_VN/errors.lang            |    9 +
 htdocs/langs/vi_VN/externalsite.lang      |    2 +-
 htdocs/langs/vi_VN/main.lang              |   19 +-
 htdocs/langs/vi_VN/margins.lang           |    2 +-
 htdocs/langs/vi_VN/members.lang           |    9 +
 htdocs/langs/vi_VN/modulebuilder.lang     |    4 +-
 htdocs/langs/vi_VN/orders.lang            |   11 +-
 htdocs/langs/vi_VN/other.lang             |    2 +
 htdocs/langs/vi_VN/productbatch.lang      |   15 +-
 htdocs/langs/vi_VN/products.lang          |    3 +-
 htdocs/langs/vi_VN/projects.lang          |    5 +
 htdocs/langs/vi_VN/propal.lang            |   11 +-
 htdocs/langs/vi_VN/stocks.lang            |   35 +-
 htdocs/langs/vi_VN/suppliers.lang         |    1 +
 htdocs/langs/vi_VN/ticket.lang            |   20 +-
 htdocs/langs/vi_VN/users.lang             |    9 +-
 htdocs/langs/vi_VN/website.lang           |   12 +-
 htdocs/langs/vi_VN/zapier.lang            |   14 +-
 htdocs/langs/zh_CN/accountancy.lang       |   26 +-
 htdocs/langs/zh_CN/admin.lang             |  153 +-
 htdocs/langs/zh_CN/banks.lang             |    3 +-
 htdocs/langs/zh_CN/bills.lang             |   28 +-
 htdocs/langs/zh_CN/boxes.lang             |   11 +-
 htdocs/langs/zh_CN/categories.lang        |    6 +-
 htdocs/langs/zh_CN/companies.lang         |   24 +-
 htdocs/langs/zh_CN/compta.lang            |   26 +-
 htdocs/langs/zh_CN/ecm.lang               |    4 +
 htdocs/langs/zh_CN/errors.lang            |    9 +
 htdocs/langs/zh_CN/externalsite.lang      |    2 +-
 htdocs/langs/zh_CN/main.lang              |   19 +-
 htdocs/langs/zh_CN/margins.lang           |   17 +-
 htdocs/langs/zh_CN/members.lang           |    9 +
 htdocs/langs/zh_CN/modulebuilder.lang     |    4 +-
 htdocs/langs/zh_CN/orders.lang            |    5 +-
 htdocs/langs/zh_CN/other.lang             |    2 +
 htdocs/langs/zh_CN/productbatch.lang      |   25 +-
 htdocs/langs/zh_CN/products.lang          |    3 +-
 htdocs/langs/zh_CN/projects.lang          |    5 +
 htdocs/langs/zh_CN/propal.lang            |   11 +-
 htdocs/langs/zh_CN/stocks.lang            |   35 +-
 htdocs/langs/zh_CN/suppliers.lang         |    1 +
 htdocs/langs/zh_CN/ticket.lang            |   20 +-
 htdocs/langs/zh_CN/users.lang             |    9 +-
 htdocs/langs/zh_CN/website.lang           |   12 +-
 htdocs/langs/zh_CN/zapier.lang            |   14 +-
 htdocs/langs/zh_HK/accountancy.lang       |   26 +-
 htdocs/langs/zh_HK/admin.lang             |   57 +-
 htdocs/langs/zh_HK/banks.lang             |    3 +-
 htdocs/langs/zh_HK/bills.lang             |   30 +-
 htdocs/langs/zh_HK/boxes.lang             |   11 +-
 htdocs/langs/zh_HK/categories.lang        |    6 +-
 htdocs/langs/zh_HK/companies.lang         |   24 +-
 htdocs/langs/zh_HK/compta.lang            |   26 +-
 htdocs/langs/zh_HK/ecm.lang               |    4 +
 htdocs/langs/zh_HK/errors.lang            |    9 +
 htdocs/langs/zh_HK/externalsite.lang      |    2 +-
 htdocs/langs/zh_HK/main.lang              |   19 +-
 htdocs/langs/zh_HK/margins.lang           |    2 +-
 htdocs/langs/zh_HK/members.lang           |    9 +
 htdocs/langs/zh_HK/modulebuilder.lang     |    4 +-
 htdocs/langs/zh_HK/orders.lang            |    2 +
 htdocs/langs/zh_HK/other.lang             |    2 +
 htdocs/langs/zh_HK/productbatch.lang      |   15 +-
 htdocs/langs/zh_HK/products.lang          |    3 +-
 htdocs/langs/zh_HK/projects.lang          |    5 +
 htdocs/langs/zh_HK/propal.lang            |    7 +-
 htdocs/langs/zh_HK/stocks.lang            |   35 +-
 htdocs/langs/zh_HK/suppliers.lang         |    1 +
 htdocs/langs/zh_HK/ticket.lang            |   20 +-
 htdocs/langs/zh_HK/users.lang             |    9 +-
 htdocs/langs/zh_HK/website.lang           |   12 +-
 htdocs/langs/zh_HK/zapier.lang            |   14 +-
 htdocs/langs/zh_TW/accountancy.lang       |   64 +-
 htdocs/langs/zh_TW/admin.lang             |   89 +-
 htdocs/langs/zh_TW/banks.lang             |   21 +-
 htdocs/langs/zh_TW/bills.lang             |   27 +-
 htdocs/langs/zh_TW/boxes.lang             |   15 +-
 htdocs/langs/zh_TW/categories.lang        |    6 +-
 htdocs/langs/zh_TW/companies.lang         |   28 +-
 htdocs/langs/zh_TW/compta.lang            |   30 +-
 htdocs/langs/zh_TW/ecm.lang               |    4 +
 htdocs/langs/zh_TW/errors.lang            |    9 +
 htdocs/langs/zh_TW/externalsite.lang      |    2 +-
 htdocs/langs/zh_TW/mails.lang             |   14 +-
 htdocs/langs/zh_TW/main.lang              |   41 +-
 htdocs/langs/zh_TW/margins.lang           |    2 +-
 htdocs/langs/zh_TW/members.lang           |    9 +
 htdocs/langs/zh_TW/modulebuilder.lang     |    4 +-
 htdocs/langs/zh_TW/orders.lang            |    2 +
 htdocs/langs/zh_TW/other.lang             |    2 +
 htdocs/langs/zh_TW/productbatch.lang      |   15 +-
 htdocs/langs/zh_TW/products.lang          |   41 +-
 htdocs/langs/zh_TW/projects.lang          |    5 +
 htdocs/langs/zh_TW/propal.lang            |   19 +-
 htdocs/langs/zh_TW/stocks.lang            |   39 +-
 htdocs/langs/zh_TW/suppliers.lang         |    3 +-
 htdocs/langs/zh_TW/ticket.lang            |   22 +-
 htdocs/langs/zh_TW/users.lang             |    6 +-
 htdocs/langs/zh_TW/website.lang           |   18 +-
 htdocs/langs/zh_TW/zapier.lang            |   16 +-
 1938 files changed, 37713 insertions(+), 15186 deletions(-)
 delete mode 100644 htdocs/langs/ar_EG/products.lang
 create mode 100644 htdocs/langs/ar_IQ/accountancy.lang
 create mode 100644 htdocs/langs/ar_IQ/admin.lang
 create mode 100644 htdocs/langs/ar_IQ/agenda.lang
 create mode 100644 htdocs/langs/ar_IQ/assets.lang
 create mode 100644 htdocs/langs/ar_IQ/banks.lang
 create mode 100644 htdocs/langs/ar_IQ/bills.lang
 create mode 100644 htdocs/langs/ar_IQ/blockedlog.lang
 create mode 100644 htdocs/langs/ar_IQ/bookmarks.lang
 create mode 100644 htdocs/langs/ar_IQ/boxes.lang
 create mode 100644 htdocs/langs/ar_IQ/cashdesk.lang
 create mode 100644 htdocs/langs/ar_IQ/categories.lang
 create mode 100644 htdocs/langs/ar_IQ/commercial.lang
 create mode 100644 htdocs/langs/ar_IQ/companies.lang
 create mode 100644 htdocs/langs/ar_IQ/compta.lang
 create mode 100644 htdocs/langs/ar_IQ/contracts.lang
 create mode 100644 htdocs/langs/ar_IQ/cron.lang
 create mode 100644 htdocs/langs/ar_IQ/deliveries.lang
 create mode 100644 htdocs/langs/ar_IQ/dict.lang
 create mode 100644 htdocs/langs/ar_IQ/donations.lang
 create mode 100644 htdocs/langs/ar_IQ/ecm.lang
 create mode 100644 htdocs/langs/ar_IQ/errors.lang
 create mode 100644 htdocs/langs/ar_IQ/exports.lang
 create mode 100644 htdocs/langs/ar_IQ/externalsite.lang
 create mode 100644 htdocs/langs/ar_IQ/ftp.lang
 create mode 100644 htdocs/langs/ar_IQ/help.lang
 create mode 100644 htdocs/langs/ar_IQ/holiday.lang
 create mode 100644 htdocs/langs/ar_IQ/hrm.lang
 create mode 100644 htdocs/langs/ar_IQ/install.lang
 create mode 100644 htdocs/langs/ar_IQ/interventions.lang
 create mode 100644 htdocs/langs/ar_IQ/intracommreport.lang
 create mode 100644 htdocs/langs/ar_IQ/languages.lang
 create mode 100644 htdocs/langs/ar_IQ/ldap.lang
 create mode 100644 htdocs/langs/ar_IQ/link.lang
 create mode 100644 htdocs/langs/ar_IQ/loan.lang
 create mode 100644 htdocs/langs/ar_IQ/mailmanspip.lang
 create mode 100644 htdocs/langs/ar_IQ/mails.lang
 create mode 100644 htdocs/langs/ar_IQ/main.lang
 create mode 100644 htdocs/langs/ar_IQ/margins.lang
 create mode 100644 htdocs/langs/ar_IQ/members.lang
 create mode 100644 htdocs/langs/ar_IQ/modulebuilder.lang
 create mode 100644 htdocs/langs/ar_IQ/mrp.lang
 create mode 100644 htdocs/langs/ar_IQ/multicurrency.lang
 create mode 100644 htdocs/langs/ar_IQ/oauth.lang
 create mode 100644 htdocs/langs/ar_IQ/opensurvey.lang
 create mode 100644 htdocs/langs/ar_IQ/orders.lang
 create mode 100644 htdocs/langs/ar_IQ/other.lang
 create mode 100644 htdocs/langs/ar_IQ/paybox.lang
 create mode 100644 htdocs/langs/ar_IQ/paypal.lang
 create mode 100644 htdocs/langs/ar_IQ/printing.lang
 create mode 100644 htdocs/langs/ar_IQ/productbatch.lang
 create mode 100644 htdocs/langs/ar_IQ/products.lang
 create mode 100644 htdocs/langs/ar_IQ/projects.lang
 create mode 100644 htdocs/langs/ar_IQ/propal.lang
 create mode 100644 htdocs/langs/ar_IQ/receiptprinter.lang
 create mode 100644 htdocs/langs/ar_IQ/receptions.lang
 create mode 100644 htdocs/langs/ar_IQ/recruitment.lang
 create mode 100644 htdocs/langs/ar_IQ/resource.lang
 create mode 100644 htdocs/langs/ar_IQ/salaries.lang
 create mode 100644 htdocs/langs/ar_IQ/sendings.lang
 create mode 100644 htdocs/langs/ar_IQ/sms.lang
 create mode 100644 htdocs/langs/ar_IQ/stocks.lang
 create mode 100644 htdocs/langs/ar_IQ/stripe.lang
 create mode 100644 htdocs/langs/ar_IQ/supplier_proposal.lang
 create mode 100644 htdocs/langs/ar_IQ/suppliers.lang
 create mode 100644 htdocs/langs/ar_IQ/ticket.lang
 create mode 100644 htdocs/langs/ar_IQ/trips.lang
 create mode 100644 htdocs/langs/ar_IQ/users.lang
 create mode 100644 htdocs/langs/ar_IQ/website.lang
 create mode 100644 htdocs/langs/ar_IQ/withdrawals.lang
 create mode 100644 htdocs/langs/ar_IQ/workflow.lang
 create mode 100644 htdocs/langs/ar_IQ/zapier.lang
 create mode 100644 htdocs/langs/de_AT/modulebuilder.lang
 create mode 100644 htdocs/langs/de_CH/modulebuilder.lang
 create mode 100644 htdocs/langs/el_CY/modulebuilder.lang
 delete mode 100644 htdocs/langs/en_AU/accountancy.lang
 create mode 100644 htdocs/langs/en_AU/modulebuilder.lang
 delete mode 100644 htdocs/langs/en_AU/products.lang
 create mode 100644 htdocs/langs/en_AU/website.lang
 delete mode 100644 htdocs/langs/en_AU/withdrawals.lang
 delete mode 100644 htdocs/langs/en_CA/accountancy.lang
 create mode 100644 htdocs/langs/en_CA/modulebuilder.lang
 delete mode 100644 htdocs/langs/en_CA/products.lang
 create mode 100644 htdocs/langs/en_CA/website.lang
 delete mode 100644 htdocs/langs/en_CA/withdrawals.lang
 create mode 100644 htdocs/langs/en_GB/modulebuilder.lang
 delete mode 100644 htdocs/langs/en_IN/accountancy.lang
 create mode 100644 htdocs/langs/en_IN/modulebuilder.lang
 delete mode 100644 htdocs/langs/en_IN/products.lang
 create mode 100644 htdocs/langs/en_IN/website.lang
 delete mode 100644 htdocs/langs/en_IN/withdrawals.lang
 delete mode 100644 htdocs/langs/en_SG/accountancy.lang
 create mode 100644 htdocs/langs/en_SG/modulebuilder.lang
 delete mode 100644 htdocs/langs/en_SG/products.lang
 create mode 100644 htdocs/langs/en_SG/website.lang
 delete mode 100644 htdocs/langs/en_SG/withdrawals.lang
 create mode 100644 htdocs/langs/es_AR/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_BO/accountancy.lang
 create mode 100644 htdocs/langs/es_BO/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_BO/products.lang
 create mode 100644 htdocs/langs/es_BO/website.lang
 delete mode 100644 htdocs/langs/es_BO/withdrawals.lang
 create mode 100644 htdocs/langs/es_CO/modulebuilder.lang
 create mode 100644 htdocs/langs/es_CO/website.lang
 delete mode 100644 htdocs/langs/es_DO/accountancy.lang
 create mode 100644 htdocs/langs/es_DO/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_DO/products.lang
 create mode 100644 htdocs/langs/es_DO/website.lang
 delete mode 100644 htdocs/langs/es_DO/withdrawals.lang
 delete mode 100644 htdocs/langs/es_GT/accountancy.lang
 create mode 100644 htdocs/langs/es_GT/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_GT/products.lang
 create mode 100644 htdocs/langs/es_GT/website.lang
 delete mode 100644 htdocs/langs/es_GT/withdrawals.lang
 delete mode 100644 htdocs/langs/es_HN/accountancy.lang
 create mode 100644 htdocs/langs/es_HN/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_HN/products.lang
 create mode 100644 htdocs/langs/es_HN/website.lang
 delete mode 100644 htdocs/langs/es_HN/withdrawals.lang
 create mode 100644 htdocs/langs/es_MX/bookmarks.lang
 create mode 100644 htdocs/langs/es_MX/categories.lang
 delete mode 100644 htdocs/langs/es_PA/accountancy.lang
 create mode 100644 htdocs/langs/es_PA/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_PA/products.lang
 create mode 100644 htdocs/langs/es_PA/website.lang
 delete mode 100644 htdocs/langs/es_PA/withdrawals.lang
 create mode 100644 htdocs/langs/es_PE/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_PE/withdrawals.lang
 delete mode 100644 htdocs/langs/es_PY/accountancy.lang
 create mode 100644 htdocs/langs/es_PY/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_PY/products.lang
 create mode 100644 htdocs/langs/es_PY/website.lang
 delete mode 100644 htdocs/langs/es_PY/withdrawals.lang
 delete mode 100644 htdocs/langs/es_US/accountancy.lang
 create mode 100644 htdocs/langs/es_US/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_US/products.lang
 create mode 100644 htdocs/langs/es_US/website.lang
 delete mode 100644 htdocs/langs/es_US/withdrawals.lang
 delete mode 100644 htdocs/langs/es_UY/accountancy.lang
 create mode 100644 htdocs/langs/es_UY/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_UY/products.lang
 create mode 100644 htdocs/langs/es_UY/website.lang
 delete mode 100644 htdocs/langs/es_UY/withdrawals.lang
 delete mode 100644 htdocs/langs/es_VE/accountancy.lang
 create mode 100644 htdocs/langs/es_VE/modulebuilder.lang
 create mode 100644 htdocs/langs/es_VE/website.lang
 create mode 100644 htdocs/langs/fr_BE/modulebuilder.lang
 delete mode 100644 htdocs/langs/fr_BE/products.lang
 delete mode 100644 htdocs/langs/fr_CH/accountancy.lang
 create mode 100644 htdocs/langs/fr_CH/modulebuilder.lang
 delete mode 100644 htdocs/langs/fr_CH/products.lang
 delete mode 100644 htdocs/langs/fr_CH/withdrawals.lang
 delete mode 100644 htdocs/langs/fr_CI/accountancy.lang
 create mode 100644 htdocs/langs/fr_CI/modulebuilder.lang
 delete mode 100644 htdocs/langs/fr_CI/products.lang
 delete mode 100644 htdocs/langs/fr_CI/withdrawals.lang
 delete mode 100644 htdocs/langs/fr_CM/accountancy.lang
 create mode 100644 htdocs/langs/fr_CM/modulebuilder.lang
 delete mode 100644 htdocs/langs/fr_CM/products.lang
 delete mode 100644 htdocs/langs/fr_CM/withdrawals.lang
 delete mode 100644 htdocs/langs/fr_GA/accountancy.lang
 create mode 100644 htdocs/langs/fr_GA/modulebuilder.lang
 delete mode 100644 htdocs/langs/fr_GA/products.lang
 delete mode 100644 htdocs/langs/fr_GA/withdrawals.lang
 create mode 100644 htdocs/langs/it_CH/modulebuilder.lang
 delete mode 100644 htdocs/langs/it_CH/products.lang
 create mode 100644 htdocs/langs/nl_BE/modulebuilder.lang
 delete mode 100644 htdocs/langs/nl_BE/withdrawals.lang
 create mode 100644 htdocs/langs/pt_AO/admin.lang
 create mode 100644 htdocs/langs/ru_UA/admin.lang

diff --git a/htdocs/langs/am_ET/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index f9a6468d94a..8f4508ada53 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/am_ET/banks.lang
+++ b/htdocs/langs/am_ET/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/am_ET/bills.lang b/htdocs/langs/am_ET/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/am_ET/bills.lang
+++ b/htdocs/langs/am_ET/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/am_ET/boxes.lang b/htdocs/langs/am_ET/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/am_ET/boxes.lang
+++ b/htdocs/langs/am_ET/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/am_ET/categories.lang b/htdocs/langs/am_ET/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/am_ET/categories.lang
+++ b/htdocs/langs/am_ET/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang
index 8dc815b522e..154400c6536 100644
--- a/htdocs/langs/am_ET/companies.lang
+++ b/htdocs/langs/am_ET/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/am_ET/compta.lang b/htdocs/langs/am_ET/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/am_ET/compta.lang
+++ b/htdocs/langs/am_ET/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/am_ET/ecm.lang b/htdocs/langs/am_ET/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/am_ET/ecm.lang
+++ b/htdocs/langs/am_ET/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/am_ET/externalsite.lang b/htdocs/langs/am_ET/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/am_ET/externalsite.lang
+++ b/htdocs/langs/am_ET/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
index f8ba6f4073c..dc2a83f2015 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/am_ET/margins.lang b/htdocs/langs/am_ET/margins.lang
index 76ea8ad5c4d..ad5406409b4 100644
--- a/htdocs/langs/am_ET/margins.lang
+++ b/htdocs/langs/am_ET/margins.lang
@@ -22,7 +22,7 @@ ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
diff --git a/htdocs/langs/am_ET/members.lang b/htdocs/langs/am_ET/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/am_ET/members.lang
+++ b/htdocs/langs/am_ET/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/am_ET/modulebuilder.lang b/htdocs/langs/am_ET/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/am_ET/modulebuilder.lang
+++ b/htdocs/langs/am_ET/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/am_ET/orders.lang b/htdocs/langs/am_ET/orders.lang
index ad91e1eef63..87d196eb22f 100644
--- a/htdocs/langs/am_ET/orders.lang
+++ b/htdocs/langs/am_ET/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
diff --git a/htdocs/langs/am_ET/other.lang b/htdocs/langs/am_ET/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/am_ET/other.lang
+++ b/htdocs/langs/am_ET/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/am_ET/productbatch.lang b/htdocs/langs/am_ET/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/am_ET/productbatch.lang
+++ b/htdocs/langs/am_ET/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/am_ET/projects.lang b/htdocs/langs/am_ET/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/am_ET/projects.lang
+++ b/htdocs/langs/am_ET/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/am_ET/propal.lang b/htdocs/langs/am_ET/propal.lang
index 95085002f66..edbc08236d3 100644
--- a/htdocs/langs/am_ET/propal.lang
+++ b/htdocs/langs/am_ET/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -89,3 +89,4 @@ IdProposal=Proposal ID
 IdProduct=Product ID
 PrParentLine=Proposal Parent Line
 LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/am_ET/stocks.lang b/htdocs/langs/am_ET/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/am_ET/stocks.lang
+++ b/htdocs/langs/am_ET/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/am_ET/suppliers.lang b/htdocs/langs/am_ET/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/am_ET/suppliers.lang
+++ b/htdocs/langs/am_ET/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/am_ET/ticket.lang b/htdocs/langs/am_ET/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/am_ET/ticket.lang
+++ b/htdocs/langs/am_ET/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/am_ET/users.lang b/htdocs/langs/am_ET/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/am_ET/users.lang
+++ b/htdocs/langs/am_ET/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/am_ET/website.lang b/htdocs/langs/am_ET/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/am_ET/website.lang
+++ b/htdocs/langs/am_ET/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/am_ET/zapier.lang b/htdocs/langs/am_ET/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/am_ET/zapier.lang
+++ b/htdocs/langs/am_ET/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/ar_EG/admin.lang b/htdocs/langs/ar_EG/admin.lang
index 2976a2efba5..671975c34bd 100644
--- a/htdocs/langs/ar_EG/admin.lang
+++ b/htdocs/langs/ar_EG/admin.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=مؤسسة
 Version=إصدار
-Publisher=الناشر
 VersionLastInstall=أول إصدار ثبت
 VersionLastUpgrade=أخر تحديث
 VersionExperimental=تجريبي
@@ -15,10 +14,10 @@ FileIntegritySomeFilesWereRemovedOrModified=فشل التحقق من تكامل
 MakeIntegrityAnalysisFrom=عمل تحليل سلامة ملفات التطبيق من
 LocalSignature=توقيع محلي مضمن (أقل موثوقية)
 RemoteSignature=التوقيع عن بعد (أكثر موثوقية)
+FilesMissing=الملفات المفقودة
 FilesUpdated=الملفات المحدثة
 FilesModified=الملفات المعدلة
 FilesAdded=الملفات المضافة
-FileCheckDolibarr=تحقق من سلامة ملفات التطبيق
 AvailableOnlyOnPackagedVersions=لا يتوفر الملف المحلي لفحص السلامة إلا عندما يتم تثبيت التطبيق من حزمة رسمية
 XmlNotFound=لم يتم العثور على ملف تكامل Xml للتطبيق
 SessionId=هوية المتصل
@@ -31,13 +30,11 @@ LockNewSessions=اغلاق الدخول للمتصلين الجدد
 ConfirmLockNewSessions=هل أنت متأكد من أنك تريد تقييد أي اتصال Dolibarr جديد لنفسك؟ سيتمكن المستخدم <b> %s </b> فقط من الاتصال بعد ذلك.
 UnlockNewSessions=الغاء حظر الاتصال
 YourSession=جلستك
-Sessions=جلسات المستخدمين
 WebUserGroup=مستخدم\\مجموعة خادم الويب
 NoSessionFound=يبدو أن تكوين PHP الخاص بك لا يسمح بإدراج الجلسات النشطة. قد يتم حماية الدليل المستخدم لحفظ الجلسات (<b> %s </b>) (على سبيل المثال عن طريق أذونات نظام التشغيل أو عن طريق توجيه PHP open_basedir).
 DBStoringCharset=ضبط الحروف في قاعدة البيانات لحفظ المعلومات
 DBSortingCharset=ضبط الحروف في قاعدة البيانات لحفظ المعلومات
 ClientCharset=مجموع حروف العميل
-ClientSortingCharset=ترتيب العميل
 WarningModuleNotActive=إن الوحدة <b>%s</b> لابد أن تكون مفعلة
 WarningOnlyPermissionOfActivatedModules=أن الصلاحيات المرتبطة بالوحدات المفعلة فقط تظهر هنا. تستطيع تفعيل وحدات أخرى من: الرئيسية ثم التنصيب ثم صفحة الوحدات
 DolibarrSetup=تثبيت أو ترقية البرنامج
@@ -49,6 +46,7 @@ Module40Name=موردين
 Module700Name=تبرعات
 Module1780Name=الأوسمة/التصنيفات
 Permission81=قراءة أوامر الشراء
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 MailToSendInvoice=فواتير العميل
 MailToSendSupplierOrder=أوامر الشراء
 MailToSendSupplierInvoice=فواتير المورد
diff --git a/htdocs/langs/ar_EG/bills.lang b/htdocs/langs/ar_EG/bills.lang
index b1dce597b45..0d13c550e27 100644
--- a/htdocs/langs/ar_EG/bills.lang
+++ b/htdocs/langs/ar_EG/bills.lang
@@ -2,6 +2,7 @@
 BillsCustomers=فواتير العميل
 BillsSuppliers=فواتير المورد
 BillsCustomersUnpaid=فواتير العميل غير المدفوعة
+BillsCustomersUnpaidForCompany=فواتير العملاء غير المدفوعة ل %s
 BillsSuppliersUnpaid=فواتير المورد غير المدفوعة
 BillsSuppliersUnpaidForCompany=فواتير الموردين غير المدفوعة لـ %s
 BillsStatistics=احصائيات فواتير العملاء
@@ -10,19 +11,16 @@ InvoiceDeposit=فاتورة دفعة أولى
 InvoiceDepositAsk=فاتورة دفعة أولى
 InvoiceReplacement=فاتورة استبدال
 ReplacementInvoice=فاتورة استبدال
-SupplierInvoice=فاتورة مورد
-SuppliersInvoices=فواتير الموردين
-SupplierBill=فاتورة مورد
+CustomersInvoices=فواتير العميل
+SuppliersInvoices=فواتير المورد
+SupplierBills=فواتير المورد
 CancelBill=إلغ فاتورة
 SendRemindByMail=إرسل تذكير عن طريق البريد الإلكتروني
 BillStatusDraft=مسودة(مطلوب الاعتماد)
-BillShortStatusValidated=معتمد
 BillShortStatusClosedUnpaid=مقفول
 SendReminderBillByMail=إرسل تذكير عن طريق البريد الإلكتروني
 SupplierBillsToPay=فواتير المورد غير المدفوعة
 CustomerBillsUnpaid=فواتير العميل غير المدفوعة
 Billed=مفوتر
 PaymentConditionShortPT_ORDER=طلب
-TypeContact_facture_external_BILLING=جهة اتصال فاتورة العميل
-AutoFillDateFromShort=حدد تاريخ البدء
-AutoFillDateToShort=حدد تاريخ الانتهاء
+PaymentTypeShortTRA=مسودة
diff --git a/htdocs/langs/ar_EG/boxes.lang b/htdocs/langs/ar_EG/boxes.lang
index 1c4466c2f30..c8006d54242 100644
--- a/htdocs/langs/ar_EG/boxes.lang
+++ b/htdocs/langs/ar_EG/boxes.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxTitleLastModifiedPropals=أحدث العروض المعدلة %s
-ForCustomersInvoices=فواتير العملاء
diff --git a/htdocs/langs/ar_EG/companies.lang b/htdocs/langs/ar_EG/companies.lang
index bc649f3af7c..7dd587c67f3 100644
--- a/htdocs/langs/ar_EG/companies.lang
+++ b/htdocs/langs/ar_EG/companies.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - companies
-ThirdPartyProspects=فرص
-ThirdPartyProspectsStats=فرص
 ThirdPartyCustomers=عملاء
 ThirdPartyCustomersStats=عملاء
 ThirdPartySuppliers=موردين
diff --git a/htdocs/langs/ar_EG/main.lang b/htdocs/langs/ar_EG/main.lang
index 65726d1afb0..91cdd996f11 100644
--- a/htdocs/langs/ar_EG/main.lang
+++ b/htdocs/langs/ar_EG/main.lang
@@ -20,17 +20,14 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 Closed2=مقفول
+CloseAs=اضبط الحالة على
 NumberByMonth=الرقم بالشهر
 RefSupplier=المرجع. مورد
 CommercialProposalsShort=عروض تجارية
 Refused=مرفوض
-Drafts=المسودات
-Validated=معتمد
 Opened=افتح
 SearchIntoCustomerInvoices=فواتير العميل
 SearchIntoSupplierInvoices=فواتير المورد
 SearchIntoSupplierOrders=أوامر الشراء
-SearchIntoCustomerProposals=عروض تجارية
 SearchIntoSupplierProposals=عرود الموردين
 ContactDefault_commande=طلب
-ContactDefault_propal=عرض
diff --git a/htdocs/langs/ar_EG/orders.lang b/htdocs/langs/ar_EG/orders.lang
index 7e6d65dd9bd..7f814594ec4 100644
--- a/htdocs/langs/ar_EG/orders.lang
+++ b/htdocs/langs/ar_EG/orders.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=منطقة طلبات العملاء
-SuppliersOrdersArea=منطقة أوامر الشراء
 OrderCard=بطاقة الأمر
 OrderId=رقم التعريف الخاص بالأمر
 Order=طلب
@@ -9,19 +8,13 @@ Orders=الطلبات
 OrderDateShort=تاريخ الأمر
 OrderToProcess=طلب تحت التشغيل
 NewOrder=أمر جديد
-NewOrderSupplier=أمر شراء جديد
 ToOrder=إصدار أمر
 MakeOrder=إصدار أمر
-SupplierOrder=أمر شراء
 SuppliersOrders=أوامر الشراء
-SuppliersOrdersRunning=أوامر الشراء الحالية
 StatusOrderValidatedShort=معتمد
 StatusOrderRefusedShort=مرفوض
 StatusOrderDraft=مسودة(مطلوب الاعتماد)
-StatusOrderValidated=معتمد
 StatusOrderRefused=مرفوض
-TypeContact_commande_external_BILLING=جهة اتصال فاتورة العميل
-StatusSupplierOrderValidatedShort=معتمد
 StatusSupplierOrderRefusedShort=مرفوض
 StatusSupplierOrderDraft=مسودة(مطلوب الاعتماد)
 StatusSupplierOrderValidated=معتمد
diff --git a/htdocs/langs/ar_EG/products.lang b/htdocs/langs/ar_EG/products.lang
deleted file mode 100644
index 5a177b2f19a..00000000000
--- a/htdocs/langs/ar_EG/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-SuppliersPrices=أسعار المورد
diff --git a/htdocs/langs/ar_EG/suppliers.lang b/htdocs/langs/ar_EG/suppliers.lang
index 14963000391..313afddee35 100644
--- a/htdocs/langs/ar_EG/suppliers.lang
+++ b/htdocs/langs/ar_EG/suppliers.lang
@@ -1,45 +1,29 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=موردين
-SuppliersInvoice=فاتورة مورد
+SupplierInvoices=فواتير المورد
 ShowSupplierInvoice=إظهار فاتورة المورد
-NewSupplier=مورد جديد
 ListOfSuppliers=قائمة موردين
 ShowSupplier=فتح صفحة المورد
 OrderDate=تاريخ الأمر
-BuyingPriceMin=أفضل سعر شراء
-BuyingPriceMinShort=أفضل سعر شراء
 TotalBuyingPriceMinShort=إجمالي أسعار الشراء
 TotalSellingPriceMinShort=إجمالي أسعار البيع
 SomeSubProductHaveNoPrices=بعض المنتجات غير مسعره
 AddSupplierPrice=إضافة سعر الشراء
-ChangeSupplierPrice=تغيير سعر الشراء
-SupplierPrices=أسعار المورد
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=مرجع المورد هذا مرتبط بالفعل بمنتج: %s
 NoRecordedSuppliers=لم يتم تسجيل مورد
 SupplierPayment=دفعة مورد
-SuppliersArea=منطقة المورد
 RefSupplierShort=المرجع. مورد
-Availability=التوفر
 ExportDataset_fournisseur_1=فواتير المورد و تفاصيلها
 ExportDataset_fournisseur_2=فواتير و دفعات المورد
 ExportDataset_fournisseur_3=تفاصيل أوامر الشراء
 ApproveThisOrder=إعتماد الأمر
 ConfirmApproveThisOrder=هل أنت متأكد أنك تريد الموافقة على الطلب <b> %s </b>؟
-DenyingThisOrder=رفض هذا الأمر
 ConfirmDenyingThisOrder=هل أنت متأكد أنك تريد رفض هذا الطلب <b> %s </b>؟
 ConfirmCancelThisOrder=هل أنت متأكد أنك تريد إلغاء هذا الطلب <b> %s </b>؟
-AddSupplierOrder=إنشاء أمر شراء
 AddSupplierInvoice=إنشاء فاتورة المورد
 ListOfSupplierProductForSupplier=قائمة المنتجات والأسعار الخاصة بالمورد <b> %s </b>
 SentToSuppliers=مرسلة إلى المورديين
-ListOfSupplierOrders=قائمة أوامر الشراء
 MenuOrdersSupplierToBill=أوامر الشراء للفاتورة
-NbDaysToDelivery=تأخير التسليم (أيام)
 DescNbDaysToDelivery=أطول تأخير لتسليم المنتجات من هذا الطلب
-SupplierReputation=سمعة المورد
 DoNotOrderThisProductToThisSupplier=لا تتعامل
-NotTheGoodQualitySupplier=جودة منخفضة
-ReputationForThisProduct=سمعة
-BuyerName=اسم المشتري
 AllProductServicePrices=أسعار جميع المنتجات / الخدمات
-BuyingPriceNumShort=أسعار المورد
diff --git a/htdocs/langs/ar_EG/zapier.lang b/htdocs/langs/ar_EG/zapier.lang
index dd7094bdc04..1ea0b48d8fa 100644
--- a/htdocs/langs/ar_EG/zapier.lang
+++ b/htdocs/langs/ar_EG/zapier.lang
@@ -1,4 +1,4 @@
 # Dolibarr language file - Source file is en_US - zapier
 ModuleZapierForDolibarrName =Zapier
 ModuleZapierForDolibarrDesc =وحدة Zapier
-ZapierForDolibarrSetup =إعداد Zapier
+ZapierForDolibarrSetup=إعداد Zapier
diff --git a/htdocs/langs/ar_IQ/accountancy.lang b/htdocs/langs/ar_IQ/accountancy.lang
new file mode 100644
index 00000000000..786f0194010
--- /dev/null
+++ b/htdocs/langs/ar_IQ/accountancy.lang
@@ -0,0 +1,430 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=Accountancy
+Accounting=Accounting
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_DEVISE=Export currency
+Selectformat=Select the format for the file
+ACCOUNTING_EXPORT_FORMAT=Select the format for the file
+ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ThisService=This service
+ThisProduct=This product
+DefaultForService=Default for service
+DefaultForProduct=Default for product
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
+CantSuggest=Can't suggest
+AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
+Journalization=Journalization
+Journals=Journals
+JournalFinancial=Financial journals
+BackToChartofaccounts=Return chart of accounts
+Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+CurrentDedicatedAccountingAccount=Current dedicated account
+AssignDedicatedAccountingAccount=New account to assign
+InvoiceLabel=Invoice label
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
+JournalizationInLedgerStatus=Status of journalization
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
+GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+DetailByAccount=Show detail by account
+AccountWithNonZeroValues=Accounts with non-zero values
+ListOfAccounts=List of accounts
+CountriesInEEC=Countries in EEC
+CountriesNotInEEC=Countries not in EEC
+CountriesInEECExceptMe=Countries in EEC except %s
+CountriesExceptMe=All countries except %s
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
+
+MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
+MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
+MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+
+AccountancyArea=Accounting area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
+AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
+AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+Selectchartofaccounts=Select active chart of accounts
+ChangeAndLoad=Change and load
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+AccountAccountingShort=Account
+SubledgerAccount=Subledger account
+SubledgerAccountLabel=Subledger account label
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
+AccountAccountingSuggest=Accounting account suggested
+MenuDefaultAccounts=Default accounts
+MenuBankAccounts=Bank accounts
+MenuVatAccounts=Vat accounts
+MenuTaxAccounts=Tax accounts
+MenuExpenseReportAccounts=Expense report accounts
+MenuLoanAccounts=Loan accounts
+MenuProductsAccounts=Product accounts
+MenuClosureAccounts=Closure accounts
+MenuAccountancyClosure=Closure
+MenuAccountancyValidationMovements=Validate movements
+ProductsBinding=Products accounts
+TransferInAccounting=Transfer in accounting
+RegistrationInAccounting=Registration in accounting
+Binding=Binding to accounts
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Vendor invoice binding
+ExpenseReportsVentilation=Expense report binding
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+ValidTransaction=Validate transaction
+WriteBookKeeping=Register transactions in accounting
+Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
+AccountBalance=Account balance
+ObjectsRef=Source object ref
+CAHTF=Total purchase vendor before tax
+TotalExpenseReport=Total expense report
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+ExpenseReportLines=Lines of expense reports to bind
+ExpenseReportLinesDone=Bound lines of expense reports
+IntoAccount=Bind line with the accounting account
+TotalForAccount=Total accounting account
+
+
+Ventilate=Bind
+LineId=Id line
+Processing=Processing
+EndProcessing=Process terminated.
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+LineOfExpenseReport=Line of expense report
+NoAccountSelected=No accounting account selected
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+
+ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
+BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+
+ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+
+ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
+ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
+DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+LabelAccount=Label account
+LabelOperation=Label operation
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+LetteringCode=Lettering code
+Lettering=Lettering
+Codejournal=Journal
+JournalLabel=Journal label
+NumPiece=Piece number
+TransactionNumShort=Num. transaction
+AccountingCategory=Custom group
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
+AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+ByAccounts=By accounts
+ByPredefinedAccountGroups=By predefined groups
+ByPersonalizedAccountGroups=By personalized groups
+ByYear=By year
+NotMatch=Not Set
+DeleteMvt=Delete some operation lines from accounting
+DelMonth=Month to delete
+DelYear=Year to delete
+DelJournal=Journal to delete
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
+FinanceJournal=Finance journal
+ExpenseReportsJournal=Expense reports journal
+DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+FeeAccountNotDefined=Account for fee not defined
+BankAccountNotDefined=Account for bank not defined
+CustomerInvoicePayment=Payment of invoice customer
+ThirdPartyAccount=Third-party account
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+AddCompteFromBK=Add accounting accounts to the group
+ReportThirdParty=List third-party account
+DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+ListAccounts=List of the accounting accounts
+UnknownAccountForThirdparty=Unknown third-party account. We will use %s
+UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
+ShowOpeningBalance=Show opening balance
+HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by level
+
+Pcgtype=Group of account
+PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+
+Reconcilable=Reconcilable
+
+TotalVente=Total turnover before tax
+TotalMarge=Total sales margin
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+Vide=-
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
+DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
+DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
+DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
+DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+
+Closure=Annual closure
+DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
+OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
+ValidateMovements=Validate movements
+DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+Balancing=Balancing
+FicheVentilation=Binding card
+GeneralLedgerIsWritten=Transactions are written in the Ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
+NoNewRecordSaved=No more record to journalize
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet accounted in ledger
+ShowTutorial=Show Tutorial
+NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+
+## Admin
+BindingOptions=Binding options
+ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccountingJournal=Show accounting journal
+NatureOfJournal=Nature of Journal
+AccountingJournalType1=Miscellaneous operations
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType5=Expenses report
+AccountingJournalType8=Inventory
+AccountingJournalType9=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=Number of entries
+NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
+
+## Export
+ExportDraftJournal=Export draft journal
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export for CEGID Expert Comptabilité
+Modelcsv_COALA=Export for Sage Coala
+Modelcsv_bob50=Export for Sage BOB 50
+Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_quadratus=Export for Quadratus QuadraCompta
+Modelcsv_ebp=Export for EBP
+Modelcsv_cogilog=Export for Cogilog
+Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
+Modelcsv_openconcerto=Export for OpenConcerto (Test)
+Modelcsv_configurable=Export CSV Configurable
+Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5Export for Gestinum (v5)
+ChartofaccountsId=Chart of accounts Id
+
+## Tools - Init accounting account on product / service
+InitAccountancy=Init accountancy
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
+DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+Options=Options
+OptionModeProductSell=Mode sales
+OptionModeProductSellIntra=Mode sales exported in EEC
+OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductBuy=Mode purchases
+OptionModeProductBuyIntra=Mode purchases imported in EEC
+OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductSellDesc=Show all products with accounting account for sales.
+OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
+OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
+OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
+PredefinedGroups=Predefined groups
+WithoutValidAccount=Without valid dedicated account
+WithValidAccount=With valid dedicated account
+ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
+AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
+SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculated
+Formula=Formula
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ExportNotSupported=The export format setuped is not supported into this page
+BookeppingLineAlreayExists=Lines already existing into bookkeeping
+NoJournalDefined=No journal defined
+Binded=Lines bound
+ToBind=Lines to bind
+UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+
+## Import
+ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
+DateExport=Date export
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/ar_IQ/admin.lang b/htdocs/langs/ar_IQ/admin.lang
new file mode 100644
index 00000000000..8f4508ada53
--- /dev/null
+++ b/htdocs/langs/ar_IQ/admin.lang
@@ -0,0 +1,2124 @@
+# Dolibarr language file - Source file is en_US - admin
+Foundation=Foundation
+Version=Version
+Publisher=Publisher
+VersionProgram=Version program
+VersionLastInstall=Initial install version
+VersionLastUpgrade=Latest version upgrade
+VersionExperimental=Experimental
+VersionDevelopment=Development
+VersionUnknown=Unknown
+VersionRecommanded=Recommended
+FileCheck=Fileset Integrity Checks
+FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
+XmlNotFound=Xml Integrity File of application not found
+SessionId=Session ID
+SessionSaveHandler=Handler to save sessions
+SessionSavePath=Session save location
+PurgeSessions=Purge of sessions
+ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
+LockNewSessions=Lock new connections
+ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
+UnlockNewSessions=Remove connection lock
+YourSession=Your session
+Sessions=Users Sessions
+WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
+NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
+DBStoringCharset=Database charset to store data
+DBSortingCharset=Database charset to sort data
+HostCharset=Host charset
+ClientCharset=Client charset
+ClientSortingCharset=Client collation
+WarningModuleNotActive=Module <b>%s</b> must be enabled
+WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
+DolibarrSetup=Dolibarr install or upgrade
+InternalUser=Internal user
+ExternalUser=External user
+InternalUsers=Internal users
+ExternalUsers=External users
+GUISetup=Display
+SetupArea=Setup
+UploadNewTemplate=Upload new template(s)
+FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
+RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
+RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+SecuritySetup=Security setup
+PHPSetup=PHP setup
+SecurityFilesDesc=Define here options related to security about uploading files.
+ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
+ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
+ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
+DictionarySetup=Dictionary setup
+Dictionary=Dictionaries
+ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+ErrorCodeCantContainZero=Code can't contain value 0
+DisableJavascript=Disable JavaScript and Ajax functions
+DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+NumberOfKeyToSearch=Number of characters to trigger search: %s
+NumberOfBytes=Number of Bytes
+SearchString=Search string
+NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+JavascriptDisabled=JavaScript disabled
+UsePreviewTabs=Use preview tabs
+ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
+PreviewNotAvailable=Preview not available
+ThemeCurrentlyActive=Theme currently active
+MySQLTimeZone=TimeZone MySql (database)
+TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+Space=Space
+Table=Table
+Fields=Fields
+Index=Index
+Mask=Mask
+NextValue=Next value
+NextValueForInvoices=Next value (invoices)
+NextValueForCreditNotes=Next value (credit notes)
+NextValueForDeposit=Next value (down payment)
+NextValueForReplacements=Next value (replacements)
+MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
+MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page
+AntiVirusCommand=Full path to antivirus command
+AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= More parameters on command line
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Accounting module setup
+UserSetup=User management setup
+MultiCurrencySetup=Multi-currency setup
+MenuLimits=Limits and accuracy
+MenuIdParent=Parent menu ID
+DetailMenuIdParent=ID of parent menu (empty for a top menu)
+DetailPosition=Sort number to define menu position
+AllMenus=All
+NotConfigured=Module/Application not configured
+Active=Active
+SetupShort=Setup
+OtherOptions=Other options
+OtherSetup=Other Setup
+CurrentValueSeparatorDecimal=Decimal separator
+CurrentValueSeparatorThousand=Thousand separator
+Destination=Destination
+IdModule=Module ID
+IdPermissions=Permissions ID
+LanguageBrowserParameter=Parameter %s
+LocalisationDolibarrParameters=Localization parameters
+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 .htaccess file with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+Box=Widget
+Boxes=Widgets
+MaxNbOfLinesForBoxes=Max. number of lines for widgets
+AllWidgetsWereEnabled=All available widgets are enabled
+PositionByDefault=Default order
+Position=Position
+MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenuForUsers=Menu for users
+LangFile=.lang file
+Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+System=System
+SystemInfo=System information
+SystemToolsArea=System tools area
+SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+Purge=Purge
+PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files
+PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeRunNow=Purge now
+PurgeNothingToDelete=No directory or files to delete.
+PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
+PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeAuditEvents=Purge all security events
+ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+GenerateBackup=Generate backup
+Backup=Backup
+Restore=Restore
+RunCommandSummary=Backup has been launched with the following command
+BackupResult=Backup result
+BackupFileSuccessfullyCreated=Backup file successfully generated
+YouCanDownloadBackupFile=The generated file can now be downloaded
+NoBackupFileAvailable=No backup files available.
+ExportMethod=Export method
+ImportMethod=Import method
+ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=Filename for backup:
+Compression=Compression
+CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
+CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+ExportCompatibility=Compatibility of generated export file
+ExportUseMySQLQuickParameter=Use the --quick parameter
+ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+MySqlExportParameters=MySQL export parameters
+PostgreSqlExportParameters= PostgreSQL export parameters
+UseTransactionnalMode=Use transactional mode
+FullPathToMysqldumpCommand=Full path to mysqldump command
+FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
+AddDropDatabase=Add DROP DATABASE command
+AddDropTable=Add DROP TABLE command
+ExportStructure=Structure
+NameColumn=Name columns
+ExtendedInsert=Extended INSERT
+NoLockBeforeInsert=No lock commands around INSERT
+DelayedInsert=Delayed insert
+EncodeBinariesInHexa=Encode binary data in hexadecimal
+IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+AutoDetectLang=Autodetect (browser language)
+FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
+ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external app/modules
+ModulesDevelopYourModule=Develop your own app/modules
+ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
+DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+NewModule=New module
+FreeModule=Free
+CompatibleUpTo=Compatible with version %s
+NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=See in Market place
+SeeSetupOfModule=See setup of module %s
+Updated=Updated
+Nouveauté=Novelty
+AchatTelechargement=Buy / Download
+GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+WebSiteDesc=External websites for more add-on (non-core) modules...
+DevelopYourModuleDesc=Some solutions to develop your own module...
+URL=URL
+RelativeURL=Relative URL
+BoxesAvailable=Widgets available
+BoxesActivated=Widgets activated
+ActivateOn=Activate on
+ActiveOn=Activated on
+ActivatableOn=Activatable on
+SourceFile=Source file
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+Required=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
+Security=Security
+Passwords=Passwords
+DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
+ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+Feature=Feature
+DolibarrLicense=License
+Developpers=Developers/contributors
+OfficialWebSite=Dolibarr official web site
+OfficialWebSiteLocal=Local web site (%s)
+OfficialWiki=Dolibarr documentation / Wiki
+OfficialDemo=Dolibarr online demo
+OfficialMarketPlace=Official market place for external modules/addons
+OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+ReferencedPreferredPartners=Preferred Partners
+OtherResources=Other resources
+ExternalResources=External Resources
+SocialNetworks=Social Networks
+SocialNetworkId=Social Network ID
+ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
+HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
+CurrentMenuHandler=Current menu handler
+MeasuringUnit=Measuring unit
+LeftMargin=Left margin
+TopMargin=Top margin
+PaperSize=Paper type
+Orientation=Orientation
+SpaceX=Space X
+SpaceY=Space Y
+FontSize=Font size
+Content=Content
+NoticePeriod=Notice period
+NewByMonth=New by month
+Emails=Emails
+EMailsSetup=Emails setup
+EMailsDesc=This page allows you to set parameters or options for email sending.
+EmailSenderProfiles=Emails sender profiles
+EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
+MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_SENDMODE=Email sending method
+MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
+MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
+MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
+MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
+MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+UserEmail=User email
+CompanyEmail=Company Email
+FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
+SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+ModuleSetup=Module setup
+ModulesSetup=Modules/Application setup
+ModuleFamilyBase=System
+ModuleFamilyCrm=Customer Relationship Management (CRM)
+ModuleFamilySrm=Vendor Relationship Management (VRM)
+ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProjects=Projects/Collaborative work
+ModuleFamilyOther=Other
+ModuleFamilyTechnic=Multi-modules tools
+ModuleFamilyExperimental=Experimental modules
+ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
+ModuleFamilyECM=Electronic Content Management (ECM)
+ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyInterface=Interfaces with external systems
+MenuHandlers=Menu handlers
+MenuAdmin=Menu editor
+DoNotUseInProduction=Do not use in production
+ThisIsProcessToFollow=Upgrade procedure:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+StepNb=Step %s
+FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
+DownloadPackageFromWebSite=Download package (for example from the official web site %s).
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
+YouCanSubmitFile=You can upload the .zip file of module package from here:
+CurrentVersion=Dolibarr current version
+CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+LastStableVersion=Latest stable version
+LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
+UpdateServerOffline=Update server offline
+WithCounter=Manage a counter
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
+ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
+DoTestServerAvailability=Test server connectivity
+DoTestSend=Test sending
+DoTestSendHTML=Test sending HTML
+ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
+UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
+SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
+DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
+DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
+ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+MinLength=Minimum length
+LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
+LanguageFile=Language file
+ExamplesWithCurrentSetup=Examples with current configuration
+ListOfDirectories=List of OpenDocument templates directories
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
+NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=Position of Name/Lastname
+DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
+TestSubmitForm=Input test form
+ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThemeDir=Skins directory
+ConnectionTimeout=Connection timeout
+ResponseTimeout=Response timeout
+SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
+ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+SecurityToken=Key to secure URLs
+NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+PDF=PDF
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
+HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFLocaltax=Rules for %s
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideDescOnPDF=Hide products description
+HideRefOnPDF=Hide products ref.
+HideDetailsOnPDF=Hide product lines details
+PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+Library=Library
+UrlGenerationParameters=Parameters to secure URLs
+SecurityTokenIsUnique=Use a unique securekey parameter for each URL
+EnterRefToBuildUrl=Enter reference for object %s
+GetSecuredUrl=Get calculated URL
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+OldVATRates=Old VAT rate
+NewVATRates=New VAT rate
+PriceBaseTypeToChange=Modify on prices with base reference value defined on
+MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
+String=String
+String1Line=String (1 line)
+TextLong=Long text
+TextLongNLines=Long text (n lines)
+HtmlText=Html text
+Int=Integer
+Float=Float
+DateAndTime=Date and hour
+Unique=Unique
+Boolean=Boolean (one checkbox)
+ExtrafieldPhone = Phone
+ExtrafieldPrice = Price
+ExtrafieldMail = Email
+ExtrafieldUrl = Url
+ExtrafieldSelect = Select list
+ExtrafieldSelectList = Select from table
+ExtrafieldSeparator=Separator (not a field)
+ExtrafieldPassword=Password
+ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
+ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=Store computed field
+ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+LibraryToBuildPDF=Library used for PDF generation
+LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+SMS=SMS
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+RefreshPhoneLink=Refresh link
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+KeepEmptyToUseDefault=Keep empty to use default value
+KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+DefaultLink=Default link
+SetAsDefault=Set as default
+ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ExternalModule=External module
+InstalledInto=Installed into directory %s
+BarcodeInitForThirdparties=Mass barcode init for third-parties
+BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Erase all current barcode values
+ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+AllBarcodeReset=All barcode values have been removed
+NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+EnableFileCache=Enable file cache
+ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
+NoDetails=No additional details in footer
+DisplayCompanyInfo=Display company address
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
+EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
+ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
+ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
+ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ClickToShowDescription=Click to show description
+DependsOn=This module needs the module(s)
+RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+EnableDefaultValues=Enable customization of default values
+EnableOverwriteTranslation=Enable usage of overwritten translation
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
+FilesAttachedToEmail=Attach file
+SendEmailsReminders=Send agenda reminders by emails
+davDescription=Setup a WebDAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
+DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
+DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
+DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+# Modules
+Module0Name=Users & Groups
+Module0Desc=Users / Employees and Groups management
+Module1Name=Third Parties
+Module1Desc=Companies and contacts management (customers, prospects...)
+Module2Name=Commercial
+Module2Desc=Commercial management
+Module10Name=Accounting (simplified)
+Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module20Name=Proposals
+Module20Desc=Commercial proposal management
+Module22Name=Mass Emailings
+Module22Desc=Manage bulk emailing
+Module23Name=Energy
+Module23Desc=Monitoring the consumption of energies
+Module25Name=Sales Orders
+Module25Desc=Sales order management
+Module30Name=Invoices
+Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module40Name=Vendors
+Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module42Name=Debug Logs
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
+Module49Name=Editors
+Module49Desc=Editor management
+Module50Name=Products
+Module50Desc=Management of Products
+Module51Name=Mass mailings
+Module51Desc=Mass paper mailing management
+Module52Name=Stocks
+Module52Desc=Stock management
+Module53Name=Services
+Module53Desc=Management of Services
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or recurring subscriptions)
+Module55Name=Barcodes
+Module55Desc=Barcode management
+Module56Name=Payment by credit transfer
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module58Name=ClickToDial
+Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module60Name=Stickers
+Module60Desc=Management of stickers
+Module70Name=Interventions
+Module70Desc=Intervention management
+Module75Name=Expense and trip notes
+Module75Desc=Expense and trip notes management
+Module80Name=Shipments
+Module80Desc=Shipments and delivery note management
+Module85Name=Banks & Cash
+Module85Desc=Management of bank or cash accounts
+Module100Name=External Site
+Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module105Name=Mailman and SPIP
+Module105Desc=Mailman or SPIP interface for member module
+Module200Name=LDAP
+Module200Desc=LDAP directory synchronization
+Module210Name=PostNuke
+Module210Desc=PostNuke integration
+Module240Name=Data exports
+Module240Desc=Tool to export Dolibarr data (with assistance)
+Module250Name=Data imports
+Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module310Name=Members
+Module310Desc=Foundation members management
+Module320Name=RSS Feed
+Module320Desc=Add a RSS feed to Dolibarr pages
+Module330Name=Bookmarks & Shortcuts
+Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
+Module400Name=Projects or Leads
+Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module410Name=Webcalendar
+Module410Desc=Webcalendar integration
+Module500Name=Taxes & Special Expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module510Name=Salaries
+Module510Desc=Record and track employee payments
+Module520Name=Loans
+Module520Desc=Management of loans
+Module600Name=Notifications on business event
+Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
+Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
+Module610Name=Product Variants
+Module610Desc=Creation of product variants (color, size etc.)
+Module700Name=Donations
+Module700Desc=Donation management
+Module770Name=Expense Reports
+Module770Desc=Manage expense reports claims (transportation, meal, ...)
+Module1120Name=Vendor Commercial Proposals
+Module1120Desc=Request vendor commercial proposal and prices
+Module1200Name=Mantis
+Module1200Desc=Mantis integration
+Module1520Name=Document Generation
+Module1520Desc=Mass email document generation
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module2000Name=WYSIWYG editor
+Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2200Name=Dynamic Prices
+Module2200Desc=Use maths expressions for auto-generation of prices
+Module2300Name=Scheduled jobs
+Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2400Name=Events/Agenda
+Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2500Name=DMS / ECM
+Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2600Name=API/Web services (SOAP server)
+Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2610Name=API/Web services (REST server)
+Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2660Name=Call WebServices (SOAP client)
+Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2700Name=Gravatar
+Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2800Desc=FTP Client
+Module2900Name=GeoIPMaxmind
+Module2900Desc=GeoIP Maxmind conversions capabilities
+Module3200Name=Unalterable Archives
+Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module4000Name=HRM
+Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module5000Name=Multi-company
+Module5000Desc=Allows you to manage multiple companies
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module10000Name=Websites
+Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module20000Name=Leave Request Management
+Module20000Desc=Define and track employee leave requests
+Module39000Name=Product Lots
+Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
+Module40000Name=Multicurrency
+Module40000Desc=Use alternative currencies in prices and documents
+Module50000Name=PayBox
+Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50150Name=POS TakePOS
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50200Name=Paypal
+Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Name=Stripe
+Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50400Name=Accounting (double entry)
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module54000Name=PrintIPP
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module59000Name=Margins
+Module59000Desc=Module to follow margins
+Module60000Name=Commissions
+Module60000Desc=Module to manage commissions
+Module62000Name=Incoterms
+Module62000Desc=Add features to manage Incoterms
+Module63000Name=Resources
+Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Permission11=Read customer invoices
+Permission12=Create/modify customer invoices
+Permission13=Invalidate customer invoices
+Permission14=Validate customer invoices
+Permission15=Send customer invoices by email
+Permission16=Create payments for customer invoices
+Permission19=Delete customer invoices
+Permission21=Read commercial proposals
+Permission22=Create/modify commercial proposals
+Permission24=Validate commercial proposals
+Permission25=Send commercial proposals
+Permission26=Close commercial proposals
+Permission27=Delete commercial proposals
+Permission28=Export commercial proposals
+Permission31=Read products
+Permission32=Create/modify products
+Permission34=Delete products
+Permission36=See/manage hidden products
+Permission38=Export products
+Permission39=Ignore minimum price
+Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
+Permission44=Delete projects (shared project and projects I'm contact for)
+Permission45=Export projects
+Permission61=Read interventions
+Permission62=Create/modify interventions
+Permission64=Delete interventions
+Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
+Permission71=Read members
+Permission72=Create/modify members
+Permission74=Delete members
+Permission75=Setup types of membership
+Permission76=Export data
+Permission78=Read subscriptions
+Permission79=Create/modify subscriptions
+Permission81=Read customers orders
+Permission82=Create/modify customers orders
+Permission84=Validate customers orders
+Permission86=Send customers orders
+Permission87=Close customers orders
+Permission88=Cancel customers orders
+Permission89=Delete customers orders
+Permission91=Read social or fiscal taxes and vat
+Permission92=Create/modify social or fiscal taxes and vat
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
+Permission95=Read reports
+Permission101=Read sendings
+Permission102=Create/modify sendings
+Permission104=Validate sendings
+Permission105=Send sendings by email
+Permission106=Export sendings
+Permission109=Delete sendings
+Permission111=Read financial accounts
+Permission112=Create/modify/delete and compare transactions
+Permission113=Setup financial accounts (create, manage categories)
+Permission114=Reconcile transactions
+Permission115=Export transactions and account statements
+Permission116=Transfers between accounts
+Permission117=Manage checks dispatching
+Permission121=Read third parties linked to user
+Permission122=Create/modify third parties linked to user
+Permission125=Delete third parties linked to user
+Permission126=Export third parties
+Permission141=Read all projects and tasks (also private projects for which I am not a contact)
+Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission146=Read providers
+Permission147=Read stats
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejections of direct debit payment orders
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
+Permission171=Read trips and expenses (yours and your subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
+Permission180=Read suppliers
+Permission181=Read purchase orders
+Permission182=Create/modify purchase orders
+Permission183=Validate purchase orders
+Permission184=Approve purchase orders
+Permission185=Order or cancel purchase orders
+Permission186=Receive purchase orders
+Permission187=Close purchase orders
+Permission188=Cancel purchase orders
+Permission192=Create lines
+Permission193=Cancel lines
+Permission194=Read the bandwidth lines
+Permission202=Create ADSL connections
+Permission203=Order connections orders
+Permission204=Order connections
+Permission205=Manage connections
+Permission206=Read connections
+Permission211=Read Telephony
+Permission212=Order lines
+Permission213=Activate line
+Permission214=Setup Telephony
+Permission215=Setup providers
+Permission221=Read emailings
+Permission222=Create/modify emailings (topic, recipients...)
+Permission223=Validate emailings (allows sending)
+Permission229=Delete emailings
+Permission237=View recipients and info
+Permission238=Manually send mailings
+Permission239=Delete mailings after validation or sent
+Permission241=Read categories
+Permission242=Create/modify categories
+Permission243=Delete categories
+Permission244=See the contents of the hidden categories
+Permission251=Read other users and groups
+PermissionAdvanced251=Read other users
+Permission252=Read permissions of other users
+Permission253=Create/modify other users, groups and permissions
+PermissionAdvanced253=Create/modify internal/external users and permissions
+Permission254=Create/modify external users only
+Permission255=Modify other users password
+Permission256=Delete or disable other users
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission271=Read CA
+Permission272=Read invoices
+Permission273=Issue invoices
+Permission281=Read contacts
+Permission282=Create/modify contacts
+Permission283=Delete contacts
+Permission286=Export contacts
+Permission291=Read tariffs
+Permission292=Set permissions on the tariffs
+Permission293=Modify customer's tariffs
+Permission300=Read barcodes
+Permission301=Create/modify barcodes
+Permission302=Delete barcodes
+Permission311=Read services
+Permission312=Assign service/subscription to contract
+Permission331=Read bookmarks
+Permission332=Create/modify bookmarks
+Permission333=Delete bookmarks
+Permission341=Read its own permissions
+Permission342=Create/modify his own user information
+Permission343=Modify his own password
+Permission344=Modify its own permissions
+Permission351=Read groups
+Permission352=Read groups permissions
+Permission353=Create/modify groups
+Permission354=Delete or disable groups
+Permission358=Export users
+Permission401=Read discounts
+Permission402=Create/modify discounts
+Permission403=Validate discounts
+Permission404=Delete discounts
+Permission430=Use Debug Bar
+Permission511=Read payments of salaries (yours and subordinates)
+Permission512=Create/modify payments of salaries
+Permission514=Delete payments of salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
+Permission531=Read services
+Permission532=Create/modify services
+Permission534=Delete services
+Permission536=See/manage hidden services
+Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
+Permission650=Read Bills of Materials
+Permission651=Create/Update Bills of Materials
+Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
+Permission701=Read donations
+Permission702=Create/modify donations
+Permission703=Delete donations
+Permission771=Read expense reports (yours and your subordinates)
+Permission772=Create/modify expense reports
+Permission773=Delete expense reports
+Permission774=Read all expense reports (even for user not subordinates)
+Permission775=Approve expense reports
+Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
+Permission779=Export expense reports
+Permission1001=Read stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
+Permission1004=Read stock movements
+Permission1005=Create/modify stock movements
+Permission1101=Read delivery receipts
+Permission1102=Create/modify delivery receipts
+Permission1104=Validate delivery receipts
+Permission1109=Delete delivery receipts
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
+Permission1181=Read suppliers
+Permission1182=Read purchase orders
+Permission1183=Create/modify purchase orders
+Permission1184=Validate purchase orders
+Permission1185=Approve purchase orders
+Permission1186=Order purchase orders
+Permission1187=Acknowledge receipt of purchase orders
+Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
+Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
+Permission1201=Get result of an export
+Permission1202=Create/Modify an export
+Permission1231=Read vendor invoices
+Permission1232=Create/modify vendor invoices
+Permission1233=Validate vendor invoices
+Permission1234=Delete vendor invoices
+Permission1235=Send vendor invoices by email
+Permission1236=Export vendor invoices, attributes and payments
+Permission1237=Export purchase orders and their details
+Permission1251=Run mass imports of external data into database (data load)
+Permission1321=Export customer invoices, attributes and payments
+Permission1322=Reopen a paid bill
+Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
+Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
+Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
+Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission2411=Read actions (events or tasks) of others
+Permission2412=Create/modify actions (events or tasks) of others
+Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
+Permission2501=Read/Download documents
+Permission2502=Download documents
+Permission2503=Submit or delete documents
+Permission2515=Setup documents directories
+Permission2801=Use FTP client in read mode (browse and download only)
+Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Delete leave requests
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin leave requests (setup and update balance)
+Permission20007=Approve leave requests
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
+Permission50201=Read transactions
+Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
+Permission54001=Print
+Permission55001=Read polls
+Permission55002=Create/modify polls
+Permission59001=Read commercial margins
+Permission59002=Define commercial margins
+Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
+DictionaryCompanyType=Third-party types
+DictionaryCompanyJuridicalType=Third-party legal entities
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryCanton=States/Provinces
+DictionaryRegion=Regions
+DictionaryCountry=Countries
+DictionaryCurrency=Currencies
+DictionaryCivility=Honorific titles
+DictionaryActions=Types of agenda events
+DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryVAT=VAT Rates or Sales Tax Rates
+DictionaryRevenueStamp=Amount of tax stamps
+DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentModes=Payment Modes
+DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaperFormat=Paper formats
+DictionaryFormatCards=Card formats
+DictionaryFees=Expense report - Types of expense report lines
+DictionarySendingMethods=Shipping methods
+DictionaryStaff=Number of Employees
+DictionaryAvailability=Delivery delay
+DictionaryOrderMethods=Ordering methods
+DictionarySource=Origin of proposals/orders
+DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
+DictionaryEMailTemplates=Email Templates
+DictionaryUnits=Units
+DictionaryMeasuringUnits=Measuring Units
+DictionarySocialNetworks=Social Networks
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryHolidayTypes=Types of leave
+DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryExpenseTaxCat=Expense report - Transportation categories
+DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
+SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
+BackToModuleList=Back to Module list
+BackToDictionaryList=Back to Dictionaries list
+TypeOfRevenueStamp=Type of tax stamp
+VATManagement=Sales Tax Management
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
+VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
+VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
+LTRate=Rate
+LocalTax1IsNotUsed=Do not use second tax
+LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
+LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1Management=Second type of tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
+LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2Management=Third type of tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=RE Management
+LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
+LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
+LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
+LocalTax2ManagementES=IRPF Management
+LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
+LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
+LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+UseRevenueStamp=Use a tax stamp
+UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+CalcLocaltax=Reports on local taxes
+CalcLocaltax1=Sales - Purchases
+CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax2=Purchases
+CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax3=Sales
+CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+LabelUsedByDefault=Label used by default if no translation can be found for code
+LabelOnDocuments=Label on documents
+LabelOrTranslationKey=Label or translation key
+ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
+NbOfDays=No. of days
+AtEndOfMonth=At end of month
+CurrentNext=Current/Next
+Offset=Offset
+AlwaysActive=Always active
+Upgrade=Upgrade
+MenuUpgrade=Upgrade / Extend
+AddExtensionThemeModuleOrOther=Deploy/install external app/module
+WebServer=Web server
+DocumentRootServer=Web server's root directory
+DataRootServer=Data files directory
+IP=IP
+Port=Port
+VirtualServerName=Virtual server name
+OS=OS
+PhpWebLink=Web-Php link
+Server=Server
+Database=Database
+DatabaseServer=Database host
+DatabaseName=Database name
+DatabasePort=Database port
+DatabaseUser=Database user
+DatabasePassword=Database password
+Tables=Tables
+TableName=Table name
+NbOfRecord=No. of records
+Host=Server
+DriverType=Driver type
+SummarySystem=System information summary
+SummaryConst=List of all Dolibarr setup parameters
+MenuCompanySetup=Company/Organization
+DefaultMenuManager= Standard menu manager
+DefaultMenuSmartphoneManager=Smartphone menu manager
+Skin=Skin theme
+DefaultSkin=Default skin theme
+MaxSizeList=Max length for list
+DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+MessageOfDay=Message of the day
+MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
+PermanentLeftSearchForm=Permanent search form on left menu
+DefaultLanguage=Default language
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableShowLogo=Show the company logo in the menu
+CompanyInfo=Company/Organization
+CompanyIds=Company/Organization identities
+CompanyName=Name
+CompanyAddress=Address
+CompanyZip=Zip
+CompanyTown=Town
+CompanyCountry=Country
+CompanyCurrency=Main currency
+CompanyObject=Object of the company
+IDCountry=ID country
+Logo=Logo
+LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoSquarred=Logo (squarred)
+LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+DoNotSuggestPaymentMode=Do not suggest
+NoActiveBankAccountDefined=No active bank account defined
+OwnerOfBankAccount=Owner of bank account %s
+BankModuleNotActive=Bank accounts module not enabled
+ShowBugTrackLink=Show link "<strong>%s</strong>"
+Alerts=Alerts
+DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
+Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
+Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
+Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
+Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
+Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
+SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription5=Other Setup menu entries manage optional parameters.
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
+Audit=Audit
+InfoDolibarr=About Dolibarr
+InfoBrowser=About Browser
+InfoOS=About OS
+InfoWebServer=About Web Server
+InfoDatabase=About Database
+InfoPHP=About PHP
+InfoPerf=About Performances
+InfoSecurity=About Security
+BrowserName=Browser name
+BrowserOS=Browser OS
+ListOfSecurityEvents=List of Dolibarr security events
+SecurityEventsPurged=Security events purged
+LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
+SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
+SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
+AccountantFileNumber=Accountant code
+DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+AvailableModules=Available app/modules
+ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
+SessionTimeOut=Time out for session
+SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
+SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+TriggersAvailable=Available triggers
+TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
+TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
+GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+DictionaryDesc=Insert all reference data. You can add your values to the default.
+ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+MiscellaneousDesc=All other security related parameters are defined here.
+LimitsSetup=Limits/Precision setup
+LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
+MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
+MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
+MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
+MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+UnitPriceOfProduct=Net unit price of a product
+TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+ParameterActiveForNextInputOnly=Parameter effective for next input only
+NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
+NoEventFoundWithCriteria=No security event has been found for this search criteria.
+SeeLocalSendMailSetup=See your local sendmail setup
+BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
+BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
+BackupDescX=The archived directory should be stored in a secure place.
+BackupDescY=The generated dump file should be stored in a secure place.
+BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
+RestoreDesc=To restore a Dolibarr backup, two steps are required.
+RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
+RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+RestoreMySQL=MySQL import
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+PreviousDumpFiles=Existing backup files
+PreviousArchiveFiles=Existing archive files
+WeekStartOnDay=First day of the week
+RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
+YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
+DownloadMoreSkins=More skins to download
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+ShowProfIdInAddress=Show professional id with addresses
+ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+TranslationUncomplete=Partial translation
+MAIN_DISABLE_METEO=Disable meteorological view
+MeteoStdMod=Standard mode
+MeteoStdModEnabled=Standard mode enabled
+MeteoPercentageMod=Percentage mode
+MeteoPercentageModEnabled=Percentage mode enabled
+MeteoUseMod=Click to use %s
+TestLoginToAPI=Test login to API
+ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
+ExternalAccess=External/Internet Access
+MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
+MAIN_PROXY_HOST=Proxy server: Name/Address
+MAIN_PROXY_PORT=Proxy server: Port
+MAIN_PROXY_USER=Proxy server: Login/User
+MAIN_PROXY_PASS=Proxy server: Password
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+ExtraFields=Complementary attributes
+ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsThirdParties=Complementary attributes (third party)
+ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsMember=Complementary attributes (member)
+ExtraFieldsMemberType=Complementary attributes (member type)
+ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsSupplierOrders=Complementary attributes (orders)
+ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
+ExtraFieldsProject=Complementary attributes (projects)
+ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+PathToDocuments=Path to documents
+PathDirectory=Directory
+SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=You must at least enable 1 module
+ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+YesInSummer=Yes in summer
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+SuhosinSessionEncrypt=Session storage encrypted by Suhosin
+ConditionIsCurrently=Condition is currently %s
+YouUseBestDriver=You use driver %s which is the best driver currently available.
+YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+SearchOptim=Search optimization
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
+BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
+AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+FieldEdition=Edition of field %s
+FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+GetBarCode=Get barcode
+NumberingModules=Numbering models
+DocumentModules=Document models
+##### Module password generation
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationPerso=Return a password according to your personally defined configuration.
+SetupPerso=According to your configuration
+PasswordPatternDesc=Password pattern description
+##### Users setup #####
+RuleForGeneratedPasswords=Rules to generate and validate passwords
+DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+UsersSetup=Users module setup
+UserMailRequired=Email required to create a new user
+UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
+##### HRM setup #####
+HRMSetup=HRM module setup
+##### Company setup #####
+CompanySetup=Companies module setup
+CompanyCodeChecker=Options for automatic generation of customer/vendor codes
+AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
+NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
+NotificationsDescUser=* per user, one user at a time.
+NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
+NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+ModelModules=Document Templates
+DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Watermark on draft document
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+CompanyIdProfChecker=Rules for Professional IDs
+MustBeUnique=Must be unique?
+MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDavServer=Root URL of %s server: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+##### Invoices #####
+BillsSetup=Invoices module setup
+BillsNumberingModule=Invoices and credit notes numbering model
+BillsPDFModules=Invoice documents models
+BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+PaymentsPDFModules=Payment documents models
+ForceInvoiceDate=Force invoice date to validation date
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
+SuggestPaymentByChequeToAddress=Suggest payment by check to
+FreeLegalTextOnInvoices=Free text on invoices
+WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+PaymentsNumberingModule=Payments numbering model
+SuppliersPayment=Vendor payments
+SupplierPaymentSetup=Vendor payments setup
+##### Proposals #####
+PropalSetup=Commercial proposals module setup
+ProposalsNumberingModules=Commercial proposal numbering models
+ProposalsPDFModules=Commercial proposal documents models
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+FreeLegalTextOnProposal=Free text on commercial proposals
+WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+OrdersSetup=Sales Orders management setup
+OrdersNumberingModules=Orders numbering models
+OrdersModelModule=Order documents models
+FreeLegalTextOnOrders=Free text on orders
+WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+##### Interventions #####
+InterventionsSetup=Interventions module setup
+FreeLegalTextOnInterventions=Free text on intervention documents
+FicheinterNumberingModules=Intervention numbering models
+TemplatePDFInterventions=Intervention card documents models
+WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+##### Contracts #####
+ContractsSetup=Contracts/Subscriptions module setup
+ContractsNumberingModules=Contracts numbering modules
+TemplatePDFContracts=Contracts documents models
+FreeLegalTextOnContracts=Free text on contracts
+WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+##### Members #####
+MembersSetup=Members module setup
+MemberMainOptions=Main options
+AdherentLoginRequired= Manage a Login for each member
+AdherentMailRequired=Email required to create a new member
+MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
+MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
+MembersDocModules=Document templates for documents generated from member record
+##### LDAP setup #####
+LDAPSetup=LDAP Setup
+LDAPGlobalParameters=Global parameters
+LDAPUsersSynchro=Users
+LDAPGroupsSynchro=Groups
+LDAPContactsSynchro=Contacts
+LDAPMembersSynchro=Members
+LDAPMembersTypesSynchro=Members types
+LDAPSynchronization=LDAP synchronisation
+LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+LDAPNamingAttribute=Key in LDAP
+LDAPSynchronizeUsers=Organization of users in LDAP
+LDAPSynchronizeGroups=Organization of groups in LDAP
+LDAPSynchronizeContacts=Organization of contacts in LDAP
+LDAPSynchronizeMembers=Organization of foundation's members in LDAP
+LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPPrimaryServer=Primary server
+LDAPSecondaryServer=Secondary server
+LDAPServerPort=Server port
+LDAPServerPortExample=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
+LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
+LDAPContactDn=Dolibarr contacts' DN
+LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr members DN
+LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=List of objectClass
+LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPMemberTypeDn=Dolibarr members types DN
+LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=List of objectClass
+LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPUserObjectClassList=List of objectClass
+LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPGroupObjectClassList=List of objectClass
+LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPContactObjectClassList=List of objectClass
+LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPTestConnect=Test LDAP connection
+LDAPTestSynchroContact=Test contacts synchronization
+LDAPTestSynchroUser=Test user synchronization
+LDAPTestSynchroGroup=Test group synchronization
+LDAPTestSynchroMember=Test member synchronization
+LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSearch= Test a LDAP search
+LDAPSynchroOK=Synchronization test successful
+LDAPSynchroKO=Failed synchronization test
+LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
+LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=LDAP server configured for version 3
+LDAPSetupForVersion2=LDAP server configured for version 2
+LDAPDolibarrMapping=Dolibarr Mapping
+LDAPLdapMapping=LDAP Mapping
+LDAPFieldLoginUnix=Login (unix)
+LDAPFieldLoginExample=Example: uid
+LDAPFilterConnection=Search filter
+LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPFieldLoginSamba=Login (samba, activedirectory)
+LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldFullname=Full name
+LDAPFieldFullnameExample=Example: cn
+LDAPFieldPasswordNotCrypted=Password not encrypted
+LDAPFieldPasswordCrypted=Password encrypted
+LDAPFieldPasswordExample=Example: userPassword
+LDAPFieldCommonNameExample=Example: cn
+LDAPFieldName=Name
+LDAPFieldNameExample=Example: sn
+LDAPFieldFirstName=First name
+LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldMail=Email address
+LDAPFieldMailExample=Example: mail
+LDAPFieldPhone=Professional phone number
+LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldHomePhone=Personal phone number
+LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldMobile=Cellular phone
+LDAPFieldMobileExample=Example: mobile
+LDAPFieldFax=Fax number
+LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldAddress=Street
+LDAPFieldAddressExample=Example: street
+LDAPFieldZip=Zip
+LDAPFieldZipExample=Example: postalcode
+LDAPFieldTown=Town
+LDAPFieldTownExample=Example: l
+LDAPFieldCountry=Country
+LDAPFieldDescription=Description
+LDAPFieldDescriptionExample=Example: description
+LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldGroupMembers= Group members
+LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldBirthdate=Birthdate
+LDAPFieldCompany=Company
+LDAPFieldCompanyExample=Example: o
+LDAPFieldSid=SID
+LDAPFieldSidExample=Example: objectsid
+LDAPFieldEndLastSubscription=Date of subscription end
+LDAPFieldTitle=Job position
+LDAPFieldTitleExample=Example: title
+LDAPFieldGroupid=Group id
+LDAPFieldGroupidExample=Exemple : gidnumber
+LDAPFieldUserid=User id
+LDAPFieldUseridExample=Exemple : uidnumber
+LDAPFieldHomedirectory=Home directory
+LDAPFieldHomedirectoryExample=Exemple : homedirectory
+LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
+LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
+LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
+LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
+LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
+LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
+ForANonAnonymousAccess=For an authenticated access (for a write access for example)
+PerfDolibarr=Performance setup/optimizing report
+YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
+ApplicativeCache=Applicative cache
+MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
+MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
+MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+OPCodeCache=OPCode cache
+NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+FilesOfTypeCached=Files of type %s are cached by HTTP server
+FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
+FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
+FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+CacheByServer=Cache by server
+CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByClient=Cache by browser
+CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultCreateForm=Default values (to use on forms)
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
+DefaultMandatory=Mandatory form fields
+##### Products #####
+ProductSetup=Products module setup
+ServiceSetup=Services module setup
+ProductServiceSetup=Products and Services modules setup
+NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
+ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
+AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
+DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
+DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
+MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+SetDefaultBarcodeTypeProducts=Default barcode type to use for products
+SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
+ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductOtherConf= Product / Service configuration
+IsNotADir=is not a directory!
+##### Syslog #####
+SyslogSetup=Logs module setup
+SyslogOutput=Logs outputs
+SyslogFacility=Facility
+SyslogLevel=Level
+SyslogFilename=File name and path
+YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
+ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
+SyslogFileNumberOfSaves=Number of backup logs to keep
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+##### Donations #####
+DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
+##### Barcode #####
+BarcodeSetup=Barcode setup
+PaperFormatModule=Print format module
+BarcodeEncodeModule=Barcode encoding type
+CodeBarGenerator=Barcode generator
+ChooseABarCode=No generator defined
+FormatNotSupportedByGenerator=Format not supported by this generator
+BarcodeDescEAN8=Barcode of type EAN8
+BarcodeDescEAN13=Barcode of type EAN13
+BarcodeDescUPC=Barcode of type UPC
+BarcodeDescISBN=Barcode of type ISBN
+BarcodeDescC39=Barcode of type C39
+BarcodeDescC128=Barcode of type C128
+BarcodeDescDATAMATRIX=Barcode of type Datamatrix
+BarcodeDescQRCODE=Barcode of type QR code
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Internal engine
+BarCodeNumberManager=Manager to auto define barcode numbers
+##### Prelevements #####
+WithdrawalsSetup=Setup of module Direct Debit payments
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS Feed
+RSSUrl=RSS URL
+RSSUrlExample=An interesting RSS feed
+##### Mailing #####
+MailingSetup=EMailing module setup
+MailingEMailFrom=Sender email (From) for emails sent by emailing module
+MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingDelay=Seconds to wait after sending next message
+##### Notification #####
+NotificationSetup=Email Notification module setup
+NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+FixedEmailTarget=Recipient
+##### Sendings #####
+SendingsSetup=Shipping module setup
+SendingsReceiptModel=Sending receipt model
+SendingsNumberingModules=Sendings numbering modules
+SendingsAbility=Support shipping sheets for customer deliveries
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+FreeLegalTextOnShippings=Free text on shipments
+##### Deliveries #####
+DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderModel=Products deliveries receipt model
+DeliveriesOrderAbility=Support products deliveries receipts
+FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+##### FCKeditor #####
+AdvancedEditor=Advanced editor
+ActivateFCKeditor=Activate advanced editor for:
+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...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
+FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
+FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForTicket=WYSIWIG creation/edition for tickets
+##### Stock #####
+StockSetup=Stock module setup
+IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+##### Menu #####
+MenuDeleted=Menu deleted
+Menu=Menu
+Menus=Menus
+TreeMenuPersonalized=Personalized menus
+NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NewMenu=New menu
+MenuHandler=Menu handler
+MenuModule=Source module
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+DetailId=Id menu
+DetailMenuHandler=Menu handler where to show new menu
+DetailMenuModule=Module name if menu entry come from a module
+DetailType=Type of menu (top or left)
+DetailTitre=Menu label or label code for translation
+DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
+DetailEnabled=Condition to show or not entry
+DetailRight=Condition to display unauthorized grey menus
+DetailLangs=Lang file name for label code translation
+DetailUser=Intern / Extern / All
+Target=Target
+DetailTarget=Target for links (_blank top opens a new window)
+DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
+ModifMenu=Menu change
+DeleteMenu=Delete menu entry
+ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+FailedToInitializeMenu=Failed to initialize menu
+##### Tax #####
+TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+OptionVatMode=VAT due
+OptionVATDefault=Standard basis
+OptionVATDebitOption=Accrual basis
+OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
+OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionPaymentForProductAndServices=Cash basis for products and services
+OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OnDelivery=On delivery
+OnPayment=On payment
+OnInvoice=On invoice
+SupposedToBePaymentDate=Payment date used
+SupposedToBeInvoiceDate=Invoice date used
+Buy=Buy
+Sell=Sell
+InvoiceDateUsed=Invoice date used
+YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+AccountancyCode=Accounting Code
+AccountancyCodeSell=Sale account. code
+AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+##### Agenda #####
+AgendaSetup=Events and agenda module setup
+PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
+PastDelayVCalExport=Do not export event older than
+AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
+AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+##### Point Of Sale (CashDesk) #####
+CashDesk=Point of Sale
+CashDeskSetup=Point of Sales module setup
+CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDeskBankAccountForSell=Default account to use to receive cash payments
+CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
+CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
+CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
+CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
+CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+##### Bookmark #####
+BookmarkSetup=Bookmark module setup
+BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
+NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+##### WebServices #####
+WebServicesSetup=Webservices module setup
+WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
+WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
+EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+##### API ####
+ApiSetup=API module setup
+ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
+ApiExporerIs=You can explore and test the APIs at URL
+OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
+ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+##### Bank #####
+BankSetupModule=Bank module setup
+FreeLegalTextOnChequeReceipts=Free text on check receipts
+BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+BankOrderGlobal=General
+BankOrderGlobalDesc=General display order
+BankOrderES=Spanish
+BankOrderESDesc=Spanish display order
+ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
+##### Suppliers #####
+SuppliersSetup=Vendor module setup
+SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
+SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=GeoIP Maxmind module setup
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
+YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
+YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
+TestGeoIPResult=Test of a conversion IP -> country
+##### Projects #####
+ProjectsNumberingModules=Projects numbering module
+ProjectsSetup=Project module setup
+ProjectsModelModule=Project reports document model
+TasksNumberingModules=Tasks numbering module
+TaskModelModule=Tasks reports document model
+UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+##### ECM (GED) #####
+##### Fiscal Year #####
+AccountingPeriods=Accounting periods
+AccountingPeriodCard=Accounting period
+NewFiscalYear=New accounting period
+OpenFiscalYear=Open accounting period
+CloseFiscalYear=Close accounting period
+DeleteFiscalYear=Delete accounting period
+ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
+ShowFiscalYear=Show accounting period
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
+Format=Format
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
+ExpenseReportNumberingModules=Expense reports numbering module
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerUser=List of automatic notifications per user*
+ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
+ListOfFixedNotifications=List of automatic fixed notifications
+GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
+GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+Threshold=Threshold
+BackupDumpWizard=Wizard to build the database dump file
+BackupZipWizard=Wizard to build the archive of documents directory
+SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
+HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+TextTitleColor=Text color of Page title
+LinkColor=Color of links
+PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+BackgroundColor=Background color
+TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
+LeftMenuBackgroundColor=Background color for Left menu
+BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
+BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableLineOddColor=Background color for odd table lines
+BackgroundTableLineEvenColor=Background color for even table lines
+MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
+Enter0or1=Enter 0 or 1
+UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PositionIntoComboList=Position of line into combo lists
+SellTaxRate=Sale tax rate
+RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
+UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
+OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
+TemplateForElement=This template record is dedicated to which element
+TypeOfTemplate=Type of template
+TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+VisibleEverywhere=Visible everywhere
+VisibleNowhere=Visible nowhere
+FixTZ=TimeZone fix
+FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+ExpectedChecksum=Expected Checksum
+CurrentChecksum=Current Checksum
+ExpectedSize=Expected size
+CurrentSize=Current size
+ForcedConstants=Required constant values
+MailToSendProposal=Customer proposals
+MailToSendOrder=Sales orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToSendReception=Receptions
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects
+MailToTicket=Tickets
+ByDefaultInList=Show by default on list view
+YouUseLastStableVersion=You use the latest stable version
+TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
+TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
+SeeChangeLog=See ChangeLog file (english only)
+AllPublishers=All publishers
+UnknownPublishers=Unknown publishers
+AddRemoveTabs=Add or remove tabs
+AddDataTables=Add object tables
+AddDictionaries=Add dictionaries tables
+AddData=Add objects or dictionaries data
+AddBoxes=Add widgets
+AddSheduledJobs=Add scheduled jobs
+AddHooks=Add hooks
+AddTriggers=Add triggers
+AddMenus=Add menus
+AddPermissions=Add permissions
+AddExportProfiles=Add export profiles
+AddImportProfiles=Add import profiles
+AddOtherPagesOrServices=Add other pages or services
+AddModels=Add document or numbering templates
+AddSubstitutions=Add keys substitutions
+DetectionNotPossible=Detection not possible
+UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+ListOfAvailableAPIs=List of available APIs
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
+UserHasNoPermissions=This user has no permissions defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+MAIN_PDF_MARGIN_LEFT=Left margin on PDF
+MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
+MAIN_PDF_MARGIN_TOP=Top margin on PDF
+MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+NothingToSetup=There is no specific setup required for this module.
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+SeveralLangugeVariatFound=Several language variants found
+RemoveSpecialChars=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+HelpOnTooltip=Help text to show on tooltip
+HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
+YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
+ChartLoaded=Chart of account loaded
+SocialNetworkSetup=Setup of module Social Networks
+EnableFeatureFor=Enable features for <strong>%s</strong>
+VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+EmailCollector=Email collector
+EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
+NewEmailCollector=New Email Collector
+EMailHost=Host of email IMAP server
+MailboxSourceDirectory=Mailbox source directory
+MailboxTargetDirectory=Mailbox target directory
+EmailcollectorOperations=Operations to do by collector
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
+MaxEmailCollectPerCollect=Max number of emails collected per collect
+CollectNow=Collect now
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
+LastResult=Latest result
+EmailCollectorConfirmCollectTitle=Email collect confirmation
+EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+NoNewEmailToProcess=No new email (matching filters) to process
+NothingProcessed=Nothing done
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Record email event
+CreateLeadAndThirdParty=Create lead (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+CodeLastResult=Latest result code
+NbOfEmailsInInbox=Number of emails in source directory
+LoadThirdPartyFromName=Load third party searching on %s (load only)
+LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
+CreateCandidature=Create job application
+FormatZip=Zip
+MainMenuCode=Menu entry code (mainmenu)
+ECMAutoTree=Show automatic ECM tree
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OpeningHours=Opening hours
+OpeningHoursDesc=Enter here the regular opening hours of your company.
+ResourceSetup=Configuration of Resource module
+UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
+EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+ConfirmUnactivation=Confirm module reset
+OnMobileOnly=On small screen (smartphone) only
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
+ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
+DefaultCustomerType=Default thirdparty type for "New customer" creation form
+ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
+RootCategoryForProductsToSell=Root category of products to sell
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+DebugBar=Debug Bar
+DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+DebugBarSetup=DebugBar Setup
+GeneralOptions=General Options
+LogsLinesNumber=Number of lines to show on logs tab
+UseDebugBar=Use the debug bar
+DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
+WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
+ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+EXPORTS_SHARE_MODELS=Export models are share with everybody
+ExportSetup=Setup of module Export
+ImportSetup=Setup of module Import
+InstanceUniqueID=Unique ID of the instance
+SmallerThan=Smaller than
+LargerThan=Larger than
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
+WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
+RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
+AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
+EmailTemplate=Template for email
+EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
+PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
+MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
+MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Event reminder email
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CombinationsSeparator=Separator character for product combinations
+SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/ar_IQ/agenda.lang b/htdocs/langs/ar_IQ/agenda.lang
new file mode 100644
index 00000000000..ca614595a65
--- /dev/null
+++ b/htdocs/langs/ar_IQ/agenda.lang
@@ -0,0 +1,170 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID event
+Actions=Events
+Agenda=Agenda
+TMenuAgenda=Agenda
+Agendas=Agendas
+LocalAgenda=Default calendar
+ActionsOwnedBy=Event owned by
+ActionsOwnedByShort=Owner
+AffectedTo=Assigned to
+Event=Event
+Events=Events
+EventsNb=Number of events
+ListOfActions=List of events
+EventReports=Event reports
+Location=Location
+ToUserOfGroup=Event assigned to any user in the group
+EventOnFullDay=Event on all day(s)
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (default calendar)
+ActionsAskedBy=Events reported by
+ActionsToDoBy=Events assigned to
+ActionsDoneBy=Events done by
+ActionAssignedTo=Event assigned to
+ViewCal=Month view
+ViewDay=Day view
+ViewWeek=Week view
+ViewPerUser=Per user view
+ViewPerType=Per type view
+AutoActions= Automatic filling
+AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
+AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+##### Agenda event labels #####
+NewCompanyToDolibarr=Third party %s created
+COMPANY_DELETEInDolibarr=Third party %s deleted
+ContractValidatedInDolibarr=Contract %s validated
+CONTRACT_DELETEInDolibarr=Contract %s deleted
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
+InvoiceDeleteDolibarr=Invoice %s deleted
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+MemberValidatedInDolibarr=Member %s validated
+MemberModifiedInDolibarr=Member %s modified
+MemberResiliatedInDolibarr=Member %s terminated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
+MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
+MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
+ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentDeletedInDolibarr=Shipment %s deleted
+ReceptionValidatedInDolibarr=Reception %s validated
+OrderCreatedInDolibarr=Order %s created
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
+OrderApprovedInDolibarr=Order %s approved
+OrderRefusedInDolibarr=Order %s refused
+OrderBackToDraftInDolibarr=Order %s go back to draft status
+ProposalSentByEMail=Commercial proposal %s sent by email
+ContractSentByEMail=Contract %s sent by email
+OrderSentByEMail=Sales order %s sent by email
+InvoiceSentByEMail=Customer invoice %s sent by email
+SupplierOrderSentByEMail=Purchase order %s sent by email
+ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
+ShippingSentByEMail=Shipment %s sent by email
+ShippingValidated= Shipment %s validated
+InterventionSentByEMail=Intervention %s sent by email
+ProposalDeleted=Proposal deleted
+OrderDeleted=Order deleted
+InvoiceDeleted=Invoice deleted
+DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
+PRODUCT_CREATEInDolibarr=Product %s created
+PRODUCT_MODIFYInDolibarr=Product %s modified
+PRODUCT_DELETEInDolibarr=Product %s deleted
+HOLIDAY_CREATEInDolibarr=Request for leave %s created
+HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
+HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
+HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
+HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
+EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
+EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
+EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
+EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+PROJECT_CREATEInDolibarr=Project %s created
+PROJECT_MODIFYInDolibarr=Project %s modified
+PROJECT_DELETEInDolibarr=Project %s deleted
+TICKET_CREATEInDolibarr=Ticket %s created
+TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
+TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_DELETEInDolibarr=Ticket %s deleted
+BOM_VALIDATEInDolibarr=BOM validated
+BOM_UNVALIDATEInDolibarr=BOM unvalidated
+BOM_CLOSEInDolibarr=BOM disabled
+BOM_REOPENInDolibarr=BOM reopen
+BOM_DELETEInDolibarr=BOM deleted
+MRP_MO_VALIDATEInDolibarr=MO validated
+MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
+MRP_MO_PRODUCEDInDolibarr=MO produced
+MRP_MO_DELETEInDolibarr=MO deleted
+MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
+##### End agenda events #####
+AgendaModelModule=Document templates for event
+DateActionStart=Start date
+DateActionEnd=End date
+AgendaUrlOptions1=You can also add following parameters to filter output:
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaShowBirthdayEvents=Birthdays of contacts
+AgendaHideBirthdayEvents=Hide birthdays of contacts
+Busy=Busy
+ExportDataset_event1=List of agenda events
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
+# External Sites ical
+ExportCal=Export calendar
+ExtSites=Import external calendars
+ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesNbOfAgenda=Number of calendars
+AgendaExtNb=Calendar no. %s
+ExtSiteUrlAgenda=URL to access .ical file
+ExtSiteNoLabel=No Description
+VisibleTimeRange=Visible time range
+VisibleDaysRange=Visible days range
+AddEvent=Create event
+MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+RepeatEvent=Repeat event
+OnceOnly=Once only
+EveryWeek=Every week
+EveryMonth=Every month
+DayOfMonth=Day of month
+DayOfWeek=Day of week
+DateStartPlusOne=Date start + 1 hour
+SetAllEventsToTodo=Set all events to todo
+SetAllEventsToInProgress=Set all events to in progress
+SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/ar_IQ/assets.lang b/htdocs/langs/ar_IQ/assets.lang
new file mode 100644
index 00000000000..afafc98503f
--- /dev/null
+++ b/htdocs/langs/ar_IQ/assets.lang
@@ -0,0 +1,67 @@
+# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+Assets = Assets
+NewAsset = New asset
+AccountancyCodeAsset = Accounting code (asset)
+AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
+NewAssetType=New asset type
+AssetsTypeSetup=Asset type setup
+AssetTypeModified=Asset type modified
+AssetType=Asset type
+AssetsLines=Assets
+DeleteType=Delete
+DeleteAnAssetType=Delete an asset type
+ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
+ShowTypeCard=Show type '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = Assets description
+
+#
+# Admin page
+#
+AssetsSetup = Assets setup
+Settings = Settings
+AssetsSetupPage = Assets setup page
+ExtraFieldsAssetsType = Complementary attributes (Asset type)
+AssetsType=Asset type
+AssetsTypeId=Asset type id
+AssetsTypeLabel=Asset type label
+AssetsTypes=Assets types
+
+#
+# Menu
+#
+MenuAssets = Assets
+MenuNewAsset = New asset
+MenuTypeAssets = Type assets
+MenuListAssets = List
+MenuNewTypeAssets = New
+MenuListTypeAssets = List
+
+#
+# Module
+#
+Asset=Asset
+NewAssetType=New asset type
+NewAsset=New asset
+ConfirmDeleteAsset=Are you sure you want to delete this asset ?
diff --git a/htdocs/langs/ar_IQ/banks.lang b/htdocs/langs/ar_IQ/banks.lang
new file mode 100644
index 00000000000..8e2d828c12a
--- /dev/null
+++ b/htdocs/langs/ar_IQ/banks.lang
@@ -0,0 +1,184 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=Bank
+MenuBankCash=Banks | Cash
+MenuVariousPayment=Miscellaneous payments
+MenuNewVariousPayment=New Miscellaneous payment
+BankName=Bank name
+FinancialAccount=Account
+BankAccount=Bank account
+BankAccounts=Bank accounts
+BankAccountsAndGateways=Bank accounts | Gateways
+ShowAccount=Show Account
+AccountRef=Financial account ref
+AccountLabel=Financial account label
+CashAccount=Cash account
+CashAccounts=Cash accounts
+CurrentAccounts=Current accounts
+SavingAccounts=Savings accounts
+ErrorBankLabelAlreadyExists=Financial account label already exists
+BankBalance=Balance
+BankBalanceBefore=Balance before
+BankBalanceAfter=Balance after
+BalanceMinimalAllowed=Minimum allowed balance
+BalanceMinimalDesired=Minimum desired balance
+InitialBankBalance=Initial balance
+EndBankBalance=End balance
+CurrentBalance=Current balance
+FutureBalance=Future balance
+ShowAllTimeBalance=Show balance from start
+AllTime=From start
+Reconciliation=Reconciliation
+RIB=Bank Account Number
+IBAN=IBAN number
+BIC=BIC/SWIFT code
+SwiftValid=BIC/SWIFT valid
+SwiftVNotalid=BIC/SWIFT not valid
+IbanValid=BAN valid
+IbanNotValid=BAN not valid
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
+PaymentByDirectDebit=Payment by direct debit
+PaymentByBankTransfers=Payments by credit transfer
+PaymentByBankTransfer=Payment by credit transfer
+AccountStatement=Account statement
+AccountStatementShort=Statement
+AccountStatements=Account statements
+LastAccountStatements=Last account statements
+IOMonthlyReporting=Monthly reporting
+BankAccountDomiciliation=Bank address
+BankAccountCountry=Account country
+BankAccountOwner=Account owner name
+BankAccountOwnerAddress=Account owner address
+RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+CreateAccount=Create account
+NewBankAccount=New account
+NewFinancialAccount=New financial account
+MenuNewFinancialAccount=New financial account
+EditFinancialAccount=Edit account
+LabelBankCashAccount=Bank or cash label
+AccountType=Account type
+BankType0=Savings account
+BankType1=Current or credit card account
+BankType2=Cash account
+AccountsArea=Accounts area
+AccountCard=Account card
+DeleteAccount=Delete account
+ConfirmDeleteAccount=Are you sure you want to delete this account?
+Account=Account
+BankTransactionByCategories=Bank entries by categories
+BankTransactionForCategory=Bank entries for category <b>%s</b>
+RemoveFromRubrique=Remove link with category
+RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
+ListBankTransactions=List of bank entries
+IdTransaction=Transaction ID
+BankTransactions=Bank entries
+BankTransaction=Bank entry
+ListTransactions=List entries
+ListTransactionsByCategory=List entries/category
+TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
+Conciliable=Can be reconciled
+Conciliate=Reconcile
+Conciliation=Reconciliation
+SaveStatementOnly=Save statement only
+ReconciliationLate=Reconciliation late
+IncludeClosedAccount=Include closed accounts
+OnlyOpenedAccount=Only open accounts
+AccountToCredit=Account to credit
+AccountToDebit=Account to debit
+DisableConciliation=Disable reconciliation feature for this account
+ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated entry
+StatusAccountOpened=Open
+StatusAccountClosed=Closed
+AccountIdShort=Number
+LineRecord=Transaction
+AddBankRecord=Add entry
+AddBankRecordLong=Add entry manually
+Conciliated=Reconciled
+ConciliatedBy=Reconciled by
+DateConciliating=Reconcile date
+BankLineConciliated=Entry reconciled with bank receipt
+Reconciled=Reconciled
+NotReconciled=Not reconciled
+CustomerInvoicePayment=Customer payment
+SupplierInvoicePayment=Vendor payment
+SubscriptionPayment=Subscription payment
+WithdrawalPayment=Debit payment order
+SocialContributionPayment=Social/fiscal tax payment
+BankTransfer=Credit transfer
+BankTransfers=Credit transfers
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferFrom=From
+TransferTo=To
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
+CheckTransmitter=Transmitter
+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?
+BankChecks=Bank checks
+BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
+ShowCheckReceipt=Show check deposit receipt
+NumberOfCheques=No. of check
+DeleteTransaction=Delete entry
+ConfirmDeleteTransaction=Are you sure you want to delete this entry?
+ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+BankMovements=Movements
+PlannedTransactions=Planned entries
+Graph=Graphics
+ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_2=Deposit slip
+TransactionOnTheOtherAccount=Transaction on the other account
+PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateFailed=Payment number could not be updated
+PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateFailed=Payment date could not be updated
+Transactions=Transactions
+BankTransactionLine=Bank entry
+AllAccounts=All bank and cash accounts
+BackToAccount=Back to account
+ShowAllAccounts=Show for all accounts
+FutureTransaction=Future transaction. Unable to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+EventualyAddCategory=Eventually, specify a category in which to classify the records
+ToConciliate=To reconcile?
+ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+DefaultRIB=Default BAN
+AllRIB=All BAN
+LabelRIB=BAN Label
+NoBANRecord=No BAN record
+DeleteARib=Delete BAN record
+ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+RejectCheck=Check returned
+ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+RejectCheckDate=Date the check was returned
+CheckRejected=Check returned
+CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
+NewVariousPayment=New miscellaneous payment
+VariousPayment=Miscellaneous payment
+VariousPayments=Miscellaneous payments
+ShowVariousPayment=Show miscellaneous payment
+AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+SEPAMandate=SEPA mandate
+YourSEPAMandate=Your SEPA mandate
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
+AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
+CashControl=POS cash desk control
+NewCashFence=New cash desk opening or closing
+BankColorizeMovement=Colorize movements
+BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
+BankColorizeMovementName1=Background color for debit movement
+BankColorizeMovementName2=Background color for credit movement
+IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/ar_IQ/bills.lang b/htdocs/langs/ar_IQ/bills.lang
new file mode 100644
index 00000000000..c0eb886a987
--- /dev/null
+++ b/htdocs/langs/ar_IQ/bills.lang
@@ -0,0 +1,591 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=Invoice
+Bills=Invoices
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Vendor invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid vendor invoices
+BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsLate=Late payments
+BillsStatistics=Customers invoices statistics
+BillsStatisticsSuppliers=Vendors invoices statistics
+DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
+DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotErasable=Disabled because cannot be erased
+InvoiceStandard=Standard invoice
+InvoiceStandardAsk=Standard invoice
+InvoiceStandardDesc=This kind of invoice is the common invoice.
+InvoiceDeposit=Down payment invoice
+InvoiceDepositAsk=Down payment invoice
+InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceProForma=Proforma invoice
+InvoiceProFormaAsk=Proforma invoice
+InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
+InvoiceReplacement=Replacement invoice
+InvoiceReplacementAsk=Replacement invoice for invoice
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceAvoir=Credit note
+InvoiceAvoirAsk=Credit note to correct invoice
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+ReplaceInvoice=Replace invoice %s
+ReplacementInvoice=Replacement invoice
+ReplacedByInvoice=Replaced by invoice %s
+ReplacementByInvoice=Replaced by invoice
+CorrectInvoice=Correct invoice %s
+CorrectionInvoice=Correction invoice
+UsedByInvoice=Used to pay invoice %s
+ConsumedBy=Consumed by
+NotConsumed=Not consumed
+NoReplacableInvoice=No replaceable invoices
+NoInvoiceToCorrect=No invoice to correct
+InvoiceHasAvoir=Was source of one or several credit notes
+CardBill=Invoice card
+PredefinedInvoices=Predefined Invoices
+Invoice=Invoice
+PdfInvoiceTitle=Invoice
+Invoices=Invoices
+InvoiceLine=Invoice line
+InvoiceCustomer=Customer invoice
+CustomerInvoice=Customer invoice
+CustomersInvoices=Customer invoices
+SupplierInvoice=Vendor invoice
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
+SupplierBill=Vendor invoice
+SupplierBills=Vendor invoices
+Payment=Payment
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+Payments=Payments
+PaymentsBack=Refunds
+paymentInInvoiceCurrency=in invoices currency
+PaidBack=Paid back
+DeletePayment=Delete payment
+ConfirmDeletePayment=Are you sure you want to delete this payment?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+SupplierPayments=Vendor payments
+ReceivedPayments=Received payments
+ReceivedCustomersPayments=Payments received from customers
+PayedSuppliersPayments=Payments paid to vendors
+ReceivedCustomersPaymentsToValid=Received customers payments to validate
+PaymentsReportsForYear=Payments reports for %s
+PaymentsReports=Payments reports
+PaymentsAlreadyDone=Payments already done
+PaymentsBackAlreadyDone=Refunds already done
+PaymentRule=Payment rule
+PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
+IdPaymentMode=Payment Type (id)
+CodePaymentMode=Payment Type (code)
+LabelPaymentMode=Payment Type (label)
+PaymentModeShort=Payment Type
+PaymentTerm=Payment Term
+PaymentConditions=Payment Terms
+PaymentConditionsShort=Payment Terms
+PaymentAmount=Payment amount
+PaymentHigherThanReminderToPay=Payment higher than reminder to pay
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
+ClassifyPaidPartially=Classify 'Paid partially'
+ClassifyCanceled=Classify 'Abandoned'
+ClassifyClosed=Classify 'Closed'
+ClassifyUnBilled=Classify 'Unbilled'
+CreateBill=Create Invoice
+CreateCreditNote=Create credit note
+AddBill=Create invoice or credit note
+AddToDraftInvoices=Add to draft invoice
+DeleteBill=Delete invoice
+SearchACustomerInvoice=Search for a customer invoice
+SearchASupplierInvoice=Search for a vendor invoice
+CancelBill=Cancel an invoice
+SendRemindByMail=Send reminder by email
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
+ConvertToReduc=Mark as credit available
+ConvertExcessReceivedToReduc=Convert excess received into available credit
+ConvertExcessPaidToReduc=Convert excess paid into available discount
+EnterPaymentReceivedFromCustomer=Enter payment received from customer
+EnterPaymentDueToCustomer=Make payment due to customer
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+PriceBase=Price base
+BillStatus=Invoice status
+StatusOfGeneratedInvoices=Status of generated invoices
+BillStatusDraft=Draft (needs to be validated)
+BillStatusPaid=Paid
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusCanceled=Abandoned
+BillStatusValidated=Validated (needs to be paid)
+BillStatusStarted=Started
+BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
+BillStatusClosedUnpaid=Closed (unpaid)
+BillStatusClosedPaidPartially=Paid (partially)
+BillShortStatusDraft=Draft
+BillShortStatusPaid=Paid
+BillShortStatusPaidBackOrConverted=Refunded or converted
+Refunded=Refunded
+BillShortStatusConverted=Paid
+BillShortStatusCanceled=Abandoned
+BillShortStatusValidated=Validated
+BillShortStatusStarted=Started
+BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
+BillShortStatusClosedUnpaid=Closed
+BillShortStatusClosedPaidPartially=Paid (partially)
+PaymentStatusToValidShort=To validate
+ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
+ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
+ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorBillNotFound=Invoice %s does not exist
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorDiscountAlreadyUsed=Error, discount already used
+ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
+ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+BillFrom=From
+BillTo=To
+ActionsOnBill=Actions on invoice
+RecurringInvoiceTemplate=Template / Recurring invoice
+NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+NotARecurringInvoiceTemplate=Not a recurring template invoice
+NewBill=New invoice
+LastBills=Latest %s invoices
+LatestTemplateInvoices=Latest %s template invoices
+LatestCustomerTemplateInvoices=Latest %s customer template invoices
+LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s vendor invoices
+AllBills=All invoices
+AllCustomerTemplateInvoices=All template invoices
+OtherBills=Other invoices
+DraftBills=Draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Vendor draft invoices
+Unpaid=Unpaid
+ErrorNoPaymentDefined=Error No payment defined
+ConfirmDeleteBill=Are you sure you want to delete this invoice?
+ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
+ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
+ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
+ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
+ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
+ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyAbandonReasonOther=Other
+ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
+ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
+ValidateBill=Validate invoice
+UnvalidateBill=Unvalidate invoice
+NumberOfBills=No. of invoices
+NumberOfBillsByMonth=No. of invoices per month
+AmountOfBills=Amount of invoices
+AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
+UseSituationInvoices=Allow situation invoice
+UseSituationInvoicesCreditNote=Allow situation invoice credit note
+Retainedwarranty=Retained warranty
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+RetainedwarrantyDefaultPercent=Retained warranty default percent
+RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
+RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+ToPayOn=To pay on %s
+toPayOn=to pay on %s
+RetainedWarranty=Retained Warranty
+PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
+DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
+setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
+setretainedwarranty=Set retained warranty
+setretainedwarrantyDateLimit=Set retained warranty date limit
+RetainedWarrantyDateLimit=Retained warranty date limit
+RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+AlreadyPaid=Already paid
+AlreadyPaidBack=Already paid back
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+Abandoned=Abandoned
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to refund
+Rest=Pending
+AmountExpected=Amount claimed
+ExcessReceived=Excess received
+ExcessPaid=Excess paid
+EscompteOffered=Discount offered (payment before term)
+EscompteOfferedShort=Discount
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
+NoDraftBills=No draft invoices
+NoOtherDraftBills=No other draft invoices
+NoDraftInvoices=No draft invoices
+RefBill=Invoice ref
+ToBill=To bill
+RemainderToBill=Remainder to bill
+SendBillByMail=Send invoice by email
+SendReminderBillByMail=Send reminder by email
+RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
+MenuToValid=To valid
+DateMaxPayment=Payment due on
+DateInvoice=Invoice date
+DatePointOfTax=Point of tax
+NoInvoice=No invoice
+ClassifyBill=Classify invoice
+SupplierBillsToPay=Unpaid vendor invoices
+CustomerBillsUnpaid=Unpaid customer invoices
+NonPercuRecuperable=Non-recoverable
+SetConditions=Set Payment Terms
+SetMode=Set Payment Type
+SetRevenuStamp=Set revenue stamp
+Billed=Billed
+RecurringInvoices=Recurring invoices
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndPayments=Customer invoices and payments
+ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_2=Customer invoices and payments
+ProformaBill=Proforma Bill:
+Reduction=Reduction
+ReductionShort=Disc.
+Reductions=Reductions
+ReductionsShort=Disc.
+Discounts=Discounts
+AddDiscount=Create discount
+AddRelativeDiscount=Create relative discount
+EditRelativeDiscount=Edit relative discount
+AddGlobalDiscount=Create absolute discount
+EditGlobalDiscounts=Edit absolute discounts
+AddCreditNote=Create credit note
+ShowDiscount=Show discount
+ShowReduc=Show the discount
+ShowSourceInvoice=Show the source invoice
+RelativeDiscount=Relative discount
+GlobalDiscount=Global discount
+CreditNote=Credit note
+CreditNotes=Credit notes
+CreditNotesOrExcessReceived=Credit notes or excess received
+Deposit=Down payment
+Deposits=Down payments
+DiscountFromCreditNote=Discount from credit note %s
+DiscountFromDeposit=Down payments from invoice %s
+DiscountFromExcessReceived=Payments in excess of invoice %s
+DiscountFromExcessPaid=Payments in excess of invoice %s
+AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
+CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+NewGlobalDiscount=New absolute discount
+NewRelativeDiscount=New relative discount
+DiscountType=Discount type
+NoteReason=Note/Reason
+ReasonDiscount=Reason
+DiscountOfferedBy=Granted by
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Customer discounts
+SupplierDiscounts=Vendors discounts
+BillAddress=Bill address
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
+HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+IdSocialContribution=Social/fiscal tax payment id
+PaymentId=Payment id
+PaymentRef=Payment ref.
+InvoiceId=Invoice id
+InvoiceRef=Invoice ref.
+InvoiceDateCreation=Invoice creation date
+InvoiceStatus=Invoice status
+InvoiceNote=Invoice note
+InvoicePaid=Invoice paid
+InvoicePaidCompletely=Paid completely
+InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
+OrderBilled=Order billed
+DonationPaid=Donation paid
+PaymentNumber=Payment number
+RemoveDiscount=Remove discount
+WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
+InvoiceNotChecked=No invoice selected
+ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+NbOfPayments=No. of payments
+SplitDiscount=Split discount in two
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
+TypeAmountOfEachNewDiscount=Input amount for each of two parts:
+TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+RelatedBill=Related invoice
+RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related vendor invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoices already exist
+MergingPDFTool=Merging PDF tool
+AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+PaymentNote=Payment note
+ListOfPreviousSituationInvoices=List of previous situation invoices
+ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
+FrequencyPer_d=Every %s days
+FrequencyPer_m=Every %s months
+FrequencyPer_y=Every %s years
+FrequencyUnit=Frequency unit
+toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
+NextDateToExecution=Date for next invoice generation
+NextDateToExecutionShort=Date next gen.
+DateLastGeneration=Date of latest generation
+DateLastGenerationShort=Date latest gen.
+MaxPeriodNumber=Max. number of invoice generation
+NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationDoneShort=Number of generation done
+MaxGenerationReached=Maximum number of generations reached
+InvoiceAutoValidate=Validate invoices automatically
+GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+DateIsNotEnough=Date not reached yet
+InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+GeneratedFromTemplate=Generated from template invoice %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
+# PaymentConditions
+Statut=Status
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShort30D=30 days
+PaymentCondition30D=30 days
+PaymentConditionShort30DENDMONTH=30 days of month-end
+PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort60D=60 days
+PaymentCondition60D=60 days
+PaymentConditionShort60DENDMONTH=60 days of month-end
+PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShortPT_DELIVERY=Delivery
+PaymentConditionPT_DELIVERY=On delivery
+PaymentConditionShortPT_ORDER=Order
+PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+PaymentConditionShort10D=10 days
+PaymentCondition10D=10 days
+PaymentConditionShort10DENDMONTH=10 days of month-end
+PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort14D=14 days
+PaymentCondition14D=14 days
+PaymentConditionShort14DENDMONTH=14 days of month-end
+PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+FixAmount=Fixed amount - 1 line with label '%s'
+VarAmount=Variable amount (%% tot.)
+VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+# PaymentType
+PaymentTypeVIR=Bank transfer
+PaymentTypeShortVIR=Bank transfer
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
+PaymentTypeLIQ=Cash
+PaymentTypeShortLIQ=Cash
+PaymentTypeCB=Credit card
+PaymentTypeShortCB=Credit card
+PaymentTypeCHQ=Check
+PaymentTypeShortCHQ=Check
+PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeShortTIP=TIP Payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
+PaymentTypeTRA=Bank draft
+PaymentTypeShortTRA=Draft
+PaymentTypeFAC=Factor
+PaymentTypeShortFAC=Factor
+BankDetails=Bank details
+BankCode=Bank code
+DeskCode=Branch code
+BankAccountNumber=Account number
+BankAccountNumberKey=Checksum
+Residence=Address
+IBANNumber=IBAN account number
+IBAN=IBAN
+CustomerIBAN=IBAN of customer
+SupplierIBAN=IBAN of vendor
+BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT code
+ExtraInfos=Extra infos
+RegulatedOn=Regulated on
+ChequeNumber=Check N°
+ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
+ChequeMaker=Check/Transfer transmitter
+ChequeBank=Bank of Check
+CheckBank=Check
+NetToBePaid=Net to be paid
+PhoneNumber=Tel
+FullPhoneNumber=Telephone
+TeleFax=Fax
+PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+IntracommunityVATNumber=Intra-Community VAT ID
+PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
+PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+SendTo=sent to
+PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
+LawApplicationPart1=By application of the law 80.335 of 12/05/80
+LawApplicationPart2=the goods remain the property of
+LawApplicationPart3=the seller until full payment of
+LawApplicationPart4=their price.
+LimitedLiabilityCompanyCapital=SARL with Capital of
+UseLine=Apply
+UseDiscount=Use discount
+UseCredit=Use credit
+UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
+MenuChequeDeposits=Check Deposits
+MenuCheques=Checks
+MenuChequesReceipts=Check receipts
+NewChequeDeposit=New deposit
+ChequesReceipts=Check receipts
+ChequesArea=Check deposits area
+ChequeDeposits=Check deposits
+Cheques=Checks
+DepositId=Id deposit
+NbCheque=Number of checks
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+ShowUnpaidAll=Show all unpaid invoices
+ShowUnpaidLateOnly=Show late unpaid invoices only
+PaymentInvoiceRef=Payment invoice %s
+ValidateInvoice=Validate invoice
+ValidateInvoices=Validate invoices
+Cash=Cash
+Reported=Delayed
+DisabledBecausePayments=Not possible since there are some payments
+CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+ExpectedToPay=Expected payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
+PayedByThisPayment=Paid by this payment
+ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
+ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
+ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ToMakePayment=Pay
+ToMakePaymentBack=Pay back
+ListOfYourUnpaidInvoices=List of unpaid invoices
+NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
+RevenueStamp=Tax stamp
+YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
+YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
+PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+EarlyClosingReason=Early closing reason
+EarlyClosingComment=Early closing note
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
+TypeContact_facture_external_BILLING=Customer invoice contact
+TypeContact_facture_external_SHIPPING=Customer shipping contact
+TypeContact_facture_external_SERVICE=Customer service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
+TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+# Situation invoices
+InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
+InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationDesc=Create a new situation following an already existing one
+SituationAmount=Situation invoice amount(net)
+SituationDeduction=Situation subtraction
+ModifyAllLines=Modify all lines
+CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
+CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+NoSituations=No open situations
+InvoiceSituationLast=Final and general invoice
+PDFCrevetteSituationNumber=Situation N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationInvoiceTitle=Situation invoice
+PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
+TotalSituationInvoice=Total situation
+invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
+StatusOfGeneratedDocuments=Status of document generation
+DoNotGenerateDoc=Do not generate document file
+AutogenerateDoc=Auto generate document file
+AutoFillDateFrom=Set start date for service line with invoice date
+AutoFillDateFromShort=Set start date
+AutoFillDateTo=Set end date for service line with next invoice date
+AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
+BILL_DELETEInDolibarr=Invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
+UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
+CustomersInvoicesArea=Customer billing area
+SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/ar_IQ/blockedlog.lang b/htdocs/langs/ar_IQ/blockedlog.lang
new file mode 100644
index 00000000000..44cb183050a
--- /dev/null
+++ b/htdocs/langs/ar_IQ/blockedlog.lang
@@ -0,0 +1,54 @@
+BlockedLog=Unalterable Logs
+Field=Field
+BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
+CompanyInitialKey=Company initial key (hash of genesis block)
+BrowseBlockedLog=Unalterable logs
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
+OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
+OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Customer payment created
+logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
+logDONATION_PAYMENT_CREATE=Donation payment created
+logDONATION_PAYMENT_DELETE=Donation payment logical deletion
+logBILL_PAYED=Customer invoice paid
+logBILL_UNPAYED=Customer invoice set unpaid
+logBILL_VALIDATE=Customer invoice validated
+logBILL_SENTBYMAIL=Customer invoice send by mail
+logBILL_DELETE=Customer invoice logically deleted
+logMODULE_RESET=Module BlockedLog was disabled
+logMODULE_SET=Module BlockedLog was enabled
+logDON_VALIDATE=Donation validated
+logDON_MODIFY=Donation modified
+logDON_DELETE=Donation logical deletion
+logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
+logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
+logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash desk closing recording
+BlockedLogBillDownload=Customer invoice download
+BlockedLogBillPreview=Customer invoice preview
+BlockedlogInfoDialog=Log Details
+ListOfTrackedEvents=List of tracked events
+Fingerprint=Fingerprint
+DownloadLogCSV=Export archived logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
+ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
+BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
+OnlyNonValid=Non-valid
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
+RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/ar_IQ/bookmarks.lang b/htdocs/langs/ar_IQ/bookmarks.lang
new file mode 100644
index 00000000000..87466cadcfa
--- /dev/null
+++ b/htdocs/langs/ar_IQ/bookmarks.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=Add current page to bookmarks
+Bookmark=Bookmark
+Bookmarks=Bookmarks
+ListOfBookmarks=List of bookmarks
+EditBookmarks=List/edit bookmarks
+NewBookmark=New bookmark
+ShowBookmark=Show bookmark
+OpenANewWindow=Open a new tab
+ReplaceWindow=Replace current tab
+BookmarkTargetNewWindowShort=New tab
+BookmarkTargetReplaceWindowShort=Current tab
+BookmarkTitle=Bookmark name
+UrlOrLink=URL
+BehaviourOnClick=Behaviour when a bookmark URL is selected
+CreateBookmark=Create bookmark
+SetHereATitleForLink=Set a name for the bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
+BookmarksManagement=Bookmarks management
+BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/ar_IQ/boxes.lang b/htdocs/langs/ar_IQ/boxes.lang
new file mode 100644
index 00000000000..4d7ee938c91
--- /dev/null
+++ b/htdocs/langs/ar_IQ/boxes.lang
@@ -0,0 +1,120 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
+BoxLoginInformation=Login Information
+BoxLastRssInfos=RSS Information
+BoxLastProducts=Latest %s Products/Services
+BoxProductsAlertStock=Stock alerts for products
+BoxLastProductsInContract=Latest %s contracted products/services
+BoxLastSupplierBills=Latest Vendor invoices
+BoxLastCustomerBills=Latest Customer invoices
+BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
+BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxLastProposals=Latest commercial proposals
+BoxLastProspects=Latest modified prospects
+BoxLastCustomers=Latest modified customers
+BoxLastSuppliers=Latest modified suppliers
+BoxLastCustomerOrders=Latest sales orders
+BoxLastActions=Latest actions
+BoxLastContracts=Latest contracts
+BoxLastContacts=Latest contacts/addresses
+BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
+BoxFicheInter=Latest interventions
+BoxCurrentAccounts=Open accounts balance
+BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleLastRssInfos=Latest %s news from %s
+BoxTitleLastProducts=Products/Services: last %s modified
+BoxTitleProductsAlertStock=Products: stock alert
+BoxTitleLastSuppliers=Latest %s recorded suppliers
+BoxTitleLastModifiedSuppliers=Vendors: last %s modified
+BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastModifiedMembers=Latest %s members
+BoxTitleLastFicheInter=Latest %s modified interventions
+BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
+BoxTitleCurrentAccounts=Open Accounts: balances
+BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
+BoxMyLastBookmarks=Bookmarks: latest %s
+BoxOldestExpiredServices=Oldest active expired services
+BoxLastExpiredServices=Latest %s oldest contacts with active expired services
+BoxTitleLastActionsToDo=Latest %s actions to do
+BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastModifiedDonations=Latest %s modified donations
+BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxTitleLatestModifiedBoms=Latest %s modified BOMs
+BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
+BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
+FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+LastRefreshDate=Latest refresh date
+NoRecordedBookmarks=No bookmarks defined.
+ClickToAdd=Click here to add.
+NoRecordedCustomers=No recorded customers
+NoRecordedContacts=No recorded contacts
+NoActionsToDo=No actions to do
+NoRecordedOrders=No recorded sales orders
+NoRecordedProposals=No recorded proposals
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid vendor invoices
+NoModifiedSupplierBills=No recorded vendor invoices
+NoRecordedProducts=No recorded products/services
+NoRecordedProspects=No recorded prospects
+NoContractedProducts=No products/services contracted
+NoRecordedContracts=No recorded contracts
+NoRecordedInterventions=No recorded interventions
+BoxLatestSupplierOrders=Latest purchase orders
+BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+NoSupplierOrder=No recorded purchase order
+BoxCustomersInvoicesPerMonth=Customer Invoices per month
+BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
+BoxCustomersOrdersPerMonth=Sales Orders per month
+BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxProposalsPerMonth=Proposals per month
+NoTooLowStockProducts=No products are under the low stock limit
+BoxProductDistribution=Products/Services Distribution
+ForObject=On %s
+BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
+BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
+BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
+BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
+BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+ForCustomersInvoices=Customers invoices
+ForCustomersOrders=Customers orders
+ForProposals=Proposals
+LastXMonthRolling=The latest %s month rolling
+ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard
+BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
+NoRecordedManualEntries=No manual entries record in accountancy
+BoxSuspenseAccount=Count accountancy operation with suspense account
+BoxTitleSuspenseAccount=Number of unallocated lines
+NumberOfLinesInSuspenseAccount=Number of line in suspense account
+SuspenseAccountNotDefined=Suspense account isn't defined
+BoxLastCustomerShipments=Last customer shipments
+BoxTitleLastCustomerShipments=Latest %s customer shipments
+NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+# Pages
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ar_IQ/cashdesk.lang b/htdocs/langs/ar_IQ/cashdesk.lang
new file mode 100644
index 00000000000..ce7698c8cd8
--- /dev/null
+++ b/htdocs/langs/ar_IQ/cashdesk.lang
@@ -0,0 +1,129 @@
+# Language file - Source file is en_US - cashdesk
+CashDeskMenu=Point of sale
+CashDesk=Point of sale
+CashDeskBankCash=Bank account (cash)
+CashDeskBankCB=Bank account (card)
+CashDeskBankCheque=Bank account (cheque)
+CashDeskWarehouse=Warehouse
+CashdeskShowServices=Selling services
+CashDeskProducts=Products
+CashDeskStock=Stock
+CashDeskOn=on
+CashDeskThirdParty=Third party
+ShoppingCart=Shopping cart
+NewSell=New sell
+AddThisArticle=Add this article
+RestartSelling=Go back on sell
+SellFinished=Sale complete
+PrintTicket=Print ticket
+SendTicket=Send ticket
+NoProductFound=No article found
+ProductFound=product found
+NoArticle=No article
+Identification=Identification
+Article=Article
+Difference=Difference
+TotalTicket=Total ticket
+NoVAT=No VAT for this sale
+Change=Excess received
+BankToPay=Account for payment
+ShowCompany=Show company
+ShowStock=Show warehouse
+DeleteArticle=Click to remove this article
+FilterRefOrLabelOrBC=Search (Ref/Label)
+UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+DolibarrReceiptPrinter=Dolibarr Receipt Printer
+PointOfSale=Point of Sale
+PointOfSaleShort=POS
+CloseBill=Close Bill
+Floors=Floors
+Floor=Floor
+AddTable=Add table
+Place=Place
+TakeposConnectorNecesary='TakePOS Connector' required
+OrderPrinters=Order printers
+SearchProduct=Search product
+Receipt=Receipt
+Header=Header
+Footer=Footer
+AmountAtEndOfPeriod=Amount at end of period (day, month or year)
+TheoricalAmount=Theorical amount
+RealAmount=Real amount
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
+NbOfInvoices=Nb of invoices
+Paymentnumpad=Type of Pad to enter payment
+Numberspad=Numbers Pad
+BillsCoinsPad=Coins and banknotes Pad
+DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Order Notes
+CashDeskBankAccountFor=Default account to use for payments in
+NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
+EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
+ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+History=History
+ValidateAndClose=Validate and close
+Terminal=Terminal
+NumberOfTerminals=Number of Terminals
+TerminalSelect=Select terminal you want to use:
+POSTicket=POS Ticket
+POSTerminal=POS Terminal
+POSModule=POS Module
+BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Add a "Direct cash payment" button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
+CustomReceipt=Custom Receipt
+ReceiptName=Receipt Name
+ProductSupplements=Product Supplements
+SupplementCategory=Supplement category
+ColorTheme=Color theme
+Colorful=Colorful
+HeadBar=Head Bar
+SortProductField=Field for sorting products
+Browser=Browser
+BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+PrintMethod=Print method
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ByTerminal=By terminal
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+CashDeskRefNumberingModules=Numbering module for POS sales
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
+BarRestaurant=Bar Restaurant
+AutoOrder=Order by the customer himself
+RestaurantMenu=Menu
+CustomerMenu=Customer menu
+ScanToMenu=Scan QR code to see the menu
+ScanToOrder=Scan QR code to order
+Appearance=Appearance
+HideCategoryImages=Hide Category Images
+HideProductImages=Hide Product Images
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/ar_IQ/categories.lang b/htdocs/langs/ar_IQ/categories.lang
new file mode 100644
index 00000000000..9520ef65a83
--- /dev/null
+++ b/htdocs/langs/ar_IQ/categories.lang
@@ -0,0 +1,99 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+RubriquesTransactions=Tags/Categories of transactions
+categories=tags/categories
+NoCategoryYet=No tag/category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Vendors tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
+UsersCategoriesArea=Users tags/categories area
+SubCats=Sub-categories
+CatList=List of tags/categories
+CatListAll=List of tags/categories (all types)
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found tags/categories
+ImpossibleAddCat=Impossible to add the tag/category %s
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+ProductIsInCategories=Product/service is linked to following tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+MemberIsInCategories=This member is linked to following members tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
+ClassifyInCategory=Add to tag/category
+NotCategorized=Without tag/category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Vendors tag/category
+CustomersCategoryShort=Customers tag/category
+ProductsCategoryShort=Products tag/category
+MembersCategoryShort=Members tag/category
+SuppliersCategoriesShort=Vendors tags/categories
+CustomersCategoriesShort=Customers tags/categories
+ProspectsCategoriesShort=Prospects tags/categories
+CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
+AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
+UsersCategoriesShort=Users tags/categories
+StockCategoriesShort=Warehouse tags/categories
+ThisCategoryHasNoItems=This category does not contain any items.
+CategId=Tag/category id
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatContactsLinks=Links between contacts/addresses and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
+DeleteFromCat=Remove from tags/category
+ExtraFieldsCategories=Complementary attributes
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
+CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+AddProductServiceIntoCategory=Add the following product/service
+AddCustomerIntoCategory=Assign category to customer
+AddSupplierIntoCategory=Assign category to supplier
+ShowCategory=Show tag/category
+ByDefaultInList=By default in list
+ChooseCategory=Choose category
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
+WebsitePagesCategoriesArea=Page-Container Categories
+UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ar_IQ/commercial.lang b/htdocs/langs/ar_IQ/commercial.lang
new file mode 100644
index 00000000000..21d282cd794
--- /dev/null
+++ b/htdocs/langs/ar_IQ/commercial.lang
@@ -0,0 +1,81 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Commerce
+CommercialArea=Commerce area
+Customer=Customer
+Customers=Customers
+Prospect=Prospect
+Prospects=Prospects
+DeleteAction=Delete an event
+NewAction=New event
+AddAction=Create event
+AddAnAction=Create an event
+AddActionRendezVous=Create a Rendez-vous event
+ConfirmDeleteAction=Are you sure you want to delete this event?
+CardAction=Event card
+ActionOnCompany=Related company
+ActionOnContact=Related contact
+TaskRDVWith=Meeting with %s
+ShowTask=Show task
+ShowAction=Show event
+ActionsReport=Events report
+ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+SaleRepresentativesOfThirdParty=Sales representatives of third party
+SalesRepresentative=Sales representative
+SalesRepresentatives=Sales representatives
+SalesRepresentativeFollowUp=Sales representative (follow-up)
+SalesRepresentativeSignature=Sales representative (signature)
+NoSalesRepresentativeAffected=No particular sales representative assigned
+ShowCustomer=Show customer
+ShowProspect=Show prospect
+ListOfProspects=List of prospects
+ListOfCustomers=List of customers
+LastDoneTasks=Latest %s completed actions
+LastActionsToDo=Oldest %s not completed actions
+DoneAndToDoActions=Completed and To do events
+DoneActions=Completed events
+ToDoActions=Incomplete events
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
+StatusNotApplicable=Not applicable
+StatusActionToDo=To do
+StatusActionDone=Complete
+StatusActionInProcess=In process
+TasksHistoryForThisContact=Events for this contact
+LastProspectDoNotContact=Do not contact
+LastProspectNeverContacted=Never contacted
+LastProspectToContact=To contact
+LastProspectContactInProcess=Contact in process
+LastProspectContactDone=Contact done
+ActionAffectedTo=Event assigned to
+ActionDoneBy=Event done by
+ActionAC_TEL=Phone call
+ActionAC_FAX=Send fax
+ActionAC_PROP=Send proposal by mail
+ActionAC_EMAIL=Send Email
+ActionAC_EMAIL_IN=Reception of Email
+ActionAC_RDV=Meetings
+ActionAC_INT=Intervention on site
+ActionAC_FAC=Send customer invoice by mail
+ActionAC_REL=Send customer invoice by mail (reminder)
+ActionAC_CLO=Close
+ActionAC_EMAILING=Send mass email
+ActionAC_COM=Send sales order by mail
+ActionAC_SHIP=Send shipping by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_OTH=Other
+ActionAC_OTH_AUTO=Other auto
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTOShort=Other
+ActionAC_EVENTORGANIZATION=Event organization events
+Stats=Sales statistics
+StatusProsp=Prospect status
+DraftPropals=Draft commercial proposals
+NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commercial proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ar_IQ/companies.lang b/htdocs/langs/ar_IQ/companies.lang
new file mode 100644
index 00000000000..154400c6536
--- /dev/null
+++ b/htdocs/langs/ar_IQ/companies.lang
@@ -0,0 +1,477 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
+ErrorSetACountryFirst=Set the country first
+SelectThirdParty=Select a third party
+ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+DeleteContact=Delete a contact/address
+ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+MenuNewThirdParty=New Third Party
+MenuNewCustomer=New Customer
+MenuNewProspect=New Prospect
+MenuNewSupplier=New Vendor
+MenuNewPrivateIndividual=New private individual
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New Third Party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
+CreateThirdPartyOnly=Create third party
+CreateThirdPartyAndContact=Create a third party + a child contact
+ProspectionArea=Prospection area
+IdThirdParty=Id third party
+IdCompany=Company Id
+IdContact=Contact Id
+ThirdPartyContacts=Third-party contacts
+ThirdPartyContact=Third-party contact/address
+Company=Company
+CompanyName=Company name
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias Name
+Companies=Companies
+CountryIsInEEC=Country is inside the European Economic Community
+PriceFormatInCurrentLanguage=Price display format in the current language and currency
+ThirdPartyName=Third-party name
+ThirdPartyEmail=Third-party email
+ThirdParty=Third-party
+ThirdParties=Third-parties
+ThirdPartyProspects=Prospects
+ThirdPartyProspectsStats=Prospects
+ThirdPartyCustomers=Customers
+ThirdPartyCustomersStats=Customers
+ThirdPartyCustomersWithIdProf12=Customers with %s or %s
+ThirdPartySuppliers=Vendors
+ThirdPartyType=Third-party type
+Individual=Private individual
+ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ParentCompany=Parent company
+Subsidiaries=Subsidiaries
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
+CivilityCode=Civility code
+RegisteredOffice=Registered office
+Lastname=Last name
+Firstname=First name
+PostOrFunction=Job position
+UserTitle=Title
+NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
+Address=Address
+State=State/Province
+StateCode=State/Province code
+StateShort=State
+Region=Region
+Region-State=Region - State
+Country=Country
+CountryCode=Country code
+CountryId=Country id
+Phone=Phone
+PhoneShort=Phone
+Skype=Skype
+Call=Call
+Chat=Chat
+PhonePro=Prof. phone
+PhonePerso=Pers. phone
+PhoneMobile=Mobile
+No_Email=Refuse bulk emailings
+Fax=Fax
+Zip=Zip Code
+Town=City
+Web=Web
+Poste= Position
+DefaultLang=Language default
+VATIsUsed=Sales tax used
+VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Sales tax is not used
+CopyAddressFromSoc=Copy address from third-party details
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+PaymentBankAccount=Payment bank account
+OverAllProposals=Proposals
+OverAllOrders=Orders
+OverAllInvoices=Invoices
+OverAllSupplierProposals=Price requests
+##### Local Taxes #####
+LocalTax1IsUsed=Use second tax
+LocalTax1IsUsedES= RE is used
+LocalTax1IsNotUsedES= RE is not used
+LocalTax2IsUsed=Use third tax
+LocalTax2IsUsedES= IRPF is used
+LocalTax2IsNotUsedES= IRPF is not used
+WrongCustomerCode=Customer code invalid
+WrongSupplierCode=Vendor code invalid
+CustomerCodeModel=Customer code model
+SupplierCodeModel=Vendor code model
+Gencod=Barcode
+##### Professional ID #####
+ProfId1Short=Prof. id 1
+ProfId2Short=Prof. id 2
+ProfId3Short=Prof. id 3
+ProfId4Short=Prof. id 4
+ProfId5Short=Prof. id 5
+ProfId6Short=Prof. id 6
+ProfId1=Professional ID 1
+ProfId2=Professional ID 2
+ProfId3=Professional ID 3
+ProfId4=Professional ID 4
+ProfId5=Professional ID 5
+ProfId6=Professional ID 6
+ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=EORI number
+ProfId6AT=-
+ProfId1AU=Prof Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Prof Id 1 (Professional number)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=EORI number
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=UID-Nummer
+ProfId2CH=-
+ProfId3CH=Prof Id 1 (Federal number)
+ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId5CH=EORI number
+ProfId6CH=-
+ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId2CL=-
+ProfId3CL=-
+ProfId4CL=-
+ProfId5CL=-
+ProfId6CL=-
+ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=EORI number
+ProfId6DE=-
+ProfId1ES=Prof Id 1 (CIF/NIF)
+ProfId2ES=Prof Id 2 (Social security number)
+ProfId3ES=Prof Id 3 (CNAE)
+ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId5ES=Prof Id 5 (EORI number)
+ProfId6ES=-
+ProfId1FR=Prof Id 1 (SIREN)
+ProfId2FR=Prof Id 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
+ProfId1GB=Registration Number
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
+ProfId5IN=Prof Id 5
+ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
+ProfId6IT=-
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=EORI number
+ProfId6LU=-
+ProfId1MA=Id prof. 1 (R.C.)
+ProfId2MA=Id prof. 2 (Patente)
+ProfId3MA=Id prof. 3 (I.F.)
+ProfId4MA=Id prof. 4 (C.N.S.S.)
+ProfId5MA=Id prof. 5 (I.C.E.)
+ProfId6MA=-
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=KVK nummer
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=EORI number
+ProfId6NL=-
+ProfId1PT=Prof Id 1 (NIPC)
+ProfId2PT=Prof Id 2 (Social security number)
+ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId4PT=Prof Id 4 (Conservatory)
+ProfId5PT=Prof Id 5 (EORI number)
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=Prof Id 1 (RC)
+ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId3TN=Prof Id 3 (Douane code)
+ProfId4TN=Prof Id 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Prof Id (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=Prof Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId3RO=Prof Id 3 (CAEN)
+ProfId4RO=Prof Id 5 (EUID)
+ProfId5RO=Prof Id 5 (EORI number)
+ProfId6RO=-
+ProfId1RU=Prof Id 1 (OGRN)
+ProfId2RU=Prof Id 2 (INN)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Prof Id 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
+VATIntra=VAT ID
+VATIntraShort=VAT ID
+VATIntraSyntaxIsValid=Syntax is valid
+VATReturn=VAT return
+ProspectCustomer=Prospect / Customer
+Prospect=Prospect
+CustomerCard=Customer Card
+Customer=Customer
+CustomerRelativeDiscount=Relative customer discount
+SupplierRelativeDiscount=Relative vendor discount
+CustomerRelativeDiscountShort=Relative discount
+CustomerAbsoluteDiscountShort=Absolute discount
+CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
+CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
+HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
+HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
+HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
+CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
+CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+DiscountNone=None
+Vendor=Vendor
+Supplier=Vendor
+AddContact=Create contact
+AddContactAddress=Create contact/address
+EditContact=Edit contact
+EditContactAddress=Edit contact/address
+Contact=Contact/Address
+Contacts=Contacts/Addresses
+ContactId=Contact id
+ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
+NoContactDefinedForThirdParty=No contact defined for this third party
+NoContactDefined=No contact defined
+DefaultContact=Default contact/address
+ContactByDefaultFor=Default contact/address for
+AddThirdParty=Create third party
+DeleteACompany=Delete a company
+PersonalInformations=Personal data
+AccountancyCode=Accounting account
+CustomerCode=Customer Code
+SupplierCode=Vendor Code
+CustomerCodeShort=Customer Code
+SupplierCodeShort=Vendor Code
+CustomerCodeDesc=Customer Code, unique for all customers
+SupplierCodeDesc=Vendor Code, unique for all vendors
+RequiredIfCustomer=Required if third party is a customer or prospect
+RequiredIfSupplier=Required if third party is a vendor
+ValidityControledByModule=Validity controlled by module
+ThisIsModuleRules=Rules for this module
+ProspectToContact=Prospect to contact
+CompanyDeleted=Company "%s" deleted from database.
+ListOfContacts=List of contacts/addresses
+ListOfContactsAddresses=List of contacts/addresses
+ListOfThirdParties=List of Third Parties
+ShowCompany=Third Party
+ShowContact=Contact-Address
+ContactsAllShort=All (No filter)
+ContactType=Contact type
+ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForProposals=Proposal's contact
+ContactForContracts=Contract's contact
+ContactForInvoices=Invoice's contact
+NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyProposal=This contact is not a contact for any commercial proposal
+NoContactForAnyContract=This contact is not a contact for any contract
+NoContactForAnyInvoice=This contact is not a contact for any invoice
+NewContact=New contact
+NewContactAddress=New Contact/Address
+MyContacts=My contacts
+Capital=Capital
+CapitalOf=Capital of %s
+EditCompany=Edit company
+ThisUserIsNot=This user is not a prospect, customer or vendor
+VATIntraCheck=Check
+VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
+NorProspectNorCustomer=Not prospect, nor customer
+JuridicalStatus=Business entity type
+Workforce=Workforce
+Staff=Employees
+ProspectLevelShort=Potential
+ProspectLevel=Prospect potential
+ContactPrivate=Private
+ContactPublic=Shared
+ContactVisibility=Visibility
+ContactOthers=Other
+OthersNotLinkedToThirdParty=Others, not linked to a third party
+ProspectStatus=Prospect status
+PL_NONE=None
+PL_UNKNOWN=Unknown
+PL_LOW=Low
+PL_MEDIUM=Medium
+PL_HIGH=High
+TE_UNKNOWN=-
+TE_STARTUP=Startup
+TE_GROUP=Large company
+TE_MEDIUM=Medium company
+TE_ADMIN=Governmental
+TE_SMALL=Small company
+TE_RETAIL=Retailer
+TE_WHOLE=Wholesaler
+TE_PRIVATE=Private individual
+TE_OTHER=Other
+StatusProspect-1=Do not contact
+StatusProspect0=Never contacted
+StatusProspect1=To be contacted
+StatusProspect2=Contact in process
+StatusProspect3=Contact done
+ChangeDoNotContact=Change status to 'Do not contact'
+ChangeNeverContacted=Change status to 'Never contacted'
+ChangeToContact=Change status to 'To be contacted'
+ChangeContactInProcess=Change status to 'Contact in process'
+ChangeContactDone=Change status to 'Contact done'
+ProspectsByStatus=Prospects by status
+NoParentCompany=None
+ExportCardToFormat=Export card to format
+ContactNotLinkedToCompany=Contact not linked to any third party
+DolibarrLogin=Dolibarr login
+NoDolibarrAccess=No Dolibarr access
+ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_2=Contacts and their properties
+ImportDataset_company_1=Third-parties and their properties
+ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
+PriceLevel=Price Level
+PriceLevelLabels=Price Level Labels
+DeliveryAddress=Delivery address
+AddAddress=Add address
+SupplierCategory=Vendor category
+JuridicalStatus200=Independent
+DeleteFile=Delete file
+ConfirmDeleteFile=Are you sure you want to delete this file?
+AllocateCommercial=Assigned to sales representative
+Organization=Organization
+FiscalYearInformation=Fiscal Year
+FiscalMonthStart=Starting month of the fiscal year
+SocialNetworksInformation=Social networks
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
+YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
+YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+ListSuppliersShort=List of Vendors
+ListProspectsShort=List of Prospects
+ListCustomersShort=List of Customers
+ThirdPartiesArea=Third Parties/Contacts
+LastModifiedThirdParties=Latest %s modified Third Parties
+UniqueThirdParties=Total of Third Parties
+InActivity=Open
+ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
+ProductsIntoElements=List of products/services into %s
+CurrentOutstandingBill=Current outstanding bill
+OutstandingBill=Max. for outstanding bill
+OutstandingBillReached=Max. for outstanding bill reached
+OrderMinAmount=Minimum amount for order
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
+ManagingDirectors=Manager(s) name (CEO, director, president...)
+MergeOriginThirdparty=Duplicate third party (third party you want to delete)
+MergeThirdparties=Merge third parties
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ThirdpartiesMergeSuccess=Third parties have been merged
+SaleRepresentativeLogin=Login of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+#Imports
+PaymentTypeCustomer=Payment Type - Customer
+PaymentTermsCustomer=Payment Terms - Customer
+PaymentTypeSupplier=Payment Type - Vendor
+PaymentTermsSupplier=Payment Term - Vendor
+PaymentTypeBoth=Payment Type - Customer and Vendor
+MulticurrencyUsed=Use Multicurrency
+MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
diff --git a/htdocs/langs/ar_IQ/compta.lang b/htdocs/langs/ar_IQ/compta.lang
new file mode 100644
index 00000000000..926cda53c9f
--- /dev/null
+++ b/htdocs/langs/ar_IQ/compta.lang
@@ -0,0 +1,288 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Billing | Payment
+TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+OptionMode=Option for accountancy
+OptionModeTrue=Option Incomes-Expenses
+OptionModeVirtual=Option Claims-Debts
+OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
+OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
+FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
+VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
+LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+Param=Setup
+RemainingAmountPayment=Amount payment remaining:
+Account=Account
+Accountparent=Parent account
+Accountsparent=Parent accounts
+Income=Income
+Outcome=Expense
+MenuReportInOut=Income / Expense
+ReportInOut=Balance of income and expenses
+ReportTurnover=Turnover invoiced
+ReportTurnoverCollected=Turnover collected
+PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
+PaymentsNotLinkedToUser=Payments not linked to any user
+Profit=Profit
+AccountingResult=Accounting result
+BalanceBefore=Balance (before)
+Balance=Balance
+Debit=Debit
+Credit=Credit
+Piece=Accounting Doc.
+AmountHTVATRealReceived=Net collected
+AmountHTVATRealPaid=Net paid
+VATToPay=Tax sales
+VATReceived=Tax received
+VATToCollect=Tax purchases
+VATSummary=Tax monthly
+VATBalance=Tax Balance
+VATPaid=Tax paid
+LT1Summary=Tax 2 summary
+LT2Summary=Tax 3 summary
+LT1SummaryES=RE Balance
+LT2SummaryES=IRPF Balance
+LT1SummaryIN=CGST Balance
+LT2SummaryIN=SGST Balance
+LT1Paid=Tax 2 paid
+LT2Paid=Tax 3 paid
+LT1PaidES=RE Paid
+LT2PaidES=IRPF Paid
+LT1PaidIN=CGST Paid
+LT2PaidIN=SGST Paid
+LT1Customer=Tax 2 sales
+LT1Supplier=Tax 2 purchases
+LT1CustomerES=RE sales
+LT1SupplierES=RE purchases
+LT1CustomerIN=CGST sales
+LT1SupplierIN=CGST purchases
+LT2Customer=Tax 3 sales
+LT2Supplier=Tax 3 purchases
+LT2CustomerES=IRPF sales
+LT2SupplierES=IRPF purchases
+LT2CustomerIN=SGST sales
+LT2SupplierIN=SGST purchases
+VATCollected=VAT collected
+StatusToPay=To pay
+SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
+SocialContribution=Social or fiscal tax
+SocialContributions=Social or fiscal taxes
+SocialContributionsDeductibles=Deductible social or fiscal taxes
+SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
+LabelContrib=Label contribution
+TypeContrib=Type contribution
+MenuSpecialExpenses=Special expenses
+MenuTaxAndDividends=Taxes and dividends
+MenuSocialContributions=Social/fiscal taxes
+MenuNewSocialContribution=New social/fiscal tax
+NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
+ContributionsToPay=Social/fiscal taxes to pay
+AccountancyTreasuryArea=Billing and payment area
+NewPayment=New payment
+PaymentCustomerInvoice=Customer invoice payment
+PaymentSupplierInvoice=vendor invoice payment
+PaymentSocialContribution=Social/fiscal tax payment
+PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
+ListPayment=List of payments
+ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of vendor payments
+DateStartPeriod=Date start period
+DateEndPeriod=Date end period
+newLT1Payment=New tax 2 payment
+newLT2Payment=New tax 3 payment
+LT1Payment=Tax 2 payment
+LT1Payments=Tax 2 payments
+LT2Payment=Tax 3 payment
+LT2Payments=Tax 3 payments
+newLT1PaymentES=New RE payment
+newLT2PaymentES=New IRPF payment
+LT1PaymentES=RE Payment
+LT1PaymentsES=RE Payments
+LT2PaymentES=IRPF Payment
+LT2PaymentsES=IRPF Payments
+VATPayment=Sales tax payment
+VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
+VATRefund=Sales tax refund
+NewVATPayment=New sales tax payment
+NewLocalTaxPayment=New tax %s payment
+Refund=Refund
+SocialContributionsPayments=Social/fiscal taxes payments
+ShowVatPayment=Show VAT payment
+TotalToPay=Total to pay
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
+CustomerAccountancyCode=Customer accounting code
+SupplierAccountancyCode=Vendor accounting code
+CustomerAccountancyCodeShort=Cust. account. code
+SupplierAccountancyCodeShort=Sup. account. code
+AccountNumber=Account number
+NewAccountingAccount=New account
+Turnover=Turnover invoiced
+TurnoverCollected=Turnover collected
+SalesTurnoverMinimum=Minimum turnover
+ByExpenseIncome=By expenses & incomes
+ByThirdParties=By third parties
+ByUserAuthorOfInvoice=By invoice author
+CheckReceipt=Check deposit
+CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Latest %s check receipts
+NewCheckReceipt=New discount
+NewCheckDeposit=New check deposit
+NewCheckDepositOn=Create receipt for deposit on account: %s
+NoWaitingChecks=No checks awaiting deposit.
+DateChequeReceived=Check reception date
+NbOfCheques=No. of checks
+PaySocialContribution=Pay a social/fiscal tax
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
+DeleteSocialContribution=Delete a social or fiscal tax payment
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
+ExportDataset_tax_1=Social and fiscal taxes and payments
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
+CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
+CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
+AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualByCompanies=Balance of income and expenses, by predefined groups of account
+AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
+AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
+SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
+RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
+RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
+RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
+SeePageForSetup=See menu <a href="%s">%s</a> for setup
+DepositsAreNotIncluded=- Down payment invoices are not included
+DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
+LT1ReportByCustomers=Report tax 2 by third party
+LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomersES=Report by third party RE
+LT2ReportByCustomersES=Report by third party IRPF
+VATReport=Sale tax report
+VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
+VATReportByCustomers=Sale tax report by customer
+VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
+VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
+LT1ReportByQuarters=Report tax 2 by rate
+LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuartersES=Report by RE rate
+LT2ReportByQuartersES=Report by IRPF rate
+SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
+SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
+RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+PercentOfInvoice=%%/invoice
+NotUsedForGoods=Not used on goods
+ProposalStats=Statistics on proposals
+OrderStats=Statistics on orders
+InvoiceStats=Statistics on bills
+Dispatch=Dispatching
+Dispatched=Dispatched
+ToDispatch=To dispatch
+ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
+SellsJournal=Sales Journal
+PurchasesJournal=Purchases Journal
+DescSellsJournal=Sales Journal
+DescPurchasesJournal=Purchases Journal
+CodeNotDef=Not defined
+WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
+DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+Pcg_version=Chart of accounts models
+Pcg_type=Pcg type
+Pcg_subtype=Pcg subtype
+InvoiceLinesToDispatch=Invoice lines to dispatch
+ByProductsAndServices=By product and service
+RefExt=External ref
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+LinkedOrder=Link to order
+Mode1=Method 1
+Mode2=Method 2
+CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
+CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationMode=Calculation mode
+AccountancyJournal=Accounting code journal
+ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
+CloneTaxForNextMonth=Clone it for next month
+SimpleReport=Simple report
+AddExtraReport=Extra reports (add foreign and national customer report)
+OtherCountriesCustomersReport=Foreign customers report
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
+SameCountryCustomersWithVAT=National customers report
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+LinkedFichinter=Link to an intervention
+ImportDataset_tax_contrib=Social/fiscal taxes
+ImportDataset_tax_vat=Vat payments
+ErrorBankAccountNotFound=Error: Bank account not found
+FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
+DeleteFromCat=Remove from accounting group
+AccountingAffectation=Accounting assignment
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover invoiced by sale tax rate
+TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
+LabelToShow=Short label
+PurchaseTurnover=Purchase turnover
+PurchaseTurnoverCollected=Purchase turnover collected
+RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
+RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/ar_IQ/contracts.lang b/htdocs/langs/ar_IQ/contracts.lang
new file mode 100644
index 00000000000..a9ac308142a
--- /dev/null
+++ b/htdocs/langs/ar_IQ/contracts.lang
@@ -0,0 +1,104 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Contracts area
+ListOfContracts=List of contracts
+AllContracts=All contracts
+ContractCard=Contract card
+ContractStatusNotRunning=Not running
+ContractStatusDraft=Draft
+ContractStatusValidated=Validated
+ContractStatusClosed=Closed
+ServiceStatusInitial=Not running
+ServiceStatusRunning=Running
+ServiceStatusNotLate=Running, not expired
+ServiceStatusNotLateShort=Not expired
+ServiceStatusLate=Running, expired
+ServiceStatusLateShort=Expired
+ServiceStatusClosed=Closed
+ShowContractOfService=Show contract of service
+Contracts=Contracts
+ContractsSubscriptions=Contracts/Subscriptions
+ContractsAndLine=Contracts and line of contracts
+Contract=Contract
+ContractLine=Contract line
+Closing=Closing
+NoContracts=No contracts
+MenuServices=Services
+MenuInactiveServices=Services not active
+MenuRunningServices=Running services
+MenuExpiredServices=Expired services
+MenuClosedServices=Closed services
+NewContract=New contract
+NewContractSubscription=New contract or subscription
+AddContract=Create contract
+DeleteAContract=Delete a contract
+ActivateAllOnContract=Activate all services
+CloseAContract=Close a contract
+ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
+ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
+ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
+ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ValidateAContract=Validate a contract
+ActivateService=Activate service
+ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+RefContract=Contract reference
+DateContract=Contract date
+DateServiceActivate=Service activation date
+ListOfServices=List of services
+ListOfInactiveServices=List of not active services
+ListOfExpiredServices=List of expired active services
+ListOfClosedServices=List of closed services
+ListOfRunningServices=List of running services
+NotActivatedServices=Inactive services (among validated contracts)
+BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
+LastContracts=Latest %s contracts
+LastModifiedServices=Latest %s modified services
+ContractStartDate=Start date
+ContractEndDate=End date
+DateStartPlanned=Planned start date
+DateStartPlannedShort=Planned start date
+DateEndPlanned=Planned end date
+DateEndPlannedShort=Planned end date
+DateStartReal=Real start date
+DateStartRealShort=Real start date
+DateEndReal=Real end date
+DateEndRealShort=Real end date
+CloseService=Close service
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
+ServiceStatus=Status of service
+DraftContracts=Drafts contracts
+CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+ActivateAllContracts=Activate all contract lines
+CloseAllContracts=Close all contract lines
+DeleteContractLine=Delete a contract line
+ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+MoveToAnotherContract=Move service into another contract.
+ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
+ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+PaymentRenewContractId=Renew contract line (number %s)
+ExpiredSince=Expiration date
+NoExpiredServices=No expired active services
+ListOfServicesToExpireWithDuration=List of Services to expire in %s days
+ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
+ListOfServicesToExpire=List of Services to expire
+NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
+StandardContractsTemplate=Standard contracts template
+ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
+LowerDateEndPlannedShort=Lower planned end date of active services
+SendContractRef=Contract information __REF__
+OtherContracts=Other contracts
+##### Types de contacts #####
+TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
+TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
+TypeContact_contrat_external_BILLING=Billing customer contact
+TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
+TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
+HideClosedServiceByDefault=Hide closed services by default
+ShowClosedServices=Show Closed Services
+HideClosedServices=Hide Closed Services
diff --git a/htdocs/langs/ar_IQ/cron.lang b/htdocs/langs/ar_IQ/cron.lang
new file mode 100644
index 00000000000..2ebdda1e685
--- /dev/null
+++ b/htdocs/langs/ar_IQ/cron.lang
@@ -0,0 +1,91 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = Read Scheduled job
+Permission23102 = Create/update Scheduled job
+Permission23103 = Delete Scheduled job
+Permission23104 = Execute Scheduled job
+# Admin
+CronSetup=Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
+CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
+CronJobProfiles=List of predefined cron job profiles
+# Menu
+EnabledAndDisabled=Enabled and disabled
+# Page list
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
+CronCommand=Command
+CronList=Scheduled jobs
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronExecute=Launch scheduled job
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronTask=Job
+CronNone=None
+CronDtStart=Not before
+CronDtEnd=Not after
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Start date of latest execution
+CronDtLastResult=End date of latest execution
+CronFrequency=Frequency
+CronClass=Class
+CronMethod=Method
+CronModule=Module
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Label
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
+CronEach=Every
+JobFinished=Job launched and finished
+Scheduled=Scheduled
+#Page card
+CronAdd= Add jobs
+CronEvery=Execute job each
+CronObject=Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save successfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+StatusAtInstall=Status at module installation
+CronStatusActiveBtn=Schedule
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronId=Id
+CronClassFile=Filename with class
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
+CronFrom=From
+# Info
+# Common
+CronType=Job type
+CronType_method=Call method of a PHP Class
+CronType_command=Shell command
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+JobDisabled=Job disabled
+MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/ar_IQ/deliveries.lang b/htdocs/langs/ar_IQ/deliveries.lang
new file mode 100644
index 00000000000..fdfd6404a8a
--- /dev/null
+++ b/htdocs/langs/ar_IQ/deliveries.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Delivery
+DeliveryRef=Ref Delivery
+DeliveryCard=Receipt card
+DeliveryOrder=Delivery receipt
+DeliveryDate=Delivery date
+CreateDeliveryOrder=Generate delivery receipt
+DeliveryStateSaved=Delivery state saved
+SetDeliveryDate=Set shipping date
+ValidateDeliveryReceipt=Validate delivery receipt
+ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
+DeleteDeliveryReceipt=Delete delivery receipt
+DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
+DeliveryMethod=Delivery method
+TrackingNumber=Tracking number
+DeliveryNotValidated=Delivery not validated
+StatusDeliveryCanceled=Canceled
+StatusDeliveryDraft=Draft
+StatusDeliveryValidated=Received
+# merou PDF model
+NameAndSignature=Name and Signature:
+ToAndDate=To___________________________________ on ____/_____/__________
+GoodStatusDeclaration=Have received the goods above in good condition,
+Deliverer=Deliverer:
+Sender=Sender
+Recipient=Recipient
+ErrorStockIsNotEnough=There's not enough stock
+Shippable=Shippable
+NonShippable=Not Shippable
+ShowShippableStatus=Show shippable status
+ShowReceiving=Show delivery receipt
+NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/ar_IQ/dict.lang b/htdocs/langs/ar_IQ/dict.lang
new file mode 100644
index 00000000000..0524cf1ca18
--- /dev/null
+++ b/htdocs/langs/ar_IQ/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
+CountryUK=United Kingdom
+CountryIE=Ireland
+CountryCN=China
+CountryTN=Tunisia
+CountryUS=United States
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Russia
+CountrySE=Sweden
+CountryCI=Ivory Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Cameroon
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brazil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Congo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Croatia
+CountryCU=Cuba
+CountryCY=Cyprus
+CountryCZ=Czech Republic
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egypt
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Greece
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haïti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Iceland
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Iraq
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenya
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrgyzstan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lithuania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagascar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Myanmar (Burma)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=New Zealand
+CountryNI=Nicaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Philippines
+CountryPN=Pitcairn Islands
+CountryPL=Poland
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=South Africa
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Caicos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraine
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
+##### Currencies #####
+Currencyeuros=Euros
+CurrencyAUD=AU Dollars
+CurrencySingAUD=AU Dollar
+CurrencyCAD=CAN Dollars
+CurrencySingCAD=CAN Dollar
+CurrencyCHF=Swiss Francs
+CurrencySingCHF=Swiss Franc
+CurrencyEUR=Euros
+CurrencySingEUR=Euro
+CurrencyFRF=French Francs
+CurrencySingFRF=French Franc
+CurrencyGBP=GB Pounds
+CurrencySingGBP=GB Pound
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian kronas
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US Dollars
+CurrencySingUSD=US Dollar
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentEUR=cents
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
+#### Input reasons #####
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+#### Paper formats ####
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
+#### Expense report categories ####
+ExpAutoCat=Car
+ExpCycloCat=Moped
+ExpMotoCat=Motorbike
+ExpAuto3CV=3 CV
+ExpAuto4CV=4 CV
+ExpAuto5CV=5 CV
+ExpAuto6CV=6 CV
+ExpAuto7CV=7 CV
+ExpAuto8CV=8 CV
+ExpAuto9CV=9 CV
+ExpAuto10CV=10 CV
+ExpAuto11CV=11 CV
+ExpAuto12CV=12 CV
+ExpAuto3PCV=3 CV and more
+ExpAuto4PCV=4 CV and more
+ExpAuto5PCV=5 CV and more
+ExpAuto6PCV=6 CV and more
+ExpAuto7PCV=7 CV and more
+ExpAuto8PCV=8 CV and more
+ExpAuto9PCV=9 CV and more
+ExpAuto10PCV=10 CV and more
+ExpAuto11PCV=11 CV and more
+ExpAuto12PCV=12 CV and more
+ExpAuto13PCV=13 CV and more
+ExpCyclo=Capacity lower to 50cm3
+ExpMoto12CV=Motorbike 1 or 2 CV
+ExpMoto345CV=Motorbike 3, 4 or 5 CV
+ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/ar_IQ/donations.lang b/htdocs/langs/ar_IQ/donations.lang
new file mode 100644
index 00000000000..d512abb2eea
--- /dev/null
+++ b/htdocs/langs/ar_IQ/donations.lang
@@ -0,0 +1,35 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+AddDonation=Create a donation
+NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation?
+PublicDonation=Public donation
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDate=Donation date
+DonationDatePayment=Payment date
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Latest %s modified donations
+DonationRecipient=Donation recipient
+IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
+DonationValidated=Donation %s validated
+DonationUseThirdparties=Use an existing thirdparty as coordinates of donators
diff --git a/htdocs/langs/ar_IQ/ecm.lang b/htdocs/langs/ar_IQ/ecm.lang
new file mode 100644
index 00000000000..c4ea8018111
--- /dev/null
+++ b/htdocs/langs/ar_IQ/ecm.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=No. of documents in directory
+ECMSection=Directory
+ECMSectionManual=Manual directory
+ECMSectionAuto=Automatic directory
+ECMSectionsManual=Manual tree
+ECMSectionsAuto=Automatic tree
+ECMSections=Directories
+ECMRoot=ECM Root
+ECMNewSection=New directory
+ECMAddSection=Add directory
+ECMCreationDate=Creation date
+ECMNbOfFilesInDir=Number of files in directory
+ECMNbOfSubDir=Number of sub-directories
+ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMCreationUser=Creator
+ECMArea=DMS/ECM area
+ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
+ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSearchByKeywords=Search by keywords
+ECMSearchByEntity=Search by object
+ECMSectionOfDocuments=Directories of documents
+ECMTypeAuto=Automatic
+ECMDocsBy=Documents linked to %s
+ECMNoDirectoryYet=No directory created
+ShowECMSection=Show directory
+DeleteSection=Remove directory
+ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ECMDirectoryForFiles=Relative directory for files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+ECMFileManager=File manager
+ECMSelectASection=Select a directory in the tree...
+DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
+ReSyncListOfDir=Resync list of directories
+HashOfFileContent=Hash of file content
+NoDirectoriesFound=No directories found
+FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ar_IQ/errors.lang b/htdocs/langs/ar_IQ/errors.lang
new file mode 100644
index 00000000000..e71c805d506
--- /dev/null
+++ b/htdocs/langs/ar_IQ/errors.lang
@@ -0,0 +1,298 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=No error, we commit
+# Errors
+ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
+ErrorBadUrl=Url %s is wrong
+ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorLoginAlreadyExists=Login %s already exists.
+ErrorGroupAlreadyExists=Group %s already exists.
+ErrorRecordNotFound=Record not found.
+ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
+ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
+ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
+ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
+ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
+ErrorBadThirdPartyName=Bad value for third-party name
+ErrorProdIdIsMandatory=The %s is mandatory
+ErrorBadCustomerCodeSyntax=Bad syntax for customer code
+ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorCustomerCodeRequired=Customer code required
+ErrorBarCodeRequired=Barcode required
+ErrorCustomerCodeAlreadyUsed=Customer code already used
+ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorPrefixRequired=Prefix required
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
+ErrorBadParameters=Bad parameters
+ErrorWrongParameters=Wrong or missing parameters
+ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadDateFormat=Value '%s' has wrong date format
+ErrorWrongDate=Date is not correct!
+ErrorFailedToWriteInDir=Failed to write in directory %s
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
+ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
+ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
+ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
+ErrorNoMailDefinedForThisUser=No mail defined for this user
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
+ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
+ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
+ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
+ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
+ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
+ErrorDirAlreadyExists=A directory with this name already exists.
+ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorPartialFile=File not received completely by server.
+ErrorNoTmpDir=Temporary directy %s does not exists.
+ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
+ErrorFileSizeTooLarge=File size is too large.
+ErrorFieldTooLong=Field %s is too long.
+ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
+ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
+ErrorNoValueForSelectType=Please fill value for select list
+ErrorNoValueForCheckBoxType=Please fill value for checkbox list
+ErrorNoValueForRadioType=Please fill value for radio list
+ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorNoAccountancyModuleLoaded=No accountancy module activated
+ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
+ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
+ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
+ErrorRecordHasChildren=Failed to delete record since it has some child records.
+ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
+ErrorPasswordsMustMatch=Both typed passwords must match each other
+ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
+ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
+ErrorsOnXLines=%s errors found
+ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
+ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
+ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
+ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorBadMask=Error on mask
+ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
+ErrorBadMaskBadRazMonth=Error, bad reset value
+ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorProdIdAlreadyExist=%s is assigned to another third
+ErrorFailedToSendPassword=Failed to send password
+ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
+ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
+ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
+ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
+ErrorRecordAlreadyExists=Record already exists
+ErrorLabelAlreadyExists=This label already exists
+ErrorCantReadFile=Failed to read file '%s'
+ErrorCantReadDir=Failed to read directory '%s'
+ErrorBadLoginPassword=Bad value for login or password
+ErrorLoginDisabled=Your account has been disabled
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Failed to change password
+ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
+ErrorLoginHasNoEmail=This user has no email address. Process aborted.
+ErrorBadValueForCode=Bad value for security code. Try again with new value...
+ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
+ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
+ErrorNoActivatedBarcode=No barcode type activated
+ErrUnzipFails=Failed to unzip %s with ZipArchive
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
+ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
+ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
+ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorNewValueCantMatchOldValue=New value can't be equal to old one
+ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorFailedToAddContact=Failed to add contact
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
+ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
+ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
+ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
+ErrorWarehouseMustDiffers=Source and target warehouses must differs
+ErrorBadFormat=Bad format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
+ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
+ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
+ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpression23=Unknown or non set variable '%s' in %s
+ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
+ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
+ErrorSavingChanges=An error has occurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
+ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
+ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
+ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
+ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
+ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
+ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
+ErrorTaskAlreadyAssigned=Task already assigned to user
+ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
+ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
+ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
+ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
+ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
+ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
+ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
+ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
+ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
+ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
+ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
+ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
+ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
+ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
+ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
+ErrorAddAtLeastOneLineFirst=Add at least one line first
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
+ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
+ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
+ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
+WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
+WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
+WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
+WarningsOnXLines=Warnings on <b>%s</b> source record(s)
+WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
+WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
+WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
+WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
+WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
+WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
+WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
+WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
+WarningProjectClosed=Project is closed. You must re-open it first.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/ar_IQ/exports.lang b/htdocs/langs/ar_IQ/exports.lang
new file mode 100644
index 00000000000..a0eb7161ef2
--- /dev/null
+++ b/htdocs/langs/ar_IQ/exports.lang
@@ -0,0 +1,136 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=Exports
+ImportArea=Import
+NewExport=New Export
+NewImport=New Import
+ExportableDatas=Exportable dataset
+ImportableDatas=Importable dataset
+SelectExportDataSet=Choose dataset you want to export...
+SelectImportDataSet=Choose dataset you want to import...
+SelectExportFields=Choose the fields you want to export, or select a predefined export profile
+SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+NotImportedFields=Fields of source file not imported
+SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveImportModel=Save this import profile (for reuse) ...
+ExportModelName=Export profile name
+ExportModelSaved=Export profile saved as <b>%s</b>.
+ExportableFields=Exportable fields
+ExportedFields=Exported fields
+ImportModelName=Import profile name
+ImportModelSaved=Import profile saved as <b>%s</b>.
+DatasetToExport=Dataset to export
+DatasetToImport=Import file into dataset
+ChooseFieldsOrdersAndTitle=Choose fields order...
+FieldsTitle=Fields title
+FieldTitle=Field title
+NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
+AvailableFormats=Available Formats
+LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
+Step=Step
+FormatedImport=Import Assistant
+FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
+FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
+FormatedExport=Export Assistant
+FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
+FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
+FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+Sheet=Sheet
+NoImportableData=No importable data (no module with definitions to allow data imports)
+FileSuccessfullyBuilt=File generated
+SQLUsedForExport=SQL Request used to extract data
+LineId=Id of line
+LineLabel=Label of line
+LineDescription=Description of line
+LineUnitPrice=Unit price of line
+LineVATRate=VAT Rate of line
+LineQty=Quantity for line
+LineTotalHT=Amount excl. tax for line
+LineTotalTTC=Amount with tax for line
+LineTotalVAT=Amount of VAT for line
+TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
+FileWithDataToImport=File with data to import
+FileToImport=Source file to import
+FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SourceFileFormat=Source file format
+FieldsInSourceFile=Fields in source file
+FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+Field=Field
+NoFields=No fields
+MoveField=Move field column number %s
+ExampleOfImportFile=Example_of_import_file
+SaveImportProfile=Save this import profile
+ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
+TablesTarget=Targeted tables
+FieldsTarget=Targeted fields
+FieldTarget=Targeted field
+FieldSource=Source field
+NbOfSourceLines=Number of lines in source file
+NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
+RunSimulateImportFile=Run Import Simulation
+FieldNeedSource=This field requires data from the source file
+SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
+InformationOnSourceFile=Information on source file
+InformationOnTargetTables=Information on target fields
+SelectAtLeastOneField=Switch at least one source field in the column of fields to export
+SelectFormat=Choose this import file format
+RunImportFile=Import Data
+NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
+DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
+TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
+EmptyLine=Empty line (will be discarded)
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
+FileWasImported=File was imported with number <b>%s</b>.
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
+NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
+NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
+DataComeFromNoWhere=Value to insert comes from nowhere in source file.
+DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataIsInsertedInto=Data coming from source file will be inserted into the following field:
+DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
+DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+SourceRequired=Data value is mandatory
+SourceExample=Example of possible data value
+ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
+ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
+CsvOptions=CSV format options
+Separator=Field Separator
+Enclosure=String Delimiter
+SpecialCode=Special code
+ExportStringFilter=%% allows replacing one or more characters in the text
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
+ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
+KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
+SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
+NoUpdateAttempt=No update attempt was performed, only insert
+ImportDataset_user_1=Users (employees or not) and properties
+ComputedField=Computed field
+## filters
+SelectFilterFields=If you want to filter on some values, just input values here.
+FilteredFields=Filtered fields
+FilteredFieldsValues=Value for filter
+FormatControlRule=Format control rule
+## imports updates
+KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
+NbInsert=Number of inserted lines: %s
+NbUpdate=Number of updated lines: %s
+MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/ar_IQ/externalsite.lang b/htdocs/langs/ar_IQ/externalsite.lang
new file mode 100644
index 00000000000..452100c65b3
--- /dev/null
+++ b/htdocs/langs/ar_IQ/externalsite.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL of HTML iframe content
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/ar_IQ/ftp.lang b/htdocs/langs/ar_IQ/ftp.lang
new file mode 100644
index 00000000000..254a2a698ce
--- /dev/null
+++ b/htdocs/langs/ar_IQ/ftp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPClientSetup=FTP or SFTP Client module setup
+NewFTPClient=New FTP/FTPS connection setup
+FTPArea=FTP/FTPS Area
+FTPAreaDesc=This screen shows a view of an FTP et SFTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP or SFTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP or SFTP functions
+FailedToConnectToFTPServer=Failed to connect to server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
+FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/ar_IQ/help.lang b/htdocs/langs/ar_IQ/help.lang
new file mode 100644
index 00000000000..048de16d3c0
--- /dev/null
+++ b/htdocs/langs/ar_IQ/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Forum/Wiki support
+EMailSupport=Emails support
+RemoteControlSupport=Online real-time / remote support
+OtherSupport=Other support
+ToSeeListOfAvailableRessources=To contact/see available resources:
+HelpCenter=Help Center
+DolibarrHelpCenter=Dolibarr Help and Support Center
+ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
+TypeOfSupport=Type of support
+TypeSupportCommunauty=Community (free)
+TypeSupportCommercial=Commercial
+TypeOfHelp=Type
+NeedHelpCenter=Need help or support?
+Efficiency=Efficiency
+TypeHelpOnly=Help only
+TypeHelpDev=Help+Development
+TypeHelpDevForm=Help+Development+Training
+BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
+LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+PossibleLanguages=Supported languages
+SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/ar_IQ/holiday.lang b/htdocs/langs/ar_IQ/holiday.lang
new file mode 100644
index 00000000000..2393a02ee50
--- /dev/null
+++ b/htdocs/langs/ar_IQ/holiday.lang
@@ -0,0 +1,134 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=Leave
+CPTitreMenu=Leave
+MenuReportMonth=Monthly statement
+MenuAddCP=New leave request
+NotActiveModCP=You must enable the module Leave to view this page.
+AddCP=Make a leave request
+DateDebCP=Start date
+DateFinCP=End date
+DraftCP=Draft
+ToReviewCP=Awaiting approval
+ApprovedCP=Approved
+CancelCP=Canceled
+RefuseCP=Refused
+ValidatorCP=Approver
+ListeCP=List of leave
+Leave=Leave request
+LeaveId=Leave ID
+ReviewedByCP=Will be approved by
+UserID=User ID
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=First name of approval user
+UserForApprovalLastname=Last name of approval user
+UserForApprovalLogin=Login of approval user
+DescCP=Description
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
+ErrorEndDateCP=You must select an end date greater than the start date.
+ErrorSQLCreateCP=An SQL error occurred during the creation:
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ReturnCP=Return to previous page
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosWorkflowCP=Information Workflow
+RequestByCP=Requested by
+TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
+NbUseDaysCP=Number of days of leave used
+NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days of leave
+NbUseDaysCPShortInMonth=Days of leave in month
+DayIsANonWorkingDay=%s is a non-working day
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
+EditCP=Edit
+DeleteCP=Delete
+ActionRefuseCP=Refuse
+ActionCancelCP=Cancel
+StatutCP=Status
+TitleDeleteCP=Delete the leave request
+ConfirmDeleteCP=Confirm the deletion of this leave request?
+ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
+CantCreateCP=You don't have the right to make leave requests.
+InvalidValidatorCP=You must choose the approver for your leave request.
+NoDateDebut=You must select a start date.
+NoDateFin=You must select an end date.
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
+ConfirmValidCP=Are you sure you want to approve the leave request?
+DateValidCP=Date approved
+TitleToValidCP=Send leave request
+ConfirmToValidCP=Are you sure you want to send the leave request?
+TitleRefuseCP=Refuse the leave request
+ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+NoMotifRefuseCP=You must choose a reason for refusing the request.
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
+DetailRefusCP=Reason for refusal
+DateRefusCP=Date of refusal
+DateCancelCP=Date of cancellation
+DefineEventUserCP=Assign an exceptional leave for a user
+addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
+MotifCP=Reason
+UserCP=User
+ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
+AddEventToUserOkCP=The addition of the exceptional leave has been completed.
+MenuLogCP=View change logs
+LogCP=Log of all updates made to "Balance of Leave"
+ActionByCP=Updated by
+UserUpdateCP=Updated for
+PrevSoldeCP=Previous Balance
+NewSoldeCP=New Balance
+alreadyCPexist=A leave request has already been done on this period.
+FirstDayOfHoliday=Beginning day of leave request
+LastDayOfHoliday=Ending day of leave request
+BoxTitleLastLeaveRequests=Latest %s modified leave requests
+HolidaysMonthlyUpdate=Monthly update
+ManualUpdate=Manual update
+HolidaysCancelation=Leave request cancelation
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
+## Configuration du Module ##
+LastUpdateCP=Last automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
+UpdateConfCPOK=Updated successfully.
+Module27130Name= Management of leave requests
+Module27130Desc= Management of leave requests
+ErrorMailNotSend=An error occurred while sending email:
+NoticePeriod=Notice period
+#Messages
+HolidaysToValidate=Validate leave requests
+HolidaysToValidateBody=Below is a leave request to validate
+HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
+HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysValidated=Validated leave requests
+HolidaysValidatedBody=Your leave request for %s to %s has been validated.
+HolidaysRefused=Request denied
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
+HolidaysCanceled=Canceled leaved request
+HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
+FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
+NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+HolidaySetup=Setup of module Leave
+HolidaysNumberingModules=Numbering models for leave requests
+TemplatePDFHolidays=Template for leave requests PDF
+FreeLegalTextOnHolidays=Free text on PDF
+WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
+HolidaysToApprove=Holidays to approve
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
diff --git a/htdocs/langs/ar_IQ/hrm.lang b/htdocs/langs/ar_IQ/hrm.lang
new file mode 100644
index 00000000000..3b8f137e103
--- /dev/null
+++ b/htdocs/langs/ar_IQ/hrm.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - en_US - hrm
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+Establishments=Establishments
+Establishment=Establishment
+NewEstablishment=New establishment
+DeleteEstablishment=Delete establishment
+ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
+OpenEtablishment=Open establishment
+CloseEtablishment=Close establishment
+# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Job positions
+# Module
+Employees=Employees
+Employee=Employee
+NewEmployee=New employee
+ListOfEmployees=List of employees
diff --git a/htdocs/langs/ar_IQ/install.lang b/htdocs/langs/ar_IQ/install.lang
new file mode 100644
index 00000000000..63947dad154
--- /dev/null
+++ b/htdocs/langs/ar_IQ/install.lang
@@ -0,0 +1,217 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Just follow the instructions step by step.
+MiscellaneousChecks=Prerequisites check
+ConfFileExists=Configuration file <b>%s</b> exists.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
+ConfFileReload=Reloading parameters from configuration file.
+PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportSessions=This PHP supports sessions.
+PHPSupport=This PHP supports %s functions.
+PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
+PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
+Recheck=Click here for a more detailed test
+ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
+ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
+ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
+ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorDirDoesNotExists=Directory %s does not exist.
+ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
+ErrorFailedToCreateDatabase=Failed to create database '%s'.
+ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
+ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorDatabaseAlreadyExists=Database '%s' already exists.
+IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
+WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+PHPVersion=PHP Version
+License=Using license
+ConfigurationFile=Configuration file
+WebPagesDirectory=Directory where web pages are stored
+DocumentsDirectory=Directory to store uploaded and generated documents
+URLRoot=URL Root
+ForceHttps=Force secure connections (https)
+CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
+DolibarrDatabase=Dolibarr Database
+DatabaseType=Database type
+DriverType=Driver type
+Server=Server
+ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
+ServerPortDescription=Database server port. Keep empty if unknown.
+DatabaseServer=Database server
+DatabaseName=Database name
+DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
+AdminLogin=User account for the Dolibarr database owner.
+PasswordAgain=Retype password confirmation
+AdminPassword=Password for Dolibarr database owner.
+CreateDatabase=Create database
+CreateUser=Create user account or grant user account permission on the Dolibarr database
+DatabaseSuperUserAccess=Database server - Superuser access
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
+DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
+KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
+SaveConfigurationFile=Saving parameters to
+ServerConnection=Server connection
+DatabaseCreation=Database creation
+CreateDatabaseObjects=Database objects creation
+ReferenceDataLoading=Reference data loading
+TablesAndPrimaryKeysCreation=Tables and Primary keys creation
+CreateTableAndPrimaryKey=Create table %s
+CreateOtherKeysForTable=Create foreign keys and indexes for table %s
+OtherKeysCreation=Foreign keys and indexes creation
+FunctionsCreation=Functions creation
+AdminAccountCreation=Administrator login creation
+PleaseTypePassword=Please type a password, empty passwords are not allowed!
+PleaseTypeALogin=Please type a login!
+PasswordsMismatch=Passwords differs, please try again!
+SetupEnd=End of setup
+SystemIsInstalled=This installation is complete.
+SystemIsUpgraded=Dolibarr has been upgraded successfully.
+YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
+AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+GoToDolibarr=Go to Dolibarr
+GoToSetupArea=Go to Dolibarr (setup area)
+MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+GoToUpgradePage=Go to upgrade page again
+WithNoSlashAtTheEnd=Without the slash "/" at the end
+DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+LoginAlreadyExists=Already exists
+DolibarrAdminLogin=Dolibarr admin login
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+FunctionNotAvailableInThisPHP=Not available in this PHP
+ChoosedMigrateScript=Choose migration script
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
+ProcessMigrateScript=Script processing
+ChooseYourSetupMode=Choose your setup mode and click "Start"...
+FreshInstall=Fresh install
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+Upgrade=Upgrade
+UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
+Start=Start
+InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
+YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
+CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+AlreadyDone=Already migrated
+DatabaseVersion=Database version
+ServerVersion=Database server version
+YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
+DBSortingCollation=Character sorting order
+YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
+BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
+RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
+FieldRenamed=Field renamed
+IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
+InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
+MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
+CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
+OpenBaseDir=PHP openbasedir parameter
+YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
+YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
+NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
+MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+MigrationShippingDelivery=Upgrade storage of shipping
+MigrationShippingDelivery2=Upgrade storage of shipping 2
+MigrationFinished=Migration finished
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+ActivateModule=Activate module %s
+ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
+WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
+KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
+KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
+KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
+UpgradeExternalModule=Run dedicated upgrade process of external module
+SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
+NothingToDelete=Nothing to clean/delete
+NothingToDo=Nothing to do
+#########
+# upgrade
+MigrationFixData=Fix for denormalized data
+MigrationOrder=Data migration for customer's orders
+MigrationSupplierOrder=Data migration for vendor's orders
+MigrationProposal=Data migration for commercial proposals
+MigrationInvoice=Data migration for customer's invoices
+MigrationContract=Data migration for contracts
+MigrationSuccessfullUpdate=Upgrade successful
+MigrationUpdateFailed=Failed upgrade process
+MigrationRelationshipTables=Data migration for relationship tables (%s)
+MigrationPaymentsUpdate=Payment data correction
+MigrationPaymentsNumberToUpdate=%s payment(s) to update
+MigrationProcessPaymentUpdate=Update payment(s) %s
+MigrationPaymentsNothingToUpdate=No more things to do
+MigrationPaymentsNothingUpdatable=No more payments that can be corrected
+MigrationContractsUpdate=Contract data correction
+MigrationContractsNumberToUpdate=%s contract(s) to update
+MigrationContractsLineCreation=Create contract line for contract ref %s
+MigrationContractsNothingToUpdate=No more things to do
+MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsEmptyDatesUpdate=Contract empty date correction
+MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
+MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
+MigrationContractsInvalidDatesUpdate=Bad value date contract correction
+MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
+MigrationContractsInvalidDatesNumber=%s contracts modified
+MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
+MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
+MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
+MigrationReopeningContracts=Open contract closed by error
+MigrationReopenThisContract=Reopen contract %s
+MigrationReopenedContractsNumber=%s contracts modified
+MigrationReopeningContractsNothingToUpdate=No closed contract to open
+MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsNothingToUpdate=All links are up to date
+MigrationShipmentOrderMatching=Sendings receipt update
+MigrationDeliveryOrderMatching=Delivery receipt update
+MigrationDeliveryDetail=Delivery update
+MigrationStockDetail=Update stock value of products
+MigrationMenusDetail=Update dynamic menus tables
+MigrationDeliveryAddress=Update delivery address in shipments
+MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
+MigrationProjectTaskTime=Update time spent in seconds
+MigrationActioncommElement=Update data on actions
+MigrationPaymentMode=Data migration for payment type
+MigrationCategorieAssociation=Migration of categories
+MigrationEvents=Migration of events to add event owner into assignment table
+MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserPhotoPath=Migration of photo paths for users
+MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationReloadModule=Reload module %s
+MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+ShowNotAvailableOptions=Show unavailable options
+HideNotAvailableOptions=Hide unavailable options
+ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
+YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+ClickHereToGoToApp=Click here to go to your application
+ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/ar_IQ/interventions.lang b/htdocs/langs/ar_IQ/interventions.lang
new file mode 100644
index 00000000000..51079fca278
--- /dev/null
+++ b/htdocs/langs/ar_IQ/interventions.lang
@@ -0,0 +1,68 @@
+# Dolibarr language file - Source file is en_US - interventions
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ListOfInterventions=List of interventions
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Latest %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
+ConfirmCloneIntervention=Are you sure you want to clone this intervention?
+NameAndSignatureOfInternalContact=Name and signature of intervening:
+NameAndSignatureOfExternalContact=Name and signature of customer:
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyDone=Classify "Done"
+StatusInterInvoiced=Billed
+SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by email
+InterventionDeletedInDolibarr=Intervention %s deleted
+InterventionsArea=Interventions area
+DraftFichinter=Draft interventions
+LastModifiedInterventions=Latest %s modified interventions
+FichinterToProcess=Interventions to process
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
+PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
+UseDurationOnFichinter=Hides the duration field for intervention records
+UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
+InterventionStatistics=Statistics of interventions
+NbOfinterventions=No. of intervention cards
+NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+InterId=Intervention id
+InterRef=Intervention ref.
+InterDateCreation=Date creation intervention
+InterDuration=Duration intervention
+InterStatus=Status intervention
+InterNote=Note intervention
+InterLine=Line of intervention
+InterLineId=Line id intervention
+InterLineDate=Line date intervention
+InterLineDuration=Line duration intervention
+InterLineDesc=Line description intervention
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/ar_IQ/intracommreport.lang b/htdocs/langs/ar_IQ/intracommreport.lang
new file mode 100644
index 00000000000..93c46f112bb
--- /dev/null
+++ b/htdocs/langs/ar_IQ/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of analysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/ar_IQ/languages.lang b/htdocs/langs/ar_IQ/languages.lang
new file mode 100644
index 00000000000..ba187326705
--- /dev/null
+++ b/htdocs/langs/ar_IQ/languages.lang
@@ -0,0 +1,105 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
+Language_ar_AR=Arabic
+Language_ar_EG=Arabic (Egypt)
+Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
+Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
+Language_bg_BG=Bulgarian
+Language_bs_BA=Bosnian
+Language_ca_ES=Catalan
+Language_cs_CZ=Czech
+Language_da_DA=Danish
+Language_da_DK=Danish
+Language_de_DE=German
+Language_de_AT=German (Austria)
+Language_de_CH=German (Switzerland)
+Language_el_GR=Greek
+Language_el_CY=Greek (Cyprus)
+Language_en_AU=English (Australia)
+Language_en_CA=English (Canada)
+Language_en_GB=English (United Kingdom)
+Language_en_IN=English (India)
+Language_en_NZ=English (New Zealand)
+Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
+Language_en_US=English (United States)
+Language_en_ZA=English (South Africa)
+Language_es_ES=Spanish
+Language_es_AR=Spanish (Argentina)
+Language_es_BO=Spanish (Bolivia)
+Language_es_CL=Spanish (Chile)
+Language_es_CO=Spanish (Colombia)
+Language_es_DO=Spanish (Dominican Republic)
+Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
+Language_es_HN=Spanish (Honduras)
+Language_es_MX=Spanish (Mexico)
+Language_es_PA=Spanish (Panama)
+Language_es_PY=Spanish (Paraguay)
+Language_es_PE=Spanish (Peru)
+Language_es_PR=Spanish (Puerto Rico)
+Language_es_US=Spanish (USA)
+Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
+Language_es_VE=Spanish (Venezuela)
+Language_et_EE=Estonian
+Language_eu_ES=Basque
+Language_fa_IR=Persian
+Language_fi_FI=Finnish
+Language_fr_BE=French (Belgium)
+Language_fr_CA=French (Canada)
+Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
+Language_fr_FR=French
+Language_fr_GA=French (Gabon)
+Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
+Language_fy_NL=Frisian
+Language_gl_ES=Galician
+Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
+Language_hr_HR=Croatian
+Language_hu_HU=Hungarian
+Language_id_ID=Indonesian
+Language_is_IS=Icelandic
+Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
+Language_ja_JP=Japanese
+Language_ka_GE=Georgian
+Language_km_KH=Khmer
+Language_kn_IN=Kannada
+Language_ko_KR=Korean
+Language_lo_LA=Lao
+Language_lt_LT=Lithuanian
+Language_lv_LV=Latvian
+Language_mk_MK=Macedonian
+Language_mn_MN=Mongolian
+Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
+Language_nl_BE=Dutch (Belgium)
+Language_nl_NL=Dutch
+Language_pl_PL=Polish
+Language_pt_BR=Portuguese (Brazil)
+Language_pt_PT=Portuguese
+Language_ro_RO=Romanian
+Language_ru_RU=Russian
+Language_ru_UA=Russian (Ukraine)
+Language_tr_TR=Turkish
+Language_sl_SI=Slovenian
+Language_sv_SV=Swedish
+Language_sv_SE=Swedish
+Language_sq_AL=Albanian
+Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
+Language_sw_SW=Kiswahili
+Language_th_TH=Thai
+Language_uk_UA=Ukrainian
+Language_uz_UZ=Uzbek
+Language_vi_VN=Vietnamese
+Language_zh_CN=Chinese
+Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
+Language_bh_MY=Malay
diff --git a/htdocs/langs/ar_IQ/ldap.lang b/htdocs/langs/ar_IQ/ldap.lang
new file mode 100644
index 00000000000..8b6f0864215
--- /dev/null
+++ b/htdocs/langs/ar_IQ/ldap.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
+UserMustChangePassNextLogon=User must change password on the domain %s
+LDAPInformationsForThisContact=Information in LDAP database for this contact
+LDAPInformationsForThisUser=Information in LDAP database for this user
+LDAPInformationsForThisGroup=Information in LDAP database for this group
+LDAPInformationsForThisMember=Information in LDAP database for this member
+LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPAttributes=LDAP attributes
+LDAPCard=LDAP card
+LDAPRecordNotFound=Record not found in LDAP database
+LDAPUsers=Users in LDAP database
+LDAPFieldStatus=Status
+LDAPFieldFirstSubscriptionDate=First subscription date
+LDAPFieldFirstSubscriptionAmount=First subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example: skypeName
+UserSynchronized=User synchronized
+GroupSynchronized=Group synchronized
+MemberSynchronized=Member synchronized
+MemberTypeSynchronized=Member type synchronized
+ContactSynchronized=Contact synchronized
+ForceSynchronize=Force synchronizing Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/ar_IQ/link.lang b/htdocs/langs/ar_IQ/link.lang
new file mode 100644
index 00000000000..1ffcd41a18b
--- /dev/null
+++ b/htdocs/langs/ar_IQ/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Link a new file/document
+LinkedFiles=Linked files and documents
+NoLinkFound=No registered links
+LinkComplete=The file has been linked successfully
+ErrorFileNotLinked=The file could not be linked
+LinkRemoved=The link %s has been removed
+ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/ar_IQ/loan.lang b/htdocs/langs/ar_IQ/loan.lang
new file mode 100644
index 00000000000..d271ed0c140
--- /dev/null
+++ b/htdocs/langs/ar_IQ/loan.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+LoanPayment=Loan payment
+ShowLoanPayment=Show Loan Payment
+LoanCapital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+Term=Term
+LoanAccountancyCapitalCode=Accounting account capital
+LoanAccountancyInsuranceCode=Accounting account insurance
+LoanAccountancyInterestCode=Accounting account interest
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ListLoanAssociatedProject=List of loan associated with the project
+AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
+TermPaidAllreadyPaid = This term is allready paid
+CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
+CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+CreateCalcSchedule=Edit financial commitment
diff --git a/htdocs/langs/ar_IQ/mailmanspip.lang b/htdocs/langs/ar_IQ/mailmanspip.lang
new file mode 100644
index 00000000000..bab4b3576b4
--- /dev/null
+++ b/htdocs/langs/ar_IQ/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed successfully
+MailmanDeletionSuccess=Unsubscription test was executed successfully
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=A Spip update will be performed
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+SPIPTitle=SPIP Content Management System
+DescADHERENT_SPIP_SERVEUR=SPIP Server
+DescADHERENT_SPIP_DB=SPIP database name
+DescADHERENT_SPIP_USER=SPIP database login
+DescADHERENT_SPIP_PASS=SPIP database password
+AddIntoSpip=Add into SPIP
+AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
+AddIntoSpipError=Failed to add the user in SPIP
+DeleteIntoSpip=Remove from SPIP
+DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
+DeleteIntoSpipError=Failed to suppress the user from SPIP
+SPIPConnectionFailed=Failed to connect to SPIP
+SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
+SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
diff --git a/htdocs/langs/ar_IQ/mails.lang b/htdocs/langs/ar_IQ/mails.lang
new file mode 100644
index 00000000000..2d02c5ddcf9
--- /dev/null
+++ b/htdocs/langs/ar_IQ/mails.lang
@@ -0,0 +1,179 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=EMailing
+EMailing=EMailing
+EMailings=EMailings
+AllEMailings=All eMailings
+MailCard=EMailing card
+MailRecipients=Recipients
+MailRecipient=Recipient
+MailTitle=Description
+MailFrom=Sender
+MailErrorsTo=Errors to
+MailReply=Reply to
+MailTo=Receiver(s)
+MailToUsers=To user(s)
+MailCC=Copy to
+MailToCCUsers=Copy to users(s)
+MailCCC=Cached copy to
+MailTopic=Email topic
+MailText=Message
+MailFile=Attached files
+MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
+ShowEMailing=Show emailing
+ListOfEMailings=List of emailings
+NewMailing=New emailing
+EditMailing=Edit emailing
+ResetMailing=Resend emailing
+DeleteMailing=Delete emailing
+DeleteAMailing=Delete an emailing
+PreviewMailing=Preview emailing
+CreateMailing=Create emailing
+TestMailing=Test email
+ValidMailing=Valid emailing
+MailingStatusDraft=Draft
+MailingStatusValidated=Validated
+MailingStatusSent=Sent
+MailingStatusSentPartialy=Sent partially
+MailingStatusSentCompletely=Sent completely
+MailingStatusError=Error
+MailingStatusNotSent=Not sent
+MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailingSuccessfullyValidated=EMailing successfully validated
+MailUnsubcribe=Unsubscribe
+MailingStatusNotContact=Don't contact anymore
+MailingStatusReadAndUnsubscribe=Read and unsubscribe
+ErrorMailRecipientIsEmpty=Email recipient is empty
+WarningNoEMailsAdded=No new Email to add to recipient's list.
+ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmDeleteMailing=Are you sure you want to delete this emailing?
+NbOfUniqueEMails=No. of unique emails
+NbOfEMails=No. of EMails
+TotalNbOfDistinctRecipients=Number of distinct recipients
+NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
+NoRecipientEmail=No recipient email for %s
+RemoveRecipient=Remove recipient
+YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
+MailingAddFile=Attach this file
+NoAttachedFiles=No attached files
+BadEMail=Bad value for Email
+ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+CloneContent=Clone message
+CloneReceivers=Cloner recipients
+DateLastSend=Date of latest sending
+DateSending=Date sending
+SentTo=Sent to <b>%s</b>
+MailingStatusRead=Read
+YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
+ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
+EMailSentToNRecipients=Email sent to %s recipients.
+EMailSentForNElements=Email sent for %s elements.
+XTargetsAdded=<b>%s</b> recipients added into target list
+OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
+AllRecipientSelected=The recipients of the %s record selected (if their email is known).
+GroupEmails=Group emails
+OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+ResultOfMailSending=Result of mass Email sending
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
+SentXXXmessages=%s message(s) sent.
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
+MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
+MailingModuleDescEmailsFromFile=Emails from file
+MailingModuleDescEmailsFromUser=Emails input by user
+MailingModuleDescDolibarrUsers=Users with Emails
+MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
+
+# Libelle des modules de liste de destinataires mailing
+LineInFile=Line %s in file
+RecipientSelectionModules=Defined requests for recipient's selection
+MailSelectedRecipients=Selected recipients
+MailingArea=EMailings area
+LastMailings=Latest %s emailings
+TargetsStatistics=Targets statistics
+NbOfCompaniesContacts=Unique contacts/addresses
+MailNoChangePossible=Recipients for validated emailing can't be changed
+SearchAMailing=Search mailing
+SendMailing=Send emailing
+SentBy=Sent by
+MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
+ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+TargetsReset=Clear list
+ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
+ToAddRecipientsChooseHere=Add recipients by choosing from the lists
+NbOfEMailingsReceived=Mass emailings received
+NbOfEMailingsSend=Mass emailings sent
+IdRecord=ID record
+DeliveryReceipt=Delivery Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+TagCheckMail=Track mail opening
+TagUnsubscribe=Unsubscribe link
+TagSignature=Signature of sending user
+EMailRecipient=Recipient Email
+TagMailtoEmail=Recipient Email (including html "mailto:" link)
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+# Module Notifications
+Notifications=Notifications
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
+UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
+UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=Recipients (advanced selection)
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
+AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchIntHelp=Use interval to select int or float value
+AdvTgtMinVal=Minimum value
+AdvTgtMaxVal=Maximum value
+AdvTgtSearchDtHelp=Use interval to select date value
+AdvTgtStartDt=Start dt.
+AdvTgtEndDt=End dt.
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
+AdvTgtTypeOfIncude=Type of targeted email
+AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+AddAll=Add all
+RemoveAll=Remove all
+ItemsCount=Item(s)
+AdvTgtNameTemplate=Filter name
+AdvTgtAddContact=Add emails according to criteria
+AdvTgtLoadFilter=Load filter
+AdvTgtDeleteFilter=Delete filter
+AdvTgtSaveFilter=Save filter
+AdvTgtCreateFilter=Create filter
+AdvTgtOrCreateNewFilter=Name of new filter
+NoContactWithCategoryFound=No contact/address with a category found
+NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
+Information=Information
+ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/ar_IQ/main.lang b/htdocs/langs/ar_IQ/main.lang
new file mode 100644
index 00000000000..dc2a83f2015
--- /dev/null
+++ b/htdocs/langs/ar_IQ/main.lang
@@ -0,0 +1,1131 @@
+# 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=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
+DatabaseConnection=Database connection
+NoTemplateDefined=No template available for this email type
+AvailableVariables=Available substitution variables
+NoTranslation=No translation
+Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
+EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
+NoRecordFound=No record found
+NoRecordDeleted=No record deleted
+NotEnoughDataYet=Not enough data
+NoError=No error
+Error=Error
+Errors=Errors
+ErrorFieldRequired=Field '%s' is required
+ErrorFieldFormat=Field '%s' has a bad value
+ErrorFileDoesNotExists=File %s does not exist
+ErrorFailedToOpenFile=Failed to open file %s
+ErrorCanNotCreateDir=Cannot create dir %s
+ErrorCanNotReadDir=Cannot read dir %s
+ErrorConstantNotDefined=Parameter %s not defined
+ErrorUnknown=Unknown error
+ErrorSQL=SQL Error
+ErrorLogoFileNotFound=Logo file '%s' was not found
+ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToModuleSetup=Go to Module setup to fix this
+ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
+ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
+ErrorInternalErrorDetected=Error detected
+ErrorWrongHostParameter=Wrong host parameter
+ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
+ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorWrongValue=Wrong value
+ErrorWrongValueForParameterX=Wrong value for parameter %s
+ErrorNoRequestInError=No request in error
+ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorDuplicateField=Duplicate value in a unique field
+ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
+ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorFailedToSaveFile=Error, failed to save file.
+ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
+MaxNbOfRecordPerPage=Max. number of records per page
+NotAuthorized=You are not authorized to do that.
+SetDate=Set date
+SelectDate=Select a date
+SeeAlso=See also %s
+SeeHere=See here
+ClickHere=Click here
+Here=Here
+Apply=Apply
+BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
+FileGenerated=The file was successfully generated
+FileSaved=The file was successfully saved
+FileUploaded=The file was successfully uploaded
+FileTransferComplete=File(s) uploaded successfully
+FilesDeleted=File(s) successfully deleted
+FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
+NbOfEntries=No. of entries
+GoToWikiHelpPage=Read online help (Internet access needed)
+GoToHelpPage=Read help
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
+RecordSaved=Record saved
+RecordDeleted=Record deleted
+RecordGenerated=Record generated
+LevelOfFeature=Level of features
+NotDefined=Not defined
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+Administrator=Administrator
+Undefined=Undefined
+PasswordForgotten=Password forgotten?
+NoAccount=No account?
+SeeAbove=See above
+HomeArea=Home
+LastConnexion=Last login
+PreviousConnexion=Previous login
+PreviousValue=Previous value
+ConnectedOnMultiCompany=Connected on environment
+ConnectedSince=Connected since
+AuthenticationMode=Authentication mode
+RequestedUrl=Requested URL
+DatabaseTypeManager=Database type manager
+RequestLastAccessInError=Latest database access request error
+ReturnCodeLastAccessInError=Return code for latest database access request error
+InformationLastAccessInError=Information for latest database access request error
+DolibarrHasDetectedError=Dolibarr has detected a technical error
+YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+MoreInformation=More information
+TechnicalInformation=Technical information
+TechnicalID=Technical ID
+LineID=Line ID
+NotePublic=Note (public)
+NotePrivate=Note (private)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+DoTest=Test
+ToFilter=Filter
+NoFilter=No filter
+WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+yes=yes
+Yes=Yes
+no=no
+No=No
+All=All
+Home=Home
+Help=Help
+OnlineHelp=Online help
+PageWiki=Wiki page
+MediaBrowser=Media browser
+Always=Always
+Never=Never
+Under=under
+Period=Period
+PeriodEndDate=End date for period
+SelectedPeriod=Selected period
+PreviousPeriod=Previous period
+Activate=Activate
+Activated=Activated
+Closed=Closed
+Closed2=Closed
+NotClosed=Not closed
+Enabled=Enabled
+Enable=Enable
+Deprecated=Deprecated
+Disable=Disable
+Disabled=Disabled
+Add=Add
+AddLink=Add link
+RemoveLink=Remove link
+AddToDraft=Add to draft
+Update=Update
+Close=Close
+CloseAs=Set status to
+CloseBox=Remove widget from your dashboard
+Confirm=Confirm
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+Delete=Delete
+Remove=Remove
+Resiliate=Terminate
+Cancel=Cancel
+Modify=Modify
+Edit=Edit
+Validate=Validate
+ValidateAndApprove=Validate and Approve
+ToValidate=To validate
+NotValidated=Not validated
+Save=Save
+SaveAs=Save As
+SaveAndStay=Save and stay
+SaveAndNew=Save and new
+TestConnection=Test connection
+ToClone=Clone
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmClone=Choose data you want to clone:
+NoCloneOptionsSpecified=No data to clone defined.
+Of=of
+Go=Go
+Run=Run
+CopyOf=Copy of
+Show=Show
+Hide=Hide
+ShowCardHere=Show card
+Search=Search
+SearchOf=Search
+SearchMenuShortCut=Ctrl + shift + f
+QuickAdd=Quick add
+QuickAddMenuShortCut=Ctrl + shift + l
+Valid=Valid
+Approve=Approve
+Disapprove=Disapprove
+ReOpen=Re-Open
+Upload=Upload
+ToLink=Link
+Select=Select
+SelectAll=Select all
+Choose=Choose
+Resize=Resize
+ResizeOrCrop=Resize or Crop
+Recenter=Recenter
+Author=Author
+User=User
+Users=Users
+Group=Group
+Groups=Groups
+NoUserGroupDefined=No user group defined
+Password=Password
+PasswordRetype=Retype your password
+NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+Name=Name
+NameSlashCompany=Name / Company
+Person=Person
+Parameter=Parameter
+Parameters=Parameters
+Value=Value
+PersonalValue=Personal value
+NewObject=New %s
+NewValue=New value
+OldValue=Old value %s
+CurrentValue=Current value
+Code=Code
+Type=Type
+Language=Language
+MultiLanguage=Multi-language
+Note=Note
+Title=Title
+Label=Label
+RefOrLabel=Ref. or label
+Info=Log
+Family=Family
+Description=Description
+Designation=Description
+DescriptionOfLine=Description of line
+DateOfLine=Date of line
+DurationOfLine=Duration of line
+Model=Doc template
+DefaultModel=Default doc template
+Action=Event
+About=About
+Number=Number
+NumberByMonth=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=Login
+Setup=Setup
+Alert=Alert
+MenuWarnings=Alerts
+Previous=Previous
+Next=Next
+Cards=Cards
+Card=Card
+Now=Now
+HourStart=Start hour
+Deadline=Deadline
+Date=Date
+DateAndHour=Date and hour
+DateToday=Today's date
+DateReference=Reference date
+DateStart=Start date
+DateEnd=End date
+DateCreation=Creation date
+DateCreationShort=Creat. date
+IPCreation=Creation IP
+DateModification=Modification date
+DateModificationShort=Modif. date
+IPModification=Modification IP
+DateLastModification=Latest modification date
+DateValidation=Validation date
+DateSigning=Signing date
+DateClosing=Closing date
+DateDue=Due date
+DateValue=Value date
+DateValueShort=Value date
+DateOperation=Operation date
+DateOperationShort=Oper. Date
+DateLimit=Limit date
+DateRequest=Request date
+DateProcess=Process date
+DateBuild=Report build date
+DatePayment=Date of payment
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
+RegistrationDate=Registration date
+UserCreation=Creation user
+UserModification=Modification user
+UserValidation=Validation user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
+UserValidationShort=Valid. user
+DurationYear=year
+DurationMonth=month
+DurationWeek=week
+DurationDay=day
+DurationYears=years
+DurationMonths=months
+DurationWeeks=weeks
+DurationDays=days
+Year=Year
+Month=Month
+Week=Week
+WeekShort=Week
+Day=Day
+Hour=Hour
+Minute=Minute
+Second=Second
+Years=Years
+Months=Months
+Days=Days
+days=days
+Hours=Hours
+Minutes=Minutes
+Seconds=Seconds
+Weeks=Weeks
+Today=Today
+Yesterday=Yesterday
+Tomorrow=Tomorrow
+Morning=Morning
+Afternoon=Afternoon
+Quadri=Quadri
+MonthOfDay=Month of the day
+DaysOfWeek=Days of week
+HourShort=H
+MinuteShort=mn
+Rate=Rate
+CurrencyRate=Currency conversion rate
+UseLocalTax=Include tax
+Bytes=Bytes
+KiloBytes=Kilobytes
+MegaBytes=Megabytes
+GigaBytes=Gigabytes
+TeraBytes=Terabytes
+UserAuthor=User of creation
+UserModif=User of last update
+b=b.
+Kb=Kb
+Mb=Mb
+Gb=Gb
+Tb=Tb
+Cut=Cut
+Copy=Copy
+Paste=Paste
+Default=Default
+DefaultValue=Default value
+DefaultValues=Default values/filters/sorting
+Price=Price
+PriceCurrency=Price (currency)
+UnitPrice=Unit price
+UnitPriceHT=Unit price (excl.)
+UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceTTC=Unit price
+PriceU=U.P.
+PriceUHT=U.P. (net)
+PriceUHTCurrency=U.P (net) (currency)
+PriceUTTC=U.P. (inc. tax)
+Amount=Amount
+AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountPayment=Payment amount
+AmountHTShort=Amount (excl.)
+AmountTTCShort=Amount (inc. tax)
+AmountHT=Amount (excl. tax)
+AmountTTC=Amount (inc. tax)
+AmountVAT=Amount tax
+MulticurrencyAlreadyPaid=Already paid, original currency
+MulticurrencyRemainderToPay=Remain to pay, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountTTC=Amount (inc. of tax), original currency
+MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
+AmountLT1=Amount tax 2
+AmountLT2=Amount tax 3
+AmountLT1ES=Amount RE
+AmountLT2ES=Amount IRPF
+AmountTotal=Total amount
+AmountAverage=Average amount
+PriceQtyMinHT=Price quantity min. (excl. tax)
+PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
+Percentage=Percentage
+Total=Total
+SubTotal=Subtotal
+TotalHTShort=Total (excl.)
+TotalHT100Short=Total 100%% (excl.)
+TotalHTShortCurrency=Total (excl. in currency)
+TotalTTCShort=Total (inc. tax)
+TotalHT=Total (excl. tax)
+TotalHTforthispage=Total (excl. tax) for this page
+Totalforthispage=Total for this page
+TotalTTC=Total (inc. tax)
+TotalTTCToYourCredit=Total (inc. tax) to your credit
+TotalVAT=Total tax
+TotalVATIN=Total IGST
+TotalLT1=Total tax 2
+TotalLT2=Total tax 3
+TotalLT1ES=Total RE
+TotalLT2ES=Total IRPF
+TotalLT1IN=Total CGST
+TotalLT2IN=Total SGST
+HT=Excl. tax
+TTC=Inc. tax
+INCVATONLY=Inc. VAT
+INCT=Inc. all taxes
+VAT=Sales tax
+VATIN=IGST
+VATs=Sales taxes
+VATINs=IGST taxes
+LT1=Sales tax 2
+LT1Type=Sales tax 2 type
+LT2=Sales tax 3
+LT2Type=Sales tax 3 type
+LT1ES=RE
+LT2ES=IRPF
+LT1IN=CGST
+LT2IN=SGST
+LT1GC=Additionnal cents
+VATRate=Tax Rate
+VATCode=Tax Rate code
+VATNPR=Tax Rate NPR
+DefaultTaxRate=Default tax rate
+Average=Average
+Sum=Sum
+Delta=Delta
+StatusToPay=To pay
+RemainToPay=Remain to pay
+Module=Module/Application
+Modules=Modules/Applications
+Option=Option
+Filters=Filters
+List=List
+FullList=Full list
+FullConversation=Full conversation
+Statistics=Statistics
+OtherStatistics=Other statistics
+Status=Status
+Favorite=Favorite
+ShortInfo=Info.
+Ref=Ref.
+ExternalRef=Ref. extern
+RefSupplier=Ref. vendor
+RefPayment=Ref. payment
+CommercialProposalsShort=Commercial proposals
+Comment=Comment
+Comments=Comments
+ActionsToDo=Events to do
+ActionsToDoShort=To do
+ActionsDoneShort=Done
+ActionNotApplicable=Not applicable
+ActionRunningNotStarted=To start
+ActionRunningShort=In progress
+ActionDoneShort=Finished
+ActionUncomplete=Incomplete
+LatestLinkedEvents=Latest %s linked events
+CompanyFoundation=Company/Organization
+Accountant=Accountant
+ContactsForCompany=Contacts for this third party
+ContactsAddressesForCompany=Contacts/addresses for this third party
+AddressesForCompany=Addresses for this third party
+ActionsOnCompany=Events for this third party
+ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
+ActionsOnMember=Events about this member
+ActionsOnProduct=Events about this product
+NActionsLate=%s late
+ToDo=To do
+Completed=Completed
+Running=In progress
+RequestAlreadyDone=Request already recorded
+Filter=Filter
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+RemoveFilter=Remove filter
+ChartGenerated=Chart generated
+ChartNotGenerated=Chart not generated
+GeneratedOn=Build on %s
+Generate=Generate
+Duration=Duration
+TotalDuration=Total duration
+Summary=Summary
+DolibarrStateBoard=Database Statistics
+DolibarrWorkBoard=Open Items
+NoOpenedElementToProcess=No open element to process
+Available=Available
+NotYetAvailable=Not yet available
+NotAvailable=Not available
+Categories=Tags/categories
+Category=Tag/category
+By=By
+From=From
+FromDate=From
+FromLocation=From
+at=at
+to=to
+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
+StatusInterInvoiced=Invoiced
+Validated=Validated
+ValidatedToProduce=Validated (To produce)
+Opened=Open
+OpenAll=Open (All)
+ClosedAll=Closed (All)
+New=New
+Discount=Discount
+Unknown=Unknown
+General=General
+Size=Size
+OriginalSize=Original size
+Received=Received
+Paid=Paid
+Topic=Subject
+ByCompanies=By third parties
+ByUsers=By user
+Links=Links
+Link=Link
+Rejects=Rejects
+Preview=Preview
+NextStep=Next step
+Datas=Data
+None=None
+NoneF=None
+NoneOrSeveral=None or several
+Late=Late
+LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
+NoItemLate=No late item
+Photo=Picture
+Photos=Pictures
+AddPhoto=Add picture
+DeletePicture=Picture delete
+ConfirmDeletePicture=Confirm picture deletion?
+Login=Login
+LoginEmail=Login (email)
+LoginOrEmail=Login or Email
+CurrentLogin=Current login
+EnterLoginDetail=Enter login details
+January=January
+February=February
+March=March
+April=April
+May=May
+June=June
+July=July
+August=August
+September=September
+October=October
+November=November
+December=December
+Month01=January
+Month02=February
+Month03=March
+Month04=April
+Month05=May
+Month06=June
+Month07=July
+Month08=August
+Month09=September
+Month10=October
+Month11=November
+Month12=December
+MonthShort01=Jan
+MonthShort02=Feb
+MonthShort03=Mar
+MonthShort04=Apr
+MonthShort05=May
+MonthShort06=Jun
+MonthShort07=Jul
+MonthShort08=Aug
+MonthShort09=Sep
+MonthShort10=Oct
+MonthShort11=Nov
+MonthShort12=Dec
+MonthVeryShort01=J
+MonthVeryShort02=F
+MonthVeryShort03=M
+MonthVeryShort04=A
+MonthVeryShort05=M
+MonthVeryShort06=J
+MonthVeryShort07=J
+MonthVeryShort08=A
+MonthVeryShort09=S
+MonthVeryShort10=O
+MonthVeryShort11=N
+MonthVeryShort12=D
+AttachedFiles=Attached files and documents
+JoinMainDoc=Join main document
+DateFormatYYYYMM=YYYY-MM
+DateFormatYYYYMMDD=YYYY-MM-DD
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+ReportName=Report name
+ReportPeriod=Report period
+ReportDescription=Description
+Report=Report
+Keyword=Keyword
+Origin=Origin
+Legend=Legend
+Fill=Fill
+Reset=Reset
+File=File
+Files=Files
+NotAllowed=Not allowed
+ReadPermissionNotAllowed=Read permission not allowed
+AmountInCurrency=Amount in %s currency
+Example=Example
+Examples=Examples
+NoExample=No example
+FindBug=Report a bug
+NbOfThirdParties=Number of third parties
+NbOfLines=Number of lines
+NbOfObjects=Number of objects
+NbOfObjectReferers=Number of related items
+Referers=Related items
+TotalQuantity=Total quantity
+DateFromTo=From %s to %s
+DateFrom=From %s
+DateUntil=Until %s
+Check=Check
+Uncheck=Uncheck
+Internal=Internal
+External=External
+Internals=Internal
+Externals=External
+Warning=Warning
+Warnings=Warnings
+BuildDoc=Build Doc
+Entity=Environment
+Entities=Entities
+CustomerPreview=Customer preview
+SupplierPreview=Vendor preview
+ShowCustomerPreview=Show customer preview
+ShowSupplierPreview=Show vendor preview
+RefCustomer=Ref. customer
+InternalRef=Internal ref.
+Currency=Currency
+InfoAdmin=Information for administrators
+Undo=Undo
+Redo=Redo
+ExpandAll=Expand all
+UndoExpandAll=Undo expand
+SeeAll=See all
+Reason=Reason
+FeatureNotYetSupported=Feature not yet supported
+CloseWindow=Close window
+Response=Response
+Priority=Priority
+SendByMail=Send by email
+MailSentBy=Email sent by
+NotSent=Not sent
+TextUsedInTheMessageBody=Email body
+SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
+Email=Email
+NoEMail=No email
+AlreadyRead=Already read
+NotRead=Unread
+NoMobilePhone=No mobile phone
+Owner=Owner
+FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
+Refresh=Refresh
+BackToList=Back to list
+BackToTree=Back to tree
+GoBack=Go back
+CanBeModifiedIfOk=Can be modified if valid
+CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
+RecordCreatedSuccessfully=Record created successfully
+RecordModifiedSuccessfully=Record modified successfully
+RecordsModified=%s record(s) modified
+RecordsDeleted=%s record(s) deleted
+RecordsGenerated=%s record(s) generated
+AutomaticCode=Automatic code
+FeatureDisabled=Feature disabled
+MoveBox=Move widget
+Offered=Offered
+NotEnoughPermissions=You don't have permission for this action
+SessionName=Session name
+Method=Method
+Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
+PartialWoman=Partial
+TotalWoman=Total
+NeverReceived=Never received
+Canceled=Canceled
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
+YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+Color=Color
+Documents=Linked files
+Documents2=Documents
+UploadDisabled=Upload disabled
+MenuAccountancy=Accounting
+MenuECM=Documents
+MenuAWStats=AWStats
+MenuMembers=Members
+MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+NoFileFound=No documents uploaded
+CurrentUserLanguage=Current language
+CurrentTheme=Current theme
+CurrentMenuManager=Current menu manager
+Browser=Browser
+Layout=Layout
+Screen=Screen
+DisabledModules=Disabled modules
+For=For
+ForCustomer=For customer
+Signature=Signature
+DateOfSignature=Date of signature
+HidePassword=Show command with password hidden
+UnHidePassword=Show real command with clear password
+Root=Root
+RootOfMedias=Root of public medias (/medias)
+Informations=Information
+Page=Page
+Notes=Notes
+AddNewLine=Add new line
+AddFile=Add file
+FreeZone=Free-text product
+FreeLineOfType=Free-text item, type:
+CloneMainAttributes=Clone object with its main attributes
+ReGeneratePDF=Re-generate PDF
+PDFMerge=PDF Merge
+Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
+PrintContentArea=Show page to print main content area
+MenuManager=Menu manager
+WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+CoreErrorTitle=System error
+CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CreditCard=Credit card
+ValidatePayment=Validate payment
+CreditOrDebitCard=Credit or debit card
+FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
+FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
+AccordingToGeoIPDatabase=(according to GeoIP conversion)
+Line=Line
+NotSupported=Not supported
+RequiredField=Required field
+Result=Result
+ToTest=Test
+ValidateBefore=Item must be validated before using this feature
+Visibility=Visibility
+Totalizable=Totalizable
+TotalizableDesc=This field is totalizable in list
+Private=Private
+Hidden=Hidden
+Resources=Resources
+Source=Source
+Prefix=Prefix
+Before=Before
+After=After
+IPAddress=IP address
+Frequency=Frequency
+IM=Instant messaging
+NewAttribute=New attribute
+AttributeCode=Attribute code
+URLPhoto=URL of photo/logo
+SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToTemplateInvoice=Link to template invoice
+LinkToSupplierOrder=Link to purchase order
+LinkToSupplierProposal=Link to vendor proposal
+LinkToSupplierInvoice=Link to vendor invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
+CreateDraft=Create draft
+SetToDraft=Back to draft
+ClickToEdit=Click to edit
+ClickToRefresh=Click to refresh
+EditWithEditor=Edit with CKEditor
+EditWithTextEditor=Edit with Text editor
+EditHTMLSource=Edit HTML Source
+ObjectDeleted=Object %s deleted
+ByCountry=By country
+ByTown=By town
+ByDate=By date
+ByMonthYear=By month/year
+ByYear=By year
+ByMonth=By month
+ByDay=By day
+BySalesRepresentative=By sales representative
+LinkedToSpecificUsers=Linked to a particular user contact
+NoResults=No results
+AdminTools=Admin Tools
+SystemTools=System tools
+ModulesSystemTools=Modules tools
+Test=Test
+Element=Element
+NoPhotoYet=No pictures available yet
+Dashboard=Dashboard
+MyDashboard=My Dashboard
+Deductible=Deductible
+from=from
+toward=toward
+Access=Access
+SelectAction=Select action
+SelectTargetUser=Select target user/employee
+HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
+SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
+OriginFileName=Original filename
+SetDemandReason=Set source
+SetBankAccount=Define Bank Account
+AccountCurrency=Account currency
+ViewPrivateNote=View notes
+XMoreLines=%s line(s) hidden
+ShowMoreLines=Show more/less lines
+PublicUrl=Public URL
+AddBox=Add box
+SelectElementAndClick=Select an element and click %s
+PrintFile=Print File %s
+ShowTransaction=Show entry on bank account
+ShowIntervention=Show intervention
+ShowContract=Show contract
+GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+Deny=Deny
+Denied=Denied
+ListOf=List of %s
+ListOfTemplates=List of templates
+Gender=Gender
+Genderman=Man
+Genderwoman=Woman
+Genderother=Other
+ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
+Mandatory=Mandatory
+Hello=Hello
+GoodBye=GoodBye
+Sincerely=Sincerely
+ConfirmDeleteObject=Are you sure you want to delete this object?
+DeleteLine=Delete line
+ConfirmDeleteLine=Are you sure you want to delete this line?
+ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
+NoRecordSelected=No record selected
+MassFilesArea=Area for files built by mass actions
+ShowTempMassFilesArea=Show area of files built by mass actions
+ConfirmMassDeletion=Bulk Delete confirmation
+ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+RelatedObjects=Related Objects
+ClassifyBilled=Classify billed
+ClassifyUnbilled=Classify unbilled
+Progress=Progress
+ProgressShort=Progr.
+FrontOffice=Front office
+BackOffice=Back office
+Submit=Submit
+View=View
+Export=Export
+Exports=Exports
+ExportFilteredList=Export filtered list
+ExportList=Export list
+ExportOptions=Export Options
+IncludeDocsAlreadyExported=Include docs already exported
+ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
+ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
+NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+Miscellaneous=Miscellaneous
+Calendar=Calendar
+GroupBy=Group by...
+ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
+RemoveString=Remove string '%s'
+SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+Download=Download
+DownloadDocument=Download document
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
+ModuleBuilder=Module and Application Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+HR=HR
+HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
+TitleSetToDraft=Go back to draft
+ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ImportId=Import id
+Events=Events
+EMailTemplates=Email templates
+FileNotShared=File not shared to external public
+Project=Project
+Projects=Projects
+LeadOrProject=Lead | Project
+LeadsOrProjects=Leads | Projects
+Lead=Lead
+Leads=Leads
+ListOpenLeads=List open leads
+ListOpenProjects=List open projects
+NewLeadOrProject=New lead or project
+Rights=Permissions
+LineNb=Line no.
+IncotermLabel=Incoterms
+TabLetteringCustomer=Customer lettering
+TabLetteringSupplier=Vendor lettering
+Monday=Monday
+Tuesday=Tuesday
+Wednesday=Wednesday
+Thursday=Thursday
+Friday=Friday
+Saturday=Saturday
+Sunday=Sunday
+MondayMin=Mo
+TuesdayMin=Tu
+WednesdayMin=We
+ThursdayMin=Th
+FridayMin=Fr
+SaturdayMin=Sa
+SundayMin=Su
+Day1=Monday
+Day2=Tuesday
+Day3=Wednesday
+Day4=Thursday
+Day5=Friday
+Day6=Saturday
+Day0=Sunday
+ShortMonday=M
+ShortTuesday=T
+ShortWednesday=W
+ShortThursday=T
+ShortFriday=F
+ShortSaturday=S
+ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
+SelectMailModel=Select an email template
+SetRef=Set ref
+Select2ResultFoundUseArrows=Some results found. Use arrows to select.
+Select2NotFound=No result found
+Select2Enter=Enter
+Select2MoreCharacter=or more character
+Select2MoreCharacters=or more characters
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
+Select2LoadingMoreResults=Loading more results...
+Select2SearchInProgress=Search in progress...
+SearchIntoThirdparties=Third parties
+SearchIntoContacts=Contacts
+SearchIntoMembers=Members
+SearchIntoUsers=Users
+SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
+SearchIntoProjects=Projects
+SearchIntoMO=Manufacturing Orders
+SearchIntoTasks=Tasks
+SearchIntoCustomerInvoices=Customer invoices
+SearchIntoSupplierInvoices=Vendor invoices
+SearchIntoCustomerOrders=Sales orders
+SearchIntoSupplierOrders=Purchase orders
+SearchIntoCustomerProposals=Commercial proposals
+SearchIntoSupplierProposals=Vendor proposals
+SearchIntoInterventions=Interventions
+SearchIntoContracts=Contracts
+SearchIntoCustomerShipments=Customer shipments
+SearchIntoExpenseReports=Expense reports
+SearchIntoLeaves=Leave
+SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
+CommentLink=Comments
+NbComments=Number of comments
+CommentPage=Comments space
+CommentAdded=Comment added
+CommentDeleted=Comment deleted
+Everybody=Everybody
+PayedBy=Paid by
+PayedTo=Paid to
+Monthly=Monthly
+Quarterly=Quarterly
+Annual=Annual
+Local=Local
+Remote=Remote
+LocalAndRemote=Local and Remote
+KeyboardShortcut=Keyboard shortcut
+AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft mass delete confirmation
+FileSharedViaALink=File shared with a public link
+SelectAThirdPartyFirst=Select a third party first...
+YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory
+AnalyticCode=Analytic code
+TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
+ShowMoreInfos=Show More Infos
+NoFilesUploadedYet=Please upload a document first
+SeePrivateNote=See private note
+PaymentInformation=Payment information
+ValidFrom=Valid from
+ValidUntil=Valid until
+NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
+ContactDefault_agenda=Event
+ContactDefault_commande=Order
+ContactDefault_contrat=Contract
+ContactDefault_facture=Invoice
+ContactDefault_fichinter=Intervention
+ContactDefault_invoice_supplier=Supplier Invoice
+ContactDefault_order_supplier=Purchase Order
+ContactDefault_project=Project
+ContactDefault_project_task=Task
+ContactDefault_propal=Proposal
+ContactDefault_supplier_proposal=Supplier Proposal
+ContactDefault_ticket=Ticket
+ContactAddedAutomatically=Contact added from contact thirdparty roles
+More=More
+ShowDetails=Show details
+CustomReports=Custom reports
+StatisticsOn=Statistics on
+SelectYourGraphOptionsFirst=Select your graph options to build a graph
+Measures=Measures
+XAxis=X-Axis
+YAxis=Y-Axis
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
+ShowOtherLanguages=Show other languages
+SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
+NotUsedForThisCustomer=Not used for this customer
+AmountMustBePositive=Amount must be positive
+ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s created
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+DateOfBirth=Date of birth
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+UpToDate=Up-to-date
+OutOfDate=Out-of-date
+EventReminder=Event Reminder
+UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/ar_IQ/margins.lang b/htdocs/langs/ar_IQ/margins.lang
new file mode 100644
index 00000000000..ad5406409b4
--- /dev/null
+++ b/htdocs/langs/ar_IQ/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+Margin=Margin
+Margins=Margins
+TotalMargin=Total Margin
+MarginOnProducts=Margin / Products
+MarginOnServices=Margin / Services
+MarginRate=Margin rate
+MarkRate=Mark rate
+DisplayMarginRates=Display margin rates
+DisplayMarkRates=Display mark rates
+InputPrice=Input price
+margin=Profit margins management
+margesSetup=Profit margins management setup
+MarginDetails=Margin details
+ProductMargins=Product margins
+CustomerMargins=Customer margins
+SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
+UserMargins=User margins
+ProductService=Product or Service
+AllProducts=All products and services
+ChooseProduct/Service=Choose product or service
+ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
+MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+UseDiscountAsProduct=As a product
+UseDiscountAsService=As a service
+UseDiscountOnTotal=On subtotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
+MargeType1=Margin on Best vendor price
+MargeType2=Margin on Weighted Average Price (WAP)
+MargeType3=Margin on Cost Price
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+CostPrice=Cost price
+UnitCharges=Unit charges
+Charges=Charges
+AgentContactType=Commercial agent contact type
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
+CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ar_IQ/members.lang b/htdocs/langs/ar_IQ/members.lang
new file mode 100644
index 00000000000..44b583a0041
--- /dev/null
+++ b/htdocs/langs/ar_IQ/members.lang
@@ -0,0 +1,215 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
+MembersListResiliated=List of terminated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
+MenuMembersResiliated=Terminated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
+DateSubscription=Subscription date
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
+MemberId=Member id
+NewMember=New member
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
+MemberStatusResiliated=Terminated member
+MemberStatusResiliatedShort=Terminated
+MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
+MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+MemberTypeModified=Member type modified
+DeleteAMemberType=Delete a member type
+ConfirmDeleteMemberType=Are you sure you want to delete this member type?
+MemberTypeDeleted=Member type deleted
+MemberTypeCanNotBeDeleted=Member type can not be deleted
+NewSubscription=New 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
+SubscriptionNotReceived=Subscription never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome email
+SubscriptionRequired=Subscription required
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorAndPhy=Moral and Physical
+Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
+ResiliateMember=Terminate a member
+ConfirmResiliateMember=Are you sure you want to terminate this member?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public website with self-subscription form
+ForceMemberType=Force the member type
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembersModified=Latest %s modified members
+LastSubscriptionsModified=Latest %s modified subscriptions
+String=String
+Text=Text
+Int=Int
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+SubscriptionNotRecorded=Subscription not recorded
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+# Label of email templates
+SendingAnEMailToMember=Sending information email to member
+SendingEmailOnAutoSubscription=Sending email on auto registration
+SendingEmailOnMemberValidation=Sending email on new member validation
+SendingEmailOnNewSubscription=Sending email on new subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
+# Topic of email templates
+YourMembershipRequestWasReceived=Your membership was received.
+YourMembershipWasValidated=Your membership was validated
+YourSubscriptionWasRecorded=Your new subscription was recorded
+SubscriptionReminderEmail=Subscription reminder
+YourMembershipWasCanceled=Your membership was canceled
+CardContent=Content of your member card
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
+ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
+ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct entry on bank account
+MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Date of latest subscription payment
+LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
+MemberNature=Nature of member
+MembersNature=Nature of members
+Public=Information are public
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
+MembersByNature=This screen show you statistics on members by nature.
+MembersByRegion=This screen show you statistics on members by region.
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No VAT for subscriptions
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+NameOrCompany=Name or company
+SubscriptionRecorded=Subscription recorded
+NoEmailSentToMember=No email sent to member
+EmailSentToMember=Email sent to member at %s
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
+SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+MembershipPaid=Membership paid for current period (until %s)
+YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/ar_IQ/modulebuilder.lang b/htdocs/langs/ar_IQ/modulebuilder.lang
new file mode 100644
index 00000000000..19afb9d95ab
--- /dev/null
+++ b/htdocs/langs/ar_IQ/modulebuilder.lang
@@ -0,0 +1,145 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
+ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+NewModule=New module
+NewObjectInModulebuilder=New object
+ModuleKey=Module key
+ObjectKey=Object key
+ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object '%s' initialized
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
+ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+DangerZone=Danger zone
+BuildPackage=Build package
+BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Build documentation
+ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
+ModuleIsLive=This module has been activated. Any change may break a current live feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP DAO CRUD class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PageForAgendaTab=PHP page for event tab
+PageForDocumentTab=PHP page for document tab
+PageForNoteTab=PHP page for note tab
+PageForContactTab=PHP page for contact tab
+PathToModulePackage=Path to zip of module/application package
+PathToModuleDocumentation=Path to file of module/application documentation (%s)
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
+FileNotYetGenerated=File not yet generated
+RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateMissingFiles=Generate missing files
+SpecificationFile=File of documentation
+LanguageFile=File for language
+ObjectProperties=Object Properties
+ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+SearchAll=Used for 'search all'
+DatabaseIndex=Database index
+FileAlreadyExists=File %s already exists
+TriggersFile=File for triggers code
+HooksFile=File for hooks code
+ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
+ReadmeFile=Readme file
+ChangeLog=ChangeLog file
+TestClassFile=File for PHP Unit Test class
+SqlFile=Sql file
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object
+SqlFileExtraFields=Sql file for complementary attributes
+SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Is a measure
+DirScanned=Directory scanned
+NoTrigger=No trigger
+NoWidget=No widget
+GoToApiExplorer=API explorer
+ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
+ListOfPermissionsDefined=List of defined permissions
+SeeExamples=See examples here
+EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdf=Display on PDF
+IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
+LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
+MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
+PermissionsDefDesc=Define here the new permissions provided by your module
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
+TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
+SeeIDsInUse=See IDs in use in your installation
+SeeReservedIDsRangeHere=See range of reserved IDs
+ToolkitForDevelopers=Toolkit for Dolibarr developers
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
+SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
+AddLanguageFile=Add language file
+YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
+DropTableIfEmpty=(Destroy table if empty)
+TableDoesNotExists=The table %s does not exists
+TableDropped=Table %s deleted
+InitStructureFromExistingTable=Build the structure array string of an existing table
+UseAboutPage=Disable the about page
+UseDocFolder=Disable the documentation folder
+UseSpecificReadme=Use a specific ReadMe
+ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
+WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CLIDesc=You can generate here some command line scripts you want to provide with your module.
+CLIFile=CLI File
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+AsciiToHtmlConverter=Ascii to HTML converter
+AsciiToPdfConverter=Ascii to PDF converter
+TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/ar_IQ/mrp.lang b/htdocs/langs/ar_IQ/mrp.lang
new file mode 100644
index 00000000000..fceeb1a15f1
--- /dev/null
+++ b/htdocs/langs/ar_IQ/mrp.lang
@@ -0,0 +1,102 @@
+Mrp=Manufacturing Orders
+MOs=Manufacturing orders
+ManufacturingOrder=Manufacturing Order
+MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPArea=MRP Area
+MrpSetupPage=Setup of module MRP
+MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
+LatestMOModified=Latest %s Manufacturing Orders modified
+Bom=Bills of Material
+BillOfMaterials=Bill of Materials
+BOMsSetup=Setup of module BOM
+ListOfBOMs=List of bills of material - BOM
+ListOfManufacturingOrders=List of Manufacturing Orders
+NewBOM=New bill of materials
+ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+BOMsNumberingModules=BOM numbering templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
+FreeLegalTextOnBOMs=Free text on document of BOM
+WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ManufacturingEfficiency=Manufacturing efficiency
+ConsumptionEfficiency=Consumption efficiency
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
+QtyToProduce=Qty to produce
+DateStartPlannedMo=Date start planned
+DateEndPlannedMo=Date end planned
+KeepEmptyForAsap=Empty means 'As Soon As Possible'
+EstimatedDuration=Estimated duration
+EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
+ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+StatusMOProduced=Produced
+QtyFrozen=Frozen Qty
+QuantityFrozen=Frozen Quantity
+QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
+DisableStockChange=Stock change disabled
+DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+BomAndBomLines=Bills Of Material and lines
+BOMLine=Line of BOM
+WarehouseForProduction=Warehouse for production
+CreateMO=Create MO
+ToConsume=To consume
+ToProduce=To produce
+QtyAlreadyConsumed=Qty already consumed
+QtyAlreadyProduced=Qty already produced
+QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
+ConsumeOrProduce=Consume or Produce
+ConsumeAndProduceAll=Consume and Produce All
+Manufactured=Manufactured
+TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
+ForAQuantityOf=For a quantity to produce of %s
+ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
+ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+ProductionForRef=Production of %s
+AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
+NoStockChangeOnServices=No stock change on services
+ProductQtyToConsumeByMO=Product quantity still to consume by open MO
+ProductQtyToProduceByMO=Product quentity still to produce by open MO
+AddNewConsumeLines=Add new line to consume
+ProductsToConsume=Products to consume
+ProductsToProduce=Products to produce
+UnitCost=Unit cost
+TotalCost=Total cost
+BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+Workstation=Workstation
+Workstations=Workstations
+WorkstationsDescription=Workstations management
+WorkstationSetup = Workstations setup
+WorkstationSetupPage = Workstations setup page
+WorkstationList=Workstation list
+WorkstationCreate=Add new workstation
+ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
+EnableAWorkstation=Enable a workstation
+ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
+DisableAWorkstation=Disable a workstation
+DeleteWorkstation=Delete
+NbOperatorsRequired=Number of operators required
+THMOperatorEstimated=Estimated operator THM
+THMMachineEstimated=Estimated machine THM
+WorkstationType=Workstation type
+Human=Human
+Machine=Machine
+HumanMachine=Human / Machine
+WorkstationArea=Workstation area
+Machines=Machines
+THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
diff --git a/htdocs/langs/ar_IQ/multicurrency.lang b/htdocs/langs/ar_IQ/multicurrency.lang
new file mode 100644
index 00000000000..26313c6bfb9
--- /dev/null
+++ b/htdocs/langs/ar_IQ/multicurrency.lang
@@ -0,0 +1,38 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi currency
+ErrorAddRateFail=Error in added rate
+ErrorAddCurrencyFail=Error in added currency
+ErrorDeleteCurrencyFail=Error delete fail
+multicurrency_syncronize_error=Synchronization error: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
+multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+multicurrency_appId=API key
+multicurrency_appCurrencySource=Source currency
+multicurrency_alternateCurrencySource=Alternate source currency
+CurrenciesUsed=Currencies used
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
+rate=rate
+MulticurrencyReceived=Received, original currency
+MulticurrencyRemainderToTake=Remaining amount, original currency
+MulticurrencyPaymentAmount=Payment amount, original currency
+AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
+TabTitleMulticurrencyRate=Rate list
+ListCurrencyRate=List of exchange rates for the currency
+CreateRate=Create a rate
+FormCreateRate=Rate creation
+FormUpdateRate=Rate modification
+successRateCreate=Rate for currency %s has been added to the database
+ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
+DeleteLineRate=Clear rate
+successRateDelete=Rate deleted
+errorRateDelete=Error when deleting the rate
+successUpdateRate=Modification made
+ErrorUpdateRate=Error when changing the rate
+Codemulticurrency=currency code
+UpdateRate=change the rate
+CancelUpdate=cancel
+NoEmptyRate=The rate field must not be empty
diff --git a/htdocs/langs/ar_IQ/oauth.lang b/htdocs/langs/ar_IQ/oauth.lang
new file mode 100644
index 00000000000..075ff49a895
--- /dev/null
+++ b/htdocs/langs/ar_IQ/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth Configuration
+OAuthServices=OAuth Services
+ManualTokenGeneration=Manual token generation
+TokenManager=Token Manager
+IsTokenGenerated=Is token generated ?
+NoAccessToken=No access token saved into local database
+HasAccessToken=A token was generated and saved into local database
+NewTokenStored=Token received and saved
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+TokenDeleted=Token deleted
+RequestAccess=Click here to request/renew access and receive a new token to save
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=See previous tab
+OAuthIDSecret=OAuth ID and Secret
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=OAuth Google service
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
+OAUTH_GITHUB_NAME=OAuth GitHub service
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/ar_IQ/opensurvey.lang b/htdocs/langs/ar_IQ/opensurvey.lang
new file mode 100644
index 00000000000..7d26151fa16
--- /dev/null
+++ b/htdocs/langs/ar_IQ/opensurvey.lang
@@ -0,0 +1,61 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Survey=Poll
+Surveys=Polls
+OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+NewSurvey=New poll
+OpenSurveyArea=Polls area
+AddACommentForPoll=You can add a comment into poll...
+AddComment=Add comment
+CreatePoll=Create poll
+PollTitle=Poll title
+ToReceiveEMailForEachVote=Receive an email for each vote
+TypeDate=Type date
+TypeClassic=Type standard
+OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+RemoveAllDays=Remove all days
+CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllHours=Remove all hours
+SelectedDays=Selected days
+TheBestChoice=The best choice currently is
+TheBestChoices=The best choices currently are
+with=with
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+CommentsOfVoters=Comments of voters
+ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+RemovePoll=Remove poll
+UrlForSurvey=URL to communicate to get a direct access to poll
+PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+CreateSurveyDate=Create a date poll
+CreateSurveyStandard=Create a standard poll
+CheckBox=Simple checkbox
+YesNoList=List (empty/yes/no)
+PourContreList=List (empty/for/against)
+AddNewColumn=Add new column
+TitleChoice=Choice label
+ExportSpreadsheet=Export result spreadsheet
+ExpireDate=Limit date
+NbOfSurveys=Number of polls
+NbOfVoters=No. of voters
+SurveyResults=Results
+PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
+5MoreChoices=5 more choices
+Against=Against
+YouAreInivitedToVote=You are invited to vote for this poll
+VoteNameAlreadyExists=This name was already used for this poll
+AddADate=Add a date
+AddStartHour=Add start hour
+AddEndHour=Add end hour
+votes=vote(s)
+NoCommentYet=No comments have been posted for this poll yet
+CanComment=Voters can comment in the poll
+CanSeeOthersVote=Voters can see other people's vote
+SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+BackToCurrentMonth=Back to current month
+ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+ErrorOpenSurveyOneChoice=Enter at least one choice
+ErrorInsertingComment=There was an error while inserting your comment
+MoreChoices=Enter more choices for the voters
+SurveyExpiredInfo=The poll has been closed or voting delay has expired.
+EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/ar_IQ/orders.lang b/htdocs/langs/ar_IQ/orders.lang
new file mode 100644
index 00000000000..87d196eb22f
--- /dev/null
+++ b/htdocs/langs/ar_IQ/orders.lang
@@ -0,0 +1,191 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Purchase orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+PdfOrderTitle=Order
+Orders=Orders
+OrderLine=Order line
+OrderDate=Order date
+OrderDateShort=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+NewOrderSupplier=New Purchase Order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Sales Order
+CustomersOrders=Sales Orders
+CustomersOrdersRunning=Current sales orders
+CustomersOrdersAndOrdersLines=Sales orders and order details
+OrdersDeliveredToBill=Sales orders delivered to bill
+OrdersToBill=Sales orders delivered
+OrdersInProcess=Sales orders in process
+OrdersToProcess=Sales orders to process
+SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Ordered
+StatusOrderProcessedShort=Processed
+StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
+StatusOrderToBillShort=Delivered
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Products received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=All products received
+ShippingExist=A shipment exists
+QtyOrdered=Qty ordered
+ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+ShipProduct=Ship product
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+OrderReopened= Order %s re-open
+AddOrder=Create order
+AddPurchaseOrder=Create purchase order
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+OrdersOpened=Orders to process
+NoDraftOrders=No draft orders
+NoOrder=No order
+NoSupplierOrder=No purchase order
+LastOrders=Latest %s sales orders
+LastCustomerOrders=Latest %s sales orders
+LastSupplierOrders=Latest %s purchase orders
+LastModifiedOrders=Latest %s modified orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+ConfirmDeleteOrder=Are you sure you want to delete this order?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
+ConfirmCancelOrder=Are you sure you want to cancel this order?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+DraftOrders=Draft orders
+DraftSuppliersOrders=Draft purchase orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. order for customer
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
+DispatchSupplierOrder=Receiving purchase order %s
+FirstApprovalAlreadyDone=First approval already done
+SecondApprovalAlreadyDone=Second approval already done
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
+OtherOrders=Other orders
+##### Types de contacts #####
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_OrderNotChecked=No orders to invoice selected
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=Email
+OrderByWWW=Online
+OrderByPhone=Phone
+# Documents models
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEratostheneDescription=A complete order model
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete Proforma invoice template
+CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
+SetShippingMode=Set shipping mode
+WithReceptionFinished=With reception finished
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
diff --git a/htdocs/langs/ar_IQ/other.lang b/htdocs/langs/ar_IQ/other.lang
new file mode 100644
index 00000000000..0e76e493b5a
--- /dev/null
+++ b/htdocs/langs/ar_IQ/other.lang
@@ -0,0 +1,292 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Security code
+NumberingShort=N°
+Tools=Tools
+TMenuTools=Tools
+ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+Birthday=Birthday
+BirthdayAlertOn=birthday alert active
+BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (text) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
+DocFileGeneratedInto=Doc file generated into <b>%s</b>.
+JumpToLogin=Disconnected. Go to login page...
+MessageForm=Message on online payment form
+MessageOK=Message on the return page for a validated payment
+MessageKO=Message on the return page for a canceled payment
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursively
+PoweredBy=Powered by
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+DateNextInvoiceBeforeGen=Date of next invoice (before generation)
+DateNextInvoiceAfterGen=Date of next invoice (after generation)
+GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
+AtLeastOneMeasureIsRequired=At least 1 field for measure is required
+AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
+LatestBlogPosts=Latest Blog Posts
+Notify_ORDER_VALIDATE=Sales order validated
+Notify_ORDER_SENTBYMAIL=Sales order sent by mail
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
+Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
+Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
+Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+Notify_PROPAL_VALIDATE=Customer proposal validated
+Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
+Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
+Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
+Notify_WITHDRAW_CREDIT=Credit withdrawal
+Notify_WITHDRAW_EMIT=Perform withdrawal
+Notify_COMPANY_CREATE=Third party created
+Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_BILL_VALIDATE=Customer invoice validated
+Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_CANCEL=Customer invoice canceled
+Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
+Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
+Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
+Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_CONTRACT_VALIDATE=Contract validated
+Notify_FICHINTER_VALIDATE=Intervention validated
+Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_SHIPPING_VALIDATE=Shipping validated
+Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
+Notify_MEMBER_VALIDATE=Member validated
+Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_SUBSCRIPTION=Member subscribed
+Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_DELETE=Member deleted
+Notify_PROJECT_CREATE=Project creation
+Notify_TASK_CREATE=Task created
+Notify_TASK_MODIFY=Task modified
+Notify_TASK_DELETE=Task deleted
+Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
+Notify_EXPENSE_REPORT_APPROVE=Expense report approved
+Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
+Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
+SeeModuleSetup=See setup of module %s
+NbOfAttachedFiles=Number of attached files/documents
+TotalSizeOfAttachedFiles=Total size of attached files/documents
+MaxSize=Maximum size
+AttachANewFile=Attach a new file/document
+LinkedObject=Linked object
+NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+DemoFundation=Manage members of a foundation
+DemoFundation2=Manage members and bank account of a foundation
+DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
+DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyAll=Company with multiple activities (all main modules)
+CreatedBy=Created by %s
+ModifiedBy=Modified by %s
+ValidatedBy=Validated by %s
+SignedBy=Signed by %s
+ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made latest change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made latest change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
+FileWasRemoved=File %s was removed
+DirWasRemoved=Directory %s was removed
+FeatureNotYetAvailable=Feature not yet available in the current version
+FeaturesSupported=Supported features
+Width=Width
+Height=Height
+Depth=Depth
+Top=Top
+Bottom=Bottom
+Left=Left
+Right=Right
+CalculatedWeight=Calculated weight
+CalculatedVolume=Calculated volume
+Weight=Weight
+WeightUnitton=ton
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pound
+WeightUnitounce=ounce
+Length=Length
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Area
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=in²
+Volume=Volume
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=ounce
+VolumeUnitlitre=litre
+VolumeUnitgallon=gallon
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=inch
+SizeUnitfoot=foot
+SizeUnitpoint=point
+BugTracker=Bug tracker
+SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+BackToLoginPage=Back to login page
+AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
+EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
+DolibarrDemo=Dolibarr ERP/CRM demo
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of sales orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of vendor proposals
+NumberOfSupplierOrders=Number of purchase orders
+NumberOfSupplierInvoices=Number of vendor invoices
+NumberOfContracts=Number of contracts
+NumberOfMos=Number of manufacturing orders
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on sales orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on vendor proposals
+NumberOfUnitsSupplierOrders=Number of units on purchase orders
+NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
+NumberOfUnitsContracts=Number of units on contracts
+NumberOfUnitsMos=Number of units to produce in manufacturing orders
+EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+EMailTextInterventionValidated=The intervention %s has been validated.
+EMailTextInvoiceValidated=Invoice %s has been validated.
+EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextProposalValidated=Proposal %s has been validated.
+EMailTextProposalClosedSigned=Proposal %s has been closed signed.
+EMailTextOrderValidated=Order %s has been validated.
+EMailTextOrderApproved=Order %s has been approved.
+EMailTextOrderValidatedBy=Order %s has been recorded by %s.
+EMailTextOrderApprovedBy=Order %s has been approved by %s.
+EMailTextOrderRefused=Order %s has been refused.
+EMailTextOrderRefusedBy=Order %s has been refused by %s.
+EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextExpenseReportValidated=Expense report %s has been validated.
+EMailTextExpenseReportApproved=Expense report %s has been approved.
+EMailTextHolidayValidated=Leave request %s has been validated.
+EMailTextHolidayApproved=Leave request %s has been approved.
+EMailTextActionAdded=The action %s has been added to the Agenda.
+ImportedWithSet=Importation data set
+DolibarrNotification=Automatic notification
+ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
+NewLength=New width
+NewHeight=New height
+NewSizeAfterCropping=New size after cropping
+DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
+CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+ImageEditor=Image editor
+YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
+YouReceiveMailBecauseOfNotification2=This event is the following:
+ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
+UseAdvancedPerms=Use the advanced permissions of some modules
+FileFormat=File format
+SelectAColor=Choose a color
+AddFiles=Add Files
+StartUpload=Start upload
+CancelUpload=Cancel upload
+FileIsTooBig=Files is too big
+PleaseBePatient=Please be patient...
+NewPassword=New password
+ResetPassword=Reset password
+RequestToResetPasswordReceived=A request to change your password has been received.
+NewKeyIs=This is your new keys to login
+NewKeyWillBe=Your new key to login to software will be
+ClickHereToGoTo=Click here to go to %s
+YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
+ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+IfAmountHigherThan=If amount higher than <strong>%s</strong>
+SourcesRepository=Repository for sources
+Chart=Chart
+PassEncoding=Password encoding
+PermissionsAdd=Permissions added
+PermissionsDelete=Permissions removed
+YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+YourPasswordHasBeenReset=Your password has been reset successfully
+ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+MissingIds=Missing ids
+ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
+ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
+ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
+TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
+OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
+
+##### Export #####
+ExportsArea=Exports area
+AvailableFormats=Available formats
+LibraryUsed=Library used
+LibraryVersion=Library version
+ExportableDatas=Exportable data
+NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+##### External sites #####
+WebsiteSetup=Setup of module website
+WEBSITE_PAGEURL=URL of page
+WEBSITE_TITLE=Title
+WEBSITE_DESCRIPTION=Description
+WEBSITE_IMAGE=Image
+WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Keywords
+LinesToImport=Lines to import
+
+MemoryUsage=Memory usage
+RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
+PopuProp=Products/Services by popularity in Proposals
+PopuCom=Products/Services by popularity in Orders
+ProductStatistics=Products/Services Statistics
+NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/ar_IQ/paybox.lang b/htdocs/langs/ar_IQ/paybox.lang
new file mode 100644
index 00000000000..6f320c03181
--- /dev/null
+++ b/htdocs/langs/ar_IQ/paybox.lang
@@ -0,0 +1,30 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Pay with Paybox
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+Continue=Next
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_HMAC_KEY=HMAC key
diff --git a/htdocs/langs/ar_IQ/paypal.lang b/htdocs/langs/ar_IQ/paypal.lang
new file mode 100644
index 00000000000..5eb5f389445
--- /dev/null
+++ b/htdocs/langs/ar_IQ/paypal.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=PayPal module setup
+PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalDoPayment=Pay with PayPal
+PAYPAL_API_SANDBOX=Mode test/sandbox
+PAYPAL_API_USER=API username
+PAYPAL_API_PASSWORD=API password
+PAYPAL_API_SIGNATURE=API signature
+PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=PayPal only
+ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ThisIsTransactionId=This is id of transaction: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+NewOnlinePaymentReceived=New online payment received
+NewOnlinePaymentFailed=New online payment tried but failed
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+ReturnURLAfterPayment=Return URL after payment
+ValidationOfOnlinePaymentFailed=Validation of online payment failed
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
+DetailedErrorMessage=Detailed Error Message
+ShortErrorMessage=Short Error Message
+ErrorCode=Error Code
+ErrorSeverityCode=Error Severity Code
+OnlinePaymentSystem=Online payment system
+PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
+PaypalImportPayment=Import PayPal payments
+PostActionAfterPayment=Post actions after payments
+ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
+ValidationOfPaymentFailed=Validation of payment has failed
+CardOwner=Card holder
+PayPalBalance=Paypal credit
diff --git a/htdocs/langs/ar_IQ/printing.lang b/htdocs/langs/ar_IQ/printing.lang
new file mode 100644
index 00000000000..16494583550
--- /dev/null
+++ b/htdocs/langs/ar_IQ/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Direct Printing
+Module64000Desc=Enable Direct Printing System
+PrintingSetup=Setup of Direct Printing System
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
+MenuDirectPrinting=Direct Printing jobs
+DirectPrint=Direct print
+PrintingDriverDesc=Configuration variables for printing driver.
+ListDrivers=List of drivers
+PrintTestDesc=List of Printers.
+FileWasSentToPrinter=File %s was sent to printer
+ViaModule=via the module
+NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+PleaseSelectaDriverfromList=Please select a driver from list.
+PleaseConfigureDriverfromList=Please configure the selected driver from list.
+SetupDriver=Driver setup
+TargetedPrinter=Targeted printer
+UserConf=Setup per user
+PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
+GCP_Name=Name
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Color
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/ar_IQ/productbatch.lang b/htdocs/langs/ar_IQ/productbatch.lang
new file mode 100644
index 00000000000..4414b6ad8d8
--- /dev/null
+++ b/htdocs/langs/ar_IQ/productbatch.lang
@@ -0,0 +1,35 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Use lot/serial number
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusNotOnBatch=No (lot/serial not used)
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
+ProductStatusNotOnBatchShort=No
+Batch=Lot/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
+batch_number=Lot/Serial number
+BatchNumberShort=Lot/Serial
+EatByDate=Eat-by date
+SellByDate=Sell-by date
+DetailBatchNumber=Lot/Serial details
+printBatch=Lot/Serial: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
+StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/ar_IQ/products.lang b/htdocs/langs/ar_IQ/products.lang
new file mode 100644
index 00000000000..28853762424
--- /dev/null
+++ b/htdocs/langs/ar_IQ/products.lang
@@ -0,0 +1,398 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Product ref.
+ProductLabel=Product label
+ProductLabelTranslated=Translated product label
+ProductDescription=Product description
+ProductDescriptionTranslated=Translated product description
+ProductNoteTranslated=Translated product note
+ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
+Products=Products
+Services=Services
+Product=Product
+Service=Service
+ProductId=Product/service id
+Create=Create
+Reference=Reference
+NewProduct=New product
+NewService=New service
+ProductVatMassChange=Global VAT Update
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+MassBarcodeInit=Mass barcode init
+MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductAccountancyBuyCode=Accounting code (purchase)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
+ProductAccountancySellExportCode=Accounting code (sale export)
+ProductOrService=Product or Service
+ProductsAndServices=Products and Services
+ProductsOrServices=Products or Services
+ProductsPipeServices=Products | Services
+ProductsOnSale=Products for sale
+ProductsOnPurchase=Products for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Products for purchase only
+ProductsNotOnSell=Products not for sale and not for purchase
+ProductsOnSellAndOnBuy=Products for sale and for purchase
+ServicesOnSale=Services for sale
+ServicesOnPurchase=Services for purchase
+ServicesOnSaleOnly=Services for sale only
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
+ServicesOnSellAndOnBuy=Services for sale and for purchase
+LastModifiedProductsAndServices=Latest %s modified products/services
+LastRecordedProducts=Latest %s recorded products
+LastRecordedServices=Latest %s recorded services
+CardProduct0=Product
+CardProduct1=Service
+Stock=Stock
+MenuStocks=Stocks
+Stocks=Stocks and location (warehouse) of products
+Movements=Movements
+Sell=Sell
+Buy=Purchase
+OnSell=For sale
+OnBuy=For purchase
+NotOnSell=Not for sale
+ProductStatusOnSell=For sale
+ProductStatusNotOnSell=Not for sale
+ProductStatusOnSellShort=For sale
+ProductStatusNotOnSellShort=Not for sale
+ProductStatusOnBuy=For purchase
+ProductStatusNotOnBuy=Not for purchase
+ProductStatusOnBuyShort=For purchase
+ProductStatusNotOnBuyShort=Not for purchase
+UpdateVAT=Update vat
+UpdateDefaultPrice=Update default price
+UpdateLevelPrices=Update prices for each level
+AppliedPricesFrom=Applied from
+SellingPrice=Selling price
+SellingPriceHT=Selling price (excl. tax)
+SellingPriceTTC=Selling price (inc. tax)
+SellingMinPriceTTC=Minimum Selling price (inc. tax)
+CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceUsage=This value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
+NewPrice=New price
+MinPrice=Min. sell price
+EditSellingPriceLabel=Edit selling price label
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
+ContractStatusClosed=Closed
+ErrorProductAlreadyExists=A product with reference %s already exists.
+ErrorProductBadRefOrLabel=Wrong value for reference or label.
+ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+Suppliers=Vendors
+SupplierRef=Vendor SKU
+ShowProduct=Show product
+ShowService=Show service
+ProductsAndServicesArea=Product and Services area
+ProductsArea=Product area
+ServicesArea=Services area
+ListOfStockMovements=List of stock movements
+BuyingPrice=Buying price
+PriceForEachProduct=Products with specific prices
+SupplierCard=Vendor card
+PriceRemoved=Price removed
+BarCode=Barcode
+BarcodeType=Barcode type
+SetDefaultBarcodeType=Set barcode type
+BarcodeValue=Barcode value
+NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
+ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
+MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesNumPrices=Number of prices
+DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
+AssociatedProductsAbility=Enable Kits (set of several products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
+ParentProductsNumber=Number of parent packaging product
+ParentProducts=Parent products
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+KeywordFilter=Keyword filter
+CategoryFilter=Category filter
+ProductToAddSearch=Search product to add
+NoMatchFound=No match found
+ListOfProductsServices=List of products/services
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
+ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
+DeleteProduct=Delete a product/service
+ConfirmDeleteProduct=Are you sure you want to delete this product/service?
+ProductDeleted=Product/Service "%s" deleted from database.
+ExportDataset_produit_1=Products
+ExportDataset_service_1=Services
+ImportDataset_produit_1=Products
+ImportDataset_service_1=Services
+DeleteProductLine=Delete product line
+ConfirmDeleteProductLine=Are you sure you want to delete this product line?
+ProductSpecial=Special
+QtyMin=Min. purchase quantity
+PriceQtyMin=Price quantity min.
+PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+VATRateForSupplierProduct=VAT Rate (for this vendor/product)
+DiscountQtyMin=Discount for this qty.
+NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
+PredefinedProductsToSell=Predefined Product
+PredefinedServicesToSell=Predefined Service
+PredefinedProductsAndServicesToSell=Predefined products/services to sell
+PredefinedProductsToPurchase=Predefined product to purchase
+PredefinedServicesToPurchase=Predefined services to purchase
+PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+NotPredefinedProducts=Not predefined products/services
+GenerateThumb=Generate thumb
+ServiceNb=Service #%s
+ListProductServiceByPopularity=List of products/services by popularity
+ListProductByPopularity=List of products by popularity
+ListServiceByPopularity=List of services by popularity
+Finished=Manufactured product
+RowMaterial=Raw Material
+ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+CloneContentProduct=Clone all main information of product/service
+ClonePricesProduct=Clone prices
+CloneCategoriesProduct=Clone tags/categories linked
+CloneCompositionProduct=Clone virtual product/service
+CloneCombinationsProduct=Clone product variants
+ProductIsUsed=This product is used
+NewRefForClone=Ref. of new product/service
+SellingPrices=Selling prices
+BuyingPrices=Buying prices
+CustomerPrices=Customer prices
+SuppliersPrices=Vendor prices
+SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
+CustomCode=Customs|Commodity|HS code
+CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
+Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
+ShortLabel=Short label
+Unit=Unit
+p=u.
+set=set
+se=set
+second=second
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=m
+lm=lm
+m2=m²
+m3=m³
+liter=liter
+l=L
+unitP=Piece
+unitSET=Set
+unitS=Second
+unitH=Hour
+unitD=Day
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
+unitT=ton
+unitKG=kg
+unitG=Gram
+unitMG=mg
+unitLB=pound
+unitOZ=ounce
+unitM=Meter
+unitDM=dm
+unitCM=cm
+unitMM=mm
+unitFT=ft
+unitIN=in
+unitM2=Square meter
+unitDM2=dm²
+unitCM2=cm²
+unitMM2=mm²
+unitFT2=ft²
+unitIN2=in²
+unitM3=Cubic meter
+unitDM3=dm³
+unitCM3=cm³
+unitMM3=mm³
+unitFT3=ft³
+unitIN3=in³
+unitOZ3=ounce
+unitgallon=gallon
+ProductCodeModel=Product ref template
+ServiceCodeModel=Service ref template
+CurrentProductPrice=Current price
+AlwaysUseNewPrice=Always use current price of product/service
+AlwaysUseFixedPrice=Use the fixed price
+PriceByQuantity=Different prices by quantity
+DisablePriceByQty=Disable prices by quantity
+PriceByQuantityRange=Quantity range
+MultipriceRules=Automatic prices for segment
+UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+PercentVariationOver=%% variation over %s
+PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
+VariantRefExample=Examples: COL, SIZE
+VariantLabelExample=Examples: Color, Size
+### composition fabrication
+Build=Produce
+ProductsMultiPrice=Products and prices for each price segment
+ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
+ProductSellByQuarterHT=Products turnover quarterly before tax
+ServiceSellByQuarterHT=Services turnover quarterly before tax
+Quarter1=1st. Quarter
+Quarter2=2nd. Quarter
+Quarter3=3rd. Quarter
+Quarter4=4th. Quarter
+BarCodePrintsheet=Print barcode
+PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+NumberOfStickers=Number of stickers to print on page
+PrintsheetForOneBarCode=Print several stickers for one barcode
+BuildPageToPrint=Generate page to print
+FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
+FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
+DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
+BarCodeDataForProduct=Barcode information of product %s:
+BarCodeDataForThirdparty=Barcode information of third party %s:
+ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
+PriceByCustomer=Different prices for each customer
+PriceCatalogue=A single sell price per product/service
+PricingRule=Rules for selling prices
+AddCustomerPrice=Add price by customer
+ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+PriceByCustomerLog=Log of previous customer prices
+MinimumPriceLimit=Minimum price can't be lower then %s
+MinimumRecommendedPrice=Minimum recommended price is: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Available global values:
+PriceMode=Price mode
+PriceNumeric=Number
+DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Child products
+MinSupplierPrice=Minimum buying price
+MinCustomerPrice=Minimum selling price
+DynamicPriceConfiguration=Dynamic price configuration
+DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+AddVariable=Add Variable
+AddUpdater=Add Updater
+GlobalVariables=Global variables
+VariableToUpdate=Variable to update
+GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Latest update
+CorrectlyUpdated=Correctly updated
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductChooseFile=Select PDF files
+IncludingProductWithTag=Include products/services with tag
+DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
+WarningSelectOneDocument=Please select at least one document
+DefaultUnitToShow=Unit
+NbOfQtyInProposals=Qty in proposals
+ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ProductsOrServicesTranslations=Products/Services translations
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+WidthUnits=Width unit
+LengthUnits=Length unit
+HeightUnits=Height unit
+SurfaceUnits=Surface unit
+SizeUnits=Size unit
+DeleteProductBuyPrice=Delete buying price
+ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
+PossibleValues=Possible values
+GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+ProductSupplierDescription=Vendor description for the product
+UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
+PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+
+#Attributes
+VariantAttributes=Variant attributes
+ProductAttributes=Variant attributes for products
+ProductAttributeName=Variant attribute %s
+ProductAttribute=Variant attribute
+ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+ProductCombinations=Variants
+PropagateVariant=Propagate variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+NewProductCombinations=New variants
+EditProductCombinations=Editing variants
+SelectCombination=Select combination
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+NewProductAttributeValue=New attribute value
+ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
+ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
+TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+DoNotRemovePreviousCombinations=Do not remove previous variants
+UsePercentageVariations=Use percentage variations
+PercentageVariation=Percentage variation
+ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
+NbOfDifferentValues=No. of different values
+NbProducts=Number of products
+ParentProduct=Parent product
+HideChildProducts=Hide variant products
+ShowChildProducts=Show variant products
+NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
+CloneDestinationReference=Destination product reference
+ErrorCopyProductCombinations=There was an error while copying the product variants
+ErrorDestinationProductNotFound=Destination product not found
+ErrorProductCombinationNotFound=Product variant not found
+ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ProductsPricePerCustomer=Product prices per customers
+ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
+DeleteLinkedProduct=Delete the child product linked to the combination
diff --git a/htdocs/langs/ar_IQ/projects.lang b/htdocs/langs/ar_IQ/projects.lang
new file mode 100644
index 00000000000..d14e52d14e8
--- /dev/null
+++ b/htdocs/langs/ar_IQ/projects.lang
@@ -0,0 +1,275 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Ref. project
+ProjectRef=Project ref.
+ProjectId=Project Id
+ProjectLabel=Project label
+ProjectsArea=Projects Area
+ProjectStatus=Project status
+SharedProject=Everybody
+PrivateProject=Project contacts
+ProjectsImContactFor=Projects for which I am explicitly a contact
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=All projects
+MyProjectsDesc=This view is limited to projects you are a contact for
+ProjectsPublicDesc=This view presents all projects you are allowed to read.
+TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+MyTasksDesc=This view is limited to projects or tasks you are a contact for
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
+ClosedProjectsAreHidden=Closed projects are not visible.
+TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
+TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. 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=Open projects
+OpenedTasks=Open tasks
+OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
+OpportunitiesStatusForProjects=Leads amount of projects by status
+ShowProject=Show project
+ShowTask=Show task
+SetProject=Set project
+NoProject=No project defined or owned
+NbOfProjects=Number of projects
+NbOfTasks=Number of tasks
+TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
+TimesSpent=Time spent
+TaskId=Task ID
+RefTask=Task ref.
+LabelTask=Task label
+TaskTimeSpent=Time spent on tasks
+TaskTimeUser=User
+TaskTimeNote=Note
+TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on open projects
+WorkloadNotDefined=Workload not defined
+NewTimeSpent=Time spent
+MyTimeSpent=My time spent
+BillTime=Bill the time spent
+BillTimeShort=Bill time
+TimeToBill=Time not billed
+TimeBilled=Time billed
+Tasks=Tasks
+Task=Task
+TaskDateStart=Task start date
+TaskDateEnd=Task end date
+TaskDescription=Task description
+NewTask=New task
+AddTask=Create task
+AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
+AddHereTimeSpentForWeek=Add here time spent for this week/task
+Activity=Activity
+Activities=Tasks/activities
+MyActivities=My tasks/activities
+MyProjects=My projects
+MyProjectsArea=My projects Area
+DurationEffective=Effective duration
+ProgressDeclared=Declared real progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently open tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
+Time=Time
+TimeConsumed=Consumed
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListProposalsAssociatedProject=List of the commercial proposals related to the project
+ListOrdersAssociatedProject=List of sales orders related to the project
+ListInvoicesAssociatedProject=List of customer invoices related to the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
+ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
+ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
+ListContractAssociatedProject=List of contracts related to the project
+ListShippingAssociatedProject=List of shippings related to the project
+ListFichinterAssociatedProject=List of interventions related to the project
+ListExpenseReportsAssociatedProject=List of expense reports related to the project
+ListDonationsAssociatedProject=List of donations related to the project
+ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
+ListSalariesAssociatedProject=List of payments of salaries related to the project
+ListActionsAssociatedProject=List of events related to the project
+ListMOAssociatedProject=List of manufacturing orders related to the project
+ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
+ActivityOnProjectToday=Activity on project today
+ActivityOnProjectYesterday=Activity on project yesterday
+ActivityOnProjectThisWeek=Activity on project this week
+ActivityOnProjectThisMonth=Activity on project this month
+ActivityOnProjectThisYear=Activity on project this year
+ChildOfProjectTask=Child of project/task
+ChildOfTask=Child of task
+TaskHasChild=Task has child
+NotOwnerOfProject=Not owner of this private project
+AffectedTo=Allocated to
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
+ValidateProject=Validate projet
+ConfirmValidateProject=Are you sure you want to validate this project?
+CloseAProject=Close project
+ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ReOpenAProject=Open project
+ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ProjectContact=Contacts of project
+TaskContact=Task contacts
+ActionsOnProject=Events on project
+YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
+DeleteATimeSpent=Delete time spent
+ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
+TaskRessourceLinks=Contacts of task
+ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
+NoTasks=No tasks for this project
+LinkedToAnotherCompany=Linked to other third party
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+ErrorTimeSpentIsEmpty=Time spent is empty
+ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
+IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
+CloneTasks=Clone tasks
+CloneContacts=Clone contacts
+CloneNotes=Clone notes
+CloneProjectFiles=Clone project joined files
+CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneMoveDate=Update project/tasks dates from now?
+ConfirmCloneProject=Are you sure to clone this project?
+ProjectReportDate=Change task dates according to new project start date
+ErrorShiftTaskDate=Impossible to shift task date according to new project start date
+ProjectsAndTasksLines=Projects and tasks
+ProjectCreatedInDolibarr=Project %s created
+ProjectValidatedInDolibarr=Project %s validated
+ProjectModifiedInDolibarr=Project %s modified
+TaskCreatedInDolibarr=Task %s created
+TaskModifiedInDolibarr=Task %s modified
+TaskDeletedInDolibarr=Task %s deleted
+OpportunityStatus=Lead status
+OpportunityStatusShort=Lead status
+OpportunityProbability=Lead probability
+OpportunityProbabilityShort=Lead probab.
+OpportunityAmount=Lead amount
+OpportunityAmountShort=Lead amount
+OpportunityWeightedAmount=Opportunity weighted amount
+OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityAmountAverageShort=Average lead amount
+OpportunityAmountWeigthedShort=Weighted lead amount
+WonLostExcluded=Won/Lost excluded
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Project leader
+TypeContact_project_external_PROJECTLEADER=Project leader
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
+TypeContact_project_task_external_TASKEXECUTIVE=Task executive
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
+SelectElement=Select element
+AddElement=Link to element
+LinkToElementShort=Link to
+# Documents models
+DocumentModelBeluga=Project document template for linked objects overview
+DocumentModelBaleine=Project document template for tasks
+DocumentModelTimeSpent=Project report template for time spent
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+ProjectReferers=Related items
+ProjectMustBeValidatedFirst=Project must be validated first
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerMonth=Input per month
+InputDetail=Input detail
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
+ProjectsWithThisUserAsContact=Projects with this user as contact
+TasksWithThisUserAsContact=Tasks assigned to this user
+ResourceNotAssignedToProject=Not assigned to project
+ResourceNotAssignedToTheTask=Not assigned to the task
+NoUserAssignedToTheProject=No users assigned to this project
+TimeSpentBy=Time spent by
+TasksAssignedTo=Tasks assigned to
+AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
+AssignTask=Assign
+ProjectOverview=Overview
+ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
+ProjectNbProjectByMonth=No. of created projects by month
+ProjectNbTaskByMonth=No. of created tasks by month
+ProjectOppAmountOfProjectsByMonth=Amount of leads by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
+TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+IdTaskTime=Id task time
+YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+OpenedProjectsByThirdparties=Open projects by third parties
+OnlyOpportunitiesShort=Only leads
+OpenedOpportunitiesShort=Open leads
+NotOpenedOpportunitiesShort=Not an open lead
+NotAnOpportunityShort=Not a lead
+OpportunityTotalAmount=Total amount of leads
+OpportunityPonderatedAmount=Weighted amount of leads
+OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWON=Won
+OppStatusLOST=Lost
+Budget=Budget
+AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+LatestProjects=Latest %s projects
+LatestModifiedProjects=Latest %s modified projects
+OtherFilteredTasks=Other filtered tasks
+NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+# Comments trans
+AllowCommentOnTask=Allow user comments on tasks
+AllowCommentOnProject=Allow user comments on projects
+DontHavePermissionForCloseProject=You do not have permissions to close the project %s
+DontHaveTheValidateStatus=The project %s must be open to be closed
+RecordsClosed=%s project(s) closed
+SendProjectRef=Information project %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
+NewTaskRefSuggested=Task ref already used, a new task ref is required
+TimeSpentInvoiced=Time spent billed
+TimeSpentForInvoice=Time spent
+OneLinePerUser=One line per user
+ServiceToUseOnLines=Service to use on lines
+InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectFollowOpportunity=Follow opportunity
+ProjectFollowTasks=Follow tasks or time spent
+Usage=Usage
+UsageOpportunity=Usage: Opportunity
+UsageTasks=Usage: Tasks
+UsageBillTimeShort=Usage: Bill time
+InvoiceToUse=Draft invoice to use
+NewInvoice=New invoice
+OneLinePerTask=One line per task
+OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
+ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/ar_IQ/propal.lang b/htdocs/langs/ar_IQ/propal.lang
new file mode 100644
index 00000000000..edbc08236d3
--- /dev/null
+++ b/htdocs/langs/ar_IQ/propal.lang
@@ -0,0 +1,92 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Commercial proposals
+Proposal=Commercial proposal
+ProposalShort=Proposal
+ProposalsDraft=Draft commercial proposals
+ProposalsOpened=Open commercial proposals
+CommercialProposal=Commercial proposal
+PdfCommercialProposalTitle=Commercial proposal
+ProposalCard=Proposal card
+NewProp=New commercial proposal
+NewPropal=New proposal
+Prospect=Prospect
+DeleteProp=Delete commercial proposal
+ValidateProp=Validate commercial proposal
+AddProp=Create proposal
+ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+LastPropals=Latest %s proposals
+LastModifiedProposals=Latest %s modified proposals
+AllPropals=All proposals
+SearchAProposal=Search a proposal
+NoProposal=No proposal
+ProposalsStatistics=Commercial proposal's statistics
+NumberOfProposalsByMonth=Number by month
+AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+NbOfProposals=Number of commercial proposals
+ShowPropal=Show proposal
+PropalsDraft=Drafts
+PropalsOpened=Open
+PropalStatusDraft=Draft (needs to be validated)
+PropalStatusValidated=Validated (proposal is open)
+PropalStatusSigned=Signed (needs billing)
+PropalStatusNotSigned=Not signed (closed)
+PropalStatusBilled=Billed
+PropalStatusDraftShort=Draft
+PropalStatusValidatedShort=Validated (open)
+PropalStatusClosedShort=Closed
+PropalStatusSignedShort=Signed
+PropalStatusNotSignedShort=Not signed
+PropalStatusBilledShort=Billed
+PropalsToClose=Commercial proposals to close
+PropalsToBill=Signed commercial proposals to bill
+ListOfProposals=List of commercial proposals
+ActionsOnPropal=Events on proposal
+RefProposal=Commercial proposal ref
+SendPropalByMail=Send commercial proposal by mail
+DatePropal=Date of proposal
+DateEndPropal=Validity ending date
+ValidityDuration=Validity duration
+SetAcceptedRefused=Set accepted/refused
+ErrorPropalNotFound=Propal %s not found
+AddToDraftProposals=Add to draft proposal
+NoDraftProposals=No draft proposals
+CopyPropalFrom=Create commercial proposal by copying existing proposal
+CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
+UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
+ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+ProposalsAndProposalsLines=Commercial proposal and lines
+ProposalLine=Proposal line
+ProposalLines=Proposal lines
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
+OtherProposals=Other proposals
+##### Availability #####
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
+TypeContact_propal_external_BILLING=Customer invoice contact
+TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_external_SHIPPING=Customer contact for delivery
+# Document models
+DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelCyanDescription=A complete proposal model
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+ProposalCustomerSignature=Written acceptance, company stamp, date and signature
+ProposalsStatisticsSuppliers=Vendor proposals statistics
+CaseFollowedBy=Case followed by
+SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/ar_IQ/receiptprinter.lang b/htdocs/langs/ar_IQ/receiptprinter.lang
new file mode 100644
index 00000000000..746d175e0c6
--- /dev/null
+++ b/htdocs/langs/ar_IQ/receiptprinter.lang
@@ -0,0 +1,82 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Setup of module ReceiptPrinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+ReceiptPrinter=Receipt printers
+ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ListPrinters=List of Printers
+SetupReceiptTemplate=Template Setup
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+PROFILE_DEFAULT=Default Profile
+PROFILE_SIMPLE=Simple Profile
+PROFILE_EPOSTEP=Epos Tep Profile
+PROFILE_P822D=P822D Profile
+PROFILE_STAR=Star Profile
+PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_SIMPLE_HELP=Simple Profile No Graphics
+PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_P822D_HELP=P822D Profile No Graphics
+PROFILE_STAR_HELP=Star Profile
+DOL_LINE_FEED=Skip line
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_LOGO=Print logo of my company
+DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
+DOL_BOLD=Bold
+DOL_BOLD_DISABLED=Disable bold
+DOL_DOUBLE_HEIGHT=Double height size
+DOL_DOUBLE_WIDTH=Double width size
+DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
+DOL_UNDERLINE=Enable underline
+DOL_UNDERLINE_DISABLED=Disable underline
+DOL_BEEP=Beep sound
+DOL_PRINT_TEXT=Print text
+DateInvoiceWithTime=Invoice date and time
+YearInvoice=Invoice year
+DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH=Invoice month
+DOL_VALUE_DAY=Invoice day
+DOL_VALUE_DAY_LETTERS=Inovice day in letters
+DOL_LINE_FEED_REVERSE=Line feed reverse
+InvoiceID=Invoice ID
+InvoiceRef=Invoice ref
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+VendorLastname=Vendor last name
+VendorFirstname=Vendor first name
+VendorEmail=Vendor email
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/ar_IQ/receptions.lang b/htdocs/langs/ar_IQ/receptions.lang
new file mode 100644
index 00000000000..760ff884fa0
--- /dev/null
+++ b/htdocs/langs/ar_IQ/receptions.lang
@@ -0,0 +1,47 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionsSetup=Product Reception setup
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Reception method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyInOtherReceptions=Qty in other receptions
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Canceled
+StatusReceptionDraft=Draft
+StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionProcessed=Processed
+StatusReceptionDraftShort=Draft
+StatusReceptionValidatedShort=Validated
+StatusReceptionProcessedShort=Processed
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+SendReceptionByEMail=Send reception by email
+SendReceptionRef=Submission of reception %s
+ActionsOnReception=Events on reception
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+ReceptionsNumberingModules=Numbering module for receptions
+ReceptionsReceiptModel=Document templates for receptions
+NoMorePredefinedProductToDispatch=No more predefined products to dispatch
+
diff --git a/htdocs/langs/ar_IQ/recruitment.lang b/htdocs/langs/ar_IQ/recruitment.lang
new file mode 100644
index 00000000000..437445f25dc
--- /dev/null
+++ b/htdocs/langs/ar_IQ/recruitment.lang
@@ -0,0 +1,76 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+DateExpected=Expected date
+FutureManager=Future manager
+ResponsibleOfRecruitement=Responsible of recruitment
+IfJobIsLocatedAtAPartner=If job is located at a partner place
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
+
+JobOfferToBeFilled=Job position to be filled
+ThisIsInformationOnJobPosition=Information of the job position to be filled
+ContactForRecruitment=Contact for recruitment
+EmailRecruiter=Email recruiter
+ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
+NewCandidature=New application
+ListOfCandidatures=List of applications
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
+JobPositions=Job positions
+RecruitmentCandidatures=Applications
+InterviewToDo=Interview to do
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
+ExtrafieldsJobPosition=Complementary attributes (job positions)
+ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/ar_IQ/resource.lang b/htdocs/langs/ar_IQ/resource.lang
new file mode 100644
index 00000000000..e8574dc680f
--- /dev/null
+++ b/htdocs/langs/ar_IQ/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+ActionsOnResource=Events about this resource
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResource=Show resource
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/ar_IQ/salaries.lang b/htdocs/langs/ar_IQ/salaries.lang
new file mode 100644
index 00000000000..6b4fdc94163
--- /dev/null
+++ b/htdocs/langs/ar_IQ/salaries.lang
@@ -0,0 +1,24 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
+Salary=Salary
+Salaries=Salaries
+NewSalary=New salary
+NewSalaryPayment=New salary card
+AddSalaryPayment=Add salary payment
+SalaryPayment=Salary payment
+SalariesPayments=Salaries payments
+SalariesPaymentsOf=Salaries payments of %s
+ShowSalaryPayment=Show salary payment
+THM=Average hourly rate
+TJM=Average daily rate
+CurrentSalary=Current salary
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/ar_IQ/sendings.lang b/htdocs/langs/ar_IQ/sendings.lang
new file mode 100644
index 00000000000..73bd9aebd42
--- /dev/null
+++ b/htdocs/langs/ar_IQ/sendings.lang
@@ -0,0 +1,76 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+AllSendings=All Shipments
+Shipment=Shipment
+Shipments=Shipments
+ShowSending=Show Shipments
+Receivings=Delivery Receipts
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+LastSendings=Latest %s shipments
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipment card
+NewSending=New shipment
+CreateShipment=Create shipment
+QtyShipped=Qty shipped
+QtyShippedShort=Qty ship.
+QtyPreparedOrShipped=Qty prepared or shipped
+QtyToShip=Qty to ship
+QtyToReceive=Qty to receive
+QtyReceived=Qty received
+QtyInOtherShipments=Qty in other shipments
+KeepToShip=Remain to ship
+KeepToShipShort=Remain
+OtherSendingsForSameOrder=Other shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Shipment sheet
+ConfirmDeleteSending=Are you sure you want to delete this shipment?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
+ConfirmCancelSending=Are you sure you want to cancel this shipment?
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planned date of delivery
+RefDeliveryReceipt=Ref delivery receipt
+StatusReceipt=Status delivery receipt
+DateReceived=Date delivery received
+ClassifyReception=Classify reception
+SendShippingByEMail=Send shipment by email
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+ShipmentLine=Shipment line
+ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
+ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
+ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/ar_IQ/sms.lang b/htdocs/langs/ar_IQ/sms.lang
new file mode 100644
index 00000000000..055085eb16a
--- /dev/null
+++ b/htdocs/langs/ar_IQ/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=Sms
+SmsSetup=SMS setup
+SmsDesc=This page allows you to define global options on SMS features
+SmsCard=SMS Card
+AllSms=All SMS campaigns
+SmsTargets=Targets
+SmsRecipients=Targets
+SmsRecipient=Target
+SmsTitle=Description
+SmsFrom=Sender
+SmsTo=Target
+SmsTopic=Topic of SMS
+SmsText=Message
+SmsMessage=SMS Message
+ShowSms=Show SMS
+ListOfSms=List SMS campaigns
+NewSms=New SMS campaign
+EditSms=Edit SMS
+ResetSms=New sending
+DeleteSms=Delete SMS campaign
+DeleteASms=Remove a SMS campaign
+PreviewSms=Previuw SMS
+PrepareSms=Prepare SMS
+CreateSms=Create SMS
+SmsResult=Result of SMS sending
+TestSms=Test SMS
+ValidSms=Validate SMS
+ApproveSms=Approve SMS
+SmsStatusDraft=Draft
+SmsStatusValidated=Validated
+SmsStatusApproved=Approved
+SmsStatusSent=Sent
+SmsStatusSentPartialy=Sent partially
+SmsStatusSentCompletely=Sent completely
+SmsStatusError=Error
+SmsStatusNotSent=Not sent
+SmsSuccessfulySent=SMS correctly sent (from %s to %s)
+ErrorSmsRecipientIsEmpty=Number of target is empty
+WarningNoSmsAdded=No new phone number to add to target list
+ConfirmValidSms=Do you confirm validation of this campaign?
+NbOfUniqueSms=No. of unique phone numbers
+NbOfSms=No. of phone numbers
+ThisIsATestMessage=This is a test message
+SendSms=Send SMS
+SmsInfoCharRemain=No. of remaining characters
+SmsInfoNumero= (international format i.e.: +33899701761)
+DelayBeforeSending=Delay before sending (minutes)
+SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+DisableStopIfSupported=Disable STOP message (if supported)
diff --git a/htdocs/langs/ar_IQ/stocks.lang b/htdocs/langs/ar_IQ/stocks.lang
new file mode 100644
index 00000000000..9a14fb38eb1
--- /dev/null
+++ b/htdocs/langs/ar_IQ/stocks.lang
@@ -0,0 +1,257 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Warehouse card
+Warehouse=Warehouse
+Warehouses=Warehouses
+ParentWarehouse=Parent warehouse
+NewWarehouse=New warehouse / Stock Location
+WarehouseEdit=Modify warehouse
+MenuNewWarehouse=New warehouse
+WarehouseSource=Source warehouse
+WarehouseSourceNotDefined=No warehouse defined,
+AddWarehouse=Create warehouse
+AddOne=Add one
+DefaultWarehouse=Default warehouse
+WarehouseTarget=Target warehouse
+ValidateSending=Delete sending
+CancelSending=Cancel sending
+DeleteSending=Delete sending
+Stock=Stock
+Stocks=Stocks
+MissingStocks=Missing stocks
+StockAtDate=Stocks at date
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
+StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
+Movements=Movements
+ErrorWarehouseRefRequired=Warehouse reference name is required
+ListOfWarehouses=List of warehouses
+ListOfStockMovements=List of stock movements
+ListOfInventories=List of inventories
+MovementId=Movement ID
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
+StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeAlsoDraftOrders=Include also draft orders
+Location=Location
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
+NumberOfProducts=Total number of products
+LastMovement=Latest movement
+LastMovements=Latest movements
+Units=Units
+Unit=Unit
+StockCorrection=Stock correction
+CorrectStock=Correct stock
+StockTransfer=Stock transfer
+TransferStock=Transfer stock
+MassStockTransferShort=Mass stock transfer
+StockMovement=Stock movement
+StockMovements=Stock movements
+NumberOfUnit=Number of units
+UnitPurchaseValue=Unit purchase price
+StockTooLow=Stock too low
+StockLowerThanLimit=Stock lower than alert limit (%s)
+EnhancedValue=Value
+PMPValue=Weighted average price
+PMPValueShort=WAP
+EnhancedValueOfWarehouses=Warehouses value
+UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+RuleForWarehouse=Rule for warehouses
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
+WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
+UserDefaultWarehouse=Set a warehouse on Users
+MainDefaultWarehouse=Default warehouse
+MainDefaultWarehouseUser=Use a default warehouse for each user
+MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
+IndependantSubProductStock=Product stock and subproduct stock are independent
+QtyDispatched=Quantity dispatched
+QtyDispatchedShort=Qty dispatched
+QtyToDispatchShort=Qty to dispatch
+OrderDispatch=Item receipts
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
+DeStockOnShipment=Decrease real stocks on shipping validation
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
+DispatchVerb=Dispatch
+StockLimitShort=Limit for alert
+StockLimit=Stock limit for alert
+StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+PhysicalStock=Physical Stock
+RealStock=Real Stock
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+VirtualStock=Virtual stock
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
+IdWarehouse=Id warehouse
+DescWareHouse=Description warehouse
+LieuWareHouse=Localisation warehouse
+WarehousesAndProducts=Warehouses and products
+WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+SellPriceMin=Selling Unit Price
+EstimatedStockValueSellShort=Value for sell
+EstimatedStockValueSell=Value for sell
+EstimatedStockValueShort=Input stock value
+EstimatedStockValue=Input stock value
+DeleteAWarehouse=Delete a warehouse
+ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+PersonalStock=Personal stock %s
+ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
+SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
+SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
+NoStockAction=No stock action
+DesiredStock=Desired Stock
+DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+StockToBuy=To order
+Replenishment=Replenishment
+ReplenishmentOrders=Replenishment orders
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
+UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
+ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+UseVirtualStock=Use virtual stock
+UsePhysicalStock=Use physical stock
+CurentSelectionMode=Current selection mode
+CurentlyUsingVirtualStock=Virtual stock
+CurentlyUsingPhysicalStock=Physical stock
+RuleForStockReplenishment=Rule for stocks replenishment
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+AlertOnly= Alerts only
+IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
+WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
+ForThisWarehouse=For this warehouse
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+Replenishments=Replenishments
+NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
+NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
+MassMovement=Mass movement
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+RecordMovement=Record transfer
+ReceivingForSameOrder=Receipts for this order
+StockMovementRecorded=Stock movements recorded
+RuleForStockAvailability=Rules on stock requirements
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
+MovementLabel=Label of movement
+TypeMovement=Direction of movement
+DateMovement=Date of movement
+InventoryCode=Movement or inventory code
+IsInPackage=Contained into package
+WarehouseAllowNegativeTransfer=Stock can be negative
+qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+ShowWarehouse=Show warehouse
+MovementCorrectStock=Stock correction for product %s
+MovementTransferStock=Stock transfer of product %s into another warehouse
+InventoryCodeShort=Inv./Mov. code
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+OpenAll=Open for all actions
+OpenInternal=Open only for internal actions
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
+ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
+ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
+ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
+AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+InventoryDate=Inventory date
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Vendor filter
+inventoryOnDate=Inventory
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RecordedQty=Recorded Qty
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
+ListInventory=List
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
+InventoryForASpecificWarehouse=Inventory for a specific warehouse
+InventoryForASpecificProduct=Inventory for a specific product
+StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
+ForceTo=Force to
+AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
+StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
+CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Fill real qty by scaning
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/ar_IQ/stripe.lang b/htdocs/langs/ar_IQ/stripe.lang
new file mode 100644
index 00000000000..a536ffd81e7
--- /dev/null
+++ b/htdocs/langs/ar_IQ/stripe.lang
@@ -0,0 +1,71 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome to our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Pay with Stripe
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
+ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
+ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
+StripeImportPayment=Import Stripe payments
+ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+StripeGateways=Stripe gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
+BankAccountForBankTransfer=Bank account for fund payouts
+StripeAccount=Stripe account
+StripeChargeList=List of Stripe charges
+StripeTransactionList=List of Stripe transactions
+StripeCustomerId=Stripe customer id
+StripePaymentModes=Stripe payment modes
+LocalID=Local ID
+StripeID=Stripe ID
+NameOnCard=Name on card
+CardNumber=Card Number
+ExpiryDate=Expiry Date
+CVN=CVN
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Create customer on Stripe
+CreateCardOnStripe=Create card on Stripe
+ShowInStripe=Show in Stripe
+StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
+StripePayoutList=List of Stripe payouts
+ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
+ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
diff --git a/htdocs/langs/ar_IQ/supplier_proposal.lang b/htdocs/langs/ar_IQ/supplier_proposal.lang
new file mode 100644
index 00000000000..a68319fb2df
--- /dev/null
+++ b/htdocs/langs/ar_IQ/supplier_proposal.lang
@@ -0,0 +1,58 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposalNew=New price request
+CommRequest=Price request
+CommRequests=Price requests
+SearchRequest=Find a request
+DraftRequests=Draft requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Latest %s modified price requests
+RequestsOpened=Open price requests
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+AskPrice=Price request
+NewAskPrice=New price request
+ShowSupplierProposal=Show price request
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Vendor ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
+DeleteAsk=Delete request
+ValidateAsk=Validate request
+SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusClosed=Closed
+SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusNotSigned=Refused
+SupplierProposalStatusDraftShort=Draft
+SupplierProposalStatusValidatedShort=Validated
+SupplierProposalStatusClosedShort=Closed
+SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusNotSignedShort=Refused
+CopyAskFrom=Create a price request by copying an existing request
+CreateEmptyAsk=Create blank request
+ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
+ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
+SendAskByMail=Send price request by mail
+SendAskRef=Sending the price request %s
+SupplierProposalCard=Request card
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
+ActionsOnSupplierProposal=Events on price request
+DocModelAuroreDescription=A complete request model (logo...)
+CommercialAsk=Price request
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposals=List of vendor proposal requests
+ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
+SupplierProposalsToClose=Vendor proposals to close
+SupplierProposalsToProcess=Vendor proposals to process
+LastSupplierProposals=Latest %s price requests
+AllPriceRequests=All requests
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=Representative following-up proposal
diff --git a/htdocs/langs/ar_IQ/suppliers.lang b/htdocs/langs/ar_IQ/suppliers.lang
new file mode 100644
index 00000000000..ca9ee174d29
--- /dev/null
+++ b/htdocs/langs/ar_IQ/suppliers.lang
@@ -0,0 +1,49 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
+History=History
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
+OrderDate=Order date
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
+SupplierPrices=Vendor prices
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
+Availability=Availability
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order details
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+DenyingThisOrder=Deny this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
+SupplierReputation=Vendor reputation
+ReferenceReputation=Reference reputation
+DoNotOrderThisProductToThisSupplier=Do not order
+NotTheGoodQualitySupplier=Low quality
+ReputationForThisProduct=Reputation
+BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
+AllProductReferencesOfSupplier=All references of vendor
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ar_IQ/ticket.lang b/htdocs/langs/ar_IQ/ticket.lang
new file mode 100644
index 00000000000..df73daf4a0d
--- /dev/null
+++ b/htdocs/langs/ar_IQ/ticket.lang
@@ -0,0 +1,316 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+Permission56001=See tickets
+Permission56002=Modify tickets
+Permission56003=Delete tickets
+Permission56004=Manage tickets
+Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+
+TicketTypeShortCOM=Commercial question
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Project
+TicketTypeShortOTHER=Other
+
+TicketSeverityShortLOW=Low
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=High
+TicketSeverityShortBLOCKING=Critical, Blocking
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+TypeContact_ticket_internal_CONTRIBUTOR=Contributor
+TypeContact_ticket_internal_SUPPORTTEC=Assigned user
+TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_CONTRIBUTOR=External contributor
+
+OriginEmail=Email source
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# Status
+Read=Read
+Assigned=Assigned
+InProgress=In progress
+NeedMoreInformation=Waiting for information
+Answered=Answered
+Waiting=Waiting
+Closed=Closed
+Deleted=Deleted
+
+# Dict
+Type=Type
+Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+TicketSetupPage=
+TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
+TicketParamModule=Module variable setup
+TicketParamMail=Email setup
+TicketEmailNotificationFrom=Notification email from
+TicketEmailNotificationFromHelp=Used into ticket message answer by example
+TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketNewEmailBodyLabel=Text message sent after creating a ticket
+TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
+TicketParamPublicInterface=Public interface setup
+TicketsEmailMustExist=Require an existing email address to create a ticket
+TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+PublicInterface=Public interface
+TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
+TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
+TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
+TicketPublicInterfaceTopicLabelAdmin=Interface title
+TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
+TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+ExtraFieldsTicket=Extra attributes
+TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
+TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
+TicketsLogEnableEmail=Enable log by email
+TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketParams=Params
+TicketsShowModuleLogo=Display the logo of the module in the public interface
+TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowCompanyLogo=Display the logo of the company in the public interface
+TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
+TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
+TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsActivatePublicInterface=Activate public interface
+TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
+TicketsAutoAssignTicket=Automatically assign the user who created the ticket
+TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
+TicketNumberingModules=Tickets numbering module
+TicketsModelModule=Document templates for tickets
+TicketNotifyTiersAtCreation=Notify third party at creation
+TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
+TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
+TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+#
+# Index & list page
+#
+TicketsIndex=Tickets area
+TicketList=List of tickets
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
+NoTicketsFound=No ticket found
+NoUnreadTicketsFound=No unread ticket found
+TicketViewAllTickets=View all tickets
+TicketViewNonClosedOnly=View only open tickets
+TicketStatByStatus=Tickets by status
+OrderByDateAsc=Sort by ascending date
+OrderByDateDesc=Sort by descending date
+ShowAsConversation=Show as conversation list
+MessageListViewType=Show as table list
+
+#
+# Ticket card
+#
+Ticket=Ticket
+TicketCard=Ticket card
+CreateTicket=Create ticket
+EditTicket=Edit ticket
+TicketsManagement=Tickets Management
+CreatedBy=Created by
+NewTicket=New Ticket
+SubjectAnswerToTicket=Ticket answer
+TicketTypeRequest=Request type
+TicketCategory=Group
+SeeTicket=See ticket
+TicketMarkedAsRead=Ticket has been marked as read
+TicketReadOn=Read on
+TicketCloseOn=Closing date
+MarkAsRead=Mark ticket as read
+TicketHistory=Ticket history
+AssignUser=Assign to user
+TicketAssigned=Ticket is now assigned
+TicketChangeType=Change type
+TicketChangeCategory=Change analytic code
+TicketChangeSeverity=Change severity
+TicketAddMessage=Add a message
+AddMessage=Add a message
+MessageSuccessfullyAdded=Ticket added
+TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessagesList=Message list
+NoMsgForThisTicket=No message for this ticket
+Properties=Classification
+LatestNewTickets=Latest %s newest tickets (not read)
+TicketSeverity=Severity
+ShowTicket=See ticket
+RelatedTickets=Related tickets
+TicketAddIntervention=Create intervention
+CloseTicket=Close ticket
+CloseATicket=Close a ticket
+ConfirmCloseAticket=Confirm ticket closing
+ConfirmDeleteTicket=Please confirm ticket deleting
+TicketDeletedSuccess=Ticket deleted with success
+TicketMarkedAsClosed=Ticket marked as closed
+TicketDurationAuto=Calculated duration
+TicketDurationAutoInfos=Duration calculated automatically from intervention related
+TicketUpdated=Ticket updated
+SendMessageByEmail=Send message by email
+TicketNewMessage=New message
+ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+TicketMessageMailIntro=Introduction
+TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
+TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
+TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailSignature=Signature
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Signature of response email
+TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
+TicketMessageHelp=Only this text will be saved in the message list on ticket card.
+TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
+TimeElapsedSince=Time elapsed since
+TicketTimeToRead=Time elapsed before read
+TicketContacts=Contacts ticket
+TicketDocumentsLinked=Documents linked to ticket
+ConfirmReOpenTicket=Confirm reopen this ticket ?
+TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
+TicketAssignedToYou=Ticket assigned
+TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
+MarkMessageAsPrivate=Mark message as private
+TicketMessagePrivateHelp=This message will not display to external users
+TicketEmailOriginIssuer=Issuer at origin of the tickets
+InitialMessage=Initial Message
+LinkToAContract=Link to a contract
+TicketPleaseSelectAContract=Select a contract
+UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
+TicketMailExchanges=Mail exchanges
+TicketInitialMessageModified=Initial message modified
+TicketMessageSuccesfullyUpdated=Message successfully updated
+TicketChangeStatus=Change status
+TicketConfirmChangeStatus=Confirm the status change: %s ?
+TicketLogStatusChanged=Status changed: %s to %s
+TicketNotNotifyTiersAtCreate=Not notify company at create
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+ErrorTicketRefRequired=Ticket reference name is required
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Ticket %s read by %s
+NoLogForThisTicket=No log for this ticket yet
+TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
+TicketLogClosedBy=Ticket %s closed by %s
+TicketLogReopen=Ticket %s re-open
+
+#
+# Public pages
+#
+TicketSystem=Ticket system
+ShowListTicketWithTrackId=Display ticket list from track ID
+ShowTicketWithTrackId=Display ticket from track ID
+TicketPublicDesc=You can create a support ticket or check from an existing ID.
+YourTicketSuccessfullySaved=Ticket has been successfully saved!
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+PleaseRememberThisId=Please keep the tracking number that we might ask you later.
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectCustomer=New support ticket
+TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
+TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
+TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketTrackId=Public Tracking ID
+OneOfTicketTrackId=One of your tracking ID
+ErrorTicketNotFound=Ticket with tracking ID %s not found!
+Subject=Subject
+ViewTicket=View ticket
+ViewMyTicketList=View my ticket list
+ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
+SeeThisTicketIntomanagementInterface=See ticket in management interface
+TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
+ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+OldUser=Old user
+NewUser=New user
+NumberOfTicketsByMonth=Number of tickets per month
+NbOfTickets=Number of tickets
+# notifications
+TicketNotificationEmailSubject=Ticket %s updated
+TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
+TicketNotificationRecipient=Notification recipient
+TicketNotificationLogMessage=Log message
+TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
+TicketNotificationNumberEmailSent=Notification email sent: %s
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/ar_IQ/trips.lang b/htdocs/langs/ar_IQ/trips.lang
new file mode 100644
index 00000000000..1f53a5737ff
--- /dev/null
+++ b/htdocs/langs/ar_IQ/trips.lang
@@ -0,0 +1,151 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Show expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense reports
+ListOfFees=List of fees
+TypeFees=Types of fees
+ShowTrip=Show expense report
+NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
+CompanyVisited=Company/organization visited
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to be informed for validating the request.
+TripSociete=Information company
+TripNDF=Informations expense report
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRIP=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hotel
+TF_TAXI=Taxi
+EX_KME=Mileage costs
+EX_FUE=Fuel CV
+EX_HOT=Hotel
+EX_PAR=Parking CV
+EX_TOL=Toll CV
+EX_TAX=Various Taxes
+EX_IND=Indemnity transportation subscription
+EX_SUM=Maintenance supply
+EX_SUO=Office supplies
+EX_CAR=Car rental
+EX_DOC=Documentation
+EX_CUR=Customers receiving
+EX_OTR=Other receiving
+EX_POS=Postage
+EX_CAM=CV maintenance and repair
+EX_EMM=Employees meal
+EX_GUM=Guests meal
+EX_BRE=Breakfast
+EX_FUE_VP=Fuel PV
+EX_TOL_VP=Toll PV
+EX_PAR_VP=Parking PV
+EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
+UploadANewFileNow=Upload a new document now
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+AucuneLigne=There is no expense report declared yet
+ModePaiement=Payment mode
+VALIDATOR=User responsible for approval
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paid by
+REFUSEUR=Denied by
+CANCEL_USER=Deleted by
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
+ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report?
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
+ConfirmCancelTrip=Are you sure you want to cancel this expense report?
+BrouillonnerTrip=Move back expense report to status "Draft"
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report?
+NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
+ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToPay=Expense reports to pay
+ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
+ExpenseReportsIk=Configuration of mileage charges
+ExpenseReportsRules=Expense report rules
+ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
+ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+expenseReportOffset=Offset
+expenseReportCoef=Coefficient
+expenseReportTotalForFive=Example with <u>d</u> = 5
+expenseReportRangeFromTo=from %d to %d
+expenseReportRangeMoreThan=more than %d
+expenseReportCoefUndefined=(value not defined)
+expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportPrintExample=offset + (d x coef) = %s
+ExpenseReportApplyTo=Apply to
+ExpenseReportDomain=Domain to apply
+ExpenseReportLimitOn=Limit on
+ExpenseReportDateStart=Date start
+ExpenseReportDateEnd=Date end
+ExpenseReportLimitAmount=Limite amount
+ExpenseReportRestrictive=Restrictive
+AllExpenseReport=All type of expense report
+OnExpense=Expense line
+ExpenseReportRuleSave=Expense report rule saved
+ExpenseReportRuleErrorOnSave=Error: %s
+RangeNum=Range %d
+ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+byEX_DAY=by day (limitation to %s)
+byEX_MON=by month (limitation to %s)
+byEX_YEA=by year (limitation to %s)
+byEX_EXP=by line (limitation to %s)
+ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
+nolimitbyEX_DAY=by day (no limitation)
+nolimitbyEX_MON=by month (no limitation)
+nolimitbyEX_YEA=by year (no limitation)
+nolimitbyEX_EXP=by line (no limitation)
+CarCategory=Vehicle category
+ExpenseRangeOffset=Offset amount: %s
+RangeIk=Mileage range
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/ar_IQ/users.lang b/htdocs/langs/ar_IQ/users.lang
new file mode 100644
index 00000000000..bbfa16450b0
--- /dev/null
+++ b/htdocs/langs/ar_IQ/users.lang
@@ -0,0 +1,125 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=HRM area
+UserCard=User card
+GroupCard=Group card
+Permission=Permission
+Permissions=Permissions
+EditPassword=Edit password
+SendNewPassword=Regenerate and send password
+SendNewPasswordLink=Send link to reset password
+ReinitPassword=Regenerate password
+PasswordChangedTo=Password changed to: %s
+SubjectNewPassword=Your new password for %s
+GroupRights=Group permissions
+UserRights=User permissions
+UserGUISetup=User Display Setup
+DisableUser=Disable
+DisableAUser=Disable a user
+DeleteUser=Delete
+DeleteAUser=Delete a user
+EnableAUser=Enable a user
+DeleteGroup=Delete
+DeleteAGroup=Delete a group
+ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
+ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
+ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
+ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
+ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
+ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+NewUser=New user
+CreateUser=Create user
+LoginNotDefined=Login is not defined.
+NameNotDefined=Name is not defined.
+ListOfUsers=List of users
+SuperAdministrator=Super Administrator
+SuperAdministratorDesc=Global administrator
+AdministratorDesc=Administrator
+DefaultRights=Default Permissions
+DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DolibarrUsers=Dolibarr users
+LastName=Last name
+FirstName=First name
+ListOfGroups=List of groups
+NewGroup=New group
+CreateGroup=Create group
+RemoveFromGroup=Remove from group
+PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
+ConfirmPasswordReset=Confirm password reset
+MenuUsersAndGroups=Users & Groups
+LastGroupsCreated=Latest %s groups created
+LastUsersCreated=Latest %s users created
+ShowGroup=Show group
+ShowUser=Show user
+NonAffectedUsers=Non assigned users
+UserModified=User modified successfully
+PhotoFile=Photo file
+ListOfUsersInGroup=List of users in this group
+ListOfGroupsForUser=List of groups for this user
+LinkToCompanyContact=Link to third party / contact
+LinkedToDolibarrMember=Link to member
+LinkedToDolibarrUser=Link to Dolibarr user
+LinkedToDolibarrThirdParty=Link to Dolibarr third party
+CreateDolibarrLogin=Create a user
+CreateDolibarrThirdParty=Create a third party
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
+UsePersonalValue=Use personal value
+InternalUser=Internal user
+ExportDataset_user_1=Users and their properties
+DomainUser=Domain user %s
+Reactivate=Reactivate
+CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
+PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
+Inherited=Inherited
+UserWillBe=Created user will be
+UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
+UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
+IdPhoneCaller=Id phone caller
+NewUserCreated=User %s created
+NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
+EventUserModified=User %s modified
+UserDisabled=User %s disabled
+UserEnabled=User %s activated
+UserDeleted=User %s removed
+NewGroupCreated=Group %s created
+GroupModified=Group %s modified
+GroupDeleted=Group %s removed
+ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
+ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
+ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
+LoginToCreate=Login to create
+NameToCreate=Name of third party to create
+YourRole=Your roles
+YourQuotaOfUsersIsReached=Your quota of active users is reached !
+NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
+DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
+HierarchicalResponsible=Supervisor
+HierarchicView=Hierarchical view
+UseTypeFieldToChange=Use field Type to change
+OpenIDURL=OpenID URL
+LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Hours worked (per week)
+ExpectedWorkedHours=Expected worked hours per week
+ColorUser=Color of the user
+DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accounting code
+UserLogoff=User logout
+UserLogged=User logged
+DateOfEmployment=Employment date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
+DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
+CantDisableYourself=You can't disable your own user record
+ForceUserExpenseValidator=Force expense report validator
+ForceUserHolidayValidator=Force leave request validator
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/ar_IQ/website.lang b/htdocs/langs/ar_IQ/website.lang
new file mode 100644
index 00000000000..7d624915ef0
--- /dev/null
+++ b/htdocs/langs/ar_IQ/website.lang
@@ -0,0 +1,147 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGENAME=Page name/alias
+WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL of external CSS file
+WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_ROBOT=Robot file (robots.txt)
+WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+WEBSITE_KEYWORDSDesc=Use a comma to separate values
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+HtmlHeaderPage=HTML header (specific to this page only)
+PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
+MediaFiles=Media library
+EditCss=Edit website properties
+EditMenu=Edit menu
+EditMedias=Edit medias
+EditPageMeta=Edit page/container properties
+EditInLine=Edit inline
+AddWebsite=Add website
+Webpage=Web page/container
+AddPage=Add page/container
+PageContainer=Page
+PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
+PageContent=Page/Contenair
+PageDeleted=Page/Contenair '%s' of website %s deleted
+PageAdded=Page/Contenair '%s' added
+ViewSiteInNewTab=View site in new tab
+ViewPageInNewTab=View page in new tab
+SetAsHomePage=Set as Home page
+RealURL=Real URL
+ViewWebsiteInProduction=View web site using home URLs
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
+ReadPerm=Read
+WritePerm=Write
+TestDeployOnWeb=Test/deploy on web
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
+NoPageYet=No pages yet
+YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
+SyntaxHelp=Help on specific syntax tips
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+#YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+ClonePage=Clone page/container
+CloneSite=Clone site
+SiteAdded=Website added
+ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
+PageIsANewTranslation=The new page is a translation of the current page ?
+LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
+ParentPageId=Parent page ID
+WebsiteId=Website ID
+CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
+OrEnterPageInfoManually=Or create page from scratch or from a page template...
+FetchAndCreate=Fetch and Create
+ExportSite=Export website
+ImportSite=Import website template
+IDOfPage=Id of page
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Website account
+WebsiteAccounts=Website accounts
+AddWebsiteAccount=Create web site account
+BackToListForThirdParty=Back to list for the third-party
+DisableSiteFirst=Disable website first
+MyContainerTitle=My web site title
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+YouMustDefineTheHomePage=You must first define the default Home page
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+GrabImagesInto=Grab also images found into css and page.
+ImagesShouldBeSavedInto=Images should be saved into directory
+WebsiteRootOfImages=Root directory for website images
+SubdirOfPage=Sub-directory dedicated to page
+AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ShowSubcontainers=Show dynamic content
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is a translation of
+ThisPageHasTranslationPages=This page/container has translation
+NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
+GoTo=Go to
+DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
+NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
+ReplaceWebsiteContent=Search or Replace website content
+DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoMedias=Delete also all medias files specific to this website?
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
+EditInLineOnOff=Mode 'Edit inline' is %s
+ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+GlobalCSSorJS=Global CSS/JS/Header file of web site
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
+UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+MainLanguage=Main language
+OtherLanguages=Other languages
+UseManifest=Provide a manifest.json file
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
+RSSFeed=RSS Feed
+RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
+PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
+AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/ar_IQ/withdrawals.lang b/htdocs/langs/ar_IQ/withdrawals.lang
new file mode 100644
index 00000000000..7d5b57f7da9
--- /dev/null
+++ b/htdocs/langs/ar_IQ/withdrawals.lang
@@ -0,0 +1,153 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Payments by Direct debit orders
+SuppliersStandingOrdersArea=Payments by Credit transfer
+StandingOrdersPayment=Direct debit payment orders
+StandingOrderPayment=Direct debit payment order
+NewStandingOrder=New direct debit order
+NewPaymentByBankTransfer=New payment by credit transfer
+StandingOrderToProcess=To process
+PaymentByBankTransferReceipts=Credit transfer orders
+PaymentByBankTransferLines=Credit transfer order lines
+WithdrawalsReceipts=Direct debit orders
+WithdrawalReceipt=Direct debit order
+BankTransferReceipts=Credit transfer orders
+BankTransferReceipt=Credit transfer order
+LatestBankTransferReceipts=Latest %s credit transfer orders
+LastWithdrawalReceipts=Latest %s direct debit files
+WithdrawalsLine=Direct debit order line
+CreditTransferLine=Credit transfer line
+WithdrawalsLines=Direct debit order lines
+CreditTransferLines=Credit transfer lines
+RequestStandingOrderToTreat=Requests for direct debit payment order to process
+RequestStandingOrderTreated=Requests for direct debit payment order processed
+RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
+RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
+SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
+InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+AmountToWithdraw=Amount to withdraw
+NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+ResponsibleUser=User Responsible
+WithdrawalsSetup=Direct debit payment setup
+CreditTransferSetup=Credit transfer setup
+WithdrawStatistics=Direct debit payment statistics
+CreditTransferStatistics=Credit transfer statistics
+Rejects=Rejects
+LastWithdrawalReceipt=Latest %s direct debit receipts
+MakeWithdrawRequest=Make a direct debit payment request
+MakeBankTransferOrder=Make a credit transfer request
+WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
+ClassCredited=Classify credited
+ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
+TransData=Transmission date
+TransMetod=Transmission method
+Send=Send
+Lines=Lines
+StandingOrderReject=Issue a rejection
+WithdrawsRefused=Direct debit refused
+WithdrawalRefused=Withdrawal refused
+CreditTransfersRefused=Credit transfers refused
+WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
+RefusedData=Date of rejection
+RefusedReason=Reason for rejection
+RefusedInvoicing=Billing the rejection
+NoInvoiceRefused=Do not charge the rejection
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
+StatusDebitCredit=Status debit/credit
+StatusWaiting=Waiting
+StatusTrans=Sent
+StatusDebited=Debited
+StatusCredited=Credited
+StatusPaid=Paid
+StatusRefused=Refused
+StatusMotif0=Unspecified
+StatusMotif1=Insufficient funds
+StatusMotif2=Request contested
+StatusMotif3=No direct debit payment order
+StatusMotif4=Sales Order
+StatusMotif5=RIB unusable
+StatusMotif6=Account without balance
+StatusMotif7=Judicial Decision
+StatusMotif8=Other reason
+CreateForSepaFRST=Create direct debit file (SEPA FRST)
+CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateAll=Create direct debit file (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateGuichet=Only office
+CreateBanque=Only bank
+OrderWaiting=Waiting for treatment
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
+NumeroNationalEmetter=National Transmitter Number
+WithBankUsingRIB=For bank accounts using RIB
+WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Receiving Bank Account
+BankToPayCreditTransfer=Bank Account used as source of payments
+CreditDate=Credit on
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
+SetToStatusSent=Set to status "File Sent"
+ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+StatisticsByLineStatus=Statistics by status of lines
+RUM=UMR
+DateRUM=Mandate signature date
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
+WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawRequestAmount=Amount of Direct debit request:
+BankTransferAmount=Amount of Credit Transfer request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
+SepaMandate=SEPA Direct Debit Mandate
+SepaMandateShort=SEPA Mandate
+PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
+SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+CreditorIdentifier=Creditor Identifier
+CreditorName=Creditor Name
+SEPAFillForm=(B) Please complete all the fields marked *
+SEPAFormYourName=Your name
+SEPAFormYourBAN=Your Bank Account Name (IBAN)
+SEPAFormYourBIC=Your Bank Identifier Code (BIC)
+SEPAFrstOrRecur=Type of payment
+ModeRECUR=Recurring payment
+ModeFRST=One-off payment
+PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
+DirectDebitOrderCreated=Direct debit order %s created
+AmountRequested=Amount requested
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Execution date
+CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
+NoDefaultIBANFound=No default IBAN found for this third party
+### Notifications
+InfoCreditSubject=Payment of direct debit payment order %s by the bank
+InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
+InfoTransSubject=Transmission of direct debit payment order %s to bank
+InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
+InfoRejectSubject=Direct debit payment order refused
+InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/ar_IQ/workflow.lang b/htdocs/langs/ar_IQ/workflow.lang
new file mode 100644
index 00000000000..494a0424a75
--- /dev/null
+++ b/htdocs/langs/ar_IQ/workflow.lang
@@ -0,0 +1,25 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Workflow module setup
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+# Autoclassify customer proposal or order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+AutomaticCreation=Automatic creation
+AutomaticClassification=Automatic classification
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/ar_IQ/zapier.lang b/htdocs/langs/ar_IQ/zapier.lang
new file mode 100644
index 00000000000..b4cc4ccba4a
--- /dev/null
+++ b/htdocs/langs/ar_IQ/zapier.lang
@@ -0,0 +1,21 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ModuleZapierForDolibarrName = Zapier for Dolibarr
+ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index e0817d618cb..0f3e0d79d19 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -10,325 +10,325 @@ ACCOUNTING_EXPORT_AMOUNT=تصدير الكمية
 ACCOUNTING_EXPORT_DEVISE=تصدير العملة
 Selectformat=حدد تنسيق للملف
 ACCOUNTING_EXPORT_FORMAT=حدد تنسيق للملف
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_ENDLINE=حدد نوع إرجاع السطر
 ACCOUNTING_EXPORT_PREFIX_SPEC=تحديد بادئة لاسم الملف
 ThisService=هذه الخدمة
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
-CantSuggest=Can't suggest
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
-Journalization=Journalization
+ThisProduct=هذا المنتج
+DefaultForService=افتراضي للخدمة
+DefaultForProduct=افتراضي للمنتج
+ProductForThisThirdparty=منتج لهذا الطرف الثالث
+ServiceForThisThirdparty=خدمة لهذا الطرف الثالث
+CantSuggest=لا أستطيع أن أقترح
+AccountancySetupDoneFromAccountancyMenu=تم إجراء معظم عمليات الإعداد المحاسبي من القائمة %s
+ConfigAccountingExpert=تكوين وحدة المحاسبة (القيد المزدوج)
+Journalization=يوميات
 Journals=دفاتر اليومية
 JournalFinancial=دفاتر اليومية المالية
 BackToChartofaccounts=العودة لشجرة الحسابات
 Chartofaccounts=جدول الحسابات
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
-OtherInfo=Other information
-DeleteCptCategory=Remove accounting account from group
-ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
-JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
-GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
-DetailByAccount=Show detail by account
-AccountWithNonZeroValues=Accounts with non zero values
-ListOfAccounts=List of accounts
-CountriesInEEC=Countries in EEC
-CountriesNotInEEC=Countries not in EEC
-CountriesInEECExceptMe=Countries in EEC except %s
-CountriesExceptMe=All countries except %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
-VueBySubAccountAccounting=View by accounting subaccount
+ChartOfSubaccounts=مخطط الحسابات الفردية
+ChartOfIndividualAccountsOfSubsidiaryLedger=مخطط الحسابات الفردية لدفتر الأستاذ الفرعي
+CurrentDedicatedAccountingAccount=الحساب الجاري المخصص
+AssignDedicatedAccountingAccount=حساب جديد للتعيين
+InvoiceLabel=تسمية الفاتورة
+OverviewOfAmountOfLinesNotBound=نظرة عامة على البنود الغير مرتبطة بحساب محاسبي
+OverviewOfAmountOfLinesBound=نظرة عامة على البنود المرتبطة بالفعل بحساب محاسبي
+OtherInfo=معلومات اخرى
+DeleteCptCategory=إزالة حساب المحاسبة من المجموعة
+ConfirmDeleteCptCategory=هل أنت متأكد أنك تريد إزالة هذا الحساب المحاسبي من مجموعة حسابات المحاسبة؟
+JournalizationInLedgerStatus=حالة اليوميات
+AlreadyInGeneralLedger=تم نقله بالفعل في دفاتر اليومية المحاسبية ودفتر الأستاذ
+NotYetInGeneralLedger=لم يتم نقله الى دفاتر اليومية المحاسبية ودفتر الأستاذ
+GroupIsEmptyCheckSetup=المجموعة فارغة ، تحقق من إعداد مجموعة المحاسبة المخصصة
+DetailByAccount=إظهار التفاصيل حسب الحساب
+AccountWithNonZeroValues=الحسابات ذات القيم غير الصفرية
+ListOfAccounts=قائمة الحسابات
+CountriesInEEC=دول الاتحاد الأوروبي
+CountriesNotInEEC=ليس ضمن دول الاتحاد الأوروبي
+CountriesInEECExceptMe=البلدان في المجموعة الاقتصادية الأوروبية باستثناء %s
+CountriesExceptMe=جميع الدول باستثناء %s
+AccountantFiles=تصدير مستندات المصدر
+ExportAccountingSourceDocHelp=باستخدام هذه الأداة ، يمكنك تصدير الأحداث  (القائمة وملفات PDF) التي تم استخدامها لإنشاء المحاسبة الخاصة بك. لتصدير دفاتر اليومية الخاصة بك ، استخدم إدخال القائمة %s - %s.
+VueByAccountAccounting=عرض حسب الحساب المحاسبي
+VueBySubAccountAccounting=عرض حسب الحساب المحاسبة الفرعي
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=حساب المحاسبة الرئيسي للعملاء الغير محددين في الإعدادات
+MainAccountForSuppliersNotDefined=حساب المحاسبة الرئيسي للموردين الغير محددين في الإعدادات
+MainAccountForUsersNotDefined=حساب المحاسبة الرئيسي للمستخدمين الغير محددين في الإعدادات
+MainAccountForVatPaymentNotDefined=حساب المحاسبة الرئيسي لدفعات (VAT) الغير محددين في الإعدادات
+MainAccountForSubscriptionPaymentNotDefined=حساب المحاسبة الرئيسي للمشتركين الغير محددين في الإعدادات
 
-AccountancyArea=Accounting area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyArea=منطقة المحاسبة
+AccountancyAreaDescIntro=استخدام وحدة المحاسبة تم في عدة خطوات:
+AccountancyAreaDescActionOnce=عادة ما يتم تنفيذ الإجراءات التالية مرة واحدة فقط ، أو مرة واحدة في السنة.
+AccountancyAreaDescActionOnceBis=يجب اتخاذ الخطوات التالية لتوفير الوقت في المستقبل من خلال اقتراح حساب المحاسبة الافتراضي الصحيح عند إجراء التسجيل (كتابة السجل في اليوميات ودفتر الأستاذ العام)
+AccountancyAreaDescActionFreq=يتم تنفيذ الإجراءات التالية عادةً كل شهر أو أسبوع أو كل يوم للشركات الكبيرة جدًا .
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
-AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
-AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+AccountancyAreaDescJournalSetup=الخطوة %s: قم بإنشاء أو التحقق من محتوى قائمة دفتر اليومية الخاصة بك من القائمة %s
+AccountancyAreaDescChartModel=الخطوة %s: تحقق من وجود نموذج لمخطط الحساب أو قم بإنشاء نموذج من القائمة %s
+AccountancyAreaDescChart=الخطوة %s : حدد و / أو أكمل مخطط حسابك من القائمة %s
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special 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.
-AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+AccountancyAreaDescVat=الخطوة %s: تحديد حسابات المحاسبة لكل معدلات ضريبة القيمة المضافة. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescDefault=الخطوة %s: تحديد حسابات المحاسبة الافتراضية. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescExpenseReport=الخطوة %s: تحديد حسابات المحاسبة الافتراضية لكل نوع من تقارير المصروفات. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescSal=الخطوة %s: تحديد حسابات المحاسبة الافتراضية لدفع الرواتب. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescContrib=الخطوة %s: تحديد حسابات المحاسبة الافتراضية للنفقات الخاصة (ضرائب متنوعة). لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescDonation=الخطوة %s: تحديد حسابات المحاسبة الافتراضية للتبرع. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescSubscription=الخطوة %s: تحديد حسابات المحاسبة الافتراضية لاشتراك الأعضاء. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescMisc=الخطوة %s: تحديد الحساب الافتراضي الإلزامي وحسابات المحاسبة الافتراضية للمعاملات المتنوعة. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescLoan=الخطوة %s: تحديد حسابات المحاسبة الافتراضية للقروض. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescBank=الخطوة %s: تحديد الحسابات المحاسبية ورمز دفتر اليومية لكل حساب بنكي والحسابات المالية. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescProd=الخطوة %s: تحديد حسابات المحاسبة لمنتجاتك او خدماتك. لهذا ، استخدم إدخال القائمة %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.
+AccountancyAreaDescBind=الخطوة %s: تحقق من الربط بين سطور %s الحالية وحساب المحاسبة ، لتمكين التطبيق من تسجيل المعاملات في دفتر الأستاذ بنقرة واحدة. إكمال الارتباطات المفقودة. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescWriteRecords=الخطوة %s: اكتب المعاملات في دفتر الأستاذ. لهذا ، انتقل إلى القائمة <strong> %s </strong> ، وانقر فوق الزر <strong> %s </strong>.
+AccountancyAreaDescAnalyze=الخطوة %s: إضافة أو تحرير المعاملات الحالية وإنشاء التقارير والصادرات.
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=الخطوة %s: إغلاق الفترة لذا لا يمكننا إجراء تعديل في المستقبل.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=Select active chart of accounts
-ChangeAndLoad=Change and load
+TheJournalCodeIsNotDefinedOnSomeBankAccount=لم تكتمل الخطوة الإلزامية في الإعداد (لم يتم تحديد رمز دفتر يومية المحاسبة لجميع الحسابات البنكية)
+Selectchartofaccounts=حدد مخطط الحسابات النشط
+ChangeAndLoad=تغيير و تحميل
 Addanaccount=إضافة حساب محاسبي
 AccountAccounting=حساب محاسبي
 AccountAccountingShort=حساب
-SubledgerAccount=Subledger account
-SubledgerAccountLabel=Subledger account label
-ShowAccountingAccount=Show accounting account
-ShowAccountingJournal=Show accounting journal
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
+SubledgerAccount=حساب أستاذ فرعي
+SubledgerAccountLabel=اسم حساب أستاذ فرعي
+ShowAccountingAccount=عرض حساب المحاسبة
+ShowAccountingJournal=عرض دفتر يومية
+ShowAccountingAccountInLedger=عرض حساب المحاسبة في دفتر الأستاذ
+ShowAccountingAccountInJournals=عرض حساب المحاسبة في دفاتر اليومية
+AccountAccountingSuggest=حساب المحاسبة المقترح
+MenuDefaultAccounts=الحسابات الافتراضية
 MenuBankAccounts=الحسابات المصرفية
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-MenuClosureAccounts=Closure accounts
-MenuAccountancyClosure=Closure
-MenuAccountancyValidationMovements=Validate movements
-ProductsBinding=Products accounts
-TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
-Binding=Binding to accounts
-CustomersVentilation=ربط فاتورة الزبون
-SuppliersVentilation=Vendor invoice binding
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in accounting
-Bookkeeping=Ledger
-BookkeepingSubAccount=Subledger
-AccountBalance=Account balance
-ObjectsRef=Source object ref
+MenuVatAccounts=حسابات ضريبة القيمة المضافة
+MenuTaxAccounts=حسابات الضرائب
+MenuExpenseReportAccounts=حسابات تقرير المصاريف
+MenuLoanAccounts=حسابات القروض
+MenuProductsAccounts=حسابات المنتج
+MenuClosureAccounts=حسابات الإغلاق
+MenuAccountancyClosure=اغلاق
+MenuAccountancyValidationMovements=اعتماد الحركات
+ProductsBinding=حسابات المنتجات
+TransferInAccounting=التحويل في المحاسبة
+RegistrationInAccounting=التسجيل في المحاسبة
+Binding=ربط للحسابات
+CustomersVentilation=ربط فاتورة العميل
+SuppliersVentilation=ربط فاتورة المورد
+ExpenseReportsVentilation=ربط تقرير المصاريف
+CreateMvts=إنشاء معاملة جديدة
+UpdateMvts=تعديل معاملة
+ValidTransaction=اعتماد المعاملة
+WriteBookKeeping=تسجيل المعاملات في المحاسبة
+Bookkeeping=دفتر حسابات
+BookkeepingSubAccount=حساب استاذ فرعي
+AccountBalance=رصيد الحساب
+ObjectsRef=مرجع الكائن المصدر
 CAHTF=Total purchase vendor before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalExpenseReport=تقرير المصاريف الإجمالية
+InvoiceLines=بنود الفواتير المراد ربطها
+InvoiceLinesDone=بنود الفواتير المقيدة
+ExpenseReportLines=بنود تقارير المصاريف المراد ربطها
+ExpenseReportLinesDone=البنود المقيدة لتقارير المصروفات
+IntoAccount=ربط البند مع حساب المحاسبة
+TotalForAccount=Total accounting account
 
 
-Ventilate=Bind
-LineId=Id line
+Ventilate=ربط
+LineId=معرف البند
 Processing=معالجة
-EndProcessing=انتهت العملية
+EndProcessing=تم إنهاء العملية.
 SelectedLines=الخطوط المحددة
 Lineofinvoice=خط الفاتورة
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+LineOfExpenseReport=بند تقرير المصاريف
+NoAccountSelected=لم يتم اختيار حساب
+VentilatedinAccount=ربط بنجاح بحساب المحاسبة
+NotVentilatedinAccount=لم يربط بحساب المحاسبة
+XLineSuccessfullyBinded=%s منتجات / خدمات  مرتبطة بنجاح بحساب محاسبة
+XLineFailedToBeBinded=%s منتجات / خدمات  لم تكن مرتبطة بأي حساب محاسبة
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=الحد الأقصى لعدد البنود في صفحة القائمة والربط (يوصى : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=ابدأ فرز الصفحة "بنود للتنفيذ" حسب أحدث العناصر
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=ابدأ في فرز الصفحة "تم الربط" حسب أحدث العناصر
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTING_LENGTH_DESCRIPTION=اقتطاع وصف المنتج والخدمات في القوائم بعد حرف x (الأفضل = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=اقتطاع نموذج وصف حساب المنتجات والخدمات في القوائم بعد حرف x (الأفضل = 50)
+ACCOUNTING_LENGTH_GACCOUNT=طول حسابات المحاسبة العامة (إذا قمت بتعيين القيمة إلى 6 هنا ، فسيظهر الحساب "706" مثل "706000" على الشاشة)
+ACCOUNTING_LENGTH_AACCOUNT=طول حسابات الطرف الثالث المحاسبية (إذا قمت بتعيين القيمة إلى 6 هنا ، فسيظهر الحساب "401" مثل "401000" على الشاشة)
+ACCOUNTING_MANAGE_ZERO=السماح بإدارة عدد مختلف من الأصفار في نهاية الحساب المحاسبي. تحتاجه بعض الدول (مثل سويسرا). إذا تم الضبط على إيقاف (افتراضي) ، يمكنك تعيين المعاملين التاليتين لتطلب من التطبيق إضافة أصفار افتراضية.
+BANK_DISABLE_DIRECT_INPUT=تعطيل التسجيل المباشر للمعاملة في الحساب المصرفي
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=تفعيل تصدير المسودة الى دفتر اليومية
+ACCOUNTANCY_COMBO_FOR_AUX=تمكين قائمة التحرير والسرد للحساب الفرعي (قد يكون بطيئًا إذا كان لديك الكثير من الأطراف الثالثة)
+ACCOUNTING_DATE_START_BINDING=تحديد موعد لبدء الربط والتحويل في المحاسبة. بعد هذا التاريخ ، لن يتم تحويل المعاملات إلى المحاسبة.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=في نقل المحاسبة ، حدد فترة العرض بشكل افتراضي
 
 ACCOUNTING_SELL_JOURNAL=دفتر البيع اليومي
 ACCOUNTING_PURCHASE_JOURNAL=دفتر الشراء اليومي
 ACCOUNTING_MISCELLANEOUS_JOURNAL=دفتر المتفرقات اليومي
 ACCOUNTING_EXPENSEREPORT_JOURNAL=دفتر تقرير المصروف اليومي
 ACCOUNTING_SOCIAL_JOURNAL=دفتر اليومية الاجتماعي
-ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+ACCOUNTING_HAS_NEW_JOURNAL=له دفتر يوميات جديد
 
-ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
-ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_RESULT_PROFIT=نتيجة حساب المحاسبي (الربح)
+ACCOUNTING_RESULT_LOSS=نتيجة حساب المحاسبي (الخسارة)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=دقتر الإغلاق
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
-TransitionalAccount=Transitional bank transfer account
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=حساب التحويل البنكي الانتقالي
+TransitionalAccount=حساب التحويل البنكي الانتقالي
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+ACCOUNTING_ACCOUNT_SUSPENSE=حساب الانتظار
+DONATION_ACCOUNTINGACCOUNT=حساب تسجيل التبرعات
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=حساب تسجيل الاشتراكات
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=حساب افتراضي لتسجيل إيداع العميل
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=حساب افتراضي للمنتجات المشتراة (يستخدم إذا لم يتم تحديده في ورقة المنتج)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=حساب افتراضي للمنتجات المشتراة في الاتحاد الاوروبي (يستخدم إذا لم يتم تحديده في ورقة المنتج)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=حساب افتراضي للمنتجات المشتراة والمستوردة من الاتحاد الاوروبي (تُستخدم إذا لم يتم تحديدها في ورقة المنتج)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=حساب افتراضي للمنتجات المباعة (يستخدم إذا لم يتم تحديده في ورقة المنتج)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=حساب افتراضي للمنتجات المباعة في الاتحاد الاوروبي (مستخدم إذا لم يتم تحديده في ورقة المنتج)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=حساب افتراضي للمنتجات المباعة والمصدرة من الاتحاد الاوروبي (تُستخدم إذا لم يتم تحديدها في ورقة المنتج)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=حساب افتراضي للخدمات المشتراة (يُستخدم إذا لم يتم تحديده في ورقة الخدمة)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=حساب افتراضي للخدمات المشتراة في الاتحاد الاوروبي (يستخدم إذا لم يتم تحديده في ورقة الخدمة)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=حساب افتراضي للخدمات المشتراة والمستوردة من الاتحاد الاوروبي (تُستخدم إذا لم يتم تحديدها في ورقة الخدمة)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=حساب افتراضي للخدمات المباعة (يُستخدم إذا لم يتم تحديده في ورقة الخدمة)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=حساب افتراضي للخدمات المباعة في الاتحاد الاوروبي (يُستخدم إذا لم يتم تحديده في ورقة الخدمة)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=حساب افتراضي للخدمات المباعة والمصدرة من الاتحاد الاوروبي (تُستخدم إذا لم يتم تحديدها في ورقة الخدمة)
 
 Doctype=نوع الوثيقة
 Docdate=التاريخ
 Docref=مرجع
-LabelAccount=حساب التسمية
+LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+Sens=الاتجاه
+AccountingDirectionHelp=بالنسبة لحساب عميل ، استخدم الائتمان لتسجيل دفعة تلقيتها <br> بالنسبة لحساب مورد ، استخدم الخصم لتسجيل دفعة تقوم بها
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=دفتر اليومية
-JournalLabel=Journal label
+JournalLabel=اسم دفتر اليومية
 NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
-ByAccounts=By accounts
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
+TransactionNumShort=رقم. العملية
+AccountingCategory=Custom group
+GroupByAccountAccounting=تجميع حسب حساب دفتر الأستاذ العام
+GroupBySubAccountAccounting=تجميع حسب حساب دفتر الأستاذ الفرعي
+AccountingAccountGroupsDesc=يمكنك هنا تحديد بعض مجموعات الحساب. سيتم استخدامها لتقارير المحاسبة الشخصية.
+ByAccounts=حسب الحسابات
+ByPredefinedAccountGroups=من خلال مجموعات محددة مسبقًا
+ByPersonalizedAccountGroups=بواسطة مجموعات شخصية
 ByYear=بحلول العام
 NotMatch=Not Set
-DeleteMvt=Delete some operation lines from accounting
-DelMonth=Month to delete
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
+DeleteMvt=حذف بعض بنود العمليات من المحاسبة
+DelMonth=شهر للحذف
+DelYear=السنة للحذف
+DelJournal=دفتر يومية للحذف
+ConfirmDeleteMvt=سيؤدي هذا إلى حذف جميع بنود العمليات المحاسبية للسنة / الشهر و / أو يوميات معينة (يفضل معيار واحد على الأقل). سيتعين عليك إعادة استخدام الميزة "%s" لاستعادة السجل المحذوف في دفتر الأستاذ.
+ConfirmDeleteMvtPartial=سيؤدي هذا إلى حذف المعاملة من المحاسبة (سيتم حذف جميع بنود العمليات المتعلقة بنفس المعاملة)
 FinanceJournal=دفتر المالية اليومي
-ExpenseReportsJournal=Expense reports journal
+ExpenseReportsJournal=دفتر تقارير المصاريف
 DescFinanceJournal=دفتر المالية اليومي المتضمن لجميع الدفعات عن طريق الحساب المصرفي
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
+DescJournalOnlyBindedVisible=هذه طريقة عرض للسجل مرتبطة بالحساب ويمكن تسجيلها في دفتر اليوميات و الأستاذ.
+VATAccountNotDefined=حساب ضريبة القيمة المضافة غير محدد
+ThirdpartyAccountNotDefined=حساب لطرف ثالث غير محدد
+ProductAccountNotDefined=حساب للمنتج غير محدد
+FeeAccountNotDefined=حساب الرسوم غير محدد
+BankAccountNotDefined=حساب للبنك غير محدد
 CustomerInvoicePayment=دفعة فاتورة العميل
-ThirdPartyAccount=Third-party account
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
+ThirdPartyAccount=حساب طرف ثالث
+NewAccountingMvt=عملية جديدة
+NumMvts=رقم العملية
+ListeMvts=قائمة الحركات
 ErrorDebitCredit=الدائن والمدين لا يمكن أن يكون لهم قيمة في الوقت نفسه
-AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=List third-party account
-DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+AddCompteFromBK=اضافة حسابات للمجموعة
+ReportThirdParty=قائمة حساب الطرف الثالث
+DescThirdPartyReport=راجع هنا قائمة العملاء والموردين وحساباتهم 
 ListAccounts=قائمة الحسابات المحاسبية
-UnknownAccountForThirdparty=Unknown third-party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
-PaymentsNotLinkedToProduct=Payment not linked to any product / service
-OpeningBalance=Opening balance
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by level
+UnknownAccountForThirdparty=حساب طرف ثالث غير معروف. سوف نستخدم %s
+UnknownAccountForThirdpartyBlocking=حساب طرف ثالث غير معروف. خطأ في المنع
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=حساب طرف ثالث غير محدد أو طرف ثالث غير معروف. سوف نستخدم %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=طرف ثالث غير معروف ودفتر الأستاذ الفرعي غير محدد في الدفعة. سنبقي قيمة حساب دفتر الأستاذ الفرعي فارغة.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=حساب طرف ثالث غير محدد أو طرف ثالث غير معروف. خطأ في المنع.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=حساب طرف ثالث وحساب قيد الانتظار غير معرّفين. خطأ في المنع
+PaymentsNotLinkedToProduct=الدفع غير مرتبط بأي منتج / خدمة
+OpeningBalance=الرصيد الافتتاحي
+ShowOpeningBalance=عرض الرصيد الافتتاحي
+HideOpeningBalance=إخفاء الرصيد الافتتاحي
+ShowSubtotalByGroup=عرض المجموع الفرعي حسب المستوى
 
-Pcgtype=Group of account
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+Pcgtype=مجموعة الحساب
+PcgtypeDesc=تُستخدم مجموعة الحسابات كمعايير "تصفية" و "تجميع" محددة مسبقًا لبعض التقارير المحاسبية. على سبيل المثال ، يتم استخدام "الدخل" أو "المصاريف" كمجموعات لحسابات المنتجات لإنشاء تقرير المصاريف / الدخل.
 
-Reconcilable=Reconcilable
+Reconcilable=قابل للتسوية
 
 TotalVente=المبيعات الإجمالية قبل الضريبة
 TotalMarge=إجمالي هامش المبيعات
 
-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=راجع هنا قائمة بنود فاتورة العميل المرتبطة (أو غير المرتبطة) بحساب المنتج
+DescVentilMore=في معظم الحالات ، إذا كنت تستخدم منتجات أو خدمات محددة مسبقًا وقمت بتعيين رقم الحساب على بطاقة المنتج / الخدمة ، فسيكون التطبيق قادرًا على إجراء جميع عمليات الربط بين سطور الفاتورة وحساب مخطط الحسابات الخاص بك ، فقط بنقرة واحدة على الزر <strong> "%s" </strong>. إذا لم يتم تعيين الحساب على بطاقات المنتج / الخدمة أو إذا كان لا يزال لديك بعض الأسطر غير المرتبطة بحساب ، فسيتعين عليك إجراء ربط يدوي من القائمة "<strong> %s </strong>".
+DescVentilDoneCustomer=راجع هنا قائمة بنود فواتير العملاء وحساب منتجاتهم
+DescVentilTodoCustomer=ربط بنود الفاتورة غير المرتبطة بحساب المنتج
+ChangeAccount=قم بتغيير حساب المنتج / الخدمة للبنود المحددة باستخدام الحساب التالي:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
-DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still 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=راجع هنا قائمة بنود فاتورة المورد المرتبطة أو غير المرتبطة بعد بحساب المنتج (فقط السجل الذي لم يتم نقله بالفعل في المحاسبة سيكون مرئي)
+DescVentilDoneSupplier=راجع هنا قائمة بنود فواتير البائعين وحساباتهم
+DescVentilTodoExpenseReport=ربط بنود تقرير المصروفات غير المرتبطة بحساب الرسوم
+DescVentilExpenseReport=راجع هنا قائمة بنود تقرير المصروفات المرتبطة (أو غير المرتبطة) بحساب الرسوم
+DescVentilExpenseReportMore=إذا قمت بإعداد حساب على نوع بنود تقرير المصروفات ، فسيكون التطبيق قادرًا على إجراء جميع عمليات الربط بين بنود تقرير المصاريف الخاصة بك وحساب مخطط الحسابات الخاص بك ، بنقرة واحدة فقط على الزر <strong> "%s" </strong>. إذا لم يتم تعيين الحساب على قاموس الرسوم أو إذا كان لا يزال لديك بعض البنود غير المرتبطة بأي حساب ، فسيتعين عليك إجراء ربط يدوي من القائمة "<strong> %s </strong>".
+DescVentilDoneExpenseReport=راجع هنا قائمة بنود تقارير المصروفات وحساب رسومها
 
-Closure=Annual closure
-DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
-OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Validate movements
-DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+Closure=الإغلاق السنوي
+DescClosure=راجع هنا عدد الحركات حسب الشهر التي لم يتم اعتمادها والسنوات المالية المفتوحة
+OverviewOfMovementsNotValidated=الخطوة الاولى نظرة عامة على الحركات التي لم يتم اعتمادها. (ضروري لإغلاق السنة المالية)
+AllMovementsWereRecordedAsValidated=تم تسجيل جميع الحركات على أنها معتمدة
+NotAllMovementsCouldBeRecordedAsValidated=لا يمكن تسجيل جميع الحركات على انها معتمدة
+ValidateMovements=اعتماد الحركات
+DescValidateMovements=سيتم حظر أي تعديل أو حذف للكتابة والحروف. يجب اعتماد جميع الإدخالات الخاصة بالتمرين وإلا فلن يكون الإغلاق ممكنًا
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+ValidateHistory=ربط تلقائي
+AutomaticBindingDone=تم الربط التلقائي
 
 ErrorAccountancyCodeIsAlreadyUse=خطأ، لا يمكنك حذف هذا الحساب المحاسبي لأنه مستخدم
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
-Balancing=Balancing
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
-NoNewRecordSaved=No more record to journalize
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
-Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
-ShowTutorial=Show Tutorial
+MvtNotCorrectlyBalanced=الحركة غير متوازنة بشكل صحيح. الخصم = %s | الائتمان = %s
+Balancing=موازنة
+FicheVentilation=بطاقة مرتبطة
+GeneralLedgerIsWritten=المعاملات مكتوبة في دفتر الأستاذ
+GeneralLedgerSomeRecordWasNotRecorded=لا يمكن تسجيل بعض المعاملات. إذا لم تكن هناك رسالة خطأ أخرى ، فربما يكون ذلك بسبب تسجيلها في دفتر اليومية بالفعل.
+NoNewRecordSaved=لا مزيد من التسجيل لليوميات
+ListOfProductsWithoutAccountingAccount=قائمة المنتجات غير مرتبطة بأي حساب
+ChangeBinding=تغيير الربط
+Accounted=حسب في دفتر الأستاذ
+NotYetAccounted=لم يحسب بعد في دفتر الأستاذ
+ShowTutorial=عرض البرنامج التعليمي
 NotReconciled=لم يتم تسويتة
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=تحذير ، كل العمليات التي لم يتم تحديد حساب دفتر الأستاذ الفرعي لها تتم تصفيتها واستبعادها من طريقة العرض هذه
 
 ## Admin
-BindingOptions=Binding options
-ApplyMassCategories=Apply mass categories
-AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
-CategoryDeleted=Category for the accounting account has been removed
-AccountingJournals=Accounting journals
-AccountingJournal=Accounting journal
-NewAccountingJournal=New accounting journal
-ShowAccountingJournal=Show accounting journal
-NatureOfJournal=Nature of Journal
-AccountingJournalType1=Miscellaneous operations
+BindingOptions=خيارات الربط
+ApplyMassCategories=تطبيق فئات جماعية
+AddAccountFromBookKeepingWithNoCategories=الحساب المتاح ليس بعد في المجموعة الشخصية
+CategoryDeleted=تمت إزالة فئة الحساب
+AccountingJournals=الدفاتر المحاسبية
+AccountingJournal=دفتر المحاسبة
+NewAccountingJournal=دفتر المحاسبة جديد
+ShowAccountingJournal=عرض دفتر يومية
+NatureOfJournal=طبيعة دفتر المحاسبة
+AccountingJournalType1=عمليات متنوعة
 AccountingJournalType2=مبيعات
 AccountingJournalType3=مشتريات
 AccountingJournalType4=بنك
-AccountingJournalType5=Expenses report
-AccountingJournalType8=Inventory
+AccountingJournalType5=تقرير مصروفات
+AccountingJournalType8=المخزون
 AccountingJournalType9=Has-new
-ErrorAccountingJournalIsAlreadyUse=This journal is already use
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
-NumberOfAccountancyEntries=Number of entries
-NumberOfAccountancyMovements=Number of movements
-ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
+ErrorAccountingJournalIsAlreadyUse=هذه الدفتر مستخدم بالفعل
+AccountingAccountForSalesTaxAreDefinedInto=ملاحظة: تم تعريف حساب ضريبة المبيعات في القائمة <b> %s </b> - <b> %s </b>
+NumberOfAccountancyEntries=عدد الادخالات
+NumberOfAccountancyMovements=عدد الحركات
+ACCOUNTING_DISABLE_BINDING_ON_SALES=تعطيل الربط والتحويل في المحاسبة على المبيعات (لن يتم أخذ فواتير العميل في الاعتبار في المحاسبة)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=تعطيل الربط والتحويل في المحاسبة على المشتريات (لن يتم أخذ فواتير البائعين في الاعتبار في المحاسبة)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=تعطيل الربط والتحويل في المحاسبة على تقارير المصروفات (لن يتم أخذ تقارير المصروفات في الاعتبار في المحاسبة)
 
 ## Export
-ExportDraftJournal=Export draft journal
+ExportDraftJournal=تصدير مسودة دفتر اليومية
 Modelcsv=نموذج التصدير
 Selectmodelcsv=تحديد نموذج للتصدير
 Modelcsv_normal=تصدير كلاسيكي
@@ -343,66 +343,88 @@ Modelcsv_agiris=Export for Agiris
 Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
 Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
-Modelcsv_configurable=Export Configurable
+Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
 Modelcsv_Gestinumv5Export for Gestinum (v5)
-ChartofaccountsId=Chart of accounts Id
+ChartofaccountsId=معرف دليل الحسابات
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+InitAccountancy=المحاسبة الأولية
+InitAccountancyDesc=يمكن استخدام هذه الصفحة لتهيئة حساب المنتجات والخدمات التي ليس لها حساب محدد للمبيعات والمشتريات.
+DefaultBindingDesc=يمكن استخدام هذه الصفحة لتعيين حساب افتراضي لاستخدامه لربط سجل المعاملات حول دفع الرواتب والتبرع والضرائب وضريبة القيمة المضافة عند عدم وجود حساب محدد بالفعل.
+DefaultClosureDesc=يمكن استخدام هذه الصفحة لتعيين العوامل المستخدمة لعمليات الإغلاق المحاسبية.
 Options=الخيارات
-OptionModeProductSell=Mode sales
-OptionModeProductSellIntra=Mode sales exported in EEC
-OptionModeProductSellExport=Mode sales exported in other countries
-OptionModeProductBuy=Mode purchases
-OptionModeProductBuyIntra=Mode purchases imported in EEC
-OptionModeProductBuyExport=Mode purchased imported from other countries
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
-OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
-OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
-OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
-CleanFixHistory=Remove accounting code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
-PredefinedGroups=Predefined groups
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
-AccountRemovedFromGroup=Account removed from group
-SaleLocal=Local sale
-SaleExport=Export sale
-SaleEEC=Sale in EEC
-SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
+OptionModeProductSell=وضع المبيعات
+OptionModeProductSellIntra=وضع المبيعات المصدرة في الاتحاد الاوروبي
+OptionModeProductSellExport=وضع المبيعات المصدرة في بلدان أخرى
+OptionModeProductBuy=وضع المشتريات
+OptionModeProductBuyIntra=وضع المشتريات المستوردة في الاتحاد الاوروبي
+OptionModeProductBuyExport=وضع المشتريات المستوردة في بلدان أخرى
+OptionModeProductSellDesc=عرض جميع المنتجات مع حساب المبيعات.
+OptionModeProductSellIntraDesc=عرض جميع المنتجات مع حساب المبيعات في الاتحاد الاوروبي.
+OptionModeProductSellExportDesc=عرض جميع المنتجات مع حساب المبيعات في دول اخرى.
+OptionModeProductBuyDesc=عرض جميع المنتجات مع حساب المشتريات.
+OptionModeProductBuyIntraDesc=عرض جميع المنتجات مع حساب المشتريات في الاتحاد الاوروبي.
+OptionModeProductBuyExportDesc=عرض جميع المنتجات مع حساب المشتريات لدول اخرى.
+CleanFixHistory=قم بإزالة رمز المحاسبة من البنود الغير موجودة في مخططات الحساب
+CleanHistory=إعادة تعيين كافة الارتباطات للسنة المحددة
+PredefinedGroups=مجموعات محددة مسبقًا
+WithoutValidAccount=بدون حساب مخصص صالح
+WithValidAccount=مع حساب مخصص صالح
+ValueNotIntoChartOfAccount=هذه القيمة للحساب غير موجودة في مخطط الحساب
+AccountRemovedFromGroup=تمت إزالة الحساب من المجموعة
+SaleLocal=بيع محلي
+SaleExport=بيع تصدير
+SaleEEC=بيع في الاتحاد الاوروبي
+SaleEECWithVAT=البيع في EEC مع ضريبة القيمة المضافة ليست فارغة ، لذلك نفترض أن هذا ليس بيعًا داخل الاتحاد والحساب المقترح هو حساب المنتج القياسي.
 SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
+Range=نطاق الحساب
+Calculated=تم حسابه
 Formula=معادلة
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
-ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
-ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookeeping
-NoJournalDefined=No journal defined
-Binded=Lines bound
-ToBind=Lines to bind
-UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
+SomeMandatoryStepsOfSetupWereNotDone=لم يتم تنفيذ بعض خطوات الإعداد الإلزامية ، يرجى إكمالها
+ErrorNoAccountingCategoryForThisCountry=لا توجد مجموعة حسابات متاحة للبلد %s (انظر الصفحة الرئيسية - الإعداد - القواميس)
+ErrorInvoiceContainsLinesNotYetBounded=تحاول تسجيل بعض بنود الفاتورة <strong> %s </strong> في دفتر اليومية ، ولكن لم يتم تقييد بعض البنود الأخرى حتى الآن للحساب. تم رفض تسجيل جميع سطور الفاتورة في هذه الفاتورة.
+ErrorInvoiceContainsLinesNotYetBoundedShort=بعض البنود في الفاتورة غير مرتبطة بحساب.
+ExportNotSupported=تنسيق التصدير الذي تم إعداده غير مدعوم في هذه الصفحة
+BookeppingLineAlreayExists=البنود موجودة بالفعل في مسك الدفاتر
+NoJournalDefined=لم يتم تحديد دفتر
+Binded=البنود مرتبطة
+ToBind=بنود للربط
+UseMenuToSetBindindManualy=البنود غير مرتبطة بعد ، استخدم القائمة <a href="%s"> %s </a> لإجراء الربط يدويًا
 
 ## Import
-ImportAccountingEntries=Accounting entries
-DateExport=Date export
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
-ExpenseReportJournal=Expense Report Journal
-InventoryJournal=Inventory Journal
+ImportAccountingEntries=مداخيل حسابية
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
+DateExport=تاريخ التصدير
+WarningReportNotReliable=تحذير ، هذا التقرير لا يستند إلى دفتر الأستاذ ، لذلك لا يحتوي على معاملة تم تعديلها يدويًا في دفتر الأستاذ. إذا كان تسجيل دفتر اليومية الخاص بك محدثًا ، فسيكون عرض مسك الدفاتر أكثر دقة.
+ExpenseReportJournal=تقرير دفتر المصاريف
+InventoryJournal=دفتر الجرد
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 65d484ec842..2dabbd20959 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -1,50 +1,51 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=أساس
 Version=الإصدار
-Publisher=Publisher
+Publisher=الناشر
 VersionProgram=إصدار البرنامج
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=إصدار التثبيت الأولي
+VersionLastUpgrade=اخر نسخة محدثة
 VersionExperimental=تجريبية
 VersionDevelopment=تطويرية
 VersionUnknown=غير معروف
 VersionRecommanded=موصى بها
-FileCheck=Fileset Integrity Checks
-FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+FileCheck=عمليات التحقق من سلامة مجموعة الملفات
+FileCheckDesc=تتيح لك هذه الأداة التحقق من سلامة الملفات و إعداد التطبيق الخاص بك ، ومقارنة كل ملف بالملف الرسمي. يمكن أيضا التحقق من قيمة بعض ثوابت الإعداد. يمكنك استخدام هذه الأداة لتحديد ما إذا تم تعديل أي ملفات (على سبيل المثال بواسطة أحد المتطفلين).
+FileIntegrityIsStrictlyConformedWithReference=تكامل الملفات يتوافق بدقة مع المرجع.
+FileIntegrityIsOkButFilesWereAdded=لقد نجح فحص سلامة الملفات ، ولكن تمت إضافة بعض الملفات الجديدة.
+FileIntegritySomeFilesWereRemovedOrModified=فشل فحص سلامة الملفات. تم تعديل بعض الملفات أو إزالتها أو إضافتها.
+GlobalChecksum=تفحص نهائي عام
+MakeIntegrityAnalysisFrom=إجراء تحليل سلامة لملفات التطبيق من
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=الملفات المفقودة
-FilesUpdated=الملفات التي تم تحديثها
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
+FilesMissing=ملفات مفقودة
+FilesUpdated=ملفات محدثة
+FilesModified=ملفات معدلة
+FilesAdded=ملفات مضافة
+FileCheckDolibarr=تحقق من سلامة ملفات التطبيق
+AvailableOnlyOnPackagedVersions=تواجد الملف المحلي لفحص التكامل  فقط عند تثبيت التطبيق من حزمة مرخصة
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=معالج لحفظ الجلسات
 SessionSavePath=Session save location
 PurgeSessions=إزالة الجلسات
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
+ConfirmPurgeSessions=هل تريد حقًا مسح كل الجلسات؟ سيؤدي هذا إلى قطع اتصال كل المستخدمين (باستثنائك).
+NoSessionListWithThisHandler=لا يسمح معالج حفظ الجلسة الذي تم تكوينه في PHP بسرد جميع الجلسات قيد التشغيل.
 LockNewSessions=إقفال الإتصالات الجديدة
 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=إزالة قفل الإتصال
 YourSession=الجلسة الخاصة بك
-Sessions=Users Sessions
+Sessions=جلسات المستخدمين
 WebUserGroup=خادم الويب المستخدم / المجموعة
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFile=أذونات في الملف %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
 DBSortingCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
-HostCharset=Host charset
-ClientCharset=Client charset
-ClientSortingCharset=Client collation
+HostCharset=ترميز المضيف
+ClientCharset=ترميز العميل
+ClientSortingCharset=ترتيب العميل
 WarningModuleNotActive=يجب أن يكون النموذج <b>%s</b> مفعل
 WarningOnlyPermissionOfActivatedModules=فقط التصاريح المتعلقة بالنماذج المنشطة تظهر هنا. يمكنك تفعيل نماذج أخرى في الصفحة الرئيسية-> لإعداد ت-> صفحة النماذج
 DolibarrSetup=تركيب أو تحديث دوليبار
@@ -54,7 +55,7 @@ InternalUsers=مستخدمين داخليين
 ExternalUsers=مستخدمين خارجيين
 GUISetup=العرض
 SetupArea=التثبيت
-UploadNewTemplate=Upload new template(s)
+UploadNewTemplate=تحميل قالب جديد
 FormToTestFileUploadForm=نموذج لاختبار تحميل ملف (وفقا لبرنامج الإعداد)
 ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
 ModuleIsEnabled=The module/application <b>%s</b> has been enabled
@@ -62,7 +63,8 @@ IfModuleEnabled=ملاحظة : نعم فعالة فقط في حال كان ال
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=الإعداد الأمني
-SecurityFilesDesc=Define here options related to security about uploading files.
+PHPSetup=PHP setup
+SecurityFilesDesc=حدد هنا الخيارات المتعلقة بالأمان حول تحميل الملفات.
 ErrorModuleRequirePHPVersion=خطأ ، هذا النموذج يتطلب نسخة بي إتش بي %s أو أعلى
 ErrorModuleRequireDolibarrVersion=خطأ ، هذا النموذج يتطلب نسخة دوليبار %s أو أعلى
 ErrorDecimalLargerThanAreForbidden=خطأ, برنامج دوليبار <b>%s</b> الحالي لا يدعم دقة أعلى من الحالية
@@ -71,10 +73,10 @@ Dictionary=قواميس
 ErrorReservedTypeSystemSystemAuto=القيمة 'system' و 'systemauto' لهذا النوع محفوظ. يمكنك إستخدام 'user' كقيمة لإضافة السجل الخاص بك
 ErrorCodeCantContainZero=الكود لا يمكن أن يحتوي على القيمة 0
 DisableJavascript=تعطيل عمليات الجافا و الأجاكس
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=ملاحظة: لغرض الاختبار أو التصحيح. لتحسين أداء الشخص المكفوف أو المتصفحات النصية ، قد تفضل استخدام الإعداد في ملف تعريف المستخدم
 UseSearchToSelectCompanyTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع COMPANY_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 UseSearchToSelectContactTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع CONTACT_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
-DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
+DelaiedFullListToSelectCompany=انتظر حتى يتم الضغط على مفتاح قبل تحميل محتوى قائمة التحرير والسرد الخاصة بالأطراف الثالثة ، <br> قد يؤدي ذلك إلى زيادة الأداء إذا كان لديك عدد كبير من الأطراف الثالثة ، ولكنه أقل ملاءمة.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
@@ -84,7 +86,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=الجافا سكربت معطل
 UsePreviewTabs=إستخدم زر المعاينة
 ShowPreview=آظهر المعاينة
-ShowHideDetails=Show-Hide details
+ShowHideDetails=عرض-إخفاء التفاصيل
 PreviewNotAvailable=المعاينة غير متاحة
 ThemeCurrentlyActive=الثيم النشط حالياً
 MySQLTimeZone=والوقت مسقل (قاعدة بيانات)
@@ -97,7 +99,7 @@ Mask=القناع
 NextValue=القيمة التالية
 NextValueForInvoices=القيمة التالية (الفواتير)
 NextValueForCreditNotes=القيمة التالية (ملاحظات دائن)
-NextValueForDeposit=Next value (down payment)
+NextValueForDeposit=القيمة التالية (دفعة أولى)
 NextValueForReplacements=القيمة التالية (استبدال)
 MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
 NoMaxSizeByPHPLimit=ملاحظة : لم يتم وضح حد في إعدادات الـ PHP الخاص بك
@@ -109,24 +111,24 @@ AntiVirusParam= المزيد من الصلاحيات بإستخدام command li
 AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=نموذج وحدة المحاسبة
 UserSetup=إعداد مستخدم الإدارة
-MultiCurrencySetup=Multi-currency setup
+MultiCurrencySetup=إعدادات تعدد العملات
 MenuLimits=الحدود و الدقة
 MenuIdParent=رمز القائمة العليا
 DetailMenuIdParent=رمز القائمة العليا (فراغ للقائمة العليا)
 DetailPosition=رتب الرقم لتعريف موقع القائمة
 AllMenus=الكل
-NotConfigured=Module/Application not configured
+NotConfigured=الوحدة النمطية | التطبيق غير مهيأ
 Active=نشطة
 SetupShort=الإعداد
 OtherOptions=الخيارات الأخرى
-OtherSetup=Other Setup
+OtherSetup=إعدادات آخرى
 CurrentValueSeparatorDecimal=الفاصلة العشرية
 CurrentValueSeparatorThousand=ألفاصلة الألفية
 Destination=المقصد
-IdModule=ID حدة
+IdModule=معرف الوحدة
 IdPermissions=ضوابط ID
 LanguageBrowserParameter=الوحدة %s
-LocalisationDolibarrParameters=Localization parameters
+LocalisationDolibarrParameters=عوامل محلية او مناطقية
 ClientTZ=المنطقة الزمنية للعميل (المستخدم)
 ClientHour=وقت العميل (المستخدم)
 OSTZ=OS المنطقة الزمنية الخادم
@@ -134,27 +136,27 @@ PHPTZ=المنطقة الزمنية خادم PHP
 DaylingSavingTime=التوقيت الصيفي
 CurrentHour=PHP خادم ساعة
 CurrentSessionTimeOut=إنتها مدة التصفح الحالية
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
-HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+YouCanEditPHPTZ=لتعيين منطقة زمنية مختلفة لـ PHP (غير مطلوب) ، يمكنك محاولة إضافة ملف .htaccess مع سطر مثل "SetEnv TZ Europe / Paris"
+HoursOnThisPageAreOnServerTZ=تحذير ، على عكس الشاشات الأخرى ، فإن الساعات على هذه الصفحة ليست بتوقيتك المحلي ، ولكن حسب المنطقة الزمنية للخادم.
 Box=Widget
 Boxes=Widgets
-MaxNbOfLinesForBoxes=Max. number of lines for widgets
-AllWidgetsWereEnabled=All available widgets are enabled
+MaxNbOfLinesForBoxes=الحد الأعلى لعدد الأسطر (widgets)
+AllWidgetsWereEnabled=تم تمكين جميع (widgets)المتاحة
 PositionByDefault=الطلبية الإفتراضية
 Position=الوضع
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+MenusDesc=يقوم مديرو القائمة بتعيين محتوى شريطي القائمة (الأفقي والعمودي).
 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=قائمة للمستخدمين
 LangFile=ملف لانج
-Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+Language_en_US_es_MX_etc=اللغة (en_US، es_MX، ...)
 System=النظام
 SystemInfo=نظام المعلومات
 SystemToolsArea=منظقة أدوات نظام
-SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+SystemToolsAreaDesc=هذه المنطقة توفر مميزات إدارية. استخدام القائمة لاختيار الخصائص التي تبحث عنها.
 Purge=أحذف
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
+PurgeAreaDesc=تسمح لك هذه الصفحة بحذف كل الملفات التي بنيت أو تم تخزينها بواسطة دوليبار (الملفات المؤقتة ، أو كافة الملفات في المجلد <b>%s</b>) استخدام هذه الميزة ليست ضرورية. هذه الخدمة مقدمة للمستخدمين الذين يستخدمون برنامج دوليبار على خادم لا يوفر لهم صلاحيات حذف الملفات التي أنشئت من قبل خادم الويب.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=إحذف الآن
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=على تفعيل
 ActiveOn=على تفعيلها
+ActivatableOn=Activatable on
 SourceFile=ملف المصدر
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=متاحا إلا إذا كان جافا سكريبت غير المعوقين
 Required=مطلوب
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=جميع الشخصيات الاخرى في قناع سوف تظل سليمة. <br> المساحات غير مسموح بها. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 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>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -533,14 +537,16 @@ Module22Name=Mass Emailings
 Module22Desc=Manage bulk emailing
 Module23Name=طاقة
 Module23Desc=مراقبة استهلاك الطاقة
-Module25Name=Sales Orders
+Module25Name=اوامر البيع
 Module25Desc=Sales order management
 Module30Name=فواتير
 Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
-Module40Name=Vendors
+Module40Name=الموردين
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=المحررين
 Module49Desc=المحررين إدارة
 Module50Name=المنتجات
@@ -555,7 +561,7 @@ Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcodes إدارة
-Module56Name=Payment by credit transfer
+Module56Name=الدفع عن طريق تحويل من الرصيد
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
@@ -639,13 +645,15 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP التحويلات Maxmind القدرات
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=شركة متعددة
 Module5000Desc=يسمح لك لإدارة الشركات المتعددة
-Module6000Name=سير العمل
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
-Module10000Name=Websites
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module10000Name=مواقع الويب
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
 Module20000Desc=Define and track employee leave requests
@@ -805,7 +813,8 @@ PermissionAdvanced253=إنشاء / تعديل المستخدمين خارجي /
 Permission254=حذف أو تعطيل المستخدمين الآخرين
 Permission255=إنشاء / تعديل بلده معلومات المستخدم
 Permission256=تعديل بنفسه كلمة المرور
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=قراءة في كاليفورنيا
 Permission272=قراءة الفواتير
 Permission273=قضية الفواتير
@@ -1007,7 +1016,7 @@ DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=أسعار الضريبة على القيمة المضافة أو ضريبة المبيعات الاسعار
 DictionaryRevenueStamp=Amount of tax stamps
-DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentConditions=شروط السداد
 DictionaryPaymentModes=Payment Modes
 DictionaryTypeContact=الاتصال / أنواع العناوين
 DictionaryTypeOfContainer=Website - Type of website pages/containers
@@ -1116,7 +1125,7 @@ Host=الخادم
 DriverType=سائق نوع
 SummarySystem=نظام معلومات موجزة
 SummaryConst=قائمة بجميع Dolibarr الإعداد البارامترات
-MenuCompanySetup=Company/Organization
+MenuCompanySetup=الشركة | المؤسسة
 DefaultMenuManager= معيار مدير القائمة
 DefaultMenuSmartphoneManager=الهاتف الذكي القائمة مدير
 Skin=موضوع الجلد
@@ -1132,7 +1141,7 @@ PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليم
 DefaultLanguage=Default language
 EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
-CompanyInfo=Company/Organization
+CompanyInfo=الشركة | المؤسسة
 CompanyIds=Company/Organization identities
 CompanyName=اسم
 CompanyAddress=عنوان
@@ -1171,44 +1180,45 @@ Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
 Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
 Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
 SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
-SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=مراجعة الحسابات الأحداث الأمنية
+SetupDescription2=القسمان التاليان إلزاميان (المدخلان الأولان في قائمة الإعداد):
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> تُستخدم المعطيات الأساسية لتخصيص السلوك الافتراضي لتطبيقك (على سبيل المثال للميزات المتعلقة بالبلد).
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> هذا البرنامج عبارة عن مجموعة من العديد من الوحدات  |  التطبيقات. يجب تمكين وتكوين الوحدات النمطية التى تحتاجها. ستظهر فى القائمة بعد تمكين هذه الوحدات.
+SetupDescription5=قائمة الإعدادات الأخرى تقوم بإدارة المعطيات الاختيارية.
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=المراجعة
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
+InfoDolibarr=حول دوليبار
+InfoBrowser=حول المتصفح
 InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-InfoSecurity=About Security
+InfoWebServer=حول خادم الويب
+InfoDatabase=حول قاعدة البيانات
+InfoPHP=حول PHP
+InfoPerf=حول الأداء
+InfoSecurity=حول الأمن
 BrowserName=اسم المتصفح
 BrowserOS=متصفح OS
-ListOfSecurityEvents=قائمة الأحداث الأمنية Dolibarr
-SecurityEventsPurged=تطهير الاحداث الامنية
-LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
-AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
-SystemInfoDesc=نظام المعلومات المتنوعة المعلومات التقنية تحصل في قراءة فقط وواضحة للمشرفين فقط.
-SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+ListOfSecurityEvents=قائمة الأحداث الأمنية لدوليبار
+SecurityEventsPurged=تم إزالة الأحداث الأمنية
+LogEventDesc=تمكين التسجيل لأحداث أمنية محددة. تسجيل المسؤولين عبر القائمة <b> %s - %s </b>. تحذير ، يمكن لهذه الميزة إنشاء كمية كبيرة من البيانات في قاعدة البيانات.
+AreaForAdminOnly=يمكن تعيين معطيات الإعدادات بواسطة المستخدم المسؤول <b> </b> فقط.
+SystemInfoDesc=معلومات النظام هي معلومات فنية متنوعة تحصل عليها في وضع القراءة فقط وتكون مرئية للمسؤولين فقط.
+SystemAreaForAdminOnly=هذه المنطقة متاحة للمستخدمين المسؤولين فقط. لا يمكن لأذونات مستخدم دوليبار تغيير هذا التقييد.
+CompanyFundationDesc=قم بتحرير معلومات شركتك | مؤسستك. ثم انقر فوق الزر "%s" في أسفل الصفحة عند الانتهاء.
 AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
-ToActivateModule=لتفعيل وحدات ، على الإعداد منطقة الصفحة الرئيسية&gt; الإعداد -> الوحدات).
-SessionTimeOut=للمرة الخمسين
+ToActivateModule=لتنشيط الوحدات ، انتقل إلى منطقة الإعدادات (الصفحة الرئيسية-> الإعدادات-> الوحدات النمطية).
+SessionTimeOut=نفذ وقت الجلسة
 SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
 SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
 TriggersAvailable=محفزات متاحة
 TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=يطلق في هذا الملف من قبل المعوقين لاحقة بين <b>NORUN</b> باسمهم.
-TriggerDisabledAsModuleDisabled=يتسبب في تعطيل هذه الصورة هي وحدة قياسية <b>٪ ق</b> معوقا.
-TriggerAlwaysActive=يطلق في هذا الملف هي حركة دائمة ، وتفعيل ما هي وحدات Dolibarr.
-TriggerActiveAsModuleActive=يطلق في هذا الملف كما ينشط حدة تمكين <b>٪ ق.</b>
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+TriggerDisabledByName=يتم تعطيل المشغلات الموجودة في هذا الملف بواسطة اللاحقة <b> -NORUN </b> في أسمائها.
+TriggerDisabledAsModuleDisabled=المشغلات في هذا الملف معطلة لأن الوحدة النمطية <b> %s </b> معطلة.
+TriggerAlwaysActive=المشغلات في هذا الملف نشطة دائمًا ، مهما كانت وحدات دوليبار النشطة.
+TriggerActiveAsModuleActive=المشغلات في هذا الملف نشطة حيث تم تمكين الوحدة النمطية <b> %s </b>.
+GeneratedPasswordDesc=اختر الطريقة التي سيتم استخدامها لكلمات المرور التي يتم إنشاؤها تلقائيًا.
 DictionaryDesc=Insert all reference data. You can add your values to the default.
 ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
 MiscellaneousDesc=All other security related parameters are defined here.
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=يجب تشغيل هذا الأمر من سطر الأوامر بعد تسجيل الدخول إلى قذيفة مع <b>المستخدم %s </b> أو يجب عليك إضافة خيار -w في نهاية سطر الأوامر <b>لتوفير %s </b> كلمة المرور.
 YourPHPDoesNotHaveSSLSupport=وظائف خدمة تصميم المواقع لا تتوفر في بي الخاص بك
 DownloadMoreSkins=مزيد من جلود بتحميل
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=ترجمة جزئية
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=تكميلية سمات
 ExtraFieldsLines=سمات التكميلية (خطوط)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1374,7 +1384,7 @@ SuggestPaymentByChequeToAddress=Suggest payment by check to
 FreeLegalTextOnInvoices=نص حر على الفواتير
 WatermarkOnDraftInvoices=العلامة المائية على مشروع الفواتير (أي إذا فارغ)
 PaymentsNumberingModule=المدفوعات نموذج الترقيم
-SuppliersPayment=Vendor payments
+SuppliersPayment=مدفوعات الموردين
 SupplierPaymentSetup=Vendor payments setup
 ##### Proposals #####
 PropalSetup=وحدة إعداد مقترحات تجارية
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=ادخل (يونكس)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=البحث عن مرشح
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=ادخل (سامبا ، activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=الاسم الكامل
@@ -1546,7 +1557,7 @@ LDAPFieldCompanyExample=Example: o
 LDAPFieldSid=سيد
 LDAPFieldSidExample=Example: objectsid
 LDAPFieldEndLastSubscription=تاريخ انتهاء الاكتتاب
-LDAPFieldTitle=Job position
+LDAPFieldTitle=الوظيفه
 LDAPFieldTitleExample=مثال: اللقب
 LDAPFieldGroupid=Group id
 LDAPFieldGroupidExample=Exemple : gidnumber
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=حساب بيع. رمز
 AccountancyCodeBuy=شراء الحساب. رمز
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=جدول الأعمال وحدة الإعداد
 PasswordTogetVCalExport=مفتاح ربط تصدير تأذن
+SecurityKey = Security Key
 PastDelayVCalExport=لا تصدر الحدث الأكبر من
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=لون الخلفية لخطوط الجدول غري
 BackgroundTableLineEvenColor=لون الخلفية حتى خطوط الجدول
 MinimumNoticePeriod=الحد الأدنى لمدة إشعار (يجب أن يتم طلب إجازة قبل هذا التأخير)
 NbAddedAutomatically=عدد الأيام تضاف إلى العدادات من المستخدمين (تلقائيا) كل شهر
-EnterAnyCode=يحتوي هذا الحقل على إشارة لتحديد الخط. أدخل أي قيمة من اختيارك، ولكن من دون أحرف خاصة.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1902,20 +1915,20 @@ ExpectedSize=Expected size
 CurrentSize=Current size
 ForcedConstants=Required constant values
 MailToSendProposal=مقترحات العملاء
-MailToSendOrder=Sales orders
+MailToSendOrder=اوامر المبيعات
 MailToSendInvoice=فواتير العملاء
 MailToSendShipment=شحنات
 MailToSendIntervention=التدخلات
 MailToSendSupplierRequestForQuotation=Quotation request
-MailToSendSupplierOrder=Purchase orders
-MailToSendSupplierInvoice=Vendor invoices
+MailToSendSupplierOrder=اوامر الشراء
+MailToSendSupplierInvoice=فواتير الموردين
 MailToSendContract=عقود
 MailToSendReception=Receptions
 MailToThirdparty=أطراف ثالثة
 MailToMember=أعضاء
 MailToUser=المستخدمين
 MailToProject=مشاريع
-MailToTicket=Tickets
+MailToTicket=تذاكر
 ByDefaultInList=تظهر بشكل افتراضي على عرض القائمة
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=مثال على رسالة يمكنك استخدامها ليعلن هذا الإصدار الرئيسي (لا تتردد في استخدامها على مواقع الويب الخاص بك)
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index 93d286a4a27..dec71e2691c 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=البنك
-MenuBankCash=Banks | Cash
+MenuBankCash=البنوك | النقد
 MenuVariousPayment=مدفوعات متنوعة
 MenuNewVariousPayment=مدفوعات متنوعة جديدة
 BankName=اسم المصرف
 FinancialAccount=الحساب
 BankAccount=الحساب المصرفي
 BankAccounts=الحسابات المصرفية
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=حسابات بنكية | بوابات
 ShowAccount=عرض الحساب
 AccountRef=مرجع الحساب المالي
-AccountLabel=بطاقة الحساب المالي
+AccountLabel=تسمية الحساب المالي
 CashAccount=الحساب النقدي
 CashAccounts=حسابات نقدية
 CurrentAccounts=الحسابات الجارية
 SavingAccounts=حسابات التوفير
-ErrorBankLabelAlreadyExists=بطاقة الحساب المالي موجوده بالفعل
-BankBalance=التوازن
+ErrorBankLabelAlreadyExists=اسم الحساب المالي موجود بالفعل
+BankBalance=الميزانية
 BankBalanceBefore=الرصيد قبل
 BankBalanceAfter=الرصيد بعد
 BalanceMinimalAllowed=الحد الأدنى المسموح من الرصيد
@@ -24,32 +24,32 @@ BalanceMinimalDesired=الحد الأدنى المطلوب من الرصيد
 InitialBankBalance=الرصيد الأولي
 EndBankBalance=الرصيد النهائي
 CurrentBalance=الرصيد الحالي
-FutureBalance=التوازن في المستقبل
+FutureBalance=الميزانية المستقبلة
 ShowAllTimeBalance=عرض الرصيد من البداية
 AllTime=من البداية
 Reconciliation=التسوية
 RIB=رقم الحساب المصرفي
-IBAN=عدد إيبان
-BIC=BIC/SWIFT code
+IBAN=رقم الآيبان
+BIC=رمز BIC / SWIFT
 SwiftValid=بيك / سويفت صالحة
 SwiftVNotalid=بيك / سويفت غير صالح
 IbanValid=بان صالحة
 IbanNotValid=بان غير صالح
-StandingOrders=Direct debit orders
+StandingOrders=أوامر الخصم المباشر
 StandingOrder=أمر الخصم المباشر
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByDirectDebit=الدفع عن طريق الخصم المباشر
+PaymentByBankTransfers=المدفوعات عن طريق تحويل الائتمان
+PaymentByBankTransfer=الدفع عن طريق تحويل من الرصيد
 AccountStatement=كشف الحساب
 AccountStatementShort=بيان
 AccountStatements=كشوفات الحساب
 LastAccountStatements=كشوفات الحساب الأخيرة
 IOMonthlyReporting=تقارير شهرية
-BankAccountDomiciliation=Bank address
-BankAccountCountry=بلد حساب
+BankAccountDomiciliation=عنوان البنك
+BankAccountCountry=بلد الحساب
 BankAccountOwner=اسم صاحب الحساب
-BankAccountOwnerAddress=عنوان مالك الحساب
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+BankAccountOwnerAddress=عنوان صاحب الحساب
+RIBControlError=فشل التحقق من سلامة القيم. هذا يعني أن المعلومات الخاصة برقم الحساب هذا ليست كاملة أو غير صحيحة (تحقق من الدولة والأرقام و IBAN).
 CreateAccount=إنشاء حساب
 NewBankAccount=حساب جديد
 NewFinancialAccount=حساب مالي جديد
@@ -57,7 +57,7 @@ MenuNewFinancialAccount=حساب مالي جديد
 EditFinancialAccount=تعديل الحساب
 LabelBankCashAccount=بطاقة مصرفية أو نقدية
 AccountType=نوع الحساب
-BankType0=حساب توفير
+BankType0=حساب التوفير
 BankType1=الحساب الجاري او حساب بطاقة الائتمان
 BankType2=الحساب النقدي
 AccountsArea=منطقة الحسابات
@@ -76,11 +76,11 @@ BankTransaction=قيد بنكي
 ListTransactions=قائمة القيود
 ListTransactionsByCategory=قائمةالقيود/الفئات
 TransactionsToConciliate=قيود للتسويات
-TransactionsToConciliateShort=To reconcile
+TransactionsToConciliateShort=للتسوية
 Conciliable=يمكن أن يتم تسويتة
 Conciliate=التسوية
 Conciliation=تسوية
-SaveStatementOnly=Save statement only
+SaveStatementOnly=حفظ البيان فقط
 ReconciliationLate=التسوية في وقت متأخر
 IncludeClosedAccount=وتشمل حسابات مغلقة
 OnlyOpenedAccount=الحسابات المفتوحة فقط
@@ -98,18 +98,18 @@ AddBankRecordLong=إضافة قيد يدوي
 Conciliated=تمت تسويتة
 ConciliatedBy=تمت التسوية بواسطة
 DateConciliating=تاريخ التسوية
-BankLineConciliated=Entry reconciled with bank receipt
+BankLineConciliated=تمت تسوية القيدمع إيصال البنك
 Reconciled=تمت تسويتة
 NotReconciled=لم يتم تسويتة
 CustomerInvoicePayment=مدفوعات العميل
-SupplierInvoicePayment=Vendor payment
+SupplierInvoicePayment=دفعة المورد
 SubscriptionPayment=دفع الاشتراك
-WithdrawalPayment=Debit payment order
+WithdrawalPayment=أمر دفع مدين
 SocialContributionPayment=مدفوعات الضرائب الاجتماعية / المالية
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=تحويل الرصيد
+BankTransfers=تحويلات الرصيد
 MenuBankInternalTransfer=حوالة داخلية
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=التحويل من حساب إلى آخر ، ستكتب Dolibarr سجلين (خصم في حساب المصدر وائتمان في الحساب الهدف). سيتم استخدام نفس المبلغ (باستثناء العلامة) والملصق والتاريخ لهذه المعاملة)
 TransferFrom=من
 TransferTo=إلى
 TransferFromToDone=التحويل من <b>%s</b>إلى <b>%s</b>من <b>%s</b>%s قد تم تسجيلة.
@@ -122,7 +122,7 @@ BankChecks=الشيكات المصرفية
 BankChecksToReceipt=شيكات في انتظار الإيداع
 BankChecksToReceiptShort=شيكات في انتظار الإيداع
 ShowCheckReceipt=عرض إيصال إيداع شيكات
-NumberOfCheques=No. of check
+NumberOfCheques=رقم الشيك
 DeleteTransaction=حذف المعاملة
 ConfirmDeleteTransaction=هل تريد بالتأكيد حذف هذه المعاملة؟
 ThisWillAlsoDeleteBankRecord=سيؤدي هذا أيضا إلى حذف القيد البنكي الذي تم إنشاؤه
@@ -138,11 +138,11 @@ PaymentDateUpdateSucceeded=تم تحديث تاريخ الدفع بنجاح
 PaymentDateUpdateFailed=تعذر تحديث تاريخ الدفع
 Transactions=المعاملات
 BankTransactionLine=قيد البنك
-AllAccounts=All bank and cash accounts
+AllAccounts=جميع الحسابات المصرفية والنقدية
 BackToAccount=عودة إلى الحساب
 ShowAllAccounts=عرض لجميع الحسابات
-FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+FutureTransaction=الصفقة المستقبلية. غير قادر على التسوية.
+SelectChequeTransactionAndGenerate=حدد / تصفية الشيكات لتضمينها في إيصال إيداع الشيك وانقر على "إنشاء".
 InputReceiptNumber=اختيار كشف الحساب البنكي ذات الصلة مع التسوية. استخدام قيمة رقمية للفرز: شهر سنة أو يوم شهر سنة
 EventualyAddCategory=في نهاية المطاف، حدد الفئة التي لتصنيف السجلات
 ToConciliate=للتسوية؟
@@ -157,27 +157,28 @@ RejectCheck=تم إرجاع الشيك
 ConfirmRejectCheck=هل انت متأكد انك تريد وضع علامة على هذا الشيك على أنه مرفوض؟
 RejectCheckDate=تاريخ إرجاع الشيك
 CheckRejected=تم إرجاع الشيك
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+CheckRejectedAndInvoicesReopened=تم إرجاع الشيكات وإعادة فتح الفواتير
 BankAccountModelModule=نماذج مستندات للحسابات البنكية
 DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
 DocumentModelBan=نموذج لطباعة صفحة تحتوي على معلومات BAN .
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
+NewVariousPayment=دفعة متنوعة جديدة
+VariousPayment=مدفوعات متنوعة
 VariousPayments=مدفوعات متنوعة
-ShowVariousPayment=Show miscellaneous payment
-AddVariousPayment=Add miscellaneous payment
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+ShowVariousPayment=عرض المدفوعات المتنوعة
+AddVariousPayment=إضافة مدفوعات متنوعة
+VariousPaymentId=معرف الدفع المتنوع
+VariousPaymentLabel=تسمية الدفعة المتنوعة
+ConfirmCloneVariousPayment=تأكيد استنساخ دفعة متنوعة
 SEPAMandate=SEPA mandate
 YourSEPAMandate=تفويض سيبا الخاص بك
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash desk control
-NewCashFence=New cash desk closing
-BankColorizeMovement=Colorize movements
-BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
-BankColorizeMovementName1=Background color for debit movement
-BankColorizeMovementName2=Background color for credit movement
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
+AutoReportLastAccountStatement=قم تلقائيًا بتعبئة الحقل "رقم كشف الحساب البنكي" برقم كشف الحساب الأخير عند إجراء التسوية
+CashControl=مراقبة مكتب النقدية في نقاط البيع
+NewCashFence=New cash desk opening or closing
+BankColorizeMovement=تلوين الحركات
+BankColorizeMovementDesc=إذا تم تمكين هذه الوظيفة ، يمكنك اختيار لون خلفية محدد لحركات الخصم أو الائتمان
+BankColorizeMovementName1=لون الخلفية لحركة الخصم
+BankColorizeMovementName2=لون الخلفية لحركة الائتمان
+IfYouDontReconcileDisableProperty=إذا لم تقم بإجراء التسويات البنكية على بعض الحسابات المصرفية ، فقم بتعطيل الخاصية "%s" عليها لإزالة هذا التحذير.
+NoBankAccountDefined=لم يتم تحديد حساب مصرفي
+NoRecordFoundIBankcAccount=لا يوجد سجل في الحساب المصرفي. عادةً ما يحدث هذا عندما يتم حذف سجل يدويًا من قائمة المعاملات في الحساب المصرفي (على سبيل المثال أثناء تسوية الحساب المصرفي). سبب آخر هو أنه تم تسجيل الدفعة عندما تم تعطيل الوحدة النمطية "%s".
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 9fdbdeaf15f..a82852b2eaa 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -3,16 +3,16 @@ Bill=فاتورة
 Bills=فواتير
 BillsCustomers=فواتير العملاء
 BillsCustomer=فاتورة العميل
-BillsSuppliers=Vendor invoices
-BillsCustomersUnpaid=فواتير العملاء غير المدفوعة
-BillsCustomersUnpaidForCompany=فواتير العملاء غير المدفوعة ل %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsSuppliers=فواتير الموردين
+BillsCustomersUnpaid=فواتير العميل غير المسددة
+BillsCustomersUnpaidForCompany=فواتير العميل الغير مسددة لـ %s
+BillsSuppliersUnpaid=فواتير المورد الغير مسددة
+BillsSuppliersUnpaidForCompany=فواتير المورد الغير مسددة لـ %s
 BillsLate=المدفوعات المتأخرة
 BillsStatistics=إحصاءات فواتير العملاء
-BillsStatisticsSuppliers=Vendors invoices statistics
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+BillsStatisticsSuppliers=إحصاءات فواتير الموردين
+DisabledBecauseDispatchedInBookkeeping=معطل لأنه تم إرسال الفاتورة إلى مسك الدفاتر
+DisabledBecauseNotLastInvoice=معطل لأن الفاتورة غير قابلة للحذف.  لقد تم تسجيل فواتير بعد هذه الفاتورة وسوف يؤدي ذلك إلى وجود ثقب في نظام العد.
 DisabledBecauseNotErasable=معطل لأنه لا يمكن محوه
 InvoiceStandard=الفاتورة القياسية
 InvoiceStandardAsk=الفاتورة القياسية
@@ -22,16 +22,16 @@ InvoiceDepositAsk=فاتورة الدفعة الأولى
 InvoiceDepositDesc=يتم هذا النوع من الفاتورة عند استلام دفعة أولى.
 InvoiceProForma=الفاتورة الأولية
 InvoiceProFormaAsk=الفاتورة الأولية
-InvoiceProFormaDesc=<b> الفاتورة المبدئية </b> عبارة عن صورة فاتورة حقيقية ولكنها لا تحتوي على قيمة للمحاسبة.
+InvoiceProFormaDesc=<b> الفاتورة المبدئية </b> عبارة عن صورة فاتورة حقيقية ولكنها لا تحتوي على قيمة محاسبية.
 InvoiceReplacement=استبدال الفاتورة
 InvoiceReplacementAsk=فاتورة استبدال الفاتورة
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc= <b> فاتورة الاستبدال </b> تُستخدم لاستبدال فاتورة بالكامل بدون دفعة مستلمة بالفعل. <br> <br> ملاحظة: يمكن فقط استبدال الفواتير التي لم يتم سدادها. إذا لم يتم إغلاق الفاتورة التي قمت باستبدالها بعد ، فسيتم إغلاقها تلقائيًا لتصبح "مهجورة".
 InvoiceAvoir=ملاحظة ائتمانية
 InvoiceAvoirAsk=ملاحظة ائتمانية لتصحيح الفاتورة
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
-invoiceAvoirWithLines=إنشاء الائتمان ملاحظة مع خطوط من الفاتورة الأصلية
-invoiceAvoirWithPaymentRestAmount=إنشاء الائتمان ملاحظة مع المتبقية غير المسددة من الفاتورة الأصلية
-invoiceAvoirLineWithPaymentRestAmount=ملاحظة الائتمان للبقاء المبلغ غير المدفوع
+InvoiceAvoirDesc=<b>ملاحظة الائتمان</b>   عبارة عن فاتورة سلبية تُستخدم لتصحيح حقيقة أن الفاتورة تُظهر مبلغًا يختلف عن المبلغ المدفوع بالفعل (على سبيل المثال ، دفع العميل كثيرًا عن طريق الخطأ ، أو لم يدفع المبلغ بالكامل منذ إرجاع بعض المنتجات) .
+invoiceAvoirWithLines=إنشاء اشعار دائن مع بنود من فاتورة الأصل
+invoiceAvoirWithPaymentRestAmount=إنشاء اشعار دائن مع المبلغ الغير مسدد من الفاتورة الأصلية
+invoiceAvoirLineWithPaymentRestAmount=اشعار دائن للمبلغ الغير مسدد
 ReplaceInvoice=استبدل الفاتورة %s
 ReplacementInvoice=استبدال الفاتورة
 ReplacedByInvoice=تم استبدالها بالفاتورة %s
@@ -41,9 +41,9 @@ CorrectionInvoice=تصحيح الفاتورة
 UsedByInvoice=تستخدم لدفع فاتورة %s
 ConsumedBy=يستهلكها
 NotConsumed=لا تستهلك
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=لا يوجد فواتير قابلة للاستبدال
 NoInvoiceToCorrect=لا توجد فاتورة للتصحيح
-InvoiceHasAvoir=كان مصدر لواحد أو عدة ملاحظات ائتمانيه
+InvoiceHasAvoir=كان مصدر لواحد أو عدة اشعارات بدائن
 CardBill=بطاقة الفاتورة
 PredefinedInvoices=فواتير محددة مسبقا
 Invoice=فاتورة
@@ -53,162 +53,165 @@ InvoiceLine=سطر الفاتورة
 InvoiceCustomer=فاتورة العميل
 CustomerInvoice=فاتورة العميل
 CustomersInvoices=فواتير العملاء
-SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
-SupplierBill=Vendor invoice
-SupplierBills=فواتير الموردين 
+SupplierInvoice=فاتورة مورد
+SuppliersInvoices=فواتير الموردين
+SupplierInvoiceLines=Vendor invoice lines
+SupplierBill=فاتورة مورد
+SupplierBills=فواتير الموردين
 Payment=دفعة
-PaymentBack=رد
-CustomerInvoicePaymentBack=رد
+PaymentBack=استرداد
+CustomerInvoicePaymentBack=استرداد
 Payments=المدفوعات
-PaymentsBack=Refunds
-paymentInInvoiceCurrency=in invoices currency
-PaidBack=تسديدها
+PaymentsBack=المبالغ المستردة
+paymentInInvoiceCurrency=بعملة الفواتير
+PaidBack=سدد الدين
 DeletePayment=حذف الدفعة
 ConfirmDeletePayment=هل انت متأكد انك ترغب في حذف هذه الدفعة؟
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
-SupplierPayments=Vendor payments
+ConfirmConvertToReduc=هل تريد تحويل هذا %s إلى رصيد متاح؟
+ConfirmConvertToReduc2=سيتم حفظ المبلغ بين جميع الخصومات ويمكن استخدامه كخصم لفاتورة حالية أو مستقبلية لهذا العميل.
+ConfirmConvertToReducSupplier=هل تريد تحويل هذا %s إلى رصيد متاح؟
+ConfirmConvertToReducSupplier2=سيتم حفظ المبلغ بين جميع الخصومات ويمكن استخدامه كخصم لفاتورة حالية أو مستقبلية لهذا البائع.
+SupplierPayments=مدفوعات الموردين
 ReceivedPayments=المدفوعات المستلمة
 ReceivedCustomersPayments=المدفوعات المستلمة من العملاء
-PayedSuppliersPayments=Payments paid to vendors
+PayedSuppliersPayments=المدفوعات المدفوعة للموردين
 ReceivedCustomersPaymentsToValid=تلقى مدفوعات عملاء للمصادقة
 PaymentsReportsForYear=تقارير المدفوعات لل%s
 PaymentsReports=تقارير المدفوعات
 PaymentsAlreadyDone=المدفوعات قد فعلت
-PaymentsBackAlreadyDone=Refunds already done
-PaymentRule=دفع الحكم
-PaymentMode=Payment Type
-PaymentTypeDC=Debit/Credit Card
+PaymentsBackAlreadyDone=تم رد الأموال
+PaymentRule=قاعدة الدفع
+PaymentMode=طريفة الدفع
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
+PaymentTypeDC=بطاقة الخصم / الائتمان
 PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
-PaymentAmount=دفع مبلغ
-PaymentHigherThanReminderToPay=دفع أعلى من دفع تذكرة
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+IdPaymentMode=معرف نوع السداد
+CodePaymentMode=كود نوع السداد
+LabelPaymentMode=اسم نوع السداد
+PaymentModeShort=طريفة السداد
+PaymentTerm=شروط السداد
+PaymentConditions=شروط السداد
+PaymentConditionsShort=شروط السداد
+PaymentAmount=مبلغ السداد
+PaymentHigherThanReminderToPay=الدفعة اعلى من الواجب سداده
+HelpPaymentHigherThanReminderToPay=انتبه ، مبلغ دفع فاتورة أو أكثر أعلى من المبلغ المستحق. <br> قم بتحرير المبلغ المدخل ، وإلا قم بالتأكيد وتذكر لإنشاء إشعار دائن للزيادة المستلمة لكل فاتورة زائدة.
+HelpPaymentHigherThanReminderToPaySupplier=انتبه ، مبلغ دفع فاتورة أو أكثر أعلى من المبلغ المستحق. <br> قم بتحرير المبلغ المدخل ، وإلا قم بالتأكيد وتذكر لإنشاء إشعار دائن للزيادة المستلمة لكل فاتورة زائدة.
 ClassifyPaid=تصنيف 'مدفوع'
-ClassifyUnPaid=Classify 'Unpaid'
+ClassifyUnPaid=تصنيف "غير مسدد"
 ClassifyPaidPartially=تصنيف 'مدفوع جزئيا'
-ClassifyCanceled=تصنيف 'المهجورة'
+ClassifyCanceled=تصنيف 'مهجور'
 ClassifyClosed=تصنيف 'مغلقة'
 ClassifyUnBilled=تصنيف "فواتير"
 CreateBill=إنشاء الفاتورة
-CreateCreditNote=إنشاء ملاحظة الائتمان
-AddBill=إنشاء فاتورة أو الائتمان المذكرة
+CreateCreditNote=إنشاء اشعار دائن
+AddBill=إنشاء فاتورة أو اشعار دائن
 AddToDraftInvoices=إضافة إلى مسودة الفاتورة
-DeleteBill=شطب فاتورة
-SearchACustomerInvoice=البحث عن زبون فاتورة
-SearchASupplierInvoice=Search for a vendor invoice
-CancelBill=شطب فاتورة
-SendRemindByMail=إرسال تذكرة عن طريق البريد الإلكتروني
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
-EnterPaymentReceivedFromCustomer=دخول الدفع الواردة من العملاء
-EnterPaymentDueToCustomer=من المقرر أن يسدد العميل
-DisabledBecauseRemainderToPayIsZero=تعطيل بسبب المتبقية غير المدفوعة صفر
+DeleteBill=حذف الفاتورة
+SearchACustomerInvoice=ابحث عن فاتورة العميل
+SearchASupplierInvoice=ابحث عن فاتورة مورد
+CancelBill=إلغاء فاتورة
+SendRemindByMail=إرسال تذكير عن طريق البريد الإلكتروني
+DoPayment=أدخل الدفعة
+DoPaymentBack=أدخل المبلغ المسترد
+ConvertToReduc=يعتبر  كائتمان متاح
+ConvertExcessReceivedToReduc=تحويل الفائض المستلم إلى رصيد متاح
+ConvertExcessPaidToReduc=تحويل الفائض المستلم إلى خصم متاح
+EnterPaymentReceivedFromCustomer=أدخل الدفعة المستلمة من العميل
+EnterPaymentDueToCustomer=انشاء استحقاق دفع للعميل
+DisabledBecauseRemainderToPayIsZero=معطل لأن المتبقي غير المسدد يساوي صفر
 PriceBase=سعر الأساس
 BillStatus=حالة الفاتورة
-StatusOfGeneratedInvoices=Status of generated invoices
-BillStatusDraft=مشروع (لا بد من التحقق من صحة)
-BillStatusPaid=دفع
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+StatusOfGeneratedInvoices=حالة الفواتير المنشأة
+BillStatusDraft=مسودة (يجب التحقق من صحتها)
+BillStatusPaid=سدد
+BillStatusPaidBackOrConverted=استرداد إشعار الائتمان أو وضع علامة على أنه رصيد متاح
+BillStatusConverted=مدفوعة (جاهزة للاستخدام في الفاتورة النهائية)
 BillStatusCanceled=المهجورة
-BillStatusValidated=مصادق عليه (لا بد من دفعها)
+BillStatusValidated=معتمد (واجب السداد)
 BillStatusStarted=بدأت
-BillStatusNotPaid=لم تدفع
-BillStatusNotRefunded=Not refunded
-BillStatusClosedUnpaid=مغلقة (غير مدفوعة الأجر)
-BillStatusClosedPaidPartially=دفعت (جزئيا)
+BillStatusNotPaid=غير مسدد
+BillStatusNotRefunded=لم تسترجع
+BillStatusClosedUnpaid=مغلقة (غير مسدد)
+BillStatusClosedPaidPartially=مسدد (جزئيا)
 BillShortStatusDraft=مسودة
-BillShortStatusPaid=دفع
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
-BillShortStatusConverted=دفع
+BillShortStatusPaid=سدد
+BillShortStatusPaidBackOrConverted=مسترجع او محول
+Refunded=مسترجع
+BillShortStatusConverted=سدد
 BillShortStatusCanceled=المهجورة
-BillShortStatusValidated=صادق
+BillShortStatusValidated=معتمد
 BillShortStatusStarted=بدأت
-BillShortStatusNotPaid=لم تدفع
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotPaid=لم تسدد
+BillShortStatusNotRefunded=لم تسترجع
 BillShortStatusClosedUnpaid=مغلقة
 BillShortStatusClosedPaidPartially=دفعت (جزئيا)
 PaymentStatusToValidShort=للمصادقة
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
-ErrorBillNotFound=فاتورة %s لا يوجد
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
-ErrorDiscountAlreadyUsed=خطأ الخصم المستخدمة بالفعل
-ErrorInvoiceAvoirMustBeNegative=خطأ ، والصحيح يجب أن يكون للفاتورة بمبلغ سلبي
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
-ErrorCantCancelIfReplacementInvoiceNotValidated=خطأ ، لا يمكن إلغاء الفاتورة التي حلت محلها اخرى الفاتورة التي لا تزال في حالة مشروع
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
-BillFrom=من
-BillTo=مشروع قانون ل
-ActionsOnBill=الإجراءات على فاتورة
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+ErrorVATIntraNotConfigured=لم يتم تحديد رقم ضريبة القيمة المضافة بعد
+ErrorNoPaiementModeConfigured=لم يتم تحديد نوع الدفع الافتراضي. انتقل إلى إعداد وحدة الفاتورة لإصلاح ذلك.
+ErrorCreateBankAccount=قم بإنشاء حساب مصرفي ، ثم انتقل إلى لوحة الإعداد الخاصة بوحدة الفاتورة لتحديد أنواع السداد
+ErrorBillNotFound=الفاتورة %s غير موجودة
+ErrorInvoiceAlreadyReplaced=خطأ ، لقد حاولت اعتماد فاتورة لاستبدال الفاتورة %s. ولكن تم بالفعل استبدال هذه الفاتورة %s.
+ErrorDiscountAlreadyUsed=خطأ ، الخصم تم استخدامه
+ErrorInvoiceAvoirMustBeNegative=خطأ ، يجب أن يكون للفاتورة الصحيحة مبلغ سلبي
+ErrorInvoiceOfThisTypeMustBePositive=خطأ ، يجب أن يحتوي هذا النوع من الفاتورة على مبلغ لا يشمل الضريبة موجبًا (أو فارغًا)
+ErrorCantCancelIfReplacementInvoiceNotValidated=خطأ ، لا يمكن إلغاء فاتورة تم استبدالها بفاتورة أخرى لا تزال في حالة المسودة
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=تم استخدام هذا الجزء أو آخر لذا لا يمكن إزالة سلسلة الخصم.
+BillFrom=من:
+BillTo=فاتورة الى:
+ActionsOnBill=الإجراءات على الفاتورة
+RecurringInvoiceTemplate=نموذج او فاتورة متكررة
+NoQualifiedRecurringInvoiceTemplateFound=لا يوجد نموذج فاتورة متكرر مؤهل للإنشاء.
+FoundXQualifiedRecurringInvoiceTemplate=تم العثور على %s نموذج فاتورة (فواتير) متكررة  مؤهلة للإنشاء.
+NotARecurringInvoiceTemplate=ليست فاتورة نموذجية متكررة
 NewBill=فاتورة جديدة
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s vendor invoices
+LastBills=أحدث %s فواتير 
+LatestTemplateInvoices=أحدث %s قالب فواتير
+LatestCustomerTemplateInvoices=أحدث %s قالب فواتير العميل 
+LatestSupplierTemplateInvoices=أحدث %s قالب فواتير مورد 
+LastCustomersBills=أحدث %s فواتير العملاء 
+LastSuppliersBills=أحدث %s فواتير الموردين
 AllBills=جميع الفواتير
-AllCustomerTemplateInvoices=All template invoices
-OtherBills=غيرها من الفواتير
-DraftBills=مشروع الفواتير
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Vendor draft invoices
-Unpaid=غير المدفوعة
-ErrorNoPaymentDefined=Error No payment defined
-ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=تبقى بدون أجر <b>(%s%s) هو</b> الخصم الممنوح لأنه تم السداد قبل الأجل. أنا أقبل أن تفقد ضريبة القيمة المضافة على هذا الخصم.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=تبقى بدون أجر <b>(%s%s) هو</b> الخصم الممنوح لأنه تم السداد قبل الأجل. I استرداد ضريبة القيمة المضافة على هذا الخصم دون مذكرة الائتمان.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=العملاء سيئة
-ConfirmClassifyPaidPartiallyReasonProductReturned=المنتجات عاد جزئيا
+AllCustomerTemplateInvoices=جميع قالب الفواتير
+OtherBills=فواتير اخرى
+DraftBills=مسودة فواتير
+CustomersDraftInvoices=مسودة فواتير العميل
+SuppliersDraftInvoices=مسودة فواتير المورد
+Unpaid=غير مسدد
+ErrorNoPaymentDefined=خطأ لم يتم تعريف السداد
+ConfirmDeleteBill=هل أنت متأكد أنك تريد حذف هذه الفاتورة؟
+ConfirmValidateBill=هل أنت متأكد من أنك تريد التحقق من صحة هذه الفاتورة بالمرجع <b> %s </b>؟
+ConfirmUnvalidateBill=هل أنت متأكد أنك تريد تغيير الفاتورة <b> %s </b> إلى حالة المسودة؟
+ConfirmClassifyPaidBill=هل أنت متأكد أنك تريد تغيير الفاتورة <b> %s </b> إلى حالة المسددة؟
+ConfirmCancelBill=هل أنت متأكد من أنك تريد إلغاء الفاتورة <b> %s </b>؟
+ConfirmCancelBillQuestion=لماذا تريد تصنيف هذه الفاتورة "مهجورة"؟
+ConfirmClassifyPaidPartially=هل أنت متأكد أنك تريد تغيير الفاتورة <b> %s </b> إلى الحالة مدفوعة؟
+ConfirmClassifyPaidPartiallyQuestion=لم يتم دفع هذه الفاتورة بالكامل. ما هو سبب إغلاق هذه الفاتورة؟
+ConfirmClassifyPaidPartiallyReasonAvoir=المتبقي الغير مدفوع <b> (%s %s) </b> هو خصم ممنوح لأن السداد تم قبل الأجل. أقوم بتسوية ضريبة القيمة المضافة مع ملاحظة اشعار دائن.
+ConfirmClassifyPaidPartiallyReasonDiscount=المتبقي الغير مدفوع <b> (%s %s) </b> هو خصم ممنوح لأن السداد تم قبل الأجل.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=المتبقي الغير مدفوع <b> (%s %s) </b> هو خصم ممنوح لأن السداد تم قبل الأجل. أنا أقبل خسارة ضريبة القيمة المضافة على هذا الخصم.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=المتبقي الغير مدفوع <b> (%s %s) </b> هو خصم ممنوح لأن السداد تم قبل الأجل. أسترد ضريبة القيمة المضافة على هذا الخصم بدون إشعار دائن.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=عميل سيء
+ConfirmClassifyPaidPartiallyReasonProductReturned=تم إرجاع بعض المنتجات
 ConfirmClassifyPaidPartiallyReasonOther=التخلي عن المبلغ لسبب آخر
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
-ConfirmClassifyPaidPartiallyReasonAvoirDesc=استخدام هذا الخيار إذا كان كل ما لا يتناسب مع
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=ويستخدم هذا الاختيار عند الدفع ليس كاملا لأن بعض المنتجات أعيدت
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=هذا الاختيار ممكن إذا تم تزويد فاتورتك بالتعليقات المناسبة. (مثال «فقط الضريبة المقابلة للسعر الذي تم دفعه هي التي تعطي الحق في الخصم»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=في بعض البلدان ، قد يكون هذا الاختيار ممكنًا فقط إذا كانت فاتورتك تحتوي على ملاحظات صحيحة.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=استخدم هذا الاختيار إذا كانت جميع الاختيارات الاخرى لا تناسبك
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=العميل السيئ <b> </b> هو العميل الذي يرفض سداد ديونه.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=يستخدم هذا الاختيار عندما لا يكتمل السداد بسبب إرجاع بعض المنتجات
+ConfirmClassifyPaidPartiallyReasonOtherDesc=استخدم هذا الخيار إذا لم يكن هناك خيار مناسب ، على سبيل المثال في الحالة التالية: <br> - الدفع غير مكتمل لأن بعض المنتجات تم شحنها مرة أخرى <br> - المبلغ المطالب به مهم جدًا لأنه تم نسيان الخصم <br> في جميع الحالات ، يجب تصحيح المبلغ المطالب به في نظام المحاسبة عن طريق إنشاء إشعار دائن.
 ConfirmClassifyAbandonReasonOther=أخرى
-ConfirmClassifyAbandonReasonOtherDesc=هذا الخيار وسوف يستخدم في جميع الحالات الأخرى. على سبيل المثال لأنك من خطة لإقامة استبدال الفاتورة.
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
-ValidateBill=التحقق من صحة الفواتير
-UnvalidateBill=Unvalidate فاتورة
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
+ConfirmClassifyAbandonReasonOtherDesc=سيتم استخدام هذا الاختيار في جميع الحالات الأخرى. على سبيل المثال ، لأنك تخطط لإنشاء فاتورة بديلة.
+ConfirmCustomerPayment=هل تؤكد إدخال المبلغ هذا لـ <b> %s </b> %s؟
+ConfirmSupplierPayment=هل تؤكد إدخال المباغ هذا لـ <b> %s </b> %s؟
+ConfirmValidatePayment=هل أنت متأكد أنك تريد اعتماد هذا المبلغ؟ لا يمكن إجراء أي تغيير بمجرد اعتماد الدفع.
+ValidateBill=اعتماد الفاتورة
+UnvalidateBill=فاتورة غير معتمدة
+NumberOfBills=عدد الفواتير
+NumberOfBillsByMonth=عدد الفواتير شهريا
 AmountOfBills=مبلغ الفواتير
-AmountOfBillsHT=Amount of invoices (net of tax)
-AmountOfBillsByMonthHT=كمية من الفواتير من قبل شهر (بعد خصم الضرائب)
+AmountOfBillsHT=مبلغ الفواتير (صافي الضرائب)
+AmountOfBillsByMonthHT=مبلغ الفواتير حسب الشهر (بعد خصم الضريبة)
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -216,8 +219,8 @@ AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following type
 RetainedwarrantyDefaultPercent=Retained warranty default percent
 RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
 RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
+ToPayOn=للسداد على %s
+toPayOn=للسداد على %s
 RetainedWarranty=Retained Warranty
 PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
 DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
@@ -226,199 +229,200 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-AlreadyPaid=دفعت بالفعل
-AlreadyPaidBack=دفعت بالفعل العودة
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+AlreadyPaid=مسدد
+AlreadyPaidBack=سددت بالفعل
+AlreadyPaidNoCreditNotesNoDeposits=سددت (بدون اشعار دائن ودفعات مقدمة)
 Abandoned=المهجورة
-RemainderToPay=تبقى بدون أجر
-RemainderToTake=المتبقي لاتخاذ
-RemainderToPayBack=Remaining amount to refund
+RemainderToPay=المتبقي غير مسدد
+RemainderToTake=الميلغ المتبقي لاتخاذ
+RemainderToPayBack=المبلغ المتبقي للاسترجاع
 Rest=بانتظار
 AmountExpected=المبلغ المطالب به
-ExcessReceived=تلقى الزائدة
-ExcessPaid=Excess paid
+ExcessReceived=المبالغ الزائدة المستلمة
+ExcessPaid=المبالغ الزائدة المسددة
 EscompteOffered=عرض الخصم (الدفع قبل الأجل)
-EscompteOfferedShort=تخفيض السعر
-SendBillRef=تقديم فاتورة%s
-SendReminderBillRef=تقديم فاتورة%s (تذكير)
-NoDraftBills=أي مشروع الفواتير
-NoOtherDraftBills=أي مشروع الفواتير
-NoDraftInvoices=لا يوجد مسودة فواتير
-RefBill=فاتورة المرجع
-ToBill=على مشروع قانون
-RemainderToBill=تبقى لمشروع قانون
+EscompteOfferedShort=خصم
+SendBillRef=تسليم الفاتورة %s
+SendReminderBillRef=تسليم الفاتورة %s (تذكير)
+NoDraftBills=لا توجد مسودات فواتير
+NoOtherDraftBills=لا توجد مسودات فواتير أخرى
+NoDraftInvoices=لا توجد مسودات فواتير
+RefBill=مرجع الفاتورة
+ToBill=على فاتورة
+RemainderToBill=باقي على الفاتورة
 SendBillByMail=ارسال الفاتورة عن طريق البريد الإلكتروني
-SendReminderBillByMail=إرسال تذكرة عن طريق البريد الإلكتروني
-RelatedCommercialProposals=المقترحات المتعلقة التجارية
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
-MenuToValid=لصحيحة
-DateMaxPayment=Payment due on
+SendReminderBillByMail=إرسال تذكير عن طريق البريد الإلكتروني
+RelatedCommercialProposals=العروض التجارية ذات الصلة
+RelatedRecurringCustomerInvoices=فواتير العملاء المتكررة ذات الصلة
+MenuToValid=صالح
+DateMaxPayment=السداد المستحق في
 DateInvoice=تاريخ الفاتورة
 DatePointOfTax=Point of tax
-NoInvoice=لا الفاتورة
-ClassifyBill=تصنيف الفاتورة
-SupplierBillsToPay=Unpaid vendor invoices
+NoInvoice=لا فاتورة
+ClassifyBill=صنف كفاتورة
+SupplierBillsToPay=فواتير المورد الغير مسددة
 CustomerBillsUnpaid=فواتير العملاء غير المسددة
 NonPercuRecuperable=غير القابلة للاسترداد
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
-SetRevenuStamp=Set revenue stamp
+SetConditions=حدد شروط السداد
+SetMode=حدد نوع السداد
+SetRevenuStamp=حدد ختم الإيرادات
 Billed=فواتير
-RecurringInvoices=Recurring invoices
-RepeatableInvoice=فاتورة قالب
-RepeatableInvoices=الفواتير قالب
+RecurringInvoices=الفواتير المتكررة
+RepeatableInvoice=قالب الفاتورة
+RepeatableInvoices=قالب الفواتير
 Repeatable=قالب
-Repeatables=النماذج
+Repeatables=القوالب
 ChangeIntoRepeatableInvoice=تحويل إلى قالب فاتورة
-CreateRepeatableInvoice=إنشاء فاتورة قالب
+CreateRepeatableInvoice=إنشاء قالب فاتورة
 CreateFromRepeatableInvoice=إنشاء من قالب الفاتورة
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
-CustomersInvoicesAndPayments=العملاء والفواتير والمدفوعات
-ExportDataset_invoice_1=Customer invoices and invoice details
-ExportDataset_invoice_2=العملاء والفواتير والمدفوعات
-ProformaBill=Proforma بيل :
+CustomersInvoicesAndInvoiceLines=فواتير العميل وتفاصيل الفاتورة
+CustomersInvoicesAndPayments=فواتير العميل ومدفوعاته
+ExportDataset_invoice_1=فواتير العميل وتفاصيل الفاتورة
+ExportDataset_invoice_2=فواتير العميل ومدفوعاته
+ProformaBill=فاتورة أولية:
 Reduction=تخفيض
-ReductionShort=Disc.
+ReductionShort=خصم
 Reductions=التخفيضات
-ReductionsShort=Disc.
+ReductionsShort=خصم
 Discounts=خصومات
 AddDiscount=إضافة الخصم
-AddRelativeDiscount=إنشاء خصم قريب
+AddRelativeDiscount=إنشاء خصم نسبي
 EditRelativeDiscount=تعديل الخصم النسبي
-AddGlobalDiscount=إضافة الخصم
-EditGlobalDiscounts=تعديل الخصومات مطلق
-AddCreditNote=علما إنشاء الائتمان
-ShowDiscount=وتظهر الخصم
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
+AddGlobalDiscount=إنشاء خصم مطلق
+EditGlobalDiscounts=تحرير الخصومات المطلقة
+AddCreditNote=إنشاء اشعار دائن
+ShowDiscount=إظهار الخصم
+ShowReduc=أظهر الخصم
+ShowSourceInvoice=عرض الفاتورة المصدر
 RelativeDiscount=الخصم النسبي
-GlobalDiscount=خصم العالمية
-CreditNote=علما الائتمان
-CreditNotes=ويلاحظ الائتمان
-CreditNotesOrExcessReceived=Credit notes or excess received
-Deposit=Down payment
-Deposits=Down payments
+GlobalDiscount=خصم عام
+CreditNote=اشعار دائن
+CreditNotes=اشعارات دائن
+CreditNotesOrExcessReceived=اشعارات دائن أو فوائض مستلمة
+Deposit=الدفعة الأولى
+Deposits=دفعة أولى
 DiscountFromCreditNote=خصم من دائن  %s
-DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
-AbsoluteDiscountUse=هذا النوع من الائتمان يمكن استخدامها على الفاتورة قبل المصادقة
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
-NewGlobalDiscount=تحديد خصم جديد
-NewRelativeDiscount=خصم جديد النسبية
-DiscountType=Discount type
+DiscountFromDeposit=دفعات مقدمة من الفاتورة %s
+DiscountFromExcessReceived=فوائض مسددة عن الفاتورة %s
+DiscountFromExcessPaid=فوائض مسددة عن الفاتورة %s
+AbsoluteDiscountUse=هذا النوع من الائتمان يمكن استخدامه على الفاتورة قبل اعتمادها
+CreditNoteDepositUse=يجب اعتماد الفاتورة لاستخدام هذا النوع من الاعتمادات
+NewGlobalDiscount=خصم مطلق جديد
+NewRelativeDiscount=خصم نسبي جديد
+DiscountType=نوع الخصم
 NoteReason=ملاحظة / السبب
 ReasonDiscount=السبب
-DiscountOfferedBy=التي تمنحها
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
-BillAddress=مشروع قانون معالجة
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
-IdSocialContribution=اجتماعي / ضريبة مالية دفع معرف
-PaymentId=دفع معرف
-PaymentRef=Payment ref.
-InvoiceId=فاتورة معرف
-InvoiceRef=المرجع الفاتورة.
-InvoiceDateCreation=فاتورة تاريخ الإنشاء
+DiscountOfferedBy=بواسطة
+DiscountStillRemaining=الخصومات أو الاعتمادات المتاحة
+DiscountAlreadyCounted=خصومات أو اعتمادات مستهلكة
+CustomerDiscounts=خصومات العملاء
+SupplierDiscounts=خصومات الموردين
+BillAddress=عنوان الفاتورة
+HelpEscompte=هذا الخصم هو خصم يمنح للعميل لأن السداد تم قبل الأجل.
+HelpAbandonBadCustomer=تم التخلي عن هذا المبلغ (قيل إن العميل عميل سيء) ويعتبر خسارة استثنائية.
+HelpAbandonOther=تم التخلي عن هذا المبلغ لأنه كان خطأ (عميل أو فاتورة خاطئة تم استبدالها بأخرى على سبيل المثال)
+IdSocialContribution=معرف دفع الضرائب الاجتماعية / المالية
+PaymentId=معرف السداد
+PaymentRef=مرجع السداد
+InvoiceId=معرف الفاتورة
+InvoiceRef=مرجع الفاتورة.
+InvoiceDateCreation=تاريخ إنشاء الفاتورة
 InvoiceStatus=حالة الفاتورة
-InvoiceNote=علما الفاتورة
-InvoicePaid=دفعت الفاتورة
-InvoicePaidCompletely=Paid completely
-InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
-OrderBilled=Order billed
-DonationPaid=Donation paid
+InvoiceNote=مذكرة الفاتورة
+InvoicePaid=فاتورة مسددة
+InvoicePaidCompletely=مسددة بالكامل
+InvoicePaidCompletelyHelp=فاتورة مدفوعة بالكامل. يستثنى من ذلك الفواتير المدفوعة جزئيًا. للحصول على قائمة بجميع الفواتير "المغلقة" أو غير "المغلقة" ، يفضل استخدام عامل تصفية حالة الفاتورة.
+OrderBilled=الامر تم فوترته
+DonationPaid=التبرع سدد
 PaymentNumber=دفع عدد
 RemoveDiscount=إزالة الخصم
-WatermarkOnDraftBill=مشاريع مائية على فواتير (إذا كانت فارغة لا شيء)
+WatermarkOnDraftBill=علامة مائية على مسودات الفواتير (لا شيء إذا كانت فارغة)
 InvoiceNotChecked=لا فاتورة مختارة
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
-DisabledBecauseReplacedInvoice=العمل والمعوقين بسبب الفاتورة قد استبدل
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
-NbOfPayments=No. of payments
-SplitDiscount=انقسام في الخصم
+ConfirmCloneInvoice=هل أنت متأكد أنك تريد استنساخ هذه الفاتورة <b>%s </b>؟
+DisabledBecauseReplacedInvoice=العمل على الفاتورة عطل لانها مستبدلة
+DescTaxAndDividendsArea=تقدم هذه المنطقة ملخصًا لجميع المدفوعات التي تم سدادها للنفقات الخاصة. يتم تضمين السجلات مع المدفوعات خلال السنة الثابتة فقط هنا.
+NbOfPayments=عدد السدادات
+SplitDiscount=تقسيم الخصم إلى قسمين
 ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount?
+TypeAmountOfEachNewDiscount=مبلغ الإدخال لكل جزء من الجزأين:
+TotalOfTwoDiscountMustEqualsOriginal=يجب أن يكون إجمالي الخصمين الجديدين مساويًا لمبلغ الخصم الأصلي.
+ConfirmRemoveDiscount=هل أنت متأكد أنك تريد إزالة هذا الخصم؟
 RelatedBill=الفاتورة ذات الصلة
 RelatedBills=الفواتير ذات الصلة
 RelatedCustomerInvoices=فواتير العملاء ذات صلة
-RelatedSupplierInvoices=Related vendor invoices
+RelatedSupplierInvoices=فواتير المورد ذات الصلة
 LatestRelatedBill=أحدث فاتورة ذات الصلة
-WarningBillExist=Warning, one or more invoices already exist
+WarningBillExist=تحذير ، هناك فاتورة واحدة أو أكثر موجودة بالفعل
 MergingPDFTool=دمج أداة PDF
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
-PaymentNote=Payment note
+AmountPaymentDistributedOnInvoice=مبلغ السداد موزع على الفاتورة
+PaymentOnDifferentThirdBills=السماح بسداد فواتير أطراف ثالثة اخرى ولكن نفس الشركة الأم
+PaymentNote=مذكرة سداد
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
 ListOfSituationInvoices=List of situation invoices
 CurrentSituationTotal=Total current situation
 DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+RemoveSituationFromCycle=إزالة هذه الفاتورة من الدورة
+ConfirmRemoveSituationFromCycle=إزالة هذه الفاتورة %s من الدورة؟
 ConfirmOuting=Confirm outing
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
+FrequencyPer_d=كل %s يوم
+FrequencyPer_m=كل %s شهر
+FrequencyPer_y=كل %s سنة
 FrequencyUnit=Frequency unit
 toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-GeneratedFromTemplate=Generated from template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
-GroupPaymentsByModOnReports=Group payments by mode on reports
+NextDateToExecution=تاريخ إصدار الفاتورة التالية
+NextDateToExecutionShort=تاريخ الاصدار القادم
+DateLastGeneration=تاريخ أحدث اصدار
+DateLastGenerationShort=تاريخ أحدث اصدار
+MaxPeriodNumber=العدد الأعلى لإصدار الفاتورة
+NbOfGenerationDone=عدد الفواتير المنجزة بالفعل
+NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationDoneShort=عدد الفواتير المنجزة بالفعل
+MaxGenerationReached=تم بلوغ الحد الأقصى لعدد الاصدار
+InvoiceAutoValidate=اعتماد الفواتير تلقائيًا
+GeneratedFromRecurringInvoice=تم إنشاؤه من نموذج الفاتورة المتكررة %s
+DateIsNotEnough=الاجل لم يحل بعد
+InvoiceGeneratedFromTemplate=الفاتورة %s المُنشأة من فاتورة القالب المتكرر %s
+GeneratedFromTemplate=تم إنشاؤه من نموذج الفاتورة %s
+WarningInvoiceDateInFuture=تحذير ، تاريخ الفاتورة احدث من التاريخ الحالي
+WarningInvoiceDateTooFarInFuture=تحذير ، تاريخ الفاتورة بعيد جدًا عن التاريخ الحالي
+ViewAvailableGlobalDiscounts=عرض الخصومات المتاحة
+GroupPaymentsByModOnReports=مجموعة المدفوعات حسب الوضع في التقارير
 # PaymentConditions
 Statut=الحالة
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=مستحقة عند الاستلام
+PaymentConditionRECEP=مستحقة عند الاستلام
 PaymentConditionShort30D=30 يوما
 PaymentCondition30D=30 يوما
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=30 يومًا من نهاية الشهر
+PaymentCondition30DENDMONTH=في غضون 30 يومًا من نهاية الشهر
 PaymentConditionShort60D=60 يوما
 PaymentCondition60D=60 يوما
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=60 يومًا من نهاية الشهر
+PaymentCondition60DENDMONTH=في غضون 60 يومًا من نهاية الشهر
 PaymentConditionShortPT_DELIVERY=تسليم
-PaymentConditionPT_DELIVERY=التسليم
+PaymentConditionPT_DELIVERY=عند التسليم
 PaymentConditionShortPT_ORDER=الطلبية
 PaymentConditionPT_ORDER=على الطلب
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50 ٪٪ مقدما، 50 ٪٪ عند التسليم
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount - 1 line with label '%s'
-VarAmount=مقدار متغير (٪٪ TOT).
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+PaymentConditionShort10D=10 أيام
+PaymentCondition10D=10 أيام
+PaymentConditionShort10DENDMONTH=10 أيام من نهاية الشهر
+PaymentCondition10DENDMONTH=في غضون 10 أيام بعد نهاية الشهر
+PaymentConditionShort14D=14 يوما
+PaymentCondition14D=14 يوما
+PaymentConditionShort14DENDMONTH=14 يومًا من نهاية الشهر
+PaymentCondition14DENDMONTH=في غضون 14 يومًا بعد نهاية الشهر
+FixAmount=المبلغ الثابت - بند واحد بالتسمية "%s"
+VarAmount=المبلغ المتغير (%% إجمالي)
+VarAmountOneLine=المبلغ المتغير (إجمالي %%.) - بند واحد بالتسمية "%s"
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=حوالة مصرفية
 PaymentTypeShortVIR=حوالة مصرفية
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
+PaymentTypePRE=أمر دفع الخصم المباشر
+PaymentTypeShortPRE=أمر دفع المدين
 PaymentTypeLIQ=نقدا
 PaymentTypeShortLIQ=نقدا
 PaymentTypeCB=بطاقة الائتمان
@@ -427,110 +431,115 @@ PaymentTypeCHQ=الشيكات
 PaymentTypeShortCHQ=الشيكات
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
-PaymentTypeTRA=Bank draft
-PaymentTypeShortTRA=مسودة
+PaymentTypeVAD=الدفع الالكتروني
+PaymentTypeShortVAD=الدفع الالكتروني
+PaymentTypeTRA=حوالة مصرفية
+PaymentTypeShortTRA=حوالة مصرفية
 PaymentTypeFAC=عامل
 PaymentTypeShortFAC=عامل
-BankDetails=التفاصيل المصرفية
-BankCode=رمز المصرف
-DeskCode=Branch code
+BankDetails=تفاصيل مصرفية
+BankCode=رمز البنك
+DeskCode=رمز الفرع
 BankAccountNumber=رقم الحساب
 BankAccountNumberKey=Checksum
 Residence=عنوان
-IBANNumber=IBAN account number
+IBANNumber=رقم حساب الآيبان
 IBAN=إيبان
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=الآيبان الخاص بالعميل
+SupplierIBAN=الآيبان الخاص بالمورد
 BIC=بيك / سويفت
-BICNumber=BIC/SWIFT code
+BICNumber=رمز BIC / SWIFT
 ExtraInfos=معلومات اضافية
 RegulatedOn=وتنظم على
 ChequeNumber=رقم الشيك
-ChequeOrTransferNumber=شيك / نقل رقم
+ChequeOrTransferNumber=رقم شيك / تحويل 
 ChequeBordereau=Check schedule
-ChequeMaker=الاختيار / الارسال نقل
+ChequeMaker=Check/Transfer transmitter
 ChequeBank=الشيكات المصرفية
-CheckBank=الاختيار
+CheckBank=الشيك
 NetToBePaid=الصافي للدفع
 PhoneNumber=الهاتف :
 FullPhoneNumber=الهاتف
 TeleFax=الفاكس
-PrettyLittleSentence=قبول مبلغ المدفوعات المستحقة عن طريق الشيكات الصادرة باسمي بوصفها عضوا في الرابطة للمحاسبة المالية وافقت عليها الإدارة.
-IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+PrettyLittleSentence=قبول المبلغ المستحق بشيكات صادرة باسمي كموظف في المحاسبة معتمد من قبل الإدارة المالية.
+IntracommunityVATNumber=معرف ضريبة القيمة المضافة داخل الاتحاد
+PaymentByChequeOrderedTo=مدفوعات الشيكات (شامل الضرائب) مستحقة الدفع إلى %s ، أرسل إلى
+PaymentByChequeOrderedToShort=مدفوعات الشيكات (شامل الضرائب) واجبة الدفع ل
 SendTo=أرسل إلى
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
-VATIsNotUsedForInvoice=* عدم الفنية للتطبيق ضريبة القيمة المضافة 293B من المجموعة الاستشارية لاندونيسيا
+PaymentByTransferOnThisBankAccount=الدفع عن طريق التحويل إلى الحساب المصرفي التالي
+VATIsNotUsedForInvoice=* غير سارية ضريبة القيمة المضافة art-293B من CGI
 LawApplicationPart1=من خلال تطبيق القانون 80.335 من 12/05/80
 LawApplicationPart2=البضاعة تظل ملكا لل
-LawApplicationPart3=the seller until full payment of
+LawApplicationPart3=البائع حتى السداد الكامل ل
 LawApplicationPart4=ثمنها.
-LimitedLiabilityCompanyCapital=SARL برأس مال
+LimitedLiabilityCompanyCapital=برأس مال
 UseLine=تطبيق
 UseDiscount=استخدام الخصم
-UseCredit=استخدام القروض
+UseCredit=استخدم الرصيد
 UseCreditNoteInInvoicePayment=تخفيض المبلغ لدفع هذه القروض
-MenuChequeDeposits=Check Deposits
+MenuChequeDeposits=إيداع الشيكات
 MenuCheques=الشيكات
-MenuChequesReceipts=Check receipts
+MenuChequesReceipts=استلام الشيكات
 NewChequeDeposit=ايداع جديدة
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
+ChequesReceipts=استلام الشيكات
+ChequesArea=منطقة ايداع الشيكات
+ChequeDeposits=إيداع الشيكات
 Cheques=الشيكات
-DepositId=إيداع معرف
+DepositId=معرف الايداع
 NbCheque=عدد الشيكات
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
-ShowUnpaidAll=وتظهر جميع الفواتير غير المسددة
-ShowUnpaidLateOnly=وتبين في وقت متأخر من الفواتير غير المدفوعة فقط
+CreditNoteConvertedIntoDiscount=تم تحويل  هذا %s إلى %s
+UsBillingContactAsIncoiveRecipientIfExist=استخدم جهة الاتصال / العنوان من نوع "جهة اتصال الفواتير" بدلاً من عنوان الجهة الخارجية كمستلم للفواتير
+ShowUnpaidAll=عرض جميع الفواتير الغير المسددة
+ShowUnpaidLateOnly=عرض الفواتير المتأخرة الغير المسددة فقط
 PaymentInvoiceRef=دفع فاتورة %s
-ValidateInvoice=تحقق من صحة الفواتير
-ValidateInvoices=Validate invoices
+ValidateInvoice=اعتماد الفاتورة
+ValidateInvoices=اعتماد الفواتير
 Cash=نقد
-Reported=تأخر
+Reported=تأخير
 DisabledBecausePayments=غير ممكن لأن هناك بعض المدفوعات
-CantRemovePaymentWithOneInvoicePaid=تصنيف لا يمكن إزالة الدفع لأنه ليس هناك على الأقل على الفاتورة سيولي
+CantRemovePaymentWithOneInvoicePaid=لا يمكن إزالة الدفعة نظرًا لوجود فاتورة مصنفة واحدة على الأقل مدفوعة
+CantRemovePaymentVATPaid=لا يمكن إزالة الدفعة لأن إقرار ضريبة القيمة المضافة مصنف كمدفوع
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=من المتوقع الدفع
-CantRemoveConciliatedPayment=Can't remove reconciled payment
-PayedByThisPayment=سيولي هذا الدفع
-ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
-ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
-ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
-ToMakePayment=دفع
+CantRemoveConciliatedPayment=لا يمكن إزالة الدفعة التي تمت تسويتها
+PayedByThisPayment=سدد بعدهذه الدفعة
+ClosePaidInvoicesAutomatically=تصنيف جميع الفواتير القياسية أو مع دفعة اولى أو الفواتير المستبدلة تلقائيا على أنها "مدفوعة" عندما يتم الدفع بالكامل.
+ClosePaidCreditNotesAutomatically=تصنيف جميع اشعارات دائن تلقائيًا على أنها "مدفوعة" عندما يتم استرداد الأموال بالكامل.
+ClosePaidContributionsAutomatically=تصنيف جميع المساهمات الاجتماعية أو المالية تلقائيًا على أنها "مدفوعة" عندما يتم الدفع بالكامل.
+ClosePaidVATAutomatically=تصنيف إقرار ضريبة القيمة المضافة تلقائيًا على أنه "مدفوع" عندما يتم الدفع بالكامل.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
+AllCompletelyPayedInvoiceWillBeClosed=سيتم تلقائيًا إغلاق جميع الفواتير المدفوعة وتحول الى "مدفوعة".
+ToMakePayment=سدد
 ToMakePaymentBack=تسديد
 ListOfYourUnpaidInvoices=قائمة الفواتير غير المسددة
 NoteListOfYourUnpaidInvoices=ملاحظة: تحتوي هذه القائمة على الفواتير الوحيدة لأطراف ثالثة ترتبط لك كممثل بيع.
-RevenueStamp=Tax stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+RevenueStamp=الطابع الضريبي
+YouMustCreateInvoiceFromThird=هذا الخيار متاح فقط عند إنشاء فاتورة من علامة التبويب "العميل" التابعة لطرف ثالث
+YouMustCreateInvoiceFromSupplierThird=هذا الخيار متاح فقط عند إنشاء فاتورة من علامة التبويب "المورد" للطرف الثالث
+YouMustCreateStandardInvoiceFirstDesc=يجب عليك إنشاء فاتورة قياسية أولاً وتحويلها إلى "نموذج" لإنشاء نموذج فاتورة جديد
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=عودة عدد مع الشكل syymm NNNN عن الفواتير القياسية و٪ syymm-NNNN لتلاحظ الائتمان حيث هو YY العام٪، مم هو الشهر وnnnn هو تسلسل مع أي انقطاع وعدم العودة إلى 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=وهناك مشروع قانون بدءا من دولار ويوجد بالفعل syymm لا تتفق مع هذا النموذج من التسلسل. إزالة أو تغيير تسميتها لتصبح لتفعيل هذه الوحدة.
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+EarlyClosingReason=سبب الإغلاق المبكر
+EarlyClosingComment=ملاحظة اغلاق مبكرة
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=ممثل العميل متابعة فاتورة
-TypeContact_facture_external_BILLING=الزبون فاتورة الاتصال
-TypeContact_facture_external_SHIPPING=العملاء الشحن الاتصال
-TypeContact_facture_external_SERVICE=خدمة العملاء الاتصال
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
-TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
-TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_facture_internal_SALESREPFOLL=ممثل متابعة فاتورة العميل
+TypeContact_facture_external_BILLING=جهة اتصال فاتورة العميل
+TypeContact_facture_external_SHIPPING=جهة اتصال شحن العميل
+TypeContact_facture_external_SERVICE=الاتصال بخدمة العملاء
+TypeContact_invoice_supplier_internal_SALESREPFOLL=ممثل متابعة فاتورة المورد
+TypeContact_invoice_supplier_external_BILLING=جهة اتصال فاتورة المورد
+TypeContact_invoice_supplier_external_SHIPPING=جهة اتصال الشحن للمورد
+TypeContact_invoice_supplier_external_SERVICE=جهة اتصال خدمة المورد
 # Situation invoices
 InvoiceFirstSituationAsk=الفاتورة الأولى الوضع
 InvoiceFirstSituationDesc=وترتبط <b>الفواتير الوضع</b> إلى حالات تتعلق التقدم، على سبيل المثال تطور البناء. ويرتبط كل حالة على فاتورة.
 InvoiceSituation=فاتورة الوضع
+PDFInvoiceSituation=فاتورة الوضع
 InvoiceSituationAsk=فاتورة تتابع الوضع
 InvoiceSituationDesc=إنشاء وضعا جديدا التالية موجودة بالفعل
 SituationAmount=مبلغ الفاتورة الوضع (صافي)
@@ -540,38 +549,43 @@ CreateNextSituationInvoice=إنشاء الوضع المقبل
 ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
 ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
 ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=الوضع القادم موجود بالفعل.
+NotLastInCycle=هذه الفاتورة ليست الأحدث في الدورة ويجب عدم تعديلها.
+DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=هذا الوضع النهائي.
 situationInvoiceShortcode_AS=AS
-situationInvoiceShortcode_S=دإ
-CantBeLessThanMinPercent=التقدم لا يمكن أن يكون أصغر من قيمتها في الحالة السابقة.
-NoSituations=لا حالات مفتوحة
+situationInvoiceShortcode_S=S
+CantBeLessThanMinPercent=لا يمكن أن يكون التقدم أقل من قيمته في الوضع السابق.
+NoSituations=No open situations
 InvoiceSituationLast=الفاتورة النهائية والعامة
 PDFCrevetteSituationNumber=Situation N°%s
 PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=فاتورة الوضع
+PDFCrevetteSituationInvoiceTitle=Situation invoice
 PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
 TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-MaxNumberOfGenerationReached=Max number of gen. reached
+invoiceLineProgressError=لا يمكن أن يكون تقدم بند الفاتورة أكبر من أو يساوي بند الفاتورة التالي
+updatePriceNextInvoiceErrorUpdateline=خطأ: تحديث السعر في سطر الفاتورة: %s
+ToCreateARecurringInvoice=لإنشاء فاتورة متكررة لهذا العقد ، قم أولاً بإنشاء مسودة الفاتورة هذه ، ثم قم بتحويلها إلى قالب فاتورة وحدد معدل تكرار إنشاء الفواتير المستقبلية.
+ToCreateARecurringInvoiceGene=لإنشاء فواتير مستقبلية بشكل منتظم ويدوي ، ما عليك سوى الانتقال إلى القائمة <strong> %s - %s - %s </strong>.
+ToCreateARecurringInvoiceGeneAuto=إذا كنت بحاجة إلى إنشاء مثل هذه الفواتير تلقائيًا ، فاطلب من المسؤول تمكين وحدة الإعداد <strong> %s </strong> وإعدادها. لاحظ أنه يمكن استخدام كلتا الطريقتين (يدويًا وآليًا) مع عدم وجود خطر التكرار.
+DeleteRepeatableInvoice=حذف قالب الفاتورة
+ConfirmDeleteRepeatableInvoice=هل أنت متأكد أنك تريد حذف قالب الفاتورة؟
+CreateOneBillByThird=إنشاء فاتورة واحدة لكل طرف ثالث (خلاف ذلك ، فاتورة واحدة لكل طلب)
+BillCreated=%s إصدار فاتورة (فواتير) 
+BillXCreated=تم إنشاء %s الفاتورة 
+StatusOfGeneratedDocuments=حالة إنشاء الوثيقة
+DoNotGenerateDoc=لا تقم بإنشاء ملف المستند
+AutogenerateDoc=إنشاء ملف المستند تلقائيًا
+AutoFillDateFrom=حدد تاريخ البدء لبند الخدمة مع تاريخ الفاتورة
+AutoFillDateFromShort=حدد تاريخ البدء
+AutoFillDateTo=حدد تاريخ الانتهاء لبندالخدمة بتاريخ الفاتورة التالية
+AutoFillDateToShort=حدد تاريخ الانتهاء
+MaxNumberOfGenerationReached=وصول الحد الأقصى من الانشاء
 BILL_DELETEInDolibarr=تم حذف الفاتورة
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
+BILL_SUPPLIER_DELETEInDolibarr=تم حذف فاتورة المورد
+UnitPriceXQtyLessDiscount=سعر الوحدة × الكمية - الخصم
+CustomersInvoicesArea=منطقة فواتير العملاء
+SupplierInvoicesArea=منطقة فواتير المورد
+FacParentLine=أصل سطر الفاتورة
+SituationTotalRayToRest=ما تبقى للدفع بدون ضريبة
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=إجمالي التقدم %d %%
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index 9d993910c15..a95a4943e9c 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -1,111 +1,120 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLoginInformation=Login Information
-BoxLastRssInfos=RSS Information
-BoxLastProducts=Latest %s Products/Services
-BoxProductsAlertStock=Stock alerts for products
-BoxLastProductsInContract=Latest %s contracted products/services
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
-BoxLastProposals=Latest commercial proposals
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
-BoxLastCustomerOrders=Latest sales orders
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
-BoxFicheInter=Latest interventions
+BoxDolibarrStateBoard=إحصائيات عن كائنات الأعمال الرئيسية في قاعدة البيانات
+BoxLoginInformation=معلومات تسجيل الدخول
+BoxLastRssInfos=معلومات RSS
+BoxLastProducts=أحدث %s منتجات | خدمات 
+BoxProductsAlertStock=تنبيهات المخزون للمنتجات
+BoxLastProductsInContract=أحدث %s منتجات | خدمات  المتعاقد عليها
+BoxLastSupplierBills=أحدث فواتير الموردين
+BoxLastCustomerBills=أحدث فواتير العملاء
+BoxOldestUnpaidCustomerBills=أقدم فواتير العملاء غير المسددة
+BoxOldestUnpaidSupplierBills=أقدم فواتير الموردين غير مدفوعة
+BoxLastProposals=أحدث العروض التجارية
+BoxLastProspects=أحدث الفرص المعدلة
+BoxLastCustomers=أحدث العملاء المعدلين
+BoxLastSuppliers=أحدث الموردين المعدلين
+BoxLastCustomerOrders=أحدث أوامر البيع
+BoxLastActions=أحدث الإجراءات
+BoxLastContracts=أحدث العقود
+BoxLastContacts=أحدث الاتصالات | العناوين
+BoxLastMembers=أحدث الأعضاء
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
+BoxFicheInter=أحدث التدخلات
 BoxCurrentAccounts=ميزان الحسابات المفتوحة
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
-BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Products/Services: last %s modified
-BoxTitleProductsAlertStock=Products: stock alert
-BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Vendors: last %s modified
-BoxTitleLastModifiedCustomers=Customers: last %s modified
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
-BoxTitleCurrentAccounts=Open Accounts: balances
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
-BoxOldestExpiredServices=أقدم خدمات منتهية الصلاحية النشطة
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
-BoxGlobalActivity=النشاط العالمي (الفواتير والمقترحات والطلبات)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
+BoxTitleMemberNextBirthdays=أعياد الميلاد لهذا الشهر (الأعضاء)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleLastRssInfos=آخر أخبار %s من %s
+BoxTitleLastProducts=المنتجات | الخدمات: آخر %s معدل 
+BoxTitleProductsAlertStock=المنتجات: تنبيه المخزون
+BoxTitleLastSuppliers=أحدث %s الموردين المسجلين
+BoxTitleLastModifiedSuppliers=الموردين: آخر %s معدل
+BoxTitleLastModifiedCustomers=العملاء: آخر %s تعديل 
+BoxTitleLastCustomersOrProspects=أحدث %s عملاء أو فرص
+BoxTitleLastCustomerBills=أحدث %s تعديل لفواتير العميل
+BoxTitleLastSupplierBills=آخر %s تعديل لفواتير الموردين
+BoxTitleLastModifiedProspects=الفرص: آخر %s تعديل 
+BoxTitleLastModifiedMembers=أحدث %s أعضاء 
+BoxTitleLastFicheInter=أحدث %s تدخلات معدلة 
+BoxTitleOldestUnpaidCustomerBills=فواتير العميل: أقدم %s غير مدفوعة
+BoxTitleOldestUnpaidSupplierBills=فواتير الموردين: أقدم %s غير مدفوعة
+BoxTitleCurrentAccounts=الحسابات المفتوحة: أرصدة
+BoxTitleSupplierOrdersAwaitingReception=أوامر الموردين في انتظار الاستلام
+BoxTitleLastModifiedContacts=جهات الاتصال | العناوين: آخر %s تعديل 
+BoxMyLastBookmarks=الإشارات المرجعية: أحدث %s
+BoxOldestExpiredServices=أقدم الخدمات النشطة منتهية الصلاحية
+BoxLastExpiredServices=أحدث %s أقدم جهات اتصال مع خدمات منتهية الصلاحية نشطة
+BoxTitleLastActionsToDo=أحدث إجراءات %s للقيام بها
+BoxTitleLastContracts=أحدث %s عقود معدلة
+BoxTitleLastModifiedDonations=أحدث %s التبرعات المعدلة
+BoxTitleLastModifiedExpenses=أحدث %s تقارير النفقات المعدلة 
+BoxTitleLatestModifiedBoms=أحدث %s BOMs معدلة 
+BoxTitleLatestModifiedMos=أحدث %s أوامر التصنيع المعدلة
+BoxTitleLastOutstandingBillReached=العملاء الذين تجاوزا الحد الاقصى
+BoxGlobalActivity=النشاط العام  (الفواتير ، العروض ، الطلبات)
+BoxGoodCustomers=عملاء جيدون
+BoxTitleGoodCustomers=%s عملاء جيدون
 BoxScheduledJobs=المهام المجدولة
 BoxTitleFunnelOfProspection=Lead funnel
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
-LastRefreshDate=Latest refresh date
-NoRecordedBookmarks=أية إشارات محددة.
-ClickToAdd=انقر هنا لإضافة.
-NoRecordedCustomers=لا العملاء تسجيل
-NoRecordedContacts=أي اتصالات تسجيل
-NoActionsToDo=توجد إجراءات لتفعل
-NoRecordedOrders=No recorded sales orders
-NoRecordedProposals=أي مقترحات تسجيل
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
-NoUnpaidSupplierBills=No unpaid vendor invoices
-NoModifiedSupplierBills=No recorded vendor invoices
-NoRecordedProducts=لم تسجل المنتجات / الخدمات
-NoRecordedProspects=لا آفاق المسجلة
-NoContractedProducts=لا توجد منتجات / خدمات التعاقد
-NoRecordedContracts=أي عقود المسجلة
-NoRecordedInterventions=لا التدخلات المسجلة
-BoxLatestSupplierOrders=Latest purchase orders
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
-NoSupplierOrder=No recorded purchase order
-BoxCustomersInvoicesPerMonth=Customer Invoices per month
-BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
-BoxCustomersOrdersPerMonth=Sales Orders per month
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
-BoxProposalsPerMonth=مقترحات شهريا
-NoTooLowStockProducts=No products are under the low stock limit
-BoxProductDistribution=Products/Services Distribution
-ForObject=On %s
-BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
-BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
-BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
-BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
-BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
-ForCustomersInvoices=عملاء الفواتير
+FailedToRefreshDataInfoNotUpToDate=فشل تحديث تدفق RSS. آخر تاريخ تحديث ناجح: %s
+LastRefreshDate=آخر تحديث
+NoRecordedBookmarks=لم يتم تحديد إشارات مرجعية
+ClickToAdd=انقر هنا للإضافة.
+NoRecordedCustomers=لا يوجد عملاء مسجلين
+NoRecordedContacts=لا توجد جهات اتصال مسجلة
+NoActionsToDo=لا توجد إجراءات للقيام بها
+NoRecordedOrders=لا توجد أوامر مبيعات مسجلة
+NoRecordedProposals=لا توجد عروض مسجلة
+NoRecordedInvoices=لا توجد فواتير عملاء مسجلة
+NoUnpaidCustomerBills=لا توجد فواتير غير مدفوعة للعملاء
+NoUnpaidSupplierBills=لا توجد فواتير موردين غير مدفوعة
+NoModifiedSupplierBills=لا توجد فواتير موردين مسجلة
+NoRecordedProducts=لا توجد منتجات | خدمات مسجلة
+NoRecordedProspects=لا توجد فرص مسجلة
+NoContractedProducts=لم يتم التعاقد على أي منتجات | خدمات
+NoRecordedContracts=لا توجد عقود مسجلة
+NoRecordedInterventions=لا توجد تدخلات مسجلة
+BoxLatestSupplierOrders=أحدث أوامر الشراء
+BoxLatestSupplierOrdersAwaitingReception=أحدث أوامر الشراء (مع استلام معلق)
+NoSupplierOrder=لا يوجد أمر شراء مسجل
+BoxCustomersInvoicesPerMonth=فواتير العملاء في الشهر
+BoxSuppliersInvoicesPerMonth=فواتير الموردين في الشهر
+BoxCustomersOrdersPerMonth=اوامر المبيعات في الشهر
+BoxSuppliersOrdersPerMonth=اوامر الموردين في الشهر
+BoxProposalsPerMonth=العروض في الشهر
+NoTooLowStockProducts=لا توجد منتجات أقل من حد المخزون المنخفض
+BoxProductDistribution=توزيع المنتجات | الخدمات
+ForObject=في %s
+BoxTitleLastModifiedSupplierBills=فواتير الموردين: آخر %s تعديل 
+BoxTitleLatestModifiedSupplierOrders=أوامر الموردين: آخر %s تعديل 
+BoxTitleLastModifiedCustomerBills=فواتير العميل: آخر %s تعديل 
+BoxTitleLastModifiedCustomerOrders=أوامر المبيعات: آخر %s تعديل 
+BoxTitleLastModifiedPropals=أحدث %s العروض المعدلة 
+BoxTitleLatestModifiedJobPositions=أحدث %s وظائف  المعدلة
+BoxTitleLatestModifiedCandidatures=أحدث %s الترشيحات المعدلة 
+ForCustomersInvoices=فواتير العملاء
 ForCustomersOrders=أوامر العملاء
-ForProposals=اقتراحات
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard
-BoxAdded=Widget was added in your dashboard
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
-NoRecordedManualEntries=No manual entries record in accountancy
+ForProposals=عروض
+LastXMonthRolling=آخر %s شهر  متداول
+ChooseBoxToAdd=إضافة widget إلى لوحة القيادة الخاصة بك
+BoxAdded=تمت إضافة widget في لوحة القيادة الخاصة بك
+BoxTitleUserBirthdaysOfMonth=أعياد الميلاد لهذا الشهر (المستخدمون)
+BoxLastManualEntries=تم إدخال أحدث سجل في المحاسبة يدويًا أو بدون مستند المصدر
+BoxTitleLastManualEntries=%s تم إدخال أحدث سجل يدويًا أو بدون مستند المصدر
+NoRecordedManualEntries=لا يوجد إدخالات سجل  يدوية في المحاسبة
 BoxSuspenseAccount=Count accountancy operation with suspense account
-BoxTitleSuspenseAccount=Number of unallocated lines
-NumberOfLinesInSuspenseAccount=Number of line in suspense account
-SuspenseAccountNotDefined=Suspense account isn't defined
-BoxLastCustomerShipments=Last customer shipments
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=No recorded customer shipment
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxTitleSuspenseAccount=عدد البنود غير المخصصة
+NumberOfLinesInSuspenseAccount=رقم البند في الحساب المعلق
+SuspenseAccountNotDefined=لم يتم تعريف الحساب المعلق
+BoxLastCustomerShipments=آخر شحنات العميل
+BoxTitleLastCustomerShipments=أحدث %s شحنات العملاء 
+NoRecordedShipments=لا توجد شحنة مسجلة للعملاء
+BoxCustomersOutstandingBillReached=العملاء الذين بلغوا الحد الأقصى المسموح به
 # Pages
-AccountancyHome=المحاسبة
-ValidatedProjects=Validated projects
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
+ValidatedProjects=المشاريع المعتمدة
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index ffc098c9333..86b8186e362 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=منطقة علامات / فئات العملاء 
 MembersCategoriesArea=منطقة علامات / فئات الأعضاء 
 ContactsCategoriesArea=منطقة  اتصالات العلامات / الفئات 
-AccountsCategoriesArea=منطقة علامات / فئات حسابات 
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=منطقة علامات / فئات المشاريع
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=إظهار العلامة / الفئة
 ByDefaultInList=افتراضيا في القائمة
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index 4c65642bdba..7be97a35374 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -1,185 +1,192 @@
 # Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=اسم الشركة ل ٪ موجود بالفعل. اختيار آخر.
-ErrorSetACountryFirst=المجموعة الأولى في البلد
-SelectThirdParty=تحديد طرف ثالث
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
-DeleteContact=حذف اتصال
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
-MenuNewThirdParty=New Third Party
-MenuNewCustomer=New Customer
-MenuNewProspect=New Prospect
-MenuNewSupplier=New Vendor
+ErrorCompanyNameAlreadyExists=اسم الشركة %s موجود بالفعل. اختر واحد اخر.
+ErrorSetACountryFirst=اضبط البلد أولاً
+SelectThirdParty=حدد طرفًا ثالثًا
+ConfirmDeleteCompany=هل أنت متأكد أنك تريد حذف هذه الشركة وجميع المعلومات الموروثة عنها؟
+DeleteContact=حذف جهة اتصال | عنوان
+ConfirmDeleteContact=هل أنت متأكد أنك تريد حذف جهة الاتصال هذه وجميع المعلومات الموروثة؟
+MenuNewThirdParty=طرف ثالث جديد
+MenuNewCustomer=عميل جديد
+MenuNewProspect=فرصة جديدة
+MenuNewSupplier=مورد جديد
 MenuNewPrivateIndividual=فرد جديد
-NewCompany=New company (prospect, customer, vendor)
-NewThirdParty=New Third Party (prospect, customer, vendor)
-CreateDolibarrThirdPartySupplier=Create a third party (vendor)
+NewCompany=شركة جديدة (فرصة، عميل ، مورد)
+NewThirdParty=طرف ثالث جديد (فرصة، عميل ، مورد)
+CreateDolibarrThirdPartySupplier=إنشاء طرف ثالث (مورد)
 CreateThirdPartyOnly=إنشاء طرف ثالث
-CreateThirdPartyAndContact=Create a third party + a child contact
-ProspectionArea=مجال التنقيب
-IdThirdParty=هوية الطرف الثالث
-IdCompany=رقم تعريف الشركة
-IdContact=رقم تعريف الاتصال
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
+CreateThirdPartyAndContact=إنشاء طرف ثالث + جهة اتصال تابعة
+ProspectionArea=منطقة الفرص
+IdThirdParty=معرف الطرف الثالث
+IdCompany=معرف الشركة
+IdContact=معرف جهة الاتصال
+ThirdPartyContacts=جهات اتصال الطرف الثالث
+ThirdPartyContact=جهة اتصال | عنوان الطرف الثالث
 Company=شركة
 CompanyName=اسم الشركة
-AliasNames=الاسم المستعار (التجارية، العلامات التجارية، ...)
-AliasNameShort=Alias Name
+AliasNames=الاسم المختصر (تجاري ، علامة تجارية)
+AliasNameShort=الاسم المختصر
 Companies=الشركات
-CountryIsInEEC=Country is inside the European Economic Community
-PriceFormatInCurrentLanguage=Price display format in the current language and currency
-ThirdPartyName=Third-party name
-ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
-ThirdPartyProspects=آفاق
-ThirdPartyProspectsStats=آفاق
+CountryIsInEEC=البلد داخل الاتحاد الأوروبي
+PriceFormatInCurrentLanguage=تنسيق عرض السعر باللغة والعملة الحالية
+ThirdPartyName=اسم الطرف الثالث
+ThirdPartyEmail=البريد الإلكتروني للطرف الثالث
+ThirdParty=طرف ثالث
+ThirdParties=الأطراف الثالثة
+ThirdPartyProspects=فرص
+ThirdPartyProspectsStats=فرص
 ThirdPartyCustomers=العملاء
 ThirdPartyCustomersStats=العملاء
-ThirdPartyCustomersWithIdProf12=الزبائن ٪ أو ٪ ق ق
-ThirdPartySuppliers=Vendors
-ThirdPartyType=Third-party type
+ThirdPartyCustomersWithIdProf12=العملاء الذين لديهم %s أو %s
+ThirdPartySuppliers=الموردين
+ThirdPartyType=نوع الطرف الثالث
 Individual=فرد
-ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ToCreateContactWithSameName=سيتم إنشاء جهة اتصال | عنوان تلقائيًا بنفس المعلومات مثل الطرف الثالث التابع للطرف الثالث. في معظم الحالات ، حتى لو كان الطرف الثالث شخصًا ماديًا ، يكفي إنشاء طرف ثالث بمفرده.
 ParentCompany=الشركة الأم
 Subsidiaries=الشركات التابعة
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=تقرير الربع
-CivilityCode=قانون الكياسة
-RegisteredOffice=المكتب المسجل
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
+CivilityCode=قواعد السلوك
+RegisteredOffice=مكتب مسجل
 Lastname=اللقب
-Firstname=Firstname
-PostOrFunction=Job position
+Firstname=الاسم الاول
+PostOrFunction=الوظيفه
 UserTitle=العنوان
-NatureOfThirdParty=Nature of Third party
-NatureOfContact=Nature of Contact
+NatureOfThirdParty=طبيعة الطرف الثالث
+NatureOfContact=طبيعة الاتصال
 Address=عنوان
 State=الولاية / المقاطعة
-StateCode=State/Province code
-StateShort=حالة
+StateCode=رمز الولاية / المقاطعة
+StateShort=الولاية
 Region=المنطقة
-Region-State=Region - State
-Country=قطر
+Region-State=المنطقة - الولاية
+Country=الدولة
 CountryCode=رمز البلد
-CountryId=بلد معرف
+CountryId=معرف البلد
 Phone=الهاتف
 PhoneShort=الهاتف
 Skype=سكايب
 Call=مكالمة
 Chat=دردشة
-PhonePro=الأستاذ الهاتف
-PhonePerso=عدد الأفراد. الهاتف
+PhonePro=هاتف العمل
+PhonePerso=الهاتف الشخصي
 PhoneMobile=الجوال
-No_Email=Refuse bulk emailings
+No_Email=رفض الرسائل الإلكترونية الجماعية
 Fax=الفاكس
 Zip=الرمز البريدي
 Town=مدينة
 Web=الويب
-Poste= موقف
-DefaultLang=Language default
-VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
-VATIsNotUsed=Sales tax is not used
-CopyAddressFromSoc=Copy address from third-party details
-ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
-PaymentBankAccount=Payment bank account
-OverAllProposals=اقتراحات
+Poste= المنصب
+DefaultLang=اللغة الافتراضية
+VATIsUsed=تطبق ضريبة المبيعات
+VATIsUsedWhenSelling=يحدد هذا ما إذا كان هذا الطرف الثالث يتضمن ضريبة بيع أم لا عندما يُصدر فاتورة لعملائه
+VATIsNotUsed=لا تطبق ضريبة المبيعات
+CopyAddressFromSoc=نسخ العنوان من تفاصيل الطرف الثالث
+ThirdpartyNotCustomerNotSupplierSoNoRef=لا عميل ولا مورد، ولا توجد كائنات مرجعية متاحة
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=لا خصومات لا لعميل ولا لمورد، الخصومات غير متوفرة
+PaymentBankAccount=حساب السداد البنكي
+OverAllProposals=عروض
 OverAllOrders=أوامر
 OverAllInvoices=فواتير
-OverAllSupplierProposals=طلبات الأسعار
+OverAllSupplierProposals=طلبات عروض الأسعار
 ##### Local Taxes #####
 LocalTax1IsUsed=استخدام الضرائب الثانية
-LocalTax1IsUsedES= يتم استخدام الطاقة المتجددة
-LocalTax1IsNotUsedES= لا يتم استخدام الطاقة المتجددة
+LocalTax1IsUsedES= يستخدم الضرائب العقارية
+LocalTax1IsNotUsedES= لا يستخدم الضرائب العقارية
 LocalTax2IsUsed=استخدام الضرائب الثالثة
-LocalTax2IsUsedES= يستخدم IRPF
-LocalTax2IsNotUsedES= IRPF لا يستخدم
-WrongCustomerCode=رمز غير صالح العملاء
-WrongSupplierCode=Vendor code invalid
+LocalTax2IsUsedES= يستخدم ضريبة IRPF
+LocalTax2IsNotUsedES= لا يستخدم ضريبة IRPF
+WrongCustomerCode=كود العميل غير صالح
+WrongSupplierCode=كود المورد غير صالح
 CustomerCodeModel=العميل رمز النموذج
-SupplierCodeModel=Vendor code model
+SupplierCodeModel=نموذج كود المورد
 Gencod=الباركود
 ##### Professional ID #####
-ProfId1Short=الأستاذ معرف 1
-ProfId2Short=معرف الأستاذ 2
-ProfId3Short=الأستاذ معرف 3
-ProfId4Short=الأستاذ معرف 4
-ProfId5Short=البروفيسور رقم 5
-ProfId6Short=البروفيسور معرف 6
-ProfId1=الهوية المهنية (1)
-ProfId2=الهوية المهنية (2)
-ProfId3=3 الهوية المهنية
+ProfId1Short=هوية مهنية 1
+ProfId2Short=هوية مهنية 2
+ProfId3Short=هوية مهنية 3
+ProfId4Short=هوية مهنية 4
+ProfId5Short=هوية مهنية 5
+ProfId6Short=هوية مهنية 6
+ProfId1=الهوية المهنية 1
+ProfId2=الهوية المهنية 2
+ProfId3=الهوية المهنية 3
 ProfId4=الهوية المهنية 4
-ProfId5=المهنية رقم 5
-ProfId6=المهنية ID 6
-ProfId1AR=معرف البروفيسور 1 (CUIT / [كيل])
-ProfId2AR=البروفيسور رقم 2 (المتوحشون الايرادات)
+ProfId5=الهوية المهنية 5
+ProfId6=الهوية المهنية 6
+ProfId1AR=الهوية المهنية 1 (CUIT / CUIL)
+ProfId2AR=الهوية المهنية 2 (المتوحشون الايرادات)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=البروفيسور رقم 1 (USt.-IdNr)
-ProfId2AT=البروفيسور رقم 2 (USt.-العدد)
-ProfId3AT=البروفيسور رقم 3 (Handelsregister-العدد).
+ProfId1AT=الهوية المهنية 1  (USt.-IdNr)
+ProfId2AT=الهوية المهنية 2 (USt.-العدد)
+ProfId3AT=الهوية المهنية 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=رقم EORI
 ProfId6AT=-
-ProfId1AU=الأستاذ عيد 1 (ايه. بي.)
+ProfId1AU=الهوية المهنية 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=الأستاذ عيد 1 (عدد المهنية)
+ProfId1BE=الهوية المهنية 1 (الرقم المهني)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=رقم EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
-ProfId3BR=IM (Inscricao المحلي)
+ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
 ProfId1CH=UID-Nummer
 ProfId2CH=-
-ProfId3CH=الأستاذ عيد 1 (عدد الاتحادية)
-ProfId4CH=الأستاذ عيد 2 (رقم السجل التجاري)
-ProfId5CH=EORI number
+ProfId3CH=الهوية المهنية 1 (رقم اتحادي)
+ProfId4CH=الهوية المهنية 2 (رقم السجل التجاري)
+ProfId5CH=رقم EORI
 ProfId6CH=-
-ProfId1CL=الأستاذ رقم 1 (شبق)
+ProfId1CL=الهوية المهنية 1 (R.U.T.)
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CO=الأستاذ رقم 1 (شبق)
+ProfId1CO=الهوية المهنية 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=الأستاذ عيد 1 (USt. - IdNr)
-ProfId2DE=الأستاذ عيد 2 (رقم USt. -)
-ProfId3DE=الأستاذ عيد 3 (Handelsregister-Nr.)
+ProfId1DE=الهوية المهنية 1 (USt.-IdNr)
+ProfId2DE=الهوية المهنية 2 (USt.-Nr)
+ProfId3DE=الهوية المهنية 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=رقم EORI
 ProfId6DE=-
-ProfId1ES=(CNAE)
-ProfId2ES=(رقم الضمان الاجتماعي)
-ProfId3ES=(IAE)
+ProfId1ES=الهوية المهنية 1 (CIF / NIF)
+ProfId2ES=الهوية المهنية 2 (رقم الضمان الاجتماعي)
+ProfId3ES=الهوية المهنية 3 (CNAE)
 ProfId4ES=(عدد الجماعية)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=الأستاذ عيد 1 (صفارة إنذار)
 ProfId2FR=الأستاذ عيد 2 (SIRET)
 ProfId3FR=الأستاذ عيد 3 (NAF ، البالغ من العمر قرد)
 ProfId4FR=الأستاذ عيد 4 (نظام المنسقين المقيمين / لجمهورية مقدونيا)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=الأستاذ عيد 1 (رقم التسجيل)
 ProfId2GB=-
 ProfId3GB=3 الأستاذ عيد حسبما
@@ -202,12 +209,13 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=رقم EORI
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=رقم EORI
 ProfId6LU=-
 ProfId1MA=الرقم أ. 1 (RC)
 ProfId2MA=الرقم أ. 2 (Patente)
@@ -225,13 +233,13 @@ ProfId1NL=KVK نومير
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=EORI number
+ProfId5NL=رقم EORI
 ProfId6NL=-
 ProfId1PT=الأستاذ عيد 1 (NIPC)
 ProfId2PT=الأستاذ عيد 2 (رقم الضمان الاجتماعي)
 ProfId3PT=الأستاذ عيد 3 (رقم السجل التجاري)
 ProfId4PT=الأستاذ عيد 4 (يضم)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,12 +263,12 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=الأستاذ رقم 1 (OGRN)
 ProfId2RU=الأستاذ رقم 2 (INN)
-ProfId3RU=الأستاذ رقم 3 (KPP)
-ProfId4RU=الأستاذ رقم 4 (اوكبو)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
 ProfId1DZ=RC
@@ -269,107 +277,107 @@ ProfId3DZ=NIF
 ProfId4DZ=NIS
 VATIntra=VAT ID
 VATIntraShort=VAT ID
-VATIntraSyntaxIsValid=تركيب صالحة
+VATIntraSyntaxIsValid=بناء الجملة صالح
 VATReturn=VAT return
-ProspectCustomer=احتمال / العملاء
-Prospect=احتمال
+ProspectCustomer=فرصة | عميل
+Prospect=فرصة
 CustomerCard=بطاقة الزبون
 Customer=العميل
-CustomerRelativeDiscount=العميل الخصم النسبي
-SupplierRelativeDiscount=Relative vendor discount
-CustomerRelativeDiscountShort=الخصم النسبي
-CustomerAbsoluteDiscountShort=مطلق الخصم
-CompanyHasRelativeDiscount=هذا العميل قد خصم <b>٪ ق ٪ ٪</b>
-CompanyHasNoRelativeDiscount=هذا العميل ليس لديها النسبية خصم افتراضي
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
-CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
-CompanyHasCreditNote=ولا يزال هذا العميل الائتمانية ويلاحظ السابقة أو ودائع <b>ل%s ق ٪</b>
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
-CompanyHasNoAbsoluteDiscount=هذا العميل ليس الخصم الائتمان المتاح
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
-SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+CustomerRelativeDiscount=خصم العميل النسبي
+SupplierRelativeDiscount=خصم المورد النسبي
+CustomerRelativeDiscountShort=خصم نسبي
+CustomerAbsoluteDiscountShort=خصم مطلق
+CompanyHasRelativeDiscount=هذا العميل لديه خصم افتراضي بقيمة <b> %s%% </b>
+CompanyHasNoRelativeDiscount=هذا العميل ليس لديه خصم نسبي بشكل افتراضي
+HasRelativeDiscountFromSupplier=لديك خصم افتراضي بقيمة <b> %s%% </b> من هذا المورد
+HasNoRelativeDiscountFromSupplier=ليس لديك خصم نسبي افتراضي من هذا المورد
+CompanyHasAbsoluteDiscount=يتوفر لدى هذا العميل خصومات (ملاحظات ائتمانية أو دفعات مقدمة) لـ <b> %s </b> %s
+CompanyHasDownPaymentOrCommercialDiscount=هذا العميل لديه خصومات متاحة (تجارية ، دفعة أولى) لـ <b> %s </b> %s
+CompanyHasCreditNote=لا يزال لدى هذا العميل اشعار دائن لـ <b> %s </b> %s
+HasNoAbsoluteDiscountFromSupplier=ليس لديك رصيد خصم متاح من هذا المورد
+HasAbsoluteDiscountFromSupplier=لديك خصومات متاحة (ملاحظات ائتمانية أو دفعات مقدمة) لـ <b> %s </b> %s من هذا المورد
+HasDownPaymentOrCommercialDiscountFromSupplier=لديك خصومات متاحة (تجارية ، دفعات مقدمة) لـ <b> %s </b> %s من هذا المورد
+HasCreditNoteFromSupplier=لديك اشعار دائن لـ <b> %s </b> %s من هذا المورد
+CompanyHasNoAbsoluteDiscount=هذا العميل ليس لديه ائتمان خصم متاح
+CustomerAbsoluteDiscountAllUsers=خصومات العملاء المطلقة (الممنوحة من قبل جميع المستخدمين)
+CustomerAbsoluteDiscountMy=خصومات العملاء المطلقة (ممنوحة منك)
+SupplierAbsoluteDiscountAllUsers=خصومات المورد المطلقة (مدخلة من جميع المستخدمين)
+SupplierAbsoluteDiscountMy=خصومات المورد المطلقة (أدخلتها بنفسك)
 DiscountNone=بلا
-Vendor=Vendor
-Supplier=Vendor
+Vendor=مورد
+Supplier=مورد
 AddContact=إنشاء اتصال
-AddContactAddress=إنشاء الاتصال / عنوان
-EditContact=تحرير الاتصال / عنوان
-EditContactAddress=تحرير الاتصال / عنوان
-Contact=Contact/Address
-Contacts=اتصالات
-ContactId=Contact id
-ContactsAddresses=اتصالات / عناوين
-FromContactName=Name:
-NoContactDefinedForThirdParty=أي اتصال محددة لهذا الطرف الثالث
-NoContactDefined=لا يوجد اتصال محددة لهذا الطرف الثالث
-DefaultContact=الاتصال الافتراضية
-ContactByDefaultFor=Default contact/address for
+AddContactAddress=إنشاء اتصال | عنوان
+EditContact=تحرير جهة الاتصال
+EditContactAddress=تحرير جهة اتصال | عنوان
+Contact=عنوان الإتصال
+Contacts=جهات الاتصال | العناوين
+ContactId=معرف جهة الاتصال
+ContactsAddresses=جهات الاتصال | العناوين
+FromContactName=الاسم:
+NoContactDefinedForThirdParty=لم يتم تحديد جهة اتصال لهذا الطرف الثالث
+NoContactDefined=لم يتم تحديد جهة اتصال
+DefaultContact=جهة الاتصال | العنوان الافتراضي
+ContactByDefaultFor=جهة الاتصال | العنوان الافتراضي لـ
 AddThirdParty=إنشاء طرف ثالث
 DeleteACompany=حذف شركة
 PersonalInformations=البيانات الشخصية
-AccountancyCode=حساب محاسبي
-CustomerCode=Customer Code
-SupplierCode=Vendor Code
-CustomerCodeShort=Customer Code
-SupplierCodeShort=Vendor Code
-CustomerCodeDesc=Customer Code, unique for all customers
-SupplierCodeDesc=Vendor Code, unique for all vendors
-RequiredIfCustomer=إذا كان الطرف الثالث هو عميل أو احتمال
-RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
-ThisIsModuleRules=Rules for this module
-ProspectToContact=إمكانية الاتصال
-CompanyDeleted=شركة "٪ ل" حذفها من قاعدة البيانات.
-ListOfContacts=قائمة الاتصالات
-ListOfContactsAddresses=قائمة الاتصالات
-ListOfThirdParties=List of Third Parties
-ShowCompany=Third Party
-ShowContact=Contact-Address
-ContactsAllShort=جميع (بدون فلتر)
+AccountancyCode=الحساب
+CustomerCode=كود العميل
+SupplierCode=كود المورد
+CustomerCodeShort=كود العميل
+SupplierCodeShort=كود المورد
+CustomerCodeDesc=كود العميل فريد لجميع العملاء
+SupplierCodeDesc=كود المورد ، فريد لجميع الموردين
+RequiredIfCustomer=مطلوب ، إذا كان الطرف الثالث عميلاً أو فرصة
+RequiredIfSupplier=مطلوب إذا كان الطرف الثالث موردا
+ValidityControledByModule=الصلاحية يتحكم بها في الوحدة
+ThisIsModuleRules=قواعد هذه الوحدة
+ProspectToContact=فرصة للاتصال
+CompanyDeleted=تم حذف شركة "%s" من قاعدة البيانات.
+ListOfContacts=قائمة جهات الاتصال | العناوين
+ListOfContactsAddresses=قائمة جهات الاتصال | العناوين
+ListOfThirdParties=قائمة الأطراف الثالثة
+ShowCompany=طرف ثالث
+ShowContact=عنوان الإتصال
+ContactsAllShort=الكل (بدون فلتر)
 ContactType=نوع الاتصال
-ContactForOrders=أوامر اتصال
-ContactForOrdersOrShipments=Order's or shipment's contact
-ContactForProposals=مقترحات اتصال
-ContactForContracts=عقود اتصال
-ContactForInvoices=فواتير اتصال
-NoContactForAnyOrder=هذا الاتصال ليس من أجل أي اتصال
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
-NoContactForAnyProposal=هذا الاتصال ليست على اتصال في أي اقتراح التجارية
-NoContactForAnyContract=هذا الاتصال ليس أي عقد للاتصال
-NoContactForAnyInvoice=هذا الاتصال ليست على اتصال في أي فاتورة
-NewContact=اتصال جديد
-NewContactAddress=New Contact/Address
-MyContacts=اتصالاتي
+ContactForOrders=جهة اتصال الامر
+ContactForOrdersOrShipments=جهة اتصال الامر أو الشحنة
+ContactForProposals=جهة اتصال العروض
+ContactForContracts=جهة اتصال العقد
+ContactForInvoices=جهة اتصال الفاتورة
+NoContactForAnyOrder=جهة الاتصال هذه ليست جهة اتصال لأي امر
+NoContactForAnyOrderOrShipments=جهة الاتصال هذه ليست جهة اتصال لأي امر أو شحنة
+NoContactForAnyProposal=جهة الاتصال هذه ليست جهة اتصال لأي عرض تجاري
+NoContactForAnyContract=جهة الاتصال هذه ليست جهة اتصال لأي عقد
+NoContactForAnyInvoice=جهة الاتصال هذه ليست جهة اتصال لأي فاتورة
+NewContact=جهة اتصال جديدة
+NewContactAddress=جهة اتصال | عنوان جديد
+MyContacts=جهات الاتصال الخاصة بي
 Capital=رأس المال
-CapitalOf=ق ٪ من رأس المال
+CapitalOf=راس مال %s
 EditCompany=تحرير الشركة
-ThisUserIsNot=This user is not a prospect, customer or vendor
+ThisUserIsNot=هذا المستخدم ليس فرصة أو عميل أو مورد
 VATIntraCheck=فحص
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
-ErrorVATCheckMS_UNAVAILABLE=وليس من الممكن التحقق. تأكد من خدمة لا تقدمها دولة عضو (في المائة).
-NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Business entity type
-Workforce=Workforce
+VATIntraCheckableOnEUSite=تحقق من معرف ضريبة القيمة المضافة داخل الاتجاد على موقع المفوضية الأوروبية
+VATIntraManualCheck=يمكنك أيضًا التحقق يدويًا على موقع المفوضية الأوروبية <a href="%s" target="_blank"> %s </a>
+ErrorVATCheckMS_UNAVAILABLE=تحقق غير ممكن. لا يتم توفير خدمة التحقق من قبل الدولة العضو (%s).
+NorProspectNorCustomer=ليس فرصة، ولا عميل
+JuridicalStatus=نوع الكيان التجاري
+Workforce=القوى العاملة
 Staff=الموظفين
 ProspectLevelShort=المحتملة
-ProspectLevel=آفاق محتملة
-ContactPrivate=القطاع الخاص
-ContactPublic=تقاسم
+ProspectLevel=فرص محتملة
+ContactPrivate=خاص
+ContactPublic=مشترك
 ContactVisibility=الرؤية
-ContactOthers=الآخر
-OthersNotLinkedToThirdParty=أخرى ، لا صلة لطرف ثالث
-ProspectStatus=آفاق الوضع
-PL_NONE=Aucun
+ContactOthers=اخرى
+OthersNotLinkedToThirdParty=آخرون غير مرتبطين بطرف ثالث
+ProspectStatus=حالة الفرصة
+PL_NONE=لا أحد
 PL_UNKNOWN=غير معروف
 PL_LOW=منخفض
 PL_MEDIUM=المتوسط
@@ -377,93 +385,93 @@ PL_HIGH=عال
 TE_UNKNOWN=-
 TE_STARTUP=بدء التشغيل
 TE_GROUP=شركة كبرى
-TE_MEDIUM=شركة المتوسط
-TE_ADMIN=الحكومية ،
+TE_MEDIUM=شركة متوسطة
+TE_ADMIN=حكومي
 TE_SMALL=شركة صغيرة
-TE_RETAIL=مبيعات التجزئة
-TE_WHOLE=Wholesaler
+TE_RETAIL=بائع تجزئة
+TE_WHOLE=تاجر الجملة
 TE_PRIVATE=فرد
 TE_OTHER=أخرى
-StatusProspect-1=لا اتصال
-StatusProspect0=اتصل أبدا
-StatusProspect1=To be contacted
+StatusProspect-1=لا تتصل
+StatusProspect0=لم يتصل
+StatusProspect1=سوف يتم الاتصال
 StatusProspect2=في عملية الاتصال
-StatusProspect3=الاتصال به
-ChangeDoNotContact=لتغيير الوضع لا اتصال '
-ChangeNeverContacted=لتغيير الوضع 'اتصل أبدا'
-ChangeToContact=Change status to 'To be contacted'
-ChangeContactInProcess=لتغيير الوضع 'في عملية'
-ChangeContactDone=لتغيير الوضع 'فعل'
-ProspectsByStatus=آفاق الوضع
+StatusProspect3=تم الاتصال
+ChangeDoNotContact=تغيير الحالة إلى "عدم الاتصال"
+ChangeNeverContacted=تغيير الحالة إلى "لم يتم الاتصال"
+ChangeToContact=تغيير الحالة إلى "ليتم الاتصال"
+ChangeContactInProcess=تغيير الحالة إلى "في عملية الاتصال"
+ChangeContactDone=تغيير الحالة إلى "تم الاتصال"
+ProspectsByStatus=الفرص حسب الحالة
 NoParentCompany=بلا
-ExportCardToFormat=تصدير بطاقة شكل
-ContactNotLinkedToCompany=اتصالات ليست مرتبطة بطرف ثالث
-DolibarrLogin=ادخل Dolibarr
-NoDolibarrAccess=لا Dolibarr الوصول
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
-ImportDataset_company_1=Third-parties and their properties
-ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
-ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
-PriceLevel=Price Level
-PriceLevelLabels=Price Level Labels
+ExportCardToFormat=تصدير البطاقة إلى التنسيق
+ContactNotLinkedToCompany=جهة الاتصال ليست مرتبطة بأي طرف ثالث
+DolibarrLogin=تسجيل الدخول الى دوليبار
+NoDolibarrAccess=لا يوجد وصول دوليبار
+ExportDataset_company_1=الأطراف الثالثة (الشركات / المؤسسات / الأشخاص الطبيعيون) وممتلكاتهم
+ExportDataset_company_2=جهات الاتصال وخصائصها
+ImportDataset_company_1=الأطراف الثالثة وممتلكاتهم
+ImportDataset_company_2=جهات اتصال | عناوين وسمات إضافية للأطراف الثالثة
+ImportDataset_company_3=حسابات بنكية لأطراف ثالثة
+ImportDataset_company_4=ممثلو مبيعات اطراف ثالثة (تعيين مندوبي مبيعات / مستخدمين للشركات)
+PriceLevel=مستوى السعر
+PriceLevelLabels=تسميات مستوى السعر
 DeliveryAddress=عنوان التسليم
-AddAddress=أضف معالجة
-SupplierCategory=Vendor category
-JuridicalStatus200=Independent
+AddAddress=اضف عنوان
+SupplierCategory=فئة المورد
+JuridicalStatus200=مستقل
 DeleteFile=حذف الملفات
-ConfirmDeleteFile=هل أنت متأكد من أنك تريد حذف هذا الملف؟
-AllocateCommercial=Assigned to sales representative
-Organization=المنظمة
-FiscalYearInformation=Fiscal Year
-FiscalMonthStart=ابتداء من شهر من السنة المالية
-SocialNetworksInformation=Social networks
+ConfirmDeleteFile=هل أنت متأكد أنك تريد حذف هذا الملف؟
+AllocateCommercial=مخصص لمندوب المبيعات
+Organization=المؤسسة
+FiscalYearInformation=السنة المالية
+FiscalMonthStart=شهر البداية للسنة المالية
+SocialNetworksInformation=الشبكات الاجتماعية
 SocialNetworksFacebookURL=Facebook URL
 SocialNetworksTwitterURL=Twitter URL
 SocialNetworksLinkedinURL=Linkedin URL
 SocialNetworksInstagramURL=Instagram URL
 SocialNetworksYoutubeURL=Youtube URL
 SocialNetworksGithubURL=Github URL
-YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of Vendors
-ListProspectsShort=List of Prospects
-ListCustomersShort=List of Customers
-ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+YouMustAssignUserMailFirst=يجب عليك إنشاء بريد إلكتروني لهذا المستخدم قبل أن تتمكن من إضافة إشعار بريد إلكتروني.
+YouMustCreateContactFirst=لتتمكن من إضافة إشعارات البريد الإلكتروني ، يجب عليك أولاً تحديد جهات الاتصال التي تحتوي على رسائل بريد إلكتروني صالحة للطرف الثالث
+ListSuppliersShort=قائمة الموردين
+ListProspectsShort=قائمة الفرص
+ListCustomersShort=قائمة العملاء
+ThirdPartiesArea=الأطراف الثالثة | جهات الاتصال
+LastModifiedThirdParties=آخر %s أطراف ثالثة معدلة
+UniqueThirdParties=إجمالي الأطراف الثالثة
 InActivity=فتح
 ActivityCeased=مغلق
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=قائمة المنتجات / الخدمات إلى %s
-CurrentOutstandingBill=فاتورة المستحق حاليا
-OutstandingBill=ماكس. لمشروع قانون المتميز
-OutstandingBillReached=Max. for outstanding bill reached
-OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
-LeopardNumRefModelDesc=العميل / المورد مدونة مجانية. هذا القانون يمكن تعديلها في أي وقت.
-ManagingDirectors=مدير (ق) اسم (CEO، مدير، رئيس ...)
-MergeOriginThirdparty=تكرار طرف ثالث (طرف ثالث كنت ترغب في حذف)
+ThirdPartyIsClosed=الطرف الثالث مغلق
+ProductsIntoElements=قائمة المنتجات | الخدمات في %s
+CurrentOutstandingBill=فاتورة مستحقة حاليا
+OutstandingBill=الأعلى للفاتورة المستحقة
+OutstandingBillReached=الأعلى لفاتورة مستحقة وصلت
+OrderMinAmount=الحد الأدنى للطلب
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+LeopardNumRefModelDesc=الكود مجاني. يمكن تعديل هذا الكود في أي وقت.
+ManagingDirectors=اسم المدير (المديرون) (الرئيس التنفيذي ، المدير ، الرئيس)
+MergeOriginThirdparty=طرف ثالث مكرر (الطرف الثالث الذي تريد حذفه)
 MergeThirdparties=دمج أطراف ثالثة
-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 third party will be deleted.
-ThirdpartiesMergeSuccess=Third parties have been merged
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=First name of sales representative
-SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+ConfirmMergeThirdparties=هل أنت متأكد أنك تريد دمج هذا الطرف الثالث في الطرف الحالي؟ سيتم نقل جميع العناصر المرتبطة (الفواتير ، الطلبات) إلى الطرف الثالث الحالي ، ثم سيتم حذف الطرف الثالث.
+ThirdpartiesMergeSuccess=تم دمج الأطراف الثالثة
+SaleRepresentativeLogin=تسجيل دخول مندوب مبيعات
+SaleRepresentativeFirstname=الاسم الأول لمندوب المبيعات
+SaleRepresentativeLastname=الاسم الأخير لمندوب المبيعات
+ErrorThirdpartiesMerge=حدث خطأ عند حذف الطرف الثالث. يرجى التحقق من السجل. تم التراجع عن التغييرات.
+NewCustomerSupplierCodeProposed=تم استخدام كود العميل أو المورد بالفعل ، تم اقتراح كود جديد
+KeepEmptyIfGenericAddress=اترك هذا الحقل فارغًا إذا كان هذا العنوان هو عنوان عام
 #Imports
-PaymentTypeCustomer=Payment Type - Customer
-PaymentTermsCustomer=Payment Terms - Customer
-PaymentTypeSupplier=Payment Type - Vendor
-PaymentTermsSupplier=Payment Term - Vendor
-PaymentTypeBoth=Payment Type - Customer and Vendor
-MulticurrencyUsed=Use Multicurrency
+PaymentTypeCustomer=نوع السداد - العميل
+PaymentTermsCustomer=شروط السداد - العميل
+PaymentTypeSupplier=نوع السداد - المورد
+PaymentTermsSupplier=شروط السداد - المورد
+PaymentTypeBoth=نوع السداد - العميل والمورد
+MulticurrencyUsed=استخدم عملات متعددة
 MulticurrencyCurrency=العملة
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=أوروبا (الاتحاد الاوروبي)
+RestOfEurope=بقية أوروبا (EEC)
+OutOfEurope=خارج أوروبا (EEC)
+CurrentOutstandingBillLate=الفاتورة الحالية المتأخرة
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=كن حذرًا ، اعتمادًا على إعدادات سعر المنتج ، يجب عليك تغيير الطرف الثالث قبل إضافة المنتج إلى نقطة البيع.
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 7b8dd642c33..97365780ddc 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
+MenuFinancial=الفواتير | السداد
 TaxModuleSetupToModifyRules=الذهاب إلى <a href="%s">الإعداد حدة الضرائب</a> لتعديل قواعد حساب
 TaxModuleSetupToModifyRulesLT=الذهاب إلى <a href="%s">إعداد الشركة</a> لتعديل قواعد حساب
 OptionMode=الخيار المحاسبة
@@ -11,30 +11,30 @@ FeatureIsSupportedInInOutModeOnly=الميزة الوحيدة المتاحة ف
 VATReportBuildWithOptionDefinedInModule=المبالغ المبينة هنا يتم حسابها باستخدام القواعد التي تحددها وحدة الإعداد الضرائب.
 LTReportBuildWithOptionDefinedInModule=وتحسب المبالغ المبينة هنا باستخدام القواعد التي يحددها الإعداد الشركة.
 Param=الإعداد
-RemainingAmountPayment=Amount payment remaining:
+RemainingAmountPayment=المبلغ المتبقي:
 Account=حساب
 Accountparent=Parent account
 Accountsparent=Parent accounts
 Income=الدخل
 Outcome=نتائج
 MenuReportInOut=دخل / نتائج
-ReportInOut=Balance of income and expenses
+ReportInOut=ميزان الايرادات والمصروفات
 ReportTurnover=Turnover invoiced
 ReportTurnoverCollected=Turnover collected
 PaymentsNotLinkedToInvoice=المدفوعات ليست مرتبطة بأي الفاتورة ، وذلك ليس مرتبطا بأي طرف ثالث
 PaymentsNotLinkedToUser=المدفوعات ليست مرتبطة بأي مستخدم
 Profit=الأرباح
 AccountingResult=نتيجة المحاسبة
-BalanceBefore=Balance (before)
+BalanceBefore=الميزان (قبل)
 Balance=التوازن
 Debit=الخصم
 Credit=الائتمان
 Piece=تمثل الوثيقة.
 AmountHTVATRealReceived=جمعت HT
 AmountHTVATRealPaid=HT المدفوعة
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
+VATToPay=المبيعات الضريبية
+VATReceived=تم استلام الضريبة
+VATToCollect=المشتريات الضريبية
 VATSummary=Tax monthly
 VATBalance=Tax Balance
 VATPaid=Tax paid
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=جمعت ضريبة القيمة المضافة
 StatusToPay=دفع
 SpecialExpensesArea=منطقة لجميع المدفوعات الخاصة
+VATExpensesArea=منطقة لجميع مدفوعات TVA
 SocialContribution=الضريبة الاجتماعية أو المالية
 SocialContributions=الضرائب الاجتماعية أو المالية
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=الزبون تسديد الفاتورة
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=اجتماعي / دفع الضرائب المالية
 PaymentVat=دفع ضريبة القيمة المضافة
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=قائمة المدفوعات
 ListOfCustomerPayments=قائمة مدفوعات العملاء
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF الدفع
 LT2PaymentsES=الدفعات IRPF
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=استقبال المدخلات تاريخ الشيك
 NbOfCheques=No. of checks
 PaySocialContribution=دفع ضريبة اجتماعية / مالية
-ConfirmPaySocialContribution=هل أنت متأكد أنك تريد أن تصنيف هذه الضريبة الاجتماعية أو المالية كما دفعت؟
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=حذف دفع الضرائب الاجتماعي أو المالي
-ConfirmDeleteSocialContribution=هل أنت متأكد أنك تريد حذف / دفع الضرائب المالية الاجتماعي؟
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=الضرائب والمدفوعات الاجتماعية والمالية
 CalcModeVATDebt=<b>الوضع٪ SVAT بشأن المحاسبة الالتزام٪ الصورة.</b>
 CalcModeVATEngagement=وضع <b>SVAT٪ على مداخيل مصاريف٪ الصورة.</b>
@@ -163,6 +175,7 @@ RulesResultInOut=- ويشمل المدفوعات الحقيقية المحرز 
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=تقرير من ضريبة القيمة المضافة العملاء جمع ودفع
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=تقرير معدل RE
@@ -217,7 +231,7 @@ Pcg_subtype=PCG النوع الفرعي
 InvoiceLinesToDispatch=خطوط الفاتورة لارسال
 ByProductsAndServices=By product and service
 RefExt=المرجع الخارجي
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=تصل إلى النظام
 Mode1=طريقة 1
 Mode2=طريقة 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=استنساخ لشهر المقبل
 SimpleReport=تقرير بسيط
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/ar_SA/ecm.lang b/htdocs/langs/ar_SA/ecm.lang
index 7ad2d6317de..94e1664bd58 100644
--- a/htdocs/langs/ar_SA/ecm.lang
+++ b/htdocs/langs/ar_SA/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index bf46cf3364d..8ed6de325ed 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=لم يتم العثور على دليل <b>%s</b> (مسار غ
 ErrorFunctionNotAvailableInPHP=<b>ق ٪</b> وظيفة مطلوبة لهذه الميزة ولكن لا تتوافر في هذه النسخة / الإعداد للPHP.
 ErrorDirAlreadyExists=دليل بهذا الاسم بالفعل.
 ErrorFileAlreadyExists=ملف بهذا الاسم موجود مسبقا.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=الملف لم تتلق تماما بواسطة الخادم.
 ErrorNoTmpDir=%s directy مؤقتة لا وجود.
 ErrorUploadBlockedByAddon=حظر حمل من قبل البرنامج المساعد بى اباتشي /.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/ar_SA/externalsite.lang b/htdocs/langs/ar_SA/externalsite.lang
index 5ef5bd5ca9d..e1c326b4787 100644
--- a/htdocs/langs/ar_SA/externalsite.lang
+++ b/htdocs/langs/ar_SA/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=إعداد رابط لموقع خارجي
-ExternalSiteURL=رابط للموقع الخارجي 
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=لم يتم تهيئة نموذج الموقع الخارجي بصورة صحيحة.
 ExampleMyMenuEntry=مُدخل قائمتي
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 22d691bfb23..bb91885ee64 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -5,7 +5,7 @@ DIRECTION=rtl
 # stsongstdlight or cid0cs are for simplified Chinese
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
 FONTFORPDF=DejaVuSans
-FONTSIZEFORPDF=9
+FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=None
 FormatDateShort=%d/%m/%Y
@@ -24,110 +24,110 @@ FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=اتصال قاعدة البيانات
-NoTemplateDefined=No template available for this email type
-AvailableVariables=Available substitution variables
+NoTemplateDefined=لا يوجد قالب متاح لهذا النوع من البريد الإلكتروني
+AvailableVariables=متغيرات الاستبدال المتاحة
 NoTranslation=لا يوجد ترجمة
 Translation=الترجمة
 CurrentTimeZone=حسب توقيت خادم البي إتش بي
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
+EmptySearchString=أدخل معايير بحث غير فارغة
+EnterADateCriteria=أدخل معايير التاريخ
 NoRecordFound=لا يوجد سجلات
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
+NoRecordDeleted=لم يتم حذف أي سجل
+NotEnoughDataYet=لا توجد بيانات كافية
 NoError=لا خطأ
 Error=خطأ
 Errors=أخطاء
-ErrorFieldRequired=مطلوب حقل '%s' ق
-ErrorFieldFormat=حقل '٪ ق' له قيمة سيئة
-ErrorFileDoesNotExists=الملف غير موجود٪ الصورة
-ErrorFailedToOpenFile=فشل في فتح الملف٪ الصورة
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=المعلمة %s غير معرف
+ErrorFieldRequired=الحقل "%s" مطلوب
+ErrorFieldFormat=يحتوي الحقل "%s" على قيمة غير صالحة
+ErrorFileDoesNotExists=الملف %s غير موجود
+ErrorFailedToOpenFile=فشل فى فتح الملف %s
+ErrorCanNotCreateDir=لا يمكن إنشاء الدليل %s
+ErrorCanNotReadDir=لا يمكن قراءة الدليل %s
+ErrorConstantNotDefined=المعامل %s غير معرف
 ErrorUnknown=خطأ غير معروف
 ErrorSQL=خطأ SQL
-ErrorLogoFileNotFound=لم يتم العثور على ملف شعار '٪ ق'
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
-ErrorGoToModuleSetup=الذهاب إلى الوحدة الإعداد لإصلاح هذه
-ErrorFailedToSendMail=فشل في إرسال البريد (المرسل =٪ ق، استقبال =٪ ق)
-ErrorFileNotUploaded=ويتم تحميل الملف. تحقق لا يتجاوز هذا الحجم الأقصى المسموح به، أن المساحة الحرة المتوفرة على القرص والتي لا يوجد بالفعل ملف بنفس الاسم في هذا الدليل.
-ErrorInternalErrorDetected=خطأ الكشف عن
-ErrorWrongHostParameter=المعلمة المضيف خاطئة
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorLogoFileNotFound=لم يتم العثور على ملف الشعار '%s'
+ErrorGoToGlobalSetup=انتقل إلى إعدادات  "الشركة | المؤسسة" لإصلاح ذلك
+ErrorGoToModuleSetup=انتقل إلى إعدادات الوحدة النمطية لإصلاح هذا
+ErrorFailedToSendMail=فشل في إرسال البريد (المرسل = %s ، المتلقي = %s)
+ErrorFileNotUploaded=لم يتم تحميل الملف. تحقق من أن الحجم لا يتجاوز الحد الأقصى المسموح به ، وأن المساحة الخالية متوفرة على القرص وأنه لا يوجد بالفعل ملف بنفس الاسم في هذا الدليل.
+ErrorInternalErrorDetected=تم الكشف عن خطأ
+ErrorWrongHostParameter=معامل مضيف خاطئ (Wrong host parameter)
+ErrorYourCountryIsNotDefined=لم يتم تعريف بلدك. انتقل إلى Home-Setup-Edit وانشر النموذج مرة أخرى.
+ErrorRecordIsUsedByChild=فشل حذف هذا السجل. يتم استخدام هذا السجل من قبل سجل فرعي واحد على الأقل.
 ErrorWrongValue=قيمة خاطئة
-ErrorWrongValueForParameterX=قيمة خاطئة للمعلمة٪ الصورة
-ErrorNoRequestInError=أي طلب في الخطأ
-ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
+ErrorWrongValueForParameterX=قيمة خاطئة للمعامل (parameter) %s
+ErrorNoRequestInError=لا يوجد طلب عن طريق الخطأ
+ErrorServiceUnavailableTryLater=الخدمة غير متوفرة في الوقت الحالي. حاول مرة أخرى في وقت لاحق.
 ErrorDuplicateField=قيمة مكررة في حقل فريد
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=فشل في العثور على <b>المستخدم٪ الصورة</b> في قاعدة بيانات Dolibarr.
-ErrorNoVATRateDefinedForSellerCountry=خطأ، لا معدلات ضريبة القيمة المضافة المحددة للبلد '٪ ق'.
-ErrorNoSocialContributionForSellerCountry=خطأ، لا الاجتماعي / المالي نوع الضرائب المحددة للبلد '٪ ق'.
+ErrorSomeErrorWereFoundRollbackIsDone=تم العثور على بعض الأخطاء. تم التراجع عن التغييرات.
+ErrorConfigParameterNotDefined=لم يتم تعريف المعامل <b> %s </b> في ملف تكوين <b>Dolibarr </b> conf.php .
+ErrorCantLoadUserFromDolibarrDatabase=فشل العثور على المستخدم <b> %s </b> في قاعدة بيانات Dolibarr.
+ErrorNoVATRateDefinedForSellerCountry=خطأ ، لم يتم تحديد معدلات ضريبة القيمة المضافة للبلد "%s".
+ErrorNoSocialContributionForSellerCountry=خطأ ، لم يتم تحديد نوع الضرائب الاجتماعية | المالية للبلد "%s".
 ErrorFailedToSaveFile=خطأ، فشل في حفظ الملف.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
-MaxNbOfRecordPerPage=Max. number of records per page
+ErrorCannotAddThisParentWarehouse=أنت تحاول إضافة مستودع رئيسي هو بالفعل تابع لمستودع موجود
+MaxNbOfRecordPerPage=عدد السجلات الاعلى في الصفحة الواحدة
 NotAuthorized=غير مصرح لك ان تفعل ذلك.
-SetDate=التاريخ المحدد
-SelectDate=تحديد تاريخ
-SeeAlso=انظر أيضا الصورة٪
+SetDate=تحديد التاريخ
+SelectDate=اختر التاريخ
+SeeAlso=راجع أيضًا %s
 SeeHere=انظر هنا
 ClickHere=اضغط هنا
-Here=Here
+Here=هنا
 Apply=تطبيق
 BackgroundColorByDefault=لون الخلفية الافتراضية
-FileRenamed=The file was successfully renamed
-FileGenerated=The file was successfully generated
-FileSaved=The file was successfully saved
+FileRenamed=تمت إعادة تسمية الملف بنجاح
+FileGenerated=تم إنشاء الملف بنجاح
+FileSaved=تم حفظ الملف بنجاح
 FileUploaded=تم تحميل الملف بنجاح
-FileTransferComplete=File(s) uploaded successfully
-FilesDeleted=File(s) successfully deleted
-FileWasNotUploaded=يتم اختيار ملف لمرفق ولكن لم تحميلها بعد. انقر على "إرفاق ملف" لهذا الغرض.
-NbOfEntries=No. of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
+FileTransferComplete=تم تحميل الملف (الملفات) بنجاح
+FilesDeleted=تم حذف الملف (الملفات) بنجاح
+FileWasNotUploaded=تم تحديد ملف للإرفاق ولكن لم يتم تحميله بعد. انقر فوق "إرفاق ملف" لهذا الغرض.
+NbOfEntries=عدد الإدخالات
+GoToWikiHelpPage=قراءة التعليمات عبر الإنترنت (يلزم الاتصال بالإنترنت)
 GoToHelpPage=قراءة المساعدة
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
-HomePage=Home Page
-RecordSaved=سجل حفظ
+DedicatedPageAvailable=هناك صفحة تعليمات مخصصة تتعلق بشاشتك الحالية
+HomePage=الصفحة الرئيسية
+RecordSaved=تم حفظ سجل
 RecordDeleted=سجل محذوف
-RecordGenerated=Record generated
-LevelOfFeature=مستوى ميزات
+RecordGenerated=تم إنشاء سجل
+LevelOfFeature=مستوى الميزات
 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.
+DolibarrInHttpAuthenticationSoPasswordUseless=تم ضبط وضع مصادقة Dolibarr على <b> %s </b> في ملف التكوين <b> conf.php </b>. <br> هذا يعني أن قاعدة بيانات كلمة المرور خارجية لـ Dolibarr ، لذلك قد لا يكون لتغيير هذا الحقل أي تأثير.
 Administrator=مدير
 Undefined=غير محدد
-PasswordForgotten=Password forgotten?
-NoAccount=No account?
+PasswordForgotten=هل نسيت كلمة المرور؟
+NoAccount=لا يوجد حساب؟
 SeeAbove=أنظر فوق
 HomeArea=الصفحة الرئيسية
-LastConnexion=Last login
-PreviousConnexion=Previous login
-PreviousValue=Previous value
-ConnectedOnMultiCompany=إتصال على البيئة
-ConnectedSince=إتصال منذ
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=نوع قاعدة البيانات مدير
-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 خطأ فني
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+LastConnexion=آخر تسجيل دخول
+PreviousConnexion=تسجيل الدخول السابق
+PreviousValue=القيمة السابقه
+ConnectedOnMultiCompany=متصل بالبيئة
+ConnectedSince=متصل منذ 
+AuthenticationMode=وضع المصادقة
+RequestedUrl=مطلوب URL
+DatabaseTypeManager=مدير نوع قاعدة البيانات
+RequestLastAccessInError=أحدث خطأ في طلب الوصول إلى قاعدة البيانات
+ReturnCodeLastAccessInError=إرجاع الكود لأحدث خطأ في طلب الوصول إلى قاعدة البيانات
+InformationLastAccessInError=معلومات عن خطأ طلب الوصول إلى قاعدة البيانات الأخيرة
+DolibarrHasDetectedError=Dolibarr اكتشف خطأ تقني
+YouCanSetOptionDolibarrMainProdToZero=يمكنك قراءة ملف السجل أو تعيين الخيار $ dolibarr_main_prod إلى "0" في (config file) للحصول على مزيد من المعلومات.
+InformationToHelpDiagnose=يمكن أن تكون هذه المعلومات مفيدة لأغراض التشخيص (يمكنك تعيين الخيار $ dolibarr_main_prod على "1" لإزالة هذه الإشعارات)
 MoreInformation=المزيد من المعلومات
 TechnicalInformation=المعلومات التقنية
 TechnicalID=ID الفني
-LineID=Line ID
-NotePublic=ملاحظة (الجمهور)
-NotePrivate=ملاحظة (خاص)
-PrecisionUnitIsLimitedToXDecimals=كان Dolibarr الإعداد للحد من دقة أسعار الوحدات إلى <b>العشرية٪ الصورة.</b>
+LineID=معرف البند
+NotePublic=ملاحظة (عامة)
+NotePrivate=ملاحظة (خاصة)
+PrecisionUnitIsLimitedToXDecimals=تم إعداد Dolibarr للحد من دقة أسعار الوحدات إلى <b> %s </b> العشرية.
 DoTest=اختبار
 ToFilter=فلتر
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
-yes=نعم فعلا
-Yes=نعم فعلا
+NoFilter=بدون فلتر
+WarningYouHaveAtLeastOneTaskLate=تحذير ، لديك عنصر واحد على الأقل تجاوز وقت التسامح(tolerance time).
+yes=نعم
+Yes=نعم
 no=لا
 No=لا
 All=جميع
@@ -135,124 +135,124 @@ Home=الصفحة الرئيسية
 Help=مساعدة
 OnlineHelp=مساعدة على الانترنت
 PageWiki=صفحة ويكيبيديا
-MediaBrowser=Media browser
+MediaBrowser=متصفح الوسائط
 Always=دائما
 Never=أبدا
 Under=تحت
 Period=فترة
 PeriodEndDate=تاريخ انتهاء الفترة
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
-Activate=فعل
-Activated=تنشيط
+SelectedPeriod=الفترة المحددة
+PreviousPeriod=الفترة السابقة
+Activate=تفعيل
+Activated=مفعل
 Closed=مغلق
 Closed2=مغلق
-NotClosed=Not closed
-Enabled=تمكين
+NotClosed=ليست مغلقة
+Enabled=ممكن
 Enable=تمكين
-Deprecated=انتقدت
+Deprecated=إهمال
 Disable=تعطيل
-Disabled=تعطيل
+Disabled=معطل
 Add=إضافة
-AddLink=إضافة وصلة
-RemoveLink=نلغي
-AddToDraft=Add to draft
+AddLink=إضافة رابط
+RemoveLink=إزالة رابط
+AddToDraft=أضف إلى المسودة
 Update=تحديث
 Close=إغلاق
-CloseAs=Set status to
-CloseBox=Remove widget from your dashboard
+CloseAs=ضبط الحالة على
+CloseBox=إزالة القطعة (widget) من لوحة القيادة الخاصة بك
 Confirm=تأكيد
-ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=هل تريد حقًا إرسال محتوى هذه البطاقة بالبريد إلى <b> %s </b>؟
 Delete=حذف
 Remove=إزالة
-Resiliate=Terminate
+Resiliate=تعطيل
 Cancel=إلغاء
 Modify=تعديل
 Edit=تحرير
-Validate=التحقق من صحة
-ValidateAndApprove=التحقق من صحة والموافقة
-ToValidate=للتحقق من صحة
-NotValidated=Not validated
+Validate=اعتماد
+ValidateAndApprove=الاعتماد والموافقة
+ToValidate=للاعتماد
+NotValidated=غير معتمد
 Save=حفظ
 SaveAs=حفظ باسم
-SaveAndStay=Save and stay
-SaveAndNew=Save and new
+SaveAndStay=احفظ وامكث
+SaveAndNew=حفظ وجديد
 TestConnection=اختبار الاتصال
 ToClone=استنساخ
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmCloneAsk=هل أنت متأكد أنك تريد استنساخ الكائن <b> %s </b>؟
+ConfirmClone=اختر البيانات التي تريد استنساخها:
 NoCloneOptionsSpecified=لا توجد بيانات لاستنساخ محددة.
 Of=من
 Go=اذهب
-Run=اركض
+Run=أدار | شغل
 CopyOf=نسخة من
 Show=تبين
-Hide=Hide
-ShowCardHere=مشاهدة بطاقة
-Search=البحث عن
-SearchOf=البحث عن
+Hide=إخفاء
+ShowCardHere=عرض بطاقة
+Search=بحث
+SearchOf=بحث
 SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+QuickAdd=إضافة سريعة
 QuickAddMenuShortCut=Ctrl + shift + l
-Valid=سارية المفعول
-Approve=الموافقة
+Valid=صالح
+Approve=موافق
 Disapprove=رفض
 ReOpen=إعادة فتح
 Upload=Upload
 ToLink=حلقة الوصل
 Select=اختار
-SelectAll=Select all
+SelectAll=اختر الكل
 Choose=أختر
-Resize=تغيير
-ResizeOrCrop=Resize or Crop
-Recenter=Recenter
+Resize=تغيير الحجم
+ResizeOrCrop=تغيير الحجم أو اقتصاص
+Recenter=إعادة توسيط
 Author=مؤلف
 User=المستعمل
 Users=المستخدمين
 Group=مجموعة
 Groups=المجموعات
-NoUserGroupDefined=لا توجد مجموعة يحددها المستخدم
-Password=الرمز السري
-PasswordRetype=أعد كتابة كلمة السر
-NoteSomeFeaturesAreDisabled=لاحظ أن الكثير من الميزات / معطلة في هذه المظاهرة وحدات.
+NoUserGroupDefined=لم يتم تحديد مجموعة مستخدمين
+Password=كلمة المرور
+PasswordRetype=أعد كتابة كلمة المرور
+NoteSomeFeaturesAreDisabled=لاحظ أنه تم تعطيل الكثير من الميزات | الوحدات في هذا العرض التوضيحي.
 Name=اسم
-NameSlashCompany=Name / Company
+NameSlashCompany=الاسم | الشركة
 Person=شخص
-Parameter=معلمة
-Parameters=المعايير
+Parameter=معامل
+Parameters=العوامل
 Value=القيمة
-PersonalValue=قيمة الشخصية
-NewObject=New %s
+PersonalValue=قيمة شخصية
+NewObject=جديد %s
 NewValue=القيمة الجديدة
-OldValue=Old value %s
+OldValue=القيمة القديمة %s
 CurrentValue=القيمة الحالية
-Code=رمز
+Code=الكود
 Type=اكتب
 Language=لغة
 MultiLanguage=متعدد اللغات
 Note=ملاحظة
-Title=العنوان
+Title=اللقب
 Label=ملصق
-RefOrLabel=المرجع. أو هذا الملصق
+RefOrLabel=المرجع أو الملصق
 Info=سجل
 Family=عائلة
 Description=الوصف
 Designation=الوصف
-DescriptionOfLine=وصف خط
-DateOfLine=Date of line
-DurationOfLine=Duration of line
-Model=Doc template
-DefaultModel=Default doc template
+DescriptionOfLine=وصف البند
+DateOfLine=تاريخ البند
+DurationOfLine=مدة البند
+Model=قالب المستند
+DefaultModel=قالب المستند الافتراضي
 Action=حدث
 About=حول
 Number=عدد
-NumberByMonth=عدد بحلول الشهر
-AmountByMonth=المبلغ الشهر
+NumberByMonth=العدد بالشهر
+AmountByMonth=المبلغ بالشهر
 Numero=عدد
-Limit=حد
-Limits=حدود
-Logout=تسجيل خروج
-NoLogoutProcessWithAuthMode=أي ميزة قطع تطبيقية مع وضع <b>المصادقة٪ الصورة</b>
+Limit=الحد
+Limits=الحدود
+Logout=تسجيل الخروج
+NoLogoutProcessWithAuthMode=لا توجد ميزة قطع الاتصال التطبيقية مع وضع المصادقة <b> %s </b>
 Connection=تسجيل الدخول
 Setup=التثبيت
 Alert=إنذار
@@ -262,42 +262,43 @@ Next=التالى
 Cards=بطاقات
 Card=بطاقة
 Now=الآن
-HourStart=بدء ساعة
-Deadline=Deadline
+HourStart=ساعة البدء
+Deadline=الموعد النهائي
 Date=التاريخ
 DateAndHour=التاريخ و الساعة
-DateToday=Today's date
-DateReference=Reference date
+DateToday=تاريخ اليوم
+DateReference=التاريخ المرجعي
 DateStart=تاريخ البدء
 DateEnd=تاريخ الانتهاء
 DateCreation=تاريخ الإنشاء
-DateCreationShort=يخلق. التاريخ
-IPCreation=Creation IP
+DateCreationShort=تاريخ الإنشاء
+IPCreation=إنشاء IP
 DateModification=تاريخ التعديل
-DateModificationShort=Modif. التاريخ
-IPModification=Modification IP
-DateLastModification=Latest modification date
-DateValidation=تاريخ التحقق من الصحة
+DateModificationShort=تاريخ التعديل
+IPModification=تعديل IP
+DateLastModification=تاريخ آخر تعديل
+DateValidation=تاريخ الاعتماد
+DateSigning=Signing date
 DateClosing=الموعد النهائي
 DateDue=تاريخ الاستحقاق
 DateValue=تاريخ القيمة
 DateValueShort=تاريخ القيمة
 DateOperation=تاريخ التشغيل
-DateOperationShort=دار الأوبرا. التاريخ
+DateOperationShort=تاريخ التشغيل
 DateLimit=تاريخ الحد
 DateRequest=تاريخ الطلب
 DateProcess=تاريخ العملية
-DateBuild=تقرير تاريخ الإنشاء
-DatePayment=تاريخ الدفع
+DateBuild=تاريخ إنشاء التقرير
+DatePayment=تاريخ السداد
 DateApprove=تاريخ الموافقة
 DateApprove2=تاريخ الموافقة (موافقة الثانية)
-RegistrationDate=Registration date
-UserCreation=Creation user
-UserModification=Modification user
-UserValidation=Validation user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-UserValidationShort=Valid. user
+RegistrationDate=تاريخ التسجيل
+UserCreation=المستخدم المنشأ
+UserModification=المستخدم المعدل
+UserValidation=المستخدم المعتمد
+UserCreationShort=المستخدم المنشأ
+UserModificationShort=المستخدم المعدل
+UserValidationShort=المستخدم المعتمد
 DurationYear=سنة
 DurationMonth=شهر
 DurationWeek=أسبوع
@@ -323,272 +324,274 @@ Minutes=دقيقة
 Seconds=ثواني
 Weeks=أسابيع
 Today=اليوم
-Yesterday=اليوم السابق
-Tomorrow=يوم غد
+Yesterday=الأمس
+Tomorrow=الغد
 Morning=صباح
 Afternoon=بعد الزوال
-Quadri=قادري
-MonthOfDay=شهر من اليوم
-DaysOfWeek=Days of week
-HourShort=H
-MinuteShort=مليون
+Quadri=Quadri
+MonthOfDay=شهر اليوم
+DaysOfWeek=ايام الاسبوع
+HourShort=س
+MinuteShort=د
 Rate=معدل
-CurrencyRate=Currency conversion rate
+CurrencyRate=معدل تحويل العملات
 UseLocalTax=يشمل الضرائب
 Bytes=بايت
 KiloBytes=كيلو بايت
 MegaBytes=ميغابايت
 GigaBytes=غيغا بايت
 TeraBytes=تيرابايت
-UserAuthor=User of creation
-UserModif=User of last update
-b=ب.
+UserAuthor=مستخدم الانشاء
+UserModif=مستخدم آخر تحديث
+b=بايت
 Kb=كيلوبايت
 Mb=ميغابايت
 Gb=جيجابايت
-Tb=مرض السل
+Tb=تيرابيت
 Cut=قطع
 Copy=نسخ
 Paste=لصق
 Default=افتراضي
 DefaultValue=القيمة الافتراضية
-DefaultValues=Default values/filters/sorting
+DefaultValues=القيم الافتراضية | التصفية | الفرز
 Price=السعر
-PriceCurrency=Price (currency)
+PriceCurrency=السعر (العملة)
 UnitPrice=سعر الوحدة
-UnitPriceHT=Unit price (excl.)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceHT=سعر الوحدة (غير شامل)
+UnitPriceHTCurrency=سعر الوحدة (غير شامل) (العملة)
 UnitPriceTTC=سعر الوحدة
-PriceU=إلى أعلى
-PriceUHT=UP (صافي)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=UP (شركة الضريبة)
-Amount=كمية
-AmountInvoice=قيمة الفاتورة
-AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
-AmountPayment=مبلغ الدفع
-AmountHTShort=Amount (excl.)
-AmountTTCShort=المبلغ (المؤتمر الوطني العراقي. الضريبية)
-AmountHT=Amount (excl. tax)
-AmountTTC=المبلغ (المؤتمر الوطني العراقي. الضريبية)
+PriceU=سعر الوحدة
+PriceUHT=سعر الوحدة (صافي)
+PriceUHTCurrency=U.P (net) (currency)
+PriceUTTC=السعر (شامل الضريبة)
+Amount=المبلغ
+AmountInvoice=مبلغ الفاتورة
+AmountInvoiced=المبلغ المفوتر
+AmountInvoicedHT=المبلغ المفوتر (بدون الضريبة)
+AmountInvoicedTTC=المبلغ المفوتر (شامل الضريبة)
+AmountPayment=مبلغ السداد
+AmountHTShort=المبلغ (غير شامل الضريبة)
+AmountTTCShort=المبلغ (شامل الضريبة)
+AmountHT=المبلغ (غير شامل الضريبة)
+AmountTTC=المبلغ (شامل الضريبة)
 AmountVAT=مبلغ الضريبة
-MulticurrencyAlreadyPaid=Already paid, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (excl. tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAlreadyPaid=مسددة ، العملة الأصلية
+MulticurrencyRemainderToPay= المتبقي ، العملة الأصلية
+MulticurrencyPaymentAmount=المبلغ المدفوع ، العملة الأصلية
+MulticurrencyAmountHT=المبلغ (غير شامل الضريبة) ، العملة الأصلية
+MulticurrencyAmountTTC=المبلغ (شامل الضريبة) ، العملة الأصلية
+MulticurrencyAmountVAT=مبلغ الضريبة ، العملة الأصلية
 MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=مبلغ الضريبة 2
 AmountLT2=مبلغ الضريبة 3
 AmountLT1ES=كمية RE
 AmountLT2ES=كمية IRPF
-AmountTotal=الكمية الكلية
-AmountAverage=متوسط ​​كمية
+AmountTotal=المبلغ الإجمالي
+AmountAverage=متوسط المبلغ
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=النسبة المئوية للكائن الأصلي
+AmountOrPercent=المبلغ أو النسبة المئوية
 Percentage=نسبة مئوية
-Total=الإجمالي الكلي
-SubTotal=حاصل الجمع
-TotalHTShort=Total (excl.)
-TotalHT100Short=Total 100%% (excl.)
-TotalHTShortCurrency=Total (excl. in currency)
-TotalTTCShort=إجمالي (شركة الضريبة)
-TotalHT=إجمالي (شركة الضريبة)
-TotalHTforthispage=إجمالي (شركة الضريبة)
-Totalforthispage=Total for this page
-TotalTTC=إجمالي (شركة الضريبة)
-TotalTTCToYourCredit=الإجمالي (المؤتمر الوطني العراقي. الضريبية) لالائتمان الخاصة بك
-TotalVAT=مجموع الضرائب
-TotalVATIN=Total IGST
+Total=الإجمالي
+SubTotal=Subtotal
+TotalHTShort=المجموع (غ ش ض)
+TotalHT100Short=إجمالي 100%% (غ ش ض)
+TotalHTShortCurrency=الاجمالى (غ.ش.ض بعملة)
+TotalTTCShort=الإجمالي (ش.ض)
+TotalHT=الإجمالي (غ.ش.ض)
+TotalHTforthispage=الاجمالي لهذه الصفحة (غ.ش.ض) 
+Totalforthispage=الاجمالي لهذه الصفحة
+TotalTTC=الإجمالي (ش.ض)
+TotalTTCToYourCredit=الإجمالي (ش.ض) إلى رصيدك
+TotalVAT=إجمالي الضريبة
+TotalVATIN=إجمالي IGST
 TotalLT1=مجموع الضرائب 2
 TotalLT2=مجموع الضرائب 3
 TotalLT1ES=مجموع RE
 TotalLT2ES=مجموع IRPF
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
-HT=Excl. tax
-TTC=شركة الضرائب
-INCVATONLY=Inc. VAT
-INCT=Inc. all taxes
+TotalLT1IN=إجمالي CGST
+TotalLT2IN=إجمالي SGST
+HT=غ.ش الضريبة
+TTC=ش. الضريبة
+INCVATONLY=ش. VAT
+INCT=شامل جميع الضرائب
 VAT=ضريبة المبيعات
 VATIN=IGST
 VATs=ضرائب المبيعات
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
+VATINs=ضرائب IGST
+LT1=ضريبة المبيعات 2
+LT1Type=نوع ضريبة المبيعات 2
+LT2=ضريبة المبيعات 3
+LT2Type=نوع ضريبة المبيعات 3
 LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=معدل الضريبة
-VATCode=Tax Rate code
-VATNPR=Tax Rate NPR
-DefaultTaxRate=Default tax rate
+VATCode=كود معدل الضريبة
+VATNPR=معدل ضريبة NPR
+DefaultTaxRate=معدل الضريبة الافتراضي
 Average=متوسط
 Sum=مجموع
 Delta=دلتا
-StatusToPay=دفع
-RemainToPay=Remain to pay
-Module=Module/Application
-Modules=Modules/Applications
+StatusToPay=للدفع
+RemainToPay=المتبقي للدفع
+Module=وحدة | تطبيق
+Modules=الوحدات | التطبيقات
 Option=خيار
-Filters=Filters
+Filters=المرشحات
 List=قائمة
-FullList=القائمة الكاملة
-FullConversation=Full conversation
+FullList=القائمة كاملة
+FullConversation=محادثة كاملة
 Statistics=إحصائيات
-OtherStatistics=الإحصاءات الأخرى
+OtherStatistics=إحصاءات أخرى
 Status=الحالة
 Favorite=المفضل
-ShortInfo=معلومات.
-Ref=المرجع.
-ExternalRef=المرجع. خارجي
-RefSupplier=Ref. vendor
-RefPayment=المرجع. دفع
-CommercialProposalsShort=مقترحات تجارية
+ShortInfo=معلومات
+Ref=المرجع
+ExternalRef=مرجع خارجي
+RefSupplier=مرجع مورد
+RefPayment=مرجع دفع
+CommercialProposalsShort=العروض التجارية
 Comment=التعليق
 Comments=تعليقات
-ActionsToDo=الأحداث للقيام
-ActionsToDoShort=لكى يفعل
-ActionsDoneShort=انتهيت
+ActionsToDo=أحداث للقيام بها
+ActionsToDoShort=للعمل
+ActionsDoneShort=منتهي
 ActionNotApplicable=غير قابل للتطبيق
-ActionRunningNotStarted=لبدء
-ActionRunningShort=In progress
-ActionDoneShort=تم الانتهاء من
-ActionUncomplete=Incomplete
-LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organization
-Accountant=Accountant
+ActionRunningNotStarted=للبدأ
+ActionRunningShort=في تقدم
+ActionDoneShort=تم الانتهاء
+ActionUncomplete=غير مكتمل
+LatestLinkedEvents=أحدث %s أحداث المرتبطة 
+CompanyFoundation=الشركة | المؤسسة
+Accountant=المحاسب
 ContactsForCompany=اتصالات لهذا الطرف الثالث
-ContactsAddressesForCompany=اتصالات / عناوين لهذا الطرف الثالث
+ContactsAddressesForCompany=اتصالات | عناوين لهذا الطرف الثالث
 AddressesForCompany=عناوين لهذا الطرف الثالث
-ActionsOnCompany=Events for this third party
-ActionsOnContact=Events for this contact/address
-ActionsOnContract=Events for this contract
+ActionsOnCompany=أحداث لهذا الطرف الثالث
+ActionsOnContact=الأحداث لهذا الاتصال او العنوان
+ActionsOnContract=أحداث هذا العقد
 ActionsOnMember=الأحداث عن هذا العضو
-ActionsOnProduct=Events about this product
-NActionsLate=٪ في وقت متأخر الصورة
-ToDo=لكى يفعل
-Completed=Completed
-Running=In progress
-RequestAlreadyDone=طلب المسجل بالفعل
+ActionsOnProduct=أحداث حول هذا المنتج
+NActionsLate=%s متأخر
+ToDo=للعمل
+Completed=مكتمل
+Running=في تقدم
+RequestAlreadyDone=تم تسجيل الطلب
 Filter=فلتر
-FilterOnInto=معايير البحث <strong>'٪ ق'</strong> إلى حقول٪ الصورة
+FilterOnInto=معايير البحث '<strong> %s </strong>' في الحقول %s
 RemoveFilter=إزالة فلتر
-ChartGenerated=الرسم البياني المتولدة
-ChartNotGenerated=الرسم البياني لم تولد
-GeneratedOn=بناء على٪ الصورة
-Generate=توليد
-Duration=المدة الزمنية
+ChartGenerated=تم إنشاء الرسم البياني
+ChartNotGenerated=لم يتم إنشاء الرسم البياني
+GeneratedOn=بناء على %s
+Generate=انشاء
+Duration=مدة
 TotalDuration=المدة الإجمالية
 Summary=ملخص
-DolibarrStateBoard=Database Statistics
-DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No open element to process
+DolibarrStateBoard=إحصائيات قاعدة البيانات
+DolibarrWorkBoard=الاصناف المفتوحة
+NoOpenedElementToProcess=لا يوجد عنصر مفتوح للمعالجة
 Available=متاح
-NotYetAvailable=لم تتوفر بعد
+NotYetAvailable=لم يتوفر بعد
 NotAvailable=غير متوفر
-Categories=الكلمات / فئات
-Category=العلامة / فئة
+Categories=العلامات | الفئات
+Category=العلامة | الفئة
 By=بواسطة
-From=من عند
-FromDate=من عند
-FromLocation=من عند
+From=من
+FromDate=من تاريخ
+FromLocation=من
 at=at
 to=إلى
 To=إلى
 and=و
 or=أو
-Other=الآخر
+Other=آخر
 Others=آخرون
-OtherInformations=Other information
+OtherInformations=معلومات أخرى
 Quantity=كمية
 Qty=الكمية
 ChangedBy=تغيير من قبل
-ApprovedBy=التي وافقت عليها
-ApprovedBy2=التي وافقت عليها (موافقة الثانية)
+ApprovedBy=الموافقة من قبل
+ApprovedBy2=الموافقة الثانية من قبل
 Approved=وافق
 Refused=رفض
-ReCalculate=حساب
+ReCalculate=إعادة الحساب
 ResultKo=فشل
 Reporting=التقارير
 Reportings=التقارير
 Draft=مسودة
-Drafts=الداما
-StatusInterInvoiced=Invoiced
-Validated=التحقق من صحة
-ValidatedToProduce=Validated (To produce)
+Drafts=المسودات
+StatusInterInvoiced=مفوترة
+Validated=معتمد
+ValidatedToProduce=معتمد (للانتاج)
 Opened=فتح
-OpenAll=Open (All)
-ClosedAll=Closed (All)
+OpenAll=فتح الكل
+ClosedAll=مغلق (الكل)
 New=جديد
-Discount=تخفيض السعر
+Discount=خصم
 Unknown=غير معروف
-General=جنرال لواء
+General=عام
 Size=حجم
-OriginalSize=Original size
+OriginalSize=الحجم الأصلي
 Received=تم الاستلام
 Paid=دفع
 Topic=الموضوع
 ByCompanies=من قبل أطراف ثالثة
-ByUsers=By user
+ByUsers=من قبل المستخدم
 Links=الروابط
-Link=حلقة الوصل
+Link=رابط
 Rejects=ترفض
 Preview=معاينة
 NextStep=الخطوة التالية
 Datas=البيانات
 None=لا شيء
 NoneF=لا شيء
-NoneOrSeveral=None or several
+NoneOrSeveral=الكل أو لا شيء 
 Late=متأخر
-LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
-NoItemLate=No late item
+LateDesc=يتم تعريف الصنف على أنه متأخر وفقًا لتكوين النظام في القائمة الرئيسية - الإعداد - التنبيهات.
+NoItemLate=لا يوجد صنف متأخر
 Photo=صورة
 Photos=الصور
-AddPhoto=إضافة الصورة
+AddPhoto=إضافة صورة
 DeletePicture=حذف صورة
-ConfirmDeletePicture=تأكيد الصورة الحذف؟
+ConfirmDeletePicture=تأكيد حذف الصورة؟
 Login=تسجيل الدخول
-LoginEmail=Login (email)
-LoginOrEmail=Login or Email
+LoginEmail=تسجيل الدخول (البريد الإلكتروني)
+LoginOrEmail=تسجيل الدخول أو البريد الإلكتروني
 CurrentLogin=تسجيل الدخول الحالي
-EnterLoginDetail=Enter login details
-January=كانون الثاني
-February=شهر فبراير
-March=مارس، يسير، يتقدم
+EnterLoginDetail=أدخل تفاصيل تسجيل الدخول
+January=يناير
+February=فبراير
+March=مارس
 April=أبريل
-May=قد
-June=حزيران
+May=مايو
+June=يونيو
 July=يوليو
 August=أغسطس
 September=سبتمبر
-October=تشرين اول
-November=تشرين الثاني
+October=اكتوبر
+November=نوفمبر
 December=ديسمبر
-Month01=كانون الثاني
-Month02=شهر فبراير
-Month03=مارس، يسير، يتقدم
+Month01=يناير
+Month02=فبراير
+Month03=مارس
 Month04=أبريل
-Month05=قد
-Month06=حزيران
+Month05=مايو
+Month06=يونيو
 Month07=يوليو
 Month08=أغسطس
 Month09=سبتمبر
-Month10=تشرين اول
-Month11=تشرين الثاني
+Month10=اكتوبر
+Month11=نوفمبر
 Month12=ديسمبر
 MonthShort01=يناير
 MonthShort02=فبراير
 MonthShort03=مارس
 MonthShort04=أبريل
-MonthShort05=قد
+MonthShort05=مايو
 MonthShort06=يونيو
 MonthShort07=يوليو
 MonthShort08=أغسطس
@@ -596,20 +599,20 @@ MonthShort09=سبتمبر
 MonthShort10=أكتوبر
 MonthShort11=نوفمبر
 MonthShort12=ديسمبر
-MonthVeryShort01=J
-MonthVeryShort02=واو
-MonthVeryShort03=م
-MonthVeryShort04=A
-MonthVeryShort05=م
-MonthVeryShort06=J
-MonthVeryShort07=J
-MonthVeryShort08=A
-MonthVeryShort09=دإ
-MonthVeryShort10=O
-MonthVeryShort11=N
-MonthVeryShort12=D
+MonthVeryShort01=01
+MonthVeryShort02=02
+MonthVeryShort03=03
+MonthVeryShort04=04
+MonthVeryShort05=05
+MonthVeryShort06=06
+MonthVeryShort07=07
+MonthVeryShort08=08
+MonthVeryShort09=09
+MonthVeryShort10=10
+MonthVeryShort11=11
+MonthVeryShort12=12
 AttachedFiles=الملفات والمستندات المرفقة
-JoinMainDoc=Join main document
+JoinMainDoc=ضم إلى المستند الرئيسي
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
@@ -617,161 +620,161 @@ ReportName=اسم التقرير
 ReportPeriod=فترة التقرير
 ReportDescription=وصف
 Report=تقرير
-Keyword=Keyword
-Origin=Origin
-Legend=أسطورة
-Fill=تعبئة
+Keyword=الكلمة الرئيسية
+Origin=الأصل
+Legend=عنوان تفسيري
+Fill=ملء
 Reset=إعادة تعيين
 File=ملف
 Files=ملفات
 NotAllowed=غير مسموح
-ReadPermissionNotAllowed=إذن لا يسمح للقراءة
+ReadPermissionNotAllowed=إذن القراءة غير مسموح به
 AmountInCurrency=المبلغ بعملة %s
 Example=مثال
 Examples=أمثلة
 NoExample=على سبيل المثال لا
-FindBug=تقرير خلل
+FindBug=الإبلاغ عن خطأ
 NbOfThirdParties=عدد من الأطراف الثالثة
-NbOfLines=عدد الخطوط
-NbOfObjects=عدد الأجسام
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=الكمية الإجمالية
-DateFromTo=ل٪ من ق ق ٪
-DateFrom=من ق ٪
-DateUntil=حتى ق ٪
+NbOfLines=عدد البنود
+NbOfObjects=عدد الأشياء
+NbOfObjectReferers=عدد الأصناف ذات الصلة
+Referers=الأصناف ذات الصلة
+TotalQuantity=العدد الإجمالي
+DateFromTo=من %s إلى %s
+DateFrom=من %s
+DateUntil=حتى %s
 Check=فحص
 Uncheck=قم بإلغاء التحديد
-Internal=الداخلية
-External=الخارجية
-Internals=الداخلية
-Externals=الخارجية
+Internal=داخلي
+External=خارجي
+Internals=داخلي
+Externals=خارجي
 Warning=تحذير
 Warnings=تحذيرات
 BuildDoc=بناء مستدات
-Entity=كيان
+Entity=بيئة
 Entities=الكيانات
-CustomerPreview=العميل معاينة
-SupplierPreview=Vendor preview
-ShowCustomerPreview=وتبين للعملاء معاينة
-ShowSupplierPreview=Show vendor preview
-RefCustomer=المرجع. العميل
-InternalRef=Internal ref.
+CustomerPreview=معاينة العميل
+SupplierPreview=معاينة المورد
+ShowCustomerPreview=عرض معاينة العميل
+ShowSupplierPreview=عرض معاينة المورد
+RefCustomer=مرجع عميل
+InternalRef=المرجع الداخلي
 Currency=العملة
-InfoAdmin=معلومات للإداريين
+InfoAdmin=معلومات للمسؤولين
 Undo=تراجع
 Redo=إعادة
 ExpandAll=توسيع الكل
 UndoExpandAll=التراجع عن التوسع
-SeeAll=See all
+SeeAll=عرض الكل
 Reason=سبب
-FeatureNotYetSupported=ميزة لم يؤيد
+FeatureNotYetSupported=الميزة غير مدعومة حتى الآن
 CloseWindow=إغلاق النافذة
 Response=رد
 Priority=الأولوية
-SendByMail=Send by email
-MailSentBy=البريد الإلكتروني التي بعث بها
+SendByMail=ارسل بالبريد الإلكترونى
+MailSentBy=البريد الإلكتروني بواسطة
 NotSent=لم يرسل
 TextUsedInTheMessageBody=هيئة البريد الإلكتروني
-SendAcknowledgementByMail=Send confirmation email
+SendAcknowledgementByMail=إرسال بريد إلكتروني للتأكيد
 SendMail=إرسال بريد إلكتروني
-Email=Email
-NoEMail=أي بريد إلكتروني
-AlreadyRead=Already read
-NotRead=Unread
-NoMobilePhone=لا هاتف المحمول
+Email=بريد الالكتروني
+NoEMail=لا بريد إلكتروني
+AlreadyRead=مقروء
+NotRead=غير مقروء
+NoMobilePhone=لا يوجد هاتف محمول
 Owner=مالك
-FollowingConstantsWillBeSubstituted=الثوابت التالية ستكون بديلا المقابلة القيمة.
+FollowingConstantsWillBeSubstituted=سيتم استبدال الثوابت التالية بالقيم المقابلة.
 Refresh=تجديد
 BackToList=العودة إلى قائمة
-BackToTree=Back to tree
+BackToTree=العودة إلى الشجرة
 GoBack=العودة
-CanBeModifiedIfOk=يمكن تعديلها إذا كان صحيحا
-CanBeModifiedIfKo=يمكن تعديلها إذا لم يكن صحيحا
-ValueIsValid=قيمة صالحة
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=سجل تعديل بنجاح
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
-AutomaticCode=مدونة الآلي
-FeatureDisabled=سمة المعوقين
-MoveBox=Move widget
-Offered=عرض
-NotEnoughPermissions=ليس لديك إذن لهذا العمل
-SessionName=اسم الدورة
+CanBeModifiedIfOk=يمكن تعديلها إذا كانت صالحة
+CanBeModifiedIfKo=يمكن تعديلها إذا لم تكن صالحة
+ValueIsValid=القيمة صالحة
+ValueIsNotValid=القيمة غير صالحة
+RecordCreatedSuccessfully=تم إنشاء السجل بنجاح
+RecordModifiedSuccessfully=تم تعديل السجل بنجاح
+RecordsModified=تم تعديل %s سجل (سجلات) 
+RecordsDeleted=تم حذف %s سجل (سجلات) 
+RecordsGenerated=تم إنشاء %s سجل (سجلات) 
+AutomaticCode=كود تلقائي
+FeatureDisabled=ميزة معطلة
+MoveBox=نقل (widget) القطعة
+Offered=معروض
+NotEnoughPermissions=ليس لديك إذن بهذا الإجراء
+SessionName=اسم الجلسة
 Method=الطريقة
 Receive=استقبال
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-ExpectedQty=Expected Qty
+CompleteOrNoMoreReceptionExpected=اكمل أو لا تتوقع شيء أكثر
+ExpectedValue=القيمة المتوقعة
+ExpectedQty=العدد المتوقع
 PartialWoman=جزئي
 TotalWoman=المجموع
-NeverReceived=لم يتلق
+NeverReceived=لم يستلم
 Canceled=ألغى
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
-YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+YouCanChangeValuesForThisListFromDictionarySetup=يمكنك تغيير قيم هذه القائمة من إعدادات القائمة - قواميس
+YouCanChangeValuesForThisListFrom=يمكنك تغيير قيم هذه القائمة من القائمة %s
+YouCanSetDefaultValueInModuleSetup=يمكنك تعيين القيمة الافتراضية المستخدمة عند إنشاء سجل جديد في إعدادات الوحدة النمطية
 Color=لون
-Documents=ربط الملفات
+Documents=الملفات المرتبطة
 Documents2=وثائق
-UploadDisabled=تحميل المعوقين
+UploadDisabled=تم تعطيل الرفع
 MenuAccountancy=محاسبة
 MenuECM=وثائق
 MenuAWStats=AWStats
 MenuMembers=أعضاء
-MenuAgendaGoogle=جوجل جدول الأعمال
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
-ThisLimitIsDefinedInSetup= 
-NoFileFound=لا الوثائق المحفوظة في هذا المجلد
-CurrentUserLanguage=الصيغة الحالية
-CurrentTheme=الموضوع الحالي
+MenuAgendaGoogle=أجندة غوغل
+MenuTaxesAndSpecialExpenses=الضرائب | مصاريف خاصة
+ThisLimitIsDefinedInSetup=حدود دوليبار (Menu home-setup-security): %s كيلوبايت ، حد PHP: %s كيلوبايت
+NoFileFound=No documents uploaded
+CurrentUserLanguage=اللغة الحالية
+CurrentTheme=الواجهة الحالية
 CurrentMenuManager=مدير القائمة الحالي
 Browser=المتصفح
 Layout=Layout
-Screen=Screen
-DisabledModules=والمعوقين وحدات
-For=لأجل
-ForCustomer=الزبون
+Screen=شاشة
+DisabledModules=الوحدات المعطلة
+For=لــ
+ForCustomer=للعميل
 Signature=التوقيع
-DateOfSignature=Date of signature
-HidePassword=وتبين للقيادة مع كلمة السر الخفي
-UnHidePassword=وتظهر واضحة للقيادة حقيقية كلمة السر
+DateOfSignature=تاريخ التوقيع
+HidePassword=عرض الأمر مع كلمة مرور المخفية
+UnHidePassword=عرض الأمر الحقيقي مع كلمة مرور الواضحة
 Root=جذور
-RootOfMedias=Root of public medias (/medias)
+RootOfMedias=جذر الوسائط العامة (/ الوسائط)
 Informations=معلومات
 Page=صفحة
-Notes=وتلاحظ
-AddNewLine=إضافة خط جديد
+Notes=ملاحظات
+AddNewLine=إضافة بند جديد
 AddFile=إضافة ملف
-FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
-CloneMainAttributes=استنساخ وجوه مع السمات الرئيسية
-ReGeneratePDF=Re-generate PDF
-PDFMerge=دمج الشعبي
+FreeZone=منتج - نص حر
+FreeLineOfType=صنف - نص حر ، نوع:
+CloneMainAttributes=استنساخ الكائن بسماته الرئيسية
+ReGeneratePDF=أعد انتاج ملف PDF
+PDFMerge=دمج PDF
 Merge=دمج
-DocumentModelStandardPDF=Standard PDF template
-PrintContentArea=وتظهر الصفحة الرئيسية لطباعة ناحية المحتوى
+DocumentModelStandardPDF=قالب PDF قياسي
+PrintContentArea=عرض الصفحة لطباعة منطقة المحتوى الرئيسية
 MenuManager=مدير القائمة
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
-CoreErrorTitle=نظام خطأ
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+WarningYouAreInMaintenanceMode=تحذير ، أنت في وضع الصيانة: فقط تسجيل الدخول <b> %s يُسمح لـ </b> باستخدام التطبيق في هذا الوضع.
+CoreErrorTitle=خطأ في النظام
+CoreErrorMessage=عفوا لقد حصل خطأ. اتصل بمسؤول النظام لديك للتحقق من السجلات أو تعطيل $ dolibarr_main_prod = 1 للحصول على مزيد من المعلومات.
 CreditCard=بطاقة الائتمان
-ValidatePayment=تحقق من الدفع
-CreditOrDebitCard=Credit or debit card
-FieldsWithAreMandatory=حقول إلزامية مع <b>%s</b>
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
+ValidatePayment=اعتماد الدفع
+CreditOrDebitCard=بطاقة الائتمان أو الخصم
+FieldsWithAreMandatory=الحقول مع <b> %s </b> إلزامية
+FieldsWithIsForPublic=الحقول التي تحتوي على <b> %s </b> تظهر في قائمة الأعضاء العامة. إذا كنت لا تريد هذا ، فقم بإلغاء تحديد المربع "عام".
 AccordingToGeoIPDatabase=(according to GeoIP conversion)
-Line=خط
-NotSupported=غير معتمد
+Line=بند
+NotSupported=غير مدعوم
 RequiredField=الحقل مطلوب
 Result=نتيجة
 ToTest=اختبار
-ValidateBefore=Item must be validated before using this feature
-Visibility=وضوح
-Totalizable=Totalizable
-TotalizableDesc=This field is totalizable in list
+ValidateBefore=يجب اعتماد الاصناف قبل استخدام هذه الميزة
+Visibility=الرؤية
+Totalizable=قابل للجمع
+TotalizableDesc=هذا الحقل قابل للجمع في القائمة
 Private=خاص
 Hidden=مخفي
 Resources=موارد
@@ -782,147 +785,149 @@ After=بعد
 IPAddress=عنوان IP
 Frequency=تردد
 IM=التراسل الفوري
-NewAttribute=جديد السمة
-AttributeCode=السمة رمز
-URLPhoto=للتسجيل من الصورة / الشعار
-SetLinkToAnotherThirdParty=تصل إلى طرف ثالث آخر
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=تصل إلى النظام
-LinkToInvoice=Link to invoice
-LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-LinkToTicket=Link to ticket
-CreateDraft=إنشاء مشروع
-SetToDraft=العودة إلى مشروع
+NewAttribute=سمة جديدة
+AttributeCode=كود السمة
+URLPhoto=عنوان URL للصورة | الشعار
+SetLinkToAnotherThirdParty=ربط بطرف ثالث آخر
+LinkTo=ربط مع او بـ
+LinkToProposal=ربط مع العرض
+LinkToOrder=ربط مع الامر
+LinkToInvoice=ربط مع الفاتورة
+LinkToTemplateInvoice=ربط مع قالب الفاتورة
+LinkToSupplierOrder=ربط مع أمر الشراء
+LinkToSupplierProposal=ربط مع عرض المورد
+LinkToSupplierInvoice=ربط مع فاتورة المورد
+LinkToContract=ربط مع العقد
+LinkToIntervention=ربط مع التداخل
+LinkToTicket=ربط مع التذكرة
+CreateDraft=إنشاء مسودة
+SetToDraft=العودة إلى المسودة
 ClickToEdit=انقر للتحرير
-ClickToRefresh=Click to refresh
-EditWithEditor=Edit with CKEditor
-EditWithTextEditor=Edit with Text editor
-EditHTMLSource=Edit HTML Source
-ObjectDeleted=%s الكائن المحذوف
+ClickToRefresh=انقر للتحديث
+EditWithEditor=تحرير باستخدام CKEditor
+EditWithTextEditor=تحرير باستخدام محرر النصوص
+EditHTMLSource=تحرير مصدر HTML
+ObjectDeleted=تم حذف الكائن %s
 ByCountry=حسب البلد
-ByTown=من بلدة
+ByTown=حسب المدينة
 ByDate=حسب التاريخ
-ByMonthYear=قبل شهر / سنة
-ByYear=بحلول العام
-ByMonth=من قبل شهر
-ByDay=بعد يوم
+ByMonthYear=حسب الشهر | السنة
+ByYear=حسب السنة
+ByMonth=حسب الشهر
+ByDay=حسب اليوم
 BySalesRepresentative=بواسطة مندوب مبيعات
-LinkedToSpecificUsers=يرتبط اسم مستخدم معين
+LinkedToSpecificUsers=مرتبط بجهة اتصال مستخدم معينة
 NoResults=لا نتائج
-AdminTools=Admin Tools
+AdminTools=أدوات المشرف
 SystemTools=ادوات النظام
-ModulesSystemTools=أدوات حدات
+ModulesSystemTools=أدوات الوحدات
 Test=اختبار
 Element=العنصر
-NoPhotoYet=أي صور متوفرة حتى الآن
-Dashboard=Dashboard
-MyDashboard=My Dashboard
+NoPhotoYet=لا توجد صور متاحة حتى الآن
+Dashboard=لوحة القيادة
+MyDashboard=لوحة القيادة الخاصة بي
 Deductible=خصم
-from=من عند
-toward=نحو
+from=من
+toward=باتجاه
 Access=وصول
 SelectAction=حدد العمل
-SelectTargetUser=Select target user/employee
-HelpCopyToClipboard=استخدم Ctrl + C لنسخ إلى الحافظة
-SaveUploadedFileWithMask=حفظ الملف على الخادم مع اسم <strong>"%s"</strong> (otherwise "%s")
+SelectTargetUser=حدد المستخدم | الموظف المستهدف
+HelpCopyToClipboard=استخدم Ctrl + C للنسخ إلى الحافظة
+SaveUploadedFileWithMask=حفظ الملف على الخادم باسم "<strong> %s </strong>" (وإلا "%s")
 OriginFileName=اسم الملف الأصلي
-SetDemandReason=مجموعة مصدر
+SetDemandReason=تعيين المصدر
 SetBankAccount=تحديد الحساب المصرفي
-AccountCurrency=Account currency
+AccountCurrency=عملة الحساب
 ViewPrivateNote=عرض الملاحظات
-XMoreLines=٪ ق خط (ق) مخبأة
-ShowMoreLines=Show more/less lines
+XMoreLines=%s بند (بنود) مخفي
+ShowMoreLines=عرض المزيد | أقل من البنود
 PublicUrl=URL العام
 AddBox=إضافة مربع
-SelectElementAndClick=Select an element and click %s
-PrintFile=طباعة ملف٪ الصورة
-ShowTransaction=Show entry on bank account
+SelectElementAndClick=حدد عنصرًا وانقر فوق %s
+PrintFile=طباعة الملف %s
+ShowTransaction=عرض الإدخال في الحساب المصرفي
 ShowIntervention=عرض التدخل
-ShowContract=وتظهر العقد
-GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+ShowContract=عرض العقد
+GoIntoSetupToChangeLogo=انتقل إلى الصفحة الرئيسية - الإعدادات - الشركة لتغيير الشعار أو انتقل إلى الصفحة الرئيسية - الإعدادات - العرض للاخفاء.
 Deny=رفض
-Denied=رفض
-ListOf=List of %s
+Denied=مرفوض
+ListOf=قائمة %s
 ListOfTemplates=قائمة القوالب
 Gender=جنس
 Genderman=رجل
 Genderwoman=امرأة
 Genderother=الآخر
 ViewList=عرض القائمة
-ViewGantt=Gantt view
-ViewKanban=Kanban view
+ViewGantt=عرض Gantt
+ViewKanban=عرض Kanban
 Mandatory=إلزامي
 Hello=أهلا
-GoodBye=GoodBye
+GoodBye=مع السلامة
 Sincerely=بإخلاص
-ConfirmDeleteObject=Are you sure you want to delete this object?
-DeleteLine=حذف الخط
-ConfirmDeleteLine=Are you sure you want to delete this line?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
-TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
-RelatedObjects=Related Objects
+ConfirmDeleteObject=هل أنت متأكد أنك تريد حذف هذا الكائن؟
+DeleteLine=حذف البند
+ConfirmDeleteLine=هل أنت متأكد أنك تريد حذف هذا البند؟
+ErrorPDFTkOutputFileNotFound=خطأ: لم يتم إنشاء الملف. يرجى التحقق من تثبيت الأمر "pdftk" في دليل مضمن في متغير البيئة $ PATH (نظام لينكس / يونكس فقط) أو اتصل بمسؤول النظام.
+NoPDFAvailableForDocGenAmongChecked=لم يكن هناك ملف PDF متاحًا لإنشاء المستند بين السجلات المحددة
+TooManyRecordForMassAction=تم تحديد عدد كبير جدًا من السجلات. الإجراء مقيد بقائمة %s سجلات.
+NoRecordSelected=لم يتم تحديد اي سجل
+MassFilesArea=مساحة للملفات التي تم إنشاؤها بواسطة إجراءات جماعية
+ShowTempMassFilesArea=عرض مساحة الملفات التي تم إنشاؤها بواسطة الإجراءات الجماعية
+ConfirmMassDeletion=تأكيد الحذف الضخم
+ConfirmMassDeletionQuestion=هل أنت متأكد من أنك تريد حذف %s السجل (السجلات) المحددة؟
+RelatedObjects=كائنات ذات صلة
 ClassifyBilled=تصنيف الفواتير
-ClassifyUnbilled=Classify unbilled
+ClassifyUnbilled=تصنيف غير مفوتر
 Progress=تقدم
-ProgressShort=Progr.
-FrontOffice=Front office
+ProgressShort=تقدم
+FrontOffice=مكتب الإستقبال
 BackOffice=المكتب الخلفي
-Submit=Submit
-View=View
+Submit=يقدم
+View=عرض
 Export=تصدير
 Exports=صادرات
-ExportFilteredList=Export filtered list
-ExportList=Export list
+ExportFilteredList=تصدير قائمة التى تم تصفيتها
+ExportList=قائمة التصدير
 ExportOptions=خيارات التصدير
-IncludeDocsAlreadyExported=Include docs already exported
+IncludeDocsAlreadyExported=تضمين المستندات التي تم تصديرها
 ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
 ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
-AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
-NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+AllExportedMovementsWereRecordedAsExported=تم تسجيل جميع حركات التصدير على أنها مصدرة
+NotAllExportedMovementsCouldBeRecordedAsExported=لا يمكن تسجيل جميع حركات التصدير على أنها مصدرة
 Miscellaneous=متفرقات
 Calendar=التقويم
 GroupBy=Group by...
 ViewFlatList=View flat list
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=عرض دفتر الأستاذ
+ViewSubAccountList=عرض دفتر الأستاذ الفرعي
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
-Download=Download
-DownloadDocument=Download document
-ActualizeCurrency=Update currency rate
+SomeTranslationAreUncomplete=قد تكون بعض اللغات المعروضة مترجمة جزئيًا فقط أو قد تحتوي على أخطاء. الرجاء المساعدة في تصحيح لغتك بالتسجيل في <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> لإضافة تحسيناتك.
+DirectDownloadLink=رابط التحميل العام
+PublicDownloadLinkDesc=فقط مطلوب الرابط لتنزيل الملف
+DirectDownloadInternalLink=رابط التحميل الخاص
+PrivateDownloadLinkDesc=تحتاج إلى تسجيل الدخول وتحتاج إلى أذونات لعرض الملف أو تنزيله
+Download=تحميل
+DownloadDocument=تحميل مستند
+ActualizeCurrency=تحديث سعر العملة
 Fiscalyear=السنة المالية
-ModuleBuilder=Module and Application Builder
-SetMultiCurrencyCode=Set currency
-BulkActions=Bulk actions
-ClickToShowHelp=Click to show tooltip help
-WebSite=Website
-WebSites=Websites
-WebSiteAccounts=Website accounts
-ExpenseReport=تقرير حساب
+ModuleBuilder=الوحدة النمطية ومنشئ التطبيق
+SetMultiCurrencyCode=تعيين العملة
+BulkActions=جملة إجراءات
+ClickToShowHelp=انقر لإظهار تعليمات تلميح الأدوات
+WebSite=الموقع الكتروني
+WebSites=مواقع الويب
+WebSiteAccounts=حسابات الموقع
+ExpenseReport=تقرير المصاريف
 ExpenseReports=تقارير المصاريف
-HR=HR
-HRAndBank=HR and Bank
-AutomaticallyCalculated=Automatically calculated
-TitleSetToDraft=Go back to draft
-ConfirmSetToDraft=Are you sure you want to go back to Draft status?
-ImportId=Import id
+HR=الموارد البشرية
+HRAndBank=الموارد البشرية والبنك
+AutomaticallyCalculated=تحسب تلقائيا
+TitleSetToDraft=ارجع إلى المسودة
+ConfirmSetToDraft=هل أنت متأكد أنك تريد العودة إلى حالة المسودة؟
+ImportId=معرف الاستيراد
 Events=الأحداث
-EMailTemplates=Email templates
-FileNotShared=File not shared to external public
+EMailTemplates=قوالب البريد الإلكتروني
+FileNotShared=الملف غير متاح للجمهور الخارجي
 Project=المشروع
 Projects=مشاريع
 LeadOrProject=Lead | Project
@@ -933,11 +938,11 @@ ListOpenLeads=List open leads
 ListOpenProjects=List open projects
 NewLeadOrProject=New lead or project
 Rights=الصلاحيات
-LineNb=Line no.
-IncotermLabel=شروط التجارة الدولية
+LineNb=رقم البند
+IncotermLabel=مصطلحات تجارية دولية
 TabLetteringCustomer=Customer lettering
 TabLetteringSupplier=Vendor lettering
-Monday=يوم الاثنين
+Monday=الاثنين
 Tuesday=الثلاثاء
 Wednesday=الأربعاء
 Thursday=الخميس
@@ -965,158 +970,162 @@ ShortThursday=تي
 ShortFriday=واو
 ShortSaturday=دإ
 ShortSunday=دإ
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
-SelectMailModel=Select an email template
+one=واحد
+two=اثنين
+three=ثلاثة
+four=أربعة
+five=خمسة
+six=ستة
+seven=سبعة
+eight=ثمانية
+nine=تسعة
+ten=عشرة
+eleven=أحد عشر
+twelve=اثني عشر
+thirteen=ثلاثة عشر
+fourteen=أربعة عشرة
+fifteen=خمسة عشر
+sixteen=ستة عشر
+seventeen=سبعة عشر
+eighteen=ثمانية عشر
+nineteen=تسعة عشر
+twenty=عشرون
+thirty=ثلاثون
+forty=أربعون
+fifty=خمسون
+sixty=ستون
+seventy=سبعون
+eighty=ثمانون
+ninety=تسعون
+hundred=مائة
+thousand=ألف
+million=مليون
+billion=مليار
+trillion=تريليون
+quadrillion=كوادريليون
+SelectMailModel=حدد قالب بريد إلكتروني
 SetRef=تعيين المرجع
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
+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> (أ | ب) <br> <kbd> <strong> * </strong> </kbd> <kbd> أي حرف </kbd> (أ ب *) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> البداية مع </kbd> (^ أ ب) <br> <kbd> <strong> $ </strong> </kbd> <kbd> النهاية مع </kbd> ( ab $) <br>
 Select2LoadingMoreResults=تحميل المزيد من النتائج ...
-Select2SearchInProgress=بحث في التقدم ...
+Select2SearchInProgress=البحث في تقدم ...
 SearchIntoThirdparties=أطراف ثالثة
 SearchIntoContacts=جهات الاتصال
 SearchIntoMembers=أعضاء
 SearchIntoUsers=المستخدمين
 SearchIntoProductsOrServices=المنتجات أو الخدمات
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=مشاريع
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=أوامر التصنيع
 SearchIntoTasks=المهام
 SearchIntoCustomerInvoices=فواتير العملاء
-SearchIntoSupplierInvoices=Vendor invoices
-SearchIntoCustomerOrders=Sales orders
-SearchIntoSupplierOrders=Purchase orders
-SearchIntoCustomerProposals=مقترحات تجارية
-SearchIntoSupplierProposals=Vendor proposals
+SearchIntoSupplierInvoices=فواتير الموردين
+SearchIntoCustomerOrders=اوامر البيع
+SearchIntoSupplierOrders=اوامر الشراء
+SearchIntoCustomerProposals=عروض تجارية
+SearchIntoSupplierProposals=عروض الموردين
 SearchIntoInterventions=التدخلات
 SearchIntoContracts=عقود
-SearchIntoCustomerShipments=Customer shipments
+SearchIntoCustomerShipments=شحنات العملاء
 SearchIntoExpenseReports=تقارير المصاريف
-SearchIntoLeaves=Leave
-SearchIntoTickets=Tickets
-SearchIntoCustomerPayments=Customer payments
-SearchIntoVendorPayments=Vendor payments
+SearchIntoLeaves=الاجازات
+SearchIntoTickets=تذاكر
+SearchIntoCustomerPayments=مدفوعات العميل
+SearchIntoVendorPayments=مدفوعات الموردين
 SearchIntoMiscPayments=مدفوعات متنوعة
 CommentLink=تعليقات
-NbComments=Number of comments
-CommentPage=Comments space
-CommentAdded=Comment added
-CommentDeleted=Comment deleted
-Everybody=مشاريع مشتركة
-PayedBy=يتحملها
-PayedTo=Paid to
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
-Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
+NbComments=عدد التعليقات
+CommentPage=مساحة التعليقات
+CommentAdded=تم إضافة تعليق
+CommentDeleted=التعليق حذف
+Everybody=الجميع
+PayedBy=مدفوع بــ
+PayedTo=مدفوع لــ
+Monthly=شهريا
+Quarterly=ربع سنوى
+Annual=سنوي
+Local=محلي
+Remote=بعيد
+LocalAndRemote=محلي و بعيد
+KeyboardShortcut=اختصارات لوحة المفاتيح
 AssignedTo=مخصص ل
-Deletedraft=Delete draft
-ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
-SelectAThirdPartyFirst=Select a third party first...
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-Inventory=Inventory
-AnalyticCode=Analytic code
-TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
-PaymentInformation=Payment information
-ValidFrom=Valid from
-ValidUntil=Valid until
-NoRecordedUsers=No users
-ToClose=To close
+Deletedraft=حذف المسودة
+ConfirmMassDraftDeletion=تأكيد الحذف الشامل للمسودة
+FileSharedViaALink=ملف مشترك مع رابط عام
+SelectAThirdPartyFirst=حدد طرف ثالث أولاً ...
+YouAreCurrentlyInSandboxMode=أنت حاليًا في وضع %s "sandbox" 
+Inventory=المخزون
+AnalyticCode=الكود التحليلي
+TMenuMRP=تخطيط موارد التصنيع
+ShowCompanyInfos=Show company infos
+ShowMoreInfos=إظهار المزيد من المعلومات
+NoFilesUploadedYet=الرجاء رفع الوثيقة أولا
+SeePrivateNote=مشاهدة ملاحظة خاصة
+PaymentInformation=معلومات السداد
+ValidFrom=صالح من
+ValidUntil=صالح حتى
+NoRecordedUsers=لايوجد مستخدمين
+ToClose=لغلق
 ToProcess=لعملية
-ToApprove=To approve
-GlobalOpenedElemView=Global view
-NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
-NoArticlesFoundForTheCategory=No article found for the category
-ToAcceptRefuse=To accept | refuse
+ToApprove=للموافقة
+GlobalOpenedElemView=نظرة شاملة
+NoArticlesFoundForTheKeyword=لم يتم العثور على مقال للكلمة الأساسية "<strong> %s </strong>"
+NoArticlesFoundForTheCategory=لا توجد مقالة وجدت لهذه الفئة
+ToAcceptRefuse=لقبول | لرفض
 ContactDefault_agenda=حدث
-ContactDefault_commande=الطلبية
+ContactDefault_commande=الامر
 ContactDefault_contrat=العقد
 ContactDefault_facture=فاتورة
 ContactDefault_fichinter=التدخل
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
+ContactDefault_invoice_supplier=فاتورة المورد
+ContactDefault_order_supplier=أمر شراء
 ContactDefault_project=المشروع
 ContactDefault_project_task=مهمة
-ContactDefault_propal=مقترح
-ContactDefault_supplier_proposal=Supplier Proposal
-ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Contact added from contact thirdparty roles
-More=More
-ShowDetails=Show details
-CustomReports=Custom reports
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
-Measures=Measures
-XAxis=X-Axis
-YAxis=Y-Axis
-StatusOfRefMustBe=Status of %s must be %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
-ShowOtherLanguages=Show other languages
-SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
+ContactDefault_propal=عرض
+ContactDefault_supplier_proposal=عرض المورد
+ContactDefault_ticket=تذكرة
+ContactAddedAutomatically=تمت إضافة جهة اتصال من جهات الاتصال الطرف الثالث
+More=أكثر
+ShowDetails=عرض التفاصيل
+CustomReports=تقارير مخصصة
+StatisticsOn=إحصائيات على
+SelectYourGraphOptionsFirst=حدد خيارات الرسم البياني الخاصة بك لإنشاء رسم بياني
+Measures=قياسات
+XAxis=المحور-X
+YAxis=المحور-Y
+StatusOfRefMustBe=الحالة %s يجب أن تكون %s
+DeleteFileHeader=تأكيد الحذف
+DeleteFileText=هل تريد حقا حذف هذا الملف؟
+ShowOtherLanguages=عرض اللغات الأخرى
+SwitchInEditModeToAddTranslation=قم بالتبديل في وضع التحرير لإضافة ترجمات لهذه اللغة
+NotUsedForThisCustomer=غير مستخدم لهذا العميل
+AmountMustBePositive=المبلغ  يجب أن يكون موجبًا
+ByStatus=حسب الحالة
 InformationMessage=معلومات
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s created
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
-DefaultMailModel=Default Mail Model
-PublicVendorName=Public name of vendor
+Used=استخدم
+ASAP=في أقرب وقت ممكن
+CREATEInDolibarr=تم إنشاء %s سجل 
+MODIFYInDolibarr=%s سجل معدّل
+DELETEInDolibarr=%s سجل تم حذفه
+VALIDATEInDolibarr=%s سجل تم اعتماده 
+APPROVEDInDolibarr=%s سجل تم الموافقة عليه
+DefaultMailModel=نموذج البريد الافتراضي
+PublicVendorName=الاسم العام للمورد
 DateOfBirth=تاريخ الميلاد
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=انتهت صلاحية رمز الأمان ، لذلك تم إلغاء الإجراء. حاول مرة اخرى.
+UpToDate=اخر تحديث
+OutOfDate=انتهت صلاحيته
+EventReminder=تذكير بالحدث
+UpdateForAllLines=تحديث لجميع البنود
 OnHold=في الانتظار
 Civility=Civility
 AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/ar_SA/margins.lang b/htdocs/langs/ar_SA/margins.lang
index a68c2b82ab9..964d6de11fa 100644
--- a/htdocs/langs/ar_SA/margins.lang
+++ b/htdocs/langs/ar_SA/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=تفاصيل الهامش
 ProductMargins=هوامش المنتج
 CustomerMargins=هوامش العملاء
 SalesRepresentativeMargins=هوامش ممثل المبيعات
+ContactOfInvoice=Contact of invoice
 UserMargins=هوامش المستخدم
 ProductService=المنتج أو الخدمة
 AllProducts=جميع المنتجات والخدمات
 ChooseProduct/Service=اختيار المنتج أو الخدمة
 ForceBuyingPriceIfNull=فرض سعر  شراء / تكلفة إلى سعر البيع إذا لم يتم تحديدها
-ForceBuyingPriceIfNullDetails=إذا لم يتم تحديد سعر الشراء / التكلفة، وهذا الخيار "تشغيل"، فإن الهامش سيكون صفرا على الخط (سعر الشراء / التكلفة = سعر البيع)، غير ذلك ("إيقاف")، فإن الهامش يساوي الافتراضي المقترح.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=طريقة الهامش للخصومات العالمية
 UseDiscountAsProduct=كمنتج
 UseDiscountAsService=كخدمة
@@ -31,14 +32,14 @@ MARGIN_TYPE=سعر الشراء / التكلفة المقترحة افتراضي
 MargeType1=Margin on Best vendor price
 MargeType2=الهامش على متوسط ​​السعر المرجح (واب)
 MargeType3=هامش على سعر التكلفة
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=سعر الكلفة
 UnitCharges=رسوم الوحدة
 Charges=الرسوم
 AgentContactType=نوع اتصال الوكيل التجاري 
-AgentContactTypeDetails=حدد نوع الاتصال (المرتبط بالفواتير) الذي سيتم استخدامه لتقرير الهامش لكل ممثل بيع
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=يجب أن يكون السعر قيمة رقمية
 markRateShouldBeLesserThan100=يجب أن يكون معدل العلامة أقل من 100
 ShowMarginInfos=إظهار معلومات الهامش
 CheckMargins=تفاصيل الهوامش
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index 98666fd6674..343db0da8b5 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=قائمة مشاريع أعضاء (ينبغي التأكد 
 MembersListValid=قائمة أعضاء صالحة
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=قائمة الأعضاء المؤهلين
 MenuMembersToValidate=أعضاء مشروع
 MenuMembersValidated=صادق أعضاء
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=أعضاء مع اشتراك لتلقي
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=انتهى
 MemberStatusPaid=الاكتتاب حتى الآن
 MemberStatusPaidShort=حتى الآن
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=أعضاء مشروع
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=التحقق من صحة
@@ -82,6 +87,8 @@ Physical=المادية
 Moral=الأخلاقية
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=حذف عضو
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=علامات الشكل
 DescADHERENT_ETIQUETTE_TEXT=النص المطبوع على أوراق عنوان الأعضاء
@@ -162,6 +170,7 @@ DocForLabels=أوراق عنوان انتج (تنسيق الإعداد للإخ
 SubscriptionPayment=دفع الاشتراك
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=أعضاء إحصاءات حسب البلد
 MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاطعة
 MembersStatisticsByTown=أعضاء إحصاءات بلدة
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index a610da6ce30..24d3349a1d3 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -1,188 +1,191 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=أوامر منطقة العملاء
-SuppliersOrdersArea=Purchase orders area
-OrderCard=من أجل بطاقة
+OrdersArea=منطقة أوامر العملاء
+SuppliersOrdersArea=منطقة أوامر الشراء
+OrderCard=بطاقة الامر
 OrderId=رقم التعريف الخاص بالطلب
 Order=ترتيب
 PdfOrderTitle=الطلبية
 Orders=أوامر
-OrderLine=من أجل خط
-OrderDate=من أجل التاريخ
-OrderDateShort=من أجل التاريخ
-OrderToProcess=من أجل عملية
-NewOrder=النظام الجديد
-NewOrderSupplier=New Purchase Order
-ToOrder=ومن أجل جعل
-MakeOrder=ومن أجل جعل
-SupplierOrder=Purchase order
-SuppliersOrders=Purchase orders
-SuppliersOrdersRunning=Current purchase orders
-CustomerOrder=Sales Order
-CustomersOrders=Sales Orders
-CustomersOrdersRunning=Current sales orders
-CustomersOrdersAndOrdersLines=Sales orders and order details
-OrdersDeliveredToBill=Sales orders delivered to bill
-OrdersToBill=Sales orders delivered
-OrdersInProcess=Sales orders in process
-OrdersToProcess=Sales orders to process
-SuppliersOrdersToProcess=Purchase orders to process
-SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
-AwaitingReception=Awaiting reception
-StatusOrderCanceledShort=ألغى
+OrderLine=بند امر
+OrderDate=تاريخ الامر
+OrderDateShort=تاريخ الامر
+OrderToProcess=امر للعمل
+NewOrder=امر جديد
+NewOrderSupplier=أمر شراء جديد
+ToOrder=قم بالامر
+MakeOrder=قم بالامر
+SupplierOrder=أمر شراء
+SuppliersOrders=اوامر الشراء
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
+SuppliersOrdersRunning=أوامر الشراء الحالية
+CustomerOrder=امر بيع
+CustomersOrders=اوامر البيع
+CustomersOrdersRunning=أوامر البيع الحالية
+CustomersOrdersAndOrdersLines=أوامر البيع مع التفاصيل
+OrdersDeliveredToBill=أوامر البيع إلى الفوتورة
+OrdersToBill=أوامر البيع المسلمة
+OrdersInProcess=أوامر المبيعات قيد المتابعة
+OrdersToProcess=أوامر المبيعات قيد المتابعة
+SuppliersOrdersToProcess=أوامر الشراء قيد المتابعة
+SuppliersOrdersAwaitingReception=أوامر الشراء في انتظار الاستلام
+AwaitingReception=في انتظار الاستقبال
+StatusOrderCanceledShort=ملغي
 StatusOrderDraftShort=مسودة
-StatusOrderValidatedShort=صادق
-StatusOrderSentShort=في عملية
-StatusOrderSent=شحنة في عملية
-StatusOrderOnProcessShort=أمر
-StatusOrderProcessedShort=تجهيز
+StatusOrderValidatedShort=معتمدة
+StatusOrderSentShort=قيد المعالجة
+StatusOrderSent=الشحنة قيد المعالجة
+StatusOrderOnProcessShort=تم الامر
+StatusOrderProcessedShort=تم معالجته
 StatusOrderDelivered=تم التوصيل
 StatusOrderDeliveredShort=تم التوصيل
-StatusOrderToBillShort=على مشروع قانون
-StatusOrderApprovedShort=وافق
+StatusOrderToBillShort=تم التوصيل
+StatusOrderApprovedShort=موافقة
 StatusOrderRefusedShort=رفض
-StatusOrderToProcessShort=لعملية
-StatusOrderReceivedPartiallyShort=تلقى جزئيا
-StatusOrderReceivedAllShort=Products received
+StatusOrderToProcessShort=لمعالجة
+StatusOrderReceivedPartiallyShort=تم استلامها جزئيًا
+StatusOrderReceivedAllShort=تم استلام المنتجات
 StatusOrderCanceled=ألغى
-StatusOrderDraft=مشروع (لا بد من التحقق من صحة)
-StatusOrderValidated=صادق
-StatusOrderOnProcess=أمر - استقبال الاستعداد
-StatusOrderOnProcessWithValidation=أمر - استقبال الاستعداد أو التحقق من صحة
-StatusOrderProcessed=تجهيز
-StatusOrderToBill=على مشروع قانون
-StatusOrderApproved=وافق
+StatusOrderDraft=مسودة (للاعتماد)
+StatusOrderValidated=معتمد
+StatusOrderOnProcess=تم الأمر - استعداد للاستقبال
+StatusOrderOnProcessWithValidation=تم طلبه - وضع الاستقبال أو الاعتماد
+StatusOrderProcessed=معالج
+StatusOrderToBill=تم التوصيل
+StatusOrderApproved=موافقة
 StatusOrderRefused=رفض
 StatusOrderReceivedPartially=تلقى جزئيا
-StatusOrderReceivedAll=All products received
-ShippingExist=شحنة موجود
+StatusOrderReceivedAll=تم استلام جميع المنتجات
+ShippingExist=شحنة موجودة
 QtyOrdered=الكمية أمرت
-ProductQtyInDraft=كمية المنتج في مشاريع المراسيم
-ProductQtyInDraftOrWaitingApproved=كمية المنتج إلى مشروع أو الأوامر المعتمدة، لا يأمر بعد
-MenuOrdersToBill=أوامر لمشروع قانون
+ProductQtyInDraft=كمية المنتج في مسودة الاوامر
+ProductQtyInDraftOrWaitingApproved=كمية المنتج في المسودة أو الأوامر المعتمدة ، لم يتم طلبها بعد
+MenuOrdersToBill=تم تسليم الطلبات
 MenuOrdersToBill2=أوامر للفوترة
-ShipProduct=سفينة المنتج
+ShipProduct=شحن المنتج
 CreateOrder=إنشاء أمر
-RefuseOrder=رفض النظام
-ApproveOrder=الموافقة على النظام
-Approve2Order=الموافقة على النظام (المستوى الثاني)
-ValidateOrder=من أجل التحقق من صحة
-UnvalidateOrder=Unvalidate النظام
-DeleteOrder=من أجل حذف
-CancelOrder=من أجل إلغاء
-OrderReopened= Order %s re-open
-AddOrder=إنشاء النظام
-AddPurchaseOrder=Create purchase order
-AddToDraftOrders=إضافة إلى مشروع النظام
-ShowOrder=وتبين من أجل
-OrdersOpened=أوامر لمعالجة
-NoDraftOrders=لا مشاريع المراسيم
-NoOrder=No order
-NoSupplierOrder=No purchase order
-LastOrders=Latest %s sales orders
-LastCustomerOrders=Latest %s sales orders
-LastSupplierOrders=Latest %s purchase orders
-LastModifiedOrders=Latest %s modified orders
-AllOrders=جميع أوامر
+RefuseOrder=رفض الامر
+ApproveOrder=الموافقة على الامر
+Approve2Order=أمر الموافقة (المستوى الثاني)
+ValidateOrder=اعتماد الامر
+UnvalidateOrder=عدم اعتماد الامر
+DeleteOrder=حذف الامر
+CancelOrder=الغاء الامر
+OrderReopened= إعادة فتح الامر %s
+AddOrder=إنشاء امر
+AddPurchaseOrder=إنشاء أمر شراء
+AddToDraftOrders=أضف إلى مسودة امر
+ShowOrder=عرض الامر
+OrdersOpened=أوامر للمعالجة
+NoDraftOrders=لا توجد مسودة اوامر
+NoOrder=لا توجد اوامر
+NoSupplierOrder=لا يوجد أمر شراء
+LastOrders=أحدث %s أوامر مبيعات 
+LastCustomerOrders=أحدث %s أوامر مبيعات 
+LastSupplierOrders=أحدث %s أوامر الشراء 
+LastModifiedOrders=أحدث %s أوامر معدلة
+AllOrders=جميع الاوامر
 NbOfOrders=عدد الأوامر
-OrdersStatistics=أوامر إحصاءات
-OrdersStatisticsSuppliers=Purchase order statistics
-NumberOfOrdersByMonth=عدد أوامر الشهر
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+OrdersStatistics=إحصائيات الاوامر
+OrdersStatisticsSuppliers=إحصائيات اوامر الشراء
+NumberOfOrdersByMonth=عدد الأوامر فى الشهر
+AmountOfOrdersByMonthHT=مبلغ الاوامر حسب الشهر (بدون الضريبة)
 ListOfOrders=قائمة الأوامر
-CloseOrder=وثيق من أجل
-ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
-ConfirmDeleteOrder=Are you sure you want to delete this order?
-ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
-ConfirmCancelOrder=Are you sure you want to cancel this order?
-ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+CloseOrder=اغلاق الامر
+ConfirmCloseOrder=هل أنت متأكد أنك تريد تعيين هذا الطلب ليتم تسليمه؟ بمجرد تسليم الطلب ، يمكن ضبطه على الفاتورة.
+ConfirmDeleteOrder=هل أنت متأكد أنك تريد حذف هذا الطلب؟
+ConfirmValidateOrder=هل أنت متأكد أنك تريد اعتماد هذا الطلب تحت الاسم <b> %s </b>؟
+ConfirmUnvalidateOrder=هل أنت متأكد من أنك تريد استعادة الطلب <b> %s </b> إلى حالة المسودة؟
+ConfirmCancelOrder=هل أنت متأكد أنك تريد إلغاء هذا الطلب؟
+ConfirmMakeOrder=هل تريد بالتأكيد تأكيد قيامك بهذا الطلب على <b> %s </b>؟
 GenerateBill=توليد الفاتورة
 ClassifyShipped=تصنيف تسليمها
-DraftOrders=مشروع أوامر
-DraftSuppliersOrders=Draft purchase orders
-OnProcessOrders=على عملية أوامر
-RefOrder=المرجع. ترتيب
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
-SendOrderByMail=لكي ترسل عن طريق البريد
-ActionsOnOrder=إجراءات من أجل
-NoArticleOfTypeProduct=أي مادة من نوع 'منتج' حتى لا مادة للشحن لهذا النظام
-OrderMode=طريقة أوامر
-AuthorRequest=طلب مقدم البلاغ
-UserWithApproveOrderGrant=مع منح المستخدمين "الموافقة على أوامر" إذن.
-PaymentOrderRef=من أجل دفع ق ٪
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
-DispatchSupplierOrder=Receiving purchase order %s
-FirstApprovalAlreadyDone=الموافقة الأولى فعلت
-SecondApprovalAlreadyDone=الموافقة الثانية فعلت
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
+DraftOrders=مسودة أوامر
+DraftSuppliersOrders=مسودة أوامر الشراء
+OnProcessOrders=أوامر قيد المعالجة
+RefOrder=مرجع الامر
+RefCustomerOrder=مرجع الامر للعميل
+RefOrderSupplier=مرجع الامر للمورد
+RefOrderSupplierShort=مرجع امر المورد
+SendOrderByMail=إرسال الامر عن طريق البريد
+ActionsOnOrder=إجراءات على الامر
+NoArticleOfTypeProduct=لا توجد مقالة من نوع "المنتج" لذلك لا توجد مقالة قابلة للشحن لهذا الطلب
+OrderMode=طريقة الامر
+AuthorRequest=Request author
+UserWithApproveOrderGrant=المستخدمين الحاصلين إذن "الموافقة على الطلبات"
+PaymentOrderRef=سداد للامر %s
+ConfirmCloneOrder=هل أنت متأكد من أنك تريد استنساخ هذا الامر <b> %s </b>؟
+DispatchSupplierOrder=استلام أمر الشراء %s
+FirstApprovalAlreadyDone=تمت الموافقة الأولى
+SecondApprovalAlreadyDone=تمت الموافقة الثانية
+SupplierOrderReceivedInDolibarr=أمر الشراء %s استلم %s
+SupplierOrderSubmitedInDolibarr=تم تقديم امر الشراء %s
+SupplierOrderClassifiedBilled=امر الشراء %s فى وضع فوترة
 OtherOrders=أوامر أخرى
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
-TypeContact_commande_internal_SHIPPING=ممثل الشحن متابعة
-TypeContact_commande_external_BILLING=الزبون فاتورة الاتصال
-TypeContact_commande_external_SHIPPING=العملاء الشحن الاتصال
-TypeContact_commande_external_CUSTOMER=اتصل العملاء بغية متابعة
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
-TypeContact_order_supplier_internal_SHIPPING=ممثل الشحن متابعة
-TypeContact_order_supplier_external_BILLING=Vendor invoice contact
-TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_commande_internal_SALESREPFOLL=مندوب متابعة أوامر البيع
+TypeContact_commande_internal_SHIPPING=مندوب متابعة الشحن
+TypeContact_commande_external_BILLING=جهة اتصال فاتورة العميل
+TypeContact_commande_external_SHIPPING=عنوان التوصيل للعميل
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=مندوب متابعة اوامر الشراء
+TypeContact_order_supplier_internal_SHIPPING=مندوب متابعة الشحن
+TypeContact_order_supplier_external_BILLING=جهة اتصال فاتورة البائع
+TypeContact_order_supplier_external_SHIPPING=عنوان  الشحن للبائع
 TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
-Error_COMMANDE_SUPPLIER_ADDON_NotDefined=لم تعرف COMMANDE_SUPPLIER_ADDON مستمر
-Error_COMMANDE_ADDON_NotDefined=لم تعرف COMMANDE_ADDON مستمر
-Error_OrderNotChecked=لا أوامر إلى فاتورة مختارة
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=لم يتم تعريف COMMANDE_SUPPLIER_ADDON الثابت
+Error_COMMANDE_ADDON_NotDefined=لم يتم تعريف COMMANDE_ADDON الثابت
+Error_OrderNotChecked=لم يتم تحديد أوامر للفوتورة
 # Order modes (how we receive order). Not the "why" are keys stored into dict.lang
-OrderByMail=بريد
+OrderByMail=البريد
 OrderByFax=الفاكس
-OrderByEMail=Email
+OrderByEMail=البريد الالكتروني
 OrderByWWW=على الانترنت
-OrderByPhone=هاتف
+OrderByPhone=الهاتف
 # Documents models
-PDFEinsteinDescription=A complete order model 
-PDFEratostheneDescription=A complete order model
-PDFEdisonDescription=نموذج النظام بسيطة
-PDFProformaDescription=A complete Proforma invoice template
-CreateInvoiceForThisCustomer=أوامر بيل
-NoOrdersToInvoice=لا أوامر فوترة
-CloseProcessedOrdersAutomatically=تصنيف "المصنعة" جميع أوامر المحدد.
-OrderCreation=إنشاء ترتيب
-Ordered=أمر
-OrderCreated=وقد تم إنشاء طلباتكم
-OrderFail=حدث خطأ أثناء إنشاء طلباتكم
+PDFEinsteinDescription=نموذج طلب كامل (التنفيذ القديم لقالب Eratosthene)
+PDFEratostheneDescription=نموذج طلب كامل
+PDFEdisonDescription=نموذج امر بسيط
+PDFProformaDescription=نموذج فاتورة أولية كامل
+CreateInvoiceForThisCustomer=فوترة الامر
+CreateInvoiceForThisSupplier=فوترة الامر
+NoOrdersToInvoice=لا أوامر للفوترة
+CloseProcessedOrdersAutomatically=تصنيف "تمت معالجتها" جميع الاوامر المحددة.
+OrderCreation=إنشاء الامر
+Ordered=الامر تم
+OrderCreated=تم إنشاء أوامرك
+OrderFail=حدث خطأ أثناء إنشاء الامر
 CreateOrders=إنشاء أوامر
-ToBillSeveralOrderSelectCustomer=لإنشاء فاتورة لعدة أوامر، انقر أولا على العملاء، ثم اختر "٪ الصورة".
-OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
-IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
-SetShippingMode=Set shipping mode
-WithReceptionFinished=With reception finished
+ToBillSeveralOrderSelectCustomer=لإنشاء فاتورة لعدة اوامر، انقر أولاً على العميل ، ثم اختر "%s".
+OptionToSetOrderBilledNotEnabled=لم يتم تمكين الخيار سير عمل في الوحدة ، لتعيين الأمر إلى "مفوتر" تلقائيًا عند اعتماد الفاتورة ، لذلك سيتعين عليك تعيين حالة الطلبات إلى "مفوتر" يدويًا بعد إنشاء الفاتورة.
+IfValidateInvoiceIsNoOrderStayUnbilled=إذا كانت عملية اعتماد الفاتورة "لا" ، فسيظل الأمر في الحالة "غير مفوتر" حتى يتم اعتماد الفاتورة.
+CloseReceivedSupplierOrdersAutomatically=أغلق الطلب إلى الحالة "%s" تلقائيًا إذا تم استلام جميع المنتجات.
+SetShippingMode=ضبط وضع الشحن
+WithReceptionFinished=عند الاستلام يعتبر منتهي
 #### supplier orders status
 StatusSupplierOrderCanceledShort=ألغيت
 StatusSupplierOrderDraftShort=مسودة
-StatusSupplierOrderValidatedShort=التحقق من صحة
-StatusSupplierOrderSentShort=في عملية
-StatusSupplierOrderSent=شحنة في عملية
-StatusSupplierOrderOnProcessShort=أمر
-StatusSupplierOrderProcessedShort=معالجة
+StatusSupplierOrderValidatedShort=معتمد
+StatusSupplierOrderSentShort=تحت المعالجة
+StatusSupplierOrderSent=الشحنة قيد المعالجة
+StatusSupplierOrderOnProcessShort=الامر تم
+StatusSupplierOrderProcessedShort=معالج
 StatusSupplierOrderDelivered=تم التوصيل
 StatusSupplierOrderDeliveredShort=تم التوصيل
 StatusSupplierOrderToBillShort=تم التوصيل
 StatusSupplierOrderApprovedShort=وافق
 StatusSupplierOrderRefusedShort=رفض
-StatusSupplierOrderToProcessShort=لعملية
-StatusSupplierOrderReceivedPartiallyShort=تلقى جزئيا
-StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderToProcessShort=لمعالجة
+StatusSupplierOrderReceivedPartiallyShort=تم الاستلام جزئيًا
+StatusSupplierOrderReceivedAllShort=تم استلام المنتجات
 StatusSupplierOrderCanceled=ألغيت
 StatusSupplierOrderDraft=مشروع (يجب التحقق من صحة)
 StatusSupplierOrderValidated=التحقق من صحة
-StatusSupplierOrderOnProcess=أمر - استقبال الاستعداد
-StatusSupplierOrderOnProcessWithValidation=أمر - استقبال الاستعداد أو التحقق من صحة
+StatusSupplierOrderOnProcess=الامر تم - انتظار الاستلام
+StatusSupplierOrderOnProcessWithValidation=الامر تم - انتظار الاستلام او الاعتماد
 StatusSupplierOrderProcessed=معالجة
 StatusSupplierOrderToBill=تم التوصيل
 StatusSupplierOrderApproved=وافق
 StatusSupplierOrderRefused=رفض
-StatusSupplierOrderReceivedPartially=تلقى جزئيا
-StatusSupplierOrderReceivedAll=All products received
+StatusSupplierOrderReceivedPartially=تم الاستلام جزئيًا
+StatusSupplierOrderReceivedAll=تم استلام جميع المنتجات
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 95f31ac01c8..ceca65f3dae 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=أوجدتها ٪ ق
 ModifiedBy=المعدلة ق ٪
 ValidatedBy=يصادق عليها ق ٪
+SignedBy=Signed by %s
 ClosedBy=أغلقت ٪ ق
 CreatedById=هوية المستخدم الذي إنشاء
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=هذا هو مفاتيح جديدة لتسجيل الدخول
 NewKeyWillBe=والمفتاح الجديد الخاص بك للدخول إلى برنامج يكون
 ClickHereToGoTo=انقر هنا للذهاب إلى٪ s
 YouMustClickToChange=ولكن يجب النقر فوق لأول مرة على الرابط التالي للتحقق من صحة هذا تغيير كلمة المرور
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=إذا كنت لم تطلب هذا التغيير، أن ينسوا هذا البريد الإلكتروني. يتم الاحتفاظ بيانات الاعتماد الخاصة بك آمنة.
 IfAmountHigherThan=إذا قدر أعلى <strong>من٪ الصورة</strong>
 SourcesRepository=مستودع للمصادر
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
index ed856843ff1..e7226260a14 100644
--- a/htdocs/langs/ar_SA/productbatch.lang
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=استخدام الكثير / الرقم التسلسلي
-ProductStatusOnBatch=نعم (الكثير / مسلسل مطلوب)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=رقم (الكثير / المسلسل لم تستخدم)
-ProductStatusOnBatchShort=نعم فعلا
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=لا
 Batch=الكثير / المسلسل
 atleast1batchfield=أكل حسب التاريخ أو بيع حسب التاريخ أو لوط / الرقم التسلسلي
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 37d70e8534c..233bd0fef15 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -86,7 +86,7 @@ ErrorProductAlreadyExists=المنتج ذو المرجع %sموجود بالفع
 ErrorProductBadRefOrLabel=قيمة خاطئة لـ مرجع  أو ملصق.
 ErrorProductClone=كان هناك مشكلة أثناء محاولة استنساخ المنتج أو الخدمة.
 ErrorPriceCantBeLowerThanMinPrice=خطأ، سعر لا يمكن أن يكون أقل من الحد الأدنى السعر.
-Suppliers=Vendors
+Suppliers=الموردين
 SupplierRef=Vendor SKU
 ShowProduct=عرض المنتج
 ShowService=عرض الخدمة
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=منتجات محددة مسبقا / خدمات للبيع
@@ -166,7 +167,7 @@ NewRefForClone=مرجع. المنتج/ الخدمة الجديدة 
 SellingPrices=أسعار بيع
 BuyingPrices=شراء أسعار
 CustomerPrices=أسعار العميل
-SuppliersPrices=Vendor prices
+SuppliersPrices=أسعار المورد
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
 CountryOrigin=بلد المنشأ
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=تحديثها بشكل صحيح
 PropalMergePdfProductActualFile=استخدام الملفات لإضافة إلى PDF دازور هي / هو
 PropalMergePdfProductChooseFile=اختر ملفات PDF
-IncludingProductWithTag=بما في ذلك المنتجات / الخدمات مع العلامة
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=سعر افتراضي، السعر الحقيقي قد تعتمد على العملاء
 WarningSelectOneDocument=يرجى تحديد وثيقة واحدة على الأقل
 DefaultUnitToShow=وحدة
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 466976a6edb..a6f5248b5b0 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -179,14 +180,14 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=مساهم
 TypeContact_project_task_external_TASKCONTRIBUTOR=مساهم
 SelectElement=حدد العنصر
 AddElement=تصل إلى العنصر
-LinkToElementShort=Link to
+LinkToElementShort=ربط مع او بـ
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
 DocumentModelTimeSpent=Project report template for time spent
 PlannedWorkload=عبء العمل المخطط لها
 PlannedWorkloadShort=عبء العمل
-ProjectReferers=Related items
+ProjectReferers=الأصناف ذات الصلة
 ProjectMustBeValidatedFirst=يجب التحقق من صحة المشروع أولا
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=إدخال يوميا
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/ar_SA/propal.lang b/htdocs/langs/ar_SA/propal.lang
index 13a7475989f..44de7ea36d0 100644
--- a/htdocs/langs/ar_SA/propal.lang
+++ b/htdocs/langs/ar_SA/propal.lang
@@ -16,7 +16,7 @@ AddProp=إنشاء اقتراح
 ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
 ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
 LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
+LastModifiedProposals=أحدث %s العروض المعدلة 
 AllPropals=جميع المقترحات
 SearchAProposal=بحث اقتراح
 NoProposal=No proposal
@@ -47,7 +47,6 @@ SendPropalByMail=اقتراح ارسال التجارية عن طريق البر
 DatePropal=تاريخ الاقتراح
 DateEndPropal=تاريخ انتهاء الصلاحية
 ValidityDuration=ومدة صلاحيتها
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal ق لم يتم العثور على ٪
 AddToDraftProposals=إضافة إلى صياغة اقتراح
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=واقتراح الخطوط التجارية
 ProposalLine=اقتراح خط
+ProposalLines=Proposal lines
 AvailabilityPeriod=توفر تأخير
 SetAvailability=ضبط تأخير توافر
 AfterOrder=بعد ذلك
@@ -85,3 +85,8 @@ ProposalCustomerSignature=قبول كتابي، ختم الشركة والتار
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index d5a935cf50a..1a09a888ada 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -19,8 +19,8 @@ Stock=الأسهم
 Stocks=الاسهم
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=الأسهم عن طريق القرعة / المسلسل
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=عوضا عن
-LocationSummary=باختصار اسم الموقع
-NumberOfDifferentProducts=عدد من المنتجات المختلفة
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=العدد الإجمالي للمنتجات
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=قيمة المستودعات
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=الأسهم الافتراضية
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=معرف مخزن
 DescWareHouse=وصف المخزن
 LieuWareHouse=المكان مخزن
 WarehousesAndProducts=والمستودعات والمنتجات
 WarehousesAndProductsBatchDetail=مستودعات والمنتجات (مع التفاصيل في الكثير / مسلسل)
 AverageUnitPricePMPShort=المتوسط المرجح لسعر
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=بيع سعر الوحدة
 EstimatedStockValueSellShort=قيمة للبيع
 EstimatedStockValueSell=قيمة للبيع
@@ -145,7 +147,7 @@ Replenishments=التجديد
 NbOfProductBeforePeriod=كمية من الناتج٪ الصورة في الأوراق المالية قبل الفترة المختارة (<٪ ق)
 NbOfProductAfterPeriod=كمية من الناتج٪ الصورة في الأوراق المالية بعد الفترة المختارة (>٪ ق)
 MassMovement=حركة جماهيرية
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=إيصالات لهذا النظام
 StockMovementRecorded=تحركات الأسهم سجلت
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=تسمية الحركة
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=حركة المخزون أو كود
 IsInPackage=الواردة في حزمة
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=إعادة فتح
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index 70bcc53eddb..d7496e5b941 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -1,48 +1,49 @@
 # Dolibarr language file - Source file is en_US - vendors
-Suppliers=Vendors
-SuppliersInvoice=Vendor invoice
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
+Suppliers=الموردين
+SuppliersInvoice=فاتورة مورد
+SupplierInvoices=فواتير الموردين
+ShowSupplierInvoice=عرض فاتورة المورد
+NewSupplier=مورد جديد
 History=التاريخ
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
-OrderDate=من أجل التاريخ
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=مجموعه subproducts شراء أسعار
-TotalSellingPriceMinShort=Total of subproducts selling prices
-SomeSubProductHaveNoPrices=بعض المنتجات الفرعية التي لا تعرف السعر
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
-SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=Vendor payment
-SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
-Availability=توفر
-ExportDataset_fournisseur_1=Vendor invoices and invoice details
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order details
-ApproveThisOrder=الموافقة على هذا النظام
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
-DenyingThisOrder=إنكار هذا النظام
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay (days)
-DescNbDaysToDelivery=The longest delivery delay of the products from this order
-SupplierReputation=Vendor reputation
-ReferenceReputation=Reference reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Low quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All references of vendor
-BuyingPriceNumShort=Vendor prices
+ListOfSuppliers=قائمة الموردين
+ShowSupplier=عرض المورد
+OrderDate=تاريخ الامر
+BuyingPriceMin=أفضل سعر شراء
+BuyingPriceMinShort=أفضل سعر شراء
+TotalBuyingPriceMinShort=إجمالي أسعار شراء المنتجات الفرعية
+TotalSellingPriceMinShort=إجمالي أسعار بيع المنتجات الفرعية
+SomeSubProductHaveNoPrices=بعض المنتجات الفرعية ليس لها سعر محدد
+AddSupplierPrice=أضف سعر شراء
+ChangeSupplierPrice=تغيير سعر الشراء
+SupplierPrices=أسعار المورد
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=مرجع المورّد هذا مقترن بالفعل بمنتج: %s
+NoRecordedSuppliers=لم يتم تسجيل أي مورد
+SupplierPayment=دفعة المورد
+SuppliersArea=منطقة المورد
+RefSupplierShort=مرجع مورد
+Availability=التوفر
+ExportDataset_fournisseur_1=فواتير المورد وتفاصيل الفاتورة
+ExportDataset_fournisseur_2=فواتير المورد والمدفوعات
+ExportDataset_fournisseur_3=أوامر الشراء وتفاصيل الامر
+ApproveThisOrder=الموافقة على هذا الامر
+ConfirmApproveThisOrder=هل أنت متأكد من أنك تريد الموافقة على الطلب <b> %s </b>؟
+DenyingThisOrder=رفض هذا الأمر
+ConfirmDenyingThisOrder=هل أنت متأكد أنك تريد رفض هذا الامر <b> %s </b>؟
+ConfirmCancelThisOrder=هل أنت متأكد أنك تريد إلغاء هذا الامر <b> %s </b>؟
+AddSupplierOrder=إنشاء أمر شراء
+AddSupplierInvoice=إنشاء فاتورة مورد
+ListOfSupplierProductForSupplier=قائمة المنتجات والأسعار للمورد <b> %s </b>
+SentToSuppliers=أرسل إلى الموردين
+ListOfSupplierOrders=قائمة أوامر الشراء
+MenuOrdersSupplierToBill=أوامر الشراء للفوتورة
+NbDaysToDelivery=تأخير التسليم (أيام)
+DescNbDaysToDelivery=أطول تأخير في تسليم المنتجات من هذا الامر
+SupplierReputation=سمعة المورد
+ReferenceReputation=سمعة المرجع
+DoNotOrderThisProductToThisSupplier=لا تأمر
+NotTheGoodQualitySupplier=جودة منخفضة
+ReputationForThisProduct=سمعة
+BuyerName=اسم المشتري
+AllProductServicePrices=جميع أسعار المنتجات | الخدمات
+AllProductReferencesOfSupplier=جميع مراجع البائع
+BuyingPriceNumShort=أسعار المورد
diff --git a/htdocs/langs/ar_SA/ticket.lang b/htdocs/langs/ar_SA/ticket.lang
index 307fdeb1792..23feb81ae34 100644
--- a/htdocs/langs/ar_SA/ticket.lang
+++ b/htdocs/langs/ar_SA/ticket.lang
@@ -18,7 +18,7 @@
 # Generic
 #
 
-Module56000Name=Tickets
+Module56000Name=تذاكر
 Module56000Desc=Ticket system for issue or request management
 
 Permission56001=See tickets
@@ -60,7 +60,7 @@ Notify_TICKET_SENTBYMAIL=Send ticket message by email
 # Status
 Read=قرأ
 Assigned=Assigned
-InProgress=In progress
+InProgress=في تقدم
 NeedMoreInformation=Waiting for information
 Answered=Answered
 Waiting=انتظار
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=اكتب
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -78,7 +80,7 @@ MailToSendTicketMessage=To send email from ticket message
 # Admin page
 #
 TicketSetup=Ticket module setup
-TicketSettings=Settings
+TicketSettings=إعدادات
 TicketSetupPage=
 TicketPublicAccess=A public interface requiring no identification is available at the following url
 TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -149,7 +151,7 @@ MessageListViewType=Show as table list
 #
 # Ticket card
 #
-Ticket=Ticket
+Ticket=تذكرة
 TicketCard=Ticket card
 CreateTicket=Create ticket
 EditTicket=Edit ticket
@@ -229,7 +231,7 @@ TicketChangeStatus=Change status
 TicketConfirmChangeStatus=Confirm the status change: %s ?
 TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
-Unread=Unread
+Unread=غير مقروء
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
 ErrorTicketRefRequired=Ticket reference name is required
 
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index 4caca7196f6..bed6554cf2f 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=إزالة من المجموعة
 PasswordChangedAndSentTo=تم تغيير كلمة المرور وترسل إلى <b>٪ ق.</b>
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=طلب تغيير كلمة السر لإرسالها إلى <b>٪ ق ٪ ق.</b>
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=مجموعات المستخدمين
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=النطاق المستخدم ق ٪
 Reactivate=تنشيط
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=منح إذن لأن الموروث من واحد من المستخدم.
 Inherited=موروث
+UserWillBe=Created user will be
 UserWillBeInternalUser=وسوف يكون المستخدم إنشاء مستخدم داخلية (لأنه لا يرتبط طرف ثالث خاص)
 UserWillBeExternalUser=وسوف يكون المستخدم إنشاء مستخدم خارجي (لأنه مرتبط إلى طرف ثالث خاص)
 IdPhoneCaller=رقم تعريف الهاتف المتصل
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index 7bf9189512a..e68b7898ca8 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=قرأ
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -78,7 +78,7 @@ IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
 WebsiteAccount=Website account
-WebsiteAccounts=Website accounts
+WebsiteAccounts=حسابات الموقع
 AddWebsiteAccount=Create web site account
 BackToListForThirdParty=Back to list for the third-party
 DisableSiteFirst=Disable website first
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/ar_SA/zapier.lang b/htdocs/langs/ar_SA/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/ar_SA/zapier.lang
+++ b/htdocs/langs/ar_SA/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/az_AZ/accountancy.lang
+++ b/htdocs/langs/az_AZ/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index f9a6468d94a..8f4508ada53 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/az_AZ/banks.lang b/htdocs/langs/az_AZ/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/az_AZ/banks.lang
+++ b/htdocs/langs/az_AZ/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/az_AZ/bills.lang b/htdocs/langs/az_AZ/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/az_AZ/bills.lang
+++ b/htdocs/langs/az_AZ/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/az_AZ/boxes.lang b/htdocs/langs/az_AZ/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/az_AZ/boxes.lang
+++ b/htdocs/langs/az_AZ/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/az_AZ/categories.lang b/htdocs/langs/az_AZ/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/az_AZ/categories.lang
+++ b/htdocs/langs/az_AZ/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/az_AZ/companies.lang b/htdocs/langs/az_AZ/companies.lang
index 8dc815b522e..154400c6536 100644
--- a/htdocs/langs/az_AZ/companies.lang
+++ b/htdocs/langs/az_AZ/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/az_AZ/compta.lang b/htdocs/langs/az_AZ/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/az_AZ/compta.lang
+++ b/htdocs/langs/az_AZ/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/az_AZ/ecm.lang b/htdocs/langs/az_AZ/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/az_AZ/ecm.lang
+++ b/htdocs/langs/az_AZ/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/az_AZ/errors.lang
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/az_AZ/externalsite.lang b/htdocs/langs/az_AZ/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/az_AZ/externalsite.lang
+++ b/htdocs/langs/az_AZ/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
index f8ba6f4073c..dc2a83f2015 100644
--- a/htdocs/langs/az_AZ/main.lang
+++ b/htdocs/langs/az_AZ/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/az_AZ/margins.lang b/htdocs/langs/az_AZ/margins.lang
index 76ea8ad5c4d..ad5406409b4 100644
--- a/htdocs/langs/az_AZ/margins.lang
+++ b/htdocs/langs/az_AZ/margins.lang
@@ -22,7 +22,7 @@ ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
diff --git a/htdocs/langs/az_AZ/members.lang b/htdocs/langs/az_AZ/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/az_AZ/members.lang
+++ b/htdocs/langs/az_AZ/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/az_AZ/modulebuilder.lang b/htdocs/langs/az_AZ/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/az_AZ/modulebuilder.lang
+++ b/htdocs/langs/az_AZ/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/az_AZ/orders.lang b/htdocs/langs/az_AZ/orders.lang
index ad91e1eef63..87d196eb22f 100644
--- a/htdocs/langs/az_AZ/orders.lang
+++ b/htdocs/langs/az_AZ/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
diff --git a/htdocs/langs/az_AZ/other.lang b/htdocs/langs/az_AZ/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/az_AZ/other.lang
+++ b/htdocs/langs/az_AZ/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/az_AZ/productbatch.lang b/htdocs/langs/az_AZ/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/az_AZ/productbatch.lang
+++ b/htdocs/langs/az_AZ/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/az_AZ/products.lang
+++ b/htdocs/langs/az_AZ/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/az_AZ/projects.lang b/htdocs/langs/az_AZ/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/az_AZ/projects.lang
+++ b/htdocs/langs/az_AZ/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/az_AZ/propal.lang b/htdocs/langs/az_AZ/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/az_AZ/propal.lang
+++ b/htdocs/langs/az_AZ/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/az_AZ/stocks.lang b/htdocs/langs/az_AZ/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/az_AZ/stocks.lang
+++ b/htdocs/langs/az_AZ/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/az_AZ/suppliers.lang b/htdocs/langs/az_AZ/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/az_AZ/suppliers.lang
+++ b/htdocs/langs/az_AZ/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/az_AZ/ticket.lang b/htdocs/langs/az_AZ/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/az_AZ/ticket.lang
+++ b/htdocs/langs/az_AZ/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/az_AZ/users.lang b/htdocs/langs/az_AZ/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/az_AZ/users.lang
+++ b/htdocs/langs/az_AZ/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/az_AZ/website.lang b/htdocs/langs/az_AZ/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/az_AZ/website.lang
+++ b/htdocs/langs/az_AZ/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/az_AZ/zapier.lang b/htdocs/langs/az_AZ/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/az_AZ/zapier.lang
+++ b/htdocs/langs/az_AZ/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 61935e71771..cd10cec3aae 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Свързани редове на фактури
 ExpenseReportLines=Редове на разходни отчети за свързване
 ExpenseReportLinesDone=Свързани редове на разходни отчети
 IntoAccount=Свързване на ред със счетоводна сметка
-TotalForAccount=Общо за счетоводна сметка
+TotalForAccount=Total accounting account
 
 
 Ventilate=Свързване
@@ -209,7 +209,7 @@ Codejournal=Журнал
 JournalLabel=Име на журнал
 NumPiece=Пореден номер
 TransactionNumShort=Транзакция №
-AccountingCategory=Персонализирани групи
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Тук може да определите някои групи счетоводни сметки. Те ще бъдат използвани за персонализирани счетоводни отчети.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Редовете все още не са свърза
 
 ## Import
 ImportAccountingEntries=Счетоводни записи
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Дата на експортиране
 WarningReportNotReliable=Внимание, тази справка не се основава на главната счетоводна книга, така че не съдържа транзакция, ръчно променена в книгата. Ако осчетоводяването ви е актуално, то прегледът на счетоводството е по-точен.
 ExpenseReportJournal=Журнал за разходни отчети
 InventoryJournal=Журнал за инвентар
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 6e7129f0a22..049f85e0287 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Разрешаване на свързването
 YourSession=Вашата сесия
 Sessions=Потребителски сесии
 WebUserGroup=Уеб сървър потребител / група
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Изглежда, че вашата PHP конфигурация не позволява изброяване на активни сесии. Директорията, използвана за запазване на сесии (<b> %s </b>), може да е защитена (например от права на операционната система или от директивата PHP open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Забележка: Ефективно е само ако мод
 RemoveLock=Премахнете / преименувайте файла <b>%s</b>, ако съществува, за да разрешите използването на инструмента за инсталиране / актуализиране.
 RestoreLock=Възстановете файла <b>%s</b> с права само за четене, за да забраните по-нататъшното използване на инструмента за инсталиране / актуализиране.
 SecuritySetup=Настройки на сигурността
+PHPSetup=PHP setup
 SecurityFilesDesc=Дефинирайте тук параметрите, свързани със сигурността, относно качването на файлове.
 ErrorModuleRequirePHPVersion=Грешка, този модул изисква PHP версия %s или по-висока.
 ErrorModuleRequireDolibarrVersion=Грешка, този модул изисква Dolibarr версия %s или по-висока.
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Тази секция осигурява администр
 Purge=Разчистване
 PurgeAreaDesc=Тази страница ви позволява да изтриете всички файлове, генерирани или съхранени от Dolibarr (временни файлове или всички файлове в директорията <b>%s</b>). Използването на тази функция обикновено не е необходимо. Той се предоставя като решение за потребители, чиито Dolibarr се хоства от доставчик, който не предлага разрешения за изтриване на файлове, генерирани от уеб сървъра.
 PurgeDeleteLogFile=Изтриване на лог файлове, включително <b>%s</b> генериран от Debug Logs модула (няма риск от загуба на данни)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Изтриване на  всички файлове в директорията: <b>%s</b>.<br>Това ще изтрие всички генерирани документи, свързани с елементи (контрагенти, фактури и т.н.), файлове, качени чрез ECM модула, архиви на базата данни и временни файлове.
 PurgeRunNow=Разчисти сега
@@ -232,6 +234,7 @@ BoxesAvailable=Налични джаджи
 BoxesActivated=Активирани джаджи
 ActivateOn=Активирай на
 ActiveOn=Активирано на
+ActivatableOn=Activatable on
 SourceFile=Изходен файл
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=На разположение е само, ако JavaScript не е деактивиран
 Required=Задължително
@@ -347,9 +350,10 @@ LastActivationAuthor=Последен автор на активирането
 LastActivationIP=Последно активиране от IP адрес
 UpdateServerOffline=Актуализиране на сървъра офлайн
 WithCounter=Управление на брояч
-GenericMaskCodes=Може да въведете всяка маска за номериране. В тази маска, могат да се използват следните тагове: <br> <b>{000000}</b> съответства на номер, който ще се увеличава на всеки %s. Въведете толкова нули, колкото е желаната дължина на брояча. Броячът ще бъде запълнен с нули от ляво, за да има толкова нули, колкото и в маската. <br> <b>{000000+000}</b> същото като в предишния случай, но започва отместване, съответстващо на номера отдясно на знака +, считано от първия %s. <br> <b>{000000@x}</b> същото като в предишния случай, но броячът се нулира, когато месецът Х е достигнат (Х между 1 и 12, или 0, за да използвате началото на месеца на фискалната година, определени в вашата конфигурация или 99, за да нулирате брояча всеки месец). Ако тази опция се използва и X е 2 или по-висока, то тогава последователностa {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> клиентският код на n знака <br> <b> {cccc000} </b> клиентският код на n знака е последван от брояч, предназначен за клиента. Този брояч е предназначен за клиента и се нулира едновременно от глобалния брояч. <br> <b> {tttt} </b> Кодът на контрагента с n знака (вижте менюто Начало - Настройка - Речник - Видове контрагенти). Ако добавите този таг, броячът ще бъде различен за всеки тип контрагент. <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Всички други символи в маската ще останат непокътнати. <br> Не са разрешени интервали. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u> Пример за 99-я %s контрагент TheCompany, с дата 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u>Пример за контрагент, създаден на 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Пример за продукт, създаден на 2007-03-01:</u> <br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Оставяйки това поле празно о
 ExtrafieldParamHelpselect=Списъкът със стойности трябва да бъде във формат key,value (където key не може да бъде '0';) <br><br> например: <br> 1,value1 <br> 2,value2 <br> code3,value3 <br> ... <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br> 1,value1|options_ <i>parent_list_code</i>:parent_key<br>2,value2|options_ <i>parent_list_code</i>:parent_key <br><br> За да имате списъка в зависимост от друг списък: <br> 1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Списъкът със стойности трябва да бъде във формат key,value (където key не може да бъде '0') <br><br> например: <br> 1,value1 <br>2,value2 <br>3,value3<br> ...
 ExtrafieldParamHelpradio=Списъкът със стойности трябва да бъде във формат key,value (където key не може да бъде '0') <br><br> например: <br> 1,value1 <br>2,value2 <br>3,value3<br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Списъкът на стойностите идва от таблица <br> Синтаксис: table_name:label_field:id_field::filter <br> Пример: c_typent:libelle:id::filter <br><br> филтърът може да бъде прост тест (например active = 1), за да се покаже само активна стойност <br> Можете също да използвате $ID$ във филтъра, който е текущият идентификатор на текущия обект <br> За да направите SELECT във филтъра, използвайте $SEL$ <br> ако искате да филтрирате по допълнителни полета, използвайте синтаксис extra.fieldcode=...(където кодът на полето е кодът на екстра полето) <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br>c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:filter<br><br> За да имате списъка в зависимост от друг списък: <br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Оставете празно за обикновен разделител<br>Посочете стойност 1 за разделител, който се свива (отворен по подразбиране за нова сесия, а след това състоянието се запазва за всяка потребителска сесия)<br>Посочете стойност 2 за разделител, който се свива (свит по подразбиране за нова сесия, а след това състоянието се запазва за всяка потребителска сесия).
 LibraryToBuildPDF=Използвана библиотека за създаване на PDF файлове
@@ -541,6 +545,8 @@ Module40Name=Доставчици
 Module40Desc=Управление на доставчици и покупки (поръчки за покупка и фактури от доставчици)
 Module42Name=Журнали за отстраняване на грешки
 Module42Desc=Инструменти за регистриране (файл, syslog, ...). Дневници за технически цели и отстраняване на грешки.
+Module43Name=Инструменти за отстраняване на грешки
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Редактори
 Module49Desc=Управление на редактори
 Module50Name=Продукти
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind възможности за преобразуване
 Module3200Name=Неизменими архиви
 Module3200Desc=Непроменлив дневник на бизнес събития. Събитията се архивират в реално време. Дневникът е таблица, достъпна единствено за четене, която съдържа последователни събития, които могат да бъдат експортирани. Този модул може да е задължителен за някои страни.
+Module3400Name=Социални мрежи
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=ЧР
 Module4000Desc=Управление на човешки ресурси (управление на отдели, договори на служители и взаимоотношения)
 Module5000Name=Няколко фирми
 Module5000Desc=Управление на няколко фирми
-Module6000Name=Работен процес
-Module6000Desc=Управление на работен процес (автоматично създаване на обект и / или автоматично променяне на неговия статус)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Уебсайтове
 Module10000Desc=Създавайте уеб сайтове (обществени) с WYSIWYG редактор. Това е CMS, ориентиран към уеб администратори или разработчици (желателно е да знаете HTML и CSS езици). Просто настройте вашия уеб сървър (Apache, Nginx, ...) да е насочен към специалната Dolibarr директория, за да бъде онлайн в интернет с избраното име за домейн.
 Module20000Name=Молби за отпуск
@@ -805,7 +813,8 @@ PermissionAdvanced253=Създаване / променяне на вътреш
 Permission254=Създаване / променя само на външни потребители
 Permission255=Променяне на парола на други потребители
 Permission256=Изтриване или деактивиране на други потребители
-Permission262=Разширяване на достъпа до всички контрагенти (не само контрагенти, за които този потребител е търговски представител).<br>Не е ефективно за външни потребители (винаги са ограничени до своите предложения, поръчки, фактури, договори и т.н.).<br>Не е ефективно за проекти (имат значение само разрешенията, видимостта и възложенията в проекта).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Преглед на CA
 Permission272=Преглед на фактури
 Permission273=Издаване на фактури
@@ -1175,7 +1184,8 @@ SetupDescription2=Следните две секции са задължител
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Основни параметри, използвани за персонализиране на поведението по подразбиране на вашата система (например за функции, свързани с държавата).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>Този софтуер е пакет от много модули / приложения. Модулите, свързани с вашите нужди, трябва да бъдат активирани и конфигурирани. С активирането на тези модули ще се появят нови менюта.
 SetupDescription5=Менюто "Други настройки" управлява допълнителни параметри.
-LogEvents=Събития за проверка на сигурността
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Проверка
 InfoDolibarr=Относно Dolibarr
 InfoBrowser=Относно браузър
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Актуализацията изглежда
 YouMustRunCommandFromCommandLineAfterLoginToUser=Трябва да изпълните тази команда от командния ред след влизане в shell с потребител <b>%s</b> или трябва да добавите опция -W в края на командния ред, за да се предостави <b>%s</b> парола.
 YourPHPDoesNotHaveSSLSupport=SSL функциите не са налични във вашия PHP
 DownloadMoreSkins=Изтегляне на повече теми
-SimpleNumRefModelDesc=Връща референтен номер във формат %syymm-nnnn, където yy е година, mm е месец и nnnn е последователност от номера без връщане към нула
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Показване на идентификационни данни в полетата с адреси
 ShowVATIntaInAddress=Скриване на вътрешнообщностния номер по ДДС в полетата с адреси
 TranslationUncomplete=Частичен превод
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Прокси сървър: Име / Адрес
 MAIN_PROXY_PORT=Прокси сървър: Порт
 MAIN_PROXY_USER=Прокси сървър: Потребителско име
 MAIN_PROXY_PASS=Прокси сървър: Парола
-DefineHereComplementaryAttributes=Определете тук всички допълнителни / персонализирани атрибути, които искате да бъдат включени за: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Допълнителни атрибути
 ExtraFieldsLines=Допълнителни атрибути (редове)
 ExtraFieldsLinesRec=Допълнителни атрибути (редове в шаблонни фактури)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Входни данни (unix)
 LDAPFieldLoginExample=Пример: uid
 LDAPFilterConnection=Филтър за търсене
 LDAPFilterConnectionExample=Пример: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Входни данни (samba, activedirectory)
 LDAPFieldLoginSambaExample=Пример: СамбаПотребителскоИме
 LDAPFieldFullname=Пълно име
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Вашата фирма не е определила д
 AccountancyCode=Счетоводен код
 AccountancyCodeSell=Счетоводен код за продажба
 AccountancyCodeBuy=Счетоводен код за покупка
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Настройка на модула за събития и календар
 PasswordTogetVCalExport=Ключ за оторизация на връзката за експортиране
+SecurityKey = Security Key
 PastDelayVCalExport=Да не се експортират събития по-стари от
 AGENDA_USE_EVENT_TYPE=Използване на видове събития (управлявани в меню Настройка - Речници - Видове събития в календара)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Автоматично задаване на стойност по подразбиране за вид събитие във формуляра при създаване на събитие
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Цвят на фона в нечетните ред
 BackgroundTableLineEvenColor=Цвят на фона в четните редове на таблица
 MinimumNoticePeriod=Минимален срок за известяване (вашата молба за отпуск трябва да бъде изпратена преди този срок)
 NbAddedAutomatically=Брой дни, добавени към броячите на потребителите (автоматично) всеки месец
-EnterAnyCode=Това поле съдържа референция за идентифициране на реда. Въведете стойност по ваш избор, но без специални символи.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Въведете 0 или 1
 UnicodeCurrency=Въведете тук между скобите, десетичен код, който представлява символа на валутата. Например: за $, въведете [36] - за Бразилски Реал R$ [82,36] - за €, въведете [8364]
 ColorFormat=RGB цвета е в HEX формат, например: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Долна граница в PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=За този модул не е необходима специфична настройка.
 SetToYesIfGroupIsComputationOfOtherGroups=Посочете стойност 'Да', ако тази група е съвкупност от други групи.
-EnterCalculationRuleIfPreviousFieldIsYes=Въведете правило за изчисление, ако предишното поле е настроено на "Да" (например "CODEGRP1 + CODEGRP2")
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Намерени са няколко езикови варианта
 RemoveSpecialChars=Премахване на специални символи
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex филтър за изчистване на стойността (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Настройка на модул Социални мреж
 EnableFeatureFor=Активиране на функции за <strong> %s </strong>
 VATIsUsedIsOff=Забележка: Опцията за използване на данък върху продажбите или ДДС е <strong>изключена</strong> в менюто %s - %s, така че данъкът върху продажбите или ДДС винаги ще бъде 0 за продажби.
 SwapSenderAndRecipientOnPDF=Размяна на адресите на подателя и получателя в PDF документи
-FeatureSupportedOnTextFieldsOnly=Внимание, функцията се поддържа само в текстови полета. Също така трябва да се зададе URL параметър action=create или action=edit ИЛИ името на страницата трябва да завършва с "new.php", за да задейства тази функция.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Имейл колекционер
 EmailCollectorDescription=Добавете планирана задача в страницата за настройка, за да сканирате редовно пощенските кутии (използвайки протокола IMAP) и да записвате получените в приложението имейли на правилното място и / или да създавате автоматично някои записи (например нови възможности).
 NewEmailCollector=Нов колекционер на имейли
@@ -2049,8 +2062,11 @@ UseDebugBar=Използване на инструменти за отстран
 DEBUGBAR_LOGS_LINES_NUMBER=Брой последни редове на журнал, които да се пазят в конзолата
 WarningValueHigherSlowsDramaticalyOutput=Внимание, по-високите стойности забавят драматично производителността
 ModuleActivated=Модул %s е активиран и забавя интерфейса
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Моделите за експортиране се споделят с всички
 ExportSetup=Настройка на модула за експортиране на данни
 ImportSetup=Настройка на модула за импортиране на данни
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Направете анонимен Ping '+1' до сървъ
 FeatureNotAvailableWithReceptionModule=Функцията не е налична, когато е активиран модул Приемане
 EmailTemplate=Шаблон за имейл
 EMailsWillHaveMessageID=Имейлите ще имат етикет „Референции“, отговарящ на този синтаксис
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Ако искате да имате някои текстове във вашия PDF файл, дублирани на 2 различни езика в един и същ генериран PDF файл, трябва да посочите тук този втори език, така че генерираният PDF файл да съдържа 2 различни езика на една и съща страница, избраният при генериране на PDF и този (само няколко PDF шаблона поддържат това). Запазете празно за един език в PDF файла.
 FafaIconSocialNetworksDesc=Въведете тук кода за FontAwesome икона. Ако не знаете какво е FontAwesome, може да използвате стандартната стойност fa-address book.
 FeatureNotAvailableWithReceptionModule=Функцията не е налична, когато е активиран модул Приемане
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index fe4cf4b6b83..f23019f31c0 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Вашите SEPA нареждания
 FindYourSEPAMandate=Това е вашето SEPA нареждане, с което да упълномощите нашата фирма да направи поръчка за директен дебит към вашата банка. Върнете го подписано (сканиран подписан документ) или го изпратете по пощата на
 AutoReportLastAccountStatement=Автоматично попълване на полето „номер на банково извлечение“ с последния номер на извлечение, когато правите съгласуване.
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Оцветяване на движения
 BankColorizeMovementDesc=Ако тази функция е активирана може да изберете конкретен цвят на фона за дебитни или кредитни движения
 BankColorizeMovementName1=Цвят на фона за дебитно движение
 BankColorizeMovementName2=Цвят на фона за кредитно движение
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index b69b0af348a..01cb523006a 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -55,6 +55,7 @@ CustomerInvoice=Фактура за продажба
 CustomersInvoices=Фактури за продажба
 SupplierInvoice=Фактура за доставка
 SuppliersInvoices=Фактури за доставка
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Фактура за доставка
 SupplierBills=Фактури за доставка
 Payment=Плащане
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Вече направени плащания
 PaymentsBackAlreadyDone=Вече направени възстановявания
 PaymentRule=Правило за плащане
 PaymentMode=Начин на плащане
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Дебитна / Кредитна карта
 PaymentTypePP=PayPal
 IdPaymentMode=Начин на плащане (идентификатор)
@@ -373,6 +376,7 @@ DateLastGeneration=Дата на последно генериране
 DateLastGenerationShort=Дата на последно ген.
 MaxPeriodNumber=Максимален брой генерирани фактури
 NbOfGenerationDone=Брой генерирани фактури
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Брой извършени генерирания
 MaxGenerationReached=Максималният брой генерирания е достигнат
 InvoiceAutoValidate=Автоматично валидиране на фактури
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=14 календарни дни от края на м
 FixAmount=Фиксирана сума - на един ред с текст '%s'
 VarAmount=Променлива сума (общо %%)
 VarAmountOneLine=Променлива сума (общо %%) - на един ред с текст '%s'
-VarAmountAllLines=Променлива сума (общо %%) - със същите редове
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Банков превод
 PaymentTypeShortVIR=Банков превод
@@ -494,12 +498,16 @@ Cash=В брой
 Reported=Закъснели
 DisabledBecausePayments=Не е възможно, тъй като има някои плащания
 CantRemovePaymentWithOneInvoicePaid=Не може да се премахне плащането, тъй като има най-малко една фактура класифицирана като платена.
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Очаквано плащане
 CantRemoveConciliatedPayment=Съгласуваното плащане не може да се премахне
 PayedByThisPayment=Платено от това плащане
 ClosePaidInvoicesAutomatically=Автоматично класифициране на всички стандартни фактури, авансови плащания или заместващи фактури като 'Платени', когато плащането се извършва изцяло.
 ClosePaidCreditNotesAutomatically=Автоматично класифициране на всички кредитни известия като 'Платени', когато възстановяването се извършва изцяло.
 ClosePaidContributionsAutomatically=Автоматично класифициране на всички социални или фискални вноски като 'Платени', когато плащането се извършва изцяло.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Всички фактури без остатък за плащане ще бъдат автоматично приключени със статус "Платени".
 ToMakePayment=Плащане
 ToMakePaymentBack=Обратно плащане
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Първо трябва да създад
 PDFCrabeDescription=PDF шаблон за фактура. Пълен шаблон за фактура (стара реализация на шаблон Sponge)
 PDFSpongeDescription=PDF шаблон за фактура. Пълен шаблон за фактура
 PDFCrevetteDescription=PDF шаблон за фактура. Пълен шаблон за ситуационни фактури
-TerreNumRefModelDesc1=Връща номер с формат %syymm-nnnn за стандартни фактури и %syymm-nnnn за кредитни бележки, където yy е година, mm е месец и nnnn е последователност без прекъсване и няма връщане към 0
-MarsNumRefModelDesc1=Връща номер с формат %syymm-nnnn за стандартни фактури, %syymm-nnnn за заместващи фактури, %syymm-nnnn за фактури за авансово плащане и %syymm-nnnn за кредитни известия, където yy е година, mm е месец и nnnn е последователност без прекъсване и без връщане към 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Документ, започващ с $syymm, вече съществува и не е съвместим с този модел на последователност. Премахнете го или го преименувайте, за да активирате този модул.
-CactusNumRefModelDesc1=Връща номер с формат %syymm-nnnn за стандартни фактури, %syymm-nnnn за кредитни известия и %syymm-nnnn за фактури за авансово плащане, където yy е година, mm е месец и nnnn е последователност без прекъсване и без връщане към 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Причина за ранно приключване
 EarlyClosingComment=Бележка за ранно приключване
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Контакт по обслужв
 InvoiceFirstSituationAsk=Първа ситуационна фактура
 InvoiceFirstSituationDesc=<b>Ситуационните фактури</b> са свързани със ситуации отнасящи се до някакъв напредък, например процес на конструиране. Всяка ситуация е свързана с една фактура.
 InvoiceSituation=Ситуационна фактура
+PDFInvoiceSituation=Ситуационна фактура
 InvoiceSituationAsk=Фактура свързана със ситуация
 InvoiceSituationDesc=Създаване на нова ситуация, следваща съществуваща такава.
 SituationAmount=Сума на ситуационна фактура (нето)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Ако трябва да генерирате
 DeleteRepeatableInvoice=Изтриване на шаблонна фактура
 ConfirmDeleteRepeatableInvoice=Сигурни ли сте, че искате да изтриете тази шаблонна фактура?
 CreateOneBillByThird=Създаване на една фактура за контрагент (в противен случай по една фактура за поръчка)
-BillCreated=Създадени са %s фактури
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Статус на генерираните документи
 DoNotGenerateDoc=Не генерирайте файл за документа
 AutogenerateDoc=Автоматично генериране на файл за документа
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Фактурата за доставка е из
 UnitPriceXQtyLessDiscount=Единична цена x Количество - Отстъпка
 CustomersInvoicesArea=Секция с фактури за продажба
 SupplierInvoicesArea=Секция с фактури за доставка
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index c59a1d12298..4b78b60d66e 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Входна информация
 BoxLastRssInfos=RSS информация
 BoxLastProducts=Продукти / Услуги: %s последно създадени
@@ -17,9 +18,13 @@ BoxLastActions=Последни действия
 BoxLastContracts=Последни договори
 BoxLastContacts=Последни контакти / адреси
 BoxLastMembers=Последни членове
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Последни интервенции
 BoxCurrentAccounts=Баланс по открити сметки
 BoxTitleMemberNextBirthdays=Рождени дни в този месец (членове)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Новини: %s последни от %s
 BoxTitleLastProducts=Продукти / Услуги: %s последно променени
 BoxTitleProductsAlertStock=Продукти: сигнали за наличност
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Пратки: %s последни към клие
 NoRecordedShipments=Няма регистрирани пратки към клиенти
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Счетоводство
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index 54c706a7b42..4c3ac637eb4 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Секция с тагове / категории за 
 CustomersCategoriesArea=Секция с тагове / категории за клиенти
 MembersCategoriesArea=Секция с тагове / категории за членове
 ContactsCategoriesArea=Секция с тагове / категории за контакти
-AccountsCategoriesArea=Секция с тагове / категории за сметки
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Секция с тагове / категории за проекти
 UsersCategoriesArea=Секция с тагове / категории за потребители
 SubCats=Подкатегории
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Показване на таг / категория
 ByDefaultInList=По подразбиране в списъка
 ChooseCategory=Избиране на категория
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Използване или оператор за категории
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 5acad41ae81..81d317bd321 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -43,9 +43,10 @@ Individual=Физическо лице
 ToCreateContactWithSameName=Автоматично ще създаде контакт / адрес със същата информация като в контрагента. В повечето случаи, дори ако вашия контрагент е частно лице, е достатъчно да създадете само контрагент.
 ParentCompany=Фирма майка
 Subsidiaries=Дъщерни дружества
-ReportByMonth=Справка по месеци
-ReportByCustomers=Справка по клиенти
-ReportByQuarter=Справка по ставки
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Код на обръщение
 RegisteredOffice=Седалище и адрес на управление
 Lastname=Фамилия
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Текуща неизплатена сметка
 OutstandingBill=Максимална неизплатена сметка
 OutstandingBillReached=Достигнат е максимумът за неизплатена сметка
 OrderMinAmount=Минимално количество за поръчка
-MonkeyNumRefModelDesc=Генерира номер с формат %syymm-nnnn за код на клиент и %syymm-nnnn за код на доставчик, където yy е година, mm е месецa, а nnnn е поредица без прекъсване и без връщане към 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Кодът е свободен. Този код може да бъде променян по всяко време.
 ManagingDirectors=Име на управител (изпълнителен директор, директор, президент...)
 MergeOriginThirdparty=Дублиращ контрагент (контрагентът, който искате да изтриете)
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 177dc32434a..b07de8ea9fd 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST покупки
 VATCollected=Получен ДДС
 StatusToPay=За плащане
 SpecialExpensesArea=Секция със специални плащания
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Социален или фискален данък
 SocialContributions=Социални или фискални данъци
 SocialContributionsDeductibles=Приспадащи се социални или фискални данъци
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Плащане на фактура за продажба
 PaymentSupplierInvoice=Плащане на фактура за покупка
 PaymentSocialContribution=Плащане на социален / фискален данък
 PaymentVat=Плащане на ДДС
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Списък на плащания
 ListOfCustomerPayments=Списък на клиентски плащания
 ListOfSupplierPayments=Списък на плащания към доставчици
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF плащане
 LT2PaymentsES=IRPF плащания
 VATPayment=Плащане на данък върху продажбите
 VATPayments=Плащания на данък върху продажбите
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Възстановяване на данък върху продажби
 NewVATPayment=Ново плащане на данък върху продажби
 NewLocalTaxPayment=Ново плащане на данък %s
@@ -134,9 +138,17 @@ NoWaitingChecks=Няма чекове, които да очакват депоз
 DateChequeReceived=Дата на приемане на чек
 NbOfCheques=Брой чекове
 PaySocialContribution=Плащане на социален / фискален данък
-ConfirmPaySocialContribution=Сигурни ли сте, че искате да класифицирате този социален или фискален данък като платен?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Изтриване на плащане за социален или фискален данък
-ConfirmDeleteSocialContribution=Сигурни ли сте, че искате да изтриете това плащане на социален / фискален данък?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Социални / фискални данъци и плащания
 CalcModeVATDebt=Режим <b>%sДДС върху осчетоводени задължения%s</b>
 CalcModeVATEngagement=Режим <b>%sДДС върху приходи - разходи%s</b>
@@ -163,6 +175,7 @@ RulesResultInOut=- Включва реални плащания по факту
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- Включва всички реални плащания по фактури, получени от клиенти<br>- Основава се на дата на плащане на тези фактури<br>
 RulesCATotalSaleJournal=Включва всички кредитни линии от журнала за продажба.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Включва запис във вашата книга със счетоводни сметки, които са в групата "РАЗХОД" или "ПРИХОД"
 RulesResultBookkeepingPredefined=Включва запис във вашата книга със счетоводни сметки, които са в групата "РАЗХОД" или "ПРИХОД"
 RulesResultBookkeepingPersonalized=Показва запис във вашата книга със счетоводни сметки <b>, групирани в персонализирани групи</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Справка за данък върху продажб
 VATReportByCustomers=Справка за данък върху продажби по клиенти
 VATReportByCustomersInInputOutputMode=Справка за получен и платен ДДС от клиент
 VATReportByQuartersInInputOutputMode=Справка по данъчна ставка върху продажби за получен и платен данък
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Справка за данък 2 по ставки
 LT2ReportByQuarters=Справка за данък 3 по ставки
 LT1ReportByQuartersES=Справка за RE по ставки
@@ -217,7 +231,7 @@ Pcg_subtype=PCG подтип
 InvoiceLinesToDispatch=Редове от фактура за изпращане
 ByProductsAndServices=По продукт и услуга
 RefExt=Външна референция
-ToCreateAPredefinedInvoice=За да създадете шаблонна фактура създайте стандартна фактура, след което преди да я валидирате кликнете върху бутона "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Връзка към поръчка
 Mode1=Метод 1
 Mode2=Метод 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Специализираната счетово
 ACCOUNTING_ACCOUNT_SUPPLIER=Счетоводна сметка, използвана за контрагенти, които са доставчици
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Специализираната счетоводна сметка, определена в картата на контрагента, ще се използва само за счетоводно отчитане на подсметка. Този ще бъде използван за главната книга и като стойност по подразбиране на подсметката за счетоводното отчитане, ако не е дефинирана специализирана счетоводна сметка за доставчика.
 ConfirmCloneTax=Потвърдете клонирането на социален/фискален данък
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Клониране за следващ месец
 SimpleReport=Обикновена справка
 AddExtraReport=Допълнителни справки (добавя справка за чуждестранни и локални клиенти)
@@ -253,7 +269,8 @@ AccountingAffectation=Счетоводно възлагане
 LastDayTaxIsRelatedTo=Последен ден от периода, с който е свързан данъкът
 VATDue=Заявен данък върху продажбите
 ClaimedForThisPeriod=Заявен за периода
-PaidDuringThisPeriod=Платен през този период
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=По ставка на ДДС
 TurnoverbyVatrate=Оборот, фактуриран по ставка на ДДС
 TurnoverCollectedbyVatrate=Оборот, натрупан по ставка на ДДС
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/bg_BG/ecm.lang b/htdocs/langs/bg_BG/ecm.lang
index 032fc7c015a..79ccce411d2 100644
--- a/htdocs/langs/bg_BG/ecm.lang
+++ b/htdocs/langs/bg_BG/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Файлът все още не е индексир
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index aea2d732d1c..f70abe8e9ba 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Директория <b>%s</b> не е намерен (Bad пъ
 ErrorFunctionNotAvailableInPHP=Функция <b>%s</b> се изисква за тази функция, но не е на разположение в тази версия / настройка на PHP.
 ErrorDirAlreadyExists=Директория с това име вече съществува.
 ErrorFileAlreadyExists=Файл с това име вече съществува.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Файла не е получил изцяло от сървъра.
 ErrorNoTmpDir=Временно за директно %s не съществува.
 ErrorUploadBlockedByAddon=Качи блокиран от PHP / Apache плъгин.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Грешка при зареждане на диаграм
 ErrorBadSyntaxForParamKeyForContent=Неправилен синтаксис за параметър keyforcontent. Трябва да има стойност, започваща с %s или %s
 ErrorVariableKeyForContentMustBeSet=Грешка, трябва да бъде зададена константа с име %s (с текстово съдържание за показване) или %s (с външен url за показване).
 ErrorURLMustStartWithHttp=URL адресът %s трябва да започва с http:// или https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Грешка, новата референция вече е използвана
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Грешка, изтриването на плащане, свързано с приключена фактура, е невъзможно.
 ErrorSearchCriteriaTooSmall=Критериите за търсене са твърде ограничени.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Публичният интерфейс не е 
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Вашата стойност на PHP параметър upload_max_filesize (%s) е по-голяма от стойността на PHP параметър post_max_size (%s). Това не е последователна настройка.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/bg_BG/externalsite.lang b/htdocs/langs/bg_BG/externalsite.lang
index 4b5650fbff9..5b2ff52c0f8 100644
--- a/htdocs/langs/bg_BG/externalsite.lang
+++ b/htdocs/langs/bg_BG/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Настройка на линк към външен сайт
-ExternalSiteURL=Външен URL адрес на сайта
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Модула Външен сайт не е конфигуриран правилно.
 ExampleMyMenuEntry=Мой елемент на меню
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index b84fe0a8561..6dddb3abc1e 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Промяна
 IPModification=Modification IP
 DateLastModification=Дата на последна промяна
 DateValidation=Дата на валидиране
+DateSigning=Signing date
 DateClosing=Дата на приключване
 DateDue=Краен срок за плащане
 DateValue=Дата на вальор
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Единична цена (без ДДС) (валута)
 UnitPriceTTC=Единична цена
 PriceU=Ед. цена
 PriceUHT=Ед. цена (без ДДС)
-PriceUHTCurrency=Ед. цена (валута)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=Ед. цена (с ДДС)
 Amount=Сума
 AmountInvoice=Фактурна стойност
@@ -389,6 +390,8 @@ AmountTotal=Обща сума
 AmountAverage=Средна сума
 PriceQtyMinHT=Цена за минимално количество (без ДДС)
 PriceQtyMinHTCurrency=Цена за минимално количество (без ДДС) (валута)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Процент
 Total=Общо
 SubTotal=Междинна сума
@@ -724,7 +727,7 @@ MenuMembers=Членове
 MenuAgendaGoogle=Google календар
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Ограничение на системата (Меню Начало - Настройка - Сигурност): %s Kb, ограничение на PHP: %s Kb
-NoFileFound=Няма записани документи в тази директория
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Текущ език
 CurrentTheme=Текуща тема
 CurrentMenuManager=Текущ меню манипулатор
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Премахване на низ „%s“
 SomeTranslationAreUncomplete=Някои от предлаганите езици могат да бъдат само частично преведени или да съдържат грешки. Моля, помогнете ни да коригираме езика ви като се регистрирате на адрес <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a>, за да добавите подобренията си.
-DirectDownloadLink=Директна връзка за изтегляне (публична / външна)
-DirectDownloadInternalLink=Директна връзка за изтегляне (изисква регистрация в системата и съответни права)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Изтегляне
 DownloadDocument=Изтегляне на документ
 ActualizeCurrency=Актуализиране на валутния курс
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Контакти
 SearchIntoMembers=Членове
 SearchIntoUsers=Потребители
 SearchIntoProductsOrServices=Продукти или услуги
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Проекти
 SearchIntoMO=Поръчки за производство
 SearchIntoTasks=Задачи
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Клавишна комбинация
 AssignedTo=Възложено на
 Deletedraft=Изтриване на чернова
 ConfirmMassDraftDeletion=Потвърждаване за масово изтриване на чернови
-FileSharedViaALink=Файлът е споделен чрез връзка
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Първо изберете контрагент...
 YouAreCurrentlyInSandboxMode=В момента се намирате в режим "sandbox" на %s
 Inventory=Складова наличност
 AnalyticCode=Аналитичен код
 TMenuMRP=ПМИ
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Показване на повече информация
 NoFilesUploadedYet=Моля, първо прикачете документ
 SeePrivateNote=Вижте частната бележка
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/bg_BG/margins.lang b/htdocs/langs/bg_BG/margins.lang
index 98573ae49a9..67098604299 100644
--- a/htdocs/langs/bg_BG/margins.lang
+++ b/htdocs/langs/bg_BG/margins.lang
@@ -22,7 +22,7 @@ ProductService=Продукт или услуга
 AllProducts=Всички продукти и услуги
 ChooseProduct/Service=Избиране на продукт или услуга
 ForceBuyingPriceIfNull=Форсиране на покупна цена / себестойност да бъде равна на продажната цена, ако не е дефинирана първата
-ForceBuyingPriceIfNullDetails=Ако покупната цена / себестойност не е дефинирана и тази опция е включена, маржа ще бъде нула за реда (покупна цена / себестойност = продажна цена), в противен случай, ако е изключена маржа ще бъде равен на предложения по подразбиране.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Маржов метод за глобални отстъпки
 UseDiscountAsProduct=Като продукт
 UseDiscountAsService=Като услуга
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 5cb008f47a5..f74329e9e8d 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Списък на чернови членове (за вал
 MembersListValid=Списък на валидирани членове
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=Списък на деактивирани членове
 MembersListQualified=Списък на квалифицирани членове
 MenuMembersToValidate=Чернови членове
 MenuMembersValidated=Валидирани членове
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Деактивирани членове
 MembersWithSubscriptionToReceive=Членове с абонамент за получаване
 MembersWithSubscriptionToReceiveShort=Абонамент за получаване
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Изтекъл абонамент
 MemberStatusActiveLateShort=Изтекъл
 MemberStatusPaid=Актуален абонамент
 MemberStatusPaidShort=Актуален
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Деактивиран член
 MemberStatusResiliatedShort=Деактивиран
 MembersStatusToValid=Чернови членове
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Деактивирани членове
 MemberStatusNoSubscription=Валидиран (не е необходим абонамент)
 MemberStatusNoSubscriptionShort=Валидиран
@@ -82,6 +87,8 @@ Physical=Реален
 Moral=Морален
 MorAndPhy=Moral and Physical
 Reenable=Повторно активиране
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Деактивиране на член
 ConfirmResiliateMember=Сигурни ли сте, че искате да деактивирате този член?
 DeleteMember=Изтриване на член
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Имейл шаблон, койт
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Имейл шаблон, който да се използва за изпращане на имейл до член при регистриране на нов абонамент
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Имейл шаблон, който да се използва за изпращане на напомняне по имейл, когато абонаментът изтича
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Имейл шаблон, който да се използва за изпращане на имейл до член при анулиране на членство
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Имейл адрес за изпращане на автоматични имейли
 DescADHERENT_ETIQUETTE_TYPE=Формат на страница за етикети
 DescADHERENT_ETIQUETTE_TEXT=Текст, отпечатан в членски адресни листи
@@ -162,6 +170,7 @@ DocForLabels=Генериране на адресни листи
 SubscriptionPayment=Плащане на абонамент
 LastSubscriptionDate=Дата на последно плащане за абонамент
 LastSubscriptionAmount=Стойност на последния абонамент
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Статистика за членове по държави
 MembersStatisticsByState=Статистика за членове по област
 MembersStatisticsByTown=Статистика за членове по град
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index eb76c35f976..8df6a66c938 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=Искам да генерирам някои докуме
 IncludeDocGenerationHelp=Ако маркирате това, ще се генерира код, който да добави поле 'Генериране на документ' върху записа.
 ShowOnCombobox=Показване на стойност в комбиниран списък
 KeyForTooltip=Ключ за подсказка
-CSSClass=CSS клас
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Непроменяем
 ForeignKey=Външен ключ
 TypeOfFieldsHelp=Тип на полета:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] (например '1' означава, че добавяме бутон + след комбинирания списък, за да създадем записа, 'filter' може да бъде 'status=1 AND fk_user=__USER_ID AND entity IN (__SHARED_ENTITIES__)')
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index 543cbaf346a..e921bcb43cf 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Възлагане на поръчка
 MakeOrder=Възлагане на поръчка
 SupplierOrder=Поръчка за покупка
 SuppliersOrders=Поръчки за покупка
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Текущи поръчки за покупка
 CustomerOrder=Поръчка за продажба
 CustomersOrders=Поръчки за продажба
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 5d9542b424e..0e71bbb327f 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Фирма с множество дейности (всички 
 CreatedBy=Създадено от %s
 ModifiedBy=Променено от %s
 ValidatedBy=Валидирано от %s
+SignedBy=Signed by %s
 ClosedBy=Приключено от %s
 CreatedById=Потребител, който е създал
 ModifiedById=Потребител, който е направил последна промяна
@@ -244,6 +245,7 @@ NewKeyIs=Това са новите ви данни за вход
 NewKeyWillBe=Вашите нови данни за вход ще бъдат
 ClickHereToGoTo=Кликнете тук, за да отидете на %s
 YouMustClickToChange=Необходимо е първо да кликнете върху следния линк, за да потвърдите промяната на паролата
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Ако не сте заявили промяна, просто забравете за този имейл. Вашите идентификационни данни се съхраняват на сигурно място.
 IfAmountHigherThan=Ако сумата e по-висока от <strong>%s</strong>
 SourcesRepository=Хранилище за източници
diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang
index ba66b298f69..42054467fed 100644
--- a/htdocs/langs/bg_BG/productbatch.lang
+++ b/htdocs/langs/bg_BG/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Използване на партиден / сериен №
-ProductStatusOnBatch=Да (изисква се партиден / сериен №)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Да (уникалният сериен номер е задължителен)
 ProductStatusNotOnBatch=Не (не се изисква партиден / сериен №)
-ProductStatusOnBatchShort=Да
+ProductStatusOnBatchShort=Партиден
+ProductStatusOnSerialShort=Сериен
 ProductStatusNotOnBatchShort=Не
 Batch=Партиден / Сериен №
 atleast1batchfield=Дата на годност, дата на продажба или партиден / сериен №
@@ -22,3 +24,12 @@ ProductLotSetup=Настройка на модул партиден / серие
 ShowCurrentStockOfLot=Показване на текуща наличност за продукт / партида
 ShowLogOfMovementIfLot=Показване на движения за продукт / партида
 StockDetailPerBatch=Наличност по партида
+SerialNumberAlreadyInUse=Сериен номер %s е вече използван от друг продукт %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index e7009fa4c48..f74d443e831 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=Ставка на ДДС (за този доставч
 DiscountQtyMin=Отстъпка за това количество
 NoPriceDefinedForThisSupplier=Няма дефинирана цена / количество за този доставчик / продукт
 NoSupplierPriceDefinedForThisProduct=Няма дефинирана цена / количество за този продукт
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Предварително определен продукт
 PredefinedServicesToSell=Предварително определена услуга
 PredefinedProductsAndServicesToSell=Предварително определени продукти / услуги за продажба
@@ -313,7 +314,7 @@ LastUpdated=Последна актуализация
 CorrectlyUpdated=Правилно актуализирано
 PropalMergePdfProductActualFile=Файловете използвани за добавяне в PDF Azur са
 PropalMergePdfProductChooseFile=Избиране на PDF файлове
-IncludingProductWithTag=Включващи продукт / услуга от категория
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Цена по подразбиране, реалната цена може да зависи от клиента
 WarningSelectOneDocument=Моля, изберете поне един документ
 DefaultUnitToShow=Мярка
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 447427dfbc8..9a5727ec772 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Списък със задачи
 GoToListOfTimeConsumed=Показване на списъка с изразходвано време
 GanttView=Gantt диаграма
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Списък на търговски предложения, свързани с проекта
 ListOrdersAssociatedProject=Списък на поръчки за продажба, свързани с проекта
 ListInvoicesAssociatedProject=Списък на фактури за продажба, свързани с проекта
@@ -268,3 +269,7 @@ OneLinePerTask=Един ред на задача
 OneLinePerPeriod=Един ред на период
 RefTaskParent=Съгласно главна задача №
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/bg_BG/propal.lang b/htdocs/langs/bg_BG/propal.lang
index 5285db83d67..33ade36041e 100644
--- a/htdocs/langs/bg_BG/propal.lang
+++ b/htdocs/langs/bg_BG/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Изпращане на търговско предложени
 DatePropal=Дата на създаване
 DateEndPropal=Валидно до
 ValidityDuration=Срок на валидност
-CloseAs=Предложението е
 SetAcceptedRefused=Подписване / Отхвърляне
 ErrorPropalNotFound=Предложение %s не е намерено
 AddToDraftProposals=Добавяне към черновата на предложение
@@ -60,6 +59,7 @@ ConfirmClonePropal=Сигурни ли сте, че искате да клони
 ConfirmReOpenProp=Сигурни ли сте, че искате да отворите отново търговско предложение с № <b>%s</b>?
 ProposalsAndProposalsLines=Търговско предложение и редове
 ProposalLine=Ред №
+ProposalLines=Proposal lines
 AvailabilityPeriod=Забавяне на наличността
 SetAvailability=Определете забавяне на наличност
 AfterOrder=след поръчка
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Име, фамилия, фирмен печат, да
 ProposalsStatisticsSuppliers=Статистика на запитвания към доставчици
 CaseFollowedBy=Случай, проследяван от
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 2e83457229d..0a87358401a 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -19,8 +19,8 @@ Stock=Наличност
 Stocks=Наличности
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Наличности по партида / сериен №
 LotSerial=Партиди / Серийни номера
 LotSerialList=Списък на партиди / серийни номера
@@ -37,8 +37,8 @@ AllWarehouses=Всички складове
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Включва чернови поръчки
 Location=Местоположение
-LocationSummary=Кратко име на местоположение
-NumberOfDifferentProducts=Брой различни продукти
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Общ брой продукти
 LastMovement=Последно движение
 LastMovements=Последни движения
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Складова стойност
 UserWarehouseAutoCreate=Автоматично създаване на личен потребителски склад при създаване на потребител
 AllowAddLimitStockByWarehouse=Управляване също и на стойност за минимална и желана наличност за двойка (продукт - склад) в допълнение към стойността за минимална и желана наличност за продукт
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Склад по подразбиране
@@ -97,15 +98,16 @@ RealStockDesc=Физическа / реална наличност е налич
 RealStockWillAutomaticallyWhen=Реалната наличност ще бъде модифицирана според това правило (както е определено в модула на Наличности):
 VirtualStock=Виртуална наличност
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Идентификатор на склад
 DescWareHouse=Описание на склад
 LieuWareHouse=Местоположение на склад
 WarehousesAndProducts=Складове и продукти
 WarehousesAndProductsBatchDetail=Складове и продукти (с подробности за партида / сериен №)
 AverageUnitPricePMPShort=Средно измерена цена
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Единична продажна цена
 EstimatedStockValueSellShort=Стойност за продажба
 EstimatedStockValueSell=Стойност за продажба
@@ -145,7 +147,7 @@ Replenishments=Попълвания на наличности
 NbOfProductBeforePeriod=Количество на продукта %s в наличност преди избрания период (< %s)
 NbOfProductAfterPeriod=Количество на продукта %s в наличност след избрания период (> %s)
 MassMovement=Масово движение
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Регистриране на прехвърляне
 ReceivingForSameOrder=Разписки за тази поръчка
 StockMovementRecorded=Движенията на наличностите са регистрирани
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Нивото на наличност трябва д
 StockMustBeEnoughForOrder=Нивото на наличност трябва да е достатъчно, за да добавите продукт / услуга към поръчка (проверката се извършва по текущите реални наличности, по време на добавяне на ред в поръчка, независимо от правилото за автоматична промяна на наличността)
 StockMustBeEnoughForShipment= Нивото на наличност трябва да е достатъчно, за да добавите продукт / услуга към пратка (проверката се прави по текущите реални наличности, по време на добавяне на ред в пратката, независимо от правилото за автоматична промяна на наличността)
 MovementLabel=Име на движение
-TypeMovement=Вид на движение
+TypeMovement=Direction of movement
 DateMovement=Дата на движение
 InventoryCode=Код на движение / Инвентарен код
 IsInPackage=Съдържа се в опаковка
@@ -183,6 +185,7 @@ inventoryCreatePermission=Създаване на нова инвентариз
 inventoryReadPermission=Преглед на инвентаризации
 inventoryWritePermission=Актуализиране на инвентаризации
 inventoryValidatePermission=Валидиране на инвентаризация
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Инвентаризация
 inventoryListTitle=Инвентаризации
 inventoryListEmpty=Не се извършва инвентаризация
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Необходима е наличност,
 ForceTo=Принуждаване до
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Прикачете файл, след това кликнете върху иконата %s, за да изберете файла като източник при импортиране...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Повторно отваряне
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index 2f3e0c1898c..607c886b4be 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Доставчици
 SuppliersInvoice=Фактура за доставка
+SupplierInvoices=Фактури за доставка
 ShowSupplierInvoice=Показване на фактура за доставка
 NewSupplier=Нов доставчик
 History=История
diff --git a/htdocs/langs/bg_BG/ticket.lang b/htdocs/langs/bg_BG/ticket.lang
index e1801645a17..b777b181aae 100644
--- a/htdocs/langs/bg_BG/ticket.lang
+++ b/htdocs/langs/bg_BG/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Изтрит
 # Dict
 Type=Вид
 Severity=Приоритет
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=За да изпратите имейл с това съобщение
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Показване на логото на модула в
 TicketsShowModuleLogoHelp=Активирайте тази опция, за да скриете логото на модула от страниците на публичния интерфейс
 TicketsShowCompanyLogo=Показване на логото на фирмата в публичния интерфейс
 TicketsShowCompanyLogoHelp=Активирайте тази опция, за да скриете логото на основната фирма от страниците на публичния интерфейс
-TicketsEmailAlsoSendToMainAddress=Изпращане на известие до основния имейл адрес
-TicketsEmailAlsoSendToMainAddressHelp=Активирайте тази опция, за да изпратите имейл до "Известяващ имейл от" (вижте настройката по-долу)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Ограничаване на показването на тикети до такива, които са възложени на текущия потребител (не е приложимо за външни потребители, винаги ще бъдат ограничени до контрагента, от който зависят)
 TicketsLimitViewAssignedOnlyHelp=Само тикети, възложени на текущия потребител ще бъдат показвани. Не важи за потребител с права за управление на тикети.
 TicketsActivatePublicInterface=Активиране на публичния интерфейс
@@ -126,10 +128,10 @@ TicketNumberingModules=Модул за номериране на тикети
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Уведомяване на контрагента при създаване
 TicketsDisableCustomerEmail=Деактивиране на имейлите, когато тикетът е създаден от публичния интерфейс
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Последно променени тикети
 BoxLastModifiedTicketDescription=Тикети: %s последно променени
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Няма скорошни променени тикети
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index 9ffab6ba5ab..5312e855960 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Премахване от групата
 PasswordChangedAndSentTo=Паролата е сменена и изпратена на <b>%s</b>.
 PasswordChangeRequest=Заявка за промяна на парола на <b>%s</b>
 PasswordChangeRequestSent=Заявка за промяна на парола на <b>%s</b> е изпратена на <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Потвърдете възстановяване на парола
 MenuUsersAndGroups=Потребители и групи
 LastGroupsCreated=Групи: %s последно създадени
@@ -70,9 +72,10 @@ ExportDataset_user_1=Потребители и техните реквизити
 DomainUser=Домейн потребител %s
 Reactivate=Възстановяване
 CreateInternalUserDesc=Тази форма позволява да създадете вътрешен потребител във вашата фирма / организация. За да създадете външен потребител (за клиент, доставчик и т.н.), използвайте бутона 'Създаване на потребител' в картата на контакта за този контрагент.
-InternalExternalDesc=<b>Вътрешен</b> потребител е този, който е част от вашата фирма / организация.<br><b>Външен</b> потребител е този, който е клиент, доставчик или друг (Външен потребител към контрагент може да бъде създаден от раздела 'Контакти / Адреси' на съответният контрагент).<br><br>И в двата случая разрешенията определят права в Dolibarr, също така външният потребител може да има различен меню манипулатор от вътрешният (Вижте Начало - Настройка - Интерфейс).
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Разрешението е предоставено, тъй като е наследено от една от групите на потребителя.
 Inherited=Наследено
+UserWillBe=Created user will be
 UserWillBeInternalUser=Създаденият потребителят ще бъде вътрешен потребител (тъй като не е свързан с определен контрагент)
 UserWillBeExternalUser=Създаденият потребителят ще бъде външен потребител (защото е свързан с определен контрагент)
 IdPhoneCaller=Идентификатор на повикващия
@@ -109,8 +112,10 @@ UserAccountancyCode=Счетоводен код на потребителя
 UserLogoff=Излизане от потребителя
 UserLogged=Потребителят е регистриран
 DateOfEmployment=Employment date
-DateEmployment=Дата на назначаване
+DateEmployment=Employment
+DateEmploymentstart=Дата на назначаване
 DateEmploymentEnd=Дата на освобождаване
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=Не можете да забраните собствения си потребителски запис
 ForceUserExpenseValidator=Принудително валидиране на разходни отчети
 ForceUserHolidayValidator=Принудително валидиране на молби за отпуск
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index 1696d94a7ad..df36f6d6170 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Използвайте с Apache / Nginx / ...</u><br>Съ
 ExampleToUseInApacheVirtualHostConfig=Пример за използване при настройка на виртуалния хост в Apache:
 YouCanAlsoTestWithPHPS=<u>Използване, чрез вграден PHP сървър</u> <br> В среда за разработка може да предпочетете да тествате сайта с вградения PHP уеб сървър (изисква се PHP 5.5) като стартирате <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Стартирайте уебсайта си на друг Dolibarr хостинг доставчик</u> <br> Ако нямате уеб сървър като Apache или NGinx в интернет може да експортирате и импортирате уебсайта си в друга Dolibarr инстанция, предоставена от друг Dolibarr хостинг доставчик, който осигурява пълна интеграция с модула на уебсайта. Може да намерите списък с някои доставчици на Dolibarr хостинг услуги на <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Проверете също дали виртуалният хост има права за <strong>%s</strong> на файлове в <br> <strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Четене
 WritePerm=Писане
 TestDeployOnWeb=Тестване / внедряване в интернет
 PreviewSiteServedByWebServer=<u>Преглеждане на %s в нов раздел.</u> <br><br> %s ще се обслужва от външен уеб сървър (като Apache, Nginx, IIS). Трябва да инсталирате и настроите този сървър, преди да посочите директория: <br> <strong>%s</strong> <br> URL адрес, обслужван от външен сървър: <br> <strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Преглеждане на %s в нов раздел.</u> <br><br> %s ще се обслужва от Dolibarr сървър, така че не се нуждаете от допълнителен уеб сървър (като Apache, Nginx, IIS), който да бъде инсталиран. <br> Неудобство е, че URL адреса на страниците не е удобен за потребителя и започва с пътя на вашия Dolibarr. <br> URL адрес, обслужван от Dolibarr: <br> <strong>%s</strong> <br><br> За да използвате вашия собствен външен уеб сървър за обслужване на този уебсайт създайте виртуален хост на вашия уеб сървър, който сочи в директорията <br> <strong>%s</strong> <br>, след това въведете името на този виртуален сървър и кликнете върху другия бутон за преглеждане.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL адресът на виртуалния хост, обслужван от външен уеб сървър, не е дефиниран.
 NoPageYet=Все още няма страници
 YouCanCreatePageOrImportTemplate=Може да създадете нова страница или да импортирате пълен шаблон на уебсайт
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/bg_BG/zapier.lang b/htdocs/langs/bg_BG/zapier.lang
index 36b711c3fae..1763b156ffc 100644
--- a/htdocs/langs/bg_BG/zapier.lang
+++ b/htdocs/langs/bg_BG/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier за Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Модул Zapier за Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Настройка на Zapier за Dolibarr
+ZapierForDolibarrSetup=Настройка на Zapier за Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index f9a6468d94a..8f4508ada53 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index ac24131462a..64b12a758f8 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index ada5ee7f5c6..a7a67d55be3 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for 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
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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 in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/bn_BD/boxes.lang
+++ b/htdocs/langs/bn_BD/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang
index 52327db3510..cb184028464 100644
--- a/htdocs/langs/bn_BD/categories.lang
+++ b/htdocs/langs/bn_BD/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index e60b163d09f..a3f02b38f30 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/bn_BD/ecm.lang b/htdocs/langs/bn_BD/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/bn_BD/ecm.lang
+++ b/htdocs/langs/bn_BD/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/bn_BD/externalsite.lang b/htdocs/langs/bn_BD/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/bn_BD/externalsite.lang
+++ b/htdocs/langs/bn_BD/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index d8cd5eaea4f..6aba43f602d 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/bn_BD/margins.lang b/htdocs/langs/bn_BD/margins.lang
index b9d52dcfdc6..ad5406409b4 100644
--- a/htdocs/langs/bn_BD/margins.lang
+++ b/htdocs/langs/bn_BD/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/bn_BD/modulebuilder.lang b/htdocs/langs/bn_BD/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/bn_BD/modulebuilder.lang
+++ b/htdocs/langs/bn_BD/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/bn_BD/orders.lang b/htdocs/langs/bn_BD/orders.lang
index 503955cf5f0..87d196eb22f 100644
--- a/htdocs/langs/bn_BD/orders.lang
+++ b/htdocs/langs/bn_BD/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Phone
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/bn_BD/productbatch.lang b/htdocs/langs/bn_BD/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/bn_BD/productbatch.lang
+++ b/htdocs/langs/bn_BD/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/bn_BD/propal.lang b/htdocs/langs/bn_BD/propal.lang
index a1c380977ac..046f1dc1a95 100644
--- a/htdocs/langs/bn_BD/propal.lang
+++ b/htdocs/langs/bn_BD/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/bn_BD/suppliers.lang b/htdocs/langs/bn_BD/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/bn_BD/suppliers.lang
+++ b/htdocs/langs/bn_BD/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/bn_BD/ticket.lang b/htdocs/langs/bn_BD/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/bn_BD/ticket.lang
+++ b/htdocs/langs/bn_BD/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/bn_BD/zapier.lang b/htdocs/langs/bn_BD/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/bn_BD/zapier.lang
+++ b/htdocs/langs/bn_BD/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/bn_IN/accountancy.lang
+++ b/htdocs/langs/bn_IN/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index f9a6468d94a..8f4508ada53 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/bn_IN/banks.lang
+++ b/htdocs/langs/bn_IN/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/bn_IN/bills.lang b/htdocs/langs/bn_IN/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/bn_IN/bills.lang
+++ b/htdocs/langs/bn_IN/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/bn_IN/boxes.lang b/htdocs/langs/bn_IN/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/bn_IN/boxes.lang
+++ b/htdocs/langs/bn_IN/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bn_IN/categories.lang b/htdocs/langs/bn_IN/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/bn_IN/categories.lang
+++ b/htdocs/langs/bn_IN/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang
index 8dc815b522e..154400c6536 100644
--- a/htdocs/langs/bn_IN/companies.lang
+++ b/htdocs/langs/bn_IN/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/bn_IN/compta.lang b/htdocs/langs/bn_IN/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/bn_IN/compta.lang
+++ b/htdocs/langs/bn_IN/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/bn_IN/ecm.lang b/htdocs/langs/bn_IN/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/bn_IN/ecm.lang
+++ b/htdocs/langs/bn_IN/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/bn_IN/externalsite.lang b/htdocs/langs/bn_IN/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/bn_IN/externalsite.lang
+++ b/htdocs/langs/bn_IN/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
index f8ba6f4073c..dc2a83f2015 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/bn_IN/margins.lang b/htdocs/langs/bn_IN/margins.lang
index 76ea8ad5c4d..ad5406409b4 100644
--- a/htdocs/langs/bn_IN/margins.lang
+++ b/htdocs/langs/bn_IN/margins.lang
@@ -22,7 +22,7 @@ ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
diff --git a/htdocs/langs/bn_IN/members.lang b/htdocs/langs/bn_IN/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/bn_IN/members.lang
+++ b/htdocs/langs/bn_IN/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/bn_IN/modulebuilder.lang b/htdocs/langs/bn_IN/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/bn_IN/modulebuilder.lang
+++ b/htdocs/langs/bn_IN/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/bn_IN/orders.lang b/htdocs/langs/bn_IN/orders.lang
index ad91e1eef63..87d196eb22f 100644
--- a/htdocs/langs/bn_IN/orders.lang
+++ b/htdocs/langs/bn_IN/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
diff --git a/htdocs/langs/bn_IN/other.lang b/htdocs/langs/bn_IN/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/bn_IN/other.lang
+++ b/htdocs/langs/bn_IN/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/bn_IN/productbatch.lang b/htdocs/langs/bn_IN/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/bn_IN/productbatch.lang
+++ b/htdocs/langs/bn_IN/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/bn_IN/projects.lang b/htdocs/langs/bn_IN/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/bn_IN/projects.lang
+++ b/htdocs/langs/bn_IN/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/bn_IN/propal.lang b/htdocs/langs/bn_IN/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/bn_IN/propal.lang
+++ b/htdocs/langs/bn_IN/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/bn_IN/stocks.lang b/htdocs/langs/bn_IN/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/bn_IN/stocks.lang
+++ b/htdocs/langs/bn_IN/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/bn_IN/suppliers.lang b/htdocs/langs/bn_IN/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/bn_IN/suppliers.lang
+++ b/htdocs/langs/bn_IN/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/bn_IN/ticket.lang b/htdocs/langs/bn_IN/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/bn_IN/ticket.lang
+++ b/htdocs/langs/bn_IN/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/bn_IN/users.lang b/htdocs/langs/bn_IN/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/bn_IN/users.lang
+++ b/htdocs/langs/bn_IN/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/bn_IN/website.lang b/htdocs/langs/bn_IN/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/bn_IN/website.lang
+++ b/htdocs/langs/bn_IN/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/bn_IN/zapier.lang b/htdocs/langs/bn_IN/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/bn_IN/zapier.lang
+++ b/htdocs/langs/bn_IN/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 6a1143bab46..ed60d2c2c9f 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 268bcdc7337..d18368eacd5 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Ukloni zaključavanje veze
 YourSession=Vaša sesija
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Postavke sigurnosti
+PHPSetup=PHP 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Prodavači
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Proizvodi
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=Kadrovska služba
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow - Tok rada
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Dopunski atributi
 ExtraFieldsLines=Dopunski atributi (tekstovi)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1367,7 +1377,7 @@ BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
-ForceInvoiceDate=Force invoice date to validation date (forcing is possible only the first time an invoice is validated)
+ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
 SuggestPaymentByChequeToAddress=Suggest payment by check to
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 9b7547ab933..cf38c2f1ddb 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Vaš SEPA mandat
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index e1ddafef69a..f59dc5e273c 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -54,9 +54,10 @@ InvoiceCustomer=Faktura kupca
 CustomerInvoice=Faktura kupca
 CustomersInvoices=Fakture kupaca
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Fakture prodavača
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=fakture dobavljača
+SupplierBills=Fakture prodavača
 Payment=Uplata
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Izvršene uplate
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Pravilo plaćanja
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debitna/kreditna kartica
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Varijabilni iznos (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bankovna transakcija
 PaymentTypeShortVIR=Bankovna transakcija
@@ -494,12 +498,16 @@ Cash=Gotovina
 Reported=Odgođeno
 DisabledBecausePayments=Nije moguće jer ima nekoliko uplata
 CantRemovePaymentWithOneInvoicePaid=Ne može se obrisati uplata jer ima bar jedna faktura klasifikovana kao plaćena
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Očekivano plaćanje
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Plaćeno ovom uplatom
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Platiti
 ToMakePaymentBack=Povrat uplate
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 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 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
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=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 down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 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=Privremena situacija
+PDFInvoiceSituation=Privremena situacija
 InvoiceSituationAsk=Faktura nakon situacije
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 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
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index 706ce4969d7..c886622fda5 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
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Posljednje akcije
 BoxLastContracts=Najnoviji ugovori
 BoxLastContacts=Najnoviji kontakti/adrese
 BoxLastMembers=Najnoviji članovi
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Posljednje intervencije
 BoxCurrentAccounts=Trenutna stanja računa
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Posljednjih %s novosti od %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Računovodstvo
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index 68923ab7d34..ad8764f8a38 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index b199c6e0fce..dcb571ec725 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -43,9 +43,10 @@ Individual=Fizičko lice
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Matična kompanija
 Subsidiaries=Podružnice
-ReportByMonth=Izvještaj po mjesecima
-ReportByCustomers=Izvještaj po kupcima
-ReportByQuarter=Izvještaj po stopama
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Pravila ponašanja
 RegisteredOffice=Registrovan ured
 Lastname=Prezime
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (broj socijalnog osiguranja)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (broj udruženja)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, stari APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registracijski broj
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luksemburg)
 ProfId2LU=Id. prof. 2 (dozvola za rad)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (broj socijalnog osiguranja)
 ProfId3PT=Prof Id 3 (broj komercijalnog zapisa)
 ProfId4PT=Prof Id 4 (konzervator)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Trenutni neplaćeni račun
 OutstandingBill=Max. za neplaćeni račun
 OutstandingBillReached=Dostignut maksimum za neplaćene račune
 OrderMinAmount=Najmanja količina za naručiti
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Ova šifra je slobodna. Ova šifra se može mijenjati bilo kad.
 ManagingDirectors=Ime menadžer(a) (CEO, direktor, predsjednik...)
 MergeOriginThirdparty=Umnoži subjekta (subjekt kojeg želite obrisati)
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 233903b0bfe..c61d91db97f 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=PDV prikupljeni
 StatusToPay=Za plaćanje
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Plaćanje računa kupca
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Plaćanje socijalnog/fiskalnog poreza
 PaymentVat=Plaćanje PDVa
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Spisak plaćanja
 ListOfCustomerPayments=Spisak uplata kupca
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link ka narudžbi
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/bs_BA/ecm.lang b/htdocs/langs/bs_BA/ecm.lang
index cd3c2cab853..b6d2a9ba2cc 100644
--- a/htdocs/langs/bs_BA/ecm.lang
+++ b/htdocs/langs/bs_BA/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index e2d3b3e5347..386a7156fbc 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/bs_BA/externalsite.lang b/htdocs/langs/bs_BA/externalsite.lang
index 70845e9ccba..54a33f638e8 100644
--- a/htdocs/langs/bs_BA/externalsite.lang
+++ b/htdocs/langs/bs_BA/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Podesi link za eksterni web sajt
-ExternalSiteURL=Link do eksternog web sajta
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modul ExternalSite nije konfigurisan kako treba.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index fb1c15f2bfd..86a1539fe0f 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Datum izmj.
 IPModification=Modification IP
 DateLastModification=Datum zadnje izmjene
 DateValidation=Datum potvrde
+DateSigning=Signing date
 DateClosing=Datum zatvaranja
 DateDue=Datum roka plaćanja
 DateValue=Datum valute
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Jedinična cijena
 PriceU=J.C.
 PriceUHT=J.C. (neto)
-PriceUHTCurrency=J.C (valuta)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=J.C. (uklj. PDV)
 Amount=Iznos
 AmountInvoice=Iznos fakture
@@ -389,6 +390,8 @@ AmountTotal=Ukupni iznos
 AmountAverage=Prosječni iznos
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Postotak
 Total=Ukupno
 SubTotal=Međuzbir
@@ -724,7 +727,7 @@ MenuMembers=Članovi
 MenuAgendaGoogle=Google kalendar
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr ograničenje (Meni Početna-Postavke-Sigurnost): %s Kb, PHP ograničenje: %s Kb
-NoFileFound=Nema dokumenata spremljenih u ovom direktoriju
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Trenutni jezik
 CurrentTheme=Trenutna tema
 CurrentMenuManager=Trenutni upravljač menija
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Ukloni pojam '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direktni link preuzimanja (javni/vanjski)
-DirectDownloadInternalLink=Link direktnog skidanja (morate biti prijavljeni i imati potrebna dopuštenja)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Skidanje
 DownloadDocument=Skidanje dokumenta
 ActualizeCurrency=Ažuriraj kurs valute
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontakti
 SearchIntoMembers=Članovi
 SearchIntoUsers=Korisnici
 SearchIntoProductsOrServices=Proizvodi ili usluge
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projekti
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Zadaci
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Prečica na tastaturi
 AssignedTo=Dodijeljeno korisniku
 Deletedraft=Obriši nacrt
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=Datoteka dijeljena preko linka
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventar
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/bs_BA/margins.lang b/htdocs/langs/bs_BA/margins.lang
index b9d52dcfdc6..ffbdb48ae69 100644
--- a/htdocs/langs/bs_BA/margins.lang
+++ b/htdocs/langs/bs_BA/margins.lang
@@ -3,7 +3,7 @@
 Margin=Margin
 Margins=Margins
 TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
+MarginOnProducts=Marža / proizvodi
 MarginOnServices=Margin / Services
 MarginRate=Margin rate
 MarkRate=Mark rate
@@ -13,15 +13,16 @@ InputPrice=Input price
 margin=Profit margins management
 margesSetup=Profit margins management setup
 MarginDetails=Margin details
-ProductMargins=Product margins
+ProductMargins=Marže proizvoda
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
-ProductService=Product or Service
-AllProducts=All products and services
+ProductService=Proizvod ili usluga
+AllProducts=Svi proizvodi i usluge
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index bca9a43ae4c..6434c6ef897 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Istekao
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Potvrđeno
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Plaćanje preplate
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/bs_BA/modulebuilder.lang b/htdocs/langs/bs_BA/modulebuilder.lang
index 9281e1f7849..5a78e93fe70 100644
--- a/htdocs/langs/bs_BA/modulebuilder.lang
+++ b/htdocs/langs/bs_BA/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index 158e1fff021..60192a26650 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Narudžbe za nabavku
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=email
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 26ece215614..84db6e2157b 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang
index 80b78d893bc..189eb2830bb 100644
--- a/htdocs/langs/bs_BA/productbatch.lang
+++ b/htdocs/langs/bs_BA/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Da
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Ne
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -17,8 +19,17 @@ printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductDoesNotUseBatchSerial=Ovaj proizvod ne koristi serijski broj
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 467e9f62b86..2f03536a62b 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Jedinica
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index ed058b147fe..351f794fe3e 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/bs_BA/propal.lang b/htdocs/langs/bs_BA/propal.lang
index ca865c7563b..c02b9e229c1 100644
--- a/htdocs/langs/bs_BA/propal.lang
+++ b/htdocs/langs/bs_BA/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Pošalji poslovni prijedlog e-mailom
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 3549cc9c195..c96cb4a268f 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -19,8 +19,8 @@ Stock=Zaliha
 Stocks=Zalihe
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
-LocationSummary=Skraćeni naziv lokacije
-NumberOfDifferentProducts=Broj različitih proizvoda
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Ukupan broj proizvoda
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Skladišna vrijednost
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Glavno skladište
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Viruelna zaliha
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=ID skladišta
 DescWareHouse=Opis skladišta
 LieuWareHouse=Lokalizacija skladišta
 WarehousesAndProducts=Skladišta i proizvodi
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Ponderirana/vagana aritmetička sredina - PAS
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Prodajna cijena jedinice
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Nadopune
 NbOfProductBeforePeriod=Količina proizvoda %s u zalihi prije odabranog perioda (%s)
 NbOfProductAfterPeriod=Količina proizvoda %s u zalihi poslije odabranog perioda (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Kretanja zalihe zapisana
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventar
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index 86861419bf5..85c445b70c8 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Dobavljači
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Fakture prodavača
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=Novi dobavljač
 History=Historija
diff --git a/htdocs/langs/bs_BA/ticket.lang b/htdocs/langs/bs_BA/ticket.lang
index fd582550e54..d0becaf2768 100644
--- a/htdocs/langs/bs_BA/ticket.lang
+++ b/htdocs/langs/bs_BA/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Tip
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index 4c99cebb83a..70951a32d6f 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Ukloni iz grupe
 PasswordChangedAndSentTo=Šifra promijenjena i poslana korisniku <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Zahtjev za promjenu šifre za <b>%s</b> poslana na <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Korisnici i grupe
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Korisnik domene %s
 Reactivate=Reaktivirati
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Dozvola je prenesena od jedne korisničke grupe.
 Inherited=Preneseno
+UserWillBe=Created user will be
 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
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=Odjava korisnika
 UserLogged=Korisnik prijavljen
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index aa90f42f735..396a2939174 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Pročitaj
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/bs_BA/zapier.lang b/htdocs/langs/bs_BA/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/bs_BA/zapier.lang
+++ b/htdocs/langs/bs_BA/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index de5dd2c6a24..2be34f0069e 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Línies de factura comptabilitzades
 ExpenseReportLines=Línies d'informes de despeses a comptabilitzar
 ExpenseReportLinesDone=Línies comptabilitzades d'informes de despeses
 IntoAccount=Línia comptabilitzada amb el compte comptable
-TotalForAccount=Total per compte comptable
+TotalForAccount=Total accounting account
 
 
 Ventilate=Comptabilitza
@@ -209,7 +209,7 @@ Codejournal=Diari
 JournalLabel=Títol de Diari
 NumPiece=Número de peça
 TransactionNumShort=Número de transacció
-AccountingCategory=Grups personalitzats
+AccountingCategory=Custom group
 GroupByAccountAccounting=Agrupa per compte major
 GroupBySubAccountAccounting=Agrupa per subcompte comptable
 AccountingAccountGroupsDesc=Podeu definir aquí alguns grups de comptes comptables. S'utilitzaran per a informes comptables personalitzats.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Línies encara no enllaçades, utilitzeu el menú <a
 
 ## Import
 ImportAccountingEntries=Entrades de comptabilitat
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Data d'exportació
 WarningReportNotReliable=Avís, aquest informe no està basat en el Llibre Major, de manera que no conté assentaments modificats manualment en el Llibre Major. Si el registre diari està actualitzat, la vista de comptes és més precisa.
 ExpenseReportJournal=Diari d'informe de despeses
 InventoryJournal=Diari d'inventari
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 552135eda7c..98d6ee38dd1 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -12,7 +12,7 @@ VersionRecommanded=Recomanada
 FileCheck=Comprovador d'integritat de fitxers
 FileCheckDesc=Aquesta eina us permet comprovar la integritat dels fitxers i la configuració de la vostra aplicació, comparant cada fitxer amb l'oficial. També es pot comprovar el valor d'algunes constants de configuració. Podeu utilitzar aquesta eina per a determinar si s'han modificat fitxers (per exemple, per un hacker).
 FileIntegrityIsStrictlyConformedWithReference=La integritat dels arxius està estrictament conforme amb la referència.
-FileIntegrityIsOkButFilesWereAdded=La comprovació de la integritat dels arxius ha resultat exitosa, no obstant s'han afegit alguns arxius nous.
+FileIntegrityIsOkButFilesWereAdded=La comprovació de la integritat dels arxius ha resultat exitosa, no obstant això, 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
@@ -37,6 +37,7 @@ UnlockNewSessions=Eliminar bloqueig de connexions
 YourSession=La seva sessió
 Sessions=Sessions d'usuaris
 WebUserGroup=Servidor web usuari/grup
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permisos als fitxers del directori arrel web
 PermissionsOnFile=Permisos al fitxer %s
 NoSessionFound=Sembla que el seu PHP no pot llistar les sessions actives. El directori de salvaguardat de sessions (<b>%s</b>) pot estar protegit (per exemple, pels permisos del sistema operatiu o per la directiva open_basedir del seu PHP).
@@ -62,6 +63,7 @@ IfModuleEnabled=Nota: sí només és eficaç si el mòdul <b>%s</b> està activa
 RemoveLock=Elimineu/reanomeneu el fitxer <b> %s </b> si existeix, per a permetre l'ús de l'eina d'actualització/instal·lació.
 RestoreLock=Substituir un arxiu <b>%s</b>, donant-li només drets de lectura a aquest arxiu per tal de prohibir noves actualitzacions.
 SecuritySetup=Configuració de seguretat
+PHPSetup=PHP setup
 SecurityFilesDesc=Defineix les opcions relacionades amb la seguretat de càrrega de fitxers.
 ErrorModuleRequirePHPVersion=Error, aquest mòdul requereix una versió %s o superior de PHP
 ErrorModuleRequireDolibarrVersion=Error, aquest mòdul requereix una versió %s o superior de Dolibarr
@@ -105,7 +107,7 @@ MaxSizeForUploadedFiles=Mida màxima per als fitxers a pujar (0 per a no permetr
 UseCaptchaCode=Utilitzeu el codi gràfic (CAPTCHA) a la pàgina d'inici de sessió
 AntiVirusCommand=Ruta completa cap al comandament antivirus
 AntiVirusCommandExample=Exemple per al dimoni ClamAv (requereix clamav-daemon): /usr/bin/clamdscan<br>Exemple per a ClamWin (molt molt lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
-AntiVirusParam= Paràmetres complementaris en la línia de comandes
+AntiVirusParam= Més paràmetres a la línia d'ordres
 AntiVirusParamExample=Exemple per al dimoni de ClamAv: --fdpass<br>Exemple per a ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuració del mòdul Comptabilitat
 UserSetup=Configuració de gestió d'usuaris
@@ -121,7 +123,7 @@ SetupShort=Configuració
 OtherOptions=Altres opcions
 OtherSetup=Altres configuracions
 CurrentValueSeparatorDecimal=Separador decimal
-CurrentValueSeparatorThousand=Separador milers
+CurrentValueSeparatorThousand=Separador de milers
 Destination=Destinació
 IdModule=ID del mòdul
 IdPermissions=ID de permisos
@@ -146,15 +148,15 @@ MenusDesc=Els gestors de menú configuren el contingut de les dues barres de men
 MenusEditorDesc=L'editor de menú us permet definir entrades de menú personalitzades. Feu-lo servir amb cura per a evitar la inestabilitat i les entrades de menú inaccessibles permanentment. <br> Alguns mòduls afegeixen entrades de menú (al menú <b> Tot </b> sobretot). Si elimineu algunes d'aquestes entrades per error, podeu restaurar-les desactivant i tornant a activar el mòdul.
 MenuForUsers=Menú per als usuaris
 LangFile=arxiu .lang
-Language_en_US_es_MX_etc=Idioma (ca_ES, es_ES, ...)
+Language_en_US_es_MX_etc=Idioma (ca_ES, es_ES...)
 System=Sistema
 SystemInfo=Informació del sistema
 SystemToolsArea=Àrea utilitats del sistema
 SystemToolsAreaDesc=Aquesta àrea proporciona funcions d'administració. Utilitzeu el menú per a triar la funció necessària.
 Purge=Purga
-PurgeAreaDesc=Aquesta pàgina permet eliminar tots els fitxers generats o guardats per Dolibarr (fitxers temporals o tots els fitxers de la carpeta <b>%s</b>). L'ús d'aquesta funció no és necessària. Es dóna per als usuaris que alberguen Dolibarr en un servidor que no ofereix els permisos d'eliminació de fitxers generats pel servidor web.
-PurgeDeleteLogFile=Suprimeix els fitxers de registre, incloent <b>%s</b> definit per al mòdul Syslog (sense risc de perdre dades)
-PurgeDeleteTemporaryFiles=Suprimeix tots els registres i fitxers temporals (no hi ha risc de perdre dades). Nota: la supressió de fitxers temporals només es fa si el directori temporal es va crear fa més de 24 hores.
+PurgeAreaDesc=Aquesta pàgina us permet suprimir tots els fitxers generats o emmagatzemats per Dolibarr (fitxers temporals o tots els fitxers del directori <b> %s </b>). Normalment no és necessari fer servir aquesta funció. Es proporciona com a solució alternativa als usuaris que allotjen Dolibarr amb un proveïdor que no ofereix permisos per a eliminar fitxers generats pel servidor web.
+PurgeDeleteLogFile=Suprimeix els fitxers de registre, inclosos <b> %s </b> definits per al mòdul Syslog (sense risc de perdre dades)
+PurgeDeleteTemporaryFiles=Suprimeix tots els fitxers de registre i temporals (no hi ha risc de perdre dades). El paràmetre pot ser 'tempfilesold', 'logfiles' o tots dos 'tempfilesold+logfiles'. Nota: la supressió de fitxers temporals només es fa si el directori temporal es va crear fa més de 24 hores.
 PurgeDeleteTemporaryFilesShort=Esborra el registre i els fitxers temporals
 PurgeDeleteAllFilesInDocumentsDir=Suprimiu tots els fitxers del directori: <b>%s</b>.<br> Això suprimirà tots els documents generats relacionats amb elements (tercers, factures, etc.), fitxers penjats al mòdul GED,  còpies de seguretat de la base de dades i fitxers temporals.
 PurgeRunNow=Purgar
@@ -174,17 +176,17 @@ NoBackupFileAvailable=Cap còpia disponible
 ExportMethod=Mètode d'exportació
 ImportMethod=Mètode d'importació
 ToBuildBackupFileClickHere=Per a crear un fitxer de còpia de seguretat, feu clic <a href="%s">aquí</a>.
-ImportMySqlDesc=Per a importar una còpia de seguretat MySQL, podeu utilitzar phpMyAdmin a través del vostre hosting o utilitzar les ordres mysql de la línia de comandes. <br> Per exemple:
-ImportPostgreSqlDesc=Per a importar una còpia de seguretat, useu l'ordre pg_restore des de la línia de comandes:
+ImportMySqlDesc=Per a importar un fitxer de còpia de seguretat MySQL, podeu utilitzar phpMyAdmin mitjançant el vostre allotjament o utilitzar l’ordre mysql de la línia d’ordres. <br>Per exemple:
+ImportPostgreSqlDesc=Per a importar un fitxer de còpia de seguretat, heu d'utilitzar l'ordre pg_restore des de la línia d'ordres:
 ImportMySqlCommand=%s %s < elmeuarxiubackup.sql
 ImportPostgreSqlCommand=%s %s elmeuarxiubackup.sql
 FileNameToGenerate=Nom del fitxer de còpia de seguretat:
 Compression=Compressió
-CommandsToDisableForeignKeysForImport=Comanda per a desactivar les claus forànies a la importació
+CommandsToDisableForeignKeysForImport=Comanda per a desactivar les claus foranes a la importació
 CommandsToDisableForeignKeysForImportWarning=Obligatori si vol poder restaurar més tard el dump SQL
 ExportCompatibility=Compatibilitat de l'arxiu d'exportació generat
 ExportUseMySQLQuickParameter=Utilitza el paràmetre --quick
-ExportUseMySQLQuickParameterHelp=El paràmetre '--quik' ajuda a limitar el consum de RAM per a tables grans.
+ExportUseMySQLQuickParameterHelp=El paràmetre '--quick' ajuda a limitar el consum de RAM per a taules grans.
 MySqlExportParameters=Paràmetres de l'exportació MySql
 PostgreSqlExportParameters= Paràmetres de l'exportació PostgreSQL
 UseTransactionnalMode=Utilitzar el mode transaccional
@@ -195,7 +197,7 @@ AddDropTable=Afegir ordres DROP TABLE
 ExportStructure=Estructura
 NameColumn=Nom de les columnes
 ExtendedInsert=Instruccions INSERT esteses
-NoLockBeforeInsert=Sense intrucció LOCK abans del INSERT
+NoLockBeforeInsert=No hi ha ordres de bloqueig en l’INSERT
 DelayedInsert=Insercions amb retard
 EncodeBinariesInHexa=Codifica les dades binàries en hexadecimal
 IgnoreDuplicateRecords=Ignorar errors de registres duplicats (INSERT IGNORE)
@@ -209,13 +211,13 @@ ModulesMarketPlaceDesc=A internet podeu trobar més mòduls per a descarregar en
 ModulesDeployDesc=Si els permisos del vostre sistema de fitxers ho permeten, podeu utilitzar aquesta eina per a desplegar un mòdul extern. El mòdul serà visible a la pestanya <strong> %s </strong>.
 ModulesMarketPlaces=Trobar mòduls/complements externs
 ModulesDevelopYourModule=Desenvolupeu els vostres mòduls/aplicacions
-ModulesDevelopDesc=Podeu desenvolupar o trobar un partner que desenvolupi per a vostè, el vostre mòdul personalitzat
+ModulesDevelopDesc=També podeu desenvolupar el vostre propi mòdul o trobar un soci per a desenvolupar-ne un.
 DOLISTOREdescriptionLong=En lloc d'anar al lloc web <a href="https://www.dolistore.com">www.dolistore.com</a> per a trobar un mòdul extern, podeu utilitzar aquesta eina incrustada que farà la cerca en la tenda per vosaltres (pot ser lent, necessiteu un accés a internet)...
 NewModule=Mòdul nou
 FreeModule=Gratuït
 CompatibleUpTo=Compatible amb la versió %s
-NotCompatible=Aquest mòdul no sembla compatible amb el vostre Dolibarr %s (Mín %s - Màx %s).
-CompatibleAfterUpdate=Aquest mòdul requereix actualitzar el vostre Dolibarr %s (Mín %s - Màx %s).
+NotCompatible=Aquest mòdul no sembla compatible amb el vostre Dolibarr %s (Mín. %s - Màx. %s).
+CompatibleAfterUpdate=Aquest mòdul requereix actualitzar el vostre Dolibarr %s (Mín. %s - Màx. %s).
 SeeInMarkerPlace=Veure a la tenda d'apps
 SeeSetupOfModule=Vegi la configuració del mòdul %s
 Updated=Actualitzat
@@ -232,6 +234,7 @@ BoxesAvailable=Panells disponibles
 BoxesActivated=Panells activats
 ActivateOn=Activar a
 ActiveOn=Actiu a
+ActivatableOn=Activable a
 SourceFile=Fitxer origen
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible només si Javascript i Ajax estan activats
 Required=Requerit
@@ -318,7 +321,7 @@ ModuleFamilyProducts=Gestió de productes (PM)
 ModuleFamilyHr=Gestió de recursos humans (HR)
 ModuleFamilyProjects=Projectes/Treball cooperatiu
 ModuleFamilyOther=Altres
-ModuleFamilyTechnic=Utilitats multi-mòduls
+ModuleFamilyTechnic=Eines multimòduls
 ModuleFamilyExperimental=Mòduls experimentals
 ModuleFamilyFinancial=Mòduls financers (Comptabilitat/tresoreria)
 ModuleFamilyECM=Gestió Electrònica de Documents (GED)
@@ -334,22 +337,23 @@ FindPackageFromWebSite=Cerca un paquet que proporcioni les funcions que necessit
 DownloadPackageFromWebSite=Descarrega el paquet (per exemple, des del lloc web oficial %s).
 UnpackPackageInDolibarrRoot=Desempaqueta/descomprimeix els fitxers empaquetats al teu directori del servidor Dolibarr: <b> %s </b>
 UnpackPackageInModulesRoot=Per a desplegar/instal·lar un mòdul extern, descomprimiu els fitxers empaquetats al directori del servidor dedicat a mòduls externs: <br><b>%s</b>
-SetupIsReadyForUse=La instal·lació del mòdul ha finalitzat. No obstant, ha d'habilitar i configurar el mòdul en la seva aplicació, aneu a la pàgina per a configurar els mòduls: <a href="%s">%s</a>.
+SetupIsReadyForUse=La instal·lació del mòdul ha finalitzat. No obstant això, ha d'habilitar i configurar el mòdul en la seva aplicació, aneu a la pàgina per a configurar els mòduls: <a href="%s">%s</a>.
 NotExistsDirect=No s'ha definit el directori arrel alternatiu a un directori existent.<br>
 InfDirAlt=Des de la versió 3, és possible definir un directori arrel alternatiu. Això li permet emmagatzemar, en un directori dedicat, plug-ins i plantilles personalitzades.<br>Només ha de crear un directori a l'arrel de Dolibarr (per exemple: custom).<br>
 InfDirExample=Llavors <br>declareu-ho a l'arxiu <strong>conf.php </strong><br> $dolibarr_main_url_root_alt='/custom'<br> $dolibarr_main_document_root_alt='/ruta/del/dolibarr/htdocs/custom'<br> Si aquestes línies estan comentades amb "#", per a activar-les simplement descomenteu-les traient el caràcter "#".
 YouCanSubmitFile=Podeu pujar el fitxer .zip del paquet del mòdul des d’aquí:
 CurrentVersion=Versió actual de Dolibarr
-CallUpdatePage=Ves a la pàgina que actualitza l'estructura de base de dades i les dades: %s
+CallUpdatePage=Aneu a la pàgina que actualitza l'estructura i les dades de la base de dades: %s.
 LastStableVersion=Última versió estable
 LastActivationDate=Data de l'última activació
 LastActivationAuthor=Últim autor d'activació
 LastActivationIP=Última IP d'activació
 UpdateServerOffline=Actualitza el servidor fora de línia
 WithCounter=Gestiona un comptador
-GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara es podrien utilitzar les etiquetes següents:<br><b> {000000}</b> correspon a un número que s'incrementarà a cada %s. Introduïu tants zeros com la longitud desitjada del comptador. El comptador es completarà amb zeros per l'esquerra per tal de tenir tants zeros com la màscara. <br><b> {000000+000} </b> igual que l'anterior, però s'aplica un desplaçament corresponent al número a la dreta del signe + a partir del primer %s. <br> <b>{000000@x}</b> igual que l'anterior, però el comptador es restableix a zero quan s'arriba al mes x (x entre 1 i 12, o 0 per a utilitzar els primers mesos de l'any fiscal definits a la configuració o 99 per a restablir-los a zero cada mes). Si s’utilitza aquesta opció i x és 2 o superior, també és obligatòria la seqüència {yy}{mm} o {yyyy}{mm}. <br><b>{dd}</b> dia (de l'1 al 31). <br> <b>{mm}</b> mes (01 a 12). <br><b> {aa} </b>, <b>{aaaa}</b> o <b>{y}</b> any en 2, 4 o 1 xifra. <br>
-GenericMaskCodes2=<b>{cccc}</b> el codi de client amb n caràcters<br><b>{cccc000}</b> el codi de client amb n caràcters seguit d'un comptador dedicat pel client. Aquest comptador dedicat al client es reinicia al mateix temps que el comptador global.<br><b>{tttt}</b> El codi del tipus de tercer amb n caràcters (vegeu el menú Inici - Configuració - Diccionaris - Tipus de tercers). Si afegeixes aquesta etiqueta, el comptador serà diferent per a cada tipus de tercer.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canvis. <br> No es permeten espais<br>
+GenericMaskCodes3EAN=La resta de caràcters de la màscara romandran intactes (excepte * o ? En 13a posició a EAN13). <br>No es permeten espais. <br> A EAN13, l'últim caràcter després de l'últim } a la 13a posició hauria de ser * o ? . Se substituirà per la clau calculada.<br>
 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>
@@ -364,7 +368,7 @@ ErrorCantUseRazIfNoYearInMask=Error, no es pot utilitzar l'opció @ per a restab
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no es pot usar opció @ si la seqüència (yy) (mm) o (yyyy) (mm) no es troba a la màscara.
 UMask=Paràmetre UMask de nous fitxers en Unix/Linux/BSD.
 UMaskExplanation=Aquest paràmetre determina els drets dels arxius creats en el servidor Dolibarr (durant la pujada, per exemple).<br>Aquest ha de ser el valor octal (per exemple, 0666 significa lectura/escriptura per a tots).<br>Aquest paràmetre no té cap efecte sobre un servidor Windows.
-SeeWikiForAllTeam=Mira a la pàgina Wiki per veure una llista de contribuents i la seva organització
+SeeWikiForAllTeam=Mireu la pàgina Wiki per a obtenir una llista dels col·laboradors i la seva organització
 UseACacheDelay= Demora en memòria cau de l'exportació en segons (0 o buit sense memòria)
 DisableLinkToHelpCenter=Amaga l'enllaç "<b>Necessiteu ajuda o assistència</b>" a la pàgina d'inici de sessió
 DisableLinkToHelp=Amaga l'enllaç a l'ajuda en línia "<b>%s</b>"
@@ -375,7 +379,7 @@ LanguageFilesCachedIntoShmopSharedMemory=arxius .lang en memòria compartida
 LanguageFile=Fitxer d'idioma
 ExamplesWithCurrentSetup=Exemples amb configuració actual
 ListOfDirectories=Llistat de directoris de plantilles OpenDocument
-ListOfDirectoriesForModelGenODT=Llista de directoris que contenen fitxers de plantilles amb format OpenDocument.<br><br>Posa aquí l'adreça completa dels directoris.<br>Afegeix un "intro" entre cada directori.<br>Per afegir un directori del mòdul GED, afegeix aquí <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Els fitxers d'aquests directoris han de tenir l'extensió <b>.odt</b> o <b>.ods</b>.
+ListOfDirectoriesForModelGenODT=Llista de directoris que contenen fitxers de plantilles amb format OpenDocument.<br><br>Posa aquí l'adreça completa dels directoris.<br>Afegeix un "intro" entre cada directori.<br>Per a afegir un directori del mòdul GED, afegeix aquí <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Els fitxers d'aquests directoris han de tenir l'extensió <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Nombre d'arxius de plantilles ODT/ODS trobats en aquest(s) directori(s)
 ExampleOfDirectoriesForModelGen=Exemples de sintaxi: <br>c:\\myapp\\mydocumentdir\\mysubdir <br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=Posant les següents etiquetes a la plantilla, obtindrà una substitució amb el valor personalitzat en generar el document:
@@ -390,7 +394,7 @@ ConnectionTimeout=Temps d'espera de connexió
 ResponseTimeout=Timeout de resposta
 SmsTestMessage=Missatge de prova de __PHONEFROM__ per __PHONETO__
 ModuleMustBeEnabledFirst=El mòdul "<b>%s</b>" ha d'habilitar-se primer si necessita aquesta funcionalitat.
-SecurityToken=Clau per a protegir les URL
+SecurityToken=Clau per a protegir els URL
 NoSmsEngine=No hi ha cap gestor d'enviament de SMS. Els gestors d'enviament de SMS no s'instal·len per defecte ja que depenen de cada proveïdor, però pot trobar-los a la plataforma %s
 PDF=PDF
 PDFDesc=Opcions globals de generació de PDF
@@ -402,12 +406,12 @@ HideLocalTaxOnPDF=Amagueu la tarifa %s a la columna Impost de venda / IVA
 HideDescOnPDF=Amaga la descripció dels productes
 HideRefOnPDF=Amaga la ref. dels productes
 HideDetailsOnPDF=Amaga els detalls de les línies de producte
-PlaceCustomerAddressToIsoLocation=Utilitza la posició estandard francesa (La Poste) per la posició de l'adreça dels clients
+PlaceCustomerAddressToIsoLocation=Utilitza la posició estàndard francesa (La Poste) per a la posició d'adreça del client
 Library=Llibreria
 UrlGenerationParameters=Seguretat de les URL
 SecurityTokenIsUnique=Fer servir un paràmetre securekey únic per a cada URL?
 EnterRefToBuildUrl=Introduïu la referència de l'objecte %s
-GetSecuredUrl=Obté la URL calculada
+GetSecuredUrl=Obteniu l'URL calculat
 ButtonHideUnauthorized=Amaga els botons d'acció no autoritzats també per als usuaris interns (en cas contrari, en gris)
 OldVATRates=Taxa d'IVA antiga
 NewVATRates=Taxa d'IVA nova
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Mantenir aquest camp buit significa que el valor s'e
 ExtrafieldParamHelpselect=La llista de valors ha de ser un conjunt de línies amb un format del tipus clau,valor (on la clau no pot ser '0') <br><br> per exemple: <br>1,valor1<br>2,valor2<br>codi3,valor3<br>...<br><br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>1,valor1|options_<i>codi_llista_pare</i>:clau_pare<br>2,valor2|options_<i>codi_llista_pare</i>:clau_pare <br><br>Per a tenir la llista depenent d'una altra llista:<br>1,valor1|<i>codi_llista_pare</i>:clau_pare<br>2,valor2|<i>codi_llista_pare</i>:clau_pare
 ExtrafieldParamHelpcheckbox=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (on la clau no pot ser '0')<br><br> per exemple: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
 ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (on la clau no pot ser '0')<br><br> per exemple: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
-ExtrafieldParamHelpsellist=Llista de valors que provenen d’una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtre<br>Exemple: c_typent:libelle:id::filtre<br><br>- id_camp ha de ser necessàriament una "primary int key"<br>- el filtre pot ser una comprovació senzilla (p.e. active=1) per a mostrar només els valors actius<br>També pots utilitzar $ID$ al filtre per a representar el ID de l'actual objecte en curs<br>Per a utilitzar un SELECT al filtre, utilitzeu la paraula clau $SEL$ per a evitar la protecció anti injecció.<br>Si vols filtrar camps addicionals utilitza la sintaxi extra.nom_camp=... (on nom_camp és el codi del camp addicional)<br><br>Per a tenir la llista en funció d’una altra llista d’atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_mare</i>|parent_column:filtre <br><br>Per a tenir la llista en funció d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_mare</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filter<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per a mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per a representar l'ID actual de l'objecte en curs <br>Per fer un SELECT en el filtre utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield) <br> <br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per a tenir la llista depenent d'una altra llista: c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Llista de valors que provenen d’una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtresql<br>Exemple: c_typent:libelle:id::filtresql<br><br>- id_camp ha de ser necessàriament una clau primària numèrica<br>- el filtresql és una condició SQL. Pot ser una prova simple (p.ex. active=1) per a mostrar només els valors actius<br>També pots utilitzar $ID$ al filtre per a representar el ID de l'actual objecte en curs<br>Per a utilitzar un SELECT al filtre, utilitzeu la paraula clau $SEL$ per a evitar la protecció anti injecció.<br>Si vols filtrar camps addicionals utilitza la sintaxi extra.nom_camp=... (on nom_camp és el codi del camp addicional)<br><br>Per a tenir la llista en funció d’una altra llista d’atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_mare</i>|parent_column:filtre <br><br>Per a tenir la llista en funció d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_mare</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filtre<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per a mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per a representar l'ID actual de l'objecte en curs <br>Per a fer un SELECT al filtre, utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu la sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield) <br> <br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per a tenir la llista depenent d'una altra llista:<br> c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
 ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName:Classpath <br>Sintaxi: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Manteniu-lo buit per un simple separador <br> Configureu-ho a 1 per a un separador col·lapsador (obert per defecte per a la sessió nova, i es mantindrà l'estat de cada sessió d'usuari) <br> Configureu-ho a 2 per a un separador col·lapsat (es va desplomar per defecte per a la sessió nova, i es mantindrà l'estat per a cada sessió d'usuari)
 LibraryToBuildPDF=Llibreria utilitzada per a la generació de PDF
@@ -454,7 +458,7 @@ SMS=SMS
 LinkToTestClickToDial=Introduïu un número de telèfon per a trucar per a mostrar un enllaç per a provar l'URL ClickToDial per a l'usuari <strong>%s</strong>
 RefreshPhoneLink=Actualitza l'enllaç
 LinkToTest=Enllaç clicable generat per l'usuari <strong>%s</strong> (feu clic al número de telèfon per a provar-lo)
-KeepEmptyToUseDefault=Deixa-ho buit per usar el valor per defecte
+KeepEmptyToUseDefault=Deixa-ho buit per a usar el valor per defecte
 KeepThisEmptyInMostCases=En la majoria dels casos, pots deixar aquest camp buit.
 DefaultLink=Enllaç per defecte
 SetAsDefault=Indica'l com Defecte
@@ -482,27 +486,27 @@ ModuleCompanyCodePanicum=Retorna un codi comptable buit.
 ModuleCompanyCodeDigitaria=Retorna un codi comptable compost d'acord amb el nom del tercer. El codi consisteix en un prefix, que pot definir-se, en primera posició, seguit del nombre de caràcters que es defineixi com a codi del tercer.
 ModuleCompanyCodeCustomerDigitaria=%s seguit pel nom abreujat del client pel nombre de caràcters: %s pel codi del compte de client
 ModuleCompanyCodeSupplierDigitaria=%s seguit pel nom abreujat del proveïdor pel nombre de caràcters: %s pel codi del compte de proveïdor
-Use3StepsApproval=Per defecte, les comandes de compra necessiten ser creades i aprovades per 2 usuaris diferents (el primer pas/usuari és per a crear i un altre pas/usuari per a aprovar. Noteu que si un usuari te permisos tant per a crear com per a aprovar, un sol pas/usuari serà suficient). Amb aquesta opció, tens la possibilitat d'introduir un tercer pas/usuari per a l'aprovació, si l'import es superior a un determinat valor (d'aquesta manera són necessaris 3 passos: 1=validació, 2=primera aprovació i 3=segona aprovació si l'import és suficient).<br>Deixa-ho en blanc si només vols un nivell d'aprovació (2 passos); posa un valor encara que sigui molt baix (0,1) si vols una segona aprovació (3 passos).
+Use3StepsApproval=Per defecte, les comandes de compra necessiten ser creades i aprovades per 2 usuaris diferents (el primer pas/usuari és per a crear i un altre pas/usuari per a aprovar. Noteu que si un usuari té permisos tant per a crear com per a aprovar, un sol pas/usuari serà suficient). Amb aquesta opció, tens la possibilitat d'introduir un tercer pas/usuari per a l'aprovació, si l'import és superior a un determinat valor (d'aquesta manera són necessaris 3 passos: 1=validació, 2=primera aprovació i 3=segona aprovació si l'import és suficient).<br>Deixa-ho en blanc si només vols un nivell d'aprovació (2 passos); posa un valor encara que sigui molt baix (0,1) si vols una segona aprovació (3 passos).
 UseDoubleApproval=Utilitza una aprovació en 3 passos quan l'import (sense impostos) sigui més gran que...
 WarningPHPMail=ADVERTÈNCIA: la configuració per a enviar correus electrònics des de l'aplicació utilitza la configuració genèrica predeterminada. Sovint és millor configurar els correus electrònics de sortida per a utilitzar el servidor de correu electrònic del vostre proveïdor de serveis de correu electrònic en lloc de la configuració predeterminada per diversos motius:
 WarningPHPMailA=- L’ús del servidor del proveïdor de serveis de correu electrònic augmenta la confiança del vostre correu electrònic, de manera que augmenta l'enviament sense ser marcat com a SPAM
-WarningPHPMailB=- Alguns proveïdors de serveis de correu electrònic (com Yahoo) no us permeten enviar un correu electrònic des d'un altre servidor que el seu propi servidor. La configuració actual utilitza el servidor de l’aplicació per enviar correus electrònics i no el servidor del vostre proveïdor de correu electrònic, de manera que alguns destinataris (el compatible amb el protocol DMARC restrictiu) demanaran al vostre proveïdor de correu electrònic si poden acceptar el vostre correu electrònic i alguns proveïdors de correu electrònic. (com Yahoo) pot respondre "no" perquè el servidor no és seu, de manera que és possible que pocs dels vostres correus electrònics enviats no s'acceptin per al lliurament (tingueu cura també de la quota d'enviament del vostre proveïdor de correu electrònic).
-WarningPHPMailC=- També és interessant utilitzar el servidor SMTP del vostre proveïdor de serveis de correu electrònic per enviar correus electrònics, de manera que tots els correus electrònics enviats des de l’aplicació també es guardaran al directori "Enviats" de la vostra bústia de correu.
+WarningPHPMailB=- Alguns proveïdors de serveis de correu electrònic (com Yahoo) no us permeten enviar un correu electrònic des d'un altre servidor que el seu propi servidor. La configuració actual utilitza el servidor de l’aplicació per a enviar correus electrònics i no el servidor del vostre proveïdor de correu electrònic, de manera que alguns destinataris (el compatible amb el protocol DMARC restrictiu) demanaran al vostre proveïdor de correu electrònic si poden acceptar el vostre correu electrònic i alguns proveïdors de correu electrònic. (com Yahoo) pot respondre "no" perquè el servidor no és seu, de manera que és possible que pocs dels vostres correus electrònics enviats no s'acceptin per al lliurament (tingueu cura també de la quota d'enviament del vostre proveïdor de correu electrònic).
+WarningPHPMailC=- També és interessant utilitzar el servidor SMTP del vostre proveïdor de serveis de correu electrònic per a enviar correus electrònics, de manera que tots els correus electrònics enviats des de l’aplicació també es guardaran al directori "Enviats" de la vostra bústia de correu.
 WarningPHPMailD=Si el mètode "PHP Mail" és realment el mètode que voleu utilitzar, podeu eliminar aquest advertiment afegint la constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP a 1 a Inici - Configuració - Altres.
-WarningPHPMail2=Si el vostre proveïdor SMTP necessita restringir al client de correu a una adreça IP (és raro), aquesta és la IP de l'agent d'usuari de correu (MUA) per la vostra aplicació ERP CRM: <strong>%s</strong>.
+WarningPHPMail2=Si el vostre proveïdor SMTP necessita restringir al client de correu a una adreça IP (molt estrany), aquesta és la IP de l'agent d'usuari de correu (MUA) per la vostra aplicació ERP CRM: <strong>%s</strong>.
 WarningPHPMailSPF=Si el nom de domini de l’adreça de correu electrònic del remitent està protegit per un registre SPF (pregunteu-li al vostre registrador de noms de domini), heu d’afegir les següents IP al registre SPF del DNS del vostre domini: <strong> %s </strong>.
-ClickToShowDescription=Clica per mostrar la descripció
+ClickToShowDescription=Feu clic per a mostrar la descripció
 DependsOn=Aquest mòdul necessita els mòduls
 RequiredBy=Aquest mòdul és requerit pel/s mòdul/s
 TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Es necessiten coneixements tècnics per a llegir el contingut de la pàgina HTML per a obtenir el nom clau d’un camp.
 PageUrlForDefaultValues=Has d'introduir aquí l'URL relatiu de la pàgina. Si inclous paràmetres a l'URL, els valors predeterminats seran efectius si tots els paràmetres s'estableixen en el mateix valor.
-PageUrlForDefaultValuesCreate=<br> Exemple: <br> Per al formulari per crear una nou tercer, és <strong> %s </strong>. <br> Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu "custom/", així que utilitzeu una ruta com <strong> mymodule / mypage.php </strong> i no custom/mymodule/mypage.php. <br> Si voleu un valor predeterminat només si la url té algun paràmetre, podeu utilitzar <strong> %s</strong>
-PageUrlForDefaultValuesList=<br> Exemple: <br> Per a la pàgina que llista els tercers, és <strong> %s </strong>. <br> Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu "custom/" utilitzeu una ruta com <strong> mymodule/mypagelist.php </strong> i no custom/mymodule/mypagelist.php. <br> Si voleu un valor predeterminat només si la url té algun paràmetre, podeu utilitzar <strong> %s</strong>
+PageUrlForDefaultValuesCreate=<br>Exemple:<br>Per al formulari per a crear un tercer nou, és <strong>%s</strong>.<br>Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu el "custom/", així que utilitzeu una ruta com <strong>mymodule/mypage.php</strong> i no custom/mymodule/mypage.php.<br>Si només voleu un valor per defecte si l'URL té algun paràmetre, podeu utilitzar <strong>%s</strong>
+PageUrlForDefaultValuesList= <br>Exemple:<br> Per a la pàgina que llista els tercers, és <strong>%s</strong>. <br> Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu el "custom/", de manera que utilitzeu un ruta com <strong>mymodule/mypagelist.php </strong> i no custom/mymodule/mypagelist.php. <br> Si només voleu un valor per defecte si l'URL té algun paràmetre, podeu utilitzar <strong>%s</strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=També tingueu en compte que sobreescriure valors predeterminats per a la creació de formularis funciona només per a pàgines dissenyades correctament (de manera que amb el paràmetre action = create o presend ...)
 EnableDefaultValues=Activa la personalització dels valors predeterminats
 EnableOverwriteTranslation=Habilita l'ús de la traducció sobreescrita
 GoIntoTranslationMenuToChangeThis=S'ha trobat una traducció de la clau amb aquest codi. Per a canviar aquest valor, l’heu d’editar des d'Inici-Configuració-Traducció.
-WarningSettingSortOrder=Avís, establir un ordre de classificació predeterminat pot provocar un error tècnic en passar a la pàgina de la llista si el camp és un camp desconegut. Si experimentes aquest error, torna a aquesta pàgina per eliminar l'ordre de classificació predeterminat i restablir el comportament predeterminat.
+WarningSettingSortOrder=Advertiment: establir un ordre d'ordenació per defecte pot provocar un error tècnic en entrar a la pàgina de llista si el camp és un camp desconegut. Si teniu aquest error, torneu a aquesta pàgina per a eliminar l'ordre de classificació predeterminat i restaurar el comportament predeterminat.
 Field=Camp
 ProductDocumentTemplates=Plantilles de documents per a generar document de producte
 FreeLegalTextOnExpenseReports=Text legal lliure en informes de despeses
@@ -540,7 +544,9 @@ Module30Desc=Gestió de factures i abonaments a clients. Gestió de factures i a
 Module40Name=Proveïdors
 Module40Desc=Gestió de proveïdors i compres (comandes de compra i facturació de factures de proveïdors)
 Module42Name=Registre de depuració
-Module42Desc=Generació de registres/logs (fitxer, syslog, ...). Aquests registres són per a finalitats tècniques/depuració.
+Module42Desc=Generació de registres (fitxer, syslog...). Aquests registres tenen finalitats tècniques o de depuració.
+Module43Name=Barra de depuració
+Module43Desc=Una eina per al desenvolupador que afegeix una barra de depuració al navegador.
 Module49Name=Editors
 Module49Desc=Gestió d'editors
 Module50Name=Productes
@@ -564,7 +570,7 @@ Module58Desc=Integració amb ClickToDial
 Module60Name=Enganxines
 Module60Desc=Gestió d’enganxines
 Module70Name=Intervencions
-Module70Desc=Gestió de intervencions
+Module70Desc=Gestió de la intervenció
 Module75Name=Notes de despeses i desplaçaments
 Module75Desc=Gestió de les notes de despeses i desplaçaments
 Module80Name=Expedicions
@@ -590,24 +596,24 @@ Module320Desc=Afegeix un fil RSS a les pàgines de Dolibarr
 Module330Name=Marcadors i Dreceres
 Module330Desc=Crear marcadors, sempre accessibles, a les pàgines internes o externes a les quals accediu sovint
 Module400Name=Projectes o Oportunitats
-Module400Desc=Gestió de projectes, oportunitats/leads i/o tasques. També podeu assignar qualsevol element (factura, comanda, pressupost, intervenció, ...) a un projecte i obtenir una vista transversal del projecte.
+Module400Desc=Gestió de projectes, oportunitats/leads o tasques. També podeu assignar qualsevol element (factura, comanda, pressupost, intervenció...) a un projecte i obtenir una vista transversal del projecte.
 Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
 Module500Name=Impostos i Despeses especials
-Module500Desc=Gestió d'altres despeses (IVA, IRPF, altres impostos, dividends, ...)
+Module500Desc=Gestió d'altres despeses (IVA, IRPF, altres impostos, dividends...)
 Module510Name=Salaris
 Module510Desc=Registre i seguiment del pagament dels salaris dels empleats
 Module520Name=Préstecs
 Module520Desc=Gestió de préstecs
 Module600Name=Notificacions sobre esdeveniments comercials
 Module600Desc=Envieu notificacions per correu electrònic activades per un esdeveniment empresarial: per usuari (configuració definit a cada usuari), per a contactes de tercers (configuració definida en cada tercer) o per correus electrònics específics
-Module600Long=Tingueu en compte que aquest mòdul està dedicat a enviar correus electrònics en temps real quan es produeix un esdeveniment de negoci específic. Si cerqueu una característica per enviar recordatoris per correu electrònic dels esdeveniments de l'agenda, aneu a la configuració del mòdul Agenda.
+Module600Long=Tingueu en compte que aquest mòdul està dedicat a enviar correus electrònics en temps real quan es produeix un esdeveniment de negoci específic. Si cerqueu una característica per a enviar recordatoris per correu electrònic dels esdeveniments de l'agenda, aneu a la configuració del mòdul Agenda.
 Module610Name=Variants de producte
 Module610Desc=Permet la creació de variants de producte en funció dels atributs (color, mida, etc.)
 Module700Name=Donacions
 Module700Desc=Gestió de donacions
 Module770Name=Informes de despeses
-Module770Desc=Gestiona reclamacions d'informes de despeses (transport, dietes, ...)
+Module770Desc=Gestiona les reclamacions d'informes de despeses (transport, menjar...)
 Module1120Name=Pressupostos de proveïdor
 Module1120Desc=Sol·licitar al venedor cotització i preus
 Module1200Name=Mantis
@@ -631,22 +637,24 @@ Module2600Desc=Habilita el servidor SOAP de Dolibarr que ofereix serveis API
 Module2610Name=Serveis API/WEB (servidor REST)
 Module2610Desc=Habilita el servidor REST de Dolibarr que ofereix serveis API
 Module2660Name=Crida a WebServices (client SOAP)
-Module2660Desc=Habilitar els serveis de client web de Dolibarr (pot ser utilitzar per gravar dades/sol·licituds de servidors externs. De moment només és suportat en comandes a proveïdors)
+Module2660Desc=Activa el client de serveis web Dolibarr (es pot utilitzar per a enviar dades/sol·licituds a servidors externs. Actualment només s'admeten les comandes de compra).
 Module2700Name=Gravatar
-Module2700Desc=Utilitza el servei en línia de Gravatar (www.gravatar.com) per mostrar fotos dels usuaris/membres (que es troben en els seus missatges de correu electrònic). Necessita un accés a Internet
+Module2700Desc=Utilitza el servei en línia de Gravatar (www.gravatar.com) per a mostrar la foto dels usuaris/socis (que es troba amb els seus correus electrònics). Necessita accés a Internet
 Module2800Desc=Client FTP
 Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacitats de conversió GeoIP Maxmind
 Module3200Name=Arxius inalterables
 Module3200Desc=Activa el registre d'alguns esdeveniments de negoci en un registre inalterable. Els esdeveniments s'arxiven en temps real. El registre és una taula d'esdeveniments encadenats que només es poden llegir i exportar. Aquest mòdul pot ser obligatori per a alguns països.
+Module3400Name=Xarxes socials
+Module3400Desc=Activa els camps de les xarxes socials a tercers i adreces (skype, twitter, facebook...).
 Module4000Name=RRHH
 Module4000Desc=Gestió de recursos humans (gestionar departaments, empleats, contractes i "feelings")
-Module5000Name=Multi-empresa
+Module5000Name=Multiempresa
 Module5000Desc=Permet gestionar diverses empreses
-Module6000Name=Flux de treball
-Module6000Desc=Gestió del flux de treball (creació automàtica d'objectes i / o canvi d'estat automàtic)
+Module6000Name=Flux de treball entre mòduls
+Module6000Desc=Gestió del flux de treball entre diferents mòduls (creació automàtica d'objectes i/o canvi d'estat automàtic)
 Module10000Name=Pàgines web
-Module10000Desc=Creeu llocs web (públics) amb un editor WYSIWYG. Es tracta d’un CMS per a administradors web o desenvolupador (és millor conèixer el llenguatge HTML i CSS). N’hi ha prou amb configurar el servidor web (Apache, Nginx, ...) per a assenyalar el directori dedicat a Dolibarr perquè el tingui en línia a Internet amb el seu propi nom de domini.
+Module10000Desc=Creeu llocs web (públics) amb un editor WYSIWYG. Es tracta d’un CMS per a administradors web o desenvolupadors (és millor conèixer el llenguatge HTML i CSS). N’hi ha prou amb configurar el servidor web (Apache, Nginx...) per a assenyalar el directori dedicat a Dolibarr perquè el tingui en línia a Internet amb el seu propi nom de domini.
 Module20000Name=Gestió de sol·licituds de dies lliures
 Module20000Desc=Defineix i fes seguiment de les sol·licituds de dies lliures dels empleats
 Module39000Name=Lots de productes
@@ -775,7 +783,7 @@ Permission187=Tanca les comandes de compra
 Permission188=Cancel·la les comandes de compra
 Permission192=Crear línies
 Permission193=Cancel·lar línies
-Permission194=Llegeix les línies d'ample de banda
+Permission194=Llegiu les línies d’amplada de banda
 Permission202=Crear connexions ADSL
 Permission203=Realitzar comanda de connexions
 Permission204=Demanar connexions
@@ -805,7 +813,8 @@ 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=Amplieu l'accés a tots els tercers (no només a tercers pels quals aquest usuari és representant de venda). <br> No és efectiu per als usuaris externs (sempre limitats per a propostes, comandes, factures, contractes, etc.). <br> No és efectiu per als projectes (només les normes sobre permisos de projecte, visibilitat i assumptes d'assignació).
+Permission262=Amplieu l’accés a tots els tercers I als seus objectes (no només a tercers dels quals l’usuari és representant de la venda). <br> No és efectiu per a usuaris externs (sempre limitat a ells mateixos per a propostes, comandes, factures, contractes, etc.). <br> No és eficaç per als projectes (només les regles sobre permisos, visibilitat i assignació de projectes).
+Permission263=Amplieu l'accés a tots els tercers SENSE els seus objectes (no només a tercers dels quals l'usuari és representant de la venda). <br> No és efectiu per a usuaris externs (sempre limitat a ells mateixos per a propostes, comandes, factures, contractes, etc.). <br> No és eficaç per als projectes (només les regles sobre permisos, visibilitat i assignació de projectes).
 Permission271=Consultar el CA
 Permission272=Consultar les factures
 Permission273=Emetre les factures
@@ -1012,7 +1021,7 @@ DictionaryPaymentModes=Formes de pagament
 DictionaryTypeContact=Tipus de contactes/adreces
 DictionaryTypeOfContainer=Lloc web: tipus de pàgines web / contenidors
 DictionaryEcotaxe=Barems CEcoParticipación (DEEE)
-DictionaryPaperFormat=Formats paper
+DictionaryPaperFormat=Formats de paper
 DictionaryFormatCards=Formats de fitxa
 DictionaryFees=Informe de despeses - Tipus de línies d'informe de despeses
 DictionarySendingMethods=Mètodes d'expedició
@@ -1062,12 +1071,12 @@ LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=Gestió Recàrrec d'Equivalència
 LocalTax1IsUsedDescES=El tipus de RE proposat per defecte en les creacions de pressupostos, factures, comandes, etc. Respon a la següent regla:<br>Si el comprador no està subjecte a RE, RE per defecte= 0. Final de regla.<br>Si el comprador està subjecte a RE aleshores s'aplica valor de RE per defecte. Final de regla.<br>
-LocalTax1IsNotUsedDescES=El tipus de RE proposat per defecte es 0. Final de regla.
+LocalTax1IsNotUsedDescES=Per defecte, el RE proposat és 0. Fi de la regla.
 LocalTax1IsUsedExampleES=A Espanya, es tracta de persones físiques: autònoms subjectes a uns epígrafs concrets de l'IAE.
 LocalTax1IsNotUsedExampleES=A Espanya, es tracta d'empreses jurídiques: Societats limitades, anònimes, etc. i persones físiques (autònoms) subjectes a certs epígrafs de l'IAE.
 LocalTax2ManagementES=Gestió IRPF
 LocalTax2IsUsedDescES=El tipus d'IRPF proposat per defecte en les creacions de pressupostos, factures, comandes, etc. Respon a la següent regla:<br>Si el venedor no està subjecte a IRPF, IRPF per defecte= 0. Final de regla.<br>Si el venedor està subjecte a IRPF aleshores s'aplica valor d'IRPF per defecte. Final de regla.<br>
-LocalTax2IsNotUsedDescES=El tipus d'IRPF proposat per defecte es 0. Final de regla.
+LocalTax2IsNotUsedDescES=Per defecte, l'IRPF proposat és 0. Fi de la regla.
 LocalTax2IsUsedExampleES=A Espanya, es tracta de persones físiques: autònoms i professionals independents que presten serveis i empreses que han triat el règim fiscal de mòduls.
 LocalTax2IsNotUsedExampleES=A Espanya, es tracta d'empreses no subjectes al règim fiscal de mòduls.
 RevenueStampDesc=El "segell d'impostos" o "segell d'ingressos" és un impost fix per factura (no depèn de l'import de la factura). També pot ser un percentatge d’impostos, però és millor utilitzar el segon o tercer tipus d’impostos per al percentatge d’impostos, ja que els segells d’impostos no proporcionen cap informe. Només uns pocs països utilitzen aquest tipus d’impostos.
@@ -1143,7 +1152,7 @@ CompanyCurrency=Divisa principal
 CompanyObject=Objecte de l'empresa
 IDCountry=ID de país
 Logo=Logo
-LogoDesc=Logotip principal de l'empresa. S'utilitzarà en documents generats (PDF, ...)
+LogoDesc=Logotip principal de l'empresa. S'utilitzarà en documents generats (PDF...)
 LogoSquarred=Logo (quadrat)
 LogoSquarredDesc=Ha de ser una icona quadrada (amplada = alçada). Aquest logotip s'utilitzarà com a icona preferida o com a altra necessitat, com a la barra de menús superior (si no està desactivada en la configuració de l'entorn).
 DoNotSuggestPaymentMode=No ho suggereixis
@@ -1161,7 +1170,7 @@ Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Comanda no processada
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Comanda de compra no processada
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Pressupost no tancat
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Pressupost no facturat
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Servei per activar
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Servei per a activar
 Delays_MAIN_DELAY_RUNNING_SERVICES=Servei caducat
 Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Factura de proveïdor pendent de pagament
 Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Factura del client no pagada
@@ -1175,35 +1184,36 @@ SetupDescription2=Les dues seccions següents són obligatòries (les dues prime
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Paràmetres bàsics utilitzats per a personalitzar el comportament per defecte de la vostra aplicació (per exemple, per a funcions relacionades amb el país).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Aquest programari és un conjunt de molts mòduls / aplicacions. Els mòduls relacionats amb les vostres necessitats s’han d’activar i configurar. Les entrades del menú apareixen amb l’activació d’aquests mòduls.
 SetupDescription5=Altres entrades del menú d'instal·lació gestionen paràmetres opcionals.
-LogEvents=Auditoria de la seguretat d'esdeveniments
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Auditoria
-InfoDolibarr=Sobre Dolibarr
-InfoBrowser=Sobre el Navegador
-InfoOS=Sobre S.O.
-InfoWebServer=Sobre Servidor web
-InfoDatabase=Sobre Base de dades
-InfoPHP=Sobre PHP
-InfoPerf=Sobre prestacions
-InfoSecurity=Quant a la seguretat
+InfoDolibarr=Quant al Dolibarr
+InfoBrowser=Quant al Navegador
+InfoOS=Quant al S.O.
+InfoWebServer=Quant al Servidor web
+InfoDatabase=Quant a Base de dades
+InfoPHP=Quant al PHP
+InfoPerf=Quant a Prestacions
+InfoSecurity=Quant a Seguretat
 BrowserName=Nom del navegador
 BrowserOS=S.O. del navegador
 ListOfSecurityEvents=Llistat d'esdeveniments de seguretat Dolibarr
 SecurityEventsPurged=Esdeveniments de seguretat purgats
 LogEventDesc=Habiliteu el registre per a esdeveniments de seguretat específics. Els administradors del registre a través del menú <b> %s - %s </b>. Avís, aquesta funció pot generar una gran quantitat de dades a la base de dades.
 AreaForAdminOnly=Els paràmetres de configuració només poden ser establerts per <b>usuaris administradors</b>.
-SystemInfoDesc=La informació del sistema és informació tècnica accessible només en només lectura als administradors.
+SystemInfoDesc=La informació del sistema és informació tècnica diversa que obteniu en mode de només lectura i visible només per als administradors.
 SystemAreaForAdminOnly=Aquesta àrea només està disponible per als usuaris administradors. Els permisos d'usuari de Dolibarr no poden canviar aquesta restricció.
 CompanyFundationDesc=Editeu la informació de la vostra empresa / organització. Feu clic al botó "%s" al final de la pàgina quan hagi acabat.
 AccountantDesc=Si teniu un comptable extern, podeu editar aquí la seva informació.
 AccountantFileNumber=Número de fila
 DisplayDesc=Els paràmetres que afecten l'aspecte i el comportament de Dolibarr es poden modificar aquí.
 AvailableModules=Mòduls/complements disponibles
-ToActivateModule=Per activar els mòduls, aneu a l'àrea de Configuració (Inici->Configuració->Mòduls).
+ToActivateModule=Per a activar mòduls, aneu a l'àrea de configuració (Inici->Configuració->Mòduls).
 SessionTimeOut=Temps de desconnexió per a la sessió
 SessionExplanation=Aquest número garanteix que la sessió no caduqui abans d'aquest retard, si el netejador de sessió es fa mitjançant un netejador de sessió de PHP intern (i res més). El netejador de sessió intern de PHP no garanteix que la sessió expire després d'aquest retard. Caducarà, després d'aquest retard, i quan s'executi el netejador de sessió, de manera que cada accés <b> %s / %s </b>, però només durant l'accés fet per altres sessions (si el valor és 0, significa que l'eliminació de la sessió només es fa mitjançant un extern procés). <br> Nota: en alguns servidors amb un mecanisme de neteja de sessió externa (cron sota debian, ubuntu ...), les sessions es poden destruir després d'un període definit per una configuració externa, independentment del valor introduït aquí.
 SessionsPurgedByExternalSystem=Sembla que les sessions en aquest servidor són netejades mitjançant un mecanisme extern (cron sota debian, ubuntu ...), probablement cada  <b> %s </b> segons (= el valor del paràmetre  sessió.gc_maxlifetime ), així que modificant aquest valor aquí no té cap efecte, Heu de sol·licitar a l’administrador del servidor que canviï la durada de la sessió.
 TriggersAvailable=Triggers disponibles
-TriggersDesc=Els activadors són fitxers que modificaran el comportament del flux de treball de Dolibarr un cop copiat al directori <b>htdocs/core/triggers</b>. Realitzen accions noves, activades en esdeveniments Dolibarr (creació d'empresa nova, validació de factures, ...).
+TriggersDesc=Els activadors són fitxers que modificaran el comportament del flux de treball de Dolibarr un cop copiat al directori <b>htdocs/core/triggers</b>. Realitzen accions noves, activades en esdeveniments Dolibarr (creació d'empresa nova, validació de factures...).
 TriggerDisabledByName=Triggers d'aquest arxiu desactivador pel sufix <b>-NORUN</b> en el nom de l'arxiu.
 TriggerDisabledAsModuleDisabled=Triggers d'aquest arxiu desactivats ja que el mòdul <b>%s</b> no està activat.
 TriggerAlwaysActive=Triggers d'aquest arxiu sempre actius, ja que els mòduls Dolibarr relacionats estan activats
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Sembla que cal executar el procés d’actuali
 YouMustRunCommandFromCommandLineAfterLoginToUser=Ha d'executar la comanda des d'un shell després d'haver iniciat sessió amb el compte <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Funcions SSL no disponibles al vostre PHP
 DownloadMoreSkins=Més temes per a descarregar
-SimpleNumRefModelDesc=Retorna el número de referència amb el format %syymm-nnnn on yy és l'any, mm és el mes i nnnn és el seqüencial sense inicialitzar
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Mostra l'identificador professional amb adreces
 ShowVATIntaInAddress=Amaga el número d'IVA intracomunitari amb adreces
 TranslationUncomplete=Traducció parcial
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Servidor proxy: nom / adreça
 MAIN_PROXY_PORT=Servidor proxy: port
 MAIN_PROXY_USER=Servidor proxy: inici de sessió / usuari
 MAIN_PROXY_PASS=Servidor proxy: contrasenya
-DefineHereComplementaryAttributes=Definiu aquí els atributs addicionals / personalitzats que voleu incloure per a: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Atributs complementaris
 ExtraFieldsLines=Atributs complementaris (línies)
 ExtraFieldsLinesRec=Atributs complementaris (línies de plantilles de factures)
@@ -1280,7 +1290,7 @@ ExtraFieldsProjectTask=Atributs complementaris (tasques)
 ExtraFieldsSalaries=Atributs complementaris (sous)
 ExtraFieldHasWrongValue=L'atribut %s té un valor incorrecte.
 AlphaNumOnlyLowerCharsAndNoSpace=només caràcters alfanumèrics i en minúscula sense espai
-SendmailOptionNotComplete=Atenció, en alguns sistemes Linux, amb aquest mètode d'enviament, per poder enviar mails en nom seu, la configuració de sendmail ha de contenir l'opció <b>-ba</b> (paràmetre <b>mail.force_extra_parameters</b> a l'arxiu <b>php.ini</b>). Si alguns dels seus destinataris no reben els seus missatges, proveu de modificar aquest paràmetre PHP amb <b>mail.force_extra_parameters =-ba </b>.
+SendmailOptionNotComplete=Advertència, en alguns sistemes Linux, per a enviar correus electrònics des del vostre correu electrònic, la configuració d'execució de sendmail ha de contenir l'opció -ba (el paràmetre mail.force_extra_parameters al fitxer php.ini). Si alguns destinataris mai no reben correus electrònics, intenteu editar aquest paràmetre PHP amb mail.force_extra_parameters = -ba).
 PathToDocuments=Rutes d'accés a documents
 PathDirectory=Catàleg
 SendmailOptionMayHurtBuggedMTA=La característica per a enviar correus mitjançant el mètode "correu directe de PHP" generarà un missatge de correu que podria no ser analitzat correctament per alguns servidors de correu entrant. El resultat és que alguns usuaris no poden llegir alguns correus d'aquestes plataformes errònies. Aquest és el cas d'alguns proveïdors d'Internet (Ex: Orange a França). Això no és un problema amb Dolibarr o PHP, però sí amb el servidor de correu entrant. Tanmateix, podeu afegir una opció MAIN_FIX_FOR_BUGGED_MTA a 1 a Configuració - Altres per a modificar Dolibarr per tal d'evitar-ho. Tanmateix, podeu tenir problemes amb altres servidors que utilitzin estrictament l'estàndard SMTP. L'altra solució (recomanada) és utilitzar el mètode "llibreria de sockets SMTP" que no té cap desavantatge.
@@ -1289,11 +1299,11 @@ TranslationKeySearch=Cerca una clau o cadena de traducció
 TranslationOverwriteKey=Sobreescriu una cadena de traducció
 TranslationDesc=Com configurar l'idioma de visualització: <br> * Per defecte / a tot el sistema: menú <strong>Inici -> Configuració -> Entorn</strong><br> * Per usuari: Feu clic al nom d'usuari a la part superior de la pantalla i modifiqueu la pestanya <strong>Configuració d'entorn d'usuari</strong> de la fitxa d'usuari.
 TranslationOverwriteDesc=També pot reemplaçar cadenes omplint la taula següent. Triï el seu idioma a la llista desplegable "%s", inserta la clau de la traducció a "%s" i la seva nova traducció a "%s"
-TranslationOverwriteDesc2=Podeu utilitzar l'altra pestanya per ajudar-vos a saber quina clau de traducció voleu utilitzar
+TranslationOverwriteDesc2=Podeu utilitzar l’altra pestanya per a ajudar-vos a saber quina clau de traducció heu d’utilitzar
 TranslationString=Cadena de traducció
 CurrentTranslationString=Cadena de traducció actual
 WarningAtLeastKeyOrTranslationRequired=Es necessita un criteri de cerca com a mínim per cadena o clau de traducció
-NewTranslationStringToShow=Cadena de traducció nova per mostrar
+NewTranslationStringToShow=Cadena de traducció nova per a mostrar
 OriginalValueWas=La traducció original s'ha sobreescrit. El valor original era: <br><br>%s
 TransKeyWithoutOriginalValue=Heu obligat una nova traducció de la clau de traducció '<strong> %s </strong>' que no existeix en cap fitxer d'idioma
 TitleNumberOfActivatedModules=Mòduls activats
@@ -1314,12 +1324,12 @@ BrowserIsOK=Esteu utilitzant el navegador web %s. Aquest navegador està bé per
 BrowserIsKO=Esteu utilitzant el navegador web %s. Es considera que aquest navegador és una mala elecció per a la seguretat, el rendiment i la fiabilitat. Recomanem utilitzar Firefox, Chrome, Opera o Safari.
 PHPModuleLoaded=Es carrega el component PHP %s
 PreloadOPCode=S'utilitza un codi OPC precarregat
-AddRefInList=Mostrar client / proveïdor ref. llista d'informació (llista de selecció o combobox) i la majoria d'hipervincle. <br> Els tercers apareixeran amb un format de nom de "CC12345 - SC45678 - The Big Company corp". en lloc de "The Big Company corp".
+AddRefInList=Mostra la llista d'informació de referència client/proveïdor (llista de selecció o llista desplegable) i la majoria d’enllaços. <br>Els tercers apareixeran amb un format de nom "CC12345 - SC45678 - Nom de l'organització". en lloc de "Nom de l'organització".
 AddAdressInList=Mostra la llista d'informació de la direcció de client / proveïdor (llista de selecció o combobox) <br> Els tercers apareixeran amb un format de nom de "The Big Company corp. - 21 jump street 123456 Big town - USA" en lloc de "The Big Company corp".
-AddEmailPhoneTownInContactList=Mostra el correu electrònic de contacte (o els telèfons si no està definit) i la llista d'informació de la ciutat (llista de selecció o llista desplegable) <br>Els contactes apareixeran amb un format de nom "Dupond Durand - dupond.durand@email.com - Paris" o "Dupond Durand - 06 07 59 65 66 - París "en lloc de" Dupond Durand".
+AddEmailPhoneTownInContactList=Mostra el correu electrònic de contacte (o els telèfons si no està definit) i la llista d'informació de la ciutat (llista de selecció o llista desplegable) <br>Els contactes apareixeran amb un format de nom "Dupond Durand - dupond.durand@email.com - París" o "Dupond Durand - 06 07 59 65 66 - París "en lloc de" Dupond Durand".
 AskForPreferredShippingMethod=Demaneu un mètode d'enviament preferit per a tercers.
 FieldEdition=Edició del camp %s
-FillThisOnlyIfRequired=Exemple: +2 (Completi només si es registre una desviació del temps en l'exportació)
+FillThisOnlyIfRequired=Exemple: +2 (ompliu només si es produeixen problemes de compensació de la zona horària)
 GetBarCode=Obté el codi de barres
 NumberingModules=Models de numeració
 DocumentModules=Models de documents
@@ -1328,13 +1338,13 @@ PasswordGenerationStandard=Retorna una contrasenya generada segons l'algorisme i
 PasswordGenerationNone=No suggereixis una contrasenya generada. La contrasenya s'ha d'escriure manualment.
 PasswordGenerationPerso=Retorna una contrasenya segons la vostra configuració personalitzada.
 SetupPerso=Segons la vostra configuració
-PasswordPatternDesc=Descripció patró contrasenya
+PasswordPatternDesc=Descripció del patró de contrasenya
 ##### Users setup #####
 RuleForGeneratedPasswords=Regles per a generar i validar contrasenyes
 DisableForgetPasswordLinkOnLogonPage=No mostri l'enllaç "Contrasenya oblidada" a la pàgina d'inici de sessió
 UsersSetup=Configuració del mòdul usuaris
-UserMailRequired=Es necessita un correu electrònic per crear un nou usuari
-UserHideInactive=Amagueu els usuaris inactius de totes les llistes combo d’usuaris (no es recomana: això pot significar que no podreu filtrar ni cercar usuaris antics en algunes pàgines)
+UserMailRequired=Cal un correu electrònic per a crear un usuari nou
+UserHideInactive=Amaga els usuaris inactius de totes les llistes desplegables d'usuaris (no es recomana: pot ser que no pugueu filtrar ni cercar usuaris antics en algunes pàgines)
 UsersDocModules=Plantilles de documents per a documents generats a partir d'un registre d'usuari
 GroupsDocModules=Plantilles de documents per a documents generats a partir d’un registre de grup
 ##### HRM setup #####
@@ -1348,16 +1358,16 @@ NotificationsDescUser=* per usuari, un usuari alhora.
 NotificationsDescContact=* per contactes de tercers (clients o venedors), un contacte a la vegada.
 NotificationsDescGlobal=* o configurant adreces de correu electrònic globals en aquesta pàgina de configuració.
 ModelModules=Plantilles de documents
-DocumentModelOdt=Genereu documents des de les plantilles OpenDocument (fitxers .ODT / .ODS de LibreOffice, OpenOffice, KOffice, TextEdit, ...)
+DocumentModelOdt=Genereu documents a partir de plantilles OpenDocument (fitxers .ODT / .ODS de LibreOffice, OpenOffice, KOffice, TextEdit...)
 WatermarkOnDraft=Marca d'aigua en els documents esborrany
-JSOnPaimentBill=Activar funció per autocompletar les línies de pagament a les entrades de pagament
-CompanyIdProfChecker=Regles sobre els IDs professionals
+JSOnPaimentBill=Activa la funció per a emplenar automàticament les línies de pagament al formulari de pagament
+CompanyIdProfChecker=Normes per a identificacions professionals
 MustBeUnique=Ha de ser únic?
-MustBeMandatory=Obligatori per crear tercers (si es defineix el número d'IVA o el tipus d'empresa)?
+MustBeMandatory=Obligatori per a crear tercers (si es defineix el NIF/CIF o el tipus d’empresa)?
 MustBeInvoiceMandatory=És obligatori per a validar les factures?
 TechnicalServicesProvided=Prestació de serveis tècnics
 #####DAV #####
-WebDAVSetupDesc=Aquest és l'enllaç per accedir al directori WebDAV. Conté un missatge "públic" obert a qualsevol usuari que conegui l'URL (si es permet l'accés al directori públic) i un directori "privat" que necessita un compte d'inici de sessió / contrasenya existent per a l'accés.
+WebDAVSetupDesc=Aquest és l'enllaç per a accedir al directori WebDAV. Conté un missatge "públic" obert a qualsevol usuari que conegui l'URL (si es permet l'accés al directori públic) i un directori "privat" que necessita un compte d'inici de sessió/contrasenya existent per a l'accés.
 WebDavServer=URL de l'arrel del servidor %s: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Un vincle d'exportació del calendari en format <b>%s</b> estarà disponible a la url: %s
@@ -1419,10 +1429,10 @@ WatermarkOnDraftContractCards=Marca d'aigua en contractes (en cas d'estar buit)
 MembersSetup=Configuració del mòdul Socis
 MemberMainOptions=Opcions principals
 AdherentLoginRequired= Gestiona un compte d'usuari per a cada soci
-AdherentMailRequired=Es necessita un correu electrònic per crear un nou membre
-MemberSendInformationByMailByDefault=La casella de selecció per enviar una confirmació per correu electrònic als socis (validació o nova subscripció) està activada per defecte
+AdherentMailRequired=Cal un correu electrònic per a crear un soci nou
+MemberSendInformationByMailByDefault=La casella de selecció per a enviar una confirmació per correu electrònic als socis (validació o nova subscripció) està activada per defecte
 VisitorCanChooseItsPaymentMode=El visitant pot triar entre els modes de pagament disponibles
-MEMBER_REMINDER_EMAIL=Activa el recordatori automàtic <b> per correu electrònic </b> de les subscripcions caducades. Nota: El mòdul <strong> %s </strong> s'ha d'habilitar i configurar correctament per enviar recordatoris.
+MEMBER_REMINDER_EMAIL=Activa el recordatori automàtic <b> per correu electrònic </b> de les subscripcions caducades. Nota: El mòdul <strong> %s </strong> s'ha d'habilitar i configurar correctament per a enviar recordatoris.
 MembersDocModules=Plantilles de documents per a documents generats a partir del registre de socis
 ##### LDAP setup #####
 LDAPSetup=Configuració de LDAP
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Nom d'usuari (unix)
 LDAPFieldLoginExample=Exemple: uid
 LDAPFilterConnection=Filtre de cerca
 LDAPFilterConnectionExample=Exemple: & (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Nom d'usuari (samba, activedirectory)
 LDAPFieldLoginSambaExample=Exemple: samaccountname
 LDAPFieldFullname=Nom complet
@@ -1536,7 +1547,7 @@ LDAPFieldTownExample=Exemple: l
 LDAPFieldCountry=País
 LDAPFieldDescription=Descripció
 LDAPFieldDescriptionExample=Exemple: descripció
-LDAPFieldNotePublic=Nota publica
+LDAPFieldNotePublic=Nota pública
 LDAPFieldNotePublicExample=Exemple: publicnote
 LDAPFieldGroupMembers= Socis del grup
 LDAPFieldGroupMembersExample= Exemple: uniqueMember
@@ -1570,11 +1581,11 @@ NotInstalled=No està instal·lat.
 NotSlowedDownByThis=No frenat per això.
 NotRiskOfLeakWithThis=No hi ha risc de filtració amb això.
 ApplicativeCache=Aplicació memòria cau
-MemcachedNotAvailable=No s'ha trobat una aplicació de cache. Pot millorar el rendiment instal·lant un cache server Memcached i un mòdul capaç d'utilitzar aquest servidor de cache.<br>Mes informació aquí <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Tingui en compte que alguns hostings no ofereixen servidors cache.
+MemcachedNotAvailable=No s'ha trobat cap memòria cau aplicativa. Podeu millorar el rendiment instal·lant un servidor de memòria cau Memcached i un mòdul capaç d’utilitzar aquest servidor de memòria cau. <br> Més informació aquí <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> Tingueu en compte que molts proveïdors d'allotjament web no proporcionen aquest servidor de memòria cau.
 MemcachedModuleAvailableButNotSetup=S'ha trobat el mòdul memcached per a l'aplicació de memòria cau, però la configuració del mòdul no està completa.
 MemcachedAvailableAndSetup=El mòdul memcached dedicat a utilitzar el servidor memcached està habilitat.
 OPCodeCache=OPCode memòria cau
-NoOPCodeCacheFound=No s'ha trobat cap memòria cau OPCode. Potser utilitzeu una memòria cau OPCode diferent de XCache o eAccelerator (bé), o potser no tingueu la memòria cau OPCode (molt dolenta).
+NoOPCodeCacheFound=No s'ha trobat cap memòria cau d'OPCode. Potser utilitzeu una memòria cau OPCode diferent de XCache o eAccelerator (bona), o potser no teniu memòria cau OPCode (molt malament).
 HTTPCacheStaticResources=Memòria cau HTTP per a estadístiques de recursos (css, img, javascript)
 FilesOfTypeCached=Fitxers de tipus %s s'emmagatzemen en memòria cau pel servidor HTTP
 FilesOfTypeNotCached=Fitxers de tipus %s no s'emmagatzemen en memòria cau pel servidor HTTP
@@ -1603,9 +1614,9 @@ OnProductSelectAddProductDesc=Com s'utilitza la descripció dels productes quan
 AutoFillFormFieldBeforeSubmit=Empleneu automàticament el camp d’entrada de la descripció amb la descripció del producte
 DoNotAutofillButAutoConcat=No empleneu automàticament el camp d'entrada amb la descripció del producte. La descripció del producte es concatenarà automàticament a la descripció introduïda.
 DoNotUseDescriptionOfProdut=La descripció del producte mai no s’inclourà a la descripció de les línies de documents
-MergePropalProductCard=Activeu a la pestanya Fitxers adjunts de productes/serveis una opció per combinar el document PDF del producte amb el PDF del pressupost si el producte/servei es troba en ell
+MergePropalProductCard=Activa a la pestanya Fitxers adjunts de producte/servei una opció per a combinar el document PDF del producte amb el PDF del pressupost si el producte/servei es troba en el pressupost
 ViewProductDescInThirdpartyLanguageAbility=Mostra les descripcions dels productes en formularis en l'idioma del tercer (en cas contrari, en l'idioma de l'usuari)
-UseSearchToSelectProductTooltip=A més, si teniu un gran nombre de productes (> 100.000), podeu augmentar la velocitat establiint la constant PRODUCT_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena.
+UseSearchToSelectProductTooltip=A més, si teniu un gran nombre de productes (> 100.000), podeu augmentar la velocitat establint la constant PRODUCT_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena.
 UseSearchToSelectProduct=Espereu fins que premeu una tecla abans de carregar el contingut de la llista combinada del producte (això pot augmentar el rendiment si teniu una gran quantitat de productes, però és menys convenient)
 SetDefaultBarcodeTypeProducts=Tipus de codi de barres utilitzat per defecte per als productes
 SetDefaultBarcodeTypeThirdParties=Tipus de codi de barres utilitzat per defecte per als tercers
@@ -1619,10 +1630,10 @@ SyslogOutput=Sortida del log
 SyslogFacility=Facilitat
 SyslogLevel=Nivell
 SyslogFilename=Nom i ruta de l'arxiu
-YouCanUseDOL_DATA_ROOT=Utilitza DOL_DATA_ROOT/dolibarr.log per un fitxer de registre en la carpeta documents de Dolibarr. Tanmateix, es pot definir una carpeta diferent per guardar aquest fitxer.
+YouCanUseDOL_DATA_ROOT=Podeu utilitzar DOL_DATA_ROOT/dolibarr.log per a un fitxer de registre al directori "documents" de Dolibarr. Podeu establir un camí diferent per a emmagatzemar aquest fitxer.
 ErrorUnknownSyslogConstant=La constant %s no és una constant syslog coneguda
 OnlyWindowsLOG_USER=En Windows, només s'admetrà la funció LOG_USER
-CompressSyslogs=Compressió i còpia de seguretat dels fitxers de registre de depuració (generats pel mòdul Log per depurar)
+CompressSyslogs=Compressió i còpia de seguretat dels fitxers de registre de depuració (generats pel mòdul Registre per a depuració)
 SyslogFileNumberOfSaves=Nombre de registres de còpia de seguretat que cal conservar
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configureu la tasca programada de neteja per a establir la freqüència de còpia de seguretat del registre
 ##### Donations #####
@@ -1645,7 +1656,7 @@ BarcodeDescDATAMATRIX=Codi de barres de tipus Datamatrix
 BarcodeDescQRCODE=Codi de barres de tipus QR
 GenbarcodeLocation=Generador de codi de barres (utilitzat pel motor intern per a alguns tipus de codis de barres). Ha de ser compatible amb "genbarcode".<br>Per exemple: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor intern
-BarCodeNumberManager=Gestor per definir automàticament els números de codi de barres
+BarCodeNumberManager=Gestor per a definir automàticament els números de codi de barres
 ##### Prelevements #####
 WithdrawalsSetup=Configuració dels pagaments de dèbit directe del mòdul
 ##### ExternalRSS #####
@@ -1686,7 +1697,7 @@ FCKeditorForMail=Edició/creació WYSIWIG per tots els e-mails (excepte Eines->e
 FCKeditorForTicket=Creació / edició de WYSIWIG per a entrades
 ##### Stock #####
 StockSetup=Configuració del mòdul d'Estoc
-IfYouUsePointOfSaleCheckModule=Si utilitzeu el mòdul Point of Sale (POS) proporcionat per defecte o un mòdul extern, aquesta configuració pot ser ignorada pel vostre mòdul POS. La majoria dels mòduls de POS estan dissenyats per defecte per crear una factura immediatament i disminuir l'estoc, independentment de les opcions aquí. Així, si necessiteu o no una disminució de les existències al registrar una venda de la vostra TPV, consulteu també la vostra configuració del mòdul POS.
+IfYouUsePointOfSaleCheckModule=Si utilitzeu el mòdul Punt de Venda (TPV) proporcionat per defecte o un mòdul extern, el vostre mòdul TPV pot ignorar aquesta configuració. La majoria de mòduls TPV estan dissenyats per defecte per a crear una factura immediatament i reduir l'estoc, independentment de les opcions aquí. Per tant, si necessiteu o no una reducció d’estoc en registrar una venda des del vostre TPV, comproveu també la configuració del mòdul TPV.
 ##### Menu #####
 MenuDeleted=Menú eliminat
 Menu=Menú
@@ -1709,7 +1720,7 @@ DetailLangs=Nom del fitxer Lang pel codi d'etiqueta de traducció
 DetailUser=Intern / Extern / Tots
 Target=Objectiu
 DetailTarget=Orientació per a enllaços (_blank top obre una finestra nova)
-DetailLevel=Nivell (-1:menú superior, 0:principal, >0 menú y submenú)
+DetailLevel=Nivell (-1:menú superior, 0:menú de capçalera,> 0 menús i submenú)
 ModifMenu=Modificació del menú
 DeleteMenu=Eliminar entrada de menú
 ConfirmDeleteMenu=Estàs segur que vols eliminar l'entrada de menú <b>%s</b> ?
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=L'empresa s'ha configurat com a no subjecta a IVA (Inic
 AccountancyCode=Codi comptable
 AccountancyCodeSell=Codi comptable vendes
 AccountancyCodeBuy=Codi comptable compres
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenir buida per defecte la casella “Crea automàticament el pagament” quan es crea un nou impost
 ##### Agenda #####
 AgendaSetup=Mòdul configuració d'accions i agenda
 PasswordTogetVCalExport=Clau d'autorització vCal export link
+SecurityKey = Security Key
 PastDelayVCalExport=No exportar els esdeveniments de més de
 AGENDA_USE_EVENT_TYPE=Utilitzeu tipus d'esdeveniments (gestionats en el menú Configuració -> Diccionaris -> Tipus d'esdeveniments d'agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Estableix automàticament aquest valor predeterminat per al tipus d'esdeveniment en el formulari de creació de l'esdeveniment
@@ -1753,23 +1766,23 @@ AGENDA_SHOW_LINKED_OBJECT=Mostra l'objecte vinculat a la vista d'agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuració del mòdul Click To Dial
 ClickToDialUrlDesc=Es crida l'URL quan es fa un clic a la imatge miniatura de telèfon. A l'URL, pots utilitzar les etiquetes <br><b>__PHONETO__</b> que serà reemplaçada pel número de telèfon de la persona a trucar <br><b>__PHONEFROM__</b> que serà reemplaçada pel número de telèfon de la persona que truca (el vostre)  <br><b>__LOGIN__</b> que serà reemplaçada pel teu usuari d'inici de clicktodial (definit a la fitxa d'usuari)  <br><b>__PASS__</b> que serà reemplaçada per la contrasenya de clicktodial (definida a la fitxa d'usuari).
-ClickToDialDesc=Aquest mòdul canvia els números de telèfon quan s'utilitza un ordinador d'escriptori en enllaços clicables. Un clic trucarà al número. Es pot utilitzar per iniciar la trucada telefònica quan s'utilitza un telèfon suau a l'escriptori o quan s'utilitza un sistema CTI basat en el protocol SIP per exemple. Nota: quan utilitzeu un telèfon intel·ligent, els números de telèfon sempre es poden fer clic.
+ClickToDialDesc=Aquest mòdul canvia els números de telèfon, en utilitzar un ordinador de sobretaula, a enllaços on es pot fer clic. Un clic trucarà al número. Es pot utilitzar per a iniciar la trucada quan s'utilitza un telèfon suau a l'escriptori o, per exemple, quan s'utilitza un sistema CTI basat en el protocol SIP. Nota: Quan feu servir un telèfon intel·ligent, sempre es pot fer clic als números de telèfon.
 ClickToDialUseTelLink=Utilitzar sols l'enllaç "tel:" als números de telèfon
 ClickToDialUseTelLinkDesc=Utilitzeu aquest mètode si els vostres usuaris tenen un softphone o una interfície de programari instal·lada a la mateixa computadora que el navegador, i us demani quan feu clic a un enllaç al vostre navegador que comença per "tel:". Si necessiteu una solució completa de servidor (no cal instal·lar programari local), heu d'establir això a "No" i omplir el camp següent.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Punt de venda
 CashDeskSetup=Configuració del mòdul de Punt de venda
-CashDeskThirdPartyForSell=Tercer genéric a utilitzar per defecte a les vendes
-CashDeskBankAccountForSell=Compte per defecte a utilitzar pels cobraments en efectiu
+CashDeskThirdPartyForSell=Tercer genèric per defecte que s'utilitzarà per a les vendes
+CashDeskBankAccountForSell=Compte predeterminat que cal utilitzar per a rebre cobraments en efectiu
 CashDeskBankAccountForCheque=Compte a utilitzar per defecte per rebre pagaments per xec
-CashDeskBankAccountForCB=Compte per defecte a utilitzar pels cobraments amb targeta de crèdit
+CashDeskBankAccountForCB=Compte predeterminat que cal utilitzar per a rebre cobraments amb targeta de crèdit
 CashDeskBankAccountForSumup=Compte bancari per defecte que es farà servir per rebre pagaments de SumUp
-CashDeskDoNotDecreaseStock=Desactiva la reducció d'estoc quan es realitza una venda des del punt de venda (si és "no", la reducció d'estoc es realitza per a cada venda realitzada des del TPV, independentment de l'opció establerta al mòdul Estoc).
+CashDeskDoNotDecreaseStock=Desactiva la reducció d'estoc quan es fa una venda des del punt de venda (si és "no", la reducció d'estoc es realitza per a cada venda realitzada des del TPV, independentment de l'opció establerta al mòdul Estoc).
 CashDeskIdWareHouse=Força i restringeix el magatzem a utilitzar per disminuir l'estoc
 StockDecreaseForPointOfSaleDisabled=La disminució d'estocs des del punt de venda està desactivat
 StockDecreaseForPointOfSaleDisabledbyBatch=La disminució d'accions en POS no és compatible amb el mòdul de gestió de Serial / Lot (actualment actiu) perquè la disminució de l'estoc està desactivada.
 CashDeskYouDidNotDisableStockDecease=No vau desactivar la disminució de l'estoc en fer una venda des del TPV. Per tant, es requereix un magatzem.
-CashDeskForceDecreaseStockLabel=La disminució d’estoc dels productes per lots es obligada.
+CashDeskForceDecreaseStockLabel=S'ha forçat la disminució de l'estoc de productes per lots.
 CashDeskForceDecreaseStockDesc=Disminuïu primer les dates més antigues de consumir i vendre.
 CashDeskReaderKeyCodeForEnter=Codi clau per a "Enter" definit al lector de codi de barres (Exemple: 13)
 ##### Bookmark #####
@@ -1783,9 +1796,9 @@ WSDLCanBeDownloadedHere=La descripció WSDL dels serveis prestats es poden recup
 EndPointIs=Els clients SOAP han d’enviar les seves sol·licituds al punt final Dolibarr disponible a l’URL
 ##### API ####
 ApiSetup=Configuració del mòdul API
-ApiDesc=Habilitant aquest mòdul, Dolibarr serà un servidor REST per oferir varis serveis web.
+ApiDesc=En habilitar aquest mòdul, Dolibarr es converteix en un servidor REST per a proporcionar diversos serveis web.
 ApiProductionMode=Activa el mode de producció (activarà l'ús d'una memòria cau per a la gestió de serveis)
-ApiExporerIs=Pots explorar i provar les API en la URL
+ApiExporerIs=Podeu explorar i provar les API a URL
 OnlyActiveElementsAreExposed=Només s'exposen els elements de mòduls habilitats
 ApiKey=Clau per l'API
 WarningAPIExplorerDisabled=S'ha desactivat l'explorador d'API. L'explorador d'API no és necessari per a proporcionar serveis d'API. És una eina perquè el desenvolupador pugui trobar/provar API REST. Si necessiteu aquesta eina, aneu a la configuració del mòdul API REST per a activar-la.
@@ -1799,7 +1812,7 @@ BankOrderES=Espanyol
 BankOrderESDesc=Ordre de visualització espanyol
 ChequeReceiptsNumberingModule=Comproveu el mòdul de numeració de rebuts
 ##### Multicompany #####
-MultiCompanySetup=Configuració del mòdul Multi-empresa
+MultiCompanySetup=Configuració del mòdul Multiempresa
 ##### Suppliers #####
 SuppliersSetup=Configuració del mòdul de Proveïdor
 SuppliersCommandModel=Plantilla completa de comanda de compra
@@ -1852,11 +1865,11 @@ YouMayFindNotificationsFeaturesIntoModuleNotification=Podeu trobar opcions de no
 ListOfNotificationsPerUser=Llista de notificacions automàtiques per usuari *
 ListOfNotificationsPerUserOrContact=Llista de possibles notificacions automàtiques (en un esdeveniment comercial) disponibles per usuari* o per contacte**
 ListOfFixedNotifications=Llista de notificacions fixes automàtiques
-GoOntoUserCardToAddMore=Ves a la pestanya "Notificacions" d'un usuari per afegir o eliminar notificacions per usuaris.
+GoOntoUserCardToAddMore=Aneu a la pestanya "Notificacions" d'un usuari per a afegir o eliminar notificacions per als usuaris
 GoOntoContactCardToAddMore=Vagi a la pestanya "Notificacions" d'un contacte de tercers per afegir o eliminar notificacions per contactes/direccions
 Threshold=Valor mínim/llindar
-BackupDumpWizard=Assistent per crear el fitxer d'exportació de base de dades
-BackupZipWizard=Assistent per crear el directori d’arxiu de documents
+BackupDumpWizard=Assistent per a crear el fitxer d'exportació de la base de dades
+BackupZipWizard=Assistent per a crear el directori d’arxiu de documents
 SomethingMakeInstallFromWebNotPossible=No és possible la instal·lació de mòduls externs des de la interfície web per la següent raó:
 SomethingMakeInstallFromWebNotPossible2=Per aquest motiu, el procés d'actualització descrit aquí és un procés manual que només un usuari privilegiat pot realitzar.
 InstallModuleFromWebHasBeenDisabledByFile=La instal·lació de mòduls externs des de l'aplicació es troba desactivada per l'administrador. Ha de requerir que elimini l'arxiu <strong>%s</strong> per habilitar aquesta funció
@@ -1879,15 +1892,15 @@ BackgroundTableLineOddColor=Color de fons per les línies senars de les taules
 BackgroundTableLineEvenColor=Color de fons per les línies parells de les taules
 MinimumNoticePeriod=Període mínim d’avís (la vostra sol·licitud de permís s’ha de fer abans d’aquest període)
 NbAddedAutomatically=Nombre de dies afegits als 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.
+EnterAnyCode=Aquest camp conté una referència per a identificar la línia. Introduïu qualsevol valor que trieu, però sense caràcters especials.
 Enter0or1=Introdueix 0 o 1
-UnicodeCurrency=Introduïu aquí entre claudàtors, llista del número de bytes que representa el símbol monetari. Per exemple: per $, introduïu [36] - per Brasil real R $ [82,36] - per €, introduïu [8364]
+UnicodeCurrency=Introduïu aquí entre claudàtors, la llista del nombre de bytes que representa el símbol de moneda. Per exemple: per $, introduïu [36] - per al real de Brasil R$ [82,36] - per €, introduïu [8364]
 ColorFormat=El color RGB es troba en format HEX, per exemple: FF0000
 PictoHelp=Nom de la icona en format dolibarr ("image.png" si es troba al directori temàtic actual, "image.png@nom_du_module" si es troba al directori / img / d'un mòdul)
-PositionIntoComboList=Posició de la línia en llistes combo
+PositionIntoComboList=Posició de la línia a les llistes desplegables
 SellTaxRate=Valor de l'IVA
 RecuperableOnly=Sí per l'IVA "No percebut sinó recuperable" dedicat per a algun estat a França. Manteniu el valor "No" en tots els altres casos.
-UrlTrackingDesc=Si el proveïdor o el servei de transport ofereix una pàgina o un lloc web per comprovar l'estat dels vostres enviaments, podeu introduir-lo aquí. Podeu utilitzar la clau {TRACKID} als paràmetres d'URL perquè el sistema la substitueixi pel número de seguiment que l'usuari va introduir a la fitxa d'enviament.
+UrlTrackingDesc=Si el proveïdor o el servei de transport ofereix una pàgina o un lloc web per a comprovar l'estat dels vostres enviaments, podeu introduir-lo aquí. Podeu utilitzar la clau {TRACKID} als paràmetres d'URL perquè el sistema la substitueixi pel número de seguiment que l'usuari va introduir a la fitxa d'enviament.
 OpportunityPercent=Quan creeu un avantatge, definiran una quantitat estimada de projecte / avantatge. Segons l'estat del lideratge, aquesta quantitat es pot multiplicar per aquesta taxa per avaluar una quantitat total que pot generar tots els vostres clients potencials. El valor és un percentatge (entre 0 i 100).
 TemplateForElement=Aquest registre de plantilla es dedica a quin element
 TypeOfTemplate=Tipus de plantilla
@@ -1922,10 +1935,10 @@ TitleExampleForMajorRelease=Exemple de missatge que podeu utilitzar per a anunci
 TitleExampleForMaintenanceRelease=Exemple de missatge que podeu utilitzar per a anunciar aquesta versió de manteniment (no dubteu a utilitzar-lo als vostres llocs web)
 ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versió %s és una versió major amb un munt de noves característiques, tant per a usuaris com per a desenvolupadors. Es pot descarregar des de la secció de descàrregues del portal https://www.dolibarr.org (subdirectori versions estables). Podeu llegir <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per veure la llista completa dels canvis.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s està disponible. La versió %s és una versió de manteniment, de manera que només conté correccions d'errors. Us recomanem que tots els usuaris actualitzeu aquesta versió. Un llançament de manteniment no introdueix novetats ni canvis a la base de dades. Podeu descarregar-lo des de l'àrea de descàrrega del portal https://www.dolibarr.org (subdirectori de les versions estables). Podeu llegir el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> per a obtenir una llista completa dels canvis.
-MultiPriceRuleDesc=Quan l'opció "Diversos nivells de preus per producte/servei" està activada, podeu definir preus diferents (un preu per nivell) per a cada producte. Per a estalviar-vos temps, aquí podeu introduir una regla per calcular automàticament un preu per a cada nivell en funció del preu del primer nivell, de manera que només haureu d'introduir un preu per al primer nivell per a cada producte. Aquesta pàgina està dissenyada per a estalviar-vos temps, però només és útil si els preus de cada nivell són relatius al primer nivell. Podeu ignorar aquesta pàgina en la majoria dels casos.
+MultiPriceRuleDesc=Quan l'opció "Diversos nivells de preus per producte/servei" està activada, podeu definir preus diferents (un preu per nivell) per a cada producte. Per a estalviar-vos temps, aquí podeu introduir una regla per a calcular automàticament un preu per a cada nivell en funció del preu del primer nivell, de manera que només haureu d'introduir un preu per al primer nivell per a cada producte. Aquesta pàgina està dissenyada per a estalviar-vos temps, però només és útil si els preus de cada nivell són relatius al primer nivell. Podeu ignorar aquesta pàgina en la majoria dels casos.
 ModelModulesProduct=Plantilles per documents de productes
 WarehouseModelModules=Plantilles per a documents de magatzems
-ToGenerateCodeDefineAutomaticRuleFirst=Per poder generar codis automàticament, primer heu de definir un gestor per definir automàticament el número del codi de barres.
+ToGenerateCodeDefineAutomaticRuleFirst=Per a poder generar codis automàticament, primer heu de definir un gestor per a definir automàticament el número de codi de barres.
 SeeSubstitutionVars=Veure * nota per llistat de possibles variables de substitució
 SeeChangeLog=Veure el fitxer ChangeLog (només en anglès)
 AllPublishers=Tots els publicadors
@@ -1947,7 +1960,7 @@ AddModels=Afegeix document o model de numeració
 AddSubstitutions=Afegeix claus de substitució
 DetectionNotPossible=Detecció no possible
 UrlToGetKeyToUseAPIs=URL per a obtenir el testimoni per a utilitzar l'API (un cop rebut el testimoni, es desa a la taula d'usuaris de la base de dades i s'ha de proporcionar a cada trucada de l'API)
-ListOfAvailableAPIs=Llistat de APIs disponibles
+ListOfAvailableAPIs=Llista d’API disponibles
 activateModuleDependNotSatisfied=El mòdul "%s" depèn del mòdul "%s", que falta, de manera que el mòdul "%1$s" pot no funcionar correctament. Instal·leu el mòdul "%2$s" o desactiveu el mòdul "%1$s" si voleu estar segur de qualsevol sorpresa.
 CommandIsNotInsideAllowedCommands=L'ordre que intenteu executar no es troba a la llista de comandaments permesos definits al paràmetre <strong> $ dolibarr_main_restrict_os_commands </strong> al fitxer <strong> conf.php </strong>.
 LandingPage=Pàgina de destinació principal
@@ -1966,10 +1979,10 @@ MAIN_PDF_MARGIN_BOTTOM=Marge inferior al PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Alçada del logotip en PDF
 NothingToSetup=No hi ha cap configuració específica necessària per a aquest mòdul.
 SetToYesIfGroupIsComputationOfOtherGroups=Estableixi a SÍ si aquest grup és un càlcul d'altres grups
-EnterCalculationRuleIfPreviousFieldIsYes=Introduïu la regla de càlcul si el camp anterior estava establert a Sí (Per exemple 'CODEGRP1 + CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=S'ha trobat diverses variants d'idiomes
 RemoveSpecialChars=Elimina els caràcters especials
-COMPANY_AQUARIUM_CLEAN_REGEX=Filtre de Regex per netejar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_AQUARIUM_CLEAN_REGEX=Filtre Regex per a netejar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtre Regex al valor net (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=No es permet la duplicació
 GDPRContact=Oficial de protecció de dades (PDO, privadesa de dades o contacte amb GDPR)
@@ -1982,8 +1995,8 @@ SocialNetworkSetup=Configuració del mòdul de Xarxes socials
 EnableFeatureFor=Activa les funcions de <strong> %s </strong>
 VATIsUsedIsOff=Nota: L'opció d'utilitzar l'impost de vendes o l'IVA s'ha establert a <strong> Desconnectada </strong> al menú %s - %s, de manera que l'impost sobre vendes o Vat utilitzat sempre serà de 0 per vendes.
 SwapSenderAndRecipientOnPDF=Intercanvieu la posició de l'adreça del remitent i del destinatari en documents PDF
-FeatureSupportedOnTextFieldsOnly=Advertència, funció només compatible amb camps de text. També s'ha d'establir un paràmetre d'URL action = create o action = edit ha de ser OR el nom de la pàgina ha de finalitzar amb 'new.php' per activar aquesta funció.
-EmailCollector=Col lector de correu electrònic
+FeatureSupportedOnTextFieldsOnly=Advertiment, funció compatible només amb els camps de text i llistes desplegables. També s'ha d'establir un paràmetre URL action=create o action=edit Ó el nom de la pàgina ha d'acabar amb 'new.php' per a activar aquesta característica.
+EmailCollector=Col·lector de correu electrònic
 EmailCollectorDescription=Afegiu una tasca programada i una pàgina de configuració per escanejar regularment caixes de correu electrònic (utilitzant el protocol IMAP) i registreu els correus electrònics rebuts a la vostra aplicació, al lloc adequat i / o creeu alguns registres automàticament (com a clients potencials).
 NewEmailCollector=Col·lector nou de correus electrònics
 EMailHost=Servidor IMAP de correu electrònic
@@ -2024,7 +2037,7 @@ ResourceSetup=Configuració del mòdul de recursos
 UseSearchToSelectResource=Utilitza un formulari de cerca per a seleccionar un recurs (millor que una llista desplegable)
 DisabledResourceLinkUser=Desactiva la funció per a enllaçar un recurs amb els usuaris
 DisabledResourceLinkContact=Desactiva la funció per a enllaçar un recurs amb els contactes
-EnableResourceUsedInEventCheck=Habilita la funció per comprovar si s’utilitza un recurs en un esdeveniment
+EnableResourceUsedInEventCheck=Activa la funció per a comprovar si s’utilitza un recurs en un esdeveniment
 ConfirmUnactivation=Confirma el restabliment del mòdul
 OnMobileOnly=Només en pantalla petita (telèfon intel·ligent)
 DisableProspectCustomerType=Desactiva el tipus de tercer "Potencial + Client" (per tant, el tercer ha de ser "Potencial" o "Client", però no pot ser tots dos)
@@ -2037,11 +2050,11 @@ Deuteranopes=Deuteranops
 Tritanopes=Tritanops
 ThisValueCanOverwrittenOnUserLevel=Aquest valor es pot sobreescriure per cada usuari des de la pestanya de la pàgina d'usuari '%s'
 DefaultCustomerType=Tipus de tercer predeterminat per al formulari de creació "Nou client"
-ABankAccountMustBeDefinedOnPaymentModeSetup=Nota: el compte bancari s'ha de definir al mòdul de cada mode de pagament (Paypal, Stripe, ...) per tal que funcioni aquesta funció.
-RootCategoryForProductsToSell=Categoria arrel dels productes a vendre
+ABankAccountMustBeDefinedOnPaymentModeSetup=Nota: el compte bancari s'ha de definir al mòdul de cada mode de pagament (Paypal, Stripe...) per tal que funcioni aquesta funció.
+RootCategoryForProductsToSell=Categoria mare de productes a vendre
 RootCategoryForProductsToSellDesc=Si es defineix, només els productes d'aquesta categoria o els fills d’aquesta categoria estaran disponibles al punt de venda
 DebugBar=Barra de depuració
-DebugBarDesc=Barra d’eines que inclou moltes eines per simplificar la depuració
+DebugBarDesc=Barra d’eines que inclou moltes eines per a simplificar la depuració
 DebugBarSetup=Configuració de la barra de depuració
 GeneralOptions=Opcions generals
 LogsLinesNumber=Nombre de línies que es mostraran a la pestanya de registres
@@ -2049,8 +2062,11 @@ UseDebugBar=Utilitzeu la barra de depuració
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre d’últimes línies de registre que cal mantenir a la consola
 WarningValueHigherSlowsDramaticalyOutput=Advertència, els valors més alts frenen molt la producció
 ModuleActivated=El mòdul %s està activat i alenteix la interfície
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Si esteu en un entorn de producció, s'hauria d'establir aquesta propietat en %s.
 AntivirusEnabledOnUpload=Antivirus activat als fitxers penjats
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Els models d’exportació es comparteixen amb tothom
 ExportSetup=Configuració del mòdul Export
 ImportSetup=Configuració del mòdul Import
@@ -2070,15 +2086,17 @@ RESTRICT_ON_IP=Permet l'accés només a alguna IP de l'amfitrió (no es permet c
 IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=Basat en la versió de la biblioteca SabreDAV
 NotAPublicIp=No és una IP pública
-MakeAnonymousPing=Creeu un ping &quot;+1&quot; anònim al servidor de bases Dolibarr (fet una vegada només després de la instal·lació) per permetre que la fundació compti el nombre d'instal·lació de Dolibarr.
+MakeAnonymousPing=Feu un Ping anònim '+1' al servidor de la fundació Dolibarr (només es fa una vegada després de la instal·lació) per a permetre que la fundació compti el nombre d'instal·lacions de Dolibarr.
 FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Recepció està habilitat
 EmailTemplate=Plantilla per correu electrònic
 EMailsWillHaveMessageID=Els correus electrònics tindran una etiqueta "Referències" que coincideix amb aquesta sintaxi
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Si voleu que alguns textos del vostre PDF es copiïn en 2 idiomes diferents en el mateix PDF generat, heu d’establir aquí aquest segon idioma perquè el PDF generat contingui 2 idiomes diferents en la mateixa pàgina, l’escollit en generar el PDF i aquesta (només poques plantilles de PDF admeten això). Mantingueu-lo buit per a 1 idioma per PDF.
 FafaIconSocialNetworksDesc=Introduïu aquí el codi de la icona de FontAwesome. Si no sabeu què és FontAwesome, podeu utilitzar el llibre genèric d’adreces.
 FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Recepció està habilitat
 RssNote=Nota: Cada definició del canal RSS proporciona un giny que heu d’habilitar per a tenir-lo disponible al tauler de control
-JumpToBoxes=Vés a Configuració -> Ginys
+JumpToBoxes=Aneu a Configuració -> Ginys
 MeasuringUnitTypeDesc=Utilitzeu aquí un valor com "mida", "superfície", "volum", "pes", "temps"
 MeasuringScaleDesc=L'escala és el nombre de llocs que heu de moure la part decimal per a coincidir amb la unitat de referència predeterminada. Per al tipus d'unitat de "temps", és el nombre de segons. Els valors entre 80 i 99 són valors reservats.
 TemplateAdded=S'ha afegit la plantilla
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Es recomana canviar aquest valor a %s per a obtenir
 DictionaryProductNature= Naturalesa del producte
 CountryIfSpecificToOneCountry=País (si és específic d'un país determinat)
 YouMayFindSecurityAdviceHere=Podeu trobar assessorament de seguretat aquí
-ModuleActivatedMayExposeInformation=Aquest mòdul pot exposar dades sensibles. Si no el necessiteu, desactiveu-lo.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=S'ha habilitat un mòdul dissenyat per al desenvolupament. No l'activeu en un entorn de producció.
 CombinationsSeparator=Caràcter separador per a combinacions de productes
 SeeLinkToOnlineDocumentation=Vegeu l'enllaç a la documentació en línia al menú superior per a obtenir exemples
 SHOW_SUBPRODUCT_REF_IN_PDF=Si s'utilitza la funció "%s" del mòdul <b> %s </b>, mostra els detalls dels subproductes d'un kit en el PDF.
 AskThisIDToYourBank=Poseu-vos en contacte amb el vostre banc per a obtenir aquesta identificació
+AdvancedModeOnly=El permís està disponible només en mode de permís avançat
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Organització d'esdeveniments
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index a8562e1ab57..1b1c9b5c1fc 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=La vostra ordre SEPA
 FindYourSEPAMandate=Aquest és el vostre mandat SEPA per a autoritzar la nostra empresa a fer una ordre de domiciliació bancària al vostre banc. Torneu-lo signat (escaneja el document signat) o envieu-lo per correu electrònic a
 AutoReportLastAccountStatement=Ompliu automàticament el camp "nombre d'extracte bancari" amb l'últim número de l'extracte al fer la conciliació
 CashControl=Control de caixa TPV
-NewCashFence=Tancament de caixa nou
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Color de moviments
 BankColorizeMovementDesc=Si aquesta funció està habilitada, podeu triar un color de fons específic per als moviments de dèbit o de crèdit
 BankColorizeMovementName1=Color de fons pel moviment de dèbit
 BankColorizeMovementName2=Color de fons pel moviment de crèdit
 IfYouDontReconcileDisableProperty=Si no feu cap conciliació bancària en alguns comptes bancaris, desactiveu la propietat "%s" per a eliminar aquest advertiment.
 NoBankAccountDefined=No s'ha definit cap compte bancari
+NoRecordFoundIBankcAccount=No s'ha trobat cap registre al compte bancari. Normalment, això passa quan un registre s’ha suprimit manualment de la llista de transaccions del compte bancari (per exemple, durant una conciliació del compte bancari). Una altra raó és que el pagament es va registrar quan es va desactivar el mòdul "%s".
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 01a98bf0260..bdcd870106f 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -54,9 +54,10 @@ InvoiceCustomer=Factura a client
 CustomerInvoice=Factura a client
 CustomersInvoices=Factures a clients
 SupplierInvoice=Factura del proveïdor
-SuppliersInvoices=Factures de proveïdors
+SuppliersInvoices=Factures de proveïdor
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Factura del proveïdor
-SupplierBills=Factures de proveïdors
+SupplierBills=Factures de proveïdor
 Payment=Pagament
 PaymentBack=Devolució
 CustomerInvoicePaymentBack=Devolució
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Pagaments efectuats
 PaymentsBackAlreadyDone=Devolucions realitzades
 PaymentRule=Regla de pagament
 PaymentMode=Forma de pagament
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Dèbit/Crèdit Tarja
 PaymentTypePP=PayPal
 IdPaymentMode=Forma de pagament (Id)
@@ -145,8 +148,8 @@ BillShortStatusClosedUnpaid=Tancada
 BillShortStatusClosedPaidPartially=Pagada (parcial)
 PaymentStatusToValidShort=A validar
 ErrorVATIntraNotConfigured=NIF intracomunitari encara no definit
-ErrorNoPaiementModeConfigured=No s'ha definit la forma de pagament per defecte. Ves a la configuració del mòdul Factures per corregir-ho.
-ErrorCreateBankAccount=Crea un compte bancari i després ves al panell de configuració del mòdul Factures per definir les formes de pagament
+ErrorNoPaiementModeConfigured=No s'ha definit cap forma de pagament predeterminada. Aneu a Configuració del mòdul de factures per a solucionar-ho.
+ErrorCreateBankAccount=Creeu un compte bancari i aneu al tauler Configuració del mòdul Factura per a definir les formes de pagament
 ErrorBillNotFound=Factura %s inexistent
 ErrorInvoiceAlreadyReplaced=Error, vol validar una factura que rectifica la factura %s. Però aquesta última ja està rectificada per la factura %s.
 ErrorDiscountAlreadyUsed=Error, el descompte ja s'està utilitzant
@@ -191,7 +194,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar <b>(%s %s)</b> é
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part
 ConfirmClassifyPaidPartiallyReasonOther=D'altra raó
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Aquesta opció és possible si la teva factura s'ha proporcionat amb comentaris adequats. (Exemple «Només l'impost corresponent al preu realment pagat dóna dret a la deducció»)
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Aquesta opció és possible si la vostra factura ha rebut els comentaris adequats. (Exemple «Només l'impost corresponent al preu realment pagat dona dret a la deducció»)
 ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=En alguns països, aquesta opció només és possible si la factura conté les notes correctes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Aquesta elecció és l'elecció que s'ha de prendre si les altres no són aplicables
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b> client morós </b> és un client que es nega a pagar el seu deute.
@@ -225,7 +228,7 @@ setPaymentConditionsShortRetainedWarranty=Definiu els termes de pagament de la g
 setretainedwarranty=Estableix la garantia retinguda
 setretainedwarrantyDateLimit=Estableix el límit de data de garantia conservada
 RetainedWarrantyDateLimit=Data límit de garantia retinguda
-RetainedWarrantyNeed100Percent=La factura de situació ha d’estar al progrés 100%% per mostrar-se en PDF
+RetainedWarrantyNeed100Percent=La factura de situació ha d’estar amb progrés 100%% per a mostrar-se en PDF
 AlreadyPaid=Ja pagat
 AlreadyPaidBack=Ja reemborsat
 AlreadyPaidNoCreditNotesNoDeposits=Ja pagat (exclosos els abonaments i bestretes)
@@ -252,7 +255,7 @@ SendReminderBillByMail=Envia recordatori per e-mail
 RelatedCommercialProposals=Pressupostos relacionats
 RelatedRecurringCustomerInvoices=Factures recurrents de client relacionades
 MenuToValid=A validar
-DateMaxPayment=Pagament vençut
+DateMaxPayment=Venciment de pagament
 DateInvoice=Data facturació
 DatePointOfTax=Punt d'impostos
 NoInvoice=Cap factura
@@ -358,7 +361,7 @@ ListOfPreviousSituationInvoices=Llista de factures de situació anteriors
 ListOfNextSituationInvoices=Llista de factures de situació següents
 ListOfSituationInvoices=Llista de factures de situació
 CurrentSituationTotal=Situació actual total
-DisabledBecauseNotEnouthCreditNote=Per eliminar una factura de situació del cicle, el total de la nota de crèdit d'aquesta factura ha de cobrir aquest total de la factura
+DisabledBecauseNotEnouthCreditNote=Per a eliminar una factura de situació del cicle, el total de la nota de crèdit d'aquesta factura ha de cobrir aquest total de factura
 RemoveSituationFromCycle=Treu aquesta factura del cicle
 ConfirmRemoveSituationFromCycle=Vols eliminar aquesta factura %s del cicle?
 ConfirmOuting=Confirma la sortida
@@ -373,6 +376,7 @@ DateLastGeneration=Data de l'última generació
 DateLastGenerationShort=Data última gen.
 MaxPeriodNumber=Màx. nombre de generació de factures
 NbOfGenerationDone=Nombre de generació de factura ja realitzat
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Número de generació realitzat
 MaxGenerationReached=Nombre màxim de generacions assolides
 InvoiceAutoValidate=Valida les factures automàticament
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=En els 14 dies següents a final de mes
 FixAmount=Import fixe: 1 línia amb l'etiqueta '%s'
 VarAmount=Import variable (%% total)
 VarAmountOneLine=Quantitat variable (%% tot.) - 1 línia amb l'etiqueta '%s'
-VarAmountAllLines=Import variable (%% tot.): Totes les mateixes línies
+VarAmountAllLines=Import variable (%% tot.): Totes les línies des de l'origen
 # PaymentType
 PaymentTypeVIR=Transferència bancària
 PaymentTypeShortVIR=Transferència bancària
@@ -494,12 +498,16 @@ Cash=Efectiu
 Reported=Ajornat
 DisabledBecausePayments=No disponible ja que hi ha pagaments
 CantRemovePaymentWithOneInvoicePaid=Eliminació impossible quan hi ha almenys una factura classificada com a pagada.
+CantRemovePaymentVATPaid=No es pot eliminar el pagament ja que la declaració de l'IVA està classificada com a pagada
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Esperant el pagament
 CantRemoveConciliatedPayment=No es pot eliminar el pagament reconciliat
 PayedByThisPayment=Pagada per aquest pagament
 ClosePaidInvoicesAutomatically=Classifiqueu automàticament totes les factures estàndard, de pagament inicial o de reemplaçament com a "Pagades" quan el pagament es realitzi completament.
 ClosePaidCreditNotesAutomatically=Classifiqueu automàticament totes les notes de crèdit com a "Pagades" quan es faci la devolució íntegra.
 ClosePaidContributionsAutomatically=Classifiqueu automàticament totes les contribucions socials o fiscals com a "Pagades" quan el pagament es realitzi íntegrament.
+ClosePaidVATAutomatically=Classifica automàticament la declaració d'IVA com a "Pagada" quan el pagament es realitzi completament.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Totes les factures no pendents de pagament es tancaran automàticament amb l'estat "Pagat".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reemborsar
@@ -508,14 +516,14 @@ NoteListOfYourUnpaidInvoices=Nota: Aquest llistat només conté factures de terc
 RevenueStamp=Segell fiscal
 YouMustCreateInvoiceFromThird=Aquesta opció només està disponible al moment de crear una factura des de la llengüeta "Client" de tercers
 YouMustCreateInvoiceFromSupplierThird=Aquesta opció només està disponible quan es crea la factura des de la pestanya "proveïdor" d'un tercer
-YouMustCreateStandardInvoiceFirstDesc=Primer has de crear una factura estàndard i convertir-la en "plantilla" per crear una nova plantilla de factura
+YouMustCreateStandardInvoiceFirstDesc=Primer heu de crear una factura estàndard i convertir-la a "plantilla" per a crear una nova plantilla de factura
 PDFCrabeDescription=Plantilla de factura PDF Crabe. Una plantilla de factura completa (implementació antiga de la plantilla Sponge)
 PDFSpongeDescription=Plantilla PDF de factures Sponge. Una plantilla de factura completa
 PDFCrevetteDescription=Plantilla Crevette per factures PDF. Una plantilla de factura completa per factures de situació.
-TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0
-MarsNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures, %syymm-nnnn per a les factures rectificatives, %syymm-nnnn per a les factures de dipòsit i %syymm-nnnn pels abonaments  on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense retorn a 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Ja existeix una factura que comença amb $syymm i no és compatible amb aquest model de seqüència. Elimineu-la o canvieu-li el nom per a activar aquest mòdul.
-CactusNumRefModelDesc1=Retorna un número amb format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a devolucions i %syymm-nnnn per a factures de dipòsits anticipats on yy es l'any, mm és el mes i nnnn és una seqüència sense ruptura i sense retorn a 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Motiu de tancament anticipat
 EarlyClosingComment=Nota de tancament anticipat
 ##### Types de contacts #####
@@ -556,13 +564,14 @@ PDFCrevetteSituationInvoiceLine=Situació N°%s : Inv. N°%s a %s
 TotalSituationInvoice=Total situació
 invoiceLineProgressError=El progrés de la línia de factura no pot ser igual o superior a la següent línia de factura
 updatePriceNextInvoiceErrorUpdateline=Error : actualització de preu en línia de factura : %s
-ToCreateARecurringInvoice=Per crear una factura recurrent d'aquest contracte, primer crea aquesta factura esborrany, després converteix-la en una plantilla de factura i defineix la freqüència per a la generació de factures futures.
+ToCreateARecurringInvoice=Per a crear una factura recurrent per a aquest contracte, primer creeu aquest esborrany de factura, després convertiu-lo en una plantilla de factura i definiu la freqüència de generació de futures factures.
 ToCreateARecurringInvoiceGene=Per a generar futures factures regularment i manualment, només cal que aneu al menú <strong> %s - %s - %s </strong>.
 ToCreateARecurringInvoiceGeneAuto=Si necessites tenir cada factura generada automàticament, pregunta a l'administrador per habilitar i configurar el mòdul <strong>%s</strong>. Tingues en compte que ambdós mètodes (manual i automàtic) es poden utilitzar alhora sense risc de duplicats.
 DeleteRepeatableInvoice=Elimina la factura recurrent
 ConfirmDeleteRepeatableInvoice=Vols eliminar la plantilla de factura?
 CreateOneBillByThird=Agrupa una factura per tercer (sinó, una factura per comanda)
-BillCreated=%s factura(es) creades
+BillCreated=%s factures generades
+BillXCreated=Factura generada %s
 StatusOfGeneratedDocuments=Estat de la generació de documents
 DoNotGenerateDoc=No generar cap fitxer de document
 AutogenerateDoc=Genera automàticament el fitxer del document
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index 37668884c7a..4c9e0642afc 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Estadístiques sobre els principals objectes de negoci de la base de dades
 BoxLoginInformation=Informació d'inici de sessió
 BoxLastRssInfos=Informació RSS
 BoxLastProducts=Últims %s Productes/Serveis
@@ -17,9 +18,13 @@ BoxLastActions=Últimes accions
 BoxLastContracts=Últims contractes
 BoxLastContacts=Últims contactes/adreces
 BoxLastMembers=Últims socis
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Últimes intervencions
 BoxCurrentAccounts=Balanç de comptes oberts
 BoxTitleMemberNextBirthdays=Aniversaris d'aquest mes (membres)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Últimes %s notícies de %s
 BoxTitleLastProducts=Productes / Serveis: últims %s modificats
 BoxTitleProductsAlertStock=Productes: alerta d'estoc
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Últims %s enviaments de clients
 NoRecordedShipments=Cap enviament de client registrat
 BoxCustomersOutstandingBillReached=Clients que superen el límit pendent
 # Pages
-AccountancyHome=Comptabilitat
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Projectes validats
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 195fe0a4157..5c202697ee7 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Àrea d'etiquetes de proveïdors
 CustomersCategoriesArea=Àrea d'etiquetes de clients
 MembersCategoriesArea=Àrea d'etiquetes de socis
 ContactsCategoriesArea=Àrea d'etiquetes de contactes
-AccountsCategoriesArea=Àrea d'etiquetes de comptes
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Àrea d'etiquetes de projectes
 UsersCategoriesArea=Àrea d'etiquetes d'usuaris
 SubCats=Subcategories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assigna la categoria al proveïdor
 ShowCategory=Mostra etiqueta
 ByDefaultInList=Per defecte en el llistat
 ChooseCategory=Tria la categoria
-StocksCategoriesArea=Categories de magatzems
-ActionCommCategoriesArea=Categories d'esdeveniments
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Categories de Pàgines/Contenidors
 UseOrOperatorForCategories=Us o operador per categories
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 0125a802bf8..fd9f867eb34 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -23,7 +23,7 @@ ThirdPartyContacts=Àrea de tercers i contactes
 ThirdPartyContact=Àrea d'adreces de tercers i contactes
 Company=Empresa
 CompanyName=Raó social
-AliasNames=Àlies (nom comercial, marca, ...)
+AliasNames=Àlies (nom comercial, marca...)
 AliasNameShort=Nom comercial
 Companies=Empreses
 CountryIsInEEC=El país es troba dins de la Comunitat Econòmica Europea
@@ -43,8 +43,9 @@ Individual=Particular
 ToCreateContactWithSameName=Es crearà un contacte/adreça automàticament amb la mateixa informació que el tercer d'acord amb el propi tercer. En la majoria de casos, fins i tot si el tercer és una persona física, la creació d'un sol tercer ja és suficient.
 ParentCompany=Seu Central
 Subsidiaries=Filials
-ReportByMonth=Informe per mes
+ReportByMonth=Report per month
 ReportByCustomers=Informe per client
+ReportByThirdparties=Report per thirdparty
 ReportByQuarter=Informe per taxa
 CivilityCode=Codi cortesia
 RegisteredOffice=Domicili social
@@ -172,14 +173,20 @@ ProfId1ES=CIF/NIF
 ProfId2ES=Núm. seguretat social
 ProfId3ES=CNAE
 ProfId4ES=Núm. col·legiat
-ProfId5ES=Número EORI
+ProfId5ES=Prof Id 5 (número EORI)
 ProfId6ES=-
 ProfId1FR=CIF/NIF
 ProfId2FR=Núm. seguretat social
 ProfId3FR=CNAE
 ProfId4FR=RCS/RM
-ProfId5FR=Número EORI
+ProfId5FR=Prof Id 5 (número EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Número registre
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=Número EORI
+ProfId6IT=-
 ProfId1LU=CIF/NIF (R.C.S. Luxemburg)
 ProfId2LU=Núm. S.S. (permís comercial)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=CIF/NIF
 ProfId2PT=Núm. seguretat social
 ProfId3PT=CNAE
 ProfId4PT=Conservatori
-ProfId5PT=Número EORI
+ProfId5PT=Prof Id 5 (número EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=CUI
 ProfId2RO=Núm. Enmatriculare
 ProfId3RO=CAEN
 ProfId4RO=EUID
-ProfId5RO=Número EORI
+ProfId5RO=Prof Id 5 (número EORI)
 ProfId6RO=-
 ProfId1RU=CIF/NIF
 ProfId2RU=Núm. seguretat social
@@ -359,7 +367,7 @@ VATIntraManualCheck=També podeu verificar-ho manualment al lloc web de la Comis
 ErrorVATCheckMS_UNAVAILABLE=Comprovació impossible. El servei de comprovació no és prestat pel país membre (%s).
 NorProspectNorCustomer=Ni client, ni client potencial
 JuridicalStatus=Tipus d'entitat empresarial
-Workforce=Força de treball
+Workforce=Nombre d'empleats
 Staff=Empleats
 ProspectLevelShort=Potencial
 ProspectLevel=Nivell de client potencial
@@ -426,7 +434,7 @@ SocialNetworksInstagramURL=URL d’Instagram
 SocialNetworksYoutubeURL=URL de Youtube
 SocialNetworksGithubURL=URL de Github
 YouMustAssignUserMailFirst=Has de crear un correu electrònic per aquest usuari abans d'afegir notificacions de correu electrònic per ell.
-YouMustCreateContactFirst=Per poder afegir notificacions de correu electrònic, en primer lloc s'ha de definir contactes amb correu electrònic vàlid pel tercer
+YouMustCreateContactFirst=Per a poder afegir notificacions per correu electrònic, primer heu de definir els contactes amb correus electrònics vàlids per al tercer
 ListSuppliersShort=Llistat de proveïdors
 ListProspectsShort=Llistat de clients potencials
 ListCustomersShort=Llistat de clients
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Factura pendent actual
 OutstandingBill=Max. de factures pendents
 OutstandingBillReached=S'ha arribat al màx. de factures pendents
 OrderMinAmount=Import mínim per comanda
-MonkeyNumRefModelDesc=Retorna número amb format %syymm-nnnn per a codi de client i %syymm-nnnn per a codi de proveïdor on yy és any, mm és mes i nnnn és una seqüència sense trencament i sense tornar a 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=El codi és lliure. Aquest codi es pot modificar en qualsevol moment.
 ManagingDirectors=Nom del gerent(s) (CEO, director, president ...)
 MergeOriginThirdparty=Duplicar tercer (tercer que vols eliminar)
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 36c3821c1be..3ae4522a649 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - compta
 MenuFinancial=Financera
-TaxModuleSetupToModifyRules=Ves a la <a href="%s">Configuració mòdul impostos</a> per modificar les regles de càlcul
-TaxModuleSetupToModifyRulesLT=Ves a la <a href="%s">Configuració de l'empresa</a> per modificar les regles de càlcul
+TaxModuleSetupToModifyRules=Aneu a <a href="%s"> Configuració del mòdul Impostos </a> per a modificar les regles de càlcul
+TaxModuleSetupToModifyRulesLT=Aneu a <a href="%s"> Configuració de l'empresa </a> per a modificar les regles de càlcul
 OptionMode=Opció de gestió comptable
 OptionModeTrue=Opció Ingressos-Despeses
 OptionModeVirtual=Opció Crèdits-Deutes
@@ -65,6 +65,7 @@ LT2SupplierIN=Compres IRPF
 VATCollected=IVA recuperat
 StatusToPay=A pagar
 SpecialExpensesArea=Àrea per tots els pagaments especials
+VATExpensesArea=Àrea per a tots els pagaments d'IVA
 SocialContribution=Impost varis
 SocialContributions=Impostos varis
 SocialContributionsDeductibles=Impostos varis deduïbles
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Cobrament factura a client
 PaymentSupplierInvoice=Pagament de la factura del proveïdor
 PaymentSocialContribution=Pagament d'impost varis
 PaymentVat=Pagament IVA
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Llistat de pagaments
 ListOfCustomerPayments=Llistat de cobraments de clients
 ListOfSupplierPayments=Llista de pagaments a proveïdors
@@ -104,6 +106,8 @@ LT2PaymentES=Pagament IRPF
 LT2PaymentsES=Pagaments IRPF
 VATPayment=Pagament d'impost de vendes
 VATPayments=Pagaments d'impost de vendes
+VATDeclarations=Declaracions d’IVA
+VATDeclaration=Declaració d'IVA
 VATRefund=Devolució IVA
 NewVATPayment=Pagament nou de l'impost sobre les vendes
 NewLocalTaxPayment=Pagament nou d'impostos %s
@@ -134,9 +138,17 @@ NoWaitingChecks=Sense xecs en espera de l'ingrés.
 DateChequeReceived=Data recepció del xec
 NbOfCheques=Nombre de xecs
 PaySocialContribution=Pagar un impost varis
-ConfirmPaySocialContribution=Esteu segur de voler classificar aquest impost varis com a pagat?
+PayVAT=Paga una declaració d’IVA
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Esteu segur que voleu classificar aquest impost varis com a pagat?
+ConfirmPayVAT=Esteu segur que voleu classificar aquesta declaració d'IVA com a pagada?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Elimina un pagament d'impost varis
-ConfirmDeleteSocialContribution=Esteu segur de voler eliminar el pagament d'aquest impost varis?
+DeleteVAT=Suprimeix una declaració d’IVA
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Esteu segur que voleu suprimir aquest pagament d'impostos varis?
+ConfirmDeleteVAT=Esteu segur que voleu suprimir aquesta declaració d'IVA?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Impostos varis i pagaments
 CalcModeVATDebt=Mode d'<b>%sIVA sobre comptabilitat de compromís%s </b>.
 CalcModeVATEngagement=Mode d'<b>%sIVA sobre ingressos-despeses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- Inclou els pagaments reals realitzats en les factures, les de
 RulesCADue=- Inclou les factures degudes al client tant si són pagades com si no. <br> - Es basa en la data de facturació d'aquestes factures. <br>
 RulesCAIn=- Inclou tots els pagaments efectius de factures rebuts dels clients. <br> - Es basa en la data de pagament d'aquestes factures <br>
 RulesCATotalSaleJournal=Inclou totes les línies de crèdit del Diari de venda.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Inclou un registre al vostre Llibre Major amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
 RulesResultBookkeepingPredefined=Inclou un registre al vostre Llibre Major amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
 RulesResultBookkeepingPersonalized=Mostra un registre al vostre Llibre Major amb comptes comptables <b> agrupats per grups personalitzats </b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Informe d'impostos sobre vendes per tercers
 VATReportByCustomers=Informe d'IVA sobre vendes per client
 VATReportByCustomersInInputOutputMode=Informe per clients d'IVA cobrat i pagat
 VATReportByQuartersInInputOutputMode=Taxa impositiva d'informe per vendes de l'impost recaptat i pagat
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Informe impost 2 per tipus
 LT2ReportByQuarters=Informe impost 3 per tipus
 LT1ReportByQuartersES=Informe per taxa de RE
@@ -217,11 +231,11 @@ Pcg_subtype=Subtipus de compte
 InvoiceLinesToDispatch=Línies de factures a desglossar
 ByProductsAndServices=Per producte i servei
 RefExt=Ref. externa
-ToCreateAPredefinedInvoice=Per crear una plantilla de factura, crea una factura estàndard, i després, sense validar-la, fes clic al botó "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Enllaçar a una comanda
 Mode1=Mètode 1
 Mode2=Mètode 2
-CalculationRuleDesc=Per calcular la totalitat de l'IVA, hi ha dos mètodes:<br>Mètode 1 és l'arrodoniment de l'IVA en cada línia, llavors es sumen-<br>Mètode 2 és la suma de tot l'IVA en cada línia, a continuació, arrodonint el resultat.<br>.El resultat final pot difereix uns pocs centaus. El mètode per defecte és <b>% s</b>.
+CalculationRuleDesc=Per a calcular l'IVA total, hi ha dos mètodes: <br>El mètode 1 és arrodonir l'IVA a cada línia i, a continuació, sumar-los. <br>El mètode 2 suma totes els IVA de cada línia i, a continuació, arrodoneix el resultat. <br>El resultat final pot diferir de pocs cèntims. El mode per defecte és el mode <b>%s</b>.
 CalculationRuleDescSupplier=Segons el proveïdor, seleccioneu el mètode adequat per aplicar la mateixa regla de càlcul i obtenir el mateix resultat esperat pel vostre proveïdor.
 TurnoverPerProductInCommitmentAccountingNotRelevant=L'informe de volum de negocis cobrat per producte no està disponible. Aquest informe només està disponible per a la facturació facturada.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=L'informe del volum de negocis cobrat per la venda no està disponible. Aquest informe només està disponible per a la facturació facturada.
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=El compte comptable dedicat definit a la fitxa
 ACCOUNTING_ACCOUNT_SUPPLIER=Compte de comptabilitat utilitzat per tercers proveïdors
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=El compte comptable dedicat definit a la fitxa de tercers només s'utilitzarà per al Llibre Major. Aquest serà utilitzat pel Llibre Major i com a valor predeterminat del subcompte si no es defineix un compte comptable a la fitxa del tercer.
 ConfirmCloneTax=Confirma el clonat d'un impost social / fiscal
+ConfirmCloneVAT=Confirma la còpia d’una declaració d’IVA
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clonar-la pel pròxim mes
 SimpleReport=Informe simple
 AddExtraReport=Informes addicionals (afegeix l'informe de clients nacionals i estrangers)
@@ -253,7 +269,8 @@ AccountingAffectation=Assignació de comptes
 LastDayTaxIsRelatedTo=Últim dia del període al qual està relacionat l'impost
 VATDue=Impost sobre vendes reclamat
 ClaimedForThisPeriod=Reclamat per al període
-PaidDuringThisPeriod=Pagat durant aquest període
+PaidDuringThisPeriod=Pagat per aquest període
+PaidDuringThisPeriodDesc=Es tracta de la suma de tots els pagaments vinculats a declaracions d’IVA que tenen una data de finalització del període a l’interval de dates seleccionat
 ByVatRate=Per de l'impost sobre vendes
 TurnoverbyVatrate=Facturació facturada pel tipus d'impost sobre la venda
 TurnoverCollectedbyVatrate=Facturació recaptada pel tipus d'impost sobre la venda
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Volum de compres recollit
 RulesPurchaseTurnoverDue=- Inclou les factures pendents del proveïdor, tant si es paguen com si no. <br>- Es basa en la data de factura d'aquestes factures.<br>
 RulesPurchaseTurnoverIn=- Inclou tots els pagaments realitzats de les factures de proveïdors. <br> - Es basa en la data de pagament d’aquestes factures <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Inclou totes les línies de dèbit del diari de compra.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Volum de compres facturat
 ReportPurchaseTurnoverCollected=Volum de compres recollit
 IncludeVarpaysInResults = Incloure varis pagaments als informes
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index 4f27a022b9e..c69f252d2af 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Fitxer encara no indexat a la base de dades (intente
 ExtraFieldsEcmFiles=Atributs addicionals dels fitxers ECM
 ExtraFieldsEcmDirectories=Atributs addicionals dels directoris ECM
 ECMSetup=Configuració de l'ECM
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 26ff6a8f8bd..deda3b33027 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -12,10 +12,10 @@ ErrorRefAlreadyExists=La referència <b> %s </b> ja existeix.
 ErrorLoginAlreadyExists=El nom d'usuari %s ja existeix.
 ErrorGroupAlreadyExists=El grup %s ja existeix.
 ErrorRecordNotFound=Registre no trobat
-ErrorFailToCopyFile=Error al copiar l'arxiu '<b>%s</b>' a '<b>%s</b>'.
-ErrorFailToCopyDir=Error al copiar el directori '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToCopyFile=No s'ha pogut copiar el fitxer "<b> %s </b>" a "<b> %s </b>".
+ErrorFailToCopyDir=No s'ha pogut copiar el directori '<b> %s </b>' a '<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>'.
+ErrorFailToDeleteFile=No s'ha pogut eliminar 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>'
@@ -42,7 +42,7 @@ ErrorWrongParameters=Falten paràmetres o són incorrectes
 ErrorBadValueForParameter=Valor incorrecte '%s' del paràmetre '%s'
 ErrorBadImageFormat=El fitxer d'imatge no té un format compatible (el vostre PHP no admet funcions per convertir imatges d'aquest format)
 ErrorBadDateFormat=El valor '%s' té un format de data no reconegut
-ErrorWrongDate=La data no es correcta!
+ErrorWrongDate=La data no és correcta.
 ErrorFailedToWriteInDir=No es pot escriure a la carpeta %s
 ErrorFoundBadEmailInFile=S'ha trobat una sintaxi incorrecta del correu electrònic per a les línies %s al fitxer (exemple de la línia %s amb email=%s)
 ErrorUserCannotBeDelete=No es pot eliminar l'usuari. És possible que estigui relacionat amb entitats de Dolibarr.
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directori <b>%s</b> no trobat (Ruta incorrecta, permisos inadeq
 ErrorFunctionNotAvailableInPHP=La funció <b>%s</b> és requerida per aquesta característica, però no es troba disponible en aquesta versió/instal·lació de PHP.
 ErrorDirAlreadyExists=Ja existeix una carpeta amb aquest nom.
 ErrorFileAlreadyExists=Ja existeix un fitxer amb aquest nom.
+ErrorDestinationAlreadyExists=Ja existeix un altre fitxer amb el nom <b> %s </b>.
 ErrorPartialFile=Arxiu no rebut íntegrament pel servidor.
 ErrorNoTmpDir=Directori temporal de recepció %s inexistent
 ErrorUploadBlockedByAddon=Càrrega bloquejada per un connector PHP/Apache.
@@ -76,14 +77,14 @@ ErrorFieldMustHaveXChar=El camp <b> %s </b> ha de tenir com a mínim %s caràcte
 ErrorNoAccountancyModuleLoaded=Mòdul de comptabilitat no activat
 ErrorExportDuplicateProfil=El nom d'aquest perfil ja existeix per aquest conjunt d'exportació
 ErrorLDAPSetupNotComplete=La configuració Dolibarr-LDAP és incompleta.
-ErrorLDAPMakeManualTest=S'ha generat un fitxer .ldif al directori %s. Proveu de carregar-lo manualment des de la línia de comandes per a obtenir més informació sobre els errors.
+ErrorLDAPMakeManualTest=S'ha generat un fitxer .ldif al directori %s. Proveu de carregar-lo manualment des de la línia d'ordres per a obtenir més informació sobre els errors.
 ErrorCantSaveADoneUserWithZeroPercentage=No es pot desar una acció amb "estat no iniciat" si el camp "fet per" també s'omple.
 ErrorRefAlreadyExists=La referència <b> %s </b> ja existeix.
 ErrorPleaseTypeBankTransactionReportName=Introduïu el nom de l’extracte bancari on s’ha d’informar de l’entrada (format AAAAAMM o AAAAAMMDD)
 ErrorRecordHasChildren=No s'ha pogut eliminar el registre, ja que té alguns registres fills.
 ErrorRecordHasAtLeastOneChildOfType=L'objecte té almenys un fill de tipus %s
 ErrorRecordIsUsedCantDelete=No es pot eliminar el registre. Ja s'utilitza o s'inclou en un altre objecte.
-ErrorModuleRequireJavascript=Javascript ha d'estar activat per a que aquesta opció pugui utilitzar-se. Per activar/desactivar JavaScript, ves al menú Inici->Configuració->Entorn.
+ErrorModuleRequireJavascript=No s’ha de desactivar Javascript perquè funcioni aquesta funció. Per a activar/desactivar Javascript, aneu al menú Inici-> Configuració->Entorn.
 ErrorPasswordsMustMatch=Les 2 contrasenyes indicades s'han de correspondre
 ErrorContactEMail=S'ha produït un error tècnic. Si us plau, contacteu amb l'administrador al següent correu electrònic <b> %s </b> i proporcioneu el codi d'error <b> %s </b> al vostre missatge o afegiu una còpia de la pantalla d'aquesta pàgina.
 ErrorWrongValueForField=Camp <b> %s </b>: '<b> %s </b>' no coincideix amb la regla regex <b> %s </b>
@@ -92,10 +93,10 @@ ErrorFieldRefNotIn=Camp <b> %s </b>: '<b> %s </b>' no és un <b> %s </b> ref act
 ErrorsOnXLines=S'han trobat %s errors
 ErrorFileIsInfectedWithAVirus=L'antivirus no ha pogut validar aquest arxiu (és probable que estigui infectat per un virus)!
 ErrorSpecialCharNotAllowedForField=Els caràcters especials no són admesos pel camp "%s"
-ErrorNumRefModel=Hi ha una referència a la base de dades (%s) i és incompatible amb aquesta numeració. Elimineu la línia o renomeneu la referència per activar aquest mòdul.
+ErrorNumRefModel=Hi ha una referència a la base de dades (%s) i no és compatible amb aquesta regla de numeració. Elimineu el registre o canvieu el nom de referència per a activar aquest mòdul.
 ErrorQtyTooLowForThisSupplier=Quantitat massa baixa per aquest proveïdor o sense un preu definit en aquest producte per aquest proveïdor
 ErrorOrdersNotCreatedQtyTooLow=Algunes ordres no s'han creat a causa de quantitats massa baixes
-ErrorModuleSetupNotComplete=La configuració del mòdul %s sembla incompleta. Vés a Inici: Configuració - Mòduls per completar.
+ErrorModuleSetupNotComplete=La configuració del mòdul %s sembla incompleta. Aneu a Inici - Configuració - Mòduls per a completar.
 ErrorBadMask=Error en la màscara
 ErrorBadMaskFailedToLocatePosOfSequence=Error, sense número de seqüència en la màscara
 ErrorBadMaskBadRazMonth=Error, valor de tornada a 0 incorrecte
@@ -141,9 +142,9 @@ ErrorToConnectToMysqlCheckInstance=Error de connexió amb la base de dades. Comp
 ErrorFailedToAddContact=Error en l'addició del contacte
 ErrorDateMustBeBeforeToday=La data ha de ser inferior a la d’avui
 ErrorDateMustBeInFuture=La data ha de ser major que avui
-ErrorPaymentModeDefinedToWithoutSetup=S'ha establert la forma de pagament al tipus %s però a la configuració del mòdul de factures no s'ha indicat la informació per mostrar aquesta forma de pagament.
+ErrorPaymentModeDefinedToWithoutSetup=S'ha definit una forma de pagament al tipus %s, però la configuració del mòdul de factures no s'ha completat per a definir la informació que es mostrarà per a aquesta forma de pagament.
 ErrorPHPNeedModule=Error, el vostre PHP ha de tenir instal·lat el mòdul <b>%s</b> per a utilitzar aquesta funció.
-ErrorOpenIDSetupNotComplete=Ha configurat Dolibarr per acceptar l'autentificació OpenID, però la URL del servei OpenID no es troba definida a la constant %s
+ErrorOpenIDSetupNotComplete=Heu configurat el fitxer de configuració Dolibarr per a permetre l'autenticació OpenID, però l'URL del servei OpenID no es defineix en constant %s
 ErrorWarehouseMustDiffers=El magatzem d'origen i destí han de ser diferents
 ErrorBadFormat=El format és incorrecte!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, aquest soci encara no s'ha enllaçat a un tercer. Enllaça el soci a un tercer existent o crea un tercer nou abans de crear la quota amb factura.
@@ -173,7 +174,7 @@ ErrorPriceExpressionUnknown=Error desconegut '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Els magatzems d'origen i destí han de ser diferents
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, intentant fer un moviment d'estoc sense informació de lot/sèrie, al producte '%s' que requereix informació del lot o sèrie
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Totes les recepcions han de verificar-se primer (acceptades o denegades) abans per realitzar aquesta acció
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Totes les recepcions han de verificar-se (acceptades) abans per poder-se realitzar a aquesta acció
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Totes les recepcions registrades han de ser verificades (aprovades) abans que se’ls permeti fer aquesta acció
 ErrorGlobalVariableUpdater0=Petició HTTP fallida amb error '%s'
 ErrorGlobalVariableUpdater1=Format JSON no vàlid "%s"
 ErrorGlobalVariableUpdater2=Falta el paràmetre '%s'
@@ -202,7 +203,7 @@ ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defin
 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 feu servir un nombre massa elevat de destinataris i que el vostre contingut de correu electrònic no sigui similar a un correu brossa. Demaneu també al vostre administrador que comprovi el tallafocs i els fitxers de registre del servidor per a obtenir una informació més completa.
-ErrorUserNotAssignedToTask=L'usuari ha d'estar assignat a la tasca per poder introduir el temps consumit.
+ErrorUserNotAssignedToTask=Cal assignar l'usuari a la tasca per a poder introduir el temps consumit.
 ErrorTaskAlreadyAssigned=La tasca també està assignada a l'usuari
 ErrorModuleFileSeemsToHaveAWrongFormat=Pareix que el mòdul té un format incorrecte.
 ErrorModuleFileSeemsToHaveAWrongFormat2=Al ZIP d'un mòdul ha d'haver necessàriament com a mínim un d'aquests directoris: <strong>%s</strong> o <strong>%s</strong>
@@ -211,7 +212,7 @@ ErrorDuplicateTrigger=Error, nom de disparador %s duplicat. Ja es troba carregat
 ErrorNoWarehouseDefined=Error, no hi ha magatzems definits.
 ErrorBadLinkSourceSetButBadValueForRef=L'enllaç que utilitzeu no és vàlid. Es defineix una "font" de pagament, però el valor de "ref" no és vàlid.
 ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=No és possible la validació massiva quan s'estableix l'opció d'augmentar/disminuir l'estoc en aquesta acció (cal validar-ho un per un per poder definir el magatzem a augmentar/disminuir)
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=La validació massiva no és possible quan s’estableix l’opció d’augmentar/disminuir estoc en aquesta acció (heu de validar una per una perquè pugueu definir el magatzem a augmentar/disminuir)
 ErrorObjectMustHaveStatusDraftToBeValidated=L'objecte %s ha de tenir l'estat 'Esborrany' per ser validat.
 ErrorObjectMustHaveLinesToBeValidated=L'objecte %s ha de tenir línies per ser validat.
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Només es poden enviar factures validades mitjançant l'acció massiva "Enviar per correu electrònic".
@@ -224,8 +225,9 @@ ErrorDescRequiredForFreeProductLines=La descripció és obligatòria per a líni
 ErrorAPageWithThisNameOrAliasAlreadyExists=La pàgina / contenidor <strong> %s </strong> té el mateix nom o àlies alternatiu que el que intenta utilitzar
 ErrorDuringChartLoad=S'ha produït un error en carregar el gràfic de comptes. Si pocs comptes no s'han carregat, podeu introduir-los manualment.
 ErrorBadSyntaxForParamKeyForContent=Sintaxi incorrecta per a la clau de contingut del paràmetre. Ha de tenir un valor que comenci per %s o %s
-ErrorVariableKeyForContentMustBeSet=Error, s'ha d'establir la constant amb el nom %s (amb contingut de text per mostrar) o %s (amb url extern per mostrar).
+ErrorVariableKeyForContentMustBeSet=Error, s’ha d’establir la constant amb el nom %s (amb el contingut de text a mostrar) o %s (amb una URL externa a mostrar).
 ErrorURLMustStartWithHttp=L'URL %s ha de començar amb http: // o https: //
+ErrorHostMustNotStartWithHttp=El nom d'amfitrió %s NO ha de començar amb http: // o https: //
 ErrorNewRefIsAlreadyUsed=Error, la referència nova ja s’està utilitzant
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, l’eliminació del pagament vinculat a una factura tancada no és possible.
 ErrorSearchCriteriaTooSmall=Criteris de cerca massa petits.
@@ -246,7 +248,7 @@ ErrorReplaceStringEmpty=Error, la cadena a on fer la substitució és buida
 ErrorProductNeedBatchNumber=Error, el producte '<b> %s </b>' necessita un número de lot/sèrie
 ErrorProductDoesNotNeedBatchNumber=Error, el producte '<b> %s </b>' no accepta un número de lot/sèrie
 ErrorFailedToReadObject=Error, no s'ha pogut llegir l'objecte del tipus <b> %s </b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Error, el paràmetre <b> %s </b> s'ha d'activar a <b>conf/conf.php<b> per permetre l'ús de la interfície de línia d'ordres pel programador de treball intern
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, el paràmetre <b> %s </b> s'ha d'activar a <b>conf/conf.php<b> per a permetre l'ús de la interfície de línia d'ordres pel programador de treball intern
 ErrorLoginDateValidity=Error, aquest inici de sessió està fora de l'interval de dates de validesa
 ErrorValueLength=La longitud del camp '<b> %s </b>' ha de ser superior a '<b> %s </b>'
 ErrorReservedKeyword=La paraula '<b> %s </b>' és una paraula clau reservada
@@ -255,22 +257,26 @@ ErrorPublicInterfaceNotEnabled=La interfície pública no s'ha activat
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Cal definir l'idioma de la pàgina nova si es defineix com a traducció d'una altra pàgina
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=L'idioma de la pàgina nova no ha de ser l'idioma d'origen si s'estableix com a traducció d'una altra pàgina
 ErrorAParameterIsRequiredForThisOperation=Un paràmetre és obligatori per a aquesta operació
+ErrorDateIsInFuture=Error, la data no pot ser en el futur
+ErrorAnAmountWithoutTaxIsRequired=Error, l'import és obligatori
+ErrorAPercentIsRequired=Error, empleneu el percentatge correctament
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El paràmetre PHP upload_max_filesize (%s) és superior al paràmetre PHP post_max_size (%s). No es tracta d’una configuració consistent.
-WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
+WarningPasswordSetWithNoAccount=S'ha establert una contrasenya per a aquest soci. Tot i això, no s'ha creat cap compte d'usuari. Per tant, aquesta contrasenya s’emmagatzema però no es pot utilitzar per a iniciar la sessió a Dolibarr. Pot ser utilitzat per un mòdul/interfície extern, però si no necessiteu definir cap inici de sessió ni contrasenya per a un soci, podeu desactivar l'opció "Gestiona un inici de sessió per a cada soci" des de la configuració del mòdul Socis. Si heu de gestionar un inici de sessió però no necessiteu cap contrasenya, podeu mantenir aquest camp buit per a evitar aquesta advertència. Nota: El correu electrònic també es pot utilitzar com a inici de sessió si el soci està enllaçat amb un usuari.
 WarningMandatorySetupNotComplete=Feu clic aquí per a configurar els paràmetres obligatoris
-WarningEnableYourModulesApplications=Feu clic aquí per activar els vostres mòduls i aplicacions
+WarningEnableYourModulesApplications=Feu clic aquí per a activar els vostres mòduls i aplicacions
 WarningSafeModeOnCheckExecDir=Atenció, està activada l'opció PHP <b>safe_mode</b>, la comanda ha d'estar dins d'un directori declarat dins del paràmetre php <b>safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=Ja existeix un marcador amb aquest títol o aquest URL.
 WarningPassIsEmpty=Atenció: La contrasenya de la base de dades està buida. Això és un forat de seguretat. Cal afegir una contrasenya a la seva base de dades i canviar el seu arxiu conf.php per reflectir això.
 WarningConfFileMustBeReadOnly=Atenció, el seu fitxer (<b>htdocs/conf/conf.php</b>) és accessible en escriptura al servidor web. Això representa un error seriós de seguretat. Modifiqueu els permisos per ser llegit únicament pel compte que executa el servidor Web.Si està executant Windows en undisco amb format FAT, sigui conscient que aquest sistema d'arxius no protegeix els arxius i no ofereix cap solució per reduir els riscos de manipulació d'aquest fitxer.
 WarningsOnXLines=Alertes a <b>%s</b> línies font
-WarningNoDocumentModelActivated=No s'ha activat cap model, per a la generació de documents. Es seleccionarà un model per defecte fins que consulteu la configuració del vostre mòdul.
+WarningNoDocumentModelActivated=No s'ha activat cap model per a la generació de documents. Per defecte s’escollirà un model fins que no comproveu la configuració del mòdul.
 WarningLockFileDoesNotExists=Avís, un cop finalitzada la instal·lació, heu de desactivar les eines d'instal·lació / migració afegint un fitxer <b> install.lock </b> al directori <b> %s </b>. Ometre la creació d'aquest fitxer suposa un greu risc de seguretat.
 WarningUntilDirRemoved=Totes les advertències de seguretat (visibles només pels usuaris administradors) romandran actives sempre que la vulnerabilitat estigui present (o aquesta constant MAIN_REMOVE_INSTALL_WARNING s'afegeix a la Configuració-> Configuració altra).
 WarningCloseAlways=Avís, el tancament és realitzat encara que la quantitat total difereixi entre els elements d'origen i destí. Activi aquesta funcionalitat amb precaució.
-WarningUsingThisBoxSlowDown=Atenció, l'ús d'aquest panell provoca serioses alentiments en les pàgines que mostren aquest panell.
+WarningUsingThisBoxSlowDown=Advertiment, si utilitzeu aquest quadre, alentireu seriosament totes les pàgines que mostren el quadre.
 WarningClickToDialUserSetupNotComplete=La configuració de ClickToDial per al compte d'usuari no està completa (vegeu la pestanya ClickToDial en la seva fitxa d'usuari)
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalitat deshabilitada quan la configuració de l'entorn està optimitzada per a persones cegues o navegadors de text.
 WarningPaymentDateLowerThanInvoiceDate=La data de pagament (%s) és anterior a la data (%s) de la factura %s.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Advertiment: no s'ha pogut afegir l'entr
 WarningTheHiddenOptionIsOn=Advertiment, l'opció oculta <b> %s </b> està activada.
 WarningCreateSubAccounts=Atenció, no podeu crear directament un subcompte, heu de crear un tercer o un usuari i assignar-los un codi comptable per a trobar-los en aquesta llista.
 WarningAvailableOnlyForHTTPSServers=Disponible només si s'utilitza una connexió segura HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/ca_ES/externalsite.lang b/htdocs/langs/ca_ES/externalsite.lang
index de2a2d77050..3518d8c97ac 100644
--- a/htdocs/langs/ca_ES/externalsite.lang
+++ b/htdocs/langs/ca_ES/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Configuració de l'enllaç a la pàgina web externa
-ExternalSiteURL=URL del lloc extern
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=El mòdul Lloc web extern no ha estat configurat correctament.
 ExampleMyMenuEntry=La meva entrada del menú
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index a50db98d5f8..7553262f78d 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -47,13 +47,13 @@ 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/Organització' per corregir-ho
-ErrorGoToModuleSetup=Ves a la configuració del mòdul per corregir-ho
+ErrorGoToGlobalSetup=Aneu a la configuració "Empresa/Organització" per a solucionar-ho
+ErrorGoToModuleSetup=Aneu a Configuració del mòdul per a solucionar-ho
 ErrorFailedToSendMail=Error en l'enviament de l'e-mail (emissor =%s, destinatairo =%s)
 ErrorFileNotUploaded=El fitxer no s'ha pogut transferir
 ErrorInternalErrorDetected=Error detectat
 ErrorWrongHostParameter=Paràmetre Servidor invàlid
-ErrorYourCountryIsNotDefined=El teu país no està definit. Ves a Inici-Configuració-Empresa-Edita i omple de nou el formulari
+ErrorYourCountryIsNotDefined=El vostre país no està definit. Aneu a Inici-Configuració-Edita i torneu a omplir el formulari.
 ErrorRecordIsUsedByChild=No s'ha pogut suprimir aquest registre. Aquest registre l’utilitza almenys un registre fill.
 ErrorWrongValue=Valor incorrecte
 ErrorWrongValueForParameterX=Valor incorrecte del paràmetre %s
@@ -114,7 +114,7 @@ ReturnCodeLastAccessInError=Retorna el codi per les últimes peticions d'accés
 InformationLastAccessInError=Informació de les últimes peticions d'accés a la base de dades amb error
 DolibarrHasDetectedError=Dolibarr ha trobat un error tècnic
 YouCanSetOptionDolibarrMainProdToZero=Podeu llegir el fitxer de registre o establir l'opció $dolibarr_main_prod a '0' al fitxer de configuració per a obtenir més informació.
-InformationToHelpDiagnose=Aquesta informació pot ser útil per a fer diagnòstics (podeu configurar l'opció $dolibarr_main_prod a '1' per eliminar aquestes notificacions)
+InformationToHelpDiagnose=Aquesta informació pot ser útil per a fer diagnòstics (podeu configurar l'opció $dolibarr_main_prod a '1' per a eliminar aquestes notificacions)
 MoreInformation=Més informació
 TechnicalInformation=Informació tècnica
 TechnicalID=ID Tècnic
@@ -244,7 +244,7 @@ DurationOfLine=Durada de la línia
 Model=Plantilla del document
 DefaultModel=Plantilla del document per defecte
 Action=Acció
-About=Sobre
+About=Quant a
 Number=Número
 NumberByMonth=Nombre per mes
 AmountByMonth=Import per mes
@@ -278,6 +278,7 @@ DateModificationShort=Data modif.
 IPModification=IP de modificació
 DateLastModification=Data de l'última modificació
 DateValidation=Data validació
+DateSigning=Signing date
 DateClosing=Data tancament
 DateDue=Data venciment
 DateValue=Data valor
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Preu unitari (exclòs) (moneda)
 UnitPriceTTC=Preu unitari total
 PriceU=P.U.
 PriceUHT=P.U.
-PriceUHTCurrency=U.P (moneda)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=Preu unitari (IVA inclòs)
 Amount=Import
 AmountInvoice=Import factura
@@ -389,6 +390,8 @@ AmountTotal=Import total
 AmountAverage=Import mitjà
 PriceQtyMinHT=Preu quantitat min. (sense IVA)
 PriceQtyMinHTCurrency=Preu quantitat min. (sense IVA) (moneda)
+PercentOfOriginalObject=Percentatge de l'objecte original
+AmountOrPercent=Import o percentatge
 Percentage=Percentatge
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Socis
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Impostos | Despeses especials
 ThisLimitIsDefinedInSetup=Límit Dolibarr (Menú inici-configuració-seguretat): %s Kb, límit PHP: %s Kb
-NoFileFound=No hi ha documents guardats en aquesta carpeta
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Idioma actual
 CurrentTheme=Tema actual
 CurrentMenuManager=Gestor menú actual
@@ -899,8 +902,10 @@ ViewAccountList=Veure llibre major
 ViewSubAccountList=Vegeu el subcompte del llibre major
 RemoveString=Eliminar cadena '%s'
 SomeTranslationAreUncomplete=Alguns idiomes poden estar traduïts parcialment o poden tenir errors. Si detectes algun, pots corregir els fitxers d'idiomes registrant-te a <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Enllaç de descàrrega directa (públic/extern)
-DirectDownloadInternalLink=Enllaç directe de descàrrega (necessita estar registrat i tenir permisos)
+DirectDownloadLink=Enllaç de descàrrega públic
+PublicDownloadLinkDesc=Per baixar el fitxer només es necessita l'enllaç
+DirectDownloadInternalLink=Enllaç de descàrrega privat
+PrivateDownloadLinkDesc=Cal estar registrat i amb permisos per a visualitzar o descarregar el fitxer
 Download=Descarrega
 DownloadDocument=Baixar el document
 ActualizeCurrency=Actualitza el canvi de divisa
@@ -908,7 +913,7 @@ Fiscalyear=Any fiscal
 ModuleBuilder=Generador de mòduls i aplicacions
 SetMultiCurrencyCode=Estableix moneda
 BulkActions=Accions massives
-ClickToShowHelp=Fes clic per mostrar l'ajuda desplegable
+ClickToShowHelp=Feu clic per a mostrar l'ajuda desplegable
 WebSite=Lloc web
 WebSites=Pàgines web
 WebSiteAccounts=Comptes de lloc web
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contactes
 SearchIntoMembers=Socis
 SearchIntoUsers=Usuaris
 SearchIntoProductsOrServices=Productes o serveis
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projectes
 SearchIntoMO=Ordres de fabricació
 SearchIntoTasks=Tasques
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Tecla de drecera
 AssignedTo=Assignada a
 Deletedraft=Suprimeix l'esborrany
 ConfirmMassDraftDeletion=Confirmació d'eliminació massiva d'esborranys
-FileSharedViaALink=Fitxer compartit a través d'un enllaç
+FileSharedViaALink=Fitxer compartit amb un enllaç públic
 SelectAThirdPartyFirst=Selecciona un tercer primer
 YouAreCurrentlyInSandboxMode=Actualment esteu en el mode %s "sandbox"
 Inventory=Inventari
 AnalyticCode=Codi analític
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Mostra més informació
 NoFilesUploadedYet=Carregueu primer un document
 SeePrivateNote=Veure nota privada
@@ -1086,7 +1093,7 @@ More=Més
 ShowDetails=Mostrar detalls
 CustomReports=Informes personalitzats
 StatisticsOn=Estadístiques de
-SelectYourGraphOptionsFirst=Seleccioneu les opcions gràfiques per crear un gràfic 
+SelectYourGraphOptionsFirst=Seleccioneu les opcions gràfiques per a crear un gràfic 
 Measures=Mesures
 XAxis=Eix X
 YAxis=Eix Y
@@ -1115,8 +1122,10 @@ OutOfDate=Obsolet
 EventReminder=Recordatori d'esdeveniments
 UpdateForAllLines=Actualització per a totes les línies
 OnHold=Fora de servei
-Civility=Civility
+Civility=Civilitat
 AffectTag=Afecta l'etiqueta
 ConfirmAffectTag=Afecta l'etiqueta massivament
 ConfirmAffectTagQuestion=Esteu segur que voleu afectar les etiquetes als registres seleccionats %s?
 CategTypeNotFound=No s'ha trobat cap tipus d'etiqueta per al tipus de registres
+CopiedToClipboard=Copiat al porta-retalls
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index 065ac5170eb..cbf1a27be62 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -22,7 +22,7 @@ ProductService=Producte o servei
 AllProducts=Tots els productes i serveis
 ChooseProduct/Service=Tria el producte o servei
 ForceBuyingPriceIfNull=Forçar preu de cost/compra al preu de venda si no s'ha definit
-ForceBuyingPriceIfNullDetails=Si el preu de cost/compra no està definit, i aquesta opció en "ON", el marge serà zero en la línia (preu de cost/compra = preu de venda), en cas contrari ("OFF"), marge serà igual al suggerit per defecte.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Mètode de gestió de descomptes globals
 UseDiscountAsProduct=Com un producte
 UseDiscountAsService=Com un servei
@@ -42,4 +42,4 @@ rateMustBeNumeric=El marge ha de ser un valor numèric
 markRateShouldBeLesserThan100=El marge té que ser menor que 100
 ShowMarginInfos=Mostrar info de marges
 CheckMargins=Detall de marges
-MarginPerSaleRepresentativeWarning=L'informe de marge per usuari utilitza el vincle entre tercers i representants de vendes per calcular el marge de cada representant de venda. Com que algunes terceres parts no poden tenir cap representant de vendes dedicat i alguns tercers poden estar vinculats a diversos, alguns imports podrien no incloure's en aquest informe (si no hi ha representant de venda) i alguns podrien aparèixer en diferents línies (per a cada representant de venda) .
+MarginPerSaleRepresentativeWarning=L'informe de marge per usuari utilitza l'enllaç entre tercers i representants de vendes per a calcular el marge de cada representant de venda. Com que és possible que algunes terceres parts no tinguin cap representant de venda dedicat i que hi hagi tercers que estiguin vinculats a diversos, és possible que algunes quantitats no s'incloguin a aquest informe (si no hi ha cap representant de vendes) i que algunes puguin aparèixer en línies diferents (per a cada representant de venda) .
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 7fe30fe8322..e99d8a53704 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -12,7 +12,7 @@ FundationMembers=Socis de l'entitat
 ListOfValidatedPublicMembers=Llistat de socis públics validats
 ErrorThisMemberIsNotPublic=Aquest soci no és públic
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Un altre soci (nom: <b>%s</b>, nom d'usuari: <b>%s</b>) ja està vinculat al tercer <b>%s</b>. Esborreu l'enllaç existent ja que un tercer només pot estar vinculat a un sol soci (i viceversa).
-ErrorUserPermissionAllowsToLinksToItselfOnly=Per raons de seguretat, ha de posseir els drets de modificació de tots els usuaris per poder vincular un soci a un usuari que no sigui vostè mateix.
+ErrorUserPermissionAllowsToLinksToItselfOnly=Per motius de seguretat, se us ha de concedir permisos per a editar tots els usuaris per a poder enllaçar un soci a un usuari que no és vostre.
 SetLinkToUser=Vincular a un usuari Dolibarr
 SetLinkToThirdParty=Vincular a un tercer Dolibarr
 MembersCards=Carnets de socis
@@ -21,10 +21,12 @@ MembersListToValid=Llistat de socis esborrany (per a validar)
 MembersListValid=Llistat de socis validats
 MembersListUpToDate=Llista de socis vàlids amb quotes al dia
 MembersListNotUpToDate=Llista de socis vàlids amb quotes pendents
+MembersListExcluded=List of excluded members
 MembersListResiliated=Llista de socis donats de baixa
 MembersListQualified=Llistat de socis qualificats
 MenuMembersToValidate=Socis esborrany
 MenuMembersValidated=Socis validats
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Socis donats de baixa
 MembersWithSubscriptionToReceive=Socis amb afiliació per rebre
 MembersWithSubscriptionToReceiveShort=Subscripcions per rebre
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Afiliació no al dia
 MemberStatusActiveLateShort=No al dia
 MemberStatusPaid=Afiliacions al dia
 MemberStatusPaidShort=Al dia
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Soci donat de baixa
 MemberStatusResiliatedShort=Baixa
 MembersStatusToValid=Socis esborrany
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Socis donats de baixa
 MemberStatusNoSubscription=Validat (no cal subscripció)
 MemberStatusNoSubscriptionShort=Validat
@@ -72,7 +77,7 @@ SubscriptionNotReceived=Afiliació no rebuda
 ListOfSubscriptions=Llista d'afiliacions
 SendCardByMail=Enviar una targeta per correu electrònic
 AddMember=Crea soci
-NoTypeDefinedGoToSetup=No s'ha definit cap tipus de soci. Ves al menú "Tipus de socis"
+NoTypeDefinedGoToSetup=No s'ha definit cap tipus de soci. Aneu al menú "Tipus de socis"
 NewMemberType=Tipus de soci nou
 WelcomeEMail=Correu electrònic de benvinguda
 SubscriptionRequired=Subjecte a cotització
@@ -82,6 +87,8 @@ Physical=Físic
 Moral=Moral
 MorAndPhy=Moral i físic
 Reenable=Reactivar
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Dona de baixa un soci
 ConfirmResiliateMember=Vols donar de baixa aquest soci?
 DeleteMember=Elimina un soci
@@ -91,10 +98,10 @@ ConfirmDeleteSubscription=Vols esborrar aquesta subscripció?
 Filehtpasswd=Arxiu htpasswd
 ValidateMember=Valida un soci
 ConfirmValidateMember=Vols validar aquest soci?
-FollowingLinksArePublic=Els següents enllaços són pàgines obertes que no estan protegides per cap permís Dolibarr. No tenen pàgines amb format, es proporciona com a exemple per mostrar com es llista la base de dades dels socis.
+FollowingLinksArePublic=Els següents enllaços són pàgines obertes que no estan protegides per cap permís de Dolibarr. No són pàgines amb format, són proporcionades com a exemple per a mostrar com llistar la base de dades de socis.
 PublicMemberList=Llistat públic de socis
 BlankSubscriptionForm=Formulari públic d'auto-subscripció
-BlankSubscriptionFormDesc=Dolibarr us pot proporcionar una URL/lloc web públic per permetre que els visitants externs sol·licitin subscriure's a la fundació. Si un mòdul de pagament en línia està habilitat, també es pot proporcionar automàticament un formulari de pagament.
+BlankSubscriptionFormDesc=Dolibarr us pot proporcionar una URL/lloc web públic per a permetre que els visitants externs sol·licitin subscriure's a la fundació. Si un mòdul de pagament en línia està habilitat, també es pot proporcionar automàticament un formulari de pagament.
 EnablePublicSubscriptionForm=Activa el lloc web públic amb el formulari d'auto-subscripció
 ForceMemberType=Força el tipus de soci
 ExportDataset_member_1=Socis i quotes
@@ -132,11 +139,12 @@ ThisIsContentOfSubscriptionReminderEmail=Volem informar-vos que la vostra subscr
 ThisIsContentOfYourCard=Aquest és un resum de la informació que tenim sobre vostè. Poseu-vos en contacte amb nosaltres si hi ha alguna cosa incorrecta. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assumpte del correu electrònic de notificació rebut en cas d'inscripció automàtica d'un convidat
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Contingut del correu electrònic de notificació rebut en cas d'inscripció automàtica d'un convidat
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Plantilla de correu electrònic a utilitzar per enviar correus electrònics a un membre de la subscripció automàtica de membres
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla de correu electrònic que s'utilitzarà per enviar correus electrònics a un membre en la validació dels membres
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla de correu electrònic que s'utilitzarà per enviar un correu electrònic a un membre sobre la nova gravació de la subscripció
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla de correu electrònic que s'utilitzarà per enviar un recordatori de correu electrònic quan la subscripció estigui a punt de caducar
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla de correu electrònic a utilitzar per enviar un correu electrònic a un membre en la cancel·lació de membres
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Plantilla de correu electrònic a utilitzar per a enviar un correu electrònic a un soci mitjançant la subscripció automàtica de socis
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla de correu electrònic que cal utilitzar per a enviar un correu electrònic a un soci amb la validació de socis
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla de correu electrònic que s'utilitzarà per a enviar un correu electrònic a un soci sobre la nova gravació de la subscripció
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla de correu electrònic que cal utilitzar per a enviar un recordatori de correu electrònic quan la subscripció estigui a punt de caducar
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla de correu electrònic que s'utilitzarà per a enviar un correu electrònic a un soci en la seva cancel·lació
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Correu electrònic del remitent per a correus electrònics automàtics
 DescADHERENT_ETIQUETTE_TYPE=Format pàgines etiquetes
 DescADHERENT_ETIQUETTE_TEXT=Text a imprimir a la direcció de les etiquetes de soci
@@ -162,6 +170,7 @@ DocForLabels=Generació d'etiquetes d'adreces (Format de plantilla configurat ac
 SubscriptionPayment=Pagament de quota
 LastSubscriptionDate=Data de l'últim pagament de subscripció
 LastSubscriptionAmount=Import de la subscripció més recent
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Estadístiques de socis per país
 MembersStatisticsByState=Estadístiques de socis per província
 MembersStatisticsByTown=Estadístiques de socis per població
@@ -200,7 +209,7 @@ SubscriptionRecorded=S'ha registrat la subscripció
 NoEmailSentToMember=No s'ha enviat un correu electrònic al membre
 EmailSentToMember=Correu electrònic enviat a membre a %s
 SendReminderForExpiredSubscriptionTitle=Enviar recordatori per correu electrònic per subscripció caducada
-SendReminderForExpiredSubscription=Envia un recordatori per correu electrònic als socis quan l'afiliació estigui a punt de caducar (el paràmetre és una quantitat de dies abans de la finalització de l'afiliació per enviar el recordatori. Pot ser una llista de dies separats per un punt i coma, per exemple '10;5;0;-5')
+SendReminderForExpiredSubscription=Envia un recordatori per correu electrònic als socis quan l'afiliació estigui a punt de caducar (el paràmetre és una quantitat de dies abans de la finalització de l'afiliació per a enviar el recordatori. Pot ser una llista de dies separats per un punt i coma, per exemple '10;5;0;-5')
 MembershipPaid=Membres pagats pel període actual (fins a %s)
 YouMayFindYourInvoiceInThisEmail=Podeu trobar la factura adjunta a aquest correu electrònic
 XMembersClosed=%s soci(s) tancat(s)
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 275cdac1d5d..797693fc98e 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Aquesta eina només ha de ser utilitzada per usuaris o desenvolupadors experimentats. Proporciona utilitats per crear o editar el vostre propi mòdul. La documentació per al desenvolupament manual alternatiu <a href="%s" target="_blank">és aquí</a> .
-EnterNameOfModuleDesc=Introdueix el nom del mòdul/aplicació per crear sense espais. Utilitza majúscules per separar paraules (Per exemple: MyModule, EcommerceForShop, SyncWithMySystem...)
+ModuleBuilderDesc=Aquesta eina només l’han d’utilitzar usuaris o desenvolupadors experimentats. Proporciona utilitats per a construir o editar el vostre propi mòdul. La documentació per al desenvolupament manual alternatiu <a href="%s" target="_blank"> és aquí </a>.
+EnterNameOfModuleDesc=Introduïu el nom del mòdul/aplicació per a crear sense espais. Utilitzeu majúscules per separar paraules (per exemple: MyModule, EcommerceForShop, SyncWithMySystem ...)
 EnterNameOfObjectDesc=Introduïu el nom de l'objecte que voleu crear sense espais. Utilitzeu majúscules per separar paraules (Per exemple: MyObject, Estudiant, Professor...). El fitxer de classes CRUD, però també el fitxer API, pàgines per a llistar/afegir/editar/eliminar objectes i els fitxers SQL es generaran.
 ModuleBuilderDesc2=Camí on es generen / editen els mòduls (primer directori per als mòduls externs definits en %s): <strong> %s </strong>
 ModuleBuilderDesc3=S'han trobat mòduls generats/editables: <strong>%s</strong>
@@ -14,20 +14,20 @@ FilesForObjectInitialized=S'han inicialitzat els fitxers per al objecte nou '%s'
 FilesForObjectUpdated=Fitxers de l'objecte '%s' actualitzat (fitxers .sql i fitxer .class.php)
 ModuleBuilderDescdescription=Introduïu aquí tota la informació general que descrigui el vostre mòdul.
 ModuleBuilderDescspecifications=Podeu introduir aquí una descripció detallada de les especificacions del mòdul que encara no està estructurada en altres pestanyes. Així que teniu a la vostra disposició totes les normes que es desenvolupin. També aquest contingut de text s'inclourà a la documentació generada (veure l'última pestanya). Podeu utilitzar el format de Markdown, però es recomana utilitzar el format Asciidoc (comparació entre .md i .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Definiu aquí els objectes que voleu gestionar amb el mòdul. Es crearà una classe CRUD DAO, fitxers SQL, una pàgina per llistar el registre d'objectes, per crear/editar/veure un registre i es generarà una API.
+ModuleBuilderDescobjects=Definiu aquí els objectes que voleu gestionar amb el vostre mòdul. Es generarà una classe CRUD DAO, fitxers SQL, una pàgina per a llistar el registre d'objectes, per a crear/editar/visualitzar un registre i una API.
 ModuleBuilderDescmenus=Aquesta pestanya està dedicada a definir les entrades de menú proporcionades pel teu mòdul.
 ModuleBuilderDescpermissions=Aquesta pestanya està dedicada a definir els permisos nous que voleu proporcionar amb el vostre mòdul.
 ModuleBuilderDesctriggers=Aquesta és la vista dels disparadors proporcionats pel teu mòdul. Per incloure el codi executat quan es posa en marxa un esdeveniment de negoci desencadenat, edita aquest fitxer.
 ModuleBuilderDeschooks=Aquesta pestanya està dedicada als ganxos (hooks)
-ModuleBuilderDescwidgets=Aquesta pestanya està dedicada per crear/gestionar ginys
-ModuleBuilderDescbuildpackage=Pots generar aquí un fitxer de paquet "llest per distribuir" (un fitxer .zip normalitzat) del teu mòdul i un fitxer de documentació "llest per distribuir". Només cal que facis clic al botó per crear el paquet o el fitxer de documentació.
+ModuleBuilderDescwidgets=Aquesta pestanya està dedicada a gestionar/crear ginys.
+ModuleBuilderDescbuildpackage=Aquí podeu generar un fitxer de paquet "a punt per a distribuir" (un fitxer .zip normalitzat) del vostre mòdul i un fitxer de documentació "a punt per a distribuir". Simplement feu clic al botó per a crear el paquet o el fitxer de documentació.
 EnterNameOfModuleToDeleteDesc=Podeu suprimir el vostre mòdul. AVÍS: se suprimiran tots els fitxers de codificació del mòdul (generats o creats manualment) I la documentació estructurada i la documentació.
 EnterNameOfObjectToDeleteDesc=Podeu suprimir un objecte. AVÍS: Tots els fitxers de codificació (generats o creats manualment) relacionats amb l'objecte s'eliminaran.
 DangerZone=Zona perillosa
 BuildPackage=Construeix el paquet
 BuildPackageDesc=Podeu generar un paquet zip de la vostra aplicació de manera que estigueu a punt per distribuir-lo a qualsevol Dolibarr. També podeu distribuir-lo o vendre-lo al mercat com <a href="https://www.dolistore.com">DoliStore.com</a> .
 BuildDocumentation=Construeix documentació
-ModuleIsNotActive=Aquest mòdul encara no està activat. Aneu a %s per activar-ho o feu clic aquí
+ModuleIsNotActive=Aquest mòdul encara no està activat. Aneu a %s per a publicar-lo o feu clic aquí
 ModuleIsLive=Aquest mòdul ha estat activat. Qualsevol canvi pot trencar la funció actual en viu.
 DescriptionLong=Descripció llarga
 EditorName=Nom de l'editor
@@ -36,7 +36,7 @@ DescriptorFile=Fitxer descriptor del mòdul
 ClassFile=Fitxer per a la classe CRUD DAO PHP
 ApiClassFile=Fitxer per la classe PHP API
 PageForList=Pàgina PHP per a la llista de registres
-PageForCreateEditView=Pàgina PHP per crear/editar/veure un registre
+PageForCreateEditView=Pàgina PHP per a crear/editar/visualitzar un registre
 PageForAgendaTab=Pàgina de PHP per a la pestanya d'esdeveniments
 PageForDocumentTab=Pàgina de PHP per a la pestanya de documents
 PageForNoteTab=Pàgina de PHP per a la pestanya de notes
@@ -99,7 +99,7 @@ DictionariesDefDescTooltip=Els diccionaris subministrats pel vostre mòdul/aplic
 PermissionsDefDescTooltip=Els permisos proporcionats pel vostre mòdul / aplicació es defineixen a la matriu <strong>$ this-> rights</strong> al fitxer descriptor del mòdul. Podeu editar manualment aquest fitxer o utilitzar l’editor incrustat. <br><br> Nota: un cop definits (i el mòdul reactivat), els permisos es visualitzen a la configuració de permisos per defecte %s.
 HooksDefDesc=Definiu a la propietat <b>module_parts['hooks']</b>, en el descriptor del mòdul, el context dels "hooks" que voleu gestionar (una llista de contextos es pot trobar si cerqueu '<b>initHooks</b>' (en el codi del nucli de Dolibarr. <br> Editeu el fitxer del "hook" per afegir el codi de les vostres funcions "hookables" (les quals es poden trobar cercant "<b>executeHooks</b>" en el codi del nucli de Dolibarr).
 TriggerDefDesc=Definiu en el fitxer "trigger" el codi que voleu executar per a cada esdeveniment de negoci executat.
-SeeIDsInUse=Veure IDs en ús a la vostra instal·lació
+SeeIDsInUse=Consulteu els identificadors que s’utilitzen a la instal·lació
 SeeReservedIDsRangeHere=Consultar l'interval d'identificadors reservats
 ToolkitForDevelopers=Kit d'eines per als desenvolupadors de Dolibarr
 TryToUseTheModuleBuilder=Si teniu coneixements de SQL i PHP, podeu utilitzar l'assistent de generador de mòduls natiu. <br> Activeu el mòdul <strong> %s </strong> i utilitzeu l'assistent fent clic al <span class="fa fa-bug"> </span> al menú superior dret. <br> Advertència: aquesta és una característica de desenvolupador avançada, feu <b> no </b> en el vostre lloc de producció!
@@ -131,12 +131,14 @@ IncludeRefGeneration=La referència de l’objecte s’ha de generar automàtica
 IncludeRefGenerationHelp=Marca-ho si vols incloure codi per a gestionar la generació automàtica de la referència
 IncludeDocGeneration=Vull generar alguns documents des de l'objecte
 IncludeDocGenerationHelp=Si ho marques, es generarà el codi per afegir una casella "Generar document" al registre.
-ShowOnCombobox=Mostra el valor en un combobox
+ShowOnCombobox=Mostra el valor a la llista desplegable
 KeyForTooltip=Clau per donar més informació
-CSSClass=Classe CSS
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=No editable
 ForeignKey=Clau forana
-TypeOfFieldsHelp=Tipus de camps: <br> varchar(99), double (24,8), real, text, html, datetime, timestamp, integer, integer:ClassName: relativepath/to/classfile.class.php[:1[:filter]] ('1' significa que afegim un botó + després del desplegable per crear el registre, 'filtre' pot ser 'status=1 AND fk_user=__USER_ID AND entity IN (__SHARED_ENTITIES__)' per exemple)
+TypeOfFieldsHelp=Tipus de camps: <br> varchar(99), double (24,8), real, text, html, datetime, timestamp, integer, integer:ClassName: relativepath/to/classfile.class.php[:1[:filter]] ('1' significa que afegim un botó + després del desplegable per a crear el registre, 'filtre' pot ser 'status=1 AND fk_user=__USER_ID AND entity IN (__SHARED_ENTITIES__)' per exemple)
 AsciiToHtmlConverter=Convertidor Ascii a HTML
 AsciiToPdfConverter=Convertidor Ascii a PDF
 TableNotEmptyDropCanceled=La taula no està buida. S'ha cancel·lat l'eliminació.
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index a840d554c15..0a94644b72e 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Realitzar comanda
 MakeOrder=Realitzar comanda
 SupplierOrder=Comanda de compra
 SuppliersOrders=Comandes de compra
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Comandes de compra actuals
 CustomerOrder=Comanda de vendes
 CustomersOrders=Comanda de vendes
@@ -97,7 +99,7 @@ ConfirmUnvalidateOrder=Vols restaurar la comanda <b>%s</b> a l'estat esborrany?
 ConfirmCancelOrder=Vols anul·lar aquesta comanda?
 ConfirmMakeOrder=Vols confirmar la creació d'aquesta comanda a data de <b>%s</b>?
 GenerateBill=Facturar
-ClassifyShipped=Classifica enviada
+ClassifyShipped=Classifica enviat
 DraftOrders=Esborranys de comandes
 DraftSuppliersOrders=Esborrany de comandes de compra
 OnProcessOrders=Comandes en procés
@@ -154,7 +156,7 @@ Ordered=Comandat
 OrderCreated=Les vostres comandes s'han creat
 OrderFail=S'ha produït un error durant la creació de les seves comandes
 CreateOrders=Crear comandes
-ToBillSeveralOrderSelectCustomer=Per crear una factura per nombroses comandes, faci primer clic sobre el client i després esculli "%s".
+ToBillSeveralOrderSelectCustomer=Per a crear una factura per a diverses comandes, feu clic primer al client i, a continuació, trieu "%s".
 OptionToSetOrderBilledNotEnabled=L'opció del mòdul Flux de treball, per establir la comanda com a "Facturada" automàticament quan es valida la factura, no està habilitada, de manera que haureu d'establir l'estat de les comandes a "Facturada" manualment després de generar la factura.
 IfValidateInvoiceIsNoOrderStayUnbilled=Si la validació de la factura és "No", l'ordre romandrà a l'estat "No facturat" fins que es validi la factura.
 CloseReceivedSupplierOrdersAutomatically=Tanqueu l'ordre d'estat "%s" automàticament si es reben tots els productes.
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 77a93f1499e..0003ac6205a 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Empresa amb activitats múltiples (tots els mòduls principals)
 CreatedBy=Creat per %s
 ModifiedBy=Modificat per %s
 ValidatedBy=Validat per %s
+SignedBy=Signed by %s
 ClosedBy=Tancat per %s
 CreatedById=ID d'usuari que ha creat
 ModifiedById=Id de l'usuari que ha fet l'últim canvi
@@ -181,7 +182,7 @@ AuthenticationDoesNotAllowSendNewPassword=El mode d'autenticació de Dolibarr es
 EnableGDLibraryDesc=Instal·leu o activeu la biblioteca GD a la instal·lació de PHP per a utilitzar aquesta opció.
 ProfIdShortDesc=<b>Prof Id %s </b> és una informació que depèn del país del tercer. <br>Per exemple, per al país <b>%s</b>, és el codi <b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
-StatsByNumberOfUnits=Estadístiques de suma quantitat de productes/serveis
+StatsByNumberOfUnits=Estadístiques de suma de la quantitat de productes/serveis
 StatsByNumberOfEntities=Estadístiques en nombre d'entitats referents (número de factura o ordre ...)
 NumberOfProposals=Nombre de pressupostos
 NumberOfCustomerOrders=Nombre de comandes de venda
@@ -224,7 +225,7 @@ NewLength=Amplada nova
 NewHeight=Alçada nova
 NewSizeAfterCropping=Mida nova després de retallar
 DefineNewAreaToPick=Indiqueu la zona d'imatge a conservar (Clic sobre la imatge i arrossegueu fins a la cantonada oposada)
-CurrentInformationOnImage=Aquesta eina va ser dissenyada per ajudar-vos a canviar la mida o retallar una imatge. Aquesta és la informació de la imatge editada actual
+CurrentInformationOnImage=Aquesta eina ha estat dissenyada per a ajudar-vos a redimensionar o retallar una imatge. Aquesta és la informació sobre la imatge editada actualment
 ImageEditor=Editor d'imatge
 YouReceiveMailBecauseOfNotification=Vostè està rebent aquest missatge perquè el seu correu electrònica està subscrit a algunes notificacions automàtiques per informar sobre esdeveniments especials del programa %s de %s.
 YouReceiveMailBecauseOfNotification2=L'esdeveniment en qüestió és el següent:
@@ -240,10 +241,11 @@ PleaseBePatient=Si us plau sigui pacient...
 NewPassword=Contrasenya nova
 ResetPassword=Restablir la contrasenya
 RequestToResetPasswordReceived=S'ha rebut una sol·licitud per canviar la teva contrasenya.
-NewKeyIs=Aquesta és la nova contrasenya per iniciar sessió
-NewKeyWillBe=La seva nova contrasenya per iniciar sessió en el software serà
+NewKeyIs=Aquesta és la nova contrasenya per a iniciar la sessió
+NewKeyWillBe=La contrasenya nova per a iniciar la sessió al programari serà
 ClickHereToGoTo=Clica aquí per anar a %s
 YouMustClickToChange=De totes formes, primer heu de fer clic al següent enllaç per a validar aquest canvi de contrasenya
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Si vostè no ha sol·licitat aquest canvi, simplement ignori aquest e-mail. Les seves credencials són guardades de forma segura
 IfAmountHigherThan=si l'import es major que <strong>%s</strong>
 SourcesRepository=Repositori de fonts
@@ -276,7 +278,7 @@ WEBSITE_PAGEURL=URL de pàgina
 WEBSITE_TITLE=Títol
 WEBSITE_DESCRIPTION=Descripció
 WEBSITE_IMAGE=Imatge
-WEBSITE_IMAGEDesc=Ruta relativa dels suports d’imatge. Podeu mantenir-la buida, ja que rarament es fa servir (pot ser utilitzada per contingut dinàmic per mostrar una miniatura a la llista de publicacions del bloc). Utilitzeu __WEBSITE_KEY__ a la ruta si aquesta depèn del nom del lloc web (per exemple: image/__ WEBSITE_KEY __ /stories/lamevaimatge.png).
+WEBSITE_IMAGEDesc=Ruta relativa dels suports d’imatge. Podeu mantenir-la buida, ja que rarament es fa servir (pot ser utilitzada per contingut dinàmic per a mostrar una miniatura a la llista de publicacions del bloc). Utilitzeu __WEBSITE_KEY__ a la ruta si aquesta depèn del nom del lloc web (per exemple: image/__ WEBSITE_KEY __ /stories/lamevaimatge.png).
 WEBSITE_KEYWORDS=Paraules clau
 LinesToImport=Línies per importar
 
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 798e4d56cbb..3cf6573bf26 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Utilitza el número de lot/sèrie
-ProductStatusOnBatch=Sí (es requereix un lot/sèrie)
+ProductStatusOnBatch=Sí (es requereix lot)
+ProductStatusOnSerial=Sí (es requereix un número de sèrie únic)
 ProductStatusNotOnBatch=No (lot/sèrie no utilitzat)
-ProductStatusOnBatchShort=Si
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=En sèrie
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Sèrie
 atleast1batchfield=Data de caducitat o data de venda o número de lot/sèrie
@@ -22,3 +24,12 @@ ProductLotSetup=Configuració del mòdul lot/sèries
 ShowCurrentStockOfLot=Mostra l'estoc actual de la parella producte/lot
 ShowLogOfMovementIfLot=Mostra el registre de moviments de la parella producte/lot
 StockDetailPerBatch=Detall d’estoc per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index ab089492c72..e0d958054d0 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -137,10 +137,11 @@ ProductSpecial=Especial
 QtyMin=Min. quantitat de compra
 PriceQtyMin=Preu mínim
 PriceQtyMinCurrency=Preu (moneda) per aquesta quantitat (sense descompte)
-VATRateForSupplierProduct=Preu de l'IVA (per a aquest proveïdor/product)
+VATRateForSupplierProduct=Tipus d'IVA (per a aquest venedor/producte)
 DiscountQtyMin=Descompte per aquesta quantitat.
 NoPriceDefinedForThisSupplier=Sense preu ni quantitat definida per aquest proveïdor / producte
 NoSupplierPriceDefinedForThisProduct=No hi ha cap preu / quantitat de proveïdor definit per a aquest producte
+PredefinedItem=Element predefinit
 PredefinedProductsToSell=Producte predefinit
 PredefinedServicesToSell=Servei predefinit
 PredefinedProductsAndServicesToSell=Productes/serveis predefinits per vendre
@@ -243,7 +244,7 @@ PriceByQuantity=Preus diferents per quantitat
 DisablePriceByQty=Desactivar els preus per quantitat
 PriceByQuantityRange=Rang de quantitats
 MultipriceRules=Preus automàtics per segment
-UseMultipriceRules=Utilitzeu les regles del segment de preus (definides a la configuració del mòdul de producte) per calcular automàticament els preus de tots els altres segments segons el primer segment
+UseMultipriceRules=Utilitzeu les regles del segment de preus (definides a la configuració del mòdul de producte) per a calcular automàticament els preus de la resta de segments segons el primer segment
 PercentVariationOver=%% variació sobre %s
 PercentDiscountOver=%% descompte sobre %s
 KeepEmptyForAutoCalculation=Mantingueu-lo buit per a calcular-ho automàticament a partir del pes o volum dels productes
@@ -282,7 +283,7 @@ MinimumPriceLimit=El preu mínim no pot ser inferior a %s
 MinimumRecommendedPrice=El preu mínim recomanat és: %s
 PriceExpressionEditor=Editor d'expressions de preus
 PriceExpressionSelected=Expressió de preus seleccionat
-PriceExpressionEditorHelp1="price = 2 + 2" o "2 + 2" per definir el preu. Utilitzeu ; per separar expressions
+PriceExpressionEditorHelp1="price = 2 + 2" o "2 + 2" per a definir el preu. Utilitzeu ; per a separar expressions
 PriceExpressionEditorHelp2=Pots accedir als atributs complementaris amb variables com <b>#extrafield_myextrafieldkey#</b> i variables globals amb <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=En productes/serveis i preus de proveïdor, hi ha disponibles les següents variables<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=Només en els preus de productes/serveis: <b>#supplier_min_price#</b><br>Només en els preus dels proveïdors: <b>#supplier_quantity# i #supplier_tva_tx#</b>
@@ -296,7 +297,7 @@ ComposedProduct=Productes Fills
 MinSupplierPrice=Preu mínim de compra
 MinCustomerPrice=Preu mínim de venda
 DynamicPriceConfiguration=Configuració de preu dinàmic
-DynamicPriceDesc=Podeu definir fórmules matemàtiques per calcular els preus dels clients o venedors. Aquestes fórmules poden utilitzar tots els operadors matemàtics, algunes constants i variables. Podeu definir aquí les variables que voleu utilitzar. Si la variable necessita una actualització automàtica, podeu definir l'URL extern per permetre que Dolibarr actualitzi el valor automàticament.
+DynamicPriceDesc=Podeu definir fórmules matemàtiques per a calcular els preus del client o del proveïdor. Aquestes fórmules poden utilitzar tots els operadors matemàtics, algunes constants i variables. Aquí podeu definir les variables que voleu utilitzar. Si la variable necessita una actualització automàtica, podeu definir l'URL extern per a permetre que Dolibarr actualitzi el valor automàticament.
 AddVariable=Afegeix variable
 AddUpdater=Afegeix actualitzador
 GlobalVariables=Variables globals
@@ -313,7 +314,7 @@ LastUpdated=Última actualització
 CorrectlyUpdated=Actualitzat correctament
 PropalMergePdfProductActualFile=Els fitxers que s’utilitzen per a afegir-se al PDF Azur són
 PropalMergePdfProductChooseFile=Selecciona fitxers PDF
-IncludingProductWithTag=Inclòs productes/serveis amb etiqueta
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Preu predeterminat, el preu real pot dependre del client
 WarningSelectOneDocument=Selecciona com a mínim un document
 DefaultUnitToShow=Unitat
@@ -338,8 +339,8 @@ SubProduct=Subproducte
 ProductSheet=Fulla de producte
 ServiceSheet=Fulla de servei
 PossibleValues=Valors possibles
-GoOnMenuToCreateVairants=Aneu al menú %s - %s per preparar variants d’atributs (com ara colors, mida, ...)
-UseProductFournDesc=Afegeix una funció per definir les descripcions dels productes definits pels proveïdors, a més de les descripcions pels clients
+GoOnMenuToCreateVairants=Aneu al menú %s - %s per a preparar variants d’atributs (com ara colors, mida...)
+UseProductFournDesc=Afegiu una funció per a definir les descripcions de productes definides pels proveïdors, a més de les descripcions per a clients
 ProductSupplierDescription=Descripció del venedor del producte
 UseProductSupplierPackaging=Utilitzeu els envasos als preus del proveïdor (calcular les quantitats segons els envasos fixats al preu del proveïdor quan afegiu / actualitzeu la línia dels documents del proveïdor)
 PackagingForThisProduct=Embalatge
@@ -388,7 +389,7 @@ ShowChildProducts=Mostra variants del producte
 NoEditVariants=Aneu a la targeta de producte principal i modifiqueu les variacions d'impacte de preus a la pestanya de variants
 ConfirmCloneProductCombinations=Vols copiar totes les variants del producte a l'altre producte pare amb la referència donada?
 CloneDestinationReference=Referència del producte destí
-ErrorCopyProductCombinations=S'ha produït un error al copiar les variants de producte
+ErrorCopyProductCombinations=S'ha produït un error en copiar les variants del producte
 ErrorDestinationProductNotFound=No s'ha trobat el producte de destí
 ErrorProductCombinationNotFound=Variant de producte no trobada
 ActionAvailableOnVariantProductOnly=Acció només disponible sobre la variant del producte
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index d9a8e813264..3a6db3e2b39 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -87,8 +87,9 @@ WhichIamLinkedToProject=que estic vinculat al projecte
 Time=Temps
 TimeConsumed=Consumit
 ListOfTasks=Llistat de tasques
-GoToListOfTimeConsumed=Ves al llistat de temps consumit
+GoToListOfTimeConsumed=Aneu al llistat del temps consumit
 GanttView=Vista de Gantt
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Llista de propostes comercials relacionades amb el projecte
 ListOrdersAssociatedProject=Llista de comandes de vendes relacionades amb el projecte
 ListInvoicesAssociatedProject=Llista de factures a clients relacionades amb el projecte
@@ -238,8 +239,8 @@ AllowToLinkFromOtherCompany=Permet enllaçar projectes procedents d'altres compa
 LatestProjects=Darrers %s projectes 
 LatestModifiedProjects=Darrers %s projectes modificats
 OtherFilteredTasks=Altres tasques filtrades
-NoAssignedTasks=No es troben tasques assignades (assigni el projecte/tasques a l'usuari actual des del quadre de selecció superior per especificar-ne l'hora)
-ThirdPartyRequiredToGenerateInvoice=S'ha de definir un tercer en el projecte per poder facturar-lo.
+NoAssignedTasks=No s'ha trobat cap tasca assignada (assigneu el projecte/tasques a l'usuari actual des del quadre de selecció superior per a introduir-hi l'hora)
+ThirdPartyRequiredToGenerateInvoice=Cal definir un tercer en el projecte per a poder facturar-lo.
 ChooseANotYetAssignedTask=Trieu una tasca que encara no us ha estat assignada
 # Comments trans
 AllowCommentOnTask=Permet comentaris dels usuaris a les tasques
@@ -248,7 +249,7 @@ DontHavePermissionForCloseProject=No teniu permisos per tancar el projecte %s
 DontHaveTheValidateStatus=El projecte %s ha de ser obert per tancar
 RecordsClosed=%s projecte(s) tancat(s)
 SendProjectRef=Informació del projecte %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=El mòdul "Salaris" ha d'estar habilitat per definir la tarifa horària de l'empleat perquè el temps es valori
+ModuleSalaryToDefineHourlyRateMustBeEnabled=El mòdul "Salaris" ha d'estar habilitat per a definir la tarifa horària dels empleats per tal de valorar el temps dedicat
 NewTaskRefSuggested=Tasca ref en ús, es requereix una nova tasca ref
 TimeSpentInvoiced=Temps de facturació facturat
 TimeSpentForInvoice=Temps dedicat
@@ -268,3 +269,7 @@ OneLinePerTask=Una línia per tasca
 OneLinePerPeriod=Una línia per període
 RefTaskParent=Ref. Tasca pare
 ProfitIsCalculatedWith=El benefici es calcula utilitzant
+AddPersonToTask=Afegeix també a les tasques
+UsageOrganizeEvent=Ús: organització d'esdeveniments
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classifica un projecte com a tancat quan s'hagin completat totes les seves tasques (progrés 100%%)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: els projectes existents amb totes les tasques amb un progrés del 100%% no es veuran afectats, i els haureu de tancar manualment. Així doncs, aquesta opció només afecta els projectes oberts.
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index b6b30391954..258f0378d23 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -7,8 +7,8 @@ ProposalsOpened=Pressupostos oberts
 CommercialProposal=Pressupost
 PdfCommercialProposalTitle=Pressupost
 ProposalCard=Fitxa pressupost
-NewProp=Nou pressupost
-NewPropal=Nou pressupost
+NewProp=Pressupost nou
+NewPropal=Pressupost nou
 Prospect=Client potencial
 DeleteProp=Eliminar pressupost
 ValidateProp=Validar pressupost
@@ -23,7 +23,7 @@ NoProposal=Sense pressupost
 ProposalsStatistics=Estadístiques de pressupostos
 NumberOfProposalsByMonth=Número per mes
 AmountOfProposalsByMonthHT=Import mensual (sense IVA)
-NbOfProposals=Número pressupostos
+NbOfProposals=Nombre de pressupostos
 ShowPropal=Veure pressupost
 PropalsDraft=Esborranys
 PropalsOpened=Actiu
@@ -59,6 +59,7 @@ ConfirmClonePropal=Estàs segur que vols clonar la proposta comercial <b>%s</b>?
 ConfirmReOpenProp=Esteu segur que voleu tornar a obrir el pressupost <b>%s</b>?
 ProposalsAndProposalsLines=Pressupostos a clients i línies de pressupostos
 ProposalLine=Línia de pressupost
+ProposalLines=Proposal lines
 AvailabilityPeriod=Temps de lliurament
 SetAvailability=Indica el temps de lliurament
 AfterOrder=després de la comanda
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 5de1e46400b..a21928521d2 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -19,8 +19,8 @@ Stock=Estoc
 Stocks=Estocs
 MissingStocks=Estocs que falten
 StockAtDate=Estocs en data
-StockAtDateInPast=Data passada
-StockAtDateInFuture=Data en el futur
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Estocs per lot/sèrie
 LotSerial=Lots/Sèries
 LotSerialList=Llista de lots/sèries
@@ -37,8 +37,8 @@ AllWarehouses=Tots els magatzems
 IncludeEmptyDesiredStock=Inclou també estoc negatives amb estoc desitjat no definit
 IncludeAlsoDraftOrders=Inclou també projectes d'ordre
 Location=Lloc
-LocationSummary=Nom curt del lloc
-NumberOfDifferentProducts=Nombre de productes diferents
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Nombre total de productes
 LastMovement=Últim moviment
 LastMovements=Últims moviments
@@ -51,7 +51,7 @@ TransferStock=Transferència d'estoc
 MassStockTransferShort=Transferència d'estoc massiu
 StockMovement=Moviment d'estoc
 StockMovements=Moviments d'estoc
-NumberOfUnit=Nombre de peces
+NumberOfUnit=Nombre d'unitats
 UnitPurchaseValue=Preu de compra unitari
 StockTooLow=Estoc insuficient
 StockLowerThanLimit=L'estoc és menor que el límit de l'alerta (%s)
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Valor d'estocs
 UserWarehouseAutoCreate=Crea un usuari de magatzem automàticament quan es crea un usuari
 AllowAddLimitStockByWarehouse=Gestioneu també valors mínims d'estoc desitjat per emparellament (producte-magatzem), a més de valors mínims d'estoc desitjat per producte
 RuleForWarehouse=Regles per als magatzems
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Estableix un magatzem en pressupostos
 WarehouseAskWarehouseDuringOrder=Estableix un magatzem per a les comandes de venda
 UserDefaultWarehouse=Estableix un magatzem per Usuaris
 MainDefaultWarehouse=Magatzem predeterminat
@@ -97,15 +98,16 @@ RealStockDesc=L'estoc físic o real és l'estoc que tens actualment als teus mag
 RealStockWillAutomaticallyWhen=L'estoc real es modificarà d'acord amb aquesta regla (tal com es defineix al mòdul d'accions):
 VirtualStock=Estoc virtual
 VirtualStockAtDate=Estoc virtual a la data
-VirtualStockAtDateDesc=Estoc virtual un cop totes les comandes pendents que es preveu fer abans de la data finalitzin
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=L’estoc virtual és l’estoc disponible calculat un cop tancades (comandes de compra rebudes, comandes de venda enviades, ordres de fabricació produïdes, etc.) totes les accions obertes/pendents (que afecten a les existències)
+AtDate=A la data
 IdWarehouse=Id. magatzem
 DescWareHouse=Descripció magatzem
 LieuWareHouse=Localització magatzem
 WarehousesAndProducts=Magatzems i productes
 WarehousesAndProductsBatchDetail=Magatzems i productes (amb detall per lot/sèrie)
 AverageUnitPricePMPShort=Preu mitjà ponderat
-AverageUnitPricePMPDesc=El preu unitari mitjà d’entrada que hem hagut de pagar als proveïdors per incorporar el producte al nostre estoc.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Preu de venda unitari
 EstimatedStockValueSellShort=Valor per vendre
 EstimatedStockValueSell=Valor per vendre
@@ -145,7 +147,7 @@ Replenishments=reaprovisionament
 NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del període seleccionat (< %s)
 NbOfProductAfterPeriod=Quantitat de producte %s en estoc després del període seleccionat (> %s)
 MassMovement=Moviments en massa
-SelectProductInAndOutWareHouse=Seleccioneu un magatzem d'origen i un magatzem de destí, un producte i una quantitat i feu clic a "%s". Un cop fet això per a tots els moviments necessaris, feu clic a "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Registre de transferència
 ReceivingForSameOrder=Recepcions d'aquesta comanda
 StockMovementRecorded=Moviments d'estoc registrat
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=El nivell d'estoc ha de ser suficient per afegir el
 StockMustBeEnoughForOrder=El nivell d'estoc ha de ser suficient per afegir el producte/servei a la comanda (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a la comanda sigui quina sigui la regla del canvi automàtic d'estoc)
 StockMustBeEnoughForShipment= El nivell d'estoc ha de ser suficient per afegir el producte/servei a l'enviament (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a l'enviament sigui quina sigui la regla del canvi automàtic d'estoc)
 MovementLabel=Etiqueta del moviment
-TypeMovement=Tipus de moviment
+TypeMovement=Direction of movement
 DateMovement=Data de moviment
 InventoryCode=Moviments o codi d'inventari
 IsInPackage=Contingut en producte compost
@@ -183,6 +185,7 @@ inventoryCreatePermission=Crea un inventari nou
 inventoryReadPermission=Veure inventaris
 inventoryWritePermission=Actualitza els inventaris
 inventoryValidatePermission=Valida l'inventari
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventari
 inventoryListTitle=Inventaris
 inventoryListEmpty=Cap inventari en progrés
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Es requereix estoc per a triar quin lot uti
 ForceTo=Obligar a
 AlwaysShowFullArbo=Mostra l'arbre complet de magatzems a la finestra emergent dels enllaços de magatzem (Advertència: pot disminuir el rendiment de manera espectacular)
 StockAtDatePastDesc=Aquí podeu veure l'estoc (estoc real) en una data determinada del passat
-StockAtDateFutureDesc=Aquí podeu veure l'estoc (estoc virtual) en una data determinada en el futur
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Estoc actual
 InventoryRealQtyHelp=Estableix el valor a 0 per a restablir la quantitat<br>Mantén el camp buit o elimina la línia per a mantenir-la sense canvis
-UpdateByScaning=Actualitza per escaneig
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Actualització per escaneig (codi de barres de producte)
 UpdateByScaningLot=Actualització per escaneig (codi de barres lot|sèrie)
 DisableStockChangeOfSubProduct=Desactiva el canvi d'estoc de tots els subproductes d'aquest kit durant aquest moviment.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Pengeu un fitxer i feu clic a la icona %s per seleccionar el fitxer com a fitxer d'importació d'origen ...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reobrir
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index 51901172a7b..4eb4f0ea0f5 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -1,8 +1,9 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Proveïdors
 SuppliersInvoice=Factura del proveïdor
+SupplierInvoices=Factures de proveïdor
 ShowSupplierInvoice=Mostra la factura del proveïdor
-NewSupplier=Nou proveïdor
+NewSupplier=Proveïdor nou
 History=Històric
 ListOfSuppliers=Llista de proveïdors
 ShowSupplier=Mostra el proveïdor
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 8e111a62ae9..953b40e6747 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -70,9 +70,11 @@ Deleted=Esborrat
 # Dict
 Type=Tipus
 Severity=Gravetat
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
-MailToSendTicketMessage=Per enviar un missatge de correu electrònic a partir del tiquet
+MailToSendTicketMessage=Per a enviar correus electrònics des del missatge de tiquet
 
 #
 # Admin page
@@ -91,8 +93,8 @@ TicketEmailNotificationToHelp=Enviar notificacions per correu electrònic a aque
 TicketNewEmailBodyLabel=Missatge de text enviat després de crear un bitllet
 TicketNewEmailBodyHelp=El text especificat aquí s'inserirà en el correu electrònic confirmant la creació d'un nou tiquet des de la interfície pública. La informació sobre la consulta del tiquet s'afegeix automàticament.
 TicketParamPublicInterface=Configuració de la interfície pública
-TicketsEmailMustExist=Es requereix una adreça de correu electrònic correcta per crear un tiquet
-TicketsEmailMustExistHelp=A la interfície pública, l'adreça de correu electrònic ja s'hauria d'emplenar a la base de dades per crear un nou tiquet.
+TicketsEmailMustExist=Cal crear una adreça de correu electrònic existent per a crear un tiquet
+TicketsEmailMustExistHelp=A la interfície pública, l'adreça de correu electrònic ja s'hauria d'emplenar a la base de dades per a crear un nou tiquet.
 PublicInterface=Interfície pública
 TicketUrlPublicInterfaceLabelAdmin=URL alternativa per a la interfície pública
 TicketUrlPublicInterfaceHelpAdmin=És possible definir un àlies al servidor web i, per tant, posar a disposició la interfície pública amb una altra URL (el servidor ha d'actuar com a proxy en aquest nou URL)
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Mostra el logotip del mòdul a la interfície pública
 TicketsShowModuleLogoHelp=Activeu aquesta opció per a ocultar el mòdul de logotip a les pàgines de la interfície pública
 TicketsShowCompanyLogo=Mostra el logotip de l'empresa en la interfície pública
 TicketsShowCompanyLogoHelp=Activeu aquesta opció per a ocultar el logotip de l'empresa principal a les pàgines de la interfície pública
-TicketsEmailAlsoSendToMainAddress=També envieu notificacions a l'adreça electrònica principal
-TicketsEmailAlsoSendToMainAddressHelp=Activar aquesta opció per enviar un correu electrònic a l'adreça "Correu electrònic de notificació procedent de" (consulteu la configuració a continuació)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restringir la visualització als tiquets assignats a l'usuari actual (no és efectiu per als usuaris externs, sempre estarà limitat al tercer de qui depengui)
 TicketsLimitViewAssignedOnlyHelp=Només es veuran les entrades assignades a l'usuari actual. No s'aplica a un usuari amb drets de gestió de tiquets.
 TicketsActivatePublicInterface=Activar la interfície pública
@@ -126,10 +128,10 @@ TicketNumberingModules=Mòdul de numeració de tiquets
 TicketsModelModule=Plantilles de document per a tiquets
 TicketNotifyTiersAtCreation=Notifica la creació de tercers
 TicketsDisableCustomerEmail=Desactiveu sempre els correus electrònics quan es crea un tiquet des de la interfície pública
-TicketsPublicNotificationNewMessage=Envia correus electrònics quan s'afegeixi un missatge nou
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Envia correus electrònics quan s'afegeixi un missatge nou des de la interfície pública (a l'usuari assignat o al correu electrònic de notificacions a (actualitzar) i/o al correu electrònic de notificacions)
 TicketPublicNotificationNewMessageDefaultEmail=Notificar correu electrònic cap a (actualitzar)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Envia notificacions de missatges nous per correu electrònic a aquesta adreça si el tiquet no té assignat cap usuari o l’usuari no en té cap.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -263,7 +265,7 @@ TicketNewEmailBodyInfosTrackUrl=Podeu veure el progrés del tiquet fent clic a l
 TicketNewEmailBodyInfosTrackUrlCustomer=Podeu veure el progrés del tiquet a la interfície específica fent clic al següent enllaç
 TicketEmailPleaseDoNotReplyToThisEmail=No respongueu directament a aquest correu electrònic. Utilitzeu l'enllaç per respondre des de la mateixa interfície.
 TicketPublicInfoCreateTicket=Aquest formulari us permet registrar un tiquet de suport al nostre sistema de gestió.
-TicketPublicPleaseBeAccuratelyDescribe=Descrigui amb precisió el problema. Proporcioneu la màxima informació possible per permetre que identifiquem correctament la vostra sol·licitud.
+TicketPublicPleaseBeAccuratelyDescribe=Descriviu amb precisió el problema. Proporcioneu la màxima informació possible per a permetre’ns identificar correctament la vostra sol·licitud.
 TicketPublicMsgViewLogIn=Introduïu l'identificador de traça dels tiquets (ID)
 TicketTrackId=ID de seguiment públic
 OneOfTicketTrackId=Un dels vostres ID de seguiment
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Últims tiquets modificats
 BoxLastModifiedTicketDescription=Últimes entrades modificades %s
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No hi ha tiquets modificats recentment
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 0d7ea59bf46..d6c2bba06d7 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -44,7 +44,7 @@ NewGroup=Grup nou
 CreateGroup=Crear el grup
 RemoveFromGroup=Eliminar del grup
 PasswordChangedAndSentTo=Contrasenya canviada i enviada a <b>%s</b>.
-PasswordChangeRequest=Sol·licitud per canviar la contrasenya de <b>%s</b>
+PasswordChangeRequest=Sol·licitud de canvi de contrasenya per <b> %s </b>
 PasswordChangeRequestSent=Petició de canvi de contrasenya per a <b>%s</b> enviada a <b>%s</b>.
 IfLoginExistPasswordRequestSent=Si aquest inici de sessió és un compte vàlid, s'ha enviat un correu electrònic per a restablir la contrasenya.
 IfEmailExistPasswordRequestSent=Si aquest correu electrònic és un compte vàlid, s'ha enviat un correu electrònic per a restablir la contrasenya.
@@ -71,8 +71,8 @@ InternalUser=Usuari intern
 ExportDataset_user_1=Usuaris i les seves propietats
 DomainUser=Usuari de domini
 Reactivate=Reactivar
-CreateInternalUserDesc=Aquest formulari us permet crear un usuari intern a la vostra empresa / organització. Per crear un usuari extern (client, proveïdor, etc.), utilitzeu el botó 'Crear usuari Dolibarr' de la targeta de contacte d'un tercer.
-InternalExternalDesc=Un usuari <b> intern </b> és un usuari que forma part de la vostra empresa/organització. <br> Un usuari <b> extern </b> és un client, proveïdor o un altre (La creació d’un usuari extern per a un tercer es pot fer des de la fitxa del contacte d’aquest tercer). <br> <br> En ambdós casos, els permisos defineixen privilegis d'acció a Dolibarr, també un usuari extern pot tenir un gestor de menús diferent de l'usuari intern (vegeu Inici - Configuració - Visualització)
+CreateInternalUserDesc=Aquest formulari us permet crear un usuari intern a la vostra empresa/organització. Per a crear un usuari extern (client, proveïdor, etc.), utilitzeu el botó "Crea l'usuari Dolibarr" de la fitxa de contacte d'aquest tercer.
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=El permís es concedeix ja que ho hereta d'un grup al qual pertany l'usuari.
 Inherited=Heretat
 UserWillBe=L'usuari creat serà
@@ -103,7 +103,7 @@ HierarchicalResponsible=Supervisor
 HierarchicView=Vista jeràrquica
 UseTypeFieldToChange=Modificar el camp Tipus per canviar
 OpenIDURL=URL d'OpenID
-LoginUsingOpenID=Utilitzeu OpenID per iniciar sessió
+LoginUsingOpenID=Utilitzeu OpenID per a iniciar la sessió
 WeeklyHours=Hores treballades (per setmana)
 ExpectedWorkedHours=Hores treballades setmanals esperades
 ColorUser=Color d'usuari
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 2e035ce7bf6..11cd6fe85f1 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -2,12 +2,12 @@
 Shortname=Codi
 WebsiteSetupDesc=Creeu aquí els llocs web que voleu utilitzar. A continuació, vagi a menú de llocs web per editar-los.
 DeleteWebsite=Elimina la pàgina web
-ConfirmDeleteWebsite=Esteu segur que voleu suprimir aquest lloc web? Totes les seves pàgines i contingut també se suprimiran. Els fitxers penjats (com al directori de suports, el mòdul ECM, ...) romandran.
+ConfirmDeleteWebsite=Esteu segur que voleu suprimir aquest lloc web? També se suprimiran totes les seves pàgines i contingut. Els fitxers penjats (com al directori de suports, al mòdul ECM...) es mantindran.
 WEBSITE_TYPE_CONTAINER=Tipus de pàgina/contenidor
 WEBSITE_PAGE_EXAMPLE=Pàgina web per a utilitzar com a exemple
 WEBSITE_PAGENAME=Nom/alies de pàgina
 WEBSITE_ALIASALT=Noms de pàgina alternatius / àlies
-WEBSITE_ALIASALTDesc=Utilitzeu aquí la llista d'altres noms / àlies, per la qual cosa també es pot accedir a la pàgina amb altres noms / àlies (per exemple, el nom antic després de canviar el nom de l'àlies per mantenir el vincle d'enllaç a l'antic vincle / nom de treball). La sintaxi és: <br> alternativament1, alternativament2, ...
+WEBSITE_ALIASALTDesc=Utilitzeu aquí la llista d'altres noms/àlies, per la qual cosa també es pot accedir a la pàgina amb altres noms/àlies (per exemple, el nom antic després de canviar el nom de l'àlies per a mantenir el vincle d'enllaç a l'antic vincle/nom de treball). La sintaxi és: <br> nomalternatiu1, nomalternatiu2...
 WEBSITE_CSS_URL=URL del fitxer CSS extern
 WEBSITE_CSS_INLINE=Fitxer de contingut CSS (comú a totes les pàgines)
 WEBSITE_JS_INLINE=Fitxer amb contingut Javascript (comú a totes les pàgines)
@@ -17,7 +17,7 @@ WEBSITE_HTACCESS=Fitxer .htaccess del lloc web
 WEBSITE_MANIFEST_JSON=Arxiu del lloc web manifest.json
 WEBSITE_README=Fitxer README.md
 WEBSITE_KEYWORDSDesc=Utilitza una coma per separar valors
-EnterHereLicenseInformation=Introduïu aquí dades de meta o informació de llicència per enviar un fitxer README.md. si distribuïu el vostre lloc web com a plantilla, el fitxer s’inclourà al paquet temptador.
+EnterHereLicenseInformation=Introduïu aquí metadades o informació de llicència per a fer un fitxer README.md. si distribuïu el vostre lloc web com a plantilla, el fitxer s'inclourà al paquet.
 HtmlHeaderPage=Encapçalament HTML (específic sols per aquesta pàgina)
 PageNameAliasHelp=Nom o àlies de la pàgina. <br> Aquest àlies també s'utilitza per construir un URL de SEO quan el lloc web es llanci des d'un Host Virtual d'un servidor web (com Apache, Nginx...). Utilitzeu el botó "<strong>%s</strong>" per editar aquest àlies.
 EditTheWebSiteForACommonHeader=Nota: si voleu definir un encapçalament personalitzat per a totes les pàgines, editeu el encapçalament al nivell del lloc en comptes de la pàgina/contenidor.
@@ -42,17 +42,17 @@ ViewPageInNewTab=Mostra la pàgina en una pestanya nova
 SetAsHomePage=Indica com a Pàgina principal
 RealURL=URL real
 ViewWebsiteInProduction=Mostra la pàgina web utilitzant les URLs d'inici
-SetHereVirtualHost=<u>Utilitzar amb Apache/NGinx/...</u><br>Creeu al vostre servidor web (Apache, Nginx, ...) un Virtual Host dedicat amb PHP habilitat i un directori arrel a<br><strong>%s</strong>
+SetHereVirtualHost=<u>Utilitzeu amb Apache/NGinx/...</u><br>Creeu al vostre servidor web (Apache, Nginx...) un Virtual Host dedicat amb PHP habilitat i un directori arrel a<br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Exemple a utilitzar en la configuració de d'un Virtual Host d'Apache:
 YouCanAlsoTestWithPHPS=<u> Utilitzeu-lo amb el servidor incrustat de PHP </u> <br> Al desenvolupar l'entorn, és possible que preferiu provar el lloc amb el servidor web incrustat de PHP (requereix PHP 5.5) executant<br> <strong> php -S 0.0. 0.0: 8080 -t %s </strong>
 YouCanAlsoDeployToAnotherWHP=<u>Executeu el vostre lloc web amb un altre proveïdor de hosting de Dolibarr</u> <br> Si no teniu disponible un servidor web com Apache o NGinx a Internet, podeu exportar i importar el vostre lloc web a una altra instància de Dolibarr proporcionada per un altre proveïdor d'allotjament de Dolibarr que ofereixi una integració completa amb el mòdul del lloc web. Podeu trobar una llista d'alguns proveïdors d'allotjament Dolibarr a <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Comproveu també que l'amfitrió virtual té permisos <strong> %s </strong> en fitxers a <strong> %s </strong>
+CheckVirtualHostPerms=Comproveu també que l'usuari del VIRTUAL HOST (per exemple www-data) té permisos <strong>%s</strong> sobre els fitxers a <br><strong>%s</strong>
 ReadPerm=Llegit
 WritePerm=Escriu
 TestDeployOnWeb=Prova / implantació a la web
 PreviewSiteServedByWebServer=<LI>Vista prèvia %s en una nova pestanya.</LI><br><br>El %s serà servit per un servidor web extern (com ara Apache, Nginx, IIS). Heu d'instal·lar i configurar aquest servidor abans d'apuntar al directori:<br><strong>%s</strong><br> URL servit per un servidor extern:<br><strong>%s</strong><br>
-PreviewSiteServedByDolibarr=<u> Previsualitza %s en una nova pestanya. </u><br> <br> El %s serà servit pel servidor Dolibarr així que no cal instal·lar cap servidor web addicional (com ara Apache, Nginx, IIS).<br>L'inconvenient és que l'URL de les pàgines no són amigables i comencen per la ruta del vostre Dolibarr. <br>URL servit per Dolibarr:<br><strong> %s </strong> <br> <br> Per a utilitzar el vostre propi servidor web extern per a servir a aquest lloc web, creeu un amfitrió virtual al vostre servidor web que apunti al directori<br><strong> %s </strong><br>, llavors introduïu el nom d'aquest servidor virtual i feu clic a l'altre botó de vista prèvia.
-VirtualHostUrlNotDefined=No s'ha definit la URL de l'amfitrió virtual que serveix el servidor web extern
+PreviewSiteServedByDolibarr=<u> Previsualitza %s en una nova pestanya. </u><br> <br> El %s serà servit pel servidor Dolibarr així que no cal instal·lar cap servidor web addicional (com ara Apache, Nginx, IIS).<br>L'inconvenient és que l'URL de les pàgines no són amigables i comencen per la ruta del vostre Dolibarr. <br>URL servit per Dolibarr:<br><strong> %s </strong> <br> <br> Per a utilitzar el vostre propi servidor web extern per a servir aquest lloc web, creeu un VIRTUALHOST al vostre servidor web que apunti al directori<br><strong> %s </strong><br>, llavors introduïu el nom d'aquest servidor virtual i feu clic a l'enllaç "Provar/Desplegar a la web".
+VirtualHostUrlNotDefined=No s'ha definit l'URL de l'amfitrió virtual servit per un servidor web extern
 NoPageYet=Encara sense pàgines
 YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una plantilla completa del lloc web
 SyntaxHelp=Ajuda sobre consells de sintaxi específics
@@ -105,7 +105,7 @@ InternalURLOfPage=URL interna de la pàgina
 ThisPageIsTranslationOf=Aquesta pàgina/contenidor és una traducció de
 ThisPageHasTranslationPages=Aquesta pàgina/contenidor té traducció
 NoWebSiteCreateOneFirst=Encara no s'ha creat cap lloc web. Creeu-ne un primer.
-GoTo=Ves a
+GoTo=Aneu a
 DynamicPHPCodeContainsAForbiddenInstruction=Afegiu un codi PHP dinàmic que conté la instrucció PHP ' <strong>%s</strong> ' prohibida per defecte com a contingut dinàmic (vegeu les opcions ocultes WEBSITE_PHP_ALLOW_xxx per augmentar la llista d’ordres permeses).
 NotAllowedToAddDynamicContent=No teniu permís per afegir o editar contingut dinàmic de PHP als llocs web. Demana permís o simplement guarda el codi en etiquetes php sense modificar.
 ReplaceWebsiteContent=Cerqueu o substitueixi el contingut del lloc web
@@ -137,3 +137,11 @@ PagesRegenerated=%s pàgina (es) / contenidor (s) regenerada
 RegenerateWebsiteContent=Regenera els fitxers de memòria cau del lloc web
 AllowedInFrames=Es permet en marcs
 DefineListOfAltLanguagesInWebsiteProperties=Definiu la llista de tots els idiomes disponibles a les propietats del lloc web.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/ca_ES/zapier.lang b/htdocs/langs/ca_ES/zapier.lang
index 4918d3bcb0f..339b5833153 100644
--- a/htdocs/langs/ca_ES/zapier.lang
+++ b/htdocs/langs/ca_ES/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier per a Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Mòdul Zapier per a Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Configuració de Zapier per a Dolibarr
-ZapierDescription=Interface with Zapier
+ZapierForDolibarrSetup=Configuració de Zapier per a Dolibarr
+ZapierDescription=Interfície amb Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 93353881a95..6a8932a1eb4 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Prověřené řádky faktury
 ExpenseReportLines=Řádky výkazů výdajů navázat
 ExpenseReportLinesDone=Vázané linie vyúčtování výdajů
 IntoAccount=Prověřit řádky v účetním účtu
-TotalForAccount=Celkem za účetní účet
+TotalForAccount=Total accounting account
 
 
 Ventilate=Prověřit
@@ -209,7 +209,7 @@ Codejournal=Deník
 JournalLabel=Označení časopisu
 NumPiece=počet kusů
 TransactionNumShort=Num. transakce
-AccountingCategory=Personalizované skupiny
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Zde můžete definovat některé skupiny účetních účtů. Budou se používat pro personalizované účetní výkazy.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Řádky, které ještě nejsou vázány, použijte na
 
 ## Import
 ImportAccountingEntries=Účetní zápisy
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Datum exportu
 WarningReportNotReliable=Upozornění: Tento přehled není založen na záznamníku, takže neobsahuje transakci upravenou ručně v Knihovně. Je-li vaše deník aktuální, zobrazení účetnictví je přesnější.
 ExpenseReportJournal=Účet výkazů výdajů
 InventoryJournal=Inventářový věstník
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index e272aa6e780..8a372311140 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Odstranit zámek spojení
 YourSession=Vaše relace
 Sessions=Uživatelské relace
 WebUserGroup=Web server uživatel / skupina
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Nastavení Vašeho PHP Vám neumožňuje výpis aktivních relací. Složka sloužící k uložení relací <b>(%s)</b> může být chráněna (např. nastavením oprávnění OS nebo PHP open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Poznámka: Ano má efekt pouze tehdy, pokud je aktivní modul <b
 RemoveLock=Odebrat / přejmenovat soubor <b> %s </b>, pokud existuje, povolit použití nástroje Update / Install.
 RestoreLock=Obnovte soubor <b>%s,</b> pouze s opravněním ke čtení, chcete-li zakázat jakékoliv použití aktualizačního nástroje.
 SecuritySetup=Bezpečnostní nastavení
+PHPSetup=PHP setup
 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šší
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Tato oblast poskytuje uživatelských funkcí. Pomocí nabí
 Purge=Očistit
 PurgeAreaDesc=Tato stránka umožňuje odstranit všechny soubory generované nebo uložené v Dolibarr (dočasné soubory nebo všechny soubory v adresáři <b> %s </b>). Použití této funkce není obvykle nutné. Je poskytována jako řešení pro uživatele, jejichž Dolibarr hostuje poskytovatel, který nenabízí oprávnění k odstranění souborů generovaných webovým serverem.
 PurgeDeleteLogFile=Odstranit soubory protokolu, včetně <b> %s </b> definované pro modul Syslog (bez rizika ztráty dat)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Odstranit všechny soubory v adresáři: <b> %s </b>. <br> Tímto odstraníte všechny generované dokumenty související s prvky (subjekty, faktury atd.), Soubory nahrané do modulu ECM, zálohování databází a dočasné soubory.
 PurgeRunNow=Vyčistit nyní
@@ -232,6 +234,7 @@ BoxesAvailable=widgety k dispozici
 BoxesActivated=Widgety aktivovány
 ActivateOn=Aktivace na
 ActiveOn=Aktivováno
+ActivatableOn=Activatable on
 SourceFile=Zdrojový soubor
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostupné pouze v případě, že není zakázán JavaScript
 Required=Potřebný
@@ -347,9 +350,10 @@ LastActivationAuthor=Poslední aktivátor autorizace
 LastActivationIP=Nejnovější IP aktivace
 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> 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>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Všechny ostatní znaky v masce zůstanou nedotčeny. <br> Mezery nejsou povoleny. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a= <u> Příklad na 99. %s subjektu Společnost s datem 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u>Příklad třetí osoby vytvořené 03.01.2007:</u> <br>
 GenericMaskCodes4c=<u>Příklad produktu vytvořeným 03.01.2007:</u> <br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Pokud ponecháte toto pole prázdné, znamená to, 
 ExtrafieldParamHelpselect=Seznam hodnot musí být řádky s formátovým klíčem, hodnota (kde klíč nemůže být '0') <br> <br> například: <br> 1, value1 <br> 2, value2 <br> code3, value3 <br> ... <br> <br> seznam 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, hodnota1 | <i> parent_list_code </i>: parent_key <br> 2, hodnota2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Seznam hodnot musí být řádky s formátovým klíčem, hodnota (kde klíč nemůže být '0') <br> <br> například: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Seznam hodnot musí být řádky s formátovým klíčem, hodnota (kde klíč nemůže být '0') <br> <br> například: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Seznam hodnot pochází z tabulky <br> Syntaxe: table_name: label_field: id_field :: filter <br> Příklad: c_typent: libelle: id :: filter <br> <br> filtr může být jednoduchý test (např. Aktivní = 1) pro zobrazení pouze aktivní hodnoty <br> You může také použít $ ID $ ve filtru, který je aktuální id aktuálního objektu <br> Chcete-li provést SELECT ve filtru, použijte $ SEL $ <br>, pokud chcete filtrovat na extrafields použijte syntaxi extra.fieldcode = ... (kde kód pole je code of extrafield) <br> <br> Aby byl seznam v závislosti na jiném seznamu doplňkových atributů: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Aby byl seznam v závislosti na jiném seznamu: <br> c_typent: libelle: id: <i> parent_list_code </i> | nadřazený sloupec: filtr
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Ponechte prázdné pro jednoduchý oddělovač <br> Tuto hodnotu nastavíte na 1 pro odlučovač (výchozí nastavení je otevřeno pro novou relaci, poté je stav zachován pro každou uživatelskou relaci) <br>Nastavte tuto položku na 2 pro sbalující se oddělovač. (ve výchozím nastavení sbaleno pro novou relaci, pak je stav udržován pro každou relaci uživatele)
 LibraryToBuildPDF=Knihovna používaná pro generování PDF
@@ -541,6 +545,8 @@ Module40Name=Dodavatelé
 Module40Desc=Prodejci a řízení nákupu (objednávky a fakturace dodavatelských faktur)
 Module42Name=Ladicí protokoly
 Module42Desc=Zařízení pro protokolování (soubor, syslog, ...). Takové protokoly jsou určeny pro technické účely / ladění.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Redakce
 Module49Desc=Editor pro správu
 Module50Name=Produkty
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverze možnosti
 Module3200Name=Nezměnitelné archivy
 Module3200Desc=Povolení nezměnitelného protokolu obchodních událostí. Události jsou archivovány v reálném čase. Protokol je tabulka řetězových událostí jen pro čtení, která lze exportovat. Tento modul může být pro některé země povinný.
+Module3400Name=Sociální sítě
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Řízení lidských zdrojů (řízení oddělení, pracovní smlouvy a pocity)
 Module5000Name=Multi-společnost
 Module5000Desc=Umožňuje spravovat více společností
-Module6000Name=Workflow
-Module6000Desc=Správa pracovních postupů (automatické vytvoření objektu a / nebo automatické změny stavu)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Webové stránky
 Module10000Desc=Vytvořte webové stránky (veřejné) pomocí editoru WYSIWYG. Toto je CMS pro webmastery nebo vývojáře (je lepší znát jazyk HTML a CSS). Stačí nastavit svůj webový server (Apache, Nginx, ...) tak, aby ukazoval na vyhrazený adresář Dolibarr, aby byl online na internetu s vaším vlastním názvem domény.
 Module20000Name=Opustit správu žádostí
@@ -805,7 +813,8 @@ PermissionAdvanced253=Vytvářejte/upravujte interní/externí uživatele a opr
 Permission254=Vytvářejte/upravujte pouze externí uživatele
 Permission255=Upravit heslo ostatních uživatelů
 Permission256=Odstraňte nebo deaktivujte ostatní uživatele
-Permission262=Rozšiřte přístup ke všem subjektům (nejen subjektům, pro které je tento uživatel prodejním zástupcem). <br> Neúčinné pro externí uživatele (vždy se omezují na návrhy, objednávky, faktury, smlouvy atd.). <br> Není efektivní pro projekty (pouze pravidla týkající se projektových oprávnění, viditelnosti a přiřazení záležitostí).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Přečtěte CA
 Permission272=Přečtěte si faktury
 Permission273=Vydání faktury
@@ -1175,7 +1184,8 @@ SetupDescription2=Následující dvě části jsou povinné (první dvě položk
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Základní parametry používané k přizpůsobení výchozího chování aplikace. (například pro funkce související se zemí)
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Tento software je sada mnoha modulů / aplikací. Moduly související s vašimi potřebami musí být povoleny a nakonfigurovány. Po aktivaci těchto modulů se zobrazí položky nabídky.
 SetupDescription5=Ostatní položky nabídky nastavení řídí volitelné parametry.
-LogEvents=Události bezpečnostního auditu
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=o Dolibarr
 InfoBrowser=O prohlížeči
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Spuštění procesu upgradu se zdá být poža
 YouMustRunCommandFromCommandLineAfterLoginToUser=Tento příkaz musíte spustit z příkazového řádku po přihlášení do shellu s uživatelem <b> %s </b> nebo musíte přidat add-W na konci příkazového řádku pro zadání <b> %s </b> hesla.
 YourPHPDoesNotHaveSSLSupport=SSL funkce není k dispozici ve vašem PHP
 DownloadMoreSkins=Další skiny ke stažení
-SimpleNumRefModelDesc=Vrací referenční číslo s formátem %syymm-nnnn, kde yy je rok, mm je měsíc a nnnn je sekvenční bez resetování
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Zobrazit profesionální id s adresami
 ShowVATIntaInAddress=Skrýt číslo DPH uvnitř Společenství s adresami
 TranslationUncomplete=Částečný překlad
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Jméno / adresa
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Přihlášení / Uživatel
 MAIN_PROXY_PASS=Proxy server: Heslo
-DefineHereComplementaryAttributes=Definujte zde všechny další / vlastní atributy, které chcete zahrnout pro: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Doplňkové atributy
 ExtraFieldsLines=Doplňkové atributy (linky)
 ExtraFieldsLinesRec=Doplňkové atributy (řádky faktur šablon)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Přihlášení (unix)
 LDAPFieldLoginExample=Příklad: uid
 LDAPFilterConnection=Vyhledávací filtr
 LDAPFilterConnectionExample=Příklad: & (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Přihlášení (samba, activedirectory)
 LDAPFieldLoginSambaExample=Příklad: samaccountname
 LDAPFieldFullname=Celé jméno
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Vaše společnost byla definována tak, aby nepoužíva
 AccountancyCode=Účetní kód
 AccountancyCodeSell=Prodej účtu. kód
 AccountancyCodeBuy=Nákup účet. kód
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Události a nastavení modulu agendy
 PasswordTogetVCalExport=Klíč pro autorizaci exportního odkazu
+SecurityKey = Security Key
 PastDelayVCalExport=Neexportovat události starší než
 AGENDA_USE_EVENT_TYPE=Používejte typy událostí (spravované v menu Nastavení -> Slovníky -> Typ událostí agendy)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automaticky nastavte tuto výchozí hodnotu pro typ události ve formuláři pro tvorbu událostí
@@ -1879,7 +1892,7 @@ 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řidaných do počítadel 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ů.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Zadejte 0 nebo 1
 UnicodeCurrency=Zde zadejte mezi zarážkami, seznam čísel bytu, který představuje symbol měny. Například: pro $, zadejte [36] - pro Brazílii skutečné R $ [82,36] - za €, zadejte [8364]
 ColorFormat=RGB barva je ve formátu HEX, např. FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Dolní okraj v PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Pro tento modul není požadováno žádné zvláštní nastavení.
 SetToYesIfGroupIsComputationOfOtherGroups=Pokud je tato skupina výpočtem jiných skupin, nastavte to na ano
-EnterCalculationRuleIfPreviousFieldIsYes=Zadejte pravidlo výpočtu, pokud bylo předchozí pole nastaveno na Ano (Například 'CODEGRP1 + CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Bylo nalezeno několik jazykových variant
 RemoveSpecialChars=Odstraňte speciální znaky
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtr Regex pro vyčištění hodnoty (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Nastavení modulu Sociální sítě
 EnableFeatureFor=Povolit funkce pro <strong> %s </strong>
 VATIsUsedIsOff=Poznámka: Možnost použít daň z prodeje nebo DPH byla nastavena na hodnotu <strong> Vypnuto </strong> v nabídce %s - %s, takže daň z prodeje nebo Vat bude vždy 0 pro prodej.
 SwapSenderAndRecipientOnPDF=Zaměnit pozici odesílatele a příjemce na dokumentech PDF
-FeatureSupportedOnTextFieldsOnly=Upozornění, funkce je podporována pouze v textových polích. Také musí být nastaven parametr URL akce = create nebo action = editace NEBO název stránky musí skončit s 'new.php' pro spuštění této funkce.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Sběratel e-mailu
 EmailCollectorDescription=Přidejte plánovanou úlohu a stránku s nastavením pro pravidelné skenování poštovních schránek (pomocí protokolu IMAP) a zaznamenávejte e-maily přijaté do vaší aplikace na správném místě a / nebo vytvořte automaticky nějaké záznamy (například potenciální zákazníci).
 NewEmailCollector=Nový e-mailový sběratel
@@ -2049,8 +2062,11 @@ UseDebugBar=Použijte ladicí lištu
 DEBUGBAR_LOGS_LINES_NUMBER=Počet posledních řádků protokolu, které se mají uchovávat v konzole
 WarningValueHigherSlowsDramaticalyOutput=Varování, vyšší hodnoty dramaticky zpomalují výstup
 ModuleActivated=Je aktivován modul %s a zpomaluje rozhraní
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Exportní modely jsou sdílené s každým
 ExportSetup=Nastavení modulu Export
 ImportSetup=Nastavení modulu Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Vytvořte anonymní Ping '+1' k nadačnímu serveru Dolibarr (
 FeatureNotAvailableWithReceptionModule=Funkce není k dispozici, pokud je povolen příjem modulu
 EmailTemplate=Šablona pro e-mail
 EMailsWillHaveMessageID=E-maily budou mít značku 'Reference' odpovídající této syntaxi
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Pokud chcete mít ve svém PDF duplikované texty ve 2 různých jazycích ve stejném generovaném PDF, musíte zde nastavit tento druhý jazyk, takže vygenerovaný PDF bude obsahovat 2 různé jazyky na stejné stránce, jeden vybraný při generování PDF a tento ( Podporuje to jen několik šablon PDF). Uchovávejte prázdné po dobu 1 jazyka na PDF.
 FafaIconSocialNetworksDesc=Sem zadejte kód ikony FontAwesome. Pokud nevíte, co je FontAwesome, můžete použít obecnou hodnotu fa-address-book.
 FeatureNotAvailableWithReceptionModule=Funkce není k dispozici, pokud je povolen příjem modulu
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Druh produktu
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 2a7b3acfdfa..eae8122c9eb 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Váš mandát SEPA
 FindYourSEPAMandate=Toto je vaše mandát SEPA, který autorizuje naši společnost, aby inkasovala inkasní příkaz k vaší bance. Vraťte jej podepsanou (skenování podepsaného dokumentu) nebo pošlete jej poštou
 AutoReportLastAccountStatement=Automaticky vyplňte pole "číslo bankovního výpisu" s posledním číslem výpisu při odsouhlasení
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Zbarvujte pohyby
 BankColorizeMovementDesc=Pokud je tato funkce povolena, můžete vybrat konkrétní barvu pozadí pro pohyby debetů nebo kreditů
 BankColorizeMovementName1=Barva pozadí pro debetní pohyb
 BankColorizeMovementName2=Barva pozadí pro pohyb úvěru
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 75b7c51af59..55a14d2395a 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -52,11 +52,12 @@ Invoices=Faktury
 InvoiceLine=Fakturační řádek
 InvoiceCustomer=Faktura zákazníka
 CustomerInvoice=Faktura zákazníka
-CustomersInvoices=Faktury zákazníků
+CustomersInvoices=faktury zákazníků
 SupplierInvoice=Faktura dodavatele
-SuppliersInvoices=Faktury dodavatelů
+SuppliersInvoices=Faktury dodavatele
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Faktura dodavatele
-SupplierBills=Faktury dodavatelů
+SupplierBills=Faktury dodavatele
 Payment=Platba
 PaymentBack=Vrácení
 CustomerInvoicePaymentBack=Vrácení
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Provedené platby
 PaymentsBackAlreadyDone=Vrácení peněz již bylo provedeno
 PaymentRule=Pravidlo platby
 PaymentMode=Způsob platby
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debetní / kreditní karty
 PaymentTypePP=PayPal
 IdPaymentMode=Typ platby (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Datum poslední generace
 DateLastGenerationShort=Datum poslední gen.
 MaxPeriodNumber=Max. počet faktur
 NbOfGenerationDone=Počet již generovaných faktur
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Počet provedených generací
 MaxGenerationReached=Maximální počet generací dosáhl
 InvoiceAutoValidate=Ověřovat faktury automaticky
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Do 14 dnů po skončení měsíce,
 FixAmount=Fixní částka - 1 řádek s označením „%s“
 VarAmount=Variabilní částka (%% celk.)
 VarAmountOneLine=Proměnná částka (%% tot.) - 1 řádek se štítkem '%s'
-VarAmountAllLines=Proměnná částka (%% celkem) - všechny stejné řádky
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bankovní převod
 PaymentTypeShortVIR=Bankovní převod
@@ -494,12 +498,16 @@ Cash=Hotovost
 Reported=Zpožděný
 DisabledBecausePayments=Není možné, protože existují určité platby
 CantRemovePaymentWithOneInvoicePaid=Nelze odstranit platbu protože je k dispozici alespoň jedna faktura označená jako zaplacená
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Očekávaná platba
 CantRemoveConciliatedPayment=Platbu smířenou platbu nelze odstranit
 PayedByThisPayment=Uhrazeno touto platbou
 ClosePaidInvoicesAutomatically=Pokud je platba provedena úplně, automaticky klasifikujte všechny standardní, zálohy nebo náhradní faktury jako „placené“.
 ClosePaidCreditNotesAutomatically=Po úplném vrácení peněz automaticky klasifikujte všechny dobropisy jako „zaplacené“.
 ClosePaidContributionsAutomatically=Pokud je platba provedena úplně, automaticky klasifikujte všechny sociální nebo fiskální příspěvky jako „placené“.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Všechny faktury bez zbývající částky budou automaticky uzavřeny se stavem "Placené".
 ToMakePayment=Zaplatit
 ToMakePaymentBack=Vrátit
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Musíte nejprve vytvořit standardní fakt
 PDFCrabeDescription=Šablona faktury PDF Crabe. Kompletní šablona faktury (stará implementace Sponge šablony)
 PDFSpongeDescription=Faktura Šablona PDF Sponge. Kompletní šablona faktury
 PDFCrevetteDescription=Faktura PDF šablony Crevette. Kompletní fakturu šablona pro situace faktur
-TerreNumRefModelDesc1=Vrátí číslo ve formátu %s yymm-nnnn pro standardní faktury a %s yymm-nnnn pro dobropisy, kde yy je rok, mm je měsíc a nnnn je sekvence bez přerušení a bez návratu k 0
-MarsNumRefModelDesc1=Vrátí číslo s formát %syymm-nnnn pro standardní faktury, %syymm-nnnn náhradních faktur, %syymm-nnnn pro akontace faktur a %syymm-nnnn pro dobropisy, kde yy je rok, MM měsíc a nnnn je sekvence bez přestávky a ne vrátí do polohy 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Účet počínaje $syymm již existuje a není kompatibilní s tímto modelem sekvence. Vyjměte ji nebo přejmenujte jej aktivací tohoto modulu.
-CactusNumRefModelDesc1=Vrátí číslo s formát %syymm-nnnn pro standardní faktury, %syymm-nnnn pro dobropisy a %syymm-nnnn pro akontace faktur, kde yy je rok, mm je měsíc a nnnn je sekvence bez přestávky, a ne návrat k 0 ° C
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Důvod předčasného uzavření
 EarlyClosingComment=Předčasná závěrečná poznámka
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Kontakt prodejce služby
 InvoiceFirstSituationAsk=Faktura první situace
 InvoiceFirstSituationDesc=<b>Situace faktury</b> jsou vázány na situace do progrese, například průběh stavby. Každá situace je vázána k faktuře.
 InvoiceSituation=Situace faktury
+PDFInvoiceSituation=Situace faktury
 InvoiceSituationAsk=Faktura v návaznosti na situaci
 InvoiceSituationDesc=Vytvořit novou situaci v návaznosti na již existující
 SituationAmount=Situační fakturační částka (čistá)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Pokud potřebujete takové faktury generovat a
 DeleteRepeatableInvoice=Odstranit šablonu faktury
 ConfirmDeleteRepeatableInvoice=Jsou vaše jisti, že chcete smazat šablonu faktury?
 CreateOneBillByThird=Vytvořte jednu fakturu za subjekt (jinak, jedna faktura na objednávku)
-BillCreated=%s bill (y) vytvořený
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Stav vytváření dokumentů
 DoNotGenerateDoc=Nevytvářejte soubor dokumentu
 AutogenerateDoc=Automatické generování souboru dokumentu
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Faktura dodavatele byla smazána
 UnitPriceXQtyLessDiscount=Jednotková cena x Množství - Sleva
 CustomersInvoicesArea=Fakturační oblast zákazníka
 SupplierInvoicesArea=Fakturační oblast dodavatele
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang
index e6624e679e4..62df479df3d 100644
--- a/htdocs/langs/cs_CZ/boxes.lang
+++ b/htdocs/langs/cs_CZ/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Informace o přihlášení
 BoxLastRssInfos=Informace RSS
 BoxLastProducts=Posledních %s produktů / služeb
@@ -17,9 +18,13 @@ BoxLastActions=Poslední akce
 BoxLastContracts=Nejnovější smlouvy
 BoxLastContacts=Poslední kontakty/adresy
 BoxLastMembers=Nejnovější členové
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Nejnovější intervence
 BoxCurrentAccounts=Zůstatek otevřených účtů
 BoxTitleMemberNextBirthdays=Narozeniny tohoto měsíce (členové)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Nejnovější %s zprávy z %s
 BoxTitleLastProducts=Poslední %s modifikované produkty/služby
 BoxTitleProductsAlertStock=Produkty: upozornění skladu
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Nejnovější %s zásilky zákazníků
 NoRecordedShipments=Žádná zaznamenaná zásilka zákazníka
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Účetnictví
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
index fc7d27f5efa..f2da2c07ab7 100644
--- a/htdocs/langs/cs_CZ/categories.lang
+++ b/htdocs/langs/cs_CZ/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Oblast značek/kategorií prodejců
 CustomersCategoriesArea=Oblast zákaznické tagy/kategorie
 MembersCategoriesArea=Oblast uživatelské tagy/kategorie
 ContactsCategoriesArea=Oblast tagy/kategorie kontakty
-AccountsCategoriesArea=Značky/kategorie účtů
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Oblast projektů značek/kategorií
 UsersCategoriesArea=Kategorie značek/kategorií uživatelů
 SubCats=Podkategorie
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Zobrazit tag/kategorii
 ByDefaultInList=Ve výchozím nastavení je v seznamu
 ChooseCategory=Vyberte kategorii
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Použití nebo operátor pro kategorie
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 7f16ddead5c..995c7c7d9df 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -43,9 +43,10 @@ Individual=Soukromá osoba
 ToCreateContactWithSameName=Automaticky vytvoří kontakt / adresu se stejnými informacemi jako subjekt v rámci subjektu. Ve většině případů, i když váš subjekt je fyzická osoba, stačí vytvořit subjekt samostatně.
 ParentCompany=Mateřská společnost
 Subsidiaries=Dceřiné společnosti
-ReportByMonth=Zpráva měsíce
-ReportByCustomers=Zpráva od zákazníka
-ReportByQuarter=Nahlásit podle kurzu
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Etický kodex
 RegisteredOffice=Sídlo společnosti
 Lastname=Příjmení
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Číslo sociálního pojištění)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate číslo)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registrační číslo
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Obchodní povolení)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=ID Id 1 (CUI)
 ProfId2RO=Id Id 2 (č. Matikulare)
 ProfId3RO=ID Id 3 (CAEN)
 ProfId4RO=Prof ID 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Momentální nezaplacený účet
 OutstandingBill=Max. za nezaplacený účet
 OutstandingBillReached=Max. pro dosažení vynikajícího účtu
 OrderMinAmount=Minimální částka pro objednávku
-MonkeyNumRefModelDesc=Vrátí číslo ve formátu %syymm-nnnn pro kód zákazníka a %syymm-nnnn pro kód dodavatele kde yy je rok, mm měsíc a nnnn je číselná řada bez přerušení a bez návratu k 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Kód je volný. Tento kód lze kdykoli změnit.
 ManagingDirectors=Jméno vedoucího (CEO, ředitel, předseda ...)
 MergeOriginThirdparty=Duplicitní subjekt (subjekt, který chcete smazat)
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index b725f1ab696..03c7be0a85e 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=Nákupy SGST
 VATCollected=Vybraná DPH
 StatusToPay=Zaplatit
 SpecialExpensesArea=Oblast pro všechny speciální platby
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Sociální nebo daňová daň
 SocialContributions=Sociální nebo daně za
 SocialContributionsDeductibles=Odečitatelné sociální či daně za
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Platba zákaznické faktury
 PaymentSupplierInvoice=Platba dodavatelské faktury
 PaymentSocialContribution=Sociální / fiskální placení daní
 PaymentVat=Platba DPH
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Seznam plateb
 ListOfCustomerPayments=Seznam zákaznických plateb
 ListOfSupplierPayments=Seznam plateb dodavatelům
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF platba
 LT2PaymentsES=IRPF Platby
 VATPayment=Platba daně z obratu
 VATPayments=Platby daně z obratu
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Vrácení daně z obratu
 NewVATPayment=Nová platba daně z obratu
 NewLocalTaxPayment=Nová daňová %s platba
@@ -134,9 +138,17 @@ NoWaitingChecks=Žádný šek nečeká na vklad
 DateChequeReceived=Zkontrolujte datum příjmu
 NbOfCheques=Počet kontrol
 PaySocialContribution=Platit sociální / fiskální daň
-ConfirmPaySocialContribution=Opravdu chcete tuto sociální nebo daňovou daň klasifikovat jako zaplacenou?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Odstranit sociální a fiskální platbu daně
-ConfirmDeleteSocialContribution=Opravdu chcete vymazat tuto sociální / daňovou daň?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=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>
@@ -163,6 +175,7 @@ RulesResultInOut=- To zahrnuje skutečné platby na fakturách, nákladů, DPH a
 RulesCADue=- Zahrnuje splatné faktury zákazníka, ať už jsou zaplaceny, nebo ne. <br> - Je založeno na fakturačním datu těchto faktur. <br>
 RulesCAIn=- Zahrnuje všechny efektivní platby faktur obdržených od zákazníků. <br> - Je založeno na datu splatnosti těchto faktur <br>
 RulesCATotalSaleJournal=Zahrnuje všechny úvěrové linky z žurnálu Prodej.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Zahrnuje záznam ve vašem účtu Ledger s účetními účty, které mají skupinu "EXPENSE" nebo "INCOME"
 RulesResultBookkeepingPredefined=Zahrnuje záznam ve vašem účtu Ledger s účetními účty, které mají skupinu "EXPENSE" nebo "INCOME"
 RulesResultBookkeepingPersonalized=Zobrazuje záznam ve vašem účtu s účetními účty <b> seskupenými podle personalizovaných skupin </b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Zpráva o dani z prodeje subjekty
 VATReportByCustomers=Zpráva o dani z prodeje zákazníkem
 VATReportByCustomersInInputOutputMode=Zpráva o vybrané a zaplacené DPH zákazníka
 VATReportByQuartersInInputOutputMode=Vykazujte podle sazby daně z prodeje vybíranou a zaplacenou daň
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Nahlásit daň 2 podle sazby
 LT2ReportByQuarters=Nahlásit daň 3 podle sazby
 LT1ReportByQuartersES=Zpráva RE hodnocení
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg podtyp
 InvoiceLinesToDispatch=Řádky faktury pro odeslání
 ByProductsAndServices=Podle produktu a služby
 RefExt=Externí ref
-ToCreateAPredefinedInvoice=Chcete-li vytvořit šablonu faktury, vytvořit standardní faktury, pak bez ověřování jej, klikněte na tlačítko „%s“.
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Odkaz na objednávku
 Mode1=Metoda 1
 Mode2=Metoda 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Účelový účet určený na kartě subjektu b
 ACCOUNTING_ACCOUNT_SUPPLIER=Účet účetnictví používaný pro subjekty dodavatele
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Účelový účet určený na kartě subjektu bude použit pouze pro účetnictví společnosti Subledger. Tato položka bude použita pro hlavní účetní knihu a jako výchozí hodnotu účetnictví společnosti Subledger, pokud není definován účet externího účetního dodavatele subjektu.
 ConfirmCloneTax=Potvrďte klon sociální / daňové daně
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Kopírovat pro příští měsíc
 SimpleReport=jednoduchá zpráva
 AddExtraReport=Další zprávy (přidat zahraniční a národní zprávy od zákazníka)
@@ -253,7 +269,8 @@ AccountingAffectation=Účetnictví
 LastDayTaxIsRelatedTo=Poslední den období souvisí s daní
 VATDue=Daň z prodeje byla uplatněna
 ClaimedForThisPeriod=Reklamace na období
-PaidDuringThisPeriod=Placené během tohoto období
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=Sazbou daně z prodeje
 TurnoverbyVatrate=Obrat je fakturován sazbou daně z prodeje
 TurnoverCollectedbyVatrate=Obrat shromážděný podle sazby daně z prodeje
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Shromážděný obrat z nákupu
 RulesPurchaseTurnoverDue=- Zahrnuje splatné faktury dodavatele, ať už jsou zaplaceny nebo ne. <br> - Je založeno na datu fakturace těchto faktur. <br>
 RulesPurchaseTurnoverIn=- Zahrnuje všechny efektivní platby faktur provedených dodavatelům. <br> - Je založeno na datu splatnosti těchto faktur <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Zahrnuje všechny debetní řádky z deníku nákupu.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Fakturovaný obrat z nákupu
 ReportPurchaseTurnoverCollected=Shromážděný obrat z nákupu
 IncludeVarpaysInResults = Zahrnout různé platby do přehledů
diff --git a/htdocs/langs/cs_CZ/ecm.lang b/htdocs/langs/cs_CZ/ecm.lang
index 69a334d98d8..491dab5f6c0 100644
--- a/htdocs/langs/cs_CZ/ecm.lang
+++ b/htdocs/langs/cs_CZ/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Soubor dosud není indexován do databáze (zkuste j
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 0be889628dc..3c541433685 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Adresář <b> %s </b>nebyl nalezen (špatná cesta, nesprávná
 ErrorFunctionNotAvailableInPHP=Funkce <b>%s</b> je nutné pro tuto funkci, ale není k dispozici v této verzi / nastavení PHP.
 ErrorDirAlreadyExists=Adresář s tímto názvem již existuje.
 ErrorFileAlreadyExists=Soubor s tímto názvem již existuje.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Soubor nebyl korektně poslán serverem
 ErrorNoTmpDir=Dočasný směr %s neexistuje.
 ErrorUploadBlockedByAddon=Nahrávání blokováno pluginem PHP / Apache.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Při načtení tabulky účtů došlo k chybě. Pokud nebyl
 ErrorBadSyntaxForParamKeyForContent=Špatná syntaxe pro parametr keyforfortent. Musí mít hodnotu začínající %s nebo %s
 ErrorVariableKeyForContentMustBeSet=Chyba, musí být nastavena konstanta s názvem %s (s obsahem textu, který se má zobrazit) nebo %s (s externí adresou URL).
 ErrorURLMustStartWithHttp=Adresa URL %s musí začínat http: // nebo https: //
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Chyba, nový odkaz je již použit
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Chyba, odstranění platby spojené s uzavřenou fakturou není možné.
 ErrorSearchCriteriaTooSmall=Vyhledávací kritéria jsou příliš malá.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Veřejné rozhraní nebylo povoleno
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Váš parametr PHP upload_max_filesize (%s) je vyšší než parametr PHP post_max_size (%s). Toto není konzistentní nastavení.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/cs_CZ/externalsite.lang b/htdocs/langs/cs_CZ/externalsite.lang
index 473892a41db..2a75cea4aa9 100644
--- a/htdocs/langs/cs_CZ/externalsite.lang
+++ b/htdocs/langs/cs_CZ/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Nastavení odkazu na externí webové stránky
-ExternalSiteURL=URL externích stránek
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modul Externí stránky nebyl správně nakonfigurován.
 ExampleMyMenuEntry=Moje menu vstup
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index e5c81c5c737..b0431474555 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Datum úpravy
 IPModification=Modification IP
 DateLastModification=Datum poslední změny
 DateValidation=Datum ověření
+DateSigning=Signing date
 DateClosing=Uzávěrka
 DateDue=Datum splatnosti
 DateValue=Hodnota data
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Jednotková cena (bez) (měny)
 UnitPriceTTC=Jednotková cena
 PriceU=UP
 PriceUHT=UP (bez DPH)
-PriceUHTCurrency=U.P (měna)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (Včetně daně)
 Amount=Množství
 AmountInvoice=Fakturovaná částka
@@ -389,6 +390,8 @@ AmountTotal=Celková částka
 AmountAverage=Průměrná částka
 PriceQtyMinHT=Cena min. (bez daně)
 PriceQtyMinHTCurrency=Cena min. (bez daně) (měna)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Procento
 Total=Celkový
 SubTotal=Mezisoučet
@@ -724,7 +727,7 @@ MenuMembers=Členové
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Daně/Zvláštní výdaje
 ThisLimitIsDefinedInSetup=Dolibarr limit (menu Domů-nastavení-zabezpečení): %s Kb, PHP limit: %s Kb
-NoFileFound=Žádné dokumenty nejsou uložené v tomto adresáři
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Aktuální jazyk
 CurrentTheme=Aktuální téma
 CurrentMenuManager=Manager aktuální nabídky
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Odstraňte řetězec ‚%s‘
 SomeTranslationAreUncomplete=Některé nabízené jazyky mohou být pouze částečně přeloženy nebo mohou obsahovat chyby. Český překlad je jen základní a orientační, může být nepřesný a mimo kontext. Pomozte prosím opravit svůj jazyk registrováním na <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> a přidejte své vylepšení.
-DirectDownloadLink=Přímý odkaz ke stažení (veřejné / externí)
-DirectDownloadInternalLink=Přímý odkaz na stažení (musí být zaznamenáván a potřebuje oprávnění)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Stažení
 DownloadDocument=Stáhnout dokument
 ActualizeCurrency=Aktualizovat měnovou sazbu
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontakty
 SearchIntoMembers=Členové
 SearchIntoUsers=Uživatelé
 SearchIntoProductsOrServices=Produkty nebo služby
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projekty
 SearchIntoMO=Výrobní zakázky
 SearchIntoTasks=Úkoly
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Klávesová zkratka
 AssignedTo=Přiřazeno
 Deletedraft=Odstranění konceptu
 ConfirmMassDraftDeletion=Potvrďte potvrzení o masovém odstranění
-FileSharedViaALink=Soubor sdílený prostřednictvím odkazu
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Nejprve vyberte subjekt ...
 YouAreCurrentlyInSandboxMode=V současné době se nacházíte v %srežimu "sandbox"
 Inventory=Inventář
 AnalyticCode=Analytický kód
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Zobrazit další informace
 NoFilesUploadedYet=Nejprve nahrajte dokument
 SeePrivateNote=Viz soukromá poznámka
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/cs_CZ/margins.lang b/htdocs/langs/cs_CZ/margins.lang
index be4b9a60b78..ed1b98b7167 100644
--- a/htdocs/langs/cs_CZ/margins.lang
+++ b/htdocs/langs/cs_CZ/margins.lang
@@ -22,7 +22,7 @@ ProductService=Produkt nebo služba
 AllProducts=Všechny produkty a služby
 ChooseProduct/Service=Zvolte produkt nebo službu
 ForceBuyingPriceIfNull=Nákup síly/cena za cenu prodejní ceny, pokud není definována
-ForceBuyingPriceIfNullDetails=Není-li cena nákupu / cena stanovena a tato volba je zapnutá, bude marže nulová na řádku (cena nákupu / prodejní cena = prodejní cena), v opačném případě ("OFF") se marge rovná navrhovanému selhání.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Metoda marže pro globální slevy
 UseDiscountAsProduct=Jako produkt
 UseDiscountAsService=Jako služba
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index d8ec8bdfbf6..0119a066681 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Seznam členů návrhu (bude ověřeno)
 MembersListValid=Seznam platných členů
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=Seznam ukončených členů
 MembersListQualified=Seznam kvalifikovaných členů
 MenuMembersToValidate=Návrh členů
 MenuMembersValidated=Ověření členové
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Ukončené členové
 MembersWithSubscriptionToReceive=Členové s předplatným k přijímání
 MembersWithSubscriptionToReceiveShort=Předplatné k odběru
@@ -47,9 +49,12 @@ MemberStatusActiveLate=předplatné vypršelo
 MemberStatusActiveLateShort=Vypršela
 MemberStatusPaid=Zasílání novinek aktuální
 MemberStatusPaidShort=Až do dnešního dne
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Ukončený člen
 MemberStatusResiliatedShort=ukončený
 MembersStatusToValid=Návrhy členů
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Ukončené členové
 MemberStatusNoSubscription=Ověření (není třeba předplatné)
 MemberStatusNoSubscriptionShort=Ověřeno
@@ -82,6 +87,8 @@ Physical=Fyzický
 Moral=Morální
 MorAndPhy=Moral and Physical
 Reenable=Znovu povolit
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Ukončit člena
 ConfirmResiliateMember=Jste si jisti, že chcete ukončit tyto členy?
 DeleteMember=Odstranění člena
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Šablona e-mailu, která se použ
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Šablona e-mailu, která se používá k odeslání e-mailu členovi při nahrávání nového odběru
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Šablona e-mailu, která se používá k odeslání upozornění na e-mail při uplynutí platnosti předplatného
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Šablona e-mailu, která se používá k odeslání e-mailu členovi na zrušení člena
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Email odesílatele pro automatické e-maily
 DescADHERENT_ETIQUETTE_TYPE=Formát stránky štítků
 DescADHERENT_ETIQUETTE_TEXT=Text vytištěný na adresních listech členů
@@ -162,6 +170,7 @@ DocForLabels=Generovat adresářové listy
 SubscriptionPayment=Platba předplatného
 LastSubscriptionDate=Datum poslední platby předplatného
 LastSubscriptionAmount=Částka nejnovějších odběrů
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Členové Statistiky podle země
 MembersStatisticsByState=Členové statistika stát / provincie
 MembersStatisticsByTown=Členové statistika podle města
diff --git a/htdocs/langs/cs_CZ/modulebuilder.lang b/htdocs/langs/cs_CZ/modulebuilder.lang
index 325c3fe3b52..0bd2158158e 100644
--- a/htdocs/langs/cs_CZ/modulebuilder.lang
+++ b/htdocs/langs/cs_CZ/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=Chci z objektu vygenerovat nějaké dokumenty
 IncludeDocGenerationHelp=Pokud toto zaškrtnete, bude vygenerován nějaký kód pro přidání pole „Generovat dokument“ do záznamu.
 ShowOnCombobox=Zobrazit hodnotu do komboboxu
 KeyForTooltip=Klíč pro popis
-CSSClass=Třída CSS
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Nelze upravovat
 ForeignKey=Cizí klíč
 TypeOfFieldsHelp=Typ polí: <br> varchar (99), dvojitý (24,8), reálný, text, html, datetime, timestamp, celé číslo, celé číslo: ClassName: relativní cesta / do / classfile.class.php [: 1 [: filter]] ('1' znamená, že přidáme tlačítko + za kombajn pro vytvoření záznamu, 'filter' může být 'status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__))
diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang
index a0e3d581017..35998344515 100644
--- a/htdocs/langs/cs_CZ/orders.lang
+++ b/htdocs/langs/cs_CZ/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Udělat objednávku
 MakeOrder=Udělat objednávku
 SupplierOrder=Nákupní objednávka
 SuppliersOrders=Objednávky
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Aktuální objednávky
 CustomerOrder=Prodejní objednávka
 CustomersOrders=Prodejní objednávky
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index 23b567fc52b..9685ebcb215 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Správa malé nebo střední firmy s více činnostmi (všechny h
 CreatedBy=Vytvořil %s
 ModifiedBy=Změnil %s
 ValidatedBy=Ověřil %s
+SignedBy=Signed by %s
 ClosedBy=Uzavřel %s
 CreatedById=Uživatel id, který vytvořil
 ModifiedById=ID uživatele, který udělal poslední změnu
@@ -244,6 +245,7 @@ NewKeyIs=To je vaše nové heslo k přihlášení
 NewKeyWillBe=Vaše nové heslo pro přihlášení do softwaru bude
 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
+ConfirmPasswordChange=Confirm password change
 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=Úložiště pro zdroje
diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang
index c4df0ba8c4b..d4609f7b491 100644
--- a/htdocs/langs/cs_CZ/productbatch.lang
+++ b/htdocs/langs/cs_CZ/productbatch.lang
@@ -1,24 +1,35 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Použijte množství/sériové číslo
-ProductStatusOnBatch=Ano (množství/sériové číslo vyžadováno)
-ProductStatusNotOnBatch=Ne (množství/sériové číslo není použito)
-ProductStatusOnBatchShort=Ano
+ManageLotSerial=Používat šarži/sériové číslo
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusNotOnBatch=Ne (šarže/sériové číslo není použito)
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Ne
-Batch=Množství/sériové
+Batch=Šarže/série
 atleast1batchfield=Spotřeba podle data nebo datum prodeje nebo množství/sériové číslo
-batch_number=Množství/Sériové číslo
-BatchNumberShort=Množství/Série
-EatByDate=Spotřeba podle data
-SellByDate=Prodej podle data
-DetailBatchNumber=Detail množství/série 
-printBatch=Množství/Série: %s
+batch_number=Šarže/sériové číslo
+BatchNumberShort=Šarže/Série
+EatByDate=Datum spotřeby
+SellByDate=Datum prodeje
+DetailBatchNumber=Detaily šarže/série 
+printBatch=Šarže/Série: %s
 printEatby=Spotřeba: %s
 printSellby=Prodej: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Přidat řádek pro dispečink  skladovatelnosti
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=Tento produkt nepoužívá šarže/sériové číslo
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
+printQty=Množství: %d
+AddDispatchBatchLine=Přidat řádek pro skladovatelnost
+WhenProductBatchModuleOnOptionAreForced=Pokud je modul šarží a sérií zapnut, je automatické "snížení zásob" nastaveno na "Snížit zásoby při potvrzení dopravy" a automatické zvýšení zásob nastaveno na "Zvýšit zásoby při ruční expedici do skladů" a volba nemůže být změněna. Ostatní volby lze definovat libovolně.
+ProductDoesNotUseBatchSerial=Tento produkt nepoužívá šarže/sériová čísla
+ProductLotSetup=Nastavení modulu šarží a sérií
+ShowCurrentStockOfLot=Zobrazit aktuální zásoby šarží produktu
+ShowLogOfMovementIfLot=Zobrazit log pohybů šarží produktu
+StockDetailPerBatch=Zásoby dané šarže
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 9f144427c41..037c83e4ea8 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=DPH (pro tento prodejce / produkt)
 DiscountQtyMin=Sleva pro tento počet.
 NoPriceDefinedForThisSupplier=Pro tento dodavatel / produkt není definována žádná cena / množství
 NoSupplierPriceDefinedForThisProduct=Pro tento produkt není definována cena / množství prodejce
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Předdefinovaný produkt
 PredefinedServicesToSell=Předdefinovaná služba
 PredefinedProductsAndServicesToSell=Předdefinované produkty/služby na prodej
@@ -313,7 +314,7 @@ LastUpdated=Poslední aktualizace
 CorrectlyUpdated=Správně aktualizováno
 PropalMergePdfProductActualFile=Soubory používají k přidání do PDF Azur template are/is
 PropalMergePdfProductChooseFile=Vyberte soubory PDF
-IncludingProductWithTag=Včetně produktu/služby s tagem
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Výchozí cena, skutečná cena může záviset na zákazníkovi
 WarningSelectOneDocument=Vyberte alespoň jeden dokument
 DefaultUnitToShow=Jednotka
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 88f500f0753..b57c679ae68 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Seznam úkolů
 GoToListOfTimeConsumed=Přejít na seznam času spotřebovaného
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Seznam komerčních návrhů týkajících se projektu
 ListOrdersAssociatedProject=Seznam prodejních zakázek týkajících se projektu
 ListInvoicesAssociatedProject=Seznam zákaznických faktur týkajících se projektu
@@ -268,3 +269,7 @@ OneLinePerTask=Jeden řádek na úkol
 OneLinePerPeriod=Jeden řádek za období
 RefTaskParent=Ref. Nadřazený úkol
 ProfitIsCalculatedWith=Zisk se vypočítá pomocí
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/cs_CZ/propal.lang b/htdocs/langs/cs_CZ/propal.lang
index a945b46a66a..55b8784f043 100644
--- a/htdocs/langs/cs_CZ/propal.lang
+++ b/htdocs/langs/cs_CZ/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Poslat obchodní nabídku poštou
 DatePropal=Datum nabídky
 DateEndPropal=Datum ukončení platnosti
 ValidityDuration=Trvání platnosti
-CloseAs=Nastavte stav na
 SetAcceptedRefused=Nastavte přijato/odmítnuto
 ErrorPropalNotFound=Propal %s nebyl nalezen
 AddToDraftProposals=Přidat do předlohy nabídky
@@ -60,6 +59,7 @@ ConfirmClonePropal=Jste si jisti, že chcete kopírovat obchodní nabídku <b>%s
 ConfirmReOpenProp=Jste si jisti, že chcete otevřít zpět obchodní nabídku <b>%s</b> ?
 ProposalsAndProposalsLines=Obchodní nabídka a řádky
 ProposalLine=Řádky nabídky
+ProposalLines=Proposal lines
 AvailabilityPeriod=Dostupné zpoždění
 SetAvailability=Nastavte si dostupné zpoždění
 AfterOrder=po objednání
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Písemný souhlas, razítko firmy, datum a podpis
 ProposalsStatisticsSuppliers=Statistika návrhů dodavatelů
 CaseFollowedBy=Případ následovaný
 SignedOnly=Podepsáno pouze
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index ef41559e9f1..af6fc1f737a 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -19,8 +19,8 @@ Stock=Skladem
 Stocks=Zásoby
 MissingStocks=Chybějící zásoby
 StockAtDate=Zásoby k datu
-StockAtDateInPast=Datum v minulosti
-StockAtDateInFuture=Datum v budoucnosti
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Zásoby podle šarže/serie
 LotSerial=Šarže/série
 LotSerialList=Seznam šarže/serie
@@ -37,8 +37,8 @@ AllWarehouses=Všechny sklady
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Zahrnout také návrhy objednávek
 Location=Umístění
-LocationSummary=Krátký název umístění
-NumberOfDifferentProducts=Počet různých výrobků
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Celkový počet produktů
 LastMovement=poslední pohyb
 LastMovements=Poslední pohyby
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Hodnota skladů
 UserWarehouseAutoCreate=Vytvoření uživatelského skladu automaticky při vytváření uživatele
 AllowAddLimitStockByWarehouse=Spravujte také hodnotu pro minimální a požadovanou zásobu na párování (produktový sklad) kromě hodnoty pro minimální a požadovanou zásobu na produkt
 RuleForWarehouse=Pravidlo pro sklady
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Nastavit sklad na prodejní objednávky
 UserDefaultWarehouse=Nastavit sklad na Uživatelé
 MainDefaultWarehouse=Výchozí sklad
@@ -97,15 +98,16 @@ RealStockDesc=Fyzické / skutečné zásoby jsou zásoby, které jsou v současn
 RealStockWillAutomaticallyWhen=Reálná aktiva bude upravena podle tohoto pravidla (jak je definováno v modulu Akcie):
 VirtualStock=Virtuální sklad
 VirtualStockAtDate=Virtuální sklad k datu
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtuální sklad je vypočítaná zásoba dostupná po uzavření všech otevřených/čekajících akcí (které mají vliv na zásoby) (přijaté objednávky, dodané prodejní objednávky, vyrobené výrobní objednávky atd.)
+AtDate=At date
 IdWarehouse=ID skladu
 DescWareHouse=Popis skladu
 LieuWareHouse=Lokalizace skladu
 WarehousesAndProducts=Sklady a výrobky
 WarehousesAndProductsBatchDetail=Sklady a produkty (s podrobnostmi o šarži/sérii)
 AverageUnitPricePMPShort=Vážená průměrná cena
-AverageUnitPricePMPDesc=Vstupní průměrná jednotková cena, kterou jsme museli platit dodavatelům, aby dostali produkt do naší zásoby.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Prodejní jednotková cena
 EstimatedStockValueSellShort=Hodnota k prodeji
 EstimatedStockValueSell=Hodnota k prodeji
@@ -145,7 +147,7 @@ Replenishments=Splátky
 NbOfProductBeforePeriod=Množství produktů %s na skladě, než zvolené období (< %s)
 NbOfProductAfterPeriod=Množství produktů %s na skladě po zvolené období (> %s)
 MassMovement=Hromadný pohyb
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Záznam přenosu
 ReceivingForSameOrder=Příjmy pro tuto objednávku
 StockMovementRecorded=Zaznamenány pohyby zásob
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Úroveň zásob musí být dostatečná pro přidán
 StockMustBeEnoughForOrder=Úroveň zásob musí být dost na to, aby bylo možné přidat produkt / službu na objednávku (kontrola se provádí na aktuálním reálném skladu při přidání řádku do objednávky bez ohledu na pravidlo automatické změny zásob)
 StockMustBeEnoughForShipment= Úroveň zásob musí být dostatečná pro přidání produktu / služby k odeslání (kontrola se provádí na aktuální reálné akci při přidání řádku do zásilky bez ohledu na pravidlo automatické změny zásob)
 MovementLabel=Štítek pohybu
-TypeMovement=Druh pohybu
+TypeMovement=Direction of movement
 DateMovement=Datum pohybu
 InventoryCode=Kód pohybu nebo zásob
 IsInPackage=Obsažené v zásilce
@@ -183,6 +185,7 @@ inventoryCreatePermission=Vytvořte nový inventář
 inventoryReadPermission=Zobrazit zásoby
 inventoryWritePermission=Aktualizovat inventáře
 inventoryValidatePermission=Ověřit inventář
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventář
 inventoryListTitle=Zásoby
 inventoryListEmpty=Neprobíhá inventář
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Zásoba je povinna zvolit, které množstv
 ForceTo=Vynutit
 AlwaysShowFullArbo=Zobrazit plný strom skladu v rozbalovacím seznamu propojení skladu (Upozornění: Může to dramaticky snížit výkon)
 StockAtDatePastDesc=Zde si můžete zobrazit akcie (skutečné zásoby) k danému datu v minulosti
-StockAtDateFutureDesc=Zde si můžete v budoucnu zobrazit akcie (virtuální akcie) k danému datu
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Aktuální stav
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Pro nahrání souboru klepněte na ikonku %s pro výběr souboru jako zdrojový soubor importu ...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Znovu otevřeno
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang
index 35368f625bb..2314bedb54b 100644
--- a/htdocs/langs/cs_CZ/suppliers.lang
+++ b/htdocs/langs/cs_CZ/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Dodavatelé
 SuppliersInvoice=Faktura dodavatele
+SupplierInvoices=Faktury dodavatele
 ShowSupplierInvoice=Zobrazit fakturu dodavatele
 NewSupplier=Nový dodavatel
 History=Historie
diff --git a/htdocs/langs/cs_CZ/ticket.lang b/htdocs/langs/cs_CZ/ticket.lang
index 268ab00719c..a09633b9355 100644
--- a/htdocs/langs/cs_CZ/ticket.lang
+++ b/htdocs/langs/cs_CZ/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Smazáno
 # Dict
 Type=Typ
 Severity=Vážnost
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Chcete-li poslat e-mail z lístkové zprávy
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Zobrazit logo modulu ve veřejném rozhraní
 TicketsShowModuleLogoHelp=Povolte tuto možnost, pokud chcete skrýt modul loga na stránkách veřejného rozhraní
 TicketsShowCompanyLogo=Zobrazit logo společnosti ve veřejném rozhraní
 TicketsShowCompanyLogoHelp=Povolte tuto možnost, pokud chcete skrýt logo hlavní společnosti na stránkách veřejného rozhraní
-TicketsEmailAlsoSendToMainAddress=Také poslat oznámení na hlavní e-mailovou adresu
-TicketsEmailAlsoSendToMainAddressHelp=Povolte tuto možnost a odešlete e-mail na adresu „Oznámení e-mailem z adresy“ (viz nastavení níže)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Omezit zobrazení na vstupenky přiřazené aktuálnímu uživateli (neúčinné pro externí uživatele, vždy omezeno na třetí stranu, na které závisí)
 TicketsLimitViewAssignedOnlyHelp=Viditelné budou pouze vstupenky přiřazené aktuálnímu uživateli. Nevztahuje se na uživatele s právy správy vstupenek.
 TicketsActivatePublicInterface=Aktivovat veřejné rozhraní
@@ -126,10 +128,10 @@ TicketNumberingModules=Modul číslování vstupenek
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Upozornit subjekt na vytvoření
 TicketsDisableCustomerEmail=Pokud je lístek vytvořen z veřejného rozhraní, vždy zakažte e-maily
-TicketsPublicNotificationNewMessage=Po přidání nové zprávy odešlete e-mail(y)
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Odeslat e-mail(y) při přidání nové zprávy z veřejného rozhraní (přiřazenému uživateli nebo e-mailu s oznámením do (aktualizace) a/nebo e-mailu s oznámením do)
 TicketPublicNotificationNewMessageDefaultEmail=E-mail s oznámeními (aktualizace)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Pokud na lístek není přiřazen uživatel nebo nemá e-mail, zašlete na tuto adresu e-mailem oznámení o nové zprávě.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Poslední změněné vstupenky
 BoxLastModifiedTicketDescription=Poslední %s změněné vstupenky
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Žádné poslední změněné vstupenky
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index 3346f1c50ef..afc98c26645 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Odstranit ze skupiny
 PasswordChangedAndSentTo=Heslo změněno a poslán na <b>%s.</b>
 PasswordChangeRequest=Požadavek na změnu hesla pro <b> %s</b>
 PasswordChangeRequestSent=Žádost o změnu hesla <b>%s</b> zaslána na <b>%s.</b>
+IfLoginExistPasswordRequestSent=Pokud je toto přihlášení platným účtem, byl zaslán e-mail k obnovení hesla.
+IfEmailExistPasswordRequestSent=Pokud je tento e-mail platným účtem, byl zaslán e-mail k obnovení hesla.
 ConfirmPasswordReset=Potvrďte resetování hesla
 MenuUsersAndGroups=Uživatelé a skupiny
 LastGroupsCreated=Posledních %s vytvořených skupin
@@ -70,9 +72,10 @@ ExportDataset_user_1=Uživatelé a jejich vlastnosti
 DomainUser=Doménový uživatel %s
 Reactivate=Reaktivace
 CreateInternalUserDesc=Tento formulář umožňuje vytvořit interní uživatele ve vaší společnosti / organizaci. Chcete-li vytvořit externího uživatele (zákazník, dodavatel atd.), použijte tlačítko "Vytvořit uživatele Dolibarr z karty kontaktu subjektu.
-InternalExternalDesc=Interní  <b> uživatel </b> je uživatel, který je součástí vaší společnosti / organizace. <br> Externí uživatel <b> </b> je zákazník, prodejce nebo jiný (Vytvoření externího uživatele pro subjekt lze provést z kontaktního záznamu subjektu). <br> <br> V obou případech oprávnění definují práva na Dolibarr, také externí uživatel může mít jiného správce menu než interní uživatel (viz Domů - Nastavení - Displej)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Povolení uděleno, neboť je zděděno z některé uživatelské skupiny.
 Inherited=Zděděný
+UserWillBe=Created user will be
 UserWillBeInternalUser=Vytvořený uživatel bude interní (protože není spojen s žádnou třetí stranou)
 UserWillBeExternalUser=Vytvořený uživatel bude externí (protože je spojen s třetí stranou)
 IdPhoneCaller=Id telefonu volajícího
@@ -109,12 +112,14 @@ UserAccountancyCode=Účetní kód uživatele
 UserLogoff=odhlášení uživatele
 UserLogged=přihlášený uživatel
 DateOfEmployment=Datum zaměstnání
-DateEmployment=Datum zahájení zaměstnání
+DateEmployment=Zaměstnanost
+DateEmploymentstart=Datum zahájení zaměstnání
 DateEmploymentEnd=Datum ukončení zaměstnání
+RangeOfLoginValidity=Časové období platnosti přihlášení
 CantDisableYourself=Nelze zakázat vlastní uživatelský záznam
 ForceUserExpenseValidator=Validator výkazu výdajů
 ForceUserHolidayValidator=Vynutit validátor žádosti o dovolenou
 ValidatorIsSupervisorByDefault=Ve výchozím nastavení je validátor nadřazený nad uživatelem. Chcete-li zachovat toto chování, ponechte prázdné.
 UserPersonalEmail=Osobní email
 UserPersonalMobile=Osobní mobilní telefon
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Varování, toto je hlavní jazyk, kterým uživatel hovoří, nikoli jazyk rozhraní, které se rozhodl zobrazit. Chcete-li změnit jazyk rozhraní viditelný tímto uživatelem, přejděte na kartu %s
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index 1fb8d39059e..228a2e197f2 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost= <u> Použit  Apache / Nginx / ... </u> <br> vytvořit na sv
 ExampleToUseInApacheVirtualHostConfig=Příklad použití v nastavení virtuálního hostitele Apache:
 YouCanAlsoTestWithPHPS= <u> Použití s vloženým serverem PHP </u> <br> Při vývoji prostředí můžete upřednostňovat testování webu pomocí integrovaného webového serveru PHP (PHP 5.5 vyžadováno) spuštěním <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
 YouCanAlsoDeployToAnotherWHP= <u> Provozujte svůj web s jiným poskytovatelem hostingu Dolibarr </u> <br> Pokud nemáte webový server jako Apache nebo NGinx dostupný na internetu, můžete exportovat a importovat webový server na jinou instanci Dolibarr poskytovanou jiným poskytovatelem hostingu Dolibarr. integrace s modulem webových stránek. Seznam některých poskytovatelů hostingu Dolibarr najdete na <a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>
-CheckVirtualHostPerms=Zkontrolujte také, že virtuální hostitel má oprávnění <strong> %s </strong> na souborech do <br> <strong> %s </strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Číst
 WritePerm=Zápis
 TestDeployOnWeb=Testování / nasazení na webu
 PreviewSiteServedByWebServer= <u> Náhled %s na nové kartě. </u> <br> <br> %s bude sloužit externímu webovém serveru (jako Apache, Nginx, IIS). Musíte nainstalovat a nastavit tento server předtím, než přejdete k adresáři: <br> <strong> %s </strong> <br> Adresa URL obsluhovaná externím serverem: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr= <u> Náhled %s na nové kartě. </u> <br> <br> Server %s bude obsluhován serverem Dolibarr, takže se nepotřebuje instalovat žádný další webový server (jako Apache, Nginx, IIS). <br> Nevhodné je, že adresy URL stránek nejsou uživatelsky přívětivé a začínají cestou Dolibarru. <br> URL sloužil Dolibarr: <br> <strong> %s </strong> <br> <br> Chcete-li použít vlastní externí webový server sloužit této webové stránky, vytvořit virtuální hostitele na webový server, který ukazoval na adresář <br> <strong> %s </strong> <br> zadejte název tohoto virtuálního serveru a klikněte na další tlačítko náhledu.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=Adresa URL virtuálního hostitele obsluhovaného externím webovým serverem není definována
 NoPageYet=Zatím žádné stránky
 YouCanCreatePageOrImportTemplate=Můžete vytvořit novou stránku nebo importovat úplnou šablonu webových stránek
@@ -137,3 +137,11 @@ PagesRegenerated=%s regenerováno stránky / kontejnery
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/cs_CZ/zapier.lang b/htdocs/langs/cs_CZ/zapier.lang
index 605cf509252..f79d823e2d8 100644
--- a/htdocs/langs/cs_CZ/zapier.lang
+++ b/htdocs/langs/cs_CZ/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier pro Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier pro Dolibarr modul
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Nastavení Zapieru pro Dolibarr
+ZapierForDolibarrSetup=Nastavení Zapieru pro Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 4f65c3b5d02..9e2f21931cc 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -14,7 +14,7 @@ ACCOUNTING_EXPORT_ENDLINE=Vælg linjeskift type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Angiv præfiks for filnavnet
 ThisService=Denne ydelse
 ThisProduct=Dette produkt
-DefaultForService=forvalg ydelse
+DefaultForService=Forvalg ydelse
 DefaultForProduct=Forvalg produkt
 ProductForThisThirdparty=Produkt til denne tredjepart
 ServiceForThisThirdparty=Service for denne tredjepart
@@ -27,7 +27,7 @@ JournalFinancial=Finanskladde
 BackToChartofaccounts=Tilbage til kontoplan
 Chartofaccounts=Kontoplan
 ChartOfSubaccounts=Diagram over individuelle konti
-ChartOfIndividualAccountsOfSubsidiaryLedger=Diagram over underregnskabets individuelle konti
+ChartOfIndividualAccountsOfSubsidiaryLedger=Diagram over individuelle konti i datterselskabet
 CurrentDedicatedAccountingAccount=Aktuel tildelt konto
 AssignDedicatedAccountingAccount=Ny konto, der skal tildeles
 InvoiceLabel=Fakturaetiket
@@ -43,9 +43,9 @@ GroupIsEmptyCheckSetup=Gruppen er tom, kontroller opsætningen af ​​den brug
 DetailByAccount=Vis detaljer efter konto
 AccountWithNonZeroValues=Konti med ikke-nul-værdier
 ListOfAccounts=Liste over konti
-CountriesInEEC=Lande i EØF
-CountriesNotInEEC=Lande ikke i EØF
-CountriesInEECExceptMe=Lande i EØF undtagen %s
+CountriesInEEC=Lande i EU
+CountriesNotInEEC=Lande ikke i EU
+CountriesInEECExceptMe=Lande i EU undtagen %s
 CountriesExceptMe=Alle lande undtagen %s
 AccountantFiles=Eksporter kildedokumenter
 ExportAccountingSourceDocHelp=Med dette værktøj kan du eksportere de kildehændelser (liste og PDF-filer), der blev brugt til at generere din regnskab. For at eksportere dine tidsskrifter skal du bruge menuindgangen %s - %s.
@@ -74,7 +74,7 @@ AccountancyAreaDescExpenseReport=Trin %s: Definer standardkonti for hver type ud
 AccountancyAreaDescSal=Trin %s: Definer standardkonto for betaling af lønninger. Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescContrib=TRIN %s: Definer standardregnskabskonti for særlige udgifter (diverse skatter). Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescDonation=Trin %s: Definer standkonto for donationer. Til dette skal du bruge menupunktet %s.
-AccountancyAreaDescSubscription=TRIN %s: Definer standardregnskabskonti for medlemsabonnement. Brug dette til menupunktet %s.
+AccountancyAreaDescSubscription=Trin %s: Definer standardregnskabskonti for medlemsabonnement. Brug dette til menupunktet %s.
 AccountancyAreaDescMisc=Trin %s: Definer obligatorisk standardkonto og standardkonti for diverse transaktioner. Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescLoan=Trin %s: Definer standardkonti for lån. Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescBank=Trin %s: Definer regnskabskonto og regnskabskode for hver bank og finanskonto. Til dette skal du bruge menupunktet %s.
@@ -92,9 +92,9 @@ ChangeAndLoad=Ret og indlæs
 Addanaccount=Tilføj en regnskabskonto
 AccountAccounting=Regnskabskonto
 AccountAccountingShort=Konto
-SubledgerAccount=Subledger-konto
-SubledgerAccountLabel=Subledger-kontoetiket
-ShowAccountingAccount=Vis regnskabskonto
+SubledgerAccount=Underleverandør konto
+SubledgerAccountLabel=Underleverandør konto etiket
+ShowAccountingAccount=Vis regnskabs konto
 ShowAccountingJournal=Vis kontokladde
 ShowAccountingAccountInLedger=Vis regnskabskonto i hovedbog
 ShowAccountingAccountInJournals=Vis regnskabskonto i tidsskrifter
@@ -131,11 +131,11 @@ InvoiceLinesDone=Fakturalinjer, der er bundet
 ExpenseReportLines=Udgiftsrapportlinjer, der skal bogføres
 ExpenseReportLinesDone=Linjer bundet til udgiftsrapporter
 IntoAccount=Bogfør linje i regnskabskonto
-TotalForAccount=Ialt for regnskabskonto
+TotalForAccount=Samlet regnskabskonto
 
 
 Ventilate=Bogfør
-LineId=Linje-ID
+LineId=Linje ID
 Processing=Behandling
 EndProcessing=Behandling afsluttet.
 SelectedLines=Valgte linjer
@@ -171,10 +171,10 @@ ACCOUNTING_HAS_NEW_JOURNAL=Ny Journal
 
 ACCOUNTING_RESULT_PROFIT=Resultatregnskabskonto (fortjeneste)
 ACCOUNTING_RESULT_LOSS=Resultatregnskabskonto (tab)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Tidsskrift for lukning
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Luknings journal
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Regnskabskonto ved overgangsbankoverførsel
-TransitionalAccount=Overgangsbankoverførselskonto
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Regnskabskonto ved overgangs bankoverførsel
+TransitionalAccount=Overgangs bankoverførsels konto
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Regnskabskonto for afventning
 DONATION_ACCOUNTINGACCOUNT=Regnskabskonto til registrering af donationer
@@ -209,7 +209,7 @@ Codejournal=Kladde
 JournalLabel=Journalmærke
 NumPiece=Partsnummer
 TransactionNumShort=Transaktionsnr.
-AccountingCategory=Regnskabskontogrupper
+AccountingCategory=Brugerdefineret gruppe
 GroupByAccountAccounting=Gruppér efter hovedkontokonto
 GroupBySubAccountAccounting=Gruppér efter underkonto konto
 AccountingAccountGroupsDesc=Du kan definere her nogle grupper af regnskabskonto. De vil blive brugt til personlige regnskabsrapporter.
@@ -258,7 +258,7 @@ ShowSubtotalByGroup=Vis subtotal efter niveau
 Pcgtype=Kontoens gruppe
 PcgtypeDesc=Kontogruppe bruges som foruddefinerede 'filter' og 'gruppering' kriterier for nogle regnskabsrapporter. For eksempel bruges 'INKOMST' eller 'UDGIFT' som grupper til regnskabsmæssige regnskaber for produkter til at oprette omkostnings- / indkomstrapporten.
 
-Reconcilable=forenelige
+Reconcilable=Afstemning
 
 TotalVente=Samlet omsætning ekskl. moms
 TotalMarge=Samlet salgsforskel
@@ -318,7 +318,7 @@ AccountingJournalType3=Køb
 AccountingJournalType4=Bank
 AccountingJournalType5=Udgiftsrapport
 AccountingJournalType8=Beholdning
-AccountingJournalType9=Har-nyt
+AccountingJournalType9=Har nyt
 ErrorAccountingJournalIsAlreadyUse=Denne kladde er allerede i brug
 AccountingAccountForSalesTaxAreDefinedInto=Bemærk: Regnskabskonto for salgsmoms er defineret i menuen <b> %s </b> - <b> %s </b>
 NumberOfAccountancyEntries=Antal poster
@@ -359,16 +359,16 @@ DefaultBindingDesc=Denne side kan bruges til at angive en standardkonto, der ska
 DefaultClosureDesc=Denne side kan bruges til at indstille parametre, der bruges til regnskabsafslutning.
 Options=Indstillinger
 OptionModeProductSell=Salg
-OptionModeProductSellIntra=Mode salg eksporteret i EØF
-OptionModeProductSellExport=Mode salg eksporteret i andre lande
+OptionModeProductSellIntra=Samlet vare salg i EU
+OptionModeProductSellExport=Samlet varesalg udenfor EU
 OptionModeProductBuy=Køb
-OptionModeProductBuyIntra=Tilstand købt importeret i EØF
-OptionModeProductBuyExport=Tilstand købt importeret fra andre lande
+OptionModeProductBuyIntra=Samlet varekøb i EU
+OptionModeProductBuyExport=Samlet varekøb uden for EU
 OptionModeProductSellDesc=Vis alle varer med salgskonto.
-OptionModeProductSellIntraDesc=Vis alle produkter med en regnskabskonto for salg i EØF.
+OptionModeProductSellIntraDesc=Vis alle produkter med en regnskabskonto for salg i EU.
 OptionModeProductSellExportDesc=Vis alle produkter med regnskabskonto for andet udenlandsk salg.
 OptionModeProductBuyDesc=Vis alle varer med købskonto.
-OptionModeProductBuyIntraDesc=Vis alle produkter med en regnskabskonto for køb i EØF.
+OptionModeProductBuyIntraDesc=Vis alle produkter med en regnskabskonto for køb i EU.
 OptionModeProductBuyExportDesc=Vis alle produkter med en regnskabskonto for andre udenlandske køb.
 CleanFixHistory=Fjern regnskabskode fra linjer, der ikke eksisterer som posteringer på konto
 CleanHistory=Nulstil alle bogføringer for det valgte år
@@ -379,9 +379,9 @@ ValueNotIntoChartOfAccount=Den angivne regnskabskonto eksisterer ikke i kontopla
 AccountRemovedFromGroup=Kontoen blev fjernet fra gruppen
 SaleLocal=Lokalt salg
 SaleExport=Eksport salg
-SaleEEC=Salg i EØF
-SaleEECWithVAT=Salg i EØF med en moms, der ikke er null, så vi antager, at dette IKKE er et intrakommunalt salg, og den foreslåede konto er standardproduktskontoen.
-SaleEECWithoutVATNumber=Du kan fastsætte moms-ID for tredjepart eller produktkonto om nødvendigt.
+SaleEEC=Salg i EU
+SaleEECWithVAT=Salg i EU med en moms, der ikke er null, så vi antager, at dette IKKE er et intrakommunalt salg, og den foreslåede konto er standardproduktskontoen.
+SaleEECWithoutVATNumber=Du kan fastsætte moms nummer for tredjepart eller produktkonto om nødvendigt.
 
 ## Dictionary
 Range=Interval for regnskabskonto
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Linjer endnu ikke bundet, brug menuen <a href="%s"> %
 
 ## Import
 ImportAccountingEntries=Regnskabsposter
-DateExport=Datoeksport
+ImportAccountingEntriesFECFormat=Regnskabsposter - FEC-format
+FECFormatJournalCode=Kodejournal (JournalKode)
+FECFormatJournalLabel=Etiketjournal (JournalLib)
+FECFormatEntryNum=Stykke nummer (EcritureNum)
+FECFormatEntryDate=Stykkets dato (EcritureDate)
+FECFormatGeneralAccountNumber=Generelt kontonummer (CompteNum)
+FECFormatGeneralAccountLabel=Generel kontoetiket (CompteLib)
+FECFormatSubledgerAccountNumber=Undernummerets kontonummer (CompAuxNum)
+FECFormatSubledgerAccountLabel=Undernummerets kontonummer (CompAuxLib)
+FECFormatPieceRef=Stykke ref (PieceRef)
+FECFormatPieceDate=Oprettelse af stykke dato (PieceDate)
+FECFormatLabelOperation=Betjening af etiketter (EcritureLib)
+FECFormatDebit=Debet (Debit)
+FECFormatCredit=Kredit (kredit)
+FECFormatReconcilableCode=Forenelig kode (EcritureLet)
+FECFormatReconcilableDate=Afstemningsdato (DateLet)
+FECFormatValidateDate=Stykkets dato valideret (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency-beløb (Montantdevise)
+FECFormatMulticurrencyCode=MultiValuta-kode (Idevise)
+
+DateExport=Eksport dato
 WarningReportNotReliable=Advarsel, denne rapport er ikke baseret på Ledger, så indeholder ikke transaktion ændret manuelt i Ledger. Hvis din journalisering er opdateret, er bogføringsvisningen mere præcis.
 ExpenseReportJournal=Udgifts Journal
 InventoryJournal=Opgørelse Journal
+
+NAccounts=%s konti
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 57b913ae14a..dfeca29316f 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Fjern forbindelseslås
 YourSession=Din session
 Sessions=Brugere Sessioner
 WebUserGroup=Webserver bruger / gruppe
+PermissionsOnFiles=Tilladelser til filer
 PermissionsOnFilesInWebRoot=Tilladelser til filer i web-rodmappen
 PermissionsOnFile=Tilladelser på fil %s
 NoSessionFound=Din PHP-konfiguration tillade ikke optagelse af aktive sessioner. Den mappe, der bruges til at gemme sessioner (<b> %s </b>), kan være beskyttet (for eksempel via operativsystemet eller ved PHP-direktivet open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: ja er kun effektivt, hvis <b>modul %s</b> er aktiveret
 RemoveLock=Fjern/omdøbe fil <b> %s </b> hvis den eksisterer, for at tillade brug af Update/Install værktøjet.
 RestoreLock=Gendan filen <b> %s </b>, kun med tilladelse for "læsning", for at deaktivere yderligere brug af Update/Install-værktøjet.
 SecuritySetup=Sikkerhedsopsætning
+PHPSetup=PHP opsætning
 SecurityFilesDesc=Definer her muligheder relateret til sikkerhed om upload af filer.
 ErrorModuleRequirePHPVersion=Fejl, dette modul kræver PHP version %s eller højere
 ErrorModuleRequireDolibarrVersion=Fejl, dette modul kræver Dolibarr version %s eller højere
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Dette område giver administrationsfunktioner. Brug menuen t
 Purge=Ryd
 PurgeAreaDesc=På denne side kan du slette alle filer, der er genereret eller gemt af Dolibarr (midlertidige filer eller alle filer i <b> %s </b> bibliotek). Brug af denne funktion er normalt ikke nødvendig. Den leveres som en løsning for brugere, hvis Dolibarr er vært for en udbyder, der ikke tilbyder tilladelser til at slette filer genereret af webserveren.
 PurgeDeleteLogFile=Slet log-filer, herunder <b>%s</b> oprettet til Syslog-modul (ingen risiko for at miste data)
-PurgeDeleteTemporaryFiles=Slet alle logfiler og midlertidige filer (ingen risiko for at miste data). Bemærk: Sletning af midlertidige filer udføres kun, hvis temp-biblioteket blev oprettet for mere end 24 timer siden.
+PurgeDeleteTemporaryFiles=Slet alle logfiler og midlertidige filer (ingen risiko for at miste data). Parameteren kan være 'tempfilesold', 'logfiles' eller begge 'tempfilesold + logfiles'. Bemærk: Sletning af midlertidige filer udføres kun, hvis temp-biblioteket blev oprettet for mere end 24 timer siden.
 PurgeDeleteTemporaryFilesShort=Slet logfiler og midlertidige filer
 PurgeDeleteAllFilesInDocumentsDir=Slet alle filer i mappen: <b> %s </b>. <br> Dette vil slette alle genererede dokumenter relateret til elementer (tredjeparter, fakturaer osv. ..), filer uploadet til ECM modulet, database backup dumps og midlertidige filer.
 PurgeRunNow=Rensningsanordningen nu
@@ -232,6 +234,7 @@ BoxesAvailable=Bokse til rådighed
 BoxesActivated=Bokse aktiveret
 ActivateOn=Aktivér om
 ActiveOn=Aktiveret på
+ActivatableOn=Aktiverbar til
 SourceFile=Kildefilen
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Kun tilgængelig, hvis JavaScript ikke er slået
 Required=Påkrævet
@@ -278,7 +281,7 @@ Emails=E-Post
 EMailsSetup=E-post sætop
 EMailsDesc=Denne side giver dig mulighed for at indstille parametre eller muligheder for afsendelse af e-mail.
 EmailSenderProfiles=E-mails afsender profiler
-EMailsSenderProfileDesc=Du kan holde denne sektion tom. Hvis du indtaster nogle e-mails her, vil de blive tilføjet til listen over mulige afsendere i kombinationsfeltet når din skrive en ny e-mail.
+EMailsSenderProfileDesc=Du kan holde denne sektion tom. Hvis du indtaster nogle e-mail adresser her, vil de blive tilføjet til listen over mulige afsendere i kombinationsfeltet når du skrive en ny e-mail.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-port (standardværdi i php.ini: <b> %s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS-vært (standardværdi i php.ini: <b> %s </b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (Ikke defineret i PHP på Unix-lignende systemer)
@@ -347,9 +350,10 @@ LastActivationAuthor=Seneste aktiveringsforfatter
 LastActivationIP=Seneste aktivering IP
 UpdateServerOffline=Opdater server offline
 WithCounter=Administrer en tæller
-GenericMaskCodes=Du kan indtaste enhver nummerering maske. I denne maske, følgende koder kan benyttes:<br><b>{000000}</b> svarer til et antal, som vil blive forøget på hver %s. Indtast så mange nuller, som den ønskede længde af tælleren. Tælleren vil være udfyldt med nuller fra venstre for at have så mange nuller, som maske. <br><b>{000000+000}</b> samme som tidligere, men en forskydning, der svarer til de tal til højre for tegnet + er anvendt, starter den første %s. <br><b>{000000@x}</b> samme som tidligere, men tælleren er blevet nulstillet til nul, når måned x er nået (x mellem 1 og 12, eller 0 for at bruge de første måneder af regnskabsåret, der er defineret i din konfiguration, eller 99 nulstiller man til nul hver måned). Hvis denne indstilling anvendes, og x er 2 eller højere, så er talfølgen {åå}{mm} eller {åååå}{mm} er også påkrævet. <br><b>{dd}</b> i dag (01 til 31).<br><b>{mm}</b> måned (01 til 12).<br><b>{åå}</b> er <b>{åååå}</b> eller <b>{y}</b> år over 2, 4 eller 1 tal. <br>
-GenericMaskCodes2=<b>{cccc}</b> den klient-kode på n tegn<br><b>{cccc000}</b> den klient-kode på n tegn, efterfulgt af en tæller, som er dedikeret til kunden. Denne tæller dedikeret til kunden er nulstillet på samme tid, end global counter.<br><b>{tttt}</b> koden af tredje part, type n tegn (se menu Home - Setup - Ordbog - Typer af tredjeparter). Hvis du tilføjer dette tag, tælleren vil være forskellige for hver type af tredje part.<br>
+GenericMaskCodes=Du kan indtaste en hvilken som helst nummereringsmaske. I denne maske kan følgende tags bruges: <br> <b> {000000} </b> svarer til et tal, der vil blive forøget på hver %s. Indtast så mange nuller som den ønskede længde på tælleren. Tælleren udfyldes med nuller fra venstre for at have så mange nuller som masken. <br> <b> {000000 + 000} </b> samme som den forrige, men en forskydning svarende til tallet til højre for + -tegnet anvendes fra det første %s. <br> <b> {000000 @ x} </b> samme som den forrige, men tælleren nulstilles til nul, når måned x er nået (x mellem 1 og 12 eller 0 for at bruge de første måneder af regnskabsåret defineret i din konfiguration eller 99 til nulstilles til nul hver måned). Hvis denne indstilling bruges, og x er 2 eller højere, kræves også sekvensen {åå} {mm} eller {åååå} {mm}. <br> <b> {dd} </b> dag (01 til 31). <br> <b> {mm} </b> måned (01 til 12). <br> <b> {åå} </b>, <b> {åååå} </b> eller <b> {y} a09a4b039f <br>
+GenericMaskCodes2= <b> {cccc} </b> klientkoden på n tegn <br> <b> {cccc000} </b> kunden er efterfulgt af kunden, der er dedikeret til kunden. Denne tæller dedikeret til kunden nulstilles samtidig med den globale tæller. <br> <b> {tttt} </b> Koden for tredjeparts type på n tegn (se menu Hjem - Opsætning - Ordbog - Typer tredjeparter). Hvis du tilføjer dette tag, vil tælleren være forskellig for hver type tredjepart. <br>
 GenericMaskCodes3=Alle andre tegn i maske vil forblive intakt. <br> Mellemrum er ikke tilladt. <br>
+GenericMaskCodes3EAN=Alle andre tegn i masken forbliver intakte (undtagen * eller? I 13. position i EAN13). <br> mellemrum er ikke tilladt. <br> I EAN13 skal det sidste tegn efter det sidste} i 13. position være * eller? . Det erstattes af den beregnede nøgle. <br>
 GenericMaskCodes4a=<u>Eksempel på 99 %s af tredje part TheCompany, med dato 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Eksempel på tredjemand oprettet den 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Eksempel på vare oprettet 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Blankt felt her betyder, at denne værdi vil blive g
 ExtrafieldParamHelpselect=Liste over værdier skal være linjer med formatnøgle, værdi (hvor nøglen ikke kan være '0') <br> <br> for eksempel: <br> 1, værdi1 <br> 2, værdi2 <br> kode3, værdi3 <br> ... <br> <br> For at få liste afhængig af en anden komplementær attributliste: <br> 1, værdi1 | options_ <i> parent_list_code </i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> For at få listen afhængig af en anden liste: <br> 1, værdi1 | <i> parent_list_code </i>: parent_key <br> 2, value2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Liste over værdier skal være linjer med formatnøgle, værdi (hvor nøglen ikke kan være '0') <br> <br> for eksempel: <br> 1, værdi1 <br> 2, værdi2 <br> 3, værdi3 <br> ...
 ExtrafieldParamHelpradio=Liste over værdier skal være linjer med formatnøgle, værdi (hvor nøglen ikke kan være '0') <br> <br> for eksempel: <br> 1, værdi1 <br> 2, værdi2 <br> 3, værdi3 <br> ...
-ExtrafieldParamHelpsellist=Liste over værdier kommer fra en tabel <br> Syntaks: tabelnavn: label_field: id_field :: filter <br> Eksempel: c_typent: libelle: id :: filter <br> <br> - id_field er nødvendigvis en primær nøgle = 1) for kun at vise aktiv værdi <br> Du kan også bruge $ ID $ i filteret, som er det aktuelle id for det aktuelle objekt <br> For at bruge en SELECT i filteret skal du bruge nøgleordet $ SEL $ til at omgå anti-injektionsbeskyttelse. <br> hvis du vil filtrere på ekstrafelter skal du bruge syntaks ekstra.fieldcode = ... (hvor feltkode er koden for extrafield) <br> <br> For at få listen afhængig af en anden supplerende attributliste: <br> c_t: <i> parent_list_code </i> | parent_column: filter <br> <br> For at få listen afhængig af en anden liste: <br> c_typent: libelle: id: a049
-ExtrafieldParamHelpchkbxlst=Liste over værdier kommer fra en tabel <br> Syntaks: tabelnavn: label_field: id_field :: filter <br> Eksempel: c_typent: libelle: id :: filter <br> <br> filter kan være en simpel test (f.eks. Aktiv = 1) for at vise kun aktiv værdi <br> Du kan også bruge $ ID $ i filter heks er det nuværende id for nuværende objekt <br> For at gøre et SELECT i filter bruger $ SEL $ <br> hvis du vil filtrere på ekstrafelter brug syntax extra.fieldcode = ... (hvor feltkode er kode for ekstrafelt) <br> <br> For at få listen afhængig af en anden komplementær attributliste: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> For at få listen afhængig af en anden liste: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelpsellist=Liste over værdier kommer fra en tabel <br> Syntaks: tabelnavn: label_field: id_field :: filtersql <br> Eksempel: c_typent: libelle: id :: filtersql <br> <br> - id_felt er nøgle aq34 er nødvendigt. Det kan være en simpel test (f.eks. Aktiv = 1) for kun at vise aktiv værdi <br> Du kan også bruge $ ID $ i filteret, som er det aktuelle id for det aktuelle objekt <br> For at bruge en SELECT i filteret skal du bruge nøgleordet $ SEL $ til omgå anti-injektionsbeskyttelse. <br> hvis du vil filtrere på ekstrafelter skal du bruge syntaks ekstra.fieldcode = ... (hvor feltkode er koden for extrafield) <br> <br> For at få listen afhængig af en anden supplerende attributliste: <br> c_t: <i> parent_list_code </i> | parent_column: filter <br> <br> For at få listen afhængig af en anden liste: <br> c_typent: libelle: id: a049
+ExtrafieldParamHelpchkbxlst=Liste over værdier kommer fra en tabel <br> Syntaks: tabelnavn: label_field: id_field :: filtersql <br> Eksempel: c_typent: libelle: id :: filtersql <br> <br> filter kan kun være en simpel test34 kan også bruge $ ID $ i filterheks er det aktuelle id for det aktuelle objekt <br> For at udføre et SELECT i filter skal du bruge $ SEL $ <br> hvis du vil filtrere på ekstrafelter, skal du bruge syntaks ekstra.fieldcode = ... (hvor feltkode er kode af ekstra felt) <br> <br> for at få listen afhængigt af en anden supplerende liste attribut: <br> c_typent: Libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> for at få listen, afhængigt af en anden liste: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelplink=Parametre skal være ObjectName: Classpath <br> Syntaks: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Hold tomt for en simpel separator <br> Indstil dette til 1 for en sammenklappende separator (åben som standard for ny session, og derefter bevares status for hver brugersession) <br> Indstil dette til 2 for en sammenklappende separator (kollapset som standard for ny session, derefter holdes status foran hver brugersession)
 LibraryToBuildPDF=Bibliotek, der bruges for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Leverandører
 Module40Desc=Leverandører og købsstyring (indkøbsordrer og fakturering af leverandørfakturaer)
 Module42Name=Debug Logs
 Module42Desc=Logning faciliteter (fil, syslog, ...). Disse logs er for teknisk/debug formål.
+Module43Name=Fejlfindingslinje
+Module43Desc=Et værktøj til udvikling af tilføjelse af en fejlfindingslinje i din browser.
 Module49Name=Tekstredigeringsværktøjer
 Module49Desc=Indstillinger for tekstredigeringsværktøjer
 Module50Name=Varer
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteringer kapaciteter
 Module3200Name=Uændrede arkiver
 Module3200Desc=Aktivér en uforanderlig log over forretningsbegivenheder. Begivenheder arkiveres i realtid. Loggen er et skrivebeskyttet bord af kæden, der kan eksporteres. Dette modul kan være obligatorisk for nogle lande.
+Module3400Name=Sociale netværk
+Module3400Desc=Aktivér felter til sociale netværk i tredjeparter og adresser (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (forvaltningen af ​​afdelingen, medarbejderkontrakter og følelser)
 Module5000Name=Multi-selskab
 Module5000Desc=Giver dig mulighed for at administrere flere selskaber
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatisk oprettelse af objekt og/eller automatisk status ændring)
+Module6000Name=Inter-moduler Workflow
+Module6000Desc=Workflow-styring mellem forskellige moduler (automatisk oprettelse af objekt og / eller automatisk statusændring)
 Module10000Name=websteder
 Module10000Desc=Opret websteder (offentlige) med en WYSIWYG-editor. Dette er en webmaster eller udviklerorienteret CMS (det er bedre at kende HTML og CSS sprog). Bare opsæt din webserver (Apache, Nginx, ...) for at pege på det dedikerede Dolibarr-bibliotek for at have det online på internettet med dit eget domænenavn.
 Module20000Name=Ferie/Fri Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Opret/rediger interne/eksterne brugere og tilladelser
 Permission254=Opret/rediger kun eksterne brugere
 Permission255=Opret/rediger anden brugers adgangskode
 Permission256=Ændre sin egen adgangskode
-Permission262=Udvid adgang til alle tredjeparter (ikke kun tredjeparter, for hvilke den pågældende bruger er salgsrepræsentant). <br> Ikke effektiv for eksterne brugere (altid begrænset til sig selv for forslag, ordrer, fakturaer, kontrakter mv.). <br> Ikke effektiv til projekter (kun regler om projekttilladelser, synlighed og opgaveforhold).
+Permission262=Udvid adgang til alle tredjeparter OG deres objekter (ikke kun tredjeparter, som brugeren er salgsrepræsentant for). <br> Ikke effektiv for eksterne brugere (altid begrænset til sig selv til forslag, ordrer, fakturaer, kontrakter osv.). <br> Ikke effektiv til projekter (kun regler om projekttilladelser, synlighed og opgave).
+Permission263=Udvid adgangen til alle tredjeparter UDEN deres objekter (ikke kun tredjeparter, som brugeren er salgsrepræsentant for). <br> Ikke effektiv for eksterne brugere (altid begrænset til sig selv til forslag, ordrer, fakturaer, kontrakter osv.). <br> Ikke effektiv til projekter (kun regler om projekttilladelser, synlighed og opgave).
 Permission271=Læs CA
 Permission272=Læs fakturaer
 Permission273=Udsteder fakturaer
@@ -1175,7 +1184,8 @@ SetupDescription2=Følgende to afsnit er obligatoriske (de to første indgange i
 SetupDescription3=<a href="%s">%s->%s</a><br><br> Grundlæggende parametre, der bruges til at tilpasse din applikations standardopførsel (f.eks. For landrelaterede funktioner).
 SetupDescription4=<a href="%s">%s->%s</a><br><br> Denne software er en pakke med mange moduler / applikationer. Modulerne relateret til dine behov skal være aktiveret og konfigureret. Menuposter vises ved aktivering af disse moduler.
 SetupDescription5=Andre opsætningsmenuindgange styrer valgfrie parametre.
-LogEvents=Sikkerhed revision arrangementer
+AuditedSecurityEvents=Sikkerhedshændelser, der revideres
+NoSecurityEventsAreAduited=Ingen sikkerhedshændelser revideres. Du kan aktivere dem fra menu %s
 Audit=Audit
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=At køre opgraderingsprocessen ser ud til at v
 YouMustRunCommandFromCommandLineAfterLoginToUser=Du skal køre denne kommando fra kommandolinjen efter login til en shell med brugerens <b>%s.</b>
 YourPHPDoesNotHaveSSLSupport=SSL-funktioner ikke er tilgængelige i dit PHP
 DownloadMoreSkins=Find flere skind på Dolistore.com
-SimpleNumRefModelDesc=Returnerer referencenummeret med formatet %syymm-nnnn hvor du er år, mm er måned og nnnn er sekventiel uden nulstilling
+SimpleNumRefModelDesc=Returnerer referencenummeret i formatet %syymm-nnnn hvor yy er året, mm er måneden og nnnn er et sekventielt auto-stigende nummer uden nulstilling
 ShowProfIdInAddress=Vis professionelt id med adresser
 ShowVATIntaInAddress=Skjul momsregistreringsnummer i Fællesskabet med adresser
 TranslationUncomplete=Delvis oversættelse
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxyserver: Navn / Adresse
 MAIN_PROXY_PORT=Proxyserver: Port
 MAIN_PROXY_USER=Proxyserver: Login / Bruger
 MAIN_PROXY_PASS=Proxyserver: Adgangskode
-DefineHereComplementaryAttributes=Definer her eventuelle ekstra / brugerdefinerede attributter, som du vil være inkluderet i: %s
+DefineHereComplementaryAttributes=Definer eventuelle yderligere / tilpassede attributter, der skal føjes til: %s
 ExtraFields=Supplerende egenskaber
 ExtraFieldsLines=Supplerende attributter (linjer)
 ExtraFieldsLinesRec=Supplerende attributter (skabeloner faktura linjer)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (Unix)
 LDAPFieldLoginExample=Eksempel: uid
 LDAPFilterConnection=Søgefilter
 LDAPFilterConnectionExample=Eksempel: & (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Eksempel: & (objectClass = groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Eksempel: Samaccountnavn
 LDAPFieldFullname=Fornavn Navn
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Dit firma er blevet defineret til ikke at bruge moms (H
 AccountancyCode=Regnskabskode
 AccountancyCodeSell=Salgskonto. kode
 AccountancyCodeBuy=Indkøbskonto. kode
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Hold afkrydsningsfeltet "Opret automatisk betalingen" tomt som standard, når du opretter en ny skat
 ##### Agenda #####
 AgendaSetup=Opsætning af modul for begivenheder og tidsplan
 PasswordTogetVCalExport=Nøglen til at tillade eksport link
+SecurityKey = Sikkerhedsnøgle
 PastDelayVCalExport=Må ikke eksportere begivenhed ældre end
 AGENDA_USE_EVENT_TYPE=Brug begivenhedstyper (styret i menuopsætning -> Ordbøger -> Type agendahændelser)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Indstil denne standardværdi automatisk for type begivenhed i begivenhedsoprettelsesformular
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Baggrundsfarve til ulige bord linjer
 BackgroundTableLineEvenColor=Baggrundsfarve til lige bordlinier
 MinimumNoticePeriod=Mindste opsigelsesperiode (din anmodning om orlov skal ske inden denne forsinkelse)
 NbAddedAutomatically=Antal dage, der tilføjes til tællere af brugere (automatisk) hver måned
-EnterAnyCode=Dette felt indeholder en reference til at identificere linje. Indtast enhver værdi efter eget valg, men uden specialtegn.
+EnterAnyCode=Dette felt indeholder en reference til identifikation af linjen. Indtast en hvilken som helst værdi efter eget valg, men uden specialtegn.
 Enter0or1=Tryk 0 eller 1
 UnicodeCurrency=Indtast her mellem seler, liste over byte nummer, der repræsenterer valutasymbolet. For eksempel: for $, indtast [36] - for Brasilien real R $ [82,36] - for €, indtast [8364]
 ColorFormat=RGB-farven er i HEX-format, fx: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bundmargen på PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Højde for logo på PDF
 NothingToSetup=Der kræves ingen specifik opsætning for dette modul.
 SetToYesIfGroupIsComputationOfOtherGroups=Indstil dette til ja, hvis denne gruppe er en beregning af andre grupper
-EnterCalculationRuleIfPreviousFieldIsYes=Indtast beregningsregel, hvis tidligere felt blev sat til Ja (For eksempel 'CODEGRP1 + CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Indtast beregningsregel, hvis det forrige felt blev indstillet til Ja. <br> For eksempel: <br> CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=Flere sprogvarianter fundet
 RemoveSpecialChars=Fjern specialtegn
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter til ren værdi (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Opsætning af modul Sociale netværk
 EnableFeatureFor=Aktivér funktioner til <strong> %s </ strong>
 VATIsUsedIsOff=Bemærk: Muligheden for at bruge salgsafgift eller moms er blevet indstillet til <strong> Fra </strong> i menuen %s - %s, så Salgsskat eller moms anvendes altid 0 for salg.
 SwapSenderAndRecipientOnPDF=Skift afsender- og modtageradresseposition på PDF-dokumenter
-FeatureSupportedOnTextFieldsOnly=Advarsel, funktion understøttes kun på tekstfelter. Også en URL parameter handling = create or action = edit skal indstilles ELLER sidens navn skal slutte med 'new.php' for at udløse denne funktion.
+FeatureSupportedOnTextFieldsOnly=Advarsel, funktion understøttet kun i tekstfelter og kombinationslister. Også en URL-parameterhandling = Opret eller handling = redigering skal indstilles ELLER sidenavnet skal slutte med 'new.php' for at udløse denne funktion.
 EmailCollector=Email samler
 EmailCollectorDescription=Tilføj et planlagt job og en opsætningsside for at scanne jævnligt emailkasser (ved hjælp af IMAP-protokollen) og optag e-mails, der er modtaget i din ansøgning, på det rigtige sted og / eller lav nogle poster automatisk (som kundeemner).
 NewEmailCollector=Ny Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Brug fejlfindingslinjen
 DEBUGBAR_LOGS_LINES_NUMBER=Antal sidste loglinjer, der skal holdes i konsollen
 WarningValueHigherSlowsDramaticalyOutput=Advarsel, højere værdier bremser dramatisk output
 ModuleActivated=Modul %s er aktiveret og forsinker grænsefladen
+ModuleActivatedWithTooHighLogLevel=Modul %s er aktiveret med et for højt logningsniveau (prøv at bruge et lavere niveau for bedre præstationer)
+ModuleSyslogActivatedButLevelNotTooVerbose=Modul %s er aktiveret, og logniveau (%s) er korrekt (ikke for detaljeret)
 IfYouAreOnAProductionSetThis=Hvis du er i et produktionsmiljø, skal du indstille denne egenskab til %s.
 AntivirusEnabledOnUpload=Antivirus aktiveret på uploadede filer
+SomeFilesOrDirInRootAreWritable=Nogle filer eller mapper er ikke i en skrivebeskyttet tilstand
 EXPORTS_SHARE_MODELS=Eksportmodeller deles med alle
 ExportSetup=Opsætning af modul Eksport
 ImportSetup=Opsætning af modul til import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Lav en anonym Ping '+1' til Dolibarr foundation-serveren (udf
 FeatureNotAvailableWithReceptionModule=Funktion ikke tilgængelig, når modulmodtagelse er aktiveret
 EmailTemplate=Skabelon til e-mail
 EMailsWillHaveMessageID=E-mails har et mærke 'Referencer', der matcher denne syntaks
+PDF_SHOW_PROJECT=Vis projekt på dokument
+ShowProjectLabel=Projektmærke
 PDF_USE_ALSO_LANGUAGE_CODE=Hvis du vil have nogle tekster i din PDF kopieret på 2 forskellige sprog i den samme genererede PDF, skal du indstille her dette andet sprog, så genereret PDF indeholder 2 forskellige sprog på samme side, det, der er valgt, når du genererer PDF og denne ( kun få PDF-skabeloner understøtter dette). Hold tomt i 1 sprog pr. PDF.
 FafaIconSocialNetworksDesc=Indtast her koden for et FontAwesome-ikon. Hvis du ikke ved, hvad der er FontAwesome, kan du bruge den generiske værdi fa-adressebog.
 FeatureNotAvailableWithReceptionModule=Funktion ikke tilgængelig, når modulmodtagelse er aktiveret
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Det anbefales at skifte denne værdi til %s for mer
 DictionaryProductNature= Produktets art
 CountryIfSpecificToOneCountry=Land (hvis det er specifikt for et givet land)
 YouMayFindSecurityAdviceHere=Du kan finde sikkerhedsrådgivning her
-ModuleActivatedMayExposeInformation=Dette modul kan udsætte følsomme data. Hvis du ikke har brug for det, skal du deaktivere det.
+ModuleActivatedMayExposeInformation=Denne PHP-udvidelse kan udsætte følsomme data. Hvis du ikke har brug for det, skal du deaktivere det.
 ModuleActivatedDoNotUseInProduction=Et modul designet til udviklingen er blevet aktiveret. Aktivér det ikke i et produktionsmiljø.
 CombinationsSeparator=Separatorkarakter til produktkombinationer
 SeeLinkToOnlineDocumentation=Se link til online dokumentation i topmenuen for eksempler
 SHOW_SUBPRODUCT_REF_IN_PDF=Hvis funktionen "%s" i modul <b> %s </b> bruges, skal du vise detaljer om delprodukter af et sæt på PDF.
 AskThisIDToYourBank=Kontakt din bank for at få dette ID
+AdvancedModeOnly=Tilladelse er kun tilgængelig i udvidet tilladelsestilstand
+ConfFileIsReadableOrWritableByAnyUsers=Conf-filen kan læses eller skrives af alle brugere. Giv kun tilladelse til webserverbrugere og -grupper.
+MailToSendEventOrganization=Begivenhedsorganisation
+AGENDA_EVENT_DEFAULT_STATUS=Standardhændelsesstatus, når du opretter en begivenhed fra formularen
+YouShouldDisablePHPFunctions=Du skal deaktivere PHP-funktioner
+IfCLINotRequiredYouShouldDisablePHPFunctions=Bortset fra hvis du har brug for at køre systemkommandoer (for modulet Planlagt job eller for at køre den eksterne kommandolinje for eksempel Anti-virus), skal du deaktivere PHP-funktioner
+NoWritableFilesFoundIntoRootDir=Ingen skrivbare filer eller mapper til de almindelige programmer blev fundet i din rodkatalog (God)
+RecommendedValueIs=Anbefalet: %s
+ARestrictedPath=En begrænset sti
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index c1fb2a83106..4e7a7706f4b 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Dit SEPA mandat
 FindYourSEPAMandate=Dette er dit SEPA-mandat til at give vores firma tilladelse til at foretage en direkte debitering til din bank. Ret det underskrevet (scan af det underskrevne dokument) eller send det pr. Mail til
 AutoReportLastAccountStatement=Udfyld automatisk feltet 'antal kontoudtog' med det sidste erklæringsnummer, når du foretager afstemning
 CashControl=POS kasse apparats kontrol
-NewCashFence=Ny kasse apparat  lukker
+NewCashFence=Ny kasseapparat åbner eller lukker
 BankColorizeMovement=Farvelæg bevægelser
 BankColorizeMovementDesc=Hvis denne funktion er aktiveret, kan du vælge specifik baggrundsfarve til debet- eller kreditbevægelser
 BankColorizeMovementName1=Baggrundsfarve til debetbevægelse
 BankColorizeMovementName2=Baggrundsfarve til kreditbevægelse
 IfYouDontReconcileDisableProperty=Hvis du ikke foretager bankafstemninger på nogle bankkonti, skal du deaktivere ejerskab "%s" på dem for at fjerne denne advarsel.
 NoBankAccountDefined=Ingen bankkonto defineret
+NoRecordFoundIBankcAccount=Ingen registrering fundet på bankkontoen. Dette sker normalt, når en post er slettet manuelt fra listen over transaktioner på bankkontoen (for eksempel under en afstemning af bankkontoen). En anden grund er, at betalingen blev registreret, da modulet "%s" blev deaktiveret.
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 07502e953de..6d0f386fced 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -52,11 +52,12 @@ Invoices=Fakturaer
 InvoiceLine=Fakturalinje
 InvoiceCustomer=Kundefaktura
 CustomerInvoice=Kundefaktura
-CustomersInvoices=Kundefakturaer
+CustomersInvoices=Kunde fakturaer
 SupplierInvoice=Leverandørfaktura
-SuppliersInvoices=Leverandørfakturaer
+SuppliersInvoices=Leverandør fakturaer
+SupplierInvoiceLines=Leverandørfakturelinjer
 SupplierBill=Leverandørfaktura
-SupplierBills=leverandørfakturaer
+SupplierBills=Leverandør fakturaer
 Payment=Betaling
 PaymentBack=Tilbagebetaling
 CustomerInvoicePaymentBack=Tilbagebetaling
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Betalinger allerede udført
 PaymentsBackAlreadyDone=Tilbagebetaling allerede udført
 PaymentRule=Betalingsregel
 PaymentMode=Betalings type
+DefaultPaymentMode=Standard betalingstype
+DefaultBankAccount=Standard bankkonto
 PaymentTypeDC=Debet / Kreditkort
 PaymentTypePP=PayPal
 IdPaymentMode=Betalingstype (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Dato for seneste generation
 DateLastGenerationShort=Dato seneste gener.
 MaxPeriodNumber=Maks. antal fakturaproduktion
 NbOfGenerationDone=Antal fakturagenerering allerede udført
+NbOfGenerationOfRecordDone=Antallet af rekordgenerering, der allerede er udført
 NbOfGenerationDoneShort=Antal genererede færdigheder
 MaxGenerationReached=Maksimalt antal generationer nået
 InvoiceAutoValidate=Validér fakturaer automatisk
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Inden for 14 dage efter slutningen af ​​måneden
 FixAmount=Fast beløb - 1 linje med etiketten '%s'
 VarAmount=Variabel mængde (%% tot.)
 VarAmountOneLine=Variabel mængde (%% tot.) - 1 linje med etiket '%s'
-VarAmountAllLines=Variabelt beløb (%% tot.) - alle samme linjer
+VarAmountAllLines=Variabelt beløb (%% tot.) - alle linjer fra oprindelse
 # PaymentType
 PaymentTypeVIR=Bankoverførsel
 PaymentTypeShortVIR=Bankoverførsel
@@ -494,12 +498,16 @@ Cash=Kontanter
 Reported=Forsinket
 DisabledBecausePayments=Ikke muligt da der er nogle betalinger
 CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betaling, da der er mindst en faktura, der er klassificeret som betalt
+CantRemovePaymentVATPaid=Kan ikke fjerne betaling, da momsangivelse er klassificeret betalt
+CantRemovePaymentSalaryPaid=Kan ikke fjerne betaling, da løn er klassificeret betalt
 ExpectedToPay=Forventet betaling
 CantRemoveConciliatedPayment=Kan ikke fjerne afstemt betaling
 PayedByThisPayment=Betalt med denne betaling
 ClosePaidInvoicesAutomatically=Klassificer automatisk alle standard-, udbetalings- eller udskiftningsfakturaer som "Betalt", når betalingen udføres helt.
 ClosePaidCreditNotesAutomatically=Klassificer automatisk alle kreditnotaer som "Betalt", når refusionen er udført helt.
 ClosePaidContributionsAutomatically=Klassificer automatisk alle sociale eller skattemæssige bidrag som "Betalt", når betaling sker helt.
+ClosePaidVATAutomatically=Klassificer automatisk momsangivelse som "betalt", når betalingen sker fuldstændigt.
+ClosePaidSalaryAutomatically=Klassificer automatisk løn som "Betalt", når betalingen sker fuldstændigt.
 AllCompletelyPayedInvoiceWillBeClosed=Alle fakturaer uden resterende betaling skal automatisk lukkes med status "Betalt".
 ToMakePayment=Betale
 ToMakePaymentBack=Tilbagebetalt
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Du skal først oprette en standardfaktura
 PDFCrabeDescription=Faktura PDF-skabelon Crabe. En komplet fakturaskabelon (gammel implementering af svampeskabelon)
 PDFSpongeDescription=Faktura PDF skabelon opsætning. En komplet faktura skabelon
 PDFCrevetteDescription=Faktura PDF skabelon Crevette. En komplet faktura skabelon for kontoudtog
-TerreNumRefModelDesc1=Retur nummer med format %syymm-nnnn for standard faktura og %syymm-nnnn for kreditnoter hvor du er år, mm er måned og nnnn er en sekvens uden pause og ingen tilbagevenden til 0
-MarsNumRefModelDesc1=Retur nummer med format %syymm-nnnn for standardfakturaer, %syymm-nnnn for udskiftningsfakturaer, %syymm-nnnn til fakturaer med forskud og %syymm-nnnn for kreditnoter hvor du er år, mm er måned og nnnn er en sekvens uden pause og nej vende tilbage til 0
+TerreNumRefModelDesc1=Returneringsnummer i formatet %syymm-nnnn til standardfakturaer og %syymm-nnnn til kreditnotaer, hvor yy er år, mm er måned og nnnn er et sekventielt automatisk stigende nummer uden pause og uden returnering til 0
+MarsNumRefModelDesc1=Returneringsnummer i formatet %syymm-nnnn for standardfakturaer, %syymm-nnnn til udskiftningsfakturaer, %syymm-nnnn for udbetalingsfakturaer og %syymm-nnnn er uden pause og ingen tilbagevenden til 0
 TerreNumRefModelError=Et faktura, der begynder med $ syymm allerede eksisterer og er ikke kompatible med denne model af sekvensinformation. Fjern den eller omdøbe den til at aktivere dette modul.
-CactusNumRefModelDesc1=Returnummer med format %syymm-nnnn for standardfakturaer, %syymm-nnnn for kreditnotaer og %syymm-nnnn for afbetalingsfakturaer hvor du er år, mm er måned og nnnn er en sekvens uden pause og ingen tilbagevenden til 0
+CactusNumRefModelDesc1=Returneringsnummer i formatet %syymm-nnnn for standardfakturaer, %syymm-nnnn for kreditnotaer og %syymm-nnnn for udbetalingsfakturaer, hvor yy er år, mm er måned og nnnn er et løbende returneringsnummer uden inkr. 0
 EarlyClosingReason=Årsag til tidlig lukning
 EarlyClosingComment=Tidlig afsluttende note
 ##### Types de contacts #####
@@ -562,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Hvis du har brug for at generere sådanne fakt
 DeleteRepeatableInvoice=Slet fakturaskabelon
 ConfirmDeleteRepeatableInvoice=Er du sikker på, at du vil slette fakturaenskabelon?
 CreateOneBillByThird=Opret en faktura pr. Tredjepart (ellers en faktura pr. Ordre)
-BillCreated=%s regning(er) oprettet
+BillCreated=%s genereret faktura (er)
+BillXCreated=Faktura %s genereret
 StatusOfGeneratedDocuments=Status for dokument generering
 DoNotGenerateDoc=Generer ikke dokument fil
 AutogenerateDoc=Auto generere dokument fil
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index dfa01d60748..bc3abe1574c 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistik over de vigtigste forretningsobjekter i databasen
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Seneste %s produkter / tjenester
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Senest ændrede medlemmer
+BoxLastMembersSubscriptions=Seneste medlemsabonnementer
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Fødselsdage i denne måned (medlemmer)
+BoxTitleMembersByType=Medlemmer efter type
+BoxTitleMembersSubscriptionsByYear=Medlemmer Abonnementer efter år
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Produkter / tjenester: sidst %s ændret
 BoxTitleProductsAlertStock=Produkter: lager advarsel
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Nyeste %s forsendelser kunde
 NoRecordedShipments=Ingen registreret kundeforsendelse
 BoxCustomersOutstandingBillReached=Kunder med en udestående grænse nået
 # Pages
-AccountancyHome=Bogføring
+UsersHome=Hjemmebrugere og grupper
+MembersHome=Hjemmemedlemskab
+ThirdpartiesHome=Hjemme-tredjeparter
+TicketsHome=Hjem billetter
+AccountancyHome=Hjemregnskab
 ValidatedProjects=Validerede projekter
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index 881d4fe22c6..dd36fa5b4e2 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Sælgere tags / kategorier område
 CustomersCategoriesArea=Kunder tags/kategorier
 MembersCategoriesArea=Medlemmer tags/kategorier
 ContactsCategoriesArea=Kontakter tags/kategorier område
-AccountsCategoriesArea=Konti tags/kategorier område
+AccountsCategoriesArea=Bankkontomærker / kategoriområde
 ProjectsCategoriesArea=Projekter tags/kategorier område
 UsersCategoriesArea=Brugere tags / kategorier område
 SubCats=Sub-kategorier
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index c01f19fef89..411dc19efc9 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -44,8 +44,9 @@ ToCreateContactWithSameName=Der oprettes automatisk en kontakt/adresse med samme
 ParentCompany=Moderselskab
 Subsidiaries=Datterselskaber
 ReportByMonth=Rapport pr. Måned
-ReportByCustomers=Rapport af kunde
-ReportByQuarter=Rapport fra kvartal
+ReportByCustomers=Rapporter pr. Kunde
+ReportByThirdparties=Rapport pr. Tredjepart
+ReportByQuarter=Rapport pr. Sats
 CivilityCode=Landekode
 RegisteredOffice=Hjemsted
 Lastname=Efternavn
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Social Security Number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate nummer)
-ProfId5ES=EORI-nummer
+ProfId5ES=Prof Id 5 (EORI-nummer)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, gamle APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=EORI-nummer
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIRENE
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Prof ID 1 (Registration Number)
 ProfId2GB=-
 ProfId3GB=Prof Id 3 (SIC)
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI-nummer
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (erhvervstilladelse)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof ID 2 (Social Security Number)
 ProfId3PT=Prof Id 3 (CVR-nummer)
 ProfId4PT=Prof Id 4 (konservatorium)
-ProfId5PT=EORI-nummer
+ProfId5PT=Prof Id 5 (EORI-nummer)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Registreringsnummer)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI-nummer
+ProfId5RO=Prof Id 5 (EORI-nummer)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Udestående faktura i øjeblikket
 OutstandingBill=Maks. for udstående faktura
 OutstandingBillReached=Maks. for udestående regning nået
 OrderMinAmount=Minimumsbeløb for ordre
-MonkeyNumRefModelDesc=Ret et nummer med formatet %syymm-nnnn til kundekode og %syymm-nnnn for leverandørkoden, hvor du er år, mm er måned og nnnn er en sekvens uden pause og ingen tilbagevenden til 0.
+MonkeyNumRefModelDesc=Returner et nummer i formatet %syymm-nnnn for kundekoden og %syymm-nnnn for sælgerkoden, hvor yy er år, mm er måned og nnnn er et sekventielt automatisk stigende nummer uden pause og ingen returnering til 0.
 LeopardNumRefModelDesc=Kunde / leverandør-koden er ledig. Denne kode kan til enhver tid ændres.
 ManagingDirectors=Leder(e) navne (CEO, direktør, chef...)
 MergeOriginThirdparty=Duplicate tredjepart (tredjepart, du vil slette)
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 67d0f186df3..2c6f3c521b8 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST køb
 VATCollected=Modtaget moms
 StatusToPay=At betale
 SpecialExpensesArea=Særlige betalinger
+VATExpensesArea=Område til alle TVA-betalinger
 SocialContribution=Skat/afgift
 SocialContributions=Skatter/afgifter
 SocialContributionsDeductibles=Fradragsberettigede skatter/afgifter
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Betaling for kundefaktura
 PaymentSupplierInvoice=leverandør faktura betaling
 PaymentSocialContribution=Betaling af skat/afgift
 PaymentVat=Betaling af moms
+AutomaticCreationPayment=Registrer automatisk betalingen
 ListPayment=Oversigt over betalinger
 ListOfCustomerPayments=Oversigt over kundebetalinger
 ListOfSupplierPayments=Liste over leverandørbetalinger
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF betaling
 LT2PaymentsES=IRPF betalinger
 VATPayment=Betaling af udgående moms
 VATPayments=Betalinger af udgående moms
+VATDeclarations=Momsangivelser
+VATDeclaration=Momsangivelse
 VATRefund=Salgskat refusion
 NewVATPayment=Ny momsafgift
 NewLocalTaxPayment=Ny Moms %s betaling
@@ -134,9 +138,17 @@ NoWaitingChecks=Ingen checks afventer indbetaling.
 DateChequeReceived=Dato for modtagelse af check
 NbOfCheques=Antal checks
 PaySocialContribution=Betal skat/afgift
-ConfirmPaySocialContribution=Er du sikker på, at du vil markere denne skat/afgift som betalt?
+PayVAT=Betal en momsangivelse
+PaySalary=Betal et lønkort
+ConfirmPaySocialContribution=Er du sikker på, at du vil klassificere denne sociale eller skattemæssige skat som betalt?
+ConfirmPayVAT=Er du sikker på, at du vil klassificere denne momsangivelse som betalt?
+ConfirmPaySalary=Er du sikker på, at du vil klassificere dette lønkort som betalt?
 DeleteSocialContribution=Slet en betaling af skat/afgift
-ConfirmDeleteSocialContribution=Er du sikker på, at du vil slette denne betaling af skat/afgift?
+DeleteVAT=Slet en momsangivelse
+DeleteSalary=Slet et lønkort
+ConfirmDeleteSocialContribution=Er du sikker på, at du vil slette denne sociale / skattemæssige skattebetaling?
+ConfirmDeleteVAT=Er du sikker på, at du vil slette denne momsangivelse?
+ConfirmDeleteSalary=Er du sikker på, at du vil slette denne løn?
 ExportDataset_tax_1=Betalinger af skatter/afgifter
 CalcModeVATDebt=Indstilling <b> %sMoms på forpligtelseskonto%s </b>.
 CalcModeVATEngagement=Mode <b> %sVAT på indkomst-udgifter%s </ b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- Den omfatter de reelle betalinger foretaget på fakturaer, ud
 RulesCADue=- Det inkluderer kundens forfaldne fakturaer, uanset om de er betalt eller ej.<br> - Det er baseret på faktureringsdatoen for disse fakturaer.<br>
 RulesCAIn=- Den omfatter alle effektive betalinger af fakturaer modtaget fra kunder. <br> - Det er baseret på betalingsdatoen for disse fakturaer <br>
 RulesCATotalSaleJournal=Den omfatter alle kreditlinjer fra salgslisten.
+RulesSalesTurnoverOfIncomeAccounts=Det inkluderer (kredit - debitering) af linjer for produktkonti i gruppe INDTÆGTER
 RulesAmountOnInOutBookkeepingRecord=Det indeholder post i din hovedbog med kontor, der har gruppen "EXPENSE" eller "INCOME"
 RulesResultBookkeepingPredefined=Det indeholder poster i din hovedbog med regnskabs kontoer, der har gruppen "EXPENSE" eller "INCOME"
 RulesResultBookkeepingPersonalized=Det viser kontoer i din hovedbog med regnskabs kontoer <b> grupperet af personlige grupper </b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Salgsskatterapport fra tredjepart
 VATReportByCustomers=Salgsskat rapport af kunde
 VATReportByCustomersInInputOutputMode=Rapport fra kunden moms indsamlet og betalt
 VATReportByQuartersInInputOutputMode=Indberetning ved Salgsskattesats af den indsamlede og betalte skat
+VATReportShowByRateDetails=Vis detaljer om denne sats
 LT1ReportByQuarters=Indberette skat 2 efter sats
 LT2ReportByQuarters=Indberette skat 3 efter sats
 LT1ReportByQuartersES=Rapportér ved RE-sats
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg underype
 InvoiceLinesToDispatch=Fakturalinjer til afsendelse
 ByProductsAndServices=Efter produkt og service
 RefExt=Ekstern ref
-ToCreateAPredefinedInvoice=For at oprette en fakturaskabelon skal du oprette en standardfaktura, og uden at godkende den, skal du klikke på knappen "%s".
+ToCreateAPredefinedInvoice=For at oprette en skabelonfaktura skal du oprette en standardfaktura og derefter klikke på knappen "%s" uden at validere den.
 LinkedOrder=Link til ordre
 Mode1=Metode 1
 Mode2=Metode 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Den dedikerede regnskabskonto, der er defineret
 ACCOUNTING_ACCOUNT_SUPPLIER=Regnskabskonto anvendt til leverandør tredjepart
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Den dedikerede regnskabskonto, der er defineret på tredjepartskort, vil kun blive anvendt til kassekladden. Denne vil blive brugt til regnskabet og som standardværdi i bogholderi regnskabet, hvis dedikeret leverandør regnskabskonto på tredjepart ikke er defineret.
 ConfirmCloneTax=Bekræft klonen af ​​en social / skattemæssig afgift
+ConfirmCloneVAT=Bekræft klonen på en momsangivelse
+ConfirmCloneSalary=Bekræft klonen på en løn
 CloneTaxForNextMonth=Klon det for næste måned
 SimpleReport=Simpel rapport
 AddExtraReport=Ekstra rapporter (tilføj udenlandsk og national kunderapport)
@@ -253,7 +269,8 @@ AccountingAffectation=Regnskabsopgave
 LastDayTaxIsRelatedTo=Sidste dag af skatten er relateret til
 VATDue=Salgsmoms påkrævet
 ClaimedForThisPeriod=Påstået for perioden
-PaidDuringThisPeriod=Betalt i denne periode
+PaidDuringThisPeriod=Betalt for denne periode
+PaidDuringThisPeriodDesc=Dette er summen af alle betalinger knyttet til momsangivelser, der har en slutdato i det valgte datointerval
 ByVatRate=Med Moms sats
 TurnoverbyVatrate=Omsætning faktureret ved salgskurs
 TurnoverCollectedbyVatrate=Omsætning opkrævet ved salgskurs
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Køb af omsætning samlet
 RulesPurchaseTurnoverDue=- Det inkluderer leverandørens forfaldne fakturaer, uanset om de er betalt eller ej. <br>- Det er baseret på fakturadato for disse fakturaer.<br>
 RulesPurchaseTurnoverIn=- Det inkluderer alle de effektive betalinger af fakturaer, der udføres til leverandører. <br>- Det er baseret på betalingsdatoen for disse fakturaer<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Det inkluderer alle debet linjer fra købsdagbogen.
+RulesPurchaseTurnoverOfExpenseAccounts=Det inkluderer (debet - kredit) af linier til produktkonti i gruppe UDGIFTER
 ReportPurchaseTurnover=Faktureret køb af omsætning
 ReportPurchaseTurnoverCollected=Køb af omsætning samlet
 IncludeVarpaysInResults = Medtag forskellige betalinger i rapporter
diff --git a/htdocs/langs/da_DK/ecm.lang b/htdocs/langs/da_DK/ecm.lang
index 804876f5f38..2df441a0807 100644
--- a/htdocs/langs/da_DK/ecm.lang
+++ b/htdocs/langs/da_DK/ecm.lang
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Søg på nøgleord
 ECMSearchByEntity=Søg på objektet
 ECMSectionOfDocuments=Abonnentfortegnelser af dokumenter
 ECMTypeAuto=Automatisk
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Dokumenter knyttet til %s
 ECMNoDirectoryYet=Ingen mappe oprettet
 ShowECMSection=Vis mappe
 DeleteSection=Fjern mappe
@@ -39,5 +39,9 @@ HashOfFileContent=Hash af fil indhold
 NoDirectoriesFound=Ingen mapper fundet
 FileNotYetIndexedInDatabase=Filen er endnu ikke indekseret i database (prøv at genoplaste den)
 ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
+ExtraFieldsEcmDirectories=Extrafields Ecm Mapper
+ECMSetup=ECM-opsætning
+GenerateImgWebp=Kopier alle billeder med en anden version med .webp-format
+ConfirmGenerateImgWebp=Hvis du bekræfter, vil du generere et billede i .webp-format for alle billeder i øjeblikket i denne mappe og dens undermappe ...
+ConfirmImgWebpCreation=Bekræft duplikering af alle billeder
+SucessConvertImgWebp=Billeder blev duplikeret
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 96148c9c1a8..5f382777db0 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> ikke fundet (Bad sti, forkerte rettigheder
 ErrorFunctionNotAvailableInPHP=<b>Funktion %s</b> er påkrævet for denne funktion, men er ikke tilgængelig i denne version / opsætning af PHP.
 ErrorDirAlreadyExists=En mappe med dette navn findes allerede.
 ErrorFileAlreadyExists=En fil med dette navn findes allerede.
+ErrorDestinationAlreadyExists=En anden fil med navnet <b> %s </b> findes allerede.
 ErrorPartialFile=Fil ikke modtaget helt af serveren.
 ErrorNoTmpDir=Midlertidig directy %s ikke eksisterer.
 ErrorUploadBlockedByAddon=Upload blokeret af en PHP / Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Fejl ved indlæsning af kontoplan. Hvis nogle konti ikke bl
 ErrorBadSyntaxForParamKeyForContent=Dårlig syntaks for parameternøgleindhold. Skal have en værdi, der starter med %s eller %s
 ErrorVariableKeyForContentMustBeSet=Fejl, konstanten med navn %s(med tekstindhold, der skal vises) eller %s(med ekstern url til at vises) skal sættes.
 ErrorURLMustStartWithHttp=URL %s skal starte med http: // eller https: //
+ErrorHostMustNotStartWithHttp=Værtsnavn %s må IKKE starte med http: // eller https: //
 ErrorNewRefIsAlreadyUsed=Fejl, den nye reference er allerede brugt
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Fejl, sletning af betaling, der er knyttet til en lukket faktura, er ikke mulig.
 ErrorSearchCriteriaTooSmall=Søgekriterier er for korte.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Offentlig grænseflade var ikke aktiveret
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Sprog for den nye side skal defineres, hvis det er indstillet som en oversættelse af en anden side
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Sprog på den nye side må ikke være kildesproget, hvis det er indstillet som en oversættelse af en anden side
 ErrorAParameterIsRequiredForThisOperation=En parameter er obligatorisk for denne handling
+ErrorDateIsInFuture=Fejl, datoen kan ikke være i fremtiden
+ErrorAnAmountWithoutTaxIsRequired=Fejl, beløb er obligatorisk
+ErrorAPercentIsRequired=Fejl, udfyld venligst procentdelen korrekt
+ErrorYouMustFirstSetupYourChartOfAccount=Du skal først konfigurere din kontoplan
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) er højere end PHP-parameter post_max_size (%s). Dette er ikke en ensartet opsætning.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Advarsel! Kunne ikke tilføje filindtast
 WarningTheHiddenOptionIsOn=Advarsel, den skjulte mulighed <b> %s </b> er aktiveret.
 WarningCreateSubAccounts=Advarsel, du kan ikke oprette en underkonto direkte, du skal oprette en tredjepart eller en bruger og tildele dem en regnskabskode for at finde dem på denne liste
 WarningAvailableOnlyForHTTPSServers=Kun tilgængelig, hvis du bruger HTTPS-sikret forbindelse.
+WarningModuleXDisabledSoYouMayMissEventHere=Modul %s er ikke aktiveret. Så du går måske glip af en masse begivenheder her.
+ErrorActionCommPropertyUserowneridNotDefined=Brugerens ejer kræves
+ErrorActionCommBadType=Den valgte hændelsestype (id: %n, kode: %s) findes ikke i begivenhedstypeordbogen
diff --git a/htdocs/langs/da_DK/externalsite.lang b/htdocs/langs/da_DK/externalsite.lang
index 0df00764d24..e9f24884e46 100644
--- a/htdocs/langs/da_DK/externalsite.lang
+++ b/htdocs/langs/da_DK/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Opsætning link til ekstern hjemmeside
-ExternalSiteURL=Ekstern webstedwebadresse
-ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
-ExampleMyMenuEntry=My menu entry
+ExternalSiteSetup=Opsæt link til ekstern hjemmeside
+ExternalSiteURL=Ekstern websteds-URL for HTML iframe-indhold
+ExternalSiteModuleNotComplete=Modul ExternalSite blev ikke konfigureret korrekt.
+ExampleMyMenuEntry=Min menu indgang
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 340e9f756c2..a19a7a0e0ce 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. dato
 IPModification=Ændring IP
 DateLastModification=Seneste ændring dato
 DateValidation=Bekræftelsesdato
+DateSigning=Underskrivelsesdato
 DateClosing=Udløbsdato
 DateDue=Forfaldsdag
 DateValue=Valørdato
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Enhedspris (ekskl.) (Valuta)
 UnitPriceTTC=Enhedspris
 PriceU=Salgspris
 PriceUHT=Pris (netto)
-PriceUHTCurrency=Salgspris (Valuta)
+PriceUHTCurrency=U.P (netto) (valuta)
 PriceUTTC=Brutto (inkl. moms)
 Amount=Beløb
 AmountInvoice=Fakturabeløbet
@@ -389,6 +390,8 @@ AmountTotal=Beløb i alt
 AmountAverage=Gennemsnitligt beløb
 PriceQtyMinHT=Prismængde min. (ekskl. skat)
 PriceQtyMinHTCurrency=Prismængde min. (ekskl. skat) (valuta)
+PercentOfOriginalObject=Procent af originalgenstand
+AmountOrPercent=Beløb eller procent
 Percentage=Procent
 Total=I alt
 SubTotal=Sum
@@ -599,11 +602,11 @@ MonthShort12=Dec
 MonthVeryShort01=J
 MonthVeryShort02=F
 MonthVeryShort03=M
-MonthVeryShort04=EN
+MonthVeryShort04=Ap
 MonthVeryShort05=M
 MonthVeryShort06=J
 MonthVeryShort07=J
-MonthVeryShort08=EN
+MonthVeryShort08=Au
 MonthVeryShort09=S
 MonthVeryShort10=O
 MonthVeryShort11=N
@@ -724,7 +727,7 @@ MenuMembers=Medlemmer
 MenuAgendaGoogle=Google dagsorden
 MenuTaxesAndSpecialExpenses=Skatter | Særlige udgifter
 ThisLimitIsDefinedInSetup=Dolibarr grænse (Menu hjemme-setup-sikkerhed): %s Kb, PHP grænse: %s Kb
-NoFileFound=Ingen dokumenter gemt i denne mappe
+NoFileFound=Ingen dokumenter uploadet
 CurrentUserLanguage=Valgt sprog
 CurrentTheme=Nuværende tema
 CurrentMenuManager=Aktuel menuhåndtering
@@ -899,8 +902,10 @@ ViewAccountList=Vis hovedbog
 ViewSubAccountList=Se underkonto hovedbog
 RemoveString=Fjern streng '%s'
 SomeTranslationAreUncomplete=Nogle af de sprog, der tilbydes, kan kun oversættes eller måske indeholde fejl. Hjælp venligst med at korrigere dit sprog ved at registrere dig på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> at tilføje dine forbedringer.
-DirectDownloadLink=Direkte download link (offentlig/ekstern)
-DirectDownloadInternalLink=Direkte download link (skal logges og har brug for tilladelser)
+DirectDownloadLink=Offentligt downloadlink
+PublicDownloadLinkDesc=Kun linket kræves for at downloade filen
+DirectDownloadInternalLink=Privat downloadlink
+PrivateDownloadLinkDesc=Du skal være logget, og du skal have tilladelse til at se eller downloade filen
 Download=Hent
 DownloadDocument=Hent dokument
 ActualizeCurrency=Opdater valutakurs
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontakter
 SearchIntoMembers=Medlemmer
 SearchIntoUsers=Brugere
 SearchIntoProductsOrServices=Produkter eller tjenester
+SearchIntoBatch=Batch / Serier / Lots
 SearchIntoProjects=Projekter
 SearchIntoMO=Fremstillingsordrer
 SearchIntoTasks=Opgaver
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Tastaturgenvej
 AssignedTo=Tildelt til
 Deletedraft=Slet udkast
 ConfirmMassDraftDeletion=Udkast til masse slette bekræftelse
-FileSharedViaALink=Fil deles via et link
+FileSharedViaALink=Fil deles med et offentligt link
 SelectAThirdPartyFirst=Vælg en tredjepart først ...
 YouAreCurrentlyInSandboxMode=Du er i øjeblikket i %s "sandbox" -tilstanden
 Inventory=Beholdning
 AnalyticCode=Analytisk kode
 TMenuMRP=MRP
+ShowCompanyInfos=Vis firmaoplysninger
 ShowMoreInfos=Vis flere oplysninger
 NoFilesUploadedYet=Upload først et dokument
 SeePrivateNote=Se privat note
@@ -1120,3 +1127,5 @@ AffectTag=Påvirke tags
 ConfirmAffectTag=Bulk Tags påvirker
 ConfirmAffectTagQuestion=Er du sikker på, at du vil påvirke tags til den %s valgte post (er)?
 CategTypeNotFound=Ingen tag-type fundet for typen af poster
+CopiedToClipboard=Kopieret til udklipsholderen
+InformationOnLinkToContract=Dette beløb er kun summen af alle linjer i kontrakten. Der tages ikke hensyn til tid.
diff --git a/htdocs/langs/da_DK/margins.lang b/htdocs/langs/da_DK/margins.lang
index ee4c55107b4..9c45049d872 100644
--- a/htdocs/langs/da_DK/margins.lang
+++ b/htdocs/langs/da_DK/margins.lang
@@ -22,7 +22,7 @@ ProductService=Produkt eller Service
 AllProducts=Alle produkter og tjenester
 ChooseProduct/Service=Vælg produkt eller service
 ForceBuyingPriceIfNull=Force køb / kostpris til salgspris, hvis ikke defineret
-ForceBuyingPriceIfNullDetails=Hvis købs- / omkostningspris ikke er defineret, og denne valgmulighed "ON", vil margen være nul på linie (køb / kostpris = salgspris), ellers ("OFF"), marginen vil svare til den foreslåede standard.
+ForceBuyingPriceIfNullDetails=Hvis købs- / kostpris ikke gives, når vi tilføjer en ny linje, og denne mulighed er "TIL", vil margenen være 0 på den nye linje (købs- / kostpris = salgspris). Hvis denne indstilling er "FRA" (anbefales), vil margenen være lig med den foreslåede værdi som standard (og kan være 100%, hvis der ikke findes nogen standardværdi).
 MARGIN_METHODE_FOR_DISCOUNT=Margin metode til globale rabatter
 UseDiscountAsProduct=Som et produkt
 UseDiscountAsService=Som en tjeneste
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index dbf397604a5..b74f1265498 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -19,12 +19,14 @@ MembersCards=Medlemmer udskrive kort
 MembersList=Liste over medlemmer
 MembersListToValid=Liste over udkast til medlemmer (der skal bekræftes)
 MembersListValid=Liste over gyldige medlemmer
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListUpToDate=Liste over gyldige medlemmer med opdateret abonnement
+MembersListNotUpToDate=Liste over gyldige medlemmer med forældet abonnement
+MembersListExcluded=Liste over ekskluderede medlemmer
 MembersListResiliated=Liste over opsatte medlemmer
 MembersListQualified=Liste over kvalificerede medlemmer
 MenuMembersToValidate=Udkast til medlemmer
 MenuMembersValidated=Bekræftet medlemmer
+MenuMembersExcluded=Ekskluderede medlemmer
 MenuMembersResiliated=Afsluttede medlemmer
 MembersWithSubscriptionToReceive=Medlemmer med abonnement for at modtage
 MembersWithSubscriptionToReceiveShort=Abonnement til at modtage
@@ -32,7 +34,7 @@ DateSubscription=Subscription dato
 DateEndSubscription=Subscription slutdato
 EndSubscription=End abonnement
 SubscriptionId=Abonnements-id
-WithoutSubscription=Without subscription
+WithoutSubscription=Uden abonnement
 MemberId=Medlem id
 NewMember=Nyt medlem
 MemberType=Medlem type
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Abonnement udløbet
 MemberStatusActiveLateShort=Udløbet
 MemberStatusPaid=Subscription ajour
 MemberStatusPaidShort=Ajour
+MemberStatusExcluded=Ekskluderet medlem
+MemberStatusExcludedShort=Ekskluderet
 MemberStatusResiliated=Afsluttet medlem
 MemberStatusResiliatedShort=opsagte
 MembersStatusToValid=Udkast til medlemmer
+MembersStatusExcluded=Ekskluderede medlemmer
 MembersStatusResiliated=Afsluttede medlemmer
 MemberStatusNoSubscription=Valideret (intet abonnement kræves)
 MemberStatusNoSubscriptionShort=bekræftet
@@ -80,8 +85,10 @@ DeleteType=Slet
 VoteAllowed=Afstemning tilladt
 Physical=Fysisk
 Moral=Moral
-MorAndPhy=Moral and Physical
+MorAndPhy=Moralisk og fysisk
 Reenable=Genaktivere
+ExcludeMember=Ekskluder et medlem
+ConfirmExcludeMember=Er du sikker på, at du vil ekskludere dette medlem?
 ResiliateMember=Afslut en medlem
 ConfirmResiliateMember=Er du sikker på at du vil opsige denne medlem?
 DeleteMember=Slet medlem
@@ -116,7 +123,7 @@ SendingEmailOnMemberValidation=Afsendelse af e-mail ved bekræftelse af nye medl
 SendingEmailOnNewSubscription=Afsendelse af e-mail på nyt abonnement
 SendingReminderForExpiredSubscription=Sender påmindelse om udløbne abonnementer
 SendingEmailOnCancelation=Afsendelse af e-mail ved annullering
-SendingReminderActionComm=Sending reminder for agenda event
+SendingReminderActionComm=Afsender påmindelse til dagsordenbegivenhed
 # Topic of email templates
 YourMembershipRequestWasReceived=Dit medlemskab blev modtaget.
 YourMembershipWasValidated=Dit medlemskab blev bekræftet
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-mail-skabelon, der skal bruges t
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-mail-skabelon, der skal bruges til at sende e-mail til et medlem ved ny abonnementsoptagelse
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-mail-skabelon, der skal bruges til at sende e-mail-påmindelse, når abonnementet er ved at udløbe
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-mail-skabelon, der skal bruges til at sende e-mail til et medlem ved annullering af medlemmer
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Afsender e-mail til automatiske e-mails
 DescADHERENT_ETIQUETTE_TYPE=Etiketter format
 DescADHERENT_ETIQUETTE_TEXT=Tekst udskrives på medlems adresseblade
@@ -162,12 +170,13 @@ DocForLabels=Generer adresse ark (Format for output faktisk setup: <b>%s)</b>
 SubscriptionPayment=Abonnement betaling
 LastSubscriptionDate=Dato for seneste abonnementsbetaling
 LastSubscriptionAmount=Mængde af seneste abonnement
+LastMemberType=Sidste medlemstype
 MembersStatisticsByCountries=Medlemmer statistik efter land
 MembersStatisticsByState=Medlemmer statistikker stat / provins
 MembersStatisticsByTown=Medlemmer statistikker byen
 MembersStatisticsByRegion=Medlemsstatistik efter region
 NbOfMembers=Antal medlemmer
-NbOfActiveMembers=Number of current active members
+NbOfActiveMembers=Antal nuværende aktive medlemmer
 NoValidatedMemberYet=Ingen bekræftede medlemmer fundet
 MembersByCountryDesc=Denne skærm viser dig statistikker over medlemmer af lande. Grafisk afhænger dog på Google online-graf service og er kun tilgængelig, hvis en internetforbindelse virker.
 MembersByStateDesc=Denne skærm viser dig statistikker om medlemmer fra staten / provinser / Canton.
@@ -177,7 +186,7 @@ MenuMembersStats=Statistik
 LastMemberDate=Seneste medlem dato
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Medlemmernes art
-MembersNature=Nature of members
+MembersNature=Medlemmernes art
 Public=Information er offentlige
 NewMemberbyWeb=Nyt medlem tilføjet. Afventer godkendelse
 NewMemberForm=Nyt medlem formular
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index 7d0df081858..412df544774 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=Jeg vil generere nogle dokumenter fra objektet
 IncludeDocGenerationHelp=Hvis du markerer dette, vil nogle koder genereres for at tilføje en kasse "Generer dokument" på posten.
 ShowOnCombobox=Vis værdi til combobox
 KeyForTooltip=Nøgle til værktøjstip
-CSSClass=CSS Class
+CSSClass=CSS til redigering / oprettelse af formular
+CSSViewClass=CSS til læst form
+CSSListClass=CSS til liste
 NotEditable=Ikke redigerbar
 ForeignKey=Fremmed nøgle
 TypeOfFieldsHelp=Felttype:<br> varchar (99), dobbelt (24,8), reel, tekst, html, datetime, tidsstempel, heltal, heltal: ClassName: relative path / to / classfile.class.php [: 1 [: filter]] ( '1' betyder, at vi tilføjer en + knap efter kombinationsboksen for at oprette posten, 'filter' kan være 'status = 1 OG fk_user = __USER_ID OG enhed IN (__SHARED_ENTITIES__)' for eksempel)
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index 11b4d53dfbd..cfef002cb41 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Lav ordre
 MakeOrder=Lav ordre
 SupplierOrder=Indkøbsordre
 SuppliersOrders=Indkøbsordre
+SaleOrderLines=Salgsordrer linjer
+PurchaseOrderLines=købsordre linjer
 SuppliersOrdersRunning=Nuværende indkøbsordrer
 CustomerOrder=Salgsordre
 CustomersOrders=Salgsordrer
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index cf4145b5f03..ccfdfb8c1ed 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Virksomhed med flere aktiviteter (alle hovedmoduler)
 CreatedBy=Oprettet af %s
 ModifiedBy=Modificeret af %s
 ValidatedBy=Attesteret af %s
+SignedBy=Underskrevet af %s
 ClosedBy=Lukket af %s
 CreatedById=Bruger id, der oprettede
 ModifiedById=Bruger id, der lavede den seneste ændring
@@ -244,6 +245,7 @@ NewKeyIs=Dette er dine nye nøgler til login
 NewKeyWillBe=Din nye nøgle til login til software vil være
 ClickHereToGoTo=Klik her for at gå til %s
 YouMustClickToChange=Du skal dog først klikke på følgende link for at bekræfte denne adgangskode ændring
+ConfirmPasswordChange=Bekræft ændring af adgangskode
 ForgetIfNothing=Hvis du ikke har anmodet om denne ændring, skal du bare glemme denne email. Dine legitimationsoplysninger holdes sikre.
 IfAmountHigherThan=Hvis beløb højere end <strong> %s </ strong>
 SourcesRepository=Repository for kilder
diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang
index 2544d59d7fc..6afb2d2fa0a 100644
--- a/htdocs/langs/da_DK/productbatch.lang
+++ b/htdocs/langs/da_DK/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Brug parti serie / serienummer
-ProductStatusOnBatch=Ja (parti serie/serienr. påkrævet)
+ProductStatusOnBatch=Ja (krævet parti)
+ProductStatusOnSerial=Ja (unikt serienummer krævet)
 ProductStatusNotOnBatch=Nej (parti serie/serienr. ikke brugt)
-ProductStatusOnBatchShort=Ja
+ProductStatusOnBatchShort=Batch
+ProductStatusOnSerialShort=Seriel
 ProductStatusNotOnBatchShort=Nej
 Batch=Parti serie / Serienr.
 atleast1batchfield=Pluk dato eller Salgs dato eller Parti serie / Serienummer
@@ -22,3 +24,12 @@ ProductLotSetup=Opsætning af modul partiSerie / serieNr
 ShowCurrentStockOfLot=Vis nuværende lager for par produkt / partiSerie
 ShowLogOfMovementIfLot=Vis log af bevægelser for par produkt / partiSerie
 StockDetailPerBatch=Lager detaljer pr. Parti Serie
+SerialNumberAlreadyInUse=Serienummer %s bruges allerede til produkt %s
+TooManyQtyForSerialNumber=Du kan kun have et produkt %s til serienummer %s
+BatchLotNumberingModules=Valgmuligheder til automatisk generering af batchprodukter, der administreres af partier
+BatchSerialNumberingModules=Valgmuligheder til automatisk generering af batchprodukter styret af serienumre
+CustomMasks=Tilføjer en mulighed for at definere maske på produktkortet
+LotProductTooltip=Tilføjer en mulighed på produktkortet for at definere en dedikeret batchnummermaske
+SNProductTooltip=Tilføjer en mulighed på produktkortet for at definere en dedikeret serienummermaske
+QtyToAddAfterBarcodeScan=Mængde, der skal tilføjes for hver stregkode / parti / seriel scannet
+
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index dc8281f3a00..cc6c8c9fbbf 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -7,7 +7,7 @@ ProductDescriptionTranslated=Oversat produktbeskrivelse
 ProductNoteTranslated=Oversat produkt notat
 ProductServiceCard=Produkter / Tjenester kortet
 TMenuProducts=Varer
-TMenuServices=Services
+TMenuServices=Ydelser
 Products=Varer
 Services=Ydelser
 Product=Vare
@@ -17,20 +17,20 @@ Create=Opret
 Reference=Reference
 NewProduct=Ny vare
 NewService=Ny ydelse
-ProductVatMassChange=Global momsopdatering
+ProductVatMassChange=Global moms opdatering
 ProductVatMassChangeDesc=Dette værktøj opdaterer momssatsen, der er defineret på <b> <u> ALLE </u> </b> produkter og tjenester!
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=Denne side kan bruges til at initialisere en stregkode på objekter, der ikke har stregkode defineret. Kontroller, inden opsætningen af ​​modulets stregkode er afsluttet.
-ProductAccountancyBuyCode=Regnskabskode (køb)
-ProductAccountancyBuyIntraCode=Regnskab kode (køb intra-samfund)
-ProductAccountancyBuyExportCode=Regnskabskode (købimport)
-ProductAccountancySellCode=Regnskabskode (salg)
-ProductAccountancySellIntraCode=Regnskabskode (salg inden for Fællesskabet)
-ProductAccountancySellExportCode=Regnskabskode (salg eksport)
+ProductAccountancyBuyCode=Regnskabs konto (køb)
+ProductAccountancyBuyIntraCode=Regnskab konto (køb i EU)
+ProductAccountancyBuyExportCode=Regnskabs konto (køb udenfor EU)
+ProductAccountancySellCode=Regnskabs konto (salg)
+ProductAccountancySellIntraCode=Regnskabs konto (salg inden for EU)
+ProductAccountancySellExportCode=Regnskabs konto (salg uden for EU)
 ProductOrService=Vare eller ydelse
 ProductsAndServices=Varer og ydelser
 ProductsOrServices=Varer eller ydelser
-ProductsPipeServices=Produkter | Services
+ProductsPipeServices=Produkter | Ydelser
 ProductsOnSale=Produkter til salg
 ProductsOnPurchase=Produkter til køb
 ProductsOnSaleOnly=Varer kun til salg
@@ -101,7 +101,7 @@ PriceRemoved=Pris fjernet
 BarCode=Stregkode
 BarcodeType=Stregkodetype
 SetDefaultBarcodeType=Vælg stregkodetype
-BarcodeValue=Stregkodeværdi
+BarcodeValue=Stregkode værdi
 NoteNotVisibleOnBill=Note (ikke synlig på fakturaer, tilbud ...)
 ServiceLimitedDuration=Hvis varen er en ydelse med begrænset varighed:
 FillWithLastServiceDates=Udfyld med sidste servicelinjedatoer
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=Momssats (for denne leverandør / produkt)
 DiscountQtyMin=Rabat for denne mængde.
 NoPriceDefinedForThisSupplier=Ingen pris / antal defineret for denne leverandør / produkt
 NoSupplierPriceDefinedForThisProduct=Der er ikke defineret nogen leverandørpris / antal for dette produkt
+PredefinedItem=Foruddefineret vare
 PredefinedProductsToSell=Foruddefineret produkt
 PredefinedServicesToSell=Foruddefineret service
 PredefinedProductsAndServicesToSell=Predefinerede produkter / tjenester til salg
@@ -168,7 +169,7 @@ BuyingPrices=Købspriser
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Sælgerpriser (af produkter eller tjenester)
-CustomCode=Told | Råvare | HS-kode
+CustomCode=Told | Råvare | VITA-kode
 CountryOrigin=Oprindelsesland
 RegionStateOrigin=Region oprindelse
 StateOrigin=Stat | provinsens oprindelse
@@ -313,7 +314,7 @@ LastUpdated=Seneste opdatering
 CorrectlyUpdated=Korrekt opdateret
 PropalMergePdfProductActualFile=Filer bruges til at tilføje til PDF Azur er / er
 PropalMergePdfProductChooseFile=Vælg PDF-filer
-IncludingProductWithTag=Herunder produkt / service med tag
+IncludingProductWithTag=Inkluder produkter / tjenester med tag
 DefaultPriceRealPriceMayDependOnCustomer=Standard pris, reel pris kan afhænge af kunde
 WarningSelectOneDocument=Vælg mindst et dokument
 DefaultUnitToShow=Enhed
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 56f72838a88..11372f112e8 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Forbruges
 ListOfTasks=Liste over opgaver
 GoToListOfTimeConsumed=Gå til listen over tid forbrugt
 GanttView=Gantt View
+ListWarehouseAssociatedProject=Liste over lagre, der er knyttet til projektet
 ListProposalsAssociatedProject=Liste over de kommercielle forslag i forbindelse med projektet
 ListOrdersAssociatedProject=Liste over salgsordrer relateret til projektet
 ListInvoicesAssociatedProject=Liste over kundefakturaer relateret til projektet
@@ -268,3 +269,7 @@ OneLinePerTask=En linje pr. Opgave
 OneLinePerPeriod=En linje pr. Periode
 RefTaskParent=Ref. Forældre Opgave
 ProfitIsCalculatedWith=Fortjeneste beregnes ved hjælp af
+AddPersonToTask=Føj også til opgaver
+UsageOrganizeEvent=Anvendelse: Begivenhedsorganisation
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Klassificer projektet som lukket, når alle dets opgaver er afsluttet (100%% fremskridt)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Bemærk: eksisterende projekter med alle opgaver ved 100%%-fremskridt påvirkes ikke: du bliver nødt til at lukke dem manuelt. Denne mulighed påvirker kun åbne projekter.
diff --git a/htdocs/langs/da_DK/propal.lang b/htdocs/langs/da_DK/propal.lang
index 01e676de7d8..ac6b590b480 100644
--- a/htdocs/langs/da_DK/propal.lang
+++ b/htdocs/langs/da_DK/propal.lang
@@ -59,6 +59,7 @@ ConfirmClonePropal=Er du sikker på, du vil klone tilbuddet <b>%s</b>?
 ConfirmReOpenProp=Er du sikker på, at du vil åbne det tilbud igen <b> %s </b>?
 ProposalsAndProposalsLines=Tilbud og linjer
 ProposalLine=Tilbudslinje
+ProposalLines=Tilbudslinjer
 AvailabilityPeriod=Tilgængelighed forsinkelse
 SetAvailability=Indstil tilgængelighed forsinkelse
 AfterOrder=efter at
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index e4de3145acb..c6fecc6ad3c 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -19,7 +19,7 @@ Stock=Lager
 Stocks=Lagre
 MissingStocks=Manglende lagre
 StockAtDate=Lagrene på dato
-StockAtDateInPast=Over dato
+StockAtDateInPast=Dato i fortiden
 StockAtDateInFuture=Dato i fremtiden
 StocksByLotSerial=Lagerført efter parti/seriel
 LotSerial=Parti/Serienr
@@ -37,8 +37,8 @@ AllWarehouses=Alle lagre
 IncludeEmptyDesiredStock=Inkluder også negativ bestand med udefineret ønsket lager
 IncludeAlsoDraftOrders=Medtag også udkast til ordrer
 Location=Placering
-LocationSummary=Kort placerings navn
-NumberOfDifferentProducts=Antal forskellige varer
+LocationSummary=Kort placeringsnavn
+NumberOfDifferentProducts=Antal unikke produkter
 NumberOfProducts=Samlet antal varer
 LastMovement=Seneste bevægelse
 LastMovements=Seneste bevægelser
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Lager værdi
 UserWarehouseAutoCreate=Opret et brugerlager automatisk, når du opretter en bruger
 AllowAddLimitStockByWarehouse=Administrer også værdi for minimum og ønsket lager pr. Parring (produktlager) ud over værdien for minimum og ønsket lager pr. Produkt
 RuleForWarehouse=Regel for lagre
-WarehouseAskWarehouseDuringPropal=Sæt et lager på salgsproportal
+WarehouseAskWarehouseOnThirparty=Indstil et lager på tredjepart
+WarehouseAskWarehouseDuringPropal=Sæt et lager på kommercielle forslag
 WarehouseAskWarehouseDuringOrder=Indstil et lager med salgsordrer
 UserDefaultWarehouse=Indstil et lager til brugere
 MainDefaultWarehouse=Standardlager
@@ -97,15 +98,16 @@ RealStockDesc=Fysisk / reel materiel er den aktuel lager i lageret.
 RealStockWillAutomaticallyWhen=Den reelle bestand ændres i henhold til denne regel (som defineret i Aktiemodulet):
 VirtualStock=Virtual lager
 VirtualStockAtDate=Virtuelt lager på dato
-VirtualStockAtDateDesc=Virtuelt lager, når alle ventende ordrer, der er planlagt udført før datoen, er afsluttet
+VirtualStockAtDateDesc=Virtuelt lager, når alle de afventende ordrer, der planlægges behandlet inden den valgte dato, er færdige
 VirtualStockDesc=Virtuelt lager er det beregnede lager, der er tilgængeligt, når alle åbne / afventende handlinger (som påvirker lagrene) er lukket (modtagne indkøbsordrer, salgsordrer, produktionsordrer produceret osv.)
+AtDate=På dato
 IdWarehouse=Lager ID
 DescWareHouse=Beskrivelse lager
 LieuWareHouse=Lager placering
 WarehousesAndProducts=Varelagre og varer
 WarehousesAndProductsBatchDetail=Lager og produkter (med detaljer pr. Lot / serie)
 AverageUnitPricePMPShort=Værdi
-AverageUnitPricePMPDesc=Den gennemsnitlige input-enhedspris, vi var nødt til at betale til leverandører for at få produktet i vores lager.
+AverageUnitPricePMPDesc=Den input-gennemsnitlige enhedspris, vi måtte betale for at få 1 enhed produkt på lager.
 SellPriceMin=Salgsenhed Pris
 EstimatedStockValueSellShort=Værdi for salg
 EstimatedStockValueSell=Værdi for salg
@@ -145,7 +147,7 @@ Replenishments=genopfyldninger
 NbOfProductBeforePeriod=Mængde af produkt %s på lager inden valgt periode (<%s)
 NbOfProductAfterPeriod=Mængde af produkt %s på lager efter valgt periode (> %s)
 MassMovement=Massebehandling
-SelectProductInAndOutWareHouse=Vælg et kildelager og et mållager, et produkt og en mængde, og klik derefter på "%s". Når dette er gjort for alle nødvendige bevægelser, skal du klikke på "%s".
+SelectProductInAndOutWareHouse=Vælg et kildelager og et mållager, et produkt og en mængde, og klik derefter på "%s". Når dette er gjort for alle krævede bevægelser, skal du klikke på "%s".
 RecordMovement=Optag overførsel
 ReceivingForSameOrder=Kvitteringer for denne ordre
 StockMovementRecorded=Aktiebevægelser registreret
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Lagerniveau skal være tilstrækkeligt til at tilfø
 StockMustBeEnoughForOrder=Lager niveau skal være nok til at tilføje produkt / service til ordre (check er udført på nuværende reelle lager, når du tilføjer en linje til ordre uanset reglen for automatisk lagerændring)
 StockMustBeEnoughForShipment= Lagerniveau skal være tilstrækkeligt til at tilføje produkt / service til forsendelse (check er udført på nuværende reelle lager, når du tilføjer en linje til forsendelse uanset reglen for automatisk lagerændring)
 MovementLabel=Etikett for bevægelse
-TypeMovement=Type bevægelse
+TypeMovement=Bevægelsesretning
 DateMovement=Dato for bevægelse
 InventoryCode=Bevægelse eller lager kode
 IsInPackage=Indeholdt i pakken
@@ -183,6 +185,7 @@ inventoryCreatePermission=Opret ny opgørelse
 inventoryReadPermission=Se varebeholdninger
 inventoryWritePermission=Opdater inventar
 inventoryValidatePermission=Bekræft inventar
+inventoryDeletePermission=Slet beholdning
 inventoryTitle=Beholdning
 inventoryListTitle=Varebeholdninger
 inventoryListEmpty=Ingen opgørelse pågår
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Lager kræves for at vælge, hvilket parti
 ForceTo=Tving til
 AlwaysShowFullArbo=Vis hele træets lagertrin ved pop op af warehouse-links (Advarsel: Dette kan mindske ydeevne dramatisk)
 StockAtDatePastDesc=Du kan her se aktien (ægte aktier) på en given dato i fortiden
-StockAtDateFutureDesc=Du kan her se bestanden (virtuel bestand) på en given dato fremover
+StockAtDateFutureDesc=Du kan her se lager antal (virtuel lager) på en given dato i fremtiden
 CurrentStock=Aktuel lager
 InventoryRealQtyHelp=Sæt værdi til 0 for at nulstille antal <br> Hold feltet tomt, eller fjern linjen for at forblive uændret
-UpdateByScaning=Opdater ved at scanne
+UpdateByScaning=Udfyld real antal ved at scanne
 UpdateByScaningProductBarcode=Opdatering ved scanning (produktstregkode)
 UpdateByScaningLot=Opdatering ved scanning (parti | seriel stregkode)
 DisableStockChangeOfSubProduct=Deaktiver lagerændringen for alle delprodukter i dette sæt under denne bevægelse.
+ImportFromCSV=Importer CSV-liste over bevægelser
+ChooseFileToImport=Upload fil, og klik derefter på ikonet %s for at vælge fil som kildeimportfil ...
+SelectAStockMovementFileToImport=vælg en aktiebevægelsesfil, der skal importeres
+InfoTemplateImport=Uploadet fil skal have dette format (* er obligatoriske felter): <br> Source Warehouse * | Mållager * | Produkt * | Mængde * | Parti / serienummer <br> CSV-tegnseparator skal være "<b> %s </b>"
+LabelOfInventoryMovemement=Beholdning %s
+ReOpen=Genåben 
+ConfirmFinish=Bekræfter du afslutningen af opgørelsen? Dette genererer alle lagerbevægelser for at opdatere din aktie.
+ObjectNotFound=%s ikke fundet
+MakeMovementsAndClose=Generer bevægelser og luk
+AutofillWithExpected=Fyld den virkelige mængde med den forventede mængde
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index c0df693ec2c..e59117969e0 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Leverandører
 SuppliersInvoice=Leverandørfaktura
+SupplierInvoices=Leverandør fakturaer
 ShowSupplierInvoice=Vis leverandørfaktura
 NewSupplier=Ny sælger
 History=Historie
@@ -38,7 +39,7 @@ MenuOrdersSupplierToBill=Indkøbsordrer til faktura
 NbDaysToDelivery=Leveringsforsinkelse (dage)
 DescNbDaysToDelivery=Den længste leveringsforsinkelse af produkterne fra denne ordre
 SupplierReputation=Leverandør ry
-ReferenceReputation=Reference reputation
+ReferenceReputation=Reference omdømme
 DoNotOrderThisProductToThisSupplier=Bestil ikke
 NotTheGoodQualitySupplier=Lav kvalitet
 ReputationForThisProduct=Omdømme
diff --git a/htdocs/langs/da_DK/ticket.lang b/htdocs/langs/da_DK/ticket.lang
index 86d053f9cc4..5aaa861cde6 100644
--- a/htdocs/langs/da_DK/ticket.lang
+++ b/htdocs/langs/da_DK/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Slettet
 # Dict
 Type=Type
 Severity=Alvorlighed
+TicketGroupIsPublic=Gruppen er offentlig
+TicketGroupIsPublicDesc=Hvis en billetgruppe er offentlig, vil den være synlig i formen, når du opretter en billet fra den offentlige grænseflade
 
 # Email templates
 MailToSendTicketMessage=At sende Email fra opgave besked
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Vis modulets logo i den offentlige grænseflade
 TicketsShowModuleLogoHelp=Aktivér denne mulighed for at skjule logo-modulet på siderne i den offentlige grænseflade
 TicketsShowCompanyLogo=Vis firmaets logo i den offentlige grænseflade
 TicketsShowCompanyLogoHelp=Aktivér denne mulighed for at skjule logoet for hovedvirksomheden på siderne i den offentlige grænseflade
-TicketsEmailAlsoSendToMainAddress=Send også besked til hoved e-mail-adresse
-TicketsEmailAlsoSendToMainAddressHelp=Aktivér denne mulighed for at sende en email til "Meddelelses email fra" adresse (se opsætning nedenfor)
+TicketsEmailAlsoSendToMainAddress=Send også en underretning til den primære e-mail-adresse
+TicketsEmailAlsoSendToMainAddressHelp=Aktivér denne mulighed for også at sende en e-mail til den adresse, der er defineret i opsætningen "%s" (se fanen "%s")
 TicketsLimitViewAssignedOnly=Begræns skærmen til opgaver, der er tildelt den aktuelle bruger (ikke effektiv for eksterne brugere, skal du altid begrænse til den tredjepart, de er afhængige af)
 TicketsLimitViewAssignedOnlyHelp=Kun opgaver tildelt den aktuelle bruger vil være synlige. Gælder ikke for en bruger med billetforvaltningsrettigheder.
 TicketsActivatePublicInterface=Aktivér den offentlige grænseflade
@@ -126,10 +128,10 @@ TicketNumberingModules=Opgave nummerering modul
 TicketsModelModule=Dokumentskabeloner til billetter
 TicketNotifyTiersAtCreation=Underret tredjepart ved oprettelsen
 TicketsDisableCustomerEmail=Deaktiver altid Emails, når en opgave oprettes fra den offentlige grænseflade
-TicketsPublicNotificationNewMessage=Send e-mail (s), når en ny besked tilføjes
+TicketsPublicNotificationNewMessage=Send e-mail (r), når en ny besked / kommentar føjes til en billet
 TicketsPublicNotificationNewMessageHelp=Send e-mail (s), når en ny meddelelse tilføjes fra den offentlige grænseflade (til den tildelte bruger eller meddelelses-e-mailen til (opdatering) og / eller meddelelses-e-mailen til)
 TicketPublicNotificationNewMessageDefaultEmail=Underretnings-e-mail til (opdatering)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send e-mail-meddelelser om ny meddelelse til denne adresse, hvis billetten ikke har en bruger tildelt, eller brugeren ikke har en e-mail.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send en e-mail til denne adresse for hver meddelelse om nye meddelelser, hvis billetten ikke har en bruger tildelt den, eller hvis brugeren ikke har nogen kendt e-mail.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Seneste ændrede opgaver
 BoxLastModifiedTicketDescription=Seneste %s ændrede opgaver
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Ingen nyligt ændrede opgaver
+BoxTicketType=Antal åbne opgaver efter type
+BoxTicketSeverity=Antal åbne opgaver efter sværhedsgrad
+BoxNoTicketSeverity=Ingen opgaver åbnet
+BoxTicketLastXDays=Antal nye opgaver efter dage de sidste %s dage
+BoxTicketLastXDayswidget = Antal nye opgaver efter dage de sidste X dage
+BoxNoTicketLastXDays=Ingen nye opgaver de sidste %s dage
+BoxNumberOfTicketByDay=Antal nye opgaver om dagen
+BoxNewTicketVSClose=Antal af dagens nye opgaver versus dagens lukkede opgaver
+TicketCreatedToday=Opgave oprettet i dag
+TicketClosedToday=Opgave lukket i dag
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index 88f93206be6..80587a6b21c 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Fjern fra gruppe
 PasswordChangedAndSentTo=Password ændret og sendt <b>til %s.</b>
 PasswordChangeRequest=Anmod om at ændre adgangskode til <b> %s </ b>
 PasswordChangeRequestSent=Anmodning om at ændre password <b>for %s</b> sendt <b>til %s.</b>
+IfLoginExistPasswordRequestSent=Hvis dette login er en gyldig konto, er der sendt en e-mail for at nulstille adgangskoden.
+IfEmailExistPasswordRequestSent=Hvis denne e-mail er en gyldig konto, er der sendt en e-mail for at nulstille adgangskoden.
 ConfirmPasswordReset=Bekræft nulstilling af adgangskode
 MenuUsersAndGroups=Brugere og grupper
 LastGroupsCreated=Seneste %s grupper oprettet
@@ -70,9 +72,10 @@ ExportDataset_user_1=Brugere og deres egenskaber
 DomainUser=Domænebruger %s
 Reactivate=Genaktiver
 CreateInternalUserDesc=Denne formular kan du oprette en intern bruger i din virksomhed / organisation. For at oprette en ekstern bruger (kunde, leverandør osv ..), skal du bruge knappen 'Opret Dolibarr Bruger' fra den tredje-parts kontaktkort.
-InternalExternalDesc=En intern bruger er en bruger, der er en del af din virksomhed / organisation.<br> En <b>ekstern</b> bruger er en kunde, sælger eller andet (Oprettelse af en ekstern bruger til en tredjepart kan udføres fra tredjepartens kontaktpost).<br><br> i begge tilfælde definerer tilladelser rettigheder på Dolibarr, også ekstern bruger kan have en anden menushåndtering end intern bruger (Se Hjem - Opsætning - Display)
+InternalExternalDesc=En intern <b>-bruger </b> er en bruger, der er en del af din virksomhed / organisation eller er en partnerbruger uden for din organisation, der muligvis skal se flere data end data relateret til hans firma (tilladelsessystemet definerer, hvad han kan eller kan kan du ikke se eller gøre). <br> En <b> ekstern </b> bruger er en kunde, leverandør eller andet, der KUN skal se data relateret til sig selv (Oprettelse af en ekstern bruger til en tredjepart kan gøres fra tredjeparts kontaktoptegnelse). <br> <br> I begge tilfælde skal du give tilladelse til de funktioner, som brugeren har brug for.
 PermissionInheritedFromAGroup=Tilladelse gives, fordi arvet fra en af en brugers gruppe.
 Inherited=Arvelige
+UserWillBe=Oprettet bruger vil være
 UserWillBeInternalUser=Oprettet brugeren vil blive en intern bruger (fordi der ikke er knyttet til en bestemt tredjepart)
 UserWillBeExternalUser=Oprettet bruger vil være en ekstern bruger (fordi knyttet til en bestemt tredjepart)
 IdPhoneCaller=Id telefonen ringer op
@@ -109,12 +112,14 @@ UserAccountancyCode=Regnskabskode for bruger
 UserLogoff=Bruger logout
 UserLogged=Bruger logget
 DateOfEmployment=Ansættelsesdato
-DateEmployment=Ansættelsesstartdato
+DateEmployment=Beskæftigelse
+DateEmploymentstart=Ansættelsesstartdato
 DateEmploymentEnd=Ansættelses slutdato
+RangeOfLoginValidity=Datointerval for login-gyldighed
 CantDisableYourself=Du kan ikke deaktivere din egen brugerpost
 ForceUserExpenseValidator=Tving udgiftsrapportvalidering
 ForceUserHolidayValidator=Tving orlov anmodning validator
 ValidatorIsSupervisorByDefault=Som standard validatoren er supervisor for brugeren. Hold tom for at bevare denne opførsel.
 UserPersonalEmail=Personlig e-mail
 UserPersonalMobile=Personlig mobiltelefon
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Advarsel! Dette er det vigtigste sprog, som brugeren taler, ikke sproget i den grænseflade, han valgte at se. For at ændre det interface, der er synligt for denne bruger, skal du gå til fanen %s
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index ec009b5ebf1..3b1a9613f32 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Brug med Apache / NGinx / ...</u><br> Opret på din webser
 ExampleToUseInApacheVirtualHostConfig=Eksempel til brug i Apache virtuel værtopsætning:
 YouCanAlsoTestWithPHPS=<u> Brug med PHP-integreret server </ u> <br> På udvikler miljø kan du helst prøve webstedet med den indbyggede PHP-server (PHP 5.5 påkrævet) ved at køre <br> <strong> php -S 0.0. 0,0: 8080 -t %s </ strong>
 YouCanAlsoDeployToAnotherWHP=<u>Kør dit websted med en anden Dolibarr Hosting-udbyder</u><br>Hvis du ikke har en webserver som Apache eller NGinx tilgængelig på internettet, kan du eksportere og importere dit websted til en anden Dolibarr-instans leveret af en anden Dolibarr-hostingudbyder, der giver fuld integration med webstedet modul. Du kan finde en liste over nogle Dolibarr-hostingudbydere på <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Kontroller også, at den virtuelle vært har tilladelse <strong> %s </strong> på filer til <br> <strong> %s</strong>
+CheckVirtualHostPerms=Kontroller også, at den virtuelle værtsbruger (for eksempel www-data) har <strong> %s </strong> tilladelser på filer til <br> <strong> %s </strong>
 ReadPerm=Læs
 WritePerm=Skriv
 TestDeployOnWeb=Test / implementer på nettet
 PreviewSiteServedByWebServer=<u> Se %s i en ny fane. </u> <br> <br> %s vil blive serveret af en ekstern webserver (som Apache, Nginx, IIS). Du skal installere og konfigurere denne server før du peger på biblioteket: <br> <strong> %s </strong> <br> URL serveret af ekstern server: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr=<u> Preview %s i en ny fane. </ u> <br> <br> %s vil blive serveret af Dolibarr server, så det behøver ikke nogen ekstra webserver (som Apache, Nginx, IIS), der skal installeres. < br> Ubelejligt er, at webadressen på sider ikke er brugervenlige og begynder med din Dolibarr-sti. <br> URL betjent af Dolibarr: <br> <strong> %s </ strong> <br> <br> Sådan bruger du din egen ekstern webserver til at tjene dette websted, opret en virtuel vært på din webserver, der peger på biblioteket <br> <strong> %s </ strong>, og indtast derefter navnet på denne virtuelle server og klik på den anden preview-knap .
+PreviewSiteServedByDolibarr= <u> Eksempel %s i en ny fane. </u> <br> <br> %s vil blive serveret af Dolibarr-serveren, så den ikke behøver nogen ekstra webserver (som Apache, Nginx, IIS), der skal installeres. <br> Det ubelejlige er, at webadresserne til sider ikke er brugervenlige og starter med stien til din Dolibarr. <br> URL tjent med Dolibarr: <br> <strong> %s </strong> <br> <br> For at bruge din egen eksterne webserver til at tjene denne hjemmeside, oprette en virtuel vært på din webserver, der peger på mappen <br> <strong> %s </strong> <br> derefter indtaste navnet på denne virtuelle server i egenskaberne af dette websted og klik på linket "Test / Implementering på nettet".
 VirtualHostUrlNotDefined=URL til den virtuelle vært, der serveres af en ekstern webserver, der ikke er defineret
 NoPageYet=Ingen sider endnu
 YouCanCreatePageOrImportTemplate=Du kan oprette en ny side eller importere en fuld hjemmeside skabelon
@@ -137,3 +137,11 @@ PagesRegenerated=%sside (r) / container (r) regenereret
 RegenerateWebsiteContent=Genopret cache-filer på webstedet
 AllowedInFrames=Tilladt i rammer
 DefineListOfAltLanguagesInWebsiteProperties=Definer liste over alle tilgængelige sprog i webstedets egenskaber.
+GenerateSitemaps=Generer webstedets sitemapfil
+ConfirmGenerateSitemaps=Hvis du bekræfter, sletter du den eksisterende sitemapfil ...
+ConfirmSitemapsCreation=Bekræft generering af sitemap
+SitemapGenerated=Sitemap genereret
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon skal være png
+ErrorFaviconSize=Favicon skal være i størrelse 32x32
+FaviconTooltip=Upload et billede, der skal være en png på 32x32
diff --git a/htdocs/langs/da_DK/zapier.lang b/htdocs/langs/da_DK/zapier.lang
index 27884d7005a..412c0e028fa 100644
--- a/htdocs/langs/da_DK/zapier.lang
+++ b/htdocs/langs/da_DK/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier til Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier til Dolibarr-modul
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Opsætning af Zapier til Dolibarr
-ZapierDescription=Interface with Zapier
+ZapierForDolibarrSetup=Opsætning af Zapier til Dolibarr
+ZapierDescription=Interface med Zapier
+ZapierAbout=Om modulet Zapier
+ZapierSetupPage=Der er ikke behov for en opsætning på Dolibarr-siden for at bruge Zapier. Du skal dog generere og udgive en pakke på zapier for at kunne bruge Zapier med Dolibarr. Se dokumentation på <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> denne wiki-side </a>.
diff --git a/htdocs/langs/de_AT/accountancy.lang b/htdocs/langs/de_AT/accountancy.lang
index 2caaa72c1fd..f2d0909a71e 100644
--- a/htdocs/langs/de_AT/accountancy.lang
+++ b/htdocs/langs/de_AT/accountancy.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
 MenuBankAccounts=Kontonummern
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 2cae2180393..07388acbb52 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -72,7 +72,6 @@ Module70Name=Eingriffe
 Module70Desc=Eingriffsverwaltung
 Module80Name=Sendungen
 Module310Desc=Mitgliederverwaltun
-Module59000Desc=Module to follow margins
 Permission31=Produkte/Services einsehen
 Permission32=Produkte/Services erstellen/bearbeiten
 Permission34=Produkte/Services löschen
@@ -129,6 +128,7 @@ SummaryConst=Liste aller Systemeinstellungen
 Skin=Oberfläche
 DefaultSkin=Standardoberfläche
 CompanyCurrency=Firmenwährung
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungsentwürfen (alle, falls leer)
 WatermarkOnDraftProposal=Wasserzeichen für Angebotsentwürfe (alle, falls leer)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Fragen Sie nach dem Bestimmungsort des Bankkontos der Bestellung
@@ -148,7 +148,6 @@ LDAPMembersTypesSynchro=Mitgliedertypen
 LDAPSynchronization=LDAP Synchronisierung
 LDAPFunctionsNotAvailableOnPHP=LDAP Funktionen nicht verfügbar in Deinem PHP
 LDAPFieldFullname=vollständiger Name
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
 MailToSendShipment=Sendungen
 MailToSendIntervention=Eingriffe
diff --git a/htdocs/langs/de_AT/bills.lang b/htdocs/langs/de_AT/bills.lang
index 1bcce6a96fe..cd770616b3d 100644
--- a/htdocs/langs/de_AT/bills.lang
+++ b/htdocs/langs/de_AT/bills.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - bills
+BillsLate=Verspätete Zahlungen
 DisabledBecauseNotErasable=Deaktiviert, weil es nicht gelöscht werden kann
 InvoiceStandardDesc=Dies ist die übliche Rechnungsart.
 InvoiceProForma=Proformarechnung
@@ -21,7 +22,6 @@ ValidateInvoice=Validate Rechnung
 DisabledBecausePayments=Nicht möglich, da gibt es einige Zahlungen
 CantRemovePaymentWithOneInvoicePaid=Kann die Zahlung nicht entfernen, da es zumindest auf der Rechnung bezahlt klassifiziert
 PayedByThisPayment=Bezahlt durch diese Zahlung
-TerreNumRefModelDesc1=Zurück NUMERO mit Format %syymm-nnnn für Standardrechnungen und syymm%-nnnn für Gutschriften, wo ist JJ Jahr, MM Monat und nnnn ist eine Folge ohne Pause und keine Rückkehr auf 0
 TypeContact_facture_internal_SALESREPFOLL=Repräsentative Follow-up Debitorenrechnung
 TypeContact_facture_external_BILLING=Debitorenrechnung Kontakt
 TypeContact_facture_external_SHIPPING=Customer Versand Kontakt
diff --git a/htdocs/langs/de_AT/externalsite.lang b/htdocs/langs/de_AT/externalsite.lang
index d481926dd08..a3871bced11 100644
--- a/htdocs/langs/de_AT/externalsite.lang
+++ b/htdocs/langs/de_AT/externalsite.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Verknüpfung zur externen Website einrichten
-ExternalSiteURL=Externe Seiten-URL
 ExampleMyMenuEntry=Mein Menüeintrag
diff --git a/htdocs/langs/de_AT/modulebuilder.lang b/htdocs/langs/de_AT/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/de_AT/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/de_AT/orders.lang b/htdocs/langs/de_AT/orders.lang
index b004e480119..9eb74a30c57 100644
--- a/htdocs/langs/de_AT/orders.lang
+++ b/htdocs/langs/de_AT/orders.lang
@@ -4,6 +4,7 @@ OrderToProcess=Zu bearbeitende Bestellung
 StatusOrderValidatedShort=Bestätigt
 StatusOrderValidated=Bestätigt
 StatusOrderOnProcess=In Arbeit
+AddPurchaseOrder=Bestellung anlegen
 RefOrder=Bestellung Nr.
 AuthorRequest=Authorenrechte beantragen
 PaymentOrderRef=Zahlung zu Bestellung %s
diff --git a/htdocs/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang
index 454cbcab118..272a2cf3d92 100644
--- a/htdocs/langs/de_AT/products.lang
+++ b/htdocs/langs/de_AT/products.lang
@@ -17,7 +17,6 @@ ProductStatusOnBuyShort=Verfügbar
 ProductStatusNotOnBuyShort=Veraltet
 SellingPriceTTC=Verkaufspreis (brutto)
 CantBeLessThanMinPrice=Der aktuelle Verkaufspreis unterschreitet die Preisuntergrenze dieses Produkts (%s ohne MwSt.)
-AssociatedProductsAbility=Enable Kits (set of several products)
 NoMatchFound=Keine Treffer gefunden
 DeleteProduct=Produkt/Service löschen
 ConfirmDeleteProduct=Möchten Sie dieses Produkt/Service wirklich löschen?
diff --git a/htdocs/langs/de_AT/propal.lang b/htdocs/langs/de_AT/propal.lang
index c96a462a74a..c0d9c0ab2b4 100644
--- a/htdocs/langs/de_AT/propal.lang
+++ b/htdocs/langs/de_AT/propal.lang
@@ -7,6 +7,7 @@ DateEndPropal=Ablauf der Bindefrist
 ValidityDuration=Bindefrist
 CopyPropalFrom=Erstelle neues Angebot durch Duplikation
 DefaultProposalDurationValidity=Standardmäßige Bindefrist (Tage)
+AvailabilityPeriod=Lieferzeit
 AvailabilityTypeAV_NOW=Prompt nach Rechnungserhalt
 TypeContact_propal_internal_SALESREPFOLL=Angebotsnachverfolgung durch Vertreter
 TypeContact_propal_external_BILLING=Debitorenrechnung Kontakt
diff --git a/htdocs/langs/de_AT/withdrawals.lang b/htdocs/langs/de_AT/withdrawals.lang
index 3ae942e5927..1e452c7a2bd 100644
--- a/htdocs/langs/de_AT/withdrawals.lang
+++ b/htdocs/langs/de_AT/withdrawals.lang
@@ -5,4 +5,3 @@ StatusWaiting=Wartestellung
 StatusMotif2=Abbuchung angefochten
 StatusMotif5=Fehlerhafte Kontodaten
 OrderWaiting=Wartestellung
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index 0a0ec0ef160..d98030ee805 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -104,7 +104,6 @@ VentilatedinAccount=Erfolgreich mit dem Buchhaltungskonto verknüpft!
 NotVentilatedinAccount=Nicht mit einem Buchhaltungskonto verknüpft
 XLineSuccessfullyBinded=%s Produkte / Leistungen erfolgreich mit einem Buchhaltungskonto verknüpft.
 XLineFailedToBeBinded=%s Produkte / Leistungen konnten nicht mit einem Buchhaltungskonto verknüpft werden.
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Sortiere nach den neuesten zu verknüpfenden Positionen
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Sortiere nach den neuesten zu verknüpften Positionen
 ACCOUNTING_LENGTH_DESCRIPTION=Produkt- und Dienstleistungsbeschreibungen abkürzen (Wir empfehlen nach 50 Zeichen)
@@ -138,7 +137,6 @@ LabelOperation=Vorgangsbezeichnung
 LetteringCode=Beschriftung
 JournalLabel=Journalbezeichnung
 TransactionNumShort=Transaktionsnummer
-AccountingCategory=Eigene Kontogruppen
 AccountingAccountGroupsDesc=Trage hier deine eigenen Buchhaltungs - Kontogruppen ein. Daraus kannst du spezielle Berichte erzeugen.
 ByAccounts=Nach Konto
 ByPredefinedAccountGroups=Nach Gruppe
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index b81530cabec..316e2eccb2f 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -174,8 +174,6 @@ InfDirExample=<br>Dann deklariere in <strong>conf.php</strong><br> $dolibarr_mai
 CallUpdatePage=Zur Aktualisierung der Daten und der Datenbankstruktur gehst du zur Seite %s.
 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 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> der Kunden-Code mit n Zeichen<br><b>{cccc000}</b> der Kunden-Code mit n Zeichen, gefolgt von der dem Kunden zugeordneten Partner ID. Dieser Zähler wird gleichzeitig mit dem Globalen Zähler zurückgesetzt.<br><b>{tttt}</b> Die Partner ID mit n Zeichen (siehe unter Einstellungen->Stammdaten->Arten von Partnern). Wenn diese Option aktiv ist, wird für jede Partnerart ein separater Zähler geführt.<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, mit Datum 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Beispiel für Dritte erstellt am 2007-03-01:</u> <br>
@@ -320,7 +318,6 @@ Module50400Name=Doppelte Buchhaltung
 Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP.\nDer Server muss dazu CUPS am Laufen haben und Zugriff auf einen Drucker haben.
 Module55000Name=Befragung, Umfrage oder Abstimmung
 Module55000Desc=Modul zur Erstellung von Online-Umfragen, Umfragen oder Abstimmungen (wie Doodle, Studs, Rdvz,....)
-Module59000Desc=Module to follow margins
 Module62000Name=Lieferbedingungen
 Module62000Desc=Hinzufügen von Funktionen zur Verwaltung von Lieferbedingungen (Incoterms)
 Module63000Desc=Hier kannst du deine Ressourcen (Drucker, Räume, Fahrzeuge) Kalenderereignissen zuweisen.
@@ -373,10 +370,13 @@ Permission1187=Empfangsbestätigung Lieferantenbestellung quittieren
 Permission1190=Lieferantenbestellungen bestätigen (zweite Bestätigung).
 Permission1231=Lieferantenrechnungen einsehen
 Permission1232=Lieferantenrechnungen erzeugen und bearbeiten
-Permission1235=Lieferantenrechnungen per E-Mail versenden
 Permission1236=Kundenrechnungen, -attribute und -zahlungen exportieren
 Permission1421=Kundenaufträge mit Attributen exportieren
 Permission2414=Aktionen und Aufgaben anderer exportieren
+Permission23001=anzeigen cronjobs
+Permission23002=erstellen/ändern cronjobs
+Permission23003=cronjobs löschen
+Permission23004=cronjobs ausführen
 Permission59002=Gewinspanne definieren
 DictionaryCompanyType=Geschäftspartner Typen
 DictionaryCompanyJuridicalType=Rechtsformen von Unternehmen
@@ -462,7 +462,6 @@ MemcachedNotAvailable=Kein Cache Anwendung gefunden. \nSie können die Leistung
 MemcachedModuleAvailableButNotSetup=Module memcached für applicative Cache gefunden, aber Setup-Modul ist nicht vollständig.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled..
 ServiceSetup=Leistungen Modul Setup
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 SetDefaultBarcodeTypeProducts=Standard-Barcode-Typ für Produkte
 SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Geschäftspartner
 UseUnits=Definieren Sie eine Masseinheit für die Menge während der Auftrags-, Auftragsbestätigungs- oder Rechnungszeilen-Ausgabe
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index ea6a4b02a75..04ebdfdd4c2 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -1,7 +1,9 @@
 # Dolibarr language file - Source file is en_US - bills
 BillsCustomersUnpaid=Offene Kundenrechnungen
 BillsCustomersUnpaidForCompany=Unbezahlte Rechnungen von %s
+BillsSuppliersUnpaid=Unbezahlte Lieferantenrechnungen
 BillsSuppliersUnpaidForCompany=Unbezahlte Rechnungen für %s
+BillsLate=Verspätete Zahlungen
 BillsStatistics=Zahlungsstatistik - Kundenrechnungen
 BillsStatisticsSuppliers=Zahlungsstatistik  - Lieferantenrechnungen
 DisabledBecauseDispatchedInBookkeeping=Das ist inaktiv, weil die Rechnung schon verbucht ist.
@@ -173,10 +175,12 @@ ChequesArea=Schecks
 ChequeDeposits=Scheckeinlagen
 NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen für Geschäftspartner, bei denen Sie als Vertreter angegeben sind.
 YouMustCreateStandardInvoiceFirstDesc=Sie müssen zuerst eine Standardrechnung Erstellen und diese dann in eine Rechnungsvorlage umwandeln
+TypeContact_facture_external_BILLING=Kundenrechnung Kontakt
 TypeContact_invoice_supplier_external_BILLING=Lieferanten - Rechnungskontakt
 TypeContact_invoice_supplier_external_SHIPPING=Lieferanten - Versandkontakt
 InvoiceFirstSituationAsk=Erste Situation Rechnung
 InvoiceSituation=Situation Rechnung
+PDFInvoiceSituation=Situation Rechnung
 SituationAmount=Situation Rechnungsbetrag (ohne MwSt.)
 CreateNextSituationInvoice=Erstelle nächsten Position
 DisabledBecauseNotLastInCycle=Der folgende Situation ist bereits vorhanden.
diff --git a/htdocs/langs/de_CH/boxes.lang b/htdocs/langs/de_CH/boxes.lang
index e4f64b3302a..1170e06a180 100644
--- a/htdocs/langs/de_CH/boxes.lang
+++ b/htdocs/langs/de_CH/boxes.lang
@@ -65,4 +65,3 @@ SuspenseAccountNotDefined=Es ist kein Wartestellungskonto festgelegt.
 BoxLastCustomerShipments=Letzte Lieferungen an Kunden
 BoxTitleLastCustomerShipments=Die neuesten %s Lieferungen an Kunden
 NoRecordedShipments=Es gibt noch keine Lieferungen an Kunden.
-AccountancyHome=Rechnungswesen
diff --git a/htdocs/langs/de_CH/categories.lang b/htdocs/langs/de_CH/categories.lang
index 974a26170ae..cebc3c2b78a 100644
--- a/htdocs/langs/de_CH/categories.lang
+++ b/htdocs/langs/de_CH/categories.lang
@@ -12,7 +12,6 @@ SuppliersCategoriesArea=Bereich für Lieferanten-Tags / Kategorien
 CustomersCategoriesArea=Schlagwörter / Kategorien für Kunden
 MembersCategoriesArea=Schlagwörter / Kategorien für Mitglieder
 ContactsCategoriesArea=Schlagwörter / Kategorien für Kontakte
-AccountsCategoriesArea=Schlagwörter / Kategorien für Konten
 ProjectsCategoriesArea=Schlagwörter / Kategorien für Projekte
 UsersCategoriesArea=Benutzerschlagworte und -kategorien
 SubCats=Unterkategorien
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 552d590f169..3bca2038541 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -23,8 +23,6 @@ ThirdPartyEmail=E-Mail des Geschäftspartners
 ThirdPartyProspectsStats=Interessenten Statistik
 ThirdPartyType=Typ des Geschäftspartners
 ToCreateContactWithSameName=Erzeuge einen Kontakt mit den selben Angaben, wie der Geschäftspartner. Meistens (auch wenn der Partner eine natürliche Person ist), braucht es das nicht.
-ReportByMonth=Monatsbericht
-ReportByCustomers=Kundenbericht
 PostOrFunction=Position
 NatureOfThirdParty=Typ des Geschäftspartners
 NatureOfContact=Typ des Geschäftspartners
@@ -155,6 +153,10 @@ TE_WHOLE=Distributor
 StatusProspect-1=Nicht kontaktieren
 StatusProspect0=Noch kein Kontaktversuch
 StatusProspect3=Erfolgreich kontaktiert
+ChangeDoNotContact=Ändern Sie den Status auf 'Nicht kontaktieren'
+ChangeNeverContacted=Ändern Sie den Status auf 'Noch kein Kontaktversuch'
+ChangeContactInProcess=Ändern Sie den Status auf 'Kontaktaufnahme läuft'
+ChangeContactDone=Ändern Sie den Status auf 'Erfolgreich kontaktiert'
 ProspectsByStatus=Leads nach Status
 NoParentCompany=Keine Mutterfirma
 ContactNotLinkedToCompany=Kontakt keinem Geschäftspartner zugeordnet
@@ -179,7 +181,6 @@ ActivityCeased=Inaktiv
 ThirdPartyIsClosed=Der Partner ist inaktiv.
 OutstandingBillReached=Kreditlimit erreicht
 OrderMinAmount=Mindestbestellmenge
-MonkeyNumRefModelDesc=Generiere die Kundennummer im Format %syymm-nnnn und die Lieferantennummer als %syymm-nnnn. (y=Jahr; m=Monat; n=fortlaufende Zahl).
 MergeOriginThirdparty=Geschäftspartner duplizieren (Geschäftspartner, den Sie löschen möchten)
 MergeThirdparties=Zusammenführen von Geschäftspartnern
 ConfirmMergeThirdparties=Willst du diesen Partner wirklich mit dem aktuellen Verbinden?\nAlle verknüpften Objekte werden dabei übernommen und dann der gewählte Partner gelöscht.
diff --git a/htdocs/langs/de_CH/compta.lang b/htdocs/langs/de_CH/compta.lang
index 1690ed0c885..d5a93e6ef69 100644
--- a/htdocs/langs/de_CH/compta.lang
+++ b/htdocs/langs/de_CH/compta.lang
@@ -26,6 +26,5 @@ ThirdPartyMustBeEditAsCustomer=Geschäftspartner muss als Kunde definiert werden
 Pcg_type=PCG Typ
 Pcg_subtype=PCG Subtyp
 InvoiceLinesToDispatch=versandbereite Rechnungszeilen
-ToCreateAPredefinedInvoice=Um eine Rechnungsvorlage zu erstellen, erstellen Sie eine Standard-Rechnung und klicken dann (ohne Freigabe) auf den Knopf "%s".
 CalculationRuleDesc=Zur Berechnung der Gesamt-MwSt. gibt es zwei Methoden: <br>Methode 1 rundet die Steuer in jeder Zeile und addiert zum Schluss. <br>Methode 2 summiert alle Steuer-Zeilen und rundet am Ende. <br>Das endgültige Ergebnis kann sich in wenigen Cent unterscheiden. Standardmodus ist <b>Modus %s.</b>
 LinkedFichinter=Mit einem Eingriff verknüpfen
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 672bfdcc6f9..0cc93b38bf1 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -114,6 +114,8 @@ UserCreationShort=Neu
 UserModificationShort=Ändern
 UserValidationShort=Validieren
 Second=Zweitens
+Morning=Morgen
+Afternoon=Nachmittag
 MinuteShort=min
 CurrencyRate=Wechselkurs
 UserAuthor=Erstellt von
@@ -175,6 +177,7 @@ AddressesForCompany=Adressen für den Geschäftspartner
 ActionsOnCompany=Ereignisse zu diesem Geschäftspartner
 ActionsOnContact=Ereignisse zu diesem Kontakt
 ActionsOnContract=Ereignisse zu diesem Vertrag
+ActionsOnMember=Aktionen zu diesem Mitglied
 ActionsOnProduct=Vorgänge zu diesem Produkt
 ToDo=Zu erledigen
 Running=In Bearbeitung
@@ -217,6 +220,7 @@ ExpandAll=Alle ausklappen
 UndoExpandAll=Ausklappen rückgängig machen
 SeeAll=Zeige alles an
 CloseWindow=Fenster schliessen
+Priority=Wichtigkeit
 NotSent=Nicht gesendet
 SendAcknowledgementByMail=Bestätigungsemail senden
 SendMail=sende E-Mail
@@ -263,6 +267,8 @@ ByMonthYear=Von Monat / Jahr
 AdminTools=Administratorwerkzeuge
 MyDashboard=Mein Dashboard
 SelectTargetUser=Wähle den Benutzer / Mitarbeiter
+SaveUploadedFileWithMask=Datei auf dem Server speichern mit dem Namen "<strong>%s</strong>" (oder "%s")
+OriginFileName=Original Dateiname
 ShowMoreLines=Mehr oder weniger Positionen anzeigen
 SelectElementAndClick=Wähle etwas aus und klicke dann auf %s
 ShowTransaction=Zeige die Transaktion auf dem zugehörigen Bankkonto.
@@ -297,8 +303,6 @@ GroupBy=Sortieren nach
 ViewFlatList=Einfache Liste anzeigen
 RemoveString=Entferne die Zeichenfolge '%s'
 SomeTranslationAreUncomplete=Du siehst ungenaue Übersetzungen oder unvollständig Übersetzte Sprachen? Hilf uns, das zu verbessern und registriere dich in der <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">Dolibarr - Übersetzungsumgebung</a>, Danke!
-DirectDownloadLink=Direkter externer Downloadlink
-DirectDownloadInternalLink=Direkter Downloadlink, wenn eingeloggt und die Rechte vorhanden sind.
 ActualizeCurrency=Aktualisiere Währung
 ModuleBuilder=Modul und Applikationsentwicklungsumgebung
 SetMultiCurrencyCode=Setze Währung
@@ -344,7 +348,6 @@ LocalAndRemote=Lokal und Entfernt
 KeyboardShortcut=Tastaturkürzel
 Deletedraft=Lösche den Entwurf
 ConfirmMassDraftDeletion=Bestätigung Mehrfachlöschung von Entwürfen
-FileSharedViaALink=Datei ist geteilt
 SelectAThirdPartyFirst=Wähle zuerst einen Partner aus.
 YouAreCurrentlyInSandboxMode=Wir sind aktuell im %s "sandbox" Modus
 Inventory=Inventar
diff --git a/htdocs/langs/de_CH/margins.lang b/htdocs/langs/de_CH/margins.lang
index 6fb3f4ceed5..0087c11d386 100644
--- a/htdocs/langs/de_CH/margins.lang
+++ b/htdocs/langs/de_CH/margins.lang
@@ -1,4 +1,8 @@
 # Dolibarr language file - Source file is en_US - margins
+ProductService=Produkt oder Service
+UseDiscountAsProduct=Als Produkt
+UseDiscountAsService=Als Service
+UseDiscountOnTotal=Auf Zwischensumme
 MARGIN_TYPE=Kaufpreis / Kosten standardmässig vorgeschlagen für Standardmargenkalkulation empfohlen\n
 MargeType1=Marge nach höchstem Lieferantenpreis
 MargeType3=Spanne vom Einstandspreis
diff --git a/htdocs/langs/de_CH/modulebuilder.lang b/htdocs/langs/de_CH/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/de_CH/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/de_CH/orders.lang b/htdocs/langs/de_CH/orders.lang
index 18c31d48556..5455bdff8b9 100644
--- a/htdocs/langs/de_CH/orders.lang
+++ b/htdocs/langs/de_CH/orders.lang
@@ -14,6 +14,7 @@ AwaitingReception=Lieferung ausstehend
 StatusOrderReceivedAllShort=Erhaltene Produkte
 CancelOrder=Bestellung verwerfen
 ShowOrder=Zeige Bestellung
+OrdersOpened=Bestellungen zu bearbeiten
 NoOrder=Keine Bestellung
 LastOrders=%s neueste Kundenbestellungen
 LastCustomerOrders=%s neueste Kundenbestellungen
@@ -28,6 +29,7 @@ ConfirmUnvalidateOrder=Bist du sicher, dass du die Bestellung <b>%s</b> in den E
 ConfirmCancelOrder=Bist du sicher, dass du diese Bestellung zurückziehen willst?
 ConfirmMakeOrder=Bist du sicher, dass du bestätigen willst, diese Bestellung am <b>%s</b> gemacht zu haben?
 DraftSuppliersOrders=Lieferantenbestellungsentwürfe
+RefOrder=Bestell-Nr.
 RefCustomerOrder=Kunden - Bestellnummer
 RefOrderSupplier=Bestellnummer für den Lieferanten
 RefOrderSupplierShort=Lieferanten - Bestellnummer
@@ -43,7 +45,6 @@ TypeContact_order_supplier_external_SHIPPING=Lieferanten - Versandkontakt
 TypeContact_order_supplier_external_CUSTOMER=Lieferanten - Nachkalkulationskontakt
 Error_OrderNotChecked=Keine zu verrechnenden Bestellungen ausgewählt
 OrderByEMail=E-Mail
-PDFEinsteinDescription=A complete order model
 OrderCreation=Erstellen einer Bestellung
 IfValidateInvoiceIsNoOrderStayUnbilled=Wenn Rechnungsvalidierung auf "Nein" steht, bleibt die Bestellung im Status "nicht verrechnet", bis die Rechnung frei gegeben worden ist.
 SetShippingMode=Versandart wählen
diff --git a/htdocs/langs/de_CH/other.lang b/htdocs/langs/de_CH/other.lang
index bc73e4c58b0..f1244585ec1 100644
--- a/htdocs/langs/de_CH/other.lang
+++ b/htdocs/langs/de_CH/other.lang
@@ -20,7 +20,10 @@ ProfIdShortDesc=<b>Prof ID %s</b> dient zur Speicherung landesabhängiger Gesch
 EMailTextInterventionValidated=Service %s wurde freigegeben
 NewSizeAfterCropping=Neue Grösse nach dem Zuschneiden
 DefineNewAreaToPick=Definieren Sie einen neuen Bereich innerhalb des Bildes (Klicken Sie mit der linken Maustaste auf das Bild und halten Sie bis zur gegenüberligenden Ecke)
+YouReceiveMailBecauseOfNotification=Sie erhalten diese Nachricht, weil Ihre E-Mail-Adresse zur Liste der zu benachrichtigenden Kontakte für %s von %s hinzugefügt wurde.
+YouReceiveMailBecauseOfNotification2=Sie erhalten dieses Mail aufgrund folgender Benachrichtigung:
 FileIsTooBig=Dateien sind zu gross
+NewKeyWillBe=Ihr neuer Anmeldeschlüssel für die Software ist
 WebsiteSetup=Einstellungen des Webseitenmoduls
 WEBSITE_PAGEURL=URL für Seite
 WEBSITE_TITLE=Titel
diff --git a/htdocs/langs/de_CH/productbatch.lang b/htdocs/langs/de_CH/productbatch.lang
index a75518f8415..53cdcf4be92 100644
--- a/htdocs/langs/de_CH/productbatch.lang
+++ b/htdocs/langs/de_CH/productbatch.lang
@@ -1,12 +1,17 @@
 # Dolibarr language file - Source file is en_US - productbatch
+ManageLotSerial=Verwende Lot / Seriennummer
+ProductStatusNotOnBatch=Nein (Lot / Seriennummer nicht verwendet)
 Batch=Lot / Seriennumer
 atleast1batchfield="Verbrauchen bis:" - oder "Verkaufen bis:" - Datum. Oder Lot / Seriennummer
+batch_number=Lot / Seriennummer
+BatchNumberShort=Charge / Serie
 EatByDate="Verbrauchen bis:" - Datum
 SellByDate="Verkaufen bis:" - Datum
 DetailBatchNumber=Details Lot / Serienummer
 printBatch=Chg / Serie: %s
 AddDispatchBatchLine=Fügen Sie eine Zeile für Haltbarkeit hinzu
 WhenProductBatchModuleOnOptionAreForced=Bei aktiviertem Modul Lot / Seriennummer wird bei Freigabe einer Lieferung der Lagerbestand automatisch vermindert.\nUmgekehrt erfolgt die Lagerzunahme bei erst bei manuellem Verschieben in die Lager.\nDas kann man nicht ändern. Die anderen Optionen kannst du ändern.
+ProductDoesNotUseBatchSerial=Dieses Produkt verwendet keine Lose oder Seriennummern
 ProductLotSetup=Einstellungen Modul Lot / Seriennummer
 ShowCurrentStockOfLot=Zeige aktuellen Lagerbestand von Produkt / Lot Paaren
 ShowLogOfMovementIfLot=Zeige Lagerbewegungen von Produkt / Lot Paaren
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index b2ef1eb5c60..fe068de6eeb 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -38,7 +38,6 @@ ServicesArea=Leistungs-Übersicht
 SupplierCard=Anbieterkarte
 SetDefaultBarcodeType=Wählen Sie den standardmässigen Barcode-Typ
 MultiPricesAbility=Preisstufen pro Produkt / Dienstleistung\n(Kunden werden einem Segment zugewiesen)
-AssociatedProductsAbility=Enable Kits (set of several products)
 ParentProducts=Übergeordnetes Produkt
 ListOfProductsServices=Liste der Produkte und Dienstleistungen
 QtyMin=Mindestmenge
diff --git a/htdocs/langs/de_CH/propal.lang b/htdocs/langs/de_CH/propal.lang
index 17738ed820a..d345fdc8e28 100644
--- a/htdocs/langs/de_CH/propal.lang
+++ b/htdocs/langs/de_CH/propal.lang
@@ -8,10 +8,13 @@ LastModifiedProposals=%s neueste geänderte Offerten
 ProposalsStatistics=Angebote Statistiken
 PropalsOpened=Offen
 PropalStatusSigned=Unterzeichnet (ist zu verrechnen)
+PropalStatusNotSigned=Nicht unterzeichnet (geschlossen)
+PropalStatusClosedShort=Geschlossen
 PropalStatusSignedShort=Unterzeichnet
 PropalStatusNotSignedShort=Nicht unterzeichnet
 PropalsToClose=Zu schliessende Angebote
 ListOfProposals=Liste der Angebote
+ActionsOnPropal=Ereignisse zum Angebot
 DefaultProposalDurationValidity=Standardmässige Gültigkeitsdatuer (Tage)
 AvailabilityPeriod=Verfügbarkeitszeitraum
 SetAvailability=Verfügbarkeitszeitraum definieren
diff --git a/htdocs/langs/de_CH/stocks.lang b/htdocs/langs/de_CH/stocks.lang
index 50f00fefcad..0e46de215c7 100644
--- a/htdocs/langs/de_CH/stocks.lang
+++ b/htdocs/langs/de_CH/stocks.lang
@@ -29,3 +29,4 @@ OpenAll=Für alle Aktionen freigeben
 UseDispatchStatus=Auslieferungs - Status (frei gegeben / zurückgewiesen) für Lieferantenbestellungen führen.
 inventoryDraft=Läuft
 inventoryOnDate=Inventar
+ReOpen=entwerfen
diff --git a/htdocs/langs/de_CH/users.lang b/htdocs/langs/de_CH/users.lang
index 18929f1b851..9f4f080f55d 100644
--- a/htdocs/langs/de_CH/users.lang
+++ b/htdocs/langs/de_CH/users.lang
@@ -37,7 +37,7 @@ WeeklyHours=Geleistete Stunden pro Woche
 ExpectedWorkedHours=Erwartete Stunden pro Woche
 DisabledInMonoUserMode=Im Wartungsmodus deaktiviert
 UserAccountancyCode=Buchhaltungskonto zum Benutzer
-DateEmployment=Datum der Anstellung
+DateEmploymentstart=Datum der Anstellung
 DateEmploymentEnd=Datum des Austrittes
 CantDisableYourself=Du kannst dein eigenes Benutzerkonto nicht löschen.
 ForceUserExpenseValidator=Anderen Prüfer für Spesenabrechnungen bestimmen.
diff --git a/htdocs/langs/de_CH/withdrawals.lang b/htdocs/langs/de_CH/withdrawals.lang
index 72755cae42a..4a0aee41836 100644
--- a/htdocs/langs/de_CH/withdrawals.lang
+++ b/htdocs/langs/de_CH/withdrawals.lang
@@ -6,4 +6,3 @@ StatusPaid=Verarbeitet
 StatusMotif4=Kundenbestellungen
 OrderWaiting=Wartend
 NumeroNationalEmetter=Nat. Überweisernummer
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 8e2382d07d4..a3725e98324 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=verbundene Rechnungszeilen
 ExpenseReportLines=Zeilen von Spesenabrechnungen zu verbinden
 ExpenseReportLinesDone=Gebundene Zeile von Spesenabrechnungen
 IntoAccount=mit dem Buchhaltungskonto verbundene Zeilen
-TotalForAccount=Gesamtsumme für Buchhaltungskonto
+TotalForAccount=Buchhaltungskonto Summe
 
 
 Ventilate=zusammenfügen
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal-Bezeichnung
 NumPiece=Teilenummer
 TransactionNumShort=Anz. Buchungen
-AccountingCategory=Personalisierte Gruppen
+AccountingCategory=Custom group
 GroupByAccountAccounting=Gruppieren nach Hauptbuchkonto
 GroupBySubAccountAccounting=Gruppieren nach Nebenbuchkonto
 AccountingAccountGroupsDesc=Hier können Kontengruppen definiert werden. Diese werden für personaliserte Buchhaltungsreports verwendet.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Zeilen noch nicht zugeordnet, verwende das Menu <a hr
 
 ## Import
 ImportAccountingEntries=Buchaltungseinträge
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Datum Export
 WarningReportNotReliable=Achtung, dieser Bericht basiert nicht auf dem Hauptbuch und enthält keine Transaktionen, die manuell im Hauptbuch geändert wurden. Wenn Ihre Journalisierung aktuell ist, ist die Buchhaltungsansicht genauer.
 ExpenseReportJournal=Spesenabrechnung Journal
 InventoryJournal=Inventarjournal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 21f0a05f884..6256ec62784 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Sperrung neuer Sitzungen aufheben
 YourSession=Ihre Sitzung
 Sessions=Benutzersitzungen
 WebUserGroup=WebServer Benutzer/Gruppen
+PermissionsOnFiles=Berechtigungen für Dateien
 PermissionsOnFilesInWebRoot=Berechtigungen für Dateien im Stammverzeichnis Web
 PermissionsOnFile=Berechtigungen für die Datei %s
 NoSessionFound=Ihre PHP -Konfiguration scheint keine Auflistung aktiver Sitzungen zuzulassen. Eventuell ist die Speicherung im Verzeichnis (<b>%s</b>) durch fehlende Berechtigungen blockiert (zum Beispiel: Betriebssystemberechtigungen oder open_basedir-Beschränkungen). 
@@ -62,6 +63,7 @@ IfModuleEnabled=Anmerkung: Ist nur wirksam wenn Modul <b>%s</b> aktiviert ist
 RemoveLock=Sie müssen die Datei <b>%s</b>  entfernen oder umbennen, falls vorhanden, um die Benutzung des Installations-/Update-Tools zu erlauben.
 RestoreLock=Stellen Sie die Datei <b>%s</b> mit ausschließlicher Leseberechtigung wieder her, um die Benutzung des Installations-/Update-Tools zu deaktivieren.
 SecuritySetup=Sicherheitseinstellungen
+PHPSetup=PHP-Einstellungen
 SecurityFilesDesc=Sicherheitseinstellungen für Dateiupload festlegen
 ErrorModuleRequirePHPVersion=Fehler: Dieses Modul benötigt die PHP Version %s oder höher
 ErrorModuleRequireDolibarrVersion=Fehler: Dieses Moduls benötigt die Dolibarr Version %s oder höher
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=In diesem Bereich finden Sie die Verwaltungsfunktionen. Verw
 Purge=Bereinigen
 PurgeAreaDesc=Auf dieser Seite können Sie alle von Dolibarr erzeugten oder gespeicherten Dateien (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b> ) löschen. Die Verwendung dieser Funktion ist in der Regel nicht erforderlich. Es wird als Workaround für Benutzer bereitgestellt, deren Dolibarr von einem Anbieter gehostet wird, der keine Berechtigungen zum löschen von Dateien anbietet, die vom Webserver erzeugt wurden.
 PurgeDeleteLogFile=Löschen der Protokolldateien, einschließlich <b>%s</b>, die für das Syslog-Modul definiert wurden (kein Risiko Daten zu verlieren)
-PurgeDeleteTemporaryFiles=Alle Protokoll- und temporären Dateien löschen (kein Risiko, Daten zu verlieren). Hinweis: Das Löschen temporärer Dateien erfolgt nur, wenn das temporäre Verzeichnis vor mehr als 24 Stunden erstellt wurde.
+PurgeDeleteTemporaryFiles=Löscht alle Protokoll- und temporären Dateien (kein Risiko, Daten zu verlieren). Parameter können 'tempfilesold', 'logfiles' oder beide 'tempfilesold + logfiles' sein. Hinweis: Das Löschen temporärer Dateien erfolgt nur, wenn das temporäre Verzeichnis vor mehr als 24 Stunden erstellt wurde.
 PurgeDeleteTemporaryFilesShort=Protokoll- und temporäre Dateien löschen
 PurgeDeleteAllFilesInDocumentsDir=Alle Dateien im Verzeichnis: <b>%s</b> löschen: <br>Dadurch werden alle erzeugten Dokumente löschen, die sich auf verknüpfte (Dritte, Rechnungen usw....), Dateien, die in das ECM Modul hochgeladen wurden, Datenbank, Backup, Dumps und temporäre Dateien beziehen.
 PurgeRunNow=Jetzt bereinigen
@@ -232,6 +234,7 @@ BoxesAvailable=Verfügbare Widgets
 BoxesActivated=Aktivierte Widgets
 ActivateOn=Aktiv ab
 ActiveOn=Aktiviert ab
+ActivatableOn=Aktivierbar auf
 SourceFile=Quelldatei
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Nur bei aktiviertem JavaScript und AJAX verfügbar
 Required=Erforderlich
@@ -289,7 +292,7 @@ MAIN_MAIL_AUTOCOPY_TO= Blindkopie (BCC) aller gesendeten E-Mails an
 MAIN_DISABLE_ALL_MAILS=Alle E-Mail-Funktionen deaktivieren (für Test- oder Demonstrationszwecke)
 MAIN_MAIL_FORCE_SENDTO=Sende alle E-Mails an den folgenden anstatt an die tatsächlichen Empfänger (für Testzwecke)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=E-Mail-Adressen von Mitarbeitern (falls definiert) beim Schreiben einer neuen E-Mail in der Liste vordefinierten Empfänger vorschlagen
-MAIN_MAIL_SENDMODE=e-Mail Sendemethode
+MAIN_MAIL_SENDMODE=E-Mail Sendemethode
 MAIN_MAIL_SMTPS_ID=SMTP-Benutzer (falls der Server eine Authentifizierung benötigt)
 MAIN_MAIL_SMTPS_PW=SMTP-Passwort (falls der Server eine Authentifizierung benötigt) 
 MAIN_MAIL_EMAIL_TLS=TLS (SSL) Verschlüsselung verwenden
@@ -302,7 +305,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Privater Schlüssel für die DKIM-Signatur
 MAIN_DISABLE_ALL_SMS=alle SMS-Funktionen abschalten  (für Test- oder Demozwecke)
 MAIN_SMS_SENDMODE=Methode zum Versenden von SMS
 MAIN_MAIL_SMS_FROM=Standard Versandrufnummer der SMS-Funktion
-MAIN_MAIL_DEFAULT_FROMTYPE=Standard Absender e-Mail für manuelle Sendungen (Benutzer e-Mail oder Unternehmen e-Mail)
+MAIN_MAIL_DEFAULT_FROMTYPE=Standard Absenderadresse für manuelles Senden (Benutzer- oder Unternehmens-Adresse)
 UserEmail=E-Mail des Benutzers
 CompanyEmail=Unternehmens-E-Mail 
 FeatureNotAvailableOnLinux=Diese Funktion ist auf Unix-Umgebungen nicht verfügbar. Testen Sie Ihr Programm sendmail lokal.
@@ -347,9 +350,10 @@ LastActivationAuthor=Benutzer der letzten Aktivierung
 LastActivationIP=IP der letzten Aktivierung
 UpdateServerOffline=Update-Server offline  (nicht erreichbar)
 WithCounter=Zähler verwenden
-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> der Kunden-Code mit n Zeichen <br> <b>{cccc000} Nach</b> dem Client-Code mit n Zeichen folgt ein Zähler, der für den Kunden <b>reserviert</b> ist. Dieser dem Kunden gewidmete Zähler wird gleichzeitig mit dem globalen Zähler zurückgesetzt. <br> <b>{tttt}</b> Der Code eines Drittanbieters setzt sich aus n Zeichen zusammen (siehe Menü Home - Setup - Dictionary - Typen von Drittanbietern). Wenn Sie dieses Tag hinzufügen, ist der Zähler für jeden Typ von Drittanbietern unterschiedlich. <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben erhalten. <br> \nLeerzeichen sind nicht zulässig. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Drittanbieters DieFirma, mit Datum 2007-01-31:</u> <br> 
 GenericMaskCodes4b=<u>Beispiel für Partner erstellt am 2018-10-27:</u> <br>
 GenericMaskCodes4c=<u>Beispiel für ein Produkt erstellt am 2018-10-27:</u> <br>
@@ -391,7 +395,7 @@ ResponseTimeout=Zeitüberschreitung für Antwort (Timeout)
 SmsTestMessage=Test Nachricht von __PHONEFROM__ zu __PHONETO__
 ModuleMustBeEnabledFirst=Modul <b>%s</b> muss aktiviert sein, wenn Sie dieses Feature benötigen.
 SecurityToken=Schlüssel um die URLs zu entschlüsseln
-NoSmsEngine=Kein SMS-Sendermanager verfügbar. Ein SMS-Sendermanager ist nicht mit der Standardverteilung installiert, da er von einem externen Anbieter abhängig ist, können Sie einige davon finden unter %s
+NoSmsEngine=Kein SMS-Sendermanager verfügbar. Ein SMS-Sendermanager gehört nicht zum Standardumfang von Dolibarr, da er von einem externen Anbieter abhängig ist. Passende Module können Sie hier finden: %s
 PDF=PDF
 PDFDesc=Globale Einstellungen für die PDF-Erzeugung
 PDFAddressForging=Regeln für die Auswahl der Adressen
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Wenn Sie dieses Feld leer lassen, wird dieser Wert u
 ExtrafieldParamHelpselect=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> Code3, Wert3 <br> ... <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> 1, value1 | options_ <i>parent_list_code</i> : parent_key <br> 2, value2 | options_ <i>parent_list_code</i> : parent_key <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> 1, value1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpsellist=Die Liste der Werte stammt aus einer Tabelle <br> Syntax: table_name:label_field:id_field::filter <br> Beispiel: c_typent:libelle:id::filter <br><br> - id_field ist notwendigerweise ein primärer int-Schlüssel <br> - Filter kann ein einfacher Test sein (z. B. aktiv = 1), um nur den aktiven Wert anzuzeigen <br> Sie können $ID$ auch in Filtern verwenden, bei denen es sich um die aktuelle ID des aktuellen Objekts handelt <br> Verwenden Sie $SEL$, um ein SELECT im Filter durchzuführen <br> Wenn Sie nach Extrafeldern filtern möchten, verwenden Sie die Syntax extra.fieldcode = ... (wobei field code der Code des Extrafelds ist) <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> c_typent:libelle:id:options_ <i>parent_list_code</i> |parent_column:filter <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> c_typent:libelle:id: <i>parent_list_code</i> |parent_column:filter
-ExtrafieldParamHelpchkbxlst=Die Liste der Werte stammt aus einer Tabelle <br> Syntax: table_name: label_field: id_field :: filter <br> Beispiel: c_typent: libelle: id :: filter <br><br> Filter kann ein einfacher Test sein (z. B. aktiv = 1), um nur den aktiven Wert anzuzeigen <br> Sie können $ ID $ auch in Filtern verwenden, bei denen es sich um die aktuelle ID des aktuellen Objekts handelt <br> Verwenden Sie $ SEL $, um ein SELECT im Filter durchzuführen <br> Wenn Sie nach Extrafeldern filtern möchten, verwenden Sie die Syntax extra.fieldcode = ... (wobei field code der Code des Extrafelds ist) <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Die Parameter müssen ObjectName: Classpath <br> sein. Syntax: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Für ein einfaches Trennzeichen leer lassen <br> Setzen Sie diesen Wert für ein ausblendendes Trennzeichen auf 1 (standardmäßig für eine neue Sitzung geöffnet, der Status wird für jede Benutzersitzung beibehalten) <br> Setzen Sie diesen Wert für ein ausblendendes Trennzeichen auf 2 (standardmäßig für ausgeblendet) neue Sitzung, dann bleibt der Status für jede Benutzersitzung erhalten)
 LibraryToBuildPDF=Bibliothek zum Erstellen von PDF-Dateien
@@ -541,6 +545,8 @@ Module40Name=Lieferanten/Hersteller
 Module40Desc=Lieferanten- und Einkaufsverwaltung (Bestellungen und Fakturierung von Lieferantenrechnungen)
 Module42Name=Debug Logs
 Module42Desc=Protokollierungsdienste (Syslog). Diese Logs dienen der Fehlersuche/Analyse.
+Module43Name=Debug Leiste
+Module43Desc=Ein Tool für Entwickler, das eine Debug-Leiste in Ihrem Browser hinzufügt.
 Module49Name=Bearbeiter
 Module49Desc=Editorverwaltung
 Module50Name=Produkte
@@ -607,7 +613,7 @@ Module610Desc=Erlaubt das Erstellen von Produktvarianten, basierend auf Merkmale
 Module700Name=Spenden
 Module700Desc=Spendenverwaltung
 Module770Name=Spesenabrechnungen
-Module770Desc=Verwaltung von Spesenabrechnungen (Transport, Essen,....)
+Module770Desc=Verwaltung von Spesenabrechnungen (Reisekosten, Verpflegungsmehraufwand,....)
 Module1120Name=Angebotsanforderung
 Module1120Desc=Anfordern von Lieferanten-Angeboten und Preisen
 Module1200Name=Mantis
@@ -639,18 +645,20 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind Konvertierung
 Module3200Name=Unveränderliche Archive
 Module3200Desc=Aktivieren Sie ein unveränderliches Protokoll von Geschäftsereignissen. Ereignisse werden in Echtzeit archiviert. Das Protokoll ist eine schreibgeschützte Tabelle mit verketteten Ereignissen, die exportiert werden können. Dieses Modul kann für einige Länder zwingend erforderlich sein.
+Module3400Name=Soziale Netzwerke
+Module3400Desc=Aktiviert Felder für soziale Netzwerke für Dritte und Adressen (Skype, Twitter, Facebook, ...).
 Module4000Name=Personal
 Module4000Desc=Personalverwaltung
 Module5000Name=Mandantenfähigkeit
 Module5000Desc=Ermöglicht Ihnen die Verwaltung mehrerer Firmen
-Module6000Name=Workflow
-Module6000Desc=Workflow Management (Automaitische Erstellung von Objekten und/oder automatische Statusaktualisierungen)
+Module6000Name=Workflow zwischen Modulen
+Module6000Desc=Workflow-Management zwischen verschiedenen Modulen (automatische Objekterstellung und / oder automatische Statusänderung)
 Module10000Name=Webseiten
 Module10000Desc=Erstellt im Internet abrufbare Webseiten mit einem WYSIWYG-Editor. Das CMS ist Webmaster- oder Entwickler-orientiert (Kenntnisse der Programmiersprachen HTML und CSS sind empfehlenswert). Richten Sie einfach Ihren Webserver (Apache, Nginx, ...) so ein, dass er auf das dedizierte Dolibarr-Verzeichnis zeigt, um die Webseite unter eigenem Domain-Namen im Internet abrufen zu können.
 Module20000Name=Urlaubsantrags-Verwaltung
 Module20000Desc=Verwalten (erstellen, ablehnen, genehmigen) Sie die Urlaubsanträge Ihrer Angestellten
-Module39000Name=Chargen- und Seriennummernverwaltung
-Module39000Desc=Verwaltung von Chargen- und Seriennummern sowie von Haltbarkeits- und Verkaufslimitdatum
+Module39000Name=Produkt-Chargen und Serien
+Module39000Desc=Verwaltung von Chargen- und Serien sowie von Haltbarkeits- und Verkaufslimitdatum
 Module40000Name=Mehrere Währungen
 Module40000Desc=Nutze alternative Währungen bei Preisen und in Dokumenten
 Module50000Name=PayBox
@@ -805,7 +813,8 @@ 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=Zugang auf alle Partner erweitern (Nicht nur die Partner wofür dieser 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)
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Rechnungen anzeigen
 Permission273=Ausgabe Rechnungen
@@ -910,7 +919,7 @@ Permission1231=Lieferantenrechnungen anzeigen
 Permission1232=Lieferantenrechnungen (Eingangsrechnungen) erstellen/bearbeiten 
 Permission1233=Lieferantenrechnungen freigeben 
 Permission1234=Lieferantenrechnungen löschen
-Permission1235=Lieferantenrechnungen per e-Mail versenden 
+Permission1235=Lieferantenrechnungen per E-Mail versenden 
 Permission1236=Lieferantenrechnungen & -zahlungen exportieren 
 Permission1237=Lieferantenbestellungen mit Details exportieren
 Permission1251=Massenimports von externen Daten ausführen (data load)
@@ -949,10 +958,10 @@ Permission20004=Alle Urlaubsanträge einsehen (von allen Benutzern einschließli
 Permission20005=Urlaubsanträge anlegen/verändern (von allen Benutzern einschließlich der nicht Untergebenen)
 Permission20006=Urlaubstage Administrieren (Setup- und Aktualisierung)
 Permission20007=Urlaubsanträge genehmigen
-Permission23001=anzeigen cronjobs
-Permission23002=erstellen/ändern cronjobs
-Permission23003=cronjobs löschen
-Permission23004=cronjobs ausführen
+Permission23001=Geplante Aufträge anzeigen
+Permission23002=Geplante Aufgaben erstellen/bearbeiten
+Permission23003=Geplante Aufgabe(n) löschen
+Permission23004=Geplante Aufgaben ausführen
 Permission50101=Verwenden des Kassenmoduls (SimplePOS)
 Permission50151=Verwenden des Kassenmoduls (TakePOS)
 Permission50201=Transaktionen einsehen
@@ -1175,7 +1184,8 @@ SetupDescription2=Die folgenden zwei Punkte sind obligatorisch:
 SetupDescription3=<a href="%s"> %s -> %s </a> <br> <br> Grundlegende Parameter zum Anpassen des Standardverhaltens Ihrer Anwendung (z. B. für länderbezogene Funktionen).
 SetupDescription4=<a href="%s"> %s -> %s </a> <br> <br> Diese Software ist eine Suite vieler Module / Anwendungen. Die auf Ihre Bedürfnisse bezogenen Module müssen aktiviert und konfiguriert sein. Menüeinträge werden mit der Aktivierung dieser Module angezeigt.
 SetupDescription5=Andere Setup-Menüs verwalten optionale Parameter.
-LogEvents=Protokollierte Ereignisse
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Protokoll
 InfoDolibarr=Über Dolibarr
 InfoBrowser=Über Ihren Webbrowser
@@ -1238,12 +1248,12 @@ ForcedToByAModule=Diese Regel wird <b>%s</b> durch ein aktiviertes Modul aufgezw
 ValueIsForcedBySystem=Dieser Wert wird vom System erzwungen. Sie können ihn nicht ändern.
 PreviousDumpFiles=bestehende Datensicherungsdateien
 PreviousArchiveFiles=Bestehende Archivdateien
-WeekStartOnDay=Wochenstart
+WeekStartOnDay=Erster Tag der Woche
 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 herunterladen
-SimpleNumRefModelDesc=Gibt die Referenznummer im Format %syymm-nnnn zurück, wobei yy  für das Jahr, mm für den Monat und nnnn für eine 4-stellige, nicht unterbrochene Zahlensequenz steht 
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Erweiterte Kundendaten im Adressfeld anzeigen
 ShowVATIntaInAddress=Umsatzsteuer-ID im Adressfeld ausblenden
 TranslationUncomplete=Teilweise Übersetzung
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxyservers: IP-Adresse / DNS-Name
 MAIN_PROXY_PORT=Proxyserver: Port
 MAIN_PROXY_USER=Proxyserver: Benutzername
 MAIN_PROXY_PASS=Proxyserver: Passwort
-DefineHereComplementaryAttributes=Definieren Sie hier alle Attribute, die nicht standardmäßig vorhanden sind und im Modul %s unterstützt werden sollen.
+DefineHereComplementaryAttributes=Definieren Sie alle zusätzlichen / benutzerdefinierten Attribute, die hinzugefügt werden müssen: %s
 ExtraFields=Ergänzende Attribute
 ExtraFieldsLines=Ergänzende Attribute (Zeilen)
 ExtraFieldsLinesRec=Zusätzliche Attribute (Rechnungsvorlage, Zeilen)
@@ -1306,7 +1316,7 @@ SuhosinSessionEncrypt=Sitzungsspeicher durch Suhosin verschlüsselt
 ConditionIsCurrently=Einstellung ist aktuell %s
 YouUseBestDriver=Sie verwenden den Treiber %s, dies ist derzeit der best verfügbare.
 YouDoNotUseBestDriver=Sie verwenden Treiber %s, aber es wird der Treiber %s empfohlen.
-NbOfObjectIsLowerThanNoPb=Es gibt nur %s %s in der Datenbank. Das erfordert keine bestimmte Optimierung.
+NbOfObjectIsLowerThanNoPb=Es existieren nur %s %s in Ihrer Datenbank. Dies erfordert daher keine speziellen Optimierungsmaßnahmen.
 SearchOptim=Such Optimierung
 YouHaveXObjectUseSearchOptim=Sie haben %s %s in der Datenbank. Sie können die Konstante %s in Home-Setup-Other zu 1 hinzufügen. Beschränken Sie die Suche auf den Anfang von Zeichenfolgen, damit die Datenbank Indizes verwenden kann, und Sie sollten sofort eine Antwort erhalten.
 YouHaveXObjectAndSearchOptimOn=Sie haben %s %s in der Datenbank und die Konstante %s ist in Home-Setup-Other auf 1 gesetzt.
@@ -1333,7 +1343,7 @@ PasswordPatternDesc=Beschreibung für Passwortmuster
 RuleForGeneratedPasswords=Regeln für die Erstellung und Freigabe von Passwörtern 
 DisableForgetPasswordLinkOnLogonPage='Passwort vergessen'-Link nicht auf der Anmeldeseite anzeigen
 UsersSetup=Benutzermoduleinstellungen
-UserMailRequired=Für die Anlage eines neuen Benutzers ist eine E-Mail-Adresse erforderlich 
+UserMailRequired=Für das Anlegen eines neuen Benutzers ist eine E-Mail-Adresse erforderlich 
 UserHideInactive=Inaktive Benutzer aus allen Kombinationslisten von Benutzern ausblenden (Nicht empfohlen: dies kann bedeuten, dass Sie auf einigen Seiten nicht nach alten Benutzern filtern oder suchen können)
 UsersDocModules=Dokumentvorlagen für Dokumente, die aus dem Benutzerdatensatz generiert wurden
 GroupsDocModules=Dokumentvorlagen für Dokumente, die aus einem Gruppendatensatz generiert wurden
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Benutzername (Unix)
 LDAPFieldLoginExample=Beispiel: uid
 LDAPFilterConnection=Suchfilter
 LDAPFilterConnectionExample=Beispiel: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Beispiel: & (objectClass = groupOfUsers)
 LDAPFieldLoginSamba=Benutzername (Samba,Active Directory)
 LDAPFieldLoginSambaExample=Beispiel : samaccountname
 LDAPFieldFullname=Vorname Nachname
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Ihr Unternehmen wurde so definiert, dass keine Mehrwert
 AccountancyCode=Kontierungs-Code
 AccountancyCodeSell=Verkaufskonto-Code
 AccountancyCodeBuy=Einkaufskonto-Code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Lassen Sie das Kontrollkästchen "Zahlung automatisch erstellen" beim Erstellen einer neuen Steuer standardmäßig leer
 ##### Agenda #####
 AgendaSetup=Aufgaben/Termine-Modul Einstellungen
 PasswordTogetVCalExport=Passwort für den VCal-Export
+SecurityKey = Security Key
 PastDelayVCalExport=Keine Termine exportieren die älter sind als
 AGENDA_USE_EVENT_TYPE=Verwenden Ereignissarten \nEinstellen unter (Start -> Einstellungen -> Wörterbücher -> Ereignissarten) 
 AGENDA_USE_EVENT_TYPE_DEFAULT=Diesen Standardwert automatisch als Ereignistyp im  Ereignis Erstell-Formular verwenden.
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Hintergrundfarbe für ungerade Tabellenzeilen
 BackgroundTableLineEvenColor=Hintergrundfarbe für gerade Tabellenzeilen
 MinimumNoticePeriod=Mindestkündigungsfrist (Ihr Urlaubsantrag muss vor dieser Frist gestellt werden)
 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.
+EnterAnyCode=Dieses Feld enthält eine Referenz zur Identifizierung der Zeile. Geben Sie einen beliebigen Wert Ihrer Wahl ein, jedoch ohne Sonderzeichen.
 Enter0or1=Gib 0 oder 1 ein
 UnicodeCurrency=Geben Sie hier zwischen geschweiften Klammern die Liste der Bytes ein, die das Währungssymbol darstellen. Zum Beispiel: Geben Sie für $ [36] ein - für brasilianische Real-R $ [82,36] - geben Sie für € [8364] ein
 ColorFormat=Die RGB Farben sind im Hexformat, zB. FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Unterer Rand im PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Höhe des Logos im PDF
 NothingToSetup=Dieses Modul benötigt keine speziellen Einstellungen.
 SetToYesIfGroupIsComputationOfOtherGroups=Setzen Sie dieses Fehld auf Ja, wenn diese Gruppe eine Berechnung von anderen Gruppen ist
-EnterCalculationRuleIfPreviousFieldIsYes=Berechnungsregel eingeben, falls das vorangehende Feld auf Ja gesetzt ist. (Beispiel: 'CODEGPR1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Mehrere Sprachvarianten gefunden
 RemoveSpecialChars=Sonderzeichen entfernen
 COMPANY_AQUARIUM_CLEAN_REGEX=Regexfilter um die Werte zu Bereinigen (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Einstellungen vom Modul für Soziale Medien
 EnableFeatureFor=Aktiviere Features für <strong>%s</strong>
 VATIsUsedIsOff=Hinweis: Die Option zur Verwendung von Umsatzsteuer oder Mehrwertsteuer wurde auf <strong> gesetzt. Aus </strong> im Menü %s - %s, daher wird für Umsatzsteuer oder Mehrwertsteuer immer 0 verwendet.
 SwapSenderAndRecipientOnPDF=Tausche Position der Absender- und Empfängeradresse in PDF-Dokumenten
-FeatureSupportedOnTextFieldsOnly=Warnung: Diese Funktion unterstützt nur Textfelder. Außerdem muss der URL-Parameter action=create oder action=edit gesetzt werden ODER der Seitenname muss mit 'new.php' enden, damit diese Funktion ausgelöst wird. 
+FeatureSupportedOnTextFieldsOnly=Warnung, Funktion wird nur in Textfeldern und Kombinationslisten unterstützt. Außerdem muss ein URL-Parameter action = create oder action = edit festgelegt werden ODER der Seitenname muss mit 'new.php' enden, um diese Funktion auszulösen.
 EmailCollector=eMail-Collector
 EmailCollectorDescription=Fügt einen geplanten Auftrag und eine Einrichtungsseite hinzu, um regelmäßig E-Mail-Postfächer (unter Verwendung des IMAP-Protokolls) zu scannen und E-Mails, die in Ihrer Anwendung eingegangen sind, am richtigen Ort aufzuzeichnen und / oder einige Datensätze automatisch zu erstellen (z. B. Leads).
 NewEmailCollector=Neuer eMail-Colletor
@@ -2019,7 +2032,7 @@ MainMenuCode=Menüpunktcode (Hauptmenü)
 ECMAutoTree=Automatischen ECM-Baum anzeigen
 OperationParamDesc=Definieren Sie die Werte, die für das Objekt der Aktion verwendet werden sollen, oder wie Werte extrahiert werden sollen. Beispiel: <br> objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Verwenden Sie a; char als Trennzeichen zum Extrahieren oder Festlegen mehrerer Eigenschaften.
 OpeningHours=Öffnungszeiten
-OpeningHoursDesc=Geben sie hier die regulären Öffnungszeiten vom Unternehmen an.
+OpeningHoursDesc=Geben sie hier die regulären Öffnungszeiten ihres Unternehmens an.
 ResourceSetup=Konfiguration vom Ressourcenmodul
 UseSearchToSelectResource=Verwende ein Suchformular um eine Ressource zu wählen (eher als eine Dropdown-Liste) zu wählen.
 DisabledResourceLinkUser=Funktion deaktivieren, um eine Ressource mit Benutzern zu verknüpfen
@@ -2049,8 +2062,11 @@ UseDebugBar=Verwenden Sie die Debug Leiste
 DEBUGBAR_LOGS_LINES_NUMBER=Zahl der letzten Protokollzeilen, die in der Konsole verbleiben sollen
 WarningValueHigherSlowsDramaticalyOutput=Warnung, höhere Werte verlangsamen die Ausgabe erheblich.
 ModuleActivated=Modul %s is aktiviert und verlangsamt die Overfläche
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Wenn Sie sich in einer Produktionsumgebung befinden, sollten Sie diese Eigenschaft auf %s setzen.
 AntivirusEnabledOnUpload=Antivirus für hochgeladene Dateien aktiviert
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Exportmodelle sind für jeden zugänglich.
 ExportSetup=Einrichtung Modul Export
 ImportSetup=Einrichtung des Modulimports
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Einen anonymen Ping '+1' an den Dolibarr-Foundation-Server (ei
 FeatureNotAvailableWithReceptionModule=Funtion nicht verfügbar, wenn Modul Wareneingang aktiviert ist
 EmailTemplate=E-Mail-Vorlage
 EMailsWillHaveMessageID=E-Mails haben ein Schlagwort "Referenzen", das dieser Syntax entspricht
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Wenn Sie möchten, dass einige Texte in Ihrem PDF in 2 verschiedenen Sprachen in demselben generierten PDF dupliziert werden, müssen Sie hier diese zweite Sprache festlegen, damit das generierte PDF zwei verschiedene Sprachen auf derselben Seite enthält, die beim Generieren von PDF ausgewählte und diese (dies wird nur von wenigen PDF-Vorlagen unterstützt). Für 1 Sprache pro PDF leer halten.
 FafaIconSocialNetworksDesc=Gib hier den Code für ein FontAwesome icon ein. Wenn du FontAwesome nicht kennst, kannst du den Standard 'fa-address-book' benutzen.
 FeatureNotAvailableWithReceptionModule=Funtion nicht verfügbar, wenn Modul Wareneingang aktiviert ist
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Das Ändern dieses Werts auf %s wird aus Sicherheit
 DictionaryProductNature= Art des Produkts
 CountryIfSpecificToOneCountry=Land (falls spezifisch für ein bestimmtes Land)
 YouMayFindSecurityAdviceHere=Hier finden Sie Sicherheitshinweise
-ModuleActivatedMayExposeInformation=Dieses Modul kann vertrauliche Daten verfügbar machen. Wenn Sie es nicht benötigen, deaktivieren Sie es.
+ModuleActivatedMayExposeInformation=Diese PHP-Erweiterung kann vertrauliche Daten verfügbar machen. Wenn Sie dies nicht benötigen, deaktivieren Sie sie.
 ModuleActivatedDoNotUseInProduction=Ein für die Entwicklung entwickeltes Modul wurde aktiviert. Aktivieren Sie es nicht in einer Produktionsumgebung.
 CombinationsSeparator=Trennzeichen für Produktkombinationen
 SeeLinkToOnlineDocumentation=Beispiele finden Sie unter dem Link zur Online-Dokumentation im oberen Menü
 SHOW_SUBPRODUCT_REF_IN_PDF=Wenn die Funktion "%s" des Moduls <b> %s </b> verwendet wird, werden Details zu Unterprodukten eines Satzes als PDF angezeigt.
 AskThisIDToYourBank=Wenden Sie sich an Ihre Bank, um diese ID zu erhalten
+AdvancedModeOnly=Berechtigung nur im erweiterten Berechtigungsmodus verfügbar
+ConfFileIsReadableOrWritableByAnyUsers=Die conf-Datei kann von jedem Benutzer gelesen oder beschrieben werden. Geben Sie nur dem Benutzer und der Gruppe des Webservers die Berechtigung.
+MailToSendEventOrganization=Organisation von Ereignissen
+AGENDA_EVENT_DEFAULT_STATUS=Standardereignisstatus beim Erstellen eines Ereignisses aus dem Formular
+YouShouldDisablePHPFunctions=Sie sollten PHP-Funktionen deaktivieren
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 1a24bc0bd5e..57256d48132 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Ihr SEPA-Mandat
 FindYourSEPAMandate=Dies ist Ihr SEPA-Mandat, um unser Unternehmen zu ermächtigen, Lastschriftaufträge bei Ihrer Bank zu tätigen. Senden Sie es unterschrieben (Scan des unterschriebenen Dokuments) oder per Post an
 AutoReportLastAccountStatement=Füllen Sie das Feld 'Nummer des Kontoauszugs' bei der Abstimmung automatisch mit der Nummer des letzten Kontoauszugs
 CashControl=POS-Kassensteuerung
-NewCashFence=Neue Kasse schließt
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Bewegungen färben
 BankColorizeMovementDesc=Wenn diese Funktion aktiviert ist, können Sie eine bestimmte Hintergrundfarbe für Debit- oder Kreditbewegungen auswählen
 BankColorizeMovementName1=Hintergrundfarbe für Debit-Bewegung
 BankColorizeMovementName2=Hintergrundfarbe für Kredit-Bewegung
 IfYouDontReconcileDisableProperty=Wenn Sie auf einigen Bankkonten keine Bankkontenabgleiche vornehmen, deaktivieren Sie die Eigenschaft "%s", um diese Warnung zu entfernen.
 NoBankAccountDefined=Kein Bankkonto definiert
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 1ecc1ea7641..9afcc86ec5b 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -55,6 +55,7 @@ CustomerInvoice=Kundenrechnung
 CustomersInvoices=Kundenrechnungen
 SupplierInvoice=Lieferantenrechnung
 SuppliersInvoices=Lieferantenrechnungen
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Lieferantenrechnung
 SupplierBills=Lieferantenrechnungen
 Payment=Zahlung
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Bereits getätigte Zahlungen
 PaymentsBackAlreadyDone=Rückerstattungen bereits erledigt
 PaymentRule=Zahlungsregel
 PaymentMode=Zahlungsart
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit- / Kreditkarte
 PaymentTypePP=PayPal
 IdPaymentMode=Zahlungsart (ID)
@@ -181,7 +184,7 @@ ConfirmValidateBill=Möchten Sie diese Rechnung mit der referenz <b>%s</b> wirkl
 ConfirmUnvalidateBill=Möchten Sie die Rechnung <b>%s</b> wirklich als 'Entwurf' markieren?
 ConfirmClassifyPaidBill=Möchten Sie die Rechnung <b>%s</b> wirklich als 'bezahlt' markieren?
 ConfirmCancelBill=Möchten sie die Rechnung <b>%s</b> wirklich stornieren?
-ConfirmCancelBillQuestion=Möchten Sie diesen Sozialbeitrag wirklich als 'abgebrochen' markieren?
+ConfirmCancelBillQuestion=Bitte wählen Sie einen Grund für die Stornierung.
 ConfirmClassifyPaidPartially=Möchten Sie die Rechnung <b>%s</b> wirklich als 'bezahlt' markieren?
 ConfirmClassifyPaidPartiallyQuestion=Diese Rechnung wurde nicht komplett bezahlt. Aus welchem Grund wird die Rechnung geschlossen?
 ConfirmClassifyPaidPartiallyReasonAvoir=Der offene Zahlbetrag <b>( %s %s)</b> resultiert aus einem gewährten Skonto. Zur Korrektur der USt. wird eine Gutschrift angelegt.
@@ -373,6 +376,7 @@ DateLastGeneration=Datum der letzten Generierung
 DateLastGenerationShort=Datum letzte Generierung
 MaxPeriodNumber=Max. Nummer der Rechnungserstellung
 NbOfGenerationDone=Rechnungslauf für diese Nummer schon durchgeführt
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Anzahl Generationen durchgeführt
 MaxGenerationReached=Max. Anzahl Generierungen erreicht
 InvoiceAutoValidate=Rechnungen automatisch freigeben
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Innerhalb von 14 Tagen nach Monatsende
 FixAmount=Festbetrag - 1 Zeile mit Label '%s'
 VarAmount=Variabler Betrag (%% tot.)
 VarAmountOneLine=Variabler Betrag (%% Total) -1 Position mit Label '%s'
-VarAmountAllLines=Variabler Betrag (%% gesamt) - alle gleichen Zeilen
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Banküberweisung
 PaymentTypeShortVIR=Banküberweisung
@@ -494,12 +498,16 @@ Cash=Bar
 Reported=Verzögert
 DisabledBecausePayments=Nicht möglich, da es Zahlungen gibt
 CantRemovePaymentWithOneInvoicePaid=Die Zahlung kann nicht entfernt werden, da es mindestens eine Rechnung gibt, die als bezahlt markiert ist
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Erwartete Zahlung
 CantRemoveConciliatedPayment=Abgeglichene Zahlung kann nicht entfernt werden
 PayedByThisPayment=mit dieser Zahlung beglichen
 ClosePaidInvoicesAutomatically=Kennzeichnen Sie automatisch alle Standard-, Anzahlungs- oder Ersatzrechnungen als "Bezahlt", wenn die Zahlung vollständig erfolgt ist.
 ClosePaidCreditNotesAutomatically=Kennzeichnen Sie automatisch alle Gutschriften als "Bezahlt", wenn die Rückerstattung vollständig erfolgt ist.
 ClosePaidContributionsAutomatically=Kennzeichnen Sie automatisch alle Sozial- oder Steuerbeiträge als "Bezahlt", wenn die Zahlung vollständig erfolgt ist.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Alle Rechnungen ohne Restzahlung werden automatisch mit dem Status "Bezahlt" geschlossen.
 ToMakePayment=Bezahlen
 ToMakePaymentBack=Rückzahlung
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Zuerst muss eine Standardrechnung erstellt
 PDFCrabeDescription=Rechnung PDF-Vorlage Crabe. Eine vollständige Rechnungsvorlage (alte Implementierung der Sponge-Vorlage)
 PDFSpongeDescription=Rechnung PDF-Vorlage Sponge. Eine vollständige Rechnungsvorlage
 PDFCrevetteDescription=PDF Rechnungsvorlage Crevette. Vollständige Rechnungsvolage für normale Rechnungen
-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.
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Eine Rechnung, beginnend mit $ syymm existiert bereits und ist nicht kompatibel mit diesem Modell der Reihe. Entfernen oder umbenennen, um dieses Modul.
-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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Grund für die vorzeitige Schließung
 EarlyClosingComment=Notiz zur vorzeitigen Schließung
 ##### Types de contacts #####
@@ -562,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Wenn Sie solche Rechnungen automatisch generie
 DeleteRepeatableInvoice=Rechnungs-Template löschen
 ConfirmDeleteRepeatableInvoice=Möchten Sie diese Rechnungsvorlage wirklich löschen?
 CreateOneBillByThird=Erstelle eine Rechnung pro Partner (andernfalls, eine Rechnung pro Bestellung)
-BillCreated=%s Rechnung(en) erstellt
+BillCreated=%s Rechnung(en) generiert
+BillXCreated=Rechnung %s generiert
 StatusOfGeneratedDocuments=Status der Dokumentenerstellung
 DoNotGenerateDoc=Dokumentdatei nicht erstellen
 AutogenerateDoc=Dokumentdatei automatisch erstellen
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index 0ebb4d77679..7ed4e4e1077 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
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Anmeldeinformationen
 BoxLastRssInfos=Informationen RSS Feed
 BoxLastProducts=%s zuletzt bearbeitete Produkte/Leistungen
@@ -17,9 +18,13 @@ BoxLastActions=Neuste Aktionen
 BoxLastContracts=Neueste Verträge
 BoxLastContacts=Neueste Kontakte/Adressen
 BoxLastMembers=neueste Mitglieder
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Neueste Serviceaufträge
 BoxCurrentAccounts=Saldo offene Konten
 BoxTitleMemberNextBirthdays=Geburtstage in diesem Monat (Mitglieder)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=%s neueste Neuigkeiten von %s
 BoxTitleLastProducts=Zuletzt bearbeitete Produkte / Leistungen (maximal %s)
 BoxTitleProductsAlertStock=Lagerbestands-Warnungen
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Neueste %s Kundensendungen
 NoRecordedShipments=Keine erfasste Kundensendung
 BoxCustomersOutstandingBillReached=Kunden mit erreichtem Aussenständen-Limit
 # Pages
-AccountancyHome=Buchführung
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validierte Projekte
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index 6a04179c699..1ed379ce3f9 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Übersicht Lieferantenkategorien
 CustomersCategoriesArea=Übersicht Kunden-/Interessentenkategorien
 MembersCategoriesArea=Übersicht Mitgliederkategorien
 ContactsCategoriesArea=Übersicht Kontaktkategorien
-AccountsCategoriesArea=Übersicht Kontenkategorien
+AccountsCategoriesArea=Bereich Bankkonten-Tags / -Kategorien
 ProjectsCategoriesArea=Übersicht Projektkategorien
 UsersCategoriesArea=Bereich:  Benutzer Tags/Kategorien
 SubCats=Unterkategorie(n)
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Ordnen Sie dem Lieferanten eine Kategorie zu
 ShowCategory=Zeige Kategorie
 ByDefaultInList=Standardwert in Liste
 ChooseCategory=Kategorie auswählen
-StocksCategoriesArea=Lagerort-Kategorien
-ActionCommCategoriesArea=Ereignis-Kategorien
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Seiteninhalte-Kategorien
 UseOrOperatorForCategories=Benutzer oder Operator für Kategorien
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 717b52abe65..6af27c65ab0 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -43,9 +43,10 @@ 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 Partner eine natürliche Person ist, reicht die Anlage nur eines Partners aus.
 ParentCompany=Muttergesellschaft
 Subsidiaries=Tochtergesellschaften
-ReportByMonth=Bericht nach Monat
-ReportByCustomers=Bericht nach Kunden
-ReportByQuarter=Bericht Quartal
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Anrede
 RegisteredOffice=Firmensitz
 Lastname=Nachname
@@ -172,14 +173,20 @@ ProfId1ES=NIF (Frankreich): Numéro d'identification fiscale\nCIF (Spanien): Có
 ProfId2ES=Sozialversicherungsnummer
 ProfId3ES=Klassifikation der Wirtschaftszweige
 ProfId4ES=Stiftungsverzeichnis
-ProfId5ES=EORI-Nummer
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=SIREN (Frankreich): Système d'identification du répertoire des entreprises
 ProfId2FR=SIRET (Frankreich): Système d’identification du répertoire des établissements
 ProfId3FR=NAF (Frankreich): Statistik-Code
 ProfId4FR=RCS (Frankreich): Registre du Commerce et des Sociétés\n(hier: Code im Handels- und Firmenregister)
-ProfId5FR=EORI-Nummer
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI-Nummer
+ProfId6IT=-
 ProfId1LU=R.C.S. Luxemburg
 ProfId2LU=Prof ID 2 (Gewerbe-Erlaubnis)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof ID 3
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI-Nummer
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI-Nummer
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=OGRN
 ProfId2RU=INN
@@ -389,11 +397,11 @@ StatusProspect0=noch nie kontaktiert
 StatusProspect1=Zu kontaktieren
 StatusProspect2=Kontaktierung läuft
 StatusProspect3=erfolgreich kontaktiert
-ChangeDoNotContact=Ändern Sie den Status auf 'Nicht kontaktieren'
-ChangeNeverContacted=Ändern Sie den Status auf 'Noch kein Kontaktversuch'
+ChangeDoNotContact=Status auf 'Nicht kontaktieren' ändern
+ChangeNeverContacted=Status auf 'Noch keine Kontaktaufnahme' ändern
 ChangeToContact=Status auf 'Zu kontaktieren' ändern
-ChangeContactInProcess=Ändern Sie den Status auf 'Kontaktaufnahme läuft'
-ChangeContactDone=Ändern Sie den Status auf 'Erfolgreich kontaktiert'
+ChangeContactInProcess=Status auf 'Kontaktaufnahme läuft' ändern
+ChangeContactDone=Status auf 'Erfolgreich kontaktiert' ändern
 ProspectsByStatus=Interessenten nach Status
 NoParentCompany=keine Muttergesellschaft
 ExportCardToFormat=Karte in Format exportieren
@@ -426,7 +434,7 @@ SocialNetworksInstagramURL=Instagram URL
 SocialNetworksYoutubeURL=Youtube URL
 SocialNetworksGithubURL=Github URL
 YouMustAssignUserMailFirst=Sie müssen zunächst eine E-Mail-Adresse für diesen Benutzer anlegen, um E-Mail-Benachrichtigungen zu ermöglichen.
-YouMustCreateContactFirst=Um E-mail-Benachrichtigungen anlegen zu können, müssen Sie zunächst einen Kontakt mit gültiger Email-Adresse zum Partner hinzufügen.
+YouMustCreateContactFirst=Um E-Mail-Benachrichtigungen anlegen zu können, müssen Sie zunächst einen Kontakt mit gültiger E-Mail-Adresse zum Partner hinzufügen.
 ListSuppliersShort=Liste der Lieferanten
 ListProspectsShort=Liste der Interessenten
 ListCustomersShort=Liste der Kunden
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Aktuell ausstehende Rechnung
 OutstandingBill=Max. für ausstehende Rechnung
 OutstandingBillReached=Kreditlimite erreicht
 OrderMinAmount=Mindestbestellwert
-MonkeyNumRefModelDesc=Gibt Zahlen mit dem Format %syymm-nnnn für die Kundennummer und %syymm-nnnn für die Lieferantennummer zurück, wobei yy Jahr, mm Monat und nnnn ununterbrochene Zahlenfolge ohne 0 ist.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Kunden / Lieferanten-Code ist frei. Dieser Code kann jederzeit geändert werden.
 ManagingDirectors=Name(n) des/der Manager (CEO, Direktor, Geschäftsführer, ...)
 MergeOriginThirdparty=Partner duplizieren (Partner den Sie löschen möchten)
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 472a03cbb90..e499f8e72ec 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST Einkäufe
 VATCollected=Erhobene USt.
 StatusToPay=Zu zahlen
 SpecialExpensesArea=Bereich für alle Sonderzahlungen
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Sozialabgabe oder Steuersatz
 SocialContributions= Steuern- oder Sozialabgaben
 SocialContributionsDeductibles=Abzugsberechtigte Sozialabgaben oder Steuern
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Zahlung Kundenrechnung
 PaymentSupplierInvoice=Zahlung Lieferantenrechnung
 PaymentSocialContribution=Sozialabgaben-/Steuer Zahlung
 PaymentVat=USt.-Zahlung
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Liste der Zahlungen
 ListOfCustomerPayments=Liste der Kundenzahlungen
 ListOfSupplierPayments=Liste der Lieferantenzahlungen
@@ -104,6 +106,8 @@ LT2PaymentES=EKSt. Zahlung
 LT2PaymentsES=EKSt. Zahlungen
 VATPayment=USt. Zahlung
 VATPayments=USt Zahlungen
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Umsatzsteuer Rückerstattung
 NewVATPayment=Neue Umsatzsteuer Zahlung
 NewLocalTaxPayment=Neue Steuer %s Zahlung
@@ -134,9 +138,17 @@ NoWaitingChecks=Keine Schecks zum Einlösen
 DateChequeReceived=Datum des Scheckerhalts
 NbOfCheques=Anzahl der Schecks
 PaySocialContribution=Zahle eine Sozialabgabe/Steuer
-ConfirmPaySocialContribution=Möchten Sie den Status dieser Sozialabgabe oder Steuer  auf "Bezahlt" ändern?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Lösche Sozialabgaben-, oder Steuerzahlung
-ConfirmDeleteSocialContribution=Möchten Sie diese Sozialabgaben-, oder Steuerzahlung wirklich löschen?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Sind Sie sicher, dass Sie dieses Gehalt löschen wollen?
 ExportDataset_tax_1=Steuer- und Sozialabgaben und Zahlungen
 CalcModeVATDebt=Modus <b>%s USt. auf Engagement Rechnungslegung %s</b>.
 CalcModeVATEngagement=Modus <b>%sTVA auf  Einnahmen-Ausgaben%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- Es sind nur tatsächliche Zahlungen für Rechnungen, Kostenab
 RulesCADue=- Es enthält die fälligen Rechnungen des Kunden, ob diese bezahlt sind oder nicht. <br> - Es basiert auf dem Rechnungsdatum dieser Rechnungen. <br>
 RulesCAIn=- Es umfasst alle effektiven Zahlungen von Rechnungen, die von Kunden erhalten wurden. <br> - Es basiert auf dem Zahlungsdatum dieser Rechnungen. <br>
 RulesCATotalSaleJournal=Es beinhaltet alle Gutschriftspositionen aus dem Verkaufsjournal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Beinhaltet Datensätze aus dem Hauptbuch mit den Gruppen "Aufwand" oder "Ertrag"
 RulesResultBookkeepingPredefined=Beinhaltet Datensätze aus dem Hauptbuch mit den Gruppen "Aufwand" oder "Ertrag"
 RulesResultBookkeepingPersonalized=Zeigt die Buchungen im Hauptbuch mit Konten <b>gruppiert nach Kontengruppen</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Umsatzsteuerauswertung pro Partner
 VATReportByCustomers=Umsatzsteuerauswertung pro Kunde
 VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten USt. nach Kunden 
 VATReportByQuartersInInputOutputMode=Bericht nach Steuersatz für die erhaltene und bezahlte Steuer
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Steuer 2 Auswertung pro Steuersatz
 LT2ReportByQuarters=Steuer 3 Auswertung pro Steuersatz
 LT1ReportByQuartersES=Bericht von RE Ratex
@@ -217,7 +231,7 @@ Pcg_subtype=Klasse des Kontos
 InvoiceLinesToDispatch=versandbereite Rechnungspositionen
 ByProductsAndServices=Nach Produkten und Leistungen
 RefExt=Externe Referenz
-ToCreateAPredefinedInvoice=Um eine Rechnungsvorlage zu erstellen, erstellen Sie eine normale Rechnung. Anschließend klicken Sie auf den Button "%s", ohne die Rechnung freizugeben.
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link zur Bestellung
 Mode1=Methode 1
 Mode2=Methode 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Das beim Parnter definierte spezielle Buchhaltu
 ACCOUNTING_ACCOUNT_SUPPLIER=Buchhaltungskonto für Lieferanten
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Das beim Parnter definierte spezielle Buchhaltungskonto wird nur für die Nebenbuchhaltung verwendet. Dieses wird für das Hauptbuch und als Standardwert der Nebenbuchhaltung verwendet, wenn kein dediziertes Kreditorenbuchhaltungskonto für den Partner definiert ist.\n
 ConfirmCloneTax=Duplizierung der Steuer-/Sozialabgaben bestätigen
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Bestätige das Klonen der Gehaltsangabe
 CloneTaxForNextMonth=Für nächsten Monat duplizieren
 SimpleReport=Einfache Berichte
 AddExtraReport=Zusätzliche Berichte (Fügen Sie fremde und nationalen Kundenbericht hinzu)
@@ -253,7 +269,8 @@ AccountingAffectation=Kontierung zuweisen
 LastDayTaxIsRelatedTo=Letzter Tag an dem die Steuer relevant ist
 VATDue=Umsatzsteuer beansprucht
 ClaimedForThisPeriod=Beantragt in der Periode
-PaidDuringThisPeriod=In dieser Perdiode bezahlt
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=Pro Steuersatz
 TurnoverbyVatrate=Verrechneter Umsatz pro Steuersatz
 TurnoverCollectedbyVatrate=Realisierter Umsatz pro Steuersatz
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Kaufumsatz gesammelt
 RulesPurchaseTurnoverDue=- Es enthält die fälligen Rechnungen des Lieferanten, ob diese bezahlt sind oder nicht. <br> - Es basiert auf dem Rechnungsdatum dieser Rechnungen. <br>
 RulesPurchaseTurnoverIn=- Es umfasst alle effektiven Zahlungen von Rechnungen an Lieferanten. <br> - Es basiert auf dem Zahlungsdatum dieser Rechnungen <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Es enthält alle Belastungszeilen aus dem Einkaufsjournal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Kaufumsatz in Rechnung gestellt
 ReportPurchaseTurnoverCollected=Kaufumsatz gesammelt
 IncludeVarpaysInResults = Nehmen Sie verschiedene Zahlungen in Berichte auf
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index 706af0b1a82..b2d0b83c9e8 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Datei noch nicht in Datenbank indiziert (bitte Datei
 ExtraFieldsEcmFiles=Extrafelder Ecm-Dateien
 ExtraFieldsEcmDirectories=Extrafelder Ecm-Verzeichnisse
 ECMSetup=DMS Einstellungen
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index b99e6a58364..0e43f38fd83 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Verzeichnis <b>%s</b> konnte nicht gefunden werden (Ungültiger
 ErrorFunctionNotAvailableInPHP=Die PHP-Funktion <b>%s</b> ist für diese Funktion erforderlich, in dieser PHP-Konfiguration jedoch nicht verfügbar.
 ErrorDirAlreadyExists=Ein Verzeichnis mit diesem Namen existiert bereits.
 ErrorFileAlreadyExists=Eine Datei mit diesem Namen existiert bereits.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Die Datei wurde nicht vollständig zum Server übertragen.
 ErrorNoTmpDir=Das temporäre Verzeichnis %s existiert nicht.
 ErrorUploadBlockedByAddon=Der Upload wurde durch ein PHP Apache-Plugin blockiert.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Fehler beim Laden des Kontenplans. Wenn einige Konten nicht
 ErrorBadSyntaxForParamKeyForContent=Fehlerhafte Syntax für param keyforcontent. Muss einen Wert haben, der mit %s oder %s beginnt
 ErrorVariableKeyForContentMustBeSet=Fehler, die Konstante mit dem Namen %s (mit Textinhalt zum Anzeigen) oder %s (mit externer URL zum Anzeigen) muss gesetzt sein.
 ErrorURLMustStartWithHttp=Die URL %s muss mit http: // oder https: // beginnen.
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Fehler, die neue Referenz ist bereits in Benutzung
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Fehler, eine zu einer bereits geschlossenen Rechnung gehörende Zahlung kann nicht gelöscht werden.
 ErrorSearchCriteriaTooSmall=Suchkriterium zu klein
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Öffentliche Schnittstelle wurde nicht aktiviert
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Die Sprache der neuen Seite muss definiert werden, wenn sie als Übersetzung einer anderen Seite festgelegt ist
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Die Sprache der neuen Seite darf nicht die Ausgangssprache sein, wenn sie als Übersetzung einer anderen Seite festgelegt ist
 ErrorAParameterIsRequiredForThisOperation=Für diesen Vorgang ist ein Parameter obligatorisch
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Fehler, Betrag ist notwendig
+ErrorAPercentIsRequired=Fehler, bitte geben Sie den Prozentsatz korrekt ein
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warnung: Dateieintrag zur ECM-Datenbanki
 WarningTheHiddenOptionIsOn=Achtung, die versteckte Option <b> %s </b> ist aktiviert.
 WarningCreateSubAccounts=Achtung, Sie können kein Unterkonto direkt erstellen. Sie müssen einen Geschäftspartner oder einen Benutzer erstellen und ihm einen Buchungscode zuweisen, um sie in dieser Liste zu finden
 WarningAvailableOnlyForHTTPSServers=Nur verfügbar, wenn eine HTTPS-gesicherte Verbindung verwendet wird.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/de_DE/externalsite.lang b/htdocs/langs/de_DE/externalsite.lang
index 4d4f246299f..26cabf1b96c 100644
--- a/htdocs/langs/de_DE/externalsite.lang
+++ b/htdocs/langs/de_DE/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Konfigurations-Link auf externe Webseite
-ExternalSiteURL=URL der externen Seite
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modul ExternalSite wurde nicht richtig konfiguriert.
 ExampleMyMenuEntry=Mein Menü-Eintrag
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index f75c58b846a..93338d908cf 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Änderungsdatum
 IPModification=Änderungs-IP
 DateLastModification=Datum letzte Änderung
 DateValidation=Freigabedatum
+DateSigning=Signing date
 DateClosing=Schließungsdatum
 DateDue=Fälligkeitsdatum
 DateValue=Valutadatum
@@ -325,8 +326,8 @@ Weeks=Wochen
 Today=Heute
 Yesterday=Gestern
 Tomorrow=Morgen
-Morning=Morgen
-Afternoon=Nachmittag
+Morning=vormittags
+Afternoon=nachmittags
 Quadri=vierfach
 MonthOfDay=Tag des Monats
 DaysOfWeek=Wochentage
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Stückpreis (netto) (Währung)
 UnitPriceTTC=Stückpreis (brutto)
 PriceU=VP
 PriceUHT=VP (netto)
-PriceUHTCurrency=Nettopreis (Währung)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=St.-Pr. (inkl. Steuern)
 Amount=Betrag
 AmountInvoice=Rechnungsbetrag
@@ -389,6 +390,8 @@ AmountTotal=Gesamtbetrag
 AmountAverage=Durchschnittsbetrag
 PriceQtyMinHT=Mindestmengenpreis (netto)
 PriceQtyMinHTCurrency=Stückpreis pro Menge (netto) (Währung)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Betrag oder Prozent
 Percentage=Prozentsatz
 Total=Gesamt
 SubTotal=Zwischensumme
@@ -469,9 +472,9 @@ ContactsForCompany=Ansprechpartner/Adressen dieses Partners
 ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Partner
 AddressesForCompany=Anschriften zu diesem Partner
 ActionsOnCompany=Aktionen für diesen Partner
-ActionsOnContact=Aktionen für diesen Kontakt
+ActionsOnContact=Termine / Ereignisse für diesen Kontakt
 ActionsOnContract=Ereignisse zu diesem Kontakt
-ActionsOnMember=Aktionen zu diesem Mitglied
+ActionsOnMember=Ereignisse zu diesem Mitglied
 ActionsOnProduct=Ereignisse zu diesem Produkt
 NActionsLate=%s verspätet
 ToDo=zu erledigen
@@ -668,7 +671,7 @@ Reason=Grund
 FeatureNotYetSupported=Diese Funktion wird (noch) nicht unterstützt
 CloseWindow=Fenster schließen
 Response=Antwort
-Priority=Wichtigkeit
+Priority=Priorität
 SendByMail=Per E-Mail versenden
 MailSentBy=E-Mail Absender
 NotSent=nicht gesendet
@@ -724,7 +727,7 @@ MenuMembers=Mitglieder
 MenuAgendaGoogle=Google-Agenda
 MenuTaxesAndSpecialExpenses=Steuern | Sonderausgaben
 ThisLimitIsDefinedInSetup=Gesetzte Dolibarr-Limits (Menü Start-Einstellungen-Sicherheit): %s Kb, PHP Limit: %s Kb
-NoFileFound=Keine Dokumente in diesem Verzeichnis
+NoFileFound=Keine Dokumente hochgeladen
 CurrentUserLanguage=Aktuelle Benutzersprache
 CurrentTheme=Aktuelles Design
 CurrentMenuManager=Aktuelle Menüverwaltung
@@ -830,8 +833,8 @@ Access=Zugriff
 SelectAction=Aktion auswählen
 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
+SaveUploadedFileWithMask=Datei auf dem Server unter dem Namen "<strong>%s</strong>" speichern (wenn deaktiviert wird der %s benutzt)
+OriginFileName=original Dateiname
 SetDemandReason=Quelle definieren
 SetBankAccount=Bankkonto angeben
 AccountCurrency=Kontowährung
@@ -899,8 +902,10 @@ ViewAccountList=Hauptbuch anzeigen
 ViewSubAccountList=Unterkonten-Buch anzeigen
 RemoveString=Entfernen Sie die Zeichenfolge '%s'
 SomeTranslationAreUncomplete=Einige Sprachen sind nur teilweise übersetzt oder enthalten Fehler. Wenn Sie dies feststellen, können Sie die Übersetzungen unter <a href="https://www.transifex.com/dolibarr-association/dolibarr/translate/#de_DE/" target="_blank">https://www.transifex.com/dolibarr-association/dolibarr/translate/#de_DE/</a> verbessern bzw. ergänzen.
-DirectDownloadLink=Direkter Download Link
-DirectDownloadInternalLink=Direkter Download-Link (muss angemeldet sein und benötigt Berechtigungen)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Dokument herunterladen
 ActualizeCurrency=Update-Wechselkurs
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontakte
 SearchIntoMembers=Mitglieder
 SearchIntoUsers=Benutzer
 SearchIntoProductsOrServices=Produkte oder Dienstleistungen
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projekte
 SearchIntoMO=Fertigungsaufträge
 SearchIntoTasks=Aufgaben
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Tastatur Kürzel
 AssignedTo=Zugewiesen an
 Deletedraft=Entwurf löschen
 ConfirmMassDraftDeletion=Bestätigung Massenlöschung Entwurf
-FileSharedViaALink=Datei via Link geteilt
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Wähle zuerst einen Partner...
 YouAreCurrentlyInSandboxMode=Sie befinden sich derzeit im %s "Sandbox"-Modus
 Inventory=Inventur
 AnalyticCode=Analyse-Code
 TMenuMRP=Produktion
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Zeige mehr Informationen
 NoFilesUploadedYet=Bitte zuerst ein Dokument hochladen
 SeePrivateNote=Private Notizen ansehen
@@ -1064,7 +1071,7 @@ ValidUntil=Gültig bis
 NoRecordedUsers=Keine Benutzer
 ToClose=Zu schließen
 ToProcess=Zu bearbeiten
-ToApprove=Zu genemigen
+ToApprove=Zu genehmigen
 GlobalOpenedElemView=Globale Ansicht
 NoArticlesFoundForTheKeyword=Kein Artikel zu Schlüssselwort gefunden '<strong>%s</strong>'
 NoArticlesFoundForTheCategory=Kein Artikel für Kategorie gefunden
@@ -1120,3 +1127,5 @@ AffectTag=Schlagwort beeinflussen
 ConfirmAffectTag=Massen-Schlagwort-Affekt
 ConfirmAffectTagQuestion=Sind Sie sicher, dass Sie Tags für die ausgewählten Datensätze von %s beeinflussen möchten?
 CategTypeNotFound=Für den Datensatztyp wurde kein Tag-Typ gefunden
+CopiedToClipboard=In die Zwischenablage kopiert
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
index a81a6a23593..38064b81c07 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -22,7 +22,7 @@ ProductService=Produkt oder Dienstleistung
 AllProducts=Alle Produkte und Leistungen
 ChooseProduct/Service=Produkt oder Service wählen
 ForceBuyingPriceIfNull=Benutze EK-Preis/Herstellkosten als Verkaufspreis, wenn nicht definiert
-ForceBuyingPriceIfNullDetails=Falls die Option aktiviert ist, wird die Spanne der Zeile mit Null angezeigt (EK-Preis/Herstellkosten = Verkaufspreis). Ist die Option deaktiviert, wird die Spanne gleich der Voreinstellung sein.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin-Methode für globale Rabatte
 UseDiscountAsProduct=als Produkt
 UseDiscountAsService=als Dienstleistung
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index c11bfa1dff2..5c8947f3a06 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Liste freizugebender Mitglieder
 MembersListValid=Liste freigegebener Mitglieder
 MembersListUpToDate=Aktuelle Mitgliederliste
 MembersListNotUpToDate=Ehemalige Mitglieder
+MembersListExcluded=List of excluded members
 MembersListResiliated=Liste der deaktivierten Mitglieder
 MembersListQualified=Liste der qualifizierten Mitglieder
 MenuMembersToValidate=Freizugebende
 MenuMembersValidated=Freigegebene Mitglieder
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Deaktivierte Mitglieder
 MembersWithSubscriptionToReceive=Mitglieder mit ausstehendem Beitrag
 MembersWithSubscriptionToReceiveShort=Zu registrierende Mitglieder
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Beitragszeitraum abgelaufen
 MemberStatusActiveLateShort=Abgelaufen
 MemberStatusPaid=Mitgliedschaft aktuell
 MemberStatusPaidShort=Aktuelle
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Deaktivierte Mitglieder
 MemberStatusResiliatedShort=Deaktiviert
 MembersStatusToValid=Freizugebende
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Deaktivierte Mitglieder
 MemberStatusNoSubscription=Validiert (kein Beitrag erforderlich)
 MemberStatusNoSubscriptionShort=Freigegeben
@@ -82,6 +87,8 @@ Physical=natürliche Person
 Moral=juristische Person
 MorAndPhy=juristisch und natürlich
 Reenable=Reaktivieren
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Mitglied deaktivieren
 ConfirmResiliateMember=Möchten Sie dieses Mitglied wirklich deaktivieren?
 DeleteMember=Mitglied löschen
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Vorlage für eine E-Mail an ein Mi
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Vorlage für eine E-Mail an ein Mitglied wegen der Neuregistrierung
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Vorlage für eine E-Mail zur Erinnerung an die Beitragsfälligkeit
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Vorlage für eine E-Mail an ein Mitglied bei Erlöschen der Mitgliedschaft
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=E-Mail-Adresse des Absenders bei automatischen Mails
 DescADHERENT_ETIQUETTE_TYPE=Format der Etikettenseite
 DescADHERENT_ETIQUETTE_TEXT=Text für den Druck auf der Mitglied-Adresskarte
@@ -162,6 +170,7 @@ DocForLabels=Etiketten erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
 SubscriptionPayment=Beitragszahlung 
 LastSubscriptionDate=Datum der letzten Beitragszahlung
 LastSubscriptionAmount=Betrag des letzten Beitrags
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Mitgliederstatistik nach Staaten
 MembersStatisticsByState=Mitgliederstatistik nach Bundesländern/Provinzen/Kantonen
 MembersStatisticsByTown=Mitgliederstatistik nach Städten
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index be2bc88b630..ad5c1c62c2e 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Liste der definierten Berechtigungen
 SeeExamples=Beispiele hier
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Ist das Feld sichtbar? (Beispiele: 0 = Nie sichtbar, 1 = Auf Liste sichtbar und Formulare erstellen / aktualisieren / anzeigen, 2 = Nur auf Liste sichtbar, 3 = Nur auf Formular erstellen / aktualisieren / anzeigen (nicht Liste), 4 = Auf Liste sichtbar und nur sichtbar bei Formular aktualisieren / anzeigen (nicht erstellen), 5 = Nur im Formular für die Listenendansicht sichtbar (nicht erstellen, nicht aktualisieren). <br> <br> Wenn ein negativer Wert verwendet wird, wird das Feld standardmäßig nicht in der Liste angezeigt, kann jedoch zur Anzeige ausgewählt werden.) <br> <br> Es kann sich um einen Ausdruck handeln, z. B.:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Zeigt dieses Feld in kompatiblen PDF-Dokumenten an. Sie können die Position mit dem Feld "Position" verwalten. <br/> Derzeit bekannt compatibles PDF-Modelle sind: eratosthenes (Bestellung), espadon (Lieferung), sponge (Rechnungen), cyan (propal / Offerten), cornas (Lieferanten-Auftrag) <br/> <br/> <strong> Für Dokument: </strong> <br/> 0 = nicht angezeigt <br/> 1 = Anzeige <br/> 2 = Anzeige nur leer wenn nicht <br/> <br/> <strong> Für Belegzeilen: </strong> <br/> 0 = nicht angezeigt <br/> 1 = in einer Spalte <br/> 3 = Anzeige in Zeile Beschreibung Spalte nach der Beschreibung <br/> 4 = Anzeige in Spalte Beschreibung nach der angezeigten Beschreibung, nur wenn nicht leer
+DisplayOnPdfDesc=Zeigt dieses Feld in kompatiblen PDF-Dokumenten an. Sie können die Position mit dem Feld "Position" verwalten. <br/> Derzeit bekannt compatibles PDF-Modelle sind: eratosthenes (Bestellung), espadon (Lieferung), sponge (Rechnungen), cyan (propal / Offerten), cornas (Lieferanten-Auftrag) <br/> <br/> <strong> Für Dokument: </strong> <br/> 0 = nicht angezeigen <br/> 1 = anzeigen <br/> 2 = nur anzeigen, wenn nicht leer <br/> <br/> <strong> Für Belegzeilen: </strong> <br/> 0 = nicht angezeigt <br/> 1 = in einer Spalte <br/> 3 = Anzeige in Zeile Beschreibung Spalte nach der Beschreibung <br/> 4 = Anzeige in Spalte Beschreibung nach der angezeigten Beschreibung, nur wenn nicht leer
 DisplayOnPdf=Anzeige auf PDF
 IsAMeasureDesc=Kann der Wert des Feldes kumuliert werden, um eine Summe in die Liste aufzunehmen? (Beispiele: 1 oder 0)
 SearchAllDesc=Wird das Feld verwendet, um eine Suche über das Schnellsuchwerkzeug durchzuführen? (Beispiele: 1 oder 0)
@@ -133,7 +133,9 @@ IncludeDocGeneration=Ich möchte einige Dokumente aus dem Objekt generieren
 IncludeDocGenerationHelp=Wenn Sie dies aktivieren, wird Code generiert, um dem Datensatz ein Feld "Dokument generieren" hinzuzufügen.
 ShowOnCombobox=Wert in der Combobox anzeigen
 KeyForTooltip=Schlüssel für Tooltip
-CSSClass=CSS-Klasse
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Nicht bearbeitbar
 ForeignKey=Unbekannter Schlüssel
 TypeOfFieldsHelp=Feldtypen:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' heißt, wir ergänzen eine + Schaltfläche nach der Kombobox, um den Eintrag zu erstellen, 'filter' kann sein 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' zum Beispiel)
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index 042c7fe53c8..221b387169f 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Erzeuge Bestellung
 MakeOrder=Erzeuge Bestellung
 SupplierOrder=Lieferantenbestellung
 SuppliersOrders=Lieferantenbestellungen
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Aktuelle Lieferantenbestellungen
 CustomerOrder=Bestellung
 CustomersOrders=Verkaufsaufträge
@@ -87,7 +89,7 @@ NbOfOrders=Anzahl der Bestellungen
 OrdersStatistics=Bestellstatistik
 OrdersStatisticsSuppliers=Statistik Lieferantenbestellungen
 NumberOfOrdersByMonth=Anzahl der Bestellungen pro Monat
-AmountOfOrdersByMonthHT=Anzahl der Aufträge pro Monat (excl. Steuern)
+AmountOfOrdersByMonthHT=Gesamtbetrag der Bestellungen pro Monat (exkl. Steuern)
 ListOfOrders=Liste Aufträge
 CloseOrder=Bestellung schließen
 ConfirmCloseOrder=Möchten Sie diese Bestellung wirklich auf "geliefert" setzen? Sobald eine Bestellung geliefert ist, kann sie auf "berechnet" gesetzt werden.
@@ -101,7 +103,7 @@ ClassifyShipped=Als geliefert markieren
 DraftOrders=Entwürfe
 DraftSuppliersOrders=Entwürfe Lieferantenbestellungen
 OnProcessOrders=Bestellungen in Bearbeitung
-RefOrder=Bestell-Nr.
+RefOrder=Best.-Nr.
 RefCustomerOrder=Kunden-BestellNr.
 RefOrderSupplier=Best.-Nr. für Lieferant
 RefOrderSupplierShort=Lieferanten-Best.-Nr.
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 5ce758eaa4e..1da316f5077 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -97,7 +97,7 @@ PredefinedMailContentSendOrder=__(Hallo)__\n\nBitte entnehmen Sie dem Anhang die
 PredefinedMailContentSendSupplierOrder=__(Hallo)__\n\nBitte entnehmen Sie dem Anhang die Bestellung\n\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__(Hallo)__\n\nAnbei erhalten Sie die Rechnung __REF__\n\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hallo)__\n\nAls Anlage erhalten Sie unsere Lieferung \n\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hallo)__\n\nBitte finden Sie den Serviceauftrag __REF__ im Anhang\n\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nIm Anhang finden Sie den Serviceauftrag __REF__.\n\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Sie können den folgenden Link anklicken um die Zahlung auszuführen, falls sie noch nicht getätigt wurde.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendActionComm=Ereigniserinnerung "__EVENT_LABEL__" am __EVENT_DATE__ um __EVENT_TIME__ <br> <br> Dies ist eine automatische Nachricht. Bitte antworten Sie nicht.
@@ -114,6 +114,7 @@ DemoCompanyAll=Verwalten Sie ein kleines oder mittleres Unternehmen mit mehreren
 CreatedBy=Erstellt von %s
 ModifiedBy=Bearbeitet von %s
 ValidatedBy=Freigegeben von %s
+SignedBy=Signed by %s
 ClosedBy=Geschlossen von %s
 CreatedById=Erstellt von User-ID
 ModifiedById=Letzte Änderung durch Benutzer-ID
@@ -226,8 +227,8 @@ NewSizeAfterCropping=Neue Größe nach dem Zuschneiden
 DefineNewAreaToPick=Definieren Sie einen neuen Bereich innerhalb des Bildes (Klicken Sie mit der linken Maustaste auf das Bild und halten Sie bis zur gegenüberliegenden Ecke)
 CurrentInformationOnImage=Mit diesem Tool können Sie die Größe eines Bildes ändern oder es zuschneiden. Dies sind die Informationen zum aktuell bearbeiteten Bild
 ImageEditor=Bildbearbeitung
-YouReceiveMailBecauseOfNotification=Sie erhalten diese Nachricht, weil Ihre E-Mail-Adresse zur Liste der zu benachrichtigenden Kontakte für %s von %s hinzugefügt wurde.
-YouReceiveMailBecauseOfNotification2=Sie erhalten dieses Mail aufgrund folgender Benachrichtigung:
+YouReceiveMailBecauseOfNotification=Sie erhalten diese Nachricht, weil Sie ein aktives Abonnement für das nachfolgende Ereignis bei %s / %s haben.
+YouReceiveMailBecauseOfNotification2=\n\nEreignis: 
 ThisIsListOfModules=Dies ist eine Liste von ausgewählten Modulen für die Demo (nur die gängigsten Module sind enthalten). Bearbeiten Sie die Auswahl und eine personalisierte Demo zu erhalten und klicken dann bitte auf "Start".
 UseAdvancedPerms=Verwenden Sie die erweiterten Berechtigungen einiger Module
 FileFormat=Dateiformat
@@ -239,11 +240,12 @@ FileIsTooBig=Dateien sind zu groß
 PleaseBePatient=Bitte haben Sie ein wenig Geduld ...
 NewPassword=Neue Kennwort
 ResetPassword=Kennwort zurücksetzen
-RequestToResetPasswordReceived=Eine Anfrage zur Änderung Ihres Passwortes erhalten.
+RequestToResetPasswordReceived=Wir haben eine Anfrage zur Änderung Ihres Passworts erhalten.
 NewKeyIs=Dies sind Ihre neuen Anmeldedaten
-NewKeyWillBe=Ihr neuer Anmeldeschlüssel für die Software ist
+NewKeyWillBe=Dies sind Ihre neuen Anmeldedaten
 ClickHereToGoTo=Hier klicken für %s
 YouMustClickToChange=Sie müssen zuerst auf den folgenden Link klicken um die Passwortänderung zu bestätigen.
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Wenn Sie diese Änderung nicht beantragt haben, löschen Sie einfach dieses Mail. Ihre Anmeldedaten sind sicher bei uns aufbewahrt.
 IfAmountHigherThan=Wenn der Betrag höher als <strong>%s</strong>
 SourcesRepository=Repository für Quellcodes
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
index 2c9fba27f18..de283a431bb 100644
--- a/htdocs/langs/de_DE/productbatch.lang
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Chargen-/Serien-Nr. benutzen 
-ProductStatusOnBatch=Ja  (Chargen-/Serien-Nr. Pflicht)
+ProductStatusOnBatch=Ja (Charge erforderlich)
+ProductStatusOnSerial=Ja  (einzigartige Seriennummer erforderlich)
 ProductStatusNotOnBatch=Nein  (keine Chargen-/Serien-Nr.)
-ProductStatusOnBatchShort=Ja
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Seriennummer
 ProductStatusNotOnBatchShort=Keine
 Batch=Charge / Seriennr.
 atleast1batchfield="Verzehr bis" oder "Verkaufen bis"-Datum oder Chargen- / Seriennummer
@@ -16,9 +18,18 @@ printEatby=Verzehren bis: %s
 printSellby=Verkaufen bis: %s
 printQty=Menge: %d
 AddDispatchBatchLine=Fügen Sie eine Zeile für den Versand bis Haltbarkeit hinzu
-WhenProductBatchModuleOnOptionAreForced=Wenn das Modul Chargen- und Seriennummernverwaltung aktiviert ist, wird die automatische Warenbestandsanpassung gezwungen beim Ereignis "versendet" den tatsächlichen Bestand zu verringern und beim Ereignis "manuelles Buchen in ein Warenlager" die tatsächlichen Bestand zu erhöhen. Dies kann nicht beeinflusst werden. Andere Optionen können wie gewünscht definiert werden.
+WhenProductBatchModuleOnOptionAreForced=Wenn das Modul "Produkt-Chargen und Serien" aktiviert ist, wird die automatische Warenbestandsanpassung gezwungen beim Ereignis "versendet" den tatsächlichen Bestand zu verringern und beim Ereignis "manuelles Buchen in ein Warenlager" die tatsächlichen Bestand zu erhöhen. Dies kann nicht beeinflusst werden. Andere Optionen können wie gewünscht definiert werden.
 ProductDoesNotUseBatchSerial=Dieses Produkt hat keine Chargen-/Seriennummer
-ProductLotSetup=Einstellungen des Moduls Chargen- und Seriennummernverwaltung
+ProductLotSetup=Einstellungen des Moduls "Produkt-Chargen und Serien"
 ShowCurrentStockOfLot=Warenbestand für diese Chargen-/Seriennummer anzeigen
 ShowLogOfMovementIfLot=Bewegungen für diese Chargen-/Seriennummer anzeigen
 StockDetailPerBatch=Lagerdetail nach Chargen
+SerialNumberAlreadyInUse=Die Seriennummer %s wird bereits für das Produkt %s verwendet
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index b29a2da4eda..1f0dacf0a52 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=Mehrwertsteuersatz (für diesen Lieferanten / Produkt)
 DiscountQtyMin=Rabatt für diese Menge
 NoPriceDefinedForThisSupplier=Für diesen Lieferanten / Produkt wurde kein Preis / Menge definiert
 NoSupplierPriceDefinedForThisProduct=Für dieses Produkt ist kein Lieferantenpreis / Menge definiert
+PredefinedItem=Vordefinierte Position
 PredefinedProductsToSell=Vordefiniertes Produkt
 PredefinedServicesToSell=Vordefinierter Dienst
 PredefinedProductsAndServicesToSell=Vordefiniertes Produkt/Leistung
@@ -313,7 +314,7 @@ LastUpdated=Zuletzt aktualisiert
 CorrectlyUpdated=erfolgreich aktualisiert
 PropalMergePdfProductActualFile=verwendete Dateien, um in PDF Azur hinzuzufügen sind / ist
 PropalMergePdfProductChooseFile=Wähle PDF-Dateien
-IncludingProductWithTag=Inklusive Artikel/Dienstleistung mit Schlagwörter
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Standardpreis, echter Preis kann vom Kunden abhängig sein
 WarningSelectOneDocument=Bitte wählen Sie mindestens ein Dokument aus
 DefaultUnitToShow=Einheit
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 681c0f22f23..963e12c139b 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=verwendet
 ListOfTasks=Aufgabenliste
 GoToListOfTimeConsumed=Liste der verwendeten Zeit aufrufen
 GanttView=Gantt-Diagramm
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Liste der projektbezogenen Angebote
 ListOrdersAssociatedProject=Liste der projektbezogenen Kundenaufträge
 ListInvoicesAssociatedProject=Liste der projektbezogenen Kundenrechnungen
@@ -268,3 +269,7 @@ OneLinePerTask=Eine Zeile pro Aufgabe
 OneLinePerPeriod=Eine Zeile pro Zeitraum
 RefTaskParent=Übergeordnete Aufgabe
 ProfitIsCalculatedWith=Der Gewinn wird berechnet mit
+AddPersonToTask=Auch zu Aufgaben hinzufügen
+UsageOrganizeEvent=Verwendung: Ereignisorganisation
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Klassifizieren Sie das Projekt als abgeschlossen, wenn alle seine Aufgaben abgeschlossen sind (100%% Fortschritt).
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Hinweis: Bestehende Projekte mit allen Aufgaben mit dem Fortschritt 100%% sind nicht betroffen: Sie müssen sie manuell schließen. Diese Option betrifft nur offene Projekte.
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index de5a2e451fa..32d5cb7ce29 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -30,7 +30,7 @@ PropalsOpened=geöffnet
 PropalStatusDraft=Entwurf (freizugeben)
 PropalStatusValidated=Freigegeben (Angebot ist offen)
 PropalStatusSigned=unterzeichnet (abrechenbar)
-PropalStatusNotSigned=Nicht unterzeichnet (geschlossen)
+PropalStatusNotSigned=abgelehnt (geschlossen)
 PropalStatusBilled=Verrechnet
 PropalStatusDraftShort=Entwurf
 PropalStatusValidatedShort=Bestätigt (offen)
@@ -41,7 +41,7 @@ PropalStatusBilledShort=Verrechnet
 PropalsToClose=Zu schließende Angebote
 PropalsToBill=Unterzeichnete Angebote zur Verrechnung
 ListOfProposals=Liste Angebote
-ActionsOnPropal=Ereignisse zum Angebot
+ActionsOnPropal=Ereignisse zu diesem Angebot
 RefProposal=Angebots-Nr.
 SendPropalByMail=Angebot per E-Mail versenden
 DatePropal=Angebotsdatum
@@ -59,6 +59,7 @@ ConfirmClonePropal=Sind Sie sicher, dass Sie dieses Angebot <b>%s</b> dupliziere
 ConfirmReOpenProp=Sind Sie sicher, dass Sie dieses Angebot <b>%s</b> wieder öffnen möchten ?
 ProposalsAndProposalsLines=Angebote und Positionen
 ProposalLine=Angebotsposition
+ProposalLines=Proposal lines
 AvailabilityPeriod=Gültig bis
 SetAvailability=Gültigkeitszeitraum definieren
 AfterOrder=nach Bestellung
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 6a0685862ae..997f17adbf5 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warenlager - Übersicht
 Warehouse=Warenlager
 Warehouses=Warenlager
 ParentWarehouse=Übergeordnetes Lager
-NewWarehouse=Neues Warenlager
+NewWarehouse=Neues Lager / Lagerstandort
 WarehouseEdit=Warenlager bearbeiten
 MenuNewWarehouse=Neues Warenlager
 WarehouseSource=Ursprungslager
@@ -19,10 +19,10 @@ Stock=Warenbestand
 Stocks=Warenbestände
 MissingStocks=Fehlende Bestände
 StockAtDate=Lagerbestände zum Datum
-StockAtDateInPast=Datum in der Vergangenheit
-StockAtDateInFuture=Datum in der Zukunft
-StocksByLotSerial=Lagerbestand nach Chargen-/Seriennummer
-LotSerial=Chargen/Serien-Nummern
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
+StocksByLotSerial=Lagerbestand nach Chargen/Serien
+LotSerial=Chargen/Serien
 LotSerialList=Liste der Chargen-/Seriennummern
 Movements=Lagerbewegungen
 ErrorWarehouseRefRequired=Warenlager-Referenz erforderlich
@@ -37,8 +37,8 @@ AllWarehouses=Alle Warenlager
 IncludeEmptyDesiredStock=Schließe auch negative Bestände mit undefinierten gewünschten Beständen ein
 IncludeAlsoDraftOrders=Fügen Sie auch Auftragsentwürfe hinzu
 Location=Standort
-LocationSummary=Kurzbezeichnung Standort
-NumberOfDifferentProducts=Anzahl unterschiedlicher Produkte
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Anzahl Produkte
 LastMovement=Letzte Bewegung
 LastMovements=Letzte Bewegungen
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Lagerwert
 UserWarehouseAutoCreate=Automatisch ein Lager erstellen wenn ein neuer Benutzer erstellt wird
 AllowAddLimitStockByWarehouse=Verwalten Sie zusätzlich zum Wert für den Mindest- und den gewünschten Bestand pro Paar (Produktlager) auch den Wert für den Mindest- und den gewünschten Bestand pro Produkt
 RuleForWarehouse=Regel für Lager
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Ein Lager zu dem Angebot einstellen
 WarehouseAskWarehouseDuringOrder=Legen Sie ein Lager für Verkaufsaufträge fest
 UserDefaultWarehouse=Legen Sie ein Lager für Benutzer fest
 MainDefaultWarehouse=Standardlager
@@ -73,39 +74,40 @@ QtyDispatched=Liefermenge
 QtyDispatchedShort=Menge versandt
 QtyToDispatchShort=Menge zu versenden
 OrderDispatch=Wareneingang
-RuleForStockManagementDecrease=Wählen Sie Regel für automatische Bestandsabnahme (manuelle Abnahme ist immer möglich, auch wenn eine automatische Abnahmeregel aktiviert ist)
-RuleForStockManagementIncrease=Wählen Sie Regel für automatische Bestandserhöhung (manuelle Erhöhung ist immer möglich, auch wenn eine automatische Erhöhungsregel aktiviert ist)
-DeStockOnBill=Reduzieren Sie den realen Bestand bei Validierung der Kundenrechnung / Gutschrift
-DeStockOnValidateOrder=Reduzieren Sie den realen Bestand bei der Validierung des Kundenauftrags
-DeStockOnShipment=Verringere reale Lagerbestände bei Bestätigung von Lieferungen
-DeStockOnShipmentOnClosing=Verringere reale Lagerbestände bei Bestätigung von Lieferungen
-ReStockOnBill=Erhöhen Sie den realen Bestand bei der Validierung der Lieferantenrechnung / -gutschrift
-ReStockOnValidateOrder=Erhöhen Sie die realen Bestände bei der Bestellbestätigung
-ReStockOnDispatchOrder=Erhöhen Sie den realen Lagerbestand beim manuellen Versand in das Lager, nachdem Sie die Ware in der Bestellung erhalten haben
-StockOnReception=Erhöhe die realen Lagerbestände bei der Inventur
-StockOnReceptionOnClosing=Erhöhe die realen Lagerbestände, wenn der Wareneingang geschlossen wird
+RuleForStockManagementDecrease=Regel für automatische Bestandsabnahme (eine manuelle Bestandskorrektur ist immer möglich, auch wenn eine Regel aktiv ist)
+RuleForStockManagementIncrease=Regel für automatische Bestandszunahme (eine manuelle Bestandskorrektur ist immer möglich, auch wenn eine Regel aktiv ist)
+DeStockOnBill=Lagerbestand beim Bestätigen von Kundenrechnungen / -gutschriften anpassen
+DeStockOnValidateOrder=Lagerbestand beim Bestätigen von Verkaufsaufträgen reduzieren
+DeStockOnShipment=Verringere tatsächliche Lagerbestände bei Bestätigung von Lieferungen
+DeStockOnShipmentOnClosing=Lagerbestand beim Schließen von Lieferungen reduzieren
+ReStockOnBill=Erhöhen Sie den tatsächlichen Bestand bei der Validierung der Lieferantenrechnung / -gutschrift
+ReStockOnValidateOrder=Erhöhen Sie tatsächliche Bestände bei der Bestellbestätigung
+ReStockOnDispatchOrder=Erhöhen der tatsächlichen Lagerbestand beim manuellen Versand ins Lager, nachdem Bestelleingang der Ware
+StockOnReception=Erhöhung des tatsächlichen Lagerbestands bei der Überprüfung des Eingangs.
+StockOnReceptionOnClosing=Erhöhe die tatsächlichen Lagerbestände, wenn der Wareneingang geschlossen wird
 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=Es erfolgt keine Lagerbestandsänderung da keine vordefinierten Produkte enthalten sind. \n
+NoPredefinedProductToDispatch=Es erfolgt keine Lagerbestandsänderung da keine vordefinierten Produkte enthalten sind. 
 DispatchVerb=Position(en) verbuchen
 StockLimitShort=Grenzwert für Alarm
 StockLimit=Mindestbestand vor Warnung
 StockLimitDesc=(leer) bedeutet keine Warnung. <br> 0 kann für eine Warnung verwendet werden, sobald der Bestand leer ist.
 PhysicalStock=Aktueller Lagerbestand
-RealStock=Realer Bestand
+RealStock=tatsächlicher Bestand
 RealStockDesc=Der aktuelle Lagerbestand ist die Stückzahl, die aktuell und physikalisch in Ihren Warenlagern vorhanden ist.
-RealStockWillAutomaticallyWhen=Der reale Bestand wird gemäß dieser Regel geändert (wie im Bestandsmodul definiert):
+RealStockWillAutomaticallyWhen=Der tatsächliche Bestand wird gemäß dieser Regel geändert (wie im Bestandsmodul definiert):
 VirtualStock=Theoretischer Lagerbestand
 VirtualStockAtDate=Virtueller Bestand zum Datum
-VirtualStockAtDateDesc=Virtueller Lagerbestand, sobald alle anstehenden Aufträge, die vor dem Datum erledigt werden sollen, abgeschlossen sind
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtueller Bestand ist der berechnete Bestand, der verfügbar ist, sobald alle offenen / ausstehenden Aktionen (die sich auf den Bestand auswirken) abgeschlossen sind (eingegangene Bestellungen, versendete Kundenaufträge, produzierte Fertigungsaufträge usw.).
+AtDate=At date
 IdWarehouse=Warenlager ID
 DescWareHouse=Beschreibung Warenlager
 LieuWareHouse=Standort Warenlager
 WarehousesAndProducts=Warenlager und Produkte
 WarehousesAndProductsBatchDetail=Warenlager und Produkte (mit Detail per lot / serial)
 AverageUnitPricePMPShort=Gewichteter Warenwert
-AverageUnitPricePMPDesc=Der eingegebene durchschnittliche Stückpreis, den wir an die Lieferanten zahlen mussten, um das Produkt in unseren Lagerbestand aufzunehmen.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Verkaufspreis
 EstimatedStockValueSellShort=Verkaufswert
 EstimatedStockValueSell=Verkaufswert
@@ -124,8 +126,8 @@ StockToBuy=zu bestellen
 Replenishment=Nachbestellung
 ReplenishmentOrders=Nachbestellungen
 VirtualDiffersFromPhysical=Je nach Erhöhung / Verringerung der Lagerbestands-Optionen können sich physische und virtuelle Lagerbestände (physische Lagerbestände + offene Aufträge) unterscheiden
-UseRealStockByDefault=Verwende für die Nachbestellfunktion realen Bestand anstelle von virtuellem Bestand
-ReplenishmentCalculation=Die zu bestellende Menge ist (gewünschte Menge - realer Bestand) anstelle von (gewünschte Menge - virtueller Bestand)
+UseRealStockByDefault=Verwenden Sie tatsächlichen Lagerbestand anstelle des virtuellen Lagerbestands für die Nachbestellfunktion.
+ReplenishmentCalculation=Die zu bestellende Menge ist (gewünschte Menge - tatsächlicher Bestand) anstelle von (gewünschte Menge - virtueller Bestand)
 UseVirtualStock=Theoretischen Lagerbestand benutzen
 UsePhysicalStock=Ist-Bestand verwenden
 CurentSelectionMode=Aktueller Auswahl-Modus
@@ -145,16 +147,16 @@ Replenishments=Nachbestellung
 NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s)
 NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s)
 MassMovement=Massenbewegung
-SelectProductInAndOutWareHouse=Wählen Sie ein Quelllager und ein Ziellager, ein Produkt und eine Menge aus und klicken Sie auf "%s". Sobald dies für alle erforderlichen Bewegungen erledigt ist, klicken Sie auf "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Umbuchung
 ReceivingForSameOrder=Verbuchungen zu dieser Bestellung
 StockMovementRecorded=Lagerbewegungen aufgezeichnet
 RuleForStockAvailability=Regeln für Bestands-Verfügbarkeit
-StockMustBeEnoughForInvoice=Ein ausreichender Lagerbestand ist erforderlich, um Produkte/Leistungen in Rechnung zu stellen. (Die Prüfung gegen den aktuellen realen Lagerbestand erfolgt, wenn eine Zeile zur Rechnung hinzugefügt wird, unabhängig von der Regel zur automatischen Lagerbestandsänderung.)
+StockMustBeEnoughForInvoice=Ein ausreichender Lagerbestand ist erforderlich, um Produkte/Leistungen in Rechnung zu stellen. (Die Prüfung gegen den aktuellen tatsächlichen Lagerbestand erfolgt, wenn eine Zeile zur Rechnung hinzugefügt wird, unabhängig von der Regel zur automatischen Lagerbestandsänderung.)
 StockMustBeEnoughForOrder=Der Lagerbestand muss ausreichen, um der Bestellung ein Produkt / eine Dienstleistung hinzuzufügen.
-StockMustBeEnoughForShipment= Ein ausreichender Lagerbestand ist erforderlich, um Produkte/Leistungen zum Versand hinzuzufügen. (Die Prüfung gegen den aktuellen realen Lagerbestand erfolgt, wenn eine Zeile zum Versand hinzugefügt wird, unabhängig von der Regel zur automatischen Lagerbestandsänderung.) 
+StockMustBeEnoughForShipment= Ein ausreichender Lagerbestand ist erforderlich, um Produkte/Leistungen zum Versand hinzuzufügen. (Die Prüfung gegen den aktuellen tatsächlichen Lagerbestand erfolgt, wenn eine Zeile zum Versand hinzugefügt wird, unabhängig von der Regel zur automatischen Lagerbestandsänderung.) 
 MovementLabel=Titel der Lagerbewegung
-TypeMovement=Art der Lagerbewegung
+TypeMovement=Direction of movement
 DateMovement=Datum Lagerbewegung
 InventoryCode=Bewegungs- oder Bestandscode
 IsInPackage=In Paket enthalten
@@ -183,6 +185,7 @@ inventoryCreatePermission=Neue Inventur erstellen
 inventoryReadPermission=Inventar anzeigen
 inventoryWritePermission=Inventar aktualisieren
 inventoryValidatePermission=Inventur freigeben
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventar
 inventoryListTitle=Inventuren
 inventoryListEmpty=Keine Inventarisierung in Arbeit
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Ein Lagerbestand ist erforderlich, um das z
 ForceTo=Erzwingen
 AlwaysShowFullArbo=Anzeige des vollständigen Angebots (Popup des Lager-Links). Warnung: Dies kann die Leistung erheblich beeinträchtigen.
 StockAtDatePastDesc=Du kannst hier den Lagerbestand (Realbestand) zu einem bestimmten Datum in der Vergangenheit anzeigen
-StockAtDateFutureDesc=Du kannst hier den Lagerbestand (virtueller Bestand) zu einem bestimmten Zeitpunkt in der Zukunft anzeigen
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Aktueller Lagerbestand
 InventoryRealQtyHelp=Setze den Wert auf 0, um die Menge zurückzusetzen. <br> Feld leer lassen oder Zeile entfernen, um unverändert zu lassen
-UpdateByScaning=Update durch Scannen
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update per Scan (Produkt-Barcode)
 UpdateByScaningLot=Update per Scan (Charge | serieller Barcode)
 DisableStockChangeOfSubProduct=Deaktivieren Sie den Lagerwechsel für alle Unterprodukte dieses Satzes während dieser Bewegung.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Datei hochladen und dann auf das Symbol %s klicken, um die Datei als Quell-Importdatei auszuwählen ...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=wiedereröffnen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index 97d31dc4605..a5043c2b875 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Lieferanten
 SuppliersInvoice=Lieferantenrechnung
+SupplierInvoices=Lieferantenrechnungen
 ShowSupplierInvoice=Zeige Lieferantenrechnung
 NewSupplier=neuer Lieferant
 History=Verlauf
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index 6405e1db2a6..87cbe3e8ab8 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Gelöscht
 # Dict
 Type=Typ
 Severity=Dringlichkeit
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Um eine E-Mail mit der Ticketmeldung zu senden
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Logo des Moduls im öffentlichen Interface anzeigen
 TicketsShowModuleLogoHelp=Aktiviere diese Option um das Logo des Moduls im öffentlichen Interface nicht anzuzeigen
 TicketsShowCompanyLogo=Unternehmenslogo im öffentlichen Interface anzeigen
 TicketsShowCompanyLogoHelp=Aktiviere diese Option um das Firmenlogo nicht im öffentlichen Interface anzuzeigen
-TicketsEmailAlsoSendToMainAddress=Sende Benachrichtungen auch an die Hauptemailadresse
-TicketsEmailAlsoSendToMainAddressHelp=Aktivieren Sie diese Option um E-Mails an die Adresse unter "Absenderadresse" (Im Setup weiter unten)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Zeige nur dem Benutzer zugewiesene Tickets an (nicht gültig für externe Benutzer, diese sehen nur die Tickets des eigenen Partners)
 TicketsLimitViewAssignedOnlyHelp=Nur dem aktuellen Benutzer zugewiesene Tickets werden angezeigt. Trifft nicht auf Benutzer zu, die das Recht haben Tickets zu verwalten.
 TicketsActivatePublicInterface=Öffentliches Interface aktivieren
@@ -126,10 +128,10 @@ TicketNumberingModules=Ticketnummerierungsmodul
 TicketsModelModule=Dokumentvorlagen für Tickets
 TicketNotifyTiersAtCreation=Partner über Ticketerstellung informieren
 TicketsDisableCustomerEmail=E-Mails immer deaktivieren, wenn ein Ticket über die öffentliche Oberfläche erstellt wird
-TicketsPublicNotificationNewMessage=Senden Sie E-Mails, wenn eine neue Nachricht hinzugefügt wird
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=E-Mail (s) senden, wenn eine neue Nachricht von der öffentlichen Oberfläche hinzugefügt wird (an den zugewiesenen Benutzer oder die Benachrichtigungs-E-Mail an (Update) und / oder die Benachrichtigungs-E-Mail an)
 TicketPublicNotificationNewMessageDefaultEmail=Benachrichtigungen per E-Mail an (Update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Sende E-Mail-Benachrichtigungen über neue Nachrichten an diese Adresse, wenn dem Ticket kein Benutzer zugewiesen ist oder der Benutzer keine E-Mail hat.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Zuletzt bearbeitete TIckets
 BoxLastModifiedTicketDescription=Zuletzt bearbeitete Tickets (maximal %s)
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Keine zuletzt bearbeiteten Tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index 12ecdfb6a6a..0a6ad3bad24 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=Der Spesenabrechnung %s wurde abgebrochen.<br> - Be
 ExpenseReportPaid=Eine Spesenabrechnung wurde ausbezahlt
 ExpenseReportPaidMessage=Der Spesenabrechnung %s wurde bezahlt.<br> - Benutzer: %s<br> - Paid von: %s<br>Klicken Sie hier, um die Spesenabrechnung anzuzeigen: %s
 TripId=Spesenabrechnung ID
-AnyOtherInThisListCanValidate=Angegebene Person über neue Spesenabrechnung informieren, mit Bitte um Validierung.
+AnyOtherInThisListCanValidate=Person, die zur Validierung der Anfrage informiert werden soll.
 TripSociete=Partner
 TripNDF=Hinweise Spesenabrechnung 
 PDFStandardExpenseReports=Standard-Vorlage, um ein PDF-Dokument für die Spesenabrechnung zu erzeugen
@@ -90,7 +90,7 @@ DATE_REFUS=Datum Ablehnung
 DATE_SAVE=Freigabedatum
 DATE_CANCEL=Stornodatum
 DATE_PAIEMENT=Zahlungsdatum
-BROUILLONNER=entwerfen
+BROUILLONNER=wiedereröffnen
 ExpenseReportRef=Belegnummer Spesenabrechnung
 ValidateAndSubmit=Validieren und zur Genehmigung einreichen
 ValidatedWaitingApproval=Validiert (Wartet auf Genehmigung)
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index fc859a67ca4..7449ffc83c4 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -25,7 +25,7 @@ ConfirmDeleteUser=Möchten Sie diesen Benutzer <b>%s</b> wirklich löschen?
 ConfirmDeleteGroup=Möchten Sie diese Gruppe <b>%s</b> wirklich löschen?
 ConfirmEnableUser=Möchten Sie diesen Benutzer <b>%s</b>  wirklich aktivieren?
 ConfirmReinitPassword=Möchten Sie für diesen Benutzer <b>%s</b> wirklich ein neues Passwort generieren?
-ConfirmSendNewPassword=Möchten Sie für diesen Benutzer <b>%s</b> wirklich ein neues Passwort generieren und diesem per E-Mail zusenden?
+ConfirmSendNewPassword=Möchten Sie für den Benutzer <b>%s</b> wirklich ein neues Passwort generieren und es diesem per E-Mail zusenden?
 NewUser=Neuer Benutzer
 CreateUser=Benutzer erstellen
 LoginNotDefined=Benutzername ist nicht gesetzt.
@@ -46,6 +46,8 @@ RemoveFromGroup=Gruppenzuweisung entfernen
 PasswordChangedAndSentTo=Passwort geändert und an <b>%s</b> gesendet.
 PasswordChangeRequest=Aufforderung, das Passwort für <b> %s </b> zu ändern
 PasswordChangeRequestSent=Kennwort-Änderungsanforderung für <b>%s</b> gesendet an <b>%s</b>.
+IfLoginExistPasswordRequestSent=Falls dieser Benutzer über ein gültiges Konto verfügt, wurde eine E-Mail zum Zurücksetzen des Passworts gesendet.
+IfEmailExistPasswordRequestSent=Eine E-Mail zum Zurücksetzen des Passworts wurde versendet (vorausgesetzt dass die angegebene E-Mail-Adresse existiert).
 ConfirmPasswordReset=Passwort zurücksetzen
 MenuUsersAndGroups=Benutzer und Gruppen
 LastGroupsCreated=Zuletzt erstellte Gruppen (%s)
@@ -70,9 +72,10 @@ ExportDataset_user_1=Benutzer und -eigenschaften
 DomainUser=Domain-Benutzer %s
 Reactivate=Reaktivieren
 CreateInternalUserDesc=Dieses Formular erlaubt ihnen das Anlegen eines internen Benutzers in ihrem Unternehmen/ihrer Organisation. Zum Anlegen eines externen Benutzers (Kunden, Lieferanten, ...), verwenden sie bitte die 'Kontakt/Adresse erstellen'-Schaltfläche in der Kontaktkarte des jeweiligen Partners.
-InternalExternalDesc=Ein <b>interner</b> Benutzer ist Teil ihres Unternehmens/ihrer Organisation.<br>Ein <b>externer</b> Benutzer ist ein Kunde, ein Lieferant oder jemand anderes. (Das Anlegen eines externen Benutzers kann aus dem Kontaktdatensatz des Dritten erfolgen.)<br>Diese  Zuordnung regelt die Rechte in Dolibarr, zudem kann ein externer Benutzer andere Menüleisten haben als der interne Benutzer (siehe: Start - Einstellungen - Menüs).
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Berechtigung durch eine Gruppenzugehörigkeit geerbt.
 Inherited=Geerbt
+UserWillBe=Benutzer erstellen als
 UserWillBeInternalUser=Erstellter Benutzer ist intern (mit keinem bestimmten Partner verknüpft)
 UserWillBeExternalUser=Erstellter Benutzer ist extern (mit einem bestimmten Partner verknüpft)
 IdPhoneCaller=Anrufer ID
@@ -109,12 +112,14 @@ UserAccountancyCode=Buchhaltungscode Benutzer
 UserLogoff=Benutzer abmelden
 UserLogged=Benutzer angemeldet
 DateOfEmployment=Anstellungsdatum
-DateEmployment=Beschäftigungsbeginn
+DateEmployment=Mitarbeiter
+DateEmploymentstart=Beschäftigungsbeginn
 DateEmploymentEnd=Beschäftigungsende
+RangeOfLoginValidity=Datumsbereich der Anmeldegültigkeit
 CantDisableYourself=Sie können nicht ihr eigenes Benutzerkonto deaktivieren
 ForceUserExpenseValidator=Überprüfung der Spesenabrechnung erzwingen
 ForceUserHolidayValidator=Gültigkeitsprüfer für Urlaubsanträge erzwingen
 ValidatorIsSupervisorByDefault=Standardmäßig ist der Prüfer der Supervisor des Benutzers. Leer lassen, um dieses Verhalten beizubehalten.
 UserPersonalEmail=Private E-Mail-Adresse
 UserPersonalMobile=Private Mobiltelefonnummer
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Warnung: das ist die eingestellte Muttersprache die der Benutzer spricht, nicht die ausgewählte Sprache der Benutzeroberfläche. Um die angezeigte Sprache der Benutzeroberfläche zu ändern, gehe zum Tab %s
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 8e7ec9d6b08..81cfe83913f 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost= <u> Verwendung mit Apache / NGinx / ... </u> <br> Erstellen
 ExampleToUseInApacheVirtualHostConfig=Beispiel für die Einrichtung eines virtuellen Apache-Hosts:
 YouCanAlsoTestWithPHPS=<u>Verwendung mit eingebettetem PHP-Server</u><br>In der Entwicklungsumgebung können Sie die Site mit dem eingebetteten PHP-Webserver (PHP 5.5 erforderlich) testen, indem Sie <br><strong>php -S 0.0.0.0:8080 -t %s</strong> ausführen.
 YouCanAlsoDeployToAnotherWHP=<u>Betreibe deine Website mit einem anderen Dolibarr Hosting-Anbieter</u><br>Wenn kein Apache oder NGinx Webserver online verfügbar ist, kann deine Website exportiert und importiert werden und zu einer anderen Dolibarr Instanz umziehen, die durch einen anderen Dolibarr Hosting-Anbieter mit kompletter Integration des Webseiten-Moduls bereitgestellt wird. Eine Liste mit Dolibarr Hosting-Anbietern ist hier abufbar <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Kontrolliere dass auch der Virtuelle Host die <strong>%s</strong> Berechtigung für die die Dateien in <br><strong>%s</strong> hat
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Lesen
 WritePerm=Schreiben
 TestDeployOnWeb=Test/Bereitstellung im Web
 PreviewSiteServedByWebServer=Die <u>Vorschau %s in einem neuen Tab</u><br><br>%s wird durch einen externen Webserver (Wie Apache, Nginx, IIS) ausgeliefert. Dieser Server muss installiert und eingerichtet sein, bevor Sie den Verzeichnis <br><strong>%s</strong> anzeigen können.<br> URL, die von dem externen Server bereitgestellt wird: <br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Vorschau %sin neuem Tab. <br><br>%s wird durch den Dolibarr Server so bereit gestellt, dass kein zusätzlicher Webserver (Wie Apache, Nginx, IIS) notwendig ist. <br>Dadurch erhalten die Seiten URL's, die nicht Benutzerfreundlich sind und der Pfad beginnt mit ihrer Dolibarr Installation.<br> Durch Dolibarr bereit gestellte URL: <br><strong>%s</strong><br><br>Um Ihren eigenen externen Webserver für diese Website zu verwenden, erstellen Sie einen virtuellen Host auf Ihrem Webserver, der auf das Verzeichnis <br><strong>%s</strong>zeigt<br>. Vorschau durch Klick auf den anderen Vorschaubutton.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=Die URL des virtuellen Hosts, der von einem externen Webserver bereit gestellt wird, ist nicht definiert
 NoPageYet=Noch keine Seiten
 YouCanCreatePageOrImportTemplate=Sie können eine neue Seite erstellen oder eine komplette Website-Vorlage importieren
@@ -137,3 +137,11 @@ PagesRegenerated=%s Seite(n) / Container neu generiert
 RegenerateWebsiteContent=Generieren Sie Website-Cache-Dateien neu
 AllowedInFrames=In Frames erlaubt
 DefineListOfAltLanguagesInWebsiteProperties=Definiere eine Liste aller verfügbaren Sprachen in den Website-Eigenschaften.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap generiert
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index b434b778de4..7f88571f6aa 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -45,6 +45,7 @@ WithdrawRequestsDone=%s Lastschrift-Zahlungsaufforderungen aufgezeichnet
 BankTransferRequestsDone=%s Überweisungsanforderungen aufgezeichnet
 ThirdPartyBankCode=Bankcode Geschäftspartner
 NoInvoiceCouldBeWithdrawed=Keine Rechnung mit Erfolg eingezogen. Überprüfen Sie, ob die Rechnungen auf Unternehmen mit einer gültigen IBAN Nummer verweisen und die IBAN Nummer eine eindeutige Mandatsreferenz besitzt <strong>%s</strong>.
+WithdrawalCantBeCreditedTwice=Dieser Widerrufsbeleg ist bereits als gutgeschrieben markiert; Dies kann nicht zweimal durchgeführt werden, da dies möglicherweise zu doppelten Zahlungen und Bankeinträgen führen würde.
 ClassCredited=Als eingegangen markieren
 ClassCreditedConfirm=Möchten Sie diesen Abbuchungsbeleg wirklich als auf Ihrem Konto eingegangen markieren?
 TransData=Überweisungsdatum
@@ -149,4 +150,4 @@ InfoRejectMessage=Hallo,<br><br> der Lastschrift-Zahlungsauftrag der Rechnung %s
 ModeWarning=Echtzeit-Modus wurde nicht aktiviert, wir stoppen nach der Simulation.
 ErrorCompanyHasDuplicateDefaultBAN=Unternehmen mit der ID %s hat mehr als ein Standardbankkonto. Keine Möglichkeit zu wissen, welches man verwenden soll.
 ErrorICSmissing=Fehlendes ICS auf dem Bankkonto %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Der Gesamtbetrag des Lastschriftauftrags unterscheidet sich von der Summe der Zeilen
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index 255f578fa39..33051a242ed 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -22,4 +22,4 @@ descWORKFLOW_TICKET_CLOSE_INTERVENTION=Schließen Sie alle mit dem Ticket verkn
 AutomaticCreation=automatische Erstellung
 AutomaticClassification=Automatische Klassifikation
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Klassifizieren Sie die verknüpfte Quellensendung als geschlossen, wenn die Kundenrechnung validiert ist.
diff --git a/htdocs/langs/de_DE/zapier.lang b/htdocs/langs/de_DE/zapier.lang
index 1051734af8b..708a80255dd 100644
--- a/htdocs/langs/de_DE/zapier.lang
+++ b/htdocs/langs/de_DE/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier für Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Modul: Zapier für Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Zapier für Dolibarr einrichten
+ZapierForDolibarrSetup=Zapier für Dolibarr einrichten
 ZapierDescription=Schnittstelle mit Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/el_CY/admin.lang b/htdocs/langs/el_CY/admin.lang
index 74ee870f906..c5a529c1701 100644
--- a/htdocs/langs/el_CY/admin.lang
+++ b/htdocs/langs/el_CY/admin.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/el_CY/modulebuilder.lang b/htdocs/langs/el_CY/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/el_CY/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index a3cd1adf61e..20c087472ee 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Δεσμευμένες γραμμές τιμολογίων
 ExpenseReportLines=Γραμμές εκθέσεων δαπανών που δεσμεύουν
 ExpenseReportLinesDone=Δεσμευμένες αναφορές δαπανών
 IntoAccount=Συνδέστε τη γραμμή με τον λογαριασμό λογιστικής
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Δένω
@@ -209,7 +209,7 @@ Codejournal=Ημερολόγιο
 JournalLabel=Ετικέτα περιοδικών
 NumPiece=Αριθμός τεμαχίου
 TransactionNumShort=Αριθ. συναλλαγή
-AccountingCategory=Προσωποποιημένες ομάδες
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Μπορείτε να ορίσετε εδώ ορισμένες ομάδες λογιστικού λογαριασμού. Θα χρησιμοποιηθούν για εξατομικευμένες λογιστικές εκθέσεις.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Οι γραμμές που δεν έχουν ακόμ
 
 ## Import
 ImportAccountingEntries=Λογιστικές εγγραφές
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Ημερομηνία εξαγωγής
 WarningReportNotReliable=Προειδοποίηση, αυτή η αναφορά δεν βασίζεται στον Καθολικό, επομένως δεν περιέχει συναλλαγή που τροποποιείται χειροκίνητα στο Ledger. Εάν η περιοδική σας έκδοση είναι ενημερωμένη, η προβολή της λογιστικής είναι πιο ακριβής.
 ExpenseReportJournal=Ενημερωτικό Δελτίο Έκθεσης
 InventoryJournal=Απογραφή Αποθέματος
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 32f57690ea4..1dcc70267fa 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Κατάργηση κλειδώματος σύνδεσης
 YourSession=Η σύνοδος σας
 Sessions=Συνεδρίες χρηστών
 WebUserGroup=Χειριστής/Ομάδα Διακομιστή Web
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Η διαμόρφωση της PHP σας φαίνεται να μην επιτρέπει την καταχώρηση των ενεργοποιημένων συνδεγριών. Ο κατάλογος που χρησιμοποιείται για την αποθήκευση των περιόδων σύνδεσης (<b>%s</b>) μπορεί να προστατεύεται (για παράδειγμα, από τα δικαιώματα των λειτουργικών συστημάτων ή από την οδηγία PHP open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Σημείωση: ναι, είναι αποτελεσματικ
 RemoveLock=Αφαιρέστε/μετονομάστε το αρχείο <b>%s</b>, αν υπάρχει, για να επιτραπεί η χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
 RestoreLock=Επαναφέρετε το  αρχείο <b>%s</b>, με δικαίωμα ανάγνωσης μόνο, για να απενεργοποιηθεί οποιαδήποτε χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
 SecuritySetup=Διαχείριση Ασφάλειας
+PHPSetup=PHP setup
 SecurityFilesDesc=Καθορίστε εδώ τις επιλογές που σχετίζονται με την ασφάλεια σχετικά με τη μεταφόρτωση αρχείων.
 ErrorModuleRequirePHPVersion=Λάθος, αυτή η ενότητα απαιτεί έκδοση PHP %s ή μεγαλύτερη
 ErrorModuleRequireDolibarrVersion=Λάθος, αυτό το module απαιτεί Dolibarr έκδοση %s ή μεγαλύτερη
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Αυτή η περιοχή παρέχει λειτουργί
 Purge=Εκκαθάριση
 PurgeAreaDesc=Αυτή η σελίδα σας επιτρέπει να διαγράψετε όλα τα αρχεία που κατασκευάζονται ή αποθηκεύονται από την Dolibarr (προσωρινά αρχεία ή όλα τα αρχεία σε <b>%s </ b> directory).  Η χρήση αυτής της λειτουργίας δεν είναι απαραίτητη.  Παρέχεται για χρήστες των οποίων η Dolibarr φιλοξενείται από πάροχο, που δεν προσφέρει δικαίωμα διαγραφής αρχείων που κατασκευάστηκαν από τον web server.
 PurgeDeleteLogFile=Διαγράψτε τα αρχεία καταγραφής, συμπεριλαμβανομένων<b>%s</b> που είναι ορισμένα για τη χρήση της μονάδας Syslog (χωρίς κίνδυνο απώλειας δεδομένων)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Διαγράψτε όλα τα αρχεία στον κατάλογο: <b>%s</b> . <br> Αυτό θα διαγράψει όλα τα παραγόμενα έγγραφα που σχετίζονται με στοιχεία (τρίτα μέρη, τιμολόγια κ.λπ.), αρχεία που έχουν φορτωθεί στη μονάδα ECM, αρχεία από αντίγραφα ασφαλείας βάσεων δεδομένων και προσωρινά αρχεία.
 PurgeRunNow=Διαγραφή τώρα
@@ -232,6 +234,7 @@ BoxesAvailable=Διαθέσιμα Widgets
 BoxesActivated=Ενεργοποιημένα Widgets
 ActivateOn=Ενεργοποιήστε στις
 ActiveOn=Ενεργοποιήθηκε στις
+ActivatableOn=Activatable on
 SourceFile=Πηγαίο αρχείο
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Διαθέσιμο μόνο αν το JavaScript δεν είναι απενεργοποιημένο
 Required=Υποχρεωτικό
@@ -347,9 +350,10 @@ LastActivationAuthor=Τελευταίος συντάκτης ενεργοποί
 LastActivationIP=Τελευταία IP ενεργοποίησης
 UpdateServerOffline=Ο διακομιστής ενημερώσεων είναι εκτός σύνδεσης
 WithCounter=Διαχειριστείτε έναν μετρητή
-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> τον κωδικό πελάτη σε n χαρακτήρες <br> <b>{cccc000}</b> ο κωδικός πελάτη σε n χαρακτήρες ακολουθείται από έναν μετρητή που προορίζεται για τον πελάτη. Αυτός ο μετρητής αφιερωμένος στον πελάτη επαναφέρεται ταυτόχρονα με τον παγκόσμιο μετρητή. <br> <b>{tttt}</b> Ο κωδικός του τύπου τρίτου μέρους σε χαρακτήρες n (δείτε το μενού Αρχική σελίδα - Ρύθμιση - Λεξικό - Τύποι τρίτων). Εάν προσθέσετε αυτήν την ετικέτα, ο μετρητής θα είναι διαφορετικός για κάθε τύπο τρίτου μέρους. <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Όλοι οι άλλοι χαρακτήρες στην μάσκα θα παραμείνουν ίδιοι.<br>Κενά διαστήματα δεν επιτρέπονται.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Παράδειγμα για το 99ο %s του τρίτου μέρους TheCompany, με ημερομηνία 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Το παράδειγμα του τρίτου μέρους δημιουργήθηκε στις 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Παράδειγμα το προϊόν δημιουργήθηκε στις 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Αφήνοντας αυτό το πεδίο κενό
 ExtrafieldParamHelpselect=Ο κατάλογος τιμών πρέπει να είναι γραμμές με κλειδί μορφής, τιμή (όπου το κλειδί δεν μπορεί να είναι &#39;0&#39;) <br><br> για παράδειγμα: <br> 1, τιμή1 <br> 2, τιμή2 <br> code3, value3 <br> ... <br><br> Προκειμένου ο κατάλογος να εξαρτάται από μια άλλη λίστα συμπληρωματικών χαρακτηριστικών: <br> 1, τιμή1 | επιλογές_επαφ <i>._ορισμός_κώδικα</i> : γονικό_κλειδί <br> 2, value2 | options_ <i>parent_list_code:</i> parent_key <br><br> Προκειμένου να υπάρχει η λίστα ανάλογα με μια άλλη λίστα: <br> 1, τιμή1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Ο κατάλογος τιμών πρέπει να είναι γραμμές με κλειδί μορφής, τιμή (όπου το κλειδί δεν μπορεί να είναι &#39;0&#39;) <br><br> για παράδειγμα: <br> 1, τιμή1 <br> 2, τιμή2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Ο κατάλογος τιμών πρέπει να είναι γραμμές με κλειδί μορφής, τιμή (όπου το κλειδί δεν μπορεί να είναι &#39;0&#39;) <br><br> για παράδειγμα: <br> 1, τιμή1 <br> 2, τιμή2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Ο κατάλογος των τιμών προέρχεται από έναν πίνακα <br> Σύνταξη: table_name: label_field: id_field :: filter <br> Παράδειγμα: c_typent: libelle: id :: φίλτρο <br><br> το φίλτρο μπορεί να είναι μια απλή δοκιμή (π.χ. ενεργή = 1) για να εμφανίζει μόνο την ενεργή τιμή <br> Μπορείτε επίσης να χρησιμοποιήσετε το $ ID $ στο φίλτρο που είναι το τρέχον id του τρέχοντος αντικειμένου <br> Για να κάνετε ένα SELECT στο φίλτρο, χρησιμοποιήστε το $ SEL $ <br> αν θέλετε να φιλτράρετε σε extrafields χρησιμοποιήστε syntax extra.fieldcode = ... (όπου ο κωδικός πεδίου είναι ο κωδικός του extrafield) <br><br> Προκειμένου ο κατάλογος να εξαρτάται από μια άλλη λίστα συμπληρωματικών χαρακτηριστικών: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: φίλτρο <br><br> Προκειμένου να υπάρχει η λίστα ανάλογα με μια άλλη λίστα: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: φίλτρο
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Κρατήστε κενό για έναν απλό διαχωριστή <br> Ρυθμίστε το σε 1 για έναν διαχωριστή που αναδιπλώνεται (ανοίγει από προεπιλογή για νέα σύνοδο και στη συνέχεια διατηρείται η κατάσταση για κάθε περίοδο λειτουργίας χρήστη) <br> Ρυθμίστε αυτό σε 2 για ένα πτυσσόμενο διαχωριστικό (συρρικνώνεται από προεπιλογή για νέα συνεδρία, τότε η κατάσταση διατηρείται για κάθε συνεδρία χρήστη)
 LibraryToBuildPDF=Βιβλιοθήκη δημιουργίας PDF
@@ -541,6 +545,8 @@ Module40Name=Προμηθευτές
 Module40Desc=Προμηθευτές και διαχείριση αγοράς (εντολές αγοράς και τιμολογίων προμηθευτών)
 Module42Name=Αρχεία καταγραφής εντοπισμού σφαλμάτων
 Module42Desc=Εγκαταστάσεις καταγραφής (αρχείο, syslog, ...). Αυτά τα αρχεία καταγραφής είναι για τεχνικούς / εντοπισμό σφαλμάτων.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Επεξεργαστές κειμένου
 Module49Desc=Διαχείριση επεξεργαστών κειμένου
 Module50Name=Προϊόντα
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Μη αναστρέψιμα αρχεία
 Module3200Desc=Ενεργοποιήστε ένα αναλλοίωτο αρχείο επιχειρηματικών εκδηλώσεων. Τα γεγονότα αρχειοθετούνται σε πραγματικό χρόνο. Το αρχείο καταγραφής είναι ένας πίνακας μόνο για ανάγνωση των αλυσιδωτών γεγονότων που μπορούν να εξαχθούν. Αυτή η ενότητα μπορεί να είναι υποχρεωτική για ορισμένες χώρες.
+Module3400Name=Κοινωνικά Δίκτυα
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Διαχείριση ανθρώπινων πόρων (διαχείριση τμήματος, συμβάσεις εργαζομένων και συναισθήματα)
 Module5000Name=Multi-company
 Module5000Desc=Σας επιτρέπει να διαχειριστήτε πολλές εταιρείες
-Module6000Name=Ροή εργασίας
-Module6000Desc=Διαχείριση ροής εργασίας (αυτόματη δημιουργία αντικειμένου ή / και αυτόματη αλλαγή κατάστασης)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Ιστοσελίδες
 Module10000Desc=Δημιουργείστε ιστότοπους (δημόσιους) με έναν κειμενογράφο WYSIWYG. Πρόκειται για ένα CMS για webmaster ή προγραμματιστές (είναι καλύτερο να γνωρίζετε τη γλώσσα HTML και CSS). Απλά ρυθμίστε τον διακομιστή ιστού σας (Apache, Nginx, ...) να δείχνει κατάλογο που είναι εγκατεστημένο το Dolibarr για να το έχετε online στο διαδίκτυο με το δικό σας όνομα τομέα.
 Module20000Name=Αφήστε τη Διαχείριση Αίτησης
@@ -805,7 +813,8 @@ PermissionAdvanced253=Δημιουργία / τροποποίηση εσωτερ
 Permission254=Δημιουργία / τροποποίηση μόνο εξωτερικών χρηστών
 Permission255=Τροποποιήστε τον κωδικό άλλων χρηστών
 Permission256=Διαγράψτε ή απενεργοποιήστε άλλους χρήστες
-Permission262=Επέκταση της πρόσβασης σε όλους τους τρίτους (όχι μόνο τρίτα μέρη για τα οποία ο εν λόγω χρήστης είναι εκπρόσωπος πωλήσεων). <br> Δεν είναι αποτελεσματικό για τους εξωτερικούς χρήστες (που πάντα περιορίζονται στον εαυτό τους για προτάσεις, παραγγελίες, τιμολόγια, συμβάσεις κ.λπ.). <br> Δεν είναι αποτελεσματικό για τα έργα (μόνο κανόνες σχετικά με τα δικαιώματα των έργων, την προβολή και την ανάθεση εργασιών).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Διαβάστε τιμολόγια
 Permission273=Έκδοση τιμολογίων
@@ -1175,7 +1184,8 @@ SetupDescription2=Οι ακόλουθες δύο ενότητες είναι υ
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Βασικές παράμετροι που χρησιμοποιούνται για την προσαρμογή της προεπιλεγμένης συμπεριφοράς της εφαρμογής σας (π.χ. για λειτουργίες που σχετίζονται με τη χώρα).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Αυτό το λογισμικό είναι μια σειρά από πολλές ενότητες / εφαρμογές. Οι ενότητες που σχετίζονται με τις ανάγκες σας πρέπει να ενεργοποιηθούν και να διαμορφωθούν. Οι καταχωρήσεις μενού θα εμφανιστούν με την ενεργοποίηση αυτών των ενοτήτων.
 SetupDescription5=Άλλες καταχωρίσεις μενού ρυθμίσεων διαχειρίζονται προαιρετικές παραμέτρ
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Ιστορικό εισόδου χρηστών
 InfoDolibarr=Πληροφορίες Dolibarr
 InfoBrowser=Πληροφορίες Φυλλομετρητή
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Η εκτέλεση της διαδικασί
 YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Επιστρέφει τον αριθμό αναφοράς με τη μορφή %syymm-nnnn όπου yy είναι year, mm είναι month και nnnn είναι διαδοχική χωρίς επαναφορά
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Εμφάνιση επαγγελματικής ταυτότητας με διευθύνσεις
 ShowVATIntaInAddress=Απόκρυψη ενδοκοινοτικού αριθμού ΦΠΑ με διευθύνσεις
 TranslationUncomplete=Ημιτελής μεταγλώττιση
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Διακομιστής μεσολάβησης: Όνομα / Δι
 MAIN_PROXY_PORT=Διακομιστής μεσολάβησης: Θύρα
 MAIN_PROXY_USER=Διακομιστής μεσολάβησης: Σύνδεση / Χρήστης
 MAIN_PROXY_PASS=Διακομιστής μεσολάβησης: Κωδικός πρόσβασης
-DefineHereComplementaryAttributes=Καθορίστε εδώ οποιαδήποτε πρόσθετα / προσαρμοσμένα χαρακτηριστικά που θέλετε να συμπεριληφθούν για: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Συμπληρωματικά χαρακτηριστικά
 ExtraFieldsLines=Συμπληρωματικά χαρακτηριστικά (σειρές)
 ExtraFieldsLinesRec=Συμπληρωματικά χαρακτηριστικά (γραμμές τιμολογίων προτύπων)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Παράδειγμα: uid
 LDAPFilterConnection=Φίλτρο αναζήτησης
 LDAPFilterConnectionExample=Παράδειγμα: &amp; (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Παράδειγμα: samaccountname
 LDAPFieldFullname=Πλήρες όνομα
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Η εταιρεία σας έχει οριστεί να
 AccountancyCode=Λογιστικός κώδικας
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Κλειδί για την έγκριση σύνδεσης εξαγωγής
+SecurityKey = Security Key
 PastDelayVCalExport=Μην εξάγετε συμβάν παλαιότερο από
 AGENDA_USE_EVENT_TYPE=Χρήση τύπων συμβάντων (διαχειρίζεται το μενού Ρύθμιση -&gt; Λεξικά -&gt; Τύπος συμβάντων ημερήσιας διάταξης)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Αυτόματη ρύθμιση αυτής της προεπιλεγμένης τιμής για τον τύπο συμβάντος στη φόρμα δημιουργίας συμβάντος
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Χρώμα φόντου για τις περιττέ
 BackgroundTableLineEvenColor=Χρώμα φόντου για τις άρτιες (ζυγές) γραμμές του πίνακα
 MinimumNoticePeriod=Ελάχιστη περίοδος προειδοποίησης (Η αίτησή σας πρέπει να γίνει πριν από αυτή την καθυστέρηση)
 NbAddedAutomatically=Αριθμός ημερών που προστίθενται στους μετρητές χρηστών (αυτόματα) κάθε μήνα
-EnterAnyCode=Αυτό το πεδίο περιέχει μια αναφορά για την αναγνώριση της γραμμής. Καταχωρίστε οποιαδήποτε τιμή της επιλογής σας, αλλά χωρίς ειδικούς χαρακτήρες.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Εισαγάγετε 0 ή 1
 UnicodeCurrency=Εισαγάγετε εδώ μεταξύ τιράντες, λίστα αριθμού byte που αντιπροσωπεύει το σύμβολο νομίσματος. Για παράδειγμα: για το $, πληκτρολογήστε [36] - για την Βραζιλία, το πραγματικό R $ [82,36] - για €, πληκτρολογήστε [8364]
 ColorFormat=Το χρώμα RGB είναι σε μορφή HEX, π.χ.: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Κάτω περιθώριο σε PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Δεν απαιτείται συγκεκριμένη ρύθμιση για αυτήν την ενότητα.
 SetToYesIfGroupIsComputationOfOtherGroups=Ορίστε αυτό το ναι αν αυτή η ομάδα είναι ένας υπολογισμός άλλων ομάδων
-EnterCalculationRuleIfPreviousFieldIsYes=Εισαγάγετε τον κανόνα υπολογισμού εάν το προηγούμενο πεδίο είχε οριστεί σε Ναι (για παράδειγμα &#39;CODEGRP1 + CODEGRP2&#39;)
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Πολλές γλωσσικές παραλλαγές βρέθηκαν
 RemoveSpecialChars=Καταργήστε τους ειδικούς χαρακτήρες
 COMPANY_AQUARIUM_CLEAN_REGEX=Φίλτρο Regex για καθαρισμό τιμής (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Ρύθμιση της ενότητας Κοινωνικά δ
 EnableFeatureFor=Ενεργοποίηση χαρακτηριστικών για <strong>%s</strong>
 VATIsUsedIsOff=Σημείωση: Η επιλογή χρήσης Φόρου Πωλήσεων ή ΦΠΑ έχει οριστεί σε <strong>Off (Απενεργοποίηση)</strong> στο μενού %s - %s, οπότε ο φόρος πωλήσεων ή ο Vat που θα χρησιμοποιηθούν θα είναι πάντα 0 για τις πωλήσεις.
 SwapSenderAndRecipientOnPDF=Αντικαταστήστε τη θέση διευθύνσεων αποστολέα και παραλήπτη σε έγγραφα PDF
-FeatureSupportedOnTextFieldsOnly=Προειδοποίηση, χαρακτηριστικό που υποστηρίζεται μόνο σε πεδία κειμένου. Επίσης, πρέπει να οριστεί μια παράμετρος URL action = create or action = edit Ή το όνομα της σελίδας πρέπει να τερματίζεται με &#39;new.php&#39; για να ενεργοποιήσει αυτή τη λειτουργία.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Συλλέκτης ηλεκτρονικού ταχυδρομείου
 EmailCollectorDescription=Προσθέστε μια προγραμματισμένη εργασία και μια σελίδα ρύθμισης για να σαρώσετε τακτικά παράθυρα email (χρησιμοποιώντας το πρωτόκολλο IMAP) και να καταγράψετε τα μηνύματα που έχετε λάβει στην αίτησή σας, στο σωστό μέρος ή / και να δημιουργήσετε αυτόματα τις εγγραφές (όπως οι οδηγοί).
 NewEmailCollector=Νέος συλλέκτης ηλεκτρονικού ταχυδρομείου
@@ -2049,8 +2062,11 @@ UseDebugBar=Χρησιμοποιήστε τη γραμμή εντοπισμού
 DEBUGBAR_LOGS_LINES_NUMBER=Αριθμός τελευταίων γραμμών καταγραφής που διατηρούνται στην κονσόλα
 WarningValueHigherSlowsDramaticalyOutput=Προειδοποίηση, οι υψηλότερες τιμές επιβραδύνουν την δραματική παραγωγή
 ModuleActivated=Η ενότητα %s ενεργοποιείται και επιβραδύνει τη διεπαφή
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Τα μοντέλα εξαγωγής είναι κοινά με όλους
 ExportSetup=Ρύθμιση εξαγωγής της ενότητας
 ImportSetup=Ρύθμιση εισαγωγής λειτουργικής μονάδας
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Δημιουργήστε ένα ανώνυμο Ping &#39;+1&#3
 FeatureNotAvailableWithReceptionModule=Η λειτουργία δεν είναι διαθέσιμη όταν είναι ενεργοποιημένη η λειτουργία Υποδοχή
 EmailTemplate=Πρότυπο email
 EMailsWillHaveMessageID=Τα μηνύματα ηλεκτρονικού ταχυδρομείου θα έχουν μια ετικέτα "Αναφορές" που ταιριάζουν με αυτή τη σύνταξη
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Εάν θέλετε να αντιγράψετε ορισμένα κείμενα στο PDF σας σε 2 διαφορετικές γλώσσες στο ίδιο δημιουργημένο PDF, πρέπει να ορίσετε εδώ αυτήν τη δεύτερη γλώσσα, ώστε το παραγόμενο PDF να περιέχει 2 διαφορετικές γλώσσες στην ίδια σελίδα, αυτή που επιλέγεται κατά τη δημιουργία PDF και αυτή ( μόνο λίγα πρότυπα PDF το υποστηρίζουν αυτό). Κρατήστε κενό για 1 γλώσσα ανά PDF.
 FafaIconSocialNetworksDesc=Εισαγάγετε εδώ τον κωδικό ενός εικονιδίου FontAwesome. Εάν δεν γνωρίζετε τι είναι το FontAwesome, μπορείτε να χρησιμοποιήσετε τη γενική τιμή fa-address-book.
 FeatureNotAvailableWithReceptionModule=Η λειτουργία δεν είναι διαθέσιμη όταν είναι ενεργοποιημένη η λειτουργία Υποδοχή
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 5fc0cb30463..083d6c75e3c 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Οι εντολές άμεσης χρέωσης σας.
 FindYourSEPAMandate=Αυτή είναι η εντολή ΕΧΠΕ για να εξουσιοδοτήσετε την εταιρεία μας να κάνει άμεση εντολή χρέωσης στην τράπεζά σας. Επιστρέψτε το υπογεγραμμένο (σάρωση του υπογεγραμμένου εγγράφου) ή στείλτε το ταχυδρομικώς η με mail
 AutoReportLastAccountStatement=Συμπληρώστε αυτόματα το πεδίο ' αριθμός τραπεζικού λογαριασμού ' με τον τελευταίο αριθμό τραπεζικής δήλωσης όταν κάνετε τη συμφωνία.
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Χρωματισμός κινήσεων
 BankColorizeMovementDesc=Εάν αυτή η λειτουργία είναι ενεργή, μπορείτε να επιλέξετε συγκεκριμένο χρώμα φόντου για χρεωστικές ή πιστωτικές κινήσεις
 BankColorizeMovementName1=Χρώμα φόντου για την κίνηση χρέωσης
 BankColorizeMovementName2=Χρώμα φόντου για την πιστωτική κίνηση
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index a9afd56b2d6..c65c89b3990 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -52,11 +52,12 @@ Invoices=Τιμολόγια
 InvoiceLine=Γραμμή Τιμολογίου
 InvoiceCustomer=Τιμολόγιο Πελάτη
 CustomerInvoice=Τιμολόγιο Πελάτη
-CustomersInvoices=Τιμολόγια Πελάτη
+CustomersInvoices=Τιμολόγια πελατών
 SupplierInvoice=Τιμολόγιο προμηθευτή
-SuppliersInvoices=Τιμολόγια προμηθευτών
+SuppliersInvoices=Τιμολόγια προμηθευτή
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Τιμολόγιο προμηθευτή
-SupplierBills=Τιμολόγια Προμηθευτή
+SupplierBills=Τιμολόγια προμηθευτή
 Payment=Πληρωμή
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Ιστορικό Πληρωμών
 PaymentsBackAlreadyDone=Οι επιστροφές χρημάτων έχουν γίνει ήδη
 PaymentRule=Κανόνας Πληρωμής
 PaymentMode=Τρόπος πληρωμής
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Χρεωστική/Πιστωτική κάρτα
 PaymentTypePP=PayPal
 IdPaymentMode=Τύπος πληρωμής (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Ημερομηνία τελευταίας δημιουργί
 DateLastGenerationShort=Ημερομηνία τελευταίας γεν.
 MaxPeriodNumber=Μέγιστη. αριθμός δημιουργίας τιμολογίου
 NbOfGenerationDone=Αριθμός γεννήσεων τιμολογίων που έχουν ήδη γίνει
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Αριθμός γενεάς που έγινε
 MaxGenerationReached=Ο μέγιστος αριθμός γενεών έφτασε
 InvoiceAutoValidate=Αυτόματη επικύρωση τιμολογίων
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Σταθερό ποσό - 1 γραμμή με την ετικέτα '%s'
 VarAmount=Μεταβλητή ποσού (%% tot.)
 VarAmountOneLine=Μεταβλητή ποσότητα (%% tot.) - 1 γραμμή με την ετικέτα &#39;%s&#39;
-VarAmountAllLines=Μεταβλητή ποσότητα (%% συν.) - όλες οι ίδιες γραμμές
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Τραπεζική μεταφορά
 PaymentTypeShortVIR=Τραπεζική μεταφορά
@@ -494,12 +498,16 @@ Cash=Μετρητά
 Reported=Με καθυστέρηση
 DisabledBecausePayments=Δεν είναι δυνατόν, δεδομένου ότι υπάρχουν ορισμένες πληρωμές
 CantRemovePaymentWithOneInvoicePaid=Δεν μπορείτε να καταργήσετε τη πληρωμή, δεδομένου ότι υπάρχει τουλάχιστον ένα τιμολόγιο που έχει χαρακτηριστεί σαν πληρωμένο
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Αναμενόμενη Πληρωμή
 CantRemoveConciliatedPayment=Δεν είναι δυνατή η κατάργηση της κοινής πληρωμής
 PayedByThisPayment=Πληρωθείτε αυτό το ποσό
 ClosePaidInvoicesAutomatically=Ταξινόμηση αυτόματα όλα τα τυποποιημένα, προκαθορισμένα ή αντικαταστατικά τιμολόγια ως &quot;Πληρωμένα&quot; όταν η πληρωμή γίνει εξ ολοκλήρου.
 ClosePaidCreditNotesAutomatically=Ταξινόμηση αυτόματα όλες τις πιστωτικές σημειώσεις ως &quot;Πληρωθεί&quot; όταν η επιστροφή γίνεται εξ ολοκλήρου.
 ClosePaidContributionsAutomatically=Ταξινόμηση αυτόματα όλες τις κοινωνικές ή φορολογικές εισφορές ως &quot;Πληρωθεί&quot; όταν η πληρωμή γίνει εξ ολοκλήρου.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Όλα τα τιμολόγια που δεν πληρώνουν υπόλοιπο θα κλείσουν αυτόματα με την κατάσταση &quot;Πληρωμή&quot;.
 ToMakePayment=Πληρωμή
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Πρότυπο τιμολόγιο PDF Crabe. Ένα πλήρες πρότυπο τιμολογίου (παλιά εφαρμογή του προτύπου Sponge)
 PDFSpongeDescription=Τιμολόγιο πρότυπο PDF Σφουγγάρι. Ένα πλήρες πρότυπο τιμολογίου
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Επιστρέψετε αριθμό με μορφή %syymm-nnnn για τυπικά τιμολόγια και %syymm-nnnn για πιστωτικά τιμολόγια όπου yy είναι το έτος, mm είναι ο μήνας και nnnn είναι μια ακολουθία αρίθμησης χωρίς διάλειμμα και χωρίς επιστροφή στο 0
-MarsNumRefModelDesc1=Επιστρέφει αριθμό με μορφή %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για τα τιμολόγια αντικατάστασης, %syymm-nnnn για τα τιμολόγια των καταθέσεων και %syymm-nnnn για πιστωτικά σημειώματα όπου yy είναι το έτος, mm είναι μήνας και nnnn είναι μια ακολουθία χωρίς διακοπή και χωρίς επιστροφή σε 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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 in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Πρώιμος λόγος κλεισίματος
 EarlyClosingComment=Πρώιμο σημείωμα κλεισίματος
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Επαφή υπηρεσιών πρ
 InvoiceFirstSituationAsk=Κατάσταση πρώτου τιμολογίου
 InvoiceFirstSituationDesc=Η <b>κατάσταση τιμολογίων</b> συνδέονται με καταστάσεις που σχετίζονται σε πρόοδο, για παράδειγμα, της προόδου μιας κατασκευής. Κάθε κατάσταση είναι συνδεδεμένη με ένα τιμολόγιο.
 InvoiceSituation=Κατάσταση τιμολογίου
+PDFInvoiceSituation=Κατάσταση τιμολογίου
 InvoiceSituationAsk=Τιμολόγιο που έπεται της κατάστασης
 InvoiceSituationDesc=Δημιουργία μιας νέας κατάστασης μετά από μια ήδη υπάρχουσα
 SituationAmount=Κατάσταση τιμολογίου ποσό (καθαρό)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Αν χρειαστεί να δημιουργ
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Κατάσταση δημιουργίας εγγράφων
 DoNotGenerateDoc=Μην δημιουργείτε αρχείο εγγράφων
 AutogenerateDoc=Αυτόματη δημιουργία αρχείου εγγράφου
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Το τιμολόγιο προμηθευτή δι
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index 40e21765069..4f0e98e4b5e 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=πληροφορίες σύνδεσης
 BoxLastRssInfos=Πληροφορίες RSS
 BoxLastProducts=Τελευταία %s Προϊόντα / Υπηρεσίες
@@ -17,9 +18,13 @@ BoxLastActions=Τελευταίες ενέργειες
 BoxLastContracts=Τελευταία συμβόλαια
 BoxLastContacts=Τελευταίες επαφές/διευθύνσεις
 BoxLastMembers=Τελευταία μέλη
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Τελευταίες παρεμβάσεις
 BoxCurrentAccounts=Άνοιξε το ισοζύγιο των λογαριασμών
 BoxTitleMemberNextBirthdays=Γενέθλια αυτού του μήνα (μέλη)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Τα %s πιο πρόσφατα νέα από %s
 BoxTitleLastProducts=Προϊόντα / Υπηρεσίες: τελευταία τροποποίηση %s
 BoxTitleProductsAlertStock=Προϊόντα: προειδοποίηση αποθέματος
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Τελευταίες %s αποστολές πελ
 NoRecordedShipments=Καμία καταγεγραμμένη αποστολή πελάτη
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Λογιστική
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 02ad08d26d6..68d647b9361 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Περιοχές ετικετών / κατηγοριών
 CustomersCategoriesArea=Πεδίο Ετικέτα/Κατηγορία Πελάτη
 MembersCategoriesArea=Πεδίο Ετικέτα/Κατηγορία Μελών
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Περιοχή Ετικετών/Κατηγοριών Λογαριασμών
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Περιοχή ετικετών / κατηγοριών χρηστών
 SubCats=Υποκατηγορίες
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Εμφάνιση ετικέτας/κατηγορίας
 ByDefaultInList=By default in list
 ChooseCategory=Επιλέξτε κατηγορία
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Χρήση ή χειριστής για κατηγορίες
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 976e2709e1a..8169c283b42 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -43,9 +43,10 @@ Individual=Ιδιώτης
 ToCreateContactWithSameName=Θα δημιουργήσει αυτόματα μια επαφή / διεύθυνση με τις ίδιες πληροφορίες με το τρίτο μέρος στο τρίτο μέρος. Στις περισσότερες περιπτώσεις, ακόμη και αν το τρίτο σας πρόσωπο είναι φυσικό πρόσωπο, είναι αρκετό να δημιουργηθεί ένα τρίτο μέρος μόνο του.
 ParentCompany=Γονική εταιρία
 Subsidiaries=Θυγατρικές
-ReportByMonth=Αναφορά ανά μήνα
-ReportByCustomers=Αναφορά ανά πελάτη
-ReportByQuarter=Αναφορά ανά τιμή
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Προσφωνήσεις
 RegisteredOffice=Έδρα της εταιρείας
 Lastname=Επίθετο
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Prof Id 1 (Registration Number)
 ProfId2GB=-
 ProfId3GB=Prof Id 3 (SIC)
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Αριθμός Εμπορικής Εγγραφής)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Πρότυπο Id 1 (CUI)
 ProfId2RO=Πρότυπο Id 2 (Nr. Înmatriculare)
 ProfId3RO=Πρότυπο Id 3 (CAEN)
 ProfId4RO=Πρότυπο Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Καθ Id 1 (OGRN)
 ProfId2RU=Καθ Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Τρέχον εκκρεμείς λογαριασμός
 OutstandingBill=Μέγιστο. για εκκρεμείς λογαριασμό
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Ελάχιστο ποσό για παραγγελία
-MonkeyNumRefModelDesc=Επιστρέφει έναν αριθμό με τη μορφή %syymm-nnnn για τον κωδικό πελάτη και %syymm-nnnn για τον κωδικό προμηθευτή όπου yy είναι έτος, mm είναι month και nnnn είναι μια ακολουθία χωρίς διακοπή και καμία επιστροφή στο 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Customer/supplier code is free. This code can be modified at any time.
 ManagingDirectors=Διαχειριστής (ες) ονομασία (CEO, διευθυντής, πρόεδρος ...)
 MergeOriginThirdparty=Διπλότυπο Πελ./Προμ. ( Πελ./Προμ. θέλετε να διαγραφεί)
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index d814080d930..7697b910499 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=Οι αγορές SGST
 VATCollected=VAT collected
 StatusToPay=Προς πληρωμή
 SpecialExpensesArea=Περιοχή για όλες τις ειδικές πληρωμές
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Κοινωνική ή φορολογική εισφορά
 SocialContributions=Κοινωνικές ή φορολογικές εισφορές
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Πληρωμή τιμολογίου πελάτη
 PaymentSupplierInvoice=πληρωμή τιμολογίου προμηθευτή
 PaymentSocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
 PaymentVat=Πληρωμή Φ.Π.Α.
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Λίστα πληρωμών
 ListOfCustomerPayments=Λίστα πληρωμών πελατών
 ListOfSupplierPayments=Λίστα πληρωμών προμηθευτών
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Πληρωμής
 LT2PaymentsES=Πληρωμές IRPF
 VATPayment=Πληρωμή ΦΠΑ πωλήσεων
 VATPayments=Πληρωμές ΦΠΑ πωλήσεων
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=Νέα καταβολή φόρου επί των πωλήσεων
 NewLocalTaxPayment=Νέα πληρωμή φόρου %s
@@ -134,9 +138,17 @@ NoWaitingChecks=Δεν υπάρχουν επιταγές που αναμένου
 DateChequeReceived=Check reception input date
 NbOfCheques=Αριθμός ελέγχων
 PaySocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
-ConfirmPaySocialContribution=Είστε σίγουροι ότι θέλετε να χαρακτηριστεί αυτή η Κοινωνική/Φορολογική εισφορά ως πληρωμένη;
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Διαγραφή Κοινωνικής/Φορολογικής εισφοράς
-ConfirmDeleteSocialContribution=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την Κοινωνική/Φορολογική εισφορά;
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Κοινωνικές/Φορολογικές εισφορές και πληρωμές
 CalcModeVATDebt=Κατάσταση <b>%sΦΠΑ επί των λογιστικών υποχρεώσεων%s</b>
 CalcModeVATEngagement=Κατάσταση <b>%sΦΠΑ επί των εσόδων-έξοδα%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- Περιλαμβάνει τα οφειλόμενα τιμολόγια του πελάτη, είτε πληρώνονται είτε όχι. <br> - Βασίζεται στην ημερομηνία χρέωσης αυτών των τιμολογίων. <br>
 RulesCAIn=- Περιλαμβάνει όλες τις πραγματικές πληρωμές τιμολογίων που εισπράττονται από πελάτες. <br> - Βασίζεται στην ημερομηνία πληρωμής αυτών των τιμολογίων <br>
 RulesCATotalSaleJournal=Περιλαμβάνει όλες τις πιστωτικές γραμμές από το περιοδικό Sale.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Περιλαμβάνει την εγγραφή στον Λογαριασμό σας με Λογαριασμούς Λογαριασμού που έχει την ομάδα &quot;ΕΞΟΔΑ&quot; ή &quot;ΕΙΣΟΔΟΣ&quot;
 RulesResultBookkeepingPredefined=Περιλαμβάνει την εγγραφή στον Λογαριασμό σας με Λογαριασμούς Λογαριασμού που έχει την ομάδα &quot;ΕΞΟΔΑ&quot; ή &quot;ΕΙΣΟΔΟΣ&quot;
 RulesResultBookkeepingPersonalized=Εμφανίζει ρεκόρ στο Λογαριασμό σας με λογαριασμούς λογαριασμών <b>ομαδοποιημένους από εξατομικευμένες ομάδες</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Έκδοση φορολογικού δελτίου απ
 VATReportByCustomers=Πώληση φορολογική έκθεση από τον πελάτη
 VATReportByCustomersInInputOutputMode=Αναφορά από τον ΦΠΑ των πελατών εισπράττεται και καταβάλλεται
 VATReportByQuartersInInputOutputMode=Υποβολή φορολογικού συντελεστή πωλήσεων του εισπραχθέντος και καταβληθέντος φόρου
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Αναφέρετε τον φόρο 2 με βάση την τιμή
 LT2ReportByQuarters=Αναφέρετε τον φόρο 3 με βάση την τιμή
 LT1ReportByQuartersES=Αναφορά με ποσοστό RE
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=Ανά προϊόν και υπηρεσία
 RefExt=Εξωτερικές αναφορές
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Σύνδεση με παραγγελία
 Mode1=Μέθοδος 1
 Mode2=Μέθοδος 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Ο αποκλειστικός λογιστικ
 ACCOUNTING_ACCOUNT_SUPPLIER=Λογαριασμός λογιστικής που χρησιμοποιείται για τους τρίτους προμηθευτές
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Ο αποκλειστικός λογιστικός λογαριασμός που ορίζεται σε κάρτα τρίτου μέρους θα χρησιμοποιηθεί μόνο για τη λογιστική της Subledger. Αυτός θα χρησιμοποιηθεί για τη Γενική Λογιστική και ως προεπιλεγμένη αξία της λογιστικής της Subleger εάν δεν έχει καθοριστεί ο λογαριασμός λογιστικής αποκλειστικής προμήθειας σε τρίτους.
 ConfirmCloneTax=Επιβεβαιώστε τον κλώνο ενός κοινωνικού / φορολογικού φόρου
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Απλή αναφορά
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Λογιστική εκχώρηση
 LastDayTaxIsRelatedTo=Την τελευταία ημέρα της περιόδου ο φόρος σχετίζεται με
 VATDue=Φόρος πωλήσεων που αξιώνεται
 ClaimedForThisPeriod=Ισχυρίζεται για την περίοδο
-PaidDuringThisPeriod=Πληρωμή κατά τη διάρκεια αυτής της περιόδου
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=Με φορολογικό συντελεστή πώλησης
 TurnoverbyVatrate=Ο κύκλος εργασιών τιμολογείται από το συντελεστή φόρου πώλησης
 TurnoverCollectedbyVatrate=Ο κύκλος εργασιών που εισπράττεται από το φορολογικό συντελεστή πώλησης
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Συλλέχθηκε ο κύκλος εργασιών
 RulesPurchaseTurnoverDue=- Περιλαμβάνει τα οφειλόμενα τιμολόγια του προμηθευτή, είτε πληρώνονται είτε όχι. <br> - Βασίζεται στην ημερομηνία τιμολογίου αυτών των τιμολογίων. <br>
 RulesPurchaseTurnoverIn=- Περιλαμβάνει όλες τις αποτελεσματικές πληρωμές τιμολογίων που πραγματοποιούνται σε προμηθευτές. <br> - Βασίζεται στην ημερομηνία πληρωμής αυτών των τιμολογίων <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Περιλαμβάνει όλες τις χρεωστικές γραμμές από το περιοδικό αγορών.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Τιμολόγηση κύκλου εργασιών αγοράς
 ReportPurchaseTurnoverCollected=Συλλέχθηκε ο κύκλος εργασιών αγοράς
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
index 1984f48b63e..35a09265da3 100644
--- a/htdocs/langs/el_GR/ecm.lang
+++ b/htdocs/langs/el_GR/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Αρχείο που δεν έχει ακόμη ευ
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 0cdb22a79d6..9cf45c8c449 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=<b>%s</b> Directory δεν βρέθηκε (Bad μονοπάτι
 ErrorFunctionNotAvailableInPHP=<b>%s</b> Λειτουργία απαιτείται για αυτό το χαρακτηριστικό, αλλά δεν είναι διαθέσιμα σε αυτή την έκδοση / setup της PHP.
 ErrorDirAlreadyExists=Ένας κατάλογος με αυτό το όνομα υπάρχει ήδη.
 ErrorFileAlreadyExists=Ένα αρχείο με αυτό το όνομα υπάρχει ήδη.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Ο διακομιστής δεν έλαβε ολόκληρο το αρχείο.
 ErrorNoTmpDir=Ο προσωρινός φάκελος %s δεν υπάρχει.
 ErrorUploadBlockedByAddon=Η μεταφόρτωση απετράπει από ένα PHP / Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Σφάλμα κατά τη φόρτωση του γραφή
 ErrorBadSyntaxForParamKeyForContent=Κακή σύνταξη για παράμετρο κλειδί για ικανοποίηση. Πρέπει να έχει μια τιμή ξεκινώντας με %s ή %s
 ErrorVariableKeyForContentMustBeSet=Σφάλμα, πρέπει να οριστεί η σταθερά με το όνομα %s (με περιεχόμενο κειμένου για εμφάνιση) ή %s (με εξωτερική διεύθυνση URL για εμφάνιση).
 ErrorURLMustStartWithHttp=Η διεύθυνση URL %s πρέπει να ξεκινά με http: // ή https: //
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Σφάλμα, η νέα αναφορά χρησιμοποιείται ήδη
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Σφάλμα, διαγραφή πληρωμής που συνδέεται με κλειστό τιμολόγιο δεν είναι δυνατή.
 ErrorSearchCriteriaTooSmall=Τα κριτήρια αναζήτησης είναι πολύ μικρά.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτό δεν είναι μια σταθερή ρύθμιση.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/el_GR/externalsite.lang b/htdocs/langs/el_GR/externalsite.lang
index d9331df4fa4..0cd2832840d 100644
--- a/htdocs/langs/el_GR/externalsite.lang
+++ b/htdocs/langs/el_GR/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Ρύθμιση συνδέσμου σε εξωτερικό website
-ExternalSiteURL=Εξωτερικές διεύθυνσης URL ιστοσελίδας
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Το Module Εξωτερικά Site δεν έχει ρυθμιστεί σωστά.
 ExampleMyMenuEntry=Καταχώρηση του μενού μου
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index e889ec49edd..529012bbdec 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Ημερ. Τροπ.
 IPModification=Modification IP
 DateLastModification=Τελευταία ημερομηνία τροποποίησης
 DateValidation=Ημερομηνία Επικύρωσης
+DateSigning=Signing date
 DateClosing=Ημερομηνία Κλεισίματος
 DateDue=Καταληκτική Ημερομηνία
 DateValue=Ημερομηνία αξίας
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Τιμή μονάδας (εκτός) (νόμισμα)
 UnitPriceTTC=Τιμή Μονάδος
 PriceU=Τιμή μον.
 PriceUHT=Τιμή μον.
-PriceUHTCurrency=U.P. (νόμισμα)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=Τιμή μον. (συμπ. Φ.Π.Α.)
 Amount=Ποσό
 AmountInvoice=Ποσό Τιμολογίου
@@ -389,6 +390,8 @@ AmountTotal=Συνολικό Ποσό
 AmountAverage=Μέσο Ποσό
 PriceQtyMinHT=Τιμή ελάχιστη ποσότητα. (εκτός φόρου)
 PriceQtyMinHTCurrency=Τιμή ελάχιστη ποσότητα. (εκτός φόρου) (νόμισμα)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Ποσοστό
 Total=Σύνολο
 SubTotal=Υποσύνολο
@@ -724,7 +727,7 @@ MenuMembers=Μέλη
 MenuAgendaGoogle=Ημερολόγιο Google
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Όριο Dolibarr (Μενού Ρυθμίσεις-Ασφάλεια): %s Kb, Όριο PHP: %s Kb
-NoFileFound=Δεν υπάρχουν έγγραφα σε αυτόν τον φάκελο
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Τρέχουσα Γλώσσα
 CurrentTheme=Τρέχων Θέμα
 CurrentMenuManager=Τρέχουσα διαχειρηση μενού
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Αφαιρέστε τη συμβολοσειρά &#39;%s&#39;
 SomeTranslationAreUncomplete=Ορισμένες από τις γλώσσες που προσφέρονται μπορούν να μεταφραστούν μόνο μερικώς ή ενδέχεται να περιέχουν σφάλματα. Βοηθήστε να διορθώσετε τη γλώσσα σας, εγγραφείτε στη <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">διεύθυνση https://transifex.com/projects/p/dolibarr/</a> για να προσθέσετε τις βελτιώσεις σας.
-DirectDownloadLink=Άμεση σύνδεση λήψης (δημόσια / εξωτερική)
-DirectDownloadInternalLink=Άμεση σύνδεση λήψης (πρέπει να καταγράφονται και να χρειάζονται δικαιώματα)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Κατεβάστε
 DownloadDocument=Κάντε λήψη εγγράφου
 ActualizeCurrency=Ενημέρωση τιμής νομίσματος
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Επαφές
 SearchIntoMembers=Μέλη
 SearchIntoUsers=Χρήστες
 SearchIntoProductsOrServices=Προϊόντα ή Υπηρεσίες
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Έργα
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Εργασίες
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Συντόμευση πληκτρολογίου
 AssignedTo=Ανάθεση σε
 Deletedraft=Διαγραφή πρόχειρου
 ConfirmMassDraftDeletion=Σχέδιο επιβεβαίωσης μαζικής διαγραφής
-FileSharedViaALink=Το αρχείο μοιράστηκε μέσω συνδέσμου
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Επιλέξτε πρώτα ένα τρίτο μέρος ...
 YouAreCurrentlyInSandboxMode=Βρίσκεστε αυτή τη στιγμή στη λειτουργία &quot;sandbox&quot; %s
 Inventory=Καταγραφή εμπορευμάτων
 AnalyticCode=Αναλυτικός κώδικας
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Εμφάνιση περισσότερων πληροφοριών
 NoFilesUploadedYet=Αρχικά, μεταφορτώστε ένα έγγραφο
 SeePrivateNote=Δείτε την ιδιωτική σημείωση
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/el_GR/margins.lang b/htdocs/langs/el_GR/margins.lang
index e5319082ebc..2e13243e3f3 100644
--- a/htdocs/langs/el_GR/margins.lang
+++ b/htdocs/langs/el_GR/margins.lang
@@ -22,7 +22,7 @@ ProductService=Προϊόν ή Υπηρεσία
 AllProducts=Όλα τα προϊόντα και οι υπηρεσίες
 ChooseProduct/Service=Επιλέξτε προϊόν ή υπηρεσία
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Μέθοδος ποσοστού για της γενικές εκπτώσεις
 UseDiscountAsProduct=Ως προϊόν
 UseDiscountAsService=Ως υπηρεσία
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index a73055746fb..c207035309f 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Λίστα πρόχειρων Μελών (προς επικύ
 MembersListValid=Λίστα έγκυρων μελών
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=Κατάλογος καταγγελθέντων μελών
 MembersListQualified=Λίστα επικυρωμένων μελών
 MenuMembersToValidate=Πρόχειρα Μέλη
 MenuMembersValidated=Επικυρωμένα μέλη
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Καταλήγοντας μέλη
 MembersWithSubscriptionToReceive=Μέλη αναμένοντα για  λήψη συνδρομής
 MembersWithSubscriptionToReceiveShort=Εγγραφή για λήψη
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Η Συνδρομή έληξε
 MemberStatusActiveLateShort=Ληγμένη
 MemberStatusPaid=Συνδρομή σε εξέλιξη
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Μέλος χωρίς Συνδρομή
 MemberStatusResiliatedShort=Τερματίστηκε
 MembersStatusToValid=Πρόχειρα Μέλη
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Καταλήγοντας μέλη
 MemberStatusNoSubscription=Επικυρωμένο (δεν απαιτείται εγγραφή)
 MemberStatusNoSubscriptionShort=Επικυρώθηκε
@@ -82,6 +87,8 @@ Physical=Φυσικό
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Επανενεργοποίηση
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Τερματίστε ένα μέλος
 ConfirmResiliateMember=Είστε σίγουροι για τη διακοπή της συνδρομής του Μέλους;
 DeleteMember=Διαγραφή ενός μέλους
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Πρότυπο ηλεκτρονι
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Πρότυπο ηλεκτρονικού ταχυδρομείου που θα χρησιμοποιηθεί για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου σε ένα μέλος στη νέα εγγραφή εγγραφής
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Πρότυπο ηλεκτρονικού ταχυδρομείου που θα χρησιμοποιηθεί για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου όταν η συνδρομή λήγει
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Πρότυπο ηλεκτρονικού ταχυδρομείου που θα χρησιμοποιηθεί για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου σε μέλος σχετικά με την ακύρωση μέλους
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Email αποστολέα για αυτόματα μηνύματα ηλεκτρονικού ταχυδρομείου
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets (Format for output actually setup: <b>%s</b
 SubscriptionPayment=Πληρωμή συνδρομής
 LastSubscriptionDate=Ημερομηνία της τελευταίας πληρωμής εγγραφής
 LastSubscriptionAmount=Ποσό τελευταίας συνδρομής
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα
 MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία
 MembersStatisticsByTown=Τα μέλη στατιστικών στοιχείων από την πόλη
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index 0c97a5a3b30..0bd432819a2 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=Θέλω να δημιουργήσω κάποια έγγρ
 IncludeDocGenerationHelp=Εάν το ελέγξετε αυτό, θα δημιουργηθεί κάποιος κώδικας για να προσθέσετε ένα πλαίσιο &quot;Δημιουργία εγγράφου&quot; στην εγγραφή.
 ShowOnCombobox=Δείξτε την αξία σε συνδυασμό
 KeyForTooltip=Κλειδί για επεξήγηση εργαλείου
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Δεν είναι δυνατή η επεξεργασία
 ForeignKey=Ξένο κλειδί
 TypeOfFieldsHelp=Τύπος πεδίων: <br> varchar (99), διπλό (24,8), πραγματικό, κείμενο, html, datetime, timestamp, ακέραιος, ακέραιος: ClassName: relativepath / to / classfile.class.php [: 1 [: filter] προσθέτουμε ένα κουμπί + μετά το σύνθετο για να δημιουργήσουμε την εγγραφή, το &#39;φίλτρο&#39; μπορεί να είναι &#39;status = 1 AND fk_user = __USER_ID ΚΑΙ η οντότητα IN (__SHARED_ENTITIES__)&#39; για παράδειγμα)
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index f46715b2529..2725ba6380b 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Δημιουργία πραγγελίας
 MakeOrder=Δημιουργία παραγγελίας
 SupplierOrder=Παραγγελία αγοράς
 SuppliersOrders=Εντολές αγοράς
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Τρέχουσες εντολές αγοράς
 CustomerOrder=Παραγγελία πώλησης
 CustomersOrders=Παραγγελίες πωλήσεων
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Τηλέφωνο
 # Documents models
-PDFEinsteinDescription=Ένα πλήρες μοντέλο παραγγελίας 
+PDFEinsteinDescription=Ένα πλήρες μοντέλο παραγγελίας (παλιά εφαρμογή του προτύπου Eratosthene)
 PDFEratostheneDescription=Ένα πλήρες μοντέλο παραγγελίας
 PDFEdisonDescription=Απλό πρότυπο παραγγελίας
 PDFProformaDescription=Ένα πλήρες πρότυπο τιμολογίου Proforma
 CreateInvoiceForThisCustomer=Τιμολογημένες παραγγελίες
+CreateInvoiceForThisSupplier=Τιμολογημένες παραγγελίες
 NoOrdersToInvoice=Δεν υπάρχουν τιμολογημένες παραγγελίες
 CloseProcessedOrdersAutomatically=Χαρακτηρίστε σε «εξέλιξη» όλες τις επιλεγμένες παραγγελίες.
 OrderCreation=Δημιουργία Παραγγελίας
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 83a5818fdcc..4bb80016fa5 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Εταιρεία με πολλαπλές δραστηριότητ
 CreatedBy=Δημιουργήθηκε από %s
 ModifiedBy=Τροποποίηθηκε από %s
 ValidatedBy=Επικυρώθηκε από  %s
+SignedBy=Signed by %s
 ClosedBy=Έκλεισε από  %s
 CreatedById=Ταυτότητα χρήστη που δημιούργησε
 ModifiedById=Αναγνωριστικό χρήστη που έκανε την τελευταία αλλαγή
@@ -244,6 +245,7 @@ NewKeyIs=Αυτό είναι το νέο σας κλειδί για να συν
 NewKeyWillBe=Το νέο σας κλειδί για να συνδεθείτε με το λογισμικό είναι
 ClickHereToGoTo=Κάντε κλικ εδώ για να μεταβείτε στο %s
 YouMustClickToChange=Θα πρέπει πρώτα να κάνετε κλικ στον παρακάτω σύνδεσμο για να επικυρώσει την αλλαγή του κωδικού πρόσβασης
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Αν δεν ζητήσατε αυτή την αλλαγή, απλά ξεχάστε αυτό το email. Τα διαπιστευτήριά σας παραμένουν ασφαλή.
 IfAmountHigherThan=Εάν το ποσό υπερβαίνει <strong>%s</strong>
 SourcesRepository=Αποθετήριο για τις πηγές
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index fe383ada8c7..8032b64030a 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Χρήση παρτίδας/σειριακού αριθμού
-ProductStatusOnBatch=Ναι (απαιτείται παρτίδα/σειριακός αριθμός)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=Όχι (δεν χρειάζεται παρτίδα/σειριακός αριθμός)
-ProductStatusOnBatchShort=Ναι
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Όχι
 Batch=Παρτίδα/Σειριακός αριθμός
 atleast1batchfield=Ημερομηνία προθεσμίας Ανάλωσης ή Πώλησης ή Παρτίδα/Σειριακός αριθμός
@@ -22,3 +24,12 @@ ProductLotSetup=Ρύθμιση του module παρτίδας / σειριακο
 ShowCurrentStockOfLot=Εμφάνιση παρόντος αποθέματος για ζεύγος προϊόν/παρτίδα
 ShowLogOfMovementIfLot=Εμφάνιση αρχείου κινήσεων για ζεύγος προϊόν/παρτίδα
 StockDetailPerBatch=Ανάλυση αποθέματος ανά παρτίδα
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 60cfc0b3233..4ba5147607a 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=ΦΠΑ (για αυτόν τον πωλητή / προ
 DiscountQtyMin=Έκπτωση για αυτό το ποσό.
 NoPriceDefinedForThisSupplier=Δεν έχει οριστεί τιμή / ποσότητα για αυτόν τον πωλητή / προϊόν
 NoSupplierPriceDefinedForThisProduct=Δεν καθορίζεται τιμή / ποσότητα πωλητή για αυτό το προϊόν
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Προκαθορισμένο προϊόν
 PredefinedServicesToSell=Προκαθορισμένη υπηρεσία
 PredefinedProductsAndServicesToSell=Προκαθορισμένα προϊόντα/υπηρεσίες προς πώληση
@@ -313,7 +314,7 @@ LastUpdated=Τελευταία ενημέρωση
 CorrectlyUpdated=Ενημερώθηκε σωστά
 PropalMergePdfProductActualFile=Αρχείο/α που θα προστεθούν στο AZUR pdf
 PropalMergePdfProductChooseFile=Επιλογή αρχείων pdf
-IncludingProductWithTag=Συμπεριλαμβανομένου προϊόντος / υπηρεσίας με ετικέτα
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Προεπιλεγμένη τιμή, η πραγματική τιμή μπορεί να εξαρτάται από τον πελάτη
 WarningSelectOneDocument=Επιλέξτε τουλάχιστον ένα έγγραφο
 DefaultUnitToShow=Μονάδα
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index f63a0fbc3e6..df429d6a631 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Κατάλογος εργασιών
 GoToListOfTimeConsumed=Μεταβείτε στη λίστα του χρόνου που καταναλώνετε
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Κατάλογος των εμπορικών προτάσεων που σχετίζονται με το έργο
 ListOrdersAssociatedProject=Κατάλογος παραγγελιών πωλήσεων που σχετίζονται με το έργο
 ListInvoicesAssociatedProject=Κατάλογος των τιμολογίων πελατών που σχετίζονται με το έργο
@@ -268,3 +269,7 @@ OneLinePerTask=Μια γραμμή ανά εργασία
 OneLinePerPeriod=Μία γραμμή ανά περίοδο
 RefTaskParent=Αναφ. Γονική εργασία
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/el_GR/propal.lang b/htdocs/langs/el_GR/propal.lang
index baf94f8ea92..086574494c7 100644
--- a/htdocs/langs/el_GR/propal.lang
+++ b/htdocs/langs/el_GR/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Αποστολή Προσφοράς με e-mail
 DatePropal=Ημερομηνία της Προσφοράς
 DateEndPropal=Ισχύς ημερομηνία λήξης
 ValidityDuration=Διάρκεια ισχύος
-CloseAs=Αλλαγή κατάστασης σε
 SetAcceptedRefused=Ορισμός αποδοχής/άρνησης
 ErrorPropalNotFound=Η Προσφορά %s δεν βρέθηκε
 AddToDraftProposals=Προσθήκη στο σχέδιο Προσφοράς
@@ -60,6 +59,7 @@ ConfirmClonePropal=Είστε βέβαιοι ότι θέλετε να κλωνο
 ConfirmReOpenProp=Είστε βέβαιοι ότι θέλετε να ανοίξετε την εμπορική πρόταση <b>%s</b> ?
 ProposalsAndProposalsLines=Προσφορές και γραμμές
 ProposalLine=Γραμμή Προσφοράς
+ProposalLines=Proposal lines
 AvailabilityPeriod=Καθυστέρηση Διαθεσιμότητα
 SetAvailability=Ορισμός καθυστέρησης διαθεσιμότητα
 AfterOrder=μετά την παραγγελία
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Γραπτή αποδοχή, σφραγίδα εται
 ProposalsStatisticsSuppliers=Στατιστικά στοιχεία για τις προτάσεις προμηθευτών
 CaseFollowedBy=Περίπτωση που ακολουθείται
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 454db71ae7c..81d1ee437c5 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -19,8 +19,8 @@ Stock=Στοκ
 Stocks=Αποθέματα
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Αποθέματα ανά παρτίδα / σειρά
 LotSerial=Lots / Serials
 LotSerialList=Κατάλογος παρτίδων / περιοδικών
@@ -37,8 +37,8 @@ AllWarehouses=Όλες οι αποθήκες
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Συμπεριλάβετε επίσης σχέδια παραγγελιών
 Location=Τοποθεσία
-LocationSummary=Σύντομη τοποθεσία όνομα
-NumberOfDifferentProducts=Αριθμός διαφορετικών προϊόντων
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Συνολικός αριθμός προϊόντων
 LastMovement=Τελευταία κίνηση
 LastMovements=Τελευταίες κινήσεις
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Αποθήκες αξία
 UserWarehouseAutoCreate=Δημιουργήστε αυτόματα μια αποθήκη χρήστη κατά τη δημιουργία ενός χρήστη
 AllowAddLimitStockByWarehouse=Διαχειριστείτε επίσης την τιμή για το ελάχιστο και το επιθυμητό απόθεμα ανά ζεύγος (αποθήκη προϊόντων) επιπλέον της τιμής για το ελάχιστο και το επιθυμητό απόθεμα ανά προϊόν
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Το φυσικό / πραγματικό απόθεμα είναι
 RealStockWillAutomaticallyWhen=Το πραγματικό απόθεμα θα τροποποιηθεί σύμφωνα με αυτόν τον κανόνα (όπως ορίζεται στην ενότητα του αποθέματος):
 VirtualStock=Εικονική απόθεμα
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id αποθήκη
 DescWareHouse=Αποθήκη Περιγραφή
 LieuWareHouse=Αποθήκη Localisation
 WarehousesAndProducts=Αποθήκες και τα προϊόντα
 WarehousesAndProductsBatchDetail=Αποθήκες και προϊόντα (με λεπτομέρεια ανά παρτίδα / σειρά)
 AverageUnitPricePMPShort=Μέση σταθμική τιμή
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Πώληση Τιμή μονάδας
 EstimatedStockValueSellShort=Τιμή για πώληση
 EstimatedStockValueSell=Τιμή για πώληση
@@ -145,7 +147,7 @@ Replenishments=Αναπληρώσεις
 NbOfProductBeforePeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (< %s)
 NbOfProductAfterPeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (> %s)
 MassMovement=Μαζική μετακίνηση
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Μεταφορά εγγραφών
 ReceivingForSameOrder=Αποδείξεις για αυτή την παραγγελία
 StockMovementRecorded=Οι κινήσεις των αποθεμάτων καταγράφονται
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Το επίπεδο αποθεμάτων πρέπε
 StockMustBeEnoughForOrder=Το επίπεδο των αποθεμάτων πρέπει να είναι αρκετό για να προσθέσετε το προϊόν / την υπηρεσία στην παραγγελία (ο έλεγχος γίνεται με βάση το τρέχον πραγματικό απόθεμα όταν προσθέτετε μια γραμμή σε παραγγελία ανεξάρτητα από τον κανόνα για την αυτόματη αλλαγή μετοχών)
 StockMustBeEnoughForShipment= Το επίπεδο αποθεμάτων πρέπει να είναι αρκετό για να προστεθεί το προϊόν / η υπηρεσία στην αποστολή (ο έλεγχος γίνεται σε τρέχον πραγματικό απόθεμα κατά την προσθήκη μιας γραμμής στην αποστολή ανεξάρτητα από τον κανόνα για την αυτόματη αλλαγή μετοχών)
 MovementLabel=Ετικέτα λογιστικής κίνησης
-TypeMovement=Τύπος κίνησης
+TypeMovement=Direction of movement
 DateMovement=Ημερομηνία μετακίνησης
 InventoryCode=Λογιστική κίνηση ή κωδικός απογραφής
 IsInPackage=Περιεχόμενα συσκευασίας
@@ -183,6 +185,7 @@ inventoryCreatePermission=Δημιουργία νέου αποθέματος
 inventoryReadPermission=Προβολή καταλόγων
 inventoryWritePermission=Ενημέρωση αποθεμάτων
 inventoryValidatePermission=Επικύρωση απογραφής
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Καταγραφή εμπορευμάτων
 inventoryListTitle=Αποθέματα
 inventoryListEmpty=Δεν υπάρχει απογραφή σε εξέλιξη
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Απόθεμα είναι απαραίτη
 ForceTo=Δύναμη σε
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 1142d55088d..8f73af54a4f 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Προμηθευτές
 SuppliersInvoice=Τιμολόγιο προμηθευτή
+SupplierInvoices=Τιμολόγια προμηθευτή
 ShowSupplierInvoice=Εμφάνιση τιμολογίου προμηθευτή
 NewSupplier=Νέος πωλητής
 History=Ιστορικό
diff --git a/htdocs/langs/el_GR/ticket.lang b/htdocs/langs/el_GR/ticket.lang
index 65f2b2d8d39..5c5c8eb9975 100644
--- a/htdocs/langs/el_GR/ticket.lang
+++ b/htdocs/langs/el_GR/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Διαγράφηκε
 # Dict
 Type=Τύπος
 Severity=Δριμύτητα
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Για να στείλετε email από το μήνυμα εισιτηρίων
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Εμφανίστε το λογότυπο της ενότη
 TicketsShowModuleLogoHelp=Ενεργοποιήστε αυτήν την επιλογή για να αποκρύψετε τη λειτουργική μονάδα λογότυπου στις σελίδες της δημόσιας διασύνδεσης
 TicketsShowCompanyLogo=Εμφανίστε το λογότυπο της εταιρείας στο δημόσιο περιβάλλον
 TicketsShowCompanyLogoHelp=Ενεργοποιήστε αυτήν την επιλογή για να αποκρύψετε το λογότυπο της κύριας εταιρείας στις σελίδες της δημόσιας διασύνδεσης
-TicketsEmailAlsoSendToMainAddress=Επίσης, αποστέλλετε ειδοποίηση στην κύρια διεύθυνση ηλεκτρονικού ταχυδρομείου
-TicketsEmailAlsoSendToMainAddressHelp=Ενεργοποιήστε αυτή την επιλογή για να στείλετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου στη διεύθυνση &quot;Ειδοποίηση ηλεκτρονικού ταχυδρομείου από&quot; (δείτε την παρακάτω ρύθμιση)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Περιορίστε την εμφάνιση σε εισιτήρια που έχουν εκχωρηθεί στον τρέχοντα χρήστη (δεν είναι αποτελεσματικά για εξωτερικούς χρήστες, πάντα περιορίζονται στο τρίτο μέρος από το οποίο εξαρτώνται)
 TicketsLimitViewAssignedOnlyHelp=Μόνο εισιτήρια που έχουν εκχωρηθεί στον τρέχοντα χρήστη θα είναι ορατά. Δεν ισχύει για χρήστη με δικαιώματα διαχείρισης εισιτηρίων.
 TicketsActivatePublicInterface=Ενεργοποιήστε τη δημόσια διεπαφή
@@ -126,10 +128,10 @@ TicketNumberingModules=Μονάδα αρίθμησης εισιτηρίων
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Ειδοποιήστε τρίτο μέρος στη δημιουργία
 TicketsDisableCustomerEmail=Πάντα να απενεργοποιείτε τα μηνύματα ηλεκτρονικού ταχυδρομείου όταν δημιουργείται ένα εισιτήριο από τη δημόσια διασύνδεση
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Τελευταία τροποποιημένα εισιτή
 BoxLastModifiedTicketDescription=Τα τελευταία τροποποιημένα εισιτήρια %s
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Δεν υπάρχουν πρόσφατα τροποποιημένα εισιτήρια
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index af7a6c554df..75b5ce4c968 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Αφαίρεση από την ομάδα
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Αίτημα αλλαγής κωδικού πρόσβασης για <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Επιβεβαιώστε την επαναφορά κωδικού πρόσβασης
 MenuUsersAndGroups=Χρήστες και Ομάδες
 LastGroupsCreated=Οι τελευταίες ομάδες %s δημιουργήθηκαν
@@ -70,9 +72,10 @@ ExportDataset_user_1=Χρήστες και τις ιδιότητές τους
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=Αυτή η φόρμα σάς επιτρέπει να δημιουργήσετε έναν εσωτερικό χρήστη στην εταιρεία / οργανισμό σας. Για να δημιουργήσετε έναν εξωτερικό χρήστη (πελάτη, προμηθευτή κ.λπ.), χρησιμοποιήστε το κουμπί &quot;Δημιουργία χρήστη Dolibarr&quot; από την κάρτα επαφών του τρίτου μέρους.
-InternalExternalDesc=Ένας εσωτερικός <b> </b> χρήστης είναι ένας χρήστης που ανήκει στην εταιρεία / τον οργανισμό σας. <br> Ένας εξωτερικός χρήστης <b> </b> είναι πελάτης, προμηθευτής ή άλλος (Η δημιουργία εξωτερικού χρήστη για τρίτο μέρος μπορεί να γίνει από την εγγραφή επαφής του τρίτου μέρους). <br> <br> Και στις δύο περιπτώσεις, τα δικαιώματα ορίζουν δικαιώματα στο Dolibarr, επίσης ο εξωτερικός χρήστης μπορεί να έχει διαφορετικό διαχειριστή μενού από τον εσωτερικό χρήστη (Βλέπε Αρχική σελίδα - Ρύθμιση - Οθόνη)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Δημιουργήθηκε χρήστη θα είναι ένας εσωτερικός χρήστης (επειδή δεν συνδέεται με ένα συγκεκριμένο τρίτο μέρος)
 UserWillBeExternalUser=Δημιουργήθηκε χρήστης θα είναι μια εξωτερική χρήστη (επειδή συνδέονται με μια συγκεκριμένη τρίτο μέρος)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=Κωδικός λογαριασμού χρήστη
 UserLogoff=Αποσύνδεση χρήστη
 UserLogged=Ο χρήστης καταγράφηκε
 DateOfEmployment=Employment date
-DateEmployment=Ημερομηνία έναρξης απασχόλησης
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Ημερομηνία λήξης απασχόλησης
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=Δεν μπορείτε να απενεργοποιήσετε το δικό σας αρχείο χρήστη
 ForceUserExpenseValidator=Έγκριση έκθεσης εξόδου ισχύος
 ForceUserHolidayValidator=Έγκριση αίτησης για άδεια εξόδου
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 7ed1f8aab8f..f9e92dbb4e8 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Παράδειγμα χρήσης στη ρύθμιση εικονικού κεντρικού υπολογιστή Apache:
 YouCanAlsoTestWithPHPS=<u>Χρήση με ενσωματωμένο διακομιστή PHP</u> <br> Στο περιβάλλον ανάπτυξης, μπορεί να προτιμάτε να δοκιμάσετε τον ιστότοπο με τον ενσωματωμένο διακομιστή ιστού PHP (απαιτείται PHP 5.5) εκτελώντας <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Εκτελέστε τον ιστότοπό σας με έναν άλλο πάροχο φιλοξενίας Dolibarr</u> <br> Αν δεν διαθέτετε διακομιστή ιστού όπως το Apache ή το NGinx που διατίθεται στο Διαδίκτυο, μπορείτε να εξάγετε και να εισάγετε την ιστοσελίδα σας σε μια άλλη παρουσία Dolibarr που παρέχεται από έναν άλλο πάροχο φιλοξενίας Dolibarr που παρέχει πλήρη ενσωμάτωση στην ενότητα Website. Μπορείτε να βρείτε μια λίστα με ορισμένους παρόχους φιλοξενίας Dolibarr στη <a href="https://saas.dolibarr.org" target="_blank">διεύθυνση https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Ελέγξτε επίσης ότι ο εικονικός κεντρικός υπολογιστής έχει άδεια <strong>%s</strong> σε αρχεία σε <br> <strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Ανάγνωση
 WritePerm=Γράφω
 TestDeployOnWeb=Δοκιμή / ανάπτυξη στο διαδίκτυο
 PreviewSiteServedByWebServer=<u>Προεπισκόπηση %s σε μια νέα καρτέλα.</u> <br><br> Το %s θα εξυπηρετηθεί από έναν εξωτερικό διακομιστή ιστού (όπως Apache, Nginx, IIS). Πρέπει να εγκαταστήσετε και να εγκαταστήσετε αυτόν τον εξυπηρετητή πριν να τονίσετε στον κατάλογο: <br> <strong>%s</strong> <br> URL που εξυπηρετείται από εξωτερικό διακομιστή: <br> <strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Προεπισκόπηση %s σε μια νέα καρτέλα.</u> <br><br> Το %s θα εξυπηρετείται από το διακομιστή Dolibarr, ώστε να μην χρειάζεται να εγκατασταθεί επιπλέον διακομιστής ιστού (όπως Apache, Nginx, IIS). <br> Το ενοχλητικό είναι ότι η διεύθυνση URL των σελίδων δεν είναι φιλική προς το χρήστη και ξεκινά με τη διαδρομή του Dolibarr σας. <br> URL που εξυπηρετείται από Dolibarr: <br> <strong>%s</strong> <br><br> Για να χρησιμοποιήσετε τον δικό σας εξωτερικό διακομιστή ιστού για να εξυπηρετήσετε αυτόν τον ιστότοπο, δημιουργήστε έναν εικονικό κεντρικό υπολογιστή στο διακομιστή ιστού σας που δείχνει στον κατάλογο <br> <strong>%s</strong> <br> στη συνέχεια, πληκτρολογήστε το όνομα αυτού του εικονικού διακομιστή και κάντε κλικ στο άλλο κουμπί προεπισκόπησης.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=Η διεύθυνση URL του εικονικού κεντρικού υπολογιστή που εξυπηρετείται από εξωτερικό διακομιστή ιστού δεν έχει οριστεί
 NoPageYet=Δεν υπάρχουν ακόμη σελίδες
 YouCanCreatePageOrImportTemplate=Μπορείτε να δημιουργήσετε μια νέα σελίδα ή να εισαγάγετε ένα πλήρες πρότυπο ιστότοπου
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/el_GR/zapier.lang b/htdocs/langs/el_GR/zapier.lang
index 84986a17471..16115db0589 100644
--- a/htdocs/langs/el_GR/zapier.lang
+++ b/htdocs/langs/el_GR/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier για Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Μονάδα Zapier για Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Εγκατάσταση του Zapier για Dolibarr
+ZapierForDolibarrSetup=Εγκατάσταση του Zapier για Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/en_AU/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index fd46f1407d3..1897b645ea1 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -1,9 +1,8 @@
 # Dolibarr language file - Source file is en_US - admin
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
-Module59000Desc=Module to follow margins
 DictionaryVAT=GST Rates or Sales Tax Rates
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OptionVatMode=GST due
 LinkColor=Colour of links
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/en_AU/modulebuilder.lang b/htdocs/langs/en_AU/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/en_AU/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/en_AU/products.lang b/htdocs/langs/en_AU/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/en_AU/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/en_AU/website.lang b/htdocs/langs/en_AU/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/en_AU/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/en_AU/withdrawals.lang b/htdocs/langs/en_AU/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/en_AU/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/en_CA/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index a5226efb4db..95bcbef4e06 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -1,9 +1,8 @@
 # Dolibarr language file - Source file is en_US - admin
-Module59000Desc=Module to follow margins
 LocalTax1Management=PST Management
 CompanyZip=Postal code
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 LDAPFieldZip=Postal code
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 FormatZip=Postal code
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_CA/modulebuilder.lang b/htdocs/langs/en_CA/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/en_CA/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/en_CA/products.lang b/htdocs/langs/en_CA/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/en_CA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/en_CA/website.lang b/htdocs/langs/en_CA/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/en_CA/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/en_CA/withdrawals.lang b/htdocs/langs/en_CA/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/en_CA/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index d759a22f0c6..cada7ac7c5b 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -49,7 +49,6 @@ VentilatedinAccount=Linked successfully to the financial account
 NotVentilatedinAccount=Not linked to the financial account
 XLineSuccessfullyBinded=%s products/services successfully linked to the finance account
 XLineFailedToBeBinded=%s products/services were not linked to any finance account
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin sorting the page "Links to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin sorting the page "Links done" by the most recent elements
 ACCOUNTING_LENGTH_GACCOUNT=Length of the General Ledger accounts (If you set value to 6 here, the account '706' will appear as '706000' on screen)
@@ -63,7 +62,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default services sales account (used if not defi
 LabelAccount=Account name
 LabelOperation=Account operation
 NumPiece=Item number
-AccountingCategory=Personalised groups
 AccountingAccountGroupsDesc=Here you can define some groups of financial accounts. They will be used for personalised accounting reports.
 ByPersonalizedAccountGroups=By personalised groups
 FeeAccountNotDefined=Account for fees not defined
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 6d8b2831bb3..43e80d62c89 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -31,8 +31,6 @@ ModuleFamilyTechnic=Multi-module tools
 NotExistsDirect=The alternative root directory is not defined in an existing directory.<br>
 InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, in a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines start with a "#", they are comments. To enable them, just remove the "#" character and save the file.
-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 to 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 is n characters<br><b>{cccc000}</b> the client code of n characters is followed by a counter dedicated per customer. This counter dedicated per customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type of 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>
 GenericMaskCodes4a=<u>Example of the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example of third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example of product created on 2007-03-01:</u><br>
@@ -42,11 +40,10 @@ ListOfDirectories=List of OpenDocument template directories
 ListOfDirectoriesForModelGenODT=List of directories containing template files in OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between each directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 FollowingSubstitutionKeysCanBeUsed=<br>To learn how to create your .odt document templates, before storing them in those directories, read wiki documentation:
 Module50200Name=PayPal
-Module59000Desc=Module to follow margins
 DictionaryAccountancyJournal=Finance journals
 CompanyZip=Postcode
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 LDAPFieldZip=Postcode
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 GenbarcodeLocation=Barcode generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 FormatZip=Postcode
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
index edab2e8bb42..9d5c847a07e 100644
--- a/htdocs/langs/en_GB/bills.lang
+++ b/htdocs/langs/en_GB/bills.lang
@@ -27,5 +27,3 @@ ChequesArea=Cheque deposits area
 ChequeDeposits=Cheque deposits
 Cheques=Cheques
 NbCheque=Number of cheques
-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
-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
diff --git a/htdocs/langs/en_GB/modulebuilder.lang b/htdocs/langs/en_GB/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/en_GB/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/en_GB/orders.lang b/htdocs/langs/en_GB/orders.lang
index c667519bb39..da80d5089a3 100644
--- a/htdocs/langs/en_GB/orders.lang
+++ b/htdocs/langs/en_GB/orders.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
 StatusOrderCanceledShort=Cancelled
 StatusOrderCanceled=Cancelled
-PDFEinsteinDescription=A complete order model
 StatusSupplierOrderCanceledShort=Cancelled
 StatusSupplierOrderCanceled=Cancelled
diff --git a/htdocs/langs/en_GB/products.lang b/htdocs/langs/en_GB/products.lang
index 757f0c2e880..e707e316257 100644
--- a/htdocs/langs/en_GB/products.lang
+++ b/htdocs/langs/en_GB/products.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
 PrintsheetForOneBarCode=Print several labels for one barcode
diff --git a/htdocs/langs/en_GB/website.lang b/htdocs/langs/en_GB/website.lang
index ef8e16da6ad..2119639ab04 100644
--- a/htdocs/langs/en_GB/website.lang
+++ b/htdocs/langs/en_GB/website.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - website
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge an SEO URL when the website is run from a Virtual host of a Web server (like Apache, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang
index 3ec4f7ab0ec..b1d58194878 100644
--- a/htdocs/langs/en_GB/withdrawals.lang
+++ b/htdocs/langs/en_GB/withdrawals.lang
@@ -13,5 +13,4 @@ WithdrawalFileNotCapable=Unable to generate Payment receipt file for your countr
 WithdrawRequestAmount=The amount of Direct Debit request:
 WithdrawRequestErrorNilAmount=Unable to create a Direct Debit request for an empty amount.
 SEPALegalText=By signing this mandate form, you authorise (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-ICS=Creditor Identifier CI for direct debit
 InfoRejectMessage=Hello,<br><br>the direct debit payment order for invoice %s related to the company %s, for an amount of %s has been refused by the bank.<br><br>--<br>%s
diff --git a/htdocs/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/en_IN/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index cf746fd99b8..cc547cb0f77 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 Module20Name=Quotations
 Module20Desc=Management of quotations
-Module59000Desc=Module to follow margins
 Permission21=Read quotations
 Permission22=Create/modify quotations
 Permission24=Validate quotations
@@ -9,12 +8,12 @@ Permission25=Send quotations
 Permission26=Close quotations
 Permission27=Delete quotations
 Permission28=Export quotations
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 PropalSetup=Quotation module setup
 ProposalsNumberingModules=Quotation numbering models
 ProposalsPDFModules=Quotation documents models
 FreeLegalTextOnProposal=Free text on quotations
 WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 MailToSendProposal=Customer quotations
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_IN/modulebuilder.lang b/htdocs/langs/en_IN/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/en_IN/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/en_IN/products.lang b/htdocs/langs/en_IN/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/en_IN/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/en_IN/website.lang b/htdocs/langs/en_IN/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/en_IN/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/en_IN/withdrawals.lang b/htdocs/langs/en_IN/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/en_IN/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/en_SG/accountancy.lang b/htdocs/langs/en_SG/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/en_SG/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_SG/admin.lang b/htdocs/langs/en_SG/admin.lang
index b68a0680537..619ae5f8bd4 100644
--- a/htdocs/langs/en_SG/admin.lang
+++ b/htdocs/langs/en_SG/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_SG/modulebuilder.lang b/htdocs/langs/en_SG/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/en_SG/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/en_SG/products.lang b/htdocs/langs/en_SG/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/en_SG/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/en_SG/website.lang b/htdocs/langs/en_SG/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/en_SG/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/en_SG/withdrawals.lang b/htdocs/langs/en_SG/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/en_SG/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
index ab876d97846..96c58aaf400 100644
--- a/htdocs/langs/es_AR/accountancy.lang
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -16,4 +16,3 @@ Journals=Diarios Contables
 JournalFinancial=Diarios Financieros
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de la factura
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 38c1f9272dd..f71ac440e90 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -260,7 +260,6 @@ Module80Name=Envíos
 Module80Desc=Gestión de envíos y remitos
 Module510Name=Sueldos
 Module4000Name=ARH
-Module59000Desc=Module to follow margins
 Module62000Name=Incotérminos
 Permission23001=Leer tarea programada
 Permission23002=Crear/actualizar tarea programada
@@ -325,6 +324,7 @@ MaxSizeList=Longitud máxima para la lista
 DefaultMaxSizeList=Longitud máxima predeterminada para listas
 CompanyInfo=Empresa / Organización
 CompanyAddress=DIrección
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 DelaysOfToleranceBeforeWarning=Retardo antes de mostrar una alerta de advertencia por:
 MiscellaneousDesc=Todos los demás parámetros relacionados con la seguridad se definen aquí.
 LimitsSetup=Límites / configuración de precisión
@@ -352,7 +352,6 @@ RunningUpdateProcessMayBeRequired=Parece que es necesario ejecutar el proceso de
 YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comandos después de iniciar sesión en un shell con el usuario <b> %s </b> o debe agregar la opción -W al final de la línea de comandos para proporcionar la contraseña de <b> %s </b>.
 YourPHPDoesNotHaveSSLSupport=Funciones SSL no disponibles en tu PHP
 DownloadMoreSkins=Más skins para descargar
-SimpleNumRefModelDesc=Devuelve el número de referencia con el formato %syymm-nnnn donde yy es año, mm es mes y nnnn es secuencial sin reinicio
 ShowProfIdInAddress=Mostrar identificación profesional con direcciones
 ShowVATIntaInAddress=Ocultar número de IVA intracomunitario con direcciones
 MeteoStdMod=Modo estandar
@@ -363,7 +362,6 @@ ExternalAccess=Acceso externo / internet
 MAIN_PROXY_USE=Use un servidor proxy (de lo contrario el acceso es directo a internet)
 MAIN_PROXY_HOST=Servidor proxy: Nombre / Dirección
 MAIN_PROXY_USER=Servidor proxy: Login / Usuario
-DefineHereComplementaryAttributes=Defina aquí cualquier atributo adicional / personalizado que desee incluir para: %s
 ExtraFields=Atributos complementarios
 ExtraFieldsLines=Atributos complementarios (líneas)
 ExtraFieldsLinesRec=Atributos complementarios (plantillas facturas líneas)
@@ -524,7 +522,6 @@ LDAPContactObjectClassListExample=Lista de atributos de registro que definen obj
 LDAPFieldZip=Cremallera
 LDAPFieldCompany=Compañía
 ViewProductDescInFormAbility=Mostrar descripción de productos en formularios (de otro forma es mostrado en una venta emergente tooltip popup)
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 Target=Destino
 Sell=Vender
 PositionIntoComboList=Posición de la línea en las listas de combo
@@ -588,7 +585,6 @@ WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas
 WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor de ese módulo y que está seguro de que este módulo no afecta negativamente el comportamiento de su aplicación y cumple con las leyes de su país (%s). Si el módulo introduce una característica ilegal, usted se hace responsable del uso de software ilegal.
 NothingToSetup=No se requiere ninguna configuración específica para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Establézcalo en sí si este grupo es un cálculo de otros grupos
-EnterCalculationRuleIfPreviousFieldIsYes=Introduzca la regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, 'CODEGRP1 + CODEGRP2')
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtro de expresiones regulares para limpiar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
 GDPRContact=Oficial de protección de datos (DPO, privacidad de datos o contacto GDPR)
 GDPRContactDesc=Si almacena datos sobre empresas / ciudadanos europeos, puede nombrar al contacto que es responsable del Reglamento general de protección de datos aquí
@@ -597,7 +593,6 @@ HelpOnTooltipDesc=Coloque texto o una clave de traducción aquí para que el tex
 YouCanDeleteFileOnServerWith=Puede eliminar este archivo en el servidor con la línea de comandos: <br> %s
 ChartLoaded=Plan de cuenta cargado
 VATIsUsedIsOff=Nota: La opción de usar el impuesto sobre las ventas o el IVA se ha establecido en <strong> Desactivado </strong> en el menú %s - %s, por lo que el impuesto sobre las ventas o IVA utilizado siempre será 0 para las ventas.
-FeatureSupportedOnTextFieldsOnly=Advertencia, función compatible solo en los campos de texto. También se debe establecer un parámetro de URL action = create o action = edit O el nombre de la página debe terminar con 'new.php' para activar esta función.
 EmailCollector=Recolector de correo electronico
 EmailCollectorDescription=Agregue un trabajo programado y una página de configuración para escanear los buzones de correo electrónico con regularidad (usando el protocolo IMAP) y registre los correos electrónicos recibidos en su aplicación, en el lugar correcto y / o cree algunos registros automáticamente (como clientes potenciales).
 NewEmailCollector=Nuevo recolector de email
diff --git a/htdocs/langs/es_AR/bills.lang b/htdocs/langs/es_AR/bills.lang
index 986251b025b..878144139a3 100644
--- a/htdocs/langs/es_AR/bills.lang
+++ b/htdocs/langs/es_AR/bills.lang
@@ -13,7 +13,9 @@ InvoiceCustomer=Factura de Cliente
 CustomerInvoice=Factura de Cliente
 CustomersInvoices=Facturas de clientes
 SupplierInvoice=Factura de Proveedor
+SuppliersInvoices=Facturas de proveedores
 SupplierBill=Factura de Proveedor
+SupplierBills=Facturas de proveedores
 PaymentAmount=Monto pagado
 BillStatusDraft=Borrador (necesita ser validado)
 BillStatusPaid=Pagado
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
index 3dd71f9bcdc..675b49930b1 100644
--- a/htdocs/langs/es_AR/companies.lang
+++ b/htdocs/langs/es_AR/companies.lang
@@ -257,7 +257,6 @@ CurrentOutstandingBill=Factura pendiente actual
 OutstandingBill=Max. por factura pendiente
 OutstandingBillReached=Max. alcanzado por factura pendiente
 OrderMinAmount=Monto mínimo por orden
-MonkeyNumRefModelDesc=Devuelve un número con el formato %syymm-nnnn para el código del cliente y %syymm-nnnn para el código del proveedor donde yy es el año, mm es el mes y nnnn es una secuencia sin interrupción ni retorno a 0.
 LeopardNumRefModelDesc=El código es gratis. Este código puede modificarse en cualquier momento.
 ManagingDirectors=Nombre(s) del gerente (CEO, director, presidente...)
 MergeOriginThirdparty=Duplicar el tercero (tercero que quieres eliminar)
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index 06f7b03da61..c34ffb3f0d7 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -134,7 +134,6 @@ Hide=Esconder
 ShowCardHere=Mostrar tarjeta
 SearchOf=Buscar
 Valid=Valida
-ReOpen=Re-abrir
 Upload=Cargar
 ResizeOrCrop=Redimensionar o Recortar
 Recenter=Recentrar
@@ -196,7 +195,6 @@ UnitPriceHT=Precio unitario (neto)
 UnitPriceHTCurrency=Precio unitario (neto) (moneda)
 UnitPriceTTC=Precio unitario
 PriceUHT=P.U. (neto)
-PriceUHTCurrency=P.U. (moneda)
 PriceUTTC=P.U. (con imp.)
 Amount=Monto
 AmountInvoice=Monto de factura
@@ -410,7 +408,6 @@ YouCanSetDefaultValueInModuleSetup=Ud. puede establecer el valor predeterminado
 Documents=Archivos enlazados
 UploadDisabled=Carga deshabilitada
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú inicio-configuración-seguridad):\n%s KB, Límite PHP: %s Kb
-NoFileFound=Ningún documento guardado en esta carpeta
 CurrentMenuManager=Administrador de menú actual
 Layout=Diseño
 DisabledModules=Deshabilitar módulos
@@ -513,8 +510,6 @@ Miscellaneous=Miscelanias
 GroupBy=Agrupar por...
 RemoveString=Quitar cadena '%s'
 SomeTranslationAreUncomplete=Alguno de los idiomas ofertados pueden estar traducidos parcialmente o pueden contener errores. Por favor ayude a corregir su idioma registrándose en  <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> para agregar sus mejoras.
-DirectDownloadLink=Enlace de descarga directa (público/externo)
-DirectDownloadInternalLink=Enlace de descarga directa (necesita estar logeado y tener permisos)
 DownloadDocument=Descargar documento
 ActualizeCurrency=Actualizar tipo de cambio
 ModuleBuilder=Constructor de Módulos y Aplicaciones
@@ -565,7 +560,6 @@ LocalAndRemote=Local y Remoto
 KeyboardShortcut=Acceso directo de teclado
 AssignedTo=Asignado a
 ConfirmMassDraftDeletion=Confirmar eliminación borradores en masa
-FileSharedViaALink=Archivo compartido vía enlace
 SelectAThirdPartyFirst=Elegir primero una tercera persona...
 YouAreCurrentlyInSandboxMode=Ud. esta en este momento en el modo %s "sandbox"
 ShowMoreInfos=Mostrar Más Info
diff --git a/htdocs/langs/es_AR/margins.lang b/htdocs/langs/es_AR/margins.lang
index 27e9744383d..ced39b02d42 100644
--- a/htdocs/langs/es_AR/margins.lang
+++ b/htdocs/langs/es_AR/margins.lang
@@ -15,7 +15,6 @@ UserMargins=Márgenes de usuario
 AllProducts=Todos los productos y servicios.
 ChooseProduct/Service=Elige producto o servicio
 ForceBuyingPriceIfNull=Forzar el costo al precio de venta si no está definido
-ForceBuyingPriceIfNullDetails=Si el costo no está definido, y esta opción está "ACTIVADA", el margen será cero en cada línea (costo = precio de venta), de lo contrario ("DESACTIVADO"), el margen será igual al valor sugerido por defecto.
 MARGIN_METHODE_FOR_DISCOUNT=Método de margen para descuentos globales
 UseDiscountOnTotal=En subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define si un descuento global se debe tratar como un producto, un servicio o solo como un subtotal para el cálculo del margen.
diff --git a/htdocs/langs/es_AR/modulebuilder.lang b/htdocs/langs/es_AR/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_AR/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_AR/orders.lang b/htdocs/langs/es_AR/orders.lang
index ab79a9a5857..dbee6561f56 100644
--- a/htdocs/langs/es_AR/orders.lang
+++ b/htdocs/langs/es_AR/orders.lang
@@ -5,6 +5,8 @@ Orders=Órdenes
 OrderDateShort=Fecha de la Orden
 OrderToProcess=Orden a procesar
 NewOrder=Nueva Orden
+NewOrderSupplier=Nueva Orden de Compra
+SupplierOrder=Orden de compra
 SuppliersOrders=Ordenes de compra
 CustomerOrder=Ordenes de venta
 StatusOrderCanceledShort=Cancelado
diff --git a/htdocs/langs/es_AR/productbatch.lang b/htdocs/langs/es_AR/productbatch.lang
index 88c6543e9e2..fa4604d5fb1 100644
--- a/htdocs/langs/es_AR/productbatch.lang
+++ b/htdocs/langs/es_AR/productbatch.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - productbatch
 ManageLotSerial=Usar lote / número de serie
-ProductStatusOnBatch=Sí (se requiere lote / serie)
 ProductStatusNotOnBatch=No (lote / serie no utilizado)
 Batch=Lote / Serie
 atleast1batchfield=Fecha de consumición o Fecha de venta o Número de lote / serie
diff --git a/htdocs/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
index 32aef2d5d67..a429996096a 100644
--- a/htdocs/langs/es_AR/products.lang
+++ b/htdocs/langs/es_AR/products.lang
@@ -63,7 +63,6 @@ PriceRemoved=Precio removido
 SetDefaultBarcodeType=Definir tipo de código de barras
 NoteNotVisibleOnBill=Nota (No visible en facturas, presupuestos...)
 ServiceLimitedDuration=Si un producto es un servicio con duración limitada:
-AssociatedProductsAbility=Enable Kits (set of several products)
 KeywordFilter=Filtro por Palabra Clave
 CategoryFilter=Filtro por Categoría
 ExportDataset_produit_1=Productos
diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang
index c291bc59434..073b81ff3d1 100644
--- a/htdocs/langs/es_AR/stocks.lang
+++ b/htdocs/langs/es_AR/stocks.lang
@@ -1,7 +1,9 @@
 # Dolibarr language file - Source file is en_US - stocks
+Location=Ubicaciòn
 inventoryEdit=Editar
 inventoryDraft=Activos
 SelectCategory=Filtro por Categoría
 AddProduct=Agregar
 inventoryDeleteLine=Eliminar línea
 ListInventory=Lista
+ReOpen=Reabierto
diff --git a/htdocs/langs/es_AR/suppliers.lang b/htdocs/langs/es_AR/suppliers.lang
index e6c3154b840..48f940c23f7 100644
--- a/htdocs/langs/es_AR/suppliers.lang
+++ b/htdocs/langs/es_AR/suppliers.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - suppliers
 SuppliersInvoice=Factura de Proveedor
+SupplierInvoices=Facturas de proveedores
 ShowSupplierInvoice=Mostrar Factura de Proveedor
 ListOfSuppliers=Lista de proveedores
 ShowSupplier=Mostrar Proveedor
diff --git a/htdocs/langs/es_AR/website.lang b/htdocs/langs/es_AR/website.lang
index ff1df53c2d8..eaf6e953faa 100644
--- a/htdocs/langs/es_AR/website.lang
+++ b/htdocs/langs/es_AR/website.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - website
 ReadPerm=Leído
 WebsiteAccounts=Cuentas de sitio web
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang
index 5e623914282..dfd195fbf17 100644
--- a/htdocs/langs/es_AR/withdrawals.lang
+++ b/htdocs/langs/es_AR/withdrawals.lang
@@ -76,7 +76,6 @@ PleaseCheckOne=Por favor marque uno sólo
 DirectDebitOrderCreated=Orden de débito automático %s creada
 AmountRequested=Monto solicitada
 CreateForSepa=Crear archivo de débito automático
-ICS=Creditor Identifier CI for direct debit
 END_TO_END=Etiqueta "EndToEndId" SEPA XML: identificación única asignada por transacción
 USTRD=Etiqueta "Unstructured" SEPA XML
 ADDDAYS=Agregar días a la fecha de ejecución
diff --git a/htdocs/langs/es_AR/zapier.lang b/htdocs/langs/es_AR/zapier.lang
index 86ef12c8559..254f8e2651e 100644
--- a/htdocs/langs/es_AR/zapier.lang
+++ b/htdocs/langs/es_AR/zapier.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - zapier
 ModuleZapierForDolibarrDesc =Módulo Zapier para Dolibarr
-ZapierForDolibarrSetup =Configurar Zapier para Dolibarr
+ZapierForDolibarrSetup=Configurar Zapier para Dolibarr
diff --git a/htdocs/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/es_BO/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index b68a0680537..619ae5f8bd4 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_BO/modulebuilder.lang b/htdocs/langs/es_BO/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_BO/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_BO/products.lang b/htdocs/langs/es_BO/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/es_BO/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_BO/website.lang b/htdocs/langs/es_BO/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/es_BO/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_BO/withdrawals.lang b/htdocs/langs/es_BO/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/es_BO/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index cdb95b2da16..f6e63f0bef1 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -92,7 +92,6 @@ VentilatedinAccount=Vinculado exitosamente a la cuenta de contabilidad
 NotVentilatedinAccount=No vinculado a la cuenta de contabilidad
 XLineSuccessfullyBinded=%s productos / servicios vinculados con éxito a una cuenta de contabilidad
 XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna cuenta de contabilidad
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la clasificación de la página "Encuadernación para hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la clasificación de la página "Encuadernación realizada" por los elementos más recientes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar descripción de productos y servicios en listados después de x caracteres (Mejor = 50)
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 4c3bf933e4f..3c5a1423a66 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -27,9 +27,12 @@ UnlockNewSessions=Eliminar bloqueo de conexión
 YourSession=Tu sesión
 Sessions=Sesiones de Usuarios
 WebUserGroup=Usuario / grupo del servidor web
+PermissionsOnFilesInWebRoot=Permisos sobre archivos en el directorio raíz web
+PermissionsOnFile=Permisos en el archivo %s
 NoSessionFound=Su configuración de PHP parece no permitir el listado de sesiones activas. El directorio utilizado para guardar sesiones ( <b>%s</b> ) puede estar protegido (por ejemplo, por permisos del sistema operativo o por la directiva PHP open_basedir).
 DBStoringCharset=Juego de caracteres de base de datos para almacenar datos
 DBSortingCharset=Juego de caracteres de base de datos para ordenar los datos
+HostCharset=Juego de caracteres de host
 WarningModuleNotActive=El módulo <b>%s</b> debe estar habilitado.
 WarningOnlyPermissionOfActivatedModules=Aquí solo se muestran los permisos relacionados con los módulos activados. Puede activar otros módulos en la página Inicio-> Configuración-> Módulos.
 DolibarrSetup=Instalación o actualización de Dolibarr
@@ -52,6 +55,7 @@ DisableJavascriptNote=Nota: Para propósitos de prueba o depuración. Para la op
 UseSearchToSelectCompanyTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad estableciendo constante COMPANY_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará al inicio de la cadena.
 UseSearchToSelectContactTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad estableciendo CONTACT_DONOTSEARCH_ANYWHERE constante en 1 en Configuración-> Otro. La búsqueda se limitará al inicio de la cadena.
 DelaiedFullListToSelectCompany=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de Terceros. <br> Esto puede aumentar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
+DelaiedFullListToSelectContact=Espere hasta que se presione una tecla antes de cargar el contenido de la lista combinada de contactos. <br> Esto puede aumentar el rendimiento si tiene una gran cantidad de contactos, pero es menos conveniente.
 NumberOfKeyToSearch=Número de caracteres para activar la búsqueda: %s
 NumberOfBytes=Número de bytes
 SearchString=Cadena de búsqueda
@@ -68,11 +72,14 @@ NextValueForInvoices=Siguiente valor (facturas)
 NextValueForCreditNotes=Siguiente valor (notas de crédito)
 NextValueForDeposit=Siguiente valor (pago inicial)
 NextValueForReplacements=Siguiente valor (reemplazos)
+MustBeLowerThanPHPLimit=Nota: su configuración de PHP actualmente limita el máximo para cargar a <b> %s </b> %s, independientemente del valor de este parámetro
 NoMaxSizeByPHPLimit=Nota: no hay límite establecido en su configuración de PHP
 MaxSizeForUploadedFiles=Tamaño máximo para los archivos cargados (0 para no permitir ninguna carga)
 UseCaptchaCode=Use el código gráfico (CAPTCHA) en la página de inicio de sesión
 AntiVirusCommand=Ruta completa al comando de antivirus
+AntiVirusCommandExample=Ejemplo de ClamAv Daemon (requiere clamav-daemon): / usr / bin / clamdscan <br> Ejemplo de ClamWin (muy, muy lento): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam=Más parámetros en la línea de comando
+AntiVirusParamExample=Ejemplo de ClamAv Daemon: --fdpass <br> Ejemplo de ClamWin: --database = "C: \\ Archivos de programa (x86) \\ ClamWin \\ lib"
 ComptaSetup=Configuración del módulo de contabilidad
 UserSetup=Configuración de administración de usuario
 MultiCurrencySetup=Configuración multimoneda
@@ -127,6 +134,7 @@ ImportPostgreSqlDesc=Para importar un archivo de copia de seguridad, debe usar e
 FileNameToGenerate=Nombre de archivo para copia de seguridad:
 CommandsToDisableForeignKeysForImport=Comando para desactivar claves externas en la importación
 CommandsToDisableForeignKeysForImportWarning=Obligatorio si desea poder restaurar su volcado sql más tarde
+ExportUseMySQLQuickParameter=Utilice el parámetro --quick
 MySqlExportParameters=Parámetros de exportación de MySQL
 PostgreSqlExportParameters=Parámetros de exportación de PostgreSQL
 UseTransactionnalMode=Usa el modo transaccional
@@ -144,18 +152,23 @@ FeatureDisabledInDemo=Característica deshabilitada en demostración
 FeatureAvailableOnlyOnStable=Característica solo disponible en versiones estables oficiales
 BoxesDesc=Los widgets son componentes que muestran información que puede agregar para personalizar algunas páginas. Puede elegir entre mostrar el widget o no seleccionando la página de destino y haciendo clic en &#39;Activar&#39;, o haciendo clic en la papelera para deshabilitarla.
 OnlyActiveElementsAreShown=Solo se muestran los elementos de los <a href="%s"> módulos habilitados </a>.
+ModulesDesc=Los módulos / aplicaciones determinan qué funciones están disponibles en el software. Algunos módulos requieren que se otorguen permisos a los usuarios después de activar el módulo. Haga clic en el botón de encendido / apagado <span class="small valignmiddle"> %s </span> de cada módulo para habilitar o deshabilitar un módulo / aplicación.
 ModulesDeployDesc=Si los permisos en su sistema de archivos lo permiten, puede utilizar esta herramienta para implementar un módulo externo. El módulo será visible en la pestaña <strong>%s</strong> .
 ModulesMarketPlaces=Buscar aplicaciones / módulos externos
 ModulesDevelopYourModule=Desarrolla tu propia aplicación / módulos
 ModulesDevelopDesc=También puede desarrollar su propio módulo o encontrar un socio para desarrollar uno para usted.
 DOLISTOREdescriptionLong=En lugar de <a href="https://www.dolistore.com">activar</a> el sitio web <a href="https://www.dolistore.com">www.dolistore.com</a> para encontrar un módulo externo, puede utilizar esta herramienta integrada que realizará la búsqueda en el mercado externo para usted (puede ser lento, necesita un acceso a Internet) ...
+NewModule=Nuevo modulo
 NotCompatible=Este módulo no parece compatible con su Dolibarr %s (Min. %s - Max. %s).
 CompatibleAfterUpdate=Este módulo requiere una actualización de su Dolibarr %s (Min. %s - Max. %s).
 SeeInMarkerPlace=Ver en Market place
+SeeSetupOfModule=Ver configuración del módulo %s
 AchatTelechargement=Compra / Descarga
 GoModuleSetupArea=Para implementar / instalar un nuevo módulo, vaya al área de configuración del módulo: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, el mercado oficial para los módulos externos Dolibarr ERP / CRM
+DoliPartnersDesc=Lista de empresas que ofrecen funciones o módulos desarrollados a medida. <br> Nota: dado que Dolibarr es una aplicación de código abierto, <i> cualquier persona </i> con experiencia en programación PHP debería poder desarrollar un módulo.
 WebSiteDesc=Sitios web externos para más módulos complementarios (no principales) ...
+RelativeURL=URL relativa
 BoxesAvailable=Widgets disponibles
 BoxesActivated=Widgets activados
 ActiveOn=Activado en
@@ -184,6 +197,7 @@ SpaceX=Espacio X
 SpaceY=Espacio Y
 Emails=Correos electrónicos
 EMailsSetup=Configuración de correos electrónicos
+EMailsDesc=Esta página le permite establecer parámetros u opciones para el envío de correo electrónico.
 EmailSenderProfiles=Perfiles de remitentes de correos electrónicos
 EMailsSenderProfileDesc=Puedes mantener esta sección vacía. Si ingresa algunos correos electrónicos aquí, se agregarán a la lista de posibles remitentes en el cuadro combinado cuando escriba un nuevo correo electrónico.
 MAIN_MAIL_SMTP_PORT=Puerto SMTP / SMTPS (valor predeterminado en php.ini: <b>%s</b> )
@@ -201,6 +215,7 @@ MAIN_MAIL_SMTPS_ID=ID de SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_EMAIL_TLS=Utilizar cifrado TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Usar cifrado TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizar les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Usa DKIM para generar firma de correo electrónico
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Dominio de correo electrónico para usar con dkim
 MAIN_DISABLE_ALL_SMS=Deshabilitar todo el envío de SMS (para propósitos de prueba o demostraciones)
@@ -211,6 +226,7 @@ UserEmail=Correo electrónico del usuario
 CompanyEmail=Email de la empresa
 FeatureNotAvailableOnLinux=Característica no disponible en sistemas como Unix. Pruebe su programa sendmail localmente.
 SubmitTranslation=Si la traducción de este idioma no está completa o si encuentra errores, puede corregirlos editando los archivos en el directorio <b>langs / %s</b> y envíe su cambio a www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Si la traducción para este idioma no está completa o encuentra errores, puede corregir esto editando los archivos en el directorio <b> langs / %s </b> y envíe los archivos modificados en dolibarr.org/forum o, si es un desarrollador, con un PR en github .com / Dolibarr / dolibarr
 ModulesSetup=Módulos / configuración de la aplicación
 ModuleFamilyCrm=Gestión de la relación con el cliente (CRM)
 ModuleFamilySrm=Gestión de relaciones con proveedores (VRM)
@@ -236,9 +252,9 @@ CallUpdatePage=Vaya a la página que actualiza la estructura de la base de datos
 LastActivationIP=Última activación IP
 UpdateServerOffline=Servidor de actualización fuera de línea
 WithCounter=Administrar un contador
-GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, se podrían usar las siguientes etiquetas:<br><b> {000000}</b> corresponde a un número que se incrementará en cada %s. Ingrese tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara. <br><b>{000000+000}</b> igual que el anterior, pero se aplica un desplazamiento correspondiente al número a la derecha del signo + a partir del primer %s. <br> <b> {000000@x}</b> igual que el anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definidos en su configuración, o 99 para restablecer a cero cada mes). Si se usa esta opción y x es 2 o mayor, también se requiere la secuencia {aa} {mm} o {aaaa} {mm}. <br><b>{dd}</b> día (01 a 31).<br><b> {mm}</b> mes (01 a 12). <br> <b>{yy}</b>, <b> {aaaa}</b> o <b>{y}</b> años en 2, 4 o 1 números.<br>
-GenericMaskCodes2=<b>{cccc}</b> el código del cliente en n caracteres <br><b>{cccc000}</b> el código del cliente en n caracteres va seguido de un contador dedicado para el cliente. Este contador dedicado al cliente se restablece al mismo tiempo que el contador global. <br><b>{tttt}</b> El código de tipo de tercero en n caracteres (consulte el menú Inicio - Configuración - Diccionario - Tipos de terceros) . Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero.<br>
+GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, se pueden utilizar las siguientes etiquetas: <br> <b>{000000}</b> corresponde a un número que se incrementará en cada %s. Ingrese tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara. <br> <b>{000000+000}</b> igual que el anterior pero se aplica un desplazamiento correspondiente al número a la derecha del signo + comenzando en el primer %s. <br> <b>{000000 @ x}</b> igual que el anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definido en su configuración, o 99 para poner a cero todos los meses). Si se usa esta opción y x es 2 o superior, entonces también se requiere la secuencia {yy} {mm} o {yyyy} {mm}. <br> <b> {dd} </b> día (01 a 31). <br> <b> {mm} </b> mes (01 a 12). <br> <b> {yy} </b>, <b>{yyyy}</b> o <b> {y} a09a4b0739 números de año más de .f8 <br>
 GenericMaskCodes3=Todos los demás personajes de la máscara permanecerán intactos. <br> No se permiten espacios. <br>
+GenericMaskCodes3EAN=Todos los demás caracteres de la máscara permanecerán intactos (excepto * o? En la 13ª posición en EAN13). <br> No se permiten espacios. <br> En EAN13, el último carácter después del último} en la posición 13 debe ser * o? . Será reemplazado por la clave calculada. <br>
 GenericMaskCodes4a=<u>Ejemplo en el 99º %s del tercero TheCompany, con fecha 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Ejemplo de un tercero creado en 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Ejemplo de producto creado el 2007-03-01:</u><br>
@@ -265,6 +281,7 @@ ExamplesWithCurrentSetup=Ejemplos con la configuración actual.
 ListOfDirectories=Lista de directorios de plantillas de OpenDocument
 ListOfDirectoriesForModelGenODT=Lista de directorios que contienen archivos de plantillas con formato OpenDocument.<br><br>Ponga aquí la ruta completa de directorios.<br>Agregue un retorno de carro entre cada directorio.<br>Para agregar un directorio del módulo GED, agregue aquí <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>. <br><br>Los archivos en esos directorios deben terminar con <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Número de archivos de plantilla ODT / ODS encontrados en estos directorios
+ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Para saber cómo crear sus plantillas de documento Odt, antes de almacenarlas en esos directorios, lea la documentación wiki:
 FirstnameNamePosition=Posición del nombre / apellido
 DescWeather=Las siguientes imágenes se mostrarán en el tablero cuando el número de acciones tardías alcance los siguientes valores:
@@ -278,8 +295,11 @@ SmsTestMessage=Mensaje de prueba de __PHONEFROM__ a __PHONETO__
 ModuleMustBeEnabledFirst=El módulo <b>%s</b> debe estar habilitado primero si necesitas esta característica.
 SecurityToken=Clave para asegurar URLs
 NoSmsEngine=No hay administrador de remitente de SMS disponible. Un administrador de remitentes de SMS no se instala con la distribución predeterminada porque dependen de un proveedor externo, pero puede encontrar algunos en %s
+PDFDesc=Opciones globales para la generación de PDF
+PDFAddressForging=Reglas para la sección de direcciones
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el Impuesto de Ventas / IVA
 PDFRulesForSalesTax=Reglas para el impuesto a las ventas / IVA
+HideLocalTaxOnPDF=Ocultar la tasa %s en la columna Impuesto sobre las ventas / IVA
 HideDescOnPDF=Ocultar descripción de productos
 HideRefOnPDF=Ocultar productos ref.
 HideDetailsOnPDF=Ocultar detalles de líneas de productos
@@ -289,11 +309,13 @@ UrlGenerationParameters=Parámetros para asegurar URLs
 SecurityTokenIsUnique=Use un parámetro de clave segura único para cada URL
 EnterRefToBuildUrl=Ingrese la referencia para el objeto %s
 GetSecuredUrl=Obtener URL calculado
+ButtonHideUnauthorized=Oculte los botones de acción no autorizados también para los usuarios internos (solo en gris de lo contrario)
 OldVATRates=Tasa de IVA anterior
 NewVATRates=Nueva tasa de IVA
 PriceBaseTypeToChange=Modificar en precios con el valor de referencia base definido en
 MassConvert=Lanzar la conversión a granel
 String=Cuerda
+String1Line=Cadena (1 línea)
 Int=Entero
 Float=Flotador
 Boolean=Boolean (una casilla de verificación)
@@ -305,12 +327,13 @@ ExtrafieldCheckBox=Casillas de verificación
 ExtrafieldCheckBoxFromList=Casillas de verificación de la mesa
 ExtrafieldLink=Enlace a un objeto
 ComputedFormula=Campo computado
+ComputedFormulaDesc=Puede ingresar aquí una fórmula usando otras propiedades del objeto o cualquier codificación PHP para obtener un valor calculado dinámico. Puede utilizar cualquier fórmula compatible con PHP, incluido el "?" operador de condición y el siguiente objeto global: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> ADVERTENCIA </strong>: Solo algunas propiedades de $ object pueden estar disponibles. Si necesita propiedades no cargadas, simplemente busque el objeto en su fórmula como en el segundo ejemplo. <br> El uso de un campo calculado significa que no puede ingresar ningún valor desde la interfaz. Además, si hay un error de sintaxis, es posible que la fórmula no devuelva nada. <br> <br> Ejemplo de fórmula: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2) ) <br> <br> Ejemplo para volver a cargar el objeto <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ obj-> id: (? $ obj-> id?) > rowid: $ objeto-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Otro ejemplo de fórmula para forzar la carga del objeto y su objeto principal: <br> (($ new reloadedobjb )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = new Project ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Proyecto principal no encontrado'
 Computedpersistent=Almacenar campo computado
 ExtrafieldParamHelpPassword=Si deja este campo en blanco, significa que este valor se almacenará sin cifrado (el campo solo debe estar oculto con una estrella en la pantalla). <br> Establezca &#39;auto&#39; para usar la regla de cifrado predeterminada para guardar la contraseña en la base de datos (entonces el valor leído será solo el hash, no hay manera de recuperar el valor original)
 ExtrafieldParamHelpselect=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser &#39;0&#39;) <br><br> por ejemplo: <br> 1, valor1 <br> 2, valor2 <br> código3, valor3 <br> ... <br><br> Para tener la lista dependiendo de otra lista de atributos complementarios: <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 dependiendo de otra lista: <br> 1, valor1 | <i>parent_list_code</i> : parent_key <br> 2, valor2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser &#39;0&#39;) <br><br> por ejemplo: <br> 1, valor1 <br> 2, valor2 <br> 3, valor3 <br> ...
 ExtrafieldParamHelpradio=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser &#39;0&#39;) <br><br> por ejemplo: <br> 1, valor1 <br> 2, valor2 <br> 3, valor3 <br> ...
-ExtrafieldParamHelpchkbxlst=La lista de valores proviene de una tabla. <br> Sintaxis: table_name: label_field: id_field :: filter <br> Ejemplo: c_typent: libelle: id :: filter <br><br> El filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar solo el valor activo <br> También puede usar $ ID $ en el filtro, que es la identificación actual del objeto actual <br> Para hacer un SELECCIONAR en filtro usa $ SEL $ <br> Si desea filtrar en campos adicionales use la sintaxis extra.fieldcode = ... (donde código de campo es el código de campo adicional) <br><br> Para tener la lista dependiendo de otra lista de atributos complementarios: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Para tener la lista dependiendo de otra lista: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
+ExtrafieldParamHelpsellist=La lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla: campo_etiqueta: campo_id .: filtrosql <br> Ejemplo: c_typent: libelle: id :: filtrosql <br> <br> - id2 campo_entrada de SQL es condición necesaria. Puede ser una prueba simple (por ejemplo, activo = 1) para mostrar solo el valor activo <br> También puede usar $ ID $ en el filtro, que es el ID actual del objeto actual <br> Para usar un SELECT en el filtro, use la palabra clave $ SEL $ para Bypass de protección antiinyección. <br> si desea filtrar en campos extra, use la sintaxis extra.fieldcode = ... (donde el código de campo es el código del campo extra) <br> <br> Para que la lista dependa de otra lista de atributos complementarios: <br> c_ty: opciones <i> parent_list_code </i> | parent_column: filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent: libf64c1e8 parent_column: <br>
 ExtrafieldParamHelpSeparator=Mantener vacío para un separador simple <br> Establezca esto en 1 para un separador de colapso (abierto de forma predeterminada para una nueva sesión, luego el estado se mantiene para cada sesión de usuario) <br> Establezca esto en 2 para un separador de colapso (colapsado por defecto para una nueva sesión, luego el estado se mantiene para cada sesión de usuario)
 LibraryToBuildPDF=Biblioteca utilizada para la generación de PDF
 LocalTaxDesc=Algunos países pueden aplicar dos o tres impuestos en cada línea de factura. Si este es el caso, elija el tipo para el segundo y tercer impuesto y su tasa. Los tipos posibles son: <br> 1: el impuesto local se aplica a los productos y servicios sin IVA (el impuesto local se calcula sobre el monto sin impuestos) <br> 2: el impuesto local se aplica a los productos y servicios, incluido el IVA <br> 3: el impuesto local se aplica a los productos sin IVA (el impuesto local se calcula sobre el monto sin impuestos) <br> 4: el impuesto local se aplica a los productos, incluido el IVA <br> 5: el impuesto local se aplica a los servicios sin IVA (el impuesto local se calcula sobre el monto sin impuestos) <br> 6: el impuesto local se aplica a los servicios, incluido el IVA (el impuesto local se calcula sobre el monto + impuesto)
@@ -438,10 +461,10 @@ Module2660Desc=Habilitar el cliente de servicios web de Dolibarr (puede usarse p
 Module2700Desc=Utilice el servicio Gravatar en línea (www.gravatar.com) para mostrar la foto de los usuarios / miembros (que se encuentra en sus correos electrónicos). Necesita acceso a internet
 Module2900Desc=Capacidades de conversiones GeoIP Maxmind
 Module3200Desc=Habilitar un registro inalterable de eventos empresariales. Los eventos se archivan en tiempo real. El registro es una tabla de solo lectura de eventos encadenados que se pueden exportar. Este módulo puede ser obligatorio para algunos países.
+Module3400Name=Redes Sociales
 Module4000Desc=Gestión de recursos humanos (gestión del departamento, contratos de empleados y sentimientos)
 Module5000Name=Multi-compañía
 Module5000Desc=Le permite administrar múltiples compañías
-Module6000Desc=Gestión de flujo de trabajo (creación automática de objeto y / o cambio de estado automático)
 Module20000Name=Gestión de solicitudes de licencia
 Module20000Desc=Definir y rastrear las solicitudes de permiso de los empleados.
 Module39000Desc=Lotes, números de serie, gestión de la fecha de caducidad de los productos.
@@ -455,7 +478,6 @@ Module50400Name=Contabilidad (doble entrada)
 Module54000Desc=Impresión directa (sin abrir los documentos) mediante la interfaz IPP de Cups (la impresora debe estar visible desde el servidor y CUPS debe estar instalada en el servidor).
 Module55000Name=Encuesta, encuesta o voto
 Module55000Desc=Cree encuestas en línea, encuestas o votos (como Doodle, Studs, RDVz, etc.)
-Module59000Desc=Module to follow margins
 Module60000Desc=Módulo para gestionar comisiones
 Module62000Desc=Añadir características para gestionar Incoterms.
 Module63000Desc=Gestionar recursos (impresoras, coches, salas, ...) para asignar a eventos.
@@ -559,7 +581,6 @@ Permission253=Crea / modifica otros usuarios, grupos y permisos.
 PermissionAdvanced253=Crear/modificar usuarios y permisos internos / externos
 Permission254=Crear/modificar solo usuarios externos
 Permission256=Eliminar o deshabilitar a otros usuarios
-Permission262=Extienda el acceso a todos los terceros (no solo a terceros para los cuales ese usuario es un representante de ventas). <br> No es efectivo para usuarios externos (siempre se limita a ellos mismos para propuestas, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asignaciones).
 Permission271=Lee CA
 Permission272=Leer facturas
 Permission273=Emitir facturas
@@ -782,7 +803,6 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Informe de gastos para aprobar
 SetupDescription1=Antes de comenzar a utilizar Dolibarr, se deben definir algunos parámetros iniciales y habilitar / configurar los módulos.
 SetupDescription2=Las siguientes dos secciones son obligatorias (las dos primeras entradas en el menú de configuración):
 SetupDescription5=Otras entradas del menú de configuración manejan parámetros opcionales.
-LogEvents=Eventos de auditoría de seguridad
 InfoDolibarr=Sobre Dolibarr
 InfoBrowser=Acerca del navegador
 InfoOS=Sobre OS
@@ -831,7 +851,6 @@ ForcedToByAModule=Esta regla es forzada a <b>%s</b> por un módulo activado
 RunningUpdateProcessMayBeRequired=Parece que se requiere ejecutar el proceso de actualización (la versión del programa %s difiere de la versión de la base de datos %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comando después de iniciar sesión en un shell con el usuario <b>%s</b> o debe agregar la opción -W al final de la línea de comandos para proporcionar una contraseña de <b>%s</b>.
 DownloadMoreSkins=Más pieles para descargar
-SimpleNumRefModelDesc=Devuelve el número de referencia con el formato %syymm-nnnn donde yy es año, mm es mes y nnnn es secuencial sin restablecimiento
 ShowProfIdInAddress=Mostrar identificación profesional con direcciones
 ShowVATIntaInAddress=Ocultar número de IVA intracomunitario con direcciones
 MeteoStdMod=Modo estandar
@@ -841,7 +860,6 @@ ExternalAccess=Acceso externo / internet
 MAIN_PROXY_USE=Utilice un servidor proxy (de lo contrario el acceso es directo a internet)
 MAIN_PROXY_HOST=Servidor proxy: Nombre / Dirección
 MAIN_PROXY_USER=Servidor proxy: Login / Usuario
-DefineHereComplementaryAttributes=Defina aquí cualquier atributo adicional / personalizado que desee incluir para: %s
 ExtraFields=Atributos complementarios
 ExtraFieldsLines=Atributos complementarios (líneas)
 ExtraFieldsLinesRec=Atributos complementarios (líneas plantillas de facturas)
@@ -1085,7 +1103,6 @@ ProductServiceSetup=Configuración de módulos de productos y servicios
 NumberOfProductShowInSelect=Número máximo de productos para mostrar en las listas de selección de combo (0 = sin límite)
 ViewProductDescInFormAbility=Mostrar descripciones de productos en formularios (de lo contrario, se muestra en una ventana emergente de información sobre herramientas)
 MergePropalProductCard=Activar en el producto / servicio pestaña Archivos adjuntos una opción para combinar el documento PDF del producto con la propuesta PDF azur si el producto / servicio figura en la propuesta
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Además, si tiene una gran cantidad de productos (&gt; 100 000), puede aumentar la velocidad configurando la constante PRODUCT_DONOTSEARCH_ANYWHERE en 1 en Configuración-&gt; Otros. La búsqueda se limitará entonces al inicio de la cadena.
 UseSearchToSelectProduct=Espere hasta que presione una tecla antes de cargar el contenido de la lista de combo de productos (esto puede aumentar el rendimiento si tiene una gran cantidad de productos, pero es menos conveniente)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras predeterminado para usar en productos
@@ -1280,7 +1297,6 @@ BackgroundTableLineOddColor=Color de fondo para las líneas de mesa impares
 BackgroundTableLineEvenColor=Color de fondo para líneas de mesas uniformes
 MinimumNoticePeriod=Periodo de preaviso mínimo (Su solicitud de ausencia debe hacerse antes de este retraso)
 NbAddedAutomatically=Cantidad de días añadidos a los contadores de usuarios (automáticamente) cada mes
-EnterAnyCode=Este campo contiene una referencia para identificar la línea. Ingrese cualquier valor de su elección, pero sin caracteres especiales.
 UnicodeCurrency=Ingrese aquí entre llaves, lista de bytes que representan el símbolo de moneda. Por ejemplo: para $, ingrese [36] - para brasil R $ [82,36] - para €, ingrese [8364]
 ColorFormat=El color RGB está en formato HEX, por ejemplo: FF0000
 PositionIntoComboList=Posición de la línea en listas combinadas
@@ -1342,7 +1358,6 @@ WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas
 WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor de ese módulo y que está seguro de que este módulo no afecta negativamente el comportamiento de su aplicación y cumple con las leyes de su país (%s). Si el módulo introduce una característica ilegal, usted se hace responsable del uso de software ilegal.
 NothingToSetup=No se requiere ninguna configuración específica para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto en sí si este grupo es un cálculo de otros grupos
-EnterCalculationRuleIfPreviousFieldIsYes=Ingrese la regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, &#39;CODEGRP1 + CODEGRP2&#39;)
 SeveralLangugeVariatFound=Varias variantes de lenguaje encontradas
 GDPRContact=Oficial de protección de datos (DPO, privacidad de datos o contacto GDPR)
 GDPRContactDesc=Si almacena datos sobre empresas / ciudadanos europeos, puede nombrar al contacto que es responsable del Reglamento general de protección de datos aquí
@@ -1353,7 +1368,6 @@ ChartLoaded=Plan de cuenta cargado
 EnableFeatureFor=Habilitar características para <strong>%s</strong>
 VATIsUsedIsOff=Nota: La opción de usar el impuesto sobre las ventas o el IVA se ha establecido en <strong>Desactivado</strong> en el menú %s - %s, por lo que el impuesto sobre las ventas o IVA utilizado siempre será 0 para las ventas.
 SwapSenderAndRecipientOnPDF=Intercambiar la posición de la dirección del remitente y el destinatario en documentos PDF
-FeatureSupportedOnTextFieldsOnly=Advertencia, función compatible solo en los campos de texto. También se debe establecer un parámetro de URL action = create o action = edit O el nombre de la página debe terminar con &#39;new.php&#39; para activar esta función.
 EmailCollector=Recolector de correo electronico
 EmailCollectorDescription=Agregue un trabajo programado y una página de configuración para escanear los buzones de correo electrónico con regularidad (utilizando el protocolo IMAP) y registre los correos electrónicos recibidos en su aplicación, en el lugar correcto y / o cree algunos registros automáticamente (como clientes potenciales).
 NewEmailCollector=Nuevo coleccionista de email
diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
index f32781fb498..86d0036c381 100644
--- a/htdocs/langs/es_CL/bills.lang
+++ b/htdocs/langs/es_CL/bills.lang
@@ -39,10 +39,11 @@ CardBill=Tarjeta de factura
 PredefinedInvoices=Facturas Predefinidas
 InvoiceCustomer=Factura del cliente
 CustomerInvoice=Factura del cliente
-CustomersInvoices=Facturas de clientes
+CustomersInvoices=Facturas de cliente
 SupplierInvoice=Factura del proveedor
+SuppliersInvoices=Facturas del vendedor
 SupplierBill=Factura del proveedor
-SupplierBills=facturas de proveedores
+SupplierBills=Facturas del vendedor
 paymentInInvoiceCurrency=en la moneda de las facturas
 DeletePayment=Eliminar pago
 ConfirmDeletePayment=¿Seguro que quieres eliminar este pago?
@@ -376,10 +377,7 @@ YouMustCreateInvoiceFromSupplierThird=Esta opción solo está disponible cuando
 YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y convertirla en "plantilla" para crear una nueva factura de plantilla
 PDFSpongeDescription=Factura PDF plantilla de esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Plantilla de factura en PDF Crevette. Una plantilla de factura completa para facturas de situación
-TerreNumRefModelDesc1=Número de devolución con formato %saaam-nnnn para facturas estándar y %saaam-nnnn para notas de crédito donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0
-MarsNumRefModelDesc1=Número de devolución con el formato %syymm-nnnn para facturas estándar, %syymm-nnnn para facturas de reposición, %syymm-nnnn para facturas de anticipo y %syymm-nnnn para las notas de crédito donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin volver a 0
 TerreNumRefModelError=Ya existe una factura que comienza con $ syymm y no es compatible con este modelo de secuencia. Quítelo o cambie el nombre para activar este módulo.
-CactusNumRefModelDesc1=Número de devolución con formato %saaam-nnnn para facturas estándar, %saaam-nnnn para notas de abono y %saaam-nnnn para facturas de abono en el que yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0
 TypeContact_facture_internal_SALESREPFOLL=Factura de cliente representativa de seguimiento
 TypeContact_facture_external_BILLING=Contacto cliente de facturación cotización
 TypeContact_facture_external_SHIPPING=Contacto de envío del cliente
@@ -415,7 +413,6 @@ ToCreateARecurringInvoiceGeneAuto=Si necesita que dichas facturas se generen aut
 DeleteRepeatableInvoice=Eliminar factura de plantilla
 ConfirmDeleteRepeatableInvoice=¿Estás seguro de que deseas eliminar la factura de la plantilla?
 CreateOneBillByThird=Cree una factura por un tercero (de lo contrario, una factura por pedido)
-BillCreated=%s factura (s) creada (s)
 AutoFillDateFrom=Establecer fecha de inicio para la línea de servicio con fecha de factura
 AutoFillDateFromShort=Establecer fecha de inicio
 AutoFillDateToShort=Establecer fecha de finalización
diff --git a/htdocs/langs/es_CL/categories.lang b/htdocs/langs/es_CL/categories.lang
index 8a54c49822d..1d59becb058 100644
--- a/htdocs/langs/es_CL/categories.lang
+++ b/htdocs/langs/es_CL/categories.lang
@@ -12,7 +12,6 @@ SuppliersCategoriesArea=Etiquetas de proveedores / área de categorías
 CustomersCategoriesArea=Etiquetas de clientes / área de categorías
 MembersCategoriesArea=Etiquetas de los miembros / área de categorías
 ContactsCategoriesArea=Etiquetas de contactos / categorías
-AccountsCategoriesArea=Etiquetas de cuentas / área de categorías
 ProjectsCategoriesArea=Área de etiquetas / categorías de proyectos
 UsersCategoriesArea=Etiquetas de usuarios / área de categorías
 CatList=Lista de etiquetas / categorías
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index 6b70cfe2d00..5971bf2928e 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -205,7 +205,6 @@ CurrentOutstandingBill=Factura pendiente actual
 OutstandingBill=Max. por factura pendiente
 OutstandingBillReached=Max. por la factura pendiente alcanzado
 OrderMinAmount=Monto mínimo para la orden
-MonkeyNumRefModelDesc=Devuelva un número con el formato %syymm-nnnn para el código del cliente y %syymm-nnnn para el código del proveedor donde yy es año, mm es mes y nnnn es una secuencia sin interrupción ni devolución a 0.
 LeopardNumRefModelDesc=El código es libre. Este código se puede modificar en cualquier momento.
 ManagingDirectors=Nombre del gerente (CEO, director, presidente ...)
 MergeOriginThirdparty=Tercero duplicado (tercero que desea eliminar)
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index 0f7a9f7764c..b2d4c4a2b91 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -110,9 +110,7 @@ NoWaitingChecks=No hay cheques pendientes de depósito.
 DateChequeReceived=Verificar fecha de recepción
 NbOfCheques=No. de cheques
 PaySocialContribution=Pagar un impuesto social / fiscal
-ConfirmPaySocialContribution=¿Estás seguro de que quieres clasificar este impuesto social o fiscal como pagado?
 DeleteSocialContribution=Eliminar un pago de impuestos sociales o fiscales
-ConfirmDeleteSocialContribution=¿Estás seguro de que deseas eliminar este pago de impuestos sociales/fiscales?
 ExportDataset_tax_1=Impuestos y pagos sociales y fiscales
 CalcModeVATDebt=Modo <b>%sIVA sobre compromisos contables%s</b>.
 CalcModeVATEngagement=Modo <b>%s IVA en ingresos-gastos%s</b>.
@@ -178,7 +176,6 @@ Pcg_subtype=Subtipo Pcg
 InvoiceLinesToDispatch=Líneas de factura para enviar
 ByProductsAndServices=Por producto y servicio
 RefExt=Ref externo
-ToCreateAPredefinedInvoice=Para crear una plantilla de factura, cree una factura estándar, luego, sin validarla, haga clic en el botón "%s".
 LinkedOrder=Enlace a la orden
 CalculationRuleDesc=Para calcular el IVA total, hay dos métodos: <br>El método 1 es redondear el IVA en cada línea y luego sumarlas.<br> El método 2 es sumar todos los IVA en cada línea, luego redondear el resultado.<br>El resultado final puede diferir de algunos centavos. El modo predeterminado es el modo <b>%s</b>.
 CalculationRuleDescSupplier=Según el proveedor, elija el método apropiado para aplicar la misma regla de cálculo y obtenga el mismo resultado esperado por su proveedor.
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index b40800298bc..71be0dfd838 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -180,7 +180,6 @@ UnitPriceHTCurrency=Precio unitario (excl.) (Moneda)
 UnitPriceTTC=Precio unitario
 PriceU=ARRIBA.
 PriceUHT=P.U. (net)
-PriceUHTCurrency=U.P (moneda)
 PriceUTTC=ARRIBA. (inc. impuesto)
 Amount=Cantidad
 AmountInvoice=Importe de la factura
@@ -460,8 +459,6 @@ Miscellaneous=Diverso
 GroupBy=Agrupar por...
 RemoveString=Eliminar la cadena '%s'
 SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar solo parcialmente traducidos o pueden contener errores. Ayude a corregir su idioma registrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> para agregar sus mejoras.
-DirectDownloadLink=Enlace de descarga directa (público / externo)
-DirectDownloadInternalLink=Enlace de descarga directa (debe registrarse y necesita permisos)
 DownloadDocument=Descargar documento
 ActualizeCurrency=Actualizar la tasa de cambio
 ModuleBuilder=Módulo y generador de aplicaciones
diff --git a/htdocs/langs/es_CL/margins.lang b/htdocs/langs/es_CL/margins.lang
index 4e0e7e2941b..7f755f0f46c 100644
--- a/htdocs/langs/es_CL/margins.lang
+++ b/htdocs/langs/es_CL/margins.lang
@@ -12,7 +12,6 @@ UserMargins=Márgenes de usuario
 ProductService=Producto o Servicio
 ChooseProduct/Service=Elija producto o servicio
 ForceBuyingPriceIfNull=Forzar compra / precio de costo a precio de venta si no se define
-ForceBuyingPriceIfNullDetails=Si el precio de compra / costo no está definido, y esta opción es "ON", el margen será cero en línea (precio de compra / costo = precio de venta), de lo contrario ("OFF"), marge será igual al valor predeterminado sugerido.
 MARGIN_METHODE_FOR_DISCOUNT=Método de margen para descuentos globales
 UseDiscountAsProduct=Como producto
 UseDiscountOnTotal=En subtotal
diff --git a/htdocs/langs/es_CL/modulebuilder.lang b/htdocs/langs/es_CL/modulebuilder.lang
index 062d82e135d..079fb308880 100644
--- a/htdocs/langs/es_CL/modulebuilder.lang
+++ b/htdocs/langs/es_CL/modulebuilder.lang
@@ -64,6 +64,7 @@ ListOfDictionariesEntries=Lista de entradas del diccionario
 ListOfPermissionsDefined=Lista de permisos definidos
 SeeExamples=Ver ejemplos aquí
 EnabledDesc=Condición para tener este campo activo (Ejemplos: 1 o $ conf-> global-> MYMODULE_MYOPTION)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 IsAMeasureDesc=¿Se puede acumular el valor de campo para obtener un total en la lista? (Ejemplos: 1 o 0)
 SearchAllDesc=¿Se utiliza el campo para realizar una búsqueda desde la herramienta de búsqueda rápida? (Ejemplos: 1 o 0)
 LanguageDefDesc=Ingrese en estos archivos, toda la clave y la traducción para cada archivo de idioma.
diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang
index 3667212a64f..d51b03fd8f4 100644
--- a/htdocs/langs/es_CL/orders.lang
+++ b/htdocs/langs/es_CL/orders.lang
@@ -111,9 +111,9 @@ TypeContact_order_supplier_external_CUSTOMER=Orden de seguimiento de contacto de
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON no definido
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON no definido
 Error_OrderNotChecked=No hay pedidos para facturar seleccionados
-PDFEinsteinDescription=A complete order model
 PDFEdisonDescription=Un modelo de orden simple
 CreateInvoiceForThisCustomer=Pagar Pedidos
+CreateInvoiceForThisSupplier=Pagar Pedidos
 NoOrdersToInvoice=No hay pedidos facturables
 CloseProcessedOrdersAutomatically=Clasifique "Procesado" todas las órdenes seleccionadas.
 OrderCreation=Creación de orden
diff --git a/htdocs/langs/es_CL/productbatch.lang b/htdocs/langs/es_CL/productbatch.lang
index 2b603794eab..63f552436c8 100644
--- a/htdocs/langs/es_CL/productbatch.lang
+++ b/htdocs/langs/es_CL/productbatch.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - productbatch
 ManageLotSerial=Use el número de lote / serie
-ProductStatusOnBatch=Sí (se requiere lote / serie)
 ProductStatusNotOnBatch=No (lote / serie no utilizada)
 Batch=Lote / serie
 atleast1batchfield=Fecha de caducidad o fecha de caducidad o Número de lote / serie
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index ddb4957ee49..9f3d2555af4 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -61,7 +61,6 @@ NoteNotVisibleOnBill=Nota (no visible en las facturas, cotizaciones, etc.)
 ServiceLimitedDuration=Si el producto es un servicio de duración limitada:
 MultiPricesAbility=Múltiples segmentos de precios por producto / servicio (cada cliente está en un segmento de precios)
 MultiPricesNumPrices=Cantidad de precios
-AssociatedProductsAbility=Enable Kits (set of several products)
 ParentProductsNumber=Número de producto de embalaje principal
 ParentProducts=Productos para padres
 KeywordFilter=Filtro de palabras clave
@@ -161,7 +160,6 @@ GlobalVariableUpdaterHelpFormat1=El formato para la solicitud es {"URL": "http:/
 CorrectlyUpdated=Correctamente actualizado
 PropalMergePdfProductActualFile=Los archivos se usan para agregar a PDF Azur son/es
 PropalMergePdfProductChooseFile=Seleccionar archivos PDF
-IncludingProductWithTag=Incluye producto / servicio con etiqueta
 DefaultPriceRealPriceMayDependOnCustomer=El precio predeterminado, el precio real puede depender del cliente
 NbOfQtyInProposals=Cantidad en propuestas
 ClinkOnALinkOfColumn=Haga clic en un enlace de la columna %s para obtener una vista detallada ...
diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang
index a4ea45fcfbc..46fffc7d68d 100644
--- a/htdocs/langs/es_CL/stocks.lang
+++ b/htdocs/langs/es_CL/stocks.lang
@@ -20,8 +20,6 @@ ListMouvementStockProject=Lista de movimientos de stock asociados al proyecto
 StocksArea=Área de almacenes
 IncludeAlsoDraftOrders=Incluir también órdenes de giro.
 Location=Ubicación
-LocationSummary=Nombre corto
-NumberOfDifferentProducts=Cantidad de productos diferentes
 NumberOfProducts=Número total de productos
 StockCorrection=Corrección de stock
 CorrectStock=Corregir stock
diff --git a/htdocs/langs/es_CL/suppliers.lang b/htdocs/langs/es_CL/suppliers.lang
index 8868eb66cea..e18be7902bf 100644
--- a/htdocs/langs/es_CL/suppliers.lang
+++ b/htdocs/langs/es_CL/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Vendedores
 SuppliersInvoice=Factura del proveedor
+SupplierInvoices=Facturas del vendedor
 ShowSupplierInvoice=Mostrar factura del vendedor
 NewSupplier=Nuevo vendedor
 ListOfSuppliers=Lista de proveedores
diff --git a/htdocs/langs/es_CL/ticket.lang b/htdocs/langs/es_CL/ticket.lang
index f0511ad43e0..e3e937e670e 100644
--- a/htdocs/langs/es_CL/ticket.lang
+++ b/htdocs/langs/es_CL/ticket.lang
@@ -41,8 +41,6 @@ TicketsLogEnableEmail=Habilitar registro por correo electrónico
 TicketsLogEnableEmailHelp=En cada cambio, se enviará un correo electrónico ** a cada contacto ** asociado con el ticket.
 TicketsShowModuleLogoHelp=Habilite esta opción para ocultar el módulo de logotipo en las páginas de la interfaz pública
 TicketsShowCompanyLogoHelp=Habilite esta opción para ocultar el logotipo de la empresa principal en las páginas de la interfaz pública
-TicketsEmailAlsoSendToMainAddress=También envíe notificaciones a la dirección de correo electrónico principal
-TicketsEmailAlsoSendToMainAddressHelp=Habilite esta opción para enviar un correo electrónico a la dirección "Correo electrónico de notificación de" (consulte la configuración a continuación)
 TicketsLimitViewAssignedOnly=Restrinja la visualización a los tickets asignados al usuario actual (no es efectivo para usuarios externos, siempre debe limitarse al tercero del que dependen)
 TicketsLimitViewAssignedOnlyHelp=Solo las entradas asignadas al usuario actual serán visibles. No se aplica a un usuario con derechos de gestión de tickets.
 TicketsActivatePublicInterface=Activar la interfaz pública
diff --git a/htdocs/langs/es_CL/website.lang b/htdocs/langs/es_CL/website.lang
index 4f997504810..874188e8088 100644
--- a/htdocs/langs/es_CL/website.lang
+++ b/htdocs/langs/es_CL/website.lang
@@ -28,11 +28,9 @@ SetAsHomePage=Establecer como página de inicio
 RealURL=URL real
 ViewWebsiteInProduction=Ver el sitio web usando las URL de origen
 YouCanAlsoTestWithPHPS=<u>Usar con el servidor PHP incorporado</u> <br> En el entorno de desarrollo, es posible que prefiera probar el sitio con el servidor web incorporado PHP (se requiere PHP 5.5) ejecutando <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
-CheckVirtualHostPerms=Compruebe también que el host virtual tiene permiso <strong>%s</strong>en los archivos en<br><strong>%s</strong>
 ReadPerm=Leer
 TestDeployOnWeb=Prueba / despliegue en la web
 PreviewSiteServedByWebServer=<u> Obtenga una vista previa de %s en una nueva pestaña. </ u> <br> <br> El %s será atendido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar y configurar este servidor antes de apuntar al directorio: <br> <strong> %s </ strong> <br> URL servida por un servidor externo: <br> <strong> %s </ strong>
-PreviewSiteServedByDolibarr=<u> Obtenga una vista previa de %s en una nueva pestaña. </ u> <br> <br> El servidor Dolibarr servirá %s, por lo que no necesita ningún servidor web adicional (como Apache, Nginx, IIS) para su instalación. < br> El inconveniente es que la URL de las páginas no es fácil de usar y comienza con la ruta de Dolibarr. <br> URL servida por Dolibarr: <br> <strong> %s </ strong> <br> <br> Para usar la suya servidor web externo para servir a este sitio web, crear un servidor virtual en su servidor web que apunte en el directorio <br> <strong> %s </ strong> <br> y luego ingresar el nombre de este servidor virtual y hacer clic en el otro botón de vista previa .
 VirtualHostUrlNotDefined=La URL del servidor virtual servido por un servidor web externo no está definido
 NoPageYet=No hay páginas aún
 SyntaxHelp=Ayuda en consejos de sintaxis específicos
@@ -71,3 +69,5 @@ EditInLineOnOff=El modo &#39;Editar en línea&#39; es %s
 ShowSubContainersOnOff=El modo para ejecutar &#39;contenido dinámico&#39; es %s
 GlobalCSSorJS=Archivo global CSS / JS / Header del sitio web
 TranslationLinks=Enlaces de Traducción
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_CL/withdrawals.lang b/htdocs/langs/es_CL/withdrawals.lang
index a205a30add6..ae95201deba 100644
--- a/htdocs/langs/es_CL/withdrawals.lang
+++ b/htdocs/langs/es_CL/withdrawals.lang
@@ -79,7 +79,6 @@ PleaseCheckOne=Por favor marque uno solo
 DirectDebitOrderCreated=Orden de débito directo %s creado
 AmountRequested=Monto solicitado
 CreateForSepa=Crear un archivo de débito directo
-ICS=Creditor Identifier CI for direct debit
 END_TO_END=Etiqueta XML SEPA &quot;EndToEndId&quot; - ID única asignada por transacción
 USTRD=Etiqueta XML no estructurada de SEPA
 InfoCreditSubject=Pago de la orden de pago de débito directo %s por el banco
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
index 08958e517aa..a1fb58e3305 100644
--- a/htdocs/langs/es_CO/accountancy.lang
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -83,7 +83,6 @@ VentilatedinAccount=Enlazado exitosamente a la cuenta contable.
 NotVentilatedinAccount=No vinculado a la cuenta contable.
 XLineSuccessfullyBinded=%s productos / servicios vinculados con éxito a una cuenta contable
 XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna cuenta contable
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la clasificación de la página "Enlace para hacer" según los elementos más recientes.
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la clasificación de la página "Encuadernación hecha" por los elementos más recientes.
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de productos y servicios en las listas después de x caracteres (Mejor = 50)
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index b8ca38f6387..cc43022632d 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -213,9 +213,6 @@ LastActivationAuthor=Autor de activación más reciente
 LastActivationIP=Última activación de IP
 UpdateServerOffline=Actualizar servidor fuera de línea
 WithCounter=Manejar un contador
-GenericMaskCodes=Puede introducir cualquier máscara de numeración. En esta máscara, se podrían usar las siguientes etiquetas: <br> <b> {000000} </b> corresponde a un número que se incrementará en cada %s. Introduzca tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara. <br> <b> {000000 + 000} </b> igual que el anterior, pero se aplica un desplazamiento correspondiente al número a la derecha del signo + a partir del primer %s. <br> <b> {000000 @ x} </b> igual que el anterior, pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definido en su configuración, o 99 para restablecer a cero cada mes). Si se usa esta opción y x es 2 o superior, entonces también se requiere la secuencia {yy} {mm} o {aaaa} {mm}. <br> <b> {dd} </b> día (01 a 31). <br> <b> {mm} </b> mes (01 a 12). <br> <b> {yy} < / b>, <b> {aaaa} </b> o <b> {y} </b> año sobre 2, 4 o 1 números. <br>
-GenericMaskCodes2=<b> {cccc} </b> el código del cliente en n caracteres <br> <b> {cccc000} </b> el código del cliente en n caracteres va seguido de un contador dedicado al cliente. Este contador dedicado al cliente se reinicia al mismo tiempo que el contador global. <br> <b> {tttt} </b> El código del tipo de tercero en n caracteres (ver menú Inicio - Configuración - Diccionario - Tipos de terceros) . Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero. <br>
-GenericMaskCodes3=Todos los demás caracteres de la máscara permanecerán intactos. <br> Los espacios no están permitidos. <br>
 GenericMaskCodes4a=<u> Ejemplo en la 99a %s de TheCompany de terceros, con fecha 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u> Ejemplo de un tercero creado el 2007-03-01: </u> <br>
 GenericMaskCodes4c=<u> Ejemplo de producto creado el 2007-03-01: </u> <br>
@@ -362,13 +359,11 @@ Module2900Desc=Capacidades de conversiones de GeoIP Maxmind
 Module3200Desc=Habilitar un registro inalterable de eventos empresariales. Los eventos se archivan en tiempo real. El registro es una tabla de solo lectura de eventos encadenados que se pueden exportar. Este módulo puede ser obligatorio para algunos países.
 Module4000Desc=Gestión de recursos humanos (gestión de departamento, contratos de empleados y sentimientos).
 Module5000Desc=Le permite gestionar múltiples empresas.
-Module6000Desc=Gestión del flujo de trabajo (creación automática de objeto y / o cambio automático de estado)
 Module40000Name=Multi moneda
 Module40000Desc=Utilizar monedas alternativas en precios y documentos.
 Module50000Name=Caja de pago
 Module54000Desc=Impresión directa (sin abrir los documentos) mediante la interfaz IPP de Cups (la impresora debe estar visible desde el servidor y CUPS debe estar instalada en el servidor).
 Module55000Name=Encuesta, encuesta o voto
-Module59000Desc=Module to follow margins
 Module60000Desc=Módulo para gestionar comisiones.
 Module62000Desc=Añadir características para gestionar Incoterms.
 Permission11=Lea las facturas de los clientes.
@@ -626,7 +621,6 @@ BankModuleNotActive=Módulo de cuentas bancarias no habilitado
 ShowBugTrackLink=Mostrar enlace "<strong> %s </strong>"
 Alerts=Las alertas
 SetupDescription1=Antes de comenzar a utilizar Dolibarr, se deben definir algunos parámetros iniciales y habilitar / configurar los módulos.
-LogEvents=Eventos de auditoria de seguridad
 InfoDolibarr=Sobre Dolibarr
 InfoBrowser=Acerca del navegador
 InfoOS=Sobre el sistema operativo
@@ -859,7 +853,6 @@ ProductSetup=Configuración del módulo de productos
 ServiceSetup=Configuración del módulo de servicios
 ProductServiceSetup=Configuración de módulos de productos y servicios.
 MergePropalProductCard=Active en la pestaña Archivos adjuntos del producto / servicio una opción para fusionar el documento PDF del producto a la propuesta PDF azur si el producto / servicio está en la propuesta
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Además, si tiene una gran cantidad de productos (> 100 000), puede aumentar la velocidad configurando la constante PRODUCT_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otros. La búsqueda se limitará entonces al inicio de la cadena.
 UseSearchToSelectProduct=Espere hasta que presione una tecla antes de cargar el contenido de la lista de combo de productos (esto puede aumentar el rendimiento si tiene una gran cantidad de productos, pero es menos conveniente)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras predeterminado para usar en productos
@@ -1094,7 +1087,6 @@ TypeCdr=Use "Ninguno" si la fecha del plazo de pago es la fecha de la factura m
 WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016) porque el módulo de Registros no reversibles se activa automáticamente.
 WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor de ese módulo y que está seguro de que este módulo no afecta negativamente el comportamiento de su aplicación y cumple con las leyes de su país (%s). Si el módulo introduce una característica ilegal, usted se hace responsable del uso de software ilegal.
 SetToYesIfGroupIsComputationOfOtherGroups=Establézcalo en sí si este grupo es un cálculo de otros grupos
-EnterCalculationRuleIfPreviousFieldIsYes=Ingrese la regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, 'CODEGRP1 + CODEGRP2')
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtro de expresiones regulares para limpiar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
 GDPRContact=Oficial de protección de datos (DPO, privacidad de datos o contacto GDPR)
 HelpOnTooltip=Texto de ayuda para mostrar en información sobre herramientas
diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang
index 9fc8e78e7ab..4b9cf5dc637 100644
--- a/htdocs/langs/es_CO/bills.lang
+++ b/htdocs/langs/es_CO/bills.lang
@@ -37,7 +37,8 @@ PredefinedInvoices=Facturas predefinidas
 InvoiceCustomer=Factura del cliente
 CustomerInvoice=Factura del cliente
 CustomersInvoices=Facturas de clientes
-SupplierBills=proveedores facturas
+SuppliersInvoices=Facturas de proveedores
+SupplierBills=Facturas de proveedores
 paymentInInvoiceCurrency=en facturas moneda
 DeletePayment=Eliminar pago
 ConfirmDeletePayment=¿Estás seguro de que quieres eliminar este pago?
@@ -327,9 +328,7 @@ NoteListOfYourUnpaidInvoices=Nota: Esta lista solo contiene facturas para tercer
 YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y convertirla en "plantilla" para crear una nueva factura de plantilla
 PDFSpongeDescription=Factura PDF plantilla de esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Plantilla PDF factura Crevette. Una plantilla de factura completa para facturas de situación.
-TerreNumRefModelDesc1=Número de devolución con formato %syymm-nnnn para facturas estándar y %syymm-nnnn para notas de crédito donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0
 TerreNumRefModelError=Ya existe una factura que comienza con $ syymm y no es compatible con este modelo de secuencia. Quítalo o renómbrelo para activar este módulo.
-CactusNumRefModelDesc1=Número de devolución con formato %syymm-nnnn para facturas estándar, %syymm-nnnn para notas de crédito y %syymm-nnnn para facturas de anticipo donde yy es año, mm es mes y nnn es una secuencia sin interrupción y sin retorno a 0
 TypeContact_facture_internal_SALESREPFOLL=Representante de seguimiento de la factura del cliente.
 TypeContact_facture_external_BILLING=Contacto factura cliente
 TypeContact_facture_external_SHIPPING=Contacto de envío del cliente
@@ -337,6 +336,7 @@ TypeContact_facture_external_SERVICE=Contacto de servicio al cliente
 InvoiceFirstSituationAsk=Primera situación factura
 InvoiceFirstSituationDesc=Las <b> facturas de situación </b> están vinculadas a situaciones relacionadas con una progresión, por ejemplo, la progresión de una construcción. Cada situación está vinculada a una factura.
 InvoiceSituation=Factura de situacion
+PDFInvoiceSituation=Factura de situacion
 InvoiceSituationAsk=Factura siguiendo la situacion.
 InvoiceSituationDesc=Crear una nueva situación siguiendo una ya existente.
 SituationAmount=Importe de la factura de situación (neto)
@@ -363,7 +363,6 @@ ToCreateARecurringInvoiceGene=Para generar facturas futuras de forma regular y m
 DeleteRepeatableInvoice=Eliminar factura de plantilla
 ConfirmDeleteRepeatableInvoice=¿Está seguro de que desea eliminar la plantilla de factura?
 CreateOneBillByThird=Cree una factura por tercero (de lo contrario, una factura por pedido)
-BillCreated=%s factura (s) creadas
 StatusOfGeneratedDocuments=Estado de generación de documentos
 AutogenerateDoc=Auto generar archivo de documento
 AutoFillDateFrom=Establecer fecha de inicio para línea de servicio con fecha de factura
diff --git a/htdocs/langs/es_CO/compta.lang b/htdocs/langs/es_CO/compta.lang
index 0466a9ef875..0b16bb527cd 100644
--- a/htdocs/langs/es_CO/compta.lang
+++ b/htdocs/langs/es_CO/compta.lang
@@ -113,9 +113,7 @@ NoWaitingChecks=No hay cheques a la espera de depósito.
 DateChequeReceived=Verifique la fecha de recepción
 NbOfCheques=No. de cheques
 PaySocialContribution=Pagar un impuesto social / fiscal
-ConfirmPaySocialContribution=¿Está seguro de que desea clasificar este impuesto social o fiscal como pagado?
 DeleteSocialContribution=Eliminar un pago fiscal social o fiscal.
-ConfirmDeleteSocialContribution=¿Está seguro de que desea eliminar este pago fiscal social / fiscal?
 ExportDataset_tax_1=Impuestos y pagos sociales y fiscales.
 CalcModeVATDebt=Modo <b> %sVAT en contabilidad de compromiso%s </b>.
 CalcModeVATEngagement=Modo <b> %sVAT en ingresos-expenses%s </b>.
@@ -184,7 +182,6 @@ Pcg_subtype=Subtipo pcg
 InvoiceLinesToDispatch=Facturas de facturas a despachar.
 ByProductsAndServices=Por producto y servicio.
 RefExt=Ref externo
-ToCreateAPredefinedInvoice=Para crear una factura de plantilla, cree una factura estándar, luego, sin validarla, haga clic en el botón "%s".
 LinkedOrder=Enlace a pedido
 CalculationRuleDesc=Para calcular el IVA total, hay dos métodos: <br> El método 1 es redondear la tina en cada línea, luego sumarlos. <br> El método 2 es sumar todas la tina en cada línea, luego redondear el resultado. <br> El resultado final puede diferir de unos céntimos. El modo predeterminado es el modo <b> %s </b>.
 CalculationRuleDescSupplier=Según el proveedor, elija el método apropiado para aplicar la misma regla de cálculo y obtener el mismo resultado esperado por su proveedor.
@@ -214,7 +211,6 @@ AccountingAffectation=Asignación de contabilidad
 LastDayTaxIsRelatedTo=Último día del período en que el impuesto está relacionado con
 VATDue=Impuesto de venta reclamado
 ClaimedForThisPeriod=Reclamado por el período
-PaidDuringThisPeriod=Pagado durante este periodo
 ByVatRate=Por impuesto de venta
 TurnoverbyVatrate=Facturación facturada por impuesto de venta
 TurnoverCollectedbyVatrate=Volumen de negocios recaudado por tasa de impuesto de venta
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index cf729c5dde4..e50d0cad34a 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -86,7 +86,6 @@ MinuteShort=Minnesota
 UseLocalTax=Incluir impuestos
 UserModif=Usuario de la última actualización.
 DefaultValues=Valores predeterminados / filtros / clasificación
-PriceUHTCurrency=U.P (moneda)
 PriceUTTC=ARRIBA. (inc. impuestos)
 MulticurrencyAlreadyPaid=Ya pagado, moneda original.
 MulticurrencyRemainderToPay=Quedan por pagar, moneda original.
@@ -193,8 +192,6 @@ ExportList=Lista de exportación
 Miscellaneous=Diverso
 GroupBy=Agrupar por...
 SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar solo parcialmente traducidos o pueden contener errores. Ayude a corregir su idioma registrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ < / a> para añadir tus mejoras.
-DirectDownloadLink=Enlace de descarga directa (público / externo)
-DirectDownloadInternalLink=Enlace de descarga directa (necesita ser registrado y necesita permisos)
 DownloadDocument=Descargar documento
 ActualizeCurrency=Tasa de cambio de moneda
 ClickToShowHelp=Haga clic para mostrar la ayuda de ayuda.
@@ -238,7 +235,6 @@ PayedTo=Pagado para
 AssignedTo=Asignado a
 Deletedraft=Borrar borrador
 ConfirmMassDraftDeletion=Confirmación de borrado masivo borrador
-FileSharedViaALink=Archivo compartido a través de un enlace.
 SelectAThirdPartyFirst=Seleccione un tercero primero ...
 YouAreCurrentlyInSandboxMode=Actualmente se encuentra en el modo "sandbox" %s
 ContactDefault_agenda=Acción
diff --git a/htdocs/langs/es_CO/modulebuilder.lang b/htdocs/langs/es_CO/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_CO/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_CO/orders.lang b/htdocs/langs/es_CO/orders.lang
index ddbbf00a6dc..c1a7be94092 100644
--- a/htdocs/langs/es_CO/orders.lang
+++ b/htdocs/langs/es_CO/orders.lang
@@ -7,7 +7,6 @@ StatusOrderCanceled=Cancelado
 StatusOrderDraft=Borrador (necesita ser validado)
 TypeContact_commande_external_BILLING=Contacto factura cliente
 TypeContact_commande_external_SHIPPING=Contacto de envío del cliente
-PDFEinsteinDescription=A complete order model
 StatusSupplierOrderCanceledShort=Cancelado
 StatusSupplierOrderCanceled=Cancelado
 StatusSupplierOrderDraft=Borrador (necesita ser validado)
diff --git a/htdocs/langs/es_CO/productbatch.lang b/htdocs/langs/es_CO/productbatch.lang
index b49891f9a6b..c1aaffb3380 100644
--- a/htdocs/langs/es_CO/productbatch.lang
+++ b/htdocs/langs/es_CO/productbatch.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - productbatch
 ManageLotSerial=Use número de lote/serie
-ProductStatusOnBatch=Si (lote/serie requerido)
 ProductStatusNotOnBatch=No (lote/serie no usado)
 atleast1batchfield=Fecha de consumo o fecha de venta o número de lote/serie
 batch_number=Número de lote/serie
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
index 19e7fb865c4..fa44c381e34 100644
--- a/htdocs/langs/es_CO/products.lang
+++ b/htdocs/langs/es_CO/products.lang
@@ -54,7 +54,6 @@ BarcodeValue=Valor de código de barras
 NoteNotVisibleOnBill=Nota (no visible en facturas, propuestas ...)
 ServiceLimitedDuration=Si el producto es un servicio con duración limitada:
 MultiPricesNumPrices=Numero de precios
-AssociatedProductsAbility=Enable Kits (set of several products)
 ParentProductsNumber=Número de producto de embalaje principal
 ParentProducts=Productos para padres
 KeywordFilter=Filtro de palabras clave
@@ -141,7 +140,6 @@ GlobalVariableUpdaterHelpFormat1=El formato para la solicitud es {"URL": "http:/
 CorrectlyUpdated=Correctamente actualizado
 PropalMergePdfProductActualFile=Los archivos que se usan para agregar a PDF Azur son / son
 PropalMergePdfProductChooseFile=Seleccionar archivos PDF
-IncludingProductWithTag=Incluyendo producto / servicio con etiqueta.
 DefaultPriceRealPriceMayDependOnCustomer=Precio por defecto, el precio real puede depender del cliente.
 WarningSelectOneDocument=Por favor seleccione al menos un documento
 NbOfQtyInProposals=Cantidad en propuestas
diff --git a/htdocs/langs/es_CO/suppliers.lang b/htdocs/langs/es_CO/suppliers.lang
index 7bd957f2702..004a8c759de 100644
--- a/htdocs/langs/es_CO/suppliers.lang
+++ b/htdocs/langs/es_CO/suppliers.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - suppliers
+SupplierInvoices=Facturas de proveedores
 NewSupplier=Nuevo vendedor
 RefSupplierShort=Árbitro. vendedor
diff --git a/htdocs/langs/es_CO/website.lang b/htdocs/langs/es_CO/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/es_CO/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
index 4c73e87c98e..33ea339dcd8 100644
--- a/htdocs/langs/es_CO/withdrawals.lang
+++ b/htdocs/langs/es_CO/withdrawals.lang
@@ -4,4 +4,3 @@ WithdrawalsReceipts=Órdenes de débito directo
 WithdrawalReceipt=Orden de domiciliación bancaria
 StatusPaid=Pagado
 StatusRefused=Rechazado
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/es_DO/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 5284148aebb..ceed7fa3336 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -1,13 +1,12 @@
 # Dolibarr language file - Source file is en_US - admin
 OldVATRates=Tasa de ITBIS antigua
 NewVATRates=Tasa de ITBIS nueva
-Module59000Desc=Module to follow margins
 Permission91=Consultar impuestos e ITBIS
 Permission92=Crear/modificar impuestos e ITBIS
 Permission93=Eliminar impuestos e ITBIS
 DictionaryVAT=Tasa de ITBIS (Impuesto sobre ventas en EEUU)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OptionVatMode=Opción de carga de ITBIS
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_DO/modulebuilder.lang b/htdocs/langs/es_DO/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_DO/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_DO/products.lang b/htdocs/langs/es_DO/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/es_DO/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_DO/website.lang b/htdocs/langs/es_DO/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/es_DO/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_DO/withdrawals.lang b/htdocs/langs/es_DO/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/es_DO/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
index 828b60ac54e..262f54e0a6e 100644
--- a/htdocs/langs/es_EC/accountancy.lang
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -90,7 +90,6 @@ VentilatedinAccount=Vinculado con éxito a la cuenta contable
 NotVentilatedinAccount=No vinculado a la cuenta contable
 XLineSuccessfullyBinded=%s productos/servicios vinculados con éxito a una cuenta de contabilidad
 XLineFailedToBeBinded=Los productos/servicios de%s no estaban vinculados a ninguna cuenta contable
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comienza la clasificación de la página "Vinculación a hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comienza la clasificación de la página "Encuadernación realizada" por los elementos más recientes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de los productos y servicios en los listados después de los caracteres x (Mejor
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 61e86a47149..efcb38d1779 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -255,8 +255,6 @@ LastActivationAuthor=Última autor de activación
 LastActivationIP=Última activación IP
 UpdateServerOffline=Actualización de servidor fuera de línea
 WithCounter=Administrar un contador
-GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, podrían tener las siguientes etiquetas: <br> <b> {000000} </b> Corresponde a un número que se incrementará en cada %s. Insertar tantos ceros como la longitud deseada del contador. El contador se completa con ceros de la izquierda para tener tantos ceros como la máscara. <br> <b> {000000 + 000} </b> Igual que la anterior, pero se aplica a un desplazamiento correspondiente al número a la derecha del signo +, comenzando en la primera %s. <br> <b> {000000 @ x} </b> Igual a anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definido en Su configuración o 99 para restablecer un cero cada mes). Si se utiliza esta opción y x es 2 o superior, la secuencia {yy} {mm} o {aaaa} {mm} también se requiere. <br> <b> {dd} </b> día (01 a 31). <br> <b> {mm} </b> mes (01 a 12). <br> <b> {yy} < / b>, <b> {aaaa} </b> o <b> {y} </b> año más de 2, 4 o 1 número. <br>
-GenericMaskCodes2=<b> {cccc} </b> El código de cliente en n caracteres <br> <b> {cccc000} </b> El código de cliente en n caracteres es seguido por un contador dedicado para el cliente. El código de tipo de cliente / proveedor en caracteres (ver menú Inicio - configuración - Diccionario - Tipos de cliente / proveedor). Si es esta etiqueta, el contador será diferente para cada tipo de cliente / proveedor. <br>
 GenericMaskCodes3=Todos los demás caracteres de la máscara permanecerán intactos. <br> No se permiten espacios. <br>
 GenericMaskCodes4a=<u> Ejemplo en el %s 99 de las empresas externas, con fecha 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u> Ejemplo de cliente / proveedor creado en 2007-03-01: </u> <br>
@@ -334,7 +332,6 @@ ExtrafieldParamHelpPassword=Dejar este campo en blanco significa que este valor
 ExtrafieldParamHelpselect=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser '0') <br> <br> por ejemplo: <br> 1, value1 <br> 2, value2 <br> code3, value3 < br> ... <br> <br> Para tener la lista dependiendo de otra lista de atributos complementarios: <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 la lista dependa de otra lista: <br> 1, value1 | <i> parent_list_code </i>: parent_key <br> 2, value2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser '0') <br> <br> por ejemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 < br> ...
 ExtrafieldParamHelpradio=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser '0') <br> <br> por ejemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 < br> ...
-ExtrafieldParamHelpchkbxlst=La lista de valores proviene de una tabla <br> Sintaxis: table_name: label_field: id_field :: filter <br> Ejemplo: c_typent: libelle: id :: filter <br> <br> filter puede ser una prueba simple (por ejemplo, active = 1 ) para mostrar solo el valor activo <br> También puede usar $ ID $ en el filtro, que es el ID actual del objeto actual. Para hacer un SELECCIONAR en el filtro, use $ SEL $ <br> si desea filtrar en campos adicionales. syntax extra.fieldcode = ... (donde código de campo es el código de campo extra) <br> <br> Para tener la lista dependiendo de otra lista de atributos complementarios: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelpSeparator=Mantener vacío para un separador simple <br> Establezca esto en 1 para un separador de colapso (abierto de forma predeterminada para una nueva sesión, luego el estado se mantiene para cada sesión de usuario) <br> Establezca esto en 2 para un separador de colapso (colapsado de manera predeterminada para una nueva sesión, luego el estado se mantiene antes de cada sesión de usuario)
 LibraryToBuildPDF=Biblioteca utilizada para la generación de PDF
 LocalTaxDesc=Algunos países pueden aplicar dos o tres impuestos en cada línea de factura. Si este es el caso, elija el tipo para el segundo y tercer impuesto y su tasa. Los tipos posibles son: <br> 1: el impuesto local se aplica a productos y servicios sin IVA (localtax se calcula sobre el monto sin impuestos) <br> 2: el impuesto local se aplica a productos y servicios, incluido el IVA (localtax se calcula sobre el monto + impuesto principal ) <br> 3: el impuesto local se aplica a productos sin IVA (el impuesto local se calcula sobre el monto sin impuestos) <br> 4: el impuesto local se aplica a productos que incluyen el IVA (impuesto local se calcula sobre el monto + IVA principal) <br> 5: local los impuestos se aplican a los servicios sin IVA (el impuesto local se calcula sobre la cantidad sin impuestos) <br> 6: el impuesto local se aplica a los servicios que incluyen impuestos (el impuesto local se calcula sobre la cantidad + impuestos)
@@ -475,7 +472,6 @@ Module2900Desc=Capacidades de conversiones GeoIP Maxmind
 Module3200Desc=Habilitar un registro inalterable de eventos empresariales. Los eventos se archivan en tiempo real. El registro es una tabla de solo lectura de eventos encadenados que se pueden exportar. Este módulo puede ser obligatorio para algunos países.
 Module4000Desc=Administración de los recursos humanos
 Module5000Desc=Permite gestionar múltiples empresas
-Module6000Desc=Gestión de flujo de trabajo (creación automática de objeto y / o cambio de estado automático)
 Module10000Name=Sitios Web
 Module20000Name=Gestión de solicitudes de licencia
 Module20000Desc=Definir y rastrear las solicitudes de permisos de los empleados.
@@ -491,7 +487,6 @@ Module50400Name=Contabilidad (doble entrada)
 Module54000Desc=Impresión directa (sin abrir los documentos) utilizando la interfaz IPP de Cups (la impresora debe estar visible desde el servidor y CUPS debe estar instalada en el servidor).
 Module55000Name=Sondeo, encuesta o votación
 Module55000Desc=Cree encuestas en línea, encuestas o votos (como Doodle, Studs, RDVz, etc.)
-Module59000Desc=Module to follow margins
 Module60000Desc=Módulo para gestionar las comisiones
 Module62000Desc=Añadir características para gestionar Incoterms.
 Module63000Desc=Gestionar recursos (impresoras, coches, salas, ...) para asignar a eventos.
@@ -600,7 +595,6 @@ Permission253=Crea / modifica otros usuarios, grupos y permisos.
 PermissionAdvanced253=Crear / modificar usuarios internos / externos y permisos
 Permission254=Crear / modificar solo usuarios externos
 Permission255=Modificar contraseña de otro usuario
-Permission262=Extienda el acceso a todos los terceros (no solo a terceros para los cuales el usuario es un representante de ventas). No es efectivo para usuarios externos (siempre se limita a ellos mismos para propuestas, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asignaciones).
 Permission271=Leer CA
 Permission272=Leer facturas
 Permission273=Emitir facturas
@@ -838,7 +832,6 @@ SetupDescription1=Antes de comenzar a utilizar Dolibarr, se deben definir alguno
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Parámetros básicos utilizados para personalizar el comportamiento predeterminado de su aplicación (por ejemplo, para los países relacionados con el comportamiento predeterminado).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Este software es un conjunto de muchos módulos/aplicaciones. Los módulos relacionados con sus necesidades deben estar habilitados y configurados. Las entradas del menú aparecerán con la activación de estos módulos.
 SetupDescription5=Otras entradas del menú de configuración manejan parámetros opcionales.
-LogEvents=Eventos de auditoría de seguridad
 Audit=Auditoria
 InfoBrowser=Acerca del navegador
 InfoOS=Acerca del OS
@@ -887,7 +880,6 @@ RestoreMySQL=Importación de MySQL
 ForcedToByAModule= Esta regla se ha forzado a <b>%s</b> por un módulo activado
 RunningUpdateProcessMayBeRequired=Parece que es necesario ejecutar el proceso de actualización (la versión del programa %s difiere de la versión de la base de datos %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comandos después de iniciar sesión en un shell con el usuario <b>%s</b> o debe agregar la opción -Al final de la línea de comandos para proporcionar la contraseña <b>%s</b>.
-SimpleNumRefModelDesc=Devuelve el número de referencia con el formato %syymm-nnnn donde yy es año, mm es mes y nnnn es secuencial sin reinicio
 ShowProfIdInAddress=Mostrar identificación profesional con direcciones
 ShowVATIntaInAddress=Ocultar número de IVA intracomunitario con direcciones
 MeteoPercentageMod=Modo porcentual
@@ -898,7 +890,6 @@ ExternalAccess=Acceso externo / internet
 MAIN_PROXY_USE=Use un servidor proxy (de lo contrario el acceso es directo a internet)
 MAIN_PROXY_HOST=Servidor proxy: Nombre / Dirección
 MAIN_PROXY_USER=Servidor proxy: Login / Usuario
-DefineHereComplementaryAttributes=Defina aquí cualquier atributo adicional / personalizado que desee incluir para: %s
 ExtraFields=Atributos complementarios
 ExtraFieldsLines=Atributos complementarios (líneas)
 ExtraFieldsLinesRec=Atributos complementarios (plantillas de líneas de facturas)
@@ -1157,7 +1148,6 @@ ProductServiceSetup=Configuración de módulos de productos y servicios
 NumberOfProductShowInSelect=Número máximo de productos para mostrar en las listas de selección de combo (0
 ViewProductDescInFormAbility=Mostrar descripciones de productos en formularios (de lo contrario, se muestra en una ventana emergente de información sobre herramientas)
 MergePropalProductCard=Activar en la ficha Archivos adjuntos de producto / servicio una opción para fusionar el documento PDF del producto con la propuesta PDF azur si el producto / servicio está en la propuesta
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Además, si tiene una gran cantidad de productos (> 100 000), puede aumentar la velocidad configurando la constante PRODUCT_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otros. La búsqueda se limitará entonces al inicio de la cadena.
 UseSearchToSelectProduct=Espere hasta que presione una tecla antes de cargar el contenido de la lista de combo de productos (esto puede aumentar el rendimiento si tiene una gran cantidad de productos, pero es menos conveniente)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras predeterminado para utilizar en los productos
@@ -1362,7 +1352,6 @@ BackgroundTableLineOddColor=Color de fondo para líneas de tabla de impares
 BackgroundTableLineEvenColor=Color de fondo para líneas de tabla pares
 MinimumNoticePeriod=Período mínimo de notificación
 NbAddedAutomatically=Número de días añadidos a los contadores de usuarios (automáticamente) cada mes
-EnterAnyCode=Este campo contiene una referencia para identificar la línea. Para ello, no hay caracteres especiales.
 Enter0or1=Ingrese 0 o 1
 UnicodeCurrency=Ingrese aquí entre llaves, lista de bytes que representan el símbolo de moneda. Por ejemplo: para $, ingrese [36] - para brasil R $ [82,36] - para €, ingrese [8364]
 ColorFormat=El color RGB está en formato HEX, por ejemplo: FF0000
@@ -1428,7 +1417,6 @@ WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas
 WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor de ese módulo y que está seguro de que este módulo no afecta negativamente el comportamiento de su aplicación y cumple con las leyes de su país ( %s). Si el módulo introduce una característica ilegal, usted se hace responsable del uso de software ilegal.
 NothingToSetup=No se requiere ninguna configuración específica para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto en "sí" si este grupo es un cálculo de otros grupos
-EnterCalculationRuleIfPreviousFieldIsYes=Ingrese la regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, 'CODEGRP1 + CODEGRP2')
 SeveralLangugeVariatFound=Algunas variantes de lenguaje
 GDPRContact=Oficial de protección de datos (DPO, privacidad de datos o contacto GDPR)
 GDPRContactDesc=Si almacena datos sobre empresas / ciudadanos europeos, puede nombrar al contacto que es responsable del Reglamento general de protección de datos aquí
@@ -1438,7 +1426,6 @@ YouCanDeleteFileOnServerWith=Puede eliminar este archivo en el servidor con la l
 ChartLoaded=Plan de cuenta cargado
 VATIsUsedIsOff=Nota: La opción de usar el impuesto sobre las ventas o el IVA se ha establecido en <strong> Desactivado </strong> en el menú %s - %s, por lo que el impuesto sobre las ventas o IVA utilizado siempre será 0 para las ventas.
 SwapSenderAndRecipientOnPDF=Cambiar la posición de la dirección del remitente y del destinatario en documentos PDF
-FeatureSupportedOnTextFieldsOnly=Advertencia, función compatible solo en los campos de texto. También se debe establecer un parámetro de URL action = create o action = edit O el nombre de la página debe terminar con 'new.php' para activar esta función.
 EmailCollector=Recolector de correo electronico
 EmailCollectorDescription=Agregue un trabajo programado y una página de configuración para escanear los buzones de correo electrónico con regularidad (usando el protocolo IMAP) y registre los correos electrónicos recibidos en su aplicación, en el lugar correcto y / o cree algunos registros automáticamente (como clientes potenciales).
 NewEmailCollector=Nuevo recolector de email
diff --git a/htdocs/langs/es_EC/bills.lang b/htdocs/langs/es_EC/bills.lang
index 9c56198744f..0028e2a141b 100644
--- a/htdocs/langs/es_EC/bills.lang
+++ b/htdocs/langs/es_EC/bills.lang
@@ -41,8 +41,9 @@ InvoiceCustomer=Factura del cliente
 CustomerInvoice=Factura del cliente
 CustomersInvoices=Facturas de clientes
 SupplierInvoice=Factura del proveedor
+SuppliersInvoices=Facturas del vendedor / proveedor
 SupplierBill=Factura del proveedor
-SupplierBills=facturas de proveedores
+SupplierBills=Facturas del vendedor / proveedor
 PaymentBack=Reembolso
 CustomerInvoicePaymentBack=Reembolso
 paymentInInvoiceCurrency=en moneda de facturas
@@ -318,7 +319,6 @@ PaymentCondition14DENDMONTH=Dentro de los 14 días siguientes al final del mes
 FixAmount=Cantidad fija: 1 línea con la etiqueta '%s'
 VarAmount=Cantidad variable (%% tot.)
 VarAmountOneLine=Cantidad variable (%% total.) - 1 línea con la etiqueta '%s'
-VarAmountAllLines=Cantidad variable (%% tot.) - todas las mismas líneas
 PaymentTypePRE=Orden de pago por domiciliación bancaria
 PaymentTypeShortPRE=Orden de pago de débito
 PaymentTypeCB=Tarjeta de crédito
@@ -387,10 +387,7 @@ YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y
 PDFCrabeDescription=Factura PDF plantilla Crabe. Una plantilla de factura completa (implementación anterior de la plantilla Sponge)
 PDFSpongeDescription=Factura PDF plantilla de esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Plantilla de factura PDF Crevette. Una plantilla completa de facturas para facturas de situación
-TerreNumRefModelDesc1=Número de devolución con el formato%syymm-nnnn para facturas estándar y%syymm-nnnn para notas de crédito donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0
-MarsNumRefModelDesc1=Número de devolución con el formato%syymm-nnnn para facturas estándar,%syymm-nnnn para facturas de reemplazo,%syymm-nnnn para facturas de pago inicial y%syymm-nnnn para notas de crédito donde yy es año, mm es mes y nnnn es una secuencia con sin descanso y sin retorno a 0
 TerreNumRefModelError=Un proyecto de ley que comienza con $ syymm ya existe y no es compatible con este modelo de secuencia. Eliminar o cambiar el nombre para activar este módulo.
-CactusNumRefModelDesc1=Número de devolución con el formato%syymm-nnnn para facturas estándar,%syymm-nnnn para notas de crédito y%syymm-nnnn para facturas de pago inicial donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0
 TypeContact_facture_internal_SALESREPFOLL=Representante de seguimiento de factura de cliente
 TypeContact_facture_external_BILLING=Contacto de factura de cliente
 TypeContact_facture_external_SHIPPING=Contacto de envío del cliente
@@ -427,7 +424,6 @@ ToCreateARecurringInvoiceGeneAuto=Si necesita que esas facturas se generen autom
 DeleteRepeatableInvoice=Eliminar factura de plantilla
 ConfirmDeleteRepeatableInvoice=¿Está seguro de que desea eliminar la factura de la plantilla?
 CreateOneBillByThird=Crear una factura por terceros (de lo contrario, una factura por pedido)
-BillCreated=%s facturas creadas
 AutoFillDateFrom=Establecer fecha de inicio para la línea de servicio con fecha de factura
 AutoFillDateFromShort=Establecer fecha de inicio
 AutoFillDateToShort=Establecer fecha de finalización
diff --git a/htdocs/langs/es_EC/categories.lang b/htdocs/langs/es_EC/categories.lang
index 3545e7ba532..4aa11eeaa7d 100644
--- a/htdocs/langs/es_EC/categories.lang
+++ b/htdocs/langs/es_EC/categories.lang
@@ -8,7 +8,6 @@ SuppliersCategoriesArea=Área de etiquetas / categorías de proveedores
 CustomersCategoriesArea=Categorías de etiquetas/categorías de clientes
 MembersCategoriesArea=Miembros tags/categories area
 ContactsCategoriesArea=Zona de etiquetas/categorías de contactos
-AccountsCategoriesArea=Cuentas tags/categories area
 ProjectsCategoriesArea=Área de etiquetas/categorías de proyectos
 UsersCategoriesArea=Etiquetas de usuarios / área de categorías
 CatList=Lista de etiquetas/categorías
diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
index 8a15891b3f1..b55655122e9 100644
--- a/htdocs/langs/es_EC/companies.lang
+++ b/htdocs/langs/es_EC/companies.lang
@@ -258,7 +258,6 @@ CurrentOutstandingBill=Factura actual pendiente
 OutstandingBill=Max. Por factura pendiente
 OutstandingBillReached=Max. Para la factura pendiente alcanzada
 OrderMinAmount=Monto mínimo para la orden
-MonkeyNumRefModelDesc=Devuelva un número con el formato %syymm-nnnn para el código de cliente y %syymm-nnnn para el código de proveedor donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0.
 LeopardNumRefModelDesc=El código es gratuito. Este código se puede modificar en cualquier momento.
 ManagingDirectors=Nombre del Gerente(s) (CEO, director, presidente ...)
 MergeOriginThirdparty=Duplicar clientes/proveedores (clientes/proveedores que desea eliminar)
diff --git a/htdocs/langs/es_EC/compta.lang b/htdocs/langs/es_EC/compta.lang
index 5933896e5b7..6b24ea9e09b 100644
--- a/htdocs/langs/es_EC/compta.lang
+++ b/htdocs/langs/es_EC/compta.lang
@@ -113,9 +113,7 @@ NoWaitingChecks=No hay cheques a la espera de depósito.
 DateChequeReceived=Consultar fecha de recepción
 NbOfCheques=No. de cheques
 PaySocialContribution=Pagar un impuesto social/fiscal
-ConfirmPaySocialContribution=¿Está seguro de que desea clasificar este impuesto social o fiscal como pagado?
 DeleteSocialContribution=Eliminar un pago de impuestos sociales o fiscales
-ConfirmDeleteSocialContribution=¿Seguro que desea eliminar este pago de impuestos sociales/fiscales?
 ExportDataset_tax_1=Impuestos y pagos sociales y fiscales
 CalcModeVATDebt=Modo <b>%sVAT en la contabilidad de compromiso%s </b>.
 CalcModeVATEngagement=Modo <b>%sVAT en los ingresos-gastos%s </b>.
@@ -181,7 +179,6 @@ Pcg_subtype=Subtipo Pcg
 InvoiceLinesToDispatch=Líneas de factura para enviar
 ByProductsAndServices=Por producto y servicio
 RefExt=Referencia externa
-ToCreateAPredefinedInvoice=Para crear una factura de plantilla, cree una factura estándar y, a continuación, sin validarla, haga clic en el botón "%s".
 LinkedOrder=Enlace al pedido
 CalculationRuleDesc=Para calcular el IVA total, hay dos métodos: <br> El método 1 redondea la tina en cada línea y luego los suma. <br> El método 2 suma todas las tinas en cada línea y luego redondea el resultado. <br> El resultado final puede diferir de pocos centavos. El modo predeterminado es modo <b>%s </b>.
 CalculationRuleDescSupplier=Según el proveedor, elija el método apropiado para aplicar la misma regla de cálculo y obtener el mismo resultado esperado por su proveedor.
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 8452c16f0ec..d3b588e3a6f 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -184,7 +184,6 @@ UnitPriceHTCurrency=Precio unitario (excl.) (Moneda)
 UnitPriceTTC=Precio unitario
 PriceU=Precio
 PriceUHT=Precio
-PriceUHTCurrency=Precio (moneda)
 PriceUTTC=Precio (inc. IVA)
 Amount=Cantidad
 AmountInvoice=Valor de la factura
@@ -489,7 +488,6 @@ NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos export
 Miscellaneous=Varios
 GroupBy=Agrupar por...
 SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar solo parcialmente traducidos o pueden contener errores. Ayude a corregir su idioma registrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> para agregar sus mejoras.
-DirectDownloadLink=Enlace de descarga directa (público/externo)
 DownloadDocument=Descargar documento
 ActualizeCurrency=Actualizar tipo de cambio
 ModuleBuilder=Módulo y generador de aplicaciones
diff --git a/htdocs/langs/es_EC/margins.lang b/htdocs/langs/es_EC/margins.lang
index c9a6111c6da..efb47f4ed10 100644
--- a/htdocs/langs/es_EC/margins.lang
+++ b/htdocs/langs/es_EC/margins.lang
@@ -13,7 +13,6 @@ SalesRepresentativeMargins=Márgenes del representante de ventas
 UserMargins=Márgenes de usuario
 ChooseProduct/Service=Elija un producto o servicio
 ForceBuyingPriceIfNull=Forzar la compra/precio de coste al precio de venta si no se define
-ForceBuyingPriceIfNullDetails=Si el precio de compra/costo no está definido, y esta opción "ON", el margen será cero en línea (precio de compra/costo = precio de venta), de lo contrario ("OFF"), el margen será igual al valor predeterminado sugerido.
 MARGIN_METHODE_FOR_DISCOUNT=Método de margen para descuentos globales
 UseDiscountOnTotal=En subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define si un descuento global se trata como un producto, un servicio o sólo en el subtotal para el cálculo del margen.
diff --git a/htdocs/langs/es_EC/orders.lang b/htdocs/langs/es_EC/orders.lang
index 942acb41d5b..d8e0030693a 100644
--- a/htdocs/langs/es_EC/orders.lang
+++ b/htdocs/langs/es_EC/orders.lang
@@ -116,6 +116,7 @@ PDFEratostheneDescription=Un modelo de orden completo
 PDFEdisonDescription=Un modelo de pedido simple
 PDFProformaDescription=Una plantilla completa de factura Proforma
 CreateInvoiceForThisCustomer=Ordenes de factura
+CreateInvoiceForThisSupplier=Ordenes de factura
 NoOrdersToInvoice=No hay pedidos facturables
 CloseProcessedOrdersAutomatically=Clasifique "Procesado" todos los pedidos seleccionados.
 OrderCreation=Creación de órdenes
diff --git a/htdocs/langs/es_EC/productbatch.lang b/htdocs/langs/es_EC/productbatch.lang
index 347913cbe2c..f4e3485e547 100644
--- a/htdocs/langs/es_EC/productbatch.lang
+++ b/htdocs/langs/es_EC/productbatch.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - productbatch
 ManageLotSerial=Utilice el número de lote/serie
-ProductStatusOnBatch=Sí (se requiere lote/serie)
 ProductStatusNotOnBatch=No (lote/serie no utilizado)
 atleast1batchfield=Fecha de entrega o Fecha de caducidad o Lote/Número de serie
 batch_number=Lote/Número de serie
diff --git a/htdocs/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
index c75401d2e14..150d9069c25 100644
--- a/htdocs/langs/es_EC/products.lang
+++ b/htdocs/langs/es_EC/products.lang
@@ -61,7 +61,6 @@ NoteNotVisibleOnBill=Nota (no visible en facturas, propuestas...)
 ServiceLimitedDuration=Si el producto es un servicio con duración limitada:
 MultiPricesAbility=Múltiples segmentos de precios por producto / servicio (cada cliente está en un segmento de precios)
 MultiPricesNumPrices=Número de precios
-AssociatedProductsAbility=Enable Kits (set of several products)
 ParentProductsNumber=Número de producto de embalaje principal
 ParentProducts=Productos para los padres
 KeywordFilter=Filtro de palabras clave
@@ -169,7 +168,6 @@ GlobalVariableUpdaterHelp1=Analiza los datos de WebService desde la URL especifi
 GlobalVariableUpdaterHelpFormat1=El formato de la solicitud es {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"tu": "datos", "para": "enviar"}}
 PropalMergePdfProductActualFile=Los archivos se utilizan para agregar en PDF Azur son/es
 PropalMergePdfProductChooseFile=Seleccionar archivos PDF
-IncludingProductWithTag=Incluye producto/servicio con etiqueta
 DefaultPriceRealPriceMayDependOnCustomer=Precio predeterminado, el precio real puede depender del cliente
 NbOfQtyInProposals=Cantidad en las propuestas
 ClinkOnALinkOfColumn=Haga clic en un enlace de la columna %s para obtener una vista detallada ...
diff --git a/htdocs/langs/es_EC/stocks.lang b/htdocs/langs/es_EC/stocks.lang
index cb52d69ad69..355b8ac0592 100644
--- a/htdocs/langs/es_EC/stocks.lang
+++ b/htdocs/langs/es_EC/stocks.lang
@@ -22,7 +22,6 @@ ListMouvementStockProject=Lista de movimientos de inventario asociado al proyect
 StocksArea=Área de almacenes
 IncludeAlsoDraftOrders=Incluya también borradores de órdenes
 Location=Ubicación
-LocationSummary=Ubicación del nombre corto
 NumberOfProducts=Número total de productos
 StockCorrection=Corrección de inventario
 CorrectStock=Inventario correcto
diff --git a/htdocs/langs/es_EC/suppliers.lang b/htdocs/langs/es_EC/suppliers.lang
index 4e550c17661..9d9e2b2015a 100644
--- a/htdocs/langs/es_EC/suppliers.lang
+++ b/htdocs/langs/es_EC/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Vendedores/Proveedores
 SuppliersInvoice=Factura del proveedor
+SupplierInvoices=Facturas del vendedor / proveedor
 ShowSupplierInvoice=Mostrar factura del proveedor
 ListOfSuppliers=Lista de proveedores
 ShowSupplier=Mostrar vendedor/proveedor
diff --git a/htdocs/langs/es_EC/ticket.lang b/htdocs/langs/es_EC/ticket.lang
index ae99f099a88..de9e0c92141 100644
--- a/htdocs/langs/es_EC/ticket.lang
+++ b/htdocs/langs/es_EC/ticket.lang
@@ -39,8 +39,6 @@ TicketsLogEnableEmailHelp=En cada cambio, se enviará un correo electrónico **
 TicketParams=Parametros
 TicketsShowModuleLogoHelp=Habilite esta opción para ocultar el módulo del logotipo en las páginas de la interfaz pública
 TicketsShowCompanyLogoHelp=Habilite esta opción para ocultar el logotipo de la empresa principal en las páginas de la interfaz pública
-TicketsEmailAlsoSendToMainAddress=También envíe notificaciones a la dirección de correo electrónico principal
-TicketsEmailAlsoSendToMainAddressHelp=Habilite esta opción para enviar un correo electrónico a la dirección "Correo electrónico de notificación de" (consulte la configuración a continuación)
 TicketsLimitViewAssignedOnly=Restrinja la visualización a los tickets asignados al usuario actual (no es efectivo para usuarios externos, siempre se limita al tercero del que dependen)
 TicketsLimitViewAssignedOnlyHelp=Solo los tickets asignadas al usuario actual serán visibles. No se aplica a un usuario con derechos de gestión de tickets.
 TicketsActivatePublicInterface=Activar la interfaz pública
diff --git a/htdocs/langs/es_EC/users.lang b/htdocs/langs/es_EC/users.lang
index da68a7098db..420d41e9997 100644
--- a/htdocs/langs/es_EC/users.lang
+++ b/htdocs/langs/es_EC/users.lang
@@ -50,7 +50,6 @@ LoginAccountDisableInDolibarr=Cuenta desactivada en Dolibarr.
 UsePersonalValue=Usar valor personal
 DomainUser=Usuario del dominio %s
 CreateInternalUserDesc=Este formulario le permite crear un usuario interno en su empresa / organización. Para crear un usuario externo (cliente, proveedor, etc.), use el botón 'Crear usuario Dolibarr' de la tarjeta de contacto de ese tercero.
-InternalExternalDesc=Un usuario interno <b> </b> es un usuario que forma parte de su empresa / organización. <br> Un usuario externo <b> externo </b> es un cliente, proveedor u otro (La creación de un usuario externo para un tercero se puede hacer desde el registro de contacto del tercero). <br> <br> En ambos casos, los permisos definen los derechos en Dolibarr, también el usuario externo puede tener un administrador de menú diferente al usuario interno (Ver Inicio - Configuración - Pantalla)
 PermissionInheritedFromAGroup=Permiso concedido porque lo a heredado de un usuario de un grupo de usuarios.
 UserWillBeInternalUser=El usuario creado será un usuario interno (porque no está vinculado a un tercero en particular)
 UserWillBeExternalUser=El usuario creado será un usuario externo (debido a que está vinculado a un tercero en particular)
diff --git a/htdocs/langs/es_EC/website.lang b/htdocs/langs/es_EC/website.lang
index fb174b10601..ca551418689 100644
--- a/htdocs/langs/es_EC/website.lang
+++ b/htdocs/langs/es_EC/website.lang
@@ -27,11 +27,9 @@ ViewWebsiteInProduction=Ver sitio web utilizando las URL de inicio
 SetHereVirtualHost=<u>uso con Apache/NGinx/...</u><br>Crea en su servidor web (Apache, Nginx, ...) de un host virtual dedicado con PHP habilitado y un directorio raíz en<br><strong>%s</strong>
 YouCanAlsoTestWithPHPS=<u>Para usar con el servidor PHP incorporado</u><br> en el entorno de desarrollo, es posible que prefiera probar el sitio con el servidor web PHP incorporado (se requiere PHP 5.5) ejecutando<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP= <u> Ejecute su sitio web con otro proveedor de alojamiento Dolibarr </u> <br> Si no tiene un servidor web como Apache o NGinx disponible en Internet, puede exportar e importar su sitio web a otra instancia de Dolibarr proporcionada por otro proveedor de alojamiento Dolibarr que proporcione el servicio completo integración con el módulo del sitio web. Puede encontrar una lista de algunos proveedores de hosting Dolibarr en <a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>
-CheckVirtualHostPerms=Verifique también que el host virtual tenga permiso para <strong>%s</strong> en los archivos <br><strong>%s</strong>
 ReadPerm=Leer
 TestDeployOnWeb=Probar / implementar en la web
 PreviewSiteServedByWebServer=<u>Vista previa %s en una nueva pestaña. </u> <br><br>La %s servirá un servidor web externo (como Apache, Nginx, IIS). Debe instalar y configurar este servidor antes de apuntar al directorio:<br><strong>%s</strong><br> URL servida por un servidor externo:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Vista previa %s en una nueva pestaña.</u><br><br> La %s servirá el servidor de Dolibarr para que no necesite instalar ningún servidor web adicional (como Apache, Nginx, IIS). <br> El inconveniente es que la URL de las páginas no es fácil de usar y comienza con la ruta de acceso de su Dolibarr. <br> URL servido por Dolibarr:<br><strong>%s</strong><br><br> para usar su propio servidor web externo para servir este sitio web, cree un host virtual en su servidor web que señale el directorio <br><strong>%s</strong><br> luego ingrese el nombre de este servidor virtual y haga clic en el otro botón de vista previa.
 VirtualHostUrlNotDefined=URL del host virtual servido por el servidor web externo no definido
 SyntaxHelp=Ayuda sobre consejos de sintaxis específicos
 SiteAdded=Sitio web añadido
@@ -63,3 +61,5 @@ EditInLineOnOff=El modo 'Editar en línea' es %s
 ShowSubContainersOnOff=El modo para ejecutar 'contenido dinámico' es %s
 UseManifest=Proporcione un archivo manifest.json
 RSSFeed=RSS
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_EC/withdrawals.lang b/htdocs/langs/es_EC/withdrawals.lang
index baadc69e3b1..ba83f5af30c 100644
--- a/htdocs/langs/es_EC/withdrawals.lang
+++ b/htdocs/langs/es_EC/withdrawals.lang
@@ -77,7 +77,6 @@ SEPAFormYourBIC=Su código de identificación bancaria (BIC)
 PleaseCheckOne=Por favor, marque uno solo
 DirectDebitOrderCreated=Orden de domiciliación %s creada
 CreateForSepa=Crear un archivo de débito directo
-ICS=Creditor Identifier CI for direct debit
 END_TO_END=Etiqueta XML SEPA "EndToEndId": identificación única asignada por transacción
 USTRD=Etiqueta XML SEPA "no estructurada"
 ADDDAYS=Agregar días a la fecha de ejecución
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index cdfb3c7cb51..9be21f76a86 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Líneas de facturas contabilizadas
 ExpenseReportLines=Líneas de informes de gastos a contabilizar
 ExpenseReportLinesDone=Líneas de informes de gastos contabilizadas
 IntoAccount=Contabilizar línea con la cuenta contable
-TotalForAccount=Total para cuenta contable
+TotalForAccount=Cuenta contable total
 
 
 Ventilate=Contabilizar
@@ -209,7 +209,7 @@ Codejournal=Diario
 JournalLabel=Etiqueta del diario
 NumPiece=Apunte
 TransactionNumShort=Núm. transacción
-AccountingCategory=Grupos personalizados
+AccountingCategory=Custom group
 GroupByAccountAccounting=Agrupar por cuenta del Libro Mayor
 GroupBySubAccountAccounting=Agrupar por cuenta de libro mayor auxiliar
 AccountingAccountGroupsDesc=Puedes definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=No es posible autodetectar, utilice el menú <a href=
 
 ## Import
 ImportAccountingEntries=Entradas contables
+ImportAccountingEntriesFECFormat=Entradas contables - formato FEC
+FECFormatJournalCode=Diario de código (JournalCode)
+FECFormatJournalLabel=Diario de etiquetas (JournalLib)
+FECFormatEntryNum=Número de pieza (EcritureNum)
+FECFormatEntryDate=Fecha de pieza (EcritureDate)
+FECFormatGeneralAccountNumber=Número de cuenta general (CompteNum)
+FECFormatGeneralAccountLabel=Etiqueta de cuenta general (CompteLib)
+FECFormatSubledgerAccountNumber=Número de cuenta del libro mayor auxiliar (CompAuxNum)
+FECFormatSubledgerAccountLabel=Número de cuenta del libro mayor auxiliar (CompAuxLib)
+FECFormatPieceRef=Pieza ref (PieceRef)
+FECFormatPieceDate=Creación de fecha de pieza (PieceDate)
+FECFormatLabelOperation=Operación de etiquetas (EcritureLib)
+FECFormatDebit=Débito (Debit)
+FECFormatCredit=Crédito (Credit)
+FECFormatReconcilableCode=Código conciliable (EcritureLet)
+FECFormatReconcilableDate=Fecha conciliable (DateLet)
+FECFormatValidateDate=Fecha de pieza validada (ValidDate)
+FECFormatMulticurrencyAmount=Importe multidivisa (Montantdevise)
+FECFormatMulticurrencyCode=Código multidivisa (Idevise)
+
 DateExport=Fecha de exportación
 WarningReportNotReliable=Advertencia, este informe no se basa en el Libro mayor, por lo que no contiene modificaciones manualmente modificadas en el Libro mayor.. Si su diario está actualizado, la vista contable es más precisa.
 ExpenseReportJournal=Informe de gastos diario
 InventoryJournal=Inventario
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 81056fb58e1..6f3f04104c8 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Eliminar bloqueo de conexiones
 YourSession=Su sesión
 Sessions=Sesiones de usuarios
 WebUserGroup=Servidor web usuario/grupo
+PermissionsOnFiles=Permisos sobre archivos
 PermissionsOnFilesInWebRoot=Permisos de ficheros en directorio raiz web
 PermissionsOnFile=Permisos en el fichero %s
 NoSessionFound=Parece que su PHP no puede listar las sesiones activas. El directorio de salvaguardado 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).
@@ -62,6 +63,7 @@ IfModuleEnabled=Nota: sólo es eficaz si el módulo <b>%s</b> está activado
 RemoveLock=Elimine o renombre el archivo <b>%s</b>, si existe, para permitir el uso de la herramienta de Actualización/Instalación.
 RestoreLock=Restaure el archivo <b> %s </b>, solo con permiso de lectura, para deshabilitar cualquier uso posterior de la herramienta Actualización/Instalación.
 SecuritySetup=Configuración de la seguridad
+PHPSetup=Configuración de PHP
 SecurityFilesDesc=Defina aquí las opciones de seguridad relacionadas con la subida de archivos.
 ErrorModuleRequirePHPVersion=Error, este módulo requiere una versión %s o superior de PHP
 ErrorModuleRequireDolibarrVersion=Error, este módulo requiere una versión %s o superior de Dolibarr
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Esta área ofrece distintas funciones de administración. Ut
 Purge=Purga
 PurgeAreaDesc=Esta página le permite borrar todos los archivos generados o almacenados por Dolibarr (archivos temporales o todos los archivos del directorio <b>%s</b>). El uso de esta función no es necesaria. Se proporciona como solución para los usuarios cuyos Dolibarr se encuentran en un proveedor que no ofrece permisos para eliminar los archivos generados por el servidor web.
 PurgeDeleteLogFile=Eliminar archivos de registro, incluidos <b> %s</b> definidos por el módulo Syslog (sin riesgo de perder datos)
-PurgeDeleteTemporaryFiles=Eliminar todos los archivos de registro y temporales (sin riesgo de perder datos). Nota: La eliminación de archivos temporales se realiza solo si el directorio temporal se creó hace más de 24 horas.
+PurgeDeleteTemporaryFiles=Elimine todos los archivos de registro y temporales (sin riesgo de perder datos). El parámetro puede ser 'tempfilesold', 'logfiles' o ambos 'tempfilesold + logfiles'. Nota: La eliminación de archivos temporales se realiza solo si el directorio temporal se creó hace más de 24 horas.
 PurgeDeleteTemporaryFilesShort=Eliminar archivos de registro y temporales
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos del directorio <b>%s</b>. Serán eliminados archivos temporales y archivos relacionados con elementos (terceros, facturas, etc.), archivos subidos al módulo GED, copias de seguridad de la base de datos y archivos temporales.
 PurgeRunNow=Purgar
@@ -232,6 +234,7 @@ BoxesAvailable=Paneles disponibles
 BoxesActivated=Paneles activados
 ActivateOn=Activar en
 ActiveOn=Activo en
+ActivatableOn=Activable en
 SourceFile=Archivo origen
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solamente si Javascript y Ajax están activados
 Required=Requerido
@@ -347,9 +350,10 @@ LastActivationAuthor=Último autor de activación
 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>
+GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, se pueden utilizar las siguientes etiquetas: <br> <b> {000000} </b> corresponde a un número que se incrementará en cada %s. Ingrese tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara. <br> <b> {000000 + 000} </b> igual que el anterior pero se aplica un desplazamiento correspondiente al número a la derecha del signo + comenzando en el primer %s. <br> <b> {000000 @ x} </b> igual que el anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definido en su configuración, o 99 para poner a cero todos los meses). Si se usa esta opción y x es 2 o superior, entonces también se requiere la secuencia {yy} {mm} o {yyyy} {mm}. <br> <b> {dd} </b> día (01 a 31). <br> <b> {mm} </b> mes (01 a 12). <br> <b> {yy} </b>, <b> {yyyy} </b> o <b> {y} </b> año sobre 2, 4 o 1 cifras. <br>
+GenericMaskCodes2= <b> {cccc} </b> el código de cliente en n caracteres <br> <b> {cccc000} </b> el código de cliente es un código de cliente dedicado a n. Este contador dedicado al cliente se pone a cero al mismo tiempo que el contador global. <br> <b> {tttt} </b> El código del tipo de terceros en n caracteres (ver menú Inicio - Configuración - Diccionario - Tipos de terceros). Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero. <br>
 GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios. <br>No se permiten espacios <br>
+GenericMaskCodes3EAN=Todos los demás caracteres de la máscara permanecerán intactos (excepto * o ? En la 13ª posición en EAN13). <br> No se permiten espacios. <br> En EAN13, el último carácter después del último} en la 13ª posición debería ser * o ? . Será reemplazado por la clave calculada. <br>
 GenericMaskCodes4a=<u>Ejemplo en la 99 ª %s del tercero La Empresa realizada el 31/03/2007: </u><br>
 GenericMaskCodes4b=<u>Ejemplo sobre un tercero creado el 31/03/2007:</u><br>
 GenericMaskCodes4c=<u>Ejemplo en un producto/servicio creado el 31/03/2007:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Mantener este campo vacío significa que el valor se
 ExtrafieldParamHelpselect=El listado de valores tiene que ser líneas key,valor<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para tener una lista en funcion de campos adicionales de lista:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para tener la lista en función de otra:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=El listado de valores tiene que ser líneas con el formato key,valor<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=El listado de valores tiene que ser líneas con el formato key,valor (donde key no puede ser 0)<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla: etiqueta_field: id_field :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br> <br> filtro puede ser una prueba simple (por ejemplo, activa = 1) Para mostrar sólo el valor activo <br> También puede utilizar $ ID $ en el filtro witch es el actual id del objeto actual <br> Para hacer un SELECT en el filtro de uso $ SEL $ <br> si desea filtrar en campos adicionales utilizar la sintaxis Extra.fieldcode = ... (donde código de campo es el código de campo adicional) <br> <br> Para que la lista dependa de otra lista de campos adicionales: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
-ExtrafieldParamHelpchkbxlst=Lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla: etiqueta_field: id_field :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br> <br> filtro puede ser una prueba simple (por ejemplo, activa = 1) Para mostrar sólo el valor activo <br> También puede utilizar $ ID $ en el filtro witch es el id actual del objeto actual <br> Para hacer un SELECT en el filtro de uso $ SEL $ <br> si desea filtrar en campos adicionales utilizar la sintaxis Extra.fieldcode = ... (donde código de campo es el código de campo adicional) <br> <br> Para que la lista dependa de otra lista de campos adicionales: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelpsellist=La lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla:campo_etiqueta:campo_id::filtrosql <br> Ejemplo: c_typent:libelle:id::filtrosql <br> <br> - id_campo es una clave entera primaria SQL es condición necesaria.<br> Puede ser una prueba simple (por ejemplo, activo = 1) para mostrar solo el valor activo <br> También puede usar $ID$ en el filtro, que es el ID actual del objeto actual <br> Para usar un SELECT en el filtro, use la palabra clave $SEL$ para bypass de protección anti-inyección. <br> si desea filtrar en campos extra, use la sintaxis extra.fieldcode=... (donde el código de campo es el código del campo extra)  <br> <br>Para que la lista dependa de otra lista de atributos complementarios: <br> c_typent:libelle:id:options_ <i> parent_list_code</i>|parent_column:filter  <br><br> Para que la lista dependa de otra lista: <br> c_typent:libelle:id: <i>parent_list_code</i> |parent_column:filter
+ExtrafieldParamHelpchkbxlst=Lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla:etiqueta_field: id_field::filtro <br> Ejemplo: c_typent:libelle:id::filtro <br> <br> filtro puede ser una prueba simple (por ejemplo, activa = 1) Para mostrar sólo el valor activo <br> También puede utilizar $ID$ en el filtro witch es el id actual del objeto actual <br> Para hacer un SELECT en el filtro de uso $SEL$ <br> si desea filtrar en campos adicionales utilizar la sintaxis Extra.fieldcode=...(donde código de campo es el código de campo adicional) <br> <br> Para que la lista dependa de otra lista de campos adicionales: <br> c_typent: libelle:id:options_ <i> parent_list_code </i> | parent_column:filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent:libelle:id: <i> parent_list_code </i> | parent_column:filter
 ExtrafieldParamHelplink=Los parámetros deben ser NombreObjeto:RutaClase <br>Sintaxis: NombreObjeto:RutaClase
 ExtrafieldParamHelpSeparator=Mantener vacío para un separador simple <br> Establezca a 1 para un separador de colapso (abierto de forma predeterminada para una nueva sesión, luego el estado se mantiene para cada sesión de usuario) <br> Establezca a 2 para un separador de colapso (colapsado por defecto para una nueva sesión, luego el estado se mantiene para cada sesión de usuario)
 LibraryToBuildPDF=Libreria usada en la generación de los PDF
@@ -541,6 +545,8 @@ Module40Name=Proveedores
 Module40Desc=Proveedores y gestión de compras (órdenes de compra y facturación de facturas de proveedores)
 Module42Name=Registros de depuración
 Module42Desc=Generación de logs (archivos, syslog,...). Dichos registros son para propósitos técnicos/de depuración.
+Module43Name=Barra de depuración
+Module43Desc=Una herramienta para que los desarrolladores agreguen una barra de depuración en su navegador.
 Module49Name=Editores
 Module49Desc=Gestión de editores
 Module50Name=Productos
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacidades de conversión GeoIP Maxmind
 Module3200Name=Archivos inalterables
 Module3200Desc=Activar el registro inalterable de eventos empresariales. Los eventos se archivan en tiempo real. El registro es una tabla de sucesos encadenados que se pueden leer y exportar. Este módulo puede ser obligatorio en algunos países.
+Module3400Name=Redes sociales
+Module3400Desc=Habilite campos de Redes Sociales en terceros y direcciones (skype, twitter, facebook, ...).
 Module4000Name=RRHH
 Module4000Desc=Departamento de Recursos Humanos (gestión del departamento, contratos de empleados)
 Module5000Name=Multi-empresa
 Module5000Desc=Permite gestionar varias empresas
-Module6000Name=Flujo de trabajo
-Module6000Desc=Gestión de flujos de trabajo (creación automática de objeto y/o cambio de estado automático)
+Module6000Name=Flujo de trabajo entre módulos
+Module6000Desc=Gestión del flujo de trabajo entre diferentes módulos (creación automática de objeto y / o cambio de estado automático)
 Module10000Name=Sitios web
 Module10000Desc=Cree sitios web (públicos) con un editor WYSIWYG. Este es un CMS orientado a webmasters o desarrolladores (es mejor conocer el lenguaje HTML y CSS). Simplemente configure su servidor web (Apache, Nginx, ...) para que apunte al directorio dedicado de Dolibarr para tenerlo en línea en Internet con su propio nombre de dominio.
 Module20000Name=Gestión de días libres
@@ -805,7 +813,8 @@ PermissionAdvanced253=Crear/modificar usuarios internos/externos y sus permisos
 Permission254=Crear/modificar únicamente usuarios externos
 Permission255=Modificar la contraseña de otros usuarios
 Permission256=Eliminar o desactivar otros usuarios
-Permission262=Ampliar el acceso a todos los terceros (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).
+Permission262=Ampliar el acceso a todos los terceros Y sus objetos (no solo a los terceros para los que el usuario es representante de ventas) <br> No efectivo para usuarios externos (siempre limitado a ellos mismos para propuestas, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asuntos de asignación).
+Permission263=Ampliar el acceso a todos los terceros SIN sus objetos (no solo a los terceros para los que el usuario es representante de ventas). <br> No efectivo para usuarios externos (siempre limitado a ellos mismos para propuestas, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asuntos de asignación).
 Permission271=Consultar el CA
 Permission272=Consultar las facturas
 Permission273=Emitir las facturas
@@ -1175,7 +1184,8 @@ SetupDescription2=Las siguientes dos secciones son obligatorias (las dos primera
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Parámetros básicos para personalizar el comportamiento por defecto de Dolibarr (por ejemplo características relacionadas con el país) 
 SetupDescription4=<a href="%s">%s -> %s</a> <br><br>Este software es una colección de varios módulos/aplicaciones. Los módulos relevantes para tus necesidades deben ser activados y configurados. Se añadirán nuevas funcionalidades a los menús por cada módulo que se active.
 SetupDescription5=Las otras entradas de configuración gestionan parámetros opcionales.
-LogEvents=Auditoría de la seguridad de eventos
+AuditedSecurityEvents=Eventos de seguridad que se auditan
+NoSecurityEventsAreAduited=No se auditan eventos de seguridad. Puede habilitarlos desde el menú %s
 Audit=Auditoría
 InfoDolibarr=Acerca de Dolibarr
 InfoBrowser=Acerca del Navegador
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Parece necesario realizar el proceso de actual
 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
+SimpleNumRefModelDesc=Devuelve el número de referencia en el formato %syymm-nnnn donde aa es el año, mm es el mes y nnnn es un número secuencial que se incrementa automáticamente sin reinicio.
 ShowProfIdInAddress=Mostrar el identificador profesional en las direcciones
 ShowVATIntaInAddress=Ocultar el identificador IVA Intracomunitario en las direcciones
 TranslationUncomplete=Traducción parcial
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Servidor proxy: Nombre/Dirección
 MAIN_PROXY_PORT=Servidor proxy: Puerto
 MAIN_PROXY_USER=Servidor proxy: Login/Usuario
 MAIN_PROXY_PASS=Servidor proxy: Contraseña
-DefineHereComplementaryAttributes=Defina aquí la lista de campos adicionales, no disponibles por defecto, y que desea gestionar para %s.
+DefineHereComplementaryAttributes=Defina cualquier atributo adicional / personalizado que deba agregarse a: %s
 ExtraFields=Campos adicionales
 ExtraFieldsLines=Campos adicionales (líneas)
 ExtraFieldsLinesRec=Campos adicionales (plantillas de líneas de facturas)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Ejemplo : uid
 LDAPFilterConnection=Filtro de búsqueda
 LDAPFilterConnectionExample=Ejemplo : &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Ejemplo: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Ejemplo : samaccountname
 LDAPFieldFullname=Nombre completo
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Su empresa está configurada como no sujeta al IVA (Ini
 AccountancyCode=Código contable
 AccountancyCodeSell=Código contable ventas
 AccountancyCodeBuy=Código contable compras
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenga la casilla de verificación "Crear el pago automáticamente" vacía de forma predeterminada al crear un nuevo impuesto.
 ##### Agenda #####
 AgendaSetup=Módulo configuración de acciones y agenda
 PasswordTogetVCalExport=Clave de autorización vcal export link
+SecurityKey = Security Key
 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=Establecer automáticamente este valor por defecto para el tipo de evento en la creación de un evento
@@ -1879,7 +1892,7 @@ 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.
+EnterAnyCode=Este campo contiene una referencia para identificar la línea. Ingrese cualquier valor de su elección, pero sin caracteres especiales.
 Enter0or1=Introduzca 0 o 1
 UnicodeCurrency=Ingrese aquí entre llaves, lista con número de byte que representa el símbolo de moneda. Por ejemplo: para $, introduzca [36] - para Brasil Real R$ [82,36] - para €, introduzca [8364]
 ColorFormat=El color RGB es en formato HEX, ej: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Margen inferior en PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altura del logo en PDF
 NothingToSetup=No hay ninguna configuración a realizar en este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto a sí si este grupo es un cálculo de otros grupos
-EnterCalculationRuleIfPreviousFieldIsYes=Ingrese regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, 'CODEGRP1 + CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Ingrese la regla de cálculo si el campo anterior se estableció en Sí. <br> Por ejemplo: <br> CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=Varias variantes de idioma encontradas
 RemoveSpecialChars=Eliminar caracteres especiales
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtro Regex para limpiar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Configuración del módulo de redes sociales.
 EnableFeatureFor=Habilitar funciones para <strong> %s </strong>
 VATIsUsedIsOff=Nota: La opción de usar el IVA se ha establecido como <strong>Desactivado</strong> en el menú %s - %s, por lo que el IVA usado siempre será 0 para las ventas.
 SwapSenderAndRecipientOnPDF=Intercambiar dirección de remitente y destinatario en documentos PDF
-FeatureSupportedOnTextFieldsOnly=Advertencia, función compatible solo en los campos de texto. También se debe establecer un parámetro de URL action=create o action=edit o el nombre de la página debe terminar con 'new.php' para activar esta función.
+FeatureSupportedOnTextFieldsOnly=Advertencia, función compatible solo con campos de texto y listas combinadas. Además, se debe establecer un parámetro de URL action = create o action = edit O el nombre de la página debe terminar con 'new.php' para activar esta función.
 EmailCollector=Recolector de correo
 EmailCollectorDescription=Añade una tarea programada y una página de configuración para escanear los buzones de e-mail con regularidad (utilizando el protocolo IMAP) y registra los e-mails recibidos en su aplicación, en el lugar correcto y/o crea registros automáticamente (como leads).
 NewEmailCollector=Nuevo recolector de e-mail
@@ -2049,8 +2062,11 @@ UseDebugBar=Usa la barra de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas líneas de registro para mantener en la consola.
 WarningValueHigherSlowsDramaticalyOutput=Advertencia, los valores altos ralentizan dramáticamente la salida.
 ModuleActivated=El módulo %s está activado y ralentiza dramáticamente la interfaz
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=El módulo %s está activado y el nivel de registro (%s) es correcto (no demasiado detallado)
 IfYouAreOnAProductionSetThis=Si esta en un entorno de produccion, deberia establecer esta propiedad  a %s
 AntivirusEnabledOnUpload=Antivirus habilitado en los ficheros subidos
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Los modelos de exportación son compartidos con todos.
 ExportSetup=Configuración del módulo de exportación.
 ImportSetup=Configuración del módulo Importar
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Realice un Ping anónimo '+1' al servidor de la base Dolibarr
 FeatureNotAvailableWithReceptionModule=Función no disponible cuando el módulo Recepción está activado
 EmailTemplate=Plantilla para e-mail
 EMailsWillHaveMessageID=Los e-mais tendrán una etiqueta 'Referencias' que coincida con esta sintaxis
+PDF_SHOW_PROJECT=Mostrar proyecto en documento
+ShowProjectLabel=Etiqueta del proyecto
 PDF_USE_ALSO_LANGUAGE_CODE=Si desea duplicar algunos textos en su PDF en 2 idiomas diferentes en el mismo PDF generado, debe establecer aquí este segundo idioma para que el PDF generado contenga 2 idiomas diferentes en la misma página, el elegido al generar el PDF y este ( solo unas pocas plantillas PDF lo admiten). Mantener vacío para 1 idioma por PDF.
 FafaIconSocialNetworksDesc=Ingrese aquí el código de un ícono FontAwesome. Si no sabe qué es FontAwesome, puede usar el valor genérico fa-address-book.
 FeatureNotAvailableWithReceptionModule=Función no disponible cuando el módulo Recepción está activado
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Cambiar el valor a %s es lo recomendado para una ma
 DictionaryProductNature= Naturaleza del producto
 CountryIfSpecificToOneCountry=País (si es específico de un país determinado)
 YouMayFindSecurityAdviceHere=Puede encontrar un aviso de seguridad aqui.
-ModuleActivatedMayExposeInformation=Este modulo puede exponer datos sensibles. Si no lo necesita, desactivelo.
+ModuleActivatedMayExposeInformation=Esta extensión de PHP puede exponer datos confidenciales. Si no lo necesita, desactívelo.
 ModuleActivatedDoNotUseInProduction=Un modulo diseñado para desarrollo ha sido habilitado. No lo habilite en un entorno de produccion.
 CombinationsSeparator=Carácter separador para las combinaciones de productos
 SeeLinkToOnlineDocumentation=Ver enlace a la documentación online del menú superior para ejemplos
 SHOW_SUBPRODUCT_REF_IN_PDF=Si se utiliza la función "%s" del módulo <b>%s</b>, muestra los detalles de los subproductos de un kit en PDF.
 AskThisIDToYourBank=Comuníquese con su banco para obtener esta identificación
+AdvancedModeOnly=Permiso disponible solo en el modo de permiso avanzado
+ConfFileIsReadableOrWritableByAnyUsers=Cualquier usuario puede leer o escribir en el archivo conf. Otorgue permiso al usuario y al grupo del servidor web únicamente.
+MailToSendEventOrganization=Organización de evento
+AGENDA_EVENT_DEFAULT_STATUS=Estado de evento predeterminado al crear un evento desde el formulario
+YouShouldDisablePHPFunctions=Deberías deshabilitar las funciones de PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Excepto si necesita ejecutar comandos del sistema (para el módulo Trabajo programado o para ejecutar el antivirus de línea de comando externo, por ejemplo), debe deshabilitar las funciones de PHP
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 748edda9c76..596be0958d9 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Su mandato SEPA
 FindYourSEPAMandate=Este es su mandato SEPA para autorizar a nuestra empresa a realizar un petición de débito directo a su banco. Gracias por devolverlo firmado (escaneo del documento firmado) o enviado por correo a
 AutoReportLastAccountStatement=Rellenar automáticamente el campo 'número de extracto bancario' con el último número de extracto cuando realice la conciliación
 CashControl=Cierre de caja del POS
-NewCashFence=Nuevo cierre de caja
+NewCashFence=Apertura o cierre de nueva caja
 BankColorizeMovement=Colorear movimientos
 BankColorizeMovementDesc=Si esta función está activada, puede elegir un color de fondo específico para los movimientos de débito o crédito
 BankColorizeMovementName1=Color de fondo para el movimiento de débito
 BankColorizeMovementName2=Color de fondo para el movimiento de crédito
 IfYouDontReconcileDisableProperty=Si no realiza las conciliaciones bancarias en algunas cuentas bancarias, desactive la propiedad "%s" en ellas para eliminar esta advertencia.
 NoBankAccountDefined=Sin cuenta bancaria definida
+NoRecordFoundIBankcAccount=No se encontró ningún registro en la cuenta bancaria. Por lo general, esto ocurre cuando un registro se ha eliminado manualmente de la lista de transacciones en la cuenta bancaria (por ejemplo, durante una conciliación de la cuenta bancaria). Otra razón es que el pago se registró cuando se deshabilitó el módulo "%s".
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index fadf06b8e3b..d6ba3c3b0e3 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -54,9 +54,10 @@ InvoiceCustomer=Factura a cliente
 CustomerInvoice=Factura a cliente
 CustomersInvoices=Facturas a clientes
 SupplierInvoice=Factura proveedor
-SuppliersInvoices=Facturas de proveedores
+SuppliersInvoices=Facturas proveedor
+SupplierInvoiceLines=Líneas de factura de proveedor
 SupplierBill=Factura proveedor
-SupplierBills=Facturas de proveedores
+SupplierBills=Facturas proveedor
 Payment=Pago
 PaymentBack=Devolución
 CustomerInvoicePaymentBack=Devolución
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Pagos efectuados
 PaymentsBackAlreadyDone=Reembolsos ya realizados
 PaymentRule=Forma de pago
 PaymentMode=Tipo de pago
+DefaultPaymentMode=Tipo de pago predeterminado
+DefaultBankAccount=Cuenta bancaria predeterminada
 PaymentTypeDC=Tarjeta de Débito/Crédito
 PaymentTypePP=PayPal
 IdPaymentMode=Tipo de pago (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Fecha de la última generación
 DateLastGenerationShort=Fecha última generación
 MaxPeriodNumber=Nº máximo de facturas a generar
 NbOfGenerationDone=Nº de facturas ya generadas
+NbOfGenerationOfRecordDone=Número de generación de registros ya realizada
 NbOfGenerationDoneShort=Generados
 MaxGenerationReached=Máximo número de generaciones alcanzado
 InvoiceAutoValidate=Validar facturas automáticamente
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=14 días a fin de més
 FixAmount=Cantidad fija -1 línea con la etiqueta '%s'
 VarAmount=Importe variable (%% total)
 VarAmountOneLine=Cantidad variable (%% tot.) - 1 línea con la etiqueta '%s'
-VarAmountAllLines=Importe variable (%% total) - todas las mismas líneas
+VarAmountAllLines=Cantidad variable (%% tot.) - todas las líneas desde el origen
 # PaymentType
 PaymentTypeVIR=Transferencia bancaria
 PaymentTypeShortVIR=Transferencia bancaria
@@ -494,12 +498,16 @@ Cash=Efectivo
 Reported=Aplazado
 DisabledBecausePayments=No disponible ya que existen pagos
 CantRemovePaymentWithOneInvoicePaid=Eliminación imposible cuando existe al menos una factura clasificada como pagada.
+CantRemovePaymentVATPaid=No se puede eliminar el pago porque la declaración de IVA se clasifica como pagada
+CantRemovePaymentSalaryPaid=No se puede eliminar el pago porque el salario se clasifica como pagado
 ExpectedToPay=Esperando el pago
 CantRemoveConciliatedPayment=No se puede eliminar un pago conciliado
 PayedByThisPayment=Pagada por este pago
 ClosePaidInvoicesAutomatically=Clasificar automáticamente todas las facturas estándar, de anticipo o de reemplazo como "Pagadas" cuando el pago se realice por completo.
 ClosePaidCreditNotesAutomatically=Clasifique automáticamente todas las notas de crédito como "Pagadas"cuando el reembolso se realice por completo.
 ClosePaidContributionsAutomatically=Clasifique automáticamente todas las contribuciones sociales o fiscales como "Pagadas" cuando el pago se realice por completo.
+ClosePaidVATAutomatically=Clasifica automáticamente la declaración de IVA como "Pagada" cuando el pago se realiza en su totalidad.
+ClosePaidSalaryAutomatically=Clasifica automáticamente el salario como "Pagado" cuando el pago se realiza en su totalidad.
 AllCompletelyPayedInvoiceWillBeClosed=Todas las facturas con un resto a pagar 0 serán automáticamente cerradas al estado "Pagada".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Tiene que crear una factura estandar antes
 PDFCrabeDescription=Factura PDF plantilla Crabe. Una plantilla de factura completa (antigua implementación de la plantilla Sponge)
 PDFSpongeDescription=Modelo de factura Esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Modelo PDF de factura Crevette. Un completo modelo de facturas de situación
-TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas, %syymm-nnnn para las facturas rectificativas y %syymm-nnnn para los abonos donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0
-MarsNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas, %syymm-nnnn para las facturas rectificativas, %syymm-nnnn para los anticipos y %syymm-nnnn para los abonos donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Ya existe una factura con $syymm y no es compatible con este modelo de secuencia. Elimínela o renómbrela para poder activar este módulo
-CactusNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas, %syymm-nnnn para los abonos y %syymm-nnnn para los anticipos donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Motivo de cierre anticipado
 EarlyClosingComment=Nota de cierre anticipado
 ##### Types de contacts #####
@@ -562,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Si necesita generar facturas automáticamente,
 DeleteRepeatableInvoice=Eliminar plantilla de factura
 ConfirmDeleteRepeatableInvoice=¿Está seguro de querer borrar la plantilla para facturas?
 CreateOneBillByThird=Crear una factura por tercero (de lo contrario, una factura por pedido)
-BillCreated=%s factura(s) creadas
+BillCreated=%s factura (s) generada
+BillXCreated=Factura %s generada
 StatusOfGeneratedDocuments=Estado de la generación de documentos
 DoNotGenerateDoc=No generar archivo de documento
 AutogenerateDoc=Generar automáticamente archivo de documento
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index cc519ff040a..c4ce2bde6f0 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Estadísticas sobre los principales objetos comerciales en la base de datos
 BoxLoginInformation=Información login
 BoxLastRssInfos=Hilos de información RSS
 BoxLastProducts=Últimos %s productos/servicios
@@ -17,9 +18,13 @@ BoxLastActions=Últimas acciones
 BoxLastContracts=Últimos contratos
 BoxLastContacts=Últimos contactos/direcciones
 BoxLastMembers=Últimos miembros
+BoxLastModifiedMembers=Miembros modificados más recientes
+BoxLastMembersSubscriptions=Últimas suscripciones de miembros
 BoxFicheInter=Últimas intervenciones
 BoxCurrentAccounts=Balance de cuentas abiertas
 BoxTitleMemberNextBirthdays=Cumpleaños de este mes (miembros)
+BoxTitleMembersByType=Miembros por tipo
+BoxTitleMembersSubscriptionsByYear=Suscripciones de miembros por año
 BoxTitleLastRssInfos=Últimas %s noticias de %s
 BoxTitleLastProducts=Productos/Servicios: últimos %s modificados
 BoxTitleProductsAlertStock=Productos: alerta de stock
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Últimos %s envíos a clientes
 NoRecordedShipments=Ningún envío a clientes registrado
 BoxCustomersOutstandingBillReached=Clientes con límite pendiente alcanzado
 # Pages
-AccountancyHome=Contabilidad
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Proyectos validados
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index b50d6c93e65..644e01fb868 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Área etiquetas/categorías Proveedores
 CustomersCategoriesArea=Área etiquetas/categorías Clientes
 MembersCategoriesArea=Área etiquetas/categorías Miembros
 ContactsCategoriesArea=Área etiquetas/categorías de contactos
-AccountsCategoriesArea=Área categorías contables
+AccountsCategoriesArea=Área de etiquetas / categorías de cuentas bancarias
 ProjectsCategoriesArea=Área etiquetas/categorías Proyectos
 UsersCategoriesArea=Área etiquetas/categorías Usuarios
 SubCats=Subcategorías
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Asignar categoría a proveedor
 ShowCategory=Mostrar etiqueta/categoría
 ByDefaultInList=Por defecto en lista
 ChooseCategory=Elija una categoría
-StocksCategoriesArea=Categorías de almacenes
-ActionCommCategoriesArea=Categorías de eventos
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Categorías de contenedor de página
 UseOrOperatorForCategories=Uso u operador para categorías
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 3a99ea2432b..57b67050848 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -45,6 +45,7 @@ ParentCompany=Sede central
 Subsidiaries=Filiales
 ReportByMonth=Informe por mes
 ReportByCustomers=Informe por cliente
+ReportByThirdparties=Informe por tercero
 ReportByQuarter=Informe por tasa
 CivilityCode=Código cortesía
 RegisteredOffice=Domicilio social
@@ -172,14 +173,20 @@ ProfId1ES=CIF/NIF
 ProfId2ES=Núm. seguridad social
 ProfId3ES=CNAE
 ProfId4ES=Núm. colegiado
-ProfId5ES=Número EORI
+ProfId5ES=Prof Id 5 (número EORI)
 ProfId6ES=-
 ProfId1FR=SIREN
 ProfId2FR=SIRET
 ProfId3FR=NAF (Ex APE)
 ProfId4FR=RCS/RM
-ProfId5FR=Número EORI
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Número registro
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=Número EORI
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=NIPC
 ProfId2PT=Núm. seguridad social
 ProfId3PT=Num reg. comercial
 ProfId4PT=Conservatorio
-ProfId5PT=Número EORI
+ProfId5PT=Prof Id 5 (número EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=CUI
 ProfId2RO=Prof ID 2 (Numero de registro)
 ProfId3RO=CAEN
 ProfId4RO=EUID
-ProfId5RO=Número EORI
+ProfId5RO=Prof Id 5 (número EORI)
 ProfId6RO=-
 ProfId1RU=OGRN
 ProfId2RU=INN
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Riesgo alcanzado
 OutstandingBill=Importe máximo para facturas pendientes
 OutstandingBillReached=Importe máximo para facturas pendientes
 OrderMinAmount=Importe mínimo para pedido
-MonkeyNumRefModelDesc=Devuelve un número bajo el formato %syymm-nnnn para los códigos de clientes y %syymm-nnnn para los códigos de los proveedores, donde yy es el año, mm el mes y nnnn un contador secuencial sin ruptura y sin volver a 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Código de cliente/proveedor libre sin verificación. Puede ser modificado en cualquier momento.
 ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.)
 MergeOriginThirdparty=Tercero duplicado (tercero que debe eliminar)
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 2fd8288fc12..55fb7c5857b 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=Compras SGST
 VATCollected=IVA recuperado
 StatusToPay=A pagar
 SpecialExpensesArea=Área de pagos especiales
+VATExpensesArea=Área para todos los pagos de IVA
 SocialContribution=Impuestos sociales o fiscales
 SocialContributions=Impuestos sociales o fiscales
 SocialContributionsDeductibles=Impuestos sociales o fiscales deducibles
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Cobro factura a cliente
 PaymentSupplierInvoice=Pago factura de proveedor
 PaymentSocialContribution=Pagos tasas sociales/fiscales
 PaymentVat=Pago IVA
+AutomaticCreationPayment=Registra automáticamente el pago
 ListPayment=Listado de pagos
 ListOfCustomerPayments=Listado de pagos de clientes
 ListOfSupplierPayments=Listado de pagos a proveedores
@@ -104,6 +106,8 @@ LT2PaymentES=Pago IRPF
 LT2PaymentsES=Pagos IRPF
 VATPayment=Pago IVA
 VATPayments=Pagos IVA
+VATDeclarations=Declaraciones de IVA
+VATDeclaration=Declaración de IVA
 VATRefund=Devolución IVA
 NewVATPayment=Nuevo pago IVA
 NewLocalTaxPayment=Nuevo pago %s
@@ -134,9 +138,17 @@ NoWaitingChecks=Sin cheques a la espera de depósito
 DateChequeReceived=Fecha recepción del cheque
 NbOfCheques=Nº de cheques
 PaySocialContribution=Pagar una tasa social/fiscal
-ConfirmPaySocialContribution=¿Está seguro de querer clasificar esta tasa social o fiscal como pagada?
+PayVAT=Pagar una declaración de IVA
+PaySalary=Pagar una tarjeta de salario
+ConfirmPaySocialContribution=¿Seguro que quiere clasificar este impuesto social o fiscal como pagado?
+ConfirmPayVAT=¿Está seguro de que desea clasificar esta declaración de IVA como pagada?
+ConfirmPaySalary=¿Está seguro de que desea clasificar esta tarjeta salarial como pagada?
 DeleteSocialContribution=Eliminar un pago de tasa social o fiscal
-ConfirmDeleteSocialContribution=¿Está seguro de querer eliminar este pago de tasa social/fiscal?
+DeleteVAT=Eliminar una declaración de IVA
+DeleteSalary=Eliminar una tarjeta de salario
+ConfirmDeleteSocialContribution=¿Está seguro de que desea eliminar este pago de impuestos sociales / fiscales?
+ConfirmDeleteVAT=¿Está seguro de que desea eliminar esta declaración de IVA?
+ConfirmDeleteSalary=¿Está seguro de que desea eliminar este salario?
 ExportDataset_tax_1=tasas sociales y fiscales y pagos
 CalcModeVATDebt=Modo <b>%sIVA sobre facturas emitidas%s</b>.
 CalcModeVATEngagement=Modo <b>%sIVA sobre facturas cobradas%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- Incluye los pagos realizados sobre las facturas, las gastos y
 RulesCADue=- Incluye las facturas vencidas del cliente, ya sean pagadas o no. <br>- Se basa en la fecha de facturación de estas facturas.<br>
 RulesCAIn=- Incluye los pagos efectuados de las facturas a clientes.<br>- Se basa en la fecha de pago de las mismas<br>
 RulesCATotalSaleJournal=Incluye todas las líneas de crédito del diario de ventas.
+RulesSalesTurnoverOfIncomeAccounts=Incluye (crédito - débito) de líneas para cuentas de productos en el grupo INGRESOS
 RulesAmountOnInOutBookkeepingRecord=Incluye registro en su libro mayor con cuentas contables que tiene el grupo "GASTOS" o "INGRESOS"
 RulesResultBookkeepingPredefined=Incluye registro en su libro mayor con cuentas contables que tiene el grupo "GASTOS" o "INGRESOS"
 RulesResultBookkeepingPersonalized=Muestra un registro en su libro mayor con cuentas contables <b>agrupadas por grupos personalizados</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Informe de impuestos por terceros
 VATReportByCustomers=Informe IVA por cliente
 VATReportByCustomersInInputOutputMode=Informe por cliente del IVA repercutido y soportado
 VATReportByQuartersInInputOutputMode=Informe por tasa del IVA repercutido y soportado
+VATReportShowByRateDetails=Mostrar detalles de esta tarifa
 LT1ReportByQuarters=Informe de IRPF por tasa
 LT2ReportByQuarters=Informe de IRPF por tasa
 LT1ReportByQuartersES=Informe de RE por tasa
@@ -217,7 +231,7 @@ Pcg_subtype=Subtipo de cuenta
 InvoiceLinesToDispatch=Líneas de facturas a contabilizar
 ByProductsAndServices=Por productos y servicios
 RefExt=Ref. externa
-ToCreateAPredefinedInvoice=Para crear una plantilla de factura, cree una factura estándar, seguidamente, sin validarla, haga clic en el botón "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Enlazar a un pedido
 Mode1=Método 1
 Mode2=Método 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Se utilizará una cuenta contable dedicada defi
 ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable usada para proveedores
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Se utilizará una cuenta contable dedicada definida en la ficha de terceros para el relleno del Libro Mayor, o como valor predeterminado de la contabilidad del Libro Mayor si no se define una cuenta contable en la ficha del tercero
 ConfirmCloneTax=Confirmar la clonación de una tasa social/fiscal
+ConfirmCloneVAT=Confirmar la clonación de una declaración de IVA
+ConfirmCloneSalary=Confirmar el clon de un salario
 CloneTaxForNextMonth=Clonarla para el próximo mes
 SimpleReport=informe simple
 AddExtraReport=Informes adicionales (añade informe de clientes extranjeros y nacionales)
@@ -253,7 +269,8 @@ AccountingAffectation=Asignación de cuenta contable
 LastDayTaxIsRelatedTo=Último día del período del impuesto
 VATDue=Impuesto reclamado
 ClaimedForThisPeriod=Reclamado para el período
-PaidDuringThisPeriod=Pagado durante este período
+PaidDuringThisPeriod=Pagado por este período
+PaidDuringThisPeriodDesc=Esta es la suma de todos los pagos vinculados a las declaraciones de IVA que tienen una fecha de fin de período en el rango de fechas seleccionado
 ByVatRate=Por tasa de impuesto
 TurnoverbyVatrate=Volumen de ventas emitidas por tipo de impuesto
 TurnoverCollectedbyVatrate=Volumen de ventas cobradas por tipo de impuesto
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Volumen de compras pagadas
 RulesPurchaseTurnoverDue=- Incluye las facturas vencidas del proveedor, ya sean pagadas o no.<br> - Se basa en la fecha de facturación de estas facturas.<br>
 RulesPurchaseTurnoverIn=- Incluye todos los pagos efectuados de facturas hechas a proveedores.<br>- Se basa en la fecha de pago de estas facturas.<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Incluye todas las líneas de débito del diario de compras.
+RulesPurchaseTurnoverOfExpenseAccounts=Incluye (débito - crédito) de líneas para cuentas de productos del grupo GASTOS
 ReportPurchaseTurnover=Volumen de compras facturado
 ReportPurchaseTurnoverCollected=Volumen de compras pagadas
 IncludeVarpaysInResults = Incluir varios pagos en informes
diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
index 6a4b189771f..11fadb7ed0c 100644
--- a/htdocs/langs/es_ES/ecm.lang
+++ b/htdocs/langs/es_ES/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Archivo aún no indexado en la base de datos (intent
 ExtraFieldsEcmFiles=campos adicionales de archivos GED
 ExtraFieldsEcmDirectories=Campos adicionales de Directorios GED
 ECMSetup=Configuración de GED
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index a25529bdd52..4ab326b7c28 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directorio<b>%s</b>no encontrado (Ruta incorrecta, permisos ina
 ErrorFunctionNotAvailableInPHP=La función  <b>%s</b> es requerida por esta funcionalidad, pero no se encuetra disponible en esta versión/instalación de PHP.
 ErrorDirAlreadyExists=Ya existe un directorio con ese nombre.
 ErrorFileAlreadyExists=Ya existe un archivo con este nombre.
+ErrorDestinationAlreadyExists=Ya existe otro archivo con el nombre <b> %s </b>.
 ErrorPartialFile=Archivo no recibido íntegramente por el servidor.
 ErrorNoTmpDir=Directorio temporal de recepción %s inexistente
 ErrorUploadBlockedByAddon=Subida bloqueada por un plugin PHP/Apache.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error al cargar plan contable. Si no se cargaron algunas cu
 ErrorBadSyntaxForParamKeyForContent=Sintaxis incorrecta para el parámetro keyforcontent. Debe tener un valor que comience con %s o %s
 ErrorVariableKeyForContentMustBeSet=Error, debe configurarse la constante con el nombre %s (con contenido de texto para mostrar) o %s (con url externa para mostrar).
 ErrorURLMustStartWithHttp=La URL %s debe comenzar con http:// o https://
+ErrorHostMustNotStartWithHttp=El nombre de host %s NO debe comenzar con http: // o https: //
 ErrorNewRefIsAlreadyUsed=Error, la nueva referencia ya está en uso
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, no es posible eliminar un pago enlazado a una factura cerrada.
 ErrorSearchCriteriaTooSmall=Los criterios de búsqueda son demasiado pequeños.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=La interfaz pública no estaba habilitada
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=El idioma de la nueva página debe definirse si se establece como una traducción de otra página.
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=El idioma de la nueva página no debe ser el idioma de origen si está configurado como traducción de otra página.
 ErrorAParameterIsRequiredForThisOperation=Un parámetro es obligatorio para esta operación.
+ErrorDateIsInFuture=Error, la fecha no puede ser futura
+ErrorAnAmountWithoutTaxIsRequired=Error, la cantidad es obligatoria
+ErrorAPercentIsRequired=Error, ingrese el porcentaje correctamente
+ErrorYouMustFirstSetupYourChartOfAccount=Primero debe configurar su plan de cuentas
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Advertencia, no se pudo agregar la entra
 WarningTheHiddenOptionIsOn=Advertencia, la opción oculta <b> %s </b> está activada.
 WarningCreateSubAccounts=Advertencia, no puede crear directamente una subcuenta, debe crear un tercero o un usuario y asignarles un código de contabilidad para encontrarlos en esta lista.
 WarningAvailableOnlyForHTTPSServers=Disponible solo si usa una conexión segura HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=El módulo %s no se ha habilitado. Así que puede perderse muchos eventos aquí.
+ErrorActionCommPropertyUserowneridNotDefined=Se requiere el propietario del usuario
+ErrorActionCommBadType=El tipo de evento seleccionado (id: %n, código: %s) no existe en el diccionario de tipo de evento
diff --git a/htdocs/langs/es_ES/externalsite.lang b/htdocs/langs/es_ES/externalsite.lang
index 973ff6db361..d66d608abbf 100644
--- a/htdocs/langs/es_ES/externalsite.lang
+++ b/htdocs/langs/es_ES/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Configuración del enlace al sitio web externo
-ExternalSiteURL=URL del sitio externo
+ExternalSiteURL=URL del sitio externo de contenido de iframe HTML
 ExternalSiteModuleNotComplete=El módulo Sitio web externo no ha sido configurado correctamente.
 ExampleMyMenuEntry=Mi entrada de menú
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index bdc22f9fe03..ebe06f60a3f 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Fecha modif.
 IPModification=IP de modificación
 DateLastModification=Última fecha de modificación
 DateValidation=Fecha de validación
+DateSigning=Fecha de firma
 DateClosing=Fecha de cierre
 DateDue=Fecha de vencimiento
 DateValue=Fecha valor
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Precio base (moneda)
 UnitPriceTTC=Precio unitario total
 PriceU=P.U.
 PriceUHT=P.U.
-PriceUHTCurrency=P.U. (divisa)
+PriceUHTCurrency=P.U. (neto) (moneda)
 PriceUTTC=P.U. (i.i.)
 Amount=Importe
 AmountInvoice=Importe factura
@@ -389,6 +390,8 @@ AmountTotal=Importe total
 AmountAverage=Importe medio
 PriceQtyMinHT=Precio cantidad min. total
 PriceQtyMinHTCurrency=Precio cantidad min. (moneda)
+PercentOfOriginalObject=Porcentaje de objeto original
+AmountOrPercent=Cantidad o porcentaje
 Percentage=Porcentaje
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Miembros
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Impuestos | Gastos especiales
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú inicio-configuración-seguridad): %s Kb, PHP limit: %s Kb
-NoFileFound=No hay documentos guardados en este directorio
+NoFileFound=No se cargaron documentos
 CurrentUserLanguage=Idioma actual
 CurrentTheme=Tema actual
 CurrentMenuManager=Gestor menú actual
@@ -899,8 +902,10 @@ ViewAccountList=Ver libro mayor
 ViewSubAccountList=Ver libro mayor de subcuenta
 RemoveString=Eliminar cadena '%s'
 SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar parcialmente traducidos o pueden contener errores. Si detecta algunos, puede corregir los archivos de idiomas registrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Enlace de descarga directa
-DirectDownloadInternalLink=Enlace de descarga directa (necesita estar registrado y necesita permisos)
+DirectDownloadLink=Enlace de descarga público
+PublicDownloadLinkDesc=Solo se requiere el enlace para descargar el archivo
+DirectDownloadInternalLink=Enlace de descarga privado
+PrivateDownloadLinkDesc=Debe iniciar sesión y necesita permisos para ver o descargar el archivo
 Download=Descargar
 DownloadDocument=Descargar el documento
 ActualizeCurrency=Actualizar el tipo de cambio
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contactos
 SearchIntoMembers=Miembros
 SearchIntoUsers=Usuarios
 SearchIntoProductsOrServices=Productos o servicios
+SearchIntoBatch=Lotes / Series
 SearchIntoProjects=Proyectos
 SearchIntoMO=Órdenes de fabricación
 SearchIntoTasks=Tareas
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Atajo de teclado
 AssignedTo=Asignada a
 Deletedraft=Eliminar borrador
 ConfirmMassDraftDeletion=Confirmación de borrado de borradores en masa
-FileSharedViaALink=Archivo compartido a través de un enlace
+FileSharedViaALink=Archivo compartido con un enlace público
 SelectAThirdPartyFirst=Selecciona un tercero primero...
 YouAreCurrentlyInSandboxMode=Actualmente se encuentra en el modo %s "sandbox"
 Inventory=Inventario
 AnalyticCode=Código analítico
 TMenuMRP=MRP
+ShowCompanyInfos=Mostrar información de la empresa
 ShowMoreInfos=Mostrar más información
 NoFilesUploadedYet=Por favor, cargue un documento primero
 SeePrivateNote=Ver nota privada
@@ -1120,3 +1127,5 @@ AffectTag=Afectar etiqueta
 ConfirmAffectTag=Afectar etiquetas masivas
 ConfirmAffectTagQuestion=¿Está seguro de que desea asignar las etiquetas a los %s registros seleccionados?
 CategTypeNotFound=No se encontró ningún tipo de etiqueta para el tipo de registros
+CopiedToClipboard=Copiado al portapapeles
+InformationOnLinkToContract=Esta cantidad es solo el total de todas las líneas del contrato. No se toma en consideración ninguna noción de tiempo.
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index 9ebc58db8ef..7fa990805dd 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -22,7 +22,7 @@ ProductService=Producto o servicio
 AllProducts=Todos los productos y servicios
 ChooseProduct/Service=Elija el producto o servicio
 ForceBuyingPriceIfNull=Forzar precio de compra/coste al precio de venta si no se define
-ForceBuyingPriceIfNullDetails=Si el precio de compra/coste no se ha definido, y esta opción está activada, el margen será cero en la línea (precio de compra/coste = precio de venta), de lo contrario el margen será igual al sugerido por defecto.
+ForceBuyingPriceIfNullDetails=Si no se proporciona el precio de compra / costo cuando agregamos una nueva línea, y esta opción está "ON", el margen será 0 en la nueva línea (precio de compra / costo = precio de venta). Si esta opción está "DESACTIVADA" (recomendada), el margen será igual al valor sugerido por defecto (y puede ser del 100% si no se puede encontrar un valor por defecto).
 MARGIN_METHODE_FOR_DISCOUNT=Método de gestión de descuentos globales
 UseDiscountAsProduct=Como un producto
 UseDiscountAsService=Como un servicio
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index 726d56b3bb8..656b756efad 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Listado de miembros borrador (a validar)
 MembersListValid=Listado de miembros validados
 MembersListUpToDate=Listado de miembros válidos con suscripción actualizada
 MembersListNotUpToDate=Listado de miembros válidos con suscripción caducada
+MembersListExcluded=Lista de miembros excluidos
 MembersListResiliated=Listado de los miembros dados de baja
 MembersListQualified=Listado de los miembros cualificados
 MenuMembersToValidate=Miembros borrador
 MenuMembersValidated=Miembros validados
+MenuMembersExcluded=Miembros excluidos
 MenuMembersResiliated=Miembros de baja
 MembersWithSubscriptionToReceive=Miembros a la espera de recibir afiliación
 MembersWithSubscriptionToReceiveShort=Suscripción a recibir
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Afiliación expirada
 MemberStatusActiveLateShort=No al día
 MemberStatusPaid=Afiliaciones al día
 MemberStatusPaidShort=Al día
+MemberStatusExcluded=Miembro excluido
+MemberStatusExcludedShort=Excluido
 MemberStatusResiliated=Miembro de baja
 MemberStatusResiliatedShort=De baja
 MembersStatusToValid=Miembros borrador
+MembersStatusExcluded=Miembros excluidos
 MembersStatusResiliated=Miembros de baja
 MemberStatusNoSubscription=Validado (no se necesita suscripción)
 MemberStatusNoSubscriptionShort=Validado
@@ -82,6 +87,8 @@ Physical=Físico
 Moral=Jurídico
 MorAndPhy=Moral y Físico
 Reenable=Reactivar
+ExcludeMember=Excluir a un miembro
+ConfirmExcludeMember=¿Está seguro de que desea excluir a este miembro?
 ResiliateMember=Dar de baja un miembro
 ConfirmResiliateMember=¿Está seguro de querer dar de baja a este miembro?
 DeleteMember=Eliminar un miembro
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla del e-mail a enviar a un
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla del e-mail para usar para enviar e-mail a un miembro en un nuevo registro de suscripción
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla del e-mail a enviar cuando una membresía esté a punto de expirar
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla del e-mail a enviar a un miembro cuando un miembro se de de baja
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=E-mail emisor para los e-mails automáticos
 DescADHERENT_ETIQUETTE_TYPE=Formato páginas etiquetas
 DescADHERENT_ETIQUETTE_TEXT=Texto a imprimir en la dirección de las etiquetas de cada miembro
@@ -162,6 +170,7 @@ DocForLabels=Generación de etiquetas de direcciones
 SubscriptionPayment=Pago cuota
 LastSubscriptionDate=Fecha de la última cotización
 LastSubscriptionAmount=Importe de la última cotización
+LastMemberType=Último tipo de miembro
 MembersStatisticsByCountries=Estadísticas de miembros por país
 MembersStatisticsByState=Estadísticas de miembros por departamento/provincia/región
 MembersStatisticsByTown=Estadísticas de miembros por población
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index 7f8008aa4cd..0974ccd8292 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=Quiero generar algunos documentos del objeto.
 IncludeDocGenerationHelp=Si marca esto, se generará código para agregar  un panel "Generar documento" en el registro.
 ShowOnCombobox=Mostrar valor en el combobox
 KeyForTooltip=Clave para tooltip
-CSSClass=Clase CSS
+CSSClass=CSS para editar / crear formulario
+CSSViewClass=CSS para formulario de lectura
+CSSListClass=CSS para lista
 NotEditable=No editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Tipo de campos: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' significa que agregamos un botón + después del combo para crear el registro, 'filtro' puede ser 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' por ejemplo)
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 14aa5ba7ccc..4b7a1bf7461 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Realizar pedido
 MakeOrder=Realizar pedido
 SupplierOrder=Pedido a proveedor
 SuppliersOrders=Pedidos a proveedor
+SaleOrderLines=Líneas de orden de venta
+PurchaseOrderLines=Líneas de pedido de compra
 SuppliersOrdersRunning=Pedidos a proveedor en curso
 CustomerOrder=Pedido de cliente
 CustomersOrders=Pedidos
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 0e4f2c2c4e6..f02f402b153 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Empresa con actividades múltiples (todos los módulos principale
 CreatedBy=Creado por %s
 ModifiedBy=Modificado por %s
 ValidatedBy=Validado por %s
+SignedBy=Firmado por %s
 ClosedBy=Cerrado por %s
 CreatedById=Id usuario que ha creado
 ModifiedById=Id de usuario que ha realizado último cambio
@@ -244,6 +245,7 @@ NewKeyIs=Esta es su nueva contraseña para iniciar sesión
 NewKeyWillBe=Su nueva contraseña para iniciar sesión en el software será
 ClickHereToGoTo=Haga click aquí para ir a %s
 YouMustClickToChange=Sin embargo, debe hacer click primero en el siguiente enlace para validar este cambio de contraseña
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Si usted no ha solicitado este cambio, simplemente ignore este email. Sus credenciales son guardadas de forma segura.
 IfAmountHigherThan=si el importe es mayor que <strong>%s</strong>
 SourcesRepository=Repositorio de los fuentes
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index 1a6500487f1..7e9513db440 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Usar numeración por lotes/series
-ProductStatusOnBatch=Sí (se necesita lote/serie)
+ProductStatusOnBatch=Si (lote requerido)
+ProductStatusOnSerial=Sí (se requiere un número de serie único)
 ProductStatusNotOnBatch=No (no se usa lote/serie)
-ProductStatusOnBatchShort=Sí
+ProductStatusOnBatchShort=Lote
+ProductStatusOnSerialShort=Serie
 ProductStatusNotOnBatchShort=No
 Batch=Lote/Serie
 atleast1batchfield=Fecha de caducidad o Fecha de venta o Lote/Numero de Serie
@@ -22,3 +24,12 @@ ProductLotSetup=Configuración del módulo lotes/series
 ShowCurrentStockOfLot=Mostrar el stock actual de este producto/lote
 ShowLogOfMovementIfLot=Ver los movimientos de stock de este producto/lote
 StockDetailPerBatch=Detalle de stock por lote
+SerialNumberAlreadyInUse=El número de serie %s ya se utiliza para el producto %s
+TooManyQtyForSerialNumber=Solo puede tener un producto %s para el número de serie %s
+BatchLotNumberingModules=Opciones para la generación automática de productos por lotes gestionados por lotes
+BatchSerialNumberingModules=Opciones para la generación automática de productos por lotes gestionados por números de serie
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Cantidad a agregar para cada código de barras / lote / serie escaneado
+
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 6511c425686..4ee991b8a18 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=Tasa IVA (para este producto/proveedor)
 DiscountQtyMin=Descuento para esta cantidad
 NoPriceDefinedForThisSupplier=Ningún precio/cant. definido para este proveedor/producto
 NoSupplierPriceDefinedForThisProduct=Ningún precio/cant. proveedor definida para este producto
+PredefinedItem=Elemento predefinido
 PredefinedProductsToSell=Producto predefinido
 PredefinedServicesToSell=Servicio predefinido
 PredefinedProductsAndServicesToSell=Productos/servicios predefinidos a la venta
@@ -313,7 +314,7 @@ LastUpdated=Última actualización
 CorrectlyUpdated=Actualizado correctamente
 PropalMergePdfProductActualFile=Archivos que se usan para añadir en el PDF Azur son
 PropalMergePdfProductChooseFile=Seleccione los archivos PDF
-IncludingProductWithTag=Productos/servicios incluidos en el tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Precio por defecto, el precio real puede depender del cliente
 WarningSelectOneDocument=Seleccione al menos un documento
 DefaultUnitToShow=Unidad
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 31513b0cd20..c3d001e9b7a 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumido
 ListOfTasks=Listado de tareas
 GoToListOfTimeConsumed=Ir al listado de tiempos consumidos
 GanttView=Vista de Gantt
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Listado de presupuestos asociados al proyecto
 ListOrdersAssociatedProject=Listado de pedidos de clientes asociados al proyecto
 ListInvoicesAssociatedProject=Listado de facturas a clientes asociadas al proyecto
@@ -234,7 +235,7 @@ OppStatusPENDING=Pendiente
 OppStatusWON=Ganado
 OppStatusLOST=Perdido
 Budget=Presupuesto
-AllowToLinkFromOtherCompany=Permitir vincular proyecto de otra empresa <br> <br> <u> Valores admitidos: </u><br> - Mantener vacío: puede vincular cualquier proyecto de la empresa (predeterminado) <br> - "todo": puede vincular cualquier proyecto, incluso proyectos de otras empresas <br> - Una lista de identificación de terceros separada por comas: puede vincular todos los proyectos de esos terceros definidos (Ejemplo: 123,4795,53) <br>
+AllowToLinkFromOtherCompany=Permitir vincular proyecto de otra empresa <br> <br> <u> Valores admitidos: </u><br> - Mantener vacío: puede vincular cualquier proyecto de la empresa (predeterminado) <br> - "all": puede vincular cualquier proyecto, incluso proyectos de otras empresas <br> - Una lista de identificación de terceros separada por comas: puede vincular todos los proyectos de esos terceros definidos (Ejemplo: 123,4795,53) <br>
 LatestProjects=Últimos %s presupuestos
 LatestModifiedProjects=Últimos %s proyectos modificados 
 OtherFilteredTasks=Otras tareas filtradas
@@ -268,3 +269,7 @@ OneLinePerTask=Una línea por tarea
 OneLinePerPeriod=Una línea por período
 RefTaskParent=Ref. Tarea principal
 ProfitIsCalculatedWith=El beneficio se calcula usando
+AddPersonToTask=Agregar también a las tareas
+UsageOrganizeEvent=Uso: Organización de eventos
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Clasifique el proyecto como cerrado cuando se completen todas sus tareas (progreso 100%%)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: los proyectos existentes con todas las tareas en 100%% no se verán afectados: tendrás que cerrarlos manualmente. Esta opción solo afecta a proyectos abiertos.
diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang
index b0d6536d10d..62505a106a3 100644
--- a/htdocs/langs/es_ES/propal.lang
+++ b/htdocs/langs/es_ES/propal.lang
@@ -59,6 +59,7 @@ ConfirmClonePropal=¿Está seguro de querer clonar el presupuesto <b>%s</b>?
 ConfirmReOpenProp=¿Está seguro de querer reabrir el presupuesto <b>%s</b>?
 ProposalsAndProposalsLines=Presupuestos a clientes y líneas de presupuestos
 ProposalLine=Línea de presupuesto
+ProposalLines=Líneas de presupuesto
 AvailabilityPeriod=Tiempo de entrega
 SetAvailability=Definir el tiempo de entrega
 AfterOrder=desde la firma
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index c40c86b03c9..aa551813b9c 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Stock faltante
 StockAtDate=Stock a fecha
-StockAtDateInPast=Fecha en el pasado
-StockAtDateInFuture=Fecha en el futuro
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks por lotes/serie
 LotSerial=Lotes/Series
 LotSerialList=Listado de lotes/series
@@ -37,8 +37,8 @@ AllWarehouses=Todos los almacenes
 IncludeEmptyDesiredStock=Incluir también stock negativo con stock deseado indefinido
 IncludeAlsoDraftOrders=Incluir también pedidos borrador
 Location=Lugar
-LocationSummary=Nombre corto del lugar
-NumberOfDifferentProducts=Número de productos diferentes
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Numero total de productos
 LastMovement=Último movimiento
 LastMovements=Últimos movimientos
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crear automáticamente existencias/almacén propio del usuario en la creación del usuario
 AllowAddLimitStockByWarehouse=Administrar también el valor del stock mínimo y deseado de la cupla (producto-almacén) además del valor del stock mínimo y deseado por producto
 RuleForWarehouse=Regla para almacenes
-WarehouseAskWarehouseDuringPropal=Establecer un almacén para presupuestos de venta
+WarehouseAskWarehouseOnThirparty=Establecer un almacén en un tercero
+WarehouseAskWarehouseDuringPropal=Establecer un almacén en presupuestos comerciales
 WarehouseAskWarehouseDuringOrder=Indicar un almacén en pedidos de clientes
 UserDefaultWarehouse=Indicar un almacén en usuarios
 MainDefaultWarehouse=Almacén por defecto
@@ -97,15 +98,16 @@ RealStockDesc=El stock físico o real es la stock que tiene actualmente en sus a
 RealStockWillAutomaticallyWhen=El stock real cambiará automáticamente de acuerdo con esta regla (según configuración del módulo de stock):
 VirtualStock=Stock virtual
 VirtualStockAtDate=Stock virtual a fecha
-VirtualStockAtDateDesc=Stock virtual una vez que se procesen todos los pedidos pendientes que se planea realizar antes de la fecha
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=El stock virtual es el stock que obtendrá una vez que todas las acciones abiertas/pendientes (que afecten al stock) serán cerradas (pedidos a proveedor del proveedor recibidos, pedidos de clientes enviados, ...)
+AtDate=En la fecha
 IdWarehouse=Id. almacén
 DescWareHouse=Descripción almacén
 LieuWareHouse=Localización almacén
 WarehousesAndProducts=Almacenes y productos
 WarehousesAndProductsBatchDetail=Almacenes y productos (con detalle por lote/serie)
 AverageUnitPricePMPShort=Valor (PMP)
-AverageUnitPricePMPDesc=El precio unitario promedio de entrada que tuvimos que pagar a los proveedores para que el producto estuviera en nuestras existencias.
+AverageUnitPricePMPDesc=El precio unitario promedio de entrada que tuvimos que gastar para obtener 1 unidad de producto en nuestro stock.
 SellPriceMin=Precio de venta unitario
 EstimatedStockValueSellShort=Valor de venta
 EstimatedStockValueSell=Valor de venta
@@ -145,7 +147,7 @@ Replenishments=Reaprovisionamiento
 NbOfProductBeforePeriod=Cantidad del producto %s en stock antes del periodo seleccionado (< %s)
 NbOfProductAfterPeriod=Cantidad del producto %s en stock después del periodo seleccionado (> %s)
 MassMovement=Movimientos en masa
-SelectProductInAndOutWareHouse=Selecccione un producto, una cantidad, un almacén origen y un almacén destino, seguidamente haga clic "%s". Una vez seleccionados todos los movimientos, haga clic en "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Registrar transferencia
 ReceivingForSameOrder=Recepciones de este pedido
 StockMovementRecorded=Movimiento de stock registrado
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=El nivel de stock debe ser suficiente para añadir e
 StockMustBeEnoughForOrder=El nivel de stock debe ser suficiente para añadir el producto/servicio al pedido (se realiza comprobación del stock real actual al agregar una línea en el pedido según las reglas del módulo stocks)
 StockMustBeEnoughForShipment= El nivel de stock debe ser suficiente para añadir el producto/servicio en el envío (se realiza comprobación del stock real actual al agregar una línea en el envío según las reglas del módulo stocks)
 MovementLabel=Etiqueta del movimiento
-TypeMovement=Tipo de movimiento
+TypeMovement=Dirección de movimiento
 DateMovement=Fecha de movimiento
 InventoryCode=Movimiento o código de inventario
 IsInPackage=Contenido en el paquete
@@ -183,6 +185,7 @@ inventoryCreatePermission=Crear nuevo inventario
 inventoryReadPermission=Ver inventarios
 inventoryWritePermission=Actualizar inventarios
 inventoryValidatePermission=Validar inventario
+inventoryDeletePermission=Eliminar inventario
 inventoryTitle=Inventario
 inventoryListTitle=Inventarios
 inventoryListEmpty=Sin inventario en progreso
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Se requiere stock para elegir qué lote usa
 ForceTo=Forzar
 AlwaysShowFullArbo=Mostrar el árbol completo del almacén en la ventana emergente de enlaces del almacén (Advertencia: esto puede disminuir drásticamente el rendimiento)
 StockAtDatePastDesc=Puede ver aquí el stock (stock real) en una fecha determinada en el pasado
-StockAtDateFutureDesc=Puede ver aquí el stock (stock virtual) en una fecha determinada en el futuro
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Stock actual
 InventoryRealQtyHelp=Establezca el valor en 0 para restablecer la cantidad <br> Mantenga el campo vacío o elimine la línea para mantenerlo sin cambios
-UpdateByScaning=Actualizar escaneando
+UpdateByScaning=Llene la cantidad real escaneando
 UpdateByScaningProductBarcode=Actualización por escaneo (código de barras del producto)
 UpdateByScaningLot=Actualización por escaneo (lote | código de barras de serie)
 DisableStockChangeOfSubProduct=Desactive el cambio de stock de todos los subproductos de este Kit durante este movimiento.
+ImportFromCSV=Importar lista CSV de movimientos
+ChooseFileToImport=Cargue el archivo y luego haga clic en el icono %s para seleccionar el archivo como archivo de importación de origen ...
+SelectAStockMovementFileToImport=seleccione un archivo de movimiento de stock para importar
+InfoTemplateImport=El archivo cargado debe tener este formato (* son campos obligatorios): <br> Almacén de origen * | Almacén de destino * | Producto * | Cantidad * | Lote / número de serie <br> El separador de caracteres CSV debe ser "<b> %s </b>"
+LabelOfInventoryMovemement=Inventario %s
+ReOpen=Reabrir
+ConfirmFinish=¿Confirmas el cierre del inventario? Esto generará todos los movimientos de stock para actualizar su stock.
+ObjectNotFound=%s no encontrado
+MakeMovementsAndClose=Generar movimientos y cerrar
+AutofillWithExpected=Llene la cantidad real con la cantidad esperada
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index d66117c0ab4..3ca5ccc0155 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Proveedores
 SuppliersInvoice=Factura proveedor
+SupplierInvoices=Facturas proveedor
 ShowSupplierInvoice=Ver factura de proveedor
 NewSupplier=Nuevo proveedor
 History=Histórico
diff --git a/htdocs/langs/es_ES/ticket.lang b/htdocs/langs/es_ES/ticket.lang
index 2ff65db0cfc..2fb5cd1f69d 100644
--- a/htdocs/langs/es_ES/ticket.lang
+++ b/htdocs/langs/es_ES/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Eliminado
 # Dict
 Type=Tasa
 Severity=Gravedad
+TicketGroupIsPublic=El grupo es público
+TicketGroupIsPublicDesc=Si un grupo de tickets es público, será visible en el formulario al crear un ticket desde la interfaz pública.
 
 # Email templates
 MailToSendTicketMessage=Enviar e-mail desde ticket
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Mostrar el logotipo del módulo en la interfaz pública
 TicketsShowModuleLogoHelp=Active esta opción para ocultar el logotipo en las páginas de la interfaz pública
 TicketsShowCompanyLogo=Mostrar el logotipo de la empresa en la interfaz pública
 TicketsShowCompanyLogoHelp=Active esta opción para ocultar el logotipo de la empresa principal en las páginas de la interfaz pública
-TicketsEmailAlsoSendToMainAddress=También envíe notificaciones a la dirección de e-mail principal
-TicketsEmailAlsoSendToMainAddressHelp=Active esta opción para enviar un e-mail a la dirección "E-mail de notificación de" (consulte la configuración a continuación)
+TicketsEmailAlsoSendToMainAddress=También envíe una notificación a la dirección de correo electrónico principal
+TicketsEmailAlsoSendToMainAddressHelp=Habilite esta opción para enviar también un correo electrónico a la dirección definida en la configuración "%s" (consulte la pestaña "%s")
 TicketsLimitViewAssignedOnly=Restringir la visualización de los tickets asignados al usuario actual (no aplicable para usuarios externos, siempre estará limitada al tercero del que dependen)
 TicketsLimitViewAssignedOnlyHelp=Solo los tickets asignados al usuario actual serán visibles. No se aplica a un usuario con derechos de gestión de tickets.
 TicketsActivatePublicInterface=Activar interfaz pública.
@@ -126,10 +128,10 @@ TicketNumberingModules=Módulo de numeración de tickets
 TicketsModelModule=Plantillas de documentos para tickets
 TicketNotifyTiersAtCreation=Notificar a los terceros en la creación
 TicketsDisableCustomerEmail=Desactivar siempre los e-mails al crear tickets desde la interfaz pública
-TicketsPublicNotificationNewMessage=Enviar e-mail(s) cuando se añade un nuevo mensaje
+TicketsPublicNotificationNewMessage=Enviar correo electrónico (s) cuando se agrega un nuevo mensaje / comentario a un ticket
 TicketsPublicNotificationNewMessageHelp=Enviar e-mail(s) cuando se añade un nuevo mensaje desde la interfaz pública (al usuario asignado o al e-mail de notificaciones (actualización) y o el e-mail de notificaciones a)
 TicketPublicNotificationNewMessageDefaultEmail=Notificaciones por e-mail a (actualización)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Envíe notificaciones de mensajes nuevos por e-mail a esta dirección si el ticket no tiene un usuario asignado o si el usuario no tiene un e-mail.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Envíe un correo electrónico a esta dirección para cada notificación de mensaje nuevo si el ticket no tiene un usuario asignado o si el usuario no tiene ningún correo electrónico conocido.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Últimos tickets modificados
 BoxLastModifiedTicketDescription=Últimos %s tickets modificados
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No hay tickets modificados recientemente
+BoxTicketType=Número de tickets abiertos por tipo
+BoxTicketSeverity=Número de tickets abiertos por gravedad
+BoxNoTicketSeverity=No hay tickets abiertos
+BoxTicketLastXDays=Número de tickets nuevos por días los últimos %s días
+BoxTicketLastXDayswidget = Número de tickets nuevos por días los últimos X días
+BoxNoTicketLastXDays=No hay entradas nuevas los últimos días %s
+BoxNumberOfTicketByDay=Número de tickets nuevos por día
+BoxNewTicketVSClose=Número de tickets nuevos de hoy en comparación con los tickets cerrados de hoy
+TicketCreatedToday=Ticket creado hoy
+TicketClosedToday=Ticket cerrado hoy
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index bfc709a9e2f..8e59820c70a 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -72,7 +72,7 @@ ExportDataset_user_1=Usuarios y sus propiedades.
 DomainUser=Usuario de dominio
 Reactivate=Reactivar
 CreateInternalUserDesc=Este formulario le permite crear un usuario interno para su empresa/organización. Para crear un usuario externo (cliente, proveedor, etc), use el botón "Crear una cuenta de usuario" desde la ficha de un contacto del tercero.
-InternalExternalDesc=Un usuario <b> interno </b> es un usuario que forma parte de su empresa/organización. <br> Un usuario <b> externo </b> es un cliente, proveedor u otro (La creación de un usuario externo para un tercero se puede hacer desde el registro de contacto del tercero). <br> <br> En ambos casos, los permisos definen los derechos en Dolibarr, también el usuario externo puede tener un administrador de menú diferente al usuario interno (Ver Inicio - Configuración - Entorno)
+InternalExternalDesc=Un usuario <b>interno</b> es un usuario que forma parte de su empresa / organización, o es un usuario asociado fuera de su organización que puede necesitar ver más datos que datos relacionados con su empresa (el sistema de permisos definirá lo que puede o puede ver o hacer). <br> Un usuario <b> externo </b> es un cliente, proveedor u otro que debe ver ÚNICAMENTE datos relacionados con él mismo (la creación de un usuario externo para un tercero se puede realizar desde el registro de contacto del tercero). <br> <br> En ambos casos, debe otorgar permisos sobre las funciones que el usuario necesita.
 PermissionInheritedFromAGroup=El permiso se concede ya que lo hereda de un grupo al cual pertenece el usuario.
 Inherited=Heredado
 UserWillBe=El usuario creado será
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index 7ea28bc2c96..673c7f003f8 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost= <u>Usar con Apache/NGinx /...</u><br>Crea en su servidor we
 ExampleToUseInApacheVirtualHostConfig=Ejemplo para usar en la configuración del host virtual Apache:
 YouCanAlsoTestWithPHPS=En el entorno de desarrollo, es posible que prefiera probar el sitio con el servidor web incrustado de PHP (se requiere PHP 5.5) ejecutando <br><strong> php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Ejecute su sitio web con otro proveedor de alojamiento Dolibarr</u> <br> Si no tiene un servidor web como Apache o NGinx disponible en Internet, puede exportar e importar su sitio web a otra instancia de Dolibarr proporcionada por otro proveedor de alojamiento de Dolibarr que brinde una integración completa con el módulo del sitio web. Puede encontrar una lista de algunos proveedores de hosting Dolibarr en <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Compruebe también que el host virtual tiene <strong>%s</strong> en archivos en <strong>%s</strong>
+CheckVirtualHostPerms=Compruebe también que el usuario del host virtual (por ejemplo, www-data) tiene <strong>%s</strong>permisos en archivos en <br><strong>%s</strong>
 ReadPerm=Leido
 WritePerm=Escribir
 TestDeployOnWeb=Prueba/despliegue en la web
 PreviewSiteServedByWebServer=<u>Vista previa de %s en una nueva pestaña.</u> <br><br>%s será servido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar y configurar este servidor antes de apuntar al directorio:<br><strong>%s</strong><br> URL servida por el servidor externo: <br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Vista previa %s en una nueva pestaña.</u> <br> <br> El %s será servido por el servidor de Dolibarr por lo que no necesita instalar ningún servidor web extra (como Apache, Nginx, IIS). <br> El inconveniente es que la URL de las páginas no amigables y comienzan con la ruta de su Dolibarr. <br> URL que sirve Dolibarr: <br><strong>%s</strong>   <br> <br>Para utilizar su propio servidor web externo para servir esta web, cree un host virtual en su servidor web que apunte al directorio<br> <strong>%s</strong><br> luego escriba el nombre de este servidor virtual y haga clic en el otro botón de vista previa.
+PreviewSiteServedByDolibarr= <u> Obtenga una vista previa de %s en una pestaña nueva. </u> <br> <br> El %s será servido por el servidor Dolibarr por lo que no necesita ningún servidor web adicional (como Apache, Nginx, IIS) para ser instalado. <br> El inconveniente es que las URL de las páginas no son fáciles de usar y comienzan con la ruta de tu Dolibarr. <br> URL servida por Dolibarr: <br> <strong> %s </strong> <br> <br> Para utilizar su propio servidor web exterior al servicio de este sitio web, crear una máquina virtual en su servidor Web que señala en el directorio <br> <strong> %s </strong> <br> a continuación, introduzca el nombre de este servidor virtual en las propiedades de este sitio web y haga clic en el enlace "Probar / Implementar en la web".
 VirtualHostUrlNotDefined=URL del Host Virtual servido por un servidor externo no definido
 NoPageYet=No hay páginas todavía
 YouCanCreatePageOrImportTemplate=Puede crear una nueva página o importar una plantilla de sitio web completa
@@ -137,3 +137,11 @@ PagesRegenerated=%s página(s)/contenedor(s) regenerados
 RegenerateWebsiteContent=Regenerar archivos de caché del sitio web
 AllowedInFrames=Permitido en marcos
 DefineListOfAltLanguagesInWebsiteProperties=Defina la lista de todos los idiomas disponibles en las propiedades del sitio web.
+GenerateSitemaps=Generar archivo de mapa del sitio del sitio web
+ConfirmGenerateSitemaps=Si confirma, borrará el archivo de mapa del sitio existente ...
+ConfirmSitemapsCreation=Confirmar la generación del mapa del sitio
+SitemapGenerated=Mapa del sitio generado
+ImportFavicon=Favicon
+ErrorFaviconType=El favicon debe ser png
+ErrorFaviconSize=El favicon debe tener un tamaño de 32x32
+FaviconTooltip=Sube una imagen que debe ser un png de 32x32
diff --git a/htdocs/langs/es_ES/zapier.lang b/htdocs/langs/es_ES/zapier.lang
index cc63194a91e..553a04438ff 100644
--- a/htdocs/langs/es_ES/zapier.lang
+++ b/htdocs/langs/es_ES/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier para Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier para el módulo Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Configuración de Zapier para Dolibarr
+ZapierForDolibarrSetup=Configuración de Zapier para Dolibarr
 ZapierDescription=Interfaz con Zapier
+ZapierAbout=Sobre el módulo Zapier
+ZapierSetupPage=No es necesario realizar una configuración en el lado de Dolibarr para utilizar Zapier. Sin embargo, debe generar y publicar un paquete en zapier para poder usar Zapier con Dolibarr. Consulte la documentación sobre <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> en esta página wiki </a>.
diff --git a/htdocs/langs/es_GT/accountancy.lang b/htdocs/langs/es_GT/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/es_GT/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_GT/admin.lang b/htdocs/langs/es_GT/admin.lang
index b68a0680537..619ae5f8bd4 100644
--- a/htdocs/langs/es_GT/admin.lang
+++ b/htdocs/langs/es_GT/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_GT/modulebuilder.lang b/htdocs/langs/es_GT/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_GT/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_GT/products.lang b/htdocs/langs/es_GT/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/es_GT/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_GT/website.lang b/htdocs/langs/es_GT/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/es_GT/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_GT/withdrawals.lang b/htdocs/langs/es_GT/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/es_GT/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_HN/accountancy.lang b/htdocs/langs/es_HN/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/es_HN/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_HN/admin.lang b/htdocs/langs/es_HN/admin.lang
index b68a0680537..619ae5f8bd4 100644
--- a/htdocs/langs/es_HN/admin.lang
+++ b/htdocs/langs/es_HN/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_HN/modulebuilder.lang b/htdocs/langs/es_HN/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_HN/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_HN/products.lang b/htdocs/langs/es_HN/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/es_HN/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_HN/website.lang b/htdocs/langs/es_HN/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/es_HN/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_HN/withdrawals.lang b/htdocs/langs/es_HN/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/es_HN/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index d6c90c3b1ce..d5919ef1940 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -79,7 +79,6 @@ VentilatedinAccount=Agregado exitosamente a la cuenta contable
 NotVentilatedinAccount=No añadido a la cuenta contable
 XLineSuccessfullyBinded=%s productos / servicios vinculados con éxito a una cuenta contable
 XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna cuenta contable
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la ordenación de la página "Enlazar para hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la ordenación de la página "Enlace realizado" por los elementos más recientes
 BANK_DISABLE_DIRECT_INPUT=Deshabilitar el registro directo de la transacción en la cuenta bancaria
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 2f40f90a92a..afc2e0f6850 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -221,19 +221,19 @@ DisableLinkToHelpCenter=Ocultar enlace &quot; <b>Necesita ayuda o soporte</b> &q
 DisableLinkToHelp=Ocultar enlace a ayuda en línea &quot; <b>%s</b> &quot;
 WarningSettingSortOrder=Advertencia, establecer un orden predeterminado puede resultar en un error técnico al pasar a la página de lista si "campo" es un campo desconocido. Si experimenta un error de este tipo, vuelva a esta página para eliminar el orden predeterminado y restaurar el comportamiento predeterminado.
 Module20Name=Propuestas
-Module25Name=Ordenes de venta
 Module30Name=Facturas
 Module40Name=Vendedores
-Module59000Desc=Module to follow margins
+Module3400Name=Redes Sociales
 DictionaryAccountancyJournal=Diarios de contabilidad
 DictionarySocialNetworks=Redes Sociales
 Upgrade=Actualizar
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 LDAPFieldFirstName=Nombre(s)
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que este directorio sea procesado por Dolibarr, debe configurar su <strong> conf/conf.php </strong> para agregar las 2 líneas de directiva: <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
 MailToSendProposal=Propuestas de clientes
 MailToSendInvoice=Facturas de clientes
 MailToSendSupplierOrder=Ordenes de compra
+MailToSendSupplierInvoice=Facturas de proveedor
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
index 4ea66beab2f..6e54fb35a3c 100644
--- a/htdocs/langs/es_MX/bills.lang
+++ b/htdocs/langs/es_MX/bills.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - bills
 BillsCustomers=Facturas de clientes
 BillsCustomer=Factura del cliente
-BillsCustomersUnpaid=Facturas de clientes no pagadas
-BillsCustomersUnpaidForCompany=Facturas de clientes no pagadas por %s
+BillsSuppliers=Facturas de proveedor
+BillsCustomersUnpaid=Facturas de cliente no pagadas
+BillsCustomersUnpaidForCompany=Facturas de cliente no pagadas por %s
+BillsSuppliersUnpaid=Facturas de proveedor no pagadas
 BillsLate=Pagos atrasados
 BillsStatistics=Estadísticas de facturas de clientes
 DisabledBecauseNotErasable=Desactivado porque no se puede borrar
@@ -26,10 +28,15 @@ NoInvoiceToCorrect=Ninguna factura para corregir
 InvoiceHasAvoir=Fue fuente de una o varias notas de crédito
 InvoiceCustomer=Factura del cliente
 CustomerInvoice=Factura del cliente
+CustomersInvoices=Facturas de clientes
+SuppliersInvoices=Facturas de proveedor
+SupplierBills=Facturas de proveedor
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
 PaymentAmount=Importe de pago
+AddBill=Crear factura o nota de crédito
 BillStatusDraft=Borrador (necesita ser validado)
 BillStatusPaid=Pagado
+BillStatusPaidBackOrConverted=Reembolso de nota de crédito o marcado como crédito disponible
 BillStatusStarted=Iniciado
 BillShortStatusPaid=Pagado
 BillShortStatusConverted=Pagado
@@ -38,12 +45,22 @@ BillShortStatusStarted=Iniciado
 BillShortStatusClosedUnpaid=Cerrada
 BillFrom=De
 BillTo=Hacia
+SupplierBillsToPay=Facturas de proveedor no pagadas
 CustomerBillsUnpaid=Facturas de clientes no pagadas
 Billed=Facturada
 CreditNote=Nota de crédito
+CreditNotes=Notas de crédito
+DiscountFromCreditNote=Descuento de nota de crédito %s
+NoteReason=Nota / Razón
 ReasonDiscount=Razón
+InvoiceNote=Nota de factura
+PaymentNote=Nota de pago
+DisabledBecauseNotEnouthCreditNote=Para eliminar una factura de situación del ciclo, el total de la nota de crédito de esta factura debe cubrir este total de la factura
 PaymentConditionShortPT_ORDER=Pedido
 PaymentTypeCB=Tarjeta de crédito
 PaymentTypeShortCB=Tarjeta de crédito
 PayedByThisPayment=Liquidado en este pago
+ClosePaidCreditNotesAutomatically=Clasifica automáticamente todas las notas de crédito como "Pagadas" cuando el reembolso se realiza en su totalidad.
+NoteListOfYourUnpaidInvoices=Nota: Esta lista contiene solo facturas de terceros con los que está vinculado como representante de ventas.
+ErrorOutingSituationInvoiceCreditNote=No se pudo sacar la nota de crédito vinculada.
 situationInvoiceShortcode_S=D
diff --git a/htdocs/langs/es_MX/bookmarks.lang b/htdocs/langs/es_MX/bookmarks.lang
new file mode 100644
index 00000000000..826bd7a1ccf
--- /dev/null
+++ b/htdocs/langs/es_MX/bookmarks.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - bookmarks
+AddThisPageToBookmarks=Agregar página actual a marcadores
+ListOfBookmarks=Lista de marcadores
+ShowBookmark=Ver marcador
+ReplaceWindow=Reemplazar pestaña actual
+BehaviourOnClick=Comportamiento cuando se selecciona una URL de marcador
+SetHereATitleForLink=Asignar nombre para el marcador
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilice un enlace externo/absoluto (https://URL) o un enlace interno/relativo (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elija si la página vinculada debe abrirse en la pestaña actual o en una pestaña nueva
+BookmarksManagement=Gestor de marcadores
+BookmarksMenuShortCut=Ctrl + Mayús + m
diff --git a/htdocs/langs/es_MX/boxes.lang b/htdocs/langs/es_MX/boxes.lang
index 681fe36e07c..8d31d1307bc 100644
--- a/htdocs/langs/es_MX/boxes.lang
+++ b/htdocs/langs/es_MX/boxes.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLoginInformation=Información de Login
+BoxLoginInformation=Información de Sesión
 BoxLastRssInfos=Información RSS
 BoxLastProducts=Últimos %s Productos/Servicios
 BoxLastSupplierBills=Últimas facturas de proveedor
@@ -7,7 +7,7 @@ BoxLastCustomerBills=Últimas facturas de clientes
 BoxOldestUnpaidCustomerBills=Facturas de clientes sin pagar más antiguas
 BoxOldestUnpaidSupplierBills=Facturas de proveedores sin pagar más antiguas
 BoxLastProposals=Últimas propuestas comerciales
-BoxLastCustomerOrders=Últimos pedidos de venta
+BoxLastCustomerOrders=Últimos pedidos
 BoxCurrentAccounts=Saldo de cuentas abiertas
 BoxSuppliersOrdersPerMonth=Órdenes a proveedor por mes
 BoxTitleLastModifiedPropals=Últimas %s cotizaciones modificadas
diff --git a/htdocs/langs/es_MX/categories.lang b/htdocs/langs/es_MX/categories.lang
new file mode 100644
index 00000000000..2ffb4e3f26f
--- /dev/null
+++ b/htdocs/langs/es_MX/categories.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubriques=Etiquetas/Categorías
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 811526bc5ac..180ac68ceaf 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -22,7 +22,6 @@ ThirdPartyEmail=Correo electrónico del tercero
 ThirdPartyCustomersWithIdProf12=Clientes con %s o %s
 ToCreateContactWithSameName=Creará automáticamente un contacto/dirección con la misma información en tercero. En la mayoría de los casos, incluso si su tercero es una persona física, la creación de un tercero solo es suficiente.
 ParentCompany=Empresa matriz
-ReportByQuarter=Reporte por tasa
 CivilityCode=Código de civilidad
 RegisteredOffice=Oficina registrada
 Lastname=Apellido
@@ -213,7 +212,6 @@ UniqueThirdParties=Total de terceros
 InActivity=Abierta
 OutstandingBillReached=Max. para la cuenta pendiente alcanzada
 OrderMinAmount=Cantidad mínima por pedido
-MonkeyNumRefModelDesc=Devuelve un número con formato %syymm-nnnn para el código de cliente y %syymm-nnnn para código de proveedor donde yy es el año, mm el mes y nnnn una secuencia numérica sin ruptura y sin regresar a 0.
 LeopardNumRefModelDesc=El código es libre. Este código puede ser modificado en cualquier momento.
 ManagingDirectors=Administrador(es) (CEO, Director, Presidente...)
 MergeOriginThirdparty=Tercero duplicado (tercero que deseas eliminar)
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index b2b9ca9f0e5..8348317d53f 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -139,16 +139,10 @@ Login=Inicio de sesión
 CurrentLogin=Inicio de sesión actual
 May=Mayo
 December=diciembre
-Month05=Mayo
 MonthShort01=Ene
 MonthShort04=Abr
-MonthShort05=Mayo
 MonthShort08=Ago
 MonthShort12=Dic
-MonthVeryShort02=V
-MonthVeryShort03=L
-MonthVeryShort05=L
-MonthVeryShort09=D
 DateFormatYYYYMM=MM-YYYY
 DateFormatYYYYMMDD=DD-MM-YYYY
 DateFormatYYYYMMDDHHMM=DD-MM-YYYY HH:SS
@@ -269,6 +263,7 @@ ShortThursday=MJ
 Select2NotFound=No se encontró ningún resultado
 Select2Enter=Entrar
 SearchIntoCustomerInvoices=Facturas de clientes
+SearchIntoSupplierInvoices=Facturas de proveedor
 SearchIntoSupplierOrders=Ordenes de compra
 SearchIntoCustomerProposals=Propuestas comerciales
 SearchIntoExpenseReports=Reporte de gastos
diff --git a/htdocs/langs/es_MX/modulebuilder.lang b/htdocs/langs/es_MX/modulebuilder.lang
index 4805c2fa2c0..82299e4a90a 100644
--- a/htdocs/langs/es_MX/modulebuilder.lang
+++ b/htdocs/langs/es_MX/modulebuilder.lang
@@ -9,3 +9,4 @@ PageForList=Página PHP para la lista de registro
 PathToModulePackage=Ruta del módulo/aplicación zip
 SpaceOrSpecialCharAreNotAllowed=No se permiten espacios ni caracteres especiales.
 FileNotYetGenerated=Archivo aún no generado
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_MX/orders.lang b/htdocs/langs/es_MX/orders.lang
index a3bb0ddd512..c63c7477cc5 100644
--- a/htdocs/langs/es_MX/orders.lang
+++ b/htdocs/langs/es_MX/orders.lang
@@ -1,6 +1,49 @@
 # Dolibarr language file - Source file is en_US - orders
+OrdersArea=Área de pedidos de clientes
+SuppliersOrdersArea=Área de órdenes de compra
+OrderCard=Tarjeta de pedido
+OrderId=ID de pedido
+NewOrderSupplier=Nueva orden de compra
+ToOrder=Crear orden
+MakeOrder=Crear orden
+SupplierOrder=Orden de compra
+SuppliersOrders=Ordenes de compra
+SuppliersOrdersRunning=Ordenes de compra actuales
+CustomerOrder=Pedidos
+SuppliersOrdersToProcess=Órdenes de compra a procesar
 StatusOrderCanceledShort=Cancelado
+StatusOrderSentShort=En proceso
+StatusOrderSent=Envío en proceso
+StatusOrderOnProcessShort=Ordenado
+StatusOrderProcessedShort=Procesada
+StatusOrderDelivered=Entregado
+StatusOrderDeliveredShort=Entregado
+StatusOrderToBillShort=Entregado
+StatusOrderToProcessShort=Procesar
 StatusOrderCanceled=Cancelado
-PDFEinsteinDescription=A complete order model
+StatusOrderDraft=Borrador (necesita ser validado)
+StatusOrderOnProcess=Pedido: recepción en espera
+StatusOrderOnProcessWithValidation=Pedido: recepción o validación en espera
+StatusOrderProcessed=Procesada
+StatusOrderToBill=Entregado
+Ordered=Ordenado
+OptionToSetOrderBilledNotEnabled=La opción del módulo Flujo de trabajo, para establecer el pedido en 'Facturado' automáticamente cuando se valida la factura, no está habilitada, por lo que deberá configurar el estado de los pedidos en 'Facturado' manualmente después de que se haya generado la factura.
+IfValidateInvoiceIsNoOrderStayUnbilled=Si la validación de la factura es 'No', el pedido permanecerá en el estado 'No facturado' hasta que se valide la factura.
+CloseReceivedSupplierOrdersAutomatically=Cierre el pedido al estado "%s" automáticamente si se reciben todos los productos.
+SetShippingMode=Establecer modo de envío
+WithReceptionFinished=Con recepción terminada
 StatusSupplierOrderCanceledShort=Cancelado
+StatusSupplierOrderSentShort=En proceso
+StatusSupplierOrderSent=Envío en proceso
+StatusSupplierOrderOnProcessShort=Ordenado
+StatusSupplierOrderProcessedShort=Procesada
+StatusSupplierOrderDelivered=Entregado
+StatusSupplierOrderDeliveredShort=Entregado
+StatusSupplierOrderToBillShort=Entregado
+StatusSupplierOrderToProcessShort=Procesar
 StatusSupplierOrderCanceled=Cancelado
+StatusSupplierOrderDraft=Borrador (necesita ser validado)
+StatusSupplierOrderOnProcess=Pedido: recepción en espera
+StatusSupplierOrderOnProcessWithValidation=Pedido: recepción o validación en espera
+StatusSupplierOrderProcessed=Procesada
+StatusSupplierOrderToBill=Entregado
diff --git a/htdocs/langs/es_MX/productbatch.lang b/htdocs/langs/es_MX/productbatch.lang
index 997e8f021db..6a138d9ffa7 100644
--- a/htdocs/langs/es_MX/productbatch.lang
+++ b/htdocs/langs/es_MX/productbatch.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - productbatch
 ManageLotSerial=Usar el número de lote/serie
 ProductStatusOnBatch=Sí (lote/serie) requerido
+ProductStatusOnSerial=Sí (numero de serie único requerido)
 ProductStatusNotOnBatch=No (lote/serie no utilizado)
 atleast1batchfield=Fecha de caducidad o Fecha de venta o número de Lote/serie
 batch_number=Número de Lote/Serie
diff --git a/htdocs/langs/es_MX/products.lang b/htdocs/langs/es_MX/products.lang
index af9eb0e2ac2..8ade985e293 100644
--- a/htdocs/langs/es_MX/products.lang
+++ b/htdocs/langs/es_MX/products.lang
@@ -5,7 +5,6 @@ ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta.
 ProductsAndServicesArea=Área de productos y servicios
 ProductsArea=Área de producto
 SetDefaultBarcodeType=Establecer el tipo de código de barras
-AssociatedProductsAbility=Enable Kits (set of several products)
 KeywordFilter=Filtro de palabras clave
 NoMatchFound=No se encontraron coincidencias
 DeleteProduct=Eliminar un producto / servicio
diff --git a/htdocs/langs/es_MX/suppliers.lang b/htdocs/langs/es_MX/suppliers.lang
index f0609ce1413..1f4aa3e931c 100644
--- a/htdocs/langs/es_MX/suppliers.lang
+++ b/htdocs/langs/es_MX/suppliers.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Vendedores
+SupplierInvoices=Facturas de proveedor
diff --git a/htdocs/langs/es_MX/website.lang b/htdocs/langs/es_MX/website.lang
index ff12c0bdb52..92219c9ce78 100644
--- a/htdocs/langs/es_MX/website.lang
+++ b/htdocs/langs/es_MX/website.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - website
 NoPageYet=Sin páginas aun
 GrabImagesInto=Insertar también las imágenes encontradas en CSS y página.
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_MX/withdrawals.lang b/htdocs/langs/es_MX/withdrawals.lang
index 2f810c0c725..98cde29ac46 100644
--- a/htdocs/langs/es_MX/withdrawals.lang
+++ b/htdocs/langs/es_MX/withdrawals.lang
@@ -5,4 +5,3 @@ Rejects=Rechazos
 StatusPaid=Pagado
 StatusRefused=Rechazado
 StatusMotif4=Órdenes de venta
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_PA/accountancy.lang b/htdocs/langs/es_PA/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/es_PA/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index eb11d0d5c6f..b6ade31f4f5 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionUnknown=Desconocido
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PA/modulebuilder.lang b/htdocs/langs/es_PA/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_PA/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_PA/products.lang b/htdocs/langs/es_PA/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/es_PA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_PA/website.lang b/htdocs/langs/es_PA/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/es_PA/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_PA/withdrawals.lang b/htdocs/langs/es_PA/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/es_PA/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index 94dd1838fd8..cf9e532ffbf 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -27,7 +27,6 @@ EndProcessing=Proceso finalizado.
 Lineofinvoice=Línea de factura
 VentilatedinAccount=Vinculado con éxito a la cuenta contable
 NotVentilatedinAccount=No vinculado a la cuenta contable
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comienza la clasificación de la página "Vinculación a hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comienza la clasificación de la página "Encuadernación realizada" por los elementos más recientes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de los productos y servicios en los listados después de los caracteres x (mejor = 50)
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 2e7678563b1..c5149bbb2de 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -2,13 +2,12 @@
 VersionProgram=Versión del programa
 VersionLastInstall=Instalar versión inicial
 Module30Name=Facturas
-Module59000Desc=Module to follow margins
 Permission91=Consultar impuestos e IGV
 Permission92=Crear/modificar impuestos e IGV
 Permission93=Eliminar impuestos e IGV
 DictionaryVAT=Tasa de IGV o tasa de impuesto a las ventas
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OptionVatMode=IGV adeudado
 MailToSendInvoice=Facturas de Clientes
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/es_PE/bills.lang b/htdocs/langs/es_PE/bills.lang
index 201a9d74882..232d6721737 100644
--- a/htdocs/langs/es_PE/bills.lang
+++ b/htdocs/langs/es_PE/bills.lang
@@ -5,6 +5,7 @@ InvoiceAvoir=Nota de crédito
 InvoiceAvoirAsk=Nota de crédito para corregir factura
 InvoiceCustomer=Factura de cliente
 CustomerInvoice=Factura de cliente
+CustomersInvoices=Facturas de clientes
 BillShortStatusClosedUnpaid=Cerrado
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar <b>(%s %s)</b> es un descuento acordado después de la factura. Acepto perder el IGV de este descuento
 AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin IGV)
diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
index 02f38a9869b..256d3198c63 100644
--- a/htdocs/langs/es_PE/main.lang
+++ b/htdocs/langs/es_PE/main.lang
@@ -50,7 +50,6 @@ Run=Ejecutar
 Show=Mostrar
 Hide=Ocultar
 SearchOf=Buscar
-ReOpen=Re-Abrir
 Upload=Subir
 AmountVAT=Importe impuesto
 MulticurrencyAmountVAT=Importe impuesto, moneda original
diff --git a/htdocs/langs/es_PE/modulebuilder.lang b/htdocs/langs/es_PE/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_PE/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_PE/products.lang b/htdocs/langs/es_PE/products.lang
index 59238285ddf..e682fe300a6 100644
--- a/htdocs/langs/es_PE/products.lang
+++ b/htdocs/langs/es_PE/products.lang
@@ -3,5 +3,5 @@ ProductRef=Ref. de producto
 ProductLabel=Etiqueta del producto
 ProductServiceCard=Ficha Productos/Servicios
 ProductOrService=Producto o Servicio
-AssociatedProductsAbility=Enable Kits (set of several products)
+ListOfStockMovements=Lista de movimientos de stock
 ExportDataset_produit_1=Productos
diff --git a/htdocs/langs/es_PE/stocks.lang b/htdocs/langs/es_PE/stocks.lang
index aa3e15a560f..1a973f55756 100644
--- a/htdocs/langs/es_PE/stocks.lang
+++ b/htdocs/langs/es_PE/stocks.lang
@@ -1,4 +1,12 @@
 # Dolibarr language file - Source file is en_US - stocks
+MovementId=ID de Movimiento
+StockMovementForId=ID de Movimiento %d
+ListMouvementStockProject=Lista de movimientos de stock asociados al proyecto
 QtyDispatchedShort=Cant. despachada
+MassMovement=Movimiento masivo
+StockMovementRecorded=Movimiento de stock grabado
+MovementLabel=Etiqueta de movimiento
 MovementCorrectStock=Corrección de stock del producto %s
 inventoryEdit=Editar
+AddProduct=Agregar
+DisableStockChangeOfSubProduct=Desactiva el cambio de stock para todos los productos de este Kit durante este movimiento.
diff --git a/htdocs/langs/es_PE/website.lang b/htdocs/langs/es_PE/website.lang
index 85fd95deb49..344f2e6ae70 100644
--- a/htdocs/langs/es_PE/website.lang
+++ b/htdocs/langs/es_PE/website.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - website
 ReadPerm=Leer
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_PE/withdrawals.lang b/htdocs/langs/es_PE/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/es_PE/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/es_PY/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index b68a0680537..619ae5f8bd4 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PY/modulebuilder.lang b/htdocs/langs/es_PY/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_PY/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_PY/products.lang b/htdocs/langs/es_PY/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/es_PY/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_PY/website.lang b/htdocs/langs/es_PY/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/es_PY/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_PY/withdrawals.lang b/htdocs/langs/es_PY/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/es_PY/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_PY/zapier.lang b/htdocs/langs/es_PY/zapier.lang
index c7cc16646c5..4a8cb0da0fc 100644
--- a/htdocs/langs/es_PY/zapier.lang
+++ b/htdocs/langs/es_PY/zapier.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - zapier
 ModuleZapierForDolibarrDesc =Zapier para modulo Dolibarr
-ZapierForDolibarrSetup =Instalacion de Zapier para Dolibarr
+ZapierForDolibarrSetup=Instalacion de Zapier para Dolibarr
diff --git a/htdocs/langs/es_US/accountancy.lang b/htdocs/langs/es_US/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/es_US/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_US/admin.lang b/htdocs/langs/es_US/admin.lang
index b68a0680537..619ae5f8bd4 100644
--- a/htdocs/langs/es_US/admin.lang
+++ b/htdocs/langs/es_US/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_US/modulebuilder.lang b/htdocs/langs/es_US/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_US/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_US/products.lang b/htdocs/langs/es_US/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/es_US/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_US/website.lang b/htdocs/langs/es_US/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/es_US/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_US/withdrawals.lang b/htdocs/langs/es_US/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/es_US/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_UY/accountancy.lang b/htdocs/langs/es_UY/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/es_UY/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_UY/admin.lang b/htdocs/langs/es_UY/admin.lang
index b68a0680537..619ae5f8bd4 100644
--- a/htdocs/langs/es_UY/admin.lang
+++ b/htdocs/langs/es_UY/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_UY/modulebuilder.lang b/htdocs/langs/es_UY/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_UY/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_UY/products.lang b/htdocs/langs/es_UY/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/es_UY/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_UY/website.lang b/htdocs/langs/es_UY/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/es_UY/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_UY/withdrawals.lang b/htdocs/langs/es_UY/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/es_UY/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/es_VE/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index d395e4cecd0..74b465f966a 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -4,7 +4,6 @@ VersionLastUpgrade=Última actualización de la versión
 ConfirmPurgeSessions=¿De verdad quieres purgar todas las sesiones? Esto desconectará a todos los usuarios (excepto a usted).
 SetupArea=Parametrizaje
 NotConfigured=Módulo / Aplicación no configurada
-Module59000Desc=Module to follow margins
 Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
 Permission256=Consultar sus permisos
@@ -30,6 +29,5 @@ WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a prove
 LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_VE/modulebuilder.lang b/htdocs/langs/es_VE/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/es_VE/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_VE/orders.lang b/htdocs/langs/es_VE/orders.lang
index af9af547c83..f1790ff6eef 100644
--- a/htdocs/langs/es_VE/orders.lang
+++ b/htdocs/langs/es_VE/orders.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
 StatusOrderDeliveredShort=Emitido
-PDFEinsteinDescription=A complete order model
 StatusSupplierOrderDraftShort=A validar
 StatusSupplierOrderValidatedShort=Validada
 StatusSupplierOrderDelivered=Emitido
diff --git a/htdocs/langs/es_VE/products.lang b/htdocs/langs/es_VE/products.lang
index 53eae0774e3..7c5fda8bea0 100644
--- a/htdocs/langs/es_VE/products.lang
+++ b/htdocs/langs/es_VE/products.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - products
 TMenuProducts=Productos y servicios
 ProductStatusNotOnBuyShort=Fuera compra
-AssociatedProductsAbility=Enable Kits (set of several products)
 PriceExpressionEditorHelp2=Puede acceder a los atributos adicionales con variables como <b>#extrafield_myextrafieldkey#</b> y variables globales con <b>#global_mycode#</b>
diff --git a/htdocs/langs/es_VE/website.lang b/htdocs/langs/es_VE/website.lang
new file mode 100644
index 00000000000..eb66189bb95
--- /dev/null
+++ b/htdocs/langs/es_VE/website.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - website
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_VE/withdrawals.lang b/htdocs/langs/es_VE/withdrawals.lang
index 0512b713a32..fb9616a1788 100644
--- a/htdocs/langs/es_VE/withdrawals.lang
+++ b/htdocs/langs/es_VE/withdrawals.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 StatusPaid=Pagada
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 170d73a6bac..1e7d1a312f3 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index abc17b9297f..d3320e12ec5 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Luba uued ühendused
 YourSession=Sinu sessioon
 Sessions=Kasutajate sessioonid
 WebUserGroup=Veebiserveri kasutaja/grupp
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Märkus: jah töötab vaid siis, kui moodul <b>%s</b> on sisse l
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Turvaseaded
+PHPSetup=PHP setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Viga: see moodul nõuab PHP versiooni %s või uuemat.
 ErrorModuleRequireDolibarrVersion=Viga: see moodul nõuab Dolibarri versiooni %s või uuemat.
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Tühjenda
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Tühjenda nüüd
@@ -232,6 +234,7 @@ BoxesAvailable=Saadaolevad vidinad
 BoxesActivated=Aktiveeritud vidinad
 ActivateOn=Aktiveeri lehel
 ActiveOn=Aktiveeritud lehel
+ActivatableOn=Activatable on
 SourceFile=Lähtekoodi fai
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Saadaval ainult siis, kui JavaScript pole keelatud
 Required=Nõutud
@@ -347,9 +350,10 @@ LastActivationAuthor=Viimane aktiveerimise autor
 LastActivationIP=Viimane aktiveerimise 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Kõik teised maskis olevad tähemärgid jäävad puutuamata.<br>Tühikud ei ole lubatud.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Näiteks 2007-03-01 loodud kolmas isik:</u> <br>
 GenericMaskCodes4c=<u>Näiteks 2007-03-01 loodud toode:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Tarnijad
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Toimetajad
 Module49Desc=Toimetaja haldamine
 Module50Name=Tooted
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteerimise võimekus
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Sotsiaalvõrgud
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=Personalihaldus
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-ettevõte
 Module5000Desc=Võimaldab hallata mitut ettevõtet
-Module6000Name=Töövoog
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Väliste ja sisemiste kasutajate ja õiguste loomine/muutm
 Permission254=Ainult väliste kasutajate loomine/muutmine
 Permission255=Teiste kasutajate paroolide muutmine
 Permission256=Teiste kasutajate kustutamine või keelamine
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=CA vaatamine
 Permission272=Arvete vaatamine
 Permission273=Arvete väljastamine
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Sündmuste turvaaudit
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=Antud käsu peab käivitama käsurealt pärast kasutajaga <b>%s</b> sisse logimist või lisades -W võtme käsu lõppu parooli <b>%s</b> kasutamiseks.
 YourPHPDoesNotHaveSSLSupport=Antud PHP ei võimalda SSL funktsioone
 DownloadMoreSkins=Veel alla laetavaid kujundusi
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Osaline tõlge
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Täiendavad atribuudid
 ExtraFieldsLines=Lisaatribuudid (read)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Kasutajanimi (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Otsingufilter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Kasutajanimi (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Täielik nimi
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Müügikonto kood
 AccountancyCodeBuy=Ostukonto kood
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Tegevuste ja päevakava mooduli seadistamine
 PasswordTogetVCalExport=Ekspordilingi autoriseerimise võti
+SecurityKey = Security Key
 PastDelayVCalExport=Ära ekspordi tegevusi, mis on vanemad kui
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 2838587c4c8..81e77744f0e 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 6fcc6f48b23..aa1b3d111a5 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -54,9 +54,10 @@ InvoiceCustomer=Müügiarve
 CustomerInvoice=Müügiarve
 CustomersInvoices=Müügiarved
 SupplierInvoice=Tarnija arve
-SuppliersInvoices=Tarnijate arved
+SuppliersInvoices=Tarnija arved
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Tarnija arve
-SupplierBills=ostuarved
+SupplierBills=Tarnija arved
 Payment=Makse
 PaymentBack=Tagasimakse
 CustomerInvoicePaymentBack=Tagasimakse
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Juba tehtud maksed
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Maksereegel
 PaymentMode=Makse tüüp
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Makse tüüp (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Muutuv summa (%% kogusummast)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Pangaülekanne
 PaymentTypeShortVIR=Pangaülekanne
@@ -494,12 +498,16 @@ Cash=Sularaha
 Reported=Hilinenud
 DisabledBecausePayments=Pole võimalik, kuna on mõningaid makseid
 CantRemovePaymentWithOneInvoicePaid=Ei saa makset eemaldada, kuna vähemalt üks arve on märgitud makstuks
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Oodatud makse
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Makstud selle maksega
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Maksa
 ToMakePaymentBack=Maksa tagasi
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Tagastab numbri formaadiga %syymm-nnnn tavaliste arvete jaoks ja %syymm-nnnn kreeditarvete jaoks, kus yy on aasta, mm on kuu ja nnnn on katkestusteta jada, mis ei lähe kunagi 0 tagasi.
-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
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Arve algusega $syymm on juba olemas ja ei ole antud jada mudeliga ühtiv. Eemalda see või muuda selle nimi antud mooduli aktiveerimiseks.
-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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index 3212c908291..4fca825fabb 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Raamatupidamine
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index f288163f0d9..f7eeeaf60b3 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 6bafeb504b3..004a976937a 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -43,9 +43,10 @@ Individual=Eraisik
 ToCreateContactWithSameName=Loob automaatselt kontakti / aadressi, millel on sama teave kui kolmanda osapoole all. Enamikul juhtudel, isegi kui teie kolmas osapool on füüsiline isik, piisab ainult kolmanda osapoole loomisest.
 ParentCompany=Emaettevõte
 Subsidiaries=Tütarettevõtted
-ReportByMonth=Aruanne kuude kaupa
-ReportByCustomers=Kliendi aruanne
-ReportByQuarter=Aruanne määra alusel
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Sisekorraeeskiri
 RegisteredOffice=Peakontor
 Lastname=Perekonnanimi
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (sireen)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, vana APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registrinumber
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (sotsiaalkindlustus number)
 ProfId3PT=Prof Id 3 (Commercial rekordarv)
 ProfId4PT=Prof Id 4 (Konservatooriumis)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Hetkel maksmata summa
 OutstandingBill=Suurim võimalik maksmata arve
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimaalne tellimuse summa
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Kood on vaba, seda saab igal ajal muuta.
 ManagingDirectors=Haldaja(te) nimi (CEO, direktor, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 35f06da633f..a23b73cef69 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=KM kogutud
 StatusToPay=Maksta
 SpecialExpensesArea=Kõigi erimaksete ala
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Müügiarve makse
 PaymentSupplierInvoice=Ostuarve makse
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=KM makse
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Maksete nimekiri
 ListOfCustomerPayments=Klientide maksete nimekiri
 ListOfSupplierPayments=Tarnija maksete nimekiri
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF makse
 LT2PaymentsES=IRPF maksed
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Tšeki vastuvõtmise kuupäev
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režiim <b>%stekkepõhise raamatupidamise KM%s</b>.
 CalcModeVATEngagement=Režiim <b>%stulude-kulude KM%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Sisend- ja väljundkäibemaks kliendi alusel
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg alamtüüp
 InvoiceLinesToDispatch=Saadetavate arvete read
 ByProductsAndServices=By product and service
 RefExt=Väline viide
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Viide tellimusele
 Mode1=Meetod 1
 Mode2=Meetod 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/et_EE/ecm.lang b/htdocs/langs/et_EE/ecm.lang
index b234192073f..c3b54ff39b5 100644
--- a/htdocs/langs/et_EE/ecm.lang
+++ b/htdocs/langs/et_EE/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 4d3ae37fabc..81de1b5c8c9 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Ei leidnud kausta <b>%s</b> (vale rada, valed õigused või on
 ErrorFunctionNotAvailableInPHP=Selle võimaluse jaoks on vaja funktsiooni <b>%s</b>, kuid see ei ole antud PHP versiooni/seadistusega saadaval.
 ErrorDirAlreadyExists=Selle nimega kaust on juba olemas.
 ErrorFileAlreadyExists=Selle nimega fail on juba olemas.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Fail ei jõudnud täielikult serverisse.
 ErrorNoTmpDir=Ajutist kausta %s ei ole olemas.
 ErrorUploadBlockedByAddon=PHP/Apache pistik blokeeris üleslaadimise.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/et_EE/externalsite.lang b/htdocs/langs/et_EE/externalsite.lang
index d4a0b2c3ee1..7295cbd8936 100644
--- a/htdocs/langs/et_EE/externalsite.lang
+++ b/htdocs/langs/et_EE/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Seadista link välisele lehele
-ExternalSiteURL=Välise lehe URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=ExternalSite moodul ei ole õigesti seadistatud.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index c8174781715..86a6e3aae9b 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Muutm kuupäev
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Kinnitamise kuupäev
+DateSigning=Signing date
 DateClosing=Lõpetamise kuupäev
 DateDue=Tähtaeg
 DateValue=Väärtuse kuupäev
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Ühiku hind
 PriceU=ÜH
 PriceUHT=ÜH (neto)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Summa
 AmountInvoice=Arve summa
@@ -389,6 +390,8 @@ AmountTotal=Kogusumma
 AmountAverage=Keskmine summa
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Protsent
 Total=Kokku
 SubTotal=Vahesumma
@@ -724,7 +727,7 @@ MenuMembers=Liikmed
 MenuAgendaGoogle=Google päevakava
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr piir (menüü Kodu->Seaded->Turvalisus): %s Kb, PHP piir: %s Kb
-NoFileFound=Antud kausta pole dokumente salvestatud
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Aktiivne keel
 CurrentTheme=Aktiivne teema
 CurrentMenuManager=Aktiivne menüü haldaja
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontaktid
 SearchIntoMembers=Liikmed
 SearchIntoUsers=Kasutajad
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projektid
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Ülesanded
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Mõjutatud isik
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/et_EE/margins.lang b/htdocs/langs/et_EE/margins.lang
index 3640a325a38..1dd50286ba4 100644
--- a/htdocs/langs/et_EE/margins.lang
+++ b/htdocs/langs/et_EE/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Marginaalide info
 ProductMargins=Toodete marginaalid
 CustomerMargins=Klientide marginaalid
 SalesRepresentativeMargins=Müügiesindajate tasud
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Toode või teenus
 AllProducts=Kõik tooted ja teenused
 ChooseProduct/Service=Vali toode või teenus
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Üldiste allahindluste marginaali meetod
 UseDiscountAsProduct=Tootena
 UseDiscountAsService=Teenusena
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Tootmishind
 UnitCharges=Ühiku kulud
 Charges=Kulud
 AgentContactType=Müügiagendi kontakti liik
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index fc49d7214b9..fcf4718f143 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Mustandi staatuses olevate liikmete nimekiri (vajab kinnitami
 MembersListValid=Kinnitatud liikmete nimekiri
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=Kvalifitseeritud liikmete nimekiri
 MenuMembersToValidate=Liikmete mustand
 MenuMembersValidated=Kinnitatud liikmed
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Kasutajad, kelle liikmemaks on saada
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Aegunud
 MemberStatusPaid=Liikmemaks ajakohane
 MemberStatusPaidShort=Ajakohane
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Liikmete mustand
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Kinnitatud
@@ -82,6 +87,8 @@ Physical=Füüsiline
 Moral=Moraalne
 MorAndPhy=Moral and Physical
 Reenable=Luba uuesti
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Kustuta liige
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Siltide lehe formaat
 DescADHERENT_ETIQUETTE_TEXT=Liikmete aadressikaartidele trükitav tekst
@@ -162,6 +170,7 @@ DocForLabels=Loo aadressilehed
 SubscriptionPayment=Liikmemaks
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Liikmete statistika riigi alusel
 MembersStatisticsByState=Liikmete statistika osariigi/provintsi alusel
 MembersStatisticsByTown=Liikmete statistika linna alusel
diff --git a/htdocs/langs/et_EE/modulebuilder.lang b/htdocs/langs/et_EE/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/et_EE/modulebuilder.lang
+++ b/htdocs/langs/et_EE/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
index d9bcab4cab8..9d6a928579c 100644
--- a/htdocs/langs/et_EE/orders.lang
+++ b/htdocs/langs/et_EE/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Telli
 MakeOrder=Telli
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Müügitellimused
@@ -141,11 +143,12 @@ OrderByEMail=E-post
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=Lihtne tellimuse mude
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Koosta tellimuste kohta arved
+CreateInvoiceForThisSupplier=Koosta tellimuste kohta arved
 NoOrdersToInvoice=Pole ühtki tellimust, mille kohta arve esitada
 CloseProcessedOrdersAutomatically=Liigita kõik valitud tellimused "Töödeldud".
 OrderCreation=Tellimuse loomine
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 3183083b1aa..ba2ede545ba 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Lõi %s
 ModifiedBy=Muutis %s
 ValidatedBy=Kinnitas %s
+SignedBy=Signed by %s
 ClosedBy=Sulges %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=Uued sisselogimise tunnused
 NewKeyWillBe=Uus tarkvarasse sisselogimise salasõna on
 ClickHereToGoTo=Klõpsa siia, et minna %s
 YouMustClickToChange=Esmalt pead klõpsa järgneval lingil, et kinnitada salasõna muutmine
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Kui Sina ei palunud seda muudatust, siis ignoreeri antud kirja ja mingeid muudatusi ei toimu.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang
index 3a9bea23b43..c3e0711af7c 100644
--- a/htdocs/langs/et_EE/productbatch.lang
+++ b/htdocs/langs/et_EE/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Jah
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Ei
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 8554d961291..d8abbac338d 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Õigesti uuendatud
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Ühik
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index c739c5c289f..9f5ee9b09d3 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/et_EE/propal.lang b/htdocs/langs/et_EE/propal.lang
index 6896ec81b00..5a5197a0900 100644
--- a/htdocs/langs/et_EE/propal.lang
+++ b/htdocs/langs/et_EE/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Saada pakkumine kirja teel
 DatePropal=Pakkumise kuupäev
 DateEndPropal=Kehtib kuni
 ValidityDuration=Kehtivuse kestvus
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Pakkumist %s ei leitud
 AddToDraftProposals=Lisa pakkumise mustandisse
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Pakkumine ja selle read
 ProposalLine=Pakkumise read
+ProposalLines=Proposal lines
 AvailabilityPeriod=Saadavuse viivitus
 SetAvailability=Määratle saadavuse viivitus
 AfterOrder=pärast tellimist
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 760b0f0dbbc..0fa5f181ced 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -19,8 +19,8 @@ Stock=Laojääk
 Stocks=Laojäägid
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Asukoht
-LocationSummary=Asukoha lühike nimi
-NumberOfDifferentProducts=Erinevate toodete arv
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Toodete koguarv
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Ladude väärtus
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtuaalne laojääk
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Lao ID
 DescWareHouse=Lao kirjeldus
 LieuWareHouse=Lao lokaliseerimine
 WarehousesAndProducts=Laod ja tooted
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Kaalutud keskmine hind
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Ühiku müügihind
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Värskendamised
 NbOfProductBeforePeriod=Toote %s laojääk enne valitud perioodi (< %s)
 NbOfProductAfterPeriod=Toote %s laojääk pärast valitud perioodi (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index 217a3267e3a..9aa574d97a1 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Tarnijad
 SuppliersInvoice=Tarnija arve
+SupplierInvoices=Tarnija arved
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=Ajalugu
diff --git a/htdocs/langs/et_EE/ticket.lang b/htdocs/langs/et_EE/ticket.lang
index fd7ed8ea019..6d1f9cfe586 100644
--- a/htdocs/langs/et_EE/ticket.lang
+++ b/htdocs/langs/et_EE/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Liik
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index 8966333a09b..1facf9d2742 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Eemalda grupist
 PasswordChangedAndSentTo=Salasõna muudetud ja saadetud aadressile <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Kasutaja <b>%s</b> salasõna muutmise plave saadetud aadressile <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Kasutajad ja grupid
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domeeni kasutaja %s
 Reactivate=Aktiveeri uuesti
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Õigus on antud, kuna see pärineb mõnest grupist, kuhu kasutaja kuulub
 Inherited=Päritud
+UserWillBe=Created user will be
 UserWillBeInternalUser=Loodav kasutaja on sisemine kasutaja (kuna ei ole seotud mõne kolmanda isikuga)
 UserWillBeExternalUser=Loodav kasutaja on väline kasutaja (kuna on seotud mõne kolmanda isikuga)
 IdPhoneCaller=Helistaja ID
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index 780b74ae7da..119edcd437d 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Loe
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/et_EE/zapier.lang b/htdocs/langs/et_EE/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/et_EE/zapier.lang
+++ b/htdocs/langs/et_EE/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 5f99e070cd3..081ca0887ca 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Konexioaren blokeoa kendu
 YourSession=Zure sesioa
 Sessions=Users Sessions
 WebUserGroup=Web-zerbitzariaren erabiltzailea/taldea
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Segurtasunaren konfigurazioa
+PHPSetup=PHP setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Errorea, modulu honek PHP-ren %s bertsioa -edo handiagoa- behar du
 ErrorModuleRequireDolibarrVersion=Errorea, modulu honek Dolibarr-en %s bertsioa -edo handiagoa- behar du
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Garbitu
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Orain garbitu
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Aktibatu on
 ActiveOn=Aktibatuta on
+ActivatableOn=Activatable on
 SourceFile=Iturri-fitxategia
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Eskuragarri soilik JavaScript ezgaituta ez badago
 Required=Beharrezkoa
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editoreak
 Module49Desc=Editoreak kudeatzea
 Module50Name=Produktuak
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index bac80483712..0f6fba01760 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 714c0da8670..4d23de8e6d0 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -52,11 +52,12 @@ Invoices=Fakturak
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Jada egindako ordainketak
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
index 42d5a977df9..acce860d953 100644
--- a/htdocs/langs/eu_ES/boxes.lang
+++ b/htdocs/langs/eu_ES/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 4318ea805b7..1ab18739b29 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index af1267b60ab..1e19182ea3a 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/eu_ES/ecm.lang b/htdocs/langs/eu_ES/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/eu_ES/ecm.lang
+++ b/htdocs/langs/eu_ES/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/eu_ES/externalsite.lang b/htdocs/langs/eu_ES/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/eu_ES/externalsite.lang
+++ b/htdocs/langs/eu_ES/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index b048eaf318c..02604cf919e 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Kideak
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontratuak
 SearchIntoMembers=Kideak
 SearchIntoUsers=Erabiltzaileak
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Proiektuak
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/eu_ES/margins.lang b/htdocs/langs/eu_ES/margins.lang
index 97ed5f003fe..45a42e5a367 100644
--- a/htdocs/langs/eu_ES/margins.lang
+++ b/htdocs/langs/eu_ES/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index 25c40cd7806..ea607afb344 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/eu_ES/modulebuilder.lang b/htdocs/langs/eu_ES/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/eu_ES/modulebuilder.lang
+++ b/htdocs/langs/eu_ES/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
index ea157944645..8ccc334ca9d 100644
--- a/htdocs/langs/eu_ES/orders.lang
+++ b/htdocs/langs/eu_ES/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=E-posta
 OrderByWWW=Online
 OrderByPhone=Telefonoa
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 8b1593d5f6c..0601f3818ea 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang
index fa8e5e62d68..ba538918c69 100644
--- a/htdocs/langs/eu_ES/productbatch.lang
+++ b/htdocs/langs/eu_ES/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Bai
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Ez
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 0827f43bd6d..09b267fccb6 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 71a1ed5245a..645cb61ef75 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/eu_ES/propal.lang b/htdocs/langs/eu_ES/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/eu_ES/propal.lang
+++ b/htdocs/langs/eu_ES/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index fa21c48cb73..3a9406782cc 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stock-ak
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Kokapena
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/eu_ES/suppliers.lang
+++ b/htdocs/langs/eu_ES/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/eu_ES/ticket.lang b/htdocs/langs/eu_ES/ticket.lang
index 086d398b0a1..9ad3a4dc0ae 100644
--- a/htdocs/langs/eu_ES/ticket.lang
+++ b/htdocs/langs/eu_ES/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Mota
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
index c3d64917656..d9063bea80e 100644
--- a/htdocs/langs/eu_ES/users.lang
+++ b/htdocs/langs/eu_ES/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index 921f6edf20f..48ec32f15d5 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/eu_ES/zapier.lang b/htdocs/langs/eu_ES/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/eu_ES/zapier.lang
+++ b/htdocs/langs/eu_ES/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 794149d01cf..a83717e547a 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=سطور بند شدۀ صورت‌حساب‌ها
 ExpenseReportLines=سطور گزارش هزینه‌ها که باید بند شوند
 ExpenseReportLinesDone=سطور بندشدۀ گزارش هزینه‌ها
 IntoAccount=بندکردن سطر به حساب حسابداری
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=بندکردن
@@ -209,7 +209,7 @@ Codejournal=دفتر
 JournalLabel=برچسب دفتر
 NumPiece=شمارۀ بخش
 TransactionNumShort=تعداد تراکنش‌ها
-AccountingCategory=گروه‌های دل‌خواه
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=در این قسمت می‌توانید گروه‌های متشکل از حساب‌حساب‌داری بسازید. این گروه‌ها برای گزارش‌های دل‌خواه حساب‌داری استفاده می‌شود.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=سطوری که هنوز بند نشده‌اند، 
 
 ## Import
 ImportAccountingEntries=ورودی‌های حساب‌داری
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=هشدار! این گزارش بر مبنای دفتر کل نمی‌باشد، بنابراین دربردارندۀ تراکنش‌هائی که به شکل دستی در دفترکل ویرایش شده‌اند نیست. در صورتی که دفترنویسی شما روزآمد باشد، نمای «دفترنویسی» دقیق‌تر است.
 ExpenseReportJournal=دفتر گزارش هزینه‌ها
 InventoryJournal=دفتر انبار
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 44b56b29436..6665602a932 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=حذف قفل اتصال
 YourSession=نشست شما
 Sessions=نشست‌های کاربران
 WebUserGroup=کاربرِ/گروهِ سرویس‌دهندۀ‌وب 
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=به نظر می‌رسد پیکربندی PHP شما امکان فهرست‌کردن نشست‌های فعال را نداشته باشد. ممکن است پوشه‌ای که برای ذخیرۀ نشست‌ها مورد استفاده است (<b>%s</b>)  حفاظت شده باشد (مثلا بواسطۀ مجوزهای سیستم‌عامل یا با تمهیدات   open_basedir در PHP).
@@ -62,6 +63,7 @@ IfModuleEnabled=توجه: «بله» تنها در صورتی مؤثر است ک
 RemoveLock=فایل <b>%s</b> را در صورت موجود بودن تغییر دهید تا امکان استفاده از ابزار نصب/روزآمدسازی وجود داشته باشد.
 RestoreLock=فایل <b>%s</b> را با مجوز فقط خواندنی بازیابی کنید تا امکان استفاده از ابزار نصب/روزآمدسازی را غیرفعال کنید.
 SecuritySetup=برپاسازی امنیتی
+PHPSetup=PHP setup
 SecurityFilesDesc=در این قسمت گزینه‌های مربوط به امنیت بارگذاری فایل را تعریف کنید
 ErrorModuleRequirePHPVersion=خطا! این واحد نیازمند PHP نسخۀ %s یا بالاتر دارد
 ErrorModuleRequireDolibarrVersion=خطا! این واحد نیاز به Dolibarr  نسخۀ %s یا بالاتر را دارد
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=این واحد دربردارندۀ عوامل مربوط 
 Purge=پاک‌کردن
 PurgeAreaDesc=این صفحه به شما امکان حذف همۀ فایل‌های تولید شده و ذخیره شده با Dolibarr  را می‌دهد (فایل‌های موقت یا همۀ فایلهای داخل پوشۀ <b>%s</b>). استفاده از این قابلیت در شرایط عادی ضرورتی ندارد. این قابلیت برای کاربرانی ایجاد شده است که میزبانی وبگاه آن‌ها امکان حذف فایل‌هائی که توسط سرویس‌دهندۀ وب ایجاد شده‌اند را نداده است. 
 PurgeDeleteLogFile=حذف فایل‌های گزارش‌کار، شامل تعریف <b>%s</b> برای واحد گزارش‌کار سامانه Syslog (خطری برای از دست دادن داده‌ها نیست)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=حذف همۀ فایل‌های موجود در پوشۀ: <b>%s</b>. <br> این باعث حذف همۀ مستنداتی که به عناصر مربوطند ( اشخاص سوم، صورت‌حساب و غیره ...)، فایل‌هائی که به واحد ECM ارسال شده‌اند، نسخه‌برداری‌های پشتیبان بانک‌داده و فایل‌های موقت خواهد شد.
 PurgeRunNow=شروع پاک‌سازی
@@ -232,6 +234,7 @@ BoxesAvailable=وسایل در دسترس
 BoxesActivated=وسایل فعال شده
 ActivateOn=فعال کردن در
 ActiveOn=فعال شده در
+ActivatableOn=Activatable on
 SourceFile=فایل منبع
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=فقط در صورتی که JavaScript غیرفعال نباشد در دسترس است
 Required=ضروری
@@ -347,9 +350,10 @@ LastActivationAuthor=آخرین سازندۀ فعال‌کننده
 LastActivationIP=آخرین درگاه‌اینترنتی فعال‌کننده
 UpdateServerOffline=به‌روز‌رسانی برون‌خطی-Offline سرویس‌دهنده
 WithCounter=مدیریت شمارنده
-GenericMaskCodes=شما می‌توانید هر نوع قالب شماره‌دهی مورد نظر خود را تعیین کنید. در این قالب، برچسب‌های زیر قابل استفاده هستند: <br><b>{000000}</b> که مربوط به عددی است که در هر %s به آن افزوده می‌شود. بسته به تعداد شماره‌هائی که لازم دارید، صفر قرار دهید.  شمارنده، به تعداد صفرهای موجود از سمت چپ تکمیل خواهد شد تا به تعداد صفرهای قالب، داشته باشد. <br><b>{000000+000}</b> مثل مورد قبل، با این تفاوت که شمارنده با عدد جایگزین پس از علامت + به عنوان اولین شمارۀ %s استفاده خواهد شد. <br><b>{000000@x}</b> همانند مورد قبل با این تفاوت که شمارنده پس از رسیدن به ماه x صفر خواهد شد (x عددی بین 1 و 12 است، یا 0 برای استفاده از ماه‌های ابتدائی سال مالی تعریف شده در پیکربندی،  یا 99 برای صفر شدن در هر ماه). در صورتی که این گزینه استفاده شود و x برابر با 2 یابیشتر باشد، توالی  {yy}{mm} یا {yyyy}{mm}  مورد نیاز خواهد بود. <br><b>{dd}</b> روز (01 تا 31). <br><b>{mm}</b> ماه (01 تا 12). <br><b>{yy}</b>، <b>{yyyy}</b> یا <b>{y}</b> سال 2، 4 رقمی یا 1 رقمی. <br>
-GenericMaskCodes2=<b>{cccc}</b> شمارۀ مشتری با تعیین تعداد اعداد <br><b> {cccc000}</b> شمارۀ مشتری با تعیین تعداد عدد به همراه یک شمارنده مخصوص مشتری. این شمارنده مخصوص در هنگام ازنوشدن شمارندۀ سراسری صفر خواهد شد. <br><b>{tttt}</b> شمارۀ نوع شخص سوم با تعیین تعداد حروف (به فهرست خانه-برپاسازی-واژه‌نامه-انواع شخص سوم) نگاه کنید. در صورتی که این برچسب را اضافه کنید، شمارنده برای هر یک از انواع شخص سوم، متفاوت خواهد بود.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=تمام حروف موجود در قالب دست‌نخورده باقی خواهد ماند. <br> امکان درج فاصل وجود نداد.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>مثال برای 99م %s مربوط به شخص سومی با نام TheCompany، با تاریخ 2007-01-31: </u><br>
 GenericMaskCodes4b=<u>به عنوان مثال در شخص‌سوم ایجاد شده در 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>به عنوان مثال در محصول ایجاد شده در 2007/03/01:</u> <br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=خالی رها کردن این بخش به معنا
 ExtrafieldParamHelpselect=فهرست مقادیر باید به صورت سطور به شکل  key,value باشد (که key نمی‌تواند برابر با 0 باشد.)<br><br> برای مثال: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>برای برخورداری از فهرستی وابسته به فهرست دیگری از مشخصات تکمیلی:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>برای برخورداری از یک فهرست وابسته به یک فهرست دیگر:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=فهرست مقادیر باید سطوری به شکل key,value باشد که (که key نمی‌تواند برابر با 0 باشد) <br><br> برای مثال: <br>1,value1<br>2,value2 <br>3,value3<br>...
 ExtrafieldParamHelpradio=فهرست مقادیر باید سطوری به شکل key,value باشد که (که key نمی‌تواند برابر با 0 باشد) <br><br> برای مثال: <br>1,value1<br>2,value2 <br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=فهرست مقادیری که از یک جدول گرفته می‌شود <br>روش درج: table_name:label_field:id_field::filter<br>مثال: c_typent:libelle:id::filter<br><br>filter می‌تواند یک آزمایش ساده باشد (مثال active=1) برای نمایش مقدار فعال <br> شما همچنین می‌توانید از  $ID$ در فیلتر استفاده نمائید که شناسۀ کنونی شیء فعلی است <br>برای انجام جستار  SELECTدر فیلتر از  $SEL$<br>اگر بخواهید از extrafields در فیلتر استفاده نمائید، از روش‌درج extra.fieldcode=...  استفاده نمائید، (که کد فیلتر، همان کد extrafiled است)<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
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=کتابخانۀ قابل استفاده برای تولید PDF
@@ -541,6 +545,8 @@ Module40Name=فروشندگان
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=گزارش‌کار اشکال‌یابی
 Module42Desc=امکانات گزارش‌برداری (فایل، گزارش‌کار سامانه، ...). این گزارش کارها مربوط به مقاصد فنی/اشکال‌یابی هستند.
+Module43Name=نوار اشکال‌یابی
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=ویراستاران
 Module49Desc=مدیریت ویراستارها
 Module50Name=محصولات
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=قابلیت‌های تبدیل GeoIP Maxmind 
 Module3200Name=بایگانی‌های تغییرناپذیر
 Module3200Desc=فعال کردن یک گزارش کاری غیرقابل تغییر. رخدادها به صورت بلادرنگ بایگانی خواهند شد. گزارش به صورت یک جدول فقط‌خواندنی از رخدادهای زنجیره‌ای در آمده که قابلیت صادرات دارند. برای بعضی از کشورها این واحد، اجباری است.
+Module3400Name=شبکه‌های اجتماعی
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=مدیریت منابع انسانی
 Module4000Desc=مدیریت منابع انسانی (مدیریت شعبه، قراردادهای کارمندان و حس‌ها)
 Module5000Name=چند-شرکتی
 Module5000Desc=به شما امکان مدیریت شرکت‌های متعدد را می‌دهد
-Module6000Name=گردش‌کار
-Module6000Desc=مدیریت گردش‌کار (ساخت خودکار اشیاء و/یا تغییر خودکار وضعیت)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=وبگاه‌ها
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=مدیریت درخواست مرخصی
@@ -805,7 +813,8 @@ PermissionAdvanced253=ساخت/ویرایش کاربران داخلی/خارجی
 Permission254=ساخت/ویرایش کاربران خارجی
 Permission255=تغییر گذرواژۀ سایر کاربران
 Permission256=حذف یا غیرفعال‌کردن سایر کاربران
-Permission262=گسترش دسترسی به همۀ اشخاص سوم (نه فقط اشخاص‌سومی که کاربر مربوط به آن نمایندۀ فروش باشد). <br> برای کاربران خارجی مؤثر نیست (همواره برای پیشنهادها، سفارشات، صورت‌حساب‌ها و قراردادها و غیره محدود به خود هستند). <br> برای طرح‌ها مؤثر نیست ( فقط نقش‌ها-rules ، قابل نمایش بودند و انتساب‌ها در مجوزهای طرح مربوطه مهم است).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=ملاحظۀ CA
 Permission272=ملاحظۀ صورت‌حساب‌ها
 Permission273=صادرکردن صورت‌حساب‌ها
@@ -1175,7 +1184,8 @@ SetupDescription2=دو واحد بعدی الزامی هستند (دو ورود
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=سایر عناوین فهرست برپاسازی برای مدیریت مقادیر اختیاری.
-LogEvents=رویدادهای بازرسی امنیتی
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=بازرسی
 InfoDolibarr=دربارۀ Dolibarr
 InfoBrowser=دربارۀ مرورگر
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=به نظر لازم است روند به‌ه
 YouMustRunCommandFromCommandLineAfterLoginToUser=شما باید این سطر دستور را پس از ورود به خط فرمان با کاربر <b>%s</b> اجرا کنید یا این‌که گزینۀ -W را در انتهای فرمان برای اعلام گذرواژۀ <b>%s</b> به‌کار گیرید.
 YourPHPDoesNotHaveSSLSupport=توابع SSL در PHP شما موجود نیست
 DownloadMoreSkins=پوسته‌های بیشتر برای دریافت
-SimpleNumRefModelDesc=شمارۀ مرجع را با حالت %syymm-nnnn باز می‌گرداند، که yy سال است، mm ماه و nnnn یک ترتیب بدون نوسازی.
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=نمایش شناسۀ حرفه‌ای و نشانی 
 ShowVATIntaInAddress=پنهان کردن شمارۀ م‌ب‌اا داخل‌جامعه‌ای-اروپا به‌همراه نشانی‌ها
 TranslationUncomplete=ترجمه جزئی
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=سرور واسط-proxy : نام/نشانی
 MAIN_PROXY_PORT=سرور واسط-proxy: درگاه
 MAIN_PROXY_USER=سرور واسط-proxy: نام‌کاربری/ورود
 MAIN_PROXY_PASS=سرور واسط-proxy: گذرواژه
-DefineHereComplementaryAttributes=سایر مشخصات مورد نظر را در صورت نیاز به شامل کردن برای %s وار نمائید
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=ویژگی‌های تکمیلی
 ExtraFieldsLines=ویژگی‌های تکمیلی (سطور)
 ExtraFieldsLinesRec=ویژگی‌های تکمیلی (سطور قالب‌های صورت‌حساب)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=ورود (unix)
 LDAPFieldLoginExample=مثال: uid
 LDAPFilterConnection=صافی جستجو
 LDAPFilterConnectionExample=مثال: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=ورود (سامبا، Active Directory)
 LDAPFieldLoginSambaExample=مثال: samaccountname
 LDAPFieldFullname=نام‌کامل
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=شرکت شما برای عدم استفاده از م
 AccountancyCode=کد حساب‌داری
 AccountancyCodeSell=کد حساب فروش
 AccountancyCodeBuy=کد حساب خرید
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=برپاسازی واحد رخدادها و جلسات
 PasswordTogetVCalExport=کلید برای اعتباردهی به پیوند صادرات
+SecurityKey = Security Key
 PastDelayVCalExport=عدم صادرکردن رخداد قدیمی‌تر از
 AGENDA_USE_EVENT_TYPE=استفاده از انواع رخداد (قابل‌مدیریت در برپاسازی-> واژه‌نامه‌ها -> انواع رخدادهای جلسات)
 AGENDA_USE_EVENT_TYPE_DEFAULT=ثبت خودکار این مقدار پیش‌فرض برای نوع رخداد در برگۀ ساخت رخداد
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=رنگ پس‌زمینۀ سطور فرد جدول
 BackgroundTableLineEvenColor=رنگ پس‌زمینۀ سطور زوج جدول
 MinimumNoticePeriod=حداقل بازۀ خبردهی (درخواست مرخصی شما باید حداقل با این فاصلۀ زمانی انجام شود)
 NbAddedAutomatically=تعداد روزهائی که باید به شمارنده‌های کاربران (به شکل خودکار) در هر ماه اضافه شود
-EnterAnyCode=این بخش حاوی ارجاعی به یک سطر شناسه است. مقدار دل‌خواه خود را وارد نمائید، اما بدون نویسه‌های خاص.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=در اینجا بین دو براکت فهرست اعداد بایت‌هائی را که نمایاندۀ نماد واحدپولی است وارد نمائید. برای مثال، برای $ مقدار [36] را وارد نمائید، برای ریال برزیل R$ مقدار [82,36] و برای €، مقدار [8364]
 ColorFormat=رنگ RGB در مبنای HEX، مثال: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=فاصلۀحاشیۀ پائین PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=تنظیمات خاصی برای این واحدموردنیاز نیست
 SetToYesIfGroupIsComputationOfOtherGroups=در صورتی که این گروه جهت محاسبۀ سایر گروه‌هاست این گزینه را انتخاب کنید
-EnterCalculationRuleIfPreviousFieldIsYes=در صورتی که بخش قبلی به "بله" تنظیم شده باشد، قاعدۀ محاسبه را وارد نمائید (برای مثال 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=چندین نوع زبان پیدا شد
 RemoveSpecialChars=حذف نویسه‌های خاص
 COMPANY_AQUARIUM_CLEAN_REGEX=گزینش Regex برای پاک کردن مقدار (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=برپاسازی واحد شبکه‌های اجتماعی
 EnableFeatureFor=فعال کردن‌قابلیت‌ها برای <strong>%s</strong>
 VATIsUsedIsOff=نکته: این گزینه برای استفاده از مالیات‌برفروش یا مالیات‌برارزش‌افزوده در فهرست %s - %s به حالت <strong>خاموش</strong> درآمده است، بنابراین مالیات‌برفروش و مالیات بر ارزش افزوده در عملیات فروش همواره برابر با 0 خواهد بود.
 SwapSenderAndRecipientOnPDF=جابه‌جا کردن محل ارسال‌کننده و دریافت کننده در سندهای PDF
-FeatureSupportedOnTextFieldsOnly=هشدار! این قابلیت تنها در بخش‌های نشوتاری پشتیبانی می‌شود. به‌هرحال مؤلفۀ نشانی اینترتی action=create و action=edit باید تنظیم شده یا این‌که نام صفحه باید با 'new.php' تمام شود تا این قابلیت را به‌حرکت‌اندازد.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=جمع‌کنندۀ رایانامه
 EmailCollectorDescription=افزودن یک وظیفۀ زمان‌بندی شده و یک صفحۀ برپاسازی برای پویش منظم بخش‌های رایانامه (با استفاده از از پرتکل IMAP) و ثبت رایانامه‌هائی که در برنامۀ شما دریافت شده در محل درست و/یا ایجاد خودکار چند ردیف (مثل سرنخ‌ها).
 NewEmailCollector=یک جمع‌کنندۀ رایانامۀ جدید
@@ -2049,8 +2062,11 @@ UseDebugBar=استفاده از نوار اشکال‌یابی
 DEBUGBAR_LOGS_LINES_NUMBER=تعداد آخرین سطور گزارش‌کار برای حفظ در کنسول
 WarningValueHigherSlowsDramaticalyOutput=هشدار! مقادیر بزرگ خروجی را به‌شدت کند می‌کند
 ModuleActivated=واحد %s فعال شده و باعث کاهش سرعت رابط کاربری می‌شود
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=اشکال صادارات با همگان به اشتراک گذاشته شدند
 ExportSetup=برپاسازی واحد صادرات
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index 74e84caae12..4f30cc9681d 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=تعهدنامۀ SEPAی شما
 FindYourSEPAMandate=این تعهدنامۀ SEPAی شماست تا شرکت ما را مجاز کند سفارش پرداخت مستقیم از بانک داشته باشد. آن را امضا شده بازگردانید (نسخۀ اسکن‌شدۀ برگۀ امضا شده) یا آن را توسط رایانامه ارسال کنید:
 AutoReportLastAccountStatement=پرکردن خودکار بخش "شمارۀ شرح کار بانک" با آخرین شمارۀ شرح کار در هنگام وفق دادن
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 4a28819cc88..9f20ff13d72 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -52,11 +52,12 @@ Invoices=صورت‌حساب‌ها
 InvoiceLine=سطر صورت‌حساب
 InvoiceCustomer=صورت‌حساب مشتری
 CustomerInvoice=صورت‌حساب مشتری
-CustomersInvoices=صورت‌حساب‌های مشتریان
+CustomersInvoices=صورت‌حساب مشتری
 SupplierInvoice=صورت‌حساب فروشنده
-SuppliersInvoices=صورت‌حاسب‌های فروشنده
+SuppliersInvoices=صورت‌حساب فروشندگان
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=صورت‌حساب فروشنده
-SupplierBills=صور‌ت‌حساب تامین‌کنندگان
+SupplierBills=صورت‌حساب فروشندگان
 Payment=پرداخت
 PaymentBack=بازپس‌گیری
 CustomerInvoicePaymentBack=بازپس‌گیری
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=پرداخت‌هائی که قبلا انجام شده
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=مقررات پرداخت
 PaymentMode=نوع پرداخ
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=کارت اعتباری/نقدی
 PaymentTypePP=PayPal
 IdPaymentMode=نوع پرداخت (شناسه)
@@ -373,6 +376,7 @@ DateLastGeneration=تاریخ آخرین تولید
 DateLastGenerationShort=تاریخ آخرین تولید
 MaxPeriodNumber=حداکثر تعداد تولید صورت‌حساب
 NbOfGenerationDone=تعداد صورت‌حساب‌هائی که تا کنون تولید شده
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=تعداد تولیدهای انجام شده
 MaxGenerationReached=حداکثر تعداد قابل تولید به‌سررسیده
 InvoiceAutoValidate=تائید خودکار صورت‌حساب‌ها
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=ظرف  14 روز پس از آخرماه
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=مبلغ متغیر ( %% کل )
 VarAmountOneLine=مبلغ متغیر ( %% کل ) - 1 سطر با برچسب "%s"
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=انتقال بانکی
 PaymentTypeShortVIR=انتقال بانکی
@@ -494,12 +498,16 @@ Cash=پول‌نقد
 Reported=تأخیرکرده
 DisabledBecausePayments=ممکن نیست، زیرا دارای پرداخت هم هست
 CantRemovePaymentWithOneInvoicePaid=امکان حذف این پرداخت نیست زیرا حداقل یک صورت‌حساب به‌عنوان پرداخت‌شده وجود دارد
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=پرداخت مورد انتظار
 CantRemoveConciliatedPayment=امکان حذف پرداخت تطبیق‌داده شده وجود ندارد
 PayedByThisPayment=پرداخت شده توسط این پرداخت
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=همۀ صورت‌حساب‌های بدون باقی‌ماندۀ پرداخت به صورت خودکار به وضعیت "پرداخت شده" بسته خواهد شد.
 ToMakePayment=پرداخت
 ToMakePaymentBack=پس‌دادن‌پرداخت
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=شما باید ابتدا یک صورت
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=قالب PDF صورت‌حساب Sponge. یک قالب کامل صورت‌حساب 
 PDFCrevetteDescription=قالب PDF صورت‌حساب Crevette. یک قالب کامل صورت‌حساب برای صورت‌حساب‌های وضعیت
-TerreNumRefModelDesc1=بازگرداندن عدد با شکل %syymm-nnnn برای صورت‌حساب‌های استاندارد و %syymm-nnnn برای یادداشت‌های اعتباری که در آن yy نمایندۀ سال، mm ماه و nnnn یک شمارنده بدون توقف و بدون بازگشت به 0 است
-MarsNumRefModelDesc1=بازگرداندن عدد با شکل %syymm-nnnn برای صورت‌حساب‌های استاندارد و %s yymm-nnnn برای صورت‌حساب‌های جایگزین و %syymm-nnnn برای صورت‌حساب‌های پیش‌پرداخت و %syymm-nnnn برای یادداشت‌های اعتباری است که در آن yy نمایندۀ سال، mm ماه و nnnn یک شمارنده بدون توقف و بدون بازگشت به 0 است
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=صورت‌حسابی که با $syymm شروع می‌شود قبلا وجود داشته و با این نوع ترتیب شماره همخوان نیست. آن را حذف کرده یا تغییر نام دهید تا این واحد فعال شود
-CactusNumRefModelDesc1=بازگرداندن عدد با شکل %s yymm-nnnn برای صورت‌حساب‌های استاندارد و %s yymm-nnnn  برای یادداشت‌های اعتباری و  %syymm-nnnn برای پیش پرداخت است که در آن yy نمایندۀ سال، mm ماه و nnnn یک شمارنده بدون توقف و بدون بازگشت به 0 است
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=طرف‌تماس خدمات فر
 InvoiceFirstSituationAsk=صورت‌حساب اولین وضعیت
 InvoiceFirstSituationDesc=<b>صورت‌حساب‌های وضعیت</b> با وضعیت‌هائی گره خورده‌اند که مربوط به پیشرفت کار هستند، برای مثال پیشرفت یک ساختمان. هر وضعیت با یک صورت‌حساب گره خورده است.
 InvoiceSituation=صورت‌حساب وضعیت
+PDFInvoiceSituation=صورت‌حساب وضعیت
 InvoiceSituationAsk=صورت‌حساب در پی وضعیت
 InvoiceSituationDesc=وضعیت جدیدی در پس وضعیتی که اکنون موجود است بسازید
 SituationAmount=مبلغ (خالص) صورت‌حساب وضعیت
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=در صورتی که می‌خواهید ای
 DeleteRepeatableInvoice=حذف صورت‌حساب قالبی
 ConfirmDeleteRepeatableInvoice=آیا مطمئنید می‌خواهید  این صورت‌حساب قالبی را حذف کنید؟
 CreateOneBillByThird=ساخت یک صورت‌حساب برای هر شخص سوم (در غیر این‌صور، یک صورت‌حساب برای هر سفارش)
-BillCreated=(%s) صورت‌حساب ساخته شد
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=وضعیت تولید سند
 DoNotGenerateDoc=عدم تولید فایل سن
 AutogenerateDoc=تولید خودکار فایل سند
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index 644922a4949..f0348d2040c 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=اطلاعات ورود
 BoxLastRssInfos=اطلاعات RSS
 BoxLastProducts=آخرین %s محصول/خدما
@@ -17,9 +18,13 @@ BoxLastActions=آخرین فعالیت‌ها
 BoxLastContracts=آخرین قراردادها
 BoxLastContacts=آخرین طرف‌های تماس/نشانی‌ها
 BoxLastMembers=آخرین اعضاء
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=آخرین واسطه‌گری‌ها
 BoxCurrentAccounts=ماندۀ حساب‌های باز
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=آخرین %s اخبار از %s
 BoxTitleLastProducts=خدمات/محصولات: آخرین %s تغییریافته
 BoxTitleProductsAlertStock=محصولات: هشدار موجودی
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=حسابداری
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index 5c7ca6a0f2e..b815c3aa17f 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌ه
 CustomersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های مشتریان
 MembersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های اعضا
 ContactsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های طرف‌های تماس
-AccountsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های حساب‌ها
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های طرح‌ها
 UsersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های کاربران
 SubCats=زیردسته‌ها
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=نمایش کلیدواژه/دسته‌بندی
 ByDefaultInList=به طور پیش‌فرض در فهرست
 ChooseCategory=انتخاب دسته‌بندی
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index ab78f11dd02..d29507f145e 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -43,9 +43,10 @@ Individual=فرد خصوصی
 ToCreateContactWithSameName=به طور خودکار با همین اطلاعات یک طرف/تماس نشانی شبیه به شخص‌سوم در ذیل این شخص‌سوم خواهد ساخت. در اکثر موارد، حتی در صورتی‌که که شخص‌سوم، یک شخص فیزیکی باشد، ساختن یک شخص‌سوم، کافی است. 
 ParentCompany=شرکت والد
 Subsidiaries=شرکتهای تابعه
-ReportByMonth=گزارش ماهانه
-ReportByCustomers=گزارش مشتری
-ReportByQuarter=گزارش بر اساس نرخ
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=کد ملی
 RegisteredOffice=دفتر ثبتی
 Lastname=نام خانوادگی
@@ -172,14 +173,20 @@ ProfId1ES=شناسۀ کاری 1 (CIF/NIF)
 ProfId2ES=شناسۀ کاری 2 (شمارۀ امنیت اجتماعی)
 ProfId3ES=شناسۀ کاری 3 (CNAE)
 ProfId4ES=شناسۀ کاری 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=شناسۀ کاری 1 (SIREN)
 ProfId2FR=شناسۀ کاری 2 (SIRET)
 ProfId3FR=شناسۀ کاری 3 (NAF, old APE)
 ProfId4FR=شناسۀ کاری 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=شمارۀ ثبت
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=شناسۀ کاری 1 (R.C.S. Luxembourg)
 ProfId2LU=شناسۀ کاری 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=شناسۀ کاری 1 (NIPC)
 ProfId2PT=شناسۀ کاری 2 (شمارۀ تامین اجتماعی)
 ProfId3PT=شناسۀ کاری 3 (Commercial Record number)
 ProfId4PT=شناسۀ کاری 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=شناسۀ کاری 1 (OGRN)
 ProfId2RU=شناسۀ کاری 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=صورت‌حساب‌های درانتظار کنونی
 OutstandingBill=حداکثر تعداد صورت‌حساب‌های درانتظار
 OutstandingBillReached=حداکثر تعداد رسیدن به صورت‌حساب‌های درانتظار
 OrderMinAmount=حداقل مقدار سفارش
-MonkeyNumRefModelDesc=یک عدد به شکل %s yymm-nnnn برای این کد مشتری و %s yymm-nnnn برای فروشنده باز می‌گرداند که yy برابر با سال، mm برابر با ماه و nnnn یک سریال بدون توقف و بدون بازگشت به 0 است.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=این کد آزاد است و می‌تواند در هر زمانی ویرایش شود.
 ManagingDirectors=نام مدیر (مدیرعامل، مدیر، رئیس...)()
 MergeOriginThirdparty=نسخه‌برداری از شخص سوم (شخص‌سومی که می‌خواهید حذف کنید)
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index 5e300643567..b8b215c8b96 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=خریدهای SGST
 VATCollected=مالیات‌بر‌ارزش‌افزودۀ جمع‌آوری شده
 StatusToPay=قابل پرداخت
 SpecialExpensesArea=ناحیۀ انجام همۀ پرداخت‌های خاص
+VATExpensesArea=Area for all TVA payments
 SocialContribution=مالیات اجتماعی و ساختاری
 SocialContributions=مالیات‌های اجتماعی و ساختاری
 SocialContributionsDeductibles=مالیات‌های اجتماعی و ساختاری کسرپذیر
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=پرداخت صورت‌حساب مشتری
 PaymentSupplierInvoice=پرداخت صورت‌حساب فروشنده
 PaymentSocialContribution=پرداخت مالیات اجتماعی/ساختاری
 PaymentVat=پرداخت مالیات‌برارزش‌افزوده
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=فهرست پرداخت‌ها
 ListOfCustomerPayments=فهرست پرداخت‌های مشتری
 ListOfSupplierPayments=فهرست‌پرداخت‌های مربوط به فروشنده
@@ -104,6 +106,8 @@ LT2PaymentES=پرداخت IRPF
 LT2PaymentsES=پرداخت‌های IRPF
 VATPayment=پرداخت مالیات بر فروش
 VATPayments=پرداخت‌های مالیات بر فروش
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=بازپس‌گیری مالیات‌برفروش
 NewVATPayment=یک پرداخت جدید مالیات‌برفروش
 NewLocalTaxPayment=یک پرداخت جدید مالیات %s
@@ -134,9 +138,17 @@ NoWaitingChecks=هیچ چکی در انتظار وصول شدن نیست
 DateChequeReceived=تاریخ دریافت چک
 NbOfCheques=تعداد چک‌ها
 PaySocialContribution=پرداخت مالیات اجتماعی/ساختاری
-ConfirmPaySocialContribution=آیا مطمئنید می‌خواهید این مالیات ساختاری یا اجتماعی را به صورت پرداخت شده طبقه‌بندی کنید؟
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=حذف یک پرداخت مالیات اجتماعی/ساختاری
-ConfirmDeleteSocialContribution=آیا مطمئن هستید می‌خواهید پرداخت این مالیات اجتماعی/ساختاری را حذف کنید؟
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=مالیات‌های اجتماعی و ساختاری و پرداخت‌ها
 CalcModeVATDebt=حالت <b>%sحساب‌داری مالیات‌بر‌ارزش افزوده تعهدی%s</b>.
 CalcModeVATEngagement=حالت <b>%sمالیات بر ارزش افزوده در ازای درآمد-هزینه%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- این شامل همۀ پرداخت‌های واقعی صو
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- شامل همۀ پرداخت‌های دریافت‌شدۀ مؤثر صورت‌حساب‌های مشتریان است. <br> -این بسته به تاریخ پرداخت این صورت‌حساب‌هاست<br>
 RulesCATotalSaleJournal=شامل همۀ سطور بستانکار دفترفروش‌روزانه است
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=شامل همۀ ردیف‌های دفترکل دارای حساب‌حساب‌داری است که در گروه‌های "هزینه" یا "درآمد" باشند
 RulesResultBookkeepingPredefined=شامل همۀ ردیف‌های دفترکل دارای حساب‌حساب‌داری است که در گروه‌های "هزینه" یا "درآمد" باشند
 RulesResultBookkeepingPersonalized=نمایش دهندۀ ردیف دفترکل شما با حساب‌های حساب‌درای است <b> گروه‌بندی‌شده توسط گروه‌های شخصی‌سازی‌شده</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=گزارش مالیات‌برفروش بر حسب شخ
 VATReportByCustomers=گزارش مالیات‌برفروش بر حسب مشتری
 VATReportByCustomersInInputOutputMode=گزارش بر حسب مالیات‌بر‌ارزش‌افزوده جمع‌آوری و پرداخت شده
 VATReportByQuartersInInputOutputMode=گزارش بر حسب مالیات‌برفروش جمع‌آوری و پرداخت شده
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=گزارش مالیات 2 بر اساس نرخ
 LT2ReportByQuarters=گزارش مالیات 3 بر اساس نرخ
 LT1ReportByQuartersES=گزارش بر اساس نرخ RE
@@ -217,7 +231,7 @@ Pcg_subtype=زیر گروه PCG
 InvoiceLinesToDispatch=سطور قابل ارسال صورت‌حساب
 ByProductsAndServices=بر حسب محصول و خدمات
 RefExt=ارجاع خارجی
-ToCreateAPredefinedInvoice=برای ساخت یک صورت‌حساب قالبی، یک صورت‌حساب استاندارد ساخته و سپس بدون تائیداعتبار آن روی کلید «%s» کلیک کنید.
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=پیوند به سفارش
 Mode1=روش 1
 Mode2=روش 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=حساب‌حساب‌داری اختصاصی 
 ACCOUNTING_ACCOUNT_SUPPLIER=حساب حساب‌داری استفاده شده برای اشخاص سوم
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=حساب‌حساب‌داری اختصاصی تعریف شده در کارت شخص‌سوم تنها برای حساب‌داری دفترمعین استفاده می‌شود. اگر حساب‌حساب‌داری اختصاصی مشتری در کارت شخص‌سوم تعریف نشده باشد، این یکی فقط برای دفترکل‌مرکزی و به‌عنوان مقدار پیش‌فرض حسابداری دفترمعین استفاده می‌شود.
 ConfirmCloneTax=نسخه‌برداری از یک مالیات اجتماعی/ساختاری را تائید کنید
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=نسخه‌برداری برای ماه آینده
 SimpleReport=گزارش ساده
 AddExtraReport=گزارش‌های دیگر (افزودن گزارش‌های مشتری خارجی و داخلی)
@@ -253,7 +269,8 @@ AccountingAffectation=انتساب حساب‌داری
 LastDayTaxIsRelatedTo=آخرین روز دورۀ مالیاتی مربوط به
 VATDue=مالیات بر فروش مطالبه شده
 ClaimedForThisPeriod=مطالبه شده برای دورۀ
-PaidDuringThisPeriod=پرداخت شده برای این دوره
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=بر حسب نرخ مالیات‌برفروش
 TurnoverbyVatrate=گردش‌مالی صورت‌حساب‌شده بر حسب نرخ مالیات بر فروش
 TurnoverCollectedbyVatrate=گردش‌مالی دریافت‌شده بر حسب نرخ مالیات بر فروش
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/fa_IR/ecm.lang b/htdocs/langs/fa_IR/ecm.lang
index b1e4bd200ec..c8b1c8e7b2f 100644
--- a/htdocs/langs/fa_IR/ecm.lang
+++ b/htdocs/langs/fa_IR/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=فایل‌ها در پایگاه داده فهرس
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 43ad72288b6..80e7a42b99d 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=پوشۀ <b>%s</b> یافت نشد. (مسیر نادرست، م
 ErrorFunctionNotAvailableInPHP=برای این قابلیت، تابع <b>%s</b> نیاز است اما در این برپاسازی/نسخۀ PHP موجود نیست.
 ErrorDirAlreadyExists=قبلا یک پوشه با همین نام وجود داشته است.
 ErrorFileAlreadyExists=قبلا یک فایل به همین نام وجود داشته است.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=فایل به طور کامل توسط سرور دریافت نشده است.
 ErrorNoTmpDir=پوشۀ موقت %s وجود ندارد.
 ErrorUploadBlockedByAddon=امکان ارسال توسط یک افزونۀ PHP/Apache مسدود شده است
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=خطا در هنگام بارگذاری نمودار حسا
 ErrorBadSyntaxForParamKeyForContent=برای مؤلفۀ keyforcontent نگارش بدی وارد شده است. باید مقداری داشته باشد که با %s یا %s آغاز شود.
 ErrorVariableKeyForContentMustBeSet=خطا، مقدارثابت با نام %s (با محتوای متنی قابل نمایش) یا %s (با نشانی بیرونی قابل نمایش) باید تنظیم شده باشد.
 ErrorURLMustStartWithHttp=نشانی اینترنتی %s باید با http://  یا  https:// آغاز گرد
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=خطا، ارجاع جدید قبلا استفاده شده است
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/fa_IR/externalsite.lang b/htdocs/langs/fa_IR/externalsite.lang
index 4f8e8888c6b..8fde4592056 100644
--- a/htdocs/langs/fa_IR/externalsite.lang
+++ b/htdocs/langs/fa_IR/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=تنظیم پیوند به وبگاه بیرونی
-ExternalSiteURL=نشانی‌اینترنتی وبگاه بیرونی
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=واحد ExternalSite  به درستی پیکربندی نشده است
 ExampleMyMenuEntry=عنوان فهرست من
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index e24969fbdf7..e06cabfcf01 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=تاریخ اصلاح
 IPModification=Modification IP
 DateLastModification=آخرین تاریخ اصلاح
 DateValidation=تاریخ اعتباردهی
+DateSigning=Signing date
 DateClosing=تاریخ بسته شدن
 DateDue=تاریخ موعدپرداخت
 DateValue=تاریخ مقداردهی
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=مبلغ واحد (بدون .) (واحد پولی)
 UnitPriceTTC=قیمت واحد
 PriceU=U.P.
 PriceUHT=U.P. (خالص)
-PriceUHTCurrency=U.P (واحدپولی)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (با مالیات)
 Amount=مبلغ
 AmountInvoice=مبلغ صورت‌حساب
@@ -389,6 +390,8 @@ AmountTotal=مبلغ کل
 AmountAverage=میانگین مبلغ
 PriceQtyMinHT=حداقل تعداد برای مبلغ (بدون مالیات)
 PriceQtyMinHTCurrency=حداقل تعداد برای مبلغ (بدون مالیات) (واحد پولی)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=درصد
 Total=جمع‌کل
 SubTotal=جمع جزء
@@ -724,7 +727,7 @@ MenuMembers=اعضاء
 MenuAgendaGoogle=دستورکار گوگل
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=محدودیت Dolibarr  (فهرست خانه-برپاسازی-امنیت):  %s کیلوبایت، محدودیت PHP برابر با: %s کیلوبایت
-NoFileFound=هیچ سندی در این پوشه ذخیره نشده است
+NoFileFound=No documents uploaded
 CurrentUserLanguage=زبان کنونی
 CurrentTheme=پوستۀ کنونی
 CurrentMenuManager=مدیرفهرست کنونی
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=حذف عبارت '%s'
 SomeTranslationAreUncomplete=برخی از زبان‌های قابل انتخاب ممکن است تنها به شکل ناقص ترجمه شده باشد یا دارای خطا باشند. لطفا برای تکمیل و تصحیح زبان مورد نظر خود در <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> ثبت نام نمائید و اصلاحات مورد نظر خود را انجام دهید.
-DirectDownloadLink=پیوند دریافت مستقیم (عمومی/خارجی)
-DirectDownloadInternalLink=پیوند دریافت مستقیم (نیازمند ورود و مجوز)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=دریافت
 DownloadDocument=دریافت سن
 ActualizeCurrency=به‌روز‌رسانی نرخ واحدپولی
@@ -1013,6 +1018,7 @@ SearchIntoContacts=طرف‌تماس‌ها
 SearchIntoMembers=اعضاء
 SearchIntoUsers=کاربران
 SearchIntoProductsOrServices=محصولات یا خدمات
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=طرح‌ها
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=وظایف
@@ -1049,12 +1055,13 @@ KeyboardShortcut=میان‌بر صفحه‌کلید
 AssignedTo=منتسب به
 Deletedraft=حذف پیش‌نویس
 ConfirmMassDraftDeletion=تائید حذف دستجمعی پیش‌نویس
-FileSharedViaALink=فایل به‌اشتراک‌گذاشته شده با پیوند
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=ابتدا یک شخص‌سوم انتخاب کنید
 YouAreCurrentlyInSandboxMode=شما فعلا در حالت "شن‌بازی" %s قرار دارید
 Inventory=انبار
 AnalyticCode=کد Analytic
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=نمایش اطلاعات بیشتر
 NoFilesUploadedYet=لطفا ابتدا یک سند بالاگذاری نمائید
 SeePrivateNote=ملاحظۀ یادداشت خصوصی
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/fa_IR/margins.lang b/htdocs/langs/fa_IR/margins.lang
index ca2b20809a8..9cff4ab05ed 100644
--- a/htdocs/langs/fa_IR/margins.lang
+++ b/htdocs/langs/fa_IR/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=جزئیات حاشیه
 ProductMargins=حاشیۀ محصولات
 CustomerMargins=حاشیۀ مشتری
 SalesRepresentativeMargins=حاشیه‌های نمایندۀ فروش
+ContactOfInvoice=Contact of invoice
 UserMargins=حاشیه‌های کاربر
 ProductService=محصولات و خدمات
 AllProducts=همۀ محصولات و خدمات
 ChooseProduct/Service=انتخاب محصول و یا خدمات
 ForceBuyingPriceIfNull=الزام مبلغ خرید/هزینه به قیمت فروش، در صورتی که تعریف نشده باشد
-ForceBuyingPriceIfNullDetails=در صورتی که مبلغ خرید/هزینه تعریف نشده باشد، و این گزینه "روشن" باشد، حاشیۀ این سطر صفر خواهد بود (مبلغ خرید/هزینه = قیمت فروش)، در غیر این‌صورت اگر ("خاموش") باشد، حاشیه برابر با پیش‌فرض پیشنهادی خواهد بود.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=روش حاشیه برای تخفیف‌های سراسری
 UseDiscountAsProduct=به عنوان یک محصول
 UseDiscountAsService=به عنوان خدمات
@@ -36,7 +37,7 @@ CostPrice=قیمت هزینه
 UnitCharges=عوارض واحد
 Charges=عوارض
 AgentContactType=نوع طرف‌تماس نمایندۀ تجاری
-AgentContactTypeDetails=تعیین طرف‌تماس (پیوند شده روی صورت‌حساب‌ها) برای گزارش حاشیۀ بر حسب نمایندۀ فروش 
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=نرخ باید یک مقدار عددی باشد
 markRateShouldBeLesserThan100=نرخ نشان باید کم‌تر از 100 باشد
 ShowMarginInfos=نمایش اطلاعات حاشیه‌ها
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index d3f532cc95e..bd42466f112 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=لیست اعضای پیش نویس (به اعتبار شود
 MembersListValid=لیست اعضای معتبر
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=لیست اعضای واجد شرایط
 MenuMembersToValidate=عضو پیش نویس
 MenuMembersValidated=اعضای اعتبار
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=کاربران با اشتراک برای دریافت
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=منقضی شده
 MemberStatusPaid=اشتراک به روز
 MemberStatusPaidShort=به روز
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=عضو پیش نویس
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=معتبر شد
@@ -82,6 +87,8 @@ Physical=فیزیکی
 Moral=اخلاقی
 MorAndPhy=Moral and Physical
 Reenable=را دوباره فعال کنید
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=حذف عضو
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=فرمت صفحه برچسب ها
 DescADHERENT_ETIQUETTE_TEXT=متن چاپ شده بر روی ورق آدرس عضو
@@ -162,6 +170,7 @@ DocForLabels=تولید ورق آدرس
 SubscriptionPayment=پرداخت اشتراک
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=آمار کاربران بر اساس کشور
 MembersStatisticsByState=آمار کاربران توسط ایالت / استان
 MembersStatisticsByTown=آمار کاربران توسط شهر
diff --git a/htdocs/langs/fa_IR/modulebuilder.lang b/htdocs/langs/fa_IR/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/fa_IR/modulebuilder.lang
+++ b/htdocs/langs/fa_IR/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index c1eb5ddfe45..94e00a837b7 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/orders.lang
@@ -16,6 +16,8 @@ ToOrder=ایجاد سفارش
 MakeOrder=ساخت سفارش
 SupplierOrder=سفارش خرید
 SuppliersOrders=سفارش‌های خرید
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=سفارش‌های خرید کنونی
 CustomerOrder=سفارش فروش
 CustomersOrders=سفارش‌های فروش
@@ -141,11 +143,12 @@ OrderByEMail=رایانامه
 OrderByWWW=برخط
 OrderByPhone=تلفن
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=یک نمونۀ سادۀ سفارش
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=صدور صورت‌حساب سفارش‌ها
+CreateInvoiceForThisSupplier=صدور صورت‌حساب سفارش‌ها
 NoOrdersToInvoice=هیچ سفارشی قابل صدور صورت‌حساب نیست
 CloseProcessedOrdersAutomatically=همۀ سفارش‌های انتخاب شده را "پردازش شده" طبقه‌بندی کن.
 OrderCreation=ساخت سفارش
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index a52e9a0dee7..a7339c81ea6 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=ایجاد شده توسط٪ s
 ModifiedBy=اصلاح شده توسط٪ s
 ValidatedBy=تایید شده توسط٪ s
+SignedBy=Signed by %s
 ClosedBy=بسته شده توسط٪ s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=این کلید جدید خود را برای ورود به سایت ا
 NewKeyWillBe=کلید جدید را برای ورود به نرم افزار خواهد بود
 ClickHereToGoTo=برای رفتن به٪ s اینجا را کلیک کنید
 YouMustClickToChange=با این حال شما باید اول بر روی لینک زیر کلیک کنید تا اعتبار این تغییر رمز عبور
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=اگر شما این تغییر را درخواست نکرده، فقط این ایمیل را فراموش کرده ام. اعتبار نامه های شما امن نگهداری می شود.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang
index f0f55c13c8e..6542fcb3563 100644
--- a/htdocs/langs/fa_IR/productbatch.lang
+++ b/htdocs/langs/fa_IR/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=استفاده از شمارۀ سری‌ساخت/سریال
-ProductStatusOnBatch=بله (نیاز به شمارۀ سری‌ساخت/سریال)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=خیر ( بدون نیاز به شمارۀ سری‌ساخت/سریال)
-ProductStatusOnBatchShort=بله
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=خیر
 Batch=سری‌ساخت/سریال
 atleast1batchfield=تاریخ‌مصرف یا تاریخ‌فروش یا شمارۀ سری‌ساخت/سریال
@@ -22,3 +24,12 @@ ProductLotSetup=برپاسازی قابلیت سری‌ساخت/شماره‌س
 ShowCurrentStockOfLot=نمایش موجودی فعلی برای زوج محصول/سری‌ساخت
 ShowLogOfMovementIfLot=نمایش گزارش‌کار جابجائی‌های مربوط به زوج محصول/سری‌ساخت
 StockDetailPerBatch=جزئیات موجودی هر سری‌ساخت
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index ff7edf92df5..61db4341804 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=نرخ م.ب.ا.ا. (برای این فروشنده/م
 DiscountQtyMin=تخفیف برای این مقدار
 NoPriceDefinedForThisSupplier=قیمت/مقدار برای این فروشنده/محصول تعریف نشده است
 NoSupplierPriceDefinedForThisProduct=قیمت/مقدار برای این محصول تعریف نشده است
+PredefinedItem=Predefined item
 PredefinedProductsToSell=محصول ازپیش‌تعریف‌شده
 PredefinedServicesToSell=خدمات از پیش‌تعریف‌شده
 PredefinedProductsAndServicesToSell=محصول/خدمات از پیش‌تعریف‌شده برای فروش
@@ -313,7 +314,7 @@ LastUpdated=آخرین به‌روزرسانی
 CorrectlyUpdated=به‌درستی به‌روز‌شد
 PropalMergePdfProductActualFile=فایل‌های قابل استفاده برای اضافه کردن به PDF Azur
 PropalMergePdfProductChooseFile=انتخاب فایل‌های PDF
-IncludingProductWithTag=شامل‌کردن محصولات/خدمات به‌واسطۀ کلیدواژه
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=قیمت پیش‌فرض، قیمت واقعی ممکن است به مشتری وابسته باشد.
 WarningSelectOneDocument=لطفا حداقل یک سند انتخاب کنید
 DefaultUnitToShow=واحد
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index ab3c12c4568..51af354f7d8 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=فهرست وظایف
 GoToListOfTimeConsumed=رجوع به فهرست زمان صرف شده
 GanttView=نمای گانت
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=فهرست پیشنهادهای تجاری مرتبط با طرح
 ListOrdersAssociatedProject=فهرست سفارش‌های فروش مربوط به طرح
 ListInvoicesAssociatedProject=فهرست صورت‌حساب مشتریان مربوط به طرح
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/fa_IR/propal.lang b/htdocs/langs/fa_IR/propal.lang
index 69b9dfd470f..d64ab1eabaf 100644
--- a/htdocs/langs/fa_IR/propal.lang
+++ b/htdocs/langs/fa_IR/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=ارسال پیشنهاد تجاری از طریق پست
 DatePropal=تاریخ پیشنهاد
 DateEndPropal=اعتبار تاریخ پایان
 ValidityDuration=مدت اعتبار
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal٪ s را یافت نشد
 AddToDraftProposals=اضافه کردن به پیش نویس پیشنهاد
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=پیشنهاد تجاری و خطوط
 ProposalLine=خط پیشنهاد
+ProposalLines=Proposal lines
 AvailabilityPeriod=تاخیر در دسترس
 SetAvailability=تنظیم تاخیر در دسترس
 AfterOrder=پس از سفارش
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index c41e21fe88c..8a946698488 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -19,8 +19,8 @@ Stock=موجودی
 Stocks=موجودی
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=موجودی به‌واسطۀ سری‌ساخت/شماره‌سری
 LotSerial=سری‌ساخت/شماره‌سریال
 LotSerialList=فهرست سری‌ساخت/شماره‌سریال
@@ -37,8 +37,8 @@ AllWarehouses=همۀ انبارها
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=دربرگرفتن سفارش‌های پیش‌نویس
 Location=محل
-LocationSummary=نام‌کوتاه محل
-NumberOfDifferentProducts=تعداد عناوین محصولات
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=تعداد کل محصولات
 LastMovement=آخرین جابجائی‌ها
 LastMovements=آخرین جابه‌جائی‌ها
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=ارزش انبار
 UserWarehouseAutoCreate=ساخت خودکار انبار کاربر در هنگام ساخت کاربر
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=انبار پیش‌فرض
@@ -97,15 +98,16 @@ RealStockDesc=موجودی فیزیکی/واقعی موجودی‌هائی هس
 RealStockWillAutomaticallyWhen=موجودی واقعی با توجه به این قاعده ویرایش خواهد شد (طوری که در واحد موجودی تعریف شده است):
 VirtualStock=موجودی مجازی
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=شناسۀ انبار
 DescWareHouse=توضیحات مربوط به انبار
 LieuWareHouse=محل انبار
 WarehousesAndProducts=انبارها و محصولا
 WarehousesAndProductsBatchDetail=انبارها و محصولات (با جزئیات مربوط به سری‌ساخت/سریال)
 AverageUnitPricePMPShort=قیمت میانگین متوازن
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=قیمت فروش واحد
 EstimatedStockValueSellShort=مقدار برای فروش
 EstimatedStockValueSell=مقدار برای فروش
@@ -145,7 +147,7 @@ Replenishments=دوباره‌پر‌کردن
 NbOfProductBeforePeriod=تعداد موجودی %s پیش از بازۀ انتخابی (< %s)
 NbOfProductAfterPeriod=تعداد موجودی  %s پس از بازۀ انتخابی (> %s)
 MassMovement=جابجائی انبوه
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=ثبت جابجائی
 ReceivingForSameOrder=رسیدهای این سفارش
 StockMovementRecorded=جابجائی موجودی‌ها ثبت شد
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=میزان موجودی باید به حدی کاف
 StockMustBeEnoughForOrder=میزان موجودی باید به حدی کافی باشد که بتوان یک محصول/خدمت را به سفارش اضافه کرد ( بررسی در خصوص موجودی واقعی در هنگام افزودن یک سطر به سفارش و هر قدر قاعدۀ تغییر خودکار تعیین کند رخ می‌هد)
 StockMustBeEnoughForShipment= میزان موجودی باید به حدی کافی باشد که بتوان یک محصول/خدمت را به حمل‌ونقل سپرد  ( بررسی در خصوص موجودی واقعی در هنگام افزودن یک سطر به برگۀ حمل‌ونقل و هر قدر قاعدۀ تغییر خودکار تعیین کند رخ می‌هد)
 MovementLabel=عنوان جابجائی
-TypeMovement=نوع جابجائی
+TypeMovement=Direction of movement
 DateMovement=تاریخ جابجائی
 InventoryCode=کد فهرست یا جابجائی
 IsInPackage=در یک بسته قرار گرفته است
@@ -183,6 +185,7 @@ inventoryCreatePermission=ساخت یک فهرست‌موجودی
 inventoryReadPermission=نمایش فهرست‌موجودی
 inventoryWritePermission=روزآمدسازی فهرست‌موجودی‌
 inventoryValidatePermission=تائیداعتبار فهرست‌موجودی
+inventoryDeletePermission=Delete inventory
 inventoryTitle=فهرست‌موجودی
 inventoryListTitle=فهرست‌های‌موجودی
 inventoryListEmpty=هیچ فهرست‌بندی‌موجودی در جریان نیست
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=فایل را بالاگذاری کرده و سپس روی نشانک %s کلیک کرده تا به‌عنوان فایل منبع واردات استفاده شود.
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index 6bd62edc318..d4e1e96be7c 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=فروشندگان
 SuppliersInvoice=صورت‌حساب فروشنده
+SupplierInvoices=صورت‌حساب فروشندگان
 ShowSupplierInvoice=نمایش صورت‌حساب فروشنده
 NewSupplier=فروشندۀ جدید
 History=سابقه
diff --git a/htdocs/langs/fa_IR/ticket.lang b/htdocs/langs/fa_IR/ticket.lang
index 8f525262ab5..7a7e7755a33 100644
--- a/htdocs/langs/fa_IR/ticket.lang
+++ b/htdocs/langs/fa_IR/ticket.lang
@@ -70,6 +70,8 @@ Deleted=حذف شده
 # Dict
 Type=نوع
 Severity=حساسیت
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=برای ارسال رایانامه از برگۀ پیا
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=نمایش نماد واحد، در رابط عمومی
 TicketsShowModuleLogoHelp=این گزینه را برای پنهان کردن نماد واحد در صفحات رابط عمومی استفاده کنید
 TicketsShowCompanyLogo=نمایش نماد شرکت در رابط عمومی
 TicketsShowCompanyLogoHelp=این گزینه را برای پنعان کردن نماد شرکت اصلی در صفحات رابط عمومی استفاده کنید
-TicketsEmailAlsoSendToMainAddress=همچنین ارسال رایانامه به نشانی‌رایانامۀ اصلی
-TicketsEmailAlsoSendToMainAddressHelp=این گزینه را فعال کنید تا یک رایانامه به نشانی  "ارسال آگاهی‌رسانی از" فرستاده شود (تنظیمات زیر را ببینید)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=محدود کردن نمایش برگۀ‌پشتیبانی به کاربر فعلی (برای کاربران خارجی مؤثر نیست، همواره محدود به شخص‌سومی که بدان مربوطند دارد)
 TicketsLimitViewAssignedOnlyHelp=تنها برگه‌هائی که به کاربر فعلی نسبت داده شده است قابل رؤیت است. این شامل کاربرانی که مجوزهای مدیریت برگه‌های پشتیبانی را دارند نمی‌شود.
 TicketsActivatePublicInterface=فعال کردن رابط عمومی
@@ -126,10 +128,10 @@ TicketNumberingModules=واحد شماره‌دهی برگه‌های پشتیب
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=اطلاع‌رسانی به شخص‌سوم در هنگام ساخت
 TicketsDisableCustomerEmail=همواره در هنگامی که یک برگۀ‌پشتیبانی از طریق رابط عمومی ساخته می‌شود، قابلیت رایانامه غیرفعال شود
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=آخرین برگه‌های ویرایش شده
 BoxLastModifiedTicketDescription=آخرین %s برگۀ‌پشتیبانی ویرایش شده
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=هیچ برگۀپشتیبانی ویرایش نشده شد
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index 72e544afadd..2140aa7a6f4 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=پاک کردن از گروه
 PasswordChangedAndSentTo=گذرواژه تغییر یافت و به <b>%s</b> ارسال شد.
 PasswordChangeRequest=درخواست تغییر گذرواژۀ برای <b>%s</b>
 PasswordChangeRequestSent=درخواست تغییر گذرواژه برای <b>%s</b> به <b>%s</b> ارسال شد
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=تائید بازنشانی گذرواژه
 MenuUsersAndGroups=کاربران و گروهها
 LastGroupsCreated=آخرین %s گروه ساخته شده
@@ -70,9 +72,10 @@ ExportDataset_user_1=کاربران و مشخصات آنها
 DomainUser=کاربر دامنه %s
 Reactivate=دوباره فعال کردن
 CreateInternalUserDesc=این برگه به شما امکان ایجاد یک کاربر داخلی در شرکت/مؤسسۀ شما را می‌دهد. برای ساخت یک کاربر خارجی (مشتری، فروشنده، غیره) از گزینۀ "ساخت کاربر Dolibarr" از برگۀ تماس شخص سوم وی اقدام نمائید.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=اجازه‌ها اعطا شده زیرا از یک گروه‌کاربری ارث‌گرفته شده است
 Inherited=ارث‌گرفته
+UserWillBe=Created user will be
 UserWillBeInternalUser=کاربری که ایجاد می‌شود یک کاربر داخلی خواهد بود (زیرا به یک شخص‌سوم معین پیوند نشده است)
 UserWillBeExternalUser=کاربری که ایجاد می‌شود یک کاربر خارجی خواهد بود (زیرا به یک شخص‌سوم معین پیوند شده است)
 IdPhoneCaller=شناسۀ تماس‌گیرنده تلفن
@@ -109,8 +112,10 @@ UserAccountancyCode=کد حساب‌داری کاربر
 UserLogoff=خروج کاربر
 UserLogged=کاربر وارد شده
 DateOfEmployment=Employment date
-DateEmployment=تاریخ شروع استخدام
+DateEmployment=Employment
+DateEmploymentstart=تاریخ شروع استخدام
 DateEmploymentEnd=تاریخ پایان استخدام
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=شما نمی‌توانید ردیف کاربری خود را غیرفعال کنید
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 5c5a464d39c..74d725122d7 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=خواندن
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/fa_IR/zapier.lang b/htdocs/langs/fa_IR/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/fa_IR/zapier.lang
+++ b/htdocs/langs/fa_IR/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 9b30fe43792..6d5d6b0a422 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Sitoa
@@ -209,7 +209,7 @@ Codejournal=Päiväkirja
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 1eda1356201..75c9a3b2f22 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Poista yhteyksien esto
 YourSession=Istuntosi
 Sessions=Käyttäjien istunnot
 WebUserGroup=Web-palvelimen käyttäjä / ryhmä
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Verkon juurihakemiston tiedostojen käyttöoikeudet
 PermissionsOnFile=Tiedoston %s käyttöoikeudet
 NoSessionFound=PHP:n asetukset estävät aktiivisten istuntojen listaamisen. Istuntojen tallennushakemisto (<b>%s</b>) voi olla suojattu (Käyttöjärjestelmäoikeudet tai PHP: n open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Huomaa: kyllä on tehokas vain, jos <b>moduuli %s</b> on käytö
 RemoveLock=Mahdollistaaksesi Päivitys-/Asennustyökalun käytön, poista/nimeä uudelleen tarvittaessa tiedosto <b>%s</b>
 RestoreLock=Palauta tiedosto <b>%s</b> vain lukuoikeuksin. Tämä estää myöhemmän Päivitys-/Asennustyökalun käytön
 SecuritySetup=Turvallisuusasetukset
+PHPSetup=PHP setup
 SecurityFilesDesc=Määritä tänne tiedostojen siirtämiseen palvelimelle liittyvät turvallisuusasetukset
 ErrorModuleRequirePHPVersion=Virhe, tämä moduuli vaatii PHP version %s tai uudemman
 ErrorModuleRequireDolibarrVersion=Virhe, tämä moduuli vaatii Dolibarr: in version %s tai uudemman
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Pääkäyttäjien toiminnot. Valitse valikosta haluttu omina
 Purge=Poista
 PurgeAreaDesc=Tällä sivulla voit poistaa kaikki Dolibarrin luomat tai tallentamat tiedostot (väliaikaiset tiedostot tai kaikki tiedostot hakemistossa <b> %s </b>). Tämän ominaisuuden käyttäminen ei yleensä ole tarpeen. Se on kiertotapa käyttäjille, joiden Dolibarria isännöi palveluntarjoaja, joka ei tarjoa oikeuksia poistaa verkkopalvelimen luomia tiedostoja.
 PurgeDeleteLogFile=Poista lokitiedostot, mukaan lukien <b> %s </b>, joka on määritetty Syslog-moduulille (ei vaaraa menettää tietoja)
-PurgeDeleteTemporaryFiles=Poista kaikki loki- ja väliaikaiset tiedostot (ei vaaraa menettää tietoja). Huomaa: Väliaikaiset tiedostot poistetaan vain, jos temp-hakemisto luotiin yli 24 tuntia sitten.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Poista loki ja väliaikaiset tiedostot
 PurgeDeleteAllFilesInDocumentsDir=Poista kaikki tiedostot hakemistosta: <b> %s </b>. <br> Tämä poistaa kaikki luodut asiakirjat, jotka liittyvät elementteihin (kolmannet osapuolet, laskut jne.), ECM-moduuliin ladatut tiedostot, tietokannan varmuuskopiot ja väliaikaiset tiedostot.
 PurgeRunNow=Siivoa nyt
@@ -232,6 +234,7 @@ BoxesAvailable=Widgetit saatavilla
 BoxesActivated=Widget aktivoitu
 ActivateOn=Aktivoi
 ActiveOn=Aktivoitu
+ActivatableOn=Activatable on
 SourceFile=Lähdetiedosto
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Käytettävissä vain, jos JavaScript käytössä
 Required=Vaadittu
@@ -347,9 +350,10 @@ LastActivationAuthor=Viimeisin taho, joka on suorittanut aktivoinnin
 LastActivationIP=Viimeinen aktiivinen IP
 UpdateServerOffline=Palvelimen offline-päivitys
 WithCounter=Laskurin hallinta
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Kaikki muut merkit ja maski pysyy ennallaan. <br> Välilyönnit eivät ole sallittuja. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Esimerkki kolmannen osapuolen luotu 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Esimerkiksi tuotteille luotu 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Jos jätät tämän kentän tyhjäksi, tämä arvo t
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Arvoluettelon on oltava rivejä, joissa on muoto: avain,arvo (missä avain ei voi olla 0) <br> <br> esimerkiksi: <br> 1,arvo1 <br> 2,arvo2 <br> 3,arvo3 <br> ...
 ExtrafieldParamHelpradio=Arvoluettelon on oltava rivejä, joissa on muoto: avain,arvo (missä avain ei voi olla 0) <br> <br> esimerkiksi: <br> 1,arvo1 <br> 2,arvo2 <br> 3,arvo3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Käytettävä kirjasto PDF:n luomiseen
@@ -469,7 +473,7 @@ EraseAllCurrentBarCode=Poista kaikki nykyiset viivakoodi arvot
 ConfirmEraseAllCurrentBarCode=Haluatko varmasti poistaa kaikki nykyiset viivakoodiarvot?
 AllBarcodeReset=Kaikki viivakoodi arvot on poistettu
 NoBarcodeNumberingTemplateDefined=Viivakoodimallin numerointia ei ole otettu käyttöön viivakoodimoduulin asetuksissa.
-EnableFileCache=Enable file cache
+EnableFileCache=Ota tiedostojen välimuisti käyttöön
 ShowDetailsInPDFPageFoot=Lisää alatunnisteeseen lisätietoja, kuten yrityksen osoite tai esimiehen nimi (ammattitunnusten, yrityksen pääoman ja ALV-numeron lisäksi).
 NoDetails=Alatunnisteessa ei ole lisätietoja
 DisplayCompanyInfo=Näytä yrityksen osoitetiedot
@@ -541,6 +545,8 @@ Module40Name=Toimittajat
 Module40Desc=Toimittajien ja ostojen hallinta (ostotilaukset ja toimittajien laskutus)
 Module42Name=Debug Logit
 Module42Desc=Kirjaustoiminnot (tiedosto, syslog, ...). Tällaiset lokit ovat teknisiä/virheenkorjaustarkoituksia varten.
+Module43Name=Virheenkorjauspalkki
+Module43Desc=Työkalu kehittäjälle, joka lisää virheenkorjauspalkin selaimeesi.
 Module49Name=Toimitus
 Module49Desc=Editors' hallinta
 Module50Name=Tuotteet
@@ -594,16 +600,16 @@ Module400Desc=Management of projects, leads/opportunities and/or tasks. You can
 Module410Name=Webcalendar
 Module410Desc=Webcalendar yhdentyminen
 Module500Name=Verot ja erityiskustannukset
-Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=Muiden kulujen hallinta (myyntiverot, sosiaaliverot tai pääomaverot, osingot jne.)
 Module510Name=Palkat
-Module510Desc=Record and track employee payments
+Module510Desc=Kirjaa ja seuraa työntekijöiden maksuja
 Module520Name=Lainat
 Module520Desc=Lainojen hallinnointi
 Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Tuotevaihtoehdot
-Module610Desc=Creation of product variants (color, size etc.)
+Module610Desc=Tuotevaihtoehtojen luominen (väri, koko jne.)
 Module700Name=Lahjoitukset
 Module700Desc=Lahjoituksien hallinnointi
 Module770Name=Kuluraportit
@@ -623,28 +629,30 @@ Module2200Desc=Use maths expressions for auto-generation of prices
 Module2300Name=Ajastetut työt
 Module2300Desc=Ajastettujen töiden hallinnointi (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2400Desc=Seuraa tapahtumia. Kirjaa automaattiset tapahtumat seurantatarkoituksiin tai tallenna manuaaliset tapahtumat tai kokoukset. Tämä on tärkein asiakas- tai toimittajasuhteiden hallinnan moduuli.
 Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2500Desc=Asiakirjojen hallintajärjestelmä / elektroninen sisällönhallinta. Luomiesi tai tallennettujen asiakirjojesi automaattinen järjestäminen. Jaa ne tarvittaessa.
 Module2600Name=API / verkkopalvelut (SOAP-palvelin)
 Module2600Desc=Ota käyttöön Dolibarr SOAP -palvelin, joka tarjoaa API-palveluita
 Module2610Name=API / verkkopalvelut (REST-palvelin)
 Module2610Desc=Ota käyttöön API-palveluita tarjoava Dolibarr REST -palvelin
 Module2660Name=Kutsu verkkopalveluita (SOAP-asiakas)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2660Desc=Ota käyttöön Dolibarr-verkkopalvelusovellus (voidaan käyttää tietojen / pyyntöjen siirtämiseen ulkoisille palvelimille. Vain ostotilauksia tuetaan tällä hetkellä.)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
 Module2800Desc=FTP Ohjelma
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind tulokset valmiuksia
-Module3200Name=Unalterable Archives
+Module3200Name=Muuttamattomat arkistot
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Sosiaaliset verkostot
+Module3400Desc=Ota sosiaalisten verkostojen kentät käyttöön kolmansille osapuolille ja osoitteille (skype, twitter, facebook, ...).
 Module4000Name=Henkilöstöhallinta
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module4000Desc=Henkilöstöjohtaminen (osaston hallinta, työsuhteet ja tunteet)
 Module5000Name=Multi-yhtiö
 Module5000Desc=Avulla voit hallita useita yrityksiä
-Module6000Name=Työtehtävät
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Nettisivut
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Poissaolopyyntöjen hallinta
@@ -679,7 +687,7 @@ Module63000Name=Resurssit
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Lue laskut
 Permission12=Luo laskut
-Permission13=Invalidate customer invoices
+Permission13=Mitätöi asiakaslaskut
 Permission14=Vahvistetut laskut
 Permission15=Lähetä laskut sähköpostilla
 Permission16=Luo maksut laskuille
@@ -696,7 +704,7 @@ Permission32=Luoda / muuttaa tuotetta / palvelua
 Permission34=Poista tuotteita / palveluita
 Permission36=Vienti tuotteet / palvelut
 Permission38=Vie tuotteita
-Permission39=Ignore minimum price
+Permission39=Ohita vähimmäishinta
 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)
@@ -711,7 +719,7 @@ Permission70=Invalidate interventions
 Permission71=Lue jäseniä
 Permission72=Luoda / muuttaa jäsenten
 Permission74=Poista jäseniä
-Permission75=Setup types of membership
+Permission75=Määritä jäsenyystyypit
 Permission76=Vie dataa
 Permission78=Lue tilauksia
 Permission79=Luoda / muuttaa tilaukset
@@ -805,7 +813,8 @@ PermissionAdvanced253=Luo / muokkaa sisäiset / ulkoiset käyttäjät ja käytt
 Permission254=Poista tai poistaa muiden käyttäjien
 Permission255=Muokkaa käyttäjien salasanoja
 Permission256=Poista käyttäjiä
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Lue CA
 Permission272=Lue laskut
 Permission273=Laskutuksen
@@ -911,8 +920,8 @@ Permission1232=Luo/Muokkaa toimittajien laskuja
 Permission1233=Vahvista myyjän laskut
 Permission1234=Poista toimittajien laskuja
 Permission1235=Lähetä toimittajien laskut sähköpostilla
-Permission1236=Export vendor invoices, attributes and payments
-Permission1237=Export purchase orders and their details
+Permission1236=Vie toimittajan laskut, määritteet ja maksut
+Permission1237=Vie ostotilaukset ja niiden tiedot
 Permission1251=Suorita massa tuonnin ulkoisten tiedot tietokantaan (tiedot kuormitus)
 Permission1321=Vienti asiakkaan laskut, ominaisuudet ja maksut
 Permission1322=Avaa uudelleen maksettu lasku
@@ -994,11 +1003,11 @@ Permission941603=Vahvista kuitit
 Permission941604=Lähetä kuitit sähköpostitse
 Permission941605=Vie kuitit
 Permission941606=Poista kuitit
-DictionaryCompanyType=Third-party types
+DictionaryCompanyType=Kolmannen osapuolen tyypit
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
 DictionaryProspectContactLevel=Prospect potential level for contacts
-DictionaryCanton=States/Provinces
+DictionaryCanton=Osavaltiot / provinssit
 DictionaryRegion=Alueiden
 DictionaryCountry=Maat
 DictionaryCurrency=Valuutat
@@ -1006,9 +1015,9 @@ DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=ALV- ja Myyntiveroprosentit
-DictionaryRevenueStamp=Amount of tax stamps
+DictionaryRevenueStamp=Veroleimojen määrä
 DictionaryPaymentConditions=Maksuehdot
-DictionaryPaymentModes=Payment Modes
+DictionaryPaymentModes=Maksutavat
 DictionaryTypeContact=Yhteystiedot tyypit
 DictionaryTypeOfContainer=Website - Type of website pages/containers
 DictionaryEcotaxe=Ympäristöveron (WEEE)
@@ -1020,7 +1029,7 @@ DictionaryStaff=Työntekijöiden lukumäärä
 DictionaryAvailability=Toimituksen viivästyminen
 DictionaryOrderMethods=Tilaaminen menetelmät
 DictionarySource=Alkuperä ehdotusten / tilaukset
-DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancyCategory=Räätälöidyt ryhmät raportteja varten
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryAccountancyJournal=Kirjanpitotilityypit
 DictionaryEMailTemplates=Mallisähköpostit
@@ -1031,32 +1040,32 @@ DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Vapaan tyyppi
 DictionaryOpportunityStatus=Lead status for project/lead
-DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryExpenseTaxCat=Kuluraportti - Kuljetuskategoriat
+DictionaryExpenseTaxRange=Kuluraportti - alue kuljetusluokittain
 DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+TypeOfUnit=Yksikön tyyppi
 SetupSaved=Asetukset tallennettu
 SetupNotSaved=Asetuksia ei tallennettu
-BackToModuleList=Back to Module list
+BackToModuleList=Takaisin moduuliluetteloon
 BackToDictionaryList=Back to Dictionaries list
-TypeOfRevenueStamp=Type of tax stamp
+TypeOfRevenueStamp=Veroleiman tyyppi
 VATManagement=Myyntiverojen hallinta
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
+VATIsNotUsedDesc=Oletusarvoisesti ehdotettu myyntivero on 0, jota voidaan käyttää esimerkiksi yhdistyksiin, yksityishenkilöihin tai pieniin yrityksiin.
 VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Myyntiveron tyyppi
 LTRate=Kurssi
 LocalTax1IsNotUsed=Älä käytä toista veroa
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1IsUsedDesc=Käytä toista verotyyppiä (muuta kuin ensimmäistä)
+LocalTax1IsNotUsedDesc=Älä käytä muuta verotyyppiä (muuta kuin ensimmäistä)
 LocalTax1Management=Toisen tyyppinen vero
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=Älä käytä kolmatta veroa
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2IsUsedDesc=Käytä kolmatta verotyyppiä (muu kuin ensimmäinen)
+LocalTax2IsNotUsedDesc=Älä käytä muuta verotyyppiä (muuta kuin ensimmäistä)
 LocalTax2Management=Kolmannen tyypin vero
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
@@ -1071,7 +1080,7 @@ LocalTax2IsNotUsedDescES=Oletuksena ehdotettu IRPF on 0. Loppu sääntö.
 LocalTax2IsUsedExampleES=Espanjassa, freelancer ja itsenäisten ammatinharjoittajien, jotka tarjoavat palveluja ja yrityksiä, jotka ovat valinneet verojärjestelmän moduuleja.
 LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
 RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
+UseRevenueStamp=Käytä veroleimaa
 UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Raportit paikallisista veroista
 CalcLocaltax1=Myynnit - Ostot
@@ -1085,7 +1094,7 @@ LabelUsedByDefault=Label käyttää oletusarvoisesti, jos ei ole käännös löy
 LabelOnDocuments=Label asiakirjoihin
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
-ConstantIsOn=Option %s is on
+ConstantIsOn=Vaihtoehto %s on päällä
 NbOfDays=Päivien lukumäärä
 AtEndOfMonth=Kuukauden lopussa
 CurrentNext=Nykyinen / Seuraava
@@ -1143,7 +1152,7 @@ CompanyCurrency=Valuutta
 CompanyObject=Yrityksen toimiala
 IDCountry=Maan tunnus
 Logo=Logo
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoDesc=Yrityksen päälogo. Käytetään luotuihin asiakirjoihin (PDF, ...)
 LogoSquarred=Logo
 LogoSquarredDesc=Täytyy olla neliön mallinnen(leveys=korkeus). Sitä voidaan käyttää esim. valikkorivillä
 DoNotSuggestPaymentMode=Eivät viittaa siihen,
@@ -1159,14 +1168,14 @@ Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projektia ei suljettu ajoissa
 Delays_MAIN_DELAY_TASKS_TODO=Suunniteltuja tehtäviä tekemättä
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tilausta ei ole käsitelty
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Ostotilausta ei ole käsitelty
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Ehdotusta ei suljettu
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Ehdotusta ei laskutettu
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Aktivoitava palvelu
+Delays_MAIN_DELAY_RUNNING_SERVICES=Vanhentunut palvelu
 Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Avoin ostovelka
 Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Avoin myyntisaaminen
 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
+Delays_MAIN_DELAY_MEMBERS=Viivästynyt jäsenmaksu
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
 Delays_MAIN_DELAY_EXPENSEREPORTS=Hyväksyttävissä olevat kuluraportit
 Delays_MAIN_DELAY_HOLIDAYS=Hyväksyttävissä olevat vapaa-anomukset
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security Audit tapahtumat
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Auditointi
 InfoDolibarr=Tietoja Dolibarrista
 InfoBrowser=Tietoja selaimesta
@@ -1183,8 +1193,8 @@ InfoOS=Tietoja OS
 InfoWebServer=Tietoja Netti Serveristä
 InfoDatabase=Tietoja Tietokannasta
 InfoPHP=Tietoja PHP
-InfoPerf=About Performances
-InfoSecurity=About Security
+InfoPerf=Tietoja suorituskyvystä
+InfoSecurity=Tietoja turvallisuudesta
 BrowserName=Selaimen nimi
 BrowserOS=Selaimen OS
 ListOfSecurityEvents=Luettelo Dolibarr turvallisuus tapahtumat
@@ -1208,8 +1218,8 @@ TriggerDisabledByName=Käynnistäjät tässä tiedosto on poistettu, <b>joita-NO
 TriggerDisabledAsModuleDisabled=Käynnistäjät tähän tiedostoon pois päältä kuin <b>moduuli %s</b> on poistettu käytöstä.
 TriggerAlwaysActive=Käynnistäjät tässä tiedosto on aina aktiivinen, mikä on aktivoitu Dolibarr moduulit.
 TriggerActiveAsModuleActive=Käynnistäjät tähän tiedostoon ovat aktiivisia <b>moduuli %s</b> on käytössä.
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
-DictionaryDesc=Insert all reference data. You can add your values to the default.
+GeneratedPasswordDesc=Valitse menetelmä, jota käytetään automaattisesti luotuihin salasanoihin.
+DictionaryDesc=Lisää kaikki viitetiedot. Voit lisätä omia arvoja oletusarvoon.
 ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
 MiscellaneousDesc=Kaikki turvallisuuteen liittyvät parametrit määritetään täällä.
 LimitsSetup=Rajat / Tarkkuus
@@ -1243,43 +1253,43 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=Sinun on suoritettava tämä komento komentoriviltä jälkeen kirjautua kuori käyttäjän <b>%s.</b>
 YourPHPDoesNotHaveSSLSupport=SSL toimintoja ei saatavilla PHP
 DownloadMoreSkins=Lisää nahat ladata
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Osittainen käännös
-MAIN_DISABLE_METEO=Disable meteorological view
+MAIN_DISABLE_METEO=Poista meteorologinen näkymä käytöstä
 MeteoStdMod=Standardi tila
 MeteoStdModEnabled=Standardi tila aktivoitu
 MeteoPercentageMod=Prosenttitila
 MeteoPercentageModEnabled=Prosenttitila käytössä
 MeteoUseMod=Klikkaa käyttääksesi %s
 TestLoginToAPI=Testikirjautuminen
-ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
+ProxyDesc=Jotkin Dolibarrin ominaisuudet edellyttävät internetyhteyttä. Määritä tässä Internet-yhteysparametrit, kuten pääsy välityspalvelimen kautta tarvittaessa.
 ExternalAccess=Ulkoinen / sisäinen pääsy
 MAIN_PROXY_USE=Käytä välityspalvelinta (muuten yhteys on suoraan Internetiin)
 MAIN_PROXY_HOST=Proxy-palvelin: Nimi/Osoite
 MAIN_PROXY_PORT=Proxy-palvelin: Portti
 MAIN_PROXY_USER=Proxy-palvelin: Käyttäjätunnus
 MAIN_PROXY_PASS=Proxy-palvelin: Salasana
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Täydentävät ominaisuudet
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (third party)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldsSalaries=Complementary attributes (salaries)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+ExtraFieldsLines=Täydentävät määritteet (rivit)
+ExtraFieldsLinesRec=Täydentävät määritteet (mallilaskurivit)
+ExtraFieldsSupplierOrdersLines=Täydentävät määritteet (tilausrivit)
+ExtraFieldsSupplierInvoicesLines=Täydentävät määritteet (laskurivit)
+ExtraFieldsThirdParties=Täydentävät määritteet (kolmas osapuoli)
+ExtraFieldsContacts=Täydentävät määritteet (yhteystiedot / osoite)
+ExtraFieldsMember=Täydentävät määritteet (jäsen)
+ExtraFieldsMemberType=Täydentävät määritteet (jäsenen tyyppi)
+ExtraFieldsCustomerInvoices=Täydentävät määritteet (laskut)
+ExtraFieldsCustomerInvoicesRec=Täydentävät määritteet (laskujen mallit)
+ExtraFieldsSupplierOrders=Täydentävät määritteet (tilaukset)
+ExtraFieldsSupplierInvoices=Täydentävät määritteet (laskut)
+ExtraFieldsProject=Täydentävät määritteet (projektit)
+ExtraFieldsProjectTask=Täydentävät määritteet (tehtävät)
+ExtraFieldsSalaries=Täydentävät määritteet (palkat)
+ExtraFieldHasWrongValue=Attribuutilla %s on väärä arvo.
+AlphaNumOnlyLowerCharsAndNoSpace=vain aakkosnumeeriset ja pienet kirjaimet ilman välilyöntiä
 SendmailOptionNotComplete=Varoitus, joissakin Linux-järjestelmissä, lähettää sähköpostia sähköpostisi, sendmail toteuttaminen setup on conatins optio-ba (parametri mail.force_extra_parameters tulee php.ini tiedosto). Jos jotkut vastaanottajat eivät koskaan vastaanottaa sähköposteja, yrittää muokata tätä PHP parametrin mail.force_extra_parameters =-ba).
 PathToDocuments=Polku asiakirjoihin
 PathDirectory=Hakemisto
@@ -1317,9 +1327,9 @@ PreloadOPCode=Esiladattua OPCode-koodia käytetään
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
-AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+AskForPreferredShippingMethod=Kysy ensisijaista lähetystapaa kolmansille osapuolille.
 FieldEdition=Alalla painos %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+FillThisOnlyIfRequired=Esimerkki: +2 (täytä vain, jos aikavyöhykkeen siirtymäongelmia esiintyy)
 GetBarCode=Hanki viivakoodi
 NumberingModules=Numerointimallit
 DocumentModules=Asiakirjamallit
@@ -1330,8 +1340,8 @@ PasswordGenerationPerso=Palauta salasana henkilökohtaisesti määrittämäsi ko
 SetupPerso=Kokoonpanosi mukaan
 PasswordPatternDesc=Password pattern description
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+RuleForGeneratedPasswords=Säännöt salasanojen luomiseen ja vahvistamiseen
+DisableForgetPasswordLinkOnLogonPage=Älä näytä "Unohtunut salasana" -linkkiä kirjautumissivulla
 UsersSetup=Käyttäjät moduuli setup
 UserMailRequired=Uuden käyttäjän luomiseen tarvitaan sähköposti
 UserHideInactive=Piilota passiiviset käyttäjät kaikista yhdistelmäluetteloista (ei suositella: tämä voi tarkoittaa, että et voi suodattaa tai etsiä vanhoja käyttäjiä joillakin sivuilla)
@@ -1341,8 +1351,8 @@ GroupsDocModules=Document templates for documents generated from a group record
 HRMSetup=Henkilöstöhallinta moduulin asetukset
 ##### Company setup #####
 CompanySetup=Yritykset moduulin asetukset
-CompanyCodeChecker=Options for automatic generation of customer/vendor codes
-AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
+CompanyCodeChecker=Vaihtoehdot asiakas- / toimittajakoodien automaattiseen luomiseen
+AccountCodeManager=Vaihtoehdot asiakkaan / toimittajan kirjanpitokoodien automaattiseen luomiseen
 NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
 NotificationsDescUser=* käyttäjää kohden, yksi käyttäjä kerrallaan.
 NotificationsDescContact=* kolmansien osapuolten yhteystietoja (asiakkaita tai toimittajia) kohti, yksi yhteyshenkilö kerrallaan.
@@ -1353,9 +1363,9 @@ WatermarkOnDraft=Vesileima asiakirjaluonnos
 JSOnPaimentBill=Aktivoi ominaisuus maksurivien automaattiseen täyttämiseen maksulomakkeella
 CompanyIdProfChecker=Rules for Professional IDs
 MustBeUnique=Täytyy olla uniikki?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-TechnicalServicesProvided=Technical services provided
+MustBeMandatory=Pakollinen kolmansien osapuolten luominen (jos alv-numero tai yritystyyppi on määritelty)?
+MustBeInvoiceMandatory=Pakollinen laskujen vahvistaminen?
+TechnicalServicesProvided=Tarjotut tekniset palvelut
 #####DAV #####
 WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
 WebDavServer=Root URL of %s server: %s
@@ -1366,14 +1376,14 @@ BillsSetup=Laskut-moduulin asetukset
 BillsNumberingModule=Laskut ja hyvityslaskut numerointiin moduuli
 BillsPDFModules=Laskun asiakirjojen malleja
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
-PaymentsPDFModules=Payment documents models
+PaymentsPDFModules=Maksutositteiden mallit
 ForceInvoiceDate=Force laskun päivämäärästä validointiin päivämäärä
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
-SuggestPaymentByChequeToAddress=Suggest payment by check to
+SuggestedPaymentModesIfNotDefinedInInvoice=Ehdotettu maksutapa laskussa oletuksena, jos sitä ei ole määritelty laskussa
+SuggestPaymentByRIBOnAccount=Ehdota maksua tilisiirtona
+SuggestPaymentByChequeToAddress=Ehdota maksua sekillä
 FreeLegalTextOnInvoices=Laskun viesti
 WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
+PaymentsNumberingModule=Maksujen numerointimalli
 SuppliersPayment=Toimittajien maksut
 SupplierPaymentSetup=Toimittajamaksujen asetukset
 ##### Proposals #####
@@ -1390,19 +1400,19 @@ 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
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Kysy hintapyynnön pankkitilin kohde
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pyydä lähdevarasto tilaukselle
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Kysy ostotilauksen pankkitilin kohde
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
-OrdersSetup=Sales Orders management setup
+SuggestedPaymentModesIfNotDefinedInOrder=Ehdotettu maksutila myyntitilauksessa oletusarvoisesti, jos sitä ei ole määritetty tilauksessa
+OrdersSetup=Myyntitilausten hallinnan määritys
 OrdersNumberingModules=Tilaukset numerointiin modules
 OrdersModelModule=Tilaa asiakirjojen malleja
 FreeLegalTextOnOrders=Vapaa tekstihaku tilauksissa
 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
+ShippableOrderIconInList=Lisää Tilaukset-luetteloon kuvake, joka ilmoittaa, voidaanko tilaus toimittaa
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Kysy tilauksen pankkitilin kohde
 ##### Interventions #####
 InterventionsSetup=Interventions moduulin asetukset
 FreeLegalTextOnInterventions=Vapaa teksti interventio asiakirjojen
@@ -1410,18 +1420,18 @@ FicheinterNumberingModules=Väliintulo numerointiin modules
 TemplatePDFInterventions=Väliintulo kortin asiakirjojen malleja
 WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Sopimukset / Tilaukset-moduulin asetukset
 ContractsNumberingModules=Sopimukset numerointi moduulit
 TemplatePDFContracts=Sopimuspohjat
 FreeLegalTextOnContracts=Vapaa sana sopimuksissa
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+WatermarkOnDraftContractCards=Vesileima sopimusluonnoksissa (ei käytössä jos jätetään tyhjäksi)
 ##### Members #####
 MembersSetup=Jäsenet moduulin asetukset
 MemberMainOptions=Päävaihtoehtoa
 AdherentLoginRequired= Hallitse Sisään jokaiselle jäsenelle
-AdherentMailRequired=Email required to create a new member
+AdherentMailRequired=Uuden jäsenen luomiseen vaaditaan sähköpostiosoite
 MemberSendInformationByMailByDefault=Checkbox lähettää vahvistusviestin jäsenille on oletusarvoisesti
-VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
+VisitorCanChooseItsPaymentMode=Vierailija voi valita käytettävissä olevista maksutavoista
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
@@ -1465,7 +1475,7 @@ LDAPDnContactActive=Yhteystietojen synkronointi
 LDAPDnContactActiveExample=Aktiivihiili / Unactivated synkronointi
 LDAPDnMemberActive=Jäsenten synkronointi
 LDAPDnMemberActiveExample=Aktiivihiili / Unactivated synkronointi
-LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActive=Jäsentyyppien synkronointi
 LDAPDnMemberTypeActiveExample=Aktiivihiili / Unactivated synkronointi
 LDAPContactDn=Dolibarr yhteystietosi DN
 LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=Täydellinen DN (ex: ou= yhteystietoja, dc= yhteiskunta, dc= com)
@@ -1488,11 +1498,11 @@ LDAPTestSynchroContact=Testaa yhteystietojen synkronointi
 LDAPTestSynchroUser=Testaa käyttäjien synkronointi
 LDAPTestSynchroGroup=Testaa ryhmien synkronointi
 LDAPTestSynchroMember=Testaa jäsenten synkronointi
-LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSynchroMemberType=Testaa jäsentyyppien synkronointi
 LDAPTestSearch= Testaa LDAP-haku
 LDAPSynchroOK=Synkronointi testi onnistunut
 LDAPSynchroKO=Epäonnistui synkronointi testi
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPSynchroKOMayBePermissions=Synkronointitesti epäonnistui. Tarkista, että yhteys palvelimeen on määritetty oikein ja sallii LDAP-päivitykset
 LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP yhteyden LDAP-palvelin onnistunut (Server= %s, Port= %s)
 LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP yhteyden LDAP-palvelimeen ei onnistunut (Server= %s, Port= %s)
 LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Esimerkki: uid
 LDAPFilterConnection=Hakusuodatin
 LDAPFilterConnectionExample=Esimerkki: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Esimerkki: samaccountname
 LDAPFieldFullname=Koko nimi
@@ -1520,24 +1531,24 @@ LDAPFieldFirstNameExample=Esimerkki: givenName
 LDAPFieldMail=Sähköpostiosoite
 LDAPFieldMailExample=Esimerkki: mail
 LDAPFieldPhone=Työpuhelin
-LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldPhoneExample=Esimerkki: puhelinnumero
 LDAPFieldHomePhone=Henkilökohtainen puhelin
-LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldHomePhoneExample=Esimerkki: kotipuhelin
 LDAPFieldMobile=Matkapuhelin
-LDAPFieldMobileExample=Example: mobile
+LDAPFieldMobileExample=Esimerkki: matkapuhelin
 LDAPFieldFax=Faksinumero
 LDAPFieldFaxExample=Example: facsimiletelephonenumber
 LDAPFieldAddress=Katuosoite
-LDAPFieldAddressExample=Example: street
+LDAPFieldAddressExample=Esimerkki: katuosoite
 LDAPFieldZip=Postinumero
-LDAPFieldZipExample=Example: postalcode
+LDAPFieldZipExample=Esimerkki: postinumero
 LDAPFieldTown=Kaupunki
 LDAPFieldTownExample=Example: l
 LDAPFieldCountry=Maa
 LDAPFieldDescription=Kuvaus
-LDAPFieldDescriptionExample=Example: description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldDescriptionExample=Esimerkki: kuvaus
+LDAPFieldNotePublic=Julkinen huomautus
+LDAPFieldNotePublicExample=Esimerkki: julkinenhuomautus
 LDAPFieldGroupMembers= Ryhmän jäsenet
 LDAPFieldGroupMembersExample= Example: uniqueMember
 LDAPFieldBirthdate=Syntymäaika
@@ -1548,9 +1559,9 @@ LDAPFieldSidExample=Example: objectsid
 LDAPFieldEndLastSubscription=Päiväys merkintää varten
 LDAPFieldTitle=Asema
 LDAPFieldTitleExample=Esimerkiksi: titteli
-LDAPFieldGroupid=Group id
+LDAPFieldGroupid=Ryhmätunnus
 LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
+LDAPFieldUserid=Käyttäjätunnus
 LDAPFieldUseridExample=Exemple : uidnumber
 LDAPFieldHomedirectory=Kotihakemisto
 LDAPFieldHomedirectoryExample=Exemple : homedirectory
@@ -1564,11 +1575,11 @@ LDAPDescMembers=Tällä sivulla voit määritellä LDAP attributes nimi LDAP puu
 LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
 LDAPDescValues=Esimerkki arvot on suunniteltu <b>OpenLDAP</b> kanssa seuraavat ladattu kaavat: <b>core.schema, cosine.schema, inetorgperson.schema).</b> Jos käytät thoose arvot ja OpenLDAP, muokata LDAP config file <b>slapd.conf</b> on kaikki thoose kaavat ladattu.
 ForANonAnonymousAccess=Jotta autentikoitu acces (for a kirjoitusoikeuksia esimerkiksi)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+PerfDolibarr=Suorituskyvyn määritys / optimointiraportti
+YouMayFindPerfAdviceHere=Tällä sivulla on joitain suoritukseen liittyviä tarkastuksia tai neuvoja.
+NotInstalled=Ei asennettu.
+NotSlowedDownByThis=Ei hidasta tätä.
+NotRiskOfLeakWithThis=Ei vuotoriskiä tällä.
 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.
@@ -1576,13 +1587,13 @@ MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is
 OPCodeCache=OPCode cache
 NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
 HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
+FilesOfTypeCached=HTTP-palvelin tallentaa välimuistiin tyypin %s tiedostot
+FilesOfTypeNotCached=HTTP-palvelin ei tallenna välimuistiin tyypin %s tiedostoja
+FilesOfTypeCompressed=HTTP-palvelin pakkaa tyypin %s tiedostot
+FilesOfTypeNotCompressed=HTTP-palvelin ei pakkaa tyypin %s tiedostoja
+CacheByServer=Välimuisti palvelimen mukaan
 CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
-CacheByClient=Cache by browser
+CacheByClient=Välimuisti selaimen mukaan
 CompressionOfResources=Compression of HTTP responses
 CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
@@ -1597,10 +1608,10 @@ ProductSetup=Tuotteet Moduuli setup
 ServiceSetup=Services-moduuli asennus
 ProductServiceSetup=Tuotteet ja palvelut moduulien asennus
 NumberOfProductShowInSelect=Yhdistelmäluetteloissa näytettävien tuotteiden enimmäismäärä (0 = ei rajoitusta)
-ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
+ViewProductDescInFormAbility=Näytä tuotekuvaukset lomakkeissa (muuten näkyvät työkaluvihjeen ponnahdusikkunassa)
+DoNotAddProductDescAtAddLines=Älä lisää tuotekuvausta (tuotekortilta), kun lisäät rivejä lomakkeisiin
+OnProductSelectAddProductDesc=Tuotteen kuvauksen käyttäminen, kun lisäät tuotteen asiakirjan riviksi
+AutoFillFormFieldBeforeSubmit=Täytä kuvauksen syöttökenttä automaattisesti tuotteen kuvauksella
 DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
 DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
@@ -1623,7 +1634,7 @@ YouCanUseDOL_DATA_ROOT=Voit käyttää DOL_DATA_ROOT / dolibarr.log varten lokit
 ErrorUnknownSyslogConstant=Constant %s ei ole tunnettu syslog vakio
 OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Number of backup logs to keep
+SyslogFileNumberOfSaves=Säilytettävien varmuuskopiointilokien määrä
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Lahjoitus-moduulin asetukset
@@ -1644,15 +1655,15 @@ BarcodeDescC128=Viivakoodityyppi C128
 BarcodeDescDATAMATRIX=Viivakoodityyppi Datamatrix
 BarcodeDescQRCODE=Viivakoodityyppi 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
-BarcodeInternalEngine=Internal engine
+BarcodeInternalEngine=Sisäinen moottori
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=Suoraveloitusmoduulin asetukset
 ##### ExternalRSS #####
 ExternalRSSSetup=Ulkopuolinen RSS tuonnin setup
 NewRSS=Uusi RSS-syöte
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=Mielenkiintoinen RSS-syöte
 ##### Mailing #####
 MailingSetup=Sähköpostituksen moduulin asetukset
 MailingEMailFrom=Sender email (From) for emails sent by emailing module
@@ -1663,7 +1674,7 @@ NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Edunsaajavaltiot
 ##### Sendings #####
-SendingsSetup=Shipping module setup
+SendingsSetup=Lähetysmoduulin asetukset
 SendingsReceiptModel=Lähettävä vastaanottanut malli
 SendingsNumberingModules=Lähetysten numerointi moduulit
 SendingsAbility=Support shipping sheets for customer deliveries
@@ -1683,7 +1694,7 @@ FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines fo
 FCKeditorForMailing= WYSIWIG luominen / painos postitusten
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+FCKeditorForTicket=WYSIWIG tikettien luominen / muokkaus
 ##### Stock #####
 StockSetup='Varasto' - moduulin asetukset
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
@@ -1713,7 +1724,7 @@ DetailLevel=Tasolla (-1: ylävalikosta 0: header-valikko&gt; 0-valikon ja alival
 ModifMenu=Valikko muutos
 DeleteMenu=Poista valikosta
 ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
+FailedToInitializeMenu=Valikon alustaminen epäonnistui
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=Vaihtoehto d'exigibilit de TVA
@@ -1736,12 +1747,14 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Kirjanpitotili
 AccountancyCodeSell=Myyntien tili
 AccountancyCodeBuy=Ostojen tili
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Toimet ja esityslistan moduulin asetukset
 PasswordTogetVCalExport=Avain sallia viennin linkki
+SecurityKey = Security Key
 PastDelayVCalExport=Älä viedä tapauksessa vanhempia kuin
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
+AGENDA_USE_EVENT_TYPE_DEFAULT=Aseta tämä oletusarvo automaattisesti tapahtuman tyypille tapahtuman luontilomakkeessa
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
@@ -1754,7 +1767,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ClickToDialSetup='Click To Dial'-moduulin asetukset
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
-ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLink=Käytä vain linkkiä "tel:" puhelinnumeroihin
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Kassapääte
@@ -1805,7 +1818,7 @@ SuppliersSetup='Toimittaja' - moduulin asetukset
 SuppliersCommandModel=Complete template of Purchase Order
 SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
 SuppliersInvoiceModel=Complete template of Vendor Invoice
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
+SuppliersInvoiceNumberingModel=Toimittajan laskujen numerointimallit
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind moduuli setup
@@ -1818,9 +1831,9 @@ TestGeoIPResult=Testaus muuntaminen IP -> maa
 ProjectsNumberingModules=Hankkeet numerointi moduuli
 ProjectsSetup=Hankkeen moduuli setup
 ProjectsModelModule=Hankkeen raportti asiakirjan malli
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+TasksNumberingModules=Tehtävien numerointimoduuli
+TaskModelModule=Tehtäväraporttien asiakirjamalli
+UseSearchToSelectProject=Odota, kunnes näppäintä painetaan, ennen kuin lataat Project-yhdistelmäluettelon sisällön. <br> Tämä voi parantaa suorituskykyä, jos sinulla on paljon projekteja, mutta se vähentää käyttömukavuutta.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Tilikaudet
@@ -1832,7 +1845,7 @@ DeleteFiscalYear=Poista tilikausi
 ConfirmDeleteFiscalYear=Haluatko varmasti poistaa tämän tilikauden?
 ShowFiscalYear=Näytä tilikausi
 AlwaysEditable=Voi aina muokata
-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=Pakota sovelluksen näkyvä nimi (varoitus: oman nimesi asettaminen tähän voi rikkoa automaattisen täytön sisäänkirjautumisominaisuuden käytettäessä DoliDroid-mobiilisovellusta)
 NbMajMin=Minimi määrä isoja merkkejä
 NbNumMin=Minimi määrä numero merkkejä
 NbSpeMin=Minimi määrä erikoismerkkejä
@@ -1841,66 +1854,66 @@ NoAmbiCaracAutoGeneration=Älä käytä erikoismerkkejä ("1","l","i","|","0","O
 SalariesSetup=Palkka moduulin asetukset
 SortOrder=Lajittelujärjestys
 Format=Formaatti
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
+TypePaymentDesc=0: Asiakkaan maksutapa, 1: Toimittajan maksutapa, 2: Sekä asiakkaiden että toimittajien maksutapa
+IncludePath=Sisällytä polku (määritelty muuttujaan %s)
 ExpenseReportsSetup=Kuluraportit moduulin asetukset
-TemplatePDFExpenseReports=Document templates to generate expense report document
+TemplatePDFExpenseReports=Asiakirjamallit kuluraportti-asiakirjan luomiseksi
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Expense reports numbering module
+ExpenseReportNumberingModules=Kuluraporttien numerointimoduuli
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of automatic notifications per user*
+ListOfNotificationsPerUser=Luettelo automaattisista ilmoituksista käyttäjää kohti *
 ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
-GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
-Threshold=Threshold
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
-SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+ListOfFixedNotifications=Luettelo automaattisista kiinteistä ilmoituksista
+GoOntoUserCardToAddMore=Siirry käyttäjän ilmoitukset -välilehteen lisätäksesi tai poistaaksesi ilmoituksia käyttäjille
+GoOntoContactCardToAddMore=Siirry kolmannen osapuolen välilehdelle Ilmoitukset, jos haluat lisätä tai poistaa ilmoituksia kontakteille / osoitteille
+Threshold=Kynnys
+BackupDumpWizard=Ohjattu toiminto tietokannan dump-tiedoston rakentamiseen
+BackupZipWizard=Ohjattu toiminto asiakirjojen arkiston rakentamiseen
+SomethingMakeInstallFromWebNotPossible=Ulkoisen moduulin asennus ei ole mahdollista verkkoliitännästä seuraavasta syystä:
+SomethingMakeInstallFromWebNotPossible2=Tästä syystä tässä kuvattu päivitysprosessi on manuaalinen prosessi, jonka vain etuoikeutettu käyttäjä voi suorittaa.
+InstallModuleFromWebHasBeenDisabledByFile=Järjestelmänvalvoja on poistanut ulkoisen moduulin asennuksen sovelluksesta. Sinun on pyydettävä häntä poistamaan tiedosto <strong> %s </strong> tämän ominaisuuden sallimiseksi.
 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
+HighlightLinesOnMouseHover=Korosta taulukon rivit hiiren liikkuessa niiden päällä
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
 HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
 TextTitleColor=Sivun otsikon tekstin väri
 LinkColor=Linkkien värit
-PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Paina näppäimistön CTRL + F5 tai tyhjennä selaimen välimuisti muutettuasi tämän arvon, jotta se tulee voimaan
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Taustaväri
 TopMenuBackgroundColor=Taustaväri ylävalikolle
 TopMenuDisableImages=Piilota kuvat ylävalikosta
 LeftMenuBackgroundColor=Taustaväri alavalikolle
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableTitleTextColor=Text color for Table title line
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleColor=Taulukon otsikkorivin taustaväri
+BackgroundTableTitleTextColor=Taulukon otsikkorivin tekstin väri
+BackgroundTableTitleTextlinkColor=Taulukon otsikkolinkkirivin tekstin väri
 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.
-Enter0or1=Enter 0 or 1
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-ColorFormat=The RGB color is in HEX format, eg: FF0000
+MinimumNoticePeriod=Vähimmäisilmoitusaika (lomapyyntösi on tehtävä ennen tätä viivettä)
+NbAddedAutomatically=Käyttäjälaskureihin lisättyjen päivien määrä (automaattisesti) kuukaudessa
+EnterAnyCode=Tämä kenttä sisältää viitteen linjan tunnistamiseksi. Syötä haluamasi arvo ilman erikoismerkkejä.
+Enter0or1=Syötä 0 tai 1
+UnicodeCurrency=Kirjoita tähän aaltosulkeiden väliin, luettelo tavunumerosta, joka edustaa valuuttasymbolia. Esimerkiksi: kirjoita $: lle [36] - Brasilian real:lle R $ [82,36] - €: lle, kirjoita [8364]
+ColorFormat=RGB-väri on HEX-muodossa, esim .: FF0000
 PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
-PositionIntoComboList=Position of line into combo lists
+PositionIntoComboList=Viivan sijainti yhdistelmäluetteloissa
 SellTaxRate=Myynnin veroprosentti
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
 UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
 OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
 TemplateForElement=This template record is dedicated to which element
-TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+TypeOfTemplate=Mallin tyyppi
+TemplateIsVisibleByOwnerOnly=Malli näkyy vain omistajalle
 VisibleEverywhere=Näkyvillä kaikkialla
 VisibleNowhere=Visible nowhere
 FixTZ=Aikavyöhyke korjaus
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+FillFixTZOnlyIfRequired=Esimerkki: +2 (täytä vain, jos ongelmia ilmenee)
 ExpectedChecksum=Oletettu tarkistussumma
 CurrentChecksum=Nykyinen tarkistussumma
 ExpectedSize=Oletettu koko
 CurrentSize=Nykyinen koko
-ForcedConstants=Required constant values
+ForcedConstants=Vaaditut kiinteät arvot
 MailToSendProposal=Tarjoukset asiakkaille
 MailToSendOrder=Asiakkaan tilaukset
 MailToSendInvoice=Asiakkaiden laskut
@@ -1916,43 +1929,43 @@ MailToMember=Jäsenet
 MailToUser=Käyttäjät
 MailToProject=Projektit
 MailToTicket=Tiketit
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ByDefaultInList=Näytä oletuksena luettelonäkymässä
+YouUseLastStableVersion=Käytät uusinta vakaata versiota
+TitleExampleForMajorRelease=Esimerkki viestistä, jonka avulla voit ilmoittaa tästä suuresta julkaisusta (käytä sitä vapaasti verkkosivustollasi)
+TitleExampleForMaintenanceRelease=Esimerkki viestistä, jonka avulla voit ilmoittaa tästä ylläpitoversiosta (käytä sitä vapaasti verkkosivustoillasi)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s on saatavana. Versio %s on merkittävä julkaisu, jossa on paljon uusia ominaisuuksia sekä käyttäjille että kehittäjille. Voit ladata sen https://www.dolibarr.org -portaalin latausalueelta (alihakemiston vakaa versio). Voit lukea täydellisen luettelon muutoksista <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a>.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s on saatavana. Versio %s on ylläpitoversio, joten sisältää vain virhekorjauksia. Suosittelemme kaikkia käyttäjiä päivittämään tähän versioon. Ylläpitoversio ei tuo uusia ominaisuuksia tai muutoksia tietokantaan. Voit ladata sen https://www.dolibarr.org -portaalin latausalueelta (alihakemiston vakaa versio). Voit lukea täydellisen luettelon muutoksista <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a>.
+MultiPriceRuleDesc=Kun vaihtoehto "Useat hintatasot tuotetta / palvelua kohti" on käytössä, voit määrittää kullekin tuotteelle eri hinnat (yksi hintatasoa kohti). Ajan säästämiseksi voit kirjoittaa tähän säännön, jolla lasketaan hintataso jokaiselle tasolle ensimmäisen tason hinnan perusteella, joten sinun on annettava vain kunkin tuotteen ensimmäisen tason hinta. Tämä sivu on suunniteltu säästämään aikaa, mutta on hyödyllinen vain, jos kunkin tason hinnat ovat suhteessa ensimmäiseen tasoon. Voit sivuuttaa tämän sivun useimmissa tapauksissa.
 ModelModulesProduct=Mallipohjat tuotedokumentaatiolle
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Mallit varastojen asiakirjoille
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
-SeeChangeLog=See ChangeLog file (english only)
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
+SeeChangeLog=Katso muutoslokitiedosto (vain englanniksi)
+AllPublishers=Kaikki julkaisijat
+UnknownPublishers=Tuntemattomat julkaisijat
 AddRemoveTabs=Lisää tai poista välilehti
-AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
-AddData=Add objects or dictionaries data
+AddDataTables=Lisää kohdetaulukot
+AddDictionaries=Lisää sanakirjatauluja
+AddData=Lisää kohteita tai sanakirjatietoja
 AddBoxes=Lisää widgettejä
 AddSheduledJobs=Lisää Ajastettuja Töitä
-AddHooks=Add hooks
+AddHooks=Lisää koukut
 AddTriggers=Add triggers
 AddMenus=Lisää valikoita
 AddPermissions=Lisää käyttöoikeuksia
 AddExportProfiles=Lisää vientiprofiileja
 AddImportProfiles=Lisää tuontiprofiileja
 AddOtherPagesOrServices=Lisää sivuja tai palveluita
-AddModels=Add document or numbering templates
+AddModels=Lisää asiakirja- tai numerointimallit
 AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+DetectionNotPossible=Tunnistaminen ei ole mahdollista
+UrlToGetKeyToUseAPIs=URL-osoite hakeaksesi tunnuksen käyttämään API-rajapintaa (kun tunnus on vastaanotettu, se tallennetaan tietokannan käyttäjätauluun ja se on annettava jokaisessa API-kutsussa)
 ListOfAvailableAPIs=Luettelo saatavilla olevista API:sta
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
-LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
+activateModuleDependNotSatisfied=Moduuli "%s" riippuu moduulista "%s", joka puuttuu, joten moduuli "%1$s" ei välttämättä toimi oikein. Asenna moduuli "%2$s" tai poista moduuli "%1$s" käytöstä, jos haluat olla turvassa yllätyksiltä
+CommandIsNotInsideAllowedCommands=Komentoa, jota yrität suorittaa, ei ole parametrissa <strong> $ dolibarr_main_restrict_os_commands </strong> määritetyssä sallittujen komentojen luettelossa <strong> conf.php </strong>.
+LandingPage=Aloitussivu
+SamePriceAlsoForSharedCompanies=Jos käytät usean yrityksen moduulia, valinnalla "Yksi hinta", hinta on myös sama kaikille yrityksille, jos tuotteet jaetaan ympäristöjen välillä
+ModuleEnabledAdminMustCheckRights=Moduuli on aktivoitu. Aktivoitujen moduulien käyttöoikeudet annettiin vain järjestelmänvalvojan käyttäjille. Saatat joutua myöntämään käyttöoikeudet muille käyttäjille tai ryhmille manuaalisesti tarvittaessa.
 UserHasNoPermissions=Käyttäjän oikeuksia ei määritetty
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
 BaseCurrency=Reference currency of the company (go into setup of company to change this)
@@ -1963,27 +1976,27 @@ MAIN_PDF_MARGIN_LEFT=PDF:n vasen marginaali
 MAIN_PDF_MARGIN_RIGHT=PDF:n oikea marginaali
 MAIN_PDF_MARGIN_TOP=PDF:n ylämarginaali
 MAIN_PDF_MARGIN_BOTTOM=PDF:n alamarginaali
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
-NothingToSetup=There is no specific setup required for this module.
+MAIN_DOCUMENTS_LOGO_HEIGHT=Logon korkeus PDF-muodossa
+NothingToSetup=Tämä moduuli ei vaadi erityisiä määrityksiä.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
-SeveralLangugeVariatFound=Several language variants found
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+SeveralLangugeVariatFound=Löytyi useita kielivaihtoehtoja
 RemoveSpecialChars=Poista erikoismerkit
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+COMPANY_DIGITARIA_UNIQUE_CODE=Kopiota ei sallita
+GDPRContact=Tietosuojavastaava (tietosuojavastaava, tietosuoja- tai GDPR-yhteyshenkilö)
 GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
+HelpOnTooltip=Ohjeteksti näytettäväksi työkaluvihjeessä
+HelpOnTooltipDesc=Lisää teksti tai käännösavain tähän, jotta teksti näkyy työkaluvihjessä, kun tämä kenttä näkyy lomakkeessa
+YouCanDeleteFileOnServerWith=Voit poistaa tämän tiedoston palvelimelta komentorivillä: <br> %s
 ChartLoaded=Tilikartta ladattu
-SocialNetworkSetup=Setup of module Social Networks
+SocialNetworkSetup=Sosiaalisten verkostojen moduulin asetukset
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+EmailCollector=Sähköpostin kerääjä
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=Uusi postinkerääjä
 EMailHost=IMAP-palvelin
@@ -1991,21 +2004,21 @@ MailboxSourceDirectory=Sähköpostin lähdehakemisto
 MailboxTargetDirectory=Postilaatikon kohdehakemisto
 EmailcollectorOperations=Keräilijän tehtävät toiminnot
 EmailcollectorOperationsDesc=Toiminnot suoritetaan ylhäältä alas järjestyksessä
-MaxEmailCollectPerCollect=Max number of emails collected per collect
+MaxEmailCollectPerCollect=Kerätyn sähköpostin enimmäismäärä keräystä kohti
 CollectNow=Kerää nyt
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
-LastResult=Latest result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+ConfirmCloneEmailCollector=Haluatko varmasti kloonata sähköpostin kerääjän %s?
+DateLastCollectResult=Viimeisimmän keräysyrityksen päivämäärä
+DateLastcollectResultOk=Viimeisimmän onnistuneen keräyksen päivämäärä
+LastResult=Viimeisin tulos
+EmailCollectorConfirmCollectTitle=Sähköpostikeräyksen vahvistus
+EmailCollectorConfirmCollect=Haluatko suorittaa tämän keräilijän kokoelman nyt?
 NoNewEmailToProcess=Ei uutta käsiteltävää sähköpostia (vastaavat suodattimet)
 NothingProcessed=Mitään ei tehty
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
-CodeLastResult=Latest result code
+XEmailsDoneYActionsDone=%s -sähköpostia hyväksytty, %s sähköpostien käsittely onnistuneesti (%s-tietuetta / tehtävää suoritettu)
+RecordEvent=Tallenna sähköpostitapahtuma
+CreateLeadAndThirdParty=Luo liidi (ja tarvittaessa kolmas osapuoli)
+CreateTicketAndThirdParty=Luo tiketti (ja linkitä kolmanteen osapuoleen, jos se on ladattu edellisellä toiminnolla)
+CodeLastResult=Viimeisin tuloskoodi
 NbOfEmailsInInbox=Lähdehakemistossa olevien sähköpostien määrä
 LoadThirdPartyFromName=Lataa kolmannen osapuolen haku sivustolta %s (vain lataus)
 LoadThirdPartyFromNameOrCreate=Lataa kolmannen osapuolen haku sivustolta %s (luo, jos sitä ei löydy)
@@ -2024,56 +2037,61 @@ ResourceSetup=Resurssimoduulin määritys
 UseSearchToSelectResource=Käytä hakulomaketta resurssin valitsemiseksi (pikavalikon sijaan).
 DisabledResourceLinkUser=Poista ominaisuus käytöstä linkittääksesi resurssin käyttäjiin
 DisabledResourceLinkContact=Poista ominaisuus käytöstä linkittääksesi resurssin kontakteihin
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+EnableResourceUsedInEventCheck=Ota ominaisuus käyttöön tarkistaaksesi, onko resurssi käytössä tapahtumassa
 ConfirmUnactivation=Vahvista moduulin nollaus
 OnMobileOnly=Vain pienellä näytöllä (älypuhelin)
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
+DisableProspectCustomerType=Poista käytöstä "Prospekti + Asiakas" -tyyppi (joten kolmannen osapuolen on oltava "Prospekti" tai "Asiakas", mutta ei voi olla molempia)
+MAIN_OPTIMIZEFORTEXTBROWSER=Yksinkertaista käyttöliittymää sokeille
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Ota tämä vaihtoehto käyttöön, jos olet sokea henkilö tai jos käytät sovellusta tekstiselaimesta, kuten Lynx tai Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Vaihda käyttöliittymän väriä värisokeille sopivaksi
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Ota tämä vaihtoehto käyttöön, jos olet värisokea, joissakin tapauksissa käyttöliittymä muuttaa väriasetuksia kontrastin lisäämiseksi.
 Protanopia=Protanopia
 Deuteranopes=Deuteranopes
 Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
-ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+ThisValueCanOverwrittenOnUserLevel=Kukin käyttäjä voi korvata tämän arvon käyttäjän sivulta - välilehti '%s'
+DefaultCustomerType=Kolmannen osapuolen oletustyyppi uuden asiakkaan luontilomakkeelle
+ABankAccountMustBeDefinedOnPaymentModeSetup=Huomaa: Pankkitili on määritettävä jokaisen maksutavan moduulissa (Paypal, Stripe, ...), jotta tämä ominaisuus toimisi.
+RootCategoryForProductsToSell=Myytävien tuotteiden pääluokka
+RootCategoryForProductsToSellDesc=Jos määritelty, vain tämän luokan tuotteet tai tämän luokan alatuotteet ovat saatavilla myyntipisteessä
 DebugBar=Virheenkorjauspalkki
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+DebugBarDesc=Työkalupalkki, joka sisältää runsaasti työkaluja virheenkorjauksen yksinkertaistamiseksi
 DebugBarSetup=Virheenkorjauspalkin asetukset
 GeneralOptions=Yleiset asetukset
-LogsLinesNumber=Number of lines to show on logs tab
+LogsLinesNumber=Lokit-välilehdessä näytettävien rivien määrä
 UseDebugBar=Käytä virheenkorjauspalkkia
 DEBUGBAR_LOGS_LINES_NUMBER=Konsolissa pidettävien lokirivien määrä
 WarningValueHigherSlowsDramaticalyOutput=Varoitus, suuremmat arvot hidastavat merkittävästi ohjelmaa
 ModuleActivated=Moduuli %son aktiivinen ja hidastaa ohjelmaa
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Jos olet tuotantoympäristössä, määritä tämän ominaisuuden arvoksi %s.
 AntivirusEnabledOnUpload=Virustorjunta käytössä ladatuissa tiedostoissa
-EXPORTS_SHARE_MODELS=Export models are share with everybody
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+EXPORTS_SHARE_MODELS=Vientimallit jaetaan kaikkien kanssa
 ExportSetup=Vienti-moduulin asetukset
-ImportSetup=Setup of module Import
+ImportSetup=tuontimoduulin asetukset
 InstanceUniqueID=Instanssin ID
 SmallerThan=Pienempi kuin
 LargerThan=Suurempi kuin
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
-WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
+WithGMailYouCanCreateADedicatedPassword=Jos otit käyttöön kaksivaiheisen vahvistuksen Gmail-tilillä, on suositeltavaa luoda erillinen toinen salasana sovellukselle sen sijaan, että käyttäisit omaa tilin salasanasi osoitteessa https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
 EndPointFor=End point for %s : %s
-DeleteEmailCollector=Delete email collector
-ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
+DeleteEmailCollector=Poista sähköpostin kerääjä
+ConfirmDeleteEmailCollector=Haluatko varmasti poistaa tämän sähköpostin kerääjän?
 RecipientEmailsWillBeReplacedWithThisValue=Vastaanottajien sähköpostiosoitteet korvataan aina tällä arvolla
 AtLeastOneDefaultBankAccountMandatory=Vähintään 1 pankkitili täytyy määrittää
 RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Perustuu SabreDAV-versioon
 NotAPublicIp=Ei julkinen IP-osoite
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+MakeAnonymousPing=Tee anonyymi Ping '+1' Dolibarr-säätiön palvelimelle (tehdään vain kerran asennuksen jälkeen), jotta säätiö voi laskea Dolibarr-asennuksen määrän.
 FeatureNotAvailableWithReceptionModule=Ominaisuus ei käytettävissä kun moduuli Vastaanotto on aktiivinen
 EmailTemplate=Mallisähköposti
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Ominaisuus ei käytettävissä kun moduuli Vastaanotto on aktiivinen
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Tämän arvon vaihtamista arvoon %s suositellaan tu
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Maa (jos määritelty annetulle maalle)
 YouMayFindSecurityAdviceHere=Löydät tietoturva-neuvoja täältä
-ModuleActivatedMayExposeInformation=Tämä moduuli saattaa paljastaa arkaluontoisia tietoja. Jos et tarvitse sitä, poista se käytöstä.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=Kehitykseen suunniteltu moduuli on otettu käyttöön. Älä ota sitä käyttöön tuotantoympäristössä.
 CombinationsSeparator=Tuoteyhdistelmien erotinmerkki
 SeeLinkToOnlineDocumentation=Katso esimerkkejä linkistä online-dokumentaatioon ylävalikossa
 SHOW_SUBPRODUCT_REF_IN_PDF=Jos käytetään moduulin <b> %s </b> ominaisuutta "%s", näytä yksityiskohdat paketin alituotteista PDF-muodossa.
 AskThisIDToYourBank=Ota yhteyttä pankkiisi saadaksesi tämän tunnuksen
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index 7d3b78bdd23..3d6580bde09 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=SEPA-toimeksiantonne
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 765ef285f83..9ac2ed704b1 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -54,9 +54,10 @@ InvoiceCustomer=Asiakkaan lasku
 CustomerInvoice=Asiakkaan lasku
 CustomersInvoices=Asiakkaiden laskut
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Toimittajien laskut
+SuppliersInvoices=Toimittajan laskut
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=tavarantoimittajien laskut
+SupplierBills=Toimittajan laskut
 Payment=Maksu
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Maksut jo
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Maksu sääntö
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Luottokortti
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Päivämäärä viimeiselle luonnille
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Hyväksy laskut automaattisesti
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=14 päivää kuun loputtua
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Pankkisiirto
 PaymentTypeShortVIR=Pankkisiirto
@@ -494,12 +498,16 @@ Cash=Kassa
 Reported=Myöhässä
 DisabledBecausePayments=Ole mahdollista, koska on olemassa joitakin maksuja
 CantRemovePaymentWithOneInvoicePaid=Ei voi poistaa maksua koska siellä on ainakin laskulla luokiteltu maksanut
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Odotettu maksu
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Maksanut tämän maksun
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Maksa
 ToMakePaymentBack=Takaisin maksu
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill alkaen $ syymm jo olemassa, ja ei ole yhteensopiva tämän mallin järjestyksessä. Poistaa sen tai nimetä sen aktivoida tämän moduulin.
-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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -562,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Poista laskupohja
 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 lasku(a) luotu
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
index 896e6895a4f..9fa1c9f36ed 100644
--- a/htdocs/langs/fi_FI/boxes.lang
+++ b/htdocs/langs/fi_FI/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS tiedot
 BoxLastProducts=Viimeisimmät %sTuotteet/Palvelut
@@ -17,9 +18,13 @@ BoxLastActions=Viimeisimmät käsittelyt
 BoxLastContracts=Viimeisimmät sopimukset
 BoxLastContacts=Viimeisimmät käsitellyt yhteystiedot
 BoxLastMembers=Viimeisimmät käyttäjät
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Viimeisimmät välitykset
 BoxCurrentAccounts=Avoimet saatavat yhteensä
 BoxTitleMemberNextBirthdays=Käyttäjien syntymäpäivät tässä kuussa
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Viimeisimmät %s uutiset %s
 BoxTitleLastProducts=Tuotteet/Palvelut: viimeisimmät %s muokatut
 BoxTitleProductsAlertStock=Tuotteet: saldohälytys
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Kirjanpito
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index 8738530c575..c98bca84e12 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 9501c740d2c..5be2288c86c 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -43,9 +43,10 @@ Individual=Yksityishenkilö
 ToCreateContactWithSameName=Luo automaattisesti yhteystiedot/osoitteen sidosryhmän tiedoilla sidosryhmän alaisuuteen. Yleensä, vaikka sidosryhmä olisi henkilö, pelkkä sidosryhmän luominen riittää.
 ParentCompany=Emoyhtiö
 Subsidiaries=Tytäryhtiöt
-ReportByMonth=Raportti kuukausittain
-ReportByCustomers=Raportti asiakkaiden mukaan
-ReportByQuarter=Raportti tuloksittain
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Siviilisääty
 RegisteredOffice=Kotipaikka
 Lastname=Sukunimi
@@ -172,14 +173,20 @@ ProfId1ES=ALV-numero 1 (CIF / NIF  Espanja)
 ProfId2ES=Prof Id 2 (Henkilötunnus)
 ProfId3ES=Prof tunnus 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate numero)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (Siret)
 ProfId3FR=Prof Id 3 (NAF, vanha APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Prof Id 1 (Registration Number)
 ProfId2GB=-
 ProfId3GB=Prof Id 3 (SIC)
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Sosiaaliturva numero)
 ProfId3PT=Prof Id 3 (Commercial Record numero)
 ProfId4PT=Prof Id 4 (konservatorio)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Professori Id 1 (OGRN)
 ProfId2RU=Professori Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Avoin lasku
 OutstandingBill=Avointen laskujen enimmäismäärä
 OutstandingBillReached=Avointen laskujen enimmäismäärä saavutettu
 OrderMinAmount=Vähimmäistilausmäärä
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Asiakas / toimittaja-koodi on maksuton. Tämä koodi voidaan muuttaa milloin tahansa.
 ManagingDirectors=Johtajien nimet (TJ, johtaja, päällikkö...)
 MergeOriginThirdparty=Monista sidosryhmä (sidosryhmä jonka haluat poistaa)
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index d75596e0a5b..d8680739af0 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=Alv
 StatusToPay=Maksaa
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Asiakas laskun maksu
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal veron maksu
 PaymentVat=ALV-maksu
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Luettelo maksut
 ListOfCustomerPayments=Luettelo asiakkaan maksut
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Maksu
 LT2PaymentsES=IRPF maksut
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Cheque vastaanotto panos päivämäärä
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Linkki Tilauksiin
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/fi_FI/ecm.lang b/htdocs/langs/fi_FI/ecm.lang
index c086c8f47c7..3adcc59a368 100644
--- a/htdocs/langs/fi_FI/ecm.lang
+++ b/htdocs/langs/fi_FI/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index df9826daae0..feec6b25b64 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> ei löytynyt (Bad polku, väärä oikeudet
 ErrorFunctionNotAvailableInPHP=<b>Tehtävä %s</b> tarvitaan tätä ominaisuutta, mutta ei ole käytettävissä tässä versiossa / setup PHP.
 ErrorDirAlreadyExists=A-hakemisto on jo olemassa.
 ErrorFileAlreadyExists=Tämän niminen tiedosto on jo olemassa.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Tiedosto ei saanut kokonaan palvelimelta.
 ErrorNoTmpDir=Tilapäinen directy %s ei ole.
 ErrorUploadBlockedByAddon=Lähetä estetty PHP / Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/fi_FI/externalsite.lang b/htdocs/langs/fi_FI/externalsite.lang
index 603e504cabe..1926b6e7f01 100644
--- a/htdocs/langs/fi_FI/externalsite.lang
+++ b/htdocs/langs/fi_FI/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup linkki ulkoiseen sivustoon
-ExternalSiteURL=Ulkoisen sivuston osoite (URL)
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Ulkoisen sivuston Moduuli ei ole oikein konfiguroitu.
 ExampleMyMenuEntry=Omassa valikossa
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index edbfc59d018..0e6d21e4a82 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Muokattu
 IPModification=Muokkaajan IP
 DateLastModification=Viimeisimmän muokkauksen päivämäärä
 DateValidation=Vahvistettu
+DateSigning=Signing date
 DateClosing=Suljettu
 DateDue=Eräpäivä
 DateValue=Arvopäivä
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Yksikköhinta
 PriceU=A-hinta
 PriceUHT=Veroton hinta
-PriceUHTCurrency=U.P (valuutta)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=Verollinen hinta
 Amount=Määrä
 AmountInvoice=Laskun summa
@@ -389,6 +390,8 @@ AmountTotal=Yhteissumma
 AmountAverage=Keskimääräinen summa
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Prosenttia
 Total=Yhteensä
 SubTotal=Välisumma
@@ -724,7 +727,7 @@ MenuMembers=Jäsenet
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr raja (Valikko koti-setup-turvallisuus): %s Kb, PHP raja: %s Kb
-NoFileFound=Ei asiakirjoja tallennettuna tähän hakemistoon
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Nykyinen kieli
 CurrentTheme=Nykyinen teema
 CurrentMenuManager=Nykyinen valikkohallinta
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Suora latauslinkki (julkinen/ulkoinen)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Lataa
 DownloadDocument=Lataa dokumentti
 ActualizeCurrency=Päivitä valuuttakurssi
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Yhteystiedot
 SearchIntoMembers=Jäsenet
 SearchIntoUsers=Käyttäjät
 SearchIntoProductsOrServices=Tuotteet tai palvelut
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projektit
 SearchIntoMO=Valmistustilaukset
 SearchIntoTasks=Tehtävät
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Pikanäppäin
 AssignedTo=Vaikuttaa
 Deletedraft=Poista luonnos
 ConfirmMassDraftDeletion=Luonnosten massapoistamisen vahvistus
-FileSharedViaALink=Tiedosto jaettu linkin kautta
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Valitse ensin kolmas osapuoli ...
 YouAreCurrentlyInSandboxMode=Olet tällä hetkellä %s "sandbox" -tilassa
 Inventory=Varasto
 AnalyticCode=Analyyttinen koodi
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Näytä lisää tietoja
 NoFilesUploadedYet=Lataa ensin asiakirja
 SeePrivateNote=Katso yksityinen huomautus
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang
index d1b075c7bc3..866a85e11e7 100644
--- a/htdocs/langs/fi_FI/margins.lang
+++ b/htdocs/langs/fi_FI/margins.lang
@@ -22,7 +22,7 @@ ProductService=Tuote tai palvelu
 AllProducts=Kaikki tuotteet ja palvelut
 ChooseProduct/Service=Valitse tuote tai palvelu
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=tuotteeksi
 UseDiscountAsService=palveluksi
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index ada2de4e243..ee9821fd4f7 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Luettelo luonnoksen jäsenten (jotka on vahvistettu)
 MembersListValid=Luettelo voimassa jäseniä
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=Luettelo pätevistä jäsenistä
 MenuMembersToValidate=Luonnos jäseniä
 MenuMembersValidated=Validoidut jäseniä
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Jäsenet Merkintäoikeuksien vastaanottaa
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Lakkaa
 MemberStatusPaid=Tilaus ajan tasalla
 MemberStatusPaidShort=Ajan tasalla
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Luonnos jäseniä
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Hyväksytty
@@ -82,6 +87,8 @@ Physical=Fyysinen
 Moral=Moraalinen
 MorAndPhy=Moral and Physical
 Reenable=Ottaa ne uudelleen
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Poista jäseneksi
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Etiketit muodossa
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Luo osoite arkkia (malli lähtö todella setup: <b>%s)</b>
 SubscriptionPayment=Tilaus maksu
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Jäsenten tilastot maittain
 MembersStatisticsByState=Jäsenten tilastot valtio / lääni
 MembersStatisticsByTown=Jäsenten tilastot kaupunki
diff --git a/htdocs/langs/fi_FI/modulebuilder.lang b/htdocs/langs/fi_FI/modulebuilder.lang
index 0e6dd72354d..23fe1bd694b 100644
--- a/htdocs/langs/fi_FI/modulebuilder.lang
+++ b/htdocs/langs/fi_FI/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index 6ad75f3c205..e4c9e7599b3 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Asiakkaiden tilausalue
-SuppliersOrdersArea=Purchase orders area
+SuppliersOrdersArea=Ostotilaukset
 OrderCard=Tilauskortti
 OrderId=Tilausnumero
 Order=Tilaus
@@ -11,23 +11,25 @@ OrderDate=Tilauspäivämäärä
 OrderDateShort=Tilauspäivä
 OrderToProcess=Jotta prosessi
 NewOrder=Uusi tilaus
-NewOrderSupplier=New Purchase Order
+NewOrderSupplier=Uusi Ostotilaus
 ToOrder=Tee tilaus
 MakeOrder=Tee tilaus
-SupplierOrder=Purchase order
-SuppliersOrders=Purchase orders
-SuppliersOrdersRunning=Current purchase orders
-CustomerOrder=Sales Order
+SupplierOrder=Ostotilaus
+SuppliersOrders=Ostotilaukset
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
+SuppliersOrdersRunning=Avoimet Ostotilaukset
+CustomerOrder=Myyntitilaus
 CustomersOrders=Myyntitilaukset
-CustomersOrdersRunning=Current sales orders
-CustomersOrdersAndOrdersLines=Sales orders and order details
-OrdersDeliveredToBill=Sales orders delivered to bill
-OrdersToBill=Sales orders delivered
-OrdersInProcess=Sales orders in process
-OrdersToProcess=Sales orders to process
-SuppliersOrdersToProcess=Purchase orders to process
-SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
-AwaitingReception=Awaiting reception
+CustomersOrdersRunning=Avoimet myyntitilaukset
+CustomersOrdersAndOrdersLines=Myyntitilaukset ja tilauksen tarkennukset
+OrdersDeliveredToBill=Laskutetut Myyntitilaukset
+OrdersToBill=Toimitetut Myyntitilaukset
+OrdersInProcess=Käsittelyssä olevat Myyntitilaukset
+OrdersToProcess=Käsittelyä tarvitsevat Myyntitilaukset
+SuppliersOrdersToProcess=Käsittelyä tarvitsevat Ostotilaukset
+SuppliersOrdersAwaitingReception=Ostotilaukset jotka odottavat saapumista
+AwaitingReception=Odottaa saapumista
 StatusOrderCanceledShort=Peruutettu
 StatusOrderDraftShort=Vedos
 StatusOrderValidatedShort=Hyväksytty
@@ -47,7 +49,7 @@ StatusOrderCanceled=Peruutettu
 StatusOrderDraft=Luonnos (vaatii vahvistuksen)
 StatusOrderValidated=Hyväksytty
 StatusOrderOnProcess=Tilattu - Odotaa vastaanottoa
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcessWithValidation=Tilattu - Odottaa saapumista tai validointia
 StatusOrderProcessed=Käsitelty
 StatusOrderToBill=Toimitettu
 StatusOrderApproved=Hyväksytty
@@ -56,41 +58,41 @@ StatusOrderReceivedPartially=Osittain saapunut
 StatusOrderReceivedAll=Kaikki tuotteet vastaanotettu
 ShippingExist=Lähetys on olemassa
 QtyOrdered=Tilattu Kpl
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ProductQtyInDraft=Tuotemäärät kesken oleville tilauksille
+ProductQtyInDraftOrWaitingApproved=Tuotemäärät kesken oleville tai hyväksytyille ostotilauksille, joita ei vielä tilattu
 MenuOrdersToBill=Toimitetut tilaukset
 MenuOrdersToBill2=Laskutettavat tilaukset
 ShipProduct=Toimita tuote
 CreateOrder=Luo tilaus
 RefuseOrder=Kiellä tilaus
 ApproveOrder=Hyväksy tilaus
-Approve2Order=Approve order (second level)
+Approve2Order=Hyväksy tilaus (toisen vaiheen hyväksyntä)
 ValidateOrder=Hyväksy tilaus
 UnvalidateOrder=Käsittele tilaus uudestaan
 DeleteOrder=Poista tilaus
 CancelOrder=Peruuta tilaus
-OrderReopened= Order %s re-open
+OrderReopened= Tilaus %s uudelleenavaus
 AddOrder=Luo tilaus
-AddPurchaseOrder=Create purchase order
-AddToDraftOrders=Add to draft order
+AddPurchaseOrder=Muodosta Ostotilaus
+AddToDraftOrders=Lisää kesken olevalle tilaukselle
 ShowOrder=Näytä tilaus
-OrdersOpened=Orders to process
-NoDraftOrders=No draft orders
-NoOrder=No order
-NoSupplierOrder=No purchase order
-LastOrders=Latest %s sales orders
-LastCustomerOrders=Latest %s sales orders
-LastSupplierOrders=Latest %s purchase orders
+OrdersOpened=Käsittelyä odottavat tilaukset
+NoDraftOrders=Ei kesken olevia tilauksia
+NoOrder=Ei tilausta
+NoSupplierOrder=Ei ostotilausta
+LastOrders=Viimeisimmät %s Myyntitilaukset
+LastCustomerOrders=Viimeisimmät %s Myyntitilaukset
+LastSupplierOrders=Viimeisimmät %sOstotilaukset
 LastModifiedOrders=Viimeisimmät %s muokatut tilaukset
 AllOrders=Kaikki tilaukset
 NbOfOrders=Tilausten määrä
 OrdersStatistics=Tilausten tilastot
-OrdersStatisticsSuppliers=Purchase order statistics
+OrdersStatisticsSuppliers=Ostotilaus statistiikka
 NumberOfOrdersByMonth=Tilausmäärät kuukausittain
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+AmountOfOrdersByMonthHT=Kuukauden tilausten määrä (ilman alv)
 ListOfOrders=Tilausluettelo
 CloseOrder=Sulje tilaus
-ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrder=Oletko varma että haluat merkitä tilauksen toimitetuksi? Kun se on toimitettu niin sen voi laskuttaa.
 ConfirmDeleteOrder=Haluatko varmasti poistaa tämän tilauksen?
 ConfirmValidateOrder=Haluatko varmasti vahvistaa tämän tilauksen nimelle <b>%s</b>?
 ConfirmUnvalidateOrder=Haluatko varmasti palauttaa tilauksen <b>%s</b> luonnostilaan?
@@ -99,7 +101,7 @@ ConfirmMakeOrder=Haluatko varmasti vahvistaa tekemäsi tilauksen <b>%s</b>?
 GenerateBill=Luo lasku
 ClassifyShipped=Luokittele toimitetuksi
 DraftOrders=Tilausluonnokset
-DraftSuppliersOrders=Draft purchase orders
+DraftSuppliersOrders=Kesken olevat Ostotilaukset
 OnProcessOrders=Käsittelyssä olevat tilaukset
 RefOrder=Tilausviite
 RefCustomerOrder=Asiakkaan viite
@@ -128,9 +130,9 @@ TypeContact_commande_external_SHIPPING=Yhteystiedot asiakkaan toimitukseen
 TypeContact_commande_external_CUSTOMER=Asiakas ottaa yhteyttä seurantaan, jotta
 TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Edustaja toimitus seurantaan
-TypeContact_order_supplier_external_BILLING=Vendor invoice contact
-TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+TypeContact_order_supplier_external_BILLING=Toimittajan laskun kontakti
+TypeContact_order_supplier_external_SHIPPING=Toimittajan toimitus kontakti
+TypeContact_order_supplier_external_CUSTOMER=Toimittajan kontakti seurantaa varten
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Vakiota COMMANDE_SUPPLIER_ADDON ei ole määritelty
 Error_COMMANDE_ADDON_NotDefined=Vakiota COMMANDE_ADDON ei ole määritelty
 Error_OrderNotChecked=Yhtään tilausta ei ole valittuna laskulle
@@ -141,23 +143,24 @@ OrderByEMail=Sähköposti
 OrderByWWW=Online
 OrderByPhone=Puhelin
 # Documents models
-PDFEinsteinDescription=A complete order model 
-PDFEratostheneDescription=A complete order model
+PDFEinsteinDescription=Täydellinen tilausmalli (vanha Eratosthene template)
+PDFEratostheneDescription=Täydellinen tilausmalli
 PDFEdisonDescription=Yksinkertainen tilausmalli
-PDFProformaDescription=A complete Proforma invoice template
+PDFProformaDescription=Täydellinen Proforma lasku template
 CreateInvoiceForThisCustomer=Laskuta tilaukset
+CreateInvoiceForThisSupplier=Laskuta tilaukset
 NoOrdersToInvoice=Yhtään tilausta ei ole laskutettavaksi
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
+CloseProcessedOrdersAutomatically=Kuittaa kaikki valitut tilaukset.
+OrderCreation=Tilauksen muodostaminen
 Ordered=Tilattu
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
+OrderCreated=Tilauksesi on muodostettu
+OrderFail=Tapahtui virhe muodostettaessa tilausta.
+CreateOrders=Tee tilaukset
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
 OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
 IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
 CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
-SetShippingMode=Set shipping mode
+SetShippingMode=Anna rahtitapa
 WithReceptionFinished=With reception finished
 #### supplier orders status
 StatusSupplierOrderCanceledShort=Peruttu
@@ -179,7 +182,7 @@ StatusSupplierOrderCanceled=Peruttu
 StatusSupplierOrderDraft=Luonnos (vaatii vahvistuksen)
 StatusSupplierOrderValidated=Hyväksytty
 StatusSupplierOrderOnProcess=Tilattu - Odotaa vastaanottoa
-StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderOnProcessWithValidation=Tilattu - Odottaa saapumista tai validointia
 StatusSupplierOrderProcessed=Käsitelty
 StatusSupplierOrderToBill=Toimitettu
 StatusSupplierOrderApproved=Hyväksytty
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index d3b6219e6db..e56b76868d9 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Muuttanut %s
 ValidatedBy=Vahvistaja %s
+SignedBy=Signed by %s
 ClosedBy=Suljettu %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang
index 4e163e82e15..1b0614a2c73 100644
--- a/htdocs/langs/fi_FI/productbatch.lang
+++ b/htdocs/langs/fi_FI/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Käytä erää / sarjanumeroa
-ProductStatusOnBatch=Kyllä (erä / sarja käytössä)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=Ei (erä / sarja ei ole käytössä)
-ProductStatusOnBatchShort=Kyllä
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Ei
 Batch=Erä/Sarjanumero
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Moduulin erän / sarjan asetukset
 ShowCurrentStockOfLot=Näytä nykyinen varasto pari tuotetta / erää kohti
 ShowLogOfMovementIfLot=Näytä siirto lokit pari tuotetta / erää kohti
 StockDetailPerBatch=Varastotiedot erää kohden
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index ba1a344683f..9ea5a554395 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Valitse PDF tiedostot
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Yksikkö
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 3f9f197f844..1f49da052b2 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Tehtävälista
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=GANTT näkymä
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/fi_FI/propal.lang b/htdocs/langs/fi_FI/propal.lang
index 2f96f9ee357..b17b251df4d 100644
--- a/htdocs/langs/fi_FI/propal.lang
+++ b/htdocs/langs/fi_FI/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Lähetä tarjous postitse
 DatePropal=Tarjouspäivämäärä
 DateEndPropal=Viimeinen voimassaolopäivä
 ValidityDuration=Voimassaolo kesto
-CloseAs=Aseta tilaksi
 SetAcceptedRefused=Aseta hyväksytty/hylätty
 ErrorPropalNotFound=Propal %s ei löydy
 AddToDraftProposals=Lisää tarjousluonnos
@@ -60,6 +59,7 @@ ConfirmClonePropal=Haluatko varmasti monistaa tarjouksen <b>%s</b>?
 ConfirmReOpenProp=Haluatko varmasti avata uudestaan tarjouksen <b>%s</b>?
 ProposalsAndProposalsLines=Kaupalliset ehdotusta ja linjat
 ProposalLine=Tarjousrivi
+ProposalLines=Proposal lines
 AvailabilityPeriod=Saatavuus viive
 SetAvailability=Aseta saatavuus viive
 AfterOrder=tilauksesta
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Kirjallinen hyväksyntä, päivämäärä ja allekirjo
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index d244c5578d0..60d143e3df2 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -19,8 +19,8 @@ Stock=Kanta
 Stocks=Varastot
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lieu
-LocationSummary=Lyhyt nimi sijainti
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Kokonaismäärä tuotteet
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Varastot arvo
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual varastossa
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id-varasto
 DescWareHouse=Kuvaus varasto
 LieuWareHouse=Lokalisointi varasto
 WarehousesAndProducts=Varastot ja tuotteet
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Value
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Myynnin Yksikköhinta
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Varasto
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Uudelleenavaa
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index ced411126ca..9b8956498e0 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Toimittajat
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Toimittajan laskut
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=Historia
diff --git a/htdocs/langs/fi_FI/ticket.lang b/htdocs/langs/fi_FI/ticket.lang
index ff13c391829..b184456e137 100644
--- a/htdocs/langs/fi_FI/ticket.lang
+++ b/htdocs/langs/fi_FI/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Tyyppi
 Severity=Vakavuus
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Sähköpostin lähettäminen lipun viestistä
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Ota tämä vaihtoehto käyttöön, jos haluat lähettää sähköpostiviestin sähköpostiosoitteeseen "Ilmoitusviesti osoitteesta" (katso alla oleva asetus)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Aktivoi julkinen käyttöliittymä
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index bc2fe0013df..97f20b34cf5 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Poista ryhmästä
 PasswordChangedAndSentTo=Salasana muutettu ja <b>lähetetään %s.</b>
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Pyynnön vaihtaa <b>salasana %s lähetetään %s.</b>
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Käyttäjät & ryhmät
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain käyttäjän %s
 Reactivate=Uudelleenaktivoi
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Lupa myönnettiin, koska periytyy yhden käyttäjän ryhmä.
 Inherited=Peritty
+UserWillBe=Created user will be
 UserWillBeInternalUser=Luotu käyttäjä on sisäinen käyttäjä (koska ei liity erityistä kolmannelle osapuolelle)
 UserWillBeExternalUser=Luotu käyttäjä tulee ulkopuolinen käyttäjä (koska liittyy erityistä kolmannelle osapuolelle)
 IdPhoneCaller=Id puhelimeen soittajan
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 218d9313551..4bd6e9e73de 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Luettu
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/fi_FI/zapier.lang b/htdocs/langs/fi_FI/zapier.lang
index 4465a404aee..d485fc959cd 100644
--- a/htdocs/langs/fi_FI/zapier.lang
+++ b/htdocs/langs/fi_FI/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier Dolibarr:lle
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier Dolibarr-moduulille
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Zapier Dolibarr:lle asetukset
+ZapierForDolibarrSetup=Zapier Dolibarr:lle asetukset
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 5f291cc8cb7..11b91eb3db3 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - accountancy
 Processing=Exécution
 Lineofinvoice=Lignes de facture
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 Doctype=Type de document
 ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps
 TotalMarge=Marge de ventes totale
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index a497b785c93..4b1e1bad526 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -16,8 +16,7 @@ FormToTestFileUploadForm=Formulaire pour tester l'upload de fichiers (selon la c
 IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
 Module20Name=Propales
 Module30Name=Factures
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 Target=Objectif
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_BE/bills.lang b/htdocs/langs/fr_BE/bills.lang
index 6ec8a0357c9..a6a4763aef9 100644
--- a/htdocs/langs/fr_BE/bills.lang
+++ b/htdocs/langs/fr_BE/bills.lang
@@ -12,7 +12,6 @@ CorrectInvoice=Corriger facture %s
 CorrectionInvoice=Facture de correction
 UsedByInvoice=Utilisée pour payer la facture %s
 PredefinedInvoices=Factures prédéfinies
-SupplierBills=factures fournisseurs
 Payment=Paiement
 Payments=Paiements
 DeletePayment=Supprimer paiement
@@ -38,4 +37,3 @@ PaymentTypeShortLIQ=En espèces
 PaymentTypeCB=Carte de crédit
 PaymentTypeShortCB=Carte de crédit
 Cash=En espèces
-TerreNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn pour les factures et %syymm-nnnn pour les notes de crédits où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0
diff --git a/htdocs/langs/fr_BE/modulebuilder.lang b/htdocs/langs/fr_BE/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/fr_BE/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/fr_BE/products.lang b/htdocs/langs/fr_BE/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/fr_BE/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/fr_BE/withdrawals.lang b/htdocs/langs/fr_BE/withdrawals.lang
index 76b150a8eb2..eb336cadcc0 100644
--- a/htdocs/langs/fr_BE/withdrawals.lang
+++ b/htdocs/langs/fr_BE/withdrawals.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 StatusTrans=Envoyé
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index 62afd3dc49d..ef78367de7a 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -87,7 +87,6 @@ LineOfExpenseReport=Ligne de rapport de dépenses
 NoAccountSelected=Aucun compte comptable sélectionné
 VentilatedinAccount=Lié avec succès au compte comptable
 XLineFailedToBeBinded=%s produits / services n'étaient liés à aucun compte comptable
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencez le tri de la page "Reliure à faire" par les éléments les plus récents
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencez le tri de la page "Reliure faite" par les éléments les plus récents
 ACCOUNTING_LENGTH_DESCRIPTION=Tronquer la description des produits et services dans les listes après les caractères X (Best = 50)
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index ab2f51e65eb..4cd705f4634 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -59,7 +59,6 @@ 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>"
@@ -97,7 +96,6 @@ Module2660Name=WebServices appel ( client SOAP )
 Module4000Name=Gestion des ressources humaines
 Module10000Name=Sites Internet
 Module55000Name=Sondage, enquête ou vote
-Module59000Desc=Module to follow margins
 Permission45=Exportation de projets
 Permission76=Exporter des données
 Permission91=Consulter les charges et la TPS/TVH
@@ -161,10 +159,10 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Demandez une source d'entrepôt pour l'ordr
 ShippableOrderIconInList=Ajouter un icône dans la liste des commandes qui indique si la commande est expédiable.
 LDAPAdminDnExample=DN complet (ex: cn = admin, dc = exemple, dc = com ou cn = Administrateur, cn = Utilisateurs, dc = exemple, dc = com pour le répertoire actif)
 LDAPFieldTitle=Poste
+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.
 DefaultSortOrder=Ordres de tri par défaut
 DefaultFocus=Champs de mise au point par défaut
 MergePropalProductCard=Activez dans le produit/service, l'option onglet de fichiers attachés pour fusionner le produit PDF le document à la proposition PDF azur si le produit/service est dans la proposition
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseUnits=Définir une unité de mesure pour la quantité lors de la commande, l'édition de la proposition ou les lignes de facture
 IsNotADir=n'est pas un répertoire
 BarcodeDescDATAMATRIX=Codebarre de type Datamatrix
@@ -209,7 +207,6 @@ BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires
 BackgroundTableLineEvenColor=Couleur de fond même pour les lignes de table
 MinimumNoticePeriod=Période minimale de préavis  (Votre demande de congé doit être fait avant ce délai)
 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.
 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
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index f7dff6b4a4f..a08d3fbe9b5 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -77,10 +77,9 @@ PaymentTypeTRA=Procédure bancaire
 PaymentTypeShortTRA=Brouillon
 ChequeMaker=Émetteur du chèque/transfert
 DepositId=Identifiant de dépot
+CreditNoteConvertedIntoDiscount=Ce %s a été converti en %s
 YouMustCreateStandardInvoiceFirstDesc=Vous devez d'abord créer une facture standard et la convertir en «modèle» pour créer une nouvelle facture modèle
 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.
 situationInvoiceShortcode_S=D
@@ -92,4 +91,3 @@ ToCreateARecurringInvoice=Pour créer une facture récurrente pour ce contrat ,
 ToCreateARecurringInvoiceGene=Pour générer des factures à venir régulièrement et manuellement , allez dans le menu <strong>%s - %s - %s</strong>.
 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/categories.lang b/htdocs/langs/fr_CA/categories.lang
index ce7287abbe9..482ef9dfa42 100644
--- a/htdocs/langs/fr_CA/categories.lang
+++ b/htdocs/langs/fr_CA/categories.lang
@@ -2,7 +2,6 @@
 Rubriques=Tags/Catégories
 RubriquesTransactions=Tags / Catégories de transactions
 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
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index 67522c477f0..677933700ee 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -38,9 +38,7 @@ 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
-ConfirmDeleteSocialContribution=Êtes-vous sûr de vouloir supprimer cette charge sociale ?
 ExportDataset_tax_1=Charges sociales et paiements
 CalcModeVATDebt=Mode <b>%sTPS/TVH sur débit%s</b>.
 CalcModeVATEngagement=Mode <b>%s TPS/TVH sur encaissement%s</b>.
@@ -53,7 +51,6 @@ RulesVATDueServices=- Pour les services, le rapport inclut les TVA TAXES) des fa
 WarningDepositsNotIncluded=Les factures de acompte ne sont pas incluses dans cette version avec ce module de comptabilité.
 DatePaymentTermCantBeLowerThanObjectDate=La date limite de règlement ne peut être inférieure à la date de l'object
 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>.
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable par défaut pour payer la TVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable utilisé pour les tiers clients
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index 75d2c1a9515..c65ead929f9 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -56,7 +56,6 @@ CurrencyRate=Taux de conversion monétaire
 UseLocalTax=Inclure taxe
 UnitPriceTTC=Prix unitaire tx incl.
 PriceUHT=Prix
-PriceUHTCurrency=U.P (devise)
 PriceUTTC=P.U. (tx incl.)
 AmountTTCShort=Montant (tx incl.)
 AmountTTC=Montant (tx incl.)
diff --git a/htdocs/langs/fr_CA/margins.lang b/htdocs/langs/fr_CA/margins.lang
index b32e70a5949..afb4d8f174f 100644
--- a/htdocs/langs/fr_CA/margins.lang
+++ b/htdocs/langs/fr_CA/margins.lang
@@ -12,7 +12,6 @@ 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
@@ -25,7 +24,6 @@ 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
diff --git a/htdocs/langs/fr_CA/modulebuilder.lang b/htdocs/langs/fr_CA/modulebuilder.lang
index 2c9957b48a1..a482f9657e2 100644
--- a/htdocs/langs/fr_CA/modulebuilder.lang
+++ b/htdocs/langs/fr_CA/modulebuilder.lang
@@ -6,3 +6,4 @@ ModuleBuilderDeschooks=Cet onglet est dédié aux crochets.
 ModuleBuilderDescwidgets=Cet onglet est dédié à la gestion / création de widgets.
 DangerZone=Zone dangereuse
 DescriptionLong=Longue description
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/fr_CA/productbatch.lang b/htdocs/langs/fr_CA/productbatch.lang
index 84804506aca..128f91cc12c 100644
--- a/htdocs/langs/fr_CA/productbatch.lang
+++ b/htdocs/langs/fr_CA/productbatch.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - productbatch
 ManageLotSerial=Utilisation du lot / numéro de série
-ProductStatusOnBatch=Oui (lot / série requise)
 ProductStatusNotOnBatch=Non (lot / série non utilisé)
 Batch=Lot / série
 atleast1batchfield=Date de livraison ou date de vente ou Lot / Numéro de série
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
index c438e57c302..897ca360dc9 100644
--- a/htdocs/langs/fr_CA/products.lang
+++ b/htdocs/langs/fr_CA/products.lang
@@ -53,7 +53,6 @@ SetDefaultBarcodeType=Définir le type de code à barres
 BarcodeValue=Valeur du code à barres
 NoteNotVisibleOnBill=Note (non visible sur les factures, propositions ...)
 ServiceLimitedDuration=Si le produit est un service à durée limitée:
-AssociatedProductsAbility=Enable Kits (set of several products)
 ParentProductsNumber=Nombre de produits d'emballage pour les parents
 ParentProducts=Produits parentaux
 KeywordFilter=Filtre à mots clés
@@ -139,7 +138,6 @@ AddUpdater=Ajouter une mise à jour
 UpdateInterval=Intervalle de mise à jour (minutes)
 CorrectlyUpdated=Correctement mis à jour
 PropalMergePdfProductActualFile=Les fichiers utilisés pour ajouter au PDF Azur sont / sont
-IncludingProductWithTag=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
diff --git a/htdocs/langs/fr_CA/stocks.lang b/htdocs/langs/fr_CA/stocks.lang
index de1faa14427..e485e3a8efd 100644
--- a/htdocs/langs/fr_CA/stocks.lang
+++ b/htdocs/langs/fr_CA/stocks.lang
@@ -13,7 +13,6 @@ 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é
 MassStockTransferShort=Transfert de stock de masse
 NumberOfUnit=Nombre d'unités
 UnitPurchaseValue=Prix ​​unitaire d'achat
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
index 75020c6fcaf..d1c2577c8d4 100644
--- a/htdocs/langs/fr_CA/withdrawals.lang
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -56,7 +56,6 @@ SEPAFormYourBAN=Votre nom de compte bancaire (IBAN)
 SEPAFormYourBIC=Votre code d'identification de banque (BIC)
 ModeFRST=Paiement unique
 PleaseCheckOne=Veuillez cocher un seul
-ICS=Creditor Identifier CI for direct debit
 InfoCreditSubject=Paiement de l'ordre de paiement de débit direct %s par la banque
 InfoCreditMessage=La ligne de paiement de débit direct %s a été payée par la banque <br> Données de paiement: %s
 InfoTransSubject=Transmission de l'ordre de paiement de débit direct %s à la banque
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/fr_CH/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index b68a0680537..619ae5f8bd4 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CH/modulebuilder.lang b/htdocs/langs/fr_CH/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/fr_CH/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/fr_CH/products.lang b/htdocs/langs/fr_CH/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/fr_CH/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/fr_CH/withdrawals.lang b/htdocs/langs/fr_CH/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/fr_CH/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_CI/accountancy.lang b/htdocs/langs/fr_CI/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/fr_CI/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_CI/admin.lang b/htdocs/langs/fr_CI/admin.lang
index b68a0680537..619ae5f8bd4 100644
--- a/htdocs/langs/fr_CI/admin.lang
+++ b/htdocs/langs/fr_CI/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CI/modulebuilder.lang b/htdocs/langs/fr_CI/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/fr_CI/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/fr_CI/products.lang b/htdocs/langs/fr_CI/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/fr_CI/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/fr_CI/withdrawals.lang b/htdocs/langs/fr_CI/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/fr_CI/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_CM/accountancy.lang b/htdocs/langs/fr_CM/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/fr_CM/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_CM/admin.lang b/htdocs/langs/fr_CM/admin.lang
index b68a0680537..619ae5f8bd4 100644
--- a/htdocs/langs/fr_CM/admin.lang
+++ b/htdocs/langs/fr_CM/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CM/modulebuilder.lang b/htdocs/langs/fr_CM/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/fr_CM/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/fr_CM/products.lang b/htdocs/langs/fr_CM/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/fr_CM/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/fr_CM/withdrawals.lang b/htdocs/langs/fr_CM/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/fr_CM/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 3b2fc290352..68c6f4841c5 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -126,12 +126,12 @@ AccountBalance=Balance des comptes
 ObjectsRef=Référence de l'objet source
 CAHTF=Total achat fournisseur HT
 TotalExpenseReport=Total note de frais
-InvoiceLines=Lignes de factures à ventiler
+InvoiceLines=Lignes de factures à lier
 InvoiceLinesDone=Lignes de factures liées
 ExpenseReportLines=Lignes de notes de frais à lier
 ExpenseReportLinesDone=Lignes de notes de frais liées
 IntoAccount=Lier ligne avec le compte comptable
-TotalForAccount=Total compte comptable
+TotalForAccount=Total pour le compte comptable
 
 
 Ventilate=Lier
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Libellé journal
 NumPiece=Numéro de pièce
 TransactionNumShort=Num. transaction
-AccountingCategory=Groupes personnalisés
+AccountingCategory=Custom group
 GroupByAccountAccounting=Affichage par compte comptable
 GroupBySubAccountAccounting=Affichage par compte auxiliaire
 AccountingAccountGroupsDesc=Vous pouvez définir ici des groupes de comptes comptable. Il seront utilisés pour les reporting comptables personnalisés
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lignes non encore liées, utilisez le menu <a href="%
 
 ## Import
 ImportAccountingEntries=Écritures comptables
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date d'export
 WarningReportNotReliable=Attention : ce rapport n'est pas basé sur le grand livre et ne contient donc pas les écritures manuelles qui lui ont été ajoutées. Si votre journalisation est à jour, la vue depuis le grand livre sera plus précise.
 ExpenseReportJournal=Journal des notes de frais
 InventoryJournal=Journal d'inventaire
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index ef48fc0a82d..5d46f36ab0f 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Lever blocage des connexions
 YourSession=Votre session
 Sessions=Sessions utilisateurs
 WebUserGroup=Utilisateur/groupe du serveur Web
+PermissionsOnFiles=Permissions sur les fichiers
 PermissionsOnFilesInWebRoot=Permissions sur les fichiers du répertoire racine
 PermissionsOnFile=Permissions sur le fichier %s
 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).
@@ -57,11 +58,12 @@ SetupArea=Configuration
 UploadNewTemplate=Téléverser un / des nouveau(x) modèle(s)
 FormToTestFileUploadForm=Formulaire de test d'envoi de fichier (selon options choisies)
 ModuleMustBeEnabled=Le module <b>%s</b>doit être activé
-ModuleIsEnabled=Le module <b>%s</b>à été désactivé
+ModuleIsEnabled=Le module/application <b>%s</b> a été activé
 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é
+PHPSetup=PHP setup
 SecurityFilesDesc=Définissez ici les options de sécurité des téléchargements de fichiers
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Cet espace offre des fonctions d'administration diverses. Ut
 Purge=Purger
 PurgeAreaDesc=Cette page vous permet d'effacer tous les fichiers construits ou stockés par Dolibarr (fichiers temporaires ou tous les fichiers du répertoire <b>%s</b>). L'utilisation de cette fonction n'est pas nécessaire. Elle est fournie pour les utilisateurs qui hébergent Dolibarr chez un hébergeur qui n'offre pas les permissions de supprimer les fichiers sauvegardés par le serveur Web.
 PurgeDeleteLogFile=Effacer les fichiers de traces de debug, incluant <b>%s</b> défini dans le module 'Journaux et traces' (pas de risque de perte de données)
-PurgeDeleteTemporaryFiles=Effacer tous les fichiers de log et fichiers temporaires (pas de risque de perte de données). Le paramètre peut être 'tempfilesold', 'logfiles' ou les 2 'tempfilesold+logfiles'. Note : La suppression s'applique aux fichiers supprimés depuis plus de 24 heures.
+PurgeDeleteTemporaryFiles=Supprimer tous les fichiers journaux et temporaires (aucun risque de perte de données). Le paramètre peut être "tempfilesold", "logfiles" ou les deux "tempfilesold + logfiles". Remarque : la suppression des fichiers temporaires est effectuée uniquement si le répertoire temporaire qui le contient a été créé il y a plus de 24 heures.
 PurgeDeleteTemporaryFilesShort=Effacer les fichiers de log et fichiers temporaires
 PurgeDeleteAllFilesInDocumentsDir=Effacer tous les fichiers du répertoire <b>%s</b>. <br>Les fichiers temporaires mais aussi les fichiers «dumps» de sauvegarde de base de données, les fichiers joints aux éléments (tiers, factures, ...) ou fichiers stockés dans le module GED seront irrémédiablement effacés.
 PurgeRunNow=Lancer la purge maintenant
@@ -223,7 +225,7 @@ Nouveauté=Nouveauté
 AchatTelechargement=Acheter/télécharger
 GoModuleSetupArea=Pour déployer/installer un nouveau module, rendez vous dans la zone de configuration des modules : <a href="%s">%s</a>
 DoliStoreDesc=DoliStore, la place de marché officielle des modules et extensions complémentaires pour Dolibarr ERP/CRM
-DoliPartnersDesc=Liste de quelques sociétés qui peuvent fournir/développer des modules ou fonctions sur mesure. <br>Remarque: Dolibarr étant une application Open Source,<i>toute</i>société Open Source connaissant le langage PHP peut fournir du développement spécifique.
+DoliPartnersDesc=Liste de quelques sociétés qui peuvent fournir/développer des modules ou fonctions sur mesure. <br>Remarque: Dolibarr étant une application Open Source, <i>toute société</i> connaissant le langage PHP peut fournir du développement spécifique.
 WebSiteDesc=Sites fournisseurs à consulter pour trouver plus de modules (extensions)...
 DevelopYourModuleDesc=Quelques pistes pour développer votre propre module/application...
 URL=URL
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets disponibles
 BoxesActivated=Widgets activés
 ActivateOn=Activer sur
 ActiveOn=Active sur
+ActivatableOn=Activable sur
 SourceFile=Fichier source
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible uniquement si Javascript activé
 Required=Requis
@@ -284,7 +287,7 @@ MAIN_MAIL_SMTP_SERVER=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Par défa
 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=E-mail utilisé les retours d'erreur (champ "Errors-To" dans les e-mails envoyés)
+MAIN_MAIL_ERRORS_TO=E-mail utilisé pour les retours d'erreur (champ "Errors-To" dans les e-mails envoyés)
 MAIN_MAIL_AUTOCOPY_TO= Envoyer systématiquement une copie cachée (Bcc) des emails envoyés à
 MAIN_DISABLE_ALL_MAILS=Désactiver globalement tout envoi d'emails (pour mode test ou démos)
 MAIN_MAIL_FORCE_SENDTO=Envoyer tous les emails à (au lieu des vrais destinataires, à des fins de test)
@@ -349,7 +352,8 @@ UpdateServerOffline=Serveur de mise à jour hors ligne
 WithCounter=Gérer un compteur
 GenericMaskCodes=Vous pouvez saisir tout masque de numérotation. Dans ce masque, les balises suivantes peuvent être utilisées:<br><b>{000000}</b> correspond à un numéro qui sera incrémenté à chaque %s. Mettre autant de zéro que la longueur désirée du compteur. Le compteur sera complété par des 0 à gauche afin d'avoir autant de zéro que dans le masque.<br><b>{000000+000}</b> idem que précédemment mais un décalage correspondant au nombre à droite du + est appliqué dès la première %s.<br><b>{000000@x}</b> idem que précédemment mais le compteur est remis à zéro le xème mois de l'année (x entre 1 et 12, ou 0 pour utiliser le mois de début d'exercice fiscal défini dans votre configuration, ou 99 pour remise à zéro chaque mois). Si cette option est utilisée et x vaut 2 ou plus, alors la séquence {yy}{mm} ou {yyyy}{mm} est obligatoire. <br><b>{dd}</b> jour (01 à 31).<br><b>{mm}</b> mois (01 à 12).<br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> année sur 2, 4 ou 1 chiffres.<br>
 GenericMaskCodes2=<b>{cccc}</b> : code client sur n caractères<br><b>{cccc000}</b> : code client sur n caractères suivi d'un compteur propre au client. Ce compteur propre au client est remis à zéro en même temps que le compteur général.<br><b>{tttt}</b> code du type de tiers sur n caractères (Voir menu Accueil > Configuration > Dictionnaires > Types de tiers). Si vous ajoutez cet élément au masque de numérotation, le compteur sera différent pour chaque type de tiers.<br>
-GenericMaskCodes3=Tout autre caractère dans le masque sera laissé inchangé (sauf * ou ? en 13ème position en EAN13).<br>Les espaces ne sont pas permis.<br>En EAN13 le dernier caractère après la dernière } se plaçant en 13ème position<br>devra être * ou ? il sera remplacé par la clé calculée.<br>
+GenericMaskCodes3=Tout autre caractère dans le masque sera laissé inchangé.<br>Les espaces ne sont pas permis.<br>
+GenericMaskCodes3EAN=Tous les autres caractères du masque resteront intacts (sauf * ou ? en 13ème position dans EAN13). <br>Les espaces ne sont pas autorisés.<br> Dans EAN13, le dernier caractère après le dernier } en 13ème position doit être * ou ? . Il sera remplacé par la clé calculée.<br>
 GenericMaskCodes4a=<u>Exemple sur la 99eme %s du tiers LaCompanie faite le 31/01/2007:</u><br>
 GenericMaskCodes4b=<u>Exemple sur un tiers créé le 31/03/2007 :</u><br>
 GenericMaskCodes4c=<u>Exemple sur un produit/service créé le 31/03/2007 :</u><br>
@@ -445,7 +449,7 @@ ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur (où la cl
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpsellist=Les paramètres de la liste viennent d'une table<br>Syntax : table_name:label_field:id_field::filter<br>Exemple : c_typent:libelle:id::filter<br><br>- id_field est nécessairement une clé primaire de type int<br>- filter peut être un simple test (e.g. active=1 pour seulement montrer les valeurs actives)<br>Vous pouvez aussi utiliser $ID$ dans le filtre qui est le ID actuel de l'objet<br>Pour faire un SELECT dans le filtre, utilisez le mot clé $SEL$ pour passer outre la protection système anti-injection<br>Si vous voulez filtrer sur un extrafield, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'extrafield)<br><br>Pour avoir une liste qui dépend d'un autre attribut complémentaire:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Pour avoir une liste qui dépend d'une autre liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Les paramètres de la liste proviennent d'une table<br>:Syntaxe : nom_de_la_table:libelle_champ:id_champ::filtre<br>Exemple : c_typent:libelle:id::filter<br><br>le filtre peut n'est qu'un test (ex : active=1) pour n'afficher que les valeurs actives.<br>Vous pouvez aussi utiliser $ID$ dans les filtres pour indiquer l'ID de l'élément courant.<br>Pour utiliser un SELECT dans un filtre, utilisez $SEL$<br>Pour filtrer sur un attribut supplémentaire, utilisez la syntaxeextra.fieldcode=... (ou fieldcode est le code de l'attribut supplémentaire)<br><br>Pour afficher une liste dépendant d'un autre attribut supplémentaire : <br>c_typent:libelle:id:options_<i>code_liste_parente</i>|colonne_parente:filtre <br><br>Pour afficher une liste dépendant d'une autre liste : <br>c_typent:libelle:id:<i>code_liste_parente</i>|colonne_parente:filter
+ExtrafieldParamHelpchkbxlst=Les paramètres de la liste proviennent d'une table<br>:Syntaxe : nom_de_la_table:libelle_champ:id_champ::filtresql<br>Exemple : c_typent:libelle:id::filtresql<br><br>le filtre peut être un simple test (ex : active=1) pour n'afficher que les valeurs actives.<br>Vous pouvez aussi utiliser $ID$ dans les filtres pour indiquer l'ID de l'élément courant.<br>Pour utiliser un SELECT dans un filtre, utilisez $SEL$<br>Pour filtrer sur un attribut supplémentaire, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'attribut supplémentaire)<br><br>Pour afficher une liste dépendant d'un autre attribut supplémentaire : <br>c_typent:libelle:id:options_<i>code_list_parent</i>|colonne_parente:filtre <br><br>Pour afficher une liste dépendant d'une autre liste : <br>c_typent:libelle:id:<i>code_liste_parente</i>|colonne_parente:filter
 ExtrafieldParamHelplink=Les paramètres doivent être ObjectName:Classpath <br> Syntaxe: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Garder vide pour un simple séparateur <br> Définissez-le sur 1 pour un séparateur auto-déroulant (ouvert par défaut pour une nouvelle session, puis le statut est conservé pour la session de l'utilisateur) <br> Définissez ceci sur 2 pour un séparateur auto-déroulant (réduit par défaut pour une nouvelle session, puis l'état est conservé pour chaque session d'utilisateur).
 LibraryToBuildPDF=Bibliothèque utilisée pour la génération des PDF
@@ -510,7 +514,7 @@ WatermarkOnDraftExpenseReports=Filigrane sur les notes de frais
 AttachMainDocByDefault=Définissez cette valeur sur 1 si vous souhaitez joindre le document principal au courrier électronique par défaut (si applicable)
 FilesAttachedToEmail=Joindre le fichier
 SendEmailsReminders=Envoyer des rappels agenda par e-mails
-davDescription=Ajout d'un composant pour devenir un serveur DAV
+davDescription=Ajout d'un composant pour devenir un serveur WebDAV
 DAVSetup=Configuration du module DAV
 DAV_ALLOW_PRIVATE_DIR=Activer le répertoire privé générique (répertoire dédié WebDAV nommé "private" - identification requise)
 DAV_ALLOW_PRIVATE_DIRTooltip=Le répertoire privé générique est un répertoire WebDAV auquel tout le monde peut accéder avec son login / mot de passe.
@@ -541,6 +545,8 @@ Module40Name=Fournisseurs
 Module40Desc=Gestion des fournisseurs et des achats (commandes et factures fournisseurs)
 Module42Name=Journaux et traces de Debug
 Module42Desc=Systèmes de logs ( fichier, syslog,... ). De tels logs ont un but technique / de débogage.
+Module43Name=Barre de débogage
+Module43Desc=Un outil pour les développeurs ajoutant une barre de débogage dans votre navigateur.
 Module49Name=Éditeurs
 Module49Desc=Gestion des éditeurs
 Module50Name=Produits
@@ -590,7 +596,7 @@ Module320Desc=Ajout de flux d'informations RSS dans les écrans Dolibarr
 Module330Name=Marque-pages et raccourci
 Module330Desc=Créez des raccourcis, toujours accessibles, vers les pages internes ou externes auxquelles vous accédez fréquemment
 Module400Name=Projets ou Opportunités
-Module400Desc=Gestion des projets, opportunités/affaires et/ou tâches. Vous pouvez aussi assigner tous les autres éléments (facture, commande, proposition, intervention, ...) à un projet et avoir une vue transverse depuis la vue projet.
+Module400Desc=Gestion des projets, leads/opportunités/affaires et/ou tâches. Vous pouvez aussi assigner tous les autres éléments (facture, commande, proposition, intervention, ...) à un projet et avoir une vue transverse depuis la vue projet.
 Module410Name=Webcalendar
 Module410Desc=Interface avec le calendrier Webcalendar
 Module500Name=Taxes et dépenses spéciales
@@ -630,7 +636,7 @@ Module2600Name=API/Web services (serveur SOAP)
 Module2600Desc=Active le server SOAP Dolibarr fournissant des services API
 Module2610Name=API/Web services (serveur REST)
 Module2610Desc=Active le server REST Dolibarr fournissant des services API
-Module2660Name=Appelle de Webservices externes (client SOAP)
+Module2660Name=Appel de Webservices externes (client SOAP)
 Module2660Desc=Activez le client Dolibarr de services Web (Peut être utilisé pour pousser des données/demandes vers des serveurs externes. Seules les commandes Fournisseurs sont prises en charge pour le moment)
 Module2700Name=Gravatar
 Module2700Desc=Utilise le service en ligne Gravatar (www.gravatar.com) pour afficher les photos d'utilisateurs/adhérents (en fonction leur email). Besoin d'un accès Internet
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacités de conversion GeoIP Maxmind
 Module3200Name=Archives/Logs Inaltérables
 Module3200Desc=Active la journalisation de certains événements métiers dans une log/archive inaltérable. Les événements sont archivés en temps réel. L'archive est une table d'événements chaînés qui peut être lu uniquement et exporté. Ce module permet d'être compatible avec les exigences des lois de certains pays (comme par exemple la loi Finance 2016 ou norme 525 en France).
+Module3400Name=Réseaux sociaux
+Module3400Desc=Activez les champs de réseaux sociaux dans les tiers et les adresses (skype, twitter, facebook, ...).
 Module4000Name=GRH
 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
-Module6000Desc=Gestion du workflow (création automatique d'objet et / ou changement automatique d'état)
+Module6000Name=Workflow Inter-modules
+Module6000Desc=Gestion du workflow entre différents modules (création automatique d'objet et / ou de changement automatique d'état)
 Module10000Name=Sites web
 Module10000Desc=Créer des sites web (publiques) avec un éditeur WYSIWYG. Il s'agit d'un CMS orienté webmaster ou développeur (il est préférable de connaître les langages HTML et CSS). Il suffit de configurer votre serveur web (Apache, Nginx, ....) pour qu'il pointe vers le répertoire Dolibarr dédié afin de le faire fonctionner sur Internet avec votre propre nom de domaine.
 Module20000Name=Demandes de congés
@@ -805,7 +813,8 @@ 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=Étendre 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 projet, et les règles de visibilité et d'assignation du projet)
+Permission262=Étendre l'accès à tous les tiers ET leurs objets (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 projet, et les règles de visibilité et d'assignation du projet)
+Permission263=Étendre l'accès à tous les tiers SANS leurs objets (pas seulement les tiers pour lesquels l'utilisateur est un représentant commercial). <br> Non efficace pour les utilisateurs externes (toujours limités à eux-mêmes pour les propositions, commandes, factures, contrats, etc.). <br> Non efficace pour les projets (seules les règles sur les autorisations de projet, la visibilité et l'attribution sont importantes).
 Permission271=Consulter le chiffre d'affaires
 Permission272=Consulter les factures
 Permission273=Émettre les factures
@@ -875,7 +884,7 @@ Permission773=Supprimer les notes de frais
 Permission774=Lire toutes les notes de frais (même pour les utilisateurs en dehors de ma hierarchie)
 Permission775=Approuver les notes de frais
 Permission776=Payer les notes de frais
-Permission777=Lisez les notes de frais de tout le monde
+Permission777=Lire les notes de frais de tout le monde
 Permission778=Créer / modifier les notes de frais de tout le monde
 Permission779=Exporter les notes de frais
 Permission1001=Consulter les stocks
@@ -1175,7 +1184,8 @@ SetupDescription2=Les deux étapes obligatoires sont les deux premières entrée
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Paramètres basiques pour personnaliser le comportement par défaut du logiciel (comportement lié au pays par exemple).
 SetupDescription4=<a href="%s"> %s -> %s </a><br> <br>Ce logiciel est un ensemble de plusieurs modules/applications. Les fonctionnalités en rapport avec vos besoins doivent être activées et configurées. Les entrées menus seront ajoutées avec l'activation de ces modules.
 SetupDescription5=Les autres entrées de configuration gèrent des paramètres facultatifs.
-LogEvents=Événements d'audit de sécurité
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit de sécurité
 InfoDolibarr=Infos Dolibarr
 InfoBrowser=Infos navigateur
@@ -1197,7 +1207,7 @@ CompanyFundationDesc=Modifiez les informations de votre société/organisation.
 AccountantDesc=Si vous avez un comptable externe, vous pouvez saisir ici ses informations.
 AccountantFileNumber=Code comptable
 DisplayDesc=Vous pouvez choisir ici tous les paramètres liés à l'apparence de Dolibarr
-AvailableModules=Modules/applications installés
+AvailableModules=Modules/applications 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 (si la valeur est 0, cela signifie que le nettoyage des session est fait par un process externe).<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 une configuration extérieure,  quelle que soit la valeur saisie ici.
@@ -1261,7 +1271,7 @@ 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 que vous voulez gérer sur les %s.
+DefineHereComplementaryAttributes=Définissez des attributs supplémentaires ou personnalisés qui seront ajoutés a : %s.
 ExtraFields=Attributs supplémentaires
 ExtraFieldsLines=Attributs supplémentaires (lignes)
 ExtraFieldsLinesRec=Attributs supplémentaires (ligne de factures modèles)
@@ -1308,7 +1318,7 @@ YouUseBestDriver=Vous utilisez le driver %s qui est le driver recommandé actuel
 YouDoNotUseBestDriver=Vous utilisez le pilote %s mais le pilote %s est recommandé.
 NbOfObjectIsLowerThanNoPb=Vous avez seulement %s %s dans la base de données. Cela ne nécessite aucune optimisation particulière.
 SearchOptim=Optimisation des recherches
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=Vous avez %s %s dans la base de données. Vous devez ajouter la constante %s à 1 dans Accueil-Configuration-Autre. Ceci limite la recherche au début des chaînes, ce qui permet à la base de données d'utiliser des index et vous devriez obtenir une réponse immédiate.
 YouHaveXObjectAndSearchOptimOn=Vous avez %s %s dans la base de données et la constante %s est définie sur 1 dans Accueil-Configuration-Autre.
 BrowserIsOK=Vous utilisez le navigateur Web %s. Ce navigateur est correct pour la sécurité et la performance.
 BrowserIsKO=Vous utilisez le navigateur %s. Ce navigateur est déconseillé pour des raisons de sécurité, performance et qualité des pages restituées. Nous vous recommandons d'utiliser Firefox, Chrome, Opera ou Safari.
@@ -1326,7 +1336,7 @@ DocumentModules=Modèles de documents
 ##### Module password generation
 PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorythme interne de Dolibarr :%s caractères contenant chiffres et minuscules
 PasswordGenerationNone=Ne pas suggérer un mot de passe généré. Le mot de passe doit être entré manuellement. 
-PasswordGenerationPerso=Retourner un mot de passe en fonction de votre configuration personnellement défini.
+PasswordGenerationPerso=Renvoie un mot de passe en fonction d'une configuration personnalisée.
 SetupPerso=Selon votre configuration
 PasswordPatternDesc=Description du masque du mot de passe
 ##### Users setup #####
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Identifiant (unix)
 LDAPFieldLoginExample=Exemple : uid
 LDAPFilterConnection=Filtre de recherche
 LDAPFilterConnectionExample=Exemple : &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Exemple: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Identifiant (samba, activedirectory)
 LDAPFieldLoginSambaExample=Exemple : samaccountname
 LDAPFieldFullname=Prénom Nom
@@ -1570,7 +1581,7 @@ NotInstalled=Non installé.
 NotSlowedDownByThis=Non ralenti par cela.
 NotRiskOfLeakWithThis=Pas de risque de fuite de données avec 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.
+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 ici<a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">https://wiki.dolibarr.org/index.php/Module_MemCached</a>.<br>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
@@ -1599,9 +1610,9 @@ ProductServiceSetup=Configuration des modules Produits et Services
 NumberOfProductShowInSelect=Nombre maximum de produits dans les listes déroulantes (0=aucune limite)
 ViewProductDescInFormAbility=Afficher les descriptions de produits dans les formulaires (sinon, comme info-bulle contextuelle)
 DoNotAddProductDescAtAddLines=Ne pas ajouter la description du produit (saisie sur sa fiche) à l'ajout d'un produit
-OnProductSelectAddProductDesc=Comment utiliser la description des produits à leur ajout dans un ligne de document
+OnProductSelectAddProductDesc=Comment utiliser la description des produits lors de l'ajout d'un produit en tant que ligne d'un document
 AutoFillFormFieldBeforeSubmit=Remplir automatiquement le champ description avec la description du produit
-DoNotAutofillButAutoConcat=Ne pas remplir automatiquement le champ description avec la description du produit. La description sera concaténée à la description du produit.
+DoNotAutofillButAutoConcat=Ne pas remplir automatiquement le champ de saisie avec la description du produit. La description du produit sera concaténée automatiquement avec la description saisie.
 DoNotUseDescriptionOfProdut=La description du produit ne sera jamais ajoutée dans la description des lignes
 MergePropalProductCard=Ajoute dans l'onglet Fichiers joints des produits/services, une option pour fusionner le document PDF du produit au PDF des propositions Azur si le produit/services est inclut dans la proposition.
 ViewProductDescInThirdpartyLanguageAbility=Afficher la description des produits sur les formulaires dans la langue du tiers (sinon dans la langue de l'utilisateur)
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Votre société/institution est définie comme non assu
 AccountancyCode=Code comptable
 AccountancyCodeSell=Code comptable vente
 AccountancyCodeBuy=Code comptable achat
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Laissez la case à cocher "Créer automatiquement le paiement" vide par défaut lors de la création d'une nouvelle taxe
 ##### Agenda #####
 AgendaSetup=Configuration du module actions et agenda
 PasswordTogetVCalExport=Clé pour autoriser le lien d'exportation
+SecurityKey = Security Key
 PastDelayVCalExport=Ne pas exporter les événements de plus de
 AGENDA_USE_EVENT_TYPE=Utiliser les types d'événements (gérés dans le menu Configuration -> Dictionnaires -> Type d'événements de l'agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Configurez automatiquement cette valeur par défaut pour le type d'événement dans le formulaire de création d'événement.
@@ -1786,7 +1799,6 @@ 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 explorer et tester les API par l'URL
-SwaggerDescriptionFile=Swagger JSON description file of APIs
 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.
@@ -1880,7 +1892,7 @@ BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires des tables
 BackgroundTableLineEvenColor=Couleur de fond pour les lignes paires des tables
 MinimumNoticePeriod=Période de préavis minimum (Votre demande de congé doit être faite avant ce délai)
 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.
+EnterAnyCode=Ce champ contient une référence pour identifier l'enregistrement. Entrez une valeur de votre choix, mais sans caractères spéciaux.
 Enter0or1=Saisir 0 ou 1 
 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 au format HEX est, par exemple: FF0000
@@ -1967,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Marge bas sur les PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Hauteur du logo sur les PDFs
 NothingToSetup=Aucune configuration particulière n'est requise pour ce module.
 SetToYesIfGroupIsComputationOfOtherGroups=Réglez ceci sur Oui si ce groupe est un calcul d'autres groupes
-EnterCalculationRuleIfPreviousFieldIsYes=Entrez la règle de calcul si le champ précédent a été défini sur Oui (par exemple, 'CODEGRP1 + CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Entrez la règle de calcul si le champ précédent a été défini sur Oui.<br>Par exemple:<br>CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=Plusieurs variantes de langue trouvées
 RemoveSpecialChars=Supprimer les caractères spéciaux
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtre Regex pour nettoyer la valeur (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1983,7 +1995,7 @@ SocialNetworkSetup=Configuration du module Réseaux Sociaux
 EnableFeatureFor=Activer les fonctionnalités pour <strong> %s </strong>
 VATIsUsedIsOff=Remarque: l'option d'utilisation de la taxe de vente ou de la TVA a été définie sur <strong> Désactivée </strong> dans le menu %s - %s, aussi la taxe de vente ou la TVA utilisée sera toujours égale à 0 pour les ventes.
 SwapSenderAndRecipientOnPDF=Inverser la position des adresses expéditeurs et destinataires sur les documents PDF
-FeatureSupportedOnTextFieldsOnly=Attention, fonctionnalité prise en charge sur les champs de texte uniquement. De plus, un paramètre d'URL action=create ou action=edit doit être défini OU le nom de la page doit se terminer par 'new.php' pour déclencher cette fonctionnalité.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Collecteur de courrier électronique
 EmailCollectorDescription=Ajoute un travail planifié et une page de configuration pour analyser régulièrement les boîtes aux lettres (à l'aide du protocole IMAP) et enregistrer les courriers électroniques reçus dans votre application, au bon endroit et/ou créer automatiquement certains enregistrements (comme des opportunités).
 NewEmailCollector=Nouveau collecteur d'email
@@ -2050,8 +2062,11 @@ UseDebugBar=Utilisez la barre de débogage
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre de dernières lignes de logs à conserver dans la console
 WarningValueHigherSlowsDramaticalyOutput=Attention, les valeurs élevées ralentissent considérablement les affichages
 ModuleActivated=Le module %s est activé et ralentit l'interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Sur un environnement de production, vous devriez régler ce paramètre sur %s.
 AntivirusEnabledOnUpload=Antivirus activé sur le téléversement des fichiers
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Les modèles d'exportation sont partagés avec tout le monde
 ExportSetup=Configuration du module Export
 ImportSetup=Configuration du module Import
@@ -2075,6 +2090,8 @@ MakeAnonymousPing=Effectuez un ping «+1» anonyme sur le serveur de la fondatio
 FeatureNotAvailableWithReceptionModule=Fonction non disponible lorsque le module Réception est activée
 EmailTemplate=Modèle d'e-mail
 EMailsWillHaveMessageID=Les e-mails auront une étiquette 'References' correspondant à cette syntaxe
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Si vous souhaitez que certains textes de votre PDF soient dupliqués dans 2 langues différentes dans le même PDF généré, vous devez définir ici cette deuxième langue pour que le PDF généré contienne 2 langues différentes dans la même page, celle choisie lors de la génération du PDF et celle-ci (seuls quelques modèles PDF prennent en charge cette fonction). Gardez vide pour 1 langue par PDF.
 FafaIconSocialNetworksDesc=Entrez ici le code d'une icône FontAwesome. Si vous ne savez pas ce qu'est FontAwesome, vous pouvez utiliser la valeur générique fa-address-book.
 FeatureNotAvailableWithReceptionModule=Fonction non disponible lorsque le module Réception est activée
@@ -2089,10 +2106,19 @@ MailToSendEventPush=Rappel d'événement par e-mail
 SwitchThisForABetterSecurity=Remplacer cette valeur par %s est recommandé pour plus de sécurité
 DictionaryProductNature= Nature de produit
 CountryIfSpecificToOneCountry=Pays (si spécifique à un pays donné)
-YouMayFindSecurityAdviceHere=Trouvez ici des conseils de sécurité.
-ModuleActivatedMayExposeInformation=Ce module peut exposer des données sensibles. Si il n'est pas nécessaire, désactivez-le.
+YouMayFindSecurityAdviceHere=Vous trouverez ici des informations et conseils de sécurité.
+ModuleActivatedMayExposeInformation=Cette extension PHP peut exposer des données sensibles. Si vous n'en avez pas besoin, désactivez-la.
 ModuleActivatedDoNotUseInProduction=Un module conçu pour le développement a été activé. Ne l'activez pas sur un environnement de production
 CombinationsSeparator=Séparateur de caractères pour les combinaisons de produits
 SeeLinkToOnlineDocumentation=Suivez le lien vers la documentation en ligne depuis le menu du haut pour des exemples
 SHOW_SUBPRODUCT_REF_IN_PDF=Afficher les détails des sous-produits d'un kit dans les PDF si la fonctionnalité "%s" du module <b>%s</b> est activée.
 AskThisIDToYourBank=Contacter votre établissement bancaire pour obtenir ce code
+AdvancedModeOnly=Autorisation disponible en mode Autorisations avancées uniquement
+ConfFileIsReadableOrWritableByAnyUsers=Le fichier conf est lisible ou inscriptible par tous les utilisateurs. Donnez l'autorisation à l'utilisateur et au groupe du serveur Web uniquement.
+MailToSendEventOrganization=Organisation d'événements
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 7ecd5800861..0b4afd8e06e 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -4,7 +4,7 @@ Actions=Événements
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Calendrier interne
+LocalAgenda=Calendrier par défaut
 ActionsOwnedBy=Propriétaire de l'événement
 ActionsOwnedByShort=Propriétaire
 AffectedTo=Affecté à
@@ -20,7 +20,7 @@ MenuToDoActions=Événements incomplets
 MenuDoneActions=Événements terminés
 MenuToDoMyActions=Mes événem. incomplets
 MenuDoneMyActions=Mes événem. terminés
-ListOfEvents=Liste des événements (calendrier interne)
+ListOfEvents=Liste des événements (calendrier par défaut)
 ActionsAskedBy=Événements enregistrés par
 ActionsToDoBy=Événements affectés à
 ActionsDoneBy=Événements réalisés par
@@ -119,6 +119,7 @@ MRP_MO_UNVALIDATEInDolibarr=OF mis à l'état de brouillon
 MRP_MO_PRODUCEDInDolibarr=OF réalisé
 MRP_MO_DELETEInDolibarr=OF supprimé
 MRP_MO_CANCELInDolibarr=OF annulé
+PAIDInDolibarr=%s payé
 ##### End agenda events #####
 AgendaModelModule=Modèle de document pour les événements
 DateActionStart=Date de début
@@ -130,7 +131,7 @@ AgendaUrlOptions4=<b>logint=%s</b>pour limiter l'export aux actions assignées 
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> pour restreindre aux événements associés au projet <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> pour exclure les événements automatiques.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> pour inclure les événements de type congé.
-AgendaShowBirthdayEvents=Anniversaires de contacts
+AgendaShowBirthdayEvents=Anniversaires des contacts
 AgendaHideBirthdayEvents=Masquer les anniversaires de contacts
 Busy=Occupé
 ExportDataset_event1=Liste des événements de l'agenda
diff --git a/htdocs/langs/fr_FR/assets.lang b/htdocs/langs/fr_FR/assets.lang
index b3de8a0f525..d93545cb6a4 100644
--- a/htdocs/langs/fr_FR/assets.lang
+++ b/htdocs/langs/fr_FR/assets.lang
@@ -61,5 +61,7 @@ MenuListTypeAssets = Liste
 #
 # Module
 #
+Asset=Immobilisations
 NewAssetType=Nouveau type d'immobilisation
 NewAsset=Nouvelle immobilisation
+ConfirmDeleteAsset=Voulez-vous vraiment supprimer cet élément?
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index b6ccc999c82..e97c2480b1c 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Votre mandat SEPA
 FindYourSEPAMandate=Voici votre mandat SEPA pour autoriser notre société à réaliser les prélèvements depuis votre compte bancaire. Merci de retourner ce mandat signé (scan du document signé) ou en l'envoyant par courrier à 
 AutoReportLastAccountStatement=Remplissez automatiquement le champ 'numéro de relevé bancaire' avec le dernier numéro lors du rapprochement
 CashControl=Contrôle de caisse POS
-NewCashFence=Nouvelle clôture de caisse
+NewCashFence=Nouvelle ouverture ou clôture de caisse
 BankColorizeMovement=Coloriser les mouvements
 BankColorizeMovementDesc=Si cette fonction est activée, vous pouvez choisir une couleur de fond spécifique pour les mouvements de débit ou de crédit.
 BankColorizeMovementName1=Couleur de fond pour les mouvements de débit
 BankColorizeMovementName2=Couleur de fond pour le mouvement de crédit
 IfYouDontReconcileDisableProperty=Si vous ne réalisez pas le rapprochement bancaire sur certains comptes bancaires, désactivez la fonctionnalité "%s" pour ne plus afficher cette alerte.
 NoBankAccountDefined=Aucun compte bancaire défini
+NoRecordFoundIBankcAccount=Aucun enregistrement trouvé dans le compte bancaire. Généralement, cela se produit lorsqu'un enregistrement a été supprimé manuellement de la liste des transactions dans le compte bancaire (par exemple lors d'un rapprochement du compte bancaire). Une autre raison est que le paiement a été enregistré lorsque le module "%s" était désactivé.
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 342924e1680..4b321bd3464 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -54,9 +54,10 @@ InvoiceCustomer=Facture client
 CustomerInvoice=Facture client
 CustomersInvoices=Factures clients
 SupplierInvoice=Facture fournisseur
-SuppliersInvoices=Factures fournisseurs
+SuppliersInvoices=Factures fournisseur
+SupplierInvoiceLines=Lignes de facture fournisseur
 SupplierBill=Facture fournisseur
-SupplierBills=Factures fournisseurs
+SupplierBills=Factures fournisseur
 Payment=Règlement
 PaymentBack=Remboursement
 CustomerInvoicePaymentBack=Rembourser
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Versements déjà effectués
 PaymentsBackAlreadyDone=Remboursements déjà effectués
 PaymentRule=Mode de paiement
 PaymentMode=Mode de règlement
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Carte débit/crédit
 PaymentTypePP=PayPal
 IdPaymentMode=Type de paiement (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date de la dernière génération
 DateLastGenerationShort=Date de dernière génération
 MaxPeriodNumber=Nombre maximum de génération
 NbOfGenerationDone=Nombre de génération de facture déjà réalisées
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Nb de générations réalisée
 MaxGenerationReached=Nombre maximum de générations atteint
 InvoiceAutoValidate=Valider les factures automatiquement
@@ -450,7 +454,7 @@ RegulatedOn=Réglé le
 ChequeNumber=Chèque N°
 ChequeOrTransferNumber=Chèque/Virement N°
 ChequeBordereau=Vérifier
-ChequeMaker=Chèque/Virement N°
+ChequeMaker=Emetteur du chèque/virement
 ChequeBank=Banque du chèque
 CheckBank=Chèque
 NetToBePaid=Net à payer
@@ -464,7 +468,6 @@ PaymentByChequeOrderedToShort=Règlement TTC par chèque à l'ordre de
 SendTo=envoyé à
 PaymentByTransferOnThisBankAccount=Règlement par virement sur le compte bancaire suivant
 VATIsNotUsedForInvoice=* TVA non applicable art-293B du CGI
-VATIsNotUsedForInvoiceAsso=* TVA non applicable art-261-7 du CGI
 LawApplicationPart1=Par application de la loi 80.335 du 12/05/80
 LawApplicationPart2=les marchandises demeurent la propriété du
 LawApplicationPart3=vendeur jusqu'à complet encaissement de
@@ -484,7 +487,7 @@ ChequeDeposits=Dépôts de chèques
 Cheques=Chèques
 DepositId=Id dépôt
 NbCheque=Nombre de chèques
-CreditNoteConvertedIntoDiscount=Ce %s a été converti en %s
+CreditNoteConvertedIntoDiscount=Cette %s a été convertie en %s
 UsBillingContactAsIncoiveRecipientIfExist=Utiliser l'adresse du contact de type 'contact facturation' plutôt que l'adresse du tiers comme destinataire des factures
 ShowUnpaidAll=Afficher tous les impayés
 ShowUnpaidLateOnly=Afficher uniquement les factures impayées en retard
@@ -495,12 +498,16 @@ Cash=Liquide
 Reported=Différé
 DisabledBecausePayments=Non disponible car il existe des paiements
 CantRemovePaymentWithOneInvoicePaid=Suppression impossible quand il existe au moins une facture classée payée.
+CantRemovePaymentVATPaid=Impossible de supprimer le paiement car la déclaration de TVA est classée payée
+CantRemovePaymentSalaryPaid=Impossible de supprimer le paiement car le salaire est classé comme étant payé
 ExpectedToPay=Paiement attendu
 CantRemoveConciliatedPayment=Suppression d'un paiement rapproché impossible
 PayedByThisPayment=Règlé par ce paiement
 ClosePaidInvoicesAutomatically=Classer "Payée" toutes les factures standard, d'acompte ou de remplacement quand le paiement est complet.
 ClosePaidCreditNotesAutomatically=Classer automatiquement à "Payé" les factures d'avoirs quand le remboursement est complet.
 ClosePaidContributionsAutomatically=Classer automatiquement à "Payé" la contribution sociale ou fiscale quand les paiements sont complets.
+ClosePaidVATAutomatically=Classez automatiquement la déclaration de TVA comme «Payée» lorsque le paiement est entièrement effectué.
+ClosePaidSalaryAutomatically=Classez automatiquement le salaire comme «payé» lorsque le paiement est entièrement effectué.
 AllCompletelyPayedInvoiceWillBeClosed=Toutes les factures avec un reste à payer nul seront automatiquement fermées au statut "Payé".
 ToMakePayment=Payer
 ToMakePaymentBack=Rembourser
@@ -513,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Pour créer une facture modèle, vous deve
 PDFCrabeDescription=Modèle de facture PDF Crabe. Un modèle de facture complet (ancienne implémentation du modèle Sponge)
 PDFSpongeDescription=Modèle de facture PDF Sponge. Un modèle de facture complet
 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 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 retour à zéro.
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=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 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 retour à zéro.
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Raison de la clôture anticipée
 EarlyClosingComment=Note de clôture anticipée
 ##### Types de contacts #####
@@ -563,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Si vous avez besoin que de telles factures soi
 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)
+BillCreated=%s facture(s) générée(s)
+BillXCreated=Facture %s générée
 StatusOfGeneratedDocuments=Statut de génération du document
 DoNotGenerateDoc=Ne pas générer le fichier
 AutogenerateDoc=Auto-génerer le fichier
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 7fd402af050..e54f69e69bf 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistiques sur les principaux objets métier de la base de données
 BoxLoginInformation=Informations de connexion
 BoxLastRssInfos=Flux d'information RSS
 BoxLastProducts=Les %s derniers produits/services enregistrés
@@ -17,9 +18,13 @@ BoxLastActions=Derniers évènements
 BoxLastContracts=Derniers contrats
 BoxLastContacts=Derniers contacts/adresses
 BoxLastMembers=Derniers adhérents
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Dernières interventions
 BoxCurrentAccounts=Balance des comptes ouverts
 BoxTitleMemberNextBirthdays=Anniversaires de ce mois (adhérents)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Les %s dernières informations de %s
 BoxTitleLastProducts=Les %s derniers produits/services modifiés
 BoxTitleProductsAlertStock=Produits en alerte stock
@@ -95,8 +100,8 @@ LastXMonthRolling=Les %s derniers mois tournant
 ChooseBoxToAdd=Ajouter le widget au tableau de bord
 BoxAdded=Le widget a été ajouté dans votre tableau de bord
 BoxTitleUserBirthdaysOfMonth=Anniversaires de ce mois (utilisateurs)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
+BoxLastManualEntries=Dernières entrées en comptabilité saisies manuellement ou sans document source
+BoxTitleLastManualEntries=Les %s derniers enregistrements saisis manuellement ou sans document source
 NoRecordedManualEntries=Pas d'entrées manuelles en comptabilité
 BoxSuspenseAccount=Comptage des opérations de comptabilité avec compte d'attente
 BoxTitleSuspenseAccount=Nombre de lignes non allouées
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Les %s dernières expéditions clients
 NoRecordedShipments=Aucune expédition client
 BoxCustomersOutstandingBillReached=Clients dont l'en-cours de facturation est dépassé
 # Pages
-AccountancyHome=Comptabilité
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Espace Comptabilité
 ValidatedProjects=Projets validés
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 5e292b0b637..9e3d3fcbf62 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -56,7 +56,8 @@ Paymentnumpad=Type de pavé pour entrer le paiement
 Numberspad=Pavé numérique
 BillsCoinsPad=Pavé avec montant des Pièces et Billets
 DolistorePosCategory=Modules TakePOS et autres solutions de PDV pour Dolibarr
-TakeposNeedsCategories=TakePOS a besoin des catégories de produits pour fonctionner
+TakeposNeedsCategories=TakePOS a besoin d'au moins une catégorie de produits pour fonctionner
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS a besoin d'au moins 1 catégorie de produits dans la catégorie <b> %s </b> pour fonctionner
 OrderNotes=Notes de commande
 CashDeskBankAccountFor=Compte par défaut à utiliser pour les paiements en
 NoPaimementModesDefined=Aucun mode de paiement défini dans la configuration de TakePOS
@@ -99,7 +100,7 @@ CashDeskRefNumberingModules=Module de numérotation pour le POS
 CashDeskGenericMaskCodes6 = <br>La balise <b> {TN} </b> est utilisée pour ajouter le numéro de terminal
 TakeposGroupSameProduct=Regrouper les mêmes lignes de produits
 StartAParallelSale=Lancer une nouvelle vente en parallèle
-SaleStartedAt=Ventes démarrées le %s
+SaleStartedAt=Ventes démarrées à %s
 ControlCashOpening=Pop-up de contrôle de caisse à l'ouverture du POS
 CloseCashFence=Clôturer la caisse
 CashReport=Rapport de caisse
@@ -124,3 +125,5 @@ ModuleReceiptPrinterMustBeEnabled=Le module Imprimante de reçus doit d'abord av
 AllowDelayedPayment=Autoriser le paiement différé
 PrintPaymentMethodOnReceipts=Imprimer le mode de paiement sur les tickets | reçus
 WeighingScale=échelle de poids
+ShowPriceHT = Afficher la colonne prix hors taxes
+ShowPriceHTOnReceipt = Afficher la colonne prix hors taxes à la réception
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index a28bf476eeb..872d04cfa1b 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Espace tags/catégories de fournisseurs
 CustomersCategoriesArea=Espace tags/catégories de clients
 MembersCategoriesArea=Espace tags/catégories adhérents
 ContactsCategoriesArea=Espace tags/catégories de contacts
-AccountsCategoriesArea=Espace des tags/categories
+AccountsCategoriesArea=Espace des tags/categories de comptes bancaires
 ProjectsCategoriesArea=Zone des tags/catégories des projets
 UsersCategoriesArea=Espace tags/catégories des utlisateurs
 SubCats=Sous-catégories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assigner cette catégorie au fournisseur
 ShowCategory=Afficher tag/catégorie
 ByDefaultInList=Par défaut dans la liste
 ChooseCategory=Choisissez une catégorie
-StocksCategoriesArea=Catégories d'entrepôts
-ActionCommCategoriesArea=Catégories d'évènements
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Catégories des pages-conteneurs
 UseOrOperatorForCategories=Utiliser l'opérateur 'ou' pour les catégories
diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang
index badec05e8c2..d663185936b 100644
--- a/htdocs/langs/fr_FR/commercial.lang
+++ b/htdocs/langs/fr_FR/commercial.lang
@@ -68,6 +68,7 @@ ActionAC_OTH_AUTO=Autre auto
 ActionAC_MANUAL=Événements insérés manuellement
 ActionAC_AUTO=Événements insérés automatiquement
 ActionAC_OTH_AUTOShort=Autre
+ActionAC_EVENTORGANIZATION=Événements d'organisation d'événements
 Stats=Statistiques de vente
 StatusProsp=Status prospection
 DraftPropals=Propositions brouillons
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index c07b5c4611f..d4a26e93344 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -45,6 +45,7 @@ ParentCompany=Maison mère
 Subsidiaries=Filiales
 ReportByMonth=Rapport par mois
 ReportByCustomers=Rapport par client
+ReportByThirdparties=Report per thirdparty
 ReportByQuarter=Rapport par taux
 CivilityCode=Code civilité
 RegisteredOffice=Siège social
@@ -172,14 +173,20 @@ ProfId1ES=Id. prof. 1 (CIF/NIF)
 ProfId2ES=Id. prof. 2 (Num. sécurité social)
 ProfId3ES=Id. prof. 3 (CNAE)
 ProfId4ES=Id. prof. 4 (Num. Collégiale)
-ProfId5ES=Numéro EORI
+ProfId5ES=Prof Id 5 (numéro EORI)
 ProfId6ES=-
 ProfId1FR=Id. prof. 1 (SIREN)
 ProfId2FR=Id. prof. 2 (SIRET)
 ProfId3FR=Id. prof. 3 (NAF-APE)
 ProfId4FR=Id. prof. 4 (RCS/RM)
-ProfId5FR=Numéro EORI
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Numéro d'enregistrement
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=Numéro EORI
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Id. prof. 1 (NIPC)
 ProfId2PT=Id. prof. 2 (Num. sécurité social)
 ProfId3PT=Id. prof. 3 (Num. enreg. commercial)
 ProfId4PT=Id. prof. 4 (Conservatory)
-ProfId5PT=Numéro EORI
+ProfId5PT=Prof Id 5 (numéro EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Id. prof. 1 (CUI)
 ProfId2RO=Id. prof. 2 (Nr. Înmatriculare)
 ProfId3RO=Id. prof. 3 (CAEN)
 ProfId4RO=Id prof 5 (EUID)
-ProfId5RO=Numéro EORI
+ProfId5RO=Prof Id 5 (numéro EORI)
 ProfId6RO=-
 ProfId1RU=Id. prof.1 (OGRN)
 ProfId2RU=Id. prof.2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Montant encours
 OutstandingBill=Montant encours autorisé
 OutstandingBillReached=Montant encours autorisé dépassé
 OrderMinAmount=Montant minimum pour la commande
-MonkeyNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn pour les codes clients et %syymm-nnnn pour les codes fournisseurs où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Code libre sans vérification. Peut être modifié à tout moment.
 ManagingDirectors=Nom du(des) gestionnaire(s) (PDG, directeur, président...)
 MergeOriginThirdparty=Tiers en doublon (le tiers que vous voulez supprimer)
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 648d8541d28..38574580e7b 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=TVA sur les achats
 VATCollected=TVA récupérée
 StatusToPay=A payer
 SpecialExpensesArea=Espace des paiements particuliers
+VATExpensesArea=Espace pour tous les paiements de TVA
 SocialContribution=Charge sociale ou fiscale
 SocialContributions=Charges fiscales ou sociales
 SocialContributionsDeductibles=Charge ou taxe déductible
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Règlement facture client
 PaymentSupplierInvoice=Règlement facture fournisseur
 PaymentSocialContribution=Paiement de charges fiscales/sociales
 PaymentVat=Règlement TVA
+AutomaticCreationPayment=Enregistrez automatiquement le paiement
 ListPayment=Liste des règlements
 ListOfCustomerPayments=Liste des règlements clients
 ListOfSupplierPayments=Liste des règlements fournisseurs
@@ -104,6 +106,8 @@ LT2PaymentES=Règlement IRPF
 LT2PaymentsES=Règlements IRPF
 VATPayment=Règlement TVA
 VATPayments=Règlements TVA
+VATDeclarations=Déclarations de TVA
+VATDeclaration=Déclaration de TVA
 VATRefund=Remboursement TVA
 NewVATPayment=Nouveau paiement de TVA
 NewLocalTaxPayment=Nouveau paiement charge %s
@@ -134,9 +138,17 @@ NoWaitingChecks=Pas de chèques en attente de remise
 DateChequeReceived=Date réception chèque
 NbOfCheques=Nb de chèques
 PaySocialContribution=Payer une charge sociale/fiscale
-ConfirmPaySocialContribution=Êtes-vous sûr de vouloir classer cette charge sociale ou fiscale à payée ?
+PayVAT=Payer une déclaration de TVA
+PaySalary=Payer un salaire
+ConfirmPaySocialContribution=Voulez-vous vraiment classer cette taxe sociale ou fiscale comme payée?
+ConfirmPayVAT=Voulez-vous vraiment classer cette déclaration de TVA comme payée ?
+ConfirmPaySalary=Voulez-vous vraiment classer ce salaire comme payée ?
 DeleteSocialContribution=Effacer une charge fiscale ou sociale
-ConfirmDeleteSocialContribution=Êtes-vous sûr de vouloir supprimer ce paiement de taxe sociale/fiscale ?
+DeleteVAT=Supprimer une déclaration de TVA
+DeleteSalary=Supprimer un salaire
+ConfirmDeleteSocialContribution=Voulez-vous vraiment supprimer ce paiement de taxe sociale / fiscale?
+ConfirmDeleteVAT=Voulez-vous vraiment supprimer cette déclaration de TVA ?
+ConfirmDeleteSalary=Êtes-vous sûr de vouloir supprimer ce salaire ?
 ExportDataset_tax_1=Taxes sociales et fiscales et paiements
 CalcModeVATDebt=Mode <b>%sTVA sur débit%s</b>.
 CalcModeVATEngagement=Mode <b>%sTVA sur encaissement%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- Il comprend les paiements réels effectués sur les factures,
 RulesCADue=- Il inclut les factures clients dues, qu'elles soient payées ou non.<br>- Il se base sur la date de facturation de ces factures.<br>
 RulesCAIn=- Il inclut les règlements effectivement reçus des factures clients.<br>- Il se base sur la date de règlement de ces factures<br>
 RulesCATotalSaleJournal=Il comprend toutes les lignes du journal de vente.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité qui ont le groupe "EXPENSE" ou "INCOME"
 RulesResultBookkeepingPredefined=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité qui ont le groupe "EXPENSE" ou "INCOME"
 RulesResultBookkeepingPersonalized=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité <b>regroupés par les groupes personnalisés</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Rapport TVA par Tiers
 VATReportByCustomers=Rapport par client
 VATReportByCustomersInInputOutputMode=Rapport par client des TVA collectées et payées
 VATReportByQuartersInInputOutputMode=Rapport par taux des TVA collectées et payées
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Rapport Tax 2 par Taux
 LT2ReportByQuarters=Rapport Tax 3 par Taux
 LT1ReportByQuartersES=Rapport par taux de RE
@@ -217,7 +231,7 @@ Pcg_subtype=Sous classe de compte
 InvoiceLinesToDispatch=Lignes de factures à ventiler
 ByProductsAndServices=Par produit et service
 RefExt=Référence externe
-ToCreateAPredefinedInvoice=Pour créer une facture modèle, créez d'abord une facture standard, puis, avant la validation, cliquez sur le bouton %s.
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Lier à une commande
 Mode1=Mode 1
 Mode2=Mode 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Le compte comptable dédié défini sur la fich
 ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable utilisé pour les tiers fournisseur
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Le compte de comptabilité dédié défini sur la fiche Tiers sera utilisé pour la comptabilité auxiliaire uniquement. Celui-ci sera utilisé pour le grand livre et comme valeur par défaut de la comptabilité auxiliaire si le compte de comptabilité fournisseur dédié au tiers n'est pas défini.
 ConfirmCloneTax=Confirmer le clonage de la charge sociale/fiscale
+ConfirmCloneVAT=Confirmer le clonage d'une déclaration de TVA
+ConfirmCloneSalary=Confirmer le clonage d'un salaire
 CloneTaxForNextMonth=Cloner pour le mois suivant
 SimpleReport=Rapport simple
 AddExtraReport=Rapports complémentaires (Ajouter le rapport client local et international)
@@ -253,7 +269,8 @@ AccountingAffectation=Compte affecté
 LastDayTaxIsRelatedTo=Dernier jour de la période pour laquelle la taxe est due
 VATDue=TVA réclamée
 ClaimedForThisPeriod=Réclamé pour la période
-PaidDuringThisPeriod=Payé durant la période
+PaidDuringThisPeriod=Payé pour cette période
+PaidDuringThisPeriodDesc=Il s'agit de la somme de tous les paiements liés aux déclarations de TVA qui ont une date de fin de période dans la plage de dates sélectionnée
 ByVatRate=Par taux de TVA
 TurnoverbyVatrate=Chiffre d'affaire facturé par taux de TVA
 TurnoverCollectedbyVatrate=Chiffre d'affaires encaissé par taux de TVA
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Chiffre d'affaires d'achat collecté
 RulesPurchaseTurnoverDue=- Il comprend les factures dues par le fournisseur, qu'elles soient payées ou non. <br> - Il est basé sur la date de facturation de ces factures. <br>
 RulesPurchaseTurnoverIn=- Il comprend tous les paiements effectifs des factures effectuées aux fournisseurs. <br> - Il est basé sur la date de paiement de ces factures <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Il comprend toutes les lignes de débit du journal d'achat.
+RulesPurchaseTurnoverOfExpenseAccounts=Il comprend (débit - crédit) des lignes pour les comptes produits dans le groupe EXPENSE
 ReportPurchaseTurnover=Chiffre d'affaires d'achat facturé
 ReportPurchaseTurnoverCollected=Chiffre d'affaires d'achat encaissé
 IncludeVarpaysInResults = Inclure les paiements divers dans les rapports
diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang
index 4464246f024..9b29059e039 100644
--- a/htdocs/langs/fr_FR/donations.lang
+++ b/htdocs/langs/fr_FR/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Créer un don
 NewDonation=Nouveau don
 DeleteADonation=Effacer le don
 ConfirmDeleteADonation=Êtes-vous sûr de vouloir supprimer ce don ?
-ShowDonation=Montrer don
 PublicDonation=Don public
 DonationsArea=Espace dons
 DonationStatusPromiseNotValidated=Promesse non validée
@@ -33,3 +32,4 @@ DONATION_ART238=Afficher article 238 du CGI si vous êtes concernés
 DONATION_ART885=Afficher article 885 du CGI si vous êtes concernés
 DonationPayment=Paiement du don
 DonationValidated=Don %s validé
+DonationUseThirdparties=Utiliser un tiers existant comme coordonnées des donateurs
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index 37fb3ee4a69..3e6e3e37bad 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Fichier non indexé dans la base de données. Télé
 ExtraFieldsEcmFiles=Attributs supplémentaires des fichiers de la GED
 ExtraFieldsEcmDirectories=Attributs supplémentaires des dossiers de la GED
 ECMSetup=Configuration du module de gestion de documents (GED)
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index f2e046506f7..072653e95b5 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -8,7 +8,7 @@ ErrorBadEMail=email %s invalide
 ErrorBadMXDomain=L'adresse e-mail %s ne semble pas correcte (le domaine n'a pas d'enregistrement MX valide)
 ErrorBadUrl=Url %s invalide
 ErrorBadValueForParamNotAString=Mauvaise valeur de paramètre. Ceci arrive lors d'une tentative de traduction d'une clé non renseignée.
-ErrorRefAlreadyExists=La référence <b>%s</b> existe déjà.
+ErrorRefAlreadyExists=Le référence <b>%s</b> existe déjà.
 ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
 ErrorRecordNotFound=Enregistrement non trouvé.
@@ -59,6 +59,7 @@ ErrorDirNotFound=Répertoire <b>%s</b> introuvable (Mauvais chemin, permissions
 ErrorFunctionNotAvailableInPHP=La fonction <b>%s</b> est requise pour cette fonctionnalité mais n'est pas disponible dans cette version/installation de PHP.
 ErrorDirAlreadyExists=Un répertoire portant ce nom existe déjà.
 ErrorFileAlreadyExists=Un fichier portant ce nom existe déjà.
+ErrorDestinationAlreadyExists=Un fichier portant le nom <b>%s</b> existe déjà.
 ErrorPartialFile=Fichier non reçu intégralement par le serveur.
 ErrorNoTmpDir=Répertoire temporaire de réception %s inexistant.
 ErrorUploadBlockedByAddon=Upload bloqué par un plugin PHP/Apache.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Erreur lors du chargement du tableau de compte. Si certains
 ErrorBadSyntaxForParamKeyForContent=Mauvaise syntaxe pour le paramètre keyforcontent. La valeur doit commencer par %s ou %s
 ErrorVariableKeyForContentMustBeSet=Erreur, la constante nommée %s (avec le contenu de texte à afficher) ou %s (avec l'adresse externe à afficher) doit être fixée.
 ErrorURLMustStartWithHttp=L'URL %s doit commencer par http:// ou https://
+ErrorHostMustNotStartWithHttp=L'URL %s ne doit PAS commencer par http:// ou https://
 ErrorNewRefIsAlreadyUsed=Erreur, la nouvelle référence est déjà utilisée
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erreur, supprimer le paiement lié à une facture clôturée n'est pas possible.
 ErrorSearchCriteriaTooSmall=Critère de recherche trop petit.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=L’interface publique n’a pas été activée
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=La langue d'une nouvelle page, si elle est la traduction d'une autre page, doit être définie
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=La langue d'une nouvelle page, si elle est définie comme traduction d'une autre page, ne peut pas être la langue principale.
 ErrorAParameterIsRequiredForThisOperation=Un paramètre est obligatoire pour cette opération
+ErrorDateIsInFuture=Erreur, la date ne peut pas être dans le futur.
+ErrorAnAmountWithoutTaxIsRequired=Erreur, le montant est obligatoire
+ErrorAPercentIsRequired=Erreur, le pourcentage doit être indiqué correctement.
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Avertissement, échec de l’ajout d’u
 WarningTheHiddenOptionIsOn=Attention, l'option cachée <b>%s</b> est activée
 WarningCreateSubAccounts=Attention, vous ne pouvez pas créer directement un compte auxiliaire, vous devez créer un tiers ou un utilisateur et leur attribuer un code comptable pour les retrouver dans cette liste
 WarningAvailableOnlyForHTTPSServers=Disponible uniquement si une connexion sécurisée HTTPS est utilisée
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=Le propriétaire de l'utilisateur est requis
+ErrorActionCommBadType=Le type d'événement sélectionné (id: %n, code: %s) n'existe pas dans le dictionnaire des types d'événement
diff --git a/htdocs/langs/fr_FR/externalsite.lang b/htdocs/langs/fr_FR/externalsite.lang
index 63194e8b836..04f3ebd8fc8 100644
--- a/htdocs/langs/fr_FR/externalsite.lang
+++ b/htdocs/langs/fr_FR/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Configuration du lien vers le site externe
-ExternalSiteURL=URL du site externe
+ExternalSiteURL=URL du site externe du contenu iFrame HTML
 ExternalSiteModuleNotComplete=La configuration du module "Site externe" est incomplète.
 ExampleMyMenuEntry=Mon entrée de menu
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index fe9dff2d86f..718123f56b0 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -9,7 +9,7 @@ AddCP=Créer une demande de congés
 DateDebCP=Date Début
 DateFinCP=Date Fin
 DraftCP=Brouillon
-ToReviewCP=En attente d'approbation
+ToReviewCP=En approbation
 ApprovedCP=Approuvée
 CancelCP=Annulée
 RefuseCP=Refusée
@@ -80,9 +80,9 @@ UserCP=Utilisateur
 ErrorAddEventToUserCP=Une erreur est survenue durant l'ajout du congé exceptionnel.
 AddEventToUserOkCP=L'ajout du congé exceptionnel à bien été effectué.
 MenuLogCP=Voir historique modif.
-LogCP=Historique de la mise à jours de jours de congés disponibles
+LogCP=Historique des mises à jour de jours de congés disponibles
 ActionByCP=Réalisée par
-UserUpdateCP=Pour l'utilisateur
+UserUpdateCP=Mis à jour pour
 PrevSoldeCP=Précédent Solde
 NewSoldeCP=Nouveau Solde
 alreadyCPexist=Une demande de congés a déjà été faite sur cette période.
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 3788acb53c4..5408ca6e4c7 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -129,7 +129,7 @@ Notifications=Notifications
 NotificationsAuto=Notifications automatiques
 NoNotificationsWillBeSent=Aucune notification automatique prévue pour ce type d'événement et de tiers.
 ANotificationsWillBeSent=1 notification automatique sera envoyée par e-mail
-SomeNotificationsWillBeSent=%s notification(s) automatique(s) sera enviyée par e-mail
+SomeNotificationsWillBeSent=%s notification(s) automatique(s) sera(seront) envoyée(s) par e-mail
 AddNewNotification=Souscrire à une nouvelle notification automatique (cible/évènement)
 ListOfActiveNotifications=Liste de toutes les souscriptions (cibles/évènements) pour des notifications emails automatiques
 ListOfNotificationsDone=Liste des toutes les notifications automatiques envoyées par e-mail
@@ -175,5 +175,5 @@ Answered=Répondu
 IsNotAnAnswer=N'est pas une réponse (e-mail initial)
 IsAnAnswer=Est une réponse à un e-mail initial
 RecordCreatedByEmailCollector=Enregistrement créé par le Collecteur d'e-mails%s depuis l'email %s
-DefaultBlacklistMailingStatus=Statut par défaut des contacts qui refusent les emailing
+DefaultBlacklistMailingStatus=Statut par défaut des contacts pour refuser les emailing
 DefaultStatusEmptyMandatory=Vide mais obligatoire
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index a8b13c7e914..32ee14fb0c7 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -278,7 +278,7 @@ DateModificationShort=Date modif.
 IPModification=Modification IP
 DateLastModification=Date de dernière modification
 DateValidation=Date validation
-DateSigning=Date signature
+DateSigning=Date de signature
 DateClosing=Date clôture
 DateDue=Date échéance
 DateValue=Date valeur
@@ -362,7 +362,7 @@ UnitPriceHTCurrency=Prix ​​unitaire (HT) (devise)
 UnitPriceTTC=Prix unitaire TTC
 PriceU=P.U.
 PriceUHT=P.U. HT
-PriceUHTCurrency=P.U. HT (devise)
+PriceUHTCurrency=P.U net (devise)
 PriceUTTC=P.U TTC
 Amount=Montant
 AmountInvoice=Montant facture
@@ -390,6 +390,8 @@ AmountTotal=Montant total
 AmountAverage=Montant moyen
 PriceQtyMinHT=Prix quantité min. HT
 PriceQtyMinHTCurrency=Prix quantité min. (HT) (devise)
+PercentOfOriginalObject=Pourcentage de l'objet d'origine
+AmountOrPercent=Montant ou pourcentage
 Percentage=Pourcentage
 Total=Total
 SubTotal=Sous-total
@@ -549,7 +551,7 @@ 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
+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 
 NoItemLate=Aucun élément en retard
 Photo=Photo
 Photos=Photos
@@ -725,7 +727,7 @@ MenuMembers=Adhérents
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Charges | Dépenses spéciales
 ThisLimitIsDefinedInSetup=Limite Dolibarr (Menu accueil-configuration-sécurité): %s Ko, Limite PHP: %s Ko
-NoFileFound=Pas de documents stockés dans cette rubrique
+NoFileFound=Pas de documents téléversés
 CurrentUserLanguage=Langue utilisateur actuelle
 CurrentTheme=Thème courant
 CurrentMenuManager=Gestionnaire de menu courant
@@ -900,8 +902,10 @@ ViewAccountList=Voir le grand livre
 ViewSubAccountList=Voir le grand livre auxiliaire
 RemoveString=Supprimer la chaine '%s'
 SomeTranslationAreUncomplete=Certaines des langues proposées peuvent n'être traduites que partiellement ou contenir des erreurs. Aidez-nous à corriger votre langue en vous inscrivant à l'adresse <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/</a> pour ajouter vos améliorations.
-DirectDownloadLink=Lien de téléchargement direct (public/externe)
-DirectDownloadInternalLink=Lien de téléchargement direct (requiert d'être logué et autorisé)
+DirectDownloadLink=Lien de téléchargement public
+PublicDownloadLinkDesc=Seul le lien est nécessaire pour télécharger le fichier
+DirectDownloadInternalLink=Lien de téléchargement privé
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Téléchargement
 DownloadDocument=Télécharger le document
 ActualizeCurrency=Mettre à jour le taux de devise
@@ -1014,7 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Adhérents
 SearchIntoUsers=Utilisateurs
 SearchIntoProductsOrServices=Produits ou services
-SearchIntoBatch=Lots / N° de série
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projets
 SearchIntoMO=Ordres de fabrication
 SearchIntoTasks=Tâches
@@ -1057,6 +1061,7 @@ YouAreCurrentlyInSandboxMode=Vous travaillez actuellement dans le mode "bac à s
 Inventory=Inventaire
 AnalyticCode=Code analytique
 TMenuMRP=GPAO
+ShowCompanyInfos=Afficher les infos de l'entreprise
 ShowMoreInfos=Afficher plus d'informations
 NoFilesUploadedYet=Merci de téléverser un document d'abord
 SeePrivateNote=Voir note privée
@@ -1118,7 +1123,9 @@ EventReminder=Rappel d'événement
 UpdateForAllLines=Mise à jour de toutes les lignes
 OnHold=En attente
 Civility=Civilité
-AffectTag=Affecter une catégorie
-ConfirmAffectTag=Affectation de catégories en masse
+AffectTag=Affecter un tag/catégorie
+ConfirmAffectTag=Affecter les tags en masse
 ConfirmAffectTagQuestion=Êtes-vous sur de vouloir affecter ces catégories aux %s lignes sélectionnées ?
-CategTypeNotFound=Aucune catégorie trouvée
+CategTypeNotFound=Aucun type de tag trouvé pour ce type d'enregistrements
+CopiedToClipboard=Copié dans le presse-papier
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang
index ff64d7516ca..fabd7851aad 100644
--- a/htdocs/langs/fr_FR/margins.lang
+++ b/htdocs/langs/fr_FR/margins.lang
@@ -22,7 +22,7 @@ ProductService=Produit ou Service
 AllProducts=Tous les produits et services
 ChooseProduct/Service=Choisissez le produit ou le service
 ForceBuyingPriceIfNull=Forcer le prix d'achat au prix de vente si non renseigné
-ForceBuyingPriceIfNullDetails=Si le prix d'achat/revient n'est pas défini, et que cette option est "ON", la marge sera de zéro sur la ligne (le prix d'achat/revient = prix de vente), autrement ("OFF"), la marge sera égale à la valeur suggérée par défaut.
+ForceBuyingPriceIfNullDetails=Si le prix d'achat/revient n'est pas défini quand on ajouter une nouvelle ligne, et que cette option est "ON", la marge sera de 0 sur la nouvelle ligne (le prix d'achat/revient = prix de vente). Si l'option est à "OFF" (recommandé), la marge sera égale à la valeur suggérée par défaut (et peut être 100% si aucune valeur par défaut n'est trouvé).
 MARGIN_METHODE_FOR_DISCOUNT=Méthode de gestion des remises globales
 UseDiscountAsProduct=Comme un produit
 UseDiscountAsService=Comme un service
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index a541c347adb..dff2f9c885b 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Liste des adhérents brouillons (à valider)
 MembersListValid=Liste des adhérents valides
 MembersListUpToDate=Liste des adhérents validés avec une adhésion à jour
 MembersListNotUpToDate=Liste des adhérents validés avec une adhésion expirée
+MembersListExcluded=List of excluded members
 MembersListResiliated=Liste des adhérents résiliés
 MembersListQualified=Liste des adhérents qualifiés
 MenuMembersToValidate=Adhérents brouillons
 MenuMembersValidated=Adhérents validés
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Adhérents résiliés
 MembersWithSubscriptionToReceive=Adhérents avec cotisation à recevoir
 MembersWithSubscriptionToReceiveShort=Cotisations à recevoir
@@ -47,11 +49,14 @@ MemberStatusActiveLate=Adhésion/cotisation expirée
 MemberStatusActiveLateShort=Expiré
 MemberStatusPaid=Adhésions à jour
 MemberStatusPaidShort=A jour
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Adhérent résilié
 MemberStatusResiliatedShort=Résilié
 MembersStatusToValid=Adhérents brouillons
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Adhérents résiliés
-MemberStatusNoSubscription=Validé (pas de cotisations nécessaires)
+MemberStatusNoSubscription=Validé (pas de cotisation nécessaire)
 MemberStatusNoSubscriptionShort=Validé
 SubscriptionNotNeeded=Aucune cotisation requise
 NewCotisation=Nouvelle adhésion
@@ -82,6 +87,8 @@ Physical=Physique
 Moral=Morale
 MorAndPhy=Morales et physiques
 Reenable=Réactiver
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Résilier un adhérent
 ConfirmResiliateMember=Êtes-vous sûr de vouloir résilier cet adhérent ?
 DeleteMember=Effacer un membre
@@ -95,7 +102,7 @@ FollowingLinksArePublic=Les liens suivants sont des pages accessibles à tous et
 PublicMemberList=Liste des membres publics
 BlankSubscriptionForm=Formulaire d'auto-inscription publique
 BlankSubscriptionFormDesc=Dolibarr peut vous fournir un URL/site web public afin de permettre aux visiteurs externes de faire une demande d'inscription à la fondation. Si un module de paiement est actif, un formulaire de paiement sera également fourni automatiquement.
-EnablePublicSubscriptionForm=Activer le formulaire d'auto-inscription public du site
+EnablePublicSubscriptionForm=Activer le formulaire public d'auto-inscription
 ForceMemberType=Forcer le type d'adhérent
 ExportDataset_member_1=Adhérents et adhésions
 ImportDataset_member_1=Adhérents
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modèle d'email à utiliser pour e
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modèle d'email électronique à utiliser pour envoyer un courrier électronique à un membre lors de l'enregistrement d'une nouvelle cotisation
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modèle d'email électronique à utiliser pour envoyer un rappel par courrier électronique lorsque l'adhésion est sur le point d'expirer
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modèle d'email utilisé pour envoyer un email à un adhérent lors de l'annulation d'adhésion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Email émetteur pour les mails automatiques
 DescADHERENT_ETIQUETTE_TYPE=Format pages étiquettes
 DescADHERENT_ETIQUETTE_TEXT=Texte imprimé sur les planches d'adresses adhérent
@@ -162,7 +170,7 @@ DocForLabels=Génération d'étiquettes d'adresses
 SubscriptionPayment=Paiement cotisation
 LastSubscriptionDate=Date de dernière adhésion
 LastSubscriptionAmount=Montant dernière adhésion
-LastMemberType=Ancien type de membre
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Statistiques des membres par pays
 MembersStatisticsByState=Statistiques des membres par département/province/canton
 MembersStatisticsByTown=Statistiques des membres par ville
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index d2bce2082cb..d2ed35e1282 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -92,7 +92,6 @@ SearchAllDesc=Le champ doit-il être utilisé pour effectuer une recherche à pa
 SpecDefDesc=Entrez ici toute la documentation que vous souhaitez joindre au module et qui n'a pas encore été définis dans d'autres onglets. Vous pouvez utiliser .md ou, mieux, la syntaxe enrichie .asciidoc.
 LanguageDefDesc=Entrez dans ces fichiers, toutes les clés et la traduction pour chaque fichier de langue.
 MenusDefDesc=Définissez ici les menus fournis par votre module
-ImportExportProfiles=You will find here the Export or Import profiles provided by your module
 DictionariesDefDesc=Définissez ici les dictionnaires fournis par le module
 PermissionsDefDesc=Définissez ici les nouvelles permissions fournies par votre module
 MenusDefDescTooltip=Les menus fournis par votre module / application sont définis dans le tableau <strong>$this->menus</strong> dans le fichier descripteur de module. Vous pouvez modifier manuellement ce fichier ou utiliser l'éditeur intégré. <br><br> Remarque: une fois définis (et les modules réactivés), les menus sont également visibles dans l'éditeur de menus mis à la disposition des utilisateurs administrateurs sur %s.
@@ -107,7 +106,7 @@ TryToUseTheModuleBuilder=Si vous connaissez SQL et PHP, vous pouvez utiliser l'a
 SeeTopRightMenu=Voir <span class="fa fa-bug"></span> à droite de votre barre de menu principal
 AddLanguageFile=Ajouter le fichier de langue
 YouCanUseTranslationKey=Vous pouvez utiliser ici une clé qui est la clé de traduction trouvée dans le fichier de langue (voir l'onglet "Langues")
-DropTableIfEmpty=(Supprimer la table si elle est vide)
+DropTableIfEmpty=(Supprimer la table si vide)
 TableDoesNotExists=La table %s n'existe pas
 TableDropped=La table %s a été supprimée
 InitStructureFromExistingTable=Construire la chaîne du tableau de structure d'une table existante
@@ -134,11 +133,13 @@ IncludeDocGeneration=Je veux générer des documents à partir de l'objet
 IncludeDocGenerationHelp=Si vous cochez cette case, du code sera généré pour ajouter une section "Générer un document" sur la fiche de l'objet.
 ShowOnCombobox=Afficher la valeur dans la liste déroulante
 KeyForTooltip=Clé pour l'info-bulle
-CSSClass=Classe CSS
+CSSClass=CSS pour le formulaire d'édition / création
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Non éditable
 ForeignKey=Clé étrangère
 TypeOfFieldsHelp=Type de champs: <br> varchar (99), double (24,8), réel, texte, html, datetime, timestamp, integer, integer:NomClasse:cheminrelatif/vers/classfile.class.php [:1[:filtre]] ('1' signifie nous ajoutons un bouton + après le combo pour créer l'enregistrement, 'filter' peut être 'status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' par exemple)
 AsciiToHtmlConverter=Convertisseur Ascii en HTML
 AsciiToPdfConverter=Convertisseur Ascii en PDF
 TableNotEmptyDropCanceled=La table n’est pas vide. La suppression a été annulée.
-ModuleBuilderNotAllowed=Le module builder est activé mais son accès n'est pas autorisé à l'utilisateur courant
+ModuleBuilderNotAllowed=Le module builder est activé mais son accès n'est pas autorisé pour votre utilisateur
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 51807552945..4cfa8e0035d 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -81,24 +81,22 @@ ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit ne peut pas être utilisé dan
 Workstation=Poste de travail
 Workstations=Postes de travail
 WorkstationsDescription=Gestion des postes de travail
-WorkstationSetup = Workstations setup
+WorkstationSetup = Configuration du module Poste de travail
 WorkstationSetupPage = Configuration du module Poste de travail 
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Liste des postes de travail
 WorkstationCreate=Ajouter un nouveau poste de travail
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
+ConfirmEnableWorkstation=Voulez-vous vraiment activer le poste de travail <b>%s</b>?
 EnableAWorkstation=Activer le module Poste de travail
-ConfirmDisableWorkstation=Êtes-vous sûr de vouloir désactiver le module Poste de travail <b>%s</b> ?
+ConfirmDisableWorkstation=Voulez-vous vraiment désactiver la station de travail <b>%s</b>?
 DisableAWorkstation=Désactiver un poste de travail
 DeleteWorkstation=Supprimer
 NbOperatorsRequired=Nombre d'opérateurs requis
 THMOperatorEstimated=THM estimé de l'opérateur
 THMMachineEstimated=THM machine estimé
 WorkstationType=Type de poste de travail
-Human=umain
+Human=Humain
 Machine=Machine
 HumanMachine=Humain/machine
 WorkstationArea=Espace Poste de travail
 Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+THMEstimatedHelp=Ce taux permet de définir un coût prévisionnel de l'article
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 8437178e8e5..5b49fcf64bd 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Passer commande
 MakeOrder=Passer commande
 SupplierOrder=Commande fournisseur
 SuppliersOrders=Commandes fournisseurs
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Commandes fournisseurs en cours
 CustomerOrder=Commande client
 CustomersOrders=Commandes
@@ -142,10 +144,11 @@ OrderByWWW=En ligne
 OrderByPhone=Téléphone
 # Documents models
 PDFEinsteinDescription=Un modèle de commande complet (ancienne implémentation du modèle Eratosthène)
-PDFEratostheneDescription=Un modèle de commande complet 
+PDFEratostheneDescription=Un modèle de commande complet
 PDFEdisonDescription=Modèle de commande simple
 PDFProformaDescription=Un modèle de facture Proforma complet
 CreateInvoiceForThisCustomer=Facturer commandes
+CreateInvoiceForThisSupplier=Facturer commandes
 NoOrdersToInvoice=Pas de commandes facturables
 CloseProcessedOrdersAutomatically=Classer automatiquement à "Traitées" les commandes sélectionnées.
 OrderCreation=Date de création
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index a8078129464..433f72df63d 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -245,6 +245,7 @@ NewKeyIs=Voici vos nouveaux identifiants pour vous connecter
 NewKeyWillBe=Vos nouveaux identifiants pour vous connecter à l'application seront
 ClickHereToGoTo=Cliquez ici pour aller sur %s
 YouMustClickToChange=Vous devez toutefois auparavant cliquer sur le lien suivant, afin de valider ce changement de mot de passe
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Si vous n'êtes pas à l'origine de cette demande, ignorez simplement ce message. Vos identifiants restent sécurisés.
 IfAmountHigherThan=Si le montant est supérieur à <strong>%s</strong>
 SourcesRepository=Répertoire pour les sources
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 5610a674018..4d4e2ce6fac 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=Taux TVA (pour ce produit/fournisseur)
 DiscountQtyMin=Remise par défaut quantité min.
 NoPriceDefinedForThisSupplier=Aucun prix/qté défini pour ce fournisseur/produit
 NoSupplierPriceDefinedForThisProduct=Aucun prix/qté fournisseur défini pour ce produit
+PredefinedItem=Article prédéfini
 PredefinedProductsToSell=Produits prédéfinis en vente
 PredefinedServicesToSell=Services prédéfinis en vente
 PredefinedProductsAndServicesToSell=Produits/Services prédéfinis en vente
@@ -313,7 +314,7 @@ LastUpdated=Dernière mise à jour
 CorrectlyUpdated=Mise à jour avec succès
 PropalMergePdfProductActualFile=Fichiers utilisés pour l'ajout au PDF Azur sont
 PropalMergePdfProductChooseFile=Sélectionnez les fichiers PDF
-IncludingProductWithTag=Comprenant produit / service avec tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Prix ​​par défaut, le prix réel peut dépendre du client
 WarningSelectOneDocument=Sélectionnez au moins un document
 DefaultUnitToShow=Unité
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index d7f3997a019..9599f880936 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -89,7 +89,7 @@ TimeConsumed=Consommé
 ListOfTasks=Liste de tâches
 GoToListOfTimeConsumed=Aller à la liste des temps consommés
 GanttView=Vue Gantt
-ListWarehouseAssociatedProject=Liste des entrepôts associés au projet
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 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
@@ -241,7 +241,7 @@ LatestModifiedProjects=Les %s derniers projets modifiés
 OtherFilteredTasks=Autres tâches filtrées
 NoAssignedTasks=Aucune tâche assignée (assignez un projet/tâche à l'utilisateur depuis la liste déroulante utilisateur en haut pour pouvoir saisir du temps dessus)
 ThirdPartyRequiredToGenerateInvoice=Un tiers doit être défini sur le projet pour pouvoir le facturer.
-ChooseANotYetAssignedTask=Choisissez une tâches qui ne vous est pas encore assignée
+ChooseANotYetAssignedTask=Choisissez une tâche qui ne vous est pas encore assignée
 # Comments trans
 AllowCommentOnTask=Autoriser les utilisateurs à ajouter des commentaires sur les tâches
 AllowCommentOnProject=Autoriser les commentaires utilisateur sur les projets
@@ -269,5 +269,7 @@ OneLinePerTask=Une ligne par tâche
 OneLinePerPeriod=Une ligne par période
 RefTaskParent=Réf. Tâche parent
 ProfitIsCalculatedWith=Le bénéfice est calculé sur la base de
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classer le projet à clôturé lorsque toutes les tâches de ce projet sont à 100 %% de progression
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Non rétroactif : l’activation de cette option ne clôturera pas les projets dont les tâches sont déjà à 100 %%. Cette option ne classe que les projets ouverts.
+AddPersonToTask=Ajouter également aux tâches
+UsageOrganizeEvent=Utilisation: Organisation d'événements
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index aaff4579427..6727ad21a8a 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Envoyer proposition commerciale par email
 DatePropal=Date de proposition
 DateEndPropal=Date de fin de validité
 ValidityDuration=Durée de validité
-CloseAs=Positionner le statut à
 SetAcceptedRefused=Accepter/Refuser 
 ErrorPropalNotFound=Propale %s inexistante
 AddToDraftProposals=Ajouter à proposition brouillon
@@ -60,6 +59,7 @@ ConfirmClonePropal=Êtes-vous sûr de vouloir cloner la proposition commerciale
 ConfirmReOpenProp=Êtes-vous sûr de vouloir réouvrir la proposition commerciale <b>%s</b> ?
 ProposalsAndProposalsLines=Propositions commerciales clients et lignes de propositions
 ProposalLine=Ligne de proposition
+ProposalLines=Proposal lines
 AvailabilityPeriod=Délai de livraison
 SetAvailability=Définir le délai de livraison
 AfterOrder=après commande
@@ -85,25 +85,8 @@ ProposalCustomerSignature=Cachet, Date, Signature et mention "Bon pour Accord"
 ProposalsStatisticsSuppliers=Statistiques de propositions commerciales
 CaseFollowedBy=Affaire suivie par
 SignedOnly=Signé seulement
-IsNotADraft = n'est pas un brouillon
-PassedInOpenStatus = passé au statut "ouvert"
-CantBeSign = ne peut pas être signée
-Sign = Signer
-Signed = signé
-NoSign = Non signer
-NoSigned = Non signé
-CantBeSign = ne peut pas être signé
-CantBeSign = ne peut pas être non signé
-CantBeValidated = Ne peut pas être validé
-ConfirmMassValidation = Confirmer la validation ?
-ConfirmMassSignature = Confirmer la signature ?
-ConfirmMassNoSignature = Confirmer la non signature ?
-ConfirmMassValidationQuestion = Voulez-vous confirmer la validation des devis brouillons selectionnés ?
-ConfirmMassSignatureQuestion = Voulez-vous confirmer la signature des devis ouvert selectionnés ?
-ConfirmMassNoSignatureQuestion = Voulez-vous confirmer la non signature des devis ouvert selectionnés ?
-PropNoProductOrService = devis ne contient pas de produits ni de services
-PropsNoProductOrService = devis ne contiennent pas de produits ni de services
-IdProposal=ID de proposition
+IdProposal=ID de la proposition commerciale
 IdProduct=ID produit
 PrParentLine=Ligne parent de proposition
-LineBuyPriceHT=Prix ​​d'achat Montant net de taxe pour la ligne
+LineBuyPriceHT=Prix d'achat HT de la ligne
+
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 73ab172a424..4005859617f 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -2,13 +2,15 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable utilisé pour les utilisateurs
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte comptable défini sur la fiche utilisateur sera utilisé uniquement pour la comptabilité auxiliaire. Celui-ci sera utilisé pour le grand livre et comme valeur par défaut de la comptabilité auxiliaire si le compte dédié de l'utilisateur n'est pas défini.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable par défaut pour les paiements de salaires
-CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Par défaut, laisser vide l’option « Créer automatiquement un règlement total » lors de la création d'un Salaire
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Salaire
 Salaries=Salaires
-NewSalaryPayment=Nouveau règlement de salaire
+NewSalary=Nouveau salaire
+NewSalaryPayment=Nouveau salaire
 AddSalaryPayment=Ajouter paiement de salaire
 SalaryPayment=Règlement salaire
 SalariesPayments=Règlements des salaires
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Afficher règlement de salaire
 THM=Tarif horaire moyen
 TJM=Tarif journalier moyen
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 2d2be548f3b..811f64f0d84 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Stocks manquants
 StockAtDate=Stock à date
-StockAtDateInPast=Date dans le passé
-StockAtDateInFuture=Date future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks par lot/série
 LotSerial=Lots/séries
 LotSerialList=Liste des numéros de lots/séries
@@ -37,8 +37,8 @@ AllWarehouses=Tous les entrepôts
 IncludeEmptyDesiredStock=Inclure aussi les stocks négatifs quand le stock désiré optimal n'est pas défini
 IncludeAlsoDraftOrders=Inclure également les commandes brouillons
 Location=Lieu
-LocationSummary=Nom court du lieu
-NumberOfDifferentProducts=Nombre de produits différents
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Nombre total de produits
 LastMovement=Dernier mouvement
 LastMovements=Derniers mouvements
@@ -62,8 +62,8 @@ EnhancedValueOfWarehouses=Valorisation des stocks
 UserWarehouseAutoCreate=Créer automatiquement un stock/entrepôt propre à l'utilisateur lors de sa création
 AllowAddLimitStockByWarehouse=Gérez également les valeurs des stocks minimums et souhaités par paire (produit-entrepôt) en plus des valeurs de minimums et souhaités par produit
 RuleForWarehouse=Règle pour les entrepôts
-WarehouseAskWarehouseOnThirparty=Définir un entrepôt sur les tiers
-WarehouseAskWarehouseDuringPropal=Définir un entrepôt sur les propositions
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Définir un entrepôt sur les propositions commerciales
 WarehouseAskWarehouseDuringOrder=Définir un entrepôt sur les commandes
 UserDefaultWarehouse=Définir un entrepôt sur les utilisateurs
 MainDefaultWarehouse=Entrepôt par défaut
@@ -98,15 +98,16 @@ RealStockDesc=Le stock physique ou réel est le stock présent dans les entrepô
 RealStockWillAutomaticallyWhen=Le stock réel sera modifié selon ces règles (voir la configuration du module Stock) :
 VirtualStock=Stock virtuel
 VirtualStockAtDate=Stock virtuel à date
-VirtualStockAtDateDesc=Stock virtuel une fois que toutes les commandes en attente qui doivent être effectuées avant la date seront terminées
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Le stock virtuel est la quantité de produit en stock après que les opérations en cours (et qui affectent les stocks) soient terminées (réceptions de commandes fournisseurs, expéditions de commandes clients, production des ordres de fabrications, etc)
+AtDate=À date
 IdWarehouse=Identifiant entrepôt
 DescWareHouse=Description entrepôt
 LieuWareHouse=Lieu entrepôt
 WarehousesAndProducts=Entrepôts et produits
 WarehousesAndProductsBatchDetail=Entrepôts et produits (avec détail par lot/série)
 AverageUnitPricePMPShort=Prix moyen pondéré (PMP)
-AverageUnitPricePMPDesc=Le prix unitaire moyen d'entrée que nous avons dû payer aux fournisseurs pour intégrer le produit dans notre stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Prix de vente unitaire
 EstimatedStockValueSellShort=Valeur à la vente
 EstimatedStockValueSell=Valeur vente
@@ -128,7 +129,7 @@ VirtualDiffersFromPhysical=Selon les paramètres d'incrémentation et décrémen
 UseRealStockByDefault=Utiliser le stock réel, plutôt que le stock virtuel, pour le réapprovisionnement
 ReplenishmentCalculation=La quantité à commander sera (quantité souhaitée - stock réel) au lieu de (quantité souhaitée - stock virtuel)
 UseVirtualStock=Utilisation du stock virtuel
-UsePhysicalStock=Utilisation du stock réel
+UsePhysicalStock=Utilisation du stock physique
 CurentSelectionMode=Mode de sélection en cours
 CurentlyUsingVirtualStock=Stock virtuel
 CurentlyUsingPhysicalStock=Stock réel
@@ -146,7 +147,7 @@ Replenishments=Réapprovisionnement
 NbOfProductBeforePeriod=Quantité du produit <b>%s</b> en stock avant la période sélectionnée (< <b>%s</b>)
 NbOfProductAfterPeriod=Quantité du produit <b>%s</b> en stock après la période sélectionnée (> <b>%s</b>)
 MassMovement=Mouvement en masse
-SelectProductInAndOutWareHouse=Sélectionner un entrepôt source et destination, un produit et une quantité à transférer, puis cliquer sur "%s". Une fois tous les mouvements choisis, cliquer sur "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Enregistrer transfert
 ReceivingForSameOrder=Réceptions pour cette commande
 StockMovementRecorded=Mouvement de stocks enregistré
@@ -155,7 +156,7 @@ StockMustBeEnoughForInvoice=Le niveau de stock doit être suffisant pour ajouter
 StockMustBeEnoughForOrder=Le niveau de stock doit être suffisant pour ajouter ce produit/service à la commande (la vérification est faite sur le stock réel lors de l'ajout de la ligne de commande, quelquesoit la règle de modification automatique de stock)
 StockMustBeEnoughForShipment= Le niveau de stock doit être suffisant pour ajouter ce produit/service à l'expédition (la vérification est faite sur le stock réel lors de l'ajout de la ligne à l'expédition, quelquesoit la règle de modification automatique de stock)
 MovementLabel=Libellé du mouvement
-TypeMovement=Type de mouvement
+TypeMovement=Sens du mouvement
 DateMovement=Date de mouvement
 InventoryCode=Code mouvement ou inventaire
 IsInPackage=Inclus dans un package
@@ -184,6 +185,7 @@ inventoryCreatePermission=Créer un nouvel inventaire
 inventoryReadPermission=Voir les inventaires
 inventoryWritePermission=Mettre à jour les inventaires
 inventoryValidatePermission=Valider l'inventaire
+inventoryDeletePermission=Supprimer l'inventaire
 inventoryTitle=Inventaire
 inventoryListTitle=inventaires
 inventoryListEmpty=Aucun inventaire en cours
@@ -236,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Le module Stock est requis pour choisir une
 ForceTo=Forcer à
 AlwaysShowFullArbo=Afficher l'arborescence complète de l'entrepôt sur la popup du lien entrepôt (Avertissement: cela peut réduire considérablement les performances)
 StockAtDatePastDesc=Vous pouvez voir ici le stock (stock réel) à une date donnée dans le passé
-StockAtDateFutureDesc=Vous pouvez voir ici le stock (stock virtuel) à une date donnée dans le futur
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Stock actuel
-InventoryRealQtyHelp=Définissez la valeur sur 0 pour réinitialiser la quantité <br> Gardez le champ vide ou supprimez la ligne pour qu'il reste inchangé
-UpdateByScaning=Mise à jour par scan
+InventoryRealQtyHelp=Définissez la valeur sur 0 pour réinitialiser la quantité <br> Gardez le champ vide ou supprimez la ligne pour qu'elle reste inchangé
+UpdateByScaning=Remplir la quantité réelle en scannant
 UpdateByScaningProductBarcode=Mettre à jour par scan (code-barres produit)
 UpdateByScaningLot=Mise à jour par scan (code barres lot/série)
-DisableStockChangeOfSubProduct=Désactiver les mouvements de stock des composants pour tout mouvement de stock de ce kit
+DisableStockChangeOfSubProduct=Désactiver les mouvements de stock des composants pour ce mouvement de stock.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Ajoutez le fichier à importer puis cliquez sur le pictogramme %s pour le sélectionner comme fichier source d'import…
+SelectAStockMovementFileToImport=sélectionnez un fichier de mouvement de stock à importer
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventaire %s
+ReOpen=Réouvrir
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/fr_FR/supplier_proposal.lang b/htdocs/langs/fr_FR/supplier_proposal.lang
index 72d73007f0c..fabfa805777 100644
--- a/htdocs/langs/fr_FR/supplier_proposal.lang
+++ b/htdocs/langs/fr_FR/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Zone des propositions de fournisseurs
 SupplierProposalShort=Proposition commerciale fournisseur
 SupplierProposals=Propositions commerciales fournisseurs
 SupplierProposalsShort=Propositions commerciale fournisseurs
+AskPrice=Demande de prix
 NewAskPrice=Nouvelle demande de prix
 ShowSupplierProposal=Afficher demande de prix
 AddSupplierProposal=Créer une demande de prix
@@ -52,3 +53,6 @@ SupplierProposalsToClose=Propositions commerciales fournisseurs à fermer
 SupplierProposalsToProcess=Propositions commerciales fournisseurs à traiter
 LastSupplierProposals=Les %s dernières demandes de prix
 AllPriceRequests=Toutes les demandes de prix
+TypeContact_supplier_proposal_external_SHIPPING=Contact fournisseur pour la livraison
+TypeContact_supplier_proposal_external_BILLING=Contact fournisseur pour la facturation
+TypeContact_supplier_proposal_external_SERVICE=Commercial du suivi des propositions
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index c3d4873d1bd..0d0bf4528a5 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Fournisseurs
 SuppliersInvoice=Facture fournisseur
+SupplierInvoices=Factures fournisseur
 ShowSupplierInvoice=Montrer la facture fournisseur
 NewSupplier=Nouveau fournisseur
 History=Historique
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index d2dbef92452..f97eeb7c35c 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Supprimé
 # Dict
 Type=Type
 Severity=Sévérité
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Pour envoyer un e-mail depuis un ticket
@@ -115,7 +117,7 @@ TicketsShowModuleLogoHelp=Activer cette option pour cacher le logo du module dan
 TicketsShowCompanyLogo=Afficher le logo de la société dans l'interface publique
 TicketsShowCompanyLogoHelp=Activez cette option pour masquer le logo de la société dans les pages de l'interface publique
 TicketsEmailAlsoSendToMainAddress=Envoyer également une notification à l'adresse e-mail principale
-TicketsEmailAlsoSendToMainAddressHelp=Activer cette option pour envoyer un email à "Email de notification de" adresse (voir configuration ci-dessous)
+TicketsEmailAlsoSendToMainAddressHelp=Activer cette option pour envoyer aussi un email à l'adresse définie dans la configuration "%s" (Voir onglet "%s")
 TicketsLimitViewAssignedOnly=Limiter l'afficher des tickets assignés à l'utilisateur courant (non valable pour les utilisateurs externes, toujours limité par le tiers dont ils dépendent)
 TicketsLimitViewAssignedOnlyHelp=Seuls les tickets affectés à l'utilisateur actuel seront visibles. Ne s'applique pas à un utilisateur disposant de droits de gestion des tickets.
 TicketsActivatePublicInterface=Activer l'interface publique
@@ -126,10 +128,10 @@ TicketNumberingModules=Module de numérotation des tickets
 TicketsModelModule=Modèles de documents pour les tickets
 TicketNotifyTiersAtCreation=Notifier le tiers à la création
 TicketsDisableCustomerEmail=Toujours désactiver les courriels lorsqu'un ticket est créé depuis l'interface publique
-TicketsPublicNotificationNewMessage=Envoyer un (des) courriel (s) lorsqu’un nouveau message est ajouté
+TicketsPublicNotificationNewMessage=Envoyer un ou des emails lorsqu’un nouveau message/commentaire est ajouté à un ticket
 TicketsPublicNotificationNewMessageHelp=Envoyer un (des) courriel(s) lorsqu’un nouveau message est ajouté à partir de l’interface publique (à l’utilisateur désigné ou au courriel de notification  (mise à jour) et/ou au courriel de notification)
 TicketPublicNotificationNewMessageDefaultEmail=Emails de notifications à (mise à jour)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Envoyez une notification email de nouveau message à cette adresse si le ticket n’a pas d’utilisateur assigné ou si l’utilisateur n’a pas d’email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Envoyez un email à cette adresse email pour chaque nouveau message de notifications si le ticket n'a pas d'utilisateur assigné ou si l'utilisateur n'a pas d'email connu.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Derniers tickets modifiés
 BoxLastModifiedTicketDescription=Les %s derniers tickets modifiés
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Pas de tickets modifiés récemment
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index efb5b645a3d..25e174f28a6 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -29,11 +29,11 @@ ExpenseReportApprovedMessage=La note de frais %s a été approuvée.<br>- Utilis
 ExpenseReportRefused=Une note de frais a été refusée
 ExpenseReportRefusedMessage=La note de frais %s a été refusée.<br>- Utilisateur : %s<br>- Refusée par : %s<br>- Motif du refus : %s<br>Cliquez ici pour afficher la note de frais: %s
 ExpenseReportCanceled=Une note de frais a été annulée
-ExpenseReportCanceledMessage=La note de frais %s a été annulée.<br>- Utilisateur : %s<br>- Annulée par : %s<br>- Motif de l'annulation : %s<br>Cliquez ici pour afficher la note de frais %s
+ExpenseReportCanceledMessage=La note de frais %s a été annulée.<br>- Utilisateur : %s<br>- Annulée par : %s<br>- Motif de l'annulation :%s<br>Cliquez ici pour afficher la note de frais %s
 ExpenseReportPaid=Une note de frais a été réglée
 ExpenseReportPaidMessage=La note de frais %s a été réglée.<br>- Utilisateur : %s<br>- Réglée par : %s<br>Cliquez ici pour afficher la note de frais %s
 TripId=Id note de frais
-AnyOtherInThisListCanValidate=Personne à informer pour la validation.
+AnyOtherInThisListCanValidate=Personne à informer pour la validation de la demande.
 TripSociete=Information société
 TripNDF=Informations note de frais
 PDFStandardExpenseReports=Modèle de note de frais PDF standard
@@ -49,7 +49,7 @@ TF_PEAGE=Péage
 TF_ESSENCE=Carburant
 TF_HOTEL=Hôtel
 TF_TAXI=Taxi
-EX_KME=frais kilométriques
+EX_KME=Frais kilométriques
 EX_FUE=Carburant
 EX_HOT=Hôtel
 EX_PAR=Stationnement
@@ -110,7 +110,7 @@ ExpenseReportPayment=Paiement des notes de frais
 ExpenseReportsToApprove=Notes de frais à approuver
 ExpenseReportsToPay=Notes de frais à payer
 ConfirmCloneExpenseReport=Êtes-vous sûr de vouloir cloner cette note de frais ?
-ExpenseReportsIk=index des frais kilométriques des notes de frais
+ExpenseReportsIk=Configuration des indemnités kilométriques
 ExpenseReportsRules=Règle de note de frais
 ExpenseReportIkDesc=Vous pouvez modifier le calcul des indemnités kilométriques par catégories et gammes précédemment définies. <b>d</b> est la distance en kilomètres.
 ExpenseReportRulesDesc=Vous pouvez créer ou mettre à jour toutes les règles de calcul. Cette règle sera utilisée à la création d'une note de frais par un utilisateur.
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=par jour (sans limite)
 nolimitbyEX_MON=par mois (sans limite)
 nolimitbyEX_YEA=par an (sans limite)
 nolimitbyEX_EXP=par ligne (sans limite)
-CarCategory=Catégorie de voiture
+CarCategory=Catégorie de véhicule
 ExpenseRangeOffset=Montant décalage: %s
 RangeIk=Barème kilométrique
 AttachTheNewLineToTheDocument=Lié la ligne à un document téléversé
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 73b9e504f74..a3085eb5d56 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Supprimer du groupe
 PasswordChangedAndSentTo=Mot de passe changé et envoyé à <b>%s</b>.
 PasswordChangeRequest=Demande de changement de mot de passe pour <b> %s </b>
 PasswordChangeRequestSent=Demande de changement de mot de passe pour <b>%s</b> envoyée à <b>%s</b>.
+IfLoginExistPasswordRequestSent=Si cet identifiant est un compte valide, un e-mail de ré-initialisation du mot de passe a été envoyé.
+IfEmailExistPasswordRequestSent=Si cet email est un compte valide, un e-mail de ré-initialisation du mot de passe a été envoyé.
 ConfirmPasswordReset=Confirmer réinitialisation du mot de passe
 MenuUsersAndGroups=Utilisateurs & Groupes
 LastGroupsCreated=Les %s derniers groupes créés
@@ -70,9 +72,10 @@ ExportDataset_user_1=Utilisateurs et attributs
 DomainUser=Utilisateur du domaine %s
 Reactivate=Réactiver
 CreateInternalUserDesc=Ce formulaire permet de créer un utilisateur interne à votre société/institution. Pour créer un utilisateur externe (client, fournisseur, ...), utilisez le bouton 'Créer compte utilisateur' qui se trouve sur la fiche du contact du tiers.
-InternalExternalDesc=Un utilisateur <b>interne</b> est un utilisateur qui fait partie de votre société/institution.<br>Un utilisateur <b>externe</b> est un compte utilisateur pour un client, fournisseur ou autre (La création d'un utilisateur externe pour un tiers peut etre fait depuis la fiche d'un contact de tiers). <br><br>Dans les deux cas, les permissions déterminent les accès aux fonctionnalités. De plus, les utilisateurs externes peuvent avoir un gestionnaire de menu différent des utilisateurs internes (Voir Accueil > configuration > Affichage)
+InternalExternalDesc=Un utilisateur <b>interne</b> est un utilisateur qui fait partie de votre société/institution ou un partenaire en dehors de votre organisation qui peut avoir besoin de voir plus de données que les données en rapport avec sa société (le système de permission définira ce qu'il peut ou ne peut pas voir).<br>Un utilisateur <b>externe</b> est un compte utilisateur pour un client, fournisseur ou autre qui ne doit voir QUE les données en rapport avec lui même (La création d'un utilisateur externe pour un tiers peut etre fait depuis la fiche d'un contact de tiers). <br><br>Dans les deux cas, vous devez définir les permissions des fonctionnalités dont l'utilisateur a besoin.
 PermissionInheritedFromAGroup=La permission est accordée car héritée d'un groupe auquel appartient l'utilisateur.
 Inherited=Hérité
+UserWillBe=Créé par l'utilisateur
 UserWillBeInternalUser=L'utilisateur créé sera un utilisateur interne (car non lié à un tiers en particulier)
 UserWillBeExternalUser=L'utilisateur créé sera un utilisateur externe (car lié à un tiers en particulier)
 IdPhoneCaller=Identifiant appelant (téléphone)
@@ -109,8 +112,10 @@ UserAccountancyCode=Code comptable de l'utilisateur
 UserLogoff=Déconnexion de l'utilisateur
 UserLogged=Utilisateur connecté
 DateOfEmployment=Date d'embauche
-DateEmployment=Date d'embauche
+DateEmployment=Emploi
+DateEmploymentstart=Date d'embauche
 DateEmploymentEnd=Date de fin d'emploi
+RangeOfLoginValidity=Période de validité de l'identifiant
 CantDisableYourself=Vous ne pouvez pas désactiver votre propre compte utilisateur
 ForceUserExpenseValidator=Forcer le valideur des notes de frais
 ForceUserHolidayValidator=Forcer le valideur des congés
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index ce277cc5f52..3af0b44c17c 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u> Utilisation avec Apache/NGinx/...</u> <br> Créez sur vot
 ExampleToUseInApacheVirtualHostConfig=Exemple à utiliser dans la configuration de l'hôte virtuel Apache:
 YouCanAlsoTestWithPHPS=<u> Utilisation avec un serveur PHP incorporé </u> <br> Sous environnement de développement, vous pouvez préférer tester le site avec le serveur Web PHP intégré (PHP 5.5 requis) en exécutant <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
 YouCanAlsoDeployToAnotherWHP=<u>Exécutez votre site Web avec un autre fournisseur d'hébergement Dolibarr</u> <br> Si vous ne disposez pas d'un serveur Web tel qu'Apache ou NGinx sur Internet, vous pouvez exporter et importer votre site Web vers une autre instance de Dolibarr fournie par un autre fournisseur d'hébergement Dolibarr offrant une intégration complète avec le module de site Web. Vous pouvez trouver une liste de certains hébergeurs Dolibarr sur <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Vérifiez également que le virtual host a la permission <strong> %s </strong> sur les fichiers dans <strong> %s </strong>
+CheckVirtualHostPerms=Vérifiez également que l'utilisateur du virtual host (par exemple www-data) a la permission <strong> %s </strong> sur les fichiers dans<br><strong> %s </strong>
 ReadPerm=Lire
 WritePerm=Écrire
 TestDeployOnWeb=Tester/déployer sur le web
 PreviewSiteServedByWebServer=<u>Prévisualiser %s dans un nouvel onglet.</u><br><br>. Le %s sera servi par un serveur web externe (comme Apache, Nginx, IIS). Vous pouvez installer et configurer ce serveur auparavant pour pointer sur le répertoire : <br><strong>%s</strong><br> URL servie par un serveur externe: <br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Aperçu %s dans un nouvel onglet.</u><br><br>Le %s sera servi par le serveur Dolibarr donc aucun serveur Web supplémentaire (comme Apache, Nginx, IIS) n'est nécessaire.<br>L'inconvénient est que l'URL des pages ne sont pas sexy et commencent par un chemin de votre Dolibarr.<br>URL servie par Dolibarr:<br><strong>%s</strong><br><br>Pour utiliser votre propre serveur web externe pour servir ce site web, créez un virtual host sur vote serveur web qui pointe sur le répertoire<br><strong>%s</strong><br> ensuite entrez le nom de ce virtual host et cliquer sur le bouton d'affichage de l'aperçu.
+PreviewSiteServedByDolibarr=<u>Aperçu %s dans un nouvel onglet.</u><br><br>Le %s sera servi par le serveur Dolibarr aussi aucun serveur Web supplémentaire (comme Apache, Nginx, IIS) n'est nécessaire.<br>L'inconvénient est que l'URL des pages ne sont pas sexy et commencent par un chemin de votre Dolibarr.<br>URL servie par Dolibarr:<br><strong>%s</strong><br><br>Pour utiliser votre propre serveur web externe pour servir ce site web, créez un virtual host sur votre serveur web qui pointe sur le répertoire<br><strong>%s</strong><br> ensuite entrez le nom de ce virtual host dans les propriétés de ce site web et  cliquer sur le lien "Tester/Déployer sur le web".
 VirtualHostUrlNotDefined=URL du virtual host servit par le serveur web externe non défini
 NoPageYet=Pas de page pour l'instant
 YouCanCreatePageOrImportTemplate=Vous pouvez créer une nouvelle page ou importer un modèle de site Web complet.
@@ -115,7 +115,7 @@ MyWebsitePages=Mes pages de site web
 SearchReplaceInto=Rechercher | Remplacer dans
 ReplaceString=Nouvelle chaîne
 CSSContentTooltipHelp=Entrez ici le contenu CSS. Pour éviter tout conflit avec le CSS de l'application, veillez à ajouter toutes les déclarations avec la classe .bodywebsite. Par exemple: <br><br> #mycssselector, input.myclass: survol {...} <br> doit être <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Remarque: Si vous avez un fichier volumineux sans ce préfixe, vous pouvez utiliser 'lessc' pour le convertir afin d'ajouter le préfixe .bodywebsite partout.
-LinkAndScriptsHereAreNotLoadedInEditor=Avertissement: Ce contenu est affiché uniquement lorsque le site est accessible depuis un serveur. Il n'est pas utilisé en mode édition. Par conséquent, si vous devez charger des fichiers javascript également en mode édition, ajoutez simplement la balise 'script src=...' dans la page.
+LinkAndScriptsHereAreNotLoadedInEditor=Avertissement: Ce contenu est affiché uniquement lorsque le site est accéder depuis un serveur. Il n'est pas pris en compte en mode édition. Par conséquent, si vous devez charger des fichiers javascript également en mode édition, ajoutez simplement la balise 'script src=...' dans la page.
 Dynamiccontent=Exemple de page à contenu dynamique
 ImportSite=Importer modèle de site web
 EditInLineOnOff=Mode 'Modifier en ligne' est %s
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/conteneur(s) régénéré(s)
 RegenerateWebsiteContent=Régénérer les fichiers de cache du site Web
 AllowedInFrames=Autorisé dans les Frames
 DefineListOfAltLanguagesInWebsiteProperties=Définir la liste des langues disponibles dans les propriétés du site web.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index 771fcfbcc83..fb3e624423c 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -42,10 +42,10 @@ LastWithdrawalReceipt=Les %s derniers bons de prélèvements
 MakeWithdrawRequest=Faire une demande de prélèvement
 MakeBankTransferOrder=Faire une demande de virement
 WithdrawRequestsDone=%s demandes de prélèvements enregistrées
-BankTransferRequestsDone=%s demande de prélèvement enregistrée
+BankTransferRequestsDone=%s demandes de prélèvements enregistrées
 ThirdPartyBankCode=Code banque du tiers
 NoInvoiceCouldBeWithdrawed=Aucune facture traitée avec succès. Vérifiez que les factures sont sur les sociétés avec un BAN par défaut valide et que le BAN a un RUM avec le mode <strong> %s </strong>.
-WithdrawalCantBeCreditedTwice=Ce bon de prélèvement est déjà classé crédité ; cette opération ne peut pas être réalisée deux fois, car cela pourrait engendrer des doublons dans les paiements et les écritures bancaires.
+WithdrawalCantBeCreditedTwice=Le virement est déjà marqué comme étant crédité ; cela ne peut pas être fait deux fois, cela créerait potentiellement des paiements et des saisies bancaires en double.
 ClassCredited=Classer crédité
 ClassCreditedConfirm=Êtes-vous sûr de vouloir classer ce bon de prélèvement comme crédité sur votre compte bancaire ?
 TransData=Date de transmission
@@ -133,8 +133,8 @@ SEPARCUR=SEPA RCUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Date d'éxecution
 CreateForSepa=Créer fichier de prélèvement automatique
-ICS=Identifiant du créditeur (CI) du prélèvement
-ICSTransfer=Identifiant créditeur (CI) du virement bancaire
+ICS=Identifiant du créditeur CI du prélèvement
+ICSTransfer=Identifiant créditeur CI du virement bancaire
 END_TO_END=Balise XML SEPA "EndToEndId" - Identifiant unique attribué par transaction
 USTRD=Balise XML SEPA "Non structurée"
 ADDDAYS=Ajouter des jours à la date d'exécution
@@ -150,4 +150,4 @@ InfoRejectMessage=Bonjour, <br><br> l'ordre de prélèvement de la facture %s li
 ModeWarning=Option mode réel non établi, nous allons arrêter après cette simulation
 ErrorCompanyHasDuplicateDefaultBAN=La société avec l'identifiant %s a plus d'un compte bancaire par défaut. Aucun moyen de savoir lequel utiliser.
 ErrorICSmissing=ICS manquant pour le compte bancaire %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Le montant total de l'ordre de prélèvement diffère de la somme des lignes
diff --git a/htdocs/langs/fr_FR/zapier.lang b/htdocs/langs/fr_FR/zapier.lang
index cdd9e953847..c8f0d311f1f 100644
--- a/htdocs/langs/fr_FR/zapier.lang
+++ b/htdocs/langs/fr_FR/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier pour Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Module Zapier pour Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Configuration de Zapier pour Dolibarr
+ZapierForDolibarrSetup=Configuration de Zapier pour Dolibarr
 ZapierDescription=Interface avec Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/fr_GA/accountancy.lang b/htdocs/langs/fr_GA/accountancy.lang
deleted file mode 100644
index 552865118f1..00000000000
--- a/htdocs/langs/fr_GA/accountancy.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_GA/admin.lang b/htdocs/langs/fr_GA/admin.lang
index ca2cbd16ab0..140767493ca 100644
--- a/htdocs/langs/fr_GA/admin.lang
+++ b/htdocs/langs/fr_GA/admin.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 Module20Name=Devis
 Module30Name=Factures
-Module59000Desc=Module to follow margins
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_GA/modulebuilder.lang b/htdocs/langs/fr_GA/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/fr_GA/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/fr_GA/products.lang b/htdocs/langs/fr_GA/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/fr_GA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/fr_GA/withdrawals.lang b/htdocs/langs/fr_GA/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/fr_GA/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index de9a83b813d..9a9114c4fdc 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Liñas de facturas contabilizadas
 ExpenseReportLines=Liñas de informes de gastos a contabilizar
 ExpenseReportLinesDone=Liñas de informes de gastos contabilizadas
 IntoAccount=Contabilizar liña coa conta contable
-TotalForAccount=Total for accounting account
+TotalForAccount=Conta contable total 
 
 
 Ventilate=Contabilizar
@@ -143,7 +143,7 @@ Lineofinvoice=Liña da factura
 LineOfExpenseReport=Liña de informe de gastos
 NoAccountSelected=Non foi seleccionada conta contable
 VentilatedinAccount=Contabilizada con éxito na conta contable
-NotVentilatedinAccount=Conta sen contabilización na contabilidad
+NotVentilatedinAccount=Conta sen contabilización na contabilidade
 XLineSuccessfullyBinded=%s produtos/servizos relacionados correctamente nunha conta contable
 XLineFailedToBeBinded=%s produtos/servizos sen conta contable
 
@@ -169,8 +169,8 @@ ACCOUNTING_EXPENSEREPORT_JOURNAL=Informe de gastos diario
 ACCOUNTING_SOCIAL_JOURNAL=Diario social
 ACCOUNTING_HAS_NEW_JOURNAL=Ten un novo diario
 
-ACCOUNTING_RESULT_PROFIT=Conta de resultado contable (Beneficio)
-ACCOUNTING_RESULT_LOSS=Conta de resultado contable (Perdas)
+ACCOUNTING_RESULT_PROFIT=Conta contable de resultado  (Beneficio)
+ACCOUNTING_RESULT_LOSS=Conta contable de resultado  (Perdas)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Diario de peche
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta contable de transferencia bancaria
@@ -180,21 +180,21 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Conta contable de operacións pendentes de asignar
 DONATION_ACCOUNTINGACCOUNT=Conta contable de rexistro de doacións/subvencións
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conta contable de rexistro subscricións
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Conta contable por defecto para rexistrar os ingresos do cliente
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Conta contable por defecto para rexistrar os ingresos realizados polo cliente
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contable predeterminada para os produtos comprados (usada se non están definidos na folla de produtos)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conta contable predeterminada para os produtos comprados na CEE (usados se non están definidos na folla de produto)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Conta contable predeterminada para os produtos comprados e importados fóra da CEE (usada se non está definido na folla de produto)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contable predeterminada para os produtos vendidos (usada se non están definidos na folla de produtos)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Conta contable predeterminada para os produtos vendidos na CEE (usados se non están definidos na folla de produto)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Conta contable predeterminada para os produtos vendidos e exportados fóra da CEE (usados se non están definidos na folla de produto)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contable predeterminada para os produtos comprados (usada se non está definida na folla de produtos)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conta contable predeterminada para os produtos comprados na CEE (usada se non está definida na folla de produto)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Conta contable predeterminada para os produtos comprados e importados fóra da CEE (usada se non está definida na folla de produto)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contable predeterminada para os produtos vendidos (usada se non está definida na folla de produtos)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Conta contable predeterminada para os produtos vendidos na CEE (usada se non está definida na folla de produto)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Conta contable predeterminada para os produtos vendidos e exportados fóra da CEE (usada se non está definida na folla de produto)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contable predeterminada para os servizos comprados (usada se non están definidos na folla de servizos)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Conta contable predeterminada para os servizos comprados na CEE (usada se non está definido na folla de servizos)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Conta contable predeterminada para os servizos comprados e importados fóra da CEE (úsase se non está definido na folla de servizos)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contable predeterminada para os servizos vendidos (usada se non están definidos na folla de servizos)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Conta contable predeterminada para os servizos vendidos en EU (usada se non están definidos na folla de servizos)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=AConta contable predeterminada para os servizos vendidos e exportados fora da EU  (usada se non están definidos na folla de servizos)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contable predeterminada para os servizos comprados (usada se non está definida na folla de servizos)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Conta contable predeterminada para os servizos comprados na CEE (usada se non está definida na folla de servizos)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Conta contable predeterminada para os servizos comprados e importados fóra da CEE (úsase se non está definida na folla de servizos)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contable predeterminada para os servizos vendidos (usada se non está definida na folla de servizos)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Conta contable predeterminada para os servizos vendidos en EU (usada se non está definida na folla de servizos)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Conta contable predeterminada para os servizos vendidos e exportados fora da EU  (usada se non está definida na folla de servizos)
 
 Doctype=Tipo de documento
 Docdate=Data
@@ -209,10 +209,10 @@ Codejournal=Diario
 JournalLabel=Etiqueta diario
 NumPiece=Apunte
 TransactionNumShort=Núm. transacción
-AccountingCategory=Grupos persoalizados
+AccountingCategory=Grupo persoalizado
 GroupByAccountAccounting=Agrupar por conta contable
 GroupBySubAccountAccounting=Agrupar por subconta contable
-AccountingAccountGroupsDesc=Pode definir aquí algúns grupos de contas contables. Serán usadas para informes de contabilidade personalizados.
+AccountingAccountGroupsDesc=Pode definir aquí algúns grupos de contas contables. Serán usadas para informes de contabilidade persoalizados.
 ByAccounts=Por contas
 ByPredefinedAccountGroups=Por grupos predefinidos
 ByPersonalizedAccountGroups=Por grupos persoalizados
@@ -222,7 +222,7 @@ DeleteMvt=Eliminar liñas do Libro Maior
 DelMonth=Mes a eliminar
 DelYear=Ano a eliminar
 DelJournal=Diario a eliminar
-ConfirmDeleteMvt=Isto eliminará todas as liñas da contabilidade do ano/mes e/ou dun diario específico. (Precísase alo menos un criterio). Terá que reutilizar a función '% s' para que o rexistro eliminado volte ao libro maior.
+ConfirmDeleteMvt=Isto eliminará todas as liñas da contabilidade do ano/mes e/ou dun diario específico. (Precísase alo menos un criterio). Terá que reutilizar a función '%s' para que o rexistro eliminado volte ao libro maior.
 ConfirmDeleteMvtPartial=Isto eliminará a transacción d da contabilidade (eliminaranse todas as liñas relacionadas coa mesma transacción)
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Non é posible autodetectar, utilice o menú <a href=
 
 ## Import
 ImportAccountingEntries=Entradas contables
+ImportAccountingEntriesFECFormat=Entradas contables: formato FEC
+FECFormatJournalCode=Código de Diario (IdDiario)
+FECFormatJournalLabel=Etiqueta de Diario (EtiqDiario)
+FECFormatEntryNum=Número de peza (NumEscritura)
+FECFormatEntryDate=Data da peza (DataEscritura)
+FECFormatGeneralAccountNumber=Número de conta xeral (NumConta)
+FECFormatGeneralAccountLabel=Etiqueta de conta xeral (EtiqConta)
+FECFormatSubledgerAccountNumber=Número de conta do Libro Maior (NumLibMaior)
+FECFormatSubledgerAccountLabel=Etiqueta de conta do Libro Maior (EtiqLibMaior)
+FECFormatPieceRef=Referencia da peza (RefPeza)
+FECFormatPieceDate=Data de creación da peza (DataPeza)
+FECFormatLabelOperation=Etiqueta da operación (EcritureLib)
+FECFormatDebit=Débito (Débito)
+FECFormatCredit=Crédito (Crédito)
+FECFormatReconcilableCode=Código conciliable (Idconcilia)
+FECFormatReconcilableDate=Data conciliable (DataCoinci) 
+FECFormatValidateDate=Data da peza validada (DataValidada) 
+FECFormatMulticurrencyAmount=Importe multidivisa (Importedivisa)
+FECFormatMulticurrencyCode=Código multidivisa (Idivisa) 
+
 DateExport=Data de exportación
 WarningReportNotReliable=Advertencia, este informe non está baseado no Libro Maior, polo que non contén modificacións manualmente realizadas no Libro Maior. Se o seu diario está actualizado, a vista contable é mais precisa.
 ExpenseReportJournal=Informe de gastos diario
-InventoryJournal=Inventario
+InventoryJournal=Diario de inventario
+
+NAccounts=%s contas
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index 4d03682d5ef..6a53c55d19c 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Eliminar bloqueo de conexións
 YourSession=A súa sesión
 Sessions=Sesións de usuarios
 WebUserGroup=Usuario/grupo do servidor web
+PermissionsOnFiles=Permisos en ficheiros
 PermissionsOnFilesInWebRoot=Permisos de ficheiros no directorio web raiz
 PermissionsOnFile=Permisos de ficheiro %s
 NoSessionFound=Parece que o seu PHP non pode listar as sesións activas. O directorio de gardado automático de sesións (<b>%s</b>) pode estar protexido (por exemplo, polos permisos do sistema operativo ou pola directiva open_basedir do seu PHP).
@@ -57,11 +58,12 @@ SetupArea=Configuración
 UploadNewTemplate=Nova(s) prantilla(s) actualizada(s)
 FormToTestFileUploadForm=Formulario de proba de subida de ficheiro (según opcións escollidas)
 ModuleMustBeEnabled=O módulo/aplicación <b>%s</b> debe estar activado
-ModuleIsEnabled=The O módulo/aplicación <b>%s</b> has foi activado
+ModuleIsEnabled=O módulo/aplicación <b>%s</b> foi activado
 IfModuleEnabled=Nota: só é eficaz se o módulo <b>%s</b> está activado
 RemoveLock=Elimine o ficheiro <b>%s</b>, se existe, para permitir a utilidade de actualización.
 RestoreLock=Substituir un ficheiro <b>%s</b>, dándolle só dereitos de lectura a este ficheiro con el fin de prohibir nuevas actualizaciones.
 SecuritySetup=Configuración da seguridade
+PHPSetup=Configuración PHP
 SecurityFilesDesc=Defina aquí as opcións de seguridade relacionadas coa subida de ficheiros.
 ErrorModuleRequirePHPVersion=Erro, este módulo require unha versión %s ou superior de PHP
 ErrorModuleRequireDolibarrVersion=Erro, este módulo require unha versión %s ou superior de Dolibarr
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Esta área ofrece distintas funcións de administración. Ut
 Purge=Purga
 PurgeAreaDesc=Esta páxina permitelle borrar todos os ficheiros xerados ou almacenados por Dolibarr (ficheiros temporais ou todos os ficheiros do directorio <b>%s</b>). O uso desta función non é precisa. Se proporciona como solución para os usuarios cuxos Dolibarr atópanse nun provedor que non ofrece permisos para eliminar os ficheiros xerados polo servidor web.
 PurgeDeleteLogFile=Eliminar ficheiros de rexistro, incluidos <b> %s</b> definidos polo módulo Syslog (sen risco de perda de datos)
-PurgeDeleteTemporaryFiles=Eliminar todos os logs e ficheros temporais (sen risco de perda de datos). Nota: A eliminación dos ficheiros temporais é realizada só de o directorio temporal foi creado hai mas de 24h.
+PurgeDeleteTemporaryFiles=Elimina todos os ficheiros de rexistro e temporais (non hai risco de perder datos). O parámetro pode ser "tempfilesold", "logfiles" ou ambos "tempfilesold + logfiles". Nota: a eliminación de ficheiros temporais só se fai se o directorio temporal creouse hai máis de 24 horas.
 PurgeDeleteTemporaryFilesShort=Eliminar logs e ficheiros temporais.
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os ficheiros do directorio <b>%s</b>. <br> Isto eliminará todos os documentos xerados relacionados con elementos (terceiros, facturas, etc...), ficheiros actualizados no módulo ECM, copias de seguridade de bases de datos e ficheiros temporais.
 PurgeRunNow=Purgar agora
@@ -173,7 +175,7 @@ YouCanDownloadBackupFile=Os ficheiros xerados poden descargarse agora
 NoBackupFileAvailable=Ningunha copia dispoñible
 ExportMethod=Método de exportación
 ImportMethod=Método de importación
-ToBuildBackupFileClickHere=Para crear unha copia, faga click <a href="%s">aquí</a>.
+ToBuildBackupFileClickHere=Para crear unha copia, prema <a href="%s">aquí</a>.
 ImportMySqlDesc=Para importar un ficheiro de copia de seguridade de MYQL, pode usar phpMyAdmin a través do se aloxamento web ou usar o comando mysql desde a liña de comandos <br> Por exemplo:
 ImportPostgreSqlDesc=Para importar unha copia de seguridade, debe usar o comando pg_restore dende a línea de comandos:
 ImportMySqlCommand=%s %s < meuficheirobackup.sql
@@ -204,7 +206,7 @@ FeatureDisabledInDemo=Opción deshabilitada no demo
 FeatureAvailableOnlyOnStable=Funcionaliade dispoñible exclusivamente en versións oficiais estables
 BoxesDesc=Os paneis son compoñentes que amosan algunha información que pode engadires para persoalizar algunhas páxinas. Pode escoller entre amosar ou non o panel seleccionando a páxina de destino e facendo clic en 'Activar', ou facendo clic na papeleira para desactivalo.
 OnlyActiveElementsAreShown=Só os elementos de <a href="%s">módulos activados</a> son amosados.
-ModulesDesc=Os módulos/aplicacións determinan qué funcionalidade está habilitada no software. Algúns módulos requiren permisos que teñen que ser concedidos aos usuarios logo de activar o módulo. Faga clic no botón<span class="small valignmiddle"> %s </span>de acendido/apagado de cada módulo para habilitar ou desactivar un módulo/aplicación.
+ModulesDesc=Os módulos/aplicacións determinan qué funcionalidade está habilitada no software. Algúns módulos requiren permisos que teñen que ser concedidos aos usuarios logo de activar o módulo. Prema no botón<span class="small valignmiddle"> %s </span>de acendido/apagado de cada módulo para habilitar ou desactivar un módulo/aplicación.
 ModulesMarketPlaceDesc=Pode atopar mais módulos para descargar en sitios web externos da Internet ...
 ModulesDeployDesc=Se os permisos no seu sistema de ficheiros llo permiten, pode utilizar esta ferramenta para instalar un módulo externo. O módulo estará entón visible na lapela <strong>%s</strong>.
 ModulesMarketPlaces=Procurar módulos externos...
@@ -232,6 +234,7 @@ BoxesAvailable=Paneis dispoñibles
 BoxesActivated=Paneis activos
 ActivateOn=Activar en
 ActiveOn=Activo en
+ActivatableOn=Pódese activar en
 SourceFile=Ficheiro orixe
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dispoñible só se Javascript e Ajax non están desactivados
 Required=Requirido
@@ -347,9 +350,10 @@ LastActivationAuthor=Último autor de activación
 LastActivationIP=Última IP activa
 UpdateServerOffline=Actualizar servidor offline
 WithCounter=Con contador
-GenericMaskCodes=Pode introducir calquera máscara numérica. Nsta máscara, pode utilizar as seguintes etiquetas:<br><b>{000000} </b> corresponde a un número que incrementase en cada un de %s. Introduza tantos ceros como lonxitude desexa amosar. O contador complétase a partir de ceros pola esquerda coa finalidade de ter tantos ceros como a máscara. <br> <b> {000000+000}</ b> Igual que o anterior, cunha compensación correspondente ao número á dereita do sinal + aplícase a partires do primeiro %s. <br> <b> {000000@x}</b> igual que o anterior, pero o contador restablecese a cero cando chega a x meses (x entre 1 e 12). Se esta opción é utilizada e x é de 2 ou superior, entón a secuencia {yy}{mm} o {yyyy}{mm} tamén é precisa. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mes (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> ano en 2, 4 ou 1 cifra.<br>
-GenericMaskCodes2=<b>{cccc}</b> código de cliente con n caracteres<br><b>{cccc000}</b> código de cliente con n caracteres é seguido por un contador adicado a clientes. Este contador adicado a clientes será reseteado ao mismo tempo que o contador global.<br><b>{tttt}</b> O código do tipo de empresa con n caracteres (vexa diccionarios->tipos de empresa).<br>
+GenericMaskCodes=Pode introducir calquera máscara de numeración. Nesta máscara pódense usar as seguintes etiquetas: <br><b> {000000} </b> corresponde a un número que se incrementará en cada %s. Introduza tantos ceros como a lonxitude desexada do contador. O contador completarase con ceros desde a esquerda para ter tantos ceros como a máscara.<br><b>{000000+000}</b>igual que o anterior pero aplícase unha compensación correspondente ao número á dereita do signo + a partir do primeiro %s.<br><b> {000000@x} </b>igual que o anterior pero o contador restablécese a cero cando se alcanza o mes x (x entre 1 e 12 ou 0 para usar os primeiros meses do ano fiscal definidos na súa configuración ou 99 para restablecer a cero cada mes). Se se usa esta opción e x é 2 ou superior, entón tamén é necesaria a secuencia {yy} {mm} ou {yyyy} {mm}. <br><b>{dd} </b> días (01 a 31) .<br><b>{mm} </b>meses (01 a 12) . <br><b>{yy}</b>,<b>{yyyy}</b> ou <b>{y}</b>anos sobre 2, 4 ou 1 números.<br>
+GenericMaskCodes2=<b>{cccc}</b> o código do cliente en n caracteres<br><b> {cccc000}</b>o código do cliente en n caracteres é seguido dun contador adicado ao cliente. Este contador adicado ao cliente restablécese ao mesmo tempo que o contador global.<br><b> {tttt}</b> O código do tipo de terceiros en n caracteres (ver menú Inicio - Configuración - Dicionario - Tipos de terceiros). Se engade esta etiqueta, o contador será diferente para cada tipo de terceiro <br>
 GenericMaskCodes3=Calquera outro caracter na máscara quedará sen cambios. <br>Non son permitidos espazos <br>
+GenericMaskCodes3EAN=Os demais caracteres da máscara permanecerán intactos (excepto * ou? na 13ª posición en EAN13).<br> Non están permitidos espazos.<br> En EAN13, o último carácter despois do último } na 13ª posición debería ser * ou ?. Substituirase pola chave calculada.<br>
 GenericMaskCodes4a=<u>Exemplo no 99th %s do terceiro a Empresa con data do 31/01/2007: </u><br>
 GenericMaskCodes4b=<u>Exemplo sobre un terceiro creado o 31/03/2007:</u><br>
 GenericMaskCodes4c=<u>Exemplo nun produto/servizo creado o 31/03/2007:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Deixar este campo en branco significa que este valor
 ExtrafieldParamHelpselect=A listaxe de parámetros ten que ser key,valor<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para ter unha lista en funcion de campos adicionais de lista:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para ter unha lista en función doutra:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=A listaxe de parámetros debe ser ser liñas con formato key,value (onde key non pode ser '0')<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=A listaxe de parámetros tiene que ser key,valor (onde key non pode ser 0)<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=A listaxe de parámetros provén dunha táboa <br> Syntax: table_name:label_field:id_field::filter <br> Exemplo: c_typent: libelle:id::filter <br> <br> - id_field é necesariamente unha chave int primaria <br> -filter pode ser unha proba sinxela (por exemplo, activa = 1) Para amosar só o valor activo <br> Tamén pode utilizar $ID$ no filtro o cal é o  id do obxecto actual <br> Para facer un SELECT no filtro de uso $SEL$ <br> se desexa filtrar en campos adicionais pode utilizar a sintaxe extra.fieldcode=... (onde código de campo é o código de campo adicional) <br> <br> Para que a lista dependa doutra lista de campos adicionais list: <br> c_typent:libelle:id: options_ <i> parent_list_code </i> |parent_column:filter <br> <br> Para que a lista dependa doutra lista: <br> c_typent:libelle:id: <i> parent_list_code </i> |parent_column:filter
-ExtrafieldParamHelpchkbxlst=A listaxe de parámetros provén dunha táboa <br> Sintaxe: table_name:label_field:id_field::filter<br> Exemplo: c_typent: libelle: id:: filter <br> <br> o filtro pode ser unha proba sinxela (por exemplo, activa = 1) Para amosar só o valor activo <br> Tamén pode utilizar $ID$ no filtro no que é o id  do obxecto actual <br> Para facer un SELECT no filtro  use $SEL$ <br> se desexa filtrar en campos adicionais pode utilizar a sintaxe extra.fieldcode = ... (onde o código de campo é o código de campo adicional) <br> <br> Para que a lista dependa doutra lista de campos adicionais: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> |parent_column: filter <br> <br> Para que a lista dependa doutra lista: <br> c_typent: libelle:id: <i> parent_list_code </i> |parent_column:filter
+ExtrafieldParamHelpsellist=A listaxe de valores provén dunha táboa<br> Sintaxe:table_name:label_field:id_field::filtersql<br> Exemplo:c_typent:libelle:id::filtersql<br><br>-id_field é necesariamente unha chave int primaria <br>-filtersql é unha condición SQL. Pode ser unha proba sinxela (por exemplo, active=1) para amosar só o valor actual <br> Tamén pode utilizar $ID$ no filtro o cal é o id activo do obxecto actual <br> Para facer un SELECT no filtro use a palabra chave $SEL$ para ignorar a protección antiinxección.<br>Se quere filtrar en campos adicionais extrafields use a sintaxe extra.fieldcode=...(onde o código do campo é o código do campo adicional extrafield)<br><br>Para ter a listaxe dependendo doutra listaxe de atributos complementarios:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filtro<br><br>Para ter a listaxe dependendo doutra listaxe:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=A listaxe de valores provén dunha táboa<br> Sintaxe:table_name:label_field:id_field::filtersq<br>Exemplo:c_typent:libelle:id::filtersql<br><br> O filtro pode ser unha proba sinxela (por exemplo, active=1) para amosar só o valor actual<br>tamén pode utilizar $ID$ no filtro o cal é o ID activo do obxecto actual<br> Para facer un SELECT no filtro use $SEL$<br> se desexa filtrar en campos adicionais extrafields use a sintaxe extra.fieldcode=...(onde o código de campo é o código do campo adicional extrafield)<br><br>Para ter a listaxe dependendo doutra listaxe de campos adicionais:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter<br><br>Para ter a listaxe dependendo doutra listaxe:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Os parámetros deben ser ObjectName:Classpath<br>Sintaxe: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Manter baleiro para un separador simple. <br> Estableza isto en 1 para un separador colapsado (aberto por defecto para a nova sesión, entón o estado manterase para cada sesión de usuario) <br> Estableza isto a 2 para un separador colapsado (contraído por defecto para a nova sesión, o estado mantense antes de cada sesión de usuario)
 LibraryToBuildPDF=Libreria usada na xeración dos PDF
@@ -453,7 +457,7 @@ LocalTaxDesc=Algúns países poden aplicar dous ou tres impostos en cada liña d
 SMS=SMS
 LinkToTestClickToDial=Insira un número de teléfono ao que chamar para amosar unha ligazón e probar a URL ClickToDial para o usuario <strong>%s </strong>
 RefreshPhoneLink=Refrescar ligazón
-LinkToTest=Ligazón seleccionable xarada para o usuario  <strong>%s</strong> (faga clic no número de teléfono para probar)
+LinkToTest=Ligazón seleccionable xarada para o usuario  <strong>%s</strong> (prema no número de teléfono para probar)
 KeepEmptyToUseDefault=Deixe baleiro este campo para usar o valor por defecto
 KeepThisEmptyInMostCases=En moitos casos, pode deixar este campo baleiro.
 DefaultLink=Ligazón por defecto
@@ -541,6 +545,8 @@ Module40Name=Provedores
 Module40Desc=Provedores e xestión de compras (pedimentos de compra e facturación de provedores)
 Module42Name=Rexistros de depuración
 Module42Desc=Xeración de logs (ficheiros, syslog,...). Ditos rexistros son para propósitos técnicos/depuración.
+Module43Name=Barra de depuración
+Module43Desc=Unha ferramenta para que o programador engada unha barra de depuración no seu navegador.
 Module49Name=Editores
 Module49Desc=Xestión de editores
 Module50Name=Produtos
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacidades de conversión GeoIP Maxmind
 Module3200Name=Ficheiros inalterables
 Module3200Desc=Activar o rexistro inalterable de eventos empresarais. Os eventos arquívanse en tempo real. O rexistro é unha taboa de sucesos encadeados que poden lerse e exportar. Este módulo pode ser obrigatorio nalgúns países.
+Module3400Name=Redes sociais
+Module3400Desc=Active os campos das redes sociais en terceiros e enderezos (skype, twitter, facebook, ...).
 Module4000Name=RRHH
 Module4000Desc=Departamento de Recursos Humanos (xestión do departamento, contratos de empregados)
 Module5000Name=Multi-empresa
 Module5000Desc=Permite xestionar varias empresas
-Module6000Name=Fluxo de traballo
-Module6000Desc=Xestión de fluxos de traballo (creación automática dun obxecto e/ou cambio de estado automático)
+Module6000Name=Fluxo de traballo entre módulos
+Module6000Desc=Xestión do fluxo de traballo entre diferentes módulos (creación automática de obxectos e/ou cambio de estado automático)
 Module10000Name=Sitios web
 Module10000Desc=Crea sitios web (públicos) cun editor WYSIWYG. Trátase dun CMS orientado a administradores web ou desenvolvedores (é mellor coñecer linguaxe HTML e CSS). Só ten que configurar o seu servidor web (Apache, Nginx, ...) para que apunte ao directorio Dolibarr adicado para que estexa en liña en internet co seu propio nome de dominio.
 Module20000Name=Xestión de días libres retribuidos
@@ -670,7 +678,7 @@ Module54000Desc=A impresión directa (sen abrir os documentos) usa o interfaz Cu
 Module55000Name=Enquisa ou Voto
 Module55000Desc=Módulo para facer enquisas en líña ou votos (como Doodle, Studs, Rdvz, ...)
 Module59000Name=Marxes
-Module59000Desc=Modulo para controlar marxes
+Module59000Desc=Módulo para xestionar os marxes de beneficio
 Module60000Name=Comisións
 Module60000Desc=Módulo para xestionar aas comisións de venda
 Module62000Name=Incoterms
@@ -770,7 +778,7 @@ Permission182=Crear/modificar pedimentos a provedores
 Permission183=Validar pedimentos a provedores
 Permission184=Aprobar pedimentos a provedores
 Permission185=Ordenar ou cancelar pedimentos a provedores
-Permission186=Recibir pedimentos de provedores
+Permission186=Recibir pedimentos a provedores
 Permission187=Pechar pedimentos a provedores
 Permission188=Anular pedimentos a provedores
 Permission192=Crear liñas
@@ -805,7 +813,8 @@ PermissionAdvanced253=Crear/modificar usuarios internos/externos e os seus permi
 Permission254=Crear/modificar únicamente usuarios externos
 Permission255=Modificar o contrasinal doutros usuarios
 Permission256=Eliminar ou desactivar outros usuarios
-Permission262=Ampliar o acceso a todos os terceiros (non só aos terceiros dos que o usuario é comercial).<br>Non efectivo para usuarios externos (sempre están limitados aos seus propios orzamentos, facturas, contratos, etc.).<br>Non efectivo para proxectos (só permisos de visión e asignación dos proxectos).
+Permission262=Ampliar o acceso a todos os terceiros E aos seus obxectos (non só aos terceiros para os que o usuario é representante da venda).<br> Non é efectivo para usuarios externos (sempre limitados a eles mesmos para orzamentos, pedimentos, facturas, contratos, etc.). <br> Non é efectivo para proxectos (só as regras en permisos de proxectos, visibilidade e asuntos de asignación).
+Permission263=Ampliar o acceso a todos os terceiros SEN os seus obxectos (non só a terceiros para os que o usuario é representante da venda).<br> Non é efectivo para usuarios externos (sempre limitado a eles mesmos para orzamentos, pedimentos, facturas, contratos, etc.). <br> Non é efectivo para proxectos (só as regras en permisos de proxectos, visibilidade e asuntos de asignación).
 Permission271=Consultar o CA
 Permission272=Consultar facturas
 Permission273=Emitir facturas
@@ -899,11 +908,11 @@ Permission1183=Crear/modificar pedimentos a provedores
 Permission1184=Validar pedimentos a provedores
 Permission1185=Aprobar pedimentos a provedores
 Permission1186=Enviar pedimentos a provedores
-Permission1187=Recibir pedimentos de provedores
+Permission1187=Recibir pedimentos a provedores
 Permission1188=Pechar pedimentos a provedores
 Permission1189=Marcar/Desmarcar a recepción dunha orde de compra
 Permission1190=Aprobar (segunda aprobación) pedimentos a provedores
-Permission1191=Exportar pedimentos de provedores e os seus atributos
+Permission1191=Exportar pedimentos a provedores e os seus atributos
 Permission1201=Obter resultado dunha exportación
 Permission1202=Crear/codificar exportacións
 Permission1231=Consultar facturas de provedores
@@ -912,7 +921,7 @@ Permission1233=Validar facturas de provedores
 Permission1234=Eliminar facturas de provedores
 Permission1235=Enviar facturas de provedores por correo
 Permission1236=Exportar facturas de provedores, campos adicionais e pagamentos
-Permission1237=Exportar pedimentos de provedores xunto cos seus detalles
+Permission1237=Exportar pedimentos a provedores xunto cos seus detalles
 Permission1251=Lanzar as importacións en masa á base de datos (carga de datos)
 Permission1321=Exportar facturas a clientes, campos adicionais e cobros
 Permission1322=Reabrir unha factura pagada
@@ -1175,7 +1184,8 @@ SetupDescription2=As seguintes dúas seccións son obrigatorias (as dúas primei
 SetupDescription3=<a href="%s">%s->%s</a> <br><br> Parámetros básicos usados para persoalizar o comportamento por defecto de Dolibarr (ex. características relacionadas co país)
 SetupDescription4=<a href="%s">%s -> %s</a> <br><br> Este software é unha colección de moitos módulos/aplicacións, todos eles mais ou menos independentes. Os módulos relevantes que precisas deben ser activados e configurados. Novos elementos/opcións serán engadidos aos menús coa activación do módulo.
 SetupDescription5=Outras entradas do menú de configuración xestionan parámetros opcionais.
-LogEvents=Auditoría da seguridade de eventos
+AuditedSecurityEvents=Eventos de seguridade auditados
+NoSecurityEventsAreAduited=Non se auditan eventos de seguridade. Pode activalos no menu %s
 Audit=Auditoría
 InfoDolibarr=Sobre Dolibarr
 InfoBrowser=Sobre o Navegador
@@ -1193,7 +1203,7 @@ LogEventDesc=Pode habilitar o rexistro de eventos de seguridade aquí. Os admini
 AreaForAdminOnly=Os parámetros de configuración poden ser tratados por <b>usuarios administradores</b> exclusivamente.
 SystemInfoDesc=A información do sistema é información técnica accesible en modo lectura para administradores exclusivamente.
 SystemAreaForAdminOnly=Esta área é accesible aos usuarios administradores exclusivamente. Os permisos dos usuarios de Dolibarr non permiten cambiar esta restricción.
-CompanyFundationDesc=Edite a información da súa empresa/entidade. Faga clic no botón "%s" a pé de páxina cando remate
+CompanyFundationDesc=Edite a información da súa empresa/entidade. Prema no botón "%s" a pé de páxina cando remate
 AccountantDesc=Se ten un contable/auditor externo, pode editar aquí a súa información.
 AccountantFileNumber=Número de ficheiro
 DisplayDesc=Pode modificar aquí todos os parámetros relacionados coa apariencia do Dolibarr
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Parece preciso realizar o proceso de actualiza
 YouMustRunCommandFromCommandLineAfterLoginToUser=Debe executar esta orde dende unha shell despois de ter iniciado sesión co usuario <b>%s</b> ou debe engadir a opción -W ao final da liña para proporcionar un contrasinal de <b> %s </b>
 YourPHPDoesNotHaveSSLSupport=Funcións SSL non dispoñibles no seu PHP
 DownloadMoreSkins=Mais temas para descargar
-SimpleNumRefModelDesc=Volta un número baixo o formato %syymm-nnnn donde y é o ano, mm o mes e nnnn un contador secuencial sen ruptura e sen regresar a 0
+SimpleNumRefModelDesc=Devolve o número de referencia no formato %s yymm-nnnn onde yy é o ano, mm é o mes e nnnn é un número secuencial de incremento automático sen restablecer
 ShowProfIdInAddress=Amosa o identificador profisional nos enderezos dos documentos
 ShowVATIntaInAddress=Ocultar o CIF intracomunitario nos enderezos dos documentos
 TranslationUncomplete=Tradución parcial
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Nome/Enderezo do servidor proxy
 MAIN_PROXY_PORT=Porto do servidor proxy
 MAIN_PROXY_USER=Login do servidor proxy
 MAIN_PROXY_PASS=Contrasinal do servidor proxy
-DefineHereComplementaryAttributes=Defina aquí a listaxe de campos adicionais, non dispoñibles por defecto, e que desexa xestionar para %s.
+DefineHereComplementaryAttributes=Defina os atributos adicionais / personalizacións que se deben engadir a: %s
 ExtraFields=Campos adicionais
 ExtraFieldsLines=Campos adicionais (liñas)
 ExtraFieldsLinesRec=Campos adicionais (prantillas de liñas de facturas)
@@ -1287,7 +1297,7 @@ SendmailOptionMayHurtBuggedMTA=A función para enviar correos usando o método "
 TranslationSetup=Configuración de tradución
 TranslationKeySearch=Buscar unha chave ou cadea de tradución
 TranslationOverwriteKey=Sobreescribir una cadena traducida
-TranslationDesc=Como configurar o idioma de visualización:<br>* Por defecto Sistema: menu <strong>Inicio - Configuración - Entorno</strong><br>* Por usuario: faga clic no nome de usuario na parte superior da pantalla e modifique a pestana <strong> Configuración da visualización do usuario </strong> na tarxeta de usuario.
+TranslationDesc=Como configurar o idioma de visualización:<br>* Por defecto Sistema: menu <strong>Inicio - Configuración - Entorno</strong><br>* Por usuario: prema no nome de usuario na parte superior da pantalla e modifique a pestana <strong> Configuración da visualización do usuario </strong> na tarxeta de usuario.
 TranslationOverwriteDesc=Tamén pode reemplazar cadeas enchendo a seguinte táboa. Escolla o seu idioma no menú despregable "%s", insira a cadea de clave de tradución en "%s" e a súa nova tradución en "%s"
 TranslationOverwriteDesc2=Podes usar a outra pestana para axudarche a saber que clave de tradución usar
 TranslationString=Cadea traducida
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Inicio de sesión (unix)
 LDAPFieldLoginExample=Exemplo : uid
 LDAPFilterConnection=Filtro de búsqueda
 LDAPFilterConnectionExample=Exemplo : &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Exemplo: & (objectClass = groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Exemplo : samaccountname
 LDAPFieldFullname=Nome completo
@@ -1606,7 +1617,7 @@ DoNotUseDescriptionOfProdut=A descrición do produto nunca se incluirá na descr
 MergePropalProductCard=Activar no produto/servizo a pestana Documentos unha opción para fusionar documentos PDF de produtos ao orzamento PDF azur se o produto/servizo atópase no orzamento
 ViewProductDescInThirdpartyLanguageAbility=Amosar as descricións dos produtos no idioma do terceiro
 UseSearchToSelectProductTooltip=Tamén, se ten un gran número de produtos (> 100 000), pode aumentar a velocidade configurando PRODUCT_DONOTSEARCH_ANYWHERE constante en 1 en Configuración-> Outro. A busca limitarase entón ao comezo da cadea.
-UseSearchToSelectProduct=Agard a que prema unha tecla antes de cargar o contido da listaxe combinada de produtos (Isto pode aumentar o rendemento se ten un gran número de produtos, pero é menos conveniente)
+UseSearchToSelectProduct=Agarda a que prema unha tecla antes de cargar o contido da listaxe combinada de produtos (Isto pode aumentar o rendemento se ten un gran número de produtos, pero é menos conveniente)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras predeterminado para usar en produtos
 SetDefaultBarcodeTypeThirdParties=Tipo de código de barras predeterminado para usar con terceiros
 UseUnits=Defina unha unidade de medida para Cantidade durante a edición de liñas de orzamento, pedimento ou factura
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=A súa empresa está cofigurada para que non use o IVE
 AccountancyCode=Código de contabilidade
 AccountancyCodeSell=Conta de venda. código
 AccountancyCodeBuy=Conta de compras código
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Manteña a caixa de verificación "Crear automáticamente o pagamento" baleira por defecto cando cree unha nova taxa
 ##### Agenda #####
 AgendaSetup=Configuración do módulo de eventos e axenda
 PasswordTogetVCalExport=Chave para autorizar a ligazón de exportación
+SecurityKey = Chave de seguridade
 PastDelayVCalExport=Non exportar eventos anteriores a
 AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (xestionados no menú Configuración -> Dicionarios -> Tipo de eventos da axenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Definir automaticamente este valor predeterminado para o tipo de evento no formulario de creación de eventos
@@ -1751,7 +1764,7 @@ AGENDA_REMINDER_EMAIL=Activar a lembranza de eventos <b> por correo electrónico
 AGENDA_REMINDER_EMAIL_NOTE=Nota: A frecuencia da tarefa %s debe ser suficiente para asegurarse de que as lembranzas se envían no momento correcto.
 AGENDA_SHOW_LINKED_OBJECT=Amosar o obxecto ligado á vista de axenda
 ##### Clicktodial #####
-ClickToDialSetup=Faga clic para marcar a configuración do módulo
+ClickToDialSetup=Prema para marcar a configuración do módulo
 ClickToDialUrlDesc=Url chamada cando se fai un clic na imaxe do teléfono. En URL, pode usar etiquetas <br> <b> __PHONETO__ </b> que se substituirán polo número de teléfono da persoa á que chamar <br> <b> __PHONEFROM__ </b> que se substituirá polo número de teléfono persoa (túa) <br> <b> __LOGIN__ </b> que se substituirá por inicio de sesión clicktodial (definido na tarxeta de usuario) <br> <b> __PASS__ </b> que se substituirá por contrasinal clicktodial (definido na tarxeta de usuario).
 ClickToDialDesc=Este módulo cambia os números de teléfono cando se usa un ordenador de escritorio por ligazóns onde se pode facer clic. Un clic chamará ao número. Isto pódese empregar para iniciar a chamada cando se usa un teléfono por software no seu escritorio ou cando se usa un sistema CTI baseado no protocolo SIP por exemplo. Nota: Cando se usa un teléfono intelixente, sempre se pode facer clic nos números de teléfono.
 ClickToDialUseTelLink=Use só unha ligazón "tel:" nos números de teléfono
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Marxe inferior en PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para logotipo en PDF
 NothingToSetup=Non é precisa ningunha configuración específica para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Configure isto en sí, se este grupo é un cálculo doutros grupos
-EnterCalculationRuleIfPreviousFieldIsYes=Introduza a regra de cálculo se o campo anterior estaba configurado en Si (por exemplo 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Introduza a regra de cálculo se o campo anterior estivo establecido en Si. <br>Por exemplo:<br> CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Atopáronse varias variantes de idioma
 RemoveSpecialChars=Eliminar caracteres especiais
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtro de rexistro para limpar o valor (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Configuración do módulo Redes sociais
 EnableFeatureFor=Activar funcións para <strong>%s</strong>
 VATIsUsedIsOff=Nota: A opción para usar Vendas IVE ou IVE configurouse como <strong> Desactivado </strong> no menú %s -%s, polo que Vendas IVE ou IVE empregados serán sempre 0 para as vendas.
 SwapSenderAndRecipientOnPDF=Cambiar a posición do remitente e do destinatario en documentos PDF
-FeatureSupportedOnTextFieldsOnly=Aviso, característica admitida só nos campos de texto. Tamén debe definirse un parámetro URL action=create ou action=edit Ou o nome da páxina debe rematar con 'new.php' para activar esta función.
+FeatureSupportedOnTextFieldsOnly=Aviso, función compatible só cos campos de texto e listaxes combinadas. Tamén debe definirse un parámetro URL action=create ou action=edit OU o nome da páxina debe rematar con 'new.php' al trigger de esta función.
 EmailCollector=Receptor de correo electrónico
 EmailCollectorDescription=Engade unha tarefa programada e unha páxina de configuración para escanear regularmente caixas de correo electrónico (usando o protocolo IMAP) e gardarr os correos electrónicos recibidos na súa aplicación no lugar axeitado e/ou crear algúns rexistros automaticamente (como clientes potenciais).
 NewEmailCollector=Novo receptor de correo electrónico
@@ -2049,8 +2062,11 @@ UseDebugBar=Use a barra de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas liñas de rexistro para manter na consola.
 WarningValueHigherSlowsDramaticalyOutput=Advertencia, os valores altos ralentizan enormemente a saída.
 ModuleActivated=O módulo %s está activado e ralentiza a interface
+ModuleActivatedWithTooHighLogLevel=O módulo %s está activado cun nivel de rexistro demasiado alto (tente usar un nivel inferior para mellor rendemento)
+ModuleSyslogActivatedButLevelNotTooVerbose=O módulo %s está activado e o nivel de log (%s) é correcto (non moi detallado)
 IfYouAreOnAProductionSetThis=Se está nun entorno de produción, debe establecer esta propiedade en %s..
 AntivirusEnabledOnUpload=Antivirus activado nos ficheiros actualizados
+SomeFilesOrDirInRootAreWritable=Algúns ficheiros ou directorios non están en modo de só lectura
 EXPORTS_SHARE_MODELS=Os modelos de exportación son compartidos con todos.
 ExportSetup=Configuración do módulo de exportación.
 ImportSetup=Configuración do módulo Importación
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Fai un Ping anónimo '+1' ao servidor da fundación Dolibarr (
 FeatureNotAvailableWithReceptionModule=Función non dispoñible cando a recepción do módulo está activada
 EmailTemplate=Modelo para correo electrónico
 EMailsWillHaveMessageID=Os correos electrónicos terán unha etiqueta "Referencias" que coincide con esta sintaxe
+PDF_SHOW_PROJECT=Amosar proxecto no documento
+ShowProjectLabel=Etiqueta do proxecto
 PDF_USE_ALSO_LANGUAGE_CODE=Se desexa ter algúns textos no seu PDF duplicados en 2 idiomas diferentes no mesmo PDF xerado, debe configurar aquí este segundo idioma para que o PDF xerado conteña 2 idiomas diferentes na mesma páxina, o elixido ao xerar PDF e este (só algúns modelos PDF soportan isto). Mantéñase baleiro por un idioma por PDF.
 FafaIconSocialNetworksDesc=Introduza aquí o código dunha icona FontAwesome. Se non sabe o que é FontAwesome, pode usar o valor xenérico fa-address-book.
 FeatureNotAvailableWithReceptionModule=Función non dispoñible cando a recepción do módulo está activada
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Modificar este valor a %s é recomendable para maio
 DictionaryProductNature= Natureza do produto
 CountryIfSpecificToOneCountry=País (se é específico dun determinado país)
 YouMayFindSecurityAdviceHere=Pode atopar avisos de seguridade aquí
-ModuleActivatedMayExposeInformation=Este módulo pode expor datos sensible. Se non o precisa, desactive.
+ModuleActivatedMayExposeInformation=Esta extensión de PHP pode amosar datos sensibles. Se non a precisa, desactivea
 ModuleActivatedDoNotUseInProduction=Un módulo deseñado para desenvolvemento foi activado. Non o active nun entorno de produción.
 CombinationsSeparator=Caracter separador para combinación de produtos
 SeeLinkToOnlineDocumentation=Ver ligazón á documentación en liña no menú superior con exemplos
 SHOW_SUBPRODUCT_REF_IN_PDF=Se se usa a función "%s" do módulo <b>%s</b>, amosa os detalles dos subprodutos dun kit en PDF.
 AskThisIDToYourBank=Póñase en contacto co seu banco para obter esta identificación
+AdvancedModeOnly=Permiso dispoñible só en modo de permisos avanzados
+ConfFileIsReadableOrWritableByAnyUsers=Calquera usuario pode ler ou escribir o ficheiro conf. Dar permiso só ao usuario e ao grupo do servidor web.
+MailToSendEventOrganization=Organización de eventos
+AGENDA_EVENT_DEFAULT_STATUS=Estado predeterminado do evento ao crear un evento desde o formulario
+YouShouldDisablePHPFunctions=Debería desactivar as funcións PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Agás se precisa executar comandos do sistema (para o módulo Traballo programado, ou executar o antivirus na liña de comandos externa por exemplo), debería ddescativar as funcións PHP
+NoWritableFilesFoundIntoRootDir=Non se atoparon ficheiros ou directorios con permisos de escritura dos programas comúns no directorio raíz (Bo)
+RecommendedValueIs=Recomendado %s
+ARestrictedPath=Un path restrinxido
diff --git a/htdocs/langs/gl_ES/agenda.lang b/htdocs/langs/gl_ES/agenda.lang
index b0328266609..95a0a0be7dc 100644
--- a/htdocs/langs/gl_ES/agenda.lang
+++ b/htdocs/langs/gl_ES/agenda.lang
@@ -4,7 +4,7 @@ Actions=Eventos
 Agenda=Axenda
 TMenuAgenda=Axenda
 Agendas=Axendas
-LocalAgenda=Calendario interno
+LocalAgenda=Calendario por defecto
 ActionsOwnedBy=Evento propiedade de
 ActionsOwnedByShort=Propietario
 AffectedTo=Asignada a
@@ -14,13 +14,13 @@ EventsNb=Número de eventos
 ListOfActions=Listaxe de eventos
 EventReports=Informes de evento
 Location=Localización
-ToUserOfGroup=Enento asignado a calquera usuario do grupo
+ToUserOfGroup=Evento asignado a calquera usuario do grupo
 EventOnFullDay=Evento para todo o(s) día(s)
 MenuToDoActions=Todos os eventos incompletos
 MenuDoneActions=Todos os eventos rematados
 MenuToDoMyActions=Meus eventos incompletos
 MenuDoneMyActions=Meus eventos rematados
-ListOfEvents=Listaxe de acontecementos (calendario interno)
+ListOfEvents=Listaxe de eventos (calendario por defecto)
 ActionsAskedBy=Eventos rexistrados por
 ActionsToDoBy=Eventos asignados a
 ActionsDoneBy=Eventos realizados por
@@ -31,7 +31,7 @@ ViewWeek=Vista semanal
 ViewPerUser=Vista por usuario
 ViewPerType=Vista por tipo
 AutoActions= Inclusión automática na axenda
-AgendaAutoActionDesc= Aquí podes definir os eventos que queras que Dolibarr cre automáticamente in Agenda. Se non sinalas nada,  só as accións manuais serán visualizadas na axenda. O seguemento automático de accións comerciais sobre obxectos (validación, cambio de estado, non será gardado.
+AgendaAutoActionDesc= Aquí podes definir os eventos que queras que Dolibarr cre automáticamente en Axenda. Se non sinalas nada,  só as accións manuais serán visualizadas na axenda. O seguemento automático de accións comerciais sobre obxectos (validación, cambio de estado), non será gardado.
 AgendaSetupOtherDesc= Esta páxina ten opcións que permiten a configuración da exportación dos eventos de Dolibarr a un calendario externo (Thunderbird, Google Calendar etc...)
 AgendaExtSitesDesc=Esta páxina permite configurar fontes externas de calendarios para ver os seus eventos dentro da axenda Dolibarr.
 ActionsEvents=Eventos para que Dolibarr cre unha acción na axenda automáticamente
@@ -119,6 +119,7 @@ MRP_MO_UNVALIDATEInDolibarr=OF establecida a borrador
 MRP_MO_PRODUCEDInDolibarr=OF producida
 MRP_MO_DELETEInDolibarr=OF eliminada
 MRP_MO_CANCELInDolibarr=OF cancelada
+PAIDInDolibarr=%s xa pago
 ##### End agenda events #####
 AgendaModelModule=Prantillas de documentos para eventos
 DateActionStart=Data de inicio
@@ -130,7 +131,7 @@ AgendaUrlOptions4=<b>logint=%s</b>para restrinxir saída as accións asignadas a
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> para restrinxir saída de accións asociadas ao proxecto <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> para excluir o evento automáticamente.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> a incluir eventos de vacacións.
-AgendaShowBirthdayEvents=Amosar cumpreanos dos contactos
+AgendaShowBirthdayEvents=Aniversarios dos contactos
 AgendaHideBirthdayEvents=Ocultar cumpreanos dos contactos
 Busy=Ocupado
 ExportDataset_event1=Listaxe de eventos da axenda
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index bbcfd6fd8f9..c262df8c706 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=A súa orde SEPA
 FindYourSEPAMandate=Esta é a súa orde SEPA para autorizar a nosa empresa a realizar un petición de débito ao seu banco. Envíea de volta asinada (dixitalice o documento asinado) ou envíe por correo a
 AutoReportLastAccountStatement=Automaticanete cubra a etiqueta 'numero de extracto bancario' co último número de extracto de cando fixo a reconciliación
 CashControl=Control de caixa TPV
-NewCashFence=Pehe de nova caixa
+NewCashFence=Nova apertura ou peche de caixa
 BankColorizeMovement=Colorear os movementos
 BankColorizeMovementDesc=Se esta función está activada, pode escoller unha cor específica do fondo dos movementos de crédito ou de débito
 BankColorizeMovementName1=Cor de fondo para movementos de débito
 BankColorizeMovementName2=Cor de fondo para os movementos de crédito
 IfYouDontReconcileDisableProperty=Se non aplica as reconciliacións bancarias nalgunhas contas bancarias, desactivar as propiedades "%s" nelas apara eliminar este aviso.
 NoBankAccountDefined=Non está definida a conta bancaria
+NoRecordFoundIBankcAccount=Non foi atopado ningún rexistro na conta bancaria. Normalmente, isto ocorre cando un rexistro foi eliminado manualmente da listaxe de transaccións da conta bancaria (por exemplo, durante a conciliación da conta bancaria). Outro motivo é que o pagamento foi rexistrado cando o modulo "%s estivo" desactivado.
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index a5ca9f3aeff..32a35a392fd 100644
--- a/htdocs/langs/gl_ES/bills.lang
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -54,7 +54,8 @@ InvoiceCustomer=Factura a cliente
 CustomerInvoice=Factura a cliente
 CustomersInvoices=Facturas a clientes
 SupplierInvoice=Factura de provedor
-SuppliersInvoices=Facturas provedores
+SuppliersInvoices=Facturas de provedores
+SupplierInvoiceLines=Liñas de factura do provedor
 SupplierBill=Factura de provedor
 SupplierBills=Facturas de provedores
 Payment=Pagamento
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Pagamentos efectuados
 PaymentsBackAlreadyDone=Reembolsos xa efectuados
 PaymentRule=Forma de pagamento
 PaymentMode=Forma de pagamento
+DefaultPaymentMode=Tipo de pagamento predeterminado 
+DefaultBankAccount=Conta bancaria predeterminada
 PaymentTypeDC=Tarxeta de Débito/Crédito
 PaymentTypePP=PayPal
 IdPaymentMode=Tipo de pagamento (id)
@@ -329,7 +332,7 @@ InvoiceNote=Nota factura
 InvoicePaid=Factura pagada
 InvoicePaidCompletely=Factura pagada completamente
 InvoicePaidCompletelyHelp=Factura pagada completamente. Isto exclúe facturas que foron pagadas parcialmente. Colle listaxe de todas as facturas "Pechadas" ou non "Pechadas", preferible ao uso do filtro no estado da factura.
-OrderBilled=Pedido facturado
+OrderBilled=Pedimento facturado
 DonationPaid=Doación paga
 PaymentNumber=Número de pagamento
 RemoveDiscount=Eliminar desconto
@@ -373,6 +376,7 @@ DateLastGeneration=Data da última xeración
 DateLastGenerationShort=Data última xeración
 MaxPeriodNumber=Nº máximo de facturas a xerar
 NbOfGenerationDone=Número de facturas xa xeradas
+NbOfGenerationOfRecordDone=Número de xeración de rexistros xa realizadas
 NbOfGenerationDoneShort=Número de xeracións feitas
 MaxGenerationReached=Máximo número de xeracións alcanzado
 InvoiceAutoValidate=Validar facturas automáticamente
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=14 días a fin de més
 FixAmount=Importe fixo -1 liña coa etiqueta %s
 VarAmount=Importe variable (%% total)
 VarAmountOneLine=Cantidade variable (%% tot.) - 1 liña coa etiqueta '%s'
-VarAmountAllLines=Cantidade variable (%% tot.) - as mesmas liñas
+VarAmountAllLines=Cantidade variable (%% tot.)- Todas as liñas desde a orixe
 # PaymentType
 PaymentTypeVIR=Transferencia bancaria
 PaymentTypeShortVIR=Transferencia bancaria
@@ -494,12 +498,16 @@ Cash=Efectivo
 Reported=Aprazado
 DisabledBecausePayments=Non dispoñible xa que existen pagamentos
 CantRemovePaymentWithOneInvoicePaid=Eliminación imposible cando existe alo menos unha factura clasificada como pagada.
+CantRemovePaymentVATPaid=Non se pode eliminar o pago porque a declaración do IVE está clasificada como pagada 
+CantRemovePaymentSalaryPaid=Non se pode eliminar o pago xa que o salario está clasificado como pagado 
 ExpectedToPay=Agardando o pagamento
 CantRemoveConciliatedPayment=Non pódese eliminar un pagamento conciliado
 PayedByThisPayment=Pagada por este pagamento
 ClosePaidInvoicesAutomatically=Clasificar como "Pagadas" as facturas, anticipos e facturas rectificativas completamente pagadas.
 ClosePaidCreditNotesAutomatically=Clasificar automáticamente como "Pagados" os abonos completamente reembolsados
 ClosePaidContributionsAutomatically=Clasificar como "Pagadas" todas as taxas fiscais ou sociais completamente pagadas
+ClosePaidVATAutomatically=Clasifique automaticamente a declaración de IVE como "Pago" cando o pagamento é feito por completo. 
+ClosePaidSalaryAutomatically=Clasifique automaticamente o salario como "Pagado" cando o pagamento é realizado por completo. 
 AllCompletelyPayedInvoiceWillBeClosed=Todas as facturas cun resto a pagar 0 serán automáticamente pechadas ao estado "Pagada".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Primeiro ten que crear unha factura están
 PDFCrabeDescription=Modelo PDF de factura Crabe. Un modelo de factura completo (implementación antiga do modelo Sponge)
 PDFSpongeDescription=Modelo PDF de factura Sponge. Un modelo de factura completo
 PDFCrevetteDescription=Modelo PDF de factura Crevette. Un modelo de factura completo para as facturas de situación
-TerreNumRefModelDesc1=Número de devolución co formato %syymm-nnnn para as facturas estándar e %syymm-nnnn para as notas de crédito onde aa é ano, mm é mes e nnnn é unha secuencia sen interrupción e sen retorno a 0
-MarsNumRefModelDesc1=Número de devolución co formato %syymm-nnnn para as facturas estándar, %syymm-nnnn para as facturas de reposición, %syymm-nnnn para as facturas de pago inicial e %syymm-nnnn para as notas de crédito onde aa é ano, mm é mes e nnnn é unha secuencia sen interrupción e sen retorno a 0
+TerreNumRefModelDesc1=Devolve o número no formato %s yymm-nnnn para as facturas estándar e %s yymm-nnnn para as notas de crédito onde aa é ano, mm é mes e nnnn é un número secuencial de incremento automático sen interrupción e sen retorno a 0 
+MarsNumRefModelDesc1=Devolve o número no formato %s yymm-nnnn para as facturas estándar, %s yymm-nnnn para as facturas rectificativas, %s yymm-nnnn para as facturas de anticipo e %s yymm-nnnn para as notas de crédito onde o ano é mm,  mm é mes e nnnn é unha número secuencial de incremento automático sen interrupción e sen retorno a 0 
 TerreNumRefModelError=Xa existe unha factura que comeza con $syymm e non é compatible con este modelo de secuencia. Elimina ou renoméao para activar este módulo.
-CactusNumRefModelDesc1=Número de devolución co formato %syymm-nnnn para as facturas estándar, %syymm-nnnn para as notas de crédito e %syymm-nnnn para as facturas de pago inicial onde aa é ano, mm é mes e nnnn é unha secuencia sen interrupción e sen devolución a 0
+CactusNumRefModelDesc1=Devolve un número no formato %s yymm-nnnn para as facturas estándar, %s yymm-nnnn para as notas de crédito e %s yymm-nnnn para as facturas de anticipo onde aa é ano, mm é mes e nnnn é un número secuencial de incremento automático sen interrupción e sen retorno a 0 
 EarlyClosingReason=Motivo de peche anticipado
 EarlyClosingComment=Nota de peche anticipado
 ##### Types de contacts #####
@@ -562,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Se precisa xerar estas facturas automaticament
 DeleteRepeatableInvoice=Eliminar factura modelo
 ConfirmDeleteRepeatableInvoice=¿Está certo de que quere eliminar a factura modelo?
 CreateOneBillByThird=Crear unha factura por terceiro (se non, unha factura por pedimento)
-BillCreated=Creáronse %s factura(s)
+BillCreated=%s factura(s) xerada
+BillXCreated=Factura %s xerada
 StatusOfGeneratedDocuments=Estado da xeración de documentos
 DoNotGenerateDoc=Non xerar ficheiro de documento
 AutogenerateDoc=Xerar automaticamente un ficheiro de documento
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
index 9012a5b62ac..9ac7e2e7401 100644
--- a/htdocs/langs/gl_ES/boxes.lang
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Estatísticas sobre os principais obxectos comerciais na base de datos
 BoxLoginInformation=Información login
 BoxLastRssInfos=Fíos de información RSS
 BoxLastProducts=Últimos %s produtos/servizos
@@ -17,9 +18,13 @@ BoxLastActions=Últimas accións
 BoxLastContracts=Últimos contratos
 BoxLastContacts=Últimos contactos/enderezos
 BoxLastMembers=Últimos membros
+BoxLastModifiedMembers=Últimos membros modificados
+BoxLastMembersSubscriptions=Últimas subscricións de membros
 BoxFicheInter=Últimas intervencións
 BoxCurrentAccounts=Balance de contas abertas
 BoxTitleMemberNextBirthdays=Cumpreanos neste mes (Membros)
+BoxTitleMembersByType=Membros por tipo
+BoxTitleMembersSubscriptionsByYear=Subscricións de membros por ano 
 BoxTitleLastRssInfos=Últimas %s novas de %s
 BoxTitleLastProducts=Produtos/Servizos: Últimos %s modificados
 BoxTitleProductsAlertStock=Produtos: alerta de stock
@@ -46,7 +51,7 @@ BoxTitleLastModifiedDonations=Últimas %s doacións/subvencións modificadas
 BoxTitleLastModifiedExpenses=Últimos %s informes de gastos modificados
 BoxTitleLatestModifiedBoms=Últimos %s MRP modificados
 BoxTitleLatestModifiedMos=Últimos %s ordes de fabricación modificadas
-BoxTitleLastOutstandingBillReached=Superouse o máximo de clientes  con pendente
+BoxTitleLastOutstandingBillReached=Clientes con máximo pendente superado
 BoxGlobalActivity=Actividade global (facturas, orzamentos, ordes)
 BoxGoodCustomers=Bos clientes
 BoxTitleGoodCustomers=%s Bos clientes
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Últimos %s envíos a clientes
 NoRecordedShipments=Ningún envío a cliente rexistrado
 BoxCustomersOutstandingBillReached=Alcanzáronse os clientes cun límite pendente
 # Pages
-AccountancyHome=Contabilidade
+UsersHome=Usuarios e grupos internos
+MembersHome=Membros internos
+ThirdpartiesHome=Terceiros internos
+TicketsHome=Tickets internos
+AccountancyHome=Contabilidade interna
 ValidatedProjects=Proxectos validados
diff --git a/htdocs/langs/gl_ES/categories.lang b/htdocs/langs/gl_ES/categories.lang
index 13f95f1a8dc..7abe3fbe746 100644
--- a/htdocs/langs/gl_ES/categories.lang
+++ b/htdocs/langs/gl_ES/categories.lang
@@ -2,7 +2,7 @@
 Rubrique=Etiqueta/Categoría
 Rubriques=Etiquetas/Categorías
 RubriquesTransactions=Etiquetas/Categorías de transaccións
-categories=etiquetas/categorias
+categories=etiquetas/categorías
 NoCategoryYet=Ningunha etiqueta/categoría deste tipo creada
 In=En
 AddIn=Engadir en
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Área etiquetas/categorías Provedores
 CustomersCategoriesArea=Área etiquetas/categorías Clientes
 MembersCategoriesArea=Área etiquetas/categorías Membros
 ContactsCategoriesArea=Área etiquetas/categorías de Contactos
-AccountsCategoriesArea=Área etiquetas/categorías Contables
+AccountsCategoriesArea=Etiquetas cuentas bancarias/Área categorías
 ProjectsCategoriesArea=Área etiquetas/categorías Proxectos
 UsersCategoriesArea=Área etiquetas/categorías Usuarios
 SubCats=Subcategorías
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Asignar categoría ao provedor
 ShowCategory=Amosar etiqueta/categoría
 ByDefaultInList=Por defecto na listaxe
 ChooseCategory=Escoller categoría
-StocksCategoriesArea=Categorías de almacéns
-ActionCommCategoriesArea=Categorías de eventos
+StocksCategoriesArea=Categorías de almacén
+ActionCommCategoriesArea=Categorías de evento
 WebsitePagesCategoriesArea=Categorías de contedores de páxina
 UseOrOperatorForCategories=Uso ou operador para categorías
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
index bb98f3309db..1e6ce90501d 100644
--- a/htdocs/langs/gl_ES/companies.lang
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -45,7 +45,8 @@ ParentCompany=Sede empresa
 Subsidiaries=Filiais
 ReportByMonth=Informe por mes
 ReportByCustomers=Informe por cliente
-ReportByQuarter=Informe por taxa
+ReportByThirdparties=Informe por terceiro
+ReportByQuarter=Informe por tarifa
 CivilityCode=Código cortesía
 RegisteredOffice=Domicilio social
 Lastname=Apelidos
@@ -172,14 +173,20 @@ ProfId1ES=Id Prof. 1  (CIF/NIF)
 ProfId2ES=Id Prof. 2 (Número Seguridade Social)
 ProfId3ES=Id Prof 3 (CNAE)
 ProfId4ES=Id Prof 4 (Número de colexiado)
-ProfId5ES=Número EORI
+ProfId5ES=Prof Id 5 (Número EORI)
 ProfId6ES=-
 ProfId1FR=Id Prof 1 (SIREN)
 ProfId2FR=Id Prof 2 (SIRET)
 ProfId3FR=Id Prof 3 (NAF, antigo APE)
 ProfId4FR=Id Prof 4 (RCS/RM)
-ProfId5FR=Número EORI
+ProfId5FR=Prof Id 5 (número EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Número rexistro
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=Número EORI
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Negocios permitidos)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Id Prof 1 (NIPC)
 ProfId2PT=Id Prof. 2 (Número segurança social)
 ProfId3PT=Id Prof. 3 (Número rexistro comercial)
 ProfId4PT=Id Prof 4 (Conservatorio)
-ProfId5PT=Número EORI
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Número EORI
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Id prof. 1 (OGRN)
 ProfId2RU=Id prof. 2 (INN)
@@ -359,7 +367,7 @@ VATIntraManualCheck=Pode tamén verificar manualmente na web da Comisión Europe
 ErrorVATCheckMS_UNAVAILABLE=Comprobación imposible. O servizo de comprobación non é fornecido polo Estado membro (%s).
 NorProspectNorCustomer=Nin cliente, nin cliente potencial
 JuridicalStatus=Forma xurídica
-Workforce=TRaballadores
+Workforce=Traballadores
 Staff=Empregados
 ProspectLevelShort=Potencial
 ProspectLevel=Cliente potencial
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Risco alcanzado
 OutstandingBill=Importe máximo para facturas pendentes
 OutstandingBillReached=Importe máximo para facturas pendentes
 OrderMinAmount=Importe mínimo para pedimento
-MonkeyNumRefModelDesc=Devolve un número co formato %syymm-nnnn para os códigos de clientes e %syymm-nnnn para os códigos dos provedores, onde yy é o ano, mm é o mes e nnnn é unha secuencia sen ruptura e sen voltar a 0.
+MonkeyNumRefModelDesc=Devolve un número no formato %s yymm-nnnn  para o código do cliente e %s yymm-nnnn para o código do provedor onde aa é ano, mm é mes e nnnn é un número secuencial de incremento automático sen interrupción e sen retorno a 0.
 LeopardNumRefModelDesc=Código libre. Pode ser modificado en calquera momento.
 ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.)
 MergeOriginThirdparty=Terceiro duplicado (terceiro a eliminar)
diff --git a/htdocs/langs/gl_ES/compta.lang b/htdocs/langs/gl_ES/compta.lang
index 92a135523c0..ae6b5e0ca8b 100644
--- a/htdocs/langs/gl_ES/compta.lang
+++ b/htdocs/langs/gl_ES/compta.lang
@@ -37,7 +37,7 @@ VATReceived=IVE repercutido
 VATToCollect=IVE compras
 VATSummary=Balance de IVE mensual
 VATBalance=Balance de IVE
-VATPaid=IVE pagado
+VATPaid=IVE xa pago
 LT1Summary=Resumo do imposto 2 RE
 LT2Summary=Resumo do imposto 3 IRPF
 LT1SummaryES=Balance de RE
@@ -65,6 +65,7 @@ LT2SupplierIN=Compras SGST
 VATCollected=IVE recuperado
 StatusToPay=A pagar
 SpecialExpensesArea=Área de pagamentos especiais
+VATExpensesArea=Área para todos os pagos de IVE
 SocialContribution=Impostos sociais ou fiscais
 SocialContributions=Impostos sociais ou fiscais
 SocialContributionsDeductibles=Impostos sociais ou fiscais deducibles
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Cobro factura ao cliente
 PaymentSupplierInvoice=Pagamento factura de provedor
 PaymentSocialContribution=Pagamentos taxas sociais/fiscais
 PaymentVat=Pagamento IVE
+AutomaticCreationPayment=Rexistra automaticamente o pagamento
 ListPayment=Listaxe de pagamentos
 ListOfCustomerPayments=Listaxe de pagamentos de clientes
 ListOfSupplierPayments=Listaxe de pagamentos a provedores
@@ -104,6 +106,8 @@ LT2PaymentES=Pagamento de IRPF
 LT2PaymentsES=Pagamentos de IRPF
 VATPayment=Pagamento de IVE
 VATPayments=Pagamentos de IVE
+VATDeclarations=Liquidacións de IVE
+VATDeclaration=Liquidación de IVE
 VATRefund=Devolución IVE
 NewVATPayment=Novo pagamento IVE
 NewLocalTaxPayment=Novo pagamento de %s
@@ -113,9 +117,9 @@ ShowVatPayment=Consultar pagamentos de IVE
 TotalToPay=Total a pagar
 BalanceVisibilityDependsOnSortAndFilters=O saldo é visible nesta lista só se a táboa está ordenada en %s e filtrada nunha 1 conta bancaria (sen outros filtros)
 CustomerAccountancyCode=Código contable cliente
-SupplierAccountancyCode=Código contable provedor
-CustomerAccountancyCodeShort=Cód. conta cliente
-SupplierAccountancyCodeShort=Cód. conta provedor
+SupplierAccountancyCode=Conta contable provedor
+CustomerAccountancyCodeShort=Conta cont. cliente
+SupplierAccountancyCodeShort=Conta cont. provedor
 AccountNumber=Número de conta
 NewAccountingAccount=Nova conta
 Turnover=Volume de vendas emitidas
@@ -134,9 +138,17 @@ NoWaitingChecks=Sen talóns agardando depósito
 DateChequeReceived=Data recepción do talón
 NbOfCheques=Nº de talóns
 PaySocialContribution=Pagar unha taxa social/fiscal
-ConfirmPaySocialContribution=¿Está certo de querer clasificar esta taxa social ou fiscal como pagada?
+PayVAT=Pagar liquidación de IVE
+PaySalary=Pagar unha tarxeta salarial
+ConfirmPaySocialContribution=Está certo de querer clasificar este imposto social ou fiscal como pagado?
+ConfirmPayVAT=Está certo de querer clasificar esta liquidación de IVE como pagada?
+ConfirmPaySalary=Esta certo de querer clasificar esta tarxeta salarial como paga?
 DeleteSocialContribution=Eliminar un pagamento de taxa social ou fiscal
-ConfirmDeleteSocialContribution=¿Está certo de querer eliminar este pagamento de taxa social/fiscal?
+DeleteVAT=Eliminar a liquidación de IVE
+DeleteSalary=Eliminar unha tarxeta salarial
+ConfirmDeleteSocialContribution=Está certo de querer eliminar este pago de impostos sociais/fiscais?
+ConfirmDeleteVAT=Está certo de querer eliminar esta liquidacion de IVE?
+ConfirmDeleteSalary=Está certo de querer eliminar este salario?
 ExportDataset_tax_1=taxas sociais e fiscais e pagamentos
 CalcModeVATDebt=Modo <b>%sIVE sobre facturas emitidas%s</b>.
 CalcModeVATEngagement=Modo <b>%sIVE sobre facturas cobradas%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- Inclúe os pagamentos realizados sobre as facturas, os gastos
 RulesCADue=- Inclúe as facturas a clientes, estexan xa pagas ou non.<br>- Baseado na data de validación das mesmas.<br>
 RulesCAIn=- Inclúe os pagamentos efectuados das facturas a clientes.<br>- Baseado na data de pagamento das mesmas<br>
 RulesCATotalSaleJournal=Inclúe todas as líñas de crédito do diario de vendas.
+RulesSalesTurnoverOfIncomeAccounts=Inclúe (crédito - débito) de liñas para contas de produtos  no gupo INGRESOS
 RulesAmountOnInOutBookkeepingRecord=Inclúe rexistro no Libro Maior con contas contables que teñen o grupo "GASTOS" ou "INGRESOS"
 RulesResultBookkeepingPredefined=Inclúe rexistro no Libro Maior con contas contables que teñen o grupo "GASTOS" ou "INGRESOS"
 RulesResultBookkeepingPersonalized=Amosa un rexistro no Libro Maior con contas contables <b>agrupadas por grupos persoalizados</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Informe de impostos por terceiros
 VATReportByCustomers=Informe IVE por cliente
 VATReportByCustomersInInputOutputMode=Informe por cliente do IVE repercutido e soportado
 VATReportByQuartersInInputOutputMode=Informe por taxa do IVE repercutido e soportado
+VATReportShowByRateDetails=Amosar detalles desta tarifa
 LT1ReportByQuarters=Informe do imposto 2 IRPF por taxa
 LT2ReportByQuarters=Informe do imposto 3 IRPF por taxa
 LT1ReportByQuartersES=Informe de RE por taxa
@@ -217,7 +231,7 @@ Pcg_subtype=Subtipo de conta
 InvoiceLinesToDispatch=Líñas de facturas a contabilizar
 ByProductsAndServices=Por produtos e servizos
 RefExt=Ref. externa
-ToCreateAPredefinedInvoice=Para crear unha factura modelo, cree unha factura estándar e, sen validala, prema nos botóns "%s".
+ToCreateAPredefinedInvoice=Para crear unha factura modelo, cree unha factura estándar e, sen validala, prema no botón "%s".
 LinkedOrder=Ligar a pedimento
 Mode1=Método 1
 Mode2=Método 2
@@ -227,14 +241,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=O informe do volume de negoc
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=O informe do volume de negocio recadado por tipo de imposto sobre a venda non está dispoñible. Este informe só está dispoñible para o volume de negocio facturado.
 CalculationMode=Modo de cálculo
 AccountancyJournal=Código contable diario
-ACCOUNTING_VAT_SOLD_ACCOUNT=Conta contable por defecto para o IVE de vendas (usado se non é definido no diccionario de IVE)
-ACCOUNTING_VAT_BUY_ACCOUNT=Cuenta contable por defecto para o IVE de compras (usado se non é definido no diccionario de IVE)
-ACCOUNTING_VAT_PAY_ACCOUNT=Código contable por defecto para o pagamento de IVE
-ACCOUNTING_ACCOUNT_CUSTOMER=Código contable empregado para terceiros clientes
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=O código contable adicado definido na tarxeta de terceiros usarase só para a contabilidade ddo Sub Libro Maior. Este usarase para o Libro Maior e como valor predeterminado da contabilidade de Sub Libro Maior se non se define unha conta contable de cliente adicada a terceiros.
-ACCOUNTING_ACCOUNT_SUPPLIER=Código contable empregado por terceiros provedores
+ACCOUNTING_VAT_SOLD_ACCOUNT=Conta contable por defecto para o IVE de vendas (usada se non é definida no diccionario de IVE)
+ACCOUNTING_VAT_BUY_ACCOUNT=Conta contable por defecto para o IVE de compras (usada se non é definida no diccionario de IVE)
+ACCOUNTING_VAT_PAY_ACCOUNT=Conta contable por defecto para o pagamento de IVE
+ACCOUNTING_ACCOUNT_CUSTOMER=Conta contable empregada para terceiros clientes
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=A conta contable adicada definida na tarxeta de terceiros usarase só para a contabilidade do Sub Libro Maior. Esta usarase para o Libro Maior e como valor predeterminado da contabilidade de Sub Libro Maior se non se define unha conta contable de cliente adicada a terceiros.
+ACCOUNTING_ACCOUNT_SUPPLIER=Conta contable empregada por terceiros provedores
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=A conta de contabilidade adicada definida na tarxeta de terceiros usarase só para a contabilidade d a conta maior. Esta usarase para o libro maior e como valor predeterminado da contabilidade de maior se non se define unha conta de contas de provedores adicada a terceiros.
 ConfirmCloneTax=Confirmar a clonación dunha taxa social/fiscal
+ConfirmCloneVAT=Confirmar a clonación dunha liquidación de IVE
+ConfirmCloneSalary=Confirmar o clonado dun salario
 CloneTaxForNextMonth=Clonarla para o próximo mes
 SimpleReport=Informe simple
 AddExtraReport=Informes adicionais (engade informe de clientes extranxeiros e locais)
@@ -253,7 +269,8 @@ AccountingAffectation=Asignación de conta contable
 LastDayTaxIsRelatedTo=Último día do período do imposto
 VATDue=Imposto reclamado
 ClaimedForThisPeriod=Reclamado para o período
-PaidDuringThisPeriod=Pagado durante este período
+PaidDuringThisPeriod=Pagado neste período
+PaidDuringThisPeriodDesc=Esta é a suma de todos os pagamentos ligados ás liquidacións de IVE que teñen unha data de finalización do período no rango de datas seleccionado
 ByVatRate=Por taxa de imposto
 TurnoverbyVatrate=Volume de vendas emitidas por tipo de imposto
 TurnoverCollectedbyVatrate=Volume de vendas cobradas por tipo de imposto
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Volume de compras recollido
 RulesPurchaseTurnoverDue=- Inclúe as facturas vencidas do provedor se se pagan ou non. <br>- Baséase na data da factura destas facturas<br>
 RulesPurchaseTurnoverIn=- Inclúe todos os pagamentos efectivos das facturas feitos aos provedores<br>- Baséase na data de pagamento destas facturas<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Inclúe todas as liñas de débito do diario de compras.
+RulesPurchaseTurnoverOfExpenseAccounts=Inclúe (crédito - débito) de liñas para contas de produtos no gupo GASTOS
 ReportPurchaseTurnover=Volume compras facturadas
 ReportPurchaseTurnoverCollected=Volume de compras abonadas
 IncludeVarpaysInResults = Inclúe varios pagos en informes
diff --git a/htdocs/langs/gl_ES/ecm.lang b/htdocs/langs/gl_ES/ecm.lang
index eb6c9efa259..c85c97b756f 100644
--- a/htdocs/langs/gl_ES/ecm.lang
+++ b/htdocs/langs/gl_ES/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Ficheiro aínda non indexado na base de datos (tente
 ExtraFieldsEcmFiles=Extrafields en ficheiros ECM
 ExtraFieldsEcmDirectories=Extrafields en directorios ECM
 ECMSetup=Configuración ECM
+GenerateImgWebp=Duplica todas as imaxes con outra versión con formato .webp 
+ConfirmGenerateImgWebp=Se confirma, xerará unha imaxe en formato .webp para todas as imaxes incluídas neste cartafol e no cartafol fillo ... 
+ConfirmImgWebpCreation=Confirmar a duplicación de todas as imaxes
+SucessConvertImgWebp=Imaxes duplicadas correctamente
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 4e0a15fee05..604b367d989 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -44,7 +44,7 @@ ErrorBadImageFormat=O ficheiro de imaxe non ten un formato compatible (o seu PHP
 ErrorBadDateFormat=O valor '%s' ten un formato de data erroneo
 ErrorWrongDate=A data non correcta!
 ErrorFailedToWriteInDir=Erro ao escribir no directorio %s
-ErrorFoundBadEmailInFile=Atopouse unha sintaxe de correo electrónico incorrecta para % s liñas no ficheiro (exemplo liña %s con correo electrónico=%s)
+ErrorFoundBadEmailInFile=Atopouse unha sintaxe de correo electrónico incorrecta para  %s liñas no ficheiro (exemplo liña %s con correo electrónico=%s)
 ErrorUserCannotBeDelete=Non pode eliminarse o usuario. É posible que esté asociado a entidades do Dolibarr
 ErrorFieldsRequired=Non se completaron algúns campos obrigatorios
 ErrorSubjectIsRequired=O asunto do correo electrónico é  obligatorio
@@ -59,6 +59,7 @@ ErrorDirNotFound=Non se atopou o directorio <b>%s</b> (camiño incorrecto, permi
 ErrorFunctionNotAvailableInPHP=A función <b>%s</b> é precisa para esta característica pero non está dispoñible nesta versión/configuración de PHP.
 ErrorDirAlreadyExists=Xa existe un directorio con este nome.
 ErrorFileAlreadyExists=Xa existe un ficheiro con este nome.
+ErrorDestinationAlreadyExists=Outro ficheiro co mesmo nome <b>%s</b> xa existe
 ErrorPartialFile=Ficheiro non recibido completamente polo servidor.
 ErrorNoTmpDir=Non existe o directorio temporal %s.
 ErrorUploadBlockedByAddon=Subida bloqueada por un plugin PHP/Apache.
@@ -87,15 +88,15 @@ ErrorModuleRequireJavascript=Non se debe desactivar Javascript para que esta fun
 ErrorPasswordsMustMatch=Os dous contrasinais escritos deben coincidir entre si
 ErrorContactEMail=Produciuse un erro técnico. Póñase en contacto co administrador no seguinte correo electrónico <b>%s</b> e proporcione o código de erro <b>%s</b> na súa mensaxe ou engada unha copia desta páxina.
 ErrorWrongValueForField=O campo <b>%s</b>:'<b>%s</b>' non coincide coa regra  <b>%s</b>
-ErrorFieldValueNotIn=Campo <b>%s</b>:'<b>%s</b>' non é un valor atopado no campo <b>%s</b> de <b>%s</ b >
+ErrorFieldValueNotIn=Campo <b>%s</b>:'<b>%s</b>' non é un valor atopado no campo <b>%s</b> de <b>%s</b>
 ErrorFieldRefNotIn=Campo <b>%s</b>:'<b>%s</b>' non é unha referencia <b>%s</b> existente
 ErrorsOnXLines=Atopáronse %s erros
 ErrorFileIsInfectedWithAVirus=O programa antivirus non puido validar o ficheiro (o ficheiro pode estar infectado por un virus)
 ErrorSpecialCharNotAllowedForField=Non se permiten caracteres especiais para o campo %s
 ErrorNumRefModel=Existe unha referencia na base de datos (%s) e non é compatible con esta regra de numeración. Elimine o rexistro ou renomee a referencia para activar este módulo.
-ErrorQtyTooLowForThisSupplier=Cantidad insuficiente para este proveedor o no hay precio definido en este producto para este proveedor
-ErrorOrdersNotCreatedQtyTooLow=Algunos pedidos no se han creado debido a una cantidad demasiado baja
-ErrorModuleSetupNotComplete=La configuración del módulo parece incompleta. Vaya a Inicio - Configuración - Módulos para completarla.
+ErrorQtyTooLowForThisSupplier=Cantidade insuficiente para este proveedor ou non hai prezo definido neste produto para este provedor
+ErrorOrdersNotCreatedQtyTooLow=Algúns pedidos non foron creados debido a unha cantidade demasiado baixa
+ErrorModuleSetupNotComplete=Aconfiguración do módulo %s parece incompleta. Vaia a Inicio - Configuración - Módulos para completala.
 ErrorBadMask=Erro na máscara
 ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sen número de secuencia
 ErrorBadMaskBadRazMonth=Erro, valor de restablecemento incorrecto
@@ -128,7 +129,7 @@ ErrorLinesCantBeNegativeOnDeposits=As liñas non poden ser negativas nun depósi
 ErrorQtyForCustomerInvoiceCantBeNegative=A cantidade da liña para as facturas do cliente non pode ser negativa
 ErrorWebServerUserHasNotPermission=A conta de usuario <b>%s </b>usada para executar o servidor web non ten permiso para iso
 ErrorNoActivatedBarcode=Non hai ningún tipo de código de barras activado
-ErrUnzipFails=Fallou ao descomprimir% s con ZipArchive
+ErrUnzipFails=Fallou ao descomprimir %s con ZipArchive
 ErrNoZipEngine=Non hai motor neste PHP para comprimir/descomprimir o ficheiro %s
 ErrorFileMustBeADolibarrPackage=O ficheiro %s debe ser un paquete zip Dolibarr
 ErrorModuleFileRequired=Debe seleccionar un ficheiro de paquete do módulo Dolibarr
@@ -197,17 +198,17 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Non hai suficiente stock de produto
 ErrorStockIsNotEnoughToAddProductOnProposal=Non hai suficiente stock de produto %s para engadilo a unha nova cotización.
 ErrorFailedToLoadLoginFileForMode=Erro ao obter a clave de acceso para o modo '%s'.
 ErrorModuleNotFound=Non se atopou o ficheiro do módulo.
-ErrorFieldAccountNotDefinedForBankLine=Valor da conta maior non indicado para a liña de orixe% s (% s)
-ErrorFieldAccountNotDefinedForInvoiceLine=O valor da conta do libro maior non indicado para o identificador de factura% s (% s)
-ErrorFieldAccountNotDefinedForLine=Valor para a conta do libro maior non indicado para a liña (% s)
-ErrorBankStatementNameMustFollowRegex=Erro, o nome do estado da conta bancaria debe seguir a seguinte regra de sintaxe% s
+ErrorFieldAccountNotDefinedForBankLine=Valor da conta maior non indicado para a liña de orixe %s  (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=O valor da conta do libro maior non indicado para o identificador de factura %s (%s)
+ErrorFieldAccountNotDefinedForLine=Valor para a conta do libro maior non indicado para a liña (%s)
+ErrorBankStatementNameMustFollowRegex=Erro, o nome do estado da conta bancaria debe seguir a seguinte regra de sintaxe %s
 ErrorPhpMailDelivery=Comprobe que non usa un número elevado de destinatarios e que o seu contido de correo electrónico non é similar ao spam. Pídelle tamén ao seu administrador que comprobe os ficheiros do firewall e os rexistros do servidor para obter información máis completa.
 ErrorUserNotAssignedToTask=O usuario debe ser asignado á tarefa para poder ingresar o tempo consumido.
 ErrorTaskAlreadyAssigned=Tarefa xa asignada ao usuario
 ErrorModuleFileSeemsToHaveAWrongFormat=O paquete do módulo parece ter un formato incorrecto.
 ErrorModuleFileSeemsToHaveAWrongFormat2=Debe existir polo menos un directorio obrigatorio no zip do módulo: <strong>%s</strong> ou <strong>%s</strong>
 ErrorFilenameDosNotMatchDolibarrPackageRules=O nome do paquete do módulo (<strong>%s</strong>) non coincide coa sintaxe do nome agardada: <strong>%s</strong>
-ErrorDuplicateTrigger=Erro, nome de triggerr duplicado %s. Xa se cargou desde% s.
+ErrorDuplicateTrigger=Erro, nome de triggerr duplicado %s. Xa se cargou desde %s.
 ErrorNoWarehouseDefined=Erro, sen almacéns definidos.
 ErrorBadLinkSourceSetButBadValueForRef=A ligazón que usa non é válida. Defínese unha "fonte" para o pago, pero o valor para "ref" non é válido.
 ErrorTooManyErrorsProcessStopped=Demasiados erros. O proceso detívose.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Erro ao cargar o plan de contabilidade. Se non se cargaron
 ErrorBadSyntaxForParamKeyForContent=Sintaxe incorrecta para o parémetro keyforcontent. Debe ter un valor que comece por %s ou %s
 ErrorVariableKeyForContentMustBeSet=Erro, debe establecerse a constante co nome %s (con contido de texto para amosar) ou %s (con URL externo para amosar).
 ErrorURLMustStartWithHttp=O URL %s debe comezar con http:// ou https://
+ErrorHostMustNotStartWithHttp=O nome do host %s NON debe comezar con http:// ou https://
 ErrorNewRefIsAlreadyUsed=Erro, a nova referencia xa está empregada
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erro, non é posible eliminar o pago ligado a unha factura pechada.
 ErrorSearchCriteriaTooSmall=Os criterios de busca son demasiado pequenos.
@@ -240,7 +242,7 @@ ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Erro, o idioma é obrigato
 ErrorLanguageOfTranslatedPageIsSameThanThisPage=Erro, o idioma da páxina traducida é o mesmo que este.
 ErrorBatchNoFoundForProductInWarehouse=Non se atopou ningún lote/serie para o produto "%s" no almacén "%s".
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Non hai cantidade suficiente para este lote/serie do produto "%s" no almacén "%s".
-ErrorOnlyOneFieldForGroupByIsPossible=Só é posible un campo para "Agrupar por" (descártanse outros)
+ErrorOnlyOneFieldForGroupByIsPossible=Só é posible 1 un campo para "Agrupar por" (descártanse outros)
 ErrorTooManyDifferentValueForSelectedGroupBy=Atopouse demasiado valor diferente (máis de <b>%s </b>) para o campo "<b>%s</b>", polo que non podemos usalo como "Agrupar por" para gráficos. Eliminouse o campo "Agrupar por". ¿Quería usalo como eixo X?
 ErrorReplaceStringEmpty=Erro, a cadea para substituír está baleira
 ErrorProductNeedBatchNumber=Erro, o produto '<b>%s</b>' precisa un número de lote/serie
@@ -251,10 +253,14 @@ ErrorLoginDateValidity=Erro, este inicio de sesión está fóra do intervalo de
 ErrorValueLength=A lonxitude do campo "<b>%s</b>" debe ser superior a "<b>%s</b>"
 ErrorReservedKeyword=A palabra '<b>%s</b>' é unha palabra chave reservada
 ErrorNotAvailableWithThisDistribution=Non dispoñible con esta distribución
-ErrorPublicInterfaceNotEnabled=Inf¡terfaz público non activada
+ErrorPublicInterfaceNotEnabled=Interfaz pública non activada
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=O idioma da nova páxina debe definirse se se define como tradución doutra páxina
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=O idioma da nova páxina non debe ser o idioma de orixe se se define como tradución doutra páxina
 ErrorAParameterIsRequiredForThisOperation=É obrigado un parámetro para esta operación
+ErrorDateIsInFuture=Erro, a data non pode ser no futuro
+ErrorAnAmountWithoutTaxIsRequired=Erro, a cantidade é obrigatoria
+ErrorAPercentIsRequired=Erro, prégase cubra a porcentaxe correctamente
+ErrorYouMustFirstSetupYourChartOfAccount=Primeiro debe configurar o seu plan de contas
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=O seu parámetro PHP upload_max_filesize (%s) é superior ao parámetro PHP post_max_size (%s). Esta non é unha configuración consistente.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Aviso, non se puido engadir a entrada do
 WarningTheHiddenOptionIsOn=Aviso, a opción oculta <b>%s</b> está activa.
 WarningCreateSubAccounts=Aviso, non pode crear directamente unha subconta, debe crear un terceiro ou un usuario e asignarlles un código contable para atopalos nesta listaxe
 WarningAvailableOnlyForHTTPSServers=Dispoñible só se usa conexión segura HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Non foi activado o módulo %s . Pode que perda moitos eventos aquí
+ErrorActionCommPropertyUserowneridNotDefined=É preciso o supervisor do usuario
+ErrorActionCommBadType=O tipo de evento seleccionado (id: %n, código: %s) non existe no diccionario Tipo de Evento
diff --git a/htdocs/langs/gl_ES/exports.lang b/htdocs/langs/gl_ES/exports.lang
index 92d24c84a79..aeb080ad0b7 100644
--- a/htdocs/langs/gl_ES/exports.lang
+++ b/htdocs/langs/gl_ES/exports.lang
@@ -33,7 +33,7 @@ FormatedImport=Asistente de importación
 FormatedImportDesc1=Esta área permitelle realizar importacións persoalizadas de datos mediante un axudante que evita ter coñecementos técnicos de Dolibarr.
 FormatedImportDesc2=O primeiro paso consiste na escolla do tipo de dato que debe importarse, despois o ficheiro e a continuación escoller os campos que desexa importar.
 FormatedExport=Asistente de exportación
-FormatedExportDesc1=Esta área permitell realizar exportacións persoalizadas dos datos mediante un axudante que evita ter coñecementos técnicos de Dolibarr.
+FormatedExportDesc1=Esta área permitelle realizar exportacións persoalizadas dos datos mediante un axudante que evita ter coñecementos técnicos de Dolibarr.
 FormatedExportDesc2=O primeiro paso consiste na escolla dun dos conxuntos de datos predefinidos, despois escoller os campos que quere exportar ao ficheiro e en que orde.
 FormatedExportDesc3=Unha vez seleccionados os datos, é posible escoller o formato do ficheiro de exportación xerado.
 Sheet=Folla
@@ -54,7 +54,7 @@ FileWithDataToImport=Ficheiro cos datos a importar
 FileToImport=Ficheiro orixe a importar
 FileMustHaveOneOfFollowingFormat=O ficheiro de importación debe conter un dos seguintes formatos
 DownloadEmptyExample=Descargar ficheiro de exemplo baleiro
-ChooseFormatOfFileToImport=Escolla o formato de ficheiro que desexa importar facendo click na imaxe %s para seleccionalo...
+ChooseFormatOfFileToImport=Escolla o formato de ficheiro que desexa importar e prema na imaxe %s para seleccionalo...
 ChooseFileToImport=Escolla o ficheiro de importación e faga clic na imaxe %s para seleccionalo como ficheiro orixe de importación...
 SourceFileFormat=Formato do ficheiro orixe
 FieldsInSourceFile=Campos no ficheiro orixe
diff --git a/htdocs/langs/gl_ES/externalsite.lang b/htdocs/langs/gl_ES/externalsite.lang
index 2f4b06c67ed..660ce32365c 100644
--- a/htdocs/langs/gl_ES/externalsite.lang
+++ b/htdocs/langs/gl_ES/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Configuración da ligazón ao sitio web externo
-ExternalSiteURL=URL do sitio web externo
+ExternalSiteURL=URL do sitio externo do contido iframe HTML
 ExternalSiteModuleNotComplete=O módulo do sitio externo non foi configurado correctamente.
 ExampleMyMenuEntry=O meu menú de entrada
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index affae88508a..8e9b9d817ff 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -73,7 +73,7 @@ SetDate=Fixar data
 SelectDate=Seleccione unha data
 SeeAlso=Vexa tamén %s
 SeeHere=Vexa aquí
-ClickHere=Faga clic aquí
+ClickHere=Prema aquí
 Here=Aquí
 Apply=Aplicar
 BackgroundColorByDefault=Cor de fondo por defecto
@@ -83,7 +83,7 @@ FileSaved=O ficheiro foi gardado correctamente
 FileUploaded=O ficheiro subiuse correctamente
 FileTransferComplete=Ficheiro(s) subidos(s) correctamente
 FilesDeleted=Ficheiros(s) eliminados correctamente
-FileWasNotUploaded=Un ficheiro foi seleccionado para axuntar, pero ainda non foi subido. Faga clic en "Axuntar este ficheiro" para subilo.
+FileWasNotUploaded=Un ficheiro foi seleccionado para axuntar, pero ainda non foi subido. Prema en "Axuntar este ficheiro" para subilo.
 NbOfEntries=Nº de entradas
 GoToWikiHelpPage=Ler a axuda en liña (é preciso acceso a Internet )
 GoToHelpPage=Ler a axuda
@@ -278,6 +278,7 @@ DateModificationShort=Data modif.
 IPModification=Modificación IP
 DateLastModification=Última data de modificación
 DateValidation=Data de validación
+DateSigning=Data de sinatura
 DateClosing=Data de peche
 DateDue=Data de vencemento
 DateValue=Data do valor
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Prezo unitario (sen impostos) (moeda)
 UnitPriceTTC=Prezo unitario
 PriceU=P.U.
 PriceUHT=P.U.
-PriceUHTCurrency=P.U. (divisa)
+PriceUHTCurrency=U.P (neto) (moeda)
 PriceUTTC=P.U.(+IVE)
 Amount=Importe
 AmountInvoice=Importe factura
@@ -389,6 +390,8 @@ AmountTotal=Importe total
 AmountAverage=Importe medio
 PriceQtyMinHT=Prezo cantidade min.
 PriceQtyMinHTCurrency=Prezo cantidade min.  (moeda)
+PercentOfOriginalObject=Porcentaxe do obxecto orixinal
+AmountOrPercent=Cantidade ou porcentaxe
 Percentage=Porcentaxe
 Total=Total
 SubTotal=Subtotal
@@ -534,7 +537,7 @@ General=Xeral
 Size=Tamaño
 OriginalSize=Tamaño orixinal
 Received=Recibido
-Paid=Pagamento
+Paid=Xa pago
 Topic=Asunto
 ByCompanies=Por terceiros
 ByUsers=Por usuario
@@ -698,7 +701,7 @@ RecordsGenerated=%s rexistro(s) xerado(s)
 AutomaticCode=Creación automática de código
 FeatureDisabled=Función desactivada
 MoveBox=Mover panel
-Offered=Sen cargo
+Offered=S/Custo
 NotEnoughPermissions=Non ten permisos para esta acción
 SessionName=Nome sesión
 Method=Método
@@ -724,7 +727,7 @@ MenuMembers=Membros
 MenuAgendaGoogle=Axenda Google
 MenuTaxesAndSpecialExpenses=Taxas | Gastos especiais
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú Inicio-configuración-seguridade): %s Kb, PHP limit: %s Kb
-NoFileFound=Non hai documentos gardados neste directorio
+NoFileFound=Non se cargaron documentos
 CurrentUserLanguage=Idioma actual
 CurrentTheme=Tema actual
 CurrentMenuManager=Xestor menú actual
@@ -840,7 +843,7 @@ XMoreLines=%s líña(s) ocultas
 ShowMoreLines=Amosar mais/menos liñas
 PublicUrl=URL pública
 AddBox=Engadir caixa
-SelectElementAndClick=Seleccione un elemento e faga clic %s
+SelectElementAndClick=Seleccione un elemento e prema %s
 PrintFile=Imprimir Ficheiro %s
 ShowTransaction=Amosar rexistro na conta bancaria
 ShowIntervention=Amosar intervención
@@ -899,8 +902,10 @@ ViewAccountList=Ver Libro Maior
 ViewSubAccountList=Ver subconta Libro Maior
 RemoveString=Eliminar cadea '%s'
 SomeTranslationAreUncomplete=Algúns dos idiomas ofrecidos poden estar parcialmente traducidos ou poden conter erros. Axuda a corrixir teu idioma rexistrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Ligazón de descarga directa (público/externo)
-DirectDownloadInternalLink=Ligazón de descarga directa (precisa estar rexistrado e precisa permisos)
+DirectDownloadLink=Ligazón pública de descarga
+PublicDownloadLinkDesc=Só é precisa a ligazón para descargar o ficheiro
+DirectDownloadInternalLink=Ligazón privada de descarga
+PrivateDownloadLinkDesc=Precisa estar logueado e ter permisos para ver ou descargar o ficheiro
 Download=Descargar
 DownloadDocument=Descargar o documento
 ActualizeCurrency=Actualizar o tipo de cambio
@@ -908,7 +913,7 @@ Fiscalyear=Ano fiscal
 ModuleBuilder=Módulo e aplicación Builder
 SetMultiCurrencyCode=Establecer moeda
 BulkActions=Accións masivas
-ClickToShowHelp=Faga clic para amosar a axuda sobre ferramentas
+ClickToShowHelp=Prema para amosar a axuda sobre ferramentas
 WebSite=Sitio web
 WebSites=Sitios web
 WebSiteAccounts=Contas do sitio web
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contactos
 SearchIntoMembers=Membros
 SearchIntoUsers=Usuarios
 SearchIntoProductsOrServices=Produtos ou servizos
+SearchIntoBatch=Lotes / Series
 SearchIntoProjects=Proxectos
 SearchIntoMO=Ordes de fabricación
 SearchIntoTasks=Tarefas
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Atallo de teclado
 AssignedTo=Asignada a
 Deletedraft=Eliminar borrador
 ConfirmMassDraftDeletion=Confirmación de borrado en masa
-FileSharedViaALink=Ficheiro compartido ao través dunha ligazón
+FileSharedViaALink=Ficheiro compartido cunha ligazón pública
 SelectAThirdPartyFirst=Selecciona un terceiro antes...
 YouAreCurrentlyInSandboxMode=Estás actualmente no modo %s "sandbox"
 Inventory=Inventario
 AnalyticCode=Código analítico
 TMenuMRP=MRP
+ShowCompanyInfos=Amosar información sobre a empresa
 ShowMoreInfos=Amosar mais información
 NoFilesUploadedYet=Pregase cargue un documento primeiro
 SeePrivateNote=Ver nota privada
@@ -1070,16 +1077,16 @@ NoArticlesFoundForTheKeyword=Artigo non atopado para a busca de '<strong>%s</str
 NoArticlesFoundForTheCategory=Artigo non atopado na categoría
 ToAcceptRefuse=A aceptar | rexeitar
 ContactDefault_agenda=Evento
-ContactDefault_commande=Orde
+ContactDefault_commande=Pedimento
 ContactDefault_contrat=Contrato
 ContactDefault_facture=Factura
 ContactDefault_fichinter=Intervención
-ContactDefault_invoice_supplier=Factura provedor
-ContactDefault_order_supplier=Orde de compra
+ContactDefault_invoice_supplier=Factura de provedor
+ContactDefault_order_supplier=Pedimento a provedor
 ContactDefault_project=Proxecto
 ContactDefault_project_task=Tarefa
-ContactDefault_propal=Proposta
-ContactDefault_supplier_proposal=Proposta de provedor
+ContactDefault_propal=Orzamento
+ContactDefault_supplier_proposal=Orzamento de provedor
 ContactDefault_ticket=Ticket
 ContactAddedAutomatically=Engadido contacto dende os contactos de terceiros
 More=Mais
@@ -1120,3 +1127,5 @@ AffectTag=Poñer etiqueta
 ConfirmAffectTag=Poñer etiqueta masiva
 ConfirmAffectTagQuestion=Está certo de que quere poñer ás etiquetas dos rexistros seleccionados %s?
 CategTypeNotFound=Non se atopou ningún tipo de etiqueta para o tipo de rexistros
+CopiedToClipboard=Copiado a portapapeis
+InformationOnLinkToContract=Este importe é só o total de todas as liñas do contrato. Non se ten en conta ningunha noción de tempo.
diff --git a/htdocs/langs/gl_ES/margins.lang b/htdocs/langs/gl_ES/margins.lang
index 0e2749a1157..dab074772fb 100644
--- a/htdocs/langs/gl_ES/margins.lang
+++ b/htdocs/langs/gl_ES/margins.lang
@@ -22,7 +22,7 @@ ProductService=Produto ou servizo
 AllProducts=Todos os produtos e servizos
 ChooseProduct/Service=Eescolla o produto ou servizo
 ForceBuyingPriceIfNull=Forzar prezo de compra/custo ao prezo de venda se non se define
-ForceBuyingPriceIfNullDetails=Se o prezo de compra/custo non foi definido, e esta opción está activada, a marxe será cero na liña (prezo de compra/custo = prezo de venda), do contrario a marxe será igual ao suxerido por defecto.
+ForceBuyingPriceIfNullDetails=Se o prezo de compra/custo non se proporciona cando engadimos unha nova liña e esta opción está "ACTIVADA", a marxe será 0 na nova liña (prezo de compra/custo = prezo de venda). Se esta opción está "DESACTIVADA" (recomendada), a marxe será igual ao valor suxerido por defecto (e pode ser do 100% se non se atopa ningún valor predeterminado). 
 MARGIN_METHODE_FOR_DISCOUNT=Método de xestión de descontos globais
 UseDiscountAsProduct=Como un produto
 UseDiscountAsService=Como un servizo
diff --git a/htdocs/langs/gl_ES/members.lang b/htdocs/langs/gl_ES/members.lang
index aefe3b7e52d..a3cda215b7f 100644
--- a/htdocs/langs/gl_ES/members.lang
+++ b/htdocs/langs/gl_ES/members.lang
@@ -19,12 +19,14 @@ MembersCards=Carnés de membros
 MembersList=Listaxe de membros
 MembersListToValid=Listaxe de membros borrador (a validar)
 MembersListValid=Listaxe de membros validados
-MembersListUpToDate=Lista de membros válidos con subscrición actualizada
-MembersListNotUpToDate=Lista de membros válidos con data vencida na subscrición
+MembersListUpToDate=Listaxe de membros válidos con subscrición actualizada
+MembersListNotUpToDate=Listaxe de membros válidos con data vencida na subscrición
+MembersListExcluded=Listaxe de membros excluídos
 MembersListResiliated=Listaxe dos membros dados de baixa
 MembersListQualified=Listaxe dos membros cualificados
 MenuMembersToValidate=Membros borrador
 MenuMembersValidated=Membros validados
+MenuMembersExcluded=Menbros excluídos
 MenuMembersResiliated=Membros de baixa
 MembersWithSubscriptionToReceive=Membros agardando recibir afiliación
 MembersWithSubscriptionToReceiveShort=Agardando afiliación
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Afiliación expirada
 MemberStatusActiveLateShort=Expirado
 MemberStatusPaid=Afiliacións ao día
 MemberStatusPaidShort=Ao día
+MemberStatusExcluded=Membro excluído
+MemberStatusExcludedShort=Excluído
 MemberStatusResiliated=Membro de baixa
 MemberStatusResiliatedShort=De baixa
 MembersStatusToValid=Membros en borrador
+MembersStatusExcluded=Menbros excluídos
 MembersStatusResiliated=Membros de baixa
 MemberStatusNoSubscription=Validado (non precisa afiliación)
 MemberStatusNoSubscriptionShort=Validado
@@ -82,6 +87,8 @@ Physical=Físico
 Moral=Xurídico
 MorAndPhy=Xurídico e Físico
 Reenable=Reactivar
+ExcludeMember=Excluír un membro
+ConfirmExcludeMember=Está certo de querer excluír a este membro?
 ResiliateMember=Dar de baixa a un membro
 ConfirmResiliateMember=¿Está certo de querer dar de baixa a este membro?
 DeleteMember=Eliminar un membro
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modelo de correo electrónico para
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modelo de correo electrónico para usar para enviar correo electrónico a membros na nova gravación de subscrición
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modelo de correo electrónico para usar para enviar recordatorios cando a subscrición está a piques de caducar
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modelo de correo electrónico a usar para enviar a membros ao cancelar a subscrición
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Modelo de correo electrónico a usar para o envío de correo electrónico a un membro excluído
 DescADHERENT_MAIL_FROM=Correo electrónico do remitente para correos electrónicos automáticos
 DescADHERENT_ETIQUETTE_TYPE=Formato de páxinas de etiquetas
 DescADHERENT_ETIQUETTE_TEXT=Texto impreso nas follas de enderezos dos membros
@@ -162,6 +170,7 @@ DocForLabels=Xeración de etiquetas de enderezos
 SubscriptionPayment=Pagamento cota
 LastSubscriptionDate=Data da última cotización
 LastSubscriptionAmount=Importe da última cotización
+LastMemberType=Último tipo de Membro
 MembersStatisticsByCountries=Estatísticas de membros por país
 MembersStatisticsByState=Estatísticas de membros por provincia/pais
 MembersStatisticsByTown=Estatísticas de membros por poboación
diff --git a/htdocs/langs/gl_ES/modulebuilder.lang b/htdocs/langs/gl_ES/modulebuilder.lang
index c5e4535245b..ffc915782df 100644
--- a/htdocs/langs/gl_ES/modulebuilder.lang
+++ b/htdocs/langs/gl_ES/modulebuilder.lang
@@ -58,7 +58,7 @@ DatabaseIndex=Índice da base de datos
 FileAlreadyExists=O ficheiro %s xa existe
 TriggersFile=Ficheiro para o código de trigger
 HooksFile=Ficheiro para o código de hooks
-ArrayOfKeyValues=​​= Matriz de chave-valor
+ArrayOfKeyValues=​​Matriz de chave-valor
 ArrayOfKeyValuesDesc=Matriz de chaves e valores se o campo é unha lista combinada con valores fixos
 WidgetFile=Ficheiro widget
 CSSFile=Ficheiro CSS
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Listaxe de permisos definidos
 SeeExamples=Ver exemplos aquí
 EnabledDesc=Condición para ter activo este campo (Exemplos: 1 ou $ conf-> global-> MYMODULE_MYOPTION)
 VisibleDesc=¿É visible o campo? (Exemplos: 0= Nunca visible, 1= Visible na lista e crear/actualizar/ver formularios, 2= Visible só na lista, 3= Visible só na forma de crear/actualizar/ver (non lista), 4= Visible na lista e actualizar/ver formulario só (non crear), 5= Visible só no formulario de visualización final da lista (non crear, non actualizar). <br> <br> Usar un valor negativo significa que o campo non se amosa por defecto na lista, pero pódese seleccionar para ver). <br> <br> Pode ser unha expresión, por exemplo: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])?0:1 <br> ($ usuario-> dereitos->vacacións->definir_ vacacións?1:0)
-DisplayOnPdfDesc=Amosar este campo en documentos PDF compatibles, pode xestionar a posición co campo "Posición". <br/> Actualmente, os modelos de PDF compatibles coñecidos son: eratosthene (pedimento), espadon (envío), sponge (facturas), cian ( orzamento), cornas (pedimento de provedor) <br/> <br/> <strong> Para documento: </strong> <br/> 0= non amosado <br/> 1= visualización <br/> 2= visualización só se non está baleiro <br/> <br/> <strong> Para liñas de documento: </strong> <br/> 0= non amosado <br/> 1= amosado nunha columna <br/> 3= amosado en liña columna de descrición despois da descrición <br/> 4= amosar na columna de descrición despois da descrición só se non está baleira
+DisplayOnPdfDesc=Amosar este campo en documentos PDF compatibles, pode xestionar a posición co campo "Posición". <br/> Actualmente, os modelos de PDF compatibles coñecidos son: eratosthene (pedimento), espadon (envío), sponge (facturas), cian ( orzamento), cornas (pedimento a provedor) <br/> <br/> <strong> Para documento: </strong> <br/> 0= non amosado <br/> 1= visualización <br/> 2= visualización só se non está baleiro <br/> <br/> <strong> Para liñas de documento: </strong> <br/> 0= non amosado <br/> 1= amosado nunha columna <br/> 3= amosado en liña columna de descrición despois da descrición <br/> 4= amosar na columna de descrición despois da descrición só se non está baleira
 DisplayOnPdf=Amosar en PDF
 IsAMeasureDesc=¿Pódese acumular o valor do campo para obter un total na lista? (Exemplos: 1 ou 0)
 SearchAllDesc=¿O campo utilízase para facer unha procura desde a ferramenta de busca rápida? (Exemplos: 1 ou 0)
@@ -133,7 +133,9 @@ IncludeDocGeneration=Quero xerar algúns documentos a partir do obxecto
 IncludeDocGenerationHelp=Se marca isto, xerarase algún código para engadir unha caixa "Xerar documento" no rexistro.
 ShowOnCombobox=Mostrar o valor en combobox
 KeyForTooltip=Chave para a información sobre ferramentas
-CSSClass=Clase CSS
+CSSClass=CSS para editar/crear formulario
+CSSViewClass=CSS para formulario de lectura
+CSSListClass=CSS para a listaxe
 NotEditable=Non editable
 ForeignKey=Chave estranxeira
 TypeOfFieldsHelp=Tipo de campos: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName:relativepath/to/classfile.class.php[:1[:filter]] ("1" significa que engadimos un botón + despois do combo para crear o rexistro, "filter" pode ser "status=1 AND fk_user=__USER_ID AND entity IN (__SHARED_ENTITIES__)" por exemplo)
diff --git a/htdocs/langs/gl_ES/orders.lang b/htdocs/langs/gl_ES/orders.lang
index c7a3ac01b3d..10bc3214df4 100644
--- a/htdocs/langs/gl_ES/orders.lang
+++ b/htdocs/langs/gl_ES/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Realizar pedimento
 MakeOrder=Realizar pedimento
 SupplierOrder=Pedimento a provedor
 SuppliersOrders=Pedimentos a provedores
+SaleOrderLines=Liñas de pedimentos de venda
+PurchaseOrderLines=Liñas de pedimentos de compras
 SuppliersOrdersRunning=Pedimentos a provedores actuais
 CustomerOrder=Pedimento cliente
 CustomersOrders=Pedimentos de clientes
@@ -80,7 +82,7 @@ NoOrder=Sen pedimentos
 NoSupplierOrder=Sen orde de compra
 LastOrders=Últimos %s pedimentos de clientes
 LastCustomerOrders=Últimos %s pedimentos de clientes
-LastSupplierOrders=Últimas %s pedimentos de provedor
+LastSupplierOrders=Últimos %s pedimentos a provedor
 LastModifiedOrders=Últimos %s pedimentos de clientes modificados
 AllOrders=Todos os pedimentos
 NbOfOrders=Número de pedimentos
@@ -98,8 +100,8 @@ ConfirmCancelOrder=¿Está certo de querer anular este pedimento?
 ConfirmMakeOrder=¿Está certo de querer confirmar este pedimento en fecha de <b>%s</b> ?
 GenerateBill=Facturar
 ClassifyShipped=Clasificar enviado
-DraftOrders=Pedimentos borrador
-DraftSuppliersOrders=Ordes de pedimentos borrador
+DraftOrders=Pedimentos de cliente borrador
+DraftSuppliersOrders=Pedimentos a provedor borrador
 OnProcessOrders=Pedimentos en proceso
 RefOrder=Ref. pedimento
 RefCustomerOrder=Ref. pedimento para o cliente
@@ -107,7 +109,7 @@ RefOrderSupplier=Ref. pedimento para o provedor
 RefOrderSupplierShort=Ref. ped. prov.
 SendOrderByMail=Enviar pedimento por e-mail
 ActionsOnOrder=Eventos sobre o pedimento
-NoArticleOfTypeProduct=Non hai artigos de tipo 'producto' y por lo tanto enviables en este pedimento
+NoArticleOfTypeProduct=Non hai artigos de tipo 'produto' polo que non hai artigo que se poida enviar neste pedimento
 OrderMode=Método de pedimento
 AuthorRequest=Autor/Solicitante
 UserWithApproveOrderGrant=Usuarios habilitados para aprobar os pedimentos
@@ -116,9 +118,9 @@ ConfirmCloneOrder=¿Está certo de querer clonar este pedimento <b>%s</b>?
 DispatchSupplierOrder=Recepción do pedimento a provedor %s
 FirstApprovalAlreadyDone=Primeira aprobación realizada
 SecondApprovalAlreadyDone=Segunda aprobación realizada
-SupplierOrderReceivedInDolibarr=Pedimento de provedor %s recibido %s
-SupplierOrderSubmitedInDolibarr=Pedimento de provedor %s solicitado
-SupplierOrderClassifiedBilled=Pedimento de provedor %s facturado
+SupplierOrderReceivedInDolibarr=Pedimento a provedor %s recibido %s
+SupplierOrderSubmitedInDolibarr=Pedimento a provedor %s solicitado
+SupplierOrderClassifiedBilled=Pedimento a provedor %s facturado
 OtherOrders=Outros pedimentos
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable seguemento do pedimento cliente
@@ -146,7 +148,7 @@ PDFEratostheneDescription=Modelo de pedimento completo (logo...)
 PDFEdisonDescription=Modelo de pedimento simple
 PDFProformaDescription=Unha factura proforma completa (logo...)
 CreateInvoiceForThisCustomer=Facturar pedimentos de cliente
-CreateInvoiceForThisSupplier=Facturar pedimentos de provedor
+CreateInvoiceForThisSupplier=Facturar pedimentos a provedor
 NoOrdersToInvoice=Sen pedimentos facturables
 CloseProcessedOrdersAutomatically=Clasificar automáticamente como "Procesados" os pedimentos seleccionados.
 OrderCreation=Creación pedimento
diff --git a/htdocs/langs/gl_ES/other.lang b/htdocs/langs/gl_ES/other.lang
index 5a52b287896..295fc5bd4ba 100644
--- a/htdocs/langs/gl_ES/other.lang
+++ b/htdocs/langs/gl_ES/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Empresa con actividades múltiples (todos os módulos principais)
 CreatedBy=Creado por %s
 ModifiedBy=Modificado por %s
 ValidatedBy=Validado por %s
+SignedBy=Asinado por %s
 ClosedBy=Pechado por %s
 CreatedById=Id usuario que foi creado
 ModifiedById=Id de usuario no que foi realizado último cambio
@@ -175,7 +176,7 @@ SizeUnitinch=pulgada
 SizeUnitfoot=pe
 SizeUnitpoint=punto
 BugTracker=Incidencias
-SendNewPasswordDesc=Este formulario permítelle solicitar un novo contrasinal. Enviarase ao seu enderezo de correo electrónico. <br> O cambio será efectivo unha vez faga clic na ligazón de confirmación do correo electrónico. <br> Comprobe a súa caixa de entrada.
+SendNewPasswordDesc=Este formulario permítelle solicitar un novo contrasinal. Enviarase ao seu enderezo de correo electrónico. <br> O cambio será efectivo unha vez prema na ligazón de confirmación do correo electrónico. <br> Comprobe a súa caixa de entrada.
 BackToLoginPage=Voltar á páxina de inicio de sesión
 AuthenticationDoesNotAllowSendNewPassword=O modo de autenticación é <b>% s </b>. <br> Neste modo, Dolibarr non pode saber nin cambiar o seu contrasinal. <br> Póñase en contacto co administrador do sistema se quere cambiar o seu contrasinal.
 EnableGDLibraryDesc=Instalar ou habilitar a biblioteca GD na súa instalación de PHP para usar esta opción.
@@ -195,7 +196,7 @@ NumberOfUnitsProposals=Número de unidades nos orzamentos a clientes
 NumberOfUnitsCustomerOrders=Número de unidades nos pedimentos de clientes
 NumberOfUnitsCustomerInvoices=Número de unidades nas facturas a clientes
 NumberOfUnitsSupplierProposals=Número de unidades nos orzamentos de provedores
-NumberOfUnitsSupplierOrders=Número de unidades nos pedimentos de provedores
+NumberOfUnitsSupplierOrders=Número de unidades nos pedimentos a provedores
 NumberOfUnitsSupplierInvoices=Número de unidades nas facturas de provedores
 NumberOfUnitsContracts=Número de unidades en contratos
 NumberOfUnitsMos=Número de unidades a producir nos pedimentos de fabricación
@@ -228,7 +229,7 @@ CurrentInformationOnImage=Esta herramienta le permite cambiar el tamaño o cuadr
 ImageEditor=Editor de imaxe
 YouReceiveMailBecauseOfNotification=Vostede está a recibir esta mensaxe porque o seu correo electrónico está subscrito a algunhas notificacións automáticas para informalo acerca de eventos especiais do programa %s de %s.
 YouReceiveMailBecauseOfNotification2=O evento en cuestión é o seguinte:
-ThisIsListOfModules=Amosámoslle un listado de módulos preseleccionados para este perfil de demostración (nesta demo só os mais comúns son accesibles). Axuste as súas preferencias e faga clic en "Iniciar".
+ThisIsListOfModules=Amosámoslle un listado de módulos preseleccionados para este perfil de demostración (nesta demo só os mais comúns son accesibles). Axuste as súas preferencias e prema en "Iniciar".
 UseAdvancedPerms=Usar os dereitos avanzados nos permisos dalgúns módulos
 FileFormat=Formato de ficheiro
 SelectAColor=Escolla unha cor
@@ -242,8 +243,9 @@ ResetPassword=Renovar contrasinal
 RequestToResetPasswordReceived=Foi recibida unha solicitude para cambiar o seu contrasinal de Dolibarr
 NewKeyIs=Este é o seu novo contrasinal para iniciar sesión
 NewKeyWillBe=O seu novo contradinal para iniciar sesión no software será
-ClickHereToGoTo=Faga click aquí para ir a %s
+ClickHereToGoTo=Prema aquí para ir a %s
 YouMustClickToChange=Porén, debe facer click primeiro na seguinte ligazón para validar este cambio de contrasinal
+ConfirmPasswordChange=Confirmar o cambio de contrasinal
 ForgetIfNothing=Se vostede non ten solicitado este cambio, simplemente ignore este correo electrónico. A súas credenciais son gardadas de forma segura.
 IfAmountHigherThan=Se o importe é maior que <strong>%s</strong>
 SourcesRepository=Repositorio das fontes
diff --git a/htdocs/langs/gl_ES/productbatch.lang b/htdocs/langs/gl_ES/productbatch.lang
index 79377f94908..73b91172fde 100644
--- a/htdocs/langs/gl_ES/productbatch.lang
+++ b/htdocs/langs/gl_ES/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Usar numeración por lote/serie
-ProductStatusOnBatch=Sí (é preciso lote/serie)
+ProductStatusOnBatch=Sí (lote obrigatorio)
+ProductStatusOnSerial=Sí (é preciso un número de serie único)
 ProductStatusNotOnBatch=Non (non é preciso lote/serie)
-ProductStatusOnBatchShort=Sí
+ProductStatusOnBatchShort=Lote
+ProductStatusOnSerialShort=Serie
 ProductStatusNotOnBatchShort=Non
 Batch=Lote/Serie
 atleast1batchfield=Data de caducidade ou data de venda ou número de Lote/Serie
@@ -22,3 +24,12 @@ ProductLotSetup=Configuración do módulo lote/serie
 ShowCurrentStockOfLot=Amosar o stock actual deste produto/lote
 ShowLogOfMovementIfLot=Consultar os movemeentos de stock deste produto/lote
 StockDetailPerBatch=Detalle de stock por lote
+SerialNumberAlreadyInUse=O número de serie %s xa é usado para o produto %s
+TooManyQtyForSerialNumber=Só pode ter un produto %s para o número de serie %s
+BatchLotNumberingModules=Opcións para a xeración automática de lotes de produtos  xestionados por lotes
+BatchSerialNumberingModules=Opcións para a xeración automática de lotes de produtos xestionados por números de serie 
+CustomMasks=Engada unha opción para definir a máscara na tarxeta do produto 
+LotProductTooltip=Engada unha opción na tarxeta do produto para definir unha máscara de número de lote dedicada 
+SNProductTooltip=Engada unha opción na tarxeta do produto para definir unha máscara de número de serie dedicada 
+QtyToAddAfterBarcodeScan=Cant. a engadir por cada código de barras/lote/serie escaneado
+
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index ba1300b6c83..daae06a5d63 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=Tasa IVE (para este produto/provedor)
 DiscountQtyMin=Desconto para esta cantidade
 NoPriceDefinedForThisSupplier=Ningún prezo/cant. definido para este provedor/produto
 NoSupplierPriceDefinedForThisProduct=Ningún prezo/cant. a provedor definida para este produto
+PredefinedItem=Elemento predefinido
 PredefinedProductsToSell=Produtos predefinidos
 PredefinedServicesToSell=Servizos predefinidos
 PredefinedProductsAndServicesToSell=Produtos/servizos predefinidos á venda
@@ -168,7 +169,7 @@ BuyingPrices=Prezos de compra
 CustomerPrices=Prezos a clientes
 SuppliersPrices=Prezos a provedores
 SuppliersPricesOfProductsOrServices=Prezos de provedores (de produtos ou servizos)
-CustomCode=Aduanda / Mercadoría / Código HS
+CustomCode=Aduana/Mercadoría/Código HS
 CountryOrigin=País de orixe
 RegionStateOrigin=Rexión de orixe
 StateOrigin=Estado|Provincia de orixe
@@ -313,7 +314,7 @@ LastUpdated=Última actualización
 CorrectlyUpdated=Actualizado correctamente
 PropalMergePdfProductActualFile=Ficheiros usados para engadir no PDF Azur son
 PropalMergePdfProductChooseFile=Seleccione os ficheiros PDF
-IncludingProductWithTag=Produtos/servizos incluidos coa etiqueta
+IncludingProductWithTag=Inclúe produtos/servizos con etiqueta 
 DefaultPriceRealPriceMayDependOnCustomer=Prezo por defecto, ou prezo real pode depender do cliente
 WarningSelectOneDocument=Seleccione alo menos un documento
 DefaultUnitToShow=Unidade
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
index 55a7a3e1624..3a9604e685c 100644
--- a/htdocs/langs/gl_ES/projects.lang
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumido
 ListOfTasks=Listaxe de tarefas
 GoToListOfTimeConsumed=Ir á listaxe de tempos empregados
 GanttView=Vista de Gantt
+ListWarehouseAssociatedProject=Listaxe de almacéns asociados ao proxecto 
 ListProposalsAssociatedProject=Listaxe de orzamentos asociados ao proxecto
 ListOrdersAssociatedProject=Listaxe de pedimentos de clientes asociados ao proxecto
 ListInvoicesAssociatedProject=Listaxe de facturas a clientes asociadas ao proxecto
@@ -268,3 +269,7 @@ OneLinePerTask=Unha liña por tarefa
 OneLinePerPeriod=Unha liña por período
 RefTaskParent=Ref. Tarefa Pai
 ProfitIsCalculatedWith=Beneficio está calculado usando
+AddPersonToTask=Engadir tamén ás tarefas
+UsageOrganizeEvent=Uso: organización de eventos 
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Clasificar o proxecto como pechado cando se completen todas as súas tarefas (100 %% progreso)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: os proxectos existentes con todas as tarefas en progreso do 100 %% non se verán afectados: terá que pechalos manualmente. Esta opción só afecta a proxectos abertos. 
diff --git a/htdocs/langs/gl_ES/propal.lang b/htdocs/langs/gl_ES/propal.lang
index af8b0cff643..a082b72181a 100644
--- a/htdocs/langs/gl_ES/propal.lang
+++ b/htdocs/langs/gl_ES/propal.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Orzamentos
-Proposal=Orzamento
+Proposals=Orzamentos a clientes
+Proposal=Orzamento a cliente
 ProposalShort=Orzamento
-ProposalsDraft=Orzamentos borrador
-ProposalsOpened=Orzamentos abertos
-CommercialProposal=Orzamento
-PdfCommercialProposalTitle=Orzamento
+ProposalsDraft=Orzamentos a cliente borrador
+ProposalsOpened=Orzamentos a cliente abertos
+CommercialProposal=Orzamento a cliente
+PdfCommercialProposalTitle=Orzamento a cliente
 ProposalCard=Ficha orzamento
 NewProp=Novo orzamento
 NewPropal=Novo orzamento
@@ -59,6 +59,7 @@ ConfirmClonePropal=¿Está certo de querer clonar o orzamento <b>%s</b>?
 ConfirmReOpenProp=¿Está certo de abrir de novo o orzamento <b>%s</b>?
 ProposalsAndProposalsLines=Orzamentos e liñas de orzamentos
 ProposalLine=Liña de orzamento
+ProposalLines=Liñas do orzamento
 AvailabilityPeriod=Tempo de entrega
 SetAvailability=Definir o tempo de entrega
 AfterOrder=dende a sinatura
diff --git a/htdocs/langs/gl_ES/salaries.lang b/htdocs/langs/gl_ES/salaries.lang
index 53100c1c694..577ba84d964 100644
--- a/htdocs/langs/gl_ES/salaries.lang
+++ b/htdocs/langs/gl_ES/salaries.lang
@@ -2,12 +2,15 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Conta contable usada para os terceiros
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Utilízase unha conta contable adicada definida na ficha de usuario para encher o Libro Maior, ou como valor predeterminado da contabilidade do Libro Maior se non é definida unha conta contable na ficha do usuario
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta contable por defecto para pagamentos de salarios
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=De xeito predeterminado, deixe baleira a opción "Crear automaticamente un pago total" ao crear un Salario
 Salary=Salario
 Salaries=Salarios
-NewSalaryPayment=Novo pagamento de salario
+NewSalary=Novo salario
+NewSalaryPayment=Nova pagamento de salario
 AddSalaryPayment=Engadir pagamento de salario
 SalaryPayment=Pagamento de salario
 SalariesPayments=Pagamentos de salarios
+SalariesPaymentsOf=Pago de salarios de %s
 ShowSalaryPayment=Ver pagamento de salario
 THM=Taxa media por hora
 TJM=Taxa media por día
diff --git a/htdocs/langs/gl_ES/stocks.lang b/htdocs/langs/gl_ES/stocks.lang
index 489350367f1..bde18dd1aa5 100644
--- a/htdocs/langs/gl_ES/stocks.lang
+++ b/htdocs/langs/gl_ES/stocks.lang
@@ -38,7 +38,7 @@ IncludeEmptyDesiredStock=Inclúe tamén stock negativo con stock desexado indefi
 IncludeAlsoDraftOrders=Incluir tamén pedimentos borrador
 Location=Localización
 LocationSummary=Nome curto da localización
-NumberOfDifferentProducts=Número de produtos diferentes
+NumberOfDifferentProducts=Número de produtos únicos
 NumberOfProducts=Numero total de produtos
 LastMovement=Último movemento
 LastMovements=Últimos movementos
@@ -62,8 +62,9 @@ EnhancedValueOfWarehouses=Valor de stocks en almacén
 UserWarehouseAutoCreate=Crea automáticamente un almacén de usuarios ao crear un usuario
 AllowAddLimitStockByWarehouse=Xestionar tamén o valor do stock mínimo e desexado por emparellamento (produto-almacén) ademais do valor do stock mínimo e stock desexado por produto
 RuleForWarehouse=Regras para almacén
-WarehouseAskWarehouseDuringPropal=Establecer un almacén en orzamento a cliente
-WarehouseAskWarehouseDuringOrder=Establecer un almacén para pedimentos de provedor
+WarehouseAskWarehouseOnThirparty=Establecer un almacén en terceiros
+WarehouseAskWarehouseDuringPropal=Establecer un almacén en orzamentos a clientes
+WarehouseAskWarehouseDuringOrder=Establecer un almacén para pedimentos a provedor
 UserDefaultWarehouse=Establecer un almacén para usuarios
 MainDefaultWarehouse=Almacén por defecto
 MainDefaultWarehouseUser=Usar un almacén por defecto para cada usuario
@@ -80,8 +81,8 @@ DeStockOnValidateOrder=Diminuír o stock real na validación do pedimento de pro
 DeStockOnShipment=Diminuír o stock real na validación do envío
 DeStockOnShipmentOnClosing=Diminúe o stock real cando o envío está pechado
 ReStockOnBill=Aumenta o stock real na validación da factura/nota de crédito do provedor
-ReStockOnValidateOrder=Aumenta o stock real na aprobación do pedimento de provedor
-ReStockOnDispatchOrder=Aumentar o stock real no envío manual ao almacén, despois da recepción da mercadoría do pedimento de provedor
+ReStockOnValidateOrder=Aumenta o stock real na aprobación do pedimento a provedor
+ReStockOnDispatchOrder=Aumentar o stock real no envío manual ao almacén, despois da recepción da mercadoría do pedimento a provedor
 StockOnReception=Aumento o stock real na validación da recepción
 StockOnReceptionOnClosing=Aumenta o stock real cando pecha a recepción
 OrderStatusNotReadyToDispatch=O pedimento de cliente aínda non ten ou non ten un estado que permite o envío de produtos en almacéns.
@@ -97,15 +98,16 @@ RealStockDesc=O stock físico/real é o stock actualmente existente nos almacén
 RealStockWillAutomaticallyWhen=O stock real modificarase segundo esta regra (como se define no módulo Stock):
 VirtualStock=Stock virtual
 VirtualStockAtDate=Stock virtual á data
-VirtualStockAtDateDesc=Stock virtual unha vez finalizados todos os pedidos pendentes que se prevé facer antes da data
+VirtualStockAtDateDesc=Stock virtual unha vez que finalicen todos os pedimentos pendentes que van ser procesados antes da data escollida
 VirtualStockDesc=O stock virtual é o stock calculado dispoñible unha vez pechadas todas as accións abertas/pendentes (que afectan ao stock) (pedimentos a provedor recibidos, pedimentos de cliente enviados, pedimentos de fabricación producidos, etc.)
+AtDate=Na data
 IdWarehouse=Id. almacén
 DescWareHouse=Descrición almacén
 LieuWareHouse=Localización almacén
 WarehousesAndProducts=Almacéns e produtos
 WarehousesAndProductsBatchDetail=Almacéns e produtos (con detalle por lote/serie)
 AverageUnitPricePMPShort=Prezo medio ponderado (PMP)
-AverageUnitPricePMPDesc=O prezo unitario medio de entrada que houbo que pagar aos provedores para que o produto estivese no noso stock.
+AverageUnitPricePMPDesc=O prezo unitario medio de entrada que houbo que gastar para conseguir 1 unidade de produto no noso stock.
 SellPriceMin=Prezo de venda unitario
 EstimatedStockValueSellShort=Valor de venda
 EstimatedStockValueSell=Valor de venda
@@ -138,14 +140,14 @@ IncludeProductWithUndefinedAlerts = Inclúe tamén stock negativo para produtos
 WarehouseForStockDecrease=Para o decremento de stock usarase o almacén <b>%s</b>
 WarehouseForStockIncrease=Para o incremento de stock usarase o almacén <b>%s</b>
 ForThisWarehouse=Para este almacén
-ReplenishmentStatusDesc=Esta é unha listaxe de todos os produtos cun stock inferior ao stock desexado (ou inferior ao valor de alerta se a caixa de verificación "só alerta" está marcada). Usando a caixa de verificación, pode crear pedimentos de provedor para cubrir a diferenza.
+ReplenishmentStatusDesc=Esta é unha listaxe de todos os produtos cun stock inferior ao stock desexado (ou inferior ao valor de alerta se a caixa de verificación "só alerta" está marcada). Usando a caixa de verificación, pode crear pedimentos a provedor para cubrir a diferenza.
 ReplenishmentStatusDescPerWarehouse=Se desexa unha reposición baseada na cantidade desexada definida por almacén, debe engadir un filtro no almacén.
 ReplenishmentOrdersDesc=Esta é unha listaxe de todos os pedimentos a provedor abertos, incluídos os produtos predefinidos. Aquí só son visibles os pedimentos abertos con produtos predefinidos, polo que os pedimentos  poden afectar ao stock..
 Replenishments=Reposicións
 NbOfProductBeforePeriod=Cantidade de produto %s en stock antes do período seleccionado (<%s)
 NbOfProductAfterPeriod=Cantidade de produto %s en stock despois do período seleccionado (>%s)
 MassMovement=Movementos en masa
-SelectProductInAndOutWareHouse=Seleccione un almacén de orixe e un almacén de destino, un produto e unha cantidade e prema en "%s". Unha vez feito isto para todos os movementos precisos, faga clic en "%s".
+SelectProductInAndOutWareHouse=Escolla un almacén de orixe e un almacén de destino, un produto e unha cantidade e prema en "%s". Unha vez feito isto para todos os movementos precisos, prema en "%s"
 RecordMovement=Rexistrar transferencia
 ReceivingForSameOrder=Recepcións deste pedimento
 StockMovementRecorded=Movemento de stock rexistrado
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=O nivel de stock debe ser suficiente para engadir pr
 StockMustBeEnoughForOrder=O nivel de stock debe ser suficiente para engadir produto/servizo ao pedimento (a comprobación faise no stock real actual ao engadir unha liña no pedimento calquera que sexa a regra para o cambio de stock automático)
 StockMustBeEnoughForShipment= O nivel de stock debe ser suficiente para engadir produto/servizo ao envío (a comprobación faise no stock real actual cando se engade unha liña ao envío calquera que sexa a regra para o cambio automático de stock)
 MovementLabel=Etiqueta do movemento
-TypeMovement=Tipo de movemento
+TypeMovement=Sentido do movemento
 DateMovement=Data de movemento
 InventoryCode=Movemento ou código de inventario
 IsInPackage=Contido no paquete
@@ -169,13 +171,13 @@ NoPendingReceptionOnSupplierOrder=Non agárdanse recepcións do pedimento a prov
 ThisSerialAlreadyExistWithDifferentDate=Este número de lote/serie (<strong>%s</strong>) xa existe, pero cunha data de caducidade ou venda distinta (atopada <strong>%s</strong> pero vostede introduce <strong>%s</strong>).
 OpenAll=Aberto para todas as accións
 OpenInternal=Aberto só a accións internas
-UseDispatchStatus=Use un estado de envío (aprobar/rexeitar) para as liñas de produtos na recepción do pedimento de provedor
+UseDispatchStatus=Use un estado de envío (aprobar/rexeitar) para as liñas de produtos na recepción do pedimento a provedor
 OptionMULTIPRICESIsOn=A opción "varios prezos por segmento" está activada. Significa que un produto ten varios prezos de venda polo que o valor para a venda non se pode calcular
 ProductStockWarehouseCreated=Límite stock para alertas e stock óptimo desxeado creado correctamente
 ProductStockWarehouseUpdated=Límite stock para alertas e stock óptimo desexado actualizado correctamente
 ProductStockWarehouseDeleted=Límite stock para alertas e stock óptimo desexado eliminado correctamente
 AddNewProductStockWarehouse=Indicar novo límite para alertas e stock óptimo desexado
-AddStockLocationLine=Disminúa a cantidade, e a continuación, faga clic para agregar outro almacén para este produto
+AddStockLocationLine=Disminúa a cantidade, e a continuación, prema para agregar outro almacén para este produto
 InventoryDate=Data inventario
 NewInventory=Novo inventario
 inventorySetup = Configuración inventario
@@ -183,6 +185,7 @@ inventoryCreatePermission=Crear novo inventario
 inventoryReadPermission=Ver inventarios
 inventoryWritePermission=Actualizar inventarios
 inventoryValidatePermission=Validar inventario
+inventoryDeletePermission=Eliminar inventario
 inventoryTitle=Inventario
 inventoryListTitle=Inventarios
 inventoryListEmpty=Sen inventario en progreso
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock é solicitado para escoller que lote
 ForceTo=Forzar a
 AlwaysShowFullArbo=Mostrar a árbore completa do almacén na ventá emerxente das ligazóns do almacén (aviso: isto pode diminuír drasticamente o rendemento)
 StockAtDatePastDesc=Aquí pode ver o stock (stock real) nunha data determinada no pasado
-StockAtDateFutureDesc=Aquí pode ver o stock (stock virtual) nunha data determinada no futuro
+StockAtDateFutureDesc=Pode ver aquí o stock (stock virtual) nunha data determinada no futuro
 CurrentStock=Stock actual
 InventoryRealQtyHelp=Estableza o valor en 0 para restablecer cantidade<br> Manteña o campo baleiro ou elimine a liña para mantelo sen cambios
-UpdateByScaning=Actualiza escaneando
+UpdateByScaning=Enche a cantidade real escaneando
 UpdateByScaningProductBarcode=Actualiza por escaneo (código de barras do produto)
 UpdateByScaningLot=Actualiza por escano (código de barras lote/serie)
 DisableStockChangeOfSubProduct=Desactive o cambio de stock de todos os subprodutos deste produto composto durante este movemento.
+ImportFromCSV=Importar listaxe de movementos en CSV
+ChooseFileToImport=Escolla o ficheiro de importación e prema na imaxe %s para seleccionalo como ficheiro orixe de importación...
+SelectAStockMovementFileToImport=Seleccionar un ficheiro a importar dos movementos de stock
+InfoTemplateImport=O ficheiro cargado precisa ter este formato (* son campos obrigatorios): <br> Almacén orixe* | Almacén destino* | Produto* | Cantidade* | Número de Lote/Serie <br> CSV debe ser " <b>%s</b>"
+LabelOfInventoryMovemement=Inventario %s
+ReOpen=Abrir de novo
+ConfirmFinish=Confirma o peche do inventario? Isto xerará todos os movementos de stock para actualizar o seu stock
+ObjectNotFound=%s non foi atopado
+MakeMovementsAndClose=Xera movementos e pecha
+AutofillWithExpected=Encher a cantidade real coa cantidade agardada
diff --git a/htdocs/langs/gl_ES/suppliers.lang b/htdocs/langs/gl_ES/suppliers.lang
index 1d835ebdedb..b49ac0b2e86 100644
--- a/htdocs/langs/gl_ES/suppliers.lang
+++ b/htdocs/langs/gl_ES/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Provedores
 SuppliersInvoice=Factura de provedor
+SupplierInvoices=Facturas de provedores
 ShowSupplierInvoice=Ver factura de provedor
 NewSupplier=Novo provedor
 History=Histórico
diff --git a/htdocs/langs/gl_ES/ticket.lang b/htdocs/langs/gl_ES/ticket.lang
index d9268409b20..9d4e31f46f1 100644
--- a/htdocs/langs/gl_ES/ticket.lang
+++ b/htdocs/langs/gl_ES/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Eliminado
 # Dict
 Type=Tipo
 Severity=Gravidade
+TicketGroupIsPublic=O grupo é público
+TicketGroupIsPublicDesc=Se un grupo de tickets é público, será visible no formulario cando se crea un ticket desde a interface pública
 
 # Email templates
 MailToSendTicketMessage=Enviar correo electrónico dende ticket
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Amosar o logotipo do módulo na interfaz pública
 TicketsShowModuleLogoHelp=Active esta opción para ocultar o logotipo nas páxinas da interfaz pública
 TicketsShowCompanyLogo=Amosar o logotipo da empresa na interfaz pública
 TicketsShowCompanyLogoHelp=Active esta opción para ocultar o logotipo da empresa principal nas páxinas da interfaz pública
-TicketsEmailAlsoSendToMainAddress=Envíe tamén notificacións a enderezo de correo electrónico principal
-TicketsEmailAlsoSendToMainAddressHelp=Active esta opción para enviar un correo electrónico ao enderezo "Notificación de correo electrónico desde" (ver configuración a continuación)
+TicketsEmailAlsoSendToMainAddress=Envíe tamén unha notificación ao enderezo de correo electrónico principal
+TicketsEmailAlsoSendToMainAddressHelp=Active esta opción para enviar tamén un correo electrónico ao enderezo definido na configuración "%s" (ver lapela "%s")
 TicketsLimitViewAssignedOnly=Restrinxir a visualización aos tickets asignados ao usuario actual (non é efectivo para usuarios externos, limítase sempre ao terceiro do que dependen)
 TicketsLimitViewAssignedOnlyHelp=Só serán visibles os tickets asignados ao usuario actual. Non se aplica a un usuario con dereitos de xestión de tickets.
 TicketsActivatePublicInterface=Activar a interface pública
@@ -126,10 +128,10 @@ TicketNumberingModules=Módulo de numeración de entradas
 TicketsModelModule=Modelos de documentos para os tickets
 TicketNotifyTiersAtCreation=Notificar a terceiros a creación
 TicketsDisableCustomerEmail=Desactiva sempre os correos electrónicos cando se crea un ticket desde a interface pública
-TicketsPublicNotificationNewMessage=Enviar correo electrónico cando se engada unha nova mensaxe
+TicketsPublicNotificationNewMessage=Envíe correo(s) electrónico(s) cando se engada unha nova mensaxe/comentario a un ticket
 TicketsPublicNotificationNewMessageHelp=Enviar correo electrónico cando se engada unha nova mensaxe desde a interface pública (ao usuario asignado ou ao correo electrónico de notificacións a (actualizar) e/ou ao correo electrónico de notificacións a)
 TicketPublicNotificationNewMessageDefaultEmail=Correo electrónico de notificacións a (actualizar)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Envía por correo electrónico novas mensaxes a este enderezo se o ticket non ten asignado un usuario ou o usuario non ten un correo electrónico.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Envía un correo electrónico a este enderezo para cada nova mensaxe de notificación se o ticket non ten un usuario asignado ou se o usuario non ten ningún correo electrónico coñecido.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Últimos tickets modificados
 BoxLastModifiedTicketDescription=Últimos %s tickets modificados
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Non hai tickets modificados recentemente
+BoxTicketType=Número de tickets abertos por tipo
+BoxTicketSeverity=Número de tickets abertos por gravidade
+BoxNoTicketSeverity=Número de tickets abertos
+BoxTicketLastXDays=Número de tickets abertos por días nos últimos %s días
+BoxTicketLastXDayswidget = Número de novos tickets por días nos últimos X días
+BoxNoTicketLastXDays=Sen novos tickets nos últimos %s días
+BoxNumberOfTicketByDay=Número de novos tickets por día
+BoxNewTicketVSClose=Número de novos tickets hoxe fronte a tickets pechados hoxe
+TicketCreatedToday=Ticket creado hoxe
+TicketClosedToday=Ticket pechado hoxe
diff --git a/htdocs/langs/gl_ES/users.lang b/htdocs/langs/gl_ES/users.lang
index 18657d820b1..908619e45e0 100644
--- a/htdocs/langs/gl_ES/users.lang
+++ b/htdocs/langs/gl_ES/users.lang
@@ -72,7 +72,7 @@ ExportDataset_user_1=Usuarios e as súas propiedades.
 DomainUser=Usuario de dominio
 Reactivate=Reactivar
 CreateInternalUserDesc=Este formulario permitelle engadir un usuario interno para a súa empresa/organización. Para crear un usuario externo (cliente, provedor, etc...), use o botón "Crear usuario Dolibarr" dende unha ficha dun contacto do terceiro.
-InternalExternalDesc=Un usuario <b>interno</b> é un usuario que pertence a súa empresa/organización.<br>Un usuario <b>externo</b> é un usuario cliente, provedor ou outro.<br><br>Nos dous casos, os permisos de usuarios definen os dereitos de acceso, pero o usuario externo pode a maiores ter un xestor de menús diferente ao usuario interno (véxase Inicio - Configuración - Entorno)
+InternalExternalDesc=Un usuario <b>interno</b> é un usuario que forma parte da súa empresa/organización ou é un usuario socio fóra da súa organización que pode precisar ver máis datos que os datos relacionados coa súa empresa (o sistema de permisos definirá o que pode ou non ver ou facer). <br>Un usuario <b>externo</b>  é un cliente, provedor ou outro que debe ver SÓ datos relacionados con el mesmo (A creación dun usuario externo para un terceiro pódese facer a partir do rexistro de contacto do terceiro) .<br><br>En ambos casos , debe conceder permisos sobre as funcións que precisa o usuario.
 PermissionInheritedFromAGroup=O permiso concédese xa que o hereda dun grupo ao cal pertence o usuario.
 Inherited=Heredado
 UserWillBe=Será o usuario creado
diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang
index 7691822ddf4..6c78521e7b5 100644
--- a/htdocs/langs/gl_ES/website.lang
+++ b/htdocs/langs/gl_ES/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u> Usar con Apache/NGinx/... </u> <br> Cree no seu servidor
 ExampleToUseInApacheVirtualHostConfig=Exemplo para usar na configuración do host virtual Apache:
 YouCanAlsoTestWithPHPS=<u> Usar con servidor incorporado PHP </u> <br> No entorno de desenvolvemento, pode que prefira probar o sitio co servidor web incorporado PHP (é preciso PHP 5.5) executando <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
 YouCanAlsoDeployToAnotherWHP=<u> Execute o seu sitio web con outro provedor de hospedaxe Dolibarr </u> <br> Se non ten un servidor web como Apache ou NGinx dispoñible en internet, pode exportar e importar o seu sitio web a outro Dolibarr por outro provedor de hospedaxe Dolibarr que proporciona unha integración completa co módulo do sitio web. Pode atopar unha lista dalgúns provedores de hospedaxe Dolibarr en <a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>
-CheckVirtualHostPerms=Comprobe tamén que o servidor virtual ten permiso <strong>%s </strong> para ficheiros en <br> <strong>%s </strong>
-ReadPerm=Lido
-WritePerm=Escribe
+CheckVirtualHostPerms=Comprobe tamén que o usuario do host virtual (por exemplo, www-data) ten permisos de <strong>%s</strong> nos ficheiros en <br><strong>%s</strong> 
+ReadPerm=Ler
+WritePerm=Escribir
 TestDeployOnWeb=Probar/despregar na web
 PreviewSiteServedByWebServer=<u> Previsualizar %s nunha nova pestana. </u> <br> <br> O %s será servido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar e configurar este servidor antes para apuntar ao directorio: <br> <strong>%s </strong> <br> URL ofrecido por un servidor externo: <br> <strong>%s </strong>
-PreviewSiteServedByDolibarr=<u> Previsualizar %s nunha nova lapela. </u> <br> <br> O servidor Dolibarr servirá o %s polo que non precisa instalar ningún servidor web adicional (como Apache, Nginx, IIS). <br> O inconveniente é que o URL das páxinas non é fácil de usar e empeza co camiño do Dolibarr. <br> URL servido por Dolibarr: <br> <strong>%s </strong> <br> < br> Para usar o seu propio servidor web externo para servir este sitio web, cree un servidor virtual no seu servidor web que apunte no directorio <br> <strong>%s </strong> <br> e logo introduza o nome deste servidor virtual e faga clic no outro botón de vista previa.
+PreviewSiteServedByDolibarr=<u>Previsualiza %s nunha nova lapela</u><br><br> O servidor Dolibarr servirá o %s polo que non precisa ningún servidor web adicional (como Apache, Nginx, IIS) para ser instalado. <br> O inconveniente é que as URL das páxinas non son fáciles de usar e comezan polo enderezo do seu Dolibarr.<br>URL ofrecido por Dolibarr: <br><strong>%s</strong><br><br> Para usar o seu propio servidor web externo para visualizar este sitio web, cree un servidor virtual no seu servidor web que apunte ao directorio <br><strong>%s</strong><br> entón introduza o nome deste servidor virtual nas propiedades deste sitio web e faga clic na ligazón "Probar/Implementar na web". 
 VirtualHostUrlNotDefined=O URL do host virtual ofrecido por un servidor web externo non está definido
 NoPageYet=Aínda non hai páxinas
 YouCanCreatePageOrImportTemplate=Pode crear unha nova páxina ou importar un modelo de sitio web completo
@@ -137,3 +137,11 @@ PagesRegenerated=%s páxina(s)/contedor(es) rexenerados
 RegenerateWebsiteContent=Rexenerar ficheiros de caché do sitio web
 AllowedInFrames=Permitido en marcos
 DefineListOfAltLanguagesInWebsiteProperties=Define a listaxe de todos os idiomas dispoñibles nas propiedades do sitio web.
+GenerateSitemaps=Xera un ficheiro de mapa do sitio web 
+ConfirmGenerateSitemaps=Se confirmas, borrará o ficheiro de mapa do sitio existente ... 
+ConfirmSitemapsCreation=Confirma a xeración do mapa do sitio 
+SitemapGenerated=Mapa do sitio xerado
+ImportFavicon=Favicon
+ErrorFaviconType=A favicon debe estar no formato png
+ErrorFaviconSize=A favicon debe ter o tamaño 32x32
+FaviconTooltip=Cargue unha imaxe en formato png de 32x32
diff --git a/htdocs/langs/gl_ES/zapier.lang b/htdocs/langs/gl_ES/zapier.lang
index 64d3db80452..60d4d375420 100644
--- a/htdocs/langs/gl_ES/zapier.lang
+++ b/htdocs/langs/gl_ES/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier para Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
-ModuleZapierForDolibarrDesc = Zapier para modulo de Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Configuración de Zapier para Dolibarr
+ModuleZapierForDolibarrDesc = Zapier para módulo de Dolibarr
+ZapierForDolibarrSetup=Configuración de Zapier para Dolibarr
 ZapierDescription=Interfaz con Zapier
+ZapierAbout=Sobre o módulo Zapier
+ZapierSetupPage=Non é precisa unha configuración en Dolibarr para usar Zapier. Porén, debe xerar e publicar un paquete en zapier para poder usar Zapier con Dolibarr. Ver a documentación nesta <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> páxina wiki</a>.
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 73aaf8f75be..32374680393 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=הסרת הנעילה חיבור
 YourSession=הפגישה שלך
 Sessions=Users Sessions
 WebUserGroup=שרת אינטרנט המשתמש / קבוצה
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=הערה: כן, הוא יעיל רק אם <b>%s</b> מודול 
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=הגדרת אבטחה
+PHPSetup=PHP setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=שגיאה, מודול זה דורש %s PHP גירסה ומעלה
 ErrorModuleRequireDolibarrVersion=שגיאה, מודול זה דורש %s Dolibarr גרסה ומעלה
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=לטהר עכשיו
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=הפעל על
 ActiveOn=הופעל על
+ActivatableOn=Activatable on
 SourceFile=מקור הקובץ
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=אפשרות זו זמינה רק אם JavaScript לא מבוטלת
 Required=דרוש
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=כל הדמויות האחרות מסכת יישאר ללא שינוי. <br> מקומות אסורים. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 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>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=העורכים
 Module49Desc=עורך ההנהלה
 Module50Name=מוצרים
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind המרות יכולות
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=רב החברה
 Module5000Desc=מאפשר לך לנהל מספר רב של חברות
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=יצירה / שינוי משתמשים פנימיים / ח
 Permission254=יצירה / שינוי משתמשים חיצוניים בלבד
 Permission255=שינוי סיסמה משתמשים אחרים
 Permission256=מחיקה או ביטול של משתמשים אחרים
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=לקרוא CA
 Permission272=לקרוא חשבוניות
 Permission273=להוציא חשבוניות
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=ביקורת אבטחה אירועים
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=ביקורת
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=עליך להפעיל את הפקודה משורת הפקודה לאחר ההתחברות להפגיז עם <b>%s</b> משתמש או עליך להוסיף-W אפשרות בסוף של שורת הפקודה כדי לספק את הסיסמה <b>%s.</b>
 YourPHPDoesNotHaveSSLSupport=פונקציות שאינן זמינות ב-SSL-PHP
 DownloadMoreSkins=עוד סקינים להורדה
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=תרגום חלקי
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=משלימים תכונות
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=התחברות (Unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=חיפוש מסנן
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=התחברות (סמבה, ActiveDirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=שם פרטי
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=אירועים מודול ההתקנה סדר היום
 PasswordTogetVCalExport=מפתח לאשר הקישור יצוא
+SecurityKey = Security Key
 PastDelayVCalExport=לא יצא אירוע מבוגרת
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index bd6e6e6d277..7652c9c8301 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -52,11 +52,12 @@ Invoices=חשבוניות
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
index bc3d4ba7b02..7c4f6c06dc8 100644
--- a/htdocs/langs/he_IL/boxes.lang
+++ b/htdocs/langs/he_IL/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index d01b7fcecb9..a5d458690e2 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index d1b5cde4dac..67d1824c77c 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 6635b8b2829..11fdc1b46fc 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/he_IL/ecm.lang b/htdocs/langs/he_IL/ecm.lang
index d0ef90500e6..f7c6c005d5b 100644
--- a/htdocs/langs/he_IL/ecm.lang
+++ b/htdocs/langs/he_IL/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/he_IL/externalsite.lang b/htdocs/langs/he_IL/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/he_IL/externalsite.lang
+++ b/htdocs/langs/he_IL/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 05e91914906..fad1276c2e6 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=משתמשים
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=אנשי קשר
 SearchIntoMembers=משתמשים
 SearchIntoUsers=משתמשים
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=פרוייקטים
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/he_IL/margins.lang b/htdocs/langs/he_IL/margins.lang
index b9d52dcfdc6..ad5406409b4 100644
--- a/htdocs/langs/he_IL/margins.lang
+++ b/htdocs/langs/he_IL/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index 5940fb7ea57..bd46c1c1a51 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/he_IL/modulebuilder.lang b/htdocs/langs/he_IL/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/he_IL/modulebuilder.lang
+++ b/htdocs/langs/he_IL/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
index bf68541e4ac..271fe5e3894 100644
--- a/htdocs/langs/he_IL/orders.lang
+++ b/htdocs/langs/he_IL/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Phone
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index d8012ef5cac..6928a0fc65e 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang
index 88effdec06a..4f0e21fcc0e 100644
--- a/htdocs/langs/he_IL/productbatch.lang
+++ b/htdocs/langs/he_IL/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=כן
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=לא
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index d9cb3f15d68..f399b0e7852 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 22aa61251a1..c0cc539e828 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/he_IL/propal.lang b/htdocs/langs/he_IL/propal.lang
index 92883dd0599..b76f1a85658 100644
--- a/htdocs/langs/he_IL/propal.lang
+++ b/htdocs/langs/he_IL/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 5d1abeffa0d..3c1991530bf 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=מניות
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/he_IL/ticket.lang b/htdocs/langs/he_IL/ticket.lang
index 39e0b9f8175..e9e3b33d874 100644
--- a/htdocs/langs/he_IL/ticket.lang
+++ b/htdocs/langs/he_IL/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index afbb1e993be..a313f6fb6c9 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index e476cd982a3..934d7bdb850 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/he_IL/zapier.lang b/htdocs/langs/he_IL/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/he_IL/zapier.lang
+++ b/htdocs/langs/he_IL/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/hi_IN/accountancy.lang b/htdocs/langs/hi_IN/accountancy.lang
index 46d584fa5d7..fd8d8a31ba6 100644
--- a/htdocs/langs/hi_IN/accountancy.lang
+++ b/htdocs/langs/hi_IN/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
index 5adf390f9fa..51e5e387403 100644
--- a/htdocs/langs/hi_IN/admin.lang
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=कनेक्शन लॉक हटाए
 YourSession=आपका सत्र
 Sessions=उपयोगकर्ताओं का सत्र
 WebUserGroup=वेब सर्वर उपयोगकर्ता / समूह
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=आपका PHP कॉन्फ़िगरेशन सक्रिय सत्रों की सूची की अनुमति नहीं देता है। सत्र संरक्षण के लिए उपयोग की गई डायरेक्टरी ( <b>%s</b>) शायद संरक्षित की गई है (उदाहरण के लिए OS अनुमतियाँ या PHP निर्देशक द्वारा open_basedir)।
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/hi_IN/banks.lang b/htdocs/langs/hi_IN/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/hi_IN/banks.lang
+++ b/htdocs/langs/hi_IN/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/hi_IN/bills.lang b/htdocs/langs/hi_IN/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/hi_IN/bills.lang
+++ b/htdocs/langs/hi_IN/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/hi_IN/boxes.lang b/htdocs/langs/hi_IN/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/hi_IN/boxes.lang
+++ b/htdocs/langs/hi_IN/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/hi_IN/categories.lang b/htdocs/langs/hi_IN/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/hi_IN/categories.lang
+++ b/htdocs/langs/hi_IN/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/hi_IN/companies.lang b/htdocs/langs/hi_IN/companies.lang
index 1481398db45..eb559cc5f9e 100644
--- a/htdocs/langs/hi_IN/companies.lang
+++ b/htdocs/langs/hi_IN/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/hi_IN/compta.lang b/htdocs/langs/hi_IN/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/hi_IN/compta.lang
+++ b/htdocs/langs/hi_IN/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/hi_IN/ecm.lang b/htdocs/langs/hi_IN/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/hi_IN/ecm.lang
+++ b/htdocs/langs/hi_IN/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/hi_IN/errors.lang b/htdocs/langs/hi_IN/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/hi_IN/errors.lang
+++ b/htdocs/langs/hi_IN/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/hi_IN/externalsite.lang b/htdocs/langs/hi_IN/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/hi_IN/externalsite.lang
+++ b/htdocs/langs/hi_IN/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/hi_IN/main.lang b/htdocs/langs/hi_IN/main.lang
index 7f67e16d9ea..295f37e2c16 100644
--- a/htdocs/langs/hi_IN/main.lang
+++ b/htdocs/langs/hi_IN/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/hi_IN/margins.lang b/htdocs/langs/hi_IN/margins.lang
index 76ea8ad5c4d..ad5406409b4 100644
--- a/htdocs/langs/hi_IN/margins.lang
+++ b/htdocs/langs/hi_IN/margins.lang
@@ -22,7 +22,7 @@ ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
diff --git a/htdocs/langs/hi_IN/members.lang b/htdocs/langs/hi_IN/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/hi_IN/members.lang
+++ b/htdocs/langs/hi_IN/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/hi_IN/modulebuilder.lang b/htdocs/langs/hi_IN/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/hi_IN/modulebuilder.lang
+++ b/htdocs/langs/hi_IN/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/hi_IN/orders.lang b/htdocs/langs/hi_IN/orders.lang
index ad91e1eef63..87d196eb22f 100644
--- a/htdocs/langs/hi_IN/orders.lang
+++ b/htdocs/langs/hi_IN/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
diff --git a/htdocs/langs/hi_IN/other.lang b/htdocs/langs/hi_IN/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/hi_IN/other.lang
+++ b/htdocs/langs/hi_IN/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/hi_IN/productbatch.lang b/htdocs/langs/hi_IN/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/hi_IN/productbatch.lang
+++ b/htdocs/langs/hi_IN/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/hi_IN/products.lang b/htdocs/langs/hi_IN/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/hi_IN/products.lang
+++ b/htdocs/langs/hi_IN/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/hi_IN/projects.lang b/htdocs/langs/hi_IN/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/hi_IN/projects.lang
+++ b/htdocs/langs/hi_IN/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/hi_IN/propal.lang b/htdocs/langs/hi_IN/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/hi_IN/propal.lang
+++ b/htdocs/langs/hi_IN/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/hi_IN/stocks.lang b/htdocs/langs/hi_IN/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/hi_IN/stocks.lang
+++ b/htdocs/langs/hi_IN/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/hi_IN/suppliers.lang b/htdocs/langs/hi_IN/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/hi_IN/suppliers.lang
+++ b/htdocs/langs/hi_IN/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/hi_IN/ticket.lang b/htdocs/langs/hi_IN/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/hi_IN/ticket.lang
+++ b/htdocs/langs/hi_IN/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/hi_IN/users.lang b/htdocs/langs/hi_IN/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/hi_IN/users.lang
+++ b/htdocs/langs/hi_IN/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/hi_IN/website.lang b/htdocs/langs/hi_IN/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/hi_IN/website.lang
+++ b/htdocs/langs/hi_IN/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/hi_IN/zapier.lang b/htdocs/langs/hi_IN/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/hi_IN/zapier.lang
+++ b/htdocs/langs/hi_IN/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index f5ba4bd62f1..7d4d1ccfde6 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Broj komada
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -226,7 +226,7 @@ ConfirmDeleteMvt=This will delete all operation lines of the accounting for the
 ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
-DescFinanceJournal=Financijski izvještaj uključujući sve tipove plačanja po bankovnom računom
+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 an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 7e0ec932d8e..9ca8d8e1a08 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -21,7 +21,7 @@ RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Nedostaju datoteke
 FilesUpdated=Nadograđene datoteke
 FilesModified=Preinačene datoteke
-FilesAdded=Added Files
+FilesAdded=Dodane datoteke
 FileCheckDolibarr=Check integrity of application files
 AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
@@ -37,6 +37,7 @@ UnlockNewSessions=Otključaj spajanje
 YourSession=Vaša sesija
 Sessions=Users Sessions
 WebUserGroup=Web Server korisnik/grupa
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Napomena: DA je efektivno samo ako je modul <b>%s</b> omogućen
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Postavke sigurnosti
+PHPSetup=PHP setup
 SecurityFilesDesc=Ovdje definirajte opcije vezane za sigurnost kod uploada datoteka.
 ErrorModuleRequirePHPVersion=Greška, ovaj modul zahtjeva PHP verziju %s ili višu
 ErrorModuleRequireDolibarrVersion=Greška, ovaj modul zahtjeva Dolibarr verzije %s ili više
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Trajno izbriši
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Izbriši sada
@@ -232,6 +234,7 @@ BoxesAvailable=Dostupni dodaci
 BoxesActivated=Aktivirani dodaci
 ActivateOn=Aktiviraj na
 ActiveOn=Aktivirano na
+ActivatableOn=Activatable on
 SourceFile=Izvorna datoteka
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostupno samo ako JavaScript nije onemogućena
 Required=Obavezno
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Svi preostali znakovi u predlošku će ostati nepromjenjeni.<br>Razmak nije dozvoljen.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Primjer na komitentu kreiranog 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Primjer na proizvodu kreiranog 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Biblioteka korištena za kreiranje PDF-a
@@ -541,6 +545,8 @@ Module40Name=Dobavljači
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Urednici
 Module49Desc=Upravljanje urednicima
 Module50Name=Proizvodi
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind mogućnosti konverzije
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=Djelatnici
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi tvrtka
 Module5000Desc=Dozvoljava upravljanje multi tvrtkama
-Module6000Name=Tijek rada
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Web lokacije
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Izradi/izmjeni interne/vanjske korisnike i dozvole
 Permission254=Izradi/izmjeni samo vanjske korisnike
 Permission255=Izmjeni lozinku ostalih korisnika
 Permission256=Obriši ili isključi ostale korisnike
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Čitaj CA
 Permission272=Čitaj račune
 Permission273=Izdaj račun
@@ -914,7 +923,7 @@ Permission1235=Send vendor invoices by email
 Permission1236=Export vendor invoices, attributes and payments
 Permission1237=Export purchase orders and their details
 Permission1251=Pokreni masovni uvoz vanjskih podataka u bazu (učitavanje podataka)
-Permission1321=Izvezi račune kupaca, atribute i plačanja
+Permission1321=Izvezi račune kupaca, atribute i plaćanja
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
 Permission1521=Read documents
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Pregled sigurnosnih događaja
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Revizija
 InfoDolibarr=O Dolibarr instalaciji
 InfoBrowser=O pregledniku
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 funkcije nisu dostupne u vašem PHP
 DownloadMoreSkins=Više skinova za skinuti
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Parcijalni prijevod
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Dodatni atributi
 ExtraFieldsLines=Dodatni atributi (stavke)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1347,7 +1357,7 @@ NotificationsDesc=Email notifications can be sent automatically for some Dolibar
 NotificationsDescUser=* per user, one user at a time.
 NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
 NotificationsDescGlobal=* or by setting global email addresses in this setup page.
-ModelModules=Document Templates
+ModelModules=Predlošci dokumenta
 DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vodeni žig na skici dokumenta
 JSOnPaimentBill=Activate feature to autofill payment lines on payment form
@@ -1373,7 +1383,7 @@ SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
 SuggestPaymentByChequeToAddress=Suggest payment by check to
 FreeLegalTextOnInvoices=Slobodan unos teksta na računu
 WatermarkOnDraftInvoices=Vodeni žig na skici računa (ništa ako se ostavi prazno)
-PaymentsNumberingModule=Način označavanja plačanja
+PaymentsNumberingModule=Način označavanja plaćanja
 SuppliersPayment=Vendor payments
 SupplierPaymentSetup=Vendor payments setup
 ##### Proposals #####
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Prijava (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Filter pretraživanja
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Prijava (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Puno ime
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Konto prodaje
 AccountancyCodeBuy=Konto nabave
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Podešavanje modula događaja i agende
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Ne izvoziti događaj stariji od
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1762,7 +1775,7 @@ CashDeskSetup=Point of Sales module setup
 CashDeskThirdPartyForSell=Default generic third party to use for sales
 CashDeskBankAccountForSell=Zadani račun za prijem gotovinskih uplata
 CashDeskBankAccountForCheque=Default account to use to receive payments by check
-CashDeskBankAccountForCB=Zadani račun za prijem plačanja kreditnim karticama
+CashDeskBankAccountForCB=Zadani račun za prijem plaćanja kreditnim karticama
 CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
 CashDeskIdWareHouse=Forsiraj i ograniči skladište za skidanje zaliha
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Boja pozadine za neparne redove u tablici
 BackgroundTableLineEvenColor=Boja pozadine za parne redove u tablici
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2072,8 +2088,10 @@ BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
 MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
+EmailTemplate=Email predložak
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2081,17 +2099,26 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
+TemplateAdded=Predložak dodan
+TemplateUpdated=Predložak ažuriran
+TemplateDeleted=Predložak obrisan
 MailToSendEventPush=Event reminder email
 SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 6e93525512f..71f59ee02c2 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 7e46e523ab2..96218a407d9 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -55,6 +55,7 @@ CustomerInvoice=Izlazni račun
 CustomersInvoices=Izlazni računi
 SupplierInvoice=Ulazni račun
 SuppliersInvoices=Ulazni računi
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Ulazni račun
 SupplierBills=Ulazni računi
 Payment=Plaćanja
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Izvršena plaćanja
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Način plaćanja
 PaymentMode=Način plaćanja
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debitna/kreditna kartica
 PaymentTypePP=PayPal
 IdPaymentMode=Način plaćanja (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Datum zadnjeg generiranja
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Automatska ovjera računa
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Iznos u postotku (%% od ukupno)
 VarAmountOneLine=Iznos u postotku (%% ukupno) - jedan redak s oznakom '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bankovni prijenos
 PaymentTypeShortVIR=Bankovni prijenos
@@ -457,7 +461,7 @@ NetToBePaid=Netto za platiti
 PhoneNumber=Tel
 FullPhoneNumber=Telefon
 TeleFax=Fax
-PrettyLittleSentence=Prihvati iznos dospjelih plačanja čekovima izdanih u moje ime kao Član računovodstvene udruge odobrenih od Porezne uprave
+PrettyLittleSentence=Prihvati iznos dospjelih plaćanja čekovima izdanih u moje ime kao Član računovodstvene udruge odobrenih od Porezne uprave
 IntracommunityVATNumber=Intra-Community VAT ID
 PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
 PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
@@ -494,12 +498,16 @@ Cash=Gotovina
 Reported=Odgođeno
 DisabledBecausePayments=Nije moguće obzirom da postoje neka plaćanja
 CantRemovePaymentWithOneInvoicePaid=Plaćanje se ne može izbrisati obzirom da postoji barem jedan račun koji je označen kao plaćen
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Očekivano plaćanje
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Plaćeno s ovom uplatom
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Plati
 ToMakePaymentBack=Povrat
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Kako biste izradili novi predložak račun
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=PDF račun prema Crevette predlošku. Kompletan predložak računa za etape
-TerreNumRefModelDesc1=Vraća broj u formatu %syymm-nnnn za standardne račune i %syymm-nnnn za odobrenja gdje je yy godina, mm je mjesec i nnnn je sljedni broj bez prekida i bez mogučnosti povratka na 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
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Račun koji počinje s $syymm već postoji i nije kompatibilan s ovim modelom označivanja. Maknite ili promjenite kako biste aktivirali ovaj modul.
-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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=Račun prve etape
 InvoiceFirstSituationDesc=<b>Račun etape</b> je vezan za etape vezane za napredovanje, npr. napredovanje gradnje. Svaka etapa je vezana za račun.
 InvoiceSituation=Račun etape
+PDFInvoiceSituation=Račun etape
 InvoiceSituationAsk=Račun slijedi etapu
 InvoiceSituationDesc=Kreiranje nove etapu koja prati postojeću
 SituationAmount=Iznos računa etape (net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Izbriši predložak računa
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 62c1870fd62..ae67f203a6a 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Zadnje akcije
 BoxLastContracts=Zadnji ugovori
 BoxLastContacts=Zadnji kontakti/adrese
 BoxLastMembers=Zadnji članovi
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Zadnje intervencije
 BoxCurrentAccounts=Stanje otvorenog računa
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Zadnjih %s novosti od %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Računovodstvo
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index 38b81102ca5..a4eb2e7ac20 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Sučelje kategorija kupaca
 MembersCategoriesArea=Sučelje kategorija članova
 ContactsCategoriesArea=Sučelje kategorija kontakta
-AccountsCategoriesArea=Sučelje tagova/kategorija računa
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Sučelje kategorija projekata
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Prikaži kategoriju
 ByDefaultInList=Po predefiniranom na listi
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index ab89dcbabc0..b78643dfe85 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -43,9 +43,10 @@ Individual=Privatna osoba
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Matična tvrtka
 Subsidiaries=Podružnice
-ReportByMonth=Izvještaji po mjesecu
-ReportByCustomers=Izvještaji po kupcu
-ReportByQuarter=Izvještaj po stopi
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Kod uljudnosti
 RegisteredOffice=Sjedište
 Lastname=Prezime
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registracijski broj
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Dokaz ID 3 (broj komercijalnog podatka)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Trenutno otvoreni računi
 OutstandingBill=Maksimalno za otvorene račune
 OutstandingBillReached=Dosegnut maksimum neplaćenih računa
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Ova šifra je besplatne. Ova šifra se može modificirati u bilo koje vrijeme.
 ManagingDirectors=Ime vlasnika(ce) ( CEO, direktor, predsjednik uprave...)
 MergeOriginThirdparty=Dupliciran komitent (komitent koji želite obrisati)
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 78940a5a086..673feed340f 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=PDV prikupljen
 StatusToPay=Za platiti
 SpecialExpensesArea=Sučelji svih specijalnih plaćanja
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Društveni ili fisklani porez
 SocialContributions=Društveni ili fiskanlni porezi
 SocialContributionsDeductibles=Odbitak društveni ili fiskalni porezi
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Uplata računa kupca
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Plaćanje društveni/fiskalni porez
 PaymentVat=PDV plaćanje
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Popis plaćanja
 ListOfCustomerPayments=Popis uplata kupaca
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF plaćanje
 LT2PaymentsES=IRPF plaćanja
 VATPayment=Plaćanje poreza prodaje
 VATPayments=Plaćanja poreza kod prodaje
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=Nema čekova koji čekaju depozit.
 DateChequeReceived=Datum zaprimanja čeka
 NbOfCheques=No. of checks
 PaySocialContribution=Plati društveni/fiskalni porez
-ConfirmPaySocialContribution=Jeste li sigurni da želite svrstati ovaj društveni/fiskalni porez kao plaćeno ?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Obriši plaćanje društvenog ili fiskalnog poreza
-ConfirmDeleteSocialContribution=Jeste li sigurni da želite obrisati ovu uplatu društveni/fiskalni poreza
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Društveni i fiskalni porezi i plaćanja
 CalcModeVATDebt=Način <b>%sPDV na računovodstvene usluge%s</b>
 CalcModeVATEngagement=Način <b>%sPDV na prihode-troškove%s</b>
@@ -163,6 +175,7 @@ RulesResultInOut=- Uključuje stvarne uplate po računima, troškove, PDV i pla
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Izvještaj prikupljenog i plaćenog PDV-a kupaca
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Izvještaj po RE stopi
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg podtip
 InvoiceLinesToDispatch=Stavke računa za otpremu
 ByProductsAndServices=By product and service
 RefExt=Vanjska ref.
-ToCreateAPredefinedInvoice=Za kreiranje predloška računa, izradite stadardni račun, onda, bez ovjeravanja, kliknite na gumb "%s"
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Poveži s narudžbom
 Mode1=Način 1
 Mode2=Način 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Kloniraj za sljedeći mjesec
 SimpleReport=Jednostavan izvještaj
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/hr_HR/dict.lang b/htdocs/langs/hr_HR/dict.lang
index 70addf50db2..2e3f562c742 100644
--- a/htdocs/langs/hr_HR/dict.lang
+++ b/htdocs/langs/hr_HR/dict.lang
@@ -21,7 +21,7 @@ CountryNL=Nizozemska
 CountryHU=Mađarska
 CountryRU=Rusija
 CountrySE=Švedska
-CountryCI=Obala Bjelokosti
+CountryCI=Obala Slonovače
 CountrySN=Senegal
 CountryAR=Argentina
 CountryCM=Kamerun
@@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald
 CountryVA=Holy See (Vatican City State)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Iceland
+CountryIS=Island
 CountryIN=Indija
 CountryID=Indonezija
 CountryIR=Iran
@@ -131,7 +131,7 @@ CountryKI=Kiribati
 CountryKP=Sjeverna Korea
 CountryKR=Južna Korea
 CountryKW=Kuvajt
-CountryKG=Kyrgyzstan
+CountryKG=Kirgistan
 CountryLA=Lao
 CountryLV=Latvija
 CountryLB=Libanon
@@ -160,7 +160,7 @@ CountryMD=Moldavija
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambik
-CountryMM=Myanmar (Burma)
+CountryMM=Mijanmar (Burma)
 CountryNA=Nambija
 CountryNR=Nauru
 CountryNP=Nepal
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinidad i Tobago
 CountryTR=Turska
 CountryTM=Turkmenistan
-CountryTC=Turks and Caicos Islands
+CountryTC=Otočje Turks i Caicos
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrajina
@@ -277,7 +277,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=Mauritius rupees
 CurrencySingMUR=Mauritius rupee
 CurrencyNOK=Norveških Kruna
-CurrencySingNOK=Norwegian kronas
+CurrencySingNOK=Norveške krune
 CurrencyTND=Tuniških Dinara
 CurrencySingTND=Tuniški Dinar
 CurrencyUSD=SAD Dolara
@@ -290,7 +290,7 @@ CurrencyXOF=CFA Francs BCEAO
 CurrencySingXOF=CFA Franc BCEAO
 CurrencyXPF=CFP Francs
 CurrencySingXPF=CFP Franc
-CurrencyCentEUR=cents
+CurrencyCentEUR=centi
 CurrencyCentSingEUR=Cent
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
@@ -307,7 +307,7 @@ DemandReasonTypeSRC_WOM=Usmeno
 DemandReasonTypeSRC_PARTNER=Suradnik
 DemandReasonTypeSRC_EMPLOYEE=Zaposlenik
 DemandReasonTypeSRC_SPONSORING=Sponzorstvo
-DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+DemandReasonTypeSRC_SRC_CUSTOMER=dolazni kontakti kupca
 #### Paper formats ####
 PaperFormatEU4A0=4A0 format
 PaperFormatEU2A0=2A0 format
@@ -330,24 +330,24 @@ PaperFormatCAP5=Format P5 Canada
 PaperFormatCAP6=Format P6 Canada
 #### Expense report categories ####
 ExpAutoCat=Auto
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
-ExpAuto3CV=3 CV
-ExpAuto4CV=4 CV
-ExpAuto5CV=5 CV
-ExpAuto6CV=6 CV
-ExpAuto7CV=7 CV
-ExpAuto8CV=8 CV
-ExpAuto9CV=9 CV
-ExpAuto10CV=10 CV
-ExpAuto11CV=11 CV
-ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
-ExpAuto4PCV=4 CV and more
-ExpAuto5PCV=5 CV and more
-ExpAuto6PCV=6 CV and more
-ExpAuto7PCV=7 CV and more
-ExpAuto8PCV=8 CV and more
+ExpCycloCat=moped
+ExpMotoCat=motocikl
+ExpAuto3CV=3 CV - životopis
+ExpAuto4CV=4 CV - životopis
+ExpAuto5CV=5 CV - životopis
+ExpAuto6CV=6 CV - životopis
+ExpAuto7CV=7 CV - životopis
+ExpAuto8CV=8 CV - životopis
+ExpAuto9CV=9 CV - životopis
+ExpAuto10CV=10 CV - životopis
+ExpAuto11CV=11 CV - životopis
+ExpAuto12CV=12 CV - životopis
+ExpAuto3PCV=3 CV - životopisa i više
+ExpAuto4PCV=4 CV - životopisa i više
+ExpAuto5PCV=5 CV - životopisa i više
+ExpAuto6PCV=6 CV - životopisa i više
+ExpAuto7PCV=7 CV - životopisa i više
+ExpAuto8PCV=8 CV - životopisa i više
 ExpAuto9PCV=9 CV and more
 ExpAuto10PCV=10 CV and more
 ExpAuto11PCV=11 CV and more
diff --git a/htdocs/langs/hr_HR/donations.lang b/htdocs/langs/hr_HR/donations.lang
index d7c4d18809a..cdbc20b9611 100644
--- a/htdocs/langs/hr_HR/donations.lang
+++ b/htdocs/langs/hr_HR/donations.lang
@@ -17,7 +17,7 @@ DonationStatusPromiseValidatedShort=Ovjereno
 DonationStatusPaidShort=Primljeno
 DonationTitle=Račun za donaciju
 DonationDate=Donation date
-DonationDatePayment=Datum plačanja
+DonationDatePayment=Datum plaćanja
 ValidPromess=Ovjeri obečanje
 DonationReceipt=Račun za donaciju
 DonationsModels=Modeli dokumenata za račune donacija
@@ -32,3 +32,4 @@ DONATION_ART238=Prikaži članak 238 iz CGI ako ste zabrinuti
 DONATION_ART885=Prikaži članak 885 iz CGI ako ste zabrinuti
 DonationPayment=Isplata donacije
 DonationValidated=Donation %s validated
+DonationUseThirdparties=Use an existing thirdparty as coordinates of donators
diff --git a/htdocs/langs/hr_HR/ecm.lang b/htdocs/langs/hr_HR/ecm.lang
index 7aec59051ed..b7f918045e2 100644
--- a/htdocs/langs/hr_HR/ecm.lang
+++ b/htdocs/langs/hr_HR/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index cf19fd01b31..7a646f39d3f 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/hr_HR/externalsite.lang b/htdocs/langs/hr_HR/externalsite.lang
index e938e493903..1c3fb21742a 100644
--- a/htdocs/langs/hr_HR/externalsite.lang
+++ b/htdocs/langs/hr_HR/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Postavljanje linkova na vanjske web stranice
-ExternalSiteURL=URL vanjske stranice
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modul ExternalSite nije ispravno podešen.
 ExampleMyMenuEntry=Moj izbornik unos
diff --git a/htdocs/langs/hr_HR/interventions.lang b/htdocs/langs/hr_HR/interventions.lang
index 44d89525dfd..a101f2af983 100644
--- a/htdocs/langs/hr_HR/interventions.lang
+++ b/htdocs/langs/hr_HR/interventions.lang
@@ -33,17 +33,15 @@ SendInterventionByMail=Send intervention by email
 InterventionCreatedInDolibarr=Intervencija %s kreirana
 InterventionValidatedInDolibarr=Intervencija %s ovjerena
 InterventionModifiedInDolibarr=Intervencija %s promjenjena
-InterventionClassifiedBilledInDolibarr=Intervencija %s je postavljena "Naplačena"
-InterventionClassifiedUnbilledInDolibarr=Intervencija %s je postavljena "Nenaplačena"
+InterventionClassifiedBilledInDolibarr=Intervencija %s je postavljena "Naplaćena"
+InterventionClassifiedUnbilledInDolibarr=Intervencija %s je postavljena "Nenaplaćena"
 InterventionSentByEMail=Intervention %s sent by email
 InterventionDeletedInDolibarr=Intervencija %s obrisana
 InterventionsArea=Sučelje intervencija
 DraftFichinter=Skica intervencija
 LastModifiedInterventions=Zadnje %s izmijenjene intervencije
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Sljedeći kontakt kupca
-# Modele numérotation
 PrintProductsOnFichinter=Ispiši također stavke tipa "proizvod" (ne samo usluge) na kartici intervencija
 PrintProductsOnFichinterDetails=intervencije generirane iz narudžbi
 UseServicesDurationOnFichinter=Koristi trajanje usluge za intervencije generirane iz narudžbi
@@ -53,7 +51,6 @@ InterventionStatistics=Statistika intervencija
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=ID Intervencije
 InterRef=Ref. Intervencije
 InterDateCreation=Datum kreiranja
@@ -65,3 +62,7 @@ InterLineId=Stavka ID
 InterLineDate=Stavka datuma
 InterLineDuration=Stavka trajanja
 InterLineDesc=Stavka opisa
+RepeatableIntervention=Template of intervention
+ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Ponovo otvori
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/hr_HR/loan.lang b/htdocs/langs/hr_HR/loan.lang
index b09829a0974..206a2004e1e 100644
--- a/htdocs/langs/hr_HR/loan.lang
+++ b/htdocs/langs/hr_HR/loan.lang
@@ -16,8 +16,8 @@ LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
 ConfirmDeleteLoan=Potvrdite brisanje kredita
 LoanDeleted=Kredit je uspješno obrisan
-ConfirmPayLoan=Potvrdite označivanje isplačen kredit
-LoanPaid=Kredit isplačen
+ConfirmPayLoan=Potvrdite označivanje isplaćen kredit
+LoanPaid=Kredit isplaćen
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
 FinancialCommitment=Financial commitment
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index ad0c07d9405..da1d8d59dd1 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Datum izmjene
 IPModification=Modification IP
 DateLastModification=Datum zadnje izmjene
 DateValidation=Datum ovjere
+DateSigning=Signing date
 DateClosing=Datum zatvaranja
 DateDue=Datum dospijeća
 DateValue=Datum vrijednosti
@@ -360,8 +361,8 @@ UnitPriceHT=Jedinična cijena (bez poreza)
 UnitPriceHTCurrency=Jedinična cijena (bez poreza) (u valuti)
 UnitPriceTTC=Jedinična cijena
 PriceU=Jed. cij.
-PriceUHT=J.C. netto
-PriceUHTCurrency=J.C. (valuta)
+PriceUHT=Jedinična cijena
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=J.C. (s porezom)
 Amount=Iznos
 AmountInvoice=Iznos računa
@@ -389,6 +390,8 @@ AmountTotal=Ukupan iznos
 AmountAverage=Prosječan iznos
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Postotak
 Total=Ukupno
 SubTotal=Sveukupno
@@ -396,7 +399,7 @@ TotalHTShort=Ukupno (bez poreza)
 TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Ukupno s PDV-om
-TotalHT=Ukupno netto
+TotalHT=Ukupno bez PDV-a
 TotalHTforthispage=Ukupno (bez PDV-a) na ovoj stranici
 Totalforthispage=Ukupno na ovoj stranici
 TotalTTC=Ukupno s PDV-om
@@ -724,7 +727,7 @@ MenuMembers=Članovi
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Granična vrijednost Dolibarra (Mapa početna->postavke->sigurnost): %s Kb, PHP granična vrijednost: %s Kb
-NoFileFound=U ovoj mapi nema spremljenih datoteka
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Trenutni jezik
 CurrentTheme=Trenutna tema
 CurrentMenuManager=Trenutni upravitelj izbornikom
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Ukloni redak '%s'
 SomeTranslationAreUncomplete=Neki od ponuđenih jezika možda su djelomično prevedeni ili sadrže greške. Molim vas pomozite ispraviti vaš jezik prijavom na <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>. Ne budite pizde!
-DirectDownloadLink=Poveznica za izravno preuzimanje (dostupno javno)
-DirectDownloadInternalLink=Poveznica za izravno preuzimanje (potrebna prijava i dopuštenje)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Preuzimanje
 DownloadDocument=Preuzimanje dokumenta
 ActualizeCurrency=Upiši novi tečaj
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontakti
 SearchIntoMembers=Članovi
 SearchIntoUsers=Korisnici
 SearchIntoProductsOrServices=Proizvodi ili usluge
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projekti
 SearchIntoMO=Proizvodni nalozi
 SearchIntoTasks=Zadaci
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Kratica tipkovnice
 AssignedTo=Dodijeljeno korisniku
 Deletedraft=Obriši skicu
 ConfirmMassDraftDeletion=Potvrda masovnog brisanja skica
-FileSharedViaALink=Datoteka podijeljena putem poveznice
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Prvo izaberite treću osobu...
 YouAreCurrentlyInSandboxMode=Trenutno ste %s u "sandbox" načinu rada
 Inventory=Zalihe
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Molim prvo učitajte dokument
 SeePrivateNote=Vidi privatne bilješke
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/hr_HR/margins.lang b/htdocs/langs/hr_HR/margins.lang
index 0ee046592c7..3a284d29ae7 100644
--- a/htdocs/langs/hr_HR/margins.lang
+++ b/htdocs/langs/hr_HR/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Detalji marže
 ProductMargins=Marže proizvoda
 CustomerMargins=Marže kupaca
 SalesRepresentativeMargins=Marže prodajnog predstavnika
+ContactOfInvoice=Contact of invoice
 UserMargins=Korisničke marže
 ProductService=Proizvod ili usluga
 AllProducts=Svi proizvodi i usluge
 ChooseProduct/Service=Odaberite proizvod ili uslugu
 ForceBuyingPriceIfNull=Forsiraj kupovno/troškovnu cijenu kao prodajnu cijenu ako nije definirano
-ForceBuyingPriceIfNullDetails=Ako kupovna/troškovna cijena nije definirana, i ova opcija je uključena, marža će biti nula na stavki ( kupovno/troškovna cijena = prodajna cijena), u protivnom (isključeno), marža će biti jednaka sugeriranoj vrijednosti.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Načini marže za globalne rabate
 UseDiscountAsProduct=Kao proizvod
 UseDiscountAsService=Kao usluga
@@ -36,7 +37,7 @@ CostPrice=Cijena troška
 UnitCharges=Troškovi jedinice
 Charges=Troškovi
 AgentContactType=Vrsta kontakta komercijalnog agenta
-AgentContactTypeDetails=Odredite koji tip kontakta (povezan na računu) će biti korišten za izvještaj marže po prodajnom predstavniku
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Stopa mora biti brojčana vrijednost
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Prikaži infomacije o marži
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 93393c63c22..38526538e24 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Popis članova u skicama ( za ovjeru )
 MembersListValid=Popis valjanih članova
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=Popis kvalificiranih članova
 MenuMembersToValidate=Skice članova
 MenuMembersValidated=Ovjereni članovi
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Članovi koji primaju pretplatu
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,15 +49,18 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Isteklo
 MemberStatusPaid=Pretplata valjana
 MemberStatusPaidShort=Valjano
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Skice članova
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Ovjereno
 SubscriptionNotNeeded=No subscription needed
 NewCotisation=Novi doprinos
-PaymentSubscription=Novo plačanje doprinosa
+PaymentSubscription=Novo plaćanje doprinosa
 SubscriptionEndDate=Datum kraja pretplate
 MembersTypeSetup=Podešavanje tipa članova
 MemberTypeModified=Member type modified
@@ -82,6 +87,8 @@ Physical=Fizički
 Moral=Moralno
 MorAndPhy=Moral and Physical
 Reenable=Ponovo omogući
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Obriši člana
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format stranice naljepnica
 DescADHERENT_ETIQUETTE_TEXT=Tekst za ispis na adresnim listovima člana
@@ -153,7 +161,7 @@ MoreActions=Dodatna akcija za snimanje
 MoreActionsOnSubscription=Dodatne akcije, predloži kao zadano kod pohrane pretplate
 MoreActionBankDirect=Create a direct entry on bank account
 MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
-MoreActionInvoiceOnly=Izradi račun bez plačanja
+MoreActionInvoiceOnly=Izradi račun bez plaćanja
 LinkToGeneratedPages=Genereiraj vizit kartu
 LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
 DocForAllMembersCards=Generiraj vizit karte za sve članove
@@ -162,6 +170,7 @@ DocForLabels=Generiraj listu adresa
 SubscriptionPayment=Plaćanje pretplate
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Statistika članova po zemlji
 MembersStatisticsByState=Statistika članova po regiji/provinciji
 MembersStatisticsByTown=Statistika članova po gradu
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index aaf54f0eb6c..348ac6e7afc 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Napravi narudžbu
 MakeOrder=Napravi narudžbu
 SupplierOrder=Narudžba dobavljaču
 SuppliersOrders=Narudžbe dobavljačima
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Otvorene narudžbe dobavljačima
 CustomerOrder=Narudžbenica
 CustomersOrders=Narudžbe kupaca
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index e96a3a7a4a4..9f094795773 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Izradio %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=ID korisnika koji je mjenjao
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang
index c037eb13c00..6a93cae8f4f 100644
--- a/htdocs/langs/hr_HR/productbatch.lang
+++ b/htdocs/langs/hr_HR/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Koristi lot/serijski broj
-ProductStatusOnBatch=DA (lot/serijski broj potreban)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=NE (lot/serijski broj ne koristi)
-ProductStatusOnBatchShort=DA
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=NE
 Batch=Lot/serijski broj
 atleast1batchfield=Upotrebljivo datum ili datum isteka ili lot/serijski broj
@@ -16,9 +18,18 @@ printEatby=Upotrebljivo: %s
 printSellby=Istek: %s
 printQty=Količina: %d
 AddDispatchBatchLine=Dodaj stavku za otpremu na police
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=Kad je modul Lot / Serial uključen, automatsko smanjenje zaliha vrši se preko 'Smanjivanje stvarnih zaliha prilikom potvrde otpreme', a automatski način povećanja vrši se preko 'Povećanje stvarnih zaliha pri ručnoj otpremi u skladišta' i ne može se uređivati. Ostale mogućnosti možete definirati kako želite.
 ProductDoesNotUseBatchSerial=Ovaj proizvod ne koristi lot/serijski broj
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
+ProductLotSetup=Podešavanje modula serije
+ShowCurrentStockOfLot=Prikaži trenutne zalihe za par proizvod/serija
+ShowLogOfMovementIfLot=Prikaži dnevnik kretanja za par proizvod/serija
+StockDetailPerBatch=Detalji zaliha po serijama
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 62d40d82a31..13595eda6c3 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Upisani proizvodi i usluge na prodaju
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Ispravno promjenjeno
 PropalMergePdfProductActualFile=Datoteke za dodati u PDF Azur su/je
 PropalMergePdfProductChooseFile=Odaberite PDF datoteke
-IncludingProductWithTag=Ukljući proizvode/usluge iz kategorije
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Predefinirana cijena, stvarna cijena može ovisiti o kupcu
 WarningSelectOneDocument=Molimo odaberite barem jedan dokument
 DefaultUnitToShow=Jedinica
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index ff826d9e7a5..04e1fbc2c24 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Popis zadataka
 GoToListOfTimeConsumed=Idi na popis utrošenog vremena
 GanttView=Gantogram
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Popis komercijalnih prijedloga vezanih za projekt
 ListOrdersAssociatedProject=Popis narudžbenica vezanih za projekt
 ListInvoicesAssociatedProject=Popis računa kupaca koji se odnose na projekt
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/hr_HR/propal.lang b/htdocs/langs/hr_HR/propal.lang
index 88e72c46a1b..a592fdd040e 100644
--- a/htdocs/langs/hr_HR/propal.lang
+++ b/htdocs/langs/hr_HR/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Pošalji ponudu e-poštom
 DatePropal=Datum ponude
 DateEndPropal=Vrijedi do
 ValidityDuration=Vrijedi do
-CloseAs=Postavi status na
 SetAcceptedRefused=Postavi prihvaćeno/odbijeno
 ErrorPropalNotFound=Ponuda %s nije pronađena
 AddToDraftProposals=Dodati skici ponude
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Ponude i stavke
 ProposalLine=Stavka ponude
+ProposalLines=Proposal lines
 AvailabilityPeriod=Rok isporuke
 SetAvailability=Odredi rok isporuke
 AfterOrder=poslije narudžbe
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Potvrda narudžbe; pečat tvrtke, datum i potpis
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 66ac338fa3a..2cf9bf1d206 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -19,8 +19,8 @@ Stock=Zaliha
 Stocks=Zalihe
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Zaliha po lot/serijskom
 LotSerial=Lot/serijski
 LotSerialList=Popis lot/serijskih brojeva
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
-LocationSummary=Kratki naziv lokacije
-NumberOfDifferentProducts=Broj različitih proizvoda
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Ukupan broj proizvoda
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Vrijednost skladišta
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Umjetna zaliha
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=ID skladišta
 DescWareHouse=Opis skladišta
 LieuWareHouse=Lokalizacija skladišta
 WarehousesAndProducts=Skladišta i proizvodi
 WarehousesAndProductsBatchDetail=Skladišta i proizvodi (s detaljima po lot/serijskom)
 AverageUnitPricePMPShort=Procjenjena prosječna cijena
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Jed. prodajna cijena 
 EstimatedStockValueSellShort=Vrijednost za prodaju
 EstimatedStockValueSell=Vrijednost za prodaju
@@ -145,7 +147,7 @@ Replenishments=Popunjavanje
 NbOfProductBeforePeriod=Količina proizvoda %s na zalihi prije odabranog perioda (< %s)
 NbOfProductAfterPeriod=Količina proizvoda %s na zalihi nakon odabranog perioda (> %s)
 MassMovement=Masovno kretanje
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Primke za narudžbu
 StockMovementRecorded=Kretanja zaliha zabilježeno
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Oznaka kretanja
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Kretanje ili inventarni kod
 IsInPackage=Sadržane u grupiranim proizvodima
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Zalihe
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Ponovo otvori
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index 7c3d64f8d0b..e0ad809810f 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Dobavljači
 SuppliersInvoice=Ulazni račun
+SupplierInvoices=Ulazni računi
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=Povijest
diff --git a/htdocs/langs/hr_HR/ticket.lang b/htdocs/langs/hr_HR/ticket.lang
index 7a4ddd8295d..720848a5c1d 100644
--- a/htdocs/langs/hr_HR/ticket.lang
+++ b/htdocs/langs/hr_HR/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Vrsta
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index d1f3b04be64..e0e20643d90 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Ukloni iz grupe
 PasswordChangedAndSentTo=Lozinka je promjenjena i poslana <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Zahtjev za promjenom lozinke za <b>%s</b> je poslana <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Korisnici & Grupe
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Korisnik na domeni %s
 Reactivate=Reaktiviraj
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Dozvola odobrena jer je nasljeđeno od jedne od korisničkih grupa.
 Inherited=Nasljeđeno
+UserWillBe=Created user will be
 UserWillBeInternalUser=Kreirani korisnik će biti interni korisnik (jer nije vezan za određenog komitenta)
 UserWillBeExternalUser=Kreirani korisnik će biti vanjski korisnik (jer je vezan za određenog komitenta)
 IdPhoneCaller=Pozivatelj ID
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=Odjava korisnika
 UserLogged=Korisnik prijavljen
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 893a4042577..02ecf7128ff 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/hr_HR/zapier.lang b/htdocs/langs/hr_HR/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/hr_HR/zapier.lang
+++ b/htdocs/langs/hr_HR/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 342be1b6de1..16c6008d9e7 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 76ed7753d26..92e6e5d9fb9 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Új kapcsolatok engedélyezése
 YourSession=Az Ön munkamenete
 Sessions=Felhasználói munkamenetek
 WebUserGroup=Webszerver felhasználója / csoportja
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Úgy tűnik, hogy a PHP-konfigurációja nem engedélyezi az aktív munkamenetek felsorolását. A munkamenetek mentéséhez használt könyvtár (<b>%s</b>) védett lehet (például operációs rendszer jogosultság vagy open_basedir PHP irányelv).
@@ -62,6 +63,7 @@ IfModuleEnabled=Megjegyzés: az 'igen' csak akkor eredményes, ha a <b>%s</b> mo
 RemoveLock=Távolítsa el / nevezze át a(z) <b>%s</b> fájlt, ha létezik, hogy engedélyezze a Frissítés / Telepítés eszközt.
 RestoreLock=Állítsa vissza az <b>%s</b> fájlt, csak olvasási jogokat engedélyezzen, hogy le lehessen tiltani a Frissítés / Telepítés eszköz további használatát.
 SecuritySetup=Biztonsági beállítások
+PHPSetup=PHP setup
 SecurityFilesDesc=Határozza meg a fájlok feltöltésének biztonságával kapcsolatos lehetőségeket.
 ErrorModuleRequirePHPVersion=Hiba történt, ez a modul a Dolibarr %s, vagy újabb verzióját igényli
 ErrorModuleRequireDolibarrVersion=Hiba történt, ez a modul a Dolibarr %s, vagy újabb verzióját igényli
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Ez a terület adminisztrációs lehetőségeket biztosít. A
 Purge=Tisztítsd
 PurgeAreaDesc=Ezen az oldalon törölheti a Dolibarr által létrehozott vagy tárolt összes fájlt (ideiglenes fájlok vagy az <b>%s</b> könyvtárban lévő fájlok). Ennek a szolgáltatásnak a használata általában nem szükséges. Megkerülő megoldásként szolgál azoknak a felhasználóknak, akiknek a Dolibarr-ját olyan szolgáltató üzemelteti, amely nem engedélyezi a webszerver által generált fájlok törlését.
 PurgeDeleteLogFile=Naplófájlok törlése, beleértve a(z) <b>%s</b> fájlt, amely a Syslog modulhoz lett megadva (nincs adatvesztés kockázata)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Az összes fájlt törölése ebben a könyvtárban: <b> %s </b>. <br> Ezzel törölheti az elemekhez kapcsolódó összes generált dokumentumot (harmadik felek, számlák stb.), az ECM modulba feltöltött fájlokat, az adatbázis biztonsági mentési ürlapjait és az ideiglenes fájlokat.
 PurgeRunNow=Ürítsd ki most
@@ -232,6 +234,7 @@ BoxesAvailable=Elérhető widgetek
 BoxesActivated=Aktivált widgetek
 ActivateOn=Aktiválás
 ActiveOn=Aktiválódik
+ActivatableOn=Activatable on
 SourceFile=Forrás fájl
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Csak ha a JavaScript nincs letiltva
 Required=Kötelező
@@ -347,9 +350,10 @@ LastActivationAuthor=A legutóbbi aktiválás végrehajtója
 LastActivationIP=A legutóbbi aktiválás IP címe
 UpdateServerOffline=A szerver offline frissítése
 WithCounter=Számláló kezelése
-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> az ügyfélkód n karakteren <br> <b>{cccc000}</b> az n karakteren lévő ügyfélkódot egy ügyfélnek szánt számláló követi. Ez az ügyfélnek szánt számláló egyidejűleg nullázódik a globális számlálóval. <br> <b>{tttt}</b> A partner típusának kódja n karakteren (lásd: Kezdőlap - Beállítás - Szótár - Partnerek típusai). Ha hozzáadja ezt a címkét, a számlálók különböznek minden partner típusától. <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Az összes többi karakter a maszkban marad érintetlen. <br> A szóközök nem megengedettek. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u> Példa a ValamilyenVállalat partner 99. %s,  2007-01-31 dátummal: </u> <br>
 GenericMaskCodes4b=<u>Példa: a harmadik fél létre 2007/03/01:</u> <br>
 GenericMaskCodes4c=<u>Példa egy 2007-03-01-én létrehozott termékre: </u> <br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Ha ezt a mezőt üresen hagyja, akkor ez az érték
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Az értékek listájának soroknak kell lennie formátumkulccsal, értékkel (ahol a kulcs nem lehet „0”) <br> <br> például: <br>1,érték1<br>2,érték2<br>3, érték3<br> ...
 ExtrafieldParamHelpradio=Az értékek listájának soroknak kell lennie formátumkulccsal, értékkel (ahol a kulcs nem lehet „0”) <br> <br> például: <br>1,érték1<br>2,érték2<br>3, érték3<br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=A paramétereknek ObjectName:Classpath típusúnak kell lennie <br> Szintaxis: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=A PDF létrehozásához használt programkönyvtár
@@ -541,6 +545,8 @@ Module40Name=Eladók
 Module40Desc=Szállítók és beszerzésmenedzsment (beszerzési megrendelések és szállítói számlák kiszámlázása)
 Module42Name=Hibanaplók
 Module42Desc=Naplózási lehetőségek (fájl, syslog, ...). Az ilyen naplók műszaki / hibakeresési célokra szolgálnak.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Szerkesztők
 Module49Desc=Szerkesztő vezetése
 Module50Name=Termékek
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind konverziók képességek
 Module3200Name=Megváltoztathatatlan archívumok
 Module3200Desc=Az üzleti események megváltoztathatatlan naplójának engedélyezése. Az eseményeket valós időben archiválódnak. A napló csak olvasható táblázat, amely exportálható láncolt eseményekből áll. Ez a modul egyes országokban kötelező lehet.
+Module3400Name=Közösségi hálózatok
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Humánerőforrás menedzsment (osztály vezetése, munkavállalói szerződések és elégedettség)
 Module5000Name=Több-cég
 Module5000Desc=Több vállalat kezelését teszi lehetővé
-Module6000Name=Munkafolyamat
-Module6000Desc=Munkafolyamat-menedzsment (objektum automatikus létrehozása és/vagy automatikus állapotváltozás)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Weboldalak
 Module10000Desc=Készítsen (nyilvános) webhelyeket egy WYSIWYG szerkesztővel. Ez egy webmester vagy fejlesztőorientált CMS (jobb, ha ismerjük a HTML és a CSS nyelvet). Csak állítsa be a webszervert (Apache, Nginx, ...), hogy mutasson a dedikált Dolibarr könyvtárra, hogy online legyen az interneten saját domain nevével.
 Module20000Name=Kérelmek kezelésének engedélyezése
@@ -805,7 +813,8 @@ PermissionAdvanced253=Létrehozza / módosítja belső / külső felhasználók
 Permission254=Létrehozása / módosítása csak a külső felhasználók számára
 Permission255=Módosíthat más felhasználó jelszavát
 Permission256=Törlése vagy tiltsa le más felhasználók
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Olvassa CA
 Permission272=Olvassa számlák
 Permission273=Számlák kibocsátása
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Az "Egyéb beállítás" menü az opcionális paramétereket tartalmazza.
-LogEvents=Biztonsági audit események
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Könyvvizsgálat
 InfoDolibarr=A Dolibarr jellemzői
 InfoBrowser=A böngésző jellemzői
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Úgy tűnik, hogy szükséges a frissítési f
 YouMustRunCommandFromCommandLineAfterLoginToUser=Kell futtatni ezt a parancsot a parancssorból bejelentkezés után a shell felhasználói <b>%s</b> vagy hozzá kell-W opció végén parancsot, hogy <b>%s</b> jelszót.
 YourPHPDoesNotHaveSSLSupport=SSL funkció nem áll rendelkezésre a PHP
 DownloadMoreSkins=További bőrök letöltése
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Részleges fordítás
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy szerver: Név / Cím
 MAIN_PROXY_PORT=Proxy szerver: Port
 MAIN_PROXY_USER=Proxy szerver: Bejelentkezés / Felhasználó
 MAIN_PROXY_PASS=Proxy szerver: Jelszó
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Kiegészítő tulajdonságok
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Bejelentkezés (unix)
 LDAPFieldLoginExample=Példa: uid
 LDAPFilterConnection=Keresés szűrő
 LDAPFilterConnectionExample=Példa: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Bejelentkezés (samba, ActiveDirectoryba)
 LDAPFieldLoginSambaExample=Példa: samaccountname
 LDAPFieldFullname=Keresztnév
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Eladás számviteli kódja
 AccountancyCodeBuy=Vétel számviteli kódja
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Rendezvények és napirend modul beállítási
 PasswordTogetVCalExport=Főbb kiviteli engedélyezésének linket
+SecurityKey = Security Key
 PastDelayVCalExport=Ne export esetén, mint a régebbi
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index ccc93640d6a..70e8abcf1be 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index e4837b5f8ae..fb9b77eecf9 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -52,11 +52,12 @@ Invoices=Számlák
 InvoiceLine=Számla tételsor
 InvoiceCustomer=Vásárlói számla
 CustomerInvoice=Vásárlói számla
-CustomersInvoices=Vásárlók számlái
+CustomersInvoices=Ügyfél számlák
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Szállítói számlák
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=beszállítók számlái
+SupplierBills=Szállítói számlák
 Payment=Fizetés
 PaymentBack=Visszatérítés
 CustomerInvoicePaymentBack=Visszatérítés
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Fizetve
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Fizetési szabály
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Változó összeg (%% össz.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Banki átutalás
 PaymentTypeShortVIR=Banki átutalás
@@ -494,12 +498,16 @@ Cash=Készpénz
 Reported=Késik
 DisabledBecausePayments=Nem lehetséges, mert van némi kifizetés
 CantRemovePaymentWithOneInvoicePaid=Nem lehet eltávolítani a fizetést, hiszen legalább egy számla kifizettetként osztályozott
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Várható fizetés
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Ezzel a fizetéssel fizetve
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Kifizetés
 ToMakePaymentBack=Visszafizetés
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A $syymm kezdődéssel már létezik számla, és nem kompatibilis ezzel a sorozat modellel. Töröld le vagy nevezd át, hogy aktiválja ezt a modult.
-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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index ead5517a357..5c57fdeffb2 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Nyitott számla egyenleg
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index f16ea1f8280..33c8f09ef3a 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 7848c56a7d1..dcb4a078cde 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -43,9 +43,10 @@ Individual=Magánszemély
 ToCreateContactWithSameName=Automatikusan létrehoz egy névjegyet / címet ugyanazzal az információval, mint a partner a partner alatt. A legtöbb esetben, még ha a partner is fizikai személy, elegendő egy partner létrehozása.
 ParentCompany=Anyavállalat
 Subsidiaries=Leányvállalatok
-ReportByMonth=Jelentés hónap szerint
-ReportByCustomers=Jelentése ügyfél szerint
-ReportByQuarter=Jelentés %-onként
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Udvariassági kód
 RegisteredOffice=Bejegyzett iroda
 Lastname=Vezetéknév
@@ -172,14 +173,20 @@ ProfId1ES=Szakma ID 1 (CIF / NIF)
 ProfId2ES=Szakma ID 2 (Társadalombiztosítási szám)
 ProfId3ES=Szakma Id 3 (CNAE)
 ProfId4ES=Szakma Id 4 (Collegiate szám)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Szakma ID 1 (SIREN)
 ProfId2FR=Szakma ID 2 (SIRET)
 ProfId3FR=Szakma Id 3 (NAF, régi APE)
 ProfId4FR=Szakma Id 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Regisztrációs szám
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Technikai azonosító 1 (Luxemburg)
 ProfId2LU=Technikai azonosító 2 (Üzlet engedélye)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Szakma ID 1 (NIPC)
 ProfId2PT=Szakma ID 2 (Társadalombiztosítási szám)
 ProfId3PT=Szakma Id 3 (Kereskedelmi azonosító szám)
 ProfId4PT=Szakma Id 4 (Konzervatórium)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Szakma id 1 (CUI)
 ProfId2RO=Szakma ID 2 (regisztrációs szám)
 ProfId3RO=Szakma ID 3 (CAEN)
 ProfId4RO=Szakma ID 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Szakma ID 1 (OGRN)
 ProfId2RU=Szakma ID 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Jelenlegi kintlévőség
 OutstandingBill=Maximális kintlévőség
 OutstandingBillReached=Max. a kintlévőség elért
 OrderMinAmount=Minimális rendelési összeg
-MonkeyNumRefModelDesc=Visszaad egy számot %syymm-nnnn formátumban az ügyfélkódhoz, és %syymm-nnnn formátumú eladói kódhoz, ahol yy év, mm hónap és nnnn szünet nélküli sorozat 0-kal feltöltve.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=A kód szabad. Ez a kód bármikor módosítható.
 ManagingDirectors=Vezető(k) neve (ügyvezető, elnök, igazgató)
 MergeOriginThirdparty=Duplikált partner (a partnert törlésre kerül)
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 58ff2d8bdcf..d18b2a6e017 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=Beszedett HÉA
 StatusToPay=Fizetni
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Ügyfél számla fizetési
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Szociális/költségvetési adó fizetés
 PaymentVat=ÁFA-fizetés
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=A fizetési lista
 ListOfCustomerPayments=Ügyfelek fizetési listája
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=Fizetési IRPF
 LT2PaymentsES=IRPF kifizetések
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Ellenőrizze a fogadás dátumát
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=Külső hiv
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link a rendelésre
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/hu_HU/ecm.lang b/htdocs/langs/hu_HU/ecm.lang
index 7665135017e..97b5acbda3b 100644
--- a/htdocs/langs/hu_HU/ecm.lang
+++ b/htdocs/langs/hu_HU/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=A fájl még nincs indexelve az adatbázisba (prób
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 66351dfdb7e..a9d1fcea36b 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=<b>%s</b> könyvtár nem található (Rossz út, rossz engedél
 ErrorFunctionNotAvailableInPHP=Funkció <b>%s</b> van szükség, de ez a funkció nem érhető el ez a verzió / beállítását PHP.
 ErrorDirAlreadyExists=A könyvtár ezzel a névvel már létezik.
 ErrorFileAlreadyExists=Egy ugyanilyen nevű fájl már létezik.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=A fájlt nem sikerült teljesen feltölteni.
 ErrorNoTmpDir=A %s ideiglenes könyvtár nem létezik.
 ErrorUploadBlockedByAddon=A feltöltést akadályozza valamilyen PHP / Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/hu_HU/externalsite.lang b/htdocs/langs/hu_HU/externalsite.lang
index eff95943d10..73ab6fbae3a 100644
--- a/htdocs/langs/hu_HU/externalsite.lang
+++ b/htdocs/langs/hu_HU/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Külső weboldalra mutató link beállítása
-ExternalSiteURL=Külső oldal URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Az ExternalSite modul nincs megfelelően beállítva.
 ExampleMyMenuEntry=A menüpontom
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 8b26160d391..0e272c3cc49 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Szerk. dátuma
 IPModification=Modification IP
 DateLastModification=Utolsó módosítás dátuma
 DateValidation=Hitelesítés dátuma
+DateSigning=Signing date
 DateClosing=Lezárás dátuma
 DateDue=Határidő
 DateValue=Érték dátuma
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Egységár (ÁFA nélkül) (valuta)
 UnitPriceTTC=Egység ár
 PriceU=E.Á.
 PriceUHT=E.Á. (nettó)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=E.Á. (adóval)
 Amount=Mennyiség
 AmountInvoice=Számla mennyiség
@@ -389,6 +390,8 @@ AmountTotal=Teljes mennyiség
 AmountAverage=Átlag mennyiség
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Százalék
 Total=Végösszeg
 SubTotal=Részösszeg
@@ -724,7 +727,7 @@ MenuMembers=Tagok
 MenuAgendaGoogle=Google naptár
 MenuTaxesAndSpecialExpenses=Adók | Különleges kiadások
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=Nincs mentett dokumentum ebben a könyvtárban
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Jelenlegi nyelv
 CurrentTheme=Jelenlegi téma
 CurrentMenuManager=Jelenlegi menü-menedzser
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Távolítsa el a '%s' karakterláncot
 SomeTranslationAreUncomplete=A felkínált nyelvek némelyike csak részben fordítható le, vagy hibákat tartalmazhat. Kérjük, segítsen nyelvének javításában az <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> címen regisztrálva.
-DirectDownloadLink=Közvetlen letöltési link (nyilvános / külső)
-DirectDownloadInternalLink=Link a közvetlen letöltéshez (belépés és jogosultság szükséges)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Letöltés
 DownloadDocument=Dokumentum letöltése
 ActualizeCurrency=Árfolyam frissítése
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kapcsolatok
 SearchIntoMembers=Tagok
 SearchIntoUsers=Felhasználók
 SearchIntoProductsOrServices=Termékek vagy Szolgáltatások
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projektek
 SearchIntoMO=Gyártási rendelések
 SearchIntoTasks=Tennivalók
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Billentyűparancs
 AssignedTo=Hozzárendelve
 Deletedraft=Vázlat törlése
 ConfirmMassDraftDeletion=Vázlatok tömeges törlésének megerősítése
-FileSharedViaALink=A fájl megosztva link segítségével
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Először válassza ki a harmadik felet ...
 YouAreCurrentlyInSandboxMode=Jelenleg %s "sandbox" módban van
 Inventory=Készletnyilvántartás
 AnalyticCode=Analitikai kód
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=További infók megjelenítése
 NoFilesUploadedYet=Először töltsön fel egy dokumentumot
 SeePrivateNote=Lásd a privát jegyzetet
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/hu_HU/margins.lang b/htdocs/langs/hu_HU/margins.lang
index 634fb7c4ec2..15ed72656ed 100644
--- a/htdocs/langs/hu_HU/margins.lang
+++ b/htdocs/langs/hu_HU/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Termék vagy Szolgáltatás
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index c191087ddb9..22c84e6b1d0 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Tagok listája tervezet (érvényesíteni kell)
 MembersListValid=Érvényes tagok listája
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=Kilépett tagok listája
 MembersListQualified=Képesítéssel rendelkező tagok listája
 MenuMembersToValidate=Draft tagjai
 MenuMembersValidated=Jóváhagyott tagjai
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Kilépett tagok
 MembersWithSubscriptionToReceive=Tagok előfizetés kapni
 MembersWithSubscriptionToReceiveShort=Előfizetés a fogadáshoz
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Az előfizetés lejárt
 MemberStatusActiveLateShort=Lejárt
 MemberStatusPaid=Előfizetés naprakész
 MemberStatusPaidShort=Naprakész
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Kiléptetett tag
 MemberStatusResiliatedShort=Kilépett
 MembersStatusToValid=Draft tagjai
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Kilépett tagok
 MemberStatusNoSubscription=Ellenörzött (előfizetés nem szükséges)
 MemberStatusNoSubscriptionShort=Hitelesítetve
@@ -82,6 +87,8 @@ Physical=Fizikai
 Moral=Erkölcsi
 MorAndPhy=Moral and Physical
 Reenable=Újra bekapcsolja
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Tag kiléptetése
 ConfirmResiliateMember=Valóban ki szeretné léptetni az adott tagot?
 DeleteMember=Tag törlése
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=A tagoknak küldött tagérvényes
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=A tagoknak küldött új előfizetés felvételéhez használatos e-mail sablon.
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Az előfizetés lejáratára emlékeztető e-mail sablonja.
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Az előfizetés lemondásakor kiküldött e-mail sablonja.
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Feladó e-mail címe az automatikus e-mailekhez
 DescADHERENT_ETIQUETTE_TYPE=Oldal formátuma címkék
 DescADHERENT_ETIQUETTE_TEXT=A tag címzési lapjára nyomtatott szöveg
@@ -162,6 +170,7 @@ DocForLabels=Létrehoz cím lap (a kimeneti formátum tulajdonképpen setup: <b>
 SubscriptionPayment=Előfizetés kiegyenlítése
 LastSubscriptionDate=A legutóbbi előfizetés fizetési dátuma.
 LastSubscriptionAmount=A legutóbbi előfizetés összege
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Országonkénti tagstatisztika.
 MembersStatisticsByState=Tartományonkénti tagstatisztika.
 MembersStatisticsByTown=Városonkénti tagstatisztika.
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index d257f8a1b0b..9192d12ec83 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index 8b1b0ac0e74..02ff5a44729 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Rendelés készítése
 MakeOrder=Rendelés készítése
 SupplierOrder=Beszerzési megrendelés
 SuppliersOrders=Megrendelések
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Jelenlegi beszerzési megrendelések
 CustomerOrder=Értékesítési megrendelés
 CustomersOrders=Értékesítési megrendelések
@@ -87,7 +89,7 @@ NbOfOrders=Megrendelések száma
 OrdersStatistics=Rendelési statisztikák
 OrdersStatisticsSuppliers=Beszerzési statisztikák
 NumberOfOrdersByMonth=Megrendelések száma havonta
-AmountOfOrdersByMonthHT=Megrendelések száma havonta (adó nélkül)
+AmountOfOrdersByMonthHT=Megrendelések értéke havonta (adó nélkül)
 ListOfOrders=Megrendelések listája
 CloseOrder=Megrendelés lezárása
 ConfirmCloseOrder=Biztos benne, hogy ezt a megrendelést kézbesítettre állítja? A kézbesített megrendelés  állítható számlázottra.
@@ -141,11 +143,12 @@ OrderByEMail=E-mail
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=Teljes megrendelési modell 
+PDFEinsteinDescription=Teljes megrendelési modell (az Eratosthene sablon régi megvalósítása)
 PDFEratostheneDescription=Teljes megrendelési modell
 PDFEdisonDescription=Egyszerű megrendelési sablon
 PDFProformaDescription=Teljes Proforma számlasablon
 CreateInvoiceForThisCustomer=Megrendelések számlázása
+CreateInvoiceForThisSupplier=Megrendelések számlázása
 NoOrdersToInvoice=Nincsenek számlázandó megrendelések
 CloseProcessedOrdersAutomatically=Minden kijelölt megrendelés jelölése 'Feldolgozott'-nak.
 OrderCreation=Megrendelés készítés
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index db482da70da..1ae365c60f9 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Készítette %s
 ModifiedBy=Módosította %s
 ValidatedBy=Érvényesíti %s
+SignedBy=Signed by %s
 ClosedBy=Lezárta %s
 CreatedById=Étrehozó ID
 ModifiedById=A legutóbbi változtatást elvégező felhasználó azonosítója
@@ -244,6 +245,7 @@ NewKeyIs=Ez az új kulcs a bejelentkezéshez
 NewKeyWillBe=A szoftverbe való bejelentkezéshez szükséges új kulcsa
 ClickHereToGoTo=Ide kattintva lépjen az %s oldalra
 YouMustClickToChange=Először rá kell kattintania a következő linkre a jelszó megváltoztatásának érvényesítéséhez
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Ha nem kérte ezt a változtatást, felejtse el ezt az e-mailt. A hitelesítő adatait biztonságban tartjuk.
 IfAmountHigherThan=Ha a mennyiség nagyobb, mint <strong>%s</strong>
 SourcesRepository=Források tárolója
diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang
index 6ba8d2aef98..a5e5e3c4906 100644
--- a/htdocs/langs/hu_HU/productbatch.lang
+++ b/htdocs/langs/hu_HU/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Igen
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Nem
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 6add4db3590..ddf05f19e41 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=Áfakulcs (ehhez az eladóhoz / termékhez)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=Ehhez a gyártóhoz / termékhez nincs megadva ár / mennyiség
 NoSupplierPriceDefinedForThisProduct=Ehhez a termékhez nincs meghatározva eladási ár / mennyiség
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Előre meghatározott termék
 PredefinedServicesToSell=Előre meghatározott szolgáltatás
 PredefinedProductsAndServicesToSell=Előre meghatározott termékek / szolgáltatások eladásra
@@ -313,7 +314,7 @@ LastUpdated=Legutolsó frissítés
 CorrectlyUpdated=Rendben frissítve
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=PDF fájlok kiválasztása
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Kérjük, válasszon legalább egy dokumentumot
 DefaultUnitToShow=Egység
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index faec1be92fe..0a5f58045ef 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Feladatok listája
 GoToListOfTimeConsumed=Ugrás az elfogyasztott idő listájára
 GanttView=Gantt nézet
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=A projekttel kapcsolatos kereskedelmi javaslatok felsorolása
 ListOrdersAssociatedProject=A projekthez kapcsolódó értékesítési rendelések listája
 ListInvoicesAssociatedProject=A projekttel kapcsolatos ügyfélszámlák listája
@@ -268,3 +269,7 @@ OneLinePerTask=Feladatonként egy sor
 OneLinePerPeriod=Periódusonként egy sor
 RefTaskParent=Ref. Szülői feladat
 ProfitIsCalculatedWith=A nyereség kiszámítása
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/hu_HU/propal.lang b/htdocs/langs/hu_HU/propal.lang
index b98a6e90f41..6ec551c8c84 100644
--- a/htdocs/langs/hu_HU/propal.lang
+++ b/htdocs/langs/hu_HU/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Küldés e-mailben kereskedelmi javaslat
 DatePropal=Születési javaslat
 DateEndPropal=Érvényesség vége dátuma
 ValidityDuration=Érvényesség időtartama
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s nem található
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Üzleti ajánlat és vonalak
 ProposalLine=Javaslat vonal
+ProposalLines=Proposal lines
 AvailabilityPeriod=Elérhetőség késleltetés
 SetAvailability=Állítsa be a rendelkezésre álló késedelem
 AfterOrder=rendezés után
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index d6a04f7d23e..983d4c646dd 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -19,8 +19,8 @@ Stock=Készlet
 Stocks=Készletek
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Készletek tétel/cikkszám alapján
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Hely
-LocationSummary=Hely rövid neve
-NumberOfDifferentProducts=Termékek száma összesen
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Termékek összesen
 LastMovement=Utolsó mozgatás
 LastMovements=Utolsó mozgatások
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Raktárak értéke
 UserWarehouseAutoCreate=Felhasználói raktár automatikus létrehozása felhasználó hozzáadásakor
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtuális készlet
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Raktár azon.
 DescWareHouse=Raktár leírás
 LieuWareHouse=Raktár helye
 WarehousesAndProducts=Raktárak és termékek
 WarehousesAndProductsBatchDetail=Raktárak és termékek (tétel/cikkszám szerint részletezve)
 AverageUnitPricePMPShort=Súlyozott átlagár
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Értékesítés Egységár
 EstimatedStockValueSellShort=Eladási érték
 EstimatedStockValueSell=Eladási érték
@@ -145,7 +147,7 @@ Replenishments=Készletek pótlása
 NbOfProductBeforePeriod=A %s termékből rendelkezésre álló mennyiség a kiválasztott periódusban (%s előtt)
 NbOfProductAfterPeriod=A %s termékből rendelkezésre álló mennyiség a kiválasztott periódusban (%s után)
 MassMovement=Tömeges mozgatás
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Mozgatás rögzítése
 ReceivingForSameOrder=Megrendelés nyugtái
 StockMovementRecorded=Rögzített készletmozgások
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Mozgás címkéje
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Mozgás vagy leltár kód
 IsInPackage=Csomag tartalmazza
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Készletnyilvántartás
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index ddee07d0144..9f6541ea875 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Eladók
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Szállítói számlák
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=Történet
diff --git a/htdocs/langs/hu_HU/ticket.lang b/htdocs/langs/hu_HU/ticket.lang
index eca711a1cf2..59c439326d2 100644
--- a/htdocs/langs/hu_HU/ticket.lang
+++ b/htdocs/langs/hu_HU/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Típus
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index 45af45e609f..9e9179eeb7c 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Eltávolítás a csoportból
 PasswordChangedAndSentTo=A jelszó megváltoztatva és elküldve: <b>%s</b>.
 PasswordChangeRequest=Jelszó megváltoztatásának kérése <b>%s</b>
 PasswordChangeRequestSent=<b>%s</b> által kért jelszóváltoztatás el lett küldve ide: <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=A jelszó visszaállításának megerősítése
 MenuUsersAndGroups=Felhasználók és csoportok
 LastGroupsCreated=Legutóbb létrehozott %s csoportok
@@ -70,9 +72,10 @@ ExportDataset_user_1=Felhasználók és tulajdonságaik
 DomainUser=Domain felhasználók %s
 Reactivate=Újra aktiválás
 CreateInternalUserDesc=Ez az űrlap lehetővé teszi belső felhasználó létrehozását a vállalatban/szervezetben. Külső felhasználó (vevő, eladó stb.) létrehozásához használja a 'Dolibarr felhasználó létrehozása' gombot a partner névjegykártyáján.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Engedélyek megadva mert örökölte az egyik csoporttól.
 Inherited=Örökölve
+UserWillBe=Created user will be
 UserWillBeInternalUser=Létrehozta felhasználó lesz egy belső felhasználó (mivel nem kapcsolódik az adott harmadik fél)
 UserWillBeExternalUser=Létrehozott felhasználó lesz egy külső felhasználó (mivel kapcsolódnak az adott harmadik fél)
 IdPhoneCaller=Telfon hívó azonosító
@@ -109,8 +112,10 @@ UserAccountancyCode=Felhasználói számviteli kód
 UserLogoff=Felhasználó kilépés
 UserLogged=Felhasználó naplózva
 DateOfEmployment=Employment date
-DateEmployment=A foglalkoztatás kezdő dátuma
+DateEmployment=Employment
+DateEmploymentstart=A foglalkoztatás kezdő dátuma
 DateEmploymentEnd=A foglalkoztatás befejezési dátuma
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=Saját felhasználói rekordját nem tilthatja le
 ForceUserExpenseValidator=A költségjelentés érvényesítésének kényszerítése
 ForceUserHolidayValidator=A szabadságkérelem érvényesítése
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index d7e4a43010d..df9bc9385e8 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Használjon beépített PHP szerverrel</u> <br> Fejlesztői környezetben a futtatással inkább tesztelheti a webhelyet a beágyazott PHP szerverrel (PHP 5.5 szükséges) <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Futtassa weboldalát egy másik Dolibarr tárhely szolgáltatóval</u> <br> Ha még nem áll rendelkezésre internetes szerver, például Apache vagy NGinx, akkor exportálhatja és importálhatja webhelyét egy másik Dolibarr példányra, amelyet egy másik Dolibarr tárhely szolgáltató biztosít, és amely teljes mértékben integrálja a webhely modult. Néhány Dolibarr tárhely-szolgáltató felsorolását a <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org oldalon</a> találja
-CheckVirtualHostPerms=Ellenőrizze azt is, hogy a virtuális gazdagép rendelkezik-e <strong>%s</strong> engedéllyel a fájlokba <br> <strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Olvas
 WritePerm=Ír
 TestDeployOnWeb=Tesztelés / telepítés az interneten
 PreviewSiteServedByWebServer=<u>Előnézet %s új fülön.</u> <br><br> Az %s-et egy külső webszerver fogja kiszolgálni (például Apache, Nginx, IIS). A kiszolgáló telepítése és telepítése előtt telepítenie kell a könyvtárat: <br> <strong>%s</strong> <br> Külső szerver által kiszolgált URL: <br> <strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Előnézet %s új fülön.</u> <br><br> Az %s-et a Dolibarr szerver fogja kiszolgálni, így nincs szüksége további webszerverre (például Apache, Nginx, IIS) a telepítéshez. <br> Kényelmetlen az, hogy az oldalak URL-je nem felhasználóbarát, és a Dolibarr útvonalával kezdődik. <br> URL szolgáltatója: Dolibarr: <br> <strong>%s</strong> <br><br> Ha saját külső webszervert szeretne használni ennek a webhelynek a kiszolgálására, hozzon létre egy virtuális gazdagépet a webkiszolgálón, amely a könyvtárba mutat <br> <strong>%s</strong> <br> majd írja be a virtuális szerver nevét, majd kattintson a másik előnézeti gombra.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=A külső webszerver által kiszolgált virtuális gazdagép URL-je nincs meghatározva
 NoPageYet=Még nincs oldal
 YouCanCreatePageOrImportTemplate=Készíthet új oldalt, vagy importálhat egy teljes webhelysablont
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/hu_HU/zapier.lang b/htdocs/langs/hu_HU/zapier.lang
index 24de04023f3..70cb3185d52 100644
--- a/htdocs/langs/hu_HU/zapier.lang
+++ b/htdocs/langs/hu_HU/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr modul
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Zapier for Dolibarr beállítása
+ZapierForDolibarrSetup=Zapier for Dolibarr beállítása
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index f8548a63d79..8f2c1104d2a 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -16,18 +16,18 @@ ThisService=Layanan ini
 ThisProduct=Produk ini
 DefaultForService=Standar untuk Layanan
 DefaultForProduct=Standar untuk Produk
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Produk untuk pihak ketiga ini
+ServiceForThisThirdparty=Layanan untuk pihak ketiga ini
 CantSuggest=Tidak bisa menyarankan
 AccountancySetupDoneFromAccountancyMenu=Kebanyakan aturan akutansi dilakukan dari bilah menu %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=Konfigurasi akuntansi modul (entri ganda)
 Journalization=Pencatatan Jurnal
 Journals=Jurnal
 JournalFinancial=Jurnal Keuangan
 BackToChartofaccounts=Akun grafik pembalik
 Chartofaccounts=Tabel Akun
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfSubaccounts=Bagan akun individu
+ChartOfIndividualAccountsOfSubsidiaryLedger=Bagan akun individu dari buku besar pembantu
 CurrentDedicatedAccountingAccount=Akun sekarang yang dipakai
 AssignDedicatedAccountingAccount=Akun baru untuk ditambahkan
 InvoiceLabel=Label Tagihan
@@ -37,8 +37,8 @@ OtherInfo=Informasi lain
 DeleteCptCategory=Hilangkan akun akutansi dari grup
 ConfirmDeleteCptCategory=Apakah Anda yakin untuk menghilangkan akun akutansi ini dari grup akun akutansi?
 JournalizationInLedgerStatus=Status Pencatatan Jurnal
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
+AlreadyInGeneralLedger=Sudah ditransfer dalam jurnal akuntansi dan buku besar
+NotYetInGeneralLedger=Belum ditransfer ke jurnal dan buku besar
 GroupIsEmptyCheckSetup=Grup kosong, periksa pengaturan grup akuntansi yang dipersonalisasi
 DetailByAccount=Tampilkan rincian berdasarkan akun
 AccountWithNonZeroValues=Akun dengan nilai bukan nol
@@ -47,10 +47,10 @@ CountriesInEEC=Negara di EEC
 CountriesNotInEEC=Negara bukan di EEC
 CountriesInEECExceptMe=Negara di EEC kecuali %s
 CountriesExceptMe=Semua negara kecuali %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
-VueBySubAccountAccounting=View by accounting subaccount
+AccountantFiles=Ekspor dokumen sumber
+ExportAccountingSourceDocHelp=Dengan alat ini, Anda dapat mengekspor agenda sumber (daftar dan PDF) yang digunakan untuk menghasilkan akuntansi Anda. Untuk mengekspor jurnal Anda, gunakan entri menu %s - %s.
+VueByAccountAccounting=Lihat berdasarkan akun akuntansi
+VueBySubAccountAccounting=Lihat menurut sub-akun akuntansi
 
 MainAccountForCustomersNotDefined=Akun akuntansi utama untuk pelanggan tidak ditentukan dalam pengaturan
 MainAccountForSuppliersNotDefined=Akun akuntansi utama untuk vendor tidak ditentukan dalam pengaturan
@@ -86,7 +86,7 @@ AccountancyAreaDescAnalyze=LANGKAH %s: Tambahkan atau sunting transaksi yang ada
 
 AccountancyAreaDescClosePeriod=LANGKAH %s: Tutup periode sehingga kita tidak dapat melakukan modifikasi di masa mendatang.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Langkah wajib dalam penyiapan belum selesai (jurnal kode akuntansi tidak ditentukan untuk semua rekening bank)
 Selectchartofaccounts=Pilih bagan akun aktif
 ChangeAndLoad=Ubah dan muat
 Addanaccount=Tambahkan sebuah akun akuntansi
@@ -96,8 +96,8 @@ SubledgerAccount=Akun sub Buku Besar
 SubledgerAccountLabel=Label akun sub Buku Besar
 ShowAccountingAccount=Tampilkan akun akuntansi
 ShowAccountingJournal=Tampilkan jurnal akuntansi
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=Tampilkan akun akuntansi dalam buku besar
+ShowAccountingAccountInJournals=Tampilkan akun akuntansi di jurnal
 AccountAccountingSuggest=Akun akuntansi yang disarankan
 MenuDefaultAccounts=Akun standar
 MenuBankAccounts=Akun bank
@@ -119,7 +119,7 @@ ExpenseReportsVentilation=Penjilidan laporan pengeluaran
 CreateMvts=Buat transaksi baru
 UpdateMvts=Modifikasi sebuah transaksi
 ValidTransaction=Validasi transaksi
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Daftarkan transaksi dalam akuntansi
 Bookkeeping=Buku Besar
 BookkeepingSubAccount=Subledger
 AccountBalance=Saldo akun
@@ -131,7 +131,7 @@ InvoiceLinesDone=Baris faktur terikat
 ExpenseReportLines=Baris laporan pengeluaran untuk dijilidkan dan diikat
 ExpenseReportLinesDone=Baris laporan pengeluaran terikat
 IntoAccount=Jilidkan baris dengan akun akuntansi
-TotalForAccount=Total untuk akun akuntansi
+TotalForAccount=Total akun akuntansi
 
 
 Ventilate=Jilidkan
@@ -147,7 +147,7 @@ NotVentilatedinAccount=Tidak terikat pada akun akuntansi
 XLineSuccessfullyBinded=%s produk/layanan berhasil diikat ke akun akuntansi
 XLineFailedToBeBinded=Produk/layanan %s tidak terikat pada akun akuntansi mana pun
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Jumlah baris maksimum pada daftar dan halaman jilid (disarankan: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Mulailah menyortir halaman "Binding to do" oleh elemen-elemen terbaru
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Mulailah menyortir halaman "Binding done" oleh elemen-elemen terbaru
 
@@ -159,8 +159,8 @@ ACCOUNTING_MANAGE_ZERO=Izinkan untuk mengelola jumlah nol yang berbeda di akhir
 BANK_DISABLE_DIRECT_INPUT=Nonaktifkan pencatatan langsung transaksi di rekening bank
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktifkan konsep ekspor di jurnal
 ACCOUNTANCY_COMBO_FOR_AUX=Aktifkan daftar kombo untuk akun anak perusahaan (mungkin lambat jika Anda memiliki banyak pihak ketiga)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTING_DATE_START_BINDING=Tentukan tanggal untuk mulai mengikat & mentransfer akuntansi. Di bawah tanggal ini, transaksi tidak akan dialihkan ke akuntansi.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Pada transfer akuntansi, pilih periode yang ditampilkan secara default
 
 ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembelian
@@ -180,7 +180,7 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Akun akuntansi tunggu
 DONATION_ACCOUNTINGACCOUNT=Akun akuntansi untuk mendaftarkan sumbangan
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Akun akuntansi untuk mendaftar langganan
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Akun akuntansi secara default untuk mendaftarkan deposit pelanggan
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Akun akuntansi secara default untuk produk yang dibeli (digunakan jika tidak didefinisikan dalam lembar produk)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Akun akuntansi secara default untuk produk yang dibeli di EEC (digunakan jika tidak didefinisikan dalam lembar produk)
@@ -201,33 +201,33 @@ Docdate=Tanggal
 Docref=Referensi
 LabelAccount=Label Akun
 LabelOperation=Operasi label
-Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+Sens=Arah
+AccountingDirectionHelp=Untuk akun akuntansi pelanggan, gunakan Kredit untuk mencatat pembayaran yang Anda terima <br> Untuk akun akuntansi pemasok, gunakan Debit untuk mencatat pembayaran yang Anda lakukan
 LetteringCode=Kode huruf
 Lettering=Tulisan
 Codejournal=Jurnal
 JournalLabel=Label jurnal
 NumPiece=Jumlah potongan
 TransactionNumShort=Tidak. transaksi
-AccountingCategory=Grup yang dipersonalisasi
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
+AccountingCategory=Custom group
+GroupByAccountAccounting=Kelompokkan menurut akun buku besar
+GroupBySubAccountAccounting=Kelompokkan menurut akun subledger
 AccountingAccountGroupsDesc=Anda dapat mendefinisikan di sini beberapa grup akun akuntansi. Mereka akan digunakan untuk laporan akuntansi yang dipersonalisasi.
 ByAccounts=Dengan akun
 ByPredefinedAccountGroups=Oleh kelompok yang telah ditentukan
 ByPersonalizedAccountGroups=Oleh grup yang dipersonalisasi
 ByYear=Tahun
 NotMatch=Tidak diatur
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Hapus beberapa jalur operasi dari akuntansi
 DelMonth=Bulan untuk dihapus
 DelYear=Tahun untuk dihapus
 DelJournal=Jurnal untuk dihapus
-ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
+ConfirmDeleteMvt=Ini akan menghapus semua baris operasi akuntansi untuk tahun / bulan dan / atau untuk jurnal tertentu (Setidaknya satu kriteria diperlukan). Anda harus menggunakan kembali fitur '%s' agar catatan yang dihapus kembali ke buku besar.
+ConfirmDeleteMvtPartial=Ini akan menghapus transaksi dari akunting (semua jalur operasi yang terkait dengan transaksi yang sama akan dihapus)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Jurnal biaya laporan
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=Ini adalah tampilan catatan yang terikat ke akun akuntansi dan dapat dicatat ke dalam Jurnal dan Buku Besar.
 VATAccountNotDefined=Akun untuk PPN tidak ditentukan
 ThirdpartyAccountNotDefined=Akun untuk pihak ketiga tidak ditentukan
 ProductAccountNotDefined=Akun untuk produk tidak ditentukan
@@ -253,7 +253,7 @@ PaymentsNotLinkedToProduct=Pembayaran tidak terkait dengan produk / layanan apa
 OpeningBalance=Saldo awal
 ShowOpeningBalance=Tampilkan saldo awal
 HideOpeningBalance=Sembunyikan saldo awal
-ShowSubtotalByGroup=Show subtotal by level
+ShowSubtotalByGroup=Tunjukkan subtotal menurut level
 
 Pcgtype=Grup akun
 PcgtypeDesc=Grup akun digunakan sebagai kriteria 'filter' dan 'pengelompokan' yang telah ditentukan sebelumnya untuk beberapa laporan akuntansi. Misalnya, 'PENGHASILAN' atau 'BEBAN' digunakan sebagai grup untuk akun akuntansi produk untuk membangun laporan pengeluaran / pendapatan.
@@ -276,11 +276,11 @@ DescVentilExpenseReport=Konsultasikan di sini daftar garis laporan pengeluaran y
 DescVentilExpenseReportMore=Jika Anda mengatur akun akuntansi pada jenis garis laporan pengeluaran, aplikasi akan dapat membuat semua ikatan antara garis laporan pengeluaran Anda dan akun akuntansi dari bagan akun Anda, cukup dengan satu klik dengan tombol<strong>"%s" </strong>. Jika akun tidak ditetapkan pada kamus biaya atau jika Anda masih memiliki beberapa baris yang tidak terikat pada akun apa pun, Anda harus membuat manual yang mengikat dari menu "<strong> %s </strong>".
 DescVentilDoneExpenseReport=Konsultasikan di sini daftar garis laporan pengeluaran dan akun akuntansi biayanya
 
-Closure=Annual closure
+Closure=Penutupan tahunan
 DescClosure=Konsultasikan di sini jumlah gerakan berdasarkan bulan yang tidak divalidasi & tahun fiskal sudah terbuka
 OverviewOfMovementsNotValidated=Langkah 1 / Ikhtisar gerakan yang tidak divalidasi. (Diperlukan untuk menutup tahun fiskal)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
+AllMovementsWereRecordedAsValidated=Semua pergerakan dicatat sebagai divalidasi
+NotAllMovementsCouldBeRecordedAsValidated=Tidak semua pergerakan dapat direkam sebagai divalidasi
 ValidateMovements=Validasi gerakan
 DescValidateMovements=Setiap modifikasi atau penghapusan tulisan, huruf dan penghapusan akan dilarang. Semua entri untuk latihan harus divalidasi jika tidak, penutupan tidak akan mungkin
 
@@ -300,10 +300,10 @@ Accounted=Disumbang dalam buku besar
 NotYetAccounted=Belum diperhitungkan dalam buku besar
 ShowTutorial=Perlihatkan Tutorial
 NotReconciled=Tidak didamaikan
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=Peringatan, semua operasi tanpa akun subledger ditentukan disaring dan dikecualikan dari tampilan ini
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Opsi mengikat
 ApplyMassCategories=Terapkan kategori secara massal
 AddAccountFromBookKeepingWithNoCategories=Akun yang tersedia belum dalam grup yang dipersonalisasi
 CategoryDeleted=Kategori untuk akun akuntansi telah dihapus
@@ -323,9 +323,9 @@ ErrorAccountingJournalIsAlreadyUse=Jurnal ini sudah digunakan
 AccountingAccountForSalesTaxAreDefinedInto=Catatan: Akun akuntansi untuk Pajak penjualan didefinisikan ke dalam menu<b>%s</b>-<b>%s </b>
 NumberOfAccountancyEntries=Jumlah entri
 NumberOfAccountancyMovements=Jumlah gerakan
-ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Nonaktifkan pengikatan & transfer akuntansi pada penjualan (faktur pelanggan tidak akan diperhitungkan dalam akuntansi)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Nonaktifkan pengikatan & transfer akuntansi pada pembelian (faktur vendor tidak akan diperhitungkan dalam akuntansi)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Nonaktifkan pengikatan & transfer akuntansi pada laporan pengeluaran (laporan pengeluaran tidak akan diperhitungkan dalam akuntansi)
 
 ## Export
 ExportDraftJournal=Ekspor draft jurnal
@@ -345,11 +345,11 @@ Modelcsv_LDCompta10=Ekspor untuk LD Compta (v10 & lebih tinggi)
 Modelcsv_openconcerto=Ekspor untuk OpenConcerto (Uji)
 Modelcsv_configurable=Ekspor CSV Dapat Dikonfigurasi
 Modelcsv_FEC=Ekspor FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
+Modelcsv_FEC2=Ekspor FEC (Dengan penulisan tanggal / dokumen dibalik)
 Modelcsv_Sage50_Swiss=Ekspor untuk Sage 50 Swiss
 Modelcsv_winfic=Ekspor Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv3=Ekspor untuk Gestinum (v3)
+Modelcsv_Gestinumv5Export untuk Gestinum (v5)
 ChartofaccountsId=Bagan akun Id
 
 ## Tools - Init accounting account on product / service
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Baris belum terikat, gunakan menu <a href="%s"> %s </
 
 ## Import
 ImportAccountingEntries=Entri akuntansi
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Tanggal ekspor
 WarningReportNotReliable=Peringatan, laporan ini tidak didasarkan pada Buku Besar, jadi tidak mengandung transaksi yang dimodifikasi secara manual di Buku Besar. Jika jurnal Anda sudah mutakhir, tampilan pembukuan lebih akurat.
 ExpenseReportJournal=Jurnal Laporan Biaya
 InventoryJournal=Jurnal Persediaan
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 6053f1fcc05..91c88376980 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Hapuskan penguncian koneksi.
 YourSession=Sesi Anda
 Sessions=Sesi Pengguna
 WebUserGroup=Server web pengguna / grup
+PermissionsOnFiles=Izin pada file
 PermissionsOnFilesInWebRoot=Izin pada file di direktori root web
 PermissionsOnFile=Izin pada file %s
 NoSessionFound=Konfigurasi PHP Anda tampaknya tidak diizinkan untuk membuat daftar untuk sesi yang aktif. Direktori yang digunakan untuk menyimpan sesi (<b>%s</b>) mungkin dilindungi (misalnya pengaturan izin OS atau oleh pengaturan direktif PHP open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Catatan: Ya akan hanya efektif ketika modul <b>%s</b> diaktifkan
 RemoveLock=Hapus / ganti nama berkas <b>%s</b> jika sudah ada, untuk memperbolehkan pemakaian alat Perbarui / Instal.
 RestoreLock=Pulihkan berkas <b>%s</b>, dengan izin baca saja, untuk menonaktifkan pemakaian alat Pembaruan / Instal lebih lanjut.
 SecuritySetup=Pengaturan Keamanan
+PHPSetup=Pengaturan PHP
 SecurityFilesDesc=Tetapkan di sini untuk opsi yang terkait dengan keamanan tentang mengunggah berkas.
 ErrorModuleRequirePHPVersion=Kesalahan, modul ini membutuhkan versi PHP %s atau lebih tinggi
 ErrorModuleRequireDolibarrVersion=Kesalahan, modul ini membutuhkan versi Dolibarr %s atau lebih tinggi
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Area ini menyediakan fungsi administrasi. Gunakan menu untuk
 Purge=Perbersihan
 PurgeAreaDesc=Halaman ini memungkinkan Anda untuk menghapus semua file yang dihasilkan atau disimpan oleh Dolibarr (file sementara atau semua file di<b>%s</b>direktori). Menggunakan fitur ini biasanya tidak diperlukan. Ini disediakan sebagai solusi untuk pengguna yang Dolibarr di-host oleh penyedia yang tidak menawarkan izin untuk menghapus file yang dihasilkan oleh server web.
 PurgeDeleteLogFile=Hapus file log, termasuk<b>%s</b>didefinisikan untuk modul Syslog (tidak ada risiko kehilangan data)
-PurgeDeleteTemporaryFiles=Hapus semua log dan file sementara (tidak ada risiko kehilangan data). Catatan: Penghapusan file sementara dilakukan hanya jika direktori temp (sementara)  dibuat lebih dari 24 jam yang lalu.
+PurgeDeleteTemporaryFiles=Hapus semua log dan file sementara (tidak ada risiko kehilangan data). Parameter dapat berupa 'tempfilesold', 'logfiles' atau keduanya 'tempfilesold + logfiles'. Catatan: Penghapusan file sementara dilakukan hanya jika direktori temp dibuat lebih dari 24 jam yang lalu.
 PurgeDeleteTemporaryFilesShort=Hapus log dan file sementara
 PurgeDeleteAllFilesInDocumentsDir=Hapus semua file dalam direktori:<b>%s </b>. <br> Ini akan menghapus semua dokumen yang dihasilkan terkait dengan elemen (pihak ketiga, faktur dll ...), file yang diunggah ke dalam modul ECM, kesedihan cadangan database dan file sementara.
 PurgeRunNow=Bersihkan sekarang
@@ -232,6 +234,7 @@ BoxesAvailable=Widget tersedia
 BoxesActivated=Widget diaktifkan
 ActivateOn=Aktifkan aktif
 ActiveOn=Diaktifkan pada
+ActivatableOn=Dapat diaktifkan pada
 SourceFile=Berkas sumber
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Hanya tersedia jika JavaScript tidak dinonaktifkan
 Required=Diperlukan
@@ -347,9 +350,10 @@ LastActivationAuthor=Penulis aktivasi terbaru
 LastActivationIP=IP aktivasi terbaru
 UpdateServerOffline=Perbarui server offline
 WithCounter=Kelola penghitung
-GenericMaskCodes=Anda dapat memasukkan topeng penomoran apa saja. Dalam topeng ini, tag berikut dapat digunakan: <br><b>{000000}</b>sesuai dengan nomor yang akan ditambahkan pada setiap %s. Masukkan angka nol sebanyak panjang penghitung yang diinginkan. Penghitung akan diisi oleh nol dari kiri untuk memiliki nol sebanyak topeng. <br><b>{000000 + 000}</b>sama seperti sebelumnya tetapi offset yang sesuai dengan angka di sebelah kanan tanda + diterapkan mulai %s pertama. <br><b>{000000 @ x}</b>sama seperti sebelumnya tetapi penghitung diatur ulang ke nol ketika bulan x tercapai (x antara 1 dan 12, atau 0 untuk menggunakan bulan-bulan awal tahun fiskal yang ditentukan dalam konfigurasi Anda, atau 99 untuk mengatur ulang agar nol setiap bulan). Jika opsi ini digunakan dan x adalah 2 atau lebih tinggi, maka urutan {yy} {mm} atau {yyyy} {mm} juga diperlukan. <br><b>{dd}</b>hari (01 hingga 31). <br><b>{mm}</b>bulan (01 hingga 12). <br><b>{yy} </b>,<b>{yyyy}</b>atau<b>{y} a09afb7fb7f7fbf07fbf07fbf0f0fbf0f0f0f0f0f0f0f0f0f0f0f0f0f00f0f0f0f0f0f0f00f0f07f0f07f0f07f3f0f07fb0f0f07fbf07fbf07fbf07fb0fb0f0f07f4f0f07 <br>
-GenericMaskCodes2=<b>{cccc}</b>kode klien pada n karakter <br><b>{cccc000} a09a4b739 aa pelanggan diikutkan dengan pelanggan pada kode pelanggan. Penghitung yang didedikasikan untuk pelanggan ini disetel ulang bersamaan dengan penghitung global. <br><b>{tttt}</b>Kode tipe pihak ketiga pada n karakter (lihat menu Beranda - Pengaturan - Kamus - Jenis pihak ketiga). Jika Anda menambahkan tag ini, penghitung akan berbeda untuk setiap jenis pihak ketiga. <br>
-GenericMaskCodes3=Semua karakter lain di topeng akan tetap utuh. <br> Spasi tidak diperbolehkan. <br>
+GenericMaskCodes=Anda dapat memasukkan topeng penomoran apa pun. Dalam topeng ini, tag berikut dapat digunakan: <br> <b> {000000} </b> sesuai dengan angka yang akan bertambah pada setiap %s. Masukkan angka nol sebanyak panjang penghitung yang diinginkan. Penghitung akan diselesaikan dengan angka nol dari kiri untuk mendapatkan angka nol sebanyak topeng. <br> <b> {000000 + 000} </b> sama dengan yang sebelumnya tetapi offset yang sesuai dengan nomor di sebelah kanan tanda + diterapkan mulai dari %s pertama. <br> <b> {000000 @ x} </b> sama dengan yang sebelumnya tetapi penghitung disetel ulang ke nol saat bulan x tercapai (x antara 1 dan 12, atau 0 untuk menggunakan bulan-bulan awal tahun fiskal yang ditentukan dalam konfigurasi Anda, atau 99 hingga reset ke nol setiap bulan). Jika opsi ini digunakan dan x adalah 2 atau lebih tinggi, maka urutan {yy} {mm} atau {yyyy} {mm} juga diperlukan. <br> <b> {dd} </b> hari (01 hingga 31). <br> <b> {mm} </b> bulan (01 hingga 12). <br> <b> {yy} </b>, <b> {yyyy} </b> atau <b> {y} a09a4b739 nomor. <br>
+GenericMaskCodes2= <b> {cccc} </b> kode klien pada karakter n <br> <b> {cccc000} a09a4b739f17f17f8z0 karakter khusus untuk klien yang dikhususkan untuk klien. Penghitung yang didedikasikan untuk pelanggan ini disetel ulang pada waktu yang sama dengan penghitung global. <br> <b> {tttt} </b> Kode jenis pihak ketiga pada n karakter (lihat menu Home - Setup - Dictionary - Jenis pihak ketiga). Jika Anda menambahkan tag ini, penghitung akan berbeda untuk setiap jenis pihak ketiga. <br>
+GenericMaskCodes3=Semua karakter lain di topeng akan tetap utuh. <br> Spasi tidak dibolehkan. <br>
+GenericMaskCodes3EAN=Semua karakter lain di topeng akan tetap utuh (kecuali * atau? Di posisi 13 di EAN13). <br> Spasi tidak dibolehkan. <br> Dalam EAN13, karakter terakhir setelah last} di posisi ke-13 harus * atau? . Ini akan diganti dengan kunci yang dihitung. <br>
 GenericMaskCodes4a= <u> Contoh pada ke-99 %s dari pihak ketiga TheCompany, dengan tanggal 2007-01-31: </u> <br>
 GenericMaskCodes4b= <u> Contoh pihak ketiga dibuat pada 2007-03-01: </u> <br>
 GenericMaskCodes4c= <u> Contoh pada produk yang dibuat pada 2007-03-01: </u> <br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Membiarkan baris ini kosong berarti nilai ini akan d
 ExtrafieldParamHelpselect=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, nilai1<br>2, nilai2 a0342fccfda0b3f0f0f0fb0f0f0fb03 daftar tergantung pada daftar atribut pelengkap lain: <br> 1, nilai1 | options_ <i> parent_list_code </i>: parent_key<br>2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar lain: <br> 1, nilai1 | <i> parent_list_code </i>: parent_key<br>2, value2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, value1<br>2, value2 a0342fccfda2b3f0f3f0f3f
 ExtrafieldParamHelpradio=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, value1<br>2, value2 a0342fccfda2b3f0f3f0f3f
-ExtrafieldParamHelpsellist=Daftar nilai berasal dari tabel <br> Sintaks: nama_tabel: label_field: id_field :: filter <br> Contoh: c_typent: libelle: id :: filter <br> <br> - id_field adalah kunci utama = 1) untuk menampilkan hanya nilai aktif <br> Anda juga dapat menggunakan $ ID $ in filter yang merupakan id saat ini dari objek <br> Untuk menggunakan SELECT ke dalam filter, gunakan kata kunci $ SEL $ untuk melewati perlindungan anti-injeksi. <br> jika Anda ingin memfilter extrafields gunakan sintaks extra.fieldcode = ... (di mana kode field adalah kode dari extrafield) <br> <br> Untuk memiliki daftar tergantung pada daftar atribut pelengkap lainnya: <br> c_typ: libelle: id19bz0 <i> parent_list_code </i> | parent_column: filter <br> <br> Untuk memiliki daftar yang bergantung pada daftar lain: <br> c_typent: libelle: id_col33_list: parentkolom
-ExtrafieldParamHelpchkbxlst=Daftar nilai berasal dari tabel<br>Sintaks: table_name: label_field: id_field :: filter<br>Contoh: c_typent: libelle: id :: filter <br> <br> filter a hanya dapat ditampilkan sebagai contoh a juga dapat menggunakan $ ID $ dalam penyihir filter adalah id saat ini dari objek saat ini<br>Untuk melakukan SELECT dalam menggunakan $ SEL $ <br> jika Anda ingin memfilter pada extrafields gunakan sintaks extra.fieldcode = ... (di mana kode baris adalah kode extrafield) <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar atribut pelengkap lain: <br> c_typent: Libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar lain: c_typent <br>: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelpsellist=Daftar nilai berasal dari tabel <br> Sintaks: nama_tabel: label_field: id_field :: filtersql <br> Contoh: c_typent: libelle: id :: filterql <br> a0342fccfccfda19bz0 - id_342 adalah kondisi kunci SQL. Ini bisa menjadi tes sederhana (misalnya aktif = 1) untuk menampilkan hanya nilai aktif <br> Anda juga dapat menggunakan $ ID $ in filter yang merupakan id saat ini dari objek saat ini <br> Untuk menggunakan SELECT ke dalam filter, gunakan kata kunci $ SEL $ to melewati perlindungan anti injeksi. <br> jika Anda ingin memfilter extrafields gunakan sintaks extra.fieldcode = ... (di mana kode field adalah kode extrafield) <br> <br> Untuk memiliki daftar bergantung pada daftar atribut pelengkap lainnya: <br> c_typ <i> parent_list_code </i> | parent_column: filter <br> <br> Agar daftar bergantung pada daftar lain: <br> c_typent: libelle
+ExtrafieldParamHelpchkbxlst=Daftar nilai berasal dari tabel <br> Sintaks: table_name:label_field:id_field::filtersql <br> Contoh: c_typent:libelle:id::filtersql <br> nilai aktif hanya dapat menguji  (co active=1)  juga dapat menggunakan $ ID $ di filter witch adalah id saat ini dari objek saat ini <br> Untuk melakukan SELECT di filter gunakan $ SEL $ <br> jika Anda ingin memfilter extrafields gunakan sintaks extra.fieldcode = ... (di mana kode bidang adalah kode extrafield) <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar atribut pelengkap lain: <br> c_typent: Libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar lain: c_typent <br><br>untuk memiliki daftar tergantung pada daftar lain:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameter harus ObjectName: Classpath <br> Sintaks: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Biarkan kosong untuk pemisah sederhana<br>Setel ini menjadi 1 untuk pemisah runtuh (buka secara default untuk sesi baru, kemudian status disimpan untuk setiap sesi pengguna) status disimpan sebelum setiap sesi pengguna)
 LibraryToBuildPDF=Perpustakaan digunakan untuk pembuatan PDF
@@ -541,6 +545,8 @@ Module40Name=Vendor
 Module40Desc=Vendor dan manajemen pembelian (pesanan pembelian dan penagihan faktur pemasok)
 Module42Name=Debug Log
 Module42Desc=Fasilitas pencatatan (file, syslog, ...). Log semacam itu untuk tujuan teknis / debug.
+Module43Name=Bilah Debug
+Module43Desc=Alat untuk pengembang yang menambahkan bilah debug di browser Anda.
 Module49Name=Editor
 Module49Desc=Manajemen editor
 Module50Name=Produk
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind kemampuan konversi
 Module3200Name=Arsip yang Tidak Dapat Diubah
 Module3200Desc=Aktifkan log peristiwa bisnis yang tidak dapat diubah. Perihal diarsipkan secara waktu nyata. Log adalah tabel read-only peristiwa dirantai yang dapat diekspor. Modul ini mungkin wajib untuk beberapa negara.
+Module3400Name=Jaringan sosial
+Module3400Desc=Aktifkan bidang Jaringan Sosial ke pihak ketiga dan alamat (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Manajemen sumber daya manusia (manajemen departemen, kontrak dan perasaan karyawan)
 Module5000Name=Multi-perusahaan
 Module5000Desc=Memungkinkan Anda mengelola banyak perusahaan
-Module6000Name=Alur kerja
-Module6000Desc=Manajemen alur kerja (pembuatan objek dan / atau perubahan status otomatis)
+Module6000Name=Alur Kerja Antar-modul
+Module6000Desc=Manajemen alur kerja antara modul yang berbeda (pembuatan objek secara otomatis dan / atau perubahan status otomatis)
 Module10000Name=Situs web
 Module10000Desc=Buat situs web (publik) dengan editor WYSIWYG. Ini adalah CMS berorientasi webmaster atau pengembang (lebih baik untuk mengetahui bahasa HTML dan CSS). Cukup atur server web Anda (Apache, Nginx, ...) untuk menunjuk ke direktori Dolibarr khusus untuk memilikinya online di internet dengan nama domain Anda sendiri.
 Module20000Name=Tinggalkan Manajemen Permintaan
@@ -805,7 +813,8 @@ PermissionAdvanced253=Membuat / memodifikasi pengguna dan izin internal / ekster
 Permission254=Buat / modifikasi hanya pengguna eksternal
 Permission255=Merubah Kata Sandi Pengguna Lain
 Permission256=Hapus atau nonaktifkan pengguna lain
-Permission262=Perluas akses ke semua pihak ketiga (tidak hanya pihak ketiga yang pengguna itu adalah perwakilan penjualan). <br> Tidak efektif untuk pengguna eksternal (selalu terbatas pada diri mereka sendiri untuk proposal, pesanan, faktur, kontrak, dll.). <br> Tidak efektif untuk proyek (hanya aturan tentang izin proyek, visibilitas dan masalah penugasan).
+Permission262=Memperluas akses ke semua pihak ketiga DAN objek mereka (tidak hanya pihak ketiga yang pengguna sebagai perwakilan penjualannya). <br> Tidak efektif untuk pengguna eksternal (selalu terbatas pada diri mereka sendiri untuk proposal, pesanan, faktur, kontrak, dll.). <br> Tidak efektif untuk proyek (hanya aturan tentang izin proyek, visibilitas, dan masalah penugasan).
+Permission263=Memperluas akses ke semua pihak ketiga TANPA objek mereka (tidak hanya pihak ketiga yang pengguna sebagai perwakilan penjualannya). <br> Tidak efektif untuk pengguna eksternal (selalu terbatas pada diri mereka sendiri untuk proposal, pesanan, faktur, kontrak, dll.). <br> Tidak efektif untuk proyek (hanya aturan tentang izin proyek, visibilitas, dan masalah penugasan).
 Permission271=Baca CA
 Permission272=Membaca Nota
 Permission273=Mengeluarkan Nota
@@ -1175,7 +1184,8 @@ SetupDescription2=Dua bagian berikut ini wajib (dua entri pertama dalam menu Pen
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Parameter dasar yang digunakan untuk menyesuaikan perilaku default aplikasi Anda (mis. untuk fitur terkait negara).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Perangkat lunak ini adalah serangkaian banyak modul / aplikasi. Modul yang terkait dengan kebutuhan Anda harus diaktifkan dan dikonfigurasi. Entri menu akan muncul dengan aktivasi modul-modul ini.
 SetupDescription5=Entri menu Pengaturan lainnya mengatur parameter opsional.
-LogEvents=Perihal audit keamanan
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=Tentang Dolibarr
 InfoBrowser=Tentang Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Menjalankan proses pemutakhiran tampaknya dipe
 YouMustRunCommandFromCommandLineAfterLoginToUser=Anda harus menjalankan perintah ini dari baris perintah setelah masuk ke shell dengan pengguna <b>%s</b> atau Anda harus menambahkan opsi -W di akhir baris perintah untuk memberikan kata kunci <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Fungsi SSL tidak tersedia di PHP Anda
 DownloadMoreSkins=Lebih banyak skin untuk diunduh
-SimpleNumRefModelDesc=Mengembalikan nomor referensi dengan format %syymm-nnnn di mana yy adalah tahun, mm adalah bulan dan nnnn berurutan tanpa reset
+SimpleNumRefModelDesc=Mengembalikan nomor referensi dalam format %syymm-nnnn di mana yy adalah tahun, mm adalah bulan dan nnnn adalah nomor auto-incrementing berurutan tanpa reset
 ShowProfIdInAddress=Tampilkan id profesional dengan alamat
 ShowVATIntaInAddress=Sembunyikan nomor PPN intra-Komunitas dengan alamat
 TranslationUncomplete=Terjemahan sebagian
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Server proxy: Nama / Alamat
 MAIN_PROXY_PORT=Server proxy: Port
 MAIN_PROXY_USER=Server proxy: Login / Pengguna
 MAIN_PROXY_PASS=Server proxy: Kata sandi
-DefineHereComplementaryAttributes=Tetapkan di sini atribut tambahan / khusus yang ingin Anda sertakan untuk: %s
+DefineHereComplementaryAttributes=Tentukan atribut tambahan / khusus yang harus ditambahkan ke: %s
 ExtraFields=Atribut pelengkap
 ExtraFieldsLines=Atribut pelengkap (garis)
 ExtraFieldsLinesRec=Atribut pelengkap (templat garis faktur)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Contoh: uid
 LDAPFilterConnection=Filter pencarian
 LDAPFilterConnectionExample=Contoh: & (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Contoh: & (objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, direktori directed)
 LDAPFieldLoginSambaExample=Contoh: samaccountname
 LDAPFieldFullname=Nama lengkap
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Perusahaan Anda telah ditetapkan untuk tidak menggunaka
 AccountancyCode=Kode Akuntansi
 AccountancyCodeSell=Akun penjualan. kode
 AccountancyCodeBuy=Beli akun. kode
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Kosongkan kotak centang "Buat pembayaran secara otomatis" secara default saat membuat pajak baru
 ##### Agenda #####
 AgendaSetup=Pengaturan modul agenda dan agenda
 PasswordTogetVCalExport=Kunci untuk mengotorisasi tautan ekspor
+SecurityKey = Security Key
 PastDelayVCalExport=Jangan ekspor agenda yang lebih lama dari
 AGENDA_USE_EVENT_TYPE=Gunakan jenis agenda (dikelola dalam Pengaturan menu -> Kamus -> Jenis agenda agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Secara otomatis mengatur nilai default ini untuk jenis agenda di agenda buat formulir
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Warna latar untuk garis tabel ganjil
 BackgroundTableLineEvenColor=Warna latar belakang untuk garis tabel genap
 MinimumNoticePeriod=Periode pemberitahuan minimum (Permintaan cuti Anda harus dilakukan sebelum penundaan ini)
 NbAddedAutomatically=Jumlah hari yang ditambahkan ke penghitung pengguna (secara otomatis) setiap bulan
-EnterAnyCode=Baris ini berisi referensi untuk mengidentifikasi baris. Masukkan nilai apa pun pilihan Anda, tetapi tanpa karakter khusus.
+EnterAnyCode=Bidang ini berisi referensi untuk mengidentifikasi garis. Masukkan nilai apa pun pilihan Anda, tetapi tanpa karakter khusus.
 Enter0or1=Masukkan 0 atau 1
 UnicodeCurrency=Masukkan di sini di antara kurung kurawal, daftar nomor byte yang mewakili simbol mata uang. Misalnya: untuk $, masukkan [36] - untuk brazil real R $ [82,36] - untuk €, masukkan [8364]
 ColorFormat=Warna RGB dalam format HEX, mis .: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Margin bawah pada PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Tinggi untuk logo di PDF
 NothingToSetup=Tidak diperlukan pengaturan khusus untuk modul ini.
 SetToYesIfGroupIsComputationOfOtherGroups=Setel ini menjadi ya jika grup ini merupakan perhitungan grup lain
-EnterCalculationRuleIfPreviousFieldIsYes=Masukkan aturan kalkulasi jika baris sebelumnya disetel ke Ya (Misalnya 'CODEGRP1 + CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Beberapa varian bahasa ditemukan
 RemoveSpecialChars=Hapus karakter khusus
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter untuk membersihkan nilai (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Pengaturan modul Jejaring Sosial
 EnableFeatureFor=Aktifkan fitur untuk<strong>%s </strong>
 VATIsUsedIsOff=Catatan: Opsi untuk menggunakan Pajak Penjualan atau PPN telah ditetapkan ke<strong>Off </strong> dalam menu %s - %s, jadi pajak penjualan atau PPN yang digunakan akan selalu 0 untuk penjualan.
 SwapSenderAndRecipientOnPDF=Tukar posisi pengirim dan alamat penerima pada dokumen PDF
-FeatureSupportedOnTextFieldsOnly=Peringatan, fitur yang didukung hanya pada baris teks. Juga parameter URL action = buat atau action = edit harus diatur ATAU nama halaman harus diakhiri dengan 'new.php' untuk memicu fitur ini.
+FeatureSupportedOnTextFieldsOnly=Peringatan, fitur hanya didukung pada bidang teks dan daftar kombo. Juga parameter URL action = create atau action = edit harus disetel ATAU nama halaman harus diakhiri dengan 'new.php' untuk memicu fitur ini.
 EmailCollector=Kolektor email
 EmailCollectorDescription=Tambahkan pekerjaan terjadwal dan halaman pengaturan untuk memindai secara teratur kotak email (menggunakan protokol IMAP) dan merekam email yang diterima ke dalam aplikasi Anda, di tempat yang tepat dan / atau membuat beberapa catatan secara otomatis (seperti lead).
 NewEmailCollector=Kolektor Email Baru
@@ -2049,8 +2062,11 @@ UseDebugBar=Gunakan bilah debug
 DEBUGBAR_LOGS_LINES_NUMBER=Jumlah baris log terakhir untuk disimpan di konsol
 WarningValueHigherSlowsDramaticalyOutput=Peringatan, nilai yang lebih tinggi memperlambat output yang dramatis
 ModuleActivated=Modul %s diaktifkan dan memperlambat antarmuka
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Jika Anda berada di lingkungan produksi, Anda harus menyetel properti ini ke %s.
 AntivirusEnabledOnUpload=Antivirus diaktifkan pada file yang diunggah
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Model ekspor dibagi dengan semua orang
 ExportSetup=Pengaturan ekspor modul
 ImportSetup=Pengaturan impor modul
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Buat Ping anonim '+1' ke server fondasi Dolibarr (dilakukan 1
 FeatureNotAvailableWithReceptionModule=Fitur tidak tersedia ketika Penerimaan modul diaktifkan
 EmailTemplate=Template untuk email
 EMailsWillHaveMessageID=Email akan memiliki tag 'Referensi' yang cocok dengan sintaks ini
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Jika Anda ingin agar beberapa teks dalam PDF Anda digandakan dalam 2 bahasa berbeda dalam PDF yang dihasilkan sama, Anda harus mengatur di sini bahasa kedua ini sehingga PDF yang dihasilkan akan berisi 2 bahasa berbeda di halaman yang sama, yang dipilih saat membuat PDF dan yang ini ( hanya beberapa templat PDF yang mendukung ini). Biarkan kosong untuk 1 bahasa per PDF.
 FafaIconSocialNetworksDesc=Masukkan di sini kode ikon FontAwesome. Jika Anda tidak tahu apa itu FontAwesome, Anda dapat menggunakan fa-address-book nilai umum.
 FeatureNotAvailableWithReceptionModule=Fitur tidak tersedia ketika Penerimaan modul diaktifkan
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Direkomendasikan untuk mengganti nilai ini ke %s un
 DictionaryProductNature= Sifat produk
 CountryIfSpecificToOneCountry=Negara (jika khusus untuk negara tertentu)
 YouMayFindSecurityAdviceHere=Anda mungkin menemukan nasihat keamanan di sini
-ModuleActivatedMayExposeInformation=Modul ini dapat mengekspos data sensitif. Jika Anda tidak membutuhkannya, nonaktifkan.
+ModuleActivatedMayExposeInformation=Ekstensi PHP ini dapat mengekspos data sensitif. Jika Anda tidak membutuhkannya, nonaktifkan.
 ModuleActivatedDoNotUseInProduction=Modul yang dirancang untuk pengembangan telah diaktifkan. Jangan mengaktifkannya di lingkungan produksi.
 CombinationsSeparator=Karakter pemisah untuk kombinasi produk
 SeeLinkToOnlineDocumentation=Lihat tautan ke dokumenter online di menu atas untuk mengetahui contohnya
 SHOW_SUBPRODUCT_REF_IN_PDF=Jika fitur "%s" modul <b> %s </b> digunakan, tampilkan detail subproduk kit di PDF.
 AskThisIDToYourBank=Hubungi bank Anda untuk mendapatkan ID ini
+AdvancedModeOnly=Izin hanya tersedia dalam mode izin Lanjutan
+ConfFileIsReadableOrWritableByAnyUsers=File conf dapat dibaca atau ditulis oleh semua pengguna. Berikan izin kepada pengguna dan grup server web saja.
+MailToSendEventOrganization=Organisasi Acara
+AGENDA_EVENT_DEFAULT_STATUS=Status acara default saat membuat acara dari formulir
+YouShouldDisablePHPFunctions=Anda harus menonaktifkan fungsi PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index e3bcae405c6..069d27df0b4 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -4,7 +4,7 @@ Actions=Perihal
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agenda
-LocalAgenda=Kalender internal
+LocalAgenda=Kalender default
 ActionsOwnedBy=Perihal yang dimiliki oleh
 ActionsOwnedByShort=Pemilik
 AffectedTo=Ditugaskan untuk
@@ -14,13 +14,13 @@ EventsNb=Jumlah kejadian
 ListOfActions=Daftar kejadian
 EventReports=Laporan agenda
 Location=Tempat
-ToUserOfGroup=Agenda yang ditugaskan untuk setiap pengguna dalam grup
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Perihal di sepanjang hari (s)
 MenuToDoActions=Semua peristiwa yang tidak lengkap
 MenuDoneActions=Semua agenda dihentikan
 MenuToDoMyActions=Perihal lengkap saya
 MenuDoneMyActions=Perihal saya dihentikan
-ListOfEvents=Daftar agenda (kalender internal)
+ListOfEvents=Daftar acara (kalender default)
 ActionsAskedBy=Perihal yang dilaporkan oleh
 ActionsToDoBy=Perihal ditugaskan untuk
 ActionsDoneBy=Perihal yang dilakukan oleh
@@ -119,6 +119,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO diatur ke konsep status
 MRP_MO_PRODUCEDInDolibarr=MO diproduksi
 MRP_MO_DELETEInDolibarr=MO dihapus
 MRP_MO_CANCELInDolibarr=MO dibatalkan
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Templat dokumen untuk agenda
 DateActionStart=Tanggal mulai
@@ -130,7 +131,7 @@ AgendaUrlOptions4=<b>logint = %s</b>untuk membatasi output ke tindakan yang dite
 AgendaUrlOptionsProject=<b>project = __ PROJECT_ID__</b>untuk membatasi output ke tindakan yang terkait dengan proyek<b>__PROJECT_ID__ </b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b>untuk mengecualikan agenda otomatis.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays = 1</b>untuk memasukkan agenda liburan.
-AgendaShowBirthdayEvents=Tampilkan ulang tahun kontak
+AgendaShowBirthdayEvents=Ulang tahun kontak
 AgendaHideBirthdayEvents=Sembunyikan ulang tahun kontak
 Busy=Sibuk
 ExportDataset_event1=Daftar agenda agenda
@@ -152,6 +153,7 @@ ActionType=Jenis agenda
 DateActionBegin=Mulai tanggal agenda
 ConfirmCloneEvent=Apakah Anda yakin ingin mengkloning agenda<b>%s </b>?
 RepeatEvent=Ulangi agenda
+OnceOnly=Once only
 EveryWeek=Setiap minggu
 EveryMonth=Setiap bulan
 DayOfMonth=Hari dalam sebulan
@@ -165,4 +167,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index d7bdb21cbd5..cdb2c57e5cf 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Mandat SEPA Anda
 FindYourSEPAMandate=Ini adalah mandat SEPA Anda untuk mengotorisasi perusahaan kami untuk melakukan pemesanan debit langsung ke bank Anda. Kembalikan ditandatangani (pindai dokumen yang ditandatangani) atau kirimkan melalui pos ke
 AutoReportLastAccountStatement=Isi kolom 'nomor rekening bank' secara otomatis dengan nomor pernyataan terakhir saat melakukan rekonsiliasi
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Warnai gerakan
 BankColorizeMovementDesc=Jika fungsi ini diaktifkan, Anda dapat memilih warna latar belakang spesifik untuk gerakan debit atau kredit
 BankColorizeMovementName1=Warna latar belakang untuk pergerakan debit
 BankColorizeMovementName2=Warna latar belakang untuk pergerakan kredit
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 7107c90a497..69108eb724c 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -52,11 +52,12 @@ Invoices=Tagihan - tagihan
 InvoiceLine=Baris tagihan
 InvoiceCustomer=Tagihan pelanggan
 CustomerInvoice=Tagihan pelanggan
-CustomersInvoices=Semua tagihan pelanggan
+CustomersInvoices=Customer invoices
 SupplierInvoice=Faktur vendor
-SuppliersInvoices=Faktur vendor
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Faktur vendor
-SupplierBills=semua tagihan untuk semua pemasok / supplier
+SupplierBills=Vendor invoices
 Payment=Pembayaran
 PaymentBack=Pengembalian dana
 CustomerInvoicePaymentBack=Pengembalian dana
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Pembayaran - pembayaran yang sudah selesai
 PaymentsBackAlreadyDone=Pengembalian dana sudah dilakukan
 PaymentRule=Aturan pembayaran
 PaymentMode=Tipe pembayaran
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Kartu Debit / Kredit
 PaymentTypePP=PayPal
 IdPaymentMode=Jenis Pembayaran (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Tanggal generasi terbaru
 DateLastGenerationShort=Tanggal gen terbaru.
 MaxPeriodNumber=Maks. jumlah pembuatan faktur
 NbOfGenerationDone=Jumlah pembuatan faktur sudah dilakukan
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Jumlah generasi yang dilakukan
 MaxGenerationReached=Jumlah generasi maksimum yang dicapai
 InvoiceAutoValidate=Validasi faktur secara otomatis
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Dalam 14 hari setelah akhir bulan
 FixAmount=Jumlah tetap - 1 baris dengan label '%s'
 VarAmount=Jumlah variabel (%% tot.)
 VarAmountOneLine=Jumlah variabel (%% tot.) - 1 baris dengan label '%s'
-VarAmountAllLines=Jumlah variabel (%% tot.) - semua baris yang sama
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=transfer Bank
 PaymentTypeShortVIR=transfer Bank
@@ -494,12 +498,16 @@ Cash=Tunai
 Reported=Terlambat
 DisabledBecausePayments=Tidak mungkin karena ada beberapa pembayaran
 CantRemovePaymentWithOneInvoicePaid=Tidak dapat menghapus pembayaran karena setidaknya ada satu faktur yang diklasifikasikan dibayar
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Pembayaran yang diharapkan
 CantRemoveConciliatedPayment=Tidak dapat menghapus pembayaran yang direkonsiliasi
 PayedByThisPayment=Dibayar dengan pembayaran ini
 ClosePaidInvoicesAutomatically=Klasifikasi secara otomatis semua standar, uang muka atau faktur pengganti sebagai "Dibayar" ketika pembayaran dilakukan seluruhnya.
 ClosePaidCreditNotesAutomatically=Klasifikasi secara otomatis semua catatan kredit sebagai "Dibayar" ketika pengembalian dana dilakukan seluruhnya.
 ClosePaidContributionsAutomatically=Klasifikasi secara otomatis semua kontribusi sosial atau fiskal sebagai "Dibayar" ketika pembayaran dilakukan seluruhnya.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Semua faktur tanpa sisa pembayaran akan ditutup secara otomatis dengan status "Dibayar".
 ToMakePayment=Membayar
 ToMakePaymentBack=Membalas
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Anda harus membuat faktur standar terlebih
 PDFCrabeDescription=Faktur templat PDF faktur Templat faktur lengkap (penerapan lama templat Sponge)
 PDFSpongeDescription=Faktur Templat PDF Faktur. Templat faktur lengkap
 PDFCrevetteDescription=Crevette templat PDF faktur. Templat faktur lengkap untuk faktur situasi
-TerreNumRefModelDesc1=Kembalikan angka dengan format %syymm-nnnn untuk faktur standar dan %syymm-nnnn untuk nota kredit di mana yy adalah tahun, mm adalah bulan dan nnnn adalah urutan tanpa istirahat dan tanpa pengembalian ke 0
-MarsNumRefModelDesc1=Membalikkan angka dengan format %syymm-nnnn untuk faktur standar, %syymm-nnnn untuk faktur pengganti, %syymm-nnnn untuk faktur uang muka dan %syymm-nnnn untuk nota kredit dimana yy adalah tahun, mm adalah bulan dan nnnn adalah urutan tanpa jeda dan tanpa balik kembali ke 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Tagihan yang dimulai dengan $ syymm sudah ada dan tidak kompatibel dengan model urutan ini. Hapus atau ubah nama untuk mengaktifkan modul ini.
-CactusNumRefModelDesc1=Kembalikan nomor dengan format %syymm-nnnn untuk faktur standar, %syymm-nnnn untuk nota kredit dan %syymm-nnnn untuk faktur uang muka di mana Anda berada di tahun, tidak ada bulan dan tidak ada bulan serta tidak ada bulan dan tidak ada bulan serta tidak ada bulan dan tidak ada bulan serta tidak ada bulan dan tidak ada kiriman.
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Alasan penutupan awal
 EarlyClosingComment=Catatan penutupan awal
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Kontak layanan vendor
 InvoiceFirstSituationAsk=Faktur situasi pertama
 InvoiceFirstSituationDesc=Faktur situasi<b></b> terkait dengan situasi yang terkait dengan perkembangan, misalnya perkembangan konstruksi. Setiap situasi terkait dengan faktur.
 InvoiceSituation=Faktur situasi
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Faktur mengikuti situasi
 InvoiceSituationDesc=Buat situasi baru setelah yang sudah ada
 SituationAmount=Jumlah faktur situasi (bersih)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Jika Anda perlu membuat faktur seperti itu sec
 DeleteRepeatableInvoice=Hapus faktur templat
 ConfirmDeleteRepeatableInvoice=Yakin ingin menghapus faktur templat?
 CreateOneBillByThird=Buat satu faktur per pihak ketiga (jika tidak, satu faktur per pesanan)
-BillCreated=tagihan %s dibuat
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status pembuatan dokumen
 DoNotGenerateDoc=Jangan menghasilkan file dokumen
 AutogenerateDoc=Menghasilkan file dokumen secara otomatis
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Faktur pemasok dihapus
 UnitPriceXQtyLessDiscount=Harga satuan x Jumlah - Diskon
 CustomersInvoicesArea=Area penagihan pelanggan
 SupplierInvoicesArea=Area penagihan pemasok
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
index 9ffe9c3402a..0106417ec18 100644
--- a/htdocs/langs/id_ID/boxes.lang
+++ b/htdocs/langs/id_ID/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Informasi Login
 BoxLastRssInfos=Informasi RSS
 BoxLastProducts=Produk / Layanan %s terbaru
@@ -17,9 +18,13 @@ BoxLastActions=Tindakan terbaru
 BoxLastContracts=Kontrak terbaru
 BoxLastContacts=Kontak / alamat terbaru
 BoxLastMembers=Anggota terbaru
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Intervensi terbaru
 BoxCurrentAccounts=Buka saldo akun
 BoxTitleMemberNextBirthdays=Ulang tahun bulan ini (anggota)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Berita %s terbaru dari %s
 BoxTitleLastProducts=Produk / Layanan: %s terakhir dimodifikasi
 BoxTitleProductsAlertStock=Produk: peringatan stok
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Pengiriman pelanggan %s terbaru
 NoRecordedShipments=Tidak ada pengiriman pelanggan yang direkam
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Akuntansi
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index d37a907add2..502485f4aca 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Area label/kategori Vendor
 CustomersCategoriesArea=Area label/kategori Pelanggan
 MembersCategoriesArea=Area label/kategori Anggota
 ContactsCategoriesArea=Area label/kategori Kontak
-AccountsCategoriesArea=Area label/kategori Akun
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Area label/kategori Proyek
 UsersCategoriesArea=Area label/kategori Pengguna
 SubCats=Sub-kategori
@@ -68,14 +68,14 @@ ThisCategoryHasNoItems=Kategori ini tidak mengandung barang apa pun.
 CategId=Label/id kategori
 ParentCategory=Parent tag/category
 ParentCategoryLabel=Label of parent tag/category
-CatSupList=List of vendors tags/categories
-CatCusList=List of customers/prospects tags/categories
+CatSupList=Daftar tag / kategori vendor
+CatCusList=Daftar tag / kategori pelanggan / prospek
 CatProdList=Daftar label/kategori produk
 CatMemberList=Daftar label/kategori anggota
 CatContactList=List of contacts tags/categories
 CatProjectsList=List of projects tags/categories
 CatUsersList=List of users tags/categories
-CatSupLinks=Links between vendors and tags/categories
+CatSupLinks=Tautan antara vendor dan tag / kategori
 CatCusLinks=Tautan antara pelanggan/prospek dan label/kategori
 CatContactsLinks=Tautan antara kontak/alamat dan label/kategori
 CatProdLinks=Tautan antara produk/layanan dan label/kategori
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Tampilkan label/kategori
 ByDefaultInList=Secara default dalam daftar
 ChooseCategory=Pilih Kategori
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Gunakan atau operator untuk kategori
diff --git a/htdocs/langs/id_ID/commercial.lang b/htdocs/langs/id_ID/commercial.lang
index 743517f4c85..816692c1453 100644
--- a/htdocs/langs/id_ID/commercial.lang
+++ b/htdocs/langs/id_ID/commercial.lang
@@ -64,10 +64,11 @@ ActionAC_SHIP=Kirim pengiriman melalui surat
 ActionAC_SUP_ORD=Kirim pesanan pembelian melalui surat
 ActionAC_SUP_INV=Kirim faktur vendor melalui surat
 ActionAC_OTH=Lainnya
-ActionAC_OTH_AUTO=Acara yang dimasukkan secara otomatis
+ActionAC_OTH_AUTO=Otomatis lainnya
 ActionAC_MANUAL=Acara yang dimasukkan secara manual
 ActionAC_AUTO=Acara yang dimasukkan secara otomatis
-ActionAC_OTH_AUTOShort=Mobil
+ActionAC_OTH_AUTOShort=Lainnya
+ActionAC_EVENTORGANIZATION=Event organization events
 Stats=Statistik penjualan
 StatusProsp=Status prospek
 DraftPropals=Menyusun proposal komersial
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 08b96e96903..adf0a9abd4a 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -43,9 +43,10 @@ Individual=Privasi individu
 ToCreateContactWithSameName=Secara otomatis akan membuat kontak/alamat dengan informasi yang sama dengan pihak ketiga di bawah pihak ketiga. Dalam kebanyakan kasus, bahkan jika pihak ketiga Anda adalah orang fisik, membuat pihak ketiga saja sudah cukup.
 ParentCompany=Perusahaan utama
 Subsidiaries=Entitas Anak
-ReportByMonth=Laporkan berdasarkan bulan
-ReportByCustomers=Laporkan oleh pelanggan
-ReportByQuarter=Laporkan berdasarkan kurs
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Kode peradaban
 RegisteredOffice=Kantor terdaftar
 Lastname=nama keluarga
@@ -136,7 +137,7 @@ ProfId1BE=Id Prof 1 (nomor profesional)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Nomor EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -148,7 +149,7 @@ ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Id Prof 1 (nomor Federal)
 ProfId4CH=Prof Id 2 (Nomor Catatan Komersial)
-ProfId5CH=EORI number
+ProfId5CH=Nomor EORI
 ProfId6CH=-
 ProfId1CL=Id Prof 1 (R.U.T.)
 ProfId2CL=-
@@ -166,20 +167,26 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=Nomor EORI
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Nomor jaminan sosial)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (nomor perguruan tinggi)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (nomor EORI)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, APE lama)
 ProfId4FR=Id Prof 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (nomor EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Nomor pendaftaran
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Indo. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Indo. prof. 2 (Izin usaha)
 ProfId3LU=-
@@ -225,13 +233,13 @@ ProfId1NL=Jumlah KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=Nomor EORI
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Nomor jaminan sosial)
 ProfId3PT=Prof Id 3 (Nomor Catatan Komersial)
 ProfId4PT=Prof Id 4 (Konservatori)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (nomor EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Matnmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -358,7 +366,7 @@ VATIntraCheckableOnEUSite=Periksa ID PPN intra-Komunitas di situs web Komisi Ero
 VATIntraManualCheck=Anda juga dapat memeriksa secara manual di situs web Komisi Eropa <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Periksa tidak mungkin. Layanan cek tidak disediakan oleh negara anggota (%s).
 NorProspectNorCustomer=Bukan prospek, bukan pelanggan
-JuridicalStatus=Business entity type
+JuridicalStatus=Jenis entitas bisnis
 Workforce=Workforce
 Staff=karyawan
 ProspectLevelShort=Potensi
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Tagihan terutang saat ini
 OutstandingBill=Maks. untuk tagihan luar biasa
 OutstandingBillReached=Maks. untuk tagihan luar biasa tercapai
 OrderMinAmount=Jumlah minimum untuk pesanan
-MonkeyNumRefModelDesc=Kembalikan nomor dengan format %syymm-nnnn untuk kode pelanggan dan %syymm-nnnn untuk kode vendor di mana yy adalah tahun, mm adalah bulan dan nnn adalah urutan tanpa istirahat dan tidak ada pengembalian ke 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Kode ini gratis. Kode ini dapat dimodifikasi kapan saja.
 ManagingDirectors=Nama manajer (CEO, direktur, presiden ...)
 MergeOriginThirdparty=Duplikat pihak ketiga (pihak ketiga yang ingin Anda hapus)
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 9e62c742f29..1d7b8a7b043 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=Pembelian SGST
 VATCollected=PPN dikumpulkan
 StatusToPay=Membayar
 SpecialExpensesArea=Area untuk semua pembayaran khusus
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Pajak sosial atau fiskal
 SocialContributions=Pajak sosial atau fiskal
 SocialContributionsDeductibles=Pajak sosial atau fiskal yang dapat dikurangkan
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Pembayaran faktur pelanggan
 PaymentSupplierInvoice=pembayaran faktur vendor
 PaymentSocialContribution=Pembayaran pajak sosial / fiskal
 PaymentVat=Pembayaran PPN
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Daftar pembayaran
 ListOfCustomerPayments=Daftar pembayaran pelanggan
 ListOfSupplierPayments=Daftar pembayaran vendor
@@ -104,6 +106,8 @@ LT2PaymentES=Pembayaran IRPF
 LT2PaymentsES=Pembayaran IRPF
 VATPayment=Pembayaran pajak penjualan
 VATPayments=Pembayaran pajak penjualan
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Pengembalian pajak penjualan
 NewVATPayment=Pembayaran pajak penjualan baru
 NewLocalTaxPayment=Pembayaran pajak %s baru
@@ -134,9 +138,17 @@ NoWaitingChecks=Tidak ada cek yang menunggu setoran.
 DateChequeReceived=Periksa tanggal penerimaan
 NbOfCheques=Jumlah cek
 PaySocialContribution=Membayar pajak sosial / fiskal
-ConfirmPaySocialContribution=Anda yakin ingin mengklasifikasikan pajak sosial atau fiskal ini sebagai yang dibayarkan?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Yakin ingin mengklasifikasikan pajak sosial atau fiskal ini sebagai dibayar?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Hapus pembayaran pajak sosial atau fiskal
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
 ConfirmDeleteSocialContribution=Anda yakin ingin menghapus pembayaran pajak sosial / fiskal ini?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Pajak dan pembayaran sosial dan fiskal
 CalcModeVATDebt=Mode<b>%sVAT pada komitmen akuning%s </b>.
 CalcModeVATEngagement=Mode<b>%sVAT pada pendapatan-pengeluaran%s </b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- Ini termasuk pembayaran nyata yang dilakukan pada faktur, bia
 RulesCADue=- Ini termasuk tagihan pelanggan apakah mereka dibayar atau tidak. <br> - Ini didasarkan pada tanggal penagihan faktur ini. <br>
 RulesCAIn=- Ini termasuk semua pembayaran faktur yang diterima dari pelanggan. <br> - Ini didasarkan pada tanggal pembayaran faktur ini <br>
 RulesCATotalSaleJournal=Ini mencakup semua jalur kredit dari jurnal Sale.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Ini termasuk catatan dalam Buku Besar Anda dengan akun akuntansi yang memiliki grup "EXPENSE" atau "INCOME"
 RulesResultBookkeepingPredefined=Ini termasuk catatan dalam Buku Besar Anda dengan akun akuntansi yang memiliki grup "EXPENSE" atau "INCOME"
 RulesResultBookkeepingPersonalized=Ini menunjukkan catatan dalam Buku Besar Anda dengan akun akuntansi<b>yang dikelompokkan berdasarkan grup yang dipersonalisasi </b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Laporan pajak penjualan oleh pihak ketiga
 VATReportByCustomers=Laporan pajak penjualan oleh pelanggan
 VATReportByCustomersInInputOutputMode=Laporan oleh pelanggan PPN dikumpulkan dan dibayar
 VATReportByQuartersInInputOutputMode=Laporkan tarif pajak Penjualan menurut pajak yang dikumpulkan dan dibayarkan
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Laporkan pajak 2 dengan tarif
 LT2ReportByQuarters=Laporkan pajak 3 dengan tarif
 LT1ReportByQuartersES=Laporkan dengan kurs RE
@@ -217,7 +231,7 @@ Pcg_subtype=Subtipe Pcg
 InvoiceLinesToDispatch=Jalur faktur untuk dikirim
 ByProductsAndServices=Berdasarkan produk dan layanan
 RefExt=Ref eksternal
-ToCreateAPredefinedInvoice=Untuk membuat faktur templat, buat faktur standar, lalu, tanpa memvalidasinya, klik tombol "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Tautan ke pesanan
 Mode1=Metode 1
 Mode2=Metode 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Akun akuntansi khusus yang ditentukan pada kart
 ACCOUNTING_ACCOUNT_SUPPLIER=Akun akuntansi digunakan untuk pihak ketiga vendor
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Akun akuntansi khusus yang ditentukan pada kartu pihak ketiga akan digunakan hanya untuk akuntansi Subledger. Yang ini akan digunakan untuk Buku Besar Umum dan sebagai nilai default akuntansi Subledger jika akun akuntansi vendor khusus pada pihak ketiga tidak didefinisikan.
 ConfirmCloneTax=Konfirmasikan klon pajak sosial / fiskal
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Mengkloningnya untuk bulan depan
 SimpleReport=Laporan sederhana
 AddExtraReport=Laporan tambahan (tambahkan laporan pelanggan asing dan nasional)
@@ -253,7 +269,8 @@ AccountingAffectation=Penugasan akuntansi
 LastDayTaxIsRelatedTo=Hari terakhir periode pajak terkait dengan
 VATDue=Pajak penjualan diklaim
 ClaimedForThisPeriod=Diklaim untuk periode tersebut
-PaidDuringThisPeriod=Dibayar selama periode ini
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=Dengan tarif pajak penjualan
 TurnoverbyVatrate=Omzet ditagih oleh tarif pajak penjualan
 TurnoverCollectedbyVatrate=Omset dikumpulkan oleh tarif pajak penjualan
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Turnover pembelian dikumpulkan
 RulesPurchaseTurnoverDue=- Ini termasuk faktur jatuh tempo pemasok apakah mereka dibayar atau tidak. <br> - Ini didasarkan pada tanggal faktur faktur ini. <br>
 RulesPurchaseTurnoverIn=- Ini mencakup semua pembayaran faktur yang dilakukan kepada pemasok secara efektif. <br> - Ini didasarkan pada tanggal pembayaran faktur ini <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Ini mencakup semua saluran debit dari jurnal pembelian.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Beli turnover yang ditagih
 ReportPurchaseTurnoverCollected=Turnover pembelian dikumpulkan
 IncludeVarpaysInResults = Sertakan berbagai pembayaran dalam laporan
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 226c36001ea..5b2df4ba2b8 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -7,8 +7,8 @@ Permission23103 = Hapus pekerjaan terjadwal
 Permission23104 = Jalankan pekerjaan yang Dijadwalkan
 # Admin
 CronSetup=Penyiapan manajemen pekerjaan terjadwal
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
-OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
+URLToLaunchCronJobs=URL untuk memeriksa dan meluncurkan tugas cron yang memenuhi syarat dari browser
+OrToLaunchASpecificJob=Atau untuk memeriksa dan meluncurkan pekerjaan tertentu dari browser
 KeyForCronAccess=Kunci keamanan untuk URL untuk meluncurkan pekerjaan cron
 FileToLaunchCronJobs=Baris perintah untuk memeriksa dan meluncurkan pekerjaan cron yang berkualitas
 CronExplainHowToRunUnix=Pada lingkungan Unix Anda harus menggunakan entri crontab berikut untuk menjalankan baris perintah setiap 5 menit
@@ -58,7 +58,7 @@ CronNote=Komentar
 CronFieldMandatory=Bidang %s wajib diisi
 CronErrEndDateStartDt=Tanggal akhir tidak boleh sebelum tanggal mulai
 StatusAtInstall=Status pada pemasangan modul
-CronStatusActiveBtn=Schedule
+CronStatusActiveBtn=Susunan acara
 CronStatusInactiveBtn=Nonaktifkan
 CronTaskInactive=Pekerjaan ini dinonaktifkan
 CronId=Indo
diff --git a/htdocs/langs/id_ID/dict.lang b/htdocs/langs/id_ID/dict.lang
index 041ea709e95..898b5877893 100644
--- a/htdocs/langs/id_ID/dict.lang
+++ b/htdocs/langs/id_ID/dict.lang
@@ -21,7 +21,7 @@ CountryNL=Belanda
 CountryHU=Hungaria
 CountryRU=Rusia
 CountrySE=Swedia
-CountryCI=Pantai Ivoiry
+CountryCI=pantai Gading
 CountrySN=Senegal
 CountryAR=Argentina
 CountryCM=Kamerun
diff --git a/htdocs/langs/id_ID/ecm.lang b/htdocs/langs/id_ID/ecm.lang
index 3702ead5f33..22be2855e7b 100644
--- a/htdocs/langs/id_ID/ecm.lang
+++ b/htdocs/langs/id_ID/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File belum diindeks ke dalam basis data (coba unggah
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 73af84cd831..17842a411a5 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -8,7 +8,7 @@ ErrorBadEMail=Email %s salah
 ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s salah
 ErrorBadValueForParamNotAString=Nilai buruk untuk parameter Anda. Biasanya ditambahkan ketika terjemahan tidak ada.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=Referensi <b> %s </b> sudah ada.
 ErrorLoginAlreadyExists=Login %s sudah ada.
 ErrorGroupAlreadyExists=Grup %s sudah ada.
 ErrorRecordNotFound=Rekaman tidak ditemukan.
@@ -59,6 +59,7 @@ ErrorDirNotFound=Direktori<b>%s</b>tidak ditemukan (Jalur salah, izin salah, ata
 ErrorFunctionNotAvailableInPHP=Fungsi<b>%s</b>diperlukan untuk fitur ini tetapi tidak tersedia dalam versi / pengaturan PHP ini.
 ErrorDirAlreadyExists=Direktori dengan nama ini sudah ada.
 ErrorFileAlreadyExists=File dengan nama ini sudah ada.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File tidak diterima sepenuhnya oleh server.
 ErrorNoTmpDir=Directy directy %s tidak ada.
 ErrorUploadBlockedByAddon=Unggah diblokir oleh plugin PHP / Apache.
@@ -78,7 +79,7 @@ ErrorExportDuplicateProfil=Nama profil ini sudah ada untuk set ekspor ini.
 ErrorLDAPSetupNotComplete=Pencocokan Dolibarr-LDAP tidak lengkap.
 ErrorLDAPMakeManualTest=File .ldif telah dibuat di direktori %s. Cobalah memuatnya secara manual dari baris perintah untuk mendapatkan informasi lebih lanjut tentang kesalahan.
 ErrorCantSaveADoneUserWithZeroPercentage=Tidak dapat menyimpan tindakan dengan "status tidak dimulai" jika bidang "dilakukan oleh" juga diisi.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=Referensi <b> %s </b> sudah ada.
 ErrorPleaseTypeBankTransactionReportName=Masukkan nama laporan bank tempat entri harus dilaporkan (Format YYYYMM atau YYYYMMDD)
 ErrorRecordHasChildren=Gagal menghapus catatan karena memiliki beberapa catatan anak.
 ErrorRecordHasAtLeastOneChildOfType=Objek memiliki setidaknya satu anak tipe %s
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Kesalahan saat memuat bagan akun. Jika beberapa akun tidak
 ErrorBadSyntaxForParamKeyForContent=Sintaks buruk untuk parameter keyforcontent Harus memiliki nilai yang dimulai dengan %s atau %s
 ErrorVariableKeyForContentMustBeSet=Kesalahan, konstanta dengan nama %s (dengan konten teks untuk ditampilkan) atau %s (dengan url eksternal untuk ditampilkan) harus disetel.
 ErrorURLMustStartWithHttp=URL %s harus dimulai dengan http: // atau https: //
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Kesalahan, referensi baru sudah digunakan
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Kesalahan, menghapus pembayaran yang ditautkan ke faktur tertutup tidak dimungkinkan.
 ErrorSearchCriteriaTooSmall=Kriteria pencarian terlalu kecil.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parameter PHP Anda upload_max_filesize (%s) lebih tinggi dari parameter PHP post_max_size (%s). Ini bukan pengaturan yang konsisten.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/id_ID/externalsite.lang b/htdocs/langs/id_ID/externalsite.lang
index b01b1beeb95..8834275846a 100644
--- a/htdocs/langs/id_ID/externalsite.lang
+++ b/htdocs/langs/id_ID/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Atur tautan ke situs web eksternal
-ExternalSiteURL=URL Situs Eksternal
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modul ExternalSite tidak dikonfigurasi dengan benar.
 ExampleMyMenuEntry=Entri menu saya
diff --git a/htdocs/langs/id_ID/ftp.lang b/htdocs/langs/id_ID/ftp.lang
index f55fc1107e8..97fdf0fefce 100644
--- a/htdocs/langs/id_ID/ftp.lang
+++ b/htdocs/langs/id_ID/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Penyiapan modul Klien FTP
-NewFTPClient=Pengaturan koneksi FTP baru
-FTPArea=Area FTP
-FTPAreaDesc=Layar ini menunjukkan tampilan server FTP.
-SetupOfFTPClientModuleNotComplete=Pengaturan modul klien FTP tampaknya tidak lengkap
-FTPFeatureNotSupportedByYourPHP=PHP Anda tidak mendukung fungsi FTP
-FailedToConnectToFTPServer=Gagal terhubung ke server FTP (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Gagal masuk ke server FTP dengan login / kata sandi yang ditentukan
+FTPClientSetup=Penyiapan modul Klien FTP atau SFTP
+NewFTPClient=Pengaturan koneksi FTP / FTPS baru
+FTPArea=Area FTP / FTPS
+FTPAreaDesc=Layar ini menunjukkan tampilan server FTP dan SFTP.
+SetupOfFTPClientModuleNotComplete=Penyiapan modul klien FTP atau SFTP tampaknya tidak lengkap
+FTPFeatureNotSupportedByYourPHP=PHP Anda tidak mendukung fungsi FTP atau SFTP
+FailedToConnectToFTPServer=Gagal terhubung ke server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Gagal masuk ke server dengan login / kata sandi yang ditentukan
 FTPFailedToRemoveFile=Gagal menghapus file<b>%s </b>.
 FTPFailedToRemoveDir=Gagal menghapus direktori<b>%s </b>: periksa izin dan direktori tersebut kosong.
 FTPPassiveMode=Mode pasif
-ChooseAFTPEntryIntoMenu=Pilih situs FTP dari menu ...
+ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
 FailedToGetFile=Gagal mendapatkan file %s
diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang
index 8d92bbbc9c4..2032b5791b0 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -13,7 +13,7 @@ ToReviewCP=Menunggu persetujuan
 ApprovedCP=Disetujui
 CancelCP=Dibatalkan
 RefuseCP=Ditolak
-ValidatorCP=Penyetuju
+ValidatorCP=Pemberi persetujuan
 ListeCP=Daftar cuti
 Leave=Permintaan cuti pergi
 LeaveId=Tinggalkan ID
@@ -39,11 +39,11 @@ TitreRequestCP=Tinggalkan permintaan
 TypeOfLeaveId=Jenis ID cuti
 TypeOfLeaveCode=Jenis kode cuti
 TypeOfLeaveLabel=Jenis label cuti
-NbUseDaysCP=Jumlah hari liburan yang dikonsumsi
-NbUseDaysCPHelp=Perhitungan memperhitungkan hari yang tidak bekerja dan hari libur yang ditentukan dalam kamus.
-NbUseDaysCPShort=Hari dikonsumsi
-NbUseDaysCPShortInMonth=Hari dikonsumsi dalam sebulan
-DayIsANonWorkingDay=%s adalah hari yang tidak bekerja
+NbUseDaysCP=Jumlah hari cuti digunakan
+NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days of leave
+NbUseDaysCPShortInMonth=Days of leave in month
+DayIsANonWorkingDay=%s is a non-working day
 DateStartInMonth=Tanggal mulai di bulan
 DateEndInMonth=Tanggal akhir dalam sebulan
 EditCP=Edit
@@ -80,14 +80,14 @@ UserCP=Pengguna
 ErrorAddEventToUserCP=Terjadi kesalahan saat menambahkan cuti luar biasa.
 AddEventToUserOkCP=Penambahan cuti luar biasa telah selesai.
 MenuLogCP=Lihat perubahan log
-LogCP=Log pembaruan hari liburan yang tersedia
-ActionByCP=Dilakukan oleh
-UserUpdateCP=Untuk pengguna
+LogCP=Log dari semua pembaruan yang dibuat untuk "Saldo Cuti"
+ActionByCP=diperbaharui oleh
+UserUpdateCP=Diperbarui untuk
 PrevSoldeCP=Saldo sebelumnya
 NewSoldeCP=Keseimbangan baru
 alreadyCPexist=Permintaan cuti telah dilakukan pada periode ini.
-FirstDayOfHoliday=Hari pertama liburan
-LastDayOfHoliday=Hari libur terakhir
+FirstDayOfHoliday=Hari awal permintaan cuti
+LastDayOfHoliday=Permintaan cuti hari terakhir
 BoxTitleLastLeaveRequests=Permintaan cuti yang dimodifikasi %s terbaru
 HolidaysMonthlyUpdate=Pembaruan bulanan
 ManualUpdate=Pembaruan manual
@@ -104,8 +104,8 @@ LEAVE_SICK=Cuti sakit
 LEAVE_OTHER=Cuti lainnya
 LEAVE_PAID_FR=Liburan berbayar
 ## Configuration du Module ##
-LastUpdateCP=Pembaruan otomatis terbaru dari alokasi cuti
-MonthOfLastMonthlyUpdate=Bulan pembaruan otomatis terbaru dari alokasi cuti
+LastUpdateCP=Pembaruan otomatis terakhir dari alokasi cuti
+MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
 UpdateConfCPOK=Berhasil diperbarui.
 Module27130Name= Manajemen permintaan cuti
 Module27130Desc= Manajemen permintaan cuti
@@ -125,8 +125,8 @@ HolidaysCanceledBody=Permintaan cuti Anda untuk %s ke %s telah dibatalkan.
 FollowedByACounter=1: Jenis cuti ini harus diikuti oleh penghitung. Penghitung bertambah secara manual atau otomatis dan ketika permintaan cuti divalidasi, penghitung dikurangi. <br> 0: Tidak diikuti oleh penghitung.
 NoLeaveWithCounterDefined=Tidak ada tipe cuti yang ditentukan yang perlu diikuti oleh penghitung
 GoIntoDictionaryHolidayTypes=Masuk ke<strong>Beranda - Setup - Kamus - Jenis cuti </strong> untuk mengatur berbagai jenis daun.
-HolidaySetup=Pengaturan modul Liburan
-HolidaysNumberingModules=Tinggalkan model penomoran permintaan
+HolidaySetup=Setup of module Leave
+HolidaysNumberingModules=Numbering models for leave requests
 TemplatePDFHolidays=Template untuk permintaan cuti PDF
 FreeLegalTextOnHolidays=Teks gratis di PDF
 WatermarkOnDraftHolidayCards=Tanda air pada permintaan cuti konsep
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index 6d4d3003efc..ed918cac7a5 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -127,12 +127,12 @@ NoEmailSentBadSenderOrRecipientEmail=Tidak ada email yang dikirim. Pengirim atau
 # Module Notifications
 Notifications=Notifikasi
 NotificationsAuto=Notifications Auto.
-NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
-ANotificationsWillBeSent=1 automatic notification will be sent by email
-SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
-AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+NoNotificationsWillBeSent=Tidak ada pemberitahuan email otomatis yang direncanakan untuk jenis acara dan perusahaan ini
+ANotificationsWillBeSent=1 notifikasi otomatis akan dikirim melalui email
+SomeNotificationsWillBeSent=%s notifikasi otomatis akan dikirim melalui email
+AddNewNotification=Berlangganan pemberitahuan email otomatis baru (target / acara)
+ListOfActiveNotifications=Buat daftar semua langganan aktif (target / acara) untuk pemberitahuan email otomatis
+ListOfNotificationsDone=Cantumkan semua pemberitahuan email otomatis yang dikirim
 MailSendSetupIs=Konfigurasi pengiriman email telah diatur ke '%s'. Mode ini tidak dapat digunakan untuk mengirim email masal.
 MailSendSetupIs2=Anda pertama-tama harus pergi, dengan akun admin, ke dalam menu %sHome - Setup - EMails%s untuk mengubah parameter<strong>'%s' </strong> untuk menggunakan mode ' %s'. Dengan mode ini, Anda dapat masuk ke pengaturan server SMTP yang disediakan oleh Penyedia Layanan Internet Anda dan menggunakan fitur kirim email dengan skala besar.
 MailSendSetupIs3=Jika Anda memiliki pertanyaan tentang cara mengatur server SMTP Anda, Anda dapat bertanya ke %s.
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 92771fd72b5..fd738bd65fa 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -30,7 +30,7 @@ NoTranslation=Tanpa terjemahan
 Translation=Terjemahan
 CurrentTimeZone=TimeZone PHP (Server)
 EmptySearchString=Masukkan kriteria pencarian yang tidak kosong
-EnterADateCriteria=Enter a date criteria
+EnterADateCriteria=Masukkan kriteria tanggal
 NoRecordFound=Tidak ada catatan yang ditemukan
 NoRecordDeleted=Tidak ada catatan yang dihapus
 NotEnoughDataYet=Tidak cukup data
@@ -87,8 +87,8 @@ FileWasNotUploaded=File dipilih untuk lampiran tetapi belum diunggah. Klik pada
 NbOfEntries=Jumlah entri
 GoToWikiHelpPage=Baca bantuan online (Diperlukan akses Internet)
 GoToHelpPage=Baca bantuan
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
-HomePage=Home Page
+DedicatedPageAvailable=Ada halaman bantuan khusus yang terkait dengan layar Anda saat ini
+HomePage=Halaman Beranda
 RecordSaved=Rekam disimpan
 RecordDeleted=Rekam dihapus
 RecordGenerated=Rekaman dihasilkan
@@ -159,7 +159,7 @@ RemoveLink=Hapus tautan
 AddToDraft=Tambahkan ke konsep
 Update=Membarui
 Close=Menutup
-CloseAs=Set status to
+CloseAs=Setel status ke
 CloseBox=Hapus widget dari dasbor Anda
 Confirm=Konfirmasi
 ConfirmSendCardByMail=Apakah Anda benar-benar ingin mengirim konten kartu ini melalui pos ke<b>%s </b>?
@@ -201,7 +201,7 @@ ReOpen=Buka kembali
 Upload=Unggah
 ToLink=Link
 Select=Pilih
-SelectAll=Select all
+SelectAll=Pilih Semua
 Choose=Memilih
 Resize=Ubah ukuran
 ResizeOrCrop=Ubah Ukuran atau Pangkas
@@ -224,7 +224,7 @@ Value=Nilai
 PersonalValue=Nilai pribadi
 NewObject=%s baru
 NewValue=Nilai baru
-OldValue=Old value %s
+OldValue=Nilai lama %s
 CurrentValue=Nilai sekarang
 Code=Kode
 Type=Tipe
@@ -263,7 +263,7 @@ Cards=Kartu-kartu
 Card=Kartu
 Now=Sekarang
 HourStart=Mulai jam
-Deadline=Deadline
+Deadline=Tenggat waktu
 Date=Tanggal
 DateAndHour=Tanggal dan jam
 DateToday=Tanggal hari ini
@@ -272,12 +272,13 @@ DateStart=Tanggal mulai
 DateEnd=Tanggal Akhir
 DateCreation=Tangga dibuat
 DateCreationShort=Creat. tanggal
-IPCreation=Creation IP
+IPCreation=IP Pembuatan
 DateModification=Tanggal modifikasi
 DateModificationShort=Modif. tanggal
-IPModification=Modification IP
+IPModification=Modifikasi IP
 DateLastModification=Tanggal modifikasi terbaru
 DateValidation=Tanggal validasi
+DateSigning=Signing date
 DateClosing=Tanggal Penutupan
 DateDue=Batas waktu
 DateValue=Tanggal nilai
@@ -329,7 +330,7 @@ Morning=Pagi
 Afternoon=Sore
 Quadri=Quadri
 MonthOfDay=Bulan dalam sehari
-DaysOfWeek=Days of week
+DaysOfWeek=Hari-hari dalam seminggu
 HourShort=H
 MinuteShort=M N
 Rate=Menilai
@@ -361,13 +362,13 @@ UnitPriceHTCurrency=Harga satuan (tidak termasuk) (mata uang)
 UnitPriceTTC=Patokan harga
 PriceU=NAIK.
 PriceUHT=NAIK. (bersih)
-PriceUHTCurrency=U.P (mata uang)
+PriceUHTCurrency=U.P (bersih) (mata uang)
 PriceUTTC=NAIK. (termasuk pajak)
 Amount=Jumlah
 AmountInvoice=Jumlah tagihan
 AmountInvoiced=Jumlah yang ditagih
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedHT=Jumlah yang ditagih (tidak termasuk pajak)
+AmountInvoicedTTC=Jumlah yang ditagih (termasuk pajak)
 AmountPayment=Jumlah pembayaran
 AmountHTShort=Jumlah (tidak termasuk)
 AmountTTCShort=Jumlah (termasuk pajak)
@@ -380,7 +381,7 @@ MulticurrencyPaymentAmount=Jumlah pembayaran, mata uang asli
 MulticurrencyAmountHT=Jumlah (tidak termasuk pajak), mata uang asli
 MulticurrencyAmountTTC=Jumlah (termasuk pajak), mata uang asli
 MulticurrencyAmountVAT=Pajak jumlah, mata uang asli
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Jumlah sub harga multi mata uang
 AmountLT1=Jumlah pajak 2
 AmountLT2=Jumlah pajak 3
 AmountLT1ES=Jumlah RE
@@ -389,6 +390,8 @@ AmountTotal=Jumlah total
 AmountAverage=Jumlah rata-rata
 PriceQtyMinHT=Kuantitas harga min. (tidak termasuk pajak)
 PriceQtyMinHTCurrency=Kuantitas harga min. (tidak termasuk pajak) (mata uang)
+PercentOfOriginalObject=Persen dari benda asli
+AmountOrPercent=Jumlah atau persen
 Percentage=Persentase
 Total=Total
 SubTotal=Subtotal
@@ -438,7 +441,7 @@ RemainToPay=Tetap membayar
 Module=Modul / Aplikasi
 Modules=Modul / Aplikasi
 Option=Pilihan
-Filters=Filters
+Filters=Filter
 List=Daftar
 FullList=Daftar lengkap
 FullConversation=Percakapan penuh
@@ -500,7 +503,7 @@ By=Oleh
 From=Dari
 FromDate=Dari
 FromLocation=Dari
-at=at
+at=di
 to=untuk
 To=untuk
 and=dan
@@ -523,7 +526,7 @@ Draft=Konsep
 Drafts=Draf
 StatusInterInvoiced=Faktur
 Validated=Divalidasi
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Divalidasi (Untuk memproduksi)
 Opened=Buka
 OpenAll=Buka semua)
 ClosedAll=Tertutup (Semua)
@@ -656,7 +659,7 @@ SupplierPreview=Pratinjau vendor
 ShowCustomerPreview=Tampilkan pratinjau pelanggan
 ShowSupplierPreview=Tampilkan pratinjau vendor
 RefCustomer=Ref. pelanggan
-InternalRef=Internal ref.
+InternalRef=Referensi internal
 Currency=Mata uang
 InfoAdmin=Informasi untuk administrator
 Undo=Membuka
@@ -671,14 +674,14 @@ Response=Tanggapan
 Priority=Prioritas
 SendByMail=Kirim melalui email
 MailSentBy=Email dikirim oleh
-NotSent=Not sent
+NotSent=Tidak terkirim
 TextUsedInTheMessageBody=Badan email
 SendAcknowledgementByMail=Kirim email konfirmasi
 SendMail=Mengirim email
 Email=Email
 NoEMail=Tidak ada email
 AlreadyRead=Sudah baca
-NotRead=Unread
+NotRead=Belum dibaca
 NoMobilePhone=Tidak ada ponsel
 Owner=Pemilik
 FollowingConstantsWillBeSubstituted=Konstanta berikut akan diganti dengan nilai yang sesuai.
@@ -705,7 +708,7 @@ Method=metode
 Receive=Menerima
 CompleteOrNoMoreReceptionExpected=Lengkap atau tidak ada yang lebih diharapkan
 ExpectedValue=Nilai yang diharapkan
-ExpectedQty=Expected Qty
+ExpectedQty=Qty yang diharapkan
 PartialWoman=Sebagian
 TotalWoman=Total
 NeverReceived=Tidak pernah menerima
@@ -724,7 +727,7 @@ MenuMembers=Anggota
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Pajak | Pengeluaran khusus
 ThisLimitIsDefinedInSetup=Batas Dolibarr (Menu home-setup-security): %s Kb, batas PHP: %s Kb
-NoFileFound=Tidak ada dokumen yang disimpan dalam direktori ini
+NoFileFound=Tidak ada dokumen yang diunggah
 CurrentUserLanguage=Bahasa saat ini
 CurrentTheme=Tema saat ini
 CurrentMenuManager=Manajer menu saat ini
@@ -895,12 +898,14 @@ Miscellaneous=Lain-lain
 Calendar=Kalender
 GroupBy=Kelompokkan oleh ...
 ViewFlatList=Lihat daftar datar
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=Lihat buku besar
+ViewSubAccountList=Lihat buku besar sub-akun
 RemoveString=Hapus string '%s'
 SomeTranslationAreUncomplete=Beberapa bahasa yang ditawarkan mungkin hanya diterjemahkan sebagian atau mengandung kesalahan. Tolong bantu untuk memperbaiki bahasa Anda dengan mendaftar di <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/</a> untuk menambahkan perbaikan dari Anda.
-DirectDownloadLink=Tautan unduhan langsung (publik / eksternal)
-DirectDownloadInternalLink=Tautan unduhan langsung (perlu dicatat dan perlu izin)
+DirectDownloadLink=Tautan unduhan publik
+PublicDownloadLinkDesc=Hanya tautan yang diperlukan untuk mengunduh file
+DirectDownloadInternalLink=Tautan unduhan pribadi
+PrivateDownloadLinkDesc=Anda harus masuk dan Anda memerlukan izin untuk melihat atau mengunduh file
 Download=Unduh
 DownloadDocument=Unduh dokumen
 ActualizeCurrency=Perbarui kurs mata uang
@@ -965,39 +970,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=satu
+two=dua
+three=tiga
+four=empat
+five=lima
+six=enam
+seven=tujuh
+eight=delapan
+nine=sembilan
+ten=sepuluh
+eleven=sebelas
+twelve=duabelas
+thirteen=ketiga belas
+fourteen=empat belas
+fifteen=limabelas
+sixteen=enambelas
+seventeen=tujuh belas
+eighteen=delapan belas
+nineteen=sembilan belas
+twenty=dua puluh
+thirty=tigapuluh
+forty=empat puluh
+fifty=lima puluh
+sixty=enam puluh
+seventy=tujuh puluh
+eighty=delapan puluh
+ninety=sembilan puluh
+hundred=ratus
+thousand=ribu
+million=juta
+billion=milyar
+trillion=triliun
+quadrillion=milion lipat empat
 SelectMailModel=Pilih templat email
 SetRef=Tetapkan ref
 Select2ResultFoundUseArrows=Beberapa hasil ditemukan. Gunakan panah untuk memilih.
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontak
 SearchIntoMembers=Anggota
 SearchIntoUsers=Pengguna
 SearchIntoProductsOrServices=Produk atau layanan
+SearchIntoBatch=Banyak / Serial
 SearchIntoProjects=Proyek
 SearchIntoMO=Pesanan Manufaktur
 SearchIntoTasks=Tugas
@@ -1028,9 +1034,9 @@ SearchIntoCustomerShipments=Pengiriman pelanggan
 SearchIntoExpenseReports=Laporan biaya
 SearchIntoLeaves=Keluar
 SearchIntoTickets=Tiket
-SearchIntoCustomerPayments=Customer payments
-SearchIntoVendorPayments=Vendor payments
-SearchIntoMiscPayments=Miscellaneous payments
+SearchIntoCustomerPayments=Pembayaran pelanggan
+SearchIntoVendorPayments=Pembayaran vendor
+SearchIntoMiscPayments=Pembayaran lain-lain
 CommentLink=Komentar
 NbComments=Jumlah komentar
 CommentPage=Ruang komentar
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Pintasan keyboard
 AssignedTo=Ditugaskan untuk
 Deletedraft=Hapus konsep
 ConfirmMassDraftDeletion=Draft konfirmasi penghapusan massal
-FileSharedViaALink=File dibagikan melalui tautan
+FileSharedViaALink=File dibagikan dengan tautan publik
 SelectAThirdPartyFirst=Pilih pihak ketiga terlebih dahulu ...
 YouAreCurrentlyInSandboxMode=Anda saat ini dalam mode "sandbox" %s
 Inventory=Inventaris
 AnalyticCode=Kode analitik
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Tampilkan Lebih Banyak Info
 NoFilesUploadedYet=Harap unggah dokumen terlebih dahulu
 SeePrivateNote=Lihat catatan pribadi
@@ -1098,25 +1105,27 @@ SwitchInEditModeToAddTranslation=Alihkan dalam mode edit untuk menambahkan terje
 NotUsedForThisCustomer=Tidak digunakan untuk pelanggan ini
 AmountMustBePositive=Jumlahnya harus positif
 ByStatus=Menurut status
-InformationMessage=Information
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s created
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
-DefaultMailModel=Default Mail Model
-PublicVendorName=Public name of vendor
-DateOfBirth=Date of birth
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+InformationMessage=Informasi
+Used=Bekas
+ASAP=Secepatnya
+CREATEInDolibarr=Rekam %s dibuat
+MODIFYInDolibarr=Rekam %s diubah
+DELETEInDolibarr=Rekam %s dihapus
+VALIDATEInDolibarr=Rekam %s divalidasi
+APPROVEDInDolibarr=Rekam %s disetujui
+DefaultMailModel=Model Email Default
+PublicVendorName=Nama publik vendor
+DateOfBirth=Tanggal lahir
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Token keamanan telah kedaluwarsa, jadi tindakan telah dibatalkan. Silahkan coba lagi.
 UpToDate=Up-to-date
-OutOfDate=Out-of-date
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
-OnHold=On hold
-Civility=Civility
-AffectTag=Affect Tag
-ConfirmAffectTag=Bulk Tag Affect
-ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
+OutOfDate=Kadaluarsa
+EventReminder=Pengingat Acara
+UpdateForAllLines=Perbarui untuk semua lini
+OnHold=Tertahan
+Civility=Kesopanan
+AffectTag=Mempengaruhi Tag
+ConfirmAffectTag=Pengaruh Tag Massal
+ConfirmAffectTagQuestion=Yakin ingin memengaruhi tag ke %s rekaman yang dipilih()?
+CategTypeNotFound=Tidak ada jenis tag yang ditemukan untuk jenis rekaman
+CopiedToClipboard=Disalin ke papan klip
+InformationOnLinkToContract=Jumlah ini hanyalah total dari semua garis kontrak. Tidak ada gagasan tentang waktu yang dipertimbangkan.
diff --git a/htdocs/langs/id_ID/margins.lang b/htdocs/langs/id_ID/margins.lang
index 0eda647eaf5..97e362f1e73 100644
--- a/htdocs/langs/id_ID/margins.lang
+++ b/htdocs/langs/id_ID/margins.lang
@@ -22,7 +22,7 @@ ProductService=Produk atau Layanan
 AllProducts=Semua produk dan layanan
 ChooseProduct/Service=Pilih produk atau layanan
 ForceBuyingPriceIfNull=Harga beli / biaya paksa untuk harga jual jika tidak ditentukan
-ForceBuyingPriceIfNullDetails=Jika harga beli / biaya tidak ditentukan, dan opsi ini "ON", margin akan menjadi nol on-line (harga beli / biaya = harga jual), jika tidak ("OFF"), marge akan sama dengan standar yang disarankan.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Metode margin untuk diskon global
 UseDiscountAsProduct=Sebagai produk
 UseDiscountAsService=Sebagai layanan
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index ca769abddcb..39cec55bfa0 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Daftar anggota konsep (akan divalidasi)
 MembersListValid=Daftar anggota yang valid
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=Daftar anggota yang diberhentikan
 MembersListQualified=Daftar anggota yang memenuhi syarat
 MenuMembersToValidate=Anggota konsep
 MenuMembersValidated=Anggota yang divalidasi
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Anggota yang diberhentikan
 MembersWithSubscriptionToReceive=Anggota dengan berlangganan untuk menerima
 MembersWithSubscriptionToReceiveShort=Berlangganan untuk menerima
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Berlangganan kedaluwarsa
 MemberStatusActiveLateShort=Kedaluwarsa
 MemberStatusPaid=Berlangganan terbaru
 MemberStatusPaidShort=Mutakhir
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Anggota yang diberhentikan
 MemberStatusResiliatedShort=Dihentikan
 MembersStatusToValid=Anggota konsep
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Anggota yang diberhentikan
 MemberStatusNoSubscription=Divalidasi (tidak perlu berlangganan)
 MemberStatusNoSubscriptionShort=Divalidasi
@@ -82,6 +87,8 @@ Physical=Fisik
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Diaktifkan kembali
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Hentikan anggota
 ConfirmResiliateMember=Anda yakin ingin memberhentikan anggota ini?
 DeleteMember=Hapus anggota
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template email yang digunakan untu
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template email untuk digunakan untuk mengirim email ke anggota pada rekaman langganan baru
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template email yang akan digunakan untuk mengirim pengingat email ketika langganan hampir kedaluwarsa
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template email yang digunakan untuk mengirim email ke anggota pada pembatalan anggota
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Mengirim Email untuk email otomatis
 DescADHERENT_ETIQUETTE_TYPE=Format halaman label
 DescADHERENT_ETIQUETTE_TEXT=Teks dicetak pada lembar alamat anggota
@@ -162,6 +170,7 @@ DocForLabels=Buat lembar alamat
 SubscriptionPayment=Pembayaran berlangganan
 LastSubscriptionDate=Tanggal pembayaran berlangganan terakhir
 LastSubscriptionAmount=Jumlah langganan terbaru
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Statistik anggota menurut negara
 MembersStatisticsByState=Statistik anggota menurut negara bagian / provinsi
 MembersStatisticsByTown=Statistik anggota menurut kota
diff --git a/htdocs/langs/id_ID/modulebuilder.lang b/htdocs/langs/id_ID/modulebuilder.lang
index aeecb827d2a..e573b8011ba 100644
--- a/htdocs/langs/id_ID/modulebuilder.lang
+++ b/htdocs/langs/id_ID/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=Saya ingin menghasilkan beberapa dokumen dari objek
 IncludeDocGenerationHelp=Jika Anda mencentang ini, beberapa kode akan dibuat untuk menambahkan kotak "Hasilkan dokumen" pada catatan.
 ShowOnCombobox=Tunjukkan nilai ke dalam kotak kombo
 KeyForTooltip=Kunci untuk tooltip
-CSSClass=Kelas CSS
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Tidak dapat diedit
 ForeignKey=Kunci asing
 TypeOfFieldsHelp=Jenis bidang: <br> varchar (99), ganda (24,8), real, teks, html, datetime, timestamp, integer, integer: ClassName: relativepath / to / classfile.class.php [: 1 [: filter]] ('1' berarti kita menambahkan tombol + setelah kombo untuk membuat catatan, 'filter' dapat berupa 'status = 1 DAN fk_user = __USER_ID DAN entitas IN (__SHARED_ENTITIES__)' misalnya)
diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
index 69f583b6e2c..7a89dad6b4e 100644
--- a/htdocs/langs/id_ID/orders.lang
+++ b/htdocs/langs/id_ID/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Buat pesanan
 MakeOrder=Buat pesanan
 SupplierOrder=Pesanan pembelian
 SuppliersOrders=Order pembelian
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Pesanan pembelian saat ini
 CustomerOrder=Order penjualan
 CustomersOrders=Pesanan Penjualan
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index dc4e9b6e401..9e98004abe1 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Perusahaan dengan berbagai kegiatan (semua modul utama)
 CreatedBy=Dibuat oleh %s
 ModifiedBy=Dimodifikasi oleh %s
 ValidatedBy=Divalidasi oleh %s
+SignedBy=Signed by %s
 ClosedBy=Ditutup oleh %s
 CreatedById=ID pengguna yang dibuat
 ModifiedById=ID pengguna yang membuat perubahan terbaru
@@ -244,6 +245,7 @@ NewKeyIs=Ini adalah kunci baru Anda untuk login
 NewKeyWillBe=Kunci baru Anda untuk masuk ke perangkat lunak adalah
 ClickHereToGoTo=Klik di sini untuk pergi ke %s
 YouMustClickToChange=Namun Anda harus terlebih dahulu mengklik tautan berikut untuk memvalidasi perubahan kata sandi ini
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Jika Anda tidak meminta perubahan ini, lupakan saja email ini. Kredensial Anda tetap aman.
 IfAmountHigherThan=Jika jumlah lebih tinggi dari<strong>%s </strong>
 SourcesRepository=Repositori untuk sumber
diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang
index 492da146be3..bd5348169ac 100644
--- a/htdocs/langs/id_ID/productbatch.lang
+++ b/htdocs/langs/id_ID/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Gunakan lot / nomor seri
-ProductStatusOnBatch=Ya (diperlukan banyak seri)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=Tidak (banyak / serial tidak digunakan)
-ProductStatusOnBatchShort=Ya
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Tidak
 Batch=Lot / Serial
 atleast1batchfield=Makan-menurut tanggal atau Jual-menurut tanggal atau Lot / nomor seri
@@ -22,3 +24,12 @@ ProductLotSetup=Pengaturan lot modul / serial
 ShowCurrentStockOfLot=Tampilkan stok saat ini untuk produk / lot pasangan
 ShowLogOfMovementIfLot=Tampilkan log pergerakan untuk produk / lot pasangan
 StockDetailPerBatch=Detail stok per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index aa10df00723..86fe0893b1e 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -108,10 +108,10 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Beberapa segmen harga per produk / layanan (setiap pelanggan berada dalam satu segmen harga)
 MultiPricesNumPrices=Jumlah harga
 DefaultPriceType=Basis harga per default (dengan versus tanpa pajak) saat menambahkan harga jual baru
-AssociatedProductsAbility=Enable Kits (set of several products)
+AssociatedProductsAbility=Aktifkan Kit (set beberapa produk)
 VariantsAbility=Enable Variants (variations of products, for example color, size)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+AssociatedProducts=Kit
+AssociatedProductsNumber=Jumlah produk yang menyusun kit ini
 ParentProductsNumber=Jumlah produk kemasan induk
 ParentProducts=Produk induk
 IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=Tarif PPN (untuk vendor / produk ini)
 DiscountQtyMin=Diskon untuk qty ini.
 NoPriceDefinedForThisSupplier=Tidak ada harga / jumlah yang ditentukan untuk vendor / produk ini
 NoSupplierPriceDefinedForThisProduct=Tidak ada harga / qty vendor yang ditentukan untuk produk ini
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Produk yang Ditentukan sebelumnya
 PredefinedServicesToSell=Layanan yang Ditentukan sebelumnya
 PredefinedProductsAndServicesToSell=Produk / layanan yang telah ditentukan untuk dijual
@@ -313,7 +314,7 @@ LastUpdated=Pembaruan terbaru
 CorrectlyUpdated=Diperbaharui dengan benar
 PropalMergePdfProductActualFile=File digunakan untuk menambahkan ke Azur PDF adalah / adalah
 PropalMergePdfProductChooseFile=Pilih file PDF
-IncludingProductWithTag=Termasuk produk / layanan dengan tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Harga default, harga sebenarnya mungkin tergantung pada pelanggan
 WarningSelectOneDocument=Silakan pilih setidaknya satu dokumen
 DefaultUnitToShow=Satuan
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index b10e1fcca51..bf2e4cbb771 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Daftar tugas
 GoToListOfTimeConsumed=Buka daftar waktu yang digunakan
 GanttView=Lihat Gantt
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Daftar proposal komersial terkait dengan proyek
 ListOrdersAssociatedProject=Daftar pesanan penjualan terkait dengan proyek
 ListInvoicesAssociatedProject=Daftar faktur pelanggan yang terkait dengan proyek
@@ -268,3 +269,7 @@ OneLinePerTask=Satu baris per tugas
 OneLinePerPeriod=Satu baris per periode
 RefTaskParent=Ref. Tugas Induk
 ProfitIsCalculatedWith=Keuntungan dihitung menggunakan
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/id_ID/propal.lang b/htdocs/langs/id_ID/propal.lang
index c7ab7ad356c..64ab11a79d1 100644
--- a/htdocs/langs/id_ID/propal.lang
+++ b/htdocs/langs/id_ID/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Kirim proposal komersial melalui surat
 DatePropal=Tanggal pengajuan
 DateEndPropal=Tanggal berakhir validitas
 ValidityDuration=Durasi validitas
-CloseAs=Setel status ke
 SetAcceptedRefused=Set diterima / ditolak
 ErrorPropalNotFound=Propal %s tidak ditemukan
 AddToDraftProposals=Tambahkan ke konsep proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Yakin ingin mengkloning proposal komersial<b>%s </b>?
 ConfirmReOpenProp=Anda yakin ingin membuka kembali proposal komersial<b>%s </b>?
 ProposalsAndProposalsLines=Proposal dan jalur komersial
 ProposalLine=Garis proposal
+ProposalLines=Proposal lines
 AvailabilityPeriod=Keterlambatan ketersediaan
 SetAvailability=Setel penundaan ketersediaan
 AfterOrder=setelah pesanan
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Penerimaan tertulis, stempel perusahaan, tanggal dan t
 ProposalsStatisticsSuppliers=Statistik proposal proposal vendor
 CaseFollowedBy=Kasus diikuti oleh
 SignedOnly=Hanya yang ditandatangani
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/id_ID/recruitment.lang b/htdocs/langs/id_ID/recruitment.lang
index 97ceb8dc169..5609f1d4027 100644
--- a/htdocs/langs/id_ID/recruitment.lang
+++ b/htdocs/langs/id_ID/recruitment.lang
@@ -18,59 +18,59 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = Perekrutan
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Kelola dan ikuti kampanye perekrutan untuk posisi pekerjaan baru
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
+RecruitmentSetup = Pengaturan perekrutan
 Settings = Pengaturan
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetupPage = Masuk di sini pengaturan opsi utama untuk modul rekrutmen
+RecruitmentArea=Area perekrutan
+PublicInterfaceRecruitmentDesc=Halaman pekerjaan publik adalah URL publik untuk menunjukkan dan menjawab pekerjaan terbuka. Ada satu tautan berbeda untuk setiap pekerjaan terbuka, ditemukan di setiap catatan pekerjaan.
+EnablePublicRecruitmentPages=Aktifkan halaman publik dari pekerjaan terbuka
 
 #
 # About page
 #
-About = About
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job position
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+About = Tentang
+RecruitmentAbout = Tentang Rekrutmen
+RecruitmentAboutPage = Rekrutmen tentang halaman
+NbOfEmployeesExpected=Nb karyawan yang diharapkan
+JobLabel=Label posisi pekerjaan
+WorkPlace=Tempat kerja
+DateExpected=Tanggal yang diharapkan
+FutureManager=Manajer masa depan
+ResponsibleOfRecruitement=Bertanggung jawab atas perekrutan
+IfJobIsLocatedAtAPartner=Jika pekerjaan terletak di tempat mitra
+PositionToBeFilled=Posisi pekerjaan
+PositionsToBeFilled=Posisi pekerjaan
+ListOfPositionsToBeFilled=Daftar posisi pekerjaan
+NewPositionToBeFilled=Posisi pekerjaan baru
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
-JobPositions=Job positions
-RecruitmentCandidatures=Applications
-InterviewToDo=Interview to do
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
-MakeOffer=Make an offer
+JobOfferToBeFilled=Posisi pekerjaan yang harus diisi
+ThisIsInformationOnJobPosition=Informasi posisi pekerjaan yang akan diisi
+ContactForRecruitment=Kontak untuk perekrutan
+EmailRecruiter=Perekrut email
+ToUseAGenericEmail=Untuk menggunakan email umum. Jika tidak ditentukan, email dari penanggung jawab perekrutan akan digunakan
+NewCandidature=Aplikasi baru
+ListOfCandidatures=Daftar aplikasi
+RequestedRemuneration=Remunerasi yang diminta
+ProposedRemuneration=Remunerasi yang diusulkan
+ContractProposed=Kontrak diusulkan
+ContractSigned=Kontrak telah ditandatangani
+ContractRefused=Kontrak ditolak
+RecruitmentCandidature=Aplikasi
+JobPositions=Posisi kerja
+RecruitmentCandidatures=Lamaran
+InterviewToDo=Wawancara untuk dilakukan
+AnswerCandidature=Jawaban lamaran
+YourCandidature=Lamaran Anda
+YourCandidatureAnswerMessage=Terima kasih atas lamaran Anda. <br> ...
+JobClosedTextCandidateFound=Posisi pekerjaan ditutup. Posisi sudah terisi.
+JobClosedTextCanceled=Posisi pekerjaan ditutup.
+ExtrafieldsJobPosition=Atribut pelengkap (posisi pekerjaan)
+ExtrafieldsCandidatures=Atribut pelengkap (lamaran pekerjaan)
+MakeOffer=Buat sebuah penawaran
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index fb71e9c978f..3c974a5f2eb 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -19,8 +19,8 @@ Stock=Persediaan
 Stocks=Stok
 MissingStocks=Stok yang hilang
 StockAtDate=Stok pada tanggal
-StockAtDateInPast=Tanggal di saat lalu
-StockAtDateInFuture=Tanggal di saat mendatang
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stok berdasarkan lot/serial
 LotSerial=Lot/Serial
 LotSerialList=Daftar lot/serial
@@ -37,8 +37,8 @@ AllWarehouses=Semua gudang
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Sertakan juga konsep pesanan
 Location=Tempat
-LocationSummary=Lokasi nama pendek
-NumberOfDifferentProducts=Jumlah produk yang berbeda
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total jumlah produk
 LastMovement=Gerakan terbaru
 LastMovements=Gerakan terbaru
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Nilai gudang
 UserWarehouseAutoCreate=Buat gudang pengguna secara otomatis saat membuat pengguna
 AllowAddLimitStockByWarehouse=Kelola juga nilai untuk stok minimum dan yang diinginkan per pasangan (gudang produk) selain nilai untuk stok minimum dan yang diinginkan per produk
 RuleForWarehouse=Aturan untuk gudang
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Atur gudang berdasarkan pesanan Penjualan
 UserDefaultWarehouse=Tetapkan gudang pada Pengguna
 MainDefaultWarehouse=Gudang bawaan
@@ -97,15 +98,16 @@ RealStockDesc=Stok fisik/nyata adalah stok saat ini di gudang.
 RealStockWillAutomaticallyWhen=Stok nyata akan dimodifikasi sesuai dengan aturan ini (sebagaimana didefinisikan dalam modul Stok):
 VirtualStock=Stok virtual
 VirtualStockAtDate=Stok virtual pda tanggal
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Stock virtual adalah stok terhitung yang tersedia setelah semua tindakan yang terbuka/tertunda (yang mempengaruhi stok) ditutup (pesanan pembelian diterima, pesanan penjualan dikirim, pesanan manufaktur diproduksi, dll)
+AtDate=At date
 IdWarehouse=Gudang id
 DescWareHouse=Deskripsi gudang
 LieuWareHouse=Gudang lokalisasi
 WarehousesAndProducts=Gudang dan produk
 WarehousesAndProductsBatchDetail=Gudang dan produk (dengan detail per lot/serial)
 AverageUnitPricePMPShort=Harga rata-rata yang ditimbang
-AverageUnitPricePMPDesc=Input harga rata-rata unit yang harus dibayarkan kepada pemasok untuk memasukkan produk ke dalam stok.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Harga Jual Unit
 EstimatedStockValueSellShort=Nilai jual
 EstimatedStockValueSell=Nilai jual
@@ -145,7 +147,7 @@ Replenishments=Pengisian ulang
 NbOfProductBeforePeriod=Jumlah produk %s dalam stok sebelum periode yang dipilih (<%s)
 NbOfProductAfterPeriod=Jumlah produk %s dalam persediaan setelah periode yang dipilih (> %s)
 MassMovement=Gerakan massa
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Rekam transfer
 ReceivingForSameOrder=Tanda terima untuk pesanan ini
 StockMovementRecorded=Pergerakan stok tercatat
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Tingkat stok harus cukup untuk menambahkan produk/la
 StockMustBeEnoughForOrder=Tingkat stok harus cukup untuk menambahkan produk/layanan ke pesanan (pemeriksaan dilakukan pada stok riil saat ini ketika menambahkan garis ke dalam urutan apa pun aturan untuk perubahan stok otomatis)
 StockMustBeEnoughForShipment= Tingkat stok harus cukup untuk menambahkan produk/layanan ke pengiriman (pemeriksaan dilakukan pada stok riil saat ini ketika menambahkan garis ke dalam pengiriman apa pun aturan untuk perubahan stok otomatis)
 MovementLabel=Label gerakan
-TypeMovement=Jenis gerakan
+TypeMovement=Direction of movement
 DateMovement=Tanggal pergerakan
 InventoryCode=Kode pergerakan atau inventaris
 IsInPackage=Terkandung dalam paket
@@ -183,6 +185,7 @@ inventoryCreatePermission=Buat inventaris baru
 inventoryReadPermission=Lihat persediaan
 inventoryWritePermission=Perbarui inventaris
 inventoryValidatePermission=Validasi inventaris
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventaris
 inventoryListTitle=Persediaan
 inventoryListEmpty=Tidak ada inventaris yang sedang berjalan
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock diperlukan untuk memilih lot yang aka
 ForceTo=Dipaksa untuk
 AlwaysShowFullArbo=Tampilkan daftar lengkap gudang di sembulan tautan gudang (Peringatan: Ini dapat menurunkan kinerja secara dramatis)
 StockAtDatePastDesc=Disini Anda dapat melihat pengadaan (pengadaan asli) pada waktu di kemudian hari
-StockAtDateFutureDesc=Disini Anda dapat melihat pengadaan (pengadaan virtual) pada waktu di kemudian hari
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Stok saat ini
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
index 1147eaa92c5..924dd5a2b97 100644
--- a/htdocs/langs/id_ID/suppliers.lang
+++ b/htdocs/langs/id_ID/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendor
 SuppliersInvoice=Faktur vendor
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Tampilkan Faktur Penjual
 NewSupplier=Vendor baru
 History=Riwayat
diff --git a/htdocs/langs/id_ID/ticket.lang b/htdocs/langs/id_ID/ticket.lang
index 2a25919c9be..a27bcf47bcd 100644
--- a/htdocs/langs/id_ID/ticket.lang
+++ b/htdocs/langs/id_ID/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Dihapus
 # Dict
 Type=Tipe
 Severity=Kerasnya
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Untuk mengirim email dari pesan tiket
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Tampilkan logo modul di antarmuka publik
 TicketsShowModuleLogoHelp=Aktifkan opsi ini untuk menyembunyikan modul logo di halaman-halaman antarmuka publik
 TicketsShowCompanyLogo=Tampilkan logo perusahaan di antarmuka publik
 TicketsShowCompanyLogoHelp=Aktifkan opsi ini untuk menyembunyikan logo perusahaan utama di halaman-halaman antarmuka publik
-TicketsEmailAlsoSendToMainAddress=Juga kirim pemberitahuan ke alamat email utama
-TicketsEmailAlsoSendToMainAddressHelp=Aktifkan opsi ini untuk mengirim email ke alamat "Email pemberitahuan dari" (lihat penyiapan di bawah)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Batasi tampilan untuk tiket yang ditetapkan untuk pengguna saat ini (tidak berlaku untuk pengguna eksternal, selalu terbatas pada pihak ketiga tempat mereka bergantung)
 TicketsLimitViewAssignedOnlyHelp=Hanya tiket yang ditetapkan untuk pengguna saat ini yang akan terlihat. Tidak berlaku untuk pengguna dengan hak pengelolaan tiket.
 TicketsActivatePublicInterface=Aktifkan antarmuka publik
@@ -126,10 +128,10 @@ TicketNumberingModules=Modul penomoran tiket
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Beri tahu pihak ketiga saat membuat
 TicketsDisableCustomerEmail=Selalu nonaktifkan email saat tiket dibuat dari antarmuka publik
-TicketsPublicNotificationNewMessage=Kirim email saat pesan baru ditambahkan
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Kirim email ketika pesan baru ditambahkan dari antarmuka publik (ke pengguna yang ditetapkan atau email notifikasi ke (pembaruan) dan/atau email notifikasi ke)
 TicketPublicNotificationNewMessageDefaultEmail=Email pemberitahuan ke (perbarui)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Kirim email pemberitahuan pesan baru ke alamat ini jika tiket tidak memiliki pengguna yang ditugaskan atau pengguna tidak memiliki email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Tiket modifikasi terbaru
 BoxLastModifiedTicketDescription=Tiket termodifikasi %s terbaru
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Tidak ada tiket yang dimodifikasi baru-baru ini
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index 8a5d6ee6cdc..0a72eb0f88b 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Hapus dari grup
 PasswordChangedAndSentTo=Kata sandi diubah dan dikirim ke<b>%s </b>.
 PasswordChangeRequest=Permintaan untuk mengubah kata sandi untuk<b>%s </b>
 PasswordChangeRequestSent=Permintaan untuk mengubah kata sandi untuk<b>%s</b>dikirim ke<b>%s </b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Konfirmasikan setel ulang kata sandi
 MenuUsersAndGroups=Pengguna & Grup
 LastGroupsCreated=Grup %s terbaru dibuat
@@ -70,9 +72,10 @@ ExportDataset_user_1=Pengguna dan propertinya
 DomainUser=Pengguna domain %s
 Reactivate=Mengaktifkan kembali
 CreateInternalUserDesc=Formulir ini memungkinkan Anda untuk membuat pengguna internal di perusahaan/organisasi Anda. Untuk membuat pengguna eksternal (pelanggan, vendor dll.), Gunakan tombol 'Buat Pengguna Dolibarr' dari kartu kontak pihak ketiga itu.
-InternalExternalDesc=Pengguna<b>internal</b>adalah pengguna yang merupakan bagian dari perusahaan/organisasi Anda. <br> Pengguna<b>eksternal</b>adalah pelanggan, vendor, atau lainnya (Membuat pengguna eksternal untuk pihak ketiga dapat dilakukan dari catatan kontak pihak ketiga). <br> <br> Dalam kedua kasus, izin menentukan hak pada Dolibarr, juga pengguna eksternal dapat memiliki menu manager yang berbeda dari pengguna internal (Lihat Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Izin diberikan karena diwarisi dari salah satu grup pengguna.
 Inherited=Warisan
+UserWillBe=Created user will be
 UserWillBeInternalUser=Pengguna yang dibuat akan menjadi pengguna internal (karena tidak tertaut ke pihak ketiga tertentu)
 UserWillBeExternalUser=Pengguna yang dibuat akan menjadi pengguna eksternal (karena ditautkan ke pihak ketiga tertentu)
 IdPhoneCaller=Penelepon telepon id
@@ -109,8 +112,10 @@ UserAccountancyCode=Kode akuntansi pengguna
 UserLogoff=Logout pengguna
 UserLogged=Pengguna login
 DateOfEmployment=Tanggal masuk kerja
-DateEmployment=Tanggal Mulai Pekerjaan
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Tanggal Akhir Pekerjaan
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=Anda tidak dapat menonaktifkan catatan pengguna Anda sendiri
 ForceUserExpenseValidator=Paksa validator laporan pengeluaran
 ForceUserHolidayValidator=Validator permintaan cuti paksa
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index eb522b5a859..76842810881 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost= <u>Gunakan dengan Apache / NGinx /...</u><br> Buat di server
 ExampleToUseInApacheVirtualHostConfig=Contoh untuk digunakan dalam pengaturan host virtual Apache:
 YouCanAlsoTestWithPHPS= <u>Gunakan dengan server yang telah tertanam PHP</u> <br>Pada lingkungan pengembangan software, Anda dapat memilih untuk menguji situs dengan server web yang tertanam PHP (PHP 5.5 diperlukan) dengan menjalankan<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP= <u> Jalankan situs web Anda dengan penyedia Hosting Dolibarr lain integrasi dengan modul Situs web. Anda dapat menemukan daftar beberapa penyedia hosting Dolibarr di <a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>
-CheckVirtualHostPerms=Periksa juga bahwa virtual host memiliki izin<strong>%s </strong> pada file ke <br><strong>%sf07f
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Baca
 WritePerm=Menulis
 TestDeployOnWeb=Uji / gunakan di web
 PreviewSiteServedByWebServer= <u>Pratinjau %s di tab baru.</u><br><br>%s akan dilayani oleh server web eksternal (seperti Apache, Nginx, IIS). Anda harus menginstal dan mengatur server ini sebelum merujuk pada direktori:<br><strong>%s</strong><br>URL dilayani oleh server eksternal: <br><strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> Pratinjau %s di tab baru. </u> <br> <br> %s akan dilayani oleh server Dolibarr sehingga tidak memerlukan server web tambahan (seperti Apache, Nginx, IIS) untuk diinstal. <br> Yang tidak nyaman adalah URL halaman tidak ramah pengguna dan mulai dengan jalur Dolibarr Anda. <br> URL dilayani oleh Dolibarr: <br><strong>%s </strong> <br> <br> Untuk menggunakan web eksternal server Anda sendiri untuk melayani situs web ini, membuat virtual host pada server web Anda titik pada direktori <br><strong>%s </strong> <br> kemudian masukkan nama server virtual ini dan klik tombol pratinjau lainnya.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL dari host virtual yang dilayani oleh server web eksternal tidak ditentukan
 NoPageYet=Belum ada halaman
 YouCanCreatePageOrImportTemplate=Anda dapat membuat halaman baru atau mengimpor template situs web lengkap
@@ -137,3 +137,11 @@ PagesRegenerated=%s halaman / wadah dibuat ulang
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/id_ID/zapier.lang b/htdocs/langs/id_ID/zapier.lang
index c0506eac4b9..dcf888549aa 100644
--- a/htdocs/langs/id_ID/zapier.lang
+++ b/htdocs/langs/id_ID/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier untuk Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier untuk modul Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Pengaturan Zapier untuk Dolibarr
+ZapierForDolibarrSetup=Pengaturan Zapier untuk Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 5c45bf600e6..c88d86a406c 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 2b6093184ff..a7fdf70d5f1 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Fjarlægja tengingu læsa
 YourSession=Tími þinn
 Sessions=Users Sessions
 WebUserGroup=Vefþjóninn notandi / hópur
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Ath: er já aðeins gild ef <b>einingin %s </b> er virkt
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Öryggi skipulag
+PHPSetup=PHP setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Villa, þessa einingu þarf PHP útgáfa %s  eða hærri
 ErrorModuleRequireDolibarrVersion=Villa, þessa einingu þarf Dolibarr útgáfu %s  eða hærri
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Hreinsa nú
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Virkja á
 ActiveOn=Virkja á
+ActivatableOn=Activatable on
 SourceFile=Frumskrár
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Aðeins í boði ef JavaScript er ekki fatlaður
 Required=Krafist
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Allir aðrir stafir í möskva haldast óbreytt. <br> Bil eru ekki leyfð. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>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>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Ritstjórar
 Module49Desc=Ritstjórainnskráning stjórnun
 Module50Name=Vörur
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind viðskipti viðbúnað
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-fyrirtæki
 Module5000Desc=Leyfir þér að stjórna mörgum fyrirtækjum
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Búa til / breyta innri / ytri notendur og leyfi
 Permission254=Eyða eða gera öðrum notendum
 Permission255=Búa til / breyta eigin upplýsingar um notandann sinn
 Permission256=Breyta eigin lykilorð hans
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Lesa CA
 Permission272=Lesa reikningum
 Permission273=Útgáfudagur reikningum
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Öryggi endurskoðun viðburðir
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Úttekt
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=Þú verður að keyra þessa skipun frá stjórn lína eftir innskráningu í skel með <b>notandann %s .</b>
 YourPHPDoesNotHaveSSLSupport=SSL virka ekki í boði í PHP þinn
 DownloadMoreSkins=Fleiri skinn til að sækja
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Algjör þýðing
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Fyllingar eiginleika
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Tenging (Unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Leita sía
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Tenging (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Firstname Nafn
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Aðgerðir og dagskrá mát skipulag
 PasswordTogetVCalExport=Lykill að heimila útflutning hlekkur
+SecurityKey = Security Key
 PastDelayVCalExport=Ekki flytja atburður eldri en
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index dbe306c9acb..040391c6a6f 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index 2b7e4a74e70..a7a13d7f07e 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -52,11 +52,12 @@ Invoices=Kvittanir
 InvoiceLine=Invoice línu
 InvoiceCustomer=Viðskiptavinur Reikningar
 CustomerInvoice=Viðskiptavinur Reikningar
-CustomersInvoices=reikninga viðskiptavinar
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=birgjum reikninga
+SupplierBills=Vendor invoices
 Payment=Greiðsla
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Greiðslur gert þegar
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Greiðsla regla
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Millifærslu
 PaymentTypeShortVIR=Millifærslu
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Seinkun
 DisabledBecausePayments=Ekki hægt þar sem það er einhvers greiðslur
 CantRemovePaymentWithOneInvoicePaid=Get ekki fjarlægt greiðslu þar er að minnsta kosti á reikning flokkast borgað
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Væntanlegur greiðslu
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Borgað af þessari greiðslu
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A frumvarpið hófst með $ syymm er til nú þegar og er ekki með þessari tegund af röð. Fjarlægja hana eða gefa henni nýtt heiti þess að virkja þessa einingu.
-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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
index fdb47cd6d8f..a4b8ba5261f 100644
--- a/htdocs/langs/is_IS/boxes.lang
+++ b/htdocs/langs/is_IS/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Bókhalds
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index b5b63e566bb..d86daa422be 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 86883bf1c40..6e0b43dedfa 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -43,9 +43,10 @@ Individual=Einstaklingur
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Móðurfélag
 Subsidiaries=Dótturfélög
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Skýrsla hlutfall
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility kóða
 RegisteredOffice=Skráð skrifstofa
 Lastname=Lastname
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF / nEf)
 ProfId2ES=Prof Id 2 (Kennitala)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate tala)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (Siren)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, gamall MANNAPI)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Prof Id 1 (Registration Number)
 ProfId2GB=-
 ProfId3GB=Prof Id 3 (SIC)
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Kennitala)
 ProfId3PT=Prof Id 3 (Commercial Record tala)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Viðskiptavinur / birgir númerið er ókeypis. Þessi kóði getur breytt hvenær sem er.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index b281068b1a6..ea24fde663b 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VSK safnað
 StatusToPay=Til að borga
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Viðskiptavinur Reikningar greiðslu
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VSK-greiðslu
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Listi yfir greiðslur
 ListOfCustomerPayments=Listi yfir greiðslur viðskiptavina
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Greiðsla
 LT2PaymentsES=IRPF Greiðslur
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Athugaðu móttöku inntak dagsetningu
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/is_IS/ecm.lang b/htdocs/langs/is_IS/ecm.lang
index 5e10a48494b..e228a4b76d9 100644
--- a/htdocs/langs/is_IS/ecm.lang
+++ b/htdocs/langs/is_IS/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 82755eaab2b..953b11adbb4 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=<b>Listinn %s </b> fannst ekki (Bad slóð, rangt leyfi eða a
 ErrorFunctionNotAvailableInPHP=<b>Virka %s </b> er krafist fyrir þessa aðgerð, en er ekki til staðar í þessari útgáfu / skipulag af PHP.
 ErrorDirAlreadyExists=A möppu með þessu nafni er þegar til.
 ErrorFileAlreadyExists=Skrá með þessu nafni er þegar til.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Skrá fékk ekki alveg við þjóninn.
 ErrorNoTmpDir=Tímabundin directy %s  er ekki til.
 ErrorUploadBlockedByAddon=Hlaða læst með PHP / Apache tappi.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/is_IS/externalsite.lang b/htdocs/langs/is_IS/externalsite.lang
index 117b42da288..871f44e7367 100644
--- a/htdocs/langs/is_IS/externalsite.lang
+++ b/htdocs/langs/is_IS/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Skipulag tengjast ytri vef
-ExternalSiteURL=Ytri Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 0c0dae311ad..de34867d736 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. dagsetning
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Löggilding dagur
+DateSigning=Signing date
 DateClosing=Lokadegi
 DateDue=Gjalddagi
 DateValue=Gildi dagsetningu
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Eining verðs
 PriceU=UPP
 PriceUHT=UP (nettó)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Upphæð
 AmountInvoice=Invoice upphæð
@@ -389,6 +390,8 @@ AmountTotal=Samtals upphæð
 AmountAverage=Meðalupphæð
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Prósenta
 Total=Samtals
 SubTotal=Millisamtala
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google dagskrá
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr takmörk (Valmynd heim-skipulag-öryggi): %s  KB, PHP takmörk: %s  Kb
-NoFileFound=Engin skjöl sem vistuð eru í þessari möppu
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Valið tungumál
 CurrentTheme=Núverandi þema
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Tengiliðir
 SearchIntoMembers=Meðlimir
 SearchIntoUsers=Notendur
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Verkefni
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Verkefni
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Áhrifum á
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/is_IS/margins.lang b/htdocs/langs/is_IS/margins.lang
index a6630619786..8dee352103a 100644
--- a/htdocs/langs/is_IS/margins.lang
+++ b/htdocs/langs/is_IS/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Vara eða þjónusta
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index c1e58714440..c883a16219c 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Listi yfir meðlimi drög (verður staðfest)
 MembersListValid=Listi yfir gildar meðlimir
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=Listi yfir viðurkennda meðlimir
 MenuMembersToValidate=Drög að meðlimir
 MenuMembersValidated=Fullgilt aðildarríki
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Meðlimir með áskrift að fá
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Útrunnið
 MemberStatusPaid=Áskrift upp til dagsetning
 MemberStatusPaidShort=Upp til dagsetning
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Drög að meðlimir
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Staðfest
@@ -82,6 +87,8 @@ Physical=Líkamleg
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Eyða meðlimur
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Snið af merki síðu
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Mynda lak heimilisfang (Format fyrir framleiðsla raunverulega skip
 SubscriptionPayment=Áskrift greiðslu
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Notendur tölfræði eftir landi
 MembersStatisticsByState=Notendur tölfræði eftir fylki / hérað
 MembersStatisticsByTown=Notendur tölfræði eftir bænum
diff --git a/htdocs/langs/is_IS/modulebuilder.lang b/htdocs/langs/is_IS/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/is_IS/modulebuilder.lang
+++ b/htdocs/langs/is_IS/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
index b212a477896..76fbd1f19ee 100644
--- a/htdocs/langs/is_IS/orders.lang
+++ b/htdocs/langs/is_IS/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Gera röð
 MakeOrder=Gera röð
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Sími
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=Einföld röð líkan
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index fb1ea9d9c80..30613bdb7e5 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Búið til af %s
 ModifiedBy=Breytt af %s
 ValidatedBy=Staðfestar af %s
+SignedBy=Signed by %s
 ClosedBy=Lokað eftir %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang
index 43b7f793dca..6217af6114c 100644
--- a/htdocs/langs/is_IS/productbatch.lang
+++ b/htdocs/langs/is_IS/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Já
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Nei
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index a43c32766fd..9edc7be7038 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 8e693b106e7..72e7c2c3466 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/is_IS/propal.lang b/htdocs/langs/is_IS/propal.lang
index 04d060e1982..7ed33b66462 100644
--- a/htdocs/langs/is_IS/propal.lang
+++ b/htdocs/langs/is_IS/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Senda auglýsing tillögu með tölvupósti
 DatePropal=Dagsetning tillögu
 DateEndPropal=Date lok gildistíma
 ValidityDuration=Gildistími Lengd
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s  fannst ekki
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Auglýsing tillögunnar og línur
 ProposalLine=Tillaga línu
+ProposalLines=Proposal lines
 AvailabilityPeriod=Framboð töf
 SetAvailability=Setja framboð töf
 AfterOrder=eftir því skyni
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index 9741ab77235..7f6f5d25511 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Verðbréf
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Staðsetning
-LocationSummary=Stutt nafn staðsetning
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Heildarfjöldi vörur
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Vöruhús gildi
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual Stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Auðkenni vörugeymsla
 DescWareHouse=Lýsing vörugeymsla
 LieuWareHouse=Staðsetning lager
 WarehousesAndProducts=Vöruhús og vörur
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Vegið meðalverð
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selja Unit verð
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index 36840ab9189..c9b83a3b331 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=Saga
diff --git a/htdocs/langs/is_IS/ticket.lang b/htdocs/langs/is_IS/ticket.lang
index 113be596543..05766c00998 100644
--- a/htdocs/langs/is_IS/ticket.lang
+++ b/htdocs/langs/is_IS/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Tegund
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index faca236ce4c..4106e08f75c 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Fjarlægja úr hópi
 PasswordChangedAndSentTo=Lykilorð breyst og sendur <b>til %s .</b>
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Beiðni um að breyta lykilorðinu <b>fyrir %s </b> sent <b>til %s .</b>
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Notendur & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Lén notanda %s
 Reactivate=Endurvekja
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Heimild veitt vegna þess að arfur frá einni í hópnum notanda.
 Inherited=Arf
+UserWillBe=Created user will be
 UserWillBeInternalUser=Búið notandi vilja vera innri notanda (vegna þess að ekki tengd við ákveðna þriðja aðila)
 UserWillBeExternalUser=Búið notandi vilja vera ytri notandi (vegna þess að tengjast ákveðnum þriðja aðila)
 IdPhoneCaller=Auðkenni sími sem hringir
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index bcec388e753..9b1431a77d8 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Lesa
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/is_IS/zapier.lang b/htdocs/langs/is_IS/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/is_IS/zapier.lang
+++ b/htdocs/langs/is_IS/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/it_CH/admin.lang b/htdocs/langs/it_CH/admin.lang
index c1d306ec390..619ae5f8bd4 100644
--- a/htdocs/langs/it_CH/admin.lang
+++ b/htdocs/langs/it_CH/admin.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/it_CH/modulebuilder.lang b/htdocs/langs/it_CH/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/it_CH/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/it_CH/products.lang b/htdocs/langs/it_CH/products.lang
deleted file mode 100644
index 2a38b9b0181..00000000000
--- a/htdocs/langs/it_CH/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 7651e63da89..a15261e9558 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Righe di fatture bloccate
 ExpenseReportLines=Linee di note spese da associare
 ExpenseReportLinesDone=Linee vincolate di note spese
 IntoAccount=Collega linee con il piano dei conti
-TotalForAccount=Totale per conto contabile
+TotalForAccount=Total accounting account
 
 
 Ventilate=Associa
@@ -209,7 +209,7 @@ Codejournal=Giornale
 JournalLabel=Etichetta del giornale
 NumPiece=Numero del pezzo
 TransactionNumShort=Num. transazione
-AccountingCategory=Gruppi personalizzati
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Qui puoi definire alcuni gruppi di conti contabili. Saranno utilizzati per rapporti contabili personalizzati.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 29b516e2c33..0c18bd7788e 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Rimuovi il blocco connessioni
 YourSession=La tua sessione
 Sessions=Sessioni utente
 WebUserGroup=Utente/gruppo del server web (per esempio www-data)
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=La tua configurazione PHP sembra non permetta di mostrare le sessioni attive. La directory utilizzata per salvare le sessioni (<b>%s</b>) potrebbe non essere protetta (per esempio tramite permessi SO oppure dalla direttiva PHP open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Nota: funziona solo se il <b>modulo %s</b> è attivo
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Impostazioni per la sicurezza
+PHPSetup=PHP setup
 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
@@ -84,7 +86,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disattivato
 UsePreviewTabs=Utilizza i tabs per l'anteprima
 ShowPreview=Vedi anteprima
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Mostra-Nascondi dettagli
 PreviewNotAvailable=Anteprima non disponibile
 ThemeCurrentlyActive=Tema attualmente attivo
 MySQLTimeZone=TimeZone MySql (database)
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Questa area fornisce funzioni di amministrazione. Usa il men
 Purge=Pulizia
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Eliminia il file log, compreso <b>%s</b> definito per il modulo Syslog (nessun rischio di perdita di dati)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Procedo all'eliminazione
@@ -232,6 +234,7 @@ BoxesAvailable=Widget disponibili
 BoxesActivated=Widget attivi
 ActivateOn=Attiva sul
 ActiveOn=Attivi sul
+ActivatableOn=Activatable on
 SourceFile=File sorgente
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponibile solo se JavaScript e Ajax non sono disattivati
 Required=Richiesto
@@ -347,9 +350,10 @@ LastActivationAuthor=Ultimo
 LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
 WithCounter=Gestisci un contatore
-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>il codice cliente di n caratteri<br><b>{cccc000}</b> il codice cliente di n caratteri è seguito da un contatore dedicato per cliente. Questo contatore dedicato per i clienti è azzerato allo stesso tempo di quello globale.<br><b>{tttt}</b> Il codice di terze parti composto da n caratteri (vedi menu Home - Impostazioni - dizionario - tipi di terze parti). Se aggiungi questa etichetta, il contatore sarà diverso per ogni tipo di terze parti<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Tutti gli altri caratteri nello schema rimarranno inalterati. <br> Gli spazi non sono ammessi. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Esempio sulla novantanovesima %s del contatto, con la data il 31/01/2007:</u> <br>
 GenericMaskCodes4b=<u>Esempio : il 99esimo cliente/fornitore viene creato 31/01/2007:</u> <br>
 GenericMaskCodes4c=<u>Esempio su prodotto creato il 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Libreria utilizzata per generare PDF
@@ -541,6 +545,8 @@ Module40Name=Fornitori
 Module40Desc=Gestione fornitori e acquisti (ordini e fatture)
 Module42Name=Debug Logs
 Module42Desc=Strumenti di tracciamento (file, syslog, ...). Questi strumenti sono per scopi tecnici/correzione.
+Module43Name=Barra di debug
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Redazione
 Module49Desc=Gestione redattori
 Module50Name=Prodotti
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Localizzazione degli accessi tramite GeoIP Maxmind
 Module3200Name=Archivi inalterabili
 Module3200Desc=Abilita un registro inalterabile degli eventi aziendali. Gli eventi sono archiviati in tempo reale. Il registro è una tabella di sola lettura degli eventi concatenati che possono essere esportati. Questo modulo potrebbe essere obbligatorio per alcuni paesi.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=Risorse umane
 Module4000Desc=Gestione delle risorse umane (gestione dei dipartimenti e contratti dipendenti)
 Module5000Name=Multiazienda
 Module5000Desc=Permette la gestione di diverse aziende
-Module6000Name=Flusso di lavoro
-Module6000Desc=Gestione flussi di lavoro (creazione automatica di oggetti e / o cambio di stati automatico)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Siti web
 Module10000Desc=Crea siti Web (pubblici) con un editor WYSIWYG. Si tratta di un CMS orientato a webmaster o sviluppatori (richiesta conoscenza di linguaggio HTML e CSS). Basta configurare il proprio server Web (Apache, Nginx, ...) in modo che punti alla directory Dolibarr dedicata per averlo online su Internet con il proprio nome di dominio.
 Module20000Name=Richieste ferie / permesso
@@ -762,7 +770,7 @@ Permission167=Esportare contratti
 Permission171=Vedi viaggi e spese (propri e i suoi subordinati)
 Permission172=Crea/modifica nota spese
 Permission173=Elimina nota spese
-Permission174=Read all trips and expenses
+Permission174=Vedere tutti i viaggi e le spese
 Permission178=Esporta note spese
 Permission180=Vedere fornitori
 Permission181=Read purchase orders
@@ -800,12 +808,13 @@ Permission244=Vedere contenuto delle categorie nascoste
 Permission251=Vedere altri utenti e gruppi
 PermissionAdvanced251=Vedere altri utenti
 Permission252=Creare/modificare altri utenti e gruppi e propri permessi
-Permission253=Create/modify other users, groups and permissions
+Permission253=Creare/Modificare altri utenti, gruppi e permessi
 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=Estendere l'accesso a tutte le terze parti (non solo le terze parti per le quali tale utente è un rappresentante di vendita). <br> Non efficace per gli utenti esterni (sempre limitato a se stessi per proposte, ordini, fatture, contratti, ecc.). <br> Non efficace per i progetti (solo le regole sulle autorizzazioni del progetto, la visibilità e le questioni relative all'assegnazione).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Vedere CA
 Permission272=Vedere fatture
 Permission273=Emettere fatture
@@ -942,11 +951,11 @@ Permission10001=Read website content
 Permission10002=Create/modify website content (html and javascript content)
 Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
 Permission10005=Delete website content
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20001=Vedere le richieste di ferie (tue e dei tuoi subordinati)
+Permission20002=Creare / modificare le tue richieste di ferie (le tue ferie e quelle dei tuoi subordinati)
 Permission20003=Eliminare le richieste di ferie
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20004=Vedere tutte le richieste di ferie (anche di utenti non subordinati)
+Permission20005=Creare / modificare richieste di ferie per tutti (anche di utenti non subordinati)
 Permission20006=Amministrazione richieste di ferie/permessi  (impostazione e aggiornamento del bilancio)
 Permission20007=Approvare le richieste di ferie
 Permission23001=Leggi lavoro pianificato
@@ -978,7 +987,7 @@ Permission55001=Leggi sondaggi
 Permission55002=Crea/modifica sondaggi
 Permission59001=Leggi margini commerciali
 Permission59002=Definisci margini commerciali
-Permission59003=Read every user margin
+Permission59003=Vedere ogni margine utente
 Permission63001=Leggi risorse
 Permission63002=Crea/modifica risorse
 Permission63003=Elimina risorsa
@@ -1175,7 +1184,8 @@ SetupDescription2=Le 2 seguenti sezioni sono obbligatorie (le prime 2 sezioni ne
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Parametri di base utilizzati per personalizzare il comportamento predefinito dell'applicazione (ad es. per le funzionalità relative al paese).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Questo software è una suite di molti moduli / applicazioni. I moduli relativi alle tue esigenze devono essere abilitati e configurati. Le voci di menu verranno visualizzate con l'attivazione di questi moduli.
 SetupDescription5=Altre voci di menu consentono la gestione di parametri opzionali.
-LogEvents=Eventi di audit di sicurezza
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=Informazioni su Dolibarr
 InfoBrowser=Informazioni browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=È necessario eseguire questo comando dal riga di comando dopo il login in una shell con l'utente <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Il PHP del server non supporta SSL
 DownloadMoreSkins=Scarica altre skin
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Nei documenti mostra identità professionale completa di:
 ShowVATIntaInAddress=Nascondi il numero di partita IVA intracomunitaria negli indirizzi
 TranslationUncomplete=Traduzione incompleta
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Definire gli eventuali attributi aggiuntivi / campi personalizzati che devono essere inclusi negli oggetti: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Campi extra
 ExtraFieldsLines=Attributi complementari (righe)
 ExtraFieldsLinesRec=Attributi complementari (righe di template di fattura)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (Unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Filtro di ricerca
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, ActiveDirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Cognome Nome
@@ -1696,7 +1707,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nuovo menu
 MenuHandler=Gestore menu
 MenuModule=Modulo sorgente
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=Nascondi i menù non autorizzati anche per gli utenti interni (altrimenti sarà solamente disabilitato)
 DetailId=Id menu
 DetailMenuHandler=Gestore menu dove mostrare il nuovo menu
 DetailMenuModule=Nome del modulo, per le voci di menu provenienti da un modulo
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=La tua azienda è stata definita per non utilizzare l'I
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Codice contabilità vendite
 AccountancyCodeBuy=Codice contabilità acquisti
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Impostazioni modulo agenda
 PasswordTogetVCalExport=Chiave per autorizzare l'esportazione di link
+SecurityKey = Security Key
 PastDelayVCalExport=Non esportare evento più vecchio di
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Colore di sfondo per le linee dispari delle tabelle
 BackgroundTableLineEvenColor=Colore di sfondo per le linee pari delle tabelle
 MinimumNoticePeriod=Periodo minimo di avviso (le richieste di ferie/permesso dovranno essere effettuate prima di questo periodo)
 NbAddedAutomatically=Numero di giorni aggiunti ai contatori di utenti (automaticamente) ogni mese
-EnterAnyCode=Questo campo contiene un riferimento per identificare la linea. Inserisci qualsiasi valore di tua scelta, ma senza caratteri speciali.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Inserire 0 o 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=Il colore RGB è nel formato HEX, es:FF0000
@@ -1953,7 +1966,7 @@ CommandIsNotInsideAllowedCommands=The command you are trying to run is not in th
 LandingPage=Landing page
 SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
 ModuleEnabledAdminMustCheckRights=Il modulo è stato attivato. Le autorizzazioni per i moduli attivati ​​sono state fornite solo agli utenti amministratori. Potrebbe essere necessario concedere le autorizzazioni ad altri utenti o gruppi manualmente, se necessario.
-UserHasNoPermissions=This user has no permissions defined
+UserHasNoPermissions=Questo utente non ha alcun permesso assegnato
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
 BaseCurrency=Valuta di riferimento della compagnia (vai nella configurazione della compagnia per cambiarla)
 WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Margine inferiore su PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altezza per logo in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Sono state trovate diverse varianti linguistiche
 RemoveSpecialChars=Rimuovi caratteri speciali
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Scambia la posizione dell'indirizzo del mittente e del destinatario sui documenti PDF
-FeatureSupportedOnTextFieldsOnly=Attenzione, funzionalità supportata solo nei campi di testo. Inoltre, è necessario impostare un parametro URL action = create o action = edit OPPURE il nome della pagina deve terminare con 'new.php' per attivare questa funzione.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Aggiungi un lavoro programmato e una pagina di configurazione per scansionare regolarmente caselle di posta elettronica (usando il protocollo IMAP) e registrare le email ricevute nella tua applicazione, nel posto giusto e / o creare automaticamente alcuni record (come i lead).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Usa la barra di debug
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Impostazione del modulo Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Effettua un ping anonimo '+1' al server della Fondazione Dolib
 FeatureNotAvailableWithReceptionModule=Funzione non disponibile quando la ricezione del modulo è abilitata
 EmailTemplate=Modello per le e-mail
 EMailsWillHaveMessageID=Le e-mail avranno un tag "Riferimenti" corrispondente a questa sintassi
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Se vuoi avere alcuni testi nel tuo PDF duplicato in 2 lingue diverse nello stesso PDF generato, devi impostare qui la seconda lingua in modo che il PDF generato contenga 2 lingue diverse nella stessa pagina, quella scelta durante la generazione del PDF e questa ( solo pochi modelli PDF supportano questa opzione). Mantieni vuoto per 1 lingua per PDF.
 FafaIconSocialNetworksDesc=Inserisci qui il codice di un'icona FontAwesome. Se non sai cos'è FontAwesome, puoi utilizzare il valore generico fa-address-book.
 FeatureNotAvailableWithReceptionModule=Funzione non disponibile quando la ricezione del modulo è abilitata
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Natura del prodotto
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 0391c90cf1b..b665c67accb 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=I tuoi mandati SEPA
 FindYourSEPAMandate=Questo è il tuo mandato SEPA che autorizza la nostra azienda ad effettuare un ordine di addebito diretto alla tua banca. Da restituire firmata (scansione del documento firmato) o inviato all'indirizzo email
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colora i movimenti
 BankColorizeMovementDesc=Se questa funzione è abilitata, è possibile scegliere il colore di sfondo specifico per i movimenti di debito o credito
 BankColorizeMovementName1=Colore di sfondo per il movimento di debito
 BankColorizeMovementName2=Colore di sfondo per il movimento del credito
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index fb10fd9b8d9..f4e57625340 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -55,8 +55,9 @@ CustomerInvoice=Fattura attive
 CustomersInvoices=Fatture attive
 SupplierInvoice=Fattura fornitore
 SuppliersInvoices=Fatture Fornitore
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Fattura fornitore
-SupplierBills=Fatture passive
+SupplierBills=Fatture Fornitore
 Payment=Pagamento
 PaymentBack=Rimborso
 CustomerInvoicePaymentBack=Rimborso
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Pagamenti già fatti
 PaymentsBackAlreadyDone=Rimborso già effettuato
 PaymentRule=Regola pagamento
 PaymentMode=Tipo di pagamento
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Carta di Debito/Credito
 PaymentTypePP=PayPal
 IdPaymentMode=Tipo di pagamento (id)
@@ -111,7 +114,7 @@ CancelBill=Annulla una fattura
 SendRemindByMail=Inviare promemoria via email
 DoPayment=Registra pagamento
 DoPaymentBack=Emetti rimborso
-ConvertToReduc=Mark as credit available
+ConvertToReduc=Converti in sconto assoluto
 ConvertExcessReceivedToReduc=Convert excess received into available credit
 ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Inserisci il pagamento ricevuto dal cliente
@@ -272,9 +275,9 @@ Repeatables=Modelli
 ChangeIntoRepeatableInvoice=Converti in modello di fattura
 CreateRepeatableInvoice=Crea modello di fattura
 CreateFromRepeatableInvoice=Crea da modello di fattura
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndInvoiceLines=Fatture attive e dettagli
 CustomersInvoicesAndPayments=Fatture attive e pagamenti
-ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_1=Fatture attive e dettagli
 ExportDataset_invoice_2=Fatture clienti e pagamenti
 ProformaBill=Fattura proforma:
 Reduction=Sconto
@@ -310,8 +313,8 @@ DiscountType=Tipo sconto
 NoteReason=Note/Motivo
 ReasonDiscount=Motivo dello sconto
 DiscountOfferedBy=Sconto concesso da
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
+DiscountStillRemaining=Sconti o crediti disponibili
+DiscountAlreadyCounted=Sconti o crediti già consumati
 CustomerDiscounts=Sconto clienti
 SupplierDiscounts=Vendors discounts
 BillAddress=Indirizzo di fatturazione
@@ -373,6 +376,7 @@ DateLastGeneration=Data dell'ultima generazione
 DateLastGenerationShort=Data ultima gen.
 MaxPeriodNumber=Numero massimo di fatture da generare
 NbOfGenerationDone=Numero di fatture generate già create
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Numero di generazione eseguita
 MaxGenerationReached=Numero massimo di generazioni raggiunto
 InvoiceAutoValidate=Convalida le fatture automaticamente
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Pagamento a 14 giorni fine mese
 FixAmount=Importo fisso - 1 riga con etichetta "%s"
 VarAmount=Importo variabile (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Importo variabile (%% tot.) - tutte le stesse righe
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bonifico bancario
 PaymentTypeShortVIR=Bonifico bancario
@@ -459,8 +463,8 @@ FullPhoneNumber=Telefono
 TeleFax=Fax
 PrettyLittleSentence=L'importo dei pagamenti in assegni emessi in nome mio viene accettato in qualità di membro di una associazione approvata dalla Amministrazione fiscale.
 IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+PaymentByChequeOrderedTo=I pagamenti tramite assegno (tasse incluse) devono essere intestati a %s, \n
+PaymentByChequeOrderedToShort=I pagamenti tramite assegno (tasse incluse) devono essere intestati a
 SendTo=spedire a
 PaymentByTransferOnThisBankAccount=Pagamento tramite Bonifico sul seguente Conto Bancario
 VATIsNotUsedForInvoice=* Non applicabile IVA art-293B del CGI
@@ -494,12 +498,16 @@ Cash=Contanti
 Reported=Segnalato
 DisabledBecausePayments=Impossibile perché ci sono dei pagamenti
 CantRemovePaymentWithOneInvoicePaid=Impossibile rimuovere il pagamento. C'è almeno una fattura classificata come pagata
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Pagamento previsto
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Pagato con questo pagamento
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down-payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classifica come "Pagata" tutte le note di credito interamente rimborsate
 ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Paga
 ToMakePaymentBack=Rimborsa
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Per creare un nuovo modelo bisogna prima c
 PDFCrabeDescription=Modello di fattura PDF Crabe. Un modello completo di fattura (vecchia implementazione del modello Sponge)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Modello di fattura Crevette. Template completo per le fatture (Modello raccomandato)
-TerreNumRefModelDesc1=Restituisce un numero nel formato %syymm-nnnn per le fatture, %syymm-nnnn per le note di credito e %syymm-nnnn per i versamenti, dove yy è l'anno, mm è il mese e nnnn è una sequenza progressiva, senza salti e che non si azzera.
-MarsNumRefModelDesc1=restituisce un numero nel formato %saamm-nnnn per fatture standard, %syymm-nnnn per le fatture sostitutive, %syymm-nnnn per le note d'addebito e %syymm-nnnn per le note di credito dove yy sta per anno, mm per mese e nnnn è una sequenza progressiva, senza salti e che non si azzera.
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Un altro modello di numerazione con sequenza $ syymm è già esistente e non è compatibile con questo modello. Rimuovere o rinominare per attivare questo modulo.
-CactusNumRefModelDesc1=Restituisce il numero con formato %syymm-nnnn per le fatture standard, %syymm-nnnn per le note di credito e %syymm-nnnn per le fatture di acconto dove yy è l'anno, mm è il mese e nnnn è una sequenza senza interruzioni e senza ritorno a 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Motivo di chiusura anticipata
 EarlyClosingComment=Nota di chiusura anticipata
 ##### Types de contacts #####
@@ -562,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Elimina template di fattura
 ConfirmDeleteRepeatableInvoice=Sei sicuro di voler eliminare il modello di fattura?
 CreateOneBillByThird=Crea una fattura per soggetto terzo (altrimenti, una fatture per ordine)
-BillCreated=%s fattura creata
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Stato della generazione del documento
 DoNotGenerateDoc=Non generare il documento
 AutogenerateDoc=Genera automaticamente il documento
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index c9877141918..111b2988d7b 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Informazioni di login
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Ultime azioni
 BoxLastContracts=Ultimi contratti
 BoxLastContacts=Ultimi contatti/indirizzi
 BoxLastMembers=Ultimi membri
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Ultimi interventi
 BoxCurrentAccounts=Saldo conti aperti
 BoxTitleMemberNextBirthdays=Compleanni di questo mese (membri)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Ultime %s notizie da %s
 BoxTitleLastProducts=Prodotti/Servizi: ultimi %s modificati
 BoxTitleProductsAlertStock=Prodotti: allerta scorte
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Ultime %s spedizioni cliente
 NoRecordedShipments=Nessuna spedizione cliente registrata
 BoxCustomersOutstandingBillReached=Clienti con limite eccezionale raggiunto
 # Pages
-AccountancyHome=Contabilità
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Progetti convalidati
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 8de361ac0e1..f3d7cf290e0 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Area tag/categorie fornitori
 CustomersCategoriesArea=Area tag/categorie clienti
 MembersCategoriesArea=Area tag/categorie membri
 ContactsCategoriesArea=Area tag/categorie contatti
-AccountsCategoriesArea=Area tag/categorie conti
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Area tag/categorie progetti
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categorie
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assegna la categoria al fornitore
 ShowCategory=Mostra tag/categoria
 ByDefaultInList=Default nella lista
 ChooseCategory=Choose category
-StocksCategoriesArea=Categorie magazzini
-ActionCommCategoriesArea=Categorie eventi
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Pagina-Contenitore delle Categorie
 UseOrOperatorForCategories=Uso o operatore per le categorie
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index a5ca94be7b1..8bbcf4e6bab 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -43,9 +43,10 @@ Individual=Privato
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Società madre
 Subsidiaries=Controllate
-ReportByMonth=Rapporto per mese
-ReportByCustomers=Segnalato dal cliente
-ReportByQuarter=Report per trimestre
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Titolo
 RegisteredOffice=Sede legale
 Lastname=Cognome
@@ -172,14 +173,20 @@ ProfId1ES=CIF/NIF
 ProfId2ES=Núm seguridad social
 ProfId3ES=CNAE
 ProfId4ES=Núm colegiado
-ProfId5ES=Codice EORI
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=SIREN
 ProfId2FR=SIRET
 ProfId3FR=NAF, vecchio APE
 ProfId4FR=RCS/RM
-ProfId5FR=Codice EORI
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=Cod. Fisc.
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -198,11 +205,12 @@ ProfId3IN=-
 ProfId4IN=-
 ProfId5IN=-
 ProfId6IN=-
-ProfId1IT=-
-ProfId2IT=-
-ProfId3IT=-
-ProfId4IT=-
+ProfId1IT=C.C.I.A.A.
+ProfId2IT=R.E.A.
+ProfId3IT=Iscr. trib.
+ProfId4IT=Cod. Fisc.
 ProfId5IT=Codice EORI
+ProfId6IT=Cod. Fisc.
 ProfId1LU=Id. prof. 1 (R.C.S. Lussemburgo)
 ProfId2LU=Id. prof. 2 (Permesso d'affari)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=NIPC
 ProfId2PT=numero di sicurezza sociale
 ProfId3PT=numero registrazione commerciale
 ProfId4PT=Conservatorio
-ProfId5PT=Codice EORI
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -255,7 +263,7 @@ ProfId1RO=Prof ID 1 (CUI)
 ProfId2RO=Prof ID 2 (Nr. Immatricolazione)
 ProfId3RO=Prof ID 3 (CAEN)
 ProfId4RO=Prof ID 5 (EUID)
-ProfId5RO=Codice EORI
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=OGRN
 ProfId2RU=INN
@@ -400,7 +408,7 @@ ExportCardToFormat=Esportazione scheda nel formato
 ContactNotLinkedToCompany=Contatto non collegato ad alcuna società
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Senza accesso a Dolibarr
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_1=Soggetti terzi (aziende, fondazioni, persone fisiche) e dettagli
 ExportDataset_company_2=Contatti e loro attributi
 ImportDataset_company_1=Third-parties and their properties
 ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Fatture scadute
 OutstandingBill=Max. fattura in sospeso
 OutstandingBillReached=Raggiunto il massimo numero di fatture scadute
 OrderMinAmount=Quantità minima per l'ordine
-MonkeyNumRefModelDesc=Restituisce un numero con formato %syymm-nnnn per il codice cliente e %syymm-nnnn per il codice fornitore, in cui yy è  l'anno, mm è il mese e nnnn è una sequenza progressiva senza interruzioni e che non ritorna a 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Codice cliente/fornitore libero. Questo codice può essere modificato in qualsiasi momento.
 ManagingDirectors=Nome Manager(s) (CEO, direttore, presidente...)
 MergeOriginThirdparty=Duplica soggetto terzo (soggetto terzo che stai eliminando)
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index a7638fb2824..0ef1e6a1a0c 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=IVA incassata
 StatusToPay=Pagare
 SpecialExpensesArea=Area per pagamenti straordinari
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Tassa o contributo
 SocialContributions=Tasse o contributi
 SocialContributionsDeductibles=Tasse o contributi deducibili
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Pagamento fattura attiva
 PaymentSupplierInvoice=pagamento fattura fornitore
 PaymentSocialContribution=Pagamento delle imposte sociali/fiscali
 PaymentVat=Pagamento IVA
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Elenco dei pagamenti
 ListOfCustomerPayments=Elenco dei pagamenti dei clienti
 ListOfSupplierPayments=Elenco dei pagamenti fornitore
@@ -104,6 +106,8 @@ LT2PaymentES=Pagamento IRPF (Spagna)
 LT2PaymentsES=Pagamenti IRPF (Spagna)
 VATPayment=Pagamento IVA
 VATPayments=Pagamenti IVA
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Rimborso IVA
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=Nessun assegno in attesa di deposito.
 DateChequeReceived=Data di ricezione assegno
 NbOfCheques=No. of checks
 PaySocialContribution=Paga tassa/contributo
-ConfirmPaySocialContribution=Sei sicuro di voler classificare questa tassa/contributo come pagato?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Cancella il pagamento della tassa/contributo
-ConfirmDeleteSocialContribution=Sei sicuro di voler cancellare il pagamento di questa tassa/contributo?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 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>
@@ -163,6 +175,7 @@ RulesResultInOut=- Include i pagamenti reali di fatture, spese e IVA. <br>- Si b
 RulesCADue=- Include le fatture scadute del cliente indipendentemente dal fatto che siano pagate o meno. <br> - Si basa sulla data di fatturazione di queste fatture. <br>
 RulesCAIn=- Comprende le fatture effettivamente pagate dai clienti.<br/>- Si basa sulla data dei pagamenti.<br/>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report per IVA cliente riscossa e pagata
 VATReportByQuartersInInputOutputMode=Resoconto imposte di vendita, sia riscosse che pagate
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Sottotipo Pcg
 InvoiceLinesToDispatch=Riga di fattura da spedire *consegnare
 ByProductsAndServices=Per prodotti e servizi
 RefExt=Referente esterno
-ToCreateAPredefinedInvoice=Per creare un modello di fattura, crea una fattura standard e poi, senza convalidarla, clicca sul pulsante "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Collega a ordine
 Mode1=Metodo 1
 Mode2=Metodo 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clona nel mese successivo
 SimpleReport=Report semplice
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=Per aliquota iva di vendita
 TurnoverbyVatrate=Fatturato per aliquota iva di vendita
 TurnoverCollectedbyVatrate=Fatturato per aliquota iva di vendita
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Fatturato di acquisto raccolto
 RulesPurchaseTurnoverDue=- Include le fatture scadute del fornitore, che siano pagate o meno. <br> - Si basa sulla data di fatturazione di queste fatture. <br>
 RulesPurchaseTurnoverIn=- Comprende tutti i pagamenti effettivi delle fatture effettuate ai fornitori. <br> - Si basa sulla data di pagamento di queste fatture <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Include tutte le righe di addebito dal giornale di registrazione acquisti.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Fatturato di acquisto fatturato
 ReportPurchaseTurnoverCollected=Fatturato di acquisto raccolto
 IncludeVarpaysInResults = Includere vari pagamenti nei rapporti
diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
index 0eef308f02a..d08a079e0d9 100644
--- a/htdocs/langs/it_IT/ecm.lang
+++ b/htdocs/langs/it_IT/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File non indicizzato nel database (prova a caricarlo
 ExtraFieldsEcmFiles=File Ecm campi extra
 ExtraFieldsEcmDirectories=Directory Ecm campi extra
 ECMSetup=Configurazione ECM
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index ec5b4234b48..9841a0c1b03 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> non trovata (percorso errato, permessi erra
 ErrorFunctionNotAvailableInPHP=Per questa funzione occorre l'estensione <b>%s</b>, ma non è disponibile in questa versione/configurazione di PHP.
 ErrorDirAlreadyExists=Esiste già una directory con questo nome.
 ErrorFileAlreadyExists=Esiste già un file con questo nome.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File non completamente ricevuto dal server.
 ErrorNoTmpDir=La directory temporanea %s non esiste.
 ErrorUploadBlockedByAddon=Upload bloccato da un plugin di Apache/PHP
@@ -213,7 +214,7 @@ ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source'
 ErrorTooManyErrorsProcessStopped=Troppi errori. Il processo è stato bloccato.
 ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
 ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
+ErrorObjectMustHaveLinesToBeValidated=L'oggetto %s deve contenere almeno una riga per essere convalidato.
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Errore! Impossibile eliminare un pagamento collegato ad una fattura Pagata.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=L'interfaccia pubblica non è stata abilitata
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/it_IT/externalsite.lang b/htdocs/langs/it_IT/externalsite.lang
index c0610ca571d..98a9f5ba9fb 100644
--- a/htdocs/langs/it_IT/externalsite.lang
+++ b/htdocs/langs/it_IT/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Imposta collegamento a sito esterno
-ExternalSiteURL=Indirizzo del sito esterno
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Il modulo ExternalSite non è configurato correttamente.
 ExampleMyMenuEntry=La mia voce di menu
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index b7ba2b5fe0e..839b58d9f6c 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Data modif.
 IPModification=Modification IP
 DateLastModification=Data ultima modifica
 DateValidation=Data di convalida
+DateSigning=Signing date
 DateClosing=Data di chiusura
 DateDue=Data di scadenza
 DateValue=Data di valuta
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Prezzo unitario (netto) (valuta)
 UnitPriceTTC=Prezzo unitario (lordo)
 PriceU=P.U.
 PriceUHT=P.U.(netto)
-PriceUHTCurrency=P.U. (valuta)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=P.U.(lordo)
 Amount=Importo
 AmountInvoice=Importo della fattura
@@ -389,6 +390,8 @@ AmountTotal=Importo totale
 AmountAverage=Importo medio
 PriceQtyMinHT=Prezzo quantità min. tasse escluse
 PriceQtyMinHTCurrency=Prezzo per quantità min. (tasse escluse) (valuta)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentuale
 Total=Totale
 SubTotal=Totale parziale
@@ -523,7 +526,7 @@ Draft=Bozza
 Drafts=Bozze
 StatusInterInvoiced=Fatturato
 Validated=Convalidato
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Convalidato (da produrre)
 Opened=Aperto
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -724,7 +727,7 @@ MenuMembers=Membri
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Tasse | Spese speciali
 ThisLimitIsDefinedInSetup=Limite applicazione (Menu home-impostazioni-sicurezza):%s Kb, limite PHP:%s Kb
-NoFileFound=Nessun documento salvato in questa directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Lingua dell'utente
 CurrentTheme=Tema attuale
 CurrentMenuManager=Gestore dei menu attuale
@@ -870,8 +873,8 @@ TooManyRecordForMassAction=Too many records selected for mass action. The action
 NoRecordSelected=Nessun record selezionato
 MassFilesArea=File creati da azioni di massa
 ShowTempMassFilesArea=Mostra i file creati da azioni di massa
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+ConfirmMassDeletion=Conferma eliminazione massiva
+ConfirmMassDeletionQuestion=Vuoi davvero eliminare %s record selezionati?
 RelatedObjects=Oggetti correlati
 ClassifyBilled=Classificare  fatturata
 ClassifyUnbilled=Classifica non pagata
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Rimuovi la stringa '%s'
 SomeTranslationAreUncomplete=Alcune traduzioni potrebbero essere incomplete, o contenere errori. In questi casi, registrandoti su <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">transifex.com/projects/p/dolibarr/</a>, avrai la possibilità di proporre modifiche, contribuendo così al miglioramento di Dolibarr.
-DirectDownloadLink=Link diretto per il download (pubblico/esterno)
-DirectDownloadInternalLink=Link per il download diretto (richiede accesso e permessi validi)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Scarica documento
 ActualizeCurrency=Aggiorna tasso di cambio
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contatti
 SearchIntoMembers=Membri
 SearchIntoUsers=Utenti
 SearchIntoProductsOrServices=Prodotti o servizi
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Progetti
 SearchIntoMO=Ordini di produzione
 SearchIntoTasks=Compiti
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Tasto scelta rapida
 AssignedTo=Azione assegnata a
 Deletedraft=Elimina bozza
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File condiviso con un link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Seleziona prima un Soggetto terzo...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventario
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Mostra maggiori informazioni
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=Vedi nota privata
@@ -1109,7 +1116,7 @@ APPROVEDInDolibarr=Record %s approved
 DefaultMailModel=Default Mail Model
 PublicVendorName=Public name of vendor
 DateOfBirth=Data di nascita
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Token di autenticazione non più valido, azione eliminata. Prego riprovare
 UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/it_IT/margins.lang b/htdocs/langs/it_IT/margins.lang
index ca1f9ef2849..5fbef6dd78e 100644
--- a/htdocs/langs/it_IT/margins.lang
+++ b/htdocs/langs/it_IT/margins.lang
@@ -22,7 +22,7 @@ ProductService=Prodotto o servizio
 AllProducts=Tutti i prodotti e servizi
 ChooseProduct/Service=Scegli prodotto o servizio
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Metodo di margine per sconti globali
 UseDiscountAsProduct=Come prodotto
 UseDiscountAsService=Come servizio
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 6cc29b824a4..a4e6d97dacb 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Elenco dei membri del progetto (da convalidare)
 MembersListValid=Elenco dei membri validi
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=Elenco dei membri qualificati
 MenuMembersToValidate=Membri da convalidare
 MenuMembersValidated=Membri convalidati
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Membri con adesione da riscuotere
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Scaduta
 MemberStatusPaid=Adesione aggiornata
 MemberStatusPaidShort=Aggiornata
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Membri da convalidare
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Convalidato (nessun abbonamento necessario)
 MemberStatusNoSubscriptionShort=convalidato
@@ -82,6 +87,8 @@ Physical=Fisica
 Moral=Giuridica
 MorAndPhy=Moral and Physical
 Reenable=Riattivare
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Elimina membro
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Formato etichette
 DescADHERENT_ETIQUETTE_TEXT=Testo da stampare nel campo indirizzo di un membro
@@ -162,6 +170,7 @@ DocForLabels=Genera etichette con indirizzi (formato di output impostato: <b>%s<
 SubscriptionPayment=Pagamento adesione
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Statistiche per paese
 MembersStatisticsByState=Statistiche per stato/provincia
 MembersStatisticsByTown=Statistiche per città
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index 12630bc2936..1dfd74bba94 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=Desidero generare alcuni documenti da questo oggetto
 IncludeDocGenerationHelp=Se selezioni questa opzione, verrà generato del codice per aggiungere una casella "Genera documento" al record.
 ShowOnCombobox=Mostra il valore dentro il combobox
 KeyForTooltip=Chiave per tooltip
-CSSClass=Classe CSS
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Non modificabile
 ForeignKey=Chiave esterna
 TypeOfFieldsHelp=Tipo di campi: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]("1" significa che aggiungiamo un pulsante + dopo la combinazione per creare il record, "filtro" può essere "status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)" per esempio)
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index 2a3069cbb23..2929e323c70 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Ordinare
 MakeOrder=Fare ordine
 SupplierOrder=Ordine d'acquisto
 SuppliersOrders=Ordini d'acquisto
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Ordini d'acquisto in corso
 CustomerOrder=Sales Order
 CustomersOrders=Ordini Cliente
@@ -85,7 +87,7 @@ LastModifiedOrders=ultimi %s ordini modificati
 AllOrders=Tutti gli ordini
 NbOfOrders=Numero di ordini
 OrdersStatistics=Statistiche ordini
-OrdersStatisticsSuppliers=Purchase order statistics
+OrdersStatisticsSuppliers=Stastistiche ordini d'acquisto
 NumberOfOrdersByMonth=Numero di ordini per mese
 AmountOfOrdersByMonthHT=Importo ordini per mese (al netto delle imposte)
 ListOfOrders=Elenco degli ordini
@@ -113,11 +115,11 @@ AuthorRequest=Autore della richiesta
 UserWithApproveOrderGrant=Utente autorizzato ad approvare ordini
 PaymentOrderRef=Riferimento pagamento ordine %s
 ConfirmCloneOrder=Vuoi davvero clonare l'ordine <b>%s</b>?
-DispatchSupplierOrder=Receiving purchase order %s
+DispatchSupplierOrder=Ricezione dell'ordine di acquisto %s
 FirstApprovalAlreadyDone=Prima approvazione già fatta
 SecondApprovalAlreadyDone=Seconda approvazione già fatta
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
+SupplierOrderReceivedInDolibarr=Ordine fornitore %s ricevuto %s
+SupplierOrderSubmitedInDolibarr=Ordine di acquisto %s inviato
 SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Altri ordini
 ##### Types de contacts #####
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 31a5514c3b0..de5e093c618 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Gestire una piccola o media azienda con più attività (tutti i m
 CreatedBy=Creato da %s
 ModifiedBy=Modificato da %s
 ValidatedBy=Convalidato da %s
+SignedBy=Signed by %s
 ClosedBy=Chiuso da %s
 CreatedById=Id utente che ha creato
 ModifiedById=Id utente ultima modifica
@@ -244,6 +245,7 @@ NewKeyIs=Queste sono le tue nuove credenziali di accesso
 NewKeyWillBe=Le tue nuove credenziali per loggare al software sono
 ClickHereToGoTo=Clicca qui per andare a %s
 YouMustClickToChange=Devi cliccare sul seguente link per validare il cambio della password
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Se non hai richiesto questo cambio, lascia perdere questa mail. Le tue credenziali sono mantenute al sicuro.
 IfAmountHigherThan=Se l'importo è superiore a <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
index 94881e30be0..805186c19ab 100644
--- a/htdocs/langs/it_IT/productbatch.lang
+++ b/htdocs/langs/it_IT/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Usa lotto/numero di serie
-ProductStatusOnBatch=Sì (è richiesto il lotto/numero di serie)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (è richiesto il lotto/numero di serie)
-ProductStatusOnBatchShort=Sì
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lotto/numero di serie
 atleast1batchfield=Data di scadenza o lotto/numero di serie
@@ -22,3 +24,12 @@ ProductLotSetup=Configurazione del modulo lotto/numero di serie
 ShowCurrentStockOfLot=Mostra la scorta disponibile per la coppia prodotto/lotto
 ShowLogOfMovementIfLot=Mostra il log dei movimenti per la coppia prodotto/lotto
 StockDetailPerBatch=Dettagli magazzino per lotto
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index dfc71f3ed8f..3a648b2422a 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -64,7 +64,7 @@ ProductStatusNotOnSellShort=Non in vendita
 ProductStatusOnBuy=Acquistabile
 ProductStatusNotOnBuy=Da non acquistare
 ProductStatusOnBuyShort=Acquistabile
-ProductStatusNotOnBuyShort=Obsoleto
+ProductStatusNotOnBuyShort=Da non acquistare
 UpdateVAT=Aggiorna iva
 UpdateDefaultPrice=Aggiornamento prezzo predefinito
 UpdateLevelPrices=Aggiorna prezzi per ogni livello
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=Aliquota IVA (per questo fornitore / prodotto)
 DiscountQtyMin=Sconto per questa quantità
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Prodotto predefinito
 PredefinedServicesToSell=Servizio predefinito
 PredefinedProductsAndServicesToSell=Prodotti/servizi predefiniti per la vendita
@@ -313,7 +314,7 @@ LastUpdated=Ultimo aggiornamento
 CorrectlyUpdated=Aggiornato correttamente
 PropalMergePdfProductActualFile=I file utilizzano per aggiungere in PDF Azzurra sono / è
 PropalMergePdfProductChooseFile=Selezionare i file PDF
-IncludingProductWithTag=Compreso prodotto/servizio con tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Prezzo predefinito, prezzo reale può dipendere cliente
 WarningSelectOneDocument=Seleziona almeno un documento
 DefaultUnitToShow=Unità
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index b30159947c7..315dbd04e4a 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Elenco dei compiti
 GoToListOfTimeConsumed=Vai all'elenco del tempo impiegato
 GanttView=Vista Gantt
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Elenco delle proposte commerciali relative al progetto
 ListOrdersAssociatedProject=Elenco degli ordini cliente relativi al progetto
 ListInvoicesAssociatedProject=Elenco delle fatture cliente associate al progetto
@@ -268,3 +269,7 @@ OneLinePerTask=Una riga per compito
 OneLinePerPeriod=Una riga per periodo
 RefTaskParent=Ref. Attività genitore
 ProfitIsCalculatedWith=Il profitto viene calcolato utilizzando
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang
index 7eb57f84fb0..c6e224b8793 100644
--- a/htdocs/langs/it_IT/propal.lang
+++ b/htdocs/langs/it_IT/propal.lang
@@ -59,6 +59,7 @@ ConfirmClonePropal=Vuoi davvero clonare il preventivo<b>%s</b>?
 ConfirmReOpenProp=Vuoi davvero riaprire il preventivo <b>%s</b>?
 ProposalsAndProposalsLines=Preventivo e righe
 ProposalLine=Riga di preventivo
+ProposalLines=Proposal lines
 AvailabilityPeriod=Tempi di consegna
 SetAvailability=Imposta i tempi di consegna
 AfterOrder=dopo ordine
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index b2da8fe996d..161a6eea248 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -19,8 +19,8 @@ Stock=Scorta
 Stocks=Scorte
 MissingStocks=Scorte mancanti
 StockAtDate=Scorte alla data
-StockAtDateInPast=Data nel passato
-StockAtDateInFuture=Data in futuro
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Scorte per lotto / seriale
 LotSerial=Lotti / Seriali
 LotSerialList=Elenco lotti / seriali
@@ -37,8 +37,8 @@ AllWarehouses=Tutti i magazzini
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Includi anche bozze di ordini
 Location=Ubicazione
-LocationSummary=Ubicazione abbreviata
-NumberOfDifferentProducts=Numero di differenti prodotti
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Numero totale prodotti
 LastMovement=Ultimo movimento
 LastMovements=Ultimi movimenti
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Valore magazzini
 UserWarehouseAutoCreate=Crea anche un magazzino alla creazione di un utente
 AllowAddLimitStockByWarehouse=Gestisci anche i valori minimo e desiderato della scorta per abbinamento (prodotto - magazzino) oltre ai valori per prodotto
 RuleForWarehouse=Regola per i magazzini
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Imposta un magazzino sugli ordini di vendita
 UserDefaultWarehouse=Imposta un magazzino per gli utenti
 MainDefaultWarehouse=Magazzino predefinito
@@ -97,15 +98,16 @@ RealStockDesc=Scorte fisiche/reali è la giacenza attualmente nei magazzini.\n
 RealStockWillAutomaticallyWhen=Le scorte fisiche saranno modificate secondo le seguenti regole (come definito nel modulo Magazzino):
 VirtualStock=Scorte virtuali
 VirtualStockAtDate=Stock virtuale alla data
-VirtualStockAtDateDesc=Stock virtuale una volta terminati tutti gli ordini in sospeso che si prevede di eseguire prima della data
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Lo stock virtuale è lo stock calcolato disponibile una volta che tutte le azioni aperte / in sospeso (che interessano le scorte) sono state chiuse (ordini di acquisto ricevuti, ordini di vendita spediti, ordini di produzione prodotti, ecc.)
+AtDate=At date
 IdWarehouse=Id magazzino
 DescWareHouse=Descrizione magazzino
 LieuWareHouse=Ubicazione magazzino
 WarehousesAndProducts=Magazzini e prodotti
 WarehousesAndProductsBatchDetail=Magazzini e prodotti (con indicazione dei lotti/numeri di serie)
 AverageUnitPricePMPShort=Media ponderata prezzo
-AverageUnitPricePMPDesc=Il prezzo unitario medio di input che abbiamo dovuto pagare ai fornitori per ottenere il prodotto nel nostro magazzino.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Prezzo di vendita unitario
 EstimatedStockValueSellShort=Valori di vendita
 EstimatedStockValueSell=Valori di vendita
@@ -145,7 +147,7 @@ Replenishments=Rifornimento
 NbOfProductBeforePeriod=Quantità del prodotto %s in magazzino prima del periodo selezionato (< %s)
 NbOfProductAfterPeriod=Quantità del prodotto %s in magazzino dopo il periodo selezionato (< %s)
 MassMovement=Movimentazione di massa
-SelectProductInAndOutWareHouse=Seleziona un magazzino di origine e un magazzino di destinazione, un prodotto e una quantità, quindi fai clic su "%s". Una volta fatto questo per tutti i movimenti richiesti, clicca su "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Ricezioni per questo ordine
 StockMovementRecorded=Movimentazione di scorte registrata
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Etichetta per lo spostamento di magazzino
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Codice di inventario o di spostamento
 IsInPackage=Contenuto nel pacchetto
@@ -183,6 +185,7 @@ inventoryCreatePermission=Crea nuovo inventario
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventario
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -225,20 +228,30 @@ ListInventory=Elenco
 StockSupportServices=Stock management supports Services
 StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Ricevi prodotti
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
+StockIncreaseAfterCorrectTransfer=Aumento tramite correzione/trasferimento
+StockDecreaseAfterCorrectTransfer=Diminuzione tramite correzione/trasferimento
+StockIncrease=Aumento scorte
+StockDecrease=Diminuzione scorte
 InventoryForASpecificWarehouse=Inventario per un magazzino specifico
 InventoryForASpecificProduct=Inventario per un prodotto specifico
 StockIsRequiredToChooseWhichLotToUse=Le scorte sono necessarie per scegliere quale lotto utilizzare
 ForceTo=Costringere
 AlwaysShowFullArbo=Visualizza l'albero completo del magazzino sul popup dei collegamenti del magazzino (avvertenza: questo potrebbe diminuire drasticamente le prestazioni)
 StockAtDatePastDesc=È possibile visualizzare qui lo stock (stock reale) in una determinata data nel passato
-StockAtDateFutureDesc=È possibile visualizzare qui lo stock (stock virtuale) in una determinata data futura
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Scorta attuale
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Scegli il file da importare e poi clicca sull'icona %s
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Riapri
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index e178c00850b..c963ccaa797 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Fornitori
 SuppliersInvoice=Fattura fornitore
+SupplierInvoices=Fatture Fornitore
 ShowSupplierInvoice=Vedi fattura fornitore
 NewSupplier=Nuovo fornitore
 History=Storico
diff --git a/htdocs/langs/it_IT/ticket.lang b/htdocs/langs/it_IT/ticket.lang
index e40b57082bf..84791ff6656 100644
--- a/htdocs/langs/it_IT/ticket.lang
+++ b/htdocs/langs/it_IT/ticket.lang
@@ -19,17 +19,17 @@
 #
 
 Module56000Name=Ticket
-Module56000Desc=Sistema di ticket per la gestione di problemi o richieste
+Module56000Desc=Sistema di tickets per la gestione di problemi o richieste
 
 Permission56001=Visualizza tickets
-Permission56002=Modify tickets
-Permission56003=Delete tickets
+Permission56002=Modifica tickets
+Permission56003=Cancella tickets
 Permission56004=Manage tickets
 Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
 
-TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
+TicketDictType=Ticket - Tipologie
+TicketDictCategory=Ticket - Gruppi
+TicketDictSeverity=Ticket - Importanza
 TicketDictResolution=Ticket - Risoluzione
 
 TicketTypeShortCOM=Commercial question
@@ -45,13 +45,13 @@ TicketSeverityShortHIGH=Alto
 TicketSeverityShortBLOCKING=Critico, bloccante
 
 ErrorBadEmailAddress=Campo '%s' non corretto
-MenuTicketMyAssign=My tickets
-MenuTicketMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+MenuTicketMyAssign=Miei tickets
+MenuTicketMyAssignNonClosed=Miei tickets aperti
+MenuListNonClosed=Tickets aperti
 
 TypeContact_ticket_internal_CONTRIBUTOR=Contributore
-TypeContact_ticket_internal_SUPPORTTEC=Assigned user
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_internal_SUPPORTTEC=Assegnato a
+TypeContact_ticket_external_SUPPORTCLI=Contatto cliente / tracciamento incidente
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
 OriginEmail=Email source
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Tipo
 Severity=Gravità
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Per inviare e-mail dal messaggio ticket
@@ -77,7 +79,7 @@ MailToSendTicketMessage=Per inviare e-mail dal messaggio ticket
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
+TicketSetup=Ticket impostazioni
 TicketSettings=Impostazioni
 TicketSetupPage=
 TicketPublicAccess=A public interface requiring no identification is available at the following url
@@ -97,7 +99,7 @@ PublicInterface=Interfaccia pubblica
 TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
 TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
 TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
-TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
+TicketPublicInterfaceTextHome=Puoi creare una richiesta si assistenza/supporto oppure visualizzarne uno esistente con il suo numero ID di richiesta.
 TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
 TicketPublicInterfaceTopicLabelAdmin=Interface title
 TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Attivare l'interfaccia pubblica
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Modelli di documenti per i ticket
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Invia e-mail quando viene aggiunto un nuovo messaggio
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Invia e-mail quando si aggiunge un nuovo messaggio dall'interfaccia pubblica (all'utente assegnato o all'e-mail di notifica a (aggiorna) e / o all'e-mail di notifica a)
 TicketPublicNotificationNewMessageDefaultEmail=Notifiche via email (aggiornamento)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Invia e-mail notifiche di nuovi messaggi a questo indirizzo se al ticket non è stato assegnato un utente o se l'utente non ha un indirizzo e-mail.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -155,7 +157,7 @@ CreateTicket=Create ticket
 EditTicket=Edita ticket
 TicketsManagement=Gestione dei ticket
 CreatedBy=Creato da
-NewTicket=New Ticket
+NewTicket=Nuovo Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
 TicketCategory=Gruppo
@@ -198,7 +200,7 @@ TicketGoIntoContactTab=Please go into "Contacts" tab to select them
 TicketMessageMailIntro=Introduction
 TicketMessageMailIntroHelp=Questo testo viene aggiunto solo all'inizio dell'email e non verrà salvato
 TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroText=Buongiorno,<br>Abbiamo risposto alla sua richiesta. Messaggio:<br>
 TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
 TicketMessageMailSignature=Firma
 TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
@@ -251,32 +253,32 @@ ShowListTicketWithTrackId=Visualizza l'elenco dei ticket dall'ID traccia
 ShowTicketWithTrackId=Display ticket from track ID
 TicketPublicDesc=You can create a support ticket or check from an existing ID.
 YourTicketSuccessfullySaved=Ticket has been successfully saved!
-MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s.
-PleaseRememberThisId=Please keep the tracking number that we might ask you later.
-TicketNewEmailSubject=Conferma creazione ticket - Rif. %s (ID biglietto pubblico %s)
-TicketNewEmailSubjectCustomer=New support ticket
+MesgInfosPublicTicketCreatedWithTrackId=Un nuovo ticket è stato creato con ID: %s e Rif: %s.
+PleaseRememberThisId=Conserva il numero di richiesta, potrebbe essere utile per risalire velocemente al suo ticket.
+TicketNewEmailSubject=Conferma creazione ticket - Rif. %s (Numero ID della richiesta: %s)
+TicketNewEmailSubjectCustomer=Nuovo ticket di supporto
 TicketNewEmailBody=Questa email automatica conferma che è stato registrato un nuovo ticket
 TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
-TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
-TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
+TicketNewEmailBodyInfosTicket=Informazioni utili per tua richiesta
+TicketNewEmailBodyInfosTrackId=Numero ID della tua richiesta: %s
 TicketNewEmailBodyInfosTrackUrl=Puoi seguire l'avanzamento del ticket cliccando il link qui sopra
 TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
 TicketPublicInfoCreateTicket=Questo modulo consente di registrare un ticket di supporto nel nostro sistema di gestione ticketing.
 TicketPublicPleaseBeAccuratelyDescribe=Descrivi il problema dettagliatamente. Fornisci più informazioni possibili per consentirci di identificare la tua richiesta.
-TicketPublicMsgViewLogIn=Please enter ticket tracking ID
+TicketPublicMsgViewLogIn=Inserisci qui il numero della sua richista ID
 TicketTrackId=Public Tracking ID
 OneOfTicketTrackId=One of your tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found!
+ErrorTicketNotFound=Richiesta numero ID %s non trovata!
 Subject=Oggetto
 ViewTicket=Vedi ticket
 ViewMyTicketList=Vedi l'elenco dei miei ticket
 ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=Nuovo biglietto creato - Rif. %s (ID biglietto pubblico %s)
+TicketNewEmailSubjectAdmin=Nuovo ticket creato - Rif. %s (ID biglietto pubblico %s)
 TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
 SeeThisTicketIntomanagementInterface=See ticket in management interface
 TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
+ErrorEmailOrTrackingInvalid=Numero richiesta ID o email errata
 OldUser=Old user
 NewUser=Nuovo utente
 NumberOfTicketsByMonth=Numero di ticket per mese
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index 199b2cb1d45..cc86bc427f5 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -68,11 +68,11 @@ CreateDolibarrThirdParty=Crea soggetto terzo
 LoginAccountDisableInDolibarr=Account disattivato in Dolibarr
 UsePersonalValue=Usa valore personalizzato
 InternalUser=Utente interno
-ExportDataset_user_1=Users and their properties
+ExportDataset_user_1=Utenti e dettagli
 DomainUser=Utente di dominio %s
 Reactivate=Riattiva
 CreateInternalUserDesc=Questo modulo permette di creare un utente interno per la vostra Azienda/Fondazione. Per creare un utente esterno (cliente, fornitore, ...), utilizzare il pulsante "Crea utente" nella scheda soggetti terzi.
-InternalExternalDesc=Un utente <b> interno </b> è un utente che fa parte della tua azienda / organizzazione. <br> Un utente <b>  esterno </b> è un cliente, un fornitore o altro (La creazione di un utente esterno per una terza parte può essere effettuata dal record di contatto della terza parte). <br> <br> In entrambi i casi, le autorizzazioni definiscono i diritti su Dolibarr, anche l'utente esterno può avere un gestore di menu diverso rispetto all'utente interno (Vedi Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Autorizzazioni ereditate dall'appartenenza al gruppo.
 Inherited=Ereditato
 UserWillBe=L'utente creato sarà
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index 64f05d19a0a..b6762895710 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Codice
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Crea qui i siti web che desideri utilizzare. Quindi vai nel menu Siti Web per modificarli.
 DeleteWebsite=Cancella sito web
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+ConfirmDeleteWebsite=Sei sicuro di voler eliminare questo sito web? Verranno rimosse anche tutte le pagine e i suoi contenuti. I file caricati (come quelli nella directory medias, nel modulo ECM, ...) non verranno cancellati.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Titolo/alias della pagina
@@ -46,12 +46,12 @@ SetHereVirtualHost= <u> Usa con Apache / NGinx / ... </u> <br> Crea sul tuo serv
 ExampleToUseInApacheVirtualHostConfig=Esempio da utilizzare nella configurazione dell'host virtuale Apache:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Controlla anche che l'utente dell'host virtuale (ad esempio www-data) abbia <strong> %s </strong> le autorizzazioni sui file in <br> <strong> %s
 ReadPerm=Da leggere
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr= <u> Anteprima %s in una nuova scheda. </u> <br> <br> %s sarà servito dal server Dolibarr pertanto non è necessario alcun server web aggiuntivo (come Apache, Nginx, IIS) per essere installato. <br> L'inconveniente è che gli URL delle pagine non sono facili da usare e iniziano con il percorso del tuo Dolibarr. <br> URL servito da Dolibarr: <br> <strong> %s </strong> <br> <br> Per utilizzare il proprio server web esterno per servire questo sito, creare un host virtuale sul server Web che punta sulla directory <br> <strong> %s </strong> <br> quindi immettere il nome di questo server virtuale nelle proprietà di questo sito Web e fare clic sul collegamento "Test / Distribuisci sul Web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -91,9 +91,9 @@ YouMustDefineTheHomePage=You must first define the default Home page
 OnlyEditionOfSourceForGrabbedContentFuture=Avvertenza: la creazione di una pagina Web importando una pagina Web esterna è riservata agli utenti esperti. A seconda della complessità della pagina di origine, il risultato dell'importazione potrebbe differire dall'originale. Inoltre, se la pagina di origine utilizza stili CSS comuni o JavaScript in conflitto, potrebbe interrompere l'aspetto o le funzionalità dell'editor del sito Web quando si lavora su questa pagina. Questo metodo è un modo più rapido per creare una pagina, ma si consiglia di creare la nuova pagina da zero o da un modello di pagina suggerito. <br> Nota anche che l'editor inline potrebbe non funzionare correttamente se utilizzato su una pagina esterna linkata
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
+ImagesShouldBeSavedInto=Le immagini devono essere salvate in una cartella
+WebsiteRootOfImages=Cartella principale per le immagini del sito
+SubdirOfPage=Cartella dedicata alla pagina
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
@@ -137,3 +137,11 @@ PagesRegenerated=%s pagina(e)/contenitore(i) rigenerato
 RegenerateWebsiteContent=Rigenera i file della cache del sito web
 AllowedInFrames=Consentito nel frame
 DefineListOfAltLanguagesInWebsiteProperties=Definisce l'elenco di tutte le lingue disponibili nelle proprietà del sito web.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/it_IT/zapier.lang b/htdocs/langs/it_IT/zapier.lang
index 5ec7be329d2..93f50b1fd94 100644
--- a/htdocs/langs/it_IT/zapier.lang
+++ b/htdocs/langs/it_IT/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier per Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier per modulo Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Installazione di Zapier per Dolibarr
+ZapierForDolibarrSetup=Installazione di Zapier per Dolibarr
 ZapierDescription=Interfaccia con Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 5b7b279db04..3a11fa8d804 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=請求書の境界線
 ExpenseReportLines=紐付けする経費報告書の行
 ExpenseReportLinesDone=経費報告書の境界線
 IntoAccount=会計科目との紐付け行
-TotalForAccount=会計科目の合計
+TotalForAccount=総会計勘定
 
 
 Ventilate=紐付
@@ -209,7 +209,7 @@ Codejournal=仕訳帳
 JournalLabel=仕訳帳ラベル
 NumPiece=個数番号
 TransactionNumShort=数トランザクション
-AccountingCategory=パーソナライズされたグループ
+AccountingCategory=カスタムグループ
 GroupByAccountAccounting=総勘定元帳勘定によるグループ化
 GroupBySubAccountAccounting=補助元帳アカウントでグループ化
 AccountingAccountGroupsDesc=ここで、会計科目のいくつかのグループを定義できる。それらは、パーソナライズされた会計レポートに使用される。
@@ -279,8 +279,8 @@ DescVentilDoneExpenseReport=経費報告書の行とその手数料会計科目
 Closure=年次閉鎖
 DescClosure=検証されていない月ごとの動きの数とすでに開いている会計年度をここで参照すること
 OverviewOfMovementsNotValidated=ステップ1 /検証されていない動きの概要。 (決算期に必要)
-AllMovementsWereRecordedAsValidated=すべての動きは検証済みとして記録された
-NotAllMovementsCouldBeRecordedAsValidated=すべての動きを検証済みとして記録できるわけではない
+AllMovementsWereRecordedAsValidated=すべての動きは検証済として記録された
+NotAllMovementsCouldBeRecordedAsValidated=すべての動きを検証済として記録できるわけではない
 ValidateMovements=動きを検証する
 DescValidateMovements=書き込み、レタリング、削除の変更または削除は禁止される。演習のすべてのエントリを検証する必要がある。検証しないと、閉じることができない。
 
@@ -385,7 +385,7 @@ SaleEECWithoutVATNumber=VATなしのEECでの販売ですが、取引先のVATID
 
 ## Dictionary
 Range=会計科目の範囲
-Calculated=計算済み
+Calculated=計算済
 Formula=式
 
 ## Error
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=まだ紐付けされていない行。メニュー<a
 
 ## Import
 ImportAccountingEntries=会計仕訳
+ImportAccountingEntriesFECFormat=会計項目 - FEC形式
+FECFormatJournalCode=コード 日記帳 (JournalCode)
+FECFormatJournalLabel=ラベル 日記帳 (JournalLib)
+FECFormatEntryNum=単体番号 (EcritureNum)
+FECFormatEntryDate=単体日付 (EcritureDate)
+FECFormatGeneralAccountNumber=一般勘定番号 (CompteNum)
+FECFormatGeneralAccountLabel=一般勘定ラベル (CompteLib)
+FECFormatSubledgerAccountNumber=補助元帳勘定番号 (CompAuxNum)
+FECFormatSubledgerAccountLabel=補助元帳勘定番号 (CompAuxLib)
+FECFormatPieceRef=単体識別符号 (PieceRef)
+FECFormatPieceDate=単体日付作成 (PieceDate)
+FECFormatLabelOperation=ラベル 運用 (EcritureLib)
+FECFormatDebit=借方 (Debit)
+FECFormatCredit=貸方(Credit)
+FECFormatReconcilableCode=調整可能なコード (EcritureLet)
+FECFormatReconcilableDate=調整可能日付 (DateLet)
+FECFormatValidateDate=検証された単体日付 (ValidDate)
+FECFormatMulticurrencyAmount=多通貨額 (Montantdevise)
+FECFormatMulticurrencyCode=他通貨 コード (Idevise)
+
 DateExport=日付のエクスポート
 WarningReportNotReliable=警告、このレポートは元帳に基づいていないため、元帳で手動で変更されたトランザクションは含まれていない。仕訳帳化が最新の場合、簿記ビューはより正確です。
 ExpenseReportJournal=経費報告仕訳帳
 InventoryJournal=在庫仕訳帳
+
+NAccounts=%sアカウント
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index fc6e2f4da0b..0cfbdae5f0d 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=接続ロックを解除する
 YourSession=あなたのセッション
 Sessions=利用者のセッション
 WebUserGroup=Webサーバのユーザ/グループ
+PermissionsOnFiles=ファイルのアクセス許可
 PermissionsOnFilesInWebRoot=Webルートディレクトリ内のファイルに対するアクセス許可
 PermissionsOnFile=ファイル%sのアクセス許可
 NoSessionFound=PHP構成では、アクティブなセッションの一覧表示が許可されていないもよう。セッションの保存に使用されるディレクトリ ( <b> %s </b> ) は、保護されている可能性がある ( たとえば、OSのアクセス許可またはPHPディレクティブopen_basedirによって ) 。
@@ -45,7 +46,7 @@ DBSortingCharset=データソート用のデータベース·キャラセット
 HostCharset=ホストのキャラセット
 ClientCharset=クライアントのキャラセット
 ClientSortingCharset=クライアントの文字照合則
-WarningModuleNotActive=モジュール<b>%sを</b>有効<b>に</b>する必要<b>が</b>ある
+WarningModuleNotActive=モジュール<b>%s</b>を有効にする必要がある
 WarningOnlyPermissionOfActivatedModules=ここには、活性化されたモジュールに関連する権限のみが表示される。ホーム->設定->モジュール ページで他のモジュールを活性化できる。
 DolibarrSetup=Dolibarrインストールまたはアップグレード
 InternalUser=内部ユーザ
@@ -62,6 +63,7 @@ IfModuleEnabled=注：【はい】は、モジュールの<b>%sが</b>有効<b>
 RemoveLock=ファイル<b>%s </b>が存在する場合、それを削除/改名することで、更新/インストール のツールが使用可能になる。
 RestoreLock=ファイル<b>%s </b>を読取権限のみで復元すると、これ以上の更新/インストール のツール使用が不可になる。
 SecuritySetup=セキュリティの設定
+PHPSetup=PHPのセットアップ
 SecurityFilesDesc=ファイルのアップロードに関するセキュリティ関連オプションをここで定義。
 ErrorModuleRequirePHPVersion=エラー、このモジュールは、PHPのバージョン%s以上が必要 
 ErrorModuleRequireDolibarrVersion=エラー、このモジュールはDolibarrバージョン%s以上が必要 
@@ -101,7 +103,7 @@ NextValueForDeposit=次の値 ( 頭金 )
 NextValueForReplacements=次の値 ( 置換 ) 
 MustBeLowerThanPHPLimit=注：現在、PHP構成では、このパラメーターの値に関係なく、アップロードの最大ファイルサイズが<b> %s </b>%sに制限されている。
 NoMaxSizeByPHPLimit=注：お使いのPHP設定では無制限
-MaxSizeForUploadedFiles=アップロードファイルの最大サイズ ( 0 べてのアップロードを禁止 ) 
+MaxSizeForUploadedFiles=アップロードファイルの最大サイズ ( 0 で、すべてのアップロード禁止 ) 
 UseCaptchaCode=ログインページで、グラフィカルコード ( CAPTCHA ) を使用して
 AntiVirusCommand=アンチウイルスのコマンドへのフルパス
 AntiVirusCommandExample=ClamAvデーモンの例： ( clamav-daemonが必要 )  /usr/bin/clamdscan <br> ClamWinの例： ( 非常に非常に遅い )  c:\\Program~1\\ClamWin\\bin\\clamscan.exe
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=この領域は管理機能を提供する。メニューを
 Purge=パージ
 PurgeAreaDesc=このページでは、Dolibarrによって生成または保存されたすべてのファイル ( 一時ファイルまたは<b> %s </b>ディレクトリ内のすべてのファイル ) を削除できる。通常、この機能を使用する必要はない。これは、Webサーバーによって生成されたファイルを削除する権限を提供しないプロバイダーによってDolibarrがホストされているユーザの回避策として提供されている。
 PurgeDeleteLogFile=Syslogモジュール用に定義された<b>%s </b>を含むログファイルを削除する ( データを失うリスクはない ) 
-PurgeDeleteTemporaryFiles=すべてのログファイルと一時ファイルを削除する(データを失うリスクなし)。注：一時ファイルの削除は、一時ディレクトリが24時間以上前に作成された場合にのみ実行される。
+PurgeDeleteTemporaryFiles=すべてのログファイルと一時ファイルを削除する（データを失うリスクはない）。パラメータは、'tempfilesold'、 'logfiles'、または両方の 'tempfilesold+logfiles' にすることができる。注：一時ファイルの削除は、一時ディレクトリが24時間以上前に作成された場合にのみ実行される。
 PurgeDeleteTemporaryFilesShort=ログと一時ファイルを削除する
 PurgeDeleteAllFilesInDocumentsDir=ディレクトリ：<b> %s</b> 内のすべてのファイルを削除する。 <br>これにより、要素 ( 取引先、請求書など ) に関連する生成されたすべてのドキュメント、ECMモジュールにアップロードされたファイル、データベースのバックアップダンプ、および一時ファイルが削除される。
 PurgeRunNow=今パージ
@@ -232,6 +234,7 @@ BoxesAvailable=利用可能なウィジェット
 BoxesActivated=ウィジェットがアクティブ化されました
 ActivateOn=でアクティブに
 ActiveOn=でアクティブ化
+ActivatableOn=でアクティブ化可能
 SourceFile=ソースファイル
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=JavaScriptが無効になっていない場合にのみ使用可能
 Required=必須
@@ -347,9 +350,10 @@ LastActivationAuthor=最新のアクティベーション作成者
 LastActivationIP=最新のアクティベーションIP
 UpdateServerOffline=サーバーをオフラインで更新する
 WithCounter=カウンターを管理する
-GenericMaskCodes=任意の番号マスクを入力することができる。このマスクには、以下のタグを使用することができる。 <br> <b>{000000}</b>各%sにインクリメントされる番号に対応している。カウンタの希望の長さなどの多くのゼロとして入力する。カウンタは、マスクとして多くのゼロとして持たせるために、左からゼロで完了する予定。 <br> <b>{000000+000}</b>以前のが、最初の%sから始まる適用されている+記号の右にある数字に対応するオフセットと同じ。 <br> <b>{000000@x}</b>前のと同じ が、カウンタがx月に達した時にゼロにリセットされる (xは 1〜12、または0の間でコンフィギュレーションで定義された会計年度の初めの数ヶ月を使用するか、99で毎月ゼロにリセット ) 。このオプションを使用すると、xが2以上である場合、 {yy}{mm} または {yyyy}{mm} のシーケンスも要求される。 <br> <b>{dd}</b>日 ( 01〜31 ) 。 <br> <b>{mm}</b>月 ( 01〜12 ) 。 <br><b>{yy}</b>、<b>{yyyy}</b>または <b>{y}</b> 年は 2、4、または1桁の数値。 <br>
-GenericMaskCodes2= <b> {cccc} </b>n文字のクライアントコード<br><b> {cccc000} </b>n文字のクライアントコードの後にカウンターが続く。お客様専用のこのカウンターは、グローバルカウンターと同時にリセットされる。 <br> <b> {tttt} </b> n文字のt取引先種別のコード ( メニュー【ホーム】-【設定】-【辞書】-【取引先の種別】を参照 ) 。このタグを追加すると、取引先の種類ごとにカウンターが異なる。 <br>
+GenericMaskCodes=任意の番号付マスクを入力できる。このマスクでは、次のタグを使用できる。<br><b> {000000} </b>は、各%sでインクリメントされる番号に対応する。カウンタで希望する桁数と同じ数のゼロを入力する。カウンタは、マスクのゼロと同じ桁数になるよう、左からゼロを補完する。 <br> <b>{000000+000}</b>前のものと同じだが、+記号の右側の数字に対応するオフセットが最初の%sから適用される。 <br> <b> {000000@x} </b>前のものと同じだが、月xに達するとカウンタがゼロにリセットされる(xは1から12の間、または設定で定義された会計年度の最初の月を使用する場合は0、または99で毎月ゼロにリセット)。このオプションが使用され、xが2以上の場合、シーケンス{yy} {mm}または{yyyy} {mm}も必要。 <br> <b> {dd}</b>日(01から31)。 <br> <b> {mm} </b> 月(01から12)。 <br> <b> {yy} </b>,<b> {yyyy} </b>または<b> {y} </b> 1,2,4桁の年<br>
+GenericMaskCodes2= <b> {cccc} </b>n文字のクライアントコード<br><b> {cccc000} </b>n文字のクライアントコードの後に顧客専用カウンタが続く。顧客専用カウンタと、グローバルカウンタは、同時にリセットされる。 <br> <b> {tttt} </b> n文字の取引先タイプのコード(メニュー 【ホーム】-【セットアップ】-【辞書】-【取引先のタイプ】を参照)。このタグを追加すると、取引先の種類ごとにカウンタが異なる。 <br>
 GenericMaskCodes3=マスク内の他のすべての文字はそのまま残る。 <br>スペースは許可されていない。 <br>
+GenericMaskCodes3EAN=マスク内の他のすべての文字はそのまま残る（EAN13の13番目の位置にある*または？を除く）。 <br>スペースは許可されていない。 <br> EAN13では、最後の}の後の13番目の位置は*または？ のみで、計算されたキーに置き換えられる。 <br>
 GenericMaskCodes4a= <u>取引先 TheCompany の99番目の%sの例、日付 2007-01-31：</u> <br>
 GenericMaskCodes4b=<u>2007-03-01に作成された取引先の例：</u> <br>
 GenericMaskCodes4c= <u> 2007-03-01に作成された製品の例：</u> <br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=このフィールドを空白のままにすると
 ExtrafieldParamHelpselect=値のリストは、 key,value形式 (key は '0' 以外) の行であること。<br><br> 例: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>別の補完属性リストに応じたリストを作るには:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>別のリストに応じたリストを作るには:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=値のリストは、 key,value形式 (key は '0' 以外) の行であること<br><br>例 : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=値のリストは、 key,value形式 (key は '0' 以外) の行であること<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=値のリストはテーブルから取得される<br>構文：table_name：label_field：id_field :: filter <br>例：c_typent：libelle：id :: filter <br> <br> --id_fieldは必然的にプライマリintキーa0342fccfda = 1 ) アクティブな値のみを表示するには<br>現在のオブジェクトの現在のIDであるフィルタで$ ID $を使用することもできる<br>フィルタにSELECTを使用するには、キーワード$ SEL $を使用してインジェクション防止保護をバイパスする。 <br>エクストラフィールドでフィルタリングする場合は、構文extra.fieldcode = ... ( フィールドコードはエクストラフィールドのコード ) を使用する。<br><br>別の補完属性リストに依存するリストを作成するには：<br> c_typent：libelle：id：options_ <i> parent_list_code </i> | parent_column：filter <br> <br>リストを別のリストに依存させるには：<br> c_typent：libelle：id：<i> parent_list_code
-ExtrafieldParamHelpchkbxlst=値のリストはテーブルから取得される<br>構文：table_name：label_field：id_field :: filter <br>例：c_typent：libelle：id :: filter <br> <br>フィルタは、アクティブな値a0342cfのみを表示する簡単なテスト ( 例：active = 1 ) にすることができるフィルタで$ ID $を使用することもできる。witchは現在のオブジェクトの現在のID。<br>フィルタでSELECTを実行するには、エクストラフィールドでフィルタリングする場合は$ SEL $ <br>を使用する。構文extra.fieldcode = ...を使用する ( フィールドコードはエクストラフィールドのコード ) <br> <br>別の補完属性リストに依存するリストを作成するには、次のようにする。 libelle：id：<i> parent_list_code </i> | parent_column：filter
+ExtrafieldParamHelpsellist=値のリストはテーブルから取得される<br>構文: table_name:label_field:id_field::filtersql<br>例: c_typent:libelle:id::filtersql<br><br>- id_field は整数のプライマリキーが必須<br>- filtersql は SQL 条件文。アクティブな値のみを表示する簡単なテストでもよい (例 active=1) <br>フィルタで $ID$ を使用することもでき、それは現在のオブジェクトの現在のID <br>フィルタで SELECT を使うには、キーワード $SEL$ を使うことで、インジェクション対抗防御を回避できる。<br>エクストラフィールドでフィルタするには、構文  extra.fieldcode=... (ここで、フィールドコードはエクストラフィールドのコード)を使用する <br><br>別の補完属性リストに依存するリストを作成するには:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>別のリストに依存したリストを作成するには:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=値のリストはテーブルから取得される<br>Syntax: table_name:label_field:id_field::filtersql<br>例: c_typent:libelle:id::filtersql<br><br>フィルターは、簡単なテスト (例 active=1) で、アクティブな値のみを表示する<br>フィルタで $ID$ を使用することもでき、それは現在のオブジェクトの現在のID<br>フィルタで SELECT を実行するには、 $SEL$ を使う<br>エクストラフィールドでフィルタするには、構文  extra.fieldcode=... (ここで、フィールドコードはエクストラフィールドのコード)を使用する<br><br>別の補完属性リストに依存するリストを作成するには:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>別のリストに依存したリストを作成するには:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=パラメータはObjectName：Classpathでなければなりません<br>構文：ObjectName：Classpath
 ExtrafieldParamHelpSeparator=単純なセパレーターの場合は空のままにする<br>折りたたみセパレーターの場合はこれを1に設定する ( 新規セッションの場合はデフォルトで開き、ユーザセッションごとにステータスが保持される ) <br>折りたたみセパレーターの場合はこれを2に設定する ( 新規セッションの場合はデフォルトで折りたたむ。ステータスは各ユーザセッションの間保持される ) 
 LibraryToBuildPDF=PDF生成に使用されるライブラリ
@@ -487,7 +491,7 @@ UseDoubleApproval=金額 ( 税抜き ) が...より高い場合は、3段階の
 WarningPHPMail=警告：アプリケーションから電子メールを送信するための設定は、デフォルトの汎用設定を使用している。多くの場合、いくつかの理由から、デフォルトの設定ではなく、メールサービスプロバイダーのメールサーバーを使用するように送信メールを設定することをお勧めする。
 WarningPHPMailA=-電子メールサービスプロバイダーのサーバーを使用すると、電子メールの信頼性が向上するため、スパムとしてフラグが立てられることなく配信可能性が向上する。
 WarningPHPMailB=-一部の電子メールサービスプロバイダー ( Yahooなど ) では、独自のサーバー以外のサーバーから電子メールを送信することを許可していない。現在の設定では、電子メールプロバイダーのサーバーではなく、アプリケーションのサーバーを使用して電子メールを送信するため、一部の受信者 ( 制限付きDMARCプロトコルと互換性のある受信者 ) は、電子メールプロバイダーと一部の電子メールプロバイダーを受け入れることができるかどうかを電子メールプロバイダーに尋ねる。  ( Yahooのように ) サーバーが彼らのものではないために「いいえ」と応答する場合がある。そのため、送信された電子メールの一部が配信を受け入れられない場合がある ( 電子メールプロバイダーの送信クォータにも注意すること ) 。
-WarningPHPMailC=-独自の電子メールサービスプロバイダーのSMTPサーバーを使用して電子メールを送信することも興味深いので、アプリケーションから送信されるすべての電子メールもメールボックスの「送信済み」ディレクトリに保存される。
+WarningPHPMailC=-独自の電子メールサービスプロバイダーのSMTPサーバーを使用して電子メールを送信することも興味深いので、アプリケーションから送信されるすべての電子メールもメールボックスの「送信済」ディレクトリに保存される。
 WarningPHPMailD=メソッド「PHPMail」が本当に使用したいメソッドである場合は、Home-Setup-Otherで定数MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUPを1に追加することで、この警告を削除できる。
 WarningPHPMail2=電子メールSMTPプロバイダーが電子メールクライアントをいくつかのIPアドレスに制限する必要がある場合 ( 非常にまれ  ) 、これはERP CRMアプリケーションのメールユーザエージェント ( MUA ) のIPアドレス ：<strong> %s</strong>。
 WarningPHPMailSPF=送信者のメールアドレスのドメイン名がSPFレコードで保護されている場合 ( ドメイン名登録事業者に尋ねる ) 、ドメインのDNSのSPFレコードに次のIPを追加する必要がある：<strong> %s</strong>。
@@ -541,6 +545,8 @@ Module40Name=仕入先s
 Module40Desc=仕入先と購入管理 ( 発注書とサプライヤーの請求書の請求 ) 
 Module42Name=デバッグログ
 Module42Desc=ロギング機能 ( ファイル、syslog、... ) 。このようなログは、技術/デバッグを目的としている。
+Module43Name=デバッグバー
+Module43Desc=開発者がブラウザにデバッグバーを追加するためのツール。
 Module49Name=エディタ
 Module49Desc=エディタの管理
 Module50Name=製品
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=のGeoIP Maxmindの変換機能
 Module3200Name=変更不可能なアーカイブ
 Module3200Desc=ビジネスイベントの変更不可能なログを有効にする。イベントはリアルタイムでアーカイブされる。ログは、エクスポート可能な連鎖イベントの読み取り専用テーブル。このモジュールは、国によっては必須の場合がある。
+Module3400Name=ソーシャルネットワーク
+Module3400Desc=ソーシャルネットワークフィールドを取引先とアドレス（skype、twitter、facebookなど）に対して有効化する。
 Module4000Name=HRM
 Module4000Desc=人事管理 ( 部門の管理、従業員の契約と感情 ) 
 Module5000Name=マルチ法人
 Module5000Desc=あなたが複数の企業を管理することができる
-Module6000Name=ワークフロー
-Module6000Desc=ワークフロー管理 ( オブジェクトの自動作成および/または自動ステータス変更 ) 
+Module6000Name=モジュール間ワークフロー
+Module6000Desc=異なるモジュール間のワークフロー管理（オブジェクトの自動作成および/または自動ステータス変更）
 Module10000Name=ウェブサイト
 Module10000Desc=WYSIWYGエディターを使用してWebサイト ( 公開 ) を作成する。これはウェブマスターまたは開発者向けのCMS  ( HTMLとCSS言語を知っている方が良い  ) 。専用のDolibarrディレクトリを指すようにWebサーバー ( Apache、Nginxなど ) を設定するだけで、独自のドメイン名を使用してインターネット上でオンラインにできる。
 Module20000Name=リクエスト管理を終了
@@ -805,7 +813,8 @@ PermissionAdvanced253=内部/外部ユーザおよびアクセス許可を作成
 Permission254=変更の作成/外部ユーザのみ
 Permission255=他のユーザのパスワードを変更する
 Permission256=他のユーザを削除するか、または無効にする
-Permission262=すべての取引先 ( そのユーザが営業担当者である取引先だけでなく ) へのアクセスを拡張する。 <br>外部ユーザには効果的ではない ( 提案、注文、請求書、契約などについては常に自分自身に限定される ) 。 <br>プロジェクトには効果的ではない ( プロジェクトの権限、可視性、および割り当てに関するルールのみが重要  ) 。
+Permission262=すべての取引先とそのオブジェクト（ユーザが営業担当者である取引先だけでなく）へのアクセスを拡張する。 <br>外部ユーザには効果的ではない（提案、注文、請求書、契約などについては常に自分自身に限定される）。 <br>プロジェクトには効果的ではない（プロジェクトの権限、可視性、および割り当てに関するルールのみが重要）。
+Permission263=オブジェクトなしで、すべての取引先にアクセスを拡張する（ユーザが営業担当者である取引先だけでなく）。 <br>外部ユーザには効果的ではない（提案、注文、請求書、契約などについては常に自分自身に限定される）。 <br>プロジェクトには効果的ではない（プロジェクトの権限、可視性、および割り当てに関するルールのみが重要）。
 Permission271=CAを読む
 Permission272=請求書をお読みください
 Permission273=問題の請求書
@@ -915,7 +924,7 @@ Permission1236=仕入先の請求書、属性、支払いをエクスポート
 Permission1237=注文書とその詳細をエクスポート
 Permission1251=データベース ( データロード ) に外部データの大量インポートを実行する
 Permission1321=顧客の請求書、属性、および支払いをエクスポート
-Permission1322=支払い済みの請求書を再開する
+Permission1322=支払い済の請求書を再開する
 Permission1421=受注と属性をエクスポート
 Permission1521=ドキュメントを読む
 Permission1522=ドキュメントを削除する
@@ -1175,7 +1184,8 @@ SetupDescription2=次の2つのセクションは必須  ( 【設定】メニュ
 SetupDescription3= <a href="%s"> %s-> %s </a> <br> <br>アプリケーションのデフォルトの動作をカスタマイズするために使用される基本パラメーター ( 国関連の機能など ) 。
 SetupDescription4= <a href="%s"> %s-> %s </a> <br> <br>このソフトウェアは、多くのモジュール/アプリケーションのスイート。ニーズに関連するモジュールを有効にして構成する必要がある。これらのモジュールをアクティブにすると、メニューエントリが表示される。
 SetupDescription5=その他の設定メニューエントリは、オプションのパラメータを管理する。
-LogEvents=セキュリティ監査イベント
+AuditedSecurityEvents=監査されるセキュリティイベント
+NoSecurityEventsAreAduited=セキュリティイベントは監査されない。メニュー%sから有効にできる
 Audit=監査
 InfoDolibarr=Dolibarrについて
 InfoBrowser=ブラウザについて
@@ -1210,7 +1220,7 @@ TriggerAlwaysActive=このファイル内のトリガーがアクティブにDol
 TriggerActiveAsModuleActive=モジュール<b>%sが</b>有効<b>になっ</b>ているとして、このファイル内のトリガーがアクティブになる。
 GeneratedPasswordDesc=自動生成されたパスワードに使用する方法を選択する。
 DictionaryDesc=すべての参照データを挿入する。デフォルトに値を追加できる。
-ConstDesc=このページでは、他のページでは使用できないパラメーターを編集 ( オーバーライド ) できる。これらは主に、開発者/高度なトラブルシューティング専用の予約済みパラメーター。
+ConstDesc=このページでは、他のページでは使用できないパラメーターを編集 ( オーバーライド ) できる。これらは主に、開発者/高度なトラブルシューティング専用の予約済パラメーター。
 MiscellaneousDesc=他のすべてのセキュリティ関連パラメータはここで定義される。
 LimitsSetup=制限/精密設定
 LimitsDesc=Dolibarrが使用する制限、精度、最適化をここで定義できる
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=アップグレードプロセスの実行が
 YouMustRunCommandFromCommandLineAfterLoginToUser=あなたは、ユーザ<b>%s、</b>シェルへのログイン後にコマンドラインからこのコマンドを実行する必要があるか、追加する必要がある-Wオプションをコマンドラインの末尾に<b>%s</b>パスワード<b>を</b>提供する。
 YourPHPDoesNotHaveSSLSupport=あなたのPHPでのSSLの機能は使用できない
 DownloadMoreSkins=ダウンロードするには多くのスキン
-SimpleNumRefModelDesc=%syymm-nnnnの形式で参照番号を返する。ここで、yyは年、mmは月、nnnnはリセットなしで連続している。
+SimpleNumRefModelDesc=参照番号を%syymm-nnnnの形式で返す。ここで、yyは年、mmは月、nnnnはリセットなしの順次自動インクリメント番号。
 ShowProfIdInAddress=住所とともにプロのIDを表示する
 ShowVATIntaInAddress=コミュニティ内のVAT番号を住所で非表示にする
 TranslationUncomplete=部分的な翻訳
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=プロキシサーバー：名前/住所
 MAIN_PROXY_PORT=プロキシサーバー：ポート
 MAIN_PROXY_USER=プロキシサーバー：ログイン/ユーザ
 MAIN_PROXY_PASS=プロキシサーバー：パスワード
-DefineHereComplementaryAttributes=ここで、含める追加/カスタム属性を定義する：%s
+DefineHereComplementaryAttributes=追加する必要のある追加/カスタム属性を定義する：%s
 ExtraFields=補完的な属性
 ExtraFieldsLines=補完的な属性 ( 行 ) 
 ExtraFieldsLinesRec=補完的な属性 ( 請求書行のテンプレート ) 
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=ログイン ( UNIX )
 LDAPFieldLoginExample=例：uid
 LDAPFilterConnection=検索フィルタ
 LDAPFilterConnectionExample=例：＆ ( objectClass = inetOrgPerson ) 
+LDAPGroupFilterExample=例：&(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=ログイン ( サンバ、ActiveDirectoryを ) 
 LDAPFieldLoginSambaExample=例：samaccountname
 LDAPFieldFullname=ファーストネーム
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=あなたの法人はVATを使用しないように定
 AccountancyCode=会計コード
 AccountancyCodeSell=販売会計コード
 AccountancyCodeBuy=購入会計コード
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=新しい税金を作成するときは、デフォルトで「支払いを自動的に作成する」チェックボックスを空のままにする
 ##### Agenda #####
 AgendaSetup=イベントと議題モジュールの設定
 PasswordTogetVCalExport=エクスポートのリンクを許可するキー
+SecurityKey = セキュリティキー
 PastDelayVCalExport=より古いイベントはエクスポートしない
 AGENDA_USE_EVENT_TYPE=イベント種別を使用する ( メニューの【設定】-> 【辞書】-> 【アジェンダイベントの種別】で管理 ) 
 AGENDA_USE_EVENT_TYPE_DEFAULT=イベント作成フォームでイベントの種別にこのデフォルト値を自動的に設定する
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=奇数のテーブルラインの背景色
 BackgroundTableLineEvenColor=偶数のテーブルラインの背景色
 MinimumNoticePeriod=最小通知期間 ( 休暇申請はこの遅延の前に行う必要がある ) 
 NbAddedAutomatically=ユーザのカウンターに毎月 ( 自動的に ) 追加される日数
-EnterAnyCode=このフィールドには、行を識別するための参照が含まれている。特殊文字を使用せずに、任意の値を入力する。
+EnterAnyCode=このフィールドには、ラインを識別するための参照が含まれている。任意の値を入力すること、たただし、特殊文字は不可。
 Enter0or1=0または1を入力すること
 UnicodeCurrency=中括弧、通貨記号を表すバイト番号のリストの間にここに入力する。例：$の場合は【36】と入力する-ブラジルレアルの場合はR $ 【82,36】-€の場合は【8364】と入力する
 ColorFormat=RGBカラーはHEX形式  例: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=PDFの下マージン
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDFのロゴの高さ
 NothingToSetup=このモジュールに必要な特定の設定はない。
 SetToYesIfGroupIsComputationOfOtherGroups=このグループが他のグループの計算である場合は、これをyesに設定する
-EnterCalculationRuleIfPreviousFieldIsYes=前のフィールドが「はい」に設定されている場合は、計算ルールを入力する ( たとえば、「CODEGRP1 + CODEGRP2」 ) 
+EnterCalculationRuleIfPreviousFieldIsYes=前のフィールドが「はい」に設定されている場合は、計算ルールを入力。 <br>例：<br> CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=いくつかの言語バリアントが見つかりました
 RemoveSpecialChars=特殊文字を削除する
 COMPANY_AQUARIUM_CLEAN_REGEX=値をクリーンアップするための正規表現フィルタ ( COMPANY_AQUARIUM_CLEAN_REGEX ) 
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=モジュールソーシャルネットワークの設定
 EnableFeatureFor=<strong> %s</strong>の機能を有効にする
 VATIsUsedIsOff=注：消費税またはVATを使用するオプションは、メニュー%s-%sで<strong> Off </strong>に設定されているため、消費税または使用される付加価値税は常に0になる。
 SwapSenderAndRecipientOnPDF=PDFドキュメントの送信者と受信者のアドレス位置を入れ替えます
-FeatureSupportedOnTextFieldsOnly=警告、機能はテキストフィールドでのみサポートされている。また、この機能をトリガーするには、URLパラメータ action=create または action=edit を設定するか、ページ名が 'new.php' で終わる必要がある。
+FeatureSupportedOnTextFieldsOnly=警告、機能性はテキストフィールドとコンボリストでのみサポートされる。また、この機能性を引き出すには、URLパラメータ action=create または action=edit を設定するか、ページ名が 'new.php' で終わる必要がある。
 EmailCollector=メールコレクター
 EmailCollectorDescription=スケジュールされたジョブと設定ページを追加して、 ( IMAPプロトコルを使用して ) 定期的に電子メールボックスをスキャンし、アプリケーションに受信した電子メールを適切な場所で記録したり、いくつかの記録を自動的に作成したりする ( 引合など ) 。
 NewEmailCollector=新規Eメールコレクター
@@ -2049,8 +2062,11 @@ UseDebugBar=デバッグバーを使用する
 DEBUGBAR_LOGS_LINES_NUMBER=コンソールに保持する最後のログ行の数
 WarningValueHigherSlowsDramaticalyOutput=警告、値を大きくすると出力が劇的に遅くなる
 ModuleActivated=モジュール%sがアクティブ化され、インターフェイスの速度が低下する
+ModuleActivatedWithTooHighLogLevel=モジュール%sが高すぎるログレベルでアクティブ化されている（パフォーマンスの向上のため、より低いレベルの使用を試すべき）
+ModuleSyslogActivatedButLevelNotTooVerbose=モジュール%sがアクティブ化され、ログレベル（%s）が正しい（冗長すぎない）
 IfYouAreOnAProductionSetThis=実稼働環境を使用している場合は、このプロパティを%sに設定する必要がある。
 AntivirusEnabledOnUpload=アップロードされたファイルでウイルス対策が有効になっている
+SomeFilesOrDirInRootAreWritable=一部のファイルやディレクトリが読み取り専用モードになっていません
 EXPORTS_SHARE_MODELS=エクスポートモデルは誰とでも共有
 ExportSetup=モジュールエクスポートの設定
 ImportSetup=モジュールインポートの設定
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Dolibarr Foundationサーバーに匿名のPing「+1」を作
 FeatureNotAvailableWithReceptionModule=モジュールの受信が有効になっている場合、この機能は使用できない
 EmailTemplate=メールのテンプレート
 EMailsWillHaveMessageID=電子メールには、この構文に一致するタグ「参照」がある
+PDF_SHOW_PROJECT=ドキュメントにプロジェクトを表示
+ShowProjectLabel=プロジェクトラベル
 PDF_USE_ALSO_LANGUAGE_CODE=PDF内の一部のテキストを同じ生成PDFで2つの異なる言語で複製する場合は、ここでこの2番目の言語を設定して、生成されたPDFに同じページに2つの異なる言語が含まれるようにする必要がある。1つはPDFの生成時に選択され、もう1つは ( これをサポートしているPDFテンプレートはごくわずか  ) 。 PDFごとに1つの言語を空のままにする。
 FafaIconSocialNetworksDesc=FontAwesomeアイコンのコードをここに入力する。 FontAwesomeとは何かわからない場合は、一般的な値fa-address-bookを使用できる。
 FeatureNotAvailableWithReceptionModule=モジュールの受信が有効になっている場合、この機能は使用できない
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=セキュリティを強化するために、この
 DictionaryProductNature= 製品の性質
 CountryIfSpecificToOneCountry=国 ( 特定の国に固有の場合 ) 
 YouMayFindSecurityAdviceHere=ここにセキュリティアドバイザリがある
-ModuleActivatedMayExposeInformation=このモジュールは機密データを公開する可能性がある。不要な場合は無効にすること。
+ModuleActivatedMayExposeInformation=このPHP拡張機能は、機密データを公開する可能性がある。不要な場合は無効にすること。
 ModuleActivatedDoNotUseInProduction=開発用に設計されたモジュールが有効になった。実稼働環境では有効にしないこと。
 CombinationsSeparator=製品の組み合わせの区切り文字
 SeeLinkToOnlineDocumentation=例については、トップメニューのオンラインドキュメントへのリンクを参照すること
 SHOW_SUBPRODUCT_REF_IN_PDF=モジュール<b>%s </b>の機能「%s」を使用する場合は、キットの副産物の詳細をPDFで表示すること。
 AskThisIDToYourBank=このIDを取得するには、銀行に問い合わせること
+AdvancedModeOnly=許可は、高度な許可モードでのみ使用可能
+ConfFileIsReadableOrWritableByAnyUsers=confファイルは、どのユーザでも読み取りまたは書き込みが可能。 Webサーバーのユーザとグループにのみアクセス許可を与える。
+MailToSendEventOrganization=イベント組織
+AGENDA_EVENT_DEFAULT_STATUS=フォームからイベントを作成するときのデフォルトのイベントステータス
+YouShouldDisablePHPFunctions=PHP関数を無効にする必要がある
+IfCLINotRequiredYouShouldDisablePHPFunctions=システムコマンドを実行する必要がある場合を除いて（たとえば、モジュールのスケジュールされたジョブの場合、または外部コマンドラインアンチウイルスを実行する場合）、PHP関数を無効にする必要がある。
+NoWritableFilesFoundIntoRootDir=共通プログラムの書き込み可能なファイルまたはディレクトリがルートディレクトリに見つからない（良好）
+RecommendedValueIs=推奨：%s
+ARestrictedPath=制限されたパス
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index b7097ecbc9f..45874c79be1 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -112,7 +112,7 @@ MenuBankInternalTransfer=内部転送
 TransferDesc=ある口座から別の口座に転送すると、Dolibarrは2つのレコード(ソース口座の借方とターゲット口座の貸方)を書込む。同じ金額(記号を除く)、ラベル、日付がこの取引に使用される)
 TransferFrom=期初
 TransferTo=期末
-TransferFromToDone=<b>%s %s</b> %sからの<b>%s</b>への転送が記録されています。
+TransferFromToDone=<b>%s %s</b> %sからの<b>%s</b>への転送が記録されている。
 CheckTransmitter=振込
 ValidateCheckReceipt=この小切手領収書を検証するか？
 ConfirmValidateCheckReceipt=この小切手領収書を検証してもよいか？一度検証すると変更できなくなる。
@@ -154,7 +154,7 @@ NoBANRecord=BANレコードなし
 DeleteARib=BANレコードを削除
 ConfirmDeleteRib=このBANレコードを削除してもよいか？
 RejectCheck=小切手が返送されました
-ConfirmRejectCheck=このチェックを拒否済みとしてマークしてもよいか？
+ConfirmRejectCheck=このチェックを拒否済としてマークしてもよいか？
 RejectCheckDate=小切手が返却された日付
 CheckRejected=小切手が返送されました
 CheckRejectedAndInvoicesReopened=返送された小切手と請求書が再開される
@@ -174,10 +174,11 @@ YourSEPAMandate=あなたのSEPA指令
 FindYourSEPAMandate=これは、当法人が銀行に口座振替を注文することを承認するSEPA指令です。署名済(署名済ドキュメントをスキャン)で返送するか、メールで送付すること
 AutoReportLastAccountStatement=照合を行うときに、フィールド「銀行取引明細書の番号」に最後の取引明細書番号を自動的に入力する
 CashControl=POS現金出納帳制御
-NewCashFence=新規現金出納帳の締め
+NewCashFence=新規キャッシュデスクの開閉
 BankColorizeMovement=移動に色を付ける
 BankColorizeMovementDesc=この機能が有効になっている場合は、借方または貸方の移動に特定の背景色を選択できます
 BankColorizeMovementName1=借方移動の背景色
 BankColorizeMovementName2=クレジット移動の背景色
 IfYouDontReconcileDisableProperty=一部の銀行口座で銀行照合を行わない場合は、それらのプロパティ "%s"を無効にして、この警告を削除すること。
 NoBankAccountDefined=銀行口座が定義されていない
+NoRecordFoundIBankcAccount=銀行口座にレコードが見つかならい。通常、これは、銀行口座のトランザクションのリストからレコードが手動で削除された場合に発生する（たとえば、銀行口座の照合中）。もう1つ別の理由としては、モジュール「%s」が無効化されたまま支払いが記録されたこと。
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 0fd32cc6afc..6dcd35ad561 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -55,6 +55,7 @@ CustomerInvoice=得意先請求書
 CustomersInvoices=顧客請求書
 SupplierInvoice=仕入先請求書
 SuppliersInvoices=仕入先請求書
+SupplierInvoiceLines=仕入先の請求書行
 SupplierBill=仕入先請求書
 SupplierBills=仕入先請求書
 Payment=支払
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=支払は実行済
 PaymentsBackAlreadyDone=払戻は実行済
 PaymentRule=支払ルール
 PaymentMode=支払種別
+DefaultPaymentMode=デフォルト支払種別
+DefaultBankAccount=デフォルト銀行口座
 PaymentTypeDC=デビット/クレジットカード
 PaymentTypePP=PayPal
 IdPaymentMode=支払種別(id)
@@ -373,6 +376,7 @@ DateLastGeneration=最新世代の日付
 DateLastGenerationShort=最新世代の日付
 MaxPeriodNumber=最大請求書の生成回数
 NbOfGenerationDone=すでに行われた請求書の生成数
+NbOfGenerationOfRecordDone=すでに処理済のレコード生成数
 NbOfGenerationDoneShort=行われた世代の数
 MaxGenerationReached=最大世代数に達しました
 InvoiceAutoValidate=請求書を自動的に検証する
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=月末から14日以内
 FixAmount=固定金額-ラベル「%s」の1行
 VarAmount=可変量(%% tot。)
 VarAmountOneLine=可変量(%% tot。)-ラベル「%s」の1行
-VarAmountAllLines=可変量(%% tot。)-すべて同じ行
+VarAmountAllLines=可変数量（%% tot.）-原点からのすべての行
 # PaymentType
 PaymentTypeVIR=銀行の転送
 PaymentTypeShortVIR=銀行の転送
@@ -494,12 +498,16 @@ Cash=現金
 Reported=遅延
 DisabledBecausePayments=いくつかの支払があるので不可
 CantRemovePaymentWithOneInvoicePaid=支払済に分類される請求書が少なくとも一つあるので支払を削除できない
+CantRemovePaymentVATPaid=VAT申告は支払い済に分類されているため、支払いを削除できない
+CantRemovePaymentSalaryPaid=給与は支払済に分類されているため、支払を削除できない
 ExpectedToPay=予想される支払
 CantRemoveConciliatedPayment=調整済の支払を削除できない
 PayedByThisPayment=この支払によって支払った
 ClosePaidInvoicesAutomatically=支払が完全に行われると、すべての標準、頭金、または交換の請求書が「支払済」として自動的に分類される。
 ClosePaidCreditNotesAutomatically=払戻が完全に行われると、すべての貸方表が「支払済」として自動的に分類される。
 ClosePaidContributionsAutomatically=支払が完全に行われると、すべての社会的または財政的貢献を「支払済」として自動的に分類。
+ClosePaidVATAutomatically=支払いが完全に行われると、VAT申告が「支払い済」として自動的に分類される。
+ClosePaidSalaryAutomatically=支払が完全に行われると、給与は自動的に ”支払済" に分類される。
 AllCompletelyPayedInvoiceWillBeClosed=残りの支払がないすべての請求書は、ステータス「支払済」で自動的に閉じられる。
 ToMakePayment=支払う
 ToMakePaymentBack=返済
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=最初に標準請求書を作成し、そ
 PDFCrabeDescription=請求書PDFテンプレートクレイブ。完全な請求書テンプレート(Spongeテンプレートの古い実装)
 PDFSpongeDescription=請求書PDFテンプレートスポンジ。完全な請求書テンプレート
 PDFCrevetteDescription=請求書PDFテンプレートクレベット。シチュエーション請求書の完全な請求書テンプレート
-TerreNumRefModelDesc1=戻る数値の書式は、標準請求書の場合は%syymm-nnnn、貸方表の場合は%syymm-nnnn、ここで yy は年、mm は月、nnnn は欠番なく連続した0に戻らない数値
-MarsNumRefModelDesc1=戻る数値の書式は、標準請求書の場合は%syymm-nnnn、交換請求書の場合は%syymm-nnnn、頭金請求書の場合は%syymm-nnnn、貸方表の場合は%syymm-nnnn、ここで yy は年、mm は月、nnnn は欠番なく連続した0に戻らない数値
+TerreNumRefModelDesc1=戻る数値の形式は、標準請求書の場合は%syymm-nnnnの形式、貸方票の場合は%syymm-nnnnの形式。ここで、yyは年、mmは月、nnnnは自動増加順次番号で切れ目なく0戻りしない数値。
+MarsNumRefModelDesc1= 戻る数値の形式は、標準請求書の場合は%syymm-nnnn の形式、交換請求書の場合は %syymm-nnnn の形式、頭金請求書の場合は %syymm-nnnn の形式 、貸方票の場合は %syymm-nnnn の形式。ここで、 yy は年、mm は月、nnnn は自動増加順次番号で切れ目なく0戻りしない数値。
 TerreNumRefModelError=$ syymm始まる法案はすでに存在し、シーケンスのこのモデルと互換性がない。それを削除するか、このモジュールを有効にするために名前を変更。
-CactusNumRefModelDesc1=戻る数値の書式は、標準の請求書の場合は%syymm-nnnn、貸方表の場合は%syymm-nnnn、頭金の請求書の場合は%syymm-nnnn、ここで yy は年、mm は月、nnnn は欠番なく連続した0に戻らない数値
+CactusNumRefModelDesc1=戻る数値の形式は、標準請求書の場合は%syymm-nnnn の形式、貸方票の場合は%syymm-nnnn の形式、頭金請求書の場合は%syymm-nnnn の形式。ここで、 yy は年、mm は月、nnnn は自動増加順次番号で切れ目なく0戻しない数値。
 EarlyClosingReason=早期閉鎖理由
 EarlyClosingComment=早期クロージングノート
 ##### Types de contacts #####
@@ -563,6 +571,7 @@ DeleteRepeatableInvoice=テンプレートの請求書を削除する
 ConfirmDeleteRepeatableInvoice=テンプレートの請求書を削除してもよいか？
 CreateOneBillByThird=取引先ごとに1つの請求書を作成する(それ以外の場合は、注文ごとに1つの請求書を作成する)
 BillCreated=%s請求書(s)が作成された
+BillXCreated=請求書%sが生成された
 StatusOfGeneratedDocuments=ドキュメント生成のステータス
 DoNotGenerateDoc=ドキュメントファイルを生成しない
 AutogenerateDoc=ドキュメントファイルの自動生成
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 6f69a9dff73..62533b2e742 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=データベース内の主要ビジネスオブジェクトに関する統計
 BoxLoginInformation=ログイン情報
 BoxLastRssInfos=RSS情報
 BoxLastProducts=最新の%s製品/サービス
@@ -17,9 +18,13 @@ BoxLastActions=最新のアクション
 BoxLastContracts=最新の契約
 BoxLastContacts=最新の連絡先/住所
 BoxLastMembers=最新のメンバー
+BoxLastModifiedMembers=最新の変更されたメンバ
+BoxLastMembersSubscriptions=最新のメンバサブスクリプション
 BoxFicheInter=最新の介入
 BoxCurrentAccounts=口座残高
 BoxTitleMemberNextBirthdays=今月の誕生日(会員)
+BoxTitleMembersByType=タイプ別のメンバ
+BoxTitleMembersSubscriptionsByYear=年ごとのメンバサブスクリプション
 BoxTitleLastRssInfos=%sからの最新の%sニュース
 BoxTitleLastProducts=製品/サービス：最後に変更された%s
 BoxTitleProductsAlertStock=製品：在庫アラート
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=最新の%s顧客出荷
 NoRecordedShipments=顧客の出荷は記録されていない
 BoxCustomersOutstandingBillReached=上限に達した顧客
 # Pages
+UsersHome=ユーザとグループ
+MembersHome=メンバシップ
+ThirdpartiesHome=取引先
+TicketsHome=チケット
 AccountancyHome=会計
-ValidatedProjects=検証済みプロジェクト
+ValidatedProjects=検証済プロジェクト
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index dc3c74ec703..6d0c80849a4 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=ベンダーのタグ/カテゴリ領域
 CustomersCategoriesArea=顧客タグ/カテゴリ領域
 MembersCategoriesArea=メンバータグ/カテゴリエリア
 ContactsCategoriesArea=連絡先タグ/カテゴリ領域
-AccountsCategoriesArea=アカウントタグ/カテゴリ領域
+AccountsCategoriesArea=銀行口座のタグ/カテゴリ領域
 ProjectsCategoriesArea=プロジェクトタグ/カテゴリ領域
 UsersCategoriesArea=ユーザータグ/カテゴリ領域
 SubCats=サブカテゴリ
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 536e29cf292..b82d69f57e3 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -43,9 +43,10 @@ Individual=個人
 ToCreateContactWithSameName=取引先の下にある取引先と同じ情報で連絡先/住所を自動作成。ほとんどの場合、取引先が実在の人物であっても、取引先を作成するだけで十分。
 ParentCompany=親会社
 Subsidiaries=子会社
-ReportByMonth=月別報告書
-ReportByCustomers=顧客別報告書
-ReportByQuarter=料金別報告書
+ReportByMonth=月次レポート
+ReportByCustomers=顧客ごとのレポート
+ReportByThirdparties=仕入先ごとのレポート
+ReportByQuarter=料金ごとのレポート
 CivilityCode=敬称コード
 RegisteredOffice=登録事務所
 Lastname=姓
@@ -172,14 +173,20 @@ ProfId1ES=職 Id 1 (CIF/NIF)
 ProfId2ES=職 Id 2 (Social security number)
 ProfId3ES=職 Id 3 (CNAE)
 ProfId4ES=職 Id 4 (Collegiate number)
-ProfId5ES=EORI番号
+ProfId5ES=職 Id 5 (EORI番号)
 ProfId6ES=-
 ProfId1FR=職 Id 1 (SIREN)
 ProfId2FR=職 Id 2 (SIRET)
 ProfId3FR=職 Id 3 (NAF, old APE)
 ProfId4FR=職 Id 4 (RCS/RM)
-ProfId5FR=EORI番号
+ProfId5FR=職 Id 5（numéroEORI）
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=登録番号
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI番号
+ProfId6IT=-
 ProfId1LU=Id. 職 1  (R.C.S. Luxembourg)
 ProfId2LU=Id. 職 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=職 Id 1 (NIPC)
 ProfId2PT=職 Id 2 (Social security number)
 ProfId3PT=職 Id 3 (Commercial Record number)
 ProfId4PT=職 Id 4 (Conservatory)
-ProfId5PT=EORI番号
+ProfId5PT=職 Id 5（EORI番号）
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=職 Id 1 (CUI)
 ProfId2RO=職 Id 2 (Nr. Înmatriculare)
 ProfId3RO=職 Id 3 (CAEN)
 ProfId4RO=職 Id 5 (EUID)
-ProfId5RO=EORI番号
+ProfId5RO=職 Id 5（EORI番号）
 ProfId6RO=-
 ProfId1RU=職 Id 1 (OGRN)
 ProfId2RU=職 Id 2 (INN)
@@ -439,15 +447,15 @@ ThirdPartyIsClosed=閉鎖した取引先
 ProductsIntoElements=%s に対する製品/サービスの一覧
 CurrentOutstandingBill=現在の未払い勘定
 OutstandingBill=未払い勘定での最大値
-OutstandingBillReached=受領済み未払い勘定での最大値
+OutstandingBillReached=受領済未払い勘定での最大値
 OrderMinAmount=注文の最小数量
-MonkeyNumRefModelDesc=顧客コードの場合は%syymm-nnnn、ベンダーコードの場合は%syymm-nnnnの形式の数値を返すよ。ここで、yyは年、mmは月、nnnnは途切れずに連続する数で0に戻らないもの。
+MonkeyNumRefModelDesc=戻る数値の形式は、顧客コードの場合は%syymm-nnnn の形式、仕入先コードの場合は%syymm-nnnn の形式。ここで、yyは年、mmは月、nnnnは自動増加順次番号で切れ目なく0戻りしない数値。
 LeopardNumRefModelDesc=顧客/サプライヤーコードは無料です。このコードは、いつでも変更することができます。
 ManagingDirectors=管理職(s)名称 (CEO, 部長, 社長...)
 MergeOriginThirdparty=重複する取引先 (削除したい取引先)
 MergeThirdparties=仕入先sを集約
 ConfirmMergeThirdparties=この取引先を現在の取引先に融合したいのね、いいよね？リンクされたすべてのオブジェクト(請求書、注文など...)は現在の取引先に移動され、この取引先には削除されるよ。
-ThirdpartiesMergeSuccess=仕入先sは集約済み
+ThirdpartiesMergeSuccess=仕入先sは集約済
 SaleRepresentativeLogin=販売担当者のログイン
 SaleRepresentativeFirstname=販売担当者の姓名の名
 SaleRepresentativeLastname=販売担当者の姓
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 379785639bb..f5d31e8c3c9 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGSTの購入
 VATCollected=付加価値税回収した
 StatusToPay=支払に
 SpecialExpensesArea=すべての特別支払のエリア
+VATExpensesArea=すべてのTVA支払いの領域
 SocialContribution=社会税または財政税
 SocialContributions=社会税または財政税
 SocialContributionsDeductibles=控除可能な社会税または財政税
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=顧客の請求書支払
 PaymentSupplierInvoice=ベンダーの請求書支払
 PaymentSocialContribution=社会/財政税支払
 PaymentVat=付加価値税支払
+AutomaticCreationPayment=支払いを自動的に記録する
 ListPayment=支払のリスト
 ListOfCustomerPayments=顧客支払のリスト
 ListOfSupplierPayments=ベンダー支払のリスト
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF支払
 LT2PaymentsES=IRPF支払
 VATPayment=消費税支払
 VATPayments=消費税支払
+VATDeclarations=VAT申告
+VATDeclaration=VAT宣言
 VATRefund=消費税還付
 NewVATPayment=新規消費税支払
 NewLocalTaxPayment=新規税金%s支払
@@ -134,9 +138,17 @@ NoWaitingChecks=入金待ちの小切手はない。
 DateChequeReceived=受付の日付を確認すること
 NbOfCheques=小切手の数
 PaySocialContribution=社会税/財政税を支払う
-ConfirmPaySocialContribution=この社会税または財政税を支払済みとして分類してもよいか？
+PayVAT=VAT申告を支払う
+PaySalary=給与カードを支払う
+ConfirmPaySocialContribution=この社会税または財政税を支払済として分類してもよいか？
+ConfirmPayVAT=このVAT申告を有料として分類してもよいか？
+ConfirmPaySalary=この給与カードを支払済として分類してもよいか？
 DeleteSocialContribution=社会税または財政税支払を削除する
+DeleteVAT=VAT宣言を削除する
+DeleteSalary=給与カードを削除する
 ConfirmDeleteSocialContribution=この社会的/財政的納税を削除してもよいか？
+ConfirmDeleteVAT=このVAT申告を削除してもよいか？
+ConfirmDeleteSalary=この給与を削除してもよいか？
 ExportDataset_tax_1=社会的および財政的な税金と支払
 CalcModeVATDebt=コミットメントアカウンティングのモード<b>%sVAT%s</b>。
 CalcModeVATEngagement=収入のモード<b>%sVAT-expenses%s</b>。
@@ -163,6 +175,7 @@ RulesResultInOut=-これには、請求書、経費、VAT、および給与に
 RulesCADue=-支払の有無にかかわらず、顧客の期日請求書が含まれる。 <br>-これらの請求書の請求日に基づいている。 <br>
 RulesCAIn=-これには、顧客から受け取った請求書のすべての有効な支払が含まれる。 <br>-これらの請求書支払日に基づいている<br>
 RulesCATotalSaleJournal=これには、販売仕訳帳のすべての貸方行が含まれる。
+RulesSalesTurnoverOfIncomeAccounts=それには、グループINCOMEでの製品勘定の (貸方-借方) 行が含まれる。
 RulesAmountOnInOutBookkeepingRecord=これには、グループ「EXPENSE」または「INCOME」を持つ会計勘定を持つ元帳のレコードが含まれる
 RulesResultBookkeepingPredefined=これには、グループ「EXPENSE」または「INCOME」を持つ会計勘定を持つ元帳のレコードが含まれる
 RulesResultBookkeepingPersonalized=パーソナライズされたグループ</b>によってグループ化された会計アカウント<b>を使用して元帳にレコードが表示される
@@ -183,6 +196,7 @@ VATReportByThirdParties=第三者による消費税レポート
 VATReportByCustomers=顧客による消費税レポート
 VATReportByCustomersInInputOutputMode=収集され支払われた顧客によるVATの報告
 VATReportByQuartersInInputOutputMode=徴収され支払われた税金の販売税率による報告
+VATReportShowByRateDetails=このレートの詳細を表示する
 LT1ReportByQuarters=税率2を報告する
 LT2ReportByQuarters=税率3を報告する
 LT1ReportByQuartersES=RE率によるレポート
@@ -217,7 +231,7 @@ Pcg_subtype=Pcgサブ種別
 InvoiceLinesToDispatch=発送する請求書明細
 ByProductsAndServices=製品およびサービス別
 RefExt=外部参照
-ToCreateAPredefinedInvoice=テンプ率請求書を作成するには、標準の請求書を作成し、それを検証せずに、ボタン「%s」をクリックする。
+ToCreateAPredefinedInvoice=テンプレート請求書を作成するには、標準の請求書を作成し、それを検証せずに、ボタン「%s」をクリックする。
 LinkedOrder=注文へのリンク
 Mode1=方法1
 Mode2=方法2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=サードパーティカードで定義され
 ACCOUNTING_ACCOUNT_SUPPLIER=ベンダーのサードパーティに使用される会計アカウント
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=サードパーティカードで定義された専用の会計アカウントは、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、サードパーティの専用仕入先会計勘定が定義されていない場合は補助元帳会計のデフォルト値として使用される。
 ConfirmCloneTax=社会税/財政税のクローンを確認する
+ConfirmCloneVAT=VAT宣言のクローンを確認する
+ConfirmCloneSalary=給与のクローンを確認する
 CloneTaxForNextMonth=来月のためにそれをクローンする
 SimpleReport=簡単なレポート
 AddExtraReport=追加レポート(海外および国内の顧客レポートを追加)
@@ -253,7 +269,8 @@ AccountingAffectation=会計の割り当て
 LastDayTaxIsRelatedTo=期間の最終日税は関連している
 VATDue=消費税が請求されました
 ClaimedForThisPeriod=期間中請求
-PaidDuringThisPeriod=この期間中に支払われた
+PaidDuringThisPeriod=この期間に支払われた
+PaidDuringThisPeriodDesc=これは、選択した日付範囲内の期末日を持つVAT申告にリンクされたすべての支払いの合計。
 ByVatRate=売却税率
 TurnoverbyVatrate=売上税率での請求済売上高
 TurnoverCollectedbyVatrate=売上税率での回収済売上高
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=回収済購入取引高
 RulesPurchaseTurnoverDue=-支払の有無にかかわらず、サプライヤーの期日請求書が含まれる。 <br>-これらの請求書の請求日に基づいている。 <br>
 RulesPurchaseTurnoverIn=-これには、サプライヤーに対して行われた請求書のすべての有効な支払が含まれる。 <br>-これらの請求書支払日に基づいている<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=これには、購入仕訳帳からのすべての借方明細が含まれる。
+RulesPurchaseTurnoverOfExpenseAccounts=それには、グループEXPENSEでの製品勘定の (借方-貸方) 行が含まれる。
 ReportPurchaseTurnover=請求済購入取引高
 ReportPurchaseTurnoverCollected=回収済購入取引高
 IncludeVarpaysInResults = レポートにさまざまな支払を含める
diff --git a/htdocs/langs/ja_JP/dict.lang b/htdocs/langs/ja_JP/dict.lang
index 38dbf01c4e3..38e701fc853 100644
--- a/htdocs/langs/ja_JP/dict.lang
+++ b/htdocs/langs/ja_JP/dict.lang
@@ -112,7 +112,7 @@ CountryGN=ギニー
 CountryGW=ギニアビサウ
 CountryGY=ガイアナ
 CountryHT=ハイチ
-CountryHM=ハード島とマクドナルド
+CountryHM=ハード島とマクドナルド諸島
 CountryVA=ローマ法王庁(バチカン市国)
 CountryHN=ホンジュラス
 CountryHK=香港
@@ -132,12 +132,12 @@ CountryKP=北朝鮮
 CountryKR=韓国
 CountryKW=クウェート
 CountryKG=キルギス
-CountryLA=ラオ語
+CountryLA=ラオス
 CountryLV=ラトビア
 CountryLB=レバノン
 CountryLS=レソト
 CountryLR=リベリア
-CountryLY=リビアの
+CountryLY=リビア
 CountryLI=リヒテンシュタイン
 CountryLT=リトアニア
 CountryLU=ルクセンブルグ
@@ -177,7 +177,7 @@ CountryNO=ノルウェー
 CountryOM=オマーン
 CountryPK=パキスタン
 CountryPW=パラオ
-CountryPS=パレスチナ自治区、
+CountryPS=パレスチナ自治区
 CountryPA=パナマ
 CountryPG=パプアニューギニア
 CountryPY=パラグアイ
@@ -191,7 +191,7 @@ CountryRE=レユニオン
 CountryRO=ルーマニア
 CountryRW=ルワンダ
 CountrySH=セントヘレナ島
-CountryKN=セントクリストファーネビス
+CountryKN=セントクリストファー・ネイビス
 CountryLC=セントルシア
 CountryPM=サンピエール島·ミクロン島
 CountryVC=セントビンセントおよびグレナディーン諸島
@@ -256,9 +256,9 @@ CivilityMTRE=マスタ
 CivilityDR=ドクター
 ##### Currencies #####
 Currencyeuros=ユーロ
-CurrencyAUD=豪ドルs
+CurrencyAUD=豪ドル
 CurrencySingAUD=豪ドル
-CurrencyCAD=カナダドルs
+CurrencyCAD=カナダドル
 CurrencySingCAD=カナダドル
 CurrencyCHF=スイスフラン
 CurrencySingCHF=スイスフラン
@@ -266,7 +266,7 @@ CurrencyEUR=ユーロ
 CurrencySingEUR=ユーロ
 CurrencyFRF=フランスのフラン
 CurrencySingFRF=フランスフラン
-CurrencyGBP=英ポンドs
+CurrencyGBP=イギリス・ポンド
 CurrencySingGBP=英ポンド
 CurrencyINR=インドルピー
 CurrencySingINR=インドルピー
@@ -276,11 +276,11 @@ CurrencyMGA=アリアリ
 CurrencySingMGA=アリアリ
 CurrencyMUR=モーリシャスルピー
 CurrencySingMUR=モーリシャスルピー
-CurrencyNOK=ノルウェークローネs
+CurrencyNOK=ノルウェークローネ
 CurrencySingNOK=ノルウェークローネ
 CurrencyTND=チュニジアディナール
 CurrencySingTND=チュニジアディナール
-CurrencyUSD=米ドルs
+CurrencyUSD=米ドル
 CurrencySingUSD=米ドル
 CurrencyUAH=グリブナ
 CurrencySingUAH=グリブナ
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index cd0cf844f89..bbec3ce2d28 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=ファイルはまだデータベースにインデ
 ExtraFieldsEcmFiles=ExtrafieldsEcmファイル
 ExtraFieldsEcmDirectories=ExtrafieldsEcmディレクトリ
 ECMSetup=ECMセットアップ
+GenerateImgWebp=すべての画像を.webp形式の別のバージョンで複製する
+ConfirmGenerateImgWebp=確認すると、現在このフォルダとそのサブフォルダ...にあるすべての画像に対して .webp形式の画像が生成される
+ConfirmImgWebpCreation=すべての画像の重複を確認する
+SucessConvertImgWebp=画像が正常に複製された
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 40d07d1e85b..bf03fa63a87 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=ディレクトリが見つかりません<b>%s(PHP</b> openbas
 ErrorFunctionNotAvailableInPHP=関数<b>%sは、</b>この機能を使用するために必要となるが、このバージョンの/ PHPのセットアップでは使用できない。
 ErrorDirAlreadyExists=この名前のディレクトリがすでに存在している。
 ErrorFileAlreadyExists=この名前を持つファイルがすでに存在している。
+ErrorDestinationAlreadyExists=<b> %s</b>という名前の別のファイルが既に存在する。
 ErrorPartialFile=ファイルはサーバーで完全に受け取っていない。
 ErrorNoTmpDir=一時的なdirectyの%sが存在しません。
 ErrorUploadBlockedByAddon=PHP / Apacheプラグインによってブロックされてアップロードする。
@@ -214,7 +215,7 @@ ErrorTooManyErrorsProcessStopped=エラーが多すぎる。プロセスが停
 ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=このアクションで在庫を増減するオプションが設定されている場合、一括検証はできない(増加/減少する倉庫を定義できるように、1つずつ検証する必要がある)
 ErrorObjectMustHaveStatusDraftToBeValidated=オブジェクト%sを検証するには、ステータスが "ドラフト" である必要がある。
 ErrorObjectMustHaveLinesToBeValidated=オブジェクト%sには、検証する行が必要だ。
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction= "電子メールで送信" 一括アクションを使用して送信できるのは、検証済みの請求書のみだ。
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction= "電子メールで送信" 一括アクションを使用して送信できるのは、検証済の請求書のみだ。
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=記事が事前定義された製品であるかどうかを選択する必要がある
 ErrorDiscountLargerThanRemainToPaySplitItBefore=あなたが適用しようとする割引は、支払うべき残りよりも大きいだ。前に割引を2つの小さな割引に分割する。
 ErrorFileNotFoundWithSharedLink=ファイルが見つからなかった。共有キーが変更されたか、ファイルが最近削除された可能性がある。
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=勘定科目表の読み込み中にエラーが発生し
 ErrorBadSyntaxForParamKeyForContent=paramkeyforcontentの構文が正しくない。 %sまたは%sで始まる値が必要だ
 ErrorVariableKeyForContentMustBeSet=エラー、名前%s(表示するテキストコンテンツ付き)または%s(表示する外部URL付き)の定数を設定する必要がある。
 ErrorURLMustStartWithHttp=URL %sは http:// または https:// で始まる必要がある
+ErrorHostMustNotStartWithHttp=ホスト名%sは、http:// または https:// で始まらないこと
 ErrorNewRefIsAlreadyUsed=エラー、新規参照はすでに使用されている
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=エラー、クローズされた請求書にリンクされた支払いを削除することはできない。
 ErrorSearchCriteriaTooSmall=検索条件が小さすぎる。
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=パブリックインターフェイスが有効
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=別のページの翻訳として設定されている場合は、新しいページの言語を定義する必要がある
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=新しいページの言語は、別ページの翻訳として設定されている場合、ソース言語にしないこと
 ErrorAParameterIsRequiredForThisOperation=この操作にはパラメーターが必須です
+ErrorDateIsInFuture=エラー、日付を未来にすることはできない
+ErrorAnAmountWithoutTaxIsRequired=エラー、数量は必須
+ErrorAPercentIsRequired=エラー、パーセンテージを正しく入力すること
+ErrorYouMustFirstSetupYourChartOfAccount=最初に勘定科目表を設定する必要がある
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize(%s)は、PHPパラメータ post_max_size(%s)よりも大きくなっている。これは一貫した設定ではない。
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=警告、ECMデータベースインデ
 WarningTheHiddenOptionIsOn=警告、非表示のオプション<b> %s</b>がオンになっている。
 WarningCreateSubAccounts=警告、サブアカウントを直接作成することはできない。このリストでそれらを見つけるには、サードパーティまたはユーザーを作成し、それらにアカウンティングコードを割り当てる必要がある
 WarningAvailableOnlyForHTTPSServers=HTTPSで保護された接続を使用している場合にのみ使用できます。
+WarningModuleXDisabledSoYouMayMissEventHere=モジュール%sが有効になっていない。そのため、ここでは多くのイベントを見逃す可能性がある。
+ErrorActionCommPropertyUserowneridNotDefined=ユーザの所有者が必要
+ErrorActionCommBadType=選択したイベント種別 (id: %n, code: %s) がイベント種別辞書に存在しない
diff --git a/htdocs/langs/ja_JP/externalsite.lang b/htdocs/langs/ja_JP/externalsite.lang
index e13d16f892d..69f71eced9c 100644
--- a/htdocs/langs/ja_JP/externalsite.lang
+++ b/htdocs/langs/ja_JP/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=外部ウェブサイトへのリンクを設定
-ExternalSiteURL=外部サイトのURL
+ExternalSiteURL=HTMLiframeコンテンツの外部サイトURL
 ExternalSiteModuleNotComplete=モジュールExternalSite(外部サイト)が正しく構成されていませんでした。
 ExampleMyMenuEntry=私のメニューエントリ
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 042be5d8fa0..79ddd3fbe8f 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -23,13 +23,13 @@ ErrorPHPDoesNotSupportUTF8=PHPインストールはUTF8関数をサポートし
 ErrorPHPDoesNotSupportIntl=PHPインストールはIntl関数をサポートしない。
 ErrorPHPDoesNotSupportxDebug=PHPインストールは、拡張デバッグ機能をサポートしない。
 ErrorPHPDoesNotSupport=PHPインストールは、%s関数をサポートしない。
-ErrorDirDoesNotExists=ディレクトリの%sが存在しません。
+ErrorDirDoesNotExists=%sディレクトリが存在しません。
 ErrorGoBackAndCorrectParameters=戻ってパラメータを確認/修正すること。
 ErrorWrongValueForParameter=あなたは、パラメータ '%s' に間違った値を入力した可能性がある。
 ErrorFailedToCreateDatabase=データベース %s を作成できなかった。
 ErrorFailedToConnectToDatabase=データベース %s への接続に失敗した。
 ErrorDatabaseVersionTooLow=データベースのバージョン (%s) が古すぎる。 バージョン %s 以降が必要。
-ErrorPHPVersionTooLow=あまりにも古いPHPバージョン。バージョン%sが必要。
+ErrorPHPVersionTooLow=PHPのバージョンが古すぎます。バージョン%sが必要です。
 ErrorConnectedButDatabaseNotFound=サーバーへの接続は成功したが、データベース '%s'が見つかりません。
 ErrorDatabaseAlreadyExists=データベース %s は既に存在する。
 IfDatabaseNotExistsGoBackAndUncheckCreate=データベースが存在しない場合は、戻って "データベースの作成" オプションをオンにする。
@@ -39,16 +39,16 @@ PHPVersion=PHPのバージョン
 License=ライセンスを使用して
 ConfigurationFile=設定ファイル
 WebPagesDirectory=ウェブページが保存されているディレクトリ
-DocumentsDirectory=アップロードし、生成されたドキュメントを格納するディレクトリ
+DocumentsDirectory=アップロードされたドキュメントや生成されたドキュメントを格納するディレクトリ
 URLRoot=URLのルート
-ForceHttps=力安全な接続(HTTPS)
+ForceHttps=セキュアな接続(HTTPS)を強制する
 CheckToForceHttps=セキュアな接続(https)を強制的にこのオプションをチェックすること。 <br>これは、WebサーバがSSL証明書を使用して構成されている必要がある。
 DolibarrDatabase=Dolibarrデータベース
 DatabaseType=データベース種別
 DriverType=ドライバ種別
 Server=サーバー
 ServerAddressDescription=データベースサーバーの名前またはIP住所。データベースサーバーがWebサーバーと同じサーバーでホストされている場合、通常は「localhost」。
-ServerPortDescription=データベース·サーバーのポート。不明の場合は、空の保管すること。
+ServerPortDescription=データベース・サーバーのポート。不明な場合は空欄のままにしてください。
 DatabaseServer=データベース·サーバー
 DatabaseName=データベース名
 DatabasePrefix=データベーステーブルプレフィックス
@@ -68,7 +68,7 @@ ServerConnection=サーバーへの接続
 DatabaseCreation=データベースの作成
 CreateDatabaseObjects=データベースオブジェクトの作成
 ReferenceDataLoading=参照データのロード
-TablesAndPrimaryKeysCreation=テーブルと主キーの作成
+TablesAndPrimaryKeysCreation=テーブルと初期キーの作成
 CreateTableAndPrimaryKey=テーブルの%sを作成する
 CreateOtherKeysForTable=テーブルの%sの外部キーとインデックスを作成する
 OtherKeysCreation=外部キーとインデックスの作成
@@ -78,8 +78,8 @@ PleaseTypePassword=パスワードを入力すること。空のパスワード
 PleaseTypeALogin=ログインを入力すること！
 PasswordsMismatch=パスワードが異なる。もう一度お試しください。
 SetupEnd=設定の終了
-SystemIsInstalled=このインストールは満了。
-SystemIsUpgraded=Dolibarrが正常にアップグレードされている。
+SystemIsInstalled=インストールが完了しました。
+SystemIsUpgraded=Dolibarrが正常にアップグレードされました。
 YouNeedToPersonalizeSetup=あなたのニーズに合わせてDolibarrを設定する必要がある(外観、機能、...).これを行うには、下記のリンクをクリックすること。
 AdminLoginCreatedSuccessfuly=Dolibarr 管理者ログイン '<b>%s</b>' の作成が成功した。
 GoToDolibarr=Dolibarrに行く
@@ -213,5 +213,5 @@ YouTryInstallDisabledByDirLock=アプリケーションは自己アップグレ
 YouTryInstallDisabledByFileLock=アプリケーションは自己アップグレードを試みたが、インストール/アップグレードページはセキュリティのために無効になっている(dolibarrドキュメントディレクトリにロックファイル<strong> install.lock </strong>が存在するため)。 <br>
 ClickHereToGoToApp=アプリケーションに移動するには、ここをクリックすること
 ClickOnLinkOrRemoveManualy=アップグレードが進行中の場合は、しばらく待つこと。そうでない場合は、次のリンクをクリックすること。この同じページが常に表示される場合は、documentsディレクトリのinstall.lockファイルを削除/名前変更する必要がある。
-Loaded=ロード済み
+Loaded=ロード済
 FunctionTest=機能テスト
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index 1a4ab927428..a5503951b7a 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -8,7 +8,7 @@ Language_bn_BD=ベンガル語
 Language_bn_IN=ベンガル語(インド)
 Language_bg_BG=ブルガリア語
 Language_bs_BA=ボスニア語
-Language_ca_ES=カタルにゃ語
+Language_ca_ES=カタロニア語
 Language_cs_CZ=チェコ語
 Language_da_DA=デンマーク語
 Language_da_DK=デンマーク語
@@ -59,7 +59,7 @@ Language_fr_NC=フランス(ニューカレドニア)
 Language_fr_SN=フランス語(セネガル)
 Language_fy_NL=フリジア語
 Language_gl_ES=ガリシア語
-Language_he_IL=ヘブライ語の
+Language_he_IL=ヘブライ語
 Language_hi_IN=ヒンディー語(インド)
 Language_hr_HR=クロアチア語
 Language_hu_HU=ハンガリー語
@@ -89,7 +89,7 @@ Language_ru_RU=ロシア語
 Language_ru_UA=ロシア語(ウクライナ)
 Language_tr_TR=トルコ語
 Language_sl_SI=スロベニア語
-Language_sv_SV=スウエーデん語
+Language_sv_SV=スウェーデン語
 Language_sv_SE=スウェーデン語
 Language_sq_AL=アルバニア語
 Language_sk_SK=スロバキア語
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index ef5a5e7ff91..9a56b5c791e 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -66,7 +66,7 @@ ErrorCantLoadUserFromDolibarrDatabase=Dolibarrデータベース内のユーザ
 ErrorNoVATRateDefinedForSellerCountry=エラー、国%s 'に対して定義されていないのVAT率。
 ErrorNoSocialContributionForSellerCountry=エラー、国 '%s'に定義された社会/財政税タイプがありません。
 ErrorFailedToSaveFile=エラー、ファイルを保存に失敗しました。
-ErrorCannotAddThisParentWarehouse=すでに既存の倉庫の子である親倉庫を追加しようとしています
+ErrorCannotAddThisParentWarehouse=すでに既存の倉庫の子である親倉庫を追加しようとしている
 MaxNbOfRecordPerPage=パージ当たりの最大レコード数
 NotAuthorized=その実行には権限が不足
 SetDate=日付を設定する
@@ -94,7 +94,7 @@ RecordDeleted=レコード削除
 RecordGenerated=レコード生成
 LevelOfFeature=機能のレベル
 NotDefined=未定義
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr認証モードは、構成ファイル<b> conf.php</b>で<b>%s</b>に設定されています。 <br>これは、パスワードデータベースがDolibarrの外部にあるため、このフィールドを変更しても効果がない可能性があることを意味します。
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr認証モードは、構成ファイル<b> conf.php</b>で<b>%s</b>に設定されている。 <br>これは、パスワードデータベースがDolibarrの外部にあるため、このフィールドを変更しても効果がない可能性があることを意味します。
 Administrator=管理者
 Undefined=未定義
 PasswordForgotten=パスワード忘れたの？
@@ -144,15 +144,15 @@ PeriodEndDate=期間の終了日
 SelectedPeriod=選択した期間
 PreviousPeriod=前回の期間
 Activate=活性化
-Activated=活性化済み
+Activated=活性化済
 Closed=閉じた
 Closed2=閉じた
 NotClosed=未閉鎖
-Enabled=有効化済み
+Enabled=有効化済
 Enable=有効化
-Deprecated=廃止済み
+Deprecated=廃止済
 Disable=無効化
-Disabled=無効化済み
+Disabled=無効化済
 Add=加える
 AddLink=リンクを追加
 RemoveLink=リンクを削除
@@ -278,6 +278,7 @@ DateModificationShort=MODIF。日付
 IPModification=変更IP
 DateLastModification=最新の変更日
 DateValidation=検証日
+DateSigning=署名日
 DateClosing=日付を閉じる
 DateDue=期日
 DateValue=値の日付
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=単価(除く)(通貨)
 UnitPriceTTC=単価
 PriceU=UP
 PriceUHT=UP(純額)
-PriceUHTCurrency=U.P(通貨)
+PriceUHTCurrency=U.P (正味) (通貨)
 PriceUTTC=アップ。 (税込)
 Amount=量
 AmountInvoice=請求額
@@ -389,6 +390,8 @@ AmountTotal=合計金額
 AmountAverage=平均額
 PriceQtyMinHT=価格数量最小(税抜)
 PriceQtyMinHTCurrency=価格数量最小(税抜き)(通貨)
+PercentOfOriginalObject=元のオブジェクトのパーセント
+AmountOrPercent=数量またはパーセント
 Percentage=割合
 Total=合計
 SubTotal=小計
@@ -724,7 +727,7 @@ MenuMembers=メンバー
 MenuAgendaGoogle=Googleの議題
 MenuTaxesAndSpecialExpenses=税金|特別経費
 ThisLimitIsDefinedInSetup=Dolibarr制限(メニューホームセットアップ·セキュリティ)：%s KB、PHP制限：%s KB
-NoFileFound=このディレクトリに保存されない文書ません
+NoFileFound=ドキュメントがアップロードされていない
 CurrentUserLanguage=現在の言語
 CurrentTheme=現在のテーマ
 CurrentMenuManager=現在のメニューマネージャー
@@ -866,7 +869,7 @@ DeleteLine=行を削除
 ConfirmDeleteLine=この行を削除してもよろしいですか？
 ErrorPDFTkOutputFileNotFound=エラー：ファイルは生成されませんでした。 'pdftk'コマンドが$ PATH環境変数(linux / unixのみ)に含まれるディレクトリーにインストールされていることを確認するか、システム管理者に連絡してください。
 NoPDFAvailableForDocGenAmongChecked=チェックされたレコードの中でドキュメント生成に使用できるPDFがありませんでした
-TooManyRecordForMassAction=マスアクション用に選択されたレコードが多すぎます。アクションは、%sレコードのリストに制限されています。
+TooManyRecordForMassAction=マスアクション用に選択されたレコードが多すぎます。アクションは、%sレコードのリストに制限されている。
 NoRecordSelected=レコードが選択されていません
 MassFilesArea=大量アクションによって作成されたファイルの領域
 ShowTempMassFilesArea=大量アクションによって作成されたファイルの領域を表示する
@@ -888,9 +891,9 @@ ExportList=エクスポートリスト
 ExportOptions=エクスポートオプション
 IncludeDocsAlreadyExported=すでにエクスポートされたドキュメントを含める
 ExportOfPiecesAlreadyExportedIsEnable=すでにエクスポートされたピースのエクスポートが有効になります
-ExportOfPiecesAlreadyExportedIsDisable=すでにエクスポートされたピースのエクスポートは無効になっています
+ExportOfPiecesAlreadyExportedIsDisable=すでにエクスポートされたピースのエクスポートは無効になっている
 AllExportedMovementsWereRecordedAsExported=エクスポートされたすべての動きは、エクスポートされたものとして記録されました
-NotAllExportedMovementsCouldBeRecordedAsExported=エクスポートされたすべての動きをエクスポート済みとして記録できるわけではありません
+NotAllExportedMovementsCouldBeRecordedAsExported=エクスポートされたすべての動きをエクスポート済として記録できるわけではありません
 Miscellaneous=その他
 Calendar=カレンダー
 GroupBy=グループ化...
@@ -899,8 +902,10 @@ ViewAccountList=元帳を表示
 ViewSubAccountList=補助科目元帳を表示
 RemoveString=文字列 '%s'を削除します
 SomeTranslationAreUncomplete=提供された言語の一部において、翻訳がほんの部分的だったり誤っていたりなの。自分の言語の訂正を助けたい人は、<a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> に登録して、改善案を追加してね。
-DirectDownloadLink=直接ダウンロードリンク(公開/外部)
-DirectDownloadInternalLink=直接ダウンロードリンク(ログに記録する必要があり、権限が必要です)
+DirectDownloadLink=公開ダウンロードリンク
+PublicDownloadLinkDesc=ファイルのダウンロードにはリンクのみが必要
+DirectDownloadInternalLink=プライベートダウンロードリンク
+PrivateDownloadLinkDesc=ログに記録する必要があり、ファイルを表示またはダウンロードするためのアクセス許可が必要
 Download=ダウンロード
 DownloadDocument=ドキュメントをダウンロード
 ActualizeCurrency=為替レートを更新する
@@ -1006,13 +1011,14 @@ Select2Enter=入る
 Select2MoreCharacter=以上のキャラクター
 Select2MoreCharacters=以上の文字
 Select2MoreCharactersMore= <strong>検索構文：</strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> OR </kbd>(| B)</kbd>と<br> <kbd> <strong> * </strong> </kbd> <kbd>任意の文字</kbd>(* b)の<br> <kbd> <strong> ^ </strong> </kbd> <kbd>スタート</kbd>と(^ AB)<br> <kbd> <strong> $ </strong> </kbd> <kbd>エンド( ab $)<br>
-Select2LoadingMoreResults=より多くの結果を読み込んでいます...
+Select2LoadingMoreResults=より多くの結果を読み込んでいる...
 Select2SearchInProgress=進行中の検索...
 SearchIntoThirdparties=サードパーティ
 SearchIntoContacts=コンタクト
 SearchIntoMembers=メンバー
 SearchIntoUsers=ユーザー
 SearchIntoProductsOrServices=製品またはサービス
+SearchIntoBatch=ロット/シリアル
 SearchIntoProjects=プロジェクト
 SearchIntoMO=製造オーダー
 SearchIntoTasks=タスク
@@ -1049,12 +1055,13 @@ KeyboardShortcut=キーボードショートカット
 AssignedTo=影響を受ける
 Deletedraft=下書き削除
 ConfirmMassDraftDeletion=下書き大量削除確
-FileSharedViaALink=リンクを介して共有されるファイル
+FileSharedViaALink=パブリックリンクと共有されているファイル
 SelectAThirdPartyFirst=最初にサードパーティを選択してください...
-YouAreCurrentlyInSandboxMode=現在、%s「サンドボックス」モードになっています
+YouAreCurrentlyInSandboxMode=現在、%s「サンドボックス」モードになっている
 Inventory=在庫
 AnalyticCode=分析コード
 TMenuMRP=MRP
+ShowCompanyInfos=法人情報を表示する
 ShowMoreInfos=詳細情報を表示
 NoFilesUploadedYet=最初にドキュメントをアップロードしてください
 SeePrivateNote=プライベートノートを見る
@@ -1104,7 +1111,7 @@ ASAP=できるだけ速やかに
 CREATEInDolibarr=作成されたレコード%s
 MODIFYInDolibarr=レコード%sが変更されました
 DELETEInDolibarr=レコード%sが削除されました
-VALIDATEInDolibarr=検証済みのレコード%s
+VALIDATEInDolibarr=検証済のレコード%s
 APPROVEDInDolibarr=承認された記録%s
 DefaultMailModel=デフォルトのメールモデル
 PublicVendorName=ベンダーの公開名
@@ -1120,3 +1127,5 @@ AffectTag=タグに影響を与える
 ConfirmAffectTag=バルクタグの影響
 ConfirmAffectTagQuestion=選択した%sレコード(s)のタグに影響を与えてもよいか？
 CategTypeNotFound=レコードのタイプのタグタイプが見つからない
+CopiedToClipboard=クリップボードにコピー
+InformationOnLinkToContract=この金額は、契約のすべての行の合計にすぎません。時間の概念は考慮されていない。
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index ab5f6299a45..df1542aa7a7 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -22,7 +22,7 @@ ProductService=製品やサービス
 AllProducts=すべての製品とサービス
 ChooseProduct/Service=製品またはサービスを選択すること
 ForceBuyingPriceIfNull=定義されていない場合、購入/原価を販売価格に強制する
-ForceBuyingPriceIfNullDetails=購入/原価が定義されておらず、このオプションが「オン」の場合、利益はオンラインでゼロになる(購入/原価=販売価格)。それ以外の場合(「オフ」)、利益は提案されたデフォルトと等しくなる。
+ForceBuyingPriceIfNullDetails=新規行を追加するときに購入/原価が提供されておらず、このオプションが「オン」の場合、新規行のマージンは0になる（購入/原価=販売価格）。このオプションが「オフ」（推奨）の場合、マージンはデフォルトで提案されている値と等しくなる（デフォルト値が見つからない場合は100％になる可能性がある）。
 MARGIN_METHODE_FOR_DISCOUNT=グローバル割引の利益方式
 UseDiscountAsProduct=製品として
 UseDiscountAsService=サービスとして
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index bbea9f1697c..417d21d59b5 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -9,7 +9,7 @@ UserNotLinkedToMember=ユーザーがメンバにリンクされていない
 ThirdpartyNotLinkedToMember=メンバにリンクされていない取引先
 MembersTickets=メンバチケット
 FundationMembers=Foundationのメンバ
-ListOfValidatedPublicMembers=検証済みのパブリックメンバのリスト
+ListOfValidatedPublicMembers=検証済のパブリックメンバのリスト
 ErrorThisMemberIsNotPublic=このメンバは、パブリックではない
 ErrorMemberIsAlreadyLinkedToThisThirdParty=別のメンバ(名前<b>：%s、</b>ログイン<b>：%s)</b>は既に取引先製の<b>%s</b>にリンクされている。第三者が唯一のメンバ(およびその逆)にリンクすることはできないので、最初にこのリンクを削除する。
 ErrorUserPermissionAllowsToLinksToItselfOnly=セキュリティ上の理由から、あなたはすべてのユーザーが自分のものでないユーザーにメンバをリンクすることができるように編集する権限を付与する必要がある。
@@ -21,10 +21,12 @@ MembersListToValid=ドラフトのメンバのリスト(検証する)
 MembersListValid=有効なメンバのリスト
 MembersListUpToDate=最新のサブスクリプションを持つ有効なメンバのリスト
 MembersListNotUpToDate=サブスクリプションが古くなっている有効なメンバのリスト
+MembersListExcluded=除外されたメンバのリスト
 MembersListResiliated=終了したメンバのリスト
 MembersListQualified=修飾されたメンバのリスト
 MenuMembersToValidate=ドラフトのメンバ
 MenuMembersValidated=検証メンバ
+MenuMembersExcluded=除外されたメンバ
 MenuMembersResiliated=終了したメンバ
 MembersWithSubscriptionToReceive=受け取るために、サブスクリプションを持つメンバ
 MembersWithSubscriptionToReceiveShort=受け取るサブスクリプション
@@ -47,11 +49,14 @@ MemberStatusActiveLate=サブスクリプションの有効期限が切れた
 MemberStatusActiveLateShort=期限切れの
 MemberStatusPaid=最新のサブスクリプション
 MemberStatusPaidShort=最新の
+MemberStatusExcluded=除外されたメンバ
+MemberStatusExcludedShort=除外
 MemberStatusResiliated=終了メンバ
 MemberStatusResiliatedShort=終了しました
 MembersStatusToValid=ドラフトのメンバ
+MembersStatusExcluded=除外されたメンバ
 MembersStatusResiliated=終了したメンバ
-MemberStatusNoSubscription=検証済み(サブスクリプションは不要)
+MemberStatusNoSubscription=検証済(サブスクリプションは不要)
 MemberStatusNoSubscriptionShort=検証
 SubscriptionNotNeeded=サブスクリプションは必要ない
 NewCotisation=新規貢献
@@ -82,6 +87,8 @@ Physical=物理的な
 Moral=道徳
 MorAndPhy=道徳的および物理的
 Reenable=再度有効にする
+ExcludeMember=メンバを除外する
+ConfirmExcludeMember=このメンバを除外してもよろしいですか？
 ResiliateMember=メンバを終了する
 ConfirmResiliateMember=このメンバを終了してもよいか？
 DeleteMember=メンバを削除する
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=メンバの検証時にメンバ
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=新規サブスクリプションの記録でメンバに電子メールを送信するために使用する電子メールテンプレート
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=サブスクリプションの有効期限が近づいたときにメールリマインダーを送信するために使用するメールテンプレート
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=メンバのキャンセル時にメンバに電子メールを送信するために使用する電子メールテンプレート
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=メンバーの除外時にメンバーに電子メールを送信するために使用する電子メールテンプレート
 DescADHERENT_MAIL_FROM=自動メールの送信者メール
 DescADHERENT_ETIQUETTE_TYPE=ラベルページのフォーマット
 DescADHERENT_ETIQUETTE_TEXT=メンバのアドレスシートに印刷されたテキスト
@@ -162,6 +170,7 @@ DocForLabels=アドレスシート<b>(：%s</b>出力の形式は実際の設定
 SubscriptionPayment=サブスクリプション費用の支払い
 LastSubscriptionDate=最新のサブスクリプション支払いの日付
 LastSubscriptionAmount=最新のサブスクリプションの量
+LastMemberType=前回のメンバー種別
 MembersStatisticsByCountries=国別メンバ統計
 MembersStatisticsByState=都道府県/州によってメンバの統計
 MembersStatisticsByTown=町によってメンバの統計
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index cd03bfe05a8..0c1e7ea97fb 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -100,7 +100,7 @@ PermissionsDefDescTooltip=モジュール/アプリケーションによって
 HooksDefDesc=定義する：管理したいフックのコンテキストを <b>module_parts['hooks']</b> プロパティのモジュール記述子の中に。 (コンテキストのリストは、コアコードで '<b>initHooks(</b>' を検索すると見つかる).<br>編集する：フックされた関数のコードを追加するためのフックファイルを。 (フック可能な関数は、コアコードで '<b>executeHooks</b>' を検索すると見つかる).
 TriggerDefDesc=実行されるビジネスイベントごとに実行するコードをトリガーファイルで定義する。
 SeeIDsInUse=インストールで使用されているIDを確認する
-SeeReservedIDsRangeHere=予約済みIDの範囲を参照すること
+SeeReservedIDsRangeHere=予約済IDの範囲を参照すること
 ToolkitForDevelopers=Dolibarr開発者向けのツールキット
 TryToUseTheModuleBuilder=SQLとPHPの知識がある場合は、ネイティブモジュールビルダーウィザードを使用できる。 <br>モジュール<strong>%s </strong>を有効にし、右上のメニューで<span class="fa fa-bug"></span>をクリックしてウィザードを使用する。 <br>警告：これは高度な開発者機能。本番サイトで</b>実験ではなく<b>を実行すること。
 SeeTopRightMenu=右上のメニューの<span class="fa fa-bug"></span>を参照すること
@@ -133,7 +133,9 @@ IncludeDocGeneration=オブジェクトからいくつかのドキュメント
 IncludeDocGenerationHelp=これをチェックすると、レコードに「ドキュメントの生成」ボックスを追加するためのコードが生成される。
 ShowOnCombobox=コンボボックスに値を表示する
 KeyForTooltip=ツールチップのキー
-CSSClass=CSSクラス
+CSSClass=フォーム 編集/作成 用のCSS
+CSSViewClass=読取フォーム用CSS
+CSSListClass=リストのCSS
 NotEditable=編集不可
 ForeignKey=外部キー
 TypeOfFieldsHelp=フィールドの種別:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' は、コンボの後に+ボタンを追加してレコードを作成することを意味する、 'filter' は例えば、 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' )
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index 2699436c7ea..8a44ed499bb 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -16,6 +16,8 @@ ToOrder=順序を作る
 MakeOrder=順序を作る
 SupplierOrder=注文書
 SuppliersOrders=注文書
+SaleOrderLines=販売注文ライン
+PurchaseOrderLines=購入注文ライン
 SuppliersOrdersRunning=現在の注文書
 CustomerOrder=販売注文
 CustomersOrders=受注
@@ -46,8 +48,8 @@ StatusOrderReceivedAllShort=受け取った製品
 StatusOrderCanceled=キャンセル
 StatusOrderDraft=下書き(検証する必要がある)
 StatusOrderValidated=検証
-StatusOrderOnProcess=注文済み-スタンバイ受信
-StatusOrderOnProcessWithValidation=注文済み-スタンバイ受信または検証
+StatusOrderOnProcess=注文済-スタンバイ受信
+StatusOrderOnProcessWithValidation=注文済-スタンバイ受信または検証
 StatusOrderProcessed=処理
 StatusOrderToBill=請求する
 StatusOrderApproved=承認された
@@ -57,7 +59,7 @@ StatusOrderReceivedAll=受け取ったすべての製品
 ShippingExist=出荷が存在する
 QtyOrdered=数量は、注文された
 ProductQtyInDraft=下書き注文への製品数量
-ProductQtyInDraftOrWaitingApproved=下書き注文または承認済み注文への製品数量、まだ注文されていない
+ProductQtyInDraftOrWaitingApproved=下書き注文または承認済注文への製品数量、まだ注文されていない
 MenuOrdersToBill=法案に注文
 MenuOrdersToBill2=請求可能な注文
 ShipProduct=船積
@@ -90,7 +92,7 @@ NumberOfOrdersByMonth=月別受注数
 AmountOfOrdersByMonthHT=月別のご注文金額(税込)
 ListOfOrders=注文の一覧
 CloseOrder=密集隊形
-ConfirmCloseOrder=この注文を配信済みに設定してもよいか？注文が配信されると、請求に設定できる。
+ConfirmCloseOrder=この注文を配信済に設定してもよいか？注文が配信されると、請求に設定できる。
 ConfirmDeleteOrder=この注文を削除してもよいか？
 ConfirmValidateOrder=この注文を<b>%s </b>という名前で検証してもよいか？
 ConfirmUnvalidateOrder=注文<b>%s </b>を下書きステータスに復元してもよいか？
@@ -148,14 +150,14 @@ PDFProformaDescription=完全な 見積請求書 テンプレート
 CreateInvoiceForThisCustomer=請求書注文
 CreateInvoiceForThisSupplier=請求書注文
 NoOrdersToInvoice=請求可能な注文はない
-CloseProcessedOrdersAutomatically=選択したすべての注文を「処理済み」に分類する。
+CloseProcessedOrdersAutomatically=選択したすべての注文を「処理済」に分類する。
 OrderCreation=注文の作成
 Ordered=順序付けられた
 OrderCreated=注文が作成された
 OrderFail=注文の作成中にエラーが発生した
 CreateOrders=注文を作成する
 ToBillSeveralOrderSelectCustomer=複数の注文の請求書を作成するには、最初に顧客をクリックしてから、「%s」を選択する。
-OptionToSetOrderBilledNotEnabled=モジュールワークフローのオプションで、請求書検証時に注文を自動的に「請求済み」に設定するオプションが有効になっていないため、請求書が生成された後、注文のステータスを手動で「請求済み」に設定する必要がある。
+OptionToSetOrderBilledNotEnabled=モジュールワークフローのオプションで、請求書検証時に注文を自動的に「請求済」に設定するオプションが有効になっていないため、請求書が生成された後、注文のステータスを手動で「請求済」に設定する必要がある。
 IfValidateInvoiceIsNoOrderStayUnbilled=請求書検証が「いいえ」の場合、請求書が検証されるまで、注文はステータス「未請求」のままになる。
 CloseReceivedSupplierOrdersAutomatically=すべての製品を受け取ったら、注文を自動的にステータス「%s」に閉じる。
 SetShippingMode=配送モードを設定する
@@ -179,8 +181,8 @@ StatusSupplierOrderReceivedAllShort=受け取った製品
 StatusSupplierOrderCanceled=キャンセル
 StatusSupplierOrderDraft=下書き(検証する必要がある)
 StatusSupplierOrderValidated=検証
-StatusSupplierOrderOnProcess=注文済み-スタンバイ受信
-StatusSupplierOrderOnProcessWithValidation=注文済み-スタンバイ受信または検証
+StatusSupplierOrderOnProcess=注文済-スタンバイ受信
+StatusSupplierOrderOnProcessWithValidation=注文済-スタンバイ受信または検証
 StatusSupplierOrderProcessed=処理
 StatusSupplierOrderToBill=請求する
 StatusSupplierOrderApproved=承認された
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index b3fda9e5699..4656b0420d0 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -20,7 +20,7 @@ ZipFileGeneratedInto=<b> %s</b>に生成されたZipファイル。
 DocFileGeneratedInto=<b> %s</b>に生成されたドキュメントファイル。
 JumpToLogin=切断された。ログインページに移動...
 MessageForm=オンライン支払いフォームのメッセージ
-MessageOK=確認済みの支払いの返品ページのメッセージ
+MessageOK=確認済の支払いの返品ページのメッセージ
 MessageKO=キャンセルされた支払いの返品ページのメッセージ
 ContentOfDirectoryIsNotEmpty=このディレクトリの内容は空ではない。
 DeleteAlsoContentRecursively=チェックすると、すべてのコンテンツが再帰的に削除される
@@ -30,18 +30,18 @@ PreviousYearOfInvoice=請求日の前年
 NextYearOfInvoice=請求日の翌年
 DateNextInvoiceBeforeGen=次の請求書の日付(生成前)
 DateNextInvoiceAfterGen=次の請求書の日付(生成後)
-GraphInBarsAreLimitedToNMeasures=Grapicsは、「バー」モードの%sメジャーに制限されています。代わりに、モード「ライン」が自動的に選択された。
-OnlyOneFieldForXAxisIsPossible=現在、X軸として使用できるフィールドは1つだけ 。最初に選択されたフィールドのみが選択されています。
+GraphInBarsAreLimitedToNMeasures=Grapicsは、「バー」モードの%sメジャーに制限されている。代わりに、モード「ライン」が自動的に選択された。
+OnlyOneFieldForXAxisIsPossible=現在、X軸として使用できるフィールドは1つだけ 。最初に選択されたフィールドのみが選択されている。
 AtLeastOneMeasureIsRequired=測定には少なくとも1つのフィールドが必要 
 AtLeastOneXAxisIsRequired=X軸には少なくとも1つのフィールドが必要 
 LatestBlogPosts=最新のブログ投稿
-Notify_ORDER_VALIDATE=検証済みの販売注文
+Notify_ORDER_VALIDATE=検証済の販売注文
 Notify_ORDER_SENTBYMAIL=メールで送信された販売注文
 Notify_ORDER_SUPPLIER_SENTBYMAIL=電子メールで送信された注文書
 Notify_ORDER_SUPPLIER_VALIDATE=記録された発注書
 Notify_ORDER_SUPPLIER_APPROVE=注文書が承認された
 Notify_ORDER_SUPPLIER_REFUSE=注文書が拒否された
-Notify_PROPAL_VALIDATE=検証済みの顧客の提案
+Notify_PROPAL_VALIDATE=検証済の顧客の提案
 Notify_PROPAL_CLOSE_SIGNED=顧客提案は署名された
 Notify_PROPAL_CLOSE_REFUSED=顧客の提案は拒否された
 Notify_PROPAL_SENTBYMAIL=電子メールによって送信された商業提案
@@ -59,7 +59,7 @@ Notify_BILL_SUPPLIER_VALIDATE=ベンダーの請求書が検証された
 Notify_BILL_SUPPLIER_PAYED=支払われたベンダーの請求書
 Notify_BILL_SUPPLIER_SENTBYMAIL=メールで送信されるベンダーの請求書
 Notify_BILL_SUPPLIER_CANCELED=ベンダーの請求書がキャンセルされた
-Notify_CONTRACT_VALIDATE=検証済みの契約
+Notify_CONTRACT_VALIDATE=検証済の契約
 Notify_FICHINTER_VALIDATE=介入検証
 Notify_FICHINTER_ADD_CONTACT=介入への連絡先を追加
 Notify_FICHINTER_SENTBYMAIL=郵送による介入
@@ -90,7 +90,7 @@ PredefinedMailTest=__(こんにちは)__\nこれは__EMAIL__に送信される
 PredefinedMailTestHtml=__(Hello)__ <br>これは__EMAIL__に送信される<b>テスト</b>メール (テストという単語は太字にする必要がある)。 <br>行はキャリッジリターンで区切られる。 <br> <br> __USER_SIGNATURE__
 PredefinedMailContentContract=__(こんにちは)__\n\n\n__(誠意をこめて)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(こんにちは)__\n\n添付の請求書__REF__をご覧ください\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(誠意をこめて)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(こんにちは)__\n\n請求書__REF__が支払われていないよう 。請求書のコピーがリマインダーとして添付されています。\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(誠意をこめて)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(こんにちは)__\n\n請求書__REF__が支払われていないよう 。請求書のコピーがリマインダーとして添付されている。\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(誠意をこめて)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(こんにちは)__\n\n添付の売買契約提案書__REF__を見つけること\n\n\n__(誠意をこめて)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(こんにちは)__\n\n添付の価格リクエストを見つけること__REF__\n\n\n__(誠意をこめて)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(こんにちは)__\n\n添付の注文__REF__を見つけること\n\n\n__(誠意をこめて)__\n\n__USER_SIGNATURE__
@@ -114,6 +114,7 @@ DemoCompanyAll=複数の活動を行う法人(すべてのメインモジュー
 CreatedBy=%sによって作成された
 ModifiedBy=%sによって変更された
 ValidatedBy=%sによって検証
+SignedBy=%sによる署名
 ClosedBy=%sによって閉じ
 CreatedById=作成したユーザーID
 ModifiedById=最新の変更を行ったユーザーID
@@ -200,7 +201,7 @@ NumberOfUnitsSupplierInvoices=ベンダーの請求書のユニット数
 NumberOfUnitsContracts=契約ユニット数
 NumberOfUnitsMos=製造指図で生産するユニットの数
 EMailTextInterventionAddedContact=新規介入%sが割り当てられた。
-EMailTextInterventionValidated=介入%sが検証されています。
+EMailTextInterventionValidated=介入%sが検証されている。
 EMailTextInvoiceValidated=請求書%sが検証された。
 EMailTextInvoicePayed=請求書%sが支払われた。
 EMailTextProposalValidated=提案%sが検証された。
@@ -224,7 +225,7 @@ NewLength=新規幅
 NewHeight=新規高さ
 NewSizeAfterCropping=トリミング後の新規サイズ
 DefineNewAreaToPick=(あなたが反対側の角に達するまで、イメージ上で左クリックをドラッグ)選択するには、画像を新たな領域を定義する。
-CurrentInformationOnImage=このツールは、画像のサイズ変更やトリミングに役立つように設計されています。これは現在編集されている画像に関する情報 
+CurrentInformationOnImage=このツールは、画像のサイズ変更やトリミングに役立つように設計されている。これは現在編集されている画像に関する情報 
 ImageEditor=イメージエディタ
 YouReceiveMailBecauseOfNotification=あなたのメールアドレスは%sの%sソフトウェアに特定のイベントを通知されるターゲットのリストに追加されているため、このメッセージが表示される。
 YouReceiveMailBecauseOfNotification2=このイベントは次のとおり 。
@@ -244,6 +245,7 @@ NewKeyIs=これはログインするための新規キー
 NewKeyWillBe=ソフトウェアにログインするための新規キーは次のようになる
 ClickHereToGoTo=%sに移動するには、ここをクリックすること
 YouMustClickToChange=ただし、このパスワードの変更を検証するには、最初に次のリンクをクリックする必要がある
+ConfirmPasswordChange=パスワードの変更を確認する
 ForgetIfNothing=この変更をリクエストしなかった場合は、このメールを忘れてください。あなたの資格情報は安全に保たれる。
 IfAmountHigherThan=<strong> %s</strong>よりも多い場合
 SourcesRepository=ソースのリポジトリ
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
index 7c05340b95e..88985c01ebe 100644
--- a/htdocs/langs/ja_JP/productbatch.lang
+++ b/htdocs/langs/ja_JP/productbatch.lang
@@ -1,24 +1,35 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=はい
-ProductStatusNotOnBatchShort=なし
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-BatchNumberShort=Lot/Serial
-EatByDate=Eat-by date
-SellByDate=Sell-by date
-DetailBatchNumber=Lot/Serial details
-printBatch=Lot/Serial: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
+ManageLotSerial=ロット/シリアル 番号を使用
+ProductStatusOnBatch=はい（ロットが必要）
+ProductStatusOnSerial=はい（一意のシリアル番号が必要）
+ProductStatusNotOnBatch=いえ (ロット/シリアル 不要)
+ProductStatusOnBatchShort=ロット
+ProductStatusOnSerialShort=シリアル
+ProductStatusNotOnBatchShort=いえ
+Batch=ロット/シリアル
+atleast1batchfield=賞味期限、消費期限、ロット/シリアル 番号
+batch_number=ロット/シリアル 番号
+BatchNumberShort=ロット/シリアル
+EatByDate=賞味期限
+SellByDate=消費期限
+DetailBatchNumber=ロット/シリアル 詳細
+printBatch=ロット/シリアル: %s
+printEatby=賞味: %s
+printSellby=消費: %s
+printQty=数量: %d
+AddDispatchBatchLine=保存期限割当の行を追加
+WhenProductBatchModuleOnOptionAreForced=モジュールロット/シリアルがオンの場合、自動在庫減少は強制的に「出荷検証時に実在庫を削減」し、自動増加モードは強制的に「倉庫への手動割当で実在庫を増やす」となり、編集は不可。他のオプションは必要に応じて定義可能。
+ProductDoesNotUseBatchSerial=この製品はロット/シリアル番号を不使用
+ProductLotSetup=モジュールのロット/シリアルの設定
+ShowCurrentStockOfLot=組合せ 製品/ロットの現在在庫を表示
+ShowLogOfMovementIfLot=組合せ 製品/ロットの移動ログを表示
+StockDetailPerBatch=ロットごとの在庫詳細
+SerialNumberAlreadyInUse=シリアル番号%sはすでに製品%sに使用されている
+TooManyQtyForSerialNumber=シリアル番号%sに対して使用できる製品%sは1つだけ。
+BatchLotNumberingModules=ロット管理のバッチ製品の自動生成のオプション
+BatchSerialNumberingModules=シリアル番号で管理されるバッチ製品の自動生成のオプション
+CustomMasks=製品カードにマスクを定義するオプションを追加する
+LotProductTooltip=製品カードにオプションを追加して、専用のバッチ番号マスクを定義する
+SNProductTooltip=製品カードに専用のシリアル番号マスクを定義するオプションを追加する
+QtyToAddAfterBarcodeScan=スキャンされたバーコード/ロット/シリアルごとに追加する数量
+
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 6357a357c87..d09196cc603 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -86,13 +86,13 @@ ErrorProductAlreadyExists=参照%sした製品はすでに存在している。
 ErrorProductBadRefOrLabel=参照またはラベルの間違った値。
 ErrorProductClone=製品またはサービスの複製を作成しようとしたときに問題が発生した。
 ErrorPriceCantBeLowerThanMinPrice=エラー、価格は最低価格より低くすることはできない。
-Suppliers=仕入先s
+Suppliers=仕入先
 SupplierRef=仕入先SKU
 ShowProduct=製品を表示
 ShowService=サービスを表示
-ProductsAndServicesArea=製品とサービスエリア
-ProductsArea=製品分野
-ServicesArea=サービスエリア
+ProductsAndServicesArea=製品とサービス部門
+ProductsArea=製品部門
+ServicesArea=サービス部門
 ListOfStockMovements=在庫変動のリスト
 BuyingPrice=買価
 PriceForEachProduct=特定の価格の製品
@@ -119,7 +119,7 @@ IfZeroItIsNotUsedByVirtualProduct=0の場合、この製品はどのキットで
 KeywordFilter=キーワードフィルタ
 CategoryFilter=カテゴリフィルタ
 ProductToAddSearch=追加するには、製品検索
-NoMatchFound=マッチするものが見つからない
+NoMatchFound=該当なし
 ListOfProductsServices=製品/サービスのリスト
 ProductAssociationList=このキットのコンポーネント(s)である製品/サービスのリスト
 ProductParentList=この製品をコンポーネントとして含むキットのリスト
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT率(この仕入先/製品の場合)
 DiscountQtyMin=この数量の割引。
 NoPriceDefinedForThisSupplier=この仕入先/製品の価格/数量は定義されていない
 NoSupplierPriceDefinedForThisProduct=この製品の仕入先価格/数量は定義されていない
+PredefinedItem=事前定義されたアイテム
 PredefinedProductsToSell=事前定義された製品
 PredefinedServicesToSell=事前定義されたサービス
 PredefinedProductsAndServicesToSell=販売する事前定義された製品/サービス
@@ -313,7 +314,7 @@ LastUpdated=最新のアップデート
 CorrectlyUpdated=正しく更新された
 PropalMergePdfProductActualFile=PDF Azur に追加するために使用するファイルは
 PropalMergePdfProductChooseFile=PDFファイルを選択
-IncludingProductWithTag=タグ付きの製品/サービスを含む
+IncludingProductWithTag=タグ付きの製品/サービスを含める
 DefaultPriceRealPriceMayDependOnCustomer=デフォルト価格、実際の価格は顧客によって異なる場合がある
 WarningSelectOneDocument=少なくとも1つのドキュメントを選択すること
 DefaultUnitToShow=単位
@@ -380,7 +381,7 @@ DoNotRemovePreviousCombinations=以前のバリアントを削除しないこと
 UsePercentageVariations=パーセンテージバリエーションを使用
 PercentageVariation=変動率
 ErrorDeletingGeneratedProducts=既存の製品バリアントを削除しようとしたときにエラーが発生した
-NbOfDifferentValues=異なる値の数
+NbOfDifferentValues=バリエーション登録数
 NbProducts=製品数
 ParentProduct=親製品
 HideChildProducts=バリアント製品を非表示にする
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 1f6b71c6b85..4921c3bdd8d 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -83,12 +83,13 @@ TheReportedProgressIsLessThanTheCalculatedProgressionByX=宣言された実際
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=宣言された実際の進捗状況は、消費の進捗状況よりも%sです。
 ProgressCalculated=消費の進捗状況
 WhichIamLinkedTo=私がリンクしている
-WhichIamLinkedToProject=私はプロジェクトにリンクしています
+WhichIamLinkedToProject=私はプロジェクトにリンクしている
 Time=時間
 TimeConsumed=消費
 ListOfTasks=タスクのリスト
 GoToListOfTimeConsumed=消費時間のリストに移動
 GanttView=ガントビュー
+ListWarehouseAssociatedProject=プロジェクトに関連する倉庫のリスト
 ListProposalsAssociatedProject=プロジェクトに関連する商業提案のリスト
 ListOrdersAssociatedProject=プロジェクトに関連する販売注文のリスト
 ListInvoicesAssociatedProject=プロジェクトに関連する顧客の請求書のリスト
@@ -268,3 +269,7 @@ OneLinePerTask=タスクごとに1行
 OneLinePerPeriod=期間ごとに1行
 RefTaskParent=参照符号親タスク
 ProfitIsCalculatedWith=利益は以下を使用して計算される
+AddPersonToTask=タスクにも追加
+UsageOrganizeEvent=使用法：イベント組織
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=すべてのタスクが完了したら、プロジェクトをクローズとして分類する（100%%の進行状況）
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=注：100%%の進行状況にあるすべてのタスクを持つ既存のプロジェクトは影響を受けない。手動で閉じる必要があります。このオプションは、開いているプロジェクトにのみ影響する。
diff --git a/htdocs/langs/ja_JP/propal.lang b/htdocs/langs/ja_JP/propal.lang
index 16cd30b6bfa..dc8eb2c7609 100644
--- a/htdocs/langs/ja_JP/propal.lang
+++ b/htdocs/langs/ja_JP/propal.lang
@@ -33,7 +33,7 @@ PropalStatusSigned=(要請求)署名
 PropalStatusNotSigned=(クローズ)署名されていない
 PropalStatusBilled=請求
 PropalStatusDraftShort=下書き
-PropalStatusValidatedShort=検証済み(オープン)
+PropalStatusValidatedShort=検証済(オープン)
 PropalStatusClosedShort=閉じた
 PropalStatusSignedShort=署名された
 PropalStatusNotSignedShort=署名されていない
@@ -59,6 +59,7 @@ ConfirmClonePropal=売買契約提案書 <b>%s </b>のクローンを作成し
 ConfirmReOpenProp=売買契約提案書 <b>%s </b>を開いてよいか？
 ProposalsAndProposalsLines=売買契約提案書や行
 ProposalLine=提案書ライン
+ProposalLines=提案ライン
 AvailabilityPeriod=可用性の遅延
 SetAvailability=可用性の遅延を設定
 AfterOrder=ご注文後
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 85fd2d27614..869a0a87d34 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -37,8 +37,8 @@ AllWarehouses=すべての倉庫
 IncludeEmptyDesiredStock=未定義の希望在庫で負の在庫も含める
 IncludeAlsoDraftOrders=ドラフト注文も含める
 Location=場所
-LocationSummary=短い名前の場所
-NumberOfDifferentProducts=異なる製品の数
+LocationSummary=場所の短い名前
+NumberOfDifferentProducts=ユニークな製品の数
 NumberOfProducts=商品の合計数
 LastMovement=最新の動き
 LastMovements=最新の動き
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=倉庫の値
 UserWarehouseAutoCreate=ユーザーの作成時にユーザー倉庫を自動的に作成する
 AllowAddLimitStockByWarehouse=製品ごとの最小在庫と希望在庫の値に加えて、ペアリングごとの最小在庫と希望在庫の値(製品倉庫)も管理する。
 RuleForWarehouse=倉庫のルール
-WarehouseAskWarehouseDuringPropal=販売推進に倉庫を設定する
+WarehouseAskWarehouseOnThirparty=取引先に倉庫を設定する
+WarehouseAskWarehouseDuringPropal=商業提案に倉庫を設定する
 WarehouseAskWarehouseDuringOrder=販売注文に倉庫を設定する
 UserDefaultWarehouse=ユーザーに倉庫を設定する
 MainDefaultWarehouse=デフォルトの倉庫
@@ -97,15 +98,16 @@ RealStockDesc=現物/実在庫は、現在倉庫にある在庫 。
 RealStockWillAutomaticallyWhen=実際の在庫は、このルールに従って変更される(在庫モジュールで定義されている)。
 VirtualStock=仮想在庫
 VirtualStockAtDate=日付での仮想在庫
-VirtualStockAtDateDesc=日付より前に行われる予定のすべての保留中の注文が終了すると、仮想在庫が発生する
+VirtualStockAtDateDesc=仮想在庫、かつての保留中の注文で、 選択した日付より前に処理される予定のものが、完了となる
 VirtualStockDesc=仮想在庫は、すべてのオープン/保留アクション(在庫に影響を与える)が閉じられたときに使用可能な計算された在庫 (発注書の受領、販売注文の出荷、製造注文の作成など)。
+AtDate=日付で
 IdWarehouse=イド倉庫
 DescWareHouse=説明倉庫
 LieuWareHouse=ローカリゼーション倉庫
 WarehousesAndProducts=倉庫と製品
 WarehousesAndProductsBatchDetail=倉庫および製品(ロット/シリアルごとの詳細付き)
 AverageUnitPricePMPShort=加重平均価格
-AverageUnitPricePMPDesc=製品を在庫に入れるためにサプライヤーに支払わなければならなかった入力平均単価。
+AverageUnitPricePMPDesc=1ユニットの製品を在庫に入れるために費やさなければならなかった入力平均単価。
 SellPriceMin=販売単価
 EstimatedStockValueSellShort=販売価値
 EstimatedStockValueSell=販売価値
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=在庫レベルは、製品/サービスを請求書
 StockMustBeEnoughForOrder=在庫レベルは、注文に製品/サービスを追加するのに十分でなければなりません(自動在庫変更のルールに関係なく、注文にラインを追加するときに現在の実際の在庫でチェックが行われる)
 StockMustBeEnoughForShipment= 在庫レベルは、製品/サービスを出荷に追加するのに十分でなければなりません(自動在庫変更のルールに関係なく、出荷にラインを追加するときに現在の実際の在庫でチェックが行われる)
 MovementLabel=動きのラベル
-TypeMovement=動きの種類
+TypeMovement=移動方向
 DateMovement=移動日
 InventoryCode=移動または在庫コード
 IsInPackage=パッケージに含まれている
@@ -183,6 +185,7 @@ inventoryCreatePermission=新規在庫を作成する
 inventoryReadPermission=在庫を見る
 inventoryWritePermission=在庫を更新する
 inventoryValidatePermission=在庫を検証する
+inventoryDeletePermission=在庫目録を削除
 inventoryTitle=在庫
 inventoryListTitle=在庫
 inventoryListEmpty=進行中の在庫はない
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=使用するロットを選択するには
 ForceTo=強制する
 AlwaysShowFullArbo=倉庫リンクのポップアップに倉庫の完全なツリーを表示する(警告：これによりパフォーマンスが大幅に低下する可能性がある)
 StockAtDatePastDesc=過去の特定の日付の在庫(実際の在庫)をここで表示できる
-StockAtDateFutureDesc=将来の特定の日付の在庫(仮想在庫)をここで表示できる
+StockAtDateFutureDesc=将来の特定の日付の在庫（仮想在庫）をここで表示できる
 CurrentStock=現在の在庫
 InventoryRealQtyHelp=値を0に設定して、数量をリセットする。<br>フィールドを空のままにするか、行を削除して、変更しないこと。
-UpdateByScaning=スキャンして更新する
+UpdateByScaning=スキャンして実際の数量を入力
 UpdateByScaningProductBarcode=スキャンによる更新(製品バーコード)
 UpdateByScaningLot=スキャンによる更新(ロット|シリアルバーコード)
 DisableStockChangeOfSubProduct=この移動中は、このキットのすべての副産物の在庫変更を無効にする。
+ImportFromCSV=移動のCSVリストをインポート
+ChooseFileToImport=ファイルをアップロードし、%sアイコンをクリックして、ソースインポートファイルとしてファイルを選択する。
+SelectAStockMovementFileToImport=インポートする在庫品移動ファイルを選択
+InfoTemplateImport=アップロードされたファイルは次の形式が必要 (*は必須フィールド)：<br> 元倉庫* | 先倉庫* | 製品* | 数量* | ロット/シリアル番号<br>CSV文字区切は「<b>%s</b>」であること
+LabelOfInventoryMovemement=在庫目録%s
+ReOpen=再開 
+ConfirmFinish=在庫の閉鎖を確認するか？これにより、在庫を更新するためのすべての在庫移動が生成される。
+ObjectNotFound=%sが見つからない
+MakeMovementsAndClose=移動を生成して閉じる
+AutofillWithExpected=実際の数量を予想数量で埋める
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index 09fd760b180..4a8a74fd271 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=仕入先s
 SuppliersInvoice=仕入先請求書
+SupplierInvoices=仕入先請求書
 ShowSupplierInvoice=仕入先の請求書を表示する
 NewSupplier=新規仕入先
 History=歴史
@@ -15,7 +16,7 @@ SomeSubProductHaveNoPrices=一部のサブ製品には価格が定義されて
 AddSupplierPrice=購入価格を追加
 ChangeSupplierPrice=購入価格の変更
 SupplierPrices=仕入先価格
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=この仕入先リファレンスは、すでに製品に関連付けられています：%s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=この仕入先リファレンスは、すでに製品に関連付けられている：%s
 NoRecordedSuppliers=仕入先は記録されていない
 SupplierPayment=仕入先の支払
 SuppliersArea=仕入先エリア
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index 9b6e686cb03..1730e1d0e0e 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -59,7 +59,7 @@ Notify_TICKET_SENTBYMAIL=メールでチケットメッセージを送信する
 
 # Status
 Read=読む
-Assigned=割り当て済み
+Assigned=割り当て済
 InProgress=進行中
 NeedMoreInformation=情報を待っている
 Answered=答えた
@@ -70,6 +70,8 @@ Deleted=削除
 # Dict
 Type=タイプ
 Severity=重大度
+TicketGroupIsPublic=グループは公開されている
+TicketGroupIsPublicDesc=チケットグループがパブリックの場合、パブリックインターフェイスからチケットを作成するときにフォームに表示される
 
 # Email templates
 MailToSendTicketMessage=チケットメッセージからメールを送信するには
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=パブリックインターフェイスにモジュール
 TicketsShowModuleLogoHelp=このオプションを有効にすると、パブリックインターフェイスのページでロゴモジュールが非表示になる
 TicketsShowCompanyLogo=パブリックインターフェイスに法人のロゴを表示する
 TicketsShowCompanyLogoHelp=このオプションを有効にすると、パブリックインターフェイスのページで主要法人のロゴが非表示になる。
-TicketsEmailAlsoSendToMainAddress=メインのメールアドレスにも通知を送信する
-TicketsEmailAlsoSendToMainAddressHelp=このオプションを有効にすると、「通知メールの送信元」アドレスにメールが送信される(以下の設定を参照)。
+TicketsEmailAlsoSendToMainAddress=また、メインの電子メールアドレスに通知を送信する
+TicketsEmailAlsoSendToMainAddressHelp=このオプションを有効にすると、セットアップ「%s」で定義されたアドレスにも電子メールが送信される（タブ「%s」を参照）。
 TicketsLimitViewAssignedOnly=現在のユーザーに割り当てられたチケットに表示を制限する(外部ユーザーには無効で、常に依存しているサードパーティに制限される)
 TicketsLimitViewAssignedOnlyHelp=現在のユーザーに割り当てられているチケットのみが表示される。チケット管理権を持つユーザーには適用されない。
 TicketsActivatePublicInterface=パブリックインターフェイスをアクティブ化する
@@ -126,10 +128,10 @@ TicketNumberingModules=チケット番号付けモジュール
 TicketsModelModule=チケットのドキュメントテンプレート
 TicketNotifyTiersAtCreation=作成時にサードパーティに通知する
 TicketsDisableCustomerEmail=パブリックインターフェイスからチケットを作成するときは、常にメールを無効にすること
-TicketsPublicNotificationNewMessage=新規メッセージが追加されたときにメール(s)を送信する
+TicketsPublicNotificationNewMessage=新規メッセージ/コメントがチケットに追加されたときにメール(s)を送信する
 TicketsPublicNotificationNewMessageHelp=新規メッセージがパブリックインターフェイスから追加されたときに電子メール(s)を送信する(割り当てられたユーザーまたは通知電子メールを(更新)および/または通知電子メールに)
 TicketPublicNotificationNewMessageDefaultEmail=通知メール(更新)
-TicketPublicNotificationNewMessageDefaultEmailHelp=チケットにユーザーが割り当てられていない場合、またはユーザーに電子メールがない場合は、このアドレスに新規メッセージ通知を電子メールで送信する。
+TicketPublicNotificationNewMessageDefaultEmailHelp=チケットにユーザが割り当てられていない場合、またはユーザに既知の電子メールがない場合は、新規メッセージ通知ごとにこのアドレスに電子メールを送信する。
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=最新の変更されたチケット
 BoxLastModifiedTicketDescription=最新の%s変更チケット
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=最近変更されたチケットはない
+BoxTicketType=タイプ別のオープンチケットの数
+BoxTicketSeverity=重大度別のオープンチケットの数
+BoxNoTicketSeverity=開いているチケットなし
+BoxTicketLastXDays=過去%s日ごとの新規チケットの数
+BoxTicketLastXDayswidget = 過去X日間の日ごとの新規チケットの数
+BoxNoTicketLastXDays=過去%s日間に新規チケットなし
+BoxNumberOfTicketByDay=日ごとの新規チケット数
+BoxNewTicketVSClose=今日の新規チケットと今日の終息チケットの数
+TicketCreatedToday=今日作成されたチケット
+TicketClosedToday=本日終息したチケット
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index a4e6141c8a5..63ad09b98ed 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -72,7 +72,7 @@ ExportDataset_user_1=ユーザとそのプロパティ
 DomainUser=ドメインユーザ%s
 Reactivate=再アクティブ化
 CreateInternalUserDesc=このフォームを使用すると、法人/組織に内部ユーザを作成できる。外部ユーザ(顧客、仕入先など)を作成するには、その取引先の連絡先カードから Dolibarrユーザの作成 ボタンを使用する。
-InternalExternalDesc=<b>内部</b>ユーザは、法人/組織の一部であるユーザ。 <br> <b>外部</b>ユーザは、顧客、仕入先、またはその他(取引先の外部ユーザの作成は、取引先の連絡先レコードから実行できる)。 <br> <br>どちらの場合も、権限はDolibarrの権限を定義し、外部ユーザも内部ユーザとは異なるメニューマネージャーを持つことができる( ホーム - 設定 - 表示 を参照)
+InternalExternalDesc=<b>内部</b>ユーザは、法人/組織の一部であるユーザ、または法人に関連するデータよりも多くのデータを表示する必要がある組織外のパートナーユーザ（許可システムは、彼が見るまたは実行することの可・不可を定義）。 <br> <b>外部</b>ユーザは、自分に関連するデータのみを表示する必要がある顧客、仕入先、またはその他のユーザ（取引先の外部ユーザの作成は、取引先の連絡先レコードから実行できる）。 <br> <br>どちらの場合も、ユーザが必要とする機能に対するアクセス許可を付与する必要がある。
 PermissionInheritedFromAGroup=ユーザのグループのいずれかから継承されたので、許可が付与される。
 Inherited=継承された
 UserWillBe=作成されたユーザは
@@ -81,7 +81,7 @@ UserWillBeExternalUser=作成したユーザ(特に取引先にリンクされ
 IdPhoneCaller=イドの電話発信
 NewUserCreated=ユーザの%s作成
 NewUserPassword=%s用パスワードの変更
-NewPasswordValidated=新規パスワードは検証済みであり、ログインするには今すぐ使用する必要がある。
+NewPasswordValidated=新規パスワードは検証済であり、ログインするには今すぐ使用する必要がある。
 EventUserModified=ユーザの%sは変更
 UserDisabled=ユーザの%sが無効になって
 UserEnabled=ユーザ%sは、アクティブ
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 8be0c5e5529..dc0e8a6e15f 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Apache/NGinx/...で使用 </u><br>専用の仮想ホスト
 ExampleToUseInApacheVirtualHostConfig=Apache仮想ホストのセットアップで使用する例：
 YouCanAlsoTestWithPHPS=<u>PHP組み込みサーバーでの使用</u><br>開発環境では、 PHP組み込みWebサーバ (PHP 5.5 が必要) でサイトをテストするのが都合がいいなら、次のコマンドを動かす<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP= <u>別のDolibarrホスティングプロバイダーでWebサイトを実行する</u><br>インターネット上でApacheやNGinxなどのWebサーバーを利用できない場合は、完全なDolibarrホスティングプロバイダーが提供する別のDolibarrインスタンスにWebサイトをエクスポートおよびインポートできる。ウェブサイトモジュールとの統合。いくつかのDolibarrホスティングプロバイダーのリストは、<a href="https://saas.dolibarr.org" target="_blank"> https：//saas.dolibarr.org</a>にある。
-CheckVirtualHostPerms=また、仮想ホストが<br> <strong> %s</strong>へのファイルに対する権限<strong>%s</strong>を持っていることを確認すること。
+CheckVirtualHostPerms=また、仮想ホストユーザー（www-dataなど）が、 <strong> %s </strong> 権限があり、ファイルに対して<br><strong>%s</strong>へが可能であることをも確認する。
 ReadPerm=読む
 WritePerm=書く
 TestDeployOnWeb=Webでのテスト/デプロイ
 PreviewSiteServedByWebServer=<u>新規タブで %s をプレビュー。</u><br><br>  %s は、外部Webサーバ (Apache, Nginx, IIS など) から提供される。 以下のディレクトリを指定するには、当該サーバをインストールして設定する必要あり:<br><strong>%s</strong><br>URL は外部サーバ:<br><strong>%s</strong> による
-PreviewSiteServedByDolibarr= <u>新規タブで%sをプレビューする。 </u> <br> <br> %sはDolibarrサーバーによって提供されるため、追加のWebサーバー(Apache、Nginx、IISなど)をインストールする必要はない。 <br>不便なのは、ページのURLがユーザーフレンドリーではなく、Dolibarrのパスで始まること。 URL <br> Dolibarrによって提供：<br> <strong> %s </strong> <br> <br>ディレクトリ<br> <strong> %s </strong> <br>上のポイントは、この仮想サーバーの名前を入力するWebサーバー上の仮想ホストを作成し、このウェブサイトを提供するために、独自の外部Webサーバーを使用するには他のプレビューボタンをクリックする。
+PreviewSiteServedByDolibarr= <u>新しいタブで%sをプレビューする。 </u> <br> <br> %sはDolibarrサーバーによって提供されるため、追加のWebサーバー（Apache、Nginx、IISなど）をインストールする必要はない。 <br>不便なのは、ページのURLがユーザーフレンドリーではなく、Dolibarrのパスで始まることです。 URL <br> Dolibarrによって提供：<br> <strong> %s </strong> <br> <br>ディレクトリ<br> <strong> %s </strong> <br>上のポイントは、この仮想サーバーの名前を入力するWebサーバー上の仮想ホストを作成し、このウェブサイトを提供するために、独自の外部Webサーバーを使用するにはこのWebサイトのプロパティで、[Webでのテスト/展開]リンクをクリックする。
 VirtualHostUrlNotDefined=外部Webサーバーによって提供される仮想ホストのURLが定義されていない
 NoPageYet=まだページはない
 YouCanCreatePageOrImportTemplate=新規ページを作成するか、完全なWebサイトテンプレートをインポートできる
@@ -88,7 +88,7 @@ SorryWebsiteIsCurrentlyOffLine=申し訳ないが、このウェブサイトは
 WEBSITE_USE_WEBSITE_ACCOUNTS=Webサイトのアカウントテーブルを有効にする
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=テーブルを有効にして、各Webサイト/サードパーティのWebサイトアカウント(ログイン/パス)を保存する
 YouMustDefineTheHomePage=最初にデフォルトのホームページを定義する必要がある
-OnlyEditionOfSourceForGrabbedContentFuture=警告：外部WebページをインポートしてWebページを作成することは、経験豊富なユーザーのために予約されています。ソースページの複雑さによっては、インポートの結果が元のページと異なる場合がある。また、ソースページが一般的なCSSスタイルまたは競合するJavaScriptを使用している場合、このページで作業するときにWebサイトエディターの外観や機能が損なわれる可能性がある。この方法はページを作成するためのより迅速な方法ですが、最初から、または提案されたページテンプレートから新規ページを作成することをお勧めする。 <br>取得した外部ページで使用すると、インラインエディタが正しく機能しない場合があることにも注意すること。
+OnlyEditionOfSourceForGrabbedContentFuture=警告：外部WebページをインポートしてWebページを作成することは、経験豊富なユーザーのために予約されている。ソースページの複雑さによっては、インポートの結果が元のページと異なる場合がある。また、ソースページが一般的なCSSスタイルまたは競合するJavaScriptを使用している場合、このページで作業するときにWebサイトエディターの外観や機能が損なわれる可能性がある。この方法はページを作成するためのより迅速な方法ですが、最初から、または提案されたページテンプレートから新規ページを作成することをお勧めする。 <br>取得した外部ページで使用すると、インラインエディタが正しく機能しない場合があることにも注意すること。
 OnlyEditionOfSourceForGrabbedContent=コンテンツが外部サイトから取得された場合は、HTMLソースのエディションのみが可能。
 GrabImagesInto=cssとページにある画像も取得する。
 ImagesShouldBeSavedInto=画像はディレクトリに保存する必要がある
@@ -129,7 +129,7 @@ MainLanguage=主な言語
 OtherLanguages=他の言語
 UseManifest=マニフェスト.jsonファイルを提供する
 PublicAuthorAlias=公開著者エイリアス
-AvailableLanguagesAreDefinedIntoWebsiteProperties=利用可能な言語はウェブサイトのプロパティに定義されています
+AvailableLanguagesAreDefinedIntoWebsiteProperties=利用可能な言語はウェブサイトのプロパティに定義されている
 ReplacementDoneInXPages=%sページまたはコンテナで行われた交換
 RSSFeed=RSSフィード
 RSSFeedDesc=このURLを使用して、タイプ「blogpost」の最新記事のRSSフィードを取得できる。
@@ -137,3 +137,11 @@ PagesRegenerated=%sページ(s)/コンテナ(s)が再生成された
 RegenerateWebsiteContent=Webサイトのキャッシュファイルを再生成する
 AllowedInFrames=フレームで許可
 DefineListOfAltLanguagesInWebsiteProperties=使用可能なすべての言語のリストをWebサイトのプロパティに定義する。
+GenerateSitemaps=ウェブサイトサイトマップファイルを生成する
+ConfirmGenerateSitemaps=確定すると、既存のサイトマップファイルが消去される...
+ConfirmSitemapsCreation=サイトマップの生成を確認する
+SitemapGenerated=生成されたサイトマップ
+ImportFavicon=ファビコン
+ErrorFaviconType=ファビコンはpngを必要とする
+ErrorFaviconSize=ファビコンのサイズは32x32を必要とする
+FaviconTooltip=32x32のpngを必要とする画像をアップロードする
diff --git a/htdocs/langs/ja_JP/zapier.lang b/htdocs/langs/ja_JP/zapier.lang
index bbad7895588..c0c8a9a383c 100644
--- a/htdocs/langs/ja_JP/zapier.lang
+++ b/htdocs/langs/ja_JP/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
-ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
-ZapierDescription=Interface with Zapier
+ModuleZapierForDolibarrName = Dolibarr対応 Zapier
+ModuleZapierForDolibarrDesc = Dolibarrモジュール対応 Zapier
+ZapierForDolibarrSetup=Dolibarr対応 Zapier を設定
+ZapierDescription=Zapier とのインタフェース
+ZapierAbout=モジュールZapierについて
+ZapierSetupPage=Zapierを使用するためにDolibarr側でセットアップする必要はない。ただし、DolibarrでZapierを使用できるようにするには、zapierでパッケージを生成して公開する必要がある。 <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">このwikiページ</a>のドキュメントを参照すること。
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index f9a6468d94a..8f4508ada53 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/ka_GE/boxes.lang
+++ b/htdocs/langs/ka_GE/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/ka_GE/categories.lang
+++ b/htdocs/langs/ka_GE/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 8dc815b522e..154400c6536 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/ka_GE/ecm.lang b/htdocs/langs/ka_GE/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/ka_GE/ecm.lang
+++ b/htdocs/langs/ka_GE/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/ka_GE/externalsite.lang b/htdocs/langs/ka_GE/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/ka_GE/externalsite.lang
+++ b/htdocs/langs/ka_GE/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index f8ba6f4073c..dc2a83f2015 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/ka_GE/margins.lang b/htdocs/langs/ka_GE/margins.lang
index b9d52dcfdc6..ad5406409b4 100644
--- a/htdocs/langs/ka_GE/margins.lang
+++ b/htdocs/langs/ka_GE/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/ka_GE/modulebuilder.lang b/htdocs/langs/ka_GE/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/ka_GE/modulebuilder.lang
+++ b/htdocs/langs/ka_GE/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang
index 503955cf5f0..87d196eb22f 100644
--- a/htdocs/langs/ka_GE/orders.lang
+++ b/htdocs/langs/ka_GE/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Phone
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/ka_GE/productbatch.lang
+++ b/htdocs/langs/ka_GE/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/ka_GE/propal.lang b/htdocs/langs/ka_GE/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/ka_GE/propal.lang
+++ b/htdocs/langs/ka_GE/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/ka_GE/suppliers.lang
+++ b/htdocs/langs/ka_GE/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/ka_GE/ticket.lang b/htdocs/langs/ka_GE/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/ka_GE/ticket.lang
+++ b/htdocs/langs/ka_GE/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/ka_GE/users.lang b/htdocs/langs/ka_GE/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/ka_GE/users.lang
+++ b/htdocs/langs/ka_GE/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/ka_GE/zapier.lang b/htdocs/langs/ka_GE/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/ka_GE/zapier.lang
+++ b/htdocs/langs/ka_GE/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/km_KH/accountancy.lang
+++ b/htdocs/langs/km_KH/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index f9a6468d94a..8f4508ada53 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/km_KH/banks.lang
+++ b/htdocs/langs/km_KH/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/km_KH/bills.lang b/htdocs/langs/km_KH/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/km_KH/bills.lang
+++ b/htdocs/langs/km_KH/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/km_KH/boxes.lang b/htdocs/langs/km_KH/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/km_KH/boxes.lang
+++ b/htdocs/langs/km_KH/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/km_KH/categories.lang b/htdocs/langs/km_KH/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/km_KH/categories.lang
+++ b/htdocs/langs/km_KH/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang
index 8dc815b522e..154400c6536 100644
--- a/htdocs/langs/km_KH/companies.lang
+++ b/htdocs/langs/km_KH/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/km_KH/compta.lang
+++ b/htdocs/langs/km_KH/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/km_KH/ecm.lang b/htdocs/langs/km_KH/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/km_KH/ecm.lang
+++ b/htdocs/langs/km_KH/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/km_KH/externalsite.lang b/htdocs/langs/km_KH/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/km_KH/externalsite.lang
+++ b/htdocs/langs/km_KH/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index af9d6ca0889..3a8d17ec853 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/km_KH/margins.lang b/htdocs/langs/km_KH/margins.lang
index 76ea8ad5c4d..ad5406409b4 100644
--- a/htdocs/langs/km_KH/margins.lang
+++ b/htdocs/langs/km_KH/margins.lang
@@ -22,7 +22,7 @@ ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
diff --git a/htdocs/langs/km_KH/members.lang b/htdocs/langs/km_KH/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/km_KH/members.lang
+++ b/htdocs/langs/km_KH/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/km_KH/modulebuilder.lang b/htdocs/langs/km_KH/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/km_KH/modulebuilder.lang
+++ b/htdocs/langs/km_KH/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/km_KH/orders.lang b/htdocs/langs/km_KH/orders.lang
index ad91e1eef63..87d196eb22f 100644
--- a/htdocs/langs/km_KH/orders.lang
+++ b/htdocs/langs/km_KH/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
diff --git a/htdocs/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/km_KH/other.lang
+++ b/htdocs/langs/km_KH/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/km_KH/productbatch.lang b/htdocs/langs/km_KH/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/km_KH/productbatch.lang
+++ b/htdocs/langs/km_KH/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/km_KH/products.lang
+++ b/htdocs/langs/km_KH/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/km_KH/projects.lang
+++ b/htdocs/langs/km_KH/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/km_KH/propal.lang b/htdocs/langs/km_KH/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/km_KH/propal.lang
+++ b/htdocs/langs/km_KH/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/km_KH/stocks.lang
+++ b/htdocs/langs/km_KH/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/km_KH/suppliers.lang b/htdocs/langs/km_KH/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/km_KH/suppliers.lang
+++ b/htdocs/langs/km_KH/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/km_KH/ticket.lang b/htdocs/langs/km_KH/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/km_KH/ticket.lang
+++ b/htdocs/langs/km_KH/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/km_KH/users.lang b/htdocs/langs/km_KH/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/km_KH/users.lang
+++ b/htdocs/langs/km_KH/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/km_KH/website.lang b/htdocs/langs/km_KH/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/km_KH/website.lang
+++ b/htdocs/langs/km_KH/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/km_KH/zapier.lang b/htdocs/langs/km_KH/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/km_KH/zapier.lang
+++ b/htdocs/langs/km_KH/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 5322b65bb8f..f0d117c5ea5 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index c3c0461c34d..10b886178a1 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index 0e7712812aa..a1be5f9460b 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/kn_IN/boxes.lang
+++ b/htdocs/langs/kn_IN/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/kn_IN/categories.lang
+++ b/htdocs/langs/kn_IN/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 63f3c11bf02..02ffb5f7a43 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -43,9 +43,10 @@ Individual=ಖಾಸಗಿ ವ್ಯಕ್ತಿ
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=ಪೋಷಕ ಸಂಸ್ಥೆ
 Subsidiaries=ಅಂಗಸಂಸ್ಥೆಗಳು
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=ದರದ ವರದಿ
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=ಸೌಜನ್ಯದ ಕೋಡ್
 RegisteredOffice=ನೋಂದಾಯಿತ ಕಚೇರಿ
 Lastname=ಕೊನೆಯ ಹೆಸರು
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=ನೋಂದಣಿ ಸಂಖ್ಯೆ
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=ಪ್ರಸ್ತುತ ಬಾಕಿ ಉಳಿದಿರ
 OutstandingBill=ಗರಿಷ್ಟ ಬಾಕಿ ಉಳಿದಿರುವ ಬಿಲ್ ಮೊತ್ತ
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=ಕೋಡ್ ಉಚಿತ. ಈ ಕೋಡ್ ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಮಾರ್ಪಡಿಸಬಹುದಾಗಿದೆ.
 ManagingDirectors=ಮ್ಯಾನೇಜರ್ (ಗಳು) ಹೆಸರು (ಸಿಇಒ, ನಿರ್ದೇಶಕ, ಅಧ್ಯಕ್ಷ ...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/kn_IN/ecm.lang b/htdocs/langs/kn_IN/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/kn_IN/ecm.lang
+++ b/htdocs/langs/kn_IN/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/kn_IN/externalsite.lang b/htdocs/langs/kn_IN/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/kn_IN/externalsite.lang
+++ b/htdocs/langs/kn_IN/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 28a3acd9245..c486eab476a 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/kn_IN/margins.lang b/htdocs/langs/kn_IN/margins.lang
index b9d52dcfdc6..ad5406409b4 100644
--- a/htdocs/langs/kn_IN/margins.lang
+++ b/htdocs/langs/kn_IN/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/kn_IN/modulebuilder.lang b/htdocs/langs/kn_IN/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/kn_IN/modulebuilder.lang
+++ b/htdocs/langs/kn_IN/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang
index 744ee716964..8ae27a2c870 100644
--- a/htdocs/langs/kn_IN/orders.lang
+++ b/htdocs/langs/kn_IN/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=ದೂರವಾಣಿ
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 4ba716c6a71..65ae9f5a554 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/kn_IN/productbatch.lang b/htdocs/langs/kn_IN/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/kn_IN/productbatch.lang
+++ b/htdocs/langs/kn_IN/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index b4ed2eaee15..8981b3b6729 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/kn_IN/propal.lang b/htdocs/langs/kn_IN/propal.lang
index 8254c0e8f24..2a78427687e 100644
--- a/htdocs/langs/kn_IN/propal.lang
+++ b/htdocs/langs/kn_IN/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/kn_IN/suppliers.lang
+++ b/htdocs/langs/kn_IN/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/kn_IN/ticket.lang b/htdocs/langs/kn_IN/ticket.lang
index 70bcd0c2f87..852cabefb2b 100644
--- a/htdocs/langs/kn_IN/ticket.lang
+++ b/htdocs/langs/kn_IN/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang
index 9a79e68dbc5..56b77126d93 100644
--- a/htdocs/langs/kn_IN/users.lang
+++ b/htdocs/langs/kn_IN/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/kn_IN/zapier.lang b/htdocs/langs/kn_IN/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/kn_IN/zapier.lang
+++ b/htdocs/langs/kn_IN/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index b0285ae6cf3..55af80d01e8 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=묶음 처리된 청구서 항목
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=회계계좌로 연결
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=묶음 처리
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 6962ec7c3b3..0a4eaa689a5 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Syslog 모듈(데이타 손실 위험 없음) <b>%s</b>에 의해 정읜된 돌리바 로그파일
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=지금 제거하기
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index b62d0312322..e50fd22f1f0 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index d08cd322216..9c4c8589dfe 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -54,9 +54,10 @@ InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
 CustomersInvoices=고객 송장
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
index 9c95a128986..d26b6fe49f9 100644
--- a/htdocs/langs/ko_KR/boxes.lang
+++ b/htdocs/langs/ko_KR/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=최근 작업
 BoxLastContracts=최근 계약
 BoxLastContacts=최근 연락처 / 주소
 BoxLastMembers=최근 회원
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=최근 개입
 BoxCurrentAccounts=미결제 잔액
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=최신 %s 뉴스 %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index e10c2c97c83..7c956eef157 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index ae5af71d69f..4ad4fe599ff 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -43,9 +43,10 @@ Individual=개인
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=모회사
 Subsidiaries=자회사
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=비율별 보고서
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=성격 코드
 RegisteredOffice=등록 된 사무실
 Lastname=성씨
@@ -172,14 +173,20 @@ ProfId1ES=프로필 Id 1 (CIF / NIF)
 ProfId2ES=프로필 ID2 (사회보장번호)
 ProfId3ES=프로필 Id 3 (CNAE)
 ProfId4ES=프로필 Id 4 (대학생 번호)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=프로필 ID 1 (SIREN)
 ProfId2FR=프로필 Id 2 (SIRET)
 ProfId3FR=프로필 Id 3 (NAF, 구 APE)
 ProfId4FR=프로필 Id 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=등록 번호
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=프로필 Id 1 (룩셈부르크)
 ProfId2LU=프로필 Id 2 (사업 허가)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=프로필 Id 1 (NIPC)
 ProfId2PT=프로필 Id 2 (사회 보장 번호)
 ProfId3PT=프로필 Id 3 (상업 기록 번호)
 ProfId4PT=프로필 Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=프로필 Id 1 (OGRN)
 ProfId2RU=프로필 Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=현재 미결제 금액
 OutstandingBill=미결 한도
 OutstandingBillReached=미결 한도 금액 도달
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=코드는 무료입니다. 이 코드는 언제든지 수정할 수 있습니다.
 ManagingDirectors=관리자 이름 (CEO, 이사, 사장 ...)
 MergeOriginThirdparty=중복 된 협력업체 (삭제하려는 협력업체)
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 199ba3514ef..320af6ec40b 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=주문 링크
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/ko_KR/ecm.lang b/htdocs/langs/ko_KR/ecm.lang
index b2d850ab449..2773e8f3a74 100644
--- a/htdocs/langs/ko_KR/ecm.lang
+++ b/htdocs/langs/ko_KR/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/ko_KR/externalsite.lang b/htdocs/langs/ko_KR/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/ko_KR/externalsite.lang
+++ b/htdocs/langs/ko_KR/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 82a305bbc21..82fe0c19c0b 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=수정날짜
 IPModification=Modification IP
 DateLastModification=최종 수정일
 DateValidation=검사날짜
+DateSigning=Signing date
 DateClosing=마감날짜
 DateDue=만기일자
 DateValue=계약날짜
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=단가
 PriceU=U.P.
 PriceUHT=U.P. (정액)
-PriceUHTCurrency=U.P (통화)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (세금 포함)
 Amount=금액
 AmountInvoice=송장 금액
@@ -389,6 +390,8 @@ AmountTotal=합계금액
 AmountAverage=평균금액
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=백분율
 Total=합계
 SubTotal=소계
@@ -724,7 +727,7 @@ MenuMembers=회원
 MenuAgendaGoogle=구글 의제
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr한계 (메뉴 홈-설정-보안): %s Kb, PHP 한계: %s Kb
-NoFileFound=이 디렉토리에 저장된 문서가 없습니다.
+NoFileFound=No documents uploaded
 CurrentUserLanguage=현재 언어
 CurrentTheme=현재 테마
 CurrentMenuManager=현재 메뉴 관리자
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString='%s'문자열을 제거하십시오.
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=다운로드
 DownloadDocument=Download document
 ActualizeCurrency=환율 업데이트
@@ -1013,6 +1018,7 @@ SearchIntoContacts=연락처
 SearchIntoMembers=구성원
 SearchIntoUsers=사용자
 SearchIntoProductsOrServices=제품 또는 서비스
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=프로젝트
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=할 일
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/ko_KR/margins.lang b/htdocs/langs/ko_KR/margins.lang
index b9d52dcfdc6..ad5406409b4 100644
--- a/htdocs/langs/ko_KR/margins.lang
+++ b/htdocs/langs/ko_KR/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index 8aad13d15da..a3729c68600 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=확인 함
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/ko_KR/modulebuilder.lang b/htdocs/langs/ko_KR/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/ko_KR/modulebuilder.lang
+++ b/htdocs/langs/ko_KR/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
index 9cf03886f08..15ea1253bc4 100644
--- a/htdocs/langs/ko_KR/orders.lang
+++ b/htdocs/langs/ko_KR/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=이메일
 OrderByWWW=Online
 OrderByPhone=전화
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index 0b663c08491..bd2b6719256 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang
index 7f2279f01bf..27e4cbad761 100644
--- a/htdocs/langs/ko_KR/productbatch.lang
+++ b/htdocs/langs/ko_KR/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=생산일련번호 사용
-ProductStatusOnBatch=예(생산일련번호필요)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=아니오(생산일련번호사용안함)
-ProductStatusOnBatchShort=예
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=아니
 Batch=생산일련번호
 atleast1batchfield=소비기한 날짜 또는 판매기한 날짜 또는 일련번호
@@ -22,3 +24,12 @@ ProductLotSetup=일련번호 모듈 설정
 ShowCurrentStockOfLot=묶음제품 또는 일련번호별제품 현 재고보기
 ShowLogOfMovementIfLot=묶음제품 또는 일련번호별제품 이동기록 보기
 StockDetailPerBatch=일련번호별 재고내역
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 390f2b13e95..556f1558ac9 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index d4b5dc5134b..15df7bd0c3a 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/ko_KR/propal.lang b/htdocs/langs/ko_KR/propal.lang
index 26a86464f91..2008257bfca 100644
--- a/htdocs/langs/ko_KR/propal.lang
+++ b/htdocs/langs/ko_KR/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -89,3 +89,4 @@ IdProposal=Proposal ID
 IdProduct=Product ID
 PrParentLine=Proposal Parent Line
 LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 3e6cd88b1b2..3cbf0afc509 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=위치
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
index 7b04cc321ad..40fa1361caf 100644
--- a/htdocs/langs/ko_KR/suppliers.lang
+++ b/htdocs/langs/ko_KR/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=기록보기
diff --git a/htdocs/langs/ko_KR/ticket.lang b/htdocs/langs/ko_KR/ticket.lang
index dbcd6edb987..211a1bd4526 100644
--- a/htdocs/langs/ko_KR/ticket.lang
+++ b/htdocs/langs/ko_KR/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=유형
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index ed097818f62..8b54361b072 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index 1136b43873a..59cc6587e4c 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/ko_KR/zapier.lang b/htdocs/langs/ko_KR/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/ko_KR/zapier.lang
+++ b/htdocs/langs/ko_KR/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index cfd6f41fbc9..9298e3177e4 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index fe18cd7ac67..83482cae80f 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index 4259ed5cc2d..65fcec00a0c 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/lo_LA/boxes.lang
+++ b/htdocs/langs/lo_LA/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/lo_LA/categories.lang
+++ b/htdocs/langs/lo_LA/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index a4225bc1cfb..99a4a7485f1 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index a84839cd09a..efb8593aa8f 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/lo_LA/ecm.lang b/htdocs/langs/lo_LA/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/lo_LA/ecm.lang
+++ b/htdocs/langs/lo_LA/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/lo_LA/externalsite.lang b/htdocs/langs/lo_LA/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/lo_LA/externalsite.lang
+++ b/htdocs/langs/lo_LA/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index de3709bef9f..454f69f07e5 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/lo_LA/margins.lang b/htdocs/langs/lo_LA/margins.lang
index b9d52dcfdc6..ad5406409b4 100644
--- a/htdocs/langs/lo_LA/margins.lang
+++ b/htdocs/langs/lo_LA/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index 9bcf361cd42..6786011e692 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang
index 503955cf5f0..87d196eb22f 100644
--- a/htdocs/langs/lo_LA/orders.lang
+++ b/htdocs/langs/lo_LA/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Phone
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 9bc54506b86..9b6ee4c9d19 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/lo_LA/productbatch.lang b/htdocs/langs/lo_LA/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/lo_LA/productbatch.lang
+++ b/htdocs/langs/lo_LA/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 0398a6604ac..610f1575d84 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 3dfd70c6444..1926aed46c7 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/lo_LA/propal.lang b/htdocs/langs/lo_LA/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/lo_LA/propal.lang
+++ b/htdocs/langs/lo_LA/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 6397b23e96b..85e2246d09a 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/lo_LA/suppliers.lang
+++ b/htdocs/langs/lo_LA/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/lo_LA/ticket.lang b/htdocs/langs/lo_LA/ticket.lang
index b2bea2dcbcd..f8eede2eb93 100644
--- a/htdocs/langs/lo_LA/ticket.lang
+++ b/htdocs/langs/lo_LA/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index cb9c22e9c30..519378d65cf 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=ລຶບຈາກກຸ່ມ
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/lo_LA/zapier.lang b/htdocs/langs/lo_LA/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/lo_LA/zapier.lang
+++ b/htdocs/langs/lo_LA/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 30578cf5a3c..c36e8e20b73 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Priskirtos sąskaitų faktūrų eilutės
 ExpenseReportLines=Išlaidų ataskaitų eilutės, kurias reikia priskirti
 ExpenseReportLinesDone=Priskirtos išlaidų ataskaitų eilutės
 IntoAccount=Priskirta eilutė su apskaitos sąskaita
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Priskirti
@@ -209,7 +209,7 @@ Codejournal=Žurnalas
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Išlaidų ataskaitos žurnalas
 InventoryJournal=Inventoriaus žurnalas
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 72b82a109b5..42dfa614740 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Pašalinti prisijungimų užraktą
 YourSession=Jūsų sesija
 Sessions=Users Sessions
 WebUserGroup=Tinklo serverio naudotojas/grupė
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Pastaba: Patvirtinimas yra efektyvus tik, kai modulis <b>%s</b>
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Apsaugos paruošimas
+PHPSetup=PHP setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Klaida, šis modulis reikalauja PHP versijos %s ar aukštesnės
 ErrorModuleRequireDolibarrVersion=Klaida, šiam moduliui reikalinga Dolibarr versija %s arba aukštesnė
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Išvalyti
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Išvalyti dabar
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Aktyvavimą įjungti
 ActiveOn=Aktyvavimas įjungtas
+ActivatableOn=Activatable on
 SourceFile=Pirminis išeities failas
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Galimas tik tuomet, kai JavaScript neišjungtas
 Required=Reikalingas
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Visi kiti simboliai maskuotėje išliks nepakitę.<br>Tarpai neleidžiami.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Trečios šalies pavyzdys sukurtas 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Produkto pavyzdys sukurtas 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Redaktoriai
 Module49Desc=Redaktoriaus valdymas
 Module50Name=Produktai
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind konvertavimo galimybes
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=Žmogiškųjų išteklių valdymas (HRM)
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi įmonė
 Module5000Desc=Jums leidžiama valdyti kelias įmones
-Module6000Name=Darbo eiga
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Sukurti/keisti vidaus/išorės vartotojus ir leidimus
 Permission254=Sukurti/keisti tik išorės vartotojus
 Permission255=Keisti kitų vartotojų slaptažodžius
 Permission256=Ištrinti ar išjungti kitus vartotojus
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Skaityti CA
 Permission272=Skaityti sąskaitas faktūras
 Permission273=Išrašyti sąskaitas faktūras
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Saugumo audito įvykiai
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Auditas
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=Jūs turite paleisti šią komandą iš komandinės eilutės po vartotojo <b>%s</b> prisijungimo prie apvalkalo arba turite pridėti -W opciją komandinės eilutės pabaigoje slaptažodžio <b>%s</b> pateikimui.
 YourPHPDoesNotHaveSSLSupport=SSL funkcijos negalimos Jūsų PHP
 DownloadMoreSkins=Parsisiųsti daugiau grafinių vaizdų (skins)
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Dalinis vertimas
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Papildomi požymiai
 ExtraFieldsLines=Papildomi atributai (linijos)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Prisijungti (Unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Paieškos filtras
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Prisijungti (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Pilnas pavadinimas/vardas
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Pardavimo sąskaita. Kodas
 AccountancyCodeBuy=Pirkimo sąskaita. Kodas
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Įvykių ir operacijų modulio nustatymas
 PasswordTogetVCalExport=Eksporto sąsajos leidimo mygtukas
+SecurityKey = Security Key
 PastDelayVCalExport=Neeksportuoti įvykių senesnių nei
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 2b529a086e7..2e254c32eba 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 62fb5167f97..598541d0fa3 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -52,11 +52,12 @@ Invoices=Sąskaitos-faktūros
 InvoiceLine=Sąskaitos-faktūros linija
 InvoiceCustomer=Kliento sąskaita-faktūra
 CustomerInvoice=Kliento sąskaita-faktūra
-CustomersInvoices=Klientų sąskaitos-faktūros
+CustomersInvoices=Klientų sąskaitos faktūros
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=tiekėjų sąskaitos-faktūros
+SupplierBills=Vendor invoices
 Payment=Mokėjimas
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Jau atlikti mokėjimai
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Mokėjimo taisyklė
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debetinė / Kreditinė kortelė
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Vėliausio generavimo data
 DateLastGenerationShort=Data vėliausio gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Automatiškai patvirtinti sąskaitas faktūras
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Kintamas dydis (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Banko pervedimas
 PaymentTypeShortVIR=Banko pervedimas
@@ -494,12 +498,16 @@ Cash=Grynieji pinigai
 Reported=Uždelstas
 DisabledBecausePayments=Neįmanoma nuo tada, kai atsirado kai kurie mokėjimai
 CantRemovePaymentWithOneInvoicePaid=Negalima pašalinti mokėjimo, nuo tada kai čia yra bent viena sąskaita-faktūra priskirta apmokėtoms
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Laukiamas mokėjimas
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Sumokėta šiuo mokėjimu
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Mokėti
 ToMakePaymentBack=Grąžinti
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Grąžinimo numeris formatu %syymm-nnnn standartinėms sąskaitoms-faktūroms ir %syymm-nnnn kreditinėms sąskaitoms, kur yy yra metai, mm mėnuo ir nnnn yra seka be pertrūkių ir be grįžimo į 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
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Sąskaita, prasidedanti $syymm, jau egzistuoja ir yra nesuderinama su šiuo sekos modeliu. Pašalinkite ją arba pakeiskite jį, kad aktyvuoti šį modulį.
-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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
index 897ee6b984c..32ff1f94d93 100644
--- a/htdocs/langs/lt_LT/boxes.lang
+++ b/htdocs/langs/lt_LT/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Atidarytų sąskaitų balansas
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Apskaita
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index 345dd6c3781..0b13dfb377a 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 5094a5a14dc..b562188197b 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -43,9 +43,10 @@ Individual=Privatus asmuo
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Motininė įmonė
 Subsidiaries=Dukterinės įmonės
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Ataskaita pagal tarifą
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Mandagumo kodeksas
 RegisteredOffice=Buveinės registracijos adresas
 Lastname=Pavardė
@@ -172,14 +173,20 @@ ProfId1ES=Prof ID 1 (CIF/NIF)
 ProfId2ES=Prof ID 2 (Socialinio draudimo numeris)
 ProfId3ES=Prof ID 3 (CNAE)
 ProfId4ES=Prof ID 4 (Collegiate skaičius)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof ID 1 (SIRENOS)
 ProfId2FR=Prof ID 2 (SIRET)
 ProfId3FR=Prof ID 3 (NBS, senas APE)
 ProfId4FR=Prof ID 4 (RBS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registracijos numeris
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=ID Prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=ID Prof. 2 (Verslo leidimas)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof ID 1 (NIPC)
 ProfId2PT=Prof ID 2 (Socialinio draudimo numeris)
 ProfId3PT=Prof ID 3 (Komercinio Registro numeris)
 ProfId4PT=Prof ID 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (OGRN)
 ProfId2RU=Prof ID 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Dabartinė neapmokėta sąskaita-faktūra
 OutstandingBill=Neapmokėtų sąskaitų-faktūrų maksimumas
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Kodas yra nemokamas. Šis kodas gali būti modifikuotas bet kada.
 ManagingDirectors=Vadovo (-ų) pareigos (Vykdantysis direktorius (CEO), direktorius, prezidentas ...)
 MergeOriginThirdparty=Dubliuoti trečiąją šalį (trečiąją šalį, kurią norite ištrinti)
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index a0c6fe59908..04c4a15acc0 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=Gautas PVM
 StatusToPay=Mokėti
 SpecialExpensesArea=Visų specialių atsiskaitymų sritis
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Kliento sąskaitos-faktūros mokėjimas
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Socialinio / fiskalinio mokesčio mokėjimas
 PaymentVat=PVM mokėjimas
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Mokėjimų sąrašas
 ListOfCustomerPayments=Kliento mokėjimų sąrašas
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF mokėjimas
 LT2PaymentsES=IRPF mokėjimai
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Čekio gavimo data
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režimas <b>%sPVM nuo įsipareigojimų apskaitos%s</b>.
 CalcModeVATEngagement=Režimas <b>%sPVM nuo pajamų-išlaidų%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Ataskaita pagal Kliento gautą ir sumokėtą PVM
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg potipis
 InvoiceLinesToDispatch=Sąskaitos-faktūros eilutės išsiuntimui
 ByProductsAndServices=By product and service
 RefExt=Išorinė nuoroda
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Metodas 1
 Mode2=Metodas 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/lt_LT/ecm.lang b/htdocs/langs/lt_LT/ecm.lang
index 9a3de9c22f6..6fe852b4340 100644
--- a/htdocs/langs/lt_LT/ecm.lang
+++ b/htdocs/langs/lt_LT/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index ee2fb18e9e6..81019d9a6b0 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Aplankas <b>%s</b> nerastas (blogas kelias, neteisingos teisės
 ErrorFunctionNotAvailableInPHP=Funkcija <b>%s</b> yra reikalinga šiai savybei, bet nėra galima šioje PHP versijoje/nustatymuose.
 ErrorDirAlreadyExists=Aplankas su tokiu pavadinimu jau egzistuoja.
 ErrorFileAlreadyExists=Failas tokiu pavadinimu jau egzistuoja.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Failas pilnai negautas serveryje.
 ErrorNoTmpDir=Laikinas aplankas %s neegzistuoja.
 ErrorUploadBlockedByAddon=Įkėlimas užblokuotas PHP/Apache įskiepio.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/lt_LT/externalsite.lang b/htdocs/langs/lt_LT/externalsite.lang
index 1196c8466c0..863500a456c 100644
--- a/htdocs/langs/lt_LT/externalsite.lang
+++ b/htdocs/langs/lt_LT/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Nustatymų nuoroda į išorinę interneto svetainę
-ExternalSiteURL=Išorinės svetainės URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modulis ExternalSite nebuvo tinkamai sukonfigūruotas.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 20eab7ac66c..3c1ea88cadb 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Pakeitimo data
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Patvirtinimo data
+DateSigning=Signing date
 DateClosing=Uždarymo data
 DateDue=Laukiama data
 DateValue=Įvertinimo data
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Vieneto kaina
 PriceU=Kaina vnt.
 PriceUHT=Vnt. kaina (be PVM)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=Vnt. kaina (su PVM)
 Amount=Suma
 AmountInvoice=Sąskaitos-faktūros suma
@@ -389,6 +390,8 @@ AmountTotal=Bendra suma
 AmountAverage=Vidutinė suma
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Procentai
 Total=Visas
 SubTotal=Tarpinė suma
@@ -724,7 +727,7 @@ MenuMembers=Nariai
 MenuAgendaGoogle=Google operacijos
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr apribojimas (Meniu Pagrindinis-Nustatymai-Saugumas): %s kb, PHP apribojimas: %s kb
-NoFileFound=Šiame kataloge nėra išsaugotų dokumentų
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Dabartinė vartojama kalba
 CurrentTheme=Dabartinė tema
 CurrentMenuManager=Dabartinis meniu valdytojas
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Adresatai
 SearchIntoMembers=Nariai
 SearchIntoUsers=Vartotojai
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projektai
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Uždaviniai
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Priskirtas
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/lt_LT/margins.lang b/htdocs/langs/lt_LT/margins.lang
index 6f4906fd592..88a1b6a45f0 100644
--- a/htdocs/langs/lt_LT/margins.lang
+++ b/htdocs/langs/lt_LT/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Maržos detalės
 ProductMargins=Produkto maržos
 CustomerMargins=Kliento maržos
 SalesRepresentativeMargins=Prekybos atstovo maržos
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Produktas ar Paslaugos
 AllProducts=Visi produktai ir paslaugos
 ChooseProduct/Service=Pasirinkite produktą ar paslaugą
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Maržos metodas visuotinėms nuolaidoms
 UseDiscountAsProduct=Kaip produktas
 UseDiscountAsService=Kaip paslauga
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Savikaina
 UnitCharges=Vieneto sąnaudos
 Charges=Sąnaudos
 AgentContactType=Prekybos agento kontakto tipas
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index b63bb1dc36d..bcf36c5bced 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Numatomų narių sąrašas (tvirtinimui)
 MembersListValid=Patvirtintų galiojančių narių sąrašas
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=Slaptų narių sąrašas (qualified)
 MenuMembersToValidate=Projektiniai nariai
 MenuMembersValidated=Patvirtinti nariai
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Nariai, kurių pasirašymą reikia gauti
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Pasibaigęs
 MemberStatusPaid=Pasirašymas atnaujintas
 MemberStatusPaidShort=Atnaujinta
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Projektiniai nariai
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Galiojantis
@@ -82,6 +87,8 @@ Physical=Fizinis
 Moral=Moralinis
 MorAndPhy=Moral and Physical
 Reenable=Įjungti vėl
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Ištrinti narį
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Etikečių puslapio formatas
 DescADHERENT_ETIQUETTE_TEXT=Spausdinamas tekstas ant nario adreso puslapių
@@ -162,6 +170,7 @@ DocForLabels=Sukurti adresų lapus
 SubscriptionPayment=Pasirašymo apmokėjimas
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Narių statistiniai duomenys pagal šalį
 MembersStatisticsByState=Narių statistiniai duomenys pagal valstybę/regioną
 MembersStatisticsByTown=Narių statistiniai duomenys pagal miestus
diff --git a/htdocs/langs/lt_LT/modulebuilder.lang b/htdocs/langs/lt_LT/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/lt_LT/modulebuilder.lang
+++ b/htdocs/langs/lt_LT/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
index 274f41645fa..a287e8f6dd8 100644
--- a/htdocs/langs/lt_LT/orders.lang
+++ b/htdocs/langs/lt_LT/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Sudaryti užsakymą
 MakeOrder=Sudaryti užsakymą
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=El. paštas
 OrderByWWW=Prisijungęs (online)
 OrderByPhone=Telefonas
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=Paprastas užsakymo modelis
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Pateikti sąskaitą užsakymams
+CreateInvoiceForThisSupplier=Pateikti sąskaitą užsakymams
 NoOrdersToInvoice=Nėra užsakymų, kuriems galima išrašyti sąskaitą
 CloseProcessedOrdersAutomatically=Klasifikuoti "Apdoroti" visus pasirinktus užsakymus.
 OrderCreation=Užsakymo kūrimas
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 3a40679f01b..2e84175f9bf 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Sukurta %s
 ModifiedBy=Modifikuota %s
 ValidatedBy=Patvirtinta %s
+SignedBy=Signed by %s
 ClosedBy=Uždaryta %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=Tai nauji Jūsų prisijungimo raktai
 NewKeyWillBe=Jūsų naujas prisijungimo prie programos raktas bus
 ClickHereToGoTo=Spauskite čia norėdami pereiti į %s
 YouMustClickToChange=Pirmiausia turite paspausti ant šios nuorodos ir patvirtinti šį slaptažodžio pakeitimą
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Jei neprašėte šio pakeitimo, tiesiog pamirškite šį pranešimą. Jūsų mandatai yra saugūs.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang
index 05645d1ec1d..9f5b8e2cef9 100644
--- a/htdocs/langs/lt_LT/productbatch.lang
+++ b/htdocs/langs/lt_LT/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Naudoti partiją / serijos numerį
-ProductStatusOnBatch=Taip (reikalinga partija / serijos numeris)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=Ne (Nenaudojama partija / serijos numeris)
-ProductStatusOnBatchShort=Taip
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Ne
 Batch=Partija / Serijos numeris
 atleast1batchfield=Valgymo data arba Pardavimo data arba Partijos / Serijos numeris
@@ -22,3 +24,12 @@ ProductLotSetup=Partijos / serijos numerio modulio sąranka
 ShowCurrentStockOfLot=Rodyti dabartinias atsargas kelių prekių / partijų
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index f3905beb77a..f0af4d4c6d4 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Vienetas
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 81e5adaaefc..935c29a1b8a 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/lt_LT/propal.lang b/htdocs/langs/lt_LT/propal.lang
index 51ffddc97b0..3721ae9bbf2 100644
--- a/htdocs/langs/lt_LT/propal.lang
+++ b/htdocs/langs/lt_LT/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Siųsti komercinį pasiūlymą paštu
 DatePropal=Pasiūlymo data
 DateEndPropal=Galiojimo pabaigos data
 ValidityDuration=Galiojimo trukmė
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Pasiūlymas %s nerastas
 AddToDraftProposals=Pridėti į pasiūlymo projektą
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Komercinis pasiūlymas ir eilutės
 ProposalLine=Pasiūlymo eilutė
+ProposalLines=Proposal lines
 AvailabilityPeriod=Tinkamumo vėlavimas
 SetAvailability=Nustatykite tinkamumo vėlavimą
 AfterOrder=po užsakymo
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index bcb4de636b7..c2efa5da6da 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -19,8 +19,8 @@ Stock=Atsargos
 Stocks=Atsargos
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Vieta
-LocationSummary=Trumpas vietos pavadinimas
-NumberOfDifferentProducts=Skirtingų produktų skaičius
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Viso produktų skaičius
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Sandėlių vertė
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtualios atsargos
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Sandėlio ID
 DescWareHouse=Sandėlio aprašymas
 LieuWareHouse=Sandėlio vieta
 WarehousesAndProducts=Sandėliai ir produktai
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Vidutinė svertinė kaina
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Vieneto pardavimo kaina
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Papildymai
 NbOfProductBeforePeriod=Produkto %s kiekis atsargose iki pasirinkto periodo (< %s)
 NbOfProductAfterPeriod=Produkto %s kiekis sandėlyje po pasirinkto periodo (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Įplaukos už šį užsakymą
 StockMovementRecorded=Įrašyti atsargų judėjimai
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Atidaryti iš naujo
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
index ec0170cc1f1..c15c50ee9ca 100644
--- a/htdocs/langs/lt_LT/suppliers.lang
+++ b/htdocs/langs/lt_LT/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=Istorija
diff --git a/htdocs/langs/lt_LT/ticket.lang b/htdocs/langs/lt_LT/ticket.lang
index 0dbbd874bab..d6841d70ed6 100644
--- a/htdocs/langs/lt_LT/ticket.lang
+++ b/htdocs/langs/lt_LT/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Tipas
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index b8d26906c5d..1fd600809a0 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Pašalinti iš grupės
 PasswordChangedAndSentTo=Slaptažodis pakeistas ir išsiųstas į <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Prašymas pakeisti slaptažodį <b>%s</b> išsiųstą į <b>%s</b>
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Vartotojai ir grupės
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domeno Vartotojas %s
 Reactivate=Atgaivinti
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Leidimas suteiktas, nes paveldėtas iš vieno grupės vartotojų
 Inherited=Paveldėtas
+UserWillBe=Created user will be
 UserWillBeInternalUser=Sukurtas vartotojas bus vidinis vartotojas (nes nėra susietas su konkrečia trečiąja šalimi)
 UserWillBeExternalUser=Sukurtas vartotojas bus išorinis vartotojas (nes susietas su konkrečia trečiąja šalimi)
 IdPhoneCaller=Skambinančiojo telefonu ID
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index 6a589a71fd8..123ffa6cf1e 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Skaityti
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/lt_LT/zapier.lang b/htdocs/langs/lt_LT/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/lt_LT/zapier.lang
+++ b/htdocs/langs/lt_LT/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 9825eac154e..b2c5a7029ea 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Šis pakalpojums
 ThisProduct=Šis produkts
 DefaultForService=Noklusējums pakalpojumam
 DefaultForProduct=Noklusējums produktam
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Produkts šai trešajai pusei
+ServiceForThisThirdparty=Pakalpojums šai trešajai pusei
 CantSuggest=Nevar ieteikt
 AccountancySetupDoneFromAccountancyMenu=Lielākā daļa grāmatvedības iestatīšanas tiek veikta no izvēlnes %s
 ConfigAccountingExpert=Moduļa uzskaites konfigurācija (dubultā ieraksts)
@@ -50,7 +50,7 @@ CountriesExceptMe=Visas valstis, izņemot %s
 AccountantFiles=Eksportēt pirmdokumentus
 ExportAccountingSourceDocHelp=Izmantojot šo rīku, varat eksportēt avota notikumus (sarakstu un PDF failus), kas tika izmantoti grāmatvedības ģenerēšanai. Lai eksportētu žurnālus, izmantojiet izvēlnes ierakstu %s - %s.
 VueByAccountAccounting=Skatīt pēc grāmatvedības konta
-VueBySubAccountAccounting=View by accounting subaccount
+VueBySubAccountAccounting=Skatīt pēc grāmatvedības apakškonta
 
 MainAccountForCustomersNotDefined=Galvenais grāmatvedības konts klientiem, kas nav definēti iestatījumos
 MainAccountForSuppliersNotDefined=Galvenais grāmatvedības konts piegādātājiem, kas nav definēti iestatījumos
@@ -131,7 +131,7 @@ InvoiceLinesDone=Iesaistīto rēķinu līnijas
 ExpenseReportLines=Izdevumu atskaites līnijas, kas saistītas
 ExpenseReportLinesDone=Saistītās izdevumu pārskatu līnijas
 IntoAccount=Bind line ar grāmatvedības kontu
-TotalForAccount=Kopā grāmatvedības kontā
+TotalForAccount=Total accounting account
 
 
 Ventilate=Saistīt
@@ -147,7 +147,7 @@ NotVentilatedinAccount=Nav saistošs grāmatvedības kontam
 XLineSuccessfullyBinded=%s produkti/pakalpojumi, kas veiksmīgi piesaistīti grāmatvedības kontam
 XLineFailedToBeBinded=%s produkti/pakalpojumi nav saistīti ar nevienu grāmatvedības kontu
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maksimālais rindu skaits saraksta un iesiešanas lapā (ieteicams: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Sāciet lappuses "Saistīšanu darīt" šķirošanu ar jaunākajiem elementiem
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Sāciet lappuses "Saistīšana pabeigta" šķirošanu ar jaunākajiem elementiem
 
@@ -201,17 +201,17 @@ Docdate=Datums
 Docref=Atsauce
 LabelAccount=Konta nosaukums
 LabelOperation=Etiķetes darbība
-Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+Sens=Virziens
+AccountingDirectionHelp=Klienta grāmatvedības kontā izmantojiet kredītu, lai reģistrētu saņemto maksājumu <br> Piegādātāja grāmatvedības kontā izmantojiet Debets, lai reģistrētu veikto maksājumu
 LetteringCode=Burtu kods
 Lettering=Burti
 Codejournal=Žurnāls
 JournalLabel=Žurnāla etiķete
 NumPiece=Gabala numurs
 TransactionNumShort=Num. darījums
-AccountingCategory=Personalizētas grupas
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
+AccountingCategory=Custom group
+GroupByAccountAccounting=Grupēt pēc galvenās grāmatas konta
+GroupBySubAccountAccounting=Grupēt pēc apakšzinēja konta
 AccountingAccountGroupsDesc=Šeit jūs varat definēt dažas grāmatvedības kontu grupas. Tie tiks izmantoti personificētiem grāmatvedības pārskatiem.
 ByAccounts=Pēc kontiem
 ByPredefinedAccountGroups=Iepriekš definētās grupas
@@ -253,7 +253,7 @@ PaymentsNotLinkedToProduct=Maksājums nav saistīts ar kādu produktu / pakalpoj
 OpeningBalance=Sākuma bilance
 ShowOpeningBalance=Rādīt sākuma atlikumu
 HideOpeningBalance=Slēpt sākuma atlikumu
-ShowSubtotalByGroup=Show subtotal by level
+ShowSubtotalByGroup=Rādīt starpsummu pēc līmeņa
 
 Pcgtype=Kontu grupa
 PcgtypeDesc=Kontu grupa tiek izmantota kā iepriekš definēti “filtra” un “grupēšanas” kritēriji dažiem grāmatvedības pārskatiem. Piemēram, “IENĀKUMS” vai “IZDEVUMI” tiek izmantoti kā produktu uzskaites kontu grupas, lai izveidotu izdevumu / ienākumu pārskatu.
@@ -276,11 +276,11 @@ DescVentilExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindiņu sa
 DescVentilExpenseReportMore=Ja jūs izveidojat grāmatvedības kontu uz izdevumu pārskata rindiņu veida, programma varēs visu saistību starp jūsu rēķina pārskatu rindiņām un jūsu kontu diagrammas grāmatvedības kontu veikt tikai ar vienu klikšķi, izmantojot pogu <strong> "%s" </strong>. Ja kontam nav iestatīta maksu vārdnīca vai ja jums joprojām ir dažas rindiņas, kurām nav saistības ar kādu kontu, izvēlnē "<strong> %s </ strong>" būs jāveic manuāla piesaistīšana.
 DescVentilDoneExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindu sarakstu un to maksu grāmatvedības kontu
 
-Closure=Annual closure
+Closure=Gada slēgšana
 DescClosure=Šeit apskatiet neapstiprināto kustību skaitu mēnesī, un fiskālie gadi jau ir atvērti
 OverviewOfMovementsNotValidated=1. solis / Nepārvērtēts kustību pārskats. (Nepieciešams, lai slēgtu fiskālo gadu)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
+AllMovementsWereRecordedAsValidated=Visas kustības tika reģistrētas kā apstiprinātas
+NotAllMovementsCouldBeRecordedAsValidated=Ne visas kustības varēja reģistrēt kā apstiprinātas
 ValidateMovements=Apstipriniet kustības
 DescValidateMovements=Jebkādas rakstīšanas, burtu un izdzēsto tekstu izmaiņas vai dzēšana būs aizliegtas. Visi vingrinājumu ieraksti ir jāapstiprina, pretējā gadījumā aizvēršana nebūs iespējama
 
@@ -300,7 +300,7 @@ Accounted=Uzskaitīts virsgrāmatā
 NotYetAccounted=Vēl nav uzskaitīti virsgrāmatā
 ShowTutorial=Rādīt apmācību
 NotReconciled=Nesaskaņots
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=Brīdinājums: visas darbības, kurās nav definēts apakškārtas konts, tiek filtrētas un izslēgtas no šī skata
 
 ## Admin
 BindingOptions=Iesiešanas iespējas
@@ -345,11 +345,11 @@ Modelcsv_LDCompta10=Eksports LD Compta (v10 un jaunākiem)
 Modelcsv_openconcerto=Eksportēt OpenConcerto (tests)
 Modelcsv_configurable=Eksportēt CSV konfigurējamu
 Modelcsv_FEC=Eksporta FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
+Modelcsv_FEC2=Eksportēt FEC (ar datumu ģenerēšanas / dokumenta maiņu)
 Modelcsv_Sage50_Swiss=Eksports uz Sage 50 Šveici
 Modelcsv_winfic=Eksportēt Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv3=Gestinum eksports (v3)
+Modelcsv_Gestinumv5Export Gestinum (v5)
 ChartofaccountsId=Kontu konts. Id
 
 ## Tools - Init accounting account on product / service
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Līnijas, kas vēl nav saistītas, izmantojiet izvēl
 
 ## Import
 ImportAccountingEntries=Grāmatvedības ieraksti
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Eksporta datums
 WarningReportNotReliable=Brīdinājums. Šis pārskats nav balstīts uz grāmatvedi, tādēļ tajā nav darījumu, kas Manuāli ir manuāli modificēts. Ja žurnāls ir atjaunināts, grāmatvedības skats ir precīzāks.
 ExpenseReportJournal=Izdevumu atskaites žurnāls
 InventoryJournal=Inventāra žurnāls
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 88ecbad779e..dd60ceda643 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -37,8 +37,9 @@ UnlockNewSessions=Noņemt savienojuma bloķēšanu
 YourSession=Jūsu sesija
 Sessions=Lietotāju sesijas
 WebUserGroup=Web servera lietotājs/grupa
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFiles=Permissions on files
+PermissionsOnFilesInWebRoot=Atļaujas failiem tīmekļa saknes direktorijā
+PermissionsOnFile=Atļaujas failā %s
 NoSessionFound=Šķiet, ka jūsu PHP konfigurācija neļauj iekļaut aktīvās sesijas. Direktorija, kuru izmanto sesiju saglabāšanai (<b>%s</b>), var būt aizsargāta (piemēram, ar OS atļaujām vai PHP direktīvu open_basedir).
 DBStoringCharset=Datu bāzes kodējuma datu uzglabāšanai
 DBSortingCharset=Datu bāzes rakstzīmju kopa, lai kārtotu datus
@@ -56,12 +57,13 @@ GUISetup=Attēlojums
 SetupArea=Iestatījumi
 UploadNewTemplate=Augšupielādēt jaunu veidni (-es)
 FormToTestFileUploadForm=Forma, lai pārbaudītu failu augšupielādi (pēc uiestatītajiem parametriem)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=Jāiespējo modulis / lietojumprogramma <b> %s </b>
+ModuleIsEnabled=Modulis / lietojumprogramma <b> %s </b> ir iespējota
 IfModuleEnabled=Piezīme: jā, ir efektīva tikai tad, ja modulis <b>%s</b> ir iespējots
 RemoveLock=Ja ir, noņemiet/pārdēvējiet failu <b>%s</b>, lai varētu izmantot atjaunināšanas/instalēšanas rīku.
 RestoreLock=Atjaunojiet failu <b>%s</b> tikai ar lasīšanas atļauju, lai atspējotu jebkādu turpmāku atjaunināšanas/instalēšanas rīka izmantošanu.
 SecuritySetup=Drošības iestatījumi
+PHPSetup=PHP setup
 SecurityFilesDesc=Šeit definējiet ar drošību saistītās iespējas failu augšupielādei.
 ErrorModuleRequirePHPVersion=Kļūda, šim modulim ir nepieciešama PHP versija %s vai augstāka
 ErrorModuleRequireDolibarrVersion=Kļūda, šim modulim nepieciešama Dolibarr versija %s vai augstāka
@@ -154,8 +156,8 @@ SystemToolsAreaDesc=Šī sadaļa nodrošina administrēšanas funkcijas. Izmanto
 Purge=Tīrīt
 PurgeAreaDesc=Šī lapa ļauj izdzēst visus Dolibarr ģenerētos vai glabātos failus (pagaidu faili vai visi faili <b> %s </b> direktorijā). Šīs funkcijas izmantošana parasti nav nepieciešama. Tas tiek nodrošināts kā risinājums lietotājiem, kuru Dolibarr uztur pakalpojumu sniedzējs, kas nepiedāvā atļaujas, lai dzēstu tīmekļa servera ģenerētos failus.
 PurgeDeleteLogFile=Dzēsiet žurnāla failus, tostarp <b>%s</b>, kas definēti Syslog modulim (nav datu pazaudēšanas riska).
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=Dzēst žurnālu un pagaidu failus
 PurgeDeleteAllFilesInDocumentsDir=Dzēsiet visus failus direktorijā: <b> %s </b>. <br> Tas izdzēsīs visus radītos dokumentus, kas saistīti ar elementiem (trešajām personām, rēķiniem utt.), ECM modulī augšupielādētiem failiem, datu bāzes rezerves izgāztuvēm un pagaidu failus.
 PurgeRunNow=Tīrīt tagad
 PurgeNothingToDelete=Nav mapes vai failu, kurus jādzēš.
@@ -232,6 +234,7 @@ BoxesAvailable=Pieejamie logrīki
 BoxesActivated=Logrīki aktivizēti
 ActivateOn=Aktivizēt
 ActiveOn=Aktivizēts
+ActivatableOn=Activatable on
 SourceFile=Avota fails
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Pieejams tikai tad, ja JavaScript nav atslēgts
 Required=Nepieciešams
@@ -257,7 +260,7 @@ ReferencedPreferredPartners=Ieteicamie partneri
 OtherResources=Citi resursi
 ExternalResources=Ārējie resursi
 SocialNetworks=Sociālie tīkli
-SocialNetworkId=Social Network ID
+SocialNetworkId=Sociālā tīkla ID
 ForDocumentationSeeWiki=Par lietotāju vai attīstītājs dokumentācijas (Doc, FAQ ...), <br> ieskatieties uz Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=Par jebkuru citu jautājumu/palīdzību, jūs varat izmantot Dolibarr forumu: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=Šeit ir daži resursi, lai iegūtu Dolibarr palīdzību un atbalstu.
@@ -347,9 +350,10 @@ LastActivationAuthor=Jaunākais aktivizētāja autors
 LastActivationIP=Jaunākā aktivizācijas IP adrese
 UpdateServerOffline=Atjaunināšanas serveris bezsaistē
 WithCounter=Pārvaldīt skaitītāju
-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 third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Visas citas rakstzīmes masku paliks neskartas.<br>Atstarpes nav atļautas.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Piemērs 99. %s no trešās personas TheCompany, ar datumu 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>
@@ -377,7 +381,7 @@ ExamplesWithCurrentSetup=Piemēri ar pašreizējo konfigurāciju
 ListOfDirectories=Saraksts OpenDocument veidnes katalogi
 ListOfDirectoriesForModelGenODT=Saraksts ar direktorijām, kurās ir veidnes faili ar OpenDocument formātu. <br> <br> Ievietojiet šeit pilnu direktoriju ceļu. <br> Pievienojiet karodziņu atpakaļ starp eah direktoriju. <br> Lai pievienotu GED moduļa direktoriju, pievienojiet šeit <b > DOL_DATA_ROOT / ecm / yourdirectoryname </b>. <br> <br> Faili šajos katalogos beidzas ar <b> .odt </b> vai <b> .ods </b>.
 NumberOfModelFilesFound=ODT / ODS veidņu failu skaits, kas atrodams šajos katalogos
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Sintakses piemēri: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Lai uzzinātu, kā izveidot odt dokumentu veidnes, pirms saglabājot tos šajās mapēs, lasīt wiki dokumentāciju:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Vārda/Uzvārda atrašanās vieta
@@ -408,7 +412,7 @@ UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites
 SecurityTokenIsUnique=Izmantojiet unikālu securekey parametru katram URL
 EnterRefToBuildUrl=Ievadiet atsauci objektam %s
 GetSecuredUrl=Saņemt aprēķināto URL
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=Slēpt neatļautu darbību pogas arī iekšējiem lietotājiem (citādi pelēks)
 OldVATRates=Vecā PVN likme
 NewVATRates=Jaunā PVN likme
 PriceBaseTypeToChange=Pārveidot par cenām ar bāzes atsauces vērtību, kas definēta tālāk
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Atstājot šo lauku tukšu, tas nozīmē, ka šī v
 ExtrafieldParamHelpselect=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> kods3, vērtība3 < br> ... <br> <br> Lai saraksts būtu atkarīgs no cita papildinošā atribūtu saraksta: <br> 1, vērtība1 | opcijas_ <i> vecāku_līmeņa kods </i>: vecāku_skava <br> 2, vērtība2 | opcijas_ <i> vecāku saraksts_code </i>: parent_key <br> <br> Lai saraksts būtu atkarīgs no cita saraksta: <br> 1, vērtība1 | <i> vecāku saraksts_code </i>: vecāku_skava <br> 2, vērtība2 | <i> vecāku saraksts_code </i>: vecāku_poga
 ExtrafieldParamHelpcheckbox=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> 3, vērtība3 < br> ...
 ExtrafieldParamHelpradio=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> 3, vērtība3 < br> ...
-ExtrafieldParamHelpsellist=Vērtību saraksts tiek iegūts no tabulas <br> Sintakse: table_name: label_field: id_field :: filter <br> Piemērs: c_typent: libelle: id :: filter <br> - id_field ir a2f a2 = 1) lai parādītu tikai aktīvo vērtību <br>. Filtrā var izmantot arī $ ID $, kas ir pašreizējā objekta <br> ID. Lai filtrā izmantotu SELECT, izmantojiet atslēgvārdu $ SEL $, lai apietu pretinjicēšanas aizsardzību. <br>, ja vēlaties filtrēt ekstrefieldos, izmantojiet sintaksi extra.fieldcode = ... (kur lauka kods ir extrafield kods) <br> <br> Lai saraksts būtu atkarīgs no cita papildu atribūtu saraksta: <br>: <br> <i> parent_list_code </i> | parent_column: filter <br> <br> Lai saraksts būtu atkarīgs no cita saraksta: <br> c_typent: libelle: ID: a04927
-ExtrafieldParamHelpchkbxlst=Vērtību saraksts nāk no tabulas <br> Sintakse: table_name: label_field: id_field :: filtrs <br> piemērs: c_typent: libelle: id :: filtrs <br> <br> filtrs var būt vienkāršs tests (piemēram, aktīvs = 1 ), lai parādītu tikai aktīvo vērtību <br> Jūs varat arī izmantot $ ID $ filtru raganā, kas ir pašreizējā objekta pašreizējais ID <br> Lai SELECT veiktu filtru, izmantojiet $ SEL $ <br>, ja vēlaties filtrēt uz ekrāna. syntax extra.fieldcode = ... (ja lauka kods ir extrafield kods) <br> <br> Lai iegūtu sarakstu atkarībā no cita papildu atribūtu saraksta: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | vecāku_krāsa: filtrs <br> <br> Lai iegūtu sarakstu atkarībā no cita saraksta: <br> c_typent: libelle: id: <i> vecāku saraksts_code </i> | vecāku_ sleja: filtrs
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametriem jābūt ObjectName: Classpath <br> Sintakse: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Vienkārša atdalītāja atstāšana tukša <br> Iestatiet to uz 1 sabrūkošajam atdalītājam (pēc noklusējuma atveriet jaunu sesiju, pēc tam katras lietotāja sesijai tiek saglabāts statuss) <br> Iestatiet to uz 2 sabrukušajam atdalītājam (jaunajai sesijai pēc noklusējuma sabrūk, pēc tam katras lietotāja sesijas laikā tiek saglabāts statuss)
 LibraryToBuildPDF=Bibliotēka, ko izmanto PDF veidošanai
@@ -541,6 +545,8 @@ Module40Name=Pārdevēji
 Module40Desc=Pārdevēju un pirkumu vadība (pirkumu pasūtījumi un rēķini par piegādātāja rēķiniem)
 Module42Name=Atkļūdošanas žurnāli
 Module42Desc=Žurnalēšana (fails, syslog, ...). Šādi žurnāli ir paredzēti tehniskiem / atkļūdošanas nolūkiem.
+Module43Name=Atkļūdošanas josla
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Redaktors
 Module49Desc=Redaktora vadība
 Module50Name=Produkti
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind pārveidošanu iespējas
 Module3200Name=Nemainīgi arhīvi
 Module3200Desc=Iespējojiet nemainīgu biznesa notikumu žurnālu. Notikumi tiek arhivēti reāllaikā. Žurnāls ir tikai lasāmu tabulu ķēdes notikumus, kurus var eksportēt. Šis modulis dažās valstīs var būt obligāts.
+Module3400Name=Sociālie tīkli
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Cilvēkresursu vadība (departamenta vadība, darbinieku līgumi un jūtas)
 Module5000Name=Multi-kompānija
 Module5000Desc=Ļauj jums pārvaldīt vairākus uzņēmumus
-Module6000Name=Darba plūsma
-Module6000Desc=Darbplūsmas vadība (automātiska objekta izveide un / vai automātiska statusa maiņa)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Mājas lapas
 Module10000Desc=Izveidojiet vietnes (publiskas) ar WYSIWYG redaktoru. Šī ir tīmekļa pārziņa vai izstrādātāja orientēta CMS (labāk ir zināt HTML un CSS valodu). Vienkārši iestatiet savu tīmekļa serveri (Apache, Nginx, ...), lai norādītu uz atvēlēto Dolibarr direktoriju, lai tas būtu tiešsaistē internetā ar savu domēna vārdu.
 Module20000Name=Atvaļinājumu pieprasījumu pārvaldība
@@ -670,7 +678,7 @@ Module54000Desc=Tiešā druka (neatverot dokumentus), izmantojot Cups IPP saskar
 Module55000Name=Aptauja vai balsojums
 Module55000Desc=Izveidot tiešsaistes aptaujas, aptaujas vai balsis (piemēram, Doodle, Studs, RDVz utt.)
 Module59000Name=Malas
-Module59000Desc=Module to follow margins
+Module59000Desc=Modulis, lai ievērotu piemales
 Module60000Name=Komisijas
 Module60000Desc=Modulis lai pārvaldītu komisijas
 Module62000Name=Inkoterms
@@ -805,7 +813,8 @@ PermissionAdvanced253=Izveidot/mainīt iekšējoss/ārējos lietotājus un atļa
 Permission254=Izveidot/mainīt ārējos lietotājus tikai
 Permission255=Mainīt citu lietotāju paroli
 Permission256=Izdzēst vai bloķēt citus lietotājus
-Permission262=Paplašināt piekļuvi visām trešajām personām (ne tikai trešām personām, kurām šis lietotājs ir pārdošanas pārstāvis). <br> Nav spēkā attiecībā uz ārējiem lietotājiem (vienmēr tikai attiecībā uz priekšlikumiem, pasūtījumiem, rēķiniem, līgumiem uc). Nav efektīvs projektiem (tikai noteikumi par projektu atļaujām, redzamību un uzdevumiem).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Lasīt CA
 Permission272=Lasīt rēķinus
 Permission273=Izrakstīt rēķinus
@@ -838,10 +847,10 @@ Permission402=Izveidot/mainīt atlaides
 Permission403=Apstiprināt atlaides
 Permission404=Dzēst atlaides
 Permission430=Izmantot Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
+Permission511=Lasīt algu maksājumus (jūsu un padoto)
 Permission512=Izveidojiet / modificējiet algu maksājumus
 Permission514=Dzēst algu maksājumus
-Permission517=Read payments of salaries of everybody
+Permission517=Izlasiet visiem algu maksājumus
 Permission519=Eksportēt algas
 Permission520=Lasīt aizdevumus
 Permission522=Izveidot / labot aizdevumus
@@ -1175,7 +1184,8 @@ SetupDescription2=Šīs divas sadaļas ir obligātas (divi pirmie ieraksti iesta
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Pamata parametri, ko izmanto, lai pielāgotu ar jūsu lietojumprogrammu saistīto noklusējuma uzvedību (piemēram, valstij).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Šī programmatūra ir daudzu moduļu / lietojumprogrammu komplekts. Ar jūsu vajadzībām saistītajiem moduļiem jābūt iespējotiem un konfigurētiem. Parādīsies izvēlnes ieraksti, aktivizējot šos moduļus.
 SetupDescription5=Citi iestatījumu izvēlnes ieraksti pārvalda izvēles parametrus.
-LogEvents=Drošības audita notikumi
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audits
 InfoDolibarr=Par Dolibarr
 InfoBrowser=Pārlūkprogrammas info
@@ -1184,7 +1194,7 @@ InfoWebServer=Par tīmekļa serveri
 InfoDatabase=Par datubāzi
 InfoPHP=Par PHP
 InfoPerf=Par izpildījumiem
-InfoSecurity=About Security
+InfoSecurity=Par drošību
 BrowserName=Pārlūkprogrammas nosaukums
 BrowserOS=Pārlūkprogrammas OS
 ListOfSecurityEvents=Saraksts ar Dolibarr drošības pasākumiem
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Šķiet, ka nepieciešams veikt atjaunināšan
 YouMustRunCommandFromCommandLineAfterLoginToUser=Jums ir palaist šo komandu no komandrindas pēc pieteikšanās uz apvalks ar lietotāju <b>%s,</b> vai jums ir pievienot-W iespēju beigās komandrindas, lai sniegtu <b>%s</b> paroli.
 YourPHPDoesNotHaveSSLSupport=SSL funkcijas, kas nav pieejama jūsu PHP
 DownloadMoreSkins=Vairāki izskati lejupielādei
-SimpleNumRefModelDesc=Atgriež atsauces numuru ar formātu %syymm-nnnn, kur yy ir gads, mm ir mēnesis un nnnn ir secīgs bez atiestatīšanas
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Rādīt profesionālo ID ar adresēm
 ShowVATIntaInAddress=Slēpt Kopienas iekšējo PVN numuru ar adresēm
 TranslationUncomplete=Daļējs tulkojums
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Starpniekserveris: nosaukums/adrese
 MAIN_PROXY_PORT=Starpniekserveris: ports
 MAIN_PROXY_USER=Starpniekserveris: pieteikšanās/lietotājs
 MAIN_PROXY_PASS=Starpniekserveris: parole
-DefineHereComplementaryAttributes=Šeit norādiet visus papildu / pielāgotos atribūtus, kurus vēlaties iekļaut: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Papildus atribūti
 ExtraFieldsLines=Papildinošas atribūti (līnijas)
 ExtraFieldsLinesRec=Papildu atribūti (veidņu rēķinu līnijas)
@@ -1308,7 +1318,7 @@ YouUseBestDriver=Jūs izmantojat draiveri %s, kas ir labākais šobrīd pieejams
 YouDoNotUseBestDriver=Jūs izmantojat draiveri %s, bet ieteicams ir %s.
 NbOfObjectIsLowerThanNoPb=Jums datu bāzē ir tikai %s %s. Tam nav nepieciešama īpaša optimizācija.
 SearchOptim=Meklēšanas optimizācija
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=Jums datu bāzē ir %s %s. Pastāvīgo %s var pievienot vienumam 1 sadaļā Mājas iestatīšana - Cits. Ierobežojiet meklēšanu tikai virkņu sākumā, kas ļauj datu bāzei izmantot indeksus, un jums nekavējoties jāsaņem atbilde.
 YouHaveXObjectAndSearchOptimOn=Jums datu bāzē ir %s %s, un konstante %s mapē Mājas iestatīšana ir iestatīta uz 1.
 BrowserIsOK=Jūs izmantojat tīmekļa pārlūku %s. Šī pārlūkprogramma ir droša un ātrdarbīgs.
 BrowserIsKO=Jūs izmantojat tīmekļa pārlūku %s. Šī pārlūka informācija ir slikta izvēle drošībai, veiktspējai un uzticamībai. Mēs iesakām izmantot Firefox, Chrome, Opera vai Safari.
@@ -1316,7 +1326,7 @@ PHPModuleLoaded=Tiek ielādēts PHP komponents %s
 PreloadOPCode=Tiek izmantots iepriekš ielādēts OPCode
 AddRefInList=Rādīt klientu / pārdevēju ref. info saraksts (atlasiet sarakstu vai kombinēto) un lielākā daļa hipersaites. <br> Trešās puses parādīsies ar nosaukumu "CC12345 - SC45678 - Lielais uzņēmums". "Lielā uzņēmuma korpuss" vietā.
 AddAdressInList=Rādīt klienta / pārdevēja adrešu sarakstu (izvēlieties sarakstu vai kombināciju) <br> Trešās puses parādīsies ar nosaukumu "Lielās kompānijas korpuss - 21 lēkt iela 123456", nevis "Lielā uzņēmuma korpuss".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+AddEmailPhoneTownInContactList=Parādīt kontaktpersonas e-pastu (vai tālruņus, ja tie nav definēti) un pilsētas informācijas sarakstu (atlasīt sarakstu vai kombinēto lodziņu) 59 65 66 - Parīze ", nevis" Dupond Durand ".
 AskForPreferredShippingMethod=Pieprasiet vēlamo piegādes metodi trešajām pusēm.
 FieldEdition=Izdevums lauka %s
 FillThisOnlyIfRequired=Piemērs: +2 (aizpildiet tikai, ja sastopaties ar problēmām)
@@ -1423,7 +1433,7 @@ AdherentMailRequired=Lai izveidotu jaunu dalībnieku, nepieciešams e-pasts
 MemberSendInformationByMailByDefault=Rūtiņu, lai nosūtītu pasta apstiprinājums locekļiem (validāciju vai jauns abonements) ir ieslēgts pēc noklusējuma
 VisitorCanChooseItsPaymentMode=Apmeklētājs var izvēlēties no pieejamiem maksājumu veidiem
 MEMBER_REMINDER_EMAIL=Iespējot automātisku atgādinājumu <b> pa e-pastu </b> par beidzies abonementi. Piezīme. Modulim <strong> %s </strong> jābūt iespējotai un pareizi iestatītai, lai nosūtītu atgādinājumus.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Dokumentu veidnes dokumentiem, kas ģenerēti no dalībnieku ieraksta
 ##### LDAP setup #####
 LDAPSetup=LDAP iestatījumi
 LDAPGlobalParameters=Globālie parametri
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Lietotājs (Unix)
 LDAPFieldLoginExample=Piemērs: uid
 LDAPFilterConnection=Meklēšanas filtrs
 LDAPFilterConnectionExample=Piemērs: & (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Lietotāja vārds (samba, Aktīvā direktorija)
 LDAPFieldLoginSambaExample=Piemērs: kāds konta nosaukums
 LDAPFieldFullname=Vārds un uzvārds
@@ -1566,9 +1577,9 @@ LDAPDescValues=Piemērs vērtības ir paredzētas <b>OpenLDAP</b> ar šādām ie
 ForANonAnonymousAccess=Par apstiprinātu piekļuvi (par rakstīšanas piekļuvi piemēram)
 PerfDolibarr=Performance uzstādīšana / optimizēt ziņojums
 YouMayFindPerfAdviceHere=Šajā lapā ir sniegtas dažas pārbaudes vai ieteikumi saistībā ar veiktspēju.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotInstalled=Nav ieinstalets.
+NotSlowedDownByThis=Tas nav palēnināts.
+NotRiskOfLeakWithThis=Ar to nav noplūdes riska.
 ApplicativeCache=Applicative kešatmiņa
 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.
@@ -1598,13 +1609,13 @@ ServiceSetup=Pakalpojumu moduļa uzstādīšana
 ProductServiceSetup=Produktu un pakalpojumu moduļu uzstādīšana
 NumberOfProductShowInSelect=Maksimālais produktu skaits, kas jāparāda kombinētajos atlases sarakstos (0 = bez ierobežojuma)
 ViewProductDescInFormAbility=Rādīt produktu aprakstus veidlapās (citādi tiek rādīts rīkjoslas uznirstošajā logā)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
+DoNotAddProductDescAtAddLines=Nepievienojiet produkta aprakstu (no produkta kartes), iesniedzot veidlapu pievienošanas rindas
+OnProductSelectAddProductDesc=Kā izmantot produktu aprakstu, pievienojot produktu kā dokumenta rindu
+AutoFillFormFieldBeforeSubmit=Automātiski aizpildiet apraksta ievades lauku ar produkta aprakstu
+DoNotAutofillButAutoConcat=Neaizpildiet ievades lauku automātiski ar produkta aprakstu. Produkta apraksts tiks automātiski savienots ar ievadīto aprakstu.
+DoNotUseDescriptionOfProdut=Produkta apraksts nekad netiks iekļauts dokumentu rindu aprakstā
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ViewProductDescInThirdpartyLanguageAbility=Parādīt produktu aprakstus veidlapās trešās puses valodā (citādi lietotāja valodā)
 UseSearchToSelectProductTooltip=Arī tad, ja jums ir liels produktu skaits (> 100 000), varat palielināt ātrumu, iestatot iestatījumu -> Cits iestatījumu konstante PRODUCT_DONOTSEARCH_ANYWHERE uz 1. Tad meklēšana būs tikai virknes sākums.
 UseSearchToSelectProduct=Pagaidiet, kamēr nospiedīsiet taustiņu, pirms ievietojat produktu kombinēto sarakstu saturu (tas var palielināt veiktspēju, ja jums ir daudz produktu, taču tas ir mazāk ērts).
 SetDefaultBarcodeTypeProducts=Noklusējuma svītrkoda veids izmantojams produktiem
@@ -1679,7 +1690,7 @@ AdvancedEditor=Uzlabotais redaktors
 ActivateFCKeditor=Aktivizēt uzlabotos redaktoru:
 FCKeditorForCompany=WYSIWYG izveidi / izdevums no elementiem apraksta un piezīmi (izņemot produktu / pakalpojumu)
 FCKeditorForProduct=WYSIWYG radīšana / izdevums produktu / pakalpojumu apraksts un atzīmēt
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForProductDetails=WYSIWIG produktu detaļu līniju izveide / izdevums visām vienībām (priekšlikumi, pasūtījumi, rēķini utt.). <span class="warning"> Brīdinājums: Šīs opcijas izmantošana šajā gadījumā nav ieteicama, jo, veidojot PDF failus, tas var radīt problēmas ar īpašām rakstzīmēm un lapu formatēšanu. </span>
 FCKeditorForMailing= WYSIWYG izveide/ izdevums masveida emailings (Tools-> e-pastu)
 FCKeditorForUserSignature=WYSIWYG izveide/labošana lietotāja paraksta
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1696,7 +1707,7 @@ NotTopTreeMenuPersonalized=Personalizētas izvēlnes, kas nav saistītas ar augs
 NewMenu=Jauna izvēlne
 MenuHandler=Izvēlnes apstrādātājs
 MenuModule=Avota modulis
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=Slēpt neatļautas izvēlnes arī iekšējiem lietotājiem (tikai pelēcīgi citādi)
 DetailId=Id izvēlne
 DetailMenuHandler=Izvēlne administrators, kur rādīt jaunu izvēlni
 DetailMenuModule=Moduļa nosaukums, ja izvēlnes ierakstam nāk no moduļa
@@ -1736,19 +1747,21 @@ YourCompanyDoesNotUseVAT=Jūsu uzņēmumam ir noteikts, ka PVN netiek izmantots
 AccountancyCode=Grāmatvedības kods
 AccountancyCodeSell=Tirdzniecība kontu. kods
 AccountancyCodeBuy=Iegādes konta. kods
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Notikumi un kārtības modulis uzstādīšana
 PasswordTogetVCalExport=Galvenais atļaut eksporta saiti
+SecurityKey = Security Key
 PastDelayVCalExport=Neeksportē notikums, kuri vecāki par
 AGENDA_USE_EVENT_TYPE=Izmantojiet notikumu tipus (tiek pārvaldīti izvēlnē Iestatīšana -> Vārdnīcas -> Darba kārtības notikumu veids).
 AGENDA_USE_EVENT_TYPE_DEFAULT=Veidojot notikuma veidlapu, automātiski iestatiet šo noklusējuma vērtību
 AGENDA_DEFAULT_FILTER_TYPE=Šādu pasākumu automātiski iestatīt darba kārtības skatā meklēšanas filtūrā
 AGENDA_DEFAULT_FILTER_STATUS=Automātiski iestatīt šo statusu notikumu skatīšanai darba filtru meklēšanas filtūrā
 AGENDA_DEFAULT_VIEW=Kuru skatu vēlaties atvērt pēc noklusējuma, izvēloties izvēlni Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_REMINDER_BROWSER=Iespējojiet notikuma atgādinājumu <b> lietotāja pārlūkprogrammā </b> (Kad ir atgādinājuma datums, pārlūkprogramma parāda uznirstošo logu. Katrs lietotājs var atspējot šādus paziņojumus pārlūka paziņojumu iestatījumos).
 AGENDA_REMINDER_BROWSER_SOUND=Iespējot skaņas paziņojumu
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Iespējojiet notikuma atgādinājumu <b>, nosūtot e-pastus </b> (katram notikumam var noteikt atgādinājuma opciju / aizkavi).
+AGENDA_REMINDER_EMAIL_NOTE=Piezīme. Uzdevuma %s biežumam jābūt pietiekamam, lai pārliecinātos, ka atgādinājums tiek nosūtīts pareizajā brīdī.
 AGENDA_SHOW_LINKED_OBJECT=Parādīt saistīto objektu darba kārtībā
 ##### Clicktodial #####
 ClickToDialSetup=Klikšķiniet lai  Dial moduļa uzstādīšanas
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Ievadiet 0 vai 1
 UnicodeCurrency=Ievadiet šeit starp aplikācijām, baitu skaitļu sarakstu, kas attēlo valūtas simbolu. Piemēram: attiecībā uz $ ievadiet [36] - Brazīlijas reālajam R $ [82,36] - par € ievadiet [8364]
 ColorFormat=RGB krāsa ir HEX formātā, piemēram: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Kājene PDF failā
 MAIN_DOCUMENTS_LOGO_HEIGHT=Logotipa augstums PDF formātā
 NothingToSetup=Šim modulim nav nepieciešama īpaša iestatīšana.
 SetToYesIfGroupIsComputationOfOtherGroups=Iestatiet to uz "jā", ja šī grupa ir citu grupu aprēķins
-EnterCalculationRuleIfPreviousFieldIsYes=Ievadiet aprēķina kārtulu, ja iepriekšējais lauks ir iestatīts uz Jā (Piemēram, 'CODEGRP1 + CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Atrasti vairāki valodu varianti
 RemoveSpecialChars=Noņemt īpašās rakstzīmes
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filtrs tīrajai vērtībai (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Moduļa Sociālo tīklu iestatīšana
 EnableFeatureFor=Iespējot funkcijas <strong> %s </strong>
 VATIsUsedIsOff=Piezīme. Izvēlnē %s - %s izvēlētā pārdošanas nodokļa vai PVN izmantošana ir iestatīta uz <strong> Izslēgts </strong>, tāpēc pārdošanas nodoklis vai izmantotais PVN vienmēr būs 0 pārdošanai.
 SwapSenderAndRecipientOnPDF=Pārsūtīt sūtītāja un adresāta adreses pozīciju PDF dokumentos
-FeatureSupportedOnTextFieldsOnly=Brīdinājums, funkcija tiek atbalstīta tikai teksta laukos. Jāiestata arī URL parametrs action = Create vai action = rediģēt. VAI lapas nosaukumam jābeidzas ar 'new.php', lai aktivizētu šo funkciju.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=E-pasta savācējs
 EmailCollectorDescription=Pievienojiet ieplānoto darbu un iestatīšanas lapu, lai regulāri skenētu e-pasta kastes (izmantojot IMAP protokolu) un ierakstītu savā pieteikumā saņemtos e-pasta ziņojumus pareizajā vietā un / vai automātiski izveidotu ierakstus (piemēram, vadus).
 NewEmailCollector=Jauns e-pasta savācējs
@@ -1990,12 +2003,12 @@ EMailHost=E-pasta IMAP serveris
 MailboxSourceDirectory=Pastkastes avota katalogs
 MailboxTargetDirectory=Pastkastes mērķa direktorija
 EmailcollectorOperations=Darbi, ko veic savācējs
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
+EmailcollectorOperationsDesc=Darbības tiek veiktas no augšas uz leju secībā
 MaxEmailCollectPerCollect=Maksimālais savākto e-pasta ziņojumu skaits
 CollectNow=Savākt tagad
 ConfirmCloneEmailCollector=Vai tiešām vēlaties klonēt e-pasta kolekcionāru %s?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
+DateLastCollectResult=Pēdējā savākšanas mēģinājuma datums
+DateLastcollectResultOk=Pēdējo savākšanas panākumu datums
 LastResult=Jaunākais rezultāts
 EmailCollectorConfirmCollectTitle=E-pasts apkopo apstiprinājumu
 EmailCollectorConfirmCollect=Vai vēlaties savākt šīs kolekcijas kolekciju tagad?
@@ -2013,7 +2026,7 @@ WithDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kas nosū
 WithoutDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kuru NAV nosūtīts no Dolibarr
 WithDolTrackingIDInMsgId=Ziņojums nosūtīts no Dolibarr
 WithoutDolTrackingIDInMsgId=Ziņojums NAV nosūtīts no Dolibarr
-CreateCandidature=Create job application
+CreateCandidature=Izveidot darba pieteikumu
 FormatZip=Pasta indekss
 MainMenuCode=Izvēlnes ievades kods (mainmenu)
 ECMAutoTree=Rādīt automātisko ECM koku
@@ -2049,8 +2062,11 @@ UseDebugBar=Izmantojiet atkļūdošanas joslu
 DEBUGBAR_LOGS_LINES_NUMBER=Pēdējo žurnālu rindu skaits, kas jāsaglabā konsolē
 WarningValueHigherSlowsDramaticalyOutput=Brīdinājums, augstākas vērtības palēnina dramatisko izeju
 ModuleActivated=Modulis %s ir aktivizēts un palēnina saskarni
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
+IfYouAreOnAProductionSetThis=Ja izmantojat ražošanas vidi, šim rekvizītam ir jāiestata kā %s.
+AntivirusEnabledOnUpload=Augšupielādētajos failos ir iespējota antivīruss
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Eksporta modeļi ir kopīgi ar visiem
 ExportSetup=Moduļa Eksportēšana iestatīšana
 ImportSetup=Moduļa importēšanas iestatīšana
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Izveidojiet anonīmu Ping '+1' Dolibarr pamata serverim (to ve
 FeatureNotAvailableWithReceptionModule=Funkcija nav pieejama, ja ir iespējota moduļa uztveršana
 EmailTemplate=E-pasta veidne
 EMailsWillHaveMessageID=E-pastam būs tags “Atsauces”, kas atbilst šai sintaksei
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Ja vēlaties, lai daži PDF faili tiktu dublēti 2 dažādās valodās tajā pašā ģenerētajā PDF failā, jums šeit ir jāiestata šī otrā valoda, lai ģenerētais PDF saturētu vienā un tajā pašā lappusē 2 dažādas valodas, vienu izvēloties, ģenerējot PDF, un šo ( tikai dažas PDF veidnes to atbalsta). Vienā PDF formātā atstājiet tukšumu 1 valodā.
 FafaIconSocialNetworksDesc=Šeit ievadiet FontAwesome ikonas kodu. Ja jūs nezināt, kas ir FontAwesome, varat izmantot vispārīgo vērtību fa-adrešu grāmata.
 FeatureNotAvailableWithReceptionModule=Funkcija nav pieejama, ja ir iespējota moduļa uztveršana
@@ -2088,10 +2106,19 @@ MailToSendEventPush=Notikuma atgādinājuma e-pasts
 SwitchThisForABetterSecurity=Lai nodrošinātu lielāku drošību, ieteicams šo vērtību pārslēgt uz %s
 DictionaryProductNature= Produkta veids
 CountryIfSpecificToOneCountry=Valsts (ja tā ir konkrēta valsts)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
+YouMayFindSecurityAdviceHere=Šeit varat atrast drošības konsultācijas
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=Izstrādei paredzētais modulis ir iespējots. Neiespējojiet to ražošanas vidē.
+CombinationsSeparator=Atdalītāja raksturs produktu kombinācijām
+SeeLinkToOnlineDocumentation=Piemēru skatiet saiti uz tiešsaistes dokumentēšanu augšējā izvēlnē
+SHOW_SUBPRODUCT_REF_IN_PDF=Ja tiek izmantots moduļa <b> %s </b> līdzeklis "%s", parādiet sīkāku informāciju par komplekta apakšproduktiem PDF formātā.
+AskThisIDToYourBank=Lai iegūtu šo ID, sazinieties ar savu banku
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index 0bf310b3a54..584af7af25e 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -173,11 +173,12 @@ SEPAMandate=SEPA mandāts
 YourSEPAMandate=Jūsu SEPA mandāts
 FindYourSEPAMandate=Tas ir jūsu SEPA mandāts, lai pilnvarotu mūsu uzņēmumu veikt tiešā debeta pasūtījumu savai bankai. Atgriezt to parakstu (skenēt parakstīto dokumentu) vai nosūtīt pa pastu uz
 AutoReportLastAccountStatement=Veicot saskaņošanu, automātiski aizpildiet lauka “bankas izraksta numurs” ar pēdējo izraksta numuru
-CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+CashControl=POS kases kontrole
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Krāsojiet kustības
 BankColorizeMovementDesc=Ja šī funkcija ir iespējota, jūs varat izvēlēties īpašu fona krāsu debeta vai kredīta pārvietošanai
 BankColorizeMovementName1=Debeta kustības fona krāsa
 BankColorizeMovementName2=Kredīta aprites fona krāsa
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
+IfYouDontReconcileDisableProperty=Ja dažos bankas kontos neveicat bankas saskaņošanu, atspējojiet rekvizītu "%s", lai noņemtu šo brīdinājumu.
+NoBankAccountDefined=Nav noteikts bankas konts
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 8e6763b543f..d3144af8df2 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -52,11 +52,12 @@ Invoices=Rēķini
 InvoiceLine=Rēķina līnija
 InvoiceCustomer=Klienta rēķins
 CustomerInvoice=Klienta rēķins
-CustomersInvoices=Klientu rēķini
+CustomersInvoices=Klienta rēķini
 SupplierInvoice=Piegādātāja rēķins
-SuppliersInvoices=Piegādātāju rēķini
+SuppliersInvoices=Piegādātāja rēķini
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Piegādātāja rēķins
-SupplierBills=piegādātāju rēķini
+SupplierBills=Piegādātāja rēķini
 Payment=Maksājums
 PaymentBack=Atmaksa
 CustomerInvoicePaymentBack=Atmaksa
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Jau samaksāts
 PaymentsBackAlreadyDone=Jau veiktas atmaksas
 PaymentRule=Maksājuma noteikums
 PaymentMode=Maksājuma veids
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debet karte/ kredīt karte
 PaymentTypePP=PayPal
 IdPaymentMode=Maksājuma veids (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Jaunākais veidošanas datums
 DateLastGenerationShort=Datuma pēdējais gen.
 MaxPeriodNumber=Maks. rēķinu veidošanas skaits
 NbOfGenerationDone=Rēķina paaudzes skaits jau ir pabeigts
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Veicamās paaudzes skaits
 MaxGenerationReached=Maksimālais sasniegto paaudžu skaits
 InvoiceAutoValidate=Rēķinus automātiski apstiprināt
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=14 dienu laikā pēc mēneša beigām
 FixAmount=Fiksēta summa - 1 rinda ar etiķeti '%s'
 VarAmount=Mainīgais apjoms (%% kop.)
 VarAmountOneLine=Mainīgā summa (%% kopā) - 1 rinda ar etiķeti '%s'
-VarAmountAllLines=Mainīgs daudzums (%% kops.) - visas tās pašas līnijas
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bankas pārskaitījums
 PaymentTypeShortVIR=Bankas pārskaitījums
@@ -494,12 +498,16 @@ Cash=Skaidra nauda
 Reported=Kavējas
 DisabledBecausePayments=Nav iespējams, kopš šeit ir daži no maksājumiem
 CantRemovePaymentWithOneInvoicePaid=Nevar dzēst maksājumu, jo eksistē kaut viens rēķins, kas klasificēts kā samaksāts
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Gaidāmais maksājums
 CantRemoveConciliatedPayment=Nevar noņemt saskaņoto maksājumu
 PayedByThisPayment=Samaksāts ar šo maksājumu
 ClosePaidInvoicesAutomatically=Automātiski klasificējiet visus standarta, priekšapmaksas vai rezerves rēķinus kā “Apmaksāts”, ja maksājums ir pilnībā veikts.
 ClosePaidCreditNotesAutomatically=Automātiski klasificējiet visas kredītzīmes kā "Apmaksātu", kad atmaksa tiek veikta pilnībā.
 ClosePaidContributionsAutomatically=Automātiski klasificējiet visas sociālās vai fiskālās iemaksas kā &quot;Apmaksātās&quot;, ja maksājums tiek veikts pilnībā.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Visi rēķini, kuriem nav jāmaksā, tiks automātiski aizvērti ar statusu "Paid".
 ToMakePayment=Maksāt
 ToMakePaymentBack=Atmaksāt
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Vispirms vispirms jāizveido standarta rē
 PDFCrabeDescription=Rēķina PDF veidne Krabis. Pilna rēķina veidne (vecā Sponge veidnes ieviešana)
 PDFSpongeDescription=Rēķina PDF veidne Sponge. Pilnīga rēķina veidne
 PDFCrevetteDescription=Rēķina PDF veidne Crevette. Pabeigta rēķina veidne situāciju rēķiniem
-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=Atgriež numuru ar formātu %syymm-nnnn par standarta rēķiniem, %syymm-nnnn par nomainītajiem rēķiniem, %syymm-nnnn par norēķinu rēķiniem un %syymm-nnnn par kredītzīmēm, kur yy ir gads, mm ir mēnesis, un nnnn ir secība bez pārtraukuma un nē atgriezties pie 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Rēķinu sākot ar syymm $ jau pastāv un nav saderīgs ar šo modeli secību. Noņemt to vai pārdēvēt to aktivizētu šo moduli.
-CactusNumRefModelDesc1=Atgriešanās numurs ar formātu %syymm-nnnn standarta rēķiniem, %syymm-nnnn par kredītzīmēm un %syymm-nnnn par norēķinu rēķiniem, kur yy ir gads, mm ir mēnesis, un nnnn ir secība bez pārtraukuma un nav atgriezta 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Priekšlaicīgas slēgšanas iemesls
 EarlyClosingComment=Priekšlaicīgās slēgšanas piezīme
 ##### Types de contacts #####
@@ -562,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Ja jums ir nepieciešams, lai šādi rēķini
 DeleteRepeatableInvoice=Dzēst veidnes rēķinu
 ConfirmDeleteRepeatableInvoice=Vai tiešām vēlaties izdzēst veidnes rēķinu?
 CreateOneBillByThird=Izveidojiet vienu rēķinu par trešo pusi (citādi, vienu rēķinu par pasūtījumu)
-BillCreated=izveidots (-i) %s rēķins (-i)
+BillCreated=%s ģenerēts (-i) rēķins (-i)
+BillXCreated=Rēķins %s izveidots
 StatusOfGeneratedDocuments=Dokumentu ģenerēšanas statuss
 DoNotGenerateDoc=Neveidot dokumenta failu
 AutogenerateDoc=Auto ģenerēt dokumenta failu
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index ff805fefef0..803487a2bbe 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistika par galvenajiem biznesa objektiem datu bāzē
 BoxLoginInformation=Pieteikšanās informācija
 BoxLastRssInfos=RSS informācija
 BoxLastProducts=Jaunākie %s Produkti/Pakalpojumi
@@ -17,9 +18,13 @@ BoxLastActions=Jaunākās darbības
 BoxLastContracts=Jaunākie līgumi
 BoxLastContacts=Jaunākie kontakti/adreses
 BoxLastMembers=Jaunākie dalībnieki
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Jaunākās intervences
 BoxCurrentAccounts=Atvērto kontu atlikums
 BoxTitleMemberNextBirthdays=Šī mēneša dzimšanas dienas (dalībnieki)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Jaunākās %s ziņas no %s
 BoxTitleLastProducts=Produkti / Pakalpojumi: pēdējais %s modificēts
 BoxTitleProductsAlertStock=Produkti: krājumu brīdinājums
@@ -46,12 +51,12 @@ BoxTitleLastModifiedDonations=Jaunākie %s labotie ziedojumi
 BoxTitleLastModifiedExpenses=Jaunākie %s modificētie izdevumu pārskati
 BoxTitleLatestModifiedBoms=Jaunākās %s modificētās BOM
 BoxTitleLatestModifiedMos=Jaunākie %s modificētie ražošanas pasūtījumi
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
+BoxTitleLastOutstandingBillReached=Pārsniegti klienti ar maksimālo nesamaksāto summu
 BoxGlobalActivity=Global darbība (pavadzīmes, priekšlikumi, rīkojumi)
 BoxGoodCustomers=Labi klienti
 BoxTitleGoodCustomers=%s Labi klienti
 BoxScheduledJobs=Plānoti darbi
-BoxTitleFunnelOfProspection=Lead funnel
+BoxTitleFunnelOfProspection=Svina piltuve
 FailedToRefreshDataInfoNotUpToDate=Neizdevās atsvaidzināt RSS plūsmu. Pēdējoreiz veiksmīgi atsvaidzināšanas datums: %s
 LastRefreshDate=Jaunākais atsvaidzināšanas datums
 NoRecordedBookmarks=Nav definētas grāmatzīmes.
@@ -95,8 +100,8 @@ LastXMonthRolling=Jaunākais %s mēnesis ritošais
 ChooseBoxToAdd=Pievienojiet logrīku savam informācijas panelim
 BoxAdded=Jūsu vadības panelī ir pievienots logrīks
 BoxTitleUserBirthdaysOfMonth=Šī mēneša dzimšanas dienas (lietotāji)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
+BoxLastManualEntries=Jaunākais grāmatvedības ieraksts, kas ievadīts manuāli vai bez avota dokumenta
+BoxTitleLastManualEntries=%s jaunākais ieraksts, kas ievadīts manuāli vai bez avota dokumenta
 NoRecordedManualEntries=Grāmatvedībā nav manuālu ierakstu
 BoxSuspenseAccount=Grāmatvedības operācija ar pagaidu kontu
 BoxTitleSuspenseAccount=Nepiešķirto līniju skaits
@@ -105,7 +110,11 @@ SuspenseAccountNotDefined=Apturēšanas konts nav definēts
 BoxLastCustomerShipments=Pēdējo klientu sūtījumi
 BoxTitleLastCustomerShipments=Jaunākie %s klientu sūtījumi
 NoRecordedShipments=Nav reģistrēts klienta sūtījums
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxCustomersOutstandingBillReached=Ir sasniegti klienti ar ierobežojumu
 # Pages
-AccountancyHome=Grāmatvedība
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Apstiprināti projekti
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index bde3733eac6..de310bd04c0 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -14,12 +14,12 @@ SuppliersCategoriesArea=Pārdevēju atzīmes / kategorijas
 CustomersCategoriesArea=Klientu atslēgvārdi/sadaļu apgabals
 MembersCategoriesArea=Dalībnieku atslēgvārdi/sadaļu apgabals
 ContactsCategoriesArea=Kontaktu tagi / sadaļu apgabals
-AccountsCategoriesArea=Kontu atzīmes / kategoriju apgabals
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projektu tagi / kategoriju apgabals
 UsersCategoriesArea=Lietotāju tagu / kategoriju apgabals
 SubCats=Apakšsadaļas
 CatList=Atslēgvārdu/sadaļu saraksts
-CatListAll=List of tags/categories (all types)
+CatListAll=Tagu / kategoriju saraksts (visi veidi)
 NewCategory=Jauna etiķete/sadaļa
 ModifCat=Labot etiķeti/sadaļu
 CatCreated=Etiķete/sadaļa izveidota
@@ -66,34 +66,34 @@ UsersCategoriesShort=Lietotāju atzīmes / kategorijas
 StockCategoriesShort=Noliktavas tagi / kategorijas
 ThisCategoryHasNoItems=Šajā kategorijā nav nevienas preces.
 CategId=Tag /sadaļas ID
-ParentCategory=Parent tag/category
-ParentCategoryLabel=Label of parent tag/category
-CatSupList=List of vendors tags/categories
-CatCusList=List of customers/prospects tags/categories
+ParentCategory=Vecāku atzīme / kategorija
+ParentCategoryLabel=Vecāku taga / kategorijas etiķete
+CatSupList=Pārdevēju tagu / kategoriju saraksts
+CatCusList=Klientu / potenciālo klientu tagu / kategoriju saraksts
 CatProdList=Produktu tagu / kategoriju saraksts
 CatMemberList=Dalībnieku tagu / kategoriju saraksts
-CatContactList=List of contacts tags/categories
-CatProjectsList=List of projects tags/categories
-CatUsersList=List of users tags/categories
-CatSupLinks=Links between vendors and tags/categories
+CatContactList=Kontaktu tagu / kategoriju saraksts
+CatProjectsList=Projektu tagu / kategoriju saraksts
+CatUsersList=Lietotāju tagu / kategoriju saraksts
+CatSupLinks=Saikne starp pārdevējiem un tagiem / kategorijām
 CatCusLinks=Saiknes starp klientiem / perspektīvām un tagiem / kategorijām
 CatContactsLinks=Saiknes starp kontaktiem / adresēm un tagiem / kategorijām
 CatProdLinks=Saiknes starp produktiem / pakalpojumiem un tagiem / kategorijām
 CatMembersLinks=Links between members and tags/categories
-CatProjectsLinks=Links between projects and tags/categories
-CatUsersLinks=Links between users and tags/categories
+CatProjectsLinks=Saikne starp projektiem un tagiem / kategorijām
+CatUsersLinks=Saites starp lietotājiem un tagiem / kategorijām
 DeleteFromCat=Noņemt no tagiem / kategorijas
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tagu / kategoriju iestatīšana
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Ja opcija ir ieslēgta, pievienojot produktu apakškategorijai, produkts tiks pievienots arī vecākajai kategorijai.
 AddProductServiceIntoCategory=Add the following product/service
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Piešķirt kategoriju klientam
+AddSupplierIntoCategory=Piešķirt kategoriju piegādātājam
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Izvēlies sadaļu
-StocksCategoriesArea=Noliktavu kategorijas
-ActionCommCategoriesArea=Pasākumu kategorijas
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Lapu konteineru kategorijas
 UseOrOperatorForCategories=Izmantojiet vai operatoru kategorijām
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 6790975f63a..3cb2ec3dd62 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -43,9 +43,10 @@ Individual=Privātpersona
 ToCreateContactWithSameName=Automātiski izveidos kontaktu / adresi ar tādu pašu informāciju kā trešā persona trešās puses ietvaros. Vairumā gadījumu pat tad, ja jūsu trešā persona ir fiziska persona, pietiek ar trešās personas izveidošanu vien.
 ParentCompany=Mātes uzņēmums
 Subsidiaries=Filiāles
-ReportByMonth=Atskaite par mēnesi
-ReportByCustomers=Klienta ziņojums
-ReportByQuarter=Kursa/ reitinga ziņojums
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Pieklājība kods
 RegisteredOffice=Juridiskā adrese
 Lastname=Uzvārds
@@ -124,7 +125,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI numurs
 ProfId6AT=-
 ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
@@ -136,7 +137,7 @@ ProfId1BE=Prof ID 1 (Professional skaits)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI numurs
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -148,7 +149,7 @@ ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof ID 1 (Federālā skaits)
 ProfId4CH=Prof Id 2 (Tirdzniecības Ieraksta numurs)
-ProfId5CH=EORI number
+ProfId5CH=EORI numurs
 ProfId6CH=-
 ProfId1CL=Prof ID 1 (RUT)
 ProfId2CL=-
@@ -166,20 +167,26 @@ ProfId1DE=Prof ID 1 (USt.-IDNR)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI numurs
 ProfId6DE=-
 ProfId1ES=Prof ID 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Sociālās apdrošināšanas numurs)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate numurs)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof ID 1 (Sirēnas)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NBS, vecais APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Reģistrācijas numurs
 ProfId2GB=-
 ProfId3GB=SIC
@@ -202,12 +209,13 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI numurs
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI numurs
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (PATENTE)
@@ -225,13 +233,13 @@ ProfId1NL=KVK nummurs
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=EORI numurs
 ProfId6NL=-
 ProfId1PT=Prof ID 1 (NIPC)
 ProfId2PT=Prof Id 2 (Sociālās apdrošināšanas numurs)
 ProfId3PT=Prof Id 3 (Tirdzniecības Ieraksta numurs)
 ProfId4PT=Prof Id 4 (konservatorija)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=1. prof. ID (CUI)
 ProfId2RO=Prof Id 2 (Nr. Manmatriculare)
 ProfId3RO=3. profils (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (BIN)
 ProfId2RU=Prof Id 2 (INN)
@@ -358,7 +366,7 @@ VATIntraCheckableOnEUSite=Pārbaudiet Kopienas iekšējo PVN identifikācijas nu
 VATIntraManualCheck=Jūs varat manuāli pārbaudīt arī Eiropas Komisijas vietnē <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Pārbaude nav iespējams. Pārbaudes pakalpojums netiek nodrošināts no dalībvalsts (%s).
 NorProspectNorCustomer=Nav izredzes, ne klients
-JuridicalStatus=Business entity type
+JuridicalStatus=Uzņēmējdarbības vienības tips
 Workforce=Darbaspēks
 Staff=Darbinieki
 ProspectLevelShort=Potenciāls
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Maks. par izcilu rēķinu
 OutstandingBillReached=Maks. par izcilu rēķinu
 OrderMinAmount=Minimālā pasūtījuma summa
-MonkeyNumRefModelDesc=Atgrieziet numuru ar kodu %syymm-nnnn klienta kodam un %syymm-nnnn par pārdevēja kodu, kur yy ir gads, mm ir mēnesis, un nnnn ir secība bez pārtraukuma un nav atgriezties pie 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Kods ir bez maksas. Šo kodu var mainīt jebkurā laikā.
 ManagingDirectors=Menedžera(u) vārds (CEO, direktors, prezidents...) 
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index ad769c0e9d3..7fddc3b40e3 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST pirkumi
 VATCollected=Iekasētais PVN
 StatusToPay=Jāsamaksā
 SpecialExpensesArea=Sadaļa visiem īpašajiem maksājumiem
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Sociālais vai fiskālais nodoklis
 SocialContributions=Sociālie vai fiskālie nodokļi
 SocialContributionsDeductibles=Atskaitāmi sociālie vai fiskālie nodokļi
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Klienta rēķina apmaksa
 PaymentSupplierInvoice=pārdevēja rēķina apmaksa
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=PVN maksājumi
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Maksājumu saraksts
 ListOfCustomerPayments=Klientu maksājumu  saraksts
 ListOfSupplierPayments=Pārdevēja maksājumu saraksts
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Maksājumu
 LT2PaymentsES=IRPF Maksājumi
 VATPayment=Tirdzniecības nodokļa samaksa
 VATPayments=Tirdzniecības nodokļa maksājumi
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=PVN atmaksa
 NewVATPayment=Jauns apgrozījuma nodokļa maksājums
 NewLocalTaxPayment=Jauns nodokļa %s maksājums
@@ -111,7 +115,7 @@ Refund=Atmaksa
 SocialContributionsPayments=Sociālo/fiskālo nodokļu maksājumi
 ShowVatPayment=Rādīt PVN maksājumu
 TotalToPay=Summa
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
+BalanceVisibilityDependsOnSortAndFilters=Atlikums šajā sarakstā ir redzams tikai tad, ja tabula ir sakārtota %s un filtrēta 1 bankas kontā (bez citiem filtriem)
 CustomerAccountancyCode=Klienta grāmatvedības kods
 SupplierAccountancyCode=Pārdevēja grāmatvedības kods
 CustomerAccountancyCodeShort=Klienta. konta. kods
@@ -134,13 +138,21 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Pārbaudiet uzņemšanas datumu
 NbOfCheques=Pārbaužu skaits
 PaySocialContribution=Maksāt sociālo/fiskālo nodokli
-ConfirmPaySocialContribution=Vai tiešām vēlaties klasificēt šo sociālo vai fiskālo nodokli kā samaksātu?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Dzēst sociālo vai fiskālo nodokļu maksājumu
-ConfirmDeleteSocialContribution=Vai tiešām vēlaties dzēst šo sociālo / fiskālo nodokļu maksājumu?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Sociālie un fiskālie nodokļi un maksājumi
 CalcModeVATDebt=Mode <b>%sVAT par saistību accounting%s.</b>
 CalcModeVATEngagement=Mode <b>%sVAT par ienākumu-expense%sS.</b>
-CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
+CalcModeDebt=Zināmu reģistrēto dokumentu analīze, pat ja tie vēl nav uzskaitīti grāmatā.
 CalcModeEngagement=Zināma reģistrēto maksājumu analīze, pat ja tie vēl nav uzskaitīti Ledger.
 CalcModeBookkeeping=Grāmatvedības grāmatiņas žurnālā publicēto datu analīze.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,8 +166,8 @@ AnnualSummaryInputOutputMode=Ienākumu un izdevumu bilance, gada kopsavilkums
 AnnualByCompanies=Ieņēmumu un izdevumu līdzsvars pēc iepriekš definētām kontu grupām
 AnnualByCompaniesDueDebtMode=Ieņēmumu un izdevumu bilance, detalizēti pēc iepriekš definētām grupām, režīms <b> %sClaims-Debts%s </b> norādīja <b> Saistību grāmatvedība </b>.
 AnnualByCompaniesInputOutputMode=Ieņēmumu un izdevumu līdzsvars, detalizēti pēc iepriekš definētām grupām, režīms <b> %sIncomes-Expenses%s </b> norādīja <b> naudas līdzekļu uzskaiti </b>.
-SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
-SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
+SeeReportInInputOutputMode=Skatiet <b> %s maksājumu analīzi s%s </b> aprēķinam, kura pamatā ir <b> reģistrētie maksājumi </b>, pat ja tie vēl nav veikti.
+SeeReportInDueDebtMode=Skatiet <b> %sanalizēto dokumentu analīzi s%s </b>, lai aprēķinātu, pamatojoties uz zināmiem <b> ierakstītiem dokumentiem </b>, pat ja tie vēl nav
 SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Uzrādītas summas ir ar visiem ieskaitot nodokļus
 RulesResultDue=- Tas ietver nesamaksātos rēķinus, izdevumus, PVN, ziedojumus neatkarīgi no tā, vai tie ir samaksāti. Ietver arī algas. <br> - tas ir balstīts uz rēķinu izrakstīšanas datumu un izdevumu vai nodokļu samaksas termiņu. Algām, kas noteiktas ar Algas moduli, tiek izmantots maksājuma valutēšanas datums.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- Tajā ir iekļauti klienta rēķini, par kuriem ir samaksāts. <br> - tas ir balstīts uz šo rēķinu apmaksas datumu. <br>
 RulesCAIn=- Tas ietver visus no klientiem saņemto rēķinu faktiskos maksājumus. <br> - Tas ir balstīts uz šo rēķinu apmaksas datumu
 RulesCATotalSaleJournal=Tas ietver visas kredītlīnijas no pārdošanas žurnāla.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Tas ietver jūsu Ledger ierakstu ar grāmatvedības kontiem, kuriem ir grupa "IZDEVUMS" vai "IENĀKUMS"
 RulesResultBookkeepingPredefined=Tas ietver jūsu Ledger ierakstu ar grāmatvedības kontiem, kuriem ir grupa "IZDEVUMS" vai "IENĀKUMS"
 RulesResultBookkeepingPersonalized=Tas rāda jūsu grāmatvedībā ierakstu ar grāmatvedības kontiem <b>grupējot pēc personalizētām grupām</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Trešo personu pārdošanas nodokļa pārskats
 VATReportByCustomers=Pārdošanas nodokļa pārskats pēc klienta
 VATReportByCustomersInInputOutputMode=Ziņojums klientu PVN iekasē un izmaksā
 VATReportByQuartersInInputOutputMode=Ienākuma nodokļa likmes aprēķins par iekasēto un samaksāto nodokli
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Ziņot par nodokli 2 pēc likmes
 LT2ReportByQuarters=Ziņojiet par nodokli 3 pēc likmes
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=PCG apakštipu
 InvoiceLinesToDispatch=Rēķina līnijas nosūtīšanas
 ByProductsAndServices=Pēc produkta un pakalpojuma
 RefExt=Ārējā ref
-ToCreateAPredefinedInvoice=Lai izveidotu veidnes rēķinu, izveidojiet standarta rēķinu, pēc tam, neapstiprinot to, noklikšķiniet uz pogas "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Saite uz pasūtījumu
 Mode1=Metode 1
 Mode2=Metode 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Īpašais grāmatvedības konts, kas noteikts t
 ACCOUNTING_ACCOUNT_SUPPLIER=Pārdevēja trešo personu grāmatvedības konts
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Trešās puses kartē noteiktais īpašais grāmatvedības konts tiks izmantots tikai Subledger grāmatvedībai. Tas tiks izmantots galvenajai grāmatai un Subledger grāmatvedības noklusējuma vērtība, ja nav definēts īpašs pārdevēja grāmatvedības konts trešajā pusē.
 ConfirmCloneTax=Apstipriniet sociālā / fiskālā nodokļa klonu
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Klonēt nākošam mēnesim
 SimpleReport=Vienkāršs pārskats
 AddExtraReport=Papildu pārskati (pievienojiet ārvalstu un valsts klientu pārskatu)
@@ -253,7 +269,8 @@ AccountingAffectation=Grāmatvedības uzskaite
 LastDayTaxIsRelatedTo=Nodokļa pēdējā diena ir saistīta ar
 VATDue=Pieprasītais pārdošanas nodoklis
 ClaimedForThisPeriod=Pretendē uz periodu
-PaidDuringThisPeriod=Apmaksāts šajā periodā
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=Ar pārdošanas nodokļa likmi
 TurnoverbyVatrate=Apgrozījums, par kuru tiek aprēķināta pārdošanas nodokļa likme
 TurnoverCollectedbyVatrate=Apgrozījums, kas iegūts, pārdodot nodokli
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Apkopots pirkumu apgrozījums
 RulesPurchaseTurnoverDue=- Tajā ir iekļauti piegādātāja rēķini par samaksu neatkarīgi no tā, vai tie ir samaksāti. <br> - tas ir balstīts uz šo rēķinu izrakstīšanas datumu. <br>
 RulesPurchaseTurnoverIn=- Tas ietver visus faktiskos rēķinu maksājumus, kas veikti piegādātājiem. <br> - tas ir balstīts uz šo rēķinu apmaksas datumu <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Tas ietver visas pirkuma žurnāla debeta līnijas.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Par pirkuma apgrozījumu izrakstīts rēķins
 ReportPurchaseTurnoverCollected=Apkopots pirkumu apgrozījums
 IncludeVarpaysInResults = Pārskatos iekļaujiet dažādus maksājumus
diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
index 15b962b9de2..d2c5fd13c9d 100644
--- a/htdocs/langs/lv_LV/ecm.lang
+++ b/htdocs/langs/lv_LV/ecm.lang
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Meklēt pēc atslēgvārdiem
 ECMSearchByEntity=Meklēt pēc objekta
 ECMSectionOfDocuments=Dokumentu sadaļas
 ECMTypeAuto=Automātiski
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Dokumenti, kas saistīti ar %s
 ECMNoDirectoryYet=Nav izveidots katalogs
 ShowECMSection=Rādīt katalogu
 DeleteSection=Dzēst direktoriju
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Fails vēl nav indeksēts datu bāzē (mēģiniet to
 ExtraFieldsEcmFiles=Extrafields Ecm failus
 ExtraFieldsEcmDirectories=Extrafields Ecm direktoriji
 ECMSetup=ECM iestatīšana
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 60299570880..e04c4e58a21 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -8,7 +8,7 @@ ErrorBadEMail=E-pasts %s ir nepareizs
 ErrorBadMXDomain=E-pasts %s nepareizs (domēnam nav derīga MX ieraksta)
 ErrorBadUrl=Url %s ir nepareizs
 ErrorBadValueForParamNotAString=Jūsu parametra nepareiza vērtība. Tas parasti parādās, ja trūkst tulkojuma.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=Atsauce <b> %s </b> jau pastāv.
 ErrorLoginAlreadyExists=Lietotājs %s jau pastāv.
 ErrorGroupAlreadyExists=Grupa %s jau pastāv.
 ErrorRecordNotFound=Ierakstīt nav atrasts.
@@ -50,7 +50,7 @@ ErrorFieldsRequired=Daži nepieciešamie lauki netika aizpildīti.
 ErrorSubjectIsRequired=E-pasta tēma ir nepieciešama
 ErrorFailedToCreateDir=Neizdevās izveidot direktoriju. Pārbaudiet, vai Web servera lietotājam ir tiesības rakstīt uz Dolibarr dokumentus direktorijā. Ja parametrs <b>safe_mode</b> ir iespējots uz šo PHP, pārbaudiet, Dolibarr php faili pieder web servera lietotājam (vai grupa).
 ErrorNoMailDefinedForThisUser=Nav definēts e-pasts šim lietotājam
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
+ErrorSetupOfEmailsNotComplete=E-pastu iestatīšana nav pabeigta
 ErrorFeatureNeedJavascript=Šai funkcijai ir nepieciešams aktivizēt javascript. Mainīt to var iestatījumi - attēlojums.
 ErrorTopMenuMustHaveAParentWithId0=Tipa &quot;Top&quot; izvēlnē nevar būt mātes ēdienkarti. Put ar 0 mātes izvēlnes vai izvēlēties izvēlni tips &quot;pa kreisi&quot;.
 ErrorLeftMenuMustHaveAParentId=Tipa 'Kreiso' izvēlne jābūt vecākiem id.
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> nav atrasts (Bad ceļš, aplamas tiesības
 ErrorFunctionNotAvailableInPHP=Funkcija <b>%s</b> ir nepieciešama šī funkcija, bet nav pieejams šajā versijā / uzstādīšanas PHP.
 ErrorDirAlreadyExists=Direrktorija ar šādu nosaukumu jau pastāv.
 ErrorFileAlreadyExists=Fails ar šādu nosaukumu jau eksistē.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Serveris failu nav saņemis pilnīgi.
 ErrorNoTmpDir=Pagaidu direktorija %s neeksistē.
 ErrorUploadBlockedByAddon=Augšupielāde bloķēja ar PHP/Apache spraudni.
@@ -78,7 +79,7 @@ ErrorExportDuplicateProfil=Šāds profila nosaukums jau eksistē šim eksportam.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP saskaņošana nav pilnīga.
 ErrorLDAPMakeManualTest=. LDIF fails ir radīts direktorija %s. Mēģināt ielādēt manuāli no komandrindas, lai būtu vairāk informācijas par kļūdām.
 ErrorCantSaveADoneUserWithZeroPercentage=Nevar saglabāt darbību ar statusu, kas nav startēts, ja arī aizpildīts lauks "done by".
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=Atsauce <b> %s </b> jau pastāv.
 ErrorPleaseTypeBankTransactionReportName=Lūdzu, ievadiet bankas izraksta nosaukumu, kurā ieraksts jāpaziņo (formāts GGGGMM vai GGGGMMDD).
 ErrorRecordHasChildren=Neizdevās dzēst ierakstu, jo tajā ir daži bērnu ieraksti.
 ErrorRecordHasAtLeastOneChildOfType=Objektam ir vismaz viens bērns no tipa %s
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Kļūda, ielādējot kontu diagrammu. Ja daži konti netika
 ErrorBadSyntaxForParamKeyForContent=Slikta sintakse param keyforcontent. Jābūt vērtībai, kas sākas ar %s vai %s
 ErrorVariableKeyForContentMustBeSet=Kļūda, ir jāiestata konstants ar nosaukumu %s (ar teksta saturu, kas jāparāda) vai %s (ar ārējo URL).
 ErrorURLMustStartWithHttp=URL %s jāsāk ar http: // vai https: //
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Kļūda, jaunā atsauce jau ir izmantota
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Kļūda, dzēšot maksājumu, kas sasaistīts ar slēgtu rēķinu.
 ErrorSearchCriteriaTooSmall=Meklēšanas kritēriji ir pārāk mazi.
@@ -248,13 +250,17 @@ ErrorProductDoesNotNeedBatchNumber=Kļūda, produkts '<b> %s </b>' nepieņem par
 ErrorFailedToReadObject=Kļūda, neizdevās nolasīt <b> tipa objektu. %s
 ErrorParameterMustBeEnabledToAllwoThisFeature=Kļūda, parametram <b> %s </b> jābūt iespējotam <b> conf / conf.php <b>, lai iekšējais darba plānotājs varētu izmantot komandrindas saskarni
 ErrorLoginDateValidity=Kļūda, šī pieteikšanās ir ārpus derīguma datumu diapazona
-ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
-ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
-ErrorNotAvailableWithThisDistribution=Not available with this distribution
-ErrorPublicInterfaceNotEnabled=Public interface was not enabled
-ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
-ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
-ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorValueLength=Lauka '<b> %s </b>' garumam jābūt lielākam par '<b> %s </b>'
+ErrorReservedKeyword=Vārds “<b> %s </b>” ir rezervēts atslēgvārds
+ErrorNotAvailableWithThisDistribution=Nav pieejams ar šo izplatīšanu
+ErrorPublicInterfaceNotEnabled=Publiskā saskarne netika iespējota
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Jaunās lapas valoda ir jādefinē, ja tā ir iestatīta kā citas lapas tulkojums
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Jaunas lapas valoda nedrīkst būt avota valoda, ja tā ir iestatīta kā citas lapas tulkojums
+ErrorAParameterIsRequiredForThisOperation=Šai darbībai ir obligāts parametrs
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
@@ -286,4 +292,7 @@ WarningSomeBankTransactionByChequeWereRemovedAfter=Daži bankas darījumi tika n
 WarningFailedToAddFileIntoDatabaseIndex=Brīdinājums, neizdevās pievienot faila ierakstu ECM datu bāzes rādītāju tabulā
 WarningTheHiddenOptionIsOn=Brīdinājums: slēpta opcija <b> %s </b> ir ieslēgta.
 WarningCreateSubAccounts=Brīdinājums: jūs nevarat izveidot tieši apakškontu, jums ir jāizveido trešā puse vai lietotājs un jāpiešķir viņiem grāmatvedības kods, lai tos atrastu šajā sarakstā
-WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningAvailableOnlyForHTTPSServers=Pieejams tikai tad, ja tiek izmantots HTTPS drošais savienojums.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/lv_LV/externalsite.lang b/htdocs/langs/lv_LV/externalsite.lang
index de165ef0b5b..925c1286ec8 100644
--- a/htdocs/langs/lv_LV/externalsite.lang
+++ b/htdocs/langs/lv_LV/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Ārējo vietņu iestatīšana
-ExternalSiteURL=Ārējā Vietnes URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modulis ExternalSite nav pareizi konfigurēts.
 ExampleMyMenuEntry=Manas izvēlnes ieraksti
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 9e137712141..0c7cf3ecaf8 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -30,7 +30,7 @@ NoTranslation=Nav iztulkots
 Translation=Tulkošana
 CurrentTimeZone=Laika josla PHP (servera)
 EmptySearchString=Ievadiet meklēšanas kritērijus
-EnterADateCriteria=Enter a date criteria
+EnterADateCriteria=Ievadiet datuma kritērijus
 NoRecordFound=Nav atrasti ieraksti
 NoRecordDeleted=Neviens ieraksts nav dzēsts
 NotEnoughDataYet=Nepietiek datu
@@ -87,7 +87,7 @@ FileWasNotUploaded=Fails ir izvēlēts pielikumam,  bet vēl nav augšupielādē
 NbOfEntries=Ierakstu skaits
 GoToWikiHelpPage=Lasīt tiešsaistes palīdzību (nepieciešams interneta piekļuve)
 GoToHelpPage=Lasīt palīdzību
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Ir īpaša palīdzības lapa, kas saistīta ar jūsu pašreizējo ekrānu
 HomePage=Mājas lapa
 RecordSaved=Ieraksts saglabāts
 RecordDeleted=Ieraksts dzēsts
@@ -201,7 +201,7 @@ ReOpen=Atvērt pa jaunu
 Upload=Augšupielādēt
 ToLink=Saite
 Select=Atlasīt
-SelectAll=Select all
+SelectAll=Izvēlēties visus
 Choose=Izvēlēties
 Resize=Samazināt
 ResizeOrCrop=Mainīt izmērus vai apgriezt
@@ -224,7 +224,7 @@ Value=Vērtība
 PersonalValue=Personīgā vērtība
 NewObject=Jauns %s
 NewValue=Jaunā vērtība
-OldValue=Old value %s
+OldValue=Vecā vērtība %s
 CurrentValue=Pašreizējā vērtība
 Code=Kods
 Type=Tips
@@ -263,7 +263,7 @@ Cards=Kartes
 Card=Karte
 Now=Tagad
 HourStart=Sākuma stunda
-Deadline=Deadline
+Deadline=Nodošanas laiks
 Date=Datums
 DateAndHour=Datums un laiks
 DateToday=Šodienas datums
@@ -272,12 +272,13 @@ DateStart=Sākuma datums
 DateEnd=Beigu datums
 DateCreation=Izveidošanas datums
 DateCreationShort=Izv. datums
-IPCreation=Creation IP
+IPCreation=Izveides IP
 DateModification=Labošanas datums
 DateModificationShort=Modif. datums
-IPModification=Modification IP
+IPModification=Modifikācijas IP
 DateLastModification=Jaunākais labošanas datums
 DateValidation=Apstiprināšanas datums
+DateSigning=Signing date
 DateClosing=Beigu datums
 DateDue=Izpildes datums
 DateValue=Valutēšanas datums
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Vienības cena (izņemot) (valūta)
 UnitPriceTTC=Vienības cena
 PriceU=UP
 PriceUHT=UP (neto)
-PriceUHTCurrency=ASV (valūta)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Summa
 AmountInvoice=Rēķina summa
@@ -389,6 +390,8 @@ AmountTotal=Kopējā summa
 AmountAverage=Vidējā summa
 PriceQtyMinHT=Cenu daudzums min. (bez nodokļiem)
 PriceQtyMinHTCurrency=Cenu daudzums min. (bez nodokļa) (valūta)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Procentuālā attiecība
 Total=Kopsumma
 SubTotal=Starpsumma
@@ -438,7 +441,7 @@ RemainToPay=Vēl jāsamaksā
 Module=Module/Application
 Modules=Moduļi/lietojumprogrammas
 Option=Iespējas
-Filters=Filters
+Filters=Filtri
 List=Saraksts
 FullList=Pilns saraksts
 FullConversation=Pilna saruna
@@ -656,7 +659,7 @@ SupplierPreview=Pārdevēja priekšskatījums
 ShowCustomerPreview=Rādīt klientu priekšskatījumu
 ShowSupplierPreview=Rādīt pārdevēja priekšskatījumu
 RefCustomer=Ref. klienta
-InternalRef=Internal ref.
+InternalRef=Iekšējā atsauce
 Currency=Valūta
 InfoAdmin=Informācija administratoriem
 Undo=Atcelt
@@ -724,7 +727,7 @@ MenuMembers=Dalībnieki
 MenuAgendaGoogle=Google darba kārtība
 MenuTaxesAndSpecialExpenses=Nodokļi | Īpašie izdevumi
 ThisLimitIsDefinedInSetup=Dolibarr robeža (Menu mājas uzstādīšana-drošība): %s Kb, PHP robeža: %s Kb
-NoFileFound=Neviens dokuments nav saglabāts šajā direktorijā
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Pašreizējā valoda
 CurrentTheme=Pašreizējā tēma
 CurrentMenuManager=Pašreizējais izvēlnes pārvaldnieks
@@ -899,8 +902,10 @@ ViewAccountList=Skatīt virsgrāmatu
 ViewSubAccountList=Skatīt apakškonta virsgrāmatu
 RemoveString=Noņemt virkni '%s'
 SomeTranslationAreUncomplete=Dažas piedāvātās valodas var būt tikai daļēji tulkotas vai var saturēt kļūdas. Lūdzu, palīdziet labot savu valodu, reģistrējoties <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a>, lai pievienotu savus uzlabojumus.
-DirectDownloadLink=Tiešā lejupielādes saite (publiska / ārēja)
-DirectDownloadInternalLink=Tiešā lejupielādes saite (ir jāreģistrē un tai ir nepieciešamas atļaujas).
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Lejupielādēt
 DownloadDocument=Lejupielādēt dokumentu
 ActualizeCurrency=Atjaunināt valūtas kursu
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontakti
 SearchIntoMembers=Dalībnieki
 SearchIntoUsers=Lietotāji
 SearchIntoProductsOrServices=Preces un pakalpojumi
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projekti
 SearchIntoMO=Ražošanas pasūtījumi
 SearchIntoTasks=Uzdevumi
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Tastatūras saīsne
 AssignedTo=Piešķirts
 Deletedraft=Dzēst melnrakstu
 ConfirmMassDraftDeletion=Projekta masveida dzēšanas apstiprinājums
-FileSharedViaALink=Fails koplietots, izmantojot saiti
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Vispirms izvēlieties trešo pusi ...
 YouAreCurrentlyInSandboxMode=Pašlaik esat %s "smilšu kastes" režīmā
 Inventory=Inventārs
 AnalyticCode=Analītiskais kods
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Rādīt vairāk informācijas
 NoFilesUploadedYet=Lūdzu, vispirms augšupielādējiet dokumentu
 SeePrivateNote=Skatīt privāto piezīmi
@@ -1113,10 +1120,12 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Drošības pilnvaras d
 UpToDate=Aktuāls
 OutOfDate=Novecojis
 EventReminder=Atgādinājums par notikumu
-UpdateForAllLines=Update for all lines
+UpdateForAllLines=Atjauninājums visām līnijām
 OnHold=On hold
-Civility=Civility
-AffectTag=Affect Tag
-ConfirmAffectTag=Bulk Tag Affect
-ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
+Civility=Laipnība
+AffectTag=Ietekmēt tagu
+ConfirmAffectTag=Masveida tagu ietekme
+ConfirmAffectTagQuestion=Vai tiešām vēlaties ietekmēt atlasītā (-o) ieraksta (-u) %s tagus?
+CategTypeNotFound=Ierakstu veidam nav atrasts neviens tagu tips
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/lv_LV/margins.lang b/htdocs/langs/lv_LV/margins.lang
index 1334860b81f..92c24a82dc9 100644
--- a/htdocs/langs/lv_LV/margins.lang
+++ b/htdocs/langs/lv_LV/margins.lang
@@ -22,7 +22,7 @@ ProductService=Produkts vai pakalpojums
 AllProducts=Visi produkti un pakalpojumi
 ChooseProduct/Service=Izvēlies preci vai pakalpojumu
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Maržinālā metode pasaules atlaides
 UseDiscountAsProduct=Kā produktu
 UseDiscountAsService=Kā pakalpojums
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index fdb1ac592bf..f8c18b6e851 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Saraksts projektu dalībnieki (tiks apstiprināts)
 MembersListValid=Derīgo dalībnieku saraksts
 MembersListUpToDate=Derīgu dalībnieku saraksts ar atjauninātu abonementu
 MembersListNotUpToDate=Derīgo dalībnieku saraksts ar novecojušu abonementu
+MembersListExcluded=List of excluded members
 MembersListResiliated=Dzēsto dalībnieku saraksts
 MembersListQualified=Saraksts kvalificētiem locekļiem
 MenuMembersToValidate=Projektu dalībnieki
 MenuMembersValidated=Apstiprināti biedri
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Izslēgtie dalībnieki
 MembersWithSubscriptionToReceive=Dalībniekiem ar abonementu, lai saņemtu
 MembersWithSubscriptionToReceiveShort=Abonēšana saņemt
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Abonements beidzies
 MemberStatusActiveLateShort=Beidzies
 MemberStatusPaid=Abonēšana atjaunināta
 MemberStatusPaidShort=Aktuāls
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Apturēts dalībnieks
 MemberStatusResiliatedShort=Izbeigta
 MembersStatusToValid=Projektu dalībnieki
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Izbeigti dalībnieki
 MemberStatusNoSubscription=Validēts (abonēšana nav nepieciešama)
 MemberStatusNoSubscriptionShort=Apstiprināts
@@ -80,8 +85,10 @@ DeleteType=Dzēst
 VoteAllowed=Balsot atļauts
 Physical=Fizisks
 Moral=Morāls
-MorAndPhy=Moral and Physical
+MorAndPhy=Morāls un fizisks
 Reenable=Atkārtoti ieslēdzams
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Izslēgt dalībnieku
 ConfirmResiliateMember=Vai tiešām vēlaties pārtraukt šo dalībnieku?
 DeleteMember=Dzēst dalībnieku
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-pasta veidne, kas jāizmanto, la
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-pasta veidne, ko izmanto, lai nosūtītu e-pastu dalībniekam jaunā abonēšanas ierakstā
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-pasta veidne, ko izmanto, lai nosūtītu e-pasta atgādinājumu, kad abonements drīz beigsies
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-pasta veidne, kas jāizmanto, lai nosūtītu e-pastu dalībniekam dalībnieka atcelšanas laikā
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sūtītāja e-pasts automātiskajiem e-pastiem
 DescADHERENT_ETIQUETTE_TYPE=Formāts etiķešu lapā
 DescADHERENT_ETIQUETTE_TEXT=Teksts drukāts uz dalībnieku adrešu lapām
@@ -162,6 +170,7 @@ DocForLabels=Izveidot adrešu lapas
 SubscriptionPayment=Abonēšanas maksa
 LastSubscriptionDate=Pēdējā abonēšanas maksājuma datums
 LastSubscriptionAmount=Jaunākās abonēšanas summa
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Dalībnieku statistika pa valstīm
 MembersStatisticsByState=Dalībnieku statistika pēc štatiem/provincēm
 MembersStatisticsByTown=Dalībnieku statistika pa pilsētām
@@ -177,7 +186,7 @@ MenuMembersStats=Statistika
 LastMemberDate=Pēdējā biedra datums
 LatestSubscriptionDate=Jaunākais piereģistrēšanās datums
 MemberNature=Dalībnieka raksturs
-MembersNature=Nature of members
+MembersNature=Locekļu raksturs
 Public=Informācija ir publiska
 NewMemberbyWeb=Jauns dalībnieks pievienots. Gaida apstiprinājumu
 NewMemberForm=Jauna dalībnieka forma
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 04eba6b459c..223e15e547e 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -40,7 +40,7 @@ PageForCreateEditView=PHP lapa, lai izveidotu / rediģētu / skatītu ierakstu
 PageForAgendaTab=PHP lappuse notikumu cilnē
 PageForDocumentTab=PHP lapas cilnei
 PageForNoteTab=PHP lapa piezīmju cilnē
-PageForContactTab=PHP page for contact tab
+PageForContactTab=PHP lapa kontaktu cilnei
 PathToModulePackage=Ceļš uz moduļa / pieteikuma pakotnes rāvienu
 PathToModuleDocumentation=Ceļš uz moduļa / lietojumprogrammas dokumentācijas failu (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces vai speciālās rakstzīmes nav atļautas.
@@ -106,7 +106,7 @@ TryToUseTheModuleBuilder=Ja jums ir zināšanas par SQL un PHP, jūs varat izman
 SeeTopRightMenu=Augšējā labajā izvēlnē skatiet <span class="fa fa-bug"></span>
 AddLanguageFile=Pievienot valodas failu
 YouCanUseTranslationKey=Šeit varat izmantot atslēgu, kas ir tulkošanas atslēga, kas tiek atrasta valodas failā (sk. Cilni "Valodas").
-DropTableIfEmpty=(Destroy table if empty)
+DropTableIfEmpty=(Iznīcināt tabulu, ja tā ir tukša)
 TableDoesNotExists=Tabula %s neeksistē
 TableDropped=Tabula %s dzēsta
 InitStructureFromExistingTable=Veidojiet esošās tabulas struktūras masīva virkni
@@ -133,11 +133,13 @@ IncludeDocGeneration=Es gribu no objekta ģenerēt dažus dokumentus
 IncludeDocGenerationHelp=Ja to atzīmēsit, tiks izveidots kāds kods, lai ierakstam pievienotu rūtiņu “Ģenerēt dokumentu”.
 ShowOnCombobox=Rādīt vērtību kombinētajā lodziņā
 KeyForTooltip=Rīka padoma atslēga
-CSSClass=CSS klase
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Nav rediģējams
 ForeignKey=Sveša atslēga
 TypeOfFieldsHelp=Lauku tips: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName: reliapath / to / classfile.class.php [: 1 [: filter]] ('1' nozīmē mēs pievienojam pogu + pēc kombināta, lai izveidotu ierakstu; “filtrs” var būt “status = 1 UN fk_user = __USER_ID UN entītija (piemēram, __SHARED_ENTITIES__)”.
 AsciiToHtmlConverter=Ascii uz HTML pārveidotāju
 AsciiToPdfConverter=Ascii uz PDF pārveidotāju
 TableNotEmptyDropCanceled=Tabula nav tukša. Dzēšana tika atcelta.
-ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ModuleBuilderNotAllowed=Moduļu veidotājs ir pieejams, bet nav atļauts jūsu lietotājam.
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 1276c32c910..e7e3c67ade4 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Veicot pasūtījumu
 MakeOrder=Veicot pasūtījumu
 SupplierOrder=Pirkuma pasūtījums
 SuppliersOrders=Pirkuma pasūtījumi
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Pašreizējie pirkumu pasūtījumi
 CustomerOrder=Pārdošanas pasūtījums
 CustomersOrders=Pārdošanas pasūtījumi
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 73b65a6e40b..2a1d6e280fb 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -78,7 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Izdevumu pārskats apstiprināts (nepieciešams a
 Notify_EXPENSE_REPORT_APPROVE=Izdevumu pārskats ir apstiprināts
 Notify_HOLIDAY_VALIDATE=Atteikt pieprasījumu apstiprināt (nepieciešams apstiprinājums)
 Notify_HOLIDAY_APPROVE=Atvaļinājuma pieprasījums apstiprināts
-Notify_ACTION_CREATE=Added action to Agenda
+Notify_ACTION_CREATE=Pievienoja darbību dienaskārtībai
 SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Skaits pievienotos failus / dokumentus
 TotalSizeOfAttachedFiles=Kopējais apjoms pievienotos failus / dokumentus
@@ -114,6 +114,7 @@ DemoCompanyAll=Uzņēmums ar vairākām darbībām (visi galvenie moduļi)
 CreatedBy=Izveidoja %s
 ModifiedBy=Laboja %s
 ValidatedBy=Apstiprināja %s
+SignedBy=Signed by %s
 ClosedBy=Slēdza %s
 CreatedById=Lietotāja id kurš izveidojis
 ModifiedById=Lietotāja id kurš veica pēdējās izmaiņas
@@ -216,7 +217,7 @@ EMailTextExpenseReportValidated=Izdevumu pārskats %s ir pārbaudīts.
 EMailTextExpenseReportApproved=Izdevumu pārskats %s ir apstiprināts.
 EMailTextHolidayValidated=Atstāt pieprasījumu %s ir apstiprināta.
 EMailTextHolidayApproved=Atstāt pieprasījumu %s ir apstiprināts.
-EMailTextActionAdded=The action %s has been added to the Agenda.
+EMailTextActionAdded=Darbība %s ir pievienota darba kārtībai.
 ImportedWithSet=Ievešanas datu kopu
 DolibarrNotification=Automātiska paziņošana
 ResizeDesc=Ievadiet jaunu platumu <b>vai</b> jaunu augstumu. Attiecība būs jātur laikā izmēru maiņas ...
@@ -244,6 +245,7 @@ NewKeyIs=Tas ir jūsu jaunās atslēgas, lai pieteiktos
 NewKeyWillBe=Jūsu jaunais galvenais, lai pieteiktos uz programmatūru, būs
 ClickHereToGoTo=Klikšķiniet šeit, lai dotos uz %s
 YouMustClickToChange=Jums ir Taču vispirms noklikšķiniet uz šīs saites, lai apstiprinātu šo paroles maiņa
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Ja Jums nav lūgt šīs izmaiņas, vienkārši aizmirst šo e-pastu. Jūsu akreditācijas dati tiek glabāti drošībā.
 IfAmountHigherThan=Ja summa pārsniedz  <strong>%s </strong>
 SourcesRepository=Repository for sources
@@ -261,7 +263,7 @@ ContactCreatedByEmailCollector=Kontaktpersona / adrese, ko izveidojis e-pasta ko
 ProjectCreatedByEmailCollector=Projekts, ko izveidojis e-pasta savācējs no e-pasta MSGID %s
 TicketCreatedByEmailCollector=Biļete, ko izveidojis e-pasta kolekcionārs no e-pasta MSGID %s
 OpeningHoursFormatDesc=Izmantojiet taustiņu -, lai nodalītu darba un aizvēršanas stundas. <br> Izmantojiet atstarpi, lai ievadītu dažādus diapazonus. <br> Piemērs: 8.-12
-PrefixSession=Prefix for session ID
+PrefixSession=Sesijas ID prefikss
 
 ##### Export #####
 ExportsArea=Eksportēšanas sadaļa
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
index 88e5c429844..56a27a10ebc 100644
--- a/htdocs/langs/lv_LV/productbatch.lang
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -1,24 +1,35 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Jā
+ManageLotSerial=Izmantot partijas / sērijas numuru
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusNotOnBatch=Nav (partija / sērijas numurs netiek izmantots)
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Nē
-Batch=Lot/Serial
+Batch=Lot/seriāls
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Partijas/sērijas numurs
 BatchNumberShort=Partija/Sērijas numurs
-EatByDate=Eat-by date
-SellByDate=Sell-by date
+EatByDate=Derīguma termiņš
+SellByDate=Derīguma termiņš
 DetailBatchNumber=Lot/Serial details
 printBatch=Lot/Serial: %s
 printEatby=Eat-by: %s
-printSellby=Sell-by: %s
+printSellby=Pārdeva: %s
 printQty=Daudz.: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=Kad modulis Lot / Serial ir ieslēgts, automātiskais krājumu samazinājums ir spiests "Samazināt reālo krājumus kuģošanas apstiprinājumā", un automātiskais palielināšanas režīms ir spiests "Palielināt reālos krājumus, manuāli nosūtīt uz noliktavām" un tos nevar rediģēt. Citas iespējas var definēt pēc vajadzības.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
+ProductLotSetup=Moduļu partijas / sērijas uzstādīšana
+ShowCurrentStockOfLot=Parādīt pašreizējo krājumu par pāris produktu / partiju
+ShowLogOfMovementIfLot=Rādīt žurnālu par kustību pāriem produktam / partijai
+StockDetailPerBatch=Krājumu dati par partiju
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 575c475d3b8..9341d32b295 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -108,8 +108,8 @@ FillWithLastServiceDates=Aizpildiet pēdējos pakalpojumu līnijas datumus
 MultiPricesAbility=Vairāki cenu segmenti katram produktam / pakalpojumam (katrs klients atrodas vienā cenu segmentā)
 MultiPricesNumPrices=Cenu skaits
 DefaultPriceType=Cenu bāze par saistību neizpildi (ar nodokli bez nodokļa), pievienojot jaunas pārdošanas cenas
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
+AssociatedProductsAbility=Iespējot komplektus (vairāku produktu komplekts)
+VariantsAbility=Iespējot variantus (produktu variācijas, piemēram, krāsa, izmērs)
 AssociatedProducts=Komplekti
 AssociatedProductsNumber=Produktu skaits, kas veido šo komplektu
 ParentProductsNumber=Number of parent packaging product
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=PVN likme (šim pārdevējam / produktam)
 DiscountQtyMin=Atlaide šim daudzumam.
 NoPriceDefinedForThisSupplier=Šim pārdevējam / produktam nav noteikta cena / daudzums
 NoSupplierPriceDefinedForThisProduct=Šim produktam nav noteikta pārdevēja cena / daudzums
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Iepriekš definēts produkts
 PredefinedServicesToSell=Iepriekš definēts pakalpojums
 PredefinedProductsAndServicesToSell=Iepriekš definēti produkti/pakalpojumi, kurus pārdot
@@ -168,10 +169,10 @@ BuyingPrices=Iepirkšanas cenas
 CustomerPrices=Klienta cenas
 SuppliersPrices=Pārdevēja cenas
 SuppliersPricesOfProductsOrServices=Pārdevēja cenas (produktiem vai pakalpojumiem)
-CustomCode=Customs|Commodity|HS code
+CustomCode=Muita | prece | HS kods
 CountryOrigin=Izcelsmes valsts
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
+RegionStateOrigin=Reģiona izcelsme
+StateOrigin=Valsts | Provinces izcelsme
 Nature=Produkta veids (materiāls / gatavs)
 NatureOfProductShort=Produkta veids
 NatureOfProductDesc=Izejviela vai gatavais produkts
@@ -242,7 +243,7 @@ AlwaysUseFixedPrice=Izmantot fiksētu cenu
 PriceByQuantity=Dažādas cenas apjomam
 DisablePriceByQty=Atspējot cenas pēc daudzuma
 PriceByQuantityRange=Daudzuma diapazons
-MultipriceRules=Automatic prices for segment
+MultipriceRules=Automātiskas cenas segmentam
 UseMultipriceRules=Izmantojiet cenu segmenta noteikumus (definēti produktu moduļa iestatījumos), lai automātiski aprēķinātu visu pārējo segmentu cenas saskaņā ar pirmo segmentu
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
@@ -290,7 +291,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Cenas veids
 PriceNumeric=Numurs
 DefaultPrice=Noklusējuma cena
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Iepriekšējo noklusēto cenu žurnāls
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Apakš produkti
 MinSupplierPrice=Minimālā iepirkuma cena
@@ -313,7 +314,7 @@ LastUpdated=Pēdējo reizi atjaunots
 CorrectlyUpdated=Pareizi atjaunināts
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Izvēlieties PDF failus
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Noklusējuma cena, reālā cena var būt atkarīga no klienta
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Vienība
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index d33723cf2ac..ca93cb7043e 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -85,10 +85,11 @@ ProgressCalculated=Progress patēriņa jomā
 WhichIamLinkedTo=ar kuru esmu saistīts
 WhichIamLinkedToProject=kuru esmu piesaistījis projektam
 Time=Laiks
-TimeConsumed=Consumed
+TimeConsumed=Patērēts
 ListOfTasks=Uzdevumu saraksts
 GoToListOfTimeConsumed=Pāriet uz patērētā laika sarakstu
 GanttView=Ganta skats
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Ar projektu saistīto komerciālo priekšlikumu saraksts
 ListOrdersAssociatedProject=Ar projektu saistīto pārdošanas pasūtījumu saraksts
 ListInvoicesAssociatedProject=Saraksts ar klienta rēķiniem, kas saistīti ar projektu
@@ -268,3 +269,7 @@ OneLinePerTask=Viena rinda katram uzdevumam
 OneLinePerPeriod=Viena rindiņa vienam periodam
 RefTaskParent=Ref. Vecāku uzdevums
 ProfitIsCalculatedWith=Peļņa tiek aprēķināta, izmantojot
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/lv_LV/propal.lang b/htdocs/langs/lv_LV/propal.lang
index 7ae48a997c1..868562cdf15 100644
--- a/htdocs/langs/lv_LV/propal.lang
+++ b/htdocs/langs/lv_LV/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Nosūtīt komerciālo priekšlikumu pa pastu
 DatePropal=Priekšlikuma datums
 DateEndPropal=Derīguma beigu datums
 ValidityDuration=Derīguma termiņš
-CloseAs=Iestatīt statusu uz
 SetAcceptedRefused=Iestatījums ir pieņemts / noraidīts
 ErrorPropalNotFound=Piedāvājums %s nav atrasts
 AddToDraftProposals=Pievienot pie priekšlikuma projektā
@@ -60,6 +59,7 @@ ConfirmClonePropal=Vai tiešām vēlaties klonēt komerciālo priekšlikumu <b>
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial priekšlikumu un līnijas
 ProposalLine=Priekšlikuma līnija
+ProposalLines=Proposal lines
 AvailabilityPeriod=Pieejamība kavēšanās
 SetAvailability=Uzstādīt pieejamību kavēšanos
 AfterOrder=pēc pasūtījuma
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Pārdevēja priekšlikumi statistikai
 CaseFollowedBy=Lieta seko
 SignedOnly=Tikai parakstīts
+IdProposal=Priekšlikuma ID
+IdProduct=Produkta ID
+PrParentLine=Priekšlikuma vecāku līnija
+LineBuyPriceHT=Pirkt cenu Summa bez nodokļiem līnijai
+
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 91412191b93..2f36be754a0 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -19,8 +19,8 @@ Stock=Krājums
 Stocks=Krājumi
 MissingStocks=Trūkst krājumu
 StockAtDate=Krājumi datumā
-StockAtDateInPast=Datums pagātnē
-StockAtDateInFuture=Datums nākotnē
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Krājumi pēc partijas/sērijas
 LotSerial=Daudz / sērijas nr
 LotSerialList=Partijas saraksts / sērijas nr
@@ -34,11 +34,11 @@ StockMovementForId=Pārvietošanas ID %d
 ListMouvementStockProject=Ar projektu saistīto krājumu kustību saraksts
 StocksArea=Noliktavas platība
 AllWarehouses=Visas noliktavas
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Iekļaujiet arī negatīvo krājumu ar nenoteiktu vēlamo krājumu
 IncludeAlsoDraftOrders=Iekļaujiet arī pasūtījumu projektus
 Location=Vieta
-LocationSummary=Īsais atrašanās vietas nosaukums
-NumberOfDifferentProducts=Dažādu produktu skaits
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Kopējais produktu skaits
 LastMovement=Pēdējā pārvietošana
 LastMovements=Pēdējās pārvietošanas
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Noliktavas vērtība
 UserWarehouseAutoCreate=Lietotāja noliktavas izveide, izveidojot lietotāju
 AllowAddLimitStockByWarehouse=Pārvaldiet arī minimālā un vēlamā krājuma vērtību pārī (produkta noliktava), papildus minimālā un vēlamā krājuma vērtībai vienam produktam
 RuleForWarehouse=Noteikumi noliktavām
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Iestatiet noliktavu pārdošanas pasūtījumiem
 UserDefaultWarehouse=Iestatiet noliktavu lietotājiem
 MainDefaultWarehouse=Noklusētā noliktava
@@ -97,15 +98,16 @@ RealStockDesc=Fiziskā / reālā krājumi ir krājumi, kas pašlaik atrodas noli
 RealStockWillAutomaticallyWhen=Reālais krājums tiks mainīts saskaņā ar šo noteikumu (kā noteikts Stock modulī):
 VirtualStock=Virtuālie krājumi
 VirtualStockAtDate=Virtuālais krājums datumā
-VirtualStockAtDateDesc=Virtuālais krājums, kad būs pabeigti visi neapstiprinātie pasūtījumi, kurus plānots veikt pirms datuma
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtuālais krājums ir aprēķinātais krājums, kas pieejams, kad visas atvērtās / neapstiprinātās darbības (kas ietekmē krājumus) ir aizvērtas (saņemti pirkumu pasūtījumi, nosūtīti pārdošanas pasūtījumi, saražoti ražošanas pasūtījumi utt.)
+AtDate=At date
 IdWarehouse=Id noliktava
 DescWareHouse=Apraksts noliktava
 LieuWareHouse=Lokālā noliktava
 WarehousesAndProducts=Noliktavas un produkti
 WarehousesAndProductsBatchDetail=Noliktavas un produkti (ar informāciju par partiju/sēriju)
 AverageUnitPricePMPShort=Vidējā svērtā cena
-AverageUnitPricePMPDesc=Vidējā vienības cena, kas mums bija jāmaksā piegādātājiem, lai produkts nonāktu mūsu noliktavā.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Pārdošanas Vienības cena
 EstimatedStockValueSellShort=Pārdošanas cena
 EstimatedStockValueSell=Pārdošanas cena
@@ -123,9 +125,9 @@ DesiredStockDesc=Šī krājuma summa būs vērtība, ko izmanto krājumu papildi
 StockToBuy=Lai pasūtītu
 Replenishment=Papildinājums
 ReplenishmentOrders=Papildināšanas pasūtījumus
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+VirtualDiffersFromPhysical=Saskaņā ar akciju opciju palielināšanu / samazināšanu fiziskais krājums un virtuālais krājums (fiziskais krājums + atvērtie pasūtījumi) var atšķirties
+UseRealStockByDefault=Papildināšanas funkcijai izmantojiet reālo krājumu, nevis virtuālos krājumus
+ReplenishmentCalculation=Pasūtījuma summa būs (vēlamais daudzums - reālais krājums), nevis (vēlamais daudzums - virtuālais krājums)
 UseVirtualStock=Izmantot virtuālu noliktavu
 UsePhysicalStock=Izmantot reālu noliktavu
 CurentSelectionMode=Pašreizējais izvēles režīms
@@ -145,7 +147,7 @@ Replenishments=Papildinājumus
 NbOfProductBeforePeriod=Produktu daudzums %s noliktavā pirms izvēlētā perioda (< %s)
 NbOfProductAfterPeriod=Produktu daudzums %s krājumā pēc izvēlētā perioda (>%s)
 MassMovement=Masveida pārvietošana
-SelectProductInAndOutWareHouse=Atlasiet avota noliktavu un mērķa noliktavu, produktu un daudzumu un pēc tam noklikšķiniet uz "%s". Kad tas ir izdarīts visām nepieciešamajām kustībām, noklikšķiniet uz "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Ierakstīt pārvietošanu
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Krājumu pārvietošana saglabāta
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Krājumu līmenim ir jābūt pietiekamam, lai produk
 StockMustBeEnoughForOrder=Krājuma līmenim ir jābūt pietiekamam, lai produktu / pakalpojumu pasūtītam pēc pasūtījuma (pārbaudiet, vai pašreizējā reālā krājumā tiek pievienota rinda, lai kāds būtu noteikums automātiskai krājumu maiņai).
 StockMustBeEnoughForShipment= Krājumu līmenim ir jābūt pietiekamam, lai produktu / pakalpojumu nosūtītu sūtījumam (pārbaudiet pašreizējo reālo krājumu, pievienojot līniju sūtījumā neatkarīgi no automātiskās krājumu maiņas)
 MovementLabel=Kustības marķējums
-TypeMovement=Kustības veids
+TypeMovement=Direction of movement
 DateMovement=Pārvietošanas datums
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Izveidot jaunu inventāru
 inventoryReadPermission=Skatīt krājumus
 inventoryWritePermission=Atjaunināt krājumus
 inventoryValidatePermission=Pārbaudīt inventāru
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventārs
 inventoryListTitle=Inventāri
 inventoryListEmpty=Netiek veikta neviena inventarizācija
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Lai izvēlētos izmantojamo partiju, ir nep
 ForceTo=Piespiest līdz
 AlwaysShowFullArbo=Parādiet pilnu noliktavas koku uznirstošajās noliktavu saitēs (Brīdinājums: tas var dramatiski samazināt veiktspēju)
 StockAtDatePastDesc=Šeit varat apskatīt krājumus (reālos krājumus) noteiktā datumā pagātnē
-StockAtDateFutureDesc=Šeit varat apskatīt krājumus (virtuālos krājumus) noteiktā datumā nākotnē
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Pašreizējais krājums
 InventoryRealQtyHelp=Iestatiet vērtību 0, lai atiestatītu daudzumu <br>. Saglabājiet lauku tukšu vai noņemiet līniju, lai paliktu nemainīgs
-UpdateByScaning=Atjauniniet, skenējot
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Atjaunināšana, skenējot (produkta svītrkods)
 UpdateByScaningLot=Atjaunināt, skenējot (partija | sērijas svītrkods)
-DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+DisableStockChangeOfSubProduct=Deaktivizējiet krājumu maiņu visiem šī komplekta apakšproduktiem šīs kustības laikā.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Atvērt pa jaunu
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 622db59bf5d..e4a2d1ba3df 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Pārdevēji
 SuppliersInvoice=Piegādātāja rēķins
+SupplierInvoices=Piegādātāja rēķini
 ShowSupplierInvoice=Rādīt piegādātāja rēķinu
 NewSupplier=Jauns pārdevējs
 History=Vēsture
@@ -38,7 +39,7 @@ MenuOrdersSupplierToBill=Pirkuma pasūtījumi rēķinam
 NbDaysToDelivery=Piegādes termiņš (dienas)
 DescNbDaysToDelivery=Šī pasūtījuma produktu ilgākais piegādes termiņš
 SupplierReputation=Pārdevēja reputācija
-ReferenceReputation=Reference reputation
+ReferenceReputation=Atsauces reputācija
 DoNotOrderThisProductToThisSupplier=Nepasūtīt
 NotTheGoodQualitySupplier=Zemas kvalitātes
 ReputationForThisProduct=Reputācija
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index 43c18d15509..1b104899e32 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Dzēsts
 # Dict
 Type=Veids
 Severity=Smagums
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Lai nosūtītu e-pastu no pieteikuma
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Parādiet moduļa logotipi publiskajā saskarnē
 TicketsShowModuleLogoHelp=Iespējojiet šo opciju, lai slēptu logotipa moduli publiskās saskarnes lapās
 TicketsShowCompanyLogo=Parādīt uzņēmuma logotipi publiskā saskarnē
 TicketsShowCompanyLogoHelp=Iespējojiet šo opciju, lai slēptu galvenā uzņēmuma logotipi publiskās saskarnes lapās
-TicketsEmailAlsoSendToMainAddress=Arī nosūtiet paziņojumu uz galveno e-pasta adresi
-TicketsEmailAlsoSendToMainAddressHelp=Iespējojiet šo opciju, lai nosūtītu e-pastu uz adresi "Paziņojuma e-pasta adrese" (skatiet iestatījumu zemāk).
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Ierobežot displeju līdz pašreizējam lietotājam piešķirtajām biļetēm (nav efektīvs ārējiem lietotājiem, vienmēr ierobežojiet to ar trešo personu, kurai tie ir atkarīgi)
 TicketsLimitViewAssignedOnlyHelp=Tiks redzamas tikai pašreizējam lietotājam piešķirtās biļetes. Neattiecas uz lietotāju ar biļešu pārvaldīšanas tiesībām.
 TicketsActivatePublicInterface=Aktivizēt publisko saskarni
@@ -123,13 +125,13 @@ TicketsActivatePublicInterfaceHelp=Publiskā saskarne ļauj apmeklētājiem izve
 TicketsAutoAssignTicket=Automātiski piešķirt lietotāju, kas izveidojis biļeti
 TicketsAutoAssignTicketHelp=Veidojot biļeti, lietotājs var automātiski piešķirt biļeti.
 TicketNumberingModules=Čeku numerācijas modulis
-TicketsModelModule=Document templates for tickets
+TicketsModelModule=Biļešu dokumentu veidnes
 TicketNotifyTiersAtCreation=Paziņot trešajai pusei radīšanas laikā
 TicketsDisableCustomerEmail=Vienmēr atspējojiet e-pasta ziņojumus, ja biļete tiek veidota no publiskās saskarnes
-TicketsPublicNotificationNewMessage=Sūtiet e-pastu (s), kad tiek pievienots jauns ziņojums
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Sūtiet e-pastu (s), kad no publiskās saskarnes tiek pievienots jauns ziņojums (piešķirtajam lietotājam vai paziņojumu e-pastu uz (atjaunināt) un / vai paziņojumu e-pastu uz)
 TicketPublicNotificationNewMessageDefaultEmail=Paziņojumu e-pasts adresātam (atjaunināt)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Sūtiet pa e-pastu jaunu ziņojumu paziņojumus uz šo adresi, ja biļetei nav piešķirts lietotājs vai lietotājam nav e-pasta.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Jaunākie labotie pieteikumi
 BoxLastModifiedTicketDescription=Jaunākās %s lanbotās biļetes
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Nav nesen labotu pieteikumu
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index ad46b5bbf5a..a654848e06a 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -72,7 +72,7 @@ ExportDataset_user_1=Lietotāji un to īpašības
 DomainUser=Domēna lietotājs %s
 Reactivate=Aktivizēt
 CreateInternalUserDesc=Šī veidlapa ļauj izveidot iekšējo lietotāju savā uzņēmumā/organizācijā. Lai izveidotu ārēju lietotāju (klientu, pārdevēju utt.), Izmantojiet trešās puses kontakta kartītes pogu “Izveidot Dolibarr lietotāju”.
-InternalExternalDesc=<b> iekšējais </b> lietotājs ir lietotājs, kas ietilpst jūsu uzņēmumā / organizācijā. <br> <b> ārējais </b> lietotājs ir klients, pārdevējs vai cits (Ārēja lietotāja izveidošanu trešai personai var veikt no trešās puses kontaktu ieraksta). <br> <br> Abos gadījumos atļaujas nosaka tiesības uz Dolibarr, arī ārējam lietotājam var būt atšķirīgs izvēlnes pārvaldnieks nekā iekšējam lietotājam (sk. Sākums - Iestatīšana - Displejs).
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Atļauja piešķirta, jo mantojis no viena lietotāja grupai.
 Inherited=Iedzimta
 UserWillBe=Izveidotais lietotājs būs
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 42971c9e293..af85a06422d 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Piemērs izmantošanai Apache virtuālā resursdatora iestatīšanā:
 YouCanAlsoTestWithPHPS=<u> Izmantojiet ar PHP serveri. </u> <br> Izstrādājot vidi, jūs varat izvēlēties testēt vietni ar PHP tīmekļa serveri (nepieciešams PHP 5.5), palaižot <br><strong> php -S 0.0. 0.0 8080-t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Izmantojiet savu vietni kopā ar citu Dolibarr mitināšanas pakalpojumu sniedzēju</u> <br> Ja jums nav pieejams tāds interneta serveris kā Apache vai NGinx, varat eksportēt un importēt savu vietni citā Dolibarr instancē, kuru nodrošina cits Dolibarr mitināšanas pakalpojumu sniedzējs un kas nodrošina pilnīgu integrāciju ar vietnes moduli. Dažu Dolibarr mitināšanas pakalpojumu sniedzēju sarakstu varat atrast vietnē <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Pārbaudiet arī to, vai virtuālajam serverim ir atļauja <strong>%s</strong> failiem vietnē <br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Lasīt
 WritePerm=Rakstīt
 TestDeployOnWeb=Pārbaudiet / izvietojiet tīmeklī
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u> Priekšskatīt %s jaunā cilnē. </ u> <br> <br> Dolibarr serveris izsniegs %s, tāpēc tam nevajadzēs instalēt papildu tīmekļa serveri (piemēram, Apache, Nginx, IIS). < br> Nelabvēlīgi ir tas, ka lapu URL nav lietotājam draudzīgs un sākas ar jūsu Dolibarr ceļu. <br> URL, ko izsniedz Dolibarr: <br> <strong> %s </ strong> <br> <br> Lai izmantotu savu ārējais tīmekļa serveris, kas kalpo šai vietnei, izveido virtuālo saimniekdatoru savā tīmekļa serverī, kas norādīts direktorijā <br> <strong> %s </ strong> <br>, pēc tam ievadiet šī virtuālā servera nosaukumu un noklikšķiniet uz citas priekšskatījuma pogas .
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=Virtuālā resursdatora adrese, kuru apkalpo ārējs tīmekļa serveris, nav definēts
 NoPageYet=Vēl nav nevienas lapas
 YouCanCreatePageOrImportTemplate=Jūs varat izveidot jaunu lapu vai importēt pilnu vietnes veidni
@@ -100,7 +100,7 @@ EmptyPage=Tukša lapa
 ExternalURLMustStartWithHttp=Ārējam URL ir jāsākas ar http: // vai https: //
 ZipOfWebsitePackageToImport=Augšupielādējiet vietnes veidņu pakotnes ZIP failu
 ZipOfWebsitePackageToLoad=vai izvēlieties pieejamo iegultās vietnes veidņu paketi
-ShowSubcontainers=Show dynamic content
+ShowSubcontainers=Rādīt dinamisko saturu
 InternalURLOfPage=Lapas iekšējais URL
 ThisPageIsTranslationOf=Šī lapa / konteiners ir tulkojums
 ThisPageHasTranslationPages=Šajā lapā / konteinerā ir tulkojums
@@ -135,5 +135,13 @@ RSSFeed=RSS barotne
 RSSFeedDesc=Izmantojot šo URL, varat iegūt RSS plūsmu no jaunākajiem rakstiem ar veidu “blogpost”
 PagesRegenerated=reģenerēta %s lapa (s) / konteiners (-i)
 RegenerateWebsiteContent=Atjaunojiet tīmekļa vietnes kešatmiņas failus
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+AllowedInFrames=Atļauts rāmjos
+DefineListOfAltLanguagesInWebsiteProperties=Vietņu rekvizītos definējiet visu pieejamo valodu sarakstu.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/lv_LV/zapier.lang b/htdocs/langs/lv_LV/zapier.lang
index 01aa75944cb..c524a9afb6f 100644
--- a/htdocs/langs/lv_LV/zapier.lang
+++ b/htdocs/langs/lv_LV/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier priekš Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Par zapier Dolibarr moduli
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Zapier iestatīšana Dolibarr
-ZapierDescription=Interface with Zapier
+ZapierForDolibarrSetup=Zapier iestatīšana Dolibarr
+ZapierDescription=Saskarne ar Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 9940d0fea92..ea5914defc9 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index b6770cce1bb..95637c0e773 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Производи
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 17caf495566..8763554c1a2 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index 1391d39e8e9..998873668db 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -52,11 +52,12 @@ Invoices=Фактури
 InvoiceLine=Invoice line
 InvoiceCustomer=Фактура на клиент
 CustomerInvoice=Фактура на клиент
-CustomersInvoices=Customers invoices
+CustomersInvoices=Фактури на клиенти
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Фактури на добавувачи
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Фактури на добавувачи
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
index 36416e0f36c..00aa55643c7 100644
--- a/htdocs/langs/mk_MK/boxes.lang
+++ b/htdocs/langs/mk_MK/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Информации за логирање
 BoxLastRssInfos=RSS информација
 BoxLastProducts=Најнови %s Производи / Услуги
@@ -17,9 +18,13 @@ BoxLastActions=Најнови активности
 BoxLastContracts=Најнови договори
 BoxLastContacts=Најнови контакти/адреси
 BoxLastMembers=Најнови членови
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Најнови интервенции
 BoxCurrentAccounts=Состојба на сметка
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Најнови %s новости од %s
 BoxTitleLastProducts=Производи/Услуги: најнови %sизменети
 BoxTitleProductsAlertStock=Производи: предупредување за залиха
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Сметководство
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index 52327db3510..cb184028464 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 2d27d1b69a4..08beacc3f25 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/mk_MK/ecm.lang b/htdocs/langs/mk_MK/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/mk_MK/ecm.lang
+++ b/htdocs/langs/mk_MK/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/mk_MK/externalsite.lang b/htdocs/langs/mk_MK/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/mk_MK/externalsite.lang
+++ b/htdocs/langs/mk_MK/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 5f2722a96ff..4eeeea5c4d3 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Корисници
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Корисници
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Доделен на
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/mk_MK/margins.lang b/htdocs/langs/mk_MK/margins.lang
index b9d52dcfdc6..cfce89ab23e 100644
--- a/htdocs/langs/mk_MK/margins.lang
+++ b/htdocs/langs/mk_MK/margins.lang
@@ -1,44 +1,45 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
+Margin=Маргина
+Margins=Маргини
+TotalMargin=Вкупна Маргина
+MarginOnProducts=Маргина / Производи
+MarginOnServices=Маргина / Услуги
+MarginRate=Стапка на маргина
 MarkRate=Mark rate
 DisplayMarginRates=Display margin rates
 DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
-UserMargins=User margins
-ProductService=Product or Service
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
+InputPrice=Влезна цена
+margin=Управување со профитните маржи (маргини)
+margesSetup=Подесување за профитните маргини
+MarginDetails=Детали за маргините
+ProductMargins=Маргина на производ
+CustomerMargins=Маргина на клиент
+SalesRepresentativeMargins=Маргина на продажен агент
+ContactOfInvoice=Contact of invoice
+UserMargins=Маргина на корисник
+ProductService=Производ или Услуга
+AllProducts=Сите Производи и Услуги
+ChooseProduct/Service=Одбери Производ или Услуга
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
+UseDiscountAsProduct=Како Производ
+UseDiscountAsService=Како Услуга
+UseDiscountOnTotal=На СУБТОТАЛ
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
-CostPrice=Cost price
+MargeType3=Маргина на Цената на чинење
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
+CostPrice=Цена на чинење
 UnitCharges=Unit charges
 Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+AgentContactType=Тип на контакт за комерцијалист
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+rateMustBeNumeric=Стапката мора да биде нумеричка вредност
+markRateShouldBeLesserThan100=Стапката на ознака треба да биде помала од 100
+ShowMarginInfos=Покажи информации за Маргина
+CheckMargins=Детали за Маргините
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index 3f292176083..e83f0e44759 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Список на предлог-членови (што тр
 MembersListValid=Листа на валидни членови
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=Листа на исклучени членови
 MembersListQualified=Листа на квалификувани членови
 MenuMembersToValidate=Предлог членови
 MenuMembersValidated=Валидни членови
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Исклучени членови
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Истечена претплата
 MemberStatusActiveLateShort=Истечен
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Исклучен член
 MemberStatusResiliatedShort=Исклучен
 MembersStatusToValid=Предлог членови
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Исклучени членови
 MemberStatusNoSubscription=Потврдено (нема потреба од претплата)
 MemberStatusNoSubscriptionShort=Валидирано
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/mk_MK/modulebuilder.lang b/htdocs/langs/mk_MK/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/mk_MK/modulebuilder.lang
+++ b/htdocs/langs/mk_MK/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
index e4280056461..6486bfe423d 100644
--- a/htdocs/langs/mk_MK/orders.lang
+++ b/htdocs/langs/mk_MK/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Phone
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/mk_MK/productbatch.lang
+++ b/htdocs/langs/mk_MK/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 6deddbe7334..9b980716330 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/mk_MK/propal.lang b/htdocs/langs/mk_MK/propal.lang
index 93d5926a7bb..efc76e36c4a 100644
--- a/htdocs/langs/mk_MK/propal.lang
+++ b/htdocs/langs/mk_MK/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 2b36b21b77a..d5de0203ece 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
index 2e78526a9ed..4e7cb54ca03 100644
--- a/htdocs/langs/mk_MK/suppliers.lang
+++ b/htdocs/langs/mk_MK/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Фактури на добавувачи
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/mk_MK/ticket.lang b/htdocs/langs/mk_MK/ticket.lang
index 8b74414e186..5b6dab8eefd 100644
--- a/htdocs/langs/mk_MK/ticket.lang
+++ b/htdocs/langs/mk_MK/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/mk_MK/users.lang
+++ b/htdocs/langs/mk_MK/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/mk_MK/zapier.lang b/htdocs/langs/mk_MK/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/mk_MK/zapier.lang
+++ b/htdocs/langs/mk_MK/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index f9a6468d94a..8f4508ada53 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/mn_MN/boxes.lang b/htdocs/langs/mn_MN/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/mn_MN/boxes.lang
+++ b/htdocs/langs/mn_MN/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/mn_MN/categories.lang b/htdocs/langs/mn_MN/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/mn_MN/categories.lang
+++ b/htdocs/langs/mn_MN/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index 8dc815b522e..154400c6536 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/mn_MN/ecm.lang b/htdocs/langs/mn_MN/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/mn_MN/ecm.lang
+++ b/htdocs/langs/mn_MN/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/mn_MN/externalsite.lang b/htdocs/langs/mn_MN/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/mn_MN/externalsite.lang
+++ b/htdocs/langs/mn_MN/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index 5cf9981a8a0..888daf47649 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/mn_MN/margins.lang b/htdocs/langs/mn_MN/margins.lang
index b9d52dcfdc6..ad5406409b4 100644
--- a/htdocs/langs/mn_MN/margins.lang
+++ b/htdocs/langs/mn_MN/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/mn_MN/modulebuilder.lang b/htdocs/langs/mn_MN/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/mn_MN/modulebuilder.lang
+++ b/htdocs/langs/mn_MN/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/mn_MN/orders.lang b/htdocs/langs/mn_MN/orders.lang
index 503955cf5f0..87d196eb22f 100644
--- a/htdocs/langs/mn_MN/orders.lang
+++ b/htdocs/langs/mn_MN/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Phone
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/mn_MN/productbatch.lang b/htdocs/langs/mn_MN/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/mn_MN/productbatch.lang
+++ b/htdocs/langs/mn_MN/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/mn_MN/propal.lang b/htdocs/langs/mn_MN/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/mn_MN/propal.lang
+++ b/htdocs/langs/mn_MN/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/mn_MN/suppliers.lang b/htdocs/langs/mn_MN/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/mn_MN/suppliers.lang
+++ b/htdocs/langs/mn_MN/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/mn_MN/ticket.lang b/htdocs/langs/mn_MN/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/mn_MN/ticket.lang
+++ b/htdocs/langs/mn_MN/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/mn_MN/users.lang b/htdocs/langs/mn_MN/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/mn_MN/users.lang
+++ b/htdocs/langs/mn_MN/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/mn_MN/zapier.lang b/htdocs/langs/mn_MN/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/mn_MN/zapier.lang
+++ b/htdocs/langs/mn_MN/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index bc97267e787..df6bcaaf778 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bundne fakturalinjer
 ExpenseReportLines=Utgiftsrapport-linjer som skal bindes
 ExpenseReportLinesDone=Bundne utgiftsrapport-linjer
 IntoAccount=Bind linje med regnskapskonto
-TotalForAccount=Totalt for regnskapskonto
+TotalForAccount=Antall regnskapskonti
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journaletikett
 NumPiece=Del nummer
 TransactionNumShort=Transaksjonsnummer
-AccountingCategory=Personlige grupper
+AccountingCategory=Custom group
 GroupByAccountAccounting=Gruppere etter hovedbokskonto
 GroupBySubAccountAccounting=Gruppere etter sub-hovedbokskonto
 AccountingAccountGroupsDesc=Her kan du definere noen grupper regnskapskonti. De vil bli brukt til personlige regnskapsrapporter.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Linjer som ennå ikke er bundet, bruk menyen <a href=
 
 ## Import
 ImportAccountingEntries=Regnskapsposter
+ImportAccountingEntriesFECFormat=Regnskapsoppføringer - FEC-format
+FECFormatJournalCode=Kodejournal (JournalCode)
+FECFormatJournalLabel=Etikettjournal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Dato eksport
 WarningReportNotReliable=Advarsel, denne rapporten er ikke basert på hovedboken, så den inneholder ikke transaksjoner endret manuelt i hovedboken. Hvis journaliseringen din er oppdatert, er bokføringsvisningen mer nøyaktig.
 ExpenseReportJournal=Utgiftsrapport-journal
 InventoryJournal=Inventar-journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index a839e55d031..61da8abc721 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Fjern forbindelseslås
 YourSession=Din økt
 Sessions=Brukers økter
 WebUserGroup=Webserver bruker/gruppe
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Tillatelser for filer i rotkatalogen på web
 PermissionsOnFile=Tillatelser på fil %s
 NoSessionFound=Din PHP-konfigurasjon ser ut til å ikke tillate oppføring av aktive økter. Mappen som brukes til å lagre økter (<b> %s </b>) kan være beskyttet (for eksempel av operativsystemer eller ved hjelp av PHP-direktivet open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Merk: Ja er bare effektiv hvis modulen <b>%s</b> er aktivert
 RemoveLock=Fjern/endre navn på filen <b>%s</b> hvis den eksisterer, for å tillate bruk av oppdaterings-/installeringsverktøyet.
 RestoreLock=Gjenopprett filen <b>%s</b> med kun leserettigheter, for å deaktivere bruk av oppdateringsverktøyet.
 SecuritySetup=Sikkerhetsinnstillinger
+PHPSetup=PHP setup
 SecurityFilesDesc=Her defineres valg relatert til sikkerhet ved opplasting av filer.
 ErrorModuleRequirePHPVersion=Feil: Denne modulen krever PHP versjon %s eller høyere
 ErrorModuleRequireDolibarrVersion=Feil: Denne modulen krever Dolibarr versjon %s eller høyere
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Dette området viser administrasjonsfunksjoner. Bruk menyen
 Purge=Utrenskning
 PurgeAreaDesc=Denne siden lar deg slette alle filer som er generert eller lagret av Dolibarr (midlertidige filer eller alle filer i katalogen <b> %s </b>). Bruk av denne funksjonen er normalt ikke nødvendig. Den leveres som en løsning for brukere hvis Dolibarr er vert for en leverandør som ikke tilbyr tillatelser for å slette filer generert av webserveren.
 PurgeDeleteLogFile=Slett loggfiler, inkludert <b>%s</b> definert for Syslog-modulen (ingen risiko for å miste data)
-PurgeDeleteTemporaryFiles=Slett alle loggfiler og midlertidige filer (ingen risiko for å miste data). Merk: Sletting av midlertidige filer gjøres bare hvis temp-katalogen ble opprettet for mer enn 24 timer siden.
+PurgeDeleteTemporaryFiles=Slett alle logg- og midlertidige filer (ingen risiko for å miste data). Parameteren kan være 'tempfilesold', 'logfiles' eller begge 'tempfilesold + logfiles'. Merk: Sletting av midlertidige filer gjøres bare hvis temp-katalogen ble opprettet for mer enn 24 timer siden.
 PurgeDeleteTemporaryFilesShort=Slett loggfiler og midlertidige filer
 PurgeDeleteAllFilesInDocumentsDir=Slett alle filer i katalogen: <b> %s </b>. <br> Dette vil slette alle genererte dokumenter relatert til elementer (tredjeparter, fakturaer etc ...), filer lastet opp i ECM-modulen, database backup dumper og midlertidig filer.
 PurgeRunNow=Start utrenskning
@@ -232,6 +234,7 @@ BoxesAvailable=Tilgjengelige widgeter
 BoxesActivated=Aktiverte widgeter
 ActivateOn=Aktivert på
 ActiveOn=Aktivert på
+ActivatableOn=Aktiverbar på
 SourceFile=Kildefil
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Tilgjengelig bare hvis Javascript og Ajax er aktivert
 Required=Påkrevet
@@ -314,7 +317,7 @@ ModulesSetup=Moduler/Applikasjonsoppsett
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relationship Management (CRM)
 ModuleFamilySrm=Vendor Relationship Management (VRM)
-ModuleFamilyProducts=Produktledelse (PM)
+ModuleFamilyProducts=Varehåndtering (PM)
 ModuleFamilyHr=Human Resource Management (HRM)
 ModuleFamilyProjects=Prosjekter/Samarbeid
 ModuleFamilyOther=Annet
@@ -347,9 +350,10 @@ 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 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>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Alle andre tegn i masken vil være intakt. <br> Mellomrom er ikke tillatt. <br>
+GenericMaskCodes3EAN=Alle andre tegn i masken forblir intakte (unntatt * eller ? I 13. posisjon i EAN13). <br> Mellomrom er ikke tillatt. <br> I EAN13 skal det siste tegnet etter det siste} i 13. posisjon være * eller? . Den vil bli erstattet av den beregnede nøkkelen. <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>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Hvis dette feltet er tomt, vil denne verdien bli lag
 ExtrafieldParamHelpselect=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1<br>2,verdi2<br>kode3,verdi3<br>...<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>1,verdi1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>: parent_key<br><br>For å få listen avhengig av en annen liste:<br>1,verdi1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
 ExtrafieldParamHelpradio=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
-ExtrafieldParamHelpsellist=Liste over verdier kommer fra en tabell <br> Syntaks: table_name:label_field:id_field::filter<br> Eksempel: c_typent:libelle:id::filter<br><br> - id_field er nødvendigvis en primær nøkkel<br> Filter kan være en enkel test (f.eks active=1) for å vise bare aktiv verdi <br> Du kan også bruke $ID$ i filteret som er gjeldende id for gjeldende objekt <br> For å bruke en SELECT i filteret, bruk nøkkelordet $SEL$ for å omgå anti-injeksjonsbeskyttelse. <br> Hvis du vil filtrere på ekstrafelt, bruk syntaks ekstra.fieldcode=... (hvor feltkode er koden til extrafield) <br> <br> For å ha listen avhengig av en annen utfyllende attributtliste: <br>c_typent:libelle:id:options_12<i> parent_list_code </i>|parent_column:filter <br><br> For å ha listen avhengig av en annen liste: <br> c_typent:libelle:id:<br>parent_list_code<br>|parent_column:filter\n 
-ExtrafieldParamHelpchkbxlst=Liste over verdier kommer fra en tabell <br> Syntaks: table_name:label_field:id_field::filter <br> Eksempel: c_typent:libelle:id::filter<br><br> filter kan være en enkel test (f.eks. Aktiv=1 ) for å vise bare aktiv verdi<br>Du kan også bruke $ID$ i filter, som er gjeldende ID for nåværende objekt<br>For å utføre en SELECT i filter, bruk $SEL$<br>Hvis du vil filtrere på ekstrafeltbruk bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code </i> |parent_column:filter<br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code</i> |parent_column:filter
+ExtrafieldParamHelpsellist=Liste over verdier kommer fra en tabell<br>Syntax: table_name:label_field:id_field::filtersql<br>Eksempel: c_typent:libelle:id::filtersql<br><br>- id_field er nødvendigvis en primær int-nøkkel<br>- filtersql er en SQL-tilstand. Det kan være en enkel test (f.eks. active=1) for å bare vise aktiv verdi<br>Du kan også bruke $ID$ i filteret som er gjeldende id for gjeldende objekt<br>For å bruke et SELECT i filteret, bruk nøkkelordet $SEL$ for å omgå beskyttelse mot injeksjon.<br>Hvis du vil filtrere på ekstrafelt, bruk syntaksen  extra.fieldcode=... (hvor feltkode er koden til ekstrafeltet)<br><br>For å ha listen avhengig av en annen komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>For å ha listen avhengig av en annen liste: <br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Liste over verdier kommer fra en tabell<br>Syntax: table_name:label_field:id_field::filtersql<br>Eksempel: c_typent:libelle:id::filtersql<br><br>filteret kan være en enkel test (f.eks active=1) for kun å vise aktive verdier<br>Du kan også bruke $ID$ i filtre, som er gjeldende ID for gjeldende objekt<br>For å utføre SELECT i filter, bruk $SEL$<br>Hvis du vil filtrere ekstrafelte, bruk syntaks extra.fieldcode=... (der feltkode er koden til ekstrafeltet)<br><br>For å ha listen avhengig av en annen komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>For å ha listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametere må være ObjectName:Classpath <br> Syntaks: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Hold tomt for en enkel separator <br> Sett dette til 1 for en kollaps-separator (åpnes som standard for ny økt, da beholdes status for hver brukerøkt) <br> Sett dette til 2 for en kollaps-separator (kollapset som standard for ny økt, da holdes status foran hver brukerøkt)
 LibraryToBuildPDF=Bibliotek brukt for PDF-generering
@@ -541,6 +545,8 @@ Module40Name=Leverandører
 Module40Desc=Leverandører og innkjøpshåndtering (innkjøpsordrer og fakturering av leverandørfakturaer)
 Module42Name=Feilsøkingslogger
 Module42Desc=Loggfunksjoner (fil, syslog, ...). Slike logger er for tekniske/feilsøkingsformål.
+Module43Name=Debug Bar
+Module43Desc=Et utviklerverktøy for å legge til en feilsøkingslinje i nettleseren din.
 Module49Name=Redigeringsprogram
 Module49Desc=Behandling av redigeringsprogram
 Module50Name=Varer
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteringsegenskaper
 Module3200Name=Uforanderlige arkiver
 Module3200Desc=Aktiver en uforanderlig logg over forretningshendelser. Hendelser arkiveres i sanntid. Loggen er en skrivebeskyttet tabell med kjedede hendelser som kan eksporteres. Denne modulen kan være obligatorisk for enkelte land.
+Module3400Name=Sosiale nettverk
+Module3400Desc=Aktiver felt for sosiale nettverk i tredjeparter og adresser (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=HRM (håndtering av avdeling, arbeidskontrakter og personell)
 Module5000Name=Multi-selskap
 Module5000Desc=Lar deg administrere flere selskaper
-Module6000Name=Arbeidsflyt
-Module6000Desc=Arbeidsflytbehandling (automatisk opprettelse av objekt og/eller automatisk statusendring)
+Module6000Name=Intermoduler Arbeidsflyt
+Module6000Desc=Arbeidsflytstyring mellom forskjellige moduler (automatisk oppretting av objekt og/eller automatisk statusendring)
 Module10000Name=Websider
 Module10000Desc=Lag nettsteder (offentlige) med en WYSIWYG-redigerer. Dette er en webmaster eller utviklerorientert CMS (det er bedre å kunne HTML og CSS språk). Bare konfigurer webserveren din (Apache, Nginx, ...) for å peke på den dedikerte Dolibarr-katalogen for å ha den online på internett med ditt eget domenenavn.
 Module20000Name=Håndtering av permisjonsforespørsler
@@ -805,7 +813,8 @@ PermissionAdvanced253=Opprett/endre interne/eksterne brukere og tillatelser
 Permission254=Opprett/modifiser kun eksterne brukere
 Permission255=Opprett/endre egen brukerinformasjon
 Permission256=Slett eller deaktiver andre brukere
-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).
+Permission262=Utvid tilgangen til alle tredjeparter OG deres objekter (ikke bare tredjeparter som brukeren er salgsrepresentant for). <br> Ikke effektiv for eksterne brukere (alltid begrenset til seg selv for tilbud, ordre, fakturaer, kontrakter osv.). <br> Ikke effektiv for prosjekter (bare regler for prosjekttillatelser, synlighet og oppgaver).
+Permission263=Utvid tilgangen til alle tredjeparter UTEN deres objekter (ikke bare tredjeparter som brukeren er salgsrepresentant for). <br> Ikke effektiv for eksterne brukere (alltid begrenset til seg selv for tilbud, ordre, fakturaer, kontrakter osv.). <br> Ikke effektiv for prosjekter (bare regler for prosjekttillatelser, synlighet og oppgaver).
 Permission271=Vis CA
 Permission272=Vis fakturaer
 Permission273=Opprett fakturaer
@@ -1175,7 +1184,8 @@ SetupDescription2=Følgende to seksjoner er obligatoriske (de to første oppfør
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Grunnleggende parametere som brukes til å tilpasse standardoppførselen til applikasjonen din (for eksempel landrelaterte funksjoner).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br> Denne programvaren er en serie med mange moduler/applikasjoner. Modulene relatert til dine behov må være aktivert og konfigurert. Menyoppføringer vises ved aktivering av disse modulene.
 SetupDescription5=Annet oppsett menyoppføringer styrer valgfrie parametere.
-LogEvents=Hendelser relatert til sikkerhet
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Revisjon
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om nettleser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Kjøring av oppgraderingen ser ut til å være
 YouMustRunCommandFromCommandLineAfterLoginToUser=Du må kjøre denne kommandoen fra kommandolinjen etter innlogging til et skall med brukeren <b>%s.</b>
 YourPHPDoesNotHaveSSLSupport=SSL funksjoner ikke tilgjengelige i din PHP
 DownloadMoreSkins=Flere skins å laste ned
-SimpleNumRefModelDesc=Returner referansenummeret med format %syymm-nnnn der åå er år, er mm måned og nnnn er en sekvens uten hull og uten tilbakestilling
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Vis Profesjonell ID med adresser
 ShowVATIntaInAddress=Skjul intra-Community MVA-numre med adresse
 TranslationUncomplete=Delvis oversettelse
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy-server: Navn/adresse
 MAIN_PROXY_PORT=Proxy-server: Port
 MAIN_PROXY_USER=Proxy-server: Log-in/bruker
 MAIN_PROXY_PASS=Proxy-server: Passord
-DefineHereComplementaryAttributes=Her kan du definere noen ekstra/egendefinerte attributter som du vil inkludere for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Komplementære attributter
 ExtraFieldsLines=Utfyllende attributter (linjer)
 ExtraFieldsLinesRec=Komplementære attributter (fakturalinjermaler )
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Eksempel: uid
 LDAPFilterConnection=Søkefilter
 LDAPFilterConnectionExample=Eksempel : &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Eksempel : samaccountname
 LDAPFieldFullname=Fullt navn
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Ditt firma er definert til ikke å bruke MVA (Hjem - Op
 AccountancyCode=Regnskapskode
 AccountancyCodeSell=Kontokode for salg
 AccountancyCodeBuy=Kontokode for innkjøp
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Hold avkrysningsboksen "Opprett automatisk betalingen" tom som standard når du oppretter en ny avgift
 ##### Agenda #####
 AgendaSetup=Innstillinger for modulen hendelser og agenda
 PasswordTogetVCalExport=Nøkkel for å autorisere eksportlenke
+SecurityKey = Security Key
 PastDelayVCalExport=Ikke eksporter hendelser eldre enn
 AGENDA_USE_EVENT_TYPE=Bruk hendelsestyper (administrert i menyoppsett -> Ordbøker -> Type agendahendelser)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Angi denne standardverdien automatisk for type hendelse i skjema for hendelsesoppretting
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Bakgrunnsfarge for oddetalls-tabellinjer
 BackgroundTableLineEvenColor=Bakgrunnsfarge for partalls-tabellinjer
 MinimumNoticePeriod=Frist for beskjed (Feriesøknaden må sendes inn før denne fristen)
 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
+EnterAnyCode=Dette feltet inneholder en referanse for å identifisere linjen. Skriv inn hvilken som helst verdi du ønsker, men uten spesialtegn.
 Enter0or1=Skriv inn 0 eller 1
 UnicodeCurrency=Her legger du inn en liste med Ascii-verdier, som representerer et valutasymbol. For eksempel: $ = [36], Brasilsk real R$ = [82,36], € = [8364]
 ColorFormat=RGB-fargen er i HEX-format, for eksempel: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bunnmarg på PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Høyde for logo på PDF
 NothingToSetup=Det er ikke noe spesifikt oppsett som kreves for denne modulen.
 SetToYesIfGroupIsComputationOfOtherGroups=Sett til ja hvis denne gruppen er en beregning av andre grupper
-EnterCalculationRuleIfPreviousFieldIsYes=Angi kalkuleringsregel hvis tidligere felt ble satt til Ja (for eksempel 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Flere språkvarianter funnet
 RemoveSpecialChars=Fjern spesialtegn
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter til ren verdi (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Oppsett av modul Sosiale nettverk
 EnableFeatureFor=Aktiver funksjoner for <strong> %s </strong>
 VATIsUsedIsOff=Merk: Muligheten til å bruke MVA er satt til <strong> Av </strong> i menyen %s - %s, så MVA vil alltid være 0 for salg.
 SwapSenderAndRecipientOnPDF=Bytt posisjoner for avsender- og mottakeradresse på PDF
-FeatureSupportedOnTextFieldsOnly=Advarsel, funksjonen støttes kun i tekstfelt. Også en URL-parameter action=create eller action=edit må settes ELLER sidenavnet må avsluttes med 'new.php' for å starte denne funksjonen.
+FeatureSupportedOnTextFieldsOnly=Advarsel, funksjonen støttes bare i tekstfelt og kombinasjonslister. Også en URL-parameter handling=opprett eller handling=redigering må angis ELLER sidenavnet må slutte med 'new.php' for å utløse denne funksjonen.
 EmailCollector=E-post samler
 EmailCollectorDescription=Legg til en planlagt jobb og en oppsettside for å jevnlig skanne etter e-post (ved hjelp av IMAP-protokollen) og registrere e-postmeldinger mottatt i applikasjonen, på riktig sted og/eller opprett poster automatisk (som kundeemner).
 NewEmailCollector=Ny e-postsamler
@@ -2049,8 +2062,11 @@ UseDebugBar=Bruk feilsøkingsfeltet
 DEBUGBAR_LOGS_LINES_NUMBER=Nummer på siste logglinjer å beholde i konsollen
 WarningValueHigherSlowsDramaticalyOutput=Advarsel, høyere verdier reduserer resultatet dramatisk
 ModuleActivated=Modul %s er aktivert og bremser grensesnittet
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Hvis du er i et produksjonsmiljø, bør du sette denne egenskapen til %s.
 AntivirusEnabledOnUpload=Antivirus aktivert på opplastede filer
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Eksportmodellene er delt med alle
 ExportSetup=Oppsett av modul Eksport
 ImportSetup=Oppsett av importmodul
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Utfør et anonymt Ping '+1' til Dolibarr foundation-serveren (
 FeatureNotAvailableWithReceptionModule=Funksjonen er ikke tilgjengelig når modulen Mottak er aktivert
 EmailTemplate=Mal for e-post
 EMailsWillHaveMessageID=E-postmeldinger vil være merket 'Referanser' som samsvarer med denne syntaksen
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Hvis du vil at tekst i PDF-en din skal dupliseres på 2 forskjellige språk i samme genererte PDF, må du angi dette andre språket, slik at generert PDF vil inneholde 2 forskjellige språk på samme side, det som er valgt når du genererer PDF og dette ( bare få PDF-maler støtter dette). Hold tom for ett språk per PDF.
 FafaIconSocialNetworksDesc=Skriv inn koden til et FontAwesome-ikon. Hvis du ikke vet hva som er FontAwesome, kan du bruke den generelle verdien fa-adresseboken.
 FeatureNotAvailableWithReceptionModule=Funksjonen er ikke tilgjengelig når modulen Mottak er aktivert
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Det anbefales å bytte denne verdien til %s for mer
 DictionaryProductNature= Varens art
 CountryIfSpecificToOneCountry=Land (hvis spesifikt for et gitt land)
 YouMayFindSecurityAdviceHere=Du kan finne sikkerhetsrådgivning her
-ModuleActivatedMayExposeInformation=Denne modulen kan avsløre sensitive data. Hvis du ikke trenger det, deaktiver det.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=En modul designet for utvikling er aktivert. Ikke aktiver det i et produksjonsmiljø.
 CombinationsSeparator=Skilletegn for varekombinasjoner
 SeeLinkToOnlineDocumentation=Se lenke til online dokumentasjon i toppmenyen for eksempler
 SHOW_SUBPRODUCT_REF_IN_PDF=Hvis funksjonen "%s" til modul <b> %s </b> brukes, kan du vise detaljer om undervarer av et sett på PDF.
 AskThisIDToYourBank=Kontakt banken din for å få denne ID-en
+AdvancedModeOnly=Tillatelse bare tilgjengelig i avansert tillatelsesmodus
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Hendelse organisasjon
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 3830db8bba9..0de8696fb38 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Dette er ditt SEPA-mandat for å autorisere vårt firma til å utføre direktedebitering til din bank. Send det i retur signert (skanning av det signerte dokumentet) eller send det via post til
 AutoReportLastAccountStatement=Fyll feltet 'Antall bankoppgaver' automatisk med siste setningsnummer når du avstemmer
 CashControl=POS kassekontroll
-NewCashFence=Ny kasseavslutning
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Fargelegg bevegelser
 BankColorizeMovementDesc=Hvis denne funksjonen er aktivert, kan du velge spesifikk bakgrunnsfarge for debet- eller kredittbevegelser
 BankColorizeMovementName1=Bakgrunnsfarge for debetbevegelse
 BankColorizeMovementName2=Bakgrunnsfarge for kredittbevegelse
 IfYouDontReconcileDisableProperty=Hvis du ikke foretar bankavstemninger på noen bankkontoer, deaktiverer du egenskapen"%s" for å fjerne denne advarselen.
 NoBankAccountDefined=Ingen bankkonto definert
+NoRecordFoundIBankcAccount=Ingen poster funnet på bankkontoen. Vanligvis skjer dette når en post er slettet manuelt fra listen over transaksjoner på bankkontoen (for eksempel under en avstemming av bankkontoen). En annen årsak er at betalingen ble registrert da modulen "%s" ble deaktivert.
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 4e1c65ac58f..5ad3d1ac255 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -55,6 +55,7 @@ CustomerInvoice=Kundefaktura
 CustomersInvoices=Kundefakturaer
 SupplierInvoice=Leverandørfaktura
 SuppliersInvoices=Leverandørfakturaer
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Leverandørfaktura
 SupplierBills=Leverandørfakturaer
 Payment=Betaling
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Betalinger allerede utført
 PaymentsBackAlreadyDone=Refusjon allerede gjort
 PaymentRule=Betalingsregel
 PaymentMode=Betalingstype
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debet/kredit-kort
 PaymentTypePP=PayPal
 IdPaymentMode=Betalingstype (ID)
@@ -239,8 +242,8 @@ ExcessReceived=Overskytende
 ExcessPaid=For mye betalt
 EscompteOffered=Rabatt innrømmet (betalt før forfall)
 EscompteOfferedShort=Rabatt
-SendBillRef=Innsendelse av faktura %s
-SendReminderBillRef=Innsendelse av faktura %s (påminnelse)
+SendBillRef=Faktura %s
+SendReminderBillRef=Faktura %s (påminnelse)
 NoDraftBills=Ingen fakturakladder
 NoOtherDraftBills=Ingen andre fakturakladder
 NoDraftInvoices=Ingen fakturakladder
@@ -373,6 +376,7 @@ DateLastGeneration=Dato for siste generering
 DateLastGenerationShort=Dato siste generering
 MaxPeriodNumber=Maks antall fakturagenereringer
 NbOfGenerationDone=Antall fakturagenereringer allerede gjort
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Antall genereringer gjort
 MaxGenerationReached=Maks antall genereringer nådd
 InvoiceAutoValidate=Valider fakturaer automatisk
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Innen 14 dager etter slutten av måneden
 FixAmount=Fast beløp - 1 linje med etiketten '%s'
 VarAmount=Variabelt beløp
 VarAmountOneLine=Variabel mengde (%% tot.) - 1 linje med etikett '%s'
-VarAmountAllLines=Variabelt beløp (%% tot.) - alle like linjer
+VarAmountAllLines=Variabelt beløp (%% tot.) - alle linjer fra opprinnelse
 # PaymentType
 PaymentTypeVIR=Bankoverførsel
 PaymentTypeShortVIR=Bankoverførsel
@@ -494,12 +498,16 @@ Cash=Kontant
 Reported=Forsinket
 DisabledBecausePayments=Ikke mulig siden det er noen betalinger
 CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betalingen siden det er minst en faktura som er klassifisert som betalt
+CantRemovePaymentVATPaid=Kan ikke fjerne betaling siden MVA-deklarasjonen er klassifisert betalt
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Forventet innbetaling
 CantRemoveConciliatedPayment=Kan ikke fjerne avtalt beløp
 PayedByThisPayment=Betales av denne innbetalingen
 ClosePaidInvoicesAutomatically=Klassifiser automatisk alle standard-, forskudds- eller erstatningsfakturaer som "Betalt" når betalingen er fullført.
 ClosePaidCreditNotesAutomatically=Klassifiser automatisk alle kreditnotaer som "Betalt" når refusjonen er fullført.
 ClosePaidContributionsAutomatically=Klassifiser automatisk alle sosiale eller skattemessige bidrag som "Betalt" når betalingen er fullstendig utført.
+ClosePaidVATAutomatically=Klassifiser automatisk MVA-erklæring som "Betalt" når betalingen er fullført.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Alle fakturaer uten gjenværende å betale vil automatisk bli stengt med status "Betalt".
 ToMakePayment=Betal
 ToMakePaymentBack=Tilbakebetal
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Du må først lage en standardfaktura og s
 PDFCrabeDescription=PDF-fakturamal Crabe. En komplett fakturamal (gammel implementering av Sponge-mal)
 PDFSpongeDescription=PDF Fakturamal Sponge. En komplett fakturamal
 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 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
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=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 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Årsaken til tidlig avslutning
 EarlyClosingComment=Tidlig avslutning notat
 ##### Types de contacts #####
@@ -562,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Hvis du vil opprette slike fakturaer automatis
 DeleteRepeatableInvoice=Slett fakturamal
 ConfirmDeleteRepeatableInvoice=Er du sikker på at du vil 
 CreateOneBillByThird=Opprett en faktura pr. tredjepart (ellers en faktura pr. ordre)
-BillCreated=%s faktura(er) opprettet
+BillCreated=%s faktura(er) generert
+BillXCreated=Faktura %s generert
 StatusOfGeneratedDocuments=Status for dokumentgenerering
 DoNotGenerateDoc=Ikke generer dokumentfil
 AutogenerateDoc=Autogenerer dokumentfil
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 7f5f1011b58..e16bdcc4fdb 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
+BoxDolibarrStateBoard=Statistikk over viktigste forretningsobjekter i databasen
 BoxLoginInformation=Innloggingsinformasjon
 BoxLastRssInfos=RSS-informasjon
 BoxLastProducts=Siste %s Varer/Tjenester
@@ -17,9 +18,13 @@ BoxLastActions=Siste hendelser
 BoxLastContracts=Siste kontrakter
 BoxLastContacts=Siste kontakter/adresser
 BoxLastMembers=Siste medlemmer
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Siste intervensjoner
 BoxCurrentAccounts=Åpne kontobalanse
 BoxTitleMemberNextBirthdays=Fødselsdager denne måneden (medlemmer)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Siste %s nyheter fra %s
 BoxTitleLastProducts=Varer/Tjenester: siste %s endret
 BoxTitleProductsAlertStock=Varer: lagervarsel
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Siste %s kundeforsendelser
 NoRecordedShipments=Ingen registrert kundesending
 BoxCustomersOutstandingBillReached=Kunder med utestående grense nådd
 # Pages
-AccountancyHome=Regnskap
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validerte prosjekter
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index fcce83f42ff..e9d51fae4d2 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Område for leverandørkoder/-kategorier
 CustomersCategoriesArea=Område for kunde-merker/kategorier
 MembersCategoriesArea=Område for medlems-merker/kategorier
 ContactsCategoriesArea=Område for kontakters merker/kategorier
-AccountsCategoriesArea=Område for kontomerker/-kategorier
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Prosjekters merker/kategori-område
 UsersCategoriesArea=Område for brukertagger/-kategorier
 SubCats=Underkategorier
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Tilordne kategori til leverandør
 ShowCategory=Vis merke/kategori
 ByDefaultInList=Som standard i liste
 ChooseCategory=Velg kategori
-StocksCategoriesArea=Lager Kategorier
-ActionCommCategoriesArea=Hendelseskategorier
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Side-Container Kategorier
 UseOrOperatorForCategories=Bruker eller operatør for kategorier
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index d3302eb55c9..ebb5306c4a0 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -43,9 +43,10 @@ Individual=Privatperson
 ToCreateContactWithSameName=Vil automatisk opprette en kontakt/adresse med samme informasjon som tredjeparten, under tredjeparten. I de fleste tilfeller, selv om tredjeparten er en privatperson, vil det være nok å opprette en tredjepart
 ParentCompany=Morselskap
 Subsidiaries=Datterselskaper
-ReportByMonth=Rapporter etter måned
-ReportByCustomers=Rapporter etter kunde
-ReportByQuarter=Rapporter pr sats
+ReportByMonth=Rapport per måned
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code (ikke i Norge)
 RegisteredOffice=Registered office (ikke i Norge)
 Lastname=Etternavn
@@ -172,14 +173,20 @@ ProfId1ES=Prof ID 1 (CIF / NIF)
 ProfId2ES=Prof ID 2 (personnummer)
 ProfId3ES=Prof ID 3 (CNAE)
 ProfId4ES=Prof ID 4 (Collegiate nummer)
-ProfId5ES=EORI-nummer
+ProfId5ES=Prof Id 5 (EORI-nummer)
 ProfId6ES=-
 ProfId1FR=Prof ID 1 (SIREN)
 ProfId2FR=Prof ID 2 (SIRET)
 ProfId3FR=Prof ID 3 (NAF, gammel APE)
 ProfId4FR=Prof ID 4 (RCS/RM)
-ProfId5FR=EORI-nummer
+ProfId5FR=Prof Id 5 (EORI-nummer)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Prof Id 1 (Registreringsnummer)
 ProfId2GB=-
 ProfId3GB=Prof Id 3 (SIC)
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI-nummer
+ProfId6IT=-
 ProfId1LU=Prof. ID 1 (R.C.S Luxembourg)
 ProfId2LU=Prof. ID (Forretningslisens)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof ID 1 (NIPC)
 ProfId2PT=Prof ID 2 (Personnummer)
 ProfId3PT=Prof ID 3 (Commercial Record number)
 ProfId4PT=Prof ID 4 (Conservatory)
-ProfId5PT=EORI-nummer
+ProfId5PT=Prof Id 5 (EORI-nummer)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI-nummer
+ProfId5RO=Prof Id 5 (EORI-nummer)
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (OGRN)
 ProfId2RU=Prof ID 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Gjeldende utestående regning
 OutstandingBill=Max. utestående beløp
 OutstandingBillReached=Maksimun utestående beløp nådd
 OrderMinAmount=Minimumsbeløp for bestilling
-MonkeyNumRefModelDesc=Returner nummer med format %syymm-nnnn for kundekode og %syymm-nnnn for leverandørkode hvor yy er år, mm er måned og nnnn er en sekvens uten pause og ingen retur til 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Fri kode. Denne koden kan endres når som helst.
 ManagingDirectors=(E) navn (CEO, direktør, president ...)
 MergeOriginThirdparty=Dupliser tredjepart (tredjepart du vil slette)
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 81f72a4f4d7..9739b3a0a96 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST kjøp
 VATCollected=MVA samlet
 StatusToPay=Å betale
 SpecialExpensesArea=Område for spesielle betalinger
+VATExpensesArea=Område for alle TVA-betalinger
 SocialContribution=Skatt eller avgift
 SocialContributions=Skatter eller avgifter
 SocialContributionsDeductibles=Fradragsberettigede avgifter
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Kundefaktura-betaling
 PaymentSupplierInvoice=betaling av leverandørfaktura 
 PaymentSocialContribution=Skatter- og avgiftsbetaling
 PaymentVat=MVA betaling
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Liste over betalinger
 ListOfCustomerPayments=Liste over kundebetalinger
 ListOfSupplierPayments=Liste over leverandørbetalinger
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Betaling
 LT2PaymentsES=IRPF Betalinger
 VATPayment=MVA-betaling
 VATPayments=MVA-betalinger
+VATDeclarations=MVA-deklarasjoner
+VATDeclaration=Mva-deklarasjon
 VATRefund=MVA-refundering
 NewVATPayment=Ny MVA-betaling
 NewLocalTaxPayment=Ny MVA %s betaling
@@ -134,9 +138,17 @@ NoWaitingChecks=Ingen sjekker venter på å bli satt inn.
 DateChequeReceived=Dato for sjekkmottak
 NbOfCheques=Antall sjekker
 PaySocialContribution=Betal skatt/avgift
-ConfirmPaySocialContribution=Er du sikker på at du vil klassifisere denne skatten/avgiften som betalt?
+PayVAT=Betal en MVA-deklarasjon
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Er du sikker på at du vil klassifisere denne sosiale eller skatterelaterte betalingen som utført?
+ConfirmPayVAT=Er du sikker på at du vil klassifisere denne MVA-deklarasjonen som betalt?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Slett en skatt eller avgift
-ConfirmDeleteSocialContribution=Er du sikker på at du vil slette denne skatten/avgiften?
+DeleteVAT=Slett en MVA-deklarasjon
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Er du sikker på at du vil slette denne sosiale/skatterelaterte betalingen?
+ConfirmDeleteVAT=Er du sikker på at du vil slette denne MVA-deklarasjonen?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Skatte- og avgiftsbetalinger
 CalcModeVATDebt=Modus <b>%sMVA ved commitment regnskap%s</b>.
 CalcModeVATEngagement=Modus <b>%sMVA på inntekt-utgifter%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- Inkluderer betalinger gjort mot fakturaer, utgifter, MVA og l
 RulesCADue=- Inkluderer kundens forfalte fakturaer enten de er betalt eller ikke. <br> - Basert på faktureringsdato for disse fakturaene. <br>
 RulesCAIn=- Inkluderer alle betalinger av fakturaer mottatt fra klienter. <br> - Er basert på betalingsdatoen for disse fakturaene <br>
 RulesCATotalSaleJournal=Den inkluderer alle kredittlinjer fra salgsjournalen.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Inkluderer poster i hovedboken med regnskapskontoer som har gruppen "UTGIFTER" eller "INNTEKT"
 RulesResultBookkeepingPredefined=Inkluderer poster i hovedboken med regnskapskontoer som har gruppen "UTGIFTER" eller "INNTEKT"
 RulesResultBookkeepingPersonalized=Viser poster i hovedboken med regnskapskontoer <b> gruppert etter tilpassede grupper </b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=MVA-rapport etter tredjepart
 VATReportByCustomers=MVA-rapport etter kunde
 VATReportByCustomersInInputOutputMode=Rapport over innhentet og betalt MVA etter kunde
 VATReportByQuartersInInputOutputMode=Rapport etter MVA-sats av MVA innkrevd og betalt
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Rapporter MVA-2 etter sats
 LT2ReportByQuarters=Rapporter MVA-3 etter sats
 LT1ReportByQuartersES=Rapport etter RE sats
@@ -217,7 +231,7 @@ Pcg_subtype=Kontoplan undertype
 InvoiceLinesToDispatch=Fakturalinjer for utsendelse
 ByProductsAndServices=Etter varer og tjenester
 RefExt=Ekstern referanse
-ToCreateAPredefinedInvoice=For å lage en fakturamal, lag først en standardfaktura uten å validere den, klikk på "%s".|
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Lenke til ordre
 Mode1=Metode 1
 Mode2=Metode 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Den dedikerte regnskapskontoen som er definert
 ACCOUNTING_ACCOUNT_SUPPLIER=Regnskapskonto brukt til leverandør-tredjepart
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Den dedikerte regnskapskonto som er definert på tredjepartskort, vil kun bli brukt til subledger. Denne vil bli brukt til hovedboken og som standardverdi for Subledger-regnskap hvis dedikert leverandørkonto på tredjepart ikke er definert.
 ConfirmCloneTax=Bekreft kloning av skatt/avgiftsbetaling
+ConfirmCloneVAT=Bekreft kloning av MVA-deklarasjon
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Klon for neste måned
 SimpleReport=Enkel rapport
 AddExtraReport=Ekstrarapporter (legg til internasjonale og nasjonale kunderapporter)
@@ -253,7 +269,8 @@ AccountingAffectation=Regnskapsoppgave
 LastDayTaxIsRelatedTo=Siste dag i perioden MVA er knyttet til
 VATDue=MVA innkrevd
 ClaimedForThisPeriod=Innkrevd for perioden
-PaidDuringThisPeriod=Betalt i denne perioden
+PaidDuringThisPeriod=Betalt for denne perioden
+PaidDuringThisPeriodDesc=Dette er summen av alle betalinger knyttet til MVA-deklarasjoner som har en sluttdato i den valgte datoperioden
 ByVatRate=Etter MVA-sats
 TurnoverbyVatrate=Omsetning fakturert etter MVA-sats
 TurnoverCollectedbyVatrate=Omsetning etter MVA-sats
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Kjøpsomsetning mottatt
 RulesPurchaseTurnoverDue=- Inkluderer leverandørens forfalte fakturaer enten de er betalt eller ikke. <br> - Basert på fakturadato for disse fakturaene. <br>
 RulesPurchaseTurnoverIn=- Inkluderer alle leverandørbetalinger som er utført. <br> - Basert på betalingsdatoen for disse fakturaene <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Inkluderer alle debetlinjer fra kjøpsjournalen.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Kjøpsomsetning fakturert
 ReportPurchaseTurnoverCollected=Kjøpsomsetning mottatt
 IncludeVarpaysInResults = Inkluder forskjellige betalinger i rapportene
diff --git a/htdocs/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
index 4e037c091f6..4d538a9eb7d 100644
--- a/htdocs/langs/nb_NO/ecm.lang
+++ b/htdocs/langs/nb_NO/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Filen er ikke indeksert i databasen (prøv å laste
 ExtraFieldsEcmFiles=Ekstrafelt Ecm Filer
 ExtraFieldsEcmDirectories=Ekstrafelt Ecm-mapper
 ECMSetup=ECM-oppsett
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 798e6598202..2c5e1915bc7 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> ble ikke funnet (feil bane, feil rettighete
 ErrorFunctionNotAvailableInPHP=Funksjonen <b>%s</b> kreves for denne funksjonen, men den er ikke tilgjengelig i denne versjonen/oppsettet av PHP.
 ErrorDirAlreadyExists=En mappe med dette navnet eksisterer allerede.
 ErrorFileAlreadyExists=En fil med dette navnet finnes allerede.
+ErrorDestinationAlreadyExists=En annen fil med navnet <b> %s </b> eksisterer allerede.
 ErrorPartialFile=Filen ble ikke fullstendig mottatt av server.
 ErrorNoTmpDir=Midlertidig mappe %s finnes ikke.
 ErrorUploadBlockedByAddon=Opplastning blokkert av en PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Feil ved lasting av kart over kontoer. Hvis noen kontoer ik
 ErrorBadSyntaxForParamKeyForContent=Feil syntaks for parameter keyforcontent. Må ha en verdi som starter med %s eller %s
 ErrorVariableKeyForContentMustBeSet=Feil, konstanten med navn %s (med tekstinnhold som skal vises) eller %s (med ekstern url til visning) må settes.
 ErrorURLMustStartWithHttp=URL %s må starte med http:// eller https://
+ErrorHostMustNotStartWithHttp=Vertsnavnet %s må IKKE starte med http:// eller https://
 ErrorNewRefIsAlreadyUsed=Feil, den nye referansen er allerede brukt
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Feil, å slette betaling knyttet til en lukket faktura er ikke mulig.
 ErrorSearchCriteriaTooSmall=For lite søkekriterier.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Offentlig grensesnitt var ikke aktivert
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Språket til den nye siden må defineres hvis den er angitt som oversettelse av en annen side
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Språket på den nye siden må ikke være kildespråket hvis det er angitt som oversettelse av en annen side
 ErrorAParameterIsRequiredForThisOperation=En parameter er obligatorisk for denne operasjonen
+ErrorDateIsInFuture=Feil, datoen kan ikke settes frem i tid
+ErrorAnAmountWithoutTaxIsRequired=Feil, beløp er obligatorisk
+ErrorAPercentIsRequired=Feil, fyll ut prosentandelen riktig
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Advarsel, kunne ikke legge til filoppfø
 WarningTheHiddenOptionIsOn=Advarsel, det skjulte alternativet <b> %s </b> er på.
 WarningCreateSubAccounts=Advarsel, du kan ikke opprette en underkonto direkte, du må opprette en tredjepart eller en bruker og tildele dem en regnskapskode for å finne dem i denne listen
 WarningAvailableOnlyForHTTPSServers=Bare tilgjengelig hvis du bruker HTTPS-sikret tilkobling.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/nb_NO/externalsite.lang b/htdocs/langs/nb_NO/externalsite.lang
index 7a530d73f28..f7f6bf1e47a 100644
--- a/htdocs/langs/nb_NO/externalsite.lang
+++ b/htdocs/langs/nb_NO/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Oppsett av lenke til ekstern nettside
-ExternalSiteURL=Ekstern nettstedadresse
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modulen Ekstern Side ble ikke riktig konfigurert.
 ExampleMyMenuEntry=Meny overskrift
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 15410c383e2..511b46ca210 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Mod. dato
 IPModification=Modifikasjons-IP
 DateLastModification=Siste endringsdato
 DateValidation=Validert den
+DateSigning=Signing date
 DateClosing=Lukket den
 DateDue=Forfallsdato
 DateValue=Verdi dato
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Enhetspris (ekskl.) (Valuta)
 UnitPriceTTC=Enhetspris
 PriceU=Pris
 PriceUHT=Pris (netto)
-PriceUHTCurrency=U.P (valuta)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inkl. avgift)
 Amount=Beløp
 AmountInvoice=Fakturabeløp
@@ -389,6 +390,8 @@ AmountTotal=Totaltbeløp
 AmountAverage=Gjennomsnittsbeløp
 PriceQtyMinHT=Pris min mengde.  (ekskl. MVA)
 PriceQtyMinHTCurrency=Pris min mengde. (ekskl. MVA) (valuta)
+PercentOfOriginalObject=Prosent av originalobjektet
+AmountOrPercent=Beløp eller prosent
 Percentage=Prosent
 Total=Totalt
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Medlemmer
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Avgifter | Spesielle utgifter
 ThisLimitIsDefinedInSetup=Dolibarr grense (Menu home-setup-security): %s Kb, PHP grense: %s Kb
-NoFileFound=Ingen dokumenter er lagret i denne mappen
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Gjeldende språk
 CurrentTheme=Gjeldende tema
 CurrentMenuManager=Nåværende menymanager
@@ -899,8 +902,10 @@ ViewAccountList=Vis hovedbok
 ViewSubAccountList=Vis underkonto hovedbok
 RemoveString=Fjern strengen '%s'
 SomeTranslationAreUncomplete=Noen av språkene som tilbys kan bare oversettes delvis eller kan inneholde feil. Vennligst hjelp å korrigere språket ditt ved å registrere deg på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> for å legge til forbedringene dine.
-DirectDownloadLink=Direkte nedlastingslink (offentlig/ekstern)
-DirectDownloadInternalLink=Direkte nedlastingslink (må være logget på og trenger tillatelser)
+DirectDownloadLink=Offentlig nedlastingskobling
+PublicDownloadLinkDesc=Kun koblingen kreves for å laste ned filen
+DirectDownloadInternalLink=Privat nedlastningskobling
+PrivateDownloadLinkDesc=Du må være innlogget og ha tillatelse for å se eller laste ned filen
 Download=Last ned
 DownloadDocument=Last ned dokument
 ActualizeCurrency=Oppdater valutakurs
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontakter
 SearchIntoMembers=Medlemmer
 SearchIntoUsers=Brukere
 SearchIntoProductsOrServices=Varer eller tjenester
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Prosjekter
 SearchIntoMO=Produksjonsordrer
 SearchIntoTasks=Oppgaver
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Tastatursnarvei
 AssignedTo=Tildelt
 Deletedraft=Slett utkast
 ConfirmMassDraftDeletion=Bekreftelse av massesletting av kladder
-FileSharedViaALink=Fil delt via en lenke
+FileSharedViaALink=Fil delt med en offentlig lenke
 SelectAThirdPartyFirst=Velg en tredjepart først ...
 YouAreCurrentlyInSandboxMode=Du er for øyeblikket i %s "sandbox" -modus
 Inventory=Varetelling
 AnalyticCode=Analytisk kode
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Vis mer info
 NoFilesUploadedYet=Vennligst last opp et dokument først
 SeePrivateNote=Se privat notat
@@ -1120,3 +1127,5 @@ AffectTag=Påvirk merke
 ConfirmAffectTag=Påvirk bulkmerke
 ConfirmAffectTagQuestion=Er du sikker på at du vil påvirke merker til valgte %s post(er)?
 CategTypeNotFound=Ingen merketype funnet for denne post-typen
+CopiedToClipboard=Kopiert til utklippstavlen
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
index 58d4549ded6..693ff867bdb 100644
--- a/htdocs/langs/nb_NO/margins.lang
+++ b/htdocs/langs/nb_NO/margins.lang
@@ -22,7 +22,7 @@ ProductService=Vare eller tjeneste
 AllProducts=Alle varer og tjenester
 ChooseProduct/Service=Velg vare eller tjenester
 ForceBuyingPriceIfNull=Tving innkjøps-/kostpris til utsalgspris hvis udefinert
-ForceBuyingPriceIfNullDetails=Hvis innkjøps-/kostpris ikke er definert, og denne opsjonen er "PÅ", vil margin bli satt til null på linjen (innkjøps-/kostpris = utsalgspris). Ellers ("AV") vil margin bli satt til foreslått standard.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin-metode for globale rabatter
 UseDiscountAsProduct=Som vare
 UseDiscountAsService=Som tjeneste
@@ -37,7 +37,7 @@ CostPrice=Kostpris
 UnitCharges=Enhets-avgifter
 Charges=Avgifter
 AgentContactType=Kommersiell agent kontakttype
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
+AgentContactTypeDetails=Definer hvilken kontakttype (lenket på fakturaer) som skal brukes til marginrapport per kontakt/adresse. Vær oppmerksom på at det ikke er pålitelig å lese statistikk for en kontakt siden kontakten i de fleste tilfeller ikke er definert eksplisitt på fakturaene.
 rateMustBeNumeric=Sats må ha en numerisk verdi
 markRateShouldBeLesserThan100=Dekningsbidrag skal være lavere enn 100
 ShowMarginInfos=Vis info om marginer
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 38f06382279..cff5ad25764 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Liste over medlems-utkast (må valideres)
 MembersListValid=Liste over gyldige medlemmer
 MembersListUpToDate=Liste over gyldige medlemmer med oppdatert abonnement
 MembersListNotUpToDate=Liste over gyldige medlemmer med utdatert abonnement
+MembersListExcluded=List of excluded members
 MembersListResiliated=Liste over terminerte medlemmer
 MembersListQualified=Liste over kvalifiserte medlemmer
 MenuMembersToValidate=Utkast medlemmer
 MenuMembersValidated=Validerte medlemmer
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminerte medlemmer
 MembersWithSubscriptionToReceive=Medlemmer som venter på abonnement
 MembersWithSubscriptionToReceiveShort=Abonnement på å motta
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Abonnement utgått
 MemberStatusActiveLateShort=Utløpt
 MemberStatusPaid=Abonnement oppdatert
 MemberStatusPaidShort=Oppdatert
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminert medlem
 MemberStatusResiliatedShort=Terminert
 MembersStatusToValid=Utkast medlemmer
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminerte medlemmer
 MemberStatusNoSubscription=Validert (ingen abonnement nødvendig)
 MemberStatusNoSubscriptionShort=Validert
@@ -82,6 +87,8 @@ Physical=Fysisk
 Moral=Moralsk
 MorAndPhy=Moralsk og fysisk
 Reenable=Reaktiverer
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminer et medlem
 ConfirmResiliateMember=Er du sikker på at du vil terminere dette medlemmet?
 DeleteMember=Slette et medlem
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-postmal til bruk for å sende e-
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-postmal til bruk for å sende e-post til et medlem på nytt abonnementsopptak
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-postmal som brukes til å sende epostpåminnelse når abonnementet er i ferd med å utløpe
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-postmal til bruk for å sende e-post til et medlem ved kansellering av medlemskap
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Avsenderadresse for automatisk e-post
 DescADHERENT_ETIQUETTE_TYPE=Side for etikettformat
 DescADHERENT_ETIQUETTE_TEXT=Tekst trykt på medlemsadresse ark
@@ -162,6 +170,7 @@ DocForLabels=Generer adresseark
 SubscriptionPayment=Abonnementsbetaling
 LastSubscriptionDate=Dato for siste abonnementsbetaling
 LastSubscriptionAmount=Beløp på siste abonnement
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Medlemsstatistikk etter land
 MembersStatisticsByState=Medlemsstatistikk etter delstat/provins
 MembersStatisticsByTown=Medlemsstatistikk etter by
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index 24ffaf2f737..90e1fcf7f63 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=Jeg vil generere noen dokumenter fra objektet
 IncludeDocGenerationHelp=Hvis du krysser av for dette, genereres det kode for å legge til en "Generer dokument" -boksen på posten.
 ShowOnCombobox=Vis verdi i kombinasjonsboks
 KeyForTooltip=Nøkkel for verktøytips
-CSSClass=CSS klasse
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Ikke redigerbar
 ForeignKey=Fremmed nøkkel
 TypeOfFieldsHelp=Type felt: <br> varchar (99), dobbel (24,8), ekte, tekst, html, datetime, tidstempel, heltall, heltall:ClassName:relativepath/to/classfile.class.php [:1[:filter]] ('1' betyr at vi legger til en + -knapp etter kombinasjonsboksen for å opprette posten, 'filter' kan være 'status=1 OG fk_user=__USER_ID OG enhet IN (__SHARED_ENTITIES__)' for eksempel)
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 550f74ff5be..0731675c368 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Lag ordre
 MakeOrder=Opprett ordre
 SupplierOrder=Innkjøpsordre
 SuppliersOrders=Innkjøpsordre
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Nåværende innkjøpsordre
 CustomerOrder=Salgsordre
 CustomersOrders=Salgsordre
@@ -141,11 +143,12 @@ OrderByEMail=E-post
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=En komplett ordremodell 
+PDFEinsteinDescription=En komplett ordremodell (gammel implementering av Eratosthene mal)
 PDFEratostheneDescription=En komplett ordremodell
 PDFEdisonDescription=En enkel ordremodell
 PDFProformaDescription=En komplett Proforma-fakturamal
 CreateInvoiceForThisCustomer=Fakturer ordrer
+CreateInvoiceForThisSupplier=Fakturer ordrer
 NoOrdersToInvoice=Ingen fakturerbare ordrer
 CloseProcessedOrdersAutomatically=Klassifiser alle valgte bestillinger "Behandlet".
 OrderCreation=Opprett ordre
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 5f24b072d78..5e6c9f56243 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Firma med mange aktiviteter (alle hovedmoduler)
 CreatedBy=Laget av %s
 ModifiedBy=Endret av %s
 ValidatedBy=Validert av %s
+SignedBy=Signed by %s
 ClosedBy=Lukket av %s
 CreatedById=Bruker-ID som opprettet
 ModifiedById=Bruker-ID som gjorde siste endring
@@ -244,6 +245,7 @@ NewKeyIs=Dette er din nye innloggingsnøkkel
 NewKeyWillBe=Ny nøkkel for innlogging er
 ClickHereToGoTo=Klikk her for å gå til %s
 YouMustClickToChange=Du må først klikke på følgende lenke for å validere passord-endringen
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Hvis det ikke er du som har bedt om endringen, kan du glemme denne e-posten. Dine opplysninger er trygge
 IfAmountHigherThan=Hvis beløpet er høyere enn<strong>%s</strong>
 SourcesRepository=Oppbevaring av kilder
diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
index bf4cc11d07a..31167037a32 100644
--- a/htdocs/langs/nb_NO/productbatch.lang
+++ b/htdocs/langs/nb_NO/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Bruk lot/serienummer
-ProductStatusOnBatch=Ja (lot/serienummer påkrevd)
+ProductStatusOnBatch=Ja (LOT påkrevd)
+ProductStatusOnSerial=Ja (unikt serienummer kreves)
 ProductStatusNotOnBatch=Nei (lot/serienummer ikke i bruk)
-ProductStatusOnBatchShort=Ja
+ProductStatusOnBatchShort=LOT
+ProductStatusOnSerialShort=Serie
 ProductStatusNotOnBatchShort=Nei
 Batch=Lot/serienummer
 atleast1batchfield=Siste forbruksdato, siste salgsdato eller lot/serienummer
@@ -16,9 +18,18 @@ printEatby=Siste forbruksdato: %s
 printSellby=Siste salgsdato: %s
 printQty=Ant: %d
 AddDispatchBatchLine=Legg til en linje for holdbarhetsdato
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=Når modulen Lot/Serie er aktivert, er automatisk lagernedgang tvunget til å 'Redusere reelt lager ved fraktgodkjennelse' og automatisk økningsmodus er tvunget til å "Øke virkelige lagre ved manuell forsendelse til lager" og kan ikke redigeres. Andre alternativer kan defineres etter ønske.
 ProductDoesNotUseBatchSerial=Denne varen har ikke lot/serienummer
 ProductLotSetup=Oppsett av model Lot/serienmmer
 ShowCurrentStockOfLot=Vis gjeldende beholdning for vare/lot
 ShowLogOfMovementIfLot=Vis logg over bevegelser for vare/lot
 StockDetailPerBatch=Varedetaljer pr. lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index de0d515bf59..ebefd4f4d91 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=MVA (for denne leverandøren/varen)
 DiscountQtyMin=Rabatt for denne kvantiteten.
 NoPriceDefinedForThisSupplier=Ingen pris/antall definert for denne leverandøren/varen
 NoSupplierPriceDefinedForThisProduct=Ingen leverandørpris/antall definert for denne varen
+PredefinedItem=Forhåndsdefinert vare
 PredefinedProductsToSell=Forhåndsdefinert vare
 PredefinedServicesToSell=Forhåndsdefinert tjeneste
 PredefinedProductsAndServicesToSell=Salg av forhåndsdefinerte varer/tjenester
@@ -313,7 +314,7 @@ LastUpdated=Siste oppdatering
 CorrectlyUpdated=Korrekt oppdatert
 PropalMergePdfProductActualFile=Filer brukt for å legge til i PDF Azur er
 PropalMergePdfProductChooseFile=Velg PDF-filer
-IncludingProductWithTag=Inkludert vare/tjeneste med merke
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Standardpris, virkelig pris avhenger av kunde
 WarningSelectOneDocument=Velg minst ett dokument
 DefaultUnitToShow=Enhet
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index d0c4f24d93e..c71833daf26 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Forbrukt
 ListOfTasks=Oppgaveliste
 GoToListOfTimeConsumed=Gå til liste for tidsbruk
 GanttView=Gantt visning
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Liste over tilbud knyttet til prosjektet
 ListOrdersAssociatedProject=Liste over salgsordre knyttet til prosjektet
 ListInvoicesAssociatedProject=Liste over kundefakturaer knyttet til prosjektet
@@ -268,3 +269,7 @@ OneLinePerTask=Én linje per oppgave
 OneLinePerPeriod=Én linje per periode
 RefTaskParent=Ref. forelderoppgave
 ProfitIsCalculatedWith=Fortjenesten beregnes ved å bruke
+AddPersonToTask=Legg også til i oppgaver
+UsageOrganizeEvent=Bruk: Hendelse Organisasjon
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Klassifiser prosjektet som lukket når alle oppgavene er fullført (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Merk: eksisterende prosjekter med alle oppgaver på 100%%-fremdrift blir ikke berørt: du må lukke dem manuelt. Dette alternativet påvirker bare åpne prosjekter.
diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
index d4353a29a1d..296889c4a3c 100644
--- a/htdocs/langs/nb_NO/propal.lang
+++ b/htdocs/langs/nb_NO/propal.lang
@@ -59,6 +59,7 @@ ConfirmClonePropal=Er du sikker på at du vil klone tilbudet <b>%s</b>?
 ConfirmReOpenProp=Er du sikker på at du vil gjenåpne tilbudet <b>%s</b>?
 ProposalsAndProposalsLines=Tilbud og linjer
 ProposalLine=Tilbudslinje
+ProposalLines=Proposal lines
 AvailabilityPeriod=Tilgjengelig forsinkelse
 SetAvailability=Sett tilgjengelig forsinkelse
 AfterOrder=etter bestilling
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index 101cae004e7..ce3cfe76d66 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -2,12 +2,15 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Regnskapskonto brukt til tredjepartsbrukere
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Regnskapskontoen som er definert på brukerkort, vil kun bli brukt til bruk av Subledger regnskap. Denne vil bli brukt til hovedboken og som standardverdi for Subledger-regnskap hvis dedikert bruker-regnskapskonto ikke er definert.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Regnskapskonto som standard for lønnsutbetalinger
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Lønn
 Salaries=Lønn
-NewSalaryPayment=Ny lønnsutbetaling
+NewSalary=New salary
+NewSalaryPayment=Nytt lønnskort
 AddSalaryPayment=Legg til lønnsutbetaling
 SalaryPayment=Lønnsutbetaling
 SalariesPayments=Lønnsutbetalinger
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Vis lønnsutbetaling
 THM=Gjennomsnittlig timepris
 TJM=Gjennomsnittlig dagspris
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index 11a434e3082..831423ab16a 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -19,8 +19,8 @@ Stock=Lagerbeholdning
 Stocks=Lagerbeholdning
 MissingStocks=Manglende varer
 StockAtDate=Varebeholdning på dato
-StockAtDateInPast=Tidligere dato
-StockAtDateInFuture=Senere dato
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Lager etter LOT/serienummer
 LotSerial=Lot/serienummer
 LotSerialList=Liste over lot/serienummer
@@ -37,8 +37,8 @@ AllWarehouses=Alle lager
 IncludeEmptyDesiredStock=Inkluder også negativ beholdning med udefinert ønsket beholdning
 IncludeAlsoDraftOrders=Inkluder også ordrekladd
 Location=Lokasjon
-LocationSummary=Kort navn på lokasjon
-NumberOfDifferentProducts=Antall forskjellige varer
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Totalt antall varer
 LastMovement=Siste bevegelse
 LastMovements=Siste bevegelser
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Lagerverdi
 UserWarehouseAutoCreate=Opprett et brukerlager automatisk når du oppretter en bruker
 AllowAddLimitStockByWarehouse=Administrer verdi for minimum og ønsket lager per sammenkobling (varelager) i tillegg til verdien for minimum og ønsket lager pr. vare
 RuleForWarehouse=Regel for lagre
-WarehouseAskWarehouseDuringPropal=Sett et varehus på tilbud
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Sett varehus på tilbud
 WarehouseAskWarehouseDuringOrder=Sett et lager på salgsordrer
 UserDefaultWarehouse=Sett et lager på brukere
 MainDefaultWarehouse=Standard lager
@@ -97,15 +98,16 @@ RealStockDesc=Fysisk/reelt lager er beholdningen du for øyeblikket har i dine i
 RealStockWillAutomaticallyWhen=Virkelig beholdning vil bli endret i henhold til denne regelen (som definert i Lager-modulen):
 VirtualStock=Virtuell beholdning
 VirtualStockAtDate=Virtuell beholdning på dato
-VirtualStockAtDateDesc=Virtuell beholdning når alle planlagte ordrer før datoen, er fullført
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtuell lagerbeholdning er den beregnede beholdningen som er tilgjengelig når alle åpne/ventende handlinger (som påvirker varer) er lukket (mottatte innkjøpsordrer, leverte salgsordrer, utførte produksjonsordrer osv.)
+AtDate=På dato
 IdWarehouse=Lager-ID
 DescWareHouse=Beskrivelse av lager
 LieuWareHouse=Lagerlokasjon
 WarehousesAndProducts=Lager og varer
 WarehousesAndProductsBatchDetail=Lager og varer (med detaljer pr. lot/serienummer)
 AverageUnitPricePMPShort=Vektet gjennomsnittspris
-AverageUnitPricePMPDesc=Gjennomsnittlig enhetspris betalt til leverandører for å få varen på lager.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Utsalgspris
 EstimatedStockValueSellShort=Verdi å selge
 EstimatedStockValueSell=Verdi å selge
@@ -145,7 +147,7 @@ Replenishments=Lagerpåfyllinger
 NbOfProductBeforePeriod=Beholdning av varen %s før valgte periode (< %s)
 NbOfProductAfterPeriod=Beholdning av varen %s før etter periode (< %s)
 MassMovement=Massebevegelse
-SelectProductInAndOutWareHouse=Velg et kilde-varehus og et mål-varehus, en vare og et antall, og klikk deretter "%s". Når dette er gjort for alle nødvendige bevegelser, klikker du på "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Postoverføring
 ReceivingForSameOrder=Kvitteringer for denne ordren
 StockMovementRecorded=Registrerte varebevegelser
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Lagernivå må være høyt nok til å legge varen/tj
 StockMustBeEnoughForOrder=Lagernivå må være høyt nok til å legge varen/tjenesten til ordre (sjekk er gjort mot dagens virkelige lagernivå når du legger til en linje i ordren i forhold til hva som er regelen for automatisk lagerendring)
 StockMustBeEnoughForShipment= Lagernivå må være høyt nok til å legge varen/tjenesten til levering (sjekk er gjort mot dagens virkelige lagernivå når du legger til en linje i leveringen i forhold til hva som er regelen for automatisk lagerendring)
 MovementLabel=Bevegelsesetikett
-TypeMovement=Type bevegelse
+TypeMovement=Direction of movement
 DateMovement=Dato for bevegelse
 InventoryCode=Bevegelse eller varelager
 IsInPackage=Innhold i pakken
@@ -183,6 +185,7 @@ inventoryCreatePermission=Opprett ny varetelling
 inventoryReadPermission=Vis varetellinger
 inventoryWritePermission=Oppdater oversikt
 inventoryValidatePermission=Valider varetelling
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Varetelling
 inventoryListTitle=Varetellinger
 inventoryListEmpty=Ingen varetelling pågår
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Det kreves lagerbeholdning for å velge hvi
 ForceTo=Tving til
 AlwaysShowFullArbo=Vis hele lagertreet med popup av lagerkoblinger (Advarsel: Dette kan redusere ytelsen dramatisk)
 StockAtDatePastDesc=Her kan du se varen (reell beholdning) på en tidligere dato
-StockAtDateFutureDesc=Her kan du se varen (virtuell beholdning) på en gitt dato i fremtiden
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Nåværende varebeholdning
 InventoryRealQtyHelp=Sett verdi til 0 for å tilbakestille antall <br> Hold feltet tomt, eller fjern linjen, for å holde uendret
-UpdateByScaning=Oppdater ved å skanne
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Oppdater ved skanning (varestrekkode)
 UpdateByScaningLot=Oppdater ved skanning (LOT/seriell strekkode)
 DisableStockChangeOfSubProduct=Deaktiver lagerendringen for alle delvaren til dette settet under denne bevegelsen.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Last opp fil og klikk deretter på %s ikonet for å velge fil som kilde-importfil ...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Gjenåpne
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index c7ade0f65bb..8eb97040929 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Leverandører
 SuppliersInvoice=Leverandørfaktura
+SupplierInvoices=Leverandørfakturaer
 ShowSupplierInvoice=Vis leverandørfaktura
 NewSupplier=Ny leverandør
 History=Historikk
diff --git a/htdocs/langs/nb_NO/ticket.lang b/htdocs/langs/nb_NO/ticket.lang
index 63f1717d97e..0b207326a40 100644
--- a/htdocs/langs/nb_NO/ticket.lang
+++ b/htdocs/langs/nb_NO/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Slettede
 # Dict
 Type=Type
 Severity=Alvorlighetsgrad
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Å sende epost fra supportseddel-melding
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Vis modulens logo i det offentlige grensesnittet
 TicketsShowModuleLogoHelp=Aktiver dette alternativet for å skjule modullogoen på sidene i det offentlige grensesnittet
 TicketsShowCompanyLogo=Vis logoen til firmaet i det offentlige grensesnittet
 TicketsShowCompanyLogoHelp=Aktiver dette alternativet for å skjule logoen til hovedselskapet på sidene i det offentlige grensesnittet
-TicketsEmailAlsoSendToMainAddress=Send også melding til hovedadressen
-TicketsEmailAlsoSendToMainAddressHelp=Aktiver dette alternativet for å sende en epost til "Varslings-epost" -adresse (se oppsett under)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Begrens visningen til supportsedler tildelt den nåværende brukeren (ikke effektiv for eksterne brukere, alltid begrenset til den tredjepart de er avhengige av)
 TicketsLimitViewAssignedOnlyHelp=Bare supportsedler som er tildelt den nåværende brukeren, vil være synlige. Gjelder ikke for en bruker med administrasjonsrettigheter.
 TicketsActivatePublicInterface=Aktiver det offentlige grensesnittet
@@ -126,10 +128,10 @@ TicketNumberingModules=Supportseddel nummereringsmodul
 TicketsModelModule=Dokumentmaler for billetter
 TicketNotifyTiersAtCreation=Varsle tredjepart ved opprettelse
 TicketsDisableCustomerEmail=Slå alltid av e-post når en billett er opprettet fra det offentlige grensesnittet
-TicketsPublicNotificationNewMessage=Send e-post(er) når en ny melding legges til
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send epost(er) når en ny melding legges til fra det offentlige grensesnittet (til tildelt bruker eller varslings-eposten til (oppdatering) og/eller varslings-eposten til)
 TicketPublicNotificationNewMessageDefaultEmail=E-postvarsler til (oppdatere)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send epost med ny melding til denne adressen hvis billetten ikke er tildelt en bruker eller brukeren ikke har epost.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Siste endrede supportsedler
 BoxLastModifiedTicketDescription=Siste %s endrede supportsedler
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Ingen nylig endrede supportsedler
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index f7c58956678..b1ac5feb529 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -72,7 +72,7 @@ ExportDataset_user_1=Brukere og deres egenskaper
 DomainUser=Domenebruker %s
 Reactivate=Reaktiver
 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 din bedrift/organisasjon. <br>En<b>ekstern</b> bruker er en kunde, leverandør eller annet (Å opprette en ekstern bruker for en tredjepart kan gjøres fra kontaktkortet til tredjepart).<br><br> I begge tilfeller defineres rettigheter i Dolibarr, også ekstern bruker kan ha en annen menystyrer enn intern bruker (se Hjem - Oppsett - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Rettigheter innvilget fordi de er arvet av en brukegruppe.
 Inherited=Arvet
 UserWillBe=Opprettet bruker vil være
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index 9cdf3dc0695..314d7173fc5 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Bruk med Apache/NGinx/...</u><br>Opprett på webserveren d
 ExampleToUseInApacheVirtualHostConfig=Eksempel på Apache virtuelt vertsoppsett:
 YouCanAlsoTestWithPHPS= <u> Bruk med PHP-innebygd server </u> <br> I utviklingsmiljø kan du foretrekke å teste nettstedet med PHP-innebygd webserver (PHP 5.5 nødvendig) ved å kjøre <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
 YouCanAlsoDeployToAnotherWHP=<u>Kjør nettstedet ditt med en annen leverandør av Dolibarr Hosting</u> <br> Hvis du ikke har en webserver som Apache eller NGinx tilgjengelig på internett, kan du eksportere og importere nettstedet til en annen Dolibarr-forekomst levert av en annen Dolibarr-leverandør som gir full integrasjon med nettstedsmodulen. Du kan finne en liste over noen Dolibarr-vertsleverandører på <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Sjekk også at virtuell vert har tillatelse <strong>%s</strong> på filer til <br><strong>%s</strong>
+CheckVirtualHostPerms=Sjekk også at den virtuelle vertsbrukeren (for eksempel www-data) har <strong>%s</strong> tillatelser på filer i<br><strong>%s</strong>
 ReadPerm=Les
 WritePerm=Skriv
 TestDeployOnWeb=Test/distribuer på nett
 PreviewSiteServedByWebServer=<u> Forhåndsvis %s i en ny fane. </u><br><br>%s vil bli servet av 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 servet av ekstern server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u> Forhåndsvis %s i en ny fanei.</u><br><br>%s blir servet av Dolibarr-serveren, slik at den ikke trenger at en ekstra webserver (som Apache, Nginx, IIS)  installeres.<br>Ulempen er at nettadressen til sidene ikke er brukervennlig og begynner med banen til Dolibarr. <br> URL servet av Dolibarr:<br><strong>%s</strong> <br> <br> For å bruke din egen eksterne webserver for å betjene dette nettstedet, opprett en virtuell vert på webserveren din som peker på katalogen<br><strong>%s</strong><br>, og skriv deretter inn navnet til denne virtuelle serveren og klikk på den andre forhåndsvisningsknappen .
+PreviewSiteServedByDolibarr= <u> Forhåndsvisning %s i en ny fane. </u><br><br> %s vil bli utført av Dolibarr-serveren, slik at den ikke trenger noen ekstra webserver (som Apache, Nginx, IIS) for å installeres. <br> Det ubeleilige er at nettadressene til sidene ikke er brukervennlige og starter med banen til Dolibarr. <br> URL fra Dolibarr: <br><strong>%s</strong><br><br> for å bruke din egen eksterne webserver til å tjene dette nettstedet, opprett en virtuell maskin på webserveren som peker på katalogen <br> <strong> %s </strong> <br> , skriv deretter inn navnet på denne virtuelle serveren i egenskapene til dette nettstedet og klikk på lenken "Test/implementer på nett".
 VirtualHostUrlNotDefined=URL til ekstern webserver ikke definert
 NoPageYet=Ingen sider ennå
 YouCanCreatePageOrImportTemplate=Du kan opprette en ny side eller importere en full nettsidemal
@@ -137,3 +137,11 @@ PagesRegenerated=%s side(r)/container(e) regenerert
 RegenerateWebsiteContent=Regenerer cache-filer på nettstedet
 AllowedInFrames=Tillatt i frames
 DefineListOfAltLanguagesInWebsiteProperties=Definer liste over alle tilgjengelige språk i nettstedsegenskaper.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/nb_NO/zapier.lang b/htdocs/langs/nb_NO/zapier.lang
index 5ab1b99ecf3..9a5e822d3c5 100644
--- a/htdocs/langs/nb_NO/zapier.lang
+++ b/htdocs/langs/nb_NO/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr-modul
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Oppsett av Zapier for Dolibarr
-ZapierDescription=Interface with Zapier
+ZapierForDolibarrSetup=Oppsett av Zapier for Dolibarr
+ZapierDescription=Grensesnitt med Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/ne_NP/accountancy.lang b/htdocs/langs/ne_NP/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/ne_NP/accountancy.lang
+++ b/htdocs/langs/ne_NP/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
index f9a6468d94a..8f4508ada53 100644
--- a/htdocs/langs/ne_NP/admin.lang
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/ne_NP/banks.lang b/htdocs/langs/ne_NP/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/ne_NP/banks.lang
+++ b/htdocs/langs/ne_NP/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/ne_NP/bills.lang b/htdocs/langs/ne_NP/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/ne_NP/bills.lang
+++ b/htdocs/langs/ne_NP/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/ne_NP/boxes.lang b/htdocs/langs/ne_NP/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/ne_NP/boxes.lang
+++ b/htdocs/langs/ne_NP/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ne_NP/categories.lang b/htdocs/langs/ne_NP/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/ne_NP/categories.lang
+++ b/htdocs/langs/ne_NP/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ne_NP/companies.lang b/htdocs/langs/ne_NP/companies.lang
index 8dc815b522e..154400c6536 100644
--- a/htdocs/langs/ne_NP/companies.lang
+++ b/htdocs/langs/ne_NP/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/ne_NP/compta.lang b/htdocs/langs/ne_NP/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/ne_NP/compta.lang
+++ b/htdocs/langs/ne_NP/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/ne_NP/ecm.lang b/htdocs/langs/ne_NP/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/ne_NP/ecm.lang
+++ b/htdocs/langs/ne_NP/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ne_NP/errors.lang b/htdocs/langs/ne_NP/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/ne_NP/errors.lang
+++ b/htdocs/langs/ne_NP/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/ne_NP/externalsite.lang b/htdocs/langs/ne_NP/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/ne_NP/externalsite.lang
+++ b/htdocs/langs/ne_NP/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/ne_NP/main.lang b/htdocs/langs/ne_NP/main.lang
index f8ba6f4073c..dc2a83f2015 100644
--- a/htdocs/langs/ne_NP/main.lang
+++ b/htdocs/langs/ne_NP/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/ne_NP/margins.lang b/htdocs/langs/ne_NP/margins.lang
index 76ea8ad5c4d..ad5406409b4 100644
--- a/htdocs/langs/ne_NP/margins.lang
+++ b/htdocs/langs/ne_NP/margins.lang
@@ -22,7 +22,7 @@ ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
diff --git a/htdocs/langs/ne_NP/members.lang b/htdocs/langs/ne_NP/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/ne_NP/members.lang
+++ b/htdocs/langs/ne_NP/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/ne_NP/modulebuilder.lang b/htdocs/langs/ne_NP/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/ne_NP/modulebuilder.lang
+++ b/htdocs/langs/ne_NP/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/ne_NP/orders.lang b/htdocs/langs/ne_NP/orders.lang
index ad91e1eef63..87d196eb22f 100644
--- a/htdocs/langs/ne_NP/orders.lang
+++ b/htdocs/langs/ne_NP/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
diff --git a/htdocs/langs/ne_NP/other.lang b/htdocs/langs/ne_NP/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/ne_NP/other.lang
+++ b/htdocs/langs/ne_NP/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/ne_NP/productbatch.lang b/htdocs/langs/ne_NP/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/ne_NP/productbatch.lang
+++ b/htdocs/langs/ne_NP/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/ne_NP/products.lang b/htdocs/langs/ne_NP/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/ne_NP/products.lang
+++ b/htdocs/langs/ne_NP/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/ne_NP/projects.lang b/htdocs/langs/ne_NP/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/ne_NP/projects.lang
+++ b/htdocs/langs/ne_NP/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/ne_NP/propal.lang b/htdocs/langs/ne_NP/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/ne_NP/propal.lang
+++ b/htdocs/langs/ne_NP/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/ne_NP/stocks.lang b/htdocs/langs/ne_NP/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/ne_NP/stocks.lang
+++ b/htdocs/langs/ne_NP/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/ne_NP/suppliers.lang b/htdocs/langs/ne_NP/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/ne_NP/suppliers.lang
+++ b/htdocs/langs/ne_NP/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/ne_NP/ticket.lang b/htdocs/langs/ne_NP/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/ne_NP/ticket.lang
+++ b/htdocs/langs/ne_NP/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/ne_NP/users.lang b/htdocs/langs/ne_NP/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/ne_NP/users.lang
+++ b/htdocs/langs/ne_NP/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/ne_NP/website.lang b/htdocs/langs/ne_NP/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/ne_NP/website.lang
+++ b/htdocs/langs/ne_NP/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/ne_NP/zapier.lang b/htdocs/langs/ne_NP/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/ne_NP/zapier.lang
+++ b/htdocs/langs/ne_NP/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index b778d524492..080da3b8334 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -20,7 +20,6 @@ UpdateMvts=Wijzigen van een transactie
 Processing=Verwerken
 EndProcessing=Verwerking beëindigd
 Lineofinvoice=Factuur lijn
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 Docdate=Datum
 Docref=Artikelcode
 TotalVente=Totaal omzet voor belastingen
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index 9e36971311b..c28e7e34745 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -149,7 +149,6 @@ InfDirAlt=Sinds versie 3 is het mogelijk om een alternatieve rootmap te definië
 InfDirExample=<br> <strong>Verklaar</strong> het dan in het bestand <strong>conf.php</strong> <br> $ Dolibarr_main_url_root_alt='/custom' <br> $ Dolibarr_main_document_root_alt='/pad/of/Dolibarr/htdocs/custom' <br> Als deze regels worden becommentarieerd met "#", schakelt u ze gewoon uit door het teken "#" te verwijderen.
 LastStableVersion=Nieuwste stabiele versie
 LastActivationIP=Laatste activerings-IP
-GenericMaskCodes2=<b>{cccc}</b> de clientcode van n tekens <br> <b>{cccc000}</b> de <b>klantcode</b> op n tekens wordt gevolgd door een teller voor de klant. Deze teller die aan de klant is toegewezen, wordt tegelijkertijd opnieuw ingesteld als de globale teller. <br> <b>{tttt}</b> De code van het type van een derde partij op n tekens (zie menu Home - Instellingen - Woordenboek - Typen derde partijen). Als u deze tag toevoegt, verschilt de teller voor elk type derde partij. <br>
 GenericMaskCodes4a=<u>Voorbeeld op de 99e %s van de derde partij TheCompany, met datum 31-01-2007:</u> <br>
 GenericMaskCodes5=<b>ABC {jj} {mm} - {000000}</b> geeft <b>ABC0701-000099</b> <br> <b>{0000 + 100 @ 1} -ZZZ / {dd} / XXX</b> geeft <b>0199-ZZZ / 31 / XXX</b> <br> <b>IN {jj} {mm} - {0000} - {t}</b> geeft <b>IN0701-0099-A</b> als het type bedrijf 'Responsable Inscripto' is met code voor het type dat 'A_RI' is
 UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD-bestandssysteem.
@@ -201,6 +200,7 @@ ModuleCompanyCodePanicum=Retourneer een lege boekhoudcode.
 Module40Name=Verkoper
 Module1780Name=Labels/Categorien
 Module1780Desc=Label/categorie maken (producten, klanten, leveranciers, contacten of leden)
+Module3400Name=Sociale Netwerken
 Permission22=Creëer / wijzig offertes
 Permission24=Valideer offertes
 Permission32=Creëer / wijzig producten / diensten
@@ -225,6 +225,7 @@ DatabasePassword=Databasewachwoord
 Skin=Uiterlijksthema
 DefaultSkin=Standaard uiterlijksthema
 CompanyCurrency=Belangrijkste valuta
+ShowBugTrackLink=Show link "<strong>%s</strong>"
 InfoWebServer=Over webserver
 InfoDatabase=Over de database
 AccountantFileNumber=Code voor boekhouder
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index 460b3139e48..ecf29a418a7 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -4,6 +4,7 @@ BillsCustomer=Klantfactuur
 BillsCustomersUnpaid=Onbetaalde klantfacturen
 BillsCustomersUnpaidForCompany=Onbetaalde afnemersfacturen voor %s
 DisabledBecauseNotErasable=Niet mogelijk omdat het niet kan worden gewist
+CustomersInvoices=Klantfacturen
 PaymentBack=Teruggave
 CustomerInvoicePaymentBack=Teruggave
 CreateCreditNote=Aanmaak krediet nota
@@ -13,6 +14,7 @@ StatusOfGeneratedInvoices=Lijst van genereerde facturen
 BillStatusDraft=Conceptfactuur (moet worden gevalideerd)
 BillShortStatusClosedUnpaid=Afgesloten
 ErrorVATIntraNotConfigured=Intracommunautair btw-nummer nog niet gedefinieerd
+BillTo=Geadresseerd aan
 LastCustomersBills=Laatste %s klantfacturen
 AmountOfBillsByMonthHT=Factuurbedrag per maand (ex BTW)
 RemainderToBill=Nog te factureren
diff --git a/htdocs/langs/nl_BE/boxes.lang b/htdocs/langs/nl_BE/boxes.lang
index 030c0a528c9..ec54c5aa572 100644
--- a/htdocs/langs/nl_BE/boxes.lang
+++ b/htdocs/langs/nl_BE/boxes.lang
@@ -24,4 +24,3 @@ BoxTitleLastModifiedPropals=Laatste %s gewijzigde offertes
 LastXMonthRolling=De laatste %s maand rollen
 ChooseBoxToAdd=Widget toevoegen aan uw dashbord
 BoxAdded=Widget is toegevoegd in je dashbord
-AccountancyHome=Boekhouding
diff --git a/htdocs/langs/nl_BE/categories.lang b/htdocs/langs/nl_BE/categories.lang
index 9d86adc7acd..9f02159c12d 100644
--- a/htdocs/langs/nl_BE/categories.lang
+++ b/htdocs/langs/nl_BE/categories.lang
@@ -10,7 +10,6 @@ ProductsCategoriesArea=Producten/Diensten  tags/categorieën omgeving
 CustomersCategoriesArea=Klanten tags/categorieën omgeving
 MembersCategoriesArea=Leden tags/categorieën omgeving
 ContactsCategoriesArea=Contacten tags/categorieën omgeving
-AccountsCategoriesArea=Accounts tags/categorieën omgeving
 ProjectsCategoriesArea=Projecten tags/categorieën omgeving
 CatList=Lijst van tags/categorieën
 NewCategory=Nieuwe tag/categorie
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index b62eb40a97c..3c215ffb8f4 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -14,8 +14,6 @@ ThirdParty=Derde partij
 ThirdParties=Derden
 ThirdPartySuppliers=Verkopers
 ThirdPartyType=Soort derde partij
-ReportByMonth=Rapport per maand
-ReportByCustomers=Rapport per klant
 RegisteredOffice=Maarschappelijke zetel
 NatureOfThirdParty=Aard van derden
 StateShort=Staat
diff --git a/htdocs/langs/nl_BE/compta.lang b/htdocs/langs/nl_BE/compta.lang
index 26787bfc20f..3e62ccae353 100644
--- a/htdocs/langs/nl_BE/compta.lang
+++ b/htdocs/langs/nl_BE/compta.lang
@@ -18,9 +18,7 @@ Refund=Teruggave
 CustomerAccountancyCodeShort=Klantcode
 SupplierAccountancyCodeShort=Leverancierscode
 PaySocialContribution=Betaal een sociale bijdrage/belasting
-ConfirmPaySocialContribution=Bent u zeker dat u deze sociale bijdrage/belasting als "betaald" wil classeren?
 DeleteSocialContribution=Verwijder betaling sociale bijdrage/belasting
-ConfirmDeleteSocialContribution=Bent u zeker dat u deze sociale bijdrage/belasting betaling wil verwijderen?
 ExportDataset_tax_1=sociale bijdragen/belastingen en betalingen
 CalcModeLT1Debt=Modus <b>%sRE op afnemersfacturen%s</b>
 CalcModeLT1Rec=Modus <b>%sRE op leveranciersfacturen%s</b>
diff --git a/htdocs/langs/nl_BE/externalsite.lang b/htdocs/langs/nl_BE/externalsite.lang
index 9fdddaacccf..4f3aab4c69f 100644
--- a/htdocs/langs/nl_BE/externalsite.lang
+++ b/htdocs/langs/nl_BE/externalsite.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link naar externe website
-ExternalSiteURL=Externe Site URL
 ExternalSiteModuleNotComplete=Module ExternalSite werd niet correct geconfigureerd.
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 293c494d51e..0e84429bb41 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -62,7 +62,7 @@ UserModificationShort=Modif. gebruiker
 UserValidationShort=Geldig. gebruiker
 CurrencyRate=Wisselkoers van valuta
 UserModif=Gebruiker van laatste update
-PriceUHTCurrency=UP (valuta)
+Amount=Hoeveelheid
 MulticurrencyRemainderToPay=Blijf betalen, oorspronkelijke valuta
 MulticurrencyAmountHT=Bedrag (excl. Btw), oorspronkelijke valuta
 MulticurrencyAmountTTC=Bedrag (incl. Btw), oorspronkelijke valuta
diff --git a/htdocs/langs/nl_BE/margins.lang b/htdocs/langs/nl_BE/margins.lang
index 329a0adf015..c2f7c5946ca 100644
--- a/htdocs/langs/nl_BE/margins.lang
+++ b/htdocs/langs/nl_BE/margins.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - margins
 MarginOnProducts=Marge / Producten
 ForceBuyingPriceIfNull=Gebruik de koop/kost prijs als verkoopsprijs indien niet gedefinieerd
-ForceBuyingPriceIfNullDetails=Indien koop/kost prijs niet gedefinieerd is, en deze optie is "ON", dan zal de marge nul zijn op deze lijn (koop/kost prijs = verkoopsprijs), anderzijds ("OFF"), marge zal gelijk zijn aan het gesuggereerde voorstel.
 UseDiscountAsProduct=Als een product
 MargeType3=Marge op kostprijs
 AgentContactType=Contacttype van commercieel medewerker
diff --git a/htdocs/langs/nl_BE/modulebuilder.lang b/htdocs/langs/nl_BE/modulebuilder.lang
new file mode 100644
index 00000000000..fe17c59910b
--- /dev/null
+++ b/htdocs/langs/nl_BE/modulebuilder.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/nl_BE/ticket.lang b/htdocs/langs/nl_BE/ticket.lang
index 943c019bd35..f1e3f473db3 100644
--- a/htdocs/langs/nl_BE/ticket.lang
+++ b/htdocs/langs/nl_BE/ticket.lang
@@ -46,8 +46,6 @@ TicketsShowModuleLogo=Geef het logo van de module weer in de openbare interface
 TicketsShowModuleLogoHelp=Schakel deze optie in om de logo module te verbergen op de pagina's van de openbare interface
 TicketsShowCompanyLogo=Geef het logo van het bedrijf weer in de openbare interface
 TicketsShowCompanyLogoHelp=Schakel deze optie in om het logo van het hoofdbedrijf te verbergen op de pagina's van de openbare interface
-TicketsEmailAlsoSendToMainAddress=Stuur ook een bericht naar het hoofd e-mailadres
-TicketsEmailAlsoSendToMainAddressHelp=Schakel deze optie in om een ​​e-mail te sturen naar het e-mailadres "Kennisgevings e-mail van" (zie onderstaande instellingen)
 TicketsLimitViewAssignedOnlyHelp=Alleen tickets die aan de huidige gebruiker zijn toegewezen, zijn zichtbaar. Is niet van toepassing op een gebruiker met rechten voor ticket beheer.
 TicketsActivatePublicInterface=Activeer de publieke interface
 TicketsActivatePublicInterfaceHelp=Met de openbare interface kunnen bezoekers tickets maken.
diff --git a/htdocs/langs/nl_BE/withdrawals.lang b/htdocs/langs/nl_BE/withdrawals.lang
deleted file mode 100644
index facdefc082f..00000000000
--- a/htdocs/langs/nl_BE/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 13032515f54..bcbe3e6525d 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -4,7 +4,7 @@ Accounting=Boekhouding
 ACCOUNTING_EXPORT_SEPARATORCSV=Kolom separator voor export bestand
 ACCOUNTING_EXPORT_DATE=Datumnotatie voor exportbestand
 ACCOUNTING_EXPORT_PIECE=Exporteer het aantal stuks
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exporteer met algemeen account
 ACCOUNTING_EXPORT_LABEL=Export label
 ACCOUNTING_EXPORT_AMOUNT=Export bedrag
 ACCOUNTING_EXPORT_DEVISE=Export valuta
@@ -16,8 +16,8 @@ ThisService=Deze dienst
 ThisProduct=Dit product
 DefaultForService=Standaard bij dienst
 DefaultForProduct=Standaard bij product
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Product voor deze relatie
+ServiceForThisThirdparty=Service voor deze relatie
 CantSuggest=Geen voorstel
 AccountancySetupDoneFromAccountancyMenu=Meeste instellingen boekhouding worden gedaan vanuit menu %s
 ConfigAccountingExpert=Configuratie van boekhoud-module (dubbel boekhouden)
@@ -131,7 +131,7 @@ InvoiceLinesDone=Gekoppelde factuurregels
 ExpenseReportLines=Te koppelen kostenboekingen
 ExpenseReportLinesDone=Gekoppelde kostenboekingen
 IntoAccount=Koppel regel aan grootboekrekening
-TotalForAccount=Totaal grootboekrekening
+TotalForAccount=Total accounting account
 
 
 Ventilate=Koppelen
@@ -209,7 +209,7 @@ Codejournal=Journaal
 JournalLabel=Journaal label
 NumPiece=Boekingstuk
 TransactionNumShort=Transactienummer
-AccountingCategory=Gepersonaliseerde groepen
+AccountingCategory=Custom group
 GroupByAccountAccounting=Groeperen op grootboekrekening
 GroupBySubAccountAccounting=Groepeer op subgrootboekrekening
 AccountingAccountGroupsDesc=Hier kunt u enkele grootboekrekening-groepen definiëren. Deze worden gebruikt voor gepersonaliseerde boekhoudrapporten.
@@ -227,7 +227,7 @@ ConfirmDeleteMvtPartial=Hiermee wordt de boeking uit de boekhouding verwijderd (
 FinanceJournal=Kas/Bank journaal
 ExpenseReportsJournal=Overzicht resultaatrekening
 DescFinanceJournal=Financieel journaal inclusief alle soorten betalingen per kas/bankrekening
-DescJournalOnlyBindedVisible=Deze boeking is gebonden aan een boekhoudkundige rekening en kan worden opgenomen in de dagboeken en het grootboek.
+DescJournalOnlyBindedVisible=Deze boeking is gekoppeld aan een tegenrekening en kan worden opgenomen in de dagboeken en het grootboek.
 VATAccountNotDefined=BTW rekeningen niet gedefinieerd
 ThirdpartyAccountNotDefined=Grootboekrekening van relatie niet gedefinieerd
 ProductAccountNotDefined=Grootboekrekening producten niet gedefinieerd
@@ -323,8 +323,8 @@ ErrorAccountingJournalIsAlreadyUse=Dit dagboek is al in gebruik
 AccountingAccountForSalesTaxAreDefinedInto=Opmerking: Grootboekrekeningen voor BTW worden vastgelegd in menukeuze <b>%s</b>-<b>%s</b>
 NumberOfAccountancyEntries=Aantal boekingen
 NumberOfAccountancyMovements=Aantal veranderingen
-ACCOUNTING_DISABLE_BINDING_ON_SALES=Schakel het koppelen en doorboeken naar de boekhouding van verkopen uit (facturen van klanten worden niet in aanmerking genomen in de boekhouding)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Schakel het koppelen en doorboeken naar de  boekhouding op inkopen uit (facturen van leveranciers worden niet meegerekend in de boekhouding)
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Schakel het koppelen en doorboeken naar de boekhouding van verkopen uit (facturen van klanten worden niet opgenomen in de boekhouding)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Schakel het koppelen en doorboeken naar de  boekhouding van inkopen uit (facturen van leveranciers worden niet doorgeboekt in de boekhouding)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Schakel het koppelen en doorboeken naar de boekhouding van onkostendeclaraties uit (met onkostendeclaraties wordt geen rekening gehouden in de boekhouding)
 
 ## Export
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Regels die nog niet zijn gebonden, gebruik het menu <
 
 ## Import
 ImportAccountingEntries=Boekingen
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Exportdatum
 WarningReportNotReliable=Waarschuwing, dit rapport is niet gebaseerd op het grootboek, dus bevat het niet de transactie die handmatig in het grootboek is gewijzigd. Als uw journalisatie up-to-date is, is de weergave van de boekhouding nauwkeuriger.
 ExpenseReportJournal=Kostenoverzicht
 InventoryJournal=Inventarisatie
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 7459ec2257a..226316eaa51 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Verwijder sessieblokkering
 YourSession=Uw sessie
 Sessions=Gebruikerssessies
 WebUserGroup=Webserver gebruiker / groep
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Machtigingen voor bestanden in de hoofdmap van het web
 PermissionsOnFile=Rechten op bestand %s
 NoSessionFound=Uw PHP-configuratie lijkt geen lijst van actieve sessies toe te staan. De map die wordt gebruikt om sessies op te slaan ( <b>%s</b> ) kan worden beschermd (bijvoorbeeld door OS machtigingen of door PHP richtlijn open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Opmerking: Ja, is alleen effectief als module <b>%s</b> is geact
 RemoveLock=Verwijder / hernoem het bestand <b>%s</b> als het bestaat, om het gebruik van de update / installatie-tool toe te staan.
 RestoreLock=Herstel het bestand <b>%s</b> , met alleen leesrechten, om verder gebruik van de update / installatie-tool uit te schakelen.
 SecuritySetup=Beveiligingsinstellingen
+PHPSetup=PHP setup
 SecurityFilesDesc=Definieer hier de opties met betrekking tot beveiliging bij het uploaden van bestanden.
 ErrorModuleRequirePHPVersion=Fout, deze module vereist PHP versie %s of hoger.
 ErrorModuleRequireDolibarrVersion=Fout, deze module vereist Dolibarr versie %s of hoger.
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Dit gebied biedt beheerfuncties. Gebruik het menu om de gewe
 Purge=Leegmaken
 PurgeAreaDesc=Op deze pagina kunt u alle bestanden verwijderen die zijn gegenereerd of opgeslagen door Dolibarr (tijdelijke bestanden of alle bestanden in de map <b>%s</b> ). Het gebruik van deze functie is normaal gesproken niet nodig. Het wordt aangeboden als een oplossing voor gebruikers van wie Dolibarr wordt gehost door een provider die geen machtigingen biedt voor het verwijderen van bestanden die zijn gegenereerd door de webserver.
 PurgeDeleteLogFile=Verwijder logbestanden <b>%s</b> aangemaakt door de Syslog module (Geen risico op verlies van gegevens)
-PurgeDeleteTemporaryFiles=Verwijder alle log- en tijdelijke bestanden (geen risico op gegevensverlies). Opmerking: tijdelijke bestanden worden alleen verwijderd als de tijdelijke map meer dan 24 uur geleden is gemaakt.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Verwijder logboek en tijdelijke bestanden
 PurgeDeleteAllFilesInDocumentsDir=Verwijder alle bestanden in de map: <b>%s</b> . <br> Hiermee worden alle gegenereerde documenten met betrekking tot elementen (relaties, facturen, enz ...), bestanden die zijn geüpload naar de ECM module, database back-up dumps en tijdelijke bestanden verwijderd.
 PurgeRunNow=Nu opschonen
@@ -232,6 +234,7 @@ BoxesAvailable=Beschikbare widgets
 BoxesActivated=Widgets geactiveerd
 ActivateOn=Activeren op
 ActiveOn=Geactiveerd op
+ActivatableOn=Activatable on
 SourceFile=Bronbestand
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Alleen beschikbaar als JavaScript en AJAX niet zijn uitgeschakeld
 Required=Verplicht
@@ -347,9 +350,10 @@ LastActivationAuthor=Laatste activeringsauteur
 LastActivationIP=Laatste activering IP-adres
 UpdateServerOffline=Updateserver offline
 WithCounter=Beheer een teller
-GenericMaskCodes=U kunt elk gewenst maskernummer invoeren. In dit masker, kunnen de volgende tags worden gebruikt:<br><b>{000000}</b> correspondeert met een nummer welke vermeerderd zal worden op elke %s. Voer zoveel nullen in als de gewenste lengte van de teller. De teller wordt aangevuld met nullen vanaf links zodat er zoveel nullen zijn als in het masker.<br><b>{000000+000}</b> hetzelfde als voorgaand maar een offset corresponderend met het nummer aan de rechterkant van het + teken is toegevoegd startend op de eerste %s. <br><b>{000000@x}</b> hetzelfde als voorgaande maar de teller wordt gereset naar nul, wanneer maand x is bereikt (x tussen 1 en 12). Als deze optie is gebruikt en x is 2 of hoger, dan is de volgorde {yy}{mm} of {yyyy}{mm} ook vereist. <br><b>{dd}</b> dag (01 t/m 31).<br><b>{mm}</b> maand (01 t/m 12).<br><b>{yy}</b>, <b>{yyyy}</b> of <b>{y}</b> jaat over 2, 4 of 1 nummer(s). <br>
-GenericMaskCodes2=<b>{cccc}</b>de cliëntcode op n tekens<br> <b>{cccc000}</b> de cliëntcode op n tekens wordt gevolgd door een teller die is toegewezen aan de klant. Deze teller voor de klant wordt op hetzelfde moment gereset als de globale teller.<br><b> {tttt}</b> De code van het type van derden op n tekens (zie menu Home - Set-up - Woordenboek - Soorten derden) . Als u deze label toevoegt, is de teller anders voor elk type derde partij.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.<br>Spaties zijn niet toegestaan.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Voorbeeld op de 99e %s van relaties TheCompany, met datum 2007-01-31: </u><br>
 GenericMaskCodes4b=<u>Voorbeeld van een Klant gecreëerd op 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Voorbeeld op product gemaakt op 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Dit veld leeg laten betekent dat deze waarde zonder
 ExtrafieldParamHelpselect=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> code3, waarde3 <br> ... <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> 1, waarde1 | options_ <i>parent_list_code</i> : parent_key <br> 2, <i>value2</i> | options_ <i>parent_list_code</i> : parent_key <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> 1, waarde1 | <i>parent_list_code</i> : parent_key <br> 2, waarde2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
 ExtrafieldParamHelpradio=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
-ExtrafieldParamHelpsellist=Lijst met waarden komen van een tabel<br>Syntax: table_name:label_field:id_field::filter<br>Bijvoorbeeld: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Lijst met waarden komt uit een tabel <br> Syntaxis: tabelnaam: labelveld: id_veld :: filter <br> Voorbeeld: c_typent: libelle: id :: filter <br><br> filter kan een eenvoudige test zijn (bijv. actief = 1) om alleen de actieve waarde weer te geven <br> U kunt ook $ ID $ gebruiken in filter waarvan de huidige id van het huidige object is <br> Gebruik $ SEL $ om een SELECT in filter te doen <br> Als u op extra velden wilt filteren, gebruikt u syntaxis extra.fieldcode = ... (waarbij veldcode de code van extraveld is) <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters moeten Objectnaam: Classpath<br> Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Blijf leeg voor een eenvoudig scheidingsteken <br> Stel dit in op 1 voor een samenvouwend scheidingsteken (standaard geopend voor nieuwe sessie, dan wordt de status behouden voor elke gebruikerssessie) <br> Stel dit in op 2 voor een samenvouwend scheidingsteken (standaard samengevouwen voor nieuwe sessie, dan wordt de status behouden voor elke gebruikerssessie)
 LibraryToBuildPDF=Gebruikte library voor generen PDF
@@ -541,6 +545,8 @@ Module40Name=Leveranciers
 Module40Desc=Leveranciers en inkoopbeheer (inkooporders en facturering van leveranciersfacturen)
 Module42Name=Debug logs
 Module42Desc=Mogelijkheden voor een log (file,syslog, ...). Deze log-files zijn voor technische/debug ondersteuning.
+Module43Name=Foutopsporingsbalk
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editorbeheer
 Module50Name=Producten
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capaciteitconversie GeoIP Maxmind
 Module3200Name=Niet aanpasbare archieven
 Module3200Desc=Schakel een niet aanpasbaar logboek van zakelijke evenementen in. Evenementen worden in realtime gearchiveerd. Het logboek is een alleen-lezen tabel met gekoppelde gebeurtenissen die kunnen worden geëxporteerd. Deze module kan voor sommige landen verplicht zijn.
+Module3400Name=Sociale netwerken
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (afdelingsbeheer, werknemerscontracten en sentiment)
 Module5000Name=Multi-bedrijf
 Module5000Desc=Hiermee kunt meerdere bedrijven beheren in Dolibarr
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatisch aanmaken van object en/of automatische statusverandering)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Maak websites (openbaar) met een WYSIWYG-editor. Dit is een webmaster of ontwikkelaar gericht CMS (kennis van HTML- en CSS-taal is gewenst). Stel uw webserver (Apache, Nginx, ...) in zodat deze naar de speciale Dolibarr-directory verwijst om deze online op internet te hebben met uw eigen domeinnaam.
 Module20000Name=Verlof aanvraagbeheer
@@ -670,7 +678,7 @@ Module54000Desc=Direct afdrukken (zonder de documenten te openen) met behulp van
 Module55000Name=Poll, Onderzoek of Stemmen
 Module55000Desc=Maak online polls, enquêtes of stemmen (zoals Doodle, Studs, RDVz enz ...)
 Module59000Name=Marges
-Module59000Desc=Module to follow margins
+Module59000Desc=Module om de marges te volgen
 Module60000Name=Commissies
 Module60000Desc=Module om commissies te beheren
 Module62000Name=Incoterms
@@ -805,7 +813,8 @@ PermissionAdvanced253=Creëer / wijzig de rechten van internet / externe gebruik
 Permission254=Verwijderen of uitschakelen van andere gebruikers
 Permission255=Wachtwoord andere gebruikers wijzigen
 Permission256=Andere gebruikers verwijderen of uitschakelen
-Permission262=Toegang uitbreiden tot alle derde partijen (niet alleen derde partijen waarvoor die gebruiker een verkoopvertegenwoordiger is). <br> Niet effectief voor externe gebruikers (altijd beperkt tot zichzelf voor voorstellen, bestellingen, facturen, contracten, enz.). <br> Niet effectief voor projecten (alleen regels over projectmachtigingen, zichtbaarheid en toewijzingsaangelegenheden).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Lees CA
 Permission272=Facturen inzien
 Permission273=Facturen uitgeven
@@ -1175,7 +1184,8 @@ SetupDescription2=De volgende twee secties zijn verplicht (de twee eerste vermel
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Basisparameters die worden gebruikt om het standaardgedrag van uw toepassing aan te passen (bijvoorbeeld voor landgerelateerde functies).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Dit programma is een samenstelling van vele modules / applicaties. De modules die betrekking hebben op uw behoeften moeten worden ingeschakeld en geconfigureerd. Menu-items verschijnen met de activering van deze modules.
 SetupDescription5=Andere items in het Setup-menu beheren optionele parameters.
-LogEvents=Veiligheidsauditgebeurtenissen
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=Over Dolibarr
 InfoBrowser=Over Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Het uitvoeren van het upgradeproces lijkt vere
 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=Retourneert het referentienummer met het formaat %syymm-nnnn waarbij yy jaar is, mm is maand en nnnn is sequentieel zonder reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Toon professionele id met adressen
 ShowVATIntaInAddress=Verberg intracommunautair btw-nummer met adressen
 TranslationUncomplete=Onvolledige vertaling
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxyserver: naam/adres
 MAIN_PROXY_PORT=Proxyserver: poort
 MAIN_PROXY_USER=Proxyserver: Inloggen/Gebruiker
 MAIN_PROXY_PASS=Proxy-server: wachtwoord
-DefineHereComplementaryAttributes=Definieer hier eventuele aanvullende/aangepaste kenmerken waarvoor u wilt worden opgenomen: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Aanvullende attributen
 ExtraFieldsLines=Aanvullende kenmerken (lijnen)
 ExtraFieldsLinesRec=Aanvullende attributen (sjablonen factuurregels)
@@ -1308,7 +1318,7 @@ YouUseBestDriver=U gebruikt stuurprogramma %s, het beste stuurprogramma dat mome
 YouDoNotUseBestDriver=U gebruikt stuurprogramma %s maar stuurprogramma %s wordt aanbevolen.
 NbOfObjectIsLowerThanNoPb=U hebt alleen %s %s in de database. Dit vereist geen specifieke optimalisatie.
 SearchOptim=Zoekmachine optimalisatie
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=U hebt %s %s in de database. U kunt de constante %s toevoegen aan 1 in Home-Instellingen-Andere instellingen. Beperk de zoekopdracht tot het begin van strings, waardoor de database indexen kan gebruiken en u onmiddellijk antwoord zou moeten krijgen.
 YouHaveXObjectAndSearchOptimOn=U hebt %s %s in de database en constante %s is ingesteld op 1 in Home-Setup-Other.
 BrowserIsOK=U gebruikt de webbrowser %s. Deze browser is geschikt voor beveiliging en prestaties.
 BrowserIsKO=U gebruikt de webbrowser %s. Deze browser staat bekend als een slechte keuze voor beveiliging, prestaties en betrouwbaarheid. We raden aan om Firefox, Chrome, Opera of Safari te gebruiken.
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Gebruikersnaam (Unix)
 LDAPFieldLoginExample=Voorbeeld: uid
 LDAPFilterConnection=Zoekfilter
 LDAPFilterConnectionExample=Voorbeeld: &amp; (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Gebruikersnaam (samba, activedirectory)
 LDAPFieldLoginSambaExample=Voorbeeld: samaccountname
 LDAPFieldFullname=Voornaam Achternaam
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Uw bedrijf is ingesteld als zijnde vrijgesteld van BTW
 AccountancyCode=Grootboekrekening
 AccountancyCodeSell=Boekhoudkundige afnemerscode
 AccountancyCodeBuy=Boekhoudkundige leverancierscode
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Acties- en agendamoduleinstellingen
 PasswordTogetVCalExport=autorisatiecode van de exportlink
+SecurityKey = Security Key
 PastDelayVCalExport=Exporteer geen gebeurtenissen ouder dan
 AGENDA_USE_EVENT_TYPE=Gebruik gebeurtenistypen (beheerd in menu Setup -&gt; Woordenboeken -&gt; Type agenda-evenementen)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Stel deze standaardwaarde automatisch in voor het type evenement in het formulier voor het maken van een evenement
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Achtergrondkleur voor oneven tabellijnen
 BackgroundTableLineEvenColor=Achtergrondkleur voor gelijkmatige tabellijnen
 MinimumNoticePeriod=Minimale opzegtermijn (uw verlofaanvraag moet vóór deze vertraging worden gedaan)
 NbAddedAutomatically=Aantal dagen toegevoegd aan tellers van gebruikers (automatisch) elke maand
-EnterAnyCode=Dit veld bevat een referentie om de lijn te identificeren. Voer een waarde naar keuze in, maar zonder speciale tekens.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Voer 0 of 1 in
 UnicodeCurrency=Voer hier tussen accolades in, lijst met byte-nummers die het valutasymbool vertegenwoordigen. Bijvoorbeeld: voer voor $ [36] in - voor Brazilië real R $ [82,36] - voer voor € [8364] in
 ColorFormat=De RGB-kleur heeft het HEX-formaat, bijvoorbeeld: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Onder-marge op PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Hoogte voor logo op PDF
 NothingToSetup=Er is geen specifieke installatie vereist voor deze module.
 SetToYesIfGroupIsComputationOfOtherGroups=Stel dit in op Ja als deze groep een berekening van andere groepen is
-EnterCalculationRuleIfPreviousFieldIsYes=Voer de berekeningsregel in als het vorige veld was ingesteld op Ja (bijvoorbeeld &#39;CODEGRP1 + CODEGRP2&#39;)
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Verschillende taalvarianten gevonden
 RemoveSpecialChars=Verwijder speciale tekens
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex-filter om waarde te reinigen (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Installatie van module Sociale netwerken
 EnableFeatureFor=Functies inschakelen voor <strong>%s</strong>
 VATIsUsedIsOff=Opmerking: De optie om omzetbelasting of btw te gebruiken is ingesteld op <strong>Uit</strong> in het menu %s - %s, dus gebruikte omzetbelasting of btw is altijd 0 voor verkoop.
 SwapSenderAndRecipientOnPDF=Wissel afzender- en ontvangeradrespositie op PDF-documenten in
-FeatureSupportedOnTextFieldsOnly=Waarschuwing, functie wordt alleen ondersteund op tekstvelden. Ook moet een URL-parameter action = create of action = edit worden ingesteld OF de paginanaam moet eindigen op &#39;new.php&#39; om deze functie te activeren.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email verzamelaar
 EmailCollectorDescription=Voeg een geplande taak en een installatiepagina toe om regelmatig e-mailboxen te scannen (met het IMAP-protocol) en ontvangen e-mails op te nemen in uw toepassing, op de juiste plaats en / of maak automatisch enkele records aan (zoals leads).
 NewEmailCollector=Nieuwe e-mailverzamelaar
@@ -2049,8 +2062,11 @@ UseDebugBar=Gebruik de foutopsporingsbalk
 DEBUGBAR_LOGS_LINES_NUMBER=Aantal laatste logboekregels dat in de console moet worden bewaard
 WarningValueHigherSlowsDramaticalyOutput=Waarschuwing, hogere waarden vertragen de uitvoer dramatisch
 ModuleActivated=Module %s is geactiveerd en vertraagt de interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Als u zich in een productieomgeving bevindt, moet u deze eigenschap instellen op %s.
 AntivirusEnabledOnUpload=Antivirus ingeschakeld op geüploade bestanden
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Exportmodellen zijn met iedereen te delen
 ExportSetup=Installatie van exportmodule
 ImportSetup=Instellen van module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Maak een anonieme ping &#39;+1&#39; naar de Dolibarr-fundering
 FeatureNotAvailableWithReceptionModule=Functie niet beschikbaar wanneer module-ontvangst is ingeschakeld
 EmailTemplate=Sjabloon voor e-mail
 EMailsWillHaveMessageID=E-mails hebben een tag 'Verwijzingen' die overeenkomen met deze syntaxis
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Als u wilt dat sommige teksten in uw PDF worden gedupliceerd in 2 verschillende talen in dezelfde gegenereerde PDF, moet u hier deze tweede taal instellen, zodat de gegenereerde PDF 2 verschillende talen op dezelfde pagina bevat, degene die is gekozen bij het genereren van PDF en deze ( slechts enkele PDF-sjablonen ondersteunen dit). Voor 1 taal per pdf leeg houden.
 FafaIconSocialNetworksDesc=Voer hier de code van een FontAwesome-pictogram in. Als je niet weet wat FontAwesome is, kun je het generieke waarde fa-adresboek gebruiken.
 FeatureNotAvailableWithReceptionModule=Functie niet beschikbaar wanneer module-ontvangst is ingeschakeld
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Het wijzigen van deze waarde naar %s wordt aanbevol
 DictionaryProductNature= Aard van het product
 CountryIfSpecificToOneCountry=Land (indien specifiek voor een bepaald land)
 YouMayFindSecurityAdviceHere=Mogelijk vindt u hier beveiligingsadvies
-ModuleActivatedMayExposeInformation=Deze module kan gevoelige gegevens blootleggen. Schakel het uit als u het niet nodig heeft.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=Een module ontworpen voor de ontwikkeling is ingeschakeld. Schakel het niet in bij een productieomgeving.
 CombinationsSeparator=Scheidingsteken voor productcombinaties
 SeeLinkToOnlineDocumentation=Zie link naar online documentatie in het bovenste menu voor voorbeelden
 SHOW_SUBPRODUCT_REF_IN_PDF=Als de functie "%s" van module <b>%s</b> wordt gebruikt, toon dan de details van subproducten van een kit op PDF.
 AskThisIDToYourBank=Neem contact op met uw bank om deze ID te krijgen
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 5350f4939a7..b96756964f8 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Uw SEPA mandaat
 FindYourSEPAMandate=Met deze SEPA machtiging geeft u ons bedrijf toestemming een opdracht ter incasso te sturen naar uw bank. Retourneer het ondertekend (scan van het ondertekende document) of stuur het per e-mail naar
 AutoReportLastAccountStatement=Vul bij het automatisch afstemmen het veld 'aantal bankafschriften' in met het laatste afschrift nummer.
 CashControl=POS kassa controle
-NewCashFence=Nieuwe kassa sluiting
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Inkleuren mutaties
 BankColorizeMovementDesc=Als deze functie is ingeschakeld, kunt u een specifieke achtergrondkleur kiezen voor debet- of creditmutaties
 BankColorizeMovementName1=Achtergrondkleur voor debetmutatie
 BankColorizeMovementName2=Achtergrondkleur voor creditmutatie
 IfYouDontReconcileDisableProperty=Als u op sommige bankrekeningen geen bankafstemmingen uitvoert, schakelt u de eigenschap "%s" uit om deze waarschuwing te verwijderen.
-NoBankAccountDefined=No bank account defined
+NoBankAccountDefined=Geen bankrekening gedefinieerd
+NoRecordFoundIBankcAccount=Geen record gevonden in de bankrekening. Vaak gebeurt dit wanneer een record handmatig is verwijderd uit de lijst van banktransacties (bijvoorbeeld tijdens een reconciliatie van de bankrekening). Een andere reden is dat de betaling was vastgelegd terwijl module "%s" was uitgeschakeld.
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 845323b0228..67c2d0e00a5 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -52,11 +52,12 @@ Invoices=Facturen
 InvoiceLine=Factuur online
 InvoiceCustomer=Afnemersfactuur
 CustomerInvoice=Afnemersfactuur
-CustomersInvoices=Afnemersfacturen
+CustomersInvoices=Klantenfactuur
 SupplierInvoice=Factuur leverancier
-SuppliersInvoices=Facturen leveranciers
+SuppliersInvoices=Inkoopfacturen
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Factuur leverancier
-SupplierBills=leveranciersfacturen
+SupplierBills=Inkoopfacturen
 Payment=Betaling
 PaymentBack=Terugbetaling
 CustomerInvoicePaymentBack=Terugbetaling
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Betalingen gedaan
 PaymentsBackAlreadyDone=Al betaalde restitutie
 PaymentRule=Betalingsvoorwaarde
 PaymentMode=Betaalwijze
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debet / Kredietkaart
 PaymentTypePP=PayPal
 IdPaymentMode=Betaalwijze (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Aanmaakdatum laatste factuur
 DateLastGenerationShort=Datum laatste aanmaak
 MaxPeriodNumber=Max. aantal factuurgeneratie
 NbOfGenerationDone=Aantal reeds aangemaakte facturen
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Aantal malen gegenereerd
 MaxGenerationReached=Maximum aantal aanmaken bereikt
 InvoiceAutoValidate=Valideer facturen automatisch
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Binnen 14 dagen na het einde van de maand
 FixAmount=Vast bedrag - 1 regel met label '%s'
 VarAmount=Variabel bedrag  (%% tot.)
 VarAmountOneLine=Variabel aantal (%% tot.) - 1 regel met label '%s'
-VarAmountAllLines=Variabel bedrag (%% tot.) - allemaal dezelfde regels
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bankoverboeking
 PaymentTypeShortVIR=Bankoverboeking
@@ -494,12 +498,16 @@ Cash=Contant
 Reported=Uitgestelde
 DisabledBecausePayments=Niet beschikbaar omdat er betalingen bestaan
 CantRemovePaymentWithOneInvoicePaid=Verwijder onmogelijk wanneer er minstens een factuur betaald is ingedeeld.
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Verwachte betaling
 CantRemoveConciliatedPayment=Kan de afgestemde betaling niet verwijderen
 PayedByThisPayment=Betaald door deze betaling
 ClosePaidInvoicesAutomatically=Classificeer automatisch alle standaard, aanbetaling of vervangende facturen als "Betaald" wanneer de betaling volledig is uitgevoerd.
 ClosePaidCreditNotesAutomatically=Classificeer automatisch alle creditnota's als "Betaald" wanneer de terugbetaling volledig is gedaan.
 ClosePaidContributionsAutomatically=Classificeer automatisch alle sociale of fiscale bijdragen als "Betaald" bij volledige betaling.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Alle volledig betaalde facturen worden automatisch afgesloten met de status "Betaald".
 ToMakePayment=Betaal
 ToMakePaymentBack=Terugbetalen
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Maak eerst een standaard factuur en conver
 PDFCrabeDescription=Factuur PDF-sjabloon Crabe. Een volledig factuursjabloon (oude implementatie van Sponge-sjabloon)
 PDFSpongeDescription=Factuur PDF-sjabloon Sponge. Een complete sjabloon voor een factuur
 PDFCrevetteDescription=Factuur PDF-sjabloon 'Crevette'. Een compleet sjabloon voor facturen
-TerreNumRefModelDesc1=Geeft een getal in de vorm van %syymm-nnnn voor standaard facturen en %syymm-nnnn voor creditnota's, met yy voor jaar, mm voor maand en nnnn als opeenvolgende getallenreeks die niet terug op 0 komt
-MarsNumRefModelDesc1=Weergave met het formaat %syymm-nnnn voor standaardfacturen, %syymm-nnnn voor vervangende facturen, %syymm-nnnn voor aanbetalingsfacturen en %syymm-nnnn voor creditfacturen, waas yy staat voor jaar, mm voor maand en nnnn is de volgorde met geen onderbreking en geen 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Een wetsvoorstel te beginnen met $ syymm bestaat al en is niet compatibel met dit model van de reeks. Verwijderen of hernoemen naar deze module te activeren.
-CactusNumRefModelDesc1=Weergave met het formaat %syymm-nnnn voor standaardfacturen, %syymm-nnnn voor creditnota's en %syymm-nnnn voor facturen met vooruitbetaling waarbij yy jaar is, mm is maand en nnnn een reeks is zonder onderbreking
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Vroege afsluiting reden
 EarlyClosingComment=Vroege afsluiting opmerking
 ##### Types de contacts #####
@@ -562,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Als u dergelijke facturen automatisch wilt lat
 DeleteRepeatableInvoice=Verwijder tijdelijke factuur
 ConfirmDeleteRepeatableInvoice=Weet u zeker dat u dit sjabloon factuur wilt verwijderen?
 CreateOneBillByThird=Orders samentrekken tot één factuur aan per relatie (anders voor elke bestelling één factuur)
-BillCreated=%s rekening(en) gecreëerd
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status aanmaken document
 DoNotGenerateDoc=Maak documentbestand niet aan
 AutogenerateDoc=Automatisch aanmaken documentbestand
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index 49eff98a42e..c6f5429c714 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistieken over de belangrijkste bedrijfsobjecten in de database
 BoxLoginInformation=Login Informatie
 BoxLastRssInfos=RSS-informatie
 BoxLastProducts=Nieuwste %s producten / services
@@ -17,9 +18,13 @@ BoxLastActions=Laatste acties
 BoxLastContracts=Laatste contracten
 BoxLastContacts=Laatste contactpersonen- / adressenlijst
 BoxLastMembers=Laatste leden
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Laatste interventies
 BoxCurrentAccounts=Saldo van de geopende rekening
 BoxTitleMemberNextBirthdays=Verjaardagen van deze maand (leden)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Laatste %s nieuws van %s
 BoxTitleLastProducts=Producten / Diensten: laatste %s bewerkt
 BoxTitleProductsAlertStock=Producten: voorraadalarm
@@ -95,8 +100,8 @@ LastXMonthRolling=De laatste %s maand overschrijdende
 ChooseBoxToAdd=Voeg widget toe aan uw dashboard
 BoxAdded=Widget is toegevoegd in je dashboard
 BoxTitleUserBirthdaysOfMonth=Verjaardagen van deze maand (gebruikers)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
+BoxLastManualEntries=Laatste record in boekhouding handmatig ingevoerd of zonder bron-document
+BoxTitleLastManualEntries=%s laatste record handmatig of zonder bron-document ingevoerd
 NoRecordedManualEntries=Geen handmatige invoer opgenomen in boekhouding
 BoxSuspenseAccount=Tel boekhoudkundige bewerking met tussenrekening
 BoxTitleSuspenseAccount=Aantal niet-toegewezen lijnen
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Laatste %s klantverzendingen
 NoRecordedShipments=Geen geregistreerde klantverzending
 BoxCustomersOutstandingBillReached=Klanten met bereikt limiet
 # Pages
-AccountancyHome=Boekhouden
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Gevalideerde projecten
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 1f1c51d1027..41621088c83 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Gebied met tags / categorieën voor leveranciers
 CustomersCategoriesArea=Klanten kenmerken/categorieën omgeving
 MembersCategoriesArea=Leden kenmerken/categorieën omgeving
 ContactsCategoriesArea=Contacten labels/categorieën omgeving
-AccountsCategoriesArea=Labels/categorieën rekeningen
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Labels/categorieën projecten
 UsersCategoriesArea=Gebruikers tags / categorieën gebied
 SubCats=Sub-categorieën
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Wijs categorie toe aan leverancier
 ShowCategory=Toon label/categorie
 ByDefaultInList=Standaard in de lijst
 ChooseCategory=Kies categorie
-StocksCategoriesArea=Categorieën voor magazijnen
-ActionCommCategoriesArea=Categorieën voor gebeurtenissen
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea= Categorieën voor Page-Container
 UseOrOperatorForCategories=Gebruik of operator voor categorieën
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index c310afcbe4b..87945631845 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -43,9 +43,10 @@ Individual=Particulier
 ToCreateContactWithSameName=Maakt automatisch een contact / adres met dezelfde informatie als de derde partij onder de derde partij. In de meeste gevallen, zelfs als uw derde partij een fysiek persoon is, is het voldoende om alleen een derde partij te maken.
 ParentCompany=Moedermaatschappij
 Subsidiaries=Dochterondernemingen
-ReportByMonth=Rapportage per maand
-ReportByCustomers=Overzicht op klant
-ReportByQuarter=Rapportage naar kwartaal
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Aanspreekvorm
 RegisteredOffice=Statutaire zetel
 Lastname=Achternaam
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI-nummer
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof. id 1 (SIREN)
 ProfId2FR=Prof. id 2 (SIRET)
 ProfId3FR=Prof. Id 3 (NAF, oude APE)
 ProfId4FR=Prof. id 4 (RCS / RM)
-ProfId5FR=EORI-nummer
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Prof. id 1 (Registratienummer)
 ProfId2GB=-
 ProfId3GB=Prof. Id 3 (SIC)
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI-nummer
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof. id 1 (NIPC)
 ProfId2PT=Prof. id 2 (Social security number)
 ProfId3PT=Prof. Id 3 (Commercial Record aantal)
 ProfId4PT=Prof. id 4 (Conservatorium)
-ProfId5PT=EORI-nummer
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI-nummer
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Huidige openstaande rekening
 OutstandingBill=Max. voor openstaande rekening
 OutstandingBillReached=Max. krediet voor openstaande facturen is bereikt
 OrderMinAmount=Minimum orderbedrag
-MonkeyNumRefModelDesc=Retourneer een getal met de notatie %syymm-nnnn voor de klantcode en %syymm-nnnn voor de leverancierscode waarbij yy jaar, mm is maand en nnnn een reeks is zonder pauze en geen terugkeer naar 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Afnemers- / leverancierscode is vrij. Deze code kan te allen tijde worden gewijzigd.
 ManagingDirectors=Manager(s) Naam (CEO, directeur, voorzitter ...)
 MergeOriginThirdparty=Dupliceren third party (third party die u wilt verwijderen)
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 79d8621996a..36e512303e3 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST-aankopen
 VATCollected=Geïnde  BTW
 StatusToPay=Te betalen
 SpecialExpensesArea=Ruimte voor alle bijzondere betalingen
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Sociale of fiscale heffingen/belasting
 SocialContributions=Sociale of fiscale heffingen/belastingen
 SocialContributionsDeductibles=Aftrekbare sociale/fiscale lasten/belastingen
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Afnemersfactuur betaling
 PaymentSupplierInvoice=Betaling leverancier
 PaymentSocialContribution=Sociale/fiscale belastingbetaling
 PaymentVat=BTW betaling
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Betalingenlijst
 ListOfCustomerPayments=Afnemersbetalingenlijst
 ListOfSupplierPayments=Lijst met leveranciersbetalingen
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF betaling
 LT2PaymentsES=IRPF Betalingen
 VATPayment=Betaling verkoop-belasting
 VATPayments=Betalingen verkoop-belasting
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=BTW Terugbetaling
 NewVATPayment=Nieuwe betaling BTW
 NewLocalTaxPayment=Nieuwe belasting %s betaling
@@ -134,9 +138,17 @@ NoWaitingChecks=Geen cheques om af te storten.
 DateChequeReceived=Ontvangstdatum cheque
 NbOfCheques=Aantal cheques
 PaySocialContribution=Betaal een sociale/fiscale vordering
-ConfirmPaySocialContribution=Weet u zeker dat u deze sociale of fiscale belasting wilt classificeren als betaald?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Verwijder een sociale/fiscale betaling
-ConfirmDeleteSocialContribution=Weet u zeker dat u deze sociale- of fiscale belasting-betaling wilt verwijderen?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Sociale- en fiscale belastingen en betalingen
 CalcModeVATDebt=Mode <b>%sBTW op verbintenissenboekhouding %s.</b>
 CalcModeVATEngagement=Mode <b>%sBTW op de inkomens-uitgaven %s.</b>
@@ -163,6 +175,7 @@ RulesResultInOut=- Het omvat de echte betalingen op facturen, uitgaven, btw en s
 RulesCADue=- Het omvat de verschuldigde facturen van de klant, of ze nu zijn betaald of niet. <br> - Het is gebaseerd op de factureringsdatum van deze facturen. <br>
 RulesCAIn=- Het omvat alle effectieve betalingen van facturen ontvangen van klanten. <br> - Het is gebaseerd op de betaaldatum van deze facturen <br>
 RulesCATotalSaleJournal=Het omvat alle kredietlijnen uit het verkoopdagboek.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Het bevat een record in uw grootboek met boekhoudrekeningen met de groep "KOSTEN" of "INKOMSTEN"
 RulesResultBookkeepingPredefined=Het bevat een record in uw grootboek met boekhoudrekeningen met de groep "KOSTEN" of "INKOMSTEN"
 RulesResultBookkeepingPersonalized=Het toont record in uw grootboek met boekhoudrekeningen <b>gegroepeerd op gepersonaliseerde groepen</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Verkoopbelastingrapport door relatie
 VATReportByCustomers=BTW-overzicht per klant
 VATReportByCustomersInInputOutputMode=Bevestigd door de klant btw geïnd en betaald
 VATReportByQuartersInInputOutputMode=Rapportage per belasting tarief van belasting geïnd en betaald
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Rapporteer belasting 2 per tarief
 LT2ReportByQuarters=Belastingaangifte 3 per tarief
 LT1ReportByQuartersES=Rapport per RE-tarief
@@ -217,7 +231,7 @@ Pcg_subtype=Boekhouding ondersoort
 InvoiceLinesToDispatch=Factuurregels te verzenden
 ByProductsAndServices=Op product en service
 RefExt=Externe ref
-ToCreateAPredefinedInvoice=Om een sjabloonfactuur te maken, maakt u een standaardfactuur en klikt u zonder deze te valideren op de knop "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=gekoppeld aan bestelling
 Mode1=Methode 1
 Mode2=Methode 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=De speciale account die is gedefinieerd op de k
 ACCOUNTING_ACCOUNT_SUPPLIER=Grootboekrekening crediteuren
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=De speciale boekhoudrekening die op een kaart van een derde is gedefinieerd, wordt alleen voor boekhouding van Subledger gebruikt. Deze wordt gebruikt voor het grootboek en als standaardwaarde voor de boekhouding van de subadministratie als er geen accountadministratie voor leveranciers bij derden is gedefinieerd.
 ConfirmCloneTax=Bevestig de kloon van een sociale / fiscale belasting
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Kloon het voor volgende maand
 SimpleReport=Eenvoudig rapport
 AddExtraReport=Extra rapportages (voeg een rapport van binnen- en buitenlandse relaties toe)
@@ -253,7 +269,8 @@ AccountingAffectation=Boekhoudopdracht
 LastDayTaxIsRelatedTo=Laatste dag van de periode waarop de belasting betrekking heeft
 VATDue=Verkoopbelasting geclaimd
 ClaimedForThisPeriod=Geclaimd voor de periode
-PaidDuringThisPeriod=Betaald tijdens deze periode
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=Per verkoop belastingtarief
 TurnoverbyVatrate=Omzet gefactureerd per omzetbelasting-tarief
 TurnoverCollectedbyVatrate=Omzet per BTW tarief
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Verzamelde inkoop-omzet
 RulesPurchaseTurnoverDue=- Het bevat de verschuldigde facturen van de leverancier, of ze nu zijn betaald of niet. <br> - Het is gebaseerd op de factuurdatum van deze facturen. <br>
 RulesPurchaseTurnoverIn=- Het omvat alle effectieve betalingen van facturen aan leveranciers. <br> - Het is gebaseerd op de betalingsdatum van deze facturen <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Het bevat alle debetregels uit het inkoopdagboek.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Inkoopbedrag gefactureerd
 ReportPurchaseTurnoverCollected=Verzamelde inkoop-omzet
 IncludeVarpaysInResults = Neem verschillende betalingen op in rapporten
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index b0b224d1835..4fbc753042e 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Bestand nog niet geïndexeerd in database (probeer d
 ExtraFieldsEcmFiles=Extrafields Ecm-bestanden
 ExtraFieldsEcmDirectories=Extrafields Ecm-mappen
 ECMSetup=ECM-instellingen
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index e829cd22faf..754f7955bb9 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Map <b>%s</b> niet gevonden (Verkeerd pad, te weinig rechten of
 ErrorFunctionNotAvailableInPHP=Functie <b>%s</b> is vereist voor deze functionaliteit, maar is niet beschikbaar in deze versie / installatie van PHP.
 ErrorDirAlreadyExists=Er bestaat al een map met deze naam.
 ErrorFileAlreadyExists=Er bestaat al een bestand met deze naam.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Het bestand is niet volledig ontvangen door de server.
 ErrorNoTmpDir=Tijdelijke map %s bestaat niet.
 ErrorUploadBlockedByAddon=Upload geblokkeerd door een PHP- en / of Apache-plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Fout bij het laden van een rekeningschema. Als enkele accou
 ErrorBadSyntaxForParamKeyForContent=Onjuiste syntaxis voor param keyforcontent. Moet een waarde hebben die begint met %s of %s
 ErrorVariableKeyForContentMustBeSet=Fout, de constante met de naam %s (met tekstinhoud om te tonen) of %s (met externe URL om te tonen) moet worden ingesteld.
 ErrorURLMustStartWithHttp=URL %s moet beginnen met http: // of https: //
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Fout, de nieuwe referentie is al gebruikt
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Fout, verwijder betaling gekoppeld aan een gesloten factuur is niet mogelijk.
 ErrorSearchCriteriaTooSmall=Zoekcriteria te klein.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Publieke interface was niet ingeschakeld
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=De taal van een nieuwe pagina moet worden gedefinieerd als deze is ingesteld als een vertaling van een andere pagina
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=De taal van de nieuwe pagina mag niet de brontaal zijn als deze is ingesteld als vertaling van een andere pagina
 ErrorAParameterIsRequiredForThisOperation=Een parameter is verplicht voor deze bewerking
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Pas op, het toevoegen van bestandsinvoer
 WarningTheHiddenOptionIsOn=Pas op, de verborgen optie <b>%s</b> is ingeschakeld.
 WarningCreateSubAccounts=Waarschuwing, u kunt niet rechtstreeks een subaccount aanmaken, u moet een derde partij of een gebruiker aanmaken en hen een boekhoudcode toewijzen om ze in deze lijst te vinden
 WarningAvailableOnlyForHTTPSServers=Alleen beschikbaar als u een beveiligde HTTPS-verbinding gebruikt.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/nl_NL/externalsite.lang b/htdocs/langs/nl_NL/externalsite.lang
index 1a4033fb34b..1685de63461 100644
--- a/htdocs/langs/nl_NL/externalsite.lang
+++ b/htdocs/langs/nl_NL/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Instellingen voor de link naar een externe website
-ExternalSiteURL=Externe website URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module Externe Site werd niet correct geconfigureerd.
 ExampleMyMenuEntry=Mijn menu-item
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index e55cb6e1942..a74a1521259 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Wijzigingsdatum
 IPModification=Wijziging IP
 DateLastModification=Laatste wijzigingsdatum
 DateValidation=Validatiedatum
+DateSigning=Signing date
 DateClosing=Sluitingsdatum
 DateDue=Vervaldatum
 DateValue=Valutadatum
@@ -361,9 +362,9 @@ UnitPriceHTCurrency=Eenheidsprijs (excl.) (Valuta)
 UnitPriceTTC=Eenheidsprijs (bruto)
 PriceU=E.P.
 PriceUHT=EP (netto)
-PriceUHTCurrency=Valuta
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. belasting)
-Amount=Hoeveelheid
+Amount=Bedrag
 AmountInvoice=Factuurbedrag
 AmountInvoiced=Gefactureerd bedrag
 AmountInvoicedHT=Gefactureerd bedrag (excl. BTW)
@@ -389,6 +390,8 @@ AmountTotal=Totaal bedrag
 AmountAverage=Gemiddeld bedrag
 PriceQtyMinHT=Prijs hoeveelheid min. (excl. belasting)
 PriceQtyMinHTCurrency=Prijs hoeveelheid min. (excl. belasting) (valuta)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Totaal
 SubTotal=Subtotaal
@@ -724,7 +727,7 @@ MenuMembers=Leden
 MenuAgendaGoogle=Google-agenda
 MenuTaxesAndSpecialExpenses=Belastingen | Bijzondere kosten
 ThisLimitIsDefinedInSetup=Dolibarr limiet (Menu Home-Instellingen-Beveiliging): %s Kb, PHP grens: %s Kb
-NoFileFound=Geen documenten die zijn opgeslagen in deze map
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Huidige taal
 CurrentTheme=Actuele thema
 CurrentMenuManager=Huidige menu manager
@@ -899,8 +902,10 @@ ViewAccountList=Grootboek bekijken
 ViewSubAccountList=Bekijk het grootboek van de subrekening
 RemoveString='%s' string verwijderen
 SomeTranslationAreUncomplete=Sommige aangeboden talen zijn mogelijk slechts gedeeltelijk vertaald of kunnen fouten bevatten. Help ons om uw taal te corrigeren door u te registreren op <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> om uw verbeteringen toe te voegen.
-DirectDownloadLink=Directe download link (openbaar/extern)
-DirectDownloadInternalLink=Directe downloadlink (moet worden gelogd en heeft machtigingen nodig)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Downloaden
 DownloadDocument=Download document
 ActualizeCurrency=Bijwerken valutakoers
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacten
 SearchIntoMembers=Leden
 SearchIntoUsers=Gebruikers
 SearchIntoProductsOrServices=Diensten of Producten
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projecten
 SearchIntoMO=Productieorders
 SearchIntoTasks=Taken
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Sneltoets
 AssignedTo=Geaffecteerden
 Deletedraft=Concept verwijderen
 ConfirmMassDraftDeletion=Bevestiging van de massa-verwijdering
-FileSharedViaALink=Bestand gedeeld via een link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Selecteer eerst een derde ...
 YouAreCurrentlyInSandboxMode=U bent momenteel in de %s "sandbox" -modus
 Inventory=Inventarisering
 AnalyticCode=Analisten code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Meer info weergeven
 NoFilesUploadedYet=Upload eerst een document
 SeePrivateNote=Zie privébrief
@@ -1120,3 +1127,5 @@ AffectTag=Heeft invloed op de tag
 ConfirmAffectTag=invloed op bulk-tag
 ConfirmAffectTagQuestion=Weet u zeker dat u tags wilt beïnvloeden voor de %s geselecteerde record (s)?
 CategTypeNotFound=Geen tag-soort gevonden voor type records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang
index fd532245afa..dae8b70553b 100644
--- a/htdocs/langs/nl_NL/margins.lang
+++ b/htdocs/langs/nl_NL/margins.lang
@@ -22,7 +22,7 @@ ProductService=Trainning of Dienst
 AllProducts=Alle Trainingen en Diensten
 ChooseProduct/Service=Kies Training of Dienst
 ForceBuyingPriceIfNull=Forceren inkoop/kostprijs naar verkoopprijs als dit niet is gedefinieerd
-ForceBuyingPriceIfNullDetails=Als inkoop / kostprijs niet is gedefinieerd en deze optie staat op "AAN", zal de marge nul zijn (inkoop / kostprijs = verkoopprijs). Indien ("UIT"), zal marge gelijk zijn aan de voorgestelde standaard.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Marge methode voor globale discounts
 UseDiscountAsProduct=Als een training
 UseDiscountAsService=Als een dienst
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index ee9c303d352..4a98f54c8d8 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Lijst van conceptleden (te valideren)
 MembersListValid=Lijst van geldige leden
 MembersListUpToDate=Geldige leden met een up-to-date abonnement
 MembersListNotUpToDate=Geldige leden met een verouderd abonnement
+MembersListExcluded=List of excluded members
 MembersListResiliated=Lijst verwijderde leden
 MembersListQualified=Lijst van gekwalificeerde leden
 MenuMembersToValidate=Conceptleden
 MenuMembersValidated=Gevalideerde leden
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Verwijderde leden
 MembersWithSubscriptionToReceive=Leden die abonnement moeten ontvangen
 MembersWithSubscriptionToReceiveShort=Abonnement ontvangen
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Abonnement verlopen
 MemberStatusActiveLateShort=Verlopen
 MemberStatusPaid=Abonnement bijgewerkt
 MemberStatusPaidShort=Bijgewerkt
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Verwijderd lid
 MemberStatusResiliatedShort=Verwijderd
 MembersStatusToValid=Conceptleden
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Verwijderde leden
 MemberStatusNoSubscription=Gevalideerd (geen abonnement vereist)
 MemberStatusNoSubscriptionShort=Gevalideerd
@@ -82,6 +87,8 @@ Physical=Fysiek
 Moral=Moreel
 MorAndPhy=Moreel en fysiek
 Reenable=Opnieuw inschakelen
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Verwijder een lid
 ConfirmResiliateMember=Weet je zeker dat je dit lidmaatschap wilt beëindigen?
 DeleteMember=Lid verwijderen
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-mailsjabloon om te gebruiken om
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-mailsjabloon om te gebruiken om e-mail naar een lid te sturen bij nieuwe abonnementopname
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-mailsjabloon om te gebruiken om e-mailherinnering te verzenden wanneer het abonnement afloopt
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-mailsjabloon om te gebruiken om e-mail naar een lid te verzenden bij annulering van een lid
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=E-mail afzender voor automatische e-mails
 DescADHERENT_ETIQUETTE_TYPE=Etikettenformaat
 DescADHERENT_ETIQUETTE_TEXT=Tekst op leden adres-blad
@@ -162,6 +170,7 @@ DocForLabels=Genereer adresvellen (formaat voor de uitvoer zoals ingesteld: <b>%
 SubscriptionPayment=Betaling van abonnement
 LastSubscriptionDate=Datum van laatste abonnementbetaling
 LastSubscriptionAmount=Bedrag van het laatste abonnement
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Leden statistieken per land
 MembersStatisticsByState=Leden statistieken per staat / provincie
 MembersStatisticsByTown=Leden van de statistieken per gemeente
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index 767bee4b08a..8d622f598cf 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=Ik wil enkele documenten genereren van het object
 IncludeDocGenerationHelp=Als u dit aanvinkt, wordt er een code gegenereerd om een vak "Document genereren" aan de record toe te voegen.
 ShowOnCombobox=Waarde weergeven in combobox
 KeyForTooltip=Sleutel voor knopinfo
-CSSClass=CSS-klasse
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Niet bewerkbaar
 ForeignKey=Vreemde sleutel
 TypeOfFieldsHelp=Type velden: <br> varchar (99), dubbel (24,8), real, tekst, html, datetime, timestamp, integer, integer: ClassName: relativepath / to / classfile.class.php [: 1 [: filter]] ('1' betekent we voegen een + -knop toe na de combo om het record te maken, 'filter' kan 'status = 1 EN fk_user = __USER_ID EN entiteit IN (bijvoorbeeld __SHARED_ENTITIES__)' zijn)
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 9ec42fd206a..ca02737b418 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Te bestellen
 MakeOrder=Opdracht indienen
 SupplierOrder=Bestelling
 SuppliersOrders=Inkooporders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Huidige inkooporders
 CustomerOrder=Klantorder
 CustomersOrders=Verkooporders
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 3b019f24cb7..15ae208dd41 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Bedrijf met meerdere activiteiten (alle hoofdmodules)
 CreatedBy=Gecreëerd door %s
 ModifiedBy=Gewijzigd door %s
 ValidatedBy=Gevalideerd door %s
+SignedBy=Signed by %s
 ClosedBy=Gesloten door %s
 CreatedById=Aangemaakt door gebruiker ID
 ModifiedById=Gebruikers-ID van diegene die de laatste wijziging heeft aangebracht
@@ -244,6 +245,7 @@ NewKeyIs=Dit is uw nieuwe sleutel om in te loggen
 NewKeyWillBe=Uw nieuwe sleutel in te loggen zal zijn
 ClickHereToGoTo=Klik hier om naar %s
 YouMustClickToChange=Je moet echter wel eerst klikken op de volgende link om de wachtwoord wijziging te valideren
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Als u deze wijziging niet heeft aangevraagd, negeer deze e-mail. Uw referenties blijven veilig bewaard.
 IfAmountHigherThan=Indien bedrag hoger dan <strong>%s</strong>
 SourcesRepository=Repository voor bronnen
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
index 3c77db06fef..8f65a606600 100644
--- a/htdocs/langs/nl_NL/productbatch.lang
+++ b/htdocs/langs/nl_NL/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Gebruik lot / serienummer
-ProductStatusOnBatch=Ja (lot / serienummer vereist)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=Nee (lot / serial niet gebruikt)
-ProductStatusOnBatchShort=Ja
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Nee
 Batch=Lot / Serienummer
 atleast1batchfield=Vervaldatum of uiterste verkoopdatum of Lot / Serienummer
@@ -22,3 +24,12 @@ ProductLotSetup=Module instellingen voor lot/serial
 ShowCurrentStockOfLot=Toon huidige voorraad voor product/lot paar
 ShowLogOfMovementIfLot=Toon bewegingslogboek voor product/lot paar
 StockDetailPerBatch=Voorraad details per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 0e20bb8eea2..50675925d5f 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -22,7 +22,7 @@ ProductVatMassChangeDesc=Deze tool werkt het btw-tarief bij dat op <b><u>ALLE</u
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=Deze pagina kan worden gebruikt om een ​​streepjescode op objecten die geen streepjescode hebben gedefinieerd. Controleer voor dat setup van de module barcode is ingesteld.
 ProductAccountancyBuyCode=Grootboeknummer inkoopboek
-ProductAccountancyBuyIntraCode=Boekhoudcode (aankoop intracommunautair)
+ProductAccountancyBuyIntraCode=Grootboeknummer (aankoop intracommunautair)
 ProductAccountancyBuyExportCode=Boekhoudcode (import importeren)
 ProductAccountancySellCode=Grootboeknummer verkoopboek
 ProductAccountancySellIntraCode=Grootboekrekening (verkoop binnen de Gemeenschap)
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=BTW-tarief (voor deze leverancier / dit product)
 DiscountQtyMin=Korting bij dit aantal
 NoPriceDefinedForThisSupplier=Geen prijs / aantal gedefinieerd voor deze leverancier / product
 NoSupplierPriceDefinedForThisProduct=Geen leveranciersprijs / aantal gedefinieerd voor dit product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Voorgedefinieerd product
 PredefinedServicesToSell=Vooraf gedefinieerde service
 PredefinedProductsAndServicesToSell=Voorgedefinieerde producten/diensten voor koop
@@ -313,7 +314,7 @@ LastUpdated=Laatst bijgewerkt
 CorrectlyUpdated=Correct bijgewerkt
 PropalMergePdfProductActualFile=Gebruikte bestanden om toe te voegen aan PDF Azur zijn/is
 PropalMergePdfProductChooseFile=Selecteer PDF bestanden
-IncludingProductWithTag=Inclusief product/dienst met label
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Standaard verkoopprijs, echte verkoopprijs kan bij klant zijn vastgelegd
 WarningSelectOneDocument=Selecteer tenminste één document
 DefaultUnitToShow=Eenheid
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index f0262ca798c..16fa0f84f88 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Lijst met taken
 GoToListOfTimeConsumed=Ga naar de lijst met tijd die is verbruikt
 GanttView=Gantt-weergave
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Lijst van de commerciële voorstellen met betrekking tot het project
 ListOrdersAssociatedProject=Lijst met verkooporders gerelateerd aan het project
 ListInvoicesAssociatedProject=Lijst met klantfacturen gerelateerd aan het project
@@ -268,3 +269,7 @@ OneLinePerTask=Eén regel per taak
 OneLinePerPeriod=Eén regel per periode
 RefTaskParent=Ref. Bovenliggende taak
 ProfitIsCalculatedWith=Winst wordt berekend met
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
index ed9e284c461..cecfecdff60 100644
--- a/htdocs/langs/nl_NL/propal.lang
+++ b/htdocs/langs/nl_NL/propal.lang
@@ -59,6 +59,7 @@ ConfirmClonePropal=Weet u zeker dat u offerte <b>%s</b>  wilt kopiëren?
 ConfirmReOpenProp=Weet u zeker dat u offerte <b>%s</b> opnieuw wilt openen?
 ProposalsAndProposalsLines=Offertes en offerteregels
 ProposalLine=Offerteregel
+ProposalLines=Proposal lines
 AvailabilityPeriod=Leveringstermijn
 SetAvailability=Bepaal leveringstermijn
 AfterOrder=na bestelling
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index db940c6cf37..bdbeef3b7d2 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -19,8 +19,8 @@ Stock=Voorraad
 Stocks=Voorraden
 MissingStocks=Ontbrekende voorraad
 StockAtDate=Voorraden op datum
-StockAtDateInPast=Datum uit het verleden
-StockAtDateInFuture=Toekomstige datum
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Voorraad volgorde op lot/serienummer
 LotSerial=Partij/Serienummer
 LotSerialList=Overzicht van partij/serienummers
@@ -37,8 +37,8 @@ AllWarehouses=Alle magazijnen
 IncludeEmptyDesiredStock=Voeg ook een negatieve voorraad toe met een ongedefinieerde gewenste voorraad
 IncludeAlsoDraftOrders=Neem ook conceptorders op
 Location=Locatie
-LocationSummary=Korte naam locatie
-NumberOfDifferentProducts=Aantal verschillende producten
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Totaal aantal producten
 LastMovement=Laatste verplaatsing
 LastMovements=Laatste mutaties
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Voorraadwaardering
 UserWarehouseAutoCreate=Creëer automatisch een gebruikersmagazijn wanneer u een gebruiker aanmaakt
 AllowAddLimitStockByWarehouse=Beheer ook de waarde voor minimale en gewenste voorraad per paar (productmagazijn) naast de waarde voor minimale en gewenste voorraad per product
 RuleForWarehouse=Voorwaarden magazijnen
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Stel een magazijn in op Verkooporders
 UserDefaultWarehouse=Stel een magazijn in op gebruikers
 MainDefaultWarehouse=Standaardmagazijn
@@ -97,15 +98,16 @@ RealStockDesc=Fysieke/echte voorraad is de voorraad die momenteel in de magazijn
 RealStockWillAutomaticallyWhen=De werkelijke voorraad wordt aangepast volgens deze regel (zoals gedefinieerd in de module Voorraad):
 VirtualStock=Virtuele voorraad
 VirtualStockAtDate=Virtuele voorraad op datum
-VirtualStockAtDateDesc=Virtuele voorraad zodra alle lopende bestellingen die volgens de planning vóór de datum moeten worden gedaan, zijn voltooid
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtuele voorraad is de berekende voorraad die beschikbaar is zodra alle openstaande / lopende acties (die van invloed zijn op voorraden) zijn gesloten (inkooporders ontvangen, verkooporders verzonden, productieorders geproduceerd, enz.)
+AtDate=At date
 IdWarehouse=Magazijn-ID
 DescWareHouse=Beschrijving magazijn
 LieuWareHouse=Localisatie magazijn
 WarehousesAndProducts=Magazijn en producten
 WarehousesAndProductsBatchDetail=Magazijnen en producten (met detail per lot/serieenummer)
 AverageUnitPricePMPShort=Waardering (PMP)
-AverageUnitPricePMPDesc=De input gemiddelde eenheidsprijs die we aan leveranciers moesten betalen om het product in onze voorraad te krijgen.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Verkopen Prijs per Eenheid
 EstimatedStockValueSellShort=Verkoopwaarde
 EstimatedStockValueSell=Verkoopwaarde
@@ -145,7 +147,7 @@ Replenishments=Bevoorradingen
 NbOfProductBeforePeriod=Aantal op voorraad van product %s voor de gekozen periode (<%s)
 NbOfProductAfterPeriod=Aantal op voorraad van product %s na de gekozen periode (<%s)
 MassMovement=Volledige verplaatsing
-SelectProductInAndOutWareHouse=Selecteer een bronmagazijn en een doelmagazijn, een product en een hoeveelheid en klik op "%s". Zodra dit is gedaan voor alle vereiste bewegingen, klikt u op "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Vastleggen verplaatsing
 ReceivingForSameOrder=Ontvangsten voor deze bestelling
 StockMovementRecorded=Geregistreerde voorraadbewegingen
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Het voorraadniveau moet voldoende zijn om het produc
 StockMustBeEnoughForOrder=Het voorraadniveau moet voldoende zijn om product / dienst aan de bestelling toe te voegen (controle wordt uitgevoerd op de huidige reële voorraad wanneer een regel wordt toegevoegd, ongeacht de regel voor automatische voorraadwijziging)
 StockMustBeEnoughForShipment= Voorraadniveau moet voldoende zijn om product / dienst aan verzending toe te voegen (controle wordt uitgevoerd op huidige reële voorraad bij het toevoegen van een regel aan verzending, ongeacht de regel voor automatische voorraadwijziging)
 MovementLabel=Label van de verplaatsing
-TypeMovement=Type beweging
+TypeMovement=Direction of movement
 DateMovement=Datum van verplaatsing
 InventoryCode=Verplaatsing of inventaris code
 IsInPackage=Vervat in pakket
@@ -183,6 +185,7 @@ inventoryCreatePermission=Aanmaken nieuwe inventarisatie
 inventoryReadPermission=Bekijk inventarisaties
 inventoryWritePermission=Bijwerken inventarisaties
 inventoryValidatePermission=Inventarisatie goedkeuren
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventarisering
 inventoryListTitle=Inventariseringen
 inventoryListEmpty=Geen inventarisering in opbouw
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Voorraad is vereist om te kiezen welk lot t
 ForceTo=Toevoegen aan
 AlwaysShowFullArbo=Volledige boomstructuur van magazijn weergeven op pop-up van magazijnkoppelingen (Waarschuwing: dit kan de prestaties drastisch verminderen)
 StockAtDatePastDesc=U kunt hier de echte voorraad op een bepaalde datum in het verleden bekijken
-StockAtDateFutureDesc=U kunt hier de virtuele voorraad op een bepaalde datum in de toekomst bekijken
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Huidige voorraad
 InventoryRealQtyHelp=Stel de waarde in op 0 om het aantal te resetten<br>Veld leeg laten of regel verwijderen om ongewijzigd te houden
-UpdateByScaning=Update door te scannen
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update door scan (product barcode)
 UpdateByScaningLot=Update door scan (partij/serie barcode)
 DisableStockChangeOfSubProduct=De-activeer tijdens deze bewerking de voorraad voor alle subproducten van deze kit.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Heropenen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index dd087ffdb83..e6f61a6c2da 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Leveranciers
 SuppliersInvoice=Factuur leverancier
+SupplierInvoices=Inkoopfacturen
 ShowSupplierInvoice=Toon factuur van leverancier
 NewSupplier=Nieuwe leverancier
 History=Geschiedenis
diff --git a/htdocs/langs/nl_NL/ticket.lang b/htdocs/langs/nl_NL/ticket.lang
index 51f8fe3a18c..bcfe4a2f113 100644
--- a/htdocs/langs/nl_NL/ticket.lang
+++ b/htdocs/langs/nl_NL/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Verwijderd
 # Dict
 Type=Type
 Severity=Prioriteit
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Om e-mail van ticket bericht te verzenden
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Toon het logo van de module in de openbare interface
 TicketsShowModuleLogoHelp=Schakel deze optie in om het logo op de pagina's van de openbare interface te verbergen
 TicketsShowCompanyLogo=Toon het logo van het bedrijf in de openbare interface
 TicketsShowCompanyLogoHelp=Schakel deze optie in om het logo van het bedrijf op de pagina's van de openbare interface te verbergen
-TicketsEmailAlsoSendToMainAddress=Stuur ook een melding naar het hoofd e-mailadres
-TicketsEmailAlsoSendToMainAddressHelp=Schakel deze optie in om een e-mail te verzenden naar het adres "E-mailmelding van" (zie onderstaande instellingen)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Beperk de weergave tot tickets die zijn toegewezen aan de huidige gebruiker (niet effectief voor externe gebruikers, altijd beperkt tot de derde partij waarvan ze afhankelijk zijn)
 TicketsLimitViewAssignedOnlyHelp=Alleen tickets die zijn toegewezen aan de huidige gebruiker zijn zichtbaar. Is niet van toepassing op een gebruiker met toegangsrechten voor tickets.
 TicketsActivatePublicInterface=Publieke interface activeren
@@ -126,10 +128,10 @@ TicketNumberingModules=Nummering module voor tickets
 TicketsModelModule=Documentsjablonen voor tickets
 TicketNotifyTiersAtCreation=Breng relatie op de hoogte bij het aanmaken
 TicketsDisableCustomerEmail=Schakel e-mails altijd uit wanneer een ticket wordt gemaakt vanuit de openbare interface
-TicketsPublicNotificationNewMessage=Stuur e-mail (s) wanneer een nieuw bericht is toegevoegd
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Stuur e-mail (s) wanneer een nieuw bericht is toegevoegd vanuit de openbare interface (naar de toegewezen gebruiker of de e-mail met meldingen naar (update) en / of de e-mail met meldingen naar)
 TicketPublicNotificationNewMessageDefaultEmail=E-mailmeldingen voor (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Stuur e-mailmeldingen voor nieuwe berichten naar dit adres als aan het ticket geen gebruiker is toegewezen of de gebruiker geen e-mail heeft.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Laatst gewijzigde tickets
 BoxLastModifiedTicketDescription=Laatste %s gewijzigde tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Geen recent gewijzigde tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index d22bd138009..3866d958572 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -72,7 +72,7 @@ ExportDataset_user_1=Gebruikers en hun eigenschappen
 DomainUser=Domeingebruikersaccount %s
 Reactivate=Reactiveren
 CreateInternalUserDesc=Met dit formulier kunt u een interne gebruiker in uw bedrijf / organisatie maken. Om een externe gebruiker (klant, leverancier etc. ..) aan te maken, gebruikt u de knop "Aanmaken Dolibarr gebruiker" van de contactkaart van die relatie.
-InternalExternalDesc=Een <b> interne </b>-gebruiker is een gebruiker die deel uitmaakt van uw bedrijf / organisatie. <br> Een externe <b> externe </b>-gebruiker is een klant, leverancier of andere (het aanmaken van een externe gebruiker voor een derde partij kan worden gedaan vanuit het contactrecord van de derde partij). <br> <br> In beide gevallen definieert de machtiging rechten op Dolibarr, ook kan de externe gebruiker een andere menumanager hebben dan de interne gebruiker (zie Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Toestemming verleend, omdat geërfd van een bepaalde gebruikersgroep.
 Inherited=Overgeërfd
 UserWillBe=De aangemaakte gebruiker zal zijn
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index a2424762f54..8dc5e4b9675 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u> Gebruik met Apache / NGinx / ... </u> <br> Creëer op uw
 ExampleToUseInApacheVirtualHostConfig=Voorbeeld om te gebruiken in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Gebruik met PHP embedded server</u> <br> In een ontwikkelomgeving kunt u de site het liefst testen met de ingebouwde PHP-webserver (PHP 5.5 vereist) <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Beheer uw website met een andere Dolibarr Hosting-provider</u> <br> Als u geen webserver zoals Apache of NGinx beschikbaar heeft op internet, kunt u uw website exporteren en importeren in een ander Dolibarr-exemplaar van een andere Dolibarr-hostingprovider die volledige integratie met de websitemodule biedt. U kunt een lijst met sommige Dolibarr-hostingproviders vinden op <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Controleer ook of virtuele host toestemming <strong>%s heeft</strong> voor bestanden in <br> <strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Lezen
 WritePerm=Schrijven
 TestDeployOnWeb=Testen / implementeren op internet
 PreviewSiteServedByWebServer=<u>Voorbeeld %s op een nieuw tabblad.</u> <br><br> De %s wordt bediend door een externe webserver (zoals Apache, Nginx, IIS). U moet deze server installeren en instellen voordat u naar de map verwijst: <br> <strong>%s</strong> <br> URL aangeboden door externe server: <br> <strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Voorbeeld %s op een nieuw tabblad.</u> <br><br> De %s wordt bediend door de Dolibarr-server, dus er is geen extra webserver (zoals Apache, Nginx, IIS) nodig om te worden geïnstalleerd. <br> Het onhandige is dat de URL van pagina's niet gebruiksvriendelijk is en begint met het pad van uw Dolibarr. <br> URL aangeboden door Dolibarr: <br> <strong>%s</strong> <br><br> Als u uw eigen externe webserver wilt gebruiken om deze website te bedienen, maakt u een virtuele host op uw webserver die naar de directory verwijst <br> <strong>%s</strong> <br> voer vervolgens de naam van deze virtuele server in en klik op de andere voorbeeldknop.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL van de virtuele host bediend door externe webserver niet gedefinieerd
 NoPageYet=Nog geen pagina's
 YouCanCreatePageOrImportTemplate=U kunt een nieuwe pagina maken of een volledige websitesjabloon importeren
@@ -137,3 +137,11 @@ PagesRegenerated=%s pagina ('s) / container (s) her-aangemaakt
 RegenerateWebsiteContent=Genereer cachebestanden van websites opnieuw
 AllowedInFrames=Toegestaan in frames
 DefineListOfAltLanguagesInWebsiteProperties=Definieer een lijst van alle beschikbare talen in website-eigenschappen.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/nl_NL/zapier.lang b/htdocs/langs/nl_NL/zapier.lang
index f9f576f9fbe..f36e42cd18a 100644
--- a/htdocs/langs/nl_NL/zapier.lang
+++ b/htdocs/langs/nl_NL/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier voor Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier voor Dolibarr-module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Installatie van Zapier voor Dolibarr
+ZapierForDolibarrSetup=Installatie van Zapier voor Dolibarr
 ZapierDescription=Interface met Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index f7345886c7e..dab89cc501b 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -10,36 +10,36 @@ ACCOUNTING_EXPORT_AMOUNT=Eksportuj kwoty
 ACCOUNTING_EXPORT_DEVISE=Eksportuj waluty
 Selectformat=Wybierz format dla pliku
 ACCOUNTING_EXPORT_FORMAT=Wybierz format dla pliku
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_ENDLINE=Wybierz typ powrotu karetki
 ACCOUNTING_EXPORT_PREFIX_SPEC=Przedrostek w nazwie pliku
 ThisService=Ta usługa
 ThisProduct=Ten produkt
 DefaultForService=Domyślny dla usługi
 DefaultForProduct=Domyślny dla produktu
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Produkt dla tego kontrahenta
+ServiceForThisThirdparty=Usługa dla tego kontrahenta
 CantSuggest=Nie mogę zasugerować
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+AccountancySetupDoneFromAccountancyMenu=Większość ustawień księgowości odbywa się z menu %s
+ConfigAccountingExpert=Konfiguracja rozliczania modułu (podwójny wpis)
 Journalization=Dokumentowanie
 Journals=Dzienniki
 JournalFinancial=Dzienniki finansowe
 BackToChartofaccounts=Zwróć plan kont
 Chartofaccounts=Plan kont
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfSubaccounts=Plan kont indywidualnych
+ChartOfIndividualAccountsOfSubsidiaryLedger=Plan kont indywidualnych księgi pomocniczej
 CurrentDedicatedAccountingAccount=Aktualne dedykowane konto
 AssignDedicatedAccountingAccount=Nowe konto do przypisania
 InvoiceLabel=Etykieta faktury
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+OverviewOfAmountOfLinesNotBound=Przegląd ilości linii niezwiązanych z kontem księgowym
+OverviewOfAmountOfLinesBound=Przegląd ilości linii już powiązanych z kontem księgowym
 OtherInfo=Inne informacje
 DeleteCptCategory=Usuń konto księgowe z grupy
-ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
+ConfirmDeleteCptCategory=Czy na pewno chcesz usunąć to konto księgowe z grupy kont księgowych?
 JournalizationInLedgerStatus=Status dokumentowania
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
-GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+AlreadyInGeneralLedger=Już przeniesione w dziennikach księgowych i księdze
+NotYetInGeneralLedger=Jeszcze nie przeniesione w dziennikach księgowych i księdze rachunkowej
+GroupIsEmptyCheckSetup=Grupa jest pusta, sprawdź konfigurację spersonalizowanej grupy księgowej
 DetailByAccount=Pokaż szczegóły konta
 AccountWithNonZeroValues=Konta z wartościami niezerowymi
 ListOfAccounts=Lista kont
@@ -47,57 +47,57 @@ CountriesInEEC=Kraje UE
 CountriesNotInEEC=Kraje spoza UE
 CountriesInEECExceptMe=Kraje UE oprócz %s
 CountriesExceptMe=Wszystkie kraje oprócz %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
-VueBySubAccountAccounting=View by accounting subaccount
+AccountantFiles=Eksportuj dokumenty źródłowe
+ExportAccountingSourceDocHelp=Za pomocą tego narzędzia możesz wyeksportować zdarzenia źródłowe (listy i pliki PDF), które zostały użyte do wygenerowania Twojej księgowości. Aby wyeksportować swoje dzienniki, użyj pozycji menu %s - %s.
+VueByAccountAccounting=Wyświetl według konta księgowego
+VueBySubAccountAccounting=Wyświetl według subkonta księgowego
 
 MainAccountForCustomersNotDefined=Główne konto księgowe dla klientów nie zdefiniowane w ustawieniach
 MainAccountForSuppliersNotDefined=Główne konto rozliczeniowe dla dostawców niezdefiniowane w konfiguracji
 MainAccountForUsersNotDefined=Główne konto księgowe dla użytkowników nie zdefiniowane w ustawieniach
 MainAccountForVatPaymentNotDefined=Główne konto księgowe dla płatności VAT nie zdefiniowane w ustawieniach
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Główne konto księgowe dla płatności za subskrypcję nie zostało zdefiniowane w konfiguracji
 
 AccountancyArea=Strefa księgowości
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescIntro=Korzystanie z modułu księgowości odbywa się w kilku etapach:
 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 the journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Należy podjąć kolejne kroki, aby zaoszczędzić czas w przyszłości, sugerując prawidłowe domyślne konto księgowe podczas sporządzania dziennika (zapis w dziennikach i księdze głównej)
 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: Check that a model of chart of account exists or create one from menu %s
-AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+AccountancyAreaDescJournalSetup=KROK %s: Utwórz lub sprawdź zawartość listy czasopism z menu %s
+AccountancyAreaDescChartModel=KROK %s: Sprawdź, czy istnieje model planu kont lub utwórz go z menu %s
+AccountancyAreaDescChart=KROK %s: Wybierz i | lub uzupełnij swój plan kont z menu %s
 
 AccountancyAreaDescVat=Krok %s: Zdefiniuj konta księgowe dla każdej stawki VAT. W tym celu użyj pozycji menu %s.
-AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescDefault=KROK %s: Zdefiniuj domyślne konta księgowe. W tym celu użyj pozycji menu %s.
+AccountancyAreaDescExpenseReport=KROK %s: Zdefiniuj domyślne konta księgowe dla każdego typu raportu z wydatków. W tym celu użyj pozycji menu %s.
 AccountancyAreaDescSal=Krok %s: Zdefiniuj domyślne konta księgowe dla płatności i wynagrodzeń. W tym celu użyj pozycji menu %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
+AccountancyAreaDescContrib=KROK %s: Zdefiniuj domyślne konta księgowe dla wydatków specjalnych (podatki różne). W tym celu użyj pozycji menu %s.
 AccountancyAreaDescDonation=Krok %s: Zdefiniuj domyśle konta księgowe dla dotacji. W tym celu użyj pozycji menu %s.
-AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
+AccountancyAreaDescSubscription=KROK %s: Zdefiniuj domyślne konta księgowe dla subskrypcji członków. W tym celu użyj pozycji menu %s.
+AccountancyAreaDescMisc=KROK %s: Zdefiniuj obowiązkowe konto domyślne i domyślne konta księgowe dla różnych transakcji. W tym celu użyj pozycji menu %s.
+AccountancyAreaDescLoan=KROK %s: Zdefiniuj domyślne konta księgowe dla pożyczek. W tym celu użyj pozycji menu %s.
+AccountancyAreaDescBank=KROK %s: Zdefiniuj konta księgowe i kod arkusza dla każdego konta bankowego i finansowego. W tym celu użyj pozycji menu %s.
 AccountancyAreaDescProd=Krok %s: Zdefiniuj konta księgowe dla swoich produktów/usług. W tym celu użyj pozycji menu %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.
+AccountancyAreaDescBind=KROK %s: Sprawdź powiązanie między istniejącymi liniami %s a kontem księgowym, aby aplikacja mogła zapisywać transakcje w księdze jednym kliknięciem. Uzupełnij brakujące powiązania. W tym celu użyj pozycji menu %s.
 AccountancyAreaDescWriteRecords=Krok %s: Zapisz transakcje do głównej księgi. W tym celu idź do <strong>%s</strong> i kliknij na przycisk <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescAnalyze=KROK %s: Dodaj lub edytuj istniejące transakcje oraz generuj raporty i eksporty.
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=KROK %s: Zamknij okres, abyśmy nie mogli wprowadzić modyfikacji w przyszłości.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Nie ukończono obowiązkowego kroku konfiguracji (arkusz kodów księgowych nie został zdefiniowany dla wszystkich kont bankowych)
 Selectchartofaccounts=Wybierz aktywny wykres kont
 ChangeAndLoad=Zmień i załaduj
 Addanaccount=Dodaj konto księgowe
 AccountAccounting=Konto księgowe
 AccountAccountingShort=Konto
-SubledgerAccount=Subledger account
-SubledgerAccountLabel=Subledger account label
+SubledgerAccount=Konto księgi podrzędnej
+SubledgerAccountLabel=Etykieta konta księgi podrzędnej
 ShowAccountingAccount=Wyświetl konta księgowe
 ShowAccountingJournal=Wyświetl dziennik konta księgowego
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=Pokaż konto księgowe w księdze
+ShowAccountingAccountInJournals=Pokaż konto księgowe w dziennikach
 AccountAccountingSuggest=Zalecane konto rachunkowe
 MenuDefaultAccounts=Domyślne konta
 MenuBankAccounts=Konta bankowe
@@ -108,30 +108,30 @@ MenuLoanAccounts=Konta kredytowe
 MenuProductsAccounts=Konta produktów
 MenuClosureAccounts=Zamknięte konta
 MenuAccountancyClosure=Zamknięte
-MenuAccountancyValidationMovements=Validate movements
+MenuAccountancyValidationMovements=Zatwierdź ruchy
 ProductsBinding=Konta produktów
-TransferInAccounting=Transfer in accounting
+TransferInAccounting=Przelew w księgowości
 RegistrationInAccounting=Rejestracja w rachunkowości
 Binding=Powiązanie z kontami
 CustomersVentilation=Powiązania do faktury klienta
-SuppliersVentilation=Vendor invoice binding
+SuppliersVentilation=Wiązanie faktury dostawcy
 ExpenseReportsVentilation=Wiążący raport z wydatków
 CreateMvts=Utwórz nową transakcję
 UpdateMvts=Modyfikacja transakcji
 ValidTransaction=Potwierdź transakcję
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Zarejestruj transakcje w księgowości
 Bookkeeping=Księga główna
 BookkeepingSubAccount=Subledger
 AccountBalance=Bilans konta
-ObjectsRef=Source object ref
-CAHTF=Total purchase vendor before tax
+ObjectsRef=Obiekt źródłowy ref
+CAHTF=Łącznie sprzedawca przed opodatkowaniem
 TotalExpenseReport=Raport z całkowitych wydatków
 InvoiceLines=Pozycje faktury do powiązania
-InvoiceLinesDone=Bound lines of invoices
+InvoiceLinesDone=Powiązane wiersze faktur
 ExpenseReportLines=Linie raportów kosztów do dowiązania
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+ExpenseReportLinesDone=Powiązane linie raportów wydatków
+IntoAccount=Powiąż linię z kontem księgowym
+TotalForAccount=Całkowite konto księgowe
 
 
 Ventilate=Powiąż
@@ -147,20 +147,20 @@ NotVentilatedinAccount=Nie dowiązane do konta księgowego
 XLineSuccessfullyBinded=%sprodukty/usługi z powodzeniem dowiązane do konta księgowego
 XLineFailedToBeBinded=%s produkty/usługi nie dowiązane do żadnego konta księgowego
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maksymalna liczba wierszy na stronie listy i wiązania (zalecane: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Rozpocznij sortowanie strony "Dowiązania do zrobienia" po najnowszych elementach
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Rozpocznij sortowanie strony "Dowiązania ukończone" po najnowszych elementach
 
-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_DESCRIPTION=Skróć opis produktów i usług w ofertach po x znakach (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Skróć formularz opisu konta produktów i usług na aukcjach po x znakach (Best = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Długość głównych kont księgowych (jeżeli ustawisz tutaj wartość na 6, konto '706' będzie miało wygląd '706000' na ekranie)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
+ACCOUNTING_LENGTH_AACCOUNT=Długość kont księgowych innych firm (jeśli ustawisz tutaj wartość 6, na ekranie konto „401” będzie wyglądać jak „401000”)
+ACCOUNTING_MANAGE_ZERO=Pozwól zarządzać różną liczbą zer na końcu konta księgowego. Potrzebne w niektórych krajach (np. W Szwajcarii). Jeśli opcja jest wyłączona (domyślnie), możesz ustawić następujące dwa parametry, aby poprosić aplikację o dodanie wirtualnych zer.
 BANK_DISABLE_DIRECT_INPUT=Wyłącz bezpośrednią rejestrację transakcji na koncie bankowym
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Włącz eksport wersji roboczej w dzienniku
+ACCOUNTANCY_COMBO_FOR_AUX=Włącz listę kombi dla konta pomocniczego (może działać wolno, jeśli masz wiele stron trzecich)
+ACCOUNTING_DATE_START_BINDING=Określ datę rozpoczęcia wiązania i przeniesienia w księgowości. Poniżej tej daty transakcje nie zostaną przeniesione do księgowości.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=W przypadku przelewu księgowego wybierz domyślnie pokazany okres
 
 ACCOUNTING_SELL_JOURNAL=Dziennik sprzedaży
 ACCOUNTING_PURCHASE_JOURNAL=Dziennik zakupów
@@ -169,150 +169,150 @@ ACCOUNTING_EXPENSEREPORT_JOURNAL=Dziennik raportów kosztowych
 ACCOUNTING_SOCIAL_JOURNAL=Dziennik społecznościowy
 ACCOUNTING_HAS_NEW_JOURNAL=Ma nowy dziennik
 
-ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
-ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_RESULT_PROFIT=Rachunek wynikowy (zysk)
+ACCOUNTING_RESULT_LOSS=Rachunek wynikowy (strata)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Dziennik zamknięcia
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
-TransitionalAccount=Transitional bank transfer account
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Rachunek księgowy przelewu przejściowego
+TransitionalAccount=Konto przejściowe do przelewów bankowych
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Konto księgowe dla oczekujących
 DONATION_ACCOUNTINGACCOUNT=Konto księgowe dla zarejestrowanych dotatcji
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Konto księgowe do rejestracji subskrypcji
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Konto księgowe domyślnie do rejestracji wpłaty klienta
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Konto księgowe domyślnie dla kupowanych produktów (używane, jeśli nie zostało zdefiniowane w karcie produktu)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Konto księgowe domyślnie dla zakupionych produktów w EWG (używane, jeśli nie zostało zdefiniowane w karcie produktu)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Konto księgowe domyślnie dla produktów zakupionych i importowanych poza EWG (używane, jeśli nie zostało zdefiniowane w karcie produktu)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Konto księgowe używane domyślnie dla sprzedanych produktów (używane jeżeli nie zdefiniowano konta w arkuszu produktu)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Konto księgowe domyślnie dla produktów sprzedawanych w EWG (używane, jeśli nie zostało zdefiniowane w karcie produktu)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Konto księgowe domyślnie dla produktów sprzedanych i wyeksportowanych poza EWG (używane, jeśli nie zostały zdefiniowane w karcie produktu)
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Konto księgowe używane domyślnie dla kupionych usług (używane jeżeli nie zdefiniowano konta w arkuszu produktu)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Konto księgowe domyślnie dla zakupionych usług w EWG (używane, jeśli nie zostało zdefiniowane w karcie usług)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Konto księgowe domyślnie dla usług zakupionych i importowanych poza EWG (używane, jeśli nie zostało zdefiniowane w karcie usług)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Konto księgowe używane domyślnie dla sprzedanych usług (używane jeżeli nie zdefiniowano konta w arkuszu produktu)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Konto księgowe domyślnie dla usług sprzedawanych w EWG (używane, jeśli nie zostało zdefiniowane w arkuszu usług)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Konto księgowe domyślnie dla usług sprzedawanych i eksportowanych poza EWG (używane, jeśli nie zostało zdefiniowane w arkuszu usług)
 
 Doctype=Rodzaj dokumentu
 Docdate=Data
 Docref=Odniesienie
 LabelAccount=Etykieta konta
-LabelOperation=Label operation
-Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
-LetteringCode=Lettering code
-Lettering=Lettering
+LabelOperation=Operacja na etykiecie
+Sens=Kierunek
+AccountingDirectionHelp=W przypadku konta księgowego klienta użyj opcji Kredyt, aby zarejestrować otrzymaną płatność <br> W przypadku konta księgowego dostawcy użyj polecenia Debet, aby zarejestrować dokonaną płatność
+LetteringCode=Kod literowy
+Lettering=Literowanie
 Codejournal=Dziennik
-JournalLabel=Journal label
+JournalLabel=Etykieta czasopisma
 NumPiece=ilość sztuk
 TransactionNumShort=Numer transakcji
-AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+AccountingCategory=Custom group
+GroupByAccountAccounting=Grupuj według konta księgi głównej
+GroupBySubAccountAccounting=Grupuj według konta księgi podrzędnej
+AccountingAccountGroupsDesc=Możesz tutaj zdefiniować kilka grup rachunków księgowych. Będą wykorzystywane do tworzenia spersonalizowanych raportów księgowych.
 ByAccounts=Według kont
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
+ByPredefinedAccountGroups=Według predefiniowanych grup
+ByPersonalizedAccountGroups=Według spersonalizowanych grup
 ByYear=Według roku
 NotMatch=Nie ustawione
-DeleteMvt=Delete some operation lines from accounting
-DelMonth=Month to delete
+DeleteMvt=Usuń niektóre linie operacyjne z księgowania
+DelMonth=Miesiąc do usunięcia
 DelYear=Rok do usunęcia
 DelJournal=Dziennik do usunięcia
-ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
+ConfirmDeleteMvt=Spowoduje to usunięcie wszystkich linii operacyjnych z rozliczenia roku / miesiąca i / lub określonego dziennika (wymagane jest co najmniej jedno kryterium). Będziesz musiał ponownie użyć funkcji „%s”, aby usunąć usunięty rekord z powrotem w księdze.
+ConfirmDeleteMvtPartial=Spowoduje to usunięcie transakcji z księgowania (wszystkie wiersze operacji związane z tą samą transakcją zostaną usunięte)
 FinanceJournal=Dziennik finansów
 ExpenseReportsJournal=Dziennik raportów kosztów
 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 an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=To jest widok rekordu, który jest powiązany z kontem księgowym i może być zapisany w dziennikach i księdze.
 VATAccountNotDefined=Konto dla niezdefiniowanego VATu
 ThirdpartyAccountNotDefined=Konto dla niezdefiniowanego kontrahenta
 ProductAccountNotDefined=Konto dla produktu nie zdefiniowane
-FeeAccountNotDefined=Account for fee not defined
+FeeAccountNotDefined=Konto z opłatą nie zostało zdefiniowane
 BankAccountNotDefined=Konto dla banku nie zdefiniowane
 CustomerInvoicePayment=Płatność za fakturę klienta
-ThirdPartyAccount=Third-party account
+ThirdPartyAccount=Konto innej firmy
 NewAccountingMvt=Nowa transakcja
 NumMvts=Ilość transakcji
 ListeMvts=Lista ruchów
 ErrorDebitCredit=Debetowych i kredytowych nie może mieć wartość w tym samym czasie
 AddCompteFromBK=Dodaj konta księgowe do grupy
-ReportThirdParty=List third-party account
-DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+ReportThirdParty=Wymień konto innej firmy
+DescThirdPartyReport=Zapoznaj się z listą klientów i dostawców zewnętrznych oraz ich kont księgowych
 ListAccounts=Lista kont księgowych
-UnknownAccountForThirdparty=Unknown third-party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
-PaymentsNotLinkedToProduct=Payment not linked to any product / service
-OpeningBalance=Opening balance
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by level
+UnknownAccountForThirdparty=Nieznane konto innej firmy. Użyjemy %s
+UnknownAccountForThirdpartyBlocking=Nieznane konto innej firmy. Błąd blokowania
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Konto innej firmy nie zostało zdefiniowane lub firma trzecia nieznana. Użyjemy %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Nieznany podmiot zewnętrzny i księga podrzędna nie została zdefiniowana w płatności. Wartość konta księgi podrzędnej pozostanie pusta.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Konto innej firmy nie zostało zdefiniowane lub firma trzecia nieznana. Błąd blokowania.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Nieznane konto innej firmy i konto oczekujące nie zostały zdefiniowane. Błąd blokowania
+PaymentsNotLinkedToProduct=Płatność nie jest powiązana z żadnym produktem / usługą
+OpeningBalance=Bilans otwarcia
+ShowOpeningBalance=Pokaż bilans otwarcia
+HideOpeningBalance=Ukryj saldo otwarcia
+ShowSubtotalByGroup=Pokaż sumę częściową według poziomu
 
 Pcgtype=Grupa konta
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+PcgtypeDesc=Grupa kont jest używana jako predefiniowane kryteria „filtru” i „grupowania” w niektórych raportach księgowych. Na przykład „DOCHÓD” lub „WYDATEK” są używane jako grupy dla kont księgowych produktów w celu utworzenia raportu kosztów / dochodów.
 
-Reconcilable=Reconcilable
+Reconcilable=Do pogodzenia
 
 TotalVente=Łączny obrót przed opodatkowaniem
 TotalMarge=Całkowita marża sprzedaży
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilCustomer=Zapoznaj się z listą wierszy faktur klienta powiązanych (lub nie) z kontem księgowym produktu
+DescVentilMore=W większości przypadków, jeśli korzystasz z predefiniowanych produktów lub usług i ustawisz numer konta na karcie produktu / usługi, aplikacja będzie w stanie powiązać wszystkie linie faktury z kontem księgowym planu kont, tylko w jedno kliknięcie przyciskiem <strong> "%s" </strong>. Jeśli konto nie zostało ustawione na kartach produktów / usług lub jeśli nadal masz jakieś linie niepowiązane z kontem, będziesz musiał wykonać ręczne powiązanie z menu „<strong> %s </strong>”.
+DescVentilDoneCustomer=Zapoznaj się z listą wierszy odbiorców faktur i ich kontami księgowymi produktów
 DescVentilTodoCustomer=Powiąż pozycje faktury aktualnie nie związane  z kontem księgowym produktu
 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 vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
-DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilSupplier=Zapoznaj się z listą wierszy faktur od dostawców powiązanych lub jeszcze niezwiązanych z kontem księgowym produktu (widoczne są tylko rekordy, które nie zostały jeszcze przeniesione w księgowości)
+DescVentilDoneSupplier=Zapoznaj się z listą wierszy faktur od dostawców i ich kontami księgowymi
+DescVentilTodoExpenseReport=Powiązanie wierszy raportu wydatków, które nie są jeszcze powiązane z kontem rozliczeniowym opłat
+DescVentilExpenseReport=Zapoznaj się z listą pozycji raportu wydatków powiązanych (lub nie) z kontem rozliczania opłat
+DescVentilExpenseReportMore=Jeśli ustawisz konto księgowe na typ wierszy raportu z wydatków, aplikacja będzie w stanie powiązać wszystkie wiersze raportu z wydatków z kontem księgowym planu kont, jednym kliknięciem za pomocą przycisku <strong> "%s" </strong>. Jeśli konto nie zostało ustawione w słowniku opłat lub jeśli nadal masz jakieś linie niepowiązane z żadnym kontem, będziesz musiał wykonać ręczne powiązanie z menu "<strong> %s </strong>".
+DescVentilDoneExpenseReport=Zapoznaj się z listą pozycji raportów wydatków i ich kontem księgowym opłat
 
-Closure=Annual closure
-DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
-OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Validate movements
-DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+Closure=Coroczne zamknięcie
+DescClosure=Sprawdź tutaj liczbę operacji miesięcznych, które nie zostały zatwierdzone, a lata podatkowe już otwarte
+OverviewOfMovementsNotValidated=Krok 1 / Przegląd ruchów, które nie zostały zatwierdzone. (Konieczne do zamknięcia roku podatkowego)
+AllMovementsWereRecordedAsValidated=Wszystkie ruchy zostały zarejestrowane jako zatwierdzone
+NotAllMovementsCouldBeRecordedAsValidated=Nie wszystkie ruchy można było zarejestrować jako zatwierdzone
+ValidateMovements=Zatwierdź ruchy
+DescValidateMovements=Jakakolwiek modyfikacja lub usunięcie pisma, napisów i usunięcia będzie zabronione. Wszystkie wpisy do ćwiczenia muszą zostać zatwierdzone, w przeciwnym razie zamknięcie nie będzie możliwe
 
 ValidateHistory=Dowiąż automatycznie
 AutomaticBindingDone=Automatyczne dowiązanie ukończone
 
 ErrorAccountancyCodeIsAlreadyUse=Błąd, nie można usunąc tego konta księgowego, ponieważ jest w użyciu
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
-Balancing=Balancing
+MvtNotCorrectlyBalanced=Ruch nie jest prawidłowo wyważony. Obciążenie = %s | Kredyt = %s
+Balancing=Balansowy
 FicheVentilation=Karta dowiązania
 GeneralLedgerIsWritten=Transakcje zapisane w księdze głównej
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
-NoNewRecordSaved=No more record to journalize
+GeneralLedgerSomeRecordWasNotRecorded=Niektóre transakcje nie mogły zostać zapisane w dzienniku. Jeśli nie ma innego komunikatu o błędzie, jest to prawdopodobnie spowodowane tym, że zostały już zapisane w dzienniku.
+NoNewRecordSaved=Koniec z zapisem do dziennika
 ListOfProductsWithoutAccountingAccount=Lista produktów nie dowiązanych do żadnego konta księgowego
 ChangeBinding=Zmień dowiązanie
-Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
-ShowTutorial=Show Tutorial
-NotReconciled=Not reconciled
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+Accounted=Rozliczone w księdze
+NotYetAccounted=Jeszcze nie uwzględnione w księdze
+ShowTutorial=Pokaż Poradnik
+NotReconciled=Nie pogodzono się
+WarningRecordWithoutSubledgerAreExcluded=Ostrzeżenie, wszystkie operacje bez zdefiniowanego konta księgi podrzędnej są filtrowane i wykluczane z tego widoku
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Opcje wiązania
 ApplyMassCategories=Dodaj masowo kategorie
-AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
+AddAccountFromBookKeepingWithNoCategories=Dostępne konto nie jest jeszcze w spersonalizowanej grupie
 CategoryDeleted=Kategoria dla konta księgowego została usunięta
 AccountingJournals=Dzienniki kont księgowych
 AccountingJournal=Dziennik księgowy
 NewAccountingJournal=Nowy dziennik księgowy
 ShowAccountingJournal=Wyświetl dziennik konta księgowego
-NatureOfJournal=Nature of Journal
-AccountingJournalType1=Miscellaneous operations
+NatureOfJournal=Charakter dziennika
+AccountingJournalType1=Różne operacje
 AccountingJournalType2=Sprzedaż
 AccountingJournalType3=Zakupy
 AccountingJournalType4=Bank
@@ -320,68 +320,68 @@ AccountingJournalType5=Raport kosztów
 AccountingJournalType8=Inwentaryzacja
 AccountingJournalType9=Ma nowe
 ErrorAccountingJournalIsAlreadyUse=Ten dziennik jest już w użytku
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
-NumberOfAccountancyEntries=Number of entries
-NumberOfAccountancyMovements=Number of movements
-ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
+AccountingAccountForSalesTaxAreDefinedInto=Uwaga: Konta księgowe dla podatku od sprzedaży są zdefiniowane w menu <b> %s </b> - <b> %s </b>
+NumberOfAccountancyEntries=Liczba wejść
+NumberOfAccountancyMovements=Liczba ruchów
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Wyłącz powiązanie i przeniesienie w księgowości sprzedaży (faktury klientów nie będą brane pod uwagę w księgowości)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Wyłącz powiązanie i przeniesienie w księgowości zakupów (faktury dostawcy nie będą brane pod uwagę w księgowości)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Wyłącz powiązanie i przeniesienie w księgowości na zestawieniach wydatków (zestawienia wydatków nie będą brane pod uwagę w księgowości)
 
 ## Export
 ExportDraftJournal=Export dziennika projektu
 Modelcsv=Model eksportu
 Selectmodelcsv=Wybierz model eksportu
 Modelcsv_normal=Standardowy eksport
-Modelcsv_CEGID=Export for CEGID Expert Comptabilité
-Modelcsv_COALA=Export for Sage Coala
-Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export for Quadratus QuadraCompta
-Modelcsv_ebp=Export for EBP
-Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
-Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
-Modelcsv_openconcerto=Export for OpenConcerto (Test)
-Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_CEGID=Eksport dla CEGID Expert Comptabilité
+Modelcsv_COALA=Eksport dla Sage Coala
+Modelcsv_bob50=Eksport dla Sage BOB 50
+Modelcsv_ciel=Eksport dla Sage Ciel Compta lub Compta Evolution
+Modelcsv_quadratus=Eksport do Quadratus QuadraCompta
+Modelcsv_ebp=Eksport do EBP
+Modelcsv_cogilog=Eksport do Cogilog
+Modelcsv_agiris=Eksport dla Agiris
+Modelcsv_LDCompta=Eksport do LD Compta (v9) (test)
+Modelcsv_LDCompta10=Eksport do LD Compta (wersja 10 i wyższa)
+Modelcsv_openconcerto=Eksport do OpenConcerto (test)
+Modelcsv_configurable=Eksportuj plik CSV konfigurowalny
+Modelcsv_FEC=Eksportuj FEC
+Modelcsv_FEC2=Eksportuj FEC (z odwróceniem generowania dat / dokumentów)
+Modelcsv_Sage50_Swiss=Eksport dla Sage 50 Szwajcaria
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
-ChartofaccountsId=Chart of accounts Id
+Modelcsv_Gestinumv3=Eksport do Gestinum (v3)
+Modelcsv_Gestinumv5Export dla Gestinum (v5)
+ChartofaccountsId=Id planu kont
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+InitAccountancy=Rozpocznij księgowość
+InitAccountancyDesc=Ta strona może służyć do inicjowania konta księgowego dla produktów i usług, które nie mają konta księgowego zdefiniowanego dla sprzedaży i zakupów.
+DefaultBindingDesc=Na tej stronie można ustawić konto domyślne, które będzie używane do łączenia rekordów transakcji dotyczących wynagrodzeń, darowizn, podatków i VAT, gdy żadne konto księgowe nie zostało jeszcze ustawione.
+DefaultClosureDesc=Ta strona może służyć do ustawiania parametrów używanych do rozliczania zamknięć.
 Options=Opcje
 OptionModeProductSell=Tryb sprzedaży
-OptionModeProductSellIntra=Mode sales exported in EEC
-OptionModeProductSellExport=Mode sales exported in other countries
+OptionModeProductSellIntra=Sprzedaż w trybie eksportowym do EWG
+OptionModeProductSellExport=Sprzedaż w trybie eksportowym do innych krajów
 OptionModeProductBuy=Tryb zakupów
-OptionModeProductBuyIntra=Mode purchases imported in EEC
-OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductBuyIntra=Zakupy w trybie importowane do EWG
+OptionModeProductBuyExport=Zakupiony tryb zaimportowany z innych krajów
 OptionModeProductSellDesc=Pokaż wszystkie produkty z kontem księgowym dla sprzedaży
-OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
-OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
+OptionModeProductSellIntraDesc=Pokaż wszystkie produkty z kontem księgowym sprzedaży w EWG.
+OptionModeProductSellExportDesc=Pokaż wszystkie produkty z kontem księgowym dla pozostałej sprzedaży zagranicznej.
 OptionModeProductBuyDesc=Pokaż wszystkie produkty z kontem księgowym dla zakupów
-OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
-OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
-CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+OptionModeProductBuyIntraDesc=Pokaż wszystkie produkty z kontem księgowym do zakupów w EWG.
+OptionModeProductBuyExportDesc=Pokaż wszystkie produkty z kontem księgowym do innych zakupów zagranicznych.
+CleanFixHistory=Usuń kod księgowy z wierszy, które nie istnieją w planach kont
 CleanHistory=Resetuj wszystkie dowiązania dla wybranego roku
-PredefinedGroups=Predefined groups
+PredefinedGroups=Wstępnie zdefiniowane grupy
 WithoutValidAccount=Bez poprawnego dedykowanego konta
 WithValidAccount=Z poprawnym dedykowanym kontem
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
-AccountRemovedFromGroup=Account removed from group
-SaleLocal=Local sale
-SaleExport=Export sale
-SaleEEC=Sale in EEC
-SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+ValueNotIntoChartOfAccount=Ta wartość konta księgowego nie istnieje w planie kont
+AccountRemovedFromGroup=Konto zostało usunięte z grupy
+SaleLocal=Sprzedaż lokalna
+SaleExport=Sprzedaż eksportowa
+SaleEEC=Sprzedaż w EWG
+SaleEECWithVAT=Sprzedaż w EWG z podatkiem VAT niezerowym, więc przypuszczamy, że NIE jest to sprzedaż wewnątrzwspólnotowa, a sugerowane konto to standardowe konto produktu.
+SaleEECWithoutVATNumber=Sprzedaż w EWG bez podatku VAT, ale identyfikator VAT strony trzeciej nie jest zdefiniowany. Wracamy na konto produktu dla sprzedaży standardowej. W razie potrzeby możesz poprawić identyfikator VAT strony trzeciej lub konto produktu.
 
 ## Dictionary
 Range=Zakres konta księgowego
@@ -390,19 +390,41 @@ Formula=Formuła
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Niektóre obowiązkowe kroki konfiguracji nie zostały wykonane. Proszę je uzupełnić.
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
-ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
-ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
+ErrorNoAccountingCategoryForThisCountry=Brak dostępnej grupy kont księgowych dla kraju %s (patrz Strona główna - Konfiguracja - Słowniki)
+ErrorInvoiceContainsLinesNotYetBounded=Próbujesz zapisywać w dzienniku niektóre wiersze faktury <strong> %s </strong>, ale niektóre inne wiersze nie są jeszcze powiązane z kontem księgowym. Odmawia się dziennikowania wszystkich wierszy faktur dla tej faktury.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Niektóre wiersze na fakturze nie są powiązane z kontem księgowym.
 ExportNotSupported=Ustawiony format exportu nie jest wspierany na tej stronie
-BookeppingLineAlreayExists=Lines already existing into bookkeeping
+BookeppingLineAlreayExists=Linie już istniejące w księgowości
 NoJournalDefined=Nie zdefiniowano dziennika
-Binded=Lines bound
+Binded=Linie związane
 ToBind=Linie do dowiązania
-UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+UseMenuToSetBindindManualy=Wiersze jeszcze niezwiązane, użyj menu <a href="%s"> %s </a>, aby wykonać powiązanie ręcznie
 
 ## Import
-ImportAccountingEntries=Accounting entries
-DateExport=Date export
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
-ExpenseReportJournal=Expense Report Journal
-InventoryJournal=Inventory Journal
+ImportAccountingEntries=Zapisy księgowe
+ImportAccountingEntriesFECFormat=Zapisy księgowe - format FEC
+FECFormatJournalCode=Dziennik kodu (JournalCode)
+FECFormatJournalLabel=Dziennik etykiet (JournalLib)
+FECFormatEntryNum=Liczba sztuk (EcritureNum)
+FECFormatEntryDate=Data wykonania (EcritureDate)
+FECFormatGeneralAccountNumber=Ogólny numer konta (CompteNum)
+FECFormatGeneralAccountLabel=Ogólna etykieta konta (CompteLib)
+FECFormatSubledgerAccountNumber=Numer konta księgi podrzędnej (CompAuxNum)
+FECFormatSubledgerAccountLabel=Numer konta księgi podrzędnej (CompAuxLib)
+FECFormatPieceRef=Kawałek ref (PieceRef)
+FECFormatPieceDate=Tworzenie daty sztuki (PieceDate)
+FECFormatLabelOperation=Operacja etykiety (EcritureLib)
+FECFormatDebit=Debet (debet)
+FECFormatCredit=Kredyt (kredyt)
+FECFormatReconcilableCode=Kod uzgodniony (EcritureLet)
+FECFormatReconcilableDate=Data uzgodnienia (DateLet)
+FECFormatValidateDate=Zatwierdzona data sztuki (ValidDate)
+FECFormatMulticurrencyAmount=Kwota w wielu walutach (Montantdevise)
+FECFormatMulticurrencyCode=Kod wielowalutowy (Idevise)
+
+DateExport=Eksport daty
+WarningReportNotReliable=Ostrzeżenie, ten raport nie jest oparty na księdze, więc nie zawiera transakcji zmodyfikowanych ręcznie w księdze. Jeśli dziennikarstwo jest aktualne, widok księgowości jest dokładniejszy.
+ExpenseReportJournal=Dziennik wydatków
+InventoryJournal=Dziennik zapasów
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 68fdfa7587f..d3f0e57c684 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -9,7 +9,7 @@ VersionExperimental=Eksperymentalny
 VersionDevelopment=Rozwój
 VersionUnknown=Nieznany
 VersionRecommanded=Zalecana
-FileCheck=Fileset Integrity Checks
+FileCheck=Sprawdzanie integralności zestawu plików
 FileCheckDesc=To narzędzie pozwala sprawdzić integralność plików i konfigurację Twej aplikacji, porównując każdy plik z oficjalnym, w tym wartości niektórych stałych z konfiguracji. Pozwala to ustalić czy jakieś pliki zostały zmodyfikowane (np. przez hakera).
 FileIntegrityIsStrictlyConformedWithReference=Integralność plików jest ściśle zgodna z referencją.
 FileIntegrityIsOkButFilesWereAdded=Sprawdzenie integralności plików przebiegło pomyślnie, aczkolwiek jakieś nowe pliki zostały dodane.
@@ -17,17 +17,17 @@ FileIntegritySomeFilesWereRemovedOrModified=Sprawdzenie integralności plików z
 GlobalChecksum=Globalna suma kontrolna
 MakeIntegrityAnalysisFrom=Wykonaj analizę integralności plików aplikacji z
 LocalSignature=Wbudowany podpis lokalny (mniej niezawodny)
-RemoteSignature=Remote distant signature (more reliable)
+RemoteSignature=Zdalny odległy podpis (bardziej niezawodny)
 FilesMissing=Brakujące pliki
 FilesUpdated=Aktualizacja plików
 FilesModified=Zmodyfikowane pliki
 FilesAdded=Dodane pliki
 FileCheckDolibarr=Sprawdź integralność plików aplikacji
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
+AvailableOnlyOnPackagedVersions=Plik lokalny do sprawdzania integralności jest dostępny tylko wtedy, gdy aplikacja jest instalowana z oficjalnego pakietu
+XmlNotFound=Nie znaleziono pliku integralności XML aplikacji
 SessionId=ID sesji
 SessionSaveHandler=Asystent zapisu sesji
-SessionSavePath=Session save location
+SessionSavePath=Lokalizacja zapisu sesji
 PurgeSessions=Czyszczenie sesji
 ConfirmPurgeSessions=Czy na pewno chcesz usunąć wszystkie sesje? Spowoduje to odłączenie każdego użytkownika (oprócz ciebie).
 NoSessionListWithThisHandler=Obsługa sesji zapisu skonfigurowana w twoim PHP nie pozwala wyświetlić listy uruchomionych sesji.
@@ -37,8 +37,9 @@ UnlockNewSessions=Usuwanie blokady połączeń
 YourSession=Twoja sesja
 Sessions=Sesje użytkowników
 WebUserGroup=Serwer sieci Web użytkownik / grupa
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFiles=Uprawnienia do plików
+PermissionsOnFilesInWebRoot=Uprawnienia do plików w katalogu głównym sieci
+PermissionsOnFile=Uprawnienia do pliku %s
 NoSessionFound=Twoja konfiguracja PHP wydaje się nie pozwalać na wyświetlanie aktywnych sesji. Katalog używany do zapisywania sesji (<b>%s</b>) może być chroniony (na przykład przez uprawnienia systemu operacyjnego lub dyrektywę PHP open_basedir).
 DBStoringCharset=Kodowanie bazy danych do przechowywania danych
 DBSortingCharset=Kodowanie bazy danych by sortować dane
@@ -56,12 +57,13 @@ GUISetup=Wyświetlanie
 SetupArea=Konfiguracja
 UploadNewTemplate=Załaduj nowy szablon(y)
 FormToTestFileUploadForm=Formularz do wysyłania pliku testowego (według konfiguracji)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=Moduł<b> %s </b> musi być włączony
+ModuleIsEnabled=Moduł<b> %s </b> został włączony
 IfModuleEnabled=Uwaga: tak jest skuteczne tylko wtedy, gdy <b>moduł %s</b> jest aktywny
 RemoveLock=Usuń/zmień nazwę pliku <b>%s</b> o ile istnieje, aby umożliwić korzystanie z narzędzia Aktualizuj/Instaluj.
 RestoreLock=Przywróć plik <b>%s</b> o uprawnieniach tylko do odczytu, aby wyłączyć dalsze korzystanie z narzędzia Aktualizuj/Instaluj.
 SecuritySetup=Ustawienia bezpieczeństwa
+PHPSetup=Ustawienia PHP
 SecurityFilesDesc=Zdefiniuj tutaj opcje związane z bezpieczeństwem przesyłania plików.
 ErrorModuleRequirePHPVersion=Błąd ten moduł wymaga PHP w wersji %s lub większej
 ErrorModuleRequireDolibarrVersion=Błąd ten moduł wymaga Dolibarr wersji %s lub większej
@@ -75,7 +77,7 @@ DisableJavascriptNote=Uwaga: Do celów testowych lub debugowania. W celu optymal
 UseSearchToSelectCompanyTooltip=Jeśli masz dużą liczbę kontrahentów (> 100 000), można zwiększyć prędkość przez ustawienie stałej COMPANY_DONOTSEARCH_ANYWHERE na 1 w Ustawienia -> Inne. Wyszukiwanie będzie wtedy ograniczone do rozpoczęcia ciągu znaków.
 UseSearchToSelectContactTooltip=Jeśli masz dużą liczbę kontrahentów (> 100 000), można zwiększyć prędkość przez ustawienie stałej COMPANY_DONOTSEARCH_ANYWHERE na 1 w Ustawienia -> Inne. Wyszukiwanie będzie wtedy ograniczone do rozpoczęcia ciągu znaków.
 DelaiedFullListToSelectCompany=Poczekaj na naciśnięcie klawisza przed załadowaniem zawartości kombinowanej listy Strony Trzecie.<br>Może to zwiększyć wydajność, jeśli masz dużą liczbę stron trzecich, ale jest to mniej wygodne.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+DelaiedFullListToSelectContact=Poczekaj, aż klawisz zostanie naciśnięty przed załadowaniem zawartości combo listy Kontakt. <br> Może to zwiększyć wydajność, jeśli masz dużą liczbę kontaktów, ale jest to mniej wygodne.
 NumberOfKeyToSearch=Liczba znaków do uruchomienia wyszukiwania: %s
 NumberOfBytes=Liczba Bajtów
 SearchString=Szukana fraza
@@ -84,7 +86,7 @@ AllowToSelectProjectFromOtherCompany=Na dokumencie kontrahenta można wybrać pr
 JavascriptDisabled=JavaScript wyłączony
 UsePreviewTabs=Użyj podgląd karty
 ShowPreview=Pokaż podgląd
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Pokaż/Ukryj szczegóły
 PreviewNotAvailable=Podgląd niedostępny
 ThemeCurrentlyActive=Temat obecnie aktywny
 MySQLTimeZone=Strefa czasowa MySQL (baza danych)
@@ -99,7 +101,7 @@ NextValueForInvoices=Następna wartość (faktury)
 NextValueForCreditNotes=Następna wartość (not kredytowych)
 NextValueForDeposit=Następna wartość (zaliczka)
 NextValueForReplacements=Następna wartość (zamienniki)
-MustBeLowerThanPHPLimit=Uwaga: twoja konfiguracja PHP obecnie ogranicza maksymalny rozmiar pliku do przesłania do <b>%s</b> %s, niezależnie od wartości tego parametru
+MustBeLowerThanPHPLimit=Uwaga: twoje ustawienia PHP obecnie ograniczają maksymalny rozmiar pliku do przesłania do <b>%s</b> %s, niezależnie od wartości tego parametru
 NoMaxSizeByPHPLimit=Uwaga: Brak ustawionego limitu w twojej konfiguracji PHP
 MaxSizeForUploadedFiles=Maksymalny rozmiar dla twoich przesyłanych plików (0 by zabronić jego przesyłanie/upload)
 UseCaptchaCode=Użyj graficzny kod (CAPTCHA) na stronie logowania
@@ -154,8 +156,8 @@ SystemToolsAreaDesc=Ten Obszar zapewnia funkcje administracyjne. Użyj menu, aby
 Purge=Czyszczenie
 PurgeAreaDesc=Ta strona pozwala usunąć wszystkie pliki wygenerowane lub przechowywane przez Dolibarr (pliki tymczasowe lub wszystkie pliki w katalogu <b>%s</b>). Korzystanie z tej funkcji zwykle nie jest konieczne. Jest to obejście dla użytkowników, których Dolibarr jest hostowany przez dostawcę, który nie oferuje uprawnień do usuwania plików wygenerowanych przez serwer WWW.
 PurgeDeleteLogFile=Usuń pliki logu, wliczając <b>%s</b> zdefiniowany dla modułu Syslog (brak ryzyka utraty danych)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files
+PurgeDeleteTemporaryFiles=Usuń wszystkie pliki dziennika i pliki tymczasowe (bez ryzyka utraty danych). Parametrem może być „tempfilesold”, „logfiles” lub oba „tempfilesold + logfiles”. Uwaga: Pliki tymczasowe są usuwane tylko wtedy, gdy katalog tymczasowy został utworzony ponad 24 godziny temu.
+PurgeDeleteTemporaryFilesShort=Usuń dziennik i pliki tymczasowe
 PurgeDeleteAllFilesInDocumentsDir=Usuń wszystkie pliki z katalogu: <b>%s</b>.<br>Spowoduje to usunięcie wszystkich wygenerowanych dokumentów związanych z elementami (strony trzecie, faktury itp.), plików przesłanych do modułu ECM, zrzutów kopii zapasowej bazy danych i plików tymczasowych.
 PurgeRunNow=Czyść teraz
 PurgeNothingToDelete=Brak katalogu lub plików do usunięcia.
@@ -223,15 +225,16 @@ Nouveauté=Nowość
 AchatTelechargement=Kup / Pobierz
 GoModuleSetupArea=Aby wdrożyć/zainstalować nowy moduł, przejdź do obszaru konfiguracji modułów: <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.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Lista firm oferujących niestandardowe moduły lub funkcje. <br> Uwaga: ponieważ Dolibarr jest aplikacją typu open source, <i> każdy </i> mający doświadczenie w programowaniu PHP powinien być w stanie stworzyć moduł.
 WebSiteDesc=Zewnętrzne strony internetowe dla dodatkowych (innych niż podstawowe) modułów.
 DevelopYourModuleDesc=Niektóre zagadnienia do opracowania własnego modułu...
 URL=URL
-RelativeURL=Względny adres URL
+RelativeURL=Powiązany adres URL
 BoxesAvailable=Dostępne widgety
 BoxesActivated=Widgety aktywowane
 ActivateOn=Uaktywnij
 ActiveOn=Aktywowany
+ActivatableOn=Aktywowane na
 SourceFile=Plik źródłowy
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostępne tylko wtedy, gdy JavaScript jest wyłączony
 Required=Wymagany
@@ -257,7 +260,7 @@ ReferencedPreferredPartners=Preferowani Partnerzy
 OtherResources=Inne zasoby
 ExternalResources=Zasoby zewnętrzne
 SocialNetworks=Sieci społecznościowe
-SocialNetworkId=Social Network ID
+SocialNetworkId=Identyfikator sieci społecznościowej
 ForDocumentationSeeWiki=Aby zapoznać się z dokumentacją użytkownika lub dewelopera (Doc, FAQ ...), <br> zajrzyj do Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Aby znaleźć odpowiedzi na pytania / uzyskać dodatkową pomoc, możesz skorzystać z  forum Dolibarr : <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Oto niektóre zasoby pozwalające uzyskać pomoc i wsparcie z Dolibarr.
@@ -276,7 +279,7 @@ NoticePeriod=Okres wypowiedzenia
 NewByMonth=Nowe według miesiąca
 Emails=Wiadomości email
 EMailsSetup=Ustawienia wiadomości email
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=Ta strona umożliwia ustawienie parametrów lub opcji wysyłania wiadomości e-mail.
 EmailSenderProfiles=Profile nadawców wiadomości e-mail
 EMailsSenderProfileDesc=Możesz pozostawić tę sekcję pustą. Jeśli wpiszesz tutaj adresy e-mail, zostaną one dodane do listy możliwych nadawców dostępnej podczas pisania nowej wiadomości e-mail.
 MAIN_MAIL_SMTP_PORT=Port SMTP/SMTPS (wartość domyślna w php.ini: <b>%s</b>)
@@ -294,7 +297,7 @@ MAIN_MAIL_SMTPS_ID=Identyfikator/login SMTP  (jeśli serwer wysyłający wymaga
 MAIN_MAIL_SMTPS_PW=Hasło SMTP (jeśli serwer wysyłający wymaga uwierzytelnienia)
 MAIN_MAIL_EMAIL_TLS=Użyj szyfrowania TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Użyj szyfrowania TLS (STARTTLS)
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoryzuj automatyczne podpisy dla certyfikatów
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Użyj metody uwierzytelniania DKIM do generowania podpisu e-mail
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domena DNS utrzymująca informacje DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Selektor DKIM wskazujący rekord DNS
@@ -308,7 +311,7 @@ CompanyEmail=Adres firmowego konta e-mail
 FeatureNotAvailableOnLinux=Cechy te nie są dostępne w systemach Unix, takich jak. Przetestuj swój program sendmail lokalnie.
 FixOnTransifex=Napraw tłumaczenie na platformie do tłumaczenia projektu
 SubmitTranslation=Jeśli tłumaczenie dla tego języka nie jest kompletne lub znajdziesz błędy, możesz to poprawić, edytując pliki w katalogu <b>langs/%s</b>. Prześlij potem swoją zmianę 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, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+SubmitTranslationENUS=Jeśli tłumaczenie na ten język nie jest kompletne lub znajdziesz błędy, możesz to poprawić, edytując pliki w katalogu <b> langs / %s </b> i przesyłając zmodyfikowane pliki na dolibarr.org/forum lub, jeśli jesteś programistą, za pomocą PR na github.com/Dolibarr/dolibarr
 ModuleSetup=Moduł konfiguracji
 ModulesSetup=Ustawienia Modułów/Aplikacji
 ModuleFamilyBase=System
@@ -328,7 +331,7 @@ MenuHandlers=Menu obsługi
 MenuAdmin=Edytor menu
 DoNotUseInProduction=Nie używaj w produkcji
 ThisIsProcessToFollow=Procedura aktualizacji:
-ThisIsAlternativeProcessToFollow=Alternatywna konfiguracja do ręcznego przetwarzania:
+ThisIsAlternativeProcessToFollow=Alternatywne ustawienia do ręcznego przetwarzania:
 StepNb=Krok %s
 FindPackageFromWebSite=Znajdź pakiet zapewniający potrzebne funkcje (na przykład na oficjalnej stronie internetowej %s).
 DownloadPackageFromWebSite=Pobierz pakiet (na przykład z oficjalnej strony internetowej %s).
@@ -338,19 +341,20 @@ SetupIsReadyForUse=Wdrożenie modułu zostało zakończone. Teraz musisz go wł
 NotExistsDirect=Alternatywny katalog główny nie jest zdefiniowany w istniejącym katalogu.<br>
 InfDirAlt=Od wersji 3 możliwe jest zdefiniowanie alternatywnego katalogu głównego. Pozwala to na przechowywanie w dedykowanym katalogu wtyczek oraz niestandardowych szablonów. <br>Wystarczy utworzyć katalog w lokalizacji plików Dolibarr (na przykład: niestandardowe).<br>
 InfDirExample= <br> Następnie zadeklarować je w pliku <strong> conf.php </strong> <br> $ dolibarr_main_url_root_alt = '' / zwyczajem <br> $ dolibarr_main_document_root_alt = '/ path / z / Dolibarr / htdocs / niestandardowej' <br> Jeśli te wiersze są z komentarzem "#", aby umożliwić im , po prostu odkomentuj, usuwając znak „#”.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+YouCanSubmitFile=Możesz załadować plik .zip pakietu modułów stąd:
 CurrentVersion=Aktualna wersja Dolibarr
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+CallUpdatePage=Przejdź do strony, która aktualizuje strukturę bazy danych i dane: %s.
 LastStableVersion=Ostatnia stabilna wersja
 LastActivationDate=Data ostatniej aktywacji
-LastActivationAuthor=Latest activation author
+LastActivationAuthor=Najnowszy autor aktywacji
 LastActivationIP=Numer IP ostatniej aktywacji
 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 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>
+WithCounter=Zarządzaj licznikiem
+GenericMaskCodes=Możesz wprowadzić dowolną maskę numeracji. W tej masce można użyć następujących tagów: <br> <b> {000000} </b> odpowiada liczbie, która będzie zwiększana na każdym %s. Wpisz tyle zer, ile chcesz długości licznika. Licznik zostanie uzupełniony zerami od lewej, aby mieć tyle zer, ile jest w masce. <br> <b> {000000 + 000} </b> taki sam jak poprzedni, ale przesunięcie odpowiadające liczbie po prawej stronie znaku + jest stosowane począwszy od pierwszego %s. <br> <b> {000000 @ x} </b> tak samo jak poprzedni, ale licznik jest resetowany do zera po osiągnięciu miesiąca x (x między 1 a 12 lub 0, aby użyć pierwszych miesięcy roku podatkowego zdefiniowanego w konfiguracji lub zerować co miesiąc). Jeśli ta opcja jest używana, a x wynosi 2 lub więcej, to sekwencja {yy} {mm} lub {yyyy} {mm} jest również wymagana. <br> <b> {dd} </b> dzień (od 01 do 31). <br> <b> {mm} </b> miesiąc (od 01 do 12). <br> <b> {yy} </b>, <b> {yyyy} </b> lub <b> {y}</b>rok powyżej 2, 4 lub 1 numerów.<br>
+GenericMaskCodes2= <b> {cccc} </b> kod klienta złożony z n znaków <br> <b> {cccc000} </b> to kod klienta, po którym następuje kod klienta. Ten dedykowany klientowi licznik jest resetowany w tym samym czasie co licznik globalny. <br> <b> {tttt} </b> Kod typu strony trzeciej na n znakach (patrz menu Strona Główna - Ustawienia - Słowniki - Rodzaje kontrahentów). Jeśli dodasz ten tag, licznik będzie inny dla każdego typu kontrahenta. <br>
 GenericMaskCodes3=Wszystkie inne znaki w masce pozostaną nienaruszone. <br> Spacje są niedozwolone. <br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes3EAN=Wszystkie inne znaki w masce pozostaną nienaruszone (z wyjątkiem * lub? Na 13. pozycji w EAN13). <br> Spacje są niedozwolone. <br> W EAN13 ostatnim znakiem po ostatniej} na 13. pozycji powinno być * lub? . Zostanie on zastąpiony przez wyliczony klucz. <br>
+GenericMaskCodes4a= <u> Przykład na 99. %s strony trzeciej TheCompany, z datą 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> wyświetli jako <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> wyświetli jako <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> wyświetli jako <b>IN0701-0099-A</b> jeśli rodzaj firmy to 'spółka Z O.O.' z kodem dla typu 'A_RI'
@@ -364,266 +368,268 @@ ErrorCantUseRazIfNoYearInMask=Błąd, nie można korzystać z opcji @ na reset l
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Błąd, nie można użyć opcji @ jeżeli sekwencja {rr}{mm} lub {yyyy}{mm} nie jest elementem maski.
 UMask=Parametr Umask dla nowych plików systemów Unix / Linux / BSD / Mac.
 UMaskExplanation=Ten parametr pozwala określić uprawnienia ustawione domyślnie na pliki stworzone przez Dolibarr na serwerze (na przykład podczas przesyłania). <br> To musi być wartość ósemkowa (na przykład, 0666 oznacza odczytu i zapisu dla wszystkich). <br> Paramtre Ce ne sert pas sous un serveur Windows.
-SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+SeeWikiForAllTeam=Spójrz na stronę Wiki, aby zapoznać się z listą współpracowników i ich organizacji
 UseACacheDelay= Opóźnienie dla buforowania odpowiedzi eksportu w sekundach (0 lub puste pole oznacza brak buforowania)
 DisableLinkToHelpCenter=Ukryj link <b>"Potrzebujesz pomocy lub wsparcia"</b> na stronie logowania
 DisableLinkToHelp=Ukryj link <b>" %s Pomoc online"</b> w lewym menu
-AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+AddCRIfTooLong=Nie ma automatycznego zawijania tekstu, zbyt długi tekst nie będzie wyświetlany na dokumentach. W razie potrzeby dodaj znaki powrotu karetki w polu tekstowym.
+ConfirmPurge=Czy na pewno chcesz wykonać to czyszczenie? <br> Spowoduje to trwałe usunięcie wszystkich plików danych bez możliwości ich przywrócenia (pliki ECM, załączone pliki ...).
 MinLength=Minimalna długość
 LanguageFilesCachedIntoShmopSharedMemory=Pliki. Lang załadowane do pamięci współdzielonej
 LanguageFile=Plik języka
-ExamplesWithCurrentSetup=Examples with current configuration
+ExamplesWithCurrentSetup=Przykłady z aktualną konfiguracją
 ListOfDirectories=Lista katalogów szablonów OpenDocument
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
+NumberOfModelFilesFound=Liczba plików szablonów ODT/ODS znalezionych w tych katalogach
+ExampleOfDirectoriesForModelGen=Przykłady składni: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Aby dowiedzieć się jak stworzyć szablony dokumentów odt, przed zapisaniem ich w katalogach, zapoznaj się z dokumentacją wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozycja Imienia / Nazwiska
-DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+DescWeather=Poniższe obrazy zostaną wyświetlone na pulpicie nawigacyjnym, gdy liczba późnych działań osiągnie następujące wartości:
 KeyForWebServicesAccess=Kluczem do korzystania z usług internetowych (parametr &quot;dolibarrkey&quot; w webservices)
 TestSubmitForm=Formularz testowy wprowadzania
-ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThisForceAlsoTheme=Korzystanie z tego menedżera menu będzie również używać własnego motywu, niezależnie od wyboru użytkownika. Również ten menedżer menu wyspecjalizowany dla smartfonów nie działa na wszystkich smartfonach. Użyj innego menedżera menu, jeśli napotkasz problemy ze swoim.
 ThemeDir=Katalog Skórek
-ConnectionTimeout=Connection timeout
+ConnectionTimeout=Czas połączenia upłynął
 ResponseTimeout=Przekroczony czas odpowiedzi
 SmsTestMessage=Wiadomość testowa z PHONEFROM__ __ do __ PHONETO__
 ModuleMustBeEnabledFirst=<b>%s</b> moduł musi być włączony przed użyciem tej funkcji.
 SecurityToken=Klucz do bezpiecznego URL
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+NoSmsEngine=Brak dostępnego menedżera nadawców SMS-ów. Menedżer nadawców SMS nie jest instalowany z domyślną dystrybucją, ponieważ zależy od zewnętrznego dostawcy, ale można go znaleźć na %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
-HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
-PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFDesc=Globalne opcje generowania plików PDF
+PDFAddressForging=Zasady dotyczące sekcji adresowej
+HideAnyVATInformationOnPDF=Ukryj wszystkie informacje związane z podatkiem od sprzedaży/VAT
+PDFRulesForSalesTax=Zasady dotyczące podatku od sprzedaży/VAT
 PDFLocaltax=Zasady dla %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
-HideDescOnPDF=Hide products description
-HideRefOnPDF=Hide products ref.
-HideDetailsOnPDF=Hide product lines details
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+HideLocalTaxOnPDF=Ukryj stawkę %s w kolumnie Podatek od sprzedaży/VAT
+HideDescOnPDF=Ukryj opis produktów
+HideRefOnPDF=Ukryj produkty nr ref.
+HideDetailsOnPDF=Ukryj szczegóły linii produktów
+PlaceCustomerAddressToIsoLocation=Użyj francuskiej pozycji standardowej (La Poste) dla pozycji adresu klienta
 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 unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=Ukryj nieautoryzowane przyciski akcji również dla użytkowników wewnętrznych (w przeciwnym razie tylko wyszarzone)
 OldVATRates=Poprzednia stawka VAT
 NewVATRates=Nowa stawka VAT
 PriceBaseTypeToChange=Zmiana dla cen opartych na wartości referencyjnej ustalonej na
-MassConvert=Launch bulk conversion
-PriceFormatInCurrentLanguage=Price Format In Current Language
+MassConvert=Uruchom konwersję zbiorczą
+PriceFormatInCurrentLanguage=Format ceny w aktualnym języku
 String=Ciąg znaków
-String1Line=String (1 line)
+String1Line=Ciąg (1 linia)
 TextLong=Długi tekst
-TextLongNLines=Long text (n lines)
+TextLongNLines=Długi tekst (n wierszy)
 HtmlText=Tekst HTML
 Int=Liczba całkowita
 Float=Liczba zmiennoprzecinkowa
 DateAndTime=Data i godzina
 Unique=Unikalny
-Boolean=Boolean (one checkbox)
+Boolean=Boolean (jedno pole wyboru)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Cena
 ExtrafieldMail = Adres e-mail
 ExtrafieldUrl = Link
 ExtrafieldSelect = Wybierz listę
 ExtrafieldSelectList = Wybierz z tabeli
-ExtrafieldSeparator=Separator (not a field)
+ExtrafieldSeparator=Separator (nie pole)
 ExtrafieldPassword=Hasło
-ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldRadio=Przyciski radiowe (tylko jeden wybór)
 ExtrafieldCheckBox=Pola wyboru
-ExtrafieldCheckBoxFromList=Checkboxes from table
+ExtrafieldCheckBoxFromList=Pola wyboru z tabeli
 ExtrafieldLink=Link do obiektu
 ComputedFormula=Obliczone pole
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-Computedpersistent=Store computed field
-ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+ComputedFormulaDesc=Możesz tu wprowadzić formułę, używając innych właściwości obiektu lub dowolnego kodowania PHP, aby uzyskać dynamiczną wartość obliczoną. Możesz używać dowolnych formuł zgodnych z PHP, w tym znaku „?” operator warunku i następujący obiekt globalny: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong>. <br> <strong> OSTRZEŻENIE </strong>: Tylko niektóre właściwości obiektu $object mogą być dostępne. Jeśli potrzebujesz właściwości, które nie są załadowane, po prostu wczytaj obiekt do formuły, tak jak w drugim przykładzie. <br> Użycie pola obliczeniowego oznacza, że nie możesz samodzielnie wprowadzić żadnej wartości z interfejsu. Ponadto, jeśli wystąpi błąd składni, formuła może nic nie zwrócić. <br> <br> Przykład formuły: <br> $object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2) <br> <br> Przykład przeładowania obiektu <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Inny przykład formuły wymuszającej ładowanie obiektu i jego obiektu nadrzędnego: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: „Nie znaleziono projektu nadrzędnego”
+Computedpersistent=Zapisz obliczone pole
+ComputedpersistentDesc=Obliczone dodatkowe pola zostaną zapisane w bazie danych, jednak wartość zostanie przeliczona tylko wtedy, gdy obiekt tego pola zostanie zmieniony. Jeśli obliczone pole zależy od innych obiektów lub danych globalnych, ta wartość może być nieprawidłowa !!
+ExtrafieldParamHelpPassword=Pozostawienie tego pola pustego oznacza, że ta wartość będzie przechowywana bez szyfrowania (pole musi być ukryte tylko z gwiazdką na ekranie). <br> Ustaw `` auto '', aby użyć domyślnej reguły szyfrowania do zapisania hasła w bazie danych (wtedy odczytana wartość będzie tylko hashem, nie ma możliwości odzyskania oryginalnej wartości)
+ExtrafieldParamHelpselect=Lista wartości musi być liniami z kluczem formatu, wartością (gdzie klucz nie może wynosić '0') <br> <br> na przykład: <br> 1, wartość1 <br> 2, wartość2 <br> <br> na przykład: <br> 1, wartość1 <br> 2, wartość2 <br> lista zależności od innej uzupełniającej listy atrybutów: <br> 1, wartosc1 | options_ <i> parent_list_code </i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> aby mieć listę w zależności od innej listy: <br> 1, wartosc1 | <i> kod_listy_nadrzędnej </i>: klucz_nadrzędny <br> 2, wartość2 | <i> kod_listy_nadrzędnej </i>: klucz_nadrzędny
+ExtrafieldParamHelpcheckbox=Lista wartości musi być liniami z kluczem formatu, wartością (gdzie klucz nie może mieć wartości '0') <br> <br> na przykład: <br> 1, wartość1 <br> 2, wartość2 <br> 3, wartość3 ...
+ExtrafieldParamHelpradio=Lista wartości musi być liniami z kluczem formatu, wartością (gdzie klucz nie może mieć wartości '0') <br> <br> na przykład: <br> 1, wartość1 <br> 2, wartość2 <br> 3, wartość3 ...
+ExtrafieldParamHelpsellist=Lista wartości pochodzi z tabeli <br> Składnia: nazwa_tabeli: etykieta_field: id_field :: filtersql <br> Przykład: c_typent: libelle: id :: filtersql <br> <br> - id_field jest warunkiem afda0 - id_pole jest aql Może to być prosty test (np. Active = 1), aby wyświetlić tylko aktywną wartość <br> Możesz również użyć $ ID $ w filtrze, który jest bieżącym identyfikatorem bieżącego obiektu <br> Aby użyć SELECT w filtrze użyj słowa kluczowego $ SEL $, aby bypass ochrona przed wtryskiem. <br>, jeśli chcesz filtrować na polach zewnętrznych, użyj składni extra.fieldcode = ... (gdzie kod pola jest kodem extrafield) <br> <br> Aby lista zależała od innej uzupełniającej listy atrybutów: a0342fccellefda19bz0: <i> kod_listy_nadrzędnej </i> | kolumna_nadrzędna: filtr <br> <br> Aby lista była zależna od innej listy: <br> c_typent: libelle: id: a049271_kod_podrzędny: a049271_filtr
+ExtrafieldParamHelpchkbxlst=Lista wartości pochodzi z tabeli <br> Składnia: nazwa_tabeli: label_field: id_field :: filtersql <br> Przykład: c_typent: libelle: id :: filtersql <br> <br> Filtr wyświetlania może być prostym testem np. Activebz0f = 1 może również użyć $ ID $ w filtrze, który jest bieżącym identyfikatorem bieżącego obiektu <br> Aby wykonać WYBÓR w filtrze, użyj $ SEL $ <br>, jeśli chcesz filtrować na polach zewnętrznych, użyj składni extra.fieldcode = ... (gdzie kod pola to Kod extrafield) <br> <br> W celu uzyskania listy w zależności od innej uzupełniającej listy atrybutów: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filtr <br> <br> W celu uzyskania listy w zależności od innej listy: <br> c_typent: libelle: id: <i> kod_listy_nadrzędnej </i> | kolumna_nadrzędna: filtr
+ExtrafieldParamHelplink=Parametry muszą być parametrami ObjectName: Classpath <br> Składnia: ObjectName: Classpath
+ExtrafieldParamHelpSeparator=Pozostaw puste dla prostego separatora <br> Ustaw na 1 dla zwijanego separatora (domyślnie otwarty dla nowej sesji, a następnie status jest zachowany dla każdej sesji użytkownika) <br> Ustaw na 2 dla zwijanego separatora (domyślnie zwinięty dla nowej sesji, a następnie status jest zachowywany przed każdą sesją użytkownika)
 LibraryToBuildPDF=Biblioteka używana do generowania plików PDF
-LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Niektóre kraje mogą nakładać dwa lub trzy podatki w każdym wierszu faktury. W takim przypadku wybierz rodzaj drugiego i trzeciego podatku oraz jego stawkę. Możliwe typy to: <br> 1: podatek lokalny dotyczy produktów i usług bez VAT (podatek lokalny jest obliczany na podstawie kwoty bez podatku) <br> 2: podatek lokalny dotyczy produktów i usług, w tym VAT (podatek lokalny jest obliczany na podstawie kwoty + podatek główny) <br> 3: podatek lokalny dotyczy produktów bez VAT (podatek lokalny jest obliczany na podstawie kwoty bez podatku) <br> 4: podatek lokalny dotyczy produktów zawierających podatek VAT (podatek lokalny jest obliczany na podstawie kwoty + główny podatek VAT) <br> 5: podatek lokalny dotyczy usług bez VAT (podatek lokalny jest obliczany od kwoty bez podatku) <br> 6: podatek lokalny dotyczy usług, w tym VAT (podatek lokalny jest obliczany od kwoty + podatek)
 SMS=SMS
 LinkToTestClickToDial=Wprowadź numer telefonu, aby zobaczyć link do przetestowania url ClickToDial dla <strong>użytkownika% s</strong>
 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
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=W większości przypadków możesz pozostawić to pole puste.
 DefaultLink=Domyślny link
 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=External module
-InstalledInto=Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
+ExternalModule=Moduł zewnętrzny
+InstalledInto=Zainstalowany w katalogu %s
+BarcodeInitForThirdparties=Masowe inicjowanie kodu kreskowego dla kontrahentów
 BarcodeInitForProductsOrServices=Masowe generowanie kodów lub reset kodów kreskowych dla usług i produktów
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+CurrentlyNWithoutBarCode=Obecnie masz rekord <strong> %s </strong> na <strong> %s </strong> %s bez kodu kreskowego.
 InitEmptyBarCode=Generuj wartość dla kolejnych %s pustych wpisów
 EraseAllCurrentBarCode=Usuń wszystkie aktualne kody kreskowe
 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=No numbering barcode template enabled in the Barcode module setup.
+NoBarcodeNumberingTemplateDefined=Brak włączonego szablonu numerowania kodów kreskowych w konfiguracji modułu kodów kreskowych.
 EnableFileCache=Włącz cache plików
-ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
-NoDetails=No additional details in footer
+ShowDetailsInPDFPageFoot=Dodaj więcej szczegółów w stopce, takich jak adres firmy lub nazwiska menedżerów (oprócz identyfikatorów zawodowych, kapitału firmy i numeru VAT).
+NoDetails=Brak dodatkowych szczegółów w stopce
 DisplayCompanyInfo=Wyświetl adres firmy
-DisplayCompanyManagers=Display manager names
+DisplayCompanyManagers=Wyświetl nazwy menedżerów
 DisplayCompanyInfoAndManagers=Wyświetl adres firmy i dane menadżerów
-EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
-ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+EnableAndSetupModuleCron=Jeśli chcesz, aby ta faktura cykliczna była generowana automatycznie, moduł * %s * musi być włączony i poprawnie skonfigurowany. W innym przypadku faktury należy generować ręcznie z tego szablonu za pomocą przycisku * Utwórz *. Pamiętaj, że nawet jeśli włączyłeś automatyczne generowanie, nadal możesz bezpiecznie uruchamiać ręczne generowanie. Generowanie duplikatów za ten sam okres nie jest możliwe.
+ModuleCompanyCodeCustomerAquarium=%s, po którym następuje kod klienta dla kodu księgowego klienta
+ModuleCompanyCodeSupplierAquarium=%s, po którym następuje kod dostawcy dla kodu księgowego dostawcy
 ModuleCompanyCodePanicum=Zwróć pusty kod księgowy
-ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
-Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
-UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ModuleCompanyCodeDigitaria=Zwraca złożony kod rozliczeniowy zgodnie z nazwą strony trzeciej. Kod składa się z prefiksu, który można zdefiniować na pierwszej pozycji, po którym następuje liczba znaków zdefiniowanych w kodzie strony trzeciej.
+ModuleCompanyCodeCustomerDigitaria=%s, po którym następuje skrócona nazwa klienta o liczbę znaków: %s dla kodu księgowego klienta.
+ModuleCompanyCodeSupplierDigitaria=%s, po którym następuje skrócona nazwa dostawcy o liczbę znaków: %s dla kodu księgowego dostawcy.
+Use3StepsApproval=Domyślnie zamówienia zakupu muszą być tworzone i zatwierdzane przez 2 różnych użytkowników (jeden krok/użytkownik do utworzenia i jeden krok/użytkownik do zatwierdzenia. Należy pamiętać, że jeśli użytkownik ma zarówno uprawnienia do tworzenia, jak i zatwierdzania, wystarczy jeden krok/użytkownik) . Za pomocą tej opcji możesz poprosić o wprowadzenie trzeciego kroku/zatwierdzenia użytkownika, jeśli kwota jest wyższa niż wartość dedykowana (więc konieczne będą 3 kroki: 1 = walidacja, 2 = pierwsze zatwierdzenie i 3 = drugie zatwierdzenie, jeśli kwota jest wystarczająca). <br> Ustaw tę opcję na pustą, jeśli wystarczy jedno zatwierdzenie (2 kroki), ustaw ją na bardzo niską wartość (0,1), jeśli zawsze wymagane jest drugie zatwierdzenie (3 kroki).
+UseDoubleApproval=Użyj 3-stopniowego zatwierdzenia, gdy kwota (bez podatku) jest wyższa niż ...
+WarningPHPMail=OSTRZEŻENIE: Konfiguracja wysyłania wiadomości e-mail z aplikacji korzysta z domyślnej konfiguracji ogólnej. Często lepiej jest skonfigurować wychodzące wiadomości e-mail tak, aby korzystały z serwera poczty e-mail dostawcy usług e-mail zamiast konfiguracji domyślnej z kilku powodów:
+WarningPHPMailA=- Korzystanie z serwera dostawcy usług e-mail zwiększa wiarygodność wiadomości e-mail, a więc zwiększa dostarczalność bez oznaczania jako SPAM
+WarningPHPMailB=- Niektórzy dostawcy usług e-mail (np. Yahoo) nie pozwalają na wysyłanie wiadomości e-mail z innego serwera niż ich własny serwer. Twoja obecna konfiguracja wykorzystuje serwer aplikacji do wysyłania wiadomości e-mail, a nie serwer dostawcy poczty e-mail, więc niektórzy odbiorcy (ten zgodny z restrykcyjnym protokołem DMARC) zapytają dostawcę poczty e-mail, czy mogą zaakceptować Twoją wiadomość e-mail i niektórzy dostawcy poczty e-mail (jak Yahoo) może odpowiedzieć „nie”, ponieważ serwer nie należy do nich, więc niewiele z wysłanych przez Ciebie e-maili może nie zostać zaakceptowanych do dostarczenia (uważaj również na limit wysyłania dostawcy poczty e-mail).
+WarningPHPMailC=- Używanie serwera SMTP własnego dostawcy usług pocztowych do wysyłania e-maili jest również interesujące, więc wszystkie e-maile wysyłane z aplikacji będą również zapisywane w katalogu „Wysłane” Twojej skrzynki pocztowej.
+WarningPHPMailD=Jeśli metoda „PHP Mail” jest rzeczywiście metodą, której chcesz użyć, możesz usunąć to ostrzeżenie, dodając stałą MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP do 1 w menu Strona Główna - Ustawienia - Inne.
+WarningPHPMail2=Jeśli Twój dostawca poczty e-mail SMTP musi ograniczyć klienta poczty e-mail do niektórych adresów IP (bardzo rzadko), jest to adres IP agenta użytkownika poczty (MUA) dla aplikacji ERP CRM: <strong> %s </strong>.
+WarningPHPMailSPF=Jeśli nazwa domeny w adresie e-mail nadawcy jest chroniona przez rekord SPF (poproś o rejestrację nazwy domeny), musisz dodać następujące adresy IP w rekordzie SPF serwera DNS swojej domeny: <strong> %s </strong>.
 ClickToShowDescription=Kliknij aby zobaczyć opis
-DependsOn=This module needs the module(s)
+DependsOn=Ten moduł wymaga modułów
 RequiredBy=Ten moduł wymagany jest przez moduł(y)
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
-EnableDefaultValues=Enable customization of default values
-EnableOverwriteTranslation=Enable usage of overwritten translation
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
+TheKeyIsTheNameOfHtmlField=To jest nazwa pola HTML. Aby odczytać zawartość strony HTML w celu uzyskania nazwy klucza pola, wymagana jest wiedza techniczna.
+PageUrlForDefaultValues=Musisz wprowadzić względną ścieżkę adresu URL strony. Jeśli umieścisz parametry w adresie URL, wartości domyślne będą obowiązywać, jeśli wszystkie parametry będą miały tę samą wartość.
+PageUrlForDefaultValuesCreate= <br> Przykład: <br> Formularz do tworzenia nowej strony trzeciej to <strong> %s </strong>. <br> W przypadku adresów URL modułów zewnętrznych zainstalowanych w katalogu niestandardowym nie należy dołączać „custom/”, więc użyj ścieżki takiej jak <strong> mymodule/mypage.php </strong>, a nie custom/mymodule/mypage.php. <br> Jeśli chcesz mieć wartość domyślną tylko wtedy, gdy adres URL ma jakiś parametr, możesz użyć <strong> %s </strong>
+PageUrlForDefaultValuesList= <br> Przykład: <br> W przypadku strony z listą stron trzecich jest to <strong> %s </strong>. <br> W przypadku adresów URL modułów zewnętrznych zainstalowanych w katalogu niestandardowym nie należy dołączać „custom/”, więc użyj ścieżki takiej jak <strong> mymodule/mypagelist.php </strong>, a nie custom/mymodule/mypagelist.php. <br> Jeśli chcesz mieć wartość domyślną tylko wtedy, gdy adres URL ma jakiś parametr, możesz użyć <strong> %s </strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Należy również pamiętać, że nadpisywanie wartości domyślnych przy tworzeniu formularzy działa tylko w przypadku stron, które zostały poprawnie zaprojektowane (więc z parametrem akcja = utwórz lub wyświetl ...)
+EnableDefaultValues=Włącz dostosowywanie wartości domyślnych
+EnableOverwriteTranslation=Włącz użycie tłumaczenia nadpisanego
+GoIntoTranslationMenuToChangeThis=Znaleziono tłumaczenie klucza z tym kodem. Aby zmienić tę wartość, należy ją edytować z poziomu Strona Główna - Ustawienia - Tłumaczenia.
+WarningSettingSortOrder=Ostrzeżenie, ustawienie domyślnej kolejności sortowania może spowodować błąd techniczny podczas przechodzenia na stronę listy, jeśli pole jest nieznanym polem. Jeśli napotkasz taki błąd, wróć na tę stronę, aby usunąć domyślną kolejność sortowania i przywrócić domyślne zachowanie.
 Field=Pole
-ProductDocumentTemplates=Document templates to generate product document
-FreeLegalTextOnExpenseReports=Free legal text on expense reports
-WatermarkOnDraftExpenseReports=Watermark on draft expense reports
-AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
-FilesAttachedToEmail=Attach file
-SendEmailsReminders=Send agenda reminders by emails
-davDescription=Setup a WebDAV server
-DAVSetup=Setup of module DAV
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+ProductDocumentTemplates=Szablony dokumentów do generowania dokumentów produktowych
+FreeLegalTextOnExpenseReports=Dowolny tekst prawny dotyczący zestawień wydatków
+WatermarkOnDraftExpenseReports=Znak wodny na projektach raportów z wydatków
+AttachMainDocByDefault=Ustaw na 1, jeśli chcesz domyślnie załączyć dokument główny do wiadomości e-mail (jeśli dotyczy)
+FilesAttachedToEmail=Załącz plik
+SendEmailsReminders=Wysyłaj przypomnienia o agendzie pocztą elektroniczną
+davDescription=Skonfiguruj serwer WebDAV
+DAVSetup=Ustawienia modułu DAV
+DAV_ALLOW_PRIVATE_DIR=Włącz ogólny katalog prywatny (dedykowany katalog WebDAV o nazwie „prywatny” - wymagane zalogowanie)
+DAV_ALLOW_PRIVATE_DIRTooltip=Ogólny katalog prywatny to katalog WebDAV, do którego każdy może uzyskać dostęp za pomocą loginu / hasła aplikacji.
+DAV_ALLOW_PUBLIC_DIR=Włącz ogólny katalog publiczny (dedykowany katalog WebDAV o nazwie „public” - logowanie nie jest wymagane)
 DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+DAV_ALLOW_ECM_DIR=Włącz prywatny katalog DMS/ECM (katalog główny modułu DMS/ECM - wymagane logowanie)
+DAV_ALLOW_ECM_DIRTooltip=Katalog główny, do którego wszystkie pliki są ładowane ręcznie podczas korzystania z modułu DMS/ECM. Podobnie jak w przypadku dostępu z interfejsu internetowego, będziesz potrzebować ważnego loginu/hasła z odpowiednimi uprawnieniami, aby uzyskać do niego dostęp.
 # Modules
 Module0Name=Użytkownicy i grupy
 Module0Desc=Zarządzanie Użytkownikami/Pracownikami i Grupami
-Module1Name=Third Parties
-Module1Desc=Companies and contacts management (customers, prospects...)
+Module1Name=Kontrahenci
+Module1Desc=Zarządzanie firmami i kontaktami (klienci, potencjalni klienci ...)
 Module2Name=Reklama
 Module2Desc=Zarządzanie reklamą
-Module10Name=Accounting (simplified)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module10Name=Księgowość (uproszczona)
+Module10Desc=Proste raporty księgowe (dzienniki, obroty) na podstawie zawartości bazy danych. Nie używa żadnej tabeli księgi.
 Module20Name=Propozycje
 Module20Desc=Zarządzanie propozycjami reklam
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
+Module22Name=Masowe wiadomości e-mail
+Module22Desc=Zarządzaj masowym wysyłaniem e-maili
 Module23Name=Energia
 Module23Desc=Monitorowanie zużycia energii
-Module25Name=Sales Orders
-Module25Desc=Sales order management
+Module25Name=Zlecenia sprzedaży
+Module25Desc=Zarządzanie zamówieniami sprzedaży
 Module30Name=Faktury
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module30Desc=Zarządzanie fakturami i notami kredytowymi dla klientów. Zarządzanie fakturami i notami kredytowymi dla dostawców
 Module40Name=Dostawcy
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
-Module42Name=Debug Logs
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module40Desc=Zarządzanie dostawcami i zakupami (zamówienia i fakturowanie faktur dostawców)
+Module42Name=Dzienniki debugowania
+Module42Desc=Możliwości logowania (plik, syslog, ...). Takie dzienniki służą do celów technicznych / debugowania.
+Module43Name=Pasek debugowania
+Module43Desc=Narzędzie dla programistów dodające pasek debugowania w przeglądarce.
 Module49Name=Edytory
 Module49Desc=Zarządzanie edytorem
 Module50Name=Produkty
-Module50Desc=Management of Products
+Module50Desc=Zarządzanie produktami
 Module51Name=Masowe wysyłanie poczty
 Module51Desc=Zarządzanie masowym wysyłaniem poczty papierowej
 Module52Name=Zapasy
-Module52Desc=Stock management
+Module52Desc=Zarządzanie zapasami
 Module53Name=Usługi
-Module53Desc=Management of Services
+Module53Desc=Zarządzanie usługami
 Module54Name=Kontrakty/Subskrypcje
-Module54Desc=Management of contracts (services or recurring subscriptions)
+Module54Desc=Zarządzanie umowami (usługi lub cykliczne subskrypcje)
 Module55Name=Kody kreskowe
 Module55Desc=Kody kreskowe zarządzania
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module56Name=Płatność przelewem
+Module56Desc=Zarządzanie płatnościami dostawców za pomocą poleceń przelewu. Obejmuje generowanie pliku SEPA dla krajów europejskich.
+Module57Name=Płatności poleceniem zapłaty
+Module57Desc=Zarządzanie poleceniami zapłaty. Obejmuje generowanie pliku SEPA dla krajów europejskich.
 Module58Name=ClickToDial
 Module58Desc=Integracja systemu ClickToDial (Asterisk,...)
-Module60Name=Stickers
-Module60Desc=Management of stickers
+Module60Name=Naklejki
+Module60Desc=Zarządzanie naklejkami
 Module70Name=Interwencje
 Module70Desc=Zarządzanie interwencjami
 Module75Name=Koszty wyjazdów i notatki
 Module75Desc=Zarządzanie kosztami wyjazdów oraz notatkami
 Module80Name=Wysyłki
-Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
+Module80Desc=Zarządzanie przesyłkami i dowodami dostawy
+Module85Name=Banki i Gotówka
 Module85Desc=Zarządzanie kontami bankowymi lub gotówkowymi
-Module100Name=External Site
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Name=Witryna zewnętrzna
+Module100Desc=Dodaj link do zewnętrznej witryny internetowej jako ikonę menu głównego. Strona internetowa jest pokazana w ramce pod górnym menu.
 Module105Name=Mailman i SPIP
 Module105Desc=Interfejs Mailman lub SPIP dla członka modułu
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
+Module200Desc=Synchronizacja katalogów LDAP
 Module210Name=PostNuke
 Module210Desc=Integracja PostNuke
 Module240Name=Eksport danych
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=Narzędzie do eksportu danych Dolibarr (z pomocą)
 Module250Name=Import danych
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=Narzędzie do importowania danych do Dolibarr (z pomocą)
 Module310Name=Członkowie
 Module310Desc=Zarządzanie członkami fundacji
 Module320Name=RSS Feed
-Module320Desc=Add a RSS feed to Dolibarr pages
-Module330Name=Bookmarks & Shortcuts
-Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
-Module400Name=Projects or Leads
-Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module320Desc=Dodaj kanał RSS do stron Dolibarr
+Module330Name=Zakładki i skróty
+Module330Desc=Twórz skróty, zawsze dostępne, do wewnętrznych lub zewnętrznych stron, do których często uzyskujesz dostęp
+Module400Name=Projekty lub potencjalni klienci
+Module400Desc=Zarządzanie projektami, potencjalnymi klientami/możliwościami i/lub zadaniami. Możesz również przypisać dowolny element (fakturę, zamówienie, propozycję, interwencję, ...) do projektu i uzyskać przekrojowy widok z widoku projektu.
 Module410Name=Webcalendar
 Module410Desc=Integracja Webcalendar
-Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module500Name=Podatki i wydatki specjalne
+Module500Desc=Zarządzanie innymi wydatkami (podatki od sprzedaży, podatki socjalne lub podatkowe, dywidendy, ...)
 Module510Name=Wynagrodzenia
-Module510Desc=Record and track employee payments
+Module510Desc=Nagrywaj i śledź płatności pracowników
 Module520Name=Kredyty
 Module520Desc=Zarządzanie kredytów
-Module600Name=Notifications on business event
-Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
-Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
-Module610Name=Product Variants
-Module610Desc=Creation of product variants (color, size etc.)
+Module600Name=Powiadomienia o wydarzeniach biznesowych
+Module600Desc=Wysyłaj powiadomienia e-mail wyzwalane przez zdarzenie biznesowe: na użytkownika (konfiguracja zdefiniowana dla każdego użytkownika), na osobę kontaktową (konfiguracja zdefiniowana dla każdej strony trzeciej) lub przez określone wiadomości e-mail
+Module600Long=Należy pamiętać, że ten moduł wysyła wiadomości e-mail w czasie rzeczywistym, gdy ma miejsce określone wydarzenie biznesowe. Jeśli szukasz funkcji wysyłania przypomnień e-mail o wydarzeniach w programie, przejdź do konfiguracji modułu Agenda.
+Module610Name=Warianty produktu
+Module610Desc=Tworzenie wariantów produktów (kolor, rozmiar itp.)
 Module700Name=Darowizny
 Module700Desc=Zarządzanie darowiznami
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=Request vendor commercial proposal and prices
+Module770Name=Raporty Wydatków
+Module770Desc=Zarządzaj raportami wydatków (transport, posiłki, ...)
+Module1120Name=Oferty handlowe dostawcy
+Module1120Desc=Poproś sprzedawcę o ofertę handlową i ceny
 Module1200Name=Mantis
 Module1200Desc=Integracja Mantis
 Module1520Name=Generowanie dokumentu
-Module1520Desc=Mass email document generation
+Module1520Desc=Masowe generowanie dokumentów e-mail
 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 text fields to be edited/formatted using CKEditor (html)
+Module2000Desc=Zezwalaj na edycję/formatowanie pól tekstowych za pomocą CKEditor (html)
 Module2200Name=Dynamiczne Ceny
-Module2200Desc=Use maths expressions for auto-generation of prices
+Module2200Desc=Użyj wyrażeń matematycznych do automatycznego generowania cen
 Module2300Name=Zaplanowane zadania
 Module2300Desc=Zarządzanie zaplanowanymi zadaniami (jak cron lub chrono table)
 Module2400Name=Wydarzenia/Agenda
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
+Module2400Desc=Śledź wydarzenia. Rejestruj automatyczne zdarzenia do celów śledzenia lub rejestruj zdarzenia ręczne lub spotkania. Jest to główny moduł dobrego zarządzania relacjami z klientami lub dostawcami.
 Module2500Name=SZD / ZZE
 Module2500Desc=System Zarządzania Dokumentami / Zarządzanie Zawartością Elektroniczną. Automatyczna organizacja twoich wygenerowanych lub składowanych dokumentów. Udostępniaj je kiedy chcesz.
 Module2600Name=API services (Web services SOAP)
@@ -631,55 +637,57 @@ Module2600Desc=Enable the Dolibarr SOAP server providing API services
 Module2610Name=API services (Web services REST)
 Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2660Name=Połączeń WebServices (klient SOAP)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2660Desc=Włącz klienta usług sieciowych Dolibarr (może być używany do przesyłania danych/żądań do serwerów zewnętrznych. Obecnie obsługiwane są tylko zamówienia zakupu).
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2700Desc=Skorzystaj z internetowego serwisu Gravatar (www.gravatar.com), aby pokazać zdjęcia użytkowników/członków (znalezione wraz z ich e-mailami). Potrzebuje dostępu do internetu
 Module2800Desc=FTP Client
 Module2900Name=GeoIPMaxmind
 Module2900Desc=Możliwości konwersji GeoIP Maxmind
-Module3200Name=Unalterable Archives
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3200Name=Niezmienione archiwa
+Module3200Desc=Włącz niezmienny dziennik zdarzeń biznesowych. Wydarzenia są archiwizowane w czasie rzeczywistym. Dziennik jest tabelą tylko do odczytu połączonych zdarzeń, które można wyeksportować. Ten moduł może być obowiązkowy w niektórych krajach.
+Module3400Name=Sieci społecznościowe
+Module3400Desc=Włącz pola sieci społecznościowych w kontrahentach i adresach (skype, twitter, facebook, ...).
 Module4000Name=HR
 Module4000Desc=Zarządzanie zasobami ludzkimi (zarządzanie departamentami, umowami pracowników,...)
 Module5000Name=Multi-company
 Module5000Desc=Pozwala na zarządzanie wieloma firmami
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Przepływ pracy między modułami
+Module6000Desc=Zarządzanie przepływem pracy pomiędzy różnymi modułami (automatyczne tworzenie obiektu i/lub automatyczna zmiana statusu)
 Module10000Name=Strony internetowe
-Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
-Module20000Name=Leave Request Management
-Module20000Desc=Define and track employee leave requests
-Module39000Name=Product Lots
-Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
-Module40000Name=Multicurrency
-Module40000Desc=Use alternative currencies in prices and documents
+Module10000Desc=Twórz strony internetowe (publiczne) za pomocą edytora WYSIWYG. To jest CMS zorientowany na webmastera lub programistę (lepiej znać język HTML i CSS). Po prostu skonfiguruj swój serwer WWW (Apache, Nginx, ...), aby wskazywał dedykowany katalog Dolibarr, aby mieć go online w Internecie z własną nazwą domeny.
+Module20000Name=Zarządzanie Wnioskami Urlopowymi
+Module20000Desc=Definiuj i śledź wnioski pracowników o urlop
+Module39000Name=Partie produktów
+Module39000Desc=Partie, numery seryjne, zarządzanie datami przydatności do spożycia/sprzedaży dla produktów
+Module40000Name=Wielowalutowy
+Module40000Desc=Używaj alternatywnych walut w cenach i dokumentach
 Module50000Name=Paybox
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50000Desc=Zaoferuj klientom stronę płatności online PayBox (karty kredytowe/debetowe). Można to wykorzystać, aby umożliwić swoim klientom dokonywanie płatności ad hoc lub płatności związanych z określonym obiektem Dolibarr (faktura, zamówienie itp.)
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50100Desc=Moduł punktów sprzedaży SimplePOS (prosty POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Moduł punktu sprzedaży TakePOS (POS z ekranem dotykowym, dla sklepów, barów lub restauracji).
 Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50200Desc=Zaoferuj klientom stronę płatności online PayPal (konto PayPal lub karty kredytowe/debetowe). Można to wykorzystać, aby umożliwić swoim klientom dokonywanie płatności ad hoc lub płatności związanych z określonym obiektem Dolibarr (faktura, zamówienie itp.)
 Module50300Name=Stripe
-Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50300Desc=Zaoferuj klientom stronę płatności online Stripe (karty kredytowe/debetowe). Można to wykorzystać, aby umożliwić swoim klientom dokonywanie płatności ad hoc lub płatności związanych z określonym obiektem Dolibarr (faktura, zamówienie itp.)
+Module50400Name=Księgowość (podwójny zapis)
+Module50400Desc=Zarządzanie księgowością (podwójne zapisy, obsługa Księgi Głównej i Księgi Pomocniczej). Wyeksportuj księgę do kilku innych formatów oprogramowania księgowego.
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module54000Desc=Druk bezpośredni (bez otwierania dokumentów) za pomocą interfejsu Cups IPP (drukarka musi być widoczna z serwera, a CUPS musi być zainstalowany na serwerze).
 Module55000Name=Poll, Survey or Vote
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module55000Desc=Twórz ankiety online, ankiety lub głosy (takie jak Doodle, Studs, RDVz itp.)
 Module59000Name=Marże
-Module59000Desc=Module to follow margins
+Module59000Desc=Moduł do śledzenia marginesów
 Module60000Name=Prowizje
 Module60000Desc=Moduł do zarządzania prowizjami
 Module62000Name=Formuły handlowe
-Module62000Desc=Add features to manage Incoterms
+Module62000Desc=Dodaj funkcje do zarządzania Incoterms
 Module63000Name=Zasoby
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Module63000Desc=Zarządzaj zasobami (drukarki, samochody, pokoje, ...) w celu przydzielania ich do wydarzeń
 Permission11=Czytaj faktur klientów
 Permission12=Tworzenie/modyfikacja faktur klientów
-Permission13=Invalidate customer invoices
+Permission13=Unieważnij faktury klienta
 Permission14=Walidacja faktur klienta
 Permission15=Wyślij fakturę klienta poprzez e-mail.
 Permission16=Tworzenie płatności za faktury klienta
@@ -696,18 +704,18 @@ Permission32=Tworzenie / modyfikacja produktów
 Permission34=Usuwanie produktów
 Permission36=Podejrzyj / zarządzaj ukrytymi produktami
 Permission38=Eksport produktów
-Permission39=Ignore minimum price
-Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects I'm contact for)
+Permission39=Zignoruj cenę minimalną
+Permission41=Przeczytaj projekty i zadania (wspólny projekt i projekty, w sprawie których się kontaktuję). Można również wprowadzić czasochłonne, dla mnie lub mojej hierarchii, przydzielone zadania (grafik)
+Permission42=Twórz / modyfikuj projekty (współdzielony projekt i projekty, w sprawie których się kontaktuję). Może również tworzyć zadania i przypisywać użytkowników do projektów i zadań
+Permission44=Usuń projekty (projekt współdzielony i projekty, z którymi się kontaktuję)
 Permission45=Eksportuj projekty
 Permission61=Czytaj interwencje
 Permission62=Tworzenie / modyfikacja interwencji
 Permission64=Usuwanie interwencji
 Permission67=Eksport interwencji
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=Wysyłaj interwencje pocztą elektroniczną
+Permission69=Zatwierdź interwencje
+Permission70=Unieważnij interwencje
 Permission71=Czytaj użytkowników
 Permission72=Tworzenie / modyfikacja użytkowników
 Permission74=Usuwanie użytkowników
@@ -730,29 +738,29 @@ Permission95=Przeczytaj raporty
 Permission101=Czytaj ustawienia
 Permission102=Utwórz / modyfikuj ustawienia
 Permission104=Walidacja ustawień
-Permission105=Send sendings by email
+Permission105=Wysyłaj wiadomości e-mailem
 Permission106=Eksportuj wysyłki
 Permission109=Usuń wysyłki
 Permission111=Czytaj raporty finansowe
 Permission112=Tworzenie / modyfikacja / usuwanie oraz porównywanie transakcji
 Permission113=Konfiguracja sprawozdań finansowych (tworzenie, zarządzanie kategoriami)
-Permission114=Reconcile transactions
+Permission114=Uzgodnij transakcje
 Permission115=Eksport transakcji oraz oświadczeń obrachunkowych
 Permission116=Przelewy pomiędzy rachunkami
-Permission117=Manage checks dispatching
+Permission117=Zarządzaj wysyłaniem czeków
 Permission121=Przeglądaj kontrahentów związanych z użytkownikiem
 Permission122=Tworzenie / modyfikacja stron trzecich związanych z użytkownikiem
 Permission125=Usuń kontrahentów związanych z użytkownikiem z użytkownikiem
 Permission126=Eksport stron trzecich
-Permission141=Read all projects and tasks (also private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
+Permission141=Przeczytaj wszystkie projekty i zadania (także projekty prywatne, dla których nie jestem osobą kontaktową)
+Permission142=Twórz/modyfikuj wszystkie projekty i zadania (także projekty prywatne, dla których nie jestem kontaktem)
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Czytaj dostawców
 Permission147=Czytaj statystyki
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
-Permission154=Record Credits/Rejections of direct debit payment orders
+Permission151=Przeczytaj polecenia zapłaty za polecenie zapłaty
+Permission152=Utwórz/zmodyfikuj polecenia zapłaty za polecenie zapłaty
+Permission153=Wysyłanie/przesyłanie poleceń zapłaty za polecenie zapłaty
+Permission154=Rejestrowanie kredytów/odrzuceń poleceń zapłaty poleceń zapłaty
 Permission161=Czytaj umowy / subskrypcje
 Permission162=Tworzenie / modyfikacja umowy / subskrypcji
 Permission163=Aktywacja usługi / subskrypcji umowy
@@ -765,17 +773,17 @@ Permission173=Usuń wyjazdy i wydatki
 Permission174=Przeczytaj wszystkie wycieczki i koszty
 Permission178=Eksport wyjazdówi i kosztów
 Permission180=Czytaj dostawców
-Permission181=Read purchase orders
-Permission182=Create/modify purchase orders
-Permission183=Validate purchase orders
-Permission184=Approve purchase orders
-Permission185=Order or cancel purchase orders
-Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
+Permission181=Przeczytaj zamówienia
+Permission182=Twórz/modyfikuj zamówienia
+Permission183=Weryfikuj zamówienia
+Permission184=Zatwierdź zamówienia zakupu
+Permission185=Zamów lub anuluj zamówienia
+Permission186=Otrzymuj zamówienia
+Permission187=Zamknij zamówienia
+Permission188=Anuluj zamówienia zakupu
 Permission192=Tworzenie linii
 Permission193=Zlikwiduj linię
-Permission194=Read the bandwidth lines
+Permission194=Przeczytaj linie przepustowości
 Permission202=Tworzenie połączenia ADSL
 Permission203=Zamów połączenie zamówień
 Permission204=Zamów połączenia
@@ -800,12 +808,13 @@ Permission244=Zobacz zawartość ukrytych kategorii
 Permission251=Czytaj innych użytkowników i grupy
 PermissionAdvanced251=Czytaj innych użytkowników
 Permission252=Czytaj uprawnienia innych użytkowników
-Permission253=Create/modify other users, groups and permissions
+Permission253=Twórz/modyfikuj innych użytkowników, grupy i uprawnienia
 PermissionAdvanced253=Tworzenie / modyfikacja wewnętrznych / zewnętrznych użytkowników i uprawnień
 Permission254=Tworzenie / modyfikacja jedynie zewnętrznych użytkowników
 Permission255=Modyfikacja haseł innych użytkowników
 Permission256=Usuń lub dezaktywuj innych użytkowników
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Rozszerz dostęp na wszystkie osoby trzecie ORAZ ich obiekty (nie tylko osoby trzecie, dla których użytkownik jest przedstawicielem handlowym). <br> Nieefektywne dla użytkowników zewnętrznych (zawsze ograniczone do siebie samych w przypadku ofert, zamówień, faktur, umów itp.). <br> Nieefektywne dla projektów (tylko reguły dotyczące pozwoleń na projekty, widoczności i przydziałów mają znaczenie).
+Permission263=Rozszerz dostęp na wszystkie osoby trzecie BEZ ich przedmiotu (nie tylko osoby trzecie, dla których użytkownik jest przedstawicielem handlowym). <br> Nieefektywne dla użytkowników zewnętrznych (zawsze ograniczone do siebie samych w przypadku ofert, zamówień, faktur, umów itp.). <br> Nieefektywne dla projektów (tylko reguły dotyczące pozwoleń na projekty, widoczności i przydziałów mają znaczenie).
 Permission271=Czytaj CA
 Permission272=Czytaj faktury
 Permission273=Wystawienie faktur
@@ -815,10 +824,10 @@ Permission283=Usuwanie kontaktów
 Permission286=Eksport kontaktów
 Permission291=Czytaj taryfy
 Permission292=Ustaw uprawnienia dotyczące taryf
-Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
+Permission293=Zmodyfikuj taryfy klienta
+Permission300=Czytaj kody kreskowe
+Permission301=Twórz/modyfikuj kody kreskowe
+Permission302=Usuń kody kreskowe
 Permission311=Czytaj usługi
 Permission312=Przypisywanie usługi / subskrypcji do umowy
 Permission331=Czytaj zakładki
@@ -837,11 +846,11 @@ Permission401=Odczytaj zniżki
 Permission402=Tworzenie / modyfikacja zniżek
 Permission403=Walidacja zniżek
 Permission404=Usuwanie zniżek
-Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
-Permission512=Create/modify payments of salaries
-Permission514=Delete payments of salaries
-Permission517=Read payments of salaries of everybody
+Permission430=Użyj paska debugowania
+Permission511=Czytaj wypłaty wynagrodzeń (twoich i podwładnych)
+Permission512=Twórz/modyfikuj wypłaty wynagrodzeń
+Permission514=Usuń wypłaty wynagrodzeń
+Permission517=Przeczytaj wypłaty wynagrodzeń wszystkich
 Permission519=Wynagrodzenia eksport
 Permission520=Czytaj Kredyty
 Permission522=Tworzenie / modyfikacja kredytów
@@ -853,19 +862,19 @@ Permission532=Tworzenie / modyfikacja usług
 Permission534=Usuwanie usług
 Permission536=Zobacz / zarządzaj ukrytymi usługami
 Permission538=Eksport usług
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
-Permission650=Read Bills of Materials
-Permission651=Create/Update Bills of Materials
-Permission652=Delete Bills of Materials
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission561=Czytaj polecenia płatności przelewem
+Permission562=Utwórz/zmodyfikuj zlecenie płatnicze za pomocą przelewu
+Permission563=Wyślij/prześlij polecenie zapłaty przelewem
+Permission564=Rekordowe obciążenia/odrzucenia polecenia przelewu
+Permission601=Przeczytaj naklejki
+Permission602=Twórz/modyfikuj naklejki
+Permission609=Usuń naklejki
+Permission650=Przeczytaj listy materiałów
+Permission651=Utwórz/zaktualizuj listy materiałów
+Permission652=Usuń listy materiałów
+Permission660=Przeczytaj zamówienie produkcyjne (MO)
+Permission661=Utwórz/zaktualizuj zamówienie produkcyjne (MO)
+Permission662=Usuń zlecenie produkcyjne (MO)
 Permission701=Zobacz darowizny
 Permission702=Tworzenie / modyfikacja darowizn
 Permission703=Usuń darowizny
@@ -875,104 +884,104 @@ Permission773=Usuń raporty wydatków
 Permission774=Przeczytaj wszystkie raporty wydatków (nawet dla użytkowników nie podwładni)
 Permission775=Zatwierdzanie raportów wydatków
 Permission776=Zapłać raporty wydatków
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Przeczytaj raporty wydatków wszystkich
+Permission778=Twórz/modyfikuj raporty wydatków dla wszystkich
 Permission779=Eksport raportów kosztów
 Permission1001=Zobacz zasoby
 Permission1002=Tworzenie / modyfikacja magazynów
 Permission1003=Usuń magazyny
 Permission1004=Zobacz przemieszczanie zasobów
 Permission1005=Tworzenie / modyfikacja przemieszczania zasobów
-Permission1101=Read delivery receipts
-Permission1102=Create/modify delivery receipts
-Permission1104=Validate delivery receipts
-Permission1109=Delete delivery receipts
-Permission1121=Read supplier proposals
-Permission1122=Create/modify supplier proposals
-Permission1123=Validate supplier proposals
-Permission1124=Send supplier proposals
-Permission1125=Delete supplier proposals
-Permission1126=Close supplier price requests
+Permission1101=Przeczytaj potwierdzenia dostaw
+Permission1102=Twórz/modyfikuj potwierdzenia dostaw
+Permission1104=Zatwierdź pokwitowania dostaw
+Permission1109=Usuń potwierdzenia dostaw
+Permission1121=Przeczytaj propozycje dostawców
+Permission1122=Twórz/modyfikuj oferty dostawców
+Permission1123=Zatwierdź propozycje dostawców
+Permission1124=Wyślij propozycje dostawców
+Permission1125=Usuń propozycje dostawców
+Permission1126=Zamknij zapytania dostawców o cenę
 Permission1181=Czytaj dostawców
-Permission1182=Read purchase orders
-Permission1183=Create/modify purchase orders
-Permission1184=Validate purchase orders
-Permission1185=Approve purchase orders
-Permission1186=Order purchase orders
-Permission1187=Acknowledge receipt of purchase orders
-Permission1188=Delete purchase orders
-Permission1189=Check/Uncheck a purchase order reception
-Permission1190=Approve (second approval) purchase orders
-Permission1191=Export supplier orders and their attributes
+Permission1182=Przeczytaj zamówienia
+Permission1183=Twórz/modyfikuj zamówienia
+Permission1184=Weryfikuj zamówienia
+Permission1185=Zatwierdź zamówienia zakupu
+Permission1186=Zrealizuj zamówienia
+Permission1187=Potwierdź otrzymanie zamówień zakupu
+Permission1188=Usuń zamówienia zakupu
+Permission1189=Zaznacz/odznacz przyjęcie zamówienia zakupu
+Permission1190=Zatwierdź (drugie zatwierdzenie) zamówienia zakupu
+Permission1191=Eksport zamówień dostawców i ich atrybutów
 Permission1201=Wygeneruj wyniki eksportu
 Permission1202=Utwórz / modyfikuj eksport
-Permission1231=Read vendor invoices
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
-Permission1234=Delete vendor invoices
-Permission1235=Send vendor invoices by email
-Permission1236=Export vendor invoices, attributes and payments
-Permission1237=Export purchase orders and their details
+Permission1231=Przeczytaj faktury od dostawców
+Permission1232=Twórz/modyfikuj faktury od dostawców
+Permission1233=Weryfikuj faktury od dostawców
+Permission1234=Usuń faktury dostawcy
+Permission1235=Wysyłaj faktury dostawcy pocztą elektroniczną
+Permission1236=Eksportuj faktury dostawców, atrybuty i płatności
+Permission1237=Eksport zamówień i ich szczegółów
 Permission1251=Uruchom masowy import danych zewnętrznych do bazy danych (wgrywanie danych)
 Permission1321=Eksport faktur klienta, atrybutów oraz płatności
-Permission1322=Reopen a paid bill
-Permission1421=Export sales orders and attributes
-Permission1521=Read documents
-Permission1522=Delete documents
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
-Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
-Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission1322=Otwórz ponownie opłacony rachunek
+Permission1421=Eksportuj zamówienia sprzedaży i atrybuty
+Permission1521=Przeczytaj dokumenty
+Permission1522=Usuń dokumenty
+Permission2401=Czytaj akcje (zdarzenia lub zadania) powiązane z jego kontem użytkownika (jeśli jest właścicielem wydarzenia lub właśnie do niego przypisane)
+Permission2402=Tworzenie/modyfikowanie działań (wydarzeń lub zadań) powiązanych z jego kontem użytkownika (jeśli jest właścicielem wydarzenia)
+Permission2403=Usuń działania (zdarzenia lub zadania) powiązane z jego kontem użytkownika (jeśli właściciel wydarzenia)
 Permission2411=Czytaj działania (zdarzenia lub zadania) innych osób
 Permission2412=Tworzenie / modyfikacja działań (zdarzeń lub zadań) innych osób
 Permission2413=Usuwanie działań (zdarzeń lub zadań) innych osób
-Permission2414=Export actions/tasks of others
+Permission2414=Eksport działań/zadań innych osób
 Permission2501=Czytaj / Pobierz dokumenty
 Permission2502=Pobierz dokumenty
 Permission2503=Potwierdź lub usuń dokumenty
 Permission2515=Konfiguracja katalogów dokumentów
 Permission2801=Użyj klienta FTP w trybie odczytu (tylko przeglądanie i pobieranie)
 Permission2802=Użyj klienta FTP w trybie zapisu (usuwanie lub przesyłanie plików)
-Permission3200=Read archived events and fingerprints
-Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission10001=Read website content
-Permission10002=Create/modify website content (html and javascript content)
-Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
-Permission10005=Delete website content
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission3200=Czytaj zarchiwizowane wydarzenia i odciski palców
+Permission3301=Wygeneruj nowe moduły
+Permission4001=Zobacz pracowników
+Permission4002=Twórz pracowników
+Permission4003=Usuń pracowników
+Permission4004=Eksportuj pracowników
+Permission10001=Przeczytaj zawartość strony internetowej
+Permission10002=Twórz/modyfikuj zawartość strony internetowej (zawartość html i javascript)
+Permission10003=Twórz/modyfikuj zawartość strony internetowej (dynamiczny kod php). Niebezpieczne, musi być zarezerwowane dla programistów z ograniczeniami.
+Permission10005=Usuń zawartość witryny
+Permission20001=Przeczytaj wnioski urlopowe (Twoje i Twoich podwładnych)
+Permission20002=Twórz/modyfikuj swoje wnioski urlopowe (urlop swój i podwładnych)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20004=Przeczytaj wszystkie wnioski urlopowe (nawet użytkowników, którzy nie są podwładnymi)
+Permission20005=Twórz/modyfikuj wnioski urlopowe dla wszystkich (nawet użytkowników niebędących podwładnymi)
 Permission20006=Admin leave requests (setup and update balance)
-Permission20007=Approve leave requests
+Permission20007=Zatwierdź wnioski urlopowe
 Permission23001=Czytaj Zaplanowane zadania
 Permission23002=Tworzenie / aktualizacja Zaplanowanych zadań
 Permission23003=Usuwanie Zaplanowanego zadania
 Permission23004=Wykonanie Zaplanowanego zadania
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50101=Użyj punktu sprzedaży (SimplePOS)
+Permission50151=Użyj punktu sprzedaży (TakePOS)
 Permission50201=Czytaj transakcje
 Permission50202=Import transakcji
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
-Permission50401=Bind products and invoices with accounting accounts
-Permission50411=Read operations in ledger
-Permission50412=Write/Edit operations in ledger
-Permission50414=Delete operations in ledger
-Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Export operations of the ledger
-Permission50420=Report and export reports (turnover, balance, journals, ledger)
-Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
-Permission50440=Manage chart of accounts, setup of accountancy
-Permission51001=Read assets
-Permission51002=Create/Update assets
-Permission51003=Delete assets
-Permission51005=Setup types of asset
+Permission50330=Przeczytaj obiekty Zapier
+Permission50331=Twórz/aktualizuj obiekty Zapier
+Permission50332=Usuń obiekty Zapier
+Permission50401=Powiąż produkty i faktury z kontami księgowymi
+Permission50411=Czytaj operacje w księdze
+Permission50412=Operacje zapisu/edycji w księdze
+Permission50414=Usuń operacje w księdze
+Permission50415=Usuń wszystkie operacje według roku i arkusza w księdze
+Permission50418=Operacje eksportowe księgi
+Permission50420=Raporty i raporty eksportowe (obroty, saldo, arkusze, księga)
+Permission50430=Zdefiniuj okresy obrachunkowe. Weryfikuj transakcje i zamykaj okresy obrachunkowe.
+Permission50440=Zarządzaj planem kont, konfiguruj rachunkowość
+Permission51001=Przeczytaj zasoby
+Permission51002=Utwórz/zaktualizuj zasoby
+Permission51003=Usuń zasoby
+Permission51005=Skonfiguruj typy zasobów
 Permission54001=Druk
 Permission55001=Czytaj ankiety
 Permission55002=Tworzenie / modyfikacja ankiet
@@ -983,96 +992,96 @@ Permission63001=Czytaj zasoby
 Permission63002=Utwórz/modyfikuj zasoby
 Permission63003=Usuń zasoby
 Permission63004=Dołącz zasoby do zdarzeń w agendzie
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
-DictionaryCompanyType=Third-party types
-DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
-DictionaryCanton=States/Provinces
+Permission64001=Zezwalaj na drukowanie bezpośrednie
+Permission67000=Zezwalaj na drukowanie paragonów
+Permission68001=Przeczytaj raport intracomm
+Permission68002=Utwórz/zmodyfikuj raport intracomm
+Permission68004=Usuń raport intracomm
+Permission941601=Przeczytaj rachunki
+Permission941602=Twórz i modyfikuj rachunki
+Permission941603=Potwierdź rachunki
+Permission941604=Wysyłaj potwierdzenia e-mailem
+Permission941605=Wpływy eksportowe
+Permission941606=Usuń rachunki
+DictionaryCompanyType=Typy kontrahentów
+DictionaryCompanyJuridicalType=Osoby prawne będące stronami trzecimi
+DictionaryProspectLevel=Potencjalny poziom dla firm
+DictionaryProspectContactLevel=Potencjalny poziom kontaktów
+DictionaryCanton=Stany/prowincje
 DictionaryRegion=Regiony
 DictionaryCountry=Kraje
 DictionaryCurrency=Waluty
-DictionaryCivility=Honorific titles
+DictionaryCivility=Tytuły honorowe
 DictionaryActions=Typy zdarzeń w  agendzie
 DictionarySocialContributions=Rodzaje obciążeń społecznych lub podatków
 DictionaryVAT=Stawki VAT lub stawki podatku od sprzedaży
-DictionaryRevenueStamp=Amount of tax stamps
+DictionaryRevenueStamp=Kwota znaków skarbowych
 DictionaryPaymentConditions=Zasady płatności
 DictionaryPaymentModes=Tryby płatności
 DictionaryTypeContact=Typy kontaktu/adresu
 DictionaryTypeOfContainer=Witryna internetowa - zbiór powiązanych ze sobą stron internetowych
 DictionaryEcotaxe=Podatku ekologicznego (WEEE)
 DictionaryPaperFormat=Formaty papieru
-DictionaryFormatCards=Card formats
-DictionaryFees=Expense report - Types of expense report lines
+DictionaryFormatCards=Formaty kart
+DictionaryFees=Raport z wydatków - Rodzaje wierszy raportu z wydatków
 DictionarySendingMethods=Metody wysyłki
 DictionaryStaff=Liczba zatrudnionych
 DictionaryAvailability=Opóźnienie dostawy
 DictionaryOrderMethods=Sposoby zamawiania
 DictionarySource=Pochodzenie wniosków / zleceń
-DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancyCategory=Spersonalizowane grupy raportów
 DictionaryAccountancysystem=Modele dla planu kont
 DictionaryAccountancyJournal=Dzienniki księgowe
 DictionaryEMailTemplates=Szablony wiadomości e-mail
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Jednostki pomiarowe
 DictionarySocialNetworks=Sieci społecznościowe
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
-DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
-DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+DictionaryProspectStatus=Status perspektywiczny dla firm
+DictionaryProspectContactStatus=Status potencjalnych kontaktów
+DictionaryHolidayTypes=Rodzaje urlopów
+DictionaryOpportunityStatus=Status potencjalnego klienta dla projektu/potencjalnego klienta
+DictionaryExpenseTaxCat=Raport wydatków - Kategorie transportu
+DictionaryExpenseTaxRange=Raport z wydatków - zakres według kategorii transportu
+DictionaryTransportMode=Raport Intracomm - tryb transportowy
+TypeOfUnit=Rodzaj jednostki
 SetupSaved=Konfiguracja zapisana
 SetupNotSaved=Ustawienia nie zapisane
 BackToModuleList=Powrót do listy modułów
 BackToDictionaryList=Powrót do listy słowników
-TypeOfRevenueStamp=Type of tax stamp
+TypeOfRevenueStamp=Rodzaj znaku skarbowego
 VATManagement=Zarządzanie podatkami od sprzedaży
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+VATIsUsedDesc=Domyślnie podczas tworzenia prospektów, faktur, zamówień itp. Stawka podatku od sprzedaży jest zgodna z aktywną regułą standardową: <br> Jeśli sprzedawca nie podlega podatkowi od sprzedaży, wówczas podatek od sprzedaży jest domyślnie ustawiony na 0. Koniec reguły. <br> Jeśli (kraj sprzedającego = kraj kupującego), wówczas podatek od sprzedaży jest domyślnie równy podatkowi od sprzedaży produktu w kraju sprzedawcy. Koniec reguły. <br> Jeśli sprzedawca i kupujący znajdują się na terenie Wspólnoty Europejskiej, a towary są produktami związanymi z transportem (transport, spedycja, linia lotnicza), domyślny podatek VAT wynosi 0. Ta zasada zależy od kraju sprzedawcy - skonsultuj się z księgowym. Kupujący powinien zapłacić podatek VAT w urzędzie celnym w swoim kraju, a nie sprzedającemu. Koniec reguły. <br> Jeśli sprzedawca i kupujący znajdują się zarówno we Wspólnocie Europejskiej, a kupujący nie jest firmą (z zarejestrowanym wewnątrzwspólnotowym numerem VAT), wówczas podatek VAT jest domyślnie równy stawce VAT kraju sprzedawcy. Koniec reguły. <br> Jeśli sprzedawca i kupujący znajdują się zarówno we Wspólnocie Europejskiej, a kupującym jest firma (z zarejestrowanym wewnątrzwspólnotowym numerem VAT), wówczas VAT wynosi domyślnie 0. Koniec reguły. <br> W każdym innym przypadku proponowaną wartością domyślną jest podatek obrotowy = 0. Koniec reguły.
+VATIsNotUsedDesc=Domyślnie proponowany podatek od sprzedaży wynosi 0 i może być stosowany w przypadkach takich jak stowarzyszenia, osoby fizyczne lub małe firmy.
+VATIsUsedExampleFR=We Francji oznacza to firmy lub organizacje posiadające rzeczywisty system podatkowy (rzeczywisty uproszczony lub normalny). System, w którym deklarowany jest podatek VAT.
+VATIsNotUsedExampleFR=We Francji oznacza to stowarzyszenia, które nie są zadeklarowane jako podatek od sprzedaży lub firmy, organizacje lub wolne zawody, które wybrały system podatkowy dla mikroprzedsiębiorstw (podatek od sprzedaży na zasadzie franczyzy) i zapłaciły franczyzę Podatek obrotowy bez żadnej deklaracji podatkowej. Ten wybór spowoduje wyświetlenie na fakturach odniesienia „Nie dotyczy podatku od sprzedaży - art-293B CGI”.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Rodzaj podatku od sprzedaży
 LTRate=Stawka
 LocalTax1IsNotUsed=Nie należy używać drugiego podatku
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1IsUsedDesc=Użyj drugiego rodzaju podatku (innego niż pierwszy)
+LocalTax1IsNotUsedDesc=Nie używaj innego rodzaju podatku (innego niż pierwszy)
 LocalTax1Management=Drugi rodzaj podatku
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=Nie używaj trzeciego podatku
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2IsUsedDesc=Użyj trzeciego rodzaju podatku (innego niż pierwszy)
+LocalTax2IsNotUsedDesc=Nie używaj innego rodzaju podatku (innego niż pierwszy)
 LocalTax2Management=Trzeci rodzaj podatku
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=RE Management
-LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsUsedDescES=Stawka RE domyślnie podczas tworzenia prospektów, faktur, zamówień itp. Jest zgodna z aktywną standardową regułą: <br> Jeśli kupujący nie podlega RE, wartość RE domyślnie = 0. Koniec panowania. <br> Jeśli kupujący podlega OZE, to domyślnie RE. Koniec panowania. <br>
 LocalTax1IsNotUsedDescES=Domyślnie proponowany RE wynosi 0. Koniec zasady.
 LocalTax1IsUsedExampleES=W Hiszpanii są specjaliści z zastrzeżeniem niektórych szczególnych grup hiszpański IAE.
 LocalTax1IsNotUsedExampleES=W Hiszpanii są zawodowej i społecznej oraz z zastrzeżeniem pewnych odcinkach hiszpański IAE.
 LocalTax2ManagementES=IRPF Management
-LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsUsedDescES=Domyślnie stawka IRPF podczas tworzenia prospektów, faktur, zamówień itp. Jest zgodna z aktywną standardową regułą: <br> Jeśli sprzedawca nie podlega IRPF, wówczas IRPF domyślnie = 0. Koniec panowania. <br> Jeśli sprzedawca podlega IRPF, to domyślnie IRPF. Koniec panowania. <br>
 LocalTax2IsNotUsedDescES=Domyślnie proponowany IRPF wynosi 0. Koniec zasady.
 LocalTax2IsUsedExampleES=W Hiszpanii, freelancerów i przedstawicieli wolnych zawodów, którzy świadczą usługi i przedsiębiorstwa, którzy wybrali system podatkowy modułów.
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+LocalTax2IsNotUsedExampleES=W Hiszpanii są to przedsiębiorstwa niepodlegające podatkowemu systemowi modułów.
+RevenueStampDesc=„Znaczek skarbowy” to stały podatek na fakturę (nie zależy od kwoty faktury). Może to być również podatek procentowy, ale użycie drugiego lub trzeciego rodzaju podatku jest lepsze w przypadku podatków procentowych, ponieważ znaki skarbowe nie zapewniają żadnego raportowania. Tylko nieliczne kraje stosują ten rodzaj podatku.
+UseRevenueStamp=Użyj znaku skarbowego
+UseRevenueStampExample=Wartość znaku skarbowego jest domyślnie definiowana w ustawieniach słowników (%s - %s - %s)
 CalcLocaltax=Raporty odnośnie podatków lokalnych
 CalcLocaltax1=Sprzedaż - Zakupy
 CalcLocaltax1Desc=Lokalne raporty Podatki są obliczane z różnicy między sprzedażą localtaxes i localtaxes zakupów
@@ -1080,15 +1089,15 @@ CalcLocaltax2=Zakupy
 CalcLocaltax2Desc=Lokalne raporty Podatki są łącznie localtaxes zakupów
 CalcLocaltax3=Sprzedaż
 CalcLocaltax3Desc=Lokalne raporty Podatki są za łączną sprzedaży localtaxes
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Zgodnie z konfiguracją podatków (patrz %s - %s - %s) Twój kraj nie musi stosować tego rodzaju podatku
 LabelUsedByDefault=Wytwórnia używany domyślnie, jeśli nie można znaleźć tłumaczenie dla kodu
 LabelOnDocuments=Etykieta na dokumenty
-LabelOrTranslationKey=Label or translation key
-ValueOfConstantKey=Value of a configuration constant
-ConstantIsOn=Option %s is on
-NbOfDays=No. of days
+LabelOrTranslationKey=Etykieta lub klucz tłumaczenia
+ValueOfConstantKey=Wartość stałej konfiguracji
+ConstantIsOn=Opcja %s jest włączona
+NbOfDays=Liczba dni
 AtEndOfMonth=Na koniec miesiąca
-CurrentNext=Current/Next
+CurrentNext=Bieżący/następny
 Offset=Offset
 AlwaysActive=Zawsze aktywne
 Upgrade=Uaktualnij
@@ -1111,7 +1120,7 @@ DatabaseUser=Użytkownik bazy danych
 DatabasePassword=Hasło bazy danych
 Tables=Tabele
 TableName=Nazwa tabeli
-NbOfRecord=No. of records
+NbOfRecord=Liczba rekordów
 Host=Serwer
 DriverType=Typ sterownika
 SummarySystem=Podsumowanie informacji systemowych
@@ -1123,59 +1132,60 @@ Skin=Skórka
 DefaultSkin=Domyślna skórka
 MaxSizeList=Maksymalna długość listy
 DefaultMaxSizeList=Domyślna maksymalna długość listy
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+DefaultMaxSizeShortList=Domyślna maksymalna długość krótkich list (np. Na karcie klienta)
 MessageOfDay=Wiadomość dnia
 MessageLogin=Wiadomość strona logowania
 LoginPage=Strona logowania
 BackgroundImageLogin=Obrazek tła
 PermanentLeftSearchForm=Stały formularz wyszukiwania w lewym menu
-DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
-EnableShowLogo=Show the company logo in the menu
+DefaultLanguage=Domyślny język
+EnableMultilangInterface=Włącz obsługę wielu języków dla relacji z klientami lub dostawcami
+EnableShowLogo=Pokaż logo firmy w menu
 CompanyInfo=Firma/Organizacja
-CompanyIds=Company/Organization identities
+CompanyIds=Tożsamość firmy/organizacji
 CompanyName=Nazwa firmy
 CompanyAddress=Adres
 CompanyZip=Kod pocztowy
 CompanyTown=Miasto
 CompanyCountry=Kraj
 CompanyCurrency=Główna waluta
-CompanyObject=Object of the company
-IDCountry=ID country
+CompanyObject=Przedmiot firmy
+IDCountry=Identifikator kraju
 Logo=Logo
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
-LogoSquarred=Logo (squarred)
-LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+LogoDesc=Główne logo firmy. Zostanie wykorzystane w generowanych dokumentach (PDF, ...)
+LogoSquarred=Logo (kwadratowe)
+LogoSquarredDesc=Musi to być kwadratowa ikona (szerokość = wysokość). To logo będzie używane jako ulubiona ikona lub inna potrzeba, na przykład na górnym pasku menu (jeśli nie zostanie wyłączone w konfiguracji wyświetlacza).
 DoNotSuggestPaymentMode=Nie proponuj
 NoActiveBankAccountDefined=Brak zdefiniowanego aktywnego konta bankowego
 OwnerOfBankAccount=Właściciel konta bankowego %s
 BankModuleNotActive=Moduł Rachunków bankowych jest nie aktywny
 ShowBugTrackLink=Show link "<strong>%s</strong>"
 Alerts=Alarmy
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
-DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
-Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
-Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
-SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
-SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Zdarzenia audytu bezpieczeństwa
+DelaysOfToleranceBeforeWarning=Opóźnienie przed wyświetleniem ostrzeżenia dotyczącego:
+DelaysOfToleranceDesc=Ustaw opóźnienie, zanim ikona alertu %s zostanie wyświetlona na ekranie dla późnego elementu.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planowane wydarzenia (wydarzenia w programie) nie zostały zakończone
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projekt nie został zamknięty na czas
+Delays_MAIN_DELAY_TASKS_TODO=Planowane zadanie (zadania projektowe) nie zostało ukończone
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Zamówienie nie zostało przetworzone
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Zamówienie nie zostało przetworzone
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Oferta nie została zamknięta
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Oferta nie została rozliczona
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Usługa do aktywacji
+Delays_MAIN_DELAY_RUNNING_SERVICES=Usługa wygasła
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Niezapłacona faktura dostawcy
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Niezapłacona faktura klienta
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Oczekujące uzgodnienie bankowe
+Delays_MAIN_DELAY_MEMBERS=Opóźniona opłata członkowska
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Nie dokonano wpłaty czekiem
+Delays_MAIN_DELAY_EXPENSEREPORTS=Raport wydatków do zatwierdzenia
+Delays_MAIN_DELAY_HOLIDAYS=Zostaw prośby do zatwierdzenia
+SetupDescription1=Przed rozpoczęciem korzystania z systemu Dolibarr należy zdefiniować pewne parametry początkowe i włączyć/skonfigurować moduły.
+SetupDescription2=Poniższe dwie sekcje są obowiązkowe (dwie pierwsze pozycje w menu Ustawienia):
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Podstawowe parametry używane do dostosowania domyślnego zachowania aplikacji (np. funkcji związanych z krajem).
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> To oprogramowanie jest zestawem wielu modułów/aplikacji. Moduły związane z Twoimi potrzebami muszą być włączone i skonfigurowane. Pozycje menu pojawią się po aktywacji tych modułów.
+SetupDescription5=Pozycje w menu Inne Ustawienia zarządzają parametrami opcjonalnymi.
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audyt
 InfoDolibarr=O Dolibarr
 InfoBrowser=O przeglądarce
@@ -1183,204 +1193,204 @@ InfoOS=O systemie
 InfoWebServer=O serwerze WWW
 InfoDatabase=O bazie danych
 InfoPHP=O PHP
-InfoPerf=About Performances
-InfoSecurity=About Security
+InfoPerf=O spektaklach
+InfoSecurity=O bezpieczeństwie
 BrowserName=Nazwa przeglądarki
 BrowserOS=Przeglądarka OS
 ListOfSecurityEvents=Lista zdarzeń bezpieczeństwa Dolibarr
 SecurityEventsPurged=Zdarzenia dotyczące bezpieczeństwa oczyszczone
-LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
+LogEventDesc=Włącz rejestrowanie określonych zdarzeń związanych z bezpieczeństwem. Administratorzy dziennika za pośrednictwem menu <b> %s - %s </b>. Ostrzeżenie, ta funkcja może generować dużą ilość danych w bazie danych.
 AreaForAdminOnly=Parametry mogą być ustawiane tylko przez <b>użytkowników z prawami administratora</b>.
 SystemInfoDesc=System informacji jest różne informacje techniczne można uzyskać w trybie tylko do odczytu i widoczne tylko dla administratorów.
-SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
-AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
-AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+SystemAreaForAdminOnly=Ten obszar jest dostępny tylko dla administratorów. Uprawnienia użytkownika Dolibarr nie mogą zmienić tego ograniczenia.
+CompanyFundationDesc=Edytuj informacje o swojej firmie/organizacji. Po zakończeniu kliknij przycisk „%s” u dołu strony.
+AccountantDesc=Jeśli masz zewnętrznego księgowego, możesz tutaj edytować jego informacje.
+AccountantFileNumber=Kod księgowego
+DisplayDesc=W tym miejscu można modyfikować parametry wpływające na wygląd i zachowanie Dolibarr.
 AvailableModules=Dostępne aplikacje / moduły
 ToActivateModule=Aby uaktywnić modules, przejdź na konfigurację Powierzchnia.
 SessionTimeOut=Limit czasu dla sesji
-SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+SessionExplanation=Ta liczba gwarantuje, że sesja nigdy nie wygaśnie przed tym opóźnieniem, jeśli czyszczenie sesji jest wykonywane przez wewnętrzne czyszczenie sesji PHP (i nic więcej). Wewnętrzne czyszczenie sesji PHP nie gwarantuje, że sesja wygaśnie po tym opóźnieniu. Wygasa po tym opóźnieniu i po uruchomieniu czyszczenia sesji, więc każdy <b> %s/%s </b>, ale tylko podczas dostępu z innych sesji (jeśli wartość wynosi 0, oznacza to, że kasowanie sesji jest wykonywane tylko przez zewnętrzną proces). <br> Uwaga: na niektórych serwerach z zewnętrznym mechanizmem czyszczenia sesji (cron w debianie, ubuntu ...) sesje mogą zostać zniszczone po okresie zdefiniowanym przez zewnętrzną konfigurację, niezależnie od wprowadzonej tutaj wartości.
+SessionsPurgedByExternalSystem=Wydaje się, że sesje na tym serwerze są czyszczone przez zewnętrzny mechanizm (cron w debianie, ubuntu ...), prawdopodobnie każda <b> %s </b> seconds (= value of parameter <b> session.gc_maxlifetime </b>), nie ma tutaj efektu. Musisz poprosić administratora serwera o zmianę opóźnienia sesji.
 TriggersAvailable=Dostępne wyzwala
-TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
+TriggersDesc=Wyzwalacze to pliki, które zmienią zachowanie przepływu pracy Dolibarr po skopiowaniu do katalogu <b> htdocs / core / triggers </b>. Realizują nowe działania, uruchamiane na wydarzeniach Dolibarr (tworzenie nowej firmy, walidacja faktur, ...).
 TriggerDisabledByName=Wyzwalacze w tym pliku są wyłączone przez <b>NORUN-suffix</b> w ich imieniu.
 TriggerDisabledAsModuleDisabled=Wyzwalacze w tym pliku są wyłączone jako <b>modułu %s</b> została wyłączona.
 TriggerAlwaysActive=Wyzwalacze w tym pliku są zawsze aktywne, niezależnie są aktywowane Dolibarr modułów.
 TriggerActiveAsModuleActive=Wyzwalacze w tym pliku są aktywne jako <b>modułu %s</b> jest aktywny.
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+GeneratedPasswordDesc=Wybierz metodę, która ma być używana w przypadku haseł generowanych automatycznie.
 DictionaryDesc=Wprowadź wszystkie potrzebne dane. Wartości można dodać do ustawień domyślnych.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+ConstDesc=Ta strona umożliwia edycję (nadpisanie) parametrów niedostępnych na innych stronach. Są to w większości parametry zarezerwowane tylko dla programistów / zaawansowanego rozwiązywania problemów.
 MiscellaneousDesc=Inne powiązane parametry bezpieczeństwa są zdefiniowane tutaj
 LimitsSetup=Ograniczenia / Precision konfiguracji
-LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+LimitsDesc=Tutaj możesz zdefiniować limity, dokładności i optymalizacje używane przez Dolibarr
+MAIN_MAX_DECIMALS_UNIT=Maks. ułamki dziesiętne dla cen jednostkowych
+MAIN_MAX_DECIMALS_TOT=Maks. ułamki dziesiętne dla cen całkowitych
+MAIN_MAX_DECIMALS_SHOWN=Maks. wartości dziesiętne dla cen <b> pokazanych na ekranie </b>. Dodaj wielokropek <b> ... </b> po tym parametrze (np. „2 ...”), jeśli chcesz zobaczyć przyrostek „<b> ... </b>” w skróconej cenie.
+MAIN_ROUNDING_RULE_TOT=Krok zaokrąglania zakresu (dla krajów, w których zaokrąglanie odbywa się na czymś innym niż podstawa 10. Na przykład wpisz 0,05, jeśli zaokrąglanie odbywa się o 0,05 kroków)
 UnitPriceOfProduct=Cena netto jednostki produktu
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+TotalPriceAfterRounding=Cena całkowita (bez / vat / z podatkiem) po zaokrągleniu
 ParameterActiveForNextInputOnly=Parametr skuteczne wejście tylko dla najbliższych
-NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
-NoEventFoundWithCriteria=No security event has been found for this search criteria.
+NoEventOrNoAuditSetup=Żadne zdarzenie dotyczące bezpieczeństwa nie zostało zarejestrowane. Jest to normalne, jeśli Audyt nie został włączony na stronie „Ustawienia - Bezpieczeństwo - Zdarzenia”.
+NoEventFoundWithCriteria=Nie znaleziono zdarzenia bezpieczeństwa dla tych kryteriów wyszukiwania.
 SeeLocalSendMailSetup=Zobacz lokalnej konfiguracji sendmaila
-BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
-BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
-BackupDescX=The archived directory should be stored in a secure place.
+BackupDesc=Kompletna kopia zapasowa <b> </b> instalacji Dolibarr wymaga dwóch kroków.
+BackupDesc2=Utwórz kopię zapasową zawartości katalogu „dokumenty” (<b> %s </b>) zawierającego wszystkie przesłane i wygenerowane pliki. Obejmuje to również wszystkie pliki zrzutu wygenerowane w kroku 1. Ta operacja może potrwać kilka minut.
+BackupDesc3=Utwórz kopię zapasową struktury i zawartości bazy danych (<b> %s </b>) w pliku zrzutu. W tym celu możesz użyć następującego asystenta.
+BackupDescX=Zarchiwizowany katalog należy przechowywać w bezpiecznym miejscu.
 BackupDescY=Wygenerowany plik zrzutu powinny być przechowywane w bezpiecznym miejscu.
-BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
-RestoreDesc=To restore a Dolibarr backup, two steps are required.
-RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
-RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+BackupPHPWarning=W przypadku tej metody nie można zagwarantować tworzenia kopii zapasowych. Zalecany poprzedni.
+RestoreDesc=Aby przywrócić kopię zapasową Dolibarr, wymagane są dwa kroki.
+RestoreDesc2=Przywróć plik kopii zapasowej (na przykład plik zip) katalogu „dokumenty” do nowej instalacji Dolibarr lub do tego katalogu aktualnych dokumentów (<b> %s </b>).
+RestoreDesc3=Przywróć strukturę bazy danych i dane z pliku zrzutu kopii zapasowej do bazy danych nowej instalacji Dolibarr lub do bazy danych bieżącej instalacji (<b> %s </b>). Ostrzeżenie, po zakończeniu przywracania musisz użyć loginu/hasła, które istniały od czasu tworzenia kopii zapasowej/instalacji, aby połączyć się ponownie. <br> Aby przywrócić kopię zapasową bazy danych w bieżącej instalacji, możesz postępować zgodnie z tym asystentem.
 RestoreMySQL=Import MySQL
 ForcedToByAModule=Ta zasada jest zmuszona <b>do %s</b> przez aktywowany modułu
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
-PreviousDumpFiles=Existing backup files
-PreviousArchiveFiles=Existing archive files
-WeekStartOnDay=First day of the week
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+ValueIsForcedBySystem=Ta wartość jest wymuszana przez system. Nie możesz tego zmienić.
+PreviousDumpFiles=Istniejące pliki kopii zapasowych
+PreviousArchiveFiles=Istniejące pliki archiwów
+WeekStartOnDay=Pierwszy dzień tygodnia
+RunningUpdateProcessMayBeRequired=Wydaje się, że wymagane jest uruchomienie procesu aktualizacji (wersja programu %s różni się od wersji bazy danych %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Należy uruchomić to polecenie z wiersza polecenia po zalogowaniu się do powłoki z <b>%s</b> użytkownika.
 YourPHPDoesNotHaveSSLSupport=funkcji SSL nie są dostępne w PHP
 DownloadMoreSkins=Więcej skórek do pobrania
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+SimpleNumRefModelDesc=Zwraca numer referencyjny w formacie %syymm-nnnn, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba automatycznie zwiększająca się bez resetowania
+ShowProfIdInAddress=Pokaż identyfikator zawodowy z adresami
+ShowVATIntaInAddress=Ukryj wewnątrzwspólnotowy numer VAT wraz z adresami
 TranslationUncomplete=Częściowe tłumaczenie
-MAIN_DISABLE_METEO=Disable meteorological view
-MeteoStdMod=Standard mode
-MeteoStdModEnabled=Standard mode enabled
-MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
-MeteoUseMod=Click to use %s
+MAIN_DISABLE_METEO=Wyłącz widok meteorologiczny
+MeteoStdMod=Tryb standardowy
+MeteoStdModEnabled=Tryb standardowy włączony
+MeteoPercentageMod=Tryb procentowy
+MeteoPercentageModEnabled=Włączono tryb procentowy
+MeteoUseMod=Kliknij, aby użyć %s
 TestLoginToAPI=Przetestuj się zalogować do interfejsu API
-ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
-ExternalAccess=External/Internet Access
-MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
-MAIN_PROXY_HOST=Proxy server: Name/Address
-MAIN_PROXY_PORT=Proxy server: Port
-MAIN_PROXY_USER=Proxy server: Login/User
-MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+ProxyDesc=Niektóre funkcje Dolibarr wymagają dostępu do Internetu. Zdefiniuj tutaj parametry połączenia internetowego, takie jak dostęp przez serwer proxy, jeśli to konieczne.
+ExternalAccess=Zewnętrzny dostęp
+MAIN_PROXY_USE=Użyj serwera proxy (w przeciwnym razie dostęp jest bezpośredni do Internetu)
+MAIN_PROXY_HOST=Serwer proxy: nazwa / adres
+MAIN_PROXY_PORT=Serwer proxy: port
+MAIN_PROXY_USER=Serwer proxy: Login / Użytkownik
+MAIN_PROXY_PASS=Serwer proxy: hasło
+DefineHereComplementaryAttributes=Zdefiniuj wszelkie dodatkowe/niestandardowe atrybuty, które należy dodać do: %s
 ExtraFields=Uzupełniające atrybuty
 ExtraFieldsLines=Atrybuty uzupełniające (linie)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsLinesRec=Atrybuty uzupełniające (szablony wierszy faktur)
 ExtraFieldsSupplierOrdersLines=(Linie uzupełniające atrybuty order)
 ExtraFieldsSupplierInvoicesLines=Atrybuty uzupełniające (linie na fakturze)
-ExtraFieldsThirdParties=Complementary attributes (third party)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsThirdParties=Atrybuty uzupełniające (firma zewnętrzna)
+ExtraFieldsContacts=Atrybuty uzupełniające (kontakty / adres)
 ExtraFieldsMember=Atrybuty uzupełniające (członek)
 ExtraFieldsMemberType=Atrybuty uzupełniające (typ członkiem)
 ExtraFieldsCustomerInvoices=Atrybuty uzupełniające (faktury)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsCustomerInvoicesRec=Atrybuty uzupełniające (szablony faktur)
 ExtraFieldsSupplierOrders=Zamówienia uzupełniające (atrybuty)
 ExtraFieldsSupplierInvoices=Atrybuty uzupełniające (faktury)
 ExtraFieldsProject=Atrybuty uzupełniające (projektów)
 ExtraFieldsProjectTask=Atrybuty uzupełniające (zadania)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=Atrybuty uzupełniające (wynagrodzenia)
 ExtraFieldHasWrongValue=Atrybut% s ma nieprawidłową wartość.
 AlphaNumOnlyLowerCharsAndNoSpace=tylko alphanumericals i małe litery bez przestrzeni
 SendmailOptionNotComplete=Uwaga, w niektórych systemach Linux, aby wysłać e-mail z poczty elektronicznej, konfiguracja wykonanie sendmail musi conatins opcja-ba (mail.force_extra_parameters parametr w pliku php.ini). Jeśli nigdy niektórzy odbiorcy otrzymywać e-maile, spróbuj edytować ten parametr PHP z mail.force_extra_parameters =-ba).
 PathToDocuments=Ścieżka do dokumentów
 PathDirectory=Katalog
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+SendmailOptionMayHurtBuggedMTA=Funkcja wysyłania wiadomości e-mail przy użyciu metody „bezpośrednio w PHP” spowoduje wygenerowanie wiadomości e-mail, która może nie zostać poprawnie przeanalizowana przez niektóre odbierające serwery pocztowe. W rezultacie niektóre wiadomości e-mail nie mogą być odczytywane przez osoby hostowane na tych błędnych platformach. Dzieje się tak w przypadku niektórych dostawców Internetu (np. Orange we Francji). Nie jest to problem z Dolibarr czy PHP, ale z odbierającym serwerem pocztowym. Możesz jednak dodać opcję MAIN_FIX_FOR_BUGGED_MTA do 1 w Ustawieniach - Inne, aby zmodyfikować Dolibarr, aby tego uniknąć. Jednak mogą wystąpić problemy z innymi serwerami, które ściśle korzystają ze standardu SMTP. Innym rozwiązaniem (zalecane) jest użycie metody „Biblioteka gniazd SMTP”, która nie ma żadnych wad.
 TranslationSetup=Ustawienia tłumaczenia
 TranslationKeySearch=Szukaj klucza lub ciągu tłumaczenia
 TranslationOverwriteKey=Nadpisz tłumaczony ciąg
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationDesc=Jak ustawić język wyświetlania: <br> * Domyślnie / Systemwide: menu <strong> Strona Główna -> Ustawienia -> Wyświetlacz </strong> <br> * Na użytkownika: Kliknij nazwę użytkownika u góry ekranu i zmodyfikuj <strong>Ustawienia Wyświetlacza Użytkownika</strong> na karcie użytkownika.
+TranslationOverwriteDesc=Możesz także przesłonić ciągi wypełniające poniższą tabelę. Wybierz swój język z listy rozwijanej „%s”, wstaw ciąg klucza tłumaczenia do „%s”, a nowe tłumaczenie do „%s”
+TranslationOverwriteDesc2=Możesz skorzystać z drugiej karty, aby dowiedzieć się, którego klucza tłumaczenia użyć
 TranslationString=Tłumaczony ciąg
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+CurrentTranslationString=Aktualny ciąg tłumaczenia
+WarningAtLeastKeyOrTranslationRequired=Kryteria wyszukiwania są wymagane przynajmniej dla klucza lub ciągu tłumaczenia
+NewTranslationStringToShow=Nowy ciąg tłumaczenia do pokazania
+OriginalValueWas=Oryginalne tłumaczenie zostanie nadpisane. Pierwotna wartość to: <br> <br> %s
+TransKeyWithoutOriginalValue=Wymuszono nowe tłumaczenie klucza tłumaczenia „<strong> %s </strong>”, który nie istnieje w żadnym pliku językowym
+TitleNumberOfActivatedModules=Aktywowane moduły
+TotalNumberOfActivatedModules=Aktywowane moduły: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Musisz przynajmniej umożliwić 1 moduł
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+ClassNotFoundIntoPathWarning=Nie znaleziono klasy %s w ścieżce PHP
 YesInSummer=Tak w lecie
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+OnlyFollowingModulesAreOpenedToExternalUsers=Uwaga, tylko następujące moduły są dostępne dla użytkowników zewnętrznych (niezależnie od uprawnień takich użytkowników) i tylko w przypadku nadania uprawnień: <br>
 SuhosinSessionEncrypt=Przechowywania sesji szyfrowane Suhosin
 ConditionIsCurrently=Stan jest obecnie% s
-YouUseBestDriver=You use driver %s which is the best driver currently available.
-YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+YouUseBestDriver=Używasz sterownika %s, który jest obecnie najlepszym dostępnym sterownikiem.
+YouDoNotUseBestDriver=Używasz sterownika %s, ale zalecany jest sterownik %s.
+NbOfObjectIsLowerThanNoPb=W bazie danych masz tylko %s %s. Nie wymaga to żadnej szczególnej optymalizacji.
 SearchOptim=Pozycjonowanie
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
-BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
-BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
-AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
-AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+YouHaveXObjectUseSearchOptim=Masz w bazie danych %s %s. Możesz dodać stałą %s do 1 w Strona Główna-Ustawienia-Inne. Ogranicz wyszukiwanie do początku ciągów, dzięki czemu baza danych będzie mogła używać indeksów i powinieneś otrzymać natychmiastową odpowiedź.
+YouHaveXObjectAndSearchOptimOn=Masz %s %s w bazie danych, a stała %s jest ustawiona na 1 w Strona Główna-Ustawienia-Inne.
+BrowserIsOK=Używasz przeglądarki internetowej %s. Ta przeglądarka jest dobra pod względem bezpieczeństwa i wydajności.
+BrowserIsKO=Używasz przeglądarki internetowej %s. Wiadomo, że ta przeglądarka jest złym wyborem pod względem bezpieczeństwa, wydajności i niezawodności. Zalecamy używanie przeglądarki Firefox, Chrome, Opera lub Safari.
+PHPModuleLoaded=Ładowany jest komponent PHP %s
+PreloadOPCode=Używany jest wstępnie załadowany kod OPCode
+AddRefInList=Wyświetl numer klienta/dostawcy lista informacji (lista wyboru lub pole wyboru) i większość hiperłączy. <br> Strony trzecie będą wyświetlane z nazwą w formacie „CC12345 - SC45678 - The Big Company corp”. zamiast „The Big Company corp”.
+AddAdressInList=Wyświetl listę informacji o adresach klientów / dostawców (lista wyboru lub pole wyboru) <br> Osoby trzecie będą wyświetlane z nazwą w formacie „The Big Company corp. - 21 jump street 123456 Big town - USA” zamiast „The Big Company corp”.
+AddEmailPhoneTownInContactList=Wyświetl kontaktowy adres e-mail (lub telefony, jeśli nie zostały zdefiniowane) i listę informacji o mieście (lista wyboru lub pole wyboru) <br> Kontakty będą wyświetlane z nazwami w formacie „Dupond Durand - dupond.durand@email.com - Paryż” lub „Dupond Durand - 06 07 59 65 66 - Paryż "zamiast" Dupond Durand ".
+AskForPreferredShippingMethod=Zapytaj o preferowaną metodę wysyłki dla stron trzecich.
 FieldEdition=Edycja pola% s
 FillThisOnlyIfRequired=Przykład: +2 (wypełnić tylko w przypadku strefy czasowej w stosunku problemy są doświadczeni)
 GetBarCode=Pobierz kod kreskowy
-NumberingModules=Numbering models
-DocumentModules=Document models
+NumberingModules=Numeracja modeli
+DocumentModules=Modele dokumentów
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
-PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationStandard=Zwróć hasło wygenerowane zgodnie z wewnętrznym algorytmem Dolibarr: %s znaków zawierających wspólne liczby i małe litery.
+PasswordGenerationNone=Nie sugeruj wygenerowanego hasła. Hasło należy wpisać ręcznie.
 PasswordGenerationPerso=Powrót hasło zależności osobiście określonej konfiguracji.
 SetupPerso=Zgodnie z twoją konfiguracją
 PasswordPatternDesc=Opis wzoru hasła
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+RuleForGeneratedPasswords=Reguły generowania i sprawdzania haseł
+DisableForgetPasswordLinkOnLogonPage=Nie pokazuj linka „Zapomniałem hasła” na stronie logowania
 UsersSetup=Użytkownicy modułu konfiguracji
-UserMailRequired=Email required to create a new user
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserMailRequired=Adres e-mail wymagany do utworzenia nowego użytkownika
+UserHideInactive=Ukryj nieaktywnych użytkowników na wszystkich listach użytkowników (niezalecane: może to oznaczać, że nie będziesz w stanie filtrować ani wyszukiwać starych użytkowników na niektórych stronach)
+UsersDocModules=Szablony dokumentów dla dokumentów generowanych na podstawie rekordu użytkownika
+GroupsDocModules=Szablony dokumentów dla dokumentów generowanych z rekordu grupowego
 ##### HRM setup #####
 HRMSetup=Ustawianie modułu HR
 ##### Company setup #####
 CompanySetup=Firmy konfiguracji modułu
-CompanyCodeChecker=Options for automatic generation of customer/vendor codes
-AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
-NotificationsDescUser=* per user, one user at a time.
-NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
-NotificationsDescGlobal=* or by setting global email addresses in this setup page.
-ModelModules=Document Templates
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+CompanyCodeChecker=Opcje automatycznego generowania kodów klientów / dostawców
+AccountCodeManager=Opcje automatycznego generowania kodów księgowych klientów / dostawców
+NotificationsDesc=Powiadomienia e-mail mogą być wysyłane automatycznie w przypadku niektórych wydarzeń Dolibarr. <br> Odbiorców powiadomień można zdefiniować:
+NotificationsDescUser=* na użytkownika, jeden użytkownik na raz.
+NotificationsDescContact=* za osobę kontaktową (klienci lub dostawcy), jeden kontakt naraz.
+NotificationsDescGlobal=* lub ustawiając globalne adresy e-mail na tej stronie konfiguracji.
+ModelModules=Szablony dokumentów
+DocumentModelOdt=Generuj dokumenty z szablonów OpenDocument (pliki .ODT / .ODS z LibreOffice, OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Znak wodny w sprawie projektu dokumentu
 JSOnPaimentBill=Aktywuj funkcję automatyczne wypełnianie linii płatności w formie płatności
-CompanyIdProfChecker=Rules for Professional IDs
+CompanyIdProfChecker=Zasady dotyczące legitymacji zawodowych
 MustBeUnique=Musi być unikatowy?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-TechnicalServicesProvided=Technical services provided
+MustBeMandatory=Obowiązkowe do tworzenia kontrahentów (jeśli zdefiniowano numer VAT lub rodzaj firmy)?
+MustBeInvoiceMandatory=Obowiązkowe do sprawdzania faktur?
+TechnicalServicesProvided=Świadczone usługi techniczne
 #####DAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
-WebDavServer=Root URL of %s server: %s
+WebDAVSetupDesc=To jest łącze umożliwiające dostęp do katalogu WebDAV. Zawiera katalog „publiczny” otwarty dla każdego użytkownika znającego adres URL (jeśli dostęp do katalogu publicznego jest dozwolony) oraz katalog „prywatny”, do którego dostęp wymaga istniejącego konta logowania / hasła.
+WebDavServer=Główny adres URL serwera %s: %s
 ##### 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
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
-PaymentsPDFModules=Payment documents models
+BillsPDFModulesAccordindToInvoiceType=Modele dokumentów fakturowych według rodzaju faktury
+PaymentsPDFModules=Modele dokumentów płatniczych
 ForceInvoiceDate=Siły daty wystawienia faktury do walidacji daty
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
-SuggestPaymentByChequeToAddress=Suggest payment by check to
+SuggestedPaymentModesIfNotDefinedInInvoice=Sugerowany tryb płatności na fakturze domyślnie, jeśli nie został zdefiniowany na fakturze
+SuggestPaymentByRIBOnAccount=Zaproponuj płatność poprzez wypłatę na konto
+SuggestPaymentByChequeToAddress=Zaproponuj płatność czekiem na
 FreeLegalTextOnInvoices=Wolny tekst na fakturach
 WatermarkOnDraftInvoices=Znak wodny na projekt faktury (brak jeśli pusty)
 PaymentsNumberingModule=Model numeracji płatności
-SuppliersPayment=Vendor payments
-SupplierPaymentSetup=Vendor payments setup
+SuppliersPayment=Płatności dostawcy
+SupplierPaymentSetup=Konfiguracja płatności dostawcy
 ##### Proposals #####
 PropalSetup=Konfiguracja modułu ofert handlowych
 ProposalsNumberingModules=Commercial wniosku numeracji modules
 ProposalsPDFModules=Commercial wniosku dokumenty modeli
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Sugerowany tryb płatności w propozycji domyślnie, jeśli nie został zdefiniowany w propozycji
 FreeLegalTextOnProposal=Darmowy tekstu propozycji
 WatermarkOnDraftProposal=Znak wodny projektów wniosków komercyjnych (brak jeśli pusty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zapytaj o rachunku bankowego przeznaczenia propozycji
@@ -1393,10 +1403,10 @@ WatermarkOnDraftSupplierProposal=Znak wodny w sprawie projektu cenie żąda dost
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Zapytaj o rachunku bankowego przeznaczenia proponowaniu ceny
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Zapytaj o magazyn źródłowy dla zamówienia
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Zapytaj o konto bankowe dla zamówienia
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
-OrdersSetup=Sales Orders management setup
+SuggestedPaymentModesIfNotDefinedInOrder=Sugerowany tryb płatności w zleceniu sprzedaży domyślnie, jeśli nie jest zdefiniowany w zamówieniu
+OrdersSetup=Konfiguracja zarządzania zleceniami sprzedaży
 OrdersNumberingModules=Zamówienia numeracji modules
 OrdersModelModule=Zamów dokumenty modeli
 FreeLegalTextOnOrders=Wolny tekst na zamówienie
@@ -1419,11 +1429,11 @@ WatermarkOnDraftContractCards=Znak wodny w szkicach projektów (brak jeśli pust
 MembersSetup=Członkowie konfiguracji modułu
 MemberMainOptions=Główne opcje
 AdherentLoginRequired= Zarządzanie logowania dla każdego członka
-AdherentMailRequired=Email required to create a new member
+AdherentMailRequired=Adres e-mail wymagany do utworzenia nowego członka
 MemberSendInformationByMailByDefault=Checkbox wysłać mail z potwierdzeniem do członków jest domyślnie
-VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
-MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
-MembersDocModules=Document templates for documents generated from member record
+VisitorCanChooseItsPaymentMode=Odwiedzający może wybierać spośród dostępnych sposobów płatności
+MEMBER_REMINDER_EMAIL=Włącz automatyczne przypominanie <b> przez e-mail </b> o wygasłych subskrypcjach. Uwaga: Moduł <strong> %s </strong> musi być włączony i poprawnie skonfigurowany, aby wysyłać przypomnienia.
+MembersDocModules=Szablony dokumentów dla dokumentów wygenerowanych na podstawie rekordu członka
 ##### LDAP setup #####
 LDAPSetup=Konfiguracja LDAP
 LDAPGlobalParameters=Parametry globalne
@@ -1441,17 +1451,17 @@ LDAPSynchronizeUsers=Organizacja użytkowników w LDAP
 LDAPSynchronizeGroups=Organizacja grup w LDAP
 LDAPSynchronizeContacts=Organizacja kontaktów w LDAP
 LDAPSynchronizeMembers=Organizacja członków fundacji w LDAP
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPSynchronizeMembersTypes=Organizacja typów członków fundacji w LDAP
 LDAPPrimaryServer=Podstawowy serwer
 LDAPSecondaryServer=Dodatkowy serwer
 LDAPServerPort=Portu serwera
-LDAPServerPortExample=Default port: 389
+LDAPServerPortExample=Port domyślny: 389
 LDAPServerProtocolVersion=Protokół wersji
 LDAPServerUseTLS=Użyj TLS
 LDAPServerUseTLSExample=Twoja użyć serwera LDAP TLS
 LDAPServerDn=Serwer 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=Kompletna nazwa wyróżniająca (np .: cn = admin, dc = example, dc = com lub cn = Administrator, cn = Users, dc = example, dc = com dla active directory)
 LDAPPassword=Hasło administratora
 LDAPUserDn=Użytkowników DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=Kompletny DN (dawniej: ou= users, dc= społeczeństwa, dc= com)
@@ -1465,7 +1475,7 @@ LDAPDnContactActive=Kontakty 'synchronizacji
 LDAPDnContactActiveExample=Aktywuj/Dezaktywuj synchronizację
 LDAPDnMemberActive=Posłów synchronizacji
 LDAPDnMemberActiveExample=Aktywuj/Dezaktywuj synchronizację
-LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActive=Synchronizacja typów członków
 LDAPDnMemberTypeActiveExample=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)
@@ -1473,8 +1483,8 @@ LDAPMemberDn=Dolibarr członków DN
 LDAPMemberDnExample=Complete DN (ex: ou=members,dc=society,dc=Kompletny DN (dawniej: ou= użytkowników, dc= społeczeństwa, dc= com)
 LDAPMemberObjectClassList=Lista objectClass
 LDAPMemberObjectClassListExample=Lista objectClass definiowania rekordu atrybutów (np. top, InetOrgPerson górę lub użytkowników do usługi Active Directory)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeDn=Członkowie Dolibarr typu DN
+LDAPMemberTypepDnExample=Kompletna nazwa wyróżniająca (np. Ou = typ_członków, dc = przykład, dc = com)
 LDAPMemberTypeObjectClassList=Lista objectClass
 LDAPMemberTypeObjectClassListExample=Lista objectClass definiowania rekordu atrybutów (np. top, groupOfUniqueNames)
 LDAPUserObjectClassList=Lista objectClass
@@ -1488,125 +1498,126 @@ LDAPTestSynchroContact=Test kontaktu synchronizacji
 LDAPTestSynchroUser=Test użytkownika synchronizacji
 LDAPTestSynchroGroup=Test grupy synchronizacji
 LDAPTestSynchroMember=Test członka synchronizacji
-LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSynchroMemberType=Testuj synchronizację typu elementu członkowskiego
 LDAPTestSearch= Testowanie wyszukiwania LDAP
 LDAPSynchroOK=Synchronizacja udany test
 LDAPSynchroKO=Niepowodzenie testu synchronizacji
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPSynchroKOMayBePermissions=Nieudany test synchronizacji. Sprawdź, czy połączenie z serwerem jest poprawnie skonfigurowane i zezwala na aktualizacje LDAP
 LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP podłączyć do serwera LDAP powiodło się (Server= %s, port= %s)
 LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP podłączyć do serwera LDAP nie powiodło się (Server= %s, port= %s)
-LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Pomyślne połączenie / uwierzytelnienie z serwerem LDAP (serwer = %s, port = %s, administrator = %s, hasło = %s)
+LDAPBindKO=Połączenie / uwierzytelnienie z serwerem LDAP nie powiodło się (serwer = %s, port = %s, administrator = %s, hasło = %s)
 LDAPSetupForVersion3=Serwer LDAP skonfigurowany dla wersji 3
 LDAPSetupForVersion2=Serwer LDAP skonfigurowany dla wersji 2
 LDAPDolibarrMapping=Dolibarr Mapping
 LDAPLdapMapping=LDAP Mapping
 LDAPFieldLoginUnix=Login (UNIX)
-LDAPFieldLoginExample=Example: uid
+LDAPFieldLoginExample=Przykład: uid
 LDAPFilterConnection=Wyszukaj filtr
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFilterConnectionExample=Przykład: & (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Przykład: & (objectClass = groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=Przykład: samaccountname
 LDAPFieldFullname=Imię i nazwisko
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldFullnameExample=Przykład: cn
+LDAPFieldPasswordNotCrypted=Hasło nie jest zaszyfrowane
+LDAPFieldPasswordCrypted=Hasło zaszyfrowane
+LDAPFieldPasswordExample=Przykład: hasło użytkownika
+LDAPFieldCommonNameExample=Przykład: cn
 LDAPFieldName=Nazwa
-LDAPFieldNameExample=Example: sn
+LDAPFieldNameExample=Przykład: sn
 LDAPFieldFirstName=Imię
-LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldFirstNameExample=Przykład: givenName
 LDAPFieldMail=Adres e-mail
-LDAPFieldMailExample=Example: mail
+LDAPFieldMailExample=Przykład: poczta
 LDAPFieldPhone=Profesjonalne numer telefonu
-LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldPhoneExample=Przykład: numer telefonu
 LDAPFieldHomePhone=Osobiste numer telefonu
-LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldHomePhoneExample=Przykład: telefon domowy
 LDAPFieldMobile=Telefon komórkowy
-LDAPFieldMobileExample=Example: mobile
+LDAPFieldMobileExample=Przykład: mobile
 LDAPFieldFax=Numer faksu
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldFaxExample=Przykład: numer telefaksu
 LDAPFieldAddress=Ulica
-LDAPFieldAddressExample=Example: street
+LDAPFieldAddressExample=Przykład: ulica
 LDAPFieldZip=Kod pocztowy
-LDAPFieldZipExample=Example: postalcode
+LDAPFieldZipExample=Przykład: kod pocztowy
 LDAPFieldTown=Miasto
-LDAPFieldTownExample=Example: l
+LDAPFieldTownExample=Przykład: l
 LDAPFieldCountry=Kraj
 LDAPFieldDescription=Opis
-LDAPFieldDescriptionExample=Example: description
+LDAPFieldDescriptionExample=Przykład: opis
 LDAPFieldNotePublic=Notatka publiczna
-LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldNotePublicExample=Przykład: notatka publiczna
 LDAPFieldGroupMembers= Członkowie grupy
-LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldGroupMembersExample= Przykład: uniqueMember
 LDAPFieldBirthdate=Data urodzenia
 LDAPFieldCompany=Firma
-LDAPFieldCompanyExample=Example: o
+LDAPFieldCompanyExample=Przykład: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
+LDAPFieldSidExample=Przykład: objectid
 LDAPFieldEndLastSubscription=Data zakończenia subskrypcji
 LDAPFieldTitle=Posada
 LDAPFieldTitleExample=Przykład: tytuł
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPFieldGroupid=Identyfikator grupy
+LDAPFieldGroupidExample=Przykład: numer gid
+LDAPFieldUserid=Identyfikator użytkownika
+LDAPFieldUseridExample=Przykład: uidnumber
+LDAPFieldHomedirectory=Katalog główny
+LDAPFieldHomedirectoryExample=Przykład: katalog główny
+LDAPFieldHomedirectoryprefix=Prefiks katalogu głównego
 LDAPSetupNotComplete=LDAP konfiguracji nie są kompletne (przejdź na innych kartach)
 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.
 LDAPDescMembers=Ta strona pozwala na zdefiniowanie atrybutów LDAP nazwę LDAP drzewa dla każdego danych na Dolibarr użytkowników modułu.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescMembersTypes=Ta strona umożliwia zdefiniowanie nazwy atrybutów LDAP w drzewie LDAP dla wszystkich danych znalezionych w typach członków Dolibarr.
 LDAPDescValues=Przykład wartości są dla <b>OpenLDAP</b> ładowane z następujących schematów: <b>core.schema, cosine.schema, inetorgperson.schema).</b> Jeśli używasz thoose wartości i OpenLDAP, zmodyfikować plik konfiguracyjny LDAP <b>slapd.conf</b> do wszystkich thoose schemas załadowany.
 ForANonAnonymousAccess=Dla uwierzytelniane dostęp (do zapisu na przykład)
-PerfDolibarr=Konfiguracja Wyniki / optymalizacja raport
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+PerfDolibarr=Raport konfiguracji/optymalizacji wydajności
+YouMayFindPerfAdviceHere=Ta strona zawiera kontrole lub porady związane z wydajnością.
+NotInstalled=Nie zainstalowany.
+NotSlowedDownByThis=Nie jest przez to spowolniony.
+NotRiskOfLeakWithThis=Nie ma z tym ryzyka wycieku.
 ApplicativeCache=Aplikacyjnych cache
 MemcachedNotAvailable=Nie znaleziono cache aplikacyjnych. Możesz zwiększyć wydajność poprzez zainstalowanie serwera cache i Memcached moduł w stanie korzystać z tego serwera cache. <br> Więcej informacji tutaj <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> . <br> Należy pamiętać, że wiele hosting provider nie zapewnia takiego serwera cache.
 MemcachedModuleAvailableButNotSetup=Moduł memcached dla aplikacyjnej cache znaleźć, ale konfiguracja modułu nie jest kompletna.
 MemcachedAvailableAndSetup=Moduł memcached dedykowane obsłudze serwer memcached jest włączony.
 OPCodeCache=OPCODE cache
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+NoOPCodeCacheFound=Nie znaleziono pamięci podręcznej OPCode. Może używasz pamięci podręcznej OPCode innej niż XCache lub eAccelerator (dobrze), a może nie masz pamięci podręcznej OPCode (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ą kompresowane przez serwer HTTP
 FilesOfTypeNotCompressed=Pliki typu %s nie są kompresowane przez serwer HTTP
 CacheByServer=Cache przez serwer
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByServerDesc=Na przykład przy użyciu dyrektywy Apache „ExpiresByType image / gif A2592000”
 CacheByClient=Cache przez przeglądarkę
 CompressionOfResources=Kompresja odpowiedzi HTTP
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+CompressionOfResourcesDesc=Na przykład przy użyciu dyrektywy Apache „AddOutputFilterByType DEFLATE”
 TestNotPossibleWithCurrentBrowsers=Taka automatyczna detekcja nie jest możliwe przy obecnych przeglądarek
-DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
-DefaultCreateForm=Default values (to use on forms)
-DefaultSearchFilters=Default search filters
+DefaultValuesDesc=Tutaj możesz zdefiniować domyślną wartość, której chcesz użyć podczas tworzenia nowego rekordu i/lub domyślne filtry lub kolejność sortowania podczas tworzenia listy rekordów.
+DefaultCreateForm=Wartości domyślne (do użycia w formularzach)
+DefaultSearchFilters=Domyślne filtry wyszukiwania
 DefaultSortOrder=Domyślna kolejność sortowania
-DefaultFocus=Default focus fields
-DefaultMandatory=Mandatory form fields
+DefaultFocus=Domyślne pola fokusu
+DefaultMandatory=Obowiązkowe pola formularza
 ##### Products #####
 ProductSetup=Produkty konfiguracji modułu
 ServiceSetup=Konfiguracja modułu Usługi
 ProductServiceSetup=Produkty i usługi moduły konfiguracyjne
-NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
-ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
-MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
-UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+NumberOfProductShowInSelect=Maksymalna liczba produktów do pokazania na listach wyboru kombi (0 = brak limitu)
+ViewProductDescInFormAbility=Wyświetlaj opisy produktów w formularzach (w przeciwnym razie wyświetlane w wyskakującym okienku z etykietką)
+DoNotAddProductDescAtAddLines=Nie dodawaj opisu produktu (z karty produktu) przy przesyłaniu dodatkowych wierszy na formularzach
+OnProductSelectAddProductDesc=Jak korzystać z opisu produktów podczas dodawania produktu jako linii dokumentu
+AutoFillFormFieldBeforeSubmit=Automatycznie wypełnij pole wejściowe opisu opisem produktu
+DoNotAutofillButAutoConcat=Nie wypełniaj automatycznie pola wejściowego opisem produktu. Opis produktu zostanie automatycznie dołączony do wprowadzonego opisu.
+DoNotUseDescriptionOfProdut=Opis produktu nigdy nie zostanie umieszczony w opisie linii dokumentów
+MergePropalProductCard=Aktywuj w zakładce produkt/usługa Załączone Pliki opcję łączenia dokumentu PDF produktu z propozycją PDF azur, jeśli produkt/usługa jest w ofercie
+ViewProductDescInThirdpartyLanguageAbility=Wyświetlaj opisy produktów w formularzach w języku strony trzeciej (w innym przypadku w języku użytkownika)
+UseSearchToSelectProductTooltip=Jeśli masz dużą liczbę produktów (> 100 000), możesz zwiększyć prędkość, ustawiając stałą PRODUCT_DONOTSEARCH_ANYWHERE na 1 w Ustawienia-> Inne. Wyszukiwanie będzie wtedy ograniczone do początku łańcucha.
+UseSearchToSelectProduct=Poczekaj, aż naciśniesz klawisz przed załadowaniem zawartości listy produktów (może to zwiększyć wydajność, jeśli masz dużą liczbę produktów, ale jest to mniej wygodne)
 SetDefaultBarcodeTypeProducts=Domyślny kod kreskowy typu użyć do produktów
 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
@@ -1621,10 +1632,10 @@ SyslogLevel=Poziom
 SyslogFilename=Nazwa pliku i ścieżka
 YouCanUseDOL_DATA_ROOT=Możesz użyć DOL_DATA_ROOT / dolibarr.log do pliku w Dolibarr "dokumenty" katalogu. Można ustawić inną ścieżkę do przechowywania tego pliku.
 ErrorUnknownSyslogConstant=Stała %s nie jest znany syslog stałej
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
-CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Number of backup logs to keep
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+OnlyWindowsLOG_USER=W systemie Windows obsługiwana będzie tylko funkcja LOG_USER
+CompressSyslogs=Kompresja i tworzenie kopii zapasowych plików dziennika debugowania (generowane przez dziennik modułu do debugowania)
+SyslogFileNumberOfSaves=Liczba dzienników kopii zapasowych do zachowania
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Skonfiguruj zaplanowane zadanie czyszczenia, aby ustawić częstotliwość tworzenia kopii zapasowych dziennika
 ##### Donations #####
 DonationsSetup=Darowizna konfiguracji modułu
 DonationsReceiptModel=Szablon otrzymania wpłaty
@@ -1647,7 +1658,7 @@ GenbarcodeLocation=Bar generowanie kodu narzędzie wiersza polecenia (używany p
 BarcodeInternalEngine=Silnik wewnętrznego
 BarCodeNumberManager=Manager auto zdefiniować numery kodów kreskowych
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=Konfiguracja modułu płatności Poleceniem Zapłaty
 ##### ExternalRSS #####
 ExternalRSSSetup=Zewnętrzne RSS przywóz konfiguracji
 NewRSS=Nowy kanał RSS
@@ -1655,19 +1666,19 @@ RSSUrl=RSS URL
 RSSUrlExample=Ciekawe RSS
 ##### Mailing #####
 MailingSetup=Moduł konfiguracji e-maila
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingEMailFrom=E-mail nadawcy (Od) dla wiadomości e-mail wysłanych przez moduł e-mailingu
+MailingEMailError=E-mail zwrotny (Errors-to) w przypadku wiadomości e-mail z błędami
 MailingDelay=Sekund po wysłaniu czekać następnej wiadomości
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+NotificationSetup=Konfiguracja modułu powiadomień e-mail
+NotificationEMailFrom=E-mail nadawcy (Od) dla wiadomości e-mail wysłanych przez moduł Powiadomienia
 FixedEmailTarget=Odbiorca
 ##### Sendings #####
-SendingsSetup=Shipping module setup
+SendingsSetup=Konfiguracja modułu wysyłkowego
 SendingsReceiptModel=Wysyłanie otrzymania modelu
 SendingsNumberingModules=Sendings numerowania modułów
 SendingsAbility=Obsługuj arkusze wysyłkowe dla dostaw do klientów
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=W większości przypadków arkusze wysyłkowe są używane zarówno jako arkusze dostaw do klientów (lista produktów do wysłania), jak i arkusze, które są odbierane i podpisywane przez klienta. W związku z tym pokwitowanie dostaw produktów jest funkcją zduplikowaną i rzadko jest aktywowane.
 FreeLegalTextOnShippings=Dowolny tekst sprawie przemieszczania
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkty dostaw otrzymania numeracji modułu
@@ -1679,24 +1690,24 @@ AdvancedEditor=Zaawansowany edytor
 ActivateFCKeditor=Uaktywnij FCKeditor za:
 FCKeditorForCompany=WYSIWIG tworzenie / edycja spółek opis i notatki
 FCKeditorForProduct=WYSIWIG tworzenie / edycja produktów / usług "opis i notatki
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
-FCKeditorForMailing= WYSIWIG tworzenie / edycja wiadomości
+FCKeditorForProductDetails=WYSIWIG tworzenie/edycja linii szczegółów produktów dla wszystkich podmiotów (oferty, zamówienia, faktury itp.). <span class="warning"> Ostrzeżenie: Używanie tej opcji w tym przypadku zdecydowanie nie jest zalecane, ponieważ może powodować problemy ze znakami specjalnymi i formatowaniem stron podczas tworzenia plików PDF. </span>
+FCKeditorForMailing= Tworzenie/edycja WYSIWYG do masowego e-mailingu (Narzędzia-> eMailing)
 FCKeditorForUserSignature=WYSIWIG tworzenie / edycja podpisu użytkownika
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+FCKeditorForMail=Tworzenie/edycja WYSIWYG dla całej poczty (z wyjątkiem Narzędzia->eMailing)
+FCKeditorForTicket=Tworzenie / edycja WYSIWIG biletów
 ##### Stock #####
-StockSetup=Stock module setup
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+StockSetup=Konfiguracja modułu magazynowego
+IfYouUsePointOfSaleCheckModule=Jeśli korzystasz z modułu punktu sprzedaży (POS) dostarczanego domyślnie lub modułu zewnętrznego, ta konfiguracja może zostać zignorowana przez moduł POS. Większość modułów POS jest domyślnie zaprojektowana do natychmiastowego tworzenia faktury i zmniejszania zapasów niezależnie od dostępnych tutaj opcji. Jeśli więc chcesz lub nie chcesz mieć spadku zapasów podczas rejestrowania sprzedaży w punkcie sprzedaży, sprawdź również konfigurację modułu POS.
 ##### Menu #####
 MenuDeleted=Menu skreślony
 Menu=Menu
 Menus=Menu
 TreeMenuPersonalized=Spersonalizowane menu
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NotTopTreeMenuPersonalized=Spersonalizowane menu niepowiązane z pozycją w górnym menu
 NewMenu=Nowe menu
 MenuHandler=Menu obsługi
 MenuModule=Źródło modułu
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=Ukryj nieautoryzowane menu również dla użytkowników wewnętrznych (w przeciwnym razie tylko wyszarzone)
 DetailId=Id menu
 DetailMenuHandler=Menu obsługi gdzie pokazać nowe menu
 DetailMenuModule=Moduł nazwę w menu, jeśli pochodzą z modułem
@@ -1708,7 +1719,7 @@ DetailRight=Warunek, aby wyświetlić menu nieautoryzowanych szary
 DetailLangs=Lang nazwy etykiety kodów
 DetailUser=Intern / Pomocy Wszystkie
 Target=Cel
-DetailTarget=Target for links (_blank top opens a new window)
+DetailTarget=Miejsce docelowe dla linków (_blank top otwiera nowe okno)
 DetailLevel=Poziom (-1: top menu 0: nagłówek menu&gt; 0 menu i podmenu)
 ModifMenu=Menu zmiany
 DeleteMenu=Usuń element menu
@@ -1717,13 +1728,13 @@ FailedToInitializeMenu=Nie można zainicjowac menu
 ##### Tax #####
 TaxSetup=Podatki, podatki socjalne lub podatkowe i dywidendy konfiguracji moduł
 OptionVatMode=Opcja d'exigibilit de TVA
-OptionVATDefault=Standard basis
+OptionVATDefault=Podstawa standardowa
 OptionVATDebitOption=Memoriału
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
-OptionPaymentForProductAndServices=Cash basis for products and services
-OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+OptionVatDefaultDesc=VAT jest należny: <br> - przy dostawie towaru (na podstawie daty faktury) <br> - przy płatności za usługi
+OptionVatDebitOptionDesc=VAT jest należny: <br> - przy dostawie towaru (na podstawie daty faktury) <br> - na fakturze (obciążeniu) za usługi
+OptionPaymentForProductAndServices=Podstawa gotówkowa na produkty i usługi
+OptionPaymentForProductAndServicesDesc=VAT jest należny: <br> - przy płatności za towary <br> - przy płatności za usługi
+SummaryOfVatExigibilityUsedByDefault=Domyślny czas kwalifikowalności VAT według wybranej opcji:
 OnDelivery=Na dostawy
 OnPayment=W sprawie wypłaty
 OnInvoice=Na fakturze
@@ -1732,45 +1743,47 @@ SupposedToBeInvoiceDate=Data użyta na fakturze
 Buy=Kupić
 Sell=Sprzedać
 InvoiceDateUsed=Data użyta na fakturze
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Twoja firma została zdefiniowana tak, aby nie używać podatku VAT (Strona Główna - Ustawienia - Firma/Organizacja), więc nie ma opcji dotyczących podatku VAT do skonfigurowania.
 AccountancyCode=Kod księgowy
 AccountancyCodeSell=Rachunek sprzedaży. kod
 AccountancyCodeBuy=Kup konto. kod
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Podczas tworzenia nowego podatku pozostaw domyślnie puste pole wyboru „Automatycznie utwórz płatność”
 ##### Agenda #####
 AgendaSetup=Działania i porządku konfiguracji modułu
 PasswordTogetVCalExport=Klucz do wywozu zezwolić na link
+SecurityKey = Security Key
 PastDelayVCalExport=Nie starsze niż eksport przypadku
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
-AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
-AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+AGENDA_USE_EVENT_TYPE=Użyj typów wydarzeń (zarządzanych w menu Ustawienia -> Słowniki -> Typ wydarzeń w programie)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatycznie ustaw tę domyślną wartość dla typu zdarzenia w formularzu tworzenia wydarzenia
+AGENDA_DEFAULT_FILTER_TYPE=Automatycznie ustaw ten typ wydarzenia w filtrze wyszukiwania widoku planu
+AGENDA_DEFAULT_FILTER_STATUS=Automatycznie ustawiaj ten stan dla wydarzeń w filtrze wyszukiwania w widoku planu zajęć
+AGENDA_DEFAULT_VIEW=Który widok chcesz otworzyć domyślnie po wybraniu menu Plan
+AGENDA_REMINDER_BROWSER=Włącz przypomnienie o zdarzeniu <b> w przeglądarce użytkownika </b> (Kiedy nadejdzie data przypomnienia, przeglądarka wyświetli wyskakujące okienko. Każdy użytkownik może wyłączyć takie powiadomienia w ustawieniach powiadomień przeglądarki).
+AGENDA_REMINDER_BROWSER_SOUND=Włącz powiadomienia dźwiękowe
+AGENDA_REMINDER_EMAIL=Włącz przypomnienie o wydarzeniu <b> przez e-mail </b> (opcję przypomnienia / opóźnienie można zdefiniować dla każdego zdarzenia).
+AGENDA_REMINDER_EMAIL_NOTE=Uwaga: częstotliwość zadania %s musi być wystarczająca, aby mieć pewność, że przypomnienie zostanie wysłane w odpowiednim momencie.
+AGENDA_SHOW_LINKED_OBJECT=Pokaż połączony obiekt w widoku planu zajęć
 ##### Clicktodial #####
 ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialUrlDesc=Adres URL wywoływany po wykonaniu kliknięcia na picto telefonu. W adresie URL, można użyć znaczników <br> <b> __PHONETO__ </b> który zostanie zastąpiony numerem telefonu osoby zadzwonić <br> <b> __PHONEFROM__ </b> który zostanie zastąpiony numerem telefonu dzwoniąc osobę (swoje) <br> <b> __LOGIN__ </b> które zostaną zastąpione clicktodial login (zdefiniowany na karcie użytkownika) <br> <b> __PASS__ </b>, który zostanie zastąpiony hasłem clicktodial (zdefiniowanym na karcie użytkownika).
+ClickToDialDesc=Ten moduł zamienia numery telefonów, gdy używasz komputera stacjonarnego, w klikalne linki. Kliknięcie wywoła numer. Można to wykorzystać do nawiązania połączenia telefonicznego podczas korzystania z telefonu programowego na pulpicie lub podczas korzystania na przykład z systemu CTI opartego na protokole SIP. Uwaga: podczas korzystania ze smartfona numery telefonów są zawsze klikalne.
 ClickToDialUseTelLink=Używaj tylko łącza "tel:" na numery telefonów
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Użyj tej metody, jeśli Twoi użytkownicy mają telefon programowy lub interfejs oprogramowania zainstalowany na tym samym komputerze co przeglądarka i wywoływany po kliknięciu łącza w przeglądarce zaczynającego się od „tel:”. Jeśli potrzebujesz pełnego rozwiązania serwerowego (nie ma potrzeby lokalnej instalacji oprogramowania), musisz ustawić to na „Nie” i wypełnić następne pole.
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDesk=Punkt sprzedaży
+CashDeskSetup=Konfiguracja modułu Point of Sales
+CashDeskThirdPartyForSell=Domyślna generyczna firma zewnętrzna do sprzedaży
 CashDeskBankAccountForSell=Środki pieniężne na rachunku do korzystania sprzedaje
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCheque=Domyślne konto używane do otrzymywania płatności czekiem
 CashDeskBankAccountForCB=Chcesz używać do przyjmowania płatności gotówkowych za pomocą kart kredytowych
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskBankAccountForSumup=Domyślne konto bankowe używane do otrzymywania płatności przez SumUp
+CashDeskDoNotDecreaseStock=Wyłącz zmniejszanie zapasów, gdy sprzedaż odbywa się z punktu sprzedaży (jeśli "nie", zmniejszanie zapasów jest dokonywane dla każdej sprzedaży dokonanej z POS, niezależnie od opcji ustawionej w module Zapasy).
 CashDeskIdWareHouse=Życie i ograniczyć magazyn użyć do spadku magazynie
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
+StockDecreaseForPointOfSaleDisabled=Zmniejszenie zapasów z punktu sprzedaży wyłączone
+StockDecreaseForPointOfSaleDisabledbyBatch=Zmniejszenie zapasów w POS nie jest kompatybilne z modułem Zarządzanie seriami / partiami (obecnie aktywne), więc zmniejszanie zapasów jest wyłączone.
 CashDeskYouDidNotDisableStockDecease=Nie wyłączono zmniejszania zapasów podczas dokonywania sprzedaży w punkcie sprzedaży. Dlatego wymagany jest magazyn.
 CashDeskForceDecreaseStockLabel=Wymuszono zmniejszenie zapasów dla produktów seryjnych.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
+CashDeskForceDecreaseStockDesc=Zmniejsz najpierw według najstarszych dat przydatności do spożycia i sprzedaży.
 CashDeskReaderKeyCodeForEnter=Kod klucza dla „Enter” zdefiniowany w czytniku kodów kreskowych (Przykład: 13)
 ##### Bookmark #####
 BookmarkSetup=Zakładka konfiguracji modułu
@@ -1797,11 +1810,11 @@ BankOrderGlobal=Ogólny
 BankOrderGlobalDesc=Ogólna kolejność wyświetlania
 BankOrderES=Hiszpański
 BankOrderESDesc=Hiszpański kolejność wyświetlania
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+ChequeReceiptsNumberingModule=Sprawdź moduł numerowania paragonów
 ##### Multicompany #####
 MultiCompanySetup=Firma Multi-Moduł konfiguracji
 ##### Suppliers #####
-SuppliersSetup=Konfiguracja modułu Dostawcy
+SuppliersSetup=Ustawienia modułu dostawcy
 SuppliersCommandModel=Kompletny szablon zamówienia
 SuppliersCommandModelMuscadet=Kompletny szablon zamówienia (stara implementacja szablonu cornas)
 SuppliersInvoiceModel=Kompletny szablon faktury od dostawcy
@@ -1845,7 +1858,7 @@ TypePaymentDesc=0: typ płatności odbiorcy, 1: typ płatności dostawcy, 2: typ
 IncludePath=Dołącz ścieżkę (zdefiniowane w zmiennej% s)
 ExpenseReportsSetup=Konfiguracja modułu Raporty Kosztów
 TemplatePDFExpenseReports=Szablony dokumentów w celu wygenerowania raportu wydatków dokument
-ExpenseReportsRulesSetup=Konfiguracja modułu "Raporty wydatków" - Reguły
+ExpenseReportsRulesSetup=Ustawienia modułu "Raporty wydatków" - Reguły
 ExpenseReportNumberingModules=Moduł "Numerowanie raportów wydatków"
 NoModueToManageStockIncrease=Nie Moduł stanie zarządzać automatyczny wzrost akcji zostało aktywowane. Wzrost Zdjęcie zostanie zrobione tylko na ręczne wprowadzanie.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Opcje powiadomień e-mail można znaleźć, włączając i konfigurując moduł „Powiadomienia”.
@@ -1879,11 +1892,11 @@ BackgroundTableLineOddColor=Kolor tła pozostałych lini tabeli
 BackgroundTableLineEvenColor=Kolor tła dla równomiernych lini tabeli
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=To pole zawiera odniesienie do identyfikacji linii. Wprowadź dowolną wybraną wartość, ale bez znaków specjalnych.
 Enter0or1=Wpisz 0 lub 1
 UnicodeCurrency=Wpisz między nawiasami kwadratowymi wielkość dziesiętną Unicode reprezentującą symbol waluty. Na przykład: dla $ [36] - dla zł [122,322] - dla € wpisz [8364]
 ColorFormat=Kolor RGB jest w formacie HEX, np .: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Nazwa ikony w formacie dolibarr („image.png” w katalogu z bieżącym motywem, „image.png@nom_du_module” w katalogu / img / modułu)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly="Tak" dla podatku VAT „Not Perceived but Recoverable” stosowanego w niektórych stanach Francji. Ustaw „Nie” dla wszelkich innych lokalizacji.
@@ -1910,7 +1923,7 @@ MailToSendSupplierRequestForQuotation=Zapytanie ofertowe
 MailToSendSupplierOrder=Zamówienia zakupowe
 MailToSendSupplierInvoice=Faktury dostawcy
 MailToSendContract=Kontrakty
-MailToSendReception=Receptions
+MailToSendReception=Przyjęcia
 MailToThirdparty=Kontrahenci
 MailToMember=Członkowie
 MailToUser=Użytkownicy
@@ -1924,7 +1937,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s jest dostępny. Wersja
 ExampleOfNewsMessageForMaintenanceRelease=System ERP i CRM Dolibarr %s jest dostępny. Wersja %s jest wersją serwisową. Wersja serwisowa nie wprowadza nowych funkcji ani zmian w bazie danych. Zawiera jedynie poprawki błędów. Wszystkim użytkownikom zalecamy uaktualnienie do tej wersji.  Możesz pobrać ją z obszaru pobierania portalu https://www.dolibarr.org (Downloads > Stable versions). Możesz przeczytać <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a>, aby uzyskać pełną listę zmian.
 MultiPriceRuleDesc=Przy włączonej opcji „Kilka poziomów cen za produkt/usługę”, możesz zdefiniować różne ceny (jeden na poziom cen) dla każdego produktu. Aby zaoszczędzić swój czas, możesz wprowadzić regułę automatycznego obliczania ceny dla każdego poziomu w oparciu o cenę pierwszego poziomu, więc będziesz musiał wprowadzić cenę tylko dla pierwszego poziomu dla każdego produktu. Ta strona została zaprojektowana w celu zaoszczędzenia czasu, ale jest przydatna tylko wtedy, gdy ceny dla każdego poziomu są w stosunku do pierwszego poziomu. W większości przypadków możesz zignorować tę stronę.
 ModelModulesProduct=Szablon dokumentu produktu
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Szablony dokumentów magazynowych
 ToGenerateCodeDefineAutomaticRuleFirst=Aby móc automatycznie generować kody, musisz najpierw zdefiniować menedżera, aby automatycznie zdefiniował numer kodu kreskowego.
 SeeSubstitutionVars=Spójrz na *, aby uzyskać listę możliwych zmiennych podstawienia
 SeeChangeLog=Zobacz plik ChangeLog (tylko w języku angielskim)
@@ -1955,7 +1968,7 @@ SamePriceAlsoForSharedCompanies=Jeśli korzystasz z modułu MultiCompany, z wybo
 ModuleEnabledAdminMustCheckRights=Moduł został aktywowany. Uprawnienia do aktywnych modułów są automatycznie przyznawane administratorom systemu. Jeśli trzeba, uprawnienia można ręcznie przyznać innym użytkownikom lub grupom.
 UserHasNoPermissions=Ten użytkownik nie ma zdefiniowanych uprawnień
 TypeCdr=Użyj „Brak”, jeśli terminem płatności jest data wystawienia faktury plus delta w dniach (delta to pole „%s”)<br>Użyj „Na koniec miesiąca”, jeśli po delcie data musi zostać przedłużona do końca miesiąca (+ opcjonalny „%s” w dniach)<br>Użyj „Bieżący/Następny”, aby data terminu płatności była pierwszą N-tego miesiąca po delcie (delta to pole „%s”, N jest przechowywane w polu „%s”)
-BaseCurrency=Waluta bazowa w firmie (przejdź do Konfiguracja > Firma/Organizacja, aby to zmienić)
+BaseCurrency=Waluta referencyjna firmy (przejdź do ustawień firmy, aby to zmienić)
 WarningNoteModuleInvoiceForFrenchLaw=Ten moduł %s jest zgodny z francuskimi przepisami (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=Ten moduł %s jest zgodny z francuskimi przepisami (Loi Finance 2016), ponieważ moduł Dzienniki Nieodwracalne jest aktywowany automatycznie.
 WarningInstallationMayBecomeNotCompliantWithLaw=Próbujesz zainstalować moduł %s, który jest modułem zewnętrznym. Aktywując go zaufasz jego wydawcy, okażesz pewność, że moduł nie wpłynie negatywnie na zachowanie Twojej aplikacji oraz, że jest zgodny z przepisami obowiązującymi w Twoim kraju (%s). Jeśli moduł wprowadzi nielegalną funkcję, staniesz się odpowiedzialny za korzystanie z nielegalnego oprogramowania.
@@ -1963,135 +1976,149 @@ MAIN_PDF_MARGIN_LEFT=Lewy margines w pliku PDF
 MAIN_PDF_MARGIN_RIGHT=Prawy margines w pliku PDF
 MAIN_PDF_MARGIN_TOP=Górny margines w pliku PDF
 MAIN_PDF_MARGIN_BOTTOM=Dolny margines w pliku PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Wysokość logo na dokumencie PDF
 NothingToSetup=Dla tego modułu nie jest wymagana żadna konkretna konfiguracja.
 SetToYesIfGroupIsComputationOfOtherGroups=Ustaw na Tak, jeśli grupa ta pochodzi z przetworzenia innych grup
-EnterCalculationRuleIfPreviousFieldIsYes=Wprowadź regułę obliczania, jeśli poprzednie pole było ustawione na Tak (na przykład „CODEGRP1 + CODEGRP2”)
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Znaleziono kilka wariantów językowych
 RemoveSpecialChars=Usuń znaki specjalne
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtr Regex do czyszczenia wartości (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtr Regex do czyszczenia wartości (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplikat jest niedozwolony
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
+GDPRContact=Inspektor ochrony danych osobowych (kontakt w sprawie ochrony danych lub RODO)
+GDPRContactDesc=Jeśli przechowujesz dane o europejskich firmach / obywatelach, możesz tutaj wskazać osobę kontaktową odpowiedzialną za ogólne rozporządzenie o ochronie danych
+HelpOnTooltip=Tekst pomocy do wyświetlenia w podpowiedzi
 HelpOnTooltipDesc=Umieść tutaj tekst lub klucz do tłumaczenia, aby tekst był wyświetlany w etykiecie narzędzia, gdy to pole pojawi się w formularzu
 YouCanDeleteFileOnServerWith=Możesz usunąć ten plik na serwerze za pomocą wiersza poleceń:<br>%s
-ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Konfiguracja modułu Sieci Społecznościowe
+ChartLoaded=Załadowano plan kont
+SocialNetworkSetup=Ustawienia modułu Sieci Społecznościowe
 EnableFeatureFor=Włącz funkcje dla <strong>%s</strong>
-VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
-MaxEmailCollectPerCollect=Max number of emails collected per collect
-CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
-LastResult=Latest result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
-CodeLastResult=Latest result code
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create job application
+VATIsUsedIsOff=Uwaga: Opcja korzystania z podatku od sprzedaży lub VAT została ustawiona na <strong> Off </strong> w menu %s - %s, więc podatek od sprzedaży lub VAT będzie zawsze wynosić 0 dla sprzedaży.
+SwapSenderAndRecipientOnPDF=Zamień adres nadawcy i adresata w dokumentach PDF
+FeatureSupportedOnTextFieldsOnly=Ostrzeżenie, funkcja obsługiwana tylko w polach tekstowych i listach kombi. Również parametr adresu URL action = create lub action = edit musi być ustawiony LUB nazwa strony musi kończyć się na „nowy.php”, aby uruchomić tę funkcję.
+EmailCollector=Kolektor e-maili
+EmailCollectorDescription=Dodaj zaplanowane zadanie i stronę konfiguracji, aby regularnie skanować skrzynki e-mail (przy użyciu protokołu IMAP) i zapisywać wiadomości e-mail otrzymane w aplikacji we właściwym miejscu i / lub automatycznie tworzyć niektóre rekordy (np. Potencjalnych klientów).
+NewEmailCollector=Nowy moduł do zbierania wiadomości e-mail
+EMailHost=Host serwera poczty e-mail IMAP
+MailboxSourceDirectory=Katalog źródłowy skrzynki pocztowej
+MailboxTargetDirectory=Katalog docelowy skrzynki pocztowej
+EmailcollectorOperations=Operacje do wykonania przez kolekcjonera
+EmailcollectorOperationsDesc=Operacje są wykonywane od góry do dołu
+MaxEmailCollectPerCollect=Maksymalna liczba e-maili zebranych na odbiór
+CollectNow=Zbierz teraz
+ConfirmCloneEmailCollector=Czy na pewno chcesz sklonować moduł zbierający wiadomości e-mail %s?
+DateLastCollectResult=Data ostatniej próby odbioru
+DateLastcollectResultOk=Data ostatniej pomyślnej zbiórki
+LastResult=Ostatni wynik
+EmailCollectorConfirmCollectTitle=Potwierdzenie odbioru poczty e-mail
+EmailCollectorConfirmCollect=Czy chcesz teraz uruchomić kolekcję dla tego kolekcjonera?
+NoNewEmailToProcess=Brak nowych e-maili (pasujących filtrów) do przetworzenia
+NothingProcessed=Nic nie zostało zrobione
+XEmailsDoneYActionsDone=%s e-maile zakwalifikowane, %s e-maile pomyślnie przetworzone (dla %s rekordu / wykonanych czynności)
+RecordEvent=Nagraj wydarzenie e-mail
+CreateLeadAndThirdParty=Utwórz potencjalnego klienta (i osobę trzecią, jeśli to konieczne)
+CreateTicketAndThirdParty=Utwórz bilet (i link do strony trzeciej, jeśli został załadowany przez poprzednią operację)
+CodeLastResult=Kod najnowszego wyniku
+NbOfEmailsInInbox=Liczba e-maili w katalogu źródłowym
+LoadThirdPartyFromName=Załaduj wyszukiwanie osób trzecich na %s (tylko ładowanie)
+LoadThirdPartyFromNameOrCreate=Załaduj wyszukiwanie osób trzecich na %s (utwórz, jeśli nie znaleziono)
+WithDolTrackingID=Wiadomość z rozmowy zainicjowanej pierwszym e-mailem wysłanym przez Dolibarr
+WithoutDolTrackingID=Wiadomość z rozmowy zainicjowanej pierwszym e-mailem NIE wysłanym od Dolibarr
+WithDolTrackingIDInMsgId=Wiadomość wysłana przez Dolibarr
+WithoutDolTrackingIDInMsgId=Wiadomość NIE została wysłana z Dolibarr
+CreateCandidature=Utwórz podanie o pracę
 FormatZip=Kod pocztowy
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
-ResourceSetup=Configuration of Resource module
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
-ConfirmUnactivation=Confirm module reset
-OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+MainMenuCode=Kod wejścia menu (menu główne)
+ECMAutoTree=Pokaż automatyczne drzewo ECM
+OperationParamDesc=Zdefiniuj wartości, które mają być używane dla obiektu akcji, lub sposób wyodrębniania wartości. Na przykład: <br> objproperty1 = SET: wartość do ustawienia <br> objproperty2 = SET: wartość zastępująca __objproperty1__ <br> objproperty3 = SETIFEMPTY: wartość używana, jeśli objproperty3 nie jest jeszcze zdefiniowana a0342 objproperty3: ([^ \\ s] *) <br> options_myextrafield1 = EXTRACT: SUBJECT: ([^ & # 92; n] *) <br> object.objproperty5 = WYCIĄG: BODY: Nazwa mojej firmy to \\ s ([^ \\ s] *) a0342fccfda <br> Użyj a; char jako separator, aby wyodrębnić lub ustawić kilka właściwości.
+OpeningHours=Godziny otwarcia
+OpeningHoursDesc=Wpisz tutaj regularne godziny otwarcia swojej firmy.
+ResourceSetup=Konfiguracja modułu zasobów
+UseSearchToSelectResource=Użyj formularza wyszukiwania, aby wybrać zasób (zamiast listy rozwijanej).
+DisabledResourceLinkUser=Wyłącz funkcję łączenia zasobów z użytkownikami
+DisabledResourceLinkContact=Wyłącz funkcję łączenia zasobów z kontaktami
+EnableResourceUsedInEventCheck=Włącz funkcję, aby sprawdzić, czy zasób jest używany w wydarzeniu
+ConfirmUnactivation=Potwierdź reset modułu
+OnMobileOnly=Tylko na małym ekranie (smartfonie)
+DisableProspectCustomerType=Wyłącz typ strony trzeciej „Prospect + Customer” (więc strona trzecia musi być „Prospect” lub „Customer”, ale nie może być jednocześnie)
+MAIN_OPTIMIZEFORTEXTBROWSER=Uproszczony interfejs dla osób niewidomych
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Włącz tę opcję, jeśli jesteś osobą niewidomą lub jeśli używasz aplikacji z przeglądarki tekstowej, takiej jak Lynx lub Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Zmień kolor interfejsu dla osoby niewidomej na kolory
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Włącz tę opcję, jeśli jesteś osobą niewidomą na kolory, w niektórych przypadkach interfejs zmieni ustawienia kolorów, aby zwiększyć kontrast.
 Protanopia=Protanopia
-Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
-ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
-DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
+Deuteranopes=Deuteranopy
+Tritanopes=Tritanopy
+ThisValueCanOverwrittenOnUserLevel=Ta wartość może być nadpisana przez każdego użytkownika na jego stronie użytkownika - zakładka „%s”
+DefaultCustomerType=Domyślny typ strony trzeciej dla formularza tworzenia „Nowego klienta”
+ABankAccountMustBeDefinedOnPaymentModeSetup=Uwaga: aby ta funkcja działała, konto bankowe musi być zdefiniowane w module każdego trybu płatności (Paypal, Stripe, ...).
+RootCategoryForProductsToSell=Kategoria główna sprzedawanych produktów
+RootCategoryForProductsToSellDesc=W przypadku zdefiniowania w punkcie sprzedaży będą dostępne tylko produkty należące do tej kategorii lub produkty podrzędne z tej kategorii
+DebugBar=Pasek debugowania
+DebugBarDesc=Pasek narzędzi z wieloma narzędziami upraszczającymi debugowanie
 DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
-LogsLinesNumber=Number of lines to show on logs tab
-UseDebugBar=Use the debug bar
-DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
-WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-ModuleActivated=Module %s is activated and slows the interface
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
-ImportSetup=Setup of module Import
-InstanceUniqueID=Unique ID of the instance
-SmallerThan=Smaller than
-LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
-WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
-EndPointFor=End point for %s : %s
-DeleteEmailCollector=Delete email collector
-ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+GeneralOptions=Opcje ogólne
+LogsLinesNumber=Liczba wierszy wyświetlanych na karcie dzienników
+UseDebugBar=Użyj paska debugowania
+DEBUGBAR_LOGS_LINES_NUMBER=Liczba ostatnich wierszy dziennika do zachowania w konsoli
+WarningValueHigherSlowsDramaticalyOutput=Ostrzeżenie, wyższe wartości dramatycznie spowalniają produkcję
+ModuleActivated=Moduł %s jest aktywowany i spowalnia interfejs
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
+IfYouAreOnAProductionSetThis=W środowisku produkcyjnym należy ustawić tę właściwość na %s.
+AntivirusEnabledOnUpload=Antywirus włączony na przesyłanych plikach
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+EXPORTS_SHARE_MODELS=Modele eksportowe są udostępniane wszystkim
+ExportSetup=Konfiguracja eksportu modułu
+ImportSetup=Konfiguracja importu modułu
+InstanceUniqueID=Unikalny identyfikator instancji
+SmallerThan=Mniejszy niż
+LargerThan=Większy niż
+IfTrackingIDFoundEventWillBeLinked=Zwróć uwagę, że jeśli identyfikator śledzenia obiektu zostanie znaleziony w wiadomości e-mail lub jeśli wiadomość e-mail jest odpowiedzią na wiadomość e-mail, która jest już zebrana i powiązana z obiektem, utworzone zdarzenie zostanie automatycznie połączone ze znanym powiązanym obiektem.
+WithGMailYouCanCreateADedicatedPassword=W przypadku konta Gmail, jeśli włączyłeś weryfikację dwuetapową, zaleca się utworzenie dedykowanego drugiego hasła dla aplikacji zamiast używania własnego hasła do konta ze strony https://myaccount.google.com/.
+EmailCollectorTargetDir=Przeniesienie wiadomości e-mail do innego tagu / katalogu po pomyślnym przetworzeniu może być pożądanym zachowaniem. Po prostu ustaw tutaj nazwę katalogu, aby skorzystać z tej funkcji (NIE używaj znaków specjalnych w nazwie). Pamiętaj, że musisz również użyć konta logowania do odczytu / zapisu.
+EmailCollectorLoadThirdPartyHelp=Możesz użyć tej akcji, aby użyć treści wiadomości e-mail do znalezienia i załadowania istniejącej strony trzeciej do bazy danych. Znaleziona (lub utworzona) osoba trzecia zostanie wykorzystana do następujących działań, które tego wymagają. W polu parametrów możesz użyć na przykład „EXTRACT: BODY: Name: \\ s ([^ \\ s] *)”, jeśli chcesz wyodrębnić nazwę osoby trzeciej z ciągu „Name: name to find” znajdującego się w ciało.
+EndPointFor=Punkt końcowy dla %s: %s
+DeleteEmailCollector=Usuń moduł zbierający e-maile
+ConfirmDeleteEmailCollector=Czy na pewno chcesz usunąć tego kolektora e-maili?
+RecipientEmailsWillBeReplacedWithThisValue=E-maile adresatów będą zawsze zastępowane tą wartością
+AtLeastOneDefaultBankAccountMandatory=Należy zdefiniować co najmniej 1 domyślne konto bankowe
+RESTRICT_ON_IP=Zezwalaj na dostęp tylko do niektórych adresów IP hostów (symbole wieloznaczne nie są dozwolone, użyj spacji między wartościami). Puste oznacza, że każdy host ma dostęp.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Based on the library SabreDAV version
-NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Przejdź do Konfiguracja -> Widżety
+BaseOnSabeDavVersion=Oparty na wersji biblioteki SabreDAV
+NotAPublicIp=To nie jest publiczny adres IP
+MakeAnonymousPing=Wykonaj anonimowe pingowanie „+1” do serwera fundacji Dolibarr (wykonane 1 raz tylko po instalacji), aby umożliwić fundacji zliczenie liczby instalacji Dolibarr.
+FeatureNotAvailableWithReceptionModule=Funkcja niedostępna, gdy włączony jest moduł Odbiór
+EmailTemplate=Szablon do wiadomości e-mail
+EMailsWillHaveMessageID=E-maile będą miały tag „References” pasujący do tej składni
+PDF_SHOW_PROJECT=Pokaż projekt w dokumencie
+ShowProjectLabel=Etykieta projektu
+PDF_USE_ALSO_LANGUAGE_CODE=Jeśli chcesz, aby niektóre teksty w pliku PDF zostały skopiowane w 2 różnych językach w tym samym wygenerowanym pliku PDF, musisz ustawić tutaj ten drugi język, aby wygenerowany plik PDF zawierał 2 różne języki na tej samej stronie, ten wybrany podczas generowania pliku PDF i ten ( tylko kilka szablonów PDF to obsługuje). Pozostaw puste dla 1 języka na plik PDF.
+FafaIconSocialNetworksDesc=Wpisz tutaj kod ikony FontAwesome. Jeśli nie wiesz, co to jest FontAwesome, możesz użyć ogólnej wartości fa-address-book.
+FeatureNotAvailableWithReceptionModule=Funkcja niedostępna, gdy włączony jest moduł Odbiór
+RssNote=Uwaga: każda definicja źródła danych RSS zawiera widżet, który należy włączyć, aby był dostępny na pulpicie nawigacyjnym
+JumpToBoxes=Przejdź do Ustawienia -> Widżety
 MeasuringUnitTypeDesc=Użyj tu wartości takich jak „rozmiar”, „powierzchnia”, „objętość”, „waga”, „czas”
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
+MeasuringScaleDesc=Skala to liczba miejsc, o które trzeba przesunąć część dziesiętną, aby dopasować się do domyślnej jednostki odniesienia. W przypadku typu jednostki „czas” jest to liczba sekund. Wartości od 80 do 99 są wartościami zarezerwowanymi.
+TemplateAdded=Dodano szablon
+TemplateUpdated=Zaktualizowano szablon
+TemplateDeleted=Szablon został usunięty
+MailToSendEventPush=E-mail z przypomnieniem o wydarzeniu
+SwitchThisForABetterSecurity=W celu zwiększenia bezpieczeństwa zaleca się zmianę tej wartości na %s
+DictionaryProductNature= Charakter produktu
+CountryIfSpecificToOneCountry=Kraj (jeśli dotyczy danego kraju)
+YouMayFindSecurityAdviceHere=Możesz znaleźć porady dotyczące bezpieczeństwa tutaj
+ModuleActivatedMayExposeInformation=To rozszerzenie PHP może ujawniać poufne dane. Jeśli jej nie potrzebujesz, wyłącz ją.
+ModuleActivatedDoNotUseInProduction=Włączono moduł przeznaczony do rozwoju. Nie włączaj go w środowisku produkcyjnym.
+CombinationsSeparator=Znak separatora dla kombinacji produktów
+SeeLinkToOnlineDocumentation=Przykłady można znaleźć w odnośniku do dokumentacji online w górnym menu
+SHOW_SUBPRODUCT_REF_IN_PDF=Jeśli używana jest funkcja „%s” modułu <b> %s </b>, wyświetl szczegóły podproduktów zestawu w pliku PDF.
+AskThisIDToYourBank=Skontaktuj się ze swoim bankiem, aby uzyskać ten identyfikator
+AdvancedModeOnly=Zezwolenie dostępne tylko w trybie uprawnień Zaawansowanych
+ConfFileIsReadableOrWritableByAnyUsers=Plik conf jest czytelny lub zapisywalny dla każdego użytkownika. Udziel pozwolenia tylko użytkownikowi i grupie serwera WWW.
+MailToSendEventOrganization=Organizacja imprez
+AGENDA_EVENT_DEFAULT_STATUS=Domyślny status zdarzenia podczas tworzenia zdarzenia z formularza
+YouShouldDisablePHPFunctions=Powinieneś wyłączyć funkcje PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 31fa178b5f7..c7266ccdbbc 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Banks | Cash
+MenuBankCash=Banki | Gotówka
 MenuVariousPayment=Różne płatności
-MenuNewVariousPayment=New Miscellaneous payment
+MenuNewVariousPayment=Nowa płatność różne
 BankName=Nazwa banku
 FinancialAccount=Konto
 BankAccount=Konto bankowe
@@ -30,26 +30,26 @@ AllTime=Od początku
 Reconciliation=Rekoncyliacja - uzgadanie stanów kont bankowych
 RIB=Numer konta bankowego
 IBAN=Numer IBAN
-BIC=BIC/SWIFT code
+BIC=Kod BIC / SWIFT
 SwiftValid=Ważny BIC/SWIFT
 SwiftVNotalid=Nie ważny BIC/SWIFT
 IbanValid=Ważny BAN
 IbanNotValid=Nie ważny BAN
-StandingOrders=Direct debit orders
+StandingOrders=Polecenia zapłaty
 StandingOrder=Zamówienie polecenia zapłaty
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByDirectDebit=Płatność poleceniem zapłaty
+PaymentByBankTransfers=Płatności przelewem
+PaymentByBankTransfer=Płatność przelewem
 AccountStatement=Wyciąg z konta
 AccountStatementShort=Wyciąg
 AccountStatements=Wyciągi z konta
 LastAccountStatements=Ostatnie wyciągi z konta
 IOMonthlyReporting=Miesiąc sprawozdawczy
-BankAccountDomiciliation=Bank address
+BankAccountDomiciliation=numer konta
 BankAccountCountry=Konto kraju
 BankAccountOwner=Nazwa właściciela konta
 BankAccountOwnerAddress=Adres właściciela konta
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
+RIBControlError=Sprawdzanie integralności wartości nie powiodło się. Oznacza to, że informacje dotyczące tego numeru konta są niekompletne lub nieprawidłowe (sprawdź kraj, numery i IBAN).
 CreateAccount=Załóż konto
 NewBankAccount=Nowe konto
 NewFinancialAccount=Nowy rachunek finansowy
@@ -76,53 +76,53 @@ BankTransaction=Wpis bankowy
 ListTransactions=Lista wpisów
 ListTransactionsByCategory=Lista wpisów/kategorii
 TransactionsToConciliate=Wpisy do zaksięgowania
-TransactionsToConciliateShort=To reconcile
+TransactionsToConciliateShort=Aby się pogodzić
 Conciliable=Może być rekoncyliowane
 Conciliate=Uzgodnienie sald
 Conciliation=Rekoncyliacja
-SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
+SaveStatementOnly=Zapisz tylko wyciąg
+ReconciliationLate=Pojednanie późno
 IncludeClosedAccount=Dołącz zamknięte rachunki
 OnlyOpenedAccount=Tylko otwarte konta
 AccountToCredit=Konto do kredytów
 AccountToDebit=Konto do obciążania
 DisableConciliation=Wyłącz funkcję rekoncyliacji dla tego konta
 ConciliationDisabled=Funkcja rekoncyliacji wyłączona
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
+LinkedToAConciliatedTransaction=Powiązane z pojednawczym wpisem
 StatusAccountOpened=Otwarte
 StatusAccountClosed=Zamknięte
 AccountIdShort=Liczba
 LineRecord=Transakcja
 AddBankRecord=Dodaj wpis
 AddBankRecordLong=Dodaj wpis ręcznie
-Conciliated=Reconciled
+Conciliated=Pojednany
 ConciliatedBy=Rekoncyliowany przez
 DateConciliating=Data rekoncyliacji
-BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+BankLineConciliated=Wpis uzgodniony z paragonem bankowym
+Reconciled=Pojednany
+NotReconciled=Nie pogodzono się
 CustomerInvoicePayment=Płatności klienta
 SupplierInvoicePayment=Płatność dostawcy
 SubscriptionPayment=Zaplanowana płatność
-WithdrawalPayment=Debit payment order
+WithdrawalPayment=Polecenie zapłaty
 SocialContributionPayment=Płatność za ZUS/podatek
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Transfer kredytowy
+BankTransfers=Polecenia przelewu
 MenuBankInternalTransfer=Przelew wewnętrzny
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Przelew z jednego konta na drugie, Dolibarr zapisze dwa rekordy (obciążenie na koncie źródłowym i kredyt na koncie docelowym). Ta sama kwota (oprócz znaku), etykieta i data zostaną użyte dla tej transakcji)
 TransferFrom=Od
 TransferTo=Do
 TransferFromToDone=Transfer z <b>%s</b> do <b>%s</b> <b>%s</b> %s został zapisany.
 CheckTransmitter=Nadawca
-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=Potwierdzić potwierdzenie tego czeku?
+ConfirmValidateCheckReceipt=Czy na pewno chcesz potwierdzić to pokwitowanie czeku? Gdy to zrobisz, żadna zmiana nie będzie możliwa?
+DeleteCheckReceipt=Usunąć to pokwitowanie czeku?
+ConfirmDeleteCheckReceipt=Czy na pewno chcesz usunąć to pokwitowanie czeku?
 BankChecks=Czeki bankowe
-BankChecksToReceipt=Checks awaiting deposit
-BankChecksToReceiptShort=Checks awaiting deposit
+BankChecksToReceipt=Czeki oczekujące na wpłatę
+BankChecksToReceiptShort=Czeki oczekujące na wpłatę
 ShowCheckReceipt=Pokaż sprawdzić otrzymania wpłaty
-NumberOfCheques=No. of check
+NumberOfCheques=Liczba czeków
 DeleteTransaction=Usuń wpis
 ConfirmDeleteTransaction=Czy jesteś pewien, że chcesz usunąć te wpis?
 ThisWillAlsoDeleteBankRecord=To usunie wygenerowany wpis bankowy
@@ -138,11 +138,11 @@ PaymentDateUpdateSucceeded=Data płatności została zaktualizowana pomyślnie
 PaymentDateUpdateFailed=Data płatności nie mogła zostać zaktualizowana
 Transactions=Transakcje
 BankTransactionLine=Wpis bankowy
-AllAccounts=All bank and cash accounts
+AllAccounts=Wszystkie rachunki bankowe i gotówkowe
 BackToAccount=Powrót do konta
 ShowAllAccounts=Pokaż wszystkie konta
-FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+FutureTransaction=Przyszła transakcja. Nie można się pogodzić.
+SelectChequeTransactionAndGenerate=Wybierz / filtruj czeki, które mają zostać uwzględnione w potwierdzeniu wpłaty czeku, i kliknij „Utwórz”.
 InputReceiptNumber=Wybierz wyciąg bankowy związany z postępowania pojednawczego. Użyj schematu: RRRRMM lub RRRRMMDD
 EventualyAddCategory=Ostatecznie, określić kategorię, w której sklasyfikować rekordy
 ToConciliate=Do zaksięgowania?
@@ -157,27 +157,28 @@ RejectCheck=Czek zwrócony
 ConfirmRejectCheck=Czy jesteś pewien, ze chcesz oznaczyć ten czek jako odrzucony?
 RejectCheckDate=Data wrócił kontrola
 CheckRejected=Czek zwrócony
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+CheckRejectedAndInvoicesReopened=Czek zwrócony i faktury ponownie otwarte
 BankAccountModelModule=Szablony dokumentu dla kont bankowych
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
+DocumentModelSepaMandate=Wzór upoważnienia SEPA. Przydatne tylko w krajach europejskich w EWG.
+DocumentModelBan=Szablon do wydrukowania strony z informacjami BAN.
+NewVariousPayment=Nowa płatność różna
+VariousPayment=Różne płatności
 VariousPayments=Różne płatności
-ShowVariousPayment=Show miscellaneous payment
-AddVariousPayment=Add miscellaneous payment
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
-SEPAMandate=SEPA mandate
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash desk control
-NewCashFence=New cash desk closing
-BankColorizeMovement=Colorize movements
-BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
-BankColorizeMovementName1=Background color for debit movement
-BankColorizeMovementName2=Background color for credit movement
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
+ShowVariousPayment=Pokaż różne płatności
+AddVariousPayment=Dodaj inną płatność
+VariousPaymentId=Różne identyfikatory płatności
+VariousPaymentLabel=Różne etykiety płatności
+ConfirmCloneVariousPayment=Potwierdź klon płatności różnej
+SEPAMandate=Mandat SEPA
+YourSEPAMandate=Twój mandat SEPA
+FindYourSEPAMandate=To jest Twoje upoważnienie SEPA do upoważnienia naszej firmy do złożenia polecenia zapłaty w Twoim banku. Zwróć podpisany (skan podpisanego dokumentu) lub wyślij pocztą na adres
+AutoReportLastAccountStatement=Automatycznie wypełnij pole „numer wyciągu bankowego” numerem ostatniego wyciągu podczas rozliczenia
+CashControl=Kontrola kas kasowych POS
+NewCashFence=Otwarcie lub zamknięcie nowej kasy
+BankColorizeMovement=Koloruj ruchy
+BankColorizeMovementDesc=Jeśli ta funkcja jest włączona, możesz wybrać określony kolor tła dla ruchów debetowych lub kredytowych
+BankColorizeMovementName1=Kolor tła dla przelewu debetowego
+BankColorizeMovementName2=Kolor tła dla przesunięcia kredytu
+IfYouDontReconcileDisableProperty=Jeśli nie dokonasz uzgodnień bankowych na niektórych kontach bankowych, wyłącz na nich właściwość „%s”, aby usunąć to ostrzeżenie.
+NoBankAccountDefined=Nie zdefiniowano konta bankowego
+NoRecordFoundIBankcAccount=Nie znaleziono rekordu na koncie bankowym. Często dzieje się tak, gdy rekord został ręcznie usunięty z listy transakcji na rachunku bankowym (na przykład podczas uzgadniania rachunku bankowego). Innym powodem jest to, że płatność została zarejestrowana, gdy moduł „%s” był wyłączony.
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index ee3d2dbb180..9bd60005f52 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -6,13 +6,13 @@ BillsCustomer=Faktura klienta
 BillsSuppliers=Faktury dostawcy
 BillsCustomersUnpaid=Niezapłacone faktury klienta
 BillsCustomersUnpaidForCompany=Niezapłacone faktury klienta dla %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsSuppliersUnpaid=Niezapłacone faktury od dostawcy
+BillsSuppliersUnpaidForCompany=Niezapłacone faktury od dostawców za %s
 BillsLate=Opóźnienia w płatnościach
 BillsStatistics=Statystyki faktur klientów
-BillsStatisticsSuppliers=Vendors invoices statistics
+BillsStatisticsSuppliers=Statystyki faktur dostawców
 DisabledBecauseDispatchedInBookkeeping=Wyłączone, ponieważ faktura została wysłana do księgowości
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotLastInvoice=Wyłączone, ponieważ faktury nie można usunąć. Niektóre faktury zostały zarejestrowane po tej jednej i spowoduje to powstanie dziur w ladzie.
 DisabledBecauseNotErasable=Wyłączone, ponieważ nie można go usunąć
 InvoiceStandard=Standardowa faktura
 InvoiceStandardAsk=Standardowa faktura
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Proforma faktury
 InvoiceProFormaDesc=<b>Faktura proforma</b> jest obrazem prawdziwej faktury, ale nie ma jeszcze wartości księgowych.
 InvoiceReplacement=Duplikat faktury
 InvoiceReplacementAsk=Duplikat faktury do faktury
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc= <b> Faktura zastępcza </b> służy do całkowitego zastąpienia faktury bez otrzymanej płatności. <br> <br> Uwaga: Tylko faktury bez płatności można wymienić. Jeśli zastępowana faktura nie jest jeszcze zamknięta, zostanie automatycznie zamknięta jako „porzucona”.
 InvoiceAvoir=Nota kredytowa
 InvoiceAvoirAsk=Edytuj notatkę do skorygowania faktury
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+InvoiceAvoirDesc=Nota kredytowa <b> </b> to faktura ujemna służąca do skorygowania faktu, że faktura zawiera kwotę różniącą się od kwoty faktycznie zapłaconej (np. Klient zapłacił za dużo przez pomyłkę lub nie zapłaci pełnej kwoty, ponieważ niektóre produkty zostały zwrócone) .
 invoiceAvoirWithLines=Tworzenie kredytowa Uwaga liniami z faktury pochodzenia
 invoiceAvoirWithPaymentRestAmount=Tworzenie kredytowa z nieopłacone Uwaga faktury pochodzenia
 invoiceAvoirLineWithPaymentRestAmount=Nota kredytowa na kwotę pozostałą nieodpłatną
@@ -41,9 +41,9 @@ CorrectionInvoice=Korekta faktury
 UsedByInvoice=Służy do zapłaty faktury %s
 ConsumedBy=Zużyto przez
 NotConsumed=Nie zużyto
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=Brak wymiennych faktur
 NoInvoiceToCorrect=Brak faktury do skorygowania
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=Było źródłem jednej lub kilku not kredytowych
 CardBill=Karta faktury
 PredefinedInvoices=Predefiniowane Faktury
 Invoice=Faktura
@@ -52,50 +52,53 @@ Invoices=Faktury
 InvoiceLine=Pole faktury
 InvoiceCustomer=Faktura klienta
 CustomerInvoice=Faktura klienta
-CustomersInvoices=Faktury Klientów
+CustomersInvoices=Faktury klienta
 SupplierInvoice=Faktura dostawcy
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Faktury dostawcy
+SupplierInvoiceLines=Wiersze faktury dostawcy
 SupplierBill=Faktura dostawcy
-SupplierBills=Faktury Dostawców
+SupplierBills=Faktury dostawcy
 Payment=Płatność
 PaymentBack=Zwrot
 CustomerInvoicePaymentBack=Zwrot
 Payments=Płatności
-PaymentsBack=Refunds
-paymentInInvoiceCurrency=in invoices currency
+PaymentsBack=Zwroty kosztów
+paymentInInvoiceCurrency=w walucie faktur
 PaidBack=Spłacona
 DeletePayment=Usuń płatności
 ConfirmDeletePayment=Czy jesteś pewien, że chcesz usunąć tą płatność?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
-SupplierPayments=Vendor payments
+ConfirmConvertToReduc=Czy chcesz zamienić ten %s na dostępny kredyt?
+ConfirmConvertToReduc2=Kwota zostanie zapisana wśród wszystkich rabatów i może zostać wykorzystana jako rabat dla bieżącej lub przyszłej faktury dla tego klienta.
+ConfirmConvertToReducSupplier=Czy chcesz zamienić ten %s na dostępny kredyt?
+ConfirmConvertToReducSupplier2=Kwota zostanie zapisana wśród wszystkich rabatów i może zostać wykorzystana jako rabat dla bieżącej lub przyszłej faktury dla tego dostawcy.
+SupplierPayments=Płatności dostawcy
 ReceivedPayments=Otrzymane płatności
 ReceivedCustomersPayments=Zaliczki otrzymane od klientów
-PayedSuppliersPayments=Payments paid to vendors
+PayedSuppliersPayments=Płatności na rzecz dostawców
 ReceivedCustomersPaymentsToValid=Odebrane płatności klientów do potwierdzenia
 PaymentsReportsForYear=Raporty płatności dla %s
 PaymentsReports=Raporty płatności
 PaymentsAlreadyDone=Płatności już wykonane
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=Zwroty już dokonane
 PaymentRule=Zasady płatności
-PaymentMode=Payment Type
+PaymentMode=Typ płatności
+DefaultPaymentMode=Domyślny typ płatności
+DefaultBankAccount=Domyślne konto bankowe
 PaymentTypeDC=Karta debetowa/kredytowa
 PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+IdPaymentMode=Typ płatności (identyfikator)
+CodePaymentMode=Rodzaj płatności (kod)
+LabelPaymentMode=Typ płatności (etykieta)
+PaymentModeShort=Typ płatności
+PaymentTerm=Termin płatności
+PaymentConditions=Zasady płatności
+PaymentConditionsShort=Zasady płatności
 PaymentAmount=Kwota płatności
 PaymentHigherThanReminderToPay=Płatności wyższe niż upomnienie do zapłaty
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Uwaga, kwota płatności jednego lub więcej rachunków jest wyższa niż kwota pozostająca do spłaty. <br> Edytuj swój wpis, w przeciwnym razie potwierdź i rozważ utworzenie noty kredytowej na nadwyżkę otrzymaną za każdą nadpłaconą fakturę.
+HelpPaymentHigherThanReminderToPaySupplier=Uwaga, kwota płatności jednego lub więcej rachunków jest wyższa niż kwota pozostająca do spłaty. <br> Edytuj swój wpis, w przeciwnym razie potwierdź i rozważ utworzenie noty kredytowej na nadwyżkę zapłaconą za każdą nadpłaconą fakturę.
 ClassifyPaid=Klasyfikacja "wpłacono"
-ClassifyUnPaid=Classify 'Unpaid'
+ClassifyUnPaid=Sklasyfikuj jako „niezapłacone”
 ClassifyPaidPartially=Klasyfikacja "wpłacono częściowo"
 ClassifyCanceled=Klasyfikacja "Porzucono"
 ClassifyClosed=Klasyfikacja "zamknięte"
@@ -106,14 +109,14 @@ AddBill=Tworzenie faktury lub noty kredytowej
 AddToDraftInvoices=Dodaj do szkicu faktury
 DeleteBill=Usuń fakturę
 SearchACustomerInvoice=Szukaj faktury klienta
-SearchASupplierInvoice=Search for a vendor invoice
+SearchASupplierInvoice=Wyszukaj fakturę od dostawcy
 CancelBill=Anulowanie faktury
 SendRemindByMail=Wyślij przypomnienie pocztą e-mail
 DoPayment=Wprowadź płatność
 DoPaymentBack=Wprowadź zwrot
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+ConvertToReduc=Oznacz jako dostępny kredyt
+ConvertExcessReceivedToReduc=Zamień otrzymane nadwyżki na dostępny kredyt
+ConvertExcessPaidToReduc=Zamień zapłaconą nadwyżkę na dostępny rabat
 EnterPaymentReceivedFromCustomer=Wprowadź płatność otrzymaną od klienta
 EnterPaymentDueToCustomer=Dokonaj płatności dla klienta
 DisabledBecauseRemainderToPayIsZero=Nieaktywne, ponieważ upływająca nieopłacona kwota wynosi zero
@@ -122,60 +125,60 @@ BillStatus=Status faktury
 StatusOfGeneratedInvoices=Status generowanych faktur
 BillStatusDraft=Projekt (musi zostać zatwierdzone)
 BillStatusPaid=Płatność
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=Zwrot noty kredytowej lub oznaczony jako dostępny kredyt
+BillStatusConverted=Zapłacone (gotowe do spożycia na fakturze końcowej)
 BillStatusCanceled=Opuszczony
 BillStatusValidated=Zatwierdzona (trzeba zapłacić)
 BillStatusStarted=Rozpoczęcie
 BillStatusNotPaid=Brak zapłaty
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=Nie podlega zwrotowi
 BillStatusClosedUnpaid=Zamknięte (nie zapłacone)
 BillStatusClosedPaidPartially=Opłacone (częściowo)
 BillShortStatusDraft=Szkic
 BillShortStatusPaid=Płatność
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
+BillShortStatusPaidBackOrConverted=Zwrócone lub zamienione
+Refunded=Zwrócono koszty
 BillShortStatusConverted=Płatność
 BillShortStatusCanceled=Opuszczone
 BillShortStatusValidated=Zatwierdzone
 BillShortStatusStarted=Rozpoczęcie
 BillShortStatusNotPaid=Brak wpłaty
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=Nie podlega zwrotowi
 BillShortStatusClosedUnpaid=Zamknięte
 BillShortStatusClosedPaidPartially=Opłacono (częściowo)
 PaymentStatusToValidShort=Do potwierdzenia
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
+ErrorVATIntraNotConfigured=Wewnątrzwspólnotowy numer VAT nie został jeszcze zdefiniowany
+ErrorNoPaiementModeConfigured=Nie zdefiniowano domyślnego typu płatności. Przejdź do konfiguracji modułu faktur, aby to naprawić.
+ErrorCreateBankAccount=Utwórz konto bankowe, a następnie przejdź do panelu Konfiguracja modułu Faktury, aby zdefiniować typy płatności
 ErrorBillNotFound=Faktura %s nie istnieje
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Błąd, próbowałeś zweryfikować fakturę w celu zastąpienia faktury %s. Ale ten został już zastąpiony fakturą %s.
 ErrorDiscountAlreadyUsed=Błąd, zniżka już używana
 ErrorInvoiceAvoirMustBeNegative=Błąd, korekty faktury muszą mieć negatywny kwotę
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorInvoiceOfThisTypeMustBePositive=Błąd, ten typ faktury musi mieć kwotę bez podatku dodatnią (lub zerową)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Błąd, nie można anulować faktury, która została zastąpiona przez inną fakturę, będącą ciągle w stanie projektu.
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Ta lub inna część jest już używana, więc serii rabatów nie można usunąć.
 BillFrom=Od
 BillTo=Do
 ActionsOnBill=Działania na fakturze
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+RecurringInvoiceTemplate=Szablon / Faktura cykliczna
+NoQualifiedRecurringInvoiceTemplateFound=Brak cyklicznej faktury szablonowej kwalifikującej się do wygenerowania.
+FoundXQualifiedRecurringInvoiceTemplate=Znaleziono %s cyklicznych faktur szablonowych kwalifikujących się do wygenerowania.
+NotARecurringInvoiceTemplate=To nie jest cykliczna faktura szablonowa
 NewBill=Nowa faktura
 LastBills=Ostatnie %s faktur
 LatestTemplateInvoices=Ostatnie %sszablonów faktur
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LatestCustomerTemplateInvoices=Najnowsze faktury klienta %s
+LatestSupplierTemplateInvoices=Najnowsze faktury z szablonu dostawcy %s
 LastCustomersBills=Ostatnie %s faktur klienta
-LastSuppliersBills=Latest %s vendor invoices
+LastSuppliersBills=Najnowsze faktury od dostawcy %s
 AllBills=Wszystkie faktury
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=Wszystkie faktury szablonowe
 OtherBills=Inne faktury
 DraftBills=Projekt faktur
 CustomersDraftInvoices=Szkic faktur klienta
-SuppliersDraftInvoices=Vendor draft invoices
+SuppliersDraftInvoices=Sprzedający projekty faktur
 Unpaid=Należne wpłaty
-ErrorNoPaymentDefined=Error No payment defined
+ErrorNoPaymentDefined=Błąd Nie zdefiniowano płatności
 ConfirmDeleteBill=Czy jesteś pewien, że chcesz usunąć tą fakturę?
 ConfirmValidateBill=Czy jesteś pewien, że chcesz zatwierdzić tą fakturę z numerem <b>%s</b>?
 ConfirmUnvalidateBill=Czy jesteś pewien, że chcesz przenieść fakturę <b>%s</b> do statusu szkicu?
@@ -183,20 +186,20 @@ ConfirmClassifyPaidBill=Czy jesteś pewien, że chcesz zmienić status faktury <
 ConfirmCancelBill=Czy jesteś pewien, że chcesz anulować fakturę <b>%s</b>?
 ConfirmCancelBillQuestion=Dlaczego chcesz sklasyfikować tę fakturę jako „porzuconą”?
 ConfirmClassifyPaidPartially=Czy jesteś pewien, że chcesz zmienić status faktury <b>%s</b> na zapłaconą?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyQuestion=Ta faktura nie została całkowicie opłacona. Jaki jest powód zamknięcia tej faktury?
+ConfirmClassifyPaidPartiallyReasonAvoir=Pozostałe niezapłacone <b> (%s %s) </b> to rabat przyznany, ponieważ płatność została dokonana przed terminem. Reguluję podatek VAT notą kredytową.
+ConfirmClassifyPaidPartiallyReasonDiscount=Pozostałe niezapłacone <b> (%s %s) </b> to rabat przyznany, ponieważ płatność została dokonana przed terminem.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Upływające nieopłacone <b>(%s %s)</b> jest przyznana zniżka, ponieważ płatność została dokonana przed terminem. Akceptuję stracić VAT na tej zniżce.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Upływające nieopłacone <b>(% s% s)</b> mają przyznaną zniżkę, ponieważ płatność została dokonana przed terminem. Odzyskano VAT od tej zniżki bez noty kredytowej.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Zły klient
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty częściowo zwrócone
 ConfirmClassifyPaidPartiallyReasonOther=Kwota porzucona z innej przyczyny
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Taki wybór jest możliwy, jeśli do faktury zostały dołączone odpowiednie uwagi. (Przykład «Tylko podatek odpowiadający faktycznie zapłaconej cenie daje prawo do odliczenia»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=W niektórych krajach ten wybór może być możliwy tylko wtedy, gdy faktura zawiera prawidłowe uwagi.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Użyj tego wyboru, jeśli wszystkie inne nie odpowiadają
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> zły klient </b> to klient, który odmawia spłaty swojego długu.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ten wybór jest używany, gdy płatność nie jest kompletna, ponieważ niektóre produkty zostały zwrócone
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Skorzystaj z tego wyboru, jeśli wszystkie inne nie są odpowiednie, na przykład w następującej sytuacji: <br> - płatność nie została zakończona, ponieważ niektóre produkty zostały odesłane <br> - zgłoszona kwota jest zbyt ważna, ponieważ zapomniano o rabacie <br> We wszystkich przypadkach kwota nadpłacona musi zostać poprawiona w systemie księgowym poprzez utworzenie noty kredytowej.
 ConfirmClassifyAbandonReasonOther=Inny
 ConfirmClassifyAbandonReasonOtherDesc=Wybór ten będzie używany we wszystkich innych przypadkach. Na przykład wówczas. gdy planujesz utworzyć fakturę zastępującą.
 ConfirmCustomerPayment=Potwierdzasz wprowadzenie płatności dla <b>%s</b> %s?
@@ -204,39 +207,39 @@ ConfirmSupplierPayment=Potwierdzasz wprowadzenie płatności dla <b>%s</b> %s?
 ConfirmValidatePayment=Czy jesteś pewny, że chcesz zatwierdzić tą płatność? Nie będzie można wprowadzić zmian po zatwierdzeniu płatności.
 ValidateBill=Zatwierdź fakturę
 UnvalidateBill=Niepotwierdzona faktura
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
+NumberOfBills=Liczba faktur
+NumberOfBillsByMonth=Liczba faktur miesięcznie
 AmountOfBills=Kwota faktury
-AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsHT=Kwota faktur (bez podatku)
 AmountOfBillsByMonthHT=Kwota faktur przez miesiąc (netto)
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+UseSituationInvoices=Zezwól na fakturę sytuacyjną
+UseSituationInvoicesCreditNote=Zezwalaj na fakturę faktury korygującej sytuację
+Retainedwarranty=Zachowana gwarancja
+AllowedInvoiceForRetainedWarranty=Zachowana gwarancja, którą można wykorzystać na następujących rodzajach faktur
+RetainedwarrantyDefaultPercent=Zachowany domyślny procent gwarancji
+RetainedwarrantyOnlyForSituation=Udostępnij „gwarancję zatrzymaną” tylko dla faktur sytuacyjnych
+RetainedwarrantyOnlyForSituationFinal=W przypadku faktur sytuacyjnych globalne potrącenie z tytułu „zatrzymanej gwarancji” ma zastosowanie tylko do sytuacji końcowej
+ToPayOn=Aby zapłacić na %s
+toPayOn=zapłacić na %s
+RetainedWarranty=Zachowana gwarancja
+PaymentConditionsShortRetainedWarranty=Zachowane warunki płatności gwarancyjnych
+DefaultPaymentConditionsRetainedWarranty=Domyślne zachowane warunki płatności gwarancyjnej
+setPaymentConditionsShortRetainedWarranty=Ustaw zachowane warunki płatności gwarancyjnej
+setretainedwarranty=Ustaw zachowaną gwarancję
+setretainedwarrantyDateLimit=Ustaw zachowany limit daty gwarancji
+RetainedWarrantyDateLimit=Zachowany termin gwarancji
+RetainedWarrantyNeed100Percent=Faktura sytuacyjna musi mieć stan postępu 100%%, aby była wyświetlana w formacie PDF
 AlreadyPaid=Zapłacono
 AlreadyPaidBack=Zwrócono
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+AlreadyPaidNoCreditNotesNoDeposits=Już zapłacone (bez not kredytowych i zaliczek)
 Abandoned=Porzucone
 RemainderToPay=Nieopłacone
 RemainderToTake=Pozostała kwota do podjęcia
-RemainderToPayBack=Remaining amount to refund
+RemainderToPayBack=Pozostała kwota do zwrotu
 Rest=W oczekiwaniu
 AmountExpected=Kwota twierdził
 ExcessReceived=Nadmiar otrzymany
-ExcessPaid=Excess paid
+ExcessPaid=Nadwyżka zapłacona
 EscompteOffered=Rabat oferowane (płatność przed kadencji)
 EscompteOfferedShort=Rabat
 SendBillRef=Złożenie faktury% s
@@ -250,21 +253,21 @@ RemainderToBill=Pozostająca do rachunku
 SendBillByMail=Wyślij fakturę pocztą e-mail
 SendReminderBillByMail=Wyślij przypomnienie pocztą e-mail
 RelatedCommercialProposals=Podobne oferty handlowe
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedRecurringCustomerInvoices=Powiązane powtarzające się faktury klientów
 MenuToValid=Do ważnych
-DateMaxPayment=Payment due on
+DateMaxPayment=Termin płatności:
 DateInvoice=Daty wystawienia faktury
-DatePointOfTax=Point of tax
+DatePointOfTax=Punkt podatkowy
 NoInvoice=Nr faktury
 ClassifyBill=Klasyfikacja faktury
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=Niezapłacone faktury od dostawcy
 CustomerBillsUnpaid=Niezapłacone faktury klienta
 NonPercuRecuperable=Niepodlegające zwrotowi
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
-SetRevenuStamp=Set revenue stamp
+SetConditions=Ustaw warunki płatności
+SetMode=Ustaw typ płatności
+SetRevenuStamp=Ustaw znaczek skarbowy
 Billed=Billed
-RecurringInvoices=Recurring invoices
+RecurringInvoices=Faktury cykliczne
 RepeatableInvoice=Szablon faktury
 RepeatableInvoices=Szablon faktur
 Repeatable=Szablon
@@ -272,15 +275,15 @@ Repeatables=Szablony
 ChangeIntoRepeatableInvoice=Konwersja do szablonu faktury
 CreateRepeatableInvoice=Tworzenie szablonu faktury
 CreateFromRepeatableInvoice=Utwórz z szablonu faktury
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndInvoiceLines=Faktury dla klientów i dane do faktur
 CustomersInvoicesAndPayments=Faktury i płatności klienta
-ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_1=Faktury dla klientów i dane do faktur
 ExportDataset_invoice_2=Faktury i płatności klienta
 ProformaBill=Proforma Bill:
 Reduction=Rabat
-ReductionShort=Disc.
+ReductionShort=Dysk.
 Reductions=Rabaty
-ReductionsShort=Disc.
+ReductionsShort=Dysk.
 Discounts=Zniżki
 AddDiscount=Stwórz zniżkę
 AddRelativeDiscount=Utwórz powiązaną zniżkę
@@ -289,113 +292,114 @@ AddGlobalDiscount=Dodaj zniżki
 EditGlobalDiscounts=Edytuj bezwzględne zniżki
 AddCreditNote=Tworzenie noty kredytowej
 ShowDiscount=Pokaż zniżki
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
+ShowReduc=Pokaż zniżkę
+ShowSourceInvoice=Pokaż fakturę źródłową
 RelativeDiscount=Powiązana zniżka
 GlobalDiscount=Globalne zniżki
 CreditNote=Nota kredytowa
 CreditNotes=Noty kredytowe
-CreditNotesOrExcessReceived=Credit notes or excess received
+CreditNotesOrExcessReceived=Otrzymane noty kredytowe lub nadwyżka
 Deposit=Zaliczka
 Deposits=Zaliczki
 DiscountFromCreditNote=Rabat od kredytu pamiętać %s
 DiscountFromDeposit=Zaliczki z faktury %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromExcessReceived=Płatności przekraczające fakturę %s
+DiscountFromExcessPaid=Płatności przekraczające fakturę %s
 AbsoluteDiscountUse=Tego rodzaju kredyt może być użyta na fakturze przed jej zatwierdzeniem
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+CreditNoteDepositUse=Faktura musi zostać zweryfikowana, aby móc korzystać z tego rodzaju kredytów
 NewGlobalDiscount=Nowe zniżki
 NewRelativeDiscount=Nowa powiązana zniżka
-DiscountType=Discount type
+DiscountType=Rodzaj rabatu
 NoteReason=Uwaga/Powód
 ReasonDiscount=Powód
 DiscountOfferedBy=Przyznane przez
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
+DiscountStillRemaining=Dostępne rabaty lub kredyty
+DiscountAlreadyCounted=Zniżki lub kredyty już wykorzystane
+CustomerDiscounts=Rabaty dla klientów
+SupplierDiscounts=Sprzedawcy rabaty
 BillAddress=Bill adres
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+HelpEscompte=Rabat ten jest rabatem udzielonym klientowi, ponieważ płatność została dokonana przed terminem.
+HelpAbandonBadCustomer=Ta kwota została porzucona (klient powiedział, że jest złym klientem) i jest uważana za wyjątkową stratę.
+HelpAbandonOther=Ta kwota została porzucona, ponieważ był to błąd (na przykład zły klient lub faktura zastąpiona inną)
 IdSocialContribution=ID płatności składki ZUS/podatku
 PaymentId=ID Płatności
-PaymentRef=Payment ref.
+PaymentRef=Ref. Płatności
 InvoiceId=ID Faktury
 InvoiceRef=Nr referencyjny faktury
 InvoiceDateCreation=Data utworzenia faktury
 InvoiceStatus=Status faktury
 InvoiceNote=Notatka do faktury
 InvoicePaid=Faktura zapłacona
-InvoicePaidCompletely=Paid completely
-InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
-OrderBilled=Order billed
-DonationPaid=Donation paid
+InvoicePaidCompletely=Całkowicie opłacony
+InvoicePaidCompletelyHelp=Faktura opłacona w całości. Nie obejmuje to faktur, które są opłacone częściowo. Aby uzyskać listę wszystkich faktur „zamkniętych” lub „niezamkniętych”, użyj filtru statusu faktury.
+OrderBilled=Zamówienie zafakturowane
+DonationPaid=Wpłacono darowiznę
 PaymentNumber=Numer płatności
 RemoveDiscount=Usuń zniżki
 WatermarkOnDraftBill=Znak wodny na szkicu faktury (brak jeżeli pusty)
 InvoiceNotChecked=Nie wybrano faktury
 ConfirmCloneInvoice=Czy jesteś pewien, że chcesz powielić tą fakturę <b>%s</b>?
 DisabledBecauseReplacedInvoice=Działania wyłączone, ponieważ na fakturze została zastąpiona
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
-NbOfPayments=No. of payments
+DescTaxAndDividendsArea=W tym obszarze prezentowane jest podsumowanie wszystkich płatności dokonanych na wydatki specjalne. Uwzględniono tutaj tylko rekordy z płatnościami w ciągu ustalonego roku.
+NbOfPayments=Liczba płatności
 SplitDiscount=Split zniżki w dwóch
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+ConfirmSplitDiscount=Czy na pewno chcesz podzielić ten rabat <b> %s </b> %s na dwa mniejsze rabaty?
+TypeAmountOfEachNewDiscount=Kwota wejściowa dla każdej z dwóch części:
+TotalOfTwoDiscountMustEqualsOriginal=Suma dwóch nowych rabatów musi być równa pierwotnej kwocie rabatu.
 ConfirmRemoveDiscount=Czy jesteś pewien, że chcesz usunąć tą zniżkę?
 RelatedBill=Powiązana faktura
 RelatedBills=Powiązane faktury
 RelatedCustomerInvoices=Powiązane z: faktury klienta
-RelatedSupplierInvoices=Related vendor invoices
+RelatedSupplierInvoices=Powiązane faktury od dostawców
 LatestRelatedBill=Ostatnie powiązane faktury
-WarningBillExist=Warning, one or more invoices already exist
+WarningBillExist=Ostrzeżenie, istnieje już co najmniej jedna faktura
 MergingPDFTool=Narzędzie do dzielenia PDF
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
+AmountPaymentDistributedOnInvoice=Kwota płatności rozłożona na fakturze
+PaymentOnDifferentThirdBills=Zezwalaj na płatności na różnych rachunkach stron trzecich, ale tej samej firmie macierzystej
+PaymentNote=Nota płatnicza
+ListOfPreviousSituationInvoices=Lista faktur z poprzedniej sytuacji
+ListOfNextSituationInvoices=Lista faktur za następną sytuację
+ListOfSituationInvoices=Lista faktur sytuacyjnych
+CurrentSituationTotal=Całkowita aktualna sytuacja
+DisabledBecauseNotEnouthCreditNote=Aby usunąć fakturę sytuacyjną z cyklu, suma faktury korygującej musi obejmować sumę tej faktury
+RemoveSituationFromCycle=Usuń tę fakturę z cyklu
+ConfirmRemoveSituationFromCycle=Usunąć tę fakturę %s z cyklu?
+ConfirmOuting=Potwierdź wyjazd
 FrequencyPer_d=Co %s dni
 FrequencyPer_m=Co %s miesięcy
 FrequencyPer_y=Co %s lat
-FrequencyUnit=Frequency unit
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-GeneratedFromTemplate=Generated from template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+FrequencyUnit=Jednostka częstotliwości
+toolTipFrequency=Przykłady: <br> <b> Zestaw 7, dzień </b>: wystawiaj nową fakturę co 7 dni <br> <b> Zestaw 3, miesiąc </b>: wystaw nową fakturę co 3 dni
+NextDateToExecution=Data następnego wygenerowania faktury
+NextDateToExecutionShort=Data następnego gen.
+DateLastGeneration=Data najnowszej generacji
+DateLastGenerationShort=Data najnowszej gen.
+MaxPeriodNumber=Maks. liczba generowanych faktur
+NbOfGenerationDone=Liczba już wygenerowanych faktur
+NbOfGenerationOfRecordDone=Liczba wygenerowanych już rekordów
+NbOfGenerationDoneShort=Liczba wykonanych generacji
+MaxGenerationReached=Osiągnięto maksymalną liczbę pokoleń
+InvoiceAutoValidate=Automatycznie weryfikuj faktury
+GeneratedFromRecurringInvoice=Wygenerowano z szablonu fakturę cykliczną %s
+DateIsNotEnough=Termin jeszcze nie minął
+InvoiceGeneratedFromTemplate=Faktura %s wygenerowana z cyklicznej faktury szablonowej %s
+GeneratedFromTemplate=Wygenerowano z szablonu faktury %s
+WarningInvoiceDateInFuture=Uwaga, data faktury jest późniejsza niż data bieżąca
+WarningInvoiceDateTooFarInFuture=Uwaga, data faktury jest zbyt odległa od aktualnej daty
 ViewAvailableGlobalDiscounts=Pokaż dostępne zniżki
-GroupPaymentsByModOnReports=Group payments by mode on reports
+GroupPaymentsByModOnReports=Grupuj płatności według trybu na raportach
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=Wymagane przy odbiorze
+PaymentConditionRECEP=Wymagane przy odbiorze
 PaymentConditionShort30D=30 dni
 PaymentCondition30D=30 dni
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=30 dni końca miesiąca
+PaymentCondition30DENDMONTH=W ciągu 30 dni od końca miesiąca
 PaymentConditionShort60D=60 dni
 PaymentCondition60D=60 dni
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=60 dni końca miesiąca
+PaymentCondition60DENDMONTH=W ciągu 60 dni od końca miesiąca
 PaymentConditionShortPT_DELIVERY=Przy dostawie
 PaymentConditionPT_DELIVERY=Przy dostawie
 PaymentConditionShortPT_ORDER=Zamówienie
@@ -404,52 +408,52 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50 %% z góry, 50%% przy dostawie
 PaymentConditionShort10D=10 dni
 PaymentCondition10D=10 dni
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort10DENDMONTH=10 dni końca miesiąca
+PaymentCondition10DENDMONTH=W ciągu 10 dni od końca miesiąca
 PaymentConditionShort14D=14 dni
 PaymentCondition14D=14 dni
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount - 1 line with label '%s'
+PaymentConditionShort14DENDMONTH=14 dni końca miesiąca
+PaymentCondition14DENDMONTH=W ciągu 14 dni od końca miesiąca
+FixAmount=Stała kwota - 1 wiersz z etykietą „%s”
 VarAmount=Zmienna ilość (%% tot.)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountOneLine=Zmienna kwota (%% tot.) - 1 wiersz z etykietą '%s'
+VarAmountAllLines=Kwota zmienna (%% tot.) - wszystkie wiersze od początku
 # PaymentType
 PaymentTypeVIR=Przelew bankowy
 PaymentTypeShortVIR=Przelew bankowy
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
+PaymentTypePRE=Polecenie zapłaty
+PaymentTypeShortPRE=Polecenie zapłaty
 PaymentTypeLIQ=Gotówka
 PaymentTypeShortLIQ=Gotówka
 PaymentTypeCB=Karta kredytowa
 PaymentTypeShortCB=Karta kredytowa
 PaymentTypeCHQ=Czek
 PaymentTypeShortCHQ=Czek
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
-PaymentTypeTRA=Bank draft
+PaymentTypeTIP=WSKAZÓWKA (dokumenty za opłatą)
+PaymentTypeShortTIP=WSKAZÓWKA Płatność
+PaymentTypeVAD=Płatność online
+PaymentTypeShortVAD=Płatność online
+PaymentTypeTRA=Przekaz bankowy
 PaymentTypeShortTRA=Szkic
 PaymentTypeFAC=Współczynnik
 PaymentTypeShortFAC=Współczynnik
 BankDetails=Szczegóły banku
 BankCode=Kod banku
-DeskCode=Branch code
+DeskCode=Kod oddziału
 BankAccountNumber=Numer konta
-BankAccountNumberKey=Checksum
+BankAccountNumberKey=Suma kontrolna
 Residence=Adres
-IBANNumber=IBAN account number
+IBANNumber=Numer konta IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN klienta
+SupplierIBAN=IBAN dostawcy
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
+BICNumber=Kod BIC / SWIFT
 ExtraInfos=Dodatkowe informacje
 RegulatedOn=Regulowane
 ChequeNumber=Czek N
 ChequeOrTransferNumber=Cheque / Transferu N
-ChequeBordereau=Check schedule
+ChequeBordereau=Sprawdź harmonogram
 ChequeMaker=Sprawdź nadajnik / transferu
 ChequeBank=Bank czek
 CheckBank=Sprawdź
@@ -458,120 +462,130 @@ PhoneNumber=Tel
 FullPhoneNumber=Telefon
 TeleFax=Faks
 PrettyLittleSentence=Akceptuję kwotę płatności przez czeki wystawione w imię moje jako członek rachunkowości stowarzyszenia zatwierdzone przez administracji podatkowej.
-IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+IntracommunityVATNumber=Wewnątrzwspólnotowy identyfikator VAT
+PaymentByChequeOrderedTo=Płatności czekiem (w tym podatek) są płatne na adres %s, wyślij na adres
+PaymentByChequeOrderedToShort=Płatności czekiem (z podatkiem) są płatne na konto
 SendTo=wysłane do
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+PaymentByTransferOnThisBankAccount=Płatność przelewem na poniższe konto bankowe
 VATIsNotUsedForInvoice=* Nie dotyczy sztuki VAT-293B z CGI
 LawApplicationPart1=Poprzez stosowanie prawa 80,335 do 12/05/80
 LawApplicationPart2=towary pozostają własnością
-LawApplicationPart3=the seller until full payment of
+LawApplicationPart3=sprzedający do pełnej zapłaty kwoty
 LawApplicationPart4=ich ceny.
 LimitedLiabilityCompanyCapital=SARL z Stolicy
 UseLine=Zastosować
 UseDiscount=Użyj zniżki
 UseCredit=Wykorzystaj kredyt
 UseCreditNoteInInvoicePayment=Zmniejszenie płatności z tego nota kredytowa
-MenuChequeDeposits=Check Deposits
+MenuChequeDeposits=Sprawdź depozyty
 MenuCheques=Czeki
-MenuChequesReceipts=Check receipts
+MenuChequesReceipts=Sprawdź paragony
 NewChequeDeposit=Nowy depozyt
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
+ChequesReceipts=Sprawdź paragony
+ChequesArea=Sprawdź obszar depozytów
+ChequeDeposits=Sprawdź depozyty
 Cheques=Czeki
 DepositId=ID depozytu
 NbCheque=Ilość czeków
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+CreditNoteConvertedIntoDiscount=Ten %s został przekształcony w %s
+UsBillingContactAsIncoiveRecipientIfExist=Jako odbiorcę faktur użyj kontaktu / adresu z typem „osoba kontaktowa ds. Rozliczeń” zamiast adresu strony trzeciej
 ShowUnpaidAll=Pokaż wszystkie niezapłacone faktury
 ShowUnpaidLateOnly=Pokaż późno unpaid fakturze tylko
 PaymentInvoiceRef=Płatność faktury %s
 ValidateInvoice=Zatwierdź fakturę
-ValidateInvoices=Validate invoices
+ValidateInvoices=Zatwierdź faktury
 Cash=Gotówka
 Reported=Opóźniony
 DisabledBecausePayments=Nie możliwe, ponieważ istnieją pewne płatności
 CantRemovePaymentWithOneInvoicePaid=Nie można usunąć płatności, ponieważ istnieje przynajmniej na fakturze sklasyfikowane płatne
+CantRemovePaymentVATPaid=Nie można usunąć płatności, ponieważ deklaracja VAT jest klasyfikowana jako zapłacona
+CantRemovePaymentSalaryPaid=Nie można usunąć płatności, ponieważ wynagrodzenie jest klasyfikowane jako zapłacone
 ExpectedToPay=Oczekuje płatności
-CantRemoveConciliatedPayment=Can't remove reconciled payment
+CantRemoveConciliatedPayment=Nie można usunąć uzgodnionej płatności
 PayedByThisPayment=Wypłacana przez płatność
-ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
-ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
-ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ClosePaidInvoicesAutomatically=Automatycznie klasyfikuj wszystkie faktury standardowe, zaliczkowe lub zastępcze jako „Opłacone”, gdy płatność jest wykonana w całości.
+ClosePaidCreditNotesAutomatically=Gdy zwrot środków zostanie wykonany w całości, automatycznie klasyfikuj wszystkie noty kredytowe jako „Zapłacone”.
+ClosePaidContributionsAutomatically=Automatycznie klasyfikuj wszystkie składki na ubezpieczenie społeczne lub fiskalne jako „opłacone”, gdy płatność została dokonana w całości.
+ClosePaidVATAutomatically=Sklasyfikuj automatycznie deklarację VAT jako „Zapłacono”, gdy płatność została wykonana w całości.
+ClosePaidSalaryAutomatically=Automatycznie klasyfikuj wynagrodzenie jako „Zapłacone”, gdy płatność jest wykonana w całości.
+AllCompletelyPayedInvoiceWillBeClosed=Wszystkie faktury, które nie pozostały do zapłaty, zostaną automatycznie zamknięte ze statusem „Zapłacone”.
 ToMakePayment=Płacić
 ToMakePaymentBack=Spłacać
 ListOfYourUnpaidInvoices=Lista niezapłaconych faktur
 NoteListOfYourUnpaidInvoices=Uwaga: Ta lista zawiera tylko faktury dla osób trzecich jesteś powiązanych jako przedstawiciel sprzedaży.
-RevenueStamp=Tax stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla standardowych faktur i %srrmm-nnnn dla not kredytowych, gdzie rr oznacza rok, mm to miesiąc, a nnnn to kolejny niepowtarzalny numer rozpoczynający się od 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
+RevenueStamp=Pieczęć podatkowa
+YouMustCreateInvoiceFromThird=Ta opcja jest dostępna tylko podczas tworzenia faktury z zakładki „Klient” strony trzeciej
+YouMustCreateInvoiceFromSupplierThird=Ta opcja jest dostępna tylko podczas tworzenia faktury z zakładki „Dostawca” strony trzeciej
+YouMustCreateStandardInvoiceFirstDesc=Najpierw musisz utworzyć standardową fakturę i przekonwertować ją na „szablon”, aby utworzyć nowy szablon faktury
+PDFCrabeDescription=Szablon faktury PDF Crabe. Kompletny szablon faktury (stara implementacja szablonu Sponge)
+PDFSpongeDescription=Szablon faktury PDF Gąbka. Kompletny szablon faktury
+PDFCrevetteDescription=Szablon faktury PDF Crevette. Kompletny szablon faktury dla faktur sytuacyjnych
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Rachunek zaczynające się od $ syymm już istnieje i nie jest kompatybilne z tym modelem sekwencji. Usuń go lub zmienić jego nazwę, aby włączyć ten moduł.
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+EarlyClosingReason=Powód wcześniejszego zamknięcia
+EarlyClosingComment=Uwaga dotycząca wczesnego zamknięcia
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Przedstawiciela w ślad za klienta faktura
 TypeContact_facture_external_BILLING=kontakt faktury klienta
 TypeContact_facture_external_SHIPPING=kontakt koszty klientów
 TypeContact_facture_external_SERVICE=kontakt z działem obsługi klienta
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Reprezentatywna kolejna faktura dostawcy
 TypeContact_invoice_supplier_external_BILLING=Kontakt do faktury sprzedawcy
 TypeContact_invoice_supplier_external_SHIPPING=Kontakt z dostawcą
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_invoice_supplier_external_SERVICE=Kontakt serwisowy dostawcy
 # Situation invoices
 InvoiceFirstSituationAsk=Pierwsza faktura sytuacja
 InvoiceFirstSituationDesc=<b>Faktury sytuacji,</b> są związane z sytuacji związanych z progresją np postęp budowy. Każda sytuacja jest związana z fakturą.
 InvoiceSituation=Sytuacja na fakturze
+PDFInvoiceSituation=Sytuacja na fakturze
 InvoiceSituationAsk=Faktura następujących sytuacji
 InvoiceSituationDesc=Utwórz nową sytuację po już istniejącej
 SituationAmount=Kwota Sytuacja faktury (netto)
 SituationDeduction=Sytuacja odejmowanie
 ModifyAllLines=Modyfikuj wszystkie linie
 CreateNextSituationInvoice=Tworzenie kolejnej sytuacji
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+ErrorFindNextSituationInvoice=Błąd nie można znaleźć następnego cyklu sytuacji ref
+ErrorOutingSituationInvoiceOnUpdate=Nie można wystawić faktury za tę sytuację.
+ErrorOutingSituationInvoiceCreditNote=Nie można wystawić połączonej noty kredytowej.
+NotLastInCycle=Ta faktura nie jest najnowszą z cyklu i nie można jej modyfikować.
 DisabledBecauseNotLastInCycle=Następna sytuacja już istnieje.
 DisabledBecauseFinal=Sytuacja ta jest ostateczna.
-situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_AS=TAK JAK
 situationInvoiceShortcode_S=Ni
 CantBeLessThanMinPercent=Postęp nie może być mniejsza niż wartość w poprzedniej sytuacji.
 NoSituations=Brak otwartych sytuacji
 InvoiceSituationLast=Ostatnia i główna faktura
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationNumber=Sytuacja nr %s
+PDFCrevetteSituationInvoiceLineDecompte=Faktura sytuacyjna - COUNT
 PDFCrevetteSituationInvoiceTitle=Sytuacja na fakturze
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
+PDFCrevetteSituationInvoiceLine=Sytuacja nr %s: Inv. Nr %s na %s
+TotalSituationInvoice=Sytuacja całkowita
+invoiceLineProgressError=Postęp wiersza faktury nie może być większy lub równy następnemu wierszowi faktury
+updatePriceNextInvoiceErrorUpdateline=Błąd: zaktualizuj cenę w wierszu faktury: %s
+ToCreateARecurringInvoice=Aby utworzyć fakturę cykliczną dla tej umowy, najpierw utwórz tę wersję roboczą faktury, a następnie przekształć ją w szablon faktury i zdefiniuj częstotliwość generowania przyszłych faktur.
+ToCreateARecurringInvoiceGene=Aby regularnie i ręcznie generować przyszłe faktury, po prostu przejdź do menu <strong> %s - %s - %s </strong>.
+ToCreateARecurringInvoiceGeneAuto=Jeśli chcesz, aby takie faktury były generowane automatycznie, poproś administratora o włączenie i skonfigurowanie modułu <strong> %s </strong>. Należy pamiętać, że obie metody (ręczna i automatyczna) mogą być używane razem bez ryzyka powielania.
 DeleteRepeatableInvoice=Usuń szablon faktury
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-MaxNumberOfGenerationReached=Max number of gen. reached
+ConfirmDeleteRepeatableInvoice=Czy na pewno chcesz usunąć fakturę z szablonu?
+CreateOneBillByThird=Utwórz jedną fakturę na osobę trzecią (w przeciwnym razie jedna faktura na zamówienie)
+BillCreated=Wygenerowano faktury %s
+BillXCreated=Wygenerowano fakturę %s
+StatusOfGeneratedDocuments=Status generowania dokumentu
+DoNotGenerateDoc=Nie generuj pliku dokumentu
+AutogenerateDoc=Automatycznie generuj plik dokumentu
+AutoFillDateFrom=Ustaw datę rozpoczęcia linii serwisowej z datą faktury
+AutoFillDateFromShort=Ustaw datę rozpoczęcia
+AutoFillDateTo=Ustaw datę zakończenia linii serwisowej z następną datą faktury
+AutoFillDateToShort=Ustaw datę zakończenia
+MaxNumberOfGenerationReached=Maksymalna liczba gen. osiągnął
 BILL_DELETEInDolibarr=Faktura usunięta
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
+BILL_SUPPLIER_DELETEInDolibarr=Faktura dostawcy została usunięta
+UnitPriceXQtyLessDiscount=Cena jednostkowa x ilość - rabat
+CustomersInvoicesArea=Obszar rozliczeniowy klienta
+SupplierInvoicesArea=Obszar rozliczeniowy dostawcy
+FacParentLine=Element nadrzędny linii faktury
+SituationTotalRayToRest=Pozostała kwota do zapłaty bez podatku
+PDFSituationTitle=Sytuacja nr %d
+SituationTotalProgress=Całkowity postęp %d %%
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index 7dd168a0e77..f7873c1874d 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -1,111 +1,120 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLoginInformation=Login Information
-BoxLastRssInfos=RSS Information
-BoxLastProducts=Latest %s Products/Services
+BoxDolibarrStateBoard=Statystyki dotyczące głównych obiektów biznesowych w bazie danych
+BoxLoginInformation=dane logowania
+BoxLastRssInfos=Informacje RSS
+BoxLastProducts=Najnowsze %s Produkty / usługi
 BoxProductsAlertStock=Alarm zapasu dla artykułów
 BoxLastProductsInContract=Ostatnie %s zlecone produkty/usługi
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
+BoxLastSupplierBills=Najnowsze faktury od dostawców
+BoxLastCustomerBills=Najnowsze faktury dla klientów
 BoxOldestUnpaidCustomerBills=Najstarsze niezapłacone faktury klientów
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxOldestUnpaidSupplierBills=Najstarsze niezapłacone faktury od dostawców
 BoxLastProposals=Ostatnie propozycje handlowe
 BoxLastProspects=Ostatnio zmodyfikowane perspektywy
 BoxLastCustomers=Ostatni modyfikowani klienci
 BoxLastSuppliers=Ostatni modyfikowani dostawcy
-BoxLastCustomerOrders=Latest sales orders
+BoxLastCustomerOrders=Najnowsze zamówienia sprzedaży
 BoxLastActions=Ostatnie zdarzenia
 BoxLastContracts=Ostatnie kontrakty
 BoxLastContacts=Ostatnie kontakty/adresy
 BoxLastMembers=Ostatni członkowie
+BoxLastModifiedMembers=Ostatnio zmodyfikowani członkowie
+BoxLastMembersSubscriptions=Najnowsze subskrypcje członków
 BoxFicheInter=Ostatnie interwencje
 BoxCurrentAccounts=Otwórz bilans konta
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMemberNextBirthdays=Urodziny w tym miesiącu (członkowie)
+BoxTitleMembersByType=Członkowie według typu
+BoxTitleMembersSubscriptionsByYear=Subskrypcje członków według roku
 BoxTitleLastRssInfos=Ostatnie %s wiadomości z %s
-BoxTitleLastProducts=Products/Services: last %s modified
-BoxTitleProductsAlertStock=Products: stock alert
+BoxTitleLastProducts=Produkty / usługi: ostatnio zmodyfikowano %s
+BoxTitleProductsAlertStock=Produkty: alert zapasów
 BoxTitleLastSuppliers=Ostani %s zapisani dostawcy
-BoxTitleLastModifiedSuppliers=Vendors: last %s modified
-BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastModifiedSuppliers=Sprzedawcy: ostatnio zmodyfikowano %s
+BoxTitleLastModifiedCustomers=Klienci: ostatnio zmodyfikowano %s
 BoxTitleLastCustomersOrProspects=Ostatnich %s klientów lub potencjalnych klientów
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastCustomerBills=Najnowsze %s zmodyfikowane faktury klienta
+BoxTitleLastSupplierBills=Najnowsze %s zmodyfikowane faktury od dostawcy
+BoxTitleLastModifiedProspects=Perspektywy: ostatnio zmodyfikowano %s
 BoxTitleLastModifiedMembers=Ostatnich %s członków
 BoxTitleLastFicheInter=Ostatnie %s zmodyfikowane interwencje
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
-BoxTitleCurrentAccounts=Open Accounts: balances
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxTitleOldestUnpaidCustomerBills=Faktury odbiorcy: najstarsze %s niezapłacone
+BoxTitleOldestUnpaidSupplierBills=Faktury od dostawców: najstarsze %s niezapłacone
+BoxTitleCurrentAccounts=Otwarte konta: salda
+BoxTitleSupplierOrdersAwaitingReception=Zamówienia dostawców oczekujące na przyjęcie
+BoxTitleLastModifiedContacts=Kontakty / adresy: ostatnio zmodyfikowano %s
+BoxMyLastBookmarks=Zakładki: najnowsze %s
 BoxOldestExpiredServices=Najstarsze aktywne przeterminowane usługi
 BoxLastExpiredServices=Ostanich %s najstarszych kontaktów z aktywnymi upływającymi usługami
 BoxTitleLastActionsToDo=Ostatnich %s zadań do zrobienia
 BoxTitleLastContracts=Ostatnich %s zmodyfikowanych kontaktów
 BoxTitleLastModifiedDonations=Ostatnich %s zmodyfikowanych dotacji
 BoxTitleLastModifiedExpenses=Ostatnich %s zmodyfikowanych raportów kosztów
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
+BoxTitleLatestModifiedBoms=Najnowsze zmodyfikowane zestawienia komponentów %s
+BoxTitleLatestModifiedMos=Najnowsze %s zmodyfikowane zamówienia produkcyjne
+BoxTitleLastOutstandingBillReached=Klienci z maksymalną zaległością przekroczeni
 BoxGlobalActivity=Globalna aktywność (faktury, wnioski, zamówienia)
 BoxGoodCustomers=Dobrzy klienci
 BoxTitleGoodCustomers=%s dobrych klientów
 BoxScheduledJobs=Zaplanowane zadania
-BoxTitleFunnelOfProspection=Lead funnel
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+BoxTitleFunnelOfProspection=Lejek ołowiu
+FailedToRefreshDataInfoNotUpToDate=Nie udało się odświeżyć strumienia RSS. Data ostatniego pomyślnego odświeżenia: %s
 LastRefreshDate=Data ostatniego odświeżenia
 NoRecordedBookmarks=Brak zdefiniowanych zakładek
 ClickToAdd=Kliknij tutaj, aby dodać.
 NoRecordedCustomers=Brak zarejestrowanych klientów
 NoRecordedContacts=Brak zapisanych kontaktów
 NoActionsToDo=Brak działań do wykonania
-NoRecordedOrders=No recorded sales orders
+NoRecordedOrders=Brak zarejestrowanych zamówień sprzedaży
 NoRecordedProposals=Brak zarejestrowanych wniosków
 NoRecordedInvoices=Brak zarejestrowanych faktur klienta
 NoUnpaidCustomerBills=Brak niezapłaconych faktur klientów
-NoUnpaidSupplierBills=No unpaid vendor invoices
-NoModifiedSupplierBills=No recorded vendor invoices
+NoUnpaidSupplierBills=Brak niezapłaconych faktur od dostawców
+NoModifiedSupplierBills=Brak zarejestrowanych faktur od dostawców
 NoRecordedProducts=Brak zarejestrowanych produktów / usług
 NoRecordedProspects=Brak potencjalnyc klientów
 NoContractedProducts=Brak produktów/usług zakontraktowanych
 NoRecordedContracts=Brak zarejestrowanych kontraktów
 NoRecordedInterventions=Brak zapisanych interwencji
-BoxLatestSupplierOrders=Latest purchase orders
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
-NoSupplierOrder=No recorded purchase order
-BoxCustomersInvoicesPerMonth=Customer Invoices per month
-BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
-BoxCustomersOrdersPerMonth=Sales Orders per month
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxLatestSupplierOrders=Najnowsze zamówienia
+BoxLatestSupplierOrdersAwaitingReception=Najnowsze zamówienia (z oczekującym odbiorem)
+NoSupplierOrder=Brak zarejestrowanego zamówienia
+BoxCustomersInvoicesPerMonth=Faktury dla klientów miesięcznie
+BoxSuppliersInvoicesPerMonth=Faktury od dostawców miesięcznie
+BoxCustomersOrdersPerMonth=Zamówienia sprzedaży miesięcznie
+BoxSuppliersOrdersPerMonth=Zamówienia dostawców miesięcznie
 BoxProposalsPerMonth=Ofert na miesiąc
-NoTooLowStockProducts=No products are under the low stock limit
-BoxProductDistribution=Products/Services Distribution
-ForObject=On %s
-BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
-BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
-BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
-BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
+NoTooLowStockProducts=Żadne produkty nie są poniżej niskiego limitu zapasów
+BoxProductDistribution=Dystrybucja produktów / usług
+ForObject=Na %s
+BoxTitleLastModifiedSupplierBills=Faktury od dostawców: ostatnio zmodyfikowano %s
+BoxTitleLatestModifiedSupplierOrders=Zamówienia dostawców: ostatnio zmodyfikowano %s
+BoxTitleLastModifiedCustomerBills=Faktury klienta: ostatnio zmodyfikowano %s
+BoxTitleLastModifiedCustomerOrders=Zamówienia sprzedaży: ostatnio zmodyfikowano %s
 BoxTitleLastModifiedPropals=Ostatnie %s zmodyfikowane oferty
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Najnowsze zmodyfikowane oferty pracy %s
+BoxTitleLatestModifiedCandidatures=Najnowsze zmodyfikowane kandydatury %s
 ForCustomersInvoices=Faktury Klientów
 ForCustomersOrders=Zamówienia klientów
 ForProposals=Oferty
 LastXMonthRolling=Ostatni %s miesiąc
 ChooseBoxToAdd=Dodaj widget do swojej tablicy...
 BoxAdded=Widget został dodany do twojej tablicy
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
-NoRecordedManualEntries=No manual entries record in accountancy
-BoxSuspenseAccount=Count accountancy operation with suspense account
-BoxTitleSuspenseAccount=Number of unallocated lines
-NumberOfLinesInSuspenseAccount=Number of line in suspense account
-SuspenseAccountNotDefined=Suspense account isn't defined
-BoxLastCustomerShipments=Last customer shipments
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=No recorded customer shipment
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxTitleUserBirthdaysOfMonth=Urodziny w tym miesiącu (użytkownicy)
+BoxLastManualEntries=Najnowszy zapis księgowy wprowadzony ręcznie lub bez dokumentu źródłowego
+BoxTitleLastManualEntries=%s ostatni rekord wprowadzony ręcznie lub bez dokumentu źródłowego
+NoRecordedManualEntries=Brak wpisów ręcznych w księgowości
+BoxSuspenseAccount=Policz operacje księgowe z kontem przejściowym
+BoxTitleSuspenseAccount=Liczba nieprzydzielonych linii
+NumberOfLinesInSuspenseAccount=Liczba linii na koncie przejściowym
+SuspenseAccountNotDefined=Konto przejściowe nie jest zdefiniowane
+BoxLastCustomerShipments=Ostatnie przesyłki klientów
+BoxTitleLastCustomerShipments=Najnowsze przesyłki klientów %s
+NoRecordedShipments=Brak zarejestrowanych przesyłek klientów
+BoxCustomersOutstandingBillReached=Osiągnięto imponujący limit klientów
 # Pages
-AccountancyHome=Księgowość
-ValidatedProjects=Validated projects
+UsersHome=Użytkownicy domowi i grupy
+MembersHome=Członkostwo domowe
+ThirdpartiesHome=Strona główna Osoby trzecie
+TicketsHome=Home Bilety
+AccountancyHome=Księgowość domowa
+ValidatedProjects=Zatwierdzone projekty
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index b0372678bc6..61f1d5332cd 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -10,16 +10,16 @@ modify=modyfikować
 Classify=Klasyfikacja
 CategoriesArea=Tagi / obszar Kategorie
 ProductsCategoriesArea=Produkty / Usługi tagi / obszar kategorie
-SuppliersCategoriesArea=Vendors tags/categories area
+SuppliersCategoriesArea=Obszar tagów / kategorii dostawców
 CustomersCategoriesArea=Klienci tagi / obszar kategorie
 MembersCategoriesArea=Użytkownicy tagi / obszar kategorie
 ContactsCategoriesArea=Kontakt tagi / obszar kategorie
-AccountsCategoriesArea=Obsza tagów / kategorii kont
+AccountsCategoriesArea=Obszar tagów / kategorii rachunków bankowych
 ProjectsCategoriesArea=Obszar tagów / kategorii projektów
 UsersCategoriesArea=Obszar znaczników/kategorii użytkowników
 SubCats=Podkategorie
 CatList=Lista tagów / kategorii
-CatListAll=List of tags/categories (all types)
+CatListAll=Lista tagów / kategorii (wszystkie typy)
 NewCategory=Nowy tag / kategoria
 ModifCat=Modyfikuj tag/kategorię
 CatCreated=Tag / kategoria stworzona
@@ -33,7 +33,7 @@ WasAddedSuccessfully=<b> %s</b> został dodany pomyślnie.
 ObjectAlreadyLinkedToCategory=Element jest już powiązany z tym tagiem/kategorią.
 ProductIsInCategories=Produkt/usuługa odnosi się do następujących tagów/kategorii
 CompanyIsInCustomersCategories=Ten kontrahent jest związany z następującymi kleintami/tagami rozwoju/kategoriami
-CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+CompanyIsInSuppliersCategories=Ta strona trzecia jest połączona z następującymi tagami / kategoriami dostawców
 MemberIsInCategories=Ten członek jest skojarzony z następującymi tagami/kategoriami członków
 ContactIsInCategories=Ten kontakt odnosi się do następujących tagów/kategorii kontaktów
 ProductHasNoCategory=Ten produkt/usługa nie jest w żadnym tagu/kategorii
@@ -49,11 +49,11 @@ ContentsNotVisibleByAllShort=Treść nie jest widoczna dla wszystkich
 DeleteCategory=Usuń tag/kategorię
 ConfirmDeleteCategory=Czy jesteś pewien, że chcesz usunąć ten tag/kategorię?
 NoCategoriesDefined=Nie zdefiniowano tagu/kategorii
-SuppliersCategoryShort=Vendors tag/category
+SuppliersCategoryShort=Tag / kategoria dostawcy
 CustomersCategoryShort=Tag/kategoria klientów
 ProductsCategoryShort=Tag/kategoria produktu
 MembersCategoryShort=Tag/kategoria członków
-SuppliersCategoriesShort=Vendors tags/categories
+SuppliersCategoriesShort=Tagi / kategorie dostawców
 CustomersCategoriesShort=Tagi/kategorie klientów
 ProspectsCategoriesShort=Tagi / kategorie potencjalnych klientów
 CustomersProspectsCategoriesShort=Klienci/potencjalni klienci znaczniki/kategorie
@@ -63,37 +63,37 @@ ContactCategoriesShort=Kontakt tagów / kategorii
 AccountsCategoriesShort=Tagi / kategorie kont
 ProjectsCategoriesShort=Tagi / kategorie projektów
 UsersCategoriesShort=Znaczniki/kategorie użytkowników
-StockCategoriesShort=Warehouse tags/categories
-ThisCategoryHasNoItems=This category does not contain any items.
+StockCategoriesShort=Tagi / kategorie magazynowe
+ThisCategoryHasNoItems=Ta kategoria nie zawiera żadnych przedmiotów.
 CategId=Tag / ID kategorii
-ParentCategory=Parent tag/category
-ParentCategoryLabel=Label of parent tag/category
-CatSupList=List of vendors tags/categories
-CatCusList=List of customers/prospects tags/categories
+ParentCategory=Tag / kategoria nadrzędna
+ParentCategoryLabel=Etykieta tagu / kategorii nadrzędnej
+CatSupList=Lista tagów / kategorii dostawców
+CatCusList=Lista tagów / kategorii klientów / potencjalnych klientów
 CatProdList=Lista tagów/kategorii produktów
 CatMemberList=Lista tagów/kategorii członków
-CatContactList=List of contacts tags/categories
-CatProjectsList=List of projects tags/categories
-CatUsersList=List of users tags/categories
-CatSupLinks=Links between vendors and tags/categories
+CatContactList=Lista tagów / kategorii kontaktów
+CatProjectsList=Lista tagów / kategorii projektów
+CatUsersList=Lista tagów / kategorii użytkowników
+CatSupLinks=Powiązania między dostawcami a tagami / kategoriami
 CatCusLinks=Powiązania między klientami / perspektyw i tagów / kategorii
-CatContactsLinks=Links between contacts/addresses and tags/categories
+CatContactsLinks=Powiązania między kontaktami / adresami i tagami / kategoriami
 CatProdLinks=Powiązania między produktami/usługami i tagami/kategoriami
 CatMembersLinks=Związki między członkami i tagów / kategorii
 CatProjectsLinks=Połączenia pomiędzy projektami a tagami / kategoriami
-CatUsersLinks=Links between users and tags/categories
+CatUsersLinks=Powiązania między użytkownikami a tagami / kategoriami
 DeleteFromCat=Usuń z tagów/kategorii
 ExtraFieldsCategories=Atrybuty uzupełniające
 CategoriesSetup=Tagi / kategorie Konfiguracja
 CategorieRecursiv=Związek z dominującą tag / kategorii automatycznie
-CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
+CategorieRecursivHelp=Jeśli opcja jest włączona, po dodaniu produktu do podkategorii, produkt zostanie również dodany do kategorii nadrzędnej.
 AddProductServiceIntoCategory=Dodaj następujący produkt / usługę
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Przypisz kategorię do klienta
+AddSupplierIntoCategory=Przypisz kategorię do dostawcy
 ShowCategory=Pokaż tag / kategoria
 ByDefaultInList=Domyśłnie na liście
 ChooseCategory=Wybrane kategorie
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
-WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
+WebsitePagesCategoriesArea=Kategorie kontenerów stron
+UseOrOperatorForCategories=Użyj lub operator dla kategorii
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index c5d2714854e..23ec198bec8 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -24,28 +24,29 @@ ThirdPartyContact=Kontakt/Adres kontrahenta
 Company=Firma
 CompanyName=Nazwa firmy
 AliasNames=Alias (handlowy, znak firmowy, ...)
-AliasNameShort=Alias Name
+AliasNameShort=Pseudonim
 Companies=Firmy
 CountryIsInEEC=Państwo należy do Europejskiej Wspólnoty Gospodarczej
-PriceFormatInCurrentLanguage=Price display format in the current language and currency
-ThirdPartyName=Third-party name
-ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
+PriceFormatInCurrentLanguage=Format wyświetlania ceny w aktualnym języku i walucie
+ThirdPartyName=Nazwa firmy zewnętrznej
+ThirdPartyEmail=E-mail innej firmy
+ThirdParty=Firma zewnętrzna
+ThirdParties=Kontrahenci
 ThirdPartyProspects=Potencjalni klienci
 ThirdPartyProspectsStats=Potencjalni klienci
 ThirdPartyCustomers=Klienci
 ThirdPartyCustomersStats=Klienci
 ThirdPartyCustomersWithIdProf12=Klienci z %s lub %s
 ThirdPartySuppliers=Dostawcy
-ThirdPartyType=Third-party type
+ThirdPartyType=Typ firmy zewnętrznej
 Individual=Osoba prywatna
-ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ToCreateContactWithSameName=Automatycznie utworzy kontakt / adres z tymi samymi informacjami, co strona trzecia w ramach strony trzeciej. W większości przypadków, nawet jeśli Twoja strona trzecia jest osobą fizyczną, wystarczy utworzyć osobę trzecią.
 ParentCompany=Firma macierzysta
 Subsidiaries=Oddziały
-ReportByMonth=Raport za miesiąc
-ReportByCustomers=Report by customer
-ReportByQuarter=Raport wg stawek
+ReportByMonth=Raport miesięcznie
+ReportByCustomers=Raport na klienta
+ReportByThirdparties=Zgłoś osobę trzecią
+ReportByQuarter=Zgłoś według stawki
 CivilityCode=Zwrot grzecznościowy
 RegisteredOffice=Siedziba
 Lastname=Nazwisko
@@ -53,7 +54,7 @@ Firstname=Imię
 PostOrFunction=Stanowisko
 UserTitle=Tytuł
 NatureOfThirdParty=Rodzaj kontrahenta
-NatureOfContact=Nature of Contact
+NatureOfContact=Charakter kontaktu
 Address=Adres
 State=Województwo
 StateCode=Kod Stanu/Prowincji
@@ -71,19 +72,19 @@ Chat=Czat
 PhonePro=Telefonu służbowy
 PhonePerso=Telefon prywatny
 PhoneMobile=Telefon komórkowy
-No_Email=Refuse bulk emailings
+No_Email=Odrzuć masowe wysyłanie e-maili
 Fax=Faks
 Zip=Kod pocztowy
 Town=Miasto
 Web=Strona www
 Poste= Stanowisko
 DefaultLang=Domyślny język
-VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsed=Zastosowany podatek od sprzedaży
+VATIsUsedWhenSelling=Określa, czy ta osoba trzecia zawiera podatek od sprzedaży, czy nie, kiedy wystawia fakturę swoim własnym klientom
 VATIsNotUsed=Nie jest płatnikiem VAT
-CopyAddressFromSoc=Copy address from third-party details
-ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
+CopyAddressFromSoc=Skopiuj adres z danych innych firm
+ThirdpartyNotCustomerNotSupplierSoNoRef=Osoba trzecia ani klient, ani sprzedawca, brak dostępnych obiektów odsyłających
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Strona trzecia ani klient, ani sprzedawca, rabaty nie są dostępne
 PaymentBankAccount=Konto bankowe dla płatności
 OverAllProposals=Propozycje
 OverAllOrders=Zamówienia
@@ -124,7 +125,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=Numer EORI
 ProfId6AT=-
 ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
@@ -136,7 +137,7 @@ ProfId1BE=Prof ID 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Numer EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE
@@ -148,7 +149,7 @@ ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal numer)
 ProfId4CH=Prof ID 2 (Commercial rekordowa liczba)
-ProfId5CH=EORI number
+ProfId5CH=Numer EORI
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
 ProfId2CL=-
@@ -166,20 +167,26 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof ID 2 (USt. Nr)
 ProfId3DE=Prof ID 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=Numer EORI
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Id Prof 2 (numer ubezpieczenia społeczne)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Id Prof 4 (liczba Collegiate)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (numer EORI)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof ID 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, stare APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Numer rejestracyjny
 ProfId2GB=-
 ProfId3GB=SIC
@@ -202,12 +209,13 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=Numer EORI
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Pozwolenie na działalność gospodarczą)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=Numer EORI
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
@@ -225,13 +233,13 @@ ProfId1NL=nummer KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=EORI number
+ProfId5NL=Numer EORI
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof ID 2 (numer ubezpieczenia społecznego)
 ProfId3PT=Prof Id 3 (Commercial rekordowa liczba)
 ProfId4PT=Prof Id 4 (Konserwatorium)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (numer EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -245,7 +253,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof ID 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id (FEIN)
+ProfId1US=Identyfikator prof. (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (numer EORI)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -276,25 +284,25 @@ Prospect=Perspektywa
 CustomerCard=Karta Klienta
 Customer=Klient
 CustomerRelativeDiscount=Względny rabat klienta
-SupplierRelativeDiscount=Relative vendor discount
+SupplierRelativeDiscount=Względna zniżka sprzedawcy
 CustomerRelativeDiscountShort=Względny rabat
 CustomerAbsoluteDiscountShort=Bezwzględny rabat
 CompanyHasRelativeDiscount=Ten klient ma standardowy rabat <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ten klient domyślnie nie posiada względnego rabatu
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
-CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+HasRelativeDiscountFromSupplier=Masz domyślny rabat <b> %s%% </b> od tego dostawcy
+HasNoRelativeDiscountFromSupplier=Nie masz domyślnego rabatu względnego od tego dostawcy
+CompanyHasAbsoluteDiscount=Ten klient ma dostępne rabaty (noty kredytowe lub zaliczki) dla <b> %s </b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Ten klient ma dostępne rabaty (komercyjne, zaliczki) na <b> %s </b> %s
 CompanyHasCreditNote=Ten klient nadal posiada noty kredytowe dla <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
+HasNoAbsoluteDiscountFromSupplier=Nie masz dostępnego kredytu rabatowego od tego dostawcy
+HasAbsoluteDiscountFromSupplier=Masz dostępne rabaty (noty kredytowe lub zaliczki) dla <b> %s </b> %s od tego dostawcy
+HasDownPaymentOrCommercialDiscountFromSupplier=Masz dostępne rabaty (komercyjne, zaliczki) dla <b> %s </b> %s od tego dostawcy
+HasCreditNoteFromSupplier=Masz noty kredytowe dla <b> %s </b> %s od tego dostawcy
 CompanyHasNoAbsoluteDiscount=Ten klient nie posiada punktów rabatowych
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
-SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+CustomerAbsoluteDiscountAllUsers=Bezwzględne rabaty dla klientów (udzielane przez wszystkich użytkowników)
+CustomerAbsoluteDiscountMy=Absolutne rabaty dla klientów (przyznawane przez Ciebie)
+SupplierAbsoluteDiscountAllUsers=Bezwzględne rabaty dostawców (wprowadzone przez wszystkich użytkowników)
+SupplierAbsoluteDiscountMy=Absolutne rabaty dostawcy (wprowadzone przez Ciebie)
 DiscountNone=Żaden
 Vendor=Sprzedawca
 Supplier=Sprzedawca
@@ -310,7 +318,7 @@ FromContactName=Nazwa:
 NoContactDefinedForThirdParty=Brak zdefiniowanych kontaktów dla tego kontrahenta
 NoContactDefined=Brak zdefinowanych kontaktów
 DefaultContact=Domyślny kontakt/adres
-ContactByDefaultFor=Default contact/address for
+ContactByDefaultFor=Domyślny kontakt / adres dla
 AddThirdParty=Dodaj kontrahenta
 DeleteACompany=Usuń firmę
 PersonalInformations=Prywatne dane osobowe
@@ -319,18 +327,18 @@ CustomerCode=Kod klienta
 SupplierCode=Kod sprzedawcy
 CustomerCodeShort=Kod klienta
 SupplierCodeShort=Kod sprzedawcy
-CustomerCodeDesc=Customer Code, unique for all customers
-SupplierCodeDesc=Vendor Code, unique for all vendors
+CustomerCodeDesc=Kod klienta, unikalny dla wszystkich klientów
+SupplierCodeDesc=Kod dostawcy, unikalny dla wszystkich dostawców
 RequiredIfCustomer=Wymagane, jeżeli Kontrahent jest klientem lub potencjalnym klientem
 RequiredIfSupplier=Wymagane jeżeli kontrahent jest dostawcą
-ValidityControledByModule=Validity controlled by module
-ThisIsModuleRules=Rules for this module
+ValidityControledByModule=Ważność kontrolowana przez moduł
+ThisIsModuleRules=Zasady dla tego modułu
 ProspectToContact=Potencjalny Klient do kontaktu
 CompanyDeleted=Firma " %s" usunięta z bazy danych.
 ListOfContacts=Lista kontaktów/adresów
 ListOfContactsAddresses=Lista kontaktów/adresów
 ListOfThirdParties=Lista kontrahentów
-ShowCompany=Third Party
+ShowCompany=Strona trzecia
 ShowContact=Kontakt-Adres
 ContactsAllShort=Wszystkie (bez filtra)
 ContactType=Typ kontaktu
@@ -350,16 +358,16 @@ MyContacts=Moje kontakty
 Capital=Kapitał
 CapitalOf=Kapitał %s
 EditCompany=Edycja firmy
-ThisUserIsNot=This user is not a prospect, customer or vendor
+ThisUserIsNot=Ten użytkownik nie jest potencjalnym klientem, klientem ani sprzedawcą
 VATIntraCheck=Sprawdź
-VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraCheckDesc=Identyfikator VAT musi zawierać prefiks kraju. Łącze <b> %s </b> korzysta z usługi europejskiego sprawdzania podatku VAT (VIES), która wymaga dostępu do Internetu z serwera Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do?locale=pl
-VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraCheckableOnEUSite=Sprawdź wewnątrzwspólnotowy identyfikator VAT na stronie internetowej Komisji Europejskiej
+VATIntraManualCheck=Możesz również sprawdzić ręcznie na stronie internetowej Komisji Europejskiej <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Brak możliwości sprawdzenia. Usługa nie jest dostarczana dla wybranego regionu (%s).
-NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Business entity type
-Workforce=Workforce
+NorProspectNorCustomer=Ani potencjalny klient, ani potencjalny klient
+JuridicalStatus=Typ podmiotu gospodarczego
+Workforce=Siła robocza
 Staff=Pracownicy
 ProspectLevelShort=Potencjał
 ProspectLevel=Potencjał potencjalnego klienta
@@ -381,7 +389,7 @@ TE_MEDIUM=Średnia firma
 TE_ADMIN=Rządowy
 TE_SMALL=Mała firma
 TE_RETAIL=Klient detaliczny
-TE_WHOLE=Wholesaler
+TE_WHOLE=Hurtownik
 TE_PRIVATE=Osoba prywatna
 TE_OTHER=Inny
 StatusProspect-1=Nie kontaktować się
@@ -400,14 +408,14 @@ ExportCardToFormat=Eksport karty do formatu
 ContactNotLinkedToCompany=Kontakt nie połączony z żadnym kontrahentem
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Brak dostępu do Dolibarr
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
-ImportDataset_company_1=Third-parties and their properties
-ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
-ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
-PriceLevel=Price Level
-PriceLevelLabels=Price Level Labels
+ExportDataset_company_1=Kontrahenci (firmy/fundacje/osoby fizyczne) i ich własności
+ExportDataset_company_2=Kontakty i ich właściwości
+ImportDataset_company_1=Kontrahenci i ich właściwości
+ImportDataset_company_2=Dodatkowe kontakty/adresy i atrybuty kontrahentów
+ImportDataset_company_3=Rachunki bankowe kontrahentów
+ImportDataset_company_4=Zewnętrzni przedstawiciele handlowi (przypisywanie przedstawicieli handlowych/użytkowników do firm)
+PriceLevel=Poziom cen
+PriceLevelLabels=Etykiety cenowe
 DeliveryAddress=Adres dostawy
 AddAddress=Dodaj adres
 SupplierCategory=Kategoria dostawcy
@@ -416,7 +424,7 @@ DeleteFile=Usuń plik
 ConfirmDeleteFile=Czy na pewno chcesz usunąć ten plik?
 AllocateCommercial=Przypisać do przedstawiciela
 Organization=Organizacja
-FiscalYearInformation=Fiscal Year
+FiscalYearInformation=Rok podatkowy
 FiscalMonthStart=Pierwszy miesiąc roku podatkowego
 SocialNetworksInformation=Media społecznościowe
 SocialNetworksFacebookURL=Facebook
@@ -425,14 +433,14 @@ SocialNetworksLinkedinURL=Linkedin
 SocialNetworksInstagramURL=Instagram
 SocialNetworksYoutubeURL=Youtube
 SocialNetworksGithubURL=Github
-YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
+YouMustAssignUserMailFirst=Aby dodać powiadomienie e-mail, musisz utworzyć wiadomość e-mail dla tego użytkownika.
 YouMustCreateContactFirst=Żeby dodać powiadomienia email, najpierw musisz określić kontakty z poprawnymi adresami email dla kontrahentów
 ListSuppliersShort=Lista sprzedawców
-ListProspectsShort=List of Prospects
+ListProspectsShort=Lista perspektyw
 ListCustomersShort=Lista klientów
-ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+ThirdPartiesArea=Osoby trzecie / kontakty
+LastModifiedThirdParties=Najnowsze %s zmodyfikowane strony trzecie
+UniqueThirdParties=Łączna liczba stron trzecich
 InActivity=Otwarte
 ActivityCeased=Zamknięte
 ThirdPartyIsClosed=Kontrahent jest zamknięty
@@ -441,19 +449,19 @@ CurrentOutstandingBill=Biężący, niezapłacony rachunek
 OutstandingBill=Maksymalna kwota niezapłaconego rachunku
 OutstandingBillReached=Maksymalna kwota dla niespłaconych rachunków osiągnięta
 OrderMinAmount=Minimalna kwota dla zamówienia
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Dowolny kod Klienta / Dostawcy. Ten kod może być modyfikowany w dowolnym momencie.
 ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...)
 MergeOriginThirdparty=Duplikuj kontrahenta (kontrahenta, którego chcesz usunąć)
 MergeThirdparties=Scal kontrahentów
-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 third party will be deleted.
-ThirdpartiesMergeSuccess=Third parties have been merged
+ConfirmMergeThirdparties=Czy na pewno chcesz scalić tę firmę zewnętrzną z obecną? Wszystkie połączone obiekty (faktury, zamówienia, ...) zostaną przeniesione do bieżącej strony trzeciej, a następnie strona trzecia zostanie usunięta.
+ThirdpartiesMergeSuccess=Strony trzecie zostały połączone
 SaleRepresentativeLogin=Login przedstawiciela handlowego
 SaleRepresentativeFirstname=Imię przedstawiciela handlowego
 SaleRepresentativeLastname=Nazwisko przedstawiciela handlowego
-ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+ErrorThirdpartiesMerge=Wystąpił błąd podczas usuwania stron trzecich. Sprawdź dziennik. Zmiany zostały cofnięte.
+NewCustomerSupplierCodeProposed=Kod klienta lub dostawcy jest już używany, sugerowany jest nowy kod
+KeepEmptyIfGenericAddress=Pozostaw to pole puste, jeśli ten adres jest adresem ogólnym
 #Imports
 PaymentTypeCustomer=Typ płatności - Klient
 PaymentTermsCustomer=Warunki płatności - Klient
@@ -463,7 +471,7 @@ PaymentTypeBoth=Typ płatności - Klient i Sprzedawca
 MulticurrencyUsed=Użyj wielowalutowości
 MulticurrencyCurrency=Waluta
 InEEC=Europa (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+RestOfEurope=Reszta Europy (EWG)
+OutOfEurope=Poza Europą (EWG)
+CurrentOutstandingBillLate=Obecny zaległy rachunek spóźniony
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Zachowaj ostrożność, w zależności od ustawień ceny produktu, przed dodaniem produktu do POS należy zmienić osobę trzecią.
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index cb71232d049..b71f9c0776d 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
+MenuFinancial=Fakturowanie | Zapłata
 TaxModuleSetupToModifyRules=Przejdź do <a href="%s">konfiguracji modułu Podatki</a> zmodyfikować zasady obliczania
 TaxModuleSetupToModifyRulesLT=Przejdź do <a href="%s">konfiguracji firmy</a> zmodyfikować zasady obliczania
 OptionMode=Opcja dla księgowości
@@ -11,7 +11,7 @@ FeatureIsSupportedInInOutModeOnly=Funkcja dostępna tylko w KREDYTÓW-DŁUGI rac
 VATReportBuildWithOptionDefinedInModule=Kwoty wyświetlane tutaj są obliczane na zasadach określonych w konfiguracji moduly podatkowego
 LTReportBuildWithOptionDefinedInModule=Kwoty podane tutaj są obliczane na podstawie zasad określonych przez konfigurację firmy.
 Param=Konfiguracja
-RemainingAmountPayment=Amount payment remaining:
+RemainingAmountPayment=Pozostała kwota płatności:
 Account=Konto
 Accountparent=Nadrzędne konto
 Accountsparent=Nadrzędne konta
@@ -19,8 +19,8 @@ Income=Przychody
 Outcome=Rozchody
 MenuReportInOut=Przychody/Koszty
 ReportInOut=Bilans przychodów i kosztów
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
+ReportTurnover=Zafakturowany obrót
+ReportTurnoverCollected=Zebrany obrót
 PaymentsNotLinkedToInvoice=Płatność nie dowiązana do żadnej faktury, więc nie dowiązana do żadnego kontrahenta
 PaymentsNotLinkedToUser=Płatnośc nie dowiązana do żadnego użytkownika
 Profit=Zysk
@@ -32,46 +32,47 @@ Credit=Kredyt
 Piece=Rachunkowość Doc.
 AmountHTVATRealReceived=HT zebrane
 AmountHTVATRealPaid=HT paid
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Tax monthly
-VATBalance=Tax Balance
-VATPaid=Tax paid
-LT1Summary=Tax 2 summary
-LT2Summary=Tax 3 summary
+VATToPay=Sprzedaż podatkowa
+VATReceived=Otrzymano podatek
+VATToCollect=Zakupy podatkowe
+VATSummary=Podatek miesięczny
+VATBalance=Saldo podatkowe
+VATPaid=Zapłacony podatek
+LT1Summary=Podsumowanie podatku 2
+LT2Summary=Podsumowanie podatku 3
 LT1SummaryES=RE Saldo
 LT2SummaryES=Balans IRPF
 LT1SummaryIN=CGST Balance
-LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
+LT2SummaryIN=Saldo SGST
+LT1Paid=Zapłacony podatek 2
+LT2Paid=Zapłacony podatek 3
 LT1PaidES=RE Płatny
 LT2PaidES=IRPF Płatny
-LT1PaidIN=CGST Paid
-LT2PaidIN=SGST Paid
-LT1Customer=Tax 2 sales
-LT1Supplier=Tax 2 purchases
+LT1PaidIN=CGST Płatne
+LT2PaidIN=SGST płatny
+LT1Customer=Sprzedaż podatkowa 2
+LT1Supplier=Podatek 2 zakupy
 LT1CustomerES=RE sprzedaży
 LT1SupplierES=RE zakupów
-LT1CustomerIN=CGST sales
-LT1SupplierIN=CGST purchases
-LT2Customer=Tax 3 sales
-LT2Supplier=Tax 3 purchases
+LT1CustomerIN=Sprzedaż CGST
+LT1SupplierIN=Zakupy CGST
+LT2Customer=Podatek 3 od sprzedaży
+LT2Supplier=Podatek 3 zakupy
 LT2CustomerES=Sprzedaż IRPF
 LT2SupplierES=Zakupy IRPF
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
+LT2CustomerIN=Sprzedaż SGST
+LT2SupplierIN=Zakupy SGST
 VATCollected=VAT zebrane
 StatusToPay=Do zapłaty
 SpecialExpensesArea=Obszar dla wszystkich specjalnych płatności
+VATExpensesArea=Obszar dla wszystkich płatności TVA
 SocialContribution=Opłata ZUS lub podatek
 SocialContributions=Opłaty ZUS lub podatki
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-DateOfSocialContribution=Date of social or fiscal tax
-LabelContrib=Label contribution
-TypeContrib=Type contribution
+SocialContributionsDeductibles=Podatki socjalne lub podatkowe do odliczenia
+SocialContributionsNondeductibles=Nie podlegające potrąceniu podatki socjalne lub podatkowe
+DateOfSocialContribution=Data podatku socjalnego lub podatkowego
+LabelContrib=Wkład etykiety
+TypeContrib=Wpisz wkład
 MenuSpecialExpenses=Koszty specjalne
 MenuTaxAndDividends=Podatki i dywidendy
 MenuSocialContributions=ZUS/podatek
@@ -79,15 +80,16 @@ MenuNewSocialContribution=Nowa opłata ZUS/podatek
 NewSocialContribution=Nowa opłata ZUS/podatek
 AddSocialContribution=Dodaj podatek fiskalny/ZUS
 ContributionsToPay=Opłata ZUS/podatek do zapłacenia
-AccountancyTreasuryArea=Billing and payment area
+AccountancyTreasuryArea=Obszar rozliczeń i płatności
 NewPayment=Nowa płatność
 PaymentCustomerInvoice=Klient płatności faktury
-PaymentSupplierInvoice=vendor invoice payment
+PaymentSupplierInvoice=płatność za fakturę dostawcy
 PaymentSocialContribution=Płatność za ZUS/podatek
 PaymentVat=Zapłata podatku VAT
+AutomaticCreationPayment=Automatycznie rejestruj płatność
 ListPayment=Wykaz płatności
 ListOfCustomerPayments=Lista płatności klientów
-ListOfSupplierPayments=List of vendor payments
+ListOfSupplierPayments=Lista płatności dostawcy
 DateStartPeriod=Data początku okresu
 DateEndPeriod=Data końca okresu
 newLT1Payment=Nowa płatność podatku 2
@@ -102,47 +104,57 @@ LT1PaymentES=RE: Płatność
 LT1PaymentsES=RE Płatności
 LT2PaymentES=Płatność IRPF
 LT2PaymentsES=Płatności IRPF
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATRefund=Sales tax refund
-NewVATPayment=New sales tax payment
-NewLocalTaxPayment=New tax %s payment
+VATPayment=Zapłata podatku od sprzedaży
+VATPayments=Płatności podatku od sprzedaży
+VATDeclarations=Deklaracje VAT
+VATDeclaration=Deklaracja VAT
+VATRefund=Zwrot podatku od sprzedaży
+NewVATPayment=Nowa płatność podatku od sprzedaży
+NewLocalTaxPayment=Nowa płatność podatku %s
 Refund=Zwrot
 SocialContributionsPayments=Płatności za ZUS/podatki
 ShowVatPayment=Pokaż płatności za podatek VAT
 TotalToPay=Razem do zapłaty
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Vendor accounting code
+BalanceVisibilityDependsOnSortAndFilters=Saldo jest widoczne na tej liście tylko wtedy, gdy tabela jest posortowana według %s i przefiltrowana na 1 koncie bankowym (bez innych filtrów)
+CustomerAccountancyCode=Kod księgowy klienta
+SupplierAccountancyCode=Kod księgowy dostawcy
 CustomerAccountancyCodeShort=Kod księg. klienta
 SupplierAccountancyCodeShort=Kod rach. dost.
 AccountNumber=Numer konta
 NewAccountingAccount=Nowe konto
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
+Turnover=Zafakturowany obrót
+TurnoverCollected=Zebrany obrót
+SalesTurnoverMinimum=Minimalny obrót
+ByExpenseIncome=Według wydatków i dochodów
 ByThirdParties=Przez kontrahentów
 ByUserAuthorOfInvoice=Na autora faktury
 CheckReceipt=Sprawdź depozyt
 CheckReceiptShort=Sprawdź depozyt
-LastCheckReceiptShort=Latest %s check receipts
+LastCheckReceiptShort=Najnowsze potwierdzenia %s
 NewCheckReceipt=Nowe zniżki
 NewCheckDeposit=Nowe sprawdzić depozytu
 NewCheckDepositOn=Nowe sprawdzić depozytu na konto: %s
-NoWaitingChecks=No checks awaiting deposit.
+NoWaitingChecks=Brak czeków oczekujących na wpłatę.
 DateChequeReceived=Data rejestracji czeku
-NbOfCheques=No. of checks
+NbOfCheques=Liczba czeków
 PaySocialContribution=Zapłać ZUS/podatek
-ConfirmPaySocialContribution=Jesteś pewien/a, że chcesz oznaczyć tą opłatę za ZUS lub podatek jako zapłaconą?
+PayVAT=Zapłać deklarację VAT
+PaySalary=Zapłać kartę płacową
+ConfirmPaySocialContribution=Czy na pewno chcesz zaklasyfikować ten podatek socjalny lub podatkowy jako zapłacony?
+ConfirmPayVAT=Czy na pewno chcesz sklasyfikować tę deklarację VAT jako zapłaconą?
+ConfirmPaySalary=Czy na pewno chcesz sklasyfikować tę kartę wynagrodzenia jako płatną?
 DeleteSocialContribution=Usuń płatność za ZUS lub podatek
-ConfirmDeleteSocialContribution=Jesteś pewien/a, że chcesz oznaczyć tą opłatę za ZUS lub podatek jako zapłaconą?
+DeleteVAT=Usuń deklarację VAT
+DeleteSalary=Usuń kartę wynagrodzenia
+ConfirmDeleteSocialContribution=Czy na pewno chcesz usunąć tę płatność podatku socjalnego / podatkowego?
+ConfirmDeleteVAT=Czy na pewno chcesz usunąć tę deklarację VAT?
+ConfirmDeleteSalary=Czy na pewno chcesz usunąć to wynagrodzenie?
 ExportDataset_tax_1=Składki ZUS, podatki i płatności
 CalcModeVATDebt=<b>Tryb% Svat na rachunkowości zaangażowanie% s.</b>
 CalcModeVATEngagement=<b>Tryb% Svat na dochody-wydatki% s.</b>
-CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
-CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
-CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeDebt=Analiza znanych zapisanych dokumentów, nawet jeśli nie zostały one jeszcze zaksięgowane w księdze.
+CalcModeEngagement=Analiza znanych zarejestrowanych płatności, nawet jeśli nie zostały jeszcze zaksięgowane w Księdze Głównej.
+CalcModeBookkeeping=Analiza danych zapisanych w tabeli Księgi rachunkowej.
 CalcModeLT1= <b>Tryb% SRE faktur klienta - dostawcy wystawia faktury% s</b>
 CalcModeLT1Debt=<b>Tryb% SRE faktur klienta% s</b>
 CalcModeLT1Rec= <b>Tryb% SRE dostawców fakturuje% s</b>
@@ -151,50 +163,52 @@ CalcModeLT2Debt=<b>Tryb% sIRPF faktur klienta% s</b>
 CalcModeLT2Rec= <b>Tryb% sIRPF od dostawców faktury% s</b>
 AnnualSummaryDueDebtMode=Saldo przychodów i kosztów, roczne podsumowanie
 AnnualSummaryInputOutputMode=Saldo przychodów i kosztów, roczne podsumowanie
-AnnualByCompanies=Balance of income and expenses, by predefined groups of account
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
-SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
-SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
+AnnualByCompanies=Saldo dochodów i wydatków według predefiniowanych grup kont
+AnnualByCompaniesDueDebtMode=Bilans dochodów i kosztów, szczegóły według predefiniowanych grup, tryb <b> %s Należności-zadłużenia%s </b> powiedział <b> Rachunkowość zobowiązań a09a4b739f17f8z
+AnnualByCompaniesInputOutputMode=Bilans dochodów i kosztów, szczegóły według predefiniowanych grup, tryb <b> %s Przychody-wydatki%s </b> powiedział <b> księgowość kasowa </b>.
+SeeReportInInputOutputMode=Zobacz <b> %sanaliza płatnościs%s </b> w celu obliczenia opartego na <b> zarejestrowanych płatnościach </b> dokonanych, nawet jeśli nie zostały jeszcze zaksięgowane w księdze
+SeeReportInDueDebtMode=Zobacz <b> %sanalizę zapisanych dokumentów%s </b> w celu obliczenia opartego na znanych <b> zapisanych dokumentach </b>, nawet jeśli nie zostały jeszcze zaksięgowane w księdze
+SeeReportInBookkeepingMode=Zobacz <b> %sanaliza tabeli księgi rachunkowej %s </b> dla raportu opartego na <b> Tabela księgi rachunkowej </b>
 RulesAmountWithTaxIncluded=- Kwoty podane są łącznie z podatkami
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultDue=- Obejmuje zaległe faktury, wydatki, podatek VAT, darowizny, niezależnie od tego, czy zostały zapłacone, czy nie. Obejmuje również wypłacane pensje. <br> - Opiera się na dacie fakturowania faktur i terminie płatności wydatków lub podatków. W przypadku wynagrodzeń zdefiniowanych w module Wynagrodzenia stosowana jest data waluty płatności.
 RulesResultInOut=- Obejmuje rzeczywiste płatności dokonywane za faktury, koszty, podatek VAT oraz wynagrodzenia. <br> Opiera się na  datach płatności faktur, wygenerowania kosztów, podatku VAT oraz wynagrodzeń. Dla darowizn brana jest pod uwagę data przekazania darowizny.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
-RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
-RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
-SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are not included
-DepositsAreIncluded=- Down payment invoices are included
-LT1ReportByMonth=Tax 2 report by month
-LT2ReportByMonth=Tax 3 report by month
-LT1ReportByCustomers=Report tax 2 by third party
-LT2ReportByCustomers=Report tax 3 by third party
+RulesCADue=- Obejmuje należne faktury klienta, niezależnie od tego, czy są opłacone, czy nie. <br> - Opiera się na dacie rozliczenia tych faktur. <br>
+RulesCAIn=- Obejmuje wszystkie efektywne płatności faktur otrzymanych od klientów. <br> - Opiera się na dacie płatności tych faktur <br>
+RulesCATotalSaleJournal=Obejmuje wszystkie linie kredytowe z dziennika Sprzedaż.
+RulesSalesTurnoverOfIncomeAccounts=Obejmuje (kredyt - debet) linie dla rachunków produktów w grupie PRZYCHODY
+RulesAmountOnInOutBookkeepingRecord=Obejmuje zapis w księdze z kontami księgowymi, które mają grupę „WYDATKI” lub „DOCHODY”
+RulesResultBookkeepingPredefined=Obejmuje zapis w księdze z kontami księgowymi, które mają grupę „WYDATKI” lub „DOCHODY”
+RulesResultBookkeepingPersonalized=Pokazuje zapis w księdze z kontami księgowymi <b> pogrupowanymi według spersonalizowanych grup </b>
+SeePageForSetup=W celu konfiguracji patrz menu <a href="%s"> %s </a>
+DepositsAreNotIncluded=- Faktury zaliczkowe nie są uwzględniane
+DepositsAreIncluded=- Faktury zaliczkowe są wliczone
+LT1ReportByMonth=Raport podatkowy 2 według miesiąca
+LT2ReportByMonth=Raport podatkowy 3 według miesiąca
+LT1ReportByCustomers=Zgłoś podatek 2 przez stronę trzecią
+LT2ReportByCustomers=Zgłoś podatek 3 przez stronę trzecią
 LT1ReportByCustomersES=Sprawozdanie trzecim RE partii
 LT2ReportByCustomersES=Raport osób trzecich IRPF
-VATReport=Sale tax report
-VATReportByPeriods=Sale tax report by period
-VATReportByMonth=Sale tax report by month
-VATReportByRates=Sale tax report by rates
-VATReportByThirdParties=Sale tax report by third parties
-VATReportByCustomers=Sale tax report by customer
+VATReport=Raport podatku od sprzedaży
+VATReportByPeriods=Raport podatku od sprzedaży według okresu
+VATReportByMonth=Raport o podatku od sprzedaży według miesięcy
+VATReportByRates=Raport podatku od sprzedaży według stawek
+VATReportByThirdParties=Raport podatku od sprzedaży przez osoby trzecie
+VATReportByCustomers=Raport podatku od sprzedaży według klienta
 VATReportByCustomersInInputOutputMode=Sprawozdanie VAT klienta gromadzone i wypłacane
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
-LT1ReportByQuarters=Report tax 2 by rate
-LT2ReportByQuarters=Report tax 3 by rate
+VATReportByQuartersInInputOutputMode=Raport według stawki podatku od sprzedaży podatku pobranego i zapłaconego
+VATReportShowByRateDetails=Pokaż szczegóły tej stawki
+LT1ReportByQuarters=Zgłoś podatek 2 według stawki
+LT2ReportByQuarters=Zgłoś podatek 3 według stawki
 LT1ReportByQuartersES=Sprawozdanie stopy RE
 LT2ReportByQuartersES=Sprawozdanie IRPF stopy
 SeeVATReportInInputOutputMode=Zobacz raport <b>%sVAT encasement%s</b> na standardowe obliczenia
 SeeVATReportInDueDebtMode=<b>%sVAT</b> sprawozdanie Zobacz <b>na flow%s</b> do obliczenia z opcją na przepływ
 RulesVATInServices=- W przypadku usług, raport zawiera przepisów VAT faktycznie otrzymane lub wydane na podstawie daty płatności.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATInProducts=- W przypadku aktywów materialnych raport zawiera podatek VAT otrzymany lub wydany na podstawie daty płatności.
 RulesVATDueServices=- W przypadku usług, raport zawiera faktur VAT należnego, płatnego lub nie, w oparciu o daty wystawienia faktury.
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- Dla aktywów materialnych raport zawiera faktury VAT na podstawie daty wystawienia faktury.
 OptionVatInfoModuleComptabilite=Uwaga: W przypadku dóbr materialnych, należy użyć daty dostawy do bardziej sprawiedliwego.
-ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+ThisIsAnEstimatedValue=To jest podgląd oparty na wydarzeniach biznesowych, a nie na końcowej tabeli księgi, więc ostateczne wyniki mogą się różnić od tych wartości podglądu
 PercentOfInvoice=%%/faktury
 NotUsedForGoods=Nie używany od towarów
 ProposalStats=Statystyki na temat propozycji
@@ -209,62 +223,66 @@ PurchasesJournal=Dziennik zakupów
 DescSellsJournal=Dziennik sprzedaży
 DescPurchasesJournal=Dziennik zakupów
 CodeNotDef=Nie zdefiniowany
-WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Faktury zaliczkowe nie są zawarte w tej wersji z tym modułem księgowym.
 DatePaymentTermCantBeLowerThanObjectDate=Termin płatności określony nie może być niższa niż data obiektu.
-Pcg_version=Chart of accounts models
+Pcg_version=Modele planu kont
 Pcg_type=Typ PCG
 Pcg_subtype=PCG podtyp
 InvoiceLinesToDispatch=Linie do wysyłki faktury
-ByProductsAndServices=By product and service
+ByProductsAndServices=Według produktów i usług
 RefExt=Ref Zewnętrzne
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link do zamówienia
 Mode1=Metoda 1
 Mode2=Metoda 2
 CalculationRuleDesc=Aby obliczyć całkowity podatek VAT, można wykorzystać jedną z dwóch metod: <br> Metoda 1 polega na zaokrągleniu VAT dla każdej pozycji, a następnie ich zsumowaniu. <br> Metoda 2 polega na zsumowaniu wszystkich VAT z każdej pozycji, a następnie zaokrągleniu wyniku. <br> Efekt końcowy może różnić się o kilka groszy. Domyślnym trybem jest tryb <b>%s</b>.
-CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
-TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
+CalculationRuleDescSupplier=W zależności od dostawcy wybierz odpowiednią metodę, aby zastosować tę samą regułę obliczania i uzyskać taki sam wynik, jakiego oczekuje dostawca.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Raport dotyczący obrotu zebranego na produkt nie jest dostępny. Ten raport jest dostępny tylko dla zafakturowanych obrotów.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Raport dotyczący obrotu uzyskanego według stawki podatku od sprzedaży jest niedostępny. Ten raport jest dostępny tylko dla zafakturowanych obrotów.
 CalculationMode=Tryb Obliczanie
-AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+AccountancyJournal=Arkusz kodów księgowych
+ACCOUNTING_VAT_SOLD_ACCOUNT=Konto księgowe domyślnie dla podatku VAT od sprzedaży (używane, jeśli nie zostało zdefiniowane w ustawieniach słownika VAT)
+ACCOUNTING_VAT_BUY_ACCOUNT=Konto księgowe domyślnie dla podatku VAT od zakupów (używane, jeśli nie zostało zdefiniowane w ustawieniach słownika VAT)
+ACCOUNTING_VAT_PAY_ACCOUNT=Konto księgowe domyślnie do płacenia podatku VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Konto księgowe używane dla stron trzecich klienta
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedykowane konto księgowe zdefiniowane na karcie osoby trzeciej będzie używane tylko do księgowania w Podedgera. Ta będzie używana dla Księgi Głównej i jako domyślna wartość księgowania Podrzędnego, jeśli dedykowane konto księgowe klienta na stronie trzeciej nie jest zdefiniowane.
+ACCOUNTING_ACCOUNT_SUPPLIER=Konto księgowe używane dla stron trzecich dostawcy
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedykowane konto księgowe zdefiniowane na karcie osoby trzeciej będzie używane tylko do księgowania w Podedgera. Ta wartość będzie używana dla Księgi Głównej i jako domyślna wartość księgowania Księgi Podrzędnej, jeśli nie zdefiniowano dedykowanego konta księgowego dostawcy na stronie trzeciej.
+ConfirmCloneTax=Potwierdź klon podatku socjalnego / podatkowego
+ConfirmCloneVAT=Potwierdź klon deklaracji VAT
+ConfirmCloneSalary=Potwierdź klon wynagrodzenia
 CloneTaxForNextMonth=Powiel to na następny miesiąc
 SimpleReport=Prosty raport
-AddExtraReport=Extra reports (add foreign and national customer report)
+AddExtraReport=Dodatkowe raporty (dodaj raport klientów zagranicznych i krajowych)
 OtherCountriesCustomersReport=Raport o klientach zagranicznych
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Oparty na dwóch pierwszych literach numeru VAT EU, które się różnią od kodu kraju , gdzie zarejetrowana jest Twoja firma.
 SameCountryCustomersWithVAT=Raport o klientach krajowych
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Oparty na dwóch pierwszych literach numeru VAT EU, które są takie same jak kod kraju, gdzie zarejetrowana jest Twoja firma.
-LinkedFichinter=Link to an intervention
+LinkedFichinter=Link do interwencji
 ImportDataset_tax_contrib=ZUS/podatek
 ImportDataset_tax_vat=Płatności VAT
 ErrorBankAccountNotFound=Błąd: Konto bankowe nie znalezione
 FiscalPeriod=Okres rozliczeniowy
-ListSocialContributionAssociatedProject=List of social contributions associated with the project
-DeleteFromCat=Remove from accounting group
-AccountingAffectation=Accounting assignment
-LastDayTaxIsRelatedTo=Last day of period the tax is related to
-VATDue=Sale tax claimed
-ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
-ByVatRate=By sale tax rate
-TurnoverbyVatrate=Turnover invoiced by sale tax rate
-TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
-PurchasebyVatrate=Purchase by sale tax rate
+ListSocialContributionAssociatedProject=Lista składek na ubezpieczenia społeczne związanych z projektem
+DeleteFromCat=Usuń z grupy księgowej
+AccountingAffectation=Cesja księgowa
+LastDayTaxIsRelatedTo=Ostatni dzień okresu, którego dotyczy podatek
+VATDue=Zażądano podatku od sprzedaży
+ClaimedForThisPeriod=Roszczony za okres
+PaidDuringThisPeriod=Zapłacono za ten okres
+PaidDuringThisPeriodDesc=Jest to suma wszystkich płatności związanych z deklaracjami VAT, które mają datę końca okresu w wybranym zakresie dat
+ByVatRate=Według stawki podatku od sprzedaży
+TurnoverbyVatrate=Obrót fakturowany według stawki podatku od sprzedaży
+TurnoverCollectedbyVatrate=Obrót pobierany według stawki podatku od sprzedaży
+PurchasebyVatrate=Zakup według stawki podatku od sprzedaży
 LabelToShow=Krótka etykieta
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
-IncludeVarpaysInResults = Include various payments in reports
-IncludeLoansInResults = Include loans in reports
+PurchaseTurnover=Obrót zakupowy
+PurchaseTurnoverCollected=Zebrany obrót zakupowy
+RulesPurchaseTurnoverDue=- Obejmuje należne faktury dostawcy, niezależnie od tego, czy są opłacone, czy nie. <br> - Opiera się na dacie faktury tych faktur. <br>
+RulesPurchaseTurnoverIn=- Obejmuje wszystkie efektywne płatności faktur wystawionych dostawcom. <br> - Opiera się na dacie płatności tych faktur <br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Obejmuje wszystkie linie debetowe z arkusza zakupów.
+RulesPurchaseTurnoverOfExpenseAccounts=Obejmuje linie (debetowo - kredytowe) na rachunki produktów w grupie WYDATKI
+ReportPurchaseTurnover=Zafakturowany obrót zakupowy
+ReportPurchaseTurnoverCollected=Zebrany obrót zakupowy
+IncludeVarpaysInResults = Uwzględnij różne płatności w raportach
+IncludeLoansInResults = Uwzględnij pożyczki w raportach
diff --git a/htdocs/langs/pl_PL/ecm.lang b/htdocs/langs/pl_PL/ecm.lang
index 465958245dd..b39489425ce 100644
--- a/htdocs/langs/pl_PL/ecm.lang
+++ b/htdocs/langs/pl_PL/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
+ECMNbOfDocs=Liczba dokumentów w katalogu
 ECMSection=Katalog
 ECMSectionManual=Katalog manualny
 ECMSectionAuto=Katalog automatyczny
@@ -14,30 +14,34 @@ ECMNbOfFilesInDir=Ilość plików w katalogu
 ECMNbOfSubDir=ilość podkatalogów
 ECMNbOfFilesInSubDir=Liczba plików w podkatalogach
 ECMCreationUser=Kreator
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=Obszar DMS / ECM
+ECMAreaDesc=Obszar DMS / ECM (system zarządzania dokumentami / elektroniczne zarządzanie treścią) umożliwia szybkie zapisywanie, udostępnianie i wyszukiwanie wszelkiego rodzaju dokumentów w Dolibarr.
 ECMAreaDesc2=* Automatyczne katalogi wypelniane sa automatycznie podczas dodawania dokumentów z karty elementu <br> * Manualne katalogi mogą być używane do zapisywania dokumentów nie powiązanych z żadnym konkretnym elementem.
 ECMSectionWasRemoved=Katalog <b>%s</b> został usunięty.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSectionWasCreated=Utworzono katalog <b> %s </b>.
 ECMSearchByKeywords=Wyszukiwanie wg słów kluczowych
 ECMSearchByEntity=Szukaj wg obiektu
 ECMSectionOfDocuments=Katalogi dokumentów
 ECMTypeAuto=Automatyczne
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Dokumenty powiązane z %s
 ECMNoDirectoryYet=Brak utworzonego katalogu
 ShowECMSection=Pokaż katalog
 DeleteSection=Usuń katalog
 ConfirmDeleteSection=Czy możesz potwierdzić usunięcie katalogu <b>%s</b>?
 ECMDirectoryForFiles=Pokrewny katalog dla plików
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Usunięcie nie jest możliwe, ponieważ zawiera niektóre pliki lub podkatalogi
+CannotRemoveDirectoryContainsFiles=Usunięcie nie jest możliwe, ponieważ zawiera niektóre pliki
 ECMFileManager=Menedżer plików
-ECMSelectASection=Select a directory in the tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-NoDirectoriesFound=No directories found
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
+ECMSelectASection=Wybierz katalog w drzewie ...
+DirNotSynchronizedSyncFirst=Wydaje się, że ten katalog został utworzony lub zmodyfikowany poza modułem ECM. Musisz najpierw kliknąć przycisk „Resync”, aby zsynchronizować dysk i bazę danych w celu pobrania zawartości tego katalogu.
+ReSyncListOfDir=Ponownie zsynchronizuj listę katalogów
+HashOfFileContent=Skrót zawartości pliku
+NoDirectoriesFound=Nie znaleziono katalogów
+FileNotYetIndexedInDatabase=Plik nie został jeszcze zindeksowany w bazie danych (spróbuj przesłać go ponownie)
+ExtraFieldsEcmFiles=Pliki Extrafields Ecm
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
+ECMSetup=Konfiguracja ECM
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index bd9179e37d9..826b8bb629f 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -4,33 +4,33 @@
 NoErrorCommitIsDone=Nie ma błędu, zobowiązujemy
 # Errors
 ErrorButCommitIsDone=Znalezione błędy, ale mimo to możemy potwierdzić
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
+ErrorBadEMail=E-mail %s jest nieprawidłowy
+ErrorBadMXDomain=E-mail %s wydaje się nieprawidłowy (domena nie ma prawidłowego rekordu MX)
 ErrorBadUrl=Url %s jest błędny
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorBadValueForParamNotAString=Zła wartość parametru. Zazwyczaj dołącza się, gdy brakuje tłumaczenia.
+ErrorRefAlreadyExists=Odniesienie <b> %s </b> już istnieje.
 ErrorLoginAlreadyExists=Zaloguj %s już istnieje.
 ErrorGroupAlreadyExists=Grupa %s już istnieje.
 ErrorRecordNotFound=Rekord nie został znaleziony.
 ErrorFailToCopyFile=Nie udało się skopiować pliku '<b>%s</b>' do '<b>%s</b>'.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Nie udało się skopiować katalogu „<b> %s </b>” do „<b> %s </b>”.
 ErrorFailToRenameFile=Nie można zmienić nazwy pliku '<b>%s</b>' na '<b>%s</b>'.
 ErrorFailToDeleteFile=Nie można usunąć pliku '<b>%s</b>'.
 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>'.
+ErrorFailToMakeReplacementInto=Nie udało się zastąpić pliku „<b> %s </b>”.
+ErrorFailToGenerateFile=Nie udało się wygenerować pliku „<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
-ErrorBadThirdPartyName=Bad value for third-party name
+ErrorBadThirdPartyName=Zła wartość dla nazwy kontrahenta
 ErrorProdIdIsMandatory=%s jest obowiązkowy
 ErrorBadCustomerCodeSyntax=Zła skadnia dla kodu klienta
-ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadBarCodeSyntax=Zła składnia kodu kreskowego. Być może ustawiłeś zły typ kodu kreskowego lub zdefiniowałeś maskę kodu kreskowego dla numeracji, która nie pasuje do zeskanowanej wartości.
 ErrorCustomerCodeRequired=Wymagany kod klienta
-ErrorBarCodeRequired=Barcode required
+ErrorBarCodeRequired=Wymagany kod kreskowy
 ErrorCustomerCodeAlreadyUsed=Kod klienta jest już używany
 ErrorBarCodeAlreadyUsed=Kod kreskowy już używany
 ErrorPrefixRequired=Wymaga przedrostka
@@ -38,19 +38,19 @@ ErrorBadSupplierCodeSyntax=Zła składnia kodu dostawcy
 ErrorSupplierCodeRequired=Wymagany kod dostawcy
 ErrorSupplierCodeAlreadyUsed=Kod dostawcy został już użyty
 ErrorBadParameters=Złe parametry
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Błędne lub brakujące parametry
 ErrorBadValueForParameter=Zła wartość '%s' dla parametru '%s'
 ErrorBadImageFormat=Plik ze zdjęciem ma nie wspierany format (twoje PHP nie wspiera funcji konwersji zdjęć w tym formacie)
 ErrorBadDateFormat=Wartość '%s' ma zły format daty
 ErrorWrongDate=Data nie jest poprawna!
 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. Maybe it is associated to Dolibarr entities.
+ErrorUserCannotBeDelete=Nie można usunąć użytkownika. Może jest to związane z podmiotami Dolibarr.
 ErrorFieldsRequired=Niektóre pola wymagane nie były uzupełnione.
 ErrorSubjectIsRequired=Temat wiadomości jest wymagany
 ErrorFailedToCreateDir=Nie można utworzyć katalogu. Sprawdź, czy serwer WWW użytkownik ma uprawnienia do zapisu do katalogu dokumentów Dolibarr. Jeśli parametr <b>safe_mode</b> jest włączona w tym PHP, czy posiada Dolibarr php pliki do serwera internetowego użytkownika (lub grupy).
 ErrorNoMailDefinedForThisUser=Nie określono adresu email dla tego użytkownika
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
+ErrorSetupOfEmailsNotComplete=Konfiguracja e-maili nie została zakończona
 ErrorFeatureNeedJavascript=Ta funkcja wymaga do pracy aktywowanego JavaScript. Zmień to w konfiguracji - wyświetlanie.
 ErrorTopMenuMustHaveAParentWithId0=Menu typu "góry" nie może mieć dominującej menu. Umieść 0 dominującej w menu lub wybrać z menu typu "Lewy".
 ErrorLeftMenuMustHaveAParentId=Menu typu "Lewy" musi mieć identyfikator rodzica.
@@ -59,50 +59,51 @@ ErrorDirNotFound=Nie znaleziono katalogu <b>%s</b> (Bad ścieżki złe uprawnien
 ErrorFunctionNotAvailableInPHP=Funkcja <b>%s</b> jest wymagana dla tej funkcjonalności, ale nie jest dostępna w tej wersji/konfiguracji PHP.
 ErrorDirAlreadyExists=Katalog o takiej nazwie już istnieje.
 ErrorFileAlreadyExists=Plik o takiej nazwie już istnieje.
+ErrorDestinationAlreadyExists=Istnieje już inny plik o nazwie <b> %s </b>.
 ErrorPartialFile=Plik nieodebrany w całości przez serwer.
 ErrorNoTmpDir=Tymczasowy directy %s nie istnieje.
 ErrorUploadBlockedByAddon=Prześlij zablokowane / PHP wtyczki Apache.
 ErrorFileSizeTooLarge=Rozmiar pliku jest zbyt duży.
-ErrorFieldTooLong=Field %s is too long.
+ErrorFieldTooLong=Pole %s jest za długie.
 ErrorSizeTooLongForIntType=Rozmiar zbyt długi dal typu int (max %s cyfr)
 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=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
+ErrorFieldCanNotContainSpecialCharacters=Pole <b> %s </b> nie może zawierać znaków specjalnych.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Pole <b> %s </b> nie może zawierać znaków specjalnych ani wielkich liter i nie może zawierać tylko cyfr.
+ErrorFieldMustHaveXChar=Pole <b> %s </b> musi zawierać co najmniej %s znaków.
 ErrorNoAccountancyModuleLoaded=Nie aktywowano modułu księgowości
 ErrorExportDuplicateProfil=Ta nazwa profil już istnieje dla tego zestawu eksportu.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP dopasowywania nie jest kompletna.
 ErrorLDAPMakeManualTest=A. LDIF plik został wygenerowany w katalogu %s. Spróbuj załadować go ręcznie z wiersza polecenia, aby mieć więcej informacji na temat błędów.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
-ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
+ErrorCantSaveADoneUserWithZeroPercentage=Nie można zapisać akcji ze stanem „nie rozpoczęto”, jeśli również wypełnione jest pole „wykonane przez”.
+ErrorRefAlreadyExists=Odniesienie <b> %s </b> już istnieje.
+ErrorPleaseTypeBankTransactionReportName=Proszę podać nazwę wyciągu bankowego, na który należy zgłosić wpis (format YYYYMM or YYYYMMDD)
+ErrorRecordHasChildren=Nie udało się usunąć rekordu, ponieważ zawiera on niektóre rekordy podrzędne.
+ErrorRecordHasAtLeastOneChildOfType=Obiekt ma co najmniej jedno dziecko typu %s
+ErrorRecordIsUsedCantDelete=Nie można usunąć rekordu. Jest już używany lub dołączony do innego obiektu.
 ErrorModuleRequireJavascript=JavaScript nie może być wyłączony aby korzystać z tej funkcji. Aby włączyć/wyłączyć Javascript, przejdź do menu Start->Ustawienia->Ekran.
 ErrorPasswordsMustMatch=Oba hasła muszą się zgadzać
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
-ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
-ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
-ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
+ErrorContactEMail=Wystąpił błąd techniczny. Skontaktuj się z administratorem pod następującym adresem e-mail <b> %s </b> i podaj w wiadomości kod błędu <b> %s </b> lub dodaj kopię ekranową tej strony.
+ErrorWrongValueForField=Pole <b> %s </b>: '<b> %s </b>' nie jest zgodne z regułą wyrażenia regularnego <b>%s</b>
+ErrorFieldValueNotIn=Pole <b> %s </b>: '<b> %s </b>' nie jest wartością znajdującą się w polu <b> %s </b> z <b> %s </b>
+ErrorFieldRefNotIn=Pole <b> %s </b>: '<b> %s </b>' nie jest </b>%s</b>istniejącym ref
+ErrorsOnXLines=Znaleziono błędy %s
 ErrorFileIsInfectedWithAVirus=Program antywirusowy nie był w stanie potwierdzić (plik może być zainfekowany przez wirusa)
 ErrorSpecialCharNotAllowedForField=Znaki specjalne nie są dozwolone dla pola "%s"
 ErrorNumRefModel=Odniesienia nie istnieje w bazie danych (%s) i nie jest zgodna z tą zasadą numeracji. Zmiana nazwy lub usuwanie zapisu w odniesieniu do aktywacji tego modułu.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
-ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorQtyTooLowForThisSupplier=Ilość za mała dla tego dostawcy lub brak zdefiniowanej ceny dla tego produktu dla tego dostawcy
+ErrorOrdersNotCreatedQtyTooLow=Niektóre zamówienia nie zostały utworzone z powodu zbyt małej ilości
+ErrorModuleSetupNotComplete=Konfiguracja modułu %s wygląda na niekompletną. Idź do Strona Główna - Ustawienia - Moduły/Aplikacje aby ukończyć konfigurację.
 ErrorBadMask=Błąd w masce wprowadzania
 ErrorBadMaskFailedToLocatePosOfSequence=Błąd, maska ​​bez kolejnego numeru
 ErrorBadMaskBadRazMonth=Błąd, zła wartość zresetowane
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorMaxNumberReachForThisMask=Osiągnięto maksymalną liczbę dla tej maski
 ErrorCounterMustHaveMoreThan3Digits=Licznik musi mieć więcej niż 3 cyfry
-ErrorSelectAtLeastOne=Error, select at least one entry.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorSelectAtLeastOne=Błąd, wybierz co najmniej jeden wpis.
+ErrorDeleteNotPossibleLineIsConsolidated=Nie można usunąć, ponieważ rekord jest powiązany z transakcją bankową, która jest pojednana
 ErrorProdIdAlreadyExist=%s jest przypisany do innego państwa
 ErrorFailedToSendPassword=Nie można wysłać hasła
 ErrorFailedToLoadRSSFile=Nie dostać kanału RSS. Spróbuj dodać stałą MAIN_SIMPLEXMLLOAD_DEBUG czy komunikaty o błędach nie zawiera wystarczających informacji.
@@ -122,34 +123,34 @@ ErrorLoginDoesNotExists=Użytkownik <b>%s</b> nie został znaleziony.
 ErrorLoginHasNoEmail=Ten użytkownik nie ma adresu e-mail. Proces przerwany.
 ErrorBadValueForCode=Zła wartość kody zabezpieczeń. Wprowadź nową wartość...
 ErrorBothFieldCantBeNegative=Pola %s i %s nie może być zarówno negatywny
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorFieldCantBeNegativeOnInvoice=Pole <strong> %s </strong> nie może być ujemne w przypadku tego typu faktury. Jeśli chcesz dodać linię rabatu, po prostu najpierw utwórz rabat (z pola „%s” na karcie podmiotu trzeciego) i zastosuj go do faktury.
+ErrorLinesCantBeNegativeForOneVATRate=Suma wierszy (bez podatku) nie może być ujemna dla danej niezerowej stawki VAT (Znaleziono sumę ujemną dla stawki VAT <b> %s </b> %%).
+ErrorLinesCantBeNegativeOnDeposits=Wiersze nie mogą być ujemne w depozycie. Jeśli to zrobisz, napotkasz problemy, kiedy będziesz musiał wykorzystać depozyt w końcowej fakturze.
 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=No engine to zip/unzip %s file in this PHP
+ErrNoZipEngine=Brak silnika do spakowania/rozpakowania pliku %s w tym PHP
 ErrorFileMustBeADolibarrPackage=Plik% s musi być pakiet zip Dolibarr
-ErrorModuleFileRequired=You must select a Dolibarr module package file
+ErrorModuleFileRequired=Musisz wybrać plik pakietu modułu Dolibarr
 ErrorPhpCurlNotInstalled=PHP CURL nie jest zainstalowany, to jest niezbędne, aby porozmawiać z Paypal
 ErrorFailedToAddToMailmanList=Nie udało się dodać% s do% s listy Mailman lub podstawy SPIP
 ErrorFailedToRemoveToMailmanList=Nie udało się usunąć rekord% s do% s listy Mailman lub podstawy SPIP
 ErrorNewValueCantMatchOldValue=Nowa wartość nie może być równa starego
 ErrorFailedToValidatePasswordReset=Nie udało się REINIT hasło. Mogą być wykonywane już reinit (ten link może być używany tylko jeden raz). Jeśli nie, spróbuj ponownie uruchomić proces reinit.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorToConnectToMysqlCheckInstance=Połączenie z bazą danych nie powiodło się. Sprawdź, czy serwer bazy danych jest uruchomiony (na przykład za pomocą mysql/mariadb możesz go uruchomić z wiersza poleceń za pomocą polecenia „sudo service mysql start”).
 ErrorFailedToAddContact=Nie udało się dodać kontaktu
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
+ErrorDateMustBeBeforeToday=Data musi być wcześniejsza niż dzisiaj
+ErrorDateMustBeInFuture=Data musi być późniejsza niż dzisiaj
 ErrorPaymentModeDefinedToWithoutSetup=Tryb płatność została ustawiona na typ% s, ale konfiguracja modułu faktury nie została zakończona do określenia informacji, aby pokazać tym trybie płatności.
 ErrorPHPNeedModule=Błąd, PHP musi mieć zainstalowany moduł <b>%s</b>, aby korzystać z tej funkcji.
 ErrorOpenIDSetupNotComplete=Ty konfiguracji Dolibarr plik konfiguracyjny, aby umożliwić uwierzytelnianie OpenID, ale adres URL usługi OpenID nie jest zdefiniowany w stałej% s
 ErrorWarehouseMustDiffers=magazyn źródłowy i docelowy musi być różny
 ErrorBadFormat=Zły 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.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Błąd, ten członek nie jest jeszcze powiązany z żadnym kontrahentem. Połącz członka z istniejącym kontrahentem lub utwórz nowego kontrahenta przed utworzeniem subskrypcji z fakturą.
 ErrorThereIsSomeDeliveries=Błąd, występuje kilka dostaw związanych z tą przesyłką. Usunięcie odrzucone.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
+ErrorCantDeletePaymentReconciliated=Nie można usunąć płatności, która wygenerowała uzgodniony wpis bankowy
+ErrorCantDeletePaymentSharedWithPayedInvoice=Nie można usunąć płatności współdzielonej z co najmniej jedną fakturą o statusie Zapłacona
 ErrorPriceExpression1=Nie można przypisać do stałej '% s'
 ErrorPriceExpression2=Nie można przedefiniować wbudowanej funkcji "%s"
 ErrorPriceExpression3=Niezdefiniowana zmienna '% s' w definicji funkcji
@@ -158,7 +159,7 @@ ErrorPriceExpression5=Nieoczekiwany '%s'
 ErrorPriceExpression6=Błędna liczba argumentów (%s podano, %s oczekiwany)
 ErrorPriceExpression8=Nieoczekiwany operator '%s'
 ErrorPriceExpression9=Wystąpił nieoczekiwany błąd
-ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression10=Operator „%s” nie ma operandu
 ErrorPriceExpression11=Spodziewając '% s'
 ErrorPriceExpression14=Dzielenie przez zero
 ErrorPriceExpression17=Niezdefiniowana zmienna '%s'
@@ -166,12 +167,12 @@ ErrorPriceExpression19=Nie znaleziono wyrażenia
 ErrorPriceExpression20=Puste wyrażenie
 ErrorPriceExpression21=Pusty wynik '%s'
 ErrorPriceExpression22=Wynik negatywny '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpression23=Nieznana lub nieustawiona zmienna „%s” w %s
+ErrorPriceExpression24=Zmienna „%s” istnieje, ale nie ma wartości
 ErrorPriceExpressionInternal=Wewnętrzny błąd '%s'
 ErrorPriceExpressionUnknown=Nieznany błąd '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Magazyn źródłowy i docelowy musi być różny
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorTryToMakeMoveOnProductRequiringBatchData=Błąd podczas próby przesunięcia zapasów bez informacji o partii/serii w produkcie „%s” wymagającym informacji o partii/serii
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Wszystkie zarejestrowane przyjęcia muszą najpierw zostać zweryfikowane (zatwierdzone lub odrzucone) przed dopuszczeniem ich do wykonania tej akcji
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Wszystkie zarejestrowane przyjęcia muszą najpierw zostać zweryfikowane (zatwierdzone) przed dopuszczeniem ich do wykonania tej akcji
 ErrorGlobalVariableUpdater0=Żądanie HTTP nie powiodło się z powodu błędu '%s'
@@ -182,108 +183,116 @@ ErrorGlobalVariableUpdater4=Klient SOAP nie powiodło się z powodu błędu '% s
 ErrorGlobalVariableUpdater5=Nie wybrano zmiennej globalnej
 ErrorFieldMustBeANumeric=Pole <b>%s</b> musi mieć wartość numeryczną
 ErrorMandatoryParametersNotProvided=Obowiązkowe parametr (y) nie przewidziane
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorOppStatusRequiredIfAmount=Określasz szacunkową kwotę dla tego potencjalnego klienta. Musisz więc również wpisać jego status.
+ErrorFailedToLoadModuleDescriptorForXXX=Nie udało się załadować klasy deskryptora modułu dla %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad definicja tablicy w menu modułu deskryptora (zły stosunek jakości do kluczowego fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorSavingChanges=Wystąpił błąd podczas zapisywania zmian
+ErrorWarehouseRequiredIntoShipmentLine=Magazyn jest wymagany na linii do wysyłki
 ErrorFileMustHaveFormat=Flik musi mieć format %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
-ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
+ErrorFilenameCantStartWithDot=Nazwa pliku nie może zaczynać się od „.”
+ErrorSupplierCountryIsNotDefined=Kraj dla tego dostawcy nie jest zdefiniowany. Popraw to najpierw.
+ErrorsThirdpartyMerge=Nie udało się scalić dwóch rekordów. Żądanie anulowane.
 ErrorStockIsNotEnoughToAddProductOnOrder=Zapas dla artykułu %sjest nie wystarczający, aby dodać go do nowego zamówienia
 ErrorStockIsNotEnoughToAddProductOnInvoice=Zapas dla artykułu %s jest nie wystarczający, aby dodać go do nowej faktury
 ErrorStockIsNotEnoughToAddProductOnShipment=Zapas dla artykułu %s jest nie wystarczający, aby dodać go do nowej wysyłki
 ErrorStockIsNotEnoughToAddProductOnProposal=Zapas dla artykułu %s jest nie wystarczający, aby dodać go do nowej propozycji
-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.
+ErrorFailedToLoadLoginFileForMode=Nie udało się uzyskać klucza logowania dla trybu „%s”.
+ErrorModuleNotFound=Nie znaleziono pliku modułu.
+ErrorFieldAccountNotDefinedForBankLine=Wartość dla konta księgowego nie została zdefiniowana dla identyfikatora wiersza źródłowego %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Wartość dla konta księgowego nie została zdefiniowana dla identyfikatora faktury %s (%s)
+ErrorFieldAccountNotDefinedForLine=Wartość dla konta księgowego nie została zdefiniowana dla wiersza (%s)
+ErrorBankStatementNameMustFollowRegex=Błąd, nazwa wyciągu bankowego musi być zgodna z następującą regułą składni %s
+ErrorPhpMailDelivery=Sprawdź, czy nie używasz zbyt dużej liczby odbiorców i czy zawartość wiadomości e-mail nie jest podobna do spamu. Poproś także administratora o sprawdzenie plików dziennika zapory i serwera, aby uzyskać pełniejsze informacje.
+ErrorUserNotAssignedToTask=Użytkownik musi być przypisany do zadania, aby móc wprowadzić czasochłonne.
 ErrorTaskAlreadyAssigned=Zadanie dopisane do użytkownika
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorModuleFileSeemsToHaveAWrongFormat=Wygląda na to, że pakiet modułów ma nieprawidłowy format.
+ErrorModuleFileSeemsToHaveAWrongFormat2=Co najmniej jeden obowiązkowy katalog musi istnieć w pliku ZIP modułu: <strong> %s </strong> lub <strong> %s </strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Nazwa pakietu modułu (<strong> %s </strong>) nie odpowiada oczekiwanej składni nazwy: <strong> %s </strong>
+ErrorDuplicateTrigger=Błąd, zduplikowana nazwa wyzwalacza %s. Już załadowano z %s.
+ErrorNoWarehouseDefined=Błąd, nie zdefiniowano magazynów.
+ErrorBadLinkSourceSetButBadValueForRef=Link, którego używasz, jest nieprawidłowy. Zdefiniowano „źródło” płatności, ale wartość „ref” jest nieprawidłowa.
 ErrorTooManyErrorsProcessStopped=Zbyt dużo błędów. Proces został zatrzymany.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
-ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
-ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
-ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
-ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
-ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
-ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
-ErrorSearchCriteriaTooSmall=Search criteria too small.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
-ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
-ErrorFieldRequiredForProduct=Field '%s' is required for product %s
-ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
-ErrorAddAtLeastOneLineFirst=Add at least one line first
-ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
-ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
-ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
-ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
-ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
-ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
-ErrorReplaceStringEmpty=Error, the string to replace into is empty
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
-ErrorLoginDateValidity=Error, this login is outside the validity date range
-ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
-ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
-ErrorNotAvailableWithThisDistribution=Not available with this distribution
-ErrorPublicInterfaceNotEnabled=Public interface was not enabled
-ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
-ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
-ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Masowa walidacja nie jest możliwa, gdy w tej akcji ustawiono opcję zwiększania/zmniejszania zapasów (należy walidować pojedynczo, aby można było zdefiniować magazyn do zwiększania/zmniejszania)
+ErrorObjectMustHaveStatusDraftToBeValidated=Obiekt %s musi mieć status „Wersja robocza”, aby został zweryfikowany.
+ErrorObjectMustHaveLinesToBeValidated=Obiekt %s musi mieć wiersze do walidacji.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Za pomocą akcji masowej „Wyślij e-mailem” można wysyłać tylko zweryfikowane faktury.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Musisz wybrać, czy artykuł jest produktem predefiniowanym, czy nie
+ErrorDiscountLargerThanRemainToPaySplitItBefore=Zniżka, którą próbujesz zastosować, jest większa niż kwota do zapłaty. Podziel rabat na 2 mniejsze rabaty wcześniej.
+ErrorFileNotFoundWithSharedLink=Nie znaleziono pliku. Być może klucz udostępniania został zmodyfikowany lub plik został niedawno usunięty.
+ErrorProductBarCodeAlreadyExists=Kod kreskowy produktu %s już istnieje w innym numerze referencyjnym produktu.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Należy również pamiętać, że używanie zestawów do automatycznego zwiększania/zmniejszania ilości produktów podrzędnych nie jest możliwe, gdy co najmniej jeden produkt podrzędny (lub produkt podrzędny z produktów podrzędnych) wymaga numeru seryjnego/partii.
+ErrorDescRequiredForFreeProductLines=Opis jest obowiązkowy dla linii z darmowym produktem
+ErrorAPageWithThisNameOrAliasAlreadyExists=Strona/kontener <strong> %s </strong> ma taką samą nazwę lub alternatywny alias, jak ten, którego próbujesz użyć
+ErrorDuringChartLoad=Błąd podczas ładowania planu kont. Jeśli kilka kont nie zostało załadowanych, nadal możesz wprowadzić je ręcznie.
+ErrorBadSyntaxForParamKeyForContent=Zła składnia parametru keyforcontent. Musi mieć wartość zaczynającą się od %s lub %s
+ErrorVariableKeyForContentMustBeSet=Błąd, należy ustawić stałą o nazwie %s (z treścią tekstową do wyświetlenia) lub %s (z zewnętrznym adresem URL do wyświetlenia).
+ErrorURLMustStartWithHttp=URL %s musi zaczynać się od http: // lub https: //
+ErrorHostMustNotStartWithHttp=Nazwa hosta %s NIE może zaczynać się od http: // lub https: //
+ErrorNewRefIsAlreadyUsed=Błąd, nowe odniesienie jest już używane
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Błąd, nie można usunąć płatności połączonej z zamkniętą fakturą.
+ErrorSearchCriteriaTooSmall=Kryteria wyszukiwania są za małe.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Obiekty muszą mieć status „Aktywne”, aby mogły być wyłączone
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Aby obiekty mogły być włączone, muszą mieć stan „Wersja robocza” lub „Wyłączone”
+ErrorNoFieldWithAttributeShowoncombobox=Żadne pola nie mają właściwości „showoncombobox” w definicji obiektu „%s”. Nie ma mowy, żeby pokazać kombolistę.
+ErrorFieldRequiredForProduct=Pole „%s” jest wymagane dla produktu %s
+ProblemIsInSetupOfTerminal=Problem dotyczy konfiguracji terminala %s.
+ErrorAddAtLeastOneLineFirst=Najpierw dodaj co najmniej jedną linię
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Błąd, rekord został już przeniesiony do księgowości, usunięcie nie jest możliwe.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Błąd, język jest obowiązkowy, jeśli ustawisz stronę jako tłumaczenie innej strony.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Błąd, język przetłumaczonej strony jest taki sam jak ten.
+ErrorBatchNoFoundForProductInWarehouse=Nie znaleziono partii / numeru seryjnego dla produktu „%s” w magazynie „%s”.
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Brak wystarczającej ilości dla tej partii / serii dla produktu „%s” w magazynie „%s”.
+ErrorOnlyOneFieldForGroupByIsPossible=Możliwe jest tylko 1 pole dla „Grupuj według” (pozostałe są odrzucane)
+ErrorTooManyDifferentValueForSelectedGroupBy=Znaleziono zbyt wiele różnych wartości (więcej niż <b> %s </b>) dla pola „<b> %s </b>”, więc nie możemy użyć go jako grupy graficznej. Pole „Grupuj według” zostało usunięte. Może chciałeś użyć go jako osi X?
+ErrorReplaceStringEmpty=Błąd, ciąg znaków do zamiany jest pusty
+ErrorProductNeedBatchNumber=Błąd, produkt „<b> %s </b>” wymaga numeru partii / numeru seryjnego
+ErrorProductDoesNotNeedBatchNumber=Błąd, produkt „<b> %s </b>” nie akceptuje numeru partii / numeru seryjnego
+ErrorFailedToReadObject=Błąd, nie można odczytać obiektu typu <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Błąd, parametr <b> %s </b> musi być włączony w <b> conf / conf.php <b>, aby umożliwić korzystanie z interfejsu wiersza poleceń przez wewnętrzny harmonogram zadań
+ErrorLoginDateValidity=Błąd, ten login jest poza zakresem dat ważności
+ErrorValueLength=Długość pola „<b> %s </b>” musi być większa niż „<b> %s </b>”
+ErrorReservedKeyword=Słowo „<b> %s </b>” jest zastrzeżonym słowem kluczowym
+ErrorNotAvailableWithThisDistribution=Niedostępne w tej dystrybucji
+ErrorPublicInterfaceNotEnabled=Interfejs publiczny nie został włączony
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Język nowej strony musi być zdefiniowany, jeśli jest ustawiony jako tłumaczenie innej strony
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Język nowej strony nie może być językiem źródłowym, jeśli jest ustawiony jako tłumaczenie innej strony
+ErrorAParameterIsRequiredForThisOperation=W przypadku tej operacji parametr jest obowiązkowy
+ErrorDateIsInFuture=Błąd, data nie może przypadać w przyszłości
+ErrorAnAmountWithoutTaxIsRequired=Błąd, kwota jest obowiązkowa
+ErrorAPercentIsRequired=Błąd, proszę poprawnie wpisać wartość procentową
+ErrorYouMustFirstSetupYourChartOfAccount=Najpierw musisz ustawić swój plan kont
 
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Twój parametr PHP upload_max_filesize (%s) jest wyższy niż parametr PHP post_max_size (%s). To nie jest spójna konfiguracja.
 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.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningMandatorySetupNotComplete=Kliknij tutaj, aby ustawić wymagane parametry
+WarningEnableYourModulesApplications=Kliknij tutaj, aby włączyć swoje moduły i aplikacje
 WarningSafeModeOnCheckExecDir=Uwaga, opcja <b>safe_mode</b> w PHP jest więc polecenia muszą być przechowywane wewnątrz katalogu <b>safe_mode_exec_dir</b> parametrów deklarowanych przez php.
 WarningBookmarkAlreadyExists=Zakładka z tego tytułu lub ten cel (URL) już istnieje.
 WarningPassIsEmpty=Ostrzeżenie, hasło do bazy danych jest puste. Jest to luka w zabezpieczeniach. Powinieneś dodać hasło do bazy danych i zmienić wpis w pliku conf.php aby zmiany przyniosły efekt.
 WarningConfFileMustBeReadOnly=Uwaga, plik konfiguracyjny <b>(htdocs / conf / conf.php)</b> mogą być zastąpione przez serwer internetowy. Jest to poważna luka w zabezpieczeniach. Modyfikowanie uprawnień na wniosek jest w trybie tylko do odczytu dla użytkownika system operacyjny używany przez serwer sieci Web. Jeśli używasz systemu Windows i format FAT na dysku, musisz wiedzieć, że ten system plików nie pozwala na dodawanie uprawnień do pliku, więc nie może być całkowicie bezpieczne.
 WarningsOnXLines=Ostrzeżeń na linii źródło <b>%s</b>
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningNoDocumentModelActivated=Żaden model do generowania dokumentów nie został aktywowany. Model zostanie wybrany domyślnie, dopóki nie sprawdzisz konfiguracji modułu.
+WarningLockFileDoesNotExists=Ostrzeżenie, po zakończeniu instalacji należy wyłączyć narzędzia do instalacji / migracji, dodając plik <b> install.lock </b> do katalogu <b> %s </b>. Pominięcie utworzenia tego pliku stanowi poważne zagrożenie bezpieczeństwa.
+WarningUntilDirRemoved=Wszystkie ostrzeżenia dotyczące bezpieczeństwa (widoczne tylko dla administratorów) pozostaną aktywne tak długo, jak długo będzie obecna luka (lub gdy zostanie dodana stała MAIN_REMOVE_INSTALL_WARNING w Setup-> Other Setup).
 WarningCloseAlways=Ostrzeżenie, zamykanie odbywa się nawet wtedy, gdy kwota zależy od elementów źródłowych i docelowych. Włącz tę funkcję, z zachowaniem ostrożności.
 WarningUsingThisBoxSlowDown=Ostrzeżenie, za pomocą tego pola spowolnić poważnie do wszystkich stron zawierających pola.
 WarningClickToDialUserSetupNotComplete=Konfiguracja ClickToDial informacji dla użytkownika nie są kompletne (patrz zakładka ClickToDial na kartę użytkownika).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funkcja wyłączona gdy konfiguracja wyświetlania jest zoptymalizowana pod kątem osób niewidomych lub przeglądarek tekstowych.
 WarningPaymentDateLowerThanInvoiceDate=Termin płatności (%s) jest wcześniejszy niż dzień wystawienia faktury (%s) dla faktury %s.
 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.
+WarningSomeLinesWithNullHourlyRate=Czasami były rejestrowane przez niektórych użytkowników, a ich stawka godzinowa nie była zdefiniowana. Zastosowano wartość 0 %s na godzinę, ale może to skutkować nieprawidłową oceną poświęconego czasu.
 WarningYourLoginWasModifiedPleaseLogin=Twój login został zmodyfikowany. Z powodów bezpieczeństwa musisz zalogować się z użyciem nowego loginy przed kolejną czynnością.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
-WarningProjectClosed=Project is closed. You must re-open it first.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
-WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
-WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
-WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningAnEntryAlreadyExistForTransKey=Istnieje już wpis dotyczący klucza tłumaczenia dla tego języka
+WarningNumberOfRecipientIsRestrictedInMassAction=Uwaga, liczba różnych odbiorców jest ograniczona do <b> %s </b> podczas korzystania z akcji masowych na listach
+WarningDateOfLineMustBeInExpenseReportRange=Uwaga, data wiersza nie mieści się w zakresie raportu z wydatków
+WarningProjectDraft=Projekt jest nadal w trybie roboczym. Nie zapomnij go zweryfikować, jeśli planujesz używać zadań.
+WarningProjectClosed=Projekt zamknięty. Najpierw musisz go ponownie otworzyć.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Niektóre transakcje bankowe zostały usunięte po wygenerowaniu paragonu zawierającego je. Zatem liczba czeków i suma paragonów może różnić się od liczby i sumy na liście.
+WarningFailedToAddFileIntoDatabaseIndex=Ostrzeżenie, nie można dodać wpisu pliku do tabeli indeksów bazy danych ECM
+WarningTheHiddenOptionIsOn=Ostrzeżenie, ukryta opcja <b> %s </b> jest włączona.
+WarningCreateSubAccounts=Ostrzeżenie, nie możesz bezpośrednio utworzyć konta podrzędnego, musisz utworzyć stronę trzecią lub użytkownika i przypisać im kod księgowy, aby znaleźć je na tej liście
+WarningAvailableOnlyForHTTPSServers=Dostępne tylko w przypadku korzystania z bezpiecznego połączenia HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Moduł %s nie został włączony. Możesz więc przegapić wiele wydarzeń tutaj.
+ErrorActionCommPropertyUserowneridNotDefined=Właściciel użytkownika jest wymagany
+ErrorActionCommBadType=Wybrany typ zdarzenia (id: %n, kod: %s) nie istnieje w słowniku typów zdarzeń
diff --git a/htdocs/langs/pl_PL/externalsite.lang b/htdocs/langs/pl_PL/externalsite.lang
index adf883f8d4d..1f03b277a8b 100644
--- a/htdocs/langs/pl_PL/externalsite.lang
+++ b/htdocs/langs/pl_PL/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Skonfiguruj link do zewnętrznej strony internetowej
-ExternalSiteURL=Zewnętrzny URL strony
+ExternalSiteURL=Adres URL witryny zewnętrznej z treścią elementu iframe HTML
 ExternalSiteModuleNotComplete=Moduł zewnętrznej strony internetowej nie został skonfigurowany poprawny
 ExampleMyMenuEntry=Moje wejścia do menu
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 8d654d34ccd..582ec9ed214 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -29,8 +29,8 @@ AvailableVariables=Dostępne zmienne substytucji
 NoTranslation=Brak tłumaczenia
 Translation=Tłumaczenie
 CurrentTimeZone=Strefa czasowa PHP (server)
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
+EmptySearchString=Wprowadź niepuste kryteria wyszukiwania
+EnterADateCriteria=Wprowadź kryteria daty
 NoRecordFound=Rekord nie został znaleziony.
 NoRecordDeleted=Brak usuniętych rekordów
 NotEnoughDataYet=Za mało danych
@@ -53,20 +53,20 @@ 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.
 ErrorInternalErrorDetected=Wykryto błąd
 ErrorWrongHostParameter=Niewłaściwy parametr hosta
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
+ErrorYourCountryIsNotDefined=Twój kraj nie jest zdefiniowany. Przejdź do Strona Główna-Konfiguracja-Edycja i ponownie opublikuj formularz.
 ErrorRecordIsUsedByChild=Nie można usunąć rekordu. Rekord jest używany przez inny rekord potomny.
 ErrorWrongValue=Błędna wartość
 ErrorWrongValueForParameterX=Nieprawidłowa wartość dla parametru %s
 ErrorNoRequestInError=Nie wykryto żadneog błednego zapytania.
 ErrorServiceUnavailableTryLater=Serwis w tej chwili jest niedostępny. Spróbuj później.
 ErrorDuplicateField=Zduplikuj niepowtarzalną wartość w polu
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorSomeErrorWereFoundRollbackIsDone=Znaleziono błędy. Zmiany zostały wycofane.
+ErrorConfigParameterNotDefined=Parametr <b> %s </b> nie jest zdefiniowany w pliku konfiguracyjnym Dolibarr <b> conf.php </b>.
 ErrorCantLoadUserFromDolibarrDatabase=Nie można znaleźć <b>użytkownika %s</b> Dolibarra w bazie danych.
 ErrorNoVATRateDefinedForSellerCountry=Błąd, nie określono stawki VAT dla kraju " %s".
 ErrorNoSocialContributionForSellerCountry=Błąd, brak określonej stopy podatkowej dla kraju '%s'.
 ErrorFailedToSaveFile=Błąd, nie udało się zapisać pliku.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
+ErrorCannotAddThisParentWarehouse=Próbujesz dodać magazyn nadrzędny, który jest już podrzędny w stosunku do istniejącego magazynu
 MaxNbOfRecordPerPage=Max. ilość wierszy na stronę
 NotAuthorized=Nie masz autoryzacji aby to zrobić
 SetDate=Ustaw datę
@@ -84,10 +84,10 @@ FileUploaded=Plik został pomyślnie przesłany
 FileTransferComplete=Plik(i) załadowany pomyślnie
 FilesDeleted=Plik(i) usunięte pomyślnie
 FileWasNotUploaded=Wybrano pliku do zamontowaia, ale jeszcze nie wysłano. W tym celu wybierz opcję "dołącz plik".
-NbOfEntries=No. of entries
+NbOfEntries=Liczba wpisów
 GoToWikiHelpPage=Przeczytaj pomoc online (wymaga połączenia z internetem)
 GoToHelpPage=Przeczytaj pomoc
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Istnieje specjalna strona pomocy związana z bieżącym ekranem
 HomePage=Strona główna
 RecordSaved=Rekord zapisany
 RecordDeleted=Rekord usunięty
@@ -102,7 +102,7 @@ NoAccount=Brak konta?
 SeeAbove=Patrz wyżej
 HomeArea=STRONA GŁÓWNA
 LastConnexion=Ostatnie logowanie
-PreviousConnexion=Previous login
+PreviousConnexion=Poprzednie logowanie
 PreviousValue=Poprzednia wartość
 ConnectedOnMultiCompany=Podłączono do środowiska
 ConnectedSince=Połączeno od
@@ -113,19 +113,19 @@ RequestLastAccessInError=Ostatni błąd zgłoszeń o dostępie do bazy danych
 ReturnCodeLastAccessInError=Kod zwrotny ostatniego błędu żądania dostępu do bazy danych
 InformationLastAccessInError=Informacje o najnowszym błędzie żądania dostępu do bazy danych
 DolibarrHasDetectedError=Dolibarr wykrył błąd techniczny
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+YouCanSetOptionDolibarrMainProdToZero=Możesz przeczytać plik dziennika lub ustawić opcję $ dolibarr_main_prod na „0” w pliku konfiguracyjnym, aby uzyskać więcej informacji.
+InformationToHelpDiagnose=Te informacje mogą być przydatne do celów diagnostycznych (możesz ustawić opcję $ dolibarr_main_prod na „1”, aby usunąć takie powiadomienia)
 MoreInformation=Więcej informacji
 TechnicalInformation=Informację techniczne
 TechnicalID=Techniczne ID
-LineID=Line ID
+LineID=ID linii
 NotePublic=Uwaga (publiczna)
 NotePrivate=Uwaga (prywatna)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr ustawił ograniczenia dokładności cen jednostkowych <b>do %s</b> miejsc po przecinku.
 DoTest=Test
 ToFilter=Filtr
 NoFilter=Brak filtra
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+WarningYouHaveAtLeastOneTaskLate=Ostrzeżenie, masz co najmniej jeden element, który przekroczył czas tolerancji.
 yes=tak
 Yes=Tak
 no=nie
@@ -162,7 +162,7 @@ Close=Zamknij
 CloseAs=Ustaw status do
 CloseBox=Usuń widget ze swojej tablicy
 Confirm=Potwierdź
-ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=Czy na pewno chcesz wysłać zawartość tej karty pocztą na adres <b> %s </b>?
 Delete=Skasować
 Remove=Usunąć
 Resiliate=Zakończ
@@ -176,7 +176,7 @@ NotValidated=Nie potwierdzone
 Save=Zapisać
 SaveAs=Zapisz jako
 SaveAndStay=Zapisz i zostań
-SaveAndNew=Save and new
+SaveAndNew=Zapisz i nowe
 TestConnection=Test połączenia
 ToClone=Duplikuj
 ConfirmCloneAsk=Czy jesteś pewny, chcesz sklonować objekt<b>%s</b>?
@@ -201,7 +201,7 @@ ReOpen=Otwórz ponownie
 Upload=Wczytaj
 ToLink=Łącze
 Select=Wybierz
-SelectAll=Select all
+SelectAll=Zaznacz wszystko
 Choose=Wybrać
 Resize=Zmiana rozmiaru
 ResizeOrCrop=Zmień rozmiar lub przytnij
@@ -224,7 +224,7 @@ Value=Wartość
 PersonalValue=Osobiste wartości
 NewObject=Nowy %s
 NewValue=Nowa wartość
-OldValue=Old value %s
+OldValue=Stara wartość %s
 CurrentValue=Aktualna wartość
 Code=Kod
 Type=Typ
@@ -239,8 +239,8 @@ Family=Rodzina
 Description=Opis
 Designation=Opis
 DescriptionOfLine=Opis pozycji
-DateOfLine=Date of line
-DurationOfLine=Duration of line
+DateOfLine=Data linii
+DurationOfLine=Czas trwania linii
 Model=Szablon dokumentu
 DefaultModel=Domyślny szablon dokumentu
 Action=Działanie
@@ -263,7 +263,7 @@ Cards=Kartki
 Card=Karta
 Now=Teraz
 HourStart=Godzina startu
-Deadline=Deadline
+Deadline=Ostateczny termin
 Date=Data
 DateAndHour=Data i godzina
 DateToday=Dzisiejsza data
@@ -272,12 +272,13 @@ DateStart=Data rozpoczęcia
 DateEnd=Data zakończenia
 DateCreation=Data utworzenia
 DateCreationShort=Data utworzenia
-IPCreation=Creation IP
+IPCreation=Utworzenie adresu IP
 DateModification=Zmiana daty
 DateModificationShort=Data modyfikacji
-IPModification=Modification IP
+IPModification=Modyfikacja adresu IP
 DateLastModification=Data ostatniej zmiany
 DateValidation=Zatwierdzenie daty
+DateSigning=Data podpisania
 DateClosing=Ostateczny termin
 DateDue=W trakcie terminu
 DateValue=Wartość daty
@@ -294,7 +295,7 @@ DateApprove2=Termin zatwierdzania (drugie zatwierdzenie)
 RegistrationDate=Data rejestracji
 UserCreation=Tworzenie użytkownika
 UserModification=Modyfikacja użytkownika
-UserValidation=Validation user
+UserValidation=Użytkownik walidacji
 UserCreationShort=Utwórz użytkownika
 UserModificationShort=Zmień użytkownika
 UserValidationShort=Zły. Użytkownik
@@ -329,7 +330,7 @@ Morning=Rano
 Afternoon=Popołudniu
 Quadri=Kwadrans
 MonthOfDay=Dzień miesiąca
-DaysOfWeek=Days of week
+DaysOfWeek=Dni tygodnia
 HourShort=H
 MinuteShort=mn
 Rate=Stawka
@@ -352,52 +353,54 @@ Copy=Kopiowanie
 Paste=Wklej
 Default=Domyślny
 DefaultValue=Wartość domyślna
-DefaultValues=Default values/filters/sorting
+DefaultValues=Wartości domyślne/filtry/sortowanie
 Price=Cena
 PriceCurrency=Cena (waluta)
 UnitPrice=Cena jednostkowa
-UnitPriceHT=Unit price (excl.)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceHT=Cena jednostkowa (wył.)
+UnitPriceHTCurrency=Cena jednostkowa (wył.) (Waluta)
 UnitPriceTTC=Cena jednostkowa
 PriceU=cen/szt.
 PriceUHT=cen/szt (netto)
-PriceUHTCurrency=cen/szt (w walucie) 
+PriceUHTCurrency=Cena jednostkowa (netto) (waluta)
 PriceUTTC=Podatek należny/naliczony
 Amount=Ilość
 AmountInvoice=Kwota faktury
 AmountInvoiced=Kwota zafakturowana
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedHT=Kwota zafakturowana (bez podatku)
+AmountInvoicedTTC=Kwota zafakturowana (z podatkiem)
 AmountPayment=Kwota płatności
-AmountHTShort=Amount (excl.)
+AmountHTShort=Kwota (wył.)
 AmountTTCShort=Kwota (zawierająca VAT)
 AmountHT=Kwota (Bez VAT)
 AmountTTC=Kwota (zawierająca VAT)
 AmountVAT=Kwota podatku VAT
-MulticurrencyAlreadyPaid=Already paid, original currency
+MulticurrencyAlreadyPaid=Już zapłacono, oryginalna waluta
 MulticurrencyRemainderToPay=Pozostało do zapłaty, oryginalna waluta
 MulticurrencyPaymentAmount=Kwota płatności, oryginalna waluta
-MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountHT=Kwota (bez podatku), oryginalna waluta
 MulticurrencyAmountTTC=Kwota (zVAT), oryginalna waluta
 MulticurrencyAmountVAT=Kwota VAT, oryginalna waluta
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Kwota ceny podrzędnej w wielu walutach
 AmountLT1=Wartość podatku 2
 AmountLT2=Wartość podatku 3
 AmountLT1ES=Kwota RE
 AmountLT2ES=Kwota IRPF
 AmountTotal=Całkowita kwota
 AmountAverage=Średnia kwota
-PriceQtyMinHT=Price quantity min. (excl. tax)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PriceQtyMinHT=Cena ilość min. (bez podatku)
+PriceQtyMinHTCurrency=Cena ilość min. (bez podatku) (waluta)
+PercentOfOriginalObject=Procent oryginalnego obiektu
+AmountOrPercent=Kwota lub procent
 Percentage=Procentowo
 Total=Razem
 SubTotal=Po podliczeniu
-TotalHTShort=Total (excl.)
-TotalHT100Short=Total 100%% (excl.)
-TotalHTShortCurrency=Total (excl. in currency)
+TotalHTShort=Razem (wył.)
+TotalHT100Short=Razem 100%% (wył.)
+TotalHTShortCurrency=Razem (bez waluty)
 TotalTTCShort=Ogółem (z VAT)
 TotalHT=Total (Bez VAT)
-TotalHTforthispage=Total (excl. tax) for this page
+TotalHTforthispage=Razem (bez podatku) dla tej strony
 Totalforthispage=Suma dla tej strony
 TotalTTC=Ogółem (z VAT)
 TotalTTCToYourCredit=Ogółem (z VAT) na twoje konto
@@ -416,19 +419,19 @@ INCT=Zawiera wszystkie podatki
 VAT=Stawka VAT
 VATIN=IGST
 VATs=Podatek od sprzedaży 
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
+VATINs=Zintegrowany podatek od towarów i usług
+LT1=Podatek obrotowy 2
+LT1Type=Rodzaj podatku od sprzedaży 2
+LT2=Podatek obrotowy 3
+LT2Type=Rodzaj podatku od sprzedaży 3
 LT1ES=RE
 LT2ES=IRPF
-LT1IN=CGST
-LT2IN=SGST
-LT1GC=Additionnal cents
+LT1IN=Centralny podatek od towarów i usług
+LT2IN=Stanowy podatek od towarów i usług
+LT1GC=Dodatkowe centy
 VATRate=Stawka VAT
 VATCode=Kod stawki podatkowej
-VATNPR=Tax Rate NPR
+VATNPR=Stawka podatku NPR
 DefaultTaxRate=Domyślna stawka podatku
 Average=Średni
 Sum=Suma
@@ -438,10 +441,10 @@ RemainToPay=Pozostało do zapłaty
 Module=Moduł/Aplikacja
 Modules=Moduły/Aplikacje
 Option=Opcja
-Filters=Filters
+Filters=Filtry
 List=Lista
 FullList=Pełna lista
-FullConversation=Full conversation
+FullConversation=Pełna rozmowa
 Statistics=Statystyki
 OtherStatistics=Inne statystyki
 Status=Stan
@@ -461,16 +464,16 @@ ActionNotApplicable=Nie dotyczy
 ActionRunningNotStarted=By rozpocząć
 ActionRunningShort=W trakcie
 ActionDoneShort=Zakończone
-ActionUncomplete=Incomplete
-LatestLinkedEvents=Latest %s linked events
+ActionUncomplete=Niekompletny
+LatestLinkedEvents=Najnowsze powiązane wydarzenia %s
 CompanyFoundation=Firma/Organizacja
 Accountant=Księgowa
 ContactsForCompany=Kontakty dla tego zamówienia
 ContactsAddressesForCompany=Kontakt/adres dla tej części/zamówienia/
 AddressesForCompany=Adressy dla części trzeciej
-ActionsOnCompany=Events for this third party
-ActionsOnContact=Events for this contact/address
-ActionsOnContract=Events for this contract
+ActionsOnCompany=Wydarzenia dla tej strony trzeciej
+ActionsOnContact=Wydarzenia dla tego kontaktu/adresu
+ActionsOnContract=Wydarzenia związane z tym kontraktem
 ActionsOnMember=Informacje o wydarzeniach dla tego uzytkownika
 ActionsOnProduct=Wydarzenia dotyczące tego produktu
 NActionsLate=%s późno
@@ -488,9 +491,9 @@ Generate=Wygeneruj
 Duration=Czas trwania
 TotalDuration=Łączny czas trwania
 Summary=Podsumowanie
-DolibarrStateBoard=Database Statistics
-DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No open element to process
+DolibarrStateBoard=Statystyki bazy danych
+DolibarrWorkBoard=Otwarte przedmioty
+NoOpenedElementToProcess=Brak otwartego elementu do przetworzenia
 Available=Dostępny
 NotYetAvailable=Nie są jeszcze dostępne
 NotAvailable=Niedostępne
@@ -500,7 +503,7 @@ By=Przez
 From=Od
 FromDate=Z
 FromLocation=Z
-at=at
+at=w
 to=do
 To=do
 and=i
@@ -521,12 +524,12 @@ Reporting=Raportowanie
 Reportings=Raportowanie
 Draft=Szkic
 Drafts=Robocze
-StatusInterInvoiced=Invoiced
+StatusInterInvoiced=Zafakturowano
 Validated=Zatwierdzona
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Zatwierdzony (do produkcji)
 Opened=Otwarte
-OpenAll=Open (All)
-ClosedAll=Closed (All)
+OpenAll=Otworzone (wszystko)
+ClosedAll=Zamknięte (wszystkie)
 New=Nowy
 Discount=Rabat
 Unknown=Nieznany
@@ -548,8 +551,8 @@ None=Żaden
 NoneF=Żaden
 NoneOrSeveral=Brak lub kilka
 Late=Późno
-LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
-NoItemLate=No late item
+LateDesc=Pozycja jest definiowana jako Opóźniona zgodnie z konfiguracją systemu w menu Strona główna - Konfiguracja - Alerty.
+NoItemLate=Brak spóźnionej pozycji
 Photo=Obraz
 Photos=Obrazy
 AddPhoto=Dodaj obraz
@@ -656,7 +659,7 @@ SupplierPreview=Podgląd dostawcy
 ShowCustomerPreview=Pokaż podgląd klienta
 ShowSupplierPreview=Pokaż podgląd dostawcy
 RefCustomer=Nr ref. klient
-InternalRef=Internal ref.
+InternalRef=Ref. Wewnętrzne
 Currency=Waluta
 InfoAdmin=Informacje dla administratorów
 Undo=Cofnij
@@ -669,7 +672,7 @@ FeatureNotYetSupported=Funkcja nie jest jeszcze obsługiwana
 CloseWindow=Zamknij okno
 Response=Odpowiedź
 Priority=Priorytet
-SendByMail=Wyślij przez email
+SendByMail=Wyślij przez e-mail
 MailSentBy=E-mail został wysłany przez
 NotSent=Nie wysłał
 TextUsedInTheMessageBody=Zawartość emaila 
@@ -678,13 +681,13 @@ SendMail=Wyślij wiadomość email
 Email=Adres e-mail
 NoEMail=Brak e-mail
 AlreadyRead=Obecnie przeczytane
-NotRead=Unread
+NotRead=nieprzeczytane
 NoMobilePhone=Brak telefonu komórkowego
 Owner=Właściciel
 FollowingConstantsWillBeSubstituted=Kolejna zawartość będzie zastąpiona wartością z korespondencji.
 Refresh=Odśwież
 BackToList=Powrót do listy
-BackToTree=Back to tree
+BackToTree=Powrót do drzewa
 GoBack=Wróć
 CanBeModifiedIfOk=Mogą być zmienione  jeśli ważne
 CanBeModifiedIfKo=Mogą być zmienione, jeśli nie ważne
@@ -692,9 +695,9 @@ ValueIsValid=Wartość jest poprawna
 ValueIsNotValid=Wartość jest niepoprawna
 RecordCreatedSuccessfully=Wpis utworzony pomyślnie
 RecordModifiedSuccessfully=Zapis zmodyfikowany pomyślnie
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
+RecordsModified=%s zmodyfikowanych rekordów
+RecordsDeleted= %s usuniętych rekordó
+RecordsGenerated=%swygenerowanych rekordów
 AutomaticCode=Automatyczny kod
 FeatureDisabled=Funkcja wyłączona
 MoveBox=Przenieś widget
@@ -705,14 +708,14 @@ Method=Metoda
 Receive=Odbiór
 CompleteOrNoMoreReceptionExpected=Pełna lub niczego więcej nie oczekiwano
 ExpectedValue=Oczekiwana wartość
-ExpectedQty=Expected Qty
+ExpectedQty=Oczekiwana ilość
 PartialWoman=Część
 TotalWoman=Razem
 NeverReceived=Nigdy nie otrzymała
 Canceled=Anulowany
 YouCanChangeValuesForThisListFromDictionarySetup=Wartości dla tej listy można zmieniać w menu Konfiguracja - Słowniki
 YouCanChangeValuesForThisListFrom=Możesz zmienić wartości dla tej listy z menu %s
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
+YouCanSetDefaultValueInModuleSetup=Możesz ustawić domyślną wartość używaną podczas tworzenia nowego rekordu w konfiguracji modułu
 Color=Kolor
 Documents=Związanych plików
 Documents2=Dokumenty
@@ -722,9 +725,9 @@ MenuECM=Dokumenty
 MenuAWStats=AWStats
 MenuMembers=Członkowie
 MenuAgendaGoogle=Google agenda
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Podatki | Wydatki specjalne
 ThisLimitIsDefinedInSetup=Limit Dollibara (Menu główne-setup-bezpieczeństwo): %s KB, PHP, limit: %s KB
-NoFileFound=Brak dokumentów zapisanych w tym katalogu
+NoFileFound=Brak wgranych dokumentów
 CurrentUserLanguage=Język bieżący
 CurrentTheme=Aktualny temat
 CurrentMenuManager=Aktualny Menu menager
@@ -739,39 +742,39 @@ DateOfSignature=Data podpisu
 HidePassword=Pokaż polecenie z ukrytym hasłem
 UnHidePassword=Pokaż prawdziwe polecenie z otwartym hasłem
 Root=Root
-RootOfMedias=Root of public medias (/medias)
+RootOfMedias=Katalog główny mediów publicznych (/medias)
 Informations=Informacja
 Page=Strona
 Notes=Uwagi
 AddNewLine=Dodaj nowy wiersz
 AddFile=Dodaj plik
-FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
+FreeZone=Produkt dowolnego tekstu
+FreeLineOfType=Element dowolny, wpisz:
 CloneMainAttributes=Skopiuj obiekt z jego głównymi atrybutami
-ReGeneratePDF=Re-generate PDF
+ReGeneratePDF=Wygeneruj ponownie PDF
 PDFMerge=Scalanie/ dzielenie PDF 
 Merge=Scalanie/ dzielenie
 DocumentModelStandardPDF=Standardowy szablon PDF
 PrintContentArea=Pokaż stronę do wydruku głównej treści
 MenuManager=Menu menager
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+WarningYouAreInMaintenanceMode=Ostrzeżenie, jesteś w trybie konserwacji: tylko logowanie <b> %s </b> może używać aplikacji w tym trybie.
 CoreErrorTitle=Błąd systemu
 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
 ValidatePayment=Weryfikacja płatności
 CreditOrDebitCard=Karta debetowa lub kredytowa
 FieldsWithAreMandatory=Pola <b>%s</b>  są obowiązkowe
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP conversion)
+FieldsWithIsForPublic=Pola z <b> %s </b> są wyświetlane na publicznej liście członków. Jeśli tego nie chcesz, odznacz pole „publiczne”.
+AccordingToGeoIPDatabase=(zgodnie z konwersją GeoIP)
 Line=Linia
 NotSupported=Nie są obsługiwane
 RequiredField=Pole wymagane
 Result=Wynik
 ToTest=Test
-ValidateBefore=Item must be validated before using this feature
+ValidateBefore=Przed skorzystaniem z tej funkcji należy zweryfikować przedmiot
 Visibility=Widoczność
-Totalizable=Totalizable
-TotalizableDesc=This field is totalizable in list
+Totalizable=Sumowalne
+TotalizableDesc=To pole można podsumować na liście
 Private=Prywatny
 Hidden=Ukryty
 Resources=Zasoby
@@ -790,18 +793,18 @@ LinkTo=Link do
 LinkToProposal=Link do oferty
 LinkToOrder=Link do zamówienia
 LinkToInvoice=Link do faktury
-LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
+LinkToTemplateInvoice=Link do szablonu faktury
+LinkToSupplierOrder=Link do zamówienia
+LinkToSupplierProposal=Link do propozycji dostawcy
+LinkToSupplierInvoice=Link do faktury dostawcy
 LinkToContract=Link do umowy
 LinkToIntervention=Link do interwencji
 LinkToTicket=Link do biletu
 CreateDraft=Utwórz Szic
 SetToDraft=Wróć do szkicu
 ClickToEdit=Kliknij by edytować
-ClickToRefresh=Click to refresh
-EditWithEditor=Edit with CKEditor
+ClickToRefresh=Kliknij, aby odświeżyć
+EditWithEditor=Edytuj za pomocą CKEditor
 EditWithTextEditor=Edytuj w edytorze tekstowym
 EditHTMLSource=Edytuj źródło HTML
 ObjectDeleted=%s obiekt usunięty
@@ -815,7 +818,7 @@ ByDay=Według dnia
 BySalesRepresentative=Według przedstawiciela handlowego
 LinkedToSpecificUsers=Podpięty do kontaktu współużytkownika
 NoResults=Brak wyników
-AdminTools=Admin Tools
+AdminTools=Narzędzia administracyjne
 SystemTools=Narzędzia systemowe
 ModulesSystemTools=Narzędzia modułów
 Test=Test
@@ -845,7 +848,7 @@ PrintFile=Wydrukuj plik %s
 ShowTransaction=Pokaż wpisy na koncie bankowym
 ShowIntervention=Pokaż interwencję
 ShowContract=Pokaż umowę
-GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
+GoIntoSetupToChangeLogo=Przejdź do Strona główna - Ustawienia - Firma, aby zmienić logo, lub przejdź do Strona główna - Ustawienia - Wyświetl, aby ukryć.
 Deny=Zabraniać
 Denied=Zabroniony
 ListOf=Lista %s
@@ -855,61 +858,63 @@ Genderman=Mężczyzna
 Genderwoman=Kobieta
 Genderother=Inne
 ViewList=Widok listy
-ViewGantt=Gantt view
-ViewKanban=Kanban view
+ViewGantt=Widok Gantta
+ViewKanban=Widok Kanban
 Mandatory=Zleceniobiorca
 Hello=Witam
 GoodBye=Do widzenia
 Sincerely=Z poważaniem
-ConfirmDeleteObject=Are you sure you want to delete this object?
+ConfirmDeleteObject=Czy na pewno chcesz usunąć ten obiekt?
 DeleteLine=Usuń linię
 ConfirmDeleteLine=Czy jesteś pewien, że chcesz usunąć tą linię?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+ErrorPDFTkOutputFileNotFound=Błąd: plik nie został wygenerowany. Sprawdź, czy polecenie „pdftk” jest zainstalowane w katalogu zawartym w zmiennej środowiskowej $PATH (tylko linux/unix) lub skontaktuj się z administratorem systemu.
 NoPDFAvailableForDocGenAmongChecked=Na potrzeby generowania dokumentów nie było dostępnych plików PDF
-TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
+TooManyRecordForMassAction=Wybrano zbyt wiele rekordów do akcji masowej. Akcja jest ograniczona do listy rekordów %s.
 NoRecordSelected=Nie wybrano wpisu
 MassFilesArea=Obszar plików zbudowanych masowo
 ShowTempMassFilesArea=Wyświetl obszar plików zbudowanych masowo
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+ConfirmMassDeletion=Potwierdzenie usuwania zbiorczego
+ConfirmMassDeletionQuestion=Czy na pewno chcesz usunąć wybrane rekordy %s?
 RelatedObjects=Powiązane obiekty
 ClassifyBilled=Oznacz jako zafakturowana
-ClassifyUnbilled=Classify unbilled
+ClassifyUnbilled=Klasyfikuj niezafakturowane
 Progress=Postęp
 ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Powrót do biura
-Submit=Submit
+Submit=Zatwierdź
 View=Widok
 Export=Eksport
 Exports=Eksporty
 ExportFilteredList=Eksportuj przefiltrowaną listę
 ExportList=Eksportuj listę
 ExportOptions=Opcje eksportu
-IncludeDocsAlreadyExported=Include docs already exported
-ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
-ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
-AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
-NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+IncludeDocsAlreadyExported=Uwzględnij dokumenty już wyeksportowane
+ExportOfPiecesAlreadyExportedIsEnable=Eksport już wyeksportowanych elementów jest włączony
+ExportOfPiecesAlreadyExportedIsDisable=Eksport już wyeksportowanych elementów jest wyłączony
+AllExportedMovementsWereRecordedAsExported=Wszystkie eksportowane przemieszczenia były rejestrowane jako eksportowane
+NotAllExportedMovementsCouldBeRecordedAsExported=Nie wszystkie wyeksportowane przepływy można było zarejestrować jako wyeksportowane
 Miscellaneous=Różne
 Calendar=Kalendarz
 GroupBy=Grupuj według
 ViewFlatList=Zobacz płaską listę
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=Wyświetl księgę
+ViewSubAccountList=Wyświetl księgę subkontową
 RemoveString=Usuń ciąg '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Bezpośredni link do pobierania (publiczny / zewnętrzny)
-DirectDownloadInternalLink=Bezpośredni link do pobrania (musisz się zalogować i potrzebujesz uprawnień)
+SomeTranslationAreUncomplete=Niektóre z oferowanych języków mogą być przetłumaczone tylko częściowo lub mogą zawierać błędy. Pomóż poprawić język, rejestrując się pod adresem <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> w celu dodania ulepszeń.
+DirectDownloadLink=Publiczny link do pobrania
+PublicDownloadLinkDesc=Do pobrania pliku wymagane jest tylko łącze
+DirectDownloadInternalLink=Prywatny link do pobrania
+PrivateDownloadLinkDesc=Musisz być zalogowany i potrzebujesz uprawnień, aby wyświetlić lub pobrać plik
 Download=Pobierz
 DownloadDocument=Pobierz dokument
 ActualizeCurrency=Aktualizuj kurs walut
 Fiscalyear=Rok podatkowy
-ModuleBuilder=Module and Application Builder
+ModuleBuilder=Kreator modułów i aplikacji
 SetMultiCurrencyCode=Ustaw walutę
 BulkActions=Masowe działania
 ClickToShowHelp=Kliknij, aby wyświetlić etykietę pomocy
-WebSite=Website
+WebSite=Strona internetowa
 WebSites=Strony internetowe
 WebSiteAccounts=Konta witryny
 ExpenseReport=Raport kosztów
@@ -918,25 +923,25 @@ HR=Dział personalny
 HRAndBank=HR i Bank
 AutomaticallyCalculated=Automatycznie przeliczone
 TitleSetToDraft=Powróć do wersji roboczej
-ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ConfirmSetToDraft=Czy na pewno chcesz wrócić do stanu wersji roboczej?
 ImportId=ID importu
 Events=Wydarzenia
-EMailTemplates=Email templates
-FileNotShared=File not shared to external public
+EMailTemplates=Szablony wiadomości
+FileNotShared=Plik nie jest udostępniony publicznie poza domenę
 Project=Projekt
 Projects=Projekty
-LeadOrProject=Lead | Project
-LeadsOrProjects=Leads | Projects
+LeadOrProject=Lead | Projekt
+LeadsOrProjects=Leady | Projekty
 Lead=Lead
-Leads=Leads
-ListOpenLeads=List open leads
-ListOpenProjects=List open projects
-NewLeadOrProject=New lead or project
+Leads=Leady
+ListOpenLeads=Lista otwartych leadów
+ListOpenProjects=Lista otwartych projektów
+NewLeadOrProject=Nowy lead lub projekt
 Rights=Uprawnienia
 LineNb=Linia nr
 IncotermLabel=Formuły handlowe
-TabLetteringCustomer=Customer lettering
-TabLetteringSupplier=Vendor lettering
+TabLetteringCustomer=Napis klienta
+TabLetteringSupplier=Napis dostawcy
 Monday=Poniedziałek
 Tuesday=Wtorek
 Wednesday=Środa
@@ -965,39 +970,39 @@ ShortThursday=Cz
 ShortFriday=Pi
 ShortSaturday=So
 ShortSunday=Ni
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=jeden
+two=dwa
+three=trzy
+four=cztery
+five=pięć
+six=sześć
+seven=siedem
+eight=osiem
+nine=dziewięć
+ten=dziesięć
+eleven=jedenaście
+twelve=dwanaście
+thirteen=trzynaście
+fourteen=czternaście
+fifteen=piętnaście
+sixteen=szesnaście
+seventeen=siedemnaście
+eighteen=osiemnaście
+nineteen=dziewiętnaście
+twenty=dwadzieścia
+thirty=trzydzieści
+forty=czterdzieści
+fifty=pięćdziesiąt
+sixty=sześćdziesiąt
+seventy=siedemdziesiąt
+eighty=osiemdziesiąt
+ninety=dziewięćdziesiąt
+hundred=sto
+thousand=tysiąc
+million=milion
+billion=miliard
+trillion=kwintylion
+quadrillion=kwadrylion
 SelectMailModel=Wybierz szablon wiadomości email
 SetRef=Ustaw referencję
 Select2ResultFoundUseArrows=Znaleziono pewne wyniki. Użyj strzałek, aby wybrać.
@@ -1005,7 +1010,7 @@ Select2NotFound=Nie znaleziono wyników
 Select2Enter=Enter
 Select2MoreCharacter=lub więcej znaków
 Select2MoreCharacters=lub więcej znaków
-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> Składnia wyszukiwania: </strong> <br> <kbd> <strong>|</strong> </kbd> <kbd> LUB </kbd> (a|b) <br> <kbd> <strong>*</strong> </kbd> <kbd> Każda postać </kbd> (a*b) <br> <kbd> <strong>^</strong> </kbd> <kbd> Zacznij </kbd> (^ab) <br> <kbd> <strong>$</strong> </kbd> <kbd> kończyć </kbd> ( ab$) <br>
 Select2LoadingMoreResults=Ładuję więcej wyników...
 Select2SearchInProgress=Wyszukiwanie w trakcie...
 SearchIntoThirdparties=Kontrahenci
@@ -1013,8 +1018,9 @@ SearchIntoContacts=Kontakty
 SearchIntoMembers=Członkowie
 SearchIntoUsers=Użytkownicy
 SearchIntoProductsOrServices=Produkty lub usługi
+SearchIntoBatch=Partie / numery seryjne
 SearchIntoProjects=Projekty
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=Zamówienia produkcyjne
 SearchIntoTasks=Zadania
 SearchIntoCustomerInvoices=Faktury klienta
 SearchIntoSupplierInvoices=Faktury dostawcy
@@ -1026,10 +1032,10 @@ SearchIntoInterventions=Interwencje
 SearchIntoContracts=Kontrakty
 SearchIntoCustomerShipments=Wysyłki klienta
 SearchIntoExpenseReports=Zestawienia wydatków
-SearchIntoLeaves=Leave
+SearchIntoLeaves=Pozostawiać
 SearchIntoTickets=Bilety
-SearchIntoCustomerPayments=Customer payments
-SearchIntoVendorPayments=Vendor payments
+SearchIntoCustomerPayments=Płatności klientów
+SearchIntoVendorPayments=Płatności dostawcy
 SearchIntoMiscPayments=Różne płatności
 CommentLink=Komentarze
 NbComments=Ilość komentarzy
@@ -1038,7 +1044,7 @@ CommentAdded=Komentarz dodany
 CommentDeleted=Komentarz usunięty
 Everybody=Wszyscy
 PayedBy=Płacone przez
-PayedTo=Paid to
+PayedTo=Zapłacono do
 Monthly=Miesięcznie
 Quarterly=Kwartalnie
 Annual=Rocznie
@@ -1048,75 +1054,78 @@ LocalAndRemote=Lokalnie i zdalnie
 KeyboardShortcut=Skróty klawiaturowe
 AssignedTo=Przypisany do
 Deletedraft=Usuń szkic
-ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
-SelectAThirdPartyFirst=Select a third party first...
+ConfirmMassDraftDeletion=Wersja robocza potwierdzenia masowego usunięcia
+FileSharedViaALink=Plik udostępniony za pomocą linku publicznego
+SelectAThirdPartyFirst=Najpierw wybierz kontrahenta ...
 YouAreCurrentlyInSandboxMode=Aktualnie korzystasz z trybu "sandbox" %s
 Inventory=Inwentaryzacja
-AnalyticCode=Analytic code
+AnalyticCode=Kod analityczny
 TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
-PaymentInformation=Payment information
-ValidFrom=Valid from
-ValidUntil=Valid until
-NoRecordedUsers=No users
-ToClose=To close
+ShowCompanyInfos=Pokaż informacje o firmie
+ShowMoreInfos=Pokaż więcej informacji
+NoFilesUploadedYet=Najpierw prześlij dokument
+SeePrivateNote=Zobacz notatkę prywatną
+PaymentInformation=Informacje dotyczące płatności
+ValidFrom=Ważne od
+ValidUntil=Ważne do
+NoRecordedUsers=Brak użytkowników
+ToClose=Do zamknięcia
 ToProcess=Do przetworzenia
-ToApprove=To approve
-GlobalOpenedElemView=Global view
-NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
-NoArticlesFoundForTheCategory=No article found for the category
-ToAcceptRefuse=To accept | refuse
+ToApprove=Do zatwierdzenia
+GlobalOpenedElemView=Widok globalny
+NoArticlesFoundForTheKeyword=Nie znaleziono artykułu dla słowa kluczowego „<strong> %s </strong>”
+NoArticlesFoundForTheCategory=Nie znaleziono artykułów w tej kategorii
+ToAcceptRefuse=Do zaakceptowania | odrzucenia
 ContactDefault_agenda=Wydarzenie
 ContactDefault_commande=Zamówienie
 ContactDefault_contrat=Kontrakt
 ContactDefault_facture=Faktura
 ContactDefault_fichinter=Interwencja
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
+ContactDefault_invoice_supplier=Faktura dostawcy
+ContactDefault_order_supplier=Zamówienie
 ContactDefault_project=Projekt
 ContactDefault_project_task=Zadanie
 ContactDefault_propal=Oferta
-ContactDefault_supplier_proposal=Supplier Proposal
-ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Contact added from contact thirdparty roles
-More=More
-ShowDetails=Show details
-CustomReports=Custom reports
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
-Measures=Measures
-XAxis=X-Axis
-YAxis=Y-Axis
-StatusOfRefMustBe=Status of %s must be %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
-ShowOtherLanguages=Show other languages
-SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
+ContactDefault_supplier_proposal=Propozycja dostawcy
+ContactDefault_ticket=Bilet
+ContactAddedAutomatically=Kontakt został dodany z ról kontaktu kontrahenta
+More=Więcej
+ShowDetails=Pokaż szczegóły
+CustomReports=Raporty niestandardowe
+StatisticsOn=Statystyki włączone
+SelectYourGraphOptionsFirst=Wybierz opcje wykresu, aby zbudować wykres
+Measures=Środki
+XAxis=Oś X
+YAxis=Oś Y.
+StatusOfRefMustBe=Status %s musi być %s
+DeleteFileHeader=Potwierdź usunięcie pliku
+DeleteFileText=Czy na pewno chcesz usunąć ten plik?
+ShowOtherLanguages=Pokaż inne języki
+SwitchInEditModeToAddTranslation=Przełącz się w tryb edycji, aby dodać tłumaczenia dla tego języka
+NotUsedForThisCustomer=Nieużywany dla tego klienta
+AmountMustBePositive=Kwota musi być dodatnia
+ByStatus=Według statusu
 InformationMessage=Informacja
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s created
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
-DefaultMailModel=Default Mail Model
-PublicVendorName=Public name of vendor
+Used=Używany
+ASAP=Tak szybko, jak to możliwe
+CREATEInDolibarr=Utworzono rekord %s
+MODIFYInDolibarr=Rekord %s zmodyfikowany
+DELETEInDolibarr=Rekord %s został usunięty
+VALIDATEInDolibarr=Rekord %s został zweryfikowany
+APPROVEDInDolibarr=Rekord %s został zatwierdzony
+DefaultMailModel=Domyślny model poczty
+PublicVendorName=Publiczna nazwa dostawcy
 DateOfBirth=Data urodzenia
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Token bezpieczeństwa wygasł, więc akcja została anulowana. Proszę spróbuj ponownie.
+UpToDate=Aktualny
+OutOfDate=Przeterminowany
+EventReminder=Przypomnienie o wydarzeniu
+UpdateForAllLines=Aktualizacja dla wszystkich linii
 OnHold=Wstrzymany
-Civility=Civility
-AffectTag=Affect Tag
-ConfirmAffectTag=Bulk Tag Affect
-ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
+Civility=Grzeczność
+AffectTag=Wpływ na Tag
+ConfirmAffectTag=Wpływ tagu zbiorczego
+ConfirmAffectTagQuestion=Czy na pewno chcesz wpłynąć na tagi %s wybranych rekordów?
+CategTypeNotFound=Nie znaleziono typu tagu dla typu rekordów
+CopiedToClipboard=Skopiowane do schowka
+InformationOnLinkToContract=Kwota ta to tylko suma wszystkich pozycji zamówienia. Nie bierze się pod uwagę żadnego pojęcia czasu.
diff --git a/htdocs/langs/pl_PL/margins.lang b/htdocs/langs/pl_PL/margins.lang
index 3b161a492b0..21093727beb 100644
--- a/htdocs/langs/pl_PL/margins.lang
+++ b/htdocs/langs/pl_PL/margins.lang
@@ -16,29 +16,30 @@ MarginDetails=Szczegóły marży
 ProductMargins=Marża produktu
 CustomerMargins=Marża klienta
 SalesRepresentativeMargins=Sprzedaż marże reprezentatywne
+ContactOfInvoice=Kontakt do faktury
 UserMargins=Marginesy użytkownika
 ProductService=Produkt lub usługa
 AllProducts=Wszystkie produkty i usługi
 ChooseProduct/Service=Wybierz produkt lub usługę
 ForceBuyingPriceIfNull=Wymuszaj cenę zakupu/cenę fabryczną jako cenę sprzedaży jeżeli ta nie jest zdefiniowana
-ForceBuyingPriceIfNullDetails=Jeżeli cena zakupu/koszt nie jest zdefiniowana, a ta opcja jest "ON", marża będzie równa 0 (cena zakupu/koszt = cena sprzedaży), w przeciwnym razie ("OFF"), marża będzie równa sugerowanej domyślnie.
+ForceBuyingPriceIfNullDetails=Jeśli cena zakupu / koszt nie zostanie podana podczas dodawania nowej linii, a ta opcja jest włączona, marża w nowej linii będzie wynosić 0 (cena zakupu / koszt = cena sprzedaży). Jeśli ta opcja jest „WYŁĄCZONA” (zalecane), margines będzie równy wartości sugerowanej domyślnie (i może wynosić 100%, jeśli nie można znaleźć wartości domyślnej).
 MARGIN_METHODE_FOR_DISCOUNT=Sposób na marżę dla globalnych rabatów
 UseDiscountAsProduct=Jako produkt
 UseDiscountAsService=Jako usługa
 UseDiscountOnTotal=Na podsumy
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Określa, czy globalne rabatu jest traktowana jako produktu, usługi lub tylko na sumy częściowej obliczania marży.
 MARGIN_TYPE=Cena zakupu/cena fabryczna jest sugerowana jako domyślna do obliczenia marży
-MargeType1=Margin on Best vendor price
-MargeType2=Marża na średniej cenie ważonej
+MargeType1=Marża na najlepszej cenie dostawcy
+MargeType2=Marża na Średniej Cenie Produktu (ŚCP)
 MargeType3=Marża na cenie fabrycznej
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Marża od najlepszej ceny zakupu = cena sprzedaży - najlepsza cena dostawcy określona na karcie produktu <br> * Marża od średniej ważonej ceny (WAP) = cena sprzedaży - średnia cena ważona produktu (WAP) lub najlepsza cena dostawcy, jeśli WAP nie został jeszcze zdefiniowany <br> * Marża Cena kosztowa = Cena sprzedaży - Cena własna zdefiniowana na karcie produktu lub WAP, jeśli cena kosztowa nie została zdefiniowana, lub najlepsza cena dostawcy, jeśli WAP nie został jeszcze zdefiniowany
 CostPrice=Cena fabryczna
 UnitCharges=Koszty jednostkowe
 Charges=Opłaty
 AgentContactType=Przedstawiciel handlowy typ kontaktu
-AgentContactTypeDetails=Zdefiniować, jaki rodzaj (związane na fakturach) kontaktowe będą wykorzystywane do raportu marży na reprezentatywną sprzedaż
+AgentContactTypeDetails=Zdefiniuj, jaki typ kontaktu (powiązany na fakturach) będzie używany do raportowania marży na kontakt/adres. Należy pamiętać, że czytanie statystyk dotyczących kontaktu nie jest wiarygodne, ponieważ w większości przypadków kontakt może nie być wyraźnie zdefiniowany na fakturach.
 rateMustBeNumeric=Stawka musi być wartością liczbową
 markRateShouldBeLesserThan100=Stopa znak powinien być niższy niż 100
 ShowMarginInfos=Pokaż informacje o marżę
 CheckMargins=Szczegóły marż
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=Raprot marży na użytkownika wykorzystuje połączenie między kontrahentami a przedstawicielami handlowymi w celu obliczenia marży każdego przedstawiciela handlowego. Ponieważ niektórzy kontrahenci mogą nie posiadać przedstawiciela handlowego a niektórzy kontrahenci mogą być połączeni z wieloma przedstawicielami handlowymi, niektóre wartości mogą nie być wliczone w ten raport (jeśli brakuje przedstawiciela handlowego) a niektóre mogą pojawić się w innych wierszach (dla każdego przedstawiciela handlowego). 
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 059bc2dddf4..2089442f991 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -6,7 +6,7 @@ Member=Członek
 Members=Członkowie
 ShowMember=Pokaż kartę członka
 UserNotLinkedToMember=Użytkownik nie wiąże się z członkiem
-ThirdpartyNotLinkedToMember=Third party not linked to a member
+ThirdpartyNotLinkedToMember=Strona trzecia niepowiązana z członkiem
 MembersTickets=Członkowie Bilety
 FundationMembers=Członkowie fundacji
 ListOfValidatedPublicMembers=Wykaz zatwierdzonych publicznej użytkowników
@@ -19,20 +19,22 @@ MembersCards=Członkowie wydruku karty
 MembersList=Lista członków
 MembersListToValid=Lista szkiców członków (do zatwierdzenia)
 MembersListValid=Wykaz ważnych członków
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
-MembersListResiliated=List of terminated members
+MembersListUpToDate=Lista ważnych członków z aktualną subskrypcją
+MembersListNotUpToDate=Lista ważnych członków z nieaktualną subskrypcją
+MembersListExcluded=Lista wykluczonych członków
+MembersListResiliated=Lista członków zakończonych
 MembersListQualified=Lista członków wykwalifikowanych
 MenuMembersToValidate=Projekt członków
 MenuMembersValidated=Zatwierdzeni członkowie
+MenuMembersExcluded=Wykluczeni członkowie
 MenuMembersResiliated=członkowie zakończone
 MembersWithSubscriptionToReceive=Użytkownicy z subskrypcji otrzymują
-MembersWithSubscriptionToReceiveShort=Subscription to receive
+MembersWithSubscriptionToReceiveShort=Subskrypcja do odbioru
 DateSubscription=Data subskrypcji
 DateEndSubscription=Data końca subskrypcji
 EndSubscription=Koniec subskrypcji
 SubscriptionId=ID subskrypcji
-WithoutSubscription=Without subscription
+WithoutSubscription=Bez abonamentu
 MemberId=ID członka
 NewMember=Nowy członek
 MemberType=Typ członka
@@ -43,26 +45,29 @@ MemberStatusDraft=Projekt (do zatwierdzonia)
 MemberStatusDraftShort=Projekt
 MemberStatusActive=Zatwierdzony (oczekuje subskrypcji)
 MemberStatusActiveShort=Zatwierdzony
-MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLate=Subskrypcja wygasła
 MemberStatusActiveLateShort=Wygasł
 MemberStatusPaid=Subskrypcja aktualne
 MemberStatusPaidShort=Aktualne
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
+MemberStatusExcluded=Wykluczony członek
+MemberStatusExcludedShort=Wyłączony
+MemberStatusResiliated=Członek usunięty
+MemberStatusResiliatedShort=Zakończony
 MembersStatusToValid=Projekt członków
+MembersStatusExcluded=Wykluczeni członkowie
 MembersStatusResiliated=członkowie zakończone
-MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscription=Zweryfikowany (subskrypcja nie jest wymagana)
 MemberStatusNoSubscriptionShort=Zatwierdzony
-SubscriptionNotNeeded=No subscription needed
+SubscriptionNotNeeded=Żadna subskrypcja nie jest wymagana
 NewCotisation=Nowe Wkład
 PaymentSubscription=Nowy wkład płatności
 SubscriptionEndDate=Data zakończenia subskrypcji
 MembersTypeSetup=Ustawienie typu członka
-MemberTypeModified=Member type modified
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
+MemberTypeModified=Zmodyfikowany typ członka
+DeleteAMemberType=Usuń typ członka
+ConfirmDeleteMemberType=Czy na pewno chcesz usunąć ten typ członka?
+MemberTypeDeleted=Typ członka został usunięty
+MemberTypeCanNotBeDeleted=Nie można usunąć typu członka
 NewSubscription=Nowa subskrypcja
 NewSubscriptionDesc=Ta forma pozwala na nagrywanie abonament jako nowy członek fundacji. Jeśli chcesz odnowić subskrypcję (jeśli jest już członkiem), prosimy o kontakt z Rady Fundacji zamiast e-mailem %s.
 Subscription=Subskrypcja
@@ -70,20 +75,22 @@ Subscriptions=Subskrypcje
 SubscriptionLate=Późno
 SubscriptionNotReceived=Subskrypcja nigdy nieotrzymana
 ListOfSubscriptions=Lista subskrypcji
-SendCardByMail=Send card by email
+SendCardByMail=Wyślij kartkę e-mailem
 AddMember=Utwórz członka
 NoTypeDefinedGoToSetup=Żaden członek typów zdefiniowanych. Przejdź do konfiguracji - Członkowie typy
 NewMemberType=Nowy typ członka
-WelcomeEMail=Welcome email
+WelcomeEMail=Powitalny e-mail
 SubscriptionRequired=Subskrypcja wymagana
 DeleteType=Usuń
 VoteAllowed=Głosowanie dozwolone
 Physical=Fizyczne
 Moral=Moralny
-MorAndPhy=Moral and Physical
+MorAndPhy=Moralne i fizyczne
 Reenable=Ponownym włączeniu
-ResiliateMember=Terminate a member
-ConfirmResiliateMember=Are you sure you want to terminate this member?
+ExcludeMember=Wyklucz członka
+ConfirmExcludeMember=Czy na pewno chcesz wykluczyć tego członka?
+ResiliateMember=Zakończ członka
+ConfirmResiliateMember=Czy na pewno chcesz usunąć tego członka?
 DeleteMember=Usuń członka
 ConfirmDeleteMember=Czy jesteś pewien, ze chcesz usunąć tego członka (Usunięcie członka spowoduje usunięcie wszystkich jego subskrypcji)?
 DeleteSubscription=Usuń subskrypcję
@@ -91,53 +98,54 @@ ConfirmDeleteSubscription=Czy jesteś pewien, że chcesz usunąć tą subskrypcj
 Filehtpasswd=htpasswd plik
 ValidateMember=Validate członkiem
 ConfirmValidateMember=Czy jesteś pewien, że chcesz zatwierdzić tego członka?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+FollowingLinksArePublic=Poniższe linki są otwartymi stronami, które nie są chronione żadnym zezwoleniem firmy Dolibarr. Nie są to strony sformatowane, podane jako przykład, aby pokazać, jak wyświetlić listę członków bazy danych.
 PublicMemberList=Publicznego liście członków
-BlankSubscriptionForm=Public self-subscription form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
-ForceMemberType=Force the member type
+BlankSubscriptionForm=Publiczny formularz samodzielnej subskrypcji
+BlankSubscriptionFormDesc=Dolibarr może udostępnić publiczny adres URL / witrynę internetową, aby umożliwić odwiedzającym z zewnątrz proszenie o zapisanie się do fundacji. Jeśli moduł płatności online jest włączony, formularz płatności może być również dostarczony automatycznie.
+EnablePublicSubscriptionForm=Włącz publiczną witrynę internetową z formularzem samodzielnej subskrypcji
+ForceMemberType=Wymuś typ pręta
 ExportDataset_member_1=Członkowie i abonamentów
 ImportDataset_member_1=Członkowie
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
+LastMembersModified=Ostatnio zmodyfikowani członkowie %s
+LastSubscriptionsModified=Najnowsze zmodyfikowane subskrypcje %s
 String=Ciąg znaków
 Text=Tekst
 Int=Int.
 DateAndTime=Data i czas
 PublicMemberCard=Państwa publiczne karty
-SubscriptionNotRecorded=Subscription not recorded
+SubscriptionNotRecorded=Subskrypcja nie została nagrana
 AddSubscription=Tworzenie subskrypcji
 ShowSubscription=Pokaż sybskrypcje
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
-SendingReminderActionComm=Sending reminder for agenda event
+SendingAnEMailToMember=Wysyłanie e-maila z informacją do członka
+SendingEmailOnAutoSubscription=Wysyłanie wiadomości e-mail po automatycznej rejestracji
+SendingEmailOnMemberValidation=Wysyłanie wiadomości e-mail z potwierdzeniem nowego członka
+SendingEmailOnNewSubscription=Wysyłanie wiadomości e-mail w sprawie nowej subskrypcji
+SendingReminderForExpiredSubscription=Wysyłanie przypomnienia o wygasłych subskrypcjach
+SendingEmailOnCancelation=Wysyłanie e-maila o anulowaniu
+SendingReminderActionComm=Wysyłanie przypomnienia o wydarzeniu w programie
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipRequestWasReceived=Twoje członkostwo zostało odebrane.
+YourMembershipWasValidated=Twoje członkostwo zostało potwierdzone
+YourSubscriptionWasRecorded=Twoja nowa subskrypcja została zarejestrowana
+SubscriptionReminderEmail=Przypomnienie o subskrypcji
+YourMembershipWasCanceled=Twoje członkostwo zostało anulowane
 CardContent=Treść Twojej karty członka
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
-ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+ThisIsContentOfYourMembershipRequestWasReceived=Chcemy Cię poinformować, że otrzymaliśmy Twoją prośbę o członkostwo. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Chcemy Cię poinformować, że Twoje członkostwo zostało zweryfikowane przy użyciu następujących informacji: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Chcemy Cię poinformować, że Twoja nowa subskrypcja została nagrana. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=Chcemy Cię poinformować, że Twoja subskrypcja wkrótce wygaśnie lub już wygasła (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Mamy nadzieję, że ją odnowisz. <br> <br>
+ThisIsContentOfYourCard=To jest podsumowanie informacji, które posiadamy o Tobie. Skontaktuj się z nami, jeśli coś jest nie tak. <br> <br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Temat powiadomienia e-mail otrzymanego w przypadku automatycznego wpisu gościa
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Treść otrzymanego e-maila z powiadomieniem w przypadku automatycznego wpisu gościa
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Szablon wiadomości e-mail używany do wysyłania wiadomości e-mail do członka w ramach automatycznej subskrypcji członka
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Szablon wiadomości e-mail używany do wysyłania wiadomości e-mail do członka w sprawie weryfikacji członka
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Szablon wiadomości e-mail używany do wysyłania wiadomości e-mail do członka w sprawie nowego nagrania subskrypcji
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Szablon wiadomości e-mail służący do wysyłania przypomnień e-mail o zbliżającym się wygaśnięciu subskrypcji
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Szablon wiadomości e-mail używany do wysyłania wiadomości e-mail do członka w przypadku anulowania członka
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_MAIL_FROM=Adres e-mail nadawcy dla automatycznych e-maili
 DescADHERENT_ETIQUETTE_TYPE=Etykiety formacie
 DescADHERENT_ETIQUETTE_TEXT=Tekst drukowany na arkuszach adresowych członkiem
 DescADHERENT_CARD_TYPE=Format karty stronę
@@ -151,8 +159,8 @@ NoThirdPartyAssociatedToMember=Nr trzeciej związane do tego członka
 MembersAndSubscriptions= Członkowie i Subscriptions
 MoreActions=Działanie uzupełniające na nagrywanie
 MoreActionsOnSubscription=Działania uzupełniające, zasugerował domyślnie podczas nagrywania abonament
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionBankDirect=Utwórz bezpośredni wpis na konto bankowe
+MoreActionBankViaInvoice=Utwórz fakturę i wpłatę na konto bankowe
 MoreActionInvoiceOnly=Tworzenie faktury bez zapłaty
 LinkToGeneratedPages=Generowanie wizytówki
 LinkToGeneratedPagesDesc=Ekran ten umożliwia generowanie plików PDF z wizytówek dla wszystkich członków lub członka szczególności.
@@ -160,24 +168,25 @@ DocForAllMembersCards=Generowanie wizytówek dla wszystkich członków (Format w
 DocForOneMemberCards=Generowanie wizytówki dla danego użytkownika (Format wyjściowy rzeczywiście setup: <b>%s)</b>
 DocForLabels=Generowanie arkuszy adres (Format wyjściowy rzeczywiście setup: <b>%s)</b>
 SubscriptionPayment=Zaplanowana płatność
-LastSubscriptionDate=Date of latest subscription payment
-LastSubscriptionAmount=Amount of latest subscription
+LastSubscriptionDate=Data ostatniej płatności abonamentowej
+LastSubscriptionAmount=Ilość ostatniej subskrypcji
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Użytkownicy statystyki według kraju
 MembersStatisticsByState=Użytkownicy statystyki na State / Province
 MembersStatisticsByTown=Użytkownicy statystyki na miasto
 MembersStatisticsByRegion=Użytkownicy statystyki regionu
 NbOfMembers=Liczba członków
-NbOfActiveMembers=Number of current active members
+NbOfActiveMembers=Liczba obecnych aktywnych członków
 NoValidatedMemberYet=Żadna potwierdzona znaleziono użytkowników
 MembersByCountryDesc=Ten ekran pokaże statystyki członków przez poszczególne kraje. Graficzny zależy jednak na Google usługi online grafów i jest dostępna tylko wtedy, gdy połączenie internetowe działa.
 MembersByStateDesc=Ten ekran pokazać Wam statystyki członkom przez stan / prowincje / Kanton.
 MembersByTownDesc=Ten ekran pokaże statystyki członkom przez miasto.
 MembersStatisticsDesc=Wybierz statystyki chcesz czytać ...
 MenuMembersStats=Statystyka
-LastMemberDate=Latest member date
+LastMemberDate=Ostatnia data członka
 LatestSubscriptionDate=Data ostatniej subskrypcji
-MemberNature=Nature of member
-MembersNature=Nature of members
+MemberNature=Charakter członka
+MembersNature=Charakter członków
 Public=Informacje są publiczne
 NewMemberbyWeb=Nowy członek dodaje. Oczekuje na zatwierdzenie
 NewMemberForm=Nowa forma członkiem
@@ -188,19 +197,19 @@ TurnoverOrBudget=Obrót (dla firmy) lub Budżet (na fundamencie)
 DefaultAmount=Domyślną kwotę abonamentu
 CanEditAmount=Użytkownik może wybrać / edytować kwotę swojej subskrypcji
 MEMBER_NEWFORM_PAYONLINE=Przejdź na zintegrowanej stronie płatności online
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
+ByProperties=Przez naturę
+MembersStatisticsByProperties=Statystyki członków według natury
 MembersByNature=Ten ekran wyświetli statystyki dotyczące członków przez naturę.
 MembersByRegion=Ten ekran wyświetli statystyki dotyczące członków w regionie.
 VATToUseForSubscriptions=Stawka VAT użyć do subskrypcji
-NoVatOnSubscription=No VAT for subscriptions
+NoVatOnSubscription=Brak podatku VAT w przypadku subskrypcji
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt stosowany do linii subskrypcji do faktury:% s
-NameOrCompany=Name or company
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
-MembershipPaid=Membership paid for current period (until %s)
-YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
-XMembersClosed=%s member(s) closed
+NameOrCompany=Imię lub firma
+SubscriptionRecorded=Subskrypcja została zarejestrowana
+NoEmailSentToMember=Żaden e-mail nie został wysłany do członka
+EmailSentToMember=E-mail wysłany do członka pod adresem %s
+SendReminderForExpiredSubscriptionTitle=Wyślij przypomnienie e-mailem o wygaśnięciu subskrypcji
+SendReminderForExpiredSubscription=Wyślij przypomnienie e-mailem do członków, gdy subskrypcja wkrótce wygaśnie (parametr to liczba dni przed końcem subskrypcji na wysłanie przypomnienia. Może to być lista dni oddzielonych średnikiem, na przykład „10; 5; 0; -5 ')
+MembershipPaid=Członkostwo opłacone za bieżący okres (do %s)
+YouMayFindYourInvoiceInThisEmail=Możesz znaleźć fakturę w załączniku do tej wiadomości e-mail
+XMembersClosed=%s członków zamkniętych
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index e2346e75b40..4df3891247e 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -1,143 +1,145 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
-EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
-ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
-ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+ModuleBuilderDesc=To narzędzie może być używane tylko przez doświadczonych użytkowników lub programistów. Udostępnia narzędzia do tworzenia lub edycji własnego modułu. Dokumentacja alternatywnego rozwoju ręcznego <a href="%s" target="_blank"> jest tutaj </a>.
+EnterNameOfModuleDesc=Wpisz nazwę bez spacji modułu/aplikacji do utworzenia. Używaj wielkich liter do oddzielania słów (na przykład: MyModule, EcommerceForShop, SyncWithMySystem, ...)
+EnterNameOfObjectDesc=Wpisz nazwę (bez spacji) obiektu do utworzenia. Używaj wielkich liter do oddzielania słów (na przykład: MyObject, Student, Teacher, ...). Zostanie wygenerowany plik klasy CRUD, ale także plik API, strony do wyświetlenia/dodania/edycji/usunięcia obiektu oraz pliki SQL.
+ModuleBuilderDesc2=Ścieżka, w której moduły są generowane/edytowane (pierwszy katalog dla modułów zewnętrznych zdefiniowany w %s): <strong> %s </strong>
+ModuleBuilderDesc3=Znaleziono wygenerowane/edytowalne moduły: <strong> %s </strong>
+ModuleBuilderDesc4=Moduł jest wykrywany jako „edytowalny”, gdy plik <strong> %s </strong> istnieje w katalogu głównym modułu
 NewModule=Nowy moduł
 NewObjectInModulebuilder=Nowy obiekt
-ModuleKey=Module key
-ObjectKey=Object key
-ModuleInitialized=Module initialized
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
-ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
-ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+ModuleKey=Klucz modułu
+ObjectKey=Klucz obiektu
+ModuleInitialized=Zainicjowano moduł
+FilesForObjectInitialized=Zainicjowano pliki dla nowego obiektu „%s”
+FilesForObjectUpdated=Zaktualizowano pliki obiektu „%s” (pliki .sql i .class.php)
+ModuleBuilderDescdescription=Wpisz tutaj wszystkie ogólne informacje opisujące Twój moduł.
+ModuleBuilderDescspecifications=Możesz wprowadzić tutaj szczegółowy opis specyfikacji swojego modułu, który nie został jeszcze podzielony na inne zakładki. Masz więc w zasięgu ręki wszystkie zasady do opracowania. Również ta treść tekstowa zostanie uwzględniona w generowanej dokumentacji (patrz ostatnia zakładka). Możesz użyć formatu Markdown, ale zalecane jest użycie formatu Asciidoc (porównanie między .md i .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Zdefiniuj tutaj obiekty, którymi chcesz zarządzać za pomocą swojego modułu. Zostanie wygenerowana klasa CRUD DAO, pliki SQL, strona do listy rekordów obiektów, do tworzenia/edycji/przeglądania rekordu oraz API.
+ModuleBuilderDescmenus=Ta zakładka jest przeznaczona do definiowania pozycji menu udostępnianych przez Twój moduł.
+ModuleBuilderDescpermissions=Ta zakładka jest przeznaczona do definiowania nowych uprawnień, które chcesz nadać modułowi.
+ModuleBuilderDesctriggers=To jest widok wyzwalaczy dostarczanych przez Twój moduł. Aby dołączyć kod wykonywany po uruchomieniu wyzwalanego zdarzenia biznesowego, po prostu edytuj ten plik.
+ModuleBuilderDeschooks=Ta zakładka jest poświęcona hookom
+ModuleBuilderDescwidgets=Ta zakładka jest przeznaczona do zarządzania/tworzenia widgetów.
+ModuleBuilderDescbuildpackage=Możesz tutaj wygenerować plik pakietu „gotowy do dystrybucji” (znormalizowany plik .zip) swojego modułu oraz plik dokumentacji „gotowy do dystrybucji”. Wystarczy kliknąć przycisk, aby zbudować pakiet lub plik dokumentacji.
+EnterNameOfModuleToDeleteDesc=Możesz usunąć swój moduł. UWAGA: Wszystkie pliki kodowe modułu (wygenerowane lub utworzone ręcznie) ORAZ ustrukturyzowane dane i dokumentacja zostaną usunięte!
+EnterNameOfObjectToDeleteDesc=Możesz usunąć obiekt. OSTRZEŻENIE: Wszystkie pliki kodujące (wygenerowane lub utworzone ręcznie) związane z obiektem zostaną usunięte!
 DangerZone=Strefa niebezpieczna
-BuildPackage=Build package
-BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
-BuildDocumentation=Build documentation
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
-ModuleIsLive=This module has been activated. Any change may break a current live feature.
+BuildPackage=Zbuduj pakiet
+BuildPackageDesc=Możesz wygenerować pakiet zip swojej aplikacji, abyś był gotowy do dystrybucji na dowolnym urządzeniu Dolibarr. Możesz go również rozprowadzać lub sprzedawać na platformie handlowej, takiej jak <a href="https://www.dolistore.com"> DoliStore.com </a>.
+BuildDocumentation=Zbuduj dokumentację
+ModuleIsNotActive=Ten moduł nie jest jeszcze aktywowany. Przejdź do %s, aby udostępnić go na żywo lub kliknij tutaj
+ModuleIsLive=Ten moduł został aktywowany. Każda zmiana może zepsuć obecną funkcję na żywo.
 DescriptionLong=Długi opis
-EditorName=Name of editor
+EditorName=Nazwa edytora
 EditorUrl=Link do edytora
-DescriptorFile=Descriptor file of module
-ClassFile=File for PHP DAO CRUD class
-ApiClassFile=File for PHP API class
-PageForList=PHP page for list of record
-PageForCreateEditView=PHP page to create/edit/view a record
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
-PageForContactTab=PHP page for contact tab
-PathToModulePackage=Path to zip of module/application package
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Force update of .class and .sql files
-RegenerateMissingFiles=Generate missing files
-SpecificationFile=File of documentation
-LanguageFile=File for language
-ObjectProperties=Object Properties
-ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
-SearchAll=Used for 'search all'
-DatabaseIndex=Database index
+DescriptorFile=Plik deskryptora modułu
+ClassFile=Plik dla klasy PHP DAO CRUD
+ApiClassFile=Plik klasy PHP API
+PageForList=Strona PHP z listą rekordów
+PageForCreateEditView=Strona PHP do tworzenia/edycji/przeglądania rekordu
+PageForAgendaTab=Strona PHP dla zakładki wydarzenia
+PageForDocumentTab=Strona PHP dla karty dokumentu
+PageForNoteTab=Strona PHP dla zakładki notatek
+PageForContactTab=Strona PHP dla zakładki kontaktowej
+PathToModulePackage=Ścieżka do pliku ZIP modułu/pakietu aplikacji
+PathToModuleDocumentation=Ścieżka do pliku dokumentacji modułu/aplikacji (%s)
+SpaceOrSpecialCharAreNotAllowed=Spacje i znaki specjalne są niedozwolone.
+FileNotYetGenerated=Plik nie został jeszcze wygenerowany
+RegenerateClassAndSql=Wymuś aktualizację plików .class i .sql
+RegenerateMissingFiles=Wygeneruj brakujące pliki
+SpecificationFile=Plik dokumentacji
+LanguageFile=Plik dla języka
+ObjectProperties=Właściwości obiektu
+ConfirmDeleteProperty=Czy na pewno chcesz usunąć właściwość <strong> %s </strong>? Spowoduje to zmianę kodu w klasie PHP, ale także usunie kolumnę z tabeli definicji obiektu.
+NotNull=NOT NULL
+NotNullDesc=1 = Ustaw bazę danych na NOT NULL. -1 = Zezwalaj na wartości null i wymuszaj wartość NULL, jeśli jest pusta (`` lub 0).
+SearchAll=Używane dla „szukaj we wszystkich”
+DatabaseIndex=Indeks bazy danych
 FileAlreadyExists=Plik %s już istnieje
-TriggersFile=File for triggers code
-HooksFile=File for hooks code
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-CSSFile=CSS file
-JSFile=Javascript file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
-TestClassFile=File for PHP Unit Test class
+TriggersFile=Plik zawierający kod wyzwalaczy
+HooksFile=Plik z kodem hooków
+ArrayOfKeyValues=Tablica wartości klucz-wartość
+ArrayOfKeyValuesDesc=Tablica kluczy i wartości, jeśli pole jest listą kombi ze stałymi wartościami
+WidgetFile=Plik widżetu
+CSSFile=Plik CSS
+JSFile=Plik Javascript
+ReadmeFile=Plik Readme
+ChangeLog=Plik ChangeLog
+TestClassFile=Plik klasy PHP Unit Test
 SqlFile=Plik SQL
-PageForLib=File for the common PHP library
-PageForObjLib=File for the PHP library dedicated to object
-SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
-SqlFileKeyExtraFields=Sql file for keys of complementary attributes
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
-DirScanned=Directory scanned
-NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=API explorer
-ListOfMenusEntries=List of menu entries
-ListOfDictionariesEntries=List of dictionaries entries
-ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
-EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
-DisplayOnPdf=Display on PDF
-IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
-SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
-SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
-LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module
-DictionariesDefDesc=Define here the dictionaries provided by your module
-PermissionsDefDesc=Define here the new permissions provided by your module
-MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
-DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
-PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
-HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
-TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
-SeeIDsInUse=See IDs in use in your installation
-SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
-TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
-SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
-AddLanguageFile=Add language file
-YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Destroy table if empty)
-TableDoesNotExists=The table %s does not exists
-TableDropped=Table %s deleted
-InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Disable the about page
-UseDocFolder=Disable the documentation folder
-UseSpecificReadme=Use a specific ReadMe
-ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
-RealPathOfModule=Real path of module
-ContentCantBeEmpty=Content of file can't be empty
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
-JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
-CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
-NoCLIFile=No CLI files
-UseSpecificEditorName = Use a specific editor name
-UseSpecificEditorURL = Use a specific editor URL
-UseSpecificFamily = Use a specific family
-UseSpecificAuthor = Use a specific author
-UseSpecificVersion = Use a specific initial version
-IncludeRefGeneration=The reference of object must be generated automatically
-IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
-IncludeDocGeneration=I want to generate some documents from the object
-IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
-ShowOnCombobox=Show value into combobox
-KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
-NotEditable=Not editable
-ForeignKey=Foreign key
-TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
-AsciiToHtmlConverter=Ascii to HTML converter
-AsciiToPdfConverter=Ascii to PDF converter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
-ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+PageForLib=Plik wspólnej biblioteki PHP
+PageForObjLib=Plik do biblioteki PHP dedykowanej obiektowi
+SqlFileExtraFields=SQL dla atrybutów uzupełniających
+SqlFileKey=SQL dla kluczy
+SqlFileKeyExtraFields=Plik SQL zawierający klucze atrybutów uzupełniających
+AnObjectAlreadyExistWithThisNameAndDiffCase=Istnieje już obiekt o tej nazwie i innej wielkości liter
+UseAsciiDocFormat=Możesz użyć formatu Markdown, ale zaleca się użycie formatu Asciidoc (porównanie między .md i .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Jest miarą
+DirScanned=Katalog przeskanowany
+NoTrigger=Bez wyzwalacza
+NoWidget=Brak widżetu
+GoToApiExplorer=Eksplorator API
+ListOfMenusEntries=Lista pozycji menu
+ListOfDictionariesEntries=Lista haseł w słownikach
+ListOfPermissionsDefined=Lista zdefiniowanych uprawnień
+SeeExamples=Zobacz przykłady tutaj
+EnabledDesc=Warunek, aby to pole było aktywne (Przykłady: 1 lub $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Czy pole jest widoczne? (Przykłady: 0 = niewidoczne, 1 = widoczne na liście i utwórz / zaktualizuj / wyświetl formularze, 2 = widoczne tylko na liście, 3 = widoczne tylko w formularzu tworzenia / aktualizacji / przeglądania (nie na liście), 4 = widoczne na liście i tylko aktualizuj / wyświetl formularz (nie twórz), 5 = widoczne tylko w formularzu widoku końca listy (nie tworzy, nie aktualizuje). <br> <br> Użycie wartości ujemnej oznacza, że pole nie jest domyślnie wyświetlane na liście, ale można je wybrać do przeglądania). <br> <br> Może to być wyrażenie, na przykład: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> ($ user- 1 holiday?
+DisplayOnPdfDesc=Wyświetlaj to pole w kompatybilnych dokumentach PDF, możesz zarządzać pozycją za pomocą pola "Pozycja". <br/> Obecnie znane modele kompatybilne PDF są: Eratostenes (kolejność), Espadon (statek), gąbka (faktury), cyjan (PROPAL / cytat), Cornas (kolejność dostawca) <br/> <br/> <strong> Dla dokumentu: nie </strong> <br/> 0 = Wyświetlane <br/> 1 = wskazanie <br/> 2 = wskazanie tylko jeśli nie jest pusta <br/> <br/> <strong> dla linii dokument: </strong> <br/> 0 = nie wyświetlany <br/> 1 = wyświetlane w kolumnie <br/> 3 = wyświetlacza w opisie linii kolumny po opisie <br/> 4 = wyświetlacza w opisie kolumnie za opis tylko wtedy, gdy nie jest pusty
+DisplayOnPdf=Wyświetl na dokumencie PDF
+IsAMeasureDesc=Czy wartość pola można skumulować, aby uzyskać sumę na liście? (Przykłady: 1 lub 0)
+SearchAllDesc=Czy to pole jest używane do wyszukiwania za pomocą narzędzia szybkiego wyszukiwania? (Przykłady: 1 lub 0)
+SpecDefDesc=Wpisz tutaj całą dokumentację, którą chcesz dostarczyć wraz z modułem, która nie jest jeszcze zdefiniowana w innych zakładkach. Możesz użyć .md lub lepszej, bogatej składni .asciidoc.
+LanguageDefDesc=Wprowadź w tych plikach cały klucz i tłumaczenie dla każdego pliku językowego.
+MenusDefDesc=Zdefiniuj tutaj menu dostarczane przez Twój moduł
+DictionariesDefDesc=Zdefiniuj tutaj słowniki dostarczone przez Twój moduł
+PermissionsDefDesc=Zdefiniuj tutaj nowe uprawnienia zapewniane przez Twój moduł
+MenusDefDescTooltip=Menu dostarczane przez moduł / aplikację są zdefiniowane w tablicy <strong> $ this-> menu </strong> w pliku deskryptora modułu. Możesz edytować ten plik ręcznie lub użyć wbudowanego edytora. <br> <br> Uwaga: Po zdefiniowaniu (i ponownej aktywacji modułu) menu są również widoczne w edytorze menu dostępnym dla administratorów na %s.
+DictionariesDefDescTooltip=Słowniki dostarczane przez moduł / aplikację są zdefiniowane w tablicy <strong> $ this-> słowniki </strong> w pliku deskryptora modułu. Możesz edytować ten plik ręcznie lub użyć wbudowanego edytora. <br> <br> Uwaga: Po zdefiniowaniu (i ponownej aktywacji modułu) słowniki są również widoczne w obszarze ustawień dla administratorów na %s.
+PermissionsDefDescTooltip=Uprawnienia nadawane przez moduł / aplikację są zdefiniowane w tablicy <strong> $ this-> rights </strong> w pliku deskryptora modułu. Możesz edytować ten plik ręcznie lub użyć wbudowanego edytora. <br> <br> Uwaga: Po zdefiniowaniu (i ponownej aktywacji modułu) uprawnienia są widoczne w domyślnej konfiguracji uprawnień %s.
+HooksDefDesc=Zdefiniuj we właściwości <b> module_parts ['hooks'] </b>, w deskryptorze modułu, kontekst punktów zaczepienia, którymi chcesz zarządzać (listę kontekstów można znaleźć, wyszukując „<b> initHooksz0f17f17f17kod (a09a4b719f). plik przechwytujący służący do dodawania kodu funkcji przechwyconych (funkcje, które można znaleźć, wyszukując w kodzie podstawowym '<b> executeHooks </b>').
+TriggerDefDesc=Zdefiniuj w pliku wyzwalacza kod, który chcesz wykonać dla każdego wykonywanego zdarzenia biznesowego.
+SeeIDsInUse=Zobacz identyfikatory używane w Twojej instalacji
+SeeReservedIDsRangeHere=Zobacz zakres zarezerwowanych identyfikatorów
+ToolkitForDevelopers=Zestaw narzędzi dla programistów Dolibarr
+TryToUseTheModuleBuilder=Jeśli znasz język SQL i PHP, możesz skorzystać z kreatora kreatora modułów natywnych. <br> Włącz moduł <strong> %s </strong> i użyj kreatora, klikając <span class="fa fa-bug"> </span> w prawym górnym menu. <br> Ostrzeżenie: to jest zaawansowana funkcja programisty, <b> nie eksperymentuj </b> w swojej witrynie produkcyjnej!
+SeeTopRightMenu=Zobacz <span class="fa fa-bug"> </span> w prawym górnym menu
+AddLanguageFile=Dodaj plik językowy
+YouCanUseTranslationKey=Możesz tutaj użyć klucza, który jest kluczem tłumaczenia znalezionym w pliku językowym (patrz zakładka „Języki”)
+DropTableIfEmpty=(Zniszcz stół, jeśli jest pusty)
+TableDoesNotExists=Tabela %s nie istnieje
+TableDropped=Tabela %s została usunięta
+InitStructureFromExistingTable=Zbuduj ciąg tablicy struktury istniejącej tabeli
+UseAboutPage=Wyłącz stronę z informacjami
+UseDocFolder=Wyłącz folder dokumentacji
+UseSpecificReadme=Użyj określonego pliku ReadMe
+ContentOfREADMECustomized=Uwaga: zawartość pliku README.md została zastąpiona określoną wartością zdefiniowaną w ustawieniach modułu ModuleBuilder.
+RealPathOfModule=Prawdziwa ścieżka modułu
+ContentCantBeEmpty=Zawartość pliku nie może być pusta
+WidgetDesc=Możesz tutaj generować i edytować widżety, które zostaną osadzone w Twoim module.
+CSSDesc=Możesz tutaj wygenerować i edytować plik ze spersonalizowanym CSS osadzonym w Twoim module.
+JSDesc=Możesz tutaj wygenerować i edytować plik ze spersonalizowanym Javascriptem osadzonym w Twoim module.
+CLIDesc=Możesz tutaj wygenerować skrypty wiersza poleceń, które chcesz udostępnić w swoim module.
+CLIFile=Plik CLI
+NoCLIFile=Brak plików CLI
+UseSpecificEditorName = Użyj określonej nazwy redaktora
+UseSpecificEditorURL = Użyj określonego adresu URL edytora
+UseSpecificFamily = Użyj określonej rodziny
+UseSpecificAuthor = Użyj konkretnego autora
+UseSpecificVersion = Użyj określonej wersji początkowej
+IncludeRefGeneration=Odniesienie do obiektu musi być generowane automatycznie
+IncludeRefGenerationHelp=Zaznacz tę opcję, jeśli chcesz dołączyć kod do automatycznego zarządzania generowaniem odwołania
+IncludeDocGeneration=Chcę wygenerować dokumenty z obiektu
+IncludeDocGenerationHelp=Jeśli to zaznaczysz, zostanie wygenerowany kod w celu dodania pola „Generuj dokument” do rekordu.
+ShowOnCombobox=Pokaż wartość w combobox
+KeyForTooltip=Klucz do podpowiedzi
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
+NotEditable=Nie można edytować
+ForeignKey=Klucz obcy
+TypeOfFieldsHelp=Typ pól: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName: względna ścieżka / do / classfile.class.php [: 1 [: filter]] („1” oznacza, że dodajemy przycisk + po kombinacji w celu utworzenia rekordu, „filter” może mieć wartość „status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)” na przykład)
+AsciiToHtmlConverter=Konwerter Ascii na HTML
+AsciiToPdfConverter=Konwerter ASCII na PDF
+TableNotEmptyDropCanceled=Tabela nie jest pusta. Upuszczenie zostało anulowane.
+ModuleBuilderNotAllowed=Kreator modułów jest dostępny, ale nie jest dozwolony dla użytkownika.
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index 4705c1b057c..b67799df5fb 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Obszar zamówień klientów
-SuppliersOrdersArea=Purchase orders area
+SuppliersOrdersArea=Obszar zamówień
 OrderCard=Karta zamówienia
 OrderId=ID zamówienia
 Order=Zamówienie
@@ -11,23 +11,25 @@ OrderDate=Data zamówienia
 OrderDateShort=Data zamówienia
 OrderToProcess=Zamówienia do przetworzenia
 NewOrder=Nowe zamówienie
-NewOrderSupplier=New Purchase Order
+NewOrderSupplier=Nowe zamówienie
 ToOrder=Stwórz zamówienie
 MakeOrder=Stwórz zamówienie
 SupplierOrder=Zamówienie
 SuppliersOrders=Zamówienia
+SaleOrderLines=Linie zamówień sprzedaży
+PurchaseOrderLines=Wiersze zamówienia zakupów
 SuppliersOrdersRunning=Aktualne zamówienia
-CustomerOrder=Sales Order
-CustomersOrders=Sales Orders
-CustomersOrdersRunning=Current sales orders
-CustomersOrdersAndOrdersLines=Sales orders and order details
-OrdersDeliveredToBill=Sales orders delivered to bill
-OrdersToBill=Sales orders delivered
-OrdersInProcess=Sales orders in process
-OrdersToProcess=Sales orders to process
+CustomerOrder=Zamówienie
+CustomersOrders=Zlecenia sprzedaży
+CustomersOrdersRunning=Bieżące zamówienia sprzedaży
+CustomersOrdersAndOrdersLines=Zamówienia sprzedaży i szczegóły zamówienia
+OrdersDeliveredToBill=Zamówienia sprzedaży dostarczane do faktury
+OrdersToBill=Dostarczone zamówienia sprzedaży
+OrdersInProcess=Zamówienia sprzedaży w trakcie realizacji
+OrdersToProcess=Zamówienia sprzedaży do przetworzenia
 SuppliersOrdersToProcess=Zamówienia do przetworzenia
-SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
-AwaitingReception=Awaiting reception
+SuppliersOrdersAwaitingReception=Zamówienia oczekujące na przyjęcie
+AwaitingReception=Oczekiwanie na odbiór
 StatusOrderCanceledShort=Anulowano
 StatusOrderDraftShort=Szkic
 StatusOrderValidatedShort=Zatwierdzone
@@ -69,17 +71,17 @@ ValidateOrder=Zatwierdź zamówienie
 UnvalidateOrder=Niezatwierdzone zamówienie
 DeleteOrder=Usuń zamówienie
 CancelOrder=Anuluj zamówienie
-OrderReopened= Order %s re-open
+OrderReopened= Zamów ponownie %s
 AddOrder=Stwórz zamówienie
-AddPurchaseOrder=Create purchase order
+AddPurchaseOrder=Utwórz zamówienie zakupu
 AddToDraftOrders=Dodaj do szkicu zamówienia
 ShowOrder=Pokaż zamówienie
 OrdersOpened=Zamówienia do przygotowania
 NoDraftOrders=Brak projektów zamówień
 NoOrder=Brak zamówienia
 NoSupplierOrder=Brak zamówień
-LastOrders=Latest %s sales orders
-LastCustomerOrders=Latest %s sales orders
+LastOrders=Najnowsze zamówienia sprzedaży %s
+LastCustomerOrders=Najnowsze zamówienia sprzedaży %s
 LastSupplierOrders=Ostatnie %s zamówienia
 LastModifiedOrders=Ostatnie %s zmodyfikowane zamówienia
 AllOrders=Wszystkie zamówienia
@@ -87,10 +89,10 @@ NbOfOrders=Liczba zleceń
 OrdersStatistics=Statystyki zamówień
 OrdersStatisticsSuppliers=Statystyki zamówień
 NumberOfOrdersByMonth=Liczba zamówień na miesiąc
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+AmountOfOrdersByMonthHT=Ilość zamówień według miesiąca (bez podatku)
 ListOfOrders=Lista zamówień
 CloseOrder=Zamknij zamówienie
-ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrder=Czy na pewno chcesz ustawić to zamówienie jako dostarczone? Po dostarczeniu zamówienia można ustawić fakturowanie.
 ConfirmDeleteOrder=Czy jesteś pewien, że chcesz usunąć to zamówienie?
 ConfirmValidateOrder=Czy jesteś pewien, że chcesz potwierdzić to zamówienie pod nazwą <b>%s</b>?
 ConfirmUnvalidateOrder=Jesteś pewien, że chcesz przywrócić to zamówienie <b>%s</b> do statusu wersji roboczej?
@@ -103,8 +105,8 @@ DraftSuppliersOrders=Szkice zamówień
 OnProcessOrders=Zamówienia w przygotowaniu
 RefOrder=Nr referencyjny zamówienia
 RefCustomerOrder=Powiązane zamówienia dla klienta
-RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
+RefOrderSupplier=Nr ref. zamówienie dla dostawcy
+RefOrderSupplierShort=Nr ref. dostawca zamówienia
 SendOrderByMail=Wyślij zamówienie pocztą
 ActionsOnOrder=Zdarzenia dla zamówienia
 NoArticleOfTypeProduct=Nr artykułu typu "produktu", więc nie shippable artykule tej kolejności
@@ -113,24 +115,24 @@ AuthorRequest=Autor wniosku
 UserWithApproveOrderGrant=Useres przyznane z "zatwierdza zamówienia zgody.
 PaymentOrderRef=Płatność do zamówienia %s
 ConfirmCloneOrder=Jesteś pewien, że chcesz zduplikować zamówienie <b>%s</b>?
-DispatchSupplierOrder=Receiving purchase order %s
+DispatchSupplierOrder=Otrzymanie zamówienia zakupu %s
 FirstApprovalAlreadyDone=Wykonano pierwsze zatwierdzenie
 SecondApprovalAlreadyDone=Wykonano drugie zatwierdzenie
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
+SupplierOrderReceivedInDolibarr=Zamówienie %s otrzymało %s
+SupplierOrderSubmitedInDolibarr=Przesłano zamówienie %s
+SupplierOrderClassifiedBilled=Zamówienie %s zostało rozliczone
 OtherOrders=Inne zamówienia
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SALESREPFOLL=Reprezentatywne kolejne zamówienie sprzedaży
 TypeContact_commande_internal_SHIPPING=Przedstawiciela w ślad za koszty
 TypeContact_commande_external_BILLING=Kontakt dla faktury klienta
 TypeContact_commande_external_SHIPPING=Kontakt klienta dla wysyłki 
 TypeContact_commande_external_CUSTOMER=kontakt klienta w ślad za zamówienie
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SALESREPFOLL=Reprezentatywne kolejne zamówienie zakupu
 TypeContact_order_supplier_internal_SHIPPING=Przedstawiciela w ślad za koszty
 TypeContact_order_supplier_external_BILLING=Kontakt do faktury sprzedawcy
 TypeContact_order_supplier_external_SHIPPING=Kontakt z dostawcą
-TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+TypeContact_order_supplier_external_CUSTOMER=Kontakt z dostawcą po kolejnym zamówieniu
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Stała COMMANDE_SUPPLIER_ADDON nie zdefiniowane
 Error_COMMANDE_ADDON_NotDefined=Stała COMMANDE_ADDON nie zdefiniowane
 Error_OrderNotChecked=Nie wybrano zamówienia do faktury
@@ -141,11 +143,12 @@ OrderByEMail=Adres e-mail
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=A complete order model 
-PDFEratostheneDescription=A complete order model
+PDFEinsteinDescription=Kompletny model zamówienia (stara implementacja szablonu Eratosthene)
+PDFEratostheneDescription=Kompletny model zamówienia
 PDFEdisonDescription=Prosty model celu
-PDFProformaDescription=A complete Proforma invoice template
+PDFProformaDescription=Kompletny szablon faktury Proforma
 CreateInvoiceForThisCustomer=Zamówienia na banknoty
+CreateInvoiceForThisSupplier=Zamówienia na banknoty
 NoOrdersToInvoice=Brak zleceń rozliczanych
 CloseProcessedOrdersAutomatically=Sklasyfikować "przetwarzane" wszystkie wybrane zamówienia.
 OrderCreation=Tworzenie zamówienia
@@ -154,11 +157,11 @@ OrderCreated=Twoje zamówienia zostały utworzone
 OrderFail=Podczas tworzenia zamówienia wystąpił błąd
 CreateOrders=Tworzenie zamówień
 ToBillSeveralOrderSelectCustomer=Aby utworzyć fakturę za kilka rzędów, kliknij pierwszy na klienta, a następnie wybrać "% s".
-OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
-IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
-SetShippingMode=Set shipping mode
-WithReceptionFinished=With reception finished
+OptionToSetOrderBilledNotEnabled=Opcja z modułu Workflow, aby automatycznie ustawić zamówienie na „Zafakturowane” po walidacji faktury, nie jest włączona, więc po wygenerowaniu faktury będziesz musiał ręcznie ustawić status zamówień na „Zafakturowane”.
+IfValidateInvoiceIsNoOrderStayUnbilled=Jeśli weryfikacja faktury to „Nie”, zamówienie pozostanie w stanie „Niezafakturowane” do momentu potwierdzenia faktury.
+CloseReceivedSupplierOrdersAutomatically=Zamknij zamówienie do statusu „%s” automatycznie, jeśli otrzymane zostaną wszystkie produkty.
+SetShippingMode=Ustaw tryb wysyłki
+WithReceptionFinished=Po zakończeniu odbioru
 #### supplier orders status
 StatusSupplierOrderCanceledShort=Anulowany
 StatusSupplierOrderDraftShort=Projekt
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index 22befcd2e4c..382cac1dde8 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -3,47 +3,47 @@ SecurityCode=Kod zabezpieczający
 NumberingShort=N°
 Tools=Narzędzia
 TMenuTools=Narzędzia
-ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+ToolsDesc=Wszystkie narzędzia, które nie są zawarte w innych pozycjach menu, są tutaj zgrupowane. <br> Wszystkie narzędzia są dostępne w lewym menu.
 Birthday=Urodziny
 BirthdayAlertOn=urodziny wpisu aktywnych
 BirthdayAlertOff=urodziny wpisu nieaktywne
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (text) of invoice date
-PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
-TextPreviousMonthOfInvoice=Previous month (text) of invoice date
-NextMonthOfInvoice=Following month (number 1-12) of invoice date
-TextNextMonthOfInvoice=Following month (text) of invoice date
-PreviousMonth=Previous month
-CurrentMonth=Current month
-ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
-DocFileGeneratedInto=Doc file generated into <b>%s</b>.
+TransKey=Tłumaczenie klucza TransKey
+MonthOfInvoice=Miesiąc (numer 1-12) daty faktury
+TextMonthOfInvoice=Miesiąc (tekst) daty faktury
+PreviousMonthOfInvoice=Poprzedni miesiąc (numer 1-12) od daty faktury
+TextPreviousMonthOfInvoice=Poprzedni miesiąc (tekst) daty faktury
+NextMonthOfInvoice=Kolejny miesiąc (numer 1-12) od daty wystawienia faktury
+TextNextMonthOfInvoice=Kolejny miesiąc (tekst) od daty faktury
+PreviousMonth=Poprzedni miesiac
+CurrentMonth=Obecny miesiąc
+ZipFileGeneratedInto=Plik ZIP wygenerowany w <b> %s </b>.
+DocFileGeneratedInto=Plik doc wygenerowany w <b> %s </b>.
 JumpToLogin=Rozłączono. Idź do strony logowania...
-MessageForm=Message on online payment form
-MessageOK=Message on the return page for a validated payment
-MessageKO=Message on the return page for a canceled payment
-ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
-DeleteAlsoContentRecursively=Check to delete all content recursively
-PoweredBy=Powered by
-YearOfInvoice=Year of invoice date
-PreviousYearOfInvoice=Previous year of invoice date
-NextYearOfInvoice=Following year of invoice date
+MessageForm=Wiadomość na formularzu płatności online
+MessageOK=Komunikat na stronie zwrotów potwierdzonej płatności
+MessageKO=Komunikat na stronie zwrotów dotyczący anulowanej płatności
+ContentOfDirectoryIsNotEmpty=Zawartość tego katalogu nie jest pusta.
+DeleteAlsoContentRecursively=Zaznacz, aby usunąć rekursywnie całą zawartość
+PoweredBy=Obsługiwane przez
+YearOfInvoice=Rok daty faktury
+PreviousYearOfInvoice=Poprzedni rok od daty wystawienia faktury
+NextYearOfInvoice=Kolejny rok od daty wystawienia faktury
 DateNextInvoiceBeforeGen=Data kolejnej faktury (przed wygenerowaniem)
 DateNextInvoiceAfterGen=Data następnej faktury (po wygenerowaniu)
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
-OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
-AtLeastOneMeasureIsRequired=At least 1 field for measure is required
-AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
-LatestBlogPosts=Latest Blog Posts
-Notify_ORDER_VALIDATE=Sales order validated
-Notify_ORDER_SENTBYMAIL=Sales order sent by mail
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
-Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
-Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+GraphInBarsAreLimitedToNMeasures=Grafika jest ograniczona do taktów %s w trybie „Bars”. Zamiast tego automatycznie wybrano tryb „Linie”.
+OnlyOneFieldForXAxisIsPossible=Obecnie możliwe jest tylko 1 pole jako oś X. Wybrano tylko pierwsze wybrane pole.
+AtLeastOneMeasureIsRequired=Wymagane jest co najmniej 1 pole do pomiaru
+AtLeastOneXAxisIsRequired=Wymagane jest co najmniej 1 pole dla osi X.
+LatestBlogPosts=Najnowsze posty na blogu
+Notify_ORDER_VALIDATE=Zamówienie sprzedaży zostało zatwierdzone
+Notify_ORDER_SENTBYMAIL=Zamówienie sprzedaży wysłane pocztą
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Zamówienie wysłane e-mailem
+Notify_ORDER_SUPPLIER_VALIDATE=Zarejestrowano zamówienie zakupu
+Notify_ORDER_SUPPLIER_APPROVE=Zatwierdzono zamówienie zakupu
+Notify_ORDER_SUPPLIER_REFUSE=Zamówienie zostało odrzucone
 Notify_PROPAL_VALIDATE=Oferta klienta potwierdzona
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Oferta klienta zamknięta i podpisana
+Notify_PROPAL_CLOSE_REFUSED=Zamknięta propozycja klienta odrzucona
 Notify_PROPAL_SENTBYMAIL=Propozycja handlowa wysłana za pośrednictwem wiadomości email
 Notify_WITHDRAW_TRANSMIT=Wycofanie transmisji
 Notify_WITHDRAW_CREDIT=Wycofanie kredyt
@@ -52,16 +52,16 @@ Notify_COMPANY_CREATE=Kontrahent utworzony
 Notify_COMPANY_SENTBYMAIL=Maile wysyłane z karty przez osoby trzecie
 Notify_BILL_VALIDATE=Faktura klienta zatwierdzona
 Notify_BILL_UNVALIDATE=Faktura klienta nie- zwalidowane
-Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_PAYED=Zapłacono fakturę klienta
 Notify_BILL_CANCEL=Faktura klienta anulowana
 Notify_BILL_SENTBYMAIL=Faktura klienta wysyłana za pośrednictwem wiadomości email
-Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
-Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
-Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_BILL_SUPPLIER_VALIDATE=Zatwierdzona faktura dostawcy
+Notify_BILL_SUPPLIER_PAYED=Zapłacono fakturę dostawcy
+Notify_BILL_SUPPLIER_SENTBYMAIL=Faktura dostawcy wysłana pocztą
+Notify_BILL_SUPPLIER_CANCELED=Faktura dostawcy anulowana
 Notify_CONTRACT_VALIDATE=Umowa zatwierdzona
 Notify_FICHINTER_VALIDATE=Interwencja zatwierdzona
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_ADD_CONTACT=Dodano kontakt do interwencji
 Notify_FICHINTER_SENTBYMAIL=Interwencja wysłana za pośrednictwem wiadomości email
 Notify_SHIPPING_VALIDATE=Wysyłka zatwierdzona
 Notify_SHIPPING_SENTBYMAIL=Wysyłka wysłane pocztą
@@ -74,46 +74,47 @@ Notify_PROJECT_CREATE=Stworzenie projektu
 Notify_TASK_CREATE=Zadanie utworzone
 Notify_TASK_MODIFY=Zadanie zmodyfikowane
 Notify_TASK_DELETE=Zadanie usunięte
-Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
-Notify_EXPENSE_REPORT_APPROVE=Expense report approved
-Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
-Notify_HOLIDAY_APPROVE=Leave request approved
-Notify_ACTION_CREATE=Added action to Agenda
+Notify_EXPENSE_REPORT_VALIDATE=Raport z wydatków zweryfikowany (wymagana akceptacja)
+Notify_EXPENSE_REPORT_APPROVE=Zatwierdzono raport wydatków
+Notify_HOLIDAY_VALIDATE=Wniosek urlopowy został zatwierdzony (wymagana akceptacja)
+Notify_HOLIDAY_APPROVE=Prośba o opuszczenie została zatwierdzona
+Notify_ACTION_CREATE=Dodano akcję do agendy
 SeeModuleSetup=Zobacz konfigurację modułu% s
 NbOfAttachedFiles=Liczba załączonych plików / dokumentów
 TotalSizeOfAttachedFiles=Całkowita wielkość załączonych plików / dokumentów
 MaxSize=Maksymalny rozmiar
 AttachANewFile=Załącz nowy plik / dokument
 LinkedObject=Związany obiektu
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
-PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
+NbOfActiveNotifications=Liczba powiadomień (liczba e-maili do odbiorców)
+PredefinedMailTest=__(Cześć)__\nTo jest wiadomość testowa wysłana na adres __EMAIL__.\nWiersze są oddzielone znakiem powrotu karetki.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__ (Witaj) __ <br> To jest test <b> </b> wiadomość wysłana na adres __EMAIL__ (słowo test musi być pogrubione). <br> Wiersze są oddzielone znakiem powrotu karetki. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(Cześć)__\n\n\n__(Z poważaniem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Cześć)__\n\nW załączeniu faktura __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Z poważaniem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Cześć)__\n\nPrzypominamy, że wydaje się, że faktura __REF__ nie została zapłacona. Dla przypomnienia dołączamy kopię faktury.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Z poważaniem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Cześć)__\n\nW załączeniu propozycja handlowa __REF__\n\n\n__(Z poważaniem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Cześć)__\n\nW załączeniu zapytanie o cenę __REF__\n\n\n__(Z poważaniem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Cześć)__\n\nW załączeniu zamówienie __REF__\n\n\n__(Z poważaniem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Cześć)__\n\nW załączeniu przesyłamy nasze zamówienie __REF__\n\n\n__(Z poważaniem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Cześć)__\n\nW załączeniu faktura __REF__\n\n\n__(Z poważaniem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Cześć)__\n\nW załączeniu przesyłka __REF__\n\n\n__(Z poważaniem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Cześć)__\n\nW załączeniu interwencja __REF__\n\n\n__(Z poważaniem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=Możesz kliknąć poniższy link, aby dokonać płatności, jeśli nie została jeszcze wykonana.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Cześć)__\n\n\n__(Z poważaniem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Przypomnienie o wydarzeniu „__EVENT_LABEL__” w dniu __EVENT_DATE__ o __EVENT_TIME__ <br> <br> To jest wiadomość automatyczna, proszę nie odpowiadać.
+DemoDesc=Dolibarr to kompaktowy ERP / CRM obsługujący kilka modułów biznesowych. Demo pokazujące wszystkie moduły nie ma sensu, ponieważ taki scenariusz nigdy się nie zdarzy (kilkaset dostępnych). Tak więc dostępnych jest kilka profili demonstracyjnych.
 ChooseYourDemoProfil=Wybierz profil demo najlepiej odzwierciedlający twoje potrzeby...
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+ChooseYourDemoProfilMore=... lub stwórz własny profil <br> (ręczny wybór modułu)
 DemoFundation=Zarządzanie członkami fundacji
 DemoFundation2=Zarządzanie członkami i kontami bankowymi fundacji
 DemoCompanyServiceOnly=Firma lub freelancer sprzedający tylko swoje usługi
 DemoCompanyShopWithCashDesk=Zarządzanie sklepem z kasy
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyProductAndStocks=Kupuj produkty w punkcie sprzedaży
+DemoCompanyManufacturing=Firma produkująca produkty
 DemoCompanyAll=Firma z kilkoma aktywnościami (wszystkie główne moduły)
 CreatedBy=Utworzone przez %s
 ModifiedBy=Zmodyfikowane przez %s
 ValidatedBy=Zatwierdzone przez %s
+SignedBy=Podpisano przez %s
 ClosedBy=Zamknięte przez %s
 CreatedById=ID użytkownika który stworzył
 ModifiedById=ID użytkownika, który dokonał ostatnich zmian
@@ -139,7 +140,7 @@ Right=Prawo
 CalculatedWeight=Obliczona waga
 CalculatedVolume=Obliczona wartość
 Weight=Waga
-WeightUnitton=ton
+WeightUnitton=tona
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -175,48 +176,48 @@ SizeUnitinch=cal
 SizeUnitfoot=stopa
 SizeUnitpoint=punkt
 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=Ten formularz umożliwia zażądanie nowego hasła. Zostanie on wysłany na Twój adres e-mail. <br> Zmiana zacznie obowiązywać po kliknięciu linku potwierdzającego w wiadomości e-mail. <br> Sprawdź swoją skrzynkę odbiorczą.
 BackToLoginPage=Powrót do strony logowania
 AuthenticationDoesNotAllowSendNewPassword=Uwierzytelnianie w <b>trybie %s.</b> <br> W tym trybie Dolibarr nie może znać ani zmienić hasła. <br> Skontaktuj się z administratorem systemu, jeśli chcesz zmienić swoje hasło.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+EnableGDLibraryDesc=Zainstaluj lub włącz bibliotekę GD w instalacji PHP, aby użyć tej opcji.
 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=Demo Dolibarr ERP/CRM
 StatsByNumberOfUnits=Statystyki dla sum ilości produktów / usług
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
-NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of sales orders
+StatsByNumberOfEntities=Statystyki dotyczące liczby podmiotów polecających (nr faktury lub zamówienia ...)
+NumberOfProposals=Liczba propozycji
+NumberOfCustomerOrders=Liczba zamówień sprzedaży
 NumberOfCustomerInvoices=Ilość faktur klientów
-NumberOfSupplierProposals=Number of vendor proposals
-NumberOfSupplierOrders=Number of purchase orders
-NumberOfSupplierInvoices=Number of vendor invoices
-NumberOfContracts=Number of contracts
-NumberOfMos=Number of manufacturing orders
-NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on sales orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on vendor proposals
-NumberOfUnitsSupplierOrders=Number of units on purchase orders
-NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
-NumberOfUnitsContracts=Number of units on contracts
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+NumberOfSupplierProposals=Liczba propozycji dostawców
+NumberOfSupplierOrders=Liczba zamówień
+NumberOfSupplierInvoices=Liczba faktur od dostawcy
+NumberOfContracts=Liczba umów
+NumberOfMos=Liczba zleceń produkcyjnych
+NumberOfUnitsProposals=Liczba jednostek w propozycjach
+NumberOfUnitsCustomerOrders=Liczba jednostek w zamówieniach sprzedaży
+NumberOfUnitsCustomerInvoices=Liczba jednostek na fakturach klienta
+NumberOfUnitsSupplierProposals=Liczba jednostek w propozycjach dostawców
+NumberOfUnitsSupplierOrders=Liczba jednostek w zamówieniach zakupu
+NumberOfUnitsSupplierInvoices=Liczba jednostek na fakturach dostawcy
+NumberOfUnitsContracts=Liczba jednostek objętych kontraktami
+NumberOfUnitsMos=Liczba jednostek do wyprodukowania w zleceniach produkcyjnych
+EMailTextInterventionAddedContact=Przypisano Ci nową interwencję %s.
 EMailTextInterventionValidated=Interwencja %s zatwierdzona
-EMailTextInvoiceValidated=Invoice %s has been validated.
-EMailTextInvoicePayed=Invoice %s has been paid.
-EMailTextProposalValidated=Proposal %s has been validated.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
-EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderApproved=Order %s has been approved.
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
-EMailTextExpenseReportValidated=Expense report %s has been validated.
-EMailTextExpenseReportApproved=Expense report %s has been approved.
-EMailTextHolidayValidated=Leave request %s has been validated.
-EMailTextHolidayApproved=Leave request %s has been approved.
-EMailTextActionAdded=The action %s has been added to the Agenda.
+EMailTextInvoiceValidated=Faktura %s została zweryfikowana.
+EMailTextInvoicePayed=Faktura %s została zapłacona.
+EMailTextProposalValidated=Oferta %s została zweryfikowana.
+EMailTextProposalClosedSigned=Wniosek %s został zamknięty i podpisany.
+EMailTextOrderValidated=Zamówienie %s zostało zweryfikowane.
+EMailTextOrderApproved=Zamówienie %s zostało zatwierdzone.
+EMailTextOrderValidatedBy=Zamówienie %s zostało zarejestrowane przez %s.
+EMailTextOrderApprovedBy=Zamówienie %s zostało zatwierdzone przez %s.
+EMailTextOrderRefused=Zamówienie %s zostało odrzucone.
+EMailTextOrderRefusedBy=Zamówienie %s zostało odrzucone przez %s.
+EMailTextExpeditionValidated=Wysyłka %s została zweryfikowana.
+EMailTextExpenseReportValidated=Raport z wydatków %s został zweryfikowany.
+EMailTextExpenseReportApproved=Raport z wydatków %s został zatwierdzony.
+EMailTextHolidayValidated=Wniosek o opuszczenie %s został zatwierdzony.
+EMailTextHolidayApproved=Wniosek o urlop %s został zatwierdzony.
+EMailTextActionAdded=Akcja %s została dodana do porządku obrad.
 ImportedWithSet=Przywóz zestaw danych
 DolibarrNotification=Automatyczne powiadomienie
 ResizeDesc=Skriv inn ny <b>bredde</b> eller ny høyde. Forhold vil bli holdt under resizing ...
@@ -224,7 +225,7 @@ 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=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+CurrentInformationOnImage=To narzędzie zostało zaprojektowane, aby pomóc Ci zmienić rozmiar lub przyciąć obraz. To są informacje o aktualnie edytowanym obrazie
 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:
@@ -237,31 +238,32 @@ StartUpload=Rozpocznij przesyłanie
 CancelUpload=Anuluj przesyłanie
 FileIsTooBig=Plik jest za duży
 PleaseBePatient=Proszę o cierpliwość...
-NewPassword=New password
+NewPassword=Nowe hasło
 ResetPassword=Resetuj hasło
-RequestToResetPasswordReceived=A request to change your password has been received.
+RequestToResetPasswordReceived=Otrzymano prośbę o zmianę hasła.
 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
 YouMustClickToChange=Trzeba jednak najpierw kliknąć na poniższy link, aby potwierdzić tę zmianę hasła
+ConfirmPasswordChange=Confirm password change
 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>
 SourcesRepository=Źródła dla repozytorium
-Chart=Chart
+Chart=Wykres
 PassEncoding=Kodowanie hasła
 PermissionsAdd=Uprawnienia dodane
 PermissionsDelete=Uprawnienia usunięte
 YourPasswordMustHaveAtLeastXChars=Twoje hasło musi składać się z <strong>%s</strong> znaków
 YourPasswordHasBeenReset=Twoje hasło zostało zresetowane pomyślnie
-ApplicantIpAddress=IP address of applicant
-SMSSentTo=SMS sent to %s
-MissingIds=Missing ids
-ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
-ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
-ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
-TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
-OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-PrefixSession=Prefix for session ID
+ApplicantIpAddress=Adres IP wnioskodawcy
+SMSSentTo=SMS wysłany na numer %s
+MissingIds=Brakujące identyfikatory
+ThirdPartyCreatedByEmailCollector=Strona trzecia utworzona przez moduł zbierający wiadomości e-mail z wiadomości e-mail MSGID %s
+ContactCreatedByEmailCollector=Kontakt / adres utworzony przez kolektora poczty e-mail z wiadomości e-mail MSGID %s
+ProjectCreatedByEmailCollector=Projekt utworzony przez kolektor poczty e-mail z wiadomości e-mail MSGID %s
+TicketCreatedByEmailCollector=Bilet utworzony przez zbierającego wiadomości e-mail z wiadomości e-mail MSGID %s
+OpeningHoursFormatDesc=Użyj - aby oddzielić godziny otwarcia i zamknięcia. <br> Użyj spacji, aby wprowadzić różne zakresy. <br> Przykład: 8-12 14-18
+PrefixSession=Prefiks identyfikatora sesji
 
 ##### Export #####
 ExportsArea=Wywóz obszarze
@@ -271,20 +273,20 @@ LibraryVersion=Wersja biblioteki
 ExportableDatas=Eksport danych
 NoExportableData=Nr eksport danych (bez modułów z eksportowane dane załadowane lub brakujące uprawnienia)
 ##### External sites #####
-WebsiteSetup=Setup of module website
+WebsiteSetup=Konfiguracja strony internetowej modułu
 WEBSITE_PAGEURL=Link strony
 WEBSITE_TITLE=Tytuł
 WEBSITE_DESCRIPTION=Opis
-WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_IMAGE=Wizerunek
+WEBSITE_IMAGEDesc=Względna ścieżka nośnika obrazu. Możesz pozostawić to pole puste, ponieważ jest rzadko używane (może być używane przez zawartość dynamiczną do wyświetlania miniatury na liście postów na blogu). Użyj __WEBSITE_KEY__ w ścieżce, jeśli ścieżka zależy od nazwy witryny (na przykład: obraz / __ WEBSITE_KEY __ / historie / mójimage.png).
 WEBSITE_KEYWORDS=Słowa kluczowe
-LinesToImport=Lines to import
+LinesToImport=Linie do zaimportowania
 
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
-ProductsPerPopularity=Products/Services by popularity
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+MemoryUsage=Zużycie pamięci
+RequestDuration=Czas trwania zapytania
+ProductsPerPopularity=Produkty / usługi według popularności
+PopuProp=Produkty / usługi według popularności w propozycjach
+PopuCom=Produkty / usługi według popularności w Zamówieniach
+ProductStatistics=Statystyki produktów / usług
+NbOfQtyInOrders=Ilość w zamówieniach
+SelectTheTypeOfObjectToAnalyze=Wybierz typ obiektu do analizy ...
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
index 35d92225276..8fd61acd09e 100644
--- a/htdocs/langs/pl_PL/productbatch.lang
+++ b/htdocs/langs/pl_PL/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Użyj lot / numer seryjny
-ProductStatusOnBatch=Tak (lot / numer seryjny wymagany)
+ProductStatusOnBatch=Tak (wymagana partia)
+ProductStatusOnSerial=Tak (wymagany unikalny numer seryjny)
 ProductStatusNotOnBatch=Nie (lot / numer seryjny nie wykorzystany)
-ProductStatusOnBatchShort=Tak
+ProductStatusOnBatchShort=Partia
+ProductStatusOnSerialShort=Seryjny
 ProductStatusNotOnBatchShort=Nie
 Batch=Lot/Serial
 atleast1batchfield=Data wykorzystania lub data sprzedaży lub Lot / Numer seryjny
@@ -16,9 +18,18 @@ printEatby=Wykorzystaj po: %s
 printSellby=Sprzedaj po: %s
 printQty=Ilość: %d
 AddDispatchBatchLine=Dodaj linię dla przedłużenia wysyłki
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=Kiedy moduł Grupa Produktów/Numer Seryjny jest włączony, automatyczne zmniejszenie stanu magazynowego jest wymuszone do 'Zmniejszenia fizycznego stanu magazynowego przy zatwierdzeniu wysyłki' i automatyczne zwiększenie stanu magazynowego jest wymuszone do 'Zwiększenia fizycznego stanu magazynowego przy ręcznym wysyłaniu produktów do magazynu' i nie może być edytowane. Inne opcje mogą być zmienione dowolnie.
 ProductDoesNotUseBatchSerial=Ten produkt nie używa lotu/numeru seryjnego
 ProductLotSetup=Konfiguracja modułu lot/seria
 ShowCurrentStockOfLot=Pokaż aktualny zapas dla pasy produkt/lot
 ShowLogOfMovementIfLot=Pokaż historię przesunięć dla pary produkt/lot
 StockDetailPerBatch=Szczegóły zapasu po locie
+SerialNumberAlreadyInUse=Numer seryjny %s jest już używany dla produktu %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Opcje automatycznego generowania produktów wsadowych zarządzanych partiami
+BatchSerialNumberingModules=Opcje automatycznego generowania produktów wsadowych zarządzanych według numerów seryjnych
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 3317f16ba9a..7abe05286d0 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -17,16 +17,16 @@ Create=Utwórz
 Reference=Nr referencyjny
 NewProduct=Nowy produkt
 NewService=Nowa usługa
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+ProductVatMassChange=Globalna aktualizacja podatku VAT
+ProductVatMassChangeDesc=To narzędzie aktualizuje stawkę VAT zdefiniowaną dla <b> <u> WSZYSTKIE </u> </b> produktów i usług!
 MassBarcodeInit=Masowa inicjalizacja kodów kreskowych
 MassBarcodeInitDesc=Strona ta może być używana do wygenerowania kodu kreskowego dla obiektów nie posiadających zdefiniowanego kodu. Sprawdź wcześniej, czy ustawienia modułu kodu kreskowego jest kompletna.
 ProductAccountancyBuyCode=Kod księgowy (zakup)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancyBuyIntraCode=Kod księgowy (zakup wewnątrzwspólnotowy)
+ProductAccountancyBuyExportCode=Kod księgowy (import zakupów)
 ProductAccountancySellCode=Kod księgowy (sprzedaż)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
-ProductAccountancySellExportCode=Accounting code (sale export)
+ProductAccountancySellIntraCode=Kod księgowy (sprzedaż wewnątrzwspólnotowa)
+ProductAccountancySellExportCode=Kod księgowy (sprzedaż eksport)
 ProductOrService=Produkt lub usługa
 ProductsAndServices=Produkty i usługi
 ProductsOrServices=Produkty lub Usługi
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Usługi tylko na sprzedaż
 ServicesOnPurchaseOnly=Usługi tylko do zakupu
 ServicesNotOnSell=Usługi nie na sprzedaż i nie do zakupu
 ServicesOnSellAndOnBuy=Usługi na sprzedaż i do zakupu
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Najnowsze zmodyfikowane produkty / usługi %s
 LastRecordedProducts=Ostatnie %s zarejestrowanych produktów
 LastRecordedServices=Ostatnie %s zarejestrowanych usług
 CardProduct0=Produkt
@@ -68,18 +68,18 @@ ProductStatusNotOnBuyShort=Nie do zakupu
 UpdateVAT=Uaktualnij VAT
 UpdateDefaultPrice=Uaktualnij domyślną cenę
 UpdateLevelPrices=Uaktualnij ceny dla każdego poziomu
-AppliedPricesFrom=Applied from
+AppliedPricesFrom=Zastosowano od
 SellingPrice=Cena sprzedaży
 SellingPriceHT=Cena sprzedaży (Bez VAT)
 SellingPriceTTC=Cena sprzedaży (z podatkiem)
 SellingMinPriceTTC=Minimalna cena sprzedaży (z podatkiem)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=This value could be used for margin calculation.
+CostPriceDescription=To pole ceny (bez podatku) może służyć do przechowywania średniej kwoty, jaką ten produkt kosztuje dla Twojej firmy. Może to być każda cena, którą sam obliczysz, na przykład ze średniej ceny zakupu plus średni koszt produkcji i dystrybucji.
+CostPriceUsage=Wartość tę można wykorzystać do obliczenia depozytu zabezpieczającego.
 SoldAmount=Sprzedana ilość
 PurchasedAmount=Zakupiona ilość
 NewPrice=Nowa cena
-MinPrice=Min. sell price
-EditSellingPriceLabel=Edit selling price label
+MinPrice=Min. Cena sprzedaży
+EditSellingPriceLabel=Edytuj etykietę ceny sprzedaży
 CantBeLessThanMinPrice=Cena sprzedaży nie może być niższa niż minimalna dopuszczalna dla tego produktu (%s bez podatku). Ten komunikat może się również pojawić po wpisaniu zbyt wysokiego rabatu.
 ContractStatusClosed=Zamknięte
 ErrorProductAlreadyExists=Produkt o numerze referencyjnym %s już istnieje.
@@ -96,7 +96,7 @@ ServicesArea=Obszar usług
 ListOfStockMovements=Wykaz przesunięć magazynowych
 BuyingPrice=Cena zakupu
 PriceForEachProduct=Produkt z konkretną ceną
-SupplierCard=Vendor card
+SupplierCard=Karta sprzedawcy
 PriceRemoved=Cena usunięta
 BarCode=Kod kreskowy
 BarcodeType=Typ kodu kreskowego
@@ -104,25 +104,25 @@ SetDefaultBarcodeType=Ustaw typ kodu kreskowego
 BarcodeValue=Wartość kodu kreskowego
 NoteNotVisibleOnBill=Notatka (nie widoczna na fakturach, ofertach...)
 ServiceLimitedDuration=Jeśli produkt jest usługą z ograniczonym czasem trwania:
-FillWithLastServiceDates=Fill with last service line dates
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+FillWithLastServiceDates=Wpisz daty ostatniej linii serwisowej
+MultiPricesAbility=Wiele segmentów cenowych na produkt / usługę (każdy klient jest w jednym segmencie cenowym)
 MultiPricesNumPrices=Ilość cen
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+DefaultPriceType=Podstawa cen domyślnych (z i bez podatku) przy dodawaniu nowych cen sprzedaży
+AssociatedProductsAbility=Enable Kits (zestaw kilku produktów)
+VariantsAbility=Włącz warianty (odmiany produktów, na przykład kolor, rozmiar)
+AssociatedProducts=Zestawy
+AssociatedProductsNumber=Liczba produktów tworzących ten zestaw
 ParentProductsNumber=Liczba dominującej opakowaniu produktu
 ParentProducts=Produkt macieżysty
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=Jeśli 0, ten produkt nie jest zestawem
+IfZeroItIsNotUsedByVirtualProduct=Jeśli 0, ten produkt nie jest używany przez żaden zestaw
 KeywordFilter=Filtr słów kluczowych
 CategoryFilter=Filtr kategorii
 ProductToAddSearch=Szukaj produktu do dodania
 NoMatchFound=Nie znaleziono odpowiednika
 ListOfProductsServices=Lista produktów/usług
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Lista produktów / usług wchodzących w skład tego zestawu
+ProductParentList=Lista zestawów zawierających ten produkt jako składnik
 ErrorAssociationIsFatherOfThis=Jeden z wybranych produktów jest nadrzędny dla produktu bieżącego
 DeleteProduct=Usuń produkt/usługę
 ConfirmDeleteProduct=Czy na pewno chcesz usunąć ten produkt/usługę?
@@ -134,20 +134,21 @@ ImportDataset_service_1=Usługi
 DeleteProductLine=Usuń linię produktu
 ConfirmDeleteProductLine=Czy na pewno chcesz usunąć tę linię produktu?
 ProductSpecial=Specjalne
-QtyMin=Min. purchase quantity
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
-NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
+QtyMin=Ilość minimalna
+PriceQtyMin=Cena ilość min.
+PriceQtyMinCurrency=Cena (waluta) za tę ilość. (bez rabatu)
+VATRateForSupplierProduct=Stawka VAT (dla tego dostawcy / produktu)
+DiscountQtyMin=Rabat na tę ilość.
+NoPriceDefinedForThisSupplier=Brak zdefiniowanej ceny / ilości dla tego dostawcy / produktu
+NoSupplierPriceDefinedForThisProduct=Dla tego produktu nie określono ceny / ilości dostawcy
+PredefinedItem=Wstępnie zdefiniowany przedmiot
+PredefinedProductsToSell=Predefiniowany produkt
+PredefinedServicesToSell=Usługa predefiniowana
 PredefinedProductsAndServicesToSell=Predefiniowane produkty / usługi do sprzedaży
 PredefinedProductsToPurchase=Predefiniowane produkty do zakupu
 PredefinedServicesToPurchase=Predefiniowane usługi do zakupu
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
-NotPredefinedProducts=Not predefined products/services
+PredefinedProductsAndServicesToPurchase=Wstępnie zdefiniowane produkty / usługi do zakupu
+NotPredefinedProducts=Niezdefiniowane produkty / usługi
 GenerateThumb=Wygeneruj miniaturkę
 ServiceNb=Usługa #%s
 ListProductServiceByPopularity=Lista produktów/usług ze względu na popularność
@@ -156,10 +157,10 @@ ListServiceByPopularity=Wykaz usług ze względu na popularność
 Finished=Produkty wytwarzane
 RowMaterial=Surowiec
 ConfirmCloneProduct=Czy na pewno chcesz powielić produkt lub usługę <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Sklonuj wszystkie główne informacje o produkcie / usłudze
 ClonePricesProduct=Powiel ceny
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
+CloneCategoriesProduct=Klonuj tagi / kategorie połączone
+CloneCompositionProduct=Sklonuj wirtualny produkt / usługę
 CloneCombinationsProduct=Powiel warianty produktu
 ProductIsUsed=Ten produkt jest używany
 NewRefForClone=Referencja nowego produktu/usługi
@@ -167,14 +168,14 @@ SellingPrices=Cena sprzedaży
 BuyingPrices=Cena zakupu
 CustomerPrices=Ceny klienta
 SuppliersPrices=Ceny dostawców
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
+SuppliersPricesOfProductsOrServices=Ceny dostawców (produktów lub usług)
+CustomCode=Cła | Towar | Kod HS
 CountryOrigin=Kraj pochodzenia
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+RegionStateOrigin=Region pochodzenia
+StateOrigin=Stan | prowincja
+Nature=Charakter produktu (materiał / wykończenie)
+NatureOfProductShort=Charakter produktu
+NatureOfProductDesc=Surowiec lub gotowy produkt
 ShortLabel=Krótka etykieta
 Unit=Jednostka
 p=jedn.
@@ -198,7 +199,7 @@ m3=m³
 liter=litr
 l=l
 unitP=Sztuka
-unitSET=Set
+unitSET=Zestaw
 unitS=Sekunda
 unitH=Godzina
 unitD=Dzień
@@ -208,7 +209,7 @@ unitLM=Metr bieżący
 unitM2=Metr kwadratowy
 unitM3=Metr sześcienny
 unitL=Litr
-unitT=ton
+unitT=tona
 unitKG=kg
 unitG=Gram
 unitMG=mg
@@ -219,7 +220,7 @@ unitDM=dm
 unitCM=cm
 unitMM=mm
 unitFT=ft
-unitIN=in
+unitIN=w
 unitM2=Metr kwadratowy
 unitDM2=dm²
 unitCM2=cm²
@@ -240,18 +241,18 @@ CurrentProductPrice=Aktualna cena
 AlwaysUseNewPrice=Zawsze używaj aktualnej ceny produktu/usługi
 AlwaysUseFixedPrice=Zastosuj stałą cenę
 PriceByQuantity=Różne ceny według ilości
-DisablePriceByQty=Disable prices by quantity
+DisablePriceByQty=Wyłącz ceny według ilości
 PriceByQuantityRange=Zakres ilości
-MultipriceRules=Automatic prices for segment
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+MultipriceRules=Ceny automatyczne za segment
+UseMultipriceRules=Użyj reguł segmentów cenowych (zdefiniowanych w konfiguracji modułu produktu), aby automatycznie obliczyć ceny wszystkich innych segmentów zgodnie z pierwszym segmentem
 PercentVariationOver=%% Zmiany na% s
 PercentDiscountOver=%% Rabatu na% s
-KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+KeepEmptyForAutoCalculation=Pozostaw puste, aby to było obliczane automatycznie na podstawie wagi lub objętości produktów
+VariantRefExample=Przykłady: COL, SIZE
+VariantLabelExample=Przykłady: kolor, rozmiar
 ### composition fabrication
 Build=Produkcja
-ProductsMultiPrice=Products and prices for each price segment
+ProductsMultiPrice=Produkty i ceny w każdym segmencie cenowym
 ProductsOrServiceMultiPrice=Ceny klienta (produktów lub usług, multi-ceny)
 ProductSellByQuarterHT=Kwartalne obroty na produktach przed opodatkowaniem
 ServiceSellByQuarterHT=Kwartalne obroty na usłuigach przed opodatkowaniem
@@ -260,48 +261,48 @@ Quarter2=2-i Kwartał
 Quarter3=3-i Kwartał
 Quarter4=4-y Kwartał
 BarCodePrintsheet=Drukuj kod kreskowy
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+PageToGenerateBarCodeSheets=Za pomocą tego narzędzia możesz drukować arkusze naklejek z kodami kreskowymi. Wybierz format strony z naklejkami, typ kodu kreskowego i wartość kodu kreskowego, a następnie kliknij przycisk <b> %s </b>.
 NumberOfStickers=Ilość naklejek do wydrukowania na stronie
 PrintsheetForOneBarCode=Wydrukuj kilka naklejek dla kodu kreskowego
 BuildPageToPrint=Generowanie strony do druku
 FillBarCodeTypeAndValueManually=Wypełnij typ kodu kreskowego i wartość ręcznie.
 FillBarCodeTypeAndValueFromProduct=Wypełnij typ kodu kreskowego i wartości z kodu kreskowego produktu.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %s:
-ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
+FillBarCodeTypeAndValueFromThirdParty=Wypełnij typ i wartość kodu kreskowego z kodu kreskowego strony trzeciej.
+DefinitionOfBarCodeForProductNotComplete=Definicja typu lub wartości kodu kreskowego niekompletna dla produktu %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definicja typu lub wartości kodu kreskowego niekompletnego dla strony trzeciej %s.
+BarCodeDataForProduct=Informacje o kodzie kreskowym produktu %s:
+BarCodeDataForThirdparty=Informacje o kodzie kreskowym strony trzeciej %s:
+ResetBarcodeForAllRecords=Zdefiniuj wartość kodu kreskowego dla całego rekordu (spowoduje to również zresetowanie wartości kodu kreskowego już zdefiniowanej z nowymi wartościami)
 PriceByCustomer=Różne ceny dla każdego klienta
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for selling prices
+PriceCatalogue=Pojedyncza cena sprzedaży za produkt / usługę
+PricingRule=Zasady dotyczące cen sprzedaży
 AddCustomerPrice=Dodaj cenę dla klienta
 ForceUpdateChildPriceSoc=Ustaw sama cena na zależnych klientów
 PriceByCustomerLog=Stwórz log z wcześniejszymi cenami dla klienta
 MinimumPriceLimit=Cena minimalna nie może być niższa niż %s
-MinimumRecommendedPrice=Minimum recommended price is: %s
+MinimumRecommendedPrice=Minimalna zalecana cena to: %s
 PriceExpressionEditor=Edytor Cena wyraz
 PriceExpressionSelected=Wybrany wyraz cena
 PriceExpressionEditorHelp1="Cena = 2 + 2" lub "2 + 2" dla ustalenia ceny. Użyj; oddzielić wyrażeń
 PriceExpressionEditorHelp2=Możesz uzyskać dostęp ExtraFields ze zmiennymi jak <b># extrafield_myextrafieldkey #</b> i zmiennych globalnych z <b># global_mycode #</b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp3=Zarówno w cenach produktów / usług, jak i dostawców dostępne są następujące zmienne: <br> <b> # tva_tx # # localtax1_tx # # localtax2_tx # # weight # # length # # surface # # price_min # </b>
+PriceExpressionEditorHelp4=Tylko w cenie produktu / usługi: <b> # provider_min_price # </b> <br> Tylko w cenach dostawcy: <b> # provider_quantity # and # provider_tva_tx # a09a4b739f17f8z
 PriceExpressionEditorHelp5=Dostępne wartości globalne:
 PriceMode=Tryb Cena
 PriceNumeric=Liczba
 DefaultPrice=Domyśla cena
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Dziennik poprzednich cen domyślnych
 ComposedProductIncDecStock=Wzrost / spadek akcji na zmiany dominującej
-ComposedProduct=Child products
+ComposedProduct=Produkty dla dzieci
 MinSupplierPrice=Minimalna cena zakupu
-MinCustomerPrice=Minimum selling price
+MinCustomerPrice=Minimalna cena sprzedaży
 DynamicPriceConfiguration=Konfiguracja dynamicznych cen
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
-AddVariable=Add Variable
-AddUpdater=Add Updater
+DynamicPriceDesc=Możesz zdefiniować formuły matematyczne do obliczania cen klientów lub dostawców. Takie formuły mogą wykorzystywać wszystkie operatory matematyczne, niektóre stałe i zmienne. Możesz tutaj zdefiniować zmienne, których chcesz użyć. Jeśli zmienna wymaga automatycznej aktualizacji, możesz zdefiniować zewnętrzny adres URL, aby umożliwić firmie Dolibarr automatyczną aktualizację wartości.
+AddVariable=Dodaj zmienną
+AddUpdater=Dodaj Updater
 GlobalVariables=Zmienne globalne
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=External updaters for variables
+VariableToUpdate=Zmienna do aktualizacji
+GlobalVariableUpdaters=Zewnętrzne aktualizatory zmiennych
 GlobalVariableUpdaterType0=Dane JSON
 GlobalVariableUpdaterHelp0=Analizuje dane JSON z określonego adresu URL, wartość określa położenie odpowiedniej wartości,
 GlobalVariableUpdaterHelpFormat0=Format żądania {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
@@ -313,38 +314,38 @@ LastUpdated=Ostatnia aktualizacja
 CorrectlyUpdated=Poprawnie zaktualizowane
 PropalMergePdfProductActualFile=Pliki użyć, aby dodać do PDF Azur są / jest
 PropalMergePdfProductChooseFile=Wybież plik PDF
-IncludingProductWithTag=Dołącz produkt / usługę z tagiem
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Domyślna cena, realna cena może zależeć od klienta
 WarningSelectOneDocument=Proszę zaznaczyć co najmniej jeden dokument
 DefaultUnitToShow=Jednostka
-NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-ProductsOrServicesTranslations=Products/Services translations
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
+NbOfQtyInProposals=Ilość w propozycjach
+ClinkOnALinkOfColumn=Kliknij link do kolumny %s, aby uzyskać szczegółowy widok ...
+ProductsOrServicesTranslations=Tłumaczenia produktów / usług
+TranslatedLabel=Przetłumaczona etykieta
+TranslatedDescription=Przetłumaczony opis
+TranslatedNote=Przetłumaczone notatki
 ProductWeight=Waga dla 1 produktu
 ProductVolume=Objętość 1 produktu
 WeightUnits=Jednostka wagi
 VolumeUnits=Jednostka objętości
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
+WidthUnits=Jednostka szerokości
+LengthUnits=Jednostka długości
+HeightUnits=Jednostka wysokości
+SurfaceUnits=Jednostka powierzchniowa
 SizeUnits=Jednostka rozmiaru
 DeleteProductBuyPrice=Usuń cenę zakupu
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
-SubProduct=Sub product
+ConfirmDeleteProductBuyPrice=Czy na pewno chcesz usunąć tę cenę zakupu?
+SubProduct=Produkt podrzędny
 ProductSheet=Arkusz produktu
 ServiceSheet=Arkusz usługi
-PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
-ProductSupplierDescription=Vendor description for the product
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+PossibleValues=Możliwa wartość
+GoOnMenuToCreateVairants=Przejdź do menu %s - %s, aby przygotować warianty atrybutów (takie jak kolory, rozmiar, ...)
+UseProductFournDesc=Dodaj funkcję definiowania opisów produktów zdefiniowanych przez dostawców oprócz opisów dla klientów
+ProductSupplierDescription=Opis dostawcy produktu
+UseProductSupplierPackaging=Użyj opakowania w cenach dostawcy (przelicz ilości zgodnie z opakowaniem ustawionym na cenie dostawcy podczas dodawania / aktualizowania linii w dokumentach dostawcy)
+PackagingForThisProduct=Opakowanie
+PackagingForThisProductDesc=Na zamówienie dostawcy automatycznie zamówisz tę ilość (lub wielokrotność tej ilości). Nie może być mniejsza niż minimalna ilość zakupu
+QtyRecalculatedWithPackaging=Ilość linii została przeliczona zgodnie z opakowaniem dostawcy
 
 #Attributes
 VariantAttributes=Atrybuty wariantu
@@ -352,46 +353,46 @@ ProductAttributes=Atrybuty wariantu dla produktów
 ProductAttributeName=Atrybut wariantu %s
 ProductAttribute=Atrybut wariantu
 ProductAttributeDeleteDialog=Czy jesteś pewien, że chcesz usunąć ten atrybut? Wszystkie wartości zostaną usunięte
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductAttributeValueDeleteDialog=Czy na pewno chcesz usunąć wartość „%s” z odniesieniem „%s” tego atrybutu?
 ProductCombinationDeleteDialog=Czy jesteś pewien, że chcesz usunąć wariant produktu "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+ProductCombinationAlreadyUsed=Wystąpił błąd podczas usuwania wariantu. Sprawdź, czy nie jest używany w żadnym obiekcie
 ProductCombinations=Warianty
-PropagateVariant=Propagate variants
-HideProductCombinations=Hide products variant in the products selector
+PropagateVariant=Propaguj warianty
+HideProductCombinations=Ukryj wariant produktów w selektorze produktów
 ProductCombination=Wariant
 NewProductCombination=Nowy wariant
 EditProductCombination=Edycja wariantu
 NewProductCombinations=Nowe warianty
-EditProductCombinations=Editing variants
-SelectCombination=Select combination
+EditProductCombinations=Edycja wariantów
+SelectCombination=Wybierz kombinację
 ProductCombinationGenerator=Generator wariantów
-Features=Features
-PriceImpact=Price impact
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
-WeightImpact=Weight impact
+Features=funkcje
+PriceImpact=Wpływ na cenę
+ImpactOnPriceLevel=Wpływ na poziom cen %s
+ApplyToAllPriceImpactLevel= Zastosuj na wszystkich poziomach
+ApplyToAllPriceImpactLevelHelp=Klikając tutaj, ustawiasz taki sam wpływ ceny na wszystkich poziomach
+WeightImpact=Wpływ na wagę
 NewProductAttribute=Nowy atrybut
 NewProductAttributeValue=Nowa wartość atrybutu
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbOfDifferentValues=No. of different values
-NbProducts=Number of products
+ErrorCreatingProductAttributeValue=Wystąpił błąd podczas tworzenia wartości atrybutu. Może to być spowodowane tym, że istnieje już wartość z tym odniesieniem
+ProductCombinationGeneratorWarning=Jeśli będziesz kontynuować, przed wygenerowaniem nowych wariantów wszystkie poprzednie zostaną USUNIĘTE. Już istniejące zostaną zaktualizowane o nowe wartości
+TooMuchCombinationsWarning=Generowanie wielu wariantów może skutkować dużym obciążeniem procesora i pamięci, a Dolibarr nie będzie w stanie ich utworzyć. Włączenie opcji „%s” może pomóc zmniejszyć użycie pamięci.
+DoNotRemovePreviousCombinations=Nie usuwaj poprzednich wariantów
+UsePercentageVariations=Użyj odchyleń procentowych
+PercentageVariation=Odchylenie procentowe
+ErrorDeletingGeneratedProducts=Wystąpił błąd podczas próby usunięcia istniejących wariantów produktu
+NbOfDifferentValues=Liczba różnych wartości
+NbProducts=Liczba produktów
 ParentProduct=Produkt macieżysty
-HideChildProducts=Hide variant products
-ShowChildProducts=Show variant products
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
-ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
-CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product variants
-ErrorDestinationProductNotFound=Destination product not found
+HideChildProducts=Ukryj warianty produktów
+ShowChildProducts=Pokaż warianty produktów
+NoEditVariants=Przejdź do karty produktu nadrzędnego i edytuj wpływ cen wariantów na karcie wariantów
+ConfirmCloneProductCombinations=Czy chcesz skopiować wszystkie warianty produktu do innego produktu macierzystego z podanym numerem referencyjnym?
+CloneDestinationReference=Numer referencyjny produktu docelowego
+ErrorCopyProductCombinations=Wystąpił błąd podczas kopiowania wariantów produktu
+ErrorDestinationProductNotFound=Nie znaleziono produktu docelowego
 ErrorProductCombinationNotFound=Wariant produktu nie znaleziony
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
-ProductsPricePerCustomer=Product prices per customers
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
-DeleteLinkedProduct=Delete the child product linked to the combination
+ActionAvailableOnVariantProductOnly=Akcja dostępna tylko w wariancie produktu
+ProductsPricePerCustomer=Ceny produktów na klientów
+ProductSupplierExtraFields=Dodatkowe atrybuty (ceny dostawców)
+DeleteLinkedProduct=Usuń produkt podrzędny powiązany z kombinacją
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 6a19404be3c..2ad158c5d84 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -7,24 +7,24 @@ ProjectsArea=Obszar projektów
 ProjectStatus=Status projektu
 SharedProject=Wszyscy
 PrivateProject=Kontakty projektu
-ProjectsImContactFor=Projects for which I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
+ProjectsImContactFor=Projekty, dla których jestem jawnym kontaktem
+AllAllowedProjects=Cały projekt, który mogę przeczytać (mój + publiczny)
 AllProjects=Wszystkie projekty
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=Ten widok jest ograniczony do projektów, w których jesteś osobą kontaktową
 ProjectsPublicDesc=Ten widok przedstawia wszystkie projekty, które możesz przeczytać.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+TasksOnProjectsPublicDesc=Ten widok przedstawia wszystkie zadania w projektach, które możesz czytać.
 ProjectsPublicTaskDesc=Ten widok przedstawia wszystkie projekty i zadania, które są dozwolone do czytania.
 ProjectsDesc=Ten widok przedstawia wszystkie projekty (twoje uprawnienia użytkownika pozwalają wyświetlać wszystko).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+TasksOnProjectsDesc=Ten widok przedstawia wszystkie zadania we wszystkich projektach (Twoje uprawnienia użytkownika dają Ci uprawnienia do przeglądania wszystkiego).
+MyTasksDesc=Ten widok jest ograniczony do projektów lub zadań, w sprawie których jesteś osobą kontaktową
 OnlyOpenedProject=Tylko otwarte projekty są widoczne (szkice projektów lub zamknięte projekty są niewidoczne)
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=Zamknięte projekty nie są widoczne.
 TasksPublicDesc=Ten widok przedstawia wszystkie projekty i zadania, które możesz przeczytać.
 TasksDesc=Ten widok przedstawia wszystkie projekty i zadania (twoje uprawnienia mają dostępu do wglądu we wszystko).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. 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
+AllTaskVisibleButEditIfYouAreAssigned=Wszystkie zadania dla zakwalifikowanych projektów są widoczne, ale możesz wprowadzić czas tylko dla zadania przypisanego do wybranego użytkownika. Przypisz zadanie, jeśli chcesz wprowadzić na nim czas.
+OnlyYourTaskAreVisible=Widoczne są tylko zadania przypisane do Ciebie. Przydziel sobie zadanie, jeśli nie jest widoczne i musisz wpisać na nim czas.
+ImportDatasetTasks=Zadania projektów
+ProjectCategories=Tagi / kategorie projektów
 NewProject=Nowy projekt
 AddProject=Tworzenie projektu
 DeleteAProject=Usuń projekt
@@ -33,21 +33,21 @@ ConfirmDeleteAProject=Czy usunąć ten projekt?
 ConfirmDeleteATask=Czy usunąć to zadanie?
 OpenedProjects=Otwarte projekty
 OpenedTasks=Otwarte zadania
-OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
-OpportunitiesStatusForProjects=Leads amount of projects by status
+OpportunitiesStatusForOpenedProjects=Prowadzi liczbę otwartych projektów według statusu
+OpportunitiesStatusForProjects=Prowadzi liczbę projektów według statusu
 ShowProject=Pokaż projekt
 ShowTask=Pokaż zadanie
 SetProject=Ustaw projekt
 NoProject=Żadny projekt niezdefiniowany lub nie jest twoją własnością
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
+NbOfProjects=Liczba projektów
+NbOfTasks=Liczba zadań
 TimeSpent=Czas spędzony
 TimeSpentByYou=Czas spędzony przez Ciebie
 TimeSpentByUser=Czas spędzony przez użytkownika
 TimesSpent=Czas spędzony
-TaskId=Task ID
-RefTask=Task ref.
-LabelTask=Task label
+TaskId=ID zadania
+RefTask=Nr zadania
+LabelTask=Etykieta zadania
 TaskTimeSpent=Czas spędzony na zadaniach
 TaskTimeUser=Użytkownik
 TaskTimeNote=Uwaga
@@ -56,10 +56,10 @@ TasksOnOpenedProject=Zadania w otwartych projektach
 WorkloadNotDefined=Czas pracy nie zdefiniowany
 NewTimeSpent=Czas spędzony
 MyTimeSpent=Mój czas spędzony
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
+BillTime=Bill spędzony czas
+BillTimeShort=Czas rachunku
+TimeToBill=Czas nie jest rozliczany
+TimeBilled=Rozliczony czas
 Tasks=Zadania
 Task=Zadanie
 TaskDateStart=Data rozpoczęcia zadania
@@ -67,77 +67,78 @@ TaskDateEnd=Data zakończenia zadania
 TaskDescription=Opis zadania
 NewTask=Nowe zadania
 AddTask=Tworzenie zadania
-AddTimeSpent=Create time spent
-AddHereTimeSpentForDay=Add here time spent for this day/task
-AddHereTimeSpentForWeek=Add here time spent for this week/task
+AddTimeSpent=Twórz spędzony czas
+AddHereTimeSpentForDay=Dodaj tutaj czas spędzony na ten dzień / zadanie
+AddHereTimeSpentForWeek=Dodaj tutaj czas spędzony na zadanie/w tym tygodniu
 Activity=Aktywność
 Activities=Zadania / aktywności
 MyActivities=Moje zadania / aktywności
 MyProjects=Moje projekty
 MyProjectsArea=Obszar moich projektów
 DurationEffective=Efektywny czas trwania
-ProgressDeclared=Declared real progress
-TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
-ProgressCalculated=Progress on consumption
-WhichIamLinkedTo=which I'm linked to
-WhichIamLinkedToProject=which I'm linked to project
+ProgressDeclared=Deklarowany rzeczywisty postęp
+TaskProgressSummary=Postęp zadania
+CurentlyOpenedTasks=Obecnie otwarte zadania
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Deklarowany rzeczywisty postęp jest mniejszy %s niż postęp konsumpcji
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Deklarowany rzeczywisty postęp jest bardziej %s niż postęp konsumpcji
+ProgressCalculated=Postęp w konsumpcji
+WhichIamLinkedTo=z którym jestem połączony
+WhichIamLinkedToProject=który jestem powiązany z projektem
 Time=Czas
-TimeConsumed=Consumed
+TimeConsumed=Strawiony
 ListOfTasks=Lista zadań
-GoToListOfTimeConsumed=Go to list of time consumed
-GanttView=Gantt View
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
-ListInvoicesAssociatedProject=List of customer invoices related to the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
-ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
-ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
-ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
-ListMOAssociatedProject=List of manufacturing orders related to the project
+GoToListOfTimeConsumed=Przejdź do listy czasochłonnych
+GanttView=Widok Gantta
+ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListProposalsAssociatedProject=Lista ofert handlowych związanych z projektem
+ListOrdersAssociatedProject=Lista zamówień sprzedaży związanych z projektem
+ListInvoicesAssociatedProject=Lista faktur klientów związanych z projektem
+ListPredefinedInvoicesAssociatedProject=Lista faktur dla klientów, wzorcowych związanych z projektem
+ListSupplierOrdersAssociatedProject=Lista zamówień związanych z projektem
+ListSupplierInvoicesAssociatedProject=Lista faktur dostawców związanych z projektem
+ListContractAssociatedProject=Lista umów związanych z projektem
+ListShippingAssociatedProject=Lista wysyłek związanych z projektem
+ListFichinterAssociatedProject=Lista interwencji związanych z projektem
+ListExpenseReportsAssociatedProject=Lista raportów wydatków związanych z projektem
+ListDonationsAssociatedProject=Lista darowizn związanych z projektem
+ListVariousPaymentsAssociatedProject=Lista różnych płatności związanych z projektem
+ListSalariesAssociatedProject=Lista wypłat wynagrodzeń związanych z projektem
+ListActionsAssociatedProject=Lista wydarzeń związanych z projektem
+ListMOAssociatedProject=Lista zleceń produkcyjnych związanych z projektem
 ListTaskTimeUserProject=Lista czasu poświęconego na zadania w projekcie
-ListTaskTimeForTask=List of time consumed on task
+ListTaskTimeForTask=Lista czasu poświęconego na zadanie
 ActivityOnProjectToday=Dzisiejsza aktywnośc w projekcie
 ActivityOnProjectYesterday=Wczorajsza aktywność w projekcie
 ActivityOnProjectThisWeek=Aktywność w projekcie w tym tygodniu
 ActivityOnProjectThisMonth=Aktywność na projekcie w tym miesiącu
 ActivityOnProjectThisYear=Aktywność na projekcie w tym roku
 ChildOfProjectTask=Dziecko projektu / zadania
-ChildOfTask=Child of task
-TaskHasChild=Task has child
+ChildOfTask=Dziecko zadań
+TaskHasChild=Zadanie ma dziecko
 NotOwnerOfProject=Brak właściciela tego prywatnego projektu
 AffectedTo=Przypisane do
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
+CantRemoveProject=Tego projektu nie można usunąć, ponieważ odwołują się do niego inne obiekty (faktura, zamówienia lub inne). Zobacz zakładkę „%s”.
 ValidateProject=Sprawdź projet
 ConfirmValidateProject=Czy zatwierdzić ten projekt?
 CloseAProject=Zamknij Projekt
 ConfirmCloseAProject=Czy zamknąć ten projekt?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+AlsoCloseAProject=Zamknij także projekt (pozostaw go otwarty, jeśli nadal musisz śledzić na nim zadania produkcyjne)
 ReOpenAProject=Otwórz projekt
 ConfirmReOpenAProject=Czy otworzyć na nowo ten projekt?
 ProjectContact=Kontakty z projektu
-TaskContact=Task contacts
+TaskContact=Kontakty związane z zadaniami
 ActionsOnProject=Działania w ramach projektu
 YouAreNotContactOfProject=Nie jestes kontaktem tego prywatnego projektu
-UserIsNotContactOfProject=User is not a contact of this private project
+UserIsNotContactOfProject=Użytkownik nie jest kontaktem w tym projekcie prywatnym
 DeleteATimeSpent=Usuń czas spędzony
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+ConfirmDeleteATimeSpent=Czy na pewno chcesz usunąć ten spędzony czas?
 DoNotShowMyTasksOnly=Zobacz również zadania nie przypisane do mnie
 ShowMyTasksOnly=Wyświetl tylko zadania przypisane do mnie
-TaskRessourceLinks=Contacts of task
+TaskRessourceLinks=Kontakty zadania
 ProjectsDedicatedToThisThirdParty=Projekty poświęcone tej stronie trzeciej
 NoTasks=Brak zadań dla tego projektu
 LinkedToAnotherCompany=Powiązane z innymą częścią trzecią
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+TaskIsNotAssignedToUser=Zadanie nie zostało przypisane do użytkownika. Użyj przycisku „<strong> %s </strong>”, aby przypisać zadanie teraz.
 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.
 IfNeedToUseOtherObjectKeepEmpty=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).
@@ -148,26 +149,26 @@ CloneProjectFiles=Sklonuj pliki przynależne do projektu
 CloneTaskFiles=Połączone pliki sklonowanych zadań (jeśli zadania sklonowano)
 CloneMoveDate=Zaktualizować daty w projekcie/zadaniach od teraz?
 ConfirmCloneProject=Czy powielić ten projekt?
-ProjectReportDate=Change task dates according to new project start date
+ProjectReportDate=Zmień daty zadań zgodnie z nową datą rozpoczęcia projektu
 ErrorShiftTaskDate=Niemożliwe do przesunięcia daty zadania według nowej daty rozpoczęcia projektu
 ProjectsAndTasksLines=Projekty i zadania
 ProjectCreatedInDolibarr=Projekt %s utworzony
-ProjectValidatedInDolibarr=Project %s validated
+ProjectValidatedInDolibarr=Projekt %s został zweryfikowany
 ProjectModifiedInDolibarr=Projekt %s zmodyfikowany
 TaskCreatedInDolibarr=Zadanie %s utworzono
 TaskModifiedInDolibarr=Zadań %s zmodyfikowano
 TaskDeletedInDolibarr=Zadań %s usunięto
-OpportunityStatus=Lead status
-OpportunityStatusShort=Lead status
-OpportunityProbability=Lead probability
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Lead amount
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
-OpportunityAmountAverageShort=Average lead amount
-OpportunityAmountWeigthedShort=Weighted lead amount
-WonLostExcluded=Won/Lost excluded
+OpportunityStatus=Status potencjalnego klienta
+OpportunityStatusShort=Status potencjalnego klienta
+OpportunityProbability=Prawdopodobieństwo ołowiu
+OpportunityProbabilityShort=Ołów probab.
+OpportunityAmount=Kwota ołowiu
+OpportunityAmountShort=Kwota ołowiu
+OpportunityWeightedAmount=Kwota ważona szansą sprzedaży
+OpportunityWeightedAmountShort=Opp. kwota ważona
+OpportunityAmountAverageShort=Średnia kwota ołowiu
+OpportunityAmountWeigthedShort=Ważona kwota ołowiu
+WonLostExcluded=Wygrane / przegrane wykluczone
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Kierownik projektu
 TypeContact_project_external_PROJECTLEADER=Lider projektu
@@ -181,51 +182,51 @@ SelectElement=Wybierz element
 AddElement=Link do elementu
 LinkToElementShort=Link do
 # Documents models
-DocumentModelBeluga=Project document template for linked objects overview
-DocumentModelBaleine=Project document template for tasks
-DocumentModelTimeSpent=Project report template for time spent
+DocumentModelBeluga=Szablon dokumentu projektu dla przeglądu połączonych obiektów
+DocumentModelBaleine=Szablon dokumentu projektu dla zadań
+DocumentModelTimeSpent=Szablon raportu projektu dla spędzonego czasu
 PlannedWorkload=Planowany nakład pracy
 PlannedWorkloadShort=Nakład pracy
 ProjectReferers=Powiązane elementy
 ProjectMustBeValidatedFirst=Projekt musi być najpierw zatwierdzony
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=Przypisz zasób użytkownika jako osobę kontaktową w projekcie, aby przydzielić czas
 InputPerDay=Wejścia na dzień
 InputPerWeek=Wejścia w tygodniu
-InputPerMonth=Input per month
-InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
+InputPerMonth=Wkład miesięcznie
+InputDetail=Dane wejściowe
+TimeAlreadyRecorded=Jest to czas już zarejestrowany dla tego zadania / dnia i użytkownika %s
 ProjectsWithThisUserAsContact=Projekty z tym użytkownika jako kontakt
 TasksWithThisUserAsContact=Zadania dopisane do tego użytkownika
 ResourceNotAssignedToProject=Nie przypisane do projektu
 ResourceNotAssignedToTheTask=Nie dopisane do zadania
-NoUserAssignedToTheProject=No users assigned to this project
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
+NoUserAssignedToTheProject=Brak użytkowników przypisanych do tego projektu
+TimeSpentBy=Czas spędzony przez
+TasksAssignedTo=Zadania przypisane do
 AssignTaskToMe=Przypisz zadanie do mnie
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
+AssignTaskToUser=Przypisz zadanie do %s
+SelectTaskToAssign=Wybierz zadanie do przypisania ...
 AssignTask=Przydzielać
 ProjectOverview=Przegląd
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageTasks=Użyj projektów, aby śledzić zadania i / lub raportować spędzony czas (karty czasu pracy)
 ManageOpportunitiesStatus=Użyj projekty śledzić pozostawienie danych kontaktowych / opportinuties
-ProjectNbProjectByMonth=No. of created projects by month
-ProjectNbTaskByMonth=No. of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of leads by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+ProjectNbProjectByMonth=Liczba utworzonych projektów według miesiąca
+ProjectNbTaskByMonth=Liczba utworzonych zadań według miesiąca
+ProjectOppAmountOfProjectsByMonth=Ilość leadów według miesiąca
+ProjectWeightedOppAmountOfProjectsByMonth=Ważona liczba potencjalnych klientów według miesiąca
+ProjectOpenedProjectByOppStatus=Otwarty projekt | prowadzony przez status potencjalnego klienta
+ProjectsStatistics=Statystyki dotyczące projektów lub potencjalnych klientów
+TasksStatistics=Statystyki dotyczące zadań projektów lub leadów
 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 suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
-NotOpenedOpportunitiesShort=Not an open lead
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
+YouCanCompleteRef=Jeśli chcesz uzupełnić odniesienie jakimś przyrostkiem, zaleca się dodanie znaku -, aby go oddzielić, aby automatyczne numerowanie nadal działało poprawnie dla następnych projektów. Na przykład %s-MYSUFFIX
+OpenedProjectsByThirdparties=Otwarte projekty stron trzecich
+OnlyOpportunitiesShort=Tylko prowadzi
+OpenedOpportunitiesShort=Otwarte leady
+NotOpenedOpportunitiesShort=To nie jest otwarty trop
+NotAnOpportunityShort=Nie prowadzi
+OpportunityTotalAmount=Całkowita liczba potencjalnych klientów
+OpportunityPonderatedAmount=Ważona liczba potencjalnych klientów
+OpportunityPonderatedAmountDesc=Kwota potencjalnych klientów ważona prawdopodobieństwem
 OppStatusPROSP=Poszukiwania
 OppStatusQUAL=Kwalifikacja
 OppStatusPROPO=Wniosek
@@ -234,37 +235,41 @@ OppStatusPENDING=W oczekiwaniu
 OppStatusWON=Won
 OppStatusLOST=Zagubiony
 Budget=Budżet
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
-LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+AllowToLinkFromOtherCompany=Zezwól na powiązanie projektu z innej firmy <br> <br> <u> Obsługiwane wartości: </u> <br> - Pozostaw puste: można połączyć dowolny projekt firmy z firmy (domyślnie) a0342fcc19 wszystkie projekty: A0342fcc identyfikatory innych firm oddzielone przecinkami: mogą łączyć wszystkie projekty tych podmiotów zewnętrznych (przykład: 123,4795,53) <br>
+LatestProjects=Najnowsze projekty %s
+LatestModifiedProjects=Najnowsze zmodyfikowane projekty %s
+OtherFilteredTasks=Inne filtrowane zadania
+NoAssignedTasks=Nie znaleziono przypisanych zadań (przypisz projekt / zadania do bieżącego użytkownika z górnego pola wyboru, aby wprowadzić czas)
+ThirdPartyRequiredToGenerateInvoice=Aby móc wystawić fakturę, w projekcie musi być zdefiniowana osoba trzecia.
+ChooseANotYetAssignedTask=Wybierz zadanie, które nie zostało Ci jeszcze przydzielone
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
-SendProjectRef=Information project %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is required
-TimeSpentInvoiced=Time spent billed
+AllowCommentOnTask=Zezwalaj na komentarze użytkowników do zadań
+AllowCommentOnProject=Zezwalaj na komentarze użytkowników w projektach
+DontHavePermissionForCloseProject=Nie masz uprawnień, aby zamknąć projekt %s
+DontHaveTheValidateStatus=Projekt %s musi być otwarty, aby mógł zostać zamknięty
+RecordsClosed=%s projekty zamknięte
+SendProjectRef=Projekt informacyjny %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Moduł „Wynagrodzenia” musi być włączony, aby zdefiniować stawkę godzinową pracownika w celu waloryzacji spędzonego czasu
+NewTaskRefSuggested=Numer referencyjny jest już używany, wymagany jest nowy numer referencyjny
+TimeSpentInvoiced=Rozliczony czas spędzony
 TimeSpentForInvoice=Czas spędzony
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
-ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks or time spent
-Usage=Usage
-UsageOpportunity=Usage: Opportunity
-UsageTasks=Usage: Tasks
-UsageBillTimeShort=Usage: Bill time
-InvoiceToUse=Draft invoice to use
+OneLinePerUser=Jedna linia na użytkownika
+ServiceToUseOnLines=Usługa do wykorzystania na liniach
+InvoiceGeneratedFromTimeSpent=Faktura %s została wygenerowana na podstawie czasu spędzonego nad projektem
+ProjectBillTimeDescription=Sprawdź, czy wprowadzasz grafik dla zadań projektu ORAZ planujesz wygenerować fakturę (y) z grafiku, aby wystawić fakturę klientowi projektu (nie sprawdzaj, czy planujesz utworzyć fakturę, która nie jest oparta na wprowadzonych grafikach). Uwaga: Aby wygenerować fakturę, przejdź do zakładki „Czas spędzony” projektu i wybierz wiersze do uwzględnienia.
+ProjectFollowOpportunity=Skorzystaj z okazji
+ProjectFollowTasks=Śledź zadania lub spędzony czas
+Usage=Stosowanie
+UsageOpportunity=Sposób użycia: okazja
+UsageTasks=Sposób użycia: zadania
+UsageBillTimeShort=Użycie: Bill czas
+InvoiceToUse=Projekt faktury do wykorzystania
 NewInvoice=Nowa faktura
-OneLinePerTask=One line per task
-OneLinePerPeriod=One line per period
-RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
+OneLinePerTask=Jedna linia na zadanie
+OneLinePerPeriod=Jedna linia na okres
+RefTaskParent=Nr ref. Zadanie rodzica
+ProfitIsCalculatedWith=Zysk jest obliczany za pomocą
+AddPersonToTask=Dodaj także do zadań
+UsageOrganizeEvent=Użycie: Organizacja wydarzeń
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Zaklasyfikuj projekt jako zamknięty po wykonaniu wszystkich jego zadań (postęp 100%%)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Uwaga: nie będzie to miało wpływu na istniejące projekty ze wszystkimi zadaniami o postępie 100%%: będziesz musiał je zamknąć ręcznie. Ta opcja dotyczy tylko otwartych projektów.
diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang
index df7e6c64dda..7e25a3622e7 100644
--- a/htdocs/langs/pl_PL/propal.lang
+++ b/htdocs/langs/pl_PL/propal.lang
@@ -13,16 +13,16 @@ Prospect=Prospect
 DeleteProp=Usuń propozycję handlową
 ValidateProp=Zatwierdź propozycję handlową
 AddProp=Utwórz wniosek
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
-LastPropals=Latest %s proposals
+ConfirmDeleteProp=Czy na pewno chcesz usunąć tę ofertę handlową?
+ConfirmValidateProp=Czy na pewno chcesz zweryfikować tę ofertę handlową pod nazwą <b> %s </b>?
+LastPropals=Najnowsze propozycje %s
 LastModifiedProposals=Ostatnich %s zmodyfikowanych ofert
 AllPropals=Wszystkie oferty
 SearchAProposal=Szukaj oferty
-NoProposal=No proposal
+NoProposal=Brak propozycji
 ProposalsStatistics=Statystyki ofert handlowych
 NumberOfProposalsByMonth=Ilość w miesiącu
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+AmountOfProposalsByMonthHT=Kwota według miesiąca (bez podatku)
 NbOfProposals=Liczba ofert handlowych
 ShowPropal=Pokaż oferty
 PropalsDraft=Szkice
@@ -33,7 +33,7 @@ PropalStatusSigned=Podpisano (do rachunku)
 PropalStatusNotSigned=Nie podpisały (zamknięte)
 PropalStatusBilled=zapowiadane
 PropalStatusDraftShort=Szkic
-PropalStatusValidatedShort=Validated (open)
+PropalStatusValidatedShort=Zweryfikowany (otwarty)
 PropalStatusClosedShort=Zamknięte
 PropalStatusSignedShort=Podpisany
 PropalStatusNotSignedShort=Niepodpisany
@@ -47,19 +47,19 @@ SendPropalByMail=Wyślij propozycję handlowa emailem
 DatePropal=Data wniosku
 DateEndPropal=Data końca obowiązywania
 ValidityDuration=Ważność czas
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+SetAcceptedRefused=Zestaw zaakceptowany / odrzucony
 ErrorPropalNotFound=Propal %s nie znaleziono
 AddToDraftProposals=Dodaj do projektu oferty
 NoDraftProposals=Brak projektu oferty
 CopyPropalFrom=Stwórz ofertę handlową poprzez skopiowanie istniejącej oferty
-CreateEmptyPropal=Create empty commercial proposal or from list of products/services
+CreateEmptyPropal=Utwórz pustą ofertę handlową lub z listy produktów / usług
 DefaultProposalDurationValidity=Domyślny czas ważności wniosku handlowych (w dniach)
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
+UseCustomerContactAsPropalRecipientIfExist=Użyj kontaktu / adresu z typem „Propozycja dalszych działań związanych z kontaktem”, jeśli zdefiniowano ją zamiast adresu strony trzeciej jako adresu odbiorcy propozycji
+ConfirmClonePropal=Czy na pewno chcesz sklonować ofertę komercyjną <b> %s </b>?
+ConfirmReOpenProp=Czy na pewno chcesz ponownie otworzyć ofertę komercyjną <b> %s </b>?
 ProposalsAndProposalsLines=Commercial wniosku i linie
 ProposalLine=Wniosek linii
+ProposalLines=Linie propozycji
 AvailabilityPeriod=Opóźnienie w dostępności
 SetAvailability=Ustaw opóźnienie w dostępności
 AfterOrder=od zamówienia
@@ -74,14 +74,19 @@ AvailabilityTypeAV_1M=1 miesiąc
 TypeContact_propal_internal_SALESREPFOLL=Przedstawiciela w ślad za wniosek
 TypeContact_propal_external_BILLING=Kontakt do klienta w sprawie faktury
 TypeContact_propal_external_CUSTOMER=kontakt klienta w ślad za wniosek
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_external_SHIPPING=Kontakt z klientem w sprawie dostawy
 # Document models
-DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
-DocModelCyanDescription=A complete proposal model
+DocModelAzurDescription=Kompletny model oferty (stara implementacja szablonu Cyan)
+DocModelCyanDescription=Kompletny model oferty
 DefaultModelPropalCreate=Domyślny model kreacji.
 DefaultModelPropalToBill=Domyślny szablon po zamknięciu wniosku biznesowego ( do zafakturowania)
 DefaultModelPropalClosed=Domyślny szablon po zamknięciu projektu biznesowego ( weryfikowane )
 ProposalCustomerSignature=Wpisany akceptacji i pieczęć firmy, data i podpis
-ProposalsStatisticsSuppliers=Vendor proposals statistics
-CaseFollowedBy=Case followed by
-SignedOnly=Signed only
+ProposalsStatisticsSuppliers=Statystyki propozycji dostawców
+CaseFollowedBy=Przypadek, po którym następuje
+SignedOnly=Tylko podpisane
+IdProposal=Identyfikator oferty
+IdProduct=ID produktu
+PrParentLine=Linia nadrzędna oferty pakietowej
+LineBuyPriceHT=Cena zakupu Kwota bez podatku dla wiersza
+
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 889b96b4be4..09b5be9369f 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Karta magazynu
 Warehouse=Magazyn
 Warehouses=Magazyny
 ParentWarehouse=Magazyn nadrzędny
-NewWarehouse=New warehouse / Stock Location
+NewWarehouse=Nowy magazyn / lokalizacja magazynu
 WarehouseEdit=Modyfikacja magazynu
 MenuNewWarehouse=Nowy magazyn
 WarehouseSource=Magazyn źródłowy
@@ -17,10 +17,10 @@ CancelSending=Anuluj wysyłanie
 DeleteSending=Usuń wysyłanie
 Stock=Stan
 Stocks=Stany
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=Brakujące zapasy
+StockAtDate=Stan na dzień
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Zapasy według lotu/nr seryjnego
 LotSerial=Partie/Serie
 LotSerialList=Lista partii/serii
@@ -28,17 +28,17 @@ Movements=Ruchy
 ErrorWarehouseRefRequired=Nazwa referencyjna magazynu wymagana
 ListOfWarehouses=Lista magazynów
 ListOfStockMovements=Wykaz stanu magazynowego
-ListOfInventories=List of inventories
+ListOfInventories=Lista zapasów
 MovementId=ID przesunięcia
 StockMovementForId=ID przesunięcia %d
 ListMouvementStockProject=Lista przesunięć zapasu skojarzona z projektem
 StocksArea=Powierzchnia magazynów
-AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
+AllWarehouses=Wszystkie magazyny
+IncludeEmptyDesiredStock=Uwzględnij również stan ujemny z nieokreślonym żądanym stanem
+IncludeAlsoDraftOrders=Uwzględnij również projekty zamówień
 Location=Lokacja
-LocationSummary=Nazwa skrócona lokalizacji
-NumberOfDifferentProducts=Wiele różnych środków
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Łączna liczba produktów
 LastMovement=Ostatni ruch
 LastMovements=Ostatnie ruchy
@@ -60,52 +60,54 @@ PMPValue=Średnia ważona ceny
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Magazyny wartości
 UserWarehouseAutoCreate=Utwórz użytkownika dla magazynu kiedy tworzysz użytkownika
-AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
-UserDefaultWarehouse=Set a warehouse on Users
+AllowAddLimitStockByWarehouse=Zarządzaj również wartością minimalnego i pożądanego zapasu na parę (magazyn produktów) oprócz wartości minimalnego i pożądanego zapasu na produkt
+RuleForWarehouse=Reguła dla magazynów
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Ustaw magazyn na ofertach handlowych
+WarehouseAskWarehouseDuringOrder=Ustaw magazyn dla zamówień sprzedaży
+UserDefaultWarehouse=Ustaw magazyn dla użytkowników
 MainDefaultWarehouse=Domyślny magazyn
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
-IndependantSubProductStock=Product stock and subproduct stock are independent
+MainDefaultWarehouseUser=Użyj domyślnej hurtowni dla każdego użytkownika
+MainDefaultWarehouseUserDesc=Aktywując tę opcję, podczas tworzenia produktu, na nim zostanie zdefiniowany magazyn przypisany do produktu. Jeśli na użytkowniku nie jest zdefiniowany żaden magazyn, definiowany jest magazyn domyślny.
+IndependantSubProductStock=Zapasy produktów i podprodukty są niezależne
 QtyDispatched=Wysłana ilość
 QtyDispatchedShort=Ilość wysłana
 QtyToDispatchShort=Ilość do wysłania
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of sales order
+OrderDispatch=Pokwitowania przedmiotów
+RuleForStockManagementDecrease=Wybierz regułę automatycznego zmniejszania zapasów (ręczne zmniejszanie jest zawsze możliwe, nawet jeśli aktywowana jest reguła automatycznego zmniejszania)
+RuleForStockManagementIncrease=Wybierz regułę automatycznego zwiększania zapasów (ręczne zwiększanie jest zawsze możliwe, nawet jeśli aktywowana jest reguła automatycznego zwiększania zapasów)
+DeStockOnBill=Zmniejsz rzeczywiste zapasy po sprawdzeniu faktury klienta / noty kredytowej
+DeStockOnValidateOrder=Zmniejsz rzeczywiste zapasy po zatwierdzeniu zamówienia sprzedaży
 DeStockOnShipment=Zmniejsz realne zapasy magazynu po potwierdzeniu wysyłki
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+DeStockOnShipmentOnClosing=Zmniejsz rzeczywiste zapasy, gdy wysyłka jest zamknięta
+ReStockOnBill=Zwiększ rzeczywiste zapasy po sprawdzeniu faktury / faktury od dostawcy
+ReStockOnValidateOrder=Zwiększ realne zapasy po zatwierdzeniu zamówienia
+ReStockOnDispatchOrder=Zwiększ realne zapasy przy ręcznej wysyłce do magazynu po otrzymaniu zamówienia
+StockOnReception=Zwiększ rzeczywiste zapasy po zatwierdzeniu odbioru
+StockOnReceptionOnClosing=Zwiększ rzeczywiste zapasy, gdy odbiór jest ustawiony na zamknięty
 OrderStatusNotReadyToDispatch=Zamówienie nie jest jeszcze lub nie więcej status, który umożliwia wysyłanie produktów w magazynach czas.
 StockDiffPhysicTeoric=Wyjaśnienia dla różnicy pomiędzy fizycznym i wirtualnych zapasem
 NoPredefinedProductToDispatch=Nie gotowych produktów dla tego obiektu. Więc nie w czas wysyłki jest wymagane.
 DispatchVerb=Wysyłka
 StockLimitShort=Limit zapasu przy którym wystąpi alarm
 StockLimit=Limit zapasu przy którym wystąpi alarm
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical Stock
+StockLimitDesc=(pusty) oznacza brak ostrzeżenia. <br> 0 może służyć jako ostrzeżenie, gdy tylko zapasy się wyczerpią.
+PhysicalStock=Zapas fizyczny
 RealStock=Realny magazyn
-RealStockDesc=Physical/real stock is the stock currently in the warehouses.
-RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+RealStockDesc=Fizyczne / rzeczywiste zapasy to stany znajdujące się obecnie w magazynach.
+RealStockWillAutomaticallyWhen=Rzeczywisty stan magazynowy zostanie zmodyfikowany zgodnie z tą zasadą (zdefiniowaną w module Magazyn):
 VirtualStock=Wirtualny zapas
-VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockAtDate=Wirtualne zapasy na dzień
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
+VirtualStockDesc=Zapasy wirtualne to obliczone zapasy dostępne po zamknięciu wszystkich otwartych / oczekujących akcji (mających wpływ na zapasy) (otrzymane zamówienia zakupu, wysłane zamówienia sprzedaży, wyprodukowane zlecenia produkcyjne itp.)
+AtDate=W dniu
 IdWarehouse=Identyfikator magazynu
 DescWareHouse=Opis magazynu
 LieuWareHouse=Lokalizacja magazynu
 WarehousesAndProducts=Magazyny i produkty
 WarehousesAndProductsBatchDetail=Magazyny i produkty (z detalami na lot / serial)
 AverageUnitPricePMPShort=Średnia ważona ceny
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=Średnia wejściowa cena jednostkowa, jaką musieliśmy wydać, aby wprowadzić 1 jednostkę produktu do naszego magazynu.
 SellPriceMin=Cena sprzedaży jednostki
 EstimatedStockValueSellShort=Wartość sprzedaży
 EstimatedStockValueSell=Wartość sprzedaży
@@ -118,71 +120,72 @@ ThisWarehouseIsPersonalStock=Tym składzie przedstawia osobiste zasobów %s %s
 SelectWarehouseForStockDecrease=Wybierz magazyn do zmniejszenia zapasu
 SelectWarehouseForStockIncrease=Wybierz magazyn do zwiększenia zapasu
 NoStockAction=Brak akcji stock
-DesiredStock=Desired Stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+DesiredStock=Pożądany zapas
+DesiredStockDesc=Ta ilość zapasów będzie wartością używaną do wypełnienia zapasów przez funkcję uzupełniania.
 StockToBuy=Na zamówienie
 Replenishment=Uzupełnienie
 ReplenishmentOrders=Zamówień towarów
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+VirtualDiffersFromPhysical=W zależności od opcji zwiększania / zmniejszania akcji, akcje fizyczne i akcje wirtualne (akcje fizyczne + zlecenia otwarte) mogą się różnić
+UseRealStockByDefault=Użyj prawdziwych zapasów zamiast wirtualnych zapasów do uzupełnienia zapasów
+ReplenishmentCalculation=Kwota do zamówienia będzie (żądana ilość - stan rzeczy) zamiast (żądana ilość - stan wirtualny)
 UseVirtualStock=Użyj wirtualnego zapasu
 UsePhysicalStock=Użyj fizycznego zapasu
 CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Wirtualny zapas
 CurentlyUsingPhysicalStock=Fizyczny zapas
 RuleForStockReplenishment=Reguła dla uzupełnienia zapasów
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+SelectProductWithNotNullQty=Wybierz co najmniej jeden produkt z liczbą inną niż NULL i dostawcą
 AlertOnly= Tylko alarmy
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Uwzględnij również ujemne zapasy produktów, dla których nie określono żądanej ilości, aby przywrócić je do 0
 WarehouseForStockDecrease=<b>Magazyn% s</b> zostaną wykorzystane do zmniejszenia magazynie
 WarehouseForStockIncrease=<b>Magazyn% s</b> zostaną wykorzystane do zwiększenia magazynie
 ForThisWarehouse=W tym magazynie
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
-ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=To jest lista wszystkich produktów, których stan magazynowy jest niższy niż żądany (lub niższy niż wartość ostrzeżenia, jeśli zaznaczone jest pole wyboru „tylko alert”). Za pomocą pola wyboru możesz tworzyć zamówienia zakupu, aby wypełnić różnicę.
+ReplenishmentStatusDescPerWarehouse=Jeśli chcesz uzupełnić zaopatrzenie na podstawie żądanej ilości zdefiniowanej dla magazynu, musisz dodać filtr do magazynu.
+ReplenishmentOrdersDesc=To jest lista wszystkich otwartych zamówień, w tym predefiniowanych produktów. W tym miejscu widoczne są tylko otwarte zamówienia ze wstępnie zdefiniowanymi produktami, więc zamówienia mogące mieć wpływ na stan magazynowy.
 Replenishments=Uzupełnienie
 NbOfProductBeforePeriod=Ilość produktów w magazynie% s przed wybrany okres (<% s)
 NbOfProductAfterPeriod=Ilość produktów w magazynie% s po wybraniu okres (>% s)
 MassMovement=Masowe przesunięcie
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfer
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+RecordMovement=Transfer rekordu
 ReceivingForSameOrder=Wpływy do tego celu
 StockMovementRecorded=Przesunięcia zapasu zarejestrowane
 RuleForStockAvailability=Zasady dotyczące dostępności zapasu
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stan zapasów musi być wystarczający, aby dodać produkt / usługę do faktury (sprawdzenie odbywa się na aktualnym stanie magazynowym podczas dodawania wiersza do faktury, niezależnie od reguły automatycznej zmiany zapasów)
+StockMustBeEnoughForOrder=Poziom zapasów musi być wystarczający, aby dodać produkt / usługę do zamówienia (sprawdzenie odbywa się na aktualnym stanie magazynowym podczas dodawania linii do zamówienia, niezależnie od reguły automatycznej zmiany zapasów)
+StockMustBeEnoughForShipment= Poziom zapasów musi być wystarczający, aby dodać produkt / usługę do wysyłki (sprawdzenie odbywa się na aktualnym stanie magazynowym podczas dodawania linii do wysyłki, niezależnie od reguły automatycznej zmiany zapasów)
 MovementLabel=Etykieta ruchu
-TypeMovement=Type of movement
+TypeMovement=Kierunek ruchu
 DateMovement=Data przesunięcia
 InventoryCode=Ruch lub kod inwentaryzacji
 IsInPackage=Zawarte w pakiecie
 WarehouseAllowNegativeTransfer=Zapas może być ujemny
 qtyToTranferIsNotEnough=Nie masz wystarczającego zapasu w magazynie źródłowym i twoje ustawienie nie pozwala na zapas ujemny.
-qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+qtyToTranferLotIsNotEnough=Nie masz wystarczających zapasów dla tego numeru partii z magazynu źródłowego, a Twoja konfiguracja nie zezwala na ujemne zapasy (ilość produktu „%s” o partii „%s” to %s w magazynie „%s”).
 ShowWarehouse=Pokaż magazyn
 MovementCorrectStock=Korekta zapasu dla artykułu %s
 MovementTransferStock=Transferuj zapas artykułu %s do innego magazynu
 InventoryCodeShort=Kod Fv/ Przesunięcia
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+NoPendingReceptionOnSupplierOrder=Brak oczekującego odbioru z powodu otwartego zamówienia
 ThisSerialAlreadyExistWithDifferentDate=Ten lot/numer seryjny (<strong>%s</strong>) już istnieje ale z inna data do wykorzystania lub sprzedania (znaleziono  <strong>%s</strong> a wszedłeś w <strong>%s</strong>)
 OpenAll=Otwórz dla wszystkich działań
 OpenInternal=Otwórz tylko dla wewnętrznych działań
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
+UseDispatchStatus=Użyj statusu wysyłki (Zatwierdź / Odrzuć) dla linii produktów podczas przyjmowania zamówienia
+OptionMULTIPRICESIsOn=Włączona jest opcja „kilka cen za segment”. Oznacza to, że produkt ma kilka cen sprzedaży, więc nie można obliczyć wartości sprzedaży
 ProductStockWarehouseCreated=Limit zapasu dla ostrzeżenia i pożądany optymalny zapas prawidłowo utworzony
 ProductStockWarehouseUpdated=Limit zapasu dla ostrzeżenia i pożądany optymalny zapas prawidłowo zaktualizowany
 ProductStockWarehouseDeleted=Limit zapasu dla ostrzeżenia i pożądany optymalny zapas prawidłowo usunięty
 AddNewProductStockWarehouse=Ustaw nowy limit dla ostrzeżenia i pożądany optymalny zapas
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+AddStockLocationLine=Zmniejsz ilość, a następnie kliknij, aby dodać kolejny magazyn dla tego produktu
 InventoryDate=Data inwentaryzacji
 NewInventory=Nowa inwentaryzacja
 inventorySetup = Ustawienia inwentaryzacji
 inventoryCreatePermission=Utwórz nową inwentaryzację
 inventoryReadPermission=Pokaż inwentaryzacje
 inventoryWritePermission=Aktualizuj inwentaryzacje
-inventoryValidatePermission=Validate inventory
+inventoryValidatePermission=Zweryfikuj zasoby
+inventoryDeletePermission=Usuń ekwipunek
 inventoryTitle=Inwentaryzacja
 inventoryListTitle=Inwentaryzacje
 inventoryListEmpty=Brak inwentaryzacji w toku
@@ -193,52 +196,62 @@ inventoryValidate=Zatwierdzony
 inventoryDraft=Działa
 inventorySelectWarehouse=Magazyn zmieniony
 inventoryConfirmCreate=Utwórz
-inventoryOfWarehouse=Inventory for warehouse: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryOfWarehouse=Zapasy magazynu: %s
+inventoryErrorQtyAdd=Błąd: jedna wielkość jest mniejsza od zera
 inventoryMvtStock=Według inwentaryzacji
 inventoryWarningProductAlreadyExists=Te produkt jest już na liście
 SelectCategory=Filtr kategorii
-SelectFournisseur=Vendor filter
+SelectFournisseur=Filtr dostawcy
 inventoryOnDate=Inwentaryzacja
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Ruchy zapasów będą miały datę inwentaryzacji (zamiast daty walidacji zapasów)
+inventoryChangePMPPermission=Pozwól zmienić wartość PMP dla produktu
+ColumnNewPMP=Nowa jednostka PMP
 OnlyProdsInStock=Nie dodawaj produktu bez zapasu
 TheoricalQty=Theorique qty
 TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RecordedQty=Recorded Qty
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
+LastPA=Ostatni BP
+CurrentPA=Obecny BP
+RecordedQty=Nagrana ilość
+RealQty=Rzeczywista ilość
+RealValue=Prawdziwa wartość
+RegulatedQty=Ilość regulowana
 AddInventoryProduct=Dodaj produkt do inwentaryzacji
 AddProduct=Dodaj
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
+ApplyPMP=Zastosuj PMP
+FlushInventory=Opróżnij zapasy
+ConfirmFlushInventory=Czy potwierdzasz tę akcję?
 InventoryFlushed=Inwentaryzacja zakończona
 ExitEditMode=Opuść edycję
 inventoryDeleteLine=Usuń linię
-RegulateStock=Regulate Stock
+RegulateStock=Reguluj zapasy
 ListInventory=Lista
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
-ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
-InventoryForASpecificWarehouse=Inventory for a specific warehouse
-InventoryForASpecificProduct=Inventory for a specific product
-StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
-ForceTo=Force to
-AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
-DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+StockSupportServices=Zarządzanie zapasami wspiera usługi
+StockSupportServicesDesc=Domyślnie można składować tylko produkty typu „produkt”. Możesz również przechowywać produkt typu „usługa”, jeśli zarówno Usługi modułu, jak i ta opcja są włączone.
+ReceiveProducts=Otrzymuj przedmioty
+StockIncreaseAfterCorrectTransfer=Zwiększ przez korektę / transfer
+StockDecreaseAfterCorrectTransfer=Zmniejsz przez korektę / przelew
+StockIncrease=Zwiększenie zapasów
+StockDecrease=Zmniejszenie zapasów
+InventoryForASpecificWarehouse=Inwentaryzacja dla konkretnego magazynu
+InventoryForASpecificProduct=Zapasy dla konkretnego produktu
+StockIsRequiredToChooseWhichLotToUse=Zapas jest wymagany, aby wybrać partię do użycia
+ForceTo=Zmusić do
+AlwaysShowFullArbo=Wyświetlaj pełne drzewo magazynu w wyskakującym okienku linków do magazynu (Ostrzeżenie: może to znacznie zmniejszyć wydajność)
+StockAtDatePastDesc=Możesz tutaj zobaczyć stan zapasów (stan rzeczywisty) w danym dniu w przeszłości
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
+CurrentStock=Aktualny stan
+InventoryRealQtyHelp=Ustaw wartość na 0, aby zresetować ilość <br> Pozostaw pole puste lub usuń wiersz, aby zachować niezmienione
+UpdateByScaning=Fill real qty by scaning
+UpdateByScaningProductBarcode=Zaktualizuj przez skanowanie (kod kreskowy produktu)
+UpdateByScaningLot=Aktualizacja przez skanowanie (lot | seryjny kod kreskowy)
+DisableStockChangeOfSubProduct=Dezaktywuj zmianę zapasów dla wszystkich podproduktów tego zestawu podczas tego ruchu.
+ImportFromCSV=Importuj listę ruchu CSV
+ChooseFileToImport=Prześlij plik, a następnie kliknij ikonę %s, aby wybrać plik jako źródłowy plik importu ...
+SelectAStockMovementFileToImport=wybierz plik ruchu zapasów do zaimportowania
+InfoTemplateImport=Przesłany plik musi mieć ten format (* pola obowiązkowe): <br> Magazyn źródłowy * | Magazyn docelowy * | Produkt * | Ilość * | Numer partii / seryjny <br> Separator znaków CSV musi mieć postać „<b> %s </b>”
+LabelOfInventoryMovemement=Zapasy %s
+ReOpen=Otworzyć na nowo
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index e317602a687..8b45068b9d7 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Dostawcy
 SuppliersInvoice=Faktura dostawcy
+SupplierInvoices=Faktury dostawcy
 ShowSupplierInvoice=Pokaż fakturę dostawcy
 NewSupplier=Nowy dostawca
 History=Historia
@@ -10,20 +11,20 @@ OrderDate=Data zamówienia
 BuyingPriceMin=Najlepsza cena zakupu
 BuyingPriceMinShort=Najlepsza cena zakupu
 TotalBuyingPriceMinShort=Suma cen zakupu podproduktów
-TotalSellingPriceMinShort=Total of subproducts selling prices
+TotalSellingPriceMinShort=Suma cen sprzedaży produktów podrzędnych
 SomeSubProductHaveNoPrices=Niektóre podprodukty nie mają zdefiniowanych cen
 AddSupplierPrice=Dodaj cenę zakupu
 ChangeSupplierPrice=Zmień cenę zakupu
 SupplierPrices=Ceny dostawców
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
-NoRecordedSuppliers=No vendor recorded
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=To odniesienie do dostawcy jest już powiązane z produktem: %s
+NoRecordedSuppliers=Brak zarejestrowanego dostawcy
 SupplierPayment=Płatność dostawcy
 SuppliersArea=Obszar dostawcy
 RefSupplierShort=Symbol dostawcy
 Availability=Dostępność
-ExportDataset_fournisseur_1=Vendor invoices and invoice details
+ExportDataset_fournisseur_1=Faktury od dostawców i dane do faktur
 ExportDataset_fournisseur_2=Faktury i płatności dostawcy
-ExportDataset_fournisseur_3=Purchase orders and order details
+ExportDataset_fournisseur_3=Zamówienia i szczegóły zamówienień
 ApproveThisOrder=Zatwierdź to zamówienie
 ConfirmApproveThisOrder=Czy zaakceptować zamówienie <b>%s</b>?
 DenyingThisOrder=Odrzuć to zamówienie
@@ -31,18 +32,18 @@ ConfirmDenyingThisOrder=Czy odrzucić zamówienie <b>%s</b>?
 ConfirmCancelThisOrder=Czy anulować zamówienie <b>%s</b>?
 AddSupplierOrder=Utwórz zamówienie
 AddSupplierInvoice=Utwórz fakturę dostawcy
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+ListOfSupplierProductForSupplier=Lista produktów i cen dostawcy <b> %s </b>
 SentToSuppliers=Wyślij do dostawców
 ListOfSupplierOrders=Lista zamówień
 MenuOrdersSupplierToBill=Zamówienia do zafakturowania
-NbDaysToDelivery=Delivery delay (days)
-DescNbDaysToDelivery=The longest delivery delay of the products from this order
+NbDaysToDelivery=Opóźnienie dostawy (dni)
+DescNbDaysToDelivery=Najdłuższe opóźnienie w dostawie produktów z tego zamówienia
 SupplierReputation=Reputacja dostawcy
-ReferenceReputation=Reference reputation
+ReferenceReputation=Reputacja referencji
 DoNotOrderThisProductToThisSupplier=Nie zamawiaj
-NotTheGoodQualitySupplier=Low quality
+NotTheGoodQualitySupplier=Niska jakość
 ReputationForThisProduct=Reputacja
 BuyerName=Nazwa kupującego
 AllProductServicePrices=Ceny wszystkich produktów/usług 
-AllProductReferencesOfSupplier=All references of vendor
+AllProductReferencesOfSupplier=Wszystkie referencje dostawcy
 BuyingPriceNumShort=Ceny dostawców
diff --git a/htdocs/langs/pl_PL/ticket.lang b/htdocs/langs/pl_PL/ticket.lang
index 457e5110c6b..7d704f01740 100644
--- a/htdocs/langs/pl_PL/ticket.lang
+++ b/htdocs/langs/pl_PL/ticket.lang
@@ -25,51 +25,53 @@ Permission56001=Zobacz bilety
 Permission56002=Modyfikuj bilety
 Permission56003=Usuwaj bilety
 Permission56004=Zarządzaj biletami
-Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56005=Zobacz bilety wszystkich stron trzecich (nie dotyczy użytkowników zewnętrznych, zawsze ograniczaj się do strony trzeciej, od której są zależni)
 
 TicketDictType=Bilet - Typ
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
+TicketDictCategory=Bilet - grupy
+TicketDictSeverity=Bilet - dotkliwości
+TicketDictResolution=Bilet - rozwiązanie
 
-TicketTypeShortCOM=Commercial question
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
-TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortCOM=Pytanie handlowe
+TicketTypeShortHELP=Prośba o pomoc funkcjonalną
+TicketTypeShortISSUE=Problem, błąd lub problem
+TicketTypeShortREQUEST=Prośba o zmianę lub ulepszenie
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Inne
 
 TicketSeverityShortLOW=Niski
-TicketSeverityShortNORMAL=Normal
+TicketSeverityShortNORMAL=Normalna
 TicketSeverityShortHIGH=Wysoki
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortBLOCKING=Krytyczne, blokujące
 
-ErrorBadEmailAddress=Field '%s' incorrect
-MenuTicketMyAssign=My tickets
-MenuTicketMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+ErrorBadEmailAddress=Pole „%s” jest nieprawidłowe
+MenuTicketMyAssign=Moje bilety
+MenuTicketMyAssignNonClosed=Moje otwarte bilety
+MenuListNonClosed=Otwórz bilety
 
 TypeContact_ticket_internal_CONTRIBUTOR=Współpracownik
-TypeContact_ticket_internal_SUPPORTTEC=Assigned user
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
-TypeContact_ticket_external_CONTRIBUTOR=External contributor
+TypeContact_ticket_internal_SUPPORTTEC=Przypisany użytkownik
+TypeContact_ticket_external_SUPPORTCLI=Kontakt z klientem / śledzenie incydentów
+TypeContact_ticket_external_CONTRIBUTOR=Współpracownik zewnętrzny
 
-OriginEmail=Email source
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+OriginEmail=Źródło wiadomości e-mail
+Notify_TICKET_SENTBYMAIL=Wyślij wiadomość e-mail z biletem
 
 # Status
 Read=Czytać
-Assigned=Assigned
+Assigned=Przydzielony
 InProgress=W trakcie
-NeedMoreInformation=Waiting for information
-Answered=Answered
+NeedMoreInformation=Czekam na informacje
+Answered=Odpowiedział
 Waiting=Czekanie
 Closed=Zamknięte
-Deleted=Deleted
+Deleted=Usunięto
 
 # Dict
 Type=Typ
-Severity=Severity
+Severity=Surowość
+TicketGroupIsPublic=Grupa jest publiczna
+TicketGroupIsPublicDesc=Jeśli grupa biletów jest publiczna, będzie widoczna w formularzu podczas tworzenia biletu z poziomu interfejsu publicznego
 
 # Email templates
 MailToSendTicketMessage=Aby wysłać wiadomość e-mail z wiadomości biletu
@@ -77,228 +79,238 @@ MailToSendTicketMessage=Aby wysłać wiadomość e-mail z wiadomości biletu
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
+TicketSetup=Konfiguracja modułu biletów
 TicketSettings=Ustawienia
 TicketSetupPage=
-TicketPublicAccess=A public interface requiring no identification is available at the following url
-TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
-TicketParamModule=Module variable setup
-TicketParamMail=Email setup
-TicketEmailNotificationFrom=Notification email from
+TicketPublicAccess=Publiczny interfejs, który nie wymaga identyfikacji, jest dostępny pod następującym adresem URL
+TicketSetupDictionaries=Typ zgłoszenia, ważność i kody analityczne można konfigurować ze słowników
+TicketParamModule=Konfiguracja zmiennej modułu
+TicketParamMail=Konfiguracja poczty e-mail
+TicketEmailNotificationFrom=E-mail z powiadomieniem od
 TicketEmailNotificationFromHelp=Używany w odpowiedzi na wiadomość biletową na przykład
-TicketEmailNotificationTo=Notifications email to
-TicketEmailNotificationToHelp=Send email notifications to this address.
-TicketNewEmailBodyLabel=Text message sent after creating a ticket
-TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
-TicketParamPublicInterface=Public interface setup
-TicketsEmailMustExist=Require an existing email address to create a ticket
-TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
+TicketEmailNotificationTo=Powiadomienia e-mail do
+TicketEmailNotificationToHelp=Wysyłaj powiadomienia e-mail na ten adres.
+TicketNewEmailBodyLabel=Wiadomość tekstowa wysyłana po utworzeniu biletu
+TicketNewEmailBodyHelp=Podany tutaj tekst zostanie wstawiony do wiadomości e-mail potwierdzającej utworzenie nowego zgłoszenia z interfejsu publicznego. Informacje o sprawdzeniu biletu są dodawane automatycznie.
+TicketParamPublicInterface=Konfiguracja interfejsu publicznego
+TicketsEmailMustExist=Wymagaj istniejącego adresu e-mail, aby utworzyć bilet
+TicketsEmailMustExistHelp=W interfejsie publicznym adres e-mail powinien być już wypełniony w bazie danych, aby utworzyć nowy bilet.
 PublicInterface=Interfejs publiczny
-TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
-TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
-TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
-TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
-TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
-TicketPublicInterfaceTopicLabelAdmin=Interface title
-TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
-TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
-TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
-ExtraFieldsTicket=Extra attributes
-TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
-TicketsDisableEmail=Do not send emails for ticket creation or message recording
-TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
-TicketsLogEnableEmail=Enable log by email
-TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketUrlPublicInterfaceLabelAdmin=Alternatywny adres URL interfejsu publicznego
+TicketUrlPublicInterfaceHelpAdmin=Możliwe jest zdefiniowanie aliasu do serwera WWW, a tym samym udostępnienie interfejsu publicznego z innym adresem URL (serwer musi działać jako proxy na tym nowym adresie URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Tekst powitalny interfejsu publicznego
+TicketPublicInterfaceTextHome=Możesz utworzyć zgłoszenie do pomocy technicznej lub wyświetlić istniejące z jego biletu śledzenia identyfikatora.
+TicketPublicInterfaceTextHomeHelpAdmin=Zdefiniowany tutaj tekst pojawi się na stronie głównej interfejsu publicznego.
+TicketPublicInterfaceTopicLabelAdmin=Tytuł interfejsu
+TicketPublicInterfaceTopicHelp=Ten tekst pojawi się jako tytuł interfejsu publicznego.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Tekst pomocy do wpisu wiadomości
+TicketPublicInterfaceTextHelpMessageHelpAdmin=Ten tekst pojawi się nad obszarem wprowadzania wiadomości użytkownika.
+ExtraFieldsTicket=Dodatkowe atrybuty
+TicketCkEditorEmailNotActivated=Edytor HTML nie jest aktywowany. Ustaw zawartość FCKEDITOR_ENABLE_MAIL na 1, aby ją pobrać.
+TicketsDisableEmail=Nie wysyłaj e-maili w celu utworzenia zgłoszenia lub nagrania wiadomości
+TicketsDisableEmailHelp=Domyślnie wiadomości e-mail są wysyłane po utworzeniu nowych biletów lub wiadomości. Włącz tę opcję, aby wyłączyć * wszystkie * powiadomienia e-mail
+TicketsLogEnableEmail=Włącz logowanie przez e-mail
+TicketsLogEnableEmailHelp=Przy każdej zmianie e-mail zostanie wysłany ** do każdego kontaktu ** związanego z biletem.
 TicketParams=Params
-TicketsShowModuleLogo=Display the logo of the module in the public interface
-TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
-TicketsShowCompanyLogo=Display the logo of the company in the public interface
-TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
-TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
-TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
+TicketsShowModuleLogo=Wyświetl logo modułu w interfejsie publicznym
+TicketsShowModuleLogoHelp=Włącz tę opcję, aby ukryć moduł logo na stronach interfejsu publicznego
+TicketsShowCompanyLogo=Wyświetl logo firmy w interfejsie publicznym
+TicketsShowCompanyLogoHelp=Włącz tę opcję, aby ukryć logo głównej firmy na stronach interfejsu publicznego
+TicketsEmailAlsoSendToMainAddress=Wyślij również powiadomienie na główny adres e-mail
+TicketsEmailAlsoSendToMainAddressHelp=Włącz tę opcję, aby również wysłać wiadomość e-mail na adres zdefiniowany w ustawieniach „%s” (patrz zakładka „%s”)
+TicketsLimitViewAssignedOnly=Ogranicz wyświetlanie do biletów przypisanych do bieżącego użytkownika (nie dotyczy użytkowników zewnętrznych, zawsze ograniczaj się do strony trzeciej, od której zależą)
+TicketsLimitViewAssignedOnlyHelp=Widoczne będą tylko bilety przypisane do bieżącego użytkownika. Nie dotyczy użytkownika z uprawnieniami do zarządzania zgłoszeniami.
 TicketsActivatePublicInterface=Aktywuj publiczny interfejs
-TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
-TicketsAutoAssignTicket=Automatically assign the user who created the ticket
-TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
-TicketNumberingModules=Tickets numbering module
-TicketsModelModule=Document templates for tickets
-TicketNotifyTiersAtCreation=Notify third party at creation
-TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketsActivatePublicInterfaceHelp=Interfejs publiczny umożliwia każdemu odwiedzającemu tworzenie biletów.
+TicketsAutoAssignTicket=Automatycznie przypisz użytkownika, który utworzył bilet
+TicketsAutoAssignTicketHelp=Podczas tworzenia biletu użytkownik może zostać automatycznie przypisany do biletu.
+TicketNumberingModules=Moduł numeracji biletów
+TicketsModelModule=Szablony dokumentów dla biletów
+TicketNotifyTiersAtCreation=Powiadom osobę trzecią podczas tworzenia
+TicketsDisableCustomerEmail=Zawsze wyłączaj wiadomości e-mail, gdy bilet jest tworzony z interfejsu publicznego
+TicketsPublicNotificationNewMessage=Wysyłaj e-maile, gdy do zgłoszenia zostanie dodana nowa wiadomość / komentarz
+TicketsPublicNotificationNewMessageHelp=Wysyłaj e-maile, gdy nowa wiadomość zostanie dodana z interfejsu publicznego (do przypisanego użytkownika lub powiadomienie e-mail do (aktualizacja) i / lub powiadomienie e-mailem do)
+TicketPublicNotificationNewMessageDefaultEmail=Powiadomienia e-mail do (aktualizacja)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Wyślij wiadomość e-mail na ten adres w przypadku każdej nowej wiadomości, jeśli do biletu nie jest przypisany użytkownik lub użytkownik nie ma żadnego znanego adresu e-mail.
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
-TicketList=List of tickets
-TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
-NoTicketsFound=No ticket found
-NoUnreadTicketsFound=No unread ticket found
-TicketViewAllTickets=View all tickets
-TicketViewNonClosedOnly=View only open tickets
-TicketStatByStatus=Tickets by status
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+TicketsIndex=Strefa biletów
+TicketList=Lista biletów
+TicketAssignedToMeInfos=Ta strona wyświetla listę zgłoszeń utworzoną przez lub przypisaną do bieżącego użytkownika
+NoTicketsFound=Nie znaleziono biletu
+NoUnreadTicketsFound=Nie znaleziono nieprzeczytanego biletu
+TicketViewAllTickets=Zobacz wszystkie bilety
+TicketViewNonClosedOnly=Wyświetl tylko otwarte bilety
+TicketStatByStatus=Bilety według statusu
+OrderByDateAsc=Sortuj według rosnącej daty
+OrderByDateDesc=Sortuj według malejącej daty
+ShowAsConversation=Pokaż jako listę rozmów
+MessageListViewType=Pokaż jako listę tabel
 
 #
 # Ticket card
 #
-Ticket=Ticket
-TicketCard=Ticket card
-CreateTicket=Create ticket
-EditTicket=Edit ticket
-TicketsManagement=Tickets Management
-CreatedBy=Created by
-NewTicket=New Ticket
-SubjectAnswerToTicket=Ticket answer
-TicketTypeRequest=Request type
+Ticket=Bilet
+TicketCard=Karta biletowa
+CreateTicket=Utwórz bilet
+EditTicket=Edytuj bilet
+TicketsManagement=Zarządzanie zgłoszeniami
+CreatedBy=Stworzone przez
+NewTicket=Nowy bilet
+SubjectAnswerToTicket=Odpowiedź na bilet
+TicketTypeRequest=Rodzaj żądania
 TicketCategory=Grupa
-SeeTicket=See ticket
-TicketMarkedAsRead=Ticket has been marked as read
-TicketReadOn=Read on
+SeeTicket=Zobacz bilet
+TicketMarkedAsRead=Bilet został oznaczony jako przeczytany
+TicketReadOn=Czytaj
 TicketCloseOn=Ostateczny termin
-MarkAsRead=Mark ticket as read
-TicketHistory=Ticket history
-AssignUser=Assign to user
-TicketAssigned=Ticket is now assigned
-TicketChangeType=Change type
-TicketChangeCategory=Change analytic code
+MarkAsRead=Oznacz bilet jako przeczytany
+TicketHistory=Historia biletów
+AssignUser=Przypisz do użytkownika
+TicketAssigned=Bilet jest teraz przypisany
+TicketChangeType=Zmień typ
+TicketChangeCategory=Zmień kod analityczny
 TicketChangeSeverity=Zmień istotność
-TicketAddMessage=Add a message
-AddMessage=Add a message
-MessageSuccessfullyAdded=Ticket added
-TicketMessageSuccessfullyAdded=Message successfully added
-TicketMessagesList=Message list
-NoMsgForThisTicket=No message for this ticket
-Properties=Classification
-LatestNewTickets=Latest %s newest tickets (not read)
-TicketSeverity=Severity
-ShowTicket=See ticket
+TicketAddMessage=Dodaj wiadomość
+AddMessage=Dodaj wiadomość
+MessageSuccessfullyAdded=Dodano bilet
+TicketMessageSuccessfullyAdded=Wiadomość została pomyślnie dodana
+TicketMessagesList=Lista wiadomości
+NoMsgForThisTicket=Brak wiadomości dla tego biletu
+Properties=Klasyfikacja
+LatestNewTickets=Najnowsze %s Najnowsze bilety (nieprzeczytane)
+TicketSeverity=Surowość
+ShowTicket=Zobacz bilet
 RelatedTickets=Powiązane bilety
 TicketAddIntervention=Tworzenie interwencji
-CloseTicket=Close ticket
-CloseATicket=Close a ticket
-ConfirmCloseAticket=Confirm ticket closing
-ConfirmDeleteTicket=Please confirm ticket deleting
-TicketDeletedSuccess=Ticket deleted with success
-TicketMarkedAsClosed=Ticket marked as closed
-TicketDurationAuto=Calculated duration
-TicketDurationAutoInfos=Duration calculated automatically from intervention related
-TicketUpdated=Ticket updated
-SendMessageByEmail=Send message by email
-TicketNewMessage=New message
-ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
-TicketGoIntoContactTab=Please go into "Contacts" tab to select them
-TicketMessageMailIntro=Introduction
-TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+CloseTicket=Zamknij bilet
+CloseATicket=Zamknij bilet
+ConfirmCloseAticket=Potwierdź zamknięcie biletu
+ConfirmDeleteTicket=Potwierdź usunięcie biletu
+TicketDeletedSuccess=Bilet został usunięty z powodzeniem
+TicketMarkedAsClosed=Bilet oznaczony jako zamknięty
+TicketDurationAuto=Obliczony czas trwania
+TicketDurationAutoInfos=Czas trwania obliczany automatycznie na podstawie interwencji
+TicketUpdated=Bilet zaktualizowany
+SendMessageByEmail=Wyślij wiadomość e-mailem
+TicketNewMessage=Nowa wiadomość
+ErrorMailRecipientIsEmptyForSendTicketMessage=Adresat jest pusty. Nie wysłano e-maila
+TicketGoIntoContactTab=Przejdź do zakładki „Kontakty”, aby je wybrać
+TicketMessageMailIntro=Wprowadzenie
+TicketMessageMailIntroHelp=Ten tekst jest dodawany tylko na początku e-maila i nie zostanie zapisany.
+TicketMessageMailIntroLabelAdmin=Wprowadzenie do wiadomości podczas wysyłania wiadomości e-mail
+TicketMessageMailIntroText=Witaj, <br> Nowa odpowiedź została wysłana na zgłoszenie, z którym się kontaktujesz. Oto wiadomość: <br>
+TicketMessageMailIntroHelpAdmin=Ten tekst zostanie wstawiony przed tekstem odpowiedzi na zgłoszenie.
 TicketMessageMailSignature=Podpis
-TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
-TicketMessageMailSignatureLabelAdmin=Signature of response email
-TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
-TicketMessageHelp=Only this text will be saved in the message list on ticket card.
-TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
-TimeElapsedSince=Time elapsed since
-TicketTimeToRead=Time elapsed before read
-TicketContacts=Contacts ticket
-TicketDocumentsLinked=Documents linked to ticket
-ConfirmReOpenTicket=Confirm reopen this ticket ?
-TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
-TicketAssignedToYou=Ticket assigned
-TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
-MarkMessageAsPrivate=Mark message as private
-TicketMessagePrivateHelp=This message will not display to external users
-TicketEmailOriginIssuer=Issuer at origin of the tickets
-InitialMessage=Initial Message
-LinkToAContract=Link to a contract
-TicketPleaseSelectAContract=Select a contract
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
-TicketMailExchanges=Mail exchanges
-TicketInitialMessageModified=Initial message modified
-TicketMessageSuccesfullyUpdated=Message successfully updated
-TicketChangeStatus=Change status
-TicketConfirmChangeStatus=Confirm the status change: %s ?
-TicketLogStatusChanged=Status changed: %s to %s
-TicketNotNotifyTiersAtCreate=Not notify company at create
-Unread=Unread
-TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-ErrorTicketRefRequired=Ticket reference name is required
+TicketMessageMailSignatureHelp=Ten tekst jest dodawany tylko na końcu wiadomości e-mail i nie zostanie zapisany.
+TicketMessageMailSignatureText= <p> Z poważaniem, </p> <p> - </p>
+TicketMessageMailSignatureLabelAdmin=Podpis e-maila zwrotnego
+TicketMessageMailSignatureHelpAdmin=Ten tekst zostanie wstawiony po wiadomości z odpowiedzią.
+TicketMessageHelp=Tylko ten tekst zostanie zapisany na liście wiadomości na karcie biletu.
+TicketMessageSubstitutionReplacedByGenericValues=Zmienne podstawienia są zastępowane wartościami ogólnymi.
+TimeElapsedSince=Czas, który upłynął od
+TicketTimeToRead=Upłynął czas przed przeczytaniem
+TicketContacts=Bilet kontaktów
+TicketDocumentsLinked=Dokumenty powiązane z biletem
+ConfirmReOpenTicket=Potwierdzić ponowne otwarcie tego biletu?
+TicketMessageMailIntroAutoNewPublicMessage=Na bilecie została umieszczona nowa wiadomość o temacie %s:
+TicketAssignedToYou=Przydzielony bilet
+TicketAssignedEmailBody=Przydzielono Ci bilet # %s przez %s
+MarkMessageAsPrivate=Oznacz wiadomość jako prywatną
+TicketMessagePrivateHelp=Ta wiadomość nie będzie wyświetlana użytkownikom zewnętrznym
+TicketEmailOriginIssuer=Wystawca w miejscu pochodzenia biletów
+InitialMessage=Wiadomość wstępna
+LinkToAContract=Link do umowy
+TicketPleaseSelectAContract=Wybierz umowę
+UnableToCreateInterIfNoSocid=Nie można utworzyć interwencji, jeśli nie zdefiniowano żadnej osoby trzeciej
+TicketMailExchanges=Wymiana poczty
+TicketInitialMessageModified=Zmodyfikowano wiadomość początkową
+TicketMessageSuccesfullyUpdated=Wiadomość została pomyślnie zaktualizowana
+TicketChangeStatus=Zmień status
+TicketConfirmChangeStatus=Potwierdź zmianę statusu: %s?
+TicketLogStatusChanged=Status zmieniony: %s na %s
+TicketNotNotifyTiersAtCreate=Nie powiadamiaj firmy o utworzeniu
+Unread=nieprzeczytane
+TicketNotCreatedFromPublicInterface=Niedostępne. Bilet nie został utworzony z interfejsu publicznego.
+ErrorTicketRefRequired=Nazwa biletu jest wymagana
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket %s read by %s
-NoLogForThisTicket=No log for this ticket yet
-TicketLogAssignedTo=Ticket %s assigned to %s
-TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
-TicketLogClosedBy=Ticket %s closed by %s
-TicketLogReopen=Ticket %s re-open
+TicketLogMesgReadBy=Bilet %s odczytany przez %s
+NoLogForThisTicket=Nie ma jeszcze dziennika dla tego biletu
+TicketLogAssignedTo=Bilet %s przypisany do %s
+TicketLogPropertyChanged=Bilet %s zmodyfikowano: klasyfikacja od %s do %s
+TicketLogClosedBy=Bilet %s zamknięty przez %s
+TicketLogReopen=Bilet %s ponownie otwarty
 
 #
 # Public pages
 #
-TicketSystem=Ticket system
-ShowListTicketWithTrackId=Display ticket list from track ID
-ShowTicketWithTrackId=Display ticket from track ID
-TicketPublicDesc=You can create a support ticket or check from an existing ID.
-YourTicketSuccessfullySaved=Ticket has been successfully saved!
-MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
-PleaseRememberThisId=Please keep the tracking number that we might ask you later.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
-TicketNewEmailSubjectCustomer=New support ticket
-TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
-TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
-TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
-TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
-TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
-TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
-TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
+TicketSystem=System biletowy
+ShowListTicketWithTrackId=Wyświetl listę biletów z identyfikatora utworu
+ShowTicketWithTrackId=Wyświetl bilet z identyfikatora utworu
+TicketPublicDesc=Możesz utworzyć zgłoszenie do pomocy technicznej lub sprawdzić na podstawie istniejącego identyfikatora.
+YourTicketSuccessfullySaved=Bilet został pomyślnie zapisany!
+MesgInfosPublicTicketCreatedWithTrackId=Utworzono nowy bilet o identyfikatorze %s i numerze ref %s.
+PleaseRememberThisId=Zachowaj numer śledzenia, o który możemy poprosić później.
+TicketNewEmailSubject=Potwierdzenie utworzenia biletu - Ref %s (publiczny identyfikator biletu %s)
+TicketNewEmailSubjectCustomer=Nowe zgłoszenie do pomocy technicznej
+TicketNewEmailBody=To jest automatyczna wiadomość e-mail potwierdzająca zarejestrowanie nowego biletu.
+TicketNewEmailBodyCustomer=To jest automatyczny e-mail potwierdzający, że nowy bilet został właśnie utworzony na Twoim koncie.
+TicketNewEmailBodyInfosTicket=Informacje do monitorowania zgłoszenia
+TicketNewEmailBodyInfosTrackId=Numer śledzenia biletu: %s
+TicketNewEmailBodyInfosTrackUrl=Możesz zobaczyć postęp zgłoszenia, klikając powyższy link.
+TicketNewEmailBodyInfosTrackUrlCustomer=Możesz zobaczyć postęp zgłoszenia w określonym interfejsie, klikając poniższy link
+TicketEmailPleaseDoNotReplyToThisEmail=Prosimy nie odpowiadać na tę wiadomość! Użyj linku, aby odpowiedzieć w interfejsie.
+TicketPublicInfoCreateTicket=Ten formularz umożliwia zarejestrowanie zgłoszenia do pomocy technicznej w naszym systemie zarządzania.
 TicketPublicPleaseBeAccuratelyDescribe=Proszę dokładnie opisać problem. Podaj jak najwięcej informacji, abyśmy mogli poprawnie zidentyfikować Twoją prośbę.
-TicketPublicMsgViewLogIn=Please enter ticket tracking ID
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found!
+TicketPublicMsgViewLogIn=Wprowadź identyfikator śledzenia biletu
+TicketTrackId=Publiczny identyfikator śledzenia
+OneOfTicketTrackId=Jeden z Twoich identyfikatorów śledzenia
+ErrorTicketNotFound=Nie znaleziono biletu z identyfikatorem śledzenia %s!
 Subject=Temat
 ViewTicket=Wyświetl bilet
-ViewMyTicketList=View my ticket list
-ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
-TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
-SeeThisTicketIntomanagementInterface=See ticket in management interface
-TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
-OldUser=Old user
+ViewMyTicketList=Wyświetl moją listę biletów
+ErrorEmailMustExistToCreateTicket=Błąd: adres e-mail nie został znaleziony w naszej bazie danych
+TicketNewEmailSubjectAdmin=Utworzono nowy bilet - ref %s (publiczny identyfikator biletu %s)
+TicketNewEmailBodyAdmin= <p> Bilet został właśnie utworzony z ID # %s, zobacz informacje: </p>
+SeeThisTicketIntomanagementInterface=Zobacz bilet w interfejsie zarządzania
+TicketPublicInterfaceForbidden=Interfejs publiczny biletów nie został włączony
+ErrorEmailOrTrackingInvalid=Nieprawidłowa wartość identyfikatora śledzenia lub adresu e-mail
+OldUser=Stary użytkownik
 NewUser=Nowy użytkownik
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
+NumberOfTicketsByMonth=Liczba biletów miesięcznie
+NbOfTickets=Liczba biletów
 # notifications
-TicketNotificationEmailSubject=Ticket %s updated
-TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
-TicketNotificationRecipient=Notification recipient
-TicketNotificationLogMessage=Log message
-TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
-TicketNotificationNumberEmailSent=Notification email sent: %s
+TicketNotificationEmailSubject=Bilet %s został zaktualizowany
+TicketNotificationEmailBody=To jest automatyczna wiadomość informująca, że bilet %s został właśnie zaktualizowany
+TicketNotificationRecipient=Odbiorca powiadomienia
+TicketNotificationLogMessage=Komunikat dziennika
+TicketNotificationEmailBodyInfosTrackUrlinternal=Wyświetl bilet w interfejsie
+TicketNotificationNumberEmailSent=Wysłano powiadomienie e-mail: %s
 
-ActionsOnTicket=Events on ticket
+ActionsOnTicket=Wydarzenia na bilecie
 
 #
 # Boxes
 #
-BoxLastTicket=Latest created tickets
-BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicket=Ostatnio utworzone bilety
+BoxLastTicketDescription=Ostatnie utworzone bilety %s
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=No recent unread tickets
-BoxLastModifiedTicket=Latest modified tickets
-BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastTicketNoRecordedTickets=Brak ostatnich nieprzeczytanych biletów
+BoxLastModifiedTicket=Najnowsze zmodyfikowane bilety
+BoxLastModifiedTicketDescription=Najnowsze zmodyfikowane bilety %s
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxLastModifiedTicketNoRecordedTickets=Brak ostatnio zmodyfikowanych biletów
+BoxTicketType=Liczba otwartych biletów według rodzaju
+BoxTicketSeverity=Liczba otwartych zgłoszeń według ważności
+BoxNoTicketSeverity=Nie otwarto żadnych biletów
+BoxTicketLastXDays=Liczba nowych biletów według dni w ostatnich dniach %s
+BoxTicketLastXDayswidget = Liczba nowych biletów według dni ostatnich X dni
+BoxNoTicketLastXDays=Brak nowych biletów w ciągu ostatnich %s dni
+BoxNumberOfTicketByDay=Liczba nowych biletów w ciągu dnia
+BoxNewTicketVSClose=Liczba dzisiejszych nowych biletów w porównaniu z dzisiejszymi zamkniętymi biletami
+TicketCreatedToday=Bilet utworzony dzisiaj
+TicketClosedToday=Bilet dzisiaj zamknięty
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index e6d255dfee3..e473f26d540 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Hasło zmieniono na: %s
 SubjectNewPassword=Twoje nowe hasło dla %s
 GroupRights=Uprawnienia grupy
 UserRights=Uprawnienia użytkownika
-UserGUISetup=User Display Setup
+UserGUISetup=Ustawienia Wyświetlacza Użytkownika
 DisableUser=Wyłączone
 DisableAUser=Wyłącz użytkownika
 DeleteUser=Usuń
@@ -34,8 +34,8 @@ ListOfUsers=Lista użytkowników
 SuperAdministrator=Super Administrator
 SuperAdministratorDesc=Administrator ze wszystkich praw
 AdministratorDesc=Administrator
-DefaultRights=Default Permissions
-DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
+DefaultRights=Uprawnienia domyślne
+DefaultRightsDesc=Zdefiniuj tutaj domyślne uprawnienia <u> </u>, które są automatycznie przyznawane nowemu użytkownikowi <u> </u> (aby zmodyfikować uprawnienia dla istniejących użytkowników, przejdź do karty użytkownika).
 DolibarrUsers=Użytkownicy Dolibarr
 LastName=Nazwisko
 FirstName=Imię
@@ -46,6 +46,8 @@ RemoveFromGroup=Usuń z grupy
 PasswordChangedAndSentTo=Hasło zmienione i wysyłane do <b>%s.</b>
 PasswordChangeRequest=Zgłoszenie zmiany hasła dla <b>%s</b>
 PasswordChangeRequestSent=Wniosek o zmianę hasła dla <b>%s</b> wysłany do <b>%s</b>.
+IfLoginExistPasswordRequestSent=Jeśli ten login jest prawidłowym kontem, wiadomość e-mail umożliwiająca zresetowanie hasła została wysłana.
+IfEmailExistPasswordRequestSent=Jeśli ten adres e-mail jest prawidłowym kontem, wiadomość e-mail umożliwiająca zresetowanie hasła została wysłana.
 ConfirmPasswordReset=Potwierdź zresetowanie hasła
 MenuUsersAndGroups=Użytkownicy i grupy
 LastGroupsCreated=Ostatnie %s utworzone grupy
@@ -66,19 +68,20 @@ CreateDolibarrThirdParty=Utwórz kontrahenta
 LoginAccountDisableInDolibarr=Konto wyłączone w Dolibarr.
 UsePersonalValue=Użyj wartości osobowych
 InternalUser=Wewnętrzny użytkownik
-ExportDataset_user_1=Users and their properties
+ExportDataset_user_1=Użytkownicy i ich właściwości
 DomainUser=Domena użytkownika %s
 Reactivate=Przywraca
-CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=Ten formularz umożliwia utworzenie wewnętrznego użytkownika w firmie / organizacji. Aby utworzyć użytkownika zewnętrznego (klienta, dostawcę itp.), Użyj przycisku „Utwórz użytkownika Dolibarr” na karcie kontaktowej strony trzeciej.
+InternalExternalDesc=Wewnętrzny użytkownik <b> </b> to użytkownik będący częścią Twojej firmy / organizacji lub będący partnerem spoza Twojej organizacji, który może potrzebować więcej danych niż danych związanych z jego firmą (system uprawnień określi, co może lub może nie widzę ani nie robię). <br> Użytkownik zewnętrzny <b> </b> to klient, sprzedawca lub inna osoba, która musi przeglądać TYLKO dane dotyczące siebie (Tworzenie użytkownika zewnętrznego dla strony trzeciej można wykonać z rekordu kontaktu osoby trzeciej). <br> <br> W obu przypadkach należy przyznać uprawnienia do funkcji, których potrzebuje użytkownik.
 PermissionInheritedFromAGroup=Zezwolenie udzielone ponieważ odziedziczył od jednego z użytkowników grupy.
 Inherited=Odziedziczone
+UserWillBe=Utworzony użytkownik będzie
 UserWillBeInternalUser=Utworzony użytkownik będzie wewnętrzny użytkownik (ponieważ nie związane z konkretnym trzeciej)
 UserWillBeExternalUser=Utworzony użytkownik będzie zewnętrzny użytkownik (ponieważ związana z konkretnym trzeciej)
 IdPhoneCaller=ID dzwoniącego
 NewUserCreated=Użytkownik %s utworzony
 NewUserPassword=Zmiana hasła dla %s
-NewPasswordValidated=Your new password have been validated and must be used now to login.
+NewPasswordValidated=Twoje nowe hasło zostało potwierdzone i musi być teraz używane do logowania.
 EventUserModified=Użytkownik %s zmodyfikowany
 UserDisabled=Użytkownik %s wyłączony
 UserEnabled=Użytkownik %s aktywowany
@@ -94,7 +97,7 @@ NameToCreate=Nazwa kontrahenta do utworzenia
 YourRole=Twoje role
 YourQuotaOfUsersIsReached=Limitu aktywnych użytkowników został osiągnięty!
 NbOfUsers=Ilość użytkowników
-NbOfPermissions=No. of permissions
+NbOfPermissions=Liczba uprawnień
 DontDowngradeSuperAdmin=Tylko superadmin niższej wersji superadmin
 HierarchicalResponsible=Kierownik
 HierarchicView=Widok hierarchiczny
@@ -108,13 +111,15 @@ DisabledInMonoUserMode=Wyłączone w trybie konserwacji
 UserAccountancyCode=Kod księgowy użytkownika
 UserLogoff=Użytkownik wylogowany
 UserLogged=Użytkownik zalogowany
-DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
-DateEmploymentEnd=Employment End Date
-CantDisableYourself=You can't disable your own user record
-ForceUserExpenseValidator=Force expense report validator
-ForceUserHolidayValidator=Force leave request validator
-ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+DateOfEmployment=Data zatrudnienia
+DateEmployment=Zatrudnienie
+DateEmploymentstart=Data rozpoczęcia zatrudnienia
+DateEmploymentEnd=Data zakończenia zatrudnienia
+RangeOfLoginValidity=Zakres dat ważności logowania
+CantDisableYourself=Nie możesz wyłączyć własnego rekordu użytkownika
+ForceUserExpenseValidator=Wymuś walidator raportu z wydatków
+ForceUserHolidayValidator=Wymuś walidator prośby o opuszczenie
+ValidatorIsSupervisorByDefault=Domyślnie walidator jest opiekunem użytkownika. Pozostaw puste, aby zachować to zachowanie.
+UserPersonalEmail=Osobisty adres e-mail
+UserPersonalMobile=Osobisty telefon komórkowy
+WarningNotLangOfInterface=Ostrzeżenie, to jest główny język, którym mówi użytkownik, a nie język interfejsu, który wybrał. Aby zmienić język interfejsu widoczny dla tego użytkownika, przejdź do zakładki %s
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index bb7ff022723..28d79383aad 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -16,7 +16,7 @@ WEBSITE_ROBOT=Plik robota (robots.txt)
 WEBSITE_HTACCESS=Plik .htaccess witryny
 WEBSITE_MANIFEST_JSON=Plik manifest.json witryny
 WEBSITE_README=Plik README.md
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
+WEBSITE_KEYWORDSDesc=Wartości rozdziel przecinkami
 EnterHereLicenseInformation=Tu wprowadź metadane lub informacje licencyjne, które wypełnią plik README.md. Przy rozprowadzaniu Twej witryny jako szablonu, plik ten zostanie dołączony do pakietu tego szablonu.
 HtmlHeaderPage=Nagłówek HTML (tylko dla tej strony)
 PageNameAliasHelp=Nazwa lub alias strony. <br> Ten alias służy również do tworzenia adresu URL wspierającego SEO, gdy witrynę obsługuje web serwer (taki jak Apacke, Nginx, ...). Użyj przycisku „<strong>%s</strong>”, aby edytować ten alias.
@@ -42,25 +42,25 @@ ViewPageInNewTab=Zobacz stronę w nowej zakładce
 SetAsHomePage=Ustaw jako stronę domową
 RealURL=Prawdziwy adres URL
 ViewWebsiteInProduction=Zobacz stronę używając linków ze strony głównej
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+SetHereVirtualHost= <u> Użyj z Apache / NGinx / ... </u> <br> Utwórz na swoim serwerze internetowym (Apache, Nginx, ...) dedykowany wirtualny host z włączoną obsługą PHP i katalog główny na <br> <strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Przykład do użycia w konfiguracji hosta wirtualnego Apache:
 YouCanAlsoTestWithPHPS=<u> Używaj z wbudowanym serwerem PHP </u> <br>Gdy w środowisku rozwojowym preferujesz testowanie web strony z web serwerem wbudowanym w PHP (wymagane PHP 5.5 lub nowsze), to uruchamiaj<br> <strong> php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Uruchom swoją witrynę u innego dostawcy wystąpień Dolibarr</u><br>Jeśli nie masz dostępnego w internecie web serwera, takiego jak Apache lub NGinx, to możesz eksportować i importować swoją witrynę do innego wystąpienia Dolibarr u kogoś oferującego wystąpienia Dolibarr mające moduł Website w pełni zintegrowany z web serwerem. Listę niektórych dostawców wystąpień Dolibarr znajdziesz w <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Sprawdź także, czy host wirtualny ma uprawnienia <strong>%s</strong> do plików <br> <strong>%s</strong>
+CheckVirtualHostPerms=Sprawdź również, czy użytkownik wirtualnego hosta (na przykład dane www) ma <strong> %s </strong> uprawnienia do plików w <br> <strong> %s</strong>
 ReadPerm=Czytanie
 WritePerm=Zapis
 TestDeployOnWeb=Testuj/wdróż na web serwerze
 PreviewSiteServedByWebServer=<u>Podgląd %s w nowej zakładce.</u><br><br>%s będzie obsługiwana przez zewnętrzny web serwer (np. Apache, Nginx, IIS). Musisz zainstalować i skonfigurować taki web serwer, zanim wskazanie do katalogu:<br><strong>%s</strong><br>URL obsługiwany przez zewnętrzny web serwer:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Podgląd %s w nowej zakładce.</u><br><br>%s będzie obsługiwany przez wewnętrzny - zawarty w Dolibarr - web serwer, przez co żaden dodatkowy web serwer nie musi być instalowany/używany.<br>Niedogodnością takiego rozwiązania są adresy URL stron web, które wtedy rozpoczynając się od ścieżki Twego wystąpienia Dolibarr są przez to nieprzyjazne użytkownikowi.<br>Adres URL obsługiwany przez Dolibarr:<br><strong>%s</strong><br><br>By do obsługi tej web witryny używać zewnętrznego - wobec Twego wystąpienia Dolibarr, ale jednak na tym samym komputerze - web serwera, to musi on działać i być skonfigurowany do obsługi katalogu<br><strong>%s</strong><br> jako swego katalogu głównego. Zatem, w swym lokalnym rzeczywistym web serwerze (jak Apache, Nginx, IIS) dla każdej swej web witryny utwórz i skonfiguruj wirtualny web serwer, po czym podaj jego nazwę i kliknij na inny przycisk do podglądu.
+PreviewSiteServedByDolibarr= <u> Podgląd %s w nowej karcie. </u> <br> <br> Serwer %s będzie obsługiwany przez serwer Dolibarr, więc nie jest potrzebny żaden dodatkowy serwer WWW (taki jak Apache, Nginx, IIS) do zainstalowania. <br> Niedogodnością jest to, że adresy URL stron nie są przyjazne dla użytkownika i zaczynają się od ścieżki do Twojego Dolibarra. <br> URL podawane przez Dolibarr: <br> <strong> %s </strong> <br> <br> Aby korzystać z własnego serwera zewnętrznego internetowej, aby służyć tej strony internetowej, stworzenie wirtualnego hosta na serwerze WWW, które punkty na katalogu <br> <strong> %s </strong> <br> następnie wprowadź nazwę tego serwera wirtualnego we właściwościach tej witryny i kliknij łącze „Przetestuj / Wdróż w sieci”.
 VirtualHostUrlNotDefined=Adres URL wirtualnego hosta obsługiwanego przez zewnętrzny web serwer nie został zdefiniowany
 NoPageYet=Brak stron
 YouCanCreatePageOrImportTemplate=Możesz utworzyć nową stronę albo załadować pełny szablon witryny
 SyntaxHelp=Pomoc na temat określonych wskazówek dotyczących składni
 YouCanEditHtmlSourceckeditor=Możesz edytować kod źródłowy HTML używając przycisku „Źródło” w edytorze.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Możesz dołączyć kod PHP do tego źródła za pomocą tagów <strong> &lt;? php? &gt; </strong>. Dostępne są następujące zmienne globalne: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs, $ pagelangs. <br> <br> <span class="fa fa-bug"> </span> Możesz także dołączyć zawartość innej strony / kontenera o następującej składni: <br> <strong> a03900aindf7d31Contiaser? ? &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> Można zrobić przekierowanie do innej strony / pojemnik z następującą składnią (Uwaga: Nie Wyjście jakiejkolwiek zawartości przed przekierowaniem): <br> <strong> &lt; php redirectToContainer ( 'alias_of_container_to_redirect_to'); ? &gt; </strong> <br> <br> <span class="fa fa-link"> </span> Aby dodać link do innej strony, użyj składni: <br> <strong> &lt;a href = "alias_of_page_to_link_to.php" &gt;mylink&lt;a&gt; </strong> <br> <br> <span class="fa fa-download"> </span> Aby umieścić link do pobrania </strong> <strong> pliku zapisanego w dokumentach <strong> </strong>, użyj <strong> document.php </strong> wrapper: <br> Przykład, dla pliku w dokumentach / ecm (należy zarejestrować), składnia jest następująca: a0342fcccfdae19bz039 = <br> ] nazwa_pliku.ext "&gt; </strong> <br> Dla pliku w dokumentach / mediach (otwarty katalog dla publicznego dostępu) składnia jest następująca: <br> <strong> a03900dfred31ecz "/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt; </strong> <br> W przypadku pliku udostępnionego za pomocą linku do udostępniania (otwarty dostęp za pomocą klucza współdzielenia hashf pliku: </strong> <br>), dla pliku udostępnionego za pomocą linku do udostępniania (otwarty dostęp przy użyciu klucza współdzielenia hashf pliku: </strong> <br>). /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> Aby to </strong> <strong> obrazu zapisane do tych <strong> dokumentów </strong>, za pomocą przycisków <strong> viewimage.php </strong> owijający: <br> przykład w przypadku obrazu do dokumentów / media (otwarte katalog dla dostępu publicznego), składnia jest następująca: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [katalog_względny /] nazwa_pliku.ext" a0065c2c071 "a0065c2c071" a0087c2c071
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource2=W przypadku obrazu udostępnionego za pomocą linku do udostępniania (otwarty dostęp przy użyciu klucza współdzielenia skrótu pliku) składnia jest następująca: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." a0012c7dcbe087c65z071
+YouCanEditHtmlSourceMore= <br> Więcej przykładów kodu HTML lub dynamicznego dostępnych w <a href="%s" target="_blank"> dokumentacji wiki </a> <br>.
 ClonePage=Powiel stronę/pojemnik
 CloneSite=Duplikuj stronę
 SiteAdded=Dodano witrynę
@@ -80,7 +80,7 @@ BlogPost=Post na blogu
 WebsiteAccount=Konto witryny
 WebsiteAccounts=Konta witryny
 AddWebsiteAccount=Utwórz konto witryny
-BackToListForThirdParty=Back to list for the third-party
+BackToListForThirdParty=Powrót do listy dla firmy zewnętrznej
 DisableSiteFirst=Najpierw wyłącz witrynę
 MyContainerTitle=Tytuł mojej witryny
 AnotherContainer=W ten sposób można dołączyć zawartość innej web strony/pojemnika (może pojawić się błąd, gdy włączysz obsługę kodu dynamicznego a wbudowany podrzędny pojemnik nie istnieje)
@@ -88,7 +88,7 @@ SorryWebsiteIsCurrentlyOffLine=Przepraszamy, ta witryna jest obecnie niedostępn
 WEBSITE_USE_WEBSITE_ACCOUNTS=Włącz tabelę kont witryny
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Włącz tabelę kont witryny (login/hasło) dla każdej witryny/strony trzeciej
 YouMustDefineTheHomePage=Najpierw musisz zdefiniować domyślną stronę główną
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContentFuture=Ostrzeżenie: Tworzenie strony internetowej poprzez importowanie zewnętrznej strony internetowej jest zarezerwowane dla doświadczonych użytkowników. W zależności od złożoności strony źródłowej, wynik importu może różnić się od oryginału. Również jeśli strona źródłowa używa typowych stylów CSS lub konfliktu JavaScript, może to zakłócić wygląd lub funkcje edytora Witryny podczas pracy na tej stronie. Ta metoda jest szybszym sposobem tworzenia strony, ale zaleca się utworzenie nowej strony od podstaw lub na podstawie sugerowanego szablonu strony. <br> Należy również zauważyć, że wbudowany edytor może nie działać poprawnie, gdy jest używany na przechwyconej stronie zewnętrznej.
 OnlyEditionOfSourceForGrabbedContent=Po zaciągnięciu zawartości z zewnętrznej web witryny możliwa jest jedynie edycja kodu źródłowego HTML
 GrabImagesInto=Przechwyć także obrazy znalezione w CSS i na stronie.
 ImagesShouldBeSavedInto=Obrazy powinny być zapisane w katalogu
@@ -100,7 +100,7 @@ EmptyPage=Pusta strona
 ExternalURLMustStartWithHttp=Zewnętrzny adres URL musi zaczynać się od http:// lub https://
 ZipOfWebsitePackageToImport=Prześlij plik Zip pakietu szablonu witryny
 ZipOfWebsitePackageToLoad=lub Wybierz jakiś dostępny wbudowany pakiet szablonu web witryny
-ShowSubcontainers=Show dynamic content
+ShowSubcontainers=Pokaż zawartość dynamiczną
 InternalURLOfPage=Wewnętrzny adres URL strony
 ThisPageIsTranslationOf=Ta strona/pojemnik to tłumaczenie
 ThisPageHasTranslationPages=Ta strona/pojemnik ma tłumaczenie
@@ -115,7 +115,7 @@ MyWebsitePages=Strony mej witryny
 SearchReplaceInto=Szukaj | Zamień na
 ReplaceString=Nowy łańcuch
 CSSContentTooltipHelp=Tu wprowadź kod CSS. W celu uniknięcia konfliktu tego kodu z kodem CSS aplikacji, każdą wprowadzoną tu deklarację poprzedź prefiksem .bodywebsite. Na przykład:<br><br>#mycssselector, input.myclass:hover { ... }<br>zamień na <br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Uwaga: Jeżeli masz duży plik z deklaracjami bez tego prefiksu, to możesz użyć 'lessc' do ich konwersji na nowe, poprzedzone prefiksem.
-LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+LinkAndScriptsHereAreNotLoadedInEditor=Ostrzeżenie: ta zawartość jest wyprowadzana tylko wtedy, gdy witryna jest uzyskiwana z serwera. Nie jest używany w trybie edycji, więc jeśli chcesz załadować pliki javascript również w trybie edycji, po prostu dodaj swój tag „script src = ...” do strony.
 Dynamiccontent=Próbka web strony z dynamiczną zawartością
 ImportSite=Załaduj szablon witryny
 EditInLineOnOff=Tryb „Edytuj w linii” jest %s
@@ -123,17 +123,25 @@ ShowSubContainersOnOff=Tryb wykonywania „zawartości dynamicznej” jest %s
 GlobalCSSorJS=Globalny plik CSS/JS/Header witryny
 BackToHomePage=Powrót do strony głównej...
 TranslationLinks=Linki do tłumaczeń
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
+YouTryToAccessToAFileThatIsNotAWebsitePage=Próbujesz uzyskać dostęp do strony, która nie jest dostępna. <br> (ref = %s, typ = %s, status = %s)
 UseTextBetween5And70Chars=Aby uzyskać dobre praktyki SEO, użyj tekstu od 5 do 70 znaków
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+MainLanguage=Główny język
+OtherLanguages=Inne języki
+UseManifest=Podaj plik manifest.json
+PublicAuthorAlias=Pseudonim autora publicznego
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Dostępne języki są zdefiniowane we właściwościach witryny
+ReplacementDoneInXPages=Zamiana wykonana na stronach lub kontenerach %s
 RSSFeed=RSS Feed
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+RSSFeedDesc=Korzystając z tego adresu URL, możesz uzyskać kanał RSS z najnowszymi artykułami typu „post na blogu”
+PagesRegenerated=%s strony / kontenery zostały ponownie wygenerowane
+RegenerateWebsiteContent=Zregeneruj pliki pamięci podręcznej witryny internetowej
+AllowedInFrames=Dozwolone w ramkach
+DefineListOfAltLanguagesInWebsiteProperties=Zdefiniuj listę wszystkich dostępnych języków we właściwościach witryny internetowej.
+GenerateSitemaps=Wygeneruj plik mapy witryny internetowej
+ConfirmGenerateSitemaps=Jeśli potwierdzisz, usuniesz istniejący plik mapy witryny ...
+ConfirmSitemapsCreation=Potwierdź wygenerowanie mapy witryny
+SitemapGenerated=Wygenerowano mapę witryny
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/pl_PL/zapier.lang b/htdocs/langs/pl_PL/zapier.lang
index bbad7895588..da9769a9faa 100644
--- a/htdocs/langs/pl_PL/zapier.lang
+++ b/htdocs/langs/pl_PL/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
-ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
-ZapierDescription=Interface with Zapier
+ModuleZapierForDolibarrName = Zapier dla Dolibarr
+ModuleZapierForDolibarrDesc = Zapier dla modułu Dolibarr
+ZapierForDolibarrSetup=Konfiguracja Zapier dla Dolibarr
+ZapierDescription=Interfejs z Zapier
+ZapierAbout=O module Zapier
+ZapierSetupPage=Nie ma potrzeby instalacji po stronie Dolibarr, aby używać Zapier. Jednak musisz wygenerować i opublikować pakiet na Zapier, aby móc używać Zapier z Dolibarr. Zobacz dokumentację <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> na tej stronie wiki </a>.
diff --git a/htdocs/langs/pt_AO/admin.lang b/htdocs/langs/pt_AO/admin.lang
new file mode 100644
index 00000000000..cac0d063f48
--- /dev/null
+++ b/htdocs/langs/pt_AO/admin.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - admin
+ShowBugTrackLink=Show link "<strong>%s</strong>"
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index e4b7f6b2454..b169f140496 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -11,10 +11,14 @@ ACCOUNTING_EXPORT_FORMAT=Selecione o formato do arquivo
 ACCOUNTING_EXPORT_ENDLINE=Selecione o tipo de retorno do frete
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome do arquivo
 DefaultForService=Padrão para serviço
+ProductForThisThirdparty=Produto para este terceiro
+ServiceForThisThirdparty=Serviço para este terceiro
 CantSuggest=Não posso sugerir
 AccountancySetupDoneFromAccountancyMenu=A maioria das configurações da Contabilidade é feita a partir do menu %s
+ConfigAccountingExpert=Configuração do módulo de contabilidade (dupla entrada)
 Journalization=Lançamento no Livro
 Chartofaccounts=Plano de contas
+ChartOfSubaccounts=Plano de contas individuais
 InvoiceLabel=Rótulo da fatura
 OverviewOfAmountOfLinesNotBound=Visão geral do montante das linhas não vinculadas a uma conta contábil
 OverviewOfAmountOfLinesBound=Visão geral do montante das linhas já vinculadas a uma conta contábil
@@ -22,6 +26,8 @@ DeleteCptCategory=Remover conta contábil do grupo
 ConfirmDeleteCptCategory=Tem certeza de que deseja remover essa conta contábil do grupo de contas contábeis?
 JournalizationInLedgerStatus=Situação do registro do diário
 GroupIsEmptyCheckSetup=O grupo está vazio, verifique a configuração do grupo de contabilidade personalizado
+AccountantFiles=Exportar documentos de origem
+VueByAccountAccounting=Ver por conta contábil
 MainAccountForCustomersNotDefined=Conta contábil principal para clientes não definidos na configuração
 MainAccountForUsersNotDefined=Conta contábil principal para usuários não definidos na configuração
 MainAccountForVatPaymentNotDefined=Conta contábil principal para o pagamento do IVA não definido na configuração
@@ -77,7 +83,6 @@ InvoiceLinesDone=Linhas das faturas vinculadas
 ExpenseReportLines=Relatórios de linhas de despesas obrigatórias
 ExpenseReportLinesDone=Relatórios de linhas de despesas vinculadas
 IntoAccount=Vincular linha com conta contábil
-TotalForAccount=Total para conta contábil
 LineId=Linha da ID
 Processing=Processando
 EndProcessing=Processo foi finalizado.
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 74da419d9fb..eb7f48d64ed 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -33,6 +33,7 @@ UnlockNewSessions=Remover Bloqueio de Conexão
 YourSession=Sua Sessão
 Sessions=Sessões de Usuários
 WebUserGroup=Servidor Web para usuário/grupo
+PermissionsOnFiles=Permissões em arquivos
 PermissionsOnFilesInWebRoot=Permissões em arquivos no diretório raiz da web
 PermissionsOnFile=Permissões no arquivo %s
 NoSessionFound=Sua configuração do PHP parece não permitir listar as sessões ativas. O diretório usado para salvar sessões (<b>%s</ b>) pode estar protegido (por exemplo, pelas permissões do sistema operacional ou pela diretiva PHP "open_basedir").
@@ -50,10 +51,13 @@ InternalUsers=Usuários Internos
 ExternalUsers=Usuários Externos
 UploadNewTemplate=Carregar novo(s) tema(s)
 FormToTestFileUploadForm=Formulário para teste de upload de arquivo
+ModuleMustBeEnabled=O módulo/aplicação <b>%s</b> deve ser ativado
+ModuleIsEnabled=O modulo/aplicação <b>%s</b> foi ativado
 IfModuleEnabled=OBS: Sim só é eficaz se o módulo <b>%s</b> estiver ativado
 RemoveLock=Remove/renomeia o arquivo <b> %s </b> se existir, para permitir o uso da ferramenta atualização/instalação.
 RestoreLock=Restaura o arquivo <b>%s</b>, com permissão de leitura, para desabilitar qualquer serviço de atualização/instalação
 SecuritySetup=Conf. de Segurança
+PHPSetup=Configuração do PHP
 SecurityFilesDesc=Defina aqui as opções relacionadas à segurança sobre o carregamento (upload) de arquivos.
 ErrorModuleRequirePHPVersion=Erro, este módulo requer uma versão %s ou superior de PHP
 ErrorModuleRequireDolibarrVersion=Erro, este módulo requer uma versão %s ou superior do Dolibarr
@@ -65,12 +69,14 @@ DisableJavascript=Desativar as funções Javascript e AJax
 DisableJavascriptNote=Obs.: Para propósitos de teste ou depuração. Para otimização de cegos ou navegadores de texto, é preferível usar a configuração do perfil do usuário
 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.
+DelaiedFullListToSelectContact=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação de contatos. <br> Isso pode aumentar o desempenho se você tiver um grande número de contatos, mas é menos conveniente.
 NumberOfBytes=Número de Bytes
 SearchString=Seqüência de pesquisa
 NotAvailableWhenAjaxDisabled=Indisponível quando o Ajax esta desativado
 AllowToSelectProjectFromOtherCompany=No documento de um terceiro, pode-se escolher um projeto conectado a outro terceiro
 UsePreviewTabs=Usar previsão de digitação na tecla 'tab'
 ShowPreview=Mostrar Previsão
+ShowHideDetails=Mostrar-ocultar detalhes
 PreviewNotAvailable=Previsão Indisponível
 ThemeCurrentlyActive=Tema Ativo
 MySQLTimeZone=Timezone Mysql (do servidor sql)
@@ -122,6 +128,8 @@ SystemToolsAreaDesc=Essa área dispõem de funções administrativas. Use esse m
 Purge=Purgar (apagar tudo)
 PurgeAreaDesc=Esta página permite deletar todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b>%s</b>). Este recurso é fornecido como uma solução alternativa aos usuários cujo a instalação esteja hospedado num servidor que impeça o acesso as pastas onde os arquivos gerados pelo Dolibarr são armazenados, para excluí-los.
 PurgeDeleteLogFile=Excluir os arquivos de registro, incluindo o <b>%s</b> definido pelo módulo Syslog (não há risco de perda de dados)
+PurgeDeleteTemporaryFiles=Exclua todos os arquivos de log e temporários (sem risco de perda de dados). O parâmetro pode ser 'tempfilesold', 'logfiles' ou ambos 'tempfilesold + logfiles'. Nota: A exclusão de arquivos temporários é feita apenas se o diretório temporário foi criado há mais de 24 horas.
+PurgeDeleteTemporaryFilesShort=Excluir arquivos de registro e temporários
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os arquivos do diretório <b>%s</b>. Isto irá excluir todos documentos (Terceiros, faturas, ...), arquivos carregados no módulo ECM, Backups e arquivos temporários
 PurgeRunNow=Purgar(Apagar) Agora
 PurgeNothingToDelete=Sem diretório ou arquivos para excluir
@@ -179,6 +187,7 @@ BoxesAvailable=Widgets disponíveis
 BoxesActivated=Widgets ativados
 ActivateOn=Ativar
 ActiveOn=Ativa
+ActivatableOn=Ativável em
 SourceFile=Arquivo Fonte
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript não estiver desativado
 UsedOnlyWithTypeOption=Usado por alguns opção agenda única
@@ -197,6 +206,7 @@ OfficialWebHostingService=Serviços de hospedagem web referenciados (hospedagem
 ReferencedPreferredPartners=Parceiro preferido
 ExternalResources=Fontes externas
 SocialNetworks=Redes Sociais
+SocialNetworkId=ID da rede social
 ForDocumentationSeeWiki=Documentos para usuários e desenvolvedores (Doc, FAQs...), <br>de uma olhada no Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Para outras questões/ajudas, você pode usar o forum do Dolibar:<br><b><a href="%s" target="_blank">%s</a></b>
 CurrentMenuHandler=Gestor atual de menu
@@ -248,8 +258,6 @@ LastActivationAuthor=Último autor da ativação
 LastActivationIP=Último IP de ativação
 UpdateServerOffline=Atualização de servidor off-line
 WithCounter=Gerenciar um contador
-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 em n caracteres <br> <b> {cccc000} </b> o código do cliente em n caracteres é seguido por um contador dedicado ao cliente. Este contador dedicado ao cliente é reiniciado ao mesmo tempo que o contador global. <br> <b> {tttt} </b> O código de tipo de terceiros em n caracteres (consulte o menu Início - Configuração - Dicionário - Tipos de terceiros) . Se você adicionar esta etiqueta, o contador será diferente para cada tipo de terceiro.<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=<u>Exemplo com o 99º %s do terceiro ACompanhia, com data 2007-01-31:</u><br>
 GenericMaskCodes4b=Ex: CLI{dd}{mm}{yy}.{000} -> <b>CLI280715.001</b><br>
@@ -294,6 +302,7 @@ 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
 GetSecuredUrl=Conseguir URL calculada
+ButtonHideUnauthorized=Ocultar botões de ação não autorizados também para usuários internos (caso contrário, acinzentados)
 OldVATRates=Taxa de ICMS antiga
 NewVATRates=Taxa de ICMS nova
 PriceBaseTypeToChange=Modificar os preços com base no valor de referência defino em
@@ -318,7 +327,6 @@ ComputedpersistentDesc=Campos extra computados serão armazenados no banco de da
 ExtrafieldParamHelpselect=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> código3, valor3 <br>...<br><br> Para que a lista dependa de outra lista de atributos complementares: <br> 1, valor1 | <i>opções_ pai_list_code</i> : parent_key <br> 2, valor2 | <i>opções_ pai_list_code</i> : parent_key <br><br> Para ter a lista dependendo de outra lista: <br> 1, valor1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpchkbxlst=Lista de valores vem de uma tabela <br> Sintaxe: table_name: label_field: id_field :: filter <br> Exemplo: c_typent: libelle: id :: filter <br><br> filtro pode ser um teste simples (por exemplo, ativo = 1) para exibir apenas o valor ativo <br> Você também pode usar $ID$ no filtro que é o ID atual do objeto atual <br> Para fazer um SELECT no filtro use $SEL$ <br> se você quiser filtrar em extrafields use a sintaxe extra.fieldcode = ... (onde o código de campo é o código do campo extra) <br><br> Para que a lista dependa de outra lista de atributos complementares: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Para ter a lista dependendo de outra lista: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
 ExtrafieldParamHelpSeparator=Mantenha em branco para um separador simples<br>Defina como 1 para um separador de recolhimento (aberto por padrão para nova sessão e, em seguida, o status é mantido para cada sessão do usuário)<br> Defina como 2 para um separador de recolhimento (recolhido por padrão para nova sessão e, em seguida, o status é mantido antes de cada sessão do usuário)
 LibraryToBuildPDF=Biblioteca usada para a geração de PDF
 LocalTaxDesc=Alguns países podem aplicar dois ou três impostos em cada linha da fatura. Se este for o caso, escolha o tipo para o segundo e terceiro imposto e sua taxa. Tipo possível são: <br> 1: imposto local aplicável a produtos e serviços sem IVA (a taxa local é calculada sobre o valor sem impostos) <br> 2: imposto local aplicável a produtos e serviços, incluindo IVA (a taxa local  é calculada no montante + imposto principal) <br> 3: imposto local aplicável a produtos sem IVA (a taxa local é calculada sobre o valor sem impostos) <br> 4: imposto local aplicável a produtos, incluindo IVA (a taxa local é calculada sobre o valor + IVA principal) <br> 5: imposto local aplicável a serviços sem IVA (a taxa local é calculado sobre o valor sem impostos) <br> 6: imposto local aplicável a serviços, incluindo IVA (a taxa local  é calculada sobre o valor + imposto)
@@ -387,6 +395,7 @@ Module40Name=Vendedores
 Module40Desc=Fornecedores e gerenciamento de compras (pedidos e cobrança de faturas de fornecedores)
 Module42Name=Notas de depuração
 Module42Desc=Recursos de registro (arquivo, syslog, ...). Tais registros são para propósitos técnicos/debug.
+Module43Name=Barra de depuração
 Module49Desc=Gestor de Editores
 Module51Name=Cartas Massivos
 Module51Desc=Gestão de correspondência do massa
@@ -448,11 +457,11 @@ Module2660Name=Chamar ServiçosWeb (cliente SOAP)
 Module2660Desc=Ativar o cliente de serviços da Web Dolibarr (pode ser usado para enviar dados/solicitações para servidores externos. Apenas pedidos de compra são suportados no momento.)
 Module2700Desc=Use o serviço online Gravatar (www.gravatar.com) para mostrar fotos de usuários/membros (encontrados com seus e-mails). Precisa de acesso à Internet
 Module2900Desc=Capacidade de conversão com o GeoIP Maxmind
+Module3400Name=Redes Sociais
 Module4000Name=RH
 Module4000Desc=Gerenciamento de recursos humanos (gerenciamento do departamento, contratos dos funcionários e benefícios)
 Module5000Name=Multi-Empresas
 Module5000Desc=Permite gerenciar várias empresas
-Module6000Name=Fluxo de Trabalho
 Module10000Desc=Crie sites (públicos) com um editor WYSIWYG. Este é um CMS orientado a webmasters ou desenvolvedores (é melhor conhecer a linguagem HTML e CSS). Basta configurar seu servidor da Web (Apache, Nginx, ...) para apontar para o diretório Dolibarr dedicado para colocá-lo online na Internet com seu próprio nome de domínio.
 Module20000Name=Deixar o gerenciamento de solicitações
 Module20000Desc=Definir e rastrear solicitações de saída de funcionários
@@ -580,7 +589,6 @@ 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=Estender o acesso a todos os terceiros (não apenas terceiros para os quais esse usuário é um representante de vendas). <br> Não é eficaz para usuários externos (sempre limitados a eles próprios para propostas, pedidos, faturas, contratos, etc.). <br> Não é eficaz para projetos (apenas regras sobre permissões de projeto, visibilidade e atribuição de tarefas).
 Permission271=Ler CA
 Permission272=Ler Faturas
 Permission273=Emitir Fatura
@@ -611,6 +619,8 @@ Permission402=Criar/Modificar Descontos
 Permission403=Validar Descontos
 Permission404=Excluir Descontos
 Permission430=Use a barra de depuração
+Permission511=Ler pagamentos de salários (seus e subordinados)
+Permission517=Ler pagamentos de salários de todos
 Permission519=Salários de exportação
 Permission520=Leia Empréstimos
 Permission522=Criar / modificar empréstimos
@@ -622,9 +632,19 @@ Permission532=Criar/Modificar Serviços
 Permission534=Excluir Serviços
 Permission536=Ver/gerenciar Serviços Ocultos
 Permission538=Exportar Serviços
+Permission561=Ler ordens de pagamento por transferência de crédito
+Permission562=Criar / alterar ordem de pagamento por transferência de crédito
+Permission563=Enviar / Transmitir ordem de pagamento por transferência de crédito
+Permission564=Registrar débitos / rejeições de transferência de crédito
+Permission601=Ler adesivos
+Permission602=Criar / alterar adesivos
+Permission609=Excluir adesivos
 Permission650=Leia as listas de materiais
 Permission651=Criar / atualizar listas de materiais
 Permission652=Excluir listas de materiais
+Permission660=Ler pedido de fabricação (MO)
+Permission661=Criar / Atualizar Pedido de Fabricação (MO)
+Permission662=Excluir Ordem de Fabricação (MO)
 Permission701=Ler Doações
 Permission702=Criar/Modificar Doações
 Permission703=Excluir Doações
@@ -634,6 +654,8 @@ Permission773=Excluir relatórios de despesas
 Permission774=Leia todos os relatórios de despesas (mesmo para o utilizadores Não subordinados)
 Permission775=Aprovar os relatórios de despesas
 Permission776=Relatórios de despesas pagas
+Permission777=Ler relatórios de despesas de todos
+Permission778=Criar / alterar relatórios de despesas de todos
 Permission779=Exportar - Relatórios de despesas
 Permission1001=Ler Estoques
 Permission1002=Criar/Modificar Estoques
@@ -656,7 +678,9 @@ Permission1185=Aprovar pedidos
 Permission1186=Encomenda de pedidos
 Permission1187=Reconhecer o recebimento de pedidos de compra
 Permission1188=Excluir pedidos
+Permission1189=Marque / desmarque a recepção de um pedido de compra
 Permission1190=Aprovar pedidos de compra (segunda aprovação)
+Permission1191=Exportar pedidos de fornecedores e seus atributos
 Permission1201=Conseguir Resultado de uma Exportação
 Permission1202=Criar/Modificar uma Exportação
 Permission1231=Ler faturas de fornecedores
@@ -667,6 +691,8 @@ Permission1236=Exportar faturas, atributos e pagamentos do fornecedor
 Permission1251=Rodar(run) Importações Massivas de Dados Externos para o Banco de Dados (carregamento de dados)
 Permission1321=Exportar Faturas de Clientes, Atributos e Pagamentos
 Permission1322=Reabrir uma nota paga
+Permission1521=Ler documentos
+Permission1522=Excluir documentos
 Permission2401=Ler ações (eventos ou tarefas) vinculadas à sua conta de usuário (se o proprietário do evento ou apenas tiver sido atribuído a)
 Permission2402=Criar / modificar ações (eventos ou tarefas) vinculadas à sua conta de usuário (se for proprietário do evento)
 Permission2403=Excluir ações (eventos ou tarefas) vinculadas à sua conta de usuário (se for proprietário do evento)
@@ -681,6 +707,7 @@ Permission2515=Configurar Diretórios dos Documentos
 Permission2801=Usar cliente FTP no modo leitura (somente navegador e baixar)
 Permission2802=Usar cliente FTP no modo escrita (deletar ou upload de arquivos)
 Permission3200=Leia eventos arquivados e impressões digitais
+Permission3301=Gerar novos módulos
 Permission4001=Visualizar funcionários
 Permission4002=Criar funcionários
 Permission4003=Excluir funcionários
@@ -700,8 +727,13 @@ Permission23001=Ler Tarefas Agendadas
 Permission23002=Criar/Atualizar Tarefas Agendadas
 Permission23003=Excluir Tarefas Agendadas
 Permission23004=Executar Tarefas Agendadas
+Permission50101=Ponto de venda de uso (SimplePOS)
+Permission50151=Ponto de venda de uso (TakePOS)
 Permission50201=Ler Transações
 Permission50202=Importar Transações
+Permission50330=Leia objetos de Zapier
+Permission50331=Criar / atualizar objetos de Zapier
+Permission50332=Excluir objetos de Zapier
 Permission50401=Vincular produtos e faturas com contas contábeis
 Permission50411=Ler operações no livro de registros
 Permission50412=Gravar/ edirar operações no livro de registros
@@ -723,6 +755,17 @@ Permission63001=Ler recursos
 Permission63002=Criar/Modificar recursos
 Permission63003=Excluir recursos
 Permission63004=Conectar os recursos aos eventos da agenda
+Permission64001=Permitir impressão direta
+Permission67000=Permitir impressão de recibos
+Permission68001=Ler o relatório intracomm
+Permission68002=Criar / alterar relatório intracomm
+Permission68004=Excluir relatório intracomm
+Permission941601=Ler recibos
+Permission941602=Criar e modificar recibos
+Permission941603=Validar recibos
+Permission941604=Enviar recibos por e-mail
+Permission941605=Exportar recibos
+Permission941606=Excluir recibos
 DictionaryCompanyType=Tipos de terceiros
 DictionaryCompanyJuridicalType=Entidades jurídicas de terceiros
 DictionaryProspectLevel=Nível potencial de prospecção para empresas
@@ -753,6 +796,8 @@ DictionaryMeasuringUnits=Unidades de Medição
 DictionarySocialNetworks=Redes Sociais
 DictionaryProspectStatus=Status em potencial para empresas
 DictionaryProspectContactStatus=Status do cliente potencial para contatos
+DictionaryTransportMode=Relatório intracomm - modo de transporte
+TypeOfUnit=Tipo de unidade
 SetupSaved=Configurações Salvas
 SetupNotSaved=Configuração não salva
 BackToModuleList=Voltar à lista do módulo
@@ -781,6 +826,7 @@ 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
 ValueOfConstantKey=Valor de uma constante de configuração
+ConstantIsOn=A opção %s está ativada
 NbOfDays=Número de dias
 CurrentNext=Atual/Próxima
 Offset=Compensar
@@ -813,6 +859,7 @@ MessageOfDay=Mensagem do dia
 MessageLogin=Mensagem da página de login
 LoginPage=Página de login
 PermanentLeftSearchForm=Formulário permanente de pesquisa no menu esquerdo
+EnableMultilangInterface=Habilitar suporte multilíngue para relacionamentos com clientes ou fornecedores
 EnableShowLogo=Mostrar o logotipo da empresa no menu
 CompanyInfo=Empresa / Organização
 CompanyIds=Identidades da empresa / organização
@@ -837,11 +884,13 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Relatório de despesas para aprovar
 Delays_MAIN_DELAY_HOLIDAYS=Solicitações de Licenças para aprovar
 SetupDescription2=As duas seções a seguir são obrigatórias (as duas primeiras entradas no menu de configuração):
 SetupDescription5=Outras entradas do menu de configuração gerenciam parâmetros opcionais.
-LogEvents=Auditoría de segurança dos eventos
+AuditedSecurityEvents=Eventos de segurança que são auditados
+NoSecurityEventsAreAduited=Nenhum evento de segurança é auditado. Você pode habilitá-los no menu %s
 Audit=Auditoría
 InfoOS=Sobre o SO
 InfoDatabase=Sobre o banco de dados
 InfoPerf=Sobre Desempenhos
+InfoSecurity=Sobre Segurança
 BrowserOS=Navegador OS
 ListOfSecurityEvents=Lista de eventos de segurança do Dolibarr
 SecurityEventsPurged=Eventos de segurança foram purgados(apagados)
@@ -882,12 +931,13 @@ RestoreDesc2=Restaure o arquivo de backup (arquivo zip, por exemplo) do diretór
 RestoreDesc3=Restaure a estrutura do banco de dados e os dados de um arquivo de despejo de backup no banco de dados da nova instalação do Dolibarr ou no banco de dados desta instalação atual ( <b>%s</b> ). Atenção, assim que a restauração for concluída, você deverá usar um login / senha, que existiu a partir do momento / instalação do backup para se conectar novamente. <br> Para restaurar um banco de dados de backup nesta instalação atual, você pode seguir este assistente.
 RestoreMySQL=Importar MySQL
 ForcedToByAModule=Essa Regra é forçada para <b>%s</b> by um módulo ativado
+ValueIsForcedBySystem=Este valor foi forçado pelo sistema. Não é permito alterar.
 PreviousArchiveFiles=Arquivos existentes
 RunningUpdateProcessMayBeRequired=A execução do processo de atualização parece ser necessária (a versão do programa %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
 DownloadMoreSkins=Mais skins para baixar
-SimpleNumRefModelDesc=Retorna o número de referência com o formato %syymm-nnnn onde yy é ano, mm é mês e nnnn é sequencial sem reset
+SimpleNumRefModelDesc=Retorna o número de referência no formato %s yymm-nnnn onde yy é o ano, mm é o mês e nnnn é um número de incremento automático sequencial sem redefinição
 ShowProfIdInAddress=Mostrar ID profissional com endereços
 ShowVATIntaInAddress=Ocultar o número de IVA intracomunitário com endereços
 MeteoStdModEnabled=Modo padrão habilitado
@@ -899,7 +949,7 @@ ExternalAccess=Acesso Externo/Internet
 MAIN_PROXY_USE=Use um servidor proxy (caso contrário, o acesso é direto à internet)
 MAIN_PROXY_HOST=Servidor proxy: nome/endereço
 MAIN_PROXY_USER=Servidor Proxy: Login/Usuário
-DefineHereComplementaryAttributes=Defina aqui quaisquer atributos adicionais/personalizados que você deseja incluir: %s
+DefineHereComplementaryAttributes=Definir quaisquer atributos adicionais / personalizados que devem ser adicionados a: %s
 ExtraFieldsLinesRec=Atributos complementares (linhas dos temas das faturas)
 ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas de encomenda)
 ExtraFieldsThirdParties=Atributos Complementares (Terceiros)
@@ -922,6 +972,7 @@ NewTranslationStringToShow=Nova variável de tradução a ser exibida
 OriginalValueWas=A tradução original foi sobrescrita. O valor original era:<br><br>%s
 TransKeyWithoutOriginalValue=Você forçou uma nova tradução para a chave de tradução ' <strong>%s</strong> ' que não existe em nenhum arquivo de idioma
 TitleNumberOfActivatedModules=Módulos ativados
+TotalNumberOfActivatedModules=Módulos ativados: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Você pelo menos deve ativar 1 módulo
 YesInSummer=Sim em verão
 OnlyFollowingModulesAreOpenedToExternalUsers=Observe que apenas os módulos a seguir estão disponíveis para usuários externos (independentemente das permissões de tais usuários) e somente se as permissões forem concedidas: <br>
@@ -930,14 +981,17 @@ ConditionIsCurrently=Condição é atualmente %s
 YouUseBestDriver=Você usa o driver %s, que é o melhor driver atualmente disponível.
 NbOfObjectIsLowerThanNoPb=Você tem apenas %s %s no banco de dados. Isso não requer nenhuma otimização específica.
 SearchOptim=Procurar Otimização
+YouHaveXObjectUseSearchOptim=Você tem %s %s no banco de dados. Você pode adicionar a constante %s a 1 em Home-Setup-Other. Limite a pesquisa ao início de strings, o que possibilita que o banco de dados use índices, e você deve obter uma resposta imediata.
 YouHaveXObjectAndSearchOptimOn=Você tem %s %s no banco de dados e a constante %s é definida como 1 em Home - Setup - Other
 PHPModuleLoaded=O componente PHP 1 %s está carregado
 PreloadOPCode=O OPCode pré-carregado está em uso
 AddRefInList=Mostrar ref. Cliente / fornecedor lista de informações (lista de seleção ou caixa de combinação) e a maior parte do hiperlink. <br> Terceiros aparecerão com um formato de nome "CC12345 - SC45678 - Empresa X." em vez de "Empresa X.".
 AddAdressInList=Exibir lista de informações de endereço do cliente / fornecedor (lista de seleção ou caixa de combinação) <br> Terceiros aparecerão com um formato de nome de "Empresa X. -  Rua tal, n°:21, sala: 123456, Cidade/Estado - Brasil" em vez de "Empresa X".
+AddEmailPhoneTownInContactList=Exibir e-mail de contato (ou telefones, se não definido) e lista de informações da cidade (lista de seleção ou combobox). <br> Os contatos aparecerão com o formato de nome "Dupond Durand - dupond.durand@email.com - Paris" ou "Dupond Durand - 06 07 59 65 66 - Paris "em vez de" Dupond Durand ".
 FillThisOnlyIfRequired=Exemplo: +2 (Preencha somente se compensar o problema do timezone é experiente)
 NumberingModules=Modelos de numeração
 DocumentModules=Modelos de documentos
+PasswordGenerationStandard=Retornar uma senha gerada de acordo com o algoritmo Dolibarr interno: %s caracteres contendo números compartilhados e caracteres em minúsculos.
 PasswordGenerationPerso=Retornar uma senha de acordo com a configuração definida para a sua personalidade.
 PasswordPatternDesc=Descrição do padrão de senha
 UsersSetup=Configurações de módulo de usuários
@@ -1010,6 +1064,7 @@ AdherentMailRequired=O e-mail necessá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
 VisitorCanChooseItsPaymentMode=O visitante pode escolher entre os modos de pagamento disponíveis
 MEMBER_REMINDER_EMAIL=Ativar lembrete automático <b>por e-mail</b> de assinaturas expiradas. Nota: O módulo <strong>%s</strong> deve estar ativado e configurado corretamente para enviar lembretes.
+MembersDocModules=Modelos de documentos para documentos gerados a partir de registro de membro
 LDAPSetup=Configurações do LDAP
 LDAPUsersSynchro=Usuários
 LDAPContactsSynchro=Contatos
@@ -1064,6 +1119,7 @@ LDAPTCPConnectKO=Conexão TCP para o servidor LDAP falhou (Servidor=%s, Porta=%s
 LDAPSetupForVersion3=Servidor LDAP configurado para versão 3
 LDAPSetupForVersion2=Servidor LDAP configurado para versão 2
 LDAPFilterConnectionExample=Exemplo: &(objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Exemplo: & (objectClass=groupOfUsers)
 LDAPFieldMail=E-Mail
 LDAPFieldMailExample=Exemplo: mail
 LDAPFieldPhone=Telefone profissional
@@ -1100,6 +1156,8 @@ LDAPDescMembersTypes=Esta página permite que você defina os atributos do nome
 LDAPDescValues=Exemplos de valores são projetados pelo <b>OpenLDAP</b> seguido dos temas carregados: <b>core.schema, cosine.schema, inetorgperson.schema</b>). Se você usa esses valores e OpenLDAP, modifique seu arquivo de configurações LDAP <b>slapd.conf</b> para ter todos esses temas carregados.
 ForANonAnonymousAccess=Para um acesso autenticado (para um acesso de escrita por exemplo)
 PerfDolibarr=Configurações/otimizações de relatório de performance
+NotInstalled=Não instalado.
+NotRiskOfLeakWithThis=Não há risco de vazamento desta forma.
 ApplicativeCache=cache de aplicativo
 MemcachedNotAvailable=Nenhum cache de aplicativo foi encontrado. Você pode aumentar a performance instalando um servidor de cache Memcached e o módulo será capaz de usar esse servidor de cache. Mais informações aqui http://wiki.dolibarr.org/index.php/Module_MemCached_EN. Note que vários provedores de host web não dispõem de tal servidor de cache.
 MemcachedModuleAvailableButNotSetup=Módulo de aceleração da memória cache está ativado mas a configuração não está completa
@@ -1121,7 +1179,13 @@ ServiceSetup=Configurações do módulo de serviços
 ProductServiceSetup=Configurações dos módulos de produtos e serviços
 NumberOfProductShowInSelect=Número máximo de produtos para mostrar em listas de seleção de combinação (0 = sem limite)
 ViewProductDescInFormAbility=Exibir descrições de produtos em formulários (mostrados de outra forma em um pop-up de dicas de ferramentas)
+DoNotAddProductDescAtAddLines=Não adicionar descrição do produto (do cartão do produto) no envio, adicione linhas nos formulários
+OnProductSelectAddProductDesc=Como usar a descrição dos produtos ao adicionar um produto como uma linha de um documento
+AutoFillFormFieldBeforeSubmit=Preencher automaticamente o campo de entrada da descrição com a descrição do produto
+DoNotAutofillButAutoConcat=Não preencha automaticamente o campo de entrada com a descrição do produto. A descrição do produto será concatenada com a descrição inserida automaticamente.
+DoNotUseDescriptionOfProdut=A descrição do produto nunca será incluída na descrição das linhas de documentos
 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=Exibir descrições de produtos em formulários no idioma do terceiro (caso contrário, no idioma do usuário)
 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
@@ -1132,6 +1196,7 @@ SyslogOutput=Saídas de logs
 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
+SyslogFileNumberOfSaves=Número de registros de backup para manter
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar o trabalho agendado de limpeza para definir a frequência de backup de log
 DonationsSetup=Configurações do módulo de doações
 DonationsReceiptModel=Templates de recibos de doação
@@ -1173,6 +1238,7 @@ FreeLegalTextOnDeliveryReceipts=Texto livre em recibos de entregas
 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 WYSIWIG de linhas de detalhes de produtos para todas as entidades (propostas, encomendas, facturas, etc ...). <span class="warning">Aviso: O uso desta opção neste caso não é recomendado, pois pode criar problemas com caracteres especiais e formatação de página ao construir arquivos PDF.</span>
 FCKeditorForMailing=Criação/edição do WYSIWIG nos E-Mails massivos (ferramentas->emailing)
 FCKeditorForUserSignature=criação/edição do WYSIWIG nas assinaturas de usuários
 FCKeditorForMail=Criação/Edição WYSIWIG para todos os e-mails (exceto Ferramentas->eMailing)
@@ -1182,6 +1248,7 @@ MenuDeleted=Menu Deletado
 NotTopTreeMenuPersonalized=Menus personalizados não conectados à uma entrada do menu superior
 NewMenu=Novo Menu
 MenuModule=Fonte do módulo
+HideUnauthorizedMenu=Ocultar menus não autorizados também para usuários internos (apenas acinzentados caso contrário)
 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
@@ -1209,10 +1276,15 @@ InvoiceDateUsed=Data usada na fatura
 YourCompanyDoesNotUseVAT=Sua empresa foi definida para não usar o IVA (Home - Configuração - Empresa / Organização), portanto, não há opções de IVA para configuração.
 AccountancyCodeSell=Código de contas de vendas
 AccountancyCodeBuy=Código de contas de compras
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenha a caixa de seleção “Criar automaticamente o pagamento” vazia por padrão ao criar um novo imposto
 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
+AGENDA_DEFAULT_VIEW=Qual visualização você deseja abrir por padrão ao selecionar o menu Agenda
+AGENDA_REMINDER_BROWSER=Habilitar o lembrete de evento no <b>navegador do usuário</b> (quando a data do lembrete é atingida, um pop-up é mostrado pelo navegador. Cada usuário pode desabilitar tais notificações na configuração de notificação do navegador).
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar a notificação sonora
+AGENDA_REMINDER_EMAIL=Habilitar lembrete de evento <b>por e-mail </b> (opção de lembrete / atraso pode ser definido em cada evento)
+AGENDA_REMINDER_EMAIL_NOTE=Nota: A frequência da tarefa %s deve ser suficiente para garantir que o lembrete seja enviado no momento correto.
 AGENDA_SHOW_LINKED_OBJECT=Exibir objeto conectado na visualização da agenda
 ClickToDialSetup=Configurações do módulo clique para discar
 ClickToDialUrlDesc=URL chamada quando clica-se no ícone do telefone.  Na URL, você pode usar as tags<br><b>__PHONETO__</b> que será substituída pelo número do telefone da pessoa a chamar<br><b>__PHONEFROM__</b> que será substituída pelo telefone da pessoa que está chamando (o seu)<br><b>__LOGIN__</b> que será substituída pelo login clicktodial (definido no cartão do usuário)<br><b>__PASS__</b> que será substituída pela senha clicktodial (definida no cartão do usuário).
@@ -1253,6 +1325,7 @@ SuppliersCommandModelMuscadet=Modelo completo do pedido (antiga implementação
 SuppliersInvoiceModel=Modelo completo da fatura do fornecedor
 IfSetToYesDontForgetPermission=Se definido como um valor não nulo, não se esqueça de fornecer permissões a grupos ou usuários com permissão para a segunda aprovação
 GeoIPMaxmindSetup=Configurações do módulo GeoIP Maxmind
+PathToGeoIPMaxmindCountryDataFile=Caminho para o arquivo contendo Maxmind ip para tradução do país. <br> Exemplos: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=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.
@@ -1308,9 +1381,10 @@ BackgroundTableLineOddColor=Cor do fundo para as linhas ímpares da tabela
 BackgroundTableLineEvenColor=Cor do fundo, mesmo para linhas de tabela
 MinimumNoticePeriod=O período mínimo de observação (O seu pedido de licença deve ser feito antes de esse atraso)
 NbAddedAutomatically=Número de dias adicionados para contadores de usuários (automaticamente) a cada mês
-EnterAnyCode=Este campo contém uma referência para identificar uma linha. Digite qualquer valor de sua escolha, mas sem caracteres especiais.
+EnterAnyCode=Este campo contém uma referência para identificar a linha. Insira qualquer valor de sua escolha, mas sem caracteres especiais.
 Enter0or1=Digite 0 ou 1
 ColorFormat=A cor RGB está no formato HEX, ex.: FF0000
+PictoHelp=Nome do ícone no formato dolibarr ('image.png' se estiver no diretório do tema atual, 'image.png@nom_du_module' se estiver no diretório / img / de um módulo)
 PositionIntoComboList=Posição de linha em listas de combinação
 SellTaxRate=Taxa de imposto sobre venda
 RecuperableOnly=Sim para VAT "Não Percebido, mas Recuperável" dedicado a alguns estados na França. Mantenha o valor como "Não" em todos os outros casos.
@@ -1338,6 +1412,7 @@ ExampleOfNewsMessageForMajorRelease=O ERP e CRM Dolibarr %s está disponível. A
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s está disponível. Versão %s é uma versão de manutenção, portanto, contém apenas correções de bugs. Recomendamos que todos os usuários atualizem para esta versão. Uma versão de manutenção não introduz novos recursos ou alterações no banco de dados. Você pode baixá-lo da área de download 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 obter uma lista completa de alterações.
 MultiPriceRuleDesc=Quando a opção "Vários níveis de preços por produto / serviço" está ativada, você pode definir preços diferentes (um por nível de preço) para cada produto. Para poupar tempo, aqui você pode inserir uma regra para calcular automaticamente um preço para cada nível com base no preço do primeiro nível, então você terá que inserir apenas um preço para o primeiro nível para cada produto. Esta página foi projetada para poupar tempo, mas é útil somente se os preços de cada nível forem relativos ao primeiro nível. Você pode ignorar esta página na maioria dos casos.
 ModelModulesProduct=Temas para os documentos do produto
+WarehouseModelModules=Modelos para documentos de armazéns
 ToGenerateCodeDefineAutomaticRuleFirst=Para gerar códigos automaticamente, você deve primeiro definir um gerente para definir automaticamente o número do código de barras.
 SeeSubstitutionVars=Veja * nota para a lista das possíveis variáveis de substituição
 SeeChangeLog=Ver o arquivo ChangeLog (somente em inglês)
@@ -1363,6 +1438,7 @@ MAIN_PDF_MARGIN_BOTTOM=Margem inferior no PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para o logotipo em PDF
 NothingToSetup=Não há configuração específica necessária para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Defina isto como yes se este grupo for um cálculo de outros grupos
+EnterCalculationRuleIfPreviousFieldIsYes=Insira a regra de cálculo se o campo anterior foi definido como Sim. <br> Por exemplo: <br> CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=Várias variantes de idioma encontradas
 RemoveSpecialChars=Remover caracteres especiais
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtro Regex para valor limpo (COMPANY_DIGITARIA_CLEAN_REGEX)
@@ -1373,11 +1449,14 @@ YouCanDeleteFileOnServerWith=Você pode excluir este arquivo no servidor com a l
 EnableFeatureFor=Ativar recursos para <strong>%s</strong>
 VATIsUsedIsOff=Nota: A opção de usar o Imposto sobre vendas ou o IVA foi definida como <strong>Desligada</strong> no menu %s - %s, portanto, o imposto sobre vendas ou IVA usado será sempre 0 para vendas.
 SwapSenderAndRecipientOnPDF=Troque o remetente e a posição do endereço do destinatário em documentos PDF
-FeatureSupportedOnTextFieldsOnly=Atenção, recurso suportado apenas em campos de texto. Além disso, um parâmetro de URL action = create ou action = edit deve ser definido OU o nome da página deve terminar com 'new.php' para acionar esse recurso.
+FeatureSupportedOnTextFieldsOnly=Aviso, recurso compatível apenas com campos de texto e listas de combinação. Além disso, um parâmetro de URL ação=criar ou ação=editar deve ser definido OU o nome da página deve terminar com 'new.php' para acionar este recurso.
 EmailCollectorDescription=Adicione um trabalho agendado e uma página de configuração para verificar regularmente as caixas de e-mail (usando o protocolo IMAP) e registre os e-mails recebidos em seu aplicativo, no lugar certo e / ou crie alguns registros automaticamente (como leads).
 NewEmailCollector=Novo coletor de e-mail
+EmailcollectorOperationsDesc=As operações são executadas de cima para baixo
 MaxEmailCollectPerCollect=Número máximo de e-mails coletados por coleta
 ConfirmCloneEmailCollector=Tem certeza de que deseja clonar o coletor de e-mail %s?
+DateLastCollectResult=Data da última tentativa de coleta
+DateLastcollectResultOk=Data da última coleta bem sucedida
 LastResult=Último resultado
 EmailCollectorConfirmCollectTitle=Confirmação de recebimento de e-mail
 EmailCollectorConfirmCollect=Deseja executar a coleta deste coletor agora?
@@ -1385,10 +1464,16 @@ NoNewEmailToProcess=Nenhum novo e-mail (filtros correspondentes) para processar
 XEmailsDoneYActionsDone=%s e-mails qualificados, %s e-mails processados com sucesso (para registro %s/ações executadas)
 RecordEvent=Registrar evento de e-mail
 CreateLeadAndThirdParty=Criar lead (e terceiro, se necessário)
+CreateTicketAndThirdParty=Criar ticket (e vincular a terceiros se tiver sido carregado por uma operação anterior)
 CodeLastResult=Código do último resultado
 NbOfEmailsInInbox=Número de e-mails no diretório de origem
 LoadThirdPartyFromName=Carregar pesquisa de terceiros em %s (carregar somente)
 LoadThirdPartyFromNameOrCreate=Carregar pesquisa de terceiros em %s (criar se não for encontrado)
+WithDolTrackingID=Mensagem de conversa iniciada por um primeiro e-mail enviado de Dolibarr
+WithoutDolTrackingID=Mensagem de uma conversa iniciada por um primeiro e-mail NÃO enviado pelo Dolibarr
+WithDolTrackingIDInMsgId=Mensagem enviada de Dolibarr
+WithoutDolTrackingIDInMsgId=Mensagem NÃO enviada de Dolibarr
+CreateCandidature=Criar formulário de emprego
 FormatZip=CEP
 MainMenuCode=Código de entrada do menu (mainmenu)
 ECMAutoTree=Mostrar árvore de ECM automática
@@ -1399,6 +1484,7 @@ UseSearchToSelectResource=Usa um formulário de busca para a escolha de um recur
 DisabledResourceLinkUser=Desativar recurso para vincular um recurso a usuários
 DisabledResourceLinkContact=Desativar recurso para vincular um recurso a contatos
 EnableResourceUsedInEventCheck=Ativar recurso para verificar se recurso está sendo usado em um evento
+DisableProspectCustomerType=Desative o tipo de terceiro "Cliente em potencial + cliente" (portanto, o terceiro deve ser "Cliente em potencial" ou "Cliente", mas não pode ser os dois)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplifique a interface para pessoas cegas
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Ative esta opção se você for uma pessoa cega ou se usar o aplicativo em um navegador de texto como o Lynx ou o Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Alterar a cor da interface para daltônicos
@@ -1417,12 +1503,16 @@ UseDebugBar=Use a barra de depuração
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas linhas de log para manter no console
 WarningValueHigherSlowsDramaticalyOutput=Atenção, valores mais altos reduzem drasticamente a saída
 ModuleActivated=O módulo %s é ativado e torna a interface mais lenta
+ModuleSyslogActivatedButLevelNotTooVerbose=O módulo %s está ativado e o nível de registro (%s) está correto (pouco detalhado)
+IfYouAreOnAProductionSetThis=Se você estiver em um ambiente de produção, deve definir esta propriedade como %s.
+AntivirusEnabledOnUpload=Antivírus habilitado em arquivos carregados
 EXPORTS_SHARE_MODELS=Modelos de exportação são compartilhar com todos
 ExportSetup=Configuração do módulo Export
 ImportSetup=Configuração do módulo Importar
 InstanceUniqueID=ID exclusivo da instância
 SmallerThan=Menor que
 LargerThan=Maior que
+IfTrackingIDFoundEventWillBeLinked=Observe que se um ID de rastreamento de um objeto for encontrado no email, ou se o email for uma resposta de um email já coletado e vinculado a um objeto, o evento criado será automaticamente vinculado ao objeto relacionado conhecido.
 WithGMailYouCanCreateADedicatedPassword=Com uma conta do GMail, se você ativou a validação de 2 etapas, é recomendável criar uma segunda senha dedicada para o aplicativo, em vez de usar sua própria senha da conta em https://myaccount.google.com/.
 EmailCollectorTargetDir=Pode ser um comportamento desejado mover o email para outra tag / diretório quando ele foi processado com êxito. Basta definir o nome do diretório aqui para usar este recurso (NÃO use caracteres especiais no nome). Observe que você também deve usar uma conta de logon de leitura / gravação.
 EmailCollectorLoadThirdPartyHelp=Você pode usar esta ação para usar o conteúdo de email para localizar e carregar uma terceira parte existente em seu banco de dados. A terceira parte encontrada (ou criada) será usada para seguir as ações que precisam dela. No campo de parâmetro, você pode usar, por exemplo, 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' se desejar extrair o nome da terceira parte de uma cadeia de caracteres 'Name: name to find' encontrada na corpo.
@@ -1439,6 +1529,8 @@ MakeAnonymousPing=Faça um ping anônimo '+1' no servidor de base Dolibarr (feit
 FeatureNotAvailableWithReceptionModule=Recurso não disponível quando a recepção do módulo está ativada
 EmailTemplate=Modelo para e-mail
 EMailsWillHaveMessageID=Os e-mails terão a tag 'Referências' correspondente a esta sintaxe
+PDF_SHOW_PROJECT=Exibir projeto no documento
+ShowProjectLabel=Rótulo do Projeto
 PDF_USE_ALSO_LANGUAGE_CODE=Se você deseja duplicar alguns textos em seu PDF em 2 idiomas diferentes no mesmo PDF gerado, defina aqui esse segundo idioma para que o PDF gerado contenha 2 idiomas diferentes na mesma página, o escolhido ao gerar PDF e este ( apenas alguns modelos de PDF suportam isso). Mantenha em branco para 1 idioma por PDF.
 FafaIconSocialNetworksDesc=Digite aqui o código de um ícone FontAwesome. Se você não souber o que é FontAwesome, poderá usar o valor genérico fa-address-book.
 RssNote=Nota: Cada definição de feed RSS fornece um widget que você deve ativar para disponibilizá-lo no painel
@@ -1448,4 +1540,19 @@ MeasuringScaleDesc=A escala é o número de casas que você precisa mover a part
 TemplateAdded=Modelo adicionado
 TemplateUpdated=Modelo atualizado
 TemplateDeleted=Modelo excluído
+MailToSendEventPush=Email de lembrete de evento
+SwitchThisForABetterSecurity=Alternar este valor para %s é recomendado para mais segurança
 DictionaryProductNature=Natureza do produto
+CountryIfSpecificToOneCountry=País (se específico para um determinado país)
+YouMayFindSecurityAdviceHere=Você pode encontrar avisos de segurança aqui
+ModuleActivatedMayExposeInformation=Esta extensão PHP pode expor dados confidenciais. Se você não precisa disso, desative-o.
+ModuleActivatedDoNotUseInProduction=Um módulo projetado para o desenvolvimento foi habilitado. Não o habilite em um ambiente de produção.
+CombinationsSeparator=Caractere separador para combinações de produtos
+SeeLinkToOnlineDocumentation=Veja o link para a documentação online no menu superior para exemplos
+AskThisIDToYourBank=Entre em contato com seu banco para obter este ID
+AdvancedModeOnly=Permissão disponível apenas no modo de permissão Avançada
+ConfFileIsReadableOrWritableByAnyUsers=O arquivo conf pode ser lido ou gravado por qualquer usuário. Dê permissão apenas ao usuário e grupo do servidor da web.
+MailToSendEventOrganization=Organização do Evento
+AGENDA_EVENT_DEFAULT_STATUS=Status de evento padrão ao criar um evento a partir do formulário
+YouShouldDisablePHPFunctions=Você deve desabilitar funções PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Exceto se você precisar executar comandos do sistema (para o módulo Trabalho agendado ou para executar o antivírus da linha de comando externa, por exemplo), você deve desabilitar as funções do PHP
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index 3a43dd851ea..2aec949c9ab 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -57,7 +57,6 @@ ProposalSentByEMail=Proposta comercial 1%s enviada por e-mail
 ContractSentByEMail=Contrato%s enviado por e-mail
 OrderSentByEMail=Ped. de venda 1%s enviado por e-mail
 InvoiceSentByEMail=Fat. %s do cliente enviada por e-mail
-SupplierOrderSentByEMail=Pedido de compra %s enviado por e-mail
 ORDER_SUPPLIER_DELETEInDolibarr=Pedido de compra %s excluído
 SupplierInvoiceSentByEMail=Fatura %s do fornec. enviada por e-mail
 ShippingSentByEMail=Embarque %s enviado por e-mail
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index e57792e9621..eb3c644c1e0 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -132,9 +132,17 @@ NewVariousPayment=Novo pagamento diverso
 VariousPayment=Pagamento diverso
 ShowVariousPayment=Mostrar pagamento diverso
 AddVariousPayment=Adicionar pagamento diverso
+VariousPaymentId=ID de pagamento diverso
+VariousPaymentLabel=Rótulo de pagamento diverso
+ConfirmCloneVariousPayment=Confirmar clone de pagamento diverso
 YourSEPAMandate=Seu mandato Área Única de Pagamentos em Euros
 AutoReportLastAccountStatement=Preencha automaticamente o campo 'número de extrato bancário' com o último número de extrato ao fazer a reconciliação
+CashControl=Controle de caixa PDV
+NewCashFence=Abertura ou fechamento de um novo caixa
 BankColorizeMovement=Colorir movimentos
 BankColorizeMovementDesc=Se esta função estiver ativada, você poderá escolher uma cor de plano de fundo específica para movimentos de débito ou crédito
 BankColorizeMovementName1=Cor de fundo para movimento de débito
 BankColorizeMovementName2=Cor de fundo para movimento de crédito
+IfYouDontReconcileDisableProperty=Caso não queira fazer reconciliações bancárias em alguma conta bancária, desative a propriedade "%s" nelas para remover este aviso.
+NoBankAccountDefined=Nenhuma conta bancária definida
+NoRecordFoundIBankcAccount=Nenhum registro encontrado na conta bancária. Normalmente, isso ocorre quando um registro foi excluído manualmente da lista de transações na conta bancária (por exemplo, durante uma reconciliação da conta bancária). Outro motivo é que o pagamento foi registrado quando o módulo "%s" estava desabilitado.
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index a20be8fd4bd..9601e9f7915 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -37,10 +37,8 @@ InvoiceHasAvoir=Foi fonte de uma ou várias notas de crédito
 CardBill=Ficha da fatura
 InvoiceCustomer=Fatura de cliente
 CustomerInvoice=Fatura de cliente
-CustomersInvoices=Faturas de clientes
 SupplierInvoice=Fatura do fornecedores
 SupplierBill=Fatura do fornecedores
-SupplierBills=Faturas de fornecedores
 PaymentBack=Reembolso
 CustomerInvoicePaymentBack=Reembolso
 PaidBack=Reembolso pago
@@ -273,7 +271,6 @@ PaymentConditionPT_ORDER=No pedido
 PaymentConditionPT_5050=50%% adiantado e 50%% na entrega
 FixAmount=Valor fixo - 1 linha com o rótulo '%s'
 VarAmount=Variavel valor (%% total)
-VarAmountAllLines=Valor variável (%% tot.) - todas as mesmas linhas
 PaymentTypePRE=Pedido com pagamento em Débito direto
 PaymentTypeShortPRE=Pedido com pagamento por débito
 PaymentTypeLIQ=Dinheiro
@@ -343,10 +340,7 @@ YouMustCreateInvoiceFromSupplierThird=Essa opção só está disponível ao cria
 YouMustCreateStandardInvoiceFirstDesc=Você deve criar antes uma fatura padrão e convertê-la em um "tema" para criar um novo tema de fatura
 PDFCrabeDescription=Modelo de fatura PDF Crabe. Um modelo de fatura completo (implementação antiga do modelo Sponge)
 PDFCrevetteDescription=Tema Crevette para fatura em PDF. Um tema completo para a situação das faturas
-TerreNumRefModelDesc1=Retorna número com formato %syymm-nnnn para padrão de faturas e %syymm-nnnn para notas de crédito onde yy é ano, mm é mês e nnnn é uma sequência numérica sem quebra e sem retorno para 0
-MarsNumRefModelDesc1=Número de retorno com o formato %syymm-nnnn para faturas padrão, %syymm-nnnn para faturas de substituição, %syymm-nnnn para faturas de adiantamento e %syymm-nnnn para notas de crédito onde yy é ano, mm é mês e nnnn é uma seqüência sem interrupção e não retornar para 0
 TerreNumRefModelError=Uma conta começa com %syymm já existe e não é compatível com esse modelo de sequência. Remova ou renomeie ele para ativar esse módulo.
-CactusNumRefModelDesc1=Número de retorno com o formato %syymm-nnnn para faturas padrão, %syymm-nnnn para notas de crédito e %syymm-nnnn para faturas de adiantamento, onde yy é ano, mm é mês e nnnn é uma seqüência sem quebra e sem retorno para 0
 EarlyClosingReason=Motivo de fechamento antecipado
 EarlyClosingComment=Nota de fechamento antecipado
 TypeContact_facture_internal_SALESREPFOLL=Representativo seguindo de fatura de cliente
@@ -359,6 +353,7 @@ TypeContact_invoice_supplier_external_SHIPPING=Contato de remessa do fornecedor
 InvoiceFirstSituationAsk=Primeira situação da fatura
 InvoiceFirstSituationDesc=A <b>situação faturas</b> são amarradas às situações relacionadas com uma progressão, por exemplo, a progressão de uma construção. Cada situação é amarrada a uma fatura.
 InvoiceSituation=Situação da fatura
+PDFInvoiceSituation=Situação da fatura
 InvoiceSituationAsk=Fatura acompanhando a situação
 InvoiceSituationDesc=Criar uma nova situação na sequência de um um já existente
 SituationAmount=Situação montante da fatura (líquida)
@@ -380,7 +375,7 @@ ToCreateARecurringInvoiceGene=Para gerar as futuras faturas regular e manualment
 ToCreateARecurringInvoiceGeneAuto=Se você precisar que essas faturas sejam geradas automaticamente, peça ao seu administrador para ativar e configurar o módulo <strong>%s</strong>. Note que ambos os métodos (manual e automático) podem ser usados juntos sem risco de duplicação.
 DeleteRepeatableInvoice=Excluir tema de fatura
 ConfirmDeleteRepeatableInvoice=Você tem certeza que deseja excluir o tema de fatura?
-BillCreated=%s conta(s) criada(s)
+BillCreated=%s fatura (s) gerada (s)
 StatusOfGeneratedDocuments=Status da geração de documentos
 DoNotGenerateDoc=Não gere arquivo de documento
 BILL_DELETEInDolibarr=Fatura excluída
@@ -388,3 +383,5 @@ BILL_SUPPLIER_DELETEInDolibarr=Fatura de fornecedor excluída
 UnitPriceXQtyLessDiscount=Preço unitário x Qtd. - Desconto
 CustomersInvoicesArea=Área de cobrança do cliente
 SupplierInvoicesArea=Área de cobrança do cliente
+FacParentLine=Linha principal da fatura
+SituationTotalRayToRest=Restante a pagar sem imposto
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index 0d2b4f7a911..665ab325650 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Estatísticas sobre os principais objetos de negócios no banco de dados
 BoxLoginInformation=Informações de Login
 BoxLastRssInfos=Informação de RSS
 BoxLastProducts=Últimos %s Produtos/Serviços
@@ -11,8 +12,12 @@ BoxLastProposals=Últimas propostas comerciais
 BoxLastProspects=Últimos prospectos de cliente modificados
 BoxLastCustomerOrders=Últimas encomendas
 BoxLastContacts=Últimos contatos/endereços
+BoxLastModifiedMembers=Últimos membros modificados
+BoxLastMembersSubscriptions=Últimas inscrições de membros
 BoxCurrentAccounts=Saldo das contas ativas
 BoxTitleMemberNextBirthdays=Aniversários deste mês (membros)
+BoxTitleMembersByType=Membros por tipo
+BoxTitleMembersSubscriptionsByYear=Assinaturas de membros por ano
 BoxTitleLastRssInfos=Últimas %s novidades de %s
 BoxTitleLastProducts=Produtos/Serviços: %s modificado
 BoxTitleProductsAlertStock=Produtos: alerta de estoque
@@ -34,8 +39,10 @@ BoxLastExpiredServices=Ultimo %s dos contatos com serviço vencido ativo
 BoxTitleLastModifiedDonations=Últimas %s doações modificadas
 BoxTitleLatestModifiedBoms=%s BOMs modificadas recentemente
 BoxTitleLatestModifiedMos=%s ordens de fabricação modificadas recentemente
+BoxTitleLastOutstandingBillReached=Clientes com máximo pendente excedido
 BoxGlobalActivity=Atividade global (faturas, propostas, pedidos)
 BoxScheduledJobs=Tarefas agendadas
+BoxTitleFunnelOfProspection=Funil de lead
 FailedToRefreshDataInfoNotUpToDate=Falha ao atualizar o fluxo de RSS. Data de atualização mais recente com êxito: %s
 LastRefreshDate=Ultima data atualizacao
 NoRecordedBookmarks=Nenhum marcador definido.
@@ -64,12 +71,15 @@ BoxTitleLastModifiedCustomerBills=Faturas do cliente: último %s modificado
 BoxTitleLastModifiedCustomerOrders=Pedidos de Vendas: último %s modificado
 BoxTitleLastModifiedPropals=Últimas %s propostas modificadas
 BoxTitleLatestModifiedJobPositions=Últimos %s trabalhos alterados
+BoxTitleLatestModifiedCandidatures=Últimas %s candidaturas alteradas
 ForCustomersInvoices=Faturas de clientes
 ForCustomersOrders=Pedidos de clientes
 LastXMonthRolling=Ultima %s mensal
 ChooseBoxToAdd=Adicionar widget para sua area de notificacoes
 BoxAdded=A ferramenta foi adicionada no seu painel
 BoxTitleUserBirthdaysOfMonth=Aniversários deste mês (usuários)
+BoxLastManualEntries=Registro mais recente na contabilidade inserido manualmente ou sem documento de origem
+BoxTitleLastManualEntries=%s último registro inserido manualmente ou sem documento de origem
 NoRecordedManualEntries=Nenhuma entrada manual registrada na contabilidade
 BoxSuspenseAccount=Operação de contabilidade com conta suspensa
 BoxTitleSuspenseAccount=Número de linhas não alocadas
@@ -78,3 +88,10 @@ SuspenseAccountNotDefined=A conta suspensa não está definida
 BoxLastCustomerShipments=Últimos envios de clientes
 BoxTitleLastCustomerShipments=%s remessas de clientes mais recentes
 NoRecordedShipments=Nenhuma remessa de cliente registrada
+BoxCustomersOutstandingBillReached=Clientes com limite pendente atingido
+UsersHome=Usuários e grupos domésticos
+MembersHome=Sócio da casa
+ThirdpartiesHome=Terceiros domésticos
+TicketsHome=Início Tickets
+AccountancyHome=Início contabilidade
+ValidatedProjects=Projetos validados
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index daab834c237..1b369de1186 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -11,10 +11,11 @@ SuppliersCategoriesArea=Área tags / categorias de fornecedores
 CustomersCategoriesArea=Área tags / categorias de Clientes
 MembersCategoriesArea=Área tags / categorias de Membros
 ContactsCategoriesArea=Área tags / categorias de Contatos
-AccountsCategoriesArea=Tags/categorias da área de Contas
+AccountsCategoriesArea=Área tags / categorias de contas bancárias
 ProjectsCategoriesArea=Projetos area de tags/categorias
 UsersCategoriesArea=Área de tags / categorias de usuários
 CatList=Lista de tags/categorias
+CatListAll=Lista tags / categorias (todos os tipos)
 NewCategory=Nova tag/categoria
 ModifCat=Modificar tag/categoria
 CatCreated=Tag/categoria criada
@@ -56,18 +57,30 @@ UsersCategoriesShort=Tags / categorias de usuários
 StockCategoriesShort=Tags / categorias de armazém
 ThisCategoryHasNoItems=Esta categoria não contém nenhum item.
 CategId=ID Tag / categoria
+ParentCategory=Tag / categoria principal
+ParentCategoryLabel=Rótulo tag / categoria principal
+CatSupList=Lista tags / categorias de fornecedores
+CatCusList=Lista de clientes / clientes potenciais / categorias
 CatProdList=Lista de produtos tags / categorias
 CatMemberList=Lista de membros tags / categorias
+CatContactList=Lista tags / categorias de contatos
+CatProjectsList=Lista tags / categorias de projetos
+CatUsersList=Lista tags / categorias de usuários
+CatSupLinks=Links entre fornecedores e tags / categorias
 CatCusLinks=Relação/links entre clientes / perspectivas e tags / categorias
 CatContactsLinks=Links entre contatos / endereços e tags / categorias
 CatProdLinks=Relação/links entre produtos / serviços e tags / categorias
 CatMembersLinks=Ligações entre os membros e tags / categorias
 CatProjectsLinks=Links entre projetos e tags/categorias
+CatUsersLinks=Links entre usuários e tags / categorias
 ExtraFieldsCategories=atributos complementares
 CategoriesSetup=Configuração Tags / categorias
 CategorieRecursiv=Fazer a ligação com os pais tag/categoria automaticamente
 CategorieRecursivHelp=Se a opção estiver ativada, quando você adicionar um produto a uma subcategoria, o produto também será adicionado à categoria pai.
 AddProductServiceIntoCategory=Adicione o seguinte produto / serviço
+AddCustomerIntoCategory=Atribuir categoria ao cliente
+AddSupplierIntoCategory=Atribuir categoria ao fornecedor
 ShowCategory=Mostrar tag / categoria
 ChooseCategory=Escolher categoria
+WebsitePagesCategoriesArea=Categorias de contêiner de página
 UseOrOperatorForCategories=Use operador para categorias
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 8987f615bd7..a2e555301a3 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -29,7 +29,6 @@ Individual=Pessoa física
 ToCreateContactWithSameName=Irá automaticamente criar um contato/endereço com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, a criação de um único terceiro é suficiente.
 ParentCompany=Matriz
 Subsidiaries=Filiais
-ReportByQuarter=Relatório pela taxa
 CivilityCode=Forma de tratamento
 RegisteredOffice=Escritório registrado
 Lastname=Sobrenome
@@ -180,6 +179,7 @@ ThisUserIsNot=Este usuário não é um cliente em potencial, cliente ou forneced
 VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link <b>%s</b> usa o serviço europeu de verificação de IVA (VIES), que requer acesso à Internet do servidor Dolibarr.
 ErrorVATCheckMS_UNAVAILABLE=Verificação não é possível. Verifique o serviço não é necessário por um membro de estado (%s).
 NorProspectNorCustomer=Nem possivel cliente, nem cliente
+JuridicalStatus=Tipo de entidade comercial
 ProspectLevelShort=Pos. Cli.
 ProspectLevel=Possível cliente
 ContactPublic=Compartilhado
@@ -234,7 +234,6 @@ ProductsIntoElements=Lista de produtos/serviços em %s
 CurrentOutstandingBill=Notas aberta correntes
 OutstandingBill=Conta excelente
 OutstandingBillReached=Máx. para dívida a ser alcançado
-MonkeyNumRefModelDesc=Retorna um número com o formato %syymm-nnnn para o código do cliente e %syymm-nnnn para o código do fornecedor, onde yy é ano, mm é mês e nnnn é uma sequência sem quebra e sem retorno a 0.
 LeopardNumRefModelDesc=O código é livre. Esse código pode ser modificado a qualquer hora.
 ManagingDirectors=Nome do Representante(CEO,Diretor,Presidente...)
 MergeOriginThirdparty=Duplicar terceiros (terceiros que deseja excluir)
@@ -252,3 +251,5 @@ PaymentTypeSupplier=Tipo de pagamento - Fornecedor
 PaymentTermsSupplier=Termos de pagamento - Fornecedor
 PaymentTypeBoth=Tipo de Pagamento - Cliente e Fornecedor
 MulticurrencyUsed=Uso de Multimoeda
+CurrentOutstandingBillLate=Atual fatura pendente atrasada
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Cuidado, dependendo das configurações de preço do produto, você deve trocar de fornecedor antes de adicionar o produto ao PDV.
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index 1dadb249b1e..fe65cc7a47c 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -50,6 +50,7 @@ LT2SupplierES=IRPF de compras
 LT2CustomerIN=Vendas de SGST
 LT2SupplierIN=Compras SGST
 VATCollected=ICMS recuperado
+VATExpensesArea=Área para todos os pagamentos de IVA
 SocialContribution=Contribuição fiscal ou social
 SocialContributions=Encargos sociais e fiscais
 SocialContributionsDeductibles=Contribuições fiscais ou sociais dedutíveis
@@ -82,6 +83,8 @@ LT2PaymentES=Pagamento de IRPF
 LT2PaymentsES=Pagamentos de IRPF
 VATPayment=Pagamento da taxa de venda
 VATPayments=Pagamentos da taxa de venda
+VATDeclarations=Declarações de IVA
+VATDeclaration=Declaração de IVA
 VATRefund=Reembolso da taxa sobre vendas
 SocialContributionsPayments=Pagamentos de impostos sociais / fiscais
 ShowVatPayment=Ver Pagamentos ICMS
@@ -100,9 +103,7 @@ NoWaitingChecks=Sem cheques a depositar.
 DateChequeReceived=Data introdução de dados de recepção cheque
 NbOfCheques=Nº. de cheques
 PaySocialContribution=Quitar um encargo fiscal/social
-ConfirmPaySocialContribution=Quer mesmo categorizar esta contribuição fiscal/social como paga?
 DeleteSocialContribution=Excluir um pagamento taxa social ou fiscal
-ConfirmDeleteSocialContribution=Quer mesmo excluir este pagamento de contribuição fiscal/social?
 ExportDataset_tax_1=Encargos fiscais e sociais e pagamentos
 CalcModeVATDebt=<b>Modo% S VAT compromisso da contabilidade% s.</b>
 CalcModeVATEngagement=<b>Modo% SVAT sobre os rendimentos e as despesas% s.</b>
@@ -151,7 +152,6 @@ Pcg_version=Modelos de carta de contas
 Pcg_subtype=PCG subtipo
 InvoiceLinesToDispatch=Linhas de nota fiscal para envio
 RefExt=Ref externo
-ToCreateAPredefinedInvoice=Para criar um tema para fatura, crie uma fatura padrão e então, sem validá-la, clique no botão "%s".
 LinkedOrder=Linque para o pedido
 CalculationRuleDesc=Para calcular o total do VAT, há dois métodos: <br> Método 1 é arredondamento cuba em cada linha, em seguida, soma-los. <br> Método 2 é somando tudo cuba em cada linha, em seguida, o arredondamento resultado. <br> Resultado final pode difere de alguns centavos. O modo padrão é o <b>modo% s.</b>
 CalculationRuleDescSupplier=De acordo com o fornecedor, escolha o método apropriado para aplicar a mesma regra de cálculo e obter o mesmo resultado esperado pelo fornecedor.
diff --git a/htdocs/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang
index 2e17c5b2760..ec2187e9913 100644
--- a/htdocs/langs/pt_BR/ecm.lang
+++ b/htdocs/langs/pt_BR/ecm.lang
@@ -16,6 +16,7 @@ ECMAreaDesc2=* As pastas automáticas são geradas automaticamente quando algum
 ECMSectionWasRemoved=A pasta <b>%s</b> foi eliminada
 ECMSearchByKeywords=Busca usando palavras chave
 ECMSearchByEntity=Busca por objeto
+ECMDocsBy=Documentos vinculados a %s
 ShowECMSection=Exibir pasta
 DeleteSection=Apagar pasta
 ConfirmDeleteSection=Por favor confirmar a remocao do diretorio <b>%s</b>?
@@ -28,3 +29,6 @@ DirNotSynchronizedSyncFirst=Este diretório parece ser criado ou modificado fora
 ReSyncListOfDir=Sincronizar lista de diretórios
 HashOfFileContent=Hash do conteúdo do arquivo
 FileNotYetIndexedInDatabase=Arquivo ainda não indexado no banco de dados (tente voltar a carregá-lo)
+ExtraFieldsEcmFiles=Campos extras Arquivos Ecm
+ExtraFieldsEcmDirectories=Campos extras Diretórios Ecm
+ECMSetup=Configuração ECM
diff --git a/htdocs/langs/pt_BR/externalsite.lang b/htdocs/langs/pt_BR/externalsite.lang
index 00d4c89c287..31cdbccc008 100644
--- a/htdocs/langs/pt_BR/externalsite.lang
+++ b/htdocs/langs/pt_BR/externalsite.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Configurar linque para o website externo
+ExternalSiteURL=URL de site externo com conteúdo HTML iframe
 ExternalSiteModuleNotComplete=O módulo SiteExterno não foi configurado corretamente.
 ExampleMyMenuEntry=Minha entrada do menu
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 7792b3ddc3c..c4a455b03d6 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -103,6 +103,7 @@ Disabled=Desativado
 AddLink=Adicionar link
 RemoveLink=Remover o link
 Update=Modificar
+CloseAs=Configurar status para
 CloseBox=Remover o widget do seu painel de controle
 ConfirmSendCardByMail=Você realmente deseja enviar o conteúdo deste cartão por e-mail para <b> %s </ b>?
 Remove=Retirar
@@ -123,6 +124,7 @@ Hide=ocultar
 ShowCardHere=Mostrar cartão
 SearchMenuShortCut=Ctrl + Shift + F
 QuickAdd=Adição rápida
+SelectAll=Selecionar tudo
 Resize=Modificar tamanho
 ResizeOrCrop=Redimensionar ou cortar
 Recenter=Recolocar no centro
@@ -133,6 +135,7 @@ PasswordRetype=Repetir Senha
 NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
 NameSlashCompany=Nome / Companhia
 PersonalValue=Valor Personalizado
+OldValue=Valor antigo %s
 CurrentValue=Valor atual
 MultiLanguage=Multi Idioma
 RefOrLabel=Ref. da etiqueta
@@ -146,6 +149,7 @@ Limit=Límite
 Logout=Sair
 NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação
 HourStart=Comece hora
+Deadline=Prazo final
 DateAndHour=Data e hora
 DateEnd=Data de término
 DateCreationShort=Data Criação
@@ -187,7 +191,6 @@ UnitPriceHTCurrency=Preço unitário (sem) (Moeda)
 UnitPriceTTC=Preço Unit. Total
 PriceU=Preço Unit.
 PriceUHT=Preço Unit.
-PriceUHTCurrency=U.P (moeda)
 PriceUTTC=U.P. (inc. Impostos)
 Amount=Valor
 AmountInvoice=Valor Fatura
@@ -453,8 +456,6 @@ GroupBy=Agrupar por
 ViewFlatList=Visão da lista resumida
 RemoveString=Remover string '%s'
 SomeTranslationAreUncomplete=Alguns dos idiomas oferecidos podem ser apenas parcialmente traduzidos ou podem conter erros. Por favor, ajude a corrigir o seu idioma registrando-se em <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ < / a> para adicionar suas melhorias.
-DirectDownloadLink=Link de download direto (público / externo)
-DirectDownloadInternalLink=Link de download direto (precisa ser registrado e precisa de permissões)
 Download=Baixar
 DownloadDocument=Descarregar documento
 ActualizeCurrency=Atualizar taxa de câmbio
@@ -501,7 +502,6 @@ Monthly=Por mês
 Remote=Controlo remoto
 Deletedraft=Excluir rascunho
 ConfirmMassDraftDeletion=Confirmação de exclusão de massa de esboço
-FileSharedViaALink=Arquivo compartilhado via um link
 SelectAThirdPartyFirst=Selecione um terceiro primeiro ...
 YouAreCurrentlyInSandboxMode=No momento você está no %s modo "caixa de areia"
 AnalyticCode=Código analitico
diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang
index a8799ab1c20..36c8bb59d1d 100644
--- a/htdocs/langs/pt_BR/margins.lang
+++ b/htdocs/langs/pt_BR/margins.lang
@@ -8,10 +8,10 @@ margesSetup=Configuração das margens de lucro
 ProductMargins=Margens de produtos
 CustomerMargins=Margems de clientes
 SalesRepresentativeMargins=Tolerância aos representante de vendas
+ContactOfInvoice=Contato da fatura
 UserMargins=Margens do usuário
 ProductService=Produto ou serviço
 ForceBuyingPriceIfNull=Compra Força preço / custo para o preço de venda se não definido
-ForceBuyingPriceIfNullDetails=Se o preço de compra / custo não definido, e essa opção "ON", a margem será zero em linha (compra / preço = custo preço de venda), caso contrário ("OFF"), marge será igual ao padrão sugerido.
 MARGIN_METHODE_FOR_DISCOUNT=Metodologia de margem para descontos globais
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global e tratado como o produto, serviço, ou somente sob o sub-total na margem.
 MARGIN_TYPE=Compra / Preço de custo sugerido por padrão para cálculo da margem de
diff --git a/htdocs/langs/pt_BR/modulebuilder.lang b/htdocs/langs/pt_BR/modulebuilder.lang
index e5120fa2996..2abf9cd2abf 100644
--- a/htdocs/langs/pt_BR/modulebuilder.lang
+++ b/htdocs/langs/pt_BR/modulebuilder.lang
@@ -57,7 +57,6 @@ IncludeDocGeneration=Gerar alguns documentos a partir do objeto
 IncludeDocGenerationHelp=Se você marcar isto, um código será gerado para adicionar uma caixa "Gerar documento" ao registro.
 ShowOnCombobox=Mostrar valor na caixa de combinação
 KeyForTooltip=Chave para dica de ferramenta
-CSSClass=Classe CSS
 NotEditable=Não editável
 ForeignKey=Chave estrangeira
 AsciiToHtmlConverter=Converter ASCII para HTML
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 79cde2cf111..f6d903c07da 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -111,11 +111,12 @@ TypeContact_order_supplier_external_SHIPPING=Contato de remessa do fornecedor
 TypeContact_order_supplier_external_CUSTOMER=Ordem de acompanhamento de contato do fornecedor
 Error_OrderNotChecked=Nenhum pedido seleçionado para se faturar
 OrderByEMail=E-mail
-PDFEinsteinDescription=Modelo de pedido completo
+PDFEinsteinDescription=Modelo de pedido completo (implementação antiga do modelo Eratosthene)
 PDFEratostheneDescription=Modelo completo de pedidos
 PDFEdisonDescription=O modelo simplificado do pedido
 PDFProformaDescription=Modelo completo de fatura Proforma
 CreateInvoiceForThisCustomer=Faturar pedidos
+CreateInvoiceForThisSupplier=Faturar pedidos
 NoOrdersToInvoice=Nenhum pedido faturavel
 CloseProcessedOrdersAutomatically=Classificar como "processados" todos os pedidos selecionados.
 OrderCreation=Criação de pedidos
diff --git a/htdocs/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang
index 3482315dc9c..214042acf7e 100644
--- a/htdocs/langs/pt_BR/productbatch.lang
+++ b/htdocs/langs/pt_BR/productbatch.lang
@@ -1,7 +1,9 @@
 # Dolibarr language file - Source file is en_US - productbatch
 ManageLotSerial=Use lote / número de série
-ProductStatusOnBatch=Sim (lote / série necessário)
+ProductStatusOnBatch=Sim (lote obrigatório)
+ProductStatusOnSerial=Sim (número de série exclusivo necessário)
 ProductStatusNotOnBatch=Não (lote / série não utilizado)
+ProductStatusOnBatchShort=Lot.
 Batch=Lote / Série
 atleast1batchfield=Compra prazo de validade ou data de venda ou Lote / Número de série
 batch_number=Lote / Número de série
@@ -13,7 +15,13 @@ printEatby=Compra-por: %s
 printSellby=Venda-por: %s
 printQty=Qtde: %d
 AddDispatchBatchLine=Adicione uma linha para Shelf Life expedição
+WhenProductBatchModuleOnOptionAreForced=Quando o módulo Lote / Série está ativado, a redução automática de estoque é forçada a 'Diminuir estoques reais na validação do envio' e o modo de aumento automático é forçado a 'Aumentar estoques reais no despacho manual em depósitos' e não pode ser editado. Outras opções podem ser definidas como você deseja.
 ProductDoesNotUseBatchSerial=Este produto não utiliza Lote / número de série
 ProductLotSetup=Configuração do módulo lote/nº de série
 ShowCurrentStockOfLot=Exibir o estoque atual para o produto/lote
 ShowLogOfMovementIfLot=Exibir o registro de movimentações para o produto/lote
+SerialNumberAlreadyInUse=O número de série %s já é usado para o produto %s
+TooManyQtyForSerialNumber=Você só pode ter um produto %s para o número de série %s
+BatchLotNumberingModules=Opções para geração automática de produtos em lote gerenciados por lotes
+BatchSerialNumberingModules=Opções para geração automática de produtos em lote gerenciados por números de série
+QtyToAddAfterBarcodeScan=Quantidade a adicionar para cada código de barras / lote / série digitalizada
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index ca73468eb49..a6538a7a297 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -166,7 +166,6 @@ GlobalVariableUpdaterType1=Dados WebService
 GlobalVariableUpdaterHelp1=Analisa os dados WebService de URL especificada, NS especifica o namespace, valor especifica a localização de valor relevante, os dados devem conter os dados para enviar e método é o método chamando WS
 PropalMergePdfProductActualFile=Usar arquivos para adicionar em PDF Azur são / é
 PropalMergePdfProductChooseFile=Selecione os arquivos PDF
-IncludingProductWithTag=Incluindo produto/serviço com tag
 DefaultPriceRealPriceMayDependOnCustomer=Preço padrão, o preço real pode depender do cliente
 NbOfQtyInProposals=Qtde nas Propostas
 ClinkOnALinkOfColumn=Clique no link da coluna %s para ter uma visão detalhada...
diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
index 637bc0f1179..3e2b3ad68cb 100644
--- a/htdocs/langs/pt_BR/propal.lang
+++ b/htdocs/langs/pt_BR/propal.lang
@@ -45,6 +45,7 @@ ConfirmClonePropal=Tem certeza que quer clonar a proposta comercial <b>%s</b>?
 ConfirmReOpenProp=Tem certeza que quer reabrir a proposta comercial <b>%s</b>?
 ProposalsAndProposalsLines=Propostas para clientes e diretrizes para apresentação de propostas
 ProposalLine=Linha da Proposta
+ProposalLines=Linhas do orçamento
 AvailabilityPeriod=Prazo de entrega
 SetAvailability=Atraso de entrega
 AfterOrder=Apos o pedido
@@ -62,3 +63,6 @@ DefaultModelPropalClosed=Modelo padrao no fechamento da proposta comercial (nao
 ProposalCustomerSignature=Aceite por escrito, carimbo da empresa, data e assinatura
 ProposalsStatisticsSuppliers=Estatísticas de propostas de fornecedores
 CaseFollowedBy=Caso seguido por
+SignedOnly=Apenas assinado
+IdProposal=ID da proposta
+IdProduct=ID do produto
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index dd94641fec9..80ddaec846f 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -10,8 +10,6 @@ CancelSending=Cancelar envio
 DeleteSending=Apagar envio
 MissingStocks=Estoques ausentes
 StockAtDate=Estoques por data
-StockAtDateInPast=Data anterior
-StockAtDateInFuture=Próxima futura
 StocksByLotSerial=Estoques por lote/nº de série
 LotSerial=Lotes/Series
 LotSerialList=Listagem de lotes/series
@@ -21,6 +19,7 @@ MovementId=ID de movimento
 StockMovementForId=ID de movimento %d
 StocksArea=Setor de armazenagem
 AllWarehouses=Todos os armazéns
+IncludeEmptyDesiredStock=Inclui também estoque negativo com estoque desejado indefinido
 IncludeAlsoDraftOrders=Incluir também projetos de pedidos
 NumberOfProducts=Número total de produtos
 LastMovement=Último movimento
@@ -34,10 +33,12 @@ StockTooLow=Estoque muito baixo
 EnhancedValueOfWarehouses=Valor de estoques
 AllowAddLimitStockByWarehouse=Gerenciar também o valor do estoque mínimo e desejado por emparelhamento (armazém de produtos), além do valor do estoque mínimo e desejado por produto
 RuleForWarehouse=Regra para armazéns
+WarehouseAskWarehouseDuringPropal=Definir um armazém em propostas comerciais
 WarehouseAskWarehouseDuringOrder=Definir um armazém em Pedidos de venda
 UserDefaultWarehouse=Definir um armazém em Usuários
 MainDefaultWarehouse=Armazém padrão
 MainDefaultWarehouseUser=Use um armazém padrão para cada usuário
+MainDefaultWarehouseUserDesc=Ao ativar esta opção, durante a criação de um produto, o armazém atribuído ao produto será definido neste. Se nenhum warehouse for definido no usuário, o warehouse padrão será definido.
 QtyDispatched=Quantidade despachada
 QtyDispatchedShort=Qtde despachada
 QtyToDispatchShort=Qtde a despachar
@@ -57,6 +58,9 @@ RealStock=Estoque real
 RealStockDesc=Estoque físico/real é o estoque atualmente nos depósitos.
 RealStockWillAutomaticallyWhen=O estoque real será modificado de acordo com esta regra (conforme definido no módulo Stock):
 VirtualStock=Estoque virtual
+VirtualStockAtDate=Estoque virtual na data
+VirtualStockDesc=O estoque virtual é o estoque calculado disponível uma vez que todas as ações abertas / pendentes (que afetam os estoques) são fechadas (pedidos de compra recebidos, pedidos de vendas enviados, pedidos de fabricação produzidos, etc)
+AtDate=Na data
 IdWarehouse=Id. armazenamento
 DescWareHouse=Descrição do armazém
 LieuWareHouse=Localização do armazenamento
@@ -77,6 +81,9 @@ DesiredStockDesc=Esta quantidade será usada para determinar o estoque a ser rep
 StockToBuy=Para encomendar
 Replenishment=Reposição
 ReplenishmentOrders=Pedidos de reposição
+VirtualDiffersFromPhysical=De acordo com o aumento / diminuição das opções de ações, o estoque físico e o estoque virtual (estoque físico + pedidos em aberto) podem ser diferentes
+UseRealStockByDefault=Usar estoque real, em vez de estoque virtual, para recurso de reposição
+ReplenishmentCalculation=O valor do pedido será (quantidade desejada - estoque real) em vez de (quantidade desejada - estoque virtual)
 UseVirtualStock=Usar estoque virtual
 UsePhysicalStock=Usar estoque físico
 CurentlyUsingVirtualStock=Estoque virtual
@@ -84,10 +91,12 @@ CurentlyUsingPhysicalStock=Estoque físico
 RuleForStockReplenishment=Regra para a reposição de estoques
 SelectProductWithNotNullQty=Selecione pelo menos um produto com uma quantidade não nula e um fornecedor
 AlertOnly=Alertas apenas
+IncludeProductWithUndefinedAlerts =Incluir também estoque negativo para produtos sem quantidade desejada definida, para restaurá-los a 0
 WarehouseForStockDecrease=Os arquivos serão utilizados para redução estoque
 WarehouseForStockIncrease=O arquivos serão utilizados para aumento de
 ForThisWarehouse=Para este armazenamento
 ReplenishmentStatusDesc=Esta é uma lista de todos os produtos com um estoque menor que o estoque desejado (ou menor que o valor de alerta, se a caixa de seleção "somente alerta" estiver marcada). Usando a caixa de seleção, você pode criar pedidos para preencher a diferença.
+ReplenishmentStatusDescPerWarehouse=Se você deseja um reabastecimento com base na quantidade desejada definida por depósito, você deve adicionar um filtro no depósito.
 ReplenishmentOrdersDesc=Esta é uma lista de todos os pedidos de compra em aberto, incluindo produtos predefinidos. Somente pedidos abertos com produtos predefinidos, portanto, os pedidos que podem afetar os estoques são visíveis aqui.
 NbOfProductBeforePeriod=Quantidade de produtos em estoque antes do período selecionado
 NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois
@@ -125,3 +134,9 @@ InventoryForASpecificProduct=Inventário para um produto específico
 StockIsRequiredToChooseWhichLotToUse=É necessário estoque para escolher qual lote usar
 ForceTo=Forçar a
 AlwaysShowFullArbo=Exibir a árvore completa do armazém no pop-up dos links do armazém (Aviso: isso pode diminuir drasticamente o desempenho)
+StockAtDatePastDesc=Você pode ver aqui o estoque (estoque real) em uma determinada data no passado
+CurrentStock=Estoque atual
+InventoryRealQtyHelp=Defina o valor como 0 para redefinir o campo qty <br> Keep vazio ou remova a linha para mantê-lo inalterado
+UpdateByScaningProductBarcode=Atualização por digitalização (código de barras do produto)
+UpdateByScaningLot=Atualizar por varredura (lote | código de barras serial)
+DisableStockChangeOfSubProduct=Desative a mudança de estoque para todos os subprodutos deste Kit durante esta movimentação.
diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang
index e3155bfae84..28c08da7876 100644
--- a/htdocs/langs/pt_BR/suppliers.lang
+++ b/htdocs/langs/pt_BR/suppliers.lang
@@ -28,6 +28,7 @@ MenuOrdersSupplierToBill=Pedidos de compra para fatura
 NbDaysToDelivery=Tempo de entrega (dias)
 DescNbDaysToDelivery=O maior atraso de entrega de produtos deste pedido
 SupplierReputation=Reputação do fornecedores
+ReferenceReputation=Reputação de referência
 DoNotOrderThisProductToThisSupplier=Não pedir
 NotTheGoodQualitySupplier=Baixa qualidade
 AllProductServicePrices=Todos os preços dos produtos / serviços
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
index 2f52343c451..b88555bee7f 100644
--- a/htdocs/langs/pt_BR/ticket.lang
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -36,18 +36,14 @@ TicketUrlPublicInterfaceHelpAdmin=É possivel definir um alias para o servidor W
 TicketsDisableEmail=Não envie e-mails para criação de bilhetes ou gravação de mensagens
 TicketsDisableEmailHelp=Por padrão, os e-mails são enviados quando novos bilhetes ou mensagens são criados. Ative esta opção para desativar * todas as notificações por e-mail
 TicketsLogEnableEmail=Ativar log por e-mail
-TicketsEmailAlsoSendToMainAddress=Também enviar notificação para o endereço de e-mail principal
-TicketsEmailAlsoSendToMainAddressHelp=Ative esta opção para enviar um e-mail para o endereço "Notificação de e-mail de" (veja a configuração abaixo)
 TicketsLimitViewAssignedOnly=Restringir a exibição aos tiquetes atribuídos ao usuário atual (não efetivo para usuários externos, sempre limitado à terceira parte da qual eles dependem)
 TicketsLimitViewAssignedOnlyHelp=Somente bilhetes atribuídos ao usuário atual ficarão visíveis. Não se aplica a um usuário com direitos de gerenciamento de bilhetes.
 TicketsActivatePublicInterfaceHelp=A interface pública permite que qualquer visitante crie bilhetes.
 TicketNumberingModules=Módulo de numeração de bilhetes
 TicketNotifyTiersAtCreation=Notificar o terceiro no momento do terceiro
 TicketsDisableCustomerEmail=Sempre disabilitar e-mail quando um ticket é criado de uma interface pública
-TicketsPublicNotificationNewMessage=Enviar e-mail (s) quando uma nova mensagem for adicionada
 TicketsPublicNotificationNewMessageHelp=Enviar e-mail (s) quando uma nova mensagem for adicionada da interface pública (para o usuário atribuído ou o e-mail de notificações para (atualizar) e / ou o e-mail de notificações para)
 TicketPublicNotificationNewMessageDefaultEmail=Email de notificações para (atualização)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Envie notificações de novas mensagens por e-mail para este endereço se o tíquete não tiver um usuário atribuído ou se o usuário não tiver um e-mail.
 TicketsIndex=Área de Tickets
 TicketList=Lista de bilhetes
 TicketAssignedToMeInfos=Esta página mostra os tíquetes criado pelo ou assinalados para o usuário corrente
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index 07fd926c913..aff26cf4ed4 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -60,7 +60,6 @@ LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr
 ExportDataset_user_1=Usuários e suas propriedades
 DomainUser=Usuário de Domínio
 CreateInternalUserDesc=Este formulário permite que você crie um usuário interno em sua empresa / organização. Para criar um usuário externo (cliente, fornecedor, etc.), use o botão 'Criar usuário Dolibarr' do cartão de contato de terceiros.
-InternalExternalDesc=Usuário <b>interno</b> é um usuário que faz parte da sua empresa / organização. <br>Usuário <b>externo</b> é um cliente, fornecedor ou outro (a criação de um usuário externo para terceiros pode ser feita a partir do registro de contatos de terceiros). <br><br>Nos dois casos, as permissões definem os direitos no Dolibarr, também o usuário externo pode ter um gerenciador de menu diferente do usuário interno (consulte Página inicial - Configuração - Tela)
 PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertence o usuário.
 UserWillBeInternalUser=Usuario criado sera um usuario interno (porque nao esta conectado a um particular terceiro)
 UserWillBeExternalUser=Usuario criado sera um usuario externo (porque esta conectado a um particular terceiro)
@@ -95,7 +94,7 @@ UserAccountancyCode=Código de contabilidade do usuário
 UserLogoff=Usuário desconetado
 UserLogged=Usuário Conectado
 DateOfEmployment=Data de emprego
-DateEmployment=Data de Início do Emprego
+DateEmploymentstart=Data de Início do Emprego
 DateEmploymentEnd=Data de término do emprego
 CantDisableYourself=Você não pode desativar seu próprio registro de usuário
 ForceUserExpenseValidator=Forçar validação do relatório de despesas
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index 44be6ab3faf..b7439263c5b 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -32,7 +32,6 @@ ExampleToUseInApacheVirtualHostConfig=Exemplo a ser usado na configuração do h
 YouCanAlsoTestWithPHPS=<u> Usar com servidor embutido em PHP </ u> <br> No ambiente de desenvolvimento, você pode preferir testar o site com o servidor da Web incorporado em PHP (o PHP 5.5 é necessário) executando o <strong> php -S 0.0. 0,0: 8080 -t %s </ strong>
 TestDeployOnWeb=Testar / implementar na web
 PreviewSiteServedByWebServer=<u> Visualize %s em uma nova guia. </ u> <br> <br> O %s será servido por um servidor web externo (como Apache, Nginx, IIS). Você deve instalar e configurar este servidor antes de apontar para o diretório: <br> <strong> %s </ strong> <br> URL servido por servidor externo: <br> <strong> %s </ strong>
-PreviewSiteServedByDolibarr=<u> Visualize %s em uma nova guia. </ u> <br> <br> O %s será servido pelo servidor Dolibarr para que não seja necessário instalar qualquer servidor web extra (como Apache, Nginx, IIS). < br> O inconveniente é que o URL das páginas não é amigável e comece com o caminho do seu Dolibarr. URL de URL servido por Dolibarr: <br> <strong> %s </ strong> <br> <br> Para usar o seu próprio servidor web externo para servir este site, crie um host virtual em seu servidor web que aponte para o diretório <br> <strong> %s </ strong> <br> e digite o nome deste servidor virtual e clique no outro botão de visualização .
 VirtualHostUrlNotDefined=URL do host virtual veiculado pelo servidor web externo não definido
 NoPageYet=Ainda não há páginas
 SyntaxHelp=Ajuda sobre dicas de sintaxe específicas
diff --git a/htdocs/langs/pt_BR/zapier.lang b/htdocs/langs/pt_BR/zapier.lang
index a89605c4809..a1150fab1bc 100644
--- a/htdocs/langs/pt_BR/zapier.lang
+++ b/htdocs/langs/pt_BR/zapier.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - zapier
 ModuleZapierForDolibarrName =Zapier para Dolibarr
 ModuleZapierForDolibarrDesc =Módulo Zapier para Dolibarr
-ZapierForDolibarrSetup =Configurações do Zapier para Dolibarr
+ZapierForDolibarrSetup=Configurações do Zapier para Dolibarr
+ZapierDescription=Interface com Zapier
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 5f98a41fc2e..9c2a8102eac 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Linhas vinculadas de faturas
 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
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Vincular
@@ -209,7 +209,7 @@ Codejournal=Diário
 JournalLabel=Journal label
 NumPiece=Número da peça
 TransactionNumShort=Núm. de transação
-AccountingCategory=Grupos personalizados
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de conta contábil. Eles serão usados ​​para relatórios contábeis personalizados.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Linhas ainda não encadernadas, use o menu <a href="%
 
 ## Import
 ImportAccountingEntries=Entradas contábeis
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Atenção, este relatório não é baseado no Ledger, portanto, não contém transações modificadas manualmente no Ledger. Se a sua periodização estiver atualizada, a visão da contabilidade será mais precisa.
 ExpenseReportJournal=Diário de relatórios de despesas
 InventoryJournal=Diário de Inventário
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 6db6d8a49dc..b5400f7bcac 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -9,7 +9,7 @@ VersionExperimental=Experimental
 VersionDevelopment=Desenvolvimento
 VersionUnknown=Desconhecida
 VersionRecommanded=Recomendada
-FileCheck=Fileset Integrity Checks
+FileCheck=Verificações de integridade do conjunto de ficheiros
 FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
 FileIntegrityIsStrictlyConformedWithReference=A integridade dos ficheiros é ajustada rigorosamente conforme a referência.
 FileIntegrityIsOkButFilesWereAdded=A verificação de integridade dos arquivos passou, no entanto, alguns novos arquivos foram adicionados.
@@ -37,8 +37,9 @@ UnlockNewSessions=Remover bloqueio de ligação
 YourSession=A sua sessão
 Sessions=Sessões de usuários
 WebUserGroup=Utilizador/grupo do servidor da Web
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFiles=Permissões em ficheiros
+PermissionsOnFilesInWebRoot=Permissões em ficheiros na pasta web principal
+PermissionsOnFile=Permissões em ficheiros %s
 NoSessionFound=Sua configuração de PHP parece não permitir a listagem de sessões ativas. O diretório usado para salvar as sessões (<b> %s </b>) pode ser protegido (por exemplo, pelas permissões do sistema operacional ou pela diretiva open_basedir do 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
@@ -62,6 +63,7 @@ IfModuleEnabled=Nota: sim, só é eficaz se o <b>módulo %s</b> estiver ativado
 RemoveLock=Remova / renomeie o arquivo <b> %s </b> se existir, para permitir o uso da ferramenta Atualizar / Instalar.
 RestoreLock=Restaure o arquivo <b> %s </b>, apenas com permissão de leitura, para desativar qualquer uso posterior da ferramenta Atualizar / Instalar.
 SecuritySetup=Configuração de segurança
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Esta área fornece funções de administração. Use o menu
 Purge=Limpar
 PurgeAreaDesc=Esta página permite excluir todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b> %s </b>). Usar esse recurso normalmente não é necessário. Ele é fornecido como uma solução alternativa para usuários cujo Dolibarr é hospedado por um provedor que não oferece permissões para excluir arquivos gerados pelo servidor da web.
 PurgeDeleteLogFile=Eliminar os ficheiros de registo, incluindo <b>%s</b> definido para o módulo Syslog (não existe risco de perda de dados)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Exclua todos os arquivos do diretório: <b> %s </b>. <br> Isso excluirá todos os documentos gerados relacionados aos elementos (terceiros, faturas etc ...), arquivos carregados no módulo ECM, despejos de backup de banco de dados e arquivos temporários.
 PurgeRunNow=Limpar agora
@@ -232,6 +234,7 @@ BoxesAvailable=Aplicativos disponíveis
 BoxesActivated=Aplicativos ativados
 ActivateOn=Ativar sobre
 ActiveOn=Ativado sobre
+ActivatableOn=Activatable on
 SourceFile=Ficheiro origem
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se o JavaScript e Ajax estiverem ativos
 Required=Requerido
@@ -347,9 +350,10 @@ LastActivationAuthor=Autor mais recente de ativação
 LastActivationIP=Último IP ativo
 UpdateServerOffline=Atualizar servidor offline
 WithCounter=Gerir um contador
-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 carateres<br><b>{cccc000}</b> o código de cliente em N carateres, seguido de um contador dedicado para o cliente. Este contador é reiniciado ao mesmo tempo que o contador global.<br><b>{tttt}</b> O código do tipo de terceiro em N carateres (consulte o menu Início->Configuração->Dicionário->Tipos de terceiros). Se adicionou esta etiqueta, o contador será diferente para cada tipo de terceiro.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Quaisquer outros caracteres na máscara não sofrerão alterações.<br>Não são permitidos espaços.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>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>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Deixar esse campo em branco significa que esse valor
 ExtrafieldParamHelpselect=Lista de valores devem ser linhas com chave de formato, o valor (onde chave pode não ser '0') <br> <br> por exemplo: <br> 1, value1 <br> 2, value2 <br> code3, value3 <br> ... <br> <br> A fim de ter o lista dependendo de outra 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 ter a lista de acordo com uma outra lista: <br> 1, value1 | <i> parent_list_code </i>: parent_key <br> 2, valor2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=A lista de valores deve ser composta por linhas com chave de formato, valor (onde a chave não pode ser '0') <br> <br> por exemplo: <br> 1, valor1 <br> 2, valor2 <br>19bz3, valor3
 ExtrafieldParamHelpradio=A lista de valores deve ser composta por linhas com chave de formato, valor (onde a chave não pode ser '0') <br> <br> por exemplo: <br> 1, valor1 <br> 2, valor2 <br>19bz3, valor3
-ExtrafieldParamHelpsellist=A lista de valores vem de uma tabela <br> Sintaxe: table_name: label_field: id_field :: filter <br> Exemplo: c_typent: libelle: id :: filter <br> <br> - id_fieldcampo int = 1) para exibir apenas o valor ativo <br> Você também pode usar $ ID $ no filtro que é o id atual do objeto atual <br> Para usar um SELECT no filtro, use a palavra-chave $ SEL $ para ignorar a proteção anti-injeção. <br> se você quiser filtrar por campos extras, use a sintaxe extra.fieldcode = ... (onde o código do campo é o código do campo extra) <br> <br> Para ter a lista dependendo de outra lista de opções de atributos complementares: <br>: libelle: idpent_ c_typent: <i> parent_list_code </i> | parent_column: filtro <br> <br> para ter a lista de acordo com uma outra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: Filtro
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Biblioteca utilizada para gerar PDF
@@ -541,6 +545,8 @@ Module40Name=Fornecedores
 Module40Desc=Fornecedores e gestão de compras (ordens de compra e faturamento de faturas de fornecedores)
 Module42Name=Registos Debug
 Module42Desc=Funções de registo de eventos (ficheiro, registo do sistema, ...). Tais registos, são para fins técnicos/depuração.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editores
 Module49Desc=Gestão de editores
 Module50Name=Produtos
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacidades de conversões GeoIP Maxmind
 Module3200Name=Arquivos inalteráveis
 Module3200Desc=Ativar um registro inalterável de eventos de negócios. Eventos são arquivados em tempo real. O log é uma tabela somente leitura de eventos encadeados que podem ser exportados. Este módulo pode ser obrigatório para alguns países.
+Module3400Name=Redes sociais
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=GRH
 Module4000Desc=Gestão de recursos humanos (gestão de departamento e contratos de funcionários)
 Module5000Name=Multiempresa
 Module5000Desc=Permite-lhe gerir várias empresas
-Module6000Name=Fluxo de trabalho
-Module6000Desc=Gerenciamento de fluxo de trabalho (criação automática de objeto e / ou mudança automática de status)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Sites da Web
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Gerenciamento de solicitação de licença
@@ -805,7 +813,8 @@ PermissionAdvanced253=Criar/modificar utilizadores internos/externos e permissõ
 Permission254=Criar/modificar apenas utilizadores externos
 Permission255=Modificar a palavra-passe de outros utilizadores
 Permission256=Eliminar ou desativar outros utilizadores
-Permission262=Estenda o acesso a todos os terceiros (não apenas terceiros para os quais o usuário é um representante de vendas). <br> Não é eficaz para usuários externos (sempre limitados a eles próprios para propostas, pedidos, faturas, contratos, etc.). <br> Não efetivo para projetos (apenas regras sobre permissões de projeto, visibilidade e questões de atribuição).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Consultar CA
 Permission272=Consultar faturas
 Permission273=Emitir fatura
@@ -1175,7 +1184,8 @@ SetupDescription2=As duas seções a seguir são obrigatórias (as duas primeira
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Parâmetros básicos usados para personalizar o comportamento padrão de seu aplicativo (por exemplo, para recursos relacionados ao país).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Este software é um conjunto de vários módulos / aplicativos. Os módulos relacionados às suas necessidades devem ser habilitados e configurados. As entradas do menu aparecerão com a ativação desses módulos.
 SetupDescription5=Outras entradas do menu Setup gerenciam parâmetros opcionais.
-LogEvents=Eventos de auditoria da segurança
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Auditoria
 InfoDolibarr=Sobre o Dolibarr
 InfoBrowser=Sobre o navegador
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=A execução do processo de atualização pare
 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 é sequencial sem redefinir
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Mostrar id profissional com endereços
 ShowVATIntaInAddress=Ocultar número de IVA intracomunitário com endereços
 TranslationUncomplete=Tradução parcial
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Servidor proxy: Nome / Endereço
 MAIN_PROXY_PORT=Servidor proxy: porta
 MAIN_PROXY_USER=Servidor proxy: Login / usuário
 MAIN_PROXY_PASS=Servidor proxy: senha
-DefineHereComplementaryAttributes=Defina aqui quaisquer atributos adicionais / personalizados que deseja incluir: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Atributos complementares
 ExtraFieldsLines=Atributos complementares (linhas)
 ExtraFieldsLinesRec=Atributos complementares (linhas de faturas de modelos)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Nome de utilizador (Unix)
 LDAPFieldLoginExample=Exemplo: uid
 LDAPFilterConnection=Filtro de pesquisa
 LDAPFilterConnectionExample=Exemplo: & (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Nome de utilizador (samba, activedirectory)
 LDAPFieldLoginSambaExample=Exemplo: samaccountname
 LDAPFieldFullname=Nome completo
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=A sua empresa foi definida para não utilizar IVA (Iní
 AccountancyCode=Código de Contabilidade
 AccountancyCodeSell=Código de contabilidade de vendas
 AccountancyCodeBuy=Código de contabilidade de compras
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Configuração do módulo "Eventos e agenda"
 PasswordTogetVCalExport=Chave de autorização para exportação do link vcal.
+SecurityKey = Security Key
 PastDelayVCalExport=Não exportar evento com mais de
 AGENDA_USE_EVENT_TYPE=Use tipos de eventos (gerenciados no menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Definir automaticamente este valor padrão para o tipo de evento no formulário de criação de evento
@@ -1879,7 +1892,7 @@ 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.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Entre aqui entre chaves, lista de números de bytes que representam o símbolo da moeda. Por exemplo: para $, insira [36] - para o brasil real R $ [82,36] - para €, insira [8364]
 ColorFormat=As cores RGB está no formato HEX, por exemplo: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Margem inferior do PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Defina isto como "sim" se este grupo for uma computação de outros grupos
-EnterCalculationRuleIfPreviousFieldIsYes=Insira a regra de cálculo se o campo anterior foi definido como Sim (por exemplo, 'CODEGRP1 + CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Várias variantes de idiomas encontradas
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtro Regex para limpar valor (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Configuração do módulo Redes Sociais
 EnableFeatureFor=Ativar recursos para <strong> %s </ strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Coletor de e-mail
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=Novo coletor de email
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index de774f7acff..0a545f07030 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -4,7 +4,7 @@ Actions=Eventos
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
-LocalAgenda=Calendário interno
+LocalAgenda=Calendário predefinido
 ActionsOwnedBy=Evento de
 ActionsOwnedByShort=Proprietário
 AffectedTo=Atribuído a
@@ -14,13 +14,13 @@ EventsNb=Número de eventos
 ListOfActions=Lista de Eventos
 EventReports=Relatórios de eventos
 Location=Localização
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Evento atribuído a qualquer utilizador do grupo
 EventOnFullDay=Evento para todo(s) o(s) dia(s)
 MenuToDoActions=Todos os eventos incompletos
 MenuDoneActions=Todos os eventos terminados
 MenuToDoMyActions=Os meus eventos incompletos
 MenuDoneMyActions=Os meus eventos terminados
-ListOfEvents=Lista de eventos (calendário interno)
+ListOfEvents=Lista de eventos (calendário predefinido)
 ActionsAskedBy=Eventos reportados por
 ActionsToDoBy=Eventos atribuídos a
 ActionsDoneBy=Eventos realizados por
@@ -31,8 +31,8 @@ ViewWeek=Vista semanal
 ViewPerUser=Vista por utilizador
 ViewPerType=Vista por tipo
 AutoActions= Preenchimento automático
-AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
-AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
+AgendaAutoActionDesc= Aqui você pode definir eventos que deseja que o Dolibarr crie automaticamente na Agenda. Se nada for marcado, apenas as ações manuais serão incluídas nos logs e exibidas na Agenda. O rastreamento automático de ações de negócios feitas em objetos (validação, mudança de status) não será salvo.
+AgendaSetupOtherDesc= Esta página oferece opções para permitir a exportação de seus eventos Dolibarr para uma agenda externa (Thunderbird, Google Agenda etc ...)
 AgendaExtSitesDesc=Esta página permite declarar as fontes externas de calendários para ver os seus eventos na agenda do Dolibarr.
 ActionsEvents=Eventos em que o Dolibarr criará uma acção em agenda automáticamente
 EventRemindersByEmailNotEnabled=Os lembretes de eventos por email não foram ativados na configuração do módulo %s.
@@ -63,7 +63,7 @@ ShipmentClassifyClosedInDolibarr=Expedição %s, classificada como faturada
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
 ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
 ShipmentDeletedInDolibarr=Expedição %s, eliminada
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=Receção %s validada
 OrderCreatedInDolibarr=Encomenda %s, criada
 OrderValidatedInDolibarr=Encomenda %s, validada
 OrderDeliveredInDolibarr=Encomenda %s, classificada como entregue
@@ -72,22 +72,22 @@ OrderBilledInDolibarr=Encomenda %s, classificada como faturada
 OrderApprovedInDolibarr=Encomenda %s, aprovada
 OrderRefusedInDolibarr=Encomenda %s, recusada
 OrderBackToDraftInDolibarr=Encomenda %s, voltou ao estado de rascunho
-ProposalSentByEMail=Commercial proposal %s sent by email
-ContractSentByEMail=Contract %s sent by email
-OrderSentByEMail=Sales order %s sent by email
-InvoiceSentByEMail=Customer invoice %s sent by email
-SupplierOrderSentByEMail=Purchase order %s sent by email
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
-SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
-ShippingSentByEMail=Shipment %s sent by email
+ProposalSentByEMail=Proposta comercial %s enviada por email
+ContractSentByEMail=Contrato %s enviado por email
+OrderSentByEMail=Pedido de venda %s enviado por e-mail
+InvoiceSentByEMail=Fatura do cliente %s enviada por e-mail
+SupplierOrderSentByEMail=Pedido de compra %s enviado por e-mail
+ORDER_SUPPLIER_DELETEInDolibarr=Ordem de compra %s removida
+SupplierInvoiceSentByEMail=Fatura do fornecedor %s enviada por e-mail
+ShippingSentByEMail=Remessa %s enviada por e-mail
 ShippingValidated= Expedição %s, validada
-InterventionSentByEMail=Intervention %s sent by email
+InterventionSentByEMail=Intervenção %s enviada por email
 ProposalDeleted=Orçamento eliminado
 OrderDeleted=Encomenda eliminada
 InvoiceDeleted=Fatura eliminada
-DraftInvoiceDeleted=Draft invoice deleted
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+DraftInvoiceDeleted=Factura rascunho apagada
+CONTACT_CREATEInDolibarr=Contacto %s criado
+CONTACT_DELETEInDolibarr=Contacto %s apagado
 PRODUCT_CREATEInDolibarr=O produto %s foi criado
 PRODUCT_MODIFYInDolibarr=O produto %s foi modificado
 PRODUCT_DELETEInDolibarr=O produto %s foi eliminado
@@ -119,6 +119,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
 MRP_MO_PRODUCEDInDolibarr=MO produced
 MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
+PAIDInDolibarr=%s paid
 ##### End agenda events #####
 AgendaModelModule=Modelos de documento para o evento
 DateActionStart=Data de início
@@ -130,7 +131,7 @@ AgendaUrlOptions4=<b>logint =%s</b> para restringir a saída às ações atribu
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> para que apenas obtenha eventos vinculados ao projeto <b>__PROJECT_ID__ </b>.
 AgendaUrlOptionsNotAutoEvent=<b> notactiontype = systemauto </ b> para excluir eventos automáticos.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Mostrar aniversários dos contactos
+AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Ocultar aniversários dos contactos
 Busy=Ocupado
 ExportDataset_event1=Lista de eventos da agenda
@@ -152,6 +153,7 @@ ActionType=Tipo de evento
 DateActionBegin=Data de início do evento
 ConfirmCloneEvent=Tem a certeza que quer clonar o evento <b>%s</b>?
 RepeatEvent=Repetir evento
+OnceOnly=Once only
 EveryWeek=Semanalmente
 EveryMonth=Mensalmente
 DayOfMonth=Dia do mês
@@ -165,4 +167,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+BrowserPush=Browser Popup Notification
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 93df84b3707..71855ac6da8 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Seu mandato SEPA
 FindYourSEPAMandate=Este é o seu mandato da SEPA para autorizar a nossa empresa a efetuar um pedido de débito direto ao seu banco. Devolva-o assinado (digitalização do documento assinado) ou envie-o por correio para
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index ce7dadc46fc..7ad76c2e3ea 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -54,9 +54,10 @@ InvoiceCustomer=Fatura a cliente
 CustomerInvoice=Fatura a cliente
 CustomersInvoices=Faturas a clientes
 SupplierInvoice=Fatura de fornecedor
-SuppliersInvoices=Faturas de fornecedores
+SuppliersInvoices=Faturas do fornecedor
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Fatura de fornecedor
-SupplierBills=faturas de fornecedores
+SupplierBills=Faturas do fornecedor
 Payment=Pagamento
 PaymentBack=Restituição
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Pagamentos já efetuados
 PaymentsBackAlreadyDone=Reembolsos já feitos
 PaymentRule=Estado do Pagamento
 PaymentMode=Tipo de pagamento
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Cartão de débito/crédito
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Data da última geração
 DateLastGenerationShort=Data mais recente gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Número de geração de faturas já efetuadas
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Número de geração feito
 MaxGenerationReached=Número máximo de gerações atingidas
 InvoiceAutoValidate=Validar faturas automaticamente
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Dentro de 14 dias após o final do mês
 FixAmount=Quantidade fixa - 1 linha com rótulo '%s'
 VarAmount=Quantidade variável (%% total.)
 VarAmountOneLine=Quantidade variável (%% tot.) - 1 linha com o rótulo '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Transferência bancária
 PaymentTypeShortVIR=Transferência bancária
@@ -494,12 +498,16 @@ Cash=Numerário
 Reported=Atrasado
 DisabledBecausePayments=Não é possível, pois há alguns pagamentos
 CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento, uma vez que existe pelo menos uma fatura classificada como paga
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Pagamento esperado
 CantRemoveConciliatedPayment=Não é possível remover o pagamento reconciliado
 PayedByThisPayment=Pago por esse pagamento
 ClosePaidInvoicesAutomatically=Classifica automaticamente todas as faturas padrão, de adiantamento ou de substituição como "Pagas" quando o pagamento é feito inteiramente.
 ClosePaidCreditNotesAutomatically=Classifica automaticamente todas as notas de crédito como "Pagas" quando o reembolso é feito totalmente.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Todas as faturas sem sobras a pagar serão automaticamente encerradas com o status "Pago".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Você precisa criar uma fatura padrão pri
 PDFCrabeDescription=Fatura PDF template Crabe. Um modelo de fatura completo (implementação antiga do modelo Sponge)
 PDFSpongeDescription=Modelo PDF da fatura Esponja. Um modelo de fatura completo
 PDFCrevetteDescription=Modelo PDF da fatura Crevette. Um modelo de fatura completo para faturas de situação
-TerreNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn para facturas standard e %syymm-nnnn para notas de crédito em que yy é ano, mm é mês e nnnn é uma sequência sem pausa e sem retorno a 0
-MarsNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn para facturas standard, %syymm-nnnn para facturas de substituição, %syymm-nnnn para facturas de adiantamento e %syymm-nnnn para notas de crédito onde yy é ano, mm é mês e nnnn é uma sequência sem pausa e sem voltar para 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=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=Devolve o número com o formato %syymm-nnnn para facturas standard, %syymm-nnnn para notas de crédito e %syymm-nnnn para facturas de adiantamento onde yy é ano, mm é mês e nnnn é uma sequência sem pausa e sem retorno a 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -562,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Tem certeza de que deseja excluir a fatura do modelo?
 CreateOneBillByThird=Crie uma fatura por terceiro (caso contrário, uma fatura por pedido)
-BillCreated=%s projeto (s) criado (s)
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Estado da geração de documentos
 DoNotGenerateDoc=Não gerar arquivo de documento
 AutogenerateDoc=Auto gerar arquivo de documento
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 494becf8c75..0573f7e4001 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
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=Informação RSS
 BoxLastProducts=Produtos / serviços %s mais recentes
@@ -17,9 +18,13 @@ BoxLastActions=Últimas ações
 BoxLastContracts=Últimos contratos
 BoxLastContacts=Últimos contactos/endereços
 BoxLastMembers=Últimos membros
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Últimas intervenções
 BoxCurrentAccounts=Saldo de abertura das contas
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Últimas %s notícias de %s
 BoxTitleLastProducts=Produtos / serviços: último %s modificado
 BoxTitleProductsAlertStock=Produtos: alerta de stock
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Contabilidade
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index 57c37b4515a..fdc8741b851 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Área de tags / categorias de fornecedores
 CustomersCategoriesArea=Área de etiquetas/categorias de clientes
 MembersCategoriesArea=Área de etiquetas/categorias de membros
 ContactsCategoriesArea=Área de etiquetas/categorias de contactos
-AccountsCategoriesArea=Área de etiquetas/categorias de contas
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Área de etiquetas/categorias de projetos
 UsersCategoriesArea=Users tags/categories area
 SubCats=Subcategorias
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Mostrar etiqueta/categoria
 ByDefaultInList=Por predefinição na lista
 ChooseCategory=Escolha a categoria
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 6e9e1163487..4ee185ca7d9 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -27,9 +27,9 @@ AliasNames=Pseudónimo (comercial, marca registada, ...)
 AliasNameShort=Nome do alias
 Companies=Empresas
 CountryIsInEEC=País faz parte da Comunidade Económica Europeia
-PriceFormatInCurrentLanguage=Price display format in the current language and currency
+PriceFormatInCurrentLanguage=Formato de preço no idioma e moeda atuais
 ThirdPartyName=Nome de terceiro
-ThirdPartyEmail=Third-party email
+ThirdPartyEmail=Email de terceiros
 ThirdParty=Terceiro
 ThirdParties=Terceiros
 ThirdPartyProspects=Clientes Potenciais
@@ -43,9 +43,10 @@ Individual=Particular
 ToCreateContactWithSameName=Criará automaticamente um contato / endereço com as mesmas informações do terceiro sob o terceiro. Na maioria dos casos, mesmo que seu terceiro seja uma pessoa física, criar um terceiro sozinho é suficiente.
 ParentCompany=Empresa-mãe
 Subsidiaries=Subsidiárias
-ReportByMonth=Relatório por mês
-ReportByCustomers=Relatório por cliente
-ReportByQuarter=Relatório por trimestre
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Código cortesía
 RegisteredOffice=Domicilio social
 Lastname=Apelidos
@@ -53,10 +54,10 @@ Firstname=Primeiro Nome
 PostOrFunction=Posição da tarefa
 UserTitle=Título
 NatureOfThirdParty=Natureza do terceiro
-NatureOfContact=Nature of Contact
+NatureOfContact=Natureza do contacto
 Address=Direcção
 State=Concelho
-StateCode=State/Province code
+StateCode=Código de região
 StateShort=Concelho
 Region=Distrito
 Region-State=Distrito - Concelho
@@ -124,7 +125,7 @@ ProfId1AT=ID Prof. 1 (USt.-IdNr)
 ProfId2AT=ID Prof. 2 (USt.-Nr)
 ProfId3AT=ID Prof. 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=Número EORI
 ProfId6AT=-
 ProfId1AU=ID Prof. 1 (ABN)
 ProfId2AU=-
@@ -172,14 +173,20 @@ ProfId1ES=ID Prof. 1 (CIF/NIF)
 ProfId2ES=ID Prof. 2 (Número de segurança social)
 ProfId3ES=ID Prof. 3 (CNAE)
 ProfId4ES=ID Prof. 4 (Número colegiado)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (Número EORI)
 ProfId6ES=-
 ProfId1FR=ID Prof. 1 (SIREN)
 ProfId2FR=ID Prof. 2 (SIRET)
 ProfId3FR=ID Prof. 3 (NAF, antigo APE)
 ProfId4FR=ID Prof. 4 (RCS/RM)
-ProfId5FR=Número EORI
+ProfId5FR=Prof Id 5 (Número EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Número Registo
 ProfId2GB=-
 ProfId3GB=SIC
@@ -202,12 +209,13 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=Número EORI
+ProfId6IT=-
 ProfId1LU=ID Prof. 1 (R.C. Luxemburgo)
 ProfId2LU=ID Prof. 2 (Permissão comercial)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=Número EORI
 ProfId6LU=-
 ProfId1MA=ID Prof. 1 (R.C.)
 ProfId2MA=ID Prof. 2 (Patente)
@@ -231,7 +239,7 @@ ProfId1PT=ID Prof. 1 (NIF)
 ProfId2PT=ID Prof. 2 (Núm. Segurança Social)
 ProfId3PT=ID Prof. 3 (Núm. Reg. Comercial)
 ProfId4PT=ID Prof. 4 (Conservatória)
-ProfId5PT=Número EORI
+ProfId5PT=Prof Id 5 (Número EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (Número EORI)
 ProfId6RO=-
 ProfId1RU=ID Prof. 1 (OGRN)
 ProfId2RU=ID Prof. 2 (INN)
@@ -282,11 +290,11 @@ 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
 HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+HasNoRelativeDiscountFromSupplier=Você não tem desconto relativo predefinido deste fornecedor
 CompanyHasAbsoluteDiscount=Este cliente tem descontos disponíveis (notas de créditos ou adiantamentos) para <b> %s </ b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Este cliente tem descontos disponíveis (comerciais, adiantamentos) para <b> %s </ b> %s
 CompanyHasCreditNote=Este cliente ainda tem notas de crédito para <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasNoAbsoluteDiscountFromSupplier=Você não tem desconto ou nota de crédito disponível neste fornecedor
 HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
 HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
 HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
@@ -310,7 +318,7 @@ FromContactName=Nome:
 NoContactDefinedForThirdParty=Não existem contactos definidos para este terceiro
 NoContactDefined=Nenhum contacto definido para este terceiro
 DefaultContact=Contacto por Defeito
-ContactByDefaultFor=Default contact/address for
+ContactByDefaultFor=Contacto / endereço predefinido para 
 AddThirdParty=Criar terceiro
 DeleteACompany=Eliminar uma Empresa
 PersonalInformations=Informação Pessoal
@@ -330,7 +338,7 @@ CompanyDeleted=A Empresa "%s" foi Eliminada
 ListOfContacts=Lista de Contactos
 ListOfContactsAddresses=Lista de Contactos
 ListOfThirdParties=Lista de Terceiros
-ShowCompany=Third Party
+ShowCompany=Terceiro
 ShowContact=Endereço de contacto
 ContactsAllShort=Todos (sem filtro)
 ContactType=Tipo de Contacto
@@ -358,8 +366,8 @@ VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Com
 VATIntraManualCheck=Você também pode verificar manualmente no site da Comissão Europeia <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Verificação Impossivel. O serviço de verificação não é prestado pelo país membro (%s).
 NorProspectNorCustomer=Não é cliente potencial, nem cliente
-JuridicalStatus=Business entity type
-Workforce=Workforce
+JuridicalStatus=Forma Jurídica
+Workforce=Colaboradores
 Staff=Funcionários
 ProspectLevelShort=Cli. Potenc.
 ProspectLevel=Cliente Potencial
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Risco alcançado
 OutstandingBill=Montante máximo para faturas pendentes
 OutstandingBillReached=Montante máximo para faturas pendente foi alcançado
 OrderMinAmount=Quantidade mínima para encomenda
-MonkeyNumRefModelDesc=Retorna um número com o formato %syymm-nnnn para o código do cliente e %syymm-nnnn para o código do fornecedor, onde yy é year, mm é month e nnnn é uma sequência sem quebra e sem retorno para 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Código de cliente/fornecedor livre sem verificação. pode ser modificado em qualquer momento.
 ManagingDirectors=Nome Diretor(es) (DE, diretor, presidente ...)
 MergeOriginThirdparty=Terceiro duplicado (terceiro que deseja eliminar)
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 03ccdc3308f..516a0aaed54 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=Compras do SGST
 VATCollected=IVA Recuperado
 StatusToPay=A pagar
 SpecialExpensesArea=Área para todos os pagamentos especiais
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Imposto social ou fiscal
 SocialContributions=Impostos sociais ou fiscais
 SocialContributionsDeductibles=Impostos sociais ou fiscais dedutíveis
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Pagamento de fatura do cliente
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Pagamento da taxa social/fiscal
 PaymentVat=Pagamento IVA
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Lista de pagamentos
 ListOfCustomerPayments=Lista de pagamentos de clientes
 ListOfSupplierPayments=Lista de pagamentos de fornecedores
@@ -104,6 +106,8 @@ LT2PaymentES=Pagamento IRPF
 LT2PaymentsES=Pagamentos IRPF
 VATPayment=Pagamento de imposto sobre vendas
 VATPayments=Pagamentos de impostos sobre vendas
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Reembolso de imposto sobre vendas
 NewVATPayment=Novo pagamento de impostos sobre vendas
 NewLocalTaxPayment=Novo imposto %s pagamento
@@ -134,9 +138,17 @@ NoWaitingChecks=Nenhum cheque aguarda depósito.
 DateChequeReceived=Data da receção do cheque
 NbOfCheques=Nº de cheques
 PaySocialContribution=Pagar um imposto social/fiscal
-ConfirmPaySocialContribution=Tem certeza de que deseja classificar este imposto social ou fiscal como pago?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Eliminar um pagamento de imposto social ou fiscal
-ConfirmDeleteSocialContribution=Tem certeza de que deseja eliminar este pagamento de imposto social/fiscal?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Impostos e pagamentos sociais e fiscais
 CalcModeVATDebt=Modo <b> %sVAT no compromisso accounting%s </ b>.
 CalcModeVATEngagement=Modo <b> %sVAT em rendimentos-expenses%s </ b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- Inclui os pagamentos reais feitos em faturas, despesas, IVA e
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=Inclui todas as linhas de crédito do diário de venda.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Inclui registro em seu livro contábil com contas contábeis que tem o grupo "DESPESA" ou "LUCRO"
 RulesResultBookkeepingPredefined=Inclui registro em seu livro contábil com contas contábeis que tem o grupo "DESPESA" ou "LUCRO"
 RulesResultBookkeepingPersonalized=Ele mostra um registro em seu livro contábil com contas contábeis <b> agrupadas por grupos personalizados </ b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Relatório fiscal de vendas de terceiros
 VATReportByCustomers=Relatório fiscal de venda por cliente
 VATReportByCustomersInInputOutputMode=Relatório do IVA do cliente recolhido e pago
 VATReportByQuartersInInputOutputMode=Relatório por taxa de imposto de venda do imposto cobrado e pago
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Relate imposto 2 pela taxa
 LT2ReportByQuarters=Relate imposto 3 pela taxa
 LT1ReportByQuartersES=Relatório por taxa de retorno
@@ -217,7 +231,7 @@ Pcg_subtype=Subtipo de PCG
 InvoiceLinesToDispatch=Linhas de fatura para despacho
 ByProductsAndServices=Por produto e serviço
 RefExt=Ref externa
-ToCreateAPredefinedInvoice=Para criar uma fatura modelo, crie uma fatura padrão e, sem validá-la, clique no botão "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Associar a encomenda
 Mode1=Método 1
 Mode2=Método 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=A conta contábil dedicada definida no cartão
 ACCOUNTING_ACCOUNT_SUPPLIER=Conta de contabilidade usada para fornecedores de terceiros
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirme o clone de um imposto social / fiscal
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Cloná-la para o mês seguinte
 SimpleReport=Relatório simples
 AddExtraReport=Relatórios extras (adicionar relatório de cliente estrangeiro e nacional)
@@ -253,7 +269,8 @@ AccountingAffectation=Atribuição contábil
 LastDayTaxIsRelatedTo=Último dia do período em que o imposto está relacionado
 VATDue=Imposto de venda reivindicado
 ClaimedForThisPeriod=Reivindicado pelo período
-PaidDuringThisPeriod=Pago durante este período
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=Por taxa de imposto de venda
 TurnoverbyVatrate=Volume de negócios faturado por taxa de imposto sobre vendas
 TurnoverCollectedbyVatrate=Volume de negócios cobrado pela taxa de imposto sobre vendas
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/pt_PT/ecm.lang b/htdocs/langs/pt_PT/ecm.lang
index 7dd458dd801..05e460b49ed 100644
--- a/htdocs/langs/pt_PT/ecm.lang
+++ b/htdocs/langs/pt_PT/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Ficheiro ainda não indexado na base de dados (tente
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 57f8d93ee48..60c54d79eb1 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=<b>%s</b> Directorio não encontrado (caminho mau, permissões
 ErrorFunctionNotAvailableInPHP=A função  <b>%s</b> é requerida por esta Funcionalidade, mas não se encontra disponivel nesta Versão/Instalação de PHP.
 ErrorDirAlreadyExists=Já existe uma pasta com esse Nome.
 ErrorFileAlreadyExists=Um arquivo com esse nome já existe.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Arquivo não foi recebido completamente pelo servidor.
 ErrorNoTmpDir=directorio Temporário %s não existe.
 ErrorUploadBlockedByAddon=Upload bloqueado por um plugin PHP Apache /.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/pt_PT/externalsite.lang b/htdocs/langs/pt_PT/externalsite.lang
index b21c17df0bb..8f9247e1b7e 100644
--- a/htdocs/langs/pt_PT/externalsite.lang
+++ b/htdocs/langs/pt_PT/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configurar ligação para site da Web externo
-ExternalSiteURL=URL do Site Externo
+ExternalSiteSetup=Configurar hiperligação para o site da Web externo
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=O módulo Site Externo não está configurado correctamente.
 ExampleMyMenuEntry=Minha entrada de menu
diff --git a/htdocs/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang
index 00fd605bc8a..969f798f133 100644
--- a/htdocs/langs/pt_PT/interventions.lang
+++ b/htdocs/langs/pt_PT/interventions.lang
@@ -35,7 +35,7 @@ InterventionValidatedInDolibarr=Intervenção %s validada
 InterventionModifiedInDolibarr=Intervenção %s modificada
 InterventionClassifiedBilledInDolibarr=Intervenção %s definida como faturada
 InterventionClassifiedUnbilledInDolibarr=Intervenção %s definida como não faturada
-InterventionSentByEMail=Intervention %s sent by email
+InterventionSentByEMail=Intervenção %s enviada por email
 InterventionDeletedInDolibarr=Intervenção %s eliminada
 InterventionsArea=Área de Intervenções
 DraftFichinter=Intervenções rascunho
@@ -64,3 +64,5 @@ InterLineDuration=Duração da intervenção na linha
 InterLineDesc=Descrição da intervenção na linha
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reabrir
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 69cfcbc202c..c5cecedc64b 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Data de Modif.
 IPModification=Modification IP
 DateLastModification=A última data de alteração
 DateValidation=Data de Validação
+DateSigning=Signing date
 DateClosing=Data de Encerramento
 DateDue=Data de Vencimento
 DateValue=Data do valor
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Preço por unidade (Excl. IVA) (moeda)
 UnitPriceTTC=Preço Unitário
 PriceU=P.U.
 PriceUHT=P.U. (líquido)
-PriceUHTCurrency=P.U. (moeda)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=P.U. (inc. impostos)
 Amount=Montante
 AmountInvoice=Montante da Fatura
@@ -389,6 +390,8 @@ AmountTotal=Montante Total
 AmountAverage=Montante médio
 PriceQtyMinHT=Preço para quandidade min. (excl. IVA)
 PriceQtyMinHTCurrency=Preço da quantidade min. (excl. IVA) (moeda)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentagem
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Membros
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Taxas | Despesas Especiais
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menu inicio->configuração->segurança): %s Kb, PHP limit: %s Kb
-NoFileFound=Não existem documentos guardados nesta pasta
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Idioma atual
 CurrentTheme=Tema Actual
 CurrentMenuManager=Gestor de menu atual
@@ -899,8 +902,10 @@ ViewAccountList=Ver livro-mestre
 ViewSubAccountList=Ver livro-mestre da subconta
 RemoveString=Remover texto '%s'
 SomeTranslationAreUncomplete=Alguns dos idiomas oferecidos podem estar apenas parcialmente traduzidos ou conter erros. Por favor ajude a corrigir o seu idioma registando-se em <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> para adicionar as suas melhorias.
-DirectDownloadLink=Link de download direto (público/externo)
-DirectDownloadInternalLink=Link de download direto (precisa de ter sessão iniciada e precisa de permissões)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download do documento
 ActualizeCurrency=Atualizar taxa de conversão da moeda
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contactos
 SearchIntoMembers=Membros
 SearchIntoUsers=Utilizadores
 SearchIntoProductsOrServices=Produtos ou serviços
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projetos
 SearchIntoMO=Ordens de Fabrico
 SearchIntoTasks=Tarefas
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Atalho de teclado
 AssignedTo=Atribuído a
 Deletedraft=Eliminar rascunho
 ConfirmMassDraftDeletion=Confirmação de eliminação múltipla de rascunhos
-FileSharedViaALink=Ficheiro partilhado via link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Seleccione um terceiro em primeiro...
 YouAreCurrentlyInSandboxMode=Você está atualmente no modo %s "sandbox"
 Inventory=Inventário
 AnalyticCode=Código analítico
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Mostrar Mais Informações
 NoFilesUploadedYet=Por favor envie um documento em primeiro
 SeePrivateNote=Ver nota privada
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/pt_PT/margins.lang b/htdocs/langs/pt_PT/margins.lang
index 78c13ebbe04..3ce049b61cc 100644
--- a/htdocs/langs/pt_PT/margins.lang
+++ b/htdocs/langs/pt_PT/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Detalhes da margem
 ProductMargins=Margens do produto
 CustomerMargins=Margens do cliente
 SalesRepresentativeMargins=Margens de representantes de vendas
+ContactOfInvoice=Contact of invoice
 UserMargins=Margens do utilizador
 ProductService=Produto ou Serviço
 AllProducts=Todos os produtos e serviços
 ChooseProduct/Service=Escolher produto ou serviço
 ForceBuyingPriceIfNull=Forçar compra / preço de custo ao preço de venda, se não definido
-ForceBuyingPriceIfNullDetails=Se compra / preço de custo não definido, e esta opção "ON", a margem será zero on line (compra / preço de custo = preço de venda), caso contrário ("OFF"), a margem será igual ao padrão sugerido.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Método de margem para descontos globais
 UseDiscountAsProduct=Como um produto
 UseDiscountAsService=Como um serviço
@@ -31,12 +32,12 @@ MARGIN_TYPE=Preço de compra / custo sugerido por padrão para cálculo de marge
 MargeType1=Margem no melhor preço do fornecedor
 MargeType2=Margem no Preço Médio Ponderado (WAP)
 MargeType3=Margem no Preço de Custo
-MarginTypeDesc=* Margem sobre o melhor preço de compra = Preço de venda - Melhor preço de fornecedor definido no cartão do produto <br> * Margem no preço médio ponderado (WAP) = Preço de venda - Preço médio ponderado pelo produto (WAP) ou melhor preço do fornecedor se WAP ainda não definido br> * Margem no preço de custo = Preço de venda - Preço de custo definido no cartão do produto ou WAP se o preço de custo não estiver definido, ou melhor preço do fornecedor se o WAP ainda não estiver definido
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Preço de custo
 UnitCharges=Custos unitários
 Charges=Custos
 AgentContactType=Tipo de contacto usado para comissionamento
-AgentContactTypeDetails=Defina que tipo de contacto (associado em faturas) será usado no relatório de margens, por representante de vendas
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=A taxa deve ser um valor numérico
 markRateShouldBeLesserThan100=A taxa de marca deve ser menor que 100
 ShowMarginInfos=Mostrar informações da margem
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 861d7820707..d69590f69c2 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Lista de Membros rascunho (a Confirmar)
 MembersListValid=Lista de Membros validados
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=Lista de membros inativos
 MembersListQualified=Lista dos Membros qualificados
 MenuMembersToValidate=Membros rascunho
 MenuMembersValidated=Membros validados
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Membros inativos
 MembersWithSubscriptionToReceive=Membros com assinatura para receber
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscrição expirada
 MemberStatusActiveLateShort=Expirada
 MemberStatusPaid=Subscrição atualizada
 MemberStatusPaidShort=Atualizada
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Membro inativo
 MemberStatusResiliatedShort=Inativo
 MembersStatusToValid=Membros rascunho
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Membros inativos
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validado
@@ -82,6 +87,8 @@ Physical=Pessoa Singular
 Moral=Pessoa Coletiva
 MorAndPhy=Moral and Physical
 Reenable=Reactivar
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminar um membro
 ConfirmResiliateMember=Tem certeza de que deseja encerrar este membro?
 DeleteMember=Eliminar um membro
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Formato etiquetas
 DescADHERENT_ETIQUETTE_TEXT=Texto impresso na folhas de endereços dos membros
@@ -162,6 +170,7 @@ DocForLabels=Gerar folhas de endereço (Formato de saída realmente configuraç
 SubscriptionPayment=Pagamento Assinatura
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Membros estatísticas por país
 MembersStatisticsByState=Membros estatísticas por estado / província
 MembersStatisticsByTown=Membros estatísticas por localidade
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index f4005f2db69..4a04d50e4db 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 2fc1142e59e..923d1cfc45a 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Efetuar encomenda
 MakeOrder=Efetuar encomenda
 SupplierOrder=Ordem de compra
 SuppliersOrders=Ordens de compra
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Ordens de compra atuais
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=On-line
 OrderByPhone=Telefone
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=Um modelo simples de encomenda
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Faturar encomendas
+CreateInvoiceForThisSupplier=Faturar encomendas
 NoOrdersToInvoice=Sem encomendas por faturar
 CloseProcessedOrdersAutomatically=Classificar todas as encomendas selecionadas como "Processadas".
 OrderCreation=Criação de encomenda
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 58dad92008d..965d7efd03d 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Empresa com múltiplas atividades (todos os módulos principais)
 CreatedBy=Criado por %s
 ModifiedBy=Modificado por %s
 ValidatedBy=Validado por %s
+SignedBy=Signed by %s
 ClosedBy=Fechado por %s
 CreatedById=ID do utilizador que criou
 ModifiedById=ID do utilizador que efetuou a última alteração
@@ -244,6 +245,7 @@ NewKeyIs=Estas são as suas novas credenciais para efectuar login
 NewKeyWillBe=Sua nova chave para acessar o software será
 ClickHereToGoTo=Clique aqui para ir para %s
 YouMustClickToChange=No entanto, você deve primeiro clicar no seguinte link para validar esta alteração de palavra-passe
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Se você não solicitou esta alteração, ignore o e-mail. As suas credenciais serão mantidas em segurança.
 IfAmountHigherThan=Se o montante for maior que <strong>%s</strong>
 SourcesRepository=Repositório para fontes
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
index e03ea4093e0..b06edfcf759 100644
--- a/htdocs/langs/pt_PT/productbatch.lang
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Utilizar lote/número de série
-ProductStatusOnBatch=Sim (lote/número de série obrigatório)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=Não (não é necessário lote/número de série)
-ProductStatusOnBatchShort=Sim
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Não
 Batch=Lote/Nr. de Série
 atleast1batchfield=Data de validade ou Data de venda ou Lote/Número de Série
@@ -22,3 +24,12 @@ ProductLotSetup=Configuração do módulo Lote/Número de Série
 ShowCurrentStockOfLot=Mostrar o stock atual para o par produto/lote
 ShowLogOfMovementIfLot=Mostrar registo de movimentos para cada par produto/lote
 StockDetailPerBatch=Detalhes do estoque por lote
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 45ba3d7cb6a..a80fdcabe16 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Produtos/serviços predefinidos para venda
@@ -313,7 +314,7 @@ LastUpdated=Última atualização
 CorrectlyUpdated=Corretamente atualizado
 PropalMergePdfProductActualFile=Os arquivos usados ​​para adicionar ao PDF Azur são / é
 PropalMergePdfProductChooseFile=Selecionar ficheiros PDF
-IncludingProductWithTag=Incluindo produto / serviço com tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Preço padrão, preço real pode depender do cliente
 WarningSelectOneDocument=Por favor, selecione pelo menos um documento
 DefaultUnitToShow=Unidade
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index 77cd1521bfe..e7f30944323 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Lista de tarefas
 GoToListOfTimeConsumed=Ir para a lista de tempo consumido
 GanttView=Vista de Gantt
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Lista das propostas comerciais relacionadas ao projeto
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=Lista de faturas de clientes relacionadas ao projeto
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/pt_PT/propal.lang b/htdocs/langs/pt_PT/propal.lang
index b811205eff0..3d98940c1b8 100644
--- a/htdocs/langs/pt_PT/propal.lang
+++ b/htdocs/langs/pt_PT/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Enviar orçamento por correio
 DatePropal=Data do orçamento
 DateEndPropal=Válido até
 ValidityDuration=Duração da Validade
-CloseAs=Definir estado como
 SetAcceptedRefused=Definir aceite/recusado
 ErrorPropalNotFound=Orçamento %s Inexistente
 AddToDraftProposals=Adicionar ao orçamento rascunho
@@ -60,6 +59,7 @@ ConfirmClonePropal=Tem a certeza que pretende clonar o orçamento <b>%s</b>?
 ConfirmReOpenProp=Tem a certeza que pretende reabrir o orçamento <b>%s</b>?
 ProposalsAndProposalsLines=Orçamento e linhas
 ProposalLine=Linha do orçamento
+ProposalLines=Proposal lines
 AvailabilityPeriod=Disponibilidade atraso
 SetAvailability=Definir atraso disponibilidade
 AfterOrder=após a ordem
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Aceitação escrita, carimbo da empresa, data e assina
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index f45b0a7d580..f8d8e1811d9 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks por lote/número de série
 LotSerial=Lotes / Nr. Série
 LotSerialList=Lista de lote / nr. série
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Localização
-LocationSummary=Nome abreviado da localização
-NumberOfDifferentProducts=Número de produtos diferentes
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Numero total de produtos
 LastMovement=Movimentos mais recentes
 LastMovements=Últimos movimentos
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crie um armazém de usuários automaticamente ao criar um usuário
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Armazém predefinido
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Stock virtual
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id. armazem
 DescWareHouse=Descrição armazem
 LieuWareHouse=Localização armazem
 WarehousesAndProducts=Armazens e produtos
 WarehousesAndProductsBatchDetail=Armazéns e produtos (com detalhe por lote / série)
 AverageUnitPricePMPShort=Valor (PMP)
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Vendendo Preço unitário
 EstimatedStockValueSellShort=Valor para vender
 EstimatedStockValueSell=Valor para vender
@@ -145,7 +147,7 @@ Replenishments=Reabastecimentos
 NbOfProductBeforePeriod=Quantidade de produto %s em estoque antes do período selecionado (<%s)
 NbOfProductAfterPeriod=Quantidade de produto %s em estoque após o período selecionado (> %s)
 MassMovement=Movimento de massa
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Transferência de registro
 ReceivingForSameOrder=Receções para esta encomenda
 StockMovementRecorded=Movimentos de estoque registrados
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=O nível de estoque deve ser suficiente para adicion
 StockMustBeEnoughForOrder=O nível de estoque deve ser suficiente para adicionar produto / serviço à ordem (a verificação é feita no estoque real atual ao adicionar uma linha à ordem, qualquer que seja a regra para a troca automática de estoque)
 StockMustBeEnoughForShipment= O nível de estoque deve ser suficiente para adicionar produto / serviço ao embarque (a verificação é feita no estoque real atual ao adicionar uma linha ao embarque, qualquer que seja a regra para a troca automática de estoque)
 MovementLabel=Rótulo de movimento
-TypeMovement=Tipo de movimento
+TypeMovement=Direction of movement
 DateMovement=Data de movimento
 InventoryCode=Movimento ou código do inventário
 IsInPackage=Contido no pacote
@@ -183,6 +185,7 @@ inventoryCreatePermission=Criar novo inventário
 inventoryReadPermission=Visualizar inventários
 inventoryWritePermission=Atualizar inventários
 inventoryValidatePermission=Validar inventário
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventário
 inventoryListTitle=Os inventários
 inventoryListEmpty=Nenhum inventário em andamento
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reabrir
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index 3449b28052b..8705f09b178 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Fornecedores
 SuppliersInvoice=Fatura de fornecedor
+SupplierInvoices=Faturas do fornecedor
 ShowSupplierInvoice=Mostrar Fatura do Fornecedor
 NewSupplier=Novo fornecedor
 History=Histórico
diff --git a/htdocs/langs/pt_PT/ticket.lang b/htdocs/langs/pt_PT/ticket.lang
index 3b45f4471c9..73f6964c767 100644
--- a/htdocs/langs/pt_PT/ticket.lang
+++ b/htdocs/langs/pt_PT/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Excluído
 # Dict
 Type=Tipo
 Severity=Severidade
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Para enviar email da mensagem do ticket
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Exibe o logotipo do módulo na interface pública
 TicketsShowModuleLogoHelp=Ative esta opção para ocultar o módulo de logotipo nas páginas da interface pública
 TicketsShowCompanyLogo=Exibir o logotipo da empresa na interface pública
 TicketsShowCompanyLogoHelp=Ative esta opção para ocultar o logotipo da empresa principal nas páginas da interface pública
-TicketsEmailAlsoSendToMainAddress=Também enviar notificação para o endereço de email principal
-TicketsEmailAlsoSendToMainAddressHelp=Ative esta opção para enviar um email para o endereço "Notificação de email de" (veja a configuração abaixo)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Somente tickets atribuídos ao usuário atual ficarão visíveis. Não se aplica a um usuário com direitos de gerenciamento de tickets.
 TicketsActivatePublicInterface=Ativar interface pública
@@ -126,10 +128,10 @@ TicketNumberingModules=Módulo de numeração de ingressos
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Últimos tickets modificados
 BoxLastModifiedTicketDescription=Últimos %s tickets modificados 
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Nenhum ticket modificado recentemente
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index ddeade51c09..a97e339f1cd 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remover do grupo
 PasswordChangedAndSentTo=Palavra-passe alterada e enviada para <b>%s</b>.
 PasswordChangeRequest=Pedido para alterar a palavra-passe a <b> %s </b>
 PasswordChangeRequestSent=Pedido para alterar a palavra-passe para <b>%s</b> enviada para <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirmar restauração da palavra-passe
 MenuUsersAndGroups=Utilizadores e Grupos
 LastGroupsCreated=Ultimos 1%s grupos criados
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Utilizador de Domínio %s
 Reactivate=Reativar
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertenece o utilizador.
 Inherited=Herdado
+UserWillBe=Created user will be
 UserWillBeInternalUser=O utilizador criado irá ser um utilizador interno (porque não está interligado com um terceiro em particular)
 UserWillBeExternalUser=O utilizador criado irá ser um utilizador externo (porque está interligado com um terceiro em particular)
 IdPhoneCaller=Id. do Chamador (telefone)
@@ -109,8 +112,10 @@ UserAccountancyCode=Código de contabilidade do utilizador
 UserLogoff=Terminar sessão do utilizador
 UserLogged=Utilizador conectado
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 9b4a56eab98..0242ca83fae 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u> Usar com servidor embutido em PHP </ u> <br> No ambiente de desenvolvimento, você pode preferir testar o site com o servidor da Web incorporado em PHP (requer PHP 5.5) executando <strong> php -S 0.0. 0,0: 8080 -t %s </ strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Verifique também se o host virtual tem permissão <strong> %s </ strong> em arquivos para o <strong> %s </ strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Ler
 WritePerm=Escrever
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u> Pré-visualize %s num novo separador. </ u> <br> <br> O %s será servido por um servidor Web externo (como Apache, Nginx, IIS). Você deve instalar e configurar este servidor antes de apontar para o diretório: <br> <strong> %s </ strong> <br> URL fornecida pelo servidor externo: <br> <strong> %s </ strong>
-PreviewSiteServedByDolibarr=<u> Prévia %s em uma nova aba. </ u> <br> <br> O %s será servido pelo servidor Dolibarr para que não seja necessário nenhum servidor web extra (como Apache, Nginx, IIS) para ser instalado. br> O inconveniente é que o URL das páginas não é de fácil utilização e começa com o caminho do seu Dolibarr. <br> URL servida por Dolibarr: <br> <strong> %s </ strong> <br> <br> Use o seu próprio servidor web externo para servir este site, criar um host virtual em seu servidor web que aponte no diretório <br> <strong> %s </ strong> <br> em seguida, digite o nome deste servidor virtual e clique no outro botão de pré-visualização .
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL do host virtual servido pelo servidor da web externo não definido
 NoPageYet=Ainda sem páginas
 YouCanCreatePageOrImportTemplate=Você pode criar uma nova página ou importar um modelo de site completo
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/pt_PT/zapier.lang b/htdocs/langs/pt_PT/zapier.lang
index b5fe0501b73..da5156793a5 100644
--- a/htdocs/langs/pt_PT/zapier.lang
+++ b/htdocs/langs/pt_PT/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier para o módulo Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Configuração do Zapier para Dolibarr
+ZapierForDolibarrSetup=Configuração do Zapier para Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 390a4165131..345f7a993a9 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - en_US - Accountancy (Double entries)
 Accountancy=Contabilitate
 Accounting=Contabilitate
-ACCOUNTING_EXPORT_SEPARATORCSV= Separator coloane pentru fisier export
-ACCOUNTING_EXPORT_DATE=Format date pentru fisiere export
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_SEPARATORCSV=Separator coloane pentru fisier export
+ACCOUNTING_EXPORT_DATE=Format date pentru fişiere export
+ACCOUNTING_EXPORT_PIECE=Export număr de piesă
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export cu cont global
-ACCOUNTING_EXPORT_LABEL=Export Eticheta
+ACCOUNTING_EXPORT_LABEL=Export etichetă
 ACCOUNTING_EXPORT_AMOUNT=Export valoare
-ACCOUNTING_EXPORT_DEVISE=Export moneda
-Selectformat=Select the format for the file
-ACCOUNTING_EXPORT_FORMAT=Select the format for the file
-ACCOUNTING_EXPORT_ENDLINE=Selectați tipul returului de transport
+ACCOUNTING_EXPORT_DEVISE=Export monedă
+Selectformat=Selectaţi formatul de fişier
+ACCOUNTING_EXPORT_FORMAT=Selectaţi formatul de fişier
+ACCOUNTING_EXPORT_ENDLINE=Selectați tipul de linie nouă
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specificati prefixul pentru numele fisierului
 ThisService=Acest serviciu
 ThisProduct=Acest produs
@@ -21,7 +21,7 @@ ServiceForThisThirdparty=Serviciu pentru acest terţ
 CantSuggest=Nu pot sugera
 AccountancySetupDoneFromAccountancyMenu=Cele mai multe configurări ale contabilității se fac din meniul %s
 ConfigAccountingExpert=Configurare modul Contabilitate (partidă dublă)
-Journalization=Inregistrari contabile
+Journalization=Înregistrări contabile
 Journals=Jurnale
 JournalFinancial=Jurnale financiare
 BackToChartofaccounts=Înapoi la planul de conturi
@@ -35,17 +35,17 @@ OverviewOfAmountOfLinesNotBound=Privire de ansamblu a sumei de linii care nu est
 OverviewOfAmountOfLinesBound=Privire de ansamblu a sumei de linii care este legată deja de un cont contabil
 OtherInfo=Alte informații
 DeleteCptCategory=Eliminați contul contabil din grup
-ConfirmDeleteCptCategory=Sigur doriți să eliminați acest cont contabil din grupul de conturi contabil?
-JournalizationInLedgerStatus=Starea înregistrărilor 
+ConfirmDeleteCptCategory=Sigur doriți să eliminați acest cont contabil din grupul de conturi?
+JournalizationInLedgerStatus=Stare jurnalizare
 AlreadyInGeneralLedger=Transferat deja în jurnale și registrele contabile
 NotYetInGeneralLedger=Netransferat încă în jurnale și registrele contabile
-GroupIsEmptyCheckSetup=Grupul este gol, verificați configurarea grupului de contabilitate personalizat
-DetailByAccount=Afișați detalii pe cont
+GroupIsEmptyCheckSetup=Grupul este gol, verificați configurarea grupului personalizat de conturi
+DetailByAccount=Afișați detalii după cont
 AccountWithNonZeroValues=Conturi cu valori nenule
-ListOfAccounts=Listă conturilor contabile
+ListOfAccounts=Listă conturi
 CountriesInEEC=Țările din CEE
 CountriesNotInEEC=Țări care nu se află în CEE
-CountriesInEECExceptMe=Țările din CEE, cu excepția celor de la %s
+CountriesInEECExceptMe=Țările din CEE, cu excepția celor din %s
 CountriesExceptMe=Toate țările, cu excepția %s
 AccountantFiles=Export documente sursă
 ExportAccountingSourceDocHelp=Cu acest instrument, puteți exporta evenimentele sursă (listă și PDF-uri) care au fost utilizate pentru a vă genera înregistrările contabile. Pentru a vă exporta jurnalele, utilizați intrarea din meniu %s-%s.
@@ -60,42 +60,42 @@ MainAccountForSubscriptionPaymentNotDefined=Contul contabil principal pentru pl
 
 AccountancyArea=Zona contabilă
 AccountancyAreaDescIntro=Utilizarea modulului de contabilitate se face în mai multe etape:
-AccountancyAreaDescActionOnce=Următoarele acțiuni sunt executate de obicei doar o singură dată sau o dată pe an ...
+AccountancyAreaDescActionOnce=Următoarele acțiuni sunt executate de obicei doar o singură dată sau o dată pe an...
 AccountancyAreaDescActionOnceBis=Următorii pași trebuie făcuți pentru a vă economisi timpul în viitor prin sugerarea contului contabil implicit corect atunci când efectuați jurnalizarea (scrierea înregistrărilor în Jurnale și în registrul Cartea Mare).
-AccountancyAreaDescActionFreq=Următoarele acțiuni sunt executate de obicei în fiecare lună, săptămână sau zi pentru companii foarte mari ...
+AccountancyAreaDescActionFreq=Următoarele acțiuni sunt executate de obicei în fiecare lună, săptămână sau zi pentru companii foarte mari...
 
-AccountancyAreaDescJournalSetup=PASUL %s: Creați sau verificați conținutul jurnalului din meniu %s
+AccountancyAreaDescJournalSetup=PASUL %s: Creați sau verificați conținutul jurnalului din meniul %s
 AccountancyAreaDescChartModel=PASUL %s: Verificați dacă există un plan de conturi sau creați unul din meniul %s
 AccountancyAreaDescChart=PASUL %s: Selectaţi şi|sau completaţi planul de conturi din meniul %s
 
-AccountancyAreaDescVat=PASUL %s: Definirea conturilor contabile pentru fiecare TVA. Pentru aceasta, utilizați intrarea din meniu %s.
+AccountancyAreaDescVat=PASUL %s: Definire conturi contabile pentru fiecare cotă de TVA. Pentru aceasta, utilizați intrarea în meniu %s.
 AccountancyAreaDescDefault=PAS %s: Definiți conturile implicite de contabilitate. Pentru aceasta, utilizați intrarea în meniu %s.
-AccountancyAreaDescExpenseReport=PASUL %s: Definiți conturile contabile implicite pentru fiecare tip de raport de cheltuieli. Pentru aceasta, utilizați intrarea din meniu %s.
-AccountancyAreaDescSal=PASUL %s: Definirea conturilor contabile implicite pentru plata salariilor. Pentru aceasta, utilizați intrarea din meniu %s.
-AccountancyAreaDescContrib=PASĂ %s: Definiți conturile implicite de contabilitate pentru cheltuieli speciale (diverse taxe). Pentru aceasta, utilizați intrarea în meniu %s.
-AccountancyAreaDescDonation=PASUL %s: Definirea conturilor contabile implicite pentru donații. Pentru aceasta, utilizați intrarea din meniu %s.
-AccountancyAreaDescSubscription=PAS %s: Definiți conturile implicite de contabilitate pentru abonamente pentru membri. Pentru aceasta, utilizați intrarea în meniu %s.
-AccountancyAreaDescMisc=STEP %s: Definiți conturile implicite implicite și conturile implicite de contabilitate pentru diverse tranzacții. Pentru aceasta, utilizați intrarea din meniu %s.
-AccountancyAreaDescLoan=PASUL %s: Definiți conturile contabile implicite pentru împrumuturi. Pentru aceasta, utilizați intrarea din meniu %s.
-AccountancyAreaDescBank=PAS %s: Definiți conturile contabile și codul jurnal pentru fiecare bancă și conturile financiare. Pentru aceasta, utilizați intrarea din meniu %s.
-AccountancyAreaDescProd=STEP %s: Definirea conturilor contabile pentru produsele / serviciile dvs. Pentru aceasta, utilizați intrarea din meniu %s.
+AccountancyAreaDescExpenseReport=PASUL %s: Definire conturi contabile implicite pentru fiecare tip de raport de cheltuieli. Pentru aceasta, utilizați intrarea în meniu %s.
+AccountancyAreaDescSal=PASUL %s: Definire conturi contabile implicite pentru plata salariilor. Pentru aceasta, utilizați intrarea în meniu %s.
+AccountancyAreaDescContrib=PASUL %s: Definire conturi contabile implicite pentru cheltuieli speciale (taxe diverse). Pentru aceasta, utilizați intrarea în meniu %s.
+AccountancyAreaDescDonation=PASUL %s: Definire conturi contabile implicite pentru donații. Pentru aceasta, utilizați intrarea în meniu %s.
+AccountancyAreaDescSubscription=PAS %s: Definiți conturile contabile implicite  pentru abonamente pentru membri. Pentru aceasta, utilizați intrarea în meniu %s.
+AccountancyAreaDescMisc=PASUL %s: Definire conturi contabile implicite obligatorii și conturi contabile implicite pentru tranzacții diverse. Pentru aceasta, utilizați intrarea în meniu %s.
+AccountancyAreaDescLoan=PASUL %s: Definire conturi contabile implicite pentru împrumuturi. Pentru aceasta, utilizați intrarea în meniu %s.
+AccountancyAreaDescBank=PASUL %s: Definire conturi contabile și codul de jurnal pentru fiecare bancă și conturi financiare. Pentru aceasta, utilizați intrarea în meniu %s.
+AccountancyAreaDescProd=STEP %s: Definire conturi contabile pentru produse/ servicii. Pentru aceasta, utilizați intrarea în meniu %s.
 
-AccountancyAreaDescBind=PASUL %s: Verificați daca asocierea între liniile %s existente și contul contabil este factuta, astfel încât aplicația să poate scrie tranzacțiile în Cartea Mare cu un singur clic. Completați asocierile lipsă. Pentru aceasta, utilizați intrarea din meniu %s.
-AccountancyAreaDescWriteRecords=PASUL %s: Scrieti tranzactii in Cartea Mare. Pentru aceasta, accesați meniul <strong> %s </strong>, apoi faceți clic pe butonul <strong> %s </strong>.
-AccountancyAreaDescAnalyze=PAS %s: Adăugați sau modificați tranzacțiile existente și generați rapoarte și exporturi.
+AccountancyAreaDescBind=PASUL %s: Verifică dacă asocierea între liniile %s existente și contul contabil este făcută, astfel încât aplicația să poate scrie tranzacțiile în Cartea Mare cu un singur clic. Completați asocierile lipsă. Pentru aceasta, utilizați intrarea în meniu %s.
+AccountancyAreaDescWriteRecords=PASUL %s: Scrie tranzacţii in Cartea Mare. Pentru aceasta, accesează meniul <strong>%s</strong>, apoi fă clic pe butonul <strong>%s</strong>.
+AccountancyAreaDescAnalyze=PASUL %s: Adaugă sau modifică tranzacțiile existente și generează rapoarte și exporturi.
 
-AccountancyAreaDescClosePeriod=PASUL %s: Inchideți perioada, astfel încât să nu putem modifica în viitor.
+AccountancyAreaDescClosePeriod=PASUL %s: Închide perioada, astfel încât să nu se poată modifica în viitor.
 
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Un pas obligatoriu în configurare nu a fost finalizat (contul contabil jurnal nu este definit pentru toate conturile bancare)
-Selectchartofaccounts=Selectați schema activă de conturi
+Selectchartofaccounts=Selectați planul activ de conturi
 ChangeAndLoad=Schimbați și încărcați
-Addanaccount=Adauga un cont contabil
+Addanaccount=Adaugă un cont contabil
 AccountAccounting=Cont contabil
 AccountAccountingShort=Cont
 SubledgerAccount=Cont de subregistru
 SubledgerAccountLabel=Eticheta contului registrului contabil
 ShowAccountingAccount=Afișați contul contabil
-ShowAccountingJournal=Arătați jurnalul contabil
+ShowAccountingJournal=Afişare jurnal contabil
 ShowAccountingAccountInLedger=Afişare cont contabil în registru
 ShowAccountingAccountInJournals=Afişează conturile contabile în jurnale
 AccountAccountingSuggest=Conturi contabile sugerate
@@ -103,7 +103,7 @@ MenuDefaultAccounts=Conturi implicite
 MenuBankAccounts=Conturi bancare
 MenuVatAccounts=Conturi de TVA
 MenuTaxAccounts=Conturi pentru taxe
-MenuExpenseReportAccounts=Conturi de rapoarte de cheltuieli
+MenuExpenseReportAccounts=Conturi rapoarte de cheltuieli
 MenuLoanAccounts=Conturi de împrumut
 MenuProductsAccounts=Conturi de produs
 MenuClosureAccounts=Conturi de închidere
@@ -115,48 +115,48 @@ RegistrationInAccounting=Înregistrare în contabilitate
 Binding=Asocierea la conturi
 CustomersVentilation=Asocierea facturii cu clientul
 SuppliersVentilation=Asocierea facturii cu furnizorul
-ExpenseReportsVentilation=Raportul de cheltuieli obligatoriu
-CreateMvts=Creați o nouă tranzacție
+ExpenseReportsVentilation=Asociere deconturi de cheltuieli
+CreateMvts=Creați o tranzacție nouă
 UpdateMvts=Modificarea unei tranzacții
 ValidTransaction=Tranzacție validată
 WriteBookKeeping=Înregistrare tranzacţii în contabilitate
 Bookkeeping=Cartea mare
 BookkeepingSubAccount=Registru analitic
 AccountBalance=Sold cont
-ObjectsRef=Referinţă sursă obiect
-CAHTF=Cumpărare totală de la furnizor înainte de impozitare
-TotalExpenseReport=Raportul total al cheltuielilor
+ObjectsRef=Referinţă obiect sursă
+CAHTF=Total achiziţii de la furnizor înainte de taxare
+TotalExpenseReport=Total deconturi de cheltuieli
 InvoiceLines=Linii de facturi de asociat
-InvoiceLinesDone=Asociaza liniile facturii
-ExpenseReportLines=Linii de rapoarte de cheltuieli de asociat
-ExpenseReportLinesDone=Linii asociate de rapoarte de cheltuieli
-IntoAccount=Asociaza linia cu contul contabil
-TotalForAccount=Total pentru contabilitate
+InvoiceLinesDone=Asociază liniile de factură
+ExpenseReportLines=Linii rapoarte de cheltuieli de asociat
+ExpenseReportLinesDone=Linii asociate rapoarte de cheltuieli
+IntoAccount=Asociază linia cu contul contabil
+TotalForAccount=Total cont contabil
 
 
-Ventilate=Asociaza
-LineId=Id-ul liniei
+Ventilate=Asociere
+LineId=Id linie
 Processing=Procesează
 EndProcessing=Proces finalizat
 SelectedLines=Linii selectate
-Lineofinvoice=Linia facturii
-LineOfExpenseReport=Linia de raport de cheltuieli
+Lineofinvoice=Linie de factură
+LineOfExpenseReport=Linie de raport de cheltuieli
 NoAccountSelected=Nu a fost selectat niciun cont contabil
-VentilatedinAccount=Asociat cu succes la contul de contabilitate
+VentilatedinAccount=Asociat cu succes la contul contabil
 NotVentilatedinAccount=Nu este asociat cu contul contabil
 XLineSuccessfullyBinded=%s produse/servicii legate cu succes de un cont contabil
-XLineFailedToBeBinded=Produsele / serviciile %s nu au fost asociate niciunui cont contabil
+XLineFailedToBeBinded=Produsele/serviciile %s nu au fost asociate niciunui cont contabil
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Numărul maxim de linii în liste și pe pagina de legare (recomandat: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Începeți sortarea paginii "Asocieri de făcut" după cele mai recente elemente
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Începeți sortarea paginii "Asocieri făcute" după cele mai recente elemente
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Începe sortarea paginii "Asocieri de făcut" după cele mai recente elemente
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Începe sortarea paginii "Asocieri făcute" după cele mai recente elemente
 
-ACCOUNTING_LENGTH_DESCRIPTION=Tăiați descrierea produselor și serviciilor în înregistrări după x caractere (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Tăiați formularul de descriere a contului de produse și servicii în înregistrări după x caractere (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION=Tăiați descrierea produselor și serviciilor în înregistrări după x caractere (Cel mai bine = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Trunchiază descrierea contării de produse și servicii în înregistrări după x caractere (Cel mai bine = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Lungimea conturilor contabile generale (Dacă setați valoarea la 6 aici, contul "706" va apărea pe ecran ca "706000")
-ACCOUNTING_LENGTH_AACCOUNT=Lungimea contului contabil terţ (Dacă setați valoarea la 6 aici, contul '401' va apărea ca '401000' pe ecran)
+ACCOUNTING_LENGTH_AACCOUNT=Lungimea contului contabil pentru terţ (Dacă setați valoarea la 6 aici, contul '401' va apărea ca '401000' pe ecran)
 ACCOUNTING_MANAGE_ZERO=Permite gestionarea unui număr diferit de zerouri la sfârșitul unui cont contabil. Cerut de unele țări (precum Elveția). Dacă este setat la oprit (implicit), puteți seta următorii doi parametri pentru a cere aplicației să adauge zerouri virtuale.
-BANK_DISABLE_DIRECT_INPUT=Dezactivați înregistrarea directă a tranzacției în contul bancar
+BANK_DISABLE_DIRECT_INPUT=Dezactivează înregistrarea directă a tranzacției în contul bancar
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Activați schița de export în jurnal
 ACCOUNTANCY_COMBO_FOR_AUX=Activați lista combo pentru cont auxiliar (poate fi lentă dacă aveți o mulțime de terți)
 ACCOUNTING_DATE_START_BINDING=Definiți o dată pentru a începe legarea și transferul în contabilitate. Înainte de această dată, tranzacțiile nu vor fi transferate în contabilitate.
@@ -164,117 +164,117 @@ ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=La transferul contabil, selectați perioad
 
 ACCOUNTING_SELL_JOURNAL=Jurnal vânzări
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal cumpărări
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal Diverse
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Jurnalul raportului de cheltuieli
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Jurnal diverse
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Jurnalul rapoartelor de cheltuieli
 ACCOUNTING_SOCIAL_JOURNAL=Jurnal Asigurări Sociale
 ACCOUNTING_HAS_NEW_JOURNAL=Are un nou jurnal
 
-ACCOUNTING_RESULT_PROFIT=Contul contabil rezultat  (Profit)
-ACCOUNTING_RESULT_LOSS=Contul contabil rezultat (pierdere)
+ACCOUNTING_RESULT_PROFIT=Contul contabil rezultat (Profit)
+ACCOUNTING_RESULT_LOSS=Contul contabil rezultat (Pierdere)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Jurnal de închidere
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Contul contabil al transferului bancar în tranziție
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cont contabil de virament pentru transfer bancar
 TransitionalAccount=Cont tranzitoriu de transfer bancar 
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Contul contabil de așteptare
-DONATION_ACCOUNTINGACCOUNT=Contul contabil pentru a înregistra donații
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Contul Contabilitate pentru a înregistra abonamente
+ACCOUNTING_ACCOUNT_SUSPENSE=Cont contabil de avans
+DONATION_ACCOUNTINGACCOUNT=Contul contabil pentru înregistrarea donațiilor
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cont contabil pentru a înregistra abonamente
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT= Cont contabil implicit pentru înregistra depunerilor clientului
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Contul contabil implicit pentru produsele cumpărate (se foloseşte dacă nu este definit în fișa de produs)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT= Contul contabil implicit pentru produsele cumpărate din CEE (utilizat dacă nu este definit în fișa de produs)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT= Contul contabil implicit pentru produsele cumpărate și importate din CEE (utilizate dacă nu sunt definite în fișa de produs)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cont contabil implicit pentru produsele vândute (utilizate dacă nu este definit în fișa produsului)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cont contabil implicit pentru produsele vândute (vor fi utilizate dacă nu sunt definite în fișa produsului)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cont contabil implicit pentru produsele vândute în CEE (se utilizează dacă nu este definit în fișa de produs)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cont contabil implicit pentru produsele vândute și exportate din CEE (se utilizează dacă nu este definit în fișa de produs)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Contul contabil implicit pentru serviciile cumpărate (utilizat dacă nu este definit în fișa serviciului)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Cont contabil implicit pentru serviciile achiziţionate (va fi utilizat dacă nu este definit în fișa serviciului)
 ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Cont contabil implicit pentru serviciile cumpărate din CEE (se utilizează dacă nu este definit în fișa de servicii)
 ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Cont contabil implicit pentru serviciile cumpărate și importate din CEE (utilizat dacă nu este definit în fișa de servicii)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Contul contabil implicit pentru serviciile vândute (utilizat dacă nu este definit în fișa de servicii)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cont contabil implicit pentru serviciile vândute (va fi utilizat dacă nu este definit în fișa de servicii)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Contul contabil implicit pentru serviciile vândute în CEE (folosit dacă nu este definit în fișa de servicii)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Contul contabil implicit pentru serviciile vândute și exportate din CEE (utilizat dacă nu este definit în fișa de servicii)
 
 Doctype=Tipul documentului
-Docdate=Data
+Docdate=Data documentului
 Docref=Referinţă
 LabelAccount=Etichetă cont
-LabelOperation=Etichetarea operaţiei
+LabelOperation=Etichetă operaţie
 Sens=Direcţie
 AccountingDirectionHelp=Pentru un cont contabil al unui client, utilizați Credit pentru a înregistra o plată pe care ați primit-o <br> Pentru un cont contabil al unui furnizor, utilizați Debit pentru a înregistra o plată pe care o efectuați
-LetteringCode=Codul de scriere
+LetteringCode=Codul de numerotare
 Lettering=Numerotare
-Codejournal=Journal
+Codejournal=Jurnal
 JournalLabel=Eticheta jurnalului
-NumPiece=Număr nota contabila
-TransactionNumShort=Numărul tranzacţiei
-AccountingCategory=Grupuri personalizate
+NumPiece=Număr notă contabilă
+TransactionNumShort=Nr. tranzacţie
+AccountingCategory=Grupă personalizată
 GroupByAccountAccounting=Grupare după cont registru
 GroupBySubAccountAccounting=Grupare după cont de subregistru
-AccountingAccountGroupsDesc=Puteți defini aici câteva grupuri de conturi de contabilitate. Acestea vor fi utilizate pentru rapoarte contabile personalizate.
-ByAccounts=Prin conturi
-ByPredefinedAccountGroups=Prin grupuri predefinite
-ByPersonalizedAccountGroups=Prin grupuri personalizate
-ByYear=Pe ani
+AccountingAccountGroupsDesc=Puteți defini aici câteva grupe de conturi contabile. Acestea vor fi utilizate pentru rapoarte contabile personalizate.
+ByAccounts=După conturi
+ByPredefinedAccountGroups=După grupe predefinite
+ByPersonalizedAccountGroups=După grupe personalizate
+ByYear=După an
 NotMatch=Nu este setat
 DeleteMvt=Ștergeți câteva linii operate din contabilitate
 DelMonth=Luna care se şterge
-DelYear=Anul pentru ștergere
-DelJournal=Jurnalul de șters
+DelYear=An de șters
+DelJournal=Jurnal de șters
 ConfirmDeleteMvt=Aceasta va șterge toate liniile operate în contabilitate pentru anul/luna și/sau pentru un jurnal specific (este necesar cel puțin un criteriu). Va trebui să refolosiți caracteristica '%s' pentru a înregistra înregistrarea ștearsă în registru. 
 ConfirmDeleteMvtPartial=Aceasta va șterge tranzacția din contabilitate (toate liniile de operațiuni legate de aceeași tranzacție vor fi șterse)
 FinanceJournal=Jurnal Bancă
 ExpenseReportsJournal=Jurnalul rapoartelor de cheltuieli
-DescFinanceJournal=Jurnal de finanțe, care include toate tipurile de plăți prin cont bancar
+DescFinanceJournal=Jurnal financiar bancar, include toate tipurile de plăți efectuate prin conturile bancare
 DescJournalOnlyBindedVisible=Aceasta este o vedere a înregistrării care este legată de un cont contabil și poate fi înregistrată în Jurnale și contabilitate.
-VATAccountNotDefined=Contul de TVA nu a fost definit
-ThirdpartyAccountNotDefined=Contul pentru o terță parte nu este definit
+VATAccountNotDefined=Contul contabil de TVA nu a fost definit
+ThirdpartyAccountNotDefined=Contul pentru terț nu este definit
 ProductAccountNotDefined=Contul pentru produs nu este definit
-FeeAccountNotDefined=Contul pentru taxă nu este definit
+FeeAccountNotDefined=Contul contabil pentru cheltuieli nu este definit
 BankAccountNotDefined=Contul pentru bancă nu este definit
-CustomerInvoicePayment=Incasare factura client
+CustomerInvoicePayment=Încasare factură client
 ThirdPartyAccount=Cont de terţ
 NewAccountingMvt=Tranzacție nouă
 NumMvts=Numărul tranzacției
 ListeMvts=Lista mișcărilor
 ErrorDebitCredit=Debitul și creditul nu pot avea o valoare, în același timp,
-AddCompteFromBK=Adăugați conturi contabile grupului
+AddCompteFromBK=Adaugă conturi contabile la grupă
 ReportThirdParty=Lista conturilor terţilor
-DescThirdPartyReport=Consultați aici lista clienților și furnizorilor terți și conturile lor contabile
+DescThirdPartyReport=Consultă aici lista terţilor clienților și furnizori și conturile lor contabile
 ListAccounts=Lista conturilor contabile
 UnknownAccountForThirdparty=Cont terț necunoscut. Vom folosi %s
-UnknownAccountForThirdpartyBlocking=Cont terț necunoscut. Eroare de blocare
+UnknownAccountForThirdpartyBlocking=Cont terț necunoscut. Eroare blocantă
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Cont analitic de terţ nedefinit sau terţ necunoscut. Se va folosi%s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Terț necunoscut și/sau cont analitic alocat nedefinit la plată. Se va menține valoarea contului analitic ca necompletat.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Contul terț nu este definit sau este necunoscut. Eroare de blocare.
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conturile terț și de așteptare necunoscute nu sunt definite. Eroare de blocare
-PaymentsNotLinkedToProduct=Plata nu legată de vreun produs/serviciu
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Contul terț nu este definit sau este necunoscut. Eroare blocantă.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Cont contabil de terți necunoscut și cont de avans nedefinit. Eroare blocantă
+PaymentsNotLinkedToProduct=Plata nu este legată de vreun produs/serviciu
 OpeningBalance=Sold iniţial de deschidere
 ShowOpeningBalance=Afişează  soldurile de deschidere
 HideOpeningBalance=Ascunde soldurile de deschidere
 ShowSubtotalByGroup=Afișează subtotalul după nivel
 
-Pcgtype=Grup de conturi
+Pcgtype=Grupă de conturi
 PcgtypeDesc=Grupele de conturi sunt utilizate ca criterii predefinite de 'filtrare' și 'grupare' pentru unele rapoarte contabile. De exemplu, 'VENITURI' sau 'CHELTUIELI' sunt utilizate ca grupe pentru conturile contabile ale produselor pentru a construi raportul de cheltuieli/venituri.
 
 Reconcilable=Compensabil
 
 TotalVente=Cifra de afaceri totală înainte de impozitare
-TotalMarge=Total Marje vânzări
+TotalMarge=Total marje vânzări
 
-DescVentilCustomer=Consultați aici lista liniilor de facturare pentru clienți asociate (sau nu) contului contabil al produsului
-DescVentilMore=În majoritatea cazurilor, dacă utilizați produse sau servicii predefinite și setați numărul contului de pe cardul de produs / serviciu, aplicația va putea să facă legătura între liniile dvs. de facturare și contul contabil al planului dvs. de conturi, doar în un singur clic <strong> "%s" </strong>. Dacă contul nu a fost setat pe cardurile de produs/serviciu sau dacă mai aveți încă unele linii care nu sunt legate la un cont, va trebui să faceți o legare manuală de la menu "<strong> %s </strong>".
-DescVentilDoneCustomer=Consultați aici lista liniilor de facturare pentru clienți și a contului contabil al produselor lor
-DescVentilTodoCustomer=Ascoiază linii de facturare care nu sunt deja legate de contul contabil al produsului
-ChangeAccount=Modificați contul contabil al produsului / serviciului pentru liniile selectate cu următorul cont contabil:
+DescVentilCustomer=Consultă aici lista liniilor de facturare clienți asociate (sau nu) contului contabil al produsului
+DescVentilMore=În majoritatea cazurilor, dacă utilizați produse sau servicii predefinite și setați numărul contului pe fişa de produs/serviciu, aplicația va putea să facă asociere dintre liniile tale de factură și contul contabil, doar printr-un singur clic pe butonul <strong>"%s"</strong>. Dacă contul contabil nu a fost setat pe fişele de produs/serviciu sau dacă mai aveți încă unele linii care nu sunt asociate la un cont, va trebui să faceți o asociere manuală din meniul "<strong>%s</strong>".
+DescVentilDoneCustomer=Consultă aici lista liniilor de facturare pentru clienți și a contului contabil al produselor lor
+DescVentilTodoCustomer=Asociază linii de facturare care nu sunt deja legate de contul contabil al produsului
+ChangeAccount=Modificați contul contabil al produsului/serviciului pentru liniile selectate cu următorul cont contabil:
 Vide=-
 DescVentilSupplier=Consultați aici lista liniilor de pe factura de achiziţie asociate sau nu la un cont de produs (doar înregistrările care nu au fost deja transferate în contabilitate sunt vizibile)
 DescVentilDoneSupplier=Consultați aici lista liniilor facturilor furnizorilor și contul lor contabil
-DescVentilTodoExpenseReport=Linii de raportare a cheltuielilor care nu sunt deja asociate unui cont contabile de taxe
-DescVentilExpenseReport=Consultați aici lista liniilor de raportare a cheltuielilor asociate (sau nu) unui cont contabile de taxe
-DescVentilExpenseReportMore=Dacă configurați contul de contabilitate pe linii de raportare a tipurilor de cheltuieli, aplicația va putea face toate legătura între liniile dvs. de raportare a cheltuielilor și contul contabil al planului dvs. de conturi, într-un singur clic <strong> „%s“ </strong>. În cazul în care contul nu a fost stabilit în dicționar de taxe sau dacă aveți încă anumite linii care nu sunt legate de niciun cont, va trebui să faceți o legare manuală din meniu<strong> %s </strong>".
-DescVentilDoneExpenseReport=Consultați aici lista liniilor rapoartelor privind cheltuielile și contul contabil a taxelor lor
+DescVentilTodoExpenseReport=Asociere linii de rapoarte de cheltuieli care nu sunt deja asociate unui cont contabil de cheltuieli
+DescVentilExpenseReport=Consultă aici lista liniilor de rapoarte cheltuieli asociate (sau nu) unui cont contabil de cheltuieli
+DescVentilExpenseReportMore=Dacă configurezi contul contabil pe linii de raportare a tipurilor de cheltuieli, aplicația va putea face toate legăturile între liniile tale de raportare a cheltuielilor și contul contabil din planul tău de conturi, printr-un singur clic <strong>"%s"</strong>. În cazul în care contul nu a fost stabilit în dicționarul de taxe sau dacă ai încă anumite linii care nu sunt legate de niciun cont, va trebui să faci o legare manuală din meniul "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consultați aici lista liniilor rapoartelor de cheltuieli și contul contabil a taxelor lor
 
 Closure=Închidere anuală
 DescClosure=Consultați aici numărul de tranzacţii lunare care nu sunt validate și se află în anii fiscali deschişi
@@ -285,50 +285,50 @@ ValidateMovements=Vallidare trasferuri
 DescValidateMovements= Orice modificare sau ștergere a înregistrărilor va fi interzisă. Toate intrările pentru un exercițiu financiar trebuie validate, altfel închiderea nu va fi posibilă
 
 ValidateHistory=Asociază automat
-AutomaticBindingDone=Asociere automată făcută
+AutomaticBindingDone=Asociere automată finalizată
 
 ErrorAccountancyCodeIsAlreadyUse=Eroare, nu puteți șterge acest cont contabil, deoarece este folosit
-MvtNotCorrectlyBalanced=Mișcarea nu este corectă în balanţă. Debit = %s | Credit = %s
+MvtNotCorrectlyBalanced=Contarea nu este corect echilibrată. Debit = %s | Credit = %s
 Balancing=în balanţă
-FicheVentilation=Card asociat
+FicheVentilation=Fişă asociere
 GeneralLedgerIsWritten=Tranzacțiile sunt scrise în Cartea Mare
-GeneralLedgerSomeRecordWasNotRecorded=Unele tranzacții nu au putut fi înregistrate periodic. Dacă nu există niciun alt mesaj de eroare, acest lucru se datorează, probabil, faptului că au fost deja înregistrate în jurnal.
+GeneralLedgerSomeRecordWasNotRecorded=Unele tranzacții nu au putut fi înregistrate în jurnal. Dacă nu există niciun alt mesaj de eroare, acest lucru se datorează, probabil, faptului că au fost deja înregistrate în jurnal.
 NoNewRecordSaved=Nu se mai înregistrează nicio intrare în jurnal.
 ListOfProductsWithoutAccountingAccount=Lista produselor care nu sunt asociate unui cont contabil
 ChangeBinding=Schimbați asocierea
 Accounted=Contabilizat în jurnal - Cartea Mare
-NotYetAccounted=Nu a fost încă înregistrată în jurnal - Cartea Mare
+NotYetAccounted=Nu a fost încă înregistrată în jurnalul Cartea Mare
 ShowTutorial=Arată tutorial
-NotReconciled=Nu este conciliat
+NotReconciled=Nu este decontat
 WarningRecordWithoutSubledgerAreExcluded=Atenție, toate operațiunile fără cont de subregistru definit sunt filtrate și excluse din această vizualizare
 
 ## Admin
 BindingOptions=Opțiuni de legare
-ApplyMassCategories=Aplica categorii bulk
+ApplyMassCategories=Aplicare în masă la categorii
 AddAccountFromBookKeepingWithNoCategories=Contul contabil disponibil nu este încă într-o grupă personalizată
 CategoryDeleted=Categoria pentru contul contabil a fost eliminată
-AccountingJournals=Jurnalele contabile
-AccountingJournal=Jurnalul contabil
+AccountingJournals=Jurnale contabile
+AccountingJournal=Jurnal contabil
 NewAccountingJournal=Jurnal contabil nou
-ShowAccountingJournal=Arătați jurnalul contabil
+ShowAccountingJournal=Afişare jurnal contabil
 NatureOfJournal= Natura jurnalului
 AccountingJournalType1=Operațiuni diverse
 AccountingJournalType2=Vânzări
 AccountingJournalType3=Achiziţii
 AccountingJournalType4=Banca
-AccountingJournalType5=Raport Cheltuieli
+AccountingJournalType5=Raport de Cheltuieli
 AccountingJournalType8=Inventar
 AccountingJournalType9=Are nou
 ErrorAccountingJournalIsAlreadyUse=Acest jurnal este deja folosit
-AccountingAccountForSalesTaxAreDefinedInto=Note: contul contabil pentru taxe de vânzări tax este definit în menu <b> %s </b> - <b> %s </b>
-NumberOfAccountancyEntries=Number de intrări
+AccountingAccountForSalesTaxAreDefinedInto=Notă: contul contabil pentru taxe de vânzări este definit în meniul <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=Număr de intrări
 NumberOfAccountancyMovements=Număr de mișcări
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Dezactivați legarea și transferul în contabilitate pentru vânzări (facturile clienților nu vor fi luate în considerare în contabilitate) 
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Dezactivați legarea și transferul în contabilitate pentru achiziții (facturile furnizor nu vor fi luate în considerare în contabilitate) 
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Dezactivați legarea și transferul în contabilitate pentru rapoartele de cheltuieli (rapoartele de cheltuieli nu vor fi luate în considerare în contabilitate)
 
 ## Export
-ExportDraftJournal=Exportați proiectul de jurnal
+ExportDraftJournal=Export jurnal schiţă
 Modelcsv=Model export
 Selectmodelcsv=Selectează un model de export
 Modelcsv_normal=Export clasic
@@ -350,32 +350,32 @@ Modelcsv_Sage50_Swiss=Export pentru Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export pentru Gestinum (v3)
 Modelcsv_Gestinumv5Export pentru Gestinum (v5)
-ChartofaccountsId=Id-ul listei de conturi
+ChartofaccountsId=Id plan de conturi
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init contabilitate
+InitAccountancy=Iniţializare contabilitate
 InitAccountancyDesc=Această pagină poate fi utilizată pentru a inițializa un cont contabil pentru produse și servicii care nu au cont contabil definit pentru vânzări și achiziții.
-DefaultBindingDesc=Această pagină poate fi utilizată pentru a seta un cont implicit care să fie folosit pentru a lega înregistrarea tranzacțiilor cu privire la salariile de plată, donațiile, impozitele și taxe atunci când nu a fost deja stabilit niciun cont contabil.
+DefaultBindingDesc=Această pagină poate fi utilizată pentru a seta un cont contabil implicit care să fie folosit pentru a asocia înregistrările tranzacțiilor cu privire la plăţi salarii, donații, impozite și taxe atunci când nu a fost deja stabilit niciun cont contabil.
 DefaultClosureDesc= Această pagină poate fi utilizată pentru a seta parametrii folosiți pentru închiderile contabile. 
 Options=Opţiuni
-OptionModeProductSell=Mod vanzari
+OptionModeProductSell=Mod vânzări
 OptionModeProductSellIntra=Mod  vânzări export în CEE
 OptionModeProductSellExport=Mod vânzări export în alte ţări
-OptionModeProductBuy=Mod cumparari
+OptionModeProductBuy=Mod cumpărări
 OptionModeProductBuyIntra=Modul achiziţii import din CEE
 OptionModeProductBuyExport=Modul achiziţii import din alte ţări
-OptionModeProductSellDesc=Afișați toate produsele ce au cont contabil pentru vânzări.
+OptionModeProductSellDesc=Afișează toate produsele care au cont contabil definit pentru vânzări.
 OptionModeProductSellIntraDesc=Afișează toate produsele cu cont contabil pentru vânzările în CEE.
 OptionModeProductSellExportDesc=Afișează toate produsele cu cont contabil pentru vânzările în alte ţări.
-OptionModeProductBuyDesc=Afișați toate produsele ce au cont contabil pentru achiziții.
+OptionModeProductBuyDesc=Afișează toate produsele care au cont contabil definit pentru achiziții.
 OptionModeProductBuyIntraDesc=Afişează toate produsele achiziţionate din CEE.
 OptionModeProductBuyExportDesc=Afişează toate produsele achiziţionate din alte ţări.
-CleanFixHistory=Eliminați codul contabil din linii care nu există în diagramele de cont
-CleanHistory=Resetați toate asocierile pentru anul selectat
-PredefinedGroups=Grupuri predefinite
-WithoutValidAccount=Fără un cont dedicat valabil
-WithValidAccount=Cu un cont dedicat valabil
-ValueNotIntoChartOfAccount=Această valoare a contului contabil nu există în planul de conturi
+CleanFixHistory=Elimină contul contabil din linii care nu există în planul de conturi
+CleanHistory=Resetează toate asocierile pentru anul selectat
+PredefinedGroups=Grupe predefinite
+WithoutValidAccount=Fără un cont dedicat valid
+WithValidAccount=Cu un cont dedicat valid
+ValueNotIntoChartOfAccount=Acest cont contabil nu există în planul de conturi
 AccountRemovedFromGroup=Cont contabil eliminat din grupă
 SaleLocal=Vânzare locală
 SaleExport=Vânzare la export
@@ -384,25 +384,47 @@ SaleEECWithVAT=Vânzarea în CEE cu cota TVA diferită de zero, deci presupunem
 SaleEECWithoutVATNumber=Vânzare în CEE fără TVA, dar codul TVA al terțului nu este definit. Se va utiliza contul contabil de produs pentru vânzările standard. Completaţi codul de TVA al terțului sau contul contabil aferent produsului.
 
 ## Dictionary
-Range=Rang cont contabil
+Range=Interval cont contabil
 Calculated=Calculat 
-Formula=Formula
+Formula=Formulă
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Câțiva pași obligatorii de configurare nu au fost făcuți, vă rugăm să-i completați
-ErrorNoAccountingCategoryForThisCountry=Nu există un grup de conturi contabile disponibil pentru țara %s (Consultați Acasă - Configurare - Dicționare)
-ErrorInvoiceContainsLinesNotYetBounded=Încercați să treceţi în jurnal câteva linii ale facturii <strong> %s </strong>, dar alte linii nu sunt încă legate de contul contabil. Jurnalizarea tuturor liniilor de facturare pentru această factură este refuzată
+SomeMandatoryStepsOfSetupWereNotDone=Câțiva pași obligatorii de configurare nu au fost făcuți, efectuează-i
+ErrorNoAccountingCategoryForThisCountry=Nu există grupe de conturi contabile disponibile pentru țara %s (Consultă Acasă - Setări - Dicționare)
+ErrorInvoiceContainsLinesNotYetBounded=Încercați să treceţi în jurnal câteva linii ale facturii <strong>%s</strong>, dar alte linii nu au un cont contabil asociat. Jurnalizarea tuturor liniilor pentru această factură este respinsă.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Unele linii de pe factură nu sunt legate de contul contabil.
-ExportNotSupported=Formatul exportat nu este suportat in aceasta pagina
+ExportNotSupported=Formatul exportat setat nu este suportat în această pagină
 BookeppingLineAlreayExists=Linii deja existente în contabilitate
 NoJournalDefined=Nici un jurnal nu a fost definit
 Binded=Linii asociate
 ToBind=Linii de asociat
-UseMenuToSetBindindManualy=Linii care nu sunt încă legate, utilizați meniul <a href="%s"> %s </a> pentru a face legarea manual
+UseMenuToSetBindindManualy=Linii care nu sunt încă asociate, utilizează meniul <a href="%s">%s</a> pentru a face asocierea manual
 
 ## Import
-ImportAccountingEntries=Intrările contabile
+ImportAccountingEntries=Intrări contabile
+ImportAccountingEntriesFECFormat=Înregistrări contabile - format FEC
+FECFormatJournalCode=Cod jurnal (JournalCode)
+FECFormatJournalLabel=Etichetă jurnal (JournalLib)
+FECFormatEntryNum=Număr notă contabilă (EcritureNum)
+FECFormatEntryDate=Dată notă contabilă (EcritureDate)
+FECFormatGeneralAccountNumber=Număr cont general (CompteNum)
+FECFormatGeneralAccountLabel=Etichetă cont general (CompteLib)
+FECFormatSubledgerAccountNumber=Număr cont subregistru (CompAuxNum)
+FECFormatSubledgerAccountLabel=Număr cont subregistru (CompAuxLib)
+FECFormatPieceRef=Ref notă contabilă (PieceRef)
+FECFormatPieceDate=Dată creare notă contabilă (PieceDate)
+FECFormatLabelOperation=Etichetă operaţiune (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Cod reconciliabil (EcritureLet)
+FECFormatReconcilableDate=Dată reconciliere (DateLet)
+FECFormatValidateDate=Dată validare notă contabilă (ValidDate)
+FECFormatMulticurrencyAmount=Sumă multi-monedă (Montantdevise)
+FECFormatMulticurrencyCode=Cod multi-monedă (Idevise)
+
 DateExport=Dată export
-WarningReportNotReliable=Atenție, acest raport nu se bazează pe registrul contabil, deci nu conține o tranzacție modificată manual în registru contabil. Dacă jurnalele dvs. sunt actualizate, vizualizarea contabilă este mai precisă.
+WarningReportNotReliable=Atenție, acest raport nu se bazează pe registrul contabil, deci nu conține o tranzacție modificată manual în registru contabil. Dacă jurnalele sunt actualizate, vizualizarea contabilă este mai precisă.
 ExpenseReportJournal=Jurnalul raportului de cheltuieli
 InventoryJournal=Jurnal inventar
+
+NAccounts=%s conturi
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 2ae296c86f8..8d2e5b49903 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -4,7 +4,7 @@ Version=Versiune
 Publisher=Editor
 VersionProgram=Versiune program
 VersionLastInstall=Versiunea iniţială instalată
-VersionLastUpgrade=Ultima versiune upgrade
+VersionLastUpgrade=Ultima versiune actualizare
 VersionExperimental=Experimental
 VersionDevelopment=Dezvoltare
 VersionUnknown=Necunoscut
@@ -15,38 +15,39 @@ FileIntegrityIsStrictlyConformedWithReference=Integritatea fișierelor este in s
 FileIntegrityIsOkButFilesWereAdded=Verificarea integrității fișierelor a reușit, totuși au fost adăugate unele fișiere noi.
 FileIntegritySomeFilesWereRemovedOrModified=Verificarea integrității fișierelor a eșuat. Unele fișiere au fost modificate, eliminate sau adăugate.
 GlobalChecksum=Sumă de control globală
-MakeIntegrityAnalysisFrom=Analizați integritatea fișierelor de aplicații de la
+MakeIntegrityAnalysisFrom=Analizați integritatea fișierelor aplicației din
 LocalSignature=Semnătura locală încorporată (mai puțin fiabilă)
 RemoteSignature=Semnătura remote (mai fiabilă)
 FilesMissing=Fișiere lipsă
 FilesUpdated=Fișiere actualizate
 FilesModified=Fișiere modificate
 FilesAdded=Fișiere adăugate
-FileCheckDolibarr=Verificați integritatea fișierelor de aplicații
+FileCheckDolibarr=Verificați integritatea fișierelor aplicației
 AvailableOnlyOnPackagedVersions=Fișierul local pentru verificarea integrității este disponibil numai când aplicația este instalată dintr-un pachet oficial
-XmlNotFound=Integritatea fișierului de aplicație Xml nu a fost găsit
+XmlNotFound=Integritatea fișierului XML al aplicației nu a fost găsit
 SessionId=ID sesiune
-SessionSaveHandler=Handler pentru a salva sesiunile
+SessionSaveHandler=Handler pentru salvarea sesiunilor
 SessionSavePath=Locația sesiunii salvate
 PurgeSessions=Goleşte sesiunile
-ConfirmPurgeSessions=Chiar vrei să ștergi toate sesiunile? Acest lucru va deconecta fiecare utilizator (cu excepția dvs.).
-NoSessionListWithThisHandler=Handlerul sesiunii salvate configurat la dvs. în PHP nu permite afișarea tuturor sesiunilor in derulare.
+ConfirmPurgeSessions=Chiar vrei să ștergi toate sesiunile? Acest lucru va deconecta fiecare utilizator (cu excepția ta).
+NoSessionListWithThisHandler=Handlerul sesiunii salvate configurat în PHP nu permite afișarea tuturor sesiunilor in derulare.
 LockNewSessions=Blocare conexiuni noi
-ConfirmLockNewSessions=Sigur doriți să restricționați orice nouă conexiune Dolibarr către dvs.? Numai utilizatorul <b> %s </b> se va putea conecta după aceea.
+ConfirmLockNewSessions=Sigur doriți să restricționați orice nouă conexiune Dolibarr? Numai utilizatorul <b> %s </b> se va putea conecta după aceea.
 UnlockNewSessions=Înlăturaţi blocarea conexiunilor
-YourSession=Sesiunea dvs
+YourSession=Sesiunea ta
 Sessions=Sesiuni utilizatori
 WebUserGroup=Utilizator/grup Web Server
+PermissionsOnFiles=Permisiuni pe fişiere
 PermissionsOnFilesInWebRoot=Permisiunile fişierelor din directorul web rădăcină
 PermissionsOnFile=Permisiuni pe fişierul %s
 NoSessionFound=Configurația dvs. PHP pare să nu permită listarea sesiunilor active. Directorul utilizat pentru salvarea sesiunilor (<b> %s </b>) ar putea fi protejat (de exemplu prin permisiuni ale sistemului de operare sau prin directiva PHP open_basedir).
-DBStoringCharset=Set caractere  al bazei de date pentru  stocarea datelor
-DBSortingCharset=Set caractereal bazei de date pentru sortarea datelor
+DBStoringCharset=Set caractere al bazei de date pentru stocare
+DBSortingCharset=Set de caractere al bazei de date pentru sortare
 HostCharset=Charset gazdă
 ClientCharset=Set de caractere client
-ClientSortingCharset=Compararea clienților
-WarningModuleNotActive=<b>Modulul %s</b> trebuie să fie activat
-WarningOnlyPermissionOfActivatedModules=Numai permisiunile legate de modulele activate  sunt prezentate aici. Aveţi posibilitatea să activaţi alte module în Setup -  Pagina Module.
+ClientSortingCharset=Îmbinare client
+WarningModuleNotActive=Modulul <b> %s </b> trebuie să fie activat
+WarningOnlyPermissionOfActivatedModules=Numai permisiunile legate de modulele activate sunt prezentate aici. Aveţi posibilitatea să activaţi alte module în Acasă->Setări->Module.
 DolibarrSetup=Dolibarr instalare sau actualizare
 InternalUser=Utilizator intern
 ExternalUser=Utilizator extern
@@ -54,238 +55,240 @@ InternalUsers=Utilizatori interni
 ExternalUsers=Utilizatori externi
 GUISetup=Afişare
 SetupArea=Setări
-UploadNewTemplate=Încărcați șabloane noi
-FormToTestFileUploadForm=Formular pentru testarear încărcării de  fişiere (în funcţie de configurare)
+UploadNewTemplate=Încărcați șabloan(e) noi
+FormToTestFileUploadForm=Formular pentru testarea încărcării de fişiere (în funcţie de configurare)
 ModuleMustBeEnabled=Modulul/aplicația <b>%s</b> trebuie să fie activată
 ModuleIsEnabled=Modulul/aplicația <b>%s</b> a fost activată
-IfModuleEnabled=Notă: Da este folositor numai dacă modul  <b>%s</b> este activat
-RemoveLock=Eliminați / redenumiți fișierul <b> %s </b> dacă există, pentru a permite utilizarea instrumentului Actualizare / Instalare.
-RestoreLock=Restaurați fișierul <b> %s </b>, numai cu permisiunea de citire, pentru a dezactiva orice viitoare utilizare a instrumentului Actualizare / Instalare.
-SecuritySetup=Setări Securitate
+IfModuleEnabled=Notă: da este folositor numai dacă modulul <b>%s</b> este activat
+RemoveLock=Eliminați/redenumiți fișierul <b> %s </b> dacă există, pentru a permite utilizarea instrumentului Actualizare/ Instalare.
+RestoreLock=Restaurați fișierul <b>%s</b>, numai cu permisiunea de citire, pentru a dezactiva orice viitoare utilizare a instrumentului Actualizare/Instalare.
+SecuritySetup=Setări securitate
+PHPSetup=Configuraţie PHP
 SecurityFilesDesc=Definiți aici opțiunile legate de securitatea încărcării fișierelor.
-ErrorModuleRequirePHPVersion=Eroare, acest modul necesită PHP versiunea %s sau mai mare
-ErrorModuleRequireDolibarrVersion=Eroare, acest modul Dolibarr necesită versiunea %s sau mai mare
-ErrorDecimalLargerThanAreForbidden=Eroare, o precizie mai mare decât  <b>%s</b> nu este suportat.
-DictionarySetup=Setări Dictionar
+ErrorModuleRequirePHPVersion=Eroare, acest modul necesită versiunea PHP  %s sau mai nouă
+ErrorModuleRequireDolibarrVersion=Eroare, acest modul necesită versiunea Dolibarr %s sau mai nouă
+ErrorDecimalLargerThanAreForbidden=Eroare, o precizie mai mare de <b>%s</b> nu este suportată.
+DictionarySetup=Setări dicţionar
 Dictionary=Dicţionare
-ErrorReservedTypeSystemSystemAuto=Valorile 'system' și 'systemauto' pentru  tip sunt rezervate. Puteți utiliza 'user' ca valoare pentru a adăuga propriile dvs. înregistrări
+ErrorReservedTypeSystemSystemAuto=Valorile 'system' și 'systemauto' pentru tip sunt rezervate. Puteți utiliza 'user' ca valoare pentru a adăuga înregistrări proprii
 ErrorCodeCantContainZero=Codul nu poate conţine valoarea 0
-DisableJavascript=Dezactivează funcţiile  JavaScript si Ajax
-DisableJavascriptNote= \nNotă: În scop de testare sau de depanare. Pentru optimizare pentru persoanele nevăzătoare sau browserele de text, ați putea prefera să utilizați configurarea pe profilul utilizatorului
-UseSearchToSelectCompanyTooltip= De asemenea, dacă aveți un număr mare de terţi (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
+DisableJavascript=Dezactivează funcţiile JavaScript şi Ajax
+DisableJavascriptNote=Notă: În scop de testare sau de depanare. Pentru optimizare pentru persoanele nevăzătoare sau browserele de text, ați putea prefera să utilizați configurarea pe profilul utilizatorului
+UseSearchToSelectCompanyTooltip= De asemenea, dacă aveți un număr mare de terţi (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 în Setări->Alte setări. Căutarea va fi limitată de la începutul șirului.
 UseSearchToSelectContactTooltip=De asemenea, dacă aveți un număr mare de terţi (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
-DelaiedFullListToSelectCompany=Așteptați până când o tastă este apăsată înainte de a încărca conținutul listei combo-urilor terțe. <br> Acest lucru ar putea crește performanța dacă aveți un număr mare de terțe părți, dar este mai puțin convenabil.
+DelaiedFullListToSelectCompany=Așteptați până când o tastă este apăsată înainte de a încărca conținutul listelor combo terțe. <br> Acest lucru ar putea crește performanța dacă aveți un număr mare de terți , dar este mai puțin convenabilă.
 DelaiedFullListToSelectContact=Așteptați până când este apăsată o tastă înainte de a încărca conținutul listei combinate Contact.<br> Acest lucru poate crește performanța dacă aveți un număr mare de contacte, dar este mai puțin convenabil.
-NumberOfKeyToSearch=Număr de caractere care să declanșeze căutarea: %s
+NumberOfKeyToSearch=Numărul de caractere care să declanșeze căutarea: %s
 NumberOfBytes=Număr de octeți
 SearchString=Șir de căutare
-NotAvailableWhenAjaxDisabled=Nu este disponibil, atunci când Ajax cu handicap
+NotAvailableWhenAjaxDisabled=Nu este disponibil, atunci când Ajax este dezactivat
 AllowToSelectProjectFromOtherCompany=Pe documentul unui terț, puteți alege un proiect legat de un alt terț
 JavascriptDisabled=JavaScript dezactivat
-UsePreviewTabs=Utilizaţi taburile previzualizare
+UsePreviewTabs=Utilizaţi taburile de previzualizare
 ShowPreview=Arată previzualizare
 ShowHideDetails=Afişare-Ascundere detalii
-PreviewNotAvailable=Preview nu este disponibil
-ThemeCurrentlyActive=Tema activă în prezent
-MySQLTimeZone=TimeZone MySql (database)
+PreviewNotAvailable=Preview indisponibil
+ThemeCurrentlyActive=Tema activă curentă
+MySQLTimeZone=TimeZone MySql (baza de date)
 TZHasNoEffect=Datele sunt stocate și returnate de serverul de baze de date ca și cum ar fi păstrate ca șir trimis. Fusul orar are efect doar atunci când se folosește funcția UNIX_TIMESTAMP (care nu ar trebui să fie utilizată de Dolibarr, astfel că baza de date TZ nu ar trebui să aibă efect, chiar dacă este schimbată după introducerea datelor).
 Space=Spaţiu
 Table=Tabel
 Fields=Câmpuri
 Index=Index
-Mask=Masca
+Mask=Mască
 NextValue=Următoarea valoare
-NextValueForInvoices=Urmatoarea valoare (facturi)
-NextValueForCreditNotes=Urmatoarea valoare (credit note)
-NextValueForDeposit=Valoarea următoare (plata în avans)
-NextValueForReplacements=Urmatoarea valoare(înlocuiri)
+NextValueForInvoices=Următoarea valoare (facturi)
+NextValueForCreditNotes=Următoarea valoare (note de credit)
+NextValueForDeposit=Următoarea valoare (plăţi în avans)
+NextValueForReplacements=Următoarea valoare(facturi de înlocuire)
 MustBeLowerThanPHPLimit=Notă: Configuraţia ta PHP permite încărcarea de fişiere cu dimensiuni de până la <b>%s</b>%s, indiferent de valoarea acestui parametru
-NoMaxSizeByPHPLimit=Notă: Nicio limită setată în configuraţia dvs. PHP
+NoMaxSizeByPHPLimit=Notă: Nicio limită setată în configuraţia PHP
 MaxSizeForUploadedFiles=Mărimea maximă pentru fişierele încărcate (0 pentru a interzice orice încărcare)
-UseCaptchaCode=Utilizaţi codul grafic  (CAPTCHA)  pe pagina de login
+UseCaptchaCode=Utilizaţi codul grafic (CAPTCHA) pe pagina de autentificare
 AntiVirusCommand=Calea completă la comanda antivirus
 AntiVirusCommandExample=Exemplu pentru ClamAv Daemon (necesită clamav-daemon): /usr/bin/clamdscan<br>Exemplu pentru ClamWin (foarte foarte lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe 
-AntiVirusParam= Mai multe despre parametrii în linia de comandă
+AntiVirusParam= Mai multe despre parametrii liniei de comandă
 AntiVirusParamExample=Exemplu pentru ClamAv Daemon: --fdpass<br>Exemplu pentru ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Setări Modul Contabilitate
-UserSetup=Setări Modul Utilizatori
-MultiCurrencySetup=Setarea în mai multe valute
+ComptaSetup=Setări modul Contabilitate
+UserSetup=Setări modul Utilizatori
+MultiCurrencySetup=Configurare multi-monedă
 MenuLimits=Limite şi precizii
 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
+DetailMenuIdParent=ID-ul meniului părinte (0 pentru meniu top)
+DetailPosition=Număr de ordine pentru a defini poziţia în meniu
 AllMenus=Toate
-NotConfigured=Modulul / aplicația nu a fost configurată
+NotConfigured=Modulul/aplicația nu a fost configurată
 Active=Activ
 SetupShort=Setări
 OtherOptions=Alte opţiuni
 OtherSetup=Alte setări
 CurrentValueSeparatorDecimal=Separator zecimal
 CurrentValueSeparatorThousand=Separator mii
-Destination=Destinaţii
+Destination=Destinaţie
 IdModule=ID Modul
 IdPermissions=ID Permisiuni
 LanguageBrowserParameter=Parametru %s
-LocalisationDolibarrParameters=Parametrii localizării
+LocalisationDolibarrParameters=Parametri localizare
 ClientTZ=Time Zone client (utilizator)
-ClientHour=Client Time(utilizator)
-OSTZ=Time Zone Server OS
+ClientHour=Timp client (utilizator)
+OSTZ=Time Zone OS Server
 PHPTZ=Time Zone Server PHP
 DaylingSavingTime=Ora de vară (utilizator)
-CurrentHour=Timp  PHP (server)
-CurrentSessionTimeOut=Sesiunea curentă timeout
+CurrentHour=Timp PHP (server)
+CurrentSessionTimeOut=Timeout sesiune curentă
 YouCanEditPHPTZ=Pentru a seta un alt fus de orar PHP (nu se cere), puteți încerca să adăugați un fișier .htaccess cu o linie ca "SetEnv TZ Europe / Paris"
 HoursOnThisPageAreOnServerTZ=Atenție, contrar altor ecrane, orele din această pagină nu sunt în fusul orar local, ci în fusul orar al serverului.
 Box=Widget
-Boxes=Widgeturi
+Boxes=Widget-uri
 MaxNbOfLinesForBoxes=Numărul maxim de linii pentru widget-uri
 AllWidgetsWereEnabled=Toate widgeturile disponibile sunt activate
-PositionByDefault=Poziţia implicită
+PositionByDefault=Ordinea implicită
 Position=Poziţie
-MenusDesc=Managerii de meniuri au stabilit conținutul celor două bare de meniu (orizontală și verticală).
-MenusEditorDesc=Editorul de meniuri vă permite să definiți intrări personalizate din meniu. Folosiți-l cu grijă pentru a evita instabilitatea și intrările de meniuri care nu pot fi accesate permanent. <br> Unele module adaugă meniuri (mai ales în meniul <b> Toate </b>). Dacă eliminați din greșeală unele dintre aceste intrări, le puteți restabili dezactivând și reînființând modulul.
+MenusDesc=Managerii de meniuri stabilesc conținutul celor două bare de meniu (orizontală și verticală).
+MenusEditorDesc=Editorul de meniuri vă permite să definiți intrări personalizate din meniu. Folosiți-l cu grijă pentru a evita instabilitatea și intrările de meniuri care nu pot fi accesate permanent. <br> Unele module adaugă meniuri (mai ales în meniul <b>Toate</b>). Dacă eliminați din greșeală unele dintre aceste intrări, le puteți restabili dezactivând și reactivând modulul.
 MenuForUsers=Meniu pentru utilizatori
-LangFile=Fişiere. Lang
-Language_en_US_es_MX_etc=Limba (en_US, es_MX, ...)
+LangFile=fişier .lang
+Language_en_US_es_MX_etc=Limbă (en_US, es_MX, ...)
 System=Sistem
-SystemInfo=Informaţii Sistem
-SystemToolsArea=Instrumente Sistem
+SystemInfo=Informaţii sistem
+SystemToolsArea=Instrumente sistem
 SystemToolsAreaDesc=Această zonă oferă funcții de administrare. Utilizați meniul pentru a alege caracteristica cerută.
 Purge=Curăţenie
-PurgeAreaDesc=Această pagină vă permite să ștergeți toate fișierele generate sau stocate de Dolibarr (fișiere temporare sau toate fișierele din directorul <b> %s </b>). Utilizarea acestei funcții nu este în mod normal necesară. Este oferită ca soluție pentru utilizatorii care găzduiesc Dolibarr la un furnizor care nu oferă permisiuni de ștergere a fișierelor generate de serverul web.
-PurgeDeleteLogFile=Ștergeți fișierele din jurnal, inclusiv <b> %s </ b> definite pentru modulul Syslog (fără risc de pierdere a datelor)
-PurgeDeleteTemporaryFiles= Ștergeți toate fișierele jurnal și temporare (fără risc de pierdere a datelor). Notă: Ștergerea fișierelor temporare se face numai dacă directorul temporar a fost creat acum mai mult de 24 de ore. 
+PurgeAreaDesc=Această pagină vă permite să ștergeți toate fișierele generate sau stocate de Dolibarr (fișiere temporare sau toate fișierele din directorul <b>%s</b>). Utilizarea acestei funcții nu este în mod normal necesară. Este oferită ca soluție pentru utilizatorii care găzduiesc Dolibarr la un furnizor care nu oferă permisiuni de ștergere a fișierelor generate de serverul web.
+PurgeDeleteLogFile=Ștergeți fișierele din jurnal, inclusiv <b> %s </b> definite pentru modulul Syslog (fără risc de pierdere a datelor)
+PurgeDeleteTemporaryFiles=Ștergeți toate fișierele jurnal și temporare (fără risc de pierdere a datelor). Parametrul poate fi 'tempfilesold', 'logfiles' sau ambele 'tempfilesold + logfiles'. Notă: Ștergerea fișierelor temporare se face numai dacă directorul temporar a fost creat acum mai mult de 24 de ore. 
 PurgeDeleteTemporaryFilesShort=Ștergeți fișierele jurnal și temporare
-PurgeDeleteAllFilesInDocumentsDir=Ștergeți toate fișierele din directorul: <b>%s</b>.<br>\nAceasta va șterge toate documentele generate legate de elemente (terțe părți, facturi etc.), fișierele încărcate în modulul ECM, gropile de rezervă pentru baze de date și fișierele temporare . 
-PurgeRunNow=Elimină acum
-PurgeNothingToDelete=Nici un director sau fișier de șters.
-PurgeNDirectoriesDeleted=<b> %s</b> fişiere sau directoare şterse.
+PurgeDeleteAllFilesInDocumentsDir=Ștergeți toate fișierele din directorul: <b>%s</b>.<br>Aceasta va șterge toate documentele generate legate de elemente (terțe părți, facturi etc.), fișierele încărcate în modulul ECM, backup-urile pentru baze de date și fișierele temporare. 
+PurgeRunNow=Curăţă acum
+PurgeNothingToDelete=Niciun director sau fișier de șters.
+PurgeNDirectoriesDeleted=<b>%s</b> fişiere sau directoare şterse.
 PurgeNDirectoriesFailed=Nu s-au putut șterge fișierele sau directoarele <b> %s </b>.
-PurgeAuditEvents=Elimină toate evenimentele de securitate
+PurgeAuditEvents=Şterge toate evenimentele de securitate
 ConfirmPurgeAuditEvents=Sigur doriți să eliminați toate evenimentele de securitate? Toate jurnalele de securitate vor fi șterse, nu vor fi eliminate alte date.
 GenerateBackup=Generează backup
 Backup=Backup
 Restore=Restaurare
-RunCommandSummary=Backup poate fi lansat cu următoarea comandă
-BackupResult=Backup rezultat
+RunCommandSummary=Backup-ul poate fi lansat cu următoarea comandă
+BackupResult=Rezultat backup
 BackupFileSuccessfullyCreated=Fişier backup generat 
 YouCanDownloadBackupFile=Fișierul generat poate fi acum descărcat
 NoBackupFileAvailable=Niciun fişier backup disponibil.
-ExportMethod=Metodă Export
-ImportMethod=Metodă Import
-ToBuildBackupFileClickHere=To build a backup file, click <a href=Pentru a construi un fişier de rezervă, faceţi clic <a href="%s">aici.</a>
-ImportMySqlDesc=Pentru a importa un fișier de backup MySQL, puteți folosi phpMyAdmin prin intermediul găzduirii dvs. sau puteți folosi comanda mysql din linia de comandă. <br> De exemplu:
-ImportPostgreSqlDesc=Pentru a importa un fişier copie de siguranţă, trebuie să utilizaţi pg_restore de comandă de la linia de comandă:
-ImportMySqlCommand=%s %s &lt;mybackupfile.sql
+ExportMethod=Metodă export
+ImportMethod=Metodă import
+ToBuildBackupFileClickHere=Pentru a crea un fişier backup, apasă <a href="%s">aici</a>.
+ImportMySqlDesc=Pentru a importa un fișier de backup MySQL, puteți folosi phpMyAdmin prin intermediul găzduirii dvs. sau puteți folosi comanda mysql din linia de comandă. <br>De exemplu:
+ImportPostgreSqlDesc=Pentru a importa un fişier backup, trebuie să utilizaţi comands pg_restore din linia de comandă:
+ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Nume fișier pentru copiere de rezervă:
+FileNameToGenerate=Nume fișier pentru backup:
 Compression=Compresie
 CommandsToDisableForeignKeysForImport=Comandă pentru a dezactiva cheile străine la import
-CommandsToDisableForeignKeysForImportWarning=Necesar dacă doriți să puteţi restaura sql dump -ul dvs  mai târziu
-ExportCompatibility=Compatibilitatea  fişierului de export generat
+CommandsToDisableForeignKeysForImportWarning=Necesar dacă doriți să puteţi restaura sqldump-ul mai târziu
+ExportCompatibility=Compatibilitatea fişierului de export generat
 ExportUseMySQLQuickParameter=Foloseşte parametrul --quick
 ExportUseMySQLQuickParameterHelp=Parametrul '--quick' ajută la limitarea consumului de memorie RAM pentru tabelele mari.
-MySqlExportParameters=Parametrii export MySQL 
+MySqlExportParameters=Parametri export MySQL 
 PostgreSqlExportParameters= Parametrii export PostgreSQL
-UseTransactionnalMode=Utilizaţi mod tranzacţional
-FullPathToMysqldumpCommand=Calea completă la comanda  mysqldump
-FullPathToPostgreSQLdumpCommand=Calea completă la comanda  pg_dump
+UseTransactionnalMode=Utilizare mod tranzacţional
+FullPathToMysqldumpCommand=Calea completă către comanda mysqldump
+FullPathToPostgreSQLdumpCommand=Calea completă către comanda pg_dump
 AddDropDatabase=Adaugă comanda DROP DATABASE
 AddDropTable=Adaugă comanda DROP TABLE
 ExportStructure=Structură
 NameColumn=Nume coloane
-ExtendedInsert=Instrucşiunea Extended INSERT
-NoLockBeforeInsert=Nu există instrucţiunea LOCK  în jurul INSERT
-DelayedInsert=Insert cu întărziere
-EncodeBinariesInHexa=Codifică  date binar  în hexazecimal
+ExtendedInsert=INSERT extins
+NoLockBeforeInsert=Nu există instrucţiunea LOCK în INSERT
+DelayedInsert=Insert cu întârziere
+EncodeBinariesInHexa=Codifică datele binare în hexazecimal
 IgnoreDuplicateRecords=Ignorați erorile de înregistrare duplicat (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser limbă)
+AutoDetectLang=Autodetecţie (limba browser-ului)
 FeatureDisabledInDemo=Funcţonalitate dezactivată în demo
-FeatureAvailableOnlyOnStable=Funcție disponibilă numai pe versiuni oficiale stabile
-BoxesDesc=Widgeturile sunt componente care prezintă unele informații pe care le puteți adăuga pentru a personaliza unele pagini. Puteți alege între afișarea sau neafișarea widget-ului , selectând pagina țintă și dând clic pe "Activați" sau făcând clic pe coșul de gunoi pentru a o dezactiva.
-OnlyActiveElementsAreShown=Numai elementele din <a href="%s"> module activate </a> sunt afişate.
+FeatureAvailableOnlyOnStable=Funcționalitate disponibilă numai pe versiuni oficiale stabile
+BoxesDesc=Widget-urile sunt componente care prezintă unele informații pe care le puteți adăuga pentru a personaliza unele pagini. Puteți alege între afișarea sau neafișarea widget-ului, selectând pagina țintă și dând clic pe 'Activare' sau făcând clic pe coșul de gunoi pentru dezactivare.
+OnlyActiveElementsAreShown=Numai elementele din <a href="%s">module activate</a> sunt afişate.
 ModulesDesc=Modulele/aplicațiile determină ce caracteristici sunt disponibile în software. Unele module necesită acordarea de permisiuni utilizatorilor după activare. Faceți clic pe butonul on/off<span class="small valignmiddle">%s</span> din fiecare modul pentru a activa sau dezactiva un modulul/aplicația.
 ModulesMarketPlaceDesc=Puteți descărca mai multe module de pe site-uri externe de pe Internet ...
-ModulesDeployDesc=Dacă permisiunile sistemului dvs. de fișiere permit acest lucru, puteți utiliza acest instrument pentru a implementa un modul extern. Modulul va fi apoi vizibil în tab <strong> %s </strong>.
-ModulesMarketPlaces=Găsiți aplicația / modulele externe
-ModulesDevelopYourModule=Dezvoltați-vă propriile aplicații / module
+ModulesDeployDesc=Dacă permisiunile sistemului de fișiere permit acest lucru, puteți utiliza acest instrument pentru a implementa un modul extern. Modulul va fi apoi vizibil în fişa <strong>%s</strong>.
+ModulesMarketPlaces=Găsiți aplicații/module externe
+ModulesDevelopYourModule=Dezvoltați-vă propriile aplicații/module
 ModulesDevelopDesc=De asemenea, va puteți dezvolta propriul modul sau puteți găsi un partener pentru a vă dezvolta unul.
-DOLISTOREdescriptionLong=În loc să porniți site-ul web <a href="https://www.dolistore.com"> www.dolistore.com </a> pentru a găsi un modul extern, puteți utiliza acest instrument încorporat care va efectua căutarea pe piața externă pentru dvs. (poate fi lentă, are nevoie de acces la internet) ...
+DOLISTOREdescriptionLong=În loc să porniți site-ul web <a href="https://www.dolistore.com">www.dolistore.com</a> pentru a găsi un modul extern, puteți utiliza acest instrument încorporat care va efectua căutarea pe piața externă pentru dvs. (poate fi lentă, are nevoie de acces la internet) ...
 NewModule=Modul nou
 FreeModule=Liber
 CompatibleUpTo=Compatibil cu versiunea %s
 NotCompatible=Acest modul nu pare compatibil cu Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Acest modul necesită o actualizare la Dolibarr %s (Min %s - Max %s).
-SeeInMarkerPlace=Consultați Market place
-SeeSetupOfModule=Vezi setare modul %s
+SeeInMarkerPlace=Consultați pe Market place
+SeeSetupOfModule=Vezi setările modului %s
 Updated=Updatat
 Nouveauté=Noutate
 AchatTelechargement=Cumpărați / Descărcați
-GoModuleSetupArea=Pentru a implementa / instala un nou modul, accesați zona de configurare a modulelor: <a href="%s"> %s </a>.
-DoliStoreDesc=DoliStore, market place oficial  pentru  module externe Dolibarr ERP / CRM
+GoModuleSetupArea=Pentru a implementa/instala un nou modul, accesați zona de configurare a modulelor: <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, marketplace oficial pentru module externe Dolibarr ERP/CRM
 DoliPartnersDesc=Lista companiilor care furnizează module sau funcții dezvoltate personalizat.<br>Notă: Având în vedere că Dolibarr este o aplicație open source, <i>orice</i> utilizator experimentat în programarea PHP ar trebui să poată dezvolta un modul
 WebSiteDesc=Site-uri externe pentru module suplimentare (non-core) ...
-DevelopYourModuleDesc=Unele soluții pentru a vă dezvolta propriul modul ...
+DevelopYourModuleDesc=Unele soluții pentru a vă dezvolta propriul modul...
 URL=URL
 RelativeURL=URL relativ
-BoxesAvailable=Widgeturi disponibile
-BoxesActivated=Widgeturile activate
+BoxesAvailable=Widget-uri disponibile
+BoxesActivated=Widget-uri activate
 ActivateOn=Activaţi pe
 ActiveOn=Activat pe
+ActivatableOn=Activabil pe
 SourceFile=Fişier sursă
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponibil numai dacă nu este dezactivat JavaScript
 Required=Solicitat
-UsedOnlyWithTypeOption=Folosit numai de unele optiuni agenda
+UsedOnlyWithTypeOption=Folosit numai de unele opţiuni agendă
 Security=Securitate
-Passwords=Parolele
+Passwords=Parole
 DoNotStoreClearPassword=Criptați parolele stocate în baza de date (nu ca text simplu). Este foarte recomandat să activați această opțiune.
 MainDbPasswordFileConfEncrypted=Criptați parola bazei de date stocată în conf.php. Este foarte recomandat să activați această opțiune.
-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=Pentru a avea o parolă decodificată în fișierul <b> conf.php </b>, înlocuiți linia <br> <b> $dolibarr_main_db_pass = "cripted:..."; </b> <br> cu <br> <b> $ dolibarr_main_db_pass = "%s"; </br>
+InstrucToEncodePass=Pentru a codifica parola în fişierul <b>conf.php</b>, înlocuiţi linia <br><b>$dolibarr_main_db_pass="...";</b><br>cu<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=Pentru a avea o parolă decodificată(în clar) în fișierul <b>conf.php </b>, înlocuiți linia <br> <b>$dolibarr_main_db_pass="crypted:..."; </b> <br> cu <br> <b>$dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=Protejați fișierele PDF generate. Acest lucru NU este recomandat, deoarece încalcă generarea PDF în bloc.
-ProtectAndEncryptPdfFilesDesc=Protecția unui document PDF îi permite să fie citit și imprimat cu orice browser PDF. Cu toate acestea, editarea și copierea nu mai sunt posibile. Rețineți că utilizarea acestei funcții face  nefunctională construirea unui fișier PDF global .
+ProtectAndEncryptPdfFilesDesc=Protecția unui document PDF îi permite să fie citit și imprimat cu orice browser PDF. Cu toate acestea, editarea și copierea nu mai sunt posibile. Rețineți că utilizarea acestei funcții face nefuncţională construirea unui fișier PDF global .
 Feature=Funcţionalitate
-DolibarrLicense=Licenţa
-Developpers=Dezvoltatori / colaboratori
+DolibarrLicense=Licenţă
+Developpers=Dezvoltatori/contributori
 OfficialWebSite=Site-ul oficial Dolibarr
 OfficialWebSiteLocal=Site-ul web local (%s)
 OfficialWiki=Documentația Dolibarr / Wiki
 OfficialDemo=Dolibarr demo online
-OfficialMarketPlace=Oficial loc pe piaţă pentru modulelor externe / addons
+OfficialMarketPlace=Marketplace-ul oficial al modulelor/suplimentelor externe
 OfficialWebHostingService=Referinţă Servicii de web hosting (Cloud hosting)
-ReferencedPreferredPartners=Parteneri preferati
+ReferencedPreferredPartners=Parteneri preferaţi
 OtherResources=Alte resurse
 ExternalResources=Resurse externe
-SocialNetworks=Retele sociale
+SocialNetworks=Reţele sociale
 SocialNetworkId=ID reţea socială
-ForDocumentationSeeWiki=Pentru utilizator sau developer documentaţia (doc, FAQs ...), <br> aruncăm o privire la Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
-ForAnswersSeeForum=Pentru orice alte întrebări / ajutor, se poate utiliza Dolibarr forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
+ForDocumentationSeeWiki=Pentru utilizator sau developer documentaţia (doc, FAQs ...), <br> este disponibilă la Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
+ForAnswersSeeForum=Pentru orice alte întrebări/ajutor, se poate utiliza Dolibarr forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Iată câteva resurse pentru a obține ajutor și asistență cu Dolibarr.
-HelpCenterDesc2=Unele dintre aceste resurse sunt disponibile numai în <b> engleză </b>.
-CurrentMenuHandler=Gestionarul meniu curent
+HelpCenterDesc2=Unele dintre aceste resurse sunt disponibile numai în <b>engleză</b>.
+CurrentMenuHandler=Gestionar meniu curent
 MeasuringUnit=Unitate de măsură
 LeftMargin=Marginea stângă
-TopMargin=Marginea superioar‮a
-PaperSize=Tipul hârtiei
+TopMargin=Marginea superioar‮ă
+PaperSize=Tip hârtie
 Orientation=Orientare
 SpaceX=Spaţiul X
 SpaceY=Spaţiul Y
-FontSize=Marimea fontului
+FontSize=Mărime font
 Content=Conţinut
-NoticePeriod=Perioadă notita
+NoticePeriod=Perioadă notificare
 NewByMonth=Nou pe lună
-Emails=E-mailuri
-EMailsSetup=Setarea e-mailurilor
-EMailsDesc=Această pagină vă permite să setați parametri sau opțiuni pentru trimiterea e-mailurilor.
-EmailSenderProfiles=Profilurile expeditorului mailurilor
-EMailsSenderProfileDesc=Puteți lăsa această secțiune goală. Dacă introduceți câteva e-mailuri aici, acestea vor fi adăugate la lista posibililor expeditori în combobox atunci când scrieți un nou e-mail.
-MAIN_MAIL_SMTP_PORT=Portul SMTP / SMTPS (valoarea implicită în php.ini: <b> %s </b>)
-MAIN_MAIL_SMTP_SERVER=Gazdă SMTP / SMTPS (valoarea implicită în php.ini: <b> %s </b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Portul SMTP / SMTPS (nu este definit în PHP pe sistemele de tip Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Gazdă SMTP / SMTPS (nu este definită în PHP pe sistemele de tip Unix)
-MAIN_MAIL_EMAIL_FROM=E-mailul expeditorului pentru e-mailurile automate (valoarea implicită în php.ini: <b> %s </b>)
-MAIN_MAIL_ERRORS_TO=E-mailul utilizat pentru e-mailurile care se întorc cu erori (câmpurile "Erori-To" în e-mailurile trimise)
-MAIN_MAIL_AUTOCOPY_TO= Copiați (Bcc) toate e-mailurile trimise către
+Emails=Email-uri
+EMailsSetup=Setare emailuri
+EMailsDesc=Această pagină vă permite să setați parametri sau opțiuni pentru trimiterea de email-uri.
+EmailSenderProfiles=Profilurile expeditorului de emailuri
+EMailsSenderProfileDesc=Puteți lăsa această secțiune goală. Dacă introduceți câteva emailuri aici, acestea vor fi adăugate la lista posibililor expeditori în combobox atunci când scrieți un nou e-mail.
+MAIN_MAIL_SMTP_PORT=Portul SMTP/SMTPS (valoarea implicită în php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=Gazdă SMTP/SMTPS (valoarea implicită în php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Portul SMTP/SMTPS (nu este definit în PHP pe sistemele de tip Unix)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Gazdă SMTP/SMTPS (nu este definită în PHP pe sistemele de tip Unix)
+MAIN_MAIL_EMAIL_FROM=Emailul expeditorului pentru emailurile automate (valoarea implicită în php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Emailul utilizat pentru emailurile care se întorc cu erori (câmpurile 'Error-To' din emailurile trimise)
+MAIN_MAIL_AUTOCOPY_TO= Copie (Bcc) pentru toate emailurile trimise către
 MAIN_DISABLE_ALL_MAILS=Dezactivați trimiterea tuturor e-mailurilor (în scopuri de testare sau demonstrații)
 MAIN_MAIL_FORCE_SENDTO=Trimiteți toate e-mailurile către (în loc de destinatari reali, în scopuri de testare)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugerați e-mailuri ale angajaților (dacă sunt definiți) în lista destinatarului predefinit atunci când scrieți un nou e-mail
@@ -300,98 +303,99 @@ MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domeniul de e-mail pentru utilizare cu dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Numele selectorului dkim
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Cheie privată pentru semnarea dkim
 MAIN_DISABLE_ALL_SMS=Dezactivați toate trimiterile prin SMS (în scopuri de testare sau demonstrații)
-MAIN_SMS_SENDMODE=Metoda de  utilizare  pentru  trimiterea SMS-urilor
+MAIN_SMS_SENDMODE=Metoda de utilizare pentru trimiterea SMS-urilor
 MAIN_MAIL_SMS_FROM=Numărul de telefon implicit pentru expeditor prin SMS
 MAIN_MAIL_DEFAULT_FROMTYPE=E-mailul implicit al expeditorului pentru trimiterea manuală (e-mailul utilizatorului sau e-mailul companiei)
-UserEmail=E-mailul utilizatorului
-CompanyEmail=E-mailul companiei
-FeatureNotAvailableOnLinux=Caracteristicã nu sunt disponibile pe Unix, cum ar fi sisteme. Testaţi-vă sendmail program la nivel local.
+UserEmail=Email utilizator
+CompanyEmail=Email companie
+FeatureNotAvailableOnLinux=Caracteristică indisponibilă pe sistemele tip Unix. Testaţi-vă programul sendmail la nivel local.
 FixOnTransifex=Remediază traducerea pe platforma de traducere online a proiectului 
 SubmitTranslation=Dacă traducerea pentru această limbă nu este completă sau dacă găsiți erori, puteți corecta aceasta prin editarea fișierelor din directorul <b> langs / %s </b> și trimiteți modificarea la www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Dacă traducerea pentru această limbă nu este completă sau găsiți erori, puteți corecta aceasta modificând fișierele din directorul <b>langs/%s</b> şi trimiţând fişierele modificate la dolibarr.org/forum sau, dacă eşti developer cu un PR la github.com/Dolibarr/dolibarr
-ModuleSetup=Configurare Modul
-ModulesSetup=Configurare Module / Aplicație
+ModuleSetup=Configurare modul
+ModulesSetup=Configurare Module/Aplicație
 ModuleFamilyBase=Sistem
-ModuleFamilyCrm=Gestionarea relațiilor cu clienții (CRM)
-ModuleFamilySrm=Gestionarea relațiilor cu furnizorii (VRM)
+ModuleFamilyCrm=Managementul relațiilor cu clienții (CRM)
+ModuleFamilySrm=Managementul relațiilor cu furnizorii (VRM)
 ModuleFamilyProducts=Gestionarea produselor (PM)
 ModuleFamilyHr=Management Resurse Umane (HR)
-ModuleFamilyProjects=Proiecte
+ModuleFamilyProjects=Proiecte/Munca în echipă
 ModuleFamilyOther=Altele
 ModuleFamilyTechnic=Instrumente Multi-module
-ModuleFamilyExperimental=Module Experimentale
-ModuleFamilyFinancial=Module financiare (Contabilitate / Trezorerie)
+ModuleFamilyExperimental=Module experimentale
+ModuleFamilyFinancial=Module financiare (Contabilitate/Trezorerie)
 ModuleFamilyECM=ECM
-ModuleFamilyPortal=Site-uri web și alte aplicații frontale
+ModuleFamilyPortal=Site-uri web și alte aplicații frontend
 ModuleFamilyInterface=Interfețe cu sisteme externe
-MenuHandlers=Manager Meniu
-MenuAdmin=Editor Meniu
+MenuHandlers=Manageri Meniu
+MenuAdmin=Editor meniu
 DoNotUseInProduction=Nu utilizaţi în producţie
 ThisIsProcessToFollow=Procedura de upgrade:
 ThisIsAlternativeProcessToFollow=Aceasta este o configurare alternativă de procesare manuală:
 StepNb=Pasul %s
 FindPackageFromWebSite=Găsiți un pachet care oferă funcțiile de care aveți nevoie (de exemplu, pe site-ul oficial %s).
 DownloadPackageFromWebSite=Descărcați pachetul (de exemplu de pe site-ul oficial %s).
-UnpackPackageInDolibarrRoot=Despachetați / dezarhivați fișierele arhivate în directorul serverului Dolibarr: <b> %s </b>
-UnpackPackageInModulesRoot=Pentru a implementa / instala un modul extern, despachetați / dezarhivați fișierele arhivate în directorul serverului dedicat modulelor externe: <br> <b> %s </b>
-SetupIsReadyForUse=Implementarea modulului a fost terminată. Cu toate acestea, trebuie să activați și să configurați modulul în aplicația dvs. accesând modulele de configurare a paginii: <a href="%s"> %s </a>.
+UnpackPackageInDolibarrRoot=Despachetați/dezarhivați fișierele arhivate în directorul serverului sistemului: <b>%s</b>
+UnpackPackageInModulesRoot=Pentru a implementa/instala un modul extern, despachetați/dezarhivați fișierele arhivate în directorul serverului dedicat modulelor externe: <br><b>%s</b>
+SetupIsReadyForUse=Implementarea modulului a fost terminată. Cu toate acestea, trebuie să activați și să configurați modulul în aplicația dvs. accesând modulele de configurare a paginii: <a href="%s">%s</a>.
 NotExistsDirect=Directorul rădăcină alternativ nu este atribuit unui director existent. <br>
-InfDirAlt=De la versiunea 3, este posibil să se definească un director rădăcină alternativ. Acest lucru vă permite să stocați, într-un director dedicat, plug-in-uri și șabloane personalizate. <br> Doar creați un director in rădăcina Dolibarr (de exemplu: personalizat).<br>
-InfDirExample=<br> Atunci declarați în fișierul <strong> conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/ custom' <br> $ dolibarr_main_document_root_alt = '/ calea / din / dolibarr / htdocs / personalizat' <br> Dacă aceste linii sunt comentate cu "#", pentru a le activa, doar anulaţi comentarea prin eliminarea caracterului "#".
+InfDirAlt=De la versiunea 3, este posibil să se definească un director rădăcină alternativ. Acest lucru vă permite să stocați, într-un director dedicat, plug-in-uri și șabloane personalizate. <br> Doar creați un director in rădăcina sistemului (de exemplu: personalizat).<br>
+InfDirExample=<br> Atunci declarați în fișierul <strong>conf.php</strong> <br> $dolibarr_main_url_root_alt='/ custom' <br> $dolibarr_main_document_root_alt = '/path/of/dolibarr/htdocs/custom' <br> Dacă aceste linii sunt comentate cu "#", pentru a le activa, doar anulaţi comentarea prin eliminarea caracterului "#".
 YouCanSubmitFile=Poţi încărca un fişier .zip al pachetului de modul de aici:
 CurrentVersion=Dolibarr versiunea curentă
-CallUpdatePage=Navigați la pagina care actualizează structura și datele bazei de date: %s.
+CallUpdatePage=Navigați la pagina care actualizează structura și datele din baza de date: %s.
 LastStableVersion=Ultima versiune stabilă
 LastActivationDate=Ultima dată de activare
 LastActivationAuthor=Ultimul autor de activare
 LastActivationIP=Ultimul IP de activare
 UpdateServerOffline=Update server offline
 WithCounter=Gestionați un contor
-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> codul clientului pe n caractere <br><b> {cccc000} </b> codul clientului pe n caractere este urmat de un contor dedicat clientului. Acest contor dedicat clientului este resetat în același timp cu contorul global. <br> <b> {tttt} </b> Codul tipului de terță parte pe n caractere (vedeți meniul Acasă - Configurare - Dicționar - Tipuri de terțe părți) . Dacă adăugați această etichetă, contorul va fi diferit pentru fiecare tip de terță parte<br>\n
-GenericMaskCodes3=Toate celelalte caractere în masca va rămâne intactă. <br> Spaţiile nu sunt permise. <br>
-GenericMaskCodes4a=<u> Exemplu privind al 99-lea %s  terț TheCompany, cu data 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> <br> <b> IN{yy}{mm}-{0000}-{t} </b> va da <b> IN0701-0099-A </b> dacă tipul companiei este "Responsible Inscripto" cu codul pentru tipul care este "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>
-DoTestServerAvailability=Test server de conectivitate
+GenericMaskCodes=Puteți introduce orice mască de numerotare. În această mască, pot fi utilizate următoarele etichete: <br><b>{000000}</b> corespunde unui număr care va fi incrementat pe fiecare %s. Introduceți la fel de multe zerouri ca lungimea dorită a contorului. Contorul va fi completat de zerouri din stânga pentru a avea la fel de multe zerouri ca masca. <br><b>{000000+000}</b> la fel ca și precedentul, dar un offset corespunzător numărului din dreapta semnului + se aplică începând cu primul %s. <br><b>{000000@x}</b> la fel ca și precedentul, dar contorul este resetat la zero când se atinge luna x (x între 1 și 12 sau 0 pentru a utiliza primele luni ale anului fiscal definit în configurația ta sau 99 pentru a reveni la zero în fiecare lună). Dacă se folosește această opțiune și x este 2 sau mai mare, atunci este necesară și secvența {yy}{mm} sau {yyyy}{mm}. <br><b>{dd}</b> zi (01 până la 31). <br><b>{mm}</b> lună (01 până la 12). <br><b>{yy}</b>, <b>{aaaa}</b> sau <b>{y}</b> an peste 2, 4 sau 1 numere.<br> 
+GenericMaskCodes2=<b>{cccc}</b> codul clientului pe n caractere<br><b> {cccc000}</b> codul clientului pe n caractere urmat de un contor dedicat clientului. Acest contor dedicat clientului este resetat în același timp cu contorul global.<br><b>{tttt}</b> Codul tipului de terț pe n caractere (consultați meniul Acasă - Setări - Dicționare - Tipuri de terți). Dacă adăugați această etichetă, contorul va fi diferit pentru fiecare tip de terț.<br>
+GenericMaskCodes3=Toate celelalte caractere din mască vor rămâne intacte. <br> Spaţiile nu sunt permise. <br>
+GenericMaskCodes3EAN=Toate celelalte caractere din mască vor rămâne intacte (cu excepția * sau ? în poziția a 13-a din EAN13). <br>Spațiile nu sunt permise. <br>În EAN13, ultimul caracter după ultima} în poziția a 13-a ar trebui să fie * sau ? . Acesta va fi înlocuit cu cheia calculată.<br>
+GenericMaskCodes4a=<u>Exemplu privind al 99-lea %s  terț Comania, cu data 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Exemplu de terţ creat pe 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Exemplu 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> <br> <b> IN{yy}{mm}-{0000}-{t} </b> va da <b> IN0701-0099-A </b> dacă tipul companiei este 'Responsible Inscripto' cu codul pentru tipul 'A_RI'
+GenericNumRefModelDesc=Întoarce un număr de personalizabil definit în conformitate cu o mască.
+ServerAvailableOnIPOrPort=Serverul este disponibil la adresa <b>%s</b> pe portul <b>%s</b>
+ServerNotAvailableOnIPOrPort=Serverul nu este disponibil la adresa <b>%s</b> pe portul <b>%s</b>
+DoTestServerAvailability=Test conectivitate server
 DoTestSend=Test de trimitere
-DoTestSendHTML=Test trimiterea HTML
-ErrorCantUseRazIfNoYearInMask=Eroare, nu se poate folosi opțiunea  @ resetează contor la fiecare an, dacă secvența {yy} sau  {yyyy} nu este în mască.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Eroare, nu poate utilizator @ opţiune dacă secvenţa (aa) (mm) sau (AAAA) (mm) nu este în masca.
-UMask=UMask parametru pentru noi imagini pe Unix / Linux / BSD sistem de fişiere.
-UMaskExplanation=Acest parametru permite să se definească permissions stabilit, în mod implicit pe fişierele create de Dolibarr pe server (în timpul de încărcare, de exemplu). <br> Acesta trebuie să fie de octal valoare (de exemplu, 0666 înseamnă citi şi scrie pentru toată lumea). <br> Ce paramtre ne sert pas sous un serveur Windows.
+DoTestSendHTML=Test trimitere HTML
+ErrorCantUseRazIfNoYearInMask=Eroare, nu se poate folosi opțiunea @ pentru a reseta contorul la fiecare an, dacă secvența {yy} sau  {yyyy} nu este în mască.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Eroare, nu se poate utiliza opţiunea @ dacă secvenţa {yy}{mm} sau {yyyy}{mm}  nu este în mască.
+UMask=Parametrul UMask pentru fişiere noi în sistemul de fişiere Unix/Linux/BSD/Mac.
+UMaskExplanation=Acest parametru îţi permite să defineşti permisiuni implicite  pe fişierele create de sistem pe server (în timpul încărcării, de exemplu). <br> Acesta trebuie să fie o valoare octală (de exemplu, 0666 înseamnă citire şi scriere pentru toată lumea). <br> Acest parametru nu se poate utiliza pe un server Windows.
 SeeWikiForAllTeam=Uitați-vă la pagina Wiki pentru o listă de contribuitori și organizațiiile lor
-UseACacheDelay= Întârziere pentru caching de export de răspuns în câteva secunde (0 sau gol pentru nici un cache)
-DisableLinkToHelpCenter=Ascundere link-ul <b>"Aveţi nevoie de ajutor sau sprijin"</b> de la pagina de login
+UseACacheDelay= Întârziere răspuns pentru caching de export în secunde (0 sau gol pentru nici un cache)
+DisableLinkToHelpCenter=Ascundere link <b>'Aveţi nevoie de ajutor sau suport'</b> de pe pagina de autentificare
 DisableLinkToHelp=Ascunde link-ul Ajutor Online "<b>%s</b>"
 AddCRIfTooLong=Nu există nici o adaptare automată a textului, textul prea lung nu va fi afișat pe documente. Vă rugăm să apăsaţi tasta ENTER în zona de text, dacă este necesar.
-ConfirmPurge=Sigur doriți să executați această curățare ? <br> Aceasta va șterge definitiv toate fișierele de date fără nici o modalitate de a le reconstitui (fișiere ECM, fișiere atașate ...).
+ConfirmPurge=Sigur doriți să executați această curățare? <br> Aceasta va șterge definitiv toate fișierele de date fără nici o modalitate de a le reconstitui (fișiere ECM, fișiere atașate ...).
 MinLength=Lungimea minimă
-LanguageFilesCachedIntoShmopSharedMemory=Fişierele  .lang încărcate în memorie partajata
+LanguageFilesCachedIntoShmopSharedMemory=Fişierele .lang încărcate în memoria partajată
 LanguageFile=Fișier lingvistic
 ExamplesWithCurrentSetup=Exemple cu configurația curentă
-ListOfDirectories=Lista de directoare OpenDocument template-uri
-ListOfDirectoriesForModelGenODT=Lista de directoare care conţin fişiere șablon in format OpenDocument.<br><br>puneţi aici intreaga cale de directoare.<br>Intoarceţi-va la inceputul textului la fiecare director.<br>Pentru a adăuga un director de modul GED, adăugaţi aici <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Fişierele în aceste directoare trebuie să se termine cu <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Numărul de fișiere șablon ODT / ODS găsite în aceste directoare
+ListOfDirectories=Lista de directoare cu şabloane OpenDocument
+ListOfDirectoriesForModelGenODT=Lista de directoare care conţin fişiere șablon in format OpenDocument.<br><br>puneţi aici întreaga cale spre directoare.<br>Adăugaţi un Enter după fiecare director.<br>Pentru a adăuga un director de modul ECM, adăugaţi aici <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Fişierele din aceste directoare trebuie să se termine cu <b>.odt</b> sau <b>.ods</b>.
+NumberOfModelFilesFound=Numărul de fișiere șablon ODT/ODS găsite în aceste directoare
 ExampleOfDirectoriesForModelGen=Exemple de sintaxă:<br> c:\\ myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br> Pentru a şti cum să vă creaţi şabloane DOCX, ODT documente, înainte de a le stoca în aceste directoare, citiţi documentaţia wiki:
+FollowingSubstitutionKeysCanBeUsed=<br> Pentru a şti cum să vă creaţi şabloane de documente ODT, înainte de a le stoca în aceste directoare, citiţi documentaţia wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Poziţia Prenume / Nume
-DescWeather=Următoarele imagini vor fi afișate pe tabloul de bord atunci când numărul ultimelor acțiuni va atinge următoarele valori:
-KeyForWebServicesAccess=Pentru a utiliza Web Services (parametru &quot;dolibarrkey&quot; în WebServices)
-TestSubmitForm=Intrare test de formă
-ThisForceAlsoTheme=Utilizând acest meniu, managerul va folosi și propria temă indiferent de alegerea utilizatorului. De asemenea, acest manager de meniu specializat pentru smartphone-uri nu funcționează pe toate smartphone-urile. Utilizați un alt manager de meniuri dacă întâmpinați probleme cu smartphone-ul dvs.
-ThemeDir=Director Teme
+FirstnameNamePosition=Poziţia Prenumelui/Numelui
+DescWeather=Următoarele imagini vor fi afișate în tabloul de bord atunci când numărul ultimelor acțiuni va atinge următoarele valori:
+KeyForWebServicesAccess=Cheie utilizare Web Services (parametru "dolibarrkey" în WebServices)
+TestSubmitForm=Test introducere date în formular
+ThisForceAlsoTheme=Utilizând acest meniu, managerul va folosi și propria temă indiferent de alegerea utilizatorului. De asemenea, acest manager de meniu specializat pentru smartphone-uri nu funcționează pe toate smartphone-urile. Utilizează un alt manager de meniuri dacă întâmpini probleme pe smartphone-ul tău.
+ThemeDir=Director teme
 ConnectionTimeout=Pauză de conectare
-ResponseTimeout=Răspuns timeout
-SmsTestMessage=Mesaj de test de la PHONEFROM__ __ la __ PHONETO__
-ModuleMustBeEnabledFirst=Modulul <b> %s</b> trebuie să fie activat daca aveti nevoie de aceasta functie
-SecurityToken=Cheia pentru URL-uri sigure
-NoSmsEngine=Nu este disponibil niciun manager de expediere SMS-uri. Un manager de expediere SMS-uri nu este instalat cu distribuția implicită deoarece acesta depinde de un furnizor extern, dar puteți găsi pe %s
+ResponseTimeout=Timeout răspuns 
+SmsTestMessage=SMS de test de la __PHONEFROM__ to __PHONETO__
+ModuleMustBeEnabledFirst=Modulul <b>%s</b> trebuie să fie activat daca aveti nevoie de aceasta funcţionalitate.
+SecurityToken=Cheia pentru URL-uri securizate
+NoSmsEngine=Nu este disponibil niciun manager de expediere SMS-uri. Un manager de expediere SMS-uri nu este instalat cu distribuția implicită deoarece acesta depinde de un furnizor extern, dar puteți găsi unul pe %s
 PDF=PDF
 PDFDesc=Opţiuni globale pentru generarea PDF
 PDFAddressForging=Reguli pentru secţiunea adresă
@@ -402,122 +406,122 @@ HideLocalTaxOnPDF=Ascunde cota %s în coloana Taxă vânzări / TVA
 HideDescOnPDF=Ascunde descrierea produselor
 HideRefOnPDF=Ascundeți referinţele produselor
 HideDetailsOnPDF=Ascundeți detaliile liniei de produs
-PlaceCustomerAddressToIsoLocation=Utilizați poziția standard franceză (La Poste) pentru poziția adresei clienților
+PlaceCustomerAddressToIsoLocation=Utilizați poziția standard franceză (La Poste) pentru poziționarea adresei clienților
 Library=Bibliotecă
-UrlGenerationParameters=Parametrii pentru a asigura URL-uri
-SecurityTokenIsUnique=Utilizaţi un unic parametru securekey pentru fiecare URL
-EnterRefToBuildUrl=Introduceţi de referinţă pentru %s obiect
+UrlGenerationParameters=Parametrii pentru URL-uri securizate
+SecurityTokenIsUnique=Utilizaţi un parametru unic securekey pentru fiecare URL
+EnterRefToBuildUrl=Introdu referinţa pentru obiectul %s 
 GetSecuredUrl=Obţineţi URL-ul calculat
-ButtonHideUnauthorized= Ascunde butoanele de acțiune neautorizate și pentru utilizatorii interni (doar gri în caz contrar) 
-OldVATRates=Vechea rată TVA
-NewVATRates=Noua rată TVA
-PriceBaseTypeToChange=Modifică la prețuri cu valoarea de referință de bază definit pe
+ButtonHideUnauthorized= Ascunde butoanele de acțiune neautorizate și pentru utilizatorii interni (doar gri în caz contrar)
+OldVATRates=Vechea cotă de TVA
+NewVATRates=Noua cotă de TVA
+PriceBaseTypeToChange=Modifică prețurile cu valoarea de referință de bază definită pe
 MassConvert=Lansați conversia în bloc
-PriceFormatInCurrentLanguage=Formatul prețului în format de valută
-String=String
+PriceFormatInCurrentLanguage=Formatul prețului în formatul limbii curente
+String=Text
 String1Line=String (1 linie)
-TextLong=Long text
+TextLong=Text lung
 TextLongNLines=Text lung (n linii)
 HtmlText=Text HTML
 Int=Întreg
 Float=Float
-DateAndTime=Data şi ora
+DateAndTime=Dată şi oră
 Unique=Unic
 Boolean=Boolean (o casetă de selectare)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Preţ
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
-ExtrafieldSelect = Select Listă 
-ExtrafieldSelectList = Select din tabel
+ExtrafieldSelect = Listă de selecţie
+ExtrafieldSelectList = Selecţie din tabel
 ExtrafieldSeparator=Separator (nu un câmp)
 ExtrafieldPassword=Parolă
 ExtrafieldRadio=Butoane radio (doar o singură alegere)
-ExtrafieldCheckBox=Casetele de selectare
-ExtrafieldCheckBoxFromList=Căsuțele de selectare din tabel
+ExtrafieldCheckBox=Casete de bifare
+ExtrafieldCheckBoxFromList=Casete de selectare din tabel
 ExtrafieldLink=Link către un obiect
 ComputedFormula=Câmp calculat
 ComputedFormulaDesc=Puteți introduce aici o formulă folosind alte proprietăți ale obiectului sau orice cod PHP pentru a obține o valoare calculată dinamic. Puteți utiliza orice formule compatibile PHP, inclusiv "?" operator de condiții și următorul obiect global: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATENŢIE</strong>: Doar unele proprietăți $object pot fi disponibile. Dacă aveți nevoie de o proprietate care nu este încărcată, introduceți singur obiectul în formula dvs. ca în cel de-al doilea exemplu.<br> Utilizarea unui câmp calculat înseamnă că nu puteți introduce nici o valoare din interfață. De asemenea, dacă există o eroare de sintaxă, formula nu poate returna nimic.\n <br><br>Exemplu de formulă<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemplu cu reîncărcarea obiectului<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Un alt exemplu de formulă pentru a forța încărcarea obiectului și a obiectului său părinte:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Proiectul părinte nu a fost găsit'
-Computedpersistent=Stocați câmpul calculat
-ComputedpersistentDesc=Câmpurile suplimentare computerizate vor fi stocate în baza de date, cu toate acestea, valoarea va fi recalculată numai atunci când obiectul acestui câmp este modificat. Dacă câmpul calculat depinde de alte obiecte sau date globale, această valoare ar putea fi greșită !!
-ExtrafieldParamHelpPassword=Lăsând acest câmp necompletat înseamnă că această valoare va fi stocată fără criptare (câmpul trebuie ascuns numai cu stea pe ecran). <br> Setarea "auto" pentru utilizarea regulii de criptare implicită pentru a salva parola în baza de date (atunci valoarea citită va fi hash numai, nici o şansă de a recupera valoarea inițială)
-ExtrafieldParamHelpselect=Lista de valori trebuie să fie linii cu format cheie,valoare (unde cheia nu poate fi "0") <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> code3,valoare3 <br> ... <br> <br> Pentru a avea lista în funcție de o altă listă de atribute complementare: <br> 1, valoare1| opţiuni_<i> parent_list_code </i>: parent_key <br> 2,valoare2|opţiuni_ <i> parent_list_code </i>: parent_key <br><br> Pentru a avea lista în funcție de altă listă: <br> 1, valoare1| <i> parent_list_code </i>: parent_key <br> 2, valoare2| <i> parent_list_code </i>: parent_key
-ExtrafieldParamHelpcheckbox=Lista de valori trebuie să fie linii cu format cheie,valoare ( cheia nu poate fi "0") <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> 3,valoare3 <br> ...
-ExtrafieldParamHelpradio=Lista de valori trebuie să fie linii cu format cheie,valoare ( cheia nu poate fi "0") <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> 3,valoare3 <br> ...
-ExtrafieldParamHelpsellist=Lista valorilor provine dintr-un tabel <br>Sintaxă: table_name:label_field: id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field este în mod necesar o cheie integer primară<br>- filtrul poate fi un test simplu (de exemplu, activ = 1) pentru a afișa numai valorile active<br> De asemenea, puteți utiliza $ID$ în filtru, care este id-ul obiectului curent <br>Pentru a utiliza un SELECT în filtru, utilizați cuvântul cheie $SEL$ pentru a ocoli protecția anti-injecție. <br>Dacă doriți să filtrați pe câmpuri suplimentare, utilizați sintaxa extra.fieldcode =... (unde codul de câmp este codul extracâmpului)<br><br> Pentru a avea lista în funcție de o altă listă de atribute complementare:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br> Pentru a avea lista în funcție de o altă listă:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Lista de valori vine dintr-un tabel<br>Sintaxă: table_name:label_field:id_field::filter<br>Examplu: c_typent:libelle:id::filter<br><br>filtrul poate fi un simplu test (ex active=1) pentru a afişa doar valoarea activă<br>De asemenea se poate utiliza $ID$ în filtrul care este ID-ul curent al obiectului curent<br>Pentru a face o SELECTARE în filtru folosiţi $SEL$<br>dacă doriţi să filtraţi în extracâmpuri folosiţi sintaxa extra.fieldcode=... (unde codul câmpului este codul extracâmpului)<br><br>Pentru a avea lista în funcție de o altă listă de atribute complementare:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Pentru a avea lista în funcție de o altă listă :<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+Computedpersistent=Câmp calculat stocat
+ComputedpersistentDesc=Extracâmpurile calculate vor fi stocate în baza de date, cu toate acestea, valorile lor vor fi recalculate numai atunci când obiectul acestui câmp este modificat. Dacă câmpul calculat depinde de alte obiecte sau date globale, aceste valori ar putea fi greșite!!
+ExtrafieldParamHelpPassword=Lăsând acest câmp necompletat înseamnă că această valoare va fi stocată fără criptare (câmpul trebuie ascuns cu steluţe pe ecran). <br> Setaţi 'auto' pentru utilizarea regulii de criptare implicită la salvarea parolei în baza de date (atunci valoarea citită va fi numai hash, nefiind nici o şansă de a recupera valoarea inițială)
+ExtrafieldParamHelpselect=Lista de valori trebuie să fie linii cu formatul cheie,valoare (unde cheia nu poate fi '0') <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> code3,valoare3 <br>... <br> <br> Pentru a avea lista în funcție de o altă listă de atribute complementare: <br> 1, valoare1| options_<i> parent_list_code</i>:parent_key<br> 2,valoare2|options_ <i>parent_list_code</i>:parent_key<br><br> Pentru a avea lista în funcție de altă listă: <br>1, valoare1|<i>parent_list_code</i>:parent_key<br>2,valoare2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=Lista de valori trebuie să fie linii cu formatul cheie,valoare (unde cheia nu poate fi "0") <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> 3,valoare3 <br> ...
+ExtrafieldParamHelpradio=Lista de valori trebuie să fie linii cu formatul cheie,valoare (unde cheia nu poate fi '0') <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> 3,valoare3 <br> ...
+ExtrafieldParamHelpsellist=Lista valorilor provine dintr-un tabel<br> Sintaxă: table_name:label_field:id_field::filtersql<br>Exemplu: c_typent:libelle:id::filtersql<br><br>- id_field este în mod necesar o cheie int primară<br>- filtersql este o condiție SQL. Poate fi un test simplu (de exemplu, activ = 1) pentru a afișa numai valoarea activă<br> Puteți utiliza, de asemenea, $ID$ în filtru, care este ID-ul curent al obiectului curent <br>Pentru a utiliza un SELECT în filtru, utilizați cuvântul cheie $SEL$ pentru a ocoli protecţia anti-injecție.<br>dacă doriți să filtrați pe câmpuri suplimentare utilizați sintaxa extra.fieldcode=... (unde codul câmpului este codul câmpului extrafield)<br><br> Pentru a avea lista în funcție de o altă listă de atribute complementare:<br> c_typent:libelle:id:options_<i>parent_list_code</i>| parent_column:filter <br><br> Pentru a avea lista în funcție de altă listă: <br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Lista valorilor provine dintr-un tabel <br>Sintaxă: table_name:label_field:id_field::filtersql<br>Exemplu: c_typent:libelle:id::filtersql<br><br>filtru care poate fi un test simplu (de exemplu, activ = 1) pentru a afișa doar valoarea activă<br> Puteți utiliza, de asemenea, $ID$ în filtru care este ID-ul curent al obiectului curent<br> Pentru a efectua o selecție în filtru folosiți $SEL$<br> dacă doriți să filtrați pe câmpuri suplimentare utilizați sintaxa extra.fieldcode=... (unde codul de câmp este codul câmpului extra)<br><br> Pentru a avea o listă dependentă de un  de atribut complementar:<br> c_typent:libelle:id:options_<i>parent_list_code</i>| parent_column:filter <br><br>Pentru a avea o listă în funcție de altă listă:<br> c_typent:libelle:id:<i> parent_list_code</i>|parent_column: filter
 ExtrafieldParamHelplink=Parametrii trebuie să fie ObjectName:Classpath<br>Sintaxă: ObjectName: Classpath 
 ExtrafieldParamHelpSeparator=Păstrați liber pentru un separator simplu <br> Setați acest lucru la 1 pentru un separator care se prăbușește (deschis în mod implicit pentru o nouă sesiune, apoi starea este păstrată pentru fiecare sesiune de utilizator) <br> Setați acest lucru la 2 pentru un separator care se prăbușește (se prăbușește implicit pentru o nouă sesiune, apoi starea este păstrată pentru fiecare sesiune a utilizatorului)
 LibraryToBuildPDF=Bibliotecă utilizată pentru generarea PDF-urilor
 LocalTaxDesc=Unele țări pot aplica două sau trei taxe pe fiecare linie de facturare. Dacă este cazul, alegeți tipul pentru a doua și a treia taxă și rata acestora. Tipuri posibile sunt: <br> 1: taxa locală se aplică produselor și serviciilor fără TVA (localtax se calculează pe valoare fără taxă)<br> 2: taxa locală se aplică produselor și serviciilor, inclusiv TVA (localtax se calculează în funcție de valoare+ taxa principală ) <br>3: taxa locală se aplică produselor fără TVA (localtax se calculează pe valoare fără taxă) <br>4: taxa locală se aplică produselor şi includ tva (localtax  se calculeaza pe valoare + TVA principală) <br> 5: taxa locală se aplică serviciilor fără TVA (localtax se calculează pe valoarea fără TVA) <br> 6: taxa locală se aplică serviciilor, inclusiv TVA (localtax se calculează pe sumă + taxă)
 SMS=SMS
-LinkToTestClickToDial=Introduceți un număr de telefon pentru a afișa un link de test ClickToDial  Url pentru utilizatorul<strong>%s</strong>
-RefreshPhoneLink=Refresh link
+LinkToTestClickToDial=Introdu un număr de telefon pentru a afișa un link de test ClickToDial Url pentru utilizatorul <strong>%s</strong>
+RefreshPhoneLink=Link refresh
 LinkToTest=Link accesibil generat pentru utilizatorul <strong>%s</strong> (faceți clic pe numărul de telefon pentru a testa)
-KeepEmptyToUseDefault=Lasă gol pentru utilizarea valorii implicite
+KeepEmptyToUseDefault=Lasă necompletat pentru utilizarea valorii implicite
 KeepThisEmptyInMostCases=În majoritatea cazurilor, poţi lăsa acest câmp necompletat.
 DefaultLink=Link implicit
 SetAsDefault=Setați ca implicit
 ValueOverwrittenByUserSetup=Atenție, această valoare poate fi suprascrisă de setările specifice utilizatorului (fiecare utilizator poate seta propriul url clicktodial)
 ExternalModule=Modul extern
 InstalledInto=Instalat în director %s
-BarcodeInitForThirdparties=Cod de bare de masă pentru terți
-BarcodeInitForProductsOrServices=Init sau reset cod de bare în  masă pentru produse şi servicii
-CurrentlyNWithoutBarCode=În prezent, aveti <strong> %s </strong>inregistrari pe <strong> %s</strong> %s fără cod de bare definit.
-InitEmptyBarCode=Valoare inițializare pentru următoarele %s înregistrări goale
+BarcodeInitForThirdparties=Coduri de bare în masă pentru terți
+BarcodeInitForProductsOrServices=Iniţializare sau resetare coduri de bare în masă pentru produse şi servicii
+CurrentlyNWithoutBarCode=În prezent, aveţi <strong>%s</strong> înregistrări pe <strong>%s</strong> %s fără cod de bare definit.
+InitEmptyBarCode=Valoare de inițializare pentru următoarele %s înregistrări goale
 EraseAllCurrentBarCode=Ștergeți toate valorile curente de coduri de bare 
 ConfirmEraseAllCurrentBarCode=Sigur doriți să ștergeți toate valorile actuale ale codurilor de bare?
-AllBarcodeReset=Toate valorile codurilor de bare au fost eliminate
-NoBarcodeNumberingTemplateDefined=Nu este activat niciun șablon de cod de bare de numere în modulul de configurare Cod de bare
-EnableFileCache=Activați memoria cache a fișierelor
+AllBarcodeReset=Toate valorile codurilor de bare au fost şterse
+NoBarcodeNumberingTemplateDefined=Nu este activat niciun șablon de cod de bare de numere în configurare modulului Coduri de bare
+EnableFileCache=Activați memoria cache cu fișiere
 ShowDetailsInPDFPageFoot=Adăugați mai multe detalii în subsolul paginii, cum ar fi adresa companiei sau numele managerului (în plus față de ID-urile profesionale, capitalul companiei și numărul de identificare fiscală TVA).
 NoDetails=Nu există detalii suplimentare în subsolul paginii
-DisplayCompanyInfo=Afiseaza adresa societatii
-DisplayCompanyManagers=Afiseaza nume manager
-DisplayCompanyInfoAndManagers=Afișați numele companiei și numele managerului
-EnableAndSetupModuleCron=Dacă doriți ca această factură recurentă să fie generată automat, modulul * %s * trebuie să fie activat și setat corect. În caz contrar, generarea de facturi trebuie făcută manual din acest șablon utilizând butonul * Creare *. Rețineți că, chiar dacă ați activat generarea automată, puteți lansa manual generarea manuală. Generarea de duplicate pentru aceeași perioadă nu este posibilă.
+DisplayCompanyInfo=Afişează adresa societăţii
+DisplayCompanyManagers=Afişează nume manager
+DisplayCompanyInfoAndManagers=Afișează numele companiei și numele managerului
+EnableAndSetupModuleCron=Dacă doriți ca această factură recurentă să fie generată automat, modulul *%s* trebuie să fie activat și setat corect. În caz contrar, generarea de facturi trebuie făcută manual din acest șablon utilizând butonul *Creare*. Rețineți că, chiar dacă ați activat generarea automată, puteți lansa manual generarea. Generarea de duplicate pentru aceeași perioadă nu este posibilă.
 ModuleCompanyCodeCustomerAquarium=%s urmat de codul clientului pentru un cod contabil al clientului
-ModuleCompanyCodeSupplierAquarium=%s urmat de codul furnizorului pentru un cod contabil al furnizorului
-ModuleCompanyCodePanicum=Returneaza un cod contabil gol.
+ModuleCompanyCodeSupplierAquarium=%s urmat de codul furnizorului pentru un cont contabil al furnizorului
+ModuleCompanyCodePanicum=Returnează un cod contabil gol.
 ModuleCompanyCodeDigitaria=Redă un cod contabil compus în funcție de numele terțului. Codul constă dintr-un prefix care poate fi definit în prima poziție, urmat de numărul de caractere definite în codul terț.
-ModuleCompanyCodeCustomerDigitaria=%s urmat de numele clientului trunchiat de numărul de caractere: %s pentru codul de contabilitate al clientului.
-ModuleCompanyCodeSupplierDigitaria=%s urmată de numele furnizorului trunchiat de numărul de caractere: %s pentru codul contabil al furnizorului.
-Use3StepsApproval=În mod implicit, comenzile de cumpărare trebuie să fie create și aprobate de 2 utilizatori diferiți (un pas/utilizator de creat și un pas/utilizator de aprobat. Rețineți că, dacă utilizatorul are atât permisiunea de a crea și de a aproba, va fi suficient un pas/un utilizator). Puteți solicita această opțiune pentru a introduce un al treilea pas/aprobare pentru utilizatori, dacă suma este mai mare decât o valoare dedicată (astfel încât vor fi necesari 3 pași:  1 = validare, 2 = prima aprobare și 3 = o a doua aprobare dacă suma este suficientă). <br> Setați acest lucru la gol, dacă este suficientă o aprobare (2 pași), setați-o la o valoare foarte mică (0,1) dacă este întotdeauna necesară o a doua aprobare (3 pași).
-UseDoubleApproval=Utilizați o aprobare de 3 pași atunci când suma (fără taxă) este mai mare decât ...
+ModuleCompanyCodeCustomerDigitaria=%s urmat de numele clientului trunchiat la numărul de caractere: %s pentru codul de contabilitate al clientului.
+ModuleCompanyCodeSupplierDigitaria=%s urmată de numele furnizorului trunchiat la numărul de caractere: %s pentru codul contabil al furnizorului.
+Use3StepsApproval=În mod implicit, comenzile de achiziţie trebuie să fie create și aprobate de 2 utilizatori diferiți (un pas/utilizator de creat și un pas/utilizator de aprobat. Rețineți că, dacă utilizatorul are atât permisiunea de a crea și de a aproba, va fi suficient un pas/un utilizator). Puteți solicita această opțiune pentru a introduce un al treilea pas/aprobare pentru utilizatori, dacă suma este mai mare decât o valoare dedicată (astfel încât vor fi necesari 3 pași:  1 = validare, 2 = prima aprobare și 3 = o a doua aprobare dacă suma este suficientă). <br> Setați acest lucru la gol, dacă este suficientă o aprobare (2 pași), setați-o la o valoare foarte mică (0,1) dacă este întotdeauna necesară o a doua aprobare (3 pași).
+UseDoubleApproval=Utilizați o aprobare în 3 pași atunci când suma (fără taxă) este mai mare decât...
 WarningPHPMail=ATENŢIE: Configurarea pentru trimitea de email-uri din aplicație utilizează configurarea generică implicită. De multe ori este mai bine să configurați email-urile de ieșire pentru a utiliza serverul de email al furnizorului dvs. de servicii email în loc de configurarea implicită din mai multe motive:
 WarningPHPMailA=- Utilizarea serverului furnizorului de servicii de e-mail crește fiabilitatea e-mailului dvs., astfel încât crește livrabilitatea fără a fi semnalată ca SPAM
 WarningPHPMailB=- Unii furnizori de servicii de email (cum ar fi Yahoo) nu vă permit să trimiteți un email de pe alt server decât propriul server. Configurarea dvs. actuală utilizează serverul aplicației pentru a trimite email-uri și nu serverul furnizorului dvs. de email, deci unii destinatari (cei compatibili cu protocolul restrictiv DMARC), vă vor întreba furnizorul de email dacă vă pot accepta emailul și unii furnizori de email (cum ar fi Yahoo) poate răspunde "nu" deoarece serverul nu este al lor, așa că puține emailuri trimise pot să nu fie acceptate pentru livrare (aveți grijă și la cota de trimitere a furnizorului dvs. de email). 
 WarningPHPMailC=- Utilizând serverul SMTP al furnizorului de servicii email pentru a trimite email-uri este, de asemenea, interesantă, astfel încât toate email-urile trimise din aplicație vor fi, de asemenea, salvate în directorul "Trimise" al cutiei poștale.
 WarningPHPMailD=Dacă metoda „PHP Mail” este cu adevărat metoda pe care ați dori să o utilizați, puteți elimina acest avertisment adăugând constanta MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP la 1 în Acasă - Configurare - Altele.
-WarningPHPMail2=Dacă furnizorul dvs. de e-mail SMTP trebuie să restricționeze clientul de e-mail la unele adrese IP (foarte rar), aceasta este adresa IP a agentului utilizator de e-mail (MUA) pentru aplicația ERP CRM: <strong> %s </strong>.
-WarningPHPMailSPF= Dacă numele de domeniu din adresa dvs. de e-mail a expeditorului este protejat de o înregistrare SPF (vă rugăm să vă înregistrați numele domeniului), trebuie să adăugați următoarele adrese IP în înregistrarea SPF a DNS-ului domeniului dvs.:<strong>%s</strong>.
+WarningPHPMail2=Dacă furnizorul dvs. de e-mail SMTP trebuie să restricționeze clientul de email la unele adrese IP (foarte rar), aceasta este adresa IP a agentului utilizator de email (MUA) pentru aplicația ERP CRM: <strong>%s</strong>.
+WarningPHPMailSPF=Dacă numele de domeniu din adresa dvs. de e-mail a expeditorului este protejat de o înregistrare SPF (vă rugăm să vă înregistrați numele domeniului), trebuie să adăugați următoarele adrese IP în înregistrarea SPF a DNS-ului domeniului dvs.:<strong>%s</strong>.
 ClickToShowDescription=Faceți clic pentru a afișa descrierea
-DependsOn=Acest modul are nevoie de modulul (modulele)
-RequiredBy=Acest modul este solicitat de modulul (modulele)
+DependsOn=Acest modul are nevoie de modulul(lele)
+RequiredBy=Acest modul este solicitat de modulul(lele)
 TheKeyIsTheNameOfHtmlField=Acesta este numele câmpului HTML. Cunoștințele tehnice sunt necesare pentru a citi conținutul paginii HTML pentru a obține numele cheie al unui câmp.
-PageUrlForDefaultValues=Trebuie să introduceți calea relativă a adresei URL a paginii. Dacă includeți parametrii în URL, valorile implicite vor fi eficiente dacă toți parametrii sunt setați la aceeași valoare.
-PageUrlForDefaultValuesCreate=<br> Exemplu: <br> Pentru formularul de creare a unei terțe părți noi este <strong> %s </strong>. <br> Pentru URL-ul modulelor externe instalate în directorul personalizat, nu includeți "personalizat/" , astfel folosiți o cale ca <strong> mymodule / mypage.php </strong> și nu personalizat /mymodule/mypage.php. <br> Dacă doriți valoarea implicită numai dacă url are un anumit parametru, puteți utiliza <strong> %s </strong>
-PageUrlForDefaultValuesList=<br> Exemplu: <br> Pentru pagina care afișează terțe părți, este <strong> %s </strong>. <br> Pentru URL-ul modulelor externe instalate în directorul personalizat, nu includeți "personalizat / utilizati o cale ca <strong> mymodule / mypagelist.php </strong> și nu personalizat /mymodule/mypagelist.php. <br> Dacă doriți valoarea implicită numai dacă URL-ul are un anumit parametru, puteți utiliza <strong> %s </strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=De asemenea, rețineți că suprascrierea valorilor implicite pentru crearea de forme funcționează numai pentru paginile care au fost proiectate corect (deci cu parametrul de acțiune = crează sau prezintă ...)
+PageUrlForDefaultValues=Trebuie să introduceți calea relativă a adresei URL a paginii. Dacă includeți parametrii în URL, valorile implicite vor fi efective dacă toți parametrii sunt setați la aceeași valoare.
+PageUrlForDefaultValuesCreate=<br> Exemplu: <br> Pentru formularul de creare a unui terți nou este <strong>%s</strong>. <br> Pentru URL-ul modulelor externe instalate în directorul custom, nu include "custom/" , foloseşte o cale ca <strong>mymodule/mypage.php</strong> și nu custom/mymodule/mypage.php. <br> Foloseşte valoarea implicită numai dacă url-ul are un anumit parametru, <strong> %s</strong>
+PageUrlForDefaultValuesList=<br> Exemplu: <br> Pentru pagina care afișează terți, este <strong>%s</strong>. <br> Pentru URL-ul modulelor externe instalate în directorul personalizat, nu include "custom/" utilizează o cale ca <strong>mymodule/mypagelist.php</strong> și nu custom/mymodule/mypagelist.php. <br> Utilizează valoarea implicită numai dacă URL-ul are un anumit parametru, <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=De asemenea, rețineți că suprascrierea valorilor implicite pentru crearea de formulare funcționează numai pentru paginile care au fost proiectate corect (deci cu parametrul de action=create sau view...)
 EnableDefaultValues=Activați personalizarea valorilor implicite
-EnableOverwriteTranslation=Activați utilizarea traducerilor suprascrise
-GoIntoTranslationMenuToChangeThis=A fost găsită o traducere pentru cheia cu acest cod. Pentru a modifica această valoare, trebuie să o editați din Acasă-Configurare-Traducere.
-WarningSettingSortOrder=Avertisment, setarea unei ordini de sortare implicite poate duce la o eroare tehnică atunci când mergeți în lista paginii dacă câmpul este un câmp necunoscut. Dacă întâmpinați o astfel de eroare, reveniți la această pagină pentru a elimina ordinea de sortare implicită și pentru a restabili comportamentul implicit.
+EnableOverwriteTranslation=Activați utilizarea traducerilor cu suprascriere
+GoIntoTranslationMenuToChangeThis=A fost găsită o traducere pentru cheia cu acest cod. Pentru a modifica această valoare, trebuie să o editați din Acasă-Setări-Traduceri.
+WarningSettingSortOrder=Atenţie, setarea unei ordini de sortare implicite poate duce la o eroare tehnică atunci când mergeți în lista paginii dacă câmpul este un câmp necunoscut. Dacă întâmpinați o astfel de eroare, reveniți la această pagină pentru a elimina ordinea de sortare implicită și pentru a restabili comportamentul implicit.
 Field=Câmp
-ProductDocumentTemplates=Șabloane de documente pentru a genera documentul produsului
-FreeLegalTextOnExpenseReports=Text legal gratuit pe rapoartele de cheltuieli
+ProductDocumentTemplates=Șabloane de documente pentru a genera fişa de produs
+FreeLegalTextOnExpenseReports=Text legal liber pe rapoartele de cheltuieli
 WatermarkOnDraftExpenseReports=Filigran pe rapoartele de cheltuieli
-AttachMainDocByDefault=Setați această valoare la 1 dacă doriți să atașați documentul principal la e-mail în mod prestabilit (dacă este cazul)
+AttachMainDocByDefault=Setați această valoare la 1 dacă doriți să atașați documentul principal la email în mod prestabilit (dacă este cazul)
 FilesAttachedToEmail=Ataşează fişier
-SendEmailsReminders=Trimiteți mementouri de agendă prin e-mailuri
+SendEmailsReminders=Trimiteți mementouri din agendă pe email
 davDescription=Configurați un server WebDAV
 DAVSetup=Configurarea modulului DAV
-DAV_ALLOW_PRIVATE_DIR=Activați directorul privat generic (directorul dedicat WebDAV denumit „privat” - este necesară autentificare)
-DAV_ALLOW_PRIVATE_DIRTooltip=Directorul privat generic este un director WebDAV pe care oricine îl poate accesa cu identificarea/ parola aplicației sale.
-DAV_ALLOW_PUBLIC_DIR=Activați directorul public generic (director dedicat WebDAV denumit „public” - nu este necesară autentificare)
-DAV_ALLOW_PUBLIC_DIRTooltip=Directorul public generic este un director WebDAV pe care îl poate accesa oricine (în modul citire și scriere), fără a fi necesară autorizarea (identificare / parolă).
-DAV_ALLOW_ECM_DIR=Activați directorul privat DMS / ECM (directorul rădăcină al modulului DMS / ECM - este necesară autentificarea)
-DAV_ALLOW_ECM_DIRTooltip=Directorul rădăcină în care toate fișierele sunt încărcate manual când se utilizează modulul DMS / ECM. Similar accesului din interfața web, veți avea nevoie de autentificare/parolă valabilă, cu permisiuni adecvate de accesare a acestuia.
+DAV_ALLOW_PRIVATE_DIR=Activați directorul privat generic (directorul dedicat WebDAV denumit "privat" - este necesară autentificarea)
+DAV_ALLOW_PRIVATE_DIRTooltip=Directorul privat generic este un director WebDAV pe care oricine îl poate accesa cu identificatorul/parola din aplicația sa.
+DAV_ALLOW_PUBLIC_DIR=Activare director public generic (director dedicat WebDAV denumit "public" - nu este necesară autentificarea)
+DAV_ALLOW_PUBLIC_DIRTooltip=Directorul public generic este un director WebDAV pe care îl poate accesa oricine (în modul citire și scriere), fără a fi necesară autorizarea (identificare/parolă).
+DAV_ALLOW_ECM_DIR=Activați directorul privat DMS/ECM (directorul rădăcină al modulului DMS/ECM - este necesară autentificarea)
+DAV_ALLOW_ECM_DIRTooltip=Directorul rădăcină în care sunt toate fișierele sunt încărcate manual când se utilizează modulul DMS/ECM. Similar accesului din interfața web, veți avea nevoie de autentificare/parolă valabilă, cu permisiuni adecvate de accesare a acestuia.
 # Modules
 Module0Name=Utilizatori & Grupuri
 Module0Desc=Managementul Utilizatorilor/Angajaților și al Grupurilor
@@ -525,150 +529,154 @@ Module1Name=Terți
 Module1Desc=Gestionarea companiilor și a contactelor (clienți, prospecţi...)
 Module2Name=Comercial
 Module2Desc=Management Comercial
-Module10Name=Contabilitate (simplificată)
+Module10Name=Contabilitate (în partidă simplă)
 Module10Desc=Rapoarte contabile simple (jurnale, cifre de afaceri) bazate pe conținutul bazei de date. Nu folosește niciun registru contabil.
-Module20Name=Oferte
+Module20Name=Oferte comerciale
 Module20Desc=Managementul Ofertelor Comerciale
-Module22Name=Mass e-mailuri
-Module22Desc=Gestionați e-mailurile în bloc
+Module22Name=Newslettere
+Module22Desc=Transmitere şi gestionare newslettere
 Module23Name=Energie
 Module23Desc=Monitorizarea consumului de energie
-Module25Name=Comenzile de vânzări
-Module25Desc=Gestionarea comenzilor de vânzări
+Module25Name=Comenzi de vânzări
+Module25Desc=Managementul comenzilor de vânzări
 Module30Name=Facturi
-Module30Desc=Gestionarea facturilor și a bonurilor de credit pentru clienți. Gestionarea facturilor și a bonurilor de credit pentru furnizori
+Module30Desc=Gestionarea facturilor și a notelor de credit pentru clienți. Gestionarea facturilor și a notelor de credit pentru furnizori
 Module40Name=Furnizori
 Module40Desc=Managementul furnizorilor și achizițiilor (comenzi de achiziţie  și facturi furnizor)
-Module42Name=Depanați jurnalele
-Module42Desc=Facilități de înregistrare (fișier, syslog, ...). Aceste jurnale sunt pentru scopuri tehnice / de depanare.
+Module42Name=Jurnale de depanare
+Module42Desc=Facilități de jurnalizare (fișier, syslog, ...). Aceste jurnale sunt pentru scopuri tehnice/de depanare.
+Module43Name=Debug bar
+Module43Desc=Un instrument pentru dezvoltatori care adaugă o bară de depanare în browserul dvs.
 Module49Name=Editori
-Module49Desc=Managementul Editorilor
+Module49Desc=Managementul editorilor
 Module50Name=Produse
 Module50Desc=Gestionarea produselor
-Module51Name=Mass-mailing
-Module51Desc=Mass-mailing hârtie "de gestionare a
+Module51Name=Scrisori
+Module51Desc=Gestionarea scrisorilor, corespondenţei poştale
 Module52Name=Stocuri
 Module52Desc=Gestionarea stocurilor
 Module53Name=Servicii
 Module53Desc=Gestiunea serviciilor
-Module54Name=Contracte / Abonamente
+Module54Name=Contracte/Abonamente
 Module54Desc=Gestionarea contractelor (servicii sau abonamente periodice)
 Module55Name=Coduri de bare
-Module55Desc=Coduri de bare "de gestionare a
+Module55Desc=Managementul codurilor de bare
 Module56Name=Plată prin transfer credit
 Module56Desc=Gestionarea plății furnizorilor efectuate prin ordine de transfer de credit. Acesta include generarea de fișiere SEPA pentru țările europene. 
 Module57Name=Plăţi prin direct debit
 Module57Desc=Gestionarea ordinelor de direct debit. Acesta include generarea de fișiere SEPA pentru țările europene. 
 Module58Name=ClickToDial
-Module58Desc=ClickToDial integrare
+Module58Desc=Integrare cu un sistem ClickToDial (Asterisk, ...)
 Module60Name=Stickere
 Module60Desc=Management stickere
 Module70Name=Intervenţii
-Module70Desc=Managementul Intervenţiilor
-Module75Name=Ordine de deplasare şi Note de Cheltuieli
-Module75Desc=Managementul Ordinele de deplasare şi Notelor de Cheltuieli
+Module70Desc=Managementul intervenţiilor
+Module75Name=Ordine de deplasare - delegaţie şi Note de Cheltuieli
+Module75Desc=Managementul Ordinelor de deplasare şi Notelor de Cheltuieli
 Module80Name=Livrări
-Module80Desc=Livrările și gestionarea notei de livrare
+Module80Desc=Livrăril și gestionarea notelor de livrare
 Module85Name=Bănci și numerar
-Module85Desc=Managementul conturilor bancare şi in numerar
+Module85Desc=Managementul conturilor bancare şi a celor de numerar
 Module100Name=Site extern
 Module100Desc=Adăugați un link către un site web extern ca pictogramă de meniu principal. Website-ul este afișat într-un cadru sub meniul principal.
 Module105Name=Mailman şi SIP
-Module105Desc=Interfaţă Mailman sau SPIP pentru modul membru
+Module105Desc=Interfaţă Mailman sau SPIP pentru modul Membri
 Module200Name=LDAP
 Module200Desc=Sincronizarea directorului LDAP
 Module210Name=PostNuke
-Module210Desc=PostNuke integrare
-Module240Name=Exportul de date
+Module210Desc=Integrare PostNuke
+Module240Name=Export date
 Module240Desc=Instrument pentru export date din Dolibarr (asistat) 
-Module250Name=Date importurile
+Module250Name=Import date
 Module250Desc=Instrument pentru import date în Dolibarr (asistat) 
 Module310Name=Membri
-Module310Desc=Fundatia membri de management
+Module310Desc=Managementul membrilor unei fundaţii
 Module320Name=Feed RSS
-Module320Desc=Adăugați un feed RSS la paginile Dolibarr
+Module320Desc=Adăugați un feed RSS la paginile sistemului
 Module330Name=Marcaje & comenzi rapide
 Module330Desc=Creați comenzi rapide, întotdeauna accesibile, paginilor interne sau externe pe care le accesați frecvent
-Module400Name=Proiecte sau inițiative
-Module400Desc=Gestionarea proiectelor, a potențialilor și / sau a sarcinilor. De asemenea, puteți asocia orice element (factură, comandă, propunere, intervenție, ...) unui proiect și obține o vedere transversală din vizualizarea proiectului.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integrare
+Module400Name=Proiecte sau oportunităţi
+Module400Desc=Gestionarea proiectelor, a lead-urilor/oportunităţilor și/sau a task-urilor. De asemenea, puteți asocia orice element (factură, comandă, propunere, intervenție, ...) unui proiect și puteţi obține o vedere transversală proiectului.
+Module410Name=Calendar web
+Module410Desc=Integrare calendar web
 Module500Name=Taxe și cheltuieli speciale
-Module500Desc=Gestionarea altor cheltuieli (impozite de vânzare, taxe sociale sau fiscale, dividende, ...)
+Module500Desc=Gestionarea altor cheltuieli (taxe de vânzare, taxe sociale sau fiscale, dividende, ...)
 Module510Name=Salarii
 Module510Desc=Înregistrați și urmăriți plățile angajaților
 Module520Name=Credite
 Module520Desc=Gestionarea creditelor
-Module600Name=Notificări privind evenimentul de afaceri
-Module600Desc=Trimiteți notificări prin e-mail declanșate de un eveniment de afaceri: pentru fiecare utilizator (setarea definită pentru fiecare utilizator), pentru contacte terțe (setare definită pentru fiecare terț) sau pentru e-mailuri specifice
-Module600Long=Rețineți că acest modul trimite e-mailuri în timp real când apare un anumit eveniment de afaceri. Dacă sunteți în căutarea unei funcții pentru a trimite memento-uri de e-mail pentru evenimente de agendă, mergeți la configurarea agendei modulului.
+Module600Name=Notificări pe eveniment de afaceri
+Module600Desc=Trimiteți notificări prin email declanșate de un eveniment de afaceri: pentru fiecare utilizator (setarea definită pentru fiecare utilizator), pentru contacte terțe (setare definită pentru fiecare terț) sau pentru emailuri specifice
+Module600Long=Rețineți că acest modul trimite emailuri în timp real când apare un anumit eveniment de afaceri. Dacă sunteți în căutarea unei funcții pentru a trimite remindere pe email pentru evenimentele din agendă, mergeți la configurarea modulului Agendă.
 Module610Name=Variante de produs
 Module610Desc=Crearea de variante de produse (culoare, dimensiune etc.)
-Module700Name=Donatii
-Module700Desc=MAnagementul Donaţiilor
+Module700Name=Donaţii
+Module700Desc=Managementul Donaţiilor
 Module770Name=Rapoarte de cheltuieli
-Module770Desc=Gestionați cererile de rapoarte de cheltuieli (transport, masă, ...)
-Module1120Name=Propuneri comerciale ale furnizorilor
-Module1120Desc=Solicitați vânzătorului propunerea comercială și prețurile
+Module770Desc=Gestionați cererile de decontare de cheltuieli (transport, masă, ...)
+Module1120Name=Oferte comerciale de la furnizori
+Module1120Desc=Solicitați furnizorilor oferte şi cereri de prețuri
 Module1200Name=Mantis
-Module1200Desc=Mantis integrare
-Module1520Name=Generare Document 
-Module1520Desc=Generarea de documente de mass e-mail
-Module1780Name=Tag-uri / Categorii
+Module1200Desc=Integrare Mantis
+Module1520Name=Generare document 
+Module1520Desc=Generarea de newslettere
+Module1780Name=Tag-uri/Categorii
 Module1780Desc=Creați etichete/categorii (produse, clienti, furnizori, contacte sau membri)
-Module2000Name=Fckeditor
-Module2000Desc=Permite câmpurilor de text să fie editate / formatate folosind CKEditor (html)
+Module2000Name=Fckeditor editor WYSIWYG
+Module2000Desc=Permite câmpurilor de text să fie editate/formatate folosind CKEditor (html)
 Module2200Name=Preţuri dinamice
-Module2200Desc=Utilizați expresii de matematică pentru generarea automată a prețurilor
-Module2300Name=Joburi programate
-Module2300Desc=Gestionarea planificată a locurilor de muncă (alias cron sau tabelul chrono)
-Module2400Name=Evenimente / Agenda
-Module2400Desc=Urmăriți evenimentele. Înregistrați evenimente automate pentru a urmări scopurile sau pentru a înregistra evenimente sau întâlniri manuale. Acesta este modulul principal pentru o bună gestionare a relațiilor cu clienții sau furnizorii.
+Module2200Desc=Utilizați expresii matematice pentru generarea automată a prețurilor
+Module2300Name=Joburi de sistem programate
+Module2300Desc=Gestionarea planificată a joburilor de sistem (alias cron sau chrono)
+Module2400Name=Evenimente/Agendă
+Module2400Desc=Urmăriți evenimentele. Înregistrați evenimente automate sau manual pentru a nota activităţi sau întâlniri. Acesta este modulul principal pentru o bună gestionare a relațiilor cu clienții sau furnizorii.
 Module2500Name=DMS / ECM
-Module2500Desc=Sistemul de management al documentelor / Gestiunea conținutului electronic. Organizarea automată a documentelor dvs. generate sau stocate. Împărțiți-le când aveți nevoie.
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Activați serviciile serverului Dolibarr SOAP care furnizează servicii API
-Module2610Name=Servicii API/Web (serverul REST)
-Module2610Desc=Activați serverul Dolibarr REST furnizând servicii API
+Module2500Desc=Sistemul de management al documentelor / Gestiunea conținutului electronic. Organizarea automată a documentelor tale generate sau stocate. Le poţi partaja dacă este necesar.
+Module2600Name=Servicii API/Web (SOAP server)
+Module2600Desc=Activați serverul SOAP pentru a furniza servicii API
+Module2610Name=Servicii API/Web (server REST)
+Module2610Desc=Activare server REST pentru furnizarea de servicii API
 Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Activați clientul de servicii Web Dolibarr (Poate fi folosit pentru a împinge datele / cererile către servere externe. În prezent, sunt acceptate numai comenzile de cumpărare.)
+Module2660Desc=Activați clientul de servicii Web (Poate fi folosit pentru a împinge datele/cererile către servere externe. În prezent, sunt acceptate numai comenzile de achiziţie.)
 Module2700Name=Gravatar
-Module2700Desc=Utilizați serviciul Gravatar online (www.gravatar.com) pentru a afișa fotografia utilizatorilor / membrilor (găsite cu e-mailurile lor). Necesită acces la Internet
+Module2700Desc=Utilizați serviciul Gravatar online (www.gravatar.com) pentru a afișa fotografia utilizatorilor/membrilor (găsite pe baza adreselor de email). Necesită acces la Internet
 Module2800Desc=FTP Client
 Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP conversii Maxmind capacităţile
-Module3200Name=Arhivele nealterabile
+Module2900Desc=Capabilităţi de conversie GeoIP Maxmind
+Module3200Name=Jurnale Nealterabile
 Module3200Desc=Activează un jurnal inalterabil al evenimentelor de afaceri. Evenimentele sunt arhivate în timp real. Jurnalul este o tabelă cu functie doar de citire a evenimentelor în lanț care pot fi exportate. Acest modul poate fi obligatoriu pentru unele țări.
+Module3400Name=Reţele sociale
+Module3400Desc=Activați câmpurile Rețele sociale la terți și adrese (skype, twitter, facebook, ...).
 Module4000Name=HRM
-Module4000Desc=Managementul resurselor umane (managementul departamentului, contracte și păreri ale angajaților)
+Module4000Desc=Managementul resurselor umane (management departamente, contracte de muncă și experienţa angajaților)
 Module5000Name=Multi-societate
 Module5000Desc=Vă permite să administraţi mai multe companii
-Module6000Name=Flux de lucru
-Module6000Desc=Gestionarea fluxului de lucru (crearea automată a modificării obiectului și / sau a stării automate)
+Module6000Name=Flux de lucru inter-module
+Module6000Desc=Gestionarea fluxului de lucru între diferite module (crearea automată a obiectului și/sau schimbarea automată a stării)
 Module10000Name=Site-uri
 Module10000Desc=Creați site-uri web (publice) cu un editor WYSIWYG. Acesta este un CMS  pentru webmasteri sau dezvoltatori (este recomandat  să cunoașteți limbajul HTML și CSS). Trebuie doar să configurați serverul web (Apache, Nginx, ...) pentru a indica directorul Dolibarr dedicat pentru a-l avea online pe internet cu propriul nume de domeniu. 
 Module20000Name=Managementul cererilor de concediu
 Module20000Desc=Definiți și urmăriți cererile de concediu pentru angajați
 Module39000Name=Loturi de producţie
 Module39000Desc=Loturi, numere seriale, administrare consum de date eat-by/sell-by pentru produse
-Module40000Name=Mai multe cursuri valutare
-Module40000Desc=Utilizați cursuri valutare alternative în prețuri și documente
+Module40000Name=Multimonedă
+Module40000Desc=Utilizați monede alternative în prețuri și documente
 Module50000Name=Paybox
-Module50000Desc=Oferiți clienților o pagină pentru plata online PayBox (carduri de credit / debit). Aceasta poate fi utilizată pentru a permite clienților dvs. să efectueze plăți ad-hoc sau plăți legate de un anumit obiect Dolibarr (factură, comandă etc.)
+Module50000Desc=Oferiți clienților o pagină pentru plata online PayBox (carduri de credit/debit). Aceasta poate fi utilizată pentru a permite clienților să efectueze plăți ad-hoc sau plăți legate de un anumit obiect din sistem (factură, comandă etc.)
 Module50100Name=POS SimplePOS
-Module50100Desc=Punct de vânzare modul SimplePOS (POS simplu).
+Module50100Desc=Punct de vânzare modulul SimplePOS (POS simplu).
 Module50150Name=POS TakePOS
 Module50150Desc=Modulul Punct de Vânzare TakePOS (POS cu ecran tactil, pentru magazine, baruri sau restaurante).
 Module50200Name=PayPal
-Module50200Desc=Oferiți clienților o pagină de plată online PayPal (cont PayPal sau carduri de credit / debit). Aceasta poate fi utilizată pentru a permite clienților dvs. să efectueze plăți ad-hoc sau plăți legate de un anumit obiect Dolibarr (factură, comandă etc.)
-Module50300Name=Dunga
-Module50300Desc=Oferiți clienţilor o pagină Stripe de plată online (carduri de credit/debit). Aceasta poate fi utilizată pentru a permite clienţilor să facă plăţi ad-hoc sau plăţi legate de un anumit obiect Dolibarr (factură, comandă etc ...)
-Module50400Name=Contabilitate (intrare dublă)
+Module50200Desc=Oferiți clienților o pagină de plată online PayPal (cont PayPal sau carduri de credit/debit). Aceasta poate fi utilizată pentru a permite clienților să efectueze plăți ad-hoc sau plăți legate de un anumit obiect din sistem (factură, comandă etc...)
+Module50300Name=Stripe
+Module50300Desc=Oferiți clienţilor o pagină Stripe de plată online (carduri de credit/debit). Aceasta poate fi utilizată pentru a permite clienţilor să facă plăţi ad-hoc sau plăţi legate de un anumit obiect sistem (factură, comandă etc ...)
+Module50400Name=Contabilitate (partidă dublă)
 Module50400Desc=Managementul contabilității (partidă dublă, suport jurnale contabile principale şi subsidiare- de filială). Exportați registrele în mai multe alte formate utilizate de software-uri de contabilitate. 
-Module54000Name=Print lP IPrinter
-Module54000Desc=Imprimare directă (fără a deschide documentele) utilizând interfața Cups IPP (Imprimanta trebuie să fie vizibilă pe server, and CUPS trebuie să fie instalat pe server).
-Module55000Name=Sondaj, supraveghere sau vot
-Module55000Desc=Creați sondaje online, sondaje sau voturi (cum ar fi Doodle, Studs, RDVz etc ...)
+Module54000Name=Print lPP
+Module54000Desc=Imprimare directă (fără a deschide documentele) utilizând interfața Cups IPP (Imprimanta trebuie să fie vizibilă pe server, şi CUPS trebuie să fie instalat pe server).
+Module55000Name=Sondaj, Chestionar sau Vot
+Module55000Desc=Creați sondaje online, chestionare sau voturi (cum ar fi Doodle, Studs, RDVz etc...)
 Module59000Name=Marje
 Module59000Desc=Modul pentru urmărirea marjelor
 Module60000Name=Comisioane
@@ -676,183 +684,184 @@ Module60000Desc=Modul management comisioane
 Module62000Name=Incoterm
 Module62000Desc=Adăugați caracteristici pentru a gestiona Incoterms
 Module63000Name=Resurse
-Module63000Desc=Gestionați resursele (imprimante, mașini, camere, ...) pentru a le aloca evenimentelor
-Permission11=Citeşte facturi
-Permission12=Creaţi/Modificare facturi
+Module63000Desc=Gestionarea resurselor (imprimante, mașini, camere, ...) pentru a le aloca evenimentelor
+Permission11=Citeşte facturi clienţi
+Permission12=Creare/modificare facturi clienţi
 Permission13=Invalidează facturi client
-Permission14=Facturi client validate
-Permission15=Trimite facturi prin e-mail
-Permission16=Crearea de plăţi pentru facturile
-Permission19=Ştergere facturi
+Permission14=Validare facturi client
+Permission15=Trimite facturi client pe email
+Permission16=Creare de plăţi pentru facturile client
+Permission19=Ştergere facturi clienţi
 Permission21=Citeşte oferte comerciale
-Permission22=Creare / Modificare oferte comerciale
-Permission24=Oferte comerciale validate
-Permission25=Trimite oferte comerciale
-Permission26=Inchide oferte comerciale
+Permission22=Creare/modificare oferte comerciale
+Permission24=Validare oferte comerciale
+Permission25=Trimitere oferte comerciale
+Permission26=Închidere oferte comerciale
 Permission27=Ştergere oferte comerciale
 Permission28=Export oferte comerciale
-Permission31=Citiţi cu produse / servicii
-Permission32=Creare / Modificare produse / servicii
-Permission34=Ştergere produse / servicii
-Permission36=Exportul de produse / servicii
-Permission38=Exportul de produse
+Permission31=Citeşte produse/servicii
+Permission32=Creare/modificare produse/servicii
+Permission34=Ştergere produse/servicii
+Permission36=Vizualizare/administrare de produse/servicii ascunse
+Permission38=Export de produse/servicii
 Permission39=Ignoră preţul minim de vânzare
-Permission41=Citiți proiectele și sarcinile (proiecte și proiecte comune pentru care sunt persoană de contact). Se poate, de asemenea, să introduceți timpul consumat, pentru mine sau pentru ierarhia mea, asupra sarcinilor atribuite (Timesheet)
-Permission42=Creați/modificați proiecte (proiecte și proiecte comune pentru care sunt persoană de contact). De asemenea, se pot crea sarcini și se pot atribui utilizatorilor proiecte și sarcini
-Permission44=Ștergeți proiectele (proiectul comun și proiectele pentru care sunt persoană de contact)
+Permission41=Citeşte proiectele și task-urile (proiecte partajate și proiecte care sunt persoană de contact). Se poate, de asemenea, să introduci timpul consumat, pentru mine sau pentru ierarhia mea, asupra task-urilor atribuite (Timesheet)
+Permission42=Creare/modificare proiecte (proiecte partajate și proiecte la care este persoană de contact). De asemenea, poate crea task-uri și poate atribui utilizatori la proiecte și tak-uri
+Permission44=Șterge proiecte (proiecte partajate și proiecte pentru care este persoană de contact)
 Permission45=Export proiecte
 Permission61=Citeşte intervenţii
-Permission62=Creare / Modificare intervenţii
+Permission62=Creare/modificare intervenţii
 Permission64=Ştergere intervenţii
 Permission67=Export intervenţii
 Permission68=Trimitere intervenţii pe email
 Permission69=Validează intervenţii
 Permission70=Invalidează intervenţii
-Permission71=Citeşte membrii
-Permission72=Creare / Modificare membri
+Permission71=Citeşte membri
+Permission72=Creare/modificare membri
 Permission74=Ştergere membri
 Permission75=Configurare tipuri membri
-Permission76=Export Date
+Permission76=Export date
 Permission78=Citeşte abonamente
-Permission79=Creare / Modificare abonamente
-Permission81=Citeşte ordinelor clienţilor
-Permission82=Creare / Modificare ordinelor clienţilor
-Permission84=Validate ordinelor clienţilor
-Permission86=Trimite ordinelor clienţilor
-Permission87=Inchide ordinelor clienţilor
-Permission88=Anulare ordinelor clienţilor
-Permission89=Ştergere ordinelor clienţilor
+Permission79=Creare/modificare abonamente
+Permission81=Citeşte comenzile de vânzare
+Permission82=Creare/modificare comenzi de vânzare
+Permission84=Validare comenzi de vânzare
+Permission86=Trimitere comenzi de vânzare
+Permission87=Închidere comenzi de vânzare
+Permission88=Anulare comenzi de vânzare
+Permission89=Ştergere comenzi de vânzare
 Permission91=Citeste taxe sociale sau fiscale și tva
-Permission92=Creare / Modificare taxe sociale sau fiscale si tva
-Permission93=Sterge taxe sociale sau fiscale si tva
-Permission94=Export taxe sociale sau fiscale si tva
+Permission92=Creare/modificare taxe sociale sau fiscale şi tva
+Permission93=Şterge taxe sociale sau fiscale şi tva
+Permission94=Export taxe sociale sau fiscale şi tva
 Permission95=Citeşte rapoarte
-Permission101=Citeşte sendings
-Permission102=Creare / Modificare Livrare
-Permission104=Validează livrari
-Permission105=Trimitere expediţii pe email
+Permission101=Citeşte livrări
+Permission102=Creare/modificare livrări
+Permission104=Validare livrări
+Permission105=Trimitere livrări pe email
 Permission106=Export livrări
-Permission109=Ştergere sendings
-Permission111=Citeşte conturile financiare
-Permission112=Crea / modifica / delete şi compara tranzacţiile
+Permission109=Şterge livrări
+Permission111=Citeşte conturi financiare
+Permission112=Creare/modificare/ştergere şi comparare tranzacţii
 Permission113=Configurare conturi financiare( creare, gestionare categorii)
 Permission114=Decontați tranzacțiile
-Permission115=Tranzacţii de export şi în declaraţiile
-Permission116=Transferuri între conturile
-Permission117=Gestionați cecuri de expediţie 
-Permission121=Citiţi cu terţe părţi legate de utilizator
-Permission122=Creare / Modificare terţe părţi legate de utilizator
-Permission125=Ştergere terţe părţi legate de utilizator
+Permission115=Export tranzacţii şi declaraţii contabile
+Permission116=Transferuri între conturi
+Permission117=Gestionare remitere cecuri
+Permission121=Citiţi terţi asociaţi la utilizator
+Permission122=Creare/modificare terţi asociaţi la utilizator
+Permission125=Ştergere terţi asociaţi la utilizator
 Permission126=Export terţi
-Permission141=Citește toate proiectele și sarcinile (inclusiv proiectele private pentru care nu sunt persoană de contact) 
-Permission142=Creați/modificați toate proiectele și sarcinile (inclusiv proiectele private pentru care nu sunt persoană de contact) 
-Permission144=Şterge toate proiectele și sarcinile (inclusiv proiectele private pentru care nu sunt persoană de contact)
-Permission146=Citiţi cu furnizorii
-Permission147=Citeşte stats
-Permission151=Citiți comenzile de plată prin debitare directă
-Permission152=Creați/modificați un ordin de plată prin debit direct
+Permission141=Citește toate proiectele și task-urile (inclusiv proiectele private pentru care nu este persoană de contact) 
+Permission142=Creare/modificare toate proiectele și task-urile (inclusiv proiectele private pentru care nu este persoană de contact) 
+Permission144=Şterge toate proiectele și task-urile (inclusiv proiectele private pentru care nu sunt persoană de contact)
+Permission146=Citeşte furnizorii
+Permission147=Citeşte statisticile
+Permission151=Citeşte ordinele de plată prin debitare directă
+Permission152=Creare/modificare ordin de plată prin debit direct
 Permission153=Trimite/transmite ordine de plată prin debit direct
-Permission154=Inregistreaza creditarea/respingerea ordinelor de plată prin debitare directă 
-Permission161=Citește contracte / abonamente
-Permission162=Creare / modificare contracte / abonamente
-Permission163=Activează un serviciu / abonament al unui contract
-Permission164=Dezactivarea unui serviciu / abonament al unui contract
-Permission165=Ștergeți contracte / abonamente
-Permission167=Export Contracte
-Permission171=Citiți delegatiile și cheltuielile (ale dvs. și ale subordonaților dvs.)
-Permission172=Creare / Modificare ordin de deplasare şi cheltuieli
-Permission173=Ştergere ordin de deplasare şi cheltuieli
-Permission174=Citeşte toate ordinele de deplasare şi cheltuieli
-Permission178=Export  ordin de deplasare şi cheltuieli
-Permission180=Citiţi cu furnizorii
-Permission181=Citiți comenzile de achiziţie
-Permission182=Creați/modificați comenzile de achiziţie
-Permission183=Validați comenzile de achiziţie
-Permission184=Aprobați comenzile de achiziţie
-Permission185=Ordonați sau anulați comenzile de achiziţie
-Permission186=Primiți comenzile de achiziţie
-Permission187=Închideţi comenzile de achiziţie
-Permission188=Anulaţi comenzile de achiziţie
-Permission192=Creaţi linii
+Permission154=Înregistrează creditarea/respingerea ordinelor de plată prin debitare directă 
+Permission161=Citește contracte/abonamente
+Permission162=Creare/modificare contracte/abonamente
+Permission163=Activează un serviciu/abonament al unui contract
+Permission164=Dezactivează un serviciu/abonament al unui contract
+Permission165=Șterge contracte/abonamente
+Permission167=Export contracte
+Permission171=Citeşte delegatiile și cheltuielile (ale sale și ale subordonaților săi)
+Permission172=Creare/modificare ordin de deplasare şi cheltuieli
+Permission173=Ştergere ordine de deplasare şi rapoarte de cheltuieli
+Permission174=Citeşte toate delegaţiile şi cheltuielile
+Permission178=Export ordine de deplasare şi rapoarte de cheltuieli
+Permission180=Citeşte furnizorii
+Permission181=Citeşte comenzile de achiziţie
+Permission182=Creați/modificare comenzi de achiziţie
+Permission183=Validare comenzi de achiziţie
+Permission184=Aprobare comenzi de achiziţie
+Permission185=Comandă sau anulare comenzi de achiziţie
+Permission186=Recepţie comenzi de achiziţie
+Permission187=Închidere comenzi de achiziţie
+Permission188=Anulare comenzi de achiziţie
+Permission192=Creare linii
 Permission193=Anulare linii
-Permission194=Citiți liniile de lățime de bandă
-Permission202=Creaţi conexiuni ADSL
-Permission203=Ordinul de conexiuni ordinelor
-Permission204=Ordinul de conexiuni
+Permission194=Citeşte liniile de lățime de bandă
+Permission202=Creare conexiuni ADSL
+Permission203=Solicită comanda pachetelor
+Permission204=Comadă pachetele
 Permission205=Gestionare conexiuni
-Permission206=Citiţi cu conexiuni
-Permission211=Citeşte de telefonie
-Permission212=Ordinul linii
-Permission213=Activaţi-line
-Permission214=Setup de telefonie
-Permission215=Setup furnizori
-Permission221=Citeşte emailings
-Permission222=Creare / Modificare emailings (subiect, beneficiarii ...)
-Permission223=Validate emailings (permite trimiterea)
-Permission229=Ştergere emailings
-Permission237=Vezi destinatari și informații
-Permission238=Trimitere emailuri manuală
-Permission239=Şterge emailurile după validare sau trimitere
+Permission206=Citeşte conexiuni
+Permission211=Citeşte Telefonie
+Permission212=Comandă linii
+Permission213=Activare linie
+Permission214=Configurare Telefonie
+Permission215=Configurare furnizori
+Permission221=Citeşte newslettere
+Permission222=Creare/modificare newslettere (subiect, destinatari..)
+Permission223=Validare newslettere (permite trimiterea)
+Permission229=Şterge newslettere
+Permission237=Vizualizare destinatari și informații
+Permission238=Trimitere manuală emailuri
+Permission239=Şterge newslettere după validare sau trimitere
 Permission241=Citeşte categorii
-Permission242=Creare / Modificare categorii
-Permission243=Ştergere categorii
-Permission244=A se vedea conţinutul ascunse categorii
+Permission242=Creare/modificare categorii
+Permission243=Şterge categorii
+Permission244=Vede conţinutul din categoriile ascunse
 Permission251=Citeşte alţi utilizatori şi grupuri
-PermissionAdvanced251=Citeste alţi utilizatori
+PermissionAdvanced251=Citeşte alţi utilizatori
 Permission252=Citire permisiunile altor utilizatori
-Permission253=Creați / modificați alți utilizatori, grupuri și permisiuni
-PermissionAdvanced253=Crearea / modificarea utilizatorii interni / externi şi permisiuni
-Permission254=Ştergere sau dezactiva alţi utilizatori
-Permission255=Creaţi / modifica propriile informaţii de utilizator
+Permission253=Creare/modificare alți utilizatori, grupuri și permisiuni
+PermissionAdvanced253=Creare/modificare utilizatori interni/externi şi permisiuni
+Permission254=Creare/modificare doar utilizatori externi
+Permission255=Creare/modificare propriile informaţii de utilizator
 Permission256=Modificare propria parolă
-Permission262=Extindeți accesul la toţi terţii (nu numai terţii pentru care utilizatorul este un reprezentant de vânzări). <br> Nu este eficient pentru utilizatori externi (întotdeauna se autolimiteaza la propuneri, comenzi, facturi, contracte etc..). <br> Nu este eficient pentru proiecte (doar reguli privind permisiunile proiectului, aspectul vizibilității și atribuții).
+Permission262=Extindeți accesul la toţi terții ȘI la obiectele acestora (nu numai la terții pentru care utilizatorul este reprezentant de vânzări). <br>Nu este eficient pentru utilizatorii externi (întotdeauna limitat la ei înșiși pentru propuneri, comenzi, facturi, contracte etc.). <br>Nu este eficient pentru proiecte (numai reguli privind permisiunile proiectului, vizibilitate și probleme de atribuire).
+Permission263=Extindeți accesul la toţi terții FĂRĂ obiectele lor (nu numai la terții pentru care utilizatorul este reprezentant de vânzări). <br>Nu este eficient pentru utilizatorii externi (întotdeauna limitat la ei înșiși pentru propuneri, comenzi, facturi, contracte etc.). <br>Nu este eficient pentru proiecte (numai reguli privind permisiunile proiectului, vizibilitate și probleme de atribuire).
 Permission271=Citeşte CA
 Permission272=Citeşte facturi
-Permission273=Problema facturilor
+Permission273=Emitere facturi
 Permission281=Citeşte contacte
-Permission282=Creare / Modificare contacte
-Permission283=Ştergere contacte
-Permission286=Exportaţi contacte
+Permission282=Creare/modificare contacte
+Permission283=Şterge contacte
+Permission286=Export contacte
 Permission291=Citeşte tarife
-Permission292=Setaţi permisiunile cu privire la tarifele de
-Permission293=Modificați tarifele clientului
-Permission300=Citiți coduri de bare
-Permission301=Creați/modificați coduri de bare
-Permission302=Ștergeți codurile de bare
+Permission292=Setare permisiuni pe tarifele de
+Permission293=Modificare tarife client
+Permission300=Citire coduri de bare
+Permission301=Creare/modificare coduri de bare
+Permission302=Șterge coduri de bare
 Permission311=Citeşte servicii
-Permission312=Atribuire serviciu / abonament la contract
-Permission331=Citiţi cu marcaje
-Permission332=Creare / Modificare marcaje
-Permission333=Ştergeţi marcaje
-Permission341=Citeste permisiunile proprii
-Permission342=Crearea / modificarea datelor sale de utilizator proprie
-Permission343=Modifica parola proprie
+Permission312=Atribuire serviciu/abonament la contract
+Permission331=Citire marcaje
+Permission332=Creare/modificare marcaje
+Permission333=Şterge marcaje
+Permission341=Citeşte permisiunile proprii
+Permission342=Creare/modificarea date proprii de utilizator
+Permission343=Modifică parola proprie
 Permission344=Modificare permisiuni proprii
-Permission351=Citeşte Grupuri
-Permission352=Grupuri de permisiuni de citire
-Permission353=Crearea / modificarea grupurilor de
-Permission354=Şterge sau dezactiva grupuri
+Permission351=Citeşte grupuri
+Permission352=Citeşte permisiuni de grupuri
+Permission353=Creare/modificare grupuri
+Permission354=Şterge sau dezactivează grupuri
 Permission358=Export utilizatori
-Permission401=Citiţi cu reduceri
-Permission402=Creare / Modificare reduceri
-Permission403=Validate reduceri
-Permission404=Ştergere reduceri
-Permission430=Utilizați bara de depanare
-Permission511=Vizualizare plăți salarii (ale dvs. și ale subordonaților)
-Permission512=Creare / Modificare plata salariilor 
-Permission514=Şterge plata salariilor 
+Permission401=Citeşte reduceri discount-uri
+Permission402=Creare/modificare discount-uri
+Permission403=Validare discount-uri
+Permission404=Şterge discount-uri
+Permission430=Utilizare bară de depanare
+Permission511=Vizualizare plăți salarii (ale tale și ale subordonaților)
+Permission512=Creare/modificare plăţi salarii
+Permission514=Şterge plăţi salarii 
 Permission517=Vizualizare plăţilor salariilor tuturor 
 Permission519=Export salarii
-Permission520=Citeşte credite
-Permission522=Creare/modificare credite
-Permission524=Şterge credite
-Permission525=Accesați calculatorul de credite
-Permission527=Imprumuturi externe
+Permission520=Citeşte credite împrumuturi
+Permission522=Creare/modificare credite împrumuturi
+Permission524=Şterge credite împrumuturi
+Permission525=Accesare calculator de credite
+Permission527=Export credite împrumuturi
 Permission531=Citeşte servicii
-Permission532=Creare / Modificare servicii
-Permission534=Ştergere servicii
-Permission536=A se vedea / administra serviciile ascunse
-Permission538=Exportul de servicii
+Permission532=Creare/modificare servicii
+Permission534=Şterge servicii
+Permission536=Vede/administrează serviciile ascunse
+Permission538=Export servicii
 Permission561=Citire ordine de plată prin transfer de credit
 Permission562=Creare/modificare comandă de plată prin transfer de credit
 Permission563=Trimitere/Transmitere comanda de plată prin transfer de credit 
@@ -860,129 +869,129 @@ Permission564=Înregistrare debite/respingeri de transfer de credit
 Permission601=Citeşte stickere
 Permission602=Creare/modificare stickere
 Permission609=Şterge stickere
-Permission650=Citiți facturile de materiale
-Permission651=Creați / actualizați facturile de materiale
-Permission652=Ștergeți facturile de materiale
+Permission650=Citeşte Bonuri de consum
+Permission651=Creare/actualizare Bonuri de consum
+Permission652=Șterge bonuri de consum
 Permission660=Citire Comandă de producţie (MO)
 Permission661=Creare/Actualizare Comandă de producţie (MO)
 Permission662=Ştergere Comandă de producţie (MO)
-Permission701=Citiţi donaţii
-Permission702=Creare / Modificare donaţii
+Permission701=Citeşte donaţii
+Permission702=Creare/modificare donaţii
 Permission703=Ştergere donaţii
-Permission771=Citiți rapoartele de cheltuieli (ale dvs. și ale subordonaților dvs.)
-Permission772=Creare / Modificare Raport Cheltuieli
+Permission771=Citeşte rapoarte de cheltuieli (ale sale și ale subordonaților săi)
+Permission772=Creare/modificare rapoarte de cheltuieli
 Permission773=Șterge rapoarte de cheltuieli
-Permission774=Citiți toate rapoartele de cheltuieli (chiar și pentru utilizatorii care nu sunt subordonații dvs.)
-Permission775=Aproba rapoarte de cheltuieli
-Permission776=Plăste  rapoarte de cheltuieli
+Permission774=Citeşte toate rapoartele de cheltuieli (chiar și pentru utilizatorii care nu sunt subordonații săi)
+Permission775=Aprobă rapoarte de cheltuieli
+Permission776=Plăteşte rapoartele de cheltuieli
 Permission777=Citire rapoarte de cheltuieli ale tuturor
 Permission778=Creare/modificare rapoarte de cheltuieli pentru toţi
-Permission779=Export Rapoarte Cheltuieli
+Permission779=Export rapoarte de cheltuieli
 Permission1001=Citeşte stocuri
-Permission1002=Creare / modificare depozite
-Permission1003=Ștergere depozite
-Permission1004=Citeşte stoc deplasările
-Permission1005=Creare / Modificare stoc deplasările
+Permission1002=Creare/modificare depozite
+Permission1003=Șterge depozite
+Permission1004=Citeşte mişcările de stoc
+Permission1005=Creare/modificare mişcare de stoc
 Permission1101=Citeşte confirmările de livrare
 Permission1102=Creare/modificare confirmări de livrare
 Permission1104=Validează confirmările de livrare
 Permission1109=Şterge confirmările de livrare
-Permission1121=Citiți propunerile furnizorilor
-Permission1122=Creați / modificați propunerile furnizorilor
-Permission1123=Validați propunerile furnizorilor
-Permission1124=Trimiteți propunerile furnizorilor
-Permission1125=Ștergeți propunerile furnizorilor
-Permission1126=Închideți cererile de preț ale furnizorului
-Permission1181=Citiţi cu furnizorii
-Permission1182=Citiți purchase orders
-Permission1183=Creați/modificați comenzile de achiziţie
-Permission1184=Validați comenzile de achiziţie
-Permission1185=Aprobați comenzile de achiziţie
-Permission1186=Comanda comenzi de cumpărare
-Permission1187=Recunoașteți bonul comenzii de cumpărare
-Permission1188=Șterge comenzile de cumpărare
+Permission1121=Citeşte oferte furnizori
+Permission1122=Creare/modificare oferte furnizori
+Permission1123=Validare oferte furnizori
+Permission1124=Trimitere oferte furnizor
+Permission1125=Șterge oferte furnizori
+Permission1126=Închide cereri de preț la furnizori
+Permission1181=Citeşte furnizori
+Permission1182=Citire comenzi de achiziţie
+Permission1183=Creare/modificare comenzi de achiziţie
+Permission1184=Validare comenzi de achiziţie
+Permission1185=Aprobare comenzi de achiziţie
+Permission1186=Execută comenzi de achiziţie
+Permission1187=Recunoașteți bonul comenzii de achiziţie
+Permission1188=Șterge comenzi de achiziţie
 Permission1189=Bifați/Debifați recepția comenzii de achiziţie
 Permission1190=Aprobă comenzile de achiziție (a doua aprobare)
 Permission1191=Export comenzi de achiziţie cu atribute
-Permission1201=Obţineţi rezultatul unui export
-Permission1202=Creare / Modificare de export
-Permission1231=Citiți facturile furnizorilor
-Permission1232=Creați/modificați facturile furnizorilor
-Permission1233=Valideaza facturile furnizorilor
-Permission1234=Șterge facturile furnizorilor
-Permission1235=Trimite facturile furnizorului pe email
-Permission1236=Exportați facturile furnizorilor, atributele și plățile
-Permission1237=Exportați comenzile de achiziție și detaliile acestora
-Permission1251=Run masa importurile de date externe în baza de date (date de sarcină)
-Permission1321=Export client facturi, atribute şi plăţile
+Permission1201=Descarcă rezultatul unui export de date
+Permission1202=Creare/modificare export de date
+Permission1231=Citeşte facturi furnizori
+Permission1232=Creare/modificare facturi furnizori
+Permission1233=Validare facturi furnizori
+Permission1234=Șterge facturi furnizori
+Permission1235=Trimite facturi furnizor pe email
+Permission1236=Export facturi furnizori, atribute și plăți
+Permission1237=Export comenzi de achiziție și detaliile acestora
+Permission1251=Execută importurile de date externe în baza de date (încărcare date)
+Permission1321=Export facturi clienţi, atribute şi plăţi
 Permission1322=Redeschide o factură plătită
-Permission1421=Exportaţi comenzi de vânzări și atribute
+Permission1421=Export comenzi de vânzări și atribute
 Permission1521=Citeşte documente
 Permission1522=Ştergere documente
-Permission2401=Citeşte acțiuni (evenimente sau sarcini) legate de contul său de utilizator (dacă este proprietar al unui eveniment sau doar i s-a atribuit)
-Permission2402= \n \nCreare/modificare acțiuni (evenimente sau sarcini) legate de contul său de utilizator (dacă este proprietar al evenimentului)
-Permission2403=Șterge acțiuni (evenimente sau sarcini) legate de contul său de utilizator (dacă este proprietar al evenimentului) 
-Permission2411=Citeşte acţiuni (evenimente sau sarcini) ale altor persoane
-Permission2412=Crearea / modificarea acţiuni (evenimente sau sarcini) ale altor persoane
-Permission2413=Ştergeţi acţiuni (evenimente sau sarcini) ale altor persoane
-Permission2414=Acțiuni de export/sarcini ale altora
-Permission2501=Citeşte documente
-Permission2502=Trimiteti sau şterge documente
+Permission2401=Citeşte acțiuni (evenimente sau task-uri) legate de contul său de utilizator (dacă este proprietar al unui eveniment sau doar i s-a atribuit)
+Permission2402=Creare/modificare acțiuni (evenimente sau task-uri) legate de contul său de utilizator (dacă este proprietar al evenimentului)
+Permission2403=Șterge acțiuni (evenimente sau task-uri) legate de contul său de utilizator (dacă este proprietar al evenimentului) 
+Permission2411=Citeşte acţiuni (evenimente sau task-uri) ale altor persoane
+Permission2412=Creare/modificarea acţiuni (evenimente sau task-uri) ale altor persoane
+Permission2413=Şterge acţiuni (evenimente sau task-uri) ale altor persoane
+Permission2414=Export acțiuni activităţi/task-uri ale altora
+Permission2501=Citeşte/descarcă documente
+Permission2502=Descărcare documente
 Permission2503=Trimite sau şterge documente
-Permission2515=Setup documente directoare
-Permission2801=Folosiți client FTP în modul de citire (numai navigare și descărcare )
-Permission2802=Folosiți client FTP în modul de scriere (ştergere şi încărcare fişiere )
-Permission3200=Citiți evenimente arhivate și amprente digitale
+Permission2515=Configurare directoare documente 
+Permission2801=Foloseşte clientul FTP în modul de citire (numai navigare și descărcare)
+Permission2802=Foloseşte clientul FTP în modul de scriere (ştergere şi încărcare fişiere)
+Permission3200=Citeşte evenimente arhivate și amprente digitale
 Permission3301=Generare module noi
-Permission4001=Vezi angajații
-Permission4002=Creați angajați
-Permission4003=Ștergeți angajații
-Permission4004=Exportați angajații
-Permission10001=Citiți conținutul site-ului web
-Permission10002=Creați / modificați conținutul site-ului web (html și conținut javascript)
-Permission10003=Creați / modificați conținutul site-ului web (cod php dinamic). Periculos, trebuie rezervat dezvoltatorilor restricționați.
-Permission10005=Ștergeți conținutul site-ului web
-Permission20001=Citiți cererile de concediu (concediul dvs. și cele ale subordonaților dvs)
-Permission20002=Creați/modificați cererile dvs. de concediu (concediul și cele ale subordonaților dvs.)
+Permission4001=Vede angajații
+Permission4002=Creare angajați
+Permission4003=Șterge angajați
+Permission4004=Export angajați
+Permission10001=Citeşte conținut site web
+Permission10002=Creare/modificare conținut site web (html și conținut javascript)
+Permission10003=Creare/modificare conținut site web (cod php dinamic). Periculos, trebuie rezervat dezvoltatorilor restricționați.
+Permission10005=Șterge conținut site web
+Permission20001=Citeşte cererile de concediu (concediul său și cele ale subordonaților săi)
+Permission20002=Creare/modificare cereri de concediu (concediul său și cele ale subordonaților săi)
 Permission20003=Şterge cererile de concediu
-Permission20004=Citiți toate solicitările de concediu (chiar și pentru utilizatori care nu sunt subordonați)
-Permission20005=Creați/modificați solicitările de concediu pentru toată lumea (chiar și pentru utilizatorii care nu sunt subordonați)
-Permission20006=Solicitări de concediu ale administrării (gestionare si actualizare balanţă)
+Permission20004=Citeşte toate cererile de concediu (chiar și pentru utilizatorii care nu-i sunt subordonați)
+Permission20005=Creare/modificare cereri de concediu pentru toată lumea (chiar și pentru utilizatorii care nu-i sunt subordonați)
+Permission20006=Administrare cereri de concediu (configurare şi actualizare balanţă)
 Permission20007=Aprobare cereri de concediu
-Permission23001=Citeste Joburi programate
-Permission23002=Creare/Modificare job programat
+Permission23001=Citeşte Joburi programate
+Permission23002=Creare/modificare job programat
 Permission23003=Şterge Joburi programate
 Permission23004=Execută Joburi programate
 Permission50101=Utilizează Punct de vânzare POS (SimplePOS)
 Permission50151=Utilizează Punct de vânzare POS (TakePOS)
 Permission50201=Citeşte tranzacţii
-Permission50202=Tranzacţiilor de import
+Permission50202=Import tranzacţii
 Permission50330=Citeşte obiecte Zapier
 Permission50331=Creare/Actualizare obiecte Zapier
 Permission50332=Şterge obiecte Zapier
-Permission50401=Uniți produsele și facturile cu conturile contabile
-Permission50411=Citiți operațiunile din cartea mare
-Permission50412=Scrieți/editați operațiunile în cartea mare
-Permission50414=Ștergeți operațiunile în cartea mare
-Permission50415=Ștergeți toate operațiunile pe an și jurnal în cartea mare
-Permission50418=Exportați operațiunile din cartea mare
-Permission50420=Rapoarte și exporturi (cifră de afaceri, balante, jurnale, carte mare)
+Permission50401=Asociază produsele și facturile cu conturile contabile
+Permission50411=Citeşte operațiunile din cartea mare
+Permission50412=Scriere/editare operațiuni în cartea mare
+Permission50414=Șterge operațiuni în cartea mare
+Permission50415=Șterge toate operațiunile după an și jurnal în cartea mare
+Permission50418=Export operațiuni din cartea mare
+Permission50420=Rapoarte și export de rapoarte (cifră de afaceri, balanţe, jurnale, carte mare)
 Permission50430=Defineşte perioadele fiscale. Validează tranzacţiile şi perioadele fiscale.
 Permission50440=Administrează schema de conturi, configurează contabilitatea
 Permission51001=Citeşte active
 Permission51002=Creare/Modificare active 
 Permission51003=Ştergere active
 Permission51005=Setare tipuri de active
-Permission54001=Printare
-Permission55001=Cieşte sondaje
-Permission55002=Creare / Modificare sondaje
+Permission54001=Tipărire
+Permission55001=Citeşte sondaje chestionare vot
+Permission55002=Creare/modificare sondaje chestionare vot
 Permission59001=Citeşte marje comerciale
 Permission59002=Defineşte marje comerciale
-Permission59003=Citeşte marjele fiecarui utilizator
-Permission63001=Citiți resursele
-Permission63002=Creaţi/modificaţi resursele 
-Permission63003=Ștergeți resursele
-Permission63004=Asociaţi resursele la agenda de evenimentele
+Permission59003=Citeşte marjele fiecărui utilizator
+Permission63001=Citeşte resurse
+Permission63002=Creare/modificare resurse
+Permission63003=Șterge resurse
+Permission63004=Asociere resurse la evenimentelele din agendă
 Permission64001=Permite tipărirea directă
 Permission67000=Permite tipărirea de bonuri chitanţe fiscale
 Permission68001=Citeşte raportare intracomunitară
@@ -995,7 +1004,7 @@ Permission941604=Trimitere bonuri chitanţe pe email
 Permission941605=Export bonuri chitanţe
 Permission941606=Ştergere bonuri chitanţe
 DictionaryCompanyType=Tipuri de terţi
-DictionaryCompanyJuridicalType=Entități juridice terțe
+DictionaryCompanyJuridicalType=Tipuri entități juridice terți
 DictionaryProspectLevel=Nivel potenţial prospect pentru companii
 DictionaryProspectContactLevel=Nivel potenţial prospect pentru contacte
 DictionaryCanton=State/Provincii
@@ -1003,272 +1012,273 @@ DictionaryRegion=Regiuni
 DictionaryCountry=Ţări
 DictionaryCurrency=Monede
 DictionaryCivility=Titluri onorifice
-DictionaryActions=Tipuri evenimente agenda
-DictionarySocialContributions=Tipuri  de taxe sociale si fiscale
-DictionaryVAT=Cote TVA sau Cote Taxe Vanzări
+DictionaryActions=Tipuri evenimente agendă
+DictionarySocialContributions=Tipuri de taxe sociale sau fiscale
+DictionaryVAT=Cote de TVA sau Cote Taxe Vânzări
 DictionaryRevenueStamp=Valoarea taxei de timbru
 DictionaryPaymentConditions=Termeni de plată
 DictionaryPaymentModes=Modalităţi de plată
 DictionaryTypeContact=Tipuri Contact/adresă
-DictionaryTypeOfContainer=Website - tip de pagini / containere de site
-DictionaryEcotaxe=Ecotax (DEEE)
+DictionaryTypeOfContainer=Website - tip de pagini/containere
+DictionaryEcotaxe=Ecotaxă (DEEE)
 DictionaryPaperFormat=Formate hârtie
-DictionaryFormatCards=Formaturi de card
-DictionaryFees=Raportul de cheltuieli - Linii de tipuri de rapoarte de cheltuieli
-DictionarySendingMethods=Metode Livrare
+DictionaryFormatCards=Formate de card
+DictionaryFees=Raportul de cheltuieli - Tipuri linii de cheltuieli
+DictionarySendingMethods=Metode de livrare
 DictionaryStaff=Număr de angajaţi
-DictionaryAvailability=Livrare întârziere
+DictionaryAvailability=Întârzieri livrare
 DictionaryOrderMethods=Metode de comandă
-DictionarySource=Originea ofertei  / comenzi
+DictionarySource=Originea ofertei/comenzii
 DictionaryAccountancyCategory=Grupuri personalizate pentru rapoarte
-DictionaryAccountancysystem=Model pentru plan de conturi
-DictionaryAccountancyJournal=Jurnalele contabile
-DictionaryEMailTemplates=Șabloane de e-mail
+DictionaryAccountancysystem=Modele planuri de conturi
+DictionaryAccountancyJournal=Jurnale contabile
+DictionaryEMailTemplates=Șabloane email
 DictionaryUnits=Unităţi
 DictionaryMeasuringUnits=Unități de măsură
-DictionarySocialNetworks=Retele sociale
+DictionarySocialNetworks=Reţele sociale
 DictionaryProspectStatus=Status prospect pentru companii
 DictionaryProspectContactStatus=Status prospect pentru contacte
 DictionaryHolidayTypes=Tipuri de concediu
-DictionaryOpportunityStatus=Stare de conducere pentru proiect/conducere
+DictionaryOpportunityStatus=Stare lead-uri pentru proiect/oportunitate
 DictionaryExpenseTaxCat=Raport de cheltuieli - Categorii de transport
 DictionaryExpenseTaxRange=Raport de cheltuieli - Gama de categorii de transport
 DictionaryTransportMode=Raportare intracomunitară - Mod transport
 TypeOfUnit=Tip de unitate
-SetupSaved=Setup salvate
-SetupNotSaved=Seturea nu a fost salvată
+SetupSaved=Setări salvate
+SetupNotSaved=Setarea nu a fost salvată
 BackToModuleList=Înapoi la lista Module
-BackToDictionaryList=Înapoi la lista de Dicționare
-TypeOfRevenueStamp=Tip de taxei de timbru
+BackToDictionaryList=Înapoi la lista de dicționare
+TypeOfRevenueStamp=Tip taxă de timbru
 VATManagement=Gestionarea taxelor de vânzare
 VATIsUsedDesc=Implicit atunci când creați proiecte, facturi, comenzi etc. rata taxei pe vânzări respectă regula standard activă <br> Dacă furnizorul nu este supus taxei pe vânzări , atunci taxa pe vânzări este implicit 0. Sfârșitul regulii. <br> Dacă țara (furnizorului= țara cumpărătorului), atunci taxa pe vânzări este implicit este egală cu taxa de vânzare a cumpărătorului. Sfârșitul regulii. <br> În cazul în care furnizorul şi cumpărătorul sunt ambii în Comunitatea Europeană şi bunurile sunt legate de transportul produselor (transport, livrare, linii aeriene), valoarea implicita a TVA este 0. Această regulă depinde de țara furnizorului - consultați contabilul dvs. TVA-ul ar trebui plătit de către cumpărători la biroul vamal din țara lor şi nu de către furnizor. Sfârșitul regulii. <br> În cazul în care furnizorul şi cumpărătorul sunt ambii în Comunitatea Europeană şi cumpărătorul nu sunt persoane juridice (cu o înregistrare intracomunitara de TVA), TVA-ul devine implicit egal cu TVA-ul din țara furnizorului. Sfârșitul regulii. <br> În cazul în care furnizorul şi cumpărătorul sunt ambii în Comunitatea Europeană şi cumpărătorul este o persoană juridică (cu o înregistrare intracomunitara de TVA), atunci TVA este implicit 0. Sfârșitul regulii. <br> În orice alt caz, valoarea implicită propusă a taxei de vânzare este  = 0. Sfârșitul regulii.
 VATIsNotUsedDesc=Implicit, taxa de vânzare propusă este 0, ea poate fi utilizată pentru cazuri precum asociații, persoane fizice sau companii mici.
-VATIsUsedExampleFR=În Franța, înseamnă companii sau organizații care au un sistem fiscal real (Simplificat real sau normal real). Un sistem în care TVA este declarată .
-VATIsNotUsedExampleFR=În Franța, înseamnă că sunt declarate asociații care nu sunt plătitoare de taxe sau societăți, organizații sau profesii liberale care au ales sistemul fiscal micro intreprindere (taxe de vânzări în franciză) şi plătesc taxe de vânzare de franciză fără nicio declarație de taxe de vânzare. Această opțiune va afișa referinţa "Vânzări  cu taxe neaplicabile - art-293B de CGI" pe facturi.
+VATIsUsedExampleFR=În Franța, se referă la companii sau organizații care au un sistem fiscal real (Simplificat real sau normă de venit). Un sistem în care TVA este declarat.
+VATIsNotUsedExampleFR=În Franța, înseamnă că sunt declarate asociații sau societăţi care nu sunt plătitoare de taxe, organizații sau profesii liberale care au ales sistemul fiscal micro intreprindere (taxe de vânzări în franciză) şi plătesc taxe de vânzare de franciză fără nicio declarație de taxe de vânzare. Această opțiune va afișa referinţa "Vânzări cu taxe neaplicabile - art-293B de CGI" pe facturi.
 ##### Local Taxes #####
 TypeOfSaleTaxes=Tipuri taxe vânzări
-LTRate=Rată
-LocalTax1IsNotUsed=Nu utilizează taxa secundă
+LTRate=Cotă
+LocalTax1IsNotUsed=Nu utilizează taxa secundară
 LocalTax1IsUsedDesc=Utilizați un al doilea tip de taxă (alta decât prima)
 LocalTax1IsNotUsedDesc=Nu utilizați al doilea tip de taxă (alta decât prima)
-LocalTax1Management=Tip secund taxă
+LocalTax1Management=Tip taxă secundară
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Nu utilizează taxa treia
+LocalTax2IsNotUsed=Nu utilizează taxa 3
 LocalTax2IsUsedDesc=Utilizați un al treilea tip de taxă (alta decât prima)
 LocalTax2IsNotUsedDesc=Nu utilizați al doilea tip de taxă (alta decât prima)
-LocalTax2Management=Tipul trei al taxei
+LocalTax2Management=Al treilea tip de taxă
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
-LocalTax1ManagementES=RE Management
+LocalTax1ManagementES=Management RE
 LocalTax1IsUsedDescES=Rata RE în mod implicit la crearea propecţilor, facturilor, comenzilor etc. respectă regula standard activă: <br> Dacă cumpărătorul nu este supus ratei RE, RE impliciy va fi 0. Sfârșitul regulii. <br> Dacă cumpărătorul este supus ratei RE, este RE implicit. Sfârșitul regulii. <br>
-LocalTax1IsNotUsedDescES=În mod implicit RE propus este 0. Sfârşitul regulă.
+LocalTax1IsNotUsedDescES=În mod implicit RE propus este 0. Sfârşitul regulii.
 LocalTax1IsUsedExampleES=În Spania sunt profesionisti supuse unor secţiuni specifice ale IAE spaniole.
-LocalTax1IsNotUsedExampleES=În Spania sunt profesionişti şi societăţile şi sub rezerva la anumite secţiuni ale IAE spaniole.
-LocalTax2ManagementES=IRPF Management
-LocalTax2IsUsedDescES=Rata IRPF în mod implicit când se creează perspective, facturi, comenzi etc. respectă regula standard activă <br> Dacă furnizorul nu este supus IRPF, atunci IRPF implicit = 0. Sfârșitul regulii. <br> Dacă furnizorul este supus IRPF atunci IRPF este implicit. Sfârșitul regulii. <br>
-LocalTax2IsNotUsedDescES=În mod implicit propus IRPF este 0. Sfârşitul regulă.
-LocalTax2IsUsedExampleES=În Spania, liber profesionişti şi specialişti independenţi, care presta servicii şi companiile care au ales sistemul de impozitare de module.
+LocalTax1IsNotUsedExampleES=În Spania sunt profesionişti şi societăţile care intră în incidenţa anumitor secţiuni ale IAE spaniole.
+LocalTax2ManagementES=Management IRPF
+LocalTax2IsUsedDescES=Rata IRPF în mod implicit când se creează prospecţi, facturi, comenzi etc. respectă regula standard activă <br> Dacă furnizorul nu este supus IRPF, atunci IRPF implicit = 0. Sfârșitul regulii. <br> Dacă furnizorul este supus IRPF atunci IRPF este implicit. Sfârșitul regulii. <br>
+LocalTax2IsNotUsedDescES=În mod implicit IRPF propus este 0. Sfârşit regulă.
+LocalTax2IsUsedExampleES=În Spania, liber profesioniştii şi specialiştii independenţi, care prestează servicii şi companiile care au ales sistemul de impozitare pe module.
 LocalTax2IsNotUsedExampleES=În Spania, sunt întreprinderi care nu sunt supuse sistemului de taxare pe module.
 RevenueStampDesc="Taxa fiscală" sau "taxa de venituri" este un impozit fix pe care îl facturați (nu depinde de valoarea facturii). Poate fi de asemenea un procent de impozit, dar utilizarea celui de-al doilea sau al treilea tip de impozit este mai bună pentru impozitele procentuale, deoarece taxele fiscale nu oferă nicio raportare. Doar puține țări folosesc acest tip de impozit.
 UseRevenueStamp= Folosiți un timbru fiscal
 UseRevenueStampExample=Valoarea implicită a timbrelor fiscale este definită în configurarea dicționarelor (%s - %s - %s)
 CalcLocaltax=Rapoarte pe taxe locale
 CalcLocaltax1=Vânzări - Cumpârări
-CalcLocaltax1Desc=Rapoarte Taxe Locale este calcult ca diferenţă dintre taxele locale de vanzare şi taxele locale de cumparare
+CalcLocaltax1Desc=Rapoartele de Taxe locale sunt calculate ca diferenţă dintre taxele locale de vânzare şi taxele locale de cumpărare
 CalcLocaltax2=Achiziţii
-CalcLocaltax2Desc=Rapoarte Taxe Locale este totalul taxelor locale de cumpărare
+CalcLocaltax2Desc=Rapoartele de Taxe Locale sunt totalul taxelor locale de cumpărare
 CalcLocaltax3=Vânzări
-CalcLocaltax3Desc=Rapoarte Taxe Locale este totalul taxelor locale de vanzare
+CalcLocaltax3Desc=Rapoartele de Taxe Locale sunt totalul taxelor locale de vânzare
 NoLocalTaxXForThisCountry= Conform configurării de impozite şi taxe (Vezi %s-%s-%s), ţara ta nu foloseşte aceste tipuri de taxe
-LabelUsedByDefault=Eticheta utilizat în mod implicit în cazul în care nu poate fi găsit de traducere pentru codul
+LabelUsedByDefault=Eticheta utilizată în mod implicit în cazul în care nu găseşte un cod de traducere
 LabelOnDocuments=Eticheta de pe documente
 LabelOrTranslationKey=Etichetă sau cheie de traducere
 ValueOfConstantKey=Valoarea unei constante de configurare
 ConstantIsOn=Opţiunea %s este activă
 NbOfDays=Nr. de zile
 AtEndOfMonth=La sfârşitul lunii
-CurrentNext=Curent / Urmatoarea
+CurrentNext=Curentă/Următoare
 Offset=Decalaj
 AlwaysActive=Întotdeauna activ
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extinde
-AddExtensionThemeModuleOrOther=Implementați / instalați aplicația externă / modul
-WebServer=Server Web
-DocumentRootServer=Server Web este directorul rădăcină
+Upgrade=Actualizare
+MenuUpgrade=Actualizare / Extindere
+AddExtensionThemeModuleOrOther=Implementare/instalare modul/aplicaţie externă
+WebServer=Server web
+DocumentRootServer= Directorul rădăcină al server-ului web
 DataRootServer=Directorul de fişiere de date
 IP=IP
 Port=Port
-VirtualServerName=Virtual server de nume
-OS=OS
-PhpWebLink=Web link-PHP
+VirtualServerName=Nume virtual server
+OS=Sistem de operare
+PhpWebLink=Web-link PHP
 Server=Server
-Database=Baza de date
-DatabaseServer=Baza de date gazdă
-DatabaseName=Baza de date nume
-DatabasePort=Baza de date port
-DatabaseUser=Baza de date de utilizator
-DatabasePassword=Baza de date parola
+Database=Bază de date
+DatabaseServer=Gazdă bază de date
+DatabaseName=Nume bază de date
+DatabasePort=Port bază de date
+DatabaseUser=Utilizator bază de date
+DatabasePassword=Parolă bază de date
 Tables=Tabele
-TableName=Nume Tabel
-NbOfRecord=Nr de înregistrări
+TableName=Nume tabel
+NbOfRecord=Nr. de înregistrări
 Host=Server
-DriverType=Driver de tip
-SummarySystem=Sistemul de informaţii rezumat
-SummaryConst=Lista tuturor Dolibarr setarea parametrilor
-MenuCompanySetup=Compania/Instituția
-DefaultMenuManager= Manager meniul Standard
-DefaultMenuSmartphoneManager=Manager meniul  Smartphone
-Skin=Tema vizuală
-DefaultSkin=Tema vizuală Implicită
-MaxSizeList=Lungime  max pentru lista
-DefaultMaxSizeList=Lungime max implicită pentru lista
-DefaultMaxSizeShortList=Lungimea maximă implicită pentru listele scurte (de ex. în cardul clientului)
+DriverType=Tip driver
+SummarySystem=Rezumat informaţii sistem
+SummaryConst=Lista tuturor parametrilor de configurare ai sistemului
+MenuCompanySetup=Companie/Organizaţie
+DefaultMenuManager= Manager meniu standard
+DefaultMenuSmartphoneManager=Manager meniu smartphone
+Skin=Temă vizuală
+DefaultSkin=Temă vizuală implicită
+MaxSizeList=Lungime maximă pentru liste
+DefaultMaxSizeList=Lungime maximă implicită pentru liste
+DefaultMaxSizeShortList=Lungimea maximă implicită pentru listele scurte (de ex. în fişa client)
 MessageOfDay=Mesajul zilei
-MessageLogin=Mesaj pagina login
+MessageLogin=Mesaj pagină de autentificare
 LoginPage=Pagină de autentificare
 BackgroundImageLogin=Imagine de fundal
-PermanentLeftSearchForm=Formular de căutare permanent in meniu din  stânga
+PermanentLeftSearchForm=Formular permanent de căutare permanent în meniul din  stânga
 DefaultLanguage=Limba implicită
 EnableMultilangInterface=Activați asistența în mai multe limbi pentru relațiile cu clienții sau furnizorii
 EnableShowLogo=Afişează logo-ul companiei în meniu
-CompanyInfo=Compania/Instituția
-CompanyIds=Identități ale companiei/organizației
+CompanyInfo=Companie/Organizaţie
+CompanyIds=Identități companie/organizație
 CompanyName=Nume
 CompanyAddress=Adresă
-CompanyZip=Zip
+CompanyZip=Cod poştal
 CompanyTown=Oraş
 CompanyCountry=Ţară
 CompanyCurrency=Moneda principală
-CompanyObject=Obiectul companiei
+CompanyObject=Obiectul de activitate al companiei
 IDCountry=ID ţară
 Logo=Logo
 LogoDesc=Logo-ul principal al companiei. Va fi utilizat în documentele generate(PDF, ...)
 LogoSquarred=Logo(pătrat)
 LogoSquarredDesc=Trebuie să fie o pictogramă pătrată (lățime = înălțime). Acest logo va fi utilizat ca pictogramă favorită sau pentru alte necesităţi, cum ar fi bara de meniu de sus (dacă nu este dezactivată în configurarea afișajului).
-DoNotSuggestPaymentMode=Nu sugerează
+DoNotSuggestPaymentMode=Nu sugera
 NoActiveBankAccountDefined=Niciun cont bancar activ definit
-OwnerOfBankAccount=Titular de cont bancar %s
-BankModuleNotActive=Conturi bancare de module nu a permis
+OwnerOfBankAccount=Titularul contului bancar %s
+BankModuleNotActive=Modulul Conturi bancare nu este activat
 ShowBugTrackLink=Arată link-ul "<strong>%s</strong>"
 Alerts=Alerte
-DelaysOfToleranceBeforeWarning=Întârziere înainte de a afișa o alertă de avertizare pentru:
+DelaysOfToleranceBeforeWarning=Durată înainte de afișarea unei alerte pentru:
 DelaysOfToleranceDesc=Setați întârzierea înainte ca o pictogramă de alertă %s să apară pe ecran pentru ultimul element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Evenimente planificate (evenimente din agendă) nu au fost finalizate
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Proiectul nu a fost închis în timp
-Delays_MAIN_DELAY_TASKS_TODO=Sarcina planificată (sarcinile proiectului) nu a fost finalizată
+Delays_MAIN_DELAY_ACTIONS_TODO=Evenimente planificate (evenimente din agendă) nefinalizate
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Proiectul nu a fost închis la timp
+Delays_MAIN_DELAY_TASKS_TODO=Task-ul planificat (task-urile proiectului) nu a fost finalizat
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Comanda nu a fost procesată
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Comanda de aprovizionare nu a fost procesată
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Propunerea nu este închisă
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Propunerea nu a fost facturată
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Serviciul pentru activare
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Comanda de achiziţie nu a fost procesată
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Oferta nu este închisă
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Oferta nu a fost facturată
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Serviciu de activat
 Delays_MAIN_DELAY_RUNNING_SERVICES=Serviciu expirat
 Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Factura furnizor neachitată
 Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Factura client neachitată
 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=În așteptarea reconcilierii bancare
 Delays_MAIN_DELAY_MEMBERS=Taxă de membru întârziată
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Cecul nu a fost creat
-Delays_MAIN_DELAY_EXPENSEREPORTS=Raportul de cheltuieli pentru aprobare
+Delays_MAIN_DELAY_EXPENSEREPORTS=Raport de cheltuieli de aprobat
 Delays_MAIN_DELAY_HOLIDAYS=Cereri de concediu de aprobat
-SetupDescription1=Înainte de a începe să utilizați Dolibarr, unii parametri inițiali trebuie să fie definiți and modulele activate/configurate.
+SetupDescription1=Înainte de a începe să utilizați sistemul, unii parametri inițiali trebuie să fie definiți şi anumite module activate/configurate.
 SetupDescription2=Următoarele două secțiuni sunt obligatorii (primele două intrări din meniul de configurare)
 SetupDescription3=<a href="%s">%s->%s</a><br><br>Parametri de bază folosiți pentru a personaliza comportamentul implicit al aplicației (de exemplu, pentru funcțiile legate de țară). 
 SetupDescription4=<a href="%s">%s->%s</a><br><br>Acest software este o suită de mai multe module/aplicații. Modulele necesare trebuie să fie activate și configurate. Intrările din meniu vor apărea odată cu activarea acestor module. 
-SetupDescription5=Alte intrări în meniul de configurare gestionează parametrii opționali.
-LogEvents=Audit de securitate evenimente
+SetupDescription5=Meniul Alte setări gestionează parametrii opționali.
+AuditedSecurityEvents=Evenimentele de securitate care sunt auditate
+NoSecurityEventsAreAduited=Niciun eveniment de securitate nu este auditat. Le poţi activa din meniul %s
 Audit=Audit
-InfoDolibarr=Despre Dolibarr
-InfoBrowser=Despre Browser
-InfoOS=Despre SO
-InfoWebServer=Despre Server Web
-InfoDatabase=Despre Baza de date
+InfoDolibarr=Despre sistem
+InfoBrowser=Despre browser
+InfoOS=Despre sistemul de operare
+InfoWebServer=Despre serverul web
+InfoDatabase=Despre baza de date
 InfoPHP=Despre PHP
-InfoPerf=Despre  Performanţe
+InfoPerf=Despre performanţe
 InfoSecurity=Despre securitate
-BrowserName=Nume Browser
+BrowserName=Nume browser
 BrowserOS=Browser OS
-ListOfSecurityEvents=Lista de evenimente Dolibarr de securitate
-SecurityEventsPurged=Evenimentelor de securitate epurate
-LogEventDesc=Activați autentificarea pentru anumite evenimente de securitate. Administratorii se autentificaprin meniu <b> %s - %s </b>. Atenție, această caracteristică poate genera o cantitate mare de date în baza de date.
-AreaForAdminOnly=Parametrii de configurare pot fi setați numai de <b> utilizatorii administratori </b>.
-SystemInfoDesc=Sistemul de informare este diverse informaţii tehnice ai citit doar în modul şi vizibil doar pentru administratori.
-SystemAreaForAdminOnly=Acest zonă este disponibilă numai administratori. Permisiunile utilizatorilor Dolibarr nu pot modifica această restricție
+ListOfSecurityEvents=Listă evenimente de securitate a sistemului
+SecurityEventsPurged=Evenimentele de securitate au fost şterse
+LogEventDesc=Activați autentificarea pentru anumite evenimente de securitate. Administratorii se autentifica prin meniul <b>%s - %s</b>. Atenție, această caracteristică poate genera o cantitate mare de date în baza de date.
+AreaForAdminOnly=Parametrii de configurare pot fi setați numai de <b>utilizatorii administratori</b>.
+SystemInfoDesc=Informațiile de sistem sunt informații tehnice diverse pe care le poţi accesa numai în modul citire, fiind vizibile numai pentru administratori.
+SystemAreaForAdminOnly=Această zonă este disponibilă numai pentru administratori. Permisiunile utilizatorilor de sistem nu pot modifica această restricție.
 CompanyFundationDesc=Editează informaţiile despre compania/organizaţia ta. Dă click pe butonul "%s" din josul paginii când ai terminat.
 AccountantDesc= Dacă aveți un contabil/firmă de contabilitate externă, puteți modifica aici informațiile aferente.
 AccountantFileNumber=Cod contabil
-DisplayDesc=Parametrii care afectează aspectul şi comportamentul  Dolibarr pot fi modificaţi aici.
+DisplayDesc=Parametrii care afectează aspectul şi comportamentul sistemului pot fi modificaţi aici.
 AvailableModules=Aplicații/module disponibile 
-ToActivateModule=Pentru a activa modulele, du-te la zona de configurare.
-SessionTimeOut=Time out pentru sesiune
+ToActivateModule=Pentru a activa module, du-te la zona de configurare (Acasă->Setări-Module).
+SessionTimeOut=Timeout pentru sesiune
 SessionExplanation=Acest număr garantează că sesiunea nu va expira niciodată înainte de această întârziere, în cazul în care curățarea sesiunii este efectuată de Cleaner intern pentru sesiuni PHP (și nimic altceva). Interfața de curățare internă a sesiunii PHP nu garantează că sesiunea va expira după această întârziere. Va expira, după această întârziere și atunci când curățătorul sesiunii va fi rulat, astfel încât fiecare <b> %s / %s </b>, acces dar numai în timpul accesului realizat de alte sesiuni (dacă valoarea este 0, înseamnă că ștergerea sesiunii se face numai printr-un proces extern). <br> Notă: pe unele servere cu mecanism extern de curățare a sesiunilor (cron sub debian, ubuntu ...) sesiunile pot fi distruse după o perioadă definită de o configurație externă, indiferent de valoarea introdusă aici.
 SessionsPurgedByExternalSystem=Sesiunile de pe acest server par a fi şterse, curățate de un mecanism extern (cron sub debian, ubuntu ...), probabil fiecare la fiecare <b>%s</b> secunde (=valoarea parametrului <b>session.gc_maxlifetime</b>),  \ndeci schimbarea valorii aici nu are efect. Trebuie să ceri administratorului serverului să modifice durata de păstrare a sesiunii.
-TriggersAvailable=Disponibil declanşează
-TriggersDesc=Triggerele sunt fișiere care vor modifica comportamentul fluxului de lucru Dolibarr după copierea în director <b> htdocs / core / triggers </b>. Ei realizează acțiuni noi, activate la evenimentele Dolibarr (creare de noi companii, validare facturi ...).
-TriggerDisabledByName=Declanşările în acest dosar sunt dezactivate <b>de-NoRun</b> sufix în numele lor.
-TriggerDisabledAsModuleDisabled=Declanşările în acest dosar sunt dezactivate ca <b>modul %s</b> este dezactivat.
-TriggerAlwaysActive=Declanşările în acest dosar sunt întotdeauna activ, ce sunt activate Dolibarr module.
-TriggerActiveAsModuleActive=Declanşările în acest dosar sunt active ca <b>modul %s</b> este activată.
+TriggersAvailable=Triggeri disponibili
+TriggersDesc=Triggerele sunt fișiere care vor modifica comportamentul fluxului de lucru din sistem după copierea în directorul <b>htdocs/core/triggers</b>. Ei realizează acțiuni noi, activate de evenimentele de sistem (creare de noi companii, validare facturi ...).
+TriggerDisabledByName=Trigger-ele din acest fişier sunt dezactivate de sufixul <b>-NORUN</b> din denumirea lor.
+TriggerDisabledAsModuleDisabled=Triggerele din acest fişier sunt dezactivate pentru că modul <b>%s</b> este dezactivat.
+TriggerAlwaysActive=Triggere-le din acest fişier sunt întotdeauna active, pe măsură ce sunt activate module.
+TriggerActiveAsModuleActive=Trigger-ele din acest fişier sunt active pe măsură ce modulul <b>%s</b>este activat.
 GeneratedPasswordDesc=Alegeți metoda care va fi utilizată pentru parolele auto-generate.
-DictionaryDesc=Introduceți toate datele de referință. Puteți adăuga valorile dvs. la valorile implicite.
+DictionaryDesc=Introduceți toate datele de referință. Poţii adăuga valorile tale la valorile implicite.
 ConstDesc=Această pagină vă permite să editați (să suprascrieţi) parametrii care nu sunt disponibili în alte pagini. Aceștia sunt în mare parte parametri rezervați doar pentru dezvoltatori/soluționare avansată a problemelor.
 MiscellaneousDesc=Toți ceilalți parametri legați de securitate sunt definiți aici.
-LimitsSetup=Limitele / Precizie
-LimitsDesc=Puteți defini limite, precizări şi optimizări utilizate de Dolibarr aici
-MAIN_MAX_DECIMALS_UNIT=Nr. max. de  zecimale pentru preţurile unitare
-MAIN_MAX_DECIMALS_TOT=Nr. max. de zecimale pentru preţurile finale
-MAIN_MAX_DECIMALS_SHOWN=Nr. max. de zecimale pentru preţurile  <b> afișate pe ecran </b>. Adăugați o elipsă <b> ... </b> după acest parametru (de ex. "2 ...") dacă doriți să vedeți "<b> ... </b>" suficient pentru preţul trunchiat
+LimitsSetup=Limite/Precizii
+LimitsDesc=Puteți defini limite, precizii şi optimizări utilizate de sistem aici
+MAIN_MAX_DECIMALS_UNIT=Nr. max. de zecimale pentru preţurile unitare
+MAIN_MAX_DECIMALS_TOT=Nr. max. de zecimale pentru preţurile totale
+MAIN_MAX_DECIMALS_SHOWN=Nr. max. de zecimale pentru preţurile  <b>afișate pe ecran </b>. Adăugați o elipsă <b> ... </b> după acest parametru (de ex. "2 ...") dacă doriți să vedeți "<b> ... </b>" sufixat pentru preţul trunchiat
 MAIN_ROUNDING_RULE_TOT=Pasul intervalului de rotunjire (pentru țările în care rotunjirea se face pe altceva decât baza 10. De exemplu, puneți 0,05 dacă rotunjirea se face cu 0,05 pași)
-UnitPriceOfProduct=preţul unitar net al unui produs
-TotalPriceAfterRounding=Preț total (fără TVA / TVA inclus) după rotunjire
-ParameterActiveForNextInputOnly=Parametru de eficient pentru următoarea intrare numai
-NoEventOrNoAuditSetup=Nu a fost înregistrat niciun eveniment de securitate. Acest lucru este normal dacă Auditul nu a fost activat în pagina "Configurare - Securitate - Evenimente".
+UnitPriceOfProduct=Preţul unitar net al unui produs
+TotalPriceAfterRounding=Preț total (fără TVA/TVA/cu TVA) după rotunjire
+ParameterActiveForNextInputOnly=Parametru efectiv numai pentru următoarea introducere
+NoEventOrNoAuditSetup=Nu a fost înregistrat niciun eveniment de securitate. Acest lucru este normal dacă Auditul nu a fost activat în pagina "Setări - Securitate - Evenimente".
 NoEventFoundWithCriteria=Nu a fost găsit niciun eveniment de securitate pentru aceste criterii de căutare.
-SeeLocalSendMailSetup=Vedeţi-vă locale sendmail setup
-BackupDesc=O <b> completă </b> copie de rezervă a unei instalări Dolibarr necesită doi pași.
+SeeLocalSendMailSetup=Vezi configurarea locală sendmail
+BackupDesc=Un backup <b>complet</b> al unei instalări de sistem necesită doi pași.
 BackupDesc2=Copia de rezervă a conținutului directorului „documente” (<b>%s</b>) care conține toate fișierele încărcate și generate. Aceasta va include, de asemenea, toate fișierele dump generate în Pasul 1. Această operație poate dura câteva minute.
-BackupDesc3=Faceţi o copie de rezervă la structura și conținutul bazei de date (<b> %s </b>) într-un cos de gunoi. Pentru aceasta, puteți utiliza următorul asistent
+BackupDesc3=Faceţi o copie de rezervă la structura și conținutul bazei de date (<b>%s</b>) într-un fişier dump. Pentru aceasta, puteți utiliza următorul asistent
 BackupDescX=Directorul arhivat trebuie să fie stocat într-un loc sigur.
-BackupDescY=Generate de fişier de imagine memorie trebuie să fie depozitate într-un loc sigur.
-BackupPHPWarning=Copia de rezervă nu poate fi garantată prin această metodă. Copia anterioră recomandată.
-RestoreDesc=Pentru a restabili o copie de rezervă Dolibarr, sunt necesari doi pași.
-RestoreDesc2=Restabiliți fișierul de rezervă (de exemplu, fișierul zip) al directorului "documente" la o nouă instalație Dolibarr sau în acest director de documente actualey (<b> %s </b>).
-RestoreDesc3=Restaurați structura bazei de date și datele dintr-un fișier de memorie de rezervă în baza de date a noii instalări Dolibarr sau în baza de date a instalării curente (<b> %s </b>). Avertisment, odată ce restaurarea este completă, trebuie să utilizați o autentificare care a existat din timpul instalarea copiei de rezervă pentru a vă conecta din nou. <br> Pentru a restabili baza de date a copiei de rezervă în această instalare curentă, puteți urma acest asistent.
-RestoreMySQL=MySQL import
-ForcedToByAModule=Această regulă este obligat <b>la %s</b> către un activat modulul
+BackupDescY=Fişierul dump generat trebuie să fie stocat într-un loc sigur.
+BackupPHPWarning=Copia backup nu poate fi garantată prin această metodă. Copia anterioră este recomandată.
+RestoreDesc=Pentru a restabili o copie de rezervă a sistemului, sunt necesari doi pași.
+RestoreDesc2=Restauraţi backup-ul (de exemplu, fișierul zip) al directorului "documente" la o nouă instalare de Dolibarr sau în acest director de documente curent (<b>%s</b>).
+RestoreDesc3=Restaurați structura bazei de date și datele dintr-un fișier de backup pentru o nouă instalare de sistem sau pentru instalarea curentă (<b>%s</b>). Atenţie, odată ce restaurarea este completă, trebuie să utilizați o autentificare care a existat la momentul backup-ului. <br> Pentru a restabili baza de date din backup în această instalare , poţi urma acest asistent.
+RestoreMySQL=Import MySQL
+ForcedToByAModule=Această regulă este forţată la <b>%s</b> de către un modul activat
 ValueIsForcedBySystem=Această valoare este impusă forțat de sistem. Nu o poți schimba.
-PreviousDumpFiles=Fișiere de rezervă existente
+PreviousDumpFiles=Fișiere backup existente
 PreviousArchiveFiles=Fişiere arhivă existente
 WeekStartOnDay=Prima zi a săptămânii
 RunningUpdateProcessMayBeRequired=Rularea procesului de actualizare pare a fi necesară (versiunea programului %s diferă de versiunea bazei de date %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Trebuie să rulaţi această comandă de la linia de comandă, după login la un raft cu <b>%s</b> utilizator.
-YourPHPDoesNotHaveSSLSupport=SSL funcţii nu sunt disponibile în PHP dvs.
-DownloadMoreSkins=Mai multe teme de  descărcat
-SimpleNumRefModelDesc=Returnează numărul de referință cu formatul%syymm-nnnn unde yy este anul, mm este luna and nnnn este secvențială fără resetare
-ShowProfIdInAddress=Afișați id profesional cu adrese
-ShowVATIntaInAddress=Ascunde TVA ul intracomunitar cu adrese
-TranslationUncomplete=Parţială traducere
-MAIN_DISABLE_METEO=Dezactivați vizualizarea meteorologică
-MeteoStdMod=Mod Standard
-MeteoStdModEnabled=Modul Standard activat
-MeteoPercentageMod=Mod Procent
-MeteoPercentageModEnabled=Modul Procent activat
+YouMustRunCommandFromCommandLineAfterLoginToUser=Trebuie să rulaţi această comandă din linia de comandă shell cu utilizatorul <b>%s</b> sau adaugă opţiunea -W la sfârşitul comenzii pentru a furniza parola de <b>%s</b>.
+YourPHPDoesNotHaveSSLSupport=Funcţiile SSL funcţii nu sunt disponibile în PHP.
+DownloadMoreSkins=Mai multe teme de descărcat
+SimpleNumRefModelDesc=Returnează numărul de referință în formatul %s yymm-nnnn unde yy este anul, mm este luna și nnnn este un număr secvențial cu incrementare automată fără resetare
+ShowProfIdInAddress=Afișare id profesional cu adrese
+ShowVATIntaInAddress=Ascunde cota de TVA intracomunitar cu adrese
+TranslationUncomplete=Traducere parţială
+MAIN_DISABLE_METEO=Dezactivare vizualizarea meteorologică
+MeteoStdMod=Mod standard
+MeteoStdModEnabled=Modul standard activat
+MeteoPercentageMod=Mod procentual
+MeteoPercentageModEnabled=Mod procentual activat
 MeteoUseMod=Faceți clic pentru a utiliza %s
-TestLoginToAPI=Testaţi logati pentru a API
-ProxyDesc=Unele caracteristici ale Dolibarr necesită acces la internet. Definiți aici parametrii conexiunii la internet, cum ar fi accesul prin intermediul unui server proxy, dacă este necesar
+TestLoginToAPI=Test autentificare la API
+ProxyDesc=Unele caracteristici ale sistemului necesită acces la internet. Definiți aici parametrii conexiunii la internet, cum ar fi accesul prin intermediul unui server proxy, dacă este necesar
 ExternalAccess=Acces Extern/Internet
 MAIN_PROXY_USE=Utilizați un server proxy (altfel accesul este direct la internet)
-MAIN_PROXY_HOST=Server proxy: Nume/adresa
+MAIN_PROXY_HOST=Server proxy: Nume/Adresă
 MAIN_PROXY_PORT=Server proxy: Port
-MAIN_PROXY_USER=Server proxy: Autentificare/Utilizator
-MAIN_PROXY_PASS=Server proxy: Parola
-DefineHereComplementaryAttributes=Definiți aici orice atribute suplimentare/personalizate pe care doriți să le includeți pentru: %s
+MAIN_PROXY_USER=Server proxy: Nume de autentificare/Utilizator
+MAIN_PROXY_PASS=Server proxy: Parolă
+DefineHereComplementaryAttributes=Definiți orice atribute suplimentare/personalizate care trebuie adăugate la: %s
 ExtraFields=Atribute complementare
 ExtraFieldsLines=Atribute complementare (linii)
 ExtraFieldsLinesRec=Atribute complementare (linii de șabloane de facturi)
 ExtraFieldsSupplierOrdersLines=Atribute complementare (linii de comandă)
-ExtraFieldsSupplierInvoicesLines=Atribute complementare (linii de facturare)
+ExtraFieldsSupplierInvoicesLines=Atribute complementare (linii de factură)
 ExtraFieldsThirdParties=Atribute complementare (terți)
-ExtraFieldsContacts=Atribute complementare (contacte /adrese)
+ExtraFieldsContacts=Atribute complementare (contacte/adrese)
 ExtraFieldsMember=Atribute complementare (membri)
 ExtraFieldsMemberType=Atribute complementare (tip membri)
 ExtraFieldsCustomerInvoices=Atribute complementare (facturi)
@@ -1276,20 +1286,20 @@ ExtraFieldsCustomerInvoicesRec=Atribute complementare (șabloane facturi)
 ExtraFieldsSupplierOrders=Atribute complementare (comenzi)
 ExtraFieldsSupplierInvoices=Atribute complementare (facturi)
 ExtraFieldsProject=Atribute complementare (proiecte)
-ExtraFieldsProjectTask=Atribute complementare (sarcini)
+ExtraFieldsProjectTask=Atribute complementare (task-uri)
 ExtraFieldsSalaries=Atribute complementare (salarii)
 ExtraFieldHasWrongValue=Atributul %s are o valoare greşită.
-AlphaNumOnlyLowerCharsAndNoSpace=numai caractere minuscule,  alfanumerice fără spaţiu
-SendmailOptionNotComplete=Atenţie, pe unele sisteme Linux, pentru a trimite e-mail de la e-mail, sendmail configurare execuţie trebuie să conatins optiunea-ba (mail.force_extra_parameters parametri în fişierul php.ini). Dacă nu unor destinatari a primi e-mailuri, încercaţi să editaţi acest parametru PHP cu mail.force_extra_parameters =-BA).
-PathToDocuments=Cale de acces documente
+AlphaNumOnlyLowerCharsAndNoSpace=numai caractere minuscule, alfanumerice fără spaţiu
+SendmailOptionNotComplete=Atenţie, pe unele sisteme Linux, pentru a trimite email, configurarea de execuţie sendmail trebuie să conţină opţiunea -ba (parametrul mail.force_extra_parameters în fişierul php.ini). Dacă unii din destinatari nu primesc email-urile deloc, încearcă să editezi acest parametru PHP cu mail.force_extra_parameters = -ba).
+PathToDocuments=Cale documente
 PathDirectory=Director
-SendmailOptionMayHurtBuggedMTA=Funcția de trimitere a e-mailurilor utilizând metoda "PHP mail direct" va genera un mesaj pe e-mail care ar putea să nu fie analizat corect de către unele servere de e-mail . Rezultatul este că unele e-mailuri nu pot fi citite de persoanele găzduite de acele platforme cu probleme. Acesta este cazul pentru unii furnizori de Internet (Ex: Orange în Franța). Aceasta nu este o problemă cu Dolibarr sau PHP, ci cu serverul de mail. Cu toate acestea, puteți adăuga o opțiune MAIN_FIX_FOR_BUGGED_MTA la 1 din Setup - Other pentru a modifica Dolibarr pentru a evita acest lucru. Cu toate acestea, este posibil să întâmpinați probleme cu alte servere care utilizează strict standardul SMTP. Cealaltă soluție (recomandată) este utilizarea metodei "SMTP socket library" care nu are dezavantaje.
-TranslationSetup=Configurarea traducerii
+SendmailOptionMayHurtBuggedMTA=Funcția de trimitere a e-mailurilor utilizând metoda "PHP mail direct" va genera un mesaj email care ar putea să nu fie analizat corect de către unele servere de email . Rezultatul este că unele email-uri nu pot fi citite de persoanele găzduite de acele platforme cu probleme. Acesta este cazul pentru unii furnizori de Internet (Ex: Orange în Franța). Aceasta nu este o problemă de sistem sau de PHP, ci cu server-ul de mail. Cu toate acestea, puteți adăuga o opțiune MAIN_FIX_FOR_BUGGED_MTA la 1 din Setări  - Alte setări ca Dolibarr să poată evita acest lucru. Cu toate acestea, este posibil să întâmpinați probleme cu alte servere care utilizează strict standardul SMTP. Cealaltă soluție (recomandată) este utilizarea metodei "SMTP socket library" care nu are aceste dezavantaje.
+TranslationSetup=Configurare traducere
 TranslationKeySearch=Căutați o cheie sau un șir de traducere 
 TranslationOverwriteKey=Suprascrieți un șir de traducere
-TranslationDesc=Cum pentru a seta limba de afișare: <br> * Default / systemwide: menu <strong>Acasă -> Configurare-> Afișaj </strong> <br> * Per utilizator: Faceți clic pe numele utilizatorului în partea de sus a ecranului și modificați  fila  <strong> Afișare utilizator Setare </strong> pe card de utilizator.
-TranslationOverwriteDesc=Puteți, de asemenea, să înlocuiți șiruri de caractere care completează urmatorul tabel . Alegeți limba dvs. din meniul derulant "%s", inserați șirul de chei de traducere în "%s" si noua dvs. traducere în "%s"
-TranslationOverwriteDesc2=Puteți utiliza cealaltă filă pentru a vă ajuta să aflați ce cheie de traducere trebuie să se utilizeze
+TranslationDesc=Cum se setează limba de afișare: <br>* Implicit/Pentru tot sistemul: meniul <strong>Acasă -> Setări -> Afișare</strong> <br>* Per utilizator: Clic pe numele utilizatorului în partea de sus a ecranului și modificați fila <strong>Setări afișare utilizator</strong> din fişa de utilizator.
+TranslationOverwriteDesc=Poți, de asemenea, să înlocuieşti șiruri de caractere care completează următorul tabel . Alege limba ta din meniul derulant "%s", inserează șirul cheie de traducere în "%s" şi noua ta traducere în "%s"
+TranslationOverwriteDesc2=Puteți utiliza cealaltă filă pentru a te ajuta să afli ce cheie de traducere trebuie să se utilizeze
 TranslationString=Șir de traducere
 CurrentTranslationString=Șirul de traducere curent
 WarningAtLeastKeyOrTranslationRequired=Un criteriu de căutare este necesar cel puțin pentru o cheie sau un șir de traducere
@@ -1301,8 +1311,8 @@ TotalNumberOfActivatedModules=Module activate: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Trebuie activat cel puţin 1 modul
 ClassNotFoundIntoPathWarning=Clasa %s nu a fost găsită în calea PHP
 YesInSummer=Da în vară
-OnlyFollowingModulesAreOpenedToExternalUsers=Rețineți că numai următoarele module sunt disponibile pentru utilizatorii externi  (indiferent de permisiunile unor astfel de utilizatori) și numai dacă sunt acordate permisiuni:<br>
-SuhosinSessionEncrypt=Stocarea sesiune criptată prin Suhosin
+OnlyFollowingModulesAreOpenedToExternalUsers=Rețineți că doar următoarele module sunt disponibile pentru utilizatorii externi (indiferent de permisiunile acestora) și numai dacă sunt acordate permisiunile următoare:<br>
+SuhosinSessionEncrypt=Stocare sesiune criptată prin Suhosin
 ConditionIsCurrently=Condiția este momentan %s
 YouUseBestDriver=Utilizați driverul %s, care este cel mai bun driver disponibil în prezent.
 YouDoNotUseBestDriver=Utilizați driverul %s dar  driverul %s este recomandat.
@@ -1314,240 +1324,241 @@ BrowserIsOK=Utilizați browserul web %s. Acest browser este ok pentru securitate
 BrowserIsKO=Utilizați browserul web %s. Acest browser este cunoscut ca fiind o alegere proastă pentru securitate, fiabilitate și performanță. Vă recomandăm să utilizați Firefox, Chrome, Opera sau Safari.
 PHPModuleLoaded=Componenta PHP %seste încărcată
 PreloadOPCode=Componenta OPCode preîncărcată este utilizată
-AddRefInList=Afișați Lista de  informatii a clientului/Furnizorului  (selectați lista sau combobox)  și cea mai mare parte a hiperlinkului.<br> Terții vor apărea cu un format de nume "CC12345 - SC45678 - The Big Company corp". în loc de "The Big Company corp".
-AddAdressInList=Afișați Lista de informatii a clientului/Furnizorului (selectați lista sau combobox).<br> Terții i vor apărea cu numele format din "Big Company corp - 21 jump street 123456 Big city - USA" în loc de "Big Company corp".
+AddRefInList=Afișează lista cu informaţii Client/Furnizor (listă de selecţie sau combo)  și cea mai mare parte a hiperlinkului.<br> Terții vor apărea în formatul "CC12345 - SC45678 - Marea companie SRL". în loc de "Marea companie SRL".
+AddAdressInList=Afișați adresa în lista clientului/furnizorului (listă de selecție sau combo).<br> Terții vor apărea cu numele formatat la "Big Company corp - 21 jump street 123456 Big city - USA" în loc de "Big Company corp".
 AddEmailPhoneTownInContactList=Afișați adresa de email de contact (sau telefoanele dacă nu este definită) și lista cu orașe (lista combo sau caseta combinată)<br> Contactele vor apărea cu formatul de nume "Dupond Durand - dupond.durand@email.com - Paris" sau "Dupond Durand - 06 07 59 65 66 - Paris" în loc de "Dupond Durand".
-AskForPreferredShippingMethod=Solicitați o metodă de transport preferată pentru terți.
-FieldEdition=Editarea  campului %s
-FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă problemele decalajjului fusului orar sunt cunoscute)
-GetBarCode=Dă codbare
+AskForPreferredShippingMethod=Solicitați o metodă de transport agreată cu terţii.
+FieldEdition=Editarea câmpului %s
+FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă există probleme cu decalajul de fus orar)
+GetBarCode=Preia cod de bare
 NumberingModules=Modele de numerotare
 DocumentModules=Şabloane documente
 ##### Module password generation
 PasswordGenerationStandard=Returnați o parolă generată conform algoritmului intern Dolibarr: %scaractere numere și litere mici.
-PasswordGenerationNone=Nu sugerați o parolă generată. Parola trebuie introdusă manual.
-PasswordGenerationPerso=Returnați o parolă în funcție de configurația dvs. personal definită.
-SetupPerso=În funcție de configurația dvs.
+PasswordGenerationNone=Nu sugera o parolă generată. Parola trebuie introdusă manual.
+PasswordGenerationPerso=Returnați o parolă în funcție de configurația ta personalizată.
+SetupPerso=În funcție de configurația ta
 PasswordPatternDesc=Descrierea modelului de parolă
 ##### Users setup #####
 RuleForGeneratedPasswords=Reguli pentru generarea și validarea parolelor
 DisableForgetPasswordLinkOnLogonPage=Nu afișați link-ul "Parola uitată" pe pagina de autentificare
-UsersSetup=Utilizatorii modul de configurare
-UserMailRequired=E-mailul necesar pentru a crea un utilizator nou
+UsersSetup=Configurare modul Utilizatori
+UserMailRequired=Emailul este necesar pentru crearea unui utilizator nou
 UserHideInactive=Ascundeți utilizatorii inactivi în toate listele combinate de utilizatori (Nu este recomandat: acest lucru înseamnă că nu veți putea filtra sau căuta pe utilizatori vechi pe unele pagini)
 UsersDocModules= Șabloane de documente pentru documentele generate din înregistrarea utilizatorului
 GroupsDocModules=Șabloane de documente generate dintr-o înregistrare de grup
 ##### HRM setup #####
 HRMSetup=Configurare Modul HRM
 ##### Company setup #####
-CompanySetup=Setări Modul Terţi
+CompanySetup=Setări modul Terţi
 CompanyCodeChecker=Opțiuni pentru generarea automată a codurilor de client/furnizor
 AccountCodeManager=Opțiuni pentru generarea automată a codurilor contabile de client/furnizor
-NotificationsDesc=Anunțurile prin e-mail pot fi trimise automat pentru unele evenimente Dolibarr. <br> Destinatarii notificărilor pot fi definiți:
-NotificationsDescUser=* pe utilizator, câte un utilizator la un moment dat.
-NotificationsDescContact=* pe contacte terți (clienți sau furnizori), câte un contact la un moment dat
-NotificationsDescGlobal=* sau prin setarea adreselor globale de e-mail în această pagină de configurare
+NotificationsDesc=Notificările prin email pot fi trimise automat pentru unele evenimente din sistem.<br> Destinatarii notificărilor pot fi definiți:
+NotificationsDescUser=* per utilizator, câte un utilizator la un moment dat.
+NotificationsDescContact=* per contacte terți (clienți sau furnizori), câte un contact la un moment dat
+NotificationsDescGlobal=* sau prin setarea adreselor globale de email în această pagină de configurare
 ModelModules=Șabloane de documente
-DocumentModelOdt=Generați documente din șabloanele OpenDocument (fișiere .ODT / .ODS de la LibreOffice, OpenOffice, KOffice, TextEdit, ...)
-WatermarkOnDraft=Watermark pe schiţa de document
-JSOnPaimentBill=Activaţi funcţia de autocompletare a liniilor de plata pe formularul de plată
+DocumentModelOdt=Generați documente din șabloanele OpenDocument (fișiere .ODT / .ODS din LibreOffice, OpenOffice, KOffice, TextEdit, ...)
+WatermarkOnDraft=Watermark pe documentul schiţă
+JSOnPaimentBill=Activaţi funcţia de autocompletare a liniilor de plată pe formularul de plată
 CompanyIdProfChecker=Reguli pentru ID-uri profesionale
-MustBeUnique=Trebuie sa fie unic?
+MustBeUnique=Trebuie să fie unic?
 MustBeMandatory=Obligatoriu pentru a crea terți (dacă TVA-ul sau tipul de companie este definit)?
 MustBeInvoiceMandatory=Este obligatorie validarea facturilor?
 TechnicalServicesProvided=Servicii tehnice furnizate
 #####DAV #####
-WebDAVSetupDesc=Acesta este linkul pentru a accesa directorul WebDAV. Acesta conține un director "public" deschis oricărui utilizator care cunoaște adresa URL (dacă este permis accesul la un director public) și un director "privat" care are nevoie de un cont de acces / parolă existent pentru acces.
-WebDavServer=Rădăcina URL a %s: serverului %s
+WebDAVSetupDesc=Acesta este linkul de acces la directorul WebDAV. Acesta conține un director "public" deschis oricărui utilizator care cunoaște adresa URL (dacă este permis accesul la un director public) și un director "privat" care are nevoie de un cont de acces/parolă existent.
+WebDavServer=URL-ul rădăcină %s pentru serverul: %s
 ##### Webcal setup #####
-WebCalUrlForVCalExport=O export se leagă de <b>format %s</b> este disponibil la următoarea adresă: %s
+WebCalUrlForVCalExport=Un export asociat la formatul <b>%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
-BillsPDFModulesAccordindToInvoiceType=Modele de documente de facturare în funcție de tipul de factură
-PaymentsPDFModules=Modele de documente de plată
-ForceInvoiceDate=Vigoare la data facturii de validare data
+BillsSetup=Configurare modul Facturi
+BillsNumberingModule=Mod de numerotare Facturi şi note de credit
+BillsPDFModules=Şabloane documente Factura
+BillsPDFModulesAccordindToInvoiceType=Şabloane documente tip factură în funcție de tipul de factură
+PaymentsPDFModules=Şabloane documente de plată
+ForceInvoiceDate=Forţează data facturii la data de validare
 SuggestedPaymentModesIfNotDefinedInInvoice=Modalitatea de plată sugerată pe factură în mod implicit, dacă nu este definită pe factură
 SuggestPaymentByRIBOnAccount=Sugerați plata prin retragere din cont
-SuggestPaymentByChequeToAddress=Sugerați plata de prin cec către
-FreeLegalTextOnInvoices=Free text pe facturi
-WatermarkOnDraftInvoices=Filigranul pe facturile schiţă (niciunul daca e gol)
+SuggestPaymentByChequeToAddress=Sugerați plata de prin cec la
+FreeLegalTextOnInvoices=Text liber pe facturi
+WatermarkOnDraftInvoices=Filigranul pe facturile schiţă (niciunul dacă e gol)
 PaymentsNumberingModule=Model de numerotare a plăților
-SuppliersPayment=Plățile furnizorului
-SupplierPaymentSetup=Configurarea plăților furnizorului
+SuppliersPayment=Plăți furnizori
+SupplierPaymentSetup=Configurare plăți furnizor
 ##### Proposals #####
-PropalSetup=Modul configurare Oferte Comerciale 
-ProposalsNumberingModules=Modele numerotare  Oferte Comerciale 
-ProposalsPDFModules=Modele documente Oferte Comerciale 
+PropalSetup=Configurare modul Oferte Comerciale 
+ProposalsNumberingModules=Modele numerotare Oferte comerciale 
+ProposalsPDFModules=Şabloane documente Oferte comerciale 
 SuggestedPaymentModesIfNotDefinedInProposal=Modalitatea de plată sugerată pe ofertă în mod implicit, dacă nu este definită pe oferta comercială
 FreeLegalTextOnProposal=Text liber pe ofertele comerciale
 WatermarkOnDraftProposal=Filigranul pe ofertele comerciale schiţă (niciunul daca e gol)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al ofertei
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar de destinație pe ofertă
 ##### SupplierProposal #####
-SupplierProposalSetup=Configurarea modului de cerere de ofertă de la furnizor
-SupplierProposalNumberingModules=Numerotarea modului de cerere de ofertă de la furnizor
-SupplierProposalPDFModules=Modele de documente de tip cerere de ofertă
-FreeLegalTextOnSupplierProposal=Textul liber pe cererile de ofertă de la furnizori
-WatermarkOnDraftSupplierProposal=Watermark privind furnizorii de cereri de ofertă (nu este cazul dacă este gol)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Cereţi contul bancar al beneficiarului în cazul unei cereri de ofertă
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Cereţi sursa depozitului pentru comandă
+SupplierProposalSetup=Configurare modul Cerere de ofertă de la furnizor
+SupplierProposalNumberingModules=Model de numerotare pentru cererile de preţuri la furnizori
+SupplierProposalPDFModules=Şabloane documente de tip cerere de preţ la furnizori
+FreeLegalTextOnSupplierProposal=Text liber pe cererile de preţ la furnizori
+WatermarkOnDraftSupplierProposal=Watermark pe cererile de preţ la furnizor schiţă (nu se aplică dacă nu se completează)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Solicită contul bancar destinaţie în cazul unei cereri de preţ
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Cereţi depozitul sursă pentru comandă
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Cereţi contul bancar al beneficiarului unei comenzi de achiziție
 ##### Orders #####
 SuggestedPaymentModesIfNotDefinedInOrder=Modalitatea de plată sugerată pe comanda de vânzare în mod implicit, dacă nu este definită pe comandă 
 OrdersSetup=Setări pentru gestionarea comenzilor de vânzări
-OrdersNumberingModules=Ordinele de numerotare module
-OrdersModelModule=Ordinul modele de documente
-FreeLegalTextOnOrders=Free text de pe ordinele de
-WatermarkOnDraftOrders=Filigranul pe comenzile schiţă (niciunul daca e gol)
-ShippableOrderIconInList=Adaugă un icon în lista Comenzilor care indica daca comanda este expediabilă
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Cere contul bancar destinație al comenzii
+OrdersNumberingModules=Modele de numerotare comenzi
+OrdersModelModule=Şabloane documente comenzi
+FreeLegalTextOnOrders=Text liber pe comenzi
+WatermarkOnDraftOrders=Watermark pe comenzile schiţă (niciunul dacă e gol)
+ShippableOrderIconInList=Adaugă un icon în lista Comenzilor care indică dacă comanda este livrabilă
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Solicită contul bancar destinație al comenzii
 ##### Interventions #####
-InterventionsSetup=Intervenţii de modul de configurare
-FreeLegalTextOnInterventions=Textul gratuit pe documente de intervenţie
-FicheinterNumberingModules=Modulele de intervenţie de numerotare
-TemplatePDFInterventions=Modele documente fişă intervenţie
-WatermarkOnDraftInterventionCards=Filigranul pe documentele fişelor de intervenţie (niciunul daca e gol)
+InterventionsSetup=Configurare modul Intervenţii
+FreeLegalTextOnInterventions=Text liber pe documentele de intervenţie
+FicheinterNumberingModules=Modele de numerotare pentru intervenţie
+TemplatePDFInterventions=Şabloane documente Fişă intervenţie
+WatermarkOnDraftInterventionCards=Filigranul pe documentele fişelor de intervenţie (niciunul dacă e gol)
 ##### Contracts #####
-ContractsSetup=Configurare modul Contracte /  Abonamente 
-ContractsNumberingModules=Contracte de numerotare module
-TemplatePDFContracts=Modele documente contracte
-FreeLegalTextOnContracts=Free text  pe contracte
-WatermarkOnDraftContractCards=Filigranul pe contractele ciornă (niciunul daca e gol)
+ContractsSetup=Configurare modul Contracte/Abonamente 
+ContractsNumberingModules=Modele numerotare Contracte
+TemplatePDFContracts=Şaboane documente contracte
+FreeLegalTextOnContracts=Text liber pe contracte
+WatermarkOnDraftContractCards=Filigranul de pe contractele schiţă (niciunul dacă nu se completează)
 ##### Members #####
-MembersSetup=Membrii modul de configurare
-MemberMainOptions=Principalele opţiuni
-AdherentLoginRequired= Gestiona un Autentificare pentru fiecare membru
-AdherentMailRequired=E-mail necesar pentru a crea un nou membru
-MemberSendInformationByMailByDefault=Validare pentru a trimite mail de confirmare a membrilor este în mod implicit
+MembersSetup=Configurare modul Membri
+MemberMainOptions=Opţiuni principale
+AdherentLoginRequired= Gestionează autentificarea pentru fiecare membru
+AdherentMailRequired=Emailul este necesar pentru a crea un nou membru
+MemberSendInformationByMailByDefault=Opţiunea de a trimite email de confirmare a membrilor(validare sau confirmare adeziune) este activă în mod implicit
 VisitorCanChooseItsPaymentMode=Vizitatorul poate alege din modurile disponibile de plată
-MEMBER_REMINDER_EMAIL=Activați memento automat <b> prin email </b> de abonamente expirate. Notă: Modul <strong> %s </strong> trebuie să fie activat and setat corect pentru a trimite mementouri.
+MEMBER_REMINDER_EMAIL=Activați reminder automat <b>prin email</b> pentru adeziunile expirate. Notă: Modul <strong>%s</strong> trebuie să fie activat and setat corect pentru a trimite remindere.
 MembersDocModules=Șabloane documente pentru documentele generate din înregistrarea membrilor
 ##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parametrii
+LDAPSetup=Configurare LDAP
+LDAPGlobalParameters=Parametri globali
 LDAPUsersSynchro=Utilizatori
 LDAPGroupsSynchro=Grupuri
 LDAPContactsSynchro=Contacte
 LDAPMembersSynchro=Membri
-LDAPMembersTypesSynchro=Tipuri  Membri
-LDAPSynchronization=LDAP de sincronizare
-LDAPFunctionsNotAvailableOnPHP=LDAP funcţii nu sunt availbale pe PHP
+LDAPMembersTypesSynchro=Tipuri membri
+LDAPSynchronization=Sincronizare LDAP
+LDAPFunctionsNotAvailableOnPHP=Funcţiile LDAP nu sunt disponibile în PHP
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
 LDAPNamingAttribute=Cheie în LDAP
-LDAPSynchronizeUsers=Sincronizaţi Dolibarr utilizatorii cu LDAP
-LDAPSynchronizeGroups=Sincronizaţi Dolibarr grupuri cu LDAP
-LDAPSynchronizeContacts=Sincronizaţi Dolibarr contacte cu LDAP
-LDAPSynchronizeMembers=Sincronizarea membrilor Dolibarr Fundaţia modulul cu LDAP
+LDAPSynchronizeUsers=Organizare utilizatori în LDAP
+LDAPSynchronizeGroups=Organizare grupuri în LDAP
+LDAPSynchronizeContacts=Organizare contacte în LDAP
+LDAPSynchronizeMembers=Organizare membri fundaţie în LDAP
 LDAPSynchronizeMembersTypes=Organizarea tipurilor de membri ai fundației în LDAP
-LDAPPrimaryServer=Primar server
-LDAPSecondaryServer=Secundar server
+LDAPPrimaryServer=Server primar
+LDAPSecondaryServer=Server secundar
 LDAPServerPort=Port server
-LDAPServerPortExample=Portul implicit: 389
-LDAPServerProtocolVersion=Protocol versiunea
+LDAPServerPortExample=Port implicit: 389
+LDAPServerProtocolVersion=Versiune protocol
 LDAPServerUseTLS=Utilizaţi TLS
-LDAPServerUseTLSExample=Parerea LDAP server utilizează TLS
+LDAPServerUseTLSExample=Serverul tău LDAP utilizează TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Completati DN (de ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com pentru directorul activ)
+LDAPAdminDnExample=Completati DN (de ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com pentru Active Directory)
 LDAPPassword=Parolă de administrator
 LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=Finalizarea DN (ex: ou= users, dc= societate, dc= com)
-LDAPGroupDn=Grupuri 'DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=Finalizarea DN (ex: ou= grupuri, dc= societate, dc= com)
-LDAPServerExample=Adresa serverului (ex: localhost, 192.168.0.2, ldaps: / / ldap.example.com /)
-LDAPServerDnExample=Complete DN (ex: dc=company,dc=Finalizarea DN (ex: dc= companie, dc= com)
-LDAPDnSynchroActive=Utilizatori şi grupuri de sincronizare
-LDAPDnSynchroActiveExample=LDAP a Dolibarr sau Dolibarr la LDAP de sincronizare
-LDAPDnContactActive=Contacte "sincronizare
-LDAPDnContactActiveExample=Activat / Unactivated de sincronizare
-LDAPDnMemberActive=Membrilor de sincronizare
-LDAPDnMemberActiveExample=Activat / Unactivated de sincronizare
-LDAPDnMemberTypeActive=Sincronizarea tipurilor de membri
-LDAPDnMemberTypeActiveExample=Activat / Unactivated de sincronizare
-LDAPContactDn=Dolibarr contacte 'DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=Finalizarea DN (ex: ou= contacte, dc= societate, dc= com)
-LDAPMemberDn=Dolibarr membrilor DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=society,dc=Finalizarea DN (ex: ou= membri, dc= societate, dc= com)
-LDAPMemberObjectClassList=Lista de objectClass
-LDAPMemberObjectClassListExample=Lista de objectClass definirea record atributele (ex: top, inetOrgPerson sau de sus, utilizatorul pentru Active Directory)
-LDAPMemberTypeDn=Membrii Dolibarr tip DN
-LDAPMemberTypepDnExample=DN complet (ex: ou = tipuridemembri, dc = exemplu, dc = com)
-LDAPMemberTypeObjectClassList=Lista de objectClass
-LDAPMemberTypeObjectClassListExample=Lista de objectClass definirea record atributele (ex: top, groupOfUniqueNames)
+LDAPUserDnExample=FQDN (ex: ou= users, dc= societate, dc= com)
+LDAPGroupDn=Grupuri DN
+LDAPGroupDnExample=FQDN (ex: ou=groups,dc=example,dc=com)
+LDAPServerExample=Adresa serverului (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=FQDN (ex: dc=example,dc=com)
+LDAPDnSynchroActive=Sincronizare de utilizatori şi grupuri
+LDAPDnSynchroActiveExample=Sincronizare LDAP către Dolibarr sau Dolibarr către LDAP
+LDAPDnContactActive=Sincronizare contacte
+LDAPDnContactActiveExample=Sicronizare activată/neactivată
+LDAPDnMemberActive=Sincronizare membri
+LDAPDnMemberActiveExample=Sincronizare activată/dezactivată
+LDAPDnMemberTypeActive=Sincronizare tipuri de membri
+LDAPDnMemberTypeActiveExample=Sinconizare activată/dezactivată
+LDAPContactDn=DN contacte Dolibarr
+LDAPContactDnExample=FQDN (ex: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=DN membri Dolibarr
+LDAPMemberDnExample= FQDN (ex: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=Listă objectClass
+LDAPMemberObjectClassListExample=Lista de objectClass care definesc atributele înregistrării (ex: top,inetOrgPerson or top,user pentru Active Directory)
+LDAPMemberTypeDn=DN tip membri Dolibarr
+LDAPMemberTypepDnExample=FQDN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=Listă objectClass
+LDAPMemberTypeObjectClassListExample=Lista de objectClass care definesc înregistrările atribut (ex: top, groupOfUniqueNames)
 LDAPUserObjectClassList=Lista de objectClass
-LDAPUserObjectClassListExample=Lista de objectClass definirea record atributele (ex: top, inetOrgPerson sau de sus, utilizatorul pentru Active Directory)
+LDAPUserObjectClassListExample=Lista objectClass care definesc atributele înregistrării (ex: top, inetOrgPerson sau top, utilizatorul pentru Active Directory)
 LDAPGroupObjectClassList=Lista de objectClass
-LDAPGroupObjectClassListExample=Lista de objectClass definirea record atributele (ex: top, groupOfUniqueNames)
-LDAPContactObjectClassList=Lista de objectClass
-LDAPContactObjectClassListExample=Lista de objectClass definirea record atributele (ex: top, inetOrgPerson sau de sus, utilizatorul pentru Active Directory)
+LDAPGroupObjectClassListExample=Lista objectClass care definesc atributele înregistrării(ex: top, groupOfUniqueNames)
+LDAPContactObjectClassList=Listă objectClass
+LDAPContactObjectClassListExample=Lista de objectClass care definesc înregistrările atribut (ex: top, inetOrgPerson sau top, user pentru Active Directory)
 LDAPTestConnect=Test conexiune LDAP
-LDAPTestSynchroContact=Test de contact de sincronizare
-LDAPTestSynchroUser=Test de utilizator de sincronizare
-LDAPTestSynchroGroup=Test de sincronizare a grupului
-LDAPTestSynchroMember=Test membru de sincronizare
-LDAPTestSynchroMemberType=Testați sincronizarea de tip membru
+LDAPTestSynchroContact=Test sincronizare contacte
+LDAPTestSynchroUser=Test sincronizare utilizator
+LDAPTestSynchroGroup=Test sincronizare grup
+LDAPTestSynchroMember=Test sincronizare membru
+LDAPTestSynchroMemberType=Testați sincronizare tip membru
 LDAPTestSearch= Test căutare LDAP
 LDAPSynchroOK=Sincronizare încercare reuşită
 LDAPSynchroKO=Eşuare încercare de sincronizare
-LDAPSynchroKOMayBePermissions=Testul de sincronizare eșuat. Verificați că conexiunea la server este corect configurată și permite actualizarea LDAP
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP se conecteze la serverul LDAP de succes (Server= %s, port= %s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP se conecteze la serverul LDAP a eşuat (Server= %s, port= %s)
+LDAPSynchroKOMayBePermissions=Testul de sincronizare a eșuat. Verificați dacă conexiunea la server este corect configurată și permite actualizarea LDAP
+LDAPTCPConnectOK=Conectare TCP la serverul LDAP cu succes (Server=%s, Port=%s)
+LDAPTCPConnectKO=Conectare TCP la serverul LDAP eşuată (Server= %s, port= %s)
 LDAPBindOK=Conectare/Autentificare la serverul LDAP cu succes (Server = %s, Port = %s, Admin = %s, Parolă= %s)
-LDAPBindKO=Conectare/Autentificare la serverul LDAP eșuată (Server = %s, Port = %s, Admin = %s, Parolă= %s)
-LDAPSetupForVersion3=LDAP server configurat pentru versiunea 3
-LDAPSetupForVersion2=LDAP server configurat pentru versiunea 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
+LDAPBindKO=Conectare/Autentificare la server-ul LDAP eșuată (Server = %s, Port = %s, Admin = %s, Parolă= %s)
+LDAPSetupForVersion3=Server LDAP configurat pentru versiunea 3
+LDAPSetupForVersion2=Server LDAPconfigurat pentru versiunea 2
+LDAPDolibarrMapping=Mapare Dolibarr
+LDAPLdapMapping=Mapare LDAP
 LDAPFieldLoginUnix=Login (Unix)
-LDAPFieldLoginExample=Examplu: uid
-LDAPFilterConnection=Cautati filtru
-LDAPFilterConnectionExample=Examplu: & (objectClass = inetOrgPerson)
+LDAPFieldLoginExample=Exemplu: uid
+LDAPFilterConnection=Filtru de căutare
+LDAPFilterConnectionExample=Exemplu: & (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Exemplu: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Examplu: samaccountname
-LDAPFieldFullname=Prenume Nume
-LDAPFieldFullnameExample=Examplu: cn
+LDAPFieldLoginSambaExample=Exemplu: samaccountname
+LDAPFieldFullname=Nume complet
+LDAPFieldFullnameExample=Exemplu: cn
 LDAPFieldPasswordNotCrypted=Parola nu este criptată
 LDAPFieldPasswordCrypted=Parolă criptată
-LDAPFieldPasswordExample=Examplu: userPassword
-LDAPFieldCommonNameExample=Examplu: cn
+LDAPFieldPasswordExample=Exemplu: userPassword
+LDAPFieldCommonNameExample=Exemplu: cn
 LDAPFieldName=Nume
-LDAPFieldNameExample=Examplu: sn
+LDAPFieldNameExample=Exemplu: sn
 LDAPFieldFirstName=Prenume
-LDAPFieldFirstNameExample=Examplu: givenName
-LDAPFieldMail=Adresa de e-mail
-LDAPFieldMailExample=Examplu: mail
-LDAPFieldPhone=Numărul de telefon profesional 
-LDAPFieldPhoneExample=Examplu: telephonenumber
-LDAPFieldHomePhone=Personale numărul de telefon
-LDAPFieldHomePhoneExample=Examplu: homephone
+LDAPFieldFirstNameExample=Exemplu: givenName
+LDAPFieldMail=Adresă email
+LDAPFieldMailExample=Exemplu: mail
+LDAPFieldPhone=Nr. telefon profesional 
+LDAPFieldPhoneExample=Exemplu: telephonenumber
+LDAPFieldHomePhone=Numărul de telefon personal
+LDAPFieldHomePhoneExample=Exemplu: homephone
 LDAPFieldMobile=Telefon celular
-LDAPFieldMobileExample=Examplu: mobile
-LDAPFieldFax=Număr de fax
-LDAPFieldFaxExample=Examplu: facsimiletelephonenumber
-LDAPFieldAddress=Strada
-LDAPFieldAddressExample=Examplu: stradă
+LDAPFieldMobileExample=Exemplu: mobile
+LDAPFieldFax=Nr de fax
+LDAPFieldFaxExample=Exemplu: facsimiletelephonenumber
+LDAPFieldAddress=Stradă
+LDAPFieldAddressExample=Exemplu: stradă
 LDAPFieldZip=Zip
-LDAPFieldZipExample=Examplu: postalcode
+LDAPFieldZipExample=Exemplu: postalcode
 LDAPFieldTown=Oraş
-LDAPFieldTownExample=Examplu: l
+LDAPFieldTownExample=Exemplu: l
 LDAPFieldCountry=Ţară
 LDAPFieldDescription=Descriere
-LDAPFieldDescriptionExample=Examplu: descriere
-LDAPFieldNotePublic=Note Publice
-LDAPFieldNotePublicExample=Examplu: publicnote
-LDAPFieldGroupMembers= Membrii grupului
-LDAPFieldGroupMembersExample= Examplu: uniqueMember
+LDAPFieldDescriptionExample=Exemplu: descriere
+LDAPFieldNotePublic=Note publice
+LDAPFieldNotePublicExample=Exemplu: publicnote
+LDAPFieldGroupMembers= Membri grup
+LDAPFieldGroupMembersExample= Exemplu: uniqueMember
 LDAPFieldBirthdate=Data naşterii
 LDAPFieldCompany=Companie
-LDAPFieldCompanyExample=Examplu: o
+LDAPFieldCompanyExample=Exemplu: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Examplu: objectsid
-LDAPFieldEndLastSubscription=Data de sfârşit de abonament
+LDAPFieldSidExample=Exemplu: objectsid
+LDAPFieldEndLastSubscription=Data de sfârşit abonament
 LDAPFieldTitle=Funcţie
-LDAPFieldTitleExample=Examplu: titlu
+LDAPFieldTitleExample=Exemplu: titlu
 LDAPFieldGroupid=Id grup
 LDAPFieldGroupidExample=Exemplu : gidnumber
 LDAPFieldUserid=Id utilizator
@@ -1555,362 +1566,364 @@ LDAPFieldUseridExample=Exemplu : uidnumber
 LDAPFieldHomedirectory=Director home
 LDAPFieldHomedirectoryExample=Exemplu : homedirectory
 LDAPFieldHomedirectoryprefix=Prefix director home
-LDAPSetupNotComplete=LDAP setup nu complet (merg pe alţii file)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nr administrator sau parola furnizate. LDAP de acces vor fi anonime şi modul doar în citire.
-LDAPDescContact=Această pagină vă permite să definiţi numele atribute LDAP LDAP în copac pentru fiecare date găsite pe Dolibarr contact.
-LDAPDescUsers=Această pagină vă permite să definiţi numele atribute LDAP LDAP în copac pentru fiecare date găsite pe Dolibarr utilizatori.
-LDAPDescGroups=Această pagină vă permite să definiţi numele atribute LDAP LDAP în copac pentru fiecare date găsite pe Dolibarr grupuri.
-LDAPDescMembers=Această pagină vă permite să definiţi numele atribute LDAP LDAP în copac pentru fiecare găsit date cu privire la modul de Dolibarr membri.
-LDAPDescMembersTypes=Această pagină vă permite să definiți numele atributelor LDAP în arborele LDAP pentru fiecare dată găsită pe tipurile de membri Dolibarr.
-LDAPDescValues=Exemplu de valori sunt proiectate pentru <b>OpenLDAP</b> încărcate cu următoarele scheme: <b>core.schema, cosine.schema, inetorgperson.schema).</b> Dacă utilizaţi thoose valori şi OpenLDAP, vă modifica LDAP fişier de configurare <b>slapd.conf</b> de a avea toate thoose scheme încărcate.
+LDAPSetupNotComplete=Configurarea LDAP nu este completă (mergi şi pe celelalte file)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Contul de administrator sau parola nu au fost furnizate. Accesul LDAP va fi anonim şi doar în modul citire.
+LDAPDescContact=Această pagină vă permite să definiţi numele atributelor LDAP în arborele LDAP pentru datele găsite în contactele Dolibarr.
+LDAPDescUsers=Această pagină vă permite să definiţi numele atributelor LDAP în arborele LDAP pentru datele găsite în utilizatorii Dolibarr.
+LDAPDescGroups=Această pagină vă permite să definiţi numele de atribute LDAP în arborele LDAP pentru datele găsite în grupurile Dolibarr.
+LDAPDescMembers=Această pagină vă permite să definiţi numele atributelor LDAP în arborele LDAP pentru datele din modulul membri Dolibarr.
+LDAPDescMembersTypes=Această pagină îţi permite să defineşti numele atributelor LDAP în arborele LDAP pentru fiecare dată găsită pe tipurile de membri Dolibarr.
+LDAPDescValues=Exemplu de valori care sunt proiectate pentru <b>OpenLDAP</b> încărcate cu următoarele scheme: <b>core.schema, cosine.schema, inetorgperson.schema).</b> Dacă utilizezi aceste valori şi OpenLDAP, modifică fişierul de configurare LDAP <b>slapd.conf</b> pentru a avea toate aceste scheme încărcate.
 ForANonAnonymousAccess=Pentru un acces autentificat (pentru o scriere de exemplu)
-PerfDolibarr=Raport performanţă setări/optimizări
-YouMayFindPerfAdviceHere=Această pagină oferă unele verificări sau sfaturi legate de performanță.
+PerfDolibarr=Configurare performanţă/raport optimizări
+YouMayFindPerfAdviceHere=Această pagină oferă unele verificări sau sfaturi de îmbunătăţire a performanței.
 NotInstalled=Neinstalat
 NotSlowedDownByThis=Nu este încetinit de aceasta
 NotRiskOfLeakWithThis=Nu există riscul de divulgare cu aceasta.
 ApplicativeCache=Cache aplicativ
-MemcachedNotAvailable=Niciun cache aplicatie găsit. Puteți îmbunătăți performanța prin instalarea unui server de cache memcached și un modul capabil de a utiliza acest server cache. <br>Mai multe informatii aici <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.\n<br>Rețineți că o mulțime de furnizor de web hosting nu oferă astfel de server de cache.
-MemcachedModuleAvailableButNotSetup=Modulul memcahed pentru aplicarea cache este găsit dar nu este configurat complet
-MemcachedAvailableAndSetup=Modulul Memcached  pentru a utiliza serverul memcached este activat.
+MemcachedNotAvailable=Niciun cache aplicabil nu a fost găsit. Poți îmbunătăți performanța prin instalarea unui server de cache memcached și unui modul capabil de a utiliza acest server cache. <br>Mai multe informaţii aici <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Reține că o mulțime de furnizori de găzduire web nu oferă astfel de server de cache.
+MemcachedModuleAvailableButNotSetup=Modulul memcahed pentru aplicare cache a fost găsit dar nu este complet configurat.
+MemcachedAvailableAndSetup=Modulul Memcached dedicat utilizării cu serverul memcached este activat.
 OPCodeCache=Cache OPCode
-NoOPCodeCacheFound=Nu a fost găsită o memorie cache OPCode. Poate că utilizați o memorie cache OPCode, alta decât XCache sau eAccelerator (bună), sau poate că nu aveți memorie OPCode cache (foarte rău).
-HTTPCacheStaticResources=HTTP cache pentru resursele statice (CSS, img, javascript)
+NoOPCodeCacheFound=Nu a fost găsită o memorie cache OPCode. Poate că utilizezi o memorie cache OPCode, alta decât XCache sau eAccelerator (bună), sau poate că nu ai memorie cache OPCode (foarte rău).
+HTTPCacheStaticResources=Cache HTTP pentru resursele statice (css, img, javascript)
 FilesOfTypeCached=Fișierele de tip %s sunt puse în cache de serverul HTTP
 FilesOfTypeNotCached=Fișierele de tip %s nu sunt puse în cache de serverul HTTP
 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=De exemplu, utilizând directiva Apache "ExpiresByType image / gif A2592000"
-CacheByClient=Cache pe browser
-CompressionOfResources=Compresie a răspunsului HTTP
+CacheByServerDesc=De exemplu, utilizând directiva Apache "ExpiresByType image/gif A2592000"
+CacheByClient=Cache în browser
+CompressionOfResources=Compresie răspunsuri HTTP
 CompressionOfResourcesDesc=De exemplu, utilizând directiva Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=O astfel de detectare automată nu este posibilă cu browserele curente
 DefaultValuesDesc=Aici puteți defini valoarea implicită pe care doriți să o utilizați când creați o nouă înregistrare, şi/sau filtrele implicite sau ordinea de sortare când listați înregistrările.
-DefaultCreateForm=Valorile implicite (de utilizat pe formulare)
-DefaultSearchFilters=Filtrele de căutare implicite
+DefaultCreateForm=Valori implicite (de utilizat pe formulare)
+DefaultSearchFilters=Filtre de căutare implicite
 DefaultSortOrder=Ordine de sortare implicite
-DefaultFocus=Câmpurile de focalizare implicite
+DefaultFocus=Câmpuri de focus implicite
 DefaultMandatory=Campuri obligatorii ale formularului
 ##### Products #####
-ProductSetup=Produse modul de configurare
-ServiceSetup=Servicii de modul de configurare
-ProductServiceSetup=Produse şi Servicii de module de configurare
+ProductSetup=Configurare modul Produse
+ServiceSetup=Configurare modul Servicii
+ProductServiceSetup=Configurare module Produse şi Servicii
 NumberOfProductShowInSelect=Numărul maxim de produse pentru a fi afișate în listele de selectare combo (0 = fără limită)
 ViewProductDescInFormAbility=Afișează descrierile produsului în formulare (altfel este afișat într-un pop-up de tip tooltip)
 DoNotAddProductDescAtAddLines=Nu adăuga descrierea produsului (din fișa produsului) la adăugarea de linii pe formulare
 OnProductSelectAddProductDesc=Cum se utilizează descrierea produselor atunci când se adaugă un produs ca linie a unui document
 AutoFillFormFieldBeforeSubmit=Completați automat câmpul de introducere a descrierii cu descrierea produsului
-DoNotAutofillButAutoConcat=Nu completa automat câmpul de introducere cu descrierea produsului. Descrierea produsului va fi concatenată automat cu descrierea introdusă. 
+DoNotAutofillButAutoConcat=Nu completa automat câmpul de introducere cu descrierea produsului. Descrierea produsului va fi concatenată automat cu descrierea introdusă.
 DoNotUseDescriptionOfProdut=Descrierea produsului nu va fi niciodată inclusă în descrierea liniilor de pe documente
-MergePropalProductCard=Activați în fișier atașat la produs/serviciu o opțiune de îmbinare a produsului de tip document PDF la propunerea PDF azur dacă produsul/serviciul se află în propunere
-ViewProductDescInThirdpartyLanguageAbility=Afișați descrierile produselor în formulare în limba terțului (altfel în limba utilizatorului) 
-UseSearchToSelectProductTooltip=De asemenea, dacă aveți un număr mare de number de produse (> 100 000), puteți crește viteza prin configurarea constantă a PRODUCT_DONOTSEARCH_ANYWHERE la 1 în Configurare-> Altele. Căutarea va fi apoi limitată la începutul șirului.
-UseSearchToSelectProduct=Așteptați până când apăsați o tastă înainte de a încărca conținutul listei combo-ului de produse (aceasta poate crește performanța dacă aveți un număr mare de produse, dar este mai puțin convenabil)
-SetDefaultBarcodeTypeProducts=Implicit tip de cod de bare de a utiliza pentru produse
-SetDefaultBarcodeTypeThirdParties=Implicit tip de cod de bare de a utiliza pentru terţi
+MergePropalProductCard=Activează la produs/serviciu în fişa Fişiere ataşate o opțiune de îmbinare a documentelor PDF la oferta PDF dacă produsul/serviciul este pe ofertă
+ViewProductDescInThirdpartyLanguageAbility=Afișați descrierile produselor în formulare în limba terțului (altfel în limba utilizatorului)
+UseSearchToSelectProductTooltip=De asemenea, dacă aveți un număr mare de produse (> 100 000), poți crește viteza prin configurarea constantei PRODUCT_DONOTSEARCH_ANYWHERE la 1 în Setări->Alte setări. Căutarea va fi limitată la începutul șirului.
+UseSearchToSelectProduct=Așteaptă până se apasă o tastă înainte de a încărca conținutul listei combo de produse (aceasta poate crește performanța dacă ai un număr mare de produse, dar este mai puțin convenabil)
+SetDefaultBarcodeTypeProducts=Tip implicit cod de bare de utilizat pentru produse
+SetDefaultBarcodeTypeThirdParties= Tip implicit cod de bare de utilizat pentru terţi
 UseUnits=Definiți o unitate de măsură pentru Cantitate în timpul ediției pentru comenzi, propuneri sau linii de facturare
 ProductCodeChecker= Modul pentru generare de cod de produs și verificare (produs sau serviciu)
-ProductOtherConf= Configurare Produse / Servicii
+ProductOtherConf= Configurare Produs / Serviciu
 IsNotADir=nu este director!
 ##### Syslog #####
-SyslogSetup=Syslog modul de configurare
+SyslogSetup=Configurare modul Syslog
 SyslogOutput=Jurnal de ieşire
-SyslogFacility=Facilitatea
+SyslogFacility=Facilitate
 SyslogLevel=Nivel
-SyslogFilename=Nume fişier şi calea
-YouCanUseDOL_DATA_ROOT=Puteţi folosi DOL_DATA_ROOT / dolibarr.log pentru un fişier de log în Dolibarr "Documente" director. Aveţi posibilitatea să setaţi o altă cale de a păstra acest fişier.
-ErrorUnknownSyslogConstant=Constant %s nu este un cunoscut syslog constant
+SyslogFilename=Nume fişier şi cale
+YouCanUseDOL_DATA_ROOT=Poţi folosi DOL_DATA_ROOT/dolibarr.log ca fişier de log în directorul "documents". Ai posibilitatea să setezi o altă cale de stocare a acestui fişier.
+ErrorUnknownSyslogConstant=Constanta %s nu este o constantă cunoscută Syslog
 OnlyWindowsLOG_USER=Pe Windows, numai facilitatea LOG_USER va fi acceptată
-CompressSyslogs=Comprimarea și copierea de rezervă a fișierelor jurnal de depanare (generate de modulul Log pentru depanare)
+CompressSyslogs=Comprimarea și backup-ul fișierelor jurnal de depanare (generate de modulul Log pentru depanare)
 SyslogFileNumberOfSaves=Număr log-uri de backup de păstrat
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurați curățarea lucrării programate pentru a configura frecvența copiei de rezervă a autentificărilor
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurați jobul de curăţare setaţi frecvența backup-urilor
 ##### Donations #####
-DonationsSetup=Donatii modul de configurare
-DonationsReceiptModel=Format de donatie la primirea
+DonationsSetup=Configurare modul Donaţii
+DonationsReceiptModel=Şablon chitanţă donaţie
 ##### Barcode #####
-BarcodeSetup=Coduri de bare de configurare
-PaperFormatModule=Imprimare in format modulul
-BarcodeEncodeModule=Coduri de bare de tip de codificare
-CodeBarGenerator=Generator de coduri de bare
-ChooseABarCode=Nu generator definit
-FormatNotSupportedByGenerator=Format nu sunt acceptate de acest generator
-BarcodeDescEAN8=Coduri de bare de tip EAN8
-BarcodeDescEAN13=Coduri de bare de tip EAN13
-BarcodeDescUPC=Coduri de bare de tip UPC
-BarcodeDescISBN=Coduri de bare de tip ISBN
-BarcodeDescC39=Coduri de bare de tip C39
-BarcodeDescC128=Coduri de bare de tip C128
-BarcodeDescDATAMATRIX=Cod de bare de tip Datamatrix
-BarcodeDescQRCODE=Cod de bare de tip QR code
-GenbarcodeLocation=Instrument pentru linia de comandă de generare de coduri de bare (utilizat de motorul intern pentru anumite tipuri de coduri de bare). Trebuie să fie compatibil cu "genbarcode". <br> De exemplu: / usr / local / bin / genbarcode
+BarcodeSetup=Configurare Coduri de bare
+PaperFormatModule=Modul Format tipărire
+BarcodeEncodeModule=Tip codificare Coduri de bare
+CodeBarGenerator=Generator coduri de bare
+ChooseABarCode=Niciun generator definit
+FormatNotSupportedByGenerator=Format nesuportat de acest generator
+BarcodeDescEAN8=Cod de bare tip EAN8
+BarcodeDescEAN13=Cod de bare tip EAN13
+BarcodeDescUPC=Cod de bare tip UPC
+BarcodeDescISBN=Cod de bare tip ISBN
+BarcodeDescC39=Cod de bare tip C39
+BarcodeDescC128=Cod de bare tip C128
+BarcodeDescDATAMATRIX=Cod de bare tip Datamatrix
+BarcodeDescQRCODE=Cod de bare tip QR code
+GenbarcodeLocation=Instrument pentru linia de comandă de generare de coduri de bare (utilizat de motorul intern pentru anumite tipuri de coduri de bare). Trebuie să fie compatibil cu "genbarcode". <br> De exemplu: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor intern
-BarCodeNumberManager=Manager pentru autodefinire numere coduri bare
+BarCodeNumberManager=Manager autodefinire numere coduri bare
 ##### Prelevements #####
-WithdrawalsSetup=Configurarea modulului de plăți debit direct
+WithdrawalsSetup=Configurare modul Plăți debit direct
 ##### ExternalRSS #####
-ExternalRSSSetup=Extern RSS importurile setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=Un interesant RSS feed
+ExternalRSSSetup=Configurare import RSS extern
+NewRSS=Feed RSS nou
+RSSUrl=URL RSS
+RSSUrlExample=Un feed RSS interesant
 ##### Mailing #####
-MailingSetup=Să trimiteţi un email la modul de instalare
-MailingEMailFrom=Expeditor e-mail (de la) pentru e-mailurile trimise prin modul de trimitere e-mailuri
-MailingEMailError=Returnați e-mail (Erori-la) pentru e-mailuri cu erori
-MailingDelay=Secunde de asteptare pentru trimiterea urmatorului mesaj
+MailingSetup=Configurare modul Newslettere
+MailingEMailFrom=Expeditor email (De la) pentru email-urile trimise prin modulul Newslettere
+MailingEMailError=Email retur (Erori-la) pentru erori email
+MailingDelay=Secunde de aşteptare pentru trimiterea următorului email
 ##### Notification #####
-NotificationSetup=Configurarea modulului de notificare prin e-mail
-NotificationEMailFrom=E-mail expeditor (De la) pentru e-mailurile trimise de modulul Notificări
-FixedEmailTarget=Recipient
+NotificationSetup=Configurare modul Notificare pe email
+NotificationEMailFrom=Email expeditor (De la) pentru email-urile trimise de modulul Notificări
+FixedEmailTarget=Destinatar
 ##### Sendings #####
-SendingsSetup=Configurare a modulului de expediere
+SendingsSetup=Configurare modul Livrări
 SendingsReceiptModel=Trimiterea primirea model
-SendingsNumberingModules=Trimiteri de numerotare module
-SendingsAbility=Foi de transport suport pentru livrările către clienți.
-NoNeedForDeliveryReceipts=În majoritatea cazurilor, foile de expediere sunt utilizate atât ca foi pentru livrările clienților (lista de produse care trebuie trimise), cât și pentru foile care sunt primite și semnate de către client. Prin urmare, foaia de confirmare a livrărilor de produse este o caracteristică duplicată și este rar activată.
-FreeLegalTextOnShippings=Text liber pe livrari
+SendingsNumberingModules=Modele de numerotare livrări
+SendingsAbility=Suport avize de expediţie pentru livrările către clienți.
+NoNeedForDeliveryReceipts=În majoritatea cazurilor, avizele de expediţie sunt utilizate atât pentru livrările către clienți (lista produselor care trebuie expediate), cât și pentru confirmarea şi semnarea de către client. Prin urmare, nota de confirmare a livrărilor de produse este o caracteristică duplicată și este rar activată.
+FreeLegalTextOnShippings=Text liber pe livrări
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Produse livrările primirea modul de numerotare
-DeliveryOrderModel=Produse livrările primirea model
-DeliveriesOrderAbility=Suport produse livrările încasări
-FreeLegalTextOnDeliveryReceipts=Free text încasări la livrare
+DeliveryOrderNumberingModules=Model de numerotare pentru recepţia livărilor de produse
+DeliveryOrderModel=Şablon recepţie produse de la furnizor
+DeliveriesOrderAbility=Suport note de livrare produse
+FreeLegalTextOnDeliveryReceipts=Text liber pe notele de recepţie produse
 ##### FCKeditor #####
 AdvancedEditor=Editor avansat
-ActivateFCKeditor=Activaţi FCKeditor pentru:
-FCKeditorForCompany=WYSIWIG crearea / editie a companiilor şi de note descriere
-FCKeditorForProduct=WYSIWIG crearea / editie a produselor / serviciilor "descrierea şi nota
+ActivateFCKeditor=Activaţi editorul avansat pentru:
+FCKeditorForCompany=Creare/editare WYSIWIG a elementelor de descriere şi note (exceptând produse/servicii)
+FCKeditorForProduct=Creare/editare WYSIWIG descriere şi note produse/servicii
 FCKeditorForProductDetails=Crearea/editarea WYSIWIG a liniilor de detalii ale produselor pentru toate entitățile (propuneri, comenzi, facturi, etc.).<span class="warning"> Atenţie: Utilizarea acestei opțiuni pentru acest caz nu este serios recomandată, deoarece poate crea probleme cu caracterele speciale și formatarea paginilor atunci când creați fișiere PDF.</span>
-FCKeditorForMailing= WYSIWIG crearea / ediţie de mailing
-FCKeditorForUserSignature=Creare/editare WYSIWIG  a semnăturii utilizatorilor
-FCKeditorForMail=Crearea / editarea WYSIWIG pentru toate e-mailurile (cu excepția Tools-> eMailing)
+FCKeditorForMailing= Creare/editare WYSIWIG pentru newslettere (Instrumente->Newslettere)
+FCKeditorForUserSignature=Creare/editare WYSIWIG a semnăturii utilizatorilor
+FCKeditorForMail=Creare/editare WYSIWIG pentru toate email-urile (cu excepția Instrumente->Newletter)
 FCKeditorForTicket=Creare/editare de tip WYSIWIG pentru tichete
 ##### Stock #####
-StockSetup=Gestionarea modulelor de stoc
-IfYouUsePointOfSaleCheckModule=Dacă utilizați modulul Punct de vânzare (POS) furnizat în mod implicit sau un modul extern, această configurare poate fi ignorată de modulul POS. Cele mai multe module POS sunt proiectate în mod implicit pentru a crea o factură imediat și pentru a scădea din stoc, indiferent de opțiunile de aici. Deci, dacă aveți nevoie sau nu să aveți o scădere din stoc la înregistrarea unei vânzări de pe POS, verificați și configurarea modulului POS.
+StockSetup=Configurare modul Stocuri
+IfYouUsePointOfSaleCheckModule=Dacă utilizezi modulul Punct de vânzare (POS) furnizat în mod implicit sau de un modul extern, această configurare poate fi ignorată de modulul POS. Cele mai multe module POS sunt proiectate în mod implicit să creeze o factură imediat și să scadă din stoc, indiferent de opțiunile de aici. Deci, dacă ai nevoie sau nu să faci o scădere din stoc la înregistrarea unei vânzări de pe POS, verifică și configurarea modulului POS.
 ##### Menu #####
-MenuDeleted=Meniu eliminat
+MenuDeleted=Meniu şters
 Menu=Meniu
 Menus=Meniuri
 TreeMenuPersonalized=Meniuri personalizate
-NotTopTreeMenuPersonalized=Meniuri personalizate care nu sunt legate de o intrare de meniu de sus
-NewMenu=New meniul
-MenuHandler=Meniu manipulant
-MenuModule=Sursa de modul
+NotTopTreeMenuPersonalized=Meniuri personalizate care nu sunt legate de o intrare din meniu de sus
+NewMenu=Meniu nou
+MenuHandler=Handler meniu
+MenuModule=Modul sursă
 HideUnauthorizedMenu=Ascunde meniurile neautorizate și pentru utilizatorii interni (doar gri altfel)
-DetailId=Id-ul pentru meniul
-DetailMenuHandler=Meniu manipulant în cazul în care pentru a arăta noul meniu
-DetailMenuModule=Modul de intrare în meniu numele dacă provin dintr-un modul
-DetailType=Tip de meniu (sus sau stanga)
-DetailTitre=Meniu etichetă sau eticheta cod pentru traducere
-DetailUrl=URL-ul în cazul în care meniul va trimite (absolute URL sau link-ul extern de legătură cu http://)
-DetailEnabled=Conditia pentru a afişa sau nu intrare
-DetailRight=Conditia pentru a afişa neautorizate gri meniuri
-DetailLangs=Lang de nume de fişier pentru eticheta cod de traducere
+DetailId=Id meniu
+DetailMenuHandler=Handler meniu utilizat pentru afişarea noului meniu
+DetailMenuModule=Numele modulului dacă intrarea în meniu provine dintr-un modul
+DetailType=Tip meniu (sus sau stânga)
+DetailTitre=Etichetă meniu sau cod etichetă pentru traducere
+DetailUrl=URL-ul la care te trimite meniul (URL absolut sau link extern de legătură cu http://)
+DetailEnabled=Condiţia pentru a afişa sau nu elementul
+DetailRight=Condiţia pentru a afişa meniurile gri neautorizate
+DetailLangs=Nume fişier lang pentru cod etichetă de traducere
 DetailUser=Intern / Extern / Toate
 Target=Ţintă
 DetailTarget=Țintă pentru linkuri (_blank top deschide o fereastră nouă)
-DetailLevel=Nivel (-1: meniul de sus, 0: antet meniu,&gt; 0 meniu şi submeniu)
-ModifMenu=Schimbare Meniu
-DeleteMenu=Ştergere intrare în meniu
-ConfirmDeleteMenu=Sunteţi sigur că doriţi să ştergeţi meniul de intrare <b>%s</b>?
+DetailLevel=Nivel (-1: meniul de sus, 0: meniu antet,>0 meniu şi submeniu)
+ModifMenu=Modificare meniu
+DeleteMenu=Şterge element din meniu
+ConfirmDeleteMenu=Sunteţi sigur că doriţi să ştergeţi elementul <b>%s</b> din meniu?
 FailedToInitializeMenu=Eroare la inițializarea meniului
 ##### Tax #####
-TaxSetup=Modul de configurare pentru impozite, taxe sociale sau fiscale și dividende 
-OptionVatMode=Opţiunea de exigibilit de TVA
+TaxSetup=Configurare modul Taxe sociale sau fiscale şi dividente
+OptionVatMode=Plătitor de TVA
 OptionVATDefault=Bază standard 
-OptionVATDebitOption=Bazată pe debit
+OptionVATDebitOption=Bază acumulare debit
 OptionVatDefaultDesc=TVA se datorează: <br> - pentru livrare de mărfuri (bazată pe facturare) <br> - Pe plăţi pentru servicii
 OptionVatDebitOptionDesc=TVA se datorează: <br> - pentru livrare de mărfuri (bazată pe facturare) <br> - pe facturi(debit) pentru servicii
-OptionPaymentForProductAndServices=Baza de numerar pentru produse și servicii
-OptionPaymentForProductAndServicesDesc=TVA se datorează: <br> - pe plăti pentru mărfuri <br> - pe plăti pentru servicii
-SummaryOfVatExigibilityUsedByDefault=Timpul pentru alegerea TVA implicit în funcție de opțiunea aleasă:
-OnDelivery=Pe  livrare
-OnPayment=Pe  plată
-OnInvoice=Pe factura
-SupposedToBePaymentDate=Plata data de utilizat, dacă nu se cunoaşte data de livrare
-SupposedToBeInvoiceDate=Data facturii utilizat
-Buy=Cumpăra
+OptionPaymentForProductAndServices=Numerar pentru produse și servicii
+OptionPaymentForProductAndServicesDesc=TVA datorat: <br> - pe plăti pentru mărfuri <br> - pe plăti pentru servicii
+SummaryOfVatExigibilityUsedByDefault=Momentul implicit al eligibilității TVA în funcție de opțiunea aleasă:
+OnDelivery=La livrare
+OnPayment=La plată
+OnInvoice=La factură
+SupposedToBePaymentDate=Se utilizează data plăţii, dacă nu se cunoaşte data de livrare
+SupposedToBeInvoiceDate=Se utilizează data facturii
+Buy=Cumpără
 Sell=Vinde
-InvoiceDateUsed=Data facturii utilizat
-YourCompanyDoesNotUseVAT=Compania dvs. a fost definită ca să nu folosească TVA (Acasă - Configurare - Companie / Organizare), deci nu există opțiuni de TVA la configurare.
+InvoiceDateUsed=Se utilizează data facturii
+YourCompanyDoesNotUseVAT=Compania ta a fost definită ca să nu folosească taxa TVA (Acasă - Setări - Companie/Organizaţie), deci nu există opțiuni de configurare TVA.
 AccountancyCode=Cod contabil
-AccountancyCodeSell=Cont vânzare. cod
-AccountancyCodeBuy=Cont cumpărare. cod
+AccountancyCodeSell=Cont contabil vânzare
+AccountancyCodeBuy=Cont contabil achiziţie
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Păstrați caseta de selectare "Creare automată plată" goală în mod implicit atunci când creați o nouă taxă
 ##### Agenda #####
-AgendaSetup=Acţiuni de ordine de zi şi de modul de configurare
-PasswordTogetVCalExport=Cheia de a autoriza export link
-PastDelayVCalExport=Nu de export eveniment mai în vârstă decât
-AGENDA_USE_EVENT_TYPE=Utilizați tipuri de evenimente (gestionate în menu Configuare-> Dicționare -> Tipul agendei de evenimente)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Puneți automat această valoare implicită pentru tipul de eveniment în formularul de creare a evenimentului
+AgendaSetup=Configurare modul Evenimente şi Agendă
+PasswordTogetVCalExport=Cheie de autorizare export link
+SecurityKey = Cheie de securitate
+PastDelayVCalExport=Nu exporta evenimente mai vechi de
+AGENDA_USE_EVENT_TYPE=Utilizați tipuri de evenimente (gestionate în menu Setări->Dicționare->Tip evenimente agendă)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Setează automat această valoare implicită pentru tipul de eveniment în formularul de creare a evenimentului
 AGENDA_DEFAULT_FILTER_TYPE=Puneți automat acest tip de eveniment în filtrul de căutare al vizualizării agendei
 AGENDA_DEFAULT_FILTER_STATUS=Puneți automat această stare pentru evenimentele din filtrul de căutare din vizualizarea agendei
 AGENDA_DEFAULT_VIEW=Ce vizualizare doriți să deschideți implicit atunci când selectați meniul Agenda
 AGENDA_REMINDER_BROWSER=Activați memento-uri evenimente în <b>browserul utilizatorului</b> (Când este atinsă data de reamintire, browserul afișează un popup. Fiecare utilizator poate dezactiva astfel de notificări din configurarea sa de notificări browser).
 AGENDA_REMINDER_BROWSER_SOUND=Activați notificarea sonoră
 AGENDA_REMINDER_EMAIL=Activați memento evenimente <b>prin email</b> (opțiunea de reamintire/întârziere poate fi definită pentru fiecare eveniment).
-AGENDA_REMINDER_EMAIL_NOTE= Notă: Frecvența sarcinii %s trebuie să fie suficientă pentru a vă asigura că reamintirea este trimisă la momentul corect.
+AGENDA_REMINDER_EMAIL_NOTE= Notă: Frecvența task-ului %s trebuie să fie suficientă pentru a vă asigura că reamintirea este trimisă la momentul corect.
 AGENDA_SHOW_LINKED_OBJECT=Afișați un obiect asociat în vizualizarea agendei
 ##### Clicktodial #####
-ClickToDialSetup=Click pentru a Dial modul setup
-ClickToDialUrlDesc=URL-ul se apelează când se face clic pe pictograma telefonului. În URL-ul, puteți utiliza etichete <br> <b> __PHONETO__ </b> care va fi înlocuit cu numărul de telefon al persoanei de apelat <br> <b> __PHONEFROM__ </b> care va fi înlocuit cu numărul de telefon al apelantului (al tău) <br> <b> __LOGIN__ </b>, care va fi înlocuit cu autentificare clicktodial (definită pe cartela de utilizator) <br> <b> __PASS__ </b> care va fi înlocuit cu parola clicktodial (definită pe cartela de utilizator).
+ClickToDialSetup=Configurare modul Click To Dial
+ClickToDialUrlDesc=URL-ul se apelează când se face clic pe pictograma telefon. În URL, poţi utiliza etichete <br> <b> __PHONETO__ </b> care vor fi înlocuite cu numărul de telefon al persoanei de apelat <br><b>__PHONEFROM__</b> care va fi înlocuit cu numărul de telefon al apelantului (al tău) <br> <b>__LOGIN__</b> , care va fi înlocuit cu numele de autentificare clicktodial (definită pe fişa utilizator) <br><b>__PASS__</b> care va fi înlocuit cu parola clicktodial (definită pe fişa utilizator).
 ClickToDialDesc=Acest modul schimbă numerele de telefon, atunci când utilizați un computer desktop, în linkuri cu clic. Un clic va apela numărul. Acest lucru poate fi folosit pentru a porni apelul telefonic atunci când utilizați un telefon smart sau când utilizați un sistem CTI bazat pe protocolul SIP, de exemplu. Notă: Când utilizați un smartphone, numerele de telefon sunt întotdeauna făcute clic.
-ClickToDialUseTelLink=Utilizați doar link "tel:" pe numerele de telefon
-ClickToDialUseTelLinkDesc=Utilizați această metodă dacă utilizatorii dvs. au un softphone sau o interfață software instalată pe același computer ca browserul și sună când faceți clic pe un link din browser care începe cu "tel:". Dacă aveți nevoie de o soluție completă de server (nu este nevoie de instalarea software-ului local), trebuie să setați această opțiune la "Nu" și să completați câmpul următor
+ClickToDialUseTelLink=Utilizează doar link "tel:" pe numerele de telefon
+ClickToDialUseTelLinkDesc=Utilizați această metodă dacă utilizatorii dvs. au un smartphone sau o interfață software instalată pe același computer ca browserul și poţi apela când faci clic pe un link din browser care începe cu "tel:". Dacă aveți nevoie de o soluție completă de server (fără instalarea software locală), trebuie să setați această opțiune la "Nu" și să completați câmpul următor.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=POS
-CashDeskSetup=Configurare Modul POS
+CashDeskSetup=Configurare modul POS
 CashDeskThirdPartyForSell=Terț generic implicit de utilizat pentru vânzări
-CashDeskBankAccountForSell=Case de cont pentru a utiliza pentru vinde
-CashDeskBankAccountForCheque=Contul implicit de folosit pentru a primi plata cu cec
-CashDeskBankAccountForCB=Cont pentru a folosi pentru a primi plăţi în numerar de carduri de credit
+CashDeskBankAccountForSell=Cont implicit pentru încasări numerar
+CashDeskBankAccountForCheque=Cont implicit utilizat pentru plăţi cu cecuri
+CashDeskBankAccountForCB=Cont implicit utilizat pentru a primi plăţi efectuate cu carduri de credit
 CashDeskBankAccountForSumup=Contul bancar implicit utilizat pentru a primi plăţi de la SumUp
-CashDeskDoNotDecreaseStock=Dezactivați scăderea stocului atunci când o vânzare se face prin POS (dacă "nu", scaderea stocului se face pentru fiecare vânzare făcută prin POS, indiferent de opțiunea stabilită în modulul Stoc).
-CashDeskIdWareHouse=Forţează și limitează depozitul să folosească scăderea stocului
-StockDecreaseForPointOfSaleDisabled=Scăderea stocului la vânzarea făcută prin POS dezactivată
-StockDecreaseForPointOfSaleDisabledbyBatch=Scăderea stocului la plata prin POS nu este compatibilă cu gestionarea modulului Serial/Lot (activă în prezent), astfel că scăderea stocului este dezactivată.
-CashDeskYouDidNotDisableStockDecease=Nu ați dezactivat scăderea stocului la efectuarea unei vânzări de la POS. Prin urmare, este necesar un depozit.
+CashDeskDoNotDecreaseStock=Dezactivează scăderea stocului atunci când o vânzare se face prin POS (dacă "nu", scăderea stocului se face pentru fiecare vânzare făcută prin POS, indiferent de opțiunea stabilită în modulul Stoc).
+CashDeskIdWareHouse=Forţează și limitează depozitul să utilizeze scăderea de stoc
+StockDecreaseForPointOfSaleDisabled=Scăderea stocului la vânzarea făcută prin POS este dezactivată
+StockDecreaseForPointOfSaleDisabledbyBatch=Scăderea stocului la plata prin POS nu este compatibilă cu modulul Management loturi/serii (activat în prezent), astfel că scăderea stocului este dezactivată.
+CashDeskYouDidNotDisableStockDecease=Nu ați dezactivat scăderea stocului la efectuarea unei vânzări de la POS. Prin urmare, este necesară specificarea unui depozit.
 CashDeskForceDecreaseStockLabel=Scăderea stocului pentru produsele din lot a fost forțată.
 CashDeskForceDecreaseStockDesc=Scădere mai întâi după cea mai vechi date de consum şi de vânzare.
 CashDeskReaderKeyCodeForEnter=Cod tastă pentru "Enter" definit în cititorul de coduri de bare(Exemplu: 13)
 ##### Bookmark #####
-BookmarkSetup=Bookmark modul de configurare
-BookmarkDesc=Acest modul vă permite să gestionați marcajele. De asemenea, puteți adăuga comenzi rapide la orice pagini Dolibarr sau site-uri externe din meniul din stânga.
+BookmarkSetup=Configurare modul Bookmark-uri
+BookmarkDesc=Acest modul vă permite să gestionați marcajele. De asemenea, puteți adăuga comenzi rapide la orice pagini din sistem sau site-uri externe din meniul din stânga.
 NbOfBoomarkToShow=Numărul maxim de marcaje în stânga pentru a afişa meniul
 ##### WebServices #####
-WebServicesSetup=WebServices modul de configurare
-WebServicesDesc=Prin activarea acestui modul, Dolibarr devenit un serviciu de web server pentru a oferi diverse servicii web.
-WSDLCanBeDownloadedHere=WSDL Descriptorul de fişier cu condiţia serviceses pot fi download aici
-EndPointIs=Clienții SOAP trebuie să își trimită cererile la punctul final Dolibarr disponibil la adresa URL
+WebServicesSetup=Configurare modul WebServices
+WebServicesDesc=Activând acest modul, sistemul devine server de servicii web şi oferă diverse diverse funcţionalităţi de interconectare şi comunicare cu alte sisteme.
+WSDLCanBeDownloadedHere=Fişierele descriptor WSDL pentru serviciile furnizate poate fi descărcat de aici
+EndPointIs=Clienții SOAP trebuie să își trimită cererile către endpoint-ul sistemului disponibil la adresa URL
 ##### API ####
 ApiSetup=Configurare Modul API
-ApiDesc=Prin activarea acestui modul, Dolibarr devine un server REST pentru furnizare de diverse servicii web.
+ApiDesc=Prin activarea acestui modul, Sistemul devine un server REST pentru furnizarea de diverse servicii web.
 ApiProductionMode=Activați modul de producție (aceasta va activa utilizarea unei memorii cache pentru gestionarea serviciilor)
-ApiExporerIs=Puteți explora și testa API-urile la adresa URL
+ApiExporerIs=Poţi explora și testa API-urile la adresa URL
 OnlyActiveElementsAreExposed=Doar elementele din modulele activate sunt expuse
 ApiKey=Cheie pentru API
-WarningAPIExplorerDisabled=Exploratorul API a fost dezactivat. Exploratorul API nu este obligat să furnizeze servicii API . Este un instrument pentru dezvoltator de a găsi/testa API-urile REST. Dacă aveți nevoie de acest instrument, mergeți la gestionarea din module API REST pentru a-l activa.
+WarningAPIExplorerDisabled=Exploratorul API a fost dezactivat. Exploratorul API nu este necesar pentru furnizarea de servicii API . Este un instrument de dezvoltatori pentru a găsi/testa API-urile REST. Dacă aveți nevoie de acest instrument, mergeți la configurarea modului API REST pentru a-l activa.
 ##### Bank #####
-BankSetupModule=Banca modul de configurare
-FreeLegalTextOnChequeReceipts=Text liber pe chitanţe
-BankOrderShow=Afişarea ordinea de conturi bancare pentru ţările care folosesc &quot;numărul de bancă detaliate&quot;
+BankSetupModule=Configurare modul Bănci
+FreeLegalTextOnChequeReceipts=Text liber pe chitanţe cec
+BankOrderShow=Afişarea ordinea pentru conturi bancare pentru ţările care folosesc "numărul bancar detaliat"
 BankOrderGlobal=General
-BankOrderGlobalDesc=General, pentru afişaj
-BankOrderES=Spaniol
-BankOrderESDesc=Spaniolă de afişare pentru
-ChequeReceiptsNumberingModule=Modul de verificare a numerotării chitanţelor
+BankOrderGlobalDesc=Ordine de afişare generală
+BankOrderES=Spaniolă
+BankOrderESDesc=Ordine de afişare Spaniolă
+ChequeReceiptsNumberingModule=Model de numerotare chitanţe cec
 ##### Multicompany #####
-MultiCompanySetup=Multi-societate modul setup
+MultiCompanySetup=Configurare modul Multi-companie
 ##### Suppliers #####
-SuppliersSetup=Configurarea modulului furnizor
+SuppliersSetup=Configurare modul Furnizori
 SuppliersCommandModel=Şablon complet pentru comanda de achiziţie
 SuppliersCommandModelMuscadet=Şablon complet pentru Comandă de achiziţie (vechea implementare a şablonului cornas)
 SuppliersInvoiceModel=Şablon complet de factură furnizor
-SuppliersInvoiceNumberingModel=Modele de numerotare a facturilor furnizorilor
+SuppliersInvoiceNumberingModel=Modele de numerotare a facturilor furnizor
 IfSetToYesDontForgetPermission=Dacă este setată o valoare nulă, nu uitați să furnizați permisiuni grupurilor sau utilizatorilor autorizați pentru a doua aprobare 
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind modul de configurare
+GeoIPMaxmindSetup=Configurare modul GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Calea spre fişierul Maxmind care conţine translatarea IP la ţară.<br>Exemple:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
-NoteOnPathLocation=Reţineţi că dvs. de IP la datele din ţara Dosarul trebuie să fie într-un director PHP poate citi (Verificaţi configurarea PHP open_basedir şi permisiunile de fişiere).
-YouCanDownloadFreeDatFileTo=Puteţi descărca o <b>versiune demo gratuită</b> a ţării dosar GeoIP Maxmind la %s.
-YouCanDownloadAdvancedDatFileTo=Puteţi descărca de asemenea, o <b>versiune</b> mai <b>completă, cu actualizari ale</b> ţării dosar GeoIP Maxmind la %s.
-TestGeoIPResult=Test de o conversie de IP -> ţară
+NoteOnPathLocation=Reţine că fişierul de conversie IP la ţară trebuie să fie într-un director citibil de PHP (Verifică configurarea PHP open_basedir şi permisiunile de fişiere).
+YouCanDownloadFreeDatFileTo=Puteţi descărca o <b>versiune demo gratuită</b> a fişierului de ţară GeoIP Maxmind de la %s.
+YouCanDownloadAdvancedDatFileTo=Puteţi descărca de asemenea, o <b>versiune mai completă, cu actualizări</b> ale fişierului de ţară GeoIP Maxmind de la %s.
+TestGeoIPResult=Test conversie IP -> ţară
 ##### Projects #####
-ProjectsNumberingModules=Proiecte de numerotare modulul
-ProjectsSetup=Proiect modul de configurare
-ProjectsModelModule=Proiectul de raport document model
-TasksNumberingModules=Model de numerotaţie al taskurilor
-TaskModelModule=Modele  de document de rapoarte taskuri
-UseSearchToSelectProject=Așteptați până când este apăsat o tastă înainte de a încărca conținutul listei proiectului combo. <br> Aceasta poate îmbunătăți performanţa dacă aveți un number mare de proiecte, dar este mai puțin convenabil.
+ProjectsNumberingModules=Model de numerotare Proiecte
+ProjectsSetup=Configurare modul Proiecte
+ProjectsModelModule=Şablon document Raport de proiect
+TasksNumberingModules=Model de numerotare taskuri
+TaskModelModule=Şabloane document rapoarte taskuri
+UseSearchToSelectProject=Așteptați până când este apăsat o tastă înainte de a încărca conținutul listei combo de Proiecte. <br> Aceasta poate îmbunătăți performanţa dacă aveți un număr mare de proiecte, dar este mai puțin convenabil.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Perioade contabiile
 AccountingPeriodCard=Perioadă contabilă
-NewFiscalYear=Perioadă contabilă nouă 
+NewFiscalYear=Perioadă contabilă nouă
 OpenFiscalYear=Deschide perioada contabilă
-CloseFiscalYear=Închide perioada contabila
+CloseFiscalYear=Închide perioada contabilă
 DeleteFiscalYear=Ștergeți perioada contabilă
-ConfirmDeleteFiscalYear=Sigur doriți să ștergeți această perioadă contabila?
+ConfirmDeleteFiscalYear=Sigur doriți să ștergeți această perioadă contabilă?
 ShowFiscalYear=Arată perioada contabilă
 AlwaysEditable=Permite a fi editat mereu
-MAIN_APPLICATION_TITLE=Forțează numele vizibil al aplicare (avertisment: setarea propriul nume aici poate duce la eliminarea facilitaţii de conectare automată atunci când se utilizează aplicația mobilă DoliDroid)
-NbMajMin=Numărul minim al caracterelor majuscule
-NbNumMin=Numărul minim al caracterelor minuscule
-NbSpeMin=Numărul minim al caracterelor speciale
-NbIteConsecutive=Numărul maxim al caracterelor care se repetă
-NoAmbiCaracAutoGeneration=Nu utiliza caractere ambigue  ("1","l","i","|","0","O") pentru generare automată
-SalariesSetup=Configurare modul salarii
-SortOrder=Ordine sortare
+MAIN_APPLICATION_TITLE=Forțează numele vizibil al aplicaţiei (atenţie: setarea propriul nume aici poate duce la eliminarea facilitaţii de conectare automată atunci când se utilizează aplicația mobilă DoliDroid)
+NbMajMin=Numărul minim de caractere majuscule
+NbNumMin=Numărul minim de caractere minuscule
+NbSpeMin=Numărul minim de caractere speciale
+NbIteConsecutive=Numărul maxim de caractere care se repetă
+NoAmbiCaracAutoGeneration=Nu utiliza caractere ambigue  ("1","l","i","|","0","O") la generarea automată
+SalariesSetup=Configurare modul Salarii
+SortOrder=Ordine de sortare
 Format=Format
-TypePaymentDesc=0: tipul de plată al clientului, 1: tipul de plată al furnizorului, 2: tipul de plată al clienților și al furnizorilor
-IncludePath=Include calea (definita in variabila %s)
-ExpenseReportsSetup=Configurarea modului rapoartelor de cheltuieli
-TemplatePDFExpenseReports=Șabloane de documente pentru a genera un document de raportare a cheltuielilor
-ExpenseReportsRulesSetup=Configurare din module Rapoarte de cheltuieli - Reguli
-ExpenseReportNumberingModules=Modul de numerotare a rapoartelor de cheltuieli
+TypePaymentDesc=0: tip de plată al clientului, 1: tip de plată al furnizorului, 2: tip de plată al clienților și al furnizorilor
+IncludePath=Include calea (definită în variabila %s)
+ExpenseReportsSetup=Configurarea modului Rapoarte de cheltuieli
+TemplatePDFExpenseReports=Șabloane de documente pentru generarea rapoartelor de cheltuieli
+ExpenseReportsRulesSetup=Configurare modul Rapoarte de cheltuieli - Reguli
+ExpenseReportNumberingModules=Model de numerotare a rapoartelor de cheltuieli
 NoModueToManageStockIncrease=Nu a fost activat niciun modul capabil să gestioneze creșterea stocului automat. Creșterea stocurilor se va face doar prin introducere manuală.
-YouMayFindNotificationsFeaturesIntoModuleNotification=Puteți găsi opțiuni pentru notificările prin e-mail prin activarea și configurarea modulului "Notificare".
+YouMayFindNotificationsFeaturesIntoModuleNotification=Puteți găsi opțiuni pentru notificările prin email activând şi configurând modulul "Notificare".
 ListOfNotificationsPerUser=Lista notificărilor automate pentru utilizator*
 ListOfNotificationsPerUserOrContact=Lista posibilelor notificări automate (în cadrul evenimentului comercial) disponibile pentru utilizator* sau pentru contact** 
 ListOfFixedNotifications=Listă notificări automate
-GoOntoUserCardToAddMore=Accesați fila "Notificări" a unui mesaj de utilizator pentru a adăuga sau elimina notificările pentru utilizatori
+GoOntoUserCardToAddMore=Accesați fişa "Notificări" a unui utilizator pentru a adăuga sau elimina notificări
 GoOntoContactCardToAddMore=Accesați fila "Notificări" a terțului pentru a adăuga sau elimina notificări pentru contacte/adrese 
 Threshold=Prag
 BackupDumpWizard=Wizard pentru generarea fişierului dump al bazei de date
 BackupZipWizard=Wizard pentru generarea arhivei cu directul de documente
 SomethingMakeInstallFromWebNotPossible=Instalarea modulului extern nu este posibilă din interfața web din următorul motiv:
-SomethingMakeInstallFromWebNotPossible2=Din acest motiv, procesul de actualizare descris aici este un proces manual pe care numai un utilizator privilegiat poate face.
-InstallModuleFromWebHasBeenDisabledByFile=Instalarea modulului extern din aplicație a fost dezactivată de administratorul dvs. Trebuie să-l rogi să-l elimine fişierul <strong> %s </strong> pentru a permite această caracteristică
-ConfFileMustContainCustom=Instalarea sau construirea unui modul extern din aplicație trebuie să salveze fişierele modulului în directorul <strong> %s </strong>. Pentru a avea acest director procesat de Dolibarr, trebuie să vă configuraţi<strong> conf / conf.php </strong> pentru a adăuga 2 linii directoare: <br> <strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / personalizat'; </strong>
-HighlightLinesOnMouseHover=Evidențiați liniile tabelului când mișcarea mouse-ului trece peste ele
+SomethingMakeInstallFromWebNotPossible2=Din acest motiv, procesul de actualizare descris aici este un proces manual pe care numai un utilizator privilegiat îl poate face.
+InstallModuleFromWebHasBeenDisabledByFile=Instalarea de module externe din aplicație a fost dezactivată de administrator. Trebuie să-i soliciţi să şteargă fişierul <strong>%s</strong> pentru a permite această caracteristică.
+ConfFileMustContainCustom=Instalarea sau construirea unui modul extern din aplicație trebuie să salveze fişierele în directorul <strong>%s</strong>. Pentru a putea fi folosit de sistem, trebuie să configurezi<strong>conf/conf.php</strong> adaugă 2 linii de directivă: <br> <strong>$dolibarr_main_url_root_alt='/custom';</strong> <br><strong> $dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Evidențiați liniile tabelului când treceţi cu mouse-ul peste ele
 HighlightLinesColor=Evidențiere culoare linie la trecerea cu mouse-ul (foloseşte „ffffff” pentru dezactivare)
 HighlightLinesChecked=Evidențiere culoare linie atunci când este bifată (foloseşte „ffffff” pentru dezactivare)
-TextTitleColor=Culoarea textului paginii de titlu
+TextTitleColor=Culoarea textului pentru titlul de pagină
 LinkColor=Culoare link-uri
-PressF5AfterChangingThis=Apăsați CTRL + F5 pe tastatură sau ștergeți memoria cache a browserului după ce ați modificat această valoare pentru a o avea eficientă
-NotSupportedByAllThemes=Va funcționa cu teme de bază, poate nu este susținută de teme externe
-BackgroundColor=Culoare Background 
-TopMenuBackgroundColor=Culoare Background pentru Top menu
-TopMenuDisableImages=Ascundeți imaginile în meniul de deasupra
-LeftMenuBackgroundColor=Culoare Background pentru Left menu
-BackgroundTableTitleColor=Culoarea de fundal pentru linia de titlul a tabelului
-BackgroundTableTitleTextColor=Culoarea textului pentru linia de titlul a tabelului
+PressF5AfterChangingThis=Apăsați CTRL + F5 sau ștergeți memoria cache a browserului după ce ați modificat această valoare pentru a se aplica
+NotSupportedByAllThemes=Va funcționa cu teme de bază, poate nu este suportată de teme externe
+BackgroundColor=Culoare fundal
+TopMenuBackgroundColor=Culoare fundal pentru meniul de Sus
+TopMenuDisableImages=Ascundeți imaginile în meniul de sus
+LeftMenuBackgroundColor=Culoare fundal pentru meniul Stânga
+BackgroundTableTitleColor=Culoarea de fundal pentru linia de titlu a tabelului
+BackgroundTableTitleTextColor=Culoarea textului pentru linia de titlu a tabelelor
 BackgroundTableTitleTextlinkColor=Culoarea textului pentru link-urile din titlul tabelelor
-BackgroundTableLineOddColor=Culoarea de fundal pentru liniile impare ale tabelului
-BackgroundTableLineEvenColor=Culoarea de fundal pentru liniile pare ale tabelului
-MinimumNoticePeriod=Perioada minimă de preaviz (cererea dvs. de concediu trebuie făcută înainte de această întârziere)
+BackgroundTableLineOddColor=Culoarea de fundal pentru liniile impare ale tabelelor
+BackgroundTableLineEvenColor=Culoarea de fundal pentru liniile pare ale tabelelor
+MinimumNoticePeriod=Perioada minimă de notificare (cererea ta de concediu trebuie făcută înainte de această perioadă)
 NbAddedAutomatically=Număr de zile adăugate la contoarele utilizatorilor (automat) în fiecare lună
-EnterAnyCode=Acest câmp conține o referinţă pentru a identifica linia. Introduceţi o valoare aleatoare, dar fără caractere speciale.
+EnterAnyCode=Acest câmp conține o referință pentru identificarea liniei. Introduceți orice valoare la alegere, dar fără caractere speciale.
 Enter0or1=Introdu 0 sau 1
-UnicodeCurrency=Enter aici între paranteze, lista de octeți care reprezintă simbolul monedei. De exemplu: pentru $, enter [36] - pentru Brazilia real R$ [82,36] - pentru €, enter [8364]
+UnicodeCurrency=Introdu aici între paranteze, lista de octeți care reprezintă simbolul monedei. De exemplu: pentru $, introdu [36] - pentru Real brazilian R$ [82,36] - pentru €, introdu [8364]
 ColorFormat=Culoarea RGB este în format HEX , de exemplu: FF0000
 PictoHelp=Numele pictogramei în format dolibarr ('image.png' dacă se află în directorul temei actuale, 'image.png@nume_modul' dacă se află în directorul /img/ al unui modul)
 PositionIntoComboList=Poziția linei în listele combo
-SellTaxRate=Rata taxei de vânzare
-RecuperableOnly=Da pentru TVA "neperceput, dar recuperabil" dedicat pentru unele state din Franța. Mențineți valoarea "Nu" în toate celelalte cazuri.
-UrlTrackingDesc=Dacă furnizorul sau serviciul de transport oferă o pagină sau un site web pentru a verifica starea expedierilor dvs., puteți să o introduceți aici. Puteți utiliza tasta {TRACKID} în parametrii adresei URL, astfel încât sistemul să îl înlocuiască cu numărul de urmărire introdus de utilizator în cartea de expediere.
-OpportunityPercent=Când creați o iniţiativă, veți defini o valoare estimată a proiectului/iniţiativei. În funcție de starea iniţiativei, această valoare poate fi înmulțită cu această rată pentru a evalua o valoare totală generată de toți potențialii clienți. Valoarea este un procentaj (între 0 și 100).
+SellTaxRate=Cota taxei de vânzare
+RecuperableOnly=Da pentru TVA "neperceput, dar recuperabil" dedicat pentru unele regiuni din Franța. Mențineți valoarea "Nu" în toate celelalte cazuri.
+UrlTrackingDesc=Dacă furnizorul sau serviciul de livrare oferă o pagină sau un site web pentru a verifica starea expedierilor dvs., puteți să o introduceți aici. Puteți utiliza codul {TRACKID} în parametrii adresei URL, astfel încât sistemul să îl înlocuiască cu numărul de urmărire AWB introdus de utilizator în fişa livrării.
+OpportunityPercent=Când creați unlead, veți defini o valoare estimată a proiectului/lead-ului. În funcție de starea lead-ului, această valoare poate fi înmulțită cu acest procentaj pentru a evalua o valoare totală generată pentru toți potențialii clienți. Valoarea este un procentaj (între 0 și 100).
 TemplateForElement=Această înregistrare șablon este dedicată pentru elementul care 
-TypeOfTemplate=Tip Model
-TemplateIsVisibleByOwnerOnly=Șablonul este vizibil numai pentru proprietar
+TypeOfTemplate=Tip şablon
+TemplateIsVisibleByOwnerOnly=Șablonul este vizibil numai de proprietar
 VisibleEverywhere=Vizibil peste tot
 VisibleNowhere=Invizibil
-FixTZ=Fixează TimeZone
-FillFixTZOnlyIfRequired=Examplu: +2 (completați numai dacă se întâlnește o problemă)
+FixTZ=TimeZone fix
+FillFixTZOnlyIfRequired=Exemplu: +2 (completați numai dacă se întâlnește o problemă)
 ExpectedChecksum=Checksum așteptat
 CurrentChecksum=Checksum curent
 ExpectedSize=Dimensiune aşteptată
 CurrentSize=Dimensiune curentă
 ForcedConstants=Valori constante necesare
-MailToSendProposal=Oferte Clienti
-MailToSendOrder=Ordine de vânzări 
-MailToSendInvoice=Facturi Clienţi
+MailToSendProposal=Oferte clienţi
+MailToSendOrder=Comenzi de vânzări 
+MailToSendInvoice=Facturi clienţi
 MailToSendShipment=Livrări
 MailToSendIntervention=Intervenţii
-MailToSendSupplierRequestForQuotation=Cerere de cotaţie
-MailToSendSupplierOrder=Comenzile de achiziție
-MailToSendSupplierInvoice=Facturi Furnizori
+MailToSendSupplierRequestForQuotation=Cerere de ofertă
+MailToSendSupplierOrder=Comenzi de achiziție
+MailToSendSupplierInvoice=Facturi furnizori
 MailToSendContract=Contracte
-MailToSendReception=Receptii
+MailToSendReception=Recepţii
 MailToThirdparty=Terţi
 MailToMember=Membri
 MailToUser=Utilizatori
@@ -1919,74 +1932,74 @@ MailToTicket=Tichete
 ByDefaultInList=Afișați în mod implicit în vizualizarea listei
 YouUseLastStableVersion=Utilizați ultima versiune stabilă
 TitleExampleForMajorRelease=Exemplu de mesaj pe care îl puteți utiliza pentru a anunța această lansare majoră (nu ezitați să o utilizați pe site-urile dvs.)
-TitleExampleForMaintenanceRelease=Exemplu de mesaj pe care îl puteți utiliza pentru a anunța această mentenanţă majoră (nu ezitați să o utilizați pe site-urile dvs.)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s este disponibil. Versiunea %s este o versiune majoră cu o mulţime de caracteristici noi atât pentru utilizatori cât şi pentru dezvoltatori . Puteți să o descărcați din https://www.dolibarr.org (versiuni stabile subdirector). Puteți să citiţi<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> pentru lista completă a modificărilor.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s este disponibil. Versiunea %s este o versiune de întreținere, deci conține doar corecții de erori. Recomandăm tuturor utilizatoriilor să faceți upgrade la această versiune. O versiune de întreținere nu introduce noi caracteristici sau modificări la baza de date. Puteți să o descărcați din https://www.dolibarr.org (versiuni stabile subdirector). Puteți să citiţi<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> pentru lista completă a modificărilor.
-MultiPriceRuleDesc=Când opțiunea "Mai multe niveluri de prețuri pe produs / serviciu" este activată, puteți defini diferite prețuri (câte unul pentru fiecare nivel de preț) pentru fiecare produs. Pentru a vă economisi timp, aici puteți introduce o regulă pentru a calcula automat un preț pentru fiecare nivel, pe baza prețului primului nivel, astfel încât va trebui să introduceți un preț pentru primul nivel pentru fiecare produs. Această pagină are rolul de a economisi timp, dar este utilă numai dacă prețurile pentru fiecare nivel sunt relative la primul nivel. În majoritatea cazurilor, puteți ignora această pagină.
-ModelModulesProduct=Șabloane pentru documente de produs
+TitleExampleForMaintenanceRelease=Exemplu de mesaj pe care îl puteți utiliza pentru a anunța această versiune de întreţinere majoră (nu ezitați să o utilizați pe site-uri)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s este disponibil. Versiunea %s este o versiune majoră cu o mulţime de caracteristici noi atât pentru utilizatori cât şi pentru dezvoltatori . Puteți să o descărcați de la https://www.dolibarr.org (subdirectorul versiuni stabile). Puteți consulta <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> pentru lista completă a modificărilor.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s este disponibil. Versiunea %s este o versiune de întreținere, deci conține doar corecții de erori. Recomandăm tuturor să facă actualizarea la această versiune. O versiune de întreținere nu introduce noi caracteristici sau modificări la baza de date. Puteți să o descărcați din https://www.dolibarr.org (subdirector versiuni stabile). Puteți să citiţi<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> pentru lista completă a modificărilor.
+MultiPriceRuleDesc=Când opțiunea "Mai multe niveluri de prețuri pe produs/serviciu" este activată, puteți defini diferite prețuri (câte unul pentru fiecare nivel de preț) pentru fiecare produs. Pentru a economisi timp, aici poţi introduce o regulă de calcul automat a unui preț pentru fiecare nivel, pe baza prețului primului nivel, astfel încât va trebui să introduceți un preț pentru primul nivel pentru fiecare produs. Această pagină are rolul de a economisi timp, dar este utilă numai dacă prețurile pentru fiecare nivel sunt relative la primul nivel. În majoritatea cazurilor, puteți ignora această pagină.
+ModelModulesProduct=Șabloane documente pentru produs
 WarehouseModelModules=Şabloane pentru documentele de depozit
-ToGenerateCodeDefineAutomaticRuleFirst=Pentru a putea genera automat coduri, trebuie mai întâi să definiți un manager pentru a defini automat numărul de cod de bare.
-SeeSubstitutionVars=Consultați * notă pentru lista variabilelor de înlocuire posibile
-SeeChangeLog=Vedeți fişierul ChangeLog (numai în engleză)
+ToGenerateCodeDefineAutomaticRuleFirst=Pentru a putea genera automat coduri de bare, trebuie mai întâi să definiți un manager de auto-definire pentru numărul de cod de bare.
+SeeSubstitutionVars=Consultați * nota pentru lista variabilelor de substituţie posibile
+SeeChangeLog=Vezi fişierul ChangeLog (numai în engleză)
 AllPublishers=Toți editorii
 UnknownPublishers=Editori necunoscuți
-AddRemoveTabs=Add sau inlatura taburi
-AddDataTables=Adăugați tabelele de obiect
-AddDictionaries=Adăugați tabele de dicționare
-AddData=Adăugați date desptre obiecte sau dicționare
-AddBoxes=Adăugați widget-uri
-AddSheduledJobs=Adăugați lucrări programate
-AddHooks=Adăugați elemente de agăţare
-AddTriggers=Adăugați declanșatoare
-AddMenus=Add meniuri
-AddPermissions=Add permisiunii
-AddExportProfiles=Add profile export
-AddImportProfiles=Add profile import
+AddRemoveTabs=Adăugaţi sau eliminaţi fişe
+AddDataTables=Adăugați tabele obiect
+AddDictionaries=Adăugare tabele de dicționare
+AddData=Adăugare date despre obiecte sau dicționare
+AddBoxes=Adăugare widget-uri
+AddSheduledJobs=Adăugare joburi programate
+AddHooks=Adăugare hook-uri
+AddTriggers=Adăugare triggere
+AddMenus=Adăugare meniuri
+AddPermissions=Adăugare permisiuni
+AddExportProfiles=Adăugare profile de export date
+AddImportProfiles=Adăugare profile de import date
 AddOtherPagesOrServices=Adăugați alte pagini sau servicii
 AddModels=Adăugați șabloane de document sau de numerotare
-AddSubstitutions=Adăugați chei de înlocuire
+AddSubstitutions=Adăugați chei de substituţie
 DetectionNotPossible=Detectarea nu este posibilă
-UrlToGetKeyToUseAPIs=URL pentru a obține tokenul pentru a utiliza API (odată ce a fost primit token este salvată în  tabelul cu baza de date a utilizatorului şi trebuie să fie furnizat pentru fiecare apel API)
-ListOfAvailableAPIs=List de API-uri disponibile
-activateModuleDependNotSatisfied=Modulul "%s" depinde de modulul "%s", care lipsește, astfel că modulul "%1$s" este posibil ca să nu funcționeze corect. Instalați modulul "%2$s" sau dezactivați modulul "%1$s" dacă doriți să fiți în siguranță de orice surpriză
-CommandIsNotInsideAllowedCommands=Comanda pe care încercați să o executați nu este în lista comenzilor permise definite în parametrul <strong> $ dolibarr_main_restrict_os_commands </strong> în fişierul<strong> conf.php </strong>.
-LandingPage=Pagina de destinație
-SamePriceAlsoForSharedCompanies=Dacă utilizați un modul multi-companie, cu opțiunea "preț unic", prețul va fi, de asemenea, același pentru toate companiile dacă produsele sunt partajate între medii
-ModuleEnabledAdminMustCheckRights=Modulul a fost activat. Permisiunile pentru modulul (modulele) activate au fost acordate numai administratorilor. Poate fi necesar să acordați permisiuni manuale altor utilizatori sau grupuri  dacă este necesar.
-UserHasNoPermissions=Acest utilizator nu are definite permisiuni
-TypeCdr=Utilizați "Niciunul" dacă data termenului de plată este data facturii plus o delta în zile (delta este câmpul "%s") <br> Utilizați "La sfârșitul lunii" dacă, după delta, date trebuie mărită pentru a ajunge la sfârșitul lunii (+ un opțional "%s" în zile) <br> Utilizați "Curent / Următor" pentru a aveadata termenului de plată fiind primul Nth din lună după delta (delta este câmpul "%s" N este stocat în câmpul "%s")
-BaseCurrency=Valuta de referință a companiei (mergeți în configurarea companiei pentru a schimba acest lucru)
+UrlToGetKeyToUseAPIs=URL pentru obținerea token-ului de utilizare API (odată ce a fost primit token acesta este salvat în tabela user în baza de date şi trebuie să fie transmis pentru fiecare apel API)
+ListOfAvailableAPIs=Listă API-uri disponibile
+activateModuleDependNotSatisfied=Modulul "%s" depinde de modulul "%s", care lipsește, astfel că modulul "%1$s" este posibil ca să nu funcționeze corect. Instalați modulul "%2$s" sau dezactivați modulul "%1$s" dacă nu doriți surprize neplăcute
+CommandIsNotInsideAllowedCommands=Comanda pe care încercați să o executați nu este în lista comenzilor permise definite în parametrul <strong>$dolibarr_main_restrict_os_commands</strong> în fişierul <strong>conf.php</strong>.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=Dacă utilizați un modul multi-companie, cu opțiunea "Preț unic", prețul va fi, de asemenea, același pentru toate companiile dacă produsele sunt partajate între entităţi
+ModuleEnabledAdminMustCheckRights=Modulul a fost activat. Permisiunile pentru modulul(ele) activate au fost acordate numai administratorilor. Poate fi necesar să acordați manual permisiuni altor utilizatori sau grupuri dacă este necesar.
+UserHasNoPermissions=Acest utilizator nu are permisiuni definite
+TypeCdr=Utilizează "Nimic" dacă data termenului de plată este data facturii plus o diferenţă în zile (delta este câmpul "%s") <br> Utilizează "La sfârșitul lunii" dacă, după diferenţă, data trebuie mărită pentru a ajunge la sfârșitul lunii (+ opțional "%s" în zile) <br> Utilizează "Curent/Următor" pentru a avea data termenului de plată ca fiind a N-a zi din lună după diferenţă (delta este câmpul "%s"; N este stocat în câmpul "%s")
+BaseCurrency=Moneda de referință a companiei (mergeți în configurarea companiei pentru a schimba acest lucru)
 WarningNoteModuleInvoiceForFrenchLaw=Acest modul %s respectă legile franceze (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=Acest modul %s respectă legile franceze (Loi Finance 2016) deoarece modulul Autentificări ireversibile este automat activat.
-WarningInstallationMayBecomeNotCompliantWithLaw=Încercați să instalați modulul %s care este un modul extern. Activarea unui modul extern înseamnă că aveți încredere în editorul modulului şi că sunteți sigur (ă) că acest modul nu afectează negativ comportamentul aplicației dvs., şi este în concordanţă cu legile țării dvs. (%s). Dacă modulul introduce o o caracteristică ilegală, devii responsabil pentru utilizarea software-ului ilegal.
+WarningNoteModulePOSForFrenchLaw=Acest modul %s respectă legile franceze (Loi Finance 2016) deoarece modulul Jurnale Nealterabile este automat activat.
+WarningInstallationMayBecomeNotCompliantWithLaw=Încercați să instalați modulul %s care este un modul extern. Activarea unui modul extern presupune că aveți încredere în editorul modulului şi că sunteți sigur că acest modul nu afectează negativ comportamentul aplicației şi este în concordanţă cu legile țării tale (%s). Dacă modulul introduce o o caracteristică ilegală, devii responsabil pentru utilizarea necorespunzătoare a software-ului.
 MAIN_PDF_MARGIN_LEFT=Marginea stângă a PDF-ului
 MAIN_PDF_MARGIN_RIGHT=Marginea dreaptă a PDF-ului 
 MAIN_PDF_MARGIN_TOP=Marginea superioară a PDF-ului 
 MAIN_PDF_MARGIN_BOTTOM=Marginea inferioară a PDF-ului 
 MAIN_DOCUMENTS_LOGO_HEIGHT=Înălţime logo în PDF
 NothingToSetup=Nu există o configurație specifică necesară pentru acest modul.
-SetToYesIfGroupIsComputationOfOtherGroups=Setați acest lucru la da dacă acest grup este un calcul al altor grupuri
-EnterCalculationRuleIfPreviousFieldIsYes=Introduceți regula de calcul în cazul în care câmpul anterior a fost setat la Da (de exemplu "CODEGRP1 + CODEGRP2")
+SetToYesIfGroupIsComputationOfOtherGroups=Setați la da dacă acest grup este calculat din alte grupuri
+EnterCalculationRuleIfPreviousFieldIsYes=Introdu regula de calcul dacă câmpul anterior a fost setat la Da. <br> De exemplu:<br> CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=Mai multe variante de limbă au fost găsite
 RemoveSpecialChars=Eliminați caracterele speciale
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtrul Regex pentru a curăța valoarea (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Flitru Regex pentru curăţarea valorii (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Nu sunt permise duplicate
 GDPRContact=Responsabilul cu protecția datelor (DPO, confidențialitatea datelor sau contact GDPR )
-GDPRContactDesc=Dacă stocați date despre companii/cetățeni europeni, puteți numi persoana de contact care este responsabilă cu Regulamentul general privind protecția datelor aici
+GDPRContactDesc=Dacă stocați date despre companii/cetățeni europeni, puteți numi persoana de contact care este responsabilă cu GDPR -  Regulamentul general privind protecția datelor aici
 HelpOnTooltip=Text de ajutor care să apară pe butonul de sugestii
 HelpOnTooltipDesc=Puneți un text sau o cheie de traducere aici pentru ca textul să apară într-o sugestie atunci când acest câmp apare într-un formular
-YouCanDeleteFileOnServerWith=Puteți șterge acest fișier pe server cu Linia de comandă: <br> %s
-ChartLoaded=Schema de cont încărcată
-SocialNetworkSetup=Configurarea modulelor Rețele sociale
-EnableFeatureFor=Activați caracteristici pentru <strong> %s </strong>
-VATIsUsedIsOff=Nota: Opțiunea de a utiliza impozitul pe vânzări sau TVA a fost setată la <strong>Oprit</strong> în meniu %s - %s, astfel încât impozitul pe vânzări sau TVA utilizate vor fi întotdeauna 0 pentru vânzări.
+YouCanDeleteFileOnServerWith=Puteți șterge acest fișier de pe server din linia de comandă: <br> %s
+ChartLoaded=Planul de conturi a fost încărcat
+SocialNetworkSetup=Configurarea modulului Rețele sociale
+EnableFeatureFor=Activați caracteristici pentru <strong>%s</strong>
+VATIsUsedIsOff=Nota: Opțiunea de a utiliza impozitul pe vânzări sau taxa TVA a fost setată la <strong>Oprit</strong> în meniul %s - %s, astfel încât impozitul pe vânzări sau taxa TVA utilizate vor fi întotdeauna 0 pentru vânzări.
 SwapSenderAndRecipientOnPDF=Interschimbă poziţia adreselor expeditorului şi destinatarului în documentele PDF generate 
-FeatureSupportedOnTextFieldsOnly=Avertizare, caracteristică acceptată numai pe câmpurile de text. De asemenea, trebuie să fie setat un parametru URL = create sau action = editare SAU numele paginii trebuie să se termine cu "new.php" pentru a declanșa această caracteristică.
-EmailCollector=Colector de e-mailuri
-EmailCollectorDescription=Adăugați o lucrare programată și o pagină de configurare pentru a scana în mod regulat căsuţele de e-mail (utilizând protocolul IMAP) și pentru a înregistra e-mailurile primite în aplicația dvs., la locul potrivit și/sau pentru a crea automat înregistrări (cum ar fi clienții).
-NewEmailCollector=Noul colector de e-mailuri
-EMailHost=Gazdă a serverului de email IMAP 
+FeatureSupportedOnTextFieldsOnly=Atenție, caracteristică acceptată numai pe câmpurile de text și pe listele combinate. De asemenea, trebuie setat un parametru URL action=create sau action=edit SAU numele paginii trebuie să se termine cu 'new.php' pentru a declanșa această caracteristică.
+EmailCollector=Colector de emailuri
+EmailCollectorDescription=Adăugați un job programat și o pagină de configurare pentru a scana în mod regulat căsuţele de email (utilizând protocolul IMAP) și pentru a înregistra emailurile primite în aplicația ta, la locul potrivit și/sau pentru a crea automat înregistrări (cum ar fi clienții).
+NewEmailCollector=Colector de emailuri nou
+EMailHost=Server gazdă de email IMAP 
 MailboxSourceDirectory=Directorul sursă al cutiei poștale
 MailboxTargetDirectory=Directorul ţintă al cutiei poștale 
 EmailcollectorOperations=Operațiuni de făcut de către colector
@@ -1998,45 +2011,45 @@ DateLastCollectResult=Data ultimei încercări de colectare
 DateLastcollectResultOk=Data ultimei colectări cu succes
 LastResult=Ultimul rezultat
 EmailCollectorConfirmCollectTitle=Confirmarea colectării de emailuri
-EmailCollectorConfirmCollect=Doriți să rulați acum colecția pentru acest colector?
+EmailCollectorConfirmCollect=Doriți să rulați acum colectarea pentru acest colector de email-uri?
 NoNewEmailToProcess=Niciun email de procesat (care sa se potriveasca cu filtrele)
-NothingProcessed=Nimic nu s-a făcut
-XEmailsDoneYActionsDone=%semail-uri calificate, %semail-uri procesate cu succes (pentru %s înregistrări/acţiuni efectuate)
-RecordEvent=Înregistrați evenimentul de e-mail
-CreateLeadAndThirdParty=Creați iniţiativă (și terț, dacă este necesar)
+NothingProcessed=Nu s-a făcut nimic
+XEmailsDoneYActionsDone=%semail-uri calificate, %s email-uri procesate cu succes (pentru %s înregistrări/acţiuni efectuate)
+RecordEvent=Înregistrați evenimentul de email
+CreateLeadAndThirdParty=Creați lead oportunitate (și terț, dacă este necesar)
 CreateTicketAndThirdParty=Creați tichet (și faceți legătura cu un terț dacă a fost încărcat de o operațiune anterioară)
 CodeLastResult=Ultimul cod rezultat
 NbOfEmailsInInbox=Numărul de email-uri în directorul sursă
 LoadThirdPartyFromName=Încărcați un terţ căutând în %s (doar încărcare)
 LoadThirdPartyFromNameOrCreate=Încărcați un terţ căutând în %s (creare dacă nu este găsit)
-WithDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail trimis de la Dolibarr
-WithoutDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail NU trimis de la Dolibarr
-WithDolTrackingIDInMsgId=Mesaj transmis de la Dolibarr
-WithoutDolTrackingIDInMsgId= Mesajul NU a fost trimis de la Dolibarr
+WithDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail trimis de la sistem
+WithoutDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail NU trimis din sistem
+WithDolTrackingIDInMsgId=Mesaj transmis din sistem
+WithoutDolTrackingIDInMsgId=Mesajul NU a fost trimis din acest sistem
 CreateCandidature=Creare aplicare la job
 FormatZip=Zip
-MainMenuCode=Codul de introducere a meniului (meniu principal)
+MainMenuCode=Codul de intrare a meniului (meniu principal)
 ECMAutoTree=Afișați arborele ECM automat
 OperationParamDesc=Definiți valorile de utilizat pentru obiectul acțiunii sau modul de extragere a valorilor. De exemplu: <br>objproperty1=SET:valoarea de setat<br>objproperty2=SET:o valoare de înlocuire a __objproperty1__<br>objproperty3=SETIFEMPTY:valoare folosită dacă objproperty3 nu este încă definită<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:Denumirea companiei mele este\\s([^\\s]*)<br><br>Folosește caracterul ; ca separator pentru a extrage sau seta mai multe proprietăți.
 OpeningHours=Program de lucru
 OpeningHoursDesc=Introduceți aici programul de lucru normal ale companiei dvs.
 ResourceSetup=Configurarea modulului Resurse 
 UseSearchToSelectResource=Utilizați un formular de căutare pentru a alege o resursă (mai degrabă decât o listă derulantă).
-DisabledResourceLinkUser=Dezactivați caracteristica care conectează o resursă la utilizatori
-DisabledResourceLinkContact=Dezactivați caracteristica care conectează o resursă la contacte
+DisabledResourceLinkUser=Dezactivați funcţia care conectează o resursă la utilizatori
+DisabledResourceLinkContact=Dezactivați funcţia care conectează o resursă la contacte
 EnableResourceUsedInEventCheck=Activează funcţionalitatea de verificare a resurselor în uz pe un eveniment
 ConfirmUnactivation=Confirmați resetarea modulului
-OnMobileOnly=Numai pe ecranul mic (smartphone)
+OnMobileOnly=Numai pe ecrane mici (smartphone)
 DisableProspectCustomerType=Dezactivați tipul terțului „Prospect + Client” (deci terțul trebuie să fie „Prospect” sau „Client”, dar nu poate fi ambele)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplificați interfața pentru o persoană nevăzătoare
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activați această opțiune dacă sunteți o persoană nevăzătoare sau dacă utilizați aplicația dintr-un browser de text precum Lynx sau Links.
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activați această opțiune dacă sunteți o persoană nevăzătoare sau dacă utilizați aplicația dintr-un browser text precum Lynx sau Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Schimbă culorile interfeţei pentru persoanele cu disabilităţi vizuale
 MAIN_OPTIMIZEFORCOLORBLINDDesc=Activează această opţiune dacă eşti o persoană cu probleme vizuale, în anumite cazuri interfaţa îşi va schimba paleta de culori pentru a mări contrastul. 
 Protanopia=Protanopie
 Deuteranopes=Deuteranopie
 Tritanopes=Tritanopie
-ThisValueCanOverwrittenOnUserLevel=Această valoare poate fi suprascrisă de fiecare utilizator de pe pagina sa de utilizator- tab '%s'
-DefaultCustomerType=Tipul terțului implicit pentru formularul de creare "Client nou" 
+ThisValueCanOverwrittenOnUserLevel=Această valoare poate fi suprascrisă de fiecare utilizator de pe pagina sa de utilizator - fişa '%s'
+DefaultCustomerType=Tipul implicit al terțului pentru formularul de creare "Client nou" 
 ABankAccountMustBeDefinedOnPaymentModeSetup=Notă: Contul bancar trebuie definit în modul pentru fiecare metodă de plată (Paypal, Stripe, ...) pentru a funcţiona.
 RootCategoryForProductsToSell=Categoria rădăcină pentru toate produsele de vânzare
 RootCategoryForProductsToSellDesc=Dacă este definit, numai produsele din această categorie sau din subcategoriile acesteia vor fi disponibile în Punctul de vânzare
@@ -2049,8 +2062,11 @@ UseDebugBar=Utilizează bara de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Numărul celor mai recente linii din jurnal care se vor păstra în consolă
 WarningValueHigherSlowsDramaticalyOutput=Avertizare, valorile foarte mari încetinesc dramatic viteza de afişare
 ModuleActivated=Modulul %s este activat şi încetineşte interfaţa
+ModuleActivatedWithTooHighLogLevel=Modulul %s este activat cu un nivel de jurnalizare prea ridicat (încearcă să utilizezi un nivel inferior pentru performanțe mai bune)
+ModuleSyslogActivatedButLevelNotTooVerbose=Modulul %s este activat și nivelul jurnalului (%s) este corect (nu prea detaliat) 
 IfYouAreOnAProductionSetThis=Dacă eşti într-un mediu de producţie, ar trebui să setezi această proprietate la %s.
 AntivirusEnabledOnUpload=Antivirusul este activat pentru fişierele încărcate
+SomeFilesOrDirInRootAreWritable=Unele fișiere sau directoare nu sunt în modul de citire exclusivă
 EXPORTS_SHARE_MODELS=Modele de export date sunt partajate cu toată lumea
 ExportSetup=Configurare modul Export
 ImportSetup=Configurare modul Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Trimiteţi un Ping anonim '+1' către serverul fundației Doli
 FeatureNotAvailableWithReceptionModule=Funcţionalitatea nu este disponibilă când modulul Recepţie este activat
 EmailTemplate=Şablon pentru email
 EMailsWillHaveMessageID=E-mailuri care conţin eticheta „Referințe” care se potrivesc cu această expresie
+PDF_SHOW_PROJECT=Afişează proiectul în document
+ShowProjectLabel=Etichetă proiect
 PDF_USE_ALSO_LANGUAGE_CODE=Dacă doriți să aveți unele texte duplicate în PDF-ul în 2 limbi diferite în același PDF generat, trebuie să setați aici această a doua limbă, astfel încât PDF-ul generat va conține 2 limbi diferite în aceeași pagină, cea aleasă la generarea PDF-ului și aceasta ( doar câteva șabloane PDF acceptă acest lucru). Păstrați gol pentru 1 limbă pentru fiecare PDF.
 FafaIconSocialNetworksDesc=Introduceți aici codul unei pictograme FontAwesome. Dacă nu știți ce este FontAwesome, puteți utiliza valoarea generică fa-address-book.
 FeatureNotAvailableWithReceptionModule=Funcţionalitatea nu este disponibilă când modulul Recepţie este activat
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Schimbarea acestei valori la %s este recomandată p
 DictionaryProductNature= Natură produs
 CountryIfSpecificToOneCountry=Țară (dacă este specifică unei anumite țări)
 YouMayFindSecurityAdviceHere=Aici puteți găsi recomandări de securitate
-ModuleActivatedMayExposeInformation=Acest modul poate expune date sensibile. Dacă nu aveți nevoie de el, dezactivați-l.
+ModuleActivatedMayExposeInformation=Această extensie PHP poate expune date sensibile. Dacă nu o foloseşti, dezactiveaz-o.
 ModuleActivatedDoNotUseInProduction=Un modul conceput pentru dezvoltare a fost activat. Nu-l activați într-un mediu de producție.
 CombinationsSeparator=Caracter separator pentru combinații de produse
 SeeLinkToOnlineDocumentation=Pentru exemple, consultați linkul către documentația online din meniul de sus
 SHOW_SUBPRODUCT_REF_IN_PDF=Dacă se folosește caracteristica "%s" a modulului <b>%s</b>, afișați detalii despre subprodusele unui kit în PDF.
-AskThisIDToYourBank=Contactați banca dvs. pentru a obține acest ID
+AskThisIDToYourBank=Contactați banca pentru a obține acest ID
+AdvancedModeOnly=Permisiunea este disponibilă numai în modul Permisiuni avansate
+ConfFileIsReadableOrWritableByAnyUsers=Fișierul conf poate fi citit sau scris de orice utilizator. Acordă permisiunea doar utilizatorului și grupului serverului web.
+MailToSendEventOrganization=Organizarea evenimentelor
+AGENDA_EVENT_DEFAULT_STATUS=Starea implicită a evenimentului când creaţi un eveniment din formular
+YouShouldDisablePHPFunctions=Ar trebui să dezactivezi funcțiile PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Cu excepția cazului în care trebuie să rulezi comenzi de sistem (pentru modulul Joburi programate sau pentru a rula linia de comandă externă Antivirus, de exemplu), trebuie să dezactivezi funcțiile PHP
+NoWritableFilesFoundIntoRootDir=Nu au fost găsite în directorul rădăcină fișiere sau directoare scriptibile ale programelor comune (OK) 
+RecommendedValueIs=Recomandat: %s
+ARestrictedPath=O cale restricţionată
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 0ca440a7b50..e923a31fa89 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=Banca
-MenuBankCash=Bănci | Casa
-MenuVariousPayment=Diverse plăţi
+Bank=Bancă
+MenuBankCash=Bănci | Caserie
+MenuVariousPayment=Plăţi diverse
 MenuNewVariousPayment=Plată nouă diversă
 BankName=Nume bancă
 FinancialAccount=Cont
@@ -9,124 +9,124 @@ BankAccount=Cont bancar
 BankAccounts=Conturi bancare
 BankAccountsAndGateways=Conturi bancare | Gateway-uri
 ShowAccount=Arată Cont
-AccountRef=Contul financiar ref
-AccountLabel=Contul financiar etichetă
-CashAccount=Cont Casa
-CashAccounts=Conturi Casa
+AccountRef=Ref cont financiar
+AccountLabel=Etichetă cont financiar
+CashAccount=Cont Casă
+CashAccounts=Conturi de Casă
 CurrentAccounts=Conturi curente
-SavingAccounts=Conturi  economii
-ErrorBankLabelAlreadyExists=Eticheta Contului financiar există deja
+SavingAccounts=Conturi de economii
+ErrorBankLabelAlreadyExists=Eticheta contului financiar există deja
 BankBalance=Sold
 BankBalanceBefore=Soldul înainte
 BankBalanceAfter=Soldul după
 BalanceMinimalAllowed=Sold minim permis
 BalanceMinimalDesired=Sold minim dorit
 InitialBankBalance=Sold Iniţial
-EndBankBalance=Sold Final
-CurrentBalance=Sold Curent
-FutureBalance=Sold Viitor
-ShowAllTimeBalance=Arată soldul de început
-AllTime=De la inceput
+EndBankBalance=Sold final
+CurrentBalance=Sold curent
+FutureBalance=Sold viitor
+ShowAllTimeBalance=Arată soldul iniţial
+AllTime=De la început
 Reconciliation=Reconciliere
-RIB=Număr Cont Bancă
+RIB=Număr Cont Bancar
 IBAN=Cod IBAN
-BIC=cod BIC/SWIFT 
-SwiftValid=BIC/SWIFT valabil
+BIC=Cod BIC/SWIFT 
+SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT invalid
-IbanValid=BAN valabil
-IbanNotValid=BAN invalid
-StandingOrders=Comenzi debit direct
-StandingOrder=Ordin de plată direct
+IbanValid=IBAN valid
+IbanNotValid=IBAN invalid
+StandingOrders=Ordine de debit direct
+StandingOrder=Ordin de plată debit direct
 PaymentByDirectDebit=Plată prin direct debit
 PaymentByBankTransfers=Plăţi prin transfer de credit
 PaymentByBankTransfer=Plată prin transfer credit
-AccountStatement=Extras Cont
+AccountStatement=Extras cont
 AccountStatementShort=Extras
 AccountStatements=Extrase Cont
 LastAccountStatements=Ultimele extrase de cont
 IOMonthlyReporting=Raport Lunar
 BankAccountDomiciliation=Adresa băncii
-BankAccountCountry=Tară Cont
-BankAccountOwner=Nume Proprietar Cont
-BankAccountOwnerAddress=Adresă Proprietar Cont
-RIBControlError=Verificarea corectitudinii a eșuat. Aceasta înseamnă că informațiile pentru acest număr de cont nu sunt complete sau sunt incorecte (bifați țara, numerele și IBAN).
+BankAccountCountry=Ţară Cont
+BankAccountOwner=Nume deţinător cont
+BankAccountOwnerAddress=Adresă deţinător Cont
+RIBControlError=Verificarea de integritate a eșuat. Aceasta înseamnă că informațiile pentru acest număr de cont nu sunt complete sau sunt incorecte (bifați țara, numerele și IBAN).
 CreateAccount=Crează cont
 NewBankAccount=Cont nou
 NewFinancialAccount=Cont financiar nou
 MenuNewFinancialAccount=Cont financiar nou
 EditFinancialAccount=Editare cont
-LabelBankCashAccount=Etichetă Banca sau Casa
+LabelBankCashAccount=Etichetă Bancă sau Casă
 AccountType=Tip Cont
-BankType0=Cont economii
+BankType0=Cont de economii
 BankType1=Cont curent sau card de credit
 BankType2=Cont numerar
 AccountsArea=CONTURI
-AccountCard=Fişa Cont
+AccountCard=Fişă Cont
 DeleteAccount=Şterge cont
 ConfirmDeleteAccount=Sunteţi sigur că doriţi să ştergeţi acest cont?
 Account=Cont
 BankTransactionByCategories=Înregistrări bancare pe categorii
-BankTransactionForCategory=Înregistrări bancare pentru categorii <b> %s </b>
-RemoveFromRubrique=Eliminaţi link-ul cu categoria
+BankTransactionForCategory=Înregistrări bancare pentru categoria <b>%s</b>
+RemoveFromRubrique=Elimină link-ul cu categoria
 RemoveFromRubriqueConfirm=Sigur doriți să eliminați legătura dintre intrare și categorie?
-ListBankTransactions=List de intrări bancare
-IdTransaction=ID-ul tranzacţiei
+ListBankTransactions=Listă de intrări bancare
+IdTransaction=ID tranzacţie
 BankTransactions=Intrări bancare
-BankTransaction=Intrare bancară
-ListTransactions=Lista înregistrări
-ListTransactionsByCategory=Lista înregistrări/categorii
+BankTransaction=Intrare tranzacţie bancară
+ListTransactions=Listă înregistrări
+ListTransactionsByCategory=Listă înregistrări/categorii
 TransactionsToConciliate=Intrări pentru reconciliere
 TransactionsToConciliateShort=De compensat
-Conciliable=Decontabil
-Conciliate=Deconteaza
-Conciliation=Conciliere
+Conciliable=Poate fi decontabil
+Conciliate=Decontare
+Conciliation=Reconciliere
 SaveStatementOnly=Salvați numai declarația
-ReconciliationLate=Reconciliere târzie
-IncludeClosedAccount=Includeţi conturile închise
-OnlyOpenedAccount=Numai conturile deschise 
-AccountToCredit=Cont de credit
-AccountToDebit=Cont de debit
+ReconciliationLate=Reconciliere întârziată
+IncludeClosedAccount=Include conturile închise
+OnlyOpenedAccount=Doar conturile deschise 
+AccountToCredit=Cont de creditat
+AccountToDebit=Cont de debitat
 DisableConciliation=Dezactivaţi reconcilierea pentru acest cont
 ConciliationDisabled=Reconciliere dezactivată
-LinkedToAConciliatedTransaction=Conectat la o intrare conciliată
+LinkedToAConciliatedTransaction=Asociat la o intrare conciliată
 StatusAccountOpened=Deschis
 StatusAccountClosed=Închis
-AccountIdShort=Cod
+AccountIdShort=Cont
 LineRecord=Tranzacţie
 AddBankRecord=Adaugă intrare
-AddBankRecordLong=Adăugați intrarea manual
+AddBankRecordLong=Adăugă intrare manuală
 Conciliated=Reconciliat
 ConciliatedBy=Decontat de
-DateConciliating=Data Decontare
+DateConciliating=Data decontare
 BankLineConciliated=Intrare compensată cu extras bancar
 Reconciled=Reconciliat
 NotReconciled=Nu este conciliat
-CustomerInvoicePayment=Plată Client
-SupplierInvoicePayment=Plata furnizorului
+CustomerInvoicePayment=Plată client
+SupplierInvoicePayment=Plată furnizor
 SubscriptionPayment=Plată cotizaţie
 WithdrawalPayment=Ordin de plată de debit
-SocialContributionPayment=Plata taxe sociale sau fiscale și tva
+SocialContributionPayment=Plată taxe sociale/fiscale și TVA
 BankTransfer=Transfer credit
 BankTransfers=Transferuri credit
 MenuBankInternalTransfer=Transfer intern
-TransferDesc=La un transfer de la un cont la altul, Dolibarr va scrie două înregistrări (un debit în contul sursă și un credit în contul țintă). Aceeași sumă (cu excepția semnului), eticheta și data va fi utilizată pentru această tranzacție)
+TransferDesc=La un transfer de la un cont la altul, sistemul va scrie două înregistrări (un debit în contul sursă și un credit în contul destinaţie). Aceeași sumă (cu excepția semnului), eticheta și data va fi utilizată pentru această tranzacție)
 TransferFrom=De la
 TransferTo=La
-TransferFromToDone=Un viramentr de la  <b>%s</b> la <b> %s </b>  de<b> %s</b> %s a fost creată.
+TransferFromToDone=Un transfer de la  <b>%s</b> la <b> %s </b>  de<b>%s</b> %s a fost înregistrat.
 CheckTransmitter=Emiţător
-ValidateCheckReceipt=Validați această chitanță de confirmare?
-ConfirmValidateCheckReceipt=Sigur doriți să validați această chitanță de verificare, nu va fi posibilă nicio modificare după ce aceasta va fi efectuată?
-DeleteCheckReceipt=Ștergeți această chitanță de confirmare? 
-ConfirmDeleteCheckReceipt=Sigur stergeți această chitanță de confirmare? 
+ValidateCheckReceipt=Validați această chitanță cec?
+ConfirmValidateCheckReceipt=Sigur doriți să validați această chitanță cec, nu va mai  fi posibilă nicio modificare după ce aceasta va fi efectuată?
+DeleteCheckReceipt=Ștergeți această chitanță cec? 
+ConfirmDeleteCheckReceipt=Sigur stergeți această chitanță cec?
 BankChecks=Cecuri bancare
 BankChecksToReceipt=CEC-uri spre încasare
 BankChecksToReceiptShort=CEC-uri spre încasare
 ShowCheckReceipt=Arată borderou de cecuri remise
-NumberOfCheques=Nr. cecului
-DeleteTransaction=Ștergeți intrarea
+NumberOfCheques=Nr. cecuri
+DeleteTransaction=Șterge intrare
 ConfirmDeleteTransaction=Sigur doriți să ștergeți această intrare?
 ThisWillAlsoDeleteBankRecord=Aceasta va șterge, de asemenea, intrarea bancară generată
-BankMovements=Mişcările
+BankMovements=Mişcări
 PlannedTransactions=Intrări planificate
 Graph=Grafice
 ExportDataset_banque_1=Înregistrări bancare și extras de cont
@@ -135,49 +135,50 @@ TransactionOnTheOtherAccount=Tranzacţie pe de alt cont
 PaymentNumberUpdateSucceeded=Număr plată actualizat cu succes
 PaymentNumberUpdateFailed=Numărul plaţii nu a putut fi actualizat
 PaymentDateUpdateSucceeded=Data plăţii actualizată cu succes
-PaymentDateUpdateFailed=Data Plata  nu a putut fi actualizată
+PaymentDateUpdateFailed=Data plăţii nu a putut fi actualizată
 Transactions=Tranzacţii
 BankTransactionLine=Intrare bancară
 AllAccounts=Toate conturile bancare și de numerar
-BackToAccount=Inapoi la cont
+BackToAccount=Înapoi la cont
 ShowAllAccounts=Arată pentru toate conturile
 FutureTransaction=Tranzacție viitoare. Imposibil de reconciliat.
-SelectChequeTransactionAndGenerate=Selectați / filtrați cecurile pentru a include în chitanța de depozit de cec și faceți clic pe "Creați"
-InputReceiptNumber=Alegeți extrasul de cont privitor la conciliere. Folosiţi o valoare numerică sortabile : YYYYMM sau YYYYMMDD
-EventualyAddCategory=În cele din urmă, precizează o categorie în care să clasezi înregistrările
-ToConciliate=Să se acorde?
-ThenCheckLinesAndConciliate=Apoi, verifică liniile prezente în extrasul de bancă şi click
-DefaultRIB=IBAN Implicit
-AllRIB=Tot BAN
-LabelRIB=Etichetă BAN
-NoBANRecord=Nicio înregistrare BAN
-DeleteARib=Ștergeți înregistrarea BAN
-ConfirmDeleteRib=Sigur doriți să ștergeți această înregistrare BAN?
+SelectChequeTransactionAndGenerate=Selectează/filtrează cecurile de inclus în chitanța de depozit de cec și fă clic pe "Creare"
+InputReceiptNumber=Alegeți extrasul de cont privitor la conciliere. Folosiţi o valoare numerică sortabilă : YYYYMM sau YYYYMMDD
+EventualyAddCategory=În cele din urmă, specifică o categorie în care să clasezi înregistrările
+ToConciliate=Să se deconteze?
+ThenCheckLinesAndConciliate=Apoi, verifică liniile prezente în extrasul bancar şi dă click
+DefaultRIB=IBAN implicit
+AllRIB=Toate IBAN-urile
+LabelRIB=Etichetă IBAN
+NoBANRecord=Nicio înregistrare IBAN
+DeleteARib=Șterge înregistrare IBAN
+ConfirmDeleteRib=Sigur doriți să ștergeți această înregistrare IBAN?
 RejectCheck=Cec returnat
 ConfirmRejectCheck=Sigur doriți să marcați acest cec ca respins?
-RejectCheckDate=data cecului ce a fost returnat
+RejectCheckDate=Data la care cecul a fost returnat
 CheckRejected=Cec returnat
 CheckRejectedAndInvoicesReopened=Verificare facturi storno şi facturi re-deschise
-BankAccountModelModule=Șabloane de documente pentru conturi bancare
-DocumentModelSepaMandate=Modelul mandatului SEPA. Utile pentru țările europene numai în CEE.
-DocumentModelBan=Șablon pentru a imprima o pagină cu informații despre BAN.
+BankAccountModelModule=Șabloane documente pentru conturi bancare
+DocumentModelSepaMandate=Şablon mandat SEPA. Util doar pentru țările din spaţiul CEE.
+DocumentModelBan=Șablon pagină tipăribilă cu informații despre IBAN.
 NewVariousPayment=Plată diversă nouă
 VariousPayment=Plată diversă
-VariousPayments=Diverse plăţi
+VariousPayments=Plăţi diverse
 ShowVariousPayment=Afişare plăţi diverse
 AddVariousPayment=Adaugă plată diversă
 VariousPaymentId=ID plată diversă
 VariousPaymentLabel=Etichetă plată diversă
 ConfirmCloneVariousPayment=Confirmă clona unei plăţi diverse
 SEPAMandate=Mandat SEPA 
-YourSEPAMandate=Mandatul dvs. SEPA  
-FindYourSEPAMandate=Acesta este mandatul dvs. SEPA pentru a autoriza compania noastră să efectueze un ordin de debitare directă către banca dvs. Reveniți semnat (scanarea documentului semnat) sau trimiteți-l prin poștă la
+YourSEPAMandate=Mandatul tău SEPA  
+FindYourSEPAMandate=Acesta este mandatul tău SEPA pentru a autoriza compania noastră să efectueze un ordin de debitare directă către banca ta. Returnaţi-l semnat (document scanat semnat) sau trimiteți-l prin poștă la
 AutoReportLastAccountStatement=Completați automat câmpul "numărul extrasului de cont" cu ultimul număr al declarației atunci când efectuați reconcilierea
 CashControl=Control POS casierie
-NewCashFence=Închidere nouă de casierie
+NewCashFence=Deschidere sau închidere nouă a casei de numerar
 BankColorizeMovement=Colorează tranzacţiile
 BankColorizeMovementDesc=Dacă această funcţie este activată, poţi alege o culoare de fundal personalizată pentru tranzacţiile de debit sau de credit
 BankColorizeMovementName1=Culoarea de fundal pentru tranzacţiile de debit
 BankColorizeMovementName2=Culoarea de fundal pentru tranzacţiile de credit
-IfYouDontReconcileDisableProperty= Dacă nu faceți reconcilieri bancare pe unele conturi bancare, dezactivați proprietatea "%s" de pe ele pentru a elimina acest avertisment. 
+IfYouDontReconcileDisableProperty= Dacă nu faceți decontări bancare pe unele conturi bancare, dezactivați proprietatea "%s" de pe ele pentru a elimina acest avertisment
 NoBankAccountDefined=Nu a fost definit niciun cont bancar
+NoRecordFoundIBankcAccount=Nu s-a găsit nicio înregistrare în contul bancar. În mod obișnuit, acest lucru se întâmplă atunci când o înregistrare a fost ștearsă manual din lista tranzacțiilor din contul bancar (de exemplu, în timpul decontării contului bancar). Un alt motiv este că plata a fost înregistrată când modulul "%s" a fost dezactivat.
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 074863b0148..c06f7e92184 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -5,30 +5,30 @@ BillsCustomers=Facturi Clienţi
 BillsCustomer=Factură Client
 BillsSuppliers=Facturi Furnizori
 BillsCustomersUnpaid=Facturi clienţi neîncasate
-BillsCustomersUnpaidForCompany=Facturi clienți neplătite pentru%s
-BillsSuppliersUnpaid=Facturi furnizor neplătite 
-BillsSuppliersUnpaidForCompany=Facturi furnizor neplătite pentru %s
+BillsCustomersUnpaidForCompany=Facturi clienți neîncasate pentru%s
+BillsSuppliersUnpaid=Facturi furnizor neachitate
+BillsSuppliersUnpaidForCompany=Facturi furnizor neachitate pentru %s
 BillsLate=Plăţi întârziate
 BillsStatistics=Statistici Facturi Clienţi
 BillsStatisticsSuppliers=Statistici facturi furnizor
 DisabledBecauseDispatchedInBookkeeping=Dezactivat deoarece factura a fost expediată în contabilitate
 DisabledBecauseNotLastInvoice=Dezactivat deoarece factura nu poate fi ștearsă. Unele facturi au fost înregistrate după aceasta și vor crea lipsuri în incrementare.
-DisabledBecauseNotErasable=Dezactivat pentru ca nu poate fi sters
+DisabledBecauseNotErasable=Dezactivat pentru că nu poate fi şters
 InvoiceStandard=Factură Standard
 InvoiceStandardAsk=Factură Standard
 InvoiceStandardDesc=Acest tip de factură este factura comună.
-InvoiceDeposit=Factura de plată în avans
-InvoiceDepositAsk=Factura de plată în avans
+InvoiceDeposit=Factură de plată în avans
+InvoiceDepositAsk=Factură de plată în avans
 InvoiceDepositDesc=Acest tip de factură se face atunci când a fost primită o factură de plată în avans
 InvoiceProForma=Factură Proformă
 InvoiceProFormaAsk=Factură Proformă
 InvoiceProFormaDesc=<b>Factura Proformă </b> este o imagine a adevăratei facturi, dar nu are nici o valoare contabilă.
-InvoiceReplacement=Factură  de Înlocuire
-InvoiceReplacementAsk=Factură  de Înlocuire  a altei  facturi
+InvoiceReplacement=Factură de înlocuire
+InvoiceReplacementAsk=Factură de înlocuire a altei facturi
 InvoiceReplacementDesc=<b>Factura de înlocuire</b> este folosită pentru a înlocui o factură care nu a fost achitată.<br><br>Notă: Se pot înlocui numai facturile neachitate. Dacă factura pe care o înlocuiți nu este încă închisă, aceasta va fi închisă automat la "Abandonată". 
-InvoiceAvoir=Nota de credit
+InvoiceAvoir=Notă de credit
 InvoiceAvoirAsk=Nota de credit pentru a corecta factura
-InvoiceAvoirDesc=<b> Nota de credit </b> este o factură negativă utilizată pentru a corecta faptul că o factură arată o sumă care diferă de suma plătită efectiv (de exemplu, clientul a plătit prea mult din greșeală sau nu va plăti suma completă din momentul returnării unor produse).
+InvoiceAvoirDesc=<b>Nota de credit</b> este o factură negativă utilizată pentru a corecta faptul că o factură arată o sumă care diferă de suma plătită efectiv (de exemplu, clientul a plătit prea mult din greșeală sau nu va plăti suma completă din moment ce a returnat o parte din produse).
 invoiceAvoirWithLines=Creați Nota de credit cu liniile din factura sursă
 invoiceAvoirWithPaymentRestAmount=Creați  Nota de credit cu valoarea neachitată a facturii sursă
 invoiceAvoirLineWithPaymentRestAmount=Notă de credit pentru valoarea rămasă neplătită
@@ -43,7 +43,7 @@ ConsumedBy=Consumat de
 NotConsumed=Neconsumat
 NoReplacableInvoice=Nu există facturi înlocuibile
 NoInvoiceToCorrect=Nicio factură de corectat
-InvoiceHasAvoir=A fost sursa una sau mai multor note de credit
+InvoiceHasAvoir=A fost sursa uneia sau mai multor note de credit
 CardBill=Fişă Factură
 PredefinedInvoices=Facturi Predefinite
 Invoice=Factură
@@ -52,17 +52,18 @@ Invoices=Facturi
 InvoiceLine=Linie Factură
 InvoiceCustomer=Factură Client
 CustomerInvoice=Factură Client
-CustomersInvoices=Facturi Clienţi
-SupplierInvoice=Factura furnizor
-SuppliersInvoices=Facturi Furnizori
-SupplierBill=Factura furnizor
-SupplierBills=Facturi Furnizori
+CustomersInvoices=Facturi clienţi
+SupplierInvoice=Factură furnizor
+SuppliersInvoices=Facturi furnizori
+SupplierInvoiceLines=Linii de factură furnizor
+SupplierBill=Factură furnizor
+SupplierBills=Facturi furnizori
 Payment=Plată
 PaymentBack=Rambursare
 CustomerInvoicePaymentBack=Rambursare
 Payments=Plăţi
 PaymentsBack=Rambursări
-paymentInInvoiceCurrency=in moneda facturii
+paymentInInvoiceCurrency=în moneda facturii
 PaidBack=Restituit
 DeletePayment=Ştergere plată
 ConfirmDeletePayment=Sunteţi sigur că doriţi să ştergeţi această plată?
@@ -70,10 +71,10 @@ ConfirmConvertToReduc=Vrei să converteşti această %s într-un credit disponib
 ConfirmConvertToReduc2=Suma care va fi economisită cumulând toate reducerile poate fi utilizată ca reducere pentru o factură curentă sau viitoare pentru acest client.
 ConfirmConvertToReducSupplier=Vrei să converteşti această %s într-un credit disponibil?
 ConfirmConvertToReducSupplier2=Suma care va fi economisită cumulând toate reducerile și care poate fi folosită ca reducere pentru o factură curentă sau viitoare pentru acest furnizor.
-SupplierPayments=Plățile furnizorului
+SupplierPayments=Plăți furnizor
 ReceivedPayments=Încasări primite
-ReceivedCustomersPayments=Încasări  Clienţi
-PayedSuppliersPayments=Plăţi plătite furnizorilor
+ReceivedCustomersPayments=Încasări de la clienţi
+PayedSuppliersPayments=Plăţi către furnizori
 ReceivedCustomersPaymentsToValid=Încasări  Clienţi  de validat
 PaymentsReportsForYear=Rapoarte Plăţi pentru %s
 PaymentsReports=Rapoarte Plăţi
@@ -81,25 +82,27 @@ PaymentsAlreadyDone=Plăţi deja efectuate
 PaymentsBackAlreadyDone=Rambursări efectuate deja
 PaymentRule=Mod de Plată
 PaymentMode=Tipul plăţii
-PaymentTypeDC=Card de debit/de credit
+DefaultPaymentMode=Tip de plată implicit
+DefaultBankAccount=Cont bancar implicit
+PaymentTypeDC=Card de debit/credit
 PaymentTypePP=PayPal
 IdPaymentMode=Tipul plăţii (id)
 CodePaymentMode=Tipul plăţii (cod)
-LabelPaymentMode=Tipul plăţii (etichetă)
+LabelPaymentMode=Tipul plăţii (denumire)
 PaymentModeShort=Tipul plăţii
-PaymentTerm=Termenul plăţii
+PaymentTerm=Termen de plată
 PaymentConditions=Termeni de plată
 PaymentConditionsShort=Termeni de plată
 PaymentAmount=Sumă de plată
 PaymentHigherThanReminderToPay=Plată mai mare decât restul de  plată
 HelpPaymentHigherThanReminderToPay=Atenție, suma de plată a uneia sau mai multor facturi este mai mare decât suma rămasă neachitată. <br> Modificați intrarea dvs., în caz contrar confirmați şi luați în considerare crearea unei note de credit pentru suma în exces primită pentru fiecare sumă primită în plus.
-HelpPaymentHigherThanReminderToPaySupplier=Atenție, suma de plată a uneia sau mai multor facturi este mai mare decât suma rămasă neachitată. <br>  Modificați intrarea dvs., în caz contrar confirmați şi luați în considerare crearea unei note de credit pentru suma în exces primită pentru fiecare sumă plătită în plus.
+HelpPaymentHigherThanReminderToPaySupplier=Atenție, suma de plată a uneia sau mai multor facturi este mai mare decât suma rămasă neachitată. <br>  Modifică intrarea, în caz contrar confirmă şi ia în considerare crearea unei note de credit pentru suma în exces primită pentru fiecare factură cu excendent.
 ClassifyPaid=Clasează "Platită"
-ClassifyUnPaid=Clasează "Neplătită"
-ClassifyPaidPartially=Clasează "Platită Parţial"
-ClassifyCanceled=Clasează "Abandonată"
-ClassifyClosed=Clasează "Închisă"
-ClassifyUnBilled=Clasează Nefacturat
+ClassifyUnPaid=Clasează ca 'Neplătită'
+ClassifyPaidPartially=Clasează ca 'Plătită parţial'
+ClassifyCanceled=Clasează ca 'Abandonată'
+ClassifyClosed=Clasează ca 'Închisă'
+ClassifyUnBilled=Clasează ca 'Nefacturată'
 CreateBill=Crează  Factura
 CreateCreditNote=Creare Notă de credit
 AddBill=Crează  Factura sau Notă de Credit
@@ -108,17 +111,17 @@ DeleteBill=Ştergere factura
 SearchACustomerInvoice=Caută o factură client
 SearchASupplierInvoice=Căutați o factură furnizor
 CancelBill=Anulează o factură
-SendRemindByMail=Trimite memento  prin e-mail
-DoPayment=Introduce o plată
-DoPaymentBack=Introduceți rambursarea
+SendRemindByMail=Trimite reminder pe email
+DoPayment=Introdu o plată
+DoPaymentBack=Introdu rambursarea
 ConvertToReduc=Marchează ca credit disponibil
-ConvertExcessReceivedToReduc=Transformați excesul primit în credit disponibil
-ConvertExcessPaidToReduc=Conversia excesului plătit în reducerea disponibilă
+ConvertExcessReceivedToReduc=Transformă excedentul încasat în credit disponibil
+ConvertExcessPaidToReduc=Converteşte excendentul plătit în reducere disponibilă
 EnterPaymentReceivedFromCustomer=Introduceţi o încasare de la client
 EnterPaymentDueToCustomer=Introduceţi o plată restituire pentru client
 DisabledBecauseRemainderToPayIsZero=Dezactivată  pentru că restul de plată este zero
 PriceBase=Preţul de bază
-BillStatus=Status Factura
+BillStatus=Status factură
 StatusOfGeneratedInvoices=Status factură generată
 BillStatusDraft=Schiţă (de validat)
 BillStatusPaid=Plătite
@@ -128,11 +131,11 @@ BillStatusCanceled=Abandonate
 BillStatusValidated=Validate (de plată)
 BillStatusStarted=Începută
 BillStatusNotPaid=Neplătită
-BillStatusNotRefunded=Nerabursabil
+BillStatusNotRefunded=Nerambursabil
 BillStatusClosedUnpaid=Închisă (neplătită)
 BillStatusClosedPaidPartially=Platite (parţial)
 BillShortStatusDraft=Schiţă
-BillShortStatusPaid=Platite
+BillShortStatusPaid=Plătite
 BillShortStatusPaidBackOrConverted=Rambursată sau convertită
 Refunded=Rambursată
 BillShortStatusConverted=Plătite
@@ -140,11 +143,11 @@ BillShortStatusCanceled=Abandonată
 BillShortStatusValidated=Validată
 BillShortStatusStarted=Începută
 BillShortStatusNotPaid=Neplatită
-BillShortStatusNotRefunded=Nerabursabil 
+BillShortStatusNotRefunded=Nerambursabil 
 BillShortStatusClosedUnpaid=Închisă
 BillShortStatusClosedPaidPartially=Platită (parţial)
 PaymentStatusToValidShort=De validat
-ErrorVATIntraNotConfigured=Codul TVA intracomunitar nu a fost încă definit
+ErrorVATIntraNotConfigured=Codul de TVA intracomunitar nu a fost încă definit
 ErrorNoPaiementModeConfigured=Nu a fost definit niciun tip de plată implicit. Accesați modul de configurare a modulelor de facturare pentru a remedia această problemă.
 ErrorCreateBankAccount=Creați un cont bancar, apoi mergeți la panoul de configurare din modulul factură pentru a defini tipurile de plăți
 ErrorBillNotFound=Factura %s nu există
@@ -153,39 +156,39 @@ ErrorDiscountAlreadyUsed=Eroare, reducerea a fost deja utilizată
 ErrorInvoiceAvoirMustBeNegative=Eroare, factura de corecţie trebuie să aibă o valoare negativă
 ErrorInvoiceOfThisTypeMustBePositive=Eroare, acets tip de factură trebuie să aibă valori pozitive(sau nule) fară TVA
 ErrorCantCancelIfReplacementInvoiceNotValidated=Eroare, nu se poate anula o factură care a fost înlocuită cu o altă factură, şi care este încă schiţă
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Această parte sau alta estedeja utilizată, astfel încât seria de reduceri nu poate fi eliminată.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Această parte sau alta este deja utilizată, astfel încât seria de reduceri nu poate fi eliminată.
 BillFrom=De la
 BillTo=La
-ActionsOnBill=Evenimente pe factura
+ActionsOnBill=Evenimente pe factură
 RecurringInvoiceTemplate=Șablon / factură recurentă
 NoQualifiedRecurringInvoiceTemplateFound=Nu există un model de factură potrivit pentru generare.
 FoundXQualifiedRecurringInvoiceTemplate=Au fost găsite %s modele de facturi recurente potrivite pentru generare.
 NotARecurringInvoiceTemplate=Nu este un model de factură recurentă.
 NewBill=Factură nouă
-LastBills=Ultimele%s facturi
-LatestTemplateInvoices=Ultimele%s șabloane factură
-LatestCustomerTemplateInvoices=Ultimele%s șabloane factură client
-LatestSupplierTemplateInvoices=Ultimele%s șabloane factură furnizor
-LastCustomersBills=Ultimele%s facturi client
-LastSuppliersBills=Ultimele%s facturi furnizor
+LastBills=Ultimele %s facturi
+LatestTemplateInvoices=Ultimele %sșabloane factură
+LatestCustomerTemplateInvoices=Ultimele %s șabloane factură client
+LatestSupplierTemplateInvoices=Ultimele %s șabloane factură furnizor
+LastCustomersBills=Ultimele %s facturi client
+LastSuppliersBills=Ultimele %s facturi furnizor
 AllBills=Toate facturile
-AllCustomerTemplateInvoices=Toate șabloanele facturilor
+AllCustomerTemplateInvoices=Toate șabloanele de factură
 OtherBills=Alte facturi
 DraftBills=Facturi schiţă
 CustomersDraftInvoices=Facturi client schiţă
 SuppliersDraftInvoices=Facturi furnizor schiţă
 Unpaid=Neachitate
-ErrorNoPaymentDefined=Eroare Nu este definită plata 
+ErrorNoPaymentDefined=Eroare Nu este definită nicio plată 
 ConfirmDeleteBill=Sunteţi sigur că doriţi să ştergeţi această factură?
-ConfirmValidateBill=Sigur doriţi să validaţi această factură cu referinţa<b>%s</b>?
-ConfirmUnvalidateBill=Sigur doriţi să schimbaţi  factura  <b>%s</b>la statusul de schiţă ?
-ConfirmClassifyPaidBill=Sigur doriţi să schimbaţi  factura  <b>%s</b>la statusul plătită ?
-ConfirmCancelBill=Sigur doriţi să anulaţi factura <b> %s</b> ?
-ConfirmCancelBillQuestion=De ce doriți clasificarea acestei facturi ca "abandonată"?
-ConfirmClassifyPaidPartially=Sigur doriţi să schimbaţi  factura  <b>%s</b>la statusul plătită ?
-ConfirmClassifyPaidPartiallyQuestion=Acestă factură nu a fost plătită complet. Care este motivul închiderii acestei facturi?
+ConfirmValidateBill=Sigur doriţi să validaţi factura cu referinţa <b>%s</b>?
+ConfirmUnvalidateBill=Sigur doriţi să schimbaţi factura <b>%s</b> la statusul de schiţă?
+ConfirmClassifyPaidBill=Sigur doriţi să schimbaţi factura <b>%s</b> la statusul Plătită ?
+ConfirmCancelBill=Sigur doriţi să anulaţi factura <b>%s</b> ?
+ConfirmCancelBillQuestion=De ce doriți clasificarea acestei facturi ca 'abandonată'?
+ConfirmClassifyPaidPartially=Sigur doriţi să schimbaţi  factura <b>%s</b> la statusul Plătită ?
+ConfirmClassifyPaidPartiallyQuestion=Acestă factură nu a fost achitată complet. Care este motivul închiderii acestei facturi?
 ConfirmClassifyPaidPartiallyReasonAvoir=Rămasă neplătită <b> (%s %s) </b> este o reducere acordată deoarece plata a fost făcută înainte de termen. Regularizez TVA-ul cu notă de credit.
-ConfirmClassifyPaidPartiallyReasonDiscount=Rămâne neplătit <b> (%s %s) </b> este o reducere acordată pentru că plata a fost făcută înainte de termen.
+ConfirmClassifyPaidPartiallyReasonDiscount=Rest neachitat <b> (%s %s) </b> este o reducere acordată pentru că plata a fost făcută înainte de termen.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restul de plată <b>( %s %s)</b> este un discount acordat la plată, pentru că a fost făcută înainte de termen. Accept piarderea TVA-ului pentru această reducere.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Restul de plată <b>( %s %s)</b> este un discount acordat la plată, pentru că a fost făcută înainte de termen. Recuperez TVA-ul de pe această reducere fără o notă de credit.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Client rău platnic
@@ -194,20 +197,20 @@ ConfirmClassifyPaidPartiallyReasonOther=Creanţă  abandonată din alte motive
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Această alegere este posibilă dacă factura dvs. a fost furnizată cu comentarii adecvate. (Exemplu «Numai impozitul care corespunde prețului plătit efectiv dă dreptul la deducere»)
 ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=În unele țări, această alegere ar putea fi posibilă numai dacă factura conține note corecte.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Utilizaţi această opţiune dacă toate celelalte nu se potrivesc
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un  <b> client rău</b> este un client care refuză să-și plătească datoria.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b>client rău</b> este un client care refuză să-și achite datoria.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Această opţiune este utilizată atunci când plata nu este completă, deoarece unele  produse au fost returnate
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilizați această opțiune dacă toate celelalte nu sunt potrivite, de exemplu în următoarea situație: <br> - plata nu este completă deoarece unele produse au fost returnate <br> - suma revendicată prea importantă deoarece o reducere a fost uitată <br> În toate cazurile, suma depășită trebuie corectată în sistemul contabil prin crearea unei note de credit.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilizați această opțiune dacă toate celelalte nu sunt potrivite, de exemplu în următoarea situație: <br> - plata nu este completă deoarece unele produse au fost returnate <br> - suma revendicată este prea importantă deoarece o reducere a fost uitată <br> În toate cazurile, suma depășită trebuie corectată în sistemul contabil prin crearea unei note de credit.
 ConfirmClassifyAbandonReasonOther=Altele
 ConfirmClassifyAbandonReasonOtherDesc=Această opţiune va fi folosită în toate celelalte cazuri. De exemplu,  dacă ai dori să creezi o factura de inlocuire a facturii.
 ConfirmCustomerPayment=Confirmaţi introducerea plăţii pentru <b>%s</b> %s ?
 ConfirmSupplierPayment=Confirmaţi introducerea plăţii pentru <b>%s</b> %s ?
-ConfirmValidatePayment=Sunteți sigur că doriți validarea acestei plăti? Nici o schimbare nu mai este posibilă după validarea plății.
+ConfirmValidatePayment=Sunteți sigur că doriți validarea acestei plăti? Nicio modificare nu mai este posibilă după validarea plății.
 ValidateBill=Validează factura
 UnvalidateBill=Devalidează factura
-NumberOfBills=Numar de facturi
+NumberOfBills=Nr. de facturi
 NumberOfBillsByMonth=Nr. de facturi pe lună
 AmountOfBills=Valoare facturi
-AmountOfBillsHT=Suma facturilor (fără impozit)
+AmountOfBillsHT=Suma facturilor (fără taxe)
 AmountOfBillsByMonthHT=Valoarea facturilor pe luni (fără tva)
 UseSituationInvoices=Permite utilizare factură centralizatoare
 UseSituationInvoicesCreditNote=Permite utilizare factură centralizatoare
@@ -252,16 +255,16 @@ SendReminderBillByMail=Trimite memento  prin e-mail
 RelatedCommercialProposals=Oferte comerciale asociate
 RelatedRecurringCustomerInvoices=Facturi recurente client asociate
 MenuToValid=De validat
-DateMaxPayment=Plata datorată la
+DateMaxPayment=Dată scadenţă la
 DateInvoice=Data facturării
-DatePointOfTax=Impozitare
+DatePointOfTax=Impozitare taxare
 NoInvoice=Nicio  factură
 ClassifyBill=Clasează factura
-SupplierBillsToPay=Facturi neplătite pentru furnizor
+SupplierBillsToPay=Facturi furnizor neplătite
 CustomerBillsUnpaid=Facturi clienţi neîncasate
 NonPercuRecuperable=Nerecuperabilă
-SetConditions=Setați termenii de plată
-SetMode=Setați tipul de plată
+SetConditions=Setare termeni de plată
+SetMode=Setare tip de plată
 SetRevenuStamp=Timbru fiscal
 Billed=Facturat
 RecurringInvoices=Facturi recurente
@@ -272,9 +275,9 @@ Repeatables=Modele
 ChangeIntoRepeatableInvoice=Converteşte in model factură
 CreateRepeatableInvoice=Crează model factură
 CreateFromRepeatableInvoice=Crează din model factură 
-CustomersInvoicesAndInvoiceLines=Facturi ale clienților si detalii ale facturilor
+CustomersInvoicesAndInvoiceLines=Facturi clienți şi detalii
 CustomersInvoicesAndPayments=Facturi Clienţi  şi plăţi
-ExportDataset_invoice_1=Facturi ale clienților si detalii ale facturilor
+ExportDataset_invoice_1=Facturi clienți şi detalii
 ExportDataset_invoice_2=Facturi Clienţi  şi plăţi
 ProformaBill=Factură Proforma :
 Reduction=Reducere
@@ -313,10 +316,10 @@ DiscountOfferedBy=Acordate de
 DiscountStillRemaining=Reduceri sau credite disponibile
 DiscountAlreadyCounted=Reduceri sau credite deja consumate
 CustomerDiscounts=Reducere pentru clienți
-SupplierDiscounts=Reducerea furnizorilor
+SupplierDiscounts=Reduceri furnizori
 BillAddress=Adresa de facturare
 HelpEscompte=Această reducere este o reducere acordată clientului, deoarece plata a fost efectuată înainte de termen.
-HelpAbandonBadCustomer=Această sumă a fost abandonată (clientul a declarat că este un client rău) și este considerată o pierdere excepțională.
+HelpAbandonBadCustomer=Această sumă a fost abandonată (clientul a fost declarat ca rău-platnic) și este considerată o pierdere excepțională.
 HelpAbandonOther=Această sumă a fost abandonată deoarece a fost o eroare (client greșit sau factură înlocuită de alta, de exemplu)
 IdSocialContribution=Id Plata taxa sociala / fiscala 
 PaymentId=ID Plată
@@ -337,10 +340,10 @@ WatermarkOnDraftBill=Filigran pe facturile schiţă  (nimic dacă gol)
 InvoiceNotChecked=Nicio factură selectată
 ConfirmCloneInvoice=Sigur doriţi să clonaţi această factură <b> %s</b>?
 DisabledBecauseReplacedInvoice=Acţiunea dezactivată, pentru că factura a fost înlocuită
-DescTaxAndDividendsArea=Această zonă prezintă un rezumat al tuturor plăților efectuate pentru cheltuieli speciale. Numai înregistrările cu plăți în cursul anului fix sunt incluse aici.
-NbOfPayments=Numărul plății
+DescTaxAndDividendsArea=Această zonă prezintă un rezumat al tuturor plăților efectuate pentru cheltuieli speciale. Numai înregistrările cu plăți în cursul anului sunt incluse aici.
+NbOfPayments=Nr. de plăți
 SplitDiscount=Imparte reducerea în două
-ConfirmSplitDiscount=Sigur doriți să împărțiți această reducere la două reduceri mai mici de <b> %s </b> %s?
+ConfirmSplitDiscount=Sigur doriți să împărțiți această reducere de <b>%s</b> %s în două reduceri mai mici?
 TypeAmountOfEachNewDiscount=Suma de intrare pentru fiecare din cele două părți:
 TotalOfTwoDiscountMustEqualsOriginal=Suma celor două noi reduceri trebuie să fie egală cu suma discountului inițial.
 ConfirmRemoveDiscount=Sigur doriţi să eliminaţi această reducere?
@@ -366,23 +369,24 @@ FrequencyPer_d=La fiecare %s zile
 FrequencyPer_m=La fiecare %s luni
 FrequencyPer_y=La fiecare %s ani
 FrequencyUnit=Unitate de frecvență
-toolTipFrequency=Exemple: <br> <b> Configurează 7, Zi </b>: da o nouă factură la fiecare 7 zile <br> <b> Configurează 3, Lună </b>: da o nouă factură la fiecare 3 luni
+toolTipFrequency=Exemple: <br><b>Setează 7, Zi</b>: generează o nouă factură la fiecare 7 zile<br><b>Setează 3, Lună</b>: generează o nouă factură la fiecare 3 luni
 NextDateToExecution=Data pentru următoarea generare a facturii
-NextDateToExecutionShort=Data următoarei gen.
+NextDateToExecutionShort=Data următoarei generări.
 DateLastGeneration=Ultima dată de generare
-DateLastGenerationShort=Data ultimei gen.
-MaxPeriodNumber=Numărul maxim de generare a facturilor
-NbOfGenerationDone=Numărul de generații de facturi deja efectuate
-NbOfGenerationDoneShort=Numărul de generații efectuate
-MaxGenerationReached=Numărul maxim de generații atins
+DateLastGenerationShort=Data ultimei generări.
+MaxPeriodNumber=Nr. maxim de facturi generate
+NbOfGenerationDone=Număr de generări de facturi deja efectuate
+NbOfGenerationOfRecordDone=Numărul de generare de înregistrări deja realizat
+NbOfGenerationDoneShort=Număr de generări efectuate
+MaxGenerationReached=Numărul maxim de generări a fost atins
 InvoiceAutoValidate=Validare automată facturi
 GeneratedFromRecurringInvoice=Generate din model factura recurentă %s
 DateIsNotEnough=Incă nu este data setată
 InvoiceGeneratedFromTemplate=Factură %s generată din model factură recurentă %s
 GeneratedFromTemplate=Generată din şablonul de factură %s
-WarningInvoiceDateInFuture=Avertisment, data facturii este mai mare decât data curentă
-WarningInvoiceDateTooFarInFuture=Avertisment, data facturii este prea departe de data curentă
-ViewAvailableGlobalDiscounts=Vedeți reducerile disponibile
+WarningInvoiceDateInFuture=Atenţie, data facturii este mai mare decât data curentă
+WarningInvoiceDateTooFarInFuture=Atenţie, data facturii este prea îndepărtată de data curentă
+ViewAvailableGlobalDiscounts=Vezi reduceri disponibile
 GroupPaymentsByModOnReports=Grupare plăţi după tip în rapoarte
 # PaymentConditions
 Statut=Status
@@ -398,7 +402,7 @@ PaymentConditionShort60DENDMONTH=60 zile la sfarsitul lunii
 PaymentCondition60DENDMONTH=In 60 zile dupa sfarsitul lunii
 PaymentConditionShortPT_DELIVERY=La livrare
 PaymentConditionPT_DELIVERY=La livrare
-PaymentConditionShortPT_ORDER=Comanda
+PaymentConditionShortPT_ORDER=Ordin de plată
 PaymentConditionPT_ORDER=Pe comandă
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% în avans, 50%% la livrare
@@ -413,11 +417,11 @@ PaymentCondition14DENDMONTH=În termen de 14 zile de la sfârșitul lunii
 FixAmount=Sumă fixă  - 1 linie cu eticheta '%s'
 VarAmount=Valoare variabilă (%% tot.)
 VarAmountOneLine=Cantitate variabilă (%% tot.) - 1 rând cu eticheta "%s"
-VarAmountAllLines=Sumă variabilă (%% tot.) - aceiaşi pe toate liniile
+VarAmountAllLines=Valoare variabilă (%% tot.) - toate liniile de origine
 # PaymentType
 PaymentTypeVIR=Transfer bancar
 PaymentTypeShortVIR=Transfer bancar
-PaymentTypePRE=Ordin de plata prin debit direct
+PaymentTypePRE=Ordin de plată prin direct debit
 PaymentTypeShortPRE=Ordin de plată de debit
 PaymentTypeLIQ=Numerar
 PaymentTypeShortLIQ=Numerar
@@ -427,8 +431,8 @@ PaymentTypeCHQ=Cec
 PaymentTypeShortCHQ=Cec
 PaymentTypeTIP=D/ P (Documente contra plata)
 PaymentTypeShortTIP=D/ P Plata
-PaymentTypeVAD=Plata online
-PaymentTypeShortVAD=Plata online
+PaymentTypeVAD=Plată online
+PaymentTypeShortVAD=Plată online
 PaymentTypeTRA=Schita banca
 PaymentTypeShortTRA=Schita
 PaymentTypeFAC=Factor
@@ -437,14 +441,14 @@ BankDetails=Coordonate Bancă
 BankCode=Cod Bancă
 DeskCode=Codul filialei
 BankAccountNumber=Număr cont
-BankAccountNumberKey=checksum
+BankAccountNumberKey=Sumă de control
 Residence=Adresă
-IBANNumber=Numărul contului IBAN
+IBANNumber=Nr. cont IBAN
 IBAN=IBAN
 CustomerIBAN=IBAN client
 SupplierIBAN=IBAN furnizor
 BIC=BIC / SWIFT
-BICNumber=cod BIC/SWIFT 
+BICNumber=Cod BIC/SWIFT 
 ExtraInfos=Informaţii suplimentare
 RegulatedOn=Plătite pe
 ChequeNumber=Cec Nr
@@ -459,10 +463,10 @@ FullPhoneNumber=Telefon
 TeleFax=Fax
 PrettyLittleSentence=Accept  plata sumelor datorate prin  cecurile emise pe numele meu ca un membru al unei asociații de contabilitate aprobată de către administrația fiscală.
 IntracommunityVATNumber=Cod de identificare TVA intracomunitar
-PaymentByChequeOrderedTo=Verificați plățile (inclusiv taxele) sunt plătibile la %s, trimiteți la
-PaymentByChequeOrderedToShort=Plățilecu cec (inclusiv taxele) se fac către
+PaymentByChequeOrderedTo=Plăți cu cec (cu taxe) achitate către %s, predate
+PaymentByChequeOrderedToShort=Plățile cu cec (cu taxe) se fac către
 SendTo=trimis la
-PaymentByTransferOnThisBankAccount=Plata prin transfer către următorul cont bancar
+PaymentByTransferOnThisBankAccount=Plată prin transfer către următorul cont bancar
 VATIsNotUsedForInvoice=* TVA neaplicabil art-293B din CGI
 LawApplicationPart1=Prin aplicarea legii 80.335 din 12.05.80
 LawApplicationPart2=mărfurile rămân în proprietatea
@@ -473,49 +477,53 @@ UseLine=Aplică
 UseDiscount=Aplică discount
 UseCredit=Utilizează credit
 UseCreditNoteInInvoicePayment=Reduce suma de plată cu acest credit
-MenuChequeDeposits=Verificați depozitele
+MenuChequeDeposits=Cecuri
 MenuCheques=Cecuri
-MenuChequesReceipts=Verificați chitanțele
+MenuChequesReceipts=File cec
 NewChequeDeposit=Depozit nou
-ChequesReceipts=Verificați chitanțele
-ChequesArea=Verificați zona depozitelor
-ChequeDeposits=Verificați depozitele
+ChequesReceipts=File cec
+ChequesArea=Cecuri
+ChequeDeposits=Cecuri
 Cheques=Cecuri
 DepositId=Depozit id
 NbCheque=Număr cecuri
 CreditNoteConvertedIntoDiscount=Acest %s a fost transformat în %s
-UsBillingContactAsIncoiveRecipientIfExist=Utilizați contactul / adresa cu tipul de "contact de facturare" în loc de adresa terțului ca destinatar pentru facturi
+UsBillingContactAsIncoiveRecipientIfExist=Utilizați contactul/adresa de tipul de "contact de facturare" în loc de adresa terțului ca destinatar pentru facturi
 ShowUnpaidAll=Afişează toate facturile neachitate
 ShowUnpaidLateOnly=Afişează numai facturile întârziate la plată
 PaymentInvoiceRef=Plată factură %s
 ValidateInvoice=Validează factura
-ValidateInvoices=Validați facturile
+ValidateInvoices=Validare facturi
 Cash=Numerar
 Reported=Întârziat
 DisabledBecausePayments=Nu este posibil, deoarece există unele plăţi
 CantRemovePaymentWithOneInvoicePaid=Nu se poate elimina plata deoarece există cel puțin o factură clasificată plătită
+CantRemovePaymentVATPaid=Nu se poate elimina plata deoarece declarația de TVA este clasificată ca fiind plătită
+CantRemovePaymentSalaryPaid=Nu se poate elimina plata deoarece salariul este clasificat plătit
 ExpectedToPay=Plată prevăzută
 CantRemoveConciliatedPayment=Nu se poate elimina plata reconciliată
 PayedByThisPayment=Achitat cu aceasta plată
 ClosePaidInvoicesAutomatically=Clasificați automat toate facturile standard, de plată sau de înlocuire drept "Plătite" atunci când plata se face în întregime
 ClosePaidCreditNotesAutomatically=Clasificați automat toate notele de credit drept "Plătite" atunci când rambursarea se face în întregime.
 ClosePaidContributionsAutomatically=Clasificați automat toate contribuțiile sociale sau fiscale drept "Plătite" atunci când plata se face în întregime.
-AllCompletelyPayedInvoiceWillBeClosed=Toate facturile fără niciun avertisment de plată vor fi închise automat cu starea "Plătit".
+ClosePaidVATAutomatically=Clasificați automat declarația TVA ca "Plătită" atunci când plata se face în întregime.
+ClosePaidSalaryAutomatically=Clasificați automat salariul ca "Plătit" atunci când plata se face în întregime.
+AllCompletelyPayedInvoiceWillBeClosed=Toate facturile fără niciun rest de plată vor fi închise automat cu starea "Plătit".
 ToMakePayment=Plăteşte
 ToMakePaymentBack=Rambursează
 ListOfYourUnpaidInvoices=Lista facturilor neplătite
 NoteListOfYourUnpaidInvoices=Notă: Această listă conține numai facturile pentru partenerii la care sunteţi reprezentant de vânzării.
 RevenueStamp=Taxă fiscală
-YouMustCreateInvoiceFromThird=Această opțiune este disponibilă numai când creați o factură din fila "Client" al unui terț
-YouMustCreateInvoiceFromSupplierThird=Această opțiune este disponibilă numai când creați o factură din fila "Furnizor" al unui terț
+YouMustCreateInvoiceFromThird=Această opțiune este disponibilă numai când creați o factură din fişa "Client" a unui terț
+YouMustCreateInvoiceFromSupplierThird=Această opțiune este disponibilă numai când creați o factură din fişa "Furnizor" a unui terț
 YouMustCreateStandardInvoiceFirstDesc=Intai se poate crea o factură standard si se transforma in model pentru a avea un nou model de factura.
 PDFCrabeDescription= Şablon PDF de factură Crabe. Un șablon de factură complet (vechea implementare a șablonului Sponge)
 PDFSpongeDescription=Factura PDF șablon Burete. Un șablon complet de factură
 PDFCrevetteDescription=Model factură PDF Crevette. Un model complet pentru factura de situaţie
-TerreNumRefModelDesc1=Returnează numărul sub forma %syymm-nnnn pentru facturile standard și %syymm-nnnn pentru notele de credit unde yy este anul, mm este luna și nnnn este o secvenţă fără nici o pauză și fără revenire la 0
-MarsNumRefModelDesc1=Returnați numărul cu formatul %syymm-nnnn pentru facturile standard, %syymm-nnnn pentru facturile de înlocuire, %syymm-nnnn pentru facturile de plată în avans și %syymm-nnnn pentru notele de credit unde yy este anul, mm este luna și nnnn este o secvență fără nicio pauză și nu reveniți la 0
+TerreNumRefModelDesc1=Returnează numărul în format %syymm-nnnn pentru facturile standard și %syymm-nnnn pentru notele de credit în care yy este anul, mm este luna și nnnn este un număr secvențial de auto-incrementare fără întrerupere și fără revenire la 0
+MarsNumRefModelDesc1=Returnează numărul în format %syymm-nnnn pentru facturile standard, %syymm-nnnn pentru facturile de înlocuire, %syymm-nnnn pentru facturile de avans și %syymm-nnnn pentru notele de credit în care yy este anul, mm este luna și nnnn este un număr secvențial de creștere automată fără întrerupere și fără revenire la 0
 TerreNumRefModelError=O factură începând cu $syymm există deja și nu este compatibilă cu acest model de numerotaţie. Ştergeţi sau redenumiți pentru a activa acest modul.
-CactusNumRefModelDesc1=Returnați numărul cu formatul %syymm-nnnn pentru facturile standard, %syymm-nnnn pentru notele de credit și %syymm-nnnn pentru facturile de plată în care yy este anul, mm este luna și nnnn este o secvență fără pauză și nici o întoarcere la 0
+CactusNumRefModelDesc1=Returnează un număr în format %syymm-nnnn pentru facturile standard, %syymm-nnnn pentru note de credit și %syymm-nnnn pentru facturile de avans în care yy este anul, mm este luna, iar nnnn este un număr secvențial de incrementare automată fără întrerupere și fără revenire la 0
 EarlyClosingReason= Motiv de închidere timpurie
 EarlyClosingComment=Notă de închidere timpurie
 ##### Types de contacts #####
@@ -523,15 +531,15 @@ TypeContact_facture_internal_SALESREPFOLL=Responsabil urmarire factură client
 TypeContact_facture_external_BILLING=Contact facturare  client
 TypeContact_facture_external_SHIPPING=Contact livrare client
 TypeContact_facture_external_SERVICE=Contact service  client
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Factură reprezentantă furnizor
-TypeContact_invoice_supplier_external_BILLING=Contactul facturii furnizorului
-TypeContact_invoice_supplier_external_SHIPPING=Contactul furnizorului de transport
-TypeContact_invoice_supplier_external_SERVICE=Contactul furnizorului de servicii
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Reprezentant urmărire facturi al furnizorului
+TypeContact_invoice_supplier_external_BILLING=Contact de facturare al furnizorului
+TypeContact_invoice_supplier_external_SHIPPING=Contact de livrare al furnizorului
+TypeContact_invoice_supplier_external_SERVICE=Contact de servicii al furnizorului
 # Situation invoices
 InvoiceFirstSituationAsk=Prima factură de situaţie pentru lucrări de construcţii
 InvoiceFirstSituationDesc=<b>Factura de situație</b> este legată de progresia unei lucrări, de exemplu progresia unei construcții. Fiecare situație este legată de o factură.
 InvoiceSituation=Factură de situaţie
-PDFInvoiceSituation=Factura de situaţie
+PDFInvoiceSituation=Factură de situaţie
 InvoiceSituationAsk=Factură urmarind situaţia
 InvoiceSituationDesc=Creaza o situatie noua urmarind una existenta deja
 SituationAmount=Valoare (neta) factură de situaţie
@@ -545,7 +553,7 @@ NotLastInCycle=Aceasta factura nu este ultima din serie si nu trebuie modificata
 DisabledBecauseNotLastInCycle=Urmatoarea situatie deja exista
 DisabledBecauseFinal=Aceasta situatie este finala
 situationInvoiceShortcode_AS=LA FEL CA
-situationInvoiceShortcode_S=D
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=Progresul nu poate fi mai mic decat valoarea lui in precedenta situatie
 NoSituations=Nicio situatie deschisa
 InvoiceSituationLast=Factură finală si generală
@@ -555,28 +563,29 @@ PDFCrevetteSituationInvoiceTitle=Factura de situaţie
 PDFCrevetteSituationInvoiceLine=Situația Nr. %s: Inv. Nr %s pe %s
 TotalSituationInvoice=Total situaţie
 invoiceLineProgressError=Progresul liniei din factură nu poate fi egal sau mai mare decat următoarea linie
-updatePriceNextInvoiceErrorUpdateline=Eroare: actualizați prețul pe linia de facturare: %s
+updatePriceNextInvoiceErrorUpdateline=Eroare: actualizare preț pe linia de facturare: %s
 ToCreateARecurringInvoice=Pentru a crea o factură recurentă la acest contract, se creeaza intai o factura schita, apoi se transforma cu un model de factura si se defineste frecventa generarii facturilor urmatoare.
 ToCreateARecurringInvoiceGene=Meniu pentru a crea facturi recurente manual <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=Dacă trebuie să generați automat astfel de facturi, cereți administratorului să activeze și să configureze modulul <strong> %s </strong>. Rețineți că ambele metode (manuală și automată) pot fi utilizate împreună fără riscul dublării.
-DeleteRepeatableInvoice=Ștergeți șablonul facturii
+ToCreateARecurringInvoiceGeneAuto=Dacă trebuie să generezi automat astfel de facturi, cere administratorului să activeze și să configureze modulul <strong> %s </strong>. Reține că ambele metode (manuală și automată) pot fi utilizate împreună fără riscul dublării.
+DeleteRepeatableInvoice=Șterge șablon factură
 ConfirmDeleteRepeatableInvoice=Sigur doriți să ștergeți factura șablon?
-CreateOneBillByThird=Creați o factură / terț (altfel, o factură pe comandă)
-BillCreated= %s facturi create
-StatusOfGeneratedDocuments=Starea generării de documente
-DoNotGenerateDoc=Nu generați fișierul de documente
+CreateOneBillByThird=Creați o factură pentru un terț (altfel, o factură pe o comandă)
+BillCreated=%s factur(i) generate
+BillXCreated=Factura %s a fost generată
+StatusOfGeneratedDocuments=Status generare document
+DoNotGenerateDoc=Nu genera fișierul document
 AutogenerateDoc=Generați automat fișierul document
 AutoFillDateFrom=Setați data de începere pentru linia de servicii cu data facturii
 AutoFillDateFromShort=Setați data de începere
-AutoFillDateTo=Setați data de încheiere pentru linia de servicii cu data următoare a facturii
+AutoFillDateTo=Setați data de încheiere pentru linia de servicii cu data facturii următoare
 AutoFillDateToShort=Setați data de încheiere
-MaxNumberOfGenerationReached=Numărul maxim de gen. atins
+MaxNumberOfGenerationReached=Numărul maxim de generări a fost atins
 BILL_DELETEInDolibarr=Factură ştearsă
 BILL_SUPPLIER_DELETEInDolibarr=Factură furnizor ştearsă
-UnitPriceXQtyLessDiscount=Preţ unitar  x Cantitate - Discount
+UnitPriceXQtyLessDiscount=Preţ unitar x Cantitate - Discount
 CustomersInvoicesArea=Facturare clienţi
 SupplierInvoicesArea=Facturare furnizori
 FacParentLine=Linie de facturare părinte
-SituationTotalRayToRest=Restul de plătit fără taxe
+SituationTotalRayToRest=Rest de plată fără taxe
 PDFSituationTitle=Situaţia nr. %d
 SituationTotalProgress=Progres total %d %%
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index 6cc341fa46f..c755a8664f6 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -1,14 +1,15 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLoginInformation=Informații de autentificare
-BoxLastRssInfos=Informații RSS
-BoxLastProducts=Ultimele %s Produse / Servicii
-BoxProductsAlertStock=Alere Stoc pentru produse
+BoxDolibarrStateBoard=Statistici privind principalele obiecte de afaceri din baza de date
+BoxLoginInformation=Informații autentificare
+BoxLastRssInfos=Flux RSS
+BoxLastProducts=Ultimele %s Produse/Servicii
+BoxProductsAlertStock=Alerte stoc produse
 BoxLastProductsInContract=Ultimele %s produse/ servicii contractate 
-BoxLastSupplierBills=Ultimele facturi ale furnizorilor
-BoxLastCustomerBills=Ultimele facturi ale clienților
+BoxLastSupplierBills=Ultimele facturi furnizori
+BoxLastCustomerBills=Ultimele facturi client
 BoxOldestUnpaidCustomerBills=Cele mai vechi facturi clienţi neîncasate
-BoxOldestUnpaidSupplierBills=Cele mai vechi facturi neachitate ale vânzătorului
-BoxLastProposals=Ultimele oferte
+BoxOldestUnpaidSupplierBills=Cele mai vechi facturi furnizori neachitate
+BoxLastProposals=Ultimele oferte comerciale
 BoxLastProspects=Ultimii prospecţi modificaţi
 BoxLastCustomers=Ultimii clienţi modificaţi
 BoxLastSuppliers=Ultimii furnizori modificaţi 
@@ -17,41 +18,45 @@ BoxLastActions=Ultimele acţiuni
 BoxLastContracts=Ultimele contracte
 BoxLastContacts=Ultimele contacte/ adrese
 BoxLastMembers=Ultimii membri
+BoxLastModifiedMembers=Ultimii membri modificaţi
+BoxLastMembersSubscriptions=Ultimele adeziuni de membri
 BoxFicheInter=Ultimele intervenţii
 BoxCurrentAccounts=Sold conturi deschise
-BoxTitleMemberNextBirthdays=Aniversări în acreastă lună (membri)
+BoxTitleMemberNextBirthdays=Aniversări în această lună (membri)
+BoxTitleMembersByType=Membri după tip
+BoxTitleMembersSubscriptionsByYear=Adeziuni membri după an
 BoxTitleLastRssInfos=Ultimele %s noutăţi de la %s 
-BoxTitleLastProducts=Produse / Servicii: ultima %s modificată
+BoxTitleLastProducts=Produse/Servicii: ultimele %s modificate
 BoxTitleProductsAlertStock=Produse: avertizare stoc
 BoxTitleLastSuppliers=Ultimii %s furnizori înregistraţi
-BoxTitleLastModifiedSuppliers=Furnizori: ultima %s modificată
-BoxTitleLastModifiedCustomers=Clienții: ultima %s modificată
-BoxTitleLastCustomersOrProspects=Ultimii %s clienti sau prospecţi
+BoxTitleLastModifiedSuppliers=Furnizori: ultimii %s modificaţi
+BoxTitleLastModifiedCustomers=Clienți: ultimii %s modificaţi
+BoxTitleLastCustomersOrProspects=Ultimii %s clienţi sau prospecţi
 BoxTitleLastCustomerBills=Ultimile %s facturi client modificate
 BoxTitleLastSupplierBills=Ultimile %s facturi furnizor modificate
 BoxTitleLastModifiedProspects=Prospecţi: ultimii %s modificaţi
 BoxTitleLastModifiedMembers=Ultimii %s membri
 BoxTitleLastFicheInter=Ultimele %s intervenţii modificate
-BoxTitleOldestUnpaidCustomerBills=Facturile cel mai vechi ale clientului:  %s neplătite
-BoxTitleOldestUnpaidSupplierBills=Facturie cele mai vechi ale furnizorilor: %s neplătite
+BoxTitleOldestUnpaidCustomerBills=Facturi clienţi: ultimile %s neplătite
+BoxTitleOldestUnpaidSupplierBills=Facturi furnizori: ultimile %s neachitate
 BoxTitleCurrentAccounts=Conturi deschise: balanțe
 BoxTitleSupplierOrdersAwaitingReception=Comenzi de achiziţie în aşteptare
-BoxTitleLastModifiedContacts=Contacte / Adrese: ultima %s modificată
+BoxTitleLastModifiedContacts=Contacte/Adrese: ultimile %s modificate
 BoxMyLastBookmarks=Bookmark-uri : ultimile %s
 BoxOldestExpiredServices=Cele mai vechi servicii active expirate
 BoxLastExpiredServices=Cele mai vechi %s contacte cu servicii active expirate
 BoxTitleLastActionsToDo=Ultimele %s acţiuni de realizat
-BoxTitleLastContracts=Ultimele contracte modificate %s
+BoxTitleLastContracts=Ultimele %s contracte modificate 
 BoxTitleLastModifiedDonations=Ultimele %s donaţii modificate 
 BoxTitleLastModifiedExpenses=Ultimele %s deconturi modificare 
-BoxTitleLatestModifiedBoms=Ultimile %sbonuri de consum modificate 
+BoxTitleLatestModifiedBoms=Ultimile %s bonuri de consum modificate 
 BoxTitleLatestModifiedMos=Ultimile %s comenzi de producţie modificate
 BoxTitleLastOutstandingBillReached=Clienţii cu restanţe mai mari decât limita de credit acceptată
-BoxGlobalActivity=Activitate globală ( facturi, oferte, comenzi)
+BoxGlobalActivity=Activitate globală (facturi, oferte, comenzi)
 BoxGoodCustomers=Clienţi buni
 BoxTitleGoodCustomers=%s Clienţi buni
 BoxScheduledJobs=Joburi programate
-BoxTitleFunnelOfProspection=Lead funnel
+BoxTitleFunnelOfProspection=Funnel lead-uri
 FailedToRefreshDataInfoNotUpToDate=Actualizarea fluxului RSS a eșuat. Ultima actualizare reușită: %s
 LastRefreshDate=Ultima dată reîmprospătare
 NoRecordedBookmarks=Niciun bookmark definit.
@@ -63,40 +68,40 @@ NoRecordedOrders=Nu sunt înregistrate comenzi de vânzări
 NoRecordedProposals=Nicio ofertă înregistrată
 NoRecordedInvoices=Nu sunt înregistrate facturi clienţi
 NoUnpaidCustomerBills=Nu sunt facturi clienţi neachitate
-NoUnpaidSupplierBills=Nu sunt facturi furnizori neachitate
-NoModifiedSupplierBills=Nu sunt facturi furnizori înregistrate 
+NoUnpaidSupplierBills=Nu sunt facturi furnizor neachitate
+NoModifiedSupplierBills=Nu sunt facturi furnizor înregistrate 
 NoRecordedProducts=Niciun produs / serviciu înregistrat
 NoRecordedProspects=Niciun prospect înregistrat
 NoContractedProducts=Niciun  produs / serviciu contractat
 NoRecordedContracts=Niciun contract înregistrat
 NoRecordedInterventions=Nicio intervenție înregistrată
-BoxLatestSupplierOrders=Ultimele comenzi de cumpărături
+BoxLatestSupplierOrders=Ultimele comenzi de achiziţie
 BoxLatestSupplierOrdersAwaitingReception=Ultimile comenzi de achiziţie (în aşteptarea recepţiei)
-NoSupplierOrder=Nu sunt înregistrate comenzi de cumpărături
+NoSupplierOrder=Nu sunt înregistrate comenzi de achiziţie
 BoxCustomersInvoicesPerMonth=Facturi clienți pe lună
 BoxSuppliersInvoicesPerMonth=Facturi furnizori pe lună
 BoxCustomersOrdersPerMonth=Comenzi de vânzări pe lună
 BoxSuppliersOrdersPerMonth=Comenzi furnizori pe lună
 BoxProposalsPerMonth=Oferte pe luni
 NoTooLowStockProducts=Niciun produs sub limita minimă de stoc
-BoxProductDistribution= Distribuție de produse/servicii
+BoxProductDistribution= Distribuția pe produse/servicii
 ForObject=Pe %s
-BoxTitleLastModifiedSupplierBills= Facturi furnizor: ultimul %s modificat
-BoxTitleLatestModifiedSupplierOrders=Comenzi furnizor: ultimul %s modificat
-BoxTitleLastModifiedCustomerBills=Facturi clienți: ultimul %s modificat
-BoxTitleLastModifiedCustomerOrders=Comenzi de vânzări: ultimul %s modificat
+BoxTitleLastModifiedSupplierBills= Facturi furnizor: ultimele %s modificate
+BoxTitleLatestModifiedSupplierOrders=Comenzi furnizor: ultimele %s modificate
+BoxTitleLastModifiedCustomerBills=Facturi clienți: ultimele %s modificate
+BoxTitleLastModifiedCustomerOrders=Comenzi de vânzări: ultimele %s modificate
 BoxTitleLastModifiedPropals=Ultimele %s oferte modificate
 BoxTitleLatestModifiedJobPositions=Ultimile %s joburi modificate
-BoxTitleLatestModifiedCandidatures=Ultimile %scandidaturi modificate
+BoxTitleLatestModifiedCandidatures=Ultimile %s candidaturi job modificate
 ForCustomersInvoices=Facturi clienţi
 ForCustomersOrders=Comenzi clienți
 ForProposals=Oferte
 LastXMonthRolling=Rulaj ultimele %s luni
-ChooseBoxToAdd=Adăugați widget în tabloul dvs. de bord
-BoxAdded=Widget a fost adăugat în tabloul dvs. de bord
+ChooseBoxToAdd=Adăugați widget pe dashboard
+BoxAdded=Widget-ul a fost adăugat în tabloul tău de bord
 BoxTitleUserBirthdaysOfMonth=Aniversări în această lună (utilizatori)
-BoxLastManualEntries=Ultimile înregistrări în contabilitate introduse manual sau fără document sursă 
-BoxTitleLastManualEntries=%s ultimele înregistrări introduse manual sau fără document sursă 
+BoxLastManualEntries=Ultimile înregistrări în contabilitate introduse manual sau fără document sursă
+BoxTitleLastManualEntries=Ultimele %s înregistrări introduse manual sau fără document sursă
 NoRecordedManualEntries=Nici o înregistrare manuală în contabilitate
 BoxSuspenseAccount=Contorizează operaţiunea contabilă cu contul suspendat 
 BoxTitleSuspenseAccount=Număr linii nealocate
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Ultimile %s livrări către clienţi
 NoRecordedShipments=Nici o livrare către clienţi
 BoxCustomersOutstandingBillReached=Clienţi care au epuizat limita de credit
 # Pages
+UsersHome=Utilizatori și grupuri
+MembersHome=Calitate de membru
+ThirdpartiesHome=Terţi
+TicketsHome=Tichete
 AccountancyHome=Contabilitate
 ValidatedProjects=Proiecte validate
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 5bce5a6db56..efbd177ea76 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -1,24 +1,24 @@
 # Dolibarr language file - Source file is en_US - categories
 Rubrique=Tag/Categorie
 Rubriques=Tag-uri/Categorii
-RubriquesTransactions=Tag-uri/Categorii de tranzacții
+RubriquesTransactions=Tag-uri/categorii tranzacții
 categories=tag-uri/categorii
-NoCategoryYet=Niciun tag/categorie de acest tip creată
+NoCategoryYet=Niciun tag/categorie de acest tip creat
 In=În
-AddIn=Adăugă în
+AddIn=Adaugă în
 modify=modifică
-Classify=Clasează
+Classify=Clasifică
 CategoriesArea=Tag-uri/Categorii
-ProductsCategoriesArea=Taguri/Categorii Produse/Servicii
+ProductsCategoriesArea=Tag-uri/categorii Produse/Servicii
 SuppliersCategoriesArea=Tag-uri/categorii furnizori
 CustomersCategoriesArea=Tag-uri/categorii clienți
 MembersCategoriesArea=Tag-uri/categorii membri
 ContactsCategoriesArea=Tag-uri/categorii contacte
-AccountsCategoriesArea=Tag-uri/categorii conturi contabile
+AccountsCategoriesArea=Tag-uri/categorii conturi bancare
 ProjectsCategoriesArea=Tag-uri/categorii proiecte
 UsersCategoriesArea=Tag-uri/categorii utilizatori
 SubCats=Subcategorii
-CatList=Lista tag-uri/categorii
+CatList=Listă tag-uri/categorii
 CatListAll=Listă tag-uri/categorii (toate tipurile)
 NewCategory=Tag/categorie nouă
 ModifCat=Modifică tag/categorie
@@ -33,9 +33,9 @@ WasAddedSuccessfully=<b> %s</b> a fost adăugat cu succes.
 ObjectAlreadyLinkedToCategory=Elementul este deja asociat cu acest tag/ categorie.
 ProductIsInCategories=Produsul/ serviciul este asociat cu următoarele tag-uri/ categorii
 CompanyIsInCustomersCategories=Acest partener este asociat cu următoarele tag-uri/ categorii clienţi/ prospecţi
-CompanyIsInSuppliersCategories=Acest terț este legat de următoarele tag-uri/categorii de furnizori
+CompanyIsInSuppliersCategories=Acest terț este asociat la următoarele tag-uri/categorii de furnizori
 MemberIsInCategories=Acest menbru este asociat cu următoarele tag-uri/ categorii membri
-ContactIsInCategories=Acest contact este asociat cu următoarele tag-uri/categorii contacte
+ContactIsInCategories=Acest contact este asociat cu următoarele tag-uri/categorii de contacte
 ProductHasNoCategory=Acest produs/serviciu nu are asociat niciun tag/categorie
 CompanyHasNoCategory=Acest terț nu are asociate tag-uri/categorii
 MemberHasNoCategory=Acest membru nu este asociat cu tag-uri/ categorii
@@ -79,7 +79,7 @@ CatSupLinks=Legături între furnizori și tag-uri/categorii
 CatCusLinks=Asocieri între clienţi/prospecţi şi tag-uri/categorii
 CatContactsLinks=Asocieri între contacte/adrese şi tag-uri/categorii 
 CatProdLinks=Asocieri între produse/servicii şi tag-uri/categorii
-CatMembersLinks=Legături între membri şi tag-uri/categorii
+CatMembersLinks=Asocieri între membri şi tag-uri/categorii
 CatProjectsLinks=Asocieri între proiecte și tag-uri/categorii
 CatUsersLinks=Legături între utilizatori şi tag-uri/categorii
 DeleteFromCat=Elimină din tag-uri/categoriii
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 044d0a52957..3b606f937a1 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Numele societăţii %s există deja. Alegeţi un altul.
-ErrorSetACountryFirst=Setaţi mai întâi ţară
+ErrorSetACountryFirst=Setaţi mai întâi ţara
 SelectThirdParty=Selectaţi un terţ
 ConfirmDeleteCompany=Sigur doriți să ștergeți această companie și toate informațiile moștenite?
-DeleteContact=Şterge un contact
+DeleteContact=Şterge un contact/adresă
 ConfirmDeleteContact=Sigur doriți să ștergeți acest contact și toate informațiile moștenite?
 MenuNewThirdParty=Terț nou
 MenuNewCustomer=Client nou
 MenuNewProspect=Prospect nou
 MenuNewSupplier=Furnizor nou
-MenuNewPrivateIndividual=Particular nou
+MenuNewPrivateIndividual=Persoană fizică nouă
 NewCompany=Companie nouă (prospect, client, furnizor)
 NewThirdParty=Terț nou (prospect, client, furnizor)
-CreateDolibarrThirdPartySupplier=Creează un terț (furnizor)
+CreateDolibarrThirdPartySupplier=Crează un terț (furnizor)
 CreateThirdPartyOnly=Creare terţ
-CreateThirdPartyAndContact=Creați un terț + un contact pentru copil
+CreateThirdPartyAndContact=Creați un terț + un contact asociat
 ProspectionArea=Prospecţi
 IdThirdParty=ID Terţ
 IdCompany=ID Societate
@@ -23,7 +23,7 @@ ThirdPartyContacts=Contacte terți
 ThirdPartyContact=Contact/adresă terț
 Company=Societate
 CompanyName=Nume societate
-AliasNames=Alias (comercial, marca inregistrata, ...)
+AliasNames=Alias (comercial, marcă inregistrată, ...)
 AliasNameShort=Alias
 Companies=Societăţi
 CountryIsInEEC=Țara se află în interiorul Comunității Economice Europene
@@ -40,14 +40,15 @@ ThirdPartyCustomersWithIdProf12=Clienţii cu %s sau %s
 ThirdPartySuppliers=Furnizori
 ThirdPartyType=Tip de terț
 Individual=Persoană fizică
-ToCreateContactWithSameName=Va crea automat o persoană de contact / o adresă cu aceleași informații ca și terțul terțului. În cele mai multe cazuri, chiar dacă partea terță este o persoană fizică, este suficientă crearea unei terțe părți singură.
+ToCreateContactWithSameName=Va crea automat o persoană de contact/adresă cu aceleași informații ca și a terțului. În cele mai multe cazuri, chiar dacă terțul este o persoană fizică, este suficientă doar crearea terțului.
 ParentCompany=Societatea-mamă
-Subsidiaries=Filiale
-ReportByMonth=Raportați pe lună
-ReportByCustomers=Raportați pe client
-ReportByQuarter=Raport pe rată
+Subsidiaries=Filiale - sedii
+ReportByMonth=Raport pe lună
+ReportByCustomers=Raport pe client
+ReportByThirdparties=Raport pe terţ
+ReportByQuarter=Raport pe cotă
 CivilityCode=Mod adresare
-RegisteredOffice=Sediul social
+RegisteredOffice=Sediu social
 Lastname=Nume
 Firstname=Prenume
 PostOrFunction=Funcţie
@@ -57,34 +58,34 @@ NatureOfContact=Natură contact
 Address=Adresă
 State=Regiune/Judeţ
 StateCode=Cod judeţ/provincie
-StateShort=Stare
+StateShort=Stat
 Region=Regiune
-Region-State=Region - Țară
+Region-State=Regiune - Țară
 Country=Ţară
 CountryCode=Cod ţară
 CountryId=ID Ţară
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
-Call=Apel
+Call=Apel telefonic
 Chat=Chat
 PhonePro=Telefon prof.
 PhonePerso=Telefon pers.
 PhoneMobile=Telefon mobil
-No_Email=Refuză email-urile bulk
+No_Email=Refuză newslettere
 Fax=Fax
-Zip=Cod postal
+Zip=Cod poştal
 Town=Oraş
 Web=Web
 Poste= Funcţie
 DefaultLang=Limba implicită
 VATIsUsed=Utilizează TVA
 VATIsUsedWhenSelling=Aceasta definește dacă acest terț include sau nu o taxă de vânzare atunci când efectuează o factură către clienții săi
-VATIsNotUsed=Impozitul pe vânzări nu este utilizat
-CopyAddressFromSoc=Copiați adresa de la detaliile terților
-ThirdpartyNotCustomerNotSupplierSoNoRef=Terț nu este nici client, nici vânzător, nu există obiecte la care se pot face referință
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Terțul nu este nici client, nici vânzător, reducerile nu sunt disponibile
-PaymentBankAccount=Cont bancar de plată
+VATIsNotUsed=Taxa pe vânzări TVA nu este utilizată
+CopyAddressFromSoc=Copiați adresa de la terț
+ThirdpartyNotCustomerNotSupplierSoNoRef=Terțul nu este nici client, nici furnizor, nu există obiecte la care se pot face referință
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Terțul nu este nici client, nici furnizor, reducerile nu sunt disponibile
+PaymentBankAccount=Cont bancar pentru înregistrarea plăţilor
 OverAllProposals=Oferte
 OverAllOrders=Comenzi
 OverAllInvoices=Facturi
@@ -100,10 +101,10 @@ WrongCustomerCode=Cod client invalid
 WrongSupplierCode=Cod furnizor invalid
 CustomerCodeModel=Model cod client
 SupplierCodeModel=Model cod furnizor
-Gencod=Coduri de bare
+Gencod=Cod de bare
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
-ProfId2Short=Prof. ID 2
+ProfId2Short=Prof. id 2
 ProfId3Short=Prof. id 3
 ProfId4Short=Prof. id 4
 ProfId5Short=Prof. Id 5
@@ -114,124 +115,131 @@ ProfId3=Professional ID 3
 ProfId4=Professional ID 4
 ProfId5=Professional ID 5
 ProfId6=Profesional ID 6
-ProfId1AR=Id-ul prof. 1 (CUIL)
-ProfId2AR=Id-ul prof. 2 (Venituri brute)
+ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId2AR=Prof Id 2 (Venituri brute)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=Prof Id-ul 1 (USt.-IdNr)
-ProfId2AT=Prof Id-ul 2 (USt.-NR)
-ProfId3AT=Prof Id-ul 3 (Handelsregister-Nr.)
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
 ProfId5AT=Nr EORI
 ProfId6AT=-
-ProfId1AU=Prof Id-ul 1 (ABN)
+ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=Prof Id-ul 1 (Professionnel Număr)
+ProfId1BE=Prof Id 1 (Număr profesional)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
 ProfId5BE=Nr EORI
 ProfId6BE=-
 ProfId1BR=-
-ProfId2BR=IE (Inregistrare Statala)
-ProfId3BR=IE (Inregistrare Municipala)
+ProfId2BR=IE (Înregistrare Statală)
+ProfId3BR=IE (Înregistrare Municipală)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
 ProfId1CH=Nr UID
 ProfId2CH=-
-ProfId3CH=Prof Id-ul 1 (Federal număr)
-ProfId4CH=Prof. ID 2 (Număr de înregistrare comercială)
+ProfId3CH=Prof Id 1 (Număr federal)
+ProfId4CH=Prof. Id 2 (Număr de înregistrare comercială)
 ProfId5CH=Nr EORI
 ProfId6CH=-
-ProfId1CL=Prof. Id-ul 1 (RUT)
+ProfId1CL=Prof. Id 1 (R.U.T.)
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CO=Prof. Id-ul 1 (RUT)
+ProfId1CO=Prof. Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof Id-ul 1 (USt.-IdNr)
-ProfId2DE=Prof Id-ul 2 (USt.-NR)
-ProfId3DE=Prof Id-ul 3 (Handelsregister-Nr.)
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
 ProfId5DE=Nr EORI
 ProfId6DE=-
-ProfId1ES=Id-ul prof. 1 (CIF/CNP)
-ProfId2ES=Prof. ID 2 (SSN)
-ProfId3ES=Id-ul prof. 3 (CNAE)
-ProfId4ES=Id-ul prof. 4 (Collegiate număr)
-ProfId5ES=Nr EORI
+ProfId1ES=Prof Id 1 (CIF/CNP)
+ProfId2ES=Prof. Id 2 (SSN)
+ProfId3ES=Prof Id 3 (CNAE)
+ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId5ES=Prof Id 5 (Număr EORI)
 ProfId6ES=-
-ProfId1FR=Prof Id-ul 1 (SIREN)
-ProfId2FR=Prof Id-ul 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, vechi APE)
-ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Nr EORI
+ProfId1FR=Prof Id 1 (SIREN)
+ProfId2FR=Prof Id 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, vechiul APE)
+ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId5FR=Prof Id 5 (Număr EORI)
 ProfId6FR=-
-ProfId1GB=Prof Id-ul 1 (numărul de înregistrare)
+ProfId1ShortFR=CIF/CUI
+ProfId2ShortFR=Nr. Reg. Com./J
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
+ProfId1GB=Număr de înregistrare
 ProfId2GB=-
-ProfId3GB=Prof Id 3 (SIC)
+ProfId3GB=SIC
 ProfId4GB=-
 ProfId5GB=-
 ProfId6GB=-
-ProfId1HN=Id prof. univ. 1 (RTN)
+ProfId1HN=Id prof. 1 (RTN)
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
-ProfId1IN=Id-ul prof. 1 (NIF)
-ProfId2IN=Prof ID 2
-ProfId3IN=Prof Id-ul 3
-ProfId4IN=Id-ul prof. univ 4
-ProfId5IN=Prof ID 5
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
+ProfId5IN=Prof Id 5
 ProfId6IN=-
 ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=Nr EORI
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=Nr EORI
 ProfId6LU=-
-ProfId1MA=Id prof. univ. 1 (RC)
-ProfId2MA=Id prof. univ. 2 (Patente)
-ProfId3MA=Id prof. univ. 3 (IF)
-ProfId4MA=Id prof. univ. 4 (CNSS)
+ProfId1MA=Id prof. 1 (R.C.)
+ProfId2MA=Id prof. 2 (Patente)
+ProfId3MA=Id prof. 3 (I.F.)
+ProfId4MA=Id prof. 4 (C.N.S.S.)
 ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
-ProfId1MX=Prof. Id-ul 1 (RFC).
-ProfId2MX=Prof. Id-ul 2 (R.. P. IMSS)
-ProfId3MX=Prof. ID 3 (Carta Profesional)
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
 ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
-ProfId4NL=-
+ProfId4NL=Burgerservicenummer (BSN)
 ProfId5NL=Nr EORI
 ProfId6NL=-
-ProfId1PT=Prof Id-ul 1 (NIPC)
-ProfId2PT=Prof Id-ul 2 (Social Security Number)
-ProfId3PT=Prof Id 3 (Comerciale număr record)
-ProfId4PT=Prof Id 4 (Conservatorul)
-ProfId5PT=Nr EORI
+ProfId1PT=Prof Id 1 (NIPC)
+ProfId2PT=Prof Id 2 (Social security number)
+ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId4PT=Prof Id 4 (Conservator)
+ProfId5PT=Prof Id 5 (Număr EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -239,13 +247,13 @@ ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
-ProfId1TN=Prof Id-ul 1 (RC)
-ProfId2TN=Prof Id-ul 2 (Fiscal matricule)
-ProfId3TN=Prof Id 3 (Douane cod)
+ProfId1TN=Prof Id 1 (RC)
+ProfId2TN=Prof Id 2 (Matricolă Fiscală)
+ProfId3TN=Prof Id 3 (Cod Douane)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Id-ul prof (FEIN)
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,12 +263,12 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Reg Com)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Nr EORI
+ProfId5RO=Prof Id 5 (Număr EORI)
 ProfId6RO=-
-ProfId1RU=Prof. Id-ul 1 (OGRN)
-ProfId2RU=Prof. Id-ul 2 (DCI)
-ProfId3RU=Prof. ID 3 (KPP)
-ProfId4RU=Prof. Id-ul 4 (OKPO)
+ProfId1RU=Prof Id 1 (OGRN)
+ProfId2RU=Prof Id 2 (INN)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
 ProfId1DZ=RC
@@ -270,31 +278,31 @@ ProfId4DZ=NIS
 VATIntra=Cod TVA
 VATIntraShort=Cod TVA
 VATIntraSyntaxIsValid=Sintaxa este validă
-VATReturn=Restituire TVA
+VATReturn=Rerturnare TVA
 ProspectCustomer=Prospect / Client
 Prospect=Prospect
-CustomerCard=Fişa Client
+CustomerCard=Fişă client
 Customer=Client
 CustomerRelativeDiscount=Discount relativ client
 SupplierRelativeDiscount=Discount relativ furnizor
 CustomerRelativeDiscountShort=Discount relativ
 CustomerAbsoluteDiscountShort=Discount absolut
-CompanyHasRelativeDiscount=Acest client are un discount <b>de %s%%</b>
-CompanyHasNoRelativeDiscount=Acest client nu are nici un discount în mod implicit
+CompanyHasRelativeDiscount=Acest client are un discount de <b>%s%%</b>
+CompanyHasNoRelativeDiscount=Acest client nu are nici un discount relativ implicit
 HasRelativeDiscountFromSupplier=Aveți un discount implicit de <b> %s%% </b> de la acest furnizor
 HasNoRelativeDiscountFromSupplier=Nu aveți nici un discount relativ implicit de la acest furnizor
-CompanyHasAbsoluteDiscount=Acest client are dicount-uri disponibile (note de credit sau plăți în avans) pentru <b> %s </b> %s
-CompanyHasDownPaymentOrCommercialDiscount=Acest client are discount-uri disponibile (comerciale, plăți în avans) pentru <b> %s </b> %s
+CompanyHasAbsoluteDiscount=Acest client are discount-uri disponibile (note de credit sau plăți în avans) pentru <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Acest client are discount-uri disponibile (comerciale, plăți în avans) pentru <b>%s</b> %s
 CompanyHasCreditNote=Acest client are încă note de credit pentru <b>%s</b> %s
 HasNoAbsoluteDiscountFromSupplier=Nu aveți credit disponibil de discount de la acest furnizor
-HasAbsoluteDiscountFromSupplier=Aveți discount-uri disponibile (note de credit sau plăți în avans) pentru <b> %s </b> %s de la acest furnizor
-HasDownPaymentOrCommercialDiscountFromSupplier=Aveți discount-uri disponibile (comerciale, plăți în avans) pentru <b> %s </b> %s de la acest furnizor
-HasCreditNoteFromSupplier=Aveți note de credit pentru <b> %s </b> %s de la acest furnizor
-CompanyHasNoAbsoluteDiscount=Acest client nu are nici discount de credit disponibil
+HasAbsoluteDiscountFromSupplier=Aveți discount-uri disponibile (note de credit sau plăți în avans) pentru <b>%s</b> %s de la acest furnizor
+HasDownPaymentOrCommercialDiscountFromSupplier=Aveți discount-uri disponibile (comerciale, plăți în avans) pentru <b>%s</b> %s de la acest furnizor
+HasCreditNoteFromSupplier=Aveți note de credit pentru <b>%s</b> %s de la acest furnizor
+CompanyHasNoAbsoluteDiscount=Acest client nu are niciun discount de credit disponibil
 CustomerAbsoluteDiscountAllUsers=Discount-uri absolute ale clienților (acordate de toți utilizatorii)
-CustomerAbsoluteDiscountMy=Reduceri absolute ale clienților (acordate de dvs.)
+CustomerAbsoluteDiscountMy=Reduceri absolute ale clienților (acordate de tine)
 SupplierAbsoluteDiscountAllUsers=Discount-uri absolute ale furnizorului (introduse de toți utilizatorii)
-SupplierAbsoluteDiscountMy=Discount-uri absolute ale furnizorilor (introduse de dvs.)
+SupplierAbsoluteDiscountMy=Discount-uri absolute ale furnizorilor (introduse de tine)
 DiscountNone=Niciunul
 Vendor=Furnizor
 Supplier=Furnizor
@@ -303,7 +311,7 @@ AddContactAddress=Creare contact/adresă
 EditContact=Editare contact
 EditContactAddress=Editare contact/adresă
 Contact=Contact/Adresă
-Contacts=Contacte
+Contacts=Contacte/Adrese
 ContactId=Id contact
 ContactsAddresses=Contacte/Adrese
 FromContactName=Nume:
@@ -313,7 +321,7 @@ DefaultContact=Contact/adresă implicită
 ContactByDefaultFor=Contact/adresă implicită pentru
 AddThirdParty=Creare terţ
 DeleteACompany=Şterge o societate
-PersonalInformations=Informaţii personale
+PersonalInformations=Date personale
 AccountancyCode=Cont contabil
 CustomerCode=Cod client
 SupplierCode=Cod furnizor
@@ -323,12 +331,12 @@ CustomerCodeDesc=Cod client, unic pentru toți clienți
 SupplierCodeDesc=Cod furnizor, unic pentru toți furnizorii
 RequiredIfCustomer=Obligatoriu, dacă un terţ este un client sau prospect
 RequiredIfSupplier=Obligatoriu dacă terțul este un furnizor
-ValidityControledByModule=Valabilitate controlată de modul
+ValidityControledByModule=Validitate controlată de modul
 ThisIsModuleRules=Reguli pentru acest modul
 ProspectToContact=Prospect de contactat
-CompanyDeleted=Societatea " %s" a fost ştearsă din baza de date.
+CompanyDeleted=Societatea "%s" a fost ştearsă din baza de date.
 ListOfContacts=Listă contacte/adrese
-ListOfContactsAddresses=Lista contacte/adrese
+ListOfContactsAddresses=Listă contacte/adrese
 ListOfThirdParties=Listă terți
 ShowCompany=Terţ
 ShowContact=Contact-Adresă
@@ -336,14 +344,14 @@ ContactsAllShort=Toate (fără filtru)
 ContactType=Tip contact
 ContactForOrders=Contact comenzi
 ContactForOrdersOrShipments=Contact comenzi sau livrări
-ContactForProposals=Contact ofertă
+ContactForProposals=Contact ofertă comercială
 ContactForContracts=Contact contracte
 ContactForInvoices=Contact facturi
-NoContactForAnyOrder=Acest contact nu este  contact pentru nici o comanda
-NoContactForAnyOrderOrShipments=Acest contact nu este  contact pentru nicio comanda sau livrare
-NoContactForAnyProposal=Acest contact nu este contact pentru nicio ofertă comercială
-NoContactForAnyContract=Acest contact nu este  contact pentru nici un contract
-NoContactForAnyInvoice=Acest contact nu este  contact pentru nici o factură
+NoContactForAnyOrder=Acest contact nu este persoană de contact pentru nicio comandă
+NoContactForAnyOrderOrShipments=Acest contact nu este persoană de contact pentru nicio comandă sau livrare
+NoContactForAnyProposal=Acest contact nu este persoană de contact pentru nicio ofertă comercială
+NoContactForAnyContract=Acest contact nu este contact pentru niciun contract
+NoContactForAnyInvoice=Acest contact nu este persoană de contact pentru nicio factură
 NewContact=Contact nou
 NewContactAddress=Contact/adresă nouă
 MyContacts=Contactele mele
@@ -351,16 +359,16 @@ Capital=Capital
 CapitalOf=Capital de %s
 EditCompany=Modificare societate
 ThisUserIsNot=Acest utilizator nu este prospect, client sau furnizor  
-VATIntraCheck=Verificare
-VATIntraCheckDesc=Codul TVA trebuie să includă prefixul țării. Linkul <b> %s </b> utilizează serviciul european de verificare TVA (VIES), care necesită acces la internet de pe serverul Dolibarr.
+VATIntraCheck=Verificare VIES
+VATIntraCheckDesc=Codul TVA trebuie să includă prefixul țării. Linkul <b>%s</b> utilizează serviciul european de verificare TVA (VIES), care necesită acces la internet de pe serverul sistemului.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Verificați codul TV intracomunitar pe site-ul web al Comisiei Europene
-VATIntraManualCheck=De asemenea, puteți verifica manual pe site-ul web al UE <a href="%s" target="_blank"> %s </a>
-ErrorVATCheckMS_UNAVAILABLE=Verificare imposibilă. Verificaţi dacă serviciul este furnizat de către statul membru ( %s).
+VATIntraCheckableOnEUSite=Verificați codul TVA intracomunitar pe site-ul web al Comisiei Europene
+VATIntraManualCheck=De asemenea, puteți verifica manual pe site-ul web al UE <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Verificare imposibilă. Verificaţi dacă serviciul este furnizat de către statul membru (%s).
 NorProspectNorCustomer=Nici prospect, nici client
 JuridicalStatus=Tipul entității comerciale
-Workforce=Forţa de muncă
-Staff=Angajati
+Workforce=Nr. angajaţi
+Staff=Angajaţi
 ProspectLevelShort=Potenţial
 ProspectLevel=Potenţial prospect
 ContactPrivate=Privat
@@ -373,7 +381,7 @@ PL_NONE=Niciunul
 PL_UNKNOWN=Necunoscut
 PL_LOW=Scăzut
 PL_MEDIUM=Mediu
-PL_HIGH=Mare
+PL_HIGH=Ridicat
 TE_UNKNOWN=-
 TE_STARTUP=Startup
 TE_GROUP=Companie mare
@@ -381,7 +389,7 @@ TE_MEDIUM=Companie medie
 TE_ADMIN=Instituţie publică
 TE_SMALL=Companie mică
 TE_RETAIL=Vânzător cu amănuntul
-TE_WHOLE=Angrosist
+TE_WHOLE=Grosist
 TE_PRIVATE=Persoană fizică
 TE_OTHER=Alt
 StatusProspect-1=Nu contacta
@@ -397,11 +405,11 @@ ChangeContactDone=Schimbă statusul la 'Contactat'
 ProspectsByStatus=Prospecţi după status
 NoParentCompany=Niciunul
 ExportCardToFormat=Export fişă în format
-ContactNotLinkedToCompany=Contact nelegat la un terţ
-DolibarrLogin=Identificator utilizator
-NoDolibarrAccess=Utilizator fără acces la Dolibarr
-ExportDataset_company_1=Terți (companii / fundații / persoane fizice) și proprietățile acestora
-ExportDataset_company_2=Persoanele de contact și proprietățile acestora
+ContactNotLinkedToCompany=Contact neasociat la un terţ
+DolibarrLogin=Nume de autentificare
+NoDolibarrAccess=Utilizator fără acces în sistem
+ExportDataset_company_1=Terți (companii/fundații/persoane fizice) și proprietățile acestora
+ExportDataset_company_2=Persoane de contact și proprietățile acestora
 ImportDataset_company_1=Terți și proprietățile acestora
 ImportDataset_company_2=Contacte/adrese și atribute suplimentare pentru terţi
 ImportDataset_company_3=Conturi bancare Terți
@@ -425,13 +433,13 @@ SocialNetworksLinkedinURL=URL Linkedin
 SocialNetworksInstagramURL=URL Instagram
 SocialNetworksYoutubeURL=URL Youtube
 SocialNetworksGithubURL=URL Github
-YouMustAssignUserMailFirst=Trebuie să creați un e-mail pentru acest utilizator înainte de a putea adăuga o notificare prin e-mail.
-YouMustCreateContactFirst=Pentru a putea adaugă notificări pe email, este necesară definirea unor contacte pentru terţi cu adresa de email validă
-ListSuppliersShort=Lista furnizori
+YouMustAssignUserMailFirst=Trebuie să adăugaţi un email pentru acest utilizator înainte de a putea adăuga o notificare prin email.
+YouMustCreateContactFirst=Pentru a putea adaugă notificări pe email, este necesară definirea unor contacte pentru terţi cu adresă de email validă
+ListSuppliersShort=Listă furnizori
 ListProspectsShort=Listă prospecţi
 ListCustomersShort=Listă clienți
 ThirdPartiesArea=Terți/Contacte
-LastModifiedThirdParties=Ultimii %sTerţi modificaţi
+LastModifiedThirdParties=Ultimii %s Terţi modificaţi
 UniqueThirdParties=Total terţi
 InActivity=Deschis
 ActivityCeased=Închis
@@ -440,30 +448,30 @@ ProductsIntoElements=Ultimele produse/servicii în %s
 CurrentOutstandingBill=Facturi neachitate curente
 OutstandingBill=Max. limită credit
 OutstandingBillReached=Limită credit depăsită 
-OrderMinAmount=Suma minimă a comenzii
-MonkeyNumRefModelDesc=Returnați un număr cu formatul %syymm-nnnn pentru codul client și %syymm-nnnn pentru codul furnizor unde yy este anul, mm este luna și nnnn este o secvență fără pauză și nici o revenire la 0.
+OrderMinAmount=Cantitatea minimă de comandă
+MonkeyNumRefModelDesc=Întoarce un număr în format %syymm-nnnn pentru codul clientului și %syymm-nnnn pentru codul furnizorului în care yy este anul, mm este luna și nnnn este un număr secvențial de incrementare automată fără întrerupere și fără revenire la 0.
 LeopardNumRefModelDesc=Codul este liber fără verificare. Acest cod poate fi modificat în orice moment.
 ManagingDirectors=Nume manager(i) (CEO, director, preşedinte...)
 MergeOriginThirdparty=Terț duplicat (terțul dorit a fi șters)
-MergeThirdparties=Îmbină terţi
+MergeThirdparties=Îmbinare terţi
 ConfirmMergeThirdparties=Sunteți sigur că doriți să fuzionați aceast terț cu cel curent? Toate obiectele legate (facturi, comenzi, ...) vor fi mutate la un terț curent, iar terțul va fi șters.
 ThirdpartiesMergeSuccess=Terții au fost unificaţi
 SaleRepresentativeLogin=Autentificare reprezentant vânzări
 SaleRepresentativeFirstname=Numele reprezentantului vânzări
 SaleRepresentativeLastname=Prenumele reprezentantului vânzări
-ErrorThirdpartiesMerge=A apărut o eroare la ștergerea terților Verificați jurnalul. S-a revenit la setarile anterioare.
+ErrorThirdpartiesMerge=A apărut o eroare la ștergerea terților. Verificați jurnalul. S-a revenit la setările anterioare.
 NewCustomerSupplierCodeProposed=Codul clientului sau furnizorului utilizat deja, introduceţi un alt cod
 KeepEmptyIfGenericAddress=Lasă acest câmp gol dacă această adresă este generică
 #Imports
 PaymentTypeCustomer=Tip de plată - Client
-PaymentTermsCustomer=Condiţii de plată - Client
+PaymentTermsCustomer=Termeni de plată - Client
 PaymentTypeSupplier=Tip de plată - Furnizor
 PaymentTermsSupplier=Termen de plată - Furnizor
 PaymentTypeBoth=Tip plată - Client şi Furnizor
-MulticurrencyUsed=Utilizați mai multe monede
-MulticurrencyCurrency=Moneda
+MulticurrencyUsed=Se utilizează mai multe monede
+MulticurrencyCurrency=Monedă
 InEEC=Europa (CEE)
 RestOfEurope=Restul Europei (CEE)
 OutOfEurope=În afara Europei (CEE)
 CurrentOutstandingBillLate=Factura curentă restantă este întârziată
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Aveți grijă, în funcție de setările de preț ale produsului, ar trebui să schimbați terții înainte de a adăuga produsul la POS.
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Aveți grijă, în funcție de setările de preț ale produsului, ar trebui să schimbați terțul înainte de a adăuga produsul la POS.
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index bd3bde9e637..d4ae7a6a2b7 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -1,63 +1,63 @@
 # Dolibarr language file - Source file is en_US - compta
 MenuFinancial=Facturare | Plăți
 TaxModuleSetupToModifyRules=Du-te la <a href="%s"> Configurare modul Taxe</a> pentru a modifica regulile de calcul
-TaxModuleSetupToModifyRulesLT=Du-te la <a href="%s">Companie setup </a> pentru a modifica regulile de calcul
-OptionMode=Opţiunea pentru ţinerea contabilitate
-OptionModeTrue=Opţiunea Venituri -Cheltuieli
+TaxModuleSetupToModifyRulesLT=Du-te la <a href="%s">Setare Companie</a> pentru a modifica regulile de calcul
+OptionMode=Opţiune pentru evidenţa contabilă
+OptionModeTrue=Opţiunea Venituri-Cheltuieli
 OptionModeVirtual=Opţiunea Creanţe-Datorii
-OptionModeTrueDesc=În acest context, se calculează cifra de afaceri de peste de plăţi (data de plăţi). \\ nThe valabilitate a cifrelor este asigurată numai în cazul în care cartea-ţinerea este analizată prin intrare / ieşire de pe conturi, prin intermediul facturilor.
+OptionModeTrueDesc=În acest context, se calculează cifra de afaceri din plăţi (data de plată). Validitatea cifrelor este asigurată numai în cazul în care evidenţa contabilă este analizată prin intrare/ieşire de pe conturi, prin intermediul facturilor.
 OptionModeVirtualDesc=În acest context, cifra de afaceri se calculează pe facturi (data de validare). Când aceste facturi se datorează, indiferent dacă acestea au fost plătite sau nu, ele sunt enumerate în cifra de afaceri de ieşire.
-FeatureIsSupportedInInOutModeOnly=Caracteristicã disponibil doar în CREDITE-DEBTS Mod de contabilitate (a se vedea modul de configurare de contabilitate)
-VATReportBuildWithOptionDefinedInModule=Sumele prezentate aici sunt calculate folosind regulile definite de modul de configurare fiscale.
-LTReportBuildWithOptionDefinedInModule=Sumele prezentate aici sunt calculate folosind regulile definite de modul de configurare Companie.
+FeatureIsSupportedInInOutModeOnly=Caracteristicã disponibilă doar în modul contabil CREDITE-DEBITE (vezi Configurare modul Contabilitate)
+VATReportBuildWithOptionDefinedInModule=Sumele prezentate aici sunt calculate folosind regulile definite de modul de configurare fiscală.
+LTReportBuildWithOptionDefinedInModule=Sumele prezentate aici sunt calculate folosind regulile definite în configurarea Companiei.
 Param=Setări
-RemainingAmountPayment=Sumă de plata rămasă:
+RemainingAmountPayment=Sumă rămasă de plată:
 Account=Cont
-Accountparent=Contul mamă
-Accountsparent=Conturile-mamă
+Accountparent=Cont părinte
+Accountsparent=Conturile părinte
 Income=Venituri
 Outcome=Cheltuieli
-MenuReportInOut=Venituri / Rezultate
+MenuReportInOut=Venituri / Cheltuieli
 ReportInOut=Soldul veniturilor și al cheltuielilor
 ReportTurnover=Cifra de afaceri facturată
 ReportTurnoverCollected=Cifra de afaceri colectată
-PaymentsNotLinkedToInvoice=Plăţile nu sunt legate de orice factură, astfel încât nu au legătură cu o terţă parte
-PaymentsNotLinkedToUser=Plăţile nu sunt legate de orice utilizator
+PaymentsNotLinkedToInvoice=Plăţile neasociate la facturi, nelegate la terţi
+PaymentsNotLinkedToUser=Plăţi neasociate niciunui utilizator
 Profit=Profit
-AccountingResult=Rezultatl contabil
+AccountingResult=Rezultat contabil
 BalanceBefore=Sold (înainte)
 Balance=Sold
 Debit=Debit
 Credit=Credit
 Piece= Doc. contabilitate
 AmountHTVATRealReceived=TVA colectat
-AmountHTVATRealPaid=TVA platit
-VATToPay=Vânzări fiscale
-VATReceived=Taxa primită
-VATToCollect=Achiziții fiscale
+AmountHTVATRealPaid=TVA plătit
+VATToPay=TVA de plată
+VATReceived=TVA colectată
+VATToCollect=TVA de colectat
 VATSummary=Taxă lunară
-VATBalance=Soldul fiscal
-VATPaid=Taxa platită
-LT1Summary=Sumarul taxei 2
-LT2Summary=Sumarul taxei 3
-LT1SummaryES=RE Sold
+VATBalance=Sold TVA
+VATPaid=Taxă platită
+LT1Summary=Sumar taxă 2
+LT2Summary=Sumar taxă 3
+LT1SummaryES=Sold RE
 LT2SummaryES=Sold IRPF
 LT1SummaryIN=Sold CGST 
 LT2SummaryIN=Sold SGST 
 LT1Paid=Taxa 2 plătită
 LT2Paid=Taxa 3 plătită
-LT1PaidES=RE Platit
+LT1PaidES=RE Plătit
 LT2PaidES=IRPF plătit
 LT1PaidIN=CGST plătit
 LT2PaidIN=SGST plătit
-LT1Customer=Vânzări fiscale 2
-LT1Supplier=Taxă achiziții 2 
-LT1CustomerES=RE vanzări
-LT1SupplierES=RE cumpărări
+LT1Customer=Vânzări taxa 2
+LT1Supplier=Achiziţii taxa 2 
+LT1CustomerES=Vânzări RE
+LT1SupplierES=Achiziţii RE
 LT1CustomerIN=Vânzări CGST 
 LT1SupplierIN=Achiziții CGST
-LT2Customer=Vânzări fiscale 3
-LT2Supplier=Taxă achiziții 3 
+LT2Customer=Vânzări taxa 3
+LT2Supplier=Achiziţii taxa 3 
 LT2CustomerES=IRPF de vânzări
 LT2SupplierES=IRPF achiziţii
 LT2CustomerIN=Vânzări SGST
@@ -65,58 +65,62 @@ LT2SupplierIN=Achiziții SGST
 VATCollected=TVA colectat
 StatusToPay=De plată
 SpecialExpensesArea=Plăţi speciale
-SocialContribution=Taxa sociala / fiscala
+VATExpensesArea=Zonă pentru toate plățile de TVA
+SocialContribution=Taxa socială/fiscală
 SocialContributions=Taxe sociale sau fiscale
 SocialContributionsDeductibles=Taxe deductibile
 SocialContributionsNondeductibles=Taxe nedeductibile
 DateOfSocialContribution=Data taxei fiscale sau sociale
-LabelContrib=Eticheta contribuție
-TypeContrib=Tip de contribuție
+LabelContrib=Etichetă contribuție
+TypeContrib=Tip contribuție
 MenuSpecialExpenses=Cheltuieli speciale
 MenuTaxAndDividends=Impozite şi dividende
-MenuSocialContributions=Taxe sociale / fiscale
-MenuNewSocialContribution=Tax social/fiscal nou
-NewSocialContribution=Taxa sociala/fiscala noua
-AddSocialContribution=Adăugați o taxă socială/fiscală
-ContributionsToPay=Taxe sociale / fiscale de plata
+MenuSocialContributions=Taxe sociale/fiscale
+MenuNewSocialContribution=Taxă socială/fiscală nouă
+NewSocialContribution=Taxa socială/fiscală nouă
+AddSocialContribution=Adaugă o taxă socială/fiscală
+ContributionsToPay=Taxe sociale/fiscale de plată
 AccountancyTreasuryArea=Zona de facturare și de plată
 NewPayment=Plată nouă
 PaymentCustomerInvoice=Plată factură client
-PaymentSupplierInvoice=plata facturii furnizorilor
-PaymentSocialContribution=Plata taxe sociale sau fiscale
+PaymentSupplierInvoice=Plată factură furnizor
+PaymentSocialContribution=Plată taxe sociale sau fiscale
 PaymentVat=Plată TVA
+AutomaticCreationPayment=Înregistrare automată a plăţii
 ListPayment=Listă plăţi
 ListOfCustomerPayments=Listă plăţi clienţi
-ListOfSupplierPayments=Lista plăților furnizorului
+ListOfSupplierPayments=Listă plăți furnizori
 DateStartPeriod=Dată început perioadă
 DateEndPeriod=Dată sfârşit perioadă
 newLT1Payment=Plată taxă nouă 2
 newLT2Payment=Plată taxă nouă 3
-LT1Payment=Plata taxa  2
-LT1Payments=Plati taxa  2
-LT2Payment=Plata taxa 3
-LT2Payments=Plati taxa  3
+LT1Payment=Plată taxa 2
+LT1Payments=Plăti taxa 2
+LT2Payment=Plată taxa 3
+LT2Payments=Plăţi taxa 3
 newLT1PaymentES=Plată nouă RE
 newLT2PaymentES=Plată nouă IRPF
-LT1PaymentES=RE Plată
-LT1PaymentsES=RE Plăţi
-LT2PaymentES=IRPF de plata
+LT1PaymentES=Plată RE
+LT1PaymentsES=Plăţi RE
+LT2PaymentES=Plată IRPF
 LT2PaymentsES=Plăţi IRPF 
-VATPayment=Plata taxei pe vânzări
-VATPayments=Plăți pentru impozitul pe vânzări
-VATRefund=Rambursarea taxei pe vânzări
-NewVATPayment=Plata noului impozit pe vânzări
+VATPayment=Plată TVA
+VATPayments=Plăți TVA
+VATDeclarations=Declaraţii TVA
+VATDeclaration=Declaraţie TVA
+VATRefund=Rambursare TVA
+NewVATPayment=Plată nouă TVA
 NewLocalTaxPayment=Plata pentru %s taxa nouă 
 Refund=Rambursare
-SocialContributionsPayments=Plata taxe sociale sau fiscale
+SocialContributionsPayments=Plăţi de taxe sociale/fiscale
 ShowVatPayment=Arata plata TVA
 TotalToPay=Total de plată
 BalanceVisibilityDependsOnSortAndFilters= Soldul este vizibil în această listă numai dacă tabelul este sortat și filtrat pe %s 1 cont bancar (fără alte filtre)
-CustomerAccountancyCode=Codul contabilității clienților
-SupplierAccountancyCode=Codul contabil al furnizorului
+CustomerAccountancyCode=Cod contabil client
+SupplierAccountancyCode=Codul contabil furnizor
 CustomerAccountancyCodeShort=Cont contabil client
 SupplierAccountancyCodeShort=Cont contabil furnizor
-AccountNumber=Numărul de cont
+AccountNumber=Număr cont
 NewAccountingAccount=Cont nou
 Turnover=Cifra de afaceri facturată
 TurnoverCollected=Cifra de afaceri colectată
@@ -125,117 +129,129 @@ ByExpenseIncome= După cheltuieli & venituri
 ByThirdParties=După terţi
 ByUserAuthorOfInvoice=După autorul facturii
 CheckReceipt=Borderou de cecuri remise
-CheckReceiptShort=Borderou cecuri
+CheckReceiptShort=Borderou încasări cecuri
 LastCheckReceiptShort=Ultimele %s cecuri remise
 NewCheckReceipt=Discount nou
 NewCheckDeposit=New verifica depozit
 NewCheckDepositOn=New verifica depozit în contul: %s
 NoWaitingChecks=CEC-uri spre încasare
-DateChequeReceived=Data primire Cec
-NbOfCheques=Numărul de cecuri
-PaySocialContribution=Plăteate o taxă socială / fiscala
-ConfirmPaySocialContribution=Sunteţi sigur că doriţi să clasaţi această taxă ca plătită?
-DeleteSocialContribution=Sterge  o plata taxe sociale sau fiscale 
-ConfirmDeleteSocialContribution=Sunteţi sigur că doriţi să ştergeţi această plată taxa sociala/fiscala?
+DateChequeReceived=Dată primire Cec
+NbOfCheques=Nr. cecuri
+PaySocialContribution=Plăteşte o taxă socială/fiscală
+PayVAT=Plătește o declarație de TVA
+PaySalary=Plată salariu pe card
+ConfirmPaySocialContribution=Sigur doriți să clasificați acest impozit/taxă socială sau fiscală drept plătită?
+ConfirmPayVAT=Sigur doriți să clasificați această declarație de TVA drept plătită?
+ConfirmPaySalary=Sigur doriți să clasificați acest salariu pe card drept plătit?
+DeleteSocialContribution=Şterge o plată de taxe sociale sau fiscale 
+DeleteVAT=Şterge o declaraţie de TVA
+DeleteSalary=Şterge un card de salarii
+ConfirmDeleteSocialContribution=Sigur doriți să ștergeți această plată pentru taxa fiscală/socială?
+ConfirmDeleteVAT=Sigur doriți să ștergeți această declarație de TVA?
+ConfirmDeleteSalary=Sigur doriți să ștergeți acest salariu?
 ExportDataset_tax_1=Taxe sociale și fiscale și plăți 
 CalcModeVATDebt=Mod <b>%s TVA pe baza contabilității de angajament %s</b>.
-CalcModeVATEngagement=Mod <b>%s TVA pe baza venituri-cheltuieli%s.</b>
+CalcModeVATEngagement=Mod <b>%s TVA pe bază venituri-cheltuieli%s.</b>
 CalcModeDebt= Analiza documentelor înregistrate cunoscute chiar dacă acestea nu sunt încă introduse în registru contabil.
 CalcModeEngagement=Analiza plăților înregistrate cunoscute, chiar dacă acestea nu sunt încă înregistrate în registru.
 CalcModeBookkeeping=Analiza datelor publicate în tabelul registrului contabil.
-CalcModeLT1= Mode <b>%sRE pe facturi clienţi - facturi furnizori %s</b>
-CalcModeLT1Debt=Mode <b>%sRE pe facturi clienţi%s</b>
-CalcModeLT1Rec= Mode <b>%sRE pe facturi furnizori%s</b>
-CalcModeLT2= Mode <b>%sIRPF pe facturi clienţi - facturi furnizori%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF pe facturi clienţi%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF pe facturi furnizori%s</b>
+CalcModeLT1= Mod <b>%sRE pe facturi clienţi - facturi furnizori %s</b>
+CalcModeLT1Debt=Mod <b>%sRE pe facturi clienţi%s</b>
+CalcModeLT1Rec= Mod <b>%sRE pe facturi furnizori%s</b>
+CalcModeLT2= Mod <b>%sIRPF pe facturi clienţi - facturi furnizori%s</b>
+CalcModeLT2Debt=Mod <b>%sIRPF pe facturi clienţi%s</b>
+CalcModeLT2Rec= Mod <b>%sIRPF pe facturi furnizori%s</b>
 AnnualSummaryDueDebtMode=Balanța de venituri și cheltuieli, rezumat anual
 AnnualSummaryInputOutputMode=Balanța de venituri și cheltuieli, rezumat anual
-AnnualByCompanies=Soldul veniturilor și al cheltuielilor, pe grupuri predefinite de cont
-AnnualByCompaniesDueDebtMode=Soldul veniturilor și cheltuielilor, detaliu după grupuri predefinite, modul <b> %sCereri-Datorii%s </b> a spus <b> Contabilitatea de angajament </b>.
-AnnualByCompaniesInputOutputMode=Soldul veniturilor și cheltuielilor, detaliile după grupuri predefinite, modul <b> %sVenituri-cheltuieli%s </b> a spus <b> contabilitatea numerică </b>.
+AnnualByCompanies=Soldul veniturilor și al cheltuielilor, pe grupe predefinite de conturi
+AnnualByCompaniesDueDebtMode=Soldul veniturilor și cheltuielilor, detaliate după grupuri predefinite, modul <b>%sCreanţe-Datorii%s </b> aşa zisa <b>Contabilitate de angajament</b>.
+AnnualByCompaniesInputOutputMode=Soldul veniturilor și cheltuielilor, detaliate după grupuri predefinite, modul <b>%sVenituri-Cheltuieli%s</b> aşa zisa <b>Contabilitate numerică</b>.
 SeeReportInInputOutputMode=Consultați <b>%s analiza plăților %s</b> pentru un calcul bazat pe <b>plățile înregistrate</b> efectuate chiar dacă acestea nu sunt încă contabilizate în Registru
 SeeReportInDueDebtMode=Consultați <b>%s analiza documentelor înregistrate %s</b> pentru un calcul pe baza <b>documentelor înregistrate</b> cunoscute, chiar dacă acestea nu sunt încă contabilizate în Registru
 SeeReportInBookkeepingMode=Consultați <b>%sanaliza registrului contabil%s</b> pentru un raport bazat pe <b>Registrul de contabilitate</b>
-RulesAmountWithTaxIncluded=- Valoarea afişată este cu toate taxele incluse
+RulesAmountWithTaxIncluded=- Valorile afişate sunt cu toate taxele incluse
 RulesResultDue=- Include facturi restante, cheltuieli, TVA, donații indiferent dacă sunt plătite sau nu. Include și salariile plătite. <br>- se bazează pe data de emitere a facturilor și data scadenței pentru cheltuieli sau plăți fiscale. Pentru salariile definite cu modulul Salarii, se utilizează data plăţii. 
 RulesResultInOut=- Include plățile efective pe facturi, cheltuieli,TVA și salarii. <br> - Se ia  în calcul data plăţii facturilor, cheltuielilor, TVA-ului  și salariilor .
 RulesCADue=- Include facturile client scadente indiferent dacă sunt încasate sau nu. <br>- Se bazează pe data emiterii acestor facturi.<br> 
 RulesCAIn=- include toate plățile efective ale facturilor primite de la clienți. <br> - se bazează pe data de plată a acestor facturi <br>
 RulesCATotalSaleJournal=Acesta include toate liniile de credit din jurnalul de vânzare.
-RulesAmountOnInOutBookkeepingRecord=Acesta include înregistrarea în registrul dvs. cu conturi contabile care are grupul "CHELTUIELI" sau "VENIT"
-RulesResultBookkeepingPredefined=Acesta include înregistrarea în registrul dvs. cu conturi contabile care are grupul "CHELTUIELI" sau "VENIT"
-RulesResultBookkeepingPersonalized=Se înregistrează în registrul dvs. cu conturi contabile <b> grupate după grupuri personalizate </b>
-SeePageForSetup=Vedeți meniul <a href="%s"> %s </a> pentru configurare
+RulesSalesTurnoverOfIncomeAccounts=Include (credit - debit) linii pentru conturile de produse din grupul VENITURI
+RulesAmountOnInOutBookkeepingRecord=Acesta include înregistrarea în Registrul contabil cu conturi contabile din grupa "CHELTUIELI" sau "VENITURI"
+RulesResultBookkeepingPredefined=Acesta include înregistrarea în Registrul contabil cu conturi contabile din grupa "CHELTUIELI" sau "VENITURI"
+RulesResultBookkeepingPersonalized=Se înregistrează în registrul tău contabil cu conturile <b> grupate în grupe personalizate</b>
+SeePageForSetup=Vezi meniul <a href="%s"> %s </a> pentru configurare
 DepositsAreNotIncluded=- Facturile de plată în avans nu sunt incluse
 DepositsAreIncluded=- Sunt incluse facturile de plată în avans
 LT1ReportByMonth=Taxa 2 raportare lunară
 LT2ReportByMonth=Taxa 3 raportare lunară
-LT1ReportByCustomers=Raportați taxa 2 de către un terț
-LT2ReportByCustomers=Raportați taxa 3 de către un terț
+LT1ReportByCustomers=Raportare taxa 2 după un terț
+LT2ReportByCustomers=Raport taxa 3 după terţi
 LT1ReportByCustomersES=Raport pe terţ RE
-LT2ReportByCustomersES=Raport de terţă parte IRPF
-VATReport=Raport privind impozitul pe vânzare
-VATReportByPeriods=Raport privind impozitul pe vânzare după perioadă
+LT2ReportByCustomersES=Raport IRPF după terţi
+VATReport=Raport TVA
+VATReportByPeriods=Raport TVA după perioade
 VATReportByMonth=Taxa pe vânzări TVA raportare lunară
-VATReportByRates=Raport privind impozitul pe vânzare pe tarife
-VATReportByThirdParties=Raportul privind impozitul pe vânzări de către terți
-VATReportByCustomers=Raportul privind impozitul pe vânzări de către client
+VATReportByRates=Raport TVA pe cote
+VATReportByThirdParties=Raport TVA pe terți
+VATReportByCustomers=Raport TVA după client
 VATReportByCustomersInInputOutputMode=Raport după TVA client colectat și plătit
-VATReportByQuartersInInputOutputMode=Raportați cu privire la rata de impozitare a vânzărilor pentru taxa colectată și plătită
-LT1ReportByQuarters=Raportați impozitul 2 în funcție de rată
-LT2ReportByQuarters=Raportați impozitul 3 în funcție de rată
-LT1ReportByQuartersES=Raport pe rată RE
-LT2ReportByQuartersES=Raport pe rată IRPF
-SeeVATReportInInputOutputMode=A se vedea raportul <b>%sVAT encasement%s</b> pentru un calcul standard
-SeeVATReportInDueDebtMode=A se vedea raportul <b>privind %sVAT flow%s</b> pentru un calcul, cu o opţiune de pe fluxul
-RulesVATInServices=- Pentru servicii, raportul include regularizările de TVA efectiv primite sau emise pe baza datelor plăților.
+VATReportByQuartersInInputOutputMode=Raport TVA după taxa colectată și plătită
+VATReportShowByRateDetails=Arată detalii despre această cotă
+LT1ReportByQuarters=Raport taxa 2 după cotă
+LT2ReportByQuarters=Raport taxa 3 după cotă
+LT1ReportByQuartersES=Raport după cota RE
+LT2ReportByQuartersES=Raport pe cotă IRPF
+SeeVATReportInInputOutputMode=Vezi raportul <b>%sVAT încasat%s</b> pentru un calcul standard
+SeeVATReportInDueDebtMode=Vezi raportul <b>%s TVA %s</b> pentru un calcul cu opţiune pe fluxul
+RulesVATInServices=- Pentru servicii, raportul include regularizările de TVA efectiv primite sau emise pe baza datei plăților.
 RulesVATInProducts=- Pentru activele materiale, raportul include TVA primită sau emisă pe baza datei plății.
 RulesVATDueServices=- Pentru servicii, raportul include facturi TVA-ului datorat, plătite sau nu, în funcţie de data facturii.
 RulesVATDueProducts=- Pentru active materiale, raportul include facturile cu TVA, pe baza datei facturii.
 OptionVatInfoModuleComptabilite=Notă: Pentru bunuri materiale, ar trebui să utilizeze la data livrării să fie mai echitabil.
 ThisIsAnEstimatedValue=Aceasta este o previzualizare, bazată pe evenimente de afaceri și nu pe tabelul final, astfel încât rezultatele finale pot fi diferite de aceste valori de previzualizare
-PercentOfInvoice=%%/factura
+PercentOfInvoice=%%/factură
 NotUsedForGoods=Nu sunt utilizate pentru cumpărarea de bunuri
-ProposalStats=Statistici privind ofertele
-OrderStats=Statistici privind comenzile
+ProposalStats=Statistici oferte comeciale
+OrderStats=Statistici comenzi
 InvoiceStats=Statistici privind facturile
-Dispatch=Dispecerizare
+Dispatch=Expediere
 Dispatched=Expediate
-ToDispatch=De  expediat
-ThirdPartyMustBeEditAsCustomer=A treia parte trebuie să fie definit ca un client
-SellsJournal=Jurnalul de vânzări
-PurchasesJournal=Jurnalul de cumpărări
-DescSellsJournal=Jurnalul de vânzări
-DescPurchasesJournal=Jurnalul de cumpărări
+ToDispatch=De expediat
+ThirdPartyMustBeEditAsCustomer=Terţul trebuie să fie definit ca şi client
+SellsJournal=Jurnal de vânzări
+PurchasesJournal=Jurnal de cumpărări
+DescSellsJournal=Jurnal de vânzări
+DescPurchasesJournal=Jurnal de cumpărări
 CodeNotDef=Nedefinit
 WarningDepositsNotIncluded=Facturile de plată în avans nu sunt incluse în această versiune cu acest modul de contabilitate.
 DatePaymentTermCantBeLowerThanObjectDate=Termenul de plată nu poate fi mai mic decât data obiectului.
-Pcg_version=Diagramă de modele de conturi
-Pcg_type=Pcg tip
-Pcg_subtype=Pcg subtip
+Pcg_version=Planuri de conturi
+Pcg_type=Tip Pcg
+Pcg_subtype=Subtip Pcg
 InvoiceLinesToDispatch=Linii factură de expediat
 ByProductsAndServices=Pe produs și serviciu
 RefExt=Referinţă externă
-ToCreateAPredefinedInvoice= Pentru a crea o factură model/ template, se crează o factură standard, apoi, fără a fi validată, se apasă pe butonul  "%s". 
-LinkedOrder=Link către comandă
+ToCreateAPredefinedInvoice=Pentru a crea o factură șablon, creați o factură standard, apoi, fără a o valida, faceți clic pe butonul "%s".
+LinkedOrder=Comandă asociată
 Mode1=Metoda 1
 Mode2=Metoda 2
 CalculationRuleDesc=Pentru a calcula totalul TVA, există două metode: <br> Metoda 1 este rotunjirea TVA-ului pe fiecare linie, apoi însumarea lor. <br> Metoda 2 este însumarea tututor TVA rilor de pe fiecare linie, apoi rotunjirea rezultatului. <br> Rezultatul final poate fi diferit cu câțiva cenți. Modul implicit este <b>%s</b>.
 CalculationRuleDescSupplier=În funcție de furnizor, alegeți metoda potrivită pentru a aplica aceeași regulă de calcul și obțineți același rezultat așteptat de către furnizor.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Raportul cifrei de afaceri colectat pe produs nu este disponibil. Acest raport este disponibil numai pentru cifra de afaceri facturată.
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Raportul cifrei de afaceri colectat pe rata de impozitare a vânzării nu este disponibil. Acest raport este disponibil numai pentru cifra de afaceri facturată.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Raportul cifrei de afaceri colectate după cota TVA nu este disponibil. Acest raport este disponibil numai pentru cifra de afaceri facturată.
 CalculationMode=Mod calcul
-AccountancyJournal=Jurnalul codului de contabilitate
-ACCOUNTING_VAT_SOLD_ACCOUNT=Contul de contabilitate implicit pentru TVA la vânzări (utilizat dacă nu este definit în setarea dicționarului TVA)
-ACCOUNTING_VAT_BUY_ACCOUNT=Contul de contabilitate implicit pentru TVA la achiziții (utilizat dacă nu este definit în setarea dicționarului TVA)
-ACCOUNTING_VAT_PAY_ACCOUNT=Contul de contabilitate implicit pentru plata TVA
-ACCOUNTING_ACCOUNT_CUSTOMER=Contul de contabilitate utilizat pentru terț client
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Contul contabil dedicat definit pe cardul terț va fi utilizat numai pentru subregistrul contabilitate . Aceasta va fi utilizat pentru registrul general și ca valoare implicită pentru subregistru contabill dacă nu este definit contul contabil dedicat clienților de la terți.
-ACCOUNTING_ACCOUNT_SUPPLIER=Contul de conturi utilizat pentru terții furnizori
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Contul contabil dedicat definit pe cardul terț va fi utilizat numai pentru subregistru de contabilitate . Acesta va fi utilizat pentru registrul general și ca valoare implicită a contabilității din subregistru dacă nu este definit contul de contabilitate dedicat vânzătorului de la un terț.
-ConfirmCloneTax=Confirmați clona unei taxe sociale fiscale
-CloneTaxForNextMonth=Clonaţi-o pentru luna următoare
+AccountancyJournal=Jurnal contabil
+ACCOUNTING_VAT_SOLD_ACCOUNT=Contul contabil implicit pentru TVA la vânzări (utilizat dacă nu este definit în setarea dicționarului TVA)
+ACCOUNTING_VAT_BUY_ACCOUNT=Contul contabil implicit pentru TVA la achiziții (utilizat dacă nu este definit în setarea dicționarului TVA)
+ACCOUNTING_VAT_PAY_ACCOUNT=Contul contabil implicit pentru plata TVA
+ACCOUNTING_ACCOUNT_CUSTOMER=Contul contabil utilizat pentru terți clienţi
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Contul contabil dedicat definit pe fişa terțului va fi utilizat numai pentru subregistrul contabilitate . Aceasta va fi utilizat pentru registrul general și ca valoare implicită pentru subregistru contabill dacă nu este definit contul contabil dedicat clienților de la terți.
+ACCOUNTING_ACCOUNT_SUPPLIER=Contul contabil utilizat pentru terți furnizori
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Contul contabil dedicat definit pe fişa terțului va fi utilizat numai pentru subregistrul contabil. Acesta va fi utilizat pentru Registrul general și ca valoare implicită a contabilității din subregistru dacă nu este definit contul contabil de vânzare asociat la un terț.
+ConfirmCloneTax=Confirmare clonare taxă socială/fiscală
+ConfirmCloneVAT=Confirmați clonarea unei declarații de TVA
+ConfirmCloneSalary=Confirmare clonare salariu
+CloneTaxForNextMonth=Clonare pentru luna următoare
 SimpleReport=Raport simplu
 AddExtraReport=Rapoarte suplimentare (adăugați raportul clienților străini și naționali)
 OtherCountriesCustomersReport=Raport clienţi externi
@@ -243,28 +259,30 @@ BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Pe baza pr
 SameCountryCustomersWithVAT=Raport clienţi interni
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Pe baza primelor două litere ale codului de TVA ca fiind același cu codul de țară al companiei dumneavoastră
 LinkedFichinter= Link către intervenție
-ImportDataset_tax_contrib=Taxe sociale / fiscale
+ImportDataset_tax_contrib=Taxe sociale/fiscale
 ImportDataset_tax_vat=Plăți TVA
 ErrorBankAccountNotFound= Eroare: cont bancar nu a fost găsit
 FiscalPeriod=Perioadă contabilă
 ListSocialContributionAssociatedProject=Lista contribuțiilor sociale asociate proiectului
-DeleteFromCat=Eliminați din grupul de contabilitate
-AccountingAffectation=Contabilitate
+DeleteFromCat=Eliminare din grupa contabilă
+AccountingAffectation=Asociere conturi contabile
 LastDayTaxIsRelatedTo=Ultima zi a perioadei în care se aplică taxa
 VATDue=Taxa de vânzare a fost revendicată
 ClaimedForThisPeriod=Revendicată pentru perioada
-PaidDuringThisPeriod=Plătit în această perioadă
-ByVatRate=Prin cota de impozit pe vânzare
-TurnoverbyVatrate=Cifra de afaceri facturată prin rata impozitului pe vânzare
-TurnoverCollectedbyVatrate=Cifra de afaceri colectată prin rata impozitului pe vânzare
-PurchasebyVatrate=Cumpărare prin rata de impozitare a vânzării
-LabelToShow=Etichetă scurta
-PurchaseTurnover=Cifră de afaceri achiziţii
-PurchaseTurnoverCollected=Cifra de afaceri colectată achiziţii
+PaidDuringThisPeriod=Plătit pentru această perioadă
+PaidDuringThisPeriodDesc=Aceasta este suma tuturor plăților legate de declarațiile de TVA care au o dată de sfârșit de perioadă în intervalul de date selectat
+ByVatRate=După cota TVA
+TurnoverbyVatrate=Cifra de afaceri facturată după cota TVA
+TurnoverCollectedbyVatrate=Cifra de afaceri colectată după cota TVA
+PurchasebyVatrate=Achiziţii după cota de TVA
+LabelToShow=Etichetă scurtă
+PurchaseTurnover=Cifră de afaceri din achiziţii
+PurchaseTurnoverCollected=Cifra de afaceri colectată din achiziţii
 RulesPurchaseTurnoverDue=- Include facturile restante la furnizori indiferent dacă sunt achitate sau nu. - <br>Se bazează pe data de emitere a acestor facturi.<br>
 RulesPurchaseTurnoverIn=- Include toate plățile efectuate ale facturilor de la furnizori. <br>- Se bazează pe data la care s-au plătit aceste facturi<br> 
 RulesPurchaseTurnoverTotalPurchaseJournal=Include toate liniile debitoare din jurnalul de cumpărări
-ReportPurchaseTurnover=Cifra de afaceri achiziţii facturate
-ReportPurchaseTurnoverCollected=Cifra de afaceri colectată achiziţii
+RulesPurchaseTurnoverOfExpenseAccounts=Include (debit - credit) linii pentru conturi de produse din grupul CHELTUIELI
+ReportPurchaseTurnover=Cifra de afaceri pe achiziţii facturate
+ReportPurchaseTurnoverCollected=Cifra de afaceri colectată din achiziţii
 IncludeVarpaysInResults = Include plăţile diverse în rapoarte
 IncludeLoansInResults =  Includeți creditele - împrumuturile în rapoarte
diff --git a/htdocs/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
index f8c93629ab9..d987ac9d0f1 100644
--- a/htdocs/langs/ro_RO/ecm.lang
+++ b/htdocs/langs/ro_RO/ecm.lang
@@ -1,43 +1,47 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Număr de documente în director
+ECMNbOfDocs=Nr. de documente în director
 ECMSection=Director
-ECMSectionManual=Director Manual
-ECMSectionAuto=Director Automat
+ECMSectionManual=Director manual
+ECMSectionAuto=Director automat
 ECMSectionsManual=Arbore manual
 ECMSectionsAuto=Arbore automat
 ECMSections=Directoare
-ECMRoot=Rădăcină ECM Electronic Content Management
-ECMNewSection=Director  Nou
-ECMAddSection=Adaugă  Director
+ECMRoot=ECM rădăcină
+ECMNewSection=Director nou
+ECMAddSection=Adaugă director
 ECMCreationDate=Data creării
 ECMNbOfFilesInDir=Număr fişiere în director
 ECMNbOfSubDir=Număr sub-directoare
 ECMNbOfFilesInSubDir=Număr fișiere în sub-directoare
 ECMCreationUser=Creator
-ECMArea=Domeniul DMS Document Management System / ECM Electronic Content Management
-ECMAreaDesc=Domeniul DMS / ECM (Document Management System / Electronic Content Management) vă permite să salvați, să partajați și să căutați rapid toate tipurile de documente din Dolibarr.
+ECMArea=DMS/ECM
+ECMAreaDesc=DMS/ECM (Document Management System / Electronic Content Management) vă permite să salvați, să partajați și să căutați rapid toate tipurile de documente în Dolibarr.
 ECMAreaDesc2=* Directoarele automate sunt completate în mod automat atunci când se adaugă documentele din fişa acelui element. <br> * Directoarele manuale poate fi folosite pentru a salva documente ce nu sunt legate de un anumit element.
-ECMSectionWasRemoved=Directorul <b>%s</b> a fost ştears.
+ECMSectionWasRemoved=Directorul <b>%s</b> a fost şters.
 ECMSectionWasCreated=Directorul <b> %s </b> a fost creat.
-ECMSearchByKeywords=Caută dupa cuvinte cheie
+ECMSearchByKeywords=Caută după cuvinte cheie
 ECMSearchByEntity=Caută după obiect
-ECMSectionOfDocuments=Directoare  documente
+ECMSectionOfDocuments=Directoare documente
 ECMTypeAuto=Automat
 ECMDocsBy=Documente asociate la %s
-ECMNoDirectoryYet=Niciun directorul creat
+ECMNoDirectoryYet=Niciun director creat
 ShowECMSection=Arată director
-DeleteSection=Elimină director
+DeleteSection=Şterge director
 ConfirmDeleteSection=Puteți confirma că doriți să ștergeți directorul <b> %s</b>?
-ECMDirectoryForFiles=Director relativ  pentru fişierele
+ECMDirectoryForFiles=Director relativ pentru fişiere
 CannotRemoveDirectoryContainsFilesOrDirs=Eliminarea nu este posibilă deoarece conține anumite fișiere sau subdirectoare
 CannotRemoveDirectoryContainsFiles=Eliminarea nu este posibilă deoarece conține unele fișiere
-ECMFileManager=Manager Fişiere
-ECMSelectASection=Selectați un director din arbore ...
+ECMFileManager=Manager fişiere
+ECMSelectASection=Selectați un director din arbore...
 DirNotSynchronizedSyncFirst=Acest director pare să fie creat sau modificat în afara modulului ECM Electronic Content Management. Trebuie să faceți clic mai întâi pe butonul "Resync" pentru a sincroniza discul și baza de date pentru a obține conținutul acestui director.
-ReSyncListOfDir=Resincronizați lista directoarelor
+ReSyncListOfDir=Resincronizare listă directoare
 HashOfFileContent=Hash-ul conținutului fișierului
 NoDirectoriesFound=Nu s-au găsit directoare
 FileNotYetIndexedInDatabase=Fișierul nu este încă indexat în baza de date (încercați să îl reîncărcați)
 ExtraFieldsEcmFiles=Extracâmpuri Fişiere ECM
 ExtraFieldsEcmDirectories=Extracâmpuri Directoare ECM
 ECMSetup=Configurare ECM
+GenerateImgWebp=Duplică toate imaginile cu o altă versiune în format .webp
+ConfirmGenerateImgWebp=Dacă confirmi, vei genera o imagine în format .webp pentru toate imaginile aflate în prezent în acest folder și subfolderul său...
+ConfirmImgWebpCreation=Confirmă duplicarea tuturor imaginilor
+SucessConvertImgWebp=Imaginile au fost duplicate cu succes
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 01159bce39a..d31612d2443 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=Ncio eroare, dăm commit
+NoErrorCommitIsDone=Nicio eroare, dăm commit
 # Errors
 ErrorButCommitIsDone=Erori constatate dar încă nevalidate
 ErrorBadEMail=Emailul %s este greșit
@@ -9,223 +9,225 @@ ErrorBadMXDomain=Email-ul %s pare greșit (domeniul nu are nicio înregistrare M
 ErrorBadUrl=Url-ul %s este greşit
 ErrorBadValueForParamNotAString=Valoare greșită pentru parametru. Se adaugă,  în general, atunci când traducerea lipsește.
 ErrorRefAlreadyExists=Referinţa <b>%s</b> există deja.
-ErrorLoginAlreadyExists=Login %s există deja.
+ErrorLoginAlreadyExists=Login-ul %s există deja.
 ErrorGroupAlreadyExists=Grupul %s există deja.
-ErrorRecordNotFound=Înregistrarea nu a fost găsit.
-ErrorFailToCopyFile=Nu a reuşit să copiaţi fişierul <b>&quot;%s&quot;</b> în <b>&quot;%s&quot;.</b>
-ErrorFailToCopyDir=Nu a reușit să copieze directorul "<b> %s </b>" în "<b> %s </b>".
-ErrorFailToRenameFile=Nu a reuşit să redenumiţi fişierul <b>&quot;%s&quot;</b> în <b>&quot;%s&quot;.</b>
-ErrorFailToDeleteFile=Nu a reuşit să eliminaţi fişierul <b>" %s".</b>
-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=Nu a reușit să înlocuiască în fișierul "<b> %s </b>".
-ErrorFailToGenerateFile=Nu a reușit să genereze fișierul"<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.
+ErrorRecordNotFound=Înregistrarea nu a fost găsită.
+ErrorFailToCopyFile=Eşec la copierea fişierului <b>%s</b> în <b>%s</b>.
+ErrorFailToCopyDir=Eşec la copierea directorului '<b>%s</b>' în '<b>%s</b>'.
+ErrorFailToRenameFile=Eşec la redenumirea fişierului <b>%s</b> în <b>%s</b>.
+ErrorFailToDeleteFile=Eşec la ştergerea fişierului '<b>%s</b>'.
+ErrorFailToCreateFile=Nu s-a putut creea fişierul '<b>%s</b>'.
+ErrorFailToRenameDir=Eşec la redenumirea directorului '<b>%s</b>' în '<b>%s</b>'.
+ErrorFailToCreateDir=Nu s-a putut crea directorul '<b>%s</b>'.
+ErrorFailToDeleteDir=Nu s-a putut şterge directorul '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Nu s-a putut înlocui în fișierul '<b>%s</b>'.
+ErrorFailToGenerateFile=Nu s-a putut genera fișierul '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=Acest contact este deja definit ca persoană de contact de acest tip.
+ErrorCashAccountAcceptsOnlyCashMoney=Acest cont bancar este un cont de numerar, sunt accepate doar plăţi de tip cash.
+ErrorFromToAccountsMustDiffers=Contul bancar sursă şi contul bancar destinaţie trebuie să fie diferite.
 ErrorBadThirdPartyName=Valoare greşită pentru numele terțului
 ErrorProdIdIsMandatory=%s este obligatoriu
-ErrorBadCustomerCodeSyntax=Bad sintaxă pentru codul de client
-ErrorBadBarCodeSyntax=Sintaxă greșită pentru codul de bare. Poate s-a setat un tip de cod de bare greșit sau ați definit o mască de cod de bare pentru numerotare care nu se potrivește cu valoarea scanată.
-ErrorCustomerCodeRequired=Clientul codul necesar
-ErrorBarCodeRequired=Codul de bare necesar
-ErrorCustomerCodeAlreadyUsed=Clientul codul folosit deja
-ErrorBarCodeAlreadyUsed=Codul de bare utilizat deja
-ErrorPrefixRequired=Prefix necesare
-ErrorBadSupplierCodeSyntax=Sintaxă greșită pentru codul furnizorului
-ErrorSupplierCodeRequired=Codul furnizorului este necesar
-ErrorSupplierCodeAlreadyUsed=Codul furnizorului deja folosit
-ErrorBadParameters=Bad parametrii
+ErrorBadCustomerCodeSyntax=Sintaxă eronată pentru codul de client
+ErrorBadBarCodeSyntax=Sintaxă greșită pentru codul de bare. Poate s-a setat un tip de cod de bare greșit sau ați definit o mască de numerotare care nu se potrivește cu valoarea scanată.
+ErrorCustomerCodeRequired=Codul client este obligatoriu
+ErrorBarCodeRequired=Codul de bare este obligatoriu
+ErrorCustomerCodeAlreadyUsed=Codul de clientul este folosit deja
+ErrorBarCodeAlreadyUsed=Codul de bare este utilizat deja
+ErrorPrefixRequired=Prefix obligatoriu
+ErrorBadSupplierCodeSyntax=Sintaxă greșită pentru codul furnizor
+ErrorSupplierCodeRequired=Codul furnizor este obligatoriu
+ErrorSupplierCodeAlreadyUsed=Codul furnizorului este deja folosit
+ErrorBadParameters=Parametri eronaţi
 ErrorWrongParameters=Parametri eronaţi sau parametri lipsă
-ErrorBadValueForParameter=Valoarea  incorectă  '%s'  pentru parametrul '%s'
-ErrorBadImageFormat=Fișier de imagine nu are un format acceptat (PHP dvs. nu acceptă funcții pentru a converti imagini de acest format)
-ErrorBadDateFormat=&quot;%s&quot; Valoarea are formatul de dată greşit
-ErrorWrongDate=Data nu este corecta!
-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 este asociat entităților Dolibarr.
-ErrorFieldsRequired=Unele campuri obligatorii nu au fost ocupate.
-ErrorSubjectIsRequired=Tema e-mailului este necesară
-ErrorFailedToCreateDir=Nu a reuşit să creeze un director. Verificaţi ca server Web utilizator are permisiuni pentru a scrie în directorul de Dolibarr documente. Dacă <b>safe_mode</b> parametru este activat pe această PHP, Dolibarr verifica faptul că fişierele PHP detine la server web utilizator (sau grup).
-ErrorNoMailDefinedForThisUser=Nu mail definite pentru acest utilizator
-ErrorSetupOfEmailsNotComplete=Configurarea email-urilor nu este finalizată
-ErrorFeatureNeedJavascript=Această caracteristică JavaScript trebuie activat pentru a fi la locul de muncă. Schimbare în acest setup - display.
-ErrorTopMenuMustHaveAParentWithId0=Un meniu de tip "Top" nu poate avea un părinte de meniu. Pune-0 în meniul părinte sau alege un meniu de tip "stânga".
-ErrorLeftMenuMustHaveAParentId=Un meniu de tip "stânga" trebuie să aibă o mamă id.
-ErrorFileNotFound=Fişierul nu a fost găsit (Bad calea, greşit permisiunile de acces refuzat sau de openbasedir parametru)
-ErrorDirNotFound=Director <b>%s</b> nu a fost găsit (calea Bad, permisiuni greşite sau acces refuzat de către openbasedir PHP, sau safe_mode parametru)
-ErrorFunctionNotAvailableInPHP=<b>Funcţia %s</b> este necesar pentru această funcţie, dar nu este disponibil în această versiune / setup de PHP.
+ErrorBadValueForParameter=Valoare  incorectă  '%s'  pentru parametrul '%s'
+ErrorBadImageFormat=Fișierul de imagine nu are un format acceptat (Configuraţia PHP nu are funcții de conversie pentru acest format)
+ErrorBadDateFormat=Valoarea '%s'  are formatul de dată greşit
+ErrorWrongDate=Data nu este corectă!
+ErrorFailedToWriteInDir=Nu s-a reuşit scrierea în directorul %s
+ErrorFoundBadEmailInFile=S-a găsit o sintaxă de email incorectă pentru liniile %s din fișier (exemplu de linie %s cu email=%s)
+ErrorUserCannotBeDelete=Utilizatorul nu poate fi șters. Poate este asociat unor entități de sistem.
+ErrorFieldsRequired=Unele câmpuri obligatorii nu au fost completate.
+ErrorSubjectIsRequired=Subiectul emailului este obligatoriu
+ErrorFailedToCreateDir=Eşec la crearea unui director. Verificaţi dacă user-ul server-ului web are permisiuni pentru a scrie în directorul de documente. Dacă parametrul <b>safe_mode</b> este activat în PHP, verifică dacă user-ul sistem deţine fişierele  de pe server(sau grup).
+ErrorNoMailDefinedForThisUser=Nicio adresă de email definită pentru acest utilizator
+ErrorSetupOfEmailsNotComplete=Configurarea emailurilor nu este finalizată
+ErrorFeatureNeedJavascript=Această caracteristică necesită ca JavaScript să fie activat pentru a funcţiona. Modificaţi în  Setări - Afişare.
+ErrorTopMenuMustHaveAParentWithId0=Un meniu de tip 'Top' nu poate avea un meniu părinte. Pune 0 la meniul părinte sau alege un meniu de tip 'Stânga'.
+ErrorLeftMenuMustHaveAParentId=Un meniu de tip 'Stânga' trebuie să aibă un id părinte.
+ErrorFileNotFound=Fişierul <b>%s</b> nu a fost găsit (cale eronată, greşit permisiunile de acces greşite sau refuzate de PHP openbasedir sau parametrul safe_mode)
+ErrorDirNotFound=Directorul <b>%s</b> nu a fost găsit (cale eronată, permisiuni greşite sau acces refuzat de către openbasedir PHP, sau parametrul safe_mode)
+ErrorFunctionNotAvailableInPHP=Funcţia <b>%s</b> este necesară pentru această caracteristică, dar nu este disponibilă în această versiune/configuraţie de PHP.
 ErrorDirAlreadyExists=Un director cu acest nume există deja.
 ErrorFileAlreadyExists=Un fişier cu acest nume există deja.
-ErrorPartialFile=Fişierul nu a primit complet de server.
-ErrorNoTmpDir=Temporare directy %s nu există.
-ErrorUploadBlockedByAddon=Încărcaţi blocat de un PHP / Apache plug-in.
+ErrorDestinationAlreadyExists=Un fişier cu numele <b>%s</b> există deja.
+ErrorPartialFile=Fişierul nu a fost recepţionat complet de server.
+ErrorNoTmpDir=Directorul temporar %s nu există.
+ErrorUploadBlockedByAddon=Încărcarea este blocată de un plugin PHP/Apache.
 ErrorFileSizeTooLarge=Dimensiunea fişierului este prea mare.
 ErrorFieldTooLong=Câmpul %s este prea lung.
-ErrorSizeTooLongForIntType=Prea mult timp pentru tipul int (%s cifre maxim) Dimensiune
-ErrorSizeTooLongForVarcharType=Prea mult timp pentru tipul de coarde (%s de caractere maxim) Dimensiune
+ErrorSizeTooLongForIntType=Dimensiunea este prea mare pentru tipul int (%s cifre maxim)
+ErrorSizeTooLongForVarcharType=Dimensiune prea mare pentru tipul string(%s caractere maxim)
 ErrorNoValueForSelectType=Completaţi valorile pentru lista de selecţie
 ErrorNoValueForCheckBoxType=Completaţi valorile pentru lista checkbox
 ErrorNoValueForRadioType=Completaţi valorile pentru lista radio
 ErrorBadFormatValueList=Valorile din lista nu pot avea mai mult de o virgulă: <u>%s</u>, dar trebuie să aibă cel puțin o: cheie, valoare
-ErrorFieldCanNotContainSpecialCharacters=Câmpul <b> %s </b> nu trebuie să conțină caractere speciale.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Câmpul <b> %s </b> nu trebuie să conțină caractere speciale sau majuscule și nu poate conține numai numere.
-ErrorFieldMustHaveXChar=Câmpul <b> %s </b> trebuie să aibă cel puțin %scaractere .
-ErrorNoAccountancyModuleLoaded=Modul de contabilitate neactivat 
-ErrorExportDuplicateProfil=Acest profil nume există deja pentru acest set de export.
-ErrorLDAPSetupNotComplete=Dolibarr-LDAP de potrivire nu este completă.
-ErrorLDAPMakeManualTest=A. Ldif fişier a fost generat în directorul %s. Încercaţi să încărcaţi manual de la linia de comandă pentru a avea mai multe informatii cu privire la erori.
+ErrorFieldCanNotContainSpecialCharacters=Câmpul <b>%s</b> nu trebuie să conțină caractere speciale.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Câmpul <b>%s</b> nu trebuie să conțină caractere speciale sau majuscule și nu poate conține numai numere.
+ErrorFieldMustHaveXChar=Câmpul <b>%s</b> trebuie să aibă cel puțin %scaractere.
+ErrorNoAccountancyModuleLoaded=Modulul Contabilitate nu este activat 
+ErrorExportDuplicateProfil=Acest nume de profil există deja pentru acest set de export.
+ErrorLDAPSetupNotComplete=Potrivirea Dolibarr-LDAP nu este finalizată.
+ErrorLDAPMakeManualTest=Un fişier .ldif a fost generat în directorul %s. Încercaţi să încărcaţi manual din linia de comandă pentru a avea mai multe informatii cu privire la erori.
 ErrorCantSaveADoneUserWithZeroPercentage=Nu se poate salva o acțiune cu "starea nu a început" dacă se completează și câmpul "efectuat de".
 ErrorRefAlreadyExists=Referinţa <b>%s</b> există deja.
 ErrorPleaseTypeBankTransactionReportName=Introduceți numele contului bancar unde trebuie raportată înregistrarea (Format YYYYMM sau YYYYMMDD)
-ErrorRecordHasChildren=Nu s-a reușit ștergerea înregistrării deoarece are unele înregistrări copii.
+ErrorRecordHasChildren=Nu s-a reușit ștergerea înregistrării deoarece are unele înregistrări copil.
 ErrorRecordHasAtLeastOneChildOfType=Obiectul are cel puțin o copie de tipul %s
 ErrorRecordIsUsedCantDelete=Nu se poate șterge înregistrarea. Este deja folosită sau inclusă în alt obiect.
-ErrorModuleRequireJavascript=Javascript nu trebuie să fie dezactivate pentru a avea această facilitate de lucru. Pentru a activa / dezactiva Javascript, du-te la meniul Home-> Configurare-> Display.
+ErrorModuleRequireJavascript=Javascript nu trebuie să fie dezactivat pentru a avea această caresteristică funcţională. Pentru a activa/dezactiva Javascript, du-te la meniul Acasă->Setări->Afişare.
 ErrorPasswordsMustMatch=Ambele parolele tastate trebuie să se potrivească reciproc
-ErrorContactEMail=A apărut o eroare tehnică. Vă rugăm să contactați administratorul la următorul e-mail <b> %s </b> și să-i furnizați codul de eroare <b> %s </b> în mesajul dvs. sau să adăugați o copie de pe ecran a acestei pagini.
-ErrorWrongValueForField=Câmp <b> %s </b>: '<b> %s </b>' nu se potrivește cu regula regex <b> %s </b>
-ErrorFieldValueNotIn=Câmp <b> %s </b>: '<b> %s </b>' nu este o valoare găsită în câmpul <b> %s </b> din <b> %s </b>
-ErrorFieldRefNotIn=Câmpul <b> %s </b>: '<b> %s </b>' nu este un <b> %s </b> ref
-ErrorsOnXLines=%serori găsite 
-ErrorFileIsInfectedWithAVirus=Programul antivirus nu a validet fisierul (fisierul ar putea fi infectat cu un virus)
-ErrorSpecialCharNotAllowedForField=Caractere speciale nu sunt permise pentru domeniul "%s"
-ErrorNumRefModel=O referire există în baza de date (%s) şi nu este compatibilă cu această regulă de numerotare. înregistra Remove sau redenumite de referinţă pentru a activa acest modul.
-ErrorQtyTooLowForThisSupplier=Cantitate prea mică pentru acest furnizor sau niciun preț definit pentru acest produs pentru acest furnizor
+ErrorContactEMail=A apărut o eroare tehnică. Contactați administratorul tehnic la următoarea adresă de email <b>%s</b> și furnizați-i codul de eroare <b>%s</b> în mesaj sau adăugați-i o copie de ecran a acestei pagini.
+ErrorWrongValueForField=Câmpul <b>%s</b>: '<b>%s</b>' nu se potrivește cu regula regex <b>%s</b>
+ErrorFieldValueNotIn=Câmpul <b>%s</b>: '<b>%s</b>' nu este o valoare găsită în câmpul <b>%s</b> din <b>%s</b>
+ErrorFieldRefNotIn=Câmpul <b>%s</b>: '<b>%s</b>' nu este o <b> %s </b> referinţă existentă
+ErrorsOnXLines=%s erori găsite 
+ErrorFileIsInfectedWithAVirus=Programul antivirus nu a validat fişierul (fişierul ar putea fi infectat cu un virus)
+ErrorSpecialCharNotAllowedForField=Caracterele speciale nu sunt permise pentru câmpul "%s"
+ErrorNumRefModel=O referinţă există în baza de date (%s) şi nu este compatibilă cu această regulă de numerotare. Şterge sau redenumeşte referinţa pentru a activa acest model.
+ErrorQtyTooLowForThisSupplier=Cantitate prea mică pentru acest furnizor sau niciun preț definit pentru acest produs de la acest furnizor
 ErrorOrdersNotCreatedQtyTooLow=Unele comenzi nu au fost create datorită cantităților prea mici
 ErrorModuleSetupNotComplete=Configurarea modulului %s pare incompletă. Mergi în Acasă - Setup - Module şi finalizează configurarea.
-ErrorBadMask=Eroare pe masca
-ErrorBadMaskFailedToLocatePosOfSequence=Eroare, fără a masca numărul de ordine
-ErrorBadMaskBadRazMonth=Eroare, Bad resetare valoarea
-ErrorMaxNumberReachForThisMask=Numărul maxim atins pentru această mască
-ErrorCounterMustHaveMoreThan3Digits=Contorul trebuie sa aiba mai mult de 3 cifre
+ErrorBadMask=Eroare pe mască
+ErrorBadMaskFailedToLocatePosOfSequence=Eroare, mască fără secvenţă de numerotare
+ErrorBadMaskBadRazMonth=Eroare, valoare de resetare eronată
+ErrorMaxNumberReachForThisMask=Numărul maxim a fost atins pentru această mască
+ErrorCounterMustHaveMoreThan3Digits=Contorul trebuie sa aibă mai mult de 3 cifre
 ErrorSelectAtLeastOne=Eroare, selectează cel puţin o înregistrare.
-ErrorDeleteNotPossibleLineIsConsolidated=Ștergerea nu este posibilă deoarece înregistrarea este legată de o tranzacție bancară care este conciliată
-ErrorProdIdAlreadyExist=%s se atribuie o altă treime
-ErrorFailedToSendPassword=Nu a reuşit să trimită parola
-ErrorFailedToLoadRSSFile=Nu pentru a obţine RSS feed. Încercaţi să adăugaţi MAIN_SIMPLEXMLLOAD_DEBUG constantă în cazul în care mesajele de eroare nu furnizează suficiente informaţii.
+ErrorDeleteNotPossibleLineIsConsolidated=Ștergerea nu este posibilă deoarece înregistrarea este legată de o tranzacție bancară care este decontată
+ErrorProdIdAlreadyExist=%s este atribuit unui alt terţ
+ErrorFailedToSendPassword=Eşec la trimiterea parolei
+ErrorFailedToLoadRSSFile=Eşec la obţinerea feed-ului RSS. Încercaţi să adăugaţi constanta MAIN_SIMPLEXMLLOAD_DEBUG în cazul în care mesajele de eroare nu furnizează suficiente informaţii.
 ErrorForbidden=Acces restricționat. <De> Încercați să accesați o pagină, zonă sau caracteristică a unui modul fără a fi autentificat sau pentru care utilizatorul dvs. nu are permisiunile necesare.
-ErrorForbidden2=Permisiunea pentru acest login poate fi definită de către administratorul dvs. Dolibarr din meniul %s-> %s.
-ErrorForbidden3=Se pare că Dolibarr nu este utilizat autentificate printr-o sesiune. Aruncati o privire la documentaţia de instalare Dolibarr să ştie cum să gestioneze authentications (htaccess, mod_auth sau alte ...).
-ErrorNoImagickReadimage=Funcţia imagick_readimage nu este gasit in acest PHP. Nu poate fi previzualizare disponibilă. Administratorii pot dezactiva această filă din meniul Setup - Display.
-ErrorRecordAlreadyExists=Record există deja
+ErrorForbidden2=Permisiunea pentru acest nume de autentificare poate fi definită de către administratorul sistemului din meniul %s->%s.
+ErrorForbidden3=Se pare că sistemul nu este utilizat printr-o sesiune cu autentificare. Aruncati o privire în documentaţia de instalare pentru a şti cum să gestionaţi autentificările (htaccess, mod_auth sau altele...).
+ErrorNoImagickReadimage=Clasa Imagick nu a fost găsită în PHP. Nu este disponibilă previzualizarea. Administratorii pot dezactiva această filă din meniul Setări - Afişare.
+ErrorRecordAlreadyExists=Înregistrarea există deja
 ErrorLabelAlreadyExists=Această etichetă există deja
-ErrorCantReadFile=Nu a reuşit să citească fişierul " %s"
-ErrorCantReadDir=Nu a reuşit să citesc directorul ' %s'
-ErrorBadLoginPassword=Bad valoarea de autentificare sau parola
-ErrorLoginDisabled=Contul dvs. a fost dezactivat
-ErrorFailedToRunExternalCommand=Nu a reuşit să rulaţi comanda externe. Verificaţi aceasta este disponibilă şi runnable de către dumneavoastră PHP de server. Dacă PHP <b>Safe Mode</b> este activat, comanda verifica că este în interiorul unui director definite de parametru <b>safe_mode_exec_dir.</b>
-ErrorFailedToChangePassword=Nu a reuşit să schimbaţi parola
-ErrorLoginDoesNotExists=User login <b>cu %s</b> nu a putut fi găsit.
-ErrorLoginHasNoEmail=Acest utilizator nu are nici o adresa de e-mail. Procesul de anulată.
-ErrorBadValueForCode=Bad valoare tipuri de cod. Încercaţi din nou cu o nouă valoare ...
-ErrorBothFieldCantBeNegative=%s Domenii şi %s nu poate fi atât negativ
+ErrorCantReadFile=Eşec la citirea fişierului '%s'
+ErrorCantReadDir=Eşec la citirea directorului ' %s'
+ErrorBadLoginPassword=Autentificare sau parolă eronată
+ErrorLoginDisabled=Contul tău a fost dezactivat
+ErrorFailedToRunExternalCommand=Eşec la rularea comenzii externe. Verifică aceasta este disponibilă şi rulabilă în PHP pe server. Dacă PHP <b>Safe Mode</b> este activat, verifică dacă comanda este în interiorul unui director definit de parametrul <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Eşec la schimbarea parolei
+ErrorLoginDoesNotExists=Contul de utilizator <b>%s</b> nu a putut fi găsit.
+ErrorLoginHasNoEmail=Acest utilizator nu are nici o adresa de email. Procesul a fost  anulat.
+ErrorBadValueForCode=Cod de securitate eronat. Încercaţi cu un cod nou...
+ErrorBothFieldCantBeNegative=Câmpurile %s şi %s nu pot fi ambele negative
 ErrorFieldCantBeNegativeOnInvoice=Câmpul <strong>%s</strong> nu poate fi negativ pe acest tip de factură. Dacă vrei să adaugi o linie de discount, creează mai discountul (în câmpul '%s' din fişa terţului) şi aplică-l pe factură.  
 ErrorLinesCantBeNegativeForOneVATRate=Totalul liniilor (fără taxe) nu poate fi negativ pentru o cotă TVA diferită de zero  (S-a găsit un total negativ cota TVA <b>%s</b>%%).
 ErrorLinesCantBeNegativeOnDeposits=Liniile nu pot fi negative într-un depozit. Dacă faceți acest lucru, vă veţi confrunta cu probleme atunci când veți consuma din stoc. 
-ErrorQtyForCustomerInvoiceCantBeNegative=Cantitatea pentru linia unei facturi client nu poate fi negativa.
-ErrorWebServerUserHasNotPermission=Contul de utilizator <b>%s</b> folosite pentru a executa serverul de web nu are permisiunea, pentru că
+ErrorQtyForCustomerInvoiceCantBeNegative=Cantitatea pentru linia unei facturi client nu poate fi negativă.
+ErrorWebServerUserHasNotPermission=Contul de utilizator <b>%s</b> folosit pentru a execuţia serverului de web nu are permisiunea pentru aceasta
 ErrorNoActivatedBarcode=Niciun tip de coduri de bare activat
 ErrUnzipFails=Eşec la dezarhivarea fişierului %s cu ZipArchive
-ErrNoZipEngine=Nu există niciun motor pentru a arhiva/dezarhiva fișierul %s în acest PHP
+ErrNoZipEngine=Nu există niciun motor pentru a arhiva/dezarhiva fișierul %s în această configuraţie PHP
 ErrorFileMustBeADolibarrPackage=Fșierul %s  trebuie să fie un pachet zip Dolibarr
-ErrorModuleFileRequired=Trebuie să selectați un fișier pachet al modulului Dolibarr
-ErrorPhpCurlNotInstalled=PHP CURLnu este instalat, acest lucru este esențial pentru comunicarea cu Paypal
+ErrorModuleFileRequired=Trebuie să selectați un fișier pachet de modul Dolibarr
+ErrorPhpCurlNotInstalled=PHP CURL nu este instalat, acest lucru este esențial pentru comunicarea cu Paypal
 ErrorFailedToAddToMailmanList=Eşec la adăugarea %s la lista de Mailman %s sau la baza SPIP
 ErrorFailedToRemoveToMailmanList=Eşec la înlăturarea %s din lista de Mailman %s sau din baza SPIP
 ErrorNewValueCantMatchOldValue=Noua valoare nu poate fi egală cu cea veche
-ErrorFailedToValidatePasswordReset=Eşec la resetarea parolei. Este posibil săfi fost deja folosit acest link ( acest link poate fi folosit doar o dată). Dacă nu, încercați să reporniți şi reiniţializaţi procesul.
-ErrorToConnectToMysqlCheckInstance=Conectarea la baza de date eșuată. Verificați serverul de bază de date că functionează (de exemplu, cu mysql/mariadb, îl puteți lansa din linia de comandă cu 'sudo service mysql start').
-ErrorFailedToAddContact=Eşuare la adaugare contact
+ErrorFailedToValidatePasswordReset=Eşec la resetarea parolei. Este posibil să fi fost folosit deja acest link (acest link poate fi folosit doar o singură dată). Dacă nu, încercați să reluaţi procesul de resetare.
+ErrorToConnectToMysqlCheckInstance=Conectarea la baza de date eșuată. Verificați serverul de bază de date că funcţionează (de exemplu, cu mysql/mariadb, îl puteți lansa din linia de comandă cu 'sudo service mysql start').
+ErrorFailedToAddContact=Eşec la adaugarea contactului
 ErrorDateMustBeBeforeToday=Data trebuie să fie mai mică decât azi
 ErrorDateMustBeInFuture=Data trebuie să fie mai mare decât azi
 ErrorPaymentModeDefinedToWithoutSetup=Un modul de plată a fost setat la tipul %s, dar setarea modulului Facturi nu a fost finalizată  a arăta pentru acest mod de plată.
-ErrorPHPNeedModule=Eroare, PHP trebuie să aibă modul <b>%s</b> instalat pentru a utiliza această funcţionalitate.
-ErrorOpenIDSetupNotComplete=Trebuie setat fișier de configurare Dolibarr pentru a permite autentificarea OpenID, dar URL-ul serviciului OpenID nu este definit în constanta %s
-ErrorWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere
-ErrorBadFormat=Format gresit!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Eroare, acest membru nu este încă legat de niciun terț. Conectați un membru la un terț existent sau creați un terț nou înainte de a crea abonament la factură.
-ErrorThereIsSomeDeliveries=Eroare, există unele livrări legate de acest transport. Ștergere refuzată.
+ErrorPHPNeedModule=Eroare, PHP trebuie să aibă modulul <b>%s</b> instalat pentru a utiliza această funcţionalitate.
+ErrorOpenIDSetupNotComplete=Ai setat fișierul de configurare al sistemului permisiunea de autentificare cu OpenID, dar URL-ul serviciului OpenID nu este definit în constanta %s
+ErrorWarehouseMustDiffers=Depozitul sursă și depozitul țintă trebuie să difere
+ErrorBadFormat=Format greşit!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Eroare, acest membru nu este încă asociat unui terț. Asociază un membru la un terț existent sau crează un terț nou înainte de a crea factura de adeziune  - cotizaţie.
+ErrorThereIsSomeDeliveries=Eroare, există unele expedieri legate de această livrare. Ștergere refuzată.
 ErrorCantDeletePaymentReconciliated=Nu se poate șterge o plată care a generat o intrare bancară care a fost reconciliată
-ErrorCantDeletePaymentSharedWithPayedInvoice=Nu se poate șterge o plată partajată de cel puțin o factură cu starea plătită
+ErrorCantDeletePaymentSharedWithPayedInvoice=Nu se poate șterge o plată conţinută de cel puțin o factură cu starea Plătită
 ErrorPriceExpression1=Nu se poate atribui la constanta '%s'
-ErrorPriceExpression2=Nu se poate redefini  funcția built-in  '%s'
-ErrorPriceExpression3=Variabila nedefinita '%s'  în definiția funcției
+ErrorPriceExpression2=Nu se poate redefini funcția built-in  '%s'
+ErrorPriceExpression3=Variabilă nedefinită '%s'  în definiția funcției
 ErrorPriceExpression4=Caracter ilegal '%s'
 ErrorPriceExpression5=Neașteptat '%s'
 ErrorPriceExpression6=Număr greșit de argumente (%s dat, %s așteptat)
 ErrorPriceExpression8=Operator neașteptat '%s'
 ErrorPriceExpression9=A apărut o eroare neașteptată
 ErrorPriceExpression10=Operatorul '%s' nu are operand
-ErrorPriceExpression11=Asteptam '%s'
-ErrorPriceExpression14=Împărţirea la zero,
+ErrorPriceExpression11=Aşteptam '%s'
+ErrorPriceExpression14=Împărţire la zero,
 ErrorPriceExpression17=Variabila  '%s' nedefinită
 ErrorPriceExpression19=Expresia nu a fost găsită
 ErrorPriceExpression20=Expresie goală
 ErrorPriceExpression21=Rezultat gol '%s'
 ErrorPriceExpression22=Rezultat negativ '%s'
-ErrorPriceExpression23=Variabila necunoscută sau nestabilită "%s" în %s
-ErrorPriceExpression24=Variabila "%s" există, dar nu are nicio valoare
+ErrorPriceExpression23=Variabilă necunoscută sau nesetată '%s' în %s
+ErrorPriceExpression24=Variabila '%s' există, dar nu are nicio valoare
 ErrorPriceExpressionInternal=Eroare internă '%s'
-ErrorPriceExpressionUnknown=Eroare Necunoscută '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere
-ErrorTryToMakeMoveOnProductRequiringBatchData=Eroare, încercarea de a face o mișcare de stocuri fără informații ca nr. lot/serial, pe produsul '%s' care necesită informații de nr. lot/serial
+ErrorPriceExpressionUnknown=Eroare necunoscută '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Depozitul sursă și depozitul țintă trebuie să difere
+ErrorTryToMakeMoveOnProductRequiringBatchData=Eroare, se încearcă efectuarea unei mișcări de stoc fără informații ca nr. de lot/serie, pentru produsul '%s' care necesită aceste informații
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove= Toate recepțiile înregistrate trebuie mai întâi verificate (aprobate sau respinse) înainte de a se permite efectuarea acestei acțiuni. 
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied= Toate recepțiile înregistrate trebuie mai întâi verificate (aprobate) înainte de a se permite efectuarea acestei acțiuni. 
-ErrorGlobalVariableUpdater0=Cerere HTTP esuat cu eroarea '%s'
-ErrorGlobalVariableUpdater1=Format JSON Invalid '%s'
-ErrorGlobalVariableUpdater2=Lipsa parametru '%s'
+ErrorGlobalVariableUpdater0=Cererea HTTP a eşuat cu eroarea '%s'
+ErrorGlobalVariableUpdater1=Format JSON invalid '%s'
+ErrorGlobalVariableUpdater2=Lipsă parametru '%s'
 ErrorGlobalVariableUpdater3=Datele solicitate nu a fost găsite
-ErrorGlobalVariableUpdater4=Client SOAP esuat cu eroarea '%s'
-ErrorGlobalVariableUpdater5=Nicio varialbila globala selectata
-ErrorFieldMustBeANumeric=Campul <b>%s</b> trebuie sa fie  o valoare numerica
+ErrorGlobalVariableUpdater4=Client SOAP eşuat cu eroarea '%s'
+ErrorGlobalVariableUpdater5=Nicio variabilă globală selectată
+ErrorFieldMustBeANumeric=Câmpul <b>%s</b> trebuie să fie de tip numeric
 ErrorMandatoryParametersNotProvided= Parametrii obligatorii nu au fost furnizați 
-ErrorOppStatusRequiredIfAmount=Ați stabilit o sumă estimată pentru acest exemplu. De asemenea, trebuie să-i introduceți și statutul .
-ErrorFailedToLoadModuleDescriptorForXXX=Nu s-a încărcat clasa descriptorilor de module pentru %s
+ErrorOppStatusRequiredIfAmount=Ați stabilit o sumă estimată pentru acest lead. De asemenea, trebuie să-i introduci și statusul.
+ErrorFailedToLoadModuleDescriptorForXXX=Nu s-a încărcat clasa descriptor de modul pentru %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
-ErrorFileMustHaveFormat=Fisierul trebuie sa aiba format '%s'
+ErrorFileMustHaveFormat=Fişierul trebuie să aibă formatul %s
 ErrorFilenameCantStartWithDot=Numele fişierului nu poate începe cu un '.'
-ErrorSupplierCountryIsNotDefined=Țara pentru acest furnizor nu este definită. Corectați mai întâi acest lucru.
-ErrorsThirdpartyMerge=Nu s-au putut îmbina cele două înregistrări. Cererea a fost anulată.
+ErrorSupplierCountryIsNotDefined=Țara pentru acest furnizor nu este definită. Corectați mai întâi.
+ErrorsThirdpartyMerge=Nu s-au putut îmbina cele două înregistrări. Comanda a fost anulată.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stocul nu este suficient pentru produsul %s pentru a-l adăuga într-o comandă nouă.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stocul nu este suficient pentru produsul %s pentru a-l adăuga într-o nouă factură.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stocul nu este suficient pentru produsul %s pentru a-l adăuga într-o expediere nouă.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stocul nu este suficient pentru produsul %s pentru a-l adăuga într-o nouă propunere.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stocul nu este suficient pentru produsul %s pentru a-l adăuga într-o livrare nouă.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stocul nu este suficient pentru produsul %s pentru a-l adăuga într-o ofertă nouă.
 ErrorFailedToLoadLoginFileForMode=Nu s-a reușit obținerea cheii de conectare pentru modul '%s'.
 ErrorModuleNotFound=Fișierul modulului nu a fost găsit.
-ErrorFieldAccountNotDefinedForBankLine=Valoarea contului de contabilitate nu este definită pentru id-ul liniei sursă %s (%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Valoarea contului de contabilitate nu este definită pentru id-ul facturii  %s (%s)
-ErrorFieldAccountNotDefinedForLine=Valoarea pentru contul de contabilitate nu este definită pentru linia (%s)
-ErrorBankStatementNameMustFollowRegex=Eroare, numele declarației bancare trebuie să respecte următoarea regulă de sintaxă %s
-ErrorPhpMailDelivery=Verificați dacă nu utilizați un număr prea mare de destinatari și că conținutul dvs. de e-mail nu este similar cu cel al unui Spam. Cereți, de asemenea, administratorului dvs. să verifice fișierele de firewall și de jurnale de server pentru informații mai complete.
-ErrorUserNotAssignedToTask=Utilizatorul trebuie să fie atribuit sarcinii pentru a putea introduce timpul consumat.
-ErrorTaskAlreadyAssigned=Sarcină deja atribuită utilizatorului
-ErrorModuleFileSeemsToHaveAWrongFormat=Pachetul de module pare să aibă un format greșit.
+ErrorFieldAccountNotDefinedForBankLine=Contul contabil nu este definit pentru id-ul liniei sursă %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Contul contabil nu este definit pentru id-ul facturii %s (%s)
+ErrorFieldAccountNotDefinedForLine=Contul contabil nu este definit pentru linia (%s)
+ErrorBankStatementNameMustFollowRegex=Eroare, numele extrasului bancar trebuie să respecte următoarea regulă de sintaxă %s
+ErrorPhpMailDelivery=Verificați dacă nu utilizați un număr prea mare de destinatari și că conținutul email-ului nu este similar cu cel al unui Spam. Cere, de asemenea, administratorului să verifice fișierele de firewall și de jurnale de server pentru informații mai complete.
+ErrorUserNotAssignedToTask=Utilizatorul trebuie să fie atribuit task-ului pentru a putea introduce timpul consumat.
+ErrorTaskAlreadyAssigned=Task atribuit deja utilizatorului
+ErrorModuleFileSeemsToHaveAWrongFormat=Pachetul de modul pare să aibă un format greșit.
 ErrorModuleFileSeemsToHaveAWrongFormat2=Cel puțin un director trebuie să existe obligatoriu în arhiva zip a modulului: <strong>%s</strong> sau <strong>%s</strong> 
-ErrorFilenameDosNotMatchDolibarrPackageRules=Numele pachetului de module (<strong> %s </strong>) nu se potrivește cu sintaxa numelui așteptat: <strong> %s </strong>
-ErrorDuplicateTrigger=Eroare, numele de declanșare duplicat  %s. Deja încărcat de la %s.
+ErrorFilenameDosNotMatchDolibarrPackageRules=Numele pachetului de modul (<strong> %s</strong>) nu se potrivește cu sintaxa de denumire așteptată: <strong>%s</strong>
+ErrorDuplicateTrigger=Eroare, nume de trigger duplicat  %s. Este deja încărcat de %s.
 ErrorNoWarehouseDefined=Eroare, nu au fost definite depozite.
 ErrorBadLinkSourceSetButBadValueForRef=Linkul pe care îl utilizați nu este valid. O "sursă" pentru plată este definită, dar valoarea pentru "ref" nu este validă.
 ErrorTooManyErrorsProcessStopped=Prea multe erori. Procesul a fost oprit.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Validarea în masă nu este posibilă atunci când opțiunea de creștere/scădere a stocului este setată pentru această acțiune (trebuie să validezi unul câte unul pentru a putea defini depozitul pentru a crește/micșora)
-ErrorObjectMustHaveStatusDraftToBeValidated=Obiectul %s trebuie să aibă statutul de "Schiţă" pentru a fi validat.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Validarea în masă nu este posibilă atunci când opțiunea de creștere/scădere a stocului este setată pentru această acțiune (trebuie să validezi unul câte unul pentru a putea defini depozitul de creștere/micșorare)
+ErrorObjectMustHaveStatusDraftToBeValidated=Obiectul %s trebuie să aibă statusul "Schiţă" pentru a fi validat.
 ErrorObjectMustHaveLinesToBeValidated=Obiectul %s trebuie să aibă linii ca să fie validat.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Numai facturile validate pot fi trimise utilizând acțiunea de masă "Trimiteți prin e-mail".
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=Trebuie să alegeți dacă articolul este un produs predefinit sau nu
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Numai facturile validate pot fi trimise utilizând acțiunea de masă "Trimite pe email".
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Trebuie să bifaţi dacă articolul este un produs predefinit sau nu
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Reducerea pe care încercați să o aplicați este mai mare decât restul de plată. Împărțiți reducerea în 2 reduceri mai mici înainte.
-ErrorFileNotFoundWithSharedLink=Dosarul nu a fost găsit. Poate fi modificată cheia de distribuire sau fișierul a fost eliminat recent.
-ErrorProductBarCodeAlreadyExists=Codul de bare al produsului %s există deja în altă referință la produs.
+ErrorFileNotFoundWithSharedLink=Fişierul nu a fost găsit. Poate s-a modificat cheia de partajare sau fișierul a fost eliminat recent.
+ErrorProductBarCodeAlreadyExists=Codul de bare al produsului %s există deja la altă referință de produs.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Rețineți, de asemenea, că utilizarea kiturilor pentru a crește/micșora automat subprodusele nu este posibilă atunci când cel puțin un subprodus (sau subprodus al subproduselor) are nevoie de un număr de serie/lot. 
-ErrorDescRequiredForFreeProductLines=Descrierea este obligatorie pentru liniile cu produse gratuite
-ErrorAPageWithThisNameOrAliasAlreadyExists=Pagina/containerul <strong> %s </strong> are același nume sau un alias alternativ ca cel pe care încercați să îl utilizați
+ErrorDescRequiredForFreeProductLines=Descrierea este obligatorie pentru liniile cu produse text liber
+ErrorAPageWithThisNameOrAliasAlreadyExists=Pagina/containerul <strong>%s</strong> are același nume sau un alias alternativ ca cel pe care încercați să îl utilizați
 ErrorDuringChartLoad=Eroare la încărcarea schemei de conturi. În cazul în care câteva conturi nu au fost încărcate, le puteți introduce în continuare manual.
 ErrorBadSyntaxForParamKeyForContent=Sintaxă greşită pentru parametru keyforcontent. Trebuie să aibă o valoare începând cu %s sau %s
 ErrorVariableKeyForContentMustBeSet=Eroare, trebuie să fie setată constanta cu numele %s (cu conținut de text care trebuie afișat) sau %s (cu adresa URL externă de afișat).
 ErrorURLMustStartWithHttp=URL-ul %s trebuie să înceapă cu http:// sau https://
+ErrorHostMustNotStartWithHttp=Numele gazdei %s NU trebuie să înceapă cu http:// sau https://
 ErrorNewRefIsAlreadyUsed=Eroare, noua referintă este deja utilizată
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Eroare, ştergerea unei plăţi asociate la o factură închisă nu este posibilă.
 ErrorSearchCriteriaTooSmall=Criteriul de căutare este prea scurt.
@@ -252,38 +254,45 @@ ErrorValueLength=Lungimea câmpului '<b>%s</b>' trebuie să fie mai mare de '<b>
 ErrorReservedKeyword=Cuvântul '<b>%s</b>' este un cuvânt cheie rezervat
 ErrorNotAvailableWithThisDistribution=Nu este disponibil cu această distribuție
 ErrorPublicInterfaceNotEnabled=Interfaţa publică nu a fost activată
-ErrorLanguageRequiredIfPageIsTranslationOfAnother=Limba noii pagini trebuie definită dacă este setată ca traducere a altei pagini 
-ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother= Limba nooi pagini nu trebuie să fie limba sursă dacă este setată ca traducere a altei pagini 
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Limba noii pagini trebuie definită dacă este setată ca traducere a altei pagini
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother= Limba noii pagini nu trebuie să fie limba sursă dacă este setată ca traducere a altei pagini
 ErrorAParameterIsRequiredForThisOperation=Un parametru este obligatoriu pentru această operațiune
+ErrorDateIsInFuture=Eroare, data nu poate fi în viitor
+ErrorAnAmountWithoutTaxIsRequired=Eroare, suma este obligatorie
+ErrorAPercentIsRequired=Eroare, completați procentajul corect
+ErrorYouMustFirstSetupYourChartOfAccount=Trebuie să setezi mai întâi planul de conturi
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parametrul tău PHP upload_max_filesize (%s) este mai mare decât paramentrul PHP post_max_size (%s). Aceasta nu este o configuraţie consistentă.
 WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator. 
 WarningMandatorySetupNotComplete=Click aici pentru a seta parametrii obligatorii
 WarningEnableYourModulesApplications=Click aici pentru a activa modulele şi aplicaţiile tale
-WarningSafeModeOnCheckExecDir=Atenţie, PHP <b>safe_mode</b> opţiune este pe atât de comandă trebuie să fie depozitate într-un director declarate de <b>safe_mode_exec_dir</b> parametru PHP.
-WarningBookmarkAlreadyExists=Un marcaj cu acest titlu sau acest obiectiv (URL) există deja.
-WarningPassIsEmpty=Atenţie, parola baza de date este gol. Aceasta este o gaura de securitate. Ar trebui să adăugaţi o parolă pentru a vă baza de date şi să vă schimbaţi conf.php fişier, pentru a reflecta acest lucru.
-WarningConfFileMustBeReadOnly=Atenţie, fişierul de configurare dvs. <b>(htdocs / conf / conf.php)</b> poate fi suprascrise de către serverul de web. Aceasta este o gaura de securitate grave. Modificare permisiuni pe fişier pentru a fi citit în modul doar pentru utilizatorul sistemului de operare folosit de server Web. Dacă utilizaţi Windows şi formatul FAT pentru discul dvs., vă trebuie să ştiţi că acest sistem de fişier nu se permite to adăuga permisiuni la dosar, deci nu poate fi complet safe.
-WarningsOnXLines=Avertismentele privind sursa <b>%s</b> linii
+WarningSafeModeOnCheckExecDir=Atenţie, opţiunea PHP <b>safe_mode</b> este activă deci comanda trebuie să fie într-un director declarat în parametrul PHP <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=Un marcaj cu acest titlu sau adresă (URL) există deja.
+WarningPassIsEmpty=Atenţie, parola bazei de date este nulă. Aceasta reprezintă o problemă de securitate. Ar trebui să adaugi o parolă pentru conectarea la baza de date şi să modifici în fişierul conf.php, pentru a reflecta acest lucru.
+WarningConfFileMustBeReadOnly=Atenţie, fişierul tău de configurare (<b>htdocs/conf/conf.php</b>) poate fi suprascris de către serverul web. Aceasta este o problemă de securitate gravă. Modifică permisiunile pe fişier pentru a putea fi doar citit de utilizatorul sistemului de operare folosit de server-ul web. Dacă utilizaţi Windows şi formatul de partiţionare FAT, nu este posibil să adaugi permisiuni pe director, deci nu poate fi safe.
+WarningsOnXLines=Avertismente pe <b>%s</b> înregistrare(ări) sursă
 WarningNoDocumentModelActivated=Nu a fost activat niciun model, pentru generarea de documente. Un model va fi ales în mod implicit până când verificați configurarea modulului.
-WarningLockFileDoesNotExists=Avertisment, odată ce configurația este terminată, trebuie să dezactivați instrumentele de instalare/migrare adăugând un fișier <b> install.lock </b> în directorul <b> %s </b>. Omiterea creării acestui fișier reprezintă un risc serios de securitate.
-WarningUntilDirRemoved=Toate avertismentele de securitate (vizibile numai de către utilizatorii administrației) vor rămâne active, atâta timp cât vulnerabilitatea este prezentă (sau că MAIN_REMOVE_INSTALL_WARNING este adăugată constant în Setup-> Other Setup).
-WarningCloseAlways=Atenţie, închiderea are loc chiar dacă suma diferă. Nu activati aceasta funcţionalitate decât  în cunoaștinţă de cauză.
-WarningUsingThisBoxSlowDown=Atenție, folosind această casetă încetiniţi serios toate paginile ce arată caseta.
-WarningClickToDialUserSetupNotComplete=Setările informațiilor ClickToDial pentru userul dvs. nu sunt complete (vezi tabul ClickToDial pe fişal dvs. de utilizator).
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcţionalitate dezactivată atunci când configurarea de afișare este optimizată pentru nevăzători sau de browsere text .
-WarningPaymentDateLowerThanInvoiceDate=Data plăţii(%s) este mai veche decât data facturii (%s) pentru factura %s
+WarningLockFileDoesNotExists=Atenţie, o dată ce configurarea este finalizată, trebuie să dezactivați instrumentele de instalare/migrare adăugând un fișier <b>install.lock</b> în directorul <b> %s </b>. Omiterea creării acestui fișier reprezintă un risc serios de securitate.
+WarningUntilDirRemoved=Toate avertismentele de securitate (vizibile numai de către utilizatorii administratori) vor rămâne active, atâta timp cât vulnerabilitatea este prezentă (sau constanta MAIN_REMOVE_INSTALL_WARNING este adăugată în Setări->Alte setări).
+WarningCloseAlways=Atenţie, închiderea are loc chiar dacă suma diferă. Nu activati aceasta funcţionalitate decât  în cunoștinţă de cauză.
+WarningUsingThisBoxSlowDown=Atenție, folosind această casetă încetiniţi serios toate paginile care afişează caseta.
+WarningClickToDialUserSetupNotComplete=Setările informațiilor ClickToDial pentru utilizatorul tău nu sunt complete (vezi tabul ClickToDial pe fişal dvs. de utilizator).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcţionalitate dezactivată atunci când configurarea de afișare este optimizată pentru nevăzători sau pentru browsere text .
+WarningPaymentDateLowerThanInvoiceDate=Data plăţii(%s) este anterioară datei facturii (%s) pentru factura %s
 WarningTooManyDataPleaseUseMoreFilters= Prea multe date (mai mult de %s linii). Folosiți mai multe filtre sau setați constanta %s la o limită superioară. 
-WarningSomeLinesWithNullHourlyRate=Unele perioade de timp au fost înregistrate de unii utilizatori în timp ce rata lor orară nu a fost definită. A fost utilizată o valoare de 0 %s pe oră, dar acest lucru poate duce la o evaluare greșită a timpului petrecut.
+WarningSomeLinesWithNullHourlyRate=Unele perioade de timp consumat au fost înregistrate de unii utilizatori care nu aveau tariful orar definit. A fost utilizată valoarea 0 %s pe oră, dar acest lucru poate duce la o evaluare financiară greșită a timpului consumat.
 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=Există deja o intrare pentru cheia de traducere pentru această limbă
-WarningNumberOfRecipientIsRestrictedInMassAction=Avertisment, numărul destinatarului diferit este limitat la <b> %s </b> când se utilizează acțiunile de masă din liste
-WarningDateOfLineMustBeInExpenseReportRange=Avertisment, data liniei nu este în intervalul raportului de cheltuieli
-WarningProjectDraft=Proiectul este încă în modul schiţă. Nu uitați să îl validați dacă intenționați să utilizați sarcini.
+WarningAnEntryAlreadyExistForTransKey=Există deja o intrare pe cheia de traducere pentru această limbă
+WarningNumberOfRecipientIsRestrictedInMassAction=Avertisment, numărul de destinatari diferiţi este limitat la <b> %s </b> când se utilizează acțiunile de masă din liste
+WarningDateOfLineMustBeInExpenseReportRange=Atenţie, data liniei nu este în intervalul raportului de cheltuieli
+WarningProjectDraft=Proiectul este încă în modul schiţă. Nu uitați să îl validați dacă intenționați să utilizați task-uri.
 WarningProjectClosed=Proiectul este închis. Trebuie să-l redeschideți mai întâi.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Anumite tranzacţii bancare au fost eliminate după ce a fost generat extrasul care le includea. Aşa că numărul de cecuri şi totalul extrasului pot diferi de cele din listă.
 WarningFailedToAddFileIntoDatabaseIndex=Atenţie , nu s-a putut adăuga fișierului în tabela index al bazei de date ECM
 WarningTheHiddenOptionIsOn=Atenţie, opţiunea ascunsă <b>%s</b> este activă.
 WarningCreateSubAccounts=Atenție, nu puteți crea direct un cont secundar, trebuie să creați un terț sau un utilizator și să le atribuiți un cod contabil pentru a le găsi în această listă
 WarningAvailableOnlyForHTTPSServers=Disponibil numai dacă se utilizează conexiunea securizată HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Modulul %s nu a fost activat. Este posibil să pierdeți o mulțime de evenimente aici. 
+ErrorActionCommPropertyUserowneridNotDefined=Utilizatorul deţinător este obligatoriu
+ErrorActionCommBadType=Tipul evenimentului selectat (id: %n, cod: %s) nu există în dicţionarul Tipuri evenimente
diff --git a/htdocs/langs/ro_RO/externalsite.lang b/htdocs/langs/ro_RO/externalsite.lang
index a66dc1f4189..1b2e130a3d5 100644
--- a/htdocs/langs/ro_RO/externalsite.lang
+++ b/htdocs/langs/ro_RO/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Link-ul de instalare pentru site-ul extern
-ExternalSiteURL=URL-ul site-ului extern
+ExternalSiteURL=URL-ul site-ului extern care va fi conținut în iframe HTML 
 ExternalSiteModuleNotComplete=Modulul Site extern nu a fost configurat corespunzător.
-ExampleMyMenuEntry=Intrare  Meniul meu
+ExampleMyMenuEntry=Intrare în Meniul meu
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 8edaaa8f73e..ae771d583c1 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -15,14 +15,14 @@ FormatDateShortJavaInput=dd.MM.yyyy
 FormatDateShortJQuery=dd.mm.yy
 FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShortJQuery=HH:MI
-FormatHourShort=%H:%M
+FormatHourShort=%H:%M %p
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
+FormatDateTextShort=%d %b, %Y
+FormatDateText=%d %B ,%Y
 FormatDateHourShort=%d.%m.%Y %H:%M
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
+FormatDateHourTextShort=%d %b, %Y, %H:%M %p
+FormatDateHourText=%d %B, %Y, %H:%M %p
 DatabaseConnection=Conexiunea la baza de date
 NoTemplateDefined=Nu există șablon disponibil pentru acest tip de email
 AvailableVariables=Variabile de substituţie disponibile
@@ -53,20 +53,20 @@ 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.
 ErrorInternalErrorDetected=Eroare detectată
 ErrorWrongHostParameter=Parametru Server greșit
-ErrorYourCountryIsNotDefined=Țara dvs. nu este definită. Mergeți la Home-Setup-Edit și postați din nou formularul.
-ErrorRecordIsUsedByChild=Nu s-a reușit ștergerea acestei înregistrări. Această înregistrare este utilizată de cel puțin o copie a înregistrării
+ErrorYourCountryIsNotDefined=Țara ta. nu este definită. Mergi în Acasă-Setări-Editare și completaţi din nou formularul.
+ErrorRecordIsUsedByChild=Nu s-a reușit ștergerea acestei înregistrări. Această înregistrare este utilizată de cel puțin înregistrare dependentă
 ErrorWrongValue=Valoare incorectă
 ErrorWrongValueForParameterX=Valoare incorectă pentru parametrul %s
 ErrorNoRequestInError=Nicio cerere cu eroare
 ErrorServiceUnavailableTryLater=Serviciul nu este disponibil momentan. Încercați mai târziu.
 ErrorDuplicateField=Valoare duplicat într-un câmp unic
 ErrorSomeErrorWereFoundRollbackIsDone=Au fost găsite unele erori. Modificările nu au fost salvate.
-ErrorConfigParameterNotDefined=Parametrul <b> %s </b> nu este definit în fișierul de configurare Dolibarr <b> conf.php </b>.
+ErrorConfigParameterNotDefined=Parametrul <b>%s</b> nu este definit în fișierul de configurare al sistemului <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Utilizatorul<b>%s</b> negăsit în baza de date Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Eroare, nici o cotă de TVA nu este definită pentru ţara '%s'.
 ErrorNoSocialContributionForSellerCountry=Eroare, niciun tip de taxă socială/fiscală nu este definită pentru ţara '%s'.
 ErrorFailedToSaveFile=Eroare, salvarea fişierului a eşuat.
-ErrorCannotAddThisParentWarehouse=Încercați să adăugați un depozit părinte care este deja o copie a unui depozit existent
+ErrorCannotAddThisParentWarehouse=Încercați să adăugați un depozit părinte care este deja subaltern a unui depozit existent
 MaxNbOfRecordPerPage=Numărul maxim de înregistrări pe pagină
 NotAuthorized=Nu aveţi dreptul să faceţi asta.
 SetDate=Setează data
@@ -91,10 +91,10 @@ DedicatedPageAvailable=Există o pagină de ajutor dedicată legată de ecranul
 HomePage=Acasă
 RecordSaved=Înregistrare salvată
 RecordDeleted=Înregistrare ştearsă
-RecordGenerated=Înregistrată generată
+RecordGenerated=Înregistrare generată
 LevelOfFeature=Nivel funcţionalităţi
 NotDefined=Nedefinit
-DolibarrInHttpAuthenticationSoPasswordUseless=Modul de autentificare Dolibarr este setat la <b> %s </b> în fișierul de configurare <b> conf.php </b>. <br> Aceasta înseamnă că baza de date pentru parole este externă pentru Dolibarr, deci schimbarea acestui câmp poate să nu aibă efect.
+DolibarrInHttpAuthenticationSoPasswordUseless=Modul de autentificare în sistem este setat la <b>%s</b> în fișierul de configurare <b>conf.php</b>. <br> Aceasta înseamnă că baza de date pentru parole este externă pentru Dolibarr, deci schimbarea acestui câmp poate să nu aibă efect.
 Administrator=Administrator
 Undefined=Nedefinit
 PasswordForgotten=Ai uitat parola?
@@ -105,14 +105,14 @@ LastConnexion=Ultima autentificare
 PreviousConnexion=Autentificarea anterioară
 PreviousValue=Valoare anterioară
 ConnectedOnMultiCompany=Conectat la entitatea
-ConnectedSince=Conectat de
+ConnectedSince=Conectat din 
 AuthenticationMode=Mod autentificare
 RequestedUrl=URL solicitat
 DatabaseTypeManager=Tip manager bază de date
 RequestLastAccessInError=Ultima eroare de solicitare acces la baza de date
 ReturnCodeLastAccessInError=Cod returnat pentru ultima eroare de acces la baza de date
 InformationLastAccessInError=Info pentru ultima eroare de acces la baza de date
-DolibarrHasDetectedError=Dolibarr a detectat o eroare tehnică
+DolibarrHasDetectedError=Sistemul a întâmpinat o eroare tehnică
 YouCanSetOptionDolibarrMainProdToZero=Puteți citi fișierul jurnal sau setați opțiunea $dolibarr_main_prod la "0" din fișierul config pentru a obține mai multe informații.
 InformationToHelpDiagnose=Aceste informații pot fi utile în scopuri de diagnoză (puteți seta opțiunea $dolibarr_main_prod la '1' pentru a elimina aceste notificări)
 MoreInformation=Mai multe informaţii
@@ -121,7 +121,7 @@ TechnicalID=ID tehnic
 LineID=ID linie
 NotePublic=Notă(publică)
 NotePrivate=Notă(privată)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr a fost de configurat cu o limită de precizie pentru prețuri unitare de <b>%s</b> zecimale.
+PrecisionUnitIsLimitedToXDecimals=Sistemul a fost de configurat cu o limită de precizie pentru prețuri unitare de <b>%s</b> zecimale.
 DoTest=Test
 ToFilter=Filtru
 NoFilter=Fără filtru
@@ -157,28 +157,28 @@ Add=Adaugă
 AddLink=Adaugă link
 RemoveLink=Eliminaţi link
 AddToDraft=Adaugă la schiţă
-Update=Modifică
+Update=Modificare
 Close=Închide
 CloseAs=Setați starea la
 CloseBox=Elimină widget-ul din tabloul de bord
-Confirm=Confirmă
-ConfirmSendCardByMail=Chiar doriți să trimiteți conținutul acestui card prin poștă la <b> %s </b>?
-Delete=Şterge
-Remove=Elimină
+Confirm=Confirmare
+ConfirmSendCardByMail=Chiar doriți să trimiteți conținutul acestei fişe prin poștă la <b>%s</b>?
+Delete=Ştergere
+Remove=Eliminare
 Resiliate=Termină
-Cancel=Anulează
+Cancel=Anulare
 Modify=Modifică
-Edit=Editează
+Edit=Editare
 Validate=Validează
 ValidateAndApprove=Validează şi aprobă
 ToValidate=De validat
 NotValidated=Nevalidată
-Save=Salvează
-SaveAs=Salvează ca
+Save=Salvare
+SaveAs=Salvare ca
 SaveAndStay=Salvează şi rămâi aici
 SaveAndNew=Salvează şi mergi la pagină nouă
 TestConnection=Test conexiune
-ToClone=Clonează
+ToClone=Clonare
 ConfirmCloneAsk=Eşti sigur că vrei să clonezi obiectul <b>%s</b>?
 ConfirmClone=Alegeți datele pe care doriți să le clonați:
 NoCloneOptionsSpecified=Nu există date definite pentru a clona .
@@ -188,33 +188,33 @@ Run=Lansează
 CopyOf=Copie la
 Show=Afişează
 Hide=Ascunde
-ShowCardHere=Arăta fişa aici
+ShowCardHere=Arată fişa
 Search=Caută
 SearchOf=Căutare
 SearchMenuShortCut=Ctrl + shift + f
 QuickAdd=Adăugare rapidă
 QuickAddMenuShortCut=Ctrl + shift + l
-Valid=Validează
-Approve=Aprobaţi
-Disapprove=Dezaproba
-ReOpen=Redeaschide
-Upload=Încărcați
+Valid=Valid
+Approve=Aprobare
+Disapprove=Dezaprobă
+ReOpen=Redeschide
+Upload=Încărcare
 ToLink=Link
-Select=Selectaţi
+Select=Selectare
 SelectAll=Selectează toate
 Choose=Alege
-Resize=Redimensionează
-ResizeOrCrop=Redimensionați sau decupați
-Recenter=Recentrează
+Resize=Redimensionare
+ResizeOrCrop=Redimensionare sau decupare
+Recenter=Recentrare
 Author=Autor
 User=Utilizator
 Users=Utilizatori
 Group=Grup
 Groups=Grupuri
-NoUserGroupDefined=Niciun grup utilizator definit
+NoUserGroupDefined=Niciun grup de utilizatori definit
 Password=Parola
 PasswordRetype=Repetă parola
-NoteSomeFeaturesAreDisabled=Atenţie, o mulţime de funcţionalităţi / module sunt dezactivate în această demonstraţie.
+NoteSomeFeaturesAreDisabled=Atenţie, o mulţime de funcţionalităţi/module sunt dezactivate în această instanţă demonstrativă.
 Name=Nume
 NameSlashCompany=Nume/Companie
 Person=Persoană
@@ -234,7 +234,7 @@ Note=Notă
 Title=Titlu
 Label=Etichetă
 RefOrLabel=Ref. sau etichetă
-Info=Loguri
+Info=Jurnal
 Family=Familie
 Description=Descriere
 Designation=Descriere
@@ -242,7 +242,7 @@ DescriptionOfLine=Descriere de linie
 DateOfLine=Data liniei
 DurationOfLine=Durata liniei
 Model=Șablonul documentului
-DefaultModel=Șablonul documentului implicit
+DefaultModel=Șablonul implicit document
 Action=Eveniment
 About=Despre
 Number=Număr
@@ -266,7 +266,7 @@ HourStart=Oră start
 Deadline=Termen limită
 Date=Dată
 DateAndHour=Dată şi oră
-DateToday=Astazi
+DateToday=Astăzi
 DateReference=Data referinţă
 DateStart=Dată începere
 DateEnd=Dată sfîrşit
@@ -278,10 +278,11 @@ DateModificationShort=Dată modif.
 IPModification=IP modificare
 DateLastModification=Data ultimei modificări
 DateValidation=Dată validare
+DateSigning=Data semnării
 DateClosing=Dată închidere
 DateDue=Dată scadenţă
-DateValue=Dată decontare
-DateValueShort=Dată decontare
+DateValue=Dată valoare
+DateValueShort=Dată valoare
 DateOperation=Dată operare
 DateOperationShort=Dată ope.
 DateLimit=Dată limită
@@ -331,9 +332,9 @@ Quadri=Trimestru
 MonthOfDay=Luna curentă
 DaysOfWeek=Zilele săptămânii
 HourShort=H
-MinuteShort=mn
-Rate=Rată
-CurrencyRate=Rata de conversie valutară
+MinuteShort=min
+Rate=Curs
+CurrencyRate=Curs de schimb monedă
 UseLocalTax=Include taxe
 Bytes=Octeţi
 KiloBytes=Kiloocteţi
@@ -361,8 +362,8 @@ UnitPriceHTCurrency=Prețul unitar(fără taxe)(fără valută)
 UnitPriceTTC=Preț unitar
 PriceU=P.U.
 PriceUHT=PU(net)
-PriceUHTCurrency=P.U (monedă)
-PriceUTTC=P.U.(incl. taxe)
+PriceUHTCurrency=P.U (net) (monedă)
+PriceUTTC=P.U.(cu taxe)
 Amount=Valoare
 AmountInvoice=Valoare factură
 AmountInvoiced=Suma facturată
@@ -389,6 +390,8 @@ AmountTotal=Valoare totală
 AmountAverage=Valoare medie
 PriceQtyMinHT=Preţ cantitate min. (fără taxe)
 PriceQtyMinHTCurrency=Preţ cantitate min. (fără taxe) (valută)
+PercentOfOriginalObject=Procentul din obiectul original
+AmountOrPercent=Valoare sau procent
 Percentage=Procentaj
 Total=Total
 SubTotal=Subtotal
@@ -397,38 +400,38 @@ TotalHT100Short=Total 100%% (fără taxe)
 TotalHTShortCurrency=Total (fără taxe în valută)
 TotalTTCShort=Total (cu taxe)
 TotalHT=Total (fără taxe)
-TotalHTforthispage=Total (fără taxă) pentru această pagină
+TotalHTforthispage=Total (fără taxe) pentru această pagină
 Totalforthispage=Total pentru această pagină
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (taxa Inc) în creditul dvs
-TotalVAT=Total TVA
+TotalTTC=Total (cu taxe)
+TotalTTCToYourCredit=Total (cu taxe) în creditul tău
+TotalVAT=Total taxe
 TotalVATIN=Total IGST
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
+TotalLT1=Total taxa 2
+TotalLT2=Total taxa 3
 TotalLT1ES=Total RE
 TotalLT2ES=Total IRPF
 TotalLT1IN=Total CGST
 TotalLT2IN=Total SGST
-HT=Fără impozit
-TTC=Inc. taxe
-INCVATONLY=Include TVA
+HT=Fără taxe
+TTC=Cu taxe
+INCVATONLY=Incl. TVA
 INCT=Include toate taxele
 VAT=TVA
 VATIN=IGST
 VATs=Taxe vânzări
 VATINs=Taxe IGST
-LT1=Impozitul pe vânzări 2
-LT1Type=Tip impozit pe vânzări 2
-LT2=Impozitul pe vânzări 3
-LT2Type=Tip impozit pe vânzări 3
+LT1=Taxa pe vânzări 2
+LT1Type=Tip taxă pe vânzări 2
+LT2=Taxă pe vânzări 3
+LT2Type=Tip taxă pe vânzări 3
 LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 LT1GC=Procente adiţionale
-VATRate=Taxa TVA
+VATRate=Cota TVA
 VATCode=Cod cotă TVA
-VATNPR=Rata impozitului NPR
+VATNPR=Cotă taxă NPR
 DefaultTaxRate=Cotă taxă implicită
 Average=Medie
 Sum=Suma
@@ -456,35 +459,35 @@ Comment=Comentează
 Comments=Comentarii
 ActionsToDo=Evenimente de făcut
 ActionsToDoShort=De făcut
-ActionsDoneShort=Făcut
+ActionsDoneShort=Efectuat
 ActionNotApplicable=Nu se aplică
 ActionRunningNotStarted=De început
 ActionRunningShort=În progres
-ActionDoneShort=Terminat
+ActionDoneShort=Finalizat
 ActionUncomplete=Incomplet
 LatestLinkedEvents=Ultimele %s evenimente asociate
 CompanyFoundation=Companie/Organizație
 Accountant=Contabil
-ContactsForCompany=Contacte pentru aceast terţ
-ContactsAddressesForCompany=Contacte pentru aceast terţ
+ContactsForCompany=Contacte pentru acest terţ
+ContactsAddressesForCompany=Contacte/adrese pentru acest terţ
 AddressesForCompany=Adrese pentru acest terţ
-ActionsOnCompany=Evenimente pentru acest terț
+ActionsOnCompany=Evenimente pe acest terț
 ActionsOnContact=Evenimente pentru acest contact/adresă
 ActionsOnContract=Evenimente pentru acest contract
 ActionsOnMember=Evenimente privind acest membru
 ActionsOnProduct=Evenimente despre acest produs
 NActionsLate=%s întârziat
 ToDo=De făcut
-Completed=Complet
+Completed=Terminat
 Running=În progres
 RequestAlreadyDone=Cerere deja înregistrată
 Filter=Filtru
 FilterOnInto=Criteriu Cautare '<strong>%s</strong>' in câmpurile %s
-RemoveFilter=Îndepărtați filtrul
+RemoveFilter=Îndepărtare filtru
 ChartGenerated=Grafice generate
 ChartNotGenerated=Grafic negenerat
 GeneratedOn=Generat pe %s
-Generate=Generează
+Generate=Generare
 Duration=Durată
 TotalDuration=Durată totală
 Summary=Sumar
@@ -492,7 +495,7 @@ DolibarrStateBoard=Statistici bază de date
 DolibarrWorkBoard=Deschideți elementele
 NoOpenedElementToProcess=Nici un element deschis care trebuie procesat
 Available=Disponibil
-NotYetAvailable=Nedisponibil încă
+NotYetAvailable=Indisponibil încă
 NotAvailable=Indisponibil
 Categories=Tag-uri/categorii
 Category=Tag/categorie
@@ -501,7 +504,7 @@ From=De la
 FromDate=De la
 FromLocation=De la
 at=la
-to=la
+to=până la
 To=la
 and=şi
 or=sau
@@ -537,7 +540,7 @@ Received=Primit
 Paid=Plătit
 Topic=Subiect
 ByCompanies=După terți
-ByUsers=De către utilizator
+ByUsers=De utilizator
 Links=Link-uri
 Link=Link
 Rejects=Respingeri
@@ -548,17 +551,17 @@ None=Niciunul
 NoneF=Niciunul
 NoneOrSeveral=Niciunul sau mai multe
 Late=Întârziat
-LateDesc=Un element este definit ca Întârziat conform configurației sistemului din meniul Acasă - Configurare - Alerte.
+LateDesc=Un element este definit ca Întârziat conform configurației sistemului din meniul Acasă - Setări - Alerte.
 NoItemLate=Nimic întârziat
 Photo=Foto
 Photos=Fotografii
 AddPhoto=Adaugă foto
 DeletePicture=Şterge foto
-ConfirmDeletePicture=Confirmaţi ştergere foto ?
+ConfirmDeletePicture=Confirmaţi ştergerea fotografiei?
 Login=Autentificare
 LoginEmail=Autentificare (email)
-LoginOrEmail=Autentificare sau Email
-CurrentLogin=Login curent
+LoginOrEmail=Nume de autentificare sau Email
+CurrentLogin=Autentificarea curentă
 EnterLoginDetail=Introduceți datele de autentificare
 January=Ianuarie
 February=Februarie
@@ -596,25 +599,25 @@ MonthShort09=sep
 MonthShort10=oct
 MonthShort11=nov
 MonthShort12=dec
-MonthVeryShort01=J
-MonthVeryShort02=V
-MonthVeryShort03=L
+MonthVeryShort01=I
+MonthVeryShort02=F
+MonthVeryShort03=M
 MonthVeryShort04=A
-MonthVeryShort05=L
-MonthVeryShort06=J
-MonthVeryShort07=J
+MonthVeryShort05=M
+MonthVeryShort06=I
+MonthVeryShort07=I
 MonthVeryShort08=A
-MonthVeryShort09=D
+MonthVeryShort09=S
 MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Fişiere şi documente ataşate
-JoinMainDoc=Alăturați-vă documentului principal
+JoinMainDoc=Alăturați documentului principal
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
-ReportName=Nume Raport
-ReportPeriod=Perioadă Raport
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+ReportName=Nume raport
+ReportPeriod=Perioadă de raportare
 ReportDescription=Descriere
 Report=Raport
 Keyword=Cuvânt cheie
@@ -629,7 +632,7 @@ ReadPermissionNotAllowed=Citirea nu este permisă
 AmountInCurrency=Valoare în moneda %s
 Example=Exemplu
 Examples=Exemple
-NoExample=Nu exemplu
+NoExample=Niciun exemplu
 FindBug=Raportaţi o eroare
 NbOfThirdParties=Număr terţi
 NbOfLines=Număr linii
@@ -639,22 +642,22 @@ Referers=Obiecte asociate
 TotalQuantity=Cantitatea totală
 DateFromTo=De la %s la %s
 DateFrom=Începând cu %s
-DateUntil=Până în %s
-Check=Verifică
+DateUntil=Până la %s
+Check=Bifaţi
 Uncheck=Debifați
 Internal=Intern
 External=Extern
-Internals=Interne
+Internals=Intern
 Externals=Extern
 Warning=Atenţie
 Warnings=Avertismente
 BuildDoc=Generează Doc
-Entity=Mediu
-Entities=Entităţile
-CustomerPreview=Preview Client
+Entity=Entitate
+Entities=Entităţi
+CustomerPreview=Previzualizare client
 SupplierPreview=Previzualizare furnizor
-ShowCustomerPreview=Afişează Preview client
-ShowSupplierPreview=Afișați previzualizarea furnizorului
+ShowCustomerPreview=Afişează preview client
+ShowSupplierPreview=Afișează previzualizare furnizor
 RefCustomer=Ref. client
 InternalRef=Ref. internă
 Currency=Moneda
@@ -669,48 +672,48 @@ FeatureNotYetSupported=Funcţionalitate încă nesuportată
 CloseWindow=Închide fereastra
 Response=Răspuns
 Priority=Prioritate
-SendByMail=Trimis prin email
-MailSentBy=E-mail trimis de
+SendByMail=Trimis pe email
+MailSentBy=Email trimis de
 NotSent=Nu a fost trimis
-TextUsedInTheMessageBody=Continut Email
-SendAcknowledgementByMail=Trimite confirmare email
-SendMail=Trimite un email
+TextUsedInTheMessageBody=Conţinut email
+SendAcknowledgementByMail=Trimite email cu confirmare
+SendMail=Trimite email
 Email=Email
 NoEMail=Niciun email
 AlreadyRead=Citit deja
-NotRead=Necitită
-NoMobilePhone=Fără număr mobil
-Owner=Proprietar
+NotRead=Necitit
+NoMobilePhone=Fără număr de telefon mobil
+Owner=Deţinător
 FollowingConstantsWillBeSubstituted=Următoarele constante vor fi înlocuite cu valoarea corespunzătoare.
 Refresh=Refresh
-BackToList=Inapoi la lista
+BackToList=Înapoi la listă
 BackToTree=Înapoi la arbore
 GoBack=Du-te înapoi
 CanBeModifiedIfOk=Poate fi modificat, dacă e valid
 CanBeModifiedIfKo=Poate fi modificat, dacă nu e valid
 ValueIsValid=Valoarea este validă
 ValueIsNotValid=Valoarea nu este validă
-RecordCreatedSuccessfully=Înregistrarea creată cu succes
+RecordCreatedSuccessfully=Înregistrare creată cu succes
 RecordModifiedSuccessfully=Înregistrare modificată cu succes
 RecordsModified=Înregistrările (Înregistrarea) %s au fost modificate
-RecordsDeleted=Înregistrările (Înregistrarea) %s au fost șterse
-RecordsGenerated=Înregistrările (Înregistrarea) generate de %s
+RecordsDeleted=Înregistrările(rarea) %s au fost șterse
+RecordsGenerated=%s înregistrare(ări) au fost generate 
 AutomaticCode=Cod automat
 FeatureDisabled=Funcţionalitate dezactivată
 MoveBox=Mutați widgetul
 Offered=Oferit
 NotEnoughPermissions=Nu aveţi permisiuni pentru această acţiune
-SessionName=Nume Sesiune
-Method=Metoda
+SessionName=Nume sesiune
+Method=Metodă
 Receive=Recepţionează
-CompleteOrNoMoreReceptionExpected=Completă sau nimic de așteptat
-ExpectedValue=Valoarea estimată
+CompleteOrNoMoreReceptionExpected=Finalizat sau nu se mai aşteaptă recepţia
+ExpectedValue=Valoarea aşteptată
 ExpectedQty=Cantitate aşteptată
 PartialWoman=Parţial
 TotalWoman=Total
 NeverReceived=Niciodată primit
 Canceled=Anulată
-YouCanChangeValuesForThisListFromDictionarySetup=Puteți modifica valorile pentru această listă din meniul Setare - Dicţionare
+YouCanChangeValuesForThisListFromDictionarySetup=Puteți modifica valorile pentru această listă din meniul Setări - Dicţionare
 YouCanChangeValuesForThisListFrom=Puteți modifica valorile pentru această listă din meniul %s
 YouCanSetDefaultValueInModuleSetup=Puteți seta valoarea implicită utilizată la crearea unei noi înregistrări în configurarea modulului
 Color=Culoare
@@ -721,57 +724,57 @@ MenuAccountancy=Contabilitate
 MenuECM=Documente
 MenuAWStats=AWStats
 MenuMembers=Membri
-MenuAgendaGoogle=Agenda Google
+MenuAgendaGoogle=Agendă Google
 MenuTaxesAndSpecialExpenses=Taxe | Cheltuieli speciale
 ThisLimitIsDefinedInSetup=Limită Dolibarr (Menu Home-setup-securitate): %s Kb, PHP limita: %s Kb
-NoFileFound=Niciun document salvat în acest director,
+NoFileFound=Niciun document încărcat
 CurrentUserLanguage=Limba curentă
 CurrentTheme=Tema curentă
 CurrentMenuManager=Manager meniu curent
 Browser=Browser
-Layout=Schemă
+Layout=Layout
 Screen=Ecran
 DisabledModules=Module dezactivate
 For=Pentru
 ForCustomer=Pentru clienţi
 Signature=Semnătură
 DateOfSignature=Data semnării
-HidePassword=Afișare comanda cu parola ascunsă
-UnHidePassword=Afișare comanda reală cu parola în clar
+HidePassword=Afișare comandă cu parola ascunsă
+UnHidePassword=Afișare comandă reală cu parola în clar
 Root=Rădăcină
 RootOfMedias=Director rădăcină pentru media public (/medias)
-Informations=Informatie
+Informations=Informaţii
 Page=Pagină
 Notes=Note
 AddNewLine=Adaugă linie nouă
 AddFile=Adaugă fişier
 FreeZone=Text liber pentru produs
-FreeLineOfType=Element text gratuit, tip:
+FreeLineOfType=Element text liber, tip:
 CloneMainAttributes=Clonează obiect cu atributele sale principale
-ReGeneratePDF=Regenerați PDF
-PDFMerge=Îmbină PDF
-Merge=Îmbină
+ReGeneratePDF=Re-generare PDF
+PDFMerge=Îmbinare PDF
+Merge=Îmbinare
 DocumentModelStandardPDF=Șablon standard PDF
-PrintContentArea=Afişaţi pagina pentru imprimat în zona conţinutului principal
+PrintContentArea=Afişaţi pagina de imprimat în zona principală de conţinut
 MenuManager=Manager Meniu
-WarningYouAreInMaintenanceMode=Atenție, sunteți în modul de întreținere: este permisă numai utilizarea sistemului de conectare <b> %s </b> în acest mod.
+WarningYouAreInMaintenanceMode=Atenție, sunteți în modul de întreținere: este permisă numai conectarea utilizatorului <b> %s </b> în acest mod.
 CoreErrorTitle=Eroare de sistem
 CoreErrorMessage=Scuze, a aparut o eroare. Contactați administratorul de sistem pentru a verifica jurnalele sau dezactivați $ dolibarr_main_prod = 1 pentru a obține mai multe informații.
 CreditCard=Card de credit
-ValidatePayment=Validează plata
+ValidatePayment=Validare plată
 CreditOrDebitCard=Card de credit sau debit
 FieldsWithAreMandatory=Campurile marcate cu <b>%s</b> sunt obligatorii
-FieldsWithIsForPublic=Câmpurile cu <b> %s </b> sunt afișate în lista publică de membri. Dacă nu doriți acest lucru, debifați caseta "publică".
+FieldsWithIsForPublic=Câmpurile cu <b>%s</b> sunt afișate în lista publică de membri. Dacă nu doriți acest lucru, debifați caseta "public".
 AccordingToGeoIPDatabase=(conform conversiei GeoIP)
 Line=Linie
 NotSupported=Nesuportat
 RequiredField=Câmp obligatoriu
 Result=Rezultat
-ToTest=Testează
+ToTest=Testare
 ValidateBefore=Elementul trebuie validat înainte de a utiliza această caracteristică
 Visibility=Vizibilitate
 Totalizable=Totalizabil
-TotalizableDesc=Acest câmp este totalizat în listă
+TotalizableDesc=Acest câmp este totalizabil în listă
 Private=Privată
 Hidden=Ascunsă
 Resources=Resurse
@@ -785,73 +788,73 @@ IM=Mesagerie instant
 NewAttribute=Atribut nou
 AttributeCode=Cod Atribut
 URLPhoto=Url către foto/logo
-SetLinkToAnotherThirdParty=Link către un alt terţ
-LinkTo=Link la
-LinkToProposal=Link la propunere
+SetLinkToAnotherThirdParty=Asociază cu un alt terţ
+LinkTo=Asociere la
+LinkToProposal=Asociere la ofertă
 LinkToOrder=Link către comandă
-LinkToInvoice=Link la factura
-LinkToTemplateInvoice=Link la factura șablon
+LinkToInvoice=Link la factură
+LinkToTemplateInvoice=Link la șablon factură
 LinkToSupplierOrder=Link la comanda de achiziție
-LinkToSupplierProposal=Link la propunerea vânzătorului
-LinkToSupplierInvoice=Link la factura furnizorului
-LinkToContract=Link la contract
-LinkToIntervention=Link la intervenție
+LinkToSupplierProposal=Link la ofertă furnizor
+LinkToSupplierInvoice=Link la factură furnizor
+LinkToContract=Asociere la contract
+LinkToIntervention=Asociere la intervenție
 LinkToTicket=Link la tichet
-CreateDraft=Creareză schiţă
-SetToDraft=Inapoi la schiţă
-ClickToEdit=Clic pentru a edita
-ClickToRefresh=Faceți clic pentru a actualiza
-EditWithEditor=Editați cu CKEditor
-EditWithTextEditor=Editați cu editor de text
-EditHTMLSource=Editați Sursa HTML
-ObjectDeleted=Obiect %s şters
+CreateDraft=Creare schiţă
+SetToDraft=Înapoi la schiţă
+ClickToEdit=Clic pentru editare
+ClickToRefresh=Click pentru refresh
+EditWithEditor=Editare cu CKEditor
+EditWithTextEditor=Editare cu editor de text
+EditHTMLSource=Editare sursă HTML
+ObjectDeleted=Obiectul %s a fost şters
 ByCountry=Pe ţară
 ByTown=Pe oraş
 ByDate=Pe dată
-ByMonthYear=Pe luna / an
-ByYear=Pe ani
-ByMonth=Pe luni
+ByMonthYear=Pe lună/an
+ByYear=Pe an
+ByMonth=Pe lună
 ByDay=Pe zi
 BySalesRepresentative=Pe reprezentant de vânzări
-LinkedToSpecificUsers=Link către un contact utilizator particular
-NoResults=Niciun Rezultat
+LinkedToSpecificUsers=Asociat la un utilizator specific
+NoResults=Niciun rezultat
 AdminTools=Instrumente de administrare
-SystemTools=Instrumente Sistem
-ModulesSystemTools=Module Instrumente
+SystemTools=Instrumente de sistem
+ModulesSystemTools=Instrumente module
 Test=Test
 Element=Element
 NoPhotoYet=Nicio imagine disponibilă
 Dashboard=Tablou de bord
 MyDashboard=Panoul meu de control
-Deductible=Deductibile
+Deductible=Deductibil
 from=de la
 toward=spre
 Access=Acces
 SelectAction=Selectați acțiune
-SelectTargetUser=Selectați utilizatorul / angajatul țintă
-HelpCopyToClipboard=Utilizați Ctrl + C pentru a copia în clipboard
-SaveUploadedFileWithMask=Salvați fișierul pe server cu numele "<strong>%s</strong>" (altfel"%s")
+SelectTargetUser=Selectați utilizatorul/angajatul țintă
+HelpCopyToClipboard=Foloseşte 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
 SetDemandReason=Setează sursa
-SetBankAccount=Defineste Cont bancar
-AccountCurrency=Valuta contului
+SetBankAccount=Definire Cont bancar
+AccountCurrency=Moneda contului
 ViewPrivateNote=Vezi notițe
 XMoreLines=%s linii(e) ascunse
 ShowMoreLines=Afișează mai multe/mai puține linii
 PublicUrl=URL Public
-AddBox=Adauga box
+AddBox=Adaugă box
 SelectElementAndClick=Selectați un element și faceți clic pe %s
-PrintFile=Printeaza Fisierul %s
+PrintFile=Tipăreşte fişierul %s
 ShowTransaction=Afișați intrarea în contul bancar
 ShowIntervention=Afişează intervenţie
 ShowContract=Afişează contract
-GoIntoSetupToChangeLogo=Accesați Acasă - Configurare - Companie pentru a schimba logo-ul sau Accesați Acasă - Configurare - Afișare pentru ascundere.
+GoIntoSetupToChangeLogo=Accesați Acasă - Setări - Companie pentru a schimba logo-ul sau Accesați Acasă - Configurare - Afișare pentru ascundere.
 Deny=Respinge
 Denied=Respins
 ListOf=Listă de %s
 ListOfTemplates=Listă template-uri
 Gender=Gen
-Genderman=Barbat
+Genderman=Bărbat
 Genderwoman=Femeie
 Genderother=Altele
 ViewList=Vedere listă
@@ -860,21 +863,21 @@ ViewKanban=Vedere Kanban
 Mandatory=Obligatoriu
 Hello=Salut
 GoodBye=La revedere
-Sincerely=Cu sinceritate
+Sincerely=Cu stimă
 ConfirmDeleteObject=Eşti sigur că vrei să ştergi acest obiect?
 DeleteLine=Şterge linie
 ConfirmDeleteLine=Sigur doriți să ștergeți această linie?
 ErrorPDFTkOutputFileNotFound=Eroare: fişierul nu a fost generat. Verifică dacă comanda 'pdftk' este instalată într-un director inclus în variabila de sistem $PATH (doar în linux/unix) sau contactează administratorul sistemului.
-NoPDFAvailableForDocGenAmongChecked=Nu au fost disponibile PDF-uri pentru generarea de documente printre înregistrările înregistrate
+NoPDFAvailableForDocGenAmongChecked=Nu au fost disponibile PDF-uri pentru generarea de documente din înregistrările selectate
 TooManyRecordForMassAction=Prea multe înregistrări selectate pentru acțiuni în masă. Acțiunea este limitată la o listă de %s înregistrări.
 NoRecordSelected=Nu a fost selectată nicio înregistrare
 MassFilesArea=Zona pentru fişiere generate prin acţiuni în masă
 ShowTempMassFilesArea=Afişează zona pentru fişiere generate prin acţiuni în masă
-ConfirmMassDeletion=Confirmarea afişării în bloc
+ConfirmMassDeletion=Confirmare ştergere în bloc
 ConfirmMassDeletionQuestion=Sigur doriți să ștergeți %s înregistrările(înregistrarea) selectate?
 RelatedObjects=Obiecte asociate
 ClassifyBilled=Clasează facturată
-ClassifyUnbilled=Clasificați nefacturabil
+ClassifyUnbilled=Clasează nefacturată
 Progress=Progres
 ProgressShort=Progr.
 FrontOffice=Front office
@@ -883,9 +886,9 @@ Submit=Trimite
 View=Vizualizare
 Export=Export
 Exports=Exporturi
-ExportFilteredList=Exportați lista filtrată
-ExportList=Exportați lista
-ExportOptions=Opţiuni Export
+ExportFilteredList=Export listă filtrată
+ExportList=Export listă
+ExportOptions=Opţiuni export
 IncludeDocsAlreadyExported=Include documentele deja exportate
 ExportOfPiecesAlreadyExportedIsEnable=Exportul elementelor deja exportate este activat
 ExportOfPiecesAlreadyExportedIsDisable=Exportul elementelor deja exportate este dezactivat
@@ -893,32 +896,34 @@ AllExportedMovementsWereRecordedAsExported=Toate mişcările exportate au fost 
 NotAllExportedMovementsCouldBeRecordedAsExported=Nu toate mişcările exportate au putut fi înregistrate ca exportate
 Miscellaneous=Diverse
 Calendar=Calendar
-GroupBy=A se grupa cu...
-ViewFlatList=Vizualizați lista plată
+GroupBy=Grupare după...
+ViewFlatList=Vizualizare listă aplatizată
 ViewAccountList=Afişare registru
 ViewSubAccountList=Afişare registru analitice
-RemoveString=Eliminați șirul "%s"
-SomeTranslationAreUncomplete=Unele dintre limbile oferite pot fi traduse numai parțial sau pot conține erori. Vă rugăm să vă ajutați să vă corectați limba prin înscrierea la <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> pentru a vă adăuga îmbunătățirile.
-DirectDownloadLink=Link direct de descărcare (public / extern)
-DirectDownloadInternalLink=Link direct de descărcare (trebuie înregistrare și are nevoie de permisiuni)
-Download=Descarcă
-DownloadDocument=Descărcați documentul
-ActualizeCurrency=Actualizați cursul valutar
+RemoveString=Eliminați șirul '%s'
+SomeTranslationAreUncomplete=Unele dintre limbile oferite pot fi traduse numai parțial sau pot conține erori. Vă rugăm să vă corectați limba prin înscrierea în <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> pentru a îmbunătăți traducerea.
+DirectDownloadLink=Link de descărcare public
+PublicDownloadLinkDesc=Doar linkul este necesar pentru a descărca fișierul
+DirectDownloadInternalLink=Link de descărcare privat
+PrivateDownloadLinkDesc=Trebuie să fiți conectat și aveți nevoie de permisiuni pentru a vizualiza sau descărca fișierul
+Download=Descărcare
+DownloadDocument=Descărcare document
+ActualizeCurrency=Actualizare curs valutar
 Fiscalyear=An fiscal
 ModuleBuilder=Dezvoltator de module şi aplicaţii
-SetMultiCurrencyCode=Setați moneda
-BulkActions=Acțiunile în masă
-ClickToShowHelp=Faceți clic pentru a afișa instrumente pentru ajutor
-WebSite=Website
+SetMultiCurrencyCode=Setare monedă
+BulkActions=Acțiuni în masă
+ClickToShowHelp=Faceți clic pentru a afișa instrumentele de ajutor
+WebSite=Site
 WebSites=Site-uri
 WebSiteAccounts=Conturi de site
-ExpenseReport=Raport Cheltuieli
-ExpenseReports=Rapoarte Cheltuieli
+ExpenseReport=Decont de cheltuieli
+ExpenseReports=Deconturi de cheltuieli
 HR=Resurse Umane
-HRAndBank=Resurse Umane si Banca
+HRAndBank=Resurse Umane şi Banca
 AutomaticallyCalculated=Calculat automat
-TitleSetToDraft=Întoarceți-vă la schiță
-ConfirmSetToDraft=Sigur doriți să vă întoarceți la Starea Schiței?
+TitleSetToDraft=Revenire la schiță
+ConfirmSetToDraft=Sigur doriți să vă întoarceți la starea Schiță?
 ImportId=ID import
 Events=Evenimente
 EMailTemplates=Șabloane de email
@@ -929,14 +934,14 @@ LeadOrProject=Oportunitate | Proiect
 LeadsOrProjects=Oportunităţi | Proiecte
 Lead=Oportunitate
 Leads=Oportunităţi
-ListOpenLeads=Listează oportunităţi deschise
-ListOpenProjects=Listează proiecte deschise
-NewLeadOrProject=Proiect sau oportunitate nouă
+ListOpenLeads=Listă lead-uri deschise
+ListOpenProjects=Listă proiecte deschise
+NewLeadOrProject=Proiect sau lead nou
 Rights=Permisiuni
 LineNb=Linia nr.
 IncotermLabel=Incoterm
-TabLetteringCustomer=Inscripția clientului
-TabLetteringSupplier=Inscripția vânzătorului
+TabLetteringCustomer=Numerotare client
+TabLetteringSupplier=Numerotare furnizor
 Monday=Luni
 Tuesday=Marţi
 Wednesday=Miercuri
@@ -949,7 +954,7 @@ TuesdayMin=Ma
 WednesdayMin=Mi
 ThursdayMin=Jo
 FridayMin=Vi
-SaturdayMin=Sa
+SaturdayMin=Sâ
 SundayMin=Du
 Day1=Luni
 Day2=Marţi
@@ -999,43 +1004,44 @@ billion=miliard
 trillion=trilion
 quadrillion=cvadrilion
 SelectMailModel=Selectați un șablon de email
-SetRef=Set ref
-Select2ResultFoundUseArrows=S-au găsit câteva rezultate. Utilizați săgețile pentru a selecta.
-Select2NotFound=Niciun rezultat gasit
-Select2Enter=Introduce
+SetRef=Setează ref
+Select2ResultFoundUseArrows=S-au găsit rezultate. Utilizați săgețile pentru selecţie.
+Select2NotFound=Niciun rezultat găsit
+Select2Enter=Introdu
 Select2MoreCharacter=sau mai multe caractere
 Select2MoreCharacters=sau mai multe caractere
-Select2MoreCharactersMore=<strong> Sintaxă de căutare: </strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> SAU </kbd> (a | b) <br> <kbd> <strong> * </strong> </kbd> <kbd> Orice caracter </kbd> (a * b) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> începe cu </kbd> (^ ab) <br> <kbd> <strong> $ </strong> </kbd> <kbd> Se termină cu </kbd> ( ab $) <br>
-Select2LoadingMoreResults=Se incarca mai multe rezultate...
-Select2SearchInProgress=Cautare in progres...
+Select2MoreCharactersMore=<strong>Sintaxă de căutare:</strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> SAU </kbd> (a|b) <br> <kbd> <strong> * </strong> </kbd> <kbd> Orice caracter</kbd> (a*b) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> Începe cu </kbd> (^ab) <br> <kbd> <strong>$</strong> </kbd> <kbd> Se termină cu </kbd> (ab$) <br>
+Select2LoadingMoreResults=Se încarcă mai multe rezultate...
+Select2SearchInProgress=Căutare în curs...
 SearchIntoThirdparties=Terţi
 SearchIntoContacts=Contacte
 SearchIntoMembers=Membri
 SearchIntoUsers=Utilizatori
 SearchIntoProductsOrServices=Produse sau servicii
+SearchIntoBatch=Loturi / Serii
 SearchIntoProjects=Proiecte
 SearchIntoMO=Comenzi de producţie
 SearchIntoTasks=Taskuri
 SearchIntoCustomerInvoices=Facturi Clienţi
 SearchIntoSupplierInvoices=Facturi Furnizori
-SearchIntoCustomerOrders=Ordine de vânzări
-SearchIntoSupplierOrders=Comenzile de achiziție
+SearchIntoCustomerOrders=Comenzi de vânzare
+SearchIntoSupplierOrders=Comenzi de achiziție
 SearchIntoCustomerProposals=Oferte Comerciale
-SearchIntoSupplierProposals=Propunerile furnizorilor
+SearchIntoSupplierProposals=Oferte furnizori
 SearchIntoInterventions=Intervenţii
 SearchIntoContracts=Contracte
 SearchIntoCustomerShipments=Livrări Client
 SearchIntoExpenseReports=Rapoarte Cheltuieli
-SearchIntoLeaves=Concediu
-SearchIntoTickets=Tichete
+SearchIntoLeaves=Concedii
+SearchIntoTickets=Tichete de suport
 SearchIntoCustomerPayments=Plăţi ale clienţilor
-SearchIntoVendorPayments=Plățile furnizorului
-SearchIntoMiscPayments=Diverse plăţi
+SearchIntoVendorPayments=Plăți furnizori
+SearchIntoMiscPayments=Plăţi diverse
 CommentLink=Comentarii
 NbComments=Număr de comentarii
 CommentPage=Spațiu de comentarii
-CommentAdded=Comentariu adăugat
-CommentDeleted=Comentariul șters
+CommentAdded=Comentariul a fost adăugat
+CommentDeleted=Comentariul a fost șters
 Everybody=Toată lumea
 PayedBy=Plătite de
 PayedTo=Plătit lui
@@ -1043,18 +1049,19 @@ Monthly=Lunar
 Quarterly=Trimestrial
 Annual=Anual
 Local=Local
-Remote=la distanta
-LocalAndRemote=Local și la distanță
-KeyboardShortcut=Comanda rapidă de la tastatură
+Remote=La distanţă
+LocalAndRemote=Local și La distanță
+KeyboardShortcut=Comandă rapidă de la tastatură
 AssignedTo=Atribuit lui
-Deletedraft=Ștergeți schița
-ConfirmMassDraftDeletion=Confirmarea ștergerii schitelor in masă
-FileSharedViaALink=Fișierul partajat printr-un link
+Deletedraft=Șterge schița
+ConfirmMassDraftDeletion=Confirmare ștergere schiţe în masă
+FileSharedViaALink=Fișier partajat cu un link public
 SelectAThirdPartyFirst=Selectați mai întâi un terț ...
-YouAreCurrentlyInSandboxMode=În prezent, sunteți în %s modul "sandbox"
+YouAreCurrentlyInSandboxMode=În prezent, eşti în  modul %s "sandbox"
 Inventory=Inventar
-AnalyticCode=Codul analitic
+AnalyticCode=Cod analitic
 TMenuMRP=MRP
+ShowCompanyInfos=Arată informaţii companie
 ShowMoreInfos=Arată mai multe informaţii
 NoFilesUploadedYet=Încarcă un document mai întâi
 SeePrivateNote=Afişare notă privată
@@ -1070,7 +1077,7 @@ NoArticlesFoundForTheKeyword=Nici un articol găsit pentru expresia '<strong>%s<
 NoArticlesFoundForTheCategory=Nici un articol în această categorie
 ToAcceptRefuse=De acceptat | refuzat
 ContactDefault_agenda=Eveniment
-ContactDefault_commande=Comanda
+ContactDefault_commande=Comandă
 ContactDefault_contrat=Contract
 ContactDefault_facture=Factură
 ContactDefault_fichinter=Intervenţie
@@ -1120,3 +1127,5 @@ AffectTag=Afectează eticheta
 ConfirmAffectTag=Afectare multiplă etichete
 ConfirmAffectTagQuestion=Sigur doriți să afectați etichetele înregistrărilor %s selectat(e)?
 CategTypeNotFound=Nu s-a găsit niciun tip de etichetă pentru tipul de înregistrări
+CopiedToClipboard=Copiat în clipboard
+InformationOnLinkToContract=Această sumă este doar totalul tuturor liniilor contractului. Nici o noțiune de timp nu este luată în considerare.
diff --git a/htdocs/langs/ro_RO/margins.lang b/htdocs/langs/ro_RO/margins.lang
index 38a23322f9f..5bb23aacf18 100644
--- a/htdocs/langs/ro_RO/margins.lang
+++ b/htdocs/langs/ro_RO/margins.lang
@@ -5,14 +5,14 @@ Margins=Marje
 TotalMargin=Total Marjă
 MarginOnProducts=Marjă / Produse
 MarginOnServices=Marjă / Servicii
-MarginRate=Rată Marjă
-MarkRate=Rată marcă
-DisplayMarginRates=Afişează ratele marjă
-DisplayMarkRates=Afişează rate marcă
+MarginRate=Cotă Marjă
+MarkRate=Cotă marcă
+DisplayMarginRates=Afişează cotă marjă
+DisplayMarkRates=Afişează cotă marcă
 InputPrice=Preţ intrare
-margin=Managementul marje profit
-margesSetup=Setare Management marje profit
-MarginDetails=Detalii Marjă
+margin=Management marje profit
+margesSetup=Configurare Management marje profit
+MarginDetails=Detalii marjă
 ProductMargins=Marjă Produs
 CustomerMargins=Marje Client
 SalesRepresentativeMargins=Marje Reprezentanţi vănzări
@@ -21,25 +21,25 @@ UserMargins=Marje Utilizator
 ProductService=Produs sau serviciu
 AllProducts=Toate produsele şi serviciile
 ChooseProduct/Service=Alege produs sau serviciu
-ForceBuyingPriceIfNull=Forțaţi prețul de cumpărare / de cost la prețul de vânzare, dacă nu este definit
-ForceBuyingPriceIfNullDetails=Dacă prețul de cumpărare / cost nu este definit și această opțiune este "ON", marja va fi zero pe linie (cumpărarea / prețul de cost = prețul de vânzare), în caz contrar ("OFF"), marginea va fi egală cu cea indicată.
-MARGIN_METHODE_FOR_DISCOUNT=Metoda marje pentru discounturi globale
+ForceBuyingPriceIfNull=Forțaţi prețul de achiziţie/de cost la prețul de vânzare, dacă nu este definit
+ForceBuyingPriceIfNullDetails=Dacă prețul de achiziţie/cost nu este furnizat atunci când adăugăm o nouă linie, iar această opțiune este „ACTIVĂ”, marja va fi 0 pe noua linie (preț de achiziţie/cost = preț de vânzare). Dacă această opțiune este „INACTIVĂ” (recomandat), marja va fi egală cu valoarea sugerată implicit (și poate fi de 100% dacă nu se găsește nicio valoare implicită).
+MARGIN_METHODE_FOR_DISCOUNT=Metoda de marjă pentru reduceri globale
 UseDiscountAsProduct=Ca produs
 UseDiscountAsService=Ca serviciu
 UseDiscountOnTotal=Pe subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definiti daca discontul global e tratat ca un produs, serviciu, sau numai pe total la calcularea marjei.
-MARGIN_TYPE=Prețul de cumpărare / cost sugerat implicit pentru calcularea marjei
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definiţi dacă discount-ul global e tratat ca un produs, serviciu, sau numai pe total la calcularea marjei.
+MARGIN_TYPE=Prețul de achiziţie/cost sugerat implicit pentru calcularea marjei
 MargeType1=Marja la prețul cel mai bun al furnizororului
-MargeType2=Marja privind prețul mediu ponderat (WAP)
+MargeType2=Marja la prețul mediu ponderat (WAP)
 MargeType3=Marja pe prețul de cost
 MarginTypeDesc=* Marja la prețul cel mai bun de cumpărare = Prețul de vânzare - Cel mai bun preț al furnizorului definit pe cardul de produs <br> * Marja pe prețul mediu ponderat (WAP) = Prețul de vânzare - prețul mediu ponderat al produsului(WAP)sau cel mai bun preț al furnizorului dacă WAP nu este definit încă <br> Marja pe prețul de preț = prețul de vânzare - prețul de cost definit pe cardul de produs sau WAP dacă prețul de cost nu este definit sau cel mai bun preț al vânzătorului dacă WAP nu este încă definit
 CostPrice=Preţ de cost
-UnitCharges=Cheluieli unitare
+UnitCharges=Cheltuieli unitare
 Charges=Cheltuieli
 AgentContactType=Tip contact agent comercial
-AgentContactTypeDetails= Definiți ce tip de contact (legat pe facturi) va fi utilizat pentru raportarea marjei pentru fiecare persoană de contact / adresă. Rețineți că citirea statisticilor referitoare la un contact nu este fiabilă, deoarece în cele mai multe cazuri, contactul nu poate fi definit explicit pe facturi.
-rateMustBeNumeric=Rata trebuie să fie numerică
-markRateShouldBeLesserThan100=Rata mîrcii trebuie să fie mai mica de 100
+AgentContactTypeDetails= Definiți ce tip de contact (legat pe facturi) va fi utilizat pentru raportarea marjei pentru fiecare persoană de contact/adresă. Rețineți că citirea statisticilor referitoare la un contact nu este fiabilă, deoarece în cele mai multe cazuri, contactul nu poate fi definit explicit pe facturi.
+rateMustBeNumeric=Cota trebuie să fie numerică
+markRateShouldBeLesserThan100=Cota mărcii trebuie să fie mai mică de 100
 ShowMarginInfos=Arată informaţii marjă
 CheckMargins=Detaliu marjă
 MarginPerSaleRepresentativeWarning=Raportul privind marja per utilizator utilizează legătura dintre terți și reprezentanții de vânzare pentru a calcula marja fiecărui reprezentant de vânzare. Deoarece unii terți nu pot avea un reprezentant dedicat vânzării și unii terți pot fi legate de mai mulți, este posibil ca anumite sume să nu fie incluse în acest raport (dacă nu există reprezentant de vânzare) și unele pot apărea pe diferite linii (pentru fiecare reprezentant de vânzare) .
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index e5001621e0d..ffbf1906aaa 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -1,206 +1,215 @@
 # Dolibarr language file - Source file is en_US - members
 MembersArea=Membri
-MemberCard=Fişă Membru
-SubscriptionCard=Fişă Cotizaţie
+MemberCard=Fişă membru
+SubscriptionCard=Fişă cotizaţie
 Member=Membru
 Members=Membri
-ShowMember=Arată fişa Membru
-UserNotLinkedToMember=Utilizator nelegat  la un Membru
-ThirdpartyNotLinkedToMember=Terț care nu este legat de un membru
-MembersTickets=Tichete Membri
-FundationMembers=Membri Asociaţiei
-ListOfValidatedPublicMembers=Listă Membri publici validaţi
+ShowMember=Arată fişa membrului
+UserNotLinkedToMember=Utilizator neasociat la la un membru
+ThirdpartyNotLinkedToMember=Terț neasociat la un membru
+MembersTickets=Tichete membri
+FundationMembers=Membri fundaţie
+ListOfValidatedPublicMembers=Listă membri publici validaţi
 ErrorThisMemberIsNotPublic=Acest membru nu este public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Un alt membru <b>(nume:<b>%s</b>, login: <b>%s</b>) este deja  legat la un terţ<b>%s</b> . Eliminaţi acest link mai întâi deoarece deoarece un terţ  nu poate fi legat decât la membru (şi invers).
-ErrorUserPermissionAllowsToLinksToItselfOnly=Din motive de securitate, trebuie să aveţi drepturi de a modifica toţi utilizatorii de a putea  lega un membru către un utilizator altul decât dvs.
-SetLinkToUser=Link către un utilizator Dolibarr
-SetLinkToThirdParty=Link către un terţ Dolibarr
-MembersCards=Carţi de vizită  membri
-MembersList=Lista de membri
-MembersListToValid=Lista  membri schiţă (de validat)
+ErrorUserPermissionAllowsToLinksToItselfOnly=Din motive de securitate, trebuie să aveţi drepturi de a modifica toţi utilizatorii pentru a putea asocia un membru unui utilizator altul decât tine.
+SetLinkToUser=Asociere utilizator sistem
+SetLinkToThirdParty=Asociere terţ din sistem
+MembersCards=Carţi de vizită membri
+MembersList=Listă de membri
+MembersListToValid=Listă membri schiţă (de validat)
 MembersListValid=Lista de membri validaţi
-MembersListUpToDate=Lista membrilor valizi cu abonament actualizat
-MembersListNotUpToDate=Lista membrilor valizi cu abonament expirat
+MembersListUpToDate=Lista membrilor valizi cu adeziune actualizată
+MembersListNotUpToDate=Lista membrilor valizi cu adeziune expirată
+MembersListExcluded=Lista membrilor excluşi
 MembersListResiliated=Lista membrilor desființați
-MembersListQualified=Lista de membri calificaţi
+MembersListQualified=Listă de membri calificaţi
 MenuMembersToValidate=Membri schiţă
 MenuMembersValidated=Membri validaţi
-MenuMembersResiliated=Membrii desființați
+MenuMembersExcluded=Membri excluşi
+MenuMembersResiliated=Membri desființați
 MembersWithSubscriptionToReceive=Membri cu cotizaţia de încasat
 MembersWithSubscriptionToReceiveShort=Cotizaţie de încasat
-DateSubscription=Data Adeziune
-DateEndSubscription=Dată Sfârşit Adeziune
+DateSubscription=Dată adeziune
+DateEndSubscription=Dată sfârşit adeziune
 EndSubscription=Sfârşit Adeziune
 SubscriptionId=ID Adeziune
-WithoutSubscription=Fără abonament
-MemberId=ID Membru
+WithoutSubscription=Fără cotizaţie
+MemberId=ID membru
 NewMember=Membru nou
 MemberType=Tip Membru
-MemberTypeId=ID Tip Membru
-MemberTypeLabel=Etichetă Tip Membru
-MembersTypes=Tipuri  Membri
-MemberStatusDraft=Schiţă (cererea tebuie validata)
-MemberStatusDraftShort=Draft
-MemberStatusActive=Validat (în aşteptareacotizatiei)
-MemberStatusActiveShort=Validată
-MemberStatusActiveLate=Abonament expirat
+MemberTypeId=ID tip membru
+MemberTypeLabel=Etichetă tip membru
+MembersTypes=Tipuri membri
+MemberStatusDraft=Schiţă (cererea trebuie validată)
+MemberStatusDraftShort=Schiţă
+MemberStatusActive=Validat (în aşteptarea cotizatiei)
+MemberStatusActiveShort=Validat
+MemberStatusActiveLate=Adeziune expirată
 MemberStatusActiveLateShort=Expirat
-MemberStatusPaid=Cotiaţia la zi
+MemberStatusPaid=Cotizaţie la zi
 MemberStatusPaidShort=La zi
+MemberStatusExcluded=Membru exclus
+MemberStatusExcludedShort=Exclus
 MemberStatusResiliated=Membru desființat
 MemberStatusResiliatedShort=Desființat
 MembersStatusToValid=Membri schiţă
+MembersStatusExcluded=Membri excluşi
 MembersStatusResiliated=Membrii desființați
 MemberStatusNoSubscription=Validată(nu este necesară cotizarea)
-MemberStatusNoSubscriptionShort=Validată
+MemberStatusNoSubscriptionShort=Validat
 SubscriptionNotNeeded=Nu este necesară cotizarea
 NewCotisation=Cotizaţie nouă
-PaymentSubscription=Plată cotizaţie nouă
+PaymentSubscription=Plată nouă cotizaţie
 SubscriptionEndDate=Data de final a adeziunii
-MembersTypeSetup=Setări Tipuri  membri
+MembersTypeSetup=Configurări Tipuri membri
 MemberTypeModified=Tip de membru modificat
-DeleteAMemberType=Ștergeți un tip de membru
+DeleteAMemberType=Șterge un tip de membru
 ConfirmDeleteMemberType=Sigur doriți să ștergeți acest tip de membru?
 MemberTypeDeleted=Tip de membru șters
 MemberTypeCanNotBeDeleted=Tipul de membru nu poate fi șters
-NewSubscription=Adeziune Nouă
-NewSubscriptionDesc=Acest formular vă permite să înregistraţi  ca un membru nou al Fundaţiei.  Dacă doriţi să reînnoiţi adeziunea dumneavoastră (dacă sunteţi deja  membru), vă rugăm să contactaţi  conducerea Fundaţiei prin   e-mail  %s .
+NewSubscription=Adeziune nouă
+NewSubscriptionDesc=Acest formular vă permite să vă înregistraţi ca membru nou al fundaţiei.  Dacă doriţi să vă reînnoiţi adeziunea (dacă sunteţi deja membru), vă rugăm să contactaţi conducerea fundaţiei pe email la %s .
 Subscription=Cotizaţie
 Subscriptions=Cotizaţii
 SubscriptionLate=Întârziat
 SubscriptionNotReceived=Cotizaţie neîncasată
-ListOfSubscriptions=Lista cotizaţii
-SendCardByMail=Trimiteți un card prin e-mail
+ListOfSubscriptions=Listă cotizaţii
+SendCardByMail=Trimite card pe email
 AddMember=Creare membru
-NoTypeDefinedGoToSetup=Niciun  tip de membru definit.  Du-te la meniul "Tipuri Membri"
-NewMemberType=Tip Membru nou
-WelcomeEMail=Mail de bun venit
-SubscriptionRequired=Necxesită Cotizaţie
+NoTypeDefinedGoToSetup=Niciun tip de membru definit. Du-te la meniul "Tipuri membri"
+NewMemberType=Tip membru nou
+WelcomeEMail=Email de bun venit
+SubscriptionRequired=Necesită Cotizaţie
 DeleteType=Şterge
 VoteAllowed=Drept de vot
 Physical=Fizică
-Moral=Morală
+Moral=Juridică
 MorAndPhy=Persoană fizică şi Juridică
-Reenable=Reactivaţi
-ResiliateMember=Desfiinţaţi un membru
+Reenable=Reactivare
+ExcludeMember=Exclude membru
+ConfirmExcludeMember=Eşti sigur că vrei să excluzi acest membru?
+ResiliateMember=Desfiinţare membru
 ConfirmResiliateMember=Sigur doriți să desfiinţaţi acest membru?
-DeleteMember=Ştergeţi un membru
+DeleteMember=Şterge un membru
 ConfirmDeleteMember=Sigur doriți să ștergeți acest membru (Ștergerea unui membru va șterge toate abonamentele sale)?
-DeleteSubscription=Ştergeţi o adeziune
+DeleteSubscription=Şterge o adeziune
 ConfirmDeleteSubscription=Sigur doriți să ștergeți acest abonament?
 Filehtpasswd=Fişier htpasswd
-ValidateMember=Validaţi un membru
+ValidateMember=Validare membru
 ConfirmValidateMember=Sigur doriți să validați acest membru?
-FollowingLinksArePublic=Următoarele link-uri sunt pagini deschise care nu sunt protejate de nicio permisiune Dolibarr. Acestea nu sunt pagini formatate, oferite ca exemplu pentru a arăta cum să listați baza de date a membrilor.
-PublicMemberList=Lista Membri publici
-BlankSubscriptionForm=Formular de auto-abonare publică
-BlankSubscriptionFormDesc=Dolibarr vă poate oferi un URL / site public pentru a permite vizitatorilor externi să ceară abonarea la fundație. Dacă este activat un modul de plată online, poate fi furnizat automat și un formular de plată.
-EnablePublicSubscriptionForm=Activați site-ul public cu formular de auto abonare
-ForceMemberType=Forțați tipul de membru
-ExportDataset_member_1=Membrii şi adeziuni
+FollowingLinksArePublic=Următoarele link-uri sunt pagini deschise care nu sunt protejate de nicio permisiune a sistemului. Acestea nu sunt pagini formatate, oferite ca exemplu pentru a arăta cum să listați baza de date a membrilor.
+PublicMemberList=Listă membri publici
+BlankSubscriptionForm=Formular de auto-adeziune publică
+BlankSubscriptionFormDesc=Sistemul poate oferi un URL/site public pentru a permite vizitatorilor externi să solicite adeziunea/abonarea la fundație/asociaţie. Dacă este activat un modul de plată online, poate fi furnizat automat și un formular de plată.
+EnablePublicSubscriptionForm=Activare site public cu formular de autoînscriere
+ForceMemberType=Forțează tipul de membru
+ExportDataset_member_1=Membri şi adeziuni
 ImportDataset_member_1=Membri
 LastMembersModified=Ultimii %s membri modificaţi
-LastSubscriptionsModified=Ultimele %sabonamente modificate 
+LastSubscriptionsModified=Ultimele %s adeziuni modificate 
 String=Şir de caractere
 Text=Text
-Int=Int
-DateAndTime=Data şi ora
-PublicMemberCard=Fişa Membru public
-SubscriptionNotRecorded=Abonamentul nu a fost înregistrat
+Int=Întreg
+DateAndTime=Dată şi oră
+PublicMemberCard=Fişă Membru public
+SubscriptionNotRecorded=Adeziunea ta nu a fost înregistrată
 AddSubscription=Creare adeziune
 ShowSubscription=Afişează adeziune
 # Label of email templates
-SendingAnEMailToMember=Trimiterea emailului de informare membrilor
-SendingEmailOnAutoSubscription=Trimiterea emailului la înregistrarea automată
-SendingEmailOnMemberValidation=Trimiterea emailului la validarea noului membru
-SendingEmailOnNewSubscription=Trimiterea unui email la noul abonament
-SendingReminderForExpiredSubscription=Trimiterea unui memento pentru abonamentele expirate
-SendingEmailOnCancelation=Trimiterea emailului la anulare
-SendingReminderActionComm=Se trimite memento pentru evenimentul din agendă
+SendingAnEMailToMember=Trimitere email de informare membri
+SendingEmailOnAutoSubscription=Trimitere email la înregistrarea automată
+SendingEmailOnMemberValidation=Trimitere email la validarea noului membru
+SendingEmailOnNewSubscription=Trimitere email la o adeziune/abonament nou
+SendingReminderForExpiredSubscription=Trimitere reminder pentru adeziunile/abonamentele expirate
+SendingEmailOnCancelation=Trimitere email la anulare
+SendingReminderActionComm=Se trimite reminder pentru evenimentul din agendă
 # Topic of email templates
-YourMembershipRequestWasReceived=Statutul tău de membru a fost primit
-YourMembershipWasValidated=Statutul tău de membru a fost validat
+YourMembershipRequestWasReceived=Adeziunea ta de membru a fost primită
+YourMembershipWasValidated=Adeziunea, statutul tău de membru a fost validat
 YourSubscriptionWasRecorded=Noul dvs. abonament a fost înregistrat
-SubscriptionReminderEmail=Memento pentru abonament
-YourMembershipWasCanceled=Statutul dvs. de membru a fost anulat
-CardContent=Continutul fişei dvs de membru
+SubscriptionReminderEmail=Reminder pentru cotizaţie
+YourMembershipWasCanceled=Statutul tău de membru a fost anulat
+CardContent=Conţinutul fişei tale de membru
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=Vrem să vă informăm că cererea dvs. de statut membru a fost primită. <br> <br>
-ThisIsContentOfYourMembershipWasValidated=Vrem să vă informăm că cererea dvs. de statut de membru a fost validată cu următoarele informații: <br> <br>
+ThisIsContentOfYourMembershipRequestWasReceived=Vrem să vă informăm că cererea dvs. de adeziune ca membru a fost primită. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Vrem să vă informăm că cererea dvs. de adeziune ca membru a fost validată cu următoarele informații: <br> <br>
 ThisIsContentOfYourSubscriptionWasRecorded=Vrem să vă informăm că noul dvs. abonament a fost înregistrat. <br> <br>
-ThisIsContentOfSubscriptionReminderEmail=Dorim să vă informăm că abonamentul dvs. este pe cale să expire sau a expirat deja (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Sperăm că il veți reînnoi. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=Dorim să vă informăm că adeziunea/abonamentul dvs. este pe cale să expire sau a expirat deja (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Sperăm că il veți reînnoi. <br> <br>
 ThisIsContentOfYourCard=Acesta este un rezumat al informațiilor pe care le avem despre dvs. Vă rugăm să ne contactați dacă ceva este incorect. <br> <br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subiectul emailului de notificare primit în cazul auto înscrierii a unui oaspete
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subiectul emailului de notificare primit în cazul autoînscrierii unui oaspete/vizitator
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Conținutul emailului de notificare primit în cazul înscrierii automate a unui oaspete
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Șablonul de email pe care să-l utilizați pentru a trimite un email unui membru pentru autoinscriere
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Șablonul de email pe care să-l utilizați pentru a trimite un e-mail către un membru pe baza validării membrilor
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Șablon de email pe care să-l utilizați pentru a trimite un email unui membru la o înregistrare nouă a abonamentului
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Șablon de email pe care să îl utilizați pentru a trimite memento-ul de email atunci când abonamentul urmează să expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Șablonul de email pe care să-l utilizați pentru a trimite un email către un membru în cazul anularii 
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Șablonul de email pe care să-l utilizați pentru a trimite un email unui membru pentru autoînscriere
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Șablonul de email pe care să-l utilizați pentru a trimite un email către un membru pe baza validării adeziunii
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Șablon de email pe care să îl utilizezi pentru a trimite un email unui membru la o înregistrare nouă de adeziune/abonament
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Șablon de email pe care să îl utilizezi pentru a trimite reminder-ul pe email atunci când adeziunea/abonamentul urmează să expire
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Șablonul de email pe care îl utilizezi pentru a trimite un email către un membru în cazul anulării 
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Șablon email de utilizat pentru a trimite email unui membru cu privire la excludere
 DescADHERENT_MAIL_FROM=Expeditor email pentru emailuri automate
 DescADHERENT_ETIQUETTE_TYPE=Format pagină etichete
-DescADHERENT_ETIQUETTE_TEXT=Text imprimat pe foaia de adresă a membrului
-DescADHERENT_CARD_TYPE=Formatul pagini card membru
-DescADHERENT_CARD_HEADER_TEXT=Text imprimat în susul cardului de membru
-DescADHERENT_CARD_TEXT=Text imprimat pe carduri de membru
-DescADHERENT_CARD_TEXT_RIGHT=Text tipărit pe carduri de membru (aliniat la dreapta)
-DescADHERENT_CARD_FOOTER_TEXT=Text imprimat în josul  de cardului de membru
+DescADHERENT_ETIQUETTE_TEXT=Text imprimat pe eticheta de adresă a membrului
+DescADHERENT_CARD_TYPE=Format card membru
+DescADHERENT_CARD_HEADER_TEXT=Text imprimat sus pe cardul de membru
+DescADHERENT_CARD_TEXT=Text imprimat pe cardurile de membru (aliniere la stânga)
+DescADHERENT_CARD_TEXT_RIGHT=Text tipărit pe cardurile de membru (aliniat la dreapta)
+DescADHERENT_CARD_FOOTER_TEXT=Text imprimat în josul cardului de membru
 ShowTypeCard=Arată tipul ' %s'
 HTPasswordExport=Generare fişier htpassword
-NoThirdPartyAssociatedToMember=Niciun terţ  asociat la acest membru
-MembersAndSubscriptions= Membrii şi cotizaţii
+NoThirdPartyAssociatedToMember=Niciun terţ asociat la acest membru
+MembersAndSubscriptions= Membri şi cotizaţii
 MoreActions=Acţiuni suplimentare la înregistrare
-MoreActionsOnSubscription=Acţiuni suplimentare , sugerate predefinit când inregistrăm o cotizaţie
+MoreActionsOnSubscription=Acţiuni suplimentare , sugerate predefinite când inregistrăm o cotizaţie/abonament
 MoreActionBankDirect=Creați o intrare directă în contul bancar
 MoreActionBankViaInvoice=Creați o factură și o plată în contul bancar
 MoreActionInvoiceOnly=Crează o factură fără plată
-LinkToGeneratedPages=Generaţi carti vizita
-LinkToGeneratedPagesDesc=Acest ecran vă permite să generaţi fişiere PDF cu cărţi de vizită pentru toţi  membri dvs. sau pentru un anumit membru.
-DocForAllMembersCards=Generaţi cărţi de vizita  pentru toţi membrii
-DocForOneMemberCards=Generaţi cărţi de vizită pentru un anumit membru
-DocForLabels=Generaţi etichete adrese
+LinkToGeneratedPages=Generare cărţi de vizită
+LinkToGeneratedPagesDesc=Acest ecran îţi permite să generezi fişiere PDF cu cărţi de vizită pentru toţi  membri sau pentru un anumit membru.
+DocForAllMembersCards=Generează cărţi de vizită pentru toţi membrii
+DocForOneMemberCards=Generează cărţi de vizită pentru un anumit membru
+DocForLabels=Generare etichete adrese
 SubscriptionPayment=Plată cotizaţie
-LastSubscriptionDate=Data ultimei plăți pentru abonament
-LastSubscriptionAmount=Suma ultimului abonament
+LastSubscriptionDate=Data ultimei plăți a cotizaţiei/abonamentului
+LastSubscriptionAmount=Suma ultimei cotizaţii/abonament
+LastMemberType=Tipul ultimului membru
 MembersStatisticsByCountries=Statistici Membri după ţară
-MembersStatisticsByState=Statistici Membri  după regiune / judeţ
-MembersStatisticsByTown=Statistici Membri după oraşe
-MembersStatisticsByRegion=Statistici Membri  după regiune
-NbOfMembers=Număr  membri
+MembersStatisticsByState=Statistici Membri după judeţ/regiune
+MembersStatisticsByTown=Statistici Membri după oraş
+MembersStatisticsByRegion=Statistici Membri după regiune
+NbOfMembers=Număr membri
 NbOfActiveMembers=Numărul curent de membri activi
 NoValidatedMemberYet=Niciun membru validat găsit
-MembersByCountryDesc=Acest ecran vă arată statisticile cu privire la membrii după ţări. Graficul depinde  serviciul on-line Google grafic şi este disponibil numai în cazul în care conexiunea la internet este activă.
-MembersByStateDesc=Acest ecran vă arată statisticile cu privire la membrii  după regiuni / judeţe.
-MembersByTownDesc=Acest ecran vă arată statisticile cu privire la membrii după oraşe.
-MembersStatisticsDesc=Alege statisticile pe care doriţi să le citiţi ...
+MembersByCountryDesc=Acest ecran îţi arată statistici cu privire la membri după ţări. Graficul depinde serviciul on-line Google grafic şi este disponibil numai în cazul în care conexiunea la internet este activă.
+MembersByStateDesc=Acest ecran îţi arată statistici cu privire la membri după regiuni/judeţe.
+MembersByTownDesc=Acest ecran îţi afişează statistici cu privire la membri după oraş.
+MembersStatisticsDesc=Alege statisticile pe care doreşti să le citeşti...
 MenuMembersStats=Statistici
-LastMemberDate=Ultima dată de membru
-LatestSubscriptionDate=Ultima dată de abonament
+LastMemberDate=Data ultimului membru
+LatestSubscriptionDate=Ultima dată a abonamentului/cotizaţiei
 MemberNature=Natură membru
 MembersNature=Natura membrilor
 Public=Profil public
 NewMemberbyWeb=Membru nou adăugat. În aşteptarea validării
 NewMemberForm=Formular Membru nou
-SubscriptionsStatistics=Statistici  privind cotizaţiile
+SubscriptionsStatistics=Statistici privind cotizaţiile/abonamentele
 NbOfSubscriptions=Număr cotizaţii
-AmountOfSubscriptions=Valoare cotizaţii
+AmountOfSubscriptions=Valoarea cotizaţiilor
 TurnoverOrBudget=Cifra de afaceri (pentru o companie), sau Bugetul (pentru o fundaţie)
-DefaultAmount=Valoarea implicită a cotizaţiei
-CanEditAmount=Vizitatorul poate alege / modifica valoarea cotizaţiei sale
-MEMBER_NEWFORM_PAYONLINE=Mergi la pagina integrată de plata online
-ByProperties=Prin natura
-MembersStatisticsByProperties=Statistica membrilor după natură
-MembersByNature=Acest ecran va afiseaza statisticile pe membrii dupa forma juridica
-MembersByRegion=Acest ecran va afiseaza statisticile pe membrii dupa regiune.
-VATToUseForSubscriptions=Rata TVA utilizată pentru înscrieri
-NoVatOnSubscription=Fără TVA pentru abonamente
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produs folosit pentru linia  abonamentului în factura:  %s
+DefaultAmount=Valoarea implicită a cotizaţiei/abonamentului
+CanEditAmount=Vizitatorul poate alege/modifica valoarea cotizaţiei sale
+MEMBER_NEWFORM_PAYONLINE=Mergi la pagina integrată de plată online
+ByProperties=După natură
+MembersStatisticsByProperties=Statistici membri după natură
+MembersByNature=Acest ecran afişează statistici membri după forma juridică
+MembersByRegion=Acest ecran afişează statistici membri după regiune.
+VATToUseForSubscriptions=Cota TVA utilizată pentru înscrieri
+NoVatOnSubscription=Fără TVA pentru cotizaţii
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produs folosit pentru linia de abonament/cotizaţie  în factura:  %s
 NameOrCompany=Nume sau companie
-SubscriptionRecorded=Abonament înregistrat
+SubscriptionRecorded=Cotizaţie/Abonament înregistrat
 NoEmailSentToMember=Nu a fost trimis niciun email membrilor
-EmailSentToMember=Email trimis la membru la %s
-SendReminderForExpiredSubscriptionTitle=Trimiteți un memento prin email pentru abonamentul expirat
-SendReminderForExpiredSubscription=Trimiteți un memento prin email membrilor când abonamentul este pe cale să expire (parametrul este numărul de zile înainte de încheierea abonamentului pentru a trimite o reamintire. Poate fi o listă de zile separate prin punct și virgulă, de exemplu '10; 5; 0; -5 „)
-MembershipPaid=Abonament plătit pentru perioada curentă (până la %s)
-YouMayFindYourInvoiceInThisEmail=Găsiți factura dvs. atașată acestui email
+EmailSentToMember=Email trimis la membru de la %s
+SendReminderForExpiredSubscriptionTitle=Trimite un remainder pe email pentru abonament/adeziune expirată
+SendReminderForExpiredSubscription=Trimite un remainder pe email membrilor când adeziunea/abonamentul este pe cale să expire (parametrul este numărul de zile înainte de încheierea abonamentului pentru a trimite o reamintire. Poate fi o listă de zile separate prin punct și virgulă, de exemplu '10; 5; 0; -5')
+MembershipPaid=Adeziune plătită pentru perioada curentă (până la %s)
+YouMayFindYourInvoiceInThisEmail=Găseşti factura ta atașată acestui email
 XMembersClosed=%s membru(i) închis
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index 219513f661d..f2f79082872 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=Acest instrument poate fi folosit doar de utilizatori cu experiență sau dezvoltatori de software. Oferă facilităţi pentru a vă construi sau edita propriul modul. Documentația pentru <a href="%s" target="_blank">dezvoltare software alternativă se găsește aici</a>. 
-EnterNameOfModuleDesc=Introduceți numele modulului/aplicației pentru a crea fără spații. Utilizați majusculă pentru a separa cuvintele (De exemplu: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Introduceți numele obiectului de creat fără spații. Utilizați majusculă pentru a separa cuvintele (De exemplu: MyObject, Student, Profesor ...). Se va genera și fișierul clasa CRUD, dar și fișierul API, paginile care vor lista/adăuga/edita/șterge obiectul și fișierele SQL.
+EnterNameOfModuleDesc=Introduceți numele modulului/aplicației care va fi creat, fără spații. Utilizați majusculă pentru a separa cuvintele (De exemplu: MyModule, EcommerceForShop, SyncWithMySystem ...)
+EnterNameOfObjectDesc=Introduceți numele obiectului de creat fără spații. Utilizează majusculă pentru a separa cuvintele (De exemplu: MyObject, Student, Profesor ...). Se va genera și fișierul clasă CRUD, dar și fișierul API, paginile de listare/adăugare/editare/ștergere ale obiectului și fișierele SQL.
 ModuleBuilderDesc2=Calea unde sunt generate/editate modulele (primul director pentru module externe definite în %s): <strong>%s</strong>
-ModuleBuilderDesc3=Module generate sau editabile găsite: <strong> %s </strong>
-ModuleBuilderDesc4=Un modul este detectat ca "editabil" atunci când fișierul <strong> %s </strong> există în rădăcina directorului modulului
+ModuleBuilderDesc3=Module generate/editabile găsite: <strong>%s</strong>
+ModuleBuilderDesc4=Un modul este detectat ca "editabil" atunci când fișierul <strong>%s</strong> există în directorul rădăcină al modulului
 NewModule=Modul nou
 NewObjectInModulebuilder=Obiect nou
-ModuleKey=Modul cheie
-ObjectKey=Obiect cheie 
+ModuleKey=Cheie modul
+ObjectKey=Cheie obiect
 ModuleInitialized=Modulul a fost inițializat
-FilesForObjectInitialized=Fișierele pentru obiectul nou "%s" inițializate
-FilesForObjectUpdated=Fișierele pentru obiectul "%s" actualizate (fișierele .sql și fișierul .class.php)
+FilesForObjectInitialized=Fișierele pentru noul obiect "%s" au fost inițializate
+FilesForObjectUpdated=Fișierele pentru obiectul "%s" au fost actualizate (fișierele .sql și fișierul .class.php)
 ModuleBuilderDescdescription=Introduceți aici toate informațiile generale care descriu modulul dvs.
-ModuleBuilderDescspecifications=Puteți introduce aici o descriere detaliată a specificațiilor modulului dvs. care nu este deja structurată în alte file. Deci, puteți ajunge ușor la toate regulile pe care trebuie să le dezvoltați. De asemenea, acest conținut de text va fi inclus în documentația generată (a se vedea ultima filă). Puteți utiliza formatul Markdown, dar este recomandat să utilizați formatul Asciidoc (comparație între .md și .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Definiți aici obiectele pe care doriți să le gestionați împreună cu modulul. O clasă CRUD DAO, fișierele SQL, pagina pentru listarea obiectelor, pentru a crea / edita / vizualiza o înregistrare și un API vor fi generate.
+ModuleBuilderDescspecifications=Poți introduce aici o descriere detaliată a specificațiilor modulului care nu este deja structurată în alte file. Deci, poți îndeplini ușor cerinţele de dezvoltare. De asemenea, acest conținut text va fi inclus în documentația generată (a se vedea ultima filă). Poți utiliza formatul Markdown, dar este recomandat să utilizezi formatul Asciidoc (comparație între .md și .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Definiți aici obiectele pe care doriți să le gestionați împreună cu modulul. O clasă CRUD DAO, fișierele SQL, pagina pentru listarea obiectelor, pentru a creare/editare/vizualizare înregistrări și un API vor fi generate.
 ModuleBuilderDescmenus=Această filă este dedicată definirii intrărilor de meniuri furnizate de modulul dvs.
-ModuleBuilderDescpermissions=Această filă este dedicată definirii noilor permisiuni pe care doriți să le furnizați împreună cu modulul.
-ModuleBuilderDesctriggers=Aceasta este vizualizarea declanșatorilor furnizați de modulul dvs. Pentru a include codul executat atunci când este lansat un eveniment de afaceri declanșat, trebuie doar să editați acest fișier.
-ModuleBuilderDeschooks=Această filă este dedicată cârligelor.
-ModuleBuilderDescwidgets=Această filă este dedicată administrării/construirii widgeturilor.
-ModuleBuilderDescbuildpackage=Puteți genera aici un fișier pachet "pregătit pentru distribuire" (un fișier .zip normalizat) al modulului dvs. și un fișier de documentație "gata de distribuire". Doar faceți clic pe butonul pentru a construi pachetul sau documentația.
+ModuleBuilderDescpermissions=Această filă este dedicată definirii de noi permisiuni pe care vrei să le furnizezi împreună cu modulul.
+ModuleBuilderDesctriggers=Aceasta este vizualizarea trigger-ilor furnizați de modulul tău. Pentru a include codul executat atunci când este lansat un eveniment de afaceri declanșat, trebuie doar să editezi acest fișier.
+ModuleBuilderDeschooks=Această filă este dedicată cârligelor hooks.
+ModuleBuilderDescwidgets=Această filă este dedicată administrării/construirii de widget-uri.
+ModuleBuilderDescbuildpackage=Puteți genera aici un fișier pachet "pregătit pentru distribuire" (un fișier .zip) al modulului tău și un fișier de documentație "gata de distribuire". Doar fă clic pe buton pentru a construi pachetul sau documentația.
 EnterNameOfModuleToDeleteDesc= Puteți șterge modulul pe care l-aţi creat. ATENŢIE: Toate fișierele de cod ale modulului (generate sau create manual) ȘI datele și documentația de structură vor fi șterse!
 EnterNameOfObjectToDeleteDesc=Puteți șterge un obiect. ATENŢIE: Toate fișierele de cod (generate sau create manual) legate de obiect vor fi șterse!
 DangerZone=Zona periculoasă
@@ -36,12 +36,12 @@ DescriptorFile=Fișier descriptor al modulului
 ClassFile=Fișier pentru clasa PHP DAO CRUD
 ApiClassFile=Fișier pentru clasa PHP API
 PageForList=Pagina PHP pentru lista de înregistrări
-PageForCreateEditView=Pagina PHP pentru a crea/edita/vizualiza o înregistrare
+PageForCreateEditView=Pagina PHP pentru creare/editare/vizualizare înregistrare
 PageForAgendaTab=Pagina PHP pentru fila eveniment
 PageForDocumentTab=Pagina PHP pentru fila document
 PageForNoteTab=Pagina PHP pentru fila note
-PageForContactTab=Pagina PHP pentru fila contact
-PathToModulePackage=Calea pentru zipul pachetului de module/aplicații
+PageForContactTab=Pagină PHP pentru fişa de contact
+PathToModulePackage=Calea pentru arhiva zip a pachetului modul/aplicație
 PathToModuleDocumentation=Calea către fişierul documentaţie al modulului/aplicaţiei (%s)
 SpaceOrSpecialCharAreNotAllowed=Spațiile sau caracterele speciale nu sunt permise.
 FileNotYetGenerated=Fișierul nu a fost încă generat
@@ -50,67 +50,67 @@ RegenerateMissingFiles=Generați fișierele lipsă
 SpecificationFile=Fişier de documentaţie
 LanguageFile=Fișier pentru limbă
 ObjectProperties=Proprietăţi obiect
-ConfirmDeleteProperty=Sigur doriți să ștergeți proprietatea <strong> %s </strong>? Acest lucru va schimba codul în clasa PHP, dar va elimina și coloana din definiția tabelului de obiect.
+ConfirmDeleteProperty=Sigur doriți să ștergeți proprietatea <strong>%s</strong>? Acest lucru va schimba codul în clasa PHP, dar va elimina și coloana din definiția tabelului de obiect.
 NotNull=Nu NUL
-NotNullDesc=1 = Setați baza de date la NOT NULL. -1 = Permite valorile null și valoarea forței la NULL dacă este goală ('' sau 0).
-SearchAll=Folosit pentru "căutarea tuturor"
+NotNullDesc=1 = Setează baza de date la NOT NULL. -1 = Permite valorile null și valoarea forțată la NULL dacă este goală ('' sau 0).
+SearchAll=Folosit pentru "căutare tot"
 DatabaseIndex=Indexul bazei de date
 FileAlreadyExists=Fișierul %s există deja
-TriggersFile=Fișier pentru codul declanșatorilor
-HooksFile=Fișier pentru codul cârligelor
-ArrayOfKeyValues=Mulțimea de valori cheie
+TriggersFile=Fișier pentru codul triggerelor
+HooksFile=Fișier cod hooks
+ArrayOfKeyValues=Mulțime de cheie-valoare
 ArrayOfKeyValuesDesc=Mulțimea de chei și valori dacă câmpul este o listă combo cu valori fixe
 WidgetFile=Fișier widget
 CSSFile=Fişier CSS
 JSFile=Fişier Javascript
 ReadmeFile=Fișierul Readme
 ChangeLog=Fișierul ChangeLog
-TestClassFile=Fișier pentru unitatea PHP Unitate de testare
-SqlFile=Dosar SQL
+TestClassFile=Fișier clasă pentru PHP Unit Test
+SqlFile=Fişier SQL
 PageForLib=Fişier pentru librăria common PHP 
 PageForObjLib=Fişier pentru librăria PHP dedicată obiectului
-SqlFileExtraFields=Dosar SQL pentru atributele complementare
-SqlFileKey=Dosar SQL pentru chei
+SqlFileExtraFields=Fişier SQL pentru atributele complementare
+SqlFileKey=Fişier SQL pentru chei
 SqlFileKeyExtraFields=Fişier SQL pentru cheile atributelor complementare
-AnObjectAlreadyExistWithThisNameAndDiffCase=Un obiect există deja cu acest nume și cu un alt caz
-UseAsciiDocFormat=Puteți utiliza formatul Markdown, dar este recomandat să utilizați formatul Asciidoc (omparison între .md și .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+AnObjectAlreadyExistWithThisNameAndDiffCase=Un obiect există deja cu acest nume și cu un alt format
+UseAsciiDocFormat=Poţi utiliza formatul Markdown, dar este recomandat să utilizezi formatul Asciidoc (vezi comparaţia între .md și .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Este o măsură
 DirScanned=Directorul scanat
-NoTrigger=Niciun declanșator
+NoTrigger=Niciun trigger
 NoWidget=Nu există widget
 GoToApiExplorer=Explorer API
 ListOfMenusEntries=Lista intrărilor din meniu
 ListOfDictionariesEntries=Listă înregistrări dicţionare
 ListOfPermissionsDefined=Lista permisiunilor definite
 SeeExamples=Vedeți aici exemple
-EnabledDesc=Condiție de activare a acestui câmp (Exemple: 1 sau $ conf-> global-> MYMODULE_MYOPTION)
+EnabledDesc=Condiție de activare a acestui câmp (Exemple: 1 sau $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Este vizibil câmpul? (Exemple: 0 = Invizibil întotdeauna, 1 = Vizibil în liste și în formularele de creare/actualizare/vizualizare, 2 = Vizibil doar în liste, 3 = Vizibil numai în formularele de creare/actualizare/vizualizare (nu în liste), 4 = Vizibil în liste și în formularele de actualizare/vizualizare (nu în cele de creare), 5 = Vizibil numai pe formularul de vizualizare finală a listei (nu pe cele de creare sau actualizare).<br><br> Utilizarea unei valori negative înseamnă că  câmp nu este afișat implicit în listă, dar poate fi selectat pentru vizualizare).<br><br>Poate  fi o expresie, de exemplu: <br>preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br>($ user-> rights-> holiday-> define_holiday? 1: 0)
 DisplayOnPdfDesc=Afișați acest câmp pe documente PDF compatibile, puteți gestiona poziția cu câmpul „Poziție”.<br/> În prezent, modelele PDF compatibile cunoscute sunt: ​​eratosten (comandă), espadon (livrare), sponge (facturi), cyan (propunere/ofertă), cornas (comandă achiziţie)<br/><br/><strong> Pentru documente: </strong><br/>0 = nu se afișează <br/>1 = se afișează <br/>2 = se afișează dacă este completat <br/><br/><strong>Pentru linii de document: </strong><br/>0 = nu se afişează <br/>1 = se afișează într-o coloană <br/>3 = se afișează în coloana descriere după descriere <br/>4 = se afișează în coloana descriere după descriere dacă este completat 
 DisplayOnPdf=Afişare în PDF
-IsAMeasureDesc=Poate fi cumulata valoarea câmpului pentru a obține un total în listă? (Exemple: 1 sau 0)
-SearchAllDesc=Este câmpul folosit pentru a face o căutare din instrumentul de căutare rapidă? (Exemple: 1 sau 0)
-SpecDefDesc=Introduceți aici toată documentația pe care doriți să o furnizați împreună cu modulul, care nu este deja definită de alte file. Puteți utiliza .md sau mai bine, sintaxa bogată .asciidoc.
-LanguageDefDesc=Introduceți în aceste fișiere toate cheile și traducerea pentru fiecare fișier lingvistic.
+IsAMeasureDesc=Poate fi cumulată valoarea câmpului pentru a obține un total în listă? (Exemple: 1 sau 0)
+SearchAllDesc=Este folosit câmpul pentru a face o căutare cu instrumentul de căutare rapidă? (Exemple: 1 sau 0)
+SpecDefDesc=Introduceți aici toată documentația pe care doriți să o furnizați împreună cu modulul, care nu este deja definită de alte file. Puteți utiliza .md sau mai bine, sintaxa îmbogăţită .asciidoc.
+LanguageDefDesc=Introdu în aceste fișiere, toate cheile de traducere și traducerea pentru fiecare fișier lingvistic.
 MenusDefDesc=Defineşte aici meniurile generate de modulul tău
 DictionariesDefDesc=Defineşte aici dicţionarele furnizate de modulul tău
 PermissionsDefDesc=Defineşte aici noile permisiuni furnizate de modulul tău
 MenusDefDescTooltip=Meniurile furnizate de modulul/aplicația dvs. sunt definite în tabloul <strong>$this->menus</strong> în fișierul de descriere al modulului. Puteți edita manual acest fișier sau puteți utiliza editorul încorporat.<br><br> Notă: odată definit (și reactivat modulul), meniurile sunt vizibile și în editorul de meniu disponibil pentru administratori la %s.
 DictionariesDefDescTooltip=Dicționarele furnizate de modulul/aplicația dvs. sunt definite în tabloul <strong>$ this->dictionaries</strong> în fișierul de descriere al modulului. Puteți edita manual acest fișier sau puteți utiliza editorul încorporat.<br><br> Notă: Modulul o dată definit (și reactivat), dicționarele lui sunt vizibile și în zona de configurare pentru administratori la %s.
 PermissionsDefDescTooltip= Permisiunile furnizate de modulul/aplicația dvs. sunt definite în matricea <strong>$ this->rights</strong> în fișierul de descriere al modulului. Puteți edita manual acest fișier sau puteți utiliza editorul încorporat. <br><br>Notă: Modulul o dată definit (și reactivat), permisiunile sunt vizibile în configurarea de bază a permisiunilor %s.
-HooksDefDesc=Definiți în proprietatea <b> module_parts ['hooks'] </b>, în descriptorul modulului, contextul de cârlige pe care doriți să îl gestionați (lista de contexte poate fi găsită printr-o căutare pe '<b> initHooks (</b>' din codul principal) <br> Edit fișierul cu cârlig pentru a adăuga codul funcțiilor dvs. înclinate (funcțiile legate pot fi găsite printr-o căutare pe '<b> executeHooks </b>' în codul principal).
-TriggerDefDesc=Definiți în fișierul declanșator codul pe care doriți să-l executați pentru fiecare eveniment de afaceri executat.
-SeeIDsInUse=Vedeți ID-urile utilizate în instalarea dvs.
-SeeReservedIDsRangeHere=Vedeți o gamă de ID-uri rezervate
-ToolkitForDevelopers=Toolkit pentru dezvoltatorii Dolibarr
-TryToUseTheModuleBuilder=Dacă aveți cunoștințe despre SQL și PHP, puteți folosi asistentul nativ modul builder. <br> Activați modulul <strong> %s </strong> și utilizați asistentul dând clic pe <span class="fa fa-bug"> </span> din meniul din dreapta sus. <br> Atenție: Aceasta este o caracteristică avansată a dezvoltatorului, nu efectuați experimentul <b> pe </b> pe site-ul dvs. de producție!
-SeeTopRightMenu=Vedeți <span class="fa fa-bug"> </span> din meniul din dreapta sus
-AddLanguageFile=Adăugați fișierul de limbă
-YouCanUseTranslationKey=Puteți folosi aici o cheie care este cheia de traducere găsită în fișierul de limbă (vezi fila "Limbi")
+HooksDefDesc=Definiți în proprietatea <b>module_parts['hooks'] </b>, în descriptorul modulului, contextul de cârlige pe care doreşti să îl gestionezi (lista de contexte poate fi găsită printr-o căutare după '<b>initHooks(</b>' în codul nucleu) <br> Editează fișierul cârlig hook pentru a adăuga cod cu funcțiile tale (funcțiile care pot fi legate pot fi găsite printr-o căutare după '<b>executeHooks</b>' în codul nucleu).
+TriggerDefDesc=Definiți în fișierul trigger codul pe care doriți să-l executați pentru fiecare eveniment urmărit.
+SeeIDsInUse=Vezi ID-urile utilizate în instalarea ta.
+SeeReservedIDsRangeHere=Vezi gama de ID-uri rezervate
+ToolkitForDevelopers=Toolkit pentru dezvoltatorii de sistem Dolibarr
+TryToUseTheModuleBuilder=Dacă ai cunoștințe de SQL și PHP, poți folosi asistentul nativ Modul Builder. <br> Activează modulul <strong>%s</strong> și utilizează asistentul dând clic pe <span class="fa fa-bug"> </span> din meniul din dreapta sus. <br> Atenție: Aceasta este o caracteristică avansată de dezvoltare, <b>nu</b> experimenta pe instanţele de producție!
+SeeTopRightMenu=Vezi <span class="fa fa-bug"></span> din meniul din dreapta sus
+AddLanguageFile=Adăugă fișierul de limbă
+YouCanUseTranslationKey=Poți folosi aici o cheie care este cheia de traducere găsită în fișierul de limbă (vezi fila "Limbi")
 DropTableIfEmpty=(Distruge tabelul dacă este gol)
 TableDoesNotExists=Tabelul %s nu există
 TableDropped=Tabelul %s a fost șters
 InitStructureFromExistingTable=Construiți șirul de structură al unui tabel existent
-UseAboutPage=Dezactivați pagina 
+UseAboutPage=Dezactivați pagina Despre
 UseDocFolder=Dezactivați dosarul de documentare
 UseSpecificReadme=Utilizați un anumit ReadMe
 ContentOfREADMECustomized=Notă: Conținutul fișierului README.md a fost înlocuit cu valoarea specifică definită la configurarea ModuleBuilder. 
@@ -133,11 +133,13 @@ IncludeDocGeneration=Vreau să generez documente din obiect
 IncludeDocGenerationHelp=Dacă bifaţi, va fi generat cod pentru a adăuga o casetă "Generare document" în înregistrarea respectivă. 
 ShowOnCombobox=Afişează valoare în combox
 KeyForTooltip=Cheie pentru tooltip
-CSSClass=Clasă CSS
+CSSClass=CSS pentru editare/creare formular
+CSSViewClass=CSS pentru vizualizare formular
+CSSListClass=CSS pentru listă
 NotEditable=Needitabil
 ForeignKey=Cheie străină
 TypeOfFieldsHelp=Tip de câmpuri: <br>varchar (99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php [: 1 [: filter]] ( '1' înseamnă că adăugăm un buton + după combo pentru a crea înregistrarea, 'filtru' poate fi 'status = 1 ȘI fk_user = __USER_ID ȘI entity IN (__SHARED_ENTITIES__)', de exemplu) 
 AsciiToHtmlConverter=Convertor ASCII la HTML
 AsciiToPdfConverter=Convertor ASCII la PDF
 TableNotEmptyDropCanceled=Tabelul nu este gol. Operaţiunea de drop a fost anulată. 
-ModuleBuilderNotAllowed=Generatorul de module este disponibil, dar nu este permis utilizatorului dvs.
+ModuleBuilderNotAllowed=Generatorul de module este disponibil, dar nu-ţi este permis să-l utilizezi.
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 9bbc1d3ffed..70f60db5b53 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -1,34 +1,36 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Comenzi Clienţi
-SuppliersOrdersArea=Zonă de comenzi de achiziție
+OrdersArea=Comenzi clienţi
+SuppliersOrdersArea=Comenzi de achiziție
 OrderCard=Fişă Comandă
 OrderId=ID Comandă
 Order=Comandă
-PdfOrderTitle=Comanda
+PdfOrderTitle=Comandă
 Orders=Comenzi
-OrderLine=Linie Comandă
-OrderDate=Dată Comandă
+OrderLine=Linie comandă
+OrderDate=Dată comandă
 OrderDateShort=Data comandă
 OrderToProcess=Comandă de procesat
 NewOrder=Comandă nouă
-NewOrderSupplier=Comandă achiziţie nouă
+NewOrderSupplier=Comandă de achiziţie nouă
 ToOrder=Plasează comanda
 MakeOrder=Plasează comanda
 SupplierOrder=Comandă de achiziție
-SuppliersOrders=Comenzile de achiziție
-SuppliersOrdersRunning=Comenzile de achiziție actuale
-CustomerOrder=Comandă de vânzări
-CustomersOrders=Comenzile de vânzări
-CustomersOrdersRunning=Comenzile de vânzări curente
+SuppliersOrders=Comenzi de achiziție
+SaleOrderLines=Linii comandă de vânzare
+PurchaseOrderLines=Linii comandă de achiziţie
+SuppliersOrdersRunning=Comenzi de achiziție curente
+CustomerOrder=Comandă de vânzare
+CustomersOrders=Comenzi de vânzări
+CustomersOrdersRunning=Comenzi de vânzări curente
 CustomersOrdersAndOrdersLines=Comenzi de vânzări și detalii de comandă
-OrdersDeliveredToBill=Comenzile de vânzări livrate la facturare
+OrdersDeliveredToBill=Comenzi de vânzări livrate de facturat
 OrdersToBill=Comenzi de vânzări livrate
 OrdersInProcess=Comenzi de vânzări în curs
-OrdersToProcess=Comenzile de vânzări pentru procesare
-SuppliersOrdersToProcess=Comenzile de cumpărare pentru procesare
+OrdersToProcess=Comenzi de vânzări de procesat
+SuppliersOrdersToProcess=Comenzi de achiziţie de procesat
 SuppliersOrdersAwaitingReception=Comenzi de achiziţie în aşteptarea recepţiei
 AwaitingReception=În aşteptarea recepţiei
-StatusOrderCanceledShort=Anulata
+StatusOrderCanceledShort=Anulată
 StatusOrderDraftShort=Schiţă
 StatusOrderValidatedShort=Validat
 StatusOrderSentShort=În curs de procesare
@@ -46,91 +48,91 @@ StatusOrderReceivedAllShort=Produse primite
 StatusOrderCanceled=Anulată
 StatusOrderDraft=Schiţă (de validat)
 StatusOrderValidated=Validată
-StatusOrderOnProcess=Comandate - receptie standby
-StatusOrderOnProcessWithValidation=Comandat - În așteptarea recepţiei sau validării
+StatusOrderOnProcess=Comandate - în aşteptarea recepţiei
+StatusOrderOnProcessWithValidation=Comandate - În așteptarea recepţiei sau validării
 StatusOrderProcessed=Procesată
 StatusOrderToBill=Livrată
 StatusOrderApproved=Aprobată
 StatusOrderRefused=Refuzată
 StatusOrderReceivedPartially=Parţial recepţionată
 StatusOrderReceivedAll=Toate produsele primite
-ShippingExist=O expediţie există
+ShippingExist=O livrare există
 QtyOrdered=Cant. comandată
-ProductQtyInDraft=Cantitate produs in comenzi draft
-ProductQtyInDraftOrWaitingApproved=Cantitate produs in comenzi draft sau aprobate necomandate inca
+ProductQtyInDraft=Cantitate produs în comenzile schiţă
+ProductQtyInDraftOrWaitingApproved=Cantitate produs în comenzi schiţă sau aprobate dar necomandate încă
 MenuOrdersToBill=Comenzi livrate
 MenuOrdersToBill2=Comenzi facturabile
-ShipProduct=Expediază produs
-CreateOrder=Crează Comanda
-RefuseOrder=Refuză comanda
-ApproveOrder=Aprobă  comanda
-Approve2Order=Aprobă  comanda ( nivel doi )
-ValidateOrder=Validează comanda
-UnvalidateOrder=Devalidează comandă
-DeleteOrder=Şterge comada
-CancelOrder=Anulează comanda
-OrderReopened= Comanda %sredeschisă
-AddOrder=Crează comanda
+ShipProduct=Livrare produs
+CreateOrder=Creare comandă
+RefuseOrder=Refuz comandă
+ApproveOrder=Aprobare comandă
+Approve2Order=Aprobă comanda (nivel doi)
+ValidateOrder=Validare comandă
+UnvalidateOrder=Devalidare comandă
+DeleteOrder=Ştergere comadă
+CancelOrder=Anulare comandă
+OrderReopened= Comanda %s a fost redeschisă
+AddOrder=Creare comandă
 AddPurchaseOrder=Creare comandă de achiziţie
 AddToDraftOrders=Adaugă la comanda schiţă
-ShowOrder=Afişează comanda
+ShowOrder=Afişare comandă
 OrdersOpened=Comenzi de procesat
-NoDraftOrders=Nicio comandă  schiţă
+NoDraftOrders=Nicio comandă schiţă
 NoOrder=Nicio comandă
 NoSupplierOrder=Nicio comandă de achiziție
 LastOrders=Ultimele %s comenzi de vânzări 
-LastCustomerOrders=Ultimele%s comenzi de vânzări 
-LastSupplierOrders=Ultimele%s comenzi de achiziție 
+LastCustomerOrders=Ultimele %s comenzi de vânzări 
+LastSupplierOrders=Ultimele %s comenzi de achiziție 
 LastModifiedOrders=Ultimele %s comenzi modificate 
 AllOrders=Toate comenzile
-NbOfOrders=Numar  comenzi
-OrdersStatistics=Statistici Comenzi
+NbOfOrders=Număr comenzi
+OrdersStatistics=Statistici comenzi
 OrdersStatisticsSuppliers=Statistici privind comenzile de achiziție
-NumberOfOrdersByMonth=Numar comenzi pe luni
-AmountOfOrdersByMonthHT=Suma comenzilor pe lună (fără taxă)
-ListOfOrders=Lista  comenzi
-CloseOrder=Inchide  comanda
-ConfirmCloseOrder=Sigur doriți să setați această comandă pentru a fi livrată? Odată ce o comandă este livrată, ea poate fi setată la factură.
+NumberOfOrdersByMonth=Număr comenzi pe luni
+AmountOfOrdersByMonthHT=Suma comenzilor pe lună (fără taxe)
+ListOfOrders=Listă comenzi
+CloseOrder=Închidere comandă
+ConfirmCloseOrder=Sigur doriți să setați această comandă pentru a fi livrată? Odată ce o comandă este livrată, ea poate fi setată ca facturabilă.
 ConfirmDeleteOrder=Sigur doriți să ștergeți această comandă?
-ConfirmValidateOrder=Sigur doriți să validați această comandă sub numele <b> %s </b>?
-ConfirmUnvalidateOrder=Sigur doriți să restaurați ordinea <b> %s </b> pentru a schița starea?
+ConfirmValidateOrder=Sigur doriți să validați această comandă sub numele <b>%s</b>?
+ConfirmUnvalidateOrder=Sigur doriți să restaurați comanda <b> %s </b> la starea de schiță?
 ConfirmCancelOrder=Sigur doriți să anulați această comandă?
-ConfirmMakeOrder=Sigur doriți să confirmați că ați făcut această comandă pe <b> %s </b>?
-GenerateBill=Generează Factură
+ConfirmMakeOrder=Sigur doriți să confirmați că ați făcut această comandă pe <b>%s</b>?
+GenerateBill=Generare Factură
 ClassifyShipped=Clasează livrată
 DraftOrders=Comenzi schiţă
-DraftSuppliersOrders=Schiţă de ordine de cumpărare
-OnProcessOrders=Comenzi în curs de tratare
+DraftSuppliersOrders=Comenzi de achiziţie schiţă
+OnProcessOrders=Comenzi în curs de procesare
 RefOrder=Ref. comandă
-RefCustomerOrder=Ref. comenzii pentru client
-RefOrderSupplier=Ref. comanzii pentru furnizor
-RefOrderSupplierShort=Ref. furnizorului comenzii 
-SendOrderByMail=Trimite comanda prin e-mail
-ActionsOnOrder=Evenimente pe comanda
-NoArticleOfTypeProduct=Nici un articol de tip "produs", astfel încât nici un articol expediabil pentru această  comandă
+RefCustomerOrder=Ref. comandă pentru client
+RefOrderSupplier=Ref. comandă pentru furnizor
+RefOrderSupplierShort=Ref. comandă furnizor
+SendOrderByMail=Trimitere comandă pe email
+ActionsOnOrder=Evenimente pe comandă
+NoArticleOfTypeProduct=Nici un articol de tip 'produs', deci niciun articol livrabil pentru această comandă
 OrderMode=Metoda de comandă
 AuthorRequest=Autor cerere
-UserWithApproveOrderGrant=Utilizatorii cu permisiuni acordate  de "aproba comenzi" .
-PaymentOrderRef=Plata comandă %s
-ConfirmCloneOrder=Sigur doriți să clonați această comandă <b> %s </b>?
-DispatchSupplierOrder=Primirea comenzii de achiziție %s
+UserWithApproveOrderGrant=Utilizatorii cu permisiuni acordate de "aprobare comenzi".
+PaymentOrderRef=Plată comandă %s
+ConfirmCloneOrder=Sigur doriți să clonați această comandă <b>%s</b>?
+DispatchSupplierOrder=Recepţia comenzii de achiziție %s
 FirstApprovalAlreadyDone=Prima aprobare a fost deja făcută
 SecondApprovalAlreadyDone=A doua aprobare a fost deja făcută
-SupplierOrderReceivedInDolibarr=Comanda de achiziţie%s primită %s
-SupplierOrderSubmitedInDolibarr=Comanda de achiziţie %s trimisă
-SupplierOrderClassifiedBilled=Comanda de achiziţie%s facturată
+SupplierOrderReceivedInDolibarr=Comanda de achiziţie %s a fost recepţionată %s
+SupplierOrderSubmitedInDolibarr=Comanda de achiziţie %s a fost trimisă
+SupplierOrderClassifiedBilled=Comanda de achiziţie %s a fost setată ca facturată
 OtherOrders=Alte comenzi
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Reprezentant urmărire comandă de vânzări 
-TypeContact_commande_internal_SHIPPING=Responsabil urmărire expediere comandă client
-TypeContact_commande_external_BILLING=Contact  client facturare comandă
-TypeContact_commande_external_SHIPPING=Contact client  livrare comandă
+TypeContact_commande_internal_SHIPPING=Responsabil urmărire livrare comandă client
+TypeContact_commande_external_BILLING=Contact client facturare comandă
+TypeContact_commande_external_SHIPPING=Contact client livrare comandă
 TypeContact_commande_external_CUSTOMER=Contact client urmărire comandă
 TypeContact_order_supplier_internal_SALESREPFOLL=Reprezentant urmărire comandă de achiziție 
-TypeContact_order_supplier_internal_SHIPPING=Responsabil  recepţie  comandă  furnizor
-TypeContact_order_supplier_external_BILLING=Contactul facturii furnizorului
-TypeContact_order_supplier_external_SHIPPING=Contactul furnizorului de transport
-TypeContact_order_supplier_external_CUSTOMER=Comandă de urmărire a contactului furnizorului
+TypeContact_order_supplier_internal_SHIPPING=Responsabil recepţie comandă furnizor
+TypeContact_order_supplier_external_BILLING=Contact facturare furnizor
+TypeContact_order_supplier_external_SHIPPING=Contact livrare furnizor
+TypeContact_order_supplier_external_CUSTOMER=Contact furnizor urmărire comandă
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constanta COMMANDE_SUPPLIER_ADDON nedefinită
 Error_COMMANDE_ADDON_NotDefined=Constanta COMMANDE_ADDON nedefinită
 Error_OrderNotChecked=Nicio comandă de facturat selectată
@@ -143,26 +145,26 @@ OrderByPhone=Telefon
 # Documents models
 PDFEinsteinDescription=Un şablon de comandă (implementare veche a şablonului Eratosthene)
 PDFEratostheneDescription=Un şablon complet de comadă
-PDFEdisonDescription=Un simplu pentru model
+PDFEdisonDescription=Un model simplu de comadă
 PDFProformaDescription=Un şablon complet de factură Proforma
 CreateInvoiceForThisCustomer=Comenzi facturate
 CreateInvoiceForThisSupplier=Comenzi facturate
 NoOrdersToInvoice=Nicio comandă facturabilă
-CloseProcessedOrdersAutomatically=Clasează automat "Procesat" toate comenzile selectate.
+CloseProcessedOrdersAutomatically=Clasează ca "Procesate" toate comenzile selectate.
 OrderCreation=Creare comandă
 Ordered=Comandat
-OrderCreated=Comenzile dvs au fost generate
-OrderFail=O eroare întâlnită în timpul creării comezilor dvs
-CreateOrders=Crează Comenzi
+OrderCreated=Comenzile tale au fost create
+OrderFail=A apărut o eroare în timpul creării comezilor tale
+CreateOrders=Creare comenzi
 ToBillSeveralOrderSelectCustomer=Pentru crearea unei facturi pentru câteva comenzi, click mai întâi pe client apoi alege "%s".
-OptionToSetOrderBilledNotEnabled=Opțiune pentru modulul Workflow, pentru setarea automată a comenzii ca „Facturată” când factura este validată, dacă  nu este activată, va trebui să setați manual starea comenzilor la „Facturată” după ce factura a fost generată şi validată.
+OptionToSetOrderBilledNotEnabled=Opțiune pentru modulul Flux de lucru, pentru setarea automată a comenzii ca „Facturată” când factura este validată, dacă  nu este activată, va trebui să setați manual starea comenzilor la „Facturată” după ce factura a fost generată şi validată.
 IfValidateInvoiceIsNoOrderStayUnbilled=Dacă validarea facturilor este "Nu", comanda va rămâne în starea "Nefacturată" până când factura va fi validată.
 CloseReceivedSupplierOrdersAutomatically=Închide automat comanda cu statusul "%s" dacă toatele produsele au fost recepţionate. 
-SetShippingMode=Setați modul de expediere
-WithReceptionFinished=Recepţionat integral
+SetShippingMode=Setați modul de livrare
+WithReceptionFinished=Recepţionată integral
 #### supplier orders status
-StatusSupplierOrderCanceledShort=Anulata
-StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderCanceledShort=Anulată
+StatusSupplierOrderDraftShort=Schiţă
 StatusSupplierOrderValidatedShort=Validată
 StatusSupplierOrderSentShort=În curs
 StatusSupplierOrderSent=Livrare în curs
@@ -176,10 +178,10 @@ StatusSupplierOrderRefusedShort=Refuzat
 StatusSupplierOrderToProcessShort=De procesat
 StatusSupplierOrderReceivedPartiallyShort=Parţial recepţionată
 StatusSupplierOrderReceivedAllShort=Produse primite
-StatusSupplierOrderCanceled=Anulata
-StatusSupplierOrderDraft=Schiţă (cererea tebuie validata)
+StatusSupplierOrderCanceled=Anulată
+StatusSupplierOrderDraft=Schiţă (trebuie validată)
 StatusSupplierOrderValidated=Validată
-StatusSupplierOrderOnProcess=Comandate - receptie standby
+StatusSupplierOrderOnProcess=Comandate - în asteptarea recepţiei
 StatusSupplierOrderOnProcessWithValidation=Comandat - recepție în așteptare sau validare
 StatusSupplierOrderProcessed=Procesate
 StatusSupplierOrderToBill=Livrate
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 1f6709568f6..318effe7aa2 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -5,25 +5,25 @@ Tools=Instrumente
 TMenuTools=Instrumente
 ToolsDesc=Toate instrumentele care nu sunt incluse în alte intrări în meniu sunt grupate aici. <br> Toate instrumentele pot fi accesate prin meniul din stânga.
 Birthday=Zi de naştere
-BirthdayAlertOn=ziua de nastere de alertă activă
-BirthdayAlertOff=ziua de nastere de alertă inactiv
+BirthdayAlertOn=alertă zi de naştere activă
+BirthdayAlertOff=alertă zi de naştere inactivă
 TransKey=Traducerea cheii TransKey
-MonthOfInvoice=Luna (numărul 1-12) de la data facturării
-TextMonthOfInvoice=Luna (textul) datei facturii
+MonthOfInvoice=Luna datei de facturare(numeric 1-12)
+TextMonthOfInvoice=Luna datei facturii (text)
 PreviousMonthOfInvoice=Luna anterioară (numărul 1-12) de la data facturării
-TextPreviousMonthOfInvoice=Luna anterioară (textul) datei facturii
-NextMonthOfInvoice=Luna următoare (numărul 1-12) de la data facturării
-TextNextMonthOfInvoice=În luna următoare (textul) datei facturii
+TextPreviousMonthOfInvoice=Luna anterioară (text) din data facturii
+NextMonthOfInvoice=Luna următoare (numărl 1-12) din data facturii
+TextNextMonthOfInvoice=Luna următoare (text) din data facturii
 PreviousMonth=Luna anterioară
 CurrentMonth=Luna curentă
-ZipFileGeneratedInto=Fișierul Zip generat în <b> %s </b>.
-DocFileGeneratedInto=Fișierul doc generat în <b> %s </b>.
-JumpToLogin=Deconectată. Accesați pagina de conectare ...
+ZipFileGeneratedInto=Fișier zip generat în <b>%s</b>.
+DocFileGeneratedInto=Fișierul doc generat în <b>%s</b>.
+JumpToLogin=Deconectat. Accesați pagina de conectare ...
 MessageForm=Mesaj pe formularul de plată online
-MessageOK=Mesaj pe pagina de returnare pentru o plată validată
-MessageKO=Mesaj de pe pagina de returnare pentru o plată anulată
+MessageOK=Mesaj la întoarcerea în pagină după o plată validată
+MessageKO=Mesaj la întoarcerea în pagină după o plată anulată
 ContentOfDirectoryIsNotEmpty=Conținutul acestui director nu este gol.
-DeleteAlsoContentRecursively=Verificați pentru a șterge tot conținutul recursiv
+DeleteAlsoContentRecursively=Bifaţi pentru a șterge tot conținutul recursiv
 PoweredBy=Dezvoltat de
 YearOfInvoice=Anul datei facturii
 PreviousYearOfInvoice=Anul anterior datei facturii
@@ -35,109 +35,110 @@ OnlyOneFieldForXAxisIsPossible=Doar 1 câmp este posibil pentru axa X. Doar prim
 AtLeastOneMeasureIsRequired=Cel puţin 1 câmp pentru metrică este necesar
 AtLeastOneXAxisIsRequired=Cel puţin 1 câmp pentru axa X este necesar
 LatestBlogPosts=Ultimile postări din blog
-Notify_ORDER_VALIDATE=Comanda vânzărilor validată
-Notify_ORDER_SENTBYMAIL=Comanda vânzărilor a fost trimisă prin poștă
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Comanda de cumparare trimisa prin e-mail
-Notify_ORDER_SUPPLIER_VALIDATE=Comanda de aprovizionare înregistrată
-Notify_ORDER_SUPPLIER_APPROVE=Comanda de aprovizionare aprobată
-Notify_ORDER_SUPPLIER_REFUSE=Comanda de aprovizionare a fost refuzată
-Notify_PROPAL_VALIDATE=Ofertă client validată
-Notify_PROPAL_CLOSE_SIGNED=Propunerea clientului a fost semnată
-Notify_PROPAL_CLOSE_REFUSED=Propunerea clientului a fost refuzată
-Notify_PROPAL_SENTBYMAIL=Ofertă comercială  trimisă prin mail
-Notify_WITHDRAW_TRANSMIT=Transmitere de retragere
-Notify_WITHDRAW_CREDIT=Credit de retragere
-Notify_WITHDRAW_EMIT=Isue retragere
-Notify_COMPANY_CREATE=Terţ a creat
-Notify_COMPANY_SENTBYMAIL=Emailuri trimise din cardul terţului
-Notify_BILL_VALIDATE=Factura client validată
+Notify_ORDER_VALIDATE=Comanda de vânzare a fost validată
+Notify_ORDER_SENTBYMAIL=Comanda de vânzare a fost trimisă prin poștă
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Comanda de achiziţie a fost trimisă pe email
+Notify_ORDER_SUPPLIER_VALIDATE=Comanda de achiziţie a fost înregistrată
+Notify_ORDER_SUPPLIER_APPROVE=Comanda de achiziţie a fost aprobată
+Notify_ORDER_SUPPLIER_REFUSE=Comanda de achiziţie a fost refuzată
+Notify_PROPAL_VALIDATE=Oferta client a fost validată
+Notify_PROPAL_CLOSE_SIGNED=Oferta comercială a fost acceptată şi semnată de client
+Notify_PROPAL_CLOSE_REFUSED=Oferta comercială a fost refuzată de client
+Notify_PROPAL_SENTBYMAIL=Ofertă comercială a fost trimisă prin poştă
+Notify_WITHDRAW_TRANSMIT=Transmitere retragere de sumă
+Notify_WITHDRAW_CREDIT=Retragere de credit
+Notify_WITHDRAW_EMIT=Efectuați retragerea
+Notify_COMPANY_CREATE=Terţul a fost creat
+Notify_COMPANY_SENTBYMAIL=Email-uri trimise din fişa terţului
+Notify_BILL_VALIDATE=Factura client a fost validată
 Notify_BILL_UNVALIDATE=Factura client nevalidată
-Notify_BILL_PAYED=Factura de client plătită
-Notify_BILL_CANCEL=Factura client anulat
-Notify_BILL_SENTBYMAIL=Factura client trimis prin e-mail
-Notify_BILL_SUPPLIER_VALIDATE=Factura furnizorului validată
-Notify_BILL_SUPPLIER_PAYED=Factura furnizorului plătită
-Notify_BILL_SUPPLIER_SENTBYMAIL=Factura furnizorului a fost trimisă prin poștă
-Notify_BILL_SUPPLIER_CANCELED=Factura furnizorului a fost anulată
-Notify_CONTRACT_VALIDATE=Contract validate
-Notify_FICHINTER_VALIDATE=De intervenţie validate
-Notify_FICHINTER_ADD_CONTACT=Adaugat contact la Interventie
-Notify_FICHINTER_SENTBYMAIL=Intervenţie trimisă prin mail
-Notify_SHIPPING_VALIDATE=Transport validate
-Notify_SHIPPING_SENTBYMAIL=Transport trimise prin poştă
-Notify_MEMBER_VALIDATE=Membru validate
+Notify_BILL_PAYED=Factura client a fost plătită
+Notify_BILL_CANCEL=Factura client a fost anulată
+Notify_BILL_SENTBYMAIL=Factura client a fost trimisă pe email
+Notify_BILL_SUPPLIER_VALIDATE=Factura furnizor a fost validată
+Notify_BILL_SUPPLIER_PAYED=Factura furnizor a fost achitată
+Notify_BILL_SUPPLIER_SENTBYMAIL=Factura furnizor a fost trimisă prin poștă
+Notify_BILL_SUPPLIER_CANCELED=Factura furnizor a fost anulată
+Notify_CONTRACT_VALIDATE=Contractul a fost validat
+Notify_FICHINTER_VALIDATE=Intervenţia a fost validată
+Notify_FICHINTER_ADD_CONTACT=Adăugare contact la intervenţie
+Notify_FICHINTER_SENTBYMAIL=Intervenţie trimisă prin poştă
+Notify_SHIPPING_VALIDATE=Livrarea a fost validată
+Notify_SHIPPING_SENTBYMAIL=Livrarea a trimisă prin poştă
+Notify_MEMBER_VALIDATE=Membrul a fost validat
 Notify_MEMBER_MODIFY=Membru modificat
-Notify_MEMBER_SUBSCRIPTION=Membru subscris
-Notify_MEMBER_RESILIATE=Membru terminat
-Notify_MEMBER_DELETE=Membre elimină
+Notify_MEMBER_SUBSCRIPTION=Membru abonat
+Notify_MEMBER_RESILIATE=Membru anulat
+Notify_MEMBER_DELETE=Membru şters
 Notify_PROJECT_CREATE=Creare proiect
 Notify_TASK_CREATE=Task creat
 Notify_TASK_MODIFY=Task modificat
-Notify_TASK_DELETE=Task sters
-Notify_EXPENSE_REPORT_VALIDATE=Raportul de cheltuieli validat (aprobarea necesară)
-Notify_EXPENSE_REPORT_APPROVE=Raportul privind cheltuielile a fost aprobat
-Notify_HOLIDAY_VALIDATE=Lăsați cererea validată (este necesară aprobarea)
-Notify_HOLIDAY_APPROVE=Lăsați cererea aprobată
+Notify_TASK_DELETE=Task şters
+Notify_EXPENSE_REPORT_VALIDATE=Raportul de cheltuieli a fost validat (aprobarea este necesară)
+Notify_EXPENSE_REPORT_APPROVE=Raportul de cheltuieli a fost aprobat
+Notify_HOLIDAY_VALIDATE=Cererea de concediu a fost validată (este necesară aprobarea)
+Notify_HOLIDAY_APPROVE=Cererea de concediu a fost aprobată
 Notify_ACTION_CREATE=Acţiune adăugată în Agendă
 SeeModuleSetup=Vezi setare modul %s
-NbOfAttachedFiles=Numărul de ataşat fişiere / documente
-TotalSizeOfAttachedFiles=Total marimea ataşat fişiere / documente
+NbOfAttachedFiles=Număr de fişiere/documente ataşate
+TotalSizeOfAttachedFiles=Mărimea totală a fişierelor/documentelor ataşate
 MaxSize=Mărimea maximă a
-AttachANewFile=Ataşaţi un fişier nou / document
-LinkedObject=Legate de obiectul
-NbOfActiveNotifications=Numărul de notificări (numărul e-mailurilor destinatarilor)
-PredefinedMailTest=__(Hello)__\nAcesta este un email de test trimis către  __EMAIL__.\nAceste rânduri sunt separate prin carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>Acesta este un email de <b>test</b> trimis către __EMAIL__ (cuvântul test ar trebui să fie scris îngroşat).<br>Aceste rânduri sunt separate prin carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentContract=__(Salut)__\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Salut)__\n\nGăsiţi factura __REF__ atașată\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Salut)__\n\nAș dori să vă reamintim că factura __REF__ pare să nu fi fost plătită. O copie a facturii este atașată ca un memento.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Salut)__\n\nGăsiţi propunerea comercială __REF__ atașată\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Salut)__\n\nVă rugăm să consultați solicitarea de preț __REF__ atașată\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Salut)__\n\nGăsiţi comanda __REF__ atașată\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Salut)__\n\nConsultați comanda __REF__ atașată\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Salut)__\n\nConsultați factura __REF__ atașată\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Salut)__\n\nVeți găsi transportul __REF__ atașat\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Salut)__\n\nConsultați intervenția __REF__ atașată\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=Puteți face clic pe linkul de mai jos pentru a efectua plata dacă nu este deja făcută.\n\n%s\n\n
-PredefinedMailContentGeneric=__(Salut)__\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendActionComm=Memento eveniment "__EVENT_LABEL__" în data de  __EVENT_DATE__ la ora __EVENT_TIME__<br><br> Acesta este un mesaj automat, vă rugăm să nu răspundeți.
-DemoDesc=Dolibarr este un sistem ERP/CRM compact care suportă mai multe module de afaceri. O prezentare Demo pentru toate modulele nu are sens deoarece acest scenariu nu se produce niciodată (câteva sute disponibile). Deci, sunt disponibile mai multe profiluri demo.
-ChooseYourDemoProfil=Alegeți profilul demo care se potrivește cel mai bine nevoilor dvs. ...
-ChooseYourDemoProfilMore=... sau construiți propriul profil <br> (selectarea manuală a modulelor)
-DemoFundation=Gestionare membrii unui Fundaţia
-DemoFundation2=Gestionaţi membri şi un cont bancar de Fundaţia
-DemoCompanyServiceOnly=Companie sau independent cu vânzare de servicii
-DemoCompanyShopWithCashDesk=Gestionaţi-un magazin cu o casă de marcat
+AttachANewFile=Ataşare fişier/document nou
+LinkedObject=Obiect asociat
+NbOfActiveNotifications=Număr de notificări (număr de adrese de email destinatar)
+PredefinedMailTest=__(Hello)__\nAcesta este un email de test trimis către  __EMAIL__.\nRândurile sunt separate de prin carriage return.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__<br>Acesta este un email de <b>test</b> trimis către __EMAIL__ (cuvântul test ar trebui să fie scris îngroşat).<br>Aceste rânduri sunt separate de un caracter de linie nouă.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\n\nGăsiţi factura __REF__ atașată\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nDorim să vă reamintim că factura __REF__ pare să nu fi fost achitată. V-am ataşat o copie a facturii.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nRegăsiţi ataşată oferta noastră comercială __REF__ \n\n\n__(Sincerely)__\n\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nVă rugăm să consultați solicitarea noastră de preț __REF__ atașată în vederea unei viitoare achiziţii \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nGăsiţi comanda __REF__ atașată\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nConsultați comanda __REF__ atașată\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nVă rugăm să consultați factura __REF__ atașată\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nGăsiţi detalii privind livrarea  __REF__ atașat\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nConsultați detaliile pentru lucrarea de intervenție __REF__ atașată\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=Puteți accesa link-ul de mai jos pentru a efectua plata dacă nu aţi făcut-o deja.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Reminder eveniment "__EVENT_LABEL__"  în data de  __EVENT_DATE__ la ora  __EVENT_TIME__<br><br> Acesta este un mesaj automat, vă rugăm să nu răspundeți.
+DemoDesc=Dolibarr este un sistem ERP/CRM compact care suportă mai multe module de afaceri. O prezentare Demo pentru toate modulele nu are sens deoarece acest scenariu nu se produce niciodată (câteva sute de module sunt disponibile). În concluzie, sunt disponibile mai multe profiluri demo.
+ChooseYourDemoProfil=Alege profilul demonstrativ care se potrivește cel mai bine nevoilor tale...
+ChooseYourDemoProfilMore=...sau construiți propriul profil <br> (selectarea manuală a modulelor)
+DemoFundation=Gestionarea membrilor unui fundaţii
+DemoFundation2=Gestionaţi membrii şi conturile bancare ale unei fundaţii
+DemoCompanyServiceOnly=Companie sau freelancer cu vânzare de servicii
+DemoCompanyShopWithCashDesk=Gestionaţi un magazin cu casă de marcat
 DemoCompanyProductAndStocks=Comercializare produse cu POS
 DemoCompanyManufacturing=Produse fabricate de companie
 DemoCompanyAll=Companie cu activități multiple (toate modulele principale)
 CreatedBy=Creat de %s
 ModifiedBy=Modificat de %s
-ValidatedBy=Validate de  %s
-ClosedBy=Închise de  %s
-CreatedById=Id Utilizator care a creat
-ModifiedById=Id utilizator care a făcut ultima modificare
-ValidatedById=Id Utilizator care a validat
-CanceledById=Id Utilizator care a anulat
-ClosedById=Id Utilizator care a închis
-CreatedByLogin=Login Utilizator care a creat
-ModifiedByLogin=Nume utilizator care a făcut ultima modificare
-ValidatedByLogin=Login Utilizator care a validat
-CanceledByLogin=Login Utilizator care a anulat
-ClosedByLogin=Login Utilizator care a inchis
-FileWasRemoved=Fişier a fost şters
-DirWasRemoved=Director a fost eliminat
+ValidatedBy=Validat de  %s
+SignedBy=Semnat de %s
+ClosedBy=Închis de  %s
+CreatedById=Id-ul utilizatorului care a creat
+ModifiedById=Id-ul utilizatorului care a făcut ultima modificare
+ValidatedById=Id-ul utilizatorului care a validat
+CanceledById=Id-ul utilizatorului care a anulat
+ClosedById=Id-ul utilizatorului care a închis
+CreatedByLogin=Utilizatorul care a creat
+ModifiedByLogin=Utilizatorul care a făcut ultima modificare
+ValidatedByLogin=Utilizatorul care a validat
+CanceledByLogin=Utilizatorul care a anulat
+ClosedByLogin=Utilizatorul care a închis
+FileWasRemoved=Fişier %s a fost şters
+DirWasRemoved=Directorul %s a fost şters
 FeatureNotYetAvailable=Caracteristică care nu este încă disponibilă în versiunea curentă
-FeaturesSupported=Caracteristici acceptate
-Width=Lărgime
+FeaturesSupported=Caracteristici disponibile
+Width=Lăţime
 Height=Înălţime
-Depth=Adancime
-Top=Top
-Bottom=De jos
+Depth=Adâncime
+Top=Sus
+Bottom=Jos
 Left=Stânga
 Right=Dreapta
-CalculatedWeight=Calculat în greutate
-CalculatedVolume=Calculat volum
+CalculatedWeight=Greutate calculată
+CalculatedVolume=Volum calculat
 Weight=Greutate
 WeightUnitton=tonă
 WeightUnitkg=kg
@@ -150,7 +151,7 @@ LengthUnitm=m
 LengthUnitdm=dm
 LengthUnitcm=cm
 LengthUnitmm=mm
-Surface=Modul
+Surface=Suprafaţă
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
@@ -175,84 +176,85 @@ SizeUnitinch=inch
 SizeUnitfoot=picior
 SizeUnitpoint=punct
 BugTracker=Bug tracker
-SendNewPasswordDesc=Acest formular vă permite să solicitați o nouă parolă. Acesta va fi trimis la adresa ta de email. <br> Schimbarea va intra în vigoare odată ce faceți clic pe link-ul de confirmare din email. <br> Verificați Inbox-ul
-BackToLoginPage=Înapoi la pagina de login
-AuthenticationDoesNotAllowSendNewPassword=Mod de autentificare <b>este %s.</b> <br> În acest mod, Dolibarr nu poate şi nici nu ştiu să-ţi schimbi parola. <br> Contactaţi administratorul de sistem, dacă doriţi să vă schimbaţi parola.
-EnableGDLibraryDesc=Instalați sau activați biblioteca GD din instalarea dvs. PHP pentru a utiliza această opțiune.
-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=Statistici pentru suma cantităţilor produselor / serviciilor
-StatsByNumberOfEntities=Statistici în numărul entităților care fac trimitere (numărul de factură sau comanda ...)
-NumberOfProposals=Numărul de propuneri
-NumberOfCustomerOrders=Numărul de ordine de vânzare
-NumberOfCustomerInvoices=Numărul de facturi pentru clienți
-NumberOfSupplierProposals=Numărul de propuneri de furnizori
-NumberOfSupplierOrders=Numărul de ordine de cumpărare
-NumberOfSupplierInvoices=Numărul facturilor furnizorilor
+SendNewPasswordDesc=Acest formular vă permite să solicitați o nouă parolă. Acesta va fi trimis la adresa ta de email. <br> Schimbarea parolei va intra în vigoare după ce faceți clic pe link-ul de confirmare din email. <br> Verificați Inbox-ul
+BackToLoginPage=Înapoi la pagina de conectare
+AuthenticationDoesNotAllowSendNewPassword=Metoda de autentificare este <b>%s</b>. <br> În acest mod, sistemul nu poate şti şi nici nu poate să-ţi schimbe parola. <br> Contactează administratorul de sistem dacă vrei să-ţi schimbi parola.
+EnableGDLibraryDesc=Instalați sau activați biblioteca GD în configuraţia PHP pentru a utiliza această opțiune.
+ProfIdShortDesc=<b>Prof Id %s</b> este identificator profesional alocat în funcţie de ţara terţului.<br> De exemplu, pentru <b> %s</b> este codul <b>%s</b>.
+DolibarrDemo=Demo Dolibarr ERP/CRM
+StatsByNumberOfUnits=Statistici pentru suma cantităţilor produselor/serviciilor
+StatsByNumberOfEntities=Statistici cantitative privind entitățile referite (numărul de facturi sau de comenzi ...)
+NumberOfProposals=Număr de oferte comerciale
+NumberOfCustomerOrders=Număr de comenzi de vânzare
+NumberOfCustomerInvoices=Număr de facturi client
+NumberOfSupplierProposals=Număr de oferte furnizor
+NumberOfSupplierOrders=Număr de comenzi de achiziţie
+NumberOfSupplierInvoices=Număr de facturi furnizor
 NumberOfContracts=Număr contracte
 NumberOfMos=Număr comenzi de producţie
-NumberOfUnitsProposals=Numărul de unități pe propuneri
-NumberOfUnitsCustomerOrders=Numărul de unități din comenzile de vânzări
-NumberOfUnitsCustomerInvoices=Numărul de unități pe facturile clienților
-NumberOfUnitsSupplierProposals=Numărul de unități pe propunerile furnizorilor
+NumberOfUnitsProposals=Numărul de unități pe oferte
+NumberOfUnitsCustomerOrders=Numărul de unități din comenzile de vânzare
+NumberOfUnitsCustomerInvoices=Numărul de unități din facturile clienților
+NumberOfUnitsSupplierProposals=Numărul de unități din ofertele furnizorilor
 NumberOfUnitsSupplierOrders=Numărul de unități din comenzile de achiziție
-NumberOfUnitsSupplierInvoices=Numărul de unități pe facturile furnizorului
+NumberOfUnitsSupplierInvoices=Numărul de unități din facturile furnizorilor
 NumberOfUnitsContracts=Număr de unităţi pe contracte
-NumberOfUnitsMos=Număr unităţi de fabricatpe comenzile de producţie
-EMailTextInterventionAddedContact=A fost atribuită o nouă intervenție %s.
-EMailTextInterventionValidated=Intervenţia %s validată
+NumberOfUnitsMos=Număr unităţi de fabricat din comenzile de producţie
+EMailTextInterventionAddedContact=Ţi-a fost atribuită o nouă intervenție %s.
+EMailTextInterventionValidated=Intervenţia %s a fost validată
 EMailTextInvoiceValidated=Factura %s a fost validată.
-EMailTextInvoicePayed=Factura %s a fost plătită.
-EMailTextProposalValidated=Propunerea %s a fost validată.
-EMailTextProposalClosedSigned=Propunerea %s a fost închisă semnată.
-EMailTextOrderValidated=Ordinul %s a fost validat.
-EMailTextOrderApproved=Ordinul %s a fost aprobat.
-EMailTextOrderValidatedBy=Ordinul %s a fost înregistrat de %s.
-EMailTextOrderApprovedBy=Ordinul %s a fost aprobat de %s.
-EMailTextOrderRefused=Ordinul %s a fost refuzat.
-EMailTextOrderRefusedBy=Ordinul %s a fost refuzat de %s.
-EMailTextExpeditionValidated=Transportul %s a fost validat.
-EMailTextExpenseReportValidated=Raportul de cheltuieli %s a fost validat.
+EMailTextInvoicePayed=Factura %s a fost achitată.
+EMailTextProposalValidated=Oferta comercială %s a fost validată.
+EMailTextProposalClosedSigned=Oferta comercială  %s a fost semnată şi închisă.
+EMailTextOrderValidated=Comanda %s a fost validată.
+EMailTextOrderApproved=Comanda %s a fost aprobată.
+EMailTextOrderValidatedBy=Comanda %s a fost înregistrată de %s.
+EMailTextOrderApprovedBy=Comanda %s a fost aprobată de %s.
+EMailTextOrderRefused=Comanda %s a fost refuzată.
+EMailTextOrderRefusedBy=Comanda %s a fost refuzată de %s.
+EMailTextExpeditionValidated=Livrarea %s a fost validată.
+EMailTextExpenseReportValidated=Decontul de cheltuieli %s a fost validat.
 EMailTextExpenseReportApproved=Raportul de cheltuieli %s a fost aprobat.
 EMailTextHolidayValidated=Cererea de concediu %s a fost validată.
 EMailTextHolidayApproved=Cererea de concediu %s a fost aprobată.
 EMailTextActionAdded=Acțiunea %s a fost adăugată în Agendă.
 ImportedWithSet=Import de date
-DolibarrNotification=Notificare Automată
-ResizeDesc=Introduceţi lăţimea noi <b>sau</b> înălţimea noi. Raportul va fi păstrat în timpul redimensionare ...
+DolibarrNotification=Notificare automată
+ResizeDesc=Introduceţi noua lăţime <b>SAU</b> noua înălţime. Raportul va fi păstrat în timpul redimensionării...
 NewLength=Lăţime nouă
 NewHeight=Înălţime nouă
-NewSizeAfterCropping=noi dimensiuni după recoltare
-DefineNewAreaToPick=Definiţi zona noi pe imagine pentru a alege (click stanga pe imagine, apoi glisaţi până când ajunge la coltul opus)
+NewSizeAfterCropping=Noile dimensiuni după decupare
+DefineNewAreaToPick=Definiţi o zonă nouă pe imagine (click stînga pe imagine, apoi glisaţi până când ajungeţi la colţul opus)
 CurrentInformationOnImage=Acest instrument a fost conceput pentru a vă ajuta să redimensionați sau să decupați o imagine. Acestea sunt informațiile despre imaginea curentă editată
-ImageEditor=Editor de imagine
-YouReceiveMailBecauseOfNotification=Veţi primi acest mesaj deoarece adresa dvs. de email a fost adăugat la lista de obiective care urmează să fie informat cu privire la evenimentele special în software-ul de %s %s.
-YouReceiveMailBecauseOfNotification2=Acest eveniment este următoarea:
-ThisIsListOfModules=Aceasta este o listă de module preselectate de acest profil de demo-ul (numai modulele cele mai comune sunt vizibile în această demonstraţie). Editeaza aceasta să aibă un demo mai personalizate şi apăsaţi pe &quot;Start&quot;.
+ImageEditor=Editor de imagini
+YouReceiveMailBecauseOfNotification=Primeşti acest email pentru că adresa ta a fost adăugata în lista de destinatari care urmează să fie informaţi cu privire la acţiunile/evenimentele care se întâmplă în %s sistem de %s.
+YouReceiveMailBecauseOfNotification2=Urmează acest eveniment:
+ThisIsListOfModules=Aceasta este o listă de module preselectate pentru acest profil demonstrativ (doar modulele cele mai comune sunt vizibile în această demonstraţie). Modifică aici pentru a avea un demo personalizat şi apasă butonul "Start".
 UseAdvancedPerms=Utilizaţi permisiunile avansate ale unor module
 FileFormat=Format fişier
 SelectAColor=Alege o culoare
-AddFiles=Adaugă  fişiere
+AddFiles=Adaugă fişiere
 StartUpload=Începeţi încărcarea
 CancelUpload=Anulaţi încărcarea
-FileIsTooBig=Fişiere este prea mare
+FileIsTooBig=Fişierele sunt prea mari
 PleaseBePatient=Vă rugăm să aveţi răbdare ...
 NewPassword=Parolă nouă
-ResetPassword=Resetează parola
-RequestToResetPasswordReceived=A fost primită o solicitare de modificare a parolei.
-NewKeyIs=Aceasta este noua cheie pentru login
-NewKeyWillBe=Noua dvs. cheie pentru a vă conecta la software-ul va fi
+ResetPassword=Resetare parolă
+RequestToResetPasswordReceived=Am primit de la tine o solicitare de modificare a parolei.
+NewKeyIs=Acestea sunt noile tale credenţiale pentru autentificare
+NewKeyWillBe=Noua ta cheie pentru conectarea la sistem va fi
 ClickHereToGoTo=Click aici pentru a merge la %s
 YouMustClickToChange=Trebuie însă mai întâi să faceți clic pe link-ul următor pentru a valida această schimbare a parolei
-ForgetIfNothing=Dacă nu ați solicitat această schimbare, ignoraţi acest e-mail. Datele dvs.  sunt păstrate în condiții de siguranță.
-IfAmountHigherThan=Daca valoarea mai mare  <strong>%s</strong>
+ConfirmPasswordChange=Confirmare schimbare parolă
+ForgetIfNothing=Dacă nu ați solicitat această schimbare, ignoraţi acest email. Datele tale sunt păstrate în condiții de siguranță.
+IfAmountHigherThan=Daca valoarea este mai mare de <strong>%s</strong>
 SourcesRepository=Depozit pentru surse
 Chart=Diagramă
-PassEncoding=Codarea parolelor
+PassEncoding=Codarea parolei
 PermissionsAdd=Au fost adăugate permisiuni
 PermissionsDelete=Permisiunile au fost eliminate
-YourPasswordMustHaveAtLeastXChars=Parola dvs. trebuie să aibă cel puțin <strong> %s </strong> caractere
-YourPasswordHasBeenReset=Parola dvs. a fost resetată cu succes
+YourPasswordMustHaveAtLeastXChars=Parola ta trebuie să aibă cel puțin <strong>%s</strong> caractere
+YourPasswordHasBeenReset=Parola ta a fost resetată cu succes
 ApplicantIpAddress=Adresa IP a solicitantului
 SMSSentTo=SMS trimis la %s
 MissingIds=ID-uri lipsă
@@ -264,27 +266,27 @@ OpeningHoursFormatDesc=Foloseşte un - pentru a separa orele de lucru.<br>Folose
 PrefixSession=Prefix pentru ID-ul sesiunii
 
 ##### Export #####
-ExportsArea=Export
-AvailableFormats=Formatele disponibile
-LibraryUsed=Librairie
-LibraryVersion=Versiunea bibliotecii
-ExportableDatas=Date Exportabile
-NoExportableData=Nu exportabil de date (nu module cu exportabil date încărcate, sau lipsă permissions)
+ExportsArea=Export date
+AvailableFormats=Formate disponibile
+LibraryUsed=Librărie utilizată
+LibraryVersion=Versiune bibliotecă
+ExportableDatas=Date exportabile
+NoExportableData=Nu sunt date exportabile (niciun module cu date exportabile nu a fost încărcat, sau lipsă permisiuni)
 ##### External sites #####
 WebsiteSetup=Configurare modul website
-WEBSITE_PAGEURL=URL pagina
+WEBSITE_PAGEURL=URL pagină
 WEBSITE_TITLE=Titlu
 WEBSITE_DESCRIPTION=Descriere
 WEBSITE_IMAGE=Imagine
 WEBSITE_IMAGEDesc=Calea relativă către imagini media. Puteți lăsa necompletat, deoarece este foarte rar utilizată (poate fi folosită de conţinutul dinamic pentru a afișa o miniatură într-o listă de postări pe blog). Foloseşte __WEBSITE_KEY__ în cale dacă aceasta depinde de numele site-ului ( de exemplu: image/__WEBSITE_KEY__/stories/myimage.png).
-WEBSITE_KEYWORDS=Cuvânt cheie
+WEBSITE_KEYWORDS=Cuvinte cheie
 LinesToImport=Linii de import
 
 MemoryUsage=Memorie utilizată
 RequestDuration=Durată request
 ProductsPerPopularity=Produse/Servicii după popularitate
-PopuProp=Produse/servicii după popularitate pe Oferte
-PopuCom=Produse/servicii după popularitate pe Comenzi de vânzare
+PopuProp=Produse/servicii după popularitate pe ofertele comerciale
+PopuCom=Produse/servicii după popularitate pe comenzile de vânzare
 ProductStatistics=Statistici produse/servicii
 NbOfQtyInOrders=Cantitate în comenzi 
 SelectTheTypeOfObjectToAnalyze=Selectează tipul obiectului de analizat...
diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang
index 62da9588ecf..c3703344839 100644
--- a/htdocs/langs/ro_RO/productbatch.lang
+++ b/htdocs/langs/ro_RO/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Foloseşte lot / număr de serie
-ProductStatusOnBatch=Da (Lot / Număr de serie cerut)
+ProductStatusOnBatch=Da (lot necesar)
+ProductStatusOnSerial=Da (este necesar un număr de serie unic)
 ProductStatusNotOnBatch=Nu (Lot / Număr de serie nefolosit)
-ProductStatusOnBatchShort=Da
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serie
 ProductStatusNotOnBatchShort=Nu
 Batch=Lot / Serie
 atleast1batchfield=Data expirării sau data vânzării sau  lot / serie
@@ -15,10 +17,19 @@ printBatch=Lot/Serie: %s
 printEatby=Expiră la : %s
 printSellby=Vândut la: %s
 printQty=Cant: %d
-AddDispatchBatchLine=Adauga o linie pentru trimiterea perioadei de valabilitate 
+AddDispatchBatchLine=Adaugă o linie pentru trimiterea perioadei de valabilitate 
 WhenProductBatchModuleOnOptionAreForced=Când modulul Lot / Serial este activat, scăderea automată a stocurilor este forțată la "Reducerea stocurilor reale la validarea livrărilor" și modul automat de creștere este forțat la "Cresterea stocurilor reale la expedierea manuală în depozite" și nu poate fi editat. Alte opțiuni pot fi definite așa cum doriți.
 ProductDoesNotUseBatchSerial=Acest produs nu foloseste numărul de lot / serie
 ProductLotSetup=Configurarea lotului / numărului serial al modulului
 ShowCurrentStockOfLot=Afișați stocul curent pentru cuplu de produs/lot
 ShowLogOfMovementIfLot=Afișați jurnalul mișcărilor pentru cuplu de produs/lot
 StockDetailPerBatch=Detaliu stoc pe lot
+SerialNumberAlreadyInUse=Seria %s este deja utilizată pentru produsul %s
+TooManyQtyForSerialNumber=Poți avea un singur produs %s pentru numărul de serie %s
+BatchLotNumberingModules=Opțiuni pentru generarea automată de produse lot gestionate pe loturi
+BatchSerialNumberingModules=Opțiuni pentru generarea automată de produse lot gestionate prin numere de serie
+CustomMasks=Adaugă o opţiune pentru definire mască în fişa produsului
+LotProductTooltip=Adaugă o opțiune în fişa de produs pentru a defini o mască dedicată numărului de lot
+SNProductTooltip=Adaugă o opțiune în fişa de produs pentru a defini o mască dedicată numărului de serie
+QtyToAddAfterBarcodeScan=Cantitate de adăugat pentru fiecare cod de bare/lot/serie scanată
+
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index dec5f4abd1c..1e5f07f0e12 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -1,48 +1,48 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Ref. produs
 ProductLabel=Etichetă produs
-ProductLabelTranslated=Etichetă de produs tradusă
+ProductLabelTranslated=Etichetă produs tradusă
 ProductDescription=Descriere produs
-ProductDescriptionTranslated=Descrierea produsului tradus
+ProductDescriptionTranslated=Descriere tradusă produs
 ProductNoteTranslated=Nota de produs tradusă
-ProductServiceCard=Fişe Produse / Servicii
+ProductServiceCard=Fişă Produs/Serviciu
 TMenuProducts=Produse
 TMenuServices=Servicii
 Products=Produse
 Services=Servicii
 Product=Produs
 Service=Serviciu
-ProductId=ID produs / serviciu
-Create=Crează
+ProductId=ID produs/serviciu
+Create=Creare
 Reference=Referinţă
 NewProduct=Produs nou
 NewService=Serviciu nou
-ProductVatMassChange=Actualizarea TVA globală
-ProductVatMassChangeDesc=Acest instrument actualizează rata TVA definită pe  <b> <u> ALL </u> </b>produse și servicii!
-MassBarcodeInit=Init cod de bare în  masă
-MassBarcodeInitDesc=Această pagină poate fi utilizată pentru a inițializa un cod de bare pe obiectele care nu au coduri de bare definit. Verificați înainte dacă  modulul cod de bare este complet configurat.
-ProductAccountancyBuyCode=Codul contabil (achiziție)
-ProductAccountancyBuyIntraCode=Cod contabil (achiziţie intra-comunitară)
+ProductVatMassChange=Actualizare TVA globală
+ProductVatMassChangeDesc=Acest instrument actualizează cota de TVA definită pe  <b><u>TOATE</u></b> produsele și serviciile!
+MassBarcodeInit=Iniţializare coduri bare în  masă
+MassBarcodeInitDesc=Această pagină poate fi utilizată pentru a inițializa un cod de bare pe obiectele care nu au coduri de bare definite. Verificați înainte dacă modulul cod de bare este complet configurat.
+ProductAccountancyBuyCode=Cont contabil (achiziție)
+ProductAccountancyBuyIntraCode=Cont contabil (achiziţie intra-comunitară)
 ProductAccountancyBuyExportCode=Cont contabil (achiziţie import)
-ProductAccountancySellCode=Codul contabil (vânzare)
-ProductAccountancySellIntraCode=Codul contabil (vânzarea intracomunitară)
-ProductAccountancySellExportCode=Codul contabil (export de vânzare)
+ProductAccountancySellCode=Cont contabil (vânzări)
+ProductAccountancySellIntraCode=Cont contabil (vânzări intracomunitare)
+ProductAccountancySellExportCode=Cont contabil (vânzări la export)
 ProductOrService=Produs sau serviciu
-ProductsAndServices=Produse si Servicii
+ProductsAndServices=Produse şi Servicii
 ProductsOrServices=Produse sau servicii
-ProductsPipeServices=Produse|Servicii
+ProductsPipeServices=Produse | Servicii
 ProductsOnSale=Produse de vânzare
 ProductsOnPurchase=Produse de achiziţionat
-ProductsOnSaleOnly=Produsele doar de vânzare 
-ProductsOnPurchaseOnly=Produsele doar pentru cumpărare
-ProductsNotOnSell=Produse care nu sunt de vânzare și cumpărare
-ProductsOnSellAndOnBuy=Produse supuse vânzării sau cumpărării
+ProductsOnSaleOnly=Produse doar de vânzare 
+ProductsOnPurchaseOnly=Produse doar pentru achiziţie
+ProductsNotOnSell=Produse care nu sunt de vânzare și nici de achiziţionat
+ProductsOnSellAndOnBuy=Produse de vânzare sau de achiziţionat
 ServicesOnSale=Servicii de vânzare
 ServicesOnPurchase=Servicii de achiziţionat
 ServicesOnSaleOnly=Servicii doar de vânzare
-ServicesOnPurchaseOnly=Numai servicii de cumpărare
-ServicesNotOnSell=Servicii care nu sunt de vânzare și de cumpărare
-ServicesOnSellAndOnBuy=Servicii supuse vânzării sau cumpărării
+ServicesOnPurchaseOnly=Servicii doar de achiziţionat
+ServicesNotOnSell=Servicii care nu sunt nici de vânzare și nici de achiziţionat
+ServicesOnSellAndOnBuy=Servicii de vânzare sau de achiziţionat
 LastModifiedProductsAndServices=Ultimile %s produse/servicii modificate
 LastRecordedProducts=Ultimele %s produse înregistrate
 LastRecordedServices=Ultimele %s servicii înregistrate 
@@ -50,133 +50,134 @@ CardProduct0=Produs
 CardProduct1=Serviciu
 Stock=Stoc
 MenuStocks=Stocuri
-Stocks=Stocurile și locația (depozitul) produselor
-Movements=Transferuri
-Sell=Vinde
-Buy=Cumpărare
-OnSell=Pentru desfacere
-OnBuy=Pentru achiziţionare
-NotOnSell=Nu pentru desfacere
-ProductStatusOnSell=Pentru desfacere
-ProductStatusNotOnSell=Nu pentru desfacere
-ProductStatusOnSellShort=Pentru desfacere
-ProductStatusNotOnSellShort=Nu pentru desfacere
-ProductStatusOnBuy=Pentru achiziţionare
-ProductStatusNotOnBuy=Nu pentru achiziţionare
-ProductStatusOnBuyShort=Pentru achiziţionare
-ProductStatusNotOnBuyShort=Nu pentru achiziţionare
-UpdateVAT=Actualizeaza  tva
-UpdateDefaultPrice=Actualizați prețul implicit
-UpdateLevelPrices=Actualizați prețurile pentru fiecare nivel
+Stocks=Stocuri și locație (depozit) produse
+Movements=Mişcări
+Sell=Vânzare
+Buy=Achiziţie
+OnSell=De vânzare
+OnBuy=De achiziţionat
+NotOnSell=Nu pentru vânzare
+ProductStatusOnSell=De vânzare
+ProductStatusNotOnSell=Nu pentru vânzare
+ProductStatusOnSellShort=De vânzare
+ProductStatusNotOnSellShort=Nu pentru vânzare
+ProductStatusOnBuy=Pentru achiziţie
+ProductStatusNotOnBuy=Nu pentru achiziţie
+ProductStatusOnBuyShort=Pentru achiziţie
+ProductStatusNotOnBuyShort=Nu pentru achiziţie
+UpdateVAT=Actualizare TVA
+UpdateDefaultPrice=Actualizare preț implicit
+UpdateLevelPrices=Actualizare prețuri pentru fiecare nivel
 AppliedPricesFrom=Aplicată de la
-SellingPrice=Preţul de vânzare
-SellingPriceHT=Prețul de vânzare (fără taxă)
-SellingPriceTTC=Preţul de vânzare (incl. taxe)
-SellingMinPriceTTC=Prețul minim de vânzare (inclusiv taxa)
-CostPriceDescription=Acest câmp de preț (fără taxă) poate fi utilizat pentru a stoca pretul de cost mediu. Poate fi orice preț pe care îl calculați dvs., de exemplu din prețul mediu de achiziție plus costul mediu de producție și distribuție.
+SellingPrice=Preţ de vânzare
+SellingPriceHT=Preț de vânzare (fără taxe)
+SellingPriceTTC=Preţ de vânzare (cu taxe)
+SellingMinPriceTTC=Preț minim de vânzare (cu taxe)
+CostPriceDescription=Acest câmp de preț (fără taxe) poate fi utilizat pentru a stoca preţul de cost mediu pentru compania ta. Poate fi orice preț pe care îl calculați, de exemplu din prețul mediu de achiziție plus costul mediu de producție și distribuție.
 CostPriceUsage=Această valoare ar putea fi utilizată pentru calcularea marjei.
-SoldAmount=Suma vândută
-PurchasedAmount=Sumă achiziționată
+SoldAmount=Cantitate vândută
+PurchasedAmount=Cantitate achiziționată
 NewPrice=Preţ nou
-MinPrice=Prețul minim de vânzare
-EditSellingPriceLabel=Editați eticheta prețului de vânzare
-CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (%s fără tva). Acest mesaj poate apărea, de asemenea, dacă tastați o reducere prea important.
+MinPrice=Preț minim de vânzare
+EditSellingPriceLabel=Editare etichetă preț vânzare
+CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (%s fără taxe). Acest mesaj poate apărea, de asemenea, dacă aplicați o reducere prea mare.
 ContractStatusClosed=Închis
 ErrorProductAlreadyExists=Un produs cu referinţa %s există deja.
-ErrorProductBadRefOrLabel=Valoare greșită pentru referință sau eticheta.
-ErrorProductClone=A apărut o problemă în timp ce sw încerca clonarea produsului sau a serviciului.
+ErrorProductBadRefOrLabel=Valoare eronată pentru referință sau etichetă.
+ErrorProductClone=A apărut o problemă în timp ce se încerca clonarea produsului sau a serviciului.
 ErrorPriceCantBeLowerThanMinPrice=Eroare, prețul nu poate fi mai mic decât prețul minim.
 Suppliers=Furnizori
-SupplierRef=Furnizor SKU
-ShowProduct=Afişează  produs
+SupplierRef=SKU furnizor
+ShowProduct=Afişează produs
 ShowService=Afişează serviciu
 ProductsAndServicesArea=Produse şi Servicii
 ProductsArea=Produse
 ServicesArea=Servicii
-ListOfStockMovements=Lista mişcări stoc
-BuyingPrice=Preț de cumpărare
+ListOfStockMovements=Listă mişcări de stoc
+BuyingPrice=Preț de achiziţie
 PriceForEachProduct=Produse cu prețuri specifice
-SupplierCard=Cardul furnizorului
+SupplierCard=Fişă furnizor
 PriceRemoved=Preţ şters
 BarCode=Coduri de bare
-BarcodeType=Tip Coduri de bare
+BarcodeType=Tip cod de bare
 SetDefaultBarcodeType=Setări tip cod de bare
-BarcodeValue=Valoarea coduri de bare
+BarcodeValue=Valoare cod de bare
 NoteNotVisibleOnBill=Notă (nevizibilă pe facturi, oferte ...)
 ServiceLimitedDuration=Dacă produsul este un serviciu cu durată limitată:
-FillWithLastServiceDates=Completează cu data ultimelor linii de servicii
-MultiPricesAbility=Segmente multiple de preț pentru fiecare produs / serviciu (fiecare client se află într-un singur segment de preț)
-MultiPricesNumPrices=Numărul de preţ
-DefaultPriceType=Baza prețurilor în mod implicit (cu sau fără taxe) la adăugarea noilor prețuri de vânzare
-AssociatedProductsAbility=Activare kituri (set de mai multe produse) 
-VariantsAbility=Activare variante (variații ale produselor, de exemplu, culoare, dimensiune)
+FillWithLastServiceDates=Completează cu datele ultimelor linii de servicii
+MultiPricesAbility=Segmente multiple de preț pentru fiecare produs/serviciu (oricare client se află într-un singur segment de preț)
+MultiPricesNumPrices=Număr de preţuri
+DefaultPriceType=Bază de prețuri implicită (cu sau fără taxe) la adăugarea noilor prețuri de vânzare
+AssociatedProductsAbility=Activare kituri (seturi alcătuite din mai multe produse)
+VariantsAbility=Activare variante de produs (variații ale produselor, de exemplu, culoare, dimensiune)
 AssociatedProducts=Kit-uri
 AssociatedProductsNumber=Numărul de produse care compun acest kit
-ParentProductsNumber=Numărul  pachetelor produselor  părinte
+ParentProductsNumber=Numărul produselor părinte din pachet
 ParentProducts=Produse-mamă
-IfZeroItIsNotAVirtualProduct=Dacă este 0, acest produs nu este un kit.
+IfZeroItIsNotAVirtualProduct=Dacă este 0, acest produs nu este un kit
 IfZeroItIsNotUsedByVirtualProduct=Dacă este 0, acest produs nu este utilizat de niciun kit
-KeywordFilter=Filtru de cuvinte cheie
-CategoryFilter=Categorie filtru
-ProductToAddSearch=Cauta produse de adăugat
+KeywordFilter=Filtru cuvinte cheie
+CategoryFilter=Filtru categorie
+ProductToAddSearch=Caută produse pentru adăugare
 NoMatchFound=Niciun rezultat găsit
-ListOfProductsServices=Lista de produse/servicii
+ListOfProductsServices=Listă de produse/servicii
 ProductAssociationList=Lista produselor/serviciilor care sunt componentă(e) ale acestui kit
 ProductParentList=Lista kit-urilor cu acest produs ca şi componentă
-ErrorAssociationIsFatherOfThis=Un produs este selectat de părinte cu curent produs
-DeleteProduct=A şterge un produs / serviciu
-ConfirmDeleteProduct=Sunteţi sigur că doriţi să ştergeţi acest produs / serviciu?
-ProductDeleted=Produse / servicii " %s" şterse din baza de date.
+ErrorAssociationIsFatherOfThis=Un produs selectat este părinte cu produsul curent
+DeleteProduct=Şterge un produs/serviciu
+ConfirmDeleteProduct=Sunteţi sigur că doriţi să ştergeţi acest produs/serviciu?
+ProductDeleted=Produse/servicii "%s" au fost şterse din baza de date.
 ExportDataset_produit_1=Produse
 ExportDataset_service_1=Servicii
 ImportDataset_produit_1=Produse
 ImportDataset_service_1=Servicii
-DeleteProductLine=Ştergeţi linia de produse
-ConfirmDeleteProductLine=Sunteţi sigur că doriţi să ştergeţi această linie de produse?
+DeleteProductLine=Şterge linia de produs
+ConfirmDeleteProductLine=Sunteţi sigur că doriţi să ştergeţi această linie de produs?
 ProductSpecial=Special
-QtyMin= Cantitate minimă cumpărată
+QtyMin= Cantitate minimă de achiziţionat
 PriceQtyMin=Preţ cantitate minimă
-PriceQtyMinCurrency=Preț (valută) pentru această cantitate. (fără reducere)
-VATRateForSupplierProduct=TVA (pentru acest furnizor/produs)
-DiscountQtyMin=Reducere pentru acest produs.
+PriceQtyMinCurrency=Preț (monedă) pentru această cantitate. (fără discount)
+VATRateForSupplierProduct=Cota TVA (pentru acest furnizor/produs)
+DiscountQtyMin=Reducere pentru această cantitate.
 NoPriceDefinedForThisSupplier=Nu există preț/cantitate definite pentru acest furnizor/produs
 NoSupplierPriceDefinedForThisProduct=Nici un preț/cantitate furnizor nu este definită pentru acest produs
+PredefinedItem=Element predefinit
 PredefinedProductsToSell=Produs predefinit
 PredefinedServicesToSell=Serviciu predefinit
-PredefinedProductsAndServicesToSell=Produse/Servicii Predefinite pentru vânzare
-PredefinedProductsToPurchase=Produse Predefinite pentru cumpărare
-PredefinedServicesToPurchase=Servicii Predefinite pentru cumpărare
-PredefinedProductsAndServicesToPurchase=Produse/servicii predefinite pentru achiziționare
-NotPredefinedProducts=Produse/servicii nepredefinite
-GenerateThumb=Generaţi thumb
-ServiceNb=Service # %s
-ListProductServiceByPopularity=Lista de produse / servicii de popularitate
-ListProductByPopularity=Lista de produse / servicii de popularitate
-ListServiceByPopularity=Lista de servicii de către popularitate
+PredefinedProductsAndServicesToSell=Produse/servicii predefinite pentru vânzare
+PredefinedProductsToPurchase=Produse predefinite pentru achiziţie
+PredefinedServicesToPurchase=Servicii predefinite pentru achiziţie
+PredefinedProductsAndServicesToPurchase=Produse/servicii predefinite pentru achiziție
+NotPredefinedProducts=Produse/servicii non-predefinite
+GenerateThumb=Generare thumbnail
+ServiceNb=Serviciu #%s
+ListProductServiceByPopularity=Lista de produse/servicii după popularitate
+ListProductByPopularity=Listă de produse după popularitate
+ListServiceByPopularity=Listă servicii după popularitate
 Finished=Produs fabricat
 RowMaterial=Materie primă
-ConfirmCloneProduct=Sunteți sigur că doriți să clonați produsul sau serviciul <b> %s </b>?
+ConfirmCloneProduct=Sunteți sigur că doriți să clonați produsul sau serviciul <b>%s</b>?
 CloneContentProduct=Clonați toate informațiile principale ale produsului/serviciului
-ClonePricesProduct=Clonează preţurile
+ClonePricesProduct=Clonare preţuri
 CloneCategoriesProduct=Clonare tag-uri/categorii asociate
-CloneCompositionProduct=Clonează produsul / serviciul virtual
-CloneCombinationsProduct=Clonați variantele de produs
+CloneCompositionProduct=Clonare produs/serviciu virtual
+CloneCombinationsProduct=Clonare variante de produs
 ProductIsUsed=Acest produs este utilizat
-NewRefForClone=Ref. de produs / serviciu nou
-SellingPrices=Preţuri vânzare
-BuyingPrices=Prețuri de achiziționare 
-CustomerPrices=Preţuri Client
-SuppliersPrices=Prețurile furnizorului
-SuppliersPricesOfProductsOrServices=Prețurile furnizorilor (de produse sau servicii)
+NewRefForClone=Ref. noului produs/serviciu
+SellingPrices=Preţuri de vânzare
+BuyingPrices=Prețuri de achiziție 
+CustomerPrices=Preţuri client
+SuppliersPrices=Prețuri furnizor
+SuppliersPricesOfProductsOrServices=Prețuri furnizori (pentru produse sau servicii)
 CustomCode=Cod vamal/Marfă/Cod HS
 CountryOrigin=Ţara de origine
 RegionStateOrigin=Regiune de origine
-StateOrigin=Judeţ/regiune de origine
+StateOrigin=Ţară|Regiune de origine
 Nature=Natură produs(materie primă/produs finit)
 NatureOfProductShort=Natură produs
 NatureOfProductDesc=Materie primă sau produs finit
-ShortLabel=Etichetă scurta
-Unit=Unit
+ShortLabel=Etichetă scurtă
+Unit=Unitate
 p=u.
 set=set
 se=set
@@ -192,7 +193,7 @@ gram=gram
 g=g
 meter=metru
 m=m
-lm=lm
+lm=ml
 m2=m²
 m3=m³
 liter=litru
@@ -205,7 +206,7 @@ unitD=Zi
 unitG=Gram
 unitM=Metru
 unitLM=Metru liniar
-unitM2=Metru patrat
+unitM2=Metru pătrat
 unitM3=Metru cub
 unitL=Litru
 unitT=tonă
@@ -220,7 +221,7 @@ unitCM=cm
 unitMM=mm
 unitFT=ft
 unitIN=inch
-unitM2=Metru patrat
+unitM2=Metru pătrat
 unitDM2=dm²
 unitCM2=cm²
 unitMM2=mm²
@@ -234,90 +235,90 @@ unitFT3=ft³
 unitIN3=in³
 unitOZ3=uncie
 unitgallon=galon
-ProductCodeModel=Model ref Produs
-ServiceCodeModel=Model ref Serviciu 
+ProductCodeModel=Şablon ref Produs
+ServiceCodeModel=Şablon ref Serviciu 
 CurrentProductPrice=Preţ curent
-AlwaysUseNewPrice=Întotdeauna foloseşte preţul curent al produsului/serviciului
-AlwaysUseFixedPrice=Foloseşte preţul fix
-PriceByQuantity=Preţuri diferite pe cantitate
-DisablePriceByQty=Dezactivați prețurile în funcție de cantitate
+AlwaysUseNewPrice=Foloseşte întotdeauna preţul curent al produsului/serviciului
+AlwaysUseFixedPrice=Foloseşte preţ fix
+PriceByQuantity=Preţuri diferite în funcţie de cantitate
+DisablePriceByQty=Dezactivare prețuri în funcție de cantitate
 PriceByQuantityRange=Interval cantitate
 MultipriceRules=Prețuri automate pentru segment
-UseMultipriceRules=Utilizați regulile segmentului de preț (definite în configurarea modulului de produs) pentru a calcula automat prețurile tuturor celorlalte segmente în funcție de primul segment
+UseMultipriceRules=Utilizați regulile segmentului de preț (definite în configurarea modulului Produse) pentru a calcula automat prețurile tuturor celorlalte segmente în funcție de primul segment
 PercentVariationOver=Variația %% peste %s
 PercentDiscountOver=%% reducere peste %s
-KeepEmptyForAutoCalculation=Păstrați gol pentru a calcula acest lucru automat din greutate sau din volumul de produse
+KeepEmptyForAutoCalculation=Păstrați gol pentru a calcula automat din greutatea sau din volumul de produse
 VariantRefExample=Exemple: COL, SIZE
 VariantLabelExample=Exemple: Culoare, Dimensiune
 ### composition fabrication
 Build=Produce
 ProductsMultiPrice=Produsele și prețurile pentru fiecare segment de preț
-ProductsOrServiceMultiPrice=Prețurile clienților (de produse sau servicii, prețuri multiple)
-ProductSellByQuarterHT=Produsul cifrei de afaceri trimestrial înainte de impozitare
-ServiceSellByQuarterHT=Rata de afaceri trimestrială din servicii înainte de impozitare
+ProductsOrServiceMultiPrice=Prețuri clienți (de produse sau servicii, prețuri multiple)
+ProductSellByQuarterHT=Cifra de afaceri trimestrială aferentă produselor înainte de taxare impozitare
+ServiceSellByQuarterHT=Cifra de afaceri trimestrială aferentă serviciilor înainte de taxare impozitare
 Quarter1=Trimestru 1.
 Quarter2=Trimestru 2.
 Quarter3=Trimestru 3.
 Quarter4=Trimestru 4.
-BarCodePrintsheet=Printeaza cod de bare 
-PageToGenerateBarCodeSheets=Cu acest instrument, puteți tipări foi de autocolante cu coduri de bare. Alegeți formatul paginii dvs. de autocolant, tipul de cod de bare și valoarea codului de bare, apoi faceți clic pe butonul <b> %s </b>.
-NumberOfStickers=Numărul de autocolante  de printat pe pagina
-PrintsheetForOneBarCode=Print câteva autocolante pentru un cod de bare
-BuildPageToPrint=Generare pagina pentru imprimantă
-FillBarCodeTypeAndValueManually=Completați tip cod de bare și valoarea manual.
-FillBarCodeTypeAndValueFromProduct=Completați tip cod de bare și valoareadin codul de bare al produsului.
+BarCodePrintsheet=Tipărire cod de bare 
+PageToGenerateBarCodeSheets=Cu acest instrument, puteți tipări autocolante cu coduri de bare. Alegeți formatul paginii de autocolant, tipul de cod de bare și valoarea codului de bare, apoi faceți clic pe butonul <b>%s</b>.
+NumberOfStickers=Număr de autocolante de tipărit pe pagină
+PrintsheetForOneBarCode=Tipăriţi mai multe autocolante pentru un cod de bare
+BuildPageToPrint=Generare pagină pentru tipărire
+FillBarCodeTypeAndValueManually=Completare manuală tip şi valoare cod de bare.
+FillBarCodeTypeAndValueFromProduct=Completați tip cod de bare și valoare din codul de bare al produsului.
 FillBarCodeTypeAndValueFromThirdParty=Completați tipul și valoarea codului de bare de la codul de bare al unui terț
-DefinitionOfBarCodeForProductNotComplete=Definiția tipului sau valorii codului de bare nu este completă pentru produsul %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definiția tipului sau valorii codului de bare nu este completat pentru un terț %s.
-BarCodeDataForProduct=Informații despre codul de bare al produsului %s:
-BarCodeDataForThirdparty=Informații despre codul de bare al terților %s:
+DefinitionOfBarCodeForProductNotComplete=Definiția tipului sau valorii codului de bare nu este completată pentru produsul %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definiția tipului sau valorii codului de bare nu este completat pentru terțul %s.
+BarCodeDataForProduct=Info cod de bare produs %s:
+BarCodeDataForThirdparty=Info cod de bare terț %s:
 ResetBarcodeForAllRecords=Definiți valoarea codului de bare pentru toate înregistrările (aceasta va reseta, de asemenea, valoarea codului de bare deja definită cu valori noi)
-PriceByCustomer=Diferite prețuri pentru fiecare client
-PriceCatalogue=Un singur preț de vânzare pentru fiecare produs / serviciu
+PriceByCustomer=Prețuri diferite pentru fiecare client
+PriceCatalogue=Un singur preț de vânzare pentru fiecare produs/serviciu
 PricingRule=Reguli privind prețurile de vânzare
-AddCustomerPrice=Add Preţ pe client
-ForceUpdateChildPriceSoc=Setează acelasi preţ pe subsidiarele clientuli
-PriceByCustomerLog=Jurnalul prețurile anterioare ale clienților
+AddCustomerPrice=Adaugă preţ pe client
+ForceUpdateChildPriceSoc=Setează acelasi preţ pe subsidiarele clientului
+PriceByCustomerLog=Jurnalul prețurilor anterioare ale clienților
 MinimumPriceLimit=Prețul minim nu poate fi mai mic decât %s
 MinimumRecommendedPrice=Prețul minim recomandat este: %s
 PriceExpressionEditor=Editor expresie preț
 PriceExpressionSelected=Expresie preț selectatată
-PriceExpressionEditorHelp1="pret = 2 + 2" sau "2 + 2" pentru setarea pretului. Foloseste ; tpentru separarea expresiilor
-PriceExpressionEditorHelp2=Puteți accesa ExtraFields cu variabile precum <b> # extrafield_myextrafieldkey # </b> și variabilele globale cu <b> # global_mycode # </b>
-PriceExpressionEditorHelp3=În ambele prețuri de produs / serviciu și furnizor există aceste variabile disponibile: <br> <b> # tva_tx # # localtax1_tx # # localtax2_tx # # greutate # # lungime # # suprafață # # price_min # </b>
-PriceExpressionEditorHelp4=Doar în prețul produsului / serviciului: <b> # supplier_min_price # </b> <br> Doar în prețurile furnizorilor: <b> # supplier_quantity # și # supplier_tva_tx # </b>
+PriceExpressionEditorHelp1="price = 2 + 2" sau "2 + 2" pentru setarea preţului. Foloseste ; pentru a separa expresiile
+PriceExpressionEditorHelp2=Puteți accesa Extracâmpuri cu variabile precum <b>#extrafield_myextrafieldkey#</b> și variabilele globale cu <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=În ambele prețuri de produs/serviciu și preţuri furnizor există aceste variabile disponibile:<br> <b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=Doar în prețul produsului/serviciului: <b># supplier_min_price#</b><br> Doar în prețurile furnizorilor: <b>#supplier_quantity# și #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=Valori globale disponibile:
-PriceMode=Mod  preț
+PriceMode=Mod de preț
 PriceNumeric=Număr
-DefaultPrice=Preț Implicit
+DefaultPrice=Preț implicit
 DefaultPriceLog=Jurnalul preţurilor implicite anterioare
-ComposedProductIncDecStock=Mărește/micșorează stoc pe schimbări sintetice
-ComposedProduct=Produse pentru copii
-MinSupplierPrice=Preţul minim de achiziţie
-MinCustomerPrice=Prețul minim de vânzare
+ComposedProductIncDecStock=Mărire/micșorare de stoc la modificarea produselor părinte
+ComposedProduct=Produse copil
+MinSupplierPrice=Preţ minim de achiziţie
+MinCustomerPrice=Preț minim de vânzare
 DynamicPriceConfiguration=Setarea dinamică a prețului
 DynamicPriceDesc=Puteți defini formule matematice pentru a calcula prețurile clienților sau furnizorilor. Astfel de formule pot folosi toți operatorii matematici, unele constante și variabile. Puteți defini aici variabilele pe care doriți să le utilizați. Dacă variabila are nevoie de o actualizare automată, puteți defini adresa URL externă pentru a permite Dolibarr să actualizeze automat valoarea.
-AddVariable=Adăugați variabilă
-AddUpdater=Adăugați Updater
+AddVariable=Adăugare variabilă
+AddUpdater=Adăugare actualizator
 GlobalVariables=Variabile globale
 VariableToUpdate=Variabilă de actualizat
 GlobalVariableUpdaters= Actualizatoare externe pentru variabile
 GlobalVariableUpdaterType0=Date JSON
 GlobalVariableUpdaterHelp0=Analizează datele JSON din adresa URL specificată, VALUE specifică locația valorii relevante,
 GlobalVariableUpdaterHelpFormat0=Format pentru solicitare {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
-GlobalVariableUpdaterType1=Datele WebService
-GlobalVariableUpdaterHelp1=Analizează datele WebService din adresa URL specificată, NS specifică spațiul de nume, VALUE specifică locația valorii relevante, DATA ar trebui să conțină datele de trimis și METHOD este metoda WS apelantă
+GlobalVariableUpdaterType1=Date WebService
+GlobalVariableUpdaterHelp1=Analizează datele WebService din adresa URL specificată, NS specifică spațiul de nume, VALUE specifică locația valorii relevante, DATA ar trebui să conțină datele de trimis și METHOD este metoda apelantă
 GlobalVariableUpdaterHelpFormat1=Formatul pentru solicitare este {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
 UpdateInterval=Interval de actualizare (minute)
 LastUpdated=Ultima actualizare
-CorrectlyUpdated=Actualizată corect
-PropalMergePdfProductActualFile=Fișierele de adăugat în PDF Azur sunt / este
-PropalMergePdfProductChooseFile=Selectați fișiere PDF
-IncludingProductWithTag=Inclusiv produsul / serviciul cu etichetă
-DefaultPriceRealPriceMayDependOnCustomer=Prețul implicit, prețul real poate depinde de client
+CorrectlyUpdated=Actualizat corect
+PropalMergePdfProductActualFile=Fișierele de adăugat în PDF Azur sunt/este
+PropalMergePdfProductChooseFile=Selectare fișiere PDF
+IncludingProductWithTag=Include produsele/serviciile cu tag-ul
+DefaultPriceRealPriceMayDependOnCustomer=Preț implicit, prețul real poate depinde de client
 WarningSelectOneDocument=Selectați cel puțin un document
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Cantitate în propuneri
+DefaultUnitToShow=Unitate
+NbOfQtyInProposals=Cantitate în oferte
 ClinkOnALinkOfColumn=Faceți clic pe un link al coloanei %s pentru a obține o afișare detaliată ...
 ProductsOrServicesTranslations=Traduceri de produse/servicii
 TranslatedLabel=Etichetă tradusă
@@ -332,64 +333,64 @@ LengthUnits=Unitate lungime
 HeightUnits=Unitate înălţime
 SurfaceUnits=Unitate suprafaţă
 SizeUnits=Unitate de măsură
-DeleteProductBuyPrice=Ștergeți prețul de achiziție
-ConfirmDeleteProductBuyPrice=Sigur doriți să ștergeți acest preț de cumpărare?
+DeleteProductBuyPrice=Șterge preț de achiziție
+ConfirmDeleteProductBuyPrice=Sigur doriți să ștergeți acest preț de achiziţie?
 SubProduct=Subprodus
-ProductSheet=Fișa produsului
-ServiceSheet=Foaia de service
+ProductSheet=Fișă produs
+ServiceSheet=Fişă serviciu
 PossibleValues=Valori posibile
-GoOnMenuToCreateVairants=Mergeți în meniul %s - %s pentru a pregăti variantele atributelor (cum ar fi culorile, mărimea, ...)
+GoOnMenuToCreateVairants=Mergeți în meniul %s - %s pentru a pregăti atributele variantelor de produs (cum ar fi culorile, mărimea, ...)
 UseProductFournDesc=Adăugați o caracteristică pentru a defini descrierile produselor definite de furnizori, pe lângă descrierile pentru clienți
 ProductSupplierDescription=Descrierea furnizorului pentru produs
-UseProductSupplierPackaging=Utilizați unităţile de ambalare la prețurile furnizorului (recalculați cantitățile în funcție de unităţile de ambalare stabilite la prețul furnizorului atunci când adăugați/actualizați linia în documentele furnizorului)
-PackagingForThisProduct=Ambalare
-PackagingForThisProductDesc=Pe comanda de achiziţie, veți comanda automat această cantitate (sau un multiplu al acestei cantități). Nu poate fi mai mică decât cantitatea minimă de cumpărare
-QtyRecalculatedWithPackaging=Cantitatea liniei a fost recalculată conform unităţii de ambalare a furnizorului
+UseProductSupplierPackaging=Utilizați împachetările la prețurile furnizor (recalculați cantitățile în funcție de împachetările stabilite la prețurile de furnizor atunci când adăugați/actualizați linia în documentele furnizorului)
+PackagingForThisProduct=Împachetare
+PackagingForThisProductDesc=Pe comanda de achiziţie, veți comanda automat această cantitate (sau un multiplu al acestei cantități). Nu poate fi mai mică decât cantitatea minimă de achiziţie
+QtyRecalculatedWithPackaging=Cantitatea liniei a fost recalculată conform împachetării furnizorului
 
 #Attributes
-VariantAttributes=Atribute variabile
-ProductAttributes=Atribute variabile pentru produse
-ProductAttributeName=Atribut variabil%s
-ProductAttribute=Atribut variabil
+VariantAttributes=Atribute variantă
+ProductAttributes=Atribute pentru variante de produs
+ProductAttributeName=Atribut variantă %s
+ProductAttribute=Atribut variantă
 ProductAttributeDeleteDialog=Sigur doriți să ștergeți acest atribut? Toate valorile vor fi șterse
 ProductAttributeValueDeleteDialog=Sigur doriți să ștergeți valoarea "%s" cu referința "%s" din acest atribut?
-ProductCombinationDeleteDialog=Sigur doriți să ștergeți varianta produsului "<strong> %s </strong>"?
-ProductCombinationAlreadyUsed=A apărut o eroare la ștergerea variantei. Verificați că nu este folosită în nici un obiect
+ProductCombinationDeleteDialog=Sigur doriți să ștergeți varianta de produs "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=A apărut o eroare la ștergerea variantei. Verificați că nu este folosită de niciun obiect
 ProductCombinations=Variante
-PropagateVariant=Variante de propagare
-HideProductCombinations=Ascunde varianta de produse în selectorul de produse
+PropagateVariant=Propagare variante de produs 
+HideProductCombinations=Ascunde varianta de produs în selectorul de produse
 ProductCombination=Variantă
-NewProductCombination=Noua variantă
-EditProductCombination=Varianta de editare
-NewProductCombinations=Noi variante
-EditProductCombinations=Varianta de editare
-SelectCombination=Selectați combinația
+NewProductCombination=Variantă nouă
+EditProductCombination=Editare variantă de produs
+NewProductCombinations=Variante noi
+EditProductCombinations=Editare variante de produs
+SelectCombination=Selectare combinație
 ProductCombinationGenerator=Generator de variante
 Features=Caracteristici
-PriceImpact=Impactul prețului
+PriceImpact=Impactul asupra prețului
 ImpactOnPriceLevel=Impact pe nivelul de preţ %s
 ApplyToAllPriceImpactLevel= Aplică la toate nivelele
 ApplyToAllPriceImpactLevelHelp=Făcând clic aici setați același impact asupra prețurilor pe toate nivelurile
-WeightImpact=Impactul greutăţii
+WeightImpact=Impactul asupra greutăţii
 NewProductAttribute=Atribut nou
 NewProductAttributeValue=Valoare nouă a atributului
 ErrorCreatingProductAttributeValue=A apărut o eroare la crearea valorii atributului. Ar putea fi pentru că există deja o valoare cu această referință
-ProductCombinationGeneratorWarning=Dacă veți continua, înainte de a genera noi variante, toate cele anterioare vor fi STERSE. Cele deja existente vor fi actualizate cu noile valori
-TooMuchCombinationsWarning=Generarea de numeroase variante poate avea ca rezultat un procesor ridicat, utilizarea memoriei și Dolibarr care nu le poate crea. Activarea opțiunii "%s" poate ajuta la reducerea utilizării memoriei.
+ProductCombinationGeneratorWarning=Dacă veți continua, înainte de a genera noi variante, toate cele anterioare vor fi ŞTERSE. Cele deja existente vor fi actualizate cu noile valori
+TooMuchCombinationsWarning=Generarea de numeroase variante poate avea ca rezultat utilizarea excesivă a procesorului şi memoriei, iar sistemul nu le va putea crea. Activarea opțiunii "%s" poate ajuta la reducerea utilizării memoriei.
 DoNotRemovePreviousCombinations=Nu eliminați variantele anterioare
-UsePercentageVariations=Utilizați variații procentuale
+UsePercentageVariations=Utilizare variații procentuale
 PercentageVariation=Variație procentuală
 ErrorDeletingGeneratedProducts=A apărut o eroare în timp ce încercați să ștergeți variantele de produs existente
 NbOfDifferentValues=Nr. de valori diferite
 NbProducts=Număr de produse
-ParentProduct=Produsul Părinte
-HideChildProducts=Ascundeți variantele produselor
-ShowChildProducts=Afișați variantele produselor
-NoEditVariants=Accesați cardul de produse Părinte și modificați impactul prețurilor variantelor în fila variante
+ParentProduct=Produs părinte
+HideChildProducts=Ascundeți variantele de produs
+ShowChildProducts=Afișare variante de produs
+NoEditVariants=Accesați fişa produsul părinte și modificați impactul asupra prețurilor variantelor în fişa Variante
 ConfirmCloneProductCombinations=Doriți să copiați toate variantele de produs la celălalt produs părinte cu referința dată?
-CloneDestinationReference=Destinație referință produs
+CloneDestinationReference=Referință produs destinație 
 ErrorCopyProductCombinations=A apărut o eroare la copierea variantelor de produs
-ErrorDestinationProductNotFound=Destinația produsului nu a fost găsita
+ErrorDestinationProductNotFound=Produsul destinația nu a fost găsit
 ErrorProductCombinationNotFound=Varianta de produs nu a fost găsită
 ActionAvailableOnVariantProductOnly=Acțiune disponibilă numai pentru varianta de produs
 ProductsPricePerCustomer=Preţuri produs per clienţi
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index f56ec6dd958..41389259f5d 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -1,176 +1,177 @@
 # Dolibarr language file - Source file is en_US - projects
 RefProject=Ref. proiect
-ProjectRef=Referinţă de proiect
-ProjectId=ID proiect
-ProjectLabel=Eticheta proiectului
+ProjectRef=Referinţă proiect
+ProjectId=ID Proiect
+ProjectLabel=Etichetă proiect
 ProjectsArea=Proiecte
-ProjectStatus=Statut Proiect
+ProjectStatus=Status proiect
 SharedProject=Toată lumea
-PrivateProject=Contacte Proiect
+PrivateProject=Contacte proiect
 ProjectsImContactFor=Proiecte pentru care sunt persoană de contact în mod explicit 
-AllAllowedProjects=Toate proiectele pe care le pot citi (mie + public)
+AllAllowedProjects=Toate proiectele pe care le pot citi (ale mele + cele publice)
 AllProjects=Toate proiectele
-MyProjectsDesc=Această vizualizare este limitată la proiectele pentru care sunteți de contactat
-ProjectsPublicDesc=Această vedere prezintă toate proiectele la care aveţi permisiunea să le  citiţi.
-TasksOnProjectsPublicDesc=Această vizualizare prezintă toate sarcinile pe care aveți permisiunea să le citiți.
-ProjectsPublicTaskDesc=Această vedere prezintă toate proiectele şi activităţile  care sunt permise să le  citiţi.
-ProjectsDesc=Această vedere prezintă toate proiectele  (permisiuni de utilizator va acorda permisiunea de a vizualiza totul).
-TasksOnProjectsDesc=Această vizualizare prezintă toate sarcinile din toate proiectele (permisiunile utilizatorului vă acordă permisiunea de a vizualiza totul).
-MyTasksDesc=Această vizualizare este limitată la proiectele sau sarcinile pentru care sunteți de contactat
-OnlyOpenedProject=Sunt vizibile numai proiectele deschise (proiectele în starea de proiect sau în starea închisă nu sunt vizibile).
+MyProjectsDesc=Această vizualizare este limitată la proiectele pentru care sunteți contactat
+ProjectsPublicDesc=Această vedere prezintă toate proiectele la care aveţi permisiunea de citire.
+TasksOnProjectsPublicDesc=Această vizualizare prezintă toate task-urile pe care aveți permisiunea să le citiți.
+ProjectsPublicTaskDesc=Această vedere prezintă toate proiectele şi task-urile care sunt permise să le citiţi.
+ProjectsDesc=Această vedere prezintă toate proiectele (permisiuni acordate pentru a vizualiza tot).
+TasksOnProjectsDesc=Această vizualizare prezintă toate task-urile din toate proiectele (permisiuni acordate pentru a vizualiza tot).
+MyTasksDesc=Această vizualizare este limitată la proiectele sau task-urile pentru care sunteți contact
+OnlyOpenedProject=Sunt vizibile numai proiectele deschise (proiectele schiţă sau închise nu sunt vizibile).
 ClosedProjectsAreHidden=Proiectele închise nu sunt vizibile.
-TasksPublicDesc=Această vedere prezintă toate proiectele şi activităţile  care sunt permise să le  citiţi.
-TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni de utilizator va acorda permisiunea de a vizualiza totul).
-AllTaskVisibleButEditIfYouAreAssigned=Toate sarcinile pentru proiectele calificate sunt vizibile, însă puteți introduce timp doar  pentru sarcina atribuită utilizatorului selectat. Atribuiți sarcină dacă trebuie să introduceți timp pe ea.
-OnlyYourTaskAreVisible=Numai sarcinile atribuite dvs. vă sunt vizibile. Atribuiți-vă sarcina dacă nu este vizibilă și trebuie să introduceți timp pe ea.
-ImportDatasetTasks=Sarcinile proiectelor
-ProjectCategories=Etichete/categorii de proiecte
+TasksPublicDesc=Această vedere prezintă toate proiectele şi task-urile pentru care aveţi permisiunea de a le citi.
+TasksDesc=Această vedere prezintă toate proiectele şi task-urile (drepturile îţi permit să vezi totul).
+AllTaskVisibleButEditIfYouAreAssigned=Toate task-urile pentru proiectele calificate sunt vizibile, însă puteți introduce timp consumat doar pe task-ul atribuit utilizatorului selectat. Atribuiți task-ul dacă trebuie să introduceți timp consumat pe el.
+OnlyYourTaskAreVisible=Numai task-urile atribuite ţie sunt vizibile. Atribuiți-vă task-ul dacă nu este vizibil și trebuie să îţi aloci timp pe el.
+ImportDatasetTasks=Task-uri proiecte
+ProjectCategories=Etichete/categorii proiecte
 NewProject=Proiect nou
 AddProject=Creare proiect
-DeleteAProject=Şterge  proiect
+DeleteAProject=Şterge proiect
 DeleteATask=Şterge task
 ConfirmDeleteAProject=Sigur doriți să ștergeți acest proiect?
-ConfirmDeleteATask=Sigur doriți să ștergeți această sarcină?
+ConfirmDeleteATask=Sigur doriți să ștergeți acest task?
 OpenedProjects=Proiecte deschise
-OpenedTasks=Sarcini deschise 
-OpportunitiesStatusForOpenedProjects=Conduce cantitatea de proiecte deschise în funcție de statut
-OpportunitiesStatusForProjects=Conduce cantitatea de proiecte în funcție de statut
+OpenedTasks=Task-uri deschise 
+OpportunitiesStatusForOpenedProjects=Sumă lead-uri din proiectele deschise în funcție de status
+OpportunitiesStatusForProjects=Sumă lead-uri din priecte în funcție de status
 ShowProject=Afişează proiect
-ShowTask=Arată sarcină
+ShowTask=Arată task
 SetProject=Setare proiect
-NoProject=Niciun proiect definit sau responsabil
+NoProject=Niciun proiect definit sau la care sunt responsabil
 NbOfProjects=Număr proiecte
 NbOfTasks=Număr task-uri
-TimeSpent=Timp comsumat
-TimeSpentByYou=Timpul consumat  da tine
-TimeSpentByUser=Timp consumat pe utilizator
+TimeSpent=Timp consumat
+TimeSpentByYou=Timpul consumat de tine
+TimeSpentByUser=Timp consumat de utilizator
 TimesSpent=Timpi consumaţi
 TaskId=ID task
 RefTask=Ref. task
 LabelTask=Denumire task
-TaskTimeSpent=Timp consumat pe task
+TaskTimeSpent=Timp consumat pe task-uri
 TaskTimeUser=Utilizator
-TaskTimeNote=Nota
-TaskTimeDate=Data
-TasksOnOpenedProject=Sarcini privind proiectele deschise
+TaskTimeNote=Notă
+TaskTimeDate=Dată
+TasksOnOpenedProject=Task-uri de pe proiectele deschise
 WorkloadNotDefined=Volumul de muncă nu este definit
 NewTimeSpent=Timpi consumaţi
 MyTimeSpent=Timpul meu consumat
-BillTime=Facturează timpul petrecut
+BillTime=Facturează timpul consumat
 BillTimeShort=Timp facturat
 TimeToBill=Timp nefacturat
 TimeBilled=Timp facturat
 Tasks=Taskuri
 Task=Task
-TaskDateStart=Data start task
-TaskDateEnd=Data de final task
+TaskDateStart=Dată start task
+TaskDateEnd=Dată finalizare task
 TaskDescription=Descriere task
 NewTask=Task nou
-AddTask=Creare sarcină 
-AddTimeSpent=Creați timp petrecut
-AddHereTimeSpentForDay=Adăugați aici timpul petrecut pentru această zi / sarcină
+AddTask=Creare task
+AddTimeSpent=Creare timp consumat
+AddHereTimeSpentForDay=Adăugați aici timpul consumat pe această zi/task
 AddHereTimeSpentForWeek=Adaugă aici timpul consumat pe săptămână/task
 Activity=Activitate
-Activities=Activităţi / Taskuri
-MyActivities=Activităţile / Taskurile mele
+Activities=Activităţi/Task-uri
+MyActivities=Activităţile/Task-urile mele
 MyProjects=Proiectele mele
-MyProjectsArea=Zona proiectelor mele
+MyProjectsArea=Proiectele mele
 DurationEffective=Durata efectivă
 ProgressDeclared=Progres real declarat
 TaskProgressSummary=Progres task
-CurentlyOpenedTasks=Taskuri deschise recent
+CurentlyOpenedTasks=Task-uri deschise recent
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=Progresul real declarat este mai mic cu %s decât progresul consumului 
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Progresul real declarat este mai mare cu %s decât progresul consumului 
-ProgressCalculated=Progres consum
+ProgressCalculated=Progres pe consum
 WhichIamLinkedTo=la care sunt atribuit
 WhichIamLinkedToProject=pentru care sunt atribuit la proiect
 Time=Timp
 TimeConsumed=Consumat
-ListOfTasks=Lista de sarcini
-GoToListOfTimeConsumed=Accesați lista de timp consumată
+ListOfTasks=Listă de task-uri
+GoToListOfTimeConsumed=Accesați lista de timpi consumaţi
 GanttView=Vizualizare Gantt 
-ListProposalsAssociatedProject=Lista propunerilor comerciale aferente proiectului
+ListWarehouseAssociatedProject=Lista depozitelor asociate la proiect
+ListProposalsAssociatedProject=Lista ofertelor comerciale aferente proiectului
 ListOrdersAssociatedProject=Lista comenzilor de vânzări aferente proiectului
-ListInvoicesAssociatedProject=Lista facturilor pentru clienți  aferente proiectului
-ListPredefinedInvoicesAssociatedProject=Lista facturilor de șablon client aferente proiectului
+ListInvoicesAssociatedProject=Lista facturilor pentru clienți aferente proiectului
+ListPredefinedInvoicesAssociatedProject=Lista facturilor șablon de client aferente proiectului
 ListSupplierOrdersAssociatedProject=Lista comenzilor de achiziție aferente proiectului
-ListSupplierInvoicesAssociatedProject=Lista facturilor furnizorilor aferente proiectului
+ListSupplierInvoicesAssociatedProject=Lista facturilor furnizor aferente proiectului
 ListContractAssociatedProject=Lista contractelor aferente proiectului
-ListShippingAssociatedProject=Lista expedierilor aferente proiectului
+ListShippingAssociatedProject=Lista livrărilor aferente proiectului
 ListFichinterAssociatedProject=Lista intervențiilor aferente proiectului
 ListExpenseReportsAssociatedProject=Lista rapoartelor de cheltuieli aferente proiectului
 ListDonationsAssociatedProject=Lista donațiilor aferente proiectului
-ListVariousPaymentsAssociatedProject=Lista diverselor plăți aferente proiectului
+ListVariousPaymentsAssociatedProject=Lista plăților diverse aferente proiectului
 ListSalariesAssociatedProject=Lista plăților salariale aferente proiectului
 ListActionsAssociatedProject=Lista evenimentelor aferente proiectului
 ListMOAssociatedProject=Lista comenzilor de producţie aferente proiectului
-ListTaskTimeUserProject=Lista timpului consumat pe sarcinile proiectului
-ListTaskTimeForTask=Listă de timp consumat pe sarcină
+ListTaskTimeUserProject=Lista de timpi consumaţi pe task-urile proiectului
+ListTaskTimeForTask=Listă de timpi consumaţi pe task
 ActivityOnProjectToday=Activitatea pe proiect astăzi
 ActivityOnProjectYesterday=Activitatea pe proiect ieri
 ActivityOnProjectThisWeek=Activitatea de pe proiect în această săptămână
 ActivityOnProjectThisMonth=Activitatea de pe proiect în această lună
 ActivityOnProjectThisYear=Activitatea de pe proiect în acest an
-ChildOfProjectTask=Copil al proiectului / taskului
-ChildOfTask=Copil de sarcină
-TaskHasChild=Sarcina are copil
-NotOwnerOfProject=Nu este proprietar al acestui proiect privat
+ChildOfProjectTask=Subunitate a proiectului/task-ului
+ChildOfTask=Subunitate de task
+TaskHasChild=Task-ul are subtask-uri
+NotOwnerOfProject=Nu este deţinătorul acestui proiect privat
 AffectedTo=Alocat  la
 CantRemoveProject=Acest proiect nu poate fi şters pentru că este referenţiat de alte obiecte(facturi, comenzi sau altele) Vezi tab-ul '%s'.
 ValidateProject=Validează proiect
 ConfirmValidateProject=Sigur doriți să validați acest proiect?
-CloseAProject=Inchide proiect
+CloseAProject=Închide proiect
 ConfirmCloseAProject=Sigur doriți să închideți acest proiect?
-AlsoCloseAProject=De asemenea, închideți proiectul (păstrați-l deschis dacă totuși trebuie să urmați sarcini de producție pe acesta)
-ReOpenAProject=Redeschide Proiect
+AlsoCloseAProject=De asemenea, închideți proiectul (păstrați-l deschis dacă totuși trebuie să urmăriţi task-uri de producție pe acesta)
+ReOpenAProject=Re-deschide proiect
 ConfirmReOpenAProject=Sigur doriți să redeschideți acest proiect?
-ProjectContact=Contacte  proiect
-TaskContact=Contacte de sarcină
+ProjectContact=Contacte proiect
+TaskContact=Contacte task-uri
 ActionsOnProject=Evenimente pe proiect
 YouAreNotContactOfProject=Nu sunteţi un contact al acestui proiect privat
 UserIsNotContactOfProject=Utilizatorul nu este un contact al acestui proiect privat
-DeleteATimeSpent=Ştergeţi timpul  consumat
-ConfirmDeleteATimeSpent=Sigur doriți să ștergeți acest timp petrecut?
-DoNotShowMyTasksOnly=Afişează, de asemenea, şi taskurile ce nu sunt atribuite mie
-ShowMyTasksOnly=Vezi numai taskurile atribuite mie
+DeleteATimeSpent=Şterge timpul consumat
+ConfirmDeleteATimeSpent=Sigur doriți să ștergeți acest timp consumat?
+DoNotShowMyTasksOnly=Afişează, de asemenea, şi task-urile ce nu-mi sunt atribuite
+ShowMyTasksOnly=Afişează numai task-urile atribuite mie
 TaskRessourceLinks=Contacte task
 ProjectsDedicatedToThisThirdParty=Proiecte dedicate acestui terţ
-NoTasks=Nr sarcini pentru acest proiect
-LinkedToAnotherCompany=Legat de terţi, alta
-TaskIsNotAssignedToUser=Activitate nealocată utilizatorului. Utilizați butonul "<strong> %s </strong>" pentru a atribui sarcina acum.
+NoTasks=Niciun task pe acest proiect
+LinkedToAnotherCompany=Asociat la un alt terţ
+TaskIsNotAssignedToUser=Task nealocat utilizatorului. Foloseşte butonul '<strong>%s</strong>' pentru a atribui task-ul acum.
 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.
-IfNeedToUseOtherObjectKeepEmpty=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.
-CloneTasks=Clonează taskuri
+ThisWillAlsoRemoveTasks=Această acţiune va şterge, de asemenea, toate task-urile proiectului (<b>%s</b> task-uri la acest moment) şi toţi timpii consumaţi.
+IfNeedToUseOtherObjectKeepEmpty=Dacă unele obiecte (facturi, comenzi, ...), care aparţin altui terţ, trebuie să fie asociate la proiect pentru creare, menţine gol pentru a avea un proiect multi-terţi.
+CloneTasks=Clonează task-uri
 CloneContacts=Clonează contacte
 CloneNotes=Clonează note
-CloneProjectFiles=Clonează proiect fişiere ataşate
-CloneTaskFiles=Clonează task(uri)  fişiere ataşate (dacă task (urile)  clonate)
-CloneMoveDate=Actualizați datele proiectului/sarcinii de acum?
-ConfirmCloneProject=Sunteți sigur ca doriți clonarea acest proiect?
-ProjectReportDate=Schimbați datele sarcinii în funcție de data de începere a proiectului
-ErrorShiftTaskDate=Imposibil de schimbat data taskului conform cu noua data de debut a proiectului
-ProjectsAndTasksLines=Proiecte şi taskuri
+CloneProjectFiles=Clonează fişierele ataşate proiectului
+CloneTaskFiles=Clonează fişierele ataşate task(urilor) (dacă task(urile) au fost clonate)
+CloneMoveDate=Actualizați datele proiectului/task-urilor începând de acum?
+ConfirmCloneProject=Sunteți sigur că doriți clonarea acest proiect?
+ProjectReportDate=Schimbați datele task-ului în funcție de data de începere a proiectului
+ErrorShiftTaskDate=Imposibil de schimbat data taskului conform cu noua dată de debut a proiectului
+ProjectsAndTasksLines=Proiecte şi task-uri
 ProjectCreatedInDolibarr=Proiect %s creat
-ProjectValidatedInDolibarr=Proiect %s validat
-ProjectModifiedInDolibarr=Proiect %s modificat
-TaskCreatedInDolibarr=Task %s creat
-TaskModifiedInDolibarr=Task %s modificat
-TaskDeletedInDolibarr=Task %s sters
-OpportunityStatus=Starea oportunităţii
-OpportunityStatusShort=Starea oportunităţii
-OpportunityProbability=Probabilitatea oportunităţii
-OpportunityProbabilityShort=Probabilitatea oportunităţii
-OpportunityAmount=Valoarea oportunităţii
-OpportunityAmountShort=Valoarea oportunităţii
-OpportunityWeightedAmount=Suma ponderată a oportunității
-OpportunityWeightedAmountShort=Suma ponderată a oportunității
-OpportunityAmountAverageShort=Valoarea medie a oportunităţii
-OpportunityAmountWeigthedShort=Valoarea oportunităţii ponderată
-WonLostExcluded=Câștigat / pierdut eliminat
+ProjectValidatedInDolibarr=Proiectul %s a fost validat
+ProjectModifiedInDolibarr=Proiectul %s a fost modificat
+TaskCreatedInDolibarr=Task-ul %s a fost creat
+TaskModifiedInDolibarr=Task-ul %s a fost modificat
+TaskDeletedInDolibarr=Task-ul %s a fost şters
+OpportunityStatus=Status lead
+OpportunityStatusShort=Status lead
+OpportunityProbability=Probabilitate lead
+OpportunityProbabilityShort=Probab. lead
+OpportunityAmount=Valoare lead
+OpportunityAmountShort=Valoare lead
+OpportunityWeightedAmount=Valoare ponderată lead
+OpportunityWeightedAmountShort=Val. ponderată lead
+OpportunityAmountAverageShort=Valoare medie lead
+OpportunityAmountWeigthedShort=Valoare ponderată lead
+WonLostExcluded=Exclus Câștigat/Pierdut
 ##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=Şef de Proiect
-TypeContact_project_external_PROJECTLEADER=Şef de Proiect
+TypeContact_project_internal_PROJECTLEADER=Coordonator proiect
+TypeContact_project_external_PROJECTLEADER=Coordonator proiect
 TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
 TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
 TypeContact_project_task_internal_TASKEXECUTIVE=Responsabil
@@ -181,83 +182,83 @@ SelectElement=Selectați elementul
 AddElement=Link către element
 LinkToElementShort=Link la
 # Documents models
-DocumentModelBeluga=Șablon de document de proiect pentru prezentarea obiectelor legate
-DocumentModelBaleine=Șablon de document de proiect pentru sarcini
-DocumentModelTimeSpent=Șablonul de raport al proiectului pentru timpul petrecut
-PlannedWorkload=Volum de lucru Planificat
-PlannedWorkloadShort=Volum de muncă
+DocumentModelBeluga=Șablon de document de proiect pentru prezentarea obiectelor asociate
+DocumentModelBaleine=Șablon de document de proiect pentru task-uri
+DocumentModelTimeSpent=Șablonul de raport al proiectului pentru timpul consumat
+PlannedWorkload=Volum de lucru planificat
+PlannedWorkloadShort=Volum de lucru
 ProjectReferers=Obiecte asociate
 ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi
 FirstAddRessourceToAllocateTime=Atribuie o resursă utilizator ca şi contact al proiectului pentru a aloca timp
-InputPerDay=Intrare pe zi
-InputPerWeek=Intrare pe saptamana
+InputPerDay=Input pe zi
+InputPerWeek=Input pe saptamană
 InputPerMonth=Intrări pe lună
-InputDetail=Detaliile de intrare
-TimeAlreadyRecorded=Acesta este timpul petrecut deja înregistrat pentru această sarcină/zi și utilizator%s
-ProjectsWithThisUserAsContact=Proiecte cu acest utilizator ca contact
-TasksWithThisUserAsContact=Sarcini atribuite acestui utilizator
+InputDetail=Detalii input
+TimeAlreadyRecorded=Acesta este timpul consumat deja înregistrat pentru acest task/zi și utilizator %s
+ProjectsWithThisUserAsContact=Proiecte la care acest utilizator este contact
+TasksWithThisUserAsContact=Task-uri atribuite acestui utilizator
 ResourceNotAssignedToProject=Nu sunt alocate proiectului
-ResourceNotAssignedToTheTask=Nu este atribuit sarcinii
+ResourceNotAssignedToTheTask=Nu este atribuit task-ului
 NoUserAssignedToTheProject=Nu au fost alocat niciun utilizator acestui proiect
-TimeSpentBy=Timpul petrecut de
-TasksAssignedTo=Sarcină atribuită
-AssignTaskToMe=Acordă-mi sarcina
-AssignTaskToUser=Atribuiți sarcina la %s
-SelectTaskToAssign=Selectați sarcina pentru a atribui ...
+TimeSpentBy=Timpul consumat de
+TasksAssignedTo=Task-uri atribuite lui
+AssignTaskToMe=Acordă-mi task-ul
+AssignTaskToUser=Atribuie task-ul lui %s
+SelectTaskToAssign=Selectați task-ul de atribuit...
 AssignTask=Atribuie
 ProjectOverview=Prezentare generală
-ManageTasks=Utilizați proiectele pentru a urmări sarcinile și / sau pentru a raporta timpul petrecut (foi de pontaj)
-ManageOpportunitiesStatus=Utilizați proiectele pentru a urma instrucţiunile/ oportunitățile
-ProjectNbProjectByMonth=Numărul de proiecte create pe lună
-ProjectNbTaskByMonth=Numărul de sarcini create pe lună
-ProjectOppAmountOfProjectsByMonth=Suma de instrucţiuni pe lună
-ProjectWeightedOppAmountOfProjectsByMonth=Suma ponderată a instrucţiunilor pe lună
-ProjectOpenedProjectByOppStatus=Deschide proiect|lead după statusul lead-ului
-ProjectsStatistics=Statistici pentru proiecte sau lead-uri
-TasksStatistics=Statisticile cu privire la task-urile proiectelor sau lead-uri
-TaskAssignedToEnterTime=Sarcină atribuită. Introducerea timpului în această sarcină ar trebui să fie posibilă.
-IdTaskTime=Id timp sarcină
-YouCanCompleteRef=Dacă doriți să completați referinta cu un sufix, este recomandat să adăugați un caracter - pentru al separa, astfel încât numerotarea automată va funcționa corect pentru proiectele următoare. De exemplu, %s-MYSUFFIX
+ManageTasks=Utilizați proiectele pentru a urmări task-urile și/sau pentru a raporta timpul consumat (foi de pontaj)
+ManageOpportunitiesStatus=Utilizați proiectele pentru a urmări lead-urile/oportunitățile
+ProjectNbProjectByMonth=Nr. proiecte create lunar
+ProjectNbTaskByMonth=Nr. de task-uri create lunar
+ProjectOppAmountOfProjectsByMonth=Sumă de lead-uri lunar
+ProjectWeightedOppAmountOfProjectsByMonth=Suma ponderată a lead-urilor pe lună
+ProjectOpenedProjectByOppStatus=Proiect|lead deschis după status
+ProjectsStatistics=Statistici pe proiecte sau lead-uri
+TasksStatistics=Statisticile pe task-urile proiectelor sau lead-urilor
+TaskAssignedToEnterTime=Task atribuit. Introducerea de timp pe acest task ar trebui să fie posibilă.
+IdTaskTime=Id timp task
+YouCanCompleteRef=Dacă doriți să completați referinţa cu un sufix, este recomandat să adăugați un caracter - pentru al separa, astfel încât numerotarea automată să funcționeze corect pentru proiectele următoare. De exemplu %s-MYSUFFIX
 OpenedProjectsByThirdparties=Proiecte deschise de terți
-OnlyOpportunitiesShort=Numai conducerea
-OpenedOpportunitiesShort=Oportunităţi deschise
-NotOpenedOpportunitiesShort=Nu este un lead deschis
-NotAnOpportunityShort=Nu este o oportunitate
-OpportunityTotalAmount=Valoarea totala a oportunităţilor
-OpportunityPonderatedAmount=Greutatea valorii oportunităţilor
-OpportunityPonderatedAmountDesc=Suma ponderată a oportunităţilor cu probabilitate
+OnlyOpportunitiesShort=Doar lead-uri
+OpenedOpportunitiesShort=Lead-uri deschise
+NotOpenedOpportunitiesShort=Niciun lead deschis
+NotAnOpportunityShort=Nu este un lead
+OpportunityTotalAmount=Valoarea totală a lead-urilor
+OpportunityPonderatedAmount=Valoarea ponderată a lead-urilor
+OpportunityPonderatedAmountDesc=Suma ponderată a lead-urilor cu probabilitate
 OppStatusPROSP=Prospectare
 OppStatusQUAL=Calificare
 OppStatusPROPO=Ofertă 
 OppStatusNEGO=Negociere
-OppStatusPENDING=In asteptarea
-OppStatusWON=Castigat
+OppStatusPENDING=În aşteptare
+OppStatusWON=Câştigat
 OppStatusLOST=Pierdut
 Budget=Buget
-AllowToLinkFromOtherCompany=Permite conectarea proiectului de la o altă companie <br> <br> <u> Valori acceptate: </u> <br> - Păstrați gol: Poate lega orice proiect al companiei (implicit) <br> - "all": Poate lega orice proiecte, chiar proiecte ale altor companii <br> - ID-urile terților separate prin virgule: pot lega toate proiectele din aceste părți terțe (Exemplu: 123,4795,53) <br>
+AllowToLinkFromOtherCompany=Permite asocierea proiectului pe la o altă companie <br><br><u> Valori acceptate: </u><br> - Păstrați gol: Poate asocia orice proiect al companiei (implicit) <br> - "all": Poate asocia orice proiecte, chiar proiecte ale altor companii <br> - ID-urile terților separate prin virgule: poate asocia toate proiectele acestor terți (Exemplu: 123,4795,53)<br>
 LatestProjects=Ultimele %s proiecte 
 LatestModifiedProjects=Ultimele %s proiecte modificate 
-OtherFilteredTasks=Alte sarcini filtrate
-NoAssignedTasks=Nu au fost găsite sarcini atribuite (atribuiți proiectul / sarcinile utilizatorului curent din caseta de selectare superioară pentru a introduce ora pe acesta)
+OtherFilteredTasks=Alte task-uri filtrate
+NoAssignedTasks=Nu au fost găsite task-uri atribuite (atribuiți proiectul/task-urile utilizatorului curent din caseta de selectare superioară pentru a introduce timp pe acesta)
 ThirdPartyRequiredToGenerateInvoice=Un terț trebuie definit pe proiect pentru a putea să fie facturat.
 ChooseANotYetAssignedTask=Alege un task care nu îţi este atribuit
 # Comments trans
-AllowCommentOnTask=Permiteți comentariile utilizatorilor pe sarcini
-AllowCommentOnProject=Permiteți comentariile utilizatorilor pe proiecte
+AllowCommentOnTask=Permiteți comentarii de la utilizatori pe task-uri
+AllowCommentOnProject=Permiteți comentarii de la utilizatori pe proiecte
 DontHavePermissionForCloseProject=Nu aveți permisiuni pentru a închide proiectul %s
 DontHaveTheValidateStatus=Proiectul %s trebuie să fie deschis pentru a fi închis
-RecordsClosed=%sProiect(e) închis(e)
-SendProjectRef=Proiect de informare %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Modulul "Salarii" trebuie să fie activat pentru a defini rata orară a angajatului pentru a avea timpul petrecut valorificat
-NewTaskRefSuggested=Referatul de sarcini deja utilizat, este necesară o nouă sarcină
-TimeSpentInvoiced=Timp petrecut facturat
+RecordsClosed=%s proiect(e) închise
+SendProjectRef=Info proiect %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Modulul 'Salarii' trebuie să fie activat pentru a defini tariful orar al angajatului pentru valorificarea timpului consumat
+NewTaskRefSuggested=Taskul de referinţă este deja utilizat, este necesară un nou task
+TimeSpentInvoiced=Timp consumat facturat
 TimeSpentForInvoice=Timpi consumaţi
-OneLinePerUser=O linie pe utilizator
-ServiceToUseOnLines=Serviciu de utilizare pe linii
-InvoiceGeneratedFromTimeSpent=Factura %s a fost generată din timpul petrecut pe proiect
-ProjectBillTimeDescription=Bifați dacă introduceți un timeline în task-urile proiectului ȘI intenționați să generați factură(i) din foaia de timp pentru a factura proiectul clientului (nu bifați dacă intenționați să creați o factură care nu se bazează pe foile de timp introduse). Notă: Pentru a genera factură, accesați fila "Timpul petrecut" al proiectului și selectați liniile pe care să le includeți. 
-ProjectFollowOpportunity=Urmăreşte oportunitatea
-ProjectFollowTasks=Task-uri urmărite sau timp consumat
+OneLinePerUser=O linie per utilizator
+ServiceToUseOnLines=Serviciu de utilizat pe linii
+InvoiceGeneratedFromTimeSpent=Factura %s a fost generată cu timpul consumat pe proiect
+ProjectBillTimeDescription=Bifați dacă introduceți un timeline în task-urile proiectului ȘI intenționați să generați factură(i) din foaia de timp pentru a factura proiectul clientului (nu bifați dacă intenționați să creați o factură care nu se bazează pe foile de timp introduse). Notă: Pentru a genera factură, accesați fila "Timp consumat" a proiectului și selectați liniile pe care să le includeți. 
+ProjectFollowOpportunity=Urmăreşte lead-ul
+ProjectFollowTasks=Urmăreşte task-urile sau timpul consumat
 Usage=Utilizare
 UsageOpportunity=Utilizare: Oportunitate
 UsageTasks=Utilizare: Task-uri
@@ -266,5 +267,9 @@ InvoiceToUse=Şablon factură de utilizat
 NewInvoice=Factură nouă
 OneLinePerTask=O linie per task
 OneLinePerPeriod=O linie per perioadă
-RefTaskParent=Ref. task părinte
+RefTaskParent=Ref. Task Părinte
 ProfitIsCalculatedWith=Profitul este calculat utilizând
+AddPersonToTask=Adaugă și la task-uri
+UsageOrganizeEvent=Utilizare: Organizare eveniment
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Clasificați proiectul ca închis când toate task-urile sale sunt finalizate (100%% progres)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Notă: proiectele existente cu toate task-urile la 100 %% progres nu vor fi afectate: va trebui să le închideți manual. Această opțiune afectează doar proiectele deschise.
diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
index 9cc3450abe0..f046b81ddc6 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -1,28 +1,28 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Oferte Comerciale
-Proposal=Ofertă  Comercială
+Proposals=Oferte comerciale
+Proposal=Ofertă comercială
 ProposalShort=Ofertă 
-ProposalsDraft=Oferte Comerciale schiţă
-ProposalsOpened=Propuneri comerciale deschise
-CommercialProposal=Ofertă Comercială
-PdfCommercialProposalTitle=Ofertă Comercială
-ProposalCard=Fişă Ofertă 
-NewProp=Ofertă Comercială Nouă
-NewPropal=Ofertă  Nouă
+ProposalsDraft=Oferte comerciale schiţă
+ProposalsOpened=Oferte comerciale deschise
+CommercialProposal=Ofertă comercială
+PdfCommercialProposalTitle=Ofertă comercială
+ProposalCard=Fişă ofertă 
+NewProp=Ofertă comercială nouă
+NewPropal=Ofertă nouă
 Prospect=Prospect
-DeleteProp=Ştergere Ofertă  Comercială
-ValidateProp=Validează Ofertă Comercială
-AddProp=Crează ofertă
-ConfirmDeleteProp=Sigur doriți să ștergeți această propunere comercială?
-ConfirmValidateProp=Sigur doriți să validați această propunere comercială sub numele <b> %s </b>?
-LastPropals=Ultimele %s oferte 
+DeleteProp=Ştergere ofertă comercială
+ValidateProp=Validare ofertă comercială
+AddProp=Creare ofertă
+ConfirmDeleteProp=Sigur doriți să ștergeți această ofertă comercială?
+ConfirmValidateProp=Sigur doriți să validați această ofertă comercială sub numele <b>%s</b>?
+LastPropals=Ultimele %s oferte comerciale
 LastModifiedProposals=Ultimele %s oferte modificate
 AllPropals=Toate ofertele
 SearchAProposal=Caută o ofertă
-NoProposal=Nici o propunere
+NoProposal=Nicio ofertă
 ProposalsStatistics=Statistici oferte comerciale
 NumberOfProposalsByMonth=Număr pe luni
-AmountOfProposalsByMonthHT=Suma pe lună (fără taxă)
+AmountOfProposalsByMonthHT=Sumă pe lună (fără taxe)
 NbOfProposals=Număr oferte comerciale
 ShowPropal=Afişează oferta
 PropalsDraft=Schiţe
@@ -30,38 +30,38 @@ PropalsOpened=Deschis
 PropalStatusDraft=Schiţă (de validat)
 PropalStatusValidated=Validată (ofertă deschisă)
 PropalStatusSigned=Semnată (de facturat)
-PropalStatusNotSigned=Nesemnată (inchisă)
+PropalStatusNotSigned=Nesemnată (închisă)
 PropalStatusBilled=Facturată
 PropalStatusDraftShort=Schiţă
-PropalStatusValidatedShort=Validat (deschis)
+PropalStatusValidatedShort=Validată (deschisă)
 PropalStatusClosedShort=Închisă
 PropalStatusSignedShort=Semnată
 PropalStatusNotSignedShort=Nesemnată
 PropalStatusBilledShort=Facturată
-PropalsToClose=Oferte Comerciale de închis
-PropalsToBill=Oferte Comerciale semnate de facturat
-ListOfProposals=Lista  ofertelor comerciale
+PropalsToClose=Oferte comerciale de închis
+PropalsToBill=Oferte comerciale semnate de facturat
+ListOfProposals=Listă oferte comerciale
 ActionsOnPropal=Evenimente pe ofertă
 RefProposal=Ref. Ofertă comercială
 SendPropalByMail=Trimite oferta comercială pe mail
-DatePropal=Dată  ofertă
-DateEndPropal=Data valabilităţii
-ValidityDuration=Durata de valabilitate
-CloseAs=Setați starea la
-SetAcceptedRefused=Set acceptat/refuzat
-ErrorPropalNotFound=Propunearea %s nu a fost găsită
-AddToDraftProposals=Adaugă  ofertă schiţă
+DatePropal=Dată ofertă
+DateEndPropal=Dată valabilitate
+ValidityDuration=Durată de valabilitate
+SetAcceptedRefused=Setează ca acceptată/refuzată
+ErrorPropalNotFound=Oferta %s nu a fost găsită
+AddToDraftProposals=Adaugă la ofertă schiţă
 NoDraftProposals=Nicio ofertă schiţă
-CopyPropalFrom=Crează ofertă comercială prin copierea uneia existente
-CreateEmptyPropal=Creați o propunere comercială goală sau dintr-o listă de produse/servicii
-DefaultProposalDurationValidity=Durata validării implicite  a ofertei (în zile)
-UseCustomerContactAsPropalRecipientIfExist=Utilizați contactul/adresa cu tipul de "propunere de urmărire a contactului" dacă este definită în locul adresei terțului ca adresă destinatar a propunerii
-ConfirmClonePropal=Sigur doriți să clonați propunerea comercială <b> %s </b>?
-ConfirmReOpenProp=Sigur doriți să redeschideți oferta comercială <b> %s </b>?
-ProposalsAndProposalsLines=Oferte Comerciale  si linii
-ProposalLine=Linie Ofertă
-AvailabilityPeriod=Disponibilitate Livrare
-SetAvailability=Setează  disponibilitatea livrării
+CopyPropalFrom=Creare ofertă comercială prin copierea uneia existente
+CreateEmptyPropal=Creare propunere comercială goală sau dintr-o listă de produse/servicii
+DefaultProposalDurationValidity=Durata valabilităţii implicite a ofertei (în zile)
+UseCustomerContactAsPropalRecipientIfExist=Utilizați contactul/adresa cu tipul de "Contact urmărire ofertă" dacă este definit în locul adresei terțului ca adresă destinatar a ofertei
+ConfirmClonePropal=Sigur doriți să clonați oferta comercială <b>%s</b>?
+ConfirmReOpenProp=Sigur doriți să redeschideți oferta comercială <b>%s</b>?
+ProposalsAndProposalsLines=Ofertă comercială şi linii
+ProposalLine=Linie ofertă
+ProposalLines=Linii ofertă
+AvailabilityPeriod=Disponibilitate livrare
+SetAvailability=Setează disponibilitatea de livrare
 AfterOrder=după comandă
 OtherProposals=Alte oferte
 ##### Availability #####
@@ -72,16 +72,21 @@ AvailabilityTypeAV_3W=3 săptămâni
 AvailabilityTypeAV_1M=1 lună
 ##### Types de contacts #####
 TypeContact_propal_internal_SALESREPFOLL=Reprezentant urmărire ofertă
-TypeContact_propal_external_BILLING=Contact client  facturare propunere
+TypeContact_propal_external_BILLING=Contact client pentru facturare ofertă
 TypeContact_propal_external_CUSTOMER=Contact client urmărire ofertă
-TypeContact_propal_external_SHIPPING=Contactul clientului pentru livrare
+TypeContact_propal_external_SHIPPING=Contactul client pentru livrare
 # Document models
 DocModelAzurDescription=Un şablon complet pentru ofertă(vechea implementare a şablonului Cyan)
 DocModelCyanDescription=Un şablon complet pentru ofertă
 DefaultModelPropalCreate=Crează model implicit
 DefaultModelPropalToBill=Model implicit la închiderea unei oferte comerciale (de facturat)
 DefaultModelPropalClosed=Model implicit la închiderea unei oferte comerciale (nefacturat)
-ProposalCustomerSignature=Acceptarea scrisă, ștampila companiei, data și semnătura
-ProposalsStatisticsSuppliers=Statistici privind propunerile furnizorilor
+ProposalCustomerSignature=Acordul scris, ștampila companiei, data și semnătura
+ProposalsStatisticsSuppliers=Statistici oferte furnizori
 CaseFollowedBy=Caz urmat de
 SignedOnly=Doar semnată
+IdProposal=ID Ofertă
+IdProduct=ID Produs
+PrParentLine=Linie părinte ofertă
+LineBuyPriceHT=Taxare la preţul net de achiziţie pentru linia respectivă
+
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 50d0128e8fc..e13759c966b 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -3,17 +3,17 @@ WarehouseCard=Fişă Depozit
 Warehouse=Depozit
 Warehouses=Depozite
 ParentWarehouse=Depozit general
-NewWarehouse=Depozit nou / locație stoc
-WarehouseEdit=Modifică depozit
+NewWarehouse=Depozit/locaţie stoc nouă
+WarehouseEdit=Modificare depozit
 MenuNewWarehouse=Depozit nou
-WarehouseSource=Depozit Sursa
+WarehouseSource=Depozit sursă
 WarehouseSourceNotDefined=Niciun depozit definit,
 AddWarehouse=Creați un depozit
 AddOne=Adaugă unul
 DefaultWarehouse=Depozit implicit
 WarehouseTarget=Depozit ţintă
-ValidateSending=Şterge expedierea
-CancelSending=Anulează expediere
+ValidateSending=Şterge expediere
+CancelSending=Anulare expediere
 DeleteSending=Şterge expediere
 Stock=Stoc
 Stocks=Stocuri
@@ -25,220 +25,233 @@ StocksByLotSerial=Stocuri după lot/serie
 LotSerial=Loturi/Serii
 LotSerialList=Listă lot/serii
 Movements=Mişcări
-ErrorWarehouseRefRequired=Referința  Depozit este obligatorie
-ListOfWarehouses=Lista  depozite
-ListOfStockMovements=Lista mişcări de stoc
-ListOfInventories=Lista inventarelor
-MovementId=ID-ul de mișcare
+ErrorWarehouseRefRequired=Referința depozit este obligatorie
+ListOfWarehouses=Listă depozite
+ListOfStockMovements=Listă mişcări de stoc
+ListOfInventories=Listă inventare
+MovementId=ID mișcare
 StockMovementForId=ID-ul de mișcare %d
-ListMouvementStockProject=Lista miscărilor de stoc asociate proiectului
+ListMouvementStockProject=Lista mişcărilor de stoc asociate proiectului
 StocksArea=Depozite
 AllWarehouses=Toate depozitele
 IncludeEmptyDesiredStock= Include și stocul negativ cu stoc dorit nedefinit
-IncludeAlsoDraftOrders=Includeți, de asemenea, schiţele de proiecte
+IncludeAlsoDraftOrders=Includeți, de asemenea, comenzile schiţă
 Location=Locație
-LocationSummary=Nume scurt locaţie
-NumberOfDifferentProducts=Numărul de produse diferite
-NumberOfProducts=Număr total produse
+LocationSummary=Numele scurt al locaţiei
+NumberOfDifferentProducts=Număr de produse unice
+NumberOfProducts=Număr total de produse
 LastMovement=Ultima mișcare
 LastMovements=Ultimele mișcări
 Units=Unităţi
 Unit=Unitate
-StockCorrection=Corecția stocurilor
+StockCorrection=Corecție stoc
 CorrectStock=Corectează stoc
-StockTransfer=Transfer  stoc
-TransferStock=Transferați stocul
-MassStockTransferShort=Transfer stocurilor în masă
+StockTransfer=Transfer stoc
+TransferStock=Transfer stoc
+MassStockTransferShort=Transfer stocuri în masă
 StockMovement=Transfer stoc
-StockMovements=Transferuri stoc
-NumberOfUnit=Număr  unităţi
-UnitPurchaseValue=Preţ unitar cumpărare
+StockMovements=Mişcări de stoc
+NumberOfUnit=Număr de unităţi
+UnitPurchaseValue=Preţ de achiziţie unitar
 StockTooLow=Stoc insuficient
 StockLowerThanLimit=Stoc mai mic decât limita de alertă (%s)
-EnhancedValue=Valoric
-PMPValue=Valoric PMP
+EnhancedValue=Valoare
+PMPValue=PMP
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Stoc valoric
 UserWarehouseAutoCreate=Creați automat un depozit utilizator atunci când creați un utilizator
-AllowAddLimitStockByWarehouse=Gestionează, de asemenea, valoarea pentru stocul minim și cel dorit pe perechi (produs-depozit), pe lângă valoarea pentru stocul minim și dorit pe produs
+AllowAddLimitStockByWarehouse=Gestionează, de asemenea, valoarea pentru stocul minim și cel dorit pe perechi (produs-depozit), pe lângă valoarea pentru stocul minim și stoc dorit pe produs
 RuleForWarehouse=Reguli pentru depozite
-WarehouseAskWarehouseDuringPropal=Setează un depozit pe oferta comercială
+WarehouseAskWarehouseOnThirparty=Setează un depozit pe terţ
+WarehouseAskWarehouseDuringPropal=Setează un depozit pe ofertele comerciale
 WarehouseAskWarehouseDuringOrder=Setează un depozit pe comenzile de vânzare
 UserDefaultWarehouse=Setează un depozit pe utilizatori
 MainDefaultWarehouse=Depozit implicit
 MainDefaultWarehouseUser=Folosiți un depozit implicit pentru fiecare utilizator
 MainDefaultWarehouseUserDesc=Prin activarea acestei opțiuni, în timpul creării unui produs, depozitul alocat produsului va fi definit pe acesta. Dacă nu este definit niciun depozit la utilizator, este definit depozitul implicit.
 IndependantSubProductStock=Stocul de produse și stocul de subproduse sunt independente
-QtyDispatched=Cantitate dipecerizată
-QtyDispatchedShort=Cant Expediate
+QtyDispatched=Cantitate expediată
+QtyDispatchedShort=Cantitate expediată
 QtyToDispatchShort=Cant de expediat
-OrderDispatch=Chitanțe pe elemente
-RuleForStockManagementDecrease=Alegeți regula pentru scăderea automată a stocului (reducerea manuală este întotdeauna posibilă, chiar dacă este activată o regulă de scădere automată)
-RuleForStockManagementIncrease=Alegeți regula pentru creșterea automată a stocului (creșterea manuală este întotdeauna posibilă, chiar dacă este activată o regulă de creștere automată)
-DeStockOnBill=Reduceți stocurile reale la validarea facturii client / notei de credit
-DeStockOnValidateOrder=Reduceți stocurile reale la validarea ordinului de vânzări
-DeStockOnShipment=Descreşte stocul fizic bazat pe validarea livrarilor
-DeStockOnShipmentOnClosing=Reduceți stocurile reale atunci când transportul este închis
-ReStockOnBill=Creșteți stocurile reale la validarea facturii vânzătorului / notei de credit
-ReStockOnValidateOrder=Creșterea stocurilor reale la aprobarea comenzii de achiziție
-ReStockOnDispatchOrder=Creșterea stocurilor reale la expedierea manuală în depozit, după primirea comenzii de cumpărare a bunurilor
+OrderDispatch=Expediere comandă
+RuleForStockManagementDecrease=Alege regula pentru scăderea automată a stocului (reducerea manuală este întotdeauna posibilă, chiar dacă este activată o regulă de scădere automată)
+RuleForStockManagementIncrease=Alege regula pentru creșterea automată a stocului (creșterea manuală este întotdeauna posibilă, chiar dacă este activată o regulă de creștere automată)
+DeStockOnBill=Reduce stocurile reale la validarea facturii client/notei de credit
+DeStockOnValidateOrder=Reduceți stocurile reale la validarea comenzii de vânzare
+DeStockOnShipment=Descreşte stocul fizic în baza livrărilor validate
+DeStockOnShipmentOnClosing=Reduceți stocurile reale atunci când livrarea este închisă
+ReStockOnBill=Crește stocurile reale la validarea facturii furnizor/notei de credit
+ReStockOnValidateOrder=Crește stocurile reale la aprobarea comenzii de achiziție
+ReStockOnDispatchOrder=Crește stocurile reale la expedierea manuală în depozit, după primirea comenzii de achiziţie a bunurilor
 StockOnReception=Creșterea stocurilor reale la validarea recepției
 StockOnReceptionOnClosing=Măriți stocurile reale atunci când recepția este închisă finalizată
-OrderStatusNotReadyToDispatch=Comanda nu mai este sau nu mai are  un statut care să permită dipecerizarea produselor în depozit
-StockDiffPhysicTeoric=Explicație pentru diferența dintre stocul fizic și virtual
-NoPredefinedProductToDispatch=Nu sunt produse predefinite pentru acest obiect. Deci, nici o dispecerizare  în stoc necesară.
-DispatchVerb=Dispecerizează
-StockLimitShort=Limita pentru alerta
-StockLimit=Stoc limită pentru alerta
-StockLimitDesc=(gol) înseamnă nici un avertisment. <br> 0 poate fi folosit pentru un avertisment imediat ce stocul este gol.
-PhysicalStock=Stocul fizic
-RealStock=Stoc Real
-RealStockDesc=Stocul fizic / real este stocul aflat în prezent în depozite.
+OrderStatusNotReadyToDispatch=Comanda nu mai este sau nu mai are un statut care să permită dipecerizarea produselor în depozit
+StockDiffPhysicTeoric=Explicație pentru diferența dintre stocul fizic și cel virtual
+NoPredefinedProductToDispatch=Nu sunt produse predefinite pentru acest obiect. Deci, nici o operaţiune de stoc nu este necesară.
+DispatchVerb=Expediere
+StockLimitShort=Limită de alertă
+StockLimit=Stoc limită de alertă
+StockLimitDesc=(gol) înseamnă nici un avertisment. <br> 0 poate fi folosit pentru un avertisment imediat ce stocul s-a epuizat.
+PhysicalStock=Stoc fizic
+RealStock=Stoc real
+RealStockDesc=Stocul fizic/real este stocul aflat în prezent în depozite.
 RealStockWillAutomaticallyWhen=Stocul real va fi modificat în conformitate cu această regulă (așa cum este definită în modulul Stoc):
-VirtualStock=Stoc Virtual
+VirtualStock=Stoc virtual
 VirtualStockAtDate=Stoc virtual la data
-VirtualStockAtDateDesc=Stoc virtual până când toate comenzile în așteptarea livrării care sunt planificate să fie efectuate înainte de termen vor fi finalizate 
+VirtualStockAtDateDesc=Stoc virtual până ce toate comenzile în așteptare care sunt planificate să fie procesate înainte de data aleasă vor fi terminate 
 VirtualStockDesc=Stocul virtual este stocul calculat disponibil odată ce toate acțiunile deschise/în așteptare (care afectează stocurile) sunt închise (comenzi de achiziție primite, comenzi de vânzare expediate, comenzi de fabricație produse etc.) 
+AtDate=La data de 
 IdWarehouse=ID depozit
 DescWareHouse=Descriere depozit
 LieuWareHouse=Localizare depozit
 WarehousesAndProducts=Depozite şi produse
-WarehousesAndProductsBatchDetail=Depozite și produse (cu detalii pe lot / serie)
-AverageUnitPricePMPShort=Valoric PMP
-AverageUnitPricePMPDesc=Prețul unitar mediu de intrare pe care a trebuit să-l plătim furnizorilor pentru a intra în stocul nostru - PUMP. 
+WarehousesAndProductsBatchDetail=Depozite și produse (cu detalii pe lot/serie)
+AverageUnitPricePMPShort=PMP
+AverageUnitPricePMPDesc=Prețul mediu de intrare pe care l-am cheltuit pentru a obține 1 unitate de produs în stoc.
 SellPriceMin=Preţ vânzare unitar
-EstimatedStockValueSellShort=Valoarea ieşire
-EstimatedStockValueSell=Valoarea ieşire
-EstimatedStockValueShort=Valoarea de intrare a stocului
-EstimatedStockValue=Valoarea de intrare a stocului PMP
+EstimatedStockValueSellShort=Valoare de ieşire
+EstimatedStockValueSell=Valoare de ieşire
+EstimatedStockValueShort=Valoarea de intrare în stoc
+EstimatedStockValue=Valoarea de intrare în stoc
 DeleteAWarehouse=Şterge un depozit
-ConfirmDeleteWarehouse=Sigur doriți să ștergeți depozitul <b> %s </b>?
-PersonalStock=Stoc  Personal %s
+ConfirmDeleteWarehouse=Sigur doriți să ștergeți depozitul <b>%s</b>?
+PersonalStock=Stoc personal %s
 ThisWarehouseIsPersonalStock=Acest depozit reprezinta stocul personal al lui  %s %s
-SelectWarehouseForStockDecrease=Alege depozitul  pentru scăderea stocului
-SelectWarehouseForStockIncrease=Alege depozitul  pentru creşterea stocului
+SelectWarehouseForStockDecrease=Alege depozitul pentru scăderea stocului
+SelectWarehouseForStockIncrease=Alege depozitul pentru creşterea de stoc
 NoStockAction=Nicio actiune pe stoc
-DesiredStock=Stocul dorit
+DesiredStock=Stoc dorit
 DesiredStockDesc=Această cantitate stoc va fi valoarea utilizată pentru a umple stocul prin reaprovizionare.
-StockToBuy=De  comandat
+StockToBuy=De comandat
 Replenishment=Reaprovizionare
-ReplenishmentOrders=Comenzi reaprovizionare
+ReplenishmentOrders=Comenzi de reaprovizionare
 VirtualDiffersFromPhysical=În funcție de opţiunile de creștere/reducere de stoc, stocul fizic și stocul virtual(stoc fizic + comenzi deschise) pot diferi
 UseRealStockByDefault=Utilizează stocul real, în loc de stocul virtual, pentru caracteristica de reaprovizionare
-ReplenishmentCalculation=Cantitatea comandată va fi (cantitatea dorită - stocul real) în loc de (cantitatea dorită - stocul virtual) 
-UseVirtualStock=Utilizeaza Stoc Virtual 
-UsePhysicalStock=Utilizeaza Stoc Fizic
-CurentSelectionMode=Mod selectie curent
-CurentlyUsingVirtualStock=Stoc Virtual 
-CurentlyUsingPhysicalStock=Stoc  Fizic
+ReplenishmentCalculation=Cantitatea comandată va fi (cantitatea dorită - stocul real) în loc de (cantitatea dorită - stocul virtual)
+UseVirtualStock=Utilizează Stoc virtual 
+UsePhysicalStock=Utilizează Stoc fizic
+CurentSelectionMode=Mod de selecţie curent
+CurentlyUsingVirtualStock=Stoc virtual 
+CurentlyUsingPhysicalStock=Stoc fizic
 RuleForStockReplenishment=Reguli pentru reaprovizionarea stocului
 SelectProductWithNotNullQty=Selectați cel puțin un produs cu cantitate nenulă și un furnizor
-AlertOnly= Numai Alerte
+AlertOnly= Doar alerte
 IncludeProductWithUndefinedAlerts = Includeți și stocuri negative pentru produsele fără cantitatea dorită definită, pentru a le restabili la 0
-WarehouseForStockDecrease=Depozitul <b>%s</b> va fi utilizat pentru scăderea stocului
-WarehouseForStockIncrease=Depozitul <b>%s</b> va fi utilizat pentru creşterea stocului
+WarehouseForStockDecrease=Depozitul <b>%s</b> va fi utilizat pentru scăderea de stoc
+WarehouseForStockIncrease=Depozitul <b>%s</b> va fi utilizat pentru creşterea de stoc
 ForThisWarehouse=Pentru acest depozit
-ReplenishmentStatusDesc=Aceasta este o listă a tuturor produselor cu un stoc mai mic decât cel dorit (sau mai mic decât valoarea de alertă dacă este bifat checkbox-ul "numai alertă"). Dacă utilizați checkbox-ul, puteți crea comenzi de achiziție pentru a umple diferența.
+ReplenishmentStatusDesc=Aceasta este o listă a tuturor produselor cu un stoc mai mic decât cel dorit (sau mai mic decât valoarea de alertă dacă este bifat checkbox-ul "doar alertă"). Dacă utilizați checkbox-ul, puteți crea comenzi de achiziție pentru reaprovizionare diferență.
 ReplenishmentStatusDescPerWarehouse=Dacă doriți o reaprovizionare bazată pe cantitatea dorită definită pe depozit, trebuie să adăugați un filtru pe depozit.
-ReplenishmentOrdersDesc=Aceasta este o listă a tuturor comenzilor de cumpărare deschise, inclusiv a produselor predefinite. Numai comenzile deschise cu produse predefinite, deci comenzile care pot afecta stocurile, sunt vizibile aici.
+ReplenishmentOrdersDesc=Aceasta este o listă a tuturor comenzilor de achiziţie deschise, inclusiv a produselor predefinite. Numai comenzile deschise cu produse predefinite, deci comenzile care pot afecta stocurile, sunt vizibile aici.
 Replenishments=Reaprovizionări
 NbOfProductBeforePeriod=Cantitatea de produs %s în stoc înainte de perioada selectată  (< %s)
 NbOfProductAfterPeriod=Cantitatea de produs %s în stoc după perioada selectată (> %s)
 MassMovement=Mişcare în masă
-SelectProductInAndOutWareHouse=Selectați un depozit sursă și un depozit destinaţie, un produs și o cantitate, apoi faceți clic pe "%s". Odată făcut acest lucru pentru toate mișcările necesare, faceți clic pe "%s".
-RecordMovement=Transferul înregistrărilor
+SelectProductInAndOutWareHouse=Selectează un depozit sursă și un depozit țintă, un produs și o cantitate, apoi fă clic pe "%s". După ce ai făcut acest lucru pentru toate mișcările necesare, fă clic pe "%s".
+RecordMovement=Înregistreză transfer
 ReceivingForSameOrder=Recepţii pentru această comandă
-StockMovementRecorded=Mişcări stoc înregistrate
+StockMovementRecorded=Mişcări de stoc înregistrate
 RuleForStockAvailability=Reguli pentru cereri stoc
-StockMustBeEnoughForInvoice=Nivelul stocului trebuie să fie suficient pentru a adăuga produsul / serviciul la factură (verificarea se face pe baza stocului real atunci când se adaugă o linie în factură, indiferent de regula pentru schimbarea automată a acțiunilor)
-StockMustBeEnoughForOrder=Nivelul stocului trebuie să fie suficient pentru a adăuga produsul / serviciul la comandă (verificarea se face pe stocul real actual atunci când se adaugă o linie în ordine indiferent de regula pentru schimbarea automată a stocului)
-StockMustBeEnoughForShipment= Nivelul stocului trebuie să fie suficient pentru a adăuga produsul / serviciul la expediere (verificarea se face pe stocul real actual atunci când se adaugă o linie în transport, indiferent de regula pentru schimbarea automată a stocului)
-MovementLabel=Eticheta transferului
-TypeMovement=Tip de mișcare
+StockMustBeEnoughForInvoice=Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul în factură (verificarea se face pe baza stocului real atunci când se adaugă o linie în factură, indiferent de regula de schimbare automată)
+StockMustBeEnoughForOrder=Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul la comandă (verificarea se face pe stocul real actual atunci când se adaugă o linie în ordine indiferent de regula pentru schimbarea automată a stocului)
+StockMustBeEnoughForShipment= Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul la livrare (verificarea se face pe stocul real actual atunci când se adaugă o linie în livrare, indiferent de regula de schimbare automată a stocului)
+MovementLabel=Eticheta mişcării de stoc
+TypeMovement=Direcţia mişcării
 DateMovement=Data mișcării
-InventoryCode=Codul de inventar sau transfer
-IsInPackage=Continute in pachet
+InventoryCode=Cod de inventar sau transfer
+IsInPackage=Conţinute în pachet
 WarehouseAllowNegativeTransfer=Stocul poate fi negativ
-qtyToTranferIsNotEnough=Nu aveți suficiente stocuri din depozitul sursă și configurația dvs. nu permite stocuri negative.
+qtyToTranferIsNotEnough=Nu ai stoc suficient în depozitul sursă și configurația ta nu permite stocuri negative.
 qtyToTranferLotIsNotEnough=Nu aveți suficient stoc, pentru acest număr de lot, din depozitul sursă, iar sistemul este configurat să nu permită stocuri negative (cantitatea de produs '%s' din lotul '%s' este %s în depozitul '%s').
 ShowWarehouse=Arată depozit
-MovementCorrectStock=Corecția stocului pentru produsul%s
-MovementTransferStock=Transfer stoc al produsului %s in alt depozit
+MovementCorrectStock=Corecție stoc pentru produsul %s
+MovementTransferStock=Transfer de stoc pentru produsul %s în alt depozit
 InventoryCodeShort=Cod de facturare/mișcare
 NoPendingReceptionOnSupplierOrder=Nu există recepție în așteptare din cauza comenzii de achiziție deschise
-ThisSerialAlreadyExistWithDifferentDate=Acest lot / număr serial (<strong> %s </strong>) există deja, dar cu o dată diferită  de consum sau de vânzare (găsită <strong> %s </strong> dar introduceți <strong> %s </strong>).
+ThisSerialAlreadyExistWithDifferentDate=Acest număr de lot/serie (<strong> %s </strong>) există deja, dar cu o dată diferită  de consum sau de vânzare (găsit ca <strong> %s </strong> dar poţi introduce <strong> %s</strong>).
 OpenAll=Deschis pentru toate acțiunile
-OpenInternal=Deschideți numai pentru acțiuni interne
+OpenInternal=Deschis numai pentru acțiuni interne
 UseDispatchStatus=Utilizați un stadiu de expediere (aprobați/refuzați) pentru linii de produse la recepția comenzii de achiziție
-OptionMULTIPRICESIsOn=Opțiunea "mai multe prețuri pe segment" este activată. Înseamnă că un produs are mai multe prețuri de vânzare, astfel încât valoarea pentru vânzare nu poate fi calculată
-ProductStockWarehouseCreated=Limita de stoc pentru alertă și stocul optim dorit creată corect
-ProductStockWarehouseUpdated=Limita de stoc pentru alertă și stoc optim optim dorit actualizată corect
-ProductStockWarehouseDeleted=Limita de stoc pentru alertă și stocul optim dorit ștearsă corect
-AddNewProductStockWarehouse=Stabiliți o nouă limită pentru stocul optim dorit și de alertă 
-AddStockLocationLine=Reduceți cantitatea, apoi faceți clic pentru a adăuga un alt depozit pentru acest produs
+OptionMULTIPRICESIsOn=Opțiunea "mai multe prețuri pe segment" este activată. Înseamnă că un produs are mai multe prețuri de vânzare, astfel încât valoarea preţului de vânzare nu poate fi calculată
+ProductStockWarehouseCreated=Limită de stoc pentru alertă și stocul optim dorit au fost create corect.
+ProductStockWarehouseUpdated=Limită de stoc pentru alertă și stocul optim dorit au fost actualizate corect.
+ProductStockWarehouseDeleted=Limita de stoc pentru alertă și stocul optim dorit au fost șterse corect
+AddNewProductStockWarehouse=Setează o nouă limită de stoc pentru alertă şi stocul optim dorit
+AddStockLocationLine=Redu cantitatea, apoi fă clic pentru a adăuga un alt depozit pentru acest produs
 InventoryDate=Data inventarului
 NewInventory=Inventar nou
-inventorySetup = Organizarea inventarului
-inventoryCreatePermission=Creați un inventar nou
-inventoryReadPermission=Vedeți inventarele
-inventoryWritePermission=Actualizați inventarele
-inventoryValidatePermission=Validați inventarul
+inventorySetup = Configurare Inventar
+inventoryCreatePermission=Crează un inventar nou
+inventoryReadPermission=Vede inventare
+inventoryWritePermission=Actualizare inventare
+inventoryValidatePermission=Validare inventar
+inventoryDeletePermission=Şterge inventar
 inventoryTitle=Inventar
-inventoryListTitle=Inventarele
+inventoryListTitle=Inventare
 inventoryListEmpty=Nu există inventar în curs
-inventoryCreateDelete=Creați/ștergeți inventarul
+inventoryCreateDelete=Creare/Ştergere inventar
 inventoryCreate=Crează nou
 inventoryEdit=Editare
 inventoryValidate=Validată
-inventoryDraft=În service
-inventorySelectWarehouse=Alegerea depozitului
-inventoryConfirmCreate=Crează
-inventoryOfWarehouse=Inventarul pentru depozit: %s
+inventoryDraft=În curs
+inventorySelectWarehouse=Alege depozitul
+inventoryConfirmCreate=Creare
+inventoryOfWarehouse=Inventar pentru depozitul: %s
 inventoryErrorQtyAdd=Eroare: o cantitate este mai mică decât zero
 inventoryMvtStock=Prin inventar
 inventoryWarningProductAlreadyExists=Acest produs este deja în listă
-SelectCategory=Categorie filtru
+SelectCategory=Filtru categorie
 SelectFournisseur=Filtru furnizor
 inventoryOnDate=Inventar
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT= Mișcările de stoc vor avea data inventarului (în loc de data validării inventarului)
-inventoryChangePMPPermission=Permiteți modificarea valorii PMP pentru un produs
-ColumnNewPMP=Nouă unitate PMP
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Mișcările de stoc vor avea data inventarierii (în loc de data validării inventarului)
+inventoryChangePMPPermission=Permite modificare valoare PMP pentru un produs
+ColumnNewPMP=PMP nou
 OnlyProdsInStock=Nu adăugați produsul fără stoc
 TheoricalQty=Cantitate teoretică
 TheoricalValue=Cantitate teoretică
-LastPA=Ultimul BP
-CurrentPA=BP Curent
+LastPA=Ultimul PA
+CurrentPA=PA curent
 RecordedQty=Cantitate înregistrată
 RealQty=Cantitate reală
 RealValue=Valoare reală
-RegulatedQty=Cantitate reglementată
+RegulatedQty=Cantitate reglată
 AddInventoryProduct=Adăugați produsul în inventar
 AddProduct=Adaugă
-ApplyPMP=Aplicați PMP
+ApplyPMP=Aplică PMP
 FlushInventory=Goliţi inventarul
 ConfirmFlushInventory=Confirmați această acțiune?
-InventoryFlushed=Inventarul golit
-ExitEditMode=Ieșiți din ediție
+InventoryFlushed=Inventarul a fost golit
+ExitEditMode=Ieșire din editare
 inventoryDeleteLine=Şterge linie
 RegulateStock=Reglează stocul
-ListInventory=Lista
-StockSupportServices=Gestiunea stocurilor suportă Servicii
-StockSupportServicesDesc=În mod implicit, puteți stoca numai produse de tipul "produs". Puteți, de asemenea, să stocați un produs de tip "serviciu", dacă sunt activate atât funcția Servicii, cât și această opțiune.
-ReceiveProducts=Primiți articole
-StockIncreaseAfterCorrectTransfer=Măriți prin corecție/transfer
-StockDecreaseAfterCorrectTransfer=Scădeți prin corecție/transfer
-StockIncrease=Creșterea stocului
-StockDecrease=Scăderea stocului
+ListInventory=Listă
+StockSupportServices=Gestiunea stocurilor suportă şi Servicii
+StockSupportServicesDesc=În mod implicit, poți stoca numai produse de tipul "produs". Puteți, de asemenea, să stocați un produs de tip "serviciu", dacă este activat modulul Servicii, cât și această opțiune.
+ReceiveProducts=Recepţie produse
+StockIncreaseAfterCorrectTransfer=Măreşte prin corecție/transfer
+StockDecreaseAfterCorrectTransfer=Scade prin corecție/transfer
+StockIncrease=Creștere stoc
+StockDecrease=Scădere stoc
 InventoryForASpecificWarehouse=Inventar pentru un depozit specific
 InventoryForASpecificProduct=Inventar pentru un produs specific
 StockIsRequiredToChooseWhichLotToUse=Stocul trebuie specificat pentru a putea alege lotul care va fi folosit
 ForceTo=Forţează la
 AlwaysShowFullArbo=Afișează arborele complet al depozitului pe fereastra popup a legăturilor de depozit (Avertisment: Aceasta poate scădea dramatic performanțele sistemului)
 StockAtDatePastDesc=Poți vedea aici stocul (stoc real) la o dată prestabilită în trecut 
-StockAtDateFutureDesc=Puteți vizualiza aici stocul (stoc virtual) la o dată dată în viitor
+StockAtDateFutureDesc=Poţi vizualiza aici stocul (stocul virtual) la o dată specificată în viitor
 CurrentStock=Stoc curent
 InventoryRealQtyHelp=Setați valoarea la 0 pentru a reseta câmpul cantitate<br> Lăsaţi necompletat, sau eliminaţi linia, pentru a păstra neschimbat 
-UpdateByScaning=Actualizare prin scanare
+UpdateByScaning=Completează catitatea reală prin scanare
 UpdateByScaningProductBarcode=Actualizare prin scanare (cod de bare produs)
 UpdateByScaningLot=Actualizare prin scanare (cod de bare lot|serie)
 DisableStockChangeOfSubProduct= Dezactivare modificare de stoc pentru toate subprodusele acestui kit în timpul acestei mișcări.
+ImportFromCSV=Import listă CSV cu mişcări
+ChooseFileToImport=Încărcați fișierul, apoi dați clic pe pictograma %s pentru a selecta fișierul ca sursă de import...
+SelectAStockMovementFileToImport=selectează un fişier cu mişcări de stoc pentru import
+InfoTemplateImport=Fișierul încărcat trebuie să aibă acest format (* sunt câmpuri obligatorii):<br> Depozit sursă* | Depozit țintă* | Produs* | Cantitate* | Număr lot/serie <br>Separatorul de caractere CSV trebuie să fie "<b>%s</b>"
+LabelOfInventoryMovemement=Inventar %s
+ReOpen=Redeschide
+ConfirmFinish=Confirmi închiderea inventarului? Aceasta va genera toate mișcările stocului pentru actualizare.
+ObjectNotFound=%s nu a fost găsit
+MakeMovementsAndClose=Generează mişcări şi închide
+AutofillWithExpected=Completează cantitatea reală cu cantitatea așteptată
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index e4051441e49..f2891790714 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -1,48 +1,49 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Furnizori
-SuppliersInvoice=Factura furnizorului
-ShowSupplierInvoice=Afișați factura furnizorului
+SuppliersInvoice=Factură furnizor
+SupplierInvoices=Facturi furnizori
+ShowSupplierInvoice=Afișați factura furnizor
 NewSupplier=Furnizor nou
 History=Istoric
-ListOfSuppliers=Lista furnizori
-ShowSupplier=Afișează furnizorul
+ListOfSuppliers=Listă furnizori
+ShowSupplier=Afișează furnizor
 OrderDate=Data comenzii
-BuyingPriceMin=Cel mai bun preț de cumpărare
-BuyingPriceMinShort=Cel mai bun preț de cumpărare
-TotalBuyingPriceMinShort=Total prețuri de cumpărare  subproduse
+BuyingPriceMin=Cel mai bun preț de achiziţie
+BuyingPriceMinShort=Cel mai bun preț de achiziţie
+TotalBuyingPriceMinShort=Total prețuri de achiziţie subproduse
 TotalSellingPriceMinShort=Totalul prețurilor de vânzare ale subproduselor
 SomeSubProductHaveNoPrices=Unele sub-produse nu au un preț definit
-AddSupplierPrice=Adăugați prețul de cumpărare
-ChangeSupplierPrice=Modificați prețul de achiziție
-SupplierPrices=Prețurile furnizorului
+AddSupplierPrice=Adăugare preț de achiziţie
+ChangeSupplierPrice=Modificare preț de achiziție
+SupplierPrices=Prețuri furnizor
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Această referință de furnizor este asociată deja cu un produs: %s
 NoRecordedSuppliers=Nu a fost înregistrat niciun furnizor
-SupplierPayment=Plata furnizorului
-SuppliersArea=Suprafața vânzătorului
+SupplierPayment=Plată furnizor
+SuppliersArea=Furnizor
 RefSupplierShort=Ref. furnizor
 Availability=Disponibilitate
 ExportDataset_fournisseur_1=Facturi furnizor și detalii factură
-ExportDataset_fournisseur_2=Facturi și plăți furnizorilor
-ExportDataset_fournisseur_3=Comenzile de cumpărare și detaliile comenzii
-ApproveThisOrder=Aprobă  această comandă
-ConfirmApproveThisOrder=Sigur doriți să aprobați comanda <b> %s </b>?
-DenyingThisOrder=Refuză aceasta comanda
-ConfirmDenyingThisOrder=Sigur doriți să refuzați această comandă <b> %s </b>?
-ConfirmCancelThisOrder=Sigur doriți să anulați această comandă <b> %s </b>?
-AddSupplierOrder=Creați comanda de aprovizionare
-AddSupplierInvoice=Creați factura furnizorilor
-ListOfSupplierProductForSupplier=Lista de produse și prețuri pentru vânzător <b> %s </b>
-SentToSuppliers=Trimite furnizorilor
-ListOfSupplierOrders=Lista comenzilor de achiziție
-MenuOrdersSupplierToBill=Comenzi de achiziție pentru facturare
-NbDaysToDelivery=întârziere de livrare (zile)
+ExportDataset_fournisseur_2=Facturi și plăți furnizori
+ExportDataset_fournisseur_3=Comenzi de achiziţie și detalii comenzi
+ApproveThisOrder=Aprobă această comandă
+ConfirmApproveThisOrder=Sigur doriți să aprobați comanda <b>%s</b>?
+DenyingThisOrder=Refuză această comandă
+ConfirmDenyingThisOrder=Sigur doriți să refuzați această comandă <b>%s</b>?
+ConfirmCancelThisOrder=Sigur doriți să anulați această comandă <b>%s</b>?
+AddSupplierOrder=Creare comandă de achiziţie
+AddSupplierInvoice=Creare factură furnizor
+ListOfSupplierProductForSupplier=Listă de produse și prețuri pentru furnizor <b>%s</b>
+SentToSuppliers=Trimite la furnizori
+ListOfSupplierOrders=Listă comenzi de achiziție
+MenuOrdersSupplierToBill=Comenzi de achiziție de facturat
+NbDaysToDelivery=Întârziere livrare (zile)
 DescNbDaysToDelivery=Cea mai lungă întârziere de livrare a produselor din această comandă
-SupplierReputation=Reputația furnizorului
+SupplierReputation=Reputație furnizor
 ReferenceReputation=Reputație de referință
 DoNotOrderThisProductToThisSupplier=Nu comanda
 NotTheGoodQualitySupplier=Calitate scăzută
-ReputationForThisProduct=Reputatie
+ReputationForThisProduct=Reputaţie
 BuyerName=Numele cumpărătorului
-AllProductServicePrices=Toate preturile produselor / serviciilor
+AllProductServicePrices=Toate preţurile produselor/serviciilor
 AllProductReferencesOfSupplier=Toate referinţele furnizorului
-BuyingPriceNumShort=Prețurile furnizorului
+BuyingPriceNumShort=Prețuri furnizor
diff --git a/htdocs/langs/ro_RO/ticket.lang b/htdocs/langs/ro_RO/ticket.lang
index 70ee1b31ebd..ba08e876e88 100644
--- a/htdocs/langs/ro_RO/ticket.lang
+++ b/htdocs/langs/ro_RO/ticket.lang
@@ -18,14 +18,14 @@
 # Generic
 #
 
-Module56000Name=Tichete
-Module56000Desc=Sistem de tichete pentru gestionarea problemelor sau a cererilor
+Module56000Name=Tichete de suport
+Module56000Desc=Sistem de tichete pentru gestionarea problemelor sau a cererilor, suport şi asistenţă tehnică
 
-Permission56001=Vedeți tichetele
+Permission56001=Vedeți tichetele de suport
 Permission56002=Modifică tichete
 Permission56003=Șterge tichete
 Permission56004=Gestionați tichetele
-Permission56005=Vedeți tichetele tuturor terților (nu sunt eficiente pentru utilizatorii externi, întotdeauna se limitează la terțul de care depind)
+Permission56005=Vedeți tichetele tuturor terților (nu este efectiv pentru utilizatorii externi, întotdeauna se limitează la terțul de care depind)
 
 TicketDictType=Tipuri de tichete
 TicketDictCategory=Tichet - Grupuri
@@ -44,32 +44,34 @@ TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Mare
 TicketSeverityShortBLOCKING=Critic, blocant
 
-ErrorBadEmailAddress=Câmpul "%s" este incorect
+ErrorBadEmailAddress=Câmpul '%s' este incorect
 MenuTicketMyAssign=Tichetele mele
 MenuTicketMyAssignNonClosed=Tichetele mele deschise
 MenuListNonClosed=Tichete deschise
 
 TypeContact_ticket_internal_CONTRIBUTOR=Contributor
 TypeContact_ticket_internal_SUPPORTTEC=Utilizator atribuit
-TypeContact_ticket_external_SUPPORTCLI=Urmărirea contactului/incidentului cu clientul
-TypeContact_ticket_external_CONTRIBUTOR=Contribuitor extern
+TypeContact_ticket_external_SUPPORTCLI=Contact client urmărire incidente
+TypeContact_ticket_external_CONTRIBUTOR=Contributor extern
 
-OriginEmail=Sursa emailului
+OriginEmail=Email sursă
 Notify_TICKET_SENTBYMAIL=Trimite mesaj tichet pe email
 
 # Status
 Read=Citit
 Assigned=Atribuit
-InProgress=In progres
+InProgress=În curs
 NeedMoreInformation=În aşteptarea de informaţii
-Answered=Răspuns
-Waiting=Aşteptare
+Answered=S-a răspuns
+Waiting=În aşteptare
 Closed=Închis
 Deleted=Șters
 
 # Dict
 Type=Tip
 Severity=Gravitate
+TicketGroupIsPublic=Grupul este public
+TicketGroupIsPublicDesc=Dacă un grup de tichete este public, acesta va fi vizibil în formular la crearea unui tichet din interfața publică
 
 # Email templates
 MailToSendTicketMessage=Pentru a trimite emailuri din mesajul tichetului
@@ -77,70 +79,70 @@ MailToSendTicketMessage=Pentru a trimite emailuri din mesajul tichetului
 #
 # Admin page
 #
-TicketSetup=Setări modulului Tichete
+TicketSetup=Configurare modul Tichete de suport
 TicketSettings=Configurări
 TicketSetupPage=
-TicketPublicAccess=O interfață publică care nu necesită identificare este disponibilă la următorul URL
+TicketPublicAccess=O interfață publică care nu necesită identificarea este disponibilă la următorul URL
 TicketSetupDictionaries=Tipul tichetului, severitatea și codurile analitice sunt configurabile din dicționare
-TicketParamModule=Setări modulului Variabile
+TicketParamModule=Setări variabile modul
 TicketParamMail=Setări email
-TicketEmailNotificationFrom=Notificare de email de la
-TicketEmailNotificationFromHelp=Folosit în mesajul tichetului de răspuns prin exemplu
-TicketEmailNotificationTo=Notificările trimise prin email la
-TicketEmailNotificationToHelp=Trimiteți notificări prin email la această adresă.
+TicketEmailNotificationFrom=Notificare email de la
+TicketEmailNotificationFromHelp=Folosit în mesajul tichetului de răspuns de exemplu
+TicketEmailNotificationTo=Notificările trimise pe email la
+TicketEmailNotificationToHelp=Trimite notificări prin email la această adresă.
 TicketNewEmailBodyLabel=Mesaj text trimis după crearea unui tichet
 TicketNewEmailBodyHelp=Textul specificat aici va fi inserat în emailul care confirmă crearea unui nou tichet din interfața publică. Informațiile privind consultarea tichetului sunt adăugate automat.
-TicketParamPublicInterface=Setări interfeței publice
+TicketParamPublicInterface=Setări interfață publică
 TicketsEmailMustExist=Solicitați o adresă de email existentă pentru a crea un tichet
-TicketsEmailMustExistHelp=În interfața publică, adresa de email ar trebui deja completată în baza de date pentru a crea un tichet nou.
-PublicInterface=Interfața publică
+TicketsEmailMustExistHelp=În interfața publică, adresa de email ar trebui să fie deja completată în baza de date pentru a crea un tichet nou.
+PublicInterface=Interfață publică
 TicketUrlPublicInterfaceLabelAdmin=URL alternativ pentru interfața publică
-TicketUrlPublicInterfaceHelpAdmin=Este posibil să definiți un alias serverului web și astfel să puneți la dispoziție interfața publică cu o alt URL (serverul trebuie să acționeze ca proxy pe acest nou URL)
-TicketPublicInterfaceTextHomeLabelAdmin=Textul interfeței publice de bun venit 
-TicketPublicInterfaceTextHome=Puteți crea un tichet de asistență sau vizualiza unul existent din tichetul de identificare.
-TicketPublicInterfaceTextHomeHelpAdmin=Textul definit aici va apărea pe pagina de pornire a interfeței publice.
-TicketPublicInterfaceTopicLabelAdmin=Titlul interfeței
-TicketPublicInterfaceTopicHelp=Acest text va apărea ca titlu al interfeței publice.
+TicketUrlPublicInterfaceHelpAdmin=Este posibil să definiți un alias pentru serverul web și astfel să puneți la dispoziție interfața publică cu un alt URL (serverul trebuie să acționeze ca proxy pe acest nou URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Textul de bun venit din interfeța publică
+TicketPublicInterfaceTextHome=Puteți crea un tichet de asistență sau vizualiza unul existent pe baza identificatorului de urmărire.
+TicketPublicInterfaceTextHomeHelpAdmin=Textul definit aici va apărea pe pagina de start a interfeței publice.
+TicketPublicInterfaceTopicLabelAdmin=Titlu interfață
+TicketPublicInterfaceTopicHelp=Acest text va apărea ca titlu în interfaţai publică.
 TicketPublicInterfaceTextHelpMessageLabelAdmin=Text de ajutor la intrarea în mesaj
 TicketPublicInterfaceTextHelpMessageHelpAdmin=Acest text va apărea deasupra zonei de intrare a mesajului utilizatorului.
-ExtraFieldsTicket=Extra atribute
-TicketCkEditorEmailNotActivated=Editorul HTML nu este activat. Puneți conținutul FCKEDITOR_ENABLE_MAIL la 1 pentru a-l obține.
-TicketsDisableEmail=Nu trimiteți emailuri pentru crearea tichetelor sau înregistrarea mesajelor
-TicketsDisableEmailHelp=Implicit, emailurile sunt trimise atunci când se creează noi tichete sau mesaje. Activați această opțiune pentru a dezactiva * toate * notificările prin email
+ExtraFieldsTicket=Atribute suplimentare
+TicketCkEditorEmailNotActivated=Editorul HTML nu este activat. Setaţi constanta FCKEDITOR_ENABLE_MAIL la valoarea 1 pentru a-l activa.
+TicketsDisableEmail=Nu trimite email-uri pentru crearea tichetelor sau înregistrarea mesajelor
+TicketsDisableEmailHelp=Implicit, email-urile sunt trimise atunci când se creează tichete sau mesaje noi. Activați această opțiune pentru a dezactiva *toate* notificările prin email
 TicketsLogEnableEmail=Activați jurnalul prin email
-TicketsLogEnableEmailHelp=La fiecare schimbare, se va trimite un email ** la fiecare contact ** asociat cu tichetul.
+TicketsLogEnableEmailHelp=La fiecare schimbare, se va trimite un email **la fiecare contact** asociat cu tichetul.
 TicketParams=Parametri
 TicketsShowModuleLogo=Afișați sigla modulului în interfața publică
-TicketsShowModuleLogoHelp=Activați această opțiune pentru a ascunde modulul de logo-uri în paginile interfeței publice
+TicketsShowModuleLogoHelp=Activați această opțiune pentru a ascunde sigla modulului în paginile interfeței publice
 TicketsShowCompanyLogo=Afișați logo-ul companiei în interfața publică
 TicketsShowCompanyLogoHelp=Activați această opțiune pentru a ascunde sigla companiei principale în paginile interfeței publice
-TicketsEmailAlsoSendToMainAddress=Trimiteți, de asemenea, o notificare adresei principale de email
-TicketsEmailAlsoSendToMainAddressHelp=Activați această opțiune pentru a trimite un email la adresa "Email de notificare de la" (consultați configurarea de mai jos)
-TicketsLimitViewAssignedOnly=Restricționați afișarea la tichetele alocate utilizatorului actual (nu este eficient pentru utilizatorii externi, întotdeauna să fie limitat la terțul de care depind)
-TicketsLimitViewAssignedOnlyHelp=Numai biletele alocate utilizatorului actual vor fi vizibile. Nu se aplică unui utilizator cu drepturi de gestionare a biletelor.
-TicketsActivatePublicInterface=Activați interfața publică
-TicketsActivatePublicInterfaceHelp=Interfața publică permite vizitatorilor să creeze bilete.
-TicketsAutoAssignTicket=Desemnați automat utilizatorul care a creat tichetul
+TicketsEmailAlsoSendToMainAddress=De asemenea, trimite o notificare la adresa principală de email
+TicketsEmailAlsoSendToMainAddressHelp=Activați această opțiune pentru a trimite, de asemenea, un email la adresa definită în setarea "%s" (consultă fila "%s")
+TicketsLimitViewAssignedOnly=Restricționează afișarea la tichetele alocate utilizatorului actual (nu este eficient pentru utilizatorii externi, întotdeauna să fie limitat la terțul de care depind)
+TicketsLimitViewAssignedOnlyHelp=Numai tichetele alocate utilizatorului curent vor fi vizibile. Nu se aplică unui utilizator cu drepturi de gestionare a tichetelor.
+TicketsActivatePublicInterface=Activare interfață publică
+TicketsActivatePublicInterfaceHelp=Interfața publică permite vizitatorilor să creeze tichete.
+TicketsAutoAssignTicket=Atribuiţi automat utilizatorul care a creat tichetul
 TicketsAutoAssignTicketHelp=La crearea unui tichet, utilizatorul poate fi automat alocat tichetului.
 TicketNumberingModules=Modul de numerotare a tichetelor
 TicketsModelModule=Şabloane documente pentru tichete
 TicketNotifyTiersAtCreation=Notificați terțul la creare
 TicketsDisableCustomerEmail=Dezactivați întotdeauna email-urile atunci când un tichet este creat din interfața publică 
-TicketsPublicNotificationNewMessage=Trimite email(uri) când un mesaj nou este adăugat
+TicketsPublicNotificationNewMessage=Trimite email(uri) atunci când un nou mesaj/comentariu este adăugat la un tichet
 TicketsPublicNotificationNewMessageHelp=Trimiteți email(uri) când un nou mesaj este adăugat din interfața publică (utilizatorului atribuit sau adreselor de notificări la (actualizare) și/sau email-ului de notificări către)
-TicketPublicNotificationNewMessageDefaultEmail=Notificări email  către (actualizare)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Trimiteți email-urile referitoare la noile notificări la această adresă dacă tichetul nu are un utilizator alocat sau dacă utilizatorul nu are e-mail.
+TicketPublicNotificationNewMessageDefaultEmail=Notificări email către (actualizare)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Trimite un email la această adresă pentru fiecare notificare de mesaj nou dacă tichetul nu are un utilizator atribuit sau dacă utilizatorul nu are niciun email cunoscut.
 #
 # Index & list page
 #
-TicketsIndex=Tichete
-TicketList=Lista de tichete
+TicketsIndex=Tichete de suport
+TicketList=Listă de tichete
 TicketAssignedToMeInfos=Această pagină afișează lista de tichete creată de utilizatorul curent sau atribuită acestuia
 NoTicketsFound=Nu a fost găsit un tichet
-NoUnreadTicketsFound=Nici un tichet necitit
+NoUnreadTicketsFound=Niciun tichet necitit
 TicketViewAllTickets=Vezi toate tichetele
-TicketViewNonClosedOnly=Vedeți numai tichetele deschise
-TicketStatByStatus=Tichete după statut
+TicketViewNonClosedOnly=Afişează numai tichetele deschise
+TicketStatByStatus=Tichete după status
 OrderByDateAsc=Sortare după dată ascendent
 OrderByDateDesc=Sortare după dată descendent
 ShowAsConversation=Afişare ca listă de conversaţie
@@ -150,31 +152,31 @@ MessageListViewType=Afişare listă ca tabel
 # Ticket card
 #
 Ticket=Tichet
-TicketCard=Card tichet
-CreateTicket=Creează un tichet
-EditTicket=Editați tichetul
-TicketsManagement=Managementul tichetelor
+TicketCard=Fişă tichet
+CreateTicket=Creare tichet
+EditTicket=Editare tichet
+TicketsManagement=Managementul tichetelor de suport tehnic incidente 
 CreatedBy=Creat de
 NewTicket=Tichet nou
-SubjectAnswerToTicket=Tichet de răspuns
+SubjectAnswerToTicket=Răspuns la tichet
 TicketTypeRequest=Tip de solicitare
 TicketCategory=Grup
-SeeTicket=Vedeți tichetul
+SeeTicket=Vezi tichetul
 TicketMarkedAsRead=Tichetul a fost marcat ca citit
 TicketReadOn=Citește mai departe
-TicketCloseOn=Dată închidere
-MarkAsRead=Marcați tichetul ca citit
-TicketHistory=Istoricul tichetului
-AssignUser=Alocați utilizatorului
+TicketCloseOn=Dată de închidere
+MarkAsRead=Marchează tichetul ca citit
+TicketHistory=Istoric tichet
+AssignUser=Atribuire la utilizator
 TicketAssigned=Tichetul este acum atribuit
-TicketChangeType=Modificați tipul
-TicketChangeCategory=Modificați codul analitic
-TicketChangeSeverity=Schimbați severitatea
+TicketChangeType=Modificare tip
+TicketChangeCategory=Modificare cod analitic
+TicketChangeSeverity=Modificare severitate
 TicketAddMessage=Adaugă un mesaj
 AddMessage=Adaugă un mesaj
 MessageSuccessfullyAdded=Tichet adăugat
 TicketMessageSuccessfullyAdded=Mesaj adăugat cu succes
-TicketMessagesList=Lista de mesaje
+TicketMessagesList=Listă de mesaje
 NoMsgForThisTicket=Niciun mesaj pentru acest tichet
 Properties=Clasificare
 LatestNewTickets=Ultimele %s cele mai noi tichete (necitite)
@@ -182,99 +184,99 @@ TicketSeverity=Gravitate
 ShowTicket=Vedeți tichetul
 RelatedTickets=Tichete conexe
 TicketAddIntervention=Crează intervenţie
-CloseTicket=Închideți tichetul
-CloseATicket=Închideți un tichet
+CloseTicket=Închide tichet
+CloseATicket=Închide un tichet
 ConfirmCloseAticket=Confirmați închiderea tichetului
-ConfirmDeleteTicket=Va rog confirmați ștergerea tichetului
-TicketDeletedSuccess=Tichet șters cu succes
+ConfirmDeleteTicket=Confirmați ștergerea tichetului
+TicketDeletedSuccess=Tichet a fost șters cu succes
 TicketMarkedAsClosed=Tichet marcat ca închis
 TicketDurationAuto=Durata calculată
-TicketDurationAutoInfos=Durata calculată automat de la intervenția asociată
+TicketDurationAutoInfos=Durata calculată automat din intervenția asociată
 TicketUpdated=Tichetul a fost actualizat
-SendMessageByEmail=Trimiteți un mesaj prin email
+SendMessageByEmail=Trimite un mesaj pe email
 TicketNewMessage=Mesaj nou
-ErrorMailRecipientIsEmptyForSendTicketMessage=Destinatarul este gol. Nu trimiteți email
-TicketGoIntoContactTab=Accesați fila "Persoane de contact" pentru a le selecta
+ErrorMailRecipientIsEmptyForSendTicketMessage=Destinatarul este gol. Nu se trimite email
+TicketGoIntoContactTab=Accesează fila "Contacte" pentru a le selecta
 TicketMessageMailIntro=Introducere
 TicketMessageMailIntroHelp=Acest text este adăugat numai la începutul emailului și nu va fi salvat.
 TicketMessageMailIntroLabelAdmin=Introducere în mesaj când trimiteți un email
-TicketMessageMailIntroText=Bună ziua, <br> Un nou răspuns a fost trimis pe un tichet pe care îl contactați. Iată mesajul: <br>
+TicketMessageMailIntroText=Salut, <br> Un nou răspuns a fost trimis pe tichetul pe care l-ai deschis. Iată mesajul: <br>
 TicketMessageMailIntroHelpAdmin=Acest text va fi inserat înaintea textului de răspuns la tichet.
 TicketMessageMailSignature=Semnătură
 TicketMessageMailSignatureHelp=Acest text este adăugat numai la sfârșitul emailului și nu va fi salvat.
-TicketMessageMailSignatureText=<p>Cu stimă, </p> <p> - </p>
+TicketMessageMailSignatureText=<p>Cu stimă, </p> <p>--</p>
 TicketMessageMailSignatureLabelAdmin=Semnătura emailului de răspuns
 TicketMessageMailSignatureHelpAdmin=Acest text va fi inserat după mesajul de răspuns.
-TicketMessageHelp=Numai acest text va fi salvat în lista de mesaje de pe cardul de tichete.
+TicketMessageHelp=Numai acest text va fi salvat în lista de mesaje de pe fişa tichetului.
 TicketMessageSubstitutionReplacedByGenericValues=Variabilele de substituție sunt înlocuite cu valori generice.
 TimeElapsedSince=Timpul trecut de atunci
 TicketTimeToRead=Timpul trecut înainte de citire
-TicketContacts=Tichet de contact
+TicketContacts=Contacte tichet
 TicketDocumentsLinked=Documente legate de tichet
 ConfirmReOpenTicket=Confirmați redeschiderea acestui tichet?
 TicketMessageMailIntroAutoNewPublicMessage=Un nou mesaj a fost postat pe tichet cu subiectul %s:
 TicketAssignedToYou=Tichet atribuit
-TicketAssignedEmailBody=Ați fost atribuit tichetului # %s de către %s
+TicketAssignedEmailBody=Ai fost atribuit tichetului # %s de către %s
 MarkMessageAsPrivate=Marcați mesajul ca privat
 TicketMessagePrivateHelp=Acest mesaj nu va fi afișat utilizatorilor externi
 TicketEmailOriginIssuer=Emitent la originea tichetelor
 InitialMessage=Mesaj inițial
-LinkToAContract=Legătura la un contract
+LinkToAContract=Asociere la un contract
 TicketPleaseSelectAContract=Selectați un contract
 UnableToCreateInterIfNoSocid=Nu se poate crea o intervenție atunci când nu este definit niciun terț
 TicketMailExchanges=Schimburi de corespondență
-TicketInitialMessageModified=Mesajul inițial modificat
-TicketMessageSuccesfullyUpdated=Mesaj actualizat cu succes
+TicketInitialMessageModified=Mesajul inițial a fost modificat
+TicketMessageSuccesfullyUpdated=Mesajul a fost actualizat cu succes
 TicketChangeStatus=Modifică starea
 TicketConfirmChangeStatus=Confirmați modificarea stării: %s?
-TicketLogStatusChanged=Starea modificată: %s la %s
-TicketNotNotifyTiersAtCreate=Nu notificați compania la crearea
+TicketLogStatusChanged=Stare modificată: din %s la %s
+TicketNotNotifyTiersAtCreate=Nu notificați compania la creare
 Unread=Necitită
 TicketNotCreatedFromPublicInterface=Indisponibil. Tichetul nu a fost creat din interfaţa publică.
-ErrorTicketRefRequired=Denumirea de referință al tichetului este necesară
+ErrorTicketRefRequired=Referința de tichet este necesară
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Tichetul %s citit de %s
-NoLogForThisTicket=Nu există jurnal pentru acest bilet încă
-TicketLogAssignedTo=Tichet %s alocat la %s
-TicketLogPropertyChanged=Tichet %s modificat: clasificarea de la %s la %s
-TicketLogClosedBy=Tichet %s închis de %s
-TicketLogReopen=Tichetul %s re-deschis 
+TicketLogMesgReadBy=Tichetul %s a fost citit de %s
+NoLogForThisTicket=Nu există jurnal pentru acest tichet încă
+TicketLogAssignedTo=Tichetul %s a fost atribuit lui %s
+TicketLogPropertyChanged=Tichet %s modificat: clasificat din %s la %s
+TicketLogClosedBy=Tichet %s a fost închis de %s
+TicketLogReopen=Tichetul %s a fost re-deschis 
 
 #
 # Public pages
 #
-TicketSystem=Sistemul de tichete
-ShowListTicketWithTrackId=Afișați lista de tichete din ID-ul piesei
-ShowTicketWithTrackId=Afișați tichetul din ID-ul piesei
-TicketPublicDesc=Puteți crea un tichet de asistență sau un cec de la un ID existent.
+TicketSystem=Sistem de tichete
+ShowListTicketWithTrackId=Afișează lista de tichete din ID-ul de urmărire
+ShowTicketWithTrackId=Afișează tichetul din ID-ul de urmărire
+TicketPublicDesc=Puteți crea un tichet de asistență sau să verificaţi unul existent pe baza ID-ului.
 YourTicketSuccessfullySaved=Tichetul a fost salvat cu succes!
-MesgInfosPublicTicketCreatedWithTrackId=Un nou tichet a fost creat cu ID %s şi Ref %s.
-PleaseRememberThisId=Păstrați numărul de urmărire pe care l-am putea întreba mai târziu.
+MesgInfosPublicTicketCreatedWithTrackId=Un nou tichet a fost creat cu ID-ul %s şi Ref %s.
+PleaseRememberThisId=Păstrați numărul de urmărire pe care vi l-am putea solicita ulterior.
 TicketNewEmailSubject=Confirmare creare tichet - Ref %s (ID tichet public %s) 
 TicketNewEmailSubjectCustomer=Tichet de asistență nou
-TicketNewEmailBody=Acesta este un email automat pentru a confirma că ați înregistrat un nou tichet.
-TicketNewEmailBodyCustomer=Acesta este un email automat pentru a confirma că un nou tichet a fost creat în contul dvs.
-TicketNewEmailBodyInfosTicket=Informații pentru monitorizarea tichetului
+TicketNewEmailBody=Acesta este un email automat de confirmare a faptului că ați înregistrat un tichet nou.
+TicketNewEmailBodyCustomer=Acesta este un email automat de confirmare că un nou tichet a fost creat în contul tău.
+TicketNewEmailBodyInfosTicket=Informații privind monitorizarea tichetului
 TicketNewEmailBodyInfosTrackId=Numărul de urmărire a tichetului: %s
 TicketNewEmailBodyInfosTrackUrl=Puteți vedea evoluția tichetului făcând clic pe linkul de mai sus.
-TicketNewEmailBodyInfosTrackUrlCustomer=Puteți vedea progresul tichetului în interfața specifică făcând clic pe următorul link
-TicketEmailPleaseDoNotReplyToThisEmail=Nu răspundeți direct la acest email! Utilizați linkul pentru a răspunde la interfață.
-TicketPublicInfoCreateTicket=Acest formular vă permite să înregistrați un tichet de asistență în sistemul nostru de management.
+TicketNewEmailBodyInfosTrackUrlCustomer=Puteți vedea statusul tichetului în interfața specifică făcând clic pe următorul link
+TicketEmailPleaseDoNotReplyToThisEmail=Nu răspundeți direct la acest email! Utilizați linkul pentru a răspunde în interfață.
+TicketPublicInfoCreateTicket=Acest formular vă permite să înregistrați un tichet de asistență în sistemul nostru de management al lucrărilor.
 TicketPublicPleaseBeAccuratelyDescribe=Descrieți cu precizie problema. Furnizați cât mai multe informații posibile pentru a ne permite să identificăm corect solicitarea dvs.
 TicketPublicMsgViewLogIn=Introduceți codul de urmărire a tichetului
-TicketTrackId=ID tracking public
-OneOfTicketTrackId=Unul dintre ID-urile tale de tracking
+TicketTrackId=ID urmărire public
+OneOfTicketTrackId=Unul dintre ID-urile tale de urmărire
 ErrorTicketNotFound=Tichetul cu codul de urmărire %s nu a fost găsit!
 Subject=Subiect
-ViewTicket=Vedeți tichetul
-ViewMyTicketList=Vedeți lista mea de tichete
+ViewTicket=Afişare tichet
+ViewMyTicketList=Afişează lista mea de tichete
 ErrorEmailMustExistToCreateTicket=Eroare: adresa de email nu a fost găsită în baza noastră de date
 TicketNewEmailSubjectAdmin=Un nou tichet creat - Ref %s(ID tichet public %s) 
 TicketNewEmailBodyAdmin=<p> Tichetul tocmai a fost creat cu ID # %s, vezi informațiile: </p>
-SeeThisTicketIntomanagementInterface=Vedeți tichetul în interfața de gestionare
+SeeThisTicketIntomanagementInterface=Vezi tichetul în interfața de management
 TicketPublicInterfaceForbidden=Interfața publică pentru tichete nu a fost activată
 ErrorEmailOrTrackingInvalid=Valoare incorectă pentru ID tracking sau email
 OldUser=Utilizator anterior
@@ -282,12 +284,12 @@ NewUser=Utilizator nou
 NumberOfTicketsByMonth=Număr de tichete pe lună
 NbOfTickets=Număr de tichete
 # notifications
-TicketNotificationEmailSubject=Tichet %s actualizat
+TicketNotificationEmailSubject=Tichetul %s a fost actualizat
 TicketNotificationEmailBody=Acesta este un mesaj automat care vă anunță că tichetul%s tocmai a fost actualizat
-TicketNotificationRecipient=Notificare destinatar
-TicketNotificationLogMessage=Mesaj de mesaj
-TicketNotificationEmailBodyInfosTrackUrlinternal=Vedeți tichetul în interfață
-TicketNotificationNumberEmailSent=Emailul de notificare a fost trimis: %s
+TicketNotificationRecipient=Destinatar notificare
+TicketNotificationLogMessage=Jurnal notificare tichet
+TicketNotificationEmailBodyInfosTrackUrlinternal=Afişează tichetul în interfață
+TicketNotificationNumberEmailSent=Email-ul de notificare a fost trimis: %s
 
 ActionsOnTicket=Evenimente pe tichet
 
@@ -295,10 +297,20 @@ ActionsOnTicket=Evenimente pe tichet
 # Boxes
 #
 BoxLastTicket=Ultimele tichete create
-BoxLastTicketDescription= Ultimele %s tichete create
+BoxLastTicketDescription=Ultimele %s tichete create
 BoxLastTicketContent=
 BoxLastTicketNoRecordedTickets=Niciun tichet recent necitit
 BoxLastModifiedTicket=Ultimele tichete modificate
-BoxLastModifiedTicketDescription=Ultimele %s bilete modificate 
+BoxLastModifiedTicketDescription=Ultimele %s tichet modificate 
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Nu există tichete modificate recent
+BoxTicketType=Număr tichete deschise după tip
+BoxTicketSeverity=Număr tichete deschise după severitate
+BoxNoTicketSeverity=Nr. tichete deschise
+BoxTicketLastXDays=Numărul de tichete noi după zile din ultimele %s zile
+BoxTicketLastXDayswidget = Numărul de tichete noi pe zile în ultimele X zile
+BoxNoTicketLastXDays=Niciun tichet nou în ultimele %s zile
+BoxNumberOfTicketByDay=Număr tichete noi după zi
+BoxNewTicketVSClose=Numărul de tichete noi de astăzi comparativ cu tichetele închise de astăzi
+TicketCreatedToday=Tichet creat azi
+TicketClosedToday=Tichet închis azi
diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang
index 92727210426..b0024168f4b 100644
--- a/htdocs/langs/ro_RO/trips.lang
+++ b/htdocs/langs/ro_RO/trips.lang
@@ -1,43 +1,43 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Arată raportul cheltuielilor
-Trips=Rapoarte Cheltuieli
-TripsAndExpenses=Rapoarte Cheltuieli
-TripsAndExpensesStatistics=Statistici Rapoarte Cheltuieli
-TripCard=Fişa Raport cheltuieli
-AddTrip=Creare Raport cheltuieli
+ShowExpenseReport=Arată raportul de cheltuieli
+Trips=Rapoarte de cheltuieli
+TripsAndExpenses=Rapoarte de cheltuieli
+TripsAndExpensesStatistics=Statistici Rapoarte de cheltuieli
+TripCard=Fişă Raport de cheltuieli
+AddTrip=Creare raport de cheltuieli
 ListOfTrips=Listă rapoarte de cheltuieli
-ListOfFees=Lista note cheltuieli
-TypeFees=Tipuri taxe
-ShowTrip=Arată raportul cheltuielilor
+ListOfFees=Listă taxe şi onorarii
+TypeFees=Tipuri taxe şi onorarii
+ShowTrip=Arată raport de cheltuieli
 NewTrip=Raport de cheltuieli nou
-LastExpenseReports=Ultimele%s rapoarte de cheltuieli 
+LastExpenseReports=Ultimele %s rapoarte de cheltuieli 
 AllExpenseReports=Toate rapoartele de cheltuieli
 CompanyVisited=Compania/instituția vizitată
-FeesKilometersOrAmout=Valoarea sau kilometri
+FeesKilometersOrAmout=Valoare sau kilometri
 DeleteTrip=Șterge raport de cheltuieli
 ConfirmDeleteTrip=Sigur doriți să ștergeți acest raport de cheltuieli?
 ListTripsAndExpenses=Listă rapoarte de cheltuieli
-ListToApprove=În așteptare pentru aprobare
-ExpensesArea=Rapoarte cheltuieli
-ClassifyRefunded=Clasează 'Rambursată'
+ListToApprove=În așteptarea aprobării
+ExpensesArea=Rapoarte de cheltuieli
+ClassifyRefunded=Clasează 'Rambursat'
 ExpenseReportWaitingForApproval=Un nou raport de cheltuieli a fost trimis spre aprobare
 ExpenseReportWaitingForApprovalMessage=Un nou raport de cheltuieli a fost trimis și așteaptă aprobarea. <br> - Utilizator: %s <br> - Perioada: %s <br> Faceți clic aici pentru a valida: %s
-ExpenseReportWaitingForReApproval=Un raport de cheltuieli a fost trimis pentru reaprobare
-ExpenseReportWaitingForReApprovalMessage=Un raport de cheltuieli a fost depus și așteaptă o nouă aprobare. <br> %s, ați refuzat să aprobați raportul de cheltuieli din acest motiv: %s. <br> A fost propusă o nouă versiune și vă așteaptă aprobarea. <br> - Utilizator: %s <br> - Perioada: %s <br> Faceți clic aici pentru validare: %s
+ExpenseReportWaitingForReApproval=Un raport de cheltuieli a fost trimis pentru re-aprobare
+ExpenseReportWaitingForReApprovalMessage=Un raport de cheltuieli a fost trimis și așteaptă o nouă aprobare. <br> %s, ați refuzat să aprobați raportul de cheltuieli din acest motiv: %s. <br> A fost propusă o nouă versiune și așteaptă aprobarea. <br> - Utilizator: %s <br> - Perioada: %s <br> Faceți clic aici pentru validare: %s
 ExpenseReportApproved=A fost aprobat un raport de cheltuieli
 ExpenseReportApprovedMessage=Raportul de cheltuieli %s a fost aprobat. <br> - Utilizator: %s <br> - Aprobat de: %s <br> Faceți clic aici pentru a afișa raportul de cheltuieli: %s
-ExpenseReportRefused=Un raport de cheltuieli a fost refuzat
-ExpenseReportRefusedMessage=Raportul de cheltuieli %s a fost refuzat. <br> - Utilizator: %s <br> - Refuzat de: %s <br> - Motiv pentru refuz: %s <br> Click aici pentru a vedea raportul de cheltuieli: %s
+ExpenseReportRefused=Un raport de cheltuieli a fost respins
+ExpenseReportRefusedMessage=Raportul de cheltuieli %s a fost respins. <br> - Utilizator: %s <br> - Respins de: %s <br> - Motiv refuz: %s <br> Click aici pentru a vedea raportul de cheltuieli: %s
 ExpenseReportCanceled=Un raport de cheltuieli a fost anulat
 ExpenseReportCanceledMessage=Raportul de cheltuieli %s a fost anulat. <br> - Utilizator: %s <br> - Anulat de: %s <br> - Motivul pentru anulare: %s <br> Click aici pentru a afișa raportul de cheltuieli: %s
 ExpenseReportPaid=Un raport de cheltuieli a fost plătit
 ExpenseReportPaidMessage=Raportul de cheltuieli %s a fost plătit. <br> - Utilizator: %s <br> - Plătit de: %s <br> Faceți clic aici pentru a afișa raportul de cheltuieli: %s
-TripId=ID Raport de cheltuieli 
-AnyOtherInThisListCanValidate=Persoana care trebuie informată pentru validare.
+TripId=ID raport de cheltuieli 
+AnyOtherInThisListCanValidate=Persoana care trebuie informată la validarea pentru validarea cererii.
 TripSociete=Informații companie
-TripNDF=Raport de cheltuieli privind informațiile
+TripNDF=Informaţii raport de cheltuieli
 PDFStandardExpenseReports=Șablon standard pentru generarea unui document PDF pentru raportul de cheltuieli
-ExpenseReportLine=Line raport de cheltuieli
+ExpenseReportLine=Linie raport de cheltuieli
 TF_OTHER=Altele
 TF_TRIP=Transport
 TF_LUNCH=Prânz
@@ -50,102 +50,102 @@ TF_ESSENCE=Combustibil
 TF_HOTEL=Hotel
 TF_TAXI=Taxi
 EX_KME=Cheltuieli de deplasare
-EX_FUE=Variaţia costurilor cu combustibilul
+EX_FUE=Combustibil - valoare actuală
 EX_HOT=Hotel
-EX_PAR=Variaţia costurilor cu parcarea
-EX_TOL=Variaţia costurilor cu vama
-EX_TAX=Diverse taxe
+EX_PAR=Parcare - valoare actuală
+EX_TOL=Vamă - valoare actuală
+EX_TAX=Taxe diverse
 EX_IND=Decontare abonament transport
-EX_SUM=Întreținere
-EX_SUO=Papetărie - rechizite
+EX_SUM=Întreținere reparaţii
+EX_SUO=Papetărie-rechizite
 EX_CAR=Închirieri mașini
 EX_DOC=Documentație
 EX_CUR=Protocol primire clienți
 EX_OTR=Alte cheltuieli de protocol
 EX_POS=Timbre şi taxe poştale
-EX_CAM=Variaţia costurilor cu întreţinerea şi reparaţiile
+EX_CAM=Întreţinere şi reparaţii - valoare estimată
 EX_EMM=Masă angajați 
 EX_GUM=Masă oaspeți
 EX_BRE=Mic dejun
-EX_FUE_VP=Valoarea actuală a combustibilului
-EX_TOL_VP=Valoarea actuală a vămii
-EX_PAR_VP=Valoarea actuală a parcării
-EX_CAM_VP=Valoarea actuală a întreţinerii şi reparaţiilor
+EX_FUE_VP=Combustibil - valoare estimată
+EX_TOL_VP=Vamă - valoare estimată
+EX_PAR_VP=Parcare - valoare estimată
+EX_CAM_VP=Întreţinere şi reparaţii - valoare estimată
 DefaultCategoryCar=Modul implicit de transport
-DefaultRangeNumber=Numărul intervalului implicit
+DefaultRangeNumber=Număr interval implicit
 UploadANewFileNow=Încarcă un document nou acum
-Error_EXPENSEREPORT_ADDON_NotDefined=Eroare, regula de numerotare a rapoartelor de cheltuieli nu a fost definită în configurarea modulului "Raport de cheltuieli"
+Error_EXPENSEREPORT_ADDON_NotDefined=Eroare, regula de numerotare a rapoartelor de cheltuieli nu a fost definită în configurarea modulului "Rapoarte de cheltuieli"
 ErrorDoubleDeclaration=Ați declarat un alt raport de cheltuieli într-un interval de timp similar.
-AucuneLigne=Nu există încă nici un raport de cheltuieli declarate 
+AucuneLigne=Nu există încă nici un raport de cheltuieli declarat
 ModePaiement=Mod plată
-VALIDATOR=Utilizator responsabil cu aprobarea
+VALIDATOR=Responsabil cu aprobarea
 VALIDOR=Aprobat de
 AUTHOR=Înregistrat de
-AUTHORPAIEMENT=Plătite de 
+AUTHORPAIEMENT=Plătit de 
 REFUSEUR=Respins de
 CANCEL_USER=Șters de 
 MOTIF_REFUS=Motiv
 MOTIF_CANCEL=Motiv
 DATE_REFUS=Dată respingere
 DATE_SAVE=Dată validare
-DATE_CANCEL=Data anulare
+DATE_CANCEL=Dată anulare
 DATE_PAIEMENT=Data plăţii
 BROUILLONNER=Redeschide
 ExpenseReportRef=Ref. raport de cheltuieli
-ValidateAndSubmit=Validareaza și trimite pentru aprobare
-ValidatedWaitingApproval=Validat(așteaptă aprobarea)
-NOT_AUTHOR=Tu nu esti autorul acestui raport de cheltuieli. Operatiune anulata.
-ConfirmRefuseTrip=Sigur doriți să refuzați acest raport de cheltuieli?
+ValidateAndSubmit=Validează și trimite pentru aprobare
+ValidatedWaitingApproval=Validat(în așteptarea aprobării)
+NOT_AUTHOR=Tu nu esti autorul acestui raport de cheltuieli. Operaţiune anulată.
+ConfirmRefuseTrip=Sigur doriți să respingeţi acest raport de cheltuieli?
 ValideTrip=Aprobă raport de cheltuieli
 ConfirmValideTrip=Sunteți sigur că doriți să aprobaţi acest raport de cheltuieli?
 PaidTrip=Plăteşte un raport de cheltuieli
 ConfirmPaidTrip=Sigur doriți să schimbați statusul acestui raport de cheltuieli la "Plătit"?
 ConfirmCancelTrip=Sunteți sigur că doriți să anulaţi acest raport de cheltuieli?
-BrouillonnerTrip=Mutați raportul de cheltuieli înapoi la starea "Draft"
-ConfirmBrouillonnerTrip=Sigur doriți să mutați raportul de cheltuieli la starea "Draft"?
+BrouillonnerTrip=Readuceţi raportul de cheltuieli înapoi la starea "Schiţă"
+ConfirmBrouillonnerTrip=Sigur doriți să readuceţi raportul de cheltuieli la starea "Schiţă"?
 SaveTrip=Validează raport de cheltuieli
 ConfirmSaveTrip=Sunteți sigur că doriți să validaţi acest raport de cheltuieli?
 NoTripsToExportCSV=Nu există un raport de cheltuieli de exportat pentru această perioadă.
-ExpenseReportPayment=Plată Raport cheltuieli
-ExpenseReportsToApprove=Rapoartele de cheltuieli pentru aprobare
-ExpenseReportsToPay=Rapoartele de cheltuieli pentru plată
+ExpenseReportPayment=Plată raport de cheltuieli
+ExpenseReportsToApprove=Rapoarte de cheltuieli de aprobat
+ExpenseReportsToPay=Rapoarte de cheltuieli de plătit
 ConfirmCloneExpenseReport=Sigur doriți să clonați acest raport de cheltuieli?
-ExpenseReportsIk=Indicele pretului /km din raportul de cheltuieli
+ExpenseReportsIk=Configurare taxe de kilometraj
 ExpenseReportsRules=Regulile rapoartelor de cheltuieli
-ExpenseReportIkDesc=Puteți modifica calculul cheltuielilor/km pe categorii și pe gama care au fost definite anterior. <b> d </b> este distanța în kilometri
+ExpenseReportIkDesc=Puteți modifica calculul cheltuielilor/km pe categorii și pe gama care au fost definite anterior. <b>d</b> este distanța în kilometri
 ExpenseReportRulesDesc=Puteți crea sau actualiza orice reguli de calcul. Această parte va fi utilizată atunci când utilizatorul va crea un nou raport de cheltuieli
 expenseReportOffset=Diferenţă
 expenseReportCoef=Coeficient
-expenseReportTotalForFive=Exemplu cu <u> d </u> = 5
+expenseReportTotalForFive=Exemplu cu <u>d</u> = 5
 expenseReportRangeFromTo=de la %d până la %d
-expenseReportRangeMoreThan=mai mult decât %d
+expenseReportRangeMoreThan=mai mult de %d
 expenseReportCoefUndefined=(valoarea nu este definită)
 expenseReportCatDisabled=Categorie dezactivată - vedeți dicționarul c_exp_tax_cat
 expenseReportRangeDisabled=Interval dezactivat - vedeți dicționarul c_exp_tax_range
 expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Aplicaţi pentru
+ExpenseReportApplyTo=Aplică la
 ExpenseReportDomain=Domeniu de aplicat
 ExpenseReportLimitOn=Limită la
 ExpenseReportDateStart=Dată început
-ExpenseReportDateEnd=Data de sfârşit
+ExpenseReportDateEnd=Dată de sfârşit
 ExpenseReportLimitAmount=Valoare limită
 ExpenseReportRestrictive=Restrictiv
 AllExpenseReport=Toate tipurile de rapoarte de cheltuieli
 OnExpense=Linie de cheltuieli
-ExpenseReportRuleSave=Regula raportului de cheltuieli a fost salvată
+ExpenseReportRuleSave=Regula de raport de cheltuieli a fost salvată
 ExpenseReportRuleErrorOnSave=Eroare: %s
 RangeNum=Interval %d
 ExpenseReportConstraintViolationError=Constrângere violare id [%s]: %s este superior lui %s %s
 byEX_DAY=pe zi (limitare la %s)
 byEX_MON=pe lună (limitare la %s)
 byEX_YEA=pe an (limitare la %s)
-byEX_EXP=de linie (limitare la %s)
+byEX_EXP=pe linie (limitare la %s)
 ExpenseReportConstraintViolationWarning=Constrângere violare id [%s]: %s este superior lui %s %s
 nolimitbyEX_DAY=pe zi (fără limitare)
 nolimitbyEX_MON=pe lună (fără limitare)
 nolimitbyEX_YEA=pe an (fără limitare)
-nolimitbyEX_EXP=prin linie (fără limitare)
-CarCategory=Categorie de autovehicule
-ExpenseRangeOffset=Suma compensării: %s
+nolimitbyEX_EXP=pe linie (fără limitare)
+CarCategory=Categorie vehicule
+ExpenseRangeOffset=Sumă de compensat: %s
 RangeIk=Interval de kilometri
 AttachTheNewLineToTheDocument=Atașați reperul la un document încărcat
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index a2e0627163f..e908a92e7fc 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -5,11 +5,11 @@ GroupCard=Fişă grup
 Permission=Permisiune
 Permissions=Permisiuni
 EditPassword=Modificare parolă
-SendNewPassword=Trimite o parolă nouă
-SendNewPasswordLink=Trimiteți link de resetare parolă
+SendNewPassword=Generează şi trimite o parolă nouă
+SendNewPasswordLink=Trimite link de resetare parolă
 ReinitPassword=Generează o parolă nouă
 PasswordChangedTo=Parola schimbată la: %s
-SubjectNewPassword=Noua dvs. parolă pentru %s
+SubjectNewPassword=Noua ta parolă pentru %s
 GroupRights=Grup de permisiuni
 UserRights=Permisiuni utilizator
 UserGUISetup=Configurare afișare utilizator
@@ -19,66 +19,69 @@ DeleteUser=Şterge
 DeleteAUser=Şterge un utilizator
 EnableAUser=Activează un utilizator
 DeleteGroup=Şterge
-DeleteAGroup=Ştergeţi un grup
-ConfirmDisableUser=Sigur doriți să dezactivați utilizatorul <b> %s </b>?
-ConfirmDeleteUser=Sigur doriți să ștergeți utilizatorul <b> %s </b>?
-ConfirmDeleteGroup=Sigur doriți să ștergeți grupul <b> %s </b>?
-ConfirmEnableUser=Sigur doriți să activați utilizatorul <b> %s </b>?
-ConfirmReinitPassword=Sigur doriți să generați o nouă parolă pentru utilizatorul <b> %s </b>?
-ConfirmSendNewPassword=Sigur doriți să generați și să trimiteți o nouă parolă pentru utilizatorul <b> %s </b>?
+DeleteAGroup=Şterge un grup
+ConfirmDisableUser=Sigur doriți să dezactivați utilizatorul <b>%s</b>?
+ConfirmDeleteUser=Sigur doriți să ștergeți utilizatorul <b>%s</b>?
+ConfirmDeleteGroup=Sigur doriți să ștergeți grupul <b>%s</b>?
+ConfirmEnableUser=Sigur doriți să activați utilizatorul <b>%s</b>?
+ConfirmReinitPassword=Sigur doriți să generați o nouă parolă pentru utilizatorul <b>%s</b>?
+ConfirmSendNewPassword=Sigur doriți să generați și să trimiteți o nouă parolă pentru utilizatorul <b>%s</b>?
 NewUser=Utilizator nou
 CreateUser=Creare utilizator
-LoginNotDefined=Numele de login nu este definit.
+LoginNotDefined=Numele de utilizator nu este definit.
 NameNotDefined=Numele nu este definit.
 ListOfUsers=Listă utilizatori
 SuperAdministrator=Super Administrator
 SuperAdministratorDesc=Administrator global, cu toate drepturile
 AdministratorDesc=Administrator
 DefaultRights=Permisiuni implicite
-DefaultRightsDesc=Definiți aici permisiunile <u> implicite </u> care sunt acordate automat unui utilizator <u> nou </u> (pentru a modifica permisiunile pentru utilizatorii existenți, accesați cardul de utilizator).
-DolibarrUsers=Utilizatori Dolibarr
+DefaultRightsDesc=Definiți aici permisiunile <u>implicite</u> care sunt acordate automat unui utilizator <u>nou</u> (pentru a modifica permisiunile pentru utilizatorii existenți, accesați fişa utilizatorului).
+DolibarrUsers=Utilizatori sistem
 LastName=Nume
 FirstName=Prenume
 ListOfGroups=Listă grupuri
 NewGroup=Grup nou
 CreateGroup=Creare grup
 RemoveFromGroup=Înlăturare din grup
-PasswordChangedAndSentTo=Parola a fost schimbată şi trimisă <b>la %s.</b>
-PasswordChangeRequest=Solicitare de modificarea parolei pentru <b> %s </b>
-PasswordChangeRequestSent=Cerere pentru a schimba parola <b>pentru %s %s</b> la trimis.
-ConfirmPasswordReset=Confirmați resetarea parolei
+PasswordChangedAndSentTo=Parola a fost schimbată şi trimisă către <b>%s</b>.
+PasswordChangeRequest=Solicitare de modificare a parolei pentru <b>%s</b>
+PasswordChangeRequestSent=Cererea de schimbare a parolei pentru <b>%s</b> a fost trimisă către <b>%s</b>.
+IfLoginExistPasswordRequestSent=Dacă acest nume de utilizator este valid, a fost trimis un email pentru resetarea parolei.
+IfEmailExistPasswordRequestSent=Dacă această adresă de email este corectă, a fost trimis un email pentru resetarea parolei.
+ConfirmPasswordReset=Confirmare resetare parolă
 MenuUsersAndGroups=Utilizatori & Grupuri
-LastGroupsCreated=Ultimele %s grupuri create de 
+LastGroupsCreated=Ultimele %s grupuri create
 LastUsersCreated=Ultimii %s utilizatori creaţi
 ShowGroup=Arată grup
 ShowUser=Arată utilizator
 NonAffectedUsers=Utilizatori nealocaţi
 UserModified=Utilizator modificat cu succes
 PhotoFile=Fişier foto
-ListOfUsersInGroup=Lista de utilizatori în acest grup
-ListOfGroupsForUser=Lista de grupuri pentru acest utilizator
-LinkToCompanyContact=Link către o terţă parte / de contact
+ListOfUsersInGroup=Listă utilizatori în acest grup
+ListOfGroupsForUser=Listă grupuri pentru acest utilizator
+LinkToCompanyContact=Link către un terţ/contact
 LinkedToDolibarrMember=Asociază la membru
-LinkedToDolibarrUser=Asociază la utilizator Dolibarr
-LinkedToDolibarrThirdParty=Asociază la terţ din sistem
-CreateDolibarrLogin=Creare utilizator Dolibarr
-CreateDolibarrThirdParty=Creaţi un terţ
-LoginAccountDisableInDolibarr=Cont dezactivat în Dolibarr.
-UsePersonalValue=Utilizaţi valoarea personale
-InternalUser=Interne de utilizator
-ExportDataset_user_1=Utilizatorii și proprietățile acestora
-DomainUser=Domeniu utilizatorul %s
+LinkedToDolibarrUser=Asociază la utilizator
+LinkedToDolibarrThirdParty=Asociază la un terţ din sistem
+CreateDolibarrLogin=Creare utilizator
+CreateDolibarrThirdParty=Creare terţ
+LoginAccountDisableInDolibarr=Cont dezactivat în sistem.
+UsePersonalValue=Utilizare setări personalizate
+InternalUser=Utilizator intern
+ExportDataset_user_1=Utilizatori și proprietățile acestora
+DomainUser=Utilizator de domeniu %s
 Reactivate=Reactivare
-CreateInternalUserDesc=Acest formular vă permite să creați un utilizator intern în compania / organizația dvs. Pentru a crea un utilizator extern (client, furnizor etc.), utilizați butonul "Creare utilizator Dolibarr" de pe cartela de contact a terțului.
-InternalExternalDesc=Un utilizator <b>intern</b> este un utilizator care face parte din compania / organizația dvs.<br> Un utilizator <b>extern</b> este un client, un furnizor sau altul (Crearea unui utilizator extern pentru un terț se poate face din înregistrarea de contact a unui terț).<br> <br>În ambele cazuri, permisiunile definesc drepturile în Dolibarr, de asemenea, utilizatorul extern poate avea un manager de meniuri diferit de cel intern (a se vedea Acasă - Configurare - Afișare)
-PermissionInheritedFromAGroup=Permisiunea acordată deoarece moştenită de la un utilizator al unui grup.
+CreateInternalUserDesc=Acest formular vă permite să creați un utilizator intern în compania/organizația ta. Pentru a crea un utilizator extern (client, furnizor etc.), utilizați butonul 'Creare utilizator sistem' de pe fişa de contact a terțului.
+InternalExternalDesc=Un utilizator <b>intern</b> este un utilizator care face parte din compania/organizația ta sau este un utilizator partener în afara organizației tale. care ar putea avea nevoie să vadă mai multe date decât date legate de compania sa (sistemul de permisiuni va defini ce poate sau nu).<br>Un utilizator <b>extern</b> este un client, un furnizor sau altul care trebuie să vizualizeze DOAR datele referitoare la el însuși (Crearea unui utilizator extern pentru un terț se poate face din înregistrarea de contact a terțului). <br><br>În ambele cazuri , trebuie să acorzi permisiuni pentru funcțiile de care are nevoie utilizatorul.
+PermissionInheritedFromAGroup=Permisiunea este acordată deoarece este moştenită de la un utilizator al unui grup.
 Inherited=Moştenit
-UserWillBeInternalUser=De utilizator creat va fi un utilizator intern (pentru că nu este legată de o parte terţă)
-UserWillBeExternalUser=De utilizator creat va fi un utilizator extern (deoarece legat de un terţ special)
-IdPhoneCaller=Id-ul telefonului apelantului
+UserWillBe=Utilizatorul creat va fi
+UserWillBeInternalUser=Utilizatorul creat va fi un utilizator intern (pentru că nu este asociat unui terţ)
+UserWillBeExternalUser=Utilizatorul creat va fi un utilizator extern (deoarece este asociat unui terţ)
+IdPhoneCaller=Id apelant telefonic
 NewUserCreated=Utilizatorul %s a fost creat
-NewUserPassword=Schimba parola pentru %s
-NewPasswordValidated=Noua ta parolă a fost validată şi trebuie folosită de acum pentru a te loga.  
+NewUserPassword=Schimbă parola pentru %s
+NewPasswordValidated=Noua ta parolă a fost validată şi trebuie folosită din acest moment pentru a te autentifica.  
 EventUserModified=Utilizatorul %s a fost modificat
 UserDisabled=Utilizatorul %s a fost dezactivat
 UserEnabled=Utilizatorul %s a fost activat
@@ -86,21 +89,21 @@ UserDeleted=Utilizatorul %s a fost şters
 NewGroupCreated=Grupul %s a fost creat
 GroupModified=Grupul %s a fost modificat
 GroupDeleted=Grupul %s a fost şters
-ConfirmCreateContact=Sigur doriți să creați un cont Dolibarr pentru această persoană de contact?
-ConfirmCreateLogin=Sigur doriți să creați un cont Dolibarr pentru acest membru?
+ConfirmCreateContact=Sigur doriți să creați un cont de acces în sistem pentru această persoană de contact?
+ConfirmCreateLogin=Sigur doriți să creați un cont de acces în sistem pentru acest membru?
 ConfirmCreateThirdParty=Sigur doriți să creați un terţ pentru acest membru?
-LoginToCreate=Nume login de creat
+LoginToCreate=Nume de utilizator de creat
 NameToCreate=Nume terţ de creat
 YourRole=Rolurile tale
 YourQuotaOfUsersIsReached=Cota ta de utilizatori activi a fost atinsă !
-NbOfUsers=Număr de utilizatori
-NbOfPermissions=Număr de permisiuni
+NbOfUsers=Nr. de utilizatori
+NbOfPermissions=Nr. de permisiuni
 DontDowngradeSuperAdmin=Numai un superadmin poate declasa un superadmin
 HierarchicalResponsible=Supervizor
 HierarchicView=Vedere ierarhică
-UseTypeFieldToChange=Foloseşte câmpul Tip pentru schimbare
+UseTypeFieldToChange=Foloseşte câmpul Tip pentru a modifica
 OpenIDURL=URL OpenID
-LoginUsingOpenID=Utilizați OpenID pentru login
+LoginUsingOpenID=Utilizați OpenID pentru autentificare
 WeeklyHours=Ore lucrate(pe săptămână)
 ExpectedWorkedHours=Numărul estimat de ore lucrate săptămânal
 ColorUser=Culoare utilizator
@@ -109,11 +112,13 @@ UserAccountancyCode=Cod contabil utilizator
 UserLogoff=Deconectare utilizator
 UserLogged=Utilizator autentificat
 DateOfEmployment=Data angajării
-DateEmployment=Data începerii angajării
+DateEmployment=Loc de muncă, ocupaţie
+DateEmploymentstart=Data începerii angajării
 DateEmploymentEnd=Data încetării angajării
+RangeOfLoginValidity=Intervalul temporal pentru care autentificarea în sistem este valabilă
 CantDisableYourself=Nu vă puteți dezactiva propria înregistrare de utilizator 
-ForceUserExpenseValidator=Forţează validarea raportului de cheltuieli
-ForceUserHolidayValidator=Forţează validarea cererii de concediu
+ForceUserExpenseValidator=Persoana care are dreptul de a valida raportul de cheltuieli
+ForceUserHolidayValidator=Persoana care are dreptul de a valida cererea de concediu
 ValidatorIsSupervisorByDefault=În mod implicit, validatorul este supervizorul utilizatorului. Nu completaţi pentru a păstra acest comportament.
 UserPersonalEmail=Email personal
 UserPersonalMobile=Telefon mobil personal
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index f1ca739ae33..c5e4eb67f7a 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -1,110 +1,110 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Cod
-WebsiteSetupDesc=Creați aici site-urile pe care doriți să le utilizați. Apoi intrați în meniul Websites pentru a le edita.
+WebsiteSetupDesc=Creați aici site-urile pe care doriți să le utilizați. Apoi intrați în meniul Site-uri pentru a le edita.
 DeleteWebsite=Şterge website
 ConfirmDeleteWebsite=Sigur doriți să ștergeți acest site web? Toate paginile și conținutul său vor fi, de asemenea, şterse. Fișierele încărcate (cele din directorul media sau din modulul ECM, ...) vor rămâne.
-WEBSITE_TYPE_CONTAINER=Tipul paginii/recipientului
-WEBSITE_PAGE_EXAMPLE=Pagină web pentru utilizare ca exemplu
-WEBSITE_PAGENAME=Pagina nume/alias
-WEBSITE_ALIASALT=Nume / pseudonime alternative de pagini
+WEBSITE_TYPE_CONTAINER=Tipul paginii/containerului
+WEBSITE_PAGE_EXAMPLE=Pagină web de utilizat ca exemplu
+WEBSITE_PAGENAME=Nume/alias pagină
+WEBSITE_ALIASALT=Nume alternative/pseudonime pagină
 WEBSITE_ALIASALTDesc=Utilizați aici o listă cu alte nume / aliasuri, astfel încât pagina poate fi accesată și folosind alte nume / aliasuri (de exemplu vechiul nume după redenumirea aliasului pentru a functionalbacklinkul pe vechiul link/nume). Sintaxa este: <br> alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=Adresa URL a fișierului CSS extern
-WEBSITE_CSS_INLINE=Conținutul fișierelor CSS (comun pentru toate paginile)
+WEBSITE_CSS_INLINE=Conținutul fișierului CSS (comun pentru toate paginile)
 WEBSITE_JS_INLINE=Conținutul fișierului Javascript (comun tuturor paginilor)
-WEBSITE_HTML_HEADER=Adăugarea în partea de jos a antetului HTML (comun pentru toate paginile)
+WEBSITE_HTML_HEADER=Adăugare în partea de jos a antetului HTML (comun pentru toate paginile)
 WEBSITE_ROBOT=Fișier robot (robots.txt)
-WEBSITE_HTACCESS=Fișier .htaccess de pe site
+WEBSITE_HTACCESS=Fișier .htaccess site
 WEBSITE_MANIFEST_JSON=Fişier manifest.json website
 WEBSITE_README=Fişier README.md
 WEBSITE_KEYWORDSDesc=Foloseşte virgula pentru a separa valorile
 EnterHereLicenseInformation=Introduceți aici metadate sau informații despre licență pentru a completa fișierul README.md. dacă distribuiți site-ul dvs. ca un șablon, fișierul va fi inclus în pachet.
 HtmlHeaderPage=Antet HTML (specific numai pentru această pagină)
 PageNameAliasHelp=Numele sau aliasul paginii. <br> Acest alias este, de asemenea, folosit pentru a crea un URL SEO când site-ul web este rulat de o gazdă virtuală a unui server Web (cum ar fi Apacke, Nginx, ...). Utilizați butonul "<strong> %s </strong>" pentru a edita acest alias.
-EditTheWebSiteForACommonHeader=Notă: dacă doriți să definiți un antet personalizat pentru toate paginile, modificați antetul la nivelul site-ului în locul paginii / containerului.
-MediaFiles=Media library
+EditTheWebSiteForACommonHeader=Notă: dacă doriți să definiți un antet personalizat pentru toate paginile, modificați antetul la nivelul site-ului şi nu la nivelul paginii/containerului.
+MediaFiles=Librărie media
 EditCss=Editare proprietăţi website
-EditMenu=Edit meniu
-EditMedias=Editați mediile
+EditMenu=Editare meniu
+EditMedias=Editare media
 EditPageMeta=Editare proprietăţi pagină/container
-EditInLine=Editați inline
-AddWebsite=Adaugă pagina web
-Webpage=Pagina web / container
-AddPage=Adăugați o pagină / un container
+EditInLine=Editare inline
+AddWebsite=Adaugă site web
+Webpage=Pagină/container web
+AddPage=Adaugă o pagină/container
 PageContainer=Pagina
-PreviewOfSiteNotYetAvailable=Previzualizarea site-ului dvs. web <strong> %s </strong> nu este încă disponibil. Mai întâi trebuie să '<strong> Importați un șablon complet de site-uri web </strong>' sau doar '<strong> Adăugați o pagină / container </strong>'.
-RequestedPageHasNoContentYet=Pagina solicitată cu id %s nu are încă conținut, sau fișierul cache cache.php a fost eliminat. Editați conținutul paginii pentru a rezolva această problemă.
-SiteDeleted=Site-ul Web "%s" a fost șters
-PageContent=Pagina/recipient
-PageDeleted=Pagina / recipientul '%s' site-ului %s a fost șters
-PageAdded=Pagina / recipient '%s' adăugată
-ViewSiteInNewTab=Vizualizați site-ul în fila nouă
-ViewPageInNewTab=Afișați pagina în fila nouă
-SetAsHomePage=Seteaza ca  pagina Home 
-RealURL=Real URL
+PreviewOfSiteNotYetAvailable=Previzualizarea site-ului dvs. web <strong> %s </strong> nu este încă disponibilă. Mai întâi trebuie să '<strong> Importați un șablon complet de site </strong>' sau doar să '<strong>Adăugați o pagină/container </strong>'.
+RequestedPageHasNoContentYet=Pagina solicitată cu id %s nu are încă conținut, sau fișierul cache .tpl.php a fost eliminat. Editați conținutul paginii pentru a rezolva această problemă.
+SiteDeleted=Site-ul web "%s" a fost șters
+PageContent=Pagină/Container
+PageDeleted=Pagina/containerul '%s' site-ului %s a fost șters
+PageAdded=Pagina/containerul '%s' a fost adăugat
+ViewSiteInNewTab=Vizualizare site într-o filă nouă
+ViewPageInNewTab=Afișare pagină în filă nouă
+SetAsHomePage=Setează ca pagină Home 
+RealURL=URL real
 ViewWebsiteInProduction=Vizualizați site-ul web utilizând URL-urile de home
 SetHereVirtualHost=<u>Utilizați cu Apache/NGinx/...</u><br> Creați pe serverul dvs. web (Apache, Nginx, ...) un vhost dedicat cu PHP activat și un director Root activat pentru<br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Exemplu configuraţie utilizabilă vhost Apache:
-YouCanAlsoTestWithPHPS=<u> Utilizarea cu serverul încorporat PHP </u> <br> În mediul de dezvoltare, puteți prefera să testați site-ul cu serverul web încorporat PHP (PHP 5.5 necesar) executând <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
+YouCanAlsoTestWithPHPS=<u> Utilizare cu serverul PHP încorporat</u> <br> În mediul de dezvoltare, vei prefera să testezi site-ul cu serverul web PHP încorporat (PHP 5.5 necesar) executând <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Rulaţi website-ul dvs. la un alt furnizor de găzduire Dolibarr</u><br> Dacă nu aveți un server web precum Apache sau NGinx disponibil public pe internet, puteți exporta și importa site-ul dvs. web pe o altă instanță Dolibarr furnizată de un alt furnizor de găzduire Dolibarr care asigură o integrare completă cu modulul Website. Puteți găsi o listă a unor furnizori de găzduire Dolibarr pe <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a> 
-CheckVirtualHostPerms=Verificați, de asemenea, că gazda virtuală are permisiunea <strong> %s </strong> pe fișiere în <br> <strong> %s </strong>
-ReadPerm=Citit
-WritePerm=Scrie
-TestDeployOnWeb=Testați/implementați pe web
-PreviewSiteServedByWebServer=<u>Previzualizați %s într-o filă nouă. </u> <br> <br> %s va fi deservit de un server web extern (cum ar fi Apache, Nginx, IIS). Trebuie să instalați și să configurați acest server înainte să indicați directorul: <br> <strong> %s </strong> <br> URL deservit de server extern: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr=<u> Previzualizați %s într-o filă nouă. </u> <br> <br> %s va fi deservit de serverul Dolibarr, deci nu are nevoie de nici un server web suplimentar (cum ar fi Apache, Nginx, IIS) care să fie instalat. <br> Inconvenientul este că adresa URL a paginilor nu este ușor de utilizat și începe cu calea Dolibarr. <br> URL deservită de Dolibarr: <br> <strong> %s </strong> <br> <br> Pentru a utiliza propriul server de web extern pentru a servi acestui site web, de a crea o gazdă virtuală de pe serverul de web acel punct de pe directorul <br> <strong> %s </strong> <br> apoi introduceți numele acestui server virtual și faceți clic pe celălalt buton de previzualizare.
-VirtualHostUrlNotDefined=URL-ul gazdei virtuale deservite de serverul web extern nu este definit
-NoPageYet=Nici o pagină
+CheckVirtualHostPerms=Verificați, de asemenea, dacă utilizatorul gazdă virtuală (de exemplu, www-data) are permisiuni <strong>%s</strong> pentru fișiere în <br><strong>%s</strong>
+ReadPerm=Citire
+WritePerm=Scriere
+TestDeployOnWeb=Testare/implementare pe web
+PreviewSiteServedByWebServer=<u>Previzualizați %s într-o filă nouă. </u> <br> <br> %s va fi deservit de un server web extern (cum ar fi Apache, Nginx, IIS). Trebuie să instalați și să configurați acest server înainte să indicați directorul: <br> <strong> %s </strong> <br> URL server extern: <br> <strong> %s </strong>
+PreviewSiteServedByDolibarr=<u>Previzualizare %s într-o filă nouă. </u><br><br> Acest %s va fi servit de serverul Dolibarr, astfel încât să nu fie nevoie de niciun server web suplimentar (cum ar fi Apache, Nginx, IIS) pentru a fi instalat.<br> Inconvenientul este că adresele URL ale paginilor nu sunt ușor de utilizat și începeți cu calea Dolibarr.<br>URL dvs. servit de Dolibarr:<br><strong>%s</strong><br><br> Pentru a utiliza propriul server web extern pentru a servi acest site web, creați virtualhost pe serverul dvs. web care indică directorul <br><strong>%s</strong><br>, apoi introduceți numele acestui virtualhost  în proprietățile acestui site și faceți clic pe pe linkul "Testare/Impementare pe web".
+VirtualHostUrlNotDefined=URL virtualhost server web extern nu este definit
+NoPageYet=Nicio pagină încă
 YouCanCreatePageOrImportTemplate=Puteți să creați o pagină nouă sau să importați un șablon de site complet
-SyntaxHelp=Ajutor pe sfaturile de sintaxă specifice
+SyntaxHelp=Ajutor şi sfaturi pentru sintaxa specifică
 YouCanEditHtmlSourceckeditor=Puteți edita codul sursă HTML folosind butonul "Sursă" din editor.
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span>Puteți include codul PHP în această sursă folosind etichete<strong>&lt;?php?&gt;</strong>. Sunt disponibile următoarele variabile globale: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br><br><span class="fa fa-bug"></span>Puteți include, de asemenea, conținutul unei alte Pagini/Container cu următoarea sintaxă: <br><strong>&lt;?php includeContainer ('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Puteți face o redirecționare către o altă Pagină/Container cu următoarea sintaxă (Notă: nu emiteți conținut înainte de o redirecționare): <br><strong>&lt;?php redirectToContainer ('alias_of_container_to_redirect_to'); ?&gt; </strong><br><br><span class="fa fa-link"></span>Pentru a adăuga o legătură la o altă pagină, utilizați sintaxa: <br><strong>&lt;a href ="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt; </strong><br><br><span class="fa fa-download"></span>Pentru a include un <strong>link de descărcare</strong> fișier stocat în <strong>directorul documentelor</strong>, utilizați wrapper-ul <strong>document.php</strong>: <br>Exemplu, pentru un fișier din documente/ECM (trebuie să fie înregistrat), sintaxa este:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br> Pentru un fișier din documente/media (director deschis pentru acces public), sintaxa este:<br><strong>&lt;a href ="/document.php?modulepart= medias&file=[relative_dir/]indicafilename.ext"&gt;</strong><br> Pentru un fișier partajat cu o legătură de partajare (acces deschis folosind cheia hash de partajare a fișierului), sintaxa este: <br><strong>&lt;a href="/ document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Pentru a include o <strong>imagine</strong> stocată în <strong>directorul de documente</strong>, utilizați wrapper-ul <strong>viewimage.php</strong>: <br>Exemplu, pentru o imagine din documente/media (director deschis pentru acces public), sintaxa este: <br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br> 
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource2=Pentru o imagine partajată cu un link de partajare (acces deschis folosind cheia de distribuire a fișierului), sintaxa este:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Mai multe exemple de cod HTML sau dinamic sunt disponibile în<a href="%s" target="_blank"> documentația wiki</a><br>.
-ClonePage=Clona pagina/container
-CloneSite=Clonează site-ul
+ClonePage=Clonare pagină/container
+CloneSite=Clonare site
 SiteAdded=Site adăugat
-ConfirmClonePage=Introduceți codul/pseudonimul paginii noi și dacă este o traducere a paginii clonate.
+ConfirmClonePage=Introduceți codul/aliasul paginii noi și dacă este o traducere a paginii clonate.
 PageIsANewTranslation=Noua pagină este o traducere a paginii curente?
 LanguageMustNotBeSameThanClonedPage=Clonați o pagină ca o traducere. Limba paginii noi trebuie să fie diferită de limba paginii sursă.
 ParentPageId=ID-ul paginii părinte
-WebsiteId=ID-ul site-ului
-CreateByFetchingExternalPage=Creați pagina/container prin preluarea paginii de la adresa URL externă ...
-OrEnterPageInfoManually=Sau să creați o pagină de la zero sau dintr-un șablon de pagină ...
-FetchAndCreate=Aduceți și creați
-ExportSite=Exportați site-ul 
+WebsiteId=ID site
+CreateByFetchingExternalPage=Creare pagină/container prin preluarea paginii de la adresa URL externă...
+OrEnterPageInfoManually=Sau creați o pagină de la zero, sau dintr-un șablon de pagină...
+FetchAndCreate=Adu și crează
+ExportSite=Export site
 ImportSite=Importați șablonul de site web
-IDOfPage=ID paginii
-Banner=Afis
-BlogPost=Postare pe blog
-WebsiteAccount=Contul site-ului
-WebsiteAccounts=Conturi de site
-AddWebsiteAccount=Creați un cont de site web
+IDOfPage=ID pagină
+Banner=Afiş banner
+BlogPost=Postare blog
+WebsiteAccount=Cont site
+WebsiteAccounts=Conturi site
+AddWebsiteAccount=Creare cont site web
 BackToListForThirdParty=Înapoi la lista terţilor
-DisableSiteFirst=Dezactivați mai întâi site-ul web
+DisableSiteFirst=Dezactivează mai întâi site-ul web
 MyContainerTitle=Titlul site-ului meu web
 AnotherContainer=Așa se include conținutul altei pagini/container (este posibil să aveți o eroare aici dacă activați codul dinamic, deoarece subcontainerul încorporat poate să nu existe) 
 SorryWebsiteIsCurrentlyOffLine=Ne pare rău, acest site este în prezent offline. Reveniţi mai târziu ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Activați tabelul contului site-ului web
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activați tabelul pentru a stoca conturile site-urilor web (Autentificare/parola) pentru fiecare site / terț
+WEBSITE_USE_WEBSITE_ACCOUNTS=Activare tabel cont site web
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activează tabelul de stocare conturile site-uri web (nume de autentificare/parolă) pentru fiecare site/terț
 YouMustDefineTheHomePage=Mai întâi trebuie să definiți pagina de Home implicită
 OnlyEditionOfSourceForGrabbedContentFuture=Atenţie: Crearea unei pagini web prin importarea unei pagini web externe este rezervată utilizatorilor cu experiență. În funcție de complexitatea paginii sursă, rezultatul importului poate diferi de original. De asemenea, dacă pagina sursă folosește stiluri CSS obișnuite sau cod Javascript conflictual, acesta poate altera aspectul sau caracteristicile editorului site-ului Web atunci când lucrați pe această pagină. Această metodă este o modalitate mai rapidă de a crea o pagină, dar este recomandat să creezi pagina ta de la zero sau de la un șablon de pagină sugerat. <br>De asemenea, reţineţi că editorul inline nu funcționează corect atunci când este utilizat pe o pagină externă capturată.
-OnlyEditionOfSourceForGrabbedContent=Numai ediția sursei HTML este posibilă atunci când conținutul a fost preluat de pe un site extern
+OnlyEditionOfSourceForGrabbedContent=Numai editarea sursei HTML este posibilă atunci când conținutul a fost preluat de pe un site extern
 GrabImagesInto=Luați și imaginile găsite în CSS și pagină.
 ImagesShouldBeSavedInto=Imaginile trebuie salvate în director
 WebsiteRootOfImages=Directorul rădăcină pentru imaginile de pe site
 SubdirOfPage=Subdirector dedicat paginii
-AliasPageAlreadyExists=Pagina Alias <strong> %s </strong> există deja
+AliasPageAlreadyExists=Pagina alias <strong>%s</strong> există deja
 CorporateHomePage=Pagina de Home a companiei
-EmptyPage=Pagina goală
+EmptyPage=Pagină goală
 ExternalURLMustStartWithHttp=Adresa URL externă trebuie să înceapă cu http:// sau https://
 ZipOfWebsitePackageToImport=Încărcați fișierul Zip cu pachetul șablon website
 ZipOfWebsitePackageToLoad=sau Alegeți un pachet șablon website încorporat disponibil
 ShowSubcontainers=Afişare conţinut dinamic
 InternalURLOfPage=Adresa URL internă a paginii
-ThisPageIsTranslationOf=Această pagină/recipient este o traducere a
-ThisPageHasTranslationPages=Această pagină / recipient are traducere
-NoWebSiteCreateOneFirst=Niciun site nu a fost creat încă. Creați primul.
+ThisPageIsTranslationOf=Această pagină/container este o traducere a
+ThisPageHasTranslationPages=Această pagină/container are traducere
+NoWebSiteCreateOneFirst=Niciun site nu a fost creat încă. Creați unul mai întâi.
 GoTo=Mergi la
 DynamicPHPCodeContainsAForbiddenInstruction=Adăugați cod PHP dinamic care conține instrucțiunea PHP '<strong>%s</strong>' care este interzisă în mod implicit ca şi conținut dinamic (consultați opțiunile ascunse WEBSITE_PHP_ALLOW_xxx pentru a extinde lista comenzilor permise). 
 NotAllowedToAddDynamicContent=Nu aveți permisiunea să adăugați sau să editați conținut dinamic PHP în site-uri web. Cereți permisiunea sau păstrați codul nemodificat în etichetele php.
@@ -116,13 +116,13 @@ SearchReplaceInto=Căutare | Înlocuire
 ReplaceString=String nou
 CSSContentTooltipHelp=Introduceți aici conținut CSS. Pentru a evita orice conflict cu CSS-ul aplicației, asigurați-vă că adaugaţi cu prepend toate declarațiile la clasa .bodywebsite. De exemplu: <br><br>#mycssselector, input.myclass: hover {...}<br>trebuie să fie <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br>Notă: Dacă aveți un fișier mare fără acest prefix, puteți utiliza 'lessc' pentru a-l converti şi adăuga prefixul .bodywebsite peste tot.
 LinkAndScriptsHereAreNotLoadedInEditor=Atenţie: Acest conținut este emis numai când site-ul este accesat de pe un server. Nu este utilizat în modul Edit, deci dacă trebuie să încărcați fișiere javascript și în modul de editare, trebuie doar să adăugați eticheta 'script src=...' în pagină.
-Dynamiccontent= Exemplu de pagină cu conținut dinamic
+Dynamiccontent=Exemplu de pagină cu conținut dinamic
 ImportSite=Importați șablonul de site web
 EditInLineOnOff=Modul 'Editare inline' este %s
 ShowSubContainersOnOff=Modul de executare 'conţinut dinamic' este %s
 GlobalCSSorJS=Fișierul CSS/JS/Header global al website-ului
 BackToHomePage=Înapoi la pagina principală...
-TranslationLinks=Linkuri traducere
+TranslationLinks=Link-uri traducere
 YouTryToAccessToAFileThatIsNotAWebsitePage=Încercați să accesați o pagină care nu este disponibilă <br>(ref =%s, type =%s, status =%s)
 UseTextBetween5And70Chars=Pentru optimizare SEO, utilizați un text între 5 și 70 de caractere 
 MainLanguage=Limba principală
@@ -132,8 +132,16 @@ PublicAuthorAlias=Alias public autor
 AvailableLanguagesAreDefinedIntoWebsiteProperties=Limbile disponibile sunt definite în proprietățile website-ului
 ReplacementDoneInXPages=Înlocuirea s-a făcut în %s pagini sau containere
 RSSFeed=Feed RSS
-RSSFeedDesc=Puteți obține un flux RSS al celor mai recente articole cu tipul 'blogpost' folosind această adresă URL
+RSSFeedDesc=Puteți obține un flux RSS al celor mai recente articole de tipul 'blogpost' folosind această adresă URL
 PagesRegenerated=%s pagină(i) /container(e) regenerate
 RegenerateWebsiteContent=Regenerați fișierele cache ale site-ului web
 AllowedInFrames=Permis în Frame-uri
 DefineListOfAltLanguagesInWebsiteProperties=Definiți lista tuturor limbilor disponibile în proprietățile site-ului web.
+GenerateSitemaps=Generează fişierul sitemap pentru website
+ConfirmGenerateSitemaps=Dacă confirmi, vei şterge fişierul sitemap existent...
+ConfirmSitemapsCreation=Confirmare generare sitemap
+SitemapGenerated=Sitemap generat
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon-ul trebuie să fie png
+ErrorFaviconSize=Favicon-ul trebuie să fie de dimensiunea 32x32
+FaviconTooltip=Încarcă o imagine care este png de 32x32
diff --git a/htdocs/langs/ro_RO/zapier.lang b/htdocs/langs/ro_RO/zapier.lang
index b57810cb893..a5a62efa301 100644
--- a/htdocs/langs/ro_RO/zapier.lang
+++ b/htdocs/langs/ro_RO/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier pentru Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Modul Zapier pentru Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Configurare modul Zapier pentru Dolibarr
-ZapierDescription=Interface with Zapier
+ZapierForDolibarrSetup=Configurare modul Zapier pentru Dolibarr
+ZapierDescription=Interfaţare cu Zapier
+ZapierAbout=Despre modulul Zapier
+ZapierSetupPage=Nu este nevoie de o configurare pe partea Dolibarr pentru a utiliza Zapier. Cu toate acestea, trebuie să generezi și să publici un pachet pe zapier pentru a putea utiliza Zapier cu Dolibarr. Consultă documentația de pe <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">această pagină wiki</a>.
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 2b44d84c585..626f22f3a36 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Привязка
@@ -209,7 +209,7 @@ Codejournal=Журнал
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Бухгалтерские записи
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Дата экспорта
 WarningReportNotReliable=Внимание, этот отчет не основан на Гроссбухе, поэтому не содержит транзакции, измененные вручную в Гроссбухе. Если журналирование актуально, бухгалтерский учет будет более точным.
 ExpenseReportJournal=Журнал отчетов о затратах
 InventoryJournal=Журнал инвентарного учета
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 621f545e086..8ec9e3b6d0f 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Удалить блокировку подключений
 YourSession=Ваша сессия
 Sessions=Пользовательские сессии
 WebUserGroup=Пользователь / группа Web-сервера
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Кажется, ваша конфигурация PHP не позволяет отображать активные сеансы. Каталог, используемый для сохранения сеансов ( <b>%s</b> ), может быть защищен (например, разрешениями ОС или директивой PHP open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Примечание: "Да" влияет только тогд
 RemoveLock=Удалите/переименуйте файл <b>%s</b>, если он существует, чтобы разрешить использование инструмента обновления/установки.
 RestoreLock=Восстановите файл <b>%s</b> с разрешением только для чтение, чтобы отключить дальнейшее использование инструмента обновления/установки.
 SecuritySetup=Настройка безопасности
+PHPSetup=PHP setup
 SecurityFilesDesc=Определите здесь параметры, связанные с безопасностью загрузки файлов.
 ErrorModuleRequirePHPVersion=Ошибка, этот модуль требует PHP версии %s или выше
 ErrorModuleRequireDolibarrVersion=Ошибка, этот модуль требует Dolibarr версии %s или выше
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Эта область обеспечивает функци
 Purge=Очистить
 PurgeAreaDesc=Эта страница позволяет вам удалить все файлы, созданные или сохраненные Dolibarr (временные файлы или все файлы в каталоге <b> %s</b> ). Использование этой функции обычно не требуется. Он предоставляется в качестве обходного пути для пользователей, чей Dolibarr размещен поставщиком, который не предлагает разрешения на удаление файлов, созданных веб-сервером.
 PurgeDeleteLogFile=Удаление файлов журналов, включая <b>%s</b> определенный для модуля Syslog (без риска потери данных)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Удалить все файлы в каталоге: <b>%s</b> . <br> Это удалит все сгенерированные документы, связанные с элементами (контрагенты, счета и т.д.), файлы, загруженные в модуль ECM, резервные копии базы данных и временные файлы.
 PurgeRunNow=Очистить сейчас
@@ -232,6 +234,7 @@ BoxesAvailable=Доступные виджеты
 BoxesActivated=Включенные виджеты
 ActivateOn=Активировать
 ActiveOn=Активирован
+ActivatableOn=Activatable on
 SourceFile=Исходный файл
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Доступно, только если JavaScript не отключен
 Required=Обязательный
@@ -347,9 +350,10 @@ LastActivationAuthor=Последний активированный автор
 LastActivationIP=Последний активированный IP-адрес
 UpdateServerOffline=Сервер обновления недоступен
 WithCounter=Управление счетчиком
-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> код клиента на n символов <br> <b> {cccc000} </b> код клиента на n символов с счетчиком, предназначенным для клиента. Этот счетчик, предназначенный для клиента, сбрасывается в то же время, что и глобальный счетчик. <br> <b> {tttt} </b> Код контрагента для n символов (см. Меню «Главная страница - Настройка - Словарь - Типы контрагентов») , Если вы добавите этот тег, счетчик будет отличаться для каждого типа контрагента. <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Все остальные символы в маске останутся нетронутыми. <br>Пробелы не допускается. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<U> Пример для 99-го %s контрагента Компании с датой 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u>Пример контрагента созданного 2007-03-01:</u> <br>
 GenericMaskCodes4c=<u>Пример товара созданного 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Оставьте это поле пустым, чт
 ExtrafieldParamHelpselect=Список значений должен быть строками формата: ключ, значение (где ключ не может быть равен 0) <br><br> например: <br> 1, значение1 <br> 2, значение2 <br> code3, значение3 <br> ... <br><br> Чтобы иметь список в зависимости от другого списка дополнительных атрибутов: <br> 1, значение1|options_ <i>parent_list_code</i> : parent_key <br> 2, значение2|options_ <i>parent_list_code</i> : parent_key <br><br> Чтобы иметь список в зависимости от другого списка: <br> 1, значение1 | <i>parent_list_code</i> : parent_key <br> 2, значение2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Список значений должен быть строками с форматом: ключ, значение (где ключ не может быть равен 0) <br><br> например: <br> 1, значение1 <br> 2, значение2 <br> 3, значение3 <br> ...
 ExtrafieldParamHelpradio=Список значений должен быть строками с форматом: ключ, значение (где ключ не может быть равен 0) <br><br> например: <br> 1, значение1 <br> 2, значение2 <br> 3, значение3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Список значений поступает из таблицы <br> Синтаксис: table_name:label_field:id_field::filter <br> Пример: c_typent: libelle:id::filter <br><br> Фильтр может быть простым тестом (например, active = 1) для отображения только активного значения <br> Вы также можете использовать $ID$ в фильтре с текущим идентификатором текущего объекта. <br> Чтобы сделать SELECT в фильтре, используйте $SEL$ <br> если вы хотите фильтровать extrafield, используйте синтаксис extra.fieldcode = ... (где code field - это код extrafield) <br><br> Чтобы иметь список в зависимости от другого списка дополнительных атрибутов: <br> c_typent:libelle:id: options_ <i>parent_list_code</i>|parent_column: filter <br><br> Чтобы иметь список в зависимости от другого списка: <br> c_typent: ibelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Библиотека используемая для создания PDF-файлов
@@ -541,6 +545,8 @@ Module40Name=Поставщики
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Отчет об ошибках
 Module42Desc=Средства регистрации (file, syslog, ...). Такие журналы предназначены для технических/отладочных целей.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Редакторы
 Module49Desc=Управления редактором
 Module50Name=Продукция
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Подключение к службе GeoIP MaxMind для преобразования IP-адреса в название страны
 Module3200Name=Неограниченные архивы
 Module3200Desc=Включите неизменяемый журнал деловых событий. События архивируются в режиме реального времени. Журнал представляет собой доступную только для чтения таблицу связанных событий, которые можно экспортировать. Этот модуль может быть обязательным для некоторых стран.
+Module3400Name=Социальные сети
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=Управление персоналом
 Module4000Desc=Управление персоналом (управление отделом, контракты и чувства сотрудников)
 Module5000Name=Группы компаний
 Module5000Desc=Управление группами компаний
-Module6000Name=Бизнес-Процесс
-Module6000Desc=Управление рабочим процессом (автоматическое создание объекта и/или автоматическое изменение статуса)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Веб-сайты
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Управление запросами на отпуск
@@ -805,7 +813,8 @@ PermissionAdvanced253=Создать / изменить внутренних / 
 Permission254=Создать / изменить только внешних пользователей
 Permission255=Изменить пароли других пользователей
 Permission256=Удалить или отключить других пользователей
-Permission262=Расширить доступ ко всем контрагентам (не только контрагентам, для которых этот пользователь является торговым представителем). <br> Не действует для внешних пользователей (всегда ограничены  предложениями, заказами, счетами, контрактами и т. д.). <br> Не действует для проектов (только правила разрешений, видимости и назначения).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Читать CA
 Permission272=Читать счета
 Permission273=Выпуск счетов
@@ -1175,7 +1184,8 @@ SetupDescription2=Следующие два раздела являются об
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Другие пункты меню настройки управляют дополнительными параметрами.
-LogEvents=Безопасность ревизии события
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Аудит
 InfoDolibarr=О Dolibarr
 InfoBrowser=О браузере
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Похоже требуется запуск 
 YouMustRunCommandFromCommandLineAfterLoginToUser=Вы должны запустить эту команду из командной строки после Войти в оболочку с пользователем <b>%s.</b>
 YourPHPDoesNotHaveSSLSupport=SSL функций, не доступных в PHP
 DownloadMoreSkins=Дополнительные шкуры для загрузки
-SimpleNumRefModelDesc=Возвращать справочный в формате %syymm-nnnn, где yy - год, mm - месяц, а nnnn - последовательность без сброса
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Показать профессиональный идентификатор с адресами
 ShowVATIntaInAddress=Скрыть номер НДС внутри Сообщества с адресами
 TranslationUncomplete=Частичный перевод
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Прокси-сервер: имя / адрес
 MAIN_PROXY_PORT=Прокси-сервер: Порт
 MAIN_PROXY_USER=Прокси-сервер: Логин
 MAIN_PROXY_PASS=Прокси-сервер: пароль
-DefineHereComplementaryAttributes=Определите здесь любые дополнительные / пользовательские атрибуты, которые вы хотите включить для: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Дополнительные атрибуты
 ExtraFieldsLines=Дополнительные атрибуты (строки)
 ExtraFieldsLinesRec=Дополнительные атрибуты (шаблоны счетов-фактур)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Логин (Unix)
 LDAPFieldLoginExample=Пример: UID
 LDAPFilterConnection=Фильтр поиска
 LDAPFilterConnectionExample=Пример: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Логин (самба, activedirectory)
 LDAPFieldLoginSambaExample=Пример: samaccountname
 LDAPFieldFullname=Фамилия Имя
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=В вашей компании определено, ч
 AccountancyCode=Бухгалтерский код
 AccountancyCodeSell=Бух. код продаж
 AccountancyCodeBuy=Бух. код покупок
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Настройка модуля событий и повестки дня
 PasswordTogetVCalExport=Ключевые разрешить экспорт ссылке
+SecurityKey = Security Key
 PastDelayVCalExport=Не экспортировать события старше
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Цвет фона для нечетных строк
 BackgroundTableLineEvenColor=Цвет фона для четных строк таблицы
 MinimumNoticePeriod=Минимальный период уведомления (ваш запрос на отпуск должен быть выполнен до этой задержки)
 NbAddedAutomatically=Количество дней, добавленных в счетчики пользователей (автоматически) каждый месяц
-EnterAnyCode=Это поле содержит ссылку для идентификации строки. Введите любое значение по вашему выбору, но без специальных символов.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=Цвет RGB находится в формате HEX, например: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Нижний отступ PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Для этого модуля не требуется никаких специальных настроек.
 SetToYesIfGroupIsComputationOfOtherGroups=Установите для этого значение yes, если эта группа является вычислением других групп
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Было найдено несколько вариантов языка
 RemoveSpecialChars=Удаление специальных символов
 COMPANY_AQUARIUM_CLEAN_REGEX=Фильтр регулярных выражений для очистки значения (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Настройка модуля Социальные сети
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Примечание: В меню %s - %s для параметра «Использовать налог с продаж или НДС» было установлено значение  <strong>Выкл.</strong> , поэтому для продаж всегда используется 0 налога с продаж или НДС.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index c5f91b7749e..c1c19cf04e0 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Ваш мандат SEPA
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 35266712613..1dc31d36f5f 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -52,11 +52,12 @@ Invoices=Счета-фактуры
 InvoiceLine=Строка счета-фактуры
 InvoiceCustomer=Счёт клиента
 CustomerInvoice=Счёт клиента
-CustomersInvoices=Счета-фактуры Покупателей
+CustomersInvoices=Счета клиента
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Счета-фактуры поставщика
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=счета-фактуры Поставщиков
+SupplierBills=Счета-фактуры поставщика
 Payment=Платеж
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Платежи уже сделаны
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Правила оплаты
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Произвольное значение (%% от суммы)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Банковский перевод
 PaymentTypeShortVIR=Банковский перевод
@@ -494,12 +498,16 @@ Cash=Наличные
 Reported=Задержан
 DisabledBecausePayments=Невозможно, поскольку есть некоторые платежи
 CantRemovePaymentWithOneInvoicePaid=Не удается удалить оплаты поскольку есть по крайней мере один счет-фактура классифицированный как 'оплачен'
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Ожидаемые платежи
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Оплачен этим платежом
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Платить
 ToMakePaymentBack=Возврат платежа
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Функция возвращает номер в формате %syymm-nnnn  для стандартных счетов и %syymm-nnnn для кредитных авизо, где yy год,  mm месяц и nnnn является непрерывной последовательностью и не возвращает 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
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Документ, начинающийся с $syymm, уже существует и не совместим с этой моделью последовательности. Удалите или переименуйте его, чтобы активировать этот модуль.
-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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index 7cfe3e8a6e7..afe6542def5 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Информация для входа
 BoxLastRssInfos=RSS информация
 BoxLastProducts=Последние  %s Продукты/ Услуги
@@ -17,9 +18,13 @@ BoxLastActions=Последние действия
 BoxLastContracts=Последние контракты
 BoxLastContacts=Последние контакты/адреса
 BoxLastMembers=Последние участники
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Последние вмешательства
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Последние  %s новостей от %s
 BoxTitleLastProducts=Продукты/Услуги: последних %s изменений 
 BoxTitleProductsAlertStock=Продукты: имеющиеся оповещения
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Бухгалтерия
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index fc188dff315..f70d36de5f5 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Раздел тегов/категорий постав
 CustomersCategoriesArea=Раздел тегов/категорий клиентов
 MembersCategoriesArea=Раздел тегов/категорий участников
 ContactsCategoriesArea=Раздел тегов/категорий контактов
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Раздел тегов/категорий проектов
 UsersCategoriesArea=Раздел тегов/категорий пользователей
 SubCats=Подкатегории
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Показать тег/категорию
 ByDefaultInList=By default in list
 ChooseCategory=Выберите категорию
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index 2f8f9c2005b..b38a6ba0a2f 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -43,9 +43,10 @@ Individual=Физическое лицо
 ToCreateContactWithSameName=Будет автоматически создан контакт/адрес с той информацией которая связывает контрагента с контрагентом. В большинстве случаев, даже если контрагент является физическим лицом, достаточно создать одного контрагента.
 ParentCompany=Материнская компания
 Subsidiaries=Филиалы
-ReportByMonth=Отчет за месяц
-ReportByCustomers=Отчет клиента
-ReportByQuarter=Отчет по рейтингу
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Код корректности
 RegisteredOffice=Зарегистрированный офис
 Lastname=Фамилия
@@ -172,14 +173,20 @@ ProfId1ES=Проф Id 1 (CIF / NIF)
 ProfId2ES=Проф Id 2 (номер социального страхования)
 ProfId3ES=Проф Id 3 (CNAE)
 ProfId4ES=Проф Id 4 (Энциклопедический номер)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Проф Id 1 (SIREN)
 ProfId2FR=Проф Id 2 (SIRET)
 ProfId3FR=Проф Id 3 (NAF, старые APE)
 ProfId4FR=Проф Id 4 (RCS / РМ)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Проф ID 1 (регистрационный номер)
 ProfId2GB=-
 ProfId3GB=Проф Id 3 (SIC)
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Я бы. проф. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Разрешенный бизнес)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Проф ID 1 (NIPC)
 ProfId2PT=Проф Id 2 (номера социального страхования)
 ProfId3PT=Проф Id 3 (коммерческий Запись номер)
 ProfId4PT=Проф Id 4 (Консерватория)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (ОГРН)
 ProfId2RU=Prof Id 2 (ИНН)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Валюта неуплаченного счёта
 OutstandingBill=Максимальный неуплаченный счёт
 OutstandingBillReached=Достигнут максимум не оплаченных счетов
 OrderMinAmount=Минимальная сумма заказа
-MonkeyNumRefModelDesc=Возвращает число в формате %syymm-nnnn для кода клиента и %syymm-nnnn для кода поставщика, где yy - год, mm - месяц, а nnnn -  последовательность без разрыва и без сброса.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Код покупателю/поставщику не присваивается. Он может быть изменен в любое время.
 ManagingDirectors=Имя управляющего или управляющих (Коммерческого директора, директора, президента...)
 MergeOriginThirdparty=Копия контрагента (контрагент которого вы хотите удалить)
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index c7e9361c99f..75ed2fffd16 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=НДС собрали
 StatusToPay=Для оплаты
 SpecialExpensesArea=Раздел для всех специальных платежей
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Заказчиком оплаты счетов-факту
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Социальный/налоговый сбор
 PaymentVat=НДС платеж
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Список платежей
 ListOfCustomerPayments=Список клиентов платежи
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF оплаты
 LT2PaymentsES=IRPF платежей
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Чек при ввода даты
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Отчёт по собранному и оплаченному НДС клиента
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Отчёт по ставке RE
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Строки счёта для отправки
 ByProductsAndServices=By product and service
 RefExt=Внешняя ссылка
-ToCreateAPredefinedInvoice=Для создания шаблона счёта создайте стандартный счёт, а затем нажмите кнопку "%s" без его сохранения.
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Ссылка для заказа
 Mode1=Метод 1
 Mode2=Метод 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Клонировать для следующего месяца
 SimpleReport=Простой отчет
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
index b943f9d58e0..fc73bb1c472 100644
--- a/htdocs/langs/ru_RU/ecm.lang
+++ b/htdocs/langs/ru_RU/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 3bcf15212e8..57d20e606ad 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> не найден (Неверный пут
 ErrorFunctionNotAvailableInPHP=<b>Функция %s</b> необходим для этой функции, но не доступен в этой версии / настройки PHP.
 ErrorDirAlreadyExists=Директория с таким именем уже существует.
 ErrorFileAlreadyExists=Файл с этим именем уже существует.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Файл не получил полностью на сервер.
 ErrorNoTmpDir=Временная директория %s не существует.
 ErrorUploadBlockedByAddon=Добавить заблокирован PHP / Apache плагин.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/ru_RU/externalsite.lang b/htdocs/langs/ru_RU/externalsite.lang
index ef3735cae09..f4987dd02cb 100644
--- a/htdocs/langs/ru_RU/externalsite.lang
+++ b/htdocs/langs/ru_RU/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Установка ссылки на внешний веб-сайт
-ExternalSiteURL=URL внешнего сайта
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Модуль ВнешнийСайт не был надлежащим образом настроен.
 ExampleMyMenuEntry=Пункт "Моё меню"
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index ac8383b1f2f..6d10082dbb5 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Дата изм.
 IPModification=Modification IP
 DateLastModification=Дата последнего изменения
 DateValidation=Дата проверки
+DateSigning=Signing date
 DateClosing=Дата закрытия
 DateDue=Срок выполнения
 DateValue=Дата зачисления
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Цена за единицу (без налога) (валю
 UnitPriceTTC=Цена за единицу
 PriceU=Цена ед.
 PriceUHT=Цена ед. (нетто)
-PriceUHTCurrency=Цена (валюта)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=Цена ед. (с налогом)
 Amount=Сумма
 AmountInvoice=Сумма счета-фактуры
@@ -389,6 +390,8 @@ AmountTotal=Общая сумма
 AmountAverage=Средняя сумма
 PriceQtyMinHT=Цена за мин. количество (без налога)
 PriceQtyMinHTCurrency=Цена за мин. количество (без налога) (валюта)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Процент
 Total=Всего
 SubTotal=Подитог
@@ -724,7 +727,7 @@ MenuMembers=Участники
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Лимит Dolibarr (Меню Главная-Настройки-Безопасность): %s Кб, лимит PHP: %s Кб
-NoFileFound=Нет документов, сохраненных в этом каталоге
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Текущий язык
 CurrentTheme=Текущая тема
 CurrentMenuManager=Менеджер текущего меню
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Удалить строку '%s'
 SomeTranslationAreUncomplete=Некоторые из предлагаемых языков пакетов могут быть переведены только частично или могут содержать ошибки. Пожалуйста, помогите исправить ваш язык, зарегистрировавшись по адресу <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/,</a> чтобы добавить свои улучшения.
-DirectDownloadLink=Прямая ссылка для скачивания (общедоступная/внешняя)
-DirectDownloadInternalLink=Прямая ссылка для скачивания (требуется регистрация и необходимые разрешения)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Загрузка
 DownloadDocument=Скачать документ
 ActualizeCurrency=Обновить текущий курс
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Контакты
 SearchIntoMembers=Участники
 SearchIntoUsers=Пользователи
 SearchIntoProductsOrServices=Продукты или услуги
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Проекты
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Задание
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Сочетание клавиш
 AssignedTo=Ответств.
 Deletedraft=Удалить черновик
 ConfirmMassDraftDeletion=Подтверждение пакетного удаления Черновиков
-FileSharedViaALink=Файл, общий доступ по ссылке
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Сначала выберите контрагента ...
 YouAreCurrentlyInSandboxMode=В настоящее время вы в  %s режиме "песочницы"
 Inventory=Инвентаризация
 AnalyticCode=Аналитический код
 TMenuMRP=ППМ
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Показать больше информации
 NoFilesUploadedYet=Пожалуйста, загрузите сначала документ
 SeePrivateNote=Смотреть личную заметку
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/ru_RU/margins.lang b/htdocs/langs/ru_RU/margins.lang
index 61546dd6e58..a205fac2481 100644
--- a/htdocs/langs/ru_RU/margins.lang
+++ b/htdocs/langs/ru_RU/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Детали наценки
 ProductMargins=Товарные наценки
 CustomerMargins=Наценки клиентов
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=Пользовательские наценки
 ProductService=Продукт или Услуга
 AllProducts=Все продукты и услуги
 ChooseProduct/Service=Выберите продукт или услугу
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=Как товар
 UseDiscountAsService=Как услуга
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Себестоимость
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Ставка должна быть числом
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Показать инф-цию о наценке
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index c2587c40060..2e01c0c009d 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Список кандидатов в участники (на
 MembersListValid=Список действительных участников
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=Список квалифицированных участников
 MenuMembersToValidate=Проект участники
 MenuMembersValidated=Подтвержденные участники
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Члены с подпиской на получение
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Истек
 MemberStatusPaid=Подписка до даты
 MemberStatusPaidShort=До даты
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Проект участники
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Утверждена
@@ -82,6 +87,8 @@ Physical=Физическая
 Moral=Моральные
 MorAndPhy=Moral and Physical
 Reenable=Снова
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Удаление члена
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Этикетки формате
 DescADHERENT_ETIQUETTE_TEXT=Текст, который будет напечетан на адресном листе пользователя
@@ -162,6 +170,7 @@ DocForLabels=Создание листов адрес (формат для вы
 SubscriptionPayment=Абонентская плата
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Члены статистику по странам
 MembersStatisticsByState=Члены статистики штата / провинции
 MembersStatisticsByTown=Члены статистики города
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index 5e148001e53..6910f244aa4 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Сделать заказ
 MakeOrder=Сделать заказ
 SupplierOrder=Purchase order
 SuppliersOrders=Заказы
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Заказы на продажу
@@ -141,11 +143,12 @@ OrderByEMail=Адрес электронной почты
 OrderByWWW=Интернет
 OrderByPhone=Телефон
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=Простая модель для
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Оплатить заказы
+CreateInvoiceForThisSupplier=Оплатить заказы
 NoOrdersToInvoice=Нет заказов для оплаты
 CloseProcessedOrdersAutomatically=Отметить "В обработке" все выделенные заказы
 OrderCreation=Создание заказа
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 2a5bf106504..1a1f99c8c45 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Создан %s
 ModifiedBy=Модифицированное% по S
 ValidatedBy=Подтверждено %s
+SignedBy=Signed by %s
 ClosedBy=Закрытые% по S
 CreatedById=ID пользователя, который создал
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=Ваши новые ключи для доступа
 NewKeyWillBe=Ваш новый ключ для доступа к ПО будет
 ClickHereToGoTo=Нажмите сюда, чтобы перейти к %s
 YouMustClickToChange=Однако, вы должны сначала нажать на ссылку для подтверждения изменения пароля
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Если вы не запрашивали эти изменения, забудьте про это электронное письмо.  Ваши данные в безопасности.
 IfAmountHigherThan=Если количество более чем <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
index 371476b81dc..befbae44568 100644
--- a/htdocs/langs/ru_RU/productbatch.lang
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Использовать номер партии/серийный номер
-ProductStatusOnBatch=Да (требуется серийный номер/номер партии)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=Нет (серийный номер/номер партии не используется)
-ProductStatusOnBatchShort=Да
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Нет
 Batch=Партии/серийный номер
 atleast1batchfield=Дата уплаты или дата продажи или Лот / Серийный номер
@@ -22,3 +24,12 @@ ProductLotSetup=Настройка лота / серийного модуля
 ShowCurrentStockOfLot=Показать текущий запас для пары товара / лота
 ShowLogOfMovementIfLot=Показать журнал движений для пары product / lot
 StockDetailPerBatch=Детальная информация о лоте
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 105d51de4e7..fca1501a90e 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Предустановленные товары/услуги для продажи
@@ -313,7 +314,7 @@ LastUpdated=Последнее обновление
 CorrectlyUpdated=Правильно обновлено
 PropalMergePdfProductActualFile=Файлы, используемые для добавления в PDF Azur, являются
 PropalMergePdfProductChooseFile=Выберите PDF-файлы
-IncludingProductWithTag=Включая товар/услугу с тегом
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Цена по умолчанию, реальная цена может зависеть от клиента
 WarningSelectOneDocument=Выберите хотя бы один документ
 DefaultUnitToShow=Единица
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 2b752094276..2ae71da669f 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
index bd139cfed29..4575b0dc66e 100644
--- a/htdocs/langs/ru_RU/propal.lang
+++ b/htdocs/langs/ru_RU/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Отправить коммерческое предложен
 DatePropal=Дата предложения
 DateEndPropal=Дата окончания действия
 ValidityDuration=Срок действия
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Пропал% не найдены
 AddToDraftProposals=Добавить проект коммерческого предложения
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Коммерческое предложение и линий
 ProposalLine=Предложение линия
+ProposalLines=Proposal lines
 AvailabilityPeriod=Наличие задержки
 SetAvailability=Задержка устанавливается доступность
 AfterOrder=после заказа
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Письменное подтверждение, пе
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 25e96f3910c..5b0fc6b9aaf 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -19,8 +19,8 @@ Stock=Фондовый
 Stocks=Акции
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Вместо
-LocationSummary=Сокращенное наименование расположение
-NumberOfDifferentProducts=Кол-во различных продуктов
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Общее количество продукции
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Склады стоимости
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Виртуальный запас
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Идентификатор склад
 DescWareHouse=Описание склада
 LieuWareHouse=Локализация склад
 WarehousesAndProducts=Склады и продукты
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Значение
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Продажа Цена за штуку
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Пополнения
 NbOfProductBeforePeriod=Количество продукта %s в остатке на начало выбранного периода (< %s)
 NbOfProductAfterPeriod=Количество продукта %s в остатке на конец выбранного периода (< %s)
 MassMovement=Массовое перемещение
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Получатели заказа
 StockMovementRecorded=Перемещения остатков записаны
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Инвентарная ведомость
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Открыть заново
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index 80f0528ac10..bbfecb4779f 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Поставщики
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Счета-фактуры поставщика
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=Новый поставщик
 History=История
diff --git a/htdocs/langs/ru_RU/ticket.lang b/htdocs/langs/ru_RU/ticket.lang
index 708af1e5769..4c4bf7788a3 100644
--- a/htdocs/langs/ru_RU/ticket.lang
+++ b/htdocs/langs/ru_RU/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Тип
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index d2a34f41a12..b4072589ddc 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Удалить из группы
 PasswordChangedAndSentTo=Пароль изменен и направил <b>в %s.</b>
 PasswordChangeRequest=Запрос на изменение пароля для <b>%s</b>
 PasswordChangeRequestSent=Запрос на изменение пароля <b>для %s направлено %s.</b>
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Подтвердите сброс пароля
 MenuUsersAndGroups=Пользователи и Группы
 LastGroupsCreated=Последние %s созданные группы 
@@ -70,9 +72,10 @@ ExportDataset_user_1=Пользователи и их свойства
 DomainUser=Домен пользователя %s
 Reactivate=Возобновить
 CreateInternalUserDesc=Эта форма позволяет вам создать внутреннего пользователя в вашей компании. Чтобы создать внешнего пользователя (клиента, поставщика и т.д.), используйте кнопку «Создать пользователя Dolibarr» из карточки контакта этого контрагента.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Разрешение предоставляется, поскольку унаследовал от одного из пользователей в группы.
 Inherited=Унаследованный
+UserWillBe=Created user will be
 UserWillBeInternalUser=Созданный пользователь будет внутреннего пользователя (потому что не связаны с определенным третьим лицам)
 UserWillBeExternalUser=Созданный пользователь будет внешний пользователь (из-за связанных с определенной третьей стороны)
 IdPhoneCaller=Идентификатор телефона абонента
@@ -109,8 +112,10 @@ UserAccountancyCode=Код учета пользователя
 UserLogoff=Выход пользователя
 UserLogged=Пользователь вошел
 DateOfEmployment=Employment date
-DateEmployment=Дата начала трудоустройства
+DateEmployment=Employment
+DateEmploymentstart=Дата начала трудоустройства
 DateEmploymentEnd=Дата окончания занятости
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=Вы не можете отключить свою собственную запись пользователя
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 775344b328a..8637448b60d 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Читать
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/ru_RU/zapier.lang b/htdocs/langs/ru_RU/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/ru_RU/zapier.lang
+++ b/htdocs/langs/ru_RU/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/ru_UA/admin.lang b/htdocs/langs/ru_UA/admin.lang
new file mode 100644
index 00000000000..cac0d063f48
--- /dev/null
+++ b/htdocs/langs/ru_UA/admin.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - admin
+ShowBugTrackLink=Show link "<strong>%s</strong>"
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index e3377be2231..fb708cba3c6 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Viazané riadky faktúr
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Priradiť riadok k účnovnému účtu
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Priradiť
@@ -209,7 +209,7 @@ Codejournal=časopis
 JournalLabel=Journal label
 NumPiece=Číslo kusu
 TransactionNumShort=Num. transakcie
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index bae00fceb7e..9a671606ef1 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Povoliť nové pripojenia
 YourSession=Vaša relácia
 Sessions=Users Sessions
 WebUserGroup=Webový server užívateľ / skupina
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Poznámka: áno je účinné len vtedy, ak je modul <b>%s</b> za
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Bezpečnostné nastavenia
+PHPSetup=PHP setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Chyba, tento modul vyžaduje PHP verzia %s alebo vyššia
 ErrorModuleRequireDolibarrVersion=Chyba, tento modul vyžaduje Dolibarr verzie %s alebo vyššia
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Očistiť
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Vyčistiť teraz
@@ -232,6 +234,7 @@ BoxesAvailable=Dostupné doplnky
 BoxesActivated=Aktivované doplnky
 ActivateOn=Aktivácia na
 ActiveOn=Aktivovaná
+ActivatableOn=Activatable on
 SourceFile=Zdrojový súbor
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostupné len v prípade, že je JavaScript nie je zakázaný
 Required=Potrebný
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Všetky ostatné znaky v maske zostanú nedotknuté. <br> Medzery nie sú povolené. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Príklad na tretie osoby vytvorené na 03.1.2007:</u> <br>
 GenericMaskCodes4c=<u>Príklad produktu vytvorili na 03.1.2007:</u> <br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Knižnica používaná pre generovanie PDF
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Redakcia
 Module49Desc=Editor pre správu
 Module50Name=Produkty
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind konverzie možnosti
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-spoločnosť
 Module5000Desc=Umožňuje spravovať viac spoločností
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Web stránky
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Vytvoriť / upraviť interné / externé užívateľa a op
 Permission254=Vytvoriť / upraviť externí používatelia iba
 Permission255=Upraviť ostatným používateľom heslo
 Permission256=Odstrániť alebo zakázať ostatným užívateľom
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Prečítajte CA
 Permission272=Prečítajte si faktúry
 Permission273=Vydanie faktúry
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Udalosti bezpečnostný audit
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=O Dolibarre
 InfoBrowser=O prehliadači
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=Je nutné spustiť tento príkaz z príkazového riadka po prihlásení do shellu s užívateľskými <b>%s</b> alebo musíte pridať parameter-w na konci príkazového riadku, aby <b>%s</b> heslo.
 YourPHPDoesNotHaveSSLSupport=SSL funkcia nie je k dispozícii vo vašom PHP
 DownloadMoreSkins=Ďalšie skiny k stiahnutiu
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Čiastočný preklad
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Doplnkové atribúty
 ExtraFieldsLines=Doplnkové atribúty (linky)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Prihlásenie (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Vyhľadávací filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Prihlásenie (samba, ActiveDirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Celé meno
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Predaj účtu. kód
 AccountancyCodeBuy=Nákup účet. kód
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Akcie a agenda Nastavenie modulu
 PasswordTogetVCalExport=Kľúč povoliť export odkaz
+SecurityKey = Security Key
 PastDelayVCalExport=Neexportovať udalosti staršie ako
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Farba pozadia pre nepárne riadky tabuľky
 BackgroundTableLineEvenColor=Farba pozadia pre párne riadky tabuľky
 MinimumNoticePeriod=Minimálny oznamovací čas ( Vaša požiadávka musi byť zaznamenaná pred týmto časom )
 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.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 877a8abd81b..0cea1cfce0f 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index ec49d768103..34636cf7302 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -52,11 +52,12 @@ Invoices=Faktúry
 InvoiceLine=Faktúra linka
 InvoiceCustomer=Zákazník faktúra
 CustomerInvoice=Zákazník faktúra
-CustomersInvoices=Zákazníci faktúry
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=dodávatelia faktúry
+SupplierBills=Vendor invoices
 Payment=Platba
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Platby neurobili
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Platba pravidlo
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Dátum posledného generovania faktúr
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Overiť faktúrý automaticky
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variabilná čiastka (%% celk.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bankový prevod
 PaymentTypeShortVIR=Bankový prevod
@@ -494,12 +498,16 @@ Cash=Hotovosť
 Reported=Oneskorený
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Predpokladaný platba
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Zaplatené touto platbou
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Zaplatiť
 ToMakePaymentBack=Oplatiť
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Bill počnúc $ syymm už existuje a nie je kompatibilný s týmto modelom sekvencie. Vyberte ju a premenujte ho na aktiváciu tohto modulu.
-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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Zmazať šablónu faktúrý
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
index 8036acd4779..9d0739d199a 100644
--- a/htdocs/langs/sk_SK/boxes.lang
+++ b/htdocs/langs/sk_SK/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Najnovšie akcie
 BoxLastContracts=Najnovšie zmluvy
 BoxLastContacts=Najnovšie kontakty/adresy
 BoxLastMembers=Najnovší užívatelia
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Najnovšie zásahy
 BoxCurrentAccounts=Otvoriť zostatok na účte
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Najnovšie %s novinky z %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Účtovníctvo
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index 9c7e4ed9951..3fcf110da7f 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index fc39a7f1038..513a5cb3ce9 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -43,9 +43,10 @@ Individual=Súkromná osoba
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Materská spoločnosť
 Subsidiaries=Dcérske spoločnosti
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Správa sadzby
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Zdvorilosť kód
 RegisteredOffice=Sídlo spoločnosti
 Lastname=Priezvisko
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Číslo sociálneho poistenia)
 ProfId3ES=Prof ID 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate číslo)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (siréna)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof ID 3 (NAF, starý APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registračné číslo
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (Nipča)
 ProfId2PT=Prof Id 2 (Číslo sociálneho poistenia)
 ProfId3PT=Prof ID 3 (obchodný Záznam číslo)
 ProfId4PT=Prof Id 4 (konzervatórium)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. za vynikajúce účet
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Kód je zadarmo. Tento kód je možné kedykoľvek zmeniť.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 2f3486a9535..c9e2fc18a94 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=Vybrané DPH
 StatusToPay=Zaplatiť
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Zákazník faktúru
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Platba sociálnej/fiškálnej dane
 PaymentVat=DPH platba
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Zoznam platieb
 ListOfCustomerPayments=Zoznam zákazníckych platieb
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF platby
 LT2PaymentsES=IRPF Platby
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Skontrolujte dátum príjmu
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režim <b>%sVAT na záväzky accounting%s.</b>
 CalcModeVATEngagement=Režim <b>%sVAT z príjmov-expense%sS.</b>
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Správa zákazníka DPH vyzdvihnúť a zaplatiť
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=PCG podtyp
 InvoiceLinesToDispatch=Faktúra linky na expedíciu
 ByProductsAndServices=By product and service
 RefExt=Externé ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Metóda 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/sk_SK/ecm.lang b/htdocs/langs/sk_SK/ecm.lang
index dc31605d394..690a626db44 100644
--- a/htdocs/langs/sk_SK/ecm.lang
+++ b/htdocs/langs/sk_SK/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 30e9dea3094..2cd5196ebaf 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Adresár <b>%s</b> nebol nájdený (Bad cesta, zlé oprávnenia
 ErrorFunctionNotAvailableInPHP=Funkcia <b>%s</b> je nutné pre túto funkciu, ale nie je k dispozícii v tejto verzii / nastavenie PHP.
 ErrorDirAlreadyExists=Adresár s týmto názvom už existuje.
 ErrorFileAlreadyExists=Súbor s týmto názvom už existuje.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Súbor nedostali úplne servera.
 ErrorNoTmpDir=Dočasné direct %s neexistuje.
 ErrorUploadBlockedByAddon=Pridať zablokovaný PHP / Apache pluginu.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/sk_SK/externalsite.lang b/htdocs/langs/sk_SK/externalsite.lang
index fc5548dc148..97c6ec00e38 100644
--- a/htdocs/langs/sk_SK/externalsite.lang
+++ b/htdocs/langs/sk_SK/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Nastavenie odkaz na externé webové stránky
-ExternalSiteURL=Externé URL stránok
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modul ExternalSite nebol správne nakonfigurovaný.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index b86251db431..d5521db463a 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modify. dátum
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Dátum overenia
+DateSigning=Signing date
 DateClosing=Uzávierka
 DateDue=Dátum splatnosti
 DateValue=Hodnota dáta
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Jednotková cena
 PriceU=UP
 PriceUHT=UP (bez DPH)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Množstvo
 AmountInvoice=Fakturovaná čiastka
@@ -389,6 +390,8 @@ AmountTotal=Celková čiastka
 AmountAverage=Priemerná suma
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percento
 Total=Celkový
 SubTotal=Medzisúčet
@@ -724,7 +727,7 @@ MenuMembers=Členovia
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu domáce bezpečnostné nastavenia): %s Kb, PHP limit: %s Kb
-NoFileFound=Žiadne dokumenty uložené v tomto adresári
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Aktuálny jazyk
 CurrentTheme=Aktuálna téma
 CurrentMenuManager=Aktuálna ponuka manažér
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontakty
 SearchIntoMembers=Členovia
 SearchIntoUsers=Užívatelia
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projekty
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Úlohy
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Priradené
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/sk_SK/margins.lang b/htdocs/langs/sk_SK/margins.lang
index 6edaad446c3..84d626fe3ec 100644
--- a/htdocs/langs/sk_SK/margins.lang
+++ b/htdocs/langs/sk_SK/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin detaily
 ProductMargins=Produktové marže
 CustomerMargins=Zákazníkov marže
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Produkt alebo služba
 AllProducts=Všetky produkty a služby
 ChooseProduct/Service=Vyberte produkt alebo službu
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Marža metóda pre globálne zľavy
 UseDiscountAsProduct=Ako produkt
 UseDiscountAsService=Ako služba
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Veľkoobchodná cena
 UnitCharges=Jednotkové náklady
 Charges=Poplatky
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index 56754d13691..30d4aeab7e3 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Zoznam návrhov členov (má byť overený)
 MembersListValid=Zoznam platných členov
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=Zoznam kvalifikovaných členov
 MenuMembersToValidate=Návrhy členov
 MenuMembersValidated=Overené členov
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Členovia s predplatným dostávať
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Vypršala
 MemberStatusPaid=Zasielanie noviniek aktuálnej
 MemberStatusPaidShort=Až do dnešného dňa
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Návrhy členov
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Overené
@@ -82,6 +87,8 @@ Physical=Fyzikálne
 Moral=Morálna
 MorAndPhy=Moral and Physical
 Reenable=Znovu povoliť
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Odstránenie člena
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Formát etikety stránku
 DescADHERENT_ETIQUETTE_TEXT=Text tlačený na listoch členských adrese
@@ -162,6 +170,7 @@ DocForLabels=Vytvoriť adresy listy
 SubscriptionPayment=Odberatelská platba
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Členovia Štatistiky podľa krajiny
 MembersStatisticsByState=Členovia štatistika štát / provincia
 MembersStatisticsByTown=Členovia štatistika podľa mesta
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index 826364134cd..25ae9d5d360 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Objednať
 MakeOrder=Objednať
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=E-mail
 OrderByWWW=Online
 OrderByPhone=Telefón
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=Jednoduchý model, aby
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill objednávky
+CreateInvoiceForThisSupplier=Bill objednávky
 NoOrdersToInvoice=Žiadne objednávky zúčtovateľné
 CloseProcessedOrdersAutomatically=Klasifikovať &quot;spracovanie&quot; všetky vybrané príkazy.
 OrderCreation=Objednať tvorba
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index cdf766025a8..98646eb50a8 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Vytvoril %s
 ModifiedBy=Zmenil %s
 ValidatedBy=Overená %s
+SignedBy=Signed by %s
 ClosedBy=Uzavrel %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=To je vaše nové kľúče k prihláseniu
 NewKeyWillBe=Váš nový kľúč pre prihlásenie do softvéru bude
 ClickHereToGoTo=Kliknite tu pre prechod na %s
 YouMustClickToChange=Musíte však najprv kliknúť na nasledujúci odkaz pre potvrdenie tejto zmeny hesla
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Ak ste o túto zmenu, stačí zabudnúť na tento e-mail. Vaše prihlasovacie údaje sú v bezpečí.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang
index 75f99b9b524..c2af074a693 100644
--- a/htdocs/langs/sk_SK/productbatch.lang
+++ b/htdocs/langs/sk_SK/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Áno
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Nie
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index ad7d3f5440e..d4db52e208b 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Preddefinovaný produkt/služba na predaj
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Správne upravené
 PropalMergePdfProductActualFile=Súbor na pridanie do PDF Azur sú/je
 PropalMergePdfProductChooseFile=Vybrať PDF súbory
-IncludingProductWithTag=Zahrnúť produkt/službu so štítkom
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Základná cena, skutočná cena môže záležať podľa zákazníka
 WarningSelectOneDocument=Prosím zvoľte minimálne jeden dokument
 DefaultUnitToShow=Jednotka
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 43af18884d9..112e55c7285 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/sk_SK/propal.lang b/htdocs/langs/sk_SK/propal.lang
index f0dcc6781b0..1df76fa3d75 100644
--- a/htdocs/langs/sk_SK/propal.lang
+++ b/htdocs/langs/sk_SK/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Poslať obchodný návrh poštou
 DatePropal=Dátum návrhu
 DateEndPropal=Platnosť koncový dátum
 ValidityDuration=Platnosť trvania
-CloseAs=Nastaviť status na
 SetAcceptedRefused=Nastaviť Akceptované/Odmietnuté
 ErrorPropalNotFound=Prepáli %s nebol nájdený
 AddToDraftProposals=Pridať do predlohy návrhu
@@ -60,6 +59,7 @@ ConfirmClonePropal=Určite chcete duplikovať komerčnú ponuku <b>%s</b>?
 ConfirmReOpenProp=Určite chcete znova otvoriť komerčnú ponuku <b>%s</b>?
 ProposalsAndProposalsLines=Komerčné návrh a vedenie
 ProposalLine=Návrh linky
+ProposalLines=Proposal lines
 AvailabilityPeriod=Dostupnosť meškanie
 SetAvailability=Nastavte si obsadenosť meškanie
 AfterOrder=po objednaní
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Písomná akceptácia, firemná pečiatka, dátum a po
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 0f1519c6e37..24456ee31a7 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -19,8 +19,8 @@ Stock=Zásoba
 Stocks=Zásoby
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Zásoby podľa LOT/Serial
 LotSerial=LOTs/Sériové čísla
 LotSerialList=Zoznam LOT/sériovych čísel
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Umiestnenie
-LocationSummary=Krátky názov umiestnenia
-NumberOfDifferentProducts=Počet rôznych výrobkov
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Celkový počet produktov
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Sklady hodnota
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtuálny sklad
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id sklad
 DescWareHouse=Popis sklad
 LieuWareHouse=Lokalizácia sklad
 WarehousesAndProducts=Sklady a produkty
 WarehousesAndProductsBatchDetail=Sklady a produkty ( podľa LOT/Serial )
 AverageUnitPricePMPShort=Vážená priemerná cena
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Predajná jednotka Cena
 EstimatedStockValueSellShort=Počet na predaj
 EstimatedStockValueSell=Počet na predaj
@@ -145,7 +147,7 @@ Replenishments=Splátky
 NbOfProductBeforePeriod=Množstvo produktov %s na sklade, než zvolené obdobie (&lt;%s)
 NbOfProductAfterPeriod=Množstvo produktov %s na sklade po zvolené obdobie (&gt; %s)
 MassMovement=Hromadný pohyb
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Bločky tejto objednávky
 StockMovementRecorded=Zaznamenané pohyby zásob
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Štítok pohybu
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Presun alebo skladový kód
 IsInPackage=Vložené do balíka
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
index b9949c65301..8fe139b6ade 100644
--- a/htdocs/langs/sk_SK/suppliers.lang
+++ b/htdocs/langs/sk_SK/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=História
diff --git a/htdocs/langs/sk_SK/ticket.lang b/htdocs/langs/sk_SK/ticket.lang
index f45e4fb3067..54eae76b82c 100644
--- a/htdocs/langs/sk_SK/ticket.lang
+++ b/htdocs/langs/sk_SK/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Typ
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
index 3c707abb9c5..4a3baedf95d 100644
--- a/htdocs/langs/sk_SK/users.lang
+++ b/htdocs/langs/sk_SK/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Odstrániť zo skupiny
 PasswordChangedAndSentTo=Heslo bolo zmenené a poslaný do <b>%s.</b>
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Žiadosť o zmenu hesla <b>%s</b> zaslaná <b>%s.</b>
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Používatelia a skupiny
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Užívateľ domény %s
 Reactivate=Reaktivácia
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Povolenie udelené, pretože dedia z jednej zo skupiny užívateľov.
 Inherited=Zdedený
+UserWillBe=Created user will be
 UserWillBeInternalUser=Vytvorený užívateľ bude interný užívateľ (pretože nie je spojený s určitou treťou stranou)
 UserWillBeExternalUser=Vytvorený užívateľ bude externý užívateľ (pretože súvisí s určitou treťou stranou)
 IdPhoneCaller=Id telefón volajúceho
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=Odhlásiť užívateľa
 UserLogged=Užívateľ prihlásený
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index e1cfe004a2f..e962c91d16e 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Čítať
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/sk_SK/zapier.lang b/htdocs/langs/sk_SK/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/sk_SK/zapier.lang
+++ b/htdocs/langs/sk_SK/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 9ca8ca3875d..7e9490abb5e 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Revija
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 8e4740be5cc..801722cc765 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Odstrani blokado povezovanja
 YourSession=Vaša seja
 Sessions=Users Sessions
 WebUserGroup=Spletni strežnik uporabnik / skupina
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Opomba: 'Da' velja samo, če je omogočen modul <b>%s</b>
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Varnostne nastavitve
+PHPSetup=PHP setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Napaka, ta modul zahteva PHP različico %s ali višjo
 ErrorModuleRequireDolibarrVersion=Napaka, Ta modul zahteva Dolibarr različico %s ali višjo
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Počisti
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Počisti zdaj
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Aktiviran na
 ActiveOn=Aktiven na
+ActivatableOn=Activatable on
 SourceFile=Izvorna datoteka
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Na voljo samo, če JavaScript in Ajax nista onemogočena
 Required=Zahtevano
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Vsi ostali znaki v maski bodo ostali nedotaknjeni.<br>Presledki niso dovoljeni.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Primer partnerja 99, kreiranega 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Primer proizvoda, kreiranega 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Urejevalniki
 Module49Desc=Upravljanje urejevalnikov
 Module50Name=Proizvodi
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Možnost konverzije GeoIP Maxmind
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Skupine podjetij
 Module5000Desc=Omogoča upravljaje skupine podjetij
-Module6000Name=Potek dela
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Kreiranje/spreminjanje notranjih/zunanjih uporabnikov in d
 Permission254=Brisanje ali onemogočenje ostalih uporabnikov
 Permission255=Kreiranje/spreminjanje lastnih uporabniških informacij
 Permission256=Spreminjanje lastnega gesla
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Branje CA
 Permission272=Branje računov
 Permission273=Izdaja računov
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Dogodki v zvezi z nadzorovanjem varnosti
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Nadzor
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=Ta ukaz morate pognati iz ukazne vrstice po prijavi v sistem kot uporabnik <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=SSL funkcije niso na voljo v vašem PHP
 DownloadMoreSkins=Prenos dodatnih preoblek
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Delni prevod
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Koplementarni atributi
 ExtraFieldsLines=Koplementarni atributi (postavke)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Firstname Name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Računovodska koda prodaje
 AccountancyCodeBuy=Računovodska koda nabave
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Nastavitev modula za aktivnosti in dnevni red
 PasswordTogetVCalExport=Ključ za avtorizacijo izvoznega linka
+SecurityKey = Security Key
 PastDelayVCalExport=Ne izvažaj dogodekov, starejših od
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Barva ozadja za lihe vrstice tabele
 BackgroundTableLineEvenColor=Barva ozadja za sode vrstice tabele
 MinimumNoticePeriod=Minimalni rok za obvestilo (Vaš zahtevek za odsotnost mora biti podan pred tem rokom)
 NbAddedAutomatically=Število dodanih dni pri števcu uporabnikov (avtomatsko) vsak mesec
-EnterAnyCode=To polje vsebuje referenco identifikacijske vrstice. Vnesite poljubno vrednost, vendar brez posebnih znakov.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index 71a06145d5c..7a25b6f14c3 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 2070ff6f437..f2991ee9dc1 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -52,9 +52,10 @@ Invoices=Računi
 InvoiceLine=Vrstica računa
 InvoiceCustomer=Račun za kupca
 CustomerInvoice=Račun za kupca
-CustomersInvoices=Računi za kupce
+CustomersInvoices=Fakture za kupce
 SupplierInvoice=Faktura dobavitelja
 SuppliersInvoices=Fakture dobaviteljev
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Faktura dobavitelja
 SupplierBills=Fakture dobaviteljev
 Payment=Plačilo
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Izvršena plačila
 PaymentsBackAlreadyDone=Izvedena vračila
 PaymentRule=Pravilo plačila
 PaymentMode=Tip plačila
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debetna/Kreditna kartica
 PaymentTypePP=PayPal
 IdPaymentMode=Tip plačila (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variabilni znesek (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bančni transfer
 PaymentTypeShortVIR=Bančni transfer
@@ -494,12 +498,16 @@ Cash=Gotovina
 Reported=Odlog
 DisabledBecausePayments=Ni možno zaradi nekaterih odprtih plačil
 CantRemovePaymentWithOneInvoicePaid=Brisanje plačila ni možno, ker je vsaj en račun označen kot plačan
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Pričakovano plačilo
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Plačano s tem plačilom
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Plačati
 ToMakePaymentBack=Vrniti plačilo
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Predlaga številko v formatu %syymm-nnnn za standardne račune in %syymm-nnnn za dobropise kjer je yy leto, mm mesec in nnnn zaporedna številka 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 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
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=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 down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=Račun za prvo situacijo
 InvoiceFirstSituationDesc=<b>Situacijski računi</b> so vezani na situacijo glede na napredek, na primer na napredek gradnje. Vska situacija je povezana z računom.
 InvoiceSituation=Situacijski račun
+PDFInvoiceSituation=Situacijski račun
 InvoiceSituationAsk=Račun, ki sledi situaciji
 InvoiceSituationDesc=Ustvari novo situacijo, ki sledi obstoječi
 SituationAmount=Vrednost računa za situacijo (neto)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
index 0bd7b6a8519..f0d05cd02f3 100644
--- a/htdocs/langs/sl_SI/boxes.lang
+++ b/htdocs/langs/sl_SI/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Zadnje akcije
 BoxLastContracts=Najnovejše pogodbe
 BoxLastContacts=Najnovejši stiki/naslovi
 BoxLastMembers=Najnovejši člani
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Zadnje intervencije
 BoxCurrentAccounts=Odpri stanje računov
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Zadnje %s novice od %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Računovodstvo
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 187bd536897..34c34fcd4f2 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Področje značk/kategorij kupcev
 MembersCategoriesArea=Področje značk/kategorij članov
 ContactsCategoriesArea=Področje značk/kategorij kontaktov
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Pokaži značko/kategorijo
 ByDefaultInList=Privzeto na seznamu
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 95e4d763b46..0bfae25b4a8 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -43,9 +43,10 @@ Individual=Posameznik
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Lastniško podjetje
 Subsidiaries=Podružnice
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Poročilo po četrtletjih
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Vljudnostni naziv
 RegisteredOffice=Registrirana poslovalnica
 Lastname=Priimek
@@ -172,14 +173,20 @@ ProfId1ES=(CNAE)
 ProfId2ES=(Social security number)
 ProfId3ES=(IAE)
 ProfId4ES=(Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Prof Id 1 (Registration Number)
 ProfId2GB=-
 ProfId3GB=Prof Id 3 (SIC)
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg)
 ProfId2LU=Id. prof. 2 (Dovoljenje za poslovanje)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN==
 ProfId2SN==
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Trenutni neplačan račun
 OutstandingBill=Max. za neplačan račun
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Koda kupca / dobavitelja po želji. Lahko jo kadarkoli spremenite.
 ManagingDirectors=Ime direktorja(ev) (CEO, direktor, predsednik...)
 MergeOriginThirdparty=Podvojen partner (partner, ki ga želite zbrisati)
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 2f71f9efc4f..41861379acc 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=Zbir DDV
 StatusToPay=Za plačilo
 SpecialExpensesArea=Področje za posebna plačila
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Plačilo računa kupca
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Plačilo socialnega/fiskalnega davka
 PaymentVat=Plačilo DDV
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Seznam plačil
 ListOfCustomerPayments=Seznam plačil kupcev
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Plačilo
 LT2PaymentsES=Plačila IRPF
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Vnos datuma prejema čeka
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Poročilo o pobranem in plačanem DDV po kupcih
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg podtip
 InvoiceLinesToDispatch=Vrstice računa za odpremo
 ByProductsAndServices=By product and service
 RefExt=Externa ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Povezava do naročila
 Mode1=Metoda 1
 Mode2=Metoda 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/sl_SI/ecm.lang b/htdocs/langs/sl_SI/ecm.lang
index b90e1d73431..36cc2a6fce7 100644
--- a/htdocs/langs/sl_SI/ecm.lang
+++ b/htdocs/langs/sl_SI/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index ef8cfd2d53f..a212d74fcf3 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Mapa <b>%s</b> ni bila najdena (Napačna pot, nimate dovoljenj
 ErrorFunctionNotAvailableInPHP=Za to opcijo je zahtevana funkcija <b>%s</b>, ki pa ni na voljo v tej verziji/nastavitvah PHP.
 ErrorDirAlreadyExists=Mapa z enakim imenom že obstaja.
 ErrorFileAlreadyExists=Datoteka z enakim imenom že obstaja.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=V strežnik ni bila prenešena celotna datoteka.
 ErrorNoTmpDir=Začasna mapa %s ne obstaja.
 ErrorUploadBlockedByAddon=PHP/Apache vtičnik je blokiral nalaganje.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/sl_SI/externalsite.lang b/htdocs/langs/sl_SI/externalsite.lang
index a539e4e6046..e2794de1ed6 100644
--- a/htdocs/langs/sl_SI/externalsite.lang
+++ b/htdocs/langs/sl_SI/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup se povezujejo na zunanji strani
-ExternalSiteURL=Zunanja stran URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modul za zunanjo stran ni bil konfiguriran pravilno
 ExampleMyMenuEntry=Moj menijski vnos
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 7f2afe8aebe..696fca76795 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Dat.spr.
 IPModification=Modification IP
 DateLastModification=Datum zadnje spremembe
 DateValidation=Datum potrditve
+DateSigning=Signing date
 DateClosing=Datum zaključka
 DateDue=Datum zapadlosti
 DateValue=Datum veljavnosti
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Cena enote
 PriceU=C.E.
 PriceUHT=C.E. (neto)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=C.E. (z davkom)
 Amount=Znesek
 AmountInvoice=Znesek računa
@@ -389,6 +390,8 @@ AmountTotal=Skupni znesek
 AmountAverage=Povprečni znesek
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Procent
 Total=Skupaj
 SubTotal=Delna vsota
@@ -724,7 +727,7 @@ MenuMembers=Člani
 MenuAgendaGoogle=Google dnevni red
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr omejitve (Meni domov-nastavitve-varnost): %s Kb, PHP omejitev: %s Kb
-NoFileFound=V tej mapi ni shranjenih dokumentov
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Trenutni jezik
 CurrentTheme=Trenutna tema
 CurrentMenuManager=Trenutni upravljalnik menija
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontakti
 SearchIntoMembers=Člani
 SearchIntoUsers=Uporabniki
 SearchIntoProductsOrServices=Proizvodi ali storitve
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projekti
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Naloge
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Se nanaša na
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/sl_SI/margins.lang b/htdocs/langs/sl_SI/margins.lang
index 82ef67e05d1..3c620843f04 100644
--- a/htdocs/langs/sl_SI/margins.lang
+++ b/htdocs/langs/sl_SI/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Podatki o marži
 ProductMargins=Marže proizvoda
 CustomerMargins=Marže kupcev
 SalesRepresentativeMargins=Marža prodajnega predstavnika
+ContactOfInvoice=Contact of invoice
 UserMargins=Marže uporabnikov
 ProductService=Proizvod ali storitev
 AllProducts=Vsi proizvodi in storitve
 ChooseProduct/Service=Izberi proizvod ali storitev
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Metoda marž pri globalnih popustih
 UseDiscountAsProduct=Kot proizvod
 UseDiscountAsService=Kot storitev
@@ -31,14 +32,14 @@ MARGIN_TYPE=Privzeto predlagana nabavna cena s stroški za izračun marže
 MargeType1=Margin on Best vendor price
 MargeType2=Marža na uravnoteženo povprečno ceno (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Stroškovna cena
 UnitCharges=Stroški po enoti
 Charges=Stroški
 AgentContactType=Tip kontakta komercialnega agenta
-AgentContactTypeDetails=Določa, kateri tip kontakta (povezava na računu) bo uporabljen za poročilo o maržah po prodajnih predstavnikih
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Stopnja mora biti numerična vrednost
 markRateShouldBeLesserThan100=Označena vrednost mora biti manjša od 100
 ShowMarginInfos=Prikaži informacije o marži
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 43b207cd33f..f98d2483e3c 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Seznam predlaganih članov (potrebna potrditev)
 MembersListValid=Seznam potrjenih članov
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=Seznam kvalificiranih članov
 MenuMembersToValidate=Predlagani člani
 MenuMembersValidated=Potrjeni člani
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Člani, ki morajo plačati članarino
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Pretečen
 MemberStatusPaid=Posodobljene članarine
 MemberStatusPaidShort=Posodobljene
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Predlagani člani
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Potrjen
@@ -82,6 +87,8 @@ Physical=Fizično
 Moral=Moralno
 MorAndPhy=Moral and Physical
 Reenable=Ponovno omogoči
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Izbriši člana
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format nalepk
 DescADHERENT_ETIQUETTE_TEXT=Tekst na evidenčnem listu člana
@@ -162,6 +170,7 @@ DocForLabels=Ustvari seznam naslovov (Format za izhod dejanske nastavitve: <b>%s
 SubscriptionPayment=Plačilo naročnine
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Statistika članov po državah
 MembersStatisticsByState=Statistika članov po deželah
 MembersStatisticsByTown=Statistika članov po mestih
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index 637417dddd2..67146107a56 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Potrebno naročiti
 MakeOrder=Izdelaj naročilo
 SupplierOrder=Nabavni nalog
 SuppliersOrders=Nabavni nalogi
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Trenutni nabavni nalogi
 CustomerOrder=Naročilo
 CustomersOrders=Naročila
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index e5b75647b50..1ead2e7ba58 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Kreiral %s
 ModifiedBy=Spremenil %s
 ValidatedBy=Potrdil %s
+SignedBy=Signed by %s
 ClosedBy=Zaključil %s
 CreatedById=ID uporabnika, ki je ustvaril
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=To so vaši novi podatki za prijavo
 NewKeyWillBe=Vaši novi podatki za prijavo v program bodo
 ClickHereToGoTo=K.iknite tukaj za vstop v %s
 YouMustClickToChange=Vendar morate najprej klikniti na naslednji link za potrditev spremembe gesla
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Če niste zahtevali te spremembe, enostavno pozabite na ta email. Vaši prijavni podatki so varno shranjeni.
 IfAmountHigherThan=Če je znesek večji od <strong>%s</strong>
 SourcesRepository=Shramba virov
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
index 80b78d893bc..5f2d0d4391a 100644
--- a/htdocs/langs/sl_SI/productbatch.lang
+++ b/htdocs/langs/sl_SI/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Da
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Ne
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 7fb5405f77f..80844772fa8 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Vnaprej določeni proizvodi/storitve za prodajo
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Pravilno posodobljeno
 PropalMergePdfProductActualFile=Datoteke za dodatek k PDF Azur so/je
 PropalMergePdfProductChooseFile=Izberi PDF datoteke
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Privzeta cena, dejanska cena je odvisna od kupca
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Enota
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 452a680f3b5..369419c4bd9 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/sl_SI/propal.lang b/htdocs/langs/sl_SI/propal.lang
index b09b8e05d61..be279d8ba0f 100644
--- a/htdocs/langs/sl_SI/propal.lang
+++ b/htdocs/langs/sl_SI/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Pošlji komercialno ponudbo po pošti
 DatePropal=Datum ponudbe
 DateEndPropal=Datum veljavnosti ponudbe
 ValidityDuration=Trajanje veljavnosti
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Ponudbe %s ne najdem
 AddToDraftProposals=Dodaj osnutku ponudbe
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Komercialna ponudba in vrstice
 ProposalLine=Vrstica ponudbe
+ProposalLines=Proposal lines
 AvailabilityPeriod=Dobavni rok
 SetAvailability=Nastavi dobavni rok
 AfterOrder=od naročila
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Pisna potrditev, žig podjetja, datum in podpis
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index b46640afdac..5ba283a55d1 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -19,8 +19,8 @@ Stock=Zaloga
 Stocks=Zaloge
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Zaloga po lotu/serijski številki
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
-LocationSummary=Kratko ime lokacije
-NumberOfDifferentProducts=Število različnih proizvodov
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Skupno število proizvodov
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Vrednost skladišč
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtualna zaloga
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=ID skladišča
 DescWareHouse=Opis skladišča
 LieuWareHouse=Lokalizacija skladišča
 WarehousesAndProducts=Skladišča in proizvodi
 WarehousesAndProductsBatchDetail=Skladišča in proizvodi (s podrobnostmi o lotu/serijski številki)
 AverageUnitPricePMPShort=Uravnotežena povprečna cena
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Prodajna cena za enoto
 EstimatedStockValueSellShort=Prodajna vrednost
 EstimatedStockValueSell=Prodajna vrednost
@@ -145,7 +147,7 @@ Replenishments=Obnovitve
 NbOfProductBeforePeriod=Količina proizvoda %s na zalogi pred izbranim obdobjem (< %s)
 NbOfProductAfterPeriod=Količina proizvoda %s na zalogi po izbranem obdobju (> %s)
 MassMovement=Masovni premik
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Prevzem tega naročila
 StockMovementRecorded=Zapisan premik zaloge
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Nalepka gibanja
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Koda gibanja ali zaloge
 IsInPackage=Vsebina paketa
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index 4d36a165272..3d8988b89e7 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Fakture dobaviteljev
+SupplierInvoices=Fakture dobaviteljev
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=Zgodovina
diff --git a/htdocs/langs/sl_SI/ticket.lang b/htdocs/langs/sl_SI/ticket.lang
index c8506ca6800..91ff26bb370 100644
--- a/htdocs/langs/sl_SI/ticket.lang
+++ b/htdocs/langs/sl_SI/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Tip
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index dc70d4adfde..c972ea9c230 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Odstrani iz skupine
 PasswordChangedAndSentTo=Geslo spremenjeno in poslano <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Zahtevek za spremembo gesla <b>%s</b> poslan <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Uporabniki & Skupine
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Uporabnik domene %s
 Reactivate=Ponovno aktiviraj
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Dovoljenje dodeljeno zaradi podedovanja od druge uporabniške skupine.
 Inherited=Podedovan
+UserWillBe=Created user will be
 UserWillBeInternalUser=Kreiran uporabnik bo interni uporabnik (ker ni povezan z določenim partnerjem)
 UserWillBeExternalUser=Kreiran uporabnik bo zunanji uporabnik (ker je povezan z določenim partnerjem)
 IdPhoneCaller=ID klicatelja po telefonu
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index 26e7a852a93..73e092221d8 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Preberite
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/sl_SI/zapier.lang b/htdocs/langs/sl_SI/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/sl_SI/zapier.lang
+++ b/htdocs/langs/sl_SI/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index b2c8f38576a..cf63cf33a99 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Lidh
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index ce21ede1d21..ce7acbd1055 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Sesioni juaj
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Konfigurimet e sigurisё
+PHPSetup=PHP setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Gabim, ky modul kërkon PHP version %s ose më të lartë
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Spastro
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Spastro tani
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Produkte
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Lexo CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index 6feb31b8e9c..550abf21df5 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 43b1a6ce65e..8445a107298 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -52,11 +52,12 @@ Invoices=Faturat
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index c5cf2d90ba8..ac4d7487c63 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Veprimet e fundit
 BoxLastContracts=Kontratat e fundit
 BoxLastContacts=Kontaktet/Adresat e fundit
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index 66125ff271d..a5d69cc6d3c 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 63049256431..067cf0318cf 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Mbiemri
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index c587a416989..2a67833777f 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/sq_AL/ecm.lang b/htdocs/langs/sq_AL/ecm.lang
index 9fd3b1f30cd..29f3fa1f5bf 100644
--- a/htdocs/langs/sq_AL/ecm.lang
+++ b/htdocs/langs/sq_AL/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/sq_AL/externalsite.lang b/htdocs/langs/sq_AL/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/sq_AL/externalsite.lang
+++ b/htdocs/langs/sq_AL/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index ba2fa0a111d..7dab8226cc8 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/sq_AL/margins.lang b/htdocs/langs/sq_AL/margins.lang
index b9d52dcfdc6..ad5406409b4 100644
--- a/htdocs/langs/sq_AL/margins.lang
+++ b/htdocs/langs/sq_AL/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index 3625ff0de68..a6d98ca17c5 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 0e5aa8847fc..2ed1b8af62e 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 9540d523083..afd043c5f78 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/sq_AL/productbatch.lang
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 93dc7f8448c..807f8af9cd0 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 93142ff9135..87655a4d973 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/sq_AL/propal.lang b/htdocs/langs/sq_AL/propal.lang
index 959d624ee89..7f8918787cc 100644
--- a/htdocs/langs/sq_AL/propal.lang
+++ b/htdocs/langs/sq_AL/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 666ede4efd4..87aa4916cc9 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stok
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Vendndodhja
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index b50aa118719..f62604b677e 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/sq_AL/ticket.lang b/htdocs/langs/sq_AL/ticket.lang
index 5f259230780..8e7d22fb4e0 100644
--- a/htdocs/langs/sq_AL/ticket.lang
+++ b/htdocs/langs/sq_AL/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index 0c2b2d29677..736243e4ee5 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/sq_AL/zapier.lang b/htdocs/langs/sq_AL/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/sq_AL/zapier.lang
+++ b/htdocs/langs/sq_AL/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 0f47b67db83..c95be506b7a 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Izveštaj
 JournalLabel=Journal label
 NumPiece=Deo broj
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index e7d50480139..8e44e169e68 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Ukloni
 YourSession=Vaša sesija
 Sessions=Users Sessions
 WebUserGroup=Web server korisnik/grupa
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index 0a1a42832d4..9d4798fc10e 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 2681e6d7762..495c4c104d7 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -52,11 +52,12 @@ Invoices=Računi
 InvoiceLine=Linija na računu
 InvoiceCustomer=Račun kupca
 CustomerInvoice=Račun kupca
-CustomersInvoices=Računi kupaca
+CustomersInvoices=Fakture klijenata
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=računi dobavljača
+SupplierBills=Vendor invoices
 Payment=Plaćanje
 PaymentBack=Povraćaj
 CustomerInvoicePaymentBack=Povraćaj
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Plaćanje već izvršeno
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Pravilo za plaćanje
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Datum najskorijeg generisanja
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Potvrdi račune automatski
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=U roku od 14 dana od poslednjeg dana u tekućem mese
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bankovni prenos
 PaymentTypeShortVIR=Bankovni prenos
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s račun(a) kreirano
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/sr_RS/boxes.lang b/htdocs/langs/sr_RS/boxes.lang
index 9f9318be2df..9970ca505c7 100644
--- a/htdocs/langs/sr_RS/boxes.lang
+++ b/htdocs/langs/sr_RS/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Otvoreno stanje računa
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Računovodstvo
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sr_RS/categories.lang b/htdocs/langs/sr_RS/categories.lang
index f72f3351441..1799529dde1 100644
--- a/htdocs/langs/sr_RS/categories.lang
+++ b/htdocs/langs/sr_RS/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Oblast naziva/kategorije dobavljača
 MembersCategoriesArea=Oblast naziva/kategorije članova
 ContactsCategoriesArea=Oblast naziva/kategorija kontakata
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Prikaži naziv/kategoriju
 ByDefaultInList=Podrazumevano u listi
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 154132b33da..4a1049a918d 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -43,9 +43,10 @@ Individual=Fizičko lice
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Osnovna kompanija
 Subsidiaries=SubsidiariesPoslovnice
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Izveštaj po kursu
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Prijavni kod
 RegisteredOffice=Registrovane kancelarije
 Lastname=Prezime
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luksemburg)
 ProfId2LU=Id. prof. 2 (Radna dozvola)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Ime menadžera (CEO, direktor, predsednik...)
 MergeOriginThirdparty=Duplirani subjekt (subjekt kojeg želite obrisati)
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 122fa300178..64e0a53d9d9 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=Prihodovani PDV
 StatusToPay=Za plaćanje
 SpecialExpensesArea=Oblast za sve posebne uplate
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Socijalni i poreski trošak
 SocialContributions=Socijalni i poreski troškovi
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Uplata po računu klijenta
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Uplata poreza/doprinosa
 PaymentVat=PDV uplata
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Lista uplata
 ListOfCustomerPayments=Lista uplata klijenata
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF uplata
 LT2PaymentsES=IRPF uplate
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Datum prijema čeka
 NbOfCheques=No. of checks
 PaySocialContribution=Uplati porez/doprinose
-ConfirmPaySocialContribution=Da li ste sigurni da želite da označite ovaj porez/doprinos kao plaćen ?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Obriši uplatu poreza/doprinosa
-ConfirmDeleteSocialContribution=Da li ste sigurni da želite da obrišete ovu uplatu poreza/doprinosa ?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Uplate poreza/doprinosa
 CalcModeVATDebt=Mod <b>%sPDV u posvećenom računovodstvu%s</b>.
 CalcModeVATEngagement=Mod <b>%sPDV na prihodima-rashodima%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- Sadrži realne uplate računa, troškova, PDV-a i zarada.<br>
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Izveštaj po prihodovanom i isplaćenom PDV-u po subjektu 
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Izveštaj po RE kursu
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg pod-tip
 InvoiceLinesToDispatch=Linije fakture za otpremu
 ByProductsAndServices=By product and service
 RefExt=Eksterna ref.
-ToCreateAPredefinedInvoice=Da kreirate šablon fakture, kreirajte običnu fakturu pa onda, bez potvrđivanja, kliknite na dugme "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link ka narudžbini
 Mode1=Metoda 1
 Mode2=Metoda 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Dupliraj za sledeći mesec
 SimpleReport=Skraćeni izveštaj
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/sr_RS/ecm.lang b/htdocs/langs/sr_RS/ecm.lang
index 6db486d990a..7ced4e58d7f 100644
--- a/htdocs/langs/sr_RS/ecm.lang
+++ b/htdocs/langs/sr_RS/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index 29ba9a69da3..b52a21dbc85 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Folder <b>%s</b> nije pronađen (pogrešna putanja, nedovoljna
 ErrorFunctionNotAvailableInPHP=Funkcija <b>%s</b> je neophodna za ovu funkcionalnost, ali nije dostupna u ovoj verziji/konfiguraciji PHP-a.
 ErrorDirAlreadyExists=Folder sa ovim imenom već postoji.
 ErrorFileAlreadyExists=Fajl sa ovim imenom već postoji.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Fajl nije u celosti primljen na server.
 ErrorNoTmpDir=Privremeni folder %s ne postoji.
 ErrorUploadBlockedByAddon=Upload blokiran PHP/Apache pluginom.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/sr_RS/externalsite.lang b/htdocs/langs/sr_RS/externalsite.lang
index 2fbe6351fef..7f81e5e93ed 100644
--- a/htdocs/langs/sr_RS/externalsite.lang
+++ b/htdocs/langs/sr_RS/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Podesi link ka eksternom sajtu
-ExternalSiteURL=Link eksternog sajta
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modul eksterni sajt nije ispravno konfigurisan.
 ExampleMyMenuEntry=Stavka iz mog menija
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 1630acdddf6..76649f882eb 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Dat. izmene
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Datum odobrenja
+DateSigning=Signing date
 DateClosing=Datum zatvaranja
 DateDue=Rok
 DateValue=Datum vrednosti
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Jedinična cena
 PriceU=J.C.
 PriceUHT=J.C. (neto)
-PriceUHTCurrency=U.P (valuta)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=J.C. (bruto)
 Amount=Iznos
 AmountInvoice=Iznos računa
@@ -389,6 +390,8 @@ AmountTotal=Ukupan iznos
 AmountAverage=Prosečan iznos
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Procenat
 Total=Total
 SubTotal=Zbir
@@ -724,7 +727,7 @@ MenuMembers=Članovi
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Meni home-podešavanja-bezbednost): %s Kb, PHP limit: %s Kb
-NoFileFound=Nema sačuvanih dokumenata u folderu
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Aktivni jezik
 CurrentTheme=Aktivna tema
 CurrentMenuManager=Aktivni menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontakti
 SearchIntoMembers=Članovi
 SearchIntoUsers=Korisnici
 SearchIntoProductsOrServices=Proizvodi ili usluge
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projekti
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Zadaci
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Dodeljeno
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/sr_RS/margins.lang b/htdocs/langs/sr_RS/margins.lang
index b94a04bd436..609fad9ba10 100644
--- a/htdocs/langs/sr_RS/margins.lang
+++ b/htdocs/langs/sr_RS/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Detalji marže
 ProductMargins=Marže proizvoda
 CustomerMargins=Marže klijenta
 SalesRepresentativeMargins=Marže agenta prodaje
+ContactOfInvoice=Contact of invoice
 UserMargins=Korisničke marže
 ProductService=Proizvod ili Usluga
 AllProducts=Svi proizvodi i usluge
 ChooseProduct/Service=Izaberi proizvod ili uslugu
 ForceBuyingPriceIfNull=Frsiraj nabavnu cenu na prodajnu cenu ukoliko nije definisana
-ForceBuyingPriceIfNullDetails=Ukoliko nabavna cena nije definisana i ova opcija je aktivna, marža će biti nula za ovu liniju (nabavna cena = prodajna cena). U suprotnom, marža će biti jednaka default vrednosti.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Metoda marže za globalne popuste
 UseDiscountAsProduct=Kao proizvod
 UseDiscountAsService=Kao usluga
@@ -31,14 +32,14 @@ MARGIN_TYPE=Default nabavna cena za računanje marže
 MargeType1=Margin on Best vendor price
 MargeType2=Marža na prosečnu cenu (PC)
 MargeType3=Marža na cenu koštanja
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cena koštanja
 UnitCharges=Unitarni troškovi
 Charges=Troškovi
 AgentContactType=Tip kontakta komercijalnog agenta
-AgentContactTypeDetails=Definiše tip kontakta (povezan sa fakturom) koji će biti korišćen za izveštaj marže po agentu prodaje
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Stopa mora biti numerička
 markRateShouldBeLesserThan100=Stopa marže mora biti niža od 100
 ShowMarginInfos=Prikaži informacije marže
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index 6501fc03581..9999a186486 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Lista draft članova (za potvrdu)
 MembersListValid=Lista potvrđenih članova
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=Lista kvalifikovanih članova
 MenuMembersToValidate=Draft članovi
 MenuMembersValidated=Potvrđeni članovi
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Članovi koji treba da prime pretplatu
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Istekla
 MemberStatusPaid=Pretplata je ažurna
 MemberStatusPaidShort=Ažurna
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft članovi
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Potvrđen
@@ -82,6 +87,8 @@ Physical=Fizičko
 Moral=Pravno
 MorAndPhy=Moral and Physical
 Reenable=Ponovo aktiviraj
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Obriši člana
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format strane naziva
 DescADHERENT_ETIQUETTE_TEXT=Tekst odštampan na karticama adresa članova
@@ -162,6 +170,7 @@ DocForLabels=Generiši karticu adrese
 SubscriptionPayment=Uplata pretplate
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Statistike članova po zemlji
 MembersStatisticsByState=Statistike članova po regionu
 MembersStatisticsByTown=Statistike članova po gradu
diff --git a/htdocs/langs/sr_RS/modulebuilder.lang b/htdocs/langs/sr_RS/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/sr_RS/modulebuilder.lang
+++ b/htdocs/langs/sr_RS/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/sr_RS/orders.lang b/htdocs/langs/sr_RS/orders.lang
index 81c0bc994b7..4c3705086e5 100644
--- a/htdocs/langs/sr_RS/orders.lang
+++ b/htdocs/langs/sr_RS/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Kreiraj narudžbinu
 MakeOrder=Kreiraj narudžbinu
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=Jednostavan model narudžbine
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Naplata narudžbina
+CreateInvoiceForThisSupplier=Naplata narudžbina
 NoOrdersToInvoice=Nema naplativih narudžbina
 CloseProcessedOrdersAutomatically=Označi sve selektovane narudžbine kao "Obrađene".
 OrderCreation=Kreacija narudžbine
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index 6abb3f27b1a..f3d16baa5b7 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Kreirao %s
 ModifiedBy=Izmenio %s
 ValidatedBy=Potvrdio %s
+SignedBy=Signed by %s
 ClosedBy=Zatvorio %s
 CreatedById=ID korisnika koji je kreirao
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=Ovo su nove informacije za login
 NewKeyWillBe=Vaša nova informacija za login za softver će biti
 ClickHereToGoTo=Kliknite ovde da otvorite %s
 YouMustClickToChange=Prvo morate kliknuti sledeći link da biste potvrdili promenu lozinke
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Ukoliko niste tražili ovu promenu, zaboravite na ovaj email. Vaši parametri za konekciju su bezbedni.
 IfAmountHigherThan=Ukoliko je iznos veći od <strong>%s</strong>
 SourcesRepository=Repository koda
diff --git a/htdocs/langs/sr_RS/productbatch.lang b/htdocs/langs/sr_RS/productbatch.lang
index ab098fa1139..01d589671dc 100644
--- a/htdocs/langs/sr_RS/productbatch.lang
+++ b/htdocs/langs/sr_RS/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Koristi serijski broj
-ProductStatusOnBatch=Da (serijski broj obavezan)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=Ne (serijski broj se ne koristi)
-ProductStatusOnBatchShort=Da
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Ne
 Batch=Serija
 atleast1batchfield=Rok trajanja ili rok prodaje serije
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 1df147564f2..a55e635e9d7 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefinisani proizvodi/usluge za prodaju
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Uspešno ažurirano
 PropalMergePdfProductActualFile=Fajlovi za dodavanje u PDF Azur su
 PropalMergePdfProductChooseFile=Selektiraj PDF fajlove
-IncludingProductWithTag=Uključivanje proizvoda/usluge sa tagom
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default cena, realna cena može zavisiti od klijenta
 WarningSelectOneDocument=Molimo izaberite barem jedan dokument
 DefaultUnitToShow=Jedinica
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 931194501ee..e50f21a77c8 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Lista zadataka
 GoToListOfTimeConsumed=Idi na listu utrošenog vremena
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/sr_RS/propal.lang b/htdocs/langs/sr_RS/propal.lang
index b67ab91efbb..dfc9d754cd3 100644
--- a/htdocs/langs/sr_RS/propal.lang
+++ b/htdocs/langs/sr_RS/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Pošalji komercijalnu poudu mailom
 DatePropal=Datum ponude
 DateEndPropal=Kraj validnosti
 ValidityDuration=Trajanje validnosti
-CloseAs=Postavi status na
 SetAcceptedRefused=Postavi prihvaćen/odbijen
 ErrorPropalNotFound=Ponuda %s nije pronađena
 AddToDraftProposals=Ubaci u draft ponude
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Komercijalna ponuda i linije
 ProposalLine=Linija ponude
+ProposalLines=Proposal lines
 AvailabilityPeriod=Čekanje dostupnosti
 SetAvailability=Postavi trajanje čekanja dostupnosti
 AfterOrder=posle narudžbine
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Pismeno odobrenje, pečat kompanije, datum i potpis
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index d33ab3c5d47..c5c04628b64 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -19,8 +19,8 @@ Stock=Zaliha
 Stocks=Zalihe
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Zalihe po seriji
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
-LocationSummary=Kratak naziv lokacije
-NumberOfDifferentProducts=Broj različitih proizvoda
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Ukupan broj proizvoda
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Vrednost magacina
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Fiktivna zaliha
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id magacina
 DescWareHouse=Opis magacina
 LieuWareHouse=Lokacija magacina
 WarehousesAndProducts=Magacini i proizvodi
 WarehousesAndProductsBatchDetail=Magacini i proizvodi (sa detaljima po seriji)
 AverageUnitPricePMPShort=Prosecna cena
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Jedinična prodajna cena
 EstimatedStockValueSellShort=Prodajna vrednost
 EstimatedStockValueSell=Prodajna vrednost
@@ -145,7 +147,7 @@ Replenishments=Dopunjavanja
 NbOfProductBeforePeriod=Količina proizvoda %s u zalihama pre selektiranog perioda (< %s)
 NbOfProductAfterPeriod=Količina proizvoda %s u zalihama posle selektiranog perioda (> %s)
 MassMovement=Masivni promet
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Prijemnice za ovu narudžbinu
 StockMovementRecorded=Snimljeni prometi zalihe
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Naziv prometa
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Promet ili inventarski kod
 IsInPackage=Sadržan u paketu
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Ponovo Otvoreno
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/sr_RS/suppliers.lang b/htdocs/langs/sr_RS/suppliers.lang
index 1bcdd369ceb..60fd4cbf67f 100644
--- a/htdocs/langs/sr_RS/suppliers.lang
+++ b/htdocs/langs/sr_RS/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=Istorija
diff --git a/htdocs/langs/sr_RS/ticket.lang b/htdocs/langs/sr_RS/ticket.lang
index 35102542484..b465760e3c8 100644
--- a/htdocs/langs/sr_RS/ticket.lang
+++ b/htdocs/langs/sr_RS/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Tip
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/sr_RS/users.lang b/htdocs/langs/sr_RS/users.lang
index 10c117a0372..e68094fa8e9 100644
--- a/htdocs/langs/sr_RS/users.lang
+++ b/htdocs/langs/sr_RS/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Izbaci iz grupe
 PasswordChangedAndSentTo=Lozinka izmenjena i poslata na <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Zahtev za izmenu lozinke za <b>%s</b> je poslat <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Korisnici & Grupe
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Korisnik domena %s
 Reactivate=Reaktiviraj
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Prava su dodeljena jer su nasleđena od jedne od korisnikovih grupa.
 Inherited=Nasleđeno
+UserWillBe=Created user will be
 UserWillBeInternalUser=Kreirani korisnik će biti interni korisnik (jer nije vezan za određeni subjekat)
 UserWillBeExternalUser=Kreirani korisnik će biti eksterni (jer je vezan za određeni subjekat)
 IdPhoneCaller=Id telefonskog poziva
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sr_RS/website.lang b/htdocs/langs/sr_RS/website.lang
index baa3b7e08c8..95a950372c2 100644
--- a/htdocs/langs/sr_RS/website.lang
+++ b/htdocs/langs/sr_RS/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Pročitaj
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/sr_RS/zapier.lang b/htdocs/langs/sr_RS/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/sr_RS/zapier.lang
+++ b/htdocs/langs/sr_RS/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 384ab4af6a9..38747956cd0 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bundet linjer med fakturor
 ExpenseReportLines=Kostnadsberäkningar rapporterar att förbinda
 ExpenseReportLinesDone=Förbundna utgiftsrapporter
 IntoAccount=Bind rad med bokföringskonto
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Binda
@@ -209,7 +209,7 @@ Codejournal=Loggbok
 JournalLabel=Loggboksetikett
 NumPiece=Stycke nummer
 TransactionNumShort=Num. transaktion
-AccountingCategory=Personliga grupper
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Här kan du definiera vissa grupper av bokföringskonto. De kommer att användas för personliga redovisningsrapporter.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Linjer som ännu inte är bundna, använd menyn <a hr
 
 ## Import
 ImportAccountingEntries=Redovisningsposter
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Varning, den här rapporten är inte baserad på huvudboken-modulen, så den innehåller inte transaktioner modifierad manuellt i huvudboken. Om din bokföring är uppdaterad är bokföringsvisningen mer exakt.
 ExpenseReportJournal=Kostnadsrapportsloggbok
 InventoryJournal=Inventarieloggbok
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 68ba4a916a7..75f460ddcd6 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Ta bort lås för anslutning
 YourSession=Din session
 Sessions=Användarsessioner
 WebUserGroup=Webbserver användare / grupp
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Behörigheter på fil %s
 NoSessionFound=Din PHP-konfiguration verkar inte tillåta att du registrerar aktiva sessioner. Den katalog som används för att spara sessioner (<b> %s </b>) kan skyddas (till exempel av operatörsbehörigheter eller genom PHP-direktivet open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Anm: ja effektivt endast om modul <b>%s</b> är aktiverat
 RemoveLock=Ta bort / byt namn på filen <b> %s </b> om den existerar, för att tillåta användning av Update / Install-verktyget.
 RestoreLock=Återställ fil <b> %s </b>, endast med läsbehörighet, för att inaktivera ytterligare användning av Update / Install-verktyget.
 SecuritySetup=Säkerhets inställning
+PHPSetup=PHP setup
 SecurityFilesDesc=Definiera här alternativ relaterade till säkerhet om uppladdning av filer.
 ErrorModuleRequirePHPVersion=Fel, kräver denna modul PHP version %s eller högre
 ErrorModuleRequireDolibarrVersion=Fel, kräver denna modul Dolibarr version %s eller högre
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Detta område ger administrationsfunktioner. Använd menyn f
 Purge=Rensa
 PurgeAreaDesc=På den här sidan kan du radera alla filer som genereras eller lagras av Dolibarr (temporära filer eller alla filer i <b> %s </b> katalog). Att använda den här funktionen är normalt inte nödvändig. Den tillhandahålls som en lösning för användare vars Dolibarr är värd av en leverantör som inte erbjuder behörigheter för att radera filer som genereras av webbservern.
 PurgeDeleteLogFile=Ta bort loggfiler, inklusive <b> %s </b> definierad för Syslog-modulen (ingen risk att förlora data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Ta bort alla filer i katalogen: <b> %s </b>. <br> Detta tar bort alla genererade dokument relaterade till elementer (tredje part, fakturor etc ...), filer som laddas upp i ECM-modulen, databassäkerhetskopior och tillfälliga filer.
 PurgeRunNow=Rensa nu
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets tillgängliga
 BoxesActivated=Widgets aktiverade
 ActivateOn=Aktivera på
 ActiveOn=Aktiverad på
+ActivatableOn=Activatable on
 SourceFile=Källfil
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Endast tillgängligt om JavaScript är inte oduglig
 Required=Obligatorisk
@@ -347,9 +350,10 @@ LastActivationAuthor=Senaste aktiveringsförfattaren
 LastActivationIP=Senaste aktivering IP
 UpdateServerOffline=Uppdatera server offline
 WithCounter=Hantera en räknare
-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> klientkoden på n tecken <br> <b> {cccc000} </b> klientkoden på n tecken följs av en räknare som är dedikerad till kunden. Denna räknare som är dedikerad till kunden återställs samtidigt som den globala räknaren. <br> <b> {tttt} </b> Koden för tredjepartstyp på n tecken (se menyn Hem - Inställning - Ordbok - Typer av tredje part). Om du lägger till den här taggen kommer räknaren att vara olika för varje typ av tredje part. <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Alla andra tecken i masken förblir intakt. <br> Blanksteg är inte tillåtna. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a= <u> Exempel på 99: e %s från tredje part TheCompany, med datum 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>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Om du lämnar fältet tomt betyder det att detta vä
 ExtrafieldParamHelpselect=Förteckning över värden måste vara linjer med formatnyckel, värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br> 1, värde1 <br> 2, värde2 <br> code3, värde3 <br> ... <br> <br> För att få lista beroende på en annan komplementär attributlista: <br> 1, värde1 | options_ <i> parent_list_code </i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> För att få listan beroende på en annan lista: <br> 1, värde1 | <i> parent_list_code </i>: parent_key <br> 2, värde2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Lista över värden måste vara rader med formatnyckel, värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br> 1, värde1 <br> 2, värde2 <br> 3, värde3 <br> ...
 ExtrafieldParamHelpradio=Lista över värden måste vara rader med formatnyckel, värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br> 1, värde1 <br> 2, värde2 <br> 3, värde3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Lista över värden kommer från en tabell <br> Syntax: tabellnamn: label_field: id_field :: filter <br> Exempel: c_typent: libelle: id :: filter <br> <br> filtret kan vara ett enkelt test (t.ex. aktiv = 1) för att visa endast aktivt värde <br> Du kan också använda $ ID $ i filterhäxa är nuvarande ID för nuvarande objekt <br> För att göra ett SELECT i filter använd $ SEL $ <br> om du vill filtrera på extrafält använder syntax extra.fieldcode = ... (där fältkoden är kod för extrafält) <br> <br> För att få listan beroende på en annan komplementär attributlista: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> För att få listan beroende på en annan lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Bibliotek som används för PDF-generering
@@ -541,6 +545,8 @@ Module40Name=Säljare
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Felsökningsloggar
 Module42Desc=Loggningsfunktioner (fil, syslog, ...). Sådana loggar är för tekniska / debug-ändamål.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Redaktion
 Module49Desc=Redaktör ledning
 Module50Name=Produkter
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind omvandlingar kapacitet
 Module3200Name=Oföränderliga arkiv
 Module3200Desc=Aktivera en oföränderlig logg över affärshändelser. Händelser arkiveras i realtid. Loggen är en skrivskyddad tabell med kedjda händelser som kan exporteras. Denna modul kan vara obligatorisk för vissa länder.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Personalhantering (förvaltningen av avdelningen, anställningskontrakt och känslor)
 Module5000Name=Multi-bolag
 Module5000Desc=Gör att du kan hantera flera företag
-Module6000Name=Workflow
-Module6000Desc=Arbetsflödeshantering (automatisk skapande av objekt och / eller automatisk statusändring)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=webbplatser
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Lämna begäranhantering
@@ -805,7 +813,8 @@ PermissionAdvanced253=Skapa / ändra interna / externa användare och behörighe
 Permission254=Ta bort eller inaktivera andra användare
 Permission255=Skapa / ändra sin egen användarinformation
 Permission256=Ändra sina egna lösenord
-Permission262=Utöka tillgången till alla tredje parter (inte bara tredje part för vilken den användaren är försäljningsrepresentant). <br> Ej effektiv för externa användare (alltid begränsad till sig själva för förslag, order, fakturor, kontrakt etc.). <br> Ej effektiv för projekt (endast regler om projektbehörigheter, synlighet och uppdragsfrågor).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Läs CA
 Permission272=Läs fakturor
 Permission273=Utfärda fakturor
@@ -1175,7 +1184,8 @@ SetupDescription2=Följande två avsnitt är obligatoriska (de två första inma
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Andra inställningsmenyposter hanterar valfria parametrar.
-LogEvents=Säkerhetsgranskning evenemang
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Revision
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Att köra uppgraderingsprocessen verkar vara n
 YouMustRunCommandFromCommandLineAfterLoginToUser=Du måste köra det här kommandot från kommandoraden efter login till ett skal med användare <b>%s.</b>
 YourPHPDoesNotHaveSSLSupport=SSL-funktioner inte är tillgängliga i din PHP
 DownloadMoreSkins=Mer skinn att ladda ner
-SimpleNumRefModelDesc=Returnerar referensnumret med format %syymm-nnnn var du är år, mm är månad och nnnn är sekventiell utan återställning
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Visa professionellt id med adresser
 ShowVATIntaInAddress=Dölj momsnumret inom gemenskapen med adresser
 TranslationUncomplete=Partiell översättning
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxyserver: Namn / Adress
 MAIN_PROXY_PORT=Proxyserver: Port
 MAIN_PROXY_USER=Proxyserver: Logga in / Användare
 MAIN_PROXY_PASS=Proxyserver: Lösenord
-DefineHereComplementaryAttributes=Definiera här några extra / anpassade attribut som du vill inkludera för: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Komplementära egenskaper
 ExtraFieldsLines=Kompletterande attribut (rader)
 ExtraFieldsLinesRec=Kompletterande attribut (mallar fakturor linjer)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Logga in (unix)
 LDAPFieldLoginExample=Exempel: uid
 LDAPFilterConnection=Sökfilter
 LDAPFilterConnectionExample=Exempel: & (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Logga in (samba, ActiveDirectory)
 LDAPFieldLoginSambaExample=Exempel: Samaccountname
 LDAPFieldFullname=Förnamn Namn
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Ditt företag har definierats för att inte använda mo
 AccountancyCode=Redovisningskod
 AccountancyCodeSell=Försäljning konto. kod
 AccountancyCodeBuy=Köpa konto. kod
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Åtgärder och dagordning modul inställning
 PasswordTogetVCalExport=Viktiga att tillåta export länk
+SecurityKey = Security Key
 PastDelayVCalExport=Inte exporterar fall äldre än
 AGENDA_USE_EVENT_TYPE=Använd händelsetyper (hanteras i menyn Inställningar -> Ordböcker -> Typ av kalenderhändelser)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Ställ in det här standardvärdet för typ av händelse automatiskt i händelse skapa formulär
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Bakgrundsfärg för udda bords linjer
 BackgroundTableLineEvenColor=Bakgrundsfärg för ännu bords linjer
 MinimumNoticePeriod=Minsta varseltid (Din ledighet begäran måste göras innan denna försening)
 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.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Ange här mellan hållare, lista med byte nummer som representerar valutasymbolen. Till exempel: för $, skriv [36] - för brazil real R $ [82,36] - för €, skriv [8364]
 ColorFormat=RGB-färgen är i HEX-format, t.ex.: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottenmarginal på PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Det finns ingen specifik inställning som krävs för den här modulen.
 SetToYesIfGroupIsComputationOfOtherGroups=Ställ det här på ja om den här gruppen är en beräkning av andra grupper
-EnterCalculationRuleIfPreviousFieldIsYes=Ange beräkningsregel om föregående fält satt till Ja (till exempel "CODEGRP1 + CODEGRP2")
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Flera språkvarianter hittades
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex-filter till rent värde (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Uppställning av modulen Sociala nätverk
 EnableFeatureFor=Aktivera funktioner för <strong> %s </strong>
 VATIsUsedIsOff=Obs! Alternativet att använda moms eller moms har ställts till <strong> Av </strong> i menyn %s - %s, så Försäljningsskatt eller moms används alltid 0 för försäljning.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Varning, funktion som endast stöds på textfält. Också en URL-parameter åtgärd = skapa eller åtgärd = redigera måste ställas in ELLER sidnamn måste sluta med "new.php" för att utlösa denna funktion.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=E-post samlare
 EmailCollectorDescription=Lägg till ett schemalagt jobb och en installationssida för att skanna regelbundet e-postrutor (med IMAP-protokoll) och spela in e-postmeddelanden som tas emot i din ansökan, på rätt plats och / eller skapa några poster automatiskt (som ledningar).
 NewEmailCollector=Ny e-postsamlare
@@ -2049,8 +2062,11 @@ UseDebugBar=Använd felsökningsfältet
 DEBUGBAR_LOGS_LINES_NUMBER=Antal sista logglinjer för att hålla i konsolen
 WarningValueHigherSlowsDramaticalyOutput=Varning, högre värden sänker dramaticaly-utgången
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Exportmodeller delas med alla
 ExportSetup=Inställning av modul Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index 42c143d1b0b..3252d7fcc2e 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Detta är ditt SEPA-mandat för att bemyndiga vårt företag att göra direkt debitering till din bank. Returnera det undertecknat (skanna av det signerade dokumentet) eller skicka det via post till
 AutoReportLastAccountStatement=Fyll i fältet 'Antal kontoutdrag' automatiskt med det sista kontonummeret när avstämning görs
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index b1c16852ac5..0059f11c2af 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -52,11 +52,12 @@ Invoices=Fakturor
 InvoiceLine=Faktura linje
 InvoiceCustomer=Kundfaktura
 CustomerInvoice=Kundfaktura
-CustomersInvoices=Kundens fakturor
+CustomersInvoices=Kundfakturor
 SupplierInvoice=Leverantörsfaktura
-SuppliersInvoices=Leverantörer fakturor
+SuppliersInvoices=Leverantörsfakturor
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Leverantörsfaktura
-SupplierBills=leverantörer fakturor
+SupplierBills=Leverantörsfakturor
 Payment=Betalning
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Betalningar redan gjort
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Betalningsregel
 PaymentMode=Betalnings typ
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debet / Kreditkort
 PaymentTypePP=PayPal
 IdPaymentMode=Betalningstyp (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Datum för senaste generationen
 DateLastGenerationShort=Datum senaste gen.
 MaxPeriodNumber=Max. Antal fakturahantering
 NbOfGenerationDone=Antal fakturahantering redan gjort
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Antal generationer gjort
 MaxGenerationReached=Maximalt antal generationer som uppnåtts
 InvoiceAutoValidate=Bekräfta fakturor automatiskt
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Inom 14 dagar efter slutet av månaden
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variabelt belopp (%% summa)
 VarAmountOneLine=Variabel mängd (%% tot.) - 1 rad med etikett '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Banköverföring
 PaymentTypeShortVIR=Banköverföring
@@ -494,12 +498,16 @@ Cash=Kontanter
 Reported=Försenad
 DisabledBecausePayments=Inte möjlig eftersom det inte finns några betalningar
 CantRemovePaymentWithOneInvoicePaid=Kan inte ta bort betalning eftersom det finns minst en faktura märkt som betalt
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Förväntad utbetalning
 CantRemoveConciliatedPayment=Det går inte att ta bort avstämd betalning
 PayedByThisPayment=Betalas av denna betalning
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återbetalning kommer automatiskt att stängas med status "Betald".
 ToMakePayment=Betala
 ToMakePaymentBack=Återbetala
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Du måste först skapa en standardfaktura
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Faktura PDF mall Svamp. En komplett fakturamall
 PDFCrevetteDescription=Faktura PDF-mall Crevette. En komplett faktura mall för lägesfakturor
-TerreNumRefModelDesc1=Återger nummer med formatet %syymm-nnnn för standardfakturor och %syymm-NNNN för kreditnotor där yy är året, mm månaden och nnnn är en sekvens med ingen paus och ingen återgång till 0
-MarsNumRefModelDesc1=Returnummer med format %syymm-nnnn för standardfakturor, %syymm-nnnn för utbytesfakturor, %syymm-nnnn för betalningsfakturor och %syymm-nnnn för kreditnoteringar var du är år, mm är månad och nnnn är en sekvens utan paus och nej återgå till 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Ett lagförslag som börjar med $ syymm finns redan och är inte förenligt med denna modell för sekvens. Ta bort den eller byta namn på den för att aktivera denna modul.
-CactusNumRefModelDesc1=Returnummer med format %syymm-nnnn för standardfakturor, %syymm-nnnn för kreditnoteringar och %syymm-nnnn för nedbetalningsfakturor varav år, mm är månad och nnnn är en sekvens utan paus och ingen återgång till 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Leverantörskontakt
 InvoiceFirstSituationAsk=Första löpande faktura
 InvoiceFirstSituationDesc=<b>Löpande fakturor</b> avser delfakturor vid pågående arbeten, t.ex. vid ett bygge.
 InvoiceSituation=Löpande faktura
+PDFInvoiceSituation=Löpande faktura
 InvoiceSituationAsk=Faktura på löpande räkning
 InvoiceSituationDesc=Skapa en avstämning / faktura på löpande räkning, följande en tidigare
 SituationAmount=Löpande faktura belopp (netto)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Om du behöver generera sådana fakturor autom
 DeleteRepeatableInvoice=Ta bort mallfaktura
 ConfirmDeleteRepeatableInvoice=Är du säker på att du vill ta bort mallfakturan?
 CreateOneBillByThird=Skapa en faktura per tredje part (annars, en faktura per order)
-BillCreated=%s faktura (er) skapade
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status för dokumentgenerering
 DoNotGenerateDoc=Generera inte dokumentfil
 AutogenerateDoc=Auto generera dokumentfil
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index a7deb6f3811..db762d25692 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=inloggningsinformation
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Senaste %s Produkter / tjänster
@@ -17,9 +18,13 @@ BoxLastActions=Senaste åtgärderna
 BoxLastContracts=Senaste kontrakt
 BoxLastContacts=Senaste kontakter / adresser
 BoxLastMembers=Senaste medlemmarna
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Senaste interventioner
 BoxCurrentAccounts=Öppna konton balans
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Senaste %s nyheter från %s
 BoxTitleLastProducts=Produkter / tjänster: senaste %s modifierad
 BoxTitleProductsAlertStock=Produkter: lagervarning
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Redovisning
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 821c5b52128..c890dddefa5 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Leverantörer tags / kategorier område
 CustomersCategoriesArea=Kunder taggar / kategorier område
 MembersCategoriesArea=Medlemmar taggar / kategorier område
 ContactsCategoriesArea=Kontakter taggar / kategorier område
-AccountsCategoriesArea=Konton taggar / kategorier område
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projektets taggar / kategorier område
 UsersCategoriesArea=Användare taggar / kategorier område
 SubCats=Underkategorier
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Visa tagg / kategori
 ByDefaultInList=Som standard i listan
 ChooseCategory=Välj kategori
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 1e64d1649c3..2dc085dac75 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -43,9 +43,10 @@ Individual=Privatperson
 ToCreateContactWithSameName=Skapar automatiskt en kontakt / adress med samma information som tredjepart under tredjepart. I de flesta fall, även om din tredjepart är en fysisk person, är det bara att skapa en tredjepart.
 ParentCompany=Moderbolaget
 Subsidiaries=Dotterbolag
-ReportByMonth=Rapportera per månad
-ReportByCustomers=Rapportera av kunden
-ReportByQuarter=Rapport från kurs
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Hövlighet kod
 RegisteredOffice=Säte
 Lastname=Efternamn
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Social Security Number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate nummer)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (Siret)
 ProfId3FR=Prof Id 3 (NAF, gamla APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registreringsnummer
 ProfId2GB=-
 ProfId3GB=Prof Id 3 (SIC)
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg)
 ProfId2LU=Id. prof. 2 (affärstillstånd)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (personnummer)
 ProfId3PT=Prof Id 3 (organisationsnummer)
 ProfId4PT=Prof Id 4 (konservatoriet)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Obetalda fakturor
 OutstandingBill=Max för obetald faktura
 OutstandingBillReached=Max. för enastående räkning uppnådd
 OrderMinAmount=Minsta belopp för beställning
-MonkeyNumRefModelDesc=Returnera ett nummer med formatet %syymm-nnnn för kundkoden och %syymm-nnnn för leverantörskoden där du är år, mm är månad och nnnn är en sekvens utan paus och ingen återgång till 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Kund / leverantör-nummer är ledig. Denna kod kan ändras när som helst.
 ManagingDirectors=Företagledares namn (vd, direktör, ordförande ...)
 MergeOriginThirdparty=Duplicera tredjepart (tredjepart du vill ta bort)
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index b9ac03cf0ef..2b141e51eb7 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST-inköp
 VATCollected=Momsintäkterna
 StatusToPay=Att betala
 SpecialExpensesArea=Område för alla special betalningar
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social eller skattemässig skatt
 SocialContributions=Sociala eller skattemässiga skatter
 SocialContributionsDeductibles=Avdragsgilla sociala eller skattemässiga skatter
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Kundfaktura betalning
 PaymentSupplierInvoice=leverantörsfaktura betalning
 PaymentSocialContribution=Sociala och skattemässiga betalningar
 PaymentVat=Moms betalning
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Lista över betalningar
 ListOfCustomerPayments=Förteckning över kundbetalningar
 ListOfSupplierPayments=Lista över leverantörsbetalningar
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Betalning
 LT2PaymentsES=IRPF betalningar
 VATPayment=Försäljningsskatt betalning
 VATPayments=Försäljningsskatt betalningar
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Återbetalning av moms
 NewVATPayment=Ny momsbetalning
 NewLocalTaxPayment=Ny skatt %s betalning
@@ -134,9 +138,17 @@ NoWaitingChecks=Inga kontroller väntar på insättning.
 DateChequeReceived=Kontrollera datum mottagning ingång
 NbOfCheques=Antal kontroller
 PaySocialContribution=Betala en social / skattemässig skatt
-ConfirmPaySocialContribution=Är du säker på att du vill märka denna sociala eller skattemässiga skatt som betalad?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Ta bort en social eller skattemässig skattebetalning
-ConfirmDeleteSocialContribution=Är du säker på att du vill ta bort denna sociala / skattemässiga skattebetalning?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Sociala och skattemässiga skatter och betalningar
 CalcModeVATDebt=<b>Läge% svat på redovisning engagemang% s.</b>
 CalcModeVATEngagement=<b>Läge% svat på inkomster-utgifter% s.</b>
@@ -163,6 +175,7 @@ RulesResultInOut=- Det inkluderar de reala betalningarna på fakturor, utgifter,
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- Det inkluderar alla effektiva betalningar av fakturor som mottagits från kunder. <br> - Det är baserat på betalningsdatum för dessa fakturor <br>
 RulesCATotalSaleJournal=Den innehåller alla kreditlinjer från försäljningsloggboken.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Det innehåller post i din huvudboken med bokföringskonto som har gruppen "EXPENSE" eller "INCOME"
 RulesResultBookkeepingPredefined=Det innehåller post i din huvudboken med bokföringskonto som har gruppen "EXPENSE" eller "INCOME"
 RulesResultBookkeepingPersonalized=Det visar rekord i din huvudboken med bokföringskonton <b> grupperad av personliga grupper </b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Försäljningsskattrapport från tredje part
 VATReportByCustomers=Försäljningsskatt rapport från kund
 VATReportByCustomersInInputOutputMode=Rapport av kunden moms samlas och betalas
 VATReportByQuartersInInputOutputMode=Rapportera enligt försäljningsskattesats för den skatt som samlats och betalats
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Rapportera skatt 2 efter skatt
 LT2ReportByQuarters=Rapportera skatt 3 efter skatt
 LT1ReportByQuartersES=Rapport från RE hastighet
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtyp
 InvoiceLinesToDispatch=Faktura linjer avsändandet
 ByProductsAndServices=Efter produkt och service
 RefExt=Extern ref
-ToCreateAPredefinedInvoice=För att skapa en mallfaktura, skapa en standardfaktura, och utan att bekräfta den, klicka på knappen "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Länk för att beställa
 Mode1=Metod 1
 Mode2=Metod 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Det dedikerade bokföringskontot som definieras
 ACCOUNTING_ACCOUNT_SUPPLIER=Redovisningskonto som används för leverantörs tredje part
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Det dedikerade bokföringskontot som definieras på tredje partskort kommer endast att användas för Subledger-bokföring. Den här kommer att användas för huvudboken och som standardvärde för Subledger-bokföring om en dedikerad leverantörsredovisningskonto på tredjeparten inte är definierad.
 ConfirmCloneTax=Bekräfta klon av en social / skattemässig skatt
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Klona det för nästa månad
 SimpleReport=Enkel rapport
 AddExtraReport=Extra rapporter (lägg till utländsk och nationell kundrapport)
@@ -253,7 +269,8 @@ AccountingAffectation=Redovisningsuppdrag
 LastDayTaxIsRelatedTo=Den sista dagen i vilken skatten är relaterad till
 VATDue=Försäljningsskatt krävdes
 ClaimedForThisPeriod=Påstås för perioden
-PaidDuringThisPeriod=Betald under denna period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=Med försäljningsskattesats
 TurnoverbyVatrate=Omsättning fakturerad med försäljningsskattesats
 TurnoverCollectedbyVatrate=Omsättning upptagen med försäljningsskattesats
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
index 0c633258618..795137d4020 100644
--- a/htdocs/langs/sv_SE/ecm.lang
+++ b/htdocs/langs/sv_SE/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Filen är inte indexerad i databasen (försök ladda
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 0ec329c972d..21a4bc7c8f0 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Nummer <b>%s</b> inte hittat (Bad väg, fel behörighet eller 
 ErrorFunctionNotAvailableInPHP=Funktion <b>%s</b> krävs för denna funktion, men finns inte i denna version och konfigureringen av PHP.
 ErrorDirAlreadyExists=En katalog med detta namn finns redan.
 ErrorFileAlreadyExists=En fil med detta namn finns redan.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Handlingar den mottagit inte helt av server.
 ErrorNoTmpDir=Tillfälliga directy %s inte existerar.
 ErrorUploadBlockedByAddon=Ladda upp blockeras av en PHP / Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Fel vid inmatning av kontoplan. Om några konton inte ladda
 ErrorBadSyntaxForParamKeyForContent=Dålig syntax för param keyforcontent. Måste ha ett värde som börjar med %s eller %s
 ErrorVariableKeyForContentMustBeSet=Fel, konstanten med namnet %s (med textinnehåll som ska visas) eller %s (med extern webbadress för att visa) måste ställas in.
 ErrorURLMustStartWithHttp=URL %s måste börja med http: // eller https: //
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Fel, den nya referensen används redan
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/sv_SE/externalsite.lang b/htdocs/langs/sv_SE/externalsite.lang
index e8162ce8502..4076aea29c5 100644
--- a/htdocs/langs/sv_SE/externalsite.lang
+++ b/htdocs/langs/sv_SE/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup länk till extern webbplats
-ExternalSiteURL=Extern webbplats URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Modul ExternalSite var inte korrekt konfigurerad.
 ExampleMyMenuEntry=Min meny posten
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index f8603cc6238..3753cd93d14 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Ändr. datum
 IPModification=Modification IP
 DateLastModification=Senaste ändringsdatum
 DateValidation=Bekräftelsesdatum
+DateSigning=Signing date
 DateClosing=Sista dag
 DateDue=Förfallodag
 DateValue=Valuteringsdag
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Enhetspris (exkl.) (Valuta)
 UnitPriceTTC=Pris per enhet
 PriceU=Styckpris
 PriceUHT=St.pris(net)
-PriceUHTCurrency=U.P (valuta)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=UPP. (inkl. skatt)
 Amount=Belopp
 AmountInvoice=Fakturabelopp
@@ -389,6 +390,8 @@ AmountTotal=Summa
 AmountAverage=Genomsnittligt belopp
 PriceQtyMinHT=Pris kvantitet min. (exkl. skatt)
 PriceQtyMinHTCurrency=Pris kvantitet min. (exkl. skatt) (valuta)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Procent
 Total=Summa
 SubTotal=Delsumma
@@ -724,7 +727,7 @@ MenuMembers=Medlemmar
 MenuAgendaGoogle=Google dagordning
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr gräns (meny hem-inställning-säkerhet): %s Kb, PHP gräns: %s Kb
-NoFileFound=Inga dokument har sparats i denhär katalogen
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Nuvarande språk
 CurrentTheme=Nuvarande tema
 CurrentMenuManager=Nuvarande menyhanterare
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Ta bort strängen '%s'
 SomeTranslationAreUncomplete=Några av de språk som erbjuds kan bara översättas delvis eller kan innehålla fel. Snälla hjälp att korrigera ditt språk genom att registrera dig på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> för att lägga till dina förbättringar.
-DirectDownloadLink=Direkt nedladdningslänk (offentlig / extern)
-DirectDownloadInternalLink=Direkt nedladdningslänk (måste vara inloggad och behöver behörigheter)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Ladda ner
 DownloadDocument=Hämta dokument
 ActualizeCurrency=Uppdatera valutakurs
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kontakter
 SearchIntoMembers=Medlemmar
 SearchIntoUsers=Användare
 SearchIntoProductsOrServices=Produkter eller tjänster
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projekt
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Uppgifter
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Tangentbordsgenväg
 AssignedTo=Påverkas i
 Deletedraft=Ta bort utkast
 ConfirmMassDraftDeletion=Utkast till massberegningsbekräftelse
-FileSharedViaALink=Fil delad via länk
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Välj en tredje part först ...
 YouAreCurrentlyInSandboxMode=Du befinner dig för närvarande i %s "sandbox" -läget
 Inventory=Lager
 AnalyticCode=Analytisk kod
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Visa mer info
 NoFilesUploadedYet=Var god ladda upp ett dokument först
 SeePrivateNote=Se privat notering
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/sv_SE/margins.lang b/htdocs/langs/sv_SE/margins.lang
index 8dfac6fa0cf..2e319949792 100644
--- a/htdocs/langs/sv_SE/margins.lang
+++ b/htdocs/langs/sv_SE/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Marginaldetaljer
 ProductMargins=Produktmarginaler
 CustomerMargins=Kundmarginaler
 SalesRepresentativeMargins=Återförsäljares marginaler
+ContactOfInvoice=Contact of invoice
 UserMargins=Användarmarginaler
 ProductService=Produkt eller tjänst
 AllProducts=Alla produkter och tjänster
 ChooseProduct/Service=Välj produkt eller tjänst
 ForceBuyingPriceIfNull=Tvinga köp / kostpris till försäljningspris om det inte är definierat
-ForceBuyingPriceIfNullDetails=Om köp- / kostnadskursen inte definieras, och detta alternativ "ON" kommer marginalen att vara noll på raden (köp / kostnadskurs = försäljningspris), annars ("OFF"), marginal motsvarar föreslagen standard.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Marginalmetod för globala rabatter
 UseDiscountAsProduct=Som produkt
 UseDiscountAsService=Som tjänst
@@ -36,7 +37,7 @@ CostPrice=Kostnadspris
 UnitCharges=Enhetspris
 Charges=Avgifter
 AgentContactType=Handelsagentens kontakttyp
-AgentContactTypeDetails=Definiera vad kontakttyp (länkad på fakturor) kommer att användas för marginalrapport per försäljning representant
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Betyg måste vara ett numeriskt värde
 markRateShouldBeLesserThan100=Mark takt bör vara lägre än 100
 ShowMarginInfos=Visa marginal information
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 848cc24cf49..6e0adfe91f2 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Förteckning över förslag till medlemmar (att bekräftas)
 MembersListValid=Förteckning över giltiga medlemmar
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=Förteckning över avslutade medlemmar
 MembersListQualified=Förteckning över kvalificerade ledamöter
 MenuMembersToValidate=Förslag medlemmar
 MenuMembersValidated=Bekräftat medlemmar
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Avslutade medlemmar
 MembersWithSubscriptionToReceive=Medlemmar med abonnemang för att ta emot
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Prenumerationen löpte ut
 MemberStatusActiveLateShort=Utgångna
 MemberStatusPaid=Prenumeration aktuell
 MemberStatusPaidShort=Aktuell
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Avslutad medlem
 MemberStatusResiliatedShort=Avslutad
 MembersStatusToValid=Förslag medlemmar
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Avslutade medlemmar
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Bekräftade
@@ -82,6 +87,8 @@ Physical=Fysisk
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Återaktivera
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Avsluta en medlem
 ConfirmResiliateMember=Är du säker på att du vill säga upp den här medlemmen?
 DeleteMember=Ta bort en medlem
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-postmall för att använda för
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-postmall för att skicka e-post till en medlem om ny abonnemangsinspelning
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-postmall för att skicka e-postpåminnelse när prenumerationen är på väg att gå ut
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-postmall för att använda för att skicka e-post till en medlem om medlemsavbeställning
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Avsändare E-post för automatiska e-postmeddelanden
 DescADHERENT_ETIQUETTE_TYPE=Utformning av etikettsida
 DescADHERENT_ETIQUETTE_TEXT=Text på medlems adressflik
@@ -162,6 +170,7 @@ DocForLabels=Generera adress ark (Format för utgång faktiskt inställning: <b>
 SubscriptionPayment=Teckning betalning
 LastSubscriptionDate=Datum för senaste prenumerationsbetalning
 LastSubscriptionAmount=Antal senaste prenumeration
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Medlemmar statistik per land
 MembersStatisticsByState=Medlemmar statistik från stat / provins
 MembersStatisticsByTown=Medlemmar statistik per kommun
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index 9983f774100..5a6e5f84a0e 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 089b388185c..5ab7146c133 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Gör så
 MakeOrder=Gör så
 SupplierOrder=Inköpsorder
 SuppliersOrders=Beställning
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Nuvarande köporder
 CustomerOrder=Kundorder
 CustomersOrders=Försäljningsorder
@@ -141,11 +143,12 @@ OrderByEMail=epost
 OrderByWWW=Nätet
 OrderByPhone=Telefonen
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=En enkel ordermodell
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Faktura order
+CreateInvoiceForThisSupplier=Faktura order
 NoOrdersToInvoice=Inga order fakturerbar
 CloseProcessedOrdersAutomatically=Märk "bearbetade" alla valda order.
 OrderCreation=Order skapning
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 1f8d1297596..b62c35eb549 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Företag med flera aktiviteter (alla huvudmoduler)
 CreatedBy=Skapad av %s
 ModifiedBy=Uppdaterad av %s
 ValidatedBy=Bekräftad av %s
+SignedBy=Signed by %s
 ClosedBy=Stängt av %s
 CreatedById=Användarkod som skapade
 ModifiedById=Användar-ID som gjorde senaste ändringen
@@ -244,6 +245,7 @@ NewKeyIs=Det här är din nya nycklar för att logga in
 NewKeyWillBe=Din nya knappen för att logga in på programvaran kommer att vara
 ClickHereToGoTo=Klicka här för att gå till %s
 YouMustClickToChange=Du måste dock först klicka på följande länk för att bekräfta detta lösenord förändring
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Om du inte har begärt denna förändring, bara glömma detta mail. Dina referenser förvaras säkert.
 IfAmountHigherThan=Om mängden högre än <strong> %s </strong>
 SourcesRepository=Förvaring för källor
diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang
index 6fe4fc70766..f0af71b91fd 100644
--- a/htdocs/langs/sv_SE/productbatch.lang
+++ b/htdocs/langs/sv_SE/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Använd batch/serie-nummer
-ProductStatusOnBatch=Ja (batch/sere-nummer krävs)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=Nej (batch/serie-nummer används ej)
-ProductStatusOnBatchShort=Ja
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Nej
 Batch=Batch/Serie
 atleast1batchfield=Bäst före-datum eller Batch/Serie-nummer
@@ -16,9 +18,18 @@ printEatby=Äter med:%s
 printSellby=Sälj-med :%s
 printQty=Antal: %d
 AddDispatchBatchLine=Lägg en linje för Hållbarhet avsändning
-WhenProductBatchModuleOnOptionAreForced=När modulen Lot / Serial är på, är automatisk lagerminskning tvungen att "Minska reella lager vid fraktvalidering" och automatisk ökningsläge är tvungen att "Öka reella lager vid manuell leverans till lager" och kan inte redigeras. Andra alternativ kan definieras som du vill.
+WhenProductBatchModuleOnOptionAreForced=När modulen Lot / Serial är på, är automatisk lagerminskning tvungen att "Minska reella lager vid fraktbekräftande" och automatisk ökningsläge är tvungen att "Öka reella lager vid manuell leverans till lager" och kan inte redigeras. Andra alternativ kan definieras som du vill.
 ProductDoesNotUseBatchSerial=Denna produkt använder ej batch/serie-nummer
 ProductLotSetup=Inställning av batch/serie modul
 ShowCurrentStockOfLot=Visa aktuellt lager för sammansatt produkt/parti
 ShowLogOfMovementIfLot=Visa statestik för sammansatt produkt/parti
 StockDetailPerBatch=Detaljlager för parti
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 895502e8464..2d55fe3f896 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=Momsavgift (för denna leverantör / produkt)
 DiscountQtyMin=Rabatt för denna mängd.
 NoPriceDefinedForThisSupplier=Inget pris / antal definierat för denna leverantör / produkt
 NoSupplierPriceDefinedForThisProduct=Ingen säljare pris / antal definierad för denna produkt
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Fördefinierad produkt
 PredefinedServicesToSell=Fördefinierad tjänst
 PredefinedProductsAndServicesToSell=Fördefinierade produkter eller tjänster att sälja
@@ -313,7 +314,7 @@ LastUpdated=Senaste uppdatering
 CorrectlyUpdated=Korrekt uppdaterad
 PropalMergePdfProductActualFile=Filer använder för att lägga till i PDF Azur är / är
 PropalMergePdfProductChooseFile=Välj PDF-filer
-IncludingProductWithTag=Inklusive produkt / service med tagg
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Standardpris, realt pris kan bero på kund
 WarningSelectOneDocument=Var god välj minst ett dokument
 DefaultUnitToShow=Enhet
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 144d986172d..b7710e22be7 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Lista över uppgifter
 GoToListOfTimeConsumed=Gå till listan över tidskrävt
 GanttView=Gantt-vy
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslagen relaterade till projektet
 ListOrdersAssociatedProject=Förteckning över försäljningsorder relaterade till projektet
 ListInvoicesAssociatedProject=Förteckning över kundfakturor relaterade till projektet
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/sv_SE/propal.lang b/htdocs/langs/sv_SE/propal.lang
index 92ae2b55e00..b5fdaf0092b 100644
--- a/htdocs/langs/sv_SE/propal.lang
+++ b/htdocs/langs/sv_SE/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Skicka kommersiella förslag per post
 DatePropal=Datum för förslag
 DateEndPropal=Datum sista giltighetsdag
 ValidityDuration=Giltighet varaktighet
-CloseAs=Ställ in status till
 SetAcceptedRefused=Set accepterad / vägrad
 ErrorPropalNotFound=Propal %s hittades inte
 AddToDraftProposals=Lägg till förslagsutkast
@@ -60,6 +59,7 @@ ConfirmClonePropal=Är du säker på att du vill klona det kommersiella förslag
 ConfirmReOpenProp=Är du säker på att du vill öppna tillbaka det kommersiella förslaget <b> %s </b>?
 ProposalsAndProposalsLines=Kommersiella förslag och linjer
 ProposalLine=Förslag linje
+ProposalLines=Proposal lines
 AvailabilityPeriod=Tillgänglighet fördröjning
 SetAvailability=Ställa tillgänglighet fördröjning
 AfterOrder=Efter att
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Skriftligt godkännande, företagsstämpel, datum och
 ProposalsStatisticsSuppliers=Statistik för leverantörsförslag
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 3979dcebd89..6ecacfe6a99 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -19,8 +19,8 @@ Stock=Lager
 Stocks=Lager
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Lager per lot / seriell
 LotSerial=Massor / serier
 LotSerialList=Lista över parti / serier
@@ -37,8 +37,8 @@ AllWarehouses=Alla lager
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Inkludera även utkast till order
 Location=Plats
-LocationSummary=Kortnamn plats
-NumberOfDifferentProducts=Antal olika produkter
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Totalt antal produkter
 LastMovement=Senaste rörelsen
 LastMovements=Senaste rörelserna
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Lagervärde
 UserWarehouseAutoCreate=Skapa ett användarlager automatiskt när du skapar en användare
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Fysisk / reell lager är beståndet för närvarande i lagerlokale
 RealStockWillAutomaticallyWhen=Den reala beståndet kommer att ändras enligt denna regel (enligt definitionen i Stock-modulen):
 VirtualStock=Virtuellt lager
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id lager
 DescWareHouse=Beskrivning lager
 LieuWareHouse=Lokalisering lager
 WarehousesAndProducts=Lager och produkter
 WarehousesAndProductsBatchDetail=Lager och produkter (med detaljer per lot / serie)
 AverageUnitPricePMPShort=Vägda genomsnittliga priset
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Säljpris per styck
 EstimatedStockValueSellShort=Värde för försäljning
 EstimatedStockValueSell=Värde för försäljning
@@ -145,7 +147,7 @@ Replenishments=Påfyllningar
 NbOfProductBeforePeriod=Antal av produkt %s i lager före vald period (< %s)
 NbOfProductAfterPeriod=Antal av produkt %s i lager efter vald period (> %s)
 MassMovement=Massrörelse
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Spela in överföring
 ReceivingForSameOrder=Kvitton för denna beställning
 StockMovementRecorded=Sparade lageröverföringar
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Lagernivå måste vara tillräcklig för att lägga
 StockMustBeEnoughForOrder=Lagernivå måste vara tillräckligt för att lägga till produkt / tjänst på beställning (check är gjort på nuvarande reellt lager när du lägger till en rad i ordning, oberoende av regeln för automatisk lagerförändring)
 StockMustBeEnoughForShipment= Lagernivå måste vara tillräcklig för att lägga till produkt / tjänst till leverans (check är gjort på nuvarande reellt lager när du lägger till en rad i leverans, oberoende av regeln för automatisk lagerförändring)
 MovementLabel=Etikett för lagerrörelse
-TypeMovement=Typ av rörelse
+TypeMovement=Direction of movement
 DateMovement=Datum för rörelse
 InventoryCode=Lagerrörelse- eller inventeringskod
 IsInPackage=Ingår i förpackning
@@ -183,6 +185,7 @@ inventoryCreatePermission=Skapa ny inventering
 inventoryReadPermission=Visa varulager
 inventoryWritePermission=Uppdatera varulager
 inventoryValidatePermission=Bekräfta inventering
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Lager
 inventoryListTitle=varulager
 inventoryListEmpty=Ingen inventering pågår
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index 451dba89d0d..c57c7839467 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Säljare
 SuppliersInvoice=Leverantörsfaktura
+SupplierInvoices=Leverantörsfakturor
 ShowSupplierInvoice=Visa leverantörsfaktura
 NewSupplier=Ny leverantör
 History=Historia
diff --git a/htdocs/langs/sv_SE/ticket.lang b/htdocs/langs/sv_SE/ticket.lang
index 95a2fb76ef8..42a21c94cc3 100644
--- a/htdocs/langs/sv_SE/ticket.lang
+++ b/htdocs/langs/sv_SE/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Raderade
 # Dict
 Type=Typ
 Severity=Allvarlighet
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Att skicka e-post från biljettmeddelande
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Visa modulens logotyp i det offentliga gränssnittet
 TicketsShowModuleLogoHelp=Aktivera det här alternativet för att dölja logotypmodulen på sidorna i det offentliga gränssnittet
 TicketsShowCompanyLogo=Visa företagets logotyp i det offentliga gränssnittet
 TicketsShowCompanyLogoHelp=Aktivera det här alternativet för att dölja huvudbolags logotyp på sidorna i det offentliga gränssnittet
-TicketsEmailAlsoSendToMainAddress=Skicka även meddelande till huvudadressen
-TicketsEmailAlsoSendToMainAddressHelp=Aktivera det här alternativet för att skicka ett mail till "Notifieringsadress från" -adressen (se inställningen nedan)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Begränsa visningen till biljetter som tilldelats den nuvarande användaren (inte effektiv för externa användare, alltid begränsad till den tredje parten som de är beroende av)
 TicketsLimitViewAssignedOnlyHelp=Endast biljetter som tilldelats den nuvarande användaren kommer att vara synliga. Gäller inte för en användare med biljettförvaltningsrättigheter.
 TicketsActivatePublicInterface=Aktivera det offentliga gränssnittet
@@ -126,10 +128,10 @@ TicketNumberingModules=Biljettnummermodul
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Meddela tredje part vid skapandet
 TicketsDisableCustomerEmail=Avaktivera alltid e-postmeddelanden när en biljett skapas från det offentliga gränssnittet
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Senast ändrade biljetter
 BoxLastModifiedTicketDescription=Senaste %s modifierade biljetter
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Inga nyligen ändrade biljetter
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 40d07f9c39b..6b883607b99 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Ta bort från grupp
 PasswordChangedAndSentTo=Lösenord ändras och skickas till <b>%s.</b>
 PasswordChangeRequest=Begär om ändring av lösenord för <b> %s </b>
 PasswordChangeRequestSent=Begäran om att ändra lösenord för <b>%s</b> skickas till <b>%s.</b>
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Bekräfta återställning av lösenord
 MenuUsersAndGroups=Användare & grupper
 LastGroupsCreated=Senaste %s grupper skapade
@@ -70,9 +72,10 @@ ExportDataset_user_1=Användare och deras egenskaper
 DomainUser=Domän användare %s
 Reactivate=Återaktivera
 CreateInternalUserDesc=I det här formuläret kan du skapa en intern användare i ditt företag / organisation. För att skapa en extern användare (kund, leverantör etc.), använd knappen "Create Dolibarr User" från den tredje partens kontaktkort.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Tillstånd beviljas, eftersom ärvt från en av en användares grupp.
 Inherited=Ärvda
+UserWillBe=Created user will be
 UserWillBeInternalUser=Skapad användare kommer att vara en intern användare (eftersom inte kopplade till en viss tredje part)
 UserWillBeExternalUser=Skapad användare kommer att vara en extern användare (eftersom kopplat till en viss tredje part)
 IdPhoneCaller=Id telefonen ringer
@@ -109,8 +112,10 @@ UserAccountancyCode=Användarkonto
 UserLogoff=Användarutloggning
 UserLogged=Användare loggad
 DateOfEmployment=Employment date
-DateEmployment=Anställningens startdatum
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Anställningens slutdatum
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=Du kan inte inaktivera din egen användarrekord
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index e04af80c19a..b3c08a3f786 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS= <u> Använd med PHP-inbäddad server </u> <br> På utvecklingsmiljö kan du föredra att testa webbplatsen med PHP-inbäddad webbserver (PHP 5.5 krävs) genom att köra <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Kontrollera också att virtuell värd har tillstånd <strong> %s </strong> på filer i <br> <strong> %s </strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Läsa
 WritePerm=Skriva
 TestDeployOnWeb=Test / distribuera på webben
 PreviewSiteServedByWebServer=<u> Förhandsgranska %s i en ny flik. </u> <br> <br> %s kommer att serveras av en extern webbserver (som Apache, Nginx, IIS). Du måste installera och konfigurera den här servern innan du pekar på katalogen: <br> <strong> %s </strong> <br> URL betjänad av extern server: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr= <u> Förhandsgranska %s i en ny flik. </u> <br> <br> %s kommer att serveras av Dolibarr-servern så det behöver inte någon extra webbserver (som Apache, Nginx, IIS) som ska installeras. <br> Det obekvämt är att webbadressen till sidorna inte är användarvänlig och börja med sökvägen till din Dolibarr. <br> URL betjänas av Dolibarr: <br> <strong> %s </strong> <br> <br> Om du vill använda din egen extern webbserver för att tjäna denna webbplats, skapa en virtuell värd på din webbserver som pekar på katalogen <br> <strong> %s </strong> <br> sedan ange namnet på denna virtuella server och klicka på den andra förhandsgranskningsknappen.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL för den virtuella värd som serveras av extern webbserver som inte definierats
 NoPageYet=Inga sidor ännu
 YouCanCreatePageOrImportTemplate=Du kan skapa en ny sida eller importera en fullständig webbplatsmall
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/sv_SE/zapier.lang b/htdocs/langs/sv_SE/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/sv_SE/zapier.lang
+++ b/htdocs/langs/sv_SE/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index f9a6468d94a..8f4508ada53 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 8dc815b522e..154400c6536 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/sw_SW/ecm.lang b/htdocs/langs/sw_SW/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/sw_SW/ecm.lang
+++ b/htdocs/langs/sw_SW/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/sw_SW/externalsite.lang b/htdocs/langs/sw_SW/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/sw_SW/externalsite.lang
+++ b/htdocs/langs/sw_SW/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index f8ba6f4073c..dc2a83f2015 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/sw_SW/margins.lang b/htdocs/langs/sw_SW/margins.lang
index b9d52dcfdc6..ad5406409b4 100644
--- a/htdocs/langs/sw_SW/margins.lang
+++ b/htdocs/langs/sw_SW/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/sw_SW/modulebuilder.lang b/htdocs/langs/sw_SW/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/sw_SW/modulebuilder.lang
+++ b/htdocs/langs/sw_SW/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang
index 503955cf5f0..87d196eb22f 100644
--- a/htdocs/langs/sw_SW/orders.lang
+++ b/htdocs/langs/sw_SW/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Phone
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/sw_SW/productbatch.lang
+++ b/htdocs/langs/sw_SW/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/sw_SW/propal.lang b/htdocs/langs/sw_SW/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/sw_SW/propal.lang
+++ b/htdocs/langs/sw_SW/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/sw_SW/suppliers.lang
+++ b/htdocs/langs/sw_SW/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/sw_SW/ticket.lang b/htdocs/langs/sw_SW/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/sw_SW/ticket.lang
+++ b/htdocs/langs/sw_SW/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/sw_SW/users.lang
+++ b/htdocs/langs/sw_SW/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sw_SW/website.lang b/htdocs/langs/sw_SW/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/sw_SW/website.lang
+++ b/htdocs/langs/sw_SW/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/sw_SW/zapier.lang b/htdocs/langs/sw_SW/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/sw_SW/zapier.lang
+++ b/htdocs/langs/sw_SW/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 6755dca4379..19154161e69 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=วารสาร
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index b816ace6628..90629c0f393 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=ถอดตัวล็อคเชื่อมต่อ
 YourSession=เซสชั่นของคุณ
 Sessions=Users Sessions
 WebUserGroup=ผู้ใช้เว็บเซิร์ฟเวอร์ / กลุ่ม
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=หมายเหตุ: <b>ใช่จะมีผลเฉ
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=การตั้งค่าการรักษาความปลอดภัย
+PHPSetup=PHP setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=ข้อผิดพลาดนี้ต้องใช้โมดูล PHP รุ่น% s หรือสูงกว่า
 ErrorModuleRequireDolibarrVersion=ข้อผิดพลาดในโมดูลนี้ต้อง s Dolibarr รุ่น% หรือสูงกว่า
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=ล้าง
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=ล้างในขณะนี้
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=เปิดใช้งานบน
 ActiveOn=เปิดใช้งานใน
+ActivatableOn=Activatable on
 SourceFile=แฟ้มแหล่งที่มา
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=มีจำหน่ายเฉพาะในกรณีที่ไม่ได้ใช้งาน JavaScript ปิดการใช้งาน
 Required=ที่จำเป็น
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=ทุกตัวละครอื่น ๆ ในหน้ากากจะยังคงเหมือนเดิม <br> ช่องว่างที่ไม่ได้รับอนุญาต <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 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>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=บรรณาธิการ
 Module49Desc=การจัดการแก้ไข
 Module50Name=ผลิตภัณฑ์
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind ความสามารถในการแปลง
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=ระบบบริหารจัดการทรัพยากรบุคคล
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=หลาย บริษัท
 Module5000Desc=ช่วยให้คุณสามารถจัดการกับหลาย บริษัท
-Module6000Name=ขั้นตอนการทำงาน
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=สร้าง / แก้ไขผู้ใช้ภา
 Permission254=สร้าง / แก้ไขผู้ใช้ภายนอกเท่านั้น
 Permission255=แก้ไขรหัสผ่านผู้ใช้อื่น ๆ
 Permission256=ลบหรือปิดการใช้งานผู้ใช้อื่น ๆ
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=อ่าน CA
 Permission272=อ่านใบแจ้งหนี้
 Permission273=ใบแจ้งหนี้ฉบับ
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=ตรวจสอบเหตุการณ์การรักษาความปลอดภัย
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=การตรวจสอบบัญชี
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=<b>คุณต้องเรียกใช้คำสั่งจากบรรทัดคำสั่งนี้หลังจากที่เข้าสู่ระบบไปยังเปลือกกับผู้ใช้% s</b> หรือคุณต้องเพิ่มตัวเลือก -W <b>ที่ท้ายบรรทัดคำสั่งที่จะให้รหัสผ่าน% s</b>
 YourPHPDoesNotHaveSSLSupport=ฟังก์ชั่น SSL ไม่สามารถใช้ได้ใน PHP ของคุณ
 DownloadMoreSkins=กินมากขึ้นในการดาวน์โหลด
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=แปลบางส่วน
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=คุณลักษณะที่สมบูรณ์
 ExtraFieldsLines=คุณลักษณะเสริม (เส้น)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=เข้าสู่ระบบ (ยูนิกซ์)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=ตัวกรองการค้นหา
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=เข้าสู่ระบบ (samba, ActiveDirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=ชื่อเต็ม
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=บัญชีการขาย รหัส
 AccountancyCodeBuy=บัญชีซื้อ รหัส
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=กิจกรรมและวาระการติดตั้งโมดูล
 PasswordTogetVCalExport=กุญแจสำคัญในการอนุญาตการเชื่อมโยงการส่งออก
+SecurityKey = Security Key
 PastDelayVCalExport=อย่าส่งออกเหตุการณ์ที่มีอายุมากกว่า
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=สีพื้นหลังสำหรับส
 BackgroundTableLineEvenColor=สีพื้นหลังสำหรับแม้แต่เส้นตาราง
 MinimumNoticePeriod=ระยะเวลาการแจ้งให้ทราบล่วงหน้าขั้นต่ำ (ตามคำขอลาของคุณจะต้องทำก่อนการหน่วงเวลานี้)
 NbAddedAutomatically=จำนวนวันที่เพิ่มเข้าไปในเคาน์เตอร์ของผู้ใช้ (โดยอัตโนมัติ) ในแต่ละเดือน
-EnterAnyCode=ฟิลด์นี้มีการอ้างอิงในการระบุสาย ป้อนค่าที่คุณเลือกได้ แต่ไม่มีตัวอักษรพิเศษ
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index 0a547bb3422..ec66bfbaf1b 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 444472a0444..5976d3100e4 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -52,11 +52,12 @@ Invoices=ใบแจ้งหนี้
 InvoiceLine=เส้นใบแจ้งหนี้
 InvoiceCustomer=ใบแจ้งหนี้ของลูกค้า
 CustomerInvoice=ใบแจ้งหนี้ของลูกค้า
-CustomersInvoices=ใบแจ้งหนี้ลูกค้า
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=ซัพพลายเออร์ใบแจ้งหนี้
+SupplierBills=Vendor invoices
 Payment=การชำระเงิน
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=การชำระเงินที่ทำมาแล
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=กฎการชำระเงิน
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=ปริมาณ (ทีโอที %%.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=โอนเงินผ่านธนาคาร
 PaymentTypeShortVIR=โอนเงินผ่านธนาคาร
@@ -494,12 +498,16 @@ Cash=เงินสด
 Reported=ล่าช้า
 DisabledBecausePayments=เป็นไปไม่ได้เนื่องจากมีการชำระเงินบางส่วน
 CantRemovePaymentWithOneInvoicePaid=ไม่สามารถลบการชำระเงินเนื่องจากมีอย่างน้อยหนึ่งใบแจ้งหนี้แยกจ่าย
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=การชำระเงินที่คาดว่าจะ
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=การชำระเงินโดยการชำระเงินนี้
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=จ่ายเงิน
 ToMakePaymentBack=คืนทุน
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=จำนวนกลับมาพร้อมกับรูปแบบ% syymm-nnnn สำหรับใบแจ้งหนี้และมาตรฐาน% syymm-nnnn สำหรับการบันทึกเครดิตที่ yy เป็นปีเป็นเดือนมิลลิเมตรและ nnnn เป็นลำดับที่มีการหยุดพักและกลับไปที่ 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
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=เริ่มต้นด้วยการเรียกเก็บเงิน $ syymm มีอยู่แล้วและไม่ได้เข้ากันได้กับรูปแบบของลำดับนี้ ลบหรือเปลี่ยนชื่อเพื่อเปิดใช้งานโมดูลนี้
-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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=ใบแจ้งหนี้สถานการณ์แรก
 InvoiceFirstSituationDesc=<b>ใบแจ้งหนี้สถานการณ์จะเชื่อมโยงกับสถานการณ์ที่เกี่ยวข้องกับความก้าวหน้าเช่นความก้าวหน้าของการก่อสร้าง</b> สถานการณ์แต่ละครั้งจะถูกผูกติดอยู่กับใบแจ้งหนี้
 InvoiceSituation=ใบแจ้งหนี้สถานการณ์
+PDFInvoiceSituation=ใบแจ้งหนี้สถานการณ์
 InvoiceSituationAsk=ใบแจ้งหนี้ดังต่อไปนี้สถานการณ์
 InvoiceSituationDesc=สร้างสถานการณ์ใหม่ดังต่อไปนี้อย่างใดอย่างหนึ่งที่มีอยู่แล้ว
 SituationAmount=จำนวนใบแจ้งหนี้สถานการณ์ (สุทธิ)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
index f51f0e660fa..304e06b4448 100644
--- a/htdocs/langs/th_TH/boxes.lang
+++ b/htdocs/langs/th_TH/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=ยอดเงินเปิดบัญชี
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=การบัญชี
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index e61138aee8e..d03372dacbc 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=ลูกค้าแท็ก / พื้นที่ประเภท
 MembersCategoriesArea=แท็กสมาชิก / พื้นที่ประเภท
 ContactsCategoriesArea=แท็กติดต่อ / พื้นที่ประเภท
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=แสดงแท็ก / หมวดหมู่
 ByDefaultInList=โดยค่าเริ่มต้นในรายการ
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 8956b27f853..27b693be2e4 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -43,9 +43,10 @@ Individual=เอกชน
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=บริษัท แม่
 Subsidiaries=บริษัท ย่อย
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=รายงานอัตรา
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=รหัสสุภาพ
 RegisteredOffice=สำนักงานที่สมัครสมาชิก
 Lastname=นามสกุล
@@ -172,14 +173,20 @@ ProfId1ES=ศหมายเลข 1 (CIF / NIF)
 ProfId2ES=ศหมายเลข 2 (หมายเลขประกันสังคม)
 ProfId3ES=ศหมายเลข 3 (CNAE)
 ProfId4ES=ศหมายเลข 4 (วิทยาลัยจำนวน)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=ศหมายเลข 1 (ไซเรน)
 ProfId2FR=ศหมายเลข 2 (SIRET)
 ProfId3FR=ศหมายเลข 3 (NAF, APE เก่า)
 ProfId4FR=ศหมายเลข 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=ทะเบียนเลขที่
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=ศหมายเลข 1 (NIPC)
 ProfId2PT=ศหมายเลข 2 (หมายเลขประกันสังคม)
 ProfId3PT=ศหมายเลข 3 (Record พาณิชย์จำนวน)
 ProfId4PT=ศหมายเลข 4 (เรือน)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=ศหมายเลข 1 (OGRN)
 ProfId2RU=ศหมายเลข 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=การเรียกเก็บเงินในป
 OutstandingBill=แม็กซ์ สำหรับการเรียกเก็บเงินที่โดดเด่น
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=รหัสที่เป็นอิสระ รหัสนี้สามารถแก้ไขได้ในเวลาใดก็ได้
 ManagingDirectors=ผู้จัดการ (s) ชื่อ (ซีอีโอผู้อำนวยการประธาน ... )
 MergeOriginThirdparty=ซ้ำของบุคคลที่สาม (บุคคลที่สามต้องการลบ)
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index a74d5c1967d..e6f46facdf1 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=ภาษีมูลค่าเพิ่มที่จัดเก็บ
 StatusToPay=ที่จะต้องจ่าย
 SpecialExpensesArea=พื้นที่สำหรับการชำระเงินพิเศษทั้งหมด
+VATExpensesArea=Area for all TVA payments
 SocialContribution=ภาษีทางสังคมหรือทางการคลัง
 SocialContributions=ภาษีทางสังคมหรือทางการคลัง
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=การชำระเงินตามใบแจ้
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=สังคม / ชำระภาษีการคลัง
 PaymentVat=การชำระเงินภาษีมูลค่าเพิ่ม
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=รายชื่อของการชำระเงิน
 ListOfCustomerPayments=รายการชำระเงินของลูกค้า
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF การชำระเงิน
 LT2PaymentsES=IRPF การชำระเงิน
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=ตรวจสอบวันที่แผนกต้อนรับส่วนหน้า
 NbOfCheques=No. of checks
 PaySocialContribution=จ่ายทางสังคม / ภาษีการคลัง
-ConfirmPaySocialContribution=คุณแน่ใจหรือว่าต้องการที่จะจัดนี้ภาษีทางสังคมหรือทางการคลังเป็นเงิน?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=ลบชำระภาษีทางสังคมหรือทางการคลัง
-ConfirmDeleteSocialContribution=คุณแน่ใจหรือว่าต้องการลบนี้สังคม / ชำระภาษีการคลัง?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=ภาษีสังคมและการคลังและการชำระเงิน
 CalcModeVATDebt=<b>โหมด% sVAT ความมุ่งมั่นบัญชี%</b> s
 CalcModeVATEngagement=โหมด <b>sVAT% รายได้ค่าใช้จ่าย-%</b> s
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=รายงานโดยลูกค้าภาษีมูลค่าเพิ่มที่จัดเก็บและเรียกชำระแล้ว
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=รายงานโดยอัตรา RE
@@ -217,7 +231,7 @@ Pcg_subtype=ชนิดย่อย PCG
 InvoiceLinesToDispatch=เส้นที่จะส่งใบแจ้งหนี้
 ByProductsAndServices=By product and service
 RefExt=อ้างอิงภายนอก
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=เชื่อมโยงการสั่งซื้อ
 Mode1=วิธีที่ 1
 Mode2=วิธีที่ 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=โคลนมันสำหรับเดือนถัดไป
 SimpleReport=รายงานอย่างง่าย
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/th_TH/ecm.lang b/htdocs/langs/th_TH/ecm.lang
index d93d9646e22..9e0495720b4 100644
--- a/htdocs/langs/th_TH/ecm.lang
+++ b/htdocs/langs/th_TH/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 4de399f8493..7803f91686e 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=<b>สารบบ% s</b> ไม่พบ (เส้นทา
 ErrorFunctionNotAvailableInPHP=<b>% s</b> ฟังก์ชั่นที่จำเป็นสำหรับคุณลักษณะนี้ แต่ไม่สามารถใช้ได้ในรุ่น / การตั้งค่าของ PHP นี้
 ErrorDirAlreadyExists=ไดเรกทอรีที่มีชื่อนี้อยู่แล้ว
 ErrorFileAlreadyExists=ไฟล์ที่มีชื่อนี้อยู่แล้ว
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=ไฟล์ไม่ได้รับอย่างสมบูรณ์โดยเซิร์ฟเวอร์
 ErrorNoTmpDir=ชั่วคราวโดยตรงได้% s ไม่ได้มีอยู่
 ErrorUploadBlockedByAddon=อัพโหลดบล็อกโดย PHP / ปลั๊กอินอาปาเช่
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/th_TH/externalsite.lang b/htdocs/langs/th_TH/externalsite.lang
index fcb010a6ab3..f650f17c22f 100644
--- a/htdocs/langs/th_TH/externalsite.lang
+++ b/htdocs/langs/th_TH/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=การติดตั้งการเชื่อมโยงไปยังเว็บไซต์ภายนอก
-ExternalSiteURL=URL ของเว็บไซต์ภายนอก
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=โมดูล ExternalSite ไม่ได้กำหนดค่าอย่างถูกต้อง
 ExampleMyMenuEntry=รายการเมนู
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 62d14790365..6934a6e98eb 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif วันที่
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=วันที่ตรวจสอบ
+DateSigning=Signing date
 DateClosing=วันปิดสมุดทะเบียน
 DateDue=วันที่ครบกำหนด
 DateValue=วันที่คิดมูลค่า
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=ราคาต่อหน่วย
 PriceU=UP
 PriceUHT=UP (สุทธิ)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=UP (รวมภาษี).
 Amount=จำนวน
 AmountInvoice=จำนวนใบแจ้งหนี้
@@ -389,6 +390,8 @@ AmountTotal=จำนวนเงินรวม
 AmountAverage=จำนวนเงินเฉลี่ย
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=ร้อยละ
 Total=ทั้งหมด
 SubTotal=ไม่ทั้งหมด
@@ -724,7 +727,7 @@ MenuMembers=สมาชิก
 MenuAgendaGoogle=วาระการประชุมของ Google
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr ขีด จำกัด (เมนูที่บ้านการตั้งค่าการรักษาความปลอดภัย):% s Kb, PHP ขีด จำกัด :% s Kb
-NoFileFound=ไม่มีเอกสารที่บันทึกไว้ในไดเรกทอรีนี้
+NoFileFound=No documents uploaded
 CurrentUserLanguage=ภาษาปัจจุบัน
 CurrentTheme=รูปแบบปัจจุบัน
 CurrentMenuManager=ผู้จัดการเมนูปัจจุบัน
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=รายชื่อผู้ติดต่อ
 SearchIntoMembers=สมาชิก
 SearchIntoUsers=ผู้ใช้
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=โครงการ
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=งาน
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=ได้รับมอบหมายให้
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/th_TH/margins.lang b/htdocs/langs/th_TH/margins.lang
index daba5831b4b..0f020953bdf 100644
--- a/htdocs/langs/th_TH/margins.lang
+++ b/htdocs/langs/th_TH/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=รายละเอียดอัตรากำไรขั้
 ProductMargins=อัตรากำไรขั้นต้นของผลิตภัณฑ์
 CustomerMargins=อัตรากำไรขั้นต้นของลูกค้า
 SalesRepresentativeMargins=อัตรากำไรขั้นต้นเป็นตัวแทนขาย
+ContactOfInvoice=Contact of invoice
 UserMargins=อัตรากำไรขั้นต้นของผู้ใช้
 ProductService=สินค้าหรือบริการ
 AllProducts=ผลิตภัณฑ์และบริการทั้งหมด
 ChooseProduct/Service=เลือกสินค้าหรือบริการ
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=วิธี Margin ส่วนลดทั่วโลก
 UseDiscountAsProduct=เป็นผลิตภัณฑ์
 UseDiscountAsService=เป็นบริการ
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=ราคาทุน
 UnitCharges=ค่าใช้จ่ายต่อหน่วย
 Charges=ค่าใช้จ่าย
 AgentContactType=ตัวแทนพาณิชย์ประเภทการติดต่อ
-AgentContactTypeDetails=กำหนดประเภทติดต่อ (เชื่อมโยงในใบแจ้งหนี้) จะใช้สำหรับการรายงานอัตรากำไรขั้นต้นต่อตัวแทนขาย
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=อัตราจะต้องเป็นค่าตัวเลข
 markRateShouldBeLesserThan100=อัตรามาร์คควรจะต่ำกว่า 100
 ShowMarginInfos=แสดงขอบข่าวสาร
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index 90071b79ff1..cb702593656 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=รายชื่อสมาชิกร่าง (ที
 MembersListValid=รายชื่อสมาชิกที่ถูกต้อง
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=รายชื่อสมาชิกที่สิ้นสุดสมาชิกภาพ
 MembersListQualified=รายชื่อสมาชิกที่ผ่านการรับรอง
 MenuMembersToValidate=สมาชิกร่าง
 MenuMembersValidated=สมาชิกผ่านการตรวจสอบ
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=สมาชิกที่มีการสมัครสมาชิกจะได้รับ
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=หมดอายุ
 MemberStatusPaid=สมัครสมาชิกถึงวันที่
 MemberStatusPaidShort=ถึงวันที่
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=สมาชิกร่าง
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=ผ่านการตรวจสอบ
@@ -82,6 +87,8 @@ Physical=กายภาพ
 Moral=ศีลธรรม
 MorAndPhy=Moral and Physical
 Reenable=reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=ลบสมาชิก
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=รูปแบบของหน้าป้าย
 DescADHERENT_ETIQUETTE_TEXT=ข้อความที่พิมพ์อยู่บนแผ่นสมาชิก
@@ -162,6 +170,7 @@ DocForLabels=สร้างแผ่นอยู่
 SubscriptionPayment=การชำระเงินการสมัครสมาชิก
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=สถิติสมาชิกตามประเทศ
 MembersStatisticsByState=สถิติสมาชิกโดยรัฐ / จังหวัด
 MembersStatisticsByTown=สถิติสมาชิกโดยเมือง
diff --git a/htdocs/langs/th_TH/modulebuilder.lang b/htdocs/langs/th_TH/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/th_TH/modulebuilder.lang
+++ b/htdocs/langs/th_TH/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index 256288586d6..dccf12e02ac 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/orders.lang
@@ -16,6 +16,8 @@ ToOrder=ทำให้การสั่งซื้อ
 MakeOrder=ทำให้การสั่งซื้อ
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=อีเมล์
 OrderByWWW=ออนไลน์
 OrderByPhone=โทรศัพท์
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=รูปแบบการสั่งซื้อที่ง่าย
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=บิลสั่งซื้อ
+CreateInvoiceForThisSupplier=บิลสั่งซื้อ
 NoOrdersToInvoice=ไม่มีการเรียกเก็บเงินการสั่งซื้อ
 CloseProcessedOrdersAutomatically=จำแนก "แปรรูป" คำสั่งที่เลือกทั้งหมด
 OrderCreation=การสร้างการสั่งซื้อ
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index b69c81198d1..aa3544a88b1 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=สร้างโดย% s
 ModifiedBy=ดัดแปลงโดย% s
 ValidatedBy=การตรวจสอบโดย% s
+SignedBy=Signed by %s
 ClosedBy=ปิดโดย% s
 CreatedById=รหัสผู้ใช้ที่สร้าง
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=นี่คือกุญแจใหม่ของคุณเข
 NewKeyWillBe=คีย์ใหม่ของคุณที่จะเข้าสู่ระบบซอฟแวร์จะเป็น
 ClickHereToGoTo=คลิกที่นี่เพื่อไปยัง% s
 YouMustClickToChange=คุณต้อง แต่แรกคลิกที่ลิงค์ต่อไปนี้ในการตรวจสอบการเปลี่ยนแปลงรหัสผ่านนี้
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=หากคุณไม่ได้ขอเปลี่ยนแปลงนี้เพียงแค่ลืมอีเมล์นี้ ข้อมูลประจำตัวของคุณจะถูกเก็บไว้ที่ปลอดภัย
 IfAmountHigherThan=หากจำนวนเงินที่สูงกว่า <strong>s%</strong>
 SourcesRepository=พื้นที่เก็บข้อมูลสำหรับแหล่งที่มา
diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang
index dfedb8b0e17..72ff7f7a24f 100644
--- a/htdocs/langs/th_TH/productbatch.lang
+++ b/htdocs/langs/th_TH/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=การใช้งานจำนวนมาก / หมายเลขซีเรีย
-ProductStatusOnBatch=ใช่ (มาก / อนุกรมที่จำเป็น)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=ไม่ (มาก / อนุกรมไม่ได้ใช้)
-ProductStatusOnBatchShort=ใช่
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=ไม่
 Batch=ล็อต/ลำดับ
 atleast1batchfield=กินตามวันที่หรือขายโดยวันที่หรือ Lot / หมายเลข Serial
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 5d91c67d7ec..0884e8e05aa 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=ผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้า / บริการที่จะขาย
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=ปรับปรุงอย่างถูกต้อง
 PropalMergePdfProductActualFile=ไฟล์ที่ใช้ในการเพิ่มเป็น PDF ดาซูร์มี / เป็น
 PropalMergePdfProductChooseFile=ไฟล์ PDF เลือก
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=ราคาเริ่มต้นราคาที่แท้จริงอาจขึ้นอยู่กับลูกค้า
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=หน่วย
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index dc146212012..80f1d602be7 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/th_TH/propal.lang b/htdocs/langs/th_TH/propal.lang
index 9c13abe8817..9b8ab3dc6b4 100644
--- a/htdocs/langs/th_TH/propal.lang
+++ b/htdocs/langs/th_TH/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=ส่งข้อเสนอในเชิงพาณิช
 DatePropal=วันของข้อเสนอ
 DateEndPropal=ตั้งแต่วันที่วันที่สิ้นสุด
 ValidityDuration=ระยะเวลาตั้งแต่วันที่
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal% s ไม่พบ
 AddToDraftProposals=เพิ่มลงในร่างข้อเสนอ
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=ข้อเสนอเชิงพาณิชย์และสาย
 ProposalLine=โฆษณาข้อเสนอ
+ProposalLines=Proposal lines
 AvailabilityPeriod=ความล่าช้าที่ว่าง
 SetAvailability=ความล่าช้าในการตั้งค่าความพร้อม
 AfterOrder=หลังจากที่สั่งซื้อ
@@ -85,3 +85,8 @@ ProposalCustomerSignature=ยอมรับเขียนประทับ 
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 1ec66e72dee..15a6bdae356 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -19,8 +19,8 @@ Stock=สต็อกสินค้า
 Stocks=หุ้น
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=สถานที่
-LocationSummary=ที่ตั้งชื่อสั้น
-NumberOfDifferentProducts=จำนวนของผลิตภัณฑ์ที่แตกต่างกัน
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=จำนวนของผลิตภัณฑ์
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=ค่าโกดัง
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=หุ้นเสมือนจริง
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=คลังสินค้า Id
 DescWareHouse=คลังสินค้ารายละเอียด
 LieuWareHouse=คลังสินค้าภาษาท้องถิ่น
 WarehousesAndProducts=โกดังและผลิตภัณฑ์
 WarehousesAndProductsBatchDetail=โกดังและผลิตภัณฑ์ (ที่มีรายละเอียดมากต่อ / อนุกรม)
 AverageUnitPricePMPShort=ราคาเฉลี่ยถ่วงน้ำหนัก
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=ราคาขายต่อหน่วย
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=replenishments
 NbOfProductBeforePeriod=ปริมาณของ% s สินค้าในสต็อกก่อนระยะเวลาที่เลือก (<% s)
 NbOfProductAfterPeriod=จำนวนของผลิตภัณฑ์% s ในสต็อกหลังจากระยะเวลาที่เลือก (>% s)
 MassMovement=การเคลื่อนไหวมวลชน
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=ใบเสร็จรับเงินสำหรับการสั่งซื้อนี้
 StockMovementRecorded=การเคลื่อนไหวของหุ้นที่บันทึกไว้
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=ป้ายของการเคลื่อนไหว
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=การเคลื่อนไหวหรือรหัสสินค้าคงคลัง
 IsInPackage=เป็นแพคเกจที่มีอยู่
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=เปิดใหม่
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
index 4c536fea3e8..5219ed3fb4a 100644
--- a/htdocs/langs/th_TH/suppliers.lang
+++ b/htdocs/langs/th_TH/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=ประวัติศาสตร์
diff --git a/htdocs/langs/th_TH/ticket.lang b/htdocs/langs/th_TH/ticket.lang
index c66c4830bdf..8f739ef8f71 100644
--- a/htdocs/langs/th_TH/ticket.lang
+++ b/htdocs/langs/th_TH/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=ชนิด
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index 884f5b91031..68e1691f8bf 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=ลบออกจากกลุ่ม
 PasswordChangedAndSentTo=<b>เปลี่ยนรหัสผ่านและส่งไปยัง%</b> s
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=<b>ขอเปลี่ยนรหัสผ่านสำหรับ% s ส่งไปยัง%</b> s
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=ผู้ใช้และกลุ่ม
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=โดเมนของผู้ใช้% s
 Reactivate=ฟื้นฟู
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=ได้รับอนุญาตเพราะรับมาจากหนึ่งในกลุ่มของผู้ใช้
 Inherited=ที่สืบทอด
+UserWillBe=Created user will be
 UserWillBeInternalUser=ผู้ใช้ที่สร้างจะเป็นผู้ใช้งานภายใน (เพราะไม่เชื่อมโยงกับบุคคลที่สามโดยเฉพาะ)
 UserWillBeExternalUser=ผู้ใช้ที่สร้างจะเป็นผู้ใช้ภายนอก (เพราะเชื่อมโยงกับบุคคลที่สามโดยเฉพาะ)
 IdPhoneCaller=id โทรโทรศัพท์
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index 373eab76476..0110af84a4b 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=อ่าน
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/th_TH/zapier.lang b/htdocs/langs/th_TH/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/th_TH/zapier.lang
+++ b/htdocs/langs/th_TH/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 197742deeac..5568b64c0fa 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bağlı fatura satırları
 ExpenseReportLines=Bağlanacak gider raporu satırları
 ExpenseReportLinesDone=Bağlanmış gider raporları satırları
 IntoAccount=Satırı muhasebe hesabına bağla
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bağla
@@ -209,7 +209,7 @@ Codejournal=Günlük
 JournalLabel=Journal label
 NumPiece=Parça sayısı
 TransactionNumShort=Num. transaction
-AccountingCategory=Kişiselleştirilmiş gruplar
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Muhasebe girişleri
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index e15ec009134..0486dee99fc 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Bağlantı kilidini kaldır
 YourSession=Oturumunuz
 Sessions=Kullanıcı Oturumları
 WebUserGroup=Web sunucusu kullanıcısı/grubu
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=PHP yapılandırmanız aktif oturumların listelenmesine izin vermiyor gibi görünüyor. Oturumları kaydetmek için kullanılan dizin (<b>%s</b>) korunuyor olabilir (örneğin, İşletim Sistemi izinleri veya open_basedir PHP direkti tarafından).
@@ -62,6 +63,7 @@ IfModuleEnabled=Not: yalnızca <b>%s</b> modülü etkinleştirildiğinde evet et
 RemoveLock=<b>%s</b> dosyası mevcutsa, Güncelleme/Yükleme aracının kullanımına izin vermek için kaldırın veya yeniden adlandırın.
 RestoreLock=Güncelleme/Yükleme aracının daha sonraki kullanımlarına engel olmak için <b>%s</b> dosyasını, sadece okuma iznine sahip olacak şekilde geri yükleyin.
 SecuritySetup=Güvenlik ayarları
+PHPSetup=PHP setup
 SecurityFilesDesc=Burada dosya yükleme konusunda güvenlikle ilgili seçenekleri tanımlayın.
 ErrorModuleRequirePHPVersion=Hata, bu modül %s veya daha yüksek PHP sürümü gerektirir
 ErrorModuleRequireDolibarrVersion=Hata, bu modül %s veya daha yüksek Dolibarr sürümü gerektirir
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Bu alan yönetim işlevlerini sunar. İstenilen özelliği s
 Purge=Temizleme
 PurgeAreaDesc=Bu sayfa Dolibarr tarafından oluşturulan veya depolanan tüm dosyaları silmenizi sağlar (<b>%s</b> dizinindeki geçici veya tüm dosyalar). Bu özelliğin kullanılması normalde gerekli değildir. Bu araç, Dolibarr yazılımı web sunucusu tarafından oluşturulan dosyaların silinmesine izin vermeyen bir sağlayıcı tarafından barındırılan kullanıcılar için geçici bir çözüm olarak sunulur.
 PurgeDeleteLogFile=Syslog modülü için tanımlı <b>%s</b> dosyası da dahil olmak üzere günlük dosyalarını sil (veri kaybetme riskiniz yoktur)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=<b>%s</b> dizinindeki bütün dosyaları sil.<br>Bu işlem, öğelerle (üçüncü partiler, faturalar, v.s.) ilgili oluşturulan tüm dosyaları, ECM modülüne yüklenen dosyaları, veritabanı yedekleme dökümlerini ve geçici dosyaları silecektir.
 PurgeRunNow=Şimdi temizle
@@ -232,6 +234,7 @@ BoxesAvailable=Mevcut ekran etiketleri
 BoxesActivated=Etkin ekran etiketleri
 ActivateOn=Etkinleştirme açık
 ActiveOn=Etkinlik açık
+ActivatableOn=Activatable on
 SourceFile=Kaynak dosyası
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Yalnızca JavaScript ve Ajax devre dışı değilse vardır
 Required=Gerekli
@@ -347,9 +350,10 @@ LastActivationAuthor=En son aktivasyon yazarı
 LastActivationIP=En son aktivasyon IP'si
 UpdateServerOffline=Güncelleme sunucusu çevrimdışı
 WithCounter=Bir sayacı yönet
-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 kodunu <br><b>{cccc000}</b>n karakterdeki istemci kodunu müşteriye atanan bir sayaç tarafından izlenir. Müşteriye ayrılan bu sayaç, global sayaçla aynı anda sıfırlanır. <br><b> {tttt} </b> n karakterdeki üçüncü parti türünün kodu (bkz. Giriş - Kurulum - Sözlük - Üçüncü parti türleri). Eğer bu etiketi eklerseniz, sayaç her üçüncü taraf türü için farklı olacaktır. <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Maskede diğer tüm karakterler olduğu gibi kalır.<br>Boşluklara izin verilmez.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a= <u> Üçüncü parti TheCompany'nin 2007-01-31 tarihli 99. %s örneği: </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>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=PDF oluşturmada kullanılan kütüphane
@@ -541,6 +545,8 @@ Module40Name=Tedarikçiler
 Module40Desc=Satıcılar ve satın alma yönetimi (satınalma siparişleri ve tedarikçi hesaplarının faturalandırılması)
 Module42Name=Hata Ayıklama Günlükleri
 Module42Desc=Günlükleme araçları (dosya, syslog, ...). Bu gibi günlükler teknik/hata ayıklama amaçları içindir.
+Module43Name=Hata Ayıklama Çubuğu
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Düzenleyiciler
 Module49Desc=Düzenleyici yönetimi
 Module50Name=Ürünler
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind dönüştürme becerileri
 Module3200Name=Değiştirilemez Arşivler
 Module3200Desc=Değiştirilemeyen bir iş etkinlikleri günlüğü etkinleştirin. Etkinlikler gerçek zamanlı olarak arşivlenir. Günlük, dışa aktarılabilen zincirlenmiş etkinliklerin salt okunur bir tablosudur. Bu modül bazı ülkeler için zorunlu olabilir.
+Module3400Name=Sosyal Ağlar
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=IK
 Module4000Desc=İnsan kaynakları yönetimi (departman, çalışan sözleşmeleri ve duygu yönetimi)
 Module5000Name=Çoklu-firma
 Module5000Desc=Birden çok firmayı yönetmenizi sağlar
-Module6000Name=İş akışı
-Module6000Desc=İş akışı yönetimi (otomatik nesne oluşturma ve/veya otomatik durum değişikliği)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websiteleri
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=İzin İstekleri Yönetimi
@@ -805,7 +813,8 @@ PermissionAdvanced253=İç/dış kullanıcı ve izinlerini oluştur/değiştir
 Permission254=Yalnızca dış kullanıcıları oluştur/değiştir
 Permission255=Diğer kullanıcıların şifrelerini değiştir
 Permission256=Diğer kullanıcıları sil ya da engelle
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=CA oku
 Permission272=Fatura oku
 Permission273=Fatura dağıt
@@ -1175,7 +1184,8 @@ SetupDescription2=Aşağıdaki iki bölümün kurulumu zorunludur (Ayarlar menü
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Bu yazılım birçok modül/uygulama paketidir. Gereksinimlerinizle ilgili modüller etkinleştirilmeli ve yapılandırılmalıdır. Bu modüllerin etkinleştirilmesiyle menü girişleri görünecektir.
 SetupDescription5=Ayarlar menüsündeki diğer girişler isteğe bağlı parametreleri yönetmenizi sağlar.
-LogEvents=Güvenlik denetimi etkinlikleri
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Denetim
 InfoDolibarr=Dolibarr Bilgileri
 InfoBrowser=Tarayıcı Bilgileri
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Yükseltme işlemini gerçekleştirmek gerekli
 YouMustRunCommandFromCommandLineAfterLoginToUser=Bu komutu <b>%s</b> kullanıcısı ile bir kabuğa giriş yaptıktan sonra komut satırından çalıştırabilir ya da parolayı <b>%s</b> elde etmek için komut satırının sonuna –W seçeneğini ekleyebilirsiniz.
 YourPHPDoesNotHaveSSLSupport=SSL fonksiyonları PHP nizde mevcut değildir
 DownloadMoreSkins=Daha fazla kaplama indirin
-SimpleNumRefModelDesc=Referans numarasını %syyaa-nnnn formatına döndürür, burada yy kısmı yıl, aa kısmı ay ve nnnn kısmı ise sıfırlamasız ardışık sayı serisidir.
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Adreslerle profesyonel kimliği göster
 ShowVATIntaInAddress=Adreslerde Vergi numarasını gizle
 TranslationUncomplete=Kısmi çeviri
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy sunucusu: Ad/Adres
 MAIN_PROXY_PORT=Proxy sunucusu: Bağlantı noktası
 MAIN_PROXY_USER=Proxy sunucusu: Oturum açma/Kullanıcı
 MAIN_PROXY_PASS=Proxy sunucusu: Şifre
-DefineHereComplementaryAttributes=%s için dahil edilmek istediğiniz ilave/özel nitelikleri buradan tanımlayabilirsiniz
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Tamamlayıcı öznitelikler
 ExtraFieldsLines=Tamamlayıcı öznitelikler (satırlar)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Oturum aç (Unix)
 LDAPFieldLoginExample=Örnek: uid
 LDAPFilterConnection=Arama süzgeçi
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Oturum aç (samba, activedirectory)
 LDAPFieldLoginSambaExample=Örnek: samaccountname
 LDAPFieldFullname=Tam Adı
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Firmanız KDV kullanmayacak şekilde tanımlanmış (Gi
 AccountancyCode=Muhasebe Kodu
 AccountancyCodeSell=Satış hesap. kodu
 AccountancyCodeBuy=Alış hesap. kodu
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Etkinlik ve gündem modülü kurulumu
 PasswordTogetVCalExport=Dışa aktarma bağlantısını yetkilendirme anahtarı
+SecurityKey = Security Key
 PastDelayVCalExport=Bundan daha eski etkinliği dışa aktarma
 AGENDA_USE_EVENT_TYPE=Etkinlik türleri kullanın (Ayarlar -> Sözlükler -> Gündem etkinlik türleri menüsünden yönetilir)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Tabloda tek satırlar için arka plan rengi
 BackgroundTableLineEvenColor=Tabloda çift satırlar için arka plan rengi
 MinimumNoticePeriod=Enaz bildirim süresi (İzin isteğiniz bu süreden önce yapılmalı)
 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.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=RGB rengi HEX formatındadır, örn: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=PDF'deki alt kenar boşluğu
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Bu modül için gerekli özel bir kurulum yok.
 SetToYesIfGroupIsComputationOfOtherGroups=Eğer bu grup diğer grupların bir hesaplaması ise bunu evet olarak ayarlayın
-EnterCalculationRuleIfPreviousFieldIsYes=Önceki alan Evet olarak ayarlanmışsa hesaplama kuralı girin (Örneğin 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Birçok dil varyantı bulundu
 RemoveSpecialChars=Özel karakterleri kaldır
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Sosyal Ağlar modülünün kurulumu
 EnableFeatureFor=<strong>%s</strong> için özellikleri etkinleştir
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=PDF üzerindeki gönderen ve alıcı adreslerinin yerini birbiriyle değiştir
-FeatureSupportedOnTextFieldsOnly=Uyarı: Bu özellik yalnızca metin alanlarında desteklenir. Bu özelliği tetiklemek için ayrıca bir URL parametresi action=create ya da action=edit ayarlanmalı VEYA sayfa adı 'new.php' ile bitmelidir.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Hata ayıklama çubuğunu kullan
 DEBUGBAR_LOGS_LINES_NUMBER=Konsolda saklanacak son günlük satırı sayısı
 WarningValueHigherSlowsDramaticalyOutput=Uyarı, yüksek değerler çıktıyı önemli ölçüde yavaşlatır
 ModuleActivated=Modül 1 %s etkinleştirilmiştir ve arayüzü yavaşlatıyor.
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Dışa aktarma modelleri herkesle paylaşılır
 ExportSetup=Dışa aktarma modülünün kurulumu
 ImportSetup=İçe aktarım modülünün kurulumu
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Alış modül etkinleştirildiğinde özellik kullanılamaz
 EmailTemplate=E-posta şablonu
 EMailsWillHaveMessageID=E-postalarda bu sözdizimiyle eşleşen bir 'Referanslar' etiketi bulunacak
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Alış modül etkinleştirildiğinde özellik kullanılamaz
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index e89ddad9ee5..d94de5e03ac 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=SEPA yetkiniz
 FindYourSEPAMandate=Bu, firmamızın bankanıza otomatik ödeme talimatı verebilme yetkisi için SEPA yetkinizdir. İmzalayarak iade edin (imzalı belgeyi tarayarak) veya e-mail ile gönderin
 AutoReportLastAccountStatement=Uzlaşma yaparken 'banka hesap özeti numarasını' en son hesap özeti numarası ile otomatik olarak doldur
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Hareketleri renklendir
 BankColorizeMovementDesc=Bu işlev etkinleştirilirse, borçlandırma veya kredi hareketleri için belirli bir arka plan rengi seçebilirsiniz
 BankColorizeMovementName1=Borç hareketi için arka plan rengi
 BankColorizeMovementName2=Kredi hareketi için arka plan rengi
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index e55b5dbcfab..f15d588ae96 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -55,8 +55,9 @@ CustomerInvoice=Müşteri faturası
 CustomersInvoices=Müşteri faturaları
 SupplierInvoice=Tedarikçi faturası
 SuppliersInvoices=Tedarikçi faturaları
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Tedarikçi faturası
-SupplierBills=tedarikçi faturaları
+SupplierBills=Tedarikçi faturaları
 Payment=Ödeme
 PaymentBack=İade
 CustomerInvoicePaymentBack=İade
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Halihazırda yapılmış ödemeler
 PaymentsBackAlreadyDone=Geri ödemeler zaten yapıldı
 PaymentRule=Ödeme kuralı
 PaymentMode=Ödeme Türü
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Banka/Kredi Kartı
 PaymentTypePP=PayPal
 IdPaymentMode=Ödeme Türü (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Son oluşturma tarihi
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Oluşturulacak maksimum fatura sayısı
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Faturaları otomatik olarak doğrula
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Değişken tutar (%% top.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Banka havalesi
 PaymentTypeShortVIR=Banka havalesi
@@ -494,12 +498,16 @@ Cash=Nakit
 Reported=Gecikmiş
 DisabledBecausePayments=Bazı ödemeler olduğundan dolayı mümkün değil
 CantRemovePaymentWithOneInvoicePaid=En az bir fatura ödenmiş olarak sınıflandırıldığı için ödemeyi silemezsiniz
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Beklenen ödeme
 CantRemoveConciliatedPayment=Uzlaştırılan ödeme kaldırılamıyor
 PayedByThisPayment=Bu ödeme ile ödenmiş
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Öde
 ToMakePaymentBack=Geri öde
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Yeni bir fatura şablonu oluşturmak için
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Fatura PDF şablonu Crevette. Durum faturaları için eksiksiz bir fatura şablonu
-TerreNumRefModelDesc1=Standart faturalar için numarayı  %syymm-nnnn biçiminde ve iade faturaları için %syymm-nnnn biçiminde göster, yy yıl, mm ay ve nnnn boşluksuz ve 0 olmayan bir dizidir.
-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
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=$syymm ile başlayan bir fatura hali hazırda vardır ve bu sıra dizisi için uygun değildir. Bu modülü etkinleştirmek için onu kaldırın ya da adını değiştirin.
-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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=İlk hakediş faturası
 InvoiceFirstSituationDesc=<b>Hakediş faturaları</b> işin ilerleme durumuyla ilgili faturalardır, örneğin; bir inşaatın ilerleyişi. Her durum bir faturaya bağlanır.
 InvoiceSituation=Hakediş faturası
+PDFInvoiceSituation=Hakediş faturası
 InvoiceSituationAsk=Hakedişi izleyen fatura
 InvoiceSituationDesc=Halihazırda olan bir hakedişi izleyen hakediş oluştur
 SituationAmount=Hakediş faturası tutarı (net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Fatura şablonunu sil
 ConfirmDeleteRepeatableInvoice=Şablon faturasını silmek istediğinizden emin misiniz?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s fatura oluşturuldu
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Belge oluşturma durumu
 DoNotGenerateDoc=Belge dosyası üretme
 AutogenerateDoc=Auto generate document file
@@ -571,7 +581,11 @@ AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Bitiş tarihini ayarla
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Fatura silindi
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Tedarikçi fatura silindi
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index 09c86eb5ee9..3a5990ccd75 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Oturum açma bilgileri
 BoxLastRssInfos=RSS Bilgisi
 BoxLastProducts=Son %s Ürün/Hizmet
@@ -17,9 +18,13 @@ BoxLastActions=Son eylemler
 BoxLastContracts=Son sözleşmeler
 BoxLastContacts=Son kişiler/adresler
 BoxLastMembers=Son üyeler
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Son müdahaleler
 BoxCurrentAccounts=Açık hesaplar bakiyesi
 BoxTitleMemberNextBirthdays=Bu ayın doğum günleri (üyeler)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=%s'dan en son %s haber
 BoxTitleLastProducts=Ürünler/Hizmetler: değiştirilen son %s
 BoxTitleProductsAlertStock=Ürünler: stok uyarısı
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Son %s müşteri gönderileri
 NoRecordedShipments=Kayıtlı müşteri gönderimi yok
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Muhasebe
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Doğrulanmış projeler
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index 5369ebbec99..620b2cd832a 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Tedarikçi etiketleri/kategorileri alanı
 CustomersCategoriesArea=Müşteri etiketleri/kategorileri alanı
 MembersCategoriesArea=Üyeler etiketleri/kategorileri alanı
 ContactsCategoriesArea=Kişi etiketleri/kategorileri alanı
-AccountsCategoriesArea=Hesap etiketleri/kategorileri alanı
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Proje etiket/kategori alanı
 UsersCategoriesArea=Kullanıcı Etiketleri/Kategorileri Alanı
 SubCats=Alt kategoriler
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Etiketi/kategoriyi göster
 ByDefaultInList=B listede varsayılana göre
 ChooseCategory=Kategori seç
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Kategoriler için veya operatör kullanın
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index b27fea49898..6eda04aac99 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -43,9 +43,10 @@ Individual=Özel şahıs
 ToCreateContactWithSameName=Otomatik olarak, üçüncü partinin altında üçüncü partiyle aynı bilgilere sahip olan bir kişi/adres oluşturacaktır. Üçüncü parti eğer bir şahıs ise, sadece üçüncü parti oluşturmak çoğu durumda yeterlidir.
 ParentCompany=Ana firma
 Subsidiaries=Bağlı firmalar
-ReportByMonth=Aya göre rapor
-ReportByCustomers=Müşteriye göre rapor
-ReportByQuarter=Orana göre rapor
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Hitap kodu
 RegisteredOffice=Merkez
 Lastname=Soyadı
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Sosyal güvenlik numarası)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Üst noı)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof No 1 (SIREN)
 ProfId2FR=Prof No 2 (SIRET)
 ProfId3FR=Prof No 3 (NAF, eski APE)
 ProfId4FR=Prof No 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Kayıt numarası
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Lüksemburg)
 ProfId2LU=Id. prof. 2 (İş izini)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof No 1 (NIPC)
 ProfId2PT=Prof No 2 (Sosyal güvenlik numarası)
 ProfId3PT=Prof No 3 (Ticaret Kayıt numarası)
 ProfId4PT=Prof No 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Geçerli bekleyen fatura
 OutstandingBill=Ödenmemiş fatura için ençok tutar
 OutstandingBillReached=Ödenmemiş fatura için ulaşılan ençok tutar
 OrderMinAmount=Sipariş için minimum miktar
-MonkeyNumRefModelDesc=%syyaa-nnnn biçiminde bir müşteri kodu ve %syyaa-nnnn biçiminde bir tedarikçi kodu oluşur. Buradaki yy yılı, aa ayı, nnnn ise aralıksız ve 0'a dönmeyen bir diziyi ifade eder.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Müşteri/tedarikçi kodu serbesttir. Bu kod herhangi bir zamanda değiştirilebilir.
 ManagingDirectors=Yönetici(lerin) adı (CEO, müdür, başkan...)
 MergeOriginThirdparty=Çifte üçüncü parti (silmek istediğiniz üçüncü parti)
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 5889d98d6bd..d3b33a4b579 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=KDV alınan
 StatusToPay=Ödenecek
 SpecialExpensesArea=Tüm özel ödemeler alanı
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Sosyal ya da mali vergi
 SocialContributions=Sosyal ya da mali vergiler
 SocialContributionsDeductibles=İndirilecek sosyal ya da mali vergiler
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Müşteri fatura ödemesi
 PaymentSupplierInvoice=Tedarikçi faturası ödemesi
 PaymentSocialContribution=Sosyal/mali vergi ödemesi
 PaymentVat=KDV ödeme
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Ödemeler listesi
 ListOfCustomerPayments=Müşteri ödemeleri listesi
 ListOfSupplierPayments=Tedarikçi ödemelerinin listesi
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Ödemesi
 LT2PaymentsES=IRPF Ödemeleri
 VATPayment=Satış vergisi ödemesi
 VATPayments=Satış vergisi ödemeleri
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=Para yatırılmayı bekleyen çek yok.
 DateChequeReceived=Çek giriş tarihi
 NbOfCheques=Çek sayısı
 PaySocialContribution=Bir sosyal/mali vergi öde
-ConfirmPaySocialContribution=Bu sosyal ya da mali vergiyi ödendi olarak sınıflandırmak istediğinizden emin misiniz?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Bir sosyal ya da mali vergi ödemesi sil
-ConfirmDeleteSocialContribution=Bu sosyal/mali vergiyi silmek istediğinizden emin misiniz? 
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Sosyal ve mali vergiler ve ödemeleri
 CalcModeVATDebt=Mod <b>%sKDV, taahhüt hesabı%s için</b>.
 CalcModeVATEngagement=Mod <b>%sKDV, gelirler-giderler%s için</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- Faturalarda, giderlerde, KDV inde ve maaşlarda yapılan ger
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- Müşterilerden alınan tüm geçerli fatura ödemelerini içerir. <br> - Faturaların ödeme tarihi temellidir <br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Üçüncü taraflara göre satış vergisi raporu
 VATReportByCustomers=Müşteriye göre satış vergisi raporu
 VATReportByCustomersInInputOutputMode=Müşteriye göre alınan ve ödenen KDV raporu
 VATReportByQuartersInInputOutputMode=Tahsil edilen ve ödenen verginin satış vergisi oranına göre rapor
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=RE Orana göre rapor
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg alt türü
 InvoiceLinesToDispatch=Gönderilecek fatura kalemleri
 ByProductsAndServices=Ürün ve hizmete göre
 RefExt=Dış ref
-ToCreateAPredefinedInvoice=Bir fatura şablonu oluşturmak için, bir standart fatura oluşturun sonra onu doğrulamadan "%s" düğmesine tıklayın.
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Siparişe bağlantıla
 Mode1=Yöntem 1
 Mode2=Yöntem 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partileri için kullanılan muhasebe hesabı
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Sosyal/mali vergi kopyasının oluşturulmasını onayla
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Sonraki ay için kopyasını oluştur
 SimpleReport=Basit rapor
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=Satış vergisi oranına göre
 TurnoverbyVatrate=Satış vergisi oranına göre faturalandırılan ciro
 TurnoverCollectedbyVatrate=Satış vergisi oranına göre toplanan ciro
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Toplanan satın alma cirosu
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- Tedarikçilere yapılan tüm geçerli fatura ödemelerini içerir. <br> - Faturaların ödeme tarihi temellidir <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Faturalanan satın alma cirosu
 ReportPurchaseTurnoverCollected=Toplanan satın alma cirosu
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
index 8302879b82c..380ce8a5ab3 100644
--- a/htdocs/langs/tr_TR/ecm.lang
+++ b/htdocs/langs/tr_TR/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Dosya henüz veritabanında dizine eklenmedi (tekrar
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 8cc4092af00..b2f7a452de6 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=<b>%s</b> dizini bulunamadı (Hatalı yol, yanlış izinler ya
 ErrorFunctionNotAvailableInPHP=<b>%s</b> işlevi bu özellik için gereklidir ama bu özellik PHP nin bu sürümü/kurulumu için geçerli değildir.
 ErrorDirAlreadyExists=Bu isimli bir dizin zaten var.
 ErrorFileAlreadyExists=Bu isimde bir dosya zaten var.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Dosya sunucu tarafından tamamen alınmadı.
 ErrorNoTmpDir=Geçici %s dizini yok.
 ErrorUploadBlockedByAddon=Dosya gönderme PHP/Apache eklentisi tarafından bloke edilmiş.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/tr_TR/externalsite.lang b/htdocs/langs/tr_TR/externalsite.lang
index cfb361e8991..43f6d94f301 100644
--- a/htdocs/langs/tr_TR/externalsite.lang
+++ b/htdocs/langs/tr_TR/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Dış web sitesine bağlantı ayarla
-ExternalSiteURL=Dış Web Sitesi URL'si
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Dış Web Sitesi modülü doğru yapılandırılmamış.
 ExampleMyMenuEntry=Menü girişim
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 5fa3692202b..d0e3f166a85 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Değiş. tarihi
 IPModification=Modification IP
 DateLastModification=Son değiştirilme tarihi
 DateValidation=Doğrulama tarihi
+DateSigning=Signing date
 DateClosing=Kapanış tarihi
 DateDue=Vade tarihi
 DateValue=Satış tarihi
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Birim fiyat (KDV hariç) (para birimi)
 UnitPriceTTC=Birim fiyat
 PriceU=B.F.
 PriceUHT=Birim Fiyat
-PriceUHTCurrency=Birim Fiyat (para birimi)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=B.F. (vergi dahil)
 Amount=Tutar
 AmountInvoice=Fatura tutarı
@@ -389,6 +390,8 @@ AmountTotal=Toplam tutar
 AmountAverage=Ortalama tutar
 PriceQtyMinHT=En düşük miktar fiyatı (KDV hariç)
 PriceQtyMinHTCurrency=En düşük miktar fiyatı (KDV hariç) (para birimi)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Yüzde
 Total=Toplam
 SubTotal=Aratoplam
@@ -724,7 +727,7 @@ MenuMembers=Üyeler
 MenuAgendaGoogle=Google gündemi
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr sınırı (Giriş-Ayarlar-Güvenlik menüsü):%s Kb, PHP sınırı:%s Kb
-NoFileFound=Hiçbir belge bu dizine kaydedilmedi
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Geçerli dil
 CurrentTheme=Geçerli tema
 CurrentMenuManager=Geçerli menü yöneticisi
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString='%s' dizisini kaldır
 SomeTranslationAreUncomplete=Sunulan dillerden bazıları sadece kısmen çevrilmiş olabilir veya çeviri hatalarına sahip olabilir. Lütfen <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> adresi üzerinden kayıt yaparak dilinizdeki çeviri hatalarını düzeltmeye yardımcı olun ve yazılımın gelişimine katkıda bulunun.
-DirectDownloadLink=Direkt indirme linki (herkese açık/harici)
-DirectDownloadInternalLink=Direkt indirme linki (giriş yapılmış olmalı ve izin gerekli)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=İndir
 DownloadDocument=Belgeyi indir
 ActualizeCurrency=Para birimini güncelle
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Kişiler
 SearchIntoMembers=Üyeler
 SearchIntoUsers=Kullanıcılar
 SearchIntoProductsOrServices=Ürünler ya da hizmetler
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projeler
 SearchIntoMO=Üretim Emirleri
 SearchIntoTasks=Görevler
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Klavye kısayolu
 AssignedTo=Görevlendirilen
 Deletedraft=Taslak sil
 ConfirmMassDraftDeletion=Toplu taslak silme onayı
-FileSharedViaALink=Dosya bir bağlantı üzerinden paylaşıldı
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Önce bir üçüncü parti seçin...
 YouAreCurrentlyInSandboxMode=Şu anda %s "sandbox" modundasınız
 Inventory=Envanter
 AnalyticCode=Analitik kod
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Daha Fazla Bilgi Göster
 NoFilesUploadedYet=Lütfen önce bir döküman yükleyin
 SeePrivateNote=Özel nota bakın
@@ -1074,7 +1081,7 @@ ContactDefault_commande=Siparişte peşin
 ContactDefault_contrat=Sözleşme
 ContactDefault_facture=Fatura
 ContactDefault_fichinter=Müdahale
-ContactDefault_invoice_supplier=Supplier Invoice
+ContactDefault_invoice_supplier=Tedarikçi Faturası
 ContactDefault_order_supplier=Purchase Order
 ContactDefault_project=Proje
 ContactDefault_project_task=Görev
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/tr_TR/margins.lang b/htdocs/langs/tr_TR/margins.lang
index bca34654bb6..0202d087d2e 100644
--- a/htdocs/langs/tr_TR/margins.lang
+++ b/htdocs/langs/tr_TR/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Kar oranı ayrıntıları
 ProductMargins=Ürün kar oranları
 CustomerMargins=Müşteri kar oranları
 SalesRepresentativeMargins=Satış temsilcisi kar oranları
+ContactOfInvoice=Contact of invoice
 UserMargins=Kullanıcı kar oranları
 ProductService=Ürün veya Hizmet
 AllProducts=Bütün ürünler ve hizmetler
 ChooseProduct/Service=Ürün veya hizmet seç
 ForceBuyingPriceIfNull=Eğer tanımlanmamışsa alış/maliyet fiyatını satış fiyatına zorla
-ForceBuyingPriceIfNullDetails=Eğer alış/maliyet fiyatı tanımlanmamışsa ve bu seçenek "AÇIK" ise satırda oran sıfır olacaktır (alış/maliyet fiyatı = satış fiyatı) aksi durumda ("KAPALI") ve oran önerilen varsayılana eşit olacaktır.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Genel indirimler için kar oranı yöntemi
 UseDiscountAsProduct=Ürün olarak
 UseDiscountAsService=Hizmet olarak
@@ -36,7 +37,7 @@ CostPrice=Maliyet fiyatı
 UnitCharges=Birim masrafları
 Charges=Masraflar
 AgentContactType=Ticari temsilci ilgili tipi
-AgentContactTypeDetails=Satış temsilcisine göre kar oranı raporu için kullanılacak kişi türünü (faturala bağlantılı) tanımla
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Kar oran sayısal bir değer olmalı
 markRateShouldBeLesserThan100=Yayınlanmış kar oranı 100 den daha düşük olmalı
 ShowMarginInfos=Kar oranı bilgisi göster
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index ea575b74239..39f105a72eb 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Taslak üye listesi (doğrulanacak)
 MembersListValid=Geçerli üye listesi
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=Sona ermiş üyelerin listesi
 MembersListQualified=Nitelikli üye listesi
 MenuMembersToValidate=Taslak üyeler
 MenuMembersValidated=Doğrulanmış üye
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Sona ermiş üyeler
 MembersWithSubscriptionToReceive=Abonelik alacal üyeler
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Abonelik süresi doldu
 MemberStatusActiveLateShort=Süresi doldu
 MemberStatusPaid=Abonelik güncel
 MemberStatusPaidShort=Güncel
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Sona ermiş üye
 MemberStatusResiliatedShort=Sonlandırılmış
 MembersStatusToValid=Taslak üyeler
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Sona ermiş üyeler
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Doğrulandı
@@ -82,6 +87,8 @@ Physical=Fiziksel
 Moral=Ahlaki
 MorAndPhy=Moral and Physical
 Reenable=Yeniden etkinleştirilebilir
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Bir üyeyi sonlandır
 ConfirmResiliateMember=Bu üyeyi feshetmek istediğinizden emin misiniz?
 DeleteMember=Üye sil
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Üyelik doğrulama sürecinde abon
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Yeni abonelik kaydı sürecinde aboneye e-posta gönderimi için kullanılacak e-posta şablonu
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Abonelik süresi dolmak üzereyken e-posta hatırlatıcısı göndermek için kullanılacak e-posta şablonu
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Üyelik iptali sürecinde aboneye e-posta gönderimi için kullanılacak e-posta şablonu
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Otomatik e-postalar için gönderen e-posta adresi
 DescADHERENT_ETIQUETTE_TYPE=Etiket sayfası biçimi
 DescADHERENT_ETIQUETTE_TEXT=Üye adres sayfalarına yazılan metin
@@ -162,6 +170,7 @@ DocForLabels=Adres çizelgeleri oluştur (Çıkış formatı için gerçek ayar
 SubscriptionPayment=Abonelik ödemesi
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=En son abonelik miktarı
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Ülkeye göre üye istatistikleri
 MembersStatisticsByState=Eyalete/ile göre üyelik istatistikleri
 MembersStatisticsByTown=İlçelere göre üyelik istatistikleri
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index c80a020642b..ae0d37ed1c7 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=Nesneden bazı belgeler oluşturmak istiyorum
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index 36f8948a858..c257cf62b83 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Sipariş yap
 MakeOrder=Sipariş yap
 SupplierOrder=Tedarikçi siparişi
 SuppliersOrders=Tedarikçi siparişleri
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Mevcut tedarikçi siparişleri
 CustomerOrder=Müşteri Siparişi
 CustomersOrders=Müşteri Siparişleri
@@ -155,7 +157,7 @@ OrderCreated=Siparişleriniz oluşturulmuştur
 OrderFail=Siparişiniz oluşturulması sırasında hata oluştu
 CreateOrders=Sipariş oluştur
 ToBillSeveralOrderSelectCustomer=Birden çok siparişe fatura oluşturmak için, önce müşteriye tıkla, sonra "%s" seç
-OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+OptionToSetOrderBilledNotEnabled=Fatura doğrulandığında siparişi otomatik olarak "Faturalandırıldı" olarak ayarlamak için İş Akışı modülünden seçenek etkinleştirilmez, bu nedenle fatura oluşturulduktan sonra siparişlerin durumunu manuel olarak "Faturalandırıldı" olarak ayarlamanız gerekir.
 IfValidateInvoiceIsNoOrderStayUnbilled=Fatura doğrulaması 'Hayır' ise sipariş, fatura doğrulanana kadar 'Faturalandırılmamış' durumuna geçer.
 CloseReceivedSupplierOrdersAutomatically=Bütün ürünler kabul edildiğinde sipariş durumunu otomatikman "%s" olarak kapat. 
 SetShippingMode=Gönderim modunu ayarla
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 66cfdd557cb..0fde88b5ca5 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Birden fazla faaliyet gösteren firma (tüm ana modüller)
 CreatedBy=Oluşturan %s
 ModifiedBy=Düzenleyen %s 
 ValidatedBy=Doğrulayan %s
+SignedBy=Signed by %s
 ClosedBy=%s tarafından kapatıldı
 CreatedById=Oluşturanın kullanıcı kimliği
 ModifiedById=Son değişikliği yapan kullanıcı kimliği
@@ -244,6 +245,7 @@ NewKeyIs=Oturum açmak için yeni anahtarınız
 NewKeyWillBe=Yazılımda oturum açmak için yeni anahtarınız bu olacaktır
 ClickHereToGoTo=%s bölümüne gitmek için buraya tıklayın
 YouMustClickToChange=Ancak önce bu şifre değiştirmeyi doğrulamak için aşağıdaki linke tıklamanız gerekir
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Bu değiştirmeyi istemediyseniz, bu e-postayı unutun. Kimlik bilgilerinizi güvenli tutulur.
 IfAmountHigherThan=Eğer tutar <strong>%s</strong> den büyükse
 SourcesRepository=Kaynaklar için havuz
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
index 42d53f44560..d64adff52ad 100644
--- a/htdocs/langs/tr_TR/productbatch.lang
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Parti/Seri numarası kullan
-ProductStatusOnBatch=Evet (parti/seri gerekli)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=Hayır (parti/seri kullanılmaz)
-ProductStatusOnBatchShort=Evet
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Hayır
 Batch=Parti/Seri
 atleast1batchfield=Son Tüketme tarihi ya da Son Satma tarihi ya da Parti/Seri numarası
@@ -16,9 +18,18 @@ printEatby=Son tüketim: %s
 printSellby=Son satış: %s
 printQty=Miktar: %d
 AddDispatchBatchLine=Dağıtımda bir Raf Ömrü satırı ekle
-WhenProductBatchModuleOnOptionAreForced=Parti/Seri modülü açıkken otomatik stok azalması 'Gönderim doğrulamasında gerçek stokları azalt' şekline, otomatik artış modu ise 'Depolara manuel gönderimde gerçek stokları arttır' şekline zorlanır ve düzenlenemez. Diğer seçenekler istediğiniz gibi tanımlanabilir.
+WhenProductBatchModuleOnOptionAreForced=Parti/Seri modülü açıkken otomatik stok azalması 'Gönderim doğrulamasında gerçek stokları azalt' şekline, otomatik artış modu ise 'Depolara manuel gönderimde gerçek stokları artır' şekline zorlanır ve düzenlenemez. Diğer seçenekler istediğiniz gibi tanımlanabilir.
 ProductDoesNotUseBatchSerial=Bu ürün parti/seri numarası kullanmıyor
 ProductLotSetup=Parti/seri modülü kurulumu
 ShowCurrentStockOfLot=Çift ürün/parti için mevcut stoğu göster
 ShowLogOfMovementIfLot=Çift ürün/parti için hareket günlüğünü göster
 StockDetailPerBatch=Parti başına stok detayı
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index f06d6621115..66e8c6516fc 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=KDV oranı (bu tedarikçi/ürün için)
 DiscountQtyMin=Bu miktar için indirim
 NoPriceDefinedForThisSupplier=Bu tedarikçi/ürün için tanımlanmış fiyat/miktar mevcut değil
 NoSupplierPriceDefinedForThisProduct=Bu ürün için tanımlanmış tedarikçi fiyatı/miktarı mevcut değil
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Önceden Tanımlanmış Ürün
 PredefinedServicesToSell=Öntanımlı Hizmet
 PredefinedProductsAndServicesToSell=Öntanımlı satılan ürünler/hizmetler
@@ -313,7 +314,7 @@ LastUpdated=Son güncelleme
 CorrectlyUpdated=Doru olarak güncellendi
 PropalMergePdfProductActualFile=PDF Azur'a eklenmek için kullanılacak dosya/lar
 PropalMergePdfProductChooseFile=PDF dosyası seç
-IncludingProductWithTag=Etiketli ürün/hizmet içerir
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Varsayılan fiyat, gerçek fiyat müşteriye bağlı olabilir
 WarningSelectOneDocument=Lütfen enaz bir belge seçin
 DefaultUnitToShow=Birim
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 24cb80a885a..40ada56b53b 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Görevler listesi
 GoToListOfTimeConsumed=Tüketilen süre listesine git
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=Proje ile ilgili müşteri siparişlerinin listesi
 ListInvoicesAssociatedProject=Proje ile ilgili müşteri faturalarının listesi
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index 385fa505586..6da99a8822a 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Teklifi e-posta ile gönder
 DatePropal=Teklif tarihi
 DateEndPropal=Teklif son geçerlilik tarihi
 ValidityDuration=Geçerlilik süresi
-CloseAs=Durumu buna ayarlayın
 SetAcceptedRefused=Kabul edildi/reddedildi ayarla
 ErrorPropalNotFound=%s teklifi bulunamadı
 AddToDraftProposals=Taslak teklife ekle
@@ -60,6 +59,7 @@ ConfirmClonePropal=<b>%s</b> teklifinin kopyasını oluşturmak istediğinizden
 ConfirmReOpenProp=<b>%s</b> teklifini tekrar açmak istediğinizden emin misiniz ?
 ProposalsAndProposalsLines=Teklif ve satırları
 ProposalLine=Teklif satırı
+ProposalLines=Proposal lines
 AvailabilityPeriod=Teslim süresi
 SetAvailability=Teslim süresi ayarla
 AfterOrder=siparişten sonra
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Kesin sipariş için Firma Kaşesi, Tarih ve İmza
 ProposalsStatisticsSuppliers=Tedarikçi teklifi istatistikleri
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 07374a8b0f4..373096f7b99 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stok
 Stocks=Stoklar
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Partiye/ürüne göre stoklar
 LotSerial=Parti/Seri
 LotSerialList=Parti/seri listesi
@@ -37,8 +37,8 @@ AllWarehouses=Tüm depolar
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Taslak siparişleri de dahil et
 Location=Konum
-LocationSummary=Kısa konum adı
-NumberOfDifferentProducts=Farklı ürün sayısı
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Toplam ürün sayısı
 LastMovement=En son hareket
 LastMovements=En son hareketler
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Depolar değeri
 UserWarehouseAutoCreate=Kullanıcı oluştururken otomatik olarak bir kullanıcı deposu oluştur
 AllowAddLimitStockByWarehouse=Her bir ürün için minimum ve istenen stok değerini yönetmenin yanı sıra her bir eşleştirme (ürün-depo) için de minimum ve istenen stok değerini de yönetin
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Varsayılan depo
@@ -97,15 +98,16 @@ RealStockDesc=Fiziksel/gerçek stok, şu anda depolardaki mevcut olan stoktur.
 RealStockWillAutomaticallyWhen=Gerçek stok bu kurala göre değiştirilecektir (Stok modulünde tanımlandığı gibi):
 VirtualStock=Sanal stok
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Depo No
 DescWareHouse=Depo açıklaması
 LieuWareHouse=Depo konumlandırma
 WarehousesAndProducts=Depolar ve ürünler
 WarehousesAndProductsBatchDetail=Depolar ve ürünler (her parti/seri için ayrıntılı)
 AverageUnitPricePMPShort=Ağırlıklı ortalama fiyat
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Satış Birim Fiyatı
 EstimatedStockValueSellShort=Satış değeri
 EstimatedStockValueSell=Satış değeri
@@ -145,7 +147,7 @@ Replenishments=İkmal
 NbOfProductBeforePeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) önceki miktarıdır
 NbOfProductAfterPeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) sonraki miktarıdır
 MassMovement=Toplu hareket
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Kayıt transferi
 ReceivingForSameOrder=Bu siparişten yapılan kabuller
 StockMovementRecorded=Stok hareketleri kaydedildi
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Faturaya ürün/hizmet eklemek için stok seviyesi y
 StockMustBeEnoughForOrder=Siparişe ürün/hizmet eklemek için stok seviyesi yeterli olmalıdır (siparişe bir satır eklerken otomatik stok değişimi için ayarlanmış olan kural ne olursa olsun mevcut gerçek stok üzerinde kontrol yapılır)
 StockMustBeEnoughForShipment= Sevkiyata ürün/hizmet eklemek için stok seviyesi yeterli olmalıdır (sevkiyata bir satır eklerken otomatik stok değişimi için ayarlanmış olan kural ne olursa olsun mevcut gerçek stok üzerinde kontrol yapılır)
 MovementLabel=Hareket etiketi
-TypeMovement=Hareket türü
+TypeMovement=Direction of movement
 DateMovement=Hareket tarihi
 InventoryCode=Hareket veya stok kodu
 IsInPackage=Pakette içerilir
@@ -183,6 +185,7 @@ inventoryCreatePermission=Yeni envanter oluştur
 inventoryReadPermission=Envanterleri görüntüle
 inventoryWritePermission=Envanteri güncelle
 inventoryValidatePermission=Envanteri doğrula
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Envanter
 inventoryListTitle=Envanterler
 inventoryListEmpty=Devam eden envanter yok
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Dosyayı yükleyin ve daha sonra bu dosyayı kaynak içe aktarma dosyası olarak seçmek için %s simgesine tıklayın...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Yeniden aç
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index 9b51c8028e4..5674056ac79 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Tedarikçiler
 SuppliersInvoice=Tedarikçi faturası
+SupplierInvoices=Tedarikçi faturaları
 ShowSupplierInvoice=Tedarikçi Faturası Göster
 NewSupplier=Yeni tedarikçi
 History=Geçmiş
diff --git a/htdocs/langs/tr_TR/ticket.lang b/htdocs/langs/tr_TR/ticket.lang
index 86bfb2ce139..3e9d1d27461 100644
--- a/htdocs/langs/tr_TR/ticket.lang
+++ b/htdocs/langs/tr_TR/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Silindi
 # Dict
 Type=Türü
 Severity=Önem seviyesi
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Destek bildirim mesajından e-posta göndermek için
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Genel arayüzde modülün logosunu görüntüle
 TicketsShowModuleLogoHelp=Genel arayüz sayfalarında logo modülünü gizlemek için bu seçeneği etkinleştirin
 TicketsShowCompanyLogo=Genel arayüzde firmanın logosunu göster 
 TicketsShowCompanyLogoHelp=Genel arayüz sayfalarında ana firmanın logosunu gizlemek için bu seçeneği etkinleştirin
-TicketsEmailAlsoSendToMainAddress=Ayrıca ana e-posta adresine de bildirim gönder
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Genel arayüzü etkinleştir
@@ -126,10 +128,10 @@ TicketNumberingModules=Destek bildirimi numaralandırma modülü
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Oluşturunca üçüncü tarafa bildir
 TicketsDisableCustomerEmail=Bir destek bildirimi ortak arayüzden oluşturulduğunda e-postaları her zaman devre dışı bırak
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=En son değiştirilen destek bildirimleri
 BoxLastModifiedTicketDescription=Değiştirilen son %s destek bildirimi
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Yakın zamanda değiştirilmiş destek bildirimi yok
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 84b68bfc470..36b671a893b 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Gruptan kaldır
 PasswordChangedAndSentTo=Parola değiştirildi ve <b>%s</b> e gönderildi.
 PasswordChangeRequest=<b>%s</b> için şifre değiştirme isteği
 PasswordChangeRequestSent=Parola değiştirildi ve <b>%s</b> e gönderildi.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Şifre sıfırlamayı onayla
 MenuUsersAndGroups=Kullanıcılar ve Gruplar
 LastGroupsCreated=Oluşturulan son %s grup
@@ -70,9 +72,10 @@ ExportDataset_user_1=Kullanıcılar ve özellikleri
 DomainUser=Etki alanı kullanıcısı %s
 Reactivate=Yeniden etkinleştir
 CreateInternalUserDesc=Bu form, firmanız/kuruluşunuz içinde bir iç kullanıcı oluşturmanıza olanak tanır. Bir dış kullanıcı oluşturmak için (müşteri, tedarikçi, vb ...), üçüncü parti kişi kartından 'Dolibarr Kullanıcısı Oluştur' butonunu kullanın.
-InternalExternalDesc=Bir <b>İç</b> kullanıcı, firmanızın/kuruluşunuzun parçası olan bir kullanıcıdır.<br>Bir <b>Dış</b> kullanıcı ise, müşteri, tedarikçi veya diğer (Bir üçüncü parti için dış kullanıcı oluşturmak isteniyorsa, oluşturulmak istenen kişinin sayfasında "Bir kullanıcı oluştur" butonu kullanılabilir) bir kullanıcıdır.<br><br>Her iki durumda da, verilen izinler Dolibarr üzerindeki hakları tanımlar. Bunun yanı sıra dış kullanıcı, iç kullanıcıdan farklı bir menü yöneticisine sahip olabilir (Giriş - Ayarlar - Ekran bölümüne bakın).
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=İzin hak tanındı çünkü bir kullanıcının grubundan intikal etti.
 Inherited=İntikal eden
+UserWillBe=Created user will be
 UserWillBeInternalUser=Oluşturulacak kullanıcı bir iç kullanıcı olacaktır (çünkü belirli bir üçüncü parti ile bağlantılı değildir)
 UserWillBeExternalUser=Oluşturulacak kullanıcı bir dış kullanıcı olacaktır (çünkü belirli bir üçüncü parti ile bağlantılıdır)
 IdPhoneCaller=Telefon açanın kimliği
@@ -109,8 +112,10 @@ UserAccountancyCode=Kullanıcı muhasebe kodu
 UserLogoff=Kullanıcı çıkış yaptı
 UserLogged=Kullanıcı giriş yaptı
 DateOfEmployment=Employment date
-DateEmployment=İşe Başlama Tarihi
+DateEmployment=Employment
+DateEmploymentstart=İşe Başlama Tarihi
 DateEmploymentEnd=İşi Bırakma Tarihi
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=Kendi kullanıcı kaydınızı devre dışı bırakamazsınız
 ForceUserExpenseValidator=Gider raporu doğrulayıcısını zorla
 ForceUserHolidayValidator=İzin isteği doğrulayıcısını zorla
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 38b93f9cc3a..e779f477ce1 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>PHP gömülü sunucu ile kullanın</u><br>Geliştirme ortamında, siteyi PHP gömülü web sunucusu ile test etmeyi tercih edebilirsiniz (PHP 5.5 gerekli)<br><strong>php -S 0.0.0.0:8080 -t%s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Okundu
 WritePerm=Yaz
 TestDeployOnWeb=Web'de dene/yayınla
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=Harici web sunucusu tarafından sunulan sanal host URL'si tanımlanmamış
 NoPageYet=Henüz hiç sayfa yok
 YouCanCreatePageOrImportTemplate=Yeni bir sayfa oluşturabilir veya tam bir web sitesi şablonunu içe aktarabilirsiniz
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/tr_TR/zapier.lang b/htdocs/langs/tr_TR/zapier.lang
index 75c635e864a..f2faffc5728 100644
--- a/htdocs/langs/tr_TR/zapier.lang
+++ b/htdocs/langs/tr_TR/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Dolibarr için Zapier
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Dolibarr modülü için Zapier
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Dolibarr için Zapier ayarları
+ZapierForDolibarrSetup=Dolibarr için Zapier ayarları
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 467fc0b218c..fb5f2043d8e 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 4fa18be466d..bd5556dd25b 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Зняти блокування з'єднання
 YourSession=Ваш сеанс
 Sessions=Сеанси користувачів
 WebUserGroup=Користувач / група веб-сервера
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Здається, що ваша конфігурація PHP не дозволяє перелічити активні сеанси. Каталог, який використовується для збереження сеансів (<b> %s </b>), може бути захищений (наприклад, дозволами ОС або директивою PHP open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Примітка: так діє, лише якщо модуль
 RemoveLock=Видаліть або перейменуйте файл <b> %s </b>, якщо він існує, щоб дозволити використання інструменту "Оновити / Встановити".
 RestoreLock=Відновіть файл <b> %s </b>, лише з дозволом для читання, щоб відключити подальше використання інструменту "Оновити / Встановити".
 SecuritySetup=Налаштування безпеки
+PHPSetup=PHP setup
 SecurityFilesDesc=Встановлені тут параметри пов’язані з безпекою щодо завантаження файлів.
 ErrorModuleRequirePHPVersion=Помилка, для цього модуля потрібна версія PHP %s або вище
 ErrorModuleRequireDolibarrVersion=Помилка, для цього модуля потрібна версія Dolibarr %s або вище
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Ця область забезпечує функції ад
 Purge=Чистка
 PurgeAreaDesc=Ця сторінка дозволяє видалити всі файли, що були створені або зберігаються Dolibarr (тимчасові файли або всі файли в каталозі <b> %s </b>). Використовувати цю функцію зазвичай не потрібно. Вона надається як рішення для користувачів, у яких Dolibarr розміщений у провайдера, що не надає дозволу на видалення файлів, створених веб-сервером.
 PurgeDeleteLogFile=Видалення файлів журналів, включаючи <b> %s </b>, визначених для модуля Syslog (немає ризику втрати даних)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Видалить усі файли в каталозі: <b> %s </b>. <br> Це видалить усі згенеровані документи, пов'язані з елементами (контрагенти, рахунки тощо), файли, завантажені в модуль ECM, резервні копії бази даних та тимчасові файли.
 PurgeRunNow=Очистити зараз
@@ -232,6 +234,7 @@ BoxesAvailable=Доступні віджети
 BoxesActivated=Активні віджети
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Вихідний файл
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Доступно лише якщо JavaScript не відключений
 Required=обов'язково
@@ -347,9 +350,10 @@ LastActivationAuthor=Автор останньої активації
 LastActivationIP=IP останньої активації
 UpdateServerOffline=Оновити сервер офлайн
 WithCounter=Управління лічильником
-GenericMaskCodes=Ви можете ввести будь-яку маску нумерації. У цій масці можуть бути використані такі теги: <br> <b> {000000} </b> відповідає числу, яке буде збільшуватися для кожного %s. Введіть стільки нулів, скільки потрібно для бажаної довжини лічильника. Лічильник буде заповнений нулями зліва, щоб мати стільки нулів, як і маска. <br> <b> {000000+000} </b> аналогічно попередньому, але зміщення, відповідає номеру праворуч від знака +, застосовується починаючи з першого %s. <br> <b> {000000@x} </b> такий же, як і попередній, але лічильник скидається до нуля, коли досягається місяць x (x між 1 та 12, або 0, щоб використовувати перші місяці фінансового року, визначені у вашій конфігурації, або 99 для скидання в нуль щомісяця). Якщо цей параметр використовується і x дорівнює 2 або вище, також потрібно послідовність {yy} {mm} або {yyyy} {mm}. <br> <b> {dd} </b> день (від 01 до 31). <br> <b> {mm} </b> місяць (від 01 до 12). <br> <b> {yy} </b>, <b> {yyyy} </b> або <b> {y} </b>рік 1, 2 або 4 цифри<br>
-GenericMaskCodes2= <b> {cccc} </b> код клієнта на n символів <br> <b> {cccc000}</b>код клієнта на n символів, супроводжується лічильником, призначеним для замовника. Цей лічильник, призначений клієнту, скидається одночасно, з глобальним лічильником. <br> <b> {tttt} </b> Код типу контрагента на n символів (див. меню Домашня сторінка - Налаштування - Словник - Типи контрагентів). Якщо ви додасте цей тег, лічильник буде різним для кожного типу контрагента. <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=Усі інші символи в масці залишаться незмінними. <br> Пробіли не допускаються. <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a= <u> Приклад 99-го %s контрагента TheCompany, з датою 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u>Зразок контрагента, створеного 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Зразок товару, створеного 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Залишивши це поле порожнім, 
 ExtrafieldParamHelpselect=Список значень складається з рядків вигляду ключ,значення (де ключ не повинен бути '0') <br><br>Наприклад: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br> У випадку, коли потрібно щоб список залежав від значень іншого  додаткового списку:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>У випадку, якщо потрібно мати список залежний від іншого: <br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Список значень повинен складатися з рядків з форматом ключ,значення (де ключ не може бути "0") <br> <br>, наприклад: <br> 1,значення1 <br> 2,значення2 <br> 3,значення3 <br> ...
 ExtrafieldParamHelpradio=Список значень повинен складатися з рядків з форматом ключ,значення (де ключ не може бути "0") <br> <br>, наприклад: <br> 1,значення1 <br> 2,значення2 <br> 3,значення3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Постачальники
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Соціальні мережі
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 5e37c104927..05707f6bc28 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 2a360131fe2..65df9d227a1 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -52,11 +52,12 @@ Invoices=Рахунки-фактури
 InvoiceLine=Рядок рахунку-фактури
 InvoiceCustomer=Рахунок клієнта
 CustomerInvoice=Рахунок клієнта
-CustomersInvoices=Рахунки-фактури покупців
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=рахунки-фактури постачальників
+SupplierBills=Vendor invoices
 Payment=Платіж
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Платежі вже зроблені
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Правила оплати
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Готівка
 Reported=Затриман
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Повернення платежу
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index 1dd858b093f..3aa0b1dcb95 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index e788c649905..ebe9d66cafa 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -43,9 +43,10 @@ Individual=Фізична особа
 ToCreateContactWithSameName=Автоматично створить контакт / адресу з тією ж інформацією, що і в контрагента. У більшості випадків, якщо ваш контрагент є фізичною особою, достатньо створити контрагента.
 ParentCompany=Батьківська компанія
 Subsidiaries=Дочірні компанії
-ReportByMonth=Звіт за місяць
-ReportByCustomers=Звіт за покупцем
-ReportByQuarter=Звіт за частотою
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Прізвище
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 717985b9ddc..5b193a6084a 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/uk_UA/ecm.lang b/htdocs/langs/uk_UA/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/uk_UA/ecm.lang
+++ b/htdocs/langs/uk_UA/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/uk_UA/externalsite.lang b/htdocs/langs/uk_UA/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/uk_UA/externalsite.lang
+++ b/htdocs/langs/uk_UA/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index e1d4ca6a387..169682a2c9f 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Сума
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Призначено
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/uk_UA/margins.lang b/htdocs/langs/uk_UA/margins.lang
index b9d52dcfdc6..ad5406409b4 100644
--- a/htdocs/langs/uk_UA/margins.lang
+++ b/htdocs/langs/uk_UA/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index 6d44b9fdbea..93aff32cf53 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Підтверджений
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index 7a72508aa33..1c7e0bbb9bf 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index a784e083458..af2ffe84443 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 6f41e992ef6..b6ca500c280 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
index 560bc529c16..15aefb27d54 100644
--- a/htdocs/langs/uk_UA/productbatch.lang
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Так
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Ні
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 80d7861289c..095e1fbc0c9 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 0ff4be4d522..5fcfeff9270 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/uk_UA/propal.lang b/htdocs/langs/uk_UA/propal.lang
index b9a317ec127..9444a850bd4 100644
--- a/htdocs/langs/uk_UA/propal.lang
+++ b/htdocs/langs/uk_UA/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index e032197748f..e37edb28c2a 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Розташування
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index e3b0758e6c3..70361194561 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Постачальники
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/uk_UA/ticket.lang b/htdocs/langs/uk_UA/ticket.lang
index aa2c156c056..920703320ae 100644
--- a/htdocs/langs/uk_UA/ticket.lang
+++ b/htdocs/langs/uk_UA/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Видалено
 # Dict
 Type=Тип
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index c2cd4a91aa4..c72450499b7 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index 447d9de9a65..d63041a9380 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Читати
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/uk_UA/zapier.lang b/htdocs/langs/uk_UA/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/uk_UA/zapier.lang
+++ b/htdocs/langs/uk_UA/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index f9a6468d94a..8f4508ada53 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 8dc815b522e..154400c6536 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/uz_UZ/ecm.lang b/htdocs/langs/uz_UZ/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/uz_UZ/ecm.lang
+++ b/htdocs/langs/uz_UZ/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/uz_UZ/externalsite.lang b/htdocs/langs/uz_UZ/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/uz_UZ/externalsite.lang
+++ b/htdocs/langs/uz_UZ/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 1744926874f..642fa95de04 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/uz_UZ/margins.lang b/htdocs/langs/uz_UZ/margins.lang
index b9d52dcfdc6..ad5406409b4 100644
--- a/htdocs/langs/uz_UZ/margins.lang
+++ b/htdocs/langs/uz_UZ/margins.lang
@@ -16,12 +16,13 @@ MarginDetails=Margin details
 ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
+ContactOfInvoice=Contact of invoice
 UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
@@ -31,14 +32,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/uz_UZ/modulebuilder.lang b/htdocs/langs/uz_UZ/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/uz_UZ/modulebuilder.lang
+++ b/htdocs/langs/uz_UZ/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index 503955cf5f0..87d196eb22f 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Phone
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/uz_UZ/productbatch.lang
+++ b/htdocs/langs/uz_UZ/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/uz_UZ/propal.lang b/htdocs/langs/uz_UZ/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/uz_UZ/propal.lang
+++ b/htdocs/langs/uz_UZ/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/uz_UZ/ticket.lang b/htdocs/langs/uz_UZ/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/uz_UZ/ticket.lang
+++ b/htdocs/langs/uz_UZ/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/uz_UZ/website.lang
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/uz_UZ/zapier.lang b/htdocs/langs/uz_UZ/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/uz_UZ/zapier.lang
+++ b/htdocs/langs/uz_UZ/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 24ec964a46d..78ba39b6a06 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Giới hạn dòng hóa đơn
 ExpenseReportLines=Dòng báo cáo chi phí để ràng buộc
 ExpenseReportLinesDone=Giới hạn dòng của báo cáo chi phí
 IntoAccount=Ràng buộc dòng với tài khoản kế toán
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Ràng buộc
@@ -209,7 +209,7 @@ Codejournal=Nhật ký
 JournalLabel=Mã nhật ký
 NumPiece=Số lượng cái
 TransactionNumShort=Số Giao dịch
-AccountingCategory=Nhóm cá nhân hóa
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Bạn có thể định nghĩa ở đây một số nhóm tài khoản kế toán. Chúng sẽ được sử dụng cho các báo cáo kế toán đã cá nhân hóa.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Các dòng chưa bị ràng buộc, sử dụng menu
 
 ## Import
 ImportAccountingEntries=Ghi sổ kế toán
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Ngày xuất
 WarningReportNotReliable=Cảnh báo, báo cáo này không dựa trên Sổ Cái, do đó không chứa giao dịch được sửa đổi thủ công trong Sổ Cái. Nếu nhật ký của bạn được cập nhật, chế độ xem sổ sách chính xác hơn.
 ExpenseReportJournal=Nhật ký báo cáo chi phí
 InventoryJournal=Nhật ký tồn kho
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 3daf83f7d2b..8ff7409cfac 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Bỏ việc khóa kết nôi
 YourSession=Phiên làm việc của bạn
 Sessions=Phiên người dùng
 WebUserGroup=Người dùng/nhóm trên máy chủ
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Cấu hình PHP của bạn dường như không cho phép liệt kê các phiên hoạt động. Thư mục được sử dụng để lưu phiên ( <b>%s</b> ) có thể được bảo vệ (ví dụ: bằng quyền của hệ điều hành hoặc bằng lệnh open_basingir của PHP).
@@ -62,6 +63,7 @@ IfModuleEnabled=Ghi chú: Yes chỉ có tác dụng nếu module <b>%s</b> đư
 RemoveLock=Xóa / đổi tên tệp <b>%s</b> nếu nó tồn tại, để cho phép sử dụng công cụ Cập nhật / Cài đặt.
 RestoreLock=Khôi phục tệp <b>%s</b> , chỉ với quyền đọc, để vô hiệu hóa bất kỳ việc sử dụng thêm công cụ Cập nhật / Cài đặt nào.
 SecuritySetup=Thiết lập an ninh
+PHPSetup=PHP setup
 SecurityFilesDesc=Xác định các tùy chọn ở đây liên quan đến bảo mật về việc tải lên các tệp.
 ErrorModuleRequirePHPVersion=Lỗi, module này yêu cầu phiên bản PHP %s hoặc mới hơn
 ErrorModuleRequireDolibarrVersion=Lỗi, module này yêu cầu Dolibarr phiên bản %s hoặc mới hơn
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=Khu vực này cung cấp các chức năng quản trị. S
 Purge=Thanh lọc
 PurgeAreaDesc=Trang này cho phép bạn xóa tất cả các tệp được tạo hoặc lưu trữ bởi Dolibarr (các tệp tạm thời hoặc tất cả các tệp trong thư mục <b>%s</b> ). Sử dụng tính năng này thường không cần thiết. Nó được cung cấp như một cách giải quyết cho người dùng có Dolibarr được lưu trữ bởi nhà cung cấp không cung cấp quyền xóa các tệp được tạo bởi máy chủ web.
 PurgeDeleteLogFile=Xóa tập tin nhật ký <b>%s</b> được tạo bởi mô-đun Syslog (không gây nguy hiểm mất dữ liệu)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các tệp trong thư mục: <b>%s</b> . <br> Việc này sẽ xóa tất cả các tài liệu được tạo liên quan đến các yếu tố (bên thứ ba, hóa đơn, v.v.), các tệp được tải lên mô-đun ECM, các bản sao lưu cơ sở dữ liệu và các tệp tạm thời.
 PurgeRunNow=Thanh lọc bây giờ
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets có sẵn
 BoxesActivated=Widgets được kích hoạt
 ActivateOn=Kích hoạt trên
 ActiveOn=Đã kích hoạt trên
+ActivatableOn=Activatable on
 SourceFile=Tập tin nguồn
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Chỉ có sẵn nếu JavaScript không bị vô hiệu hóa
 Required=Được yêu cầu
@@ -347,9 +350,10 @@ LastActivationAuthor=Tác giả kích hoạt mới nhất
 LastActivationIP=IP kích hoạt mới nhất
 UpdateServerOffline=Cập nhật server offline
 WithCounter=Quản lý bộ đếm
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags 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> mã máy khách trên n ký tự <br> <b>{cccc000}</b> mã máy khách trên n ký tự được theo sau bởi một bộ đếm dành riêng cho khách hàng. Bộ đếm này dành riêng cho khách hàng được đặt lại cùng lúc so với bộ đếm toàn cầu. <br> <b>{tttt}</b> Mã của loại bên thứ ba trên n ký tự (xem menu Trang chủ - Cài đặt - Từ điển - Các loại bên thứ ba). Nếu bạn thêm thẻ này, bộ đếm sẽ khác nhau đối với từng loại bên thứ ba. <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Ví dụ về %s thứ 99 của bên thứ ba TheCompany, với ngày 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Để trống trường này có nghĩa là giá tr
 ExtrafieldParamHelpselect=Danh sách các giá trị phải là các dòng có khóa định dạng, giá trị (trong đó khóa không thể là '0') <br><br> ví dụ: <br> 1, giá trị1 <br> 2, giá trị2 <br> mã3, giá trị3 <br> ... <br><br> Để có danh sách tùy thuộc vào danh sách thuộc tính bổ sung khác: <br> 1, value1 | <i>tùy chọn_ Parent_list_code</i> : Parent_key <br> 2, value2 | <i>tùy chọn_ Parent_list_code</i> : Parent_key <br><br> Để có danh sách tùy thuộc vào danh sách khác: <br> 1, giá trị1 | <i>Parent_list_code</i> : Parent_key <br> 2, giá trị2 | <i>Parent_list_code</i> : Parent_key
 ExtrafieldParamHelpcheckbox=Danh sách các giá trị phải là các dòng có khóa định dạng, giá trị (trong đó khóa không thể là '0') <br><br> ví dụ: <br> 1, giá trị1 <br> 2, giá trị2 <br> 3, giá trị3 <br> ...
 ExtrafieldParamHelpradio=Danh sách các giá trị phải là các dòng có khóa định dạng, giá trị (trong đó khóa không thể là '0') <br><br> ví dụ: <br> 1, giá trị1 <br> 2, giá trị2 <br> 3, giá trị3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Danh sách các giá trị đến từ một bảng <br> Cú pháp: tên_bảng: nhãn_field: id_field :: bộ lọc <br> Ví dụ: c_typent: libelle: id :: filter <br><br> bộ lọc có thể là một thử nghiệm đơn giản (ví dụ: active = 1) để chỉ hiển thị giá trị hoạt động <br> Bạn cũng có thể sử dụng $ID$ trong bộ lọc phù thủy là id hiện tại của đối tượng hiện tại <br> Để thực hiện SELECT trong bộ lọc, hãy sử dụng $SEL$ <br> nếu bạn muốn lọc trên các trường ngoài, hãy sử dụng cú pháp Extra.fieldcode = ... (trong đó mã trường là mã của trường ngoài) <br><br> Để có danh sách tùy thuộc vào danh sách thuộc tính bổ sung khác: <br> c_typent: libelle: id: <i>Options_ Parent_list_code</i> | Parent_column: bộ lọc <br><br> Để có danh sách tùy thuộc vào danh sách khác: <br> c_typent: libelle: id: <i>Parent_list_code</i> | Parent_column: bộ lọc
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Giữ trống cho một dấu phân cách đơn giản <br> Đặt giá trị này thành 1 cho dấu phân cách thu gọn (mặc định mở cho phiên mới, sau đó trạng thái được giữ cho mỗi phiên người dùng) <br> Đặt giá trị này thành 2 cho dấu phân cách thu gọn (mặc định được thu gọn cho phiên mới, sau đó trạng thái được giữ trước mỗi phiên người dùng)
 LibraryToBuildPDF=Thư viện được sử dụng để tạo PDF
@@ -541,6 +545,8 @@ Module40Name=Nhà cung cấp
 Module40Desc=Quản lý nhà cung cấp và mua hàng (Đơn mua và hóa đơn mua hàng)
 Module42Name=Nhật ký gỡ lỗi
 Module42Desc=Phương tiện ghi nhật ký (tệp, syslog, ...). Nhật ký như vậy là cho mục đích kỹ thuật / gỡ lỗi.
+Module43Name=Thanh gỡ lỗi
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Biên tập
 Module49Desc=Quản lý biên tập
 Module50Name=Sản phẩm
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Lưu trữ không thể thay đổi
 Module3200Desc=Cho phép một bản ghi không thể thay đổi của các sự kiện kinh doanh. Các sự kiện được lưu trữ trong thời gian thực. Nhật ký là một bảng chỉ đọc các sự kiện được xâu chuỗi có thể được xuất dữ liệu. Mô-đun này có thể là bắt buộc đối với một số quốc gia.
+Module3400Name=Mạng xã hội
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=Nhân sự
 Module4000Desc=Quản lý nhân sự (quản lý bộ phận, hợp đồng nhân viên và cảm xúc)
 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
-Module6000Desc=Quản lý quy trình làm việc (tự động tạo đối tượng và / hoặc thay đổi trạng thái tự động)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Trang web
 Module10000Desc=Tạo trang web (công khai) với trình soạn thảo WYSIWYG. Đây là một quản trị viên web hoặc nhà phát triển hướng CMS (tốt hơn là nên biết ngôn ngữ HTML và CSS). Chỉ cần thiết lập máy chủ web của bạn (Apache, Nginx, ...) để trỏ đến thư mục Dolibarr dành riêng để truy cập trực tuyến trên internet với tên miền của riêng bạn.
 Module20000Name=Quản lý yêu cầu nghỉ
@@ -805,7 +813,8 @@ PermissionAdvanced253=Tạo/chỉnh sửa người sử dụng nội bộ / bên
 Permission254=Tạo/chỉnh sửa chỉ người dùng bên ngoài
 Permission255=Chỉnh sửa mật khẩu của người dùng khác
 Permission256=Xóa hoặc vô hiệu người dùng khác
-Permission262=Mở rộng quyền truy cập cho tất cả các bên thứ ba (không chỉ các bên thứ ba mà người dùng đó là đại diện bán hàng). <br> Không hiệu quả đối với người dùng bên ngoài (luôn giới hạn bản thân cho các đề xuất, đơn đặt hàng, hóa đơn, hợp đồng, v.v.). <br> Không hiệu quả đối với các dự án (chỉ các quy tắc về quyền của dự án, khả năng hiển thị và phân công).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Xem CA
 Permission272=Xem hóa đơn
 Permission273=Xuất hóa đơn
@@ -1175,7 +1184,8 @@ SetupDescription2=Hai phần sau đây là bắt buộc (hai mục đầu tiên
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a> <br> Phần mềm này là một bộ gồm nhiều mô-đun/ứng dụng, tất cả đều ít nhiều độc lập nhau. Các mô-đun liên quan đến nhu cầu của bạn phải được kích hoạt và cấu hình. Các mục/tùy chọn sẽ được thêm vào menu với sự kích hoạt của một mô-đun.
 SetupDescription5=Các menu thiết lập khác quản lý các tham số tùy chọn.
-LogEvents=Sự kiện kiểm toán bảo mật
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Kiểm toán
 InfoDolibarr=Thông tin về Dolibarr
 InfoBrowser=Thông tin trình duyệt
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Quá trình chạy nâng cấp dường như l
 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=Chức năng SSL không có sẵn trong chương trình PHP
 DownloadMoreSkins=Nhiều giao diện để tải về
-SimpleNumRefModelDesc=Trả về số tham chiếu có định dạng %syymm-nnnn trong đó yy là năm, mm là tháng và nnnn là tuần tự không đặt lại
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Hiển thị id chuyên nghiệp với địa chỉ
 ShowVATIntaInAddress=Ẩn số VAT Cộng Đồng nội bộ với địa chỉ
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Máy chủ proxy: Tên / Địa chỉ
 MAIN_PROXY_PORT=Máy chủ proxy: Cổng
 MAIN_PROXY_USER=Máy chủ proxy: Đăng nhập / Người dùng
 MAIN_PROXY_PASS=Máy chủ proxy: Mật khẩu
-DefineHereComplementaryAttributes=Xác định ở đây bất kỳ thuộc tính bổ sung/tùy chỉnh nào bạn muốn đưa vào: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Thuộc tính bổ sung
 ExtraFieldsLines=Thuộc tính bổ sung (dòng)
 ExtraFieldsLinesRec=Thuộc tính bổ sung (dòng hóa đơn mẫu)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Ví dụ: uid
 LDAPFilterConnection=Bộ lọc tìm kiếm
 LDAPFilterConnectionExample=Ví dụ: &(objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Ví dụ: samaccountname
 LDAPFieldFullname=Họ và tên
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Công ty của bạn đã được xác định không
 AccountancyCode=Mã kế toán
 AccountancyCodeSell=Mã kế toán bán hàng
 AccountancyCodeBuy=Mã kế toán mua hàng
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Cài đặt module sự kiện và chương trình nghị sự
 PasswordTogetVCalExport=Khóa được phép xuất liên kết
+SecurityKey = Security Key
 PastDelayVCalExport=Không xuất dữ liệu sự kiện cũ hơn
 AGENDA_USE_EVENT_TYPE=Sử dụng các loại sự kiện (được quản lý trong menu Cài đặt -> Từ điển -> Loại sự kiện chương trình nghị sự)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Tự động đặt giá trị mặc định này cho loại sự kiện trong biểu mẫu tạo sự kiện
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Màu nền của hàng lẻ
 BackgroundTableLineEvenColor=Màu nền của hàng chẵn
 MinimumNoticePeriod=Thời gian thông báo tối thiểu (Yêu cầu nghỉ phép của bạn phải được thực hiện trước khi trì hoãn này)
 NbAddedAutomatically=Số ngày được thêm vào bộ đếm của người dùng (tự động) mỗi tháng
-EnterAnyCode=Trường này chứa một tham chiếu để xác định dòng. Nhập bất kỳ giá trị nào bạn chọn, nhưng không có ký tự đặc biệt.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Lỗi 0 hoặc 1
 UnicodeCurrency=Nhập vào đây giữa các dấu ngoặc nhọn, danh sách số byte đại diện cho ký hiệu tiền tệ. Ví dụ: với $, nhập [36] - đối với brazil real R $ [82,36] - với €, nhập [8364]
 ColorFormat=Màu RGB ở định dạng HEX, ví dụ: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Lề dưới PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Không có thiết lập cụ thể cần thiết cho mô-đun này.
 SetToYesIfGroupIsComputationOfOtherGroups=Đặt cái này thành Có nếu nhóm này là sự tính toán của các nhóm khác
-EnterCalculationRuleIfPreviousFieldIsYes=Nhập quy tắc tính toán nếu trường trước đó được đặt thành Có (Ví dụ: 'CODEGRP1 + CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Một số biến thể ngôn ngữ được tìm thấy
 RemoveSpecialChars=Xóa các ký tự đặc biệt
 COMPANY_AQUARIUM_CLEAN_REGEX=Bộ lọc Regex để làm sạch giá trị (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Thiết lập mô-đun Mạng xã hội
 EnableFeatureFor=Kích hoạt tính năng cho <strong>%s</strong>
 VATIsUsedIsOff=Lưu ý: Tùy chọn sử dụng Thuế bán hàng hoặc VAT đã được đặt thành <strong>Tắt</strong> trong menu %s - %s, vì vậy Thuế bán hàng hoặc Vat được sử dụng sẽ luôn là 0 cho bán hàng.
 SwapSenderAndRecipientOnPDF=Hoán đổi vị trí địa chỉ người gửi và người nhận trên tài liệu PDF
-FeatureSupportedOnTextFieldsOnly=Cảnh báo, tính năng chỉ được hỗ trợ trên các trường văn bản. Ngoài ra, một tham số URL action=create hoặc action=edit phải được đặt OR tên trang phải kết thúc bằng ''new.php' để trigger tính năng này.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Trình thu thập email
 EmailCollectorDescription=Thêm một công việc được lên lịch và một trang thiết lập để quét các hộp thư điện tử thường xuyên (sử dụng giao thức IMAP) và ghi lại các email nhận được vào ứng dụng của bạn, đúng nơi và/hoặc tự động tạo một số bản ghi (như khách hàng tiềm năng).
 NewEmailCollector=Trình thu thập email mới
@@ -2049,8 +2062,11 @@ UseDebugBar=Sử dụng thanh gỡ lỗi
 DEBUGBAR_LOGS_LINES_NUMBER=Số dòng nhật ký cuối cùng cần giữ trong bảng điều khiển
 WarningValueHigherSlowsDramaticalyOutput=Cảnh báo, giá trị cao hơn làm chậm đáng kể ở đầu ra
 ModuleActivated=Mô-đun %s được kích hoạt và làm chậm giao diện
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Mô hình xuất dữ liệu được chia sẻ với mọi người
 ExportSetup=Thiết lập mô-đun Xuất dữ liệu
 ImportSetup=Thiết lập module nhập liệu
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Tạo một Ping ẩn danh '+1' cho máy chủ nền tảng Do
 FeatureNotAvailableWithReceptionModule=Tính năng không khả dụng khi mô-đun Tiếp nhận được bật
 EmailTemplate=Mẫu cho email
 EMailsWillHaveMessageID=Email sẽ có thẻ 'Tài liệu tham khảo' khớp với cú pháp này
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=Nếu bạn muốn có text trong PDF của mình bằng 2 ngôn ngữ khác nhau trong cùng một tệp PDF được tạo, bạn phải đặt ở đây ngôn ngữ thứ hai này để PDF được tạo sẽ chứa 2 ngôn ngữ khác nhau trong cùng một trang, một ngôn ngữ được chọn khi tạo PDF và ngôn ngữ này ( chỉ có vài mẫu PDF hỗ trợ này). Giữ trống cho 1 ngôn ngữ trên mỗi PDF.
 FafaIconSocialNetworksDesc=Nhập vào đây mã của biểu tượng FontAwgie. Nếu bạn không biết FontAwgie là gì, bạn có thể sử dụng  fa-address-book
 FeatureNotAvailableWithReceptionModule=Tính năng không khả dụng khi mô-đun Tiếp nhận được bật
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 8a13699a9e8..2aa8dc26f32 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Ủy quyền SEPA của bạn
 FindYourSEPAMandate=Đây là ủy quyền SEPA của bạn để ủy quyền cho công ty chúng tôi thực hiện lệnh ghi nợ trực tiếp vào ngân hàng của bạn. Trả lại nó đã ký (quét tài liệu đã ký) hoặc gửi thư đến
 AutoReportLastAccountStatement=Tự động điền vào trường "số báo cáo ngân hàng" với số sao kê cuối cùng khi thực hiện đối chiếu
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Tô màu cho các kết chuyển
 BankColorizeMovementDesc=Nếu chức năng này được bật, bạn có thể chọn màu nền cụ thể cho các kết chuyển ghi nợ hoặc tín dụng
 BankColorizeMovementName1=Màu nền cho kết chuyển ghi nợ
 BankColorizeMovementName2=Màu nền cho kết chuyển ghi có
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index fcbd94c39c7..ddc3663bdc4 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -55,6 +55,7 @@ CustomerInvoice=Hóa đơn khách hàng
 CustomersInvoices=Hóa đơn khách hàng
 SupplierInvoice=Hóa đơn nhà cung cấp
 SuppliersInvoices=Hóa đơn nhà cung cấp
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Hóa đơn nhà cung cấp
 SupplierBills=Hóa đơn nhà cung cấp
 Payment=Thanh toán
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Đã thanh toán
 PaymentsBackAlreadyDone=Đã thanh toán lại
 PaymentRule=Quy tắc thanh toán
 PaymentMode=Hình thức thanh toán
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Thẻ tín dụng/Ghi nợ
 PaymentTypePP=PayPal
 IdPaymentMode=Hình thức thanh toán (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Ngày tạo cuối
 DateLastGenerationShort=Ngày tạo cuối
 MaxPeriodNumber=Tối đa số lượng hóa đơn
 NbOfGenerationDone=Số lượng hóa đơn đã được tạo xong
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Số lượng tạo ra được thực hiện
 MaxGenerationReached=Số lượng tạo ra tối đa đạt được
 InvoiceAutoValidate=Xác nhận hóa đơn tự động
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Trong vòng 14 ngày sau khi kết thúc tháng
 FixAmount=Số tiền không đổi -1 dòng với nhãn là '%s'
 VarAmount=Số tiền thay đổi (%% tot.)
 VarAmountOneLine=Số tiền thay đổi (%% tot.) - 1 dòng có nhãn '%s'
-VarAmountAllLines=Số lượng sai khác (%%trên tổng) - tất cả các dòng giống nhau
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Chuyển khoản ngân hàng
 PaymentTypeShortVIR=Chuyển khoản ngân hàng
@@ -494,12 +498,16 @@ Cash=Tiền mặt
 Reported=Bị trễ
 DisabledBecausePayments=Không được khi có nhiều khoản thanh toán
 CantRemovePaymentWithOneInvoicePaid=Không thể xóa bỏ thanh toán khi có ít nhất một hóa đơn được phân loại đã trả
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Thanh toán dự kiến
 CantRemoveConciliatedPayment=Không thể xóa đối chiếu thanh toán
 PayedByThisPayment=Đã trả bởi khoản thanh toán này
 ClosePaidInvoicesAutomatically=Tự động phân loại tất cả các tiêu chuẩn, giảm thanh toán hoặc hóa đơn thay thế là "Trả tiền" khi thanh toán được thực hiện hoàn thành.
 ClosePaidCreditNotesAutomatically=Tự động phân loại tất cả các ghi chú tín dụng là "Trả tiền" khi hoàn trả hoàn thành.
 ClosePaidContributionsAutomatically=Tự động phân loại tất cả các khoản đóng góp xã hội hoặc tài chính là "Trả tiền" khi thanh toán được thực hiện hoàn thành.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=Tất cả các hóa đơn không có phần thanh toán còn lại sẽ được tự động đóng lại với trạng thái "Đã thanh toán";.
 ToMakePayment=Trả
 ToMakePaymentBack=Trả lại
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Trước tiên, bạn phải tạo hóa đ
 PDFCrabeDescription=Hóa đơn mẫu PDF Crabe. Một mẫu hóa đơn đầy đủ (mẫu đề nghị)
 PDFSpongeDescription=Hóa đơn PDF mẫu Sponge. Một mẫu hóa đơn hoàn chỉnh
 PDFCrevetteDescription=Hóa đơn PDF mẫu Crevette. Mẫu hóa đơn hoàn chỉnh cho hóa đơn tình huống
-TerreNumRefModelDesc1=Quay về số với định dạng %ssyymm-nnnn cho hóa đơn chuẩn và %syymm-nnnn cho các giấy báo có nơi mà yy là năm, mm là tháng và nnnn là một chuỗi ngắt và không trở về 0
-MarsNumRefModelDesc1=Trả về số có định dạng %syymm-nnnn cho hóa đơn tiêu chuẩn, %syymm-nnnn cho hóa đơn thay thế, %syymm-nnn cho thanh toán giảm và %syymm-nnnn cho ghi chú tín dụng khi yy là năm, mm là tháng và nnnn là chuỗi không ngăn cách và không trả về 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Bắt đầu ra một hóa đơn với $syymm mà đã tồn tại thì không tương thích với mô hình này của chuỗi. Xóa bỏ nó hoặc đổi tên nó để kích hoạt module này.
-CactusNumRefModelDesc1=Số trả về có định dạng %syymm-nnnn cho các hóa đơn tiêu chuẩn, %syymm-nnnn cho các ghi chú tín dụng và %syymm-nnnn cho giảm thanh toán các hóa đơn khi yy là năm, mm là tháng và nnnn là chuỗi không phân cách và không trả về 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Lý do đóng sớm
 EarlyClosingComment=Ghi chú lý do đóng sớm
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Liên lạc dịch vụ nhà cung
 InvoiceFirstSituationAsk=Hóa đơn tình huống đầu
 InvoiceFirstSituationDesc=Các <b>hoá đơn tình huống</b> được gắn với các tình huống liên quan đến một sự tiến triển, ví dụ như sự tiến triển của một công trình. Mỗi tình huống được gắn với một hóa đơn.
 InvoiceSituation=Hóa đơn tình huống
+PDFInvoiceSituation=Hóa đơn tình huống
 InvoiceSituationAsk=Hóa đơn theo dõi tình huống
 InvoiceSituationDesc=Tạo một tình huống mới theo cái đã tồn tại
 SituationAmount=Số tiền hóa đơn tình huống (chưa thuế)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=Nếu bạn cần tạo các hóa đơn tự 
 DeleteRepeatableInvoice=Xóa hóa đơn mẫu
 ConfirmDeleteRepeatableInvoice=Bạn có chắc chắn muốn xóa hóa đơn mẫu?
 CreateOneBillByThird=Tạo 1 hóa đơn theo tổ chức (hoặc, 1 hóa đơn theo đơn hàng)
-BillCreated=%s hóa đơn được tạo
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Tình trạng tạo tài liệu
 DoNotGenerateDoc=Không tạo tệp tài liệu
 AutogenerateDoc=Tự động tạo tập tin tài liệu
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Hoá đơn Nhà cung cấp đã được xoá
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index 20c4c4c059e..e002c44df14 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Thông tin đăng nhập
 BoxLastRssInfos=Thông tin RSS
 BoxLastProducts=Sản phẩm/Dịch vụ mới nhất %s
@@ -17,9 +18,13 @@ BoxLastActions=Hành động mới nhất
 BoxLastContracts=Hợp đồng mới nhất
 BoxLastContacts=Liên lạc / địa chỉ mới nhất
 BoxLastMembers=Thành viên mới nhất
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Can thiệp mới nhất
 BoxCurrentAccounts=Số dư tài khoản mở
 BoxTitleMemberNextBirthdays=Sinh nhật của tháng này (thành viên)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Tin tức mới nhất %s từ %s
 BoxTitleLastProducts=Sản phẩm / Dịch vụ: %s được sửa đổi lần cuối
 BoxTitleProductsAlertStock=Sản phẩm: cảnh báo tồn kho
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Lô hàng mới nhất của khách hàng %s
 NoRecordedShipments=Không ghi nhận lô hàng của khách hàng
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Kế toán
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index c7947d9a0d0..45dff33ca44 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Khu vực thẻ/ danh mục nhà cung cấp
 CustomersCategoriesArea=Khu vực thẻ/danh mục khách hàng
 MembersCategoriesArea=Khu vực thẻ/danh mục thành viên
 ContactsCategoriesArea=Khu vực thẻ/ danh mục liên lạc
-AccountsCategoriesArea=Khu vực thẻ/ danh mục tài khoản
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Khu vực thẻ/ danh mục dự án
 UsersCategoriesArea=Khu vực thẻ/ danh mục người dùng
 SubCats=Danh mục con
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Hiển thị thẻ/ danh mục
 ByDefaultInList=Theo mặc định trong danh sách
 ChooseCategory=Chọn danh mục
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Sử dụng hoặc điều hành các danh mục
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 38e3c5dad27..a35ab2ab2b0 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -43,9 +43,10 @@ Individual=Cá nhân
 ToCreateContactWithSameName=Sẽ tự động tạo một liên hệ/ địa chỉ có cùng thông tin với bên thứ ba dưới bên thứ ba. Trong hầu hết các trường hợp, ngay cả khi bên thứ ba của bạn là một người thực tế, chỉ tạo một bên thứ ba là đủ.
 ParentCompany=Công ty mẹ
 Subsidiaries=Các chi nhánh
-ReportByMonth=Báo cáo theo tháng
-ReportByCustomers=Báo cáo theo khách hàng
-ReportByQuarter=Báo cáo theo tỷ lệ
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Mã Civility
 RegisteredOffice=Trụ sở đăng ký
 Lastname=Họ
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Giấy phép kinh doanh)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (NaN)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Công nợ hiện tại
 OutstandingBill=Công nợ tối đa
 OutstandingBillReached=Tối đa cho hóa đơn chưa thanh toán
 OrderMinAmount=Số lượng tối thiểu cho đơn hàng
-MonkeyNumRefModelDesc=Trả về một số có định dạng %syymm-nnnn cho mã khách hàng và %syymm-nnnn cho mã nhà cung cấp trong đó yy là năm, mm là tháng và nnnn là một chuỗi không ngắt quãng và không trả về 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Mã này tự do. Mã này có thể được sửa đổi bất cứ lúc nào.
 ManagingDirectors=Tên quản lý (CEO, giám đốc, chủ tịch...)
 MergeOriginThirdparty=Sao y bên thứ ba (bên thứ ba bạn muốn xóa)
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index fda16aecf93..ea724951735 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST mua hàng
 VATCollected=Thu thuế GTGT
 StatusToPay=Để trả
 SpecialExpensesArea=Khu vực dành cho tất cả các khoản thanh toán đặc biệt
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Thuế xã hội hoặc tài chính
 SocialContributions=Thuế xã hội hoặc tài chính
 SocialContributionsDeductibles=Khấu trừ thuế xã hội hoặc tài khóa
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Thanh toán hóa đơn của khách hàng
 PaymentSupplierInvoice=Thanh toán hóa đơn nhà cung cấp
 PaymentSocialContribution=Thanh toán xã hội/ fiscal tax
 PaymentVat=Nộp thuế GTGT
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=Danh sách thanh toán
 ListOfCustomerPayments=Danh sách các khoản thanh toán của khách hàng
 ListOfSupplierPayments=Danh sách thanh toán nhà cung cấp
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF thanh toán
 LT2PaymentsES=IRPF Thanh toán
 VATPayment=Thanh toán thuế bán hàng
 VATPayments=Thanh toán thuế bán hàng
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Hoàn thuế bán hàng
 NewVATPayment=Thêm thanh toán thuế bán hàng
 NewLocalTaxPayment=Thêm thanh toán thuế %s
@@ -134,9 +138,17 @@ NoWaitingChecks=Không có séc chờ đặt cọc
 DateChequeReceived=Kiểm tra ngày tiếp nhận
 NbOfCheques=Số lượng séc
 PaySocialContribution=Nộp thuế xã hội / tài chính
-ConfirmPaySocialContribution=Bạn có chắc chắn muốn phân loại thuế xã hội hoặc tài chính này như đã trả?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Xóa một khoản thanh toán thuế xã hội hoặc tài chính
-ConfirmDeleteSocialContribution=Bạn có chắc chắn muốn xóa khoản thanh toán thuế xã hội / tài chính này không?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Thuế và tài chính xã hội và thanh toán
 CalcModeVATDebt=Chế độ <b>%sVAT về kế toán cam kết%s</b>.
 CalcModeVATEngagement=Chế độ <b>%sVAT đối với thu nhập-chi phí%s.</b>
@@ -163,6 +175,7 @@ RulesResultInOut=- Nó bao gồm các khoản thanh toán thực tế được t
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- Nó bao gồm tất cả các khoản thanh toán hiệu quả của hóa đơn nhận được từ khách hàng. <br> - Nó được dựa trên ngày thanh toán của các hóa đơn này <br>
 RulesCATotalSaleJournal=Nó bao gồm tất cả các hạn mức tín dụng từ nhật ký Bán hàng.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=Nó bao gồm bản ghi trong Sổ cái của bạn với các tài khoản kế toán có nhóm "CHI PHÍ" hoặc "THU NHẬP"
 RulesResultBookkeepingPredefined=Nó bao gồm bản ghi trong Sổ cái của bạn với các tài khoản kế toán có nhóm "CHI PHÍ" hoặc "THU NHẬP"
 RulesResultBookkeepingPersonalized=Nó hiển thị ghi nhận trong Sổ cái của bạn với các tài khoản kế toán <b>được nhóm theo các nhóm được cá nhân hóa</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Báo cáo thuế bán hàng của bên thứ ba
 VATReportByCustomers=Báo cáo thuế bán hàng của khách hàng
 VATReportByCustomersInInputOutputMode=Báo cáo của thuế GTGT của khách hàng thu thập và trả
 VATReportByQuartersInInputOutputMode=Báo cáo thuế suất bán hàng của thuế thu và thuế nộp
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Báo cáo thuế 2 theo thuế suất
 LT2ReportByQuarters=Báo cáo thuế 3 theo thuế suất
 LT1ReportByQuartersES=Báo cáo của tỷ lệ RE
@@ -217,7 +231,7 @@ Pcg_subtype=PCG chủng
 InvoiceLinesToDispatch=Dòng hoá đơn để gửi
 ByProductsAndServices=Theo sản phẩm và dịch vụ
 RefExt=Ref bên ngoài
-ToCreateAPredefinedInvoice=Để tạo hóa đơn mẫu, hãy tạo hóa đơn tiêu chuẩn, sau đó, không xác nhận hóa đơn, nhấp vào nút "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Liên kết để đặt hàng
 Mode1=Phương pháp 1
 Mode2=Phương pháp 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Tài khoản kế toán chuyên dụng được
 ACCOUNTING_ACCOUNT_SUPPLIER=Tài khoản kế toán được sử dụng cho nhà cung cấp bên thứ ba
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Tài khoản kế toán chuyên dụng được xác định trên thẻ của bên thứ ba sẽ chỉ được sử dụng cho kế toán Sổ phụ. Cái này sẽ được sử dụng cho Sổ cái và là giá trị mặc định của kế toán Sổ phụ nếu tài khoản kế toán chuyên dụng của nhà cung cấp bên thứ ba không được xác định.
 ConfirmCloneTax=Xác nhận nhân bản thuế xã hội / tài chính
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Sao chép nó vào tháng tới
 SimpleReport=Báo cáo đơn giản
 AddExtraReport=Báo cáo bổ sung (thêm báo cáo khách hàng nước ngoài và quốc nội)
@@ -253,7 +269,8 @@ AccountingAffectation=Phân công kế toán
 LastDayTaxIsRelatedTo=Ngày cuối cùng của kỳ thuế có liên quan đến
 VATDue=Khiếu nại thuế bán hàng
 ClaimedForThisPeriod=Thời gian yêu cầu bồi thường
-PaidDuringThisPeriod=Được trả tiền trong thời gian này
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=Theo thuế suất bán hàng
 TurnoverbyVatrate=Doanh thu được lập hóa đơn theo thuế suất bán hàng
 TurnoverCollectedbyVatrate=Doanh thu được thu thập theo thuế suất bán hàng
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Doanh số hàng mua
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Nó bao gồm tất cả các dòng ghi nợ từ nhật ký
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Doanh số hàng mua đã ra hoá đơn
 ReportPurchaseTurnoverCollected=Doanh số hàng mua đã tập hợp
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang
index 631914c3b06..10952377cc4 100644
--- a/htdocs/langs/vi_VN/ecm.lang
+++ b/htdocs/langs/vi_VN/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=Tệp chưa được lập chỉ mục vào cơ sở
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 1413520f21d..872a1d3b568 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Thư <b>mục% s</b> không tìm thấy (con đường xấu, c
 ErrorFunctionNotAvailableInPHP=Chức <b>năng% s</b> là cần thiết cho tính năng này nhưng không có sẵn trong phiên bản này / thiết lập PHP.
 ErrorDirAlreadyExists=Một thư mục với tên này đã tồn tại.
 ErrorFileAlreadyExists=Một tập tin với tên này đã tồn tại.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File không nhận được hoàn toàn bởi máy chủ.
 ErrorNoTmpDir=Directy tạm thời% s không tồn tại.
 ErrorUploadBlockedByAddon=Tải bị chặn bởi một plugin PHP / Apache.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Lỗi khi tải hệ thống tài khoản. Nếu một vài
 ErrorBadSyntaxForParamKeyForContent=Cú pháp sai cho thông số keycontcontent. Phải có giá trị bắt đầu bằng %s hoặc %s
 ErrorVariableKeyForContentMustBeSet=Lỗi, hằng số có tên %s (có nội dung văn bản sẽ hiển thị) hoặc %s (có url bên ngoài để hiển thị) phải được đặt.
 ErrorURLMustStartWithHttp=URL %s phải bắt đầu bằng http: // hoặc https: //
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Lỗi, tham chiếu mới đã được sử dụng
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Lỗi, xóa thanh toán liên kết với một hóa đơn đã đóng là không thể.
 ErrorSearchCriteriaTooSmall=Tiêu chí tìm kiếm quá nhỏ.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Giao diện công cộng không được kích ho
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Tham số PHP của bạn upload_max_filesize (%s) cao hơn tham số PHP post_max_size (%s). Đây không phải là một thiết lập phù hợp.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/vi_VN/externalsite.lang b/htdocs/langs/vi_VN/externalsite.lang
index c7963106440..9292c2606ba 100644
--- a/htdocs/langs/vi_VN/externalsite.lang
+++ b/htdocs/langs/vi_VN/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Thiết lập liên kết đến trang web bên ngoài
-ExternalSiteURL=Địa chỉ trang bên ngoài
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Mô-đun trang web bên ngoài được cấu hình không đúng.
 ExampleMyMenuEntry=Mục menu của tôi
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 787b79af04c..b8bef1f3bf1 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Ngày điều chỉnh
 IPModification=Modification IP
 DateLastModification=Ngày sửa đổi mới nhất
 DateValidation=Ngày xác nhận
+DateSigning=Signing date
 DateClosing=Ngày kết thúc
 DateDue=Ngày đáo hạn
 DateValue=Giá trị ngày
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Đơn giá (không bao gồm) (tiền tệ)
 UnitPriceTTC=Đơn giá
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=Đơn giá (tiền tệ)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=Đơn giá (gồm thuế)
 Amount=Số tiền
 AmountInvoice=Số tiền hóa đơn
@@ -389,6 +390,8 @@ AmountTotal=Tổng số tiền
 AmountAverage=Số tiền trung bình
 PriceQtyMinHT=Giá theo số lượng tối thiểu (không bao gồm thuế)
 PriceQtyMinHTCurrency=Giá theo số lượng tối thiểu (không bao gồm thuế) (tiền tệ)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Phần trăm
 Total=Tổng
 SubTotal=Tổng phụ
@@ -724,7 +727,7 @@ MenuMembers=Thành viên
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Giới hạn của Dolibarr (Thực đơn Nhà-Thiết lập-Bảo mật): %s Kb, giới hạn của PHP: %s Kb
-NoFileFound=Không có chứng từ được lưu trong thư mục này
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Ngôn ngữ hiện tại
 CurrentTheme=Theme hiện tại
 CurrentMenuManager=Quản lý menu hiện tại
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Xóa chuỗi '%s'
 SomeTranslationAreUncomplete=Một số ngôn ngữ được cung cấp có thể chỉ được dịch một phần hoặc có thể có lỗi. Vui lòng giúp sửa ngôn ngữ của bạn bằng cách đăng ký tại <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> để thêm các cải tiến của bạn.
-DirectDownloadLink=Liên kết tải xuống trực tiếp (public/external)
-DirectDownloadInternalLink=Liên kết tải xuống trực tiếp (cần phải đăng nhập và cần quyền)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Tải xuống
 DownloadDocument=Tải tài liệu
 ActualizeCurrency=Cập nhật tỷ giá tiền tệ
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Liên lạc
 SearchIntoMembers=Thành viên
 SearchIntoUsers=Người dùng
 SearchIntoProductsOrServices=Sản phẩm hoặc dịch vụ
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Các dự án
 SearchIntoMO=Đơn đặt hàng sản xuất
 SearchIntoTasks=Tác vụ
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Phim tắt
 AssignedTo=Giao cho
 Deletedraft=Xóa dự thảo
 ConfirmMassDraftDeletion=Xác nhận xóa hàng loạt Dự thảo
-FileSharedViaALink=Tập tin được chia sẻ qua một liên kết
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Chọn bên thứ ba trước ...
 YouAreCurrentlyInSandboxMode=Bạn hiện đang ở chế độ "hộp cát" %s
 Inventory=Hàng tồn kho
 AnalyticCode=Mã phân tích
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Hiển thị thêm thông tin
 NoFilesUploadedYet=Đầu tiên vui lòng tải lên một tài liệu
 SeePrivateNote=Xem ghi chú riêng
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/vi_VN/margins.lang b/htdocs/langs/vi_VN/margins.lang
index cbe99ad407f..25581aea638 100644
--- a/htdocs/langs/vi_VN/margins.lang
+++ b/htdocs/langs/vi_VN/margins.lang
@@ -22,7 +22,7 @@ ProductService=Sản phẩm hoặc dịch vụ
 AllProducts=Tất cả các sản phẩm và dịch vụ
 ChooseProduct/Service=Chọn sản phẩm hoặc dịch vụ
 ForceBuyingPriceIfNull=Ép buộc mua/giá thành giá bán nếu không được xác định
-ForceBuyingPriceIfNullDetails=Nếu giá mua/ giá thành không được xác định và tùy chọn này "BẬT", biên độ lợi nhuận sẽ bằng 0 trên dòng (giá mua/giá thành = giá bán), nếu không ("TẮT"), thì biên độ sẽ bằng với mặc định được đề xuất.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Phương pháp biên giảm giá toàn cầu
 UseDiscountAsProduct=Là một sản phẩm
 UseDiscountAsService=Là một dịch vụ
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 790bb7b013c..5f510070f92 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=Danh sách thành viên dự thảo (sẽ được xác nhậ
 MembersListValid=Danh sách thành viên hợp lệ
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=Danh sách thành viên bị chấm dứt
 MembersListQualified=Danh sách thành viên đủ điều kiện
 MenuMembersToValidate=Thành viên dự thảo
 MenuMembersValidated=Thành viên hợp lệ
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Thành viên bị chấm dứt
 MembersWithSubscriptionToReceive=Thành viên có đăng ký để nhận
 MembersWithSubscriptionToReceiveShort=Đăng ký để nhận
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Đăng ký hết hạn
 MemberStatusActiveLateShort=Đã hết hạn
 MemberStatusPaid=Đăng ký cập nhật
 MemberStatusPaidShort=Cập nhật
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Thành viên bị chấm dứt
 MemberStatusResiliatedShort=Chấm dứt
 MembersStatusToValid=Thành viên dự thảo
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Thành viên bị chấm dứt
 MemberStatusNoSubscription=Xác nhận (không cần đăng ký)
 MemberStatusNoSubscriptionShort=Đã xác nhận
@@ -82,6 +87,8 @@ Physical=Vật lý
 Moral=Đạo đức
 MorAndPhy=Moral and Physical
 Reenable=Bật lại
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Chấm dứt thành viên
 ConfirmResiliateMember=Bạn có chắc chắn muốn chấm dứt thành viên này?
 DeleteMember=Xóa thành viên
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Mẫu email để sử dụng đ
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Mẫu email để sử dụng để gửi email cho thành viên trong bản ghi đăng ký mới
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Mẫu email sẽ sử dụng để gửi email nhắc nhở khi đăng ký sắp hết hạn
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Mẫu email để sử dụng để gửi email cho thành viên khi hủy thành viên
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Email người gửi cho gửi email tự động
 DescADHERENT_ETIQUETTE_TYPE=Định dạng của trang nhãn
 DescADHERENT_ETIQUETTE_TEXT=Văn bản in trên tờ địa chỉ thành viên
@@ -162,6 +170,7 @@ DocForLabels=Tạo tờ địa chỉ
 SubscriptionPayment=Đăng ký thanh toán
 LastSubscriptionDate=Ngày thanh toán đăng ký mới nhất
 LastSubscriptionAmount=Số tiền đăng ký mới nhất
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Thống kê thành viên theo quốc gia
 MembersStatisticsByState=Thống kê thành viên theo tiểu bang / tỉnh
 MembersStatisticsByTown=Thống kê thành viên theo thị trấn
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index d8c8e376b9b..99ce316be1e 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=Tôi muốn tạo một số tài liệu từ đối tượ
 IncludeDocGenerationHelp=Nếu bạn kiểm tra điều này, một số mã sẽ được tạo để thêm hộp "Tạo tài liệu" trong hồ sơ.
 ShowOnCombobox=Hiển thị giá trị vào combobox
 KeyForTooltip=Khóa cho tooltip
-CSSClass=Lớp CSS
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Không thể chỉnh sửa
 ForeignKey=Khóa ngoại
 TypeOfFieldsHelp=Kiểu trường: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' có nghĩa là chúng ta thêm nút + sau khi kết hợp để tạo bản ghi, ví dụ 'bộ lọc' có thể là 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTEER__)')
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index f77878edc7b..8cfeed65329 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Tạo đơn hàng
 MakeOrder=Tạo đơn hàng
 SupplierOrder=Đơn đặt hàng mua
 SuppliersOrders=Đơn đặt hàng mua
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Đơn đặt hàng mua hiện tại
 CustomerOrder=Đơn đặt hàng bán
 CustomersOrders=Đơn bán hàng bán
@@ -69,7 +71,7 @@ ValidateOrder=Xác nhận đơn hàng
 UnvalidateOrder=Đơn hàng chưa xác nhận
 DeleteOrder=Xóa đơn hàng
 CancelOrder=Hủy đơn hàng
-OrderReopened= Order %s re-open
+OrderReopened= Đơn hàng %s được mở lại
 AddOrder=Tạo đơn hàng
 AddPurchaseOrder=Tạo đơn hàng mua
 AddToDraftOrders=Thêm vào đơn hàng dự thảo
@@ -141,11 +143,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Điện thoại
 # Documents models
-PDFEinsteinDescription=A complete order model 
-PDFEratostheneDescription=A complete order model
+PDFEinsteinDescription=Mẫu hoàn thiện của đơn hàng (Mẫu cũ của mẫu Eratosthene)
+PDFEratostheneDescription=Mẫu đơn hàng hoàn thiện
 PDFEdisonDescription=Mẫu đơn hàng đơn giản
-PDFProformaDescription=A complete Proforma invoice template
+PDFProformaDescription=Mẫu hoàn thiện của hoá đơn hình thức
 CreateInvoiceForThisCustomer=Thanh toán đơn hàng
+CreateInvoiceForThisSupplier=Thanh toán đơn hàng
 NoOrdersToInvoice=Không có đơn hàng có thể lập hóa đơn
 CloseProcessedOrdersAutomatically=Phân loại "Đã xử lý" cho tất cả các đơn hàng được chọn.
 OrderCreation=Tạo đơn hàng
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 5ad76877a81..c92b2668971 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Công ty có nhiều hoạt động (tất cả các mô-đun ch
 CreatedBy=Được tạo ra bởi %s
 ModifiedBy=Được thay đổi bởi %s
 ValidatedBy=Xác nhận bởi %s
+SignedBy=Signed by %s
 ClosedBy=Đóng bởi %s
 CreatedById=Id người dùng đã tạo ra
 ModifiedById=Id người dùng đó đã thực hiện thay đổi mới nhất
@@ -244,6 +245,7 @@ NewKeyIs=Đây là chìa khóa mới để đăng nhập
 NewKeyWillBe=Khóa mới của bạn để đăng nhập vào phần mềm sẽ được
 ClickHereToGoTo=Click vào đây để đi đến% s
 YouMustClickToChange=Tuy nhiên, trước tiên bạn phải nhấp vào liên kết sau đây để xác nhận thay đổi mật khẩu này
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=Nếu bạn không yêu cầu thay đổi này, chỉ cần quên email này. Thông tin của bạn được lưu giữ an toàn.
 IfAmountHigherThan=Nếu số tiền cao hơn <strong>%s</strong>
 SourcesRepository=Kho lưu trữ cho các nguồn
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
index 9d5c0bff7e1..d6942190bd5 100644
--- a/htdocs/langs/vi_VN/productbatch.lang
+++ b/htdocs/langs/vi_VN/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Sử dụng số lô / số sê-ri
-ProductStatusOnBatch=Có (lô/ sê-ri được yêu cầu)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=Không (lô/ sê-ri không sử dụng)
-ProductStatusOnBatchShort=Có
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Không
 Batch=Lô/ Sê-ri
 atleast1batchfield=Hạn sử dụng hoặc Hạn bán hoặc Lô / Số sê-ri
@@ -22,3 +24,12 @@ ProductLotSetup=Thiết lập mô-đun Lô/ Sê-ri
 ShowCurrentStockOfLot=Hiển thị tồn kho hiện tại cho cặp sản phẩm/ lô
 ShowLogOfMovementIfLot=Hiển thị nhật ký biến động kho cho cặp sản phẩm/ lô
 StockDetailPerBatch=Chi tiết tồn kho trên mỗi lô
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 2e0982b1ff6..9727502004b 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=Tỷ lệ VAT (cho nhà cung cấp/ sản phẩm này)
 DiscountQtyMin=Chiết khấu cho s.lượng này
 NoPriceDefinedForThisSupplier=Không có giá/ s.lượng được định rõ cho nhà cung cấp/ sản phẩm này
 NoSupplierPriceDefinedForThisProduct=Không có giá/ s.lượng của nhà cung cấp được định rõ cho sản phẩm này
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Sản phẩm định sẵn
 PredefinedServicesToSell=Dịch vụ định sẵn
 PredefinedProductsAndServicesToSell=Sản phẩm/dịch vụ định sẵn để bán
@@ -313,7 +314,7 @@ LastUpdated=Cập nhật mới nhất
 CorrectlyUpdated=Đã cập nhật chính xác
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Chọn file PDF
-IncludingProductWithTag=Bao gồm sản phẩm/ dịch vụ được gắn tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Giá mặc định, giá thực có thể phụ thuộc vào khách hàng
 WarningSelectOneDocument=Hãy chọn ít nhất một tài liệu
 DefaultUnitToShow=Đơn vị
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 0337979bc3b..e87f7bf0ced 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=Danh sách nhiệm vụ
 GoToListOfTimeConsumed=Tới danh sách thời gian tiêu thụ
 GanttView=Chế độ xem Gantt
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=Danh sách các đề xuất thương mại liên quan đến dự án
 ListOrdersAssociatedProject=Danh sách các đơn đặt hàng bán liên quan đến dự án
 ListInvoicesAssociatedProject=Danh sách hóa đơn khách hàng liên quan đến dự án
@@ -268,3 +269,7 @@ OneLinePerTask=Dòng dòng một công việc
 OneLinePerPeriod=Một dòng cho một khoảng thời gian
 RefTaskParent=Tham chiếu công việc cấp cha
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
index a9e808d9f5a..6df3d5acfc0 100644
--- a/htdocs/langs/vi_VN/propal.lang
+++ b/htdocs/langs/vi_VN/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Gửi đơn hàng đề xuất qua thư
 DatePropal=Ngày đề xuất
 DateEndPropal=Ngày hết hiệu lực
 ValidityDuration=Thời hạn hiệu lực
-CloseAs=Đặt trạng thái thành
 SetAcceptedRefused=Đặt chấp nhận / từ chối
 ErrorPropalNotFound=Đơn hàng đề xuất %s không tìm thấy
 AddToDraftProposals=Thêm vào dự thảo đề xuất
@@ -60,6 +59,7 @@ ConfirmClonePropal=Bạn có chắc chắn muốn nhân bản đề xuất thư
 ConfirmReOpenProp=Bạn có chắc chắn muốn mở lại đề xuất thương mại <b>%s</b> ?
 ProposalsAndProposalsLines=Đơn hàng đề xuất và chi tiết
 ProposalLine=Chi tiết đơn hàng đề xuất
+ProposalLines=Proposal lines
 AvailabilityPeriod=Độ chậm trễ có thể
 SetAvailability=Chỉnh thời gian trì hoãn sẵn có
 AfterOrder=sau đơn hàng
@@ -85,7 +85,8 @@ ProposalCustomerSignature=Văn bản chấp nhận, dấu công ty, ngày và ch
 ProposalsStatisticsSuppliers=Thống kê đề xuất nhà cung cấp
 CaseFollowedBy=Theo bởi trường hợp
 SignedOnly=Signed only
-IdProposal=ID đề xuất
-IdProduct=ID sản phẩm
-PrParentLine=Dòng mẹ đề xuất
-LineBuyPriceHT=Giá mua Số lượng ròng của thuế cho dòng
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index d25ecfa620a..1a90a0e49ff 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -19,8 +19,8 @@ Stock=Tồn kho
 Stocks=Tồn kho
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Tồn kho theo lô / sê-ri
 LotSerial=Lô/ Sê-ri
 LotSerialList=Danh sách lô/ sê-ri
@@ -37,8 +37,8 @@ AllWarehouses=Tất cả kho
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Bao gồm cả dự thảo đơn đặt hàng
 Location=Đến từ
-LocationSummary=Tên ngắn của địa điểm
-NumberOfDifferentProducts=Số lượng sản phẩm khác nhau
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Tổng số sản phẩm
 LastMovement=Dịch chuyển mới nhất
 LastMovements=Dịch chuyển mới nhất
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Giá trị kho
 UserWarehouseAutoCreate=Tự động tạo người dùng kho khi tạo người dùng
 AllowAddLimitStockByWarehouse=Quản lý đồng thời giá trị cho tồn kho tối thiểu và mong muốn trên mỗi cặp (sản phẩm - kho) ngoài giá trị cho tồn kho tối thiểu và mong muốn trên mỗi sản phẩm
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Kho mặc định
@@ -97,15 +98,16 @@ RealStockDesc=Vật lý/ tồn kho thực là tồn kho hiện tại trong kho.
 RealStockWillAutomaticallyWhen=Tồn kho thực sẽ được sửa đổi theo quy tắc này (như được xác định trong mô-đun Tồn kho):
 VirtualStock=Tồn kho ảo
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Mã kho
 DescWareHouse=Mô tả kho
 LieuWareHouse=Địa phương hóa kho
 WarehousesAndProducts=Các kho hàng và sản phẩm
 WarehousesAndProductsBatchDetail=Kho và sản phẩm (với chi tiết mỗi lô /sê-ri)
 AverageUnitPricePMPShort=Giá bình quân gia quyền
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Đơn giá bán
 EstimatedStockValueSellShort=Giá trị bán
 EstimatedStockValueSell=Giá trị bán
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Số lượng sản phẩm% s trong kho trước khi thời gian được lựa chọn (<% s)
 NbOfProductAfterPeriod=Số lượng sản phẩm% s trong kho sau khi được lựa chọn thời gian (>% s)
 MassMovement=Chuyển kho toàn bộ
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Chuyển bản ghi
 ReceivingForSameOrder=Biên nhận cho đơn đặt hàng này
 StockMovementRecorded=Chuyển động kho được ghi nhận
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Mức tồn kho phải đủ để thêm sản phẩ
 StockMustBeEnoughForOrder=Mức tồn kho phải đủ để thêm sản phẩm/dịch vụ để đặt hàng (kiểm tra được thực hiện trên tồn kho thực hiện tại khi thêm một dòng vào đơn hàng bất kể quy tắc nào để thay đổi tồn kho tự động)
 StockMustBeEnoughForShipment= Mức tồn kho phải đủ để thêm sản phẩm / dịch vụ vào lô hàng (kiểm tra được thực hiện trên tồn kho thực hiện tại khi thêm một dòng vào lô hàng bất kể quy tắc thay đổi tồn kho tự động)
 MovementLabel=Nhãn chuyển kho
-TypeMovement=Loại chuyển kho
+TypeMovement=Direction of movement
 DateMovement=Ngày chuyển
 InventoryCode=Mã chuyển kho hoặc mã kiểm kho
 IsInPackage=Chứa vào gói
@@ -183,6 +185,7 @@ inventoryCreatePermission=Tạo kiểm kho mới
 inventoryReadPermission=Xem kiểm kho
 inventoryWritePermission=Cập nhật kiểm kho
 inventoryValidatePermission=Xác nhận kiểm kho
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Hàng tồn kho
 inventoryListTitle=Kiểm kho
 inventoryListEmpty=Không việc kiểm kho trong tiến trình
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Tồn kho là bắt buộc để chọn lô
 ForceTo=Ép buộc
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Tải lên tệp sau đó nhấp vào biểu tượng %s để lựa chọn tệp là tệp nguồn nhập
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Mở lại
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index eab38bec619..1bbcdce2cbb 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Nhà cung cấp
 SuppliersInvoice=Hóa đơn nhà cung cấp
+SupplierInvoices=Hóa đơn nhà cung cấp
 ShowSupplierInvoice=Hiển thị hóa đơn nhà cung cấp
 NewSupplier=Nhà cung cấp mới
 History=Lịch sử
diff --git a/htdocs/langs/vi_VN/ticket.lang b/htdocs/langs/vi_VN/ticket.lang
index 572f49247ce..dad560fa10f 100644
--- a/htdocs/langs/vi_VN/ticket.lang
+++ b/htdocs/langs/vi_VN/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Đã xóa
 # Dict
 Type=Loại
 Severity=Mức độ nghiêm trọng
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=Để gửi email từ tin nhắn vé
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Hiển thị logo của mô-đun trong giao diện công c
 TicketsShowModuleLogoHelp=Cho phép tùy chọn này để ẩn mô-đun logo trong các trang của giao diện công cộng
 TicketsShowCompanyLogo=Hiển thị logo của công ty trong giao diện công cộng
 TicketsShowCompanyLogoHelp=Cho phép tùy chọn này để ẩn logo của công ty chính trong các trang của giao diện công cộng
-TicketsEmailAlsoSendToMainAddress=Đồng thời gửi thông báo đến địa chỉ email chính
-TicketsEmailAlsoSendToMainAddressHelp=Cho phép tùy chọn này để gửi email đến địa chỉ "Thông báo email từ" (xem thiết lập bên dưới)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Hạn chế hiển thị đối với vé được chỉ định cho người dùng hiện tại (không hiệu quả đối với người dùng bên ngoài, luôn bị giới hạn ở bên thứ ba mà họ phụ thuộc)
 TicketsLimitViewAssignedOnlyHelp=Chỉ có vé được chỉ định cho người dùng hiện tại sẽ hiển thị. Không áp dụng cho người dùng có quyền quản lý vé.
 TicketsActivatePublicInterface=Kích hoạt giao diện công cộng
@@ -126,10 +128,10 @@ TicketNumberingModules=Mô-đun đánh số vé
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Thông báo cho bên thứ ba khi tạo
 TicketsDisableCustomerEmail=Luôn vô hiệu hóa email khi vé được tạo từ giao diện công cộng
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Vé sửa đổi mới nhất
 BoxLastModifiedTicketDescription=Vé sửa đổi mới nhất %s
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Không có vé sửa đổi gần đây
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index 9297c08b76f..019f7aeb3af 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Xóa khỏi nhóm
 PasswordChangedAndSentTo=Mật khẩu thay đổi và gửi đến <b>%s</b>.
 PasswordChangeRequest=Yêu cầu thay đổi mật khẩu cho <b>%s</b>
 PasswordChangeRequestSent=Yêu cầu thay đổi mật khẩu cho <b>%s</b> đã gửi đến <b>% s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Xác nhận đặt lại mật khẩu
 MenuUsersAndGroups=Người dùng & Nhóm
 LastGroupsCreated=Các nhóm %s mới nhất được tạo
@@ -70,9 +72,10 @@ ExportDataset_user_1=Người dùng và các tính chất của họ
 DomainUser=Domain người dùng %s
 Reactivate=Kích hoạt lại
 CreateInternalUserDesc=Biểu mẫu này cho phép bạn tạo một người dùng nội bộ trong công ty/ tổ chức của bạn. Để tạo người dùng bên ngoài (khách hàng, nhà cung cấp, v.v.), hãy sử dụng nút 'Tạo Người dùng Dolibarr' từ thẻ liên lạc của bên thứ ba đó.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Quyền được cấp bởi vì được thừa hưởng từ một trong những nhóm của người dùng.
 Inherited=Được thừa kế
+UserWillBe=Created user will be
 UserWillBeInternalUser=Người dùng tạo ra sẽ là một người dùng nội bộ (vì không liên kết với một bên thứ ba cụ thể)
 UserWillBeExternalUser=Người dùng tạo ra sẽ là một người dùng bên ngoài (vì liên quan đến một bên thứ ba cụ thể)
 IdPhoneCaller=Id người gọi điện thoại
@@ -109,8 +112,10 @@ UserAccountancyCode=Mã kế toán của người dùng
 UserLogoff=Người dùng đăng xuất
 UserLogged=Người dùng đăng nhập
 DateOfEmployment=Employment date
-DateEmployment=Ngày bắt đầu làm việc
+DateEmployment=Employment
+DateEmploymentstart=Ngày bắt đầu làm việc
 DateEmploymentEnd=Ngày kết thúc việc làm
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=Bạn không thể vô hiệu hóa hồ sơ người dùng của bạn
 ForceUserExpenseValidator=Thúc phê duyệt báo cáo chi phí
 ForceUserHolidayValidator=Thúc phê duyệt báo cáo chi phí
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 5f40936142b..9696a7d6d44 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Sử dụng với máy chủ nhúng PHP</u> <br> Trên môi trường phát triển, bạn có thể muốn kiểm tra trang web với máy chủ web nhúng PHP (yêu cầu PHP 5.5) bằng cách chạy <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Chạy trang web của bạn với một nhà cung cấp Dolibarr Hosting khác</u> <br> Nếu bạn không có máy chủ web như Apache hoặc NGinx có sẵn trên internet, bạn có thể xuất và nhập trang web của mình vào một phiên bản Dolibarr khác được cung cấp bởi một nhà cung cấp dịch vụ lưu trữ Dolibarr khác cung cấp tích hợp đầy đủ với mô-đun Trang web. Bạn có thể tìm thấy danh sách một số nhà cung cấp dịch vụ lưu trữ Dolibarr trên <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Kiểm tra xem máy chủ ảo có quyền <strong>%s</strong> trên các tệp vào <br> <strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Đọc
 WritePerm=Viết
 TestDeployOnWeb=Kiểm tra / triển khai trên web
 PreviewSiteServedByWebServer=<u>Xem trước %s trong một tab mới.</u> <br><br> %s sẽ được phục vụ bởi một máy chủ web bên ngoài (như Apache, Nginx, IIS). Bạn phải cài đặt và thiết lập máy chủ này trước khi trỏ đến thư mục: <br> <strong>%s</strong> <br> URL được phục vụ bởi máy chủ bên ngoài: <br> <strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Xem trước %s trong một tab mới.</u> <br><br> %s sẽ được phục vụ bởi máy chủ Dolibarr nên không cần thêm bất kỳ máy chủ web nào (như Apache, Nginx, IIS). <br> Điều bất tiện là URL của các trang không thân thiện với người dùng và bắt đầu bằng đường dẫn Dolibarr của bạn. <br> URL được phục vụ bởi Dolibarr: <br> <strong>%s</strong> <br><br> Để sử dụng máy chủ web bên ngoài của riêng bạn để phục vụ trang web này, hãy tạo một máy chủ ảo trên máy chủ web của bạn trỏ vào thư mục <br> <strong>%s</strong> <br> sau đó nhập tên của máy chủ ảo này và nhấp vào nút xem trước khác.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL của máy chủ ảo được cung cấp bởi máy chủ web bên ngoài không được xác định
 NoPageYet=Chưa có trang nào
 YouCanCreatePageOrImportTemplate=Bạn có thể tạo một trang mới hoặc nhập một mẫu trang web đầy đủ
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/vi_VN/zapier.lang b/htdocs/langs/vi_VN/zapier.lang
index bbb899dd004..3eb7187a5c5 100644
--- a/htdocs/langs/vi_VN/zapier.lang
+++ b/htdocs/langs/vi_VN/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier cho Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Mô-đun Zapier cho Dolibarr
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Thiết lập Zapier cho Dolibarr
+ZapierForDolibarrSetup=Thiết lập Zapier cho Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 5bfcb481baa..1079a11bcfe 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=已绑定的发票行
 ExpenseReportLines=要绑定的费用行报告
 ExpenseReportLinesDone=已绑定的费用报告行
 IntoAccount=用会计科目绑定行
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=绑定
@@ -209,7 +209,7 @@ Codejournal=日记帐
 JournalLabel=Journal label
 NumPiece=件数
 TransactionNumShort=Num. transaction
-AccountingCategory=会计分类
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=您可以在此处定义一些会计科目组。它们将用于会计分类报告。
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=会计分录
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=费用报告日常报表
 InventoryJournal=库存日常报表
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 0c6ae1ca992..20c23406c24 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -9,8 +9,8 @@ VersionExperimental=试验
 VersionDevelopment=开发
 VersionUnknown=未知
 VersionRecommanded=推荐
-FileCheck=Fileset Integrity Checks
-FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
+FileCheck=文件集完整性检查
+FileCheckDesc=使用此工具，您可以将文件与正式文件进行比较，以检查文件的完整性和应用程序的设置。也可以检查某些设置常数的值。您可以使用此工具来确定是否已修改任何文件（例如，被黑客入侵）。
 FileIntegrityIsStrictlyConformedWithReference=文件完整性严格符合参考。
 FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
 FileIntegritySomeFilesWereRemovedOrModified=文件完整性检查失败。某些文件已被修改，删除或添加。
@@ -27,7 +27,7 @@ AvailableOnlyOnPackagedVersions=The local file for integrity checking is only av
 XmlNotFound=找不到程序的Xml完整性文件
 SessionId=会话 ID
 SessionSaveHandler=会话保存处理程序
-SessionSavePath=Session save location
+SessionSavePath=会话保存位置
 PurgeSessions=清空会话
 ConfirmPurgeSessions=您真的要清除所有会话吗？它将断开每个用户（您自己除外）。
 NoSessionListWithThisHandler=您 PHP 中设置的保存会话处理程序不允许列出运行中的会话。
@@ -35,14 +35,15 @@ LockNewSessions=锁定新连接
 ConfirmLockNewSessions=你确定要限制 Dolibarr 的所有新连接，只允许您自己连入？此后将只有用户 <b>%s</b> 可以连入。
 UnlockNewSessions=取消连接锁定
 YourSession=你的会话
-Sessions=Users Sessions
+Sessions=用户会话
 WebUserGroup=Web 服务器用户/组
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
-NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
+PermissionsOnFiles=Permissions on files
+PermissionsOnFilesInWebRoot=Web根目录中文件的权限
+PermissionsOnFile=文件%s的权限
+NoSessionFound=您的PHP配置似乎不允许列出活动会话。可以保护用于保存会话的目录（<b> %s </b>）（例如，通过OS权限或PHP指令open_basedir）。
 DBStoringCharset=数据库保存数据的字符编码
 DBSortingCharset=数据库排序数据的字符编码
-HostCharset=Host charset
+HostCharset=主机字符集
 ClientCharset=客户端的字符编码
 ClientSortingCharset=客户核对
 WarningModuleNotActive=<b> %s </b>模块必须启用
@@ -56,12 +57,13 @@ GUISetup=主题
 SetupArea=设置
 UploadNewTemplate=上传新模板
 FormToTestFileUploadForm=文件上传功能测试
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=必须启用模块/应用程序<b> %s </b>
+ModuleIsEnabled=启用了模块/应用程序<b> %s </b>
 IfModuleEnabled=注：“是”仅在模块 <b>%s</b> 启用时有效
-RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
+RemoveLock=删除/重命名文件<b> %s </b>（如果存在），以允许使用更新/安装工具。
+RestoreLock=恢复文件<b> %s </b>的只读权限，以禁止升级工具的使用。
 SecuritySetup=安全设置
+PHPSetup=PHP setup
 SecurityFilesDesc=在此定义与上载文件的安全性相关的选项。
 ErrorModuleRequirePHPVersion=错误，此模块要求 PHP 版本 %s 或更高
 ErrorModuleRequireDolibarrVersion=错误，此模块要求 Dolibarr 版本 %s 或更高
@@ -71,20 +73,20 @@ Dictionary=字典库
 ErrorReservedTypeSystemSystemAuto=类型的值'system'和'systemauto'保留。您可以使用“user”作为值来添加自己的记录
 ErrorCodeCantContainZero=编码不能包含 0
 DisableJavascript=禁用 JavaScript 和 Ajax 功能
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=注意：用于测试或调试目的。为了针对盲人浏览器或文本浏览器进行优化，您可能更喜欢使用用户个人资料上的设置
 UseSearchToSelectCompanyTooltip=此外，如果您有大量第三方（> 100 000），您可以通过在"设置"-> "其他"中将常量COMPANY_DONOTSEARCH_ANYWHERE设置为1来提高速度。然后搜索将限制为以字符串的开头。
 UseSearchToSelectContactTooltip=此外，如果您有大量第三方（> 100 000），您可以通过在"设置"-> "其他"中将常量CONTACT_DONOTSEARCH_ANYWHERE设置为1来提高速度。然后搜索将限制为以字符串开头。
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
 DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
-NumberOfBytes=Number of Bytes
-SearchString=Search string
+NumberOfBytes=字节数
+SearchString=搜寻字串
 NotAvailableWhenAjaxDisabled=Ajax 禁用时不可用
 AllowToSelectProjectFromOtherCompany=在合作方的文档上，可以选择链接到另一个合作方的项目
 JavascriptDisabled=禁用 JavaScript
 UsePreviewTabs=使用预览标签
 ShowPreview=显示预览
-ShowHideDetails=Show-Hide details
+ShowHideDetails=显示隐藏详细信息
 PreviewNotAvailable=无预览
 ThemeCurrentlyActive=当前使用的主题
 MySQLTimeZone=MySql 服务器的时区
@@ -138,15 +140,15 @@ YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to a
 HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
 Box=插件
 Boxes=插件
-MaxNbOfLinesForBoxes=Max. number of lines for widgets
+MaxNbOfLinesForBoxes=插件清单数量最大值
 AllWidgetsWereEnabled=全部插件已启用
 PositionByDefault=默认顺序
 Position=位置
 MenusDesc=菜单管理器定义两菜单中的内容(横向和纵向菜单栏)。
-MenusEditorDesc=菜单编辑器允许您定义个性化的菜单项。请谨慎使用，以免造成部分菜单项无法访问，影响 Dolibarr 的稳定性。<br>一些模块会添加菜单项(通常在 <b>所有(All)</b>菜单下)。如果您错误的移除了其中的一些菜单项，可以通过禁用/重新启用相应的模块来恢复。
+MenusEditorDesc=菜单编辑器允许您定义自定义菜单条目。请小心使用，以避免不稳定和永久无法访问的菜单项。<br>某些模块添加菜单项（通常在菜单<b>全部</b>中）。如果您错误地删除了其中一些条目，则可以恢复它们禁用并重新启用该模块。
 MenuForUsers=用户菜单
 LangFile=.lang 文件
-Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+Language_en_US_es_MX_etc=语言（en_US，es_MX等）
 System=系统
 SystemInfo=系统信息
 SystemToolsArea=系统工具区
@@ -154,8 +156,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=清空
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=删除系统日志模块定义的日志文件<b>%s</b>(无数据丢失风险)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFilesShort=删除日志和临时文件
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=立即清空
 PurgeNothingToDelete=未删除目录或文件
@@ -169,7 +171,7 @@ Restore=还原
 RunCommandSummary=备份已通过如下命令执行
 BackupResult=备份结果
 BackupFileSuccessfullyCreated=备份文件生成成功
-YouCanDownloadBackupFile=The generated file can now be downloaded
+YouCanDownloadBackupFile=现在可以下载生成的文件
 NoBackupFileAvailable=没有可用的备份文件。
 ExportMethod=导出方法
 ImportMethod=导入方法
@@ -178,13 +180,13 @@ ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your h
 ImportPostgreSqlDesc=导入备份文件，你必须使用 pg_restore 命令行命令：
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Filename for backup:
+FileNameToGenerate=备份文件名：
 Compression=压缩
 CommandsToDisableForeignKeysForImport=导入时禁用 Foreign Key 的命令
 CommandsToDisableForeignKeysForImportWarning=如果你希望稍候能恢复您的SQL转储则必须使用。
 ExportCompatibility=生成导出文件的兼容性
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+ExportUseMySQLQuickParameter=使用--quick参数
+ExportUseMySQLQuickParameterHelp=“ --quick”参数有助于限制大型表的RAM消耗。
 MySqlExportParameters=MySQL 导出参数
 PostgreSqlExportParameters= PostgreSQL 导出参数
 UseTransactionnalMode=使用事务模式
@@ -211,7 +213,7 @@ ModulesMarketPlaces=更多模块...
 ModulesDevelopYourModule=开发自己的模块
 ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
-NewModule=New module
+NewModule=新模块
 FreeModule=空余
 CompatibleUpTo=与版本%s兼容
 NotCompatible=此模块似乎与您的Dolibarr %s（Min %s  -  Max %s）不兼容。
@@ -227,11 +229,12 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=参考网址查找更多模块...
 DevelopYourModuleDesc=一些开发自己模块的解决方案......
 URL=网址
-RelativeURL=Relative URL
+RelativeURL=相关URL
 BoxesAvailable=插件可用
 BoxesActivated=插件已启用
 ActivateOn=启用
 ActiveOn=启用
+ActivatableOn=可激活
 SourceFile=来源文件
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=仅当 JavaScript 启用时可用
 Required=必要
@@ -247,17 +250,17 @@ ProtectAndEncryptPdfFilesDesc=PDF保护允许在PDF浏览器中阅读和打印PD
 Feature=功能
 DolibarrLicense=授权
 Developpers=开发者/贡献者
-OfficialWebSite=Dolibarr official web site
+OfficialWebSite=Dolibarr官方网站
 OfficialWebSiteLocal=内部网站 (%s)
-OfficialWiki=Dolibarr documentation / Wiki
+OfficialWiki=Dolibarr文档/ Wiki
 OfficialDemo=Dolibarr在线演示
 OfficialMarketPlace=官方市场提供外部模块/扩展
 OfficialWebHostingService=引用网络托管服务（云主机）
 ReferencedPreferredPartners=首选合作伙伴
 OtherResources=其他资源
-ExternalResources=External Resources
+ExternalResources=外部资源
 SocialNetworks=社交网络
-SocialNetworkId=Social Network ID
+SocialNetworkId=社交网络ID
 ForDocumentationSeeWiki=用户或开发人员用文档(文档，常见问题…)，<br>参见 Dolibarr 百科：<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=您有任何其他问题/帮助，可以到 Dolibarr 论坛： <br> <b><a href="%s" target="_blank">%s</a></b>简体中文翻译可到Dolibarr爱好者交流Q群技术交流：206239089
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -285,19 +288,19 @@ MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS 端口 ( Unix 类系统
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
-MAIN_MAIL_AUTOCOPY_TO= BCC 所有发送邮件至
-MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
-MAIN_MAIL_FORCE_SENDTO=发送电子邮件至（替换真正的收件人，用于测试目的）
+MAIN_MAIL_AUTOCOPY_TO= 将所有已发送的电子邮件复制（密件抄送）到
+MAIN_DISABLE_ALL_MAILS=禁用所有电子邮件发送（出于测试目的或演示目的）
+MAIN_MAIL_FORCE_SENDTO=发送电子邮件至（替换实际的收件人，用于测试目的）
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
 MAIN_MAIL_SENDMODE=Email sending method
 MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
-MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
-MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_TLS=使用 TLS(SSL)加密
+MAIN_MAIL_EMAIL_STARTTLS=使用TLS（STARTTLS）加密
 MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=dkim选择器名称
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
 MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
 MAIN_SMS_SENDMODE=短信发送方法
@@ -347,9 +350,10 @@ LastActivationAuthor=最新激活作者
 LastActivationIP=最新激活IP
 UpdateServerOffline=离线升级服务器
 WithCounter=管理柜台
-GenericMaskCodes=您可自由设置格式掩码。在 %s 格式掩码中， 有如下计数标记可用：<br><b>{000000}</b>表示按顺序递增的序号。序号位数与掩码中0的个数相同，不足自动补零，达最大值后自动归零。<br><b>{000000+000}</b> 同上但 %s 起始序号从 + 后的数值记起。<br><b>{000000@x}</b> 与第一种相同，但序号到X月时自动清零(x=1~12 、0＝程序设置中的财年起始月、99＝每月清零)。 如果使用此种掩码且 x >= 2 ，则必须同时使用日期掩码 {yy}{mm} 或 {yyyy}{mm}。<br><b>{dd}</b> 天 (01~31)。<br><b>{mm}</b> 月 (01~12)。<br><b>{yy}</b>，<b>{yyyy}</b> 或 <b>{y}</b> 代表 2位, 4位 或 1 位年。<br><br>
-GenericMaskCodes2=<b>{cccc}</b> 客户代码<br><b>{cccc000}</b> 客户代码ccc后跟客户引用序号000。<br><b>{tttt}></b> 公司类型代码。(参见公司类型的下拉菜单项目列表)。<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=其它非标记字符将维持不变。<br>不允许使用空格<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>例如: 2007-01-31 第三方“TheCompany”的第99笔 %s ：</u> <br>
 GenericMaskCodes4b=<u>例如合作方创建于 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>例如: 于 2007-03-1 建立的产品资料:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=已使用资料库以支持生成PDF文件
@@ -466,24 +470,24 @@ BarcodeInitForProductsOrServices=产品或服务条码批量初始化或重置
 CurrentlyNWithoutBarCode=目前，您在<strong> %s </ strong> %s上没有定义条形码时有<strong> %s </ strong>记录。
 InitEmptyBarCode=初始值为下一个%s空记录
 EraseAllCurrentBarCode=抹掉现存所有条码值
-ConfirmEraseAllCurrentBarCode=您确定要删除所有当前条形码值吗？
+ConfirmEraseAllCurrentBarCode=您确定要删除所有当前条形码值吗？ 
 AllBarcodeReset=所有现存条码值已经被删除
 NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
 EnableFileCache=启用文件缓存
 ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
-NoDetails=No additional details in footer
+NoDetails=页脚中没有其他详细信息
 DisplayCompanyInfo=显示公司地址
 DisplayCompanyManagers=显示经理姓名
 DisplayCompanyInfoAndManagers=显示公司地址和经理姓名
 EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
-ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
+ModuleCompanyCodeCustomerAquarium=%s后跟客户会计代码的客户代码
+ModuleCompanyCodeSupplierAquarium=%s后跟供应商会计代码的合作方供应商代码
 ModuleCompanyCodePanicum=返回一个空的科目代码
 ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
 ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
-Use3StepsApproval=默认情况下，需要由2个不同的用户创建和批准采购订单（一步/用户创建和一步/用户批准。请注意，如果用户同时拥有创建和批准权限，则一步/用户就足够了） 。如果金额高于专用值，您可以要求使用此选项引入第三步/用户批准（因此需要3个步骤：1 =验证，2 =首次批准，3 =如果金额足够则为第二批准）。 <br>如果一个批准（2个步骤）足够，则将其设置为空，如果始终需要第二个批准（3个步骤），则将其设置为非常低的值（0.1）。
-UseDoubleApproval=当金额（不含税）高于......时，使用3步批准
+Use3StepsApproval=默认情况下，需要由2个不同的用户创建和批准采购订单（一步/用户创建和一步/用户批准。请注意，如果用户同时拥有创建和批准权限，则一步/用户就足够了） 。如果金额高于专用值，您可以要求使用此选项引入第三步/用户批准（因此需要3个步骤：1 =确认，2 =首次批准，3 =如果金额足够则为第二批准）。 <br>如果一个批准（2个步骤）足够，则将其设置为空，如果始终需要第二个批准（3个步骤），则将其设置为非常低的值（0.1）。
+UseDoubleApproval=当金额（不含税金）高于......时，使用3步批准
 WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
 WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
 WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
@@ -491,16 +495,16 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=如果您的电子邮件SMTP提供商需要将电子邮件客户端限制为某些IP地址（非常罕见），则这是您的ERP CRM应用程序的邮件用户代理（MUA）的IP地址：<strong> %s</strong>。
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
-ClickToShowDescription=单击以显示说明
-DependsOn=This module needs the module(s)
-RequiredBy=本模块被以下模块需要
+ClickToShowDescription=单击以显示描述
+DependsOn=该模块需要模块(集)
+RequiredBy=本模块被以下模块(集)需要
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
-EnableDefaultValues=Enable customization of default values
-EnableOverwriteTranslation=Enable usage of overwritten translation
+EnableDefaultValues=启用自定义默认值
+EnableOverwriteTranslation=启用覆盖翻译
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
 WarningSettingSortOrder=警告，如果字段是未知字段，则在列表页面上设置默认排序顺序可能会导致技术错误。如果遇到此类错误，请返回此页面以删除默认排序顺序并恢复默认行为。
 Field=字段
@@ -510,7 +514,7 @@ WatermarkOnDraftExpenseReports=草稿费用报告上的水印
 AttachMainDocByDefault=如果要在默认情况下将主文档附加到电子邮件，请将此项设置为1（如果适用）
 FilesAttachedToEmail=附加文件
 SendEmailsReminders=通过电子邮件发送议程提醒
-davDescription=Setup a WebDAV server
+davDescription=设置WebDAV服务器
 DAVSetup=模块DAV的设置
 DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
 DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
@@ -541,6 +545,8 @@ Module40Name=供应商
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=调试日志
 Module42Desc=记录设施（文件，系统日志，......）。此类日志用于技术/调试目的。
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=编辑器
 Module49Desc=编辑器管理
 Module50Name=产品
@@ -639,12 +645,14 @@ Module2900Name=Maxmind网站的GeoIP全球IP地址数据库
 Module2900Desc=Maxmind的geoip数据库的转换能力
 Module3200Name=不可改变的档案
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=社交网络
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=人事管理
 Module4000Desc=人力资源管理（部门管理，员工合同和感受）
 Module5000Name=多公司
 Module5000Desc=允许你管理多个公司
-Module6000Name=工作流程
-Module6000Desc=工作流管理（自动创建对象和/或自动状态更改）
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=网站
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=创建/变更内部/外部用户和权限
 Permission254=只能创建/变更外部用户资料
 Permission255=修改其他用户密码
 Permission256=删除或暂时关闭其他用户
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=读取 CA
 Permission272=读取发票
 Permission273=开具发票
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=安全稽核事件
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=安全稽核
 InfoDolibarr=关于Dolibarr
 InfoBrowser=关于浏览器
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=您必须以 <b>%s</b> 用户在MySQL控制台登陆后通过命令行运行此命令否则您必须在命令行的末尾使用 -W 选项来提供 <b>%s</b> 的密码。
 YourPHPDoesNotHaveSSLSupport=SSL 在您的 PHP 中不可用
 DownloadMoreSkins=下载更多外观主题
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=部分翻译
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=自定义属性
 ExtraFieldsLines=自定义属性 (行列)
 ExtraFieldsLinesRec=补充属性（模板发票行）
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=登陆 (Unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=筛选搜索
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=登陆 (samba,activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=全名
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=贵公司已被定义为不含增值税 (首页->设定
 AccountancyCode=科目代码
 AccountancyCodeSell=销售账户代码
 AccountancyCodeBuy=采购账户代码
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=事件及行程模块设置
 PasswordTogetVCalExport=导出链接的授权密钥
+SecurityKey = Security Key
 PastDelayVCalExport=不导出早于这个日期的时间
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=表格奇数背景颜色
 BackgroundTableLineEvenColor=表格偶数背景颜色
 MinimumNoticePeriod=最小通知间隔
 NbAddedAutomatically=每月添加到用户计数器（自动）的天数
-EnterAnyCode=该字段包含标识行的引用。输入您选择的任何值，但不包含特殊字符。
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=RGB颜色采用HEX格式，例如：FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=PDF的底部边距
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=如果此组是其他组的计算，则将此值设置为yes
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=找到了几种语言变体
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=正则表达式过滤器清理值（COMPANY_AQUARIUM_CLEAN_REGEX）
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index c810652102d..96a4fe4a833 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=您的SEPA授权
 FindYourSEPAMandate=这是您的SEPA授权，授权我们公司向您的银行直接扣款。返回签名（扫描签名文档）或通过邮件发送给
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index f46fab501c3..114560a8b53 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -52,9 +52,10 @@ Invoices=发票
 InvoiceLine=发票线
 InvoiceCustomer=客户发票
 CustomerInvoice=客户发票
-CustomersInvoices=客户发票
+CustomersInvoices=顾客发票
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=供应商发票
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
 SupplierBills=供应商发票
 Payment=付款
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=付款已完成
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=付款规则
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=借记卡/信用卡
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=最新一代的日期
 DateLastGenerationShort=最新日期。
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=已完成的发票数量
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=完成的代数
 MaxGenerationReached=达到最大代数
 InvoiceAutoValidate=自动验证发票
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=在月底之后的14天内
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=可变金额(%% tot.)
 VarAmountOneLine=可变金额（%% tot。） -  1行标签'%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=银行转帐
 PaymentTypeShortVIR=银行转帐
@@ -494,12 +498,16 @@ Cash=现金
 Reported=延迟
 DisabledBecausePayments=不可操作，因为已经接收了付款
 CantRemovePaymentWithOneInvoicePaid=无法删除，因为至少有一份发票被归类为已支付
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=预期付款
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=已由此付款来支付
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=支付
 ToMakePaymentBack=支付
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=您必须先创建标准发票并将其转
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=发票PDF模板Crevette。情况发票的完整发票模板
-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=标准发票的格式为%syymm-nnnn，换发票为%syymm-nnnn，预付款发票为%syymm-nnnn，yy为年份为%syymm-nnnn，mm为月，nnnn为没有中断的序列回到0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=返回编号为标准发票的格式为%syymm-nnnn，信用票据为%syymm-nnnn，yy为年的预付款发票为%syymm-nnnn，mm为月，nnnn为没有中断且不返回0的序列
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=第一种情况发票
 InvoiceFirstSituationDesc=<b>现状发票</b>与进展相关的情况有关，例如建筑的进展。每种情况都与发票挂钩。
 InvoiceSituation=情况发票
+PDFInvoiceSituation=情况发票
 InvoiceSituationAsk=根据情况发票
 InvoiceSituationDesc=在已有的情况之后创建新情况
 SituationAmount=情况发票金额（净额）
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=删除模板发票
 ConfirmDeleteRepeatableInvoice=您确定要删除模板发票吗？
 CreateOneBillByThird=每个合作方创建一个发票（否则，每个订单一个发票）
-BillCreated=%s条例草案已创建
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=文件生成的状态
 DoNotGenerateDoc=不生成文档文件
 AutogenerateDoc=自动生成文档文件
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index 6ff10e54c76..864117c4789 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=最近的动作
 BoxLastContracts=最近的合同
 BoxLastContacts=最新联系人/地址
 BoxLastMembers=最新会员
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=最新干预
 BoxCurrentAccounts=打开财务会计账单
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=来自 %s 的最新的 %s 条新闻
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=会计
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index 355be943e79..d9f0d4cf96f 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=客户标签/类别区
 MembersCategoriesArea=会员标签/分类区
 ContactsCategoriesArea=联系人标签/分类信息区
-AccountsCategoriesArea=账户标签/分类区
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=项目标签/分类区
 UsersCategoriesArea=Users tags/categories area
 SubCats=子类别
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=显示标签/分类
 ByDefaultInList=按默认列表
 ChooseCategory=选择类别
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 8f852619ac3..0575152ba7d 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -43,9 +43,10 @@ Individual=私营个体
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=母公司
 Subsidiaries=附属公司
-ReportByMonth=按月报告
-ReportByCustomers=顾客报告
-ReportByQuarter=按报表等级
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=文明守则
 RegisteredOffice=注册给办公室
 Lastname=姓氏
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (社保号)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (社保号)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=钢筋混凝土
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=当前优质账单
 OutstandingBill=优质账单最大值
 OutstandingBillReached=已达到最大优质账单值
 OrderMinAmount=订单的最低金额
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=客户/供应商代码是免费的。此代码可以随时修改。
 ManagingDirectors=公司高管(s)称呼 (CEO, 董事长, 总裁...)
 MergeOriginThirdparty=重复合伙人(合伙人要删除)
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 4ae180df234..cb4815b8ab6 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST购买
 VATCollected=增值税征收
 StatusToPay=待支付
 SpecialExpensesArea=特殊支付区域
+VATExpensesArea=Area for all TVA payments
 SocialContribution=社会或财政税
 SocialContributions=社会或财政税
 SocialContributionsDeductibles=免赔额的社会或财政税
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=客户发票付款
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=社会/财政税款
 PaymentVat=增值税纳税
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=付款列表
 ListOfCustomerPayments=客户付款列表
 ListOfSupplierPayments=供应商付款清单
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF付款
 LT2PaymentsES=IRPF付款
 VATPayment=销售税款
 VATPayments=销售税款
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=销售税退税
 NewVATPayment=新的销售税
 NewLocalTaxPayment=新税%s付款
@@ -134,9 +138,17 @@ NoWaitingChecks=空空如也——没有等待支票存款
 DateChequeReceived=支票接收日期
 NbOfCheques=No. of checks
 PaySocialContribution=支付社会/财政税
-ConfirmPaySocialContribution=你确定想要归类社会或财政税为支付吗？
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=删除社会或财政税款
-ConfirmDeleteSocialContribution=你确定要删除这个社会/财政税款吗？
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=社会和财政税和付款
 CalcModeVATDebt=模式 <b>%sVAT 关于承诺债务%s</b>.
 CalcModeVATEngagement=模式 <b>%s 增值税收入，支出 %s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- 它包括发票，费用，增值税和工资的实际付款
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=它包括Sale日常报表中的所有信用额度。
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=它包括在您的账目中记录具有“EXPENSE”或“INCOME”组的会计科目
 RulesResultBookkeepingPredefined=它包括在您的账目中记录具有“EXPENSE”或“INCOME”组的会计科目
 RulesResultBookkeepingPersonalized=它在您的分类帐中显示记录，其中会计帐户<b>按个性化组分组</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=第三方销售税报告
 VATReportByCustomers=客户销售税报告
 VATReportByCustomersInInputOutputMode=每客户增值税征收和支付的报表
 VATReportByQuartersInInputOutputMode=按收取和支付的税收的销售税率报告
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=按费率报税2
 LT2ReportByQuarters=按费率报税3
 LT1ReportByQuartersES=按RE税率报告
@@ -217,7 +231,7 @@ Pcg_subtype=PCG子类型
 InvoiceLinesToDispatch=待分配的发票行
 ByProductsAndServices=通过产品和服务
 RefExt=外部编码
-ToCreateAPredefinedInvoice=要创建模板发票，请创建标准发票，然后在不验证的情况下单击按钮“%s”。
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=链接到订单
 Mode1=方法 1
 Mode2=方法 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=用于供应商合作方的会计帐户
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=复制下一个月
 SimpleReport=简报
 AddExtraReport=额外报告（添加国外和国家客户报告）
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=税收的最后一天与税收有关
 VATDue=销售税索赔
 ClaimedForThisPeriod=声称为期间
-PaidDuringThisPeriod=在此期间支付
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=按销售税率计算
 TurnoverbyVatrate=营业税按销售税率开具
 TurnoverCollectedbyVatrate=按销售税率收取的营业额
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/zh_CN/ecm.lang b/htdocs/langs/zh_CN/ecm.lang
index d97e7b37f7c..5ac4ee9542f 100644
--- a/htdocs/langs/zh_CN/ecm.lang
+++ b/htdocs/langs/zh_CN/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=文件尚未编入数据库（尝试重新上传）
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index a7705c06513..0fbfa09aab9 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=目录<b>%s</b>不存在（错误的道路，错误的参数saf
 ErrorFunctionNotAvailableInPHP=函数<b>%s</b>是需要此功能，但并不在此版本/ PHP设置的。
 ErrorDirAlreadyExists=具有此名称的目录已经存在。
 ErrorFileAlreadyExists=具有此名称的文件已经存在。
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=文件未收到了完全由服务器。
 ErrorNoTmpDir=临时的说明书%s不存在。
 ErrorUploadBlockedByAddon=上传封锁一个PHP / Apache的插件。
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/zh_CN/externalsite.lang b/htdocs/langs/zh_CN/externalsite.lang
index 11107f670be..5ad169c8784 100644
--- a/htdocs/langs/zh_CN/externalsite.lang
+++ b/htdocs/langs/zh_CN/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=设置链接到外部网站
-ExternalSiteURL=外部网站网址
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=外部网站模块配置不正确。
 ExampleMyMenuEntry=我的菜单选项
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 23a6b0f6baa..917bbfefb1c 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=变更日期
 IPModification=Modification IP
 DateLastModification=最后修改日期
 DateValidation=验证日期
+DateSigning=Signing date
 DateClosing=截止日期
 DateDue=截止日期
 DateValue=确认日期
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=单价
 PriceU=单价
 PriceUHT=单价（不含税）
-PriceUHTCurrency=单价(货币)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=单价（含税）
 Amount=金额
 AmountInvoice=发票金额
@@ -389,6 +390,8 @@ AmountTotal=总金额
 AmountAverage=平均金额
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=百分比
 Total=总计
 SubTotal=小计
@@ -724,7 +727,7 @@ MenuMembers=会员
 MenuAgendaGoogle=谷歌议程
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=来自Dolibarr本身的大小限制(菜单：home-setup-security)为：%s Kb，而PHP的限制为: %s Kb
-NoFileFound=这个目录没保存有文档
+NoFileFound=No documents uploaded
 CurrentUserLanguage=当前语言
 CurrentTheme=当前主题样式
 CurrentMenuManager=当前菜单管理器
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=删除字符串'%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=直接下载链接（公共/外部）
-DirectDownloadInternalLink=直接下载链接（需要登录且需要权限）
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=下载
 DownloadDocument=下载文件
 ActualizeCurrency=更新货币汇率
@@ -1013,6 +1018,7 @@ SearchIntoContacts=联系人
 SearchIntoMembers=会员
 SearchIntoUsers=用户
 SearchIntoProductsOrServices=产品或服务
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=项目
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=任务
@@ -1049,12 +1055,13 @@ KeyboardShortcut=快捷键
 AssignedTo=分配给
 Deletedraft=删除草稿
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=文件通过链接共享
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=库存
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/zh_CN/margins.lang b/htdocs/langs/zh_CN/margins.lang
index 29da0d1f5b6..3de77342399 100644
--- a/htdocs/langs/zh_CN/margins.lang
+++ b/htdocs/langs/zh_CN/margins.lang
@@ -15,30 +15,31 @@ margesSetup=盈利利润管理设置
 MarginDetails=利润明细
 ProductMargins=产品利润
 CustomerMargins=客户利润
-SalesRepresentativeMargins=Sales representative margins
+SalesRepresentativeMargins=销售代表利润率
+ContactOfInvoice=Contact of invoice
 UserMargins=用户利润
 ProductService=产品或服务
 AllProducts=全部产品和服务
 ChooseProduct/Service=选择产品或服务
 ForceBuyingPriceIfNull=如期尚未定义则强制设定买入/成本价格为销售价格
-ForceBuyingPriceIfNullDetails=如果未定义买入/成本价格, 这个选项 "ON", 显示为零 (即买入/成本价格 = 销售价格), 除些之外 ("OFF"), 显示建议的默认值.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=全局纯利润计算方法
 UseDiscountAsProduct=作为产品
 UseDiscountAsService=作为服务
 UseDiscountOnTotal=在小计
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best vendor price
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=定义全局折扣是被视为产品，服务还是仅作为保证金计算的小计。
+MARGIN_TYPE=默认情况下建议的购买/成本价格用于保证金计算
+MargeType1=最佳供应商价格的保证金
 MargeType2=加权平均价差 (WAP)
 MargeType3=成本价格保证金
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=成本价
 UnitCharges=费用单位
 Charges=费用
 AgentContactType=商业代理联络类型
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
 rateMustBeNumeric=税率必须为数字值
 markRateShouldBeLesserThan100=Mark rate 将低于 100
 ShowMarginInfos=显示利润信息
 CheckMargins=利润明细
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 464a3eff1ce..b9dfc7beb43 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=准会员 (待验证)列表
 MembersListValid=有效人员名录
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=解雇会员列表
 MembersListQualified=合格会员列表
 MenuMembersToValidate=待定会员
 MenuMembersValidated=认证会员
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=解雇会员
 MembersWithSubscriptionToReceive=接受订阅会员
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=订阅已过期
 MemberStatusActiveLateShort=过期
 MemberStatusPaid=认购最新
 MemberStatusPaidShort=截至日期
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=终止的成员
 MemberStatusResiliatedShort=终止
 MembersStatusToValid=待定会员
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=解雇会员
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=批准
@@ -82,6 +87,8 @@ Physical=普通会员
 Moral=荣誉会员
 MorAndPhy=Moral and Physical
 Reenable=重新启用
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=终止会员
 ConfirmResiliateMember=您确定要终止此会员吗？
 DeleteMember=删除会员
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=标签纸的格式
 DescADHERENT_ETIQUETTE_TEXT=文本打印会员地址表
@@ -162,6 +170,7 @@ DocForLabels=生成地址表
 SubscriptionPayment=认购款项
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=按国别统计人员
 MembersStatisticsByState=成员由州/省的统计信息
 MembersStatisticsByTown=按村镇统计人员
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index 520c9966786..d89035568f3 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index 5280f9748e6..16f4506f62f 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -16,6 +16,8 @@ ToOrder=订单填写
 MakeOrder=订单填写
 SupplierOrder=采购订单
 SuppliersOrders=采购订单
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=当前采购订单
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
@@ -141,11 +143,12 @@ OrderByEMail=电子邮件
 OrderByWWW=在线
 OrderByPhone=电话
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=一份简单的订购模式
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=计费订单
+CreateInvoiceForThisSupplier=计费订单
 NoOrdersToInvoice=没有订单账单
 CloseProcessedOrdersAutomatically=归类所有“已处理”的订单。
 OrderCreation=创建订单
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 8a671ff8156..4169d86762f 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=公司有多项活动（所有主要模块）
 CreatedBy=创建者 %s
 ModifiedBy=修改者 %s
 ValidatedBy=由%验证s
+SignedBy=Signed by %s
 ClosedBy=由%闭s
 CreatedById=创建的用户ID号
 ModifiedById=最近变更的用户ID号
@@ -244,6 +245,7 @@ NewKeyIs=你的新登陆码如上
 NewKeyWillBe=你的新登陆码将会是
 ClickHereToGoTo=点击这里 %s
 YouMustClickToChange=你要先点击下面的链接来验证密码改变
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=如果不想改密码，直接忽略这个邮件，你的密码将保持原样。
 IfAmountHigherThan=如果数额高于 <strong>%s</strong>
 SourcesRepository=源库
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
index fccb54d3730..76c192781be 100644
--- a/htdocs/langs/zh_CN/productbatch.lang
+++ b/htdocs/langs/zh_CN/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=使用批号/序列号
-ProductStatusOnBatch=是 (必须使用批号/序列号)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=否 (不使用批号/序列号)
-ProductStatusOnBatchShort=是
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=否
 Batch=批号/序列号
 atleast1batchfield=保质期或销售日期或批号/序列号
@@ -16,9 +18,18 @@ printEatby=食用日期: %s
 printSellby=销售日期: %s
 printQty=数量: %d
 AddDispatchBatchLine=添加一个用于货架寿命调度
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=当模块批/序列打开时，自动库存减少被强制为“减少运输验证时的实际库存”，并且自动增加模式被强制为“在手动调度到仓库时增加实际库存”并且无法编辑。可以根据需要定义其他选项。
 ProductDoesNotUseBatchSerial=此产品不使用批号/序列号
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
+ProductLotSetup=模块批次/序列的设置
+ShowCurrentStockOfLot=显示成对产品/批次的当前库存
+ShowLogOfMovementIfLot=显示成对产品/批次的动作日志
+StockDetailPerBatch=每批库存详细信息
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 71ff5981d18..e6f7f593ce6 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=预定产品/服务到销售
@@ -313,7 +314,7 @@ LastUpdated=最新更新
 CorrectlyUpdated=当前更新
 PropalMergePdfProductActualFile=文件添加到 PDF Azur are/is
 PropalMergePdfProductChooseFile=选择PDF文件
-IncludingProductWithTag=包括产品/服务标签
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=默认价格，实际价格可能取决于客户
 WarningSelectOneDocument=请至少选择一个文档
 DefaultUnitToShow=单位
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 29454990c0b..d29983a9419 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=任务列表
 GoToListOfTimeConsumed=转到消耗的时间列表
 GanttView=甘特视图
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/zh_CN/propal.lang b/htdocs/langs/zh_CN/propal.lang
index 79d10f5e2ba..1937967bd03 100644
--- a/htdocs/langs/zh_CN/propal.lang
+++ b/htdocs/langs/zh_CN/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=通过电邮发送报价单
 DatePropal=报价日期
 DateEndPropal=有效期截止至
 ValidityDuration=有效时间
-CloseAs=设置状态
 SetAcceptedRefused=设定接受/拒绝
 ErrorPropalNotFound=未发现报价单 %s
 AddToDraftProposals=添加至报价草稿
@@ -60,6 +59,7 @@ ConfirmClonePropal=您确定要克隆商业提案<b> %s </b>吗？
 ConfirmReOpenProp=您确定要打开商业提案<b> %s </b>吗？
 ProposalsAndProposalsLines=报价单和报价项目
 ProposalLine=报价项目
+ProposalLines=Proposal lines
 AvailabilityPeriod=交货延迟期
 SetAvailability=设置交货延迟期
 AfterOrder=下单后
@@ -85,7 +85,8 @@ ProposalCustomerSignature=书面接受,公司盖章,日期和签名
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
-IdProposal=提案编号
-IdProduct=产品编号
-PrParentLine=提案父行
-LineBuyPriceHT=购买价格扣除税额
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 8f79f6ef131..979d0a66d28 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -19,8 +19,8 @@ Stock=库存
 Stocks=库存
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=按库存批号/序列号
 LotSerial=批号/序列号
 LotSerialList=批号/序列号列表
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=位置
-LocationSummary=位置简称
-NumberOfDifferentProducts=不同的产品数
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=产品总数
 LastMovement=最新移库
 LastMovements=最新移库
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=仓库价值
 UserWarehouseAutoCreate=创建用户时自动创建用户仓库
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=虚拟库存
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=编号仓库
 DescWareHouse=说明仓库
 LieuWareHouse=本地化仓库
 WarehousesAndProducts=仓库和产品
 WarehousesAndProductsBatchDetail=仓库和产品(各批号/序列号详情)
 AverageUnitPricePMPShort=加权平均价格
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=销售单价
 EstimatedStockValueSellShort=销量
 EstimatedStockValueSell=销量
@@ -145,7 +147,7 @@ Replenishments=补充资金
 NbOfProductBeforePeriod=产品数量%s选定期前库存（<%s）
 NbOfProductAfterPeriod=选定期限后产品数量%s（> %s）
 MassMovement=批量库存调拨
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=记录转移
 ReceivingForSameOrder=此订单的收据
 StockMovementRecorded=库存调拨已记录
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=调拨标签
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=行动日期
 InventoryCode=调拨或盘点编码
 IsInPackage=包含在模块包
@@ -183,6 +185,7 @@ inventoryCreatePermission=创建新库存
 inventoryReadPermission=查看库存
 inventoryWritePermission=更新库存
 inventoryValidatePermission=验证库存
+inventoryDeletePermission=Delete inventory
 inventoryTitle=库存
 inventoryListTitle=存货
 inventoryListEmpty=没有库存正在进行中
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=重新打开
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index 0c96e366e26..b53b51c3e06 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=供应商
 SuppliersInvoice=供应商发票
+SupplierInvoices=供应商发票
 ShowSupplierInvoice=显示供应商发票
 NewSupplier=新供应商
 History=历史
diff --git a/htdocs/langs/zh_CN/ticket.lang b/htdocs/langs/zh_CN/ticket.lang
index 4cd03733e48..9546af9bd17 100644
--- a/htdocs/langs/zh_CN/ticket.lang
+++ b/htdocs/langs/zh_CN/ticket.lang
@@ -70,6 +70,8 @@ Deleted=删除
 # Dict
 Type=类型
 Severity=严重
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=从票证消息发送电子邮件
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=在公共界面中显示模块的徽标
 TicketsShowModuleLogoHelp=启用此选项可在公共界面的页面中隐藏徽标模块
 TicketsShowCompanyLogo=在公共界面中显示公司的徽标
 TicketsShowCompanyLogoHelp=启用此选项可在公共界面的页面中隐藏主公司的徽标
-TicketsEmailAlsoSendToMainAddress=同时向主电子邮件地址发送通知
-TicketsEmailAlsoSendToMainAddressHelp=启用此选项可向“通知电子邮件地址”发送电子邮件（请参阅下面的设置）
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=仅显示分配给当前用户的票证。不适用于具有票证管理权限的用户。
 TicketsActivatePublicInterface=激活公共接口
@@ -126,10 +128,10 @@ TicketNumberingModules=票据编号模块
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=最新修改的票据
 BoxLastModifiedTicketDescription=最新%s改装票据
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=没有最近修改的票据
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index a1b638ec1dd..eac36116632 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=从组中删除
 PasswordChangedAndSentTo=密码更改，发送到<b>%s。</b>
 PasswordChangeRequest=请求更改<b> %s </b>的密码
 PasswordChangeRequestSent=要求更改密码<b>的S%</b>发送到<b>%s。</b>
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=确认密码重置
 MenuUsersAndGroups=用户和组
 LastGroupsCreated=最新创建的%s组
@@ -70,9 +72,10 @@ ExportDataset_user_1=用户及属性
 DomainUser=域用户%s
 Reactivate=重新激活
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=因为从权限授予一个用户的一组继承。
 Inherited=遗传
+UserWillBe=Created user will be
 UserWillBeInternalUser=创建的用户将是一个内部用户(因为没有联系到一个特定的合伙人)
 UserWillBeExternalUser=创建的用户将是外部用户(因为链接到一个特定的合伙人)
 IdPhoneCaller=手机来电者身份
@@ -109,8 +112,10 @@ UserAccountancyCode=用户科目代码
 UserLogoff=用户注销
 UserLogged=用户登录
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index 2b160b7e674..30e49125fe1 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=还要检查虚拟主机是否有权限<strong> %s </strong>将文件转换为<br> <strong> %s </strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=阅读
 WritePerm=写
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>在新标签页中预览%s。</u> <br> <br> %s将由外部Web服务器（如Apache，Nginx，IIS）提供服务。您必须先安装并设置此服务器才能指向目录：<br> <strong> %s </strong> <br>外部服务器提供的URL：<br> <strong> %s </strong>
-PreviewSiteServedByDolibarr=<u>在新选项卡中预览%s。</u> <br> <br> %s将由Dolibarr服务器提供服务，因此不需要安装任何额外的Web服务器（如Apache，Nginx，IIS）。 <br>不方便的是，页面的URL不是用户友好的，并且以Dolibarr的路径开头。<br> Dolibarr提供的URL：<br> <strong> %s </strong> <br> <br>使用您自己的外部Web服务器为此Web站点提供服务，在Web服务器上创建指向目录的虚拟主机<br> <strong> %s </strong> <br>然后输入此虚拟服务器的名称并单击其他预览按钮。
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=未定义外部Web服务器所服务的虚拟主机的URL
 NoPageYet=还没有页面
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/zh_CN/zapier.lang b/htdocs/langs/zh_CN/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/zh_CN/zapier.lang
+++ b/htdocs/langs/zh_CN/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/zh_HK/accountancy.lang b/htdocs/langs/zh_HK/accountancy.lang
index 9e084932477..786f0194010 100644
--- a/htdocs/langs/zh_HK/accountancy.lang
+++ b/htdocs/langs/zh_HK/accountancy.lang
@@ -131,7 +131,7 @@ InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
 IntoAccount=Bind line with the accounting account
-TotalForAccount=Total for accounting account
+TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
@@ -209,7 +209,7 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index f9a6468d94a..8f4508ada53 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
@@ -62,6 +63,7 @@ IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
+PHPSetup=PHP setup
 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
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -232,6 +234,7 @@ BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
 ActiveOn=Activated on
+ActivatableOn=Activatable on
 SourceFile=Source file
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
@@ -347,9 +350,10 @@ 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 menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -541,6 +545,8 @@ Module40Name=Vendors
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module43Name=Debug Bar
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3400Name=Social Networks
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Human resources management (management of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=Websites
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
 Module20000Name=Leave Request Management
@@ -805,7 +813,8 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -1175,7 +1184,8 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
-LogEvents=Security audit events
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Audit
 InfoDolibarr=About Dolibarr
 InfoBrowser=About Browser
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 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 sequential with no reset
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=Proxy server: Name/Address
 MAIN_PROXY_PORT=Proxy server: Port
 MAIN_PROXY_USER=Proxy server: Login/User
 MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Search filter
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Full name
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
+SecurityKey = Security Key
 PastDelayVCalExport=Do not export event older than
 AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1982,7 +1995,7 @@ SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
@@ -2049,8 +2062,11 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
@@ -2089,9 +2107,18 @@ SwitchThisForABetterSecurity=Switching this value to %s is recommended for more
 DictionaryProductNature= Nature of product
 CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/zh_HK/banks.lang b/htdocs/langs/zh_HK/banks.lang
index 81a23238550..8e2d828c12a 100644
--- a/htdocs/langs/zh_HK/banks.lang
+++ b/htdocs/langs/zh_HK/banks.lang
@@ -174,10 +174,11 @@ YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
 CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/zh_HK/bills.lang b/htdocs/langs/zh_HK/bills.lang
index d5d418affc6..c0eb886a987 100644
--- a/htdocs/langs/zh_HK/bills.lang
+++ b/htdocs/langs/zh_HK/bills.lang
@@ -52,11 +52,12 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
+CustomersInvoices=Customer invoices
 SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Vendor invoices
+SupplierInvoiceLines=Vendor invoice lines
 SupplierBill=Vendor invoice
-SupplierBills=suppliers invoices
+SupplierBills=Vendor invoices
 Payment=Payment
 PaymentBack=Refund
 CustomerInvoicePaymentBack=Refund
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
 PaymentMode=Payment Type
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -373,6 +376,7 @@ DateLastGeneration=Date of latest generation
 DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=Number of generation done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -494,12 +498,16 @@ Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
+CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
 ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -512,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number 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
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -531,6 +539,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
 InvoiceSituation=Situation invoice
+PDFInvoiceSituation=Situation invoice
 InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
@@ -561,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
+BillCreated=%s invoice(s) generated
+BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Do not generate document file
 AutogenerateDoc=Auto generate document file
@@ -575,3 +585,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/zh_HK/boxes.lang b/htdocs/langs/zh_HK/boxes.lang
index 9a751483fb1..4d7ee938c91 100644
--- a/htdocs/langs/zh_HK/boxes.lang
+++ b/htdocs/langs/zh_HK/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Statistics on main business objects in database
 BoxLoginInformation=Login Information
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -17,9 +18,13 @@ BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
 BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
-AccountancyHome=Accountancy
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects
diff --git a/htdocs/langs/zh_HK/categories.lang b/htdocs/langs/zh_HK/categories.lang
index 4ddf0d6093f..9520ef65a83 100644
--- a/htdocs/langs/zh_HK/categories.lang
+++ b/htdocs/langs/zh_HK/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=Vendors tags/categories area
 CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assign category to supplier
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/zh_HK/companies.lang b/htdocs/langs/zh_HK/companies.lang
index 8dc815b522e..154400c6536 100644
--- a/htdocs/langs/zh_HK/companies.lang
+++ b/htdocs/langs/zh_HK/companies.lang
@@ -43,9 +43,10 @@ Individual=Private individual
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=EORI number
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -441,7 +449,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
diff --git a/htdocs/langs/zh_HK/compta.lang b/htdocs/langs/zh_HK/compta.lang
index 1afeb6e3727..926cda53c9f 100644
--- a/htdocs/langs/zh_HK/compta.lang
+++ b/htdocs/langs/zh_HK/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=VAT collected
 StatusToPay=To pay
 SpecialExpensesArea=Area for all special payments
+VATExpensesArea=Area for all TVA payments
 SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
+VATDeclarations=VAT declarations
+VATDeclaration=VAT declaration
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -134,9 +138,17 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+PaySalary=Pay a salary card
+ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
+ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
+ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+DeleteSalary=Delete a salary card
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -163,6 +175,7 @@ RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT
 RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
 RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
@@ -183,6 +196,7 @@ VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 ByProductsAndServices=By product and service
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax
+ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +269,8 @@ AccountingAffectation=Accounting assignment
 LastDayTaxIsRelatedTo=Last day of period the tax is related to
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=Purchase turnover collected
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
diff --git a/htdocs/langs/zh_HK/ecm.lang b/htdocs/langs/zh_HK/ecm.lang
index 71df60734fb..c4ea8018111 100644
--- a/htdocs/langs/zh_HK/ecm.lang
+++ b/htdocs/langs/zh_HK/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index 5b26be724d9..e71c805d506 100644
--- a/htdocs/langs/zh_HK/errors.lang
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
 ErrorDirAlreadyExists=A directory with this name already exists.
 ErrorFileAlreadyExists=A file with this name already exists.
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
 ErrorNoTmpDir=Temporary directy %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/zh_HK/externalsite.lang b/htdocs/langs/zh_HK/externalsite.lang
index da4853df0df..452100c65b3 100644
--- a/htdocs/langs/zh_HK/externalsite.lang
+++ b/htdocs/langs/zh_HK/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
 ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang
index f8ba6f4073c..dc2a83f2015 100644
--- a/htdocs/langs/zh_HK/main.lang
+++ b/htdocs/langs/zh_HK/main.lang
@@ -278,6 +278,7 @@ DateModificationShort=Modif. date
 IPModification=Modification IP
 DateLastModification=Latest modification date
 DateValidation=Validation date
+DateSigning=Signing date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -389,6 +390,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
@@ -724,7 +727,7 @@ MenuMembers=Members
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
+NoFileFound=No documents uploaded
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
 CurrentMenuManager=Current menu manager
@@ -899,8 +902,10 @@ ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
@@ -1013,6 +1018,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=Projects
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Tasks
@@ -1049,12 +1055,13 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
 AnalyticCode=Analytic code
 TMenuMRP=MRP
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
@@ -1120,3 +1127,5 @@ AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/zh_HK/margins.lang b/htdocs/langs/zh_HK/margins.lang
index 76ea8ad5c4d..ad5406409b4 100644
--- a/htdocs/langs/zh_HK/margins.lang
+++ b/htdocs/langs/zh_HK/margins.lang
@@ -22,7 +22,7 @@ ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
diff --git a/htdocs/langs/zh_HK/members.lang b/htdocs/langs/zh_HK/members.lang
index 5812248b129..44b583a0041 100644
--- a/htdocs/langs/zh_HK/members.lang
+++ b/htdocs/langs/zh_HK/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
 MembersListUpToDate=List of valid members with up-to-date subscription
 MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
 MemberStatusNoSubscription=Validated (no subscription needed)
 MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
 Moral=Moral
 MorAndPhy=Moral and Physical
 Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send emai
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -162,6 +170,7 @@ DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
+LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
diff --git a/htdocs/langs/zh_HK/modulebuilder.lang b/htdocs/langs/zh_HK/modulebuilder.lang
index 845dd12624d..19afb9d95ab 100644
--- a/htdocs/langs/zh_HK/modulebuilder.lang
+++ b/htdocs/langs/zh_HK/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/zh_HK/orders.lang b/htdocs/langs/zh_HK/orders.lang
index ad91e1eef63..87d196eb22f 100644
--- a/htdocs/langs/zh_HK/orders.lang
+++ b/htdocs/langs/zh_HK/orders.lang
@@ -16,6 +16,8 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
 CustomersOrders=Sales Orders
diff --git a/htdocs/langs/zh_HK/other.lang b/htdocs/langs/zh_HK/other.lang
index 7a895bb1ca5..0e76e493b5a 100644
--- a/htdocs/langs/zh_HK/other.lang
+++ b/htdocs/langs/zh_HK/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
+SignedBy=Signed by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
 ModifiedById=User id who made latest change
@@ -244,6 +245,7 @@ NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
 YouMustClickToChange=You must however first click on the following link to validate this password change
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
diff --git a/htdocs/langs/zh_HK/productbatch.lang b/htdocs/langs/zh_HK/productbatch.lang
index 54270c4a23b..4414b6ad8d8 100644
--- a/htdocs/langs/zh_HK/productbatch.lang
+++ b/htdocs/langs/zh_HK/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
@@ -22,3 +24,12 @@ ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
 StockDetailPerBatch=Stock detail per lot
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index 9ecc11ed93d..28853762424 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
+PredefinedItem=Predefined item
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -313,7 +314,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
diff --git a/htdocs/langs/zh_HK/projects.lang b/htdocs/langs/zh_HK/projects.lang
index 05aa1f5a560..d14e52d14e8 100644
--- a/htdocs/langs/zh_HK/projects.lang
+++ b/htdocs/langs/zh_HK/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
 ListInvoicesAssociatedProject=List of customer invoices related to the project
@@ -268,3 +269,7 @@ OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/zh_HK/propal.lang b/htdocs/langs/zh_HK/propal.lang
index 273996ab1b1..edbc08236d3 100644
--- a/htdocs/langs/zh_HK/propal.lang
+++ b/htdocs/langs/zh_HK/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -60,6 +59,7 @@ ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s<
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+ProposalLines=Proposal lines
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
@@ -85,3 +85,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/zh_HK/stocks.lang b/htdocs/langs/zh_HK/stocks.lang
index a1f55010139..9a14fb38eb1 100644
--- a/htdocs/langs/zh_HK/stocks.lang
+++ b/htdocs/langs/zh_HK/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
 StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -37,8 +37,8 @@ AllWarehouses=All warehouses
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Total number of products
 LastMovement=Latest movement
 LastMovements=Latest movements
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -97,15 +98,16 @@ RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
 VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=At date
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
 AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -145,7 +147,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -183,6 +185,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
+inventoryDeletePermission=Delete inventory
 inventoryTitle=Inventory
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to us
 ForceTo=Force to
 AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=Import CSV list of movement
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+SelectAStockMovementFileToImport=select a stock movement file to import
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=Inventory %s
+ReOpen=Reopen
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/zh_HK/suppliers.lang b/htdocs/langs/zh_HK/suppliers.lang
index 03b03c75269..ca9ee174d29 100644
--- a/htdocs/langs/zh_HK/suppliers.lang
+++ b/htdocs/langs/zh_HK/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
+SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=History
diff --git a/htdocs/langs/zh_HK/ticket.lang b/htdocs/langs/zh_HK/ticket.lang
index 982fff90ffa..df73daf4a0d 100644
--- a/htdocs/langs/zh_HK/ticket.lang
+++ b/htdocs/langs/zh_HK/ticket.lang
@@ -70,6 +70,8 @@ Deleted=Deleted
 # Dict
 Type=Type
 Severity=Severity
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=To send email from ticket message
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface
 TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
 TicketsShowCompanyLogo=Display the logo of the company in the public interface
 TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
 TicketsActivatePublicInterface=Activate public interface
@@ -126,10 +128,10 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Notify third party at creation
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/zh_HK/users.lang b/htdocs/langs/zh_HK/users.lang
index 25d9205457b..bbfa16450b0 100644
--- a/htdocs/langs/zh_HK/users.lang
+++ b/htdocs/langs/zh_HK/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -70,9 +72,10 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
@@ -109,8 +112,10 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
-DateEmployment=Employment Start Date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/zh_HK/website.lang b/htdocs/langs/zh_HK/website.lang
index f17def114b8..7d624915ef0 100644
--- a/htdocs/langs/zh_HK/website.lang
+++ b/htdocs/langs/zh_HK/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
@@ -137,3 +137,11 @@ PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
 DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/zh_HK/zapier.lang b/htdocs/langs/zh_HK/zapier.lang
index bbad7895588..b4cc4ccba4a 100644
--- a/htdocs/langs/zh_HK/zapier.lang
+++ b/htdocs/langs/zh_HK/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
 ZapierDescription=Interface with Zapier
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 3b4947efd9a..dea0a0036fa 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -16,18 +16,18 @@ ThisService=此服務
 ThisProduct=此產品
 DefaultForService=服務的預設
 DefaultForProduct=產品的預設
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=此合作方的產品
+ServiceForThisThirdparty=此合作方的服務
 CantSuggest=無法建議
 AccountancySetupDoneFromAccountancyMenu=從%s選單的大部分會計設定已完成
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=記帳模組的組態（重複輸入）
 Journalization=註冊到日記帳
 Journals=日記帳
 JournalFinancial=財務日記帳
 BackToChartofaccounts=回到會計科目表
 Chartofaccounts=會計科目表
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfSubaccounts=個人帳戶圖表
+ChartOfIndividualAccountsOfSubsidiaryLedger=子分類帳的個人帳戶圖表
 CurrentDedicatedAccountingAccount=目前的專用帳戶
 AssignDedicatedAccountingAccount=新帳戶指派給
 InvoiceLabel=發票標籤
@@ -37,8 +37,8 @@ OtherInfo=其他資訊
 DeleteCptCategory=從群組移除會計帳戶
 ConfirmDeleteCptCategory=您確定要從會計帳戶組中刪除此會計帳戶嗎？
 JournalizationInLedgerStatus=日誌狀態
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
+AlreadyInGeneralLedger=已經轉移到會計日記帳和分類帳中
+NotYetInGeneralLedger=尚未轉移到結帳日記帳和分類帳中
 GroupIsEmptyCheckSetup=群組是空的，檢查個人化會計群組的設定
 DetailByAccount=依帳戶顯示細節
 AccountWithNonZeroValues=非零值的帳戶
@@ -47,10 +47,10 @@ CountriesInEEC=歐盟國家
 CountriesNotInEEC=非歐盟國家
 CountriesInEECExceptMe=除了%s以外的歐盟國家
 CountriesExceptMe=除了%s以外的所有國家
-AccountantFiles=Export source documents
+AccountantFiles=匯出來源文件
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
-VueBySubAccountAccounting=View by accounting subaccount
+VueByAccountAccounting=依會計科目檢視
+VueBySubAccountAccounting=依會計子分類帳檢視
 
 MainAccountForCustomersNotDefined=在設定中客戶的主要會計帳戶尚未定義
 MainAccountForSuppliersNotDefined=在設定中供應商的主要會計帳戶尚未定義
@@ -96,8 +96,8 @@ SubledgerAccount=子帳帳戶
 SubledgerAccountLabel=子帳帳戶標籤
 ShowAccountingAccount=顯示會計項目
 ShowAccountingJournal=顯示會計日記帳
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=在分類帳中顯示會計科目
+ShowAccountingAccountInJournals=在日記帳中顯示會計科目
 AccountAccountingSuggest=建議的會計項目
 MenuDefaultAccounts=預設會計項目
 MenuBankAccounts=銀行帳戶
@@ -121,7 +121,7 @@ UpdateMvts=交易的修改
 ValidTransaction=驗證交易
 WriteBookKeeping=Register transactions in accounting
 Bookkeeping=總帳
-BookkeepingSubAccount=Subledger
+BookkeepingSubAccount=子分類帳
 AccountBalance=帳戶餘額
 ObjectsRef=參考的來源物件
 CAHTF=稅前總採購供應商
@@ -131,7 +131,7 @@ InvoiceLinesDone=已關聯的各式發票
 ExpenseReportLines=費用報表關聯數
 ExpenseReportLinesDone=已關連的費用報表
 IntoAccount=會計項目的關聯
-TotalForAccount=會計科目總計
+TotalForAccount=Total accounting account
 
 
 Ventilate=關聯
@@ -201,7 +201,7 @@ Docdate=日期
 Docref=參考
 LabelAccount=標籤帳戶
 LabelOperation=標籤操作
-Sens=Direction
+Sens=方向
 AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=字元編碼
 Lettering=字元
@@ -209,7 +209,7 @@ Codejournal=日記帳
 JournalLabel=日記帳標籤
 NumPiece=件數
 TransactionNumShort=交易編號
-AccountingCategory=個人化群組
+AccountingCategory=Custom group
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=您可定義某些會計科目大類。他們可以在個人化會計報表中使用。
@@ -253,7 +253,7 @@ PaymentsNotLinkedToProduct=付款未連結到任何產品/服務
 OpeningBalance=初期餘額
 ShowOpeningBalance=顯示初期餘額
 HideOpeningBalance=隱藏初期餘額
-ShowSubtotalByGroup=Show subtotal by level
+ShowSubtotalByGroup=依級別顯示小計
 
 Pcgtype=會計項目大類
 PcgtypeDesc=用作某些會計報告的預定義“過濾器”和“分組”標準的科目組。例如“ INCOME”或“ EXPENSE”用作產品的會計科目組，以建立費用/收入報告。
@@ -276,11 +276,11 @@ DescVentilExpenseReport=在此查閱費用報表行數是否關聯到費用會
 DescVentilExpenseReportMore=如果您在費用報告類型上設定會計帳戶，則應用程序將能夠在費用報告和會計科目表的會計帳戶之間進行所有綁定，只需點擊按鈕<strong>“ %s”即可</strong> 。如果未在費用字典中設定帳戶，或者您仍有某些行未綁定到任何帳戶，則必須從選單“ <strong>%s</strong> ”進行手動綁定。
 DescVentilDoneExpenseReport=在此查閱費用報表的清單及其費用會計項目。
 
-Closure=Annual closure
+Closure=年度關閉
 DescClosure=請在此處查詢依照月份的未經驗證活動數和已經開放的會計年度
 OverviewOfMovementsNotValidated=第1步/未驗證移動總覽。 （需要關閉一個會計年度）
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
+AllMovementsWereRecordedAsValidated=所有動作均記錄為已驗證
+NotAllMovementsCouldBeRecordedAsValidated=並非所有動作都可以記錄為已驗證
 ValidateMovements=驗證動作
 DescValidateMovements=禁止修改，刪除任何文字內容。所有條目都必須經過驗證，否則將無法結案
 
@@ -303,7 +303,7 @@ NotReconciled=未對帳
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=綁定選項
 ApplyMassCategories=套用大量分類
 AddAccountFromBookKeepingWithNoCategories=個性化組中尚未有可用帳戶
 CategoryDeleted=會計項目的類別已移除
@@ -402,7 +402,29 @@ UseMenuToSetBindindManualy=尚未綁定的行，請使用選單<a href="%s">%s</
 
 ## Import
 ImportAccountingEntries=會計條目
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
 DateExport=日期輸出
 WarningReportNotReliable=警告，此報表非依總帳製作的，所以不含總帳中人工修改的交易。若您日記簿是最新的日期，則記帳檢視會比較準確。
 ExpenseReportJournal=費用報表日記帳
 InventoryJournal=庫存日記帳
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 3d26c53e461..83ad22dd2f6 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -37,6 +37,7 @@ UnlockNewSessions=移除連線鎖定
 YourSession=您的程序
 Sessions=用戶程序
 WebUserGroup=網頁伺服器用戶/組別
+PermissionsOnFiles=Permissions on files
 PermissionsOnFilesInWebRoot=網站根目錄中檔案的權限
 PermissionsOnFile=檔案%s的權限
 NoSessionFound=您的PHP設定似乎不允許列出活動程序。用於保存程序的資料夾（ <b>%s</b> ）可能受到保護（例如，通過OS權限或PHP指令open_basedir）。
@@ -62,6 +63,7 @@ IfModuleEnabled=註：若模組<b>%s</b>啓用時，「是的」有效。
 RemoveLock=如果存在<b>%s</b>檔案,刪除/重新命名文件以允許使用更新/安裝工具。
 RestoreLock=還原檔案唯讀權限檔案<b>%s</b> ，以禁止使用更新/安裝工具。
 SecuritySetup=安全設定
+PHPSetup=PHP setup
 SecurityFilesDesc=在此定義上傳檔案相關的安全設定。
 ErrorModuleRequirePHPVersion=錯誤，這個模組需要的PHP版本是 %s 或更高版本
 ErrorModuleRequireDolibarrVersion=錯誤，這個模組需要 Dolibarr 版本 %s 或更高版本
@@ -154,7 +156,7 @@ SystemToolsAreaDesc=此區域提供管理功能。使用選單選擇所需的功
 Purge=清除
 PurgeAreaDesc=此頁面允許您刪除Dolibarr產生或儲存的所有文件（暫存檔案或<b>%s</b>目錄中的所有文件）。通常不需要使用此功能。此功能提供無權限刪除Web服務器產生之文件的Dolibarr用戶提供了一種解決方法。
 PurgeDeleteLogFile=刪除 log 檔案，包含Syslog 模組的 <b>%s</b> (沒有遺失資料風險)
-PurgeDeleteTemporaryFiles=刪除所有紀錄與暫存檔案（沒有丟失資料的風險）。注意：僅對於24小時前於temp資料夾已建立的檔案才執行刪除操作。
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
 PurgeDeleteTemporaryFilesShort=刪除紀錄和暫存檔案
 PurgeDeleteAllFilesInDocumentsDir=刪除資料夾中的所有檔案： <b>%s</b> 。 <br>這將刪除所有與元件（合作方，發票等）相關的所有產生文件，上傳到ECM模組中的檔案，資料庫備份轉存和臨時文件。
 PurgeRunNow=立即清除
@@ -232,6 +234,7 @@ BoxesAvailable=可用小工具
 BoxesActivated=小工具已啟用
 ActivateOn=啟用
 ActiveOn=已啟用
+ActivatableOn=Activatable on
 SourceFile=來源檔案
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=僅當 JavaScript 不是停用時可用
 Required=必須
@@ -256,7 +259,7 @@ OfficialWebHostingService=可參考的網站主機服務 (雲端主機)
 ReferencedPreferredPartners=首選合作夥伴
 OtherResources=其他資源
 ExternalResources=外部資源
-SocialNetworks=社交網路
+SocialNetworks=社群網路
 SocialNetworkId=社群網路 ID
 ForDocumentationSeeWiki=有關用戶或開發人員的文件（文件，常見問題...), <br>可在Dolibarr維基查閱： <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=有關任何其他問題/幫助，您可以使用Dolibarr論壇： <br> <a href="%s" target="_blank"><b>%s</b></a>
@@ -347,9 +350,10 @@ LastActivationAuthor=最新啟動的作者
 LastActivationIP=最新啟動的 IP
 UpdateServerOffline=離線更新伺服器
 WithCounter=管理計數器
-GenericMaskCodes=您可以輸入任何編號遮罩。在此遮罩中，可以使用以下標籤： <br> <b>{000000}</b>對應一個數字，該數字將在每個%s上遞增。輸入與計數器所需長度一樣多的零。計數器將從左側的零開始補全，以便具有與遮罩一樣多的零。 <br> <b>{000000+000}</b>與上一個相同，但是從第一個%s開始應用與+號右邊的數字相對應的偏移量。 <br> <b>{000000 @ x}</b>與上一個相同，但是當到達月份x時，計數器會重置為零（x在1到12之間，或者為0以使用您配置中定義的會計年度的前幾個月，或者為99每月重置為零）。如果使用此選項並且x為2或更高，則還需要序列{yy} {mm}或{yyyy} {mm}。 <br> <b>{dd}</b>天（01到31）。 <br> <b>{mm}</b>月（01到12）。 <br> <b>{yy}</b> ， <b>{yyyy}</b>或<b>{y}</b>年超過2、4或1個數字。 <br>
-GenericMaskCodes2=<b>{cccc}</b>客戶端用n個字元的代碼 <br> <b>{cccc000}</b>在n個字元上的客戶代碼後跟一個專門為客戶提供的計數器。此專用於客戶的計數器與全域計數器在同一時間重置。 <br> <b>{tttt}</b>合作方類型用n個字元的代碼（請參閱選單 首頁-設定-分類-合作方類型）。如果增加此標籤，則每種類型的合作方的計數器都將不同。 <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=遮罩中的所有其他字元將保持不變。 <br>不允許使用空格。 <br>
+GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
 GenericMaskCodes4a=<u>在日期 2007-01-31 ,第99個%s合作方公司範例:</u><br>
 GenericMaskCodes4b=<u>位於2007-03-01 建立的合作方範例:</u><br>
 GenericMaskCodes4c=<u>位於2007-03-01 建立的產品範例:</u><br>
@@ -444,8 +448,8 @@ ExtrafieldParamHelpPassword=將欄位保留為空白表示該值將不加密地
 ExtrafieldParamHelpselect=數值清單必須為含有關鍵字的行,數值 (關鍵字不能為 '0')<br><br>例如： <br> 1，值1 <br> 2，值2 <br> code3，value3 <br> ... <br><br>為了使此清單取決於另一個互補屬性清單： <br> 1，value1 | options_ <i>parent_list_code</i> ：parent_key <br> 2，value2 | options_ <i>parent_list_code</i> ：parent_key <br><br>為了使清單取決於另一個清單： <br> 1，值1 | <i>parent_list_code</i> ：parent_key <br> 2，值2 | <i>parent_list_code</i> ：parent_key
 ExtrafieldParamHelpcheckbox=數值清單必須為含有關鍵字的行,數值 (關鍵字不能為 '0')<br><br>範例:<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=數值清單必須為含有關鍵字的行,數值 (關鍵字不能為 '0')<br><br>範例:<br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=表單中的數值清單<br>語法： table_name:label_field:id_field::filter<br>例如：: c_typent:libelle:id::filter<br><br>篩選可以是一個簡單的測試 (例如 啟動 =1 ) 只顯示啟動的數值<br>您也可以在篩選中使用 $ID$作為目前物件的ID<br>在篩選器中執行 SELECT 則使用 $SEL$<br>若您要在額外欄位篩選使用語法 extra.fieldcode=... (extra.fileldcode為欄位的代碼)<br><br>為使清單明細依賴於另一個補充屬性的清單：<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter<br><br>為使清單依賴於另一個補充屬性清單：<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=保持空白以使用簡單的分隔符號<br>對於折疊分隔符號，將此值設定為1（預設情況下，對於新程序打開，然後為每個用戶程序保留狀態） <br>將其設定為2可折疊分隔符號（預設情況下，新程序已折疊，然後在每個用戶程序中保持狀態）
 LibraryToBuildPDF=PDF產生器程式庫
@@ -505,7 +509,7 @@ GoIntoTranslationMenuToChangeThis=找到了帶有此代碼的密鑰的翻譯。
 WarningSettingSortOrder=警告，如果欄位是未知欄位，則在清單頁面上設定預設的排列順序可能會導致技術錯誤。如果遇到此類錯誤，請返回此頁面以刪除預設的排列順序並恢復預設行為。
 Field=欄位
 ProductDocumentTemplates=文件範例產生產品文件檔案
-FreeLegalTextOnExpenseReports=費用報告上的免費法律文字
+FreeLegalTextOnExpenseReports=費用報告上的自由法律文字
 WatermarkOnDraftExpenseReports=費用報告草稿上的浮水印
 AttachMainDocByDefault=若您要預設將主要文件附加到電子郵件(若適用的話)，此值設定為 1
 FilesAttachedToEmail=附加檔案
@@ -541,6 +545,8 @@ Module40Name=供應商
 Module40Desc=供應商和採購管理（採購訂單和供應商發票開票）
 Module42Name=除錯日誌
 Module42Desc=日誌記錄 (file, syslog, ...)。這些日誌是針對技術性以及除錯用途。
+Module43Name=除錯列
+Module43Desc=A tool for developper adding a debug bar in your browser.
 Module49Name=編輯器
 Module49Desc=編輯器管理
 Module50Name=產品
@@ -639,12 +645,14 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind轉換功能
 Module3200Name=不可改變的檔案
 Module3200Desc=啟用不可更改的商業事件日誌。事件是即時存檔的。日誌是可以匯出的鍊式事件的唯讀表格。在某些國家/地區，此模組可能是必需的。
+Module3400Name=社群網路
+Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=人資
 Module4000Desc=人力資源管理(部門、員工合約及感受的管理)
 Module5000Name=多重公司
 Module5000Desc=允許您管理多重公司
-Module6000Name=工作流程
-Module6000Desc=工作流程管理(自動建立項目和/或自動更改狀況)
+Module6000Name=Inter-modules Workflow
+Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
 Module10000Name=網站
 Module10000Desc=使用所見即所得編輯器建立網站（公共）。這是一個面向網站管理員或面向開發人員的CMS（最好了解HTML和CSS語言）。只需將您的Web伺服器（Apache，Nginx等）設定為指向專用的Dolibarr資料夾，即可使用您自己的網域名稱在Internet上連線。
 Module20000Name=休假申請管理
@@ -805,7 +813,8 @@ PermissionAdvanced253=建立/修改內部/外部用戶資訊和權限
 Permission254=只能建立/修改外部用戶資訊
 Permission255=修改其他用戶密碼
 Permission256=刪除或停用其他用戶
-Permission262=延伸存取全部合作方（不只是合作方的業務代表）。<br>對外部用戶無效（對提案建議書、訂單、發票、通訊錄等）。<br>對專案無效（僅在專案存取、顯示及指派事件的規則）
+Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=讀取 CA
 Permission272=讀取發票
 Permission273=發票問題
@@ -1018,7 +1027,7 @@ DictionaryFees=費用報告-費用報告行的類型
 DictionarySendingMethods=出貨方式
 DictionaryStaff=員工人數
 DictionaryAvailability=遲延交付
-DictionaryOrderMethods=下訂方法
+DictionaryOrderMethods=訂購方式
 DictionarySource=原始提案/建議書/訂單
 DictionaryAccountancyCategory=報告的個人化組別
 DictionaryAccountancysystem=會計科目表模型
@@ -1026,7 +1035,7 @@ DictionaryAccountancyJournal=會計日記帳
 DictionaryEMailTemplates=電子郵件範本
 DictionaryUnits=單位
 DictionaryMeasuringUnits=計算單位
-DictionarySocialNetworks=社會網路
+DictionarySocialNetworks=社群網路
 DictionaryProspectStatus=公司的潛在狀態
 DictionaryProspectContactStatus=聯絡人的潛在狀態
 DictionaryHolidayTypes=休假類型
@@ -1175,7 +1184,8 @@ SetupDescription2=以下兩個部分是必需的（“設定”選單中的前
 SetupDescription3= <a href="%s"> %s-> %s </a> <br> <br>用於自訂您的應用程式預設行為的基本參數（例如 跟國家相關的功能）。
 SetupDescription4= <a href="%s"> %s-> %s </a> <br> <br>此軟體是許多模組/應用程式的套件。必須啟用和配置與您的需求相關的模組。這些模組啟動後將會顯示在選單上。
 SetupDescription5=其他設定選單項目管理可選參數。
-LogEvents=安全稽核事件
+AuditedSecurityEvents=Security events that are audited
+NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=稽核
 InfoDolibarr=關於 Dolibarr
 InfoBrowser=關於瀏覽器
@@ -1243,7 +1253,7 @@ RunningUpdateProcessMayBeRequired=似乎需要執行升級（程式版本%s與
 YouMustRunCommandFromCommandLineAfterLoginToUser=用戶<b>%s</b>在登入終端機後您必須從命令列執行此命令，或您必須在命令列末增加 -W 選項以提供 <b>%s</b> 密碼。
 YourPHPDoesNotHaveSSLSupport=您的PHP中無法使用SSL功能
 DownloadMoreSkins=更多佈景主題下載
-SimpleNumRefModelDesc=返回格式為%syymm-nnnn的參考編號，其中yy是年，mm是月，nnnn是連續的，沒有重置
+SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=顯示帶有地址的專業ID
 ShowVATIntaInAddress=隱藏帶有地址的歐盟營業稅號
 TranslationUncomplete=部分翻譯
@@ -1261,7 +1271,7 @@ MAIN_PROXY_HOST=代理伺服器：名稱/地址
 MAIN_PROXY_PORT=代理伺服器：連接埠
 MAIN_PROXY_USER=代理伺服器：登入名稱/用戶
 MAIN_PROXY_PASS=代理伺服器：密碼
-DefineHereComplementaryAttributes=在此處定義您想要包括的任何其他/自定義屬性：%s
+DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
 ExtraFields=補充屬性
 ExtraFieldsLines=補充屬性(行)
 ExtraFieldsLinesRec=補充屬性 ( 範本發票行)
@@ -1505,6 +1515,7 @@ LDAPFieldLoginUnix=登入（Unix系統）
 LDAPFieldLoginExample=範例: uid
 LDAPFilterConnection=搜尋過濾器
 LDAPFilterConnectionExample=範例: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=登入 (samba, activedirectory)
 LDAPFieldLoginSambaExample=範例: samaccountname
 LDAPFieldFullname=全名
@@ -1736,9 +1747,11 @@ YourCompanyDoesNotUseVAT=您的公司尚未定義使用營業稅 ( 首頁 - 設
 AccountancyCode=會計代碼
 AccountancyCodeSell=銷售會計代碼
 AccountancyCodeBuy=採購會計代碼
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
 AgendaSetup=事件和應辦事項模組設定
 PasswordTogetVCalExport=授權匯出連結秘鑰
+SecurityKey = Security Key
 PastDelayVCalExport=不要匯出早於以下時間的事件
 AGENDA_USE_EVENT_TYPE=使用事件類型（在選單設定->分類->應辦事項類型中管理）
 AGENDA_USE_EVENT_TYPE_DEFAULT=在事件建立表單中自動為事件類型設定此預設值
@@ -1879,7 +1892,7 @@ BackgroundTableLineOddColor=表格奇數行的背景顏色
 BackgroundTableLineEvenColor=表格偶數行的背景色
 MinimumNoticePeriod=最短通知期限（您的休假申請必須在此之前完成）
 NbAddedAutomatically=每月（自動）新增到用戶計數器的天數
-EnterAnyCode=此欄位包含用於識別行的參考。輸入您選擇的任何值，但不能包含特殊字元。
+EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
 Enter0or1=輸入0或1
 UnicodeCurrency=在括號之間輸入代表貨幣符號的字元數列表。例如：對於$，輸入[36]-對於巴西R $ [82,36]-對於€，輸入[8364]
 ColorFormat=在 HEX 格式中 RGB 顏色，例如： FF0000
@@ -1966,7 +1979,7 @@ MAIN_PDF_MARGIN_BOTTOM=PDF底部邊距
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDF上Logo的高度
 NothingToSetup=此模組不需要特別的設定。
 SetToYesIfGroupIsComputationOfOtherGroups=若此群組是其他群組的計算值，則將其設定為 "是"
-EnterCalculationRuleIfPreviousFieldIsYes=如果先前欄位設定為“是”，則輸入計算規則（例如“ CODEGRP1 + CODEGRP2”）
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=發現數個語言變數
 RemoveSpecialChars=刪除特殊字元
 COMPANY_AQUARIUM_CLEAN_REGEX=用正則表達式篩選器清除值（COMPANY_AQUARIUM_CLEAN_REGEX）
@@ -1978,11 +1991,11 @@ HelpOnTooltip=工具提示上的幫助文字
 HelpOnTooltipDesc=在這裡放入文字或是翻譯鍵以便此欄位顯示在表單時可以顯示在工具提示
 YouCanDeleteFileOnServerWith=您可以使用下列命令行在伺服器上刪除此文件： <br> %s
 ChartLoaded=已載入會計項目表
-SocialNetworkSetup=社交網路模組設定
+SocialNetworkSetup=社群網路模組設定
 EnableFeatureFor=為 <strong>%s</strong> 啓用功能
 VATIsUsedIsOff=注意：在選單%s-%s中，使用營業稅或增值稅的選項已設定為“ <strong>關閉</strong> ”，因此用於銷售的營業稅或增值稅將始終為0。
 SwapSenderAndRecipientOnPDF=交換PDF文件上的發件人和收件人地址位置
-FeatureSupportedOnTextFieldsOnly=警告，僅文字欄位支援此功能。另外，必須設定網址參數action = create或action = edit到OR頁面,名稱必須為'new.php' 才能觸發此功能。
+FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=電子郵件收集器
 EmailCollectorDescription=新增計劃作業和設定頁面以定期掃描信箱（使用IMAP協議），並在正確的位置記錄接收到您應用程式中的電子郵件和/或自動建立一些記錄（例如潛在）。
 NewEmailCollector=新電子郵件收集器
@@ -1994,8 +2007,8 @@ EmailcollectorOperationsDesc=全部訂單的操作已執行
 MaxEmailCollectPerCollect=每次收集電子郵件的最大數量
 CollectNow=立刻收集
 ConfirmCloneEmailCollector=您確定要複製電子郵件收集器%s嗎？
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
+DateLastCollectResult=最新嘗試收集日期
+DateLastcollectResultOk=最新收集成功日期
 LastResult=最新結果
 EmailCollectorConfirmCollectTitle=郵件收集確認
 EmailCollectorConfirmCollect=您是否要立即執行此收集器的收集？
@@ -2009,7 +2022,7 @@ CodeLastResult=最新結果代碼
 NbOfEmailsInInbox=來源資料夾中的電子郵件數量
 LoadThirdPartyFromName=在%s載入合作方搜尋 (僅載入)
 LoadThirdPartyFromNameOrCreate= 在%s載入合作方搜尋 (如果找不到就建立)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithDolTrackingID=來自Dolibarr寄送的第一封電子郵件發起的對話訊息
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=來自Dolibarr的訊息
 WithoutDolTrackingIDInMsgId=未從Dolibarr傳送訊息
@@ -2049,8 +2062,11 @@ UseDebugBar=使用debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=控制台中可保留的日誌行數
 WarningValueHigherSlowsDramaticalyOutput=警告，較高的值會嚴重降低輸出速度
 ModuleActivated=模組%s已啟動並顯示於界面上
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
+IfYouAreOnAProductionSetThis=如果您在生產環境中，則應將此屬性設定為%s。
 AntivirusEnabledOnUpload=在上傳的檔案已啟用了防病毒功能
+SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
 EXPORTS_SHARE_MODELS=匯出模組功能可分享此模組給所有人
 ExportSetup=模組匯出設定
 ImportSetup=模組匯入設定
@@ -2074,6 +2090,8 @@ MakeAnonymousPing=對Dolibarr基金會服務器進行匿名Ping'+1'（僅在安
 FeatureNotAvailableWithReceptionModule=啟用接收模組後，此功能不可用
 EmailTemplate=電子郵件模板
 EMailsWillHaveMessageID=電子郵件將具有與此語法匹配的標籤“參考”
+PDF_SHOW_PROJECT=Show project on document
+ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=如果您要在生成同一的PDF中以兩種不同的語言複製一些文字，則必須在此處設置第二種語言讓生成的PDF在同一頁中包含兩種不同的語言，選擇的可以用來生成PDF跟另一種語言（只有少數PDF模板支援此功能)。PDF只有一種語言則留空。
 FafaIconSocialNetworksDesc=在此處輸入FontAwesome圖示的代碼。如果您不知道什麼是FontAwesome，則可以使用通用值fa-address-book。
 FeatureNotAvailableWithReceptionModule=啟用接收模組後，此功能不可用
@@ -2084,14 +2102,23 @@ MeasuringScaleDesc=比例尺是您必須移動小數部分以匹配默認參考
 TemplateAdded=範本已增加
 TemplateUpdated=範本已更新
 TemplateDeleted=範本已刪除
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+MailToSendEventPush=事件提醒電子郵件
+SwitchThisForABetterSecurity=建議將此值變更為%s以提高安全性
 DictionaryProductNature= 產品性質
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+CountryIfSpecificToOneCountry=國家（如果特定於給定國家）
+YouMayFindSecurityAdviceHere=您可以在這裡找到安全建議
+ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+CombinationsSeparator=產品組合的分隔符號
+SeeLinkToOnlineDocumentation=有關範例，請參見選單上的線上文件連結。
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
+AskThisIDToYourBank=請聯絡您的銀行以獲取此ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+YouShouldDisablePHPFunctions=You should disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
+RecommendedValueIs=Recommended: %s
+ARestrictedPath=A restricted path
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index f3885f17658..3026ef1770b 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -37,7 +37,7 @@ IbanValid=BAN 有效
 IbanNotValid=BAN 無效
 StandingOrders=直接轉帳訂單
 StandingOrder=直接轉帳訂單
-PaymentByDirectDebit=Payment by direct debit
+PaymentByDirectDebit=直接付款
 PaymentByBankTransfers=信用轉帳付款
 PaymentByBankTransfer=銀行轉帳付款
 AccountStatement=帳戶對帳單
@@ -106,8 +106,8 @@ SupplierInvoicePayment=供應商付款
 SubscriptionPayment=訂閱付款
 WithdrawalPayment=借方付款單
 SocialContributionPayment=社會/財務稅負繳款單
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=銀行轉帳
+BankTransfers=銀行轉帳
 MenuBankInternalTransfer=內部轉帳
 TransferDesc=從一個帳戶轉移到另一個帳戶，Dolibarr將寫入兩個記錄（來源帳戶中的借款方和目標帳戶中的貸款方）。此交易將使用相同的金額（簽名,標籤和日期除外）
 TransferFrom=從
@@ -166,18 +166,19 @@ VariousPayment=雜項付款
 VariousPayments=雜項付款
 ShowVariousPayment=顯示雜項付款
 AddVariousPayment=新增雜項付款
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+VariousPaymentId=雜項付款編號
+VariousPaymentLabel=雜項付款標籤
+ConfirmCloneVariousPayment=確認複製的雜項付款
 SEPAMandate=歐洲統一支付區要求
 YourSEPAMandate=您的歐洲統一支付區要求
 FindYourSEPAMandate=這是您SEPA的授權，授權我們公司向您的銀行直接付款。退還已簽名（掃描已簽名文檔）或通過郵件發送至
 AutoReportLastAccountStatement=進行對帳時，自動用最後一個對帳單編號填寫“銀行對帳單編號”欄位
-CashControl=POS cash desk control
-NewCashFence=New cash desk closing
+CashControl=POS收銀台控制
+NewCashFence=New cash desk opening or closing
 BankColorizeMovement=動作顏色
 BankColorizeMovementDesc=如果啟用此功能，則可以為借款方或貸款方動作選擇特定的背景顏色
 BankColorizeMovementName1=借款方動作的背景顏色
 BankColorizeMovementName2=貸款方動作的背景顏色
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
+IfYouDontReconcileDisableProperty=如果您不對某些銀行帳戶進行銀行對帳，請在其上禁用屬性“ %s”以刪除此警告。
+NoBankAccountDefined=未定義銀行帳戶
+NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 5e5158ca8af..af50c6b9267 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -55,6 +55,7 @@ CustomerInvoice=客戶發票
 CustomersInvoices=客戶發票
 SupplierInvoice=供應商發票
 SuppliersInvoices=供應商發票
+SupplierInvoiceLines=供應商發票行
 SupplierBill=供應商發票
 SupplierBills=供應商發票
 Payment=付款
@@ -81,6 +82,8 @@ PaymentsAlreadyDone=付款已完成
 PaymentsBackAlreadyDone=退款已完成
 PaymentRule=付款條件
 PaymentMode=付款類型
+DefaultPaymentMode=Default Payment Type
+DefaultBankAccount=Default Bank Account
 PaymentTypeDC=借/貸卡片
 PaymentTypePP=PayPal
 IdPaymentMode=付款類型 (id)
@@ -234,8 +237,8 @@ RemainderToPay=未付款餘額
 RemainderToTake=剩餘金額
 RemainderToPayBack=剩餘金額退款
 Rest=待辦中
-AmountExpected=索賠額
-ExcessReceived=收到過多
+AmountExpected=索款額
+ExcessReceived=超額收款
 ExcessPaid=超額付款
 EscompteOffered=已提供折扣（付款日前付款）
 EscompteOfferedShort=折扣
@@ -373,6 +376,7 @@ DateLastGeneration=最新的產生日期
 DateLastGenerationShort=最新的產生日期
 MaxPeriodNumber=產生發票的最大數量
 NbOfGenerationDone=已經產生完成的發票數量
+NbOfGenerationOfRecordDone=Number of record generation already done
 NbOfGenerationDoneShort=已產生完成發票數
 MaxGenerationReached=已達到最大產生數量
 InvoiceAutoValidate=自動驗證發票
@@ -413,7 +417,7 @@ PaymentCondition14DENDMONTH=月底後的14天內
 FixAmount=固定金額-標籤為“ %s”的1行
 VarAmount=可變金額 (%% tot.)
 VarAmountOneLine=可變金額 (%% tot.) - 有標籤 '%s'的一行
-VarAmountAllLines=可變數量(%% tot.)-所有相同行
+VarAmountAllLines=可變金額（%% tot.）-所有行從起點
 # PaymentType
 PaymentTypeVIR=銀行轉帳
 PaymentTypeShortVIR=銀行轉帳
@@ -494,12 +498,16 @@ Cash=現金
 Reported=已延遲
 DisabledBecausePayments=無法付款，因為有一些付款
 CantRemovePaymentWithOneInvoicePaid=無法移除此付款，因為至少有一張發票分類已付款
+CantRemovePaymentVATPaid=由於稅金已分類為已付款，因此無法刪除付款
+CantRemovePaymentSalaryPaid=由於薪資已分類為已付款，因此無法刪除付款
 ExpectedToPay=預期付款
 CantRemoveConciliatedPayment=無法刪除對帳款
 PayedByThisPayment=支付這筆款項
 ClosePaidInvoicesAutomatically=完全付款後，將所有標準，預付款或替換發票自動分類為“已付款”。
 ClosePaidCreditNotesAutomatically=當已完全退款後將所有同意折讓照會通知自動分類為 "已付款"。
 ClosePaidContributionsAutomatically=完全付款後，將所有社會或財政捐款自動分類為“已付款”。
+ClosePaidVATAutomatically=完全付款後，自動將稅金分類為“已付款”。
+ClosePaidSalaryAutomatically=完全付款後，薪資會自動分類為“已付款”。
 AllCompletelyPayedInvoiceWillBeClosed=所有沒有餘款的發票將自動關閉，狀態為“已付款”。
 ToMakePayment=付款
 ToMakePaymentBack=退還款項
@@ -512,18 +520,18 @@ YouMustCreateStandardInvoiceFirstDesc=您必須先建立標準發票，然後將
 PDFCrabeDescription=發票PDF範本Crabe。完整的發票範本（Sponge範本的舊範本）
 PDFSpongeDescription=發票PDF範本Sponge。完整的發票範本
 PDFCrevetteDescription=發票PDF範本Crevette。狀況發票的完整發票範本
-TerreNumRefModelDesc1=轉回數字的格式，標準發票為%syymm-nnnn 及同意折讓照會通知是%syymm-nnnn，其中 yy 是年，mm 是月，nnnn 是無空白且不返回 0 的序列
-MarsNumRefModelDesc1=轉回數字格式，標準發票為%syymm-nnnn，替換發票為%syymm-nnnn，訂金發票為%syymm-nnnn，同意折讓照會通知為 %syymm-nnnn，其中 yy 是年，mm 是月，nnnn 為無空白且不返回 0 的序列
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=以$ syymm開頭的帳單已經存在，並且與該序列模型不符合。將其刪除或重新命名以啟動此模組。
-CactusNumRefModelDesc1=轉回數字格式，標準發票為%syymm-nnnn，同意折讓照會通知為%syymm-nnnn，訂金發票格式為%syymm-nnnn，其中 yy 為年，mm 為月，nnnn 為無空白且不返回0的序列
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 EarlyClosingReason=提前關閉原因
 EarlyClosingComment=提前關閉註記
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=有代表性的後續客戶發票
+TypeContact_facture_internal_SALESREPFOLL=客戶發票聯絡人
 TypeContact_facture_external_BILLING=客戶發票聯絡人
 TypeContact_facture_external_SHIPPING=客戶運輸聯絡人
 TypeContact_facture_external_SERVICE=客戶服務聯絡人
-TypeContact_invoice_supplier_internal_SALESREPFOLL=有代表性的後續供應商發票
+TypeContact_invoice_supplier_internal_SALESREPFOLL=供應商發票聯絡人
 TypeContact_invoice_supplier_external_BILLING=供應商發票聯絡人
 TypeContact_invoice_supplier_external_SHIPPING=供應商貨運聯絡人
 TypeContact_invoice_supplier_external_SERVICE=供應商服務聯絡人
@@ -562,7 +570,8 @@ ToCreateARecurringInvoiceGeneAuto=如果需要自動生成此類發票，請要
 DeleteRepeatableInvoice=刪除發票範本
 ConfirmDeleteRepeatableInvoice=您確定要刪除發票範本嗎？
 CreateOneBillByThird=為每個合作方建立一張發票（否則，為每個訂單建立一張發票）
-BillCreated=%s帳單已新增
+BillCreated=已產生%s發票
+BillXCreated=已產生發票%s
 StatusOfGeneratedDocuments=文件產生狀態
 DoNotGenerateDoc=不要產生文件檔案
 AutogenerateDoc=自動產生文件檔案
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index 157b6a17cef..2a6b283482d 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=資料庫中主要業務對象的統計資料
 BoxLoginInformation=登入資訊
 BoxLastRssInfos=RSS資訊
 BoxLastProducts=最新%s筆的產品/服務
@@ -17,9 +18,13 @@ BoxLastActions=最新活動
 BoxLastContracts=最新合約
 BoxLastContacts=最新通訊錄/地址
 BoxLastMembers=最新會員
+BoxLastModifiedMembers=Latest modified members
+BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=最新干預
 BoxCurrentAccounts=開啟帳戶餘額
 BoxTitleMemberNextBirthdays=本月生日（會員）
+BoxTitleMembersByType=Members by type
+BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=來自%s的最新%s筆消息
 BoxTitleLastProducts=產品/服務：最新%s筆已修改
 BoxTitleProductsAlertStock=產品：庫存警報
@@ -95,8 +100,8 @@ LastXMonthRolling=最新%s月份滾動
 ChooseBoxToAdd=將小工具加到您的控制板
 BoxAdded=小工具已加到您的控制板中
 BoxTitleUserBirthdaysOfMonth=本月的生日（用戶）
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
+BoxLastManualEntries=最新手動輸入的會計記錄或沒有來源文件
+BoxTitleLastManualEntries=%s最新已手動輸入記錄或沒有來源文件
 NoRecordedManualEntries=會計中沒有手動條目
 BoxSuspenseAccount=用暫記帳戶計算會計操作
 BoxTitleSuspenseAccount=未分配的行數
@@ -107,5 +112,9 @@ BoxTitleLastCustomerShipments=最新%s筆客戶發貨
 NoRecordedShipments=沒有已記錄的客戶發貨
 BoxCustomersOutstandingBillReached=達到最大客戶數
 # Pages
-AccountancyHome=會計
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
 ValidatedProjects=已驗證的專案
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index c92c7a709c4..f0c1333e1c7 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -14,7 +14,7 @@ SuppliersCategoriesArea=供應商標籤/類別區域
 CustomersCategoriesArea=客戶標籤/類別區域
 MembersCategoriesArea=會員標籤/類別區域
 ContactsCategoriesArea=聯絡人標籤/類別區域
-AccountsCategoriesArea=帳戶標籤/類別區域
+AccountsCategoriesArea=Bank accounts tags/categories area
 ProjectsCategoriesArea=專案標籤/類別區域
 UsersCategoriesArea=用戶標籤/類別區域
 SubCats=子類別
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=分配類別給供應商
 ShowCategory=顯示標籤/類別
 ByDefaultInList=預設在清單中
 ChooseCategory=選擇類別
-StocksCategoriesArea=倉庫類別
-ActionCommCategoriesArea=事件類別
+StocksCategoriesArea=Warehouse Categories
+ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=頁面容器類別
 UseOrOperatorForCategories=類別的使用或運算
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 8bbc2a0225b..1f51cecff77 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -43,9 +43,10 @@ Individual=私營個體
 ToCreateContactWithSameName=會自動新增一個與合作方具有相同資訊的聯絡人/地址。在大多數情況下，即使您的合作方是自然人，只需建立合作方即可。
 ParentCompany=母公司
 Subsidiaries=子公司
-ReportByMonth=月報告
-ReportByCustomers=客戶報告
-ReportByQuarter=百分比報告
+ReportByMonth=Report per month
+ReportByCustomers=Report per customer
+ReportByThirdparties=Report per thirdparty
+ReportByQuarter=Report per rate
 CivilityCode=Civility code
 RegisteredOffice=已註冊辦公室
 Lastname=姓氏
@@ -172,14 +173,20 @@ ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 （社會安全號碼）
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (學院編號)
-ProfId5ES=歐盟增值稅號
+ProfId5ES=Prof Id 5 (EORI number)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=歐盟增值稅號
+ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
 ProfId1GB=註冊號
 ProfId2GB=-
 ProfId3GB=SIC
@@ -203,6 +210,7 @@ ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
 ProfId5IT=歐盟增值稅號
+ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S.盧森堡)
 ProfId2LU=Id. prof. 2 (營業執照)
 ProfId3LU=-
@@ -231,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2（社會安全號碼）
 ProfId3PT=Prof Id 3（商業記錄碼）
 ProfId4PT=Prof Id 4 (音樂學院)
-ProfId5PT=歐盟增值稅號
+ProfId5PT=Prof Id 5 (EORI number)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=歐盟增值稅號
+ProfId5RO=Prof Id 5 (EORI number)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -358,7 +366,7 @@ VATIntraCheckableOnEUSite=檢查在歐盟區網站內的區內營業稅
 VATIntraManualCheck=您也可在歐盟網站以人工方式確認<a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=無法檢查。無法使用會員國家（%s）進行檢查服務。
 NorProspectNorCustomer=非潛在方或客戶
-JuridicalStatus=業務實體類型
+JuridicalStatus=法人類型
 Workforce=員工
 Staff=僱員
 ProspectLevelShort=潛在等級
@@ -418,7 +426,7 @@ AllocateCommercial=指定業務代表
 Organization=組織
 FiscalYearInformation=會計年度
 FiscalMonthStart=會計年度開始月份
-SocialNetworksInformation=社交網路
+SocialNetworksInformation=社群網路
 SocialNetworksFacebookURL=Facebook網址
 SocialNetworksTwitterURL=Twitter網址
 SocialNetworksLinkedinURL=Linkedin網址
@@ -441,7 +449,7 @@ CurrentOutstandingBill=目前未付款帳單
 OutstandingBill=未付款帳單的最大金額
 OutstandingBillReached=已達最大金額的未付款帳單
 OrderMinAmount=最小訂購量
-MonkeyNumRefModelDesc=客戶代號回復 %s yymm-nnnn ，且供應商代號為 %s yymm-nnnn 的數字格式，其中 yy 指的是年度，mm指的是月份，nnnn指的是不間斷或返回 0 的序號。
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=客戶/供應商編號規則不受限制，此編碼可以隨時修改。(可開啟Elephant or Monkey模組來設定編碼規則)
 ManagingDirectors=主管(們)姓名 (執行長, 部門主管, 總裁...)
 MergeOriginThirdparty=重複的客戶/供應商 (你想刪除的客戶/供應商)
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 82b499908a9..32228a05a2f 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -65,6 +65,7 @@ LT2SupplierIN=SGST購買品
 VATCollected=已收取營業稅
 StatusToPay=付款
 SpecialExpensesArea=所有特殊付款區域
+VATExpensesArea=Area for all TVA payments
 SocialContribution=社會稅或財政稅
 SocialContributions=社會稅或財政稅
 SocialContributionsDeductibles=可抵扣的社會稅或財政稅
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=客戶發票付款
 PaymentSupplierInvoice=供應商發票付款
 PaymentSocialContribution=社會/財政稅款付款
 PaymentVat=營業稅付款
+AutomaticCreationPayment=Automatically record the payment
 ListPayment=付款清單
 ListOfCustomerPayments=客戶付款清單
 ListOfSupplierPayments=供應商付款清單
@@ -104,6 +106,8 @@ LT2PaymentES=IRPF付款
 LT2PaymentsES=IRPF付款
 VATPayment=營業稅付款
 VATPayments=營業稅付款
+VATDeclarations=稅金申報
+VATDeclaration=稅金申報
 VATRefund=營業稅退還
 NewVATPayment=新營業稅付款
 NewLocalTaxPayment=新%s稅金付款
@@ -134,9 +138,17 @@ NoWaitingChecks=沒有支票等待存入。
 DateChequeReceived=支票接收日期
 NbOfCheques=支票數量
 PaySocialContribution=支付社會/財政稅
-ConfirmPaySocialContribution=您確定要將此社會稅或財政稅歸為已繳稅嗎？
+PayVAT=支付稅金申報
+PaySalary=支付薪資卡
+ConfirmPaySocialContribution=您確定要將此社會稅或財政稅分類為已付款嗎？
+ConfirmPayVAT=您確定要將此稅金申報單分類為已付款嗎？
+ConfirmPaySalary=您確定要將此薪資卡分類為已付款嗎？
 DeleteSocialContribution=刪除社會或財政稅金
-ConfirmDeleteSocialContribution=您確定要刪除此社會/財政稅金嗎？
+DeleteVAT=刪除稅金申報
+DeleteSalary=刪除薪資卡
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary?
 ExportDataset_tax_1=社會和財政稅金及繳稅
 CalcModeVATDebt=<b>%s承諾會計營業稅%s</b>模式.
 CalcModeVATEngagement=<b>%s收入-支出營業稅%s</b>模式.
@@ -163,14 +175,15 @@ RulesResultInOut=-它包括發票，費用，營業稅和薪水的實際付款
 RulesCADue=-它包括客戶的到期發票，無論是否已付款。 <br>-它基於這些發票的開票日期。 <br>
 RulesCAIn=-包括從客戶收到的所有有效發票付款。 <br> -此基於這些發票的付款日期<br>
 RulesCATotalSaleJournal=它包括“銷售”日記帳中的所有信用額度。
+RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=它包括分類帳中具有“ 費用”或“ 收入”組的會計帳戶中的記錄
 RulesResultBookkeepingPredefined=它包括分類帳中具有“ 支出”或“ 收入”組的會計帳戶中的記錄
 RulesResultBookkeepingPersonalized=它顯示會計帳戶分類帳中的記錄， <b>並依個性化組別分組</b>
 SeePageForSetup=請參考選單<a href="%s">%s</a>進行設定
 DepositsAreNotIncluded=-未包含預付款發票
 DepositsAreIncluded=-包含預付款發票
-LT1ReportByMonth=Tax 2 report by month
-LT2ReportByMonth=Tax 3 report by month
+LT1ReportByMonth=稅率2每月報告
+LT2ReportByMonth=稅率3每月報告
 LT1ReportByCustomers=合作方稅率2報告
 LT2ReportByCustomers=合作方稅率3報告
 LT1ReportByCustomersES=合作方RE報告
@@ -183,6 +196,7 @@ VATReportByThirdParties=合作方營業稅報告
 VATReportByCustomers=客戶銷售稅報告
 VATReportByCustomersInInputOutputMode=依客戶已收繳營業稅報告
 VATReportByQuartersInInputOutputMode=依銷售稅率收取和繳納的報告
+VATReportShowByRateDetails=顯示此稅率的詳細訊息
 LT1ReportByQuarters=依稅率2報稅
 LT2ReportByQuarters=依稅率3報稅
 LT1ReportByQuartersES=依RE稅率報稅
@@ -217,7 +231,7 @@ Pcg_subtype=Pcg子類型
 InvoiceLinesToDispatch=調度發票行
 ByProductsAndServices=依產品和服務
 RefExt=外部參考
-ToCreateAPredefinedInvoice=要建立發票範本，請建立標準發票，然後在不對其進行驗證的情況下，點擊按鈕“ %s”。
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=連線到訂單
 Mode1=方法1
 Mode2=方法2
@@ -235,6 +249,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=合作方卡上定義的專用會計科目將
 ACCOUNTING_ACCOUNT_SUPPLIER=供應商合作方使用的會計科目
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=合作方卡上定義的專用會計科目將僅用於子帳會計。如果未定義第三方的專用供應商會計科目，則此科目將用於“總帳”，並作為“子帳”會計的預設值。
 ConfirmCloneTax=確認複製社會/財政稅
+ConfirmCloneVAT=確認複製稅金申報
+ConfirmCloneSalary=Confirm the clone of a salary
 CloneTaxForNextMonth=為下個月複製此稅
 SimpleReport=簡易報告
 AddExtraReport=其他報告（增加外國和國家客戶報告）
@@ -253,7 +269,8 @@ AccountingAffectation=會計分配
 LastDayTaxIsRelatedTo=稅期的最後一天
 VATDue=要求營業稅
 ClaimedForThisPeriod=要求的期間
-PaidDuringThisPeriod=在此期間支付
+PaidDuringThisPeriod=Paid for this period
+PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
 ByVatRate=依營業稅率
 TurnoverbyVatrate=依營業稅率開票的營業額
 TurnoverCollectedbyVatrate=依營業稅率收取的營業額
@@ -264,6 +281,7 @@ PurchaseTurnoverCollected=採購營業額
 RulesPurchaseTurnoverDue=-它包括供應商的到期發票，無論是否已付款。 <br>-它基於這些發票的發票日期。 <br>
 RulesPurchaseTurnoverIn=-它包括對供應商的所有有效發票付款。<br>-此基於這些發票的付款日期<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=它包括採購日記帳中的所有借方行。
+RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
 ReportPurchaseTurnover=已開票營業額
 ReportPurchaseTurnoverCollected=採購營業額
 IncludeVarpaysInResults = 在報告中包括各種付款
diff --git a/htdocs/langs/zh_TW/ecm.lang b/htdocs/langs/zh_TW/ecm.lang
index 155f77c6998..8f90c198407 100644
--- a/htdocs/langs/zh_TW/ecm.lang
+++ b/htdocs/langs/zh_TW/ecm.lang
@@ -41,3 +41,7 @@ FileNotYetIndexedInDatabase=檔案尚未編入資料庫（嘗試重新上傳）
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM設定
+GenerateImgWebp=Duplicate all images with another version with .webp format
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmImgWebpCreation=Confirm all images duplication
+SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index f4f7a6ed0cc..9cf8fe438b5 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=未找到資料夾<b>%s</b>（錯誤的路徑，錯誤的權限
 ErrorFunctionNotAvailableInPHP=此功能需要函數<b>%s</b>，但是無法在此PHP版本中使用。
 ErrorDirAlreadyExists=具有此名稱的資料夾已經存在。
 ErrorFileAlreadyExists=具有此名稱的檔案已經存在。
+ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=伺服器未完整的收到檔案。
 ErrorNoTmpDir=臨時指示%s不存在。
 ErrorUploadBlockedByAddon=PHP / Apache的插件已阻擋上傳。
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=載入會計科目表時出錯。如果幾個帳戶沒有
 ErrorBadSyntaxForParamKeyForContent=參數keyforcontent的語法錯誤。必須具有以%s或%s開頭的值
 ErrorVariableKeyForContentMustBeSet=錯誤，必須設定名稱為%s（帶有文字內容）或%s（帶有外部網址）的常數。
 ErrorURLMustStartWithHttp=網址 %s 必須以 http://或https://開始
+ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=錯誤，新參考已被使用
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=錯誤，無法刪除連結到已關閉發票的付款。
 ErrorSearchCriteriaTooSmall=搜尋條件太小。
@@ -255,6 +257,10 @@ ErrorPublicInterfaceNotEnabled=未啟用公共界面
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP參數upload_max_filesize（%s）高於PHP參數post_max_size（%s）。這不是相同的設定。
@@ -287,3 +293,6 @@ WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into E
 WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
+WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
diff --git a/htdocs/langs/zh_TW/externalsite.lang b/htdocs/langs/zh_TW/externalsite.lang
index 31329ec4e36..1cfac37b239 100644
--- a/htdocs/langs/zh_TW/externalsite.lang
+++ b/htdocs/langs/zh_TW/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=設定連結到外部網站
-ExternalSiteURL=外部網站網址
+ExternalSiteURL=External Site URL of HTML iframe content
 ExternalSiteModuleNotComplete=外部網站模組設定不正確。
 ExampleMyMenuEntry=我的選單條目
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index c8ad519aa7c..2e602c47207 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -49,7 +49,7 @@ WarningNoEMailsAdded=沒有新的電子郵件可增加到收件人清單。
 ConfirmValidMailing=您確定要驗證此電子郵件嗎？
 ConfirmResetMailing=警告，通過重新初始化電子郵件<b>%s</b> ，您可以批次發送此電子郵件。你確定要這麼做嗎？
 ConfirmDeleteMailing=您確定要刪除此電子郵件嗎？
-NbOfUniqueEMails=獨特電子郵件的數量
+NbOfUniqueEMails=唯一電子郵件的數量
 NbOfEMails=電子郵件數量
 TotalNbOfDistinctRecipients=不重複收件人數量
 NoTargetYet=尚未定義收件人（在“收件人”分頁上）
@@ -126,7 +126,7 @@ TagMailtoEmail=收件人電子郵件（包括html“ mailto：”連結）
 NoEmailSentBadSenderOrRecipientEmail=沒有發送電子郵件。寄件人或收件人的電子郵件不正確。驗證用戶資料。
 # Module Notifications
 Notifications=通知
-NotificationsAuto=自動通知。
+NotificationsAuto=自動通知
 NoNotificationsWillBeSent=沒有為此類型事件和公司計畫的自動電子郵件通知
 ANotificationsWillBeSent=1條自動通知將以電子郵件寄送
 SomeNotificationsWillBeSent=%s的自動通知將以電子郵件寄送
@@ -164,9 +164,9 @@ AdvTgtCreateFilter=建立過濾器
 AdvTgtOrCreateNewFilter=新過濾器名稱
 NoContactWithCategoryFound=找不到具有類別的聯絡人/地址
 NoContactLinkedToThirdpartieWithCategoryFound=找不到具有類別的聯絡人/地址
-OutGoingEmailSetup=Outgoing emails
-InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+OutGoingEmailSetup=外送電子郵件
+InGoingEmailSetup=收到的電子郵件
+OutGoingEmailSetupForEmailing=外送電子郵件（用於模組%s）
 DefaultOutgoingEmailSetup=與全域寄送電子郵件設定相同的配置
 Information=資訊
 ContactsWithThirdpartyFilter=帶有合作方過濾器的聯絡人
@@ -175,5 +175,5 @@ Answered=已回覆
 IsNotAnAnswer=未回應（原始電子郵件）
 IsAnAnswer=是一封原始電子郵件的回應
 RecordCreatedByEmailCollector=由電子郵件收集器%s從電子郵件%s建立的記錄
-DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
-DefaultStatusEmptyMandatory=Empty but mandatory
+DefaultBlacklistMailingStatus=垃圾批量電子郵件的預設聯絡狀態
+DefaultStatusEmptyMandatory=必填
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 74cc374cb06..4cdffe835d3 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -87,7 +87,7 @@ FileWasNotUploaded=所選定的檔案尚未上傳。點選 "附加檔案"。
 NbOfEntries=項目數量
 GoToWikiHelpPage=讀取線上幫助 (需要連上網路)
 GoToHelpPage=讀取幫助
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=有一個與您目前畫面相關的專用幫助頁面
 HomePage=首頁
 RecordSaved=記錄已儲存
 RecordDeleted=記錄已刪除
@@ -224,7 +224,7 @@ Value=值
 PersonalValue=個人設定值
 NewObject=新 %s
 NewValue=新值
-OldValue=Old value %s
+OldValue=舊數值%s
 CurrentValue=目前值
 Code=代碼
 Type=類型
@@ -272,12 +272,13 @@ DateStart=開始日期
 DateEnd=結束日期
 DateCreation=建立日期
 DateCreationShort=建立日
-IPCreation=Creation IP
+IPCreation=建立IP
 DateModification=修改日期
 DateModificationShort=修改日
-IPModification=Modification IP
+IPModification=修改IP
 DateLastModification=最新修改日期
 DateValidation=驗證日期
+DateSigning=Signing date
 DateClosing=關閉日期
 DateDue=截止日期
 DateValue=值的日期
@@ -361,7 +362,7 @@ UnitPriceHTCurrency=單價（不含）（貨幣）
 UnitPriceTTC=單位價格
 PriceU=單價
 PriceUHT=單價(淨)
-PriceUHTCurrency=單價(貨幣)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=單價(含稅)
 Amount=金額
 AmountInvoice=發票金額
@@ -389,6 +390,8 @@ AmountTotal=總金額
 AmountAverage=平均金額
 PriceQtyMinHT=最小數量價格（不含稅）
 PriceQtyMinHTCurrency=最小數量價格（不含稅）（貨幣）
+PercentOfOriginalObject=Percent of original object
+AmountOrPercent=Amount or percent
 Percentage=百分比
 Total=總計
 SubTotal=小計
@@ -438,7 +441,7 @@ RemainToPay=保持付款
 Module=模組/應用程式
 Modules=模組/應用程式
 Option=選項
-Filters=Filters
+Filters=過濾器
 List=清單
 FullList=全部清單
 FullConversation=全部轉換
@@ -656,7 +659,7 @@ SupplierPreview=供應商預覽資訊
 ShowCustomerPreview=顯示客戶預覽資訊
 ShowSupplierPreview=顯示供應商預覽
 RefCustomer=參考客戶
-InternalRef=Internal ref.
+InternalRef=內部參考
 Currency=貨幣
 InfoAdmin=管理員資訊
 Undo=復原
@@ -724,7 +727,7 @@ MenuMembers=會員
 MenuAgendaGoogle=Google 行事曆
 MenuTaxesAndSpecialExpenses=稅金|特別費用
 ThisLimitIsDefinedInSetup=Dolibarr 的限制（選單 首頁 - 設定 - 安全）： %s Kb, PHP的限制：%s Kb
-NoFileFound=此資料夾沒有任何檔案
+NoFileFound=No documents uploaded
 CurrentUserLanguage=目前語言
 CurrentTheme=目前主題
 CurrentMenuManager=目前選單管理器
@@ -899,8 +902,10 @@ ViewAccountList=檢視總帳
 ViewSubAccountList=檢視子帳戶總帳
 RemoveString=移除字串‘%s’
 SomeTranslationAreUncomplete=提供的某些語言可能僅被部分翻譯，或者可能包含錯誤。請通過註冊<a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>來進行改進，以幫助修正您的語言。
-DirectDownloadLink=直接下載連結(公共/外部)
-DirectDownloadInternalLink=直接下載連結(需要登入及存取權限)
+DirectDownloadLink=Public download link
+PublicDownloadLinkDesc=Only the link is required to download the file
+DirectDownloadInternalLink=Private download link
+PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=下載
 DownloadDocument=下載文件
 ActualizeCurrency=更新匯率
@@ -1013,6 +1018,7 @@ SearchIntoContacts=通訊錄
 SearchIntoMembers=會員
 SearchIntoUsers=用戶
 SearchIntoProductsOrServices=產品或服務
+SearchIntoBatch=Lots / Serials
 SearchIntoProjects=專案
 SearchIntoMO=製造訂單
 SearchIntoTasks=任務
@@ -1049,12 +1055,13 @@ KeyboardShortcut=快捷鍵
 AssignedTo=指定人
 Deletedraft=刪除草稿
 ConfirmMassDraftDeletion=草稿批次刪除確認
-FileSharedViaALink=透過連線分享檔案
+FileSharedViaALink=File shared with a public link
 SelectAThirdPartyFirst=先選擇合作方(客戶/供應商)...
 YouAreCurrentlyInSandboxMode=您目前在 %s "沙盒" 模式
 Inventory=庫存
 AnalyticCode=分析代碼
 TMenuMRP=製造資源計劃(MRP)
+ShowCompanyInfos=Show company infos
 ShowMoreInfos=顯示更多信息
 NoFilesUploadedYet=請先上傳文件
 SeePrivateNote=查看私人筆記
@@ -1115,8 +1122,10 @@ OutOfDate=過期
 EventReminder=事件提醒
 UpdateForAllLines=更新所有行
 OnHold=On hold
-Civility=Civility
-AffectTag=Affect Tag
-ConfirmAffectTag=Bulk Tag Affect
-ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
+Civility=稱謂或頭銜
+AffectTag=影響標籤
+ConfirmAffectTag=批量標籤影響
+ConfirmAffectTagQuestion=您確定要影響對%s所選記錄的標籤嗎？
+CategTypeNotFound=找不到記錄類型的標籤類型
+CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
diff --git a/htdocs/langs/zh_TW/margins.lang b/htdocs/langs/zh_TW/margins.lang
index aec566adc67..b3cc74b2402 100644
--- a/htdocs/langs/zh_TW/margins.lang
+++ b/htdocs/langs/zh_TW/margins.lang
@@ -22,7 +22,7 @@ ProductService=產品或服務
 AllProducts=所有產品和服務
 ChooseProduct/Service=選擇產品或服務
 ForceBuyingPriceIfNull=如果未定義，強制將買入/成本價轉換為賣價
-ForceBuyingPriceIfNullDetails=如果未定義購買/成本價格，並且此選項為“ ON”，則利潤為零上架（購買/成本價格=售價），否則（“ OFF”），利潤等於建議的默認值。
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=全球折扣的利潤規則
 UseDiscountAsProduct=作為產品
 UseDiscountAsService=作為服務
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index d31b8fa9640..14c60c9ba39 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=草案會員清單（待確認）
 MembersListValid=有效會員清單
 MembersListUpToDate=最新訂閱的有效會員清單
 MembersListNotUpToDate=訂閱過期的有效會員清單
+MembersListExcluded=List of excluded members
 MembersListResiliated=已被終止會員清單
 MembersListQualified=合格會員清單
 MenuMembersToValidate=草案會員
 MenuMembersValidated=已驗證會員
+MenuMembersExcluded=Excluded members
 MenuMembersResiliated=已終止會員
 MembersWithSubscriptionToReceive=可接收訂閱會員
 MembersWithSubscriptionToReceiveShort=接收訂閱
@@ -47,9 +49,12 @@ MemberStatusActiveLate=訂閱已過期
 MemberStatusActiveLateShort=已過期
 MemberStatusPaid=訂閱最新
 MemberStatusPaidShort=最新
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
 MemberStatusResiliated=已終止成員
 MemberStatusResiliatedShort=已終止
 MembersStatusToValid=草案會員
+MembersStatusExcluded=Excluded members
 MembersStatusResiliated=已終止會員
 MemberStatusNoSubscription=已驗證（無需訂閱）
 MemberStatusNoSubscriptionShort=已驗證
@@ -82,6 +87,8 @@ Physical=自然人
 Moral=法人
 MorAndPhy=法人與自然人
 Reenable=重新啟用
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=終止會員
 ConfirmResiliateMember=您確定要終止此會員嗎？
 DeleteMember=刪除會員
@@ -137,6 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=電子郵件範本，用於會員
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=電子郵件範本，用於新的訂閱記錄時向會員發送電子郵件
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=電子郵件範本, 用於訂閱即將到期時發送電子郵件提醒
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=電子郵件範本，用於在會員取消時向會員發送電子郵件
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=自動發送電子郵件之發件人電子郵件
 DescADHERENT_ETIQUETTE_TYPE=標籤頁格式
 DescADHERENT_ETIQUETTE_TEXT=會員地址列表文字
@@ -162,6 +170,7 @@ DocForLabels=產生地址表
 SubscriptionPayment=訂閱付款
 LastSubscriptionDate=最新訂閱付款的日期
 LastSubscriptionAmount=最新訂閱金額
+LastMemberType=Last Member type
 MembersStatisticsByCountries=會員統計(國家/城市)
 MembersStatisticsByState=會員統計(州/省)
 MembersStatisticsByTown=會員統計(城鎮)
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index bffd8ecac21..3e33eeafd60 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -133,7 +133,9 @@ IncludeDocGeneration=我想從項目產生一些文件
 IncludeDocGenerationHelp=如果選中此選項，將產生一些代碼以在記錄上增加“產生文件”框。
 ShowOnCombobox=在組合框中顯示數值
 KeyForTooltip=Key for tooltip
-CSSClass=CSS類別
+CSSClass=CSS for edit/create form
+CSSViewClass=CSS for read form
+CSSListClass=CSS for list
 NotEditable=無法編輯
 ForeignKey=外部金鑰
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index 1213c4f6bdb..7d2f56c434e 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -16,6 +16,8 @@ ToOrder=製作訂單
 MakeOrder=製作訂單
 SupplierOrder=採購訂單
 SuppliersOrders=採購訂單
+SaleOrderLines=Sale order lines
+PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=目前的採購訂單
 CustomerOrder=銷售訂單
 CustomersOrders=銷售訂單
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 9ee8202b562..e424cc39c42 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -114,6 +114,7 @@ DemoCompanyAll=有多項活動的公司（所有主要模組）
 CreatedBy=由%s建立
 ModifiedBy=由%s修改
 ValidatedBy=由%s驗證
+SignedBy=Signed by %s
 ClosedBy=由%s關閉
 CreatedById=建立的用戶ID
 ModifiedById=進行最新更改的用戶ID
@@ -244,6 +245,7 @@ NewKeyIs=這是您的新登入密碼
 NewKeyWillBe=您用於登入軟體的新密鑰將為
 ClickHereToGoTo=點擊這裡前往%s
 YouMustClickToChange=您必須先點擊以下連結驗證此密碼更改
+ConfirmPasswordChange=Confirm password change
 ForgetIfNothing=如果您沒有請求此更改，請忽略此電子郵件。您的憑證仍保持安全狀態。
 IfAmountHigherThan=如果金額高於<strong> %s </strong>
 SourcesRepository=資料庫
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index 175d9119178..72db592eb05 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -1,8 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=使用批次/序號數字
-ProductStatusOnBatch=是的(需要批次/序號)
+ProductStatusOnBatch=Yes (lot required)
+ProductStatusOnSerial=Yes (unique serial number required)
 ProductStatusNotOnBatch=不是(不使用批次/序號)
-ProductStatusOnBatchShort=Yes
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=No
 Batch=批次/序號
 atleast1batchfield=有效日期或銷售日期或批次/序號
@@ -22,3 +24,12 @@ ProductLotSetup=批次/序號模組的設定
 ShowCurrentStockOfLot=顯示關聯產品/批次的目前庫存
 ShowLogOfMovementIfLot=顯示產品/批次的移動記錄
 StockDetailPerBatch=每批次的庫存詳細資料
+SerialNumberAlreadyInUse=Serial number %s is already used for product %s
+TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
+BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
+BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+CustomMasks=Adds an option to define mask in the product card
+LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
+SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 6b2594c3473..7e05d098a4a 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -104,25 +104,25 @@ SetDefaultBarcodeType=設定條碼類型
 BarcodeValue=條碼值
 NoteNotVisibleOnBill=註解(不會在發票或提案/建議書上顯示)
 ServiceLimitedDuration=如果產品是一種有期限的服務：
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=填寫上次服務日期
 MultiPricesAbility=每個產品/服務有多個價格區段（每個客戶屬於一個價格區段）
 MultiPricesNumPrices=價格數量
 DefaultPriceType=增加新銷售價格時的每個預設價格（含稅和不含稅）基準
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+AssociatedProductsAbility=啟用套件（幾種產品的組合）
+VariantsAbility=啟用變數（產品變數,例如顏色,尺寸）
+AssociatedProducts=套件
+AssociatedProductsNumber=構成此套件的產品數量
 ParentProductsNumber=母套裝產品數
 ParentProducts=母產品
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=如果為0，則此產品不是套件
+IfZeroItIsNotUsedByVirtualProduct=如果為0，則表示此產品未用於任何套件
 KeywordFilter=關鍵字過濾
 CategoryFilter=分類篩選器
 ProductToAddSearch=用搜索新增產品
 NoMatchFound=未找到符合的項目
 ListOfProductsServices=產品/服務清單
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=組成此套件的產品/服務清單
+ProductParentList=含有此產品的套件清單
 ErrorAssociationIsFatherOfThis=所選產品之一是當前產品的母產品
 DeleteProduct=刪除一個產品/服務
 ConfirmDeleteProduct=你確定要刪除這個產品/服務？
@@ -141,6 +141,7 @@ VATRateForSupplierProduct=營業稅率（此供應商/產品）
 DiscountQtyMin=此數量的折扣。
 NoPriceDefinedForThisSupplier=沒有此供應商/產品定義的價格/數量
 NoSupplierPriceDefinedForThisProduct=沒有定義此產品供應商價格/數量
+PredefinedItem=Predefined item
 PredefinedProductsToSell=預定義產品
 PredefinedServicesToSell=預定義服務
 PredefinedProductsAndServicesToSell=預定義的可銷售產品/服務
@@ -168,13 +169,13 @@ BuyingPrices=採購價格
 CustomerPrices=客戶價格
 SuppliersPrices=供應商價格
 SuppliersPricesOfProductsOrServices=供應商價格（產品或服務）
-CustomCode=Customs|Commodity|HS code
+CustomCode=海關|商品| HS碼
 CountryOrigin=原產地
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
+RegionStateOrigin=原始產地
+StateOrigin=州|省份
 Nature=產品性質（材料/成品）
 NatureOfProductShort=產品性質
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=產品原料或成品
 ShortLabel=短標籤
 Unit=單位
 p=u.
@@ -242,7 +243,7 @@ AlwaysUseFixedPrice=使用固定價格
 PriceByQuantity=數量不同的價格
 DisablePriceByQty=停用數量價格
 PriceByQuantityRange=數量範圍
-MultipriceRules=Automatic prices for segment
+MultipriceRules=價格自動分段
 UseMultipriceRules=使用價格區段規則（在產品模組設定中定義），根據第一區段自動計算所有其他區段的價格
 PercentVariationOver=%%超過%s上的變化
 PercentDiscountOver=%%超過%s的折扣
@@ -290,7 +291,7 @@ PriceExpressionEditorHelp5=可用的全域值：
 PriceMode=價格模式
 PriceNumeric=號碼
 DefaultPrice=預設價格
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=舊預設價格紀錄
 ComposedProductIncDecStock=母產品變更時增加/減少庫存
 ComposedProduct=子產品
 MinSupplierPrice=最低採購價格
@@ -313,7 +314,7 @@ LastUpdated=最新更新
 CorrectlyUpdated=更新成功
 PropalMergePdfProductActualFile=用於增加到PDF Azur的文件是
 PropalMergePdfProductChooseFile=選擇PDF文件
-IncludingProductWithTag=包含有標籤的產品/服務
+IncludingProductWithTag=Include products/services with tag
 DefaultPriceRealPriceMayDependOnCustomer=預設價格，實際價格可能取決於客戶
 WarningSelectOneDocument=請至少選擇一份文件
 DefaultUnitToShow=單位
@@ -343,7 +344,7 @@ UseProductFournDesc=增加供應商已定義產品描述的功能，以針對客
 ProductSupplierDescription=產品的供應商說明
 UseProductSupplierPackaging=按照供應商價格使用包裝（在供應商文件中增加/更新行時，根據供應商價格上設定的包裝重新計算數量）
 PackagingForThisProduct=包裝
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+PackagingForThisProductDesc=根據供應商訂單，您將自動訂購此數量（或此數量的倍數）。不能少於最低購買數量
 QtyRecalculatedWithPackaging=根據供應商的包裝重新計算了生產線的數量
 
 #Attributes
@@ -367,9 +368,9 @@ SelectCombination=選擇組合
 ProductCombinationGenerator=變數產生器
 Features=功能
 PriceImpact=價格影響
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=影響價格層級%s
+ApplyToAllPriceImpactLevel= 使用於所有層級
+ApplyToAllPriceImpactLevelHelp=點擊此處，可以在所有層級上設定相同的價格影響
 WeightImpact=重量影響
 NewProductAttribute=新屬性
 NewProductAttributeValue=新屬性值
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 81804cf8dcf..2dafa3a1e88 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -89,6 +89,7 @@ TimeConsumed=已消耗
 ListOfTasks=任務清單
 GoToListOfTimeConsumed=前往工作時間清單
 GanttView=甘特圖
+ListWarehouseAssociatedProject=List of warehouses associated to the project
 ListProposalsAssociatedProject=與專案有關的商業建議書清單
 ListOrdersAssociatedProject=與專案相關的銷售訂單清單
 ListInvoicesAssociatedProject=與專案相關的客戶發票清單
@@ -268,3 +269,7 @@ OneLinePerTask=每個任務一行
 OneLinePerPeriod=每個週期一行
 RefTaskParent=參考上層任務
 ProfitIsCalculatedWith=利潤計算是使用
+AddPersonToTask=Add also to tasks
+UsageOrganizeEvent=Usage: Event Organization
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
diff --git a/htdocs/langs/zh_TW/propal.lang b/htdocs/langs/zh_TW/propal.lang
index b9822379360..ba1758df186 100644
--- a/htdocs/langs/zh_TW/propal.lang
+++ b/htdocs/langs/zh_TW/propal.lang
@@ -45,9 +45,8 @@ ActionsOnPropal=提案/建議書上的事件
 RefProposal=商業提案/建議書參考
 SendPropalByMail=透過郵件發送商業提案/建議書
 DatePropal=提案/建議書日期
-DateEndPropal=有效期結束日期
+DateEndPropal=有效期
 ValidityDuration=有效期
-CloseAs=將狀態設定為
 SetAcceptedRefused=設定為已接受/已拒絕
 ErrorPropalNotFound=找不到提案/建議書 %s
 AddToDraftProposals=加入到提案/建議書草稿
@@ -60,8 +59,9 @@ ConfirmClonePropal=您確定您要完整複製商業提案/建議書<b>%s</b>？
 ConfirmReOpenProp=您確定要再打開商業提案/建議書<b>%s</b>嗎？
 ProposalsAndProposalsLines=商業提案/建議書和行
 ProposalLine=提案/建議書行
-AvailabilityPeriod=有效期展延
-SetAvailability=設定有效期展延
+ProposalLines=Proposal lines
+AvailabilityPeriod=交貨期
+SetAvailability=設定交貨期
 AfterOrder=訂單後
 OtherProposals=其他提案/建議書
 ##### Availability #####
@@ -71,9 +71,9 @@ AvailabilityTypeAV_2W=2個星期
 AvailabilityTypeAV_3W=3個星期
 AvailabilityTypeAV_1M=1個月
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=代表性的後續提案/建議書
+TypeContact_propal_internal_SALESREPFOLL=提案/建議書聯絡人
 TypeContact_propal_external_BILLING=客戶發票聯絡人
-TypeContact_propal_external_CUSTOMER=後續提案/建議書的客戶聯絡人
+TypeContact_propal_external_CUSTOMER=提案/建議書客戶聯絡人
 TypeContact_propal_external_SHIPPING=客戶交貨聯絡人
 # Document models
 DocModelAzurDescription=完整的提案/建議書模型（Cyan範本的舊範本）
@@ -84,4 +84,9 @@ DefaultModelPropalClosed=當關閉企業提案/建議書時使用的預設範本
 ProposalCustomerSignature=書面驗收，公司印章，日期和簽名
 ProposalsStatisticsSuppliers=供應商提案/建議書統計
 CaseFollowedBy=案件追蹤者
-SignedOnly=Signed only
+SignedOnly=僅簽名
+IdProposal=方案/提案編號
+IdProduct=產品編號
+PrParentLine=方案/提案主行
+LineBuyPriceHT=購買價格扣除稅額
+
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index d28483b5676..db37cf3b2c5 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -18,9 +18,9 @@ DeleteSending=刪除傳送
 Stock=庫存
 Stocks=庫存
 MissingStocks=缺少庫存
-StockAtDate=當時的庫存
-StockAtDateInPast=過去的日期
-StockAtDateInFuture=將來的日期
+StockAtDate=歷史庫存
+StockAtDateInPast=Date in the past
+StockAtDateInFuture=Date in the future
 StocksByLotSerial=依批次/序號的庫存
 LotSerial=批次/序號
 LotSerialList=批次/序號清單
@@ -37,8 +37,8 @@ AllWarehouses=所有倉庫
 IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=包括草稿訂單
 Location=位置
-LocationSummary=簡稱位置
-NumberOfDifferentProducts=產品數量
+LocationSummary=Short name of location
+NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=產品總數
 LastMovement=最新變動
 LastMovements=最新變動(s)
@@ -62,7 +62,8 @@ EnhancedValueOfWarehouses=倉庫價值
 UserWarehouseAutoCreate=新增用戶時自動新增用戶倉庫
 AllowAddLimitStockByWarehouse=除了每個產品的最小和期望庫存值之外，還管理每個配對（產品倉庫）的最小和期望庫存值
 RuleForWarehouse=倉庫規則
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseDuringPropal=為商業提案/建議書設定一個倉庫
 WarehouseAskWarehouseDuringOrder=在銷售訂單上設定一個倉庫
 UserDefaultWarehouse=在用戶上設定一個倉庫
 MainDefaultWarehouse=預設倉庫
@@ -93,19 +94,20 @@ StockLimit=庫存限制的警報
 StockLimitDesc=（空白）表示沒有警告。 可將<br>0用作庫存警告。
 PhysicalStock=實體庫存
 RealStock=實際庫存
-RealStockDesc=實體/實際庫存是當前倉庫中的庫存。
+RealStockDesc=實體/實際庫存是目前倉庫中的庫存。
 RealStockWillAutomaticallyWhen=實際庫存將根據以下規則（在“庫存”模組中定義）進行修改：
 VirtualStock=虛擬庫存
 VirtualStockAtDate=截至日期的虛擬庫存
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+AtDate=目前
 IdWarehouse=編號倉庫
 DescWareHouse=說明倉庫
 LieuWareHouse=本地化倉庫
 WarehousesAndProducts=倉庫和產品
 WarehousesAndProductsBatchDetail=倉庫和產品（有批次/序列的詳細信息）
 AverageUnitPricePMPShort=加權平均價格
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
 SellPriceMin=銷售單價
 EstimatedStockValueSellShort=銷售價值
 EstimatedStockValueSell=銷售價值
@@ -145,7 +147,7 @@ Replenishments=補貨
 NbOfProductBeforePeriod=選則期間以前產品%s庫存的數量(<%s）
 NbOfProductAfterPeriod=選則期間之後產品%s庫存的數量(> %s)
 MassMovement=全部活動
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=記錄轉移
 ReceivingForSameOrder=此訂單的收據
 StockMovementRecorded=庫存變動已記錄
@@ -154,7 +156,7 @@ StockMustBeEnoughForInvoice=庫存水平必須足以將產品/服務新增到發
 StockMustBeEnoughForOrder=庫存水平必須足以將產品/服務新增到訂單中（將此筆加到訂單中時，無論自動庫存更改的規則如何，都要對當前實際庫存進行檢查）
 StockMustBeEnoughForShipment= 庫存水平必須足以將產品/服務新增到發貨中（將此筆加到發貨中時，無論自動庫存更改的規則如何，都要對當前實際庫存進行檢查）
 MovementLabel=產品移動標籤
-TypeMovement=移動類型
+TypeMovement=Direction of movement
 DateMovement=移動日期
 InventoryCode=移動或庫存代碼
 IsInPackage=包含在包裝中
@@ -183,6 +185,7 @@ inventoryCreatePermission=產生新庫存
 inventoryReadPermission=檢視庫存
 inventoryWritePermission=更新庫存
 inventoryValidatePermission=驗證庫存
+inventoryDeletePermission=刪除庫存
 inventoryTitle=庫存
 inventoryListTitle=庫存(s)
 inventoryListEmpty=沒有進行中的庫存
@@ -235,10 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=庫存需要選擇要使用的批次
 ForceTo=強制到
 AlwaysShowFullArbo=在倉庫連結的彈出窗口上顯示完整的倉庫樹狀圖（警告：這可能會大大降低性能）
 StockAtDatePastDesc=您可以在此處檢視給定之過去日期的庫存（實際庫存）
-StockAtDateFutureDesc=您可以在此處檢視給定之未來日期的庫存（虛擬庫存）
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=目前庫存
 InventoryRealQtyHelp=將值設定為0以重置數量<br>保持欄位為空或刪除行以保持不變
-UpdateByScaning=以掃描更新
+UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=掃描更新（產品條碼）
 UpdateByScaningLot=掃描更新（批次|序列條碼）
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
+ImportFromCSV=匯入CSV移動清單
+ChooseFileToImport=上傳檔案，然後點擊%s圖示以選擇要匯入的檔案...
+SelectAStockMovementFileToImport=選擇要匯入的庫存移動檔案
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+LabelOfInventoryMovemement=%s的庫存
+ReOpen=重新打開
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ObjectNotFound=%s not found
+MakeMovementsAndClose=Generate movements and close
+AutofillWithExpected=Fill real quantity with expected quantity
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index 54f6e586026..1c8d77181c5 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=供應商
 SuppliersInvoice=供應商發票
+SupplierInvoices=供應商發票
 ShowSupplierInvoice=顯示供應商發票
 NewSupplier=新供應商
 History=歷史紀錄
@@ -38,7 +39,7 @@ MenuOrdersSupplierToBill=採購訂單發票
 NbDaysToDelivery=交貨延遲時間（天）
 DescNbDaysToDelivery=此訂單中產品的最長交貨延遲時間
 SupplierReputation=供應商信譽
-ReferenceReputation=Reference reputation
+ReferenceReputation=參考商譽
 DoNotOrderThisProductToThisSupplier=不訂購
 NotTheGoodQualitySupplier=低品質
 ReputationForThisProduct=信譽
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index 8ce934d6b3e..1776b33f613 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -70,6 +70,8 @@ Deleted=已刪除
 # Dict
 Type=類型
 Severity=嚴重程度
+TicketGroupIsPublic=Group is public
+TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
 MailToSendTicketMessage=從服務單訊息發送電子郵件
@@ -114,8 +116,8 @@ TicketsShowModuleLogo=在公共界面中顯示模組的商標
 TicketsShowModuleLogoHelp=啟用此選項可在公共界面的頁面中隱藏商標模組
 TicketsShowCompanyLogo=在公共界面上顯示公司商標
 TicketsShowCompanyLogoHelp=啟用此選項可在公共界面的頁面中隱藏主要公司的商標
-TicketsEmailAlsoSendToMainAddress=同時發送通知到主要電子郵件地址
-TicketsEmailAlsoSendToMainAddressHelp=啟用此選項可將電子郵件發送到“通知電子郵件來源”地址（請參閱下面的設定）
+TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
+TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
 TicketsLimitViewAssignedOnly=限制顯示分配給目前用戶的服務單。（對外部用戶無效，始終被限制於他們所依賴的合作方）
 TicketsLimitViewAssignedOnlyHelp=僅顯示分配給目前用戶的服務單。不適用於具有服務單管理權限的用戶。
 TicketsActivatePublicInterface=啟用公共界面
@@ -123,13 +125,13 @@ TicketsActivatePublicInterfaceHelp=公共界面允許任何訪客建立服務單
 TicketsAutoAssignTicket=自動分配建立服務單的用戶
 TicketsAutoAssignTicketHelp=建立服務單時，可以自動將用戶分配給服務單。
 TicketNumberingModules=服務單編號模組
-TicketsModelModule=Document templates for tickets
+TicketsModelModule=服務單的文件範本
 TicketNotifyTiersAtCreation=建立時通知合作方
 TicketsDisableCustomerEmail=從公共界面建立服務單時，始終禁用電子郵件
-TicketsPublicNotificationNewMessage=當有新訊息時寄送電子郵件
+TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
 TicketsPublicNotificationNewMessageHelp=當公共界面有新增訊息時寄送電子郵件(給已分配用戶或寄送通知電子郵件給(更新)與/或通知電子郵件給)
 TicketPublicNotificationNewMessageDefaultEmail=通知電子郵件寄送到（更新）
-TicketPublicNotificationNewMessageDefaultEmailHelp=如果沒有分配服務單或用戶沒有電子郵件，請通過電子郵件向此信箱寄送新消息通知。
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
 #
 # Index & list page
 #
@@ -302,3 +304,13 @@ BoxLastModifiedTicket=最新修改的服務單
 BoxLastModifiedTicketDescription=最新%s張修改的服務單
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=沒有最近修改的服務單
+BoxTicketType=Number of open tickets by type
+BoxTicketSeverity=Number of open tickets by severity
+BoxNoTicketSeverity=No tickets opened
+BoxTicketLastXDays=Number of new tickets by days the last %s days
+BoxTicketLastXDayswidget = Number of new tickets by days the last X days
+BoxNoTicketLastXDays=No new tickets the last %s days
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+TicketCreatedToday=Ticket created today
+TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 26680ee4029..26b9aacbd38 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -72,10 +72,10 @@ ExportDataset_user_1=用戶及其屬性
 DomainUser=網域用戶%s
 Reactivate=重新啟用
 CreateInternalUserDesc=此表單使您可以在公司/組織中建立內部用戶。要建立外部用戶（客戶，供應商等），請使用該第三方聯絡卡中的“建立Dolibarr用戶”按鈕。
-InternalExternalDesc=一位 <b>內部</b> 使用者是您 公司/組織 的一部分。<br>一位 <b>外部</b> 使用者是顧客，供應商或是其他 (可從第三方的聯絡人紀錄為第三方建立一位外部使用者)。<br><br>以上兩種情形，在 Dolibarr 權限定義權利，外部使用者可以使用一個跟內部使用者不同的選單管理器 (見 首頁 - 設定 - 顯示)
+InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
 PermissionInheritedFromAGroup=因為從權限授予一個用戶的一組繼承。
 Inherited=繼承
-UserWillBe=Created user will be
+UserWillBe=建立的用戶將是
 UserWillBeInternalUser=建立的用戶將是一個內部用戶（因為沒有連結到一個特定的第三方）
 UserWillBeExternalUser=建立的用戶將是外部用戶（因為連結到一個特定的第三方）
 IdPhoneCaller=手機來電者身份
@@ -112,7 +112,7 @@ UserAccountancyCode=用戶帳號
 UserLogoff=用戶登出
 UserLogged=用戶登入
 DateOfEmployment=到職日期
-DateEmployment=就業機會
+DateEmployment=雇傭期間
 DateEmploymentstart=入職日期
 DateEmploymentEnd=離職日期
 RangeOfLoginValidity=登入的有效日期範圍
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index f83dc275c73..7a2ba12877b 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>使用Apache/NGinx/...</u><br>建立您的網頁伺服器
 ExampleToUseInApacheVirtualHostConfig=在Apache虛擬主機設定中使用的範例：
 YouCanAlsoTestWithPHPS=在開發環境中<u>使用嵌入式PHP伺服器</u><br>, 您也許想要使用<br><strong>php -S 0.0.0.0:8080 -t %s</strong> 來測試此嵌入式PHP伺服器 (需要PHP 5.5) 的網站
 YouCanAlsoDeployToAnotherWHP=<u>在其他Dolibarr網站託管供應商執行您的網站</u> <br>如果您在網路上沒有Apache或NGinx之類的Web伺服器，則可以將網站匯出並匯入到另一個由Dolibarr網站託管供應商提供且有完整整合網站模組。您可以在<a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>上找到一些Dolibarr網站託管服務供應商的清單。
-CheckVirtualHostPerms=還要檢查虛擬主機是否具有將<strong> %s </strong>上的許可權轉換為<br> <strong> %s </strong>的權限
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=閱讀
 WritePerm=寫入
 TestDeployOnWeb=上線 測試/部署
 PreviewSiteServedByWebServer=<u>在新分頁中預覽%s。 </u> <br> <br> %s將由外部Web伺服器（例如Apache，Nginx，IIS）提供服務。您必須先安裝和設定此伺服器，然後再指向目錄：<br> <strong> %s </strong> <br>外部伺服器提供的網址：<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>在新分頁中預覽%s。 </u> <br> <br> Dolibarr伺服器將為%s提供服務，因此不需要安裝任何其他Web伺服器（例如Apache，Nginx，IIS）。 <br>的不便之處在於頁面的URL不友好，並且以Dolibarr的路徑開頭。 <br> URL由Dolibarr提供：<br> <strong> %s </strong> <br> <br>要使用自己的外部Web伺服器來服務於這個網站，在您的Web伺服器上建立一個虛擬主機其指向目錄<br> <strong> %s </strong> <br>然後輸入該虛伺服器的名稱然後點擊另一個預覽按鈕。
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
 VirtualHostUrlNotDefined=未定義由外部網站伺服器提供服務的虛擬主機網址
 NoPageYet=暫無頁面
 YouCanCreatePageOrImportTemplate=您可以建立一個新頁面或匯入完整的網站模板
@@ -100,7 +100,7 @@ EmptyPage=空白頁
 ExternalURLMustStartWithHttp=外部網址必須以http://或https://開始
 ZipOfWebsitePackageToImport=上傳網站模板包的Zip檔案
 ZipOfWebsitePackageToLoad=或選擇一個可用的嵌入式網站模板包
-ShowSubcontainers=Show dynamic content
+ShowSubcontainers=顯示動態內容
 InternalURLOfPage=頁面的內部網址
 ThisPageIsTranslationOf=該頁面/內容是以下內容的翻譯：
 ThisPageHasTranslationPages=此頁面/內容已翻譯
@@ -135,5 +135,13 @@ RSSFeed=RSS 訂閱
 RSSFeedDesc=您可以使用此網址獲得類型為“ blogpost”的最新文章RSS feed。
 PagesRegenerated=已重新產生%s頁面/容器
 RegenerateWebsiteContent=重新產生網站快取檔案
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+AllowedInFrames=允許在框架中
+DefineListOfAltLanguagesInWebsiteProperties=在網站屬性中定義所有可用語言的清單。
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated
+ImportFavicon=Favicon
+ErrorFaviconType=Favicon must be png
+ErrorFaviconSize=Favicon must be of size 32x32
+FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/zh_TW/zapier.lang b/htdocs/langs/zh_TW/zapier.lang
index 0d40930b895..83bf36a1885 100644
--- a/htdocs/langs/zh_TW/zapier.lang
+++ b/htdocs/langs/zh_TW/zapier.lang
@@ -13,17 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# Generic
-#
-
-# Module label 'ModuleZapierForDolibarrName'
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-# Module description 'ModuleZapierForDolibarrDesc'
 ModuleZapierForDolibarrDesc = Zapier的Dolibarr模組
-
-#
-# Admin page
-#
-ZapierForDolibarrSetup = Zapier的設定
-ZapierDescription=Interface with Zapier
+ZapierForDolibarrSetup=Zapier的設定
+ZapierDescription=Zapier界面
+ZapierAbout=About the module Zapier
+ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.

From d66540bf001775184275bd2fd966bac8003fa27d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 20 Apr 2021 04:42:51 +0200
Subject: [PATCH 180/928] Revert "Split mod fournisseur"

This reverts commit 78dbf4f7ffdedb0eaf3b104618cc80536146f4c2.
---
 htdocs/comm/action/class/cactioncomm.class.php | 4 ++--
 htdocs/comm/index.php                          | 4 ++--
 htdocs/compta/accounting-files.php             | 2 +-
 htdocs/compta/index.php                        | 2 +-
 htdocs/contact/consumption.php                 | 4 ++--
 htdocs/core/ajax/selectsearchbox.php           | 2 +-
 htdocs/core/lib/product.lib.php                | 2 +-
 htdocs/core/menus/standard/eldy.lib.php        | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 66586cff4a3..8483839b944 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -201,10 +201,10 @@ class CActionComm
 						if ($obj->module == 'propal' && empty($conf->propal->enabled)  && empty($user->propale->lire)) {
 							$qualified = 0;
 						}
-						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($user->rights->fournisseur->facture->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (empty($conf->supplier_invoice->enabled) && empty($user->rights->supplier_invoice->lire)))) {
+						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || empty($conf->supplier_invoice->enabled)) && empty($user->fournisseur->facture->lire)) {
 							$qualified = 0;
 						}
-						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($user->rights->fournisseur->commande->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (empty($conf->supplier_order->enabled) && empty($user->rights->supplier_order->lire)))) {
+						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || empty($conf->supplier_order->enabled)) && empty($user->fournisseur->commande->lire)) {
 							$qualified = 0;
 						}
 						if ($obj->module == 'shipping' && empty($conf->expedition->enabled) && empty($user->expedition->lire)) {
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 8b763243bf1..a3826fa7dcd 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -588,7 +588,7 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
 /*
  * Last suppliers
  */
-if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->societe->lire) {
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->societe->lire) {
 	$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 	$sql .= ", s.code_client, s.code_compta, s.client";
 	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
@@ -647,7 +647,7 @@ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_S
 				{
 					$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
 				}*/
-				if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur) {
+				if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur) {
 					$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
 				}
 				print $s;
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 9ce9dfb6f8b..68c73c84090 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -128,7 +128,7 @@ $error = 0;
 
 $listofchoices = array(
 	'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills', 'enabled' => !empty($conf->facture->enabled), 'perms' => !empty($user->rights->facture->lire)),
-	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => !empty($conf->supplier_invoice->enabled), 'perms' => (!empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->supplier_invoice->lire)),
+	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => !empty($conf->supplier_invoice->enabled), 'perms' => !empty($user->rights->fournisseur->facture->lire)),
 	'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips', 'enabled' => !empty($conf->expensereport->enabled), 'perms' => !empty($user->rights->expensereport->lire)),
 	'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation', 'enabled' => !empty($conf->don->enabled), 'perms' => !empty($user->rights->don->lire)),
 	'selectsocialcontributions'=>array('label'=>'SocialContributions', 'enabled' => !empty($conf->tax->enabled), 'perms' => !empty($user->rights->tax->charges->lire)),
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index e208fce3539..4d46f04a136 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -258,7 +258,7 @@ if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 
 
 // Last modified supplier invoices
-if (((!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire))) {
+if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
 	$langs->load("boxes");
 	$facstatic = new FactureFournisseur($db);
 
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index f421d287299..b87a73e8cc2 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -167,10 +167,10 @@ if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) {
 
 if ($object->thirdparty->fournisseur) {
 	$thirdTypeArray['supplier'] = $langs->trans("supplier");
-	if ((!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) {
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
 		$elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
 	}
-	if ((!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->lire)) {
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) {
 		$elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
 	}
 
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 5d81f4b250d..d10324ef620 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -115,7 +115,7 @@ if (!empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARC
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) {
 	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if ((!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED)) || (!empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire)) {
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
 	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index d054c8d5569..e8ce515317f 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -58,7 +58,7 @@ function product_prepare_head($object)
 	}
 
 	if (!empty($object->status_buy) || (!empty($conf->margin->enabled) && !empty($object->status))) {   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
-		if ((((!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)))
+		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
 		|| (!empty($conf->margin->enabled) && $user->rights->margin->liretous)
 		) {
 			$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 5e63dc4d081..7e815523283 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -281,7 +281,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			) ? 1 : 0,
 		'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire)
 			|| !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read)
-			|| !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->supplier_invoice->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),
+			|| !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),
 		'module'=>'facture|supplier_invoice|don|tax|salaries|loan'
 	);
 	$menu_arr[] = array(

From f82d1d246d303904abed30b1c1067f9f1bce85e7 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 09:45:32 +0200
Subject: [PATCH 181/928] cleanup on the index registration page

---
 htdocs/public/project/index.php | 618 +-------------------------------
 1 file changed, 8 insertions(+), 610 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 9b04890084e..7ff74c31cb9 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -85,6 +85,12 @@ $id = dol_decode(GETPOST('id'), $dolibarr_main_instance_unique_id);
 //$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.
 
+$project = new Project($db);
+$resultproject = $project->fetch($id);
+if ($resultproject < 0) {
+	$error++;
+	$errmsg .= $project->error;
+}
 
 /*
  * Actions
@@ -180,6 +186,7 @@ if (!empty($conf->global->PAYMENT_NEWFORM_TEXT)) {
 if (empty($text)) {
 	$text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
 	$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
 }
 print $text;
 
@@ -192,103 +199,10 @@ $var = false;
 
 $object = null;
 
-
-// Free payment
-if (!$source) {
-	$found = true;
-	$tag = GETPOST("tag", 'alpha');
-	if (GETPOST('fulltag', 'alpha')) {
-		$fulltag = GETPOST('fulltag', 'alpha');
-	} else {
-		$fulltag = "TAG=".$tag;
-	}
-
-}
-
-
-// Payment on customer order
-if ($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);
-	}
-	$object = $order;
-
-	if (GETPOST('fulltag', 'alpha')) {
-		$fulltag = GETPOST('fulltag', 'alpha');
-	} else {
-		$fulltag = 'ORD='.$order->id.'.CUS='.$order->thirdparty->id;
-		if (!empty($TAG)) {
-			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
-		}
-	}
-	$fulltag = dol_string_unaccent($fulltag);
-}
-
-
-// Payment on customer invoice
-if ($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);
-	}
-	$object = $invoice;
-
-	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
-		$amount = price2num($invoice->total_ttc - ($invoice->getSommePaiement() + $invoice->getSumCreditNotesUsed() + $invoice->getSumDepositsUsed()));
-		if (GETPOST("amount", 'alpha')) {
-			$amount = GETPOST("amount", 'alpha');
-		}
-		$amount = price2num($amount);
-	}
-
-	if (GETPOST('fulltag', 'alpha')) {
-		$fulltag = GETPOST('fulltag', 'alpha');
-	} else {
-		$fulltag = 'INV='.$invoice->id.'.CUS='.$invoice->thirdparty->id;
-		if (!empty($TAG)) {
-			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
-		}
-	}
-	$fulltag = dol_string_unaccent($fulltag);
-
-	$labeldesc = $langs->trans("Invoice").' '.$invoice->ref;
-	if (GETPOST('desc', 'alpha')) {
-		$labeldesc = GETPOST('desc', 'alpha');
-	}
-	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
-}
-
-if (!$found && !$mesg) {
-	$mesg = $langs->trans("ErrorBadParameters");
-}
-
-if ($mesg) {
-	print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
-}
-
 print "\n";
 
 
-// Show all payment mode buttons (Stripe, Paypal, ...)
+// Show all action buttons
 print '<br>';
 print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
 print '<br><br>';
@@ -306,522 +220,6 @@ print '</div>'."\n";
 print '<br>';
 
 
-
-// Add more content on page for some services
-if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payment mode
-	// Stripe
-	if (GETPOST('dopayment_stripe', 'alpha')) {
-		// Personalized checkout
-		print '<style>
-	    /**
-	     * The CSS shown here will not be introduced in the Quickstart guide, but shows
-	     * how you can use CSS to style your Element s container.
-	     */
-	    .StripeElement {
-	        background-color: white;
-	        padding: 8px 12px;
-	        border-radius: 4px;
-	        border: 1px solid transparent;
-	        box-shadow: 0 1px 3px 0 #e6ebf1;
-	        -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>';
-
-		print '<!-- Form payment-form STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = '.$conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION.' STRIPE_USE_NEW_CHECKOUT = '.$conf->global->STRIPE_USE_NEW_CHECKOUT.' -->'."\n";
-		print '<form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">'."\n";
-
-		print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
-		print '<input type="hidden" name="dopayment_stripe" value="1">'."\n";
-		print '<input type="hidden" name="action" value="charge">'."\n";
-		print '<input type="hidden" name="tag" value="'.$TAG.'">'."\n";
-		print '<input type="hidden" name="s" value="'.$source.'">'."\n";
-		print '<input type="hidden" name="ref" value="'.$REF.'">'."\n";
-		print '<input type="hidden" name="fulltag" value="'.$FULLTAG.'">'."\n";
-		print '<input type="hidden" name="suffix" value="'.$suffix.'">'."\n";
-		print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
-		print '<input type="hidden" name="e" value="'.$entity.'" />';
-		print '<input type="hidden" name="amount" value="'.$amount.'">'."\n";
-		print '<input type="hidden" name="currency" value="'.$currency.'">'."\n";
-		print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
-		print '<input type="hidden" name="email" value="'.GETPOST('email', 'alpha').'" />';
-		print '<input type="hidden" name="thirdparty_id" value="'.GETPOST('thirdparty_id', 'int').'" />';
-
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || !empty($conf->global->STRIPE_USE_NEW_CHECKOUT)) {	// Use a SCA ready method
-			require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
-
-			$service = 'StripeLive';
-			$servicestatus = 1;
-			if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')) {
-				$service = 'StripeTest';
-				$servicestatus = 0;
-			}
-
-			$stripe = new Stripe($db);
-			$stripeacc = $stripe->getStripeAccount($service);
-			$stripecu = null;
-			if (is_object($object) && is_object($object->thirdparty)) {
-				$stripecu = $stripe->customerStripe($object->thirdparty, $stripeacc, $servicestatus, 1);
-			}
-
-			if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
-				$noidempotency_key = (GETPOSTISSET('noidempotency') ? GETPOST('noidempotency', 'int') : 0); // By default noidempotency is unset, so we must use a different tag/ref for each payment. If set, we can pay several times the same tag/ref.
-				$paymentintent = $stripe->getPaymentIntent($amount, $currency, $tag, 'Stripe payment: '.$fulltag.(is_object($object) ? ' ref='.$object->ref : ''), $object, $stripecu, $stripeacc, $servicestatus, 0, 'automatic', false, null, 0, $noidempotency_key);
-				// The paymentintnent has status 'requires_payment_method' (even if paymentintent was already paid)
-				//var_dump($paymentintent);
-				if ($stripe->error) {
-					setEventMessages($stripe->error, null, 'errors');
-				}
-			}
-		}
-
-		//if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent))
-		//{
-		print '
-        <table id="dolpaymenttable" summary="Payment form" class="center">
-        <tbody><tr><td class="textpublicpayment">';
-
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
-			print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
-		}
-
-		print '<div class="form-row left">';
-		print '<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>';
-
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
-			print '<br><input id="cardholder-name" class="marginbottomonly" name="cardholder-name" value="" type="text" placeholder="'.$langs->trans("CardOwner").'" autocomplete="off" autofocus required>';
-		}
-
-		print '<div id="card-element">
-        <!-- a Stripe Element will be inserted here. -->
-        </div>';
-
-		print '<!-- Used to display form errors -->
-        <div id="card-errors" role="alert"></div>
-        </div>';
-
-		print '<br>';
-		print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';
-		print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif">';
-
-		print '</td></tr></tbody>';
-		print '</table>';
-		//}
-
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
-			if (empty($paymentintent)) {
-				print '<center>'.$langs->trans("Error").'</center>';
-			} else {
-				print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
-				//$_SESSION["paymentintent_id"] = $paymentintent->id;
-			}
-		}
-
-		print '</form>'."\n";
-
-
-		// JS Code for Stripe
-		if (empty($stripearrayofkeys['publishable_key'])) {
-			$langs->load("errors");
-			print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
-		} else {
-			print '<!-- JS Code for Stripe components -->';
-			print '<script src="https://js.stripe.com/v3/"></script>'."\n";
-			print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
-
-			// Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
-			print '<script type="text/javascript" language="javascript">'."\n";
-
-			if (!empty($conf->global->STRIPE_USE_NEW_CHECKOUT)) {
-				$amountstripe = $amount;
-
-				// Correct the amount according to unit of currency
-				// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
-				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-				if (!in_array($currency, $arrayzerounitcurrency)) {
-					$amountstripe = $amountstripe * 100;
-				}
-
-				$ipaddress = getUserRemoteIP();
-				$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
-				if (is_object($object)) {
-					$metadata['dol_type'] = $object->element;
-					$metadata['dol_id'] = $object->id;
-
-					$ref = $object->ref;
-				}
-
-				try {
-					$arrayforpaymentintent = array(
-						'description'=>'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
-						"metadata" => $metadata
-					);
-					if ($TAG) {
-						$arrayforpaymentintent["statement_descriptor"] = dol_trunc($TAG, 10, 'right', 'UTF-8', 1); // 22 chars that appears on bank receipt (company + description)
-					}
-
-					$arrayforcheckout = array(
-						'payment_method_types' => array('card'),
-						'line_items' => array(array(
-							'name' => $langs->transnoentitiesnoconv("Payment").' '.$TAG, // Label of product line
-							'description' => 'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
-							'amount' => $amountstripe,
-							'currency' => $currency,
-							//'images' => array($urllogofull),
-							'quantity' => 1,
-						)),
-						'client_reference_id' => $FULLTAG,
-						'success_url' => $urlok,
-						'cancel_url' => $urlko,
-						'payment_intent_data' => $arrayforpaymentintent
-					);
-					if ($stripecu) {
-						$arrayforcheckout['customer'] = $stripecu;
-					} elseif (GETPOST('email', 'alpha') && isValidEmail(GETPOST('email', 'alpha'))) {
-						$arrayforcheckout['customer_email'] = GETPOST('email', 'alpha');
-					}
-					$sessionstripe = \Stripe\Checkout\Session::create($arrayforcheckout);
-
-					$remoteip = getUserRemoteIP();
-
-					// Save some data for the paymentok
-					$_SESSION["currencyCodeType"] = $currency;
-					$_SESSION["paymentType"] = '';
-					$_SESSION["FinalPaymentAmt"] = $amount;
-					$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
-					$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
-					$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
-				} catch (Exception $e) {
-					print $e->getMessage();
-				}
-				?>
-				// Code for payment with option STRIPE_USE_NEW_CHECKOUT set
-
-				// Create a Stripe client.
-				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-
-				// 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 = {
-				base: {
-				color: '#32325d',
-				lineHeight: '24px',
-				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-				fontSmoothing: 'antialiased',
-				fontSize: '16px',
-				'::placeholder': {
-				color: '#aab7c4'
-				}
-				},
-				invalid: {
-				color: '#fa755a',
-				iconColor: '#fa755a'
-				}
-				};
-
-				var cardElement = elements.create('card', {style: style});
-
-				// Comment this to avoid the redirect
-				stripe.redirectToCheckout({
-				// Make the id field from the Checkout Session creation API response
-				// available to this file, so you can provide it as parameter here
-				// instead of the {{CHECKOUT_SESSION_ID}} placeholder.
-				sessionId: '<?php print $sessionstripe->id; ?>'
-				}).then(function (result) {
-				// If `redirectToCheckout` fails due to a browser or network
-				// error, display the localized error message to your customer
-				// using `result.error.message`.
-				});
-
-
-				<?php
-			} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
-				?>
-				// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
-
-				// Create a Stripe client.
-				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-
-				// 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 = {
-				base: {
-				color: '#32325d',
-				lineHeight: '24px',
-				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-				fontSmoothing: 'antialiased',
-				fontSize: '16px',
-				'::placeholder': {
-				color: '#aab7c4'
-				}
-				},
-				invalid: {
-				color: '#fa755a',
-				iconColor: '#fa755a'
-				}
-				};
-
-				var cardElement = elements.create('card', {style: style});
-
-				// Add an instance of the card Element into the `card-element` <div>
-				cardElement.mount('#card-element');
-
-				// Handle real-time validation errors from the card Element.
-				cardElement.addEventListener('change', function(event) {
-				var displayError = document.getElementById('card-errors');
-				if (event.error) {
-				console.log("Show event error (like 'Incorrect card number', ...)");
-				displayError.textContent = event.error.message;
-				} else {
-				console.log("Reset error message");
-				displayError.textContent = '';
-				}
-				});
-
-				// Handle form submission
-				var cardholderName = document.getElementById('cardholder-name');
-				var cardButton = document.getElementById('buttontopay');
-				var clientSecret = cardButton.dataset.secret;
-
-				cardButton.addEventListener('click', function(event) {
-				console.log("We click on buttontopay");
-				event.preventDefault();
-
-				if (cardholderName.value == '')
-				{
-				console.log("Field Card holder is empty");
-				var displayError = document.getElementById('card-errors');
-				displayError.textContent = '<?php print dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardOwner"))); ?>';
-				}
-				else
-				{
-				/* Disable button to pay and show hourglass cursor */
-				jQuery('#hourglasstopay').show();
-				jQuery('#buttontopay').hide();
-
-				stripe.handleCardPayment(
-				clientSecret, cardElement, {
-				payment_method_data: {
-				billing_details: {
-				name: cardholderName.value
-				<?php if (GETPOST('email', 'alpha') || (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->email))) {
-					?>, email: '<?php echo dol_escape_js(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $object->thirdparty->email); ?>'<?php
-				} ?>
-				<?php if (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->phone)) {
-					?>, phone: '<?php echo dol_escape_js($object->thirdparty->phone); ?>'<?php
-				} ?>
-				<?php if (is_object($object) && is_object($object->thirdparty)) {
-					?>, address: {
-					city: '<?php echo dol_escape_js($object->thirdparty->town); ?>',
-					<?php if ($object->thirdparty->country_code) {
-						?>country: '<?php echo dol_escape_js($object->thirdparty->country_code); ?>',<?php
-					} ?>
-					line1: '<?php echo dol_escape_js(preg_replace('/\s\s+/', ' ', $object->thirdparty->address)); ?>',
-					postal_code: '<?php echo dol_escape_js($object->thirdparty->zip); ?>'
-					}
-				<?php } ?>
-				}
-				},
-				save_payment_method:<?php if ($stripecu) {
-					print 'true';
-				} else {
-					print 'false';
-				} ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
-				}
-				).then(function(result) {
-				console.log(result);
-				if (result.error) {
-				console.log("Error on result of handleCardPayment");
-				jQuery('#buttontopay').show();
-				jQuery('#hourglasstopay').hide();
-				// Inform the user if there was an error
-				var errorElement = document.getElementById('card-errors');
-				errorElement.textContent = result.error.message;
-				} else {
-				// The payment has succeeded. Display a success message.
-				console.log("No error on result of handleCardPayment, so we submit the form");
-				// Submit the form
-				jQuery('#buttontopay').hide();
-				jQuery('#hourglasstopay').show();
-				// Send form (action=charge that will do nothing)
-				jQuery('#payment-form').submit();
-				}
-				});
-				}
-				});
-
-				<?php
-			} else {
-				// Old method (not SCA ready)
-				?>
-				// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
-
-				// Create a Stripe client.
-				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-
-				// 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 = {
-				base: {
-				color: '#32325d',
-				lineHeight: '24px',
-				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-				fontSmoothing: 'antialiased',
-				fontSize: '16px',
-				'::placeholder': {
-				color: '#aab7c4'
-				}
-				},
-				invalid: {
-				color: '#fa755a',
-				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');
-				if (event.error) {
-				displayError.textContent = event.error.message;
-				} else {
-				displayError.textContent = '';
-				}
-				});
-
-				// Handle form submission
-				var form = document.getElementById('payment-form');
-				console.log(form);
-				form.addEventListener('submit', function(event) {
-				event.preventDefault();
-				<?php
-				if (empty($conf->global->STRIPE_USE_3DSECURE)) {	// Ask credit card directly, no 3DS test
-					?>
-					/* Use token */
-					stripe.createToken(card).then(function(result) {
-					if (result.error) {
-					// Inform the user if there was an error
-					var errorElement = document.getElementById('card-errors');
-					errorElement.textContent = result.error.message;
-					} else {
-					// Send the token to your server
-					stripeTokenHandler(result.token);
-					}
-					});
-					<?php
-				} else // Ask credit card with 3DS test
-				{
-					?>
-					/* Use 3DS source */
-					stripe.createSource(card).then(function(result) {
-					if (result.error) {
-					// Inform the user if there was an error
-					var errorElement = document.getElementById('card-errors');
-					errorElement.textContent = result.error.message;
-					} else {
-					// Send the source to your server
-					stripeSourceHandler(result.source);
-					}
-					});
-					<?php
-				}
-				?>
-				});
-
-
-				/* Insert the Token into the form so it gets submitted to the server */
-				function stripeTokenHandler(token) {
-				// Insert the token ID into the form so it gets submitted to the server
-				var form = document.getElementById('payment-form');
-
-				var hiddenInput = document.createElement('input');
-				hiddenInput.setAttribute('type', 'hidden');
-				hiddenInput.setAttribute('name', 'stripeToken');
-				hiddenInput.setAttribute('value', token.id);
-				form.appendChild(hiddenInput);
-
-				var hiddenInput2 = document.createElement('input');
-				hiddenInput2.setAttribute('type', 'hidden');
-				hiddenInput2.setAttribute('name', 'token');
-				hiddenInput2.setAttribute('value', '<?php echo newToken(); ?>');
-				form.appendChild(hiddenInput2);
-
-				// Submit the form
-				jQuery('#buttontopay').hide();
-				jQuery('#hourglasstopay').show();
-				console.log("submit token");
-				form.submit();
-				}
-
-				/* Insert the Source into the form so it gets submitted to the server */
-				function stripeSourceHandler(source) {
-				// Insert the source ID into the form so it gets submitted to the server
-				var form = document.getElementById('payment-form');
-
-				var hiddenInput = document.createElement('input');
-				hiddenInput.setAttribute('type', 'hidden');
-				hiddenInput.setAttribute('name', 'stripeSource');
-				hiddenInput.setAttribute('value', source.id);
-				form.appendChild(hiddenInput);
-
-				var hiddenInput2 = document.createElement('input');
-				hiddenInput2.setAttribute('type', 'hidden');
-				hiddenInput2.setAttribute('name', 'token');
-				hiddenInput2.setAttribute('value', '<?php echo newToken(); ?>');
-				form.appendChild(hiddenInput2);
-
-				// Submit the form
-				jQuery('#buttontopay').hide();
-				jQuery('#hourglasstopay').show();
-				console.log("submit source");
-				form.submit();
-				}
-
-				<?php
-			}
-
-			print '</script>';
-		}
-	}
-	// This hook is used to show the embedded form to make payments with external payment modules (ie Payzen, ...)
-	$parameters = [
-		'paymentmethod' => $paymentmethod,
-		'amount' => price2num(GETPOST("newamount"), 'MT'),
-		'tag' => GETPOST("tag", 'alpha'),
-		'dopayment' => GETPOST('dopayment', 'alpha')
-	];
-	$reshook = $hookmanager->executeHooks('doPayment', $parameters, $object, $action);
-}
-
-
 htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
 
 llxFooter('', 'public');

From 81907191ca3e75f57d029966b46136b4c477b16c Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 20 Apr 2021 10:17:08 +0200
Subject: [PATCH 182/928] product card typo

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 094ce8670a9..66f4b66aa75 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -894,7 +894,7 @@ if (empty($reshook)) {
 				$result = $facture->addline(
 					$desc,
 					$pu_ht,
-					price2nm(GETPOST('qty'), 'MS'),
+					price2num(GETPOST('qty'), 'MS'),
 					$tva_tx,
 					$localtax1_tx,
 					$localtax2_tx,

From 7405813ad0df90922de51586627cd4c3a25b57e8 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 10:24:36 +0200
Subject: [PATCH 183/928] now displays only buttons if the corresponding
 boolean is checked

---
 htdocs/compta/paiement.php          |  2 +-
 htdocs/public/payment/paymentok.php |  6 +-----
 htdocs/public/project/index.php     | 32 ++++++++++++-----------------
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 94b114c03d8..418bca03d83 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -253,7 +253,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			// Create payment and update this->multicurrency_amounts if this->amounts filled or
 			// this->amounts if this->multicurrency_amounts filled.
-			$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
+			$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
 			if ($paiement_id < 0) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index a52ddb5fbcc..c4f6b0a012c 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -167,11 +167,7 @@ if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
 		// Creation of payment line
 		$paiement = new Paiement($db);
 		$paiement->datepaye     = dol_now();
-		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
-		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
-		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
-		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
-		$paiement->note_private = GETPOST('comment', 'alpha');
+		$paiement->amounts[]    = $paidinvoice->total_ttc; // Array with all payments dispatching with invoice id
 
 		// Validating the attendee
 		$attendeetovalidate = new ConferenceOrBoothAttendee($db);
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 7ff74c31cb9..ff6da63be9a 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -172,22 +172,10 @@ if ($urllogo) {
 
 print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
 
-// Output introduction text
-$text = '';
-if (!empty($conf->global->PAYMENT_NEWFORM_TEXT)) {
-	$langs->load("members");
-	if (preg_match('/^\((.*)\)$/', $conf->global->PAYMENT_NEWFORM_TEXT, $reg)) {
-		$text .= $langs->trans($reg[1])."<br>\n";
-	} else {
-		$text .= $conf->global->PAYMENT_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("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
-	$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
-	$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
-}
+$text  = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
+
 print $text;
 
 // Output payment summary form
@@ -204,11 +192,17 @@ print "\n";
 
 // Show all action buttons
 print '<br>';
-print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
-print '<br><br>';
+// Output introduction text
+if($project->accept_conference_suggestions){
+	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
+	print '<br><br>';
+}
 print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">';
 print '<br><br>';
-print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
+if($project->accept_booth_suggestions){
+	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
+}
+
 
 
 print '</td></tr>'."\n";

From b43e85dbf48f3cc50779a9bed03ca34827e2144a Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 10:27:32 +0200
Subject: [PATCH 184/928] added global dolibarr_main_instance_unique_id in
 attendeesubscription page

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index b5ae6b0ba01..bb2de7a590c 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -71,6 +71,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
+global $dolibarr_main_instance_unique_id;
+
 // Init vars
 $errmsg = '';
 $num = 0;

From 3b17a0d66ae6b67e462051311f7ece6b6669eedc Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 10:42:50 +0200
Subject: [PATCH 185/928] wip on paymentok page

---
 htdocs/public/payment/paymentok.php | 40 +++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index c4f6b0a012c..533ce56cee1 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -164,18 +164,36 @@ if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
 	if ($resultinvoice < 0) {
 		setEventMessages(null, $paidinvoice->errors, "errors");
 	} else {
-		// Creation of payment line
-		$paiement = new Paiement($db);
-		$paiement->datepaye     = dol_now();
-		$paiement->amounts[]    = $paidinvoice->total_ttc; // Array with all payments dispatching with invoice id
-
-		// Validating the attendee
-		$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-		$resultattendee = $attendeetovalidate->fetch($ref);
-		if ($resultattendee < 0) {
-			setEventMessages(null, $attendeetovalidate->errors, "errors");
+		// Finding thirdparty
+		$thirdparty = new Societe($db);
+		$resultthirdparty = $thirdparty->fetch($paidinvoice->socid);
+		if ($resultthirdparty <= 0) {
+			$mesg = $thirdparty->error;
+			$error++;
 		} else {
-			$attendeetovalidate->setStatut(1);
+			// Creation of payment line
+			$paiement 				= new Paiement($db);
+			$paiement->facid 		= $paidinvoice->id;
+			$paiement->datepaye     = dol_now();
+			$paiement->amount       = $paidinvoice->total_ttc;
+			$paiement->amounts[]    = $paidinvoice->total_ttc;
+
+			$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
+			if ($paiement_id < 0) {
+				setEventMessages($paiement->error, $paiement->errors, 'errors');
+				$error++;
+			}
+			else {
+				// Validating the attendee
+				$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+				$resultattendee = $attendeetovalidate->fetch($ref);
+				if ($resultattendee < 0) {
+					setEventMessages(null, $attendeetovalidate->errors, "errors");
+				} else {
+					$attendeetovalidate->setStatut(1);
+					// @todo send email
+				}
+			}
 		}
 	}
 }

From 5c490ca57e4e9794b55bcf86fbdc0b409ffbab8c Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 10:56:45 +0200
Subject: [PATCH 186/928] security added to subscriptionok page

---
 .../attendee_subscription.php                 |  2 +-
 .../eventorganization/subscriptionok.php      | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index bb2de7a590c..03fa023ad11 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -349,7 +349,7 @@ if (empty($reshook) && $action == 'add') {
 			// No price has been set
 			// Validating the subscription
 			$confattendee->setStatut(1);
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
 			Header("Location: ".$redirection);
 			exit;
 		}
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index c12c1053e97..e51358f907d 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -56,12 +56,29 @@ if (!empty($conf->paypal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 }
 
+global $dolibarr_main_instance_unique_id, $dolibarr_main_url_root, $mysoc;
+
 $langs->loadLangs(array("main", "companies", "install", "other", "eventorganization"));
 
 $object = new stdClass(); // For triggers
 
 $error = 0;
 
+// Security check
+$securekey = dol_decode(GETPOST('securekey'), $dolibarr_main_instance_unique_id);
+if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY) {
+	print $langs->trans('MissingOrBadSecureKey');
+	exit;
+}
+
+$idthirdparty = dol_decode(GETPOST('idthirdparty'), $dolibarr_main_instance_unique_id);
+
+$thirdparty = new Societe($db);
+$resthirdparty = $thirdparty->fetch($idthirdparty);
+if ($resthirdparty<0) {
+	$error++;
+	$errmsg .= $thirdparty->error;
+}
 
 /*
  * Actions
@@ -153,4 +170,4 @@ unset($_SESSION["TRANSACTIONID"]);
 
 llxFooter('', 'public');
 
-$db->close();
\ No newline at end of file
+$db->close();

From 53a89180d910e9fdfedb95eda2653c75b183558c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 20 Apr 2021 11:22:12 +0200
Subject: [PATCH 187/928] Update element.php

merging by
- if (!empty($conf->facture->enabled))
- if (!empty($conf->loan->enabled))
---
 htdocs/projet/element.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 95c348a7e09..a6e3af11979 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -41,8 +41,6 @@ if (!empty($conf->propal->enabled)) {
 }
 if (!empty($conf->facture->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-}
-if (!empty($conf->facture->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
 if (!empty($conf->commande->enabled)) {
@@ -80,8 +78,6 @@ if (!empty($conf->don->enabled)) {
 }
 if (!empty($conf->loan->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
-}
-if (!empty($conf->loan->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
 }
 if (!empty($conf->stock->enabled)) {

From 3a1f70fe348082167469209bc8b8d2cad2fb3fb7 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 20 Apr 2021 11:31:45 +0200
Subject: [PATCH 188/928] Update bom_agenda.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda';
---
 htdocs/bom/bom_agenda.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index dc3421dea0c..0f18c39d2af 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -126,7 +126,7 @@ $form = new Form($db);
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
 	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-	$help_url = '';
+	$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda';
 	llxHeader('', $title, $help_url);
 
 	if (!empty($conf->notification->enabled)) {

From cce6224c910740941f2e5ee74820100d33675c74 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 20 Apr 2021 11:33:47 +0200
Subject: [PATCH 189/928] Update bom_card.php

$help_url ='EN:Module_BOM';
llxHeader('', $title, $help_url);
---
 htdocs/bom/bom_card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 37ec67e1ba3..ae35eae14f4 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -241,8 +241,8 @@ $formfile = new FormFile($db);
 
 
 $title = $langs->trans('BOM');
-
-llxHeader('', $title, '');
+$help_url ='EN:Module_BOM';
+llxHeader('', $title, $help_url);
 
 // Example : Adding jquery code
 print '<script type="text/javascript" language="javascript">

From 529909c3d1a8bd39729e72170074920acfdc2867 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 11:35:31 +0200
Subject: [PATCH 190/928] wip on sending mails

---
 .../eventorganization/subscriptionok.php      | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index e51358f907d..7fc72f78e7c 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -80,6 +80,38 @@ if ($resthirdparty<0) {
 	$errmsg .= $thirdparty->error;
 }
 
+// Send subscription email
+include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+$formmail = new FormMail($db);
+// Set output language
+$outputlangs = new Translate('', $conf);
+$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+// Load traductions files required by page
+$outputlangs->loadLangs(array("main", "members"));
+// Get email content from template
+$arraydefaultmessage = null;
+$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+
+if (!empty($labeltouse)) {
+	$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+}
+
+if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+	$subject = $arraydefaultmessage->topic;
+	$msg     = $arraydefaultmessage->content;
+}
+
+$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+complete_substitutions_array($substitutionarray, $outputlangs, $object);
+$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+if ($subjecttosend && $texttosend) {
+	$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
+
+	$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
+}
+
 /*
  * Actions
  */

From 634d638a168769276ab7923bbf0dc411e821cc1e Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 20 Apr 2021 11:35:33 +0200
Subject: [PATCH 191/928] Update bom_document.php

$help_url = 'EN:Module_BOM';
---
 htdocs/bom/bom_document.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 1b6db3c0810..c0196670cfb 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -100,8 +100,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 $form = new Form($db);
 
 $title = $langs->trans("BillOfMaterials").' - '.$langs->trans("Files");
-$help_url = '';
-//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+
+$help_url = 'EN:Module_BOM';
+
 llxHeader('', $title, $help_url);
 
 if ($object->id) {

From 792c865ac0b4436ef69d9543e7f1d6ce4f10ea3e Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 20 Apr 2021 11:39:27 +0200
Subject: [PATCH 192/928] Update bom_list.php

new: $help_url = 'EN:Module_BOM';

moved up:  llxHeader('', $title, $help_url);
---
 htdocs/bom/bom_list.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index ed1a0c3ab42..be0a79075f8 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -278,10 +278,12 @@ $form = new Form($db);
 
 $now = dol_now();
 
-//$help_url="EN:Module_BillOfMaterials|FR:Module_BillOfMaterials_FR|ES:Módulo_BillOfMaterials";
-$help_url = '';
+$help_url = 'EN:Module_BOM';
+
 $title = $langs->trans('ListOfBOMs');
 
+llxHeader('', $title, $help_url);
+
 
 // Build and execute select
 // --------------------------------------------------------------------
@@ -393,7 +395,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url);
+// llxHeader('', $title, $help_url);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 

From 4fde184afbf566b48c2855cfd605437ff3f52782 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Apr 2021 11:40:43 +0200
Subject: [PATCH 193/928] Add the setup page of module accounting to not search
 where is setup

---
 htdocs/admin/accountant.php                 |  2 +-
 htdocs/admin/accounting.php                 | 66 +++++++++++++++++++++
 htdocs/core/modules/modAccounting.class.php |  2 +-
 3 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 htdocs/admin/accounting.php

diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 3ed43f1664f..56c9605c460 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -17,7 +17,7 @@
 
 /**
  *	\file       htdocs/admin/accountant.php
- *	\ingroup    accountant
+ *	\ingroup    core
  *	\brief      Setup page to configure accountant / auditor
  */
 
diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php
new file mode 100644
index 00000000000..b32ce06ad22
--- /dev/null
+++ b/htdocs/admin/accounting.php
@@ -0,0 +1,66 @@
+<?php
+/* Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/admin/accounting.php
+ *	\ingroup    accounting
+ *	\brief      Setup page to configure accountanting module
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+
+$action = GETPOST('action', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'adminaccoutant'; // To manage different context of search
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'companies'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$error = 0;
+
+
+/*
+ * Actions
+ */
+
+// Nothing
+
+
+/*
+ * View
+ */
+
+$help_url = '';
+llxHeader('', $langs->trans("ConfigAccountingExpert"), $help_url);
+
+print load_fiche_titre($langs->trans("ConfigAccountingExpert"), '', 'title_setup');
+
+print "<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("AccountancySetupDoneFromAccountancyMenu", $langs->transnoentitiesnoconv("Accounting").' - '.$langs->transnoentitiesnoconv("Setup"))."</span><br>\n";
+print "<br>\n";
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index b4645b51a87..7b289c74253 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -60,7 +60,7 @@ class modAccounting extends DolibarrModules
 		$this->dirs = array('/accounting/temp');
 
 		// Config pages
-		$this->config_page_url = array();
+		$this->config_page_url = array('accounting.php');
 
 		// Dependencies
 		$this->depends = array("modFacture", "modBanque", "modTax"); // List of modules id that must be enabled if this module is enabled

From f1f63cd4e2f22ab338abcca862193d276e12306a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Apr 2021 11:56:26 +0200
Subject: [PATCH 194/928] Enhance detection of update available

---
 htdocs/admin/accounting.php                   |  4 +++-
 htdocs/admin/modules.php                      | 14 ++++++++++++--
 htdocs/core/modules/DolibarrModules.class.php |  4 ++--
 htdocs/langs/en_US/admin.lang                 |  7 ++++---
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php
index b32ce06ad22..e775f5bd8e3 100644
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.php
@@ -55,7 +55,9 @@ $error = 0;
 $help_url = '';
 llxHeader('', $langs->trans("ConfigAccountingExpert"), $help_url);
 
-print load_fiche_titre($langs->trans("ConfigAccountingExpert"), '', 'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+
+print load_fiche_titre($langs->trans("ConfigAccountingExpert"), $linkback, 'title_setup');
 
 print "<br>\n";
 print '<span class="opacitymedium">'.$langs->trans("AccountancySetupDoneFromAccountancyMenu", $langs->transnoentitiesnoconv("Accounting").' - '.$langs->transnoentitiesnoconv("Setup"))."</span><br>\n";
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 84bf924139c..142d5accb0f 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -521,8 +521,8 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 	$moreforfilter = '<div class="valignmiddle">';
 
 	$moreforfilter .= '<div class="floatright right pagination --module-list"><ul><li>';
-	$moreforfilter .= dolGetButtonTitle($langs->trans('CheckForModuleUpdate'), $langs->trans('CheckForModuleUpdateHelp'), 'fa fa-check-double ', $_SERVER["PHP_SELF"].'?action=checklastversion&token='.newToken().'&mode='.$mode.$param, '', 1, array('morecss'=>'reposition'));
-	$moreforfilter .= '</li><li>'.dolGetButtonTitleSeparator();
+	$moreforfilter .= dolGetButtonTitle($langs->trans('CheckForModuleUpdate'), $langs->trans('CheckForModuleUpdate').'<br>'.$langs->trans('CheckForModuleUpdateHelp'), 'fa fa-sync', $_SERVER["PHP_SELF"].'?action=checklastversion&token='.newToken().'&mode='.$mode.$param, '', 1, array('morecss'=>'reposition'));
+	$moreforfilter .= dolGetButtonTitleSeparator();
 	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', ($mode == 'commonkanban' ? 2 : 1), array('morecss'=>'reposition'));
 	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', ($mode == 'common' ? 2 : 1), array('morecss'=>'reposition'));
 	$moreforfilter .= '</li></ul></div>';
@@ -584,6 +584,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 	// Show list of modules
 	$oldfamily = '';
+	$foundoneexternalmodulewithupdate = 0;
 	$linenum = 0;
 	foreach ($orders as $key => $value) {
 		$linenum++;
@@ -915,6 +916,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			if ($objMod->needUpdate) {
 				$versionTitle = $langs->trans('ModuleUpdateAvailable').' : '.$objMod->lastVersion;
 				print '<span class="badge badge-warning classfortooltip" title="'.dol_escape_htmltag($versionTitle).'">'.$versiontrans.'</span>';
+				$foundoneexternalmodulewithupdate++;
 			} else {
 				print $versiontrans;
 			}
@@ -934,6 +936,14 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		}
 	}
 
+	if ($action == 'checklastversion') {
+		if ($foundoneexternalmodulewithupdate) {
+			setEventMessages($langs->trans("ModuleUpdateAvailable"), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("NoExternalModuleWithUpdate"), null, 'mesgs');
+		}
+	}
+
 	if ($oldfamily) {
 		if ($mode == 'commonkanban') {
 			print '</div>';
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 056be705f9e..30ee2bb72be 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2310,9 +2310,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	}
 
 	/**
-	 * check for module update
+	 * Check for module update
 	 * TODO : store results for $this->url_last_version and $this->needUpdate
-	 *  Add a cron task to monitor for updates
+	 * Add a cron task to monitor for updates
 	 *
 	 * @return int <0 if Error, 0 == no update needed,  >0 if need update
 	 */
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1d6e5f0d502..6a11c26c50c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2122,7 +2122,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
-CheckForModuleUpdate=Check for modules updates
-CheckForModuleUpdateHelp=Check for modules updates.<br>This action will connect to modules editors to check if a new version is available.
-ModuleUpdateAvailable=An update is available for this module
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)

From 455d5233e66b13a2e83ed5cd310edff47c4df699 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Apr 2021 11:58:51 +0200
Subject: [PATCH 195/928] Fix trans

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

diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index df1542aa7a7..8303105bb25 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -22,7 +22,7 @@ ProductService=製品やサービス
 AllProducts=すべての製品とサービス
 ChooseProduct/Service=製品またはサービスを選択すること
 ForceBuyingPriceIfNull=定義されていない場合、購入/原価を販売価格に強制する
-ForceBuyingPriceIfNullDetails=新規行を追加するときに購入/原価が提供されておらず、このオプションが「オン」の場合、新規行のマージンは0になる（購入/原価=販売価格）。このオプションが「オフ」（推奨）の場合、マージンはデフォルトで提案されている値と等しくなる（デフォルト値が見つからない場合は100％になる可能性がある）。
+ForceBuyingPriceIfNullDetails=新規行を追加するときに購入/原価が提供されておらず、このオプションが「オン」の場合、新規行のマージンは0になる（購入/原価=販売価格）。このオプションが「オフ」（推奨）の場合、マージンはデフォルトで提案されている値と等しくなる（デフォルト値が見つからない場合は100%%になる可能性がある）。
 MARGIN_METHODE_FOR_DISCOUNT=グローバル割引の利益方式
 UseDiscountAsProduct=製品として
 UseDiscountAsService=サービスとして

From 14f009f5500d07a8f88ebc37cd50b90e44688564 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Apr 2021 12:19:46 +0200
Subject: [PATCH 196/928] Fix CURLOPT_CONNECT_TO

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

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 0d729e6c762..66300a1948b 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -179,7 +179,6 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 			$iptocheck = '0'; //
 		}
 
-		//var_dump($_SERVER);
 		if ($iptocheck) {
 			if ($localurl == 0) {	// Only external url allowed (dangerous, may allow to get malware)
 				if (!filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
@@ -219,7 +218,10 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 
 			// Set CURLOPT_CONNECT_TO so curl will not try another resolution that may give a different result. Possible only on PHP v7+
 			if (defined('CURLOPT_CONNECT_TO')) {
-				curl_setopt($ch, CURLOPT_CONNECT_TO, $iptocheck);
+				$connect_to = array(sprintf("%s:%d:%s:%d", $newUrlArray['host'], $newUrlArray['port'], $iptocheck, $newUrlArray['port']));
+				//var_dump($newUrlArray);
+				//var_dump($connect_to);
+				curl_setopt($ch, CURLOPT_CONNECT_TO, $connect_to);
 			}
 		}
 

From db5fb42c11e75c887d807f3ecbba8c61e4abce6f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Apr 2021 12:27:00 +0200
Subject: [PATCH 197/928] css

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

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 315673f1582..f5ab2af51e3 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -289,7 +289,7 @@ if ($mode == 'overwrite') {
 	print "\n";
 
 	print '<tr class="oddeven"><td>';
-	print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, $disablededit ? 1 : 0, 'maxwidthonsmartphone', 1);
+	print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, $disablededit ? 1 : 0, 'maxwidth250', 1);
 	print '</td>'."\n";
 	print '<td>';
 	print '<input type="text" class="flat maxwidthonsmartphone"'.$disablededit.' name="transkey" id="transkey" value="'.(!empty($transkey) ? $transkey : "").'">';
@@ -338,7 +338,7 @@ if ($mode == 'overwrite') {
 			print '<td>'.$obj->transkey.'</td>'."\n";
 
 			// Value
-			print '<td>';
+			print '<td class="small">';
 			/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
 			print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
 			print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
@@ -482,7 +482,7 @@ if ($mode == 'searchkey') {
 
 	print '<tr class="oddeven"><td>';
 	//print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1);
-	print $formadmin->select_language($langcode, 'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1);
+	print $formadmin->select_language($langcode, 'langcode', 0, null, 0, 0, 0, 'maxwidth250', 1);
 	print '</td>'."\n";
 	print '<td>';
 	print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="'.$transkey.'">';
@@ -529,7 +529,7 @@ if ($mode == 'searchkey') {
 		if ($i > ($offset + $limit)) {
 			break;
 		}
-		print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td>';
+		print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td class="small">';
 		print dol_escape_htmltag($val);
 		print '</td><td class="right nowraponall">';
 		if (!empty($newlangfileonly->tab_translate[$key])) {

From d0d0e0390b748758d075cd63425c3124c382cdb0 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 12:28:34 +0200
Subject: [PATCH 198/928] wip on mail

---
 .../eventorganization/subscriptionok.php      | 19 ++++++++++++++++++-
 htdocs/public/payment/paymentok.php           |  5 +----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 7fc72f78e7c..3fcf74a4c0c 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -109,7 +109,24 @@ $texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 if ($subjecttosend && $texttosend) {
 	$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
 
-	$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
+	global $conf, $langs;
+
+	// Envoi mail confirmation
+	$from = $conf->email_from;
+	if (!empty($conf->global->ADHERENT_MAIL_FROM)) {
+		$from = $conf->global->ADHERENT_MAIL_FROM;
+	}
+
+	$trackid = 'mem'.$this->id;
+
+	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+	$mailfile = new CMailFile($subjecttosend, $thirdparty->email, $from, $texttosend, array(), array(), array(), "", "", 0, -1, '', '', $trackid, $moreinheader);
+	if ($mailfile->sendfile()) {
+		return 1;
+	} else {
+		$this->error = $langs->trans("ErrorFailedToSendMail", $from, $this->email).'. '.$mailfile->error;
+		return -1;
+	}
 }
 
 /*
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 533ce56cee1..90cf38a6051 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -177,13 +177,11 @@ if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
 			$paiement->datepaye     = dol_now();
 			$paiement->amount       = $paidinvoice->total_ttc;
 			$paiement->amounts[]    = $paidinvoice->total_ttc;
-
 			$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
 			if ($paiement_id < 0) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
-			}
-			else {
+			} else {
 				// Validating the attendee
 				$attendeetovalidate = new ConferenceOrBoothAttendee($db);
 				$resultattendee = $attendeetovalidate->fetch($ref);
@@ -191,7 +189,6 @@ if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
 					setEventMessages(null, $attendeetovalidate->errors, "errors");
 				} else {
 					$attendeetovalidate->setStatut(1);
-					// @todo send email
 				}
 			}
 		}

From 1bd2bd3237a9ce17e1673367421c8511cc2d5c2c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Apr 2021 12:46:41 +0200
Subject: [PATCH 199/928] Fix php8 warning

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

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 66300a1948b..ff63ca251c3 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -187,7 +187,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 					$info['content'] = 'Error bad hostname IP (private or reserved range). Must be an external URL.';
 					break;
 				}
-				if ($iptocheck == $_SERVER["SERVER_ADDR"]) {
+				if (!empty($_SERVER["SERVER_ADDR"]) && $iptocheck == $_SERVER["SERVER_ADDR"]) {
 					$info['http_code'] = 400;
 					$info['content'] = 'Error bad hostname IP (IP is a local IP). Must be an external URL.';
 					break;

From 771afbc195a425d7f15b50dc49bd68c7d366cdf5 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:10:29 +0200
Subject: [PATCH 200/928] Update llx_20_c_departements.sql

Italy new
---
 .../mysql/data/llx_20_c_departements.sql      | 224 +++++++++---------
 1 file changed, 112 insertions(+), 112 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 1f3de968346..e1e363e9c62 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -51,7 +51,7 @@
 -- Germany
 -- Honduras
 -- Hungary
--- (Italy)
+-- Italy
 -- Luxembourg
 -- Netherlands
 -- (Moroco)
@@ -531,117 +531,117 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (183300, 'HU-CS', 'HU333', NULL, NULL, 'Csongrád');
 
 
--- Provinces Italy (id=3)
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AG',315,NULL,NULL,NULL,'AGRIGENTO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AL',312,NULL,NULL,NULL,'ALESSANDRIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AN',310,NULL,NULL,NULL,'ANCONA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AO',319,NULL,NULL,NULL,'AOSTA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AR',316,NULL,NULL,NULL,'AREZZO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AP',310,NULL,NULL,NULL,'ASCOLI PICENO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AT',312,NULL,NULL,NULL,'ASTI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AV',304,NULL,NULL,NULL,'AVELLINO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BA',313,NULL,NULL,NULL,'BARI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BT',313,NULL,NULL,NULL,'BARLETTA-ANDRIA-TRANI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BL',320,NULL,NULL,NULL,'BELLUNO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BN',304,NULL,NULL,NULL,'BENEVENTO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BG',309,NULL,NULL,NULL,'BERGAMO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BI',312,NULL,NULL,NULL,'BIELLA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BO',305,NULL,NULL,NULL,'BOLOGNA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BZ',317,NULL,NULL,NULL,'BOLZANO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BS',309,NULL,NULL,NULL,'BRESCIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BR',313,NULL,NULL,NULL,'BRINDISI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CA',314,NULL,NULL,NULL,'CAGLIARI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CL',315,NULL,NULL,NULL,'CALTANISSETTA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CB',311,NULL,NULL,NULL,'CAMPOBASSO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CI',314,NULL,NULL,NULL,'CARBONIA-IGLESIAS');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CE',304,NULL,NULL,NULL,'CASERTA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CT',315,NULL,NULL,NULL,'CATANIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CZ',303,NULL,NULL,NULL,'CATANZARO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CH',301,NULL,NULL,NULL,'CHIETI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CO',309,NULL,NULL,NULL,'COMO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CS',303,NULL,NULL,NULL,'COSENZA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CR',309,NULL,NULL,NULL,'CREMONA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('KR',303,NULL,NULL,NULL,'CROTONE');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CN',312,NULL,NULL,NULL,'CUNEO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('EN',315,NULL,NULL,NULL,'ENNA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FM',310,NULL,NULL,NULL,'FERMO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FE',305,NULL,NULL,NULL,'FERRARA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FI',316,NULL,NULL,NULL,'FIRENZE');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FG',313,NULL,NULL,NULL,'FOGGIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FC',305,NULL,NULL,NULL,'FORLI-CESENA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FR',307,NULL,NULL,NULL,'FROSINONE');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('GE',308,NULL,NULL,NULL,'GENOVA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('GO',306,NULL,NULL,NULL,'GORIZIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('GR',316,NULL,NULL,NULL,'GROSSETO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('IM',308,NULL,NULL,NULL,'IMPERIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('IS',311,NULL,NULL,NULL,'ISERNIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SP',308,NULL,NULL,NULL,'LA SPEZIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AQ',301,NULL,NULL,NULL,'L AQUILA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LT',307,NULL,NULL,NULL,'LATINA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LE',313,NULL,NULL,NULL,'LECCE');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LC',309,NULL,NULL,NULL,'LECCO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LI',314,NULL,NULL,NULL,'LIVORNO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LO',309,NULL,NULL,NULL,'LODI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LU',316,NULL,NULL,NULL,'LUCCA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MC',310,NULL,NULL,NULL,'MACERATA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MN',309,NULL,NULL,NULL,'MANTOVA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MS',316,NULL,NULL,NULL,'MASSA-CARRARA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MT',302,NULL,NULL,NULL,'MATERA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VS',314,NULL,NULL,NULL,'MEDIO CAMPIDANO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('ME',315,NULL,NULL,NULL,'MESSINA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MI',309,NULL,NULL,NULL,'MILANO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MB',309,NULL,NULL,NULL,'MONZA e BRIANZA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MO',305,NULL,NULL,NULL,'MODENA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('NA',304,NULL,NULL,NULL,'NAPOLI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('NO',312,NULL,NULL,NULL,'NOVARA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('NU',314,NULL,NULL,NULL,'NUORO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('OG',314,NULL,NULL,NULL,'OGLIASTRA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('OT',314,NULL,NULL,NULL,'OLBIA-TEMPIO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('OR',314,NULL,NULL,NULL,'ORISTANO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PD',320,NULL,NULL,NULL,'PADOVA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PA',315,NULL,NULL,NULL,'PALERMO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PR',305,NULL,NULL,NULL,'PARMA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PV',309,NULL,NULL,NULL,'PAVIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PG',318,NULL,NULL,NULL,'PERUGIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PU',310,NULL,NULL,NULL,'PESARO e URBINO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PE',301,NULL,NULL,NULL,'PESCARA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PC',305,NULL,NULL,NULL,'PIACENZA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PI',316,NULL,NULL,NULL,'PISA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PT',316,NULL,NULL,NULL,'PISTOIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PN',306,NULL,NULL,NULL,'PORDENONE');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PZ',302,NULL,NULL,NULL,'POTENZA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PO',316,NULL,NULL,NULL,'PRATO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RG',315,NULL,NULL,NULL,'RAGUSA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RA',305,NULL,NULL,NULL,'RAVENNA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RC',303,NULL,NULL,NULL,'REGGIO CALABRIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RE',305,NULL,NULL,NULL,'REGGIO NELL EMILIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RI',307,NULL,NULL,NULL,'RIETI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RN',305,NULL,NULL,NULL,'RIMINI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RM',307,NULL,NULL,NULL,'ROMA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RO',320,NULL,NULL,NULL,'ROVIGO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SA',304,NULL,NULL,NULL,'SALERNO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SS',314,NULL,NULL,NULL,'SASSARI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SV',308,NULL,NULL,NULL,'SAVONA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SI',316,NULL,NULL,NULL,'SIENA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SR',315,NULL,NULL,NULL,'SIRACUSA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SO',309,NULL,NULL,NULL,'SONDRIO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TA',313,NULL,NULL,NULL,'TARANTO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TE',301,NULL,NULL,NULL,'TERAMO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TR',318,NULL,NULL,NULL,'TERNI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TO',312,NULL,NULL,NULL,'TORINO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TP',315,NULL,NULL,NULL,'TRAPANI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TN',317,NULL,NULL,NULL,'TRENTO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TV',320,NULL,NULL,NULL,'TREVISO');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TS',306,NULL,NULL,NULL,'TRIESTE');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('UD',306,NULL,NULL,NULL,'UDINE');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VA',309,NULL,NULL,NULL,'VARESE');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VE',320,NULL,NULL,NULL,'VENEZIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VB',312,NULL,NULL,NULL,'VERBANO-CUSIO-OSSOLA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VC',312,NULL,NULL,NULL,'VERCELLI');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VR',320,NULL,NULL,NULL,'VERONA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VV',303,NULL,NULL,NULL,'VIBO VALENTIA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VI',320,NULL,NULL,NULL,'VICENZA');
-insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VT',307,NULL,NULL,NULL,'VITERBO');
+-- Italy Provinces (id=3)
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (315, 'AG', NULL, NULL, NULL, 'AGRIGENTO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (312, 'AL', NULL, NULL, NULL, 'ALESSANDRIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (310, 'AN', NULL, NULL, NULL, 'ANCONA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (319, 'AO', NULL, NULL, NULL, 'AOSTA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (316, 'AR', NULL, NULL, NULL, 'AREZZO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (310, 'AP', NULL, NULL, NULL, 'ASCOLI PICENO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (312, 'AT', NULL, NULL, NULL, 'ASTI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (304, 'AV', NULL, NULL, NULL, 'AVELLINO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (313, 'BA', NULL, NULL, NULL, 'BARI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (313, 'BT', NULL, NULL, NULL, 'BARLETTA-ANDRIA-TRANI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (320, 'BL', NULL, NULL, NULL, 'BELLUNO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (304, 'BN', NULL, NULL, NULL, 'BENEVENTO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'BG', NULL, NULL, NULL, 'BERGAMO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (312, 'BI', NULL, NULL, NULL, 'BIELLA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (305, 'BO', NULL, NULL, NULL, 'BOLOGNA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (317, 'BZ', NULL, NULL, NULL, 'BOLZANO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'BS', NULL, NULL, NULL, 'BRESCIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (313, 'BR', NULL, NULL, NULL, 'BRINDISI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (314, 'CA', NULL, NULL, NULL, 'CAGLIARI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (315, 'CL', NULL, NULL, NULL, 'CALTANISSETTA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (311, 'CB', NULL, NULL, NULL, 'CAMPOBASSO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (314, 'CI', NULL, NULL, NULL, 'CARBONIA-IGLESIAS');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (304, 'CE', NULL, NULL, NULL, 'CASERTA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (315, 'CT', NULL, NULL, NULL, 'CATANIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (303, 'CZ', NULL, NULL, NULL, 'CATANZARO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (301, 'CH', NULL, NULL, NULL, 'CHIETI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'CO', NULL, NULL, NULL, 'COMO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (303, 'CS', NULL, NULL, NULL, 'COSENZA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'CR', NULL, NULL, NULL, 'CREMONA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (303, 'KR', NULL, NULL, NULL, 'CROTONE');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (312, 'CN', NULL, NULL, NULL, 'CUNEO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (315, 'EN', NULL, NULL, NULL, 'ENNA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (310, 'FM', NULL, NULL, NULL, 'FERMO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (305, 'FE', NULL, NULL, NULL, 'FERRARA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (316, 'FI', NULL, NULL, NULL, 'FIRENZE');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (313, 'FG', NULL, NULL, NULL, 'FOGGIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (305, 'FC', NULL, NULL, NULL, 'FORLI-CESENA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (307, 'FR', NULL, NULL, NULL, 'FROSINONE');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (308, 'GE', NULL, NULL, NULL, 'GENOVA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (306, 'GO', NULL, NULL, NULL, 'GORIZIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (316, 'GR', NULL, NULL, NULL, 'GROSSETO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (308, 'IM', NULL, NULL, NULL, 'IMPERIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (311, 'IS', NULL, NULL, NULL, 'ISERNIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (308, 'SP', NULL, NULL, NULL, 'LA SPEZIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (301, 'AQ', NULL, NULL, NULL, 'L AQUILA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (307, 'LT', NULL, NULL, NULL, 'LATINA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (313, 'LE', NULL, NULL, NULL, 'LECCE');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'LC', NULL, NULL, NULL, 'LECCO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (314, 'LI', NULL, NULL, NULL, 'LIVORNO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'LO', NULL, NULL, NULL, 'LODI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (316, 'LU', NULL, NULL, NULL, 'LUCCA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (310, 'MC', NULL, NULL, NULL, 'MACERATA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'MN', NULL, NULL, NULL, 'MANTOVA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (316, 'MS', NULL, NULL, NULL, 'MASSA-CARRARA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (302, 'MT', NULL, NULL, NULL, 'MATERA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (314, 'VS', NULL, NULL, NULL, 'MEDIO CAMPIDANO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (315, 'ME', NULL, NULL, NULL, 'MESSINA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'MI', NULL, NULL, NULL, 'MILANO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'MB', NULL, NULL, NULL, 'MONZA e BRIANZA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (305, 'MO', NULL, NULL, NULL, 'MODENA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (304, 'NA', NULL, NULL, NULL, 'NAPOLI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (312, 'NO', NULL, NULL, NULL, 'NOVARA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (314, 'NU', NULL, NULL, NULL, 'NUORO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (314, 'OG', NULL, NULL, NULL, 'OGLIASTRA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (314, 'OT', NULL, NULL, NULL, 'OLBIA-TEMPIO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (314, 'OR', NULL, NULL, NULL, 'ORISTANO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (320, 'PD', NULL, NULL, NULL, 'PADOVA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (315, 'PA', NULL, NULL, NULL, 'PALERMO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (305, 'PR', NULL, NULL, NULL, 'PARMA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'PV', NULL, NULL, NULL, 'PAVIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (318, 'PG', NULL, NULL, NULL, 'PERUGIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (310, 'PU', NULL, NULL, NULL, 'PESARO e URBINO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (301, 'PE', NULL, NULL, NULL, 'PESCARA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (305, 'PC', NULL, NULL, NULL, 'PIACENZA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (316, 'PI', NULL, NULL, NULL, 'PISA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (316, 'PT', NULL, NULL, NULL, 'PISTOIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (306, 'PN', NULL, NULL, NULL, 'PORDENONE');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (302, 'PZ', NULL, NULL, NULL, 'POTENZA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (316, 'PO', NULL, NULL, NULL, 'PRATO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (315, 'RG', NULL, NULL, NULL, 'RAGUSA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (305, 'RA', NULL, NULL, NULL, 'RAVENNA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (303, 'RC', NULL, NULL, NULL, 'REGGIO CALABRIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (305, 'RE', NULL, NULL, NULL, 'REGGIO NELL EMILIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (307, 'RI', NULL, NULL, NULL, 'RIETI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (305, 'RN', NULL, NULL, NULL, 'RIMINI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (307, 'RM', NULL, NULL, NULL, 'ROMA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (320, 'RO', NULL, NULL, NULL, 'ROVIGO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (304, 'SA', NULL, NULL, NULL, 'SALERNO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (314, 'SS', NULL, NULL, NULL, 'SASSARI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (308, 'SV', NULL, NULL, NULL, 'SAVONA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (316, 'SI', NULL, NULL, NULL, 'SIENA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (315, 'SR', NULL, NULL, NULL, 'SIRACUSA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'SO', NULL, NULL, NULL, 'SONDRIO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (313, 'TA', NULL, NULL, NULL, 'TARANTO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (301, 'TE', NULL, NULL, NULL, 'TERAMO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (318, 'TR', NULL, NULL, NULL, 'TERNI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (312, 'TO', NULL, NULL, NULL, 'TORINO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (315, 'TP', NULL, NULL, NULL, 'TRAPANI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (317, 'TN', NULL, NULL, NULL, 'TRENTO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (320, 'TV', NULL, NULL, NULL, 'TREVISO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (306, 'TS', NULL, NULL, NULL, 'TRIESTE');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (306, 'UD', NULL, NULL, NULL, 'UDINE');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'VA', NULL, NULL, NULL, 'VARESE');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (320, 'VE', NULL, NULL, NULL, 'VENEZIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (312, 'VB', NULL, NULL, NULL, 'VERBANO-CUSIO-OSSOLA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (312, 'VC', NULL, NULL, NULL, 'VERCELLI');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (320, 'VR', NULL, NULL, NULL, 'VERONA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (303, 'VV', NULL, NULL, NULL, 'VIBO VALENTIA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (320, 'VI', NULL, NULL, NULL, 'VICENZA');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (307, 'VT', NULL, NULL, NULL, 'VITERBO');
 
 
 -- Luxembourg Cantons (id country=140)

From 4180a9ef62b6840450852fe85800023b01aeb260 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Apr 2021 13:30:18 +0200
Subject: [PATCH 201/928] FIX pb when saving some export profiles

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 ++
 htdocs/install/mysql/tables/llx_export_model.sql | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 3f17d23b51f..faf194e6920 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -48,6 +48,8 @@ UPDATE llx_c_country SET eec = 1 WHERE code IN ('AT','BE','BG','CY','CZ','DE','D
 
 -- For v14
 
+ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
+
 create table llx_accounting_groups_account
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql
index 53952430c14..7e68eab4ad5 100644
--- a/htdocs/install/mysql/tables/llx_export_model.sql
+++ b/htdocs/install/mysql/tables/llx_export_model.sql
@@ -24,7 +24,7 @@ create table llx_export_model
   	rowid		integer AUTO_INCREMENT PRIMARY KEY,
 	fk_user		integer DEFAULT 0 NOT NULL,
   	label		varchar(50) NOT NULL,
-  	type		varchar(20) NOT NULL,
+  	type		varchar(64) NOT NULL,
   	field		text NOT NULL,
   	filter		text
   	

From 1729497d621851330cbb40311bfdc905818763cf Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 20 Apr 2021 13:56:58 +0200
Subject: [PATCH 202/928] FIX Accountancy - Quadra export - wrong data on
 credit

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

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index e24b1abe8b1..f884add80de 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -555,7 +555,7 @@ class AccountancyExport
 			$Tab['signe_montant'] = '+';
 
 			// The amount must be in centimes without decimal points.
-			$Tab['montant'] = str_pad(abs(($data->debit - $abs->credit) * 100), 12, '0', STR_PAD_LEFT);
+			$Tab['montant'] = str_pad(abs(($data->debit - $data->credit) * 100), 12, '0', STR_PAD_LEFT);
 			$Tab['contrepartie'] = str_repeat(' ', 8);
 
 			// Force date format : %d%m%y

From 2cde31d17c3fd9300c0c99341a80c311c1a4c6da Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 14:39:41 +0200
Subject: [PATCH 203/928] creation of ATT and BOO payment event

---
 htdocs/public/payment/paymentok.php | 162 +++++++++++++++++++++-------
 1 file changed, 123 insertions(+), 39 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 90cf38a6051..950d68560b5 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -156,45 +156,6 @@ $object = new stdClass(); // For triggers
 
 $error = 0;
 
-// After a conference attendee payment
-if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
-	// Looking for the invoice to which add a payment
-	$paidinvoice = new Facture($db);
-	$resultinvoice = $paidinvoice->fetch($invoiceref);
-	if ($resultinvoice < 0) {
-		setEventMessages(null, $paidinvoice->errors, "errors");
-	} else {
-		// Finding thirdparty
-		$thirdparty = new Societe($db);
-		$resultthirdparty = $thirdparty->fetch($paidinvoice->socid);
-		if ($resultthirdparty <= 0) {
-			$mesg = $thirdparty->error;
-			$error++;
-		} else {
-			// Creation of payment line
-			$paiement 				= new Paiement($db);
-			$paiement->facid 		= $paidinvoice->id;
-			$paiement->datepaye     = dol_now();
-			$paiement->amount       = $paidinvoice->total_ttc;
-			$paiement->amounts[]    = $paidinvoice->total_ttc;
-			$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
-			if ($paiement_id < 0) {
-				setEventMessages($paiement->error, $paiement->errors, 'errors');
-				$error++;
-			} else {
-				// Validating the attendee
-				$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-				$resultattendee = $attendeetovalidate->fetch($ref);
-				if ($resultattendee < 0) {
-					setEventMessages(null, $attendeetovalidate->errors, "errors");
-				} else {
-					$attendeetovalidate->setStatut(1);
-				}
-			}
-		}
-	}
-}
-
 /*
  * Actions
  */
@@ -822,6 +783,129 @@ if ($ispaymentok) {
 			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
+	} elseif (array_key_exists('ATT', $tmptag) && $tmptag['INV'] > 0) {
+		// Record payment
+		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		$object = new Facture($db);
+		$result = $object->fetch($tmptag['INV']);
+		if ($result) {
+			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
+
+			$paymentTypeId = 0;
+			if ($paymentmethod == 'paybox') {
+				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if ($paymentmethod == 'paypal') {
+				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if ($paymentmethod == 'stripe') {
+				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if (empty($paymentTypeId)) {
+				$paymentType = $_SESSION["paymentType"];
+				if (empty($paymentType)) {
+					$paymentType = 'CB';
+				}
+				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+			}
+
+			$currencyCodeType = $_SESSION['currencyCodeType'];
+
+			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
+			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
+				$db->begin();
+
+				// Creation of payment line
+				include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+				$paiement = new Paiement($db);
+				$paiement->datepaye = $now;
+				if ($currencyCodeType == $conf->currency) {
+					$paiement->amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
+				} else {
+					$paiement->multicurrency_amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching
+
+					$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+					$ispostactionok = -1;
+					$error++; // Not yet supported
+				}
+				$paiement->paiementid   = $paymentTypeId;
+				$paiement->num_payment = '';
+				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+				$paiement->ext_payment_id = $TRANSACTIONID;
+				$paiement->ext_payment_site = $service;
+
+				if (!$error) {
+					$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
+					if ($paiement_id < 0) {
+						$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
+						$ispostactionok = -1;
+						$error++;
+					} else {
+						$postactionmessages[] = 'Payment created';
+						$ispostactionok = 1;
+					}
+				}
+
+				if (!$error && !empty($conf->banque->enabled)) {
+					$bankaccountid = 0;
+					if ($paymentmethod == 'paybox') {
+						$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+					} elseif ($paymentmethod == 'paypal') {
+						$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+					} elseif ($paymentmethod == 'stripe') {
+						$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+					}
+
+					if ($bankaccountid > 0) {
+						$label = '(CustomerInvoicePayment)';
+						if ($object->type == Facture::TYPE_CREDIT_NOTE) {
+							$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+						}
+						$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
+						if ($result < 0) {
+							$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
+							$ispostactionok = -1;
+							$error++;
+						} else {
+							$postactionmessages[] = 'Bank transaction of payment created';
+							$ispostactionok = 1;
+						}
+					} else {
+						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
+						$ispostactionok = -1;
+						$error++;
+					}
+				}
+
+				if (!$error) {
+					$db->commit();
+
+					// Validating the attendee
+					$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+					$resultattendee = $attendeetovalidate->fetch($ref);
+					if ($resultattendee < 0) {
+						setEventMessages(null, $attendeetovalidate->errors, "errors");
+					} else {
+						$attendeetovalidate->setStatut(1);
+					}
+					$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+					Header("Location: ".$redirection);
+					exit;
+
+				} else {
+					$db->rollback();
+				}
+			} else {
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.';
+				$ispostactionok = -1;
+			}
+
+		} else {
+			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
+			$ispostactionok = -1;
+		}
+	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['INV'] > 0) {
+		// BOOTH CASE (to copy and adapt from above)
 	} else {
 		// Nothing done
 	}

From b70e477f471a571408f2521b72533558f0ca3d0c Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 14:49:11 +0200
Subject: [PATCH 204/928] removal of the mail sending (not functional yet) in
 the subscriptionok page, it will be moved to the paymentok after payment or
 the attendeesubscription if no payment has to be done

---
 .../attendee_subscription.php                 |  2 +-
 .../eventorganization/subscriptionok.php      | 58 -------------------
 htdocs/public/payment/paymentok.php           | 24 +++++---
 3 files changed, 16 insertions(+), 68 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 03fa023ad11..56855c70b62 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -349,7 +349,7 @@ if (empty($reshook) && $action == 'add') {
 			// No price has been set
 			// Validating the subscription
 			$confattendee->setStatut(1);
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
 			Header("Location: ".$redirection);
 			exit;
 		}
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 3fcf74a4c0c..81db5ac1c02 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -71,64 +71,6 @@ if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY) {
 	exit;
 }
 
-$idthirdparty = dol_decode(GETPOST('idthirdparty'), $dolibarr_main_instance_unique_id);
-
-$thirdparty = new Societe($db);
-$resthirdparty = $thirdparty->fetch($idthirdparty);
-if ($resthirdparty<0) {
-	$error++;
-	$errmsg .= $thirdparty->error;
-}
-
-// Send subscription email
-include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-$formmail = new FormMail($db);
-// Set output language
-$outputlangs = new Translate('', $conf);
-$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-// Load traductions files required by page
-$outputlangs->loadLangs(array("main", "members"));
-// Get email content from template
-$arraydefaultmessage = null;
-$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-
-if (!empty($labeltouse)) {
-	$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
-}
-
-if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-	$subject = $arraydefaultmessage->topic;
-	$msg     = $arraydefaultmessage->content;
-}
-
-$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-complete_substitutions_array($substitutionarray, $outputlangs, $object);
-$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
-
-if ($subjecttosend && $texttosend) {
-	$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
-
-	global $conf, $langs;
-
-	// Envoi mail confirmation
-	$from = $conf->email_from;
-	if (!empty($conf->global->ADHERENT_MAIL_FROM)) {
-		$from = $conf->global->ADHERENT_MAIL_FROM;
-	}
-
-	$trackid = 'mem'.$this->id;
-
-	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($subjecttosend, $thirdparty->email, $from, $texttosend, array(), array(), array(), "", "", 0, -1, '', '', $trackid, $moreinheader);
-	if ($mailfile->sendfile()) {
-		return 1;
-	} else {
-		$this->error = $langs->trans("ErrorFailedToSendMail", $from, $this->email).'. '.$mailfile->error;
-		return -1;
-	}
-}
-
 /*
  * Actions
  */
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 950d68560b5..88d50d66a62 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -783,11 +783,11 @@ if ($ispaymentok) {
 			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
-	} elseif (array_key_exists('ATT', $tmptag) && $tmptag['INV'] > 0) {
+	} elseif (array_key_exists('ATT', $tmptag) && $tmptag['ATT'] > 0) {
 		// Record payment
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
-		$result = $object->fetch($tmptag['INV']);
+		$result = $object->fetch($tmptag['ATT']);
 		if ($result) {
 			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 
@@ -888,23 +888,29 @@ if ($ispaymentok) {
 					} else {
 						$attendeetovalidate->setStatut(1);
 					}
-					$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
-					Header("Location: ".$redirection);
-					exit;
 
+					// Redirecting to confirmation page
+					$thirdparty = new Societe($db);
+					$resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc);
+					if ($resultthirdparty < 0) {
+						setEventMessages(null, $thirdparty->errors, "errors");
+					} else {
+						$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+						Header("Location: ".$redirection);
+						exit;
+					}
 				} else {
 					$db->rollback();
 				}
 			} else {
-				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.';
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['ATT'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
-
 		} else {
-			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
+			$postactionmessages[] = 'Invoice paid '.$tmptag['ATT'].' was not found';
 			$ispostactionok = -1;
 		}
-	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['INV'] > 0) {
+	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['BOO'] > 0) {
 		// BOOTH CASE (to copy and adapt from above)
 	} else {
 		// Nothing done

From 07cd751c59046fb837bece52a4cbb9d5c25cd73c Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 20 Apr 2021 15:51:02 +0200
Subject: [PATCH 205/928] batch status dictionnary

---
 htdocs/admin/dict.php                         | 13 ++++++++-
 .../mysql/data/llx_c_productbatch_status.sql  | 28 +++++++++++++++++++
 .../tables/llx_c_productbatch_status.key.sql  | 19 +++++++++++++
 .../tables/llx_c_productbatch_status.sql      | 25 +++++++++++++++++
 htdocs/langs/en_US/admin.lang                 |  1 +
 htdocs/langs/en_US/productbatch.lang          |  5 ++--
 htdocs/langs/fr_FR/admin.lang                 |  1 +
 htdocs/langs/fr_FR/productbatch.lang          |  6 ++--
 8 files changed, 93 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/install/mysql/data/llx_c_productbatch_status.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_productbatch_status.sql

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 9061fd150b7..8efbbf4cbfa 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -100,7 +100,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0);
+$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0, 43, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
@@ -146,6 +146,7 @@ $tabname[39] = MAIN_DB_PREFIX."c_prospectcontactlevel";
 $tabname[40] = MAIN_DB_PREFIX."c_stcommcontact";
 $tabname[41] = MAIN_DB_PREFIX."c_transport_mode";
 $tabname[42] = MAIN_DB_PREFIX."c_product_nature";
+$tabname[43] = MAIN_DB_PREFIX."c_productbatch_status";
 
 // Dictionary labels
 $tablib = array();
@@ -191,6 +192,7 @@ $tablib[39] = "DictionaryProspectContactLevel";
 $tablib[40] = "DictionaryProspectContactStatus";
 $tablib[41] = "DictionaryTransportMode";
 $tablib[42] = "DictionaryProductNature";
+$tablib[43] = "DictionaryBatchStatus";
 
 // Requests to extract data
 $tabsql = array();
@@ -236,6 +238,7 @@ $tabsql[39] = "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_P
 $tabsql[40] = "SELECT id      as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcommcontact";
 $tabsql[41] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_transport_mode";
 $tabsql[42] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_product_nature";
+$tabsql[43] = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_productbatch_status";
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -281,6 +284,7 @@ $tabsqlsort[39] = "sortorder ASC";
 $tabsqlsort[40] = "code ASC";
 $tabsqlsort[41] = "code ASC";
 $tabsqlsort[42] = "code ASC";
+$tabsqlsort[43] = "code ASC";
 
 // Field names in select result for dictionary display
 $tabfield = array();
@@ -326,6 +330,7 @@ $tabfield[39] = "code,libelle,sortorder";
 $tabfield[40] = "code,libelle,picto";
 $tabfield[41] = "code,label";
 $tabfield[42] = "code,label";
+$tabfield[43] = "code,label";
 
 // Edit field names for editing a record
 $tabfieldvalue = array();
@@ -371,6 +376,7 @@ $tabfieldvalue[39] = "code,libelle,sortorder";
 $tabfieldvalue[40] = "code,libelle,picto";
 $tabfieldvalue[41] = "code,label";
 $tabfieldvalue[42] = "code,label";
+$tabfieldvalue[43] = "code,label";
 
 // Field names in the table for inserting a record
 $tabfieldinsert = array();
@@ -417,6 +423,7 @@ $tabfieldinsert[39] = "code,label,sortorder";
 $tabfieldinsert[40] = "code,libelle,picto";
 $tabfieldinsert[41] = "code,label";
 $tabfieldinsert[42] = "code,label";
+$tabfieldinsert[43] = "code,label";
 
 // Rowid name of field depending if field is autoincrement on or off..
 // Use "" if id field is "rowid" and has autoincrement on
@@ -464,6 +471,7 @@ $tabrowid[39] = "code";
 $tabrowid[40] = "id";
 $tabrowid[41] = "";
 $tabrowid[42] = "rowid";
+$tabrowid[43] = "rowid";
 
 // Condition to show dictionary in setup page
 $tabcond = array();
@@ -509,6 +517,7 @@ $tabcond[39] = (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_
 $tabcond[40] = (!empty($conf->societe->enabled) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
 $tabcond[41] = !empty($conf->intracommreport->enabled);
 $tabcond[42] = !empty($conf->product->enabled);
+$tabcond[43] = !empty($conf->product->enabled && !empty($conf->productbatch->enabled));
 
 // List of help for fields
 $tabhelp = array();
@@ -554,6 +563,7 @@ $tabhelp[39] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[40] = array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"));
 $tabhelp[41] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[42] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[43] = array('code'=>$langs->trans("EnterAnyCode"));
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck = array();
@@ -599,6 +609,7 @@ $tabfieldcheck[39] = array();
 $tabfieldcheck[40] = array();
 $tabfieldcheck[41] = array();
 $tabfieldcheck[42] = array();
+$tabfieldcheck[43] = array();
 
 // Complete all arrays with entries found into modules
 complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck);
diff --git a/htdocs/install/mysql/data/llx_c_productbatch_status.sql b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
new file mode 100644
index 00000000000..a4628e0bd91
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
@@ -0,0 +1,28 @@
+-- Copyright (C) 2021 Noé Cendrier <noe.cendrier@altairis.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Do not place a comment at the end of the line, this file is parsed when
+-- from the install and all '--' are removed.
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'ProductCanBeUsed', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
+
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql b/htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql
new file mode 100644
index 00000000000..fc72f556a97
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql
@@ -0,0 +1,19 @@
+-- ========================================================================
+-- Copyright (C) 2021 Noé Cendrier <noe.cendrier@altairis.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+ALTER TABLE llx_c_productbatch_status ADD UNIQUE INDEX uk_c_productbatch_status(code);
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_status.sql b/htdocs/install/mysql/tables/llx_c_productbatch_status.sql
new file mode 100644
index 00000000000..2ffad7f5939
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_status.sql
@@ -0,0 +1,25 @@
+-- ========================================================================
+-- Copyright (C) 2012-2017      Noé Cendrier  <noe.cendrier@altairis.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (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_c_productbatch_status
+(
+  rowid    integer            AUTO_INCREMENT PRIMARY KEY,
+  code     varchar(16)        NOT NULL,
+  label    varchar(50)        NOT NULL,
+  active   integer  DEFAULT 1 NOT NULL  
+)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b103d0082ba..5d336524798 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1043,6 +1043,7 @@ DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product batch status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 4414b6ad8d8..dc1cccd7d7b 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -32,4 +32,5 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
+OutOfOrder=Out of order
+ProductCanBeUsed=Functional
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index ef48fc0a82d..a9a5327e924 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1034,6 +1034,7 @@ DictionaryOpportunityStatus=Statut d'opportunités pour les affaires/projets
 DictionaryExpenseTaxCat=Note de frais - catégories de déplacement
 DictionaryExpenseTaxRange=Note de frais - Tri par catégorie de déplacement
 DictionaryTransportMode=Déclaration d'échanges intracommunautaires - Mode de transport
+DictionaryBatchStatus=État du lot (produits)
 TypeOfUnit=Type d'unité
 SetupSaved=Configuration sauvegardée
 SetupNotSaved=Configuration non enregistrée
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index cd38ac89278..ce8eae07253 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Utiliser les numéros de lots/série
 ProductStatusOnBatch=Lot (requis)
 ProductStatusOnSerial=Numéro de série (doit être unique pour chaque équipement)
@@ -30,4 +30,6 @@ BatchLotNumberingModules=Modèle de génération et contrôle des numéros de lo
 BatchSerialNumberingModules=Modèle de génération et contrôle des numéros de série
 CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
 LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
-SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
\ No newline at end of file
+SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
+OutOfOrder=Hors d'usage
+ProductCanBeUsed=En état de marche
\ No newline at end of file

From a500d83c0bb988f18eb7217ec8843abfb2a87430 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 16:09:22 +0200
Subject: [PATCH 206/928] linked invoice and attendee

---
 htdocs/core/class/commonobject.class.php      |  5 +++
 .../attendee_subscription.php                 |  3 +-
 htdocs/public/payment/newpayment.php          | 37 +++++++++++--------
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a93acda2a17..2c9e81b369e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3820,6 +3820,11 @@ abstract class CommonObject
 						$classpath = 'projet/class';
 						$classfile = 'project';
 						$classname = 'Project';
+					} elseif ($objecttype == 'conferenceorboothattendee') {
+						$classpath = 'eventorganization/class';
+						$classfile = 'conferenceorboothattendee';
+						$classname = 'ConferenceOrBoothAttendee';
+						$module = 'eventorganization';
 					}
 
 					// Here $module, $classfile and $classname are set
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 56855c70b62..0f92400b5f2 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -321,12 +321,13 @@ if (empty($reshook) && $action == 'add') {
 						$confattendee->errors[] = $confattendee->error;
 					}
 				}
-
 				$resultfacture = $facture->create($user);
 				if ($resultfacture <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;
 					$error++;
+				} else {
+					$facture->add_object_linked($confattendee->element, $confattendee->id);
 				}
 			}
 
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 75d72b4bbea..06f81fccea3 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -117,17 +117,30 @@ if ($source == 'conferencesubscription') {
 	$invoice = new Facture($db);
 	$resultinvoice = $invoice->fetch($decodedinvoiceid);
 	if ($resultinvoice <= 0) {
-		$mesg = $invoice->error;
-		$error++;
+		setEventMessages(null, $invoice->errors, "errors");
 	} else {
+		$invoice->fetchObjectLinked();
 		// Finding the thirdparty associated to the Attendee
 		$thirdparty = new Societe($db);
 		$resultthirdparty = $thirdparty->fetch($invoice->socid);
 		if ($resultthirdparty <= 0) {
-			$mesg = $thirdparty->error;
-			$error++;
+			setEventMessages(null, $thirdparty->errors, "errors");
 		}
 		$object = $thirdparty;
+
+		$linkedAttendees = $invoice->linkedObjectsIds['conferenceorboothattendee'];
+
+		if (is_array($linkedAttendees)) {
+			$linkedAttendees = array_values($linkedAttendees);
+
+			$attendee = new ConferenceOrBoothAttendee($db);
+			$resultattendee = $attendee->fetch($linkedAttendees[0]);
+			if ($resultattendee <= 0) {
+				setEventMessages(null, $attendee->errors, "errors");
+			}
+			var_dump($attendee);
+			exit;
+		}
 	}
 }
 
@@ -363,7 +376,7 @@ if ($action == 'dopayment') {
 
 			// A redirect is added if API call successfull
 			if ($source == 'conferencesubscription') {
-				$PAYPAL_API_OK .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+				$PAYPAL_API_OK .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
@@ -384,7 +397,7 @@ if ($action == 'dopayment') {
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 
 		$mesg = '';
@@ -742,7 +755,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		exit;
 	} else {
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 		header("Location: ".$urlok);
 		exit;
@@ -1763,18 +1776,10 @@ if ($source == 'conferencesubscription') {
 	$found = true;
 	$langs->load("members");
 
-	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
-		$amount = $project->price_registration;
-		if (GETPOST("amount", 'alpha')) {
-			$amount = GETPOST("amount", 'alpha');
-		}
-		$amount = price2num($amount, 'MT');
-	}
-
 	if (GETPOST('fulltag', 'alpha')) {
 		$fulltag = GETPOST('fulltag', 'alpha');
 	} else {
-		$fulltag = 'MEM='.$member->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+		$fulltag = 'ATT='.$attendee->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 		if (!empty($TAG)) {
 			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
 		}

From d340e21cb3ba468f24bdd04cdc21bdc46d4e00c7 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 20 Apr 2021 16:13:36 +0200
Subject: [PATCH 207/928] No translation for dictionary labels

---
 htdocs/install/mysql/data/llx_c_productbatch_status.sql | 4 ++--
 htdocs/langs/en_US/productbatch.lang                    | 2 --
 htdocs/langs/fr_FR/productbatch.lang                    | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_productbatch_status.sql b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
index a4628e0bd91..ebe64ff3a26 100644
--- a/htdocs/install/mysql/data/llx_c_productbatch_status.sql
+++ b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
@@ -23,6 +23,6 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'ProductCanBeUsed', 1);
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'En état de marche', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', "Hors d'usage", 1);
 
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index dc1cccd7d7b..92c224b55f5 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -32,5 +32,3 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-OutOfOrder=Out of order
-ProductCanBeUsed=Functional
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index ce8eae07253..c3e48ddbeb1 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -30,6 +30,4 @@ BatchLotNumberingModules=Modèle de génération et contrôle des numéros de lo
 BatchSerialNumberingModules=Modèle de génération et contrôle des numéros de série
 CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
 LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
-SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
-OutOfOrder=Hors d'usage
-ProductCanBeUsed=En état de marche
\ No newline at end of file
+SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
\ No newline at end of file

From 5ad64640c2270c2dc41c7bc598afe70531c0b0dc Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 16:26:11 +0200
Subject: [PATCH 208/928] removal of var_dump

---
 htdocs/public/payment/newpayment.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 06f81fccea3..22efe3d18af 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -138,8 +138,6 @@ if ($source == 'conferencesubscription') {
 			if ($resultattendee <= 0) {
 				setEventMessages(null, $attendee->errors, "errors");
 			}
-			var_dump($attendee);
-			exit;
 		}
 	}
 }

From f1d68c201b6169bc6f8d19df2e7806e96f003cf2 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 20 Apr 2021 16:56:15 +0200
Subject: [PATCH 209/928] conflict resolution

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

diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 92c224b55f5..aedf85a4fb8 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -32,3 +32,4 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+

From 4c57a6c207636ba44cf2256c829d3a93d9a0c2de Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 17:28:18 +0200
Subject: [PATCH 210/928] wip on mail, sending ok but no content

---
 htdocs/core/class/CMailFile.class.php         |  1 -
 htdocs/langs/en_US/eventorganization.lang     |  4 ++
 .../attendee_subscription.php                 | 46 +++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 863bb9a6794..526c464403f 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -584,7 +584,6 @@ class CMailFile
 			if ($reshook < 0) {
 				$this->error = "Error in hook maildao sendMail ".$reshook;
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-
 				return $reshook;
 			}
 			if ($reshook == 1) {	// Hook replace standard code
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 9e2df362467..5ddd3d259ea 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -113,6 +113,10 @@ ConferenceAttendeeFee = Conference attendee fee
 #
 SubscriptionOk = Your subscription to this conference has been validated
 #
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
 # Payment page
 #
 Attendee = Participant
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 0f92400b5f2..cad279687e7 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -350,6 +350,52 @@ if (empty($reshook) && $action == 'add') {
 			// No price has been set
 			// Validating the subscription
 			$confattendee->setStatut(1);
+
+			// Sending mail
+			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+			$formmail = new FormMail($db);
+			// Set output language
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+			// Load traductions files required by page
+			$outputlangs->loadLangs(array("main", "members"));
+			// Get email content from template
+			$arraydefaultmessage = null;
+
+			$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+
+			if (!empty($labeltouse)) {
+				$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+			}
+
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+				$subject = $arraydefaultmessage->topic;
+				$msg     = $arraydefaultmessage->content;
+			}
+
+			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+			complete_substitutions_array($substitutionarray, $outputlangs, $object);
+			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+			$texttosend = $msg;
+
+			$sendto = $thirdparty->email;
+			$from = $conf->global->MAILING_EMAIL_FROM;
+			$urlback = $_SERVER["REQUEST_URI"];
+			$topic = $langs->trans("ConfAttendeeSubscriptionConfirmation");
+
+			$ishtml = dol_textishtml($texttosend); // May contain urls
+
+			$mailfile = new CMailFile($topic, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+			$result = $mailfile->sendfile();
+			var_dump($result);
+			if ($result) {
+				dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+			} else {
+				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+			}
+
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
 			Header("Location: ".$redirection);
 			exit;

From 95c7657acef236f85c534f1300cc3a02d733c99f Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 20 Apr 2021 20:21:24 +0200
Subject: [PATCH 211/928] add gitingore for modulebuilders

---
 htdocs/modulebuilder/template/.gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/.gitignore b/htdocs/modulebuilder/template/.gitignore
index 942cb8b03ba..150a55149b6 100644
--- a/htdocs/modulebuilder/template/.gitignore
+++ b/htdocs/modulebuilder/template/.gitignore
@@ -15,4 +15,6 @@
 /.buildpath
 /.project
 # Other
-*.back
\ No newline at end of file
+*.back
+/.editorconfig
+/.gitattributes

From b2d6b73125ac16597b6d947519774c9f9bf6f6e2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 20 Apr 2021 20:23:45 +0200
Subject: [PATCH 212/928] add gitingore for modulebuilders

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18ae79180a0..371c8be2f5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,10 +43,6 @@ htdocs/includes/squizlabs/
 htdocs/includes/webmozart/
 htdocs/.well-known/apple-developer-merchantid-domain-association
 
-
-cyberoffice/
-mycyberoffice/
-
 # Node Modules
 build/yarn-error.log
 build/node_modules/

From a15d58065facaf0ef2cd3e46f6f8222aa48d4a55 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 20 Apr 2021 20:25:51 +0200
Subject: [PATCH 213/928] =?UTF-8?q?=09modifi=C3=A9=C2=A0:=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20.gitignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 371c8be2f5e..a008514f2ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,6 @@ yarn.lock
 package-lock.json
 
 doc/install.lock
+
+/htdocs/cyber*
+/htdocs/mycyber*

From 5fe9815570ac4f6b1581783b50672eac06aec58b Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 20 Apr 2021 23:54:33 +0200
Subject: [PATCH 214/928] Update paymentok.php

---
 htdocs/public/payment/paymentok.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 1942635001f..112abe9b149 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -394,7 +394,7 @@ if ($ispaymentok) {
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-				$result = $object->validate($user);
+				$result = $object->status == -2 ? -1 : object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
 				if ($result < 0 || empty($object->datevalid)) {
 					$error++;
 					$errmsg = $object->error;
@@ -412,7 +412,13 @@ if ($ispaymentok) {
 
 				$datesubend = null;
 				if ($datesubscription && $defaultdelay && $defaultdelayunit) {
-					$datesubend = dol_time_plus_duree(dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit), -1, 'd');
+					$datesubend = dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit);
+					// the new end date of subscription must be in futur
+					while (dol_time_plus_duree($datesubend, -1, 'd') < $now) {
+						$datesubend = dol_time_plus_duree($datesubend, $defaultdelay, $defaultdelayunit);
+						$datesubscription = dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit);
+					}
+					$datesubend = dol_time_plus_duree($datesubend, -1, 'd');
 				}
 
 				$paymentdate = $now;

From 86812c13ee4e1dbef605568ab2da0d2af4af93cc Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Wed, 21 Apr 2021 09:18:40 +0200
Subject: [PATCH 215/928] no double quote

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

diff --git a/htdocs/install/mysql/data/llx_c_productbatch_status.sql b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
index ebe64ff3a26..c925c0cd937 100644
--- a/htdocs/install/mysql/data/llx_c_productbatch_status.sql
+++ b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
@@ -24,5 +24,5 @@
 --
 
 INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'En état de marche', 1);
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', "Hors d'usage", 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'Hors d’usage', 1);
 

From 790ff0c64c1a7c93392f87c614e5180ec88356f8 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 10:48:37 +0200
Subject: [PATCH 216/928] mail template working, but info in it not replaced by
 values

---
 htdocs/public/eventorganization/attendee_subscription.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index cad279687e7..6cad964446f 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -364,9 +364,8 @@ if (empty($reshook) && $action == 'add') {
 			$arraydefaultmessage = null;
 
 			$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-
 			if (!empty($labeltouse)) {
-				$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+				$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
 			}
 
 			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
@@ -377,16 +376,15 @@ if (empty($reshook) && $action == 'add') {
 			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 			complete_substitutions_array($substitutionarray, $outputlangs, $object);
 			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-			$texttosend = $msg;
+			$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
 			$sendto = $thirdparty->email;
 			$from = $conf->global->MAILING_EMAIL_FROM;
 			$urlback = $_SERVER["REQUEST_URI"];
-			$topic = $langs->trans("ConfAttendeeSubscriptionConfirmation");
 
 			$ishtml = dol_textishtml($texttosend); // May contain urls
 
-			$mailfile = new CMailFile($topic, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+			$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
 
 			$result = $mailfile->sendfile();
 			var_dump($result);

From 7a65a1768a10fb9b45ab83de56300449d05983b6 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 11:57:03 +0200
Subject: [PATCH 217/928] wip on mail content

---
 htdocs/public/eventorganization/attendee_subscription.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 6cad964446f..727f2c64d6f 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -373,8 +373,11 @@ if (empty($reshook) && $action == 'add') {
 				$msg     = $arraydefaultmessage->content;
 			}
 
-			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
 			complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+			$substitutionarray['ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived'] = 'Vous êtes bien enregistré.';
+
 			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
 			$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
@@ -387,7 +390,6 @@ if (empty($reshook) && $action == 'add') {
 			$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
 
 			$result = $mailfile->sendfile();
-			var_dump($result);
 			if ($result) {
 				dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
 			} else {

From 780b3f4714d8db3f07308ed0b51139bcfeff2da0 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 13:41:30 +0200
Subject: [PATCH 218/928] target:blank added for the link to the registration
 pag

---
 htdocs/eventorganization/conferenceorbooth_list.php       | 2 +-
 htdocs/public/eventorganization/attendee_subscription.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index feb202de663..cbf0e91f7fa 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -368,7 +368,7 @@ if ($projectid > 0) {
 	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$encodedid;
 	$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
 	$linkregister .= '&securekey='.urlencode($encodedsecurekey);
-	print '<a href="'.$linkregister.'">'.$linkregister.'</a>';
+	print '<a target="_blank" href="'.$linkregister.'">'.$linkregister.'</a>';
 	print '</td></tr>';
 
 	// Other attributes
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 727f2c64d6f..22b6955c6f5 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -376,8 +376,6 @@ if (empty($reshook) && $action == 'add') {
 			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
 			complete_substitutions_array($substitutionarray, $outputlangs, $object);
 
-			$substitutionarray['ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived'] = 'Vous êtes bien enregistré.';
-
 			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
 			$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 

From 9809179aa45bb22f107b82a27e9dc1f88a774e2b Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 14:19:07 +0200
Subject: [PATCH 219/928] securekey added to newpayment page, correction in the
 invoice line created

---
 htdocs/langs/en_US/eventorganization.lang         |  2 +-
 .../eventorganization/attendee_subscription.php   | 15 +++++++++++++--
 htdocs/public/payment/newpayment.php              |  3 +++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 5ddd3d259ea..863cec82164 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -107,7 +107,7 @@ MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
 EvntOrgStartDuration = This conference starts on 
 EvntOrgEndDuration =  and ends on
-ConferenceAttendeeFee = Conference attendee fee
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s
 #
 # SubscriptionOk page
 #
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 22b6955c6f5..ed6d5261fcd 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -334,14 +334,25 @@ if (empty($reshook) && $action == 'add') {
 			if (!$error) {
 				// Add line to draft invoice
 				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-				$result = $facture->addline($langs->trans("ConferenceAttendeeFee").' for the event : \''.$conference->label.'\' occuring from '.dol_print_date($conference->datep, '%d/%m/%y %H:%M:%S').' to '.dol_print_date($conference->datep2, '%d/%m/%y %H:%M:%S'), floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+				$result = $facture->addline($langs->trans("ConferenceAttendeeFee", $conference->label, dol_print_date($conference->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conference->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
 				if ($result <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;
 					$error++;
 				}
 				if (!$error) {
-					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.dol_encode($facture->id, $dolibarr_main_instance_unique_id);
+					$valid = true;
+					$sourcetouse = 'conferencesubscription';
+					$reftouse = dol_encode($facture->id, $dolibarr_main_instance_unique_id);
+					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
+
+						} else {
+							$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+						}
+					}
 					Header("Location: ".$redirection);
 					exit;
 				}
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 22efe3d18af..2a43e655288 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -155,6 +155,7 @@ foreach ($_POST as $key => $val) {
 }
 
 
+
 // 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
@@ -168,6 +169,7 @@ $ref = $REF = GETPOST('ref', 'alpha');
 $TAG = GETPOST("tag", 'alpha');
 $FULLTAG = GETPOST("fulltag", 'alpha'); // fulltag is tag with more informations
 $SECUREKEY = GETPOST("securekey"); // Secure key
+
 if ($paymentmethod && !preg_match('/'.preg_quote('PM='.$paymentmethod, '/').'/', $FULLTAG)) {
 	$FULLTAG .= ($FULLTAG ? '.' : '').'PM='.$paymentmethod;
 }
@@ -262,6 +264,7 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 	} else {
 		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
 	}
+
 	if ($SECUREKEY != $token) {
 		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
 			$valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility

From f059cbe89c715775277140bec559283b4112a542 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 14:50:50 +0200
Subject: [PATCH 220/928] ref passed in url no longer crypted (useless) and
 correctly passed through POST at submit

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 htdocs/public/payment/newpayment.php                      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index ed6d5261fcd..7f04bfe0cb5 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -343,7 +343,7 @@ if (empty($reshook) && $action == 'add') {
 				if (!$error) {
 					$valid = true;
 					$sourcetouse = 'conferencesubscription';
-					$reftouse = dol_encode($facture->id, $dolibarr_main_instance_unique_id);
+					$reftouse = $facture->id;
 					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
 					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 2a43e655288..1032737919b 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -113,9 +113,9 @@ if (!$action) {
 
 if ($source == 'conferencesubscription') {
 	// Finding the Attendee
-	$decodedinvoiceid = dol_decode(GETPOST('ref'), $dolibarr_main_instance_unique_id);
+	$invoiceid = GETPOST('ref');
 	$invoice = new Facture($db);
-	$resultinvoice = $invoice->fetch($decodedinvoiceid);
+	$resultinvoice = $invoice->fetch($invoiceid);
 	if ($resultinvoice <= 0) {
 		setEventMessages(null, $invoice->errors, "errors");
 	} else {
@@ -1808,7 +1808,7 @@ if ($source == 'conferencesubscription') {
 	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="'.dol_escape_htmltag($source).'">';
-	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($attendee->ref).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->id).'">';
 	print '</td></tr>'."\n";
 
 	// Amount

From 4d20079c496cd8a79a3e6cbf0a0d5d50b9e3dac0 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 15:20:08 +0200
Subject: [PATCH 221/928] fix: the ref passed in url is now attendee s one, not
 invoice s

---
 .../attendee_subscription.php                 |  2 +-
 htdocs/public/payment/newpayment.php          | 44 ++++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 7f04bfe0cb5..91bc2da646b 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -343,7 +343,7 @@ if (empty($reshook) && $action == 'add') {
 				if (!$error) {
 					$valid = true;
 					$sourcetouse = 'conferencesubscription';
-					$reftouse = $facture->id;
+					$reftouse = $confattendee->id;
 					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
 					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 1032737919b..461cd406a92 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -59,6 +59,7 @@ 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.'/eventorganization/class/conferenceorboothattendee.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -113,30 +114,31 @@ if (!$action) {
 
 if ($source == 'conferencesubscription') {
 	// Finding the Attendee
-	$invoiceid = GETPOST('ref');
-	$invoice = new Facture($db);
-	$resultinvoice = $invoice->fetch($invoiceid);
-	if ($resultinvoice <= 0) {
-		setEventMessages(null, $invoice->errors, "errors");
+	$attendeeid = GETPOST('ref');
+	$attendee = new ConferenceOrBoothAttendee($db);
+	$resultattendee = $attendee->fetch($attendeeid);
+	if ($resultattendee <= 0) {
+		setEventMessages(null, $attendee->errors, "errors");
 	} else {
-		$invoice->fetchObjectLinked();
-		// Finding the thirdparty associated to the Attendee
-		$thirdparty = new Societe($db);
-		$resultthirdparty = $thirdparty->fetch($invoice->socid);
-		if ($resultthirdparty <= 0) {
-			setEventMessages(null, $thirdparty->errors, "errors");
-		}
-		$object = $thirdparty;
 
-		$linkedAttendees = $invoice->linkedObjectsIds['conferenceorboothattendee'];
+		$attendee->fetchObjectLinked();
+		$linkedInvoices = $attendee->linkedObjectsIds['facture'];
 
-		if (is_array($linkedAttendees)) {
-			$linkedAttendees = array_values($linkedAttendees);
+		if (is_array($linkedInvoices)) {
+			$linkedInvoices = array_values($linkedInvoices);
 
-			$attendee = new ConferenceOrBoothAttendee($db);
-			$resultattendee = $attendee->fetch($linkedAttendees[0]);
-			if ($resultattendee <= 0) {
-				setEventMessages(null, $attendee->errors, "errors");
+			$invoice = new Facture($db);
+			$resultinvoice = $invoice->fetch($linkedInvoices[0]);
+			if ($resultinvoice <= 0) {
+				setEventMessages(null, $invoice->errors, "errors");
+			} else {
+				// Finding the associated thirdparty
+				$thirdparty = new Societe($db);
+				$resultthirdparty = $thirdparty->fetch($invoice->socid);
+				if ($resultthirdparty <= 0) {
+					setEventMessages(null, $thirdparty->errors, "errors");
+				}
+				$object = $thirdparty;
 			}
 		}
 	}
@@ -1808,7 +1810,7 @@ if ($source == 'conferencesubscription') {
 	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="'.dol_escape_htmltag($source).'">';
-	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->id).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($attendee->id).'">';
 	print '</td></tr>'."\n";
 
 	// Amount

From 8e7043eca6d1a18d9d98c6328c41da3829ceb99e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 15:31:14 +0200
Subject: [PATCH 222/928] conforbooth class included in paymentok page

---
 htdocs/public/payment/paymentok.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 88d50d66a62..88ab62a8b2f 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -50,6 +50,7 @@ if (is_numeric($entity)) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 
 if (!empty($conf->paypal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';

From ebf2466d7b347836edc500762d3838d4e9b859d3 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 15:36:07 +0200
Subject: [PATCH 223/928] no more redirection to subscriptionok after paymentok
 successful

---
 htdocs/public/payment/paymentok.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 88ab62a8b2f..8b040692dc8 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -889,17 +889,6 @@ if ($ispaymentok) {
 					} else {
 						$attendeetovalidate->setStatut(1);
 					}
-
-					// Redirecting to confirmation page
-					$thirdparty = new Societe($db);
-					$resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc);
-					if ($resultthirdparty < 0) {
-						setEventMessages(null, $thirdparty->errors, "errors");
-					} else {
-						$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
-						Header("Location: ".$redirection);
-						exit;
-					}
 				} else {
 					$db->rollback();
 				}

From 3b9ff839a7d2f4d783ad90da3330522e90412c70 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 21 Apr 2021 14:14:47 +0000
Subject: [PATCH 224/928] Fixing style errors.

---
 htdocs/societe/card.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 512c66f9ddd..72d5ead1935 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1463,7 +1463,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 		print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
 		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) 
+		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE))
 		{
 			print '</td>';
 			if ($conf->browser->layout == 'phone') print '</tr><tr>';
@@ -1471,8 +1471,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		else 
-		{
+		else {
 			print '<input type="hidden" name="effectif_id" id="effectif_id" value="'.$object->effectif_id.'">';
 		}
 		print '</td></tr>';
@@ -2091,7 +2090,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.( ($conf->browser->layout == 'phone' || !empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) ? ' colspan="3"' : '').'>';
 			print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-			if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) 
+			if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE))
 			{
 				print '</td>';
 				if ($conf->browser->layout == 'phone') print '</tr><tr>';
@@ -2099,8 +2098,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
-			else 
-			{
+			else {
 				print '<input type="hidden" name="effectif_id" id="effectif_id" value="'.$object->effectif_id.'">';
 			}
 			print '</td></tr>';
@@ -2508,7 +2506,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		// Workforce/Staff
-		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) 
+		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE))
 		{
 			print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
 		}

From e81637b60811babd93e5b8e2d1ba2ce598c821d9 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 16:37:02 +0200
Subject: [PATCH 225/928] wip on getting the existing attendee

---
 htdocs/langs/en_US/eventorganization.lang     |  3 +-
 .../attendee_subscription.php                 | 32 ++++++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 863cec82164..6ef39e81ff6 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -105,8 +105,7 @@ ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
-EvntOrgStartDuration = This conference starts on 
-EvntOrgEndDuration =  and ends on
+EvntOrgDuration = This conference starts on %s and ends on %s
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s
 #
 # SubscriptionOk page
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 91bc2da646b..2bacd3a1951 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -284,14 +284,24 @@ if (empty($reshook) && $action == 'add') {
 		} else {
 			// creation of an attendee
 			$confattendee = new ConferenceOrBoothAttendee($db);
-			$confattendee->fk_soc = $thirdparty->id;
-			$confattendee->date_subscription = dol_now();
-			$confattendee->email = GETPOST("email");
-			$confattendee->fk_actioncomm = $id;
-			$resultconfattendee = $confattendee->create($user);
-			if ($resultconfattendee < 0) {
-				$error++;
-				$errmsg .= $confattendee->error;
+			$resultfetchattendee = $confattendee->fetchAll('','', 1, 0, array('t.fk_soc'=>$thirdparty->id, 't.fk_actioncomm'=>$id));
+			if ($resultfetchattendee == 0 || count($resultfetchattendee) == 0) {
+				// Need to create an attendee
+				$confattendee->fk_soc = $thirdparty->id;
+				$confattendee->date_subscription = dol_now();
+				$confattendee->email = GETPOST("email");
+				$confattendee->fk_actioncomm = $id;
+				$resultconfattendee = $confattendee->create($user);
+				if ($resultconfattendee < 0) {
+					$error++;
+					$errmsg .= $confattendee->error;
+				}
+				print 'created attendee';
+			} else {
+				// Found an attendee
+				print 'found attendee';
+				var_dump($resultfetchattendee);
+				$confattendee = $resultfetchattendee[0];
 			}
 		}
 	}
@@ -312,6 +322,7 @@ if (empty($reshook) && $action == 'add') {
 				$facture->paye = 0;
 				$facture->date = dol_now();
 				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
+
 				if (empty($facture->cond_reglement_id)) {
 					$paymenttermstatic = new PaymentTerm($confattendee->db);
 					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
@@ -437,10 +448,7 @@ print '<div class="center subscriptionformhelptext justify">';
 // Welcome message
 print $langs->trans("EvntOrgWelcomeMessage");
 print $id.".".'<br>';
-print $langs->trans("EvntOrgStartDuration");
-print dol_print_date($conference->datep).' ';
-print $langs->trans("EvntOrgEndDuration");
-print ' '.dol_print_date($conference->datef).".";
+print $langs->trans("EvntOrgDuration", dol_print_date($conference->datep), dol_print_date($conference->datef));
 print '</div>';
 
 dol_htmloutput_errors($errmsg);

From b9408d6c711df9e90091b317474bf40515150648 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 16:43:57 +0200
Subject: [PATCH 226/928] email sending added in paymentok

---
 htdocs/public/payment/paymentok.php | 43 +++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 8b040692dc8..27b00fec402 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -888,6 +888,49 @@ if ($ispaymentok) {
 						setEventMessages(null, $attendeetovalidate->errors, "errors");
 					} else {
 						$attendeetovalidate->setStatut(1);
+
+						// Sending mail
+						require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+						$formmail = new FormMail($db);
+						// Set output language
+						$outputlangs = new Translate('', $conf);
+						$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+						// Load traductions files required by page
+						$outputlangs->loadLangs(array("main", "members"));
+						// Get email content from template
+						$arraydefaultmessage = null;
+
+						$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+						if (!empty($labeltouse)) {
+							$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+						}
+
+						if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+							$subject = $arraydefaultmessage->topic;
+							$msg     = $arraydefaultmessage->content;
+						}
+
+						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+						complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+						$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+						$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+						$sendto = $thirdparty->email;
+						$from = $conf->global->MAILING_EMAIL_FROM;
+						$urlback = $_SERVER["REQUEST_URI"];
+
+						$ishtml = dol_textishtml($texttosend); // May contain urls
+
+						$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+						$result = $mailfile->sendfile();
+						if ($result) {
+							dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+						} else {
+							dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+						}
 					}
 				} else {
 					$db->rollback();

From 166a23004cbaa01d509dec288450a6290993d315 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 21 Apr 2021 15:04:44 +0000
Subject: [PATCH 227/928] Fixing style errors.

---
 htdocs/societe/card.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ce4fbcb1213..8102c5064f2 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1516,8 +1516,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if ($user->admin) {
 			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE))
-		{
+		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) {
 			print '</td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
@@ -1527,8 +1526,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if ($user->admin) {
 				print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
-		}
-		else {
+		} else {
 			print '<input type="hidden" name="effectif_id" id="effectif_id" value="'.$object->effectif_id.'">';
 		}
 		print '</td></tr>';
@@ -2207,8 +2205,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
-			if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE))
-			{
+			if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) {
 				print '</td>';
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
@@ -2218,8 +2215,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if ($user->admin) {
 					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 				}
-			}
-			else {
+			} else {
 				print '<input type="hidden" name="effectif_id" id="effectif_id" value="'.$object->effectif_id.'">';
 			}
 			print '</td></tr>';
@@ -2658,8 +2654,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '</td></tr>';
 
 		// Workforce/Staff
-		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE))
-		{
+		if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) {
 			print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
 		}
 

From 1700ac937a33c69ef007a4d4361f8f66dcbe8eb8 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 17:25:28 +0200
Subject: [PATCH 228/928] wip on looking for existing attendees instead of
 creating them each time

---
 .../attendee_subscription.php                 | 51 ++++++++-----------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 2bacd3a1951..d88a1ddd55a 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -228,10 +228,26 @@ if (empty($reshook) && $action == 'add') {
 	}
 
 	if (!$error) {
-		// Vérifier si client existe par l'email
+		// Check if attendee already exists (by email)
+		$confattendee = new ConferenceOrBoothAttendee($db);
+		$resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 't.email'=>$email));
+		if ($resultfetchconfattendee != 0 && count($resultfetchconfattendee)>0) {
+			// Found confattendee
+			$confattendee = $resultfetchconfattendee[0];
+		} else {
+			// Need to create a confattendee
+		}
+		$confattendee->date_subscription = dol_now();
+		$confattendee->email = GETPOST("email");
+		$confattendee->fk_actioncomm = $id;
+		$resultconfattendee = $confattendee->create($user);
+		if ($resultconfattendee < 0) {
+			$error++;
+			$errmsg .= $confattendee->error;
+		}
+		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
-		$resultfetchthirdparty = $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
-
+		$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
 		if ($resultfetchthirdparty<0) {
 			$error++;
 			$errmsg .= $thirdparty->error;
@@ -277,33 +293,8 @@ if (empty($reshook) && $action == 'add') {
 			// We have an existing thirdparty ready to use
 			$readythirdparty = 1;
 		}
-
-		if ($readythirdparty < 0) {
-			$error++;
-			$errmsg .= $thirdparty->error;
-		} else {
-			// creation of an attendee
-			$confattendee = new ConferenceOrBoothAttendee($db);
-			$resultfetchattendee = $confattendee->fetchAll('','', 1, 0, array('t.fk_soc'=>$thirdparty->id, 't.fk_actioncomm'=>$id));
-			if ($resultfetchattendee == 0 || count($resultfetchattendee) == 0) {
-				// Need to create an attendee
-				$confattendee->fk_soc = $thirdparty->id;
-				$confattendee->date_subscription = dol_now();
-				$confattendee->email = GETPOST("email");
-				$confattendee->fk_actioncomm = $id;
-				$resultconfattendee = $confattendee->create($user);
-				if ($resultconfattendee < 0) {
-					$error++;
-					$errmsg .= $confattendee->error;
-				}
-				print 'created attendee';
-			} else {
-				// Found an attendee
-				print 'found attendee';
-				var_dump($resultfetchattendee);
-				$confattendee = $resultfetchattendee[0];
-			}
-		}
+		// Updating the fk_soc associated to the confattendee to match the ready to use thirdparty we have got
+		$confattendee->fk_soc = $thirdparty->id;
 	}
 
 	if (!$error) {

From 22dab0e0afb32b929ed503ca88fff5eb60edba34 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 17:26:46 +0200
Subject: [PATCH 229/928] fix on creating attendee

---
 .../attendee_subscription.php                 | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index d88a1ddd55a..e564bec5839 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -228,7 +228,7 @@ if (empty($reshook) && $action == 'add') {
 	}
 
 	if (!$error) {
-		// Check if attendee already exists (by email)
+		// Check if attendee already exists (by email and for this event)
 		$confattendee = new ConferenceOrBoothAttendee($db);
 		$resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 't.email'=>$email));
 		if ($resultfetchconfattendee != 0 && count($resultfetchconfattendee)>0) {
@@ -236,15 +236,16 @@ if (empty($reshook) && $action == 'add') {
 			$confattendee = $resultfetchconfattendee[0];
 		} else {
 			// Need to create a confattendee
+			$confattendee->date_subscription = dol_now();
+			$confattendee->email = GETPOST("email");
+			$confattendee->fk_actioncomm = $id;
+			$resultconfattendee = $confattendee->create($user);
+			if ($resultconfattendee < 0) {
+				$error++;
+				$errmsg .= $confattendee->error;
+			}
 		}
-		$confattendee->date_subscription = dol_now();
-		$confattendee->email = GETPOST("email");
-		$confattendee->fk_actioncomm = $id;
-		$resultconfattendee = $confattendee->create($user);
-		if ($resultconfattendee < 0) {
-			$error++;
-			$errmsg .= $confattendee->error;
-		}
+
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
 		$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);

From be9986f47bebb0586bc137e1460d008525c5777b Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Wed, 21 Apr 2021 21:23:14 +0200
Subject: [PATCH 230/928] Missing $

---
 htdocs/public/payment/paymentok.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 112abe9b149..6bbfd1e3b31 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -394,7 +394,7 @@ if ($ispaymentok) {
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-				$result = $object->status == -2 ? -1 : object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
+				$result = $object->status == -2 ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
 				if ($result < 0 || empty($object->datevalid)) {
 					$error++;
 					$errmsg = $object->error;

From c43863c2a8ebbb25becedee7f492f8a2b577a21a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 22 Apr 2021 11:22:40 +0200
Subject: [PATCH 231/928] Update llx_10_c_regions.sql

Peru
Hungary
---
 .../install/mysql/data/llx_10_c_regions.sql   | 152 +++++++++---------
 1 file changed, 75 insertions(+), 77 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index 5f94ece4720..79d77e6d6af 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -67,6 +67,7 @@
 -- Germany -> for Departmements
 -- Greece
 -- Honduras -> for Departmements
+-- Hungary
 -- India -> for Departmements
 -- Indonesia -> for Departmements
 -- Italy
@@ -76,6 +77,7 @@
 -- Morocco
 -- Netherlands -> for Departmements
 -- Panama -> for Departmements
+-- Peru
 -- Portugal
 -- Romania -> for Departmements
 -- San Salvador
@@ -228,6 +230,16 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 1
 insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 114, 11401, '', 0, 'Honduras');
 
 
+-- Hungary Regions (rowid country=18)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 183100, 'HU31', NULL, 'Northern Hungary');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 183200, 'HU32', NULL, 'Northern Great Plain');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 183300, 'HU33', NULL, 'Southern Great Plain');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 180100, 'HU1',  NULL, 'Central Hungary');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 182100, 'HU21', NULL, 'Central Transdanubia');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 182200, 'HU22', NULL, 'Western Transdanubia');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 182300, 'HU23', NULL, 'Southern Transdanubia');
+
+
 -- India Regions (id country=117)
 insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 117, 11701, '', 0, 'India');
 
@@ -311,6 +323,35 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 1
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 178, 17801, '', 0, 'Panama');
 
 
+-- Peru Regions (id country=181)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18101, '', 0, 'Amazonas');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18102, '', 0, 'Ancash');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18103, '', 0, 'Apurimac');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18104, '', 0, 'Arequipa');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18105, '', 0, 'Ayacucho');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18106, '', 0, 'Cajamarca');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18107, '', 0, 'Callao');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18108, '', 0, 'Cuzco');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18109, '', 0, 'Huancavelica');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18110, '', 0, 'Huanuco');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18111, '', 0, 'Ica');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18112, '', 0, 'Junin');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18113, '', 0, 'La Libertad');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18114, '', 0, 'Lambayeque');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18115, '', 0, 'Lima Metropolitana');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18116, '', 0, 'Lima');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18117, '', 0, 'Loreto');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18118, '', 0, 'Madre de Dios');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18119, '', 0, 'Moquegua');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18120, '', 0, 'Pasco');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18121, '', 0, 'Piura');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18122, '', 0, 'Puno');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18123, '', 0, 'San Martín');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18124, '', 0, 'Tacna');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18125, '', 0, 'Tumbes');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 181, 18126, '', 0, 'Ucayali');
+
+
 -- Portugal Regions (rowid country=25)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 25, 15001, 'PT', NULL, 'Portugal');
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 25, 15002, 'PT9', NULL, 'Azores-Madeira');
@@ -414,84 +455,41 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 2
 
 
 
-
-
--- Regions Peru (id country=181)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18101, '', 0, 'Amazonas', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18102, '', 0, 'Ancash', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18103, '', 0, 'Apurimac', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18104, '', 0, 'Arequipa', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18105, '', 0, 'Ayacucho', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18106, '', 0, 'Cajamarca', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18107, '', 0, 'Callao', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18108, '', 0, 'Cuzco', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18109, '', 0, 'Huancavelica', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18110, '', 0, 'Huanuco', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18111, '', 0, 'Ica', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18112, '', 0, 'Junin', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18113, '', 0, 'La Libertad', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18114, '', 0, 'Lambayeque', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18115, '', 0, 'Lima Metropolitana', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18116, '', 0, 'Lima', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18117, '', 0, 'Loreto', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18118, '', 0, 'Madre de Dios', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18119, '', 0, 'Moquegua', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18120, '', 0, 'Pasco', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18121, '', 0, 'Piura', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18122, '', 0, 'Puno', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18123, '', 0, 'San Martín', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18124, '', 0, 'Tacna', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18125, '', 0, 'Tumbes', 1);
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  181, 18126, '', 0, 'Ucayali', 1);
-
-
-
--- Regions Hungary (rowid country=18)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18, 183100, 'HU31', NULL, 'Northern Hungary');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18, 183200, 'HU32', NULL, 'Northern Great Plain');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18, 183300, 'HU33', NULL, 'Southern Great Plain');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18, 180100, 'HU1',  NULL, 'Central Hungary');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18, 182100, 'HU21', NULL, 'Central Transdanubia');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18, 182200, 'HU22', NULL, 'Western Transdanubia');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (18, 182300, 'HU23', NULL, 'Southern Transdanubia');
-
-
-
 -- Regions China (rowid country=9)
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 901, '京',0,'北京市');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 902, '津',0,'天津市');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 903, '沪',0,'上海市');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 904, '渝',0,'重庆市');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 905, '冀',0,'河北省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 906, '晋',0,'山西省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 907, '辽',0,'辽宁省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 908, '吉',0,'吉林省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 909, '黑',0,'黑龙江省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 910, '苏',0,'江苏省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 911, '浙',0,'浙江省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 912, '皖',0,'安徽省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 913, '闽',0,'福建省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 914, '赣',0,'江西省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 915, '鲁',0,'山东省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 916, '豫',0,'河南省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 917, '鄂',0,'湖北省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 918, '湘',0,'湖南省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 919, '粤',0,'广东省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 920, '琼',0,'海南省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 921, '川',0,'四川省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 922, '贵',0,'贵州省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 923, '云',0,'云南省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 924, '陕',0,'陕西省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 925, '甘',0,'甘肃省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 926, '青',0,'青海省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 927, '台',0,'台湾省');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 928, '蒙',0,'内蒙古自治区');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 929, '桂',0,'广西壮族自治区');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 930, '藏',0,'西藏自治区');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 931, '宁',0,'宁夏回族自治区');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 932, '新',0,'新疆维吾尔自治区');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 933, '港',0,'香港特别行政区');
-insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9, 934, '澳',0,'澳门特别行政区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 901, '京',0,'北京市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 902, '津',0,'天津市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 903, '沪',0,'上海市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 904, '渝',0,'重庆市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 905, '冀',0,'河北省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 906, '晋',0,'山西省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 907, '辽',0,'辽宁省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 908, '吉',0,'吉林省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 909, '黑',0,'黑龙江省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 910, '苏',0,'江苏省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 911, '浙',0,'浙江省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 912, '皖',0,'安徽省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 913, '闽',0,'福建省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 914, '赣',0,'江西省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 915, '鲁',0,'山东省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 916, '豫',0,'河南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 917, '鄂',0,'湖北省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 918, '湘',0,'湖南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 919, '粤',0,'广东省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 920, '琼',0,'海南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 921, '川',0,'四川省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 922, '贵',0,'贵州省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 923, '云',0,'云南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 924, '陕',0,'陕西省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 925, '甘',0,'甘肃省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 926, '青',0,'青海省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 927, '台',0,'台湾省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 928, '蒙',0,'内蒙古自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 929, '桂',0,'广西壮族自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 930, '藏',0,'西藏自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 931, '宁',0,'宁夏回族自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 932, '新',0,'新疆维吾尔自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 933, '港',0,'香港特别行政区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 934, '澳',0,'澳门特别行政区');
 
 
 -- Regions Taiwan (rowid country=213)

From e05c318fd863845edf09aae4a5cae50aeda4d970 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 11:45:00 +0200
Subject: [PATCH 232/928] various modifications on the way existing attendees
 and thirdparties are handled at registration

---
 .../class/conferenceorboothattendee.class.php |  1 +
 .../attendee_subscription.php                 | 55 +++++++++++++------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 6418d73580b..d8e166fde5a 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -438,6 +438,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		}
 
 		$resql = $this->db->query($sql);
+
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index e564bec5839..6e06838de91 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -81,6 +81,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 $email = GETPOST("email");
+$societe = GETPOST("societe");
 
 // Getting id from Post and decoding it
 $encodedid = GETPOST('id');
@@ -230,14 +231,14 @@ if (empty($reshook) && $action == 'add') {
 	if (!$error) {
 		// Check if attendee already exists (by email and for this event)
 		$confattendee = new ConferenceOrBoothAttendee($db);
-		$resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 't.email'=>$email));
-		if ($resultfetchconfattendee != 0 && count($resultfetchconfattendee)>0) {
+		$resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 'customsql'=>'t.email="'.$email.'"'));
+		if ($resultfetchconfattendee > 0 && count($resultfetchconfattendee)>0) {
 			// Found confattendee
-			$confattendee = $resultfetchconfattendee[0];
+			$confattendee = array_shift($resultfetchconfattendee);
 		} else {
 			// Need to create a confattendee
 			$confattendee->date_subscription = dol_now();
-			$confattendee->email = GETPOST("email");
+			$confattendee->email = $email;
 			$confattendee->fk_actioncomm = $id;
 			$resultconfattendee = $confattendee->create($user);
 			if ($resultconfattendee < 0) {
@@ -248,17 +249,36 @@ if (empty($reshook) && $action == 'add') {
 
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
-		$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
+		// Fetch using fk_soc of the existing attendee
+		if (!empty($confattendee->fk_soc)) {
+			$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
+		} else {
+			// Fetch using the input field by user
+			if (!empty($societe)) {
+				$resultfetchthirdparty = $thirdparty->fetch('', $societe);
+				var_dump($resultfetchthirdparty);
+				if ($resultfetchthirdparty<=0) {
+					// Need to create a new one
+					$resultfetchthirdparty = 0;
+				} else {
+					$confattendee->fk_soc = $thirdparty->id;
+					$confattendee->update($user);
+				}
+			} else {
+				// Need to create a thirdparty
+				$resultfetchthirdparty = 0;
+			}
+		}
+		var_dump($resultfetchthirdparty);
 		if ($resultfetchthirdparty<0) {
 			$error++;
 			$errmsg .= $thirdparty->error;
-			$readythirdparty = -1;
 		} elseif ($resultfetchthirdparty==0) {
 			// creation of a new thirdparty
-			if (!empty(GETPOST("societe"))) {
-				$thirdparty->name        = GETPOST("societe");
+			if (!empty($societe)) {
+				$thirdparty->name     = $societe;
 			} else {
-				$thirdparty->name        = $email;
+				$thirdparty->name     = $email;
 			}
 			$thirdparty->address      = GETPOST("address");
 			$thirdparty->zip          = GETPOST("zipcode");
@@ -288,14 +308,16 @@ if (empty($reshook) && $action == 'add') {
 			}
 			$thirdparty->code_client = $tmpcode;
 			$readythirdparty = $thirdparty->create($user);
-			$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
-			$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
-		} else {
-			// We have an existing thirdparty ready to use
-			$readythirdparty = 1;
+			if ($readythirdparty <0) {
+				$error++;
+				$errmsg .= $thirdparty->error;
+			} else {
+				$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
+				$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
+				$confattendee->fk_soc = $thirdparty->id;
+				$confattendee->update($user);
+			}
 		}
-		// Updating the fk_soc associated to the confattendee to match the ready to use thirdparty we have got
-		$confattendee->fk_soc = $thirdparty->id;
 	}
 
 	if (!$error) {
@@ -316,6 +338,7 @@ if (empty($reshook) && $action == 'add') {
 				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
 
 				if (empty($facture->cond_reglement_id)) {
+					var_dump($confattendee->db);
 					$paymenttermstatic = new PaymentTerm($confattendee->db);
 					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
 					if (empty($facture->cond_reglement_id)) {

From e6318eb4f4da90eaaed1d01828c2f46486acd0fa Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 12:06:33 +0200
Subject: [PATCH 233/928] style

---
 htdocs/public/eventorganization/attendee_subscription.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 6e06838de91..1a17f13c2b4 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -256,7 +256,6 @@ if (empty($reshook) && $action == 'add') {
 			// Fetch using the input field by user
 			if (!empty($societe)) {
 				$resultfetchthirdparty = $thirdparty->fetch('', $societe);
-				var_dump($resultfetchthirdparty);
 				if ($resultfetchthirdparty<=0) {
 					// Need to create a new one
 					$resultfetchthirdparty = 0;
@@ -269,7 +268,6 @@ if (empty($reshook) && $action == 'add') {
 				$resultfetchthirdparty = 0;
 			}
 		}
-		var_dump($resultfetchthirdparty);
 		if ($resultfetchthirdparty<0) {
 			$error++;
 			$errmsg .= $thirdparty->error;
@@ -314,7 +312,7 @@ if (empty($reshook) && $action == 'add') {
 			} else {
 				$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
 				$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
-				$confattendee->fk_soc = $thirdparty->id;
+				$confattendee->fk_soc     = $thirdparty->id;
 				$confattendee->update($user);
 			}
 		}
@@ -338,7 +336,6 @@ if (empty($reshook) && $action == 'add') {
 				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
 
 				if (empty($facture->cond_reglement_id)) {
-					var_dump($confattendee->db);
 					$paymenttermstatic = new PaymentTerm($confattendee->db);
 					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
 					if (empty($facture->cond_reglement_id)) {

From 467595ce60a4291f581746088cf2200ebfaa773e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 14:53:32 +0200
Subject: [PATCH 234/928] an already subscribed attendee will not be redirected
 to a payment page, now

---
 htdocs/public/eventorganization/attendee_subscription.php | 8 ++++++--
 htdocs/public/payment/paymentok.php                       | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 1a17f13c2b4..6c069122d65 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -72,6 +72,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 global $dolibarr_main_instance_unique_id;
+global $dolibarr_main_url_root;
 
 // Init vars
 $errmsg = '';
@@ -246,7 +247,11 @@ if (empty($reshook) && $action == 'add') {
 				$errmsg .= $confattendee->error;
 			}
 		}
-
+		if($confattendee->status == 1) {
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+			Header("Location: ".$redirection);
+			exit;
+		}
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
 		// Fetch using fk_soc of the existing attendee
@@ -320,7 +325,6 @@ if (empty($reshook) && $action == 'add') {
 
 	if (!$error) {
 		$db->commit();
-		global $dolibarr_main_url_root;
 		if (!empty(floatval($project->price_registration))) {
 			$productforinvoicerow = new Product($db);
 			$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION);
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 27b00fec402..d4946ce0ac7 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -944,7 +944,7 @@ if ($ispaymentok) {
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['BOO'] > 0) {
-		// BOOTH CASE (to copy and adapt from above)
+		// @todo BOOTH CASE (to copy and adapt from above)
 	} else {
 		// Nothing done
 	}

From 3573baf3ed82012c4ae669802877700d4f6dce8d Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Thu, 22 Apr 2021 15:24:26 +0200
Subject: [PATCH 235/928] fix bookmarks to allow Public items to be set and
 deleted by admins

---
 htdocs/bookmarks/card.php |  2 +-
 htdocs/bookmarks/list.php | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 3c3e03ecb37..f71a750027f 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -171,7 +171,7 @@ if ($action == 'create') {
 
 	// Owner
 	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
-	print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 0, '', 0, GETPOSTISSET('userid') ? GETPOST('userid', 'int') : array($user->id), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300');
 	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
 
 	// Position
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index d94b5cbdd88..2190bd7fc8d 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -204,8 +204,10 @@ while ($i < min($num, $limit)) {
 	print '</td>';
 
 	$linkintern = 0;
-	$title = $obj->title;
-	$link = $obj->url;
+	$title      = $obj->title;
+	$link       = $obj->url;
+	$canedit    = $user->rights->bookmark->supprimer;
+	$candelete  = $user->rights->bookmark->creer;
 
 	// Title
 	print "<td>";
@@ -252,6 +254,10 @@ while ($i < min($num, $limit)) {
 		print $tmpuser->getNomUrl(1);
 	} else {
 		print $langs->trans("Public");
+		if (!$user->admin) {
+			$candelete = false;
+			$canedit = false;
+		}
 	}
 	print "</td>\n";
 
@@ -263,10 +269,10 @@ while ($i < min($num, $limit)) {
 
 	// Actions
 	print '<td class="nowrap right">';
-	if ($user->rights->bookmark->creer) {
+	if ($canedit)
 		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
 	}
-	if ($user->rights->bookmark->supprimer) {
+	if ($candelete)
 		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$obj->rowid.'">'.img_delete().'</a>';
 	} else {
 		print "&nbsp;";

From eb96d5bd58017c1d236e56e7fb6c163569c9a753 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 15:27:16 +0200
Subject: [PATCH 236/928] added comments

---
 .../eventorganization/attendee_subscription.php      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 6c069122d65..9fb27168fd1 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -247,6 +247,9 @@ if (empty($reshook) && $action == 'add') {
 				$errmsg .= $confattendee->error;
 			}
 		}
+		// At this point, we have an attendee. It may not be linked to a thirdparty if we just created it
+
+		// If the attendee has already paid
 		if($confattendee->status == 1) {
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
 			Header("Location: ".$redirection);
@@ -254,22 +257,23 @@ if (empty($reshook) && $action == 'add') {
 		}
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
-		// Fetch using fk_soc of the existing attendee
+		// Fetch using fk_soc if the attendee was already existing
 		if (!empty($confattendee->fk_soc)) {
 			$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
 		} else {
-			// Fetch using the input field by user
+			// Fetch using the input field by user if we just created the attendee
 			if (!empty($societe)) {
 				$resultfetchthirdparty = $thirdparty->fetch('', $societe);
 				if ($resultfetchthirdparty<=0) {
-					// Need to create a new one
+					// Need to create a new one (not found or multiple with the same name)
 					$resultfetchthirdparty = 0;
 				} else {
+					// We found an unique result with that name, so we put in in fk_soc of attendee
 					$confattendee->fk_soc = $thirdparty->id;
 					$confattendee->update($user);
 				}
 			} else {
-				// Need to create a thirdparty
+				// Need to create a thirdparty (put number>0 if we do not want to create a thirdparty for free-conferences)
 				$resultfetchthirdparty = 0;
 			}
 		}

From efcc5e714a23eb4fe5a799ac7b2d2ea046014143 Mon Sep 17 00:00:00 2001
From: ksar <35605507+ksar-ksar@users.noreply.github.com>
Date: Thu, 22 Apr 2021 15:49:37 +0200
Subject: [PATCH 237/928] FIX #17363

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

diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 925c8fd6ff4..61f935572d2 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -184,7 +184,7 @@ foreach ($dirmodels as $reldir)
 							{
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
-								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmo&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
 

From 804547997bea4a6b65e52286ce376d671fecc91f Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 15:52:45 +0200
Subject: [PATCH 238/928] removed obsolete post information and now giving the
 source in the url

---
 htdocs/public/payment/newpayment.php | 8 +++-----
 htdocs/public/payment/paymentok.php  | 6 ------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 461cd406a92..1b737037a93 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -207,8 +207,6 @@ if (!empty($entity)) {
 $urlok = preg_replace('/&$/', '', $urlok); // Remove last &
 $urlko = preg_replace('/&$/', '', $urlko); // Remove last &
 
-
-
 // Make special controls
 
 if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled)) {
@@ -379,7 +377,7 @@ if ($action == 'dopayment') {
 
 			// A redirect is added if API call successfull
 			if ($source == 'conferencesubscription') {
-				$PAYPAL_API_OK .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+				$PAYPAL_API_OK .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
@@ -400,7 +398,7 @@ if ($action == 'dopayment') {
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 
 		$mesg = '';
@@ -758,7 +756,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		exit;
 	} else {
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 		header("Location: ".$urlok);
 		exit;
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index d4946ce0ac7..681c980a3e8 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -109,12 +109,6 @@ $invoiceref = GETPOST('invoice');
 $suffix = GETPOST("suffix", 'aZ09');
 $membertypeid = GETPOST("membertypeid", 'int');
 
-$conferencesubscription = GETPOST('conferencesubscription');
-$uncryptedconferencesubscription = dol_decode($conferencesubscription, $dolibarr_main_instance_unique_id);
-$subscription = substr($uncryptedconferencesubscription, 0, strlen($uncryptedconferencesubscription)-strlen($ref));
-$reffrompayment = substr($uncryptedconferencesubscription, -strlen($ref), strlen($ref));
-
-
 // Detect $paymentmethod
 $paymentmethod = '';
 $reg = array();

From ee96fb64707b646873179171451c3a6efed2ec2a Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Thu, 22 Apr 2021 15:56:12 +0200
Subject: [PATCH 239/928] FIX: payment creation: re-generate invoice PDF with
 correct display options

---
 htdocs/compta/paiement/class/paiement.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 05d2fe0c08b..221ff3de042 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -440,8 +440,13 @@ class Paiement extends CommonObject
                             	$outputlangs = new Translate("", $conf);
                             	$outputlangs->setDefaultLang($newlang);
                             }
+
+                            $hidedetails = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0;
+                            $hidedesc = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0;
+                            $hideref = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0;
+
                             $ret = $invoice->fetch($facid); // Reload to get new records
-                            $result = $invoice->generateDocument($invoice->modelpdf, $outputlangs);
+                            $result = $invoice->generateDocument($invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
                             if ($result < 0) {
                             	setEventMessages($invoice->error, $invoice->errors, 'errors');
                             	$error++;

From ce022ab36cbbc4f2e1d46c02eefa5f90716f3443 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Thu, 22 Apr 2021 15:57:06 +0200
Subject: [PATCH 240/928] FIX: payment validation: invoices PDF were no
 re-generated, make it with correct display options

---
 htdocs/compta/paiement/card.php | 79 +++++++++++++++++++++++++--------
 1 file changed, 61 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 59da7387f62..f54417b8a6f 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -109,28 +109,71 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->
     $object->fetch($id);
 	if ($object->valide($user) > 0)
 	{
-		$db->commit();
-
 		// Loop on each invoice linked to this payment to rebuild PDF
-		$factures = array();
-		foreach ($factures as $id)
-		{
-			$fac = new Facture($db);
-			$fac->fetch($id);
+        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+            $outputlangs = $langs;
+            if (!empty($_REQUEST['lang_id']))
+            {
+                $outputlangs = new Translate("", $conf);
+                $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+            }
+
+            $hidedetails = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0;
+            $hidedesc = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0;
+            $hideref = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0;
+
+            $sql = 'SELECT f.rowid as facid';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s';
+            $sql .= ' WHERE pf.fk_facture = f.rowid';
+            $sql .= ' AND f.fk_soc = s.rowid';
+            $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
+            $sql .= ' AND pf.fk_paiement = '.$object->id;
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $i = 0;
+                $num = $db->num_rows($resql);
+
+                if ($num > 0)
+                {
+                    while ($i < $num)
+                    {
+                        $objp = $db->fetch_object($resql);
+
+                        $invoice = new Facture($db);
+
+                        if ($invoice->fetch($objp->facid) <= 0) {
+                            $errors++;
+                            setEventMessage($invoice->error, $invoice->errors, 'errors');
+                            break;
+                        }
+
+                        if ($invoice->generateDocument($fac->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref) < 0) {
+                            $errors++;
+                            setEventMessage($invoice->error, $invoice->errors, 'errors');
+                            break;
+                        }
+
+                        $i++;
+                    }
+                }
+
+                $db->free($resql);
+            }
+            else
+            {
+                $errors++;
+                setEventMessage($db->error, $db->errors, 'errors');
+            }
 
-			$outputlangs = $langs;
-			if (!empty($_REQUEST['lang_id']))
-			{
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$fac->generateDocument($fac->modelpdf, $outputlangs);
-			}
 		}
 
-		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
-		exit;
+        if (! $errors) {
+            $db->commit();
+
+            header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
+            exit;
+        }
 	}
 	else
 	{

From f832434ce3ebfbd2245d33ef5d456169ce562927 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 16:17:22 +0200
Subject: [PATCH 241/928] removing mistake from last commit: source is already
 given in urlok

---
 htdocs/public/payment/newpayment.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 1b737037a93..2f6b61a82d4 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -377,7 +377,7 @@ if ($action == 'dopayment') {
 
 			// A redirect is added if API call successfull
 			if ($source == 'conferencesubscription') {
-				$PAYPAL_API_OK .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+				$PAYPAL_API_OK .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
@@ -398,7 +398,7 @@ if ($action == 'dopayment') {
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 
 		$mesg = '';
@@ -756,7 +756,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		exit;
 	} else {
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 		header("Location: ".$urlok);
 		exit;

From eb52f5daa0767387fd48d99e29949e57c0bc456d Mon Sep 17 00:00:00 2001
From: Indelog <maxime@indelog.fr>
Date: Thu, 22 Apr 2021 14:48:05 +0200
Subject: [PATCH 242/928] Add : register donation payment when public payment

- When we paid a donation whit public link, create the associated payment and
  put its status to payed if all the promised amount is it.

- Set the amount to pay on public page depending to the rest to pay for
  the don.
---
 htdocs/don/class/don.class.php                |  30 +++++
 htdocs/don/class/paymentdonation.class.php    |  25 +++-
 .../install/mysql/migration/13.0.0-14.0.0.sql |   4 +
 .../mysql/tables/llx_payment_donation.sql     |  10 +-
 htdocs/public/payment/newpayment.php          |   3 +-
 htdocs/public/payment/paymentok.php           | 113 ++++++++++++++++++
 6 files changed, 177 insertions(+), 8 deletions(-)

diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 1ec3ebe1cc5..799ad1376cf 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2016      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2019      Thibault FOUCART     <support@ptibogxiv.net>
  * Copyright (C) 2019-2020 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2021      Maxime DEMAREST      <maxime@indelog.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
@@ -1098,4 +1099,33 @@ class Don extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
+
+	/**
+	 * Function to get reamain to pay for a donation
+	 *
+	 * @return   int      					<0 if KO, > reamain to pay if  OK
+	 */
+	public function getRemainToPay()
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		if (empty($this->id))
+		{
+			$this->error = 'Missing object id';
+			$this->errors[] = $this->error;
+			dol_syslog(__METHOD__.' : '.$this->error, LOG_ERR);
+			return -1;
+		}
+
+		$sql = 'SELECT SUM(amount) as sum_amount FROM '.MAIN_DB_PREFIX.'payment_donation WHERE fk_donation = '.$this->id;
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			dol_print_error($this->db);
+			return -2;
+		} else {
+			$sum_amount = (float) $this->db->fetch_object($resql)->sum_amount;
+			return (float) $this->amount - $sum_amount;
+		}
+
+	}
 }
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 7c8bd71ccd2..6a39850e2db 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -92,6 +92,15 @@ class PaymentDonation extends CommonObject
 	public $type_code;
 	public $type_label;
 
+	/**
+	 * @var string Id of external payment mode
+	 */
+	public $ext_payment_id;
+
+	/**
+	 * @var string Name of external payment mode
+	 */
+	public $ext_payment_site;
 
 	/**
 	 *	Constructor
@@ -126,6 +135,14 @@ class PaymentDonation extends CommonObject
 		}
 
 		// Clean parameters
+		if (isset($this->chid)) {
+			$this->chid = (int) $this->chid;
+		}
+		// NOTE : The property used in INSERT for fk_donation is not fk_donation but chid
+		//        (keep priority to chid property)
+		elseif (isset($this->fk_donation)) {
+			$this->chid = (int) $this->fk_donation;
+		}
 		if (isset($this->fk_donation)) {
 			$this->fk_donation = (int) $this->fk_donation;
 		}
@@ -169,12 +186,14 @@ class PaymentDonation extends CommonObject
 
 		if ($totalamount != 0) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_donation (fk_donation, datec, datep, amount,";
-			$sql .= " fk_typepayment, num_payment, note, fk_user_creat, fk_bank)";
+			$sql .= " fk_typepayment, num_payment, note, ext_payment_id, ext_payment_site,";
+			$sql .= " fk_user_creat, fk_bank)";
 			$sql .= " VALUES ($this->chid, '".$this->db->idate($now)."',";
 			$sql .= " '".$this->db->idate($this->datepaid)."',";
 			$sql .= " ".$totalamount.",";
-			$sql .= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_public)."', ".$user->id.",";
-			$sql .= " 0)";
+			$sql .= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_public)."', ";
+			$sql .= " ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").",";
+			$sql .= " ".$user->id.", 0)";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index e762ddd94e4..10a38ee44bf 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -431,6 +431,10 @@ ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_closing integer DEFAULT NULL af
 
 ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity; -- project associated to warehouse if any
 
+-- Add external payement suport for donation
+ALTER TABLE llx_payment_donation ADD COLUMN ext_payment_site  varchar(128) AFTER note;
+ALTER TABLE llx_payment_donation ADD COLUMN ext_payment_id  varchar(128) AFTER note;
+
 -- Rebuild sequence for postgres only after query INSERT INTO llx_salary(rowid, ...
 -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
 
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index 088138bf96f..a93a6c1a0e9 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -20,14 +20,16 @@ create table llx_payment_donation
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_donation     integer,
-  datec           datetime,           -- date de creation
+  datec           datetime,                             -- date de creation
   tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  datep           datetime,           -- payment date
+  datep           datetime,                             -- payment date
   amount          double(24,8) DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),
   note            text,
+  ext_payment_id   varchar(128),						-- external id of payment (for example Stripe charge id)
+  ext_payment_site varchar(128),						-- name of external paymentmode (for example 'stripe')
   fk_bank         integer NOT NULL,
-  fk_user_creat   integer,            -- creation user
-  fk_user_modif   integer             -- last modification user
+  fk_user_creat   integer,                              -- creation user
+  fk_user_modif   integer                               -- last modification user
 )ENGINE=innodb;
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 40c742d562a..684c559dac3 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1587,9 +1587,10 @@ if ($source == 'donation') {
 	$object = $don;
 
 	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
-		$amount = $subscription->total_ttc;
 		if (GETPOST("amount", 'alpha')) {
 			$amount = GETPOST("amount", 'alpha');
+		} else {
+			$amount = $don->getRemainToPay();
 		}
 		$amount = price2num($amount);
 	}
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 1942635001f..902bfa29321 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2021		Waël Almoman			<info@almoman.com>
+ * Copyright (C) 2021		Maxime Demarest			<maxime@indelog.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
@@ -776,6 +777,117 @@ if ($ispaymentok) {
 			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
+
+	} elseif (array_key_exists('DON', $tmptag) && $tmptag['DON'] > 0) {
+		include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
+		$don = new Don($db);
+		$result = $don->fetch($tmptag['DON']);
+		if ($result) {
+			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
+
+			$paymentTypeId = 0;
+			if ($paymentmethod == 'paybox') {
+				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if ($paymentmethod == 'paypal') {
+				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if ($paymentmethod == 'stripe') {
+				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if (empty($paymentTypeId)) {
+				$paymentType = $_SESSION["paymentType"];
+				if (empty($paymentType)) {
+					$paymentType = 'CB';
+				}
+				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+			}
+
+			$currencyCodeType = $_SESSION['currencyCodeType'];
+
+			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
+			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
+				$db->begin();
+
+				// Creation of paiement line for donation
+				include_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
+				$paiement = new PaymentDonation($db);
+
+				if ($currencyCodeType == $conf->currency) {
+					$paiement->amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching with donation
+
+				} else {
+					// PaymentDonation does not support multi currency
+					$postactionmessages[] = 'Payment donation can\'t be payed with diffent currency than '.$conf->currency;
+					$ispostactionok = -1;
+					$error++; // Not yet supported
+				}
+
+				$paiement->fk_donation = $don->id;
+				$paiement->datepaid = $now;
+				$paiement->paymenttype = $paymentTypeId;
+				$paiement->num_payment = '';
+				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+				$paiement->ext_payment_id = $TRANSACTIONID;
+				$paiement->ext_payment_site = $service;
+
+				if (!$error) {
+					$paiement_id = $paiement->create($user, 1);
+					if ($paiement_id < 0) {
+						$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
+						$ispostactionok = -1;
+						$error++;
+					} else {
+						$postactionmessages[] = 'Payment created';
+						$ispostactionok = 1;
+
+						if ($totalpayed >= $don->getRemainToPay()) $don->setPaid($don->id);
+					}
+				}
+
+				if (!$error && !empty($conf->banque->enabled)) {
+					$bankaccountid = 0;
+					if ($paymentmethod == 'paybox') {
+						$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+					} elseif ($paymentmethod == 'paypal') {
+						$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+					} elseif ($paymentmethod == 'stripe') {
+						$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+					}
+
+					if ($bankaccountid > 0) {
+						$result = $paiement->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', $bankaccountid, '', '');
+						if ($result < 0) {
+							$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
+							$ispostactionok = -1;
+							$error++;
+						} else {
+							$postactionmessages[] = 'Bank transaction of payment created';
+							$ispostactionok = 1;
+						}
+					} else {
+						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
+						$ispostactionok = -1;
+						$error++;
+					}
+				}
+
+				if (!$error) {
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			} else {
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of donation '.$tmptag['DON'].'. May be payment was already recorded.';
+				$ispostactionok = -1;
+			}
+		} else {
+			$postactionmessages[] = 'Donation paid '.$tmptag['DON'].' was not found';
+			$ispostactionok = -1;
+		}
+
+		// TODO send email with acknowledgment for the donation
+		//      (need that the donation module can gen a pdf document for the cerfa with pre filled content)
 	} else {
 		// Nothing done
 	}
@@ -903,6 +1015,7 @@ if ($ispaymentok) {
 			$content .= "ErrorSeverityCode = ".$ErrorSeverityCode."<br>\n";
 		}
 
+
 		$ishtml = dol_textishtml($content); // May contain urls
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';

From d6954b2826d9012ad63c938c1d0cbef866457b74 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 22 Apr 2021 14:56:15 +0000
Subject: [PATCH 243/928] Fixing style errors.

---
 htdocs/don/class/don.class.php      | 4 +---
 htdocs/public/payment/paymentok.php | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 799ad1376cf..d075111e049 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -1109,8 +1109,7 @@ class Don extends CommonObject
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		if (empty($this->id))
-		{
+		if (empty($this->id)) {
 			$this->error = 'Missing object id';
 			$this->errors[] = $this->error;
 			dol_syslog(__METHOD__.' : '.$this->error, LOG_ERR);
@@ -1126,6 +1125,5 @@ class Don extends CommonObject
 			$sum_amount = (float) $this->db->fetch_object($resql)->sum_amount;
 			return (float) $this->amount - $sum_amount;
 		}
-
 	}
 }
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 902bfa29321..530ceb098b3 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -777,7 +777,6 @@ if ($ispaymentok) {
 			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
-
 	} elseif (array_key_exists('DON', $tmptag) && $tmptag['DON'] > 0) {
 		include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 		$don = new Don($db);
@@ -815,7 +814,6 @@ if ($ispaymentok) {
 
 				if ($currencyCodeType == $conf->currency) {
 					$paiement->amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching with donation
-
 				} else {
 					// PaymentDonation does not support multi currency
 					$postactionmessages[] = 'Payment donation can\'t be payed with diffent currency than '.$conf->currency;

From 4d907ef443ac58289b6be6d88cde82b25692ed35 Mon Sep 17 00:00:00 2001
From: Indelog <maxime@indelog.fr>
Date: Thu, 22 Apr 2021 17:04:35 +0200
Subject: [PATCH 244/928] Fix Stickler

---
 htdocs/don/class/paymentdonation.class.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 6a39850e2db..82c3ddde7fa 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -137,10 +137,9 @@ class PaymentDonation extends CommonObject
 		// Clean parameters
 		if (isset($this->chid)) {
 			$this->chid = (int) $this->chid;
-		}
-		// NOTE : The property used in INSERT for fk_donation is not fk_donation but chid
-		//        (keep priority to chid property)
-		elseif (isset($this->fk_donation)) {
+		} elseif (isset($this->fk_donation)) {
+			// NOTE : The property used in INSERT for fk_donation is not fk_donation but chid
+			//        (keep priority to chid property)
 			$this->chid = (int) $this->fk_donation;
 		}
 		if (isset($this->fk_donation)) {

From 379cb74cd921764f522f4331d678a2a36d24037c Mon Sep 17 00:00:00 2001
From: Robin <yann.robin@batiactugroupe.com>
Date: Thu, 22 Apr 2021 17:09:33 +0200
Subject: [PATCH 245/928] FIX tag selector error if supplier disable

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

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 00c74544d17..ff278ccd719 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -575,7 +575,7 @@ if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 		$moreforfilter .= $formother->select_categories(Categorie::TYPE_CUSTOMER, $search_categ_thirdparty, 'search_categ_thirdparty', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (empty($type) || $type == 'f')
+	if (!empty($conf->fournisseur->enabled) && (empty($type) || $type == 'f'))
 	{
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('SuppliersCategoriesShort').': ';

From ed923253bd2c9017249420bfbcce6e5fd01b26c2 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 22 Apr 2021 15:23:37 +0000
Subject: [PATCH 246/928] Fixing style errors.

---
 htdocs/contact/list.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 9b034438f2c..05328999cf5 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -723,8 +723,7 @@ if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		$moreforfilter .= '</div>';
 	}
 
-	if (!empty($conf->fournisseur->enabled) && (empty($type) || $type == 'f'))
-	{
+	if (!empty($conf->fournisseur->enabled) && (empty($type) || $type == 'f')) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('SuppliersCategoriesShort');
 		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');

From 78a6284bd2015b185677b67ae931956764562957 Mon Sep 17 00:00:00 2001
From: Indelog <maxime@indelog.fr>
Date: Thu, 22 Apr 2021 18:01:52 +0200
Subject: [PATCH 247/928] Fix : missig ext_payment_id on adh public pay

When pay a mebership contibution whit public link the payment add add in
database don't have a "ext_payment_id". This fix it.
---
 htdocs/adherents/class/adherent.class.php | 6 +++++-
 htdocs/public/payment/paymentok.php       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 0299b32663c..33345eb4e57 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1570,9 +1570,11 @@ class Adherent extends CommonObject
 	 *	@param	string		$emetteur_nom			Name of cheque writer
 	 *	@param	string		$emetteur_banque		Name of bank of cheque
 	 *  @param	string		$autocreatethirdparty	Auto create new thirdparty if member not yet linked to a thirdparty and we request an option that generate invoice.
+	 *  @param  string      $ext_payment_id         External id of payment (for example Stripe charge id)
+	 *  @param  string      $ext_payment_site       Name of external paymentmode (for example 'stripe')
 	 *	@return int									<0 if KO, >0 if OK
 	 */
-	public function subscriptionComplementaryActions($subscriptionid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom = '', $emetteur_banque = '', $autocreatethirdparty = 0)
+	public function subscriptionComplementaryActions($subscriptionid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom = '', $emetteur_banque = '', $autocreatethirdparty = 0, $ext_payment_id = '', $ext_payment_site = '')
 	{
 		global $conf, $langs, $user, $mysoc;
 
@@ -1752,6 +1754,8 @@ class Adherent extends CommonObject
 				$paiement->paiementid = dol_getIdFromCode($this->db, $operation, 'c_paiement', 'code', 'id', 1);
 				$paiement->num_payment = $num_chq;
 				$paiement->note_public = $label;
+				$paiement->ext_payment_id = $ext_payment_id;
+				$paiement->ext_payment_site = $ext_payment_site;
 
 				if (!$error) {
 					// Create payment line for invoice
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 1942635001f..018a2b05c3b 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -480,7 +480,7 @@ if ($ispaymentok) {
 
 					$autocreatethirdparty = 1; // will create thirdparty if member not yet linked to a thirdparty
 
-					$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque, $autocreatethirdparty);
+					$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque, $autocreatethirdparty, $TRANSACTIONID, $service);
 					if ($result < 0) {
 						dol_syslog("Error ".$object->error." ".join(',', $object->errors), LOG_DEBUG, 0, '_payment');
 

From 196ebbb8e8d3edf924bcefbd280f6b670a4de03f Mon Sep 17 00:00:00 2001
From: Indelog <maxime@indelog.fr>
Date: Thu, 22 Apr 2021 19:18:47 +0200
Subject: [PATCH 248/928] Fix : empty email on public membership form

We can validate the public membership form whith an empty email when
`$conf->global->ADHERENT_MAIL_REQUIRED` is set. This fix it.
---
 htdocs/public/members/new.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 1946125dbc2..f850cdff35c 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -208,9 +208,12 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
 	}
-	if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
+	if ($conf->global->ADHERENT_MAIL_REQUIRED && empty(GETPOST('email'))) {
+		$error++;
+		$errmsg .= $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Email'))."<br>\n";
+	} elseif (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
++		$langs->load('errors');
 		$error++;
-		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
 	}
 	$birthday = dol_mktime($_POST["birthhour"], $_POST["birthmin"], $_POST["birthsec"], $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
@@ -586,7 +589,7 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	print '</td></tr>';
 }
 // EMail
-print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Email").($conf->global->ADHERENT_MAIL_REQUIRED ? ' <span style="color:red;">*</span>' : '').'</td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Login
 if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 	print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";

From e7a4699bd930c54372497f70bc3430d1d3f1c5c7 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 22 Apr 2021 17:26:46 +0000
Subject: [PATCH 249/928] Fixing style errors.

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index f850cdff35c..3d0ecc6fd16 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -212,7 +212,7 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Email'))."<br>\n";
 	} elseif (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
-+		$langs->load('errors');
+		+		$langs->load('errors');
 		$error++;
 		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
 	}

From b9c33fc8b6aaa8fbc70cdf87509beb192b34dc5c Mon Sep 17 00:00:00 2001
From: gmilad <61253440+gmilad@users.noreply.github.com>
Date: Fri, 23 Apr 2021 00:45:07 +0200
Subject: [PATCH 250/928] Update doleditor.class.php for
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(English below)
Bonjour,

Voici une proposition d'ajout de fonctionnalité afin de pouvoir activer facilement le plugins SpellCheckAsYouType (SCAYT)  de CKEditor, pour l'historique voir ce fils de discutions sur le forum Francophone de Dolibarr :

https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad

Amicalement,
Gaëtan.

(English below)
Hello,

Here is a proposal to add functionality to easily activate the  SpellCheckAsYouType (SCAYT)  plugins of CKEditor, for the history see this thread on the Dolibarr forum:

https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad

Kind regards,
Gaëtan.
---
 htdocs/core/class/doleditor.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 25b1a43486a..ab8f432c85d 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gaëtan MAISON <gm@ilad.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -154,6 +155,11 @@ class DolEditor
 				} else {
 					$skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
 				}
+				if (!empty($conf->global->FCKEDITOR_ENABLE_SCAYT_AUTOSTARTUP)) {
+					$scaytautostartup = 'scayt_autoStartup: true,';
+				} else {
+					$scaytautostartup = '/*scayt is disable*/'; // Disable by default
+				}
 
 				$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';
 
@@ -178,6 +184,8 @@ class DolEditor
             						width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').',
             						height: '.$this->height.',
                                     skin: \''.$skin.'\',
+                                    '.$scaytautostartup.'
+                                    scayt_sLang: \''.$langs->getDefaultLang().'\',
                                     language: \''.$langs->defaultlang.'\',
                                     textDirection: \''.$langs->trans("DIRECTION").'\',
                                     on :

From 4589813d3f87521e10f7fdb05d239e009cc50934 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 09:46:02 +0200
Subject: [PATCH 251/928] added thirdparty fetch before mail sending to get its
 name

---
 htdocs/public/payment/paymentok.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 681c980a3e8..cdee63c2955 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -884,6 +884,9 @@ if ($ispaymentok) {
 						$attendeetovalidate->setStatut(1);
 
 						// Sending mail
+						$thirdparty = new Societe($db);
+						$thirdparty->fetch($attendeetovalidate->fk_soc);
+
 						require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 						$formmail = new FormMail($db);

From b441c600bb1a9c5fe8daff4df13ba68c836be9fe Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 10:32:28 +0200
Subject: [PATCH 252/928] fixing error introduced in a previous commit

---
 htdocs/compta/paiement.php                                    | 2 +-
 htdocs/core/class/CMailFile.class.php                         | 1 +
 .../class/conferenceorboothattendee.class.php                 | 1 -
 htdocs/public/payment/newpayment.php                          | 4 ++--
 htdocs/public/payment/paymentok.php                           | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 418bca03d83..94b114c03d8 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -253,7 +253,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			// Create payment and update this->multicurrency_amounts if this->amounts filled or
 			// this->amounts if this->multicurrency_amounts filled.
-			$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
+			$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
 			if ($paiement_id < 0) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 526c464403f..863bb9a6794 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -584,6 +584,7 @@ class CMailFile
 			if ($reshook < 0) {
 				$this->error = "Error in hook maildao sendMail ".$reshook;
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+
 				return $reshook;
 			}
 			if ($reshook == 1) {	// Hook replace standard code
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index d8e166fde5a..6418d73580b 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -438,7 +438,6 @@ class ConferenceOrBoothAttendee extends CommonObject
 		}
 
 		$resql = $this->db->query($sql);
-
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 2f6b61a82d4..5007b325c11 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -157,7 +157,6 @@ foreach ($_POST as $key => $val) {
 }
 
 
-
 // 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
@@ -207,6 +206,8 @@ if (!empty($entity)) {
 $urlok = preg_replace('/&$/', '', $urlok); // Remove last &
 $urlko = preg_replace('/&$/', '', $urlko); // Remove last &
 
+
+
 // Make special controls
 
 if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled)) {
@@ -264,7 +265,6 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 	} else {
 		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
 	}
-
 	if ($SECUREKEY != $token) {
 		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
 			$valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index cdee63c2955..444a769673c 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -109,6 +109,7 @@ $invoiceref = GETPOST('invoice');
 $suffix = GETPOST("suffix", 'aZ09');
 $membertypeid = GETPOST("membertypeid", 'int');
 
+
 // Detect $paymentmethod
 $paymentmethod = '';
 $reg = array();
@@ -151,6 +152,7 @@ $object = new stdClass(); // For triggers
 
 $error = 0;
 
+
 /*
  * Actions
  */

From 432bdaea654a030c2968b7e2fdf0b1e0bee13269 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 10:36:12 +0200
Subject: [PATCH 253/928] same as previous commit

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

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index b4b6604b118..9cbbdaf3f7d 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -283,6 +283,8 @@ if ($action == 'edit') {
 					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
 					$form->select_produits($selected, $constname, '', 0);
 				}
+			} else {
+				print '<input name="' . $constname . '"  class="flat ' . (empty($val['css']) ? 'minwidth200' : $val['css']) . '" value="' . $conf->global->{$constname} . '">';
 			}
 			print '</td></tr>';
 		}

From 2ab17c44e9fc12c162ba7e680ab8c5fcb680094b Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Fri, 23 Apr 2021 11:11:47 +0200
Subject: [PATCH 254/928] FIX : Add function price2num for rounding values in
 productAlertStock box

---
 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 dcd95445ddd..47009c77a53 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -203,7 +203,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 					    'td' => 'class="center"',
-                        'text' => $objp->total_stock.' / '.$objp->seuil_stock_alerte,
+                        'text' => price2num($objp->total_stock).' / '.$objp->seuil_stock_alerte,
                         'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
                     );
 

From 1511bf811c0438f36d7c088fc49abd52ab285057 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 12:22:03 +0200
Subject: [PATCH 255/928] now getting the amount of the invoice in the
 newpayment page

---
 htdocs/public/payment/newpayment.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 5007b325c11..d6613cb86de 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -132,6 +132,7 @@ if ($source == 'conferencesubscription') {
 			if ($resultinvoice <= 0) {
 				setEventMessages(null, $invoice->errors, "errors");
 			} else {
+				$amount = price2num($invoice->total_ttc);
 				// Finding the associated thirdparty
 				$thirdparty = new Societe($db);
 				$resultthirdparty = $thirdparty->fetch($invoice->socid);
@@ -1814,7 +1815,7 @@ if ($source == 'conferencesubscription') {
 	// Amount
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
-	$valtoshow = $invoice->total_ttc;
+	$valtoshow = $amount;
 	print '<b>'.price($valtoshow).'</b>';
 	print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 	print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';

From c5775cc90257319341d150d1cd4ffc6a07795078 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Fri, 23 Apr 2021 12:31:45 +0200
Subject: [PATCH 256/928] FIX : Add parameter to function price2num()

---
 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 47009c77a53..7982181f7ca 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -203,7 +203,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 					    'td' => 'class="center"',
-                        'text' => price2num($objp->total_stock).' / '.$objp->seuil_stock_alerte,
+                        'text' => price2num($objp->total_stock, 'MF').' / '.$objp->seuil_stock_alerte,
                         'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
                     );
 

From 09807706f0459de88bdc8331f7986b6293babc7d Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Fri, 23 Apr 2021 14:51:02 +0200
Subject: [PATCH 257/928] first try on productlot traceability fields

---
 htdocs/core/class/html.form.class.php    | 41 +++++++++++++++++++++++
 htdocs/product/card.php                  |  5 +++
 htdocs/product/stock/productlot_card.php | 42 ++++++++++++++++++++++++
 3 files changed, 88 insertions(+)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 835810ff065..e7bff68ccee 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5742,6 +5742,47 @@ class Form
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load into the cache productbatch status
+	 *
+	 *  @return	int							Nb of loaded lines, 0 if already loaded, <0 if KO
+	 */
+	public function load_cache_productbatch_status()
+	{
+		// phpcs:enable
+		global $langs;
+
+		$num = count($this->cache_vatrates);
+		if ($num > 0) {
+			return $num; // Cache already loaded
+		}
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = "SELECT s.rowid, s.code, s.label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_status as c";
+		$sql .= " WHERE t.active > 0";
+		$sql .= " ORDER BY c.code ASC";
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			if ($num) {
+				for ($i = 0; $i < $num; $i++) {
+					$obj = $this->db->fetch_object($resql);
+					$this->cache_status[$i]['rowid']	= $obj->rowid;
+					$this->cache_status[$i]['code'] = $obj->code;
+					$this->cache_status[$i]['label'] = $obj->taux.'%'.($obj->code ? ' ('.$obj->code.')' : ''); // Label must contains only 0-9 , . % or *
+				}
+				return $num;
+			}
+		} else {
+			$this->error = '<font class="error">'.$this->db->error().'</font>';
+			return -2;
+		}
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output an HTML select vat rate.
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 64e5b844cb0..f3dc87f41ba 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1294,6 +1294,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			print '</tr>';
 		}
+		// Traceability
+		if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+			print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth100onsmartphone" value="'.GETPOST('lifetime').'"></td></tr>';
+			print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth100onsmartphone" value="'.GETPOST('qc_frequency').'"></td></tr>';
+		}
 
 		// Other attributes
 		$parameters = array('colspan' => 3, 'cols' => '3');
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 646f3d322d7..b797d7bccc7 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -428,6 +428,48 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</tr>';
 	}
 
+	// Traceability info
+	if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+		print '<tr><td>';
+		print $form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker');
+		print '</td><td>';
+		print $form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker');
+		print '</td>';
+		print '</tr>';
+		print '<tr><td>';
+		print $form->editfieldkey($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer, 'datepicker');
+		print '</td><td>';
+		print $form->editfieldval($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer, 'datepicker');
+		print '</td>';
+		print '</tr>';
+		print '<tr><td>';
+		print $form->editfieldkey($langs->trans('DestructionDate'), 'destruction_date', $object->destruction_date, $object, $user->rights->stock->creer, 'datepicker');
+		print '</td><td>';
+		print $form->editfieldval($langs->trans('DestructionDate'), 'destruction_date', $object->destruction_date, $object, $user->rights->stock->creer, 'datepicker');
+		print '</td>';
+		print '</tr>';
+		print '<tr><td>';
+		print $form->editfieldkey($langs->trans('FirstUseDate'), 'first_use_date', $object->first_use_date, $object, $user->rights->stock->creer, 'datepicker');
+		print '</td><td>';
+		print $form->editfieldval($langs->trans('FirstUseDate'), 'first_use_date', $object->first_use_date, $object, $user->rights->stock->creer, 'datepicker');
+		print '</td>';
+		print '</tr>';
+		print '<tr><td>';
+		print $form->editfieldkey($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'string');
+		print '</td><td>';
+		print $form->editfieldval($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'string');
+		print '</td>';
+		print '</tr>';
+		$form->load_cache_productbatch_status();
+		print '<tr><td>';
+		print $form->editfieldkey($langs->trans('Status'), 'fk_status', $form->cache_productbatch_status[$object->status], $object, $user->rights->stock->creer, 'select:productbatch_status');
+		print '</td><td>';
+		print $form->editfieldval($langs->trans('Status'), 'fk_status', $form->cache_productbatch_status[$object->status], $object, $user->rights->stock->creer, 'select:productbatch_status');
+		print '</td>';
+		print '</tr>';
+		/*print '<tr><td>'.$langs->trans("Status").'</td><td>select à voir</td></tr>';*/
+	}
+
 	// Other attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 

From 3d3fb17da31e83aa78f8b32a738d9746bc91c5c5 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 23 Apr 2021 15:41:43 +0200
Subject: [PATCH 258/928] Add parameter "option" to hook formattachOptions

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 974bdce6d26..0bb30241062 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -268,7 +268,7 @@ class FormFile
 				$out .= "\n</div><!-- End form link new url -->\n";
 			}
 
-			$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url'=>$url, 'perm'=>$perm);
+			$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url'=>$url, 'perm'=>$perm, 'options'=>$options);
 			$res = $hookmanager->executeHooks('formattachOptions', $parameters, $object);
 			if (empty($res))
 			{

From f8479b4a574a2f175f00daa1fc7c88cca3e5b787 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@scopen.fr>
Date: Fri, 23 Apr 2021 16:37:39 +0200
Subject: [PATCH 259/928] fixed invoice validation, payment, and attendee
 validation

---
 .../attendee_subscription.php                 |  2 +-
 htdocs/public/payment/newpayment.php          | 28 +++++++++----------
 htdocs/public/payment/paymentok.php           | 12 ++++++--
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 9fb27168fd1..fab0a9733c8 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -374,7 +374,7 @@ if (empty($reshook) && $action == 'add') {
 				if (!$error) {
 					$valid = true;
 					$sourcetouse = 'conferencesubscription';
-					$reftouse = $confattendee->id;
+					$reftouse = $facture->id;
 					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
 					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index d6613cb86de..4460988ea60 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -114,23 +114,23 @@ if (!$action) {
 
 if ($source == 'conferencesubscription') {
 	// Finding the Attendee
-	$attendeeid = GETPOST('ref');
-	$attendee = new ConferenceOrBoothAttendee($db);
-	$resultattendee = $attendee->fetch($attendeeid);
-	if ($resultattendee <= 0) {
-		setEventMessages(null, $attendee->errors, "errors");
+	$invoiceid = GETPOST('ref');
+	$invoice = new Facture($db);
+	$resultinvoice = $invoice->fetch($invoiceid);
+	if ($resultinvoice <= 0) {
+		setEventMessages(null, $invoice->errors, "errors");
 	} else {
 
-		$attendee->fetchObjectLinked();
-		$linkedInvoices = $attendee->linkedObjectsIds['facture'];
+		$invoice->fetchObjectLinked();
+		$linkedAttendees = $invoice->linkedObjectsIds['conferenceorboothattendee'];
 
-		if (is_array($linkedInvoices)) {
-			$linkedInvoices = array_values($linkedInvoices);
+		if (is_array($linkedAttendees)) {
+			$linkedAttendees = array_values($linkedAttendees);
 
-			$invoice = new Facture($db);
-			$resultinvoice = $invoice->fetch($linkedInvoices[0]);
-			if ($resultinvoice <= 0) {
-				setEventMessages(null, $invoice->errors, "errors");
+			$attendee = new ConferenceOrBoothAttendee($db);
+			$resultattendee = $attendee->fetch($linkedAttendees[0]);
+			if ($resultattendee <= 0) {
+				setEventMessages(null, $attendee->errors, "errors");
 			} else {
 				$amount = price2num($invoice->total_ttc);
 				// Finding the associated thirdparty
@@ -1809,7 +1809,7 @@ if ($source == 'conferencesubscription') {
 	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="'.dol_escape_htmltag($source).'">';
-	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($attendee->id).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->id).'">';
 	print '</td></tr>'."\n";
 
 	// Amount
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 444a769673c..39cfa0f37c9 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -784,7 +784,7 @@ if ($ispaymentok) {
 		// Record payment
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
-		$result = $object->fetch($tmptag['ATT']);
+		$result = $object->fetch($ref);
 		if ($result) {
 			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 
@@ -810,6 +810,14 @@ if ($ispaymentok) {
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
+				$resultvalidate = $object->validate($user); 
+ 				if ($resultvalidate < 0) {
+					$postactionmessages[] = 'Cannot validate invoice';
+                                        $ispostactionok = -1;
+                                        $error++; // Not yet supported
+				} else {
+				
+				}
 				$db->begin();
 
 				// Creation of payment line
@@ -879,7 +887,7 @@ if ($ispaymentok) {
 
 					// Validating the attendee
 					$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-					$resultattendee = $attendeetovalidate->fetch($ref);
+					$resultattendee = $attendeetovalidate->fetch($tmptag['ATT']);
 					if ($resultattendee < 0) {
 						setEventMessages(null, $attendeetovalidate->errors, "errors");
 					} else {

From f65fa98c37a7894ea69e6afb5f0c6bdb7a57732c Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 16:46:09 +0200
Subject: [PATCH 260/928] indent fix, validation and mail sending put into else
 block to avoid errors

---
 htdocs/public/payment/paymentok.php | 219 ++++++++++++++--------------
 1 file changed, 109 insertions(+), 110 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 39cfa0f37c9..3d3946927c8 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -810,137 +810,136 @@ if ($ispaymentok) {
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-				$resultvalidate = $object->validate($user); 
- 				if ($resultvalidate < 0) {
+				$resultvalidate = $object->validate($user);
+				if ($resultvalidate < 0) {
 					$postactionmessages[] = 'Cannot validate invoice';
-                                        $ispostactionok = -1;
-                                        $error++; // Not yet supported
-				} else {
-				
-				}
-				$db->begin();
-
-				// Creation of payment line
-				include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-				$paiement = new Paiement($db);
-				$paiement->datepaye = $now;
-				if ($currencyCodeType == $conf->currency) {
-					$paiement->amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
-				} else {
-					$paiement->multicurrency_amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching
-
-					$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
 					$ispostactionok = -1;
 					$error++; // Not yet supported
-				}
-				$paiement->paiementid   = $paymentTypeId;
-				$paiement->num_payment = '';
-				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
-				$paiement->ext_payment_id = $TRANSACTIONID;
-				$paiement->ext_payment_site = $service;
+				} else {
+					$db->begin();
 
-				if (!$error) {
-					$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
-					if ($paiement_id < 0) {
-						$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
-						$ispostactionok = -1;
-						$error++;
+					// Creation of payment line
+					include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+					$paiement = new Paiement($db);
+					$paiement->datepaye = $now;
+					if ($currencyCodeType == $conf->currency) {
+						$paiement->amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
 					} else {
-						$postactionmessages[] = 'Payment created';
-						$ispostactionok = 1;
-					}
-				}
+						$paiement->multicurrency_amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching
 
-				if (!$error && !empty($conf->banque->enabled)) {
-					$bankaccountid = 0;
-					if ($paymentmethod == 'paybox') {
-						$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
-					} elseif ($paymentmethod == 'paypal') {
-						$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
-					} elseif ($paymentmethod == 'stripe') {
-						$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+						$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+						$ispostactionok = -1;
+						$error++; // Not yet supported
 					}
+					$paiement->paiementid   = $paymentTypeId;
+					$paiement->num_payment = '';
+					$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+					$paiement->ext_payment_id = $TRANSACTIONID;
+					$paiement->ext_payment_site = $service;
 
-					if ($bankaccountid > 0) {
-						$label = '(CustomerInvoicePayment)';
-						if ($object->type == Facture::TYPE_CREDIT_NOTE) {
-							$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
-						}
-						$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
-						if ($result < 0) {
+					if (!$error) {
+						$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
+						if ($paiement_id < 0) {
 							$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
 							$ispostactionok = -1;
 							$error++;
 						} else {
-							$postactionmessages[] = 'Bank transaction of payment created';
+							$postactionmessages[] = 'Payment created';
 							$ispostactionok = 1;
 						}
-					} else {
-						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
-						$ispostactionok = -1;
-						$error++;
 					}
-				}
 
-				if (!$error) {
-					$db->commit();
-
-					// Validating the attendee
-					$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-					$resultattendee = $attendeetovalidate->fetch($tmptag['ATT']);
-					if ($resultattendee < 0) {
-						setEventMessages(null, $attendeetovalidate->errors, "errors");
-					} else {
-						$attendeetovalidate->setStatut(1);
-
-						// Sending mail
-						$thirdparty = new Societe($db);
-						$thirdparty->fetch($attendeetovalidate->fk_soc);
-
-						require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-						$formmail = new FormMail($db);
-						// Set output language
-						$outputlangs = new Translate('', $conf);
-						$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
-						// Load traductions files required by page
-						$outputlangs->loadLangs(array("main", "members"));
-						// Get email content from template
-						$arraydefaultmessage = null;
-
-						$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-						if (!empty($labeltouse)) {
-							$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+					if (!$error && !empty($conf->banque->enabled)) {
+						$bankaccountid = 0;
+						if ($paymentmethod == 'paybox') {
+							$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+						} elseif ($paymentmethod == 'paypal') {
+							$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+						} elseif ($paymentmethod == 'stripe') {
+							$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
 						}
 
-						if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-							$subject = $arraydefaultmessage->topic;
-							$msg     = $arraydefaultmessage->content;
-						}
-
-						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
-						complete_substitutions_array($substitutionarray, $outputlangs, $object);
-
-						$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-						$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
-
-						$sendto = $thirdparty->email;
-						$from = $conf->global->MAILING_EMAIL_FROM;
-						$urlback = $_SERVER["REQUEST_URI"];
-
-						$ishtml = dol_textishtml($texttosend); // May contain urls
-
-						$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
-
-						$result = $mailfile->sendfile();
-						if ($result) {
-							dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+						if ($bankaccountid > 0) {
+							$label = '(CustomerInvoicePayment)';
+							if ($object->type == Facture::TYPE_CREDIT_NOTE) {
+								$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+							}
+							$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
+							if ($result < 0) {
+								$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
+								$ispostactionok = -1;
+								$error++;
+							} else {
+								$postactionmessages[] = 'Bank transaction of payment created';
+								$ispostactionok = 1;
+							}
 						} else {
-							dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+							$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
+							$ispostactionok = -1;
+							$error++;
 						}
 					}
-				} else {
-					$db->rollback();
+
+					if (!$error) {
+						$db->commit();
+
+						// Validating the attendee
+						$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+						$resultattendee = $attendeetovalidate->fetch($tmptag['ATT']);
+						if ($resultattendee < 0) {
+							setEventMessages(null, $attendeetovalidate->errors, "errors");
+						} else {
+							$attendeetovalidate->setStatut(1);
+
+							// Sending mail
+							$thirdparty = new Societe($db);
+							$thirdparty->fetch($attendeetovalidate->fk_soc);
+
+							require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+							include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+							$formmail = new FormMail($db);
+							// Set output language
+							$outputlangs = new Translate('', $conf);
+							$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+							// Load traductions files required by page
+							$outputlangs->loadLangs(array("main", "members"));
+							// Get email content from template
+							$arraydefaultmessage = null;
+
+							$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+							if (!empty($labeltouse)) {
+								$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+							}
+
+							if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+								$subject = $arraydefaultmessage->topic;
+								$msg     = $arraydefaultmessage->content;
+							}
+
+							$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+							complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+							$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+							$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+							$sendto = $thirdparty->email;
+							$from = $conf->global->MAILING_EMAIL_FROM;
+							$urlback = $_SERVER["REQUEST_URI"];
+
+							$ishtml = dol_textishtml($texttosend); // May contain urls
+
+							$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+							$result = $mailfile->sendfile();
+							if ($result) {
+								dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+							} else {
+								dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+							}
+						}
+					} else {
+						$db->rollback();
+					}
 				}
 			} else {
 				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['ATT'].'. May be payment was already recorded.';

From e9b35cf36b7f5b4e3ad1441bdd33afae09cb2a8e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 16:53:34 +0200
Subject: [PATCH 261/928] mail template modified to add company name and remove
 useless payment link

---
 htdocs/install/mysql/data/llx_c_email_templates.sql | 2 +-
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index fabbbf2e700..5ca98be8545 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -35,6 +35,6 @@ INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_u
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskConf', 10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskBooth', 20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsBooth', 30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__(Sincerely)__<br /><br />__MYCOMPANY_NAME__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailAttendees', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailSpeakers', 60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index ba36b27e885..52ac44e05a0 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -196,7 +196,7 @@ ALTER TABLE llx_tva ALTER COLUMN paye SET DEFAULT 0;
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskConf', 10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskBooth', 20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsBooth', 30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__(Sincerely)__<br /><br />__MYCOMPANY_NAME__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailAttendees', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailSpeakers', 60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 

From 7f9f67e7efadf8a732daa1e8c55a944af2617b70 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 23 Apr 2021 15:12:34 +0000
Subject: [PATCH 262/928] Fixing style errors.

---
 .../class/conferenceorbooth.class.php         | 12 ++++----
 .../conferenceorbooth_card.php                |  2 +-
 htdocs/modulebuilder/template/admin/setup.php | 30 +++++++++----------
 .../attendee_subscription.php                 |  3 +-
 htdocs/public/payment/newpayment.php          |  1 -
 htdocs/public/project/index.php               |  4 +--
 6 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index b859c10a98d..02714496b35 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -237,19 +237,19 @@ class ConferenceOrBooth extends ActionComm
 	 */
 	public function fetch($id, $ref = null, $ref_ext = '', $email_msgid = '')
 	{
-	    global $dolibarr_main_url_root, $dolibarr_main_instance_unique_id, $conf, $langs;
-	    
+		global $dolibarr_main_url_root, $dolibarr_main_instance_unique_id, $conf, $langs;
+
 		$result = parent::fetch($id, $ref, $ref_ext, $email_msgid);
-		
+
 		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
 		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$encodedid;
-		
+
 		$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
-		
+
 		$this->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
 		$this->pubregister = $link_subscription;
-		
+
 		$this->getActionCommFields();
 		return $result;
 	}
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index fc232406ce9..f983994c4ec 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -494,7 +494,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
 	$keyforbreak='pubregister';
-	
+
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 	//var_dump($object);
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 96f4d831261..21057347115 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -81,8 +81,8 @@ $arrayofparameters = array(
 	//'MYMODULE_MYPARAM4'=>array('type'=>'emailtemplate:thirdparty', 'enabled'=>1),
 	//'MYMODULE_MYPARAM5'=>array('type'=>'yesno', 'enabled'=>1),
 	//'MYMODULE_MYPARAM5'=>array('type'=>'thirdparty_type', 'enabled'=>1),
-    //'MYMODULE_MYPARAM6'=>array('type'=>'securekey', 'enabled'=>1),
-    //'MYMODULE_MYPARAM7'=>array('type'=>'product', 'enabled'=>1),
+	//'MYMODULE_MYPARAM6'=>array('type'=>'securekey', 'enabled'=>1),
+	//'MYMODULE_MYPARAM7'=>array('type'=>'product', 'enabled'=>1),
 );
 
 $error = 0;
@@ -296,13 +296,13 @@ if ($action == 'edit') {
             				});
                          });
                     });';
-			        print '</script>';
-			    }
+					print '</script>';
+				}
 			} elseif ($val['type'] == 'product') {
-			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-			        $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
-			        $form->select_produits($selected, $constname, '', 0);
-			    }
+				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+					$form->select_produits($selected, $constname, '', 0);
+				}
 			} else {
 				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
 			}
@@ -370,13 +370,13 @@ if ($action == 'edit') {
 						print $langs->trans("NorProspectNorCustomer");
 					}
 				} elseif ($val['type'] == 'product') {
-				    $product = new Product($db);
-				    $resprod = $product->fetch($conf->global->{$constname});
-				    if ($resprod > 0) {
-				        print $product->ref;
-				    } elseif ($resprod < 0) {
-				        setEventMessages(null, $object->errors, "errors");
-				    }
+					$product = new Product($db);
+					$resprod = $product->fetch($conf->global->{$constname});
+					if ($resprod > 0) {
+						print $product->ref;
+					} elseif ($resprod < 0) {
+						setEventMessages(null, $object->errors, "errors");
+					}
 				} else {
 					print $conf->global->{$constname};
 				}
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index fab0a9733c8..40f238c90d6 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -250,7 +250,7 @@ if (empty($reshook) && $action == 'add') {
 		// At this point, we have an attendee. It may not be linked to a thirdparty if we just created it
 
 		// If the attendee has already paid
-		if($confattendee->status == 1) {
+		if ($confattendee->status == 1) {
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
 			Header("Location: ".$redirection);
 			exit;
@@ -379,7 +379,6 @@ if (empty($reshook) && $action == 'add') {
 					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 							$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
-
 						} else {
 							$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 						}
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 4460988ea60..b351367f6ea 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -120,7 +120,6 @@ if ($source == 'conferencesubscription') {
 	if ($resultinvoice <= 0) {
 		setEventMessages(null, $invoice->errors, "errors");
 	} else {
-
 		$invoice->fetchObjectLinked();
 		$linkedAttendees = $invoice->linkedObjectsIds['conferenceorboothattendee'];
 
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index ff6da63be9a..03f26ed2f37 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -193,13 +193,13 @@ print "\n";
 // Show all action buttons
 print '<br>';
 // Output introduction text
-if($project->accept_conference_suggestions){
+if ($project->accept_conference_suggestions) {
 	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
 	print '<br><br>';
 }
 print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">';
 print '<br><br>';
-if($project->accept_booth_suggestions){
+if ($project->accept_booth_suggestions) {
 	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
 }
 

From a28402e3a0704e2c313434b0a63734927b7a7c24 Mon Sep 17 00:00:00 2001
From: antonin_tdj <50403308+ibuiv@users.noreply.github.com>
Date: Fri, 23 Apr 2021 18:03:16 +0200
Subject: [PATCH 263/928] Product Stock Card - add new standard Hooks

---
 htdocs/product/stock/card.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 0a77a39a0df..0cd30ed827a 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -571,6 +571,9 @@ if ($action == 'create') {
 
 			print '<table class="noborder centpercent">';
 			print "<tr class=\"liste_titre\">";
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
 			print_liste_field_titre("Product", "", "p.ref", "&amp;id=".$id, "", "", $sortfield, $sortorder);
 			print_liste_field_titre("Label", "", "p.label", "&amp;id=".$id, "", "", $sortfield, $sortorder);
 			print_liste_field_titre("NumberOfUnit", "", "ps.reel", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
@@ -591,6 +594,10 @@ if ($action == 'create') {
 			if ($user->rights->stock->creer) {
 				print_liste_field_titre('');
 			}
+			// Hook fields
+			$parameters = array('sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+			$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
 			print "</tr>\n";
 
 			$totalunit = 0;
@@ -601,6 +608,13 @@ if ($action == 'create') {
 			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 				$sql .= ",fk_unit";
 			}
+			// Add fields from hooks
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+			if($reshook > 0){			//Note that $sql is replaced if reshook > 0
+				$sql = "";
+			}
+			$sql .= $hookmanager->resPrint;
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
 			$sql .= " WHERE ps.fk_product = p.rowid";
 			$sql .= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse)
@@ -635,6 +649,9 @@ if ($action == 'create') {
 
 					//print '<td>'.dol_print_date($objp->datem).'</td>';
 					print '<tr class="oddeven">';
+					$parameters = array('obj'=>$objp);
+					$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+					print $hookmanager->resPrint;
 					print "<td>";
 					$productstatic->id = $objp->rowid;
 					$productstatic->ref = $objp->ref;

From 9fbb5087b91f3fdaab4b6d7a331cc1ad896d81b1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 23 Apr 2021 16:05:24 +0000
Subject: [PATCH 264/928] Fixing style errors.

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

diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 0cd30ed827a..3ceb896741e 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -611,7 +611,7 @@ if ($action == 'create') {
 			// Add fields from hooks
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
-			if($reshook > 0){			//Note that $sql is replaced if reshook > 0
+			if ($reshook > 0) {			//Note that $sql is replaced if reshook > 0
 				$sql = "";
 			}
 			$sql .= $hookmanager->resPrint;

From f60df8964ab9d450ee8fb7671a47e76cf7d24628 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 24 Apr 2021 08:05:00 +0200
Subject: [PATCH 265/928] NEW: Add option
 SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD

---
 htdocs/core/class/commonobject.class.php | 3 +++
 htdocs/core/lib/functions.lib.php        | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a93acda2a17..d5ddbec1245 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5238,6 +5238,9 @@ abstract class CommonObject
 							if ($this->element == 'contrat' && !empty($conf->global->CONTRACT_ALLOW_EXTERNAL_DOWNLOAD)) {
 								$setsharekey = true;
 							}
+							if ($this->element == 'supplier_proposal' && !empty($conf->global->SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+								$setsharekey = true;
+							}
 
 							if ($setsharekey) {
 								if (empty($ecmfile->share)) {	// Because object not found or share not set yet
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7368510484f..6f591c33128 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7102,6 +7102,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				} else {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = '';
 				}
+				if (!empty($conf->global->SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'supplier_proposal') {
+					$substitutionarray['__DIRECTDOWNLOAD_URL_SUPPLIER_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
+				} else {
+					$substitutionarray['__DIRECTDOWNLOAD_URL_SUPPLIER_PROPOSAL__'] = '';
+				}
 
 				if (is_object($object) && $object->element == 'propal') {
 					$substitutionarray['__URL_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/comm/propal/card.php?id=".$object->id;
@@ -7115,6 +7120,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				if (is_object($object) && $object->element == 'contrat') {
 					$substitutionarray['__URL_CONTRACT__'] = DOL_MAIN_URL_ROOT."/contrat/card.php?id=".$object->id;
 				}
+				if (is_object($object) && $object->element == 'supplier_proposal') {
+					$substitutionarray['__URL_SUPPLIER_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/supplier_proposal/card.php?id=".$object->id;
+				}
 			}
 
 			if (is_object($object) && $object->element == 'action') {

From 8b49585b64137442fddeba4f51b7b43776236833 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 24 Apr 2021 18:21:36 +0200
Subject: [PATCH 266/928] fix: return invoice id when create from order

---
 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 4ae9fe197fe..8d0e2bb8b47 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1387,7 +1387,7 @@ class Facture extends CommonInvoice
 
 			if (!$error)
 			{
-				return 1;
+				return $ret;
 			} else return -1;
 		} else return -1;
 	}

From e229348e2c52eec63e7a599658158a4a0e409e99 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 24 Apr 2021 18:24:25 +0200
Subject: [PATCH 267/928] .gitignre

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a008514f2ee..371c8be2f5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,3 @@ yarn.lock
 package-lock.json
 
 doc/install.lock
-
-/htdocs/cyber*
-/htdocs/mycyber*

From bc924ca00ee4fd76270876a130df1a492d09700a Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 24 Apr 2021 18:27:43 +0200
Subject: [PATCH 268/928] .gitignre

---
 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 8d0e2bb8b47..4ae9fe197fe 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1387,7 +1387,7 @@ class Facture extends CommonInvoice
 
 			if (!$error)
 			{
-				return $ret;
+				return 1;
 			} else return -1;
 		} else return -1;
 	}

From 48c26fd614ead9c3e3d6a7be8bb6a38d3e85082f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Apr 2021 18:43:24 +0200
Subject: [PATCH 269/928] Fix add option INVOICE_DISALLOW_REOPEN to lock
 problematic feature

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 907d18987ea..b9a3ae86811 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -189,7 +189,7 @@ if (empty($reshook))
 	   		$action = '';
 		}
 	} // Change status of invoice
-	elseif ($action == 'reopen' && $usercancreate) {
+	elseif ($action == 'reopen' && $usercancreate && empty($conf->global->INVOICE_DISALLOW_REOPEN)) {
 		$result = $object->fetch($id);
 
 		if ($object->statut == Facture::STATUS_CLOSED || ($object->statut == Facture::STATUS_ABANDONED && ($object->close_code != 'replaced' || $object->getIdReplacingInvoice() == 0)) || ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 1)) {    // ($object->statut == 1 && $object->paye == 1) should not happened but can be found when data are corrupted

From d0cc64479d6986e62e29013dde7c42acae472eeb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Apr 2021 20:18:11 +0200
Subject: [PATCH 270/928] Fix protect sql

---
 htdocs/accountancy/admin/accountmodel.php        |  2 +-
 htdocs/accountancy/bookkeeping/card.php          |  2 +-
 .../class/accountancycategory.class.php          | 10 +++++-----
 .../class/accountingaccount.class.php            |  4 ++--
 htdocs/accountancy/class/bookkeeping.class.php   |  4 ++--
 htdocs/accountancy/customer/index.php            |  4 ++--
 htdocs/accountancy/expensereport/index.php       |  4 ++--
 htdocs/accountancy/journal/bankjournal.php       | 16 ++++++++--------
 htdocs/accountancy/supplier/index.php            |  4 ++--
 htdocs/adherents/class/adherent.class.php        |  4 ++--
 htdocs/adherents/class/adherent_type.class.php   |  2 +-
 htdocs/adherents/class/subscription.class.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/boxes.php                           |  4 ++--
 htdocs/admin/dict.php                            |  2 +-
 htdocs/admin/external_rss.php                    |  2 +-
 htdocs/admin/security.php                        |  2 +-
 htdocs/asset/class/asset_type.class.php          |  2 +-
 htdocs/blockedlog/class/authority.class.php      |  2 +-
 htdocs/bookmarks/class/bookmark.class.php        |  2 +-
 htdocs/categories/class/categorie.class.php      |  2 +-
 htdocs/comm/action/class/actioncomm.class.php    |  2 +-
 htdocs/comm/action/index.php                     |  2 +-
 htdocs/comm/action/pertype.php                   |  2 +-
 htdocs/comm/action/peruser.php                   |  2 +-
 htdocs/comm/index.php                            | 10 +++++-----
 htdocs/comm/mailing/advtargetemailing.php        |  2 +-
 htdocs/comm/mailing/cibles.php                   |  2 +-
 htdocs/comm/propal/class/propal.class.php        |  2 +-
 htdocs/comm/prospect/index.php                   |  2 +-
 htdocs/commande/class/commande.class.php         |  4 ++--
 htdocs/commande/customer.php                     |  2 +-
 htdocs/compta/bank/class/account.class.php       |  7 ++++---
 htdocs/compta/bank/line.php                      |  2 +-
 htdocs/compta/cashcontrol/report.php             |  2 +-
 htdocs/compta/clients.php                        |  2 +-
 htdocs/compta/facture/class/facture.class.php    |  2 +-
 .../prelevement/class/bonprelevement.class.php   |  2 +-
 .../prelevement/class/ligneprelevement.class.php |  2 +-
 htdocs/compta/prelevement/list.php               |  2 +-
 htdocs/compta/prelevement/rejets.php             |  2 +-
 .../sociales/class/chargesociales.class.php      |  2 +-
 htdocs/compta/sociales/list.php                  |  2 +-
 htdocs/contact/list.php                          |  2 +-
 htdocs/contrat/index.php                         | 10 +++++-----
 htdocs/contrat/services_list.php                 |  2 +-
 htdocs/core/class/commoninvoice.class.php        |  4 ++--
 htdocs/core/class/commonobject.class.php         |  4 ++--
 htdocs/core/lib/company.lib.php                  |  6 +++---
 .../movement/doc/pdf_standard.modules.php        |  2 +-
 htdocs/core/website.inc.php                      |  2 +-
 htdocs/don/class/don.class.php                   |  2 +-
 htdocs/expedition/class/expedition.class.php     |  8 ++++----
 htdocs/fichinter/card-rec.php                    |  2 +-
 htdocs/fichinter/class/fichinter.class.php       |  2 +-
 htdocs/fichinter/list.php                        |  2 +-
 .../fourn/class/fournisseur.commande.class.php   |  2 +-
 htdocs/loan/list.php                             |  2 +-
 htdocs/mrp/mo_movements.php                      |  2 +-
 htdocs/product/class/product.class.php           |  4 ++--
 htdocs/product/stock/stockatdate.php             |  2 +-
 htdocs/projet/list.php                           |  2 +-
 htdocs/reception/class/reception.class.php       |  4 ++--
 htdocs/societe/index.php                         |  2 +-
 .../class/supplier_proposal.class.php            |  2 +-
 htdocs/supplier_proposal/index.php               |  2 +-
 htdocs/user/class/usergroup.class.php            |  2 +-
 70 files changed, 109 insertions(+), 108 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 7c05a9a0da4..f0fd9702009 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -442,7 +442,7 @@ if ($id) {
 		} else {
 			$sql .= " WHERE ";
 		}
-		$sql .= " c.rowid = ".$search_country_id;
+		$sql .= " c.rowid = ".((int) $search_country_id);
 	}
 
 	// If sort order is "country", we use country_code instead
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index e3cac139c08..f91b1821df4 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -563,7 +563,7 @@ if ($action == 'create') {
 		{
 		 $sqlmid = 'SELECT rowid as ref';
 			$sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac";
-			$sqlmid .= " WHERE fac.rowid=" . $object->fk_doc;
+			$sqlmid .= " WHERE fac.rowid=" . ((int) $object->fk_doc);
 			dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG);
 			$resultmid = $db->query($sqlmid);
 			if ($resultmid) {
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 9550933f2d8..d8e1598d1ac 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -473,7 +473,7 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " SELECT DISTINCT aa.account_number";
 		$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 = ".$conf->global->CHARTOFACCOUNTS;
+		$sql .= " AND asy.rowid = ".((int) $conf->global->CHARTOFACCOUNTS);
 		$sql .= " AND aa.active = 1";
 		$sql .= " AND aa.entity = ".$conf->entity.")";
 		$sql .= " GROUP BY t.numero_compte, t.label_operation, t.doc_ref";
@@ -562,7 +562,7 @@ class AccountancyCategory // extends CommonObject
 		$sql = "SELECT aa.rowid, aa.account_number";
 		$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 = ".$conf->global->CHARTOFACCOUNTS;
+		$sql .= " AND asy.rowid = ".((int) $conf->global->CHARTOFACCOUNTS);
 		$sql .= " AND aa.active = 1";
 		$sql .= " AND aa.entity = ".$conf->entity;
 		$sql .= " ORDER BY LENGTH(aa.account_number) DESC;"; // LENGTH is ok with mysql and postgresql
@@ -589,8 +589,8 @@ class AccountancyCategory // extends CommonObject
 				$accountincptsadded[$account_number_formated] = 1;
 				// We found an account number that is in list $cpts of account to add
 				$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account";
-				$sql .= " SET fk_accounting_category=".$id_cat;
-				$sql .= " WHERE rowid=".$obj->rowid;
+				$sql .= " SET fk_accounting_category=".((int) $id_cat);
+				$sql .= " WHERE rowid=".((int) $obj->rowid);
 				dol_syslog(__METHOD__, LOG_DEBUG);
 				$resqlupdate = $this->db->query($sql);
 				if (!$resqlupdate) {
@@ -629,7 +629,7 @@ class AccountancyCategory // extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account as aa";
 		$sql .= " SET fk_accounting_category= 0";
-		$sql .= " WHERE aa.rowid= ".$cpt_id;
+		$sql .= " WHERE aa.rowid = ".((int) $cpt_id);
 		$this->db->begin();
 
 		dol_syslog(__METHOD__." sql=".$sql, LOG_DEBUG);
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index a7d89c45294..28601380ac1 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -347,10 +347,10 @@ class AccountingAccount extends CommonObject
 		$sql .= " , label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "''");
 		$sql .= " , labelshort = ".($this->labelshort ? "'".$this->db->escape($this->labelshort)."'" : "''");
 		$sql .= " , fk_accounting_category = ".(empty($this->account_category) ? 0 : (int) $this->account_category);
-		$sql .= " , fk_user_modif = ".$user->id;
+		$sql .= " , fk_user_modif = ".((int) $user->id);
 		$sql .= " , active = ".(int) $this->active;
 		$sql .= " , reconcilable = ".(int) $this->reconcilable;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 6220904dbe8..00ed8879076 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1860,7 +1860,7 @@ class BookKeeping extends CommonObject
 		$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 asy.rowid = " . ((int) $pcgver);
 		$sql .= " AND ab.entity IN (" . getEntity('accountancy') . ")";
 		$sql .= " ORDER BY account_number ASC";
 		*/
@@ -1893,7 +1893,7 @@ class BookKeeping extends CommonObject
 		$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 asy.rowid = ".((int) $pcgver);
 		$sql .= " AND ab.entity IN (".getEntity('accountancy').")";
 		$sql .= " ORDER BY account_number ASC";
 
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 0b32e2802c4..43daa2efa88 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -110,13 +110,13 @@ if ($action == 'validatehistory') {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet";
 		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
 		$sql1 .= " FROM " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " WHERE " . MAIN_DB_PREFIX . "facturedet.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS.' AND accnt.entity = '.$conf->entity;
+		$sql1 .= " WHERE " . MAIN_DB_PREFIX . "facturedet.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
 		$sql1 .= " AND " . MAIN_DB_PREFIX . "facturedet.fk_code_ventilation = 0";
 	} else {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd, " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
 		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
-		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS.' AND accnt.entity = '.$conf->entity;
+		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
 		$sql1 .= " AND fd.fk_code_ventilation = 0";
 	}*/
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 38f7f596932..b4e85fd517a 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -103,13 +103,13 @@ if ($action == 'validatehistory') {
 		$sql1 = "UPDATE ".MAIN_DB_PREFIX."expensereport_det";
 		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
 		$sql1 .= " FROM ".MAIN_DB_PREFIX."c_type_fees as t, ".MAIN_DB_PREFIX."accounting_account as accnt , ".MAIN_DB_PREFIX."accounting_system as syst";
-		$sql1 .= " WHERE ".MAIN_DB_PREFIX."expensereport_det.fk_c_type_fees = t.id  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=".$conf->global->CHARTOFACCOUNTS.' AND accnt.entity = '.$conf->entity;
+		$sql1 .= " WHERE ".MAIN_DB_PREFIX."expensereport_det.fk_c_type_fees = t.id  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid = ".((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
 		$sql1 .= " AND accnt.active = 1 AND t.accountancy_code = accnt.account_number";
 		$sql1 .= " AND ".MAIN_DB_PREFIX."expensereport_det.fk_code_ventilation = 0";
 	} else {
 		$sql1 = "UPDATE ".MAIN_DB_PREFIX."expensereport_det as erd, ".MAIN_DB_PREFIX."c_type_fees as t, ".MAIN_DB_PREFIX."accounting_account as accnt , ".MAIN_DB_PREFIX."accounting_system as syst";
 		$sql1 .= " SET erd.fk_code_ventilation = accnt.rowid";
-		$sql1 .= " WHERE erd.fk_c_type_fees = t.id AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=".$conf->global->CHARTOFACCOUNTS.' AND accnt.entity = '.$conf->entity;
+		$sql1 .= " WHERE erd.fk_c_type_fees = t.id AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid = ".((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
 		$sql1 .= " AND accnt.active = 1 AND t.accountancy_code=accnt.account_number";
 		$sql1 .= " AND erd.fk_code_ventilation = 0";
 	}
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 27b37c74932..741b2c9f038 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -1323,42 +1323,42 @@ function getSourceDocRef($val, $typerecord)
 	} elseif ($typerecord == 'payment_supplier') {
 		$sqlmid = 'SELECT payfac.fk_facturefourn as id, f.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfac, ".MAIN_DB_PREFIX."facture_fourn as f";
-		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=".$val["paymentsupplierid"];
+		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=".((int) $val["paymentsupplierid"]);
 		$ref = $langs->transnoentitiesnoconv("SupplierInvoice");
 	} elseif ($typerecord == 'payment_expensereport') {
 		$sqlmid = 'SELECT e.rowid as id, e.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as pe, ".MAIN_DB_PREFIX."expensereport as e";
-		$sqlmid .= " WHERE pe.rowid=".$val["paymentexpensereport"]." AND pe.fk_expensereport = e.rowid";
+		$sqlmid .= " WHERE pe.rowid=".((int) $val["paymentexpensereport"])." AND pe.fk_expensereport = e.rowid";
 		$ref = $langs->transnoentitiesnoconv("ExpenseReport");
 	} elseif ($typerecord == 'payment_salary') {
 		$sqlmid = 'SELECT s.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
-		$sqlmid .= " WHERE s.rowid=".$val["paymentsalid"];
+		$sqlmid .= " WHERE s.rowid=".((int) $val["paymentsalid"]);
 		$ref = $langs->transnoentitiesnoconv("SalaryPayment");
 	} elseif ($typerecord == 'sc') {
 		$sqlmid = 'SELECT sc.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementcharge as sc";
-		$sqlmid .= " WHERE sc.rowid=".$val["paymentscid"];
+		$sqlmid .= " WHERE sc.rowid=".((int) $val["paymentscid"]);
 		$ref = $langs->transnoentitiesnoconv("SocialContribution");
 	} elseif ($typerecord == 'payment_vat') {
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."tva as v";
-		$sqlmid .= " WHERE v.rowid=".$val["paymentvatid"];
+		$sqlmid .= " WHERE v.rowid=".((int) $val["paymentvatid"]);
 		$ref = $langs->transnoentitiesnoconv("PaymentVat");
 	} elseif ($typerecord == 'payment_donation') {
 		$sqlmid = 'SELECT payd.fk_donation as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_donation as payd";
-		$sqlmid .= " WHERE payd.fk_donation=".$val["paymentdonationid"];
+		$sqlmid .= " WHERE payd.fk_donation=".((int) $val["paymentdonationid"]);
 		$ref = $langs->transnoentitiesnoconv("Donation");
 	} elseif ($typerecord == 'payment_loan') {
 		$sqlmid = 'SELECT l.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_loan as l";
-		$sqlmid .= " WHERE l.rowid=".$val["paymentloanid"];
+		$sqlmid .= " WHERE l.rowid=".((int) $val["paymentloanid"]);
 		$ref = $langs->transnoentitiesnoconv("LoanPayment");
 	} elseif ($typerecord == 'payment_various') {
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
-		$sqlmid .= " WHERE v.rowid=".$val["paymentvariousid"];
+		$sqlmid .= " WHERE v.rowid=".((int) $val["paymentvariousid"]);
 		$ref = $langs->transnoentitiesnoconv("VariousPayment");
 	}
 	// Add warning
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 392551708de..91dd921f1fa 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -118,13 +118,13 @@ if ($action == 'validatehistory') {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
 		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
 		$sql1 .= " FROM " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " WHERE " . MAIN_DB_PREFIX . "facture_fourn_det.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS.' AND accnt.entity = '.$conf->entity;
+		$sql1 .= " WHERE " . MAIN_DB_PREFIX . "facture_fourn_det.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_buy=accnt.account_number";
 		$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 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.' AND accnt.entity = '.$conf->entity;
+		$sql1 .= " WHERE fd.fk_product = p.rowid AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_buy=accnt.account_number";
 		$sql1 .= " AND fd.fk_code_ventilation = 0";
 	}*/
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 0299b32663c..d7dbeb9eb13 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1597,8 +1597,8 @@ class Adherent extends CommonObject
 				$inserturlid = $acct->add_url_line($insertid, $this->id, DOL_URL_ROOT.'/adherents/card.php?rowid=', $this->getFullname($langs), 'member');
 				if ($inserturlid > 0) {
 					// Update table subscription
-					$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET fk_bank=".$insertid;
-					$sql .= " WHERE rowid=".$subscriptionid;
+					$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET fk_bank=".((int) $insertid);
+					$sql .= " WHERE rowid=".((int) $subscriptionid);
 
 					dol_syslog("subscription::subscription", LOG_DEBUG);
 					$resql = $this->db->query($sql);
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index b2f181e59be..d051c40810b 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -365,7 +365,7 @@ class AdherentType extends CommonObject
 		$sql .= "note = '".$this->db->escape($this->note)."',";
 		$sql .= "vote = ".(integer) $this->db->escape($this->vote).",";
 		$sql .= "mail_valid = '".$this->db->escape($this->mail_valid)."'";
-		$sql .= " WHERE rowid =".$this->id;
+		$sql .= " WHERE rowid =".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 65b01991100..95bbe79804f 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -217,7 +217,7 @@ class Subscription extends CommonObject
 		$sql .= " datef,";
 		$sql .= " subscription, note, fk_bank";
 		$sql .= " FROM ".MAIN_DB_PREFIX."subscription";
-		$sql .= "	WHERE rowid=".$rowid;
+		$sql .= "	WHERE rowid=".((int) $rowid);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 9560a284e2a..b713362912e 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -318,7 +318,7 @@ if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 if ($search_type > 0) {
-	$sql .= " AND t.rowid=".$db->escape($search_type);
+	$sql .= " AND t.rowid=".((int) $search_type);
 }
 if ($search_filter == 'withoutsubscription') {
 	$sql .= " AND (datefin IS NULL OR t.subscription = 0)";
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 54729e5ba8a..ec9b2c3a65e 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -677,7 +677,7 @@ if ($rowid > 0) {
 		$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 .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-		$sql .= " WHERE d.rowid = c.fk_adherent AND d.rowid=".$rowid;
+		$sql .= " WHERE d.rowid = c.fk_adherent AND d.rowid=".((int) $rowid);
 		$sql .= $db->order($sortfield, $sortorder);
 
 		$result = $db->query($sql);
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 7322f92fccd..55cafade309 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -170,7 +170,7 @@ if (isset($date_select) && $date_select != '') {
 }
 if ($search_ref) {
 	if (is_numeric($search_ref)) {
-		$sql .= " AND (c.rowid = ".$db->escape($search_ref).")";
+		$sql .= " AND c.rowid = ".((int) $search_ref);
 	} else {
 		$sql .= " AND 1 = 2"; // Always wrong
 	}
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 25c44baa7db..c9b98784142 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -500,7 +500,7 @@ if ($rowid > 0) {
 		$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('adherent').")";
-		$sql .= " AND t.rowid = ".$object->id;
+		$sql .= " AND t.rowid = ".((int) $object->id);
 		if ($sall) {
 			$sql .= natural_search(array("f.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);
 		}
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index e8793ca3c30..fc3e30a484b 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -156,7 +156,7 @@ if ($action == 'delete') {
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
 		$sql .= " WHERE entity = ".$conf->entity;
-		$sql .= " AND box_id=".$obj->box_id;
+		$sql .= " AND box_id=".((int) $obj->box_id);
 
 		$resql = $db->query($sql);
 
@@ -255,7 +255,7 @@ if ($resql) {
 		// We renumber the order of the boxes if one of them is in ''
 		// This occurs just after an insert.
 		if ($decalage) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($decalage)."' WHERE rowid=".$obj->rowid;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($decalage)."' WHERE rowid=".((int) $obj->rowid);
 			$db->query($sql);
 		}
 	}
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 636278dd6fb..455c01d0337 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1151,7 +1151,7 @@ if ($id) {
 		$sql .= " WHERE 1 = 1";
 	}
 	if ($search_country_id > 0) {
-		$sql .= " AND c.rowid = ".$search_country_id;
+		$sql .= " AND c.rowid = ".((int) $search_country_id);
 	}
 	if ($search_code != '' && $id == 9) {
 		$sql .= natural_search("code_iso", $search_code);
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index b8b412ad6f8..71086096e4f 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -136,7 +136,7 @@ if (GETPOST("delete")) {
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
 				$sql .= " WHERE entity = ".$conf->entity;
-				$sql .= " AND box_id = ".$obj->rowid;
+				$sql .= " AND box_id = ".((int) $obj->rowid);
 				$resql = $db->query($sql);
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 9ce22b7c08e..e3521f1d0af 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -71,7 +71,7 @@ if ($action == 'activate_encrypt') {
 			if (dol_hash($obj->pass)) {
 				$sql = "UPDATE ".MAIN_DB_PREFIX."user";
 				$sql .= " SET pass_crypted = '".dol_hash($obj->pass)."', pass = NULL";
-				$sql .= " WHERE rowid=".$obj->rowid;
+				$sql .= " WHERE rowid=".((int) $obj->rowid);
 				//print $sql;
 
 				$resql2 = $db->query($sql);
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index 99205d2b3f3..36c654c28ba 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -188,7 +188,7 @@ class AssetType extends CommonObject
 		$sql .= "accountancy_code_depreciation_asset = '".$this->db->escape($this->accountancy_code_depreciation_asset)."',";
 		$sql .= "accountancy_code_depreciation_expense = '".$this->db->escape($this->accountancy_code_depreciation_expense)."',";
 		$sql .= "note = '".$this->db->escape($this->note)."'";
-		$sql .= " WHERE rowid =".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 9fc10fdc59e..2071eb03c47 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -148,7 +148,7 @@ class BlockedLogAuthority
 
 		global $langs;
 
-		dol_syslog(get_class($this)."::fetch id=".$id, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch id=".((int) $id), LOG_DEBUG);
 
 		if (empty($id) && empty($signature)) {
 			$this->error = 'BadParameter';
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 4fe8c3cee83..9a5b3a53c20 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -219,7 +219,7 @@ class Bookmark extends CommonObject
 		$sql .= " ,title = '".$this->db->escape($this->title)."'";
 		$sql .= " ,favicon = '".$this->db->escape($this->favicon)."'";
 		$sql .= " ,position = ".(int) $this->position;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog("Bookmark::update", LOG_DEBUG);
 		if ($this->db->query($sql)) {
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 1f467b507d1..51079636d4f 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1470,7 +1470,7 @@ class Categorie extends CommonObject
 			// Load bank categories
 			$sql = "SELECT c.label, c.rowid";
 			$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 .= " WHERE a.lineid=".((int) $id)." AND a.fk_categ = c.rowid";
 			$sql .= " AND c.entity IN (".getEntity('category').")";
 			$sql .= " ORDER BY c.label";
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index f7ceea4743d..d8bcd0efb1b 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -2436,7 +2436,7 @@ class ActionComm extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
 		$sql .= " SET percent = ".(int) $percent;
-		$sql .= " WHERE id=".$id;
+		$sql .= " WHERE id = ".((int) $id);
 
 		if ($this->db->query($sql)) {
 			$this->db->commit();
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 33e4fabe2aa..be0884a5556 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -720,7 +720,7 @@ if ($action == 'show_day') {
 	$sql .= ')';
 }
 if ($type) {
-	$sql .= " AND ca.id = ".$type;
+	$sql .= " AND ca.id = ".((int) $type);
 }
 if ($status == '0') {
 	$sql .= " AND a.percent = 0";
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 8d436f0e0f6..19f8a8ce31c 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -592,7 +592,7 @@ if ($action == 'show_day') {
 	$sql .= ')';
 }
 if ($type) {
-	$sql .= " AND ca.id = ".$type;
+	$sql .= " AND ca.id = ".((int) $type);
 }
 if ($status == '0') {
 	$sql .= " AND a.percent = 0";
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 3ad2d31b353..62af33b34ee 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -613,7 +613,7 @@ if ($action == 'show_day') {
 	$sql .= ')';
 }
 if ($type) {
-	$sql .= " AND ca.id = ".$type;
+	$sql .= " AND ca.id = ".((int) $type);
 }
 if ($status == '0') {
 	$sql .= " AND a.percent = 0";
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 60a6bd5974b..5c2360624a4 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -219,7 +219,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND s.rowid = ".$socid;
+		$sql .= " AND s.rowid = ".((int) $socid);
 	}
 
 	$resql = $db->query($sql);
@@ -605,7 +605,7 @@ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_S
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND s.rowid = ".$socid;
+		$sql .= " AND s.rowid = ".((int) $socid);
 	}
 	$sql .= " ORDER BY s.datec DESC";
 	$sql .= $db->plimit($max, 0);
@@ -711,7 +711,7 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // T
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND s.rowid = ".$socid;
+		$sql .= " AND s.rowid = ".((int) $socid);
 	}
 	$sql .= " ORDER BY c.tms DESC";
 	$sql .= $db->plimit($max + 1, 0);
@@ -786,7 +786,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND s.rowid = ".$socid;
+		$sql .= " AND s.rowid = ".((int) $socid);
 	}
 	$sql .= " ORDER BY p.rowid DESC";
 
@@ -902,7 +902,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND s.rowid = ".$socid;
+		$sql .= " AND s.rowid = ".((int) $socid);
 	}
 	$sql .= " ORDER BY c.rowid DESC";
 
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 2487e772373..bd052f4161e 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -379,7 +379,7 @@ if ($action == 'deletefilter') {
 
 if ($action == 'delete') {
 	// Ici, rowid indique le destinataire et id le mailing
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$rowid;
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid = ".((int) $rowid);
 	$resql = $db->query($sql);
 	if ($resql) {
 		if (!empty($id)) {
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d9557845492..27859403d96 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -167,7 +167,7 @@ if (GETPOST('exportcsv', 'int')) {
 
 if ($action == 'delete') {
 	// Ici, rowid indique le destinataire et id le mailing
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$rowid;
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid = ".((int) $rowid);
 	$resql = $db->query($sql);
 	if ($resql) {
 		if (!empty($id)) {
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index ffee98ffbba..441020c9b5d 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1477,7 +1477,7 @@ class Propal extends CommonObject
 			$sql .= " WHERE p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid
 			$sql .= " AND p.ref='".$this->db->escape($ref)."'";
 		} else {
-			$sql .= " WHERE p.rowid=".$rowid;
+			$sql .= " WHERE p.rowid = ".((int) $rowid);
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 3aacd070ae4..8883e0af6f3 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -194,7 +194,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND s.rowid = ".$socid;
+		$sql .= " AND s.rowid = ".((int) $socid);
 	}
 	$sql .= " ORDER BY p.rowid DESC";
 	$sql .= $db->plimit(5, 0);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 635e561eaef..c89ad9340d2 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1807,7 +1807,7 @@ class Commande extends CommonOrder
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
 
 		if ($id) {
-			$sql .= " WHERE c.rowid=".$id;
+			$sql .= " WHERE c.rowid=".((int) $id);
 		} else {
 			$sql .= " WHERE c.entity IN (".getEntity('commande').")"; // Dont't use entity if you use rowid
 		}
@@ -2687,7 +2687,7 @@ class Commande extends CommonOrder
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid) {
-			$sql .= " AND s.rowid = ".$socid;
+			$sql .= " AND s.rowid = ".((int) $socid);
 		}
 		if ($draft) {
 			$sql .= " AND c.fk_statut = ".self::STATUS_DRAFT;
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 4f75ca3d4c5..6dfa898a024 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -105,7 +105,7 @@ if (dol_strlen($begin)) {
 	$sql .= " AND s.nom like '".$db->escape($begin)."'";
 }
 if ($socid > 0) {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 $sql .= " AND c.fk_statut in (1, 2) AND c.facture = 0";
 $sql .= " GROUP BY s.nom";
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 943fef0c32a..13c2bdba4ce 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -509,6 +509,7 @@ class Account extends CommonObject
 		}
 
 		// Clean parameters
+		$label =
 		$emetteur = trim($emetteur);
 		$banque = trim($banque);
 
@@ -516,7 +517,7 @@ class Account extends CommonObject
 
 		if (is_numeric($oper)) {    // Clean operation to have a code instead of a rowid
 			$sql = "SELECT code FROM ".MAIN_DB_PREFIX."c_paiement";
-			$sql .= " WHERE id=".$oper;
+			$sql .= " WHERE id = ".((int) $oper);
 			$sql .= " AND entity IN (".getEntity('c_paiement').")";
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -1223,7 +1224,7 @@ class Account extends CommonObject
 		$sql .= " AND (ba.rappro = 1 AND ba.courant != 2)"; // Compte rapprochable
 		$sql .= " AND clos = 0";
 		if ($filteraccountid) {
-			$sql .= " AND ba.rowid = ".$filteraccountid;
+			$sql .= " AND ba.rowid = ".((int) $filteraccountid);
 		}
 
 		$resql = $this->db->query($sql);
@@ -1278,7 +1279,7 @@ class Account extends CommonObject
 		$sql .= " AND (ba.rappro = 1 AND ba.courant != 2)"; // Compte rapprochable
 		$sql .= " AND clos = 0";
 		if ($filteraccountid) {
-			$sql .= " AND ba.rowid = ".$filteraccountid;
+			$sql .= " AND ba.rowid = ".((int) $filteraccountid);
 		}
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index bfea7c74b60..3aa477dfc9c 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -268,7 +268,7 @@ $sql = "SELECT b.rowid,b.dateo as do,b.datev as dv, b.amount, b.label, b.rappro,
 $sql .= " b.num_releve, b.fk_user_author, b.num_chq, b.fk_type, b.fk_account, b.fk_bordereau as receiptid,";
 $sql .= " b.emetteur,b.banque";
 $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
-$sql .= " WHERE rowid=".$rowid;
+$sql .= " WHERE rowid=".((int) $rowid);
 $sql .= " ORDER BY dateo ASC";
 $result = $db->query($sql);
 if ($result) {
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index add61ac086c..653161ca3bc 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -342,7 +342,7 @@ if ($resql) {
 	$sql .= "SET";
 	$sql .= " cash='".$db->escape($cash)."'";
 	$sql .= ", card='".$db->escape($bank)."'";
-	$sql .= " where rowid=".$id;
+	$sql .= " where rowid = ".((int) $id);
 	$db->query($sql);
 	*/
 
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 191038ed28a..60924dae644 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -127,7 +127,7 @@ if (dol_strlen($begin)) {
 	$sql .= natural_search("s.nom", $begin);
 }
 if ($socid) {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 $sql .= " ORDER BY $sortfield $sortorder ";
 $sql .= $db->plimit($conf->liste_limit + 1, $offset);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b949877dc82..9ae760220a4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1604,7 +1604,7 @@ class Facture extends CommonInvoice
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON f.fk_incoterms = i.rowid';
 
 		if ($rowid) {
-			$sql .= " WHERE f.rowid=".$rowid;
+			$sql .= " WHERE f.rowid=".((int) $rowid);
 		} else {
 			$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')'; // Dont't use entity if you use rowid
 			if ($ref) {
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 087911ce140..ea44a75899d 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -290,7 +290,7 @@ class BonPrelevement extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 		$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
 		if ($rowid > 0) {
-			$sql .= " AND p.rowid = ".$rowid;
+			$sql .= " AND p.rowid = ".((int) $rowid);
 		} else {
 			$sql .= " AND p.ref = '".$this->db->escape($ref)."'";
 		}
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 6fa9b94b637..1c57feca37e 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -79,7 +79,7 @@ class LignePrelevement
 		$sql .= ", pl.statut, pl.fk_soc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
 		$sql .= ", ".MAIN_DB_PREFIX."prelevement_bons as p";
-		$sql .= " WHERE pl.rowid=".$rowid;
+		$sql .= " WHERE pl.rowid=".((int) $rowid);
 		$sql .= " AND p.rowid = pl.fk_prelevement_bons";
 		$sql .= " AND p.entity = ".$conf->entity;
 
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 0818dbb61d1..feb69bdc7fb 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -125,7 +125,7 @@ if ($type == 'bank-transfer') {
 $sql .= " AND f.fk_soc = s.rowid";
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
 if ($socid) {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 if ($search_line) {
 	$sql .= " AND pl.rowid = '".$db->escape($search_line)."'";
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index fb03f2a6c6c..5aec35cf504 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -99,7 +99,7 @@ if ($type == 'bank-transfer') {
 	$sql .= " AND p.type = 'debit-order'";
 }
 if ($socid) {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($limit + 1, $offset);
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 20cc2c82b0c..1977ac9791b 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -147,7 +147,7 @@ class ChargeSociales extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id';
 		$sql .= ' WHERE cs.entity IN ('.getEntity('tax').')';
 		if ($ref) {
-			$sql .= " AND cs.rowid = ".$ref;
+			$sql .= " AND cs.ref = '".$this->db->escape($ref)."'";
 		} else {
 			$sql .= " AND cs.rowid = ".((int) $id);
 		}
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index ffebc7dcc73..2b0c3961759 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -195,7 +195,7 @@ $sql .= " WHERE cs.fk_type = c.id";
 $sql .= " AND cs.entity = ".$conf->entity;
 // Search criteria
 if ($search_ref) {
-	$sql .= " AND cs.rowid=".$db->escape($search_ref);
+	$sql .= " AND cs.ref = '".$db->escape($search_ref)."'";
 }
 if ($search_label) {
 	$sql .= natural_search("cs.libelle", $search_label);
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index b02856ceb3b..c7386c260ed 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -513,7 +513,7 @@ if ($type == "o") {        // filtre sur type
 	$sql .= " AND s.client IN (2, 3)";
 }
 if (!empty($socid)) {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 8ab94ca6793..aed4cba2fe1 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -323,11 +323,11 @@ 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 .= " AND s.rowid = ".((int) $socid);
 }
 $sql .= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid";
 $sql .= " ORDER BY c.tms DESC";
-$sql .= " LIMIT ".$max;
+$sql .= $db->plimit($max);
 
 dol_syslog("contrat/index.php", LOG_DEBUG);
 $result = $db->query($sql);
@@ -398,7 +398,7 @@ 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 .= " AND s.rowid = ".((int) $socid);
 }
 $sql .= " ORDER BY cd.tms DESC";
 
@@ -480,7 +480,7 @@ 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 .= " AND s.rowid = ".((int) $socid);
 }
 $sql .= " ORDER BY cd.tms DESC";
 
@@ -562,7 +562,7 @@ 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 .= " AND s.rowid = ".((int) $socid);
 }
 $sql .= " ORDER BY cd.tms DESC";
 
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 7247dc02c83..a0ecc6b4be8 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -288,7 +288,7 @@ if ($search_service) {
 	$sql .= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
 }
 if ($socid > 0) {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 
 $filter_dateouvertureprevue_start = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 50d94da8531..81f2b529f1d 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -604,10 +604,10 @@ abstract class CommonInvoice extends CommonObject
 		$sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
 		$sqltemp .= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
 		if (is_numeric($cond_reglement)) {
-			$sqltemp .= " WHERE c.rowid=".$cond_reglement;
+			$sqltemp .= " WHERE c.rowid=".((int) $cond_reglement);
 		} else {
 			$sqltemp .= " WHERE c.entity IN (".getEntity('c_payment_term').")";
-			$sqltemp .= " AND c.code='".$this->db->escape($cond_reglement)."'";
+			$sqltemp .= " AND c.code = '".$this->db->escape($cond_reglement)."'";
 		}
 
 		dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a93acda2a17..2088263a2c2 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3969,7 +3969,7 @@ abstract class CommonObject
 			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "element_element";
 			$sql .= " WHERE";
 			if ($rowid > 0) {
-				$sql .= " rowid = " . $rowid;
+				$sql .= " rowid = " . ((int) $rowid);
 			} else {
 				if ($deletesource) {
 					$sql .= " fk_source = " . $sourceid . " AND sourcetype = '" . $this->db->escape($sourcetype) . "'";
@@ -5012,7 +5012,7 @@ abstract class CommonObject
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
-		$sql .= " WHERE rowid=".$rowid;
+		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index fb97d2e5361..7183e24dea5 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -504,11 +504,11 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
 
 	$sql = "SELECT rowid, code, label FROM ".MAIN_DB_PREFIX."c_country";
 	if (is_numeric($searchkey)) {
-		$sql .= " WHERE rowid=".$searchkey;
+		$sql .= " WHERE rowid = ".((int) $searchkey);
 	} elseif (!empty($searchkey)) {
-		$sql .= " WHERE code='".$db->escape($searchkey)."'";
+		$sql .= " WHERE code = '".$db->escape($searchkey)."'";
 	} else {
-		$sql .= " WHERE label='".$db->escape($searchlabel)."'";
+		$sql .= " WHERE label = '".$db->escape($searchlabel)."'";
 	}
 
 	$resql = $dbtouse->query($sql);
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index c8a0c50862b..c2817fb50f6 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -295,7 +295,7 @@ class pdf_stdandard extends ModelePDFMovement
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON m.batch = pl.batch AND m.fk_product = pl.fk_product";
 		$sql .= " WHERE m.fk_product = p.rowid";
 		if ($msid > 0) {
-			$sql .= " AND m.rowid = ".$msid;
+			$sql .= " AND m.rowid = ".((int) $msid);
 		}
 		$sql .= " AND m.fk_entrepot = e.rowid";
 		$sql .= " AND e.entity IN (".getEntity('stock').")";
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 30ffee00248..8ffa69e31ac 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -94,7 +94,7 @@ if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php') {	// If we browsi
 		$sql = "SELECT wp.rowid, wp.lang, wp.pageurl, wp.fk_page";
 		$sql .= " FROM ".MAIN_DB_PREFIX."website_page as wp";
 		$sql .= " WHERE wp.fk_website = ".((int) $website->id);
-		$sql .= " AND (wp.fk_page = ".$pageid." OR wp.rowid  = ".$pageid;
+		$sql .= " AND (wp.fk_page = ".((int) $pageid)." OR wp.rowid  = ".((int) $pageid);
 		if (is_object($websitepage) && $websitepage->fk_page > 0) {
 			$sql .= " OR wp.fk_page = ".$websitepage->fk_page." OR wp.rowid = ".$websitepage->fk_page;
 		}
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 1ec3ebe1cc5..a925cdb4ba4 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -612,7 +612,7 @@ class Don extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid";
 		$sql .= " WHERE d.entity IN (".getEntity('donation').")";
 		if (!empty($id)) {
-			$sql .= " AND d.rowid=".$id;
+			$sql .= " AND d.rowid=".((int) $id);
 		} elseif (!empty($ref)) {
 			$sql .= " AND d.ref='".$this->db->escape($ref)."'";
 		}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index ed6f7a25eaf..f7c5a1d32a8 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -545,7 +545,7 @@ class Expedition extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_shipment_mode as s ON e.fk_shipping_method = s.rowid';
 		$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
 		if ($id) {
-			$sql .= " AND e.rowid=".$id;
+			$sql .= " AND e.rowid = ".((int) $id);
 		}
 		if ($ref) {
 			$sql .= " AND e.ref='".$this->db->escape($ref)."'";
@@ -2033,7 +2033,7 @@ class Expedition extends CommonObject
 		$sql = "SELECT em.rowid, em.code, em.libelle as label, em.description, em.tracking, em.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
 		if ($id != '') {
-			$sql .= " WHERE em.rowid=".$id;
+			$sql .= " WHERE em.rowid=".((int) $id);
 		}
 
 		$resql = $this->db->query($sql);
@@ -2072,7 +2072,7 @@ class Expedition extends CommonObject
 			$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
 			$sql .= ",description='".$this->db->escape($this->update['description'])."'";
 			$sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
-			$sql .= " WHERE rowid=".$id;
+			$sql .= " WHERE rowid=".((int) $id);
 			$resql = $this->db->query($sql);
 		}
 		if ($resql < 0) {
@@ -2952,7 +2952,7 @@ class ExpeditionLigne extends CommonObjectLine
 					// delete lot expedition line
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
 					$sql .= " WHERE fk_expeditiondet = ".$this->id;
-					$sql .= " AND rowid = ".$expedition_batch_id;
+					$sql .= " AND rowid = ".((int) $expedition_batch_id);
 
 					if (!$this->db->query($sql)) {
 						$this->errors[] = $this->db->lasterror()." - sql=$sql";
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index b7280c2f4a4..26ea2cfaaa8 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -771,7 +771,7 @@ if ($action == 'create') {
 		$sql .= " WHERE f.fk_soc = s.rowid";
 		$sql .= " AND f.entity = ".$conf->entity;
 		if ($socid) {
-			$sql .= " AND s.rowid = ".$socid;
+			$sql .= " AND s.rowid = ".((int) $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/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 1fef1ed7c03..1c1c1ab37be 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -432,7 +432,7 @@ class Fichinter extends CommonObject
 			$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
 			$sql .= " AND f.ref='".$this->db->escape($ref)."'";
 		} else {
-			$sql .= " WHERE f.rowid=".$rowid;
+			$sql .= " WHERE f.rowid=".((int) $rowid);
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index ee9edc6694b..86c1cccef95 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -282,7 +282,7 @@ if (!$user->rights->societe->client->voir && empty($socid)) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 if ($socid) {
-	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
 if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index c999f204749..331e211e5ac 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -331,7 +331,7 @@ class CommandeFournisseur extends CommonOrder
 		if (empty($id)) {
 			$sql .= " WHERE c.entity IN (".getEntity('supplier_order').")";
 		} else {
-			$sql .= " WHERE c.rowid=".$id;
+			$sql .= " WHERE c.rowid=".((int) $id);
 		}
 
 		if ($ref) {
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index fa1de74b0cc..f9b08a63a48 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -113,7 +113,7 @@ if ($search_amount) {
 	$sql .= natural_search("l.capital", $search_amount, 1);
 }
 if ($search_ref) {
-	$sql .= " AND l.rowid = ".$db->escape($search_ref);
+	$sql .= " AND l.rowid = ".((int) $search_ref);
 }
 if ($search_label) {
 	$sql .= natural_search("l.label", $search_label);
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index b4b777f7b49..7b9c0662e53 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -441,7 +441,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$sql .= " WHERE m.fk_product = p.rowid";
 	$sql .= " AND m.origintype = 'mo' AND m.fk_origin = ".(int) $object->id;
 	if ($msid > 0) {
-		$sql .= " AND m.rowid = ".$msid;
+		$sql .= " AND m.rowid = ".((int) $msid);
 	}
 	$sql .= " AND m.fk_entrepot = e.rowid";
 	$sql .= " AND e.entity IN (".getEntity('stock').")";
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 6ed0b4266a8..fbe706e93db 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1679,11 +1679,11 @@ class Product extends CommonObject
 	{
 		// phpcs:enable
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-		$sql .= " WHERE fk_product_price=".$rowid;
+		$sql .= " WHERE fk_product_price=".((int) $rowid);
 		$resql = $this->db->query($sql);
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price";
-		$sql .= " WHERE rowid=".$rowid;
+		$sql .= " WHERE rowid=".((int) $rowid);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			return 1;
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index d9a9be0cd70..e5eb2751109 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -266,7 +266,7 @@ $reshook = $hookmanager->executeHooks('printFieldListJoin', $parameters); // Not
 $sql .= $hookmanager->resPrint;
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($productid > 0) {
-	$sql .= " AND p.rowid = ".$productid;
+	$sql .= " AND p.rowid = ".((int) $productid);
 }
 if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 	$sql .= " AND p.fk_product_type = 0";
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index a0888daee2a..a9f17f5439b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -424,7 +424,7 @@ if ($search_public != '') {
 	$sql .= " AND p.public = ".$db->escape($search_public);
 }
 // For external user, no check is done on company permission because readability is managed by public status of project and assignement.
-//if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
+//if ($socid > 0) $sql.= " AND s.rowid = ".((int) $socid);
 if ($search_sale > 0) {
 	$sql .= " AND sc.fk_user = ".((int) $search_sale);
 }
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index b2f31505c44..d5e3feaa255 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -384,7 +384,7 @@ class Reception extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
 		$sql .= " WHERE e.entity IN (".getEntity('reception').")";
 		if ($id) {
-			$sql .= " AND e.rowid=".$id;
+			$sql .= " AND e.rowid=".((int) $id);
 		}
 		if ($ref) {
 			$sql .= " AND e.ref='".$this->db->escape($ref)."'";
@@ -1356,7 +1356,7 @@ class Reception extends CommonObject
 			$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
 			$sql .= ",description='".$this->db->escape($this->update['description'])."'";
 			$sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
-			$sql .= " WHERE rowid=".$id;
+			$sql .= " WHERE rowid=".((int) $id);
 			$resql = $this->db->query($sql);
 		}
 		if ($resql < 0) {
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index a8a4c454c2c..f56beedb64e 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -274,7 +274,7 @@ 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 .= " AND s.rowid = ".((int) $socid);
 }
 if (!$user->rights->fournisseur->lire) {
 	$sql .= " AND (s.fournisseur != 1 OR s.client != 0)";
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 0320a663ea8..728bf8f0fd9 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1938,7 +1938,7 @@ class SupplierProposal extends CommonObject
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
 		if ($socid) {
-			$sql .= " AND s.rowid = ".$socid;
+			$sql .= " AND s.rowid = ".((int) $socid);
 		}
 		if ($draft) {
 			$sql .= " AND p.fk_statut = 0";
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 0cfdc5a09b6..75eba410d0f 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -315,7 +315,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND s.rowid = ".$socid;
+		$sql .= " AND s.rowid = ".((int) $socid);
 	}
 	$sql .= " ORDER BY p.rowid DESC";
 
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index f0b6bcdfe87..3738c63b435 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -504,7 +504,7 @@ class UserGroup extends CommonObject
 					}
 
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights";
-					$sql .= " WHERE fk_usergroup = $this->id AND fk_id=".$nid;
+					$sql .= " WHERE fk_usergroup = $this->id AND fk_id=".((int) $nid);
 					$sql .= " AND entity = ".$entity;
 					if (!$this->db->query($sql)) {
 						$error++;

From 9f03054fc45fac448fe76e3af0711a9ac7759fac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Apr 2021 20:52:48 +0200
Subject: [PATCH 271/928] Fix #yogosha5877

---
 htdocs/compta/bank/bankentries_list.php       | 23 ++++++++++---------
 htdocs/compta/bank/class/account.class.php    |  2 +-
 .../bank/class/api_bankaccounts.class.php     |  8 ++++++-
 htdocs/core/lib/functions.lib.php             |  6 ++---
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index f6b719515cc..39967304e4c 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -791,7 +791,7 @@ if ($resql) {
 		$nbmax = 12; // We show last 12 receipts (so we can have more than one year)
 		$liste = "";
 		$sql = "SELECT DISTINCT num_releve FROM ".MAIN_DB_PREFIX."bank";
-		$sql .= " WHERE fk_account=".$object->id." AND num_releve IS NOT NULL";
+		$sql .= " WHERE fk_account = ".((int) $object->id)." AND num_releve IS NOT NULL";
 		$sql .= $db->order("num_releve", "DESC");
 		$sql .= $db->plimit($nbmax + 1);
 		print '<br>';
@@ -967,7 +967,7 @@ if ($resql) {
 	$moreforfilter = '';
 
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('DateOperationShort').' :';
+	$moreforfilter .= $langs->trans('DateOperationShort').' ';
 	$moreforfilter .= ($conf->browser->layout == 'phone' ? '<br>' : ' ');
 	$moreforfilter .= '<div class="nowrap inline-block">';
 	$moreforfilter .= $form->selectDate($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')).'</div>';
@@ -976,7 +976,7 @@ if ($resql) {
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('DateValueShort').' : ';
+	$moreforfilter .= $langs->trans('DateValueShort').' ';
 	$moreforfilter .= ($conf->browser->layout == 'phone' ? '<br>' : ' ');
 	$moreforfilter .= '<div class="nowrap inline-block">';
 	$moreforfilter .= $form->selectDate($search_dv_start, 'search_start_dv', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')).'</div>';
@@ -1329,21 +1329,22 @@ if ($resql) {
 
 		// Description
 		if (!empty($arrayfields['b.label']['checked'])) {
-			print "<td>";
-
-			//print "<a href=\"line.php?rowid=".$objp->rowid."&amp;account=".$objp->fk_account."\">";
+			$labeltoshow = '';
+			$titletoshow = '';
 			$reg = array();
 			preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
 			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) {
-				print $langs->trans($reg[1]);
+				$labeltoshow = $langs->trans($reg[1]);
 			} else {
 				if ($objp->label == '(payment_salary)') {
-					print dol_trunc($langs->trans("SalaryPayment", 40));
+					$labeltoshow = dol_trunc($langs->trans("SalaryPayment", 40));
 				} else {
-					print dol_trunc($objp->label, 40);
+					$labeltoshow = dol_escape_htmltag($objp->label);
+					$titletoshow = $objp->label;
 				}
 			}
-			//print "</a>&nbsp;";
+			print '<td class="tdoverflowmax300"'.($titletoshow ? ' title="'.dol_escape_htmltag($titletoshow).'"' : '').'>';
+			print $labeltoshow;	// Already escaped
 
 			// Add links after description
 			$cachebankaccount = array();
@@ -1498,7 +1499,7 @@ if ($resql) {
 
 		// Num cheque
 		if (!empty($arrayfields['b.num_chq']['checked'])) {
-			print '<td class="nowrap" align="center">'.($objp->num_chq ? $objp->num_chq : "")."</td>\n";
+			print '<td class="nowrap" align="center">'.($objp->num_chq ? dol_escape_htmltag($objp->num_chq) : "")."</td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 13c2bdba4ce..4e2e60908d8 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -509,9 +509,9 @@ class Account extends CommonObject
 		}
 
 		// Clean parameters
-		$label =
 		$emetteur = trim($emetteur);
 		$banque = trim($banque);
+		$label = trim($label);
 
 		$now = dol_now();
 
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 04ef9543867..0f13ed1e523 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -249,6 +249,10 @@ class BankAccounts extends DolibarrApi
 			$typeto = 'LIQ';
 		}
 
+		// Clean data
+		$description = checkVal($description, 'alphanohtml');
+
+
 		/**
 		 * Creating bank line records
 		 */
@@ -295,7 +299,9 @@ class BankAccounts extends DolibarrApi
 			return array(
 				'success' => array(
 					'code' => 201,
-					'message' => 'Internal wire transfer created successfully.'
+					'message' => 'Internal wire transfer created successfully.',
+					'bank_id_from' => $bank_line_id_from,
+					'bank_id_to' => $bank_line_id_to,
 				)
 			);
 		} else {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7368510484f..cb48ac4d45d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -686,11 +686,11 @@ function GETPOSTINT($paramname, $method = 0, $filter = null, $options = null, $n
 /**
  *  Return a value after checking on a rule.
  *
- *  @param  string  $out	     Value to get/check
- *  @param  string  $check	     Type of check
+ *  @param  string  $out	     Value to check/clear.
+ *  @param  string  $check	     Type of check/sanitizing
  *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'
- *  @return string|array         Value found (string or array), or '' if check fails
+ *  @return string|array         Value sanitized (string or array). It may be '' if format check fails.
  */
 function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options = null)
 {

From b2c2c552141d76b4d82ea67cc179dc81ac070ea0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Apr 2021 21:00:26 +0200
Subject: [PATCH 272/928] Fix #yogosha5877

---
 htdocs/product/class/api_products.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 6b26421d0f8..9b06b30765d 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -721,6 +721,11 @@ class Products extends DolibarrApi
 			throw new RestException(404, 'Supplier not found');
 		}
 
+		// Clean data
+		$ref_fourn = checkVal($ref_fourn, 'alphanohtml');
+		$desc_fourn = checkVal($desc_fourn, 'restricthtml');
+		$barcode = checkVal($barcode, 'alphanohtml');
+
 		$result = $this->productsupplier->update_buyprice($qty, $buyprice, DolibarrApiAccess::$user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges, $remise_percent, $remise, $newnpr, $delivery_time_days, $supplier_reputation, $localtaxes_array, $newdefaultvatcode, $multicurrency_buyprice, $multicurrency_price_base_type, $multicurrency_tx, $multicurrency_code, $desc_fourn, $barcode, $fk_barcode_type);
 
 		if ($result <= 0) {

From ac68599fab8c79acbdaac5c3cb255ec904c8c2c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Apr 2021 21:02:48 +0200
Subject: [PATCH 273/928] Fix #yogosha5877

---
 .../modulebuilder/template/class/api_mymodule.class.php   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index da616de0d82..47a3ac984f9 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -208,12 +208,17 @@ class MyModuleApi extends DolibarrApi
 		if (!DolibarrApiAccess::$user->rights->mymodule->write) {
 			throw new RestException(401);
 		}
+
 		// Check mandatory fields
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
 			$this->myobject->$field = $value;
 		}
+
+		// Clean data
+		// $this->myobject->abc = checkVal($this->myobject->abc, 'alphanohtml');
+
 		if ($this->myobject->create(DolibarrApiAccess::$user)<0) {
 			throw new RestException(500, "Error creating MyObject", array_merge(array($this->myobject->error), $this->myobject->errors));
 		}
@@ -253,6 +258,9 @@ class MyModuleApi extends DolibarrApi
 			$this->myobject->$field = $value;
 		}
 
+		// Clean data
+		// $this->myobject->abc = checkVal($this->myobject->abc, 'alphanohtml');
+
 		if ($this->myobject->update(DolibarrApiAccess::$user, false) > 0) {
 			return $this->get($id);
 		} else {

From 42938ffe31da85c013dc7e8598b5f913736f2393 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Apr 2021 21:15:09 +0200
Subject: [PATCH 274/928] FIX #yogosha5879

---
 .../accountancy/class/bookkeeping.class.php   |  8 +++---
 htdocs/adherents/class/subscription.class.php |  2 +-
 htdocs/admin/boxes.php                        |  4 +--
 htdocs/compta/bank/class/account.class.php    | 26 +++++++++++--------
 .../cheque/class/remisecheque.class.php       |  2 +-
 .../class/bonprelevement.class.php            |  4 +--
 htdocs/compta/tva/class/tva.class.php         |  2 +-
 7 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 00ed8879076..a93b36cf2b4 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -371,8 +371,8 @@ class BookKeeping extends CommonObject
 				$sql .= ", ".(!isset($this->date_lim_reglement) || dol_strlen($this->date_lim_reglement) == 0 ? 'NULL' : "'".$this->db->idate($this->date_lim_reglement)."'");
 				$sql .= ", '".$this->db->escape($this->doc_type)."'";
 				$sql .= ", '".$this->db->escape($this->doc_ref)."'";
-				$sql .= ", ".$this->fk_doc;
-				$sql .= ", ".$this->fk_docdet;
+				$sql .= ", ".((int) $this->fk_doc);
+				$sql .= ", ".((int) $this->fk_docdet);
 				$sql .= ", ".(!empty($this->thirdparty_code) ? ("'".$this->db->escape($this->thirdparty_code)."'") : "NULL");
 				$sql .= ", ".(!empty($this->subledger_account) ? ("'".$this->db->escape($this->subledger_account)."'") : "NULL");
 				$sql .= ", ".(!empty($this->subledger_label) ? ("'".$this->db->escape($this->subledger_label)."'") : "NULL");
@@ -632,8 +632,8 @@ class BookKeeping extends CommonObject
 		$sql .= ' '.(!isset($this->date_lim_reglement) || dol_strlen($this->date_lim_reglement) == 0 ? 'NULL' : "'".$this->db->idate($this->date_lim_reglement)."'").',';
 		$sql .= ' '.(!isset($this->doc_type) ? 'NULL' : "'".$this->db->escape($this->doc_type)."'").',';
 		$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 .= ' '.(empty($this->fk_doc) ? '0' : (int) $this->fk_doc).',';
+		$sql .= ' '.(empty($this->fk_docdet) ? '0' : (int) $this->fk_docdet).',';
 		$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)."'").',';
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 95bbe79804f..1285b12b2d0 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -165,7 +165,7 @@ class Subscription extends CommonObject
 		} else {
 			$type = $this->fk_type;
 		}
-		$sql .= " VALUES (".$this->fk_adherent.", '".$this->db->escape($type)."', '".$this->db->idate($now)."',";
+		$sql .= " VALUES (".((int) $this->fk_adherent).", '".$this->db->escape($type)."', '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->idate($this->dateh)."',";
 		$sql .= " '".$this->db->idate($this->datef)."',";
 		$sql .= " ".$this->amount.",";
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index fc3e30a484b..44629525a26 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -114,8 +114,8 @@ if ($action == 'add') {
 						if (empty($arrayofexistingboxid[$boxid['value']])) {
 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
 							$sql .= "box_id, position, box_order, fk_user, entity";
-							$sql .= ") values (";
-							$sql .= $boxid['value'].", ".$pos.", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity;
+							$sql .= ") VALUES (";
+							$sql .= $boxid['value'].", ".((int) $pos).", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity;
 							$sql .= ")";
 
 							dol_syslog("boxes.php activate box", LOG_DEBUG);
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 4e2e60908d8..5a00e93e83f 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -508,6 +508,10 @@ class Account extends CommonObject
 			dol_syslog(__METHOD__.": using numeric operations is deprecated", LOG_WARNING);
 		}
 
+		if (empty($this->id) && !empty($this->rowid)) {	// For backward compatibility
+			$this->id = $this->rowid;
+		}
+
 		// Clean parameters
 		$emetteur = trim($emetteur);
 		$banque = trim($banque);
@@ -534,8 +538,8 @@ class Account extends CommonObject
 			$this->error = "oper not defined";
 			return -1;
 		}
-		if (!$this->rowid) {
-			$this->error = "this->rowid not defined";
+		if (!$this->id) {
+			$this->error = "this->id not defined";
 			return -2;
 		}
 		if ($this->courant == Account::TYPE_CASH && $oper != 'LIQ') {
@@ -556,7 +560,7 @@ class Account extends CommonObject
 		$accline->label = $label;
 		$accline->amount = $amount;
 		$accline->fk_user_author = $user->id;
-		$accline->fk_account = $this->rowid;
+		$accline->fk_account = $this->id;
 		$accline->fk_type = $oper;
 		$accline->numero_compte = $accountancycode;
 		$accline->num_releve = $num_releve;
@@ -575,10 +579,10 @@ class Account extends CommonObject
 
 		if ($accline->insert() > 0) {
 			if ($categorie > 0) {
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (";
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class(";
 				$sql .= "lineid, fk_categ";
 				$sql .= ") VALUES (";
-				$sql .= $accline->id.", ".$categorie;
+				$sql .= ((int) $accline->id).", '".$this->db->escape($categorie)."'";
 				$sql .= ")";
 
 				$result = $this->db->query($sql);
@@ -611,7 +615,7 @@ class Account extends CommonObject
 	 */
 	public function create(User $user, $notrigger = 0)
 	{
-		global $langs, $conf, $hookmanager;
+		global $langs, $conf;
 
 		$error = 0;
 
@@ -770,7 +774,7 @@ class Account extends CommonObject
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
-		global $langs, $conf, $hookmanager;
+		global $langs, $conf;
 
 		$error = 0;
 
@@ -796,9 +800,9 @@ class Account extends CommonObject
 		$sql .= " ref   = '".$this->db->escape($this->ref)."'";
 		$sql .= ",label = '".$this->db->escape($this->label)."'";
 
-		$sql .= ",courant = ".$this->courant;
-		$sql .= ",clos = ".$this->clos;
-		$sql .= ",rappro = ".$this->rappro;
+		$sql .= ",courant = ".((int) $this->courant);
+		$sql .= ",clos = ".((int) $this->clos);
+		$sql .= ",rappro = ".((int) $this->rappro);
 		$sql .= ",url = ".($this->url ? "'".$this->db->escape($this->url)."'" : "null");
 		$sql .= ",account_number = '".$this->db->escape($this->account_number)."'";
 		$sql .= ",fk_accountancy_journal = ".($this->fk_accountancy_journal > 0 ? $this->db->escape($this->fk_accountancy_journal) : "null");
@@ -824,7 +828,7 @@ class Account extends CommonObject
 		$sql .= ",ics = '".$this->db->escape($this->ics)."'";
 		$sql .= ",ics_transfer = '".$this->db->escape($this->ics_transfer)."'";
 
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 489d4c7cec0..0c05a1bc03a 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -171,7 +171,7 @@ class RemiseCheque extends CommonObject
 		$sql .= "'".$this->db->idate($now)."'";
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", ".$user->id;
-		$sql .= ", ".$account_id;
+		$sql .= ", ".((int) $account_id);
 		$sql .= ", 0";
 		$sql .= ", 0";
 		$sql .= ", 0";
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index ea44a75899d..dbf2d67778a 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -229,9 +229,9 @@ class BonPrelevement extends CommonObject
 			$sql .= ", cle_rib";
 			$sql .= ") VALUES (";
 			$sql .= $this->id;
-			$sql .= ", ".$client_id;
+			$sql .= ", ".((int) $client_id);
 			$sql .= ", '".$this->db->escape($client_nom)."'";
-			$sql .= ", '".price2num($amount)."'";
+			$sql .= ", ".((float) price2num($amount));
 			$sql .= ", '".$this->db->escape($code_banque)."'";
 			$sql .= ", '".$this->db->escape($code_guichet)."'";
 			$sql .= ", '".$this->db->escape($number)."'";
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 25d622d825d..ff35ece947b 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -585,7 +585,7 @@ class Tva extends CommonObject
 		$sql .= " '".$this->db->idate($this->datec)."'";
 		$sql .= ", '".$this->db->idate($this->datep)."'";
 		$sql .= ", '".$this->db->idate($this->datev)."'";
-		$sql .= ", ".$this->amount;
+		$sql .= ", ".((float) $this->amount);
 		$sql .= ", '".$this->db->escape($this->type_payment)."'";
 		$sql .= ", '".$this->db->escape($this->num_payment)."'";
 		if ($this->note) {

From 6c2d9d3b3c4d5cd00dd42750534d70257af4de3d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 13:17:47 +0200
Subject: [PATCH 275/928] Fix permission to reopen invoice.

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index b9a3ae86811..60e5d4eb52a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -119,8 +119,11 @@ $usercancreate = $user->rights->facture->creer;
 $usercanissuepayment = $user->rights->facture->paiement;
 $usercandelete = $user->rights->facture->supprimer;
 $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->validate)));
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send);
-$usercanreopen = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->reopen);
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->send)));
+$usercanreopen = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->reopen)));
+if (!empty($conf->global->INVOICE_DISALLOW_REOPEN)) {
+	$usercanreopen = false;
+}
 $usercanunvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->unvalidate)));
 
 $usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
@@ -189,7 +192,7 @@ if (empty($reshook))
 	   		$action = '';
 		}
 	} // Change status of invoice
-	elseif ($action == 'reopen' && $usercancreate && empty($conf->global->INVOICE_DISALLOW_REOPEN)) {
+	elseif ($action == 'reopen' && $usercanreopen) {
 		$result = $object->fetch($id);
 
 		if ($object->statut == Facture::STATUS_CLOSED || ($object->statut == Facture::STATUS_ABANDONED && ($object->close_code != 'replaced' || $object->getIdReplacingInvoice() == 0)) || ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 1)) {    // ($object->statut == 1 && $object->paye == 1) should not happened but can be found when data are corrupted

From 474bfdd6bc66a7042766d732ce02817aa597a403 Mon Sep 17 00:00:00 2001
From: kastoras <kastoras_1@hotmail.com>
Date: Sun, 25 Apr 2021 16:20:17 +0300
Subject: [PATCH 276/928] Close/CLOSE #17390 Products API, GET /products
 without variants

When accessing get /products, using $without_variants parameter to true (the deault value is false), the api retur only products and no variants.
---
 htdocs/product/class/api_products.class.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 9b06b30765d..c3f5c4f5551 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -166,9 +166,10 @@ class Products extends DolibarrApi
 	 * @param  int    $category   Use this param to filter list by category
 	 * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
 	 * @param  bool   $ids_only   Return only IDs of product instead of all properties (faster, above all if list is long)
+	 * @param  bool   $without_variants   Return only products, not variants
 	 * @return array                Array of product objects
 	 */
-	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false)
+	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false, $without_variants = false)
 	{
 		global $db, $conf;
 
@@ -186,6 +187,11 @@ class Products extends DolibarrApi
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
+
+      	if($without_variants){
+			$sql .= ' AND t.rowid in (select distinct fk_product_parent from '.MAIN_DB_PREFIX.'product_attribute_combination)';
+		}
+
 		// Select products of given category
 		if ($category > 0) {
 			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);

From 2fd2c671391d9b5a423063f3707266013b819d9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 15:09:56 +0200
Subject: [PATCH 277/928] Clean edit of user card

---
 htdocs/core/class/html.formcompany.class.php |   4 +-
 htdocs/core/lib/ajax.lib.php                 |   6 +-
 htdocs/langs/en_US/main.lang                 |   4 +-
 htdocs/langs/en_US/users.lang                |   3 +-
 htdocs/theme/eldy/global.inc.php             |   3 +
 htdocs/theme/md/style.css.php                |   3 +
 htdocs/user/card.php                         | 447 ++++++++++---------
 7 files changed, 253 insertions(+), 217 deletions(-)

diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 6677f7f8dce..48f46860717 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -312,9 +312,9 @@ class FormCompany extends Form
 						$out .= '<option value="0">&nbsp;</option>';
 					} else {
 						if (!$country || $country != $obj->country) {
-							// Affiche la rupture si on est en mode liste multipays
+							// Show break if we are in list with multiple countries
 							if (!$country_codeid && $obj->country_code) {
-								$out .= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
+								$out .= '<option value="-1" disabled data-html="----- '.$obj->country.' -----">----- '.$obj->country." -----</option>\n";
 								$country = $obj->country;
 							}
 						}
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 4108724236d..8874b96eda5 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -454,8 +454,10 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 					templateResult: function (data, container) {	/* Format visible output into combo list */
 	 					/* Code to add class of origin OPTION propagated to the new select2 <li> tag */
 						if (data.element) { $(container).addClass($(data.element).attr("class")); }
-					    //console.log(data.html);
-					    if (data.id == -1) return \'&nbsp;\';
+					    console.log($(data.element).attr("data-html"));
+					    if (data.id == -1 && $(data.element).attr("data-html") == undefined) {
+							return \'&nbsp;\';
+						}
 						if ($(data.element).attr("data-html") != undefined) return htmlEntityDecodeJs($(data.element).attr("data-html"));		// If property html set, we decode html entities and use this
 						return data.text;
 					},
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index dc2a83f2015..8fea1ffd839 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 727773a9606..d84257b69ad 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 12d9677c4b5..3622d77de2f 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1354,6 +1354,9 @@ table[summary="list_of_modules"] .fa-cog {
 .width125 { width: 125px; }
 .width150 { width: 150px; }
 .width200 { width: 200px; }
+.width300 { width: 300px; }
+.width400 { width: 400px; }
+.width500 { width: 500px; }
 .maxwidth25  { max-width: 25px; }
 .maxwidth50  { max-width: 50px; }
 .maxwidth75  { max-width: 75px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 87a9d6b1b47..7b49acc63b5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1390,6 +1390,9 @@ table[summary="list_of_modules"] .fa-cog {
 .width125 { width: 125px; }
 .width150 { width: 150px; }
 .width200 { width: 200px; }
+.width300 { width: 300px; }
+.width400 { width: 400px; }
+.width500 { width: 500px; }
 .maxwidth25  { max-width: 25px; }
 .maxwidth50  { max-width: 50px; }
 .maxwidth75  { max-width: 75px; }
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 57d5c44615f..9d2039a4678 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -839,54 +839,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 	$password = (GETPOSTISSET('password') ?GETPOST('password') : $generated_password);
 
-	// Password
-	print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td>';
-	print '<td>';
-	$valuetoshow = '';
-	if (preg_match('/ldap/', $dolibarr_main_authentication)) {
-		$valuetoshow .= ($valuetoshow ? ', ' : '').$langs->trans("PasswordOfUserInLDAP");
-	}
-	if (preg_match('/http/', $dolibarr_main_authentication)) {
-		$valuetoshow .= ($valuetoshow ? ', ' : '').$langs->trans("HTTPBasicPassword");
-	}
-	if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
-		if (!empty($ldap_pass)) {	// For very old system comaptibilty. Now clear password can't be viewed from LDAP read
-			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input type="hidden" name="password" value="'.$ldap_pass.'">'; // Dolibarr password is preffiled with LDAP known password
-			$valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
-		} else {
-			// We do not use a field password but a field text to show new password to use.
-			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="new-password">';
-		}
-	}
-
-	// Other form for user password
-	$parameters = array('valuetoshow' => $valuetoshow, 'password' => $password);
-	$reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if ($reshook > 0) {
-		$valuetoshow = $hookmanager->resPrint; // to replace
-	} else {
-		$valuetoshow .= $hookmanager->resPrint; // to add
-	}
-
-	print $valuetoshow;
-	print '</td></tr>';
-
-	if (!empty($conf->api->enabled)) {
-		// API key
-		//$generated_password = getRandomPassword(false);
-		print '<tr><td>'.$langs->trans("ApiKey").'</td>';
-		print '<td>';
-		print '<input size="30" maxsize="32" type="text" id="api_key" name="api_key" value="'.GETPOST('api_key', 'alphanohtml').'" autocomplete="off">';
-		if (!empty($conf->use_javascript_ajax)) {
-			print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
-		}
-		print '</td></tr>';
-	} else {
-		// PARTIAL WORKAROUND
-		$generated_fake_api_key = getRandomPassword(false);
-		print '<input type="hidden" name="api_key" value="'.$generated_fake_api_key.'">';
-	}
-
 	// Administrator
 	if (!empty($user->admin)) {
 		print '<tr><td>'.$langs->trans("Administrator").'</td>';
@@ -936,10 +888,11 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print '</td></tr>';
 
 	// Employee
-	$defaultemployee = 1;
+	$defaultemployee = '1';
 	print '<tr>';
 	print '<td>'.$langs->trans('Employee').'</td><td>';
-	print $form->selectyesno("employee", (GETPOST('employee') != '' ?GETPOST('employee') : $defaultemployee), 1);
+	print '<input type="checkbox" name="employee" value="1"'.(GETPOST('employee') == '1' ? ' checked="checked"' : ($defaultemployee ? ' checked="checked"' : '')).'>';
+	//print $form->selectyesno("employee", (GETPOST('employee') != '' ?GETPOST('employee') : $defaultemployee), 1);
 	print '</td></tr>';
 
 	// Hierarchy
@@ -979,6 +932,70 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print $form->textwithpicto($langs->trans("Internal"), $langs->trans("InternalExternalDesc"), 1, 'help', '', 0, 2);
 	print '</td></tr>';
 
+
+	print '</table><hr><table class="border centpercent">';
+
+
+	// Date validity
+	print '<tr><td class="titlefieldcreate">'.$langs->trans("RangeOfLoginValidity").'</td>';
+	print '<td>';
+	print $form->selectDate($datestartvalidity, 'datestartvalidity', 0, 0, 1, 'formdatestartvalidity', 1, 1);
+
+	print ' &nbsp; ';
+
+	print $form->selectDate($dateendvalidity, 'dateendvalidity', 0, 0, 1, 'formdateendvalidity', 1, 0);
+	print '</td>';
+	print "</tr>\n";
+
+	// Password
+	print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td>';
+	print '<td>';
+	$valuetoshow = '';
+	if (preg_match('/ldap/', $dolibarr_main_authentication)) {
+		$valuetoshow .= ($valuetoshow ? ', ' : '').$langs->trans("PasswordOfUserInLDAP");
+	}
+	if (preg_match('/http/', $dolibarr_main_authentication)) {
+		$valuetoshow .= ($valuetoshow ? ', ' : '').$langs->trans("HTTPBasicPassword");
+	}
+	if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
+		if (!empty($ldap_pass)) {	// For very old system comaptibilty. Now clear password can't be viewed from LDAP read
+			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input type="hidden" name="password" value="'.$ldap_pass.'">'; // Dolibarr password is preffiled with LDAP known password
+			$valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
+		} else {
+			// We do not use a field password but a field text to show new password to use.
+			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="new-password">';
+		}
+	}
+
+	// Other form for user password
+	$parameters = array('valuetoshow' => $valuetoshow, 'password' => $password);
+	$reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if ($reshook > 0) {
+		$valuetoshow = $hookmanager->resPrint; // to replace
+	} else {
+		$valuetoshow .= $hookmanager->resPrint; // to add
+	}
+
+	print $valuetoshow;
+	print '</td></tr>';
+
+	if (!empty($conf->api->enabled)) {
+		// API key
+		//$generated_password = getRandomPassword(false);
+		print '<tr><td>'.$langs->trans("ApiKey").'</td>';
+		print '<td>';
+		print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="'.GETPOST('api_key', 'alphanohtml').'" autocomplete="off">';
+		if (!empty($conf->use_javascript_ajax)) {
+			print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
+		}
+		print '</td></tr>';
+	} else {
+		// PARTIAL WORKAROUND
+		$generated_fake_api_key = getRandomPassword(false);
+		print '<input type="hidden" name="api_key" value="'.$generated_fake_api_key.'">';
+	}
+
+
 	print '</table><hr><table class="border centpercent">';
 
 
@@ -1223,17 +1240,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print '</td>';
 	print "</tr>\n";
 
-	// Date validity
-	print '<tr><td>'.$langs->trans("RangeOfLoginValidity").'</td>';
-	print '<td>';
-	print $form->selectDate($datestartvalidity, 'datestartvalidity', 0, 0, 1, 'formdatestartvalidity', 1, 1);
-
-	print ' - ';
-
-	print $form->selectDate($dateendvalidity, 'dateendvalidity', 0, 0, 1, 'formdateendvalidity', 1, 0);
-	print '</td>';
-	print "</tr>\n";
-
 	// Date birth
 	print '<tr><td>'.$langs->trans("DateOfBirth").'</td>';
 	print '<td>';
@@ -1371,7 +1377,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<table class="border tableforfield" width="100%">';
 
 			// Login
-			print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
+			print '<tr><td class="titlefieldmiddle">'.$langs->trans("Login").'</td>';
 			if (!empty($object->ldap_sid) && $object->statut == 0) {
 				print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
 			} else {
@@ -1379,72 +1385,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 			print '</tr>'."\n";
 
-			// Password
-			print '<tr><td>'.$langs->trans("Password").'</td>';
-
-			print '<td class="wordbreak">';
-			$valuetoshow = '';
-			if (preg_match('/ldap/', $dolibarr_main_authentication)) {
-				if (!empty($object->ldap_sid)) {
-					if ($passDoNotExpire) {
-						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("LdapUacf_".$statutUACF);
-					} elseif ($userChangePassNextLogon) {
-						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("UserMustChangePassNextLogon", $ldap->domainFQDN).'</span>';
-					} elseif ($userDisabled) {
-						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("LdapUacf_".$statutUACF, $ldap->domainFQDN).'</span>';
-					} else {
-						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
-					}
-				} else {
-					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
-				}
-			}
-			if (preg_match('/http/', $dolibarr_main_authentication)) {
-				$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("HTTPBasicPassword");
-			}
-			if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
-				if ($object->pass) {
-					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '');
-					$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
-				} else {
-					if ($user->admin && $user->id == $object->id) {
-						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '');
-						//$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Crypted").' - </span>';
-						$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
-						// TODO Add a feature to reveal the hash
-						$valuetoshow .= '<!-- Crypted into '.$object->pass_indatabase_crypted.' -->';
-					} else {
-						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
-					}
-				}
-			}
-
-			// Other form for user password
-			$parameters = array('valuetoshow' => $valuetoshow);
-			$reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			if ($reshook > 0) {
-				$valuetoshow = $hookmanager->resPrint; // to replace
-			} else {
-				$valuetoshow .= $hookmanager->resPrint; // to add
-			}
-
-			print $valuetoshow;
-			print "</td>";
-			print '</tr>'."\n";
-
-			// API key
-			if (!empty($conf->api->enabled) && $user->admin) {
-				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
-				print '<td>';
-				if (!empty($object->api_key)) {
-					print '<span class="opacitymedium">'.preg_replace('/./', '*', $object->api_key).'</span>';
-				}
-				if ($user->admin || $user->id == $object->id) {
-					// TODO Add a feature to reveal the hash
-				}
-				print '</td></tr>';
-			}
-
 			// Administrator
 			print '<tr><td>'.$langs->trans("Administrator").'</td><td>';
 			if (!empty($conf->multicompany->enabled) && $object->admin && !$object->entity) {
@@ -1480,7 +1420,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Employee
 			print '<tr><td>'.$langs->trans("Employee").'</td><td colspan="2">';
-			print yn($object->employee);
+			print '<input type="checkbox" disabled name="employee" value="1"'.($object->employee ? ' checked="checked"' : '').'>';
+			//print yn($object->employee);
 			print '</td></tr>'."\n";
 
 			// TODO Move this into tab RH, visible when salarie or RH is visible (HierarchicalResponsible must be on both tab)
@@ -1604,20 +1545,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</td>';
 			print "</tr>\n";
 
-			// Date login validity
-			print '<tr><td>'.$langs->trans("RangeOfLoginValidity").'</td>';
-			print '<td>';
-			if ($object->datestartvalidity) {
-				print '<span class="opacitymedium">'.$langs->trans("FromDate").'</span> ';
-				print dol_print_date($object->datestartvalidity, 'day');
-			}
-			if ($object->dateendvalidity) {
-				print '<span class="opacitymedium"> - '.$langs->trans("To").'</span> ';
-				print dol_print_date($object->dateendvalidity, 'day');
-			}
-			print '</td>';
-			print "</tr>\n";
-
 			// Date of birth
 			print '<tr><td>'.$langs->trans("DateOfBirth").'</td>';
 			print '<td>';
@@ -1637,6 +1564,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<div class="fichehalfright"><div class="ficheaddleft">';
 
 			print '<div class="underbanner clearboth"></div>';
+
 			print '<table class="border tableforfield centpercent">';
 
 			// Color user
@@ -1755,7 +1683,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print dol_htmlentitiesbr($object->signature);
 			print "</td></tr>\n";
 
-			//VCard
+			// VCard
 			print '<tr><td class="tdtop">'.$langs->trans("VCard").'</td>';
 			print '<td>';
 			print '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'">';
@@ -1765,6 +1693,97 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print "</td></tr>\n";
 
 			print "</table>\n";
+
+
+			print '<div class="div-table-responsive-no-min">';
+			print '<table class="border tableforfield centpercent">';
+			print '<tr class="liste_titre"><td class="liste_titre">';
+			print $langs->trans("Credentials");
+			print '</td>';
+			print '<td></td>';
+			print '</tr>';
+
+			// Date login validity
+			print '<tr><td>'.$langs->trans("RangeOfLoginValidity").'</td>';
+			print '<td>';
+			if ($object->datestartvalidity) {
+				print '<span class="opacitymedium">'.$langs->trans("FromDate").'</span> ';
+				print dol_print_date($object->datestartvalidity, 'day');
+			}
+			if ($object->dateendvalidity) {
+				print '<span class="opacitymedium"> - '.$langs->trans("To").'</span> ';
+				print dol_print_date($object->dateendvalidity, 'day');
+			}
+			print '</td>';
+			print "</tr>\n";
+
+			// Password
+			print '<tr><td class="titlefield">'.$langs->trans("Password").'</td>';
+
+			print '<td class="wordbreak">';
+			$valuetoshow = '';
+			if (preg_match('/ldap/', $dolibarr_main_authentication)) {
+				if (!empty($object->ldap_sid)) {
+					if ($passDoNotExpire) {
+						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("LdapUacf_".$statutUACF);
+					} elseif ($userChangePassNextLogon) {
+						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("UserMustChangePassNextLogon", $ldap->domainFQDN).'</span>';
+					} elseif ($userDisabled) {
+						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("LdapUacf_".$statutUACF, $ldap->domainFQDN).'</span>';
+					} else {
+						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
+					}
+				} else {
+					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
+				}
+			}
+			if (preg_match('/http/', $dolibarr_main_authentication)) {
+				$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("HTTPBasicPassword");
+			}
+			if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
+				if ($object->pass) {
+					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '');
+					$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+				} else {
+					if ($user->admin && $user->id == $object->id) {
+						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '');
+						//$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Crypted").' - </span>';
+						$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+						// TODO Add a feature to reveal the hash
+						$valuetoshow .= '<!-- Crypted into '.$object->pass_indatabase_crypted.' -->';
+					} else {
+						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+					}
+				}
+			}
+
+			// Other form for user password
+			$parameters = array('valuetoshow' => $valuetoshow);
+			$reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if ($reshook > 0) {
+				$valuetoshow = $hookmanager->resPrint; // to replace
+			} else {
+				$valuetoshow .= $hookmanager->resPrint; // to add
+			}
+
+			print $valuetoshow;
+			print "</td>";
+			print '</tr>'."\n";
+
+			// API key
+			if (!empty($conf->api->enabled) && $user->admin) {
+				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
+				print '<td>';
+				if (!empty($object->api_key)) {
+					print '<span class="opacitymedium">'.preg_replace('/./', '*', $object->api_key).'</span>';
+				}
+				if ($user->admin || $user->id == $object->id) {
+					// TODO Add a feature to reveal the hash
+				}
+				print '</td></tr>';
+			}
+			print '</table></div>';
+
 			print '</div>';
 
 			print '</div></div>';
@@ -2011,47 +2030,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</td>';
 			print '</tr>';
 
-			// Pass
-			print '<tr><td>'.$langs->trans("Password").'</td>';
-			print '<td>';
-			$valuetoshow = '';
-			if (preg_match('/ldap/', $dolibarr_main_authentication)) {
-				$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
-			}
-			if (preg_match('/http/', $dolibarr_main_authentication)) {
-				$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$form->textwithpicto($text, $langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless", $dolibarr_main_authentication), 1, 'warning');
-			}
-			if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
-				if ($caneditpassword) {
-					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="new-password">';
-				} else {
-					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
-				}
-			}
-
-			// Other form for user password
-			$parameters = array('valuetoshow' => $valuetoshow, 'caneditpassword' => $caneditpassword);
-			$reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			if ($reshook > 0) {
-				$valuetoshow = $hookmanager->resPrint; // to replace
-			} else {
-				$valuetoshow .= $hookmanager->resPrint; // to add
-			}
-
-			print $valuetoshow;
-			print "</td></tr>\n";
-
-			// API key
-			if (!empty($conf->api->enabled) && $user->admin) {
-				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
-				print '<td>';
-				print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
-				if (!empty($conf->use_javascript_ajax)) {
-					print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
-				}
-				print '</td></tr>';
-			}
-
 			// Administrator
 			print '<tr><td>'.$langs->trans("Administrator").'</td>';
 			if ($object->socid > 0) {
@@ -2145,13 +2123,15 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Employee', 'employee', '', $object, 0).'</td><td>';
 			if ($caneditfield) {
-				 print $form->selectyesno("employee", $object->employee, 1);
+				print '<input type="checkbox" name="employee" value="1"'.($object->employee ? ' checked="checked"' : '').'>';
+				//print $form->selectyesno("employee", $object->employee, 1);
 			} else {
-				if ($object->employee) {
+				print '<input type="checkbox" name="employee" disabled value="1"'.($object->employee ? ' checked="checked"' : '').'>';
+				/*if ($object->employee) {
 					print $langs->trans("Yes");
 				} else {
 					print $langs->trans("No");
-				}
+				}*/
 			}
 			print '</td></tr>';
 
@@ -2246,6 +2226,74 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 			print '</td></tr>';
 
+
+			print '</table><hr><table class="border centpercent">';
+
+
+			// Date access validity
+			print '<tr><td>'.$langs->trans("RangeOfLoginValidity").'</td>';
+			print '<td>';
+			if ($caneditfield) {
+				print $form->selectDate($datestartvalidity ? $datestartvalidity : $object->datestartvalidity, 'datestartvalidity', 0, 0, 1, 'formdatestartvalidity', 1, 1, 0, '', '', '', '', 1, '', '');
+			} else {
+				print dol_print_date($object->datestartvalidity, 'day');
+			}
+
+			/*if ($datestartvalidity && $dateendvalidity) {
+				print ' - ';
+			}*/
+			print ' &nbsp; ';
+
+			if ($caneditfield) {
+				print $form->selectDate($dateendvalidity ? $datendevalidity : $object->dateendvalidity, 'dateendvalidity', 0, 0, 1, 'formdateendvalidity', 1, 0, 0, '', '', '', '', 1, '', '');
+			} else {
+				print dol_print_date($object->dateendvalidity, 'day');
+			}
+			print '</td>';
+			print "</tr>\n";
+
+			// Pass
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("Password").'</td>';
+			print '<td>';
+			$valuetoshow = '';
+			if (preg_match('/ldap/', $dolibarr_main_authentication)) {
+				$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
+			}
+			if (preg_match('/http/', $dolibarr_main_authentication)) {
+				$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$form->textwithpicto($text, $langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless", $dolibarr_main_authentication), 1, 'warning');
+			}
+			if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
+				if ($caneditpassword) {
+					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="new-password">';
+				} else {
+					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
+				}
+			}
+
+			// Other form for user password
+			$parameters = array('valuetoshow' => $valuetoshow, 'caneditpassword' => $caneditpassword);
+			$reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if ($reshook > 0) {
+				$valuetoshow = $hookmanager->resPrint; // to replace
+			} else {
+				$valuetoshow .= $hookmanager->resPrint; // to add
+			}
+
+			print $valuetoshow;
+			print "</td></tr>\n";
+
+			// API key
+			if (!empty($conf->api->enabled) && $user->admin) {
+				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
+				print '<td>';
+				print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
+				if (!empty($conf->use_javascript_ajax)) {
+					print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
+				}
+				print '</td></tr>';
+			}
+
+
 			print '</table><hr><table class="border centpercent">';
 
 
@@ -2636,29 +2684,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</td>';
 			print "</tr>\n";
 
-
-			// Date login validity
-			print '<tr><td>'.$langs->trans("RangeOfLoginValidity").'</td>';
-			print '<td>';
-			if ($caneditfield) {
-				print $form->selectDate($datestartvalidity ? $datestartvalidity : $object->datestartvalidity, 'datestartvalidity', 0, 0, 1, 'formdatestartvalidity', 1, 1);
-			} else {
-				print dol_print_date($object->datestartvalidity, 'day');
-			}
-
-			if ($datestartvalidity && $dateendvalidity) {
-				print ' - ';
-			}
-
-			if ($caneditfield) {
-				print $form->selectDate($dateendvalidity ? $datendevalidity : $object->dateendvalidity, 'dateendvalidity', 0, 0, 1, 'formdateendvalidity', 1, 0);
-			} else {
-				print dol_print_date($object->dateendvalidity, 'day');
-			}
-			print '</td>';
-			print "</tr>\n";
-
-
 			// Date birth
 			print '<tr><td>'.$langs->trans("DateOfBirth").'</td>';
 			print '<td>';

From e780bae77f609ae760a2022c3b1460fac2ec779b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 15:27:10 +0200
Subject: [PATCH 278/928] css

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 9d2039a4678..b1a9a229827 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1165,7 +1165,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 	// Signature
 	print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>';
-	print '<td>';
+	print '<td class="wordbreak">';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor('signature', GETPOST('signature', 'restricthtml'), '', 138, 'dolibarr_notes', 'In', true, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
 	print $doleditor->Create(1);
@@ -1679,7 +1679,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Signature
-			print '<tr><td class="tdtop">'.$langs->trans('Signature').'</td><td>';
+			print '<tr><td class="tdtop">'.$langs->trans('Signature').'</td><td class="wordbreak">';
 			print dol_htmlentitiesbr($object->signature);
 			print "</td></tr>\n";
 

From a8563de1c434df445ffa7cf05276887570e9a6d7 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 25 Apr 2021 13:34:26 +0000
Subject: [PATCH 279/928] Fixing style errors.

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

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index c3f5c4f5551..0ceb082bd93 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -188,7 +188,7 @@ class Products extends DolibarrApi
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
 
-      	if($without_variants){
+		if ($without_variants) {
 			$sql .= ' AND t.rowid in (select distinct fk_product_parent from '.MAIN_DB_PREFIX.'product_attribute_combination)';
 		}
 

From fd2d317b4af758680c4173c1c3d3a5ae795983c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 15:55:36 +0200
Subject: [PATCH 280/928] Fix #yogosha5881

---
 htdocs/accountancy/journal/bankjournal.php        |  2 +-
 htdocs/comm/action/card.php                       |  2 +-
 htdocs/comm/mailing/card.php                      |  4 ++--
 htdocs/comm/mailing/cibles.php                    |  2 --
 htdocs/comm/propal/card.php                       |  4 ++--
 htdocs/commande/card.php                          |  4 ++--
 htdocs/commande/class/commande.class.php          |  8 ++++++--
 htdocs/compta/bank/account_statement_document.php |  2 +-
 htdocs/compta/bank/line.php                       |  2 +-
 htdocs/compta/bank/various_payment/list.php       |  2 +-
 htdocs/compta/deplacement/card.php                |  2 +-
 htdocs/compta/facture/card-rec.php                |  6 +++---
 htdocs/compta/facture/card.php                    | 10 +++++-----
 htdocs/compta/facture/class/facture-rec.class.php |  2 +-
 htdocs/compta/facture/class/facture.class.php     |  2 +-
 htdocs/compta/prelevement/card.php                |  2 +-
 htdocs/compta/prelevement/factures.php            |  2 +-
 htdocs/compta/prelevement/line.php                |  2 +-
 htdocs/contrat/card.php                           |  4 ++--
 htdocs/contrat/class/contrat.class.php            |  2 +-
 htdocs/core/class/commonobject.class.php          |  2 +-
 htdocs/core/lib/company.lib.php                   |  2 +-
 htdocs/core/tpl/resource_view.tpl.php             |  4 ++--
 htdocs/don/card.php                               |  2 +-
 htdocs/expedition/class/expeditionbatch.class.php |  4 +---
 htdocs/expedition/shipment.php                    |  2 +-
 htdocs/fourn/class/fournisseur.facture.class.php  |  2 +-
 htdocs/fourn/commande/card.php                    |  4 ++--
 htdocs/fourn/commande/dispatch.php                |  2 +-
 htdocs/fourn/facture/card.php                     |  2 +-
 htdocs/ftp/admin/ftpclient.php                    |  1 +
 htdocs/install/lib/repair.lib.php                 |  2 +-
 htdocs/intracommreport/card.php                   |  2 +-
 htdocs/margin/productMargins.php                  |  2 +-
 htdocs/product/class/product.class.php            |  4 ++--
 htdocs/product/price.php                          |  2 +-
 htdocs/product/stock/card.php                     |  2 +-
 htdocs/reception/class/reception.class.php        |  2 +-
 htdocs/societe/list.php                           |  2 +-
 htdocs/supplier_proposal/card.php                 |  2 +-
 htdocs/ticket/class/ticket.class.php              |  2 +-
 htdocs/user/notify/card.php                       |  6 +++---
 htdocs/variants/combinations.php                  |  2 +-
 43 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 741b2c9f038..e3e2a308cf9 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -130,7 +130,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu3 ON bu3.fk_bank = b.rowid A
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu4 ON bu4.fk_bank = b.rowid AND bu4.type='payment_supplier'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc on bu1.url_id=soc.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on bu2.url_id=u.rowid";
-$sql .= " WHERE ba.fk_accountancy_journal=".$id_journal;
+$sql .= " WHERE ba.fk_accountancy_journal=".((int) $id_journal);
 $sql .= ' AND b.amount != 0 AND ba.entity IN ('.getEntity('bank_account', 0).')'; // We don't share object for accountancy
 if ($date_start && $date_end) {
 	$sql .= " AND b.dateo >= '".$db->idate($date_start)."' AND b.dateo <= '".$db->idate($date_end)."'";
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 74ff6c6aa62..322a688bd45 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1395,7 +1395,7 @@ if ($id > 0) {
 
 	// Confirmation suppression action
 	if ($action == 'delete') {
-		print $form->formconfirm("card.php?id=".$id, $langs->trans("DeleteAction"), $langs->trans("ConfirmDeleteAction"), "confirm_delete", '', '', 1);
+		print $form->formconfirm("card.php?id=".urlencode($id), $langs->trans("DeleteAction"), $langs->trans("ConfirmDeleteAction"), "confirm_delete", '', '', 1);
 	}
 
 	if ($action == 'edit') {
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 4958811ef4d..c3ef480d2ae 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -308,7 +308,7 @@ if (empty($reshook)) {
 							dol_syslog("comm/mailing/card.php: ok for #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_DEBUG);
 
 							$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-							$sql .= " SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
+							$sql .= " SET statut=1, date_envoi = '".$db->idate($now)."' WHERE rowid=".((int) $obj->rowid);
 							$resql2 = $db->query($sql);
 							if (!$resql2) {
 								dol_print_error($db);
@@ -378,7 +378,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id;
+				$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".((int) $statut)." WHERE rowid = ".((int) $object->id);
 				dol_syslog("comm/mailing/card.php: update global status", LOG_DEBUG);
 				$resql2 = $db->query($sql);
 				if (!$resql2) {
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 27859403d96..afd6273d6c0 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -104,8 +104,6 @@ if ($action == 'add') {
 	}
 	if ($result > 0) {
 		setEventMessages($langs->trans("XTargetsAdded", $result), null, 'mesgs');
-		//header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		//exit;
 		$action = '';
 	}
 	if ($result == 0) {
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index ebca0177868..44e2ad8a4cd 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1248,7 +1248,7 @@ if (empty($reshook)) {
 
 			if (empty($user->rights->margins->creer)) {
 				foreach ($object->lines as &$line) {
-					if ($line->id == GETPOST('lineid')) {
+					if ($line->id == GETPOST('lineid', 'int')) {
 						$fournprice = $line->fk_fournprice;
 						$buyingprice = $line->pa_ht;
 						break;
@@ -2433,7 +2433,7 @@ if ($action == 'create') {
 	// Show object lines
 	$result = $object->getLinesArray();
 
-	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid')).'" method="POST">
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 	<input type="hidden" name="token" value="' . newToken().'">
 	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 	<input type="hidden" name="mode" value="">
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 0665a567738..12117a5f1cb 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1052,7 +1052,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			if (empty($user->rights->margins->creer)) {
 				foreach ($object->lines as &$line) {
-					if ($line->id == GETPOST('lineid')) {
+					if ($line->id == GETPOST('lineid', 'int')) {
 						$fournprice = $line->fk_fournprice;
 						$buyingprice = $line->pa_ht;
 						break;
@@ -2416,7 +2416,7 @@ if ($action == 'create' && $usercancreate) {
 		 */
 		$result = $object->getLinesArray();
 
-		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid')).'" method="POST">
+		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index c89ad9340d2..40fd3892c4c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -4206,11 +4206,15 @@ class OrderLine extends CommonOrderLine
 
 		$error = 0;
 
+		if (empty($this->id) && !empty($this->rowid)) {		// For backward compatibility
+			$this->id = $this->rowid;
+		}
+
 		// check if order line is not in a shipment line before deleting
 		$sqlCheckShipmentLine  = "SELECT";
 		$sqlCheckShipmentLine .= " ed.rowid";
 		$sqlCheckShipmentLine .= " FROM ".MAIN_DB_PREFIX."expeditiondet ed";
-		$sqlCheckShipmentLine .= " WHERE ed.fk_origin_line = ".$this->rowid;
+		$sqlCheckShipmentLine .= " WHERE ed.fk_origin_line = ".((int) $this->id);
 
 		$resqlCheckShipmentLine = $this->db->query($sqlCheckShipmentLine);
 		if (!$resqlCheckShipmentLine) {
@@ -4235,7 +4239,7 @@ class OrderLine extends CommonOrderLine
 
 		$this->db->begin();
 
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid=".$this->rowid;
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid = ".((int) $this->id);
 
 		dol_syslog("OrderLine::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 6103df38f66..4f317c1a9ed 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -129,7 +129,7 @@ if (!empty($numref)) {
 	$object->fetch_thirdparty();
 	$upload_dir = $conf->bank->dir_output."/".$id."/statement/".dol_sanitizeFileName($numref);
 }
-$backtopage = $_SERVER['PHP_SELF']."?account=".$id."&num=".$numref;
+$backtopage = $_SERVER['PHP_SELF']."?account=".urlencode($id)."&num=".urlencode($numref);
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 3aa477dfc9c..76f7f821f8a 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -291,7 +291,7 @@ if ($result) {
 
 		// Confirmations
 		if ($action == 'delete_categ') {
-			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$rowid."&cat1=".GETPOST("fk_categ")."&orig_account=".$orig_account, $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
+			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".urlencode($rowid)."&cat1=".urlencode(GETPOST("fk_categ", 'int'))."&orig_account=".urlencode($orig_account), $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
 		}
 
 		print '<form name="update" method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$rowid.'">';
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index dcc1f4aef97..5e6d199db0a 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -226,7 +226,7 @@ $sql .= " WHERE v.entity IN (".getEntity('payment_various').")";
 
 // Search criteria
 if ($search_ref) {
-	$sql .= " AND v.rowid=".$db->escape($search_ref);
+	$sql .= " AND v.rowid = ".((int) $search_ref);
 }
 if ($search_label) {
 	$sql .= natural_search(array('v.label'), $search_label);
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 3d4693f8c7b..6f390e82552 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -366,7 +366,7 @@ if ($action == 'create') {
 			 * Confirm delete trip
 			 */
 			if ($action == 'delete') {
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete");
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".urlencode($id), $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete");
 			}
 
 			$soc = new Societe($db);
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 4f0148a05a1..1ee26e6daf3 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -770,7 +770,7 @@ if (empty($reshook)) {
 		}
 
 		/*$line = new FactureLigne($db);
-		$line->fetch(GETPOST('lineid'));
+		$line->fetch(GETPOST('lineid', 'int'));
 		$percent = $line->get_prev_progress($object->id);
 
 		if (GETPOST('progress') < $percent)
@@ -823,7 +823,7 @@ if (empty($reshook)) {
 		// Update line
 		if (!$error) {
 			$result = $object->updateline(
-				GETPOST('lineid'),
+				GETPOST('lineid', 'int'),
 				$description,
 				$pu_ht,
 				$qty,
@@ -1597,7 +1597,7 @@ if ($action == 'create') {
 
 
 		// Lines
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
         	<input type="hidden" name="token" value="' . newToken().'">
         	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
         	<input type="hidden" name="mode" value="">
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index bde5a6e6c38..df27efe91ed 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -238,13 +238,13 @@ if (empty($reshook)) {
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
-		$result = $object->deleteline(GETPOST('lineid'));
+		$result = $object->deleteline(GETPOST('lineid', 'int'));
 		if ($result > 0) {
 			// 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) && GETPOST('lang_id')) {
+				$newlang = GETPOST('lang_id');
 			}
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 				$newlang = $object->thirdparty->default_lang;
@@ -2416,7 +2416,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			if (empty($usercancreatemargin)) {
 				foreach ($object->lines as &$line) {
-					if ($line->id == GETPOST('lineid')) {
+					if ($line->id == GETPOST('lineid', 'int')) {
 						$fournprice = $line->fk_fournprice;
 						$buyingprice = $line->pa_ht;
 						break;
@@ -5168,7 +5168,7 @@ if ($action == 'create') {
 		}
 	}
 
-	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid')).'" method="POST">
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 	<input type="hidden" name="token" value="' . newToken().'">
 	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 	<input type="hidden" name="mode" value="">
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 363a781538a..ee4d1a48397 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -765,7 +765,7 @@ class FactureRec extends CommonInvoice
 	{
 		$rowid = $this->id;
 
-		dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete rowid=".((int) $rowid), LOG_DEBUG);
 
 		$error = 0;
 		$this->db->begin();
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 9ae760220a4..26a5d862457 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3657,7 +3657,7 @@ class Facture extends CommonInvoice
 	{
 		global $user;
 
-		dol_syslog(get_class($this)."::deleteline rowid=".$rowid, LOG_DEBUG);
+		dol_syslog(get_class($this)."::deleteline rowid=".((int) $rowid), LOG_DEBUG);
 
 		if ($this->statut != self::STATUS_DRAFT) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 20a11effdad..cd3e155ae06 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -380,7 +380,7 @@ if ($id > 0 || $ref) {
 		$num = $db->num_rows($result);
 		$i = 0;
 
-		$urladd = "&amp;id=".$id;
+		$urladd = "&id=".urlencode($id);
 
 		print '<form method="get" action="'.$_SERVER ['PHP_SELF'].'" name="search_form">'."\n";
 		print '<input type="hidden" name="id" value="'.$id.'"/>';
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 9cfeb860d33..c00c29e1c39 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -220,7 +220,7 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	$param = "&id=".$id;
+	$param = "&id=".urlencode($id);
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index dce5dd39b60..a912ecdba3a 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -275,7 +275,7 @@ if ($id) {
 		$num = $db->num_rows($result);
 		$i = 0;
 
-		$urladd = "&amp;id=".$id;
+		$urladd = "&id=".urlencode($id);
 
 		print_barre_liste($langs->trans("Bills"), $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num, 0, '');
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 1ab26b73c75..c925dea94bf 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -711,7 +711,7 @@ if (empty($reshook)) {
 			$db->rollback();
 		}
 	} elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer) {
-		$result = $object->deleteline(GETPOST('lineid'), $user);
+		$result = $object->deleteline(GETPOST('lineid', 'int'), $user);
 
 		if ($result >= 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -1963,7 +1963,7 @@ if ($action == 'create') {
 			$dateSelector = 1;
 
 			print "\n";
-			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid')).'" method="POST">
+			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 			<input type="hidden" name="token" value="'.newToken().'">
 			<input type="hidden" name="action" value="'.(($action != 'editline') ? 'addline' : 'updateline').'">
 			<input type="hidden" name="mode" value="">
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 33dd0e8e2f7..3bfe1a2315e 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1832,7 +1832,7 @@ class Contrat extends CommonObject
 			$this->db->begin();
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;
-			$sql .= " WHERE rowid=".$idline;
+			$sql .= " WHERE rowid = ".((int) $idline);
 
 			dol_syslog(get_class($this)."::deleteline", LOG_DEBUG);
 			$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2088263a2c2..4aa20d8f41a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8893,7 +8893,7 @@ abstract class CommonObject
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;
-		$sql .= " WHERE rowid=".$idline;
+		$sql .= " WHERE rowid = ".((int) $idline);
 
 		dol_syslog(get_class($this)."::deleteLineCommon", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 7183e24dea5..d197b687876 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -571,7 +571,7 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
 
 	$sql = "SELECT d.rowid as id, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.code_region as region_code, r.nom as region_name FROM";
 	$sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
-	$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and d.rowid=".$id;
+	$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and d.rowid=".((int) $id);
 	$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
 	$sql .= " ORDER BY c.code, d.code_departement";
 
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 81ad11ebdc9..740590cb34a 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -33,7 +33,7 @@ if ((array) $linked_resources && count($linked_resources) > 0) {
 
 		//$element_id = $linked_resource['rowid'];
 
-		if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid')) {
+		if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid', 'int')) {
 			print '<div class="tagtr oddeven">';
 			print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';
 			print '<input type="hidden" name="element" value="'.$element.'" />';
@@ -47,7 +47,7 @@ if ((array) $linked_resources && count($linked_resources) > 0) {
 			print '</div>';
 		} else {
 			$class = '';
-			if ($linked_resource['rowid'] == GETPOST('lineid')) {
+			if ($linked_resource['rowid'] == GETPOST('lineid', 'int')) {
 				$class = 'highlight';
 			}
 
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 1dfade00bec..0763ff9b7e5 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -120,7 +120,7 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
 
 if ($action == 'update') {
 	if (!empty($cancel)) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".urlencode($id));
 		exit;
 	}
 
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index f97d6b87a1b..736cfba6e42 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -151,10 +151,8 @@ class ExpeditionLineBatch extends CommonObject
 	 */
 	public static function deletefromexp($db, $id_expedition)
 	{
-		$id_expedition = (int) $id_expedition;
-
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element;
-		$sql .= " WHERE fk_expeditiondet in (SELECT rowid FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition=".$id_expedition.")";
+		$sql .= " WHERE fk_expeditiondet in (SELECT rowid FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition=".((int) $id_expedition).")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		if ($db->query($sql)) {
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index cba2e14cf74..80dbaf698ef 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -258,7 +258,7 @@ if ($id > 0 || !empty($ref)) {
 
 		// Confirm validation
 		if ($action == 'cloture') {
-			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id, $langs->trans("CloseShipment"), $langs->trans("ConfirmCloseShipment"), "confirm_cloture");
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".urlencode($id), $langs->trans("CloseShipment"), $langs->trans("ConfirmCloseShipment"), "confirm_cloture");
 		}
 
 		// Call Hook formConfirm
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index fca16305047..8245e8ec1cc 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -678,7 +678,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON t.fk_mode_reglement = p.id";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
 		if ($id) {
-			$sql .= " WHERE t.rowid=".$id;
+			$sql .= " WHERE t.rowid=".((int) $id);
 		}
 		if ($ref) {
 			$sql .= " WHERE t.ref='".$this->db->escape($ref)."' AND t.entity IN (".getEntity('supplier_invoice').")";
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 8358b71f2c7..e33b9de48c1 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1326,7 +1326,7 @@ if (empty($reshook)) {
 				$_GET['socid'] = $_POST['socid'];
 			} else {
 				$db->commit();
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".urlencode($id));
 				exit;
 			}
 		}
@@ -2275,7 +2275,7 @@ if ($action == 'create') {
 	//$result = $object->getLinesArray();
 
 
-	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid')).'" method="POST">
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 	<input type="hidden" name="token" value="'.newToken().'">
 	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 	<input type="hidden" name="mode" value="">
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index c27a33f522b..b183092972e 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -1166,7 +1166,7 @@ if ($id > 0 || !empty($ref)) {
 				$objp = $db->fetch_object($resql);
 
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid) {
-					print '<form name="editdispatchedlines" id="editdispatchedlines" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#line_'.GETPOST('lineid').'" method="POST">
+					print '<form name="editdispatchedlines" id="editdispatchedlines" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#line_'.GETPOST('lineid', 'int').'" method="POST">
 					<input type="hidden" name="token" value="'.newToken().'">
 					<input type="hidden" name="action" value="updateline">
 					<input type="hidden" name="mode" value="">
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 578c9c7e062..e59e4583e72 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3293,7 +3293,7 @@ if ($action == 'create') {
 		/*
 		 * Lines
 		 */
-		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid')).'" method="POST">';
+		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="'.(($action != 'editline') ? 'addline' : 'updateline').'">';
 		print '<input type="hidden" name="mode" value="">';
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 5094f178cea..12ee32a496f 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -237,6 +237,7 @@ if (!function_exists('ftp_connect')) {
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
+			$reg = array();
 			preg_match('/([0-9]+)$/i', $obj->name, $reg);
 			$idrss = $reg[0];
 			//print "x".join(',',$reg)."=".$obj->name."=".$idrss;
diff --git a/htdocs/install/lib/repair.lib.php b/htdocs/install/lib/repair.lib.php
index 242fbff25d4..bd54e55ebde 100644
--- a/htdocs/install/lib/repair.lib.php
+++ b/htdocs/install/lib/repair.lib.php
@@ -140,7 +140,7 @@ function clean_data_ecm_directories()
 			$label = $obj->label;
 			$newlabel = dol_sanitizeFileName($label);
 			if ($label != $newlabel) {
-				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set label='".$db->escape($newlabel)."' WHERE rowid=".$id;
+				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set label = '".$db->escape($newlabel)."' WHERE rowid = ".((int) $id);
 				print '<tr><td>'.$sqlupdate."</td></tr>\n";
 				$resqlupdate = $db->query($sqlupdate);
 				if (!$resqlupdate) {
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 0226848bd48..24b8797a670 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -203,7 +203,7 @@ if ($id > 0 && $action != 'edit') {
 			);
 		}
 		print $form->formconfirm(
-			"card.php?rowid=".$id,
+			"card.php?rowid=".urlencode($id),
 			$langs->trans("DeleteReport"),
 			$langs->trans("ConfirmDeleteReport"),
 			"confirm_delete",
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index f18cc4ee503..ac006c042aa 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -198,7 +198,7 @@ $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
 $sql .= " AND f.fk_statut NOT IN (".$db->sanitize(implode(', ', $invoice_status_except_list)).")";
 $sql .= " AND d.fk_facture = f.rowid";
 if ($id > 0) {
-	$sql .= " AND d.fk_product =".$id;
+	$sql .= " AND d.fk_product =".((int) $id);
 }
 if (!empty($TSelectedCats)) {
 	$sql .= ' AND cp.fk_categorie IN ('.$db->sanitize(implode(',', $TSelectedCats)).')';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index fbe706e93db..a1fd7a5b1dc 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4535,8 +4535,8 @@ class Product extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
 		$sql .= " ".MAIN_DB_PREFIX."product_association as pa";
 		$sql .= " WHERE p.rowid = pa.fk_product_fils";
-		$sql .= " AND pa.fk_product_pere = ".$id;
-		$sql .= " AND pa.fk_product_fils != ".$id; // This should not happens, it is to avoid infinite loop if it happens
+		$sql .= " AND pa.fk_product_pere = ".((int) $id);
+		$sql .= " AND pa.fk_product_fils <> ".((int) $id); // This should not happens, it is to avoid infinite loop if it happens
 
 		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level, LOG_DEBUG);
 
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index a08eaa8558b..7dfb94be79f 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -568,7 +568,7 @@ if (empty($reshook)) {
 
 	if ($action == 'delete_customer_price' && ($user->rights->produit->supprimer || $user->rights->service->supprimer)) {
 		// Delete price by customer
-		$prodcustprice->id = GETPOST('lineid');
+		$prodcustprice->id = GETPOST('lineid', 'int');
 		$result = $prodcustprice->delete($user);
 
 		if ($result < 0) {
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 0a77a39a0df..0d3783dc161 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -137,7 +137,7 @@ if (empty($reshook)) {
 						header("Location: ".$backtopage);
 						exit;
 					} else {
-						header("Location: card.php?id=".$id);
+						header("Location: card.php?id=".urlencode($id));
 						exit;
 					}
 				} else {
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index d5e3feaa255..946990f0c7b 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -1317,7 +1317,7 @@ class Reception extends CommonObject
 		$sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
 		if ($id != '') {
-			$sql .= " WHERE em.rowid=".$id;
+			$sql .= " WHERE em.rowid = ".((int) $id);
 		}
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 9c5d261f996..f79857d744f 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -292,7 +292,7 @@ if ($action == "change") {	// Change customer for TakePOS
 		$db->query($sql);
 	}
 
-	$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+	$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".((int) $idcustomer)." where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
 	$resql = $db->query($sql);
 	?>
 		<script>
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 122b881495f..d5b4974eb83 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1743,7 +1743,7 @@ if ($action == 'create') {
 	// Show object lines
 	$result = $object->getLinesArray();
 
-	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid')).'" method="POST">
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
 	<input type="hidden" name="token" value="' . newToken().'">
 	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 	<input type="hidden" name="mode" value="">
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 1d77e323c10..c16817ad7a5 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1452,7 +1452,7 @@ class Ticket extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."ticket";
 		if ($id_assign_user > 0) {
-			$sql .= " SET fk_user_assign=".$id_assign_user.", fk_statut = ".Ticket::STATUS_ASSIGNED;
+			$sql .= " SET fk_user_assign=".((int) $id_assign_user).", fk_statut = ".Ticket::STATUS_ASSIGNED;
 		} else {
 			$sql .= " SET fk_user_assign=null, fk_statut = ".Ticket::STATUS_READ;
 		}
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 0c9785d7463..469823f0358 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -97,7 +97,7 @@ if ($action == 'add') {
 		$db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-		$sql .= " WHERE fk_user=".$id." AND fk_action=".$actionid;
+		$sql .= " WHERE fk_user=".((int) $id)." AND fk_action=".((int) $actionid);
 		if ($db->query($sql)) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_action)";
 			$sql .= " VALUES ('".$db->idate($now)."',".$id.",".$actionid.")";
@@ -204,11 +204,11 @@ if ($result > 0) {
 	// Add notification form
 	//  print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.urlencode($id).'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	$param = "&id=".$id;
+	$param = "&id=".urlencode($id);
 
 	// Line with titles
 	/*  print '<table width="100%" class="noborder">';
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 979ec261663..ded3a1bb8b9 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -727,7 +727,7 @@ if (!empty($id) || !empty($ref)) {
 				$prodstatic->fetch($prodcomb->fk_product_child);
 
 				print $form->formconfirm(
-					"combinations.php?id=".$id."&valueid=".$valueid,
+					"combinations.php?id=".urlencode($id)."&valueid=".urlencode($valueid),
 					$langs->trans('Delete'),
 					$langs->trans('ProductCombinationDeleteDialog', $prodstatic->ref),
 					"confirm_deletecombination",

From e057f44293a2eedf6bee0f0716edee93e88d7b2e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 16:15:15 +0200
Subject: [PATCH 281/928] Typo

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

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 89b5a696462..b4016af109a 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -314,7 +314,7 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
 //var_dump($api->r->apiVersionMap);
 //exit;
 
-// We do not want that restler output data if we use native compression (default behaviour) but we want to have it returned into a string.
+// We do not want that restler outputs data if we use native compression (default behaviour) but we want to have it returned into a string.
 Luracast\Restler\Defaults::$returnResponse = (empty($conf->global->API_DISABLE_COMPRESSION) && !empty($_SERVER['HTTP_ACCEPT_ENCODING']));
 
 // Call API (we suppose we found it).

From 5d0e93344b189b8627f69a22a69e1fa22d40f543 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 17:41:59 +0200
Subject: [PATCH 282/928] Upgrade to swagger 2.2

---
 COPYRIGHT                                     |     2 +-
 dev/dolibarr_changes.txt                      |    10 +-
 htdocs/api/class/api_login.class.php          |     7 +-
 htdocs/api/index.php                          |     5 +
 .../Luracast/Restler/explorer/css/print.css   |  1188 +-
 .../Luracast/Restler/explorer/css/reset.css   |   126 +-
 .../Luracast/Restler/explorer/css/screen.css  |  1305 +-
 .../Luracast/Restler/explorer/css/style.css   |   251 +-
 .../Restler/explorer/css/typography.css       |    14 -
 .../Restler/explorer/fonts/DroidSans-Bold.ttf |   Bin 42480 -> 42480 bytes
 .../Restler/explorer/fonts/DroidSans.ttf      |   Bin 41028 -> 41028 bytes
 .../explorer/images/explorer_icons.png        |   Bin 5763 -> 5115 bytes
 .../Restler/explorer/images/favicon-16x16.png |   Bin 0 -> 445 bytes
 .../Restler/explorer/images/favicon-32x32.png |   Bin 0 -> 1141 bytes
 .../Restler/explorer/images/favicon.ico       |   Bin 0 -> 5430 bytes
 .../Restler/explorer/images/logo_small.png    |   Bin 1620 -> 455 bytes
 .../Restler/explorer/images/pet_store_api.png |   Bin 0 -> 631 bytes
 .../Restler/explorer/images/wordnik_api.png   |   Bin 0 -> 670 bytes
 .../Luracast/Restler/explorer/index.html      |    52 +-
 .../Luracast/Restler/explorer/lang/ca.js      |    53 +
 .../Luracast/Restler/explorer/lang/el.js      |    56 +
 .../Luracast/Restler/explorer/lang/en.js      |     1 +
 .../Luracast/Restler/explorer/lang/es.js      |     1 +
 .../Luracast/Restler/explorer/lang/fr.js      |     3 +-
 .../Luracast/Restler/explorer/lang/geo.js     |    56 +
 .../Luracast/Restler/explorer/lang/ja.js      |     9 +-
 .../Luracast/Restler/explorer/lang/ko-kr.js   |    53 +
 .../Luracast/Restler/explorer/lang/ru.js      |     1 +
 .../Restler/explorer/lang/translator.js       |     2 +-
 .../Luracast/Restler/explorer/lang/zh-cn.js   |     3 +
 .../Restler/explorer/lib/backbone-min.js      |    16 +-
 .../Luracast/Restler/explorer/lib/es5-shim.js |     1 +
 .../Restler/explorer/lib/handlebars-1.0.0.js  |  2278 ---
 .../Restler/explorer/lib/handlebars-2.0.0.js  |    28 -
 .../Restler/explorer/lib/handlebars-4.0.5.js  |     3 +
 .../explorer/lib/highlight.7.3.pack.js        |     1 -
 .../explorer/lib/highlight.9.1.0.pack.js      |     1 +
 .../lib/highlight.9.1.0.pack_extended.js      |     1 +
 .../Restler/explorer/lib/jquery-1.8.0.min.js  |     5 +-
 .../Restler/explorer/lib/jquery.ba-bbq.min.js |    19 +-
 .../explorer/lib/jquery.slideto.min.js        |     2 +-
 .../Restler/explorer/lib/jquery.wiggle.min.js |     9 +-
 .../Restler/explorer/lib/js-yaml.min.js       |     2 +
 .../Restler/explorer/lib/jsoneditor.min.js    |    16 +-
 .../Restler/explorer/lib/lodash.min.js        |     2 +
 .../Luracast/Restler/explorer/lib/marked.js   |  1273 +-
 .../explorer/lib/object-assign-pollyfill.js   |     1 +
 .../Restler/explorer/lib/sanitize-html.min.js |     4 +
 .../Restler/explorer/lib/shred.bundle.js      |  2765 ---
 .../Restler/explorer/lib/shred/content.js     |   193 -
 .../Restler/explorer/lib/swagger-oauth.js     |   339 +-
 .../Luracast/Restler/explorer/lib/swagger.js  |  1653 --
 .../Restler/explorer/lib/underscore-min.js    |     6 -
 .../Restler/explorer/lib/underscore-min.map   |     1 -
 .../Luracast/Restler/explorer/o2c.html        |     6 +-
 .../Luracast/Restler/explorer/swagger-ui.js   | 16260 ++++++++--------
 .../Restler/explorer/swagger-ui.min.js        |    15 +
 57 files changed, 7967 insertions(+), 20131 deletions(-)
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/images/favicon-16x16.png
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/images/favicon-32x32.png
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/images/favicon.ico
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/images/pet_store_api.png
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/images/wordnik_api.png
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ca.js
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/el.js
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/geo.js
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ko-kr.js
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/es5-shim.js
 delete mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js
 delete mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-2.0.0.js
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-4.0.5.js
 delete mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.9.1.0.pack.js
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.9.1.0.pack_extended.js
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/js-yaml.min.js
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/lodash.min.js
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/object-assign-pollyfill.js
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/sanitize-html.min.js
 delete mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js
 delete mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js
 delete mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
 delete mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js
 delete mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.map
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js

diff --git a/COPYRIGHT b/COPYRIGHT
index b133b05b2cf..9704c857ed3 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -54,7 +54,7 @@ jQuery TableDnD        0.6           GPL and MIT License         Yes
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
 jsGanttImproved        2.7.3         BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
-SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
+SwaggerUI			   2.2.10		 GPL-2+                      Yes             JS library to offer the REST API explorer
 
 Image libraries:
 Octicons               8.1           MIT                         Yes
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index e207afa5658..9ea62de9048 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -225,9 +225,6 @@ JQUERYFILETREE:
 
 RESTLER:
 --------
-Change content of file htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
-
-+With swagger 2:
 
 * Add line into Util.php to complete function
 
@@ -249,6 +246,13 @@ Change content of file htdocs/includes/restler/framework/Luracast/Restler/explor
         if (!is_string($haystack)) return false;
 
 
++With swagger 2 provided into /explorer:
+----------------------------------------
+
+Change content of file htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
+
+
+
 PARSEDOWN
 ---------
 
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index df5b9945a76..7afdb74b89d 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -31,8 +31,13 @@ class Login
 	 */
 	public function __construct()
 	{
-		global $db;
+		global $conf, $db;
 		$this->db = $db;
+
+		//$conf->global->MAIN_MODULE_API_LOGIN_DISABLED = 1;
+		if (!empty($conf->global->MAIN_MODULE_API_LOGIN_DISABLED)) {
+			throw new RestException(403, "Error login APIs are disabled. You must get the token from backoffice to be able to use APIs");
+		}
 	}
 
 	/**
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index b4016af109a..241f33fd98a 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -218,6 +218,11 @@ if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $
 									continue;
 								}
 
+								//$conf->global->MAIN_MODULE_API_LOGIN_DISABLED = 1;
+								if ($file_searched == 'api_login.class.php' && !empty($conf->global->MAIN_MODULE_API_LOGIN_DISABLED)) {
+									continue;
+								}
+
 								$regapi = array();
 								if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $regapi)) {
 									$classname = ucwords($regapi[1]);
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/print.css b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/print.css
index 2e6b310300b..f2e8446445c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/print.css
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/print.css
@@ -1,1187 +1 @@
-/* Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org> */
-.swagger-section pre code {
-  display: block;
-  padding: 0.5em;
-  background: #F0F0F0;
-}
-.swagger-section pre code,
-.swagger-section pre .subst,
-.swagger-section pre .tag .title,
-.swagger-section pre .lisp .title,
-.swagger-section pre .clojure .built_in,
-.swagger-section pre .nginx .title {
-  color: black;
-}
-.swagger-section pre .string,
-.swagger-section pre .title,
-.swagger-section pre .constant,
-.swagger-section pre .parent,
-.swagger-section pre .tag .value,
-.swagger-section pre .rules .value,
-.swagger-section pre .rules .value .number,
-.swagger-section pre .preprocessor,
-.swagger-section pre .ruby .symbol,
-.swagger-section pre .ruby .symbol .string,
-.swagger-section pre .aggregate,
-.swagger-section pre .template_tag,
-.swagger-section pre .django .variable,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .addition,
-.swagger-section pre .flow,
-.swagger-section pre .stream,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .apache .cbracket,
-.swagger-section pre .tex .command,
-.swagger-section pre .tex .special,
-.swagger-section pre .erlang_repl .function_or_atom,
-.swagger-section pre .markdown .header {
-  color: #800;
-}
-.swagger-section pre .comment,
-.swagger-section pre .annotation,
-.swagger-section pre .template_comment,
-.swagger-section pre .diff .header,
-.swagger-section pre .chunk,
-.swagger-section pre .markdown .blockquote {
-  color: #888;
-}
-.swagger-section pre .number,
-.swagger-section pre .date,
-.swagger-section pre .regexp,
-.swagger-section pre .literal,
-.swagger-section pre .smalltalk .symbol,
-.swagger-section pre .smalltalk .char,
-.swagger-section pre .go .constant,
-.swagger-section pre .change,
-.swagger-section pre .markdown .bullet,
-.swagger-section pre .markdown .link_url {
-  color: #080;
-}
-.swagger-section pre .label,
-.swagger-section pre .javadoc,
-.swagger-section pre .ruby .string,
-.swagger-section pre .decorator,
-.swagger-section pre .filter .argument,
-.swagger-section pre .localvars,
-.swagger-section pre .array,
-.swagger-section pre .attr_selector,
-.swagger-section pre .important,
-.swagger-section pre .pseudo,
-.swagger-section pre .pi,
-.swagger-section pre .doctype,
-.swagger-section pre .deletion,
-.swagger-section pre .envvar,
-.swagger-section pre .shebang,
-.swagger-section pre .apache .sqbracket,
-.swagger-section pre .nginx .built_in,
-.swagger-section pre .tex .formula,
-.swagger-section pre .erlang_repl .reserved,
-.swagger-section pre .prompt,
-.swagger-section pre .markdown .link_label,
-.swagger-section pre .vhdl .attribute,
-.swagger-section pre .clojure .attribute,
-.swagger-section pre .coffeescript .property {
-  color: #8888ff;
-}
-.swagger-section pre .keyword,
-.swagger-section pre .id,
-.swagger-section pre .phpdoc,
-.swagger-section pre .title,
-.swagger-section pre .built_in,
-.swagger-section pre .aggregate,
-.swagger-section pre .css .tag,
-.swagger-section pre .javadoctag,
-.swagger-section pre .phpdoc,
-.swagger-section pre .yardoctag,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .winutils,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .go .typename,
-.swagger-section pre .tex .command,
-.swagger-section pre .markdown .strong,
-.swagger-section pre .request,
-.swagger-section pre .status {
-  font-weight: bold;
-}
-.swagger-section pre .markdown .emphasis {
-  font-style: italic;
-}
-.swagger-section pre .nginx .built_in {
-  font-weight: normal;
-}
-.swagger-section pre .coffeescript .javascript,
-.swagger-section pre .javascript .xml,
-.swagger-section pre .tex .formula,
-.swagger-section pre .xml .javascript,
-.swagger-section pre .xml .vbscript,
-.swagger-section pre .xml .css,
-.swagger-section pre .xml .cdata {
-  opacity: 0.5;
-}
-.swagger-section .swagger-ui-wrap {
-  line-height: 1;
-  font-family: "Droid Sans", sans-serif;
-  max-width: 960px;
-  margin-left: auto;
-  margin-right: auto;
-  /* JSONEditor specific styling */
-}
-.swagger-section .swagger-ui-wrap b,
-.swagger-section .swagger-ui-wrap strong {
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap q,
-.swagger-section .swagger-ui-wrap blockquote {
-  quotes: none;
-}
-.swagger-section .swagger-ui-wrap p {
-  line-height: 1.4em;
-  padding: 0 0 10px;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap q:before,
-.swagger-section .swagger-ui-wrap q:after,
-.swagger-section .swagger-ui-wrap blockquote:before,
-.swagger-section .swagger-ui-wrap blockquote:after {
-  content: none;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu h1,
-.swagger-section .swagger-ui-wrap .heading_with_menu h2,
-.swagger-section .swagger-ui-wrap .heading_with_menu h3,
-.swagger-section .swagger-ui-wrap .heading_with_menu h4,
-.swagger-section .swagger-ui-wrap .heading_with_menu h5,
-.swagger-section .swagger-ui-wrap .heading_with_menu h6 {
-  display: block;
-  clear: none;
-  float: left;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 60%;
-}
-.swagger-section .swagger-ui-wrap table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.swagger-section .swagger-ui-wrap table thead tr th {
-  padding: 5px;
-  font-size: 0.9em;
-  color: #666666;
-  border-bottom: 1px solid #999999;
-}
-.swagger-section .swagger-ui-wrap table tbody tr:last-child td {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap table tbody tr.offset {
-  background-color: #f0f0f0;
-}
-.swagger-section .swagger-ui-wrap table tbody tr td {
-  padding: 6px;
-  font-size: 0.9em;
-  border-bottom: 1px solid #cccccc;
-  vertical-align: top;
-  line-height: 1.3em;
-}
-.swagger-section .swagger-ui-wrap ol {
-  margin: 0px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: decimal;
-}
-.swagger-section .swagger-ui-wrap ol li {
-  padding: 5px 0px;
-  font-size: 0.9em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap ol,
-.swagger-section .swagger-ui-wrap ul {
-  list-style: none;
-}
-.swagger-section .swagger-ui-wrap h1 a,
-.swagger-section .swagger-ui-wrap h2 a,
-.swagger-section .swagger-ui-wrap h3 a,
-.swagger-section .swagger-ui-wrap h4 a,
-.swagger-section .swagger-ui-wrap h5 a,
-.swagger-section .swagger-ui-wrap h6 a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap h1 a:hover,
-.swagger-section .swagger-ui-wrap h2 a:hover,
-.swagger-section .swagger-ui-wrap h3 a:hover,
-.swagger-section .swagger-ui-wrap h4 a:hover,
-.swagger-section .swagger-ui-wrap h5 a:hover,
-.swagger-section .swagger-ui-wrap h6 a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap h1 span.divider,
-.swagger-section .swagger-ui-wrap h2 span.divider,
-.swagger-section .swagger-ui-wrap h3 span.divider,
-.swagger-section .swagger-ui-wrap h4 span.divider,
-.swagger-section .swagger-ui-wrap h5 span.divider,
-.swagger-section .swagger-ui-wrap h6 span.divider {
-  color: #aaaaaa;
-}
-.swagger-section .swagger-ui-wrap a {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap a img {
-  border: none;
-}
-.swagger-section .swagger-ui-wrap article,
-.swagger-section .swagger-ui-wrap aside,
-.swagger-section .swagger-ui-wrap details,
-.swagger-section .swagger-ui-wrap figcaption,
-.swagger-section .swagger-ui-wrap figure,
-.swagger-section .swagger-ui-wrap footer,
-.swagger-section .swagger-ui-wrap header,
-.swagger-section .swagger-ui-wrap hgroup,
-.swagger-section .swagger-ui-wrap menu,
-.swagger-section .swagger-ui-wrap nav,
-.swagger-section .swagger-ui-wrap section,
-.swagger-section .swagger-ui-wrap summary {
-  display: block;
-}
-.swagger-section .swagger-ui-wrap pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap pre code {
-  line-height: 1.6em;
-  background: none;
-}
-.swagger-section .swagger-ui-wrap .content > .content-type > div > label {
-  clear: both;
-  display: block;
-  color: #0F6AB4;
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap .content pre {
-  font-size: 12px;
-  margin-top: 5px;
-  padding: 5px;
-}
-.swagger-section .swagger-ui-wrap .icon-btn {
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .info_title {
-  padding-bottom: 10px;
-  font-weight: bold;
-  font-size: 25px;
-}
-.swagger-section .swagger-ui-wrap .footer {
-  margin-top: 20px;
-}
-.swagger-section .swagger-ui-wrap p.big,
-.swagger-section .swagger-ui-wrap div.big p {
-  font-size: 1em;
-  margin-bottom: 10px;
-}
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.string input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.url input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.text textarea,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.numeric input {
-  width: 500px !important;
-}
-.swagger-section .swagger-ui-wrap .info_license {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_tos {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .message-fail {
-  color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap .info_url {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_email {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_name {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_description {
-  padding-bottom: 10px;
-  font-size: 15px;
-}
-.swagger-section .swagger-ui-wrap .markdown ol li,
-.swagger-section .swagger-ui-wrap .markdown ul li {
-  padding: 3px 0px;
-  line-height: 1.4em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input {
-  display: block;
-  padding: 4px;
-  width: auto;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input.title {
-  font-size: 1.3em;
-}
-.swagger-section .swagger-ui-wrap table.fullwidth {
-  width: 100%;
-}
-.swagger-section .swagger-ui-wrap .model-signature {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 1em;
-  line-height: 1.5em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a {
-  text-decoration: none;
-  color: #AAA;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav .selected {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propType {
-  color: #5555aa;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre:hover {
-  background-color: #ffffdd;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre {
-  font-size: .85em;
-  line-height: 1.2em;
-  overflow: auto;
-  max-height: 200px;
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav {
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li:last-child {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li {
-  float: left;
-  margin: 0 5px 5px 0;
-  padding: 2px 5px 2px 0;
-  border-right: 1px solid #ddd;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOpt {
-  color: #555;
-}
-.swagger-section .swagger-ui-wrap .model-signature .snippet small {
-  font-size: 0.75em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOptKey {
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .strong {
-  font-weight: bold;
-  color: #000;
-  font-size: .9em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description div {
-  font-size: 0.9em;
-  line-height: 1.5em;
-  margin-left: 1em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .stronger {
-  font-weight: bold;
-  color: #000;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper {
-  border-spacing: 0;
-  position: absolute;
-  background-color: #ffffff;
-  border: 1px solid #bbbbbb;
-  display: none;
-  font-size: 11px;
-  max-width: 400px;
-  line-height: 30px;
-  color: black;
-  padding: 5px;
-  margin-left: 10px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper th {
-  text-align: center;
-  background-color: #eeeeee;
-  border: 1px solid #bbbbbb;
-  font-size: 11px;
-  color: #666666;
-  font-weight: bold;
-  padding: 5px;
-  line-height: 15px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:first-child,
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:last-child {
-  display: inline;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:not(:first-child):before {
-  display: block;
-  content: '';
-}
-.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown > p:only-child {
-  margin-right: -3px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propName {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-container {
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap .body-textarea {
-  width: 300px;
-  height: 100px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap .markdown p code,
-.swagger-section .swagger-ui-wrap .markdown li code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #f0f0f0;
-  color: black;
-  padding: 1px 3px;
-}
-.swagger-section .swagger-ui-wrap .required {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .editor_holder {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap .editor_holder label {
-  font-weight: normal!important;
-  /* JSONEditor uses bold by default for all labels, we revert that back to normal to not give the impression that by default fields are required */
-}
-.swagger-section .swagger-ui-wrap .editor_holder label.required {
-  font-weight: bold!important;
-}
-.swagger-section .swagger-ui-wrap input.parameter {
-  width: 300px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap h1 {
-  color: black;
-  font-size: 1.5em;
-  line-height: 1.3em;
-  padding: 10px 0 10px 0;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu ul {
-  display: block;
-  clear: none;
-  float: right;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  margin-top: 10px;
-}
-.swagger-section .swagger-ui-wrap h2 {
-  color: black;
-  font-size: 1.3em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub {
-  font-size: 0.7em;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub a {
-  color: #777777;
-}
-.swagger-section .swagger-ui-wrap span.weak {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .message-success {
-  color: #89BF04;
-}
-.swagger-section .swagger-ui-wrap caption,
-.swagger-section .swagger-ui-wrap th,
-.swagger-section .swagger-ui-wrap td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-.swagger-section .swagger-ui-wrap .code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.text textarea {
-  font-family: "Droid Sans", sans-serif;
-  height: 250px;
-  padding: 4px;
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.select select {
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean label {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean input {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0 5px 0 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.required label {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label {
-  display: block;
-  clear: both;
-  width: auto;
-  padding: 0 0 3px;
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label abbr {
-  padding-left: 3px;
-  color: #888888;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li p.inline-hints {
-  margin-left: 0;
-  font-style: italic;
-  font-size: 0.9em;
-  margin: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.buttons {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap span.blank,
-.swagger-section .swagger-ui-wrap span.empty {
-  color: #888888;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .markdown h3 {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap .markdown h4 {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .markdown pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-  margin: 0 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown pre code {
-  line-height: 1.6em;
-}
-.swagger-section .swagger-ui-wrap div.gist {
-  margin: 20px 0 25px 0 !important;
-}
-.swagger-section .swagger-ui-wrap ul#resources {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource {
-  border-bottom: 1px solid #dddddd;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading h2 a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading ul.options li a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading ul.options li a {
-  color: #555555;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:last-child {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading {
-  border: 1px solid transparent;
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 14px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  border-right: 1px solid #dddddd;
-  color: #666666;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a {
-  color: #aaaaaa;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
-  color: #999999;
-  padding-left: 0;
-  display: block;
-  clear: none;
-  float: left;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
-  color: #999999;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0 0 10px;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 {
-  display: block;
-  clear: none;
-  float: left;
-  width: auto;
-  margin: 0;
-  padding: 0;
-  line-height: 1.1em;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path {
-  padding-left: 10px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  text-decoration: none;
-  color: white;
-  display: inline-block;
-  width: 50px;
-  font-size: 0.7em;
-  text-align: center;
-  padding: 7px 0 4px;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  -o-border-radius: 2px;
-  -ms-border-radius: 2px;
-  -khtml-border-radius: 2px;
-  border-radius: 2px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 6px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li.access {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content {
-  border-top: none;
-  padding: 10px;
-  -moz-border-radius-bottomleft: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-  -o-border-bottom-left-radius: 6px;
-  -ms-border-bottom-left-radius: 6px;
-  -khtml-border-bottom-left-radius: 6px;
-  border-bottom-left-radius: 6px;
-  -moz-border-radius-bottomright: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-  -o-border-bottom-right-radius: 6px;
-  -ms-border-bottom-right-radius: 6px;
-  -khtml-border-bottom-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-  margin: 0 0 20px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content h4 {
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header a {
-  padding: 4px 0 0 10px;
-  display: inline-block;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit {
-  display: block;
-  clear: none;
-  float: left;
-  padding: 6px 8px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber {
-  background-image: url('../images/throbber.gif');
-  width: 128px;
-  height: 16px;
-  display: block;
-  clear: none;
-  float: right;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type='text'].error {
-  outline: 2px solid black;
-  outline-color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
-  max-width: 300px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  padding: 10px;
-  font-size: 0.9em;
-  max-height: 400px;
-  overflow-y: auto;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading {
-  background-color: #f9f2e9;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a {
-  background-color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0e0ca;
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content {
-  background-color: #faf5ee;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4 {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #ffd20f;
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li a {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content h4 {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading {
-  background-color: #f5e8e8;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #e8c6c7;
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  background-color: #f7eded;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4 {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a {
-  color: #c8787a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading {
-  background-color: #e7f6ec;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a {
-  background-color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3e8d1;
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content {
-  background-color: #ebf7f0;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4 {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading {
-  background-color: #FCE9E3;
-  border: 1px solid #F5D5C3;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a {
-  background-color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0cecb;
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content {
-  background-color: #faf0ef;
-  border: 1px solid #f0cecb;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4 {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  border-top: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap p#colophon {
-  margin: 0 15px 40px 15px;
-  padding: 10px 0;
-  font-size: 0.8em;
-  border-top: 1px solid #dddddd;
-  font-family: "Droid Sans", sans-serif;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap p#colophon a {
-  text-decoration: none;
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap h3 {
-  color: black;
-  font-size: 1.1em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown ol,
-.swagger-section .swagger-ui-wrap .markdown ul {
-  font-family: "Droid Sans", sans-serif;
-  margin: 5px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: disc;
-}
-.swagger-section .swagger-ui-wrap form.form_box {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box label {
-  color: #0f6ab4 !important;
-}
-.swagger-section .swagger-ui-wrap form.form_box input[type=submit] {
-  display: block;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box p.weak {
-  font-size: 0.8em;
-}
-.swagger-section .swagger-ui-wrap form.form_box p {
-  font-size: 0.9em;
-  padding: 0 0 15px;
-  color: #7e7b6d;
-}
-.swagger-section .swagger-ui-wrap form.form_box p a {
-  color: #646257;
-}
-.swagger-section .swagger-ui-wrap form.form_box p strong {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
-  padding-bottom: 0;
-}
-.swagger-section .title {
-  font-style: bold;
-}
-.swagger-section .secondary_form {
-  display: none;
-}
-.swagger-section .main_image {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-section .oauth_body {
-  margin-left: 100px;
-  margin-right: 100px;
-}
-.swagger-section .oauth_submit {
-  text-align: center;
-}
-.swagger-section .api-popup-dialog {
-  z-index: 10000;
-  position: absolute;
-  width: 500px;
-  background: #FFF;
-  padding: 20px;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  display: none;
-  font-size: 13px;
-  color: #777;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog .error-msg {
-  padding-left: 5px;
-  padding-bottom: 5px;
-}
-.swagger-section .api-popup-dialog .api-popup-authbtn {
-  height: 30px;
-}
-.swagger-section .api-popup-dialog .api-popup-cancel {
-  height: 30px;
-}
-.swagger-section .api-popup-scopes {
-  padding: 10px 20px;
-}
-.swagger-section .api-popup-scopes li {
-  padding: 5px 0;
-  line-height: 20px;
-}
-.swagger-section .api-popup-scopes li input {
-  position: relative;
-  top: 2px;
-}
-.swagger-section .api-popup-scopes .api-scope-desc {
-  padding-left: 20px;
-  font-style: italic;
-}
-.swagger-section .api-popup-actions {
-  padding-top: 10px;
-}
-#header {
-  display: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre {
-  max-height: none;
-}
-.swagger-section .swagger-ui-wrap .body-textarea {
-  width: 100px;
-}
-.swagger-section .swagger-ui-wrap input.parameter {
-  width: 100px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options {
-  display: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints {
-  display: block !important;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content {
-  display: block !important;
-}
+.swagger-section pre code{display:block;padding:.5em;background:#f0f0f0}.swagger-section pre .clojure .built_in,.swagger-section pre .lisp .title,.swagger-section pre .nginx .title,.swagger-section pre .subst,.swagger-section pre .tag .title,.swagger-section pre code{color:#000}.swagger-section pre .addition,.swagger-section pre .aggregate,.swagger-section pre .apache .cbracket,.swagger-section pre .apache .tag,.swagger-section pre .bash .variable,.swagger-section pre .constant,.swagger-section pre .django .variable,.swagger-section pre .erlang_repl .function_or_atom,.swagger-section pre .flow,.swagger-section pre .markdown .header,.swagger-section pre .parent,.swagger-section pre .preprocessor,.swagger-section pre .ruby .symbol,.swagger-section pre .ruby .symbol .string,.swagger-section pre .rules .value,.swagger-section pre .rules .value .number,.swagger-section pre .smalltalk .class,.swagger-section pre .stream,.swagger-section pre .string,.swagger-section pre .tag .value,.swagger-section pre .template_tag,.swagger-section pre .tex .command,.swagger-section pre .tex .special,.swagger-section pre .title{color:#800}.swagger-section pre .annotation,.swagger-section pre .chunk,.swagger-section pre .comment,.swagger-section pre .diff .header,.swagger-section pre .markdown .blockquote,.swagger-section pre .template_comment{color:#888}.swagger-section pre .change,.swagger-section pre .date,.swagger-section pre .go .constant,.swagger-section pre .literal,.swagger-section pre .markdown .bullet,.swagger-section pre .markdown .link_url,.swagger-section pre .number,.swagger-section pre .regexp,.swagger-section pre .smalltalk .char,.swagger-section pre .smalltalk .symbol{color:#080}.swagger-section pre .apache .sqbracket,.swagger-section pre .array,.swagger-section pre .attr_selector,.swagger-section pre .clojure .attribute,.swagger-section pre .coffeescript .property,.swagger-section pre .decorator,.swagger-section pre .deletion,.swagger-section pre .doctype,.swagger-section pre .envvar,.swagger-section pre .erlang_repl .reserved,.swagger-section pre .filter .argument,.swagger-section pre .important,.swagger-section pre .javadoc,.swagger-section pre .label,.swagger-section pre .localvars,.swagger-section pre .markdown .link_label,.swagger-section pre .nginx .built_in,.swagger-section pre .pi,.swagger-section pre .prompt,.swagger-section pre .pseudo,.swagger-section pre .ruby .string,.swagger-section pre .shebang,.swagger-section pre .tex .formula,.swagger-section pre .vhdl .attribute{color:#88f}.swagger-section pre .aggregate,.swagger-section pre .apache .tag,.swagger-section pre .bash .variable,.swagger-section pre .built_in,.swagger-section pre .css .tag,.swagger-section pre .go .typename,.swagger-section pre .id,.swagger-section pre .javadoctag,.swagger-section pre .keyword,.swagger-section pre .markdown .strong,.swagger-section pre .phpdoc,.swagger-section pre .request,.swagger-section pre .smalltalk .class,.swagger-section pre .status,.swagger-section pre .tex .command,.swagger-section pre .title,.swagger-section pre .winutils,.swagger-section pre .yardoctag{font-weight:700}.swagger-section pre .markdown .emphasis{font-style:italic}.swagger-section pre .nginx .built_in{font-weight:400}.swagger-section pre .coffeescript .javascript,.swagger-section pre .javascript .xml,.swagger-section pre .tex .formula,.swagger-section pre .xml .cdata,.swagger-section pre .xml .css,.swagger-section pre .xml .javascript,.swagger-section pre .xml .vbscript{opacity:.5}.swagger-section .hljs{display:block;overflow-x:auto;padding:.5em;background:#f0f0f0}.swagger-section .hljs,.swagger-section .hljs-subst{color:#444}.swagger-section .hljs-attribute,.swagger-section .hljs-doctag,.swagger-section .hljs-keyword,.swagger-section .hljs-meta-keyword,.swagger-section .hljs-name,.swagger-section .hljs-selector-tag{font-weight:700}.swagger-section .hljs-addition,.swagger-section .hljs-built_in,.swagger-section .hljs-bullet,.swagger-section .hljs-code,.swagger-section .hljs-literal{color:#1f811f}.swagger-section .hljs-link,.swagger-section .hljs-regexp,.swagger-section .hljs-selector-attr,.swagger-section .hljs-selector-pseudo,.swagger-section .hljs-symbol,.swagger-section .hljs-template-variable,.swagger-section .hljs-variable{color:#bc6060}.swagger-section .hljs-deletion,.swagger-section .hljs-number,.swagger-section .hljs-quote,.swagger-section .hljs-selector-class,.swagger-section .hljs-selector-id,.swagger-section .hljs-string,.swagger-section .hljs-template-tag,.swagger-section .hljs-type{color:#800}.swagger-section .hljs-section,.swagger-section .hljs-title{color:#800;font-weight:700}.swagger-section .hljs-comment{color:#888}.swagger-section .hljs-meta{color:#2b6ea1}.swagger-section .hljs-emphasis{font-style:italic}.swagger-section .hljs-strong{font-weight:700}.swagger-section .swagger-ui-wrap{line-height:1;font-family:Droid Sans,sans-serif;min-width:760px;max-width:960px;margin-left:auto;margin-right:auto}.swagger-section .swagger-ui-wrap b,.swagger-section .swagger-ui-wrap strong{font-family:Droid Sans,sans-serif;font-weight:700}.swagger-section .swagger-ui-wrap blockquote,.swagger-section .swagger-ui-wrap q{quotes:none}.swagger-section .swagger-ui-wrap p{line-height:1.4em;padding:0 0 10px;color:#333}.swagger-section .swagger-ui-wrap blockquote:after,.swagger-section .swagger-ui-wrap blockquote:before,.swagger-section .swagger-ui-wrap q:after,.swagger-section .swagger-ui-wrap q:before{content:none}.swagger-section .swagger-ui-wrap .heading_with_menu h1,.swagger-section .swagger-ui-wrap .heading_with_menu h2,.swagger-section .swagger-ui-wrap .heading_with_menu h3,.swagger-section .swagger-ui-wrap .heading_with_menu h4,.swagger-section .swagger-ui-wrap .heading_with_menu h5,.swagger-section .swagger-ui-wrap .heading_with_menu h6{display:block;clear:none;float:left;-ms-box-sizing:border-box;box-sizing:border-box;width:60%}.swagger-section .swagger-ui-wrap table{border-collapse:collapse;border-spacing:0}.swagger-section .swagger-ui-wrap table thead tr th{padding:5px;font-size:.9em;color:#666;border-bottom:1px solid #999}.swagger-section .swagger-ui-wrap table tbody tr:last-child td{border-bottom:none}.swagger-section .swagger-ui-wrap table tbody tr.offset{background-color:#f0f0f0}.swagger-section .swagger-ui-wrap table tbody tr td{padding:6px;font-size:.9em;border-bottom:1px solid #ccc;vertical-align:top;line-height:1.3em}.swagger-section .swagger-ui-wrap ol{margin:0 0 10px;padding:0 0 0 18px;list-style-type:decimal}.swagger-section .swagger-ui-wrap ol li{padding:5px 0;font-size:.9em;color:#333}.swagger-section .swagger-ui-wrap ol,.swagger-section .swagger-ui-wrap ul{list-style:none}.swagger-section .swagger-ui-wrap h1 a,.swagger-section .swagger-ui-wrap h2 a,.swagger-section .swagger-ui-wrap h3 a,.swagger-section .swagger-ui-wrap h4 a,.swagger-section .swagger-ui-wrap h5 a,.swagger-section .swagger-ui-wrap h6 a{text-decoration:none}.swagger-section .swagger-ui-wrap h1 a:hover,.swagger-section .swagger-ui-wrap h2 a:hover,.swagger-section .swagger-ui-wrap h3 a:hover,.swagger-section .swagger-ui-wrap h4 a:hover,.swagger-section .swagger-ui-wrap h5 a:hover,.swagger-section .swagger-ui-wrap h6 a:hover{text-decoration:underline}.swagger-section .swagger-ui-wrap h1 span.divider,.swagger-section .swagger-ui-wrap h2 span.divider,.swagger-section .swagger-ui-wrap h3 span.divider,.swagger-section .swagger-ui-wrap h4 span.divider,.swagger-section .swagger-ui-wrap h5 span.divider,.swagger-section .swagger-ui-wrap h6 span.divider{color:#aaa}.swagger-section .swagger-ui-wrap a{color:#547f00}.swagger-section .swagger-ui-wrap a img{border:none}.swagger-section .swagger-ui-wrap article,.swagger-section .swagger-ui-wrap aside,.swagger-section .swagger-ui-wrap details,.swagger-section .swagger-ui-wrap figcaption,.swagger-section .swagger-ui-wrap figure,.swagger-section .swagger-ui-wrap footer,.swagger-section .swagger-ui-wrap header,.swagger-section .swagger-ui-wrap hgroup,.swagger-section .swagger-ui-wrap menu,.swagger-section .swagger-ui-wrap nav,.swagger-section .swagger-ui-wrap section,.swagger-section .swagger-ui-wrap summary{display:block}.swagger-section .swagger-ui-wrap pre{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;background-color:#fcf6db;border:1px solid #e5e0c6;padding:10px}.swagger-section .swagger-ui-wrap pre code{line-height:1.6em;background:none}.swagger-section .swagger-ui-wrap .content>.content-type>div>label{clear:both;display:block;color:#0f6ab4;font-size:1.1em;margin:0;padding:15px 0 5px}.swagger-section .swagger-ui-wrap .content pre{font-size:12px;margin-top:5px;padding:5px}.swagger-section .swagger-ui-wrap .icon-btn{cursor:pointer}.swagger-section .swagger-ui-wrap .info_title{padding-bottom:10px;font-weight:700;font-size:25px}.swagger-section .swagger-ui-wrap .footer{margin-top:20px}.swagger-section .swagger-ui-wrap div.big p,.swagger-section .swagger-ui-wrap p.big{font-size:1em;margin-bottom:10px}.swagger-section .swagger-ui-wrap form.fullwidth ol li.numeric input,.swagger-section .swagger-ui-wrap form.fullwidth ol li.string input,.swagger-section .swagger-ui-wrap form.fullwidth ol li.text textarea,.swagger-section .swagger-ui-wrap form.fullwidth ol li.url input{width:500px!important}.swagger-section .swagger-ui-wrap .info_license,.swagger-section .swagger-ui-wrap .info_tos{padding-bottom:5px}.swagger-section .swagger-ui-wrap .message-fail{color:#c00}.swagger-section .swagger-ui-wrap .info_email,.swagger-section .swagger-ui-wrap .info_name,.swagger-section .swagger-ui-wrap .info_url{padding-bottom:5px}.swagger-section .swagger-ui-wrap .info_description{padding-bottom:10px;font-size:15px}.swagger-section .swagger-ui-wrap .markdown ol li,.swagger-section .swagger-ui-wrap .markdown ul li{padding:3px 0;line-height:1.4em;color:#333}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input,.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input,.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input{display:block;padding:4px;width:auto;clear:both}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input.title,.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input.title,.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input.title{font-size:1.3em}.swagger-section .swagger-ui-wrap table.fullwidth{width:100%}.swagger-section .swagger-ui-wrap .model-signature{font-family:Droid Sans,sans-serif;font-size:1em;line-height:1.5em}.swagger-section .swagger-ui-wrap .model-signature .signature-nav a{text-decoration:none;color:#aaa}.swagger-section .swagger-ui-wrap .model-signature .signature-nav a:hover{text-decoration:underline;color:#000}.swagger-section .swagger-ui-wrap .model-signature .signature-nav .selected{color:#000;text-decoration:none}.swagger-section .swagger-ui-wrap .model-signature .propType{color:#55a}.swagger-section .swagger-ui-wrap .model-signature pre:hover{background-color:#ffd}.swagger-section .swagger-ui-wrap .model-signature pre{font-size:.85em;line-height:1.2em;overflow:auto;height:200px;resize:vertical;cursor:pointer}.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav{display:block;min-width:230px;margin:0;padding:0}.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li:last-child{padding-right:0;border-right:none}.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li{float:left;margin:0 5px 5px 0;padding:2px 5px 2px 0;border-right:1px solid #ddd}.swagger-section .swagger-ui-wrap .model-signature .propOpt{color:#555}.swagger-section .swagger-ui-wrap .model-signature .snippet small{font-size:.75em}.swagger-section .swagger-ui-wrap .model-signature .propOptKey{font-style:italic}.swagger-section .swagger-ui-wrap .model-signature .description .strong{font-weight:700;color:#000;font-size:.9em}.swagger-section .swagger-ui-wrap .model-signature .description div{font-size:.9em;line-height:1.5em;margin-left:1em}.swagger-section .swagger-ui-wrap .model-signature .description .stronger{font-weight:700;color:#000}.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper{border-spacing:0;position:absolute;background-color:#fff;border:1px solid #bbb;display:none;font-size:11px;max-width:400px;line-height:30px;color:#000;padding:5px;margin-left:10px}.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper th{text-align:center;background-color:#eee;border:1px solid #bbb;font-size:11px;color:#666;font-weight:700;padding:5px;line-height:15px}.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName{font-weight:700}.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown>p:first-child,.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown>p:last-child{display:inline}.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown>p:not(:first-child):before{display:block;content:''}.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown>p:only-child{margin-right:-3px}.swagger-section .swagger-ui-wrap .model-signature .propName{font-weight:700}.swagger-section .swagger-ui-wrap .model-signature .signature-container{clear:both}.swagger-section .swagger-ui-wrap .body-textarea{width:300px;height:100px;border:1px solid #aaa}.swagger-section .swagger-ui-wrap .markdown li code,.swagger-section .swagger-ui-wrap .markdown p code{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;background-color:#f0f0f0;color:#000;padding:1px 3px}.swagger-section .swagger-ui-wrap .required{font-weight:700}.swagger-section .swagger-ui-wrap .editor_holder{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;font-size:.9em}.swagger-section .swagger-ui-wrap .editor_holder label{font-weight:400!important}.swagger-section .swagger-ui-wrap .editor_holder label.required{font-weight:700!important}.swagger-section .swagger-ui-wrap input.parameter{width:300px;border:1px solid #aaa}.swagger-section .swagger-ui-wrap h1{color:#000;font-size:1.5em;line-height:1.3em;padding:10px 0;font-family:Droid Sans,sans-serif;font-weight:700}.swagger-section .swagger-ui-wrap .heading_with_menu{float:none;clear:both;overflow:hidden;display:block}.swagger-section .swagger-ui-wrap .heading_with_menu ul{display:block;clear:none;float:right;-ms-box-sizing:border-box;box-sizing:border-box;margin-top:10px}.swagger-section .swagger-ui-wrap h2{color:#000;font-size:1.3em;padding:10px 0}.swagger-section .swagger-ui-wrap h2 a{color:#000}.swagger-section .swagger-ui-wrap h2 span.sub{font-size:.7em;color:#999;font-style:italic}.swagger-section .swagger-ui-wrap h2 span.sub a{color:#777}.swagger-section .swagger-ui-wrap span.weak{color:#666}.swagger-section .swagger-ui-wrap .message-success{color:#89bf04}.swagger-section .swagger-ui-wrap caption,.swagger-section .swagger-ui-wrap td,.swagger-section .swagger-ui-wrap th{text-align:left;font-weight:400;vertical-align:middle}.swagger-section .swagger-ui-wrap .code{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.text textarea{font-family:Droid Sans,sans-serif;height:250px;padding:4px;display:block;clear:both}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.select select{display:block;clear:both}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean{float:none;clear:both;overflow:hidden;display:block}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean label{display:block;float:left;clear:none;margin:0;padding:0}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean input{display:block;float:left;clear:none;margin:0 5px 0 0}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.required label{color:#000}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label{display:block;clear:both;width:auto;padding:0 0 3px;color:#666}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label abbr{padding-left:3px;color:#888}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li p.inline-hints{margin-left:0;font-style:italic;font-size:.9em;margin:0}.swagger-section .swagger-ui-wrap form.formtastic fieldset.buttons{margin:0;padding:0}.swagger-section .swagger-ui-wrap span.blank,.swagger-section .swagger-ui-wrap span.empty{color:#888;font-style:italic}.swagger-section .swagger-ui-wrap .markdown h3{color:#547f00}.swagger-section .swagger-ui-wrap .markdown h4{color:#666}.swagger-section .swagger-ui-wrap .markdown pre{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;background-color:#fcf6db;border:1px solid #e5e0c6;padding:10px;margin:0 0 10px}.swagger-section .swagger-ui-wrap .markdown pre code{line-height:1.6em;overflow:auto}.swagger-section .swagger-ui-wrap div.gist{margin:20px 0 25px!important}.swagger-section .swagger-ui-wrap ul#resources{font-family:Droid Sans,sans-serif;font-size:.9em}.swagger-section .swagger-ui-wrap ul#resources li.resource{border-bottom:1px solid #ddd}.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading h2 a,.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading h2 a{color:#000}.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading ul.options li a,.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading ul.options li a{color:#555}.swagger-section .swagger-ui-wrap ul#resources li.resource:last-child{border-bottom:none}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading{border:1px solid transparent;float:none;clear:both;overflow:hidden;display:block}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options{overflow:hidden;padding:0;display:block;clear:none;float:right;margin:14px 10px 0 0}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li{float:left;clear:none;margin:0;padding:2px 10px;border-right:1px solid #ddd;color:#666;font-size:.9em}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a{color:#aaa;text-decoration:none}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover{text-decoration:underline;color:#000}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a.active,.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:active,.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover{text-decoration:underline}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.first,.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:first-child{padding-left:0}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:last-child{padding-right:0;border-right:none}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options.first,.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options:first-child{padding-left:0}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2{color:#999;padding-left:0;display:block;clear:none;float:left;font-family:Droid Sans,sans-serif;font-weight:700}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a{color:#999}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover{color:#000}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation{float:none;clear:both;overflow:hidden;display:block;margin:0 0 10px;padding:0}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading{float:none;clear:both;overflow:hidden;display:block;margin:0;padding:0}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3{display:block;clear:none;float:left;width:auto;margin:0;padding:0;line-height:1.1em;color:#000}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path{padding-left:10px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a{color:#000;text-decoration:none}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a.toggleOperation.deprecated{text-decoration:line-through}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a:hover{text-decoration:underline}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.http_method a{text-transform:uppercase;text-decoration:none;color:#fff;display:inline-block;width:50px;font-size:.7em;text-align:center;padding:7px 0 4px;border-radius:2px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span{margin:0;padding:0}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options{overflow:hidden;padding:0;display:block;clear:none;float:right;margin:6px 10px 0 0}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li{float:left;clear:none;margin:0;padding:2px 10px;font-size:.9em}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a{text-decoration:none}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a .markdown p{color:inherit;padding:0;line-height:inherit}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a .nickname{color:#aaa;padding:0;line-height:inherit}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li.access{color:#000}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content{border-top:none;padding:10px;border-bottom-left-radius:6px;border-bottom-right-radius:6px;margin:0 0 20px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content h4{font-size:1.1em;margin:0;padding:15px 0 5px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header{float:none;clear:both;overflow:hidden;display:block}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header a{padding:4px 0 0 10px;display:inline-block;font-size:.9em}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit{display:block;clear:none;float:left;padding:6px 8px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber{background-image:url(../images/throbber.gif);width:128px;height:16px;display:block;clear:none;float:right}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type=text].error{outline:2px solid #000;outline-color:#c00}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name=parameterContentType]{max-width:300px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;padding:10px;font-size:.9em;max-height:400px;overflow-y:auto}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading{background-color:#f9f2e9;border:1px solid #f0e0ca}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a{background-color:#c5862b}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#f0e0ca;color:#c5862b}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a{color:#c5862b}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content{background-color:#faf5ee;border:1px solid #f0e0ca}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4{color:#c5862b}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a{color:#dcb67f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading{background-color:#fcffcd;border:1px solid #000;border-color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading h3 span.http_method a{text-transform:uppercase;background-color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#ffd20f;color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li a{color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content{background-color:#fcffcd;border:1px solid #000;border-color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content h4{color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content div.sandbox_header a{color:#6fc992}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading{background-color:#f5e8e8;border:1px solid #e8c6c7}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a{text-transform:uppercase;background-color:#a41e22}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#e8c6c7;color:#a41e22}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a{color:#a41e22}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content{background-color:#f7eded;border:1px solid #e8c6c7}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4{color:#a41e22}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a{color:#c8787a}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading{background-color:#e7f6ec;border:1px solid #c3e8d1}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a{background-color:#10a54a}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#c3e8d1;color:#10a54a}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a{color:#10a54a}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content{background-color:#ebf7f0;border:1px solid #c3e8d1}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4{color:#10a54a}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a{color:#6fc992}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading{background-color:#fce9e3;border:1px solid #f5d5c3}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a{background-color:#d38042}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#f0cecb;color:#d38042}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a{color:#d38042}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content{background-color:#faf0ef;border:1px solid #f0cecb}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4{color:#d38042}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a{color:#dcb67f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading{background-color:#e7f0f7;border:1px solid #c3d9ec}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a{background-color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#c3d9ec;color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a{color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content{background-color:#ebf3f9;border:1px solid #c3d9ec}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4{color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a{color:#6fa5d2}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading{background-color:#e7f0f7;border:1px solid #c3d9ec}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading h3 span.http_method a{background-color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#c3d9ec;color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li a{color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content{background-color:#ebf3f9;border:1px solid #c3d9ec}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content h4{color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content div.sandbox_header a{color:#6fa5d2}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content{border-top:none}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li:last-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child{padding-right:0;border-right:none}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a.active,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:active,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:hover{text-decoration:underline}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations.first,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations:first-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li.first,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li:first-child{padding-left:0}.swagger-section .swagger-ui-wrap p#colophon{margin:0 15px 40px;padding:10px 0;font-size:.8em;border-top:1px solid #ddd;font-family:Droid Sans,sans-serif;color:#999;font-style:italic}.swagger-section .swagger-ui-wrap p#colophon a{text-decoration:none;color:#547f00}.swagger-section .swagger-ui-wrap h3{color:#000;font-size:1.1em;padding:10px 0}.swagger-section .swagger-ui-wrap .markdown ol,.swagger-section .swagger-ui-wrap .markdown ul{font-family:Droid Sans,sans-serif;margin:5px 0 10px;padding:0 0 0 18px;list-style-type:disc}.swagger-section .swagger-ui-wrap form.form_box{background-color:#ebf3f9;border:1px solid #c3d9ec;padding:10px}.swagger-section .swagger-ui-wrap form.form_box label{color:#0f6ab4!important}.swagger-section .swagger-ui-wrap form.form_box input[type=submit]{display:block;padding:10px}.swagger-section .swagger-ui-wrap form.form_box p.weak{font-size:.8em}.swagger-section .swagger-ui-wrap form.form_box p{font-size:.9em;padding:0 0 15px;color:#7e7b6d}.swagger-section .swagger-ui-wrap form.form_box p a{color:#646257}.swagger-section .swagger-ui-wrap form.form_box p strong{color:#000}.swagger-section .swagger-ui-wrap .operation-status td.markdown>p:last-child{padding-bottom:0}.swagger-section .title{font-style:bold}.swagger-section .secondary_form{display:none}.swagger-section .main_image{display:block;margin-left:auto;margin-right:auto}.swagger-section .oauth_body{margin-left:100px;margin-right:100px}.swagger-section .oauth_submit{text-align:center;display:inline-block}.swagger-section .authorize-wrapper{margin:15px 0 10px}.swagger-section .authorize-wrapper_operation{float:right}.swagger-section .authorize__btn:hover{text-decoration:underline;cursor:pointer}.swagger-section .authorize__btn_operation:hover .authorize-scopes{display:block}.swagger-section .authorize-scopes{position:absolute;margin-top:20px;background:#fff;border:1px solid #ccc;border-radius:5px;display:none;font-size:13px;max-width:300px;line-height:30px;color:#000;padding:5px}.swagger-section .authorize-scopes .authorize__scope{text-decoration:none}.swagger-section .authorize__btn_operation{height:18px;vertical-align:middle;display:inline-block;background:url(../images/explorer_icons.png) no-repeat}.swagger-section .authorize__btn_operation_login{background-position:0 0;width:18px;margin-top:-6px;margin-left:4px}.swagger-section .authorize__btn_operation_logout{background-position:-30px 0;width:18px;margin-top:-6px;margin-left:4px}.swagger-section #auth_container{color:#fff;display:inline-block;border:none;padding:5px;width:87px;height:13px}.swagger-section #auth_container .authorize__btn{color:#fff}.swagger-section .auth_container{padding:0 0 10px;margin-bottom:5px;border-bottom:1px solid #ccc;font-size:.9em}.swagger-section .auth_container .auth__title{color:#547f00;font-size:1.2em}.swagger-section .auth_container .basic_auth__label{display:inline-block;width:60px}.swagger-section .auth_container .auth__description{color:#999;margin-bottom:5px}.swagger-section .auth_container .auth__button{margin-top:10px;height:30px}.swagger-section .auth_container .key_auth__field{margin:5px 0}.swagger-section .auth_container .key_auth__label{display:inline-block;width:60px}.swagger-section .api-popup-dialog{position:absolute;display:none}.swagger-section .api-popup-dialog-wrapper{z-index:2;width:500px;background:#fff;padding:20px;border:1px solid #ccc;border-radius:5px;font-size:13px;color:#777;position:fixed;top:50%;left:50%;transform:translate(-50%,-50%)}.swagger-section .api-popup-dialog-shadow{position:fixed;top:0;left:0;width:100%;height:100%;opacity:.2;background-color:gray;z-index:1}.swagger-section .api-popup-dialog .api-popup-title{font-size:24px;padding:10px 0}.swagger-section .api-popup-dialog .error-msg{padding-left:5px;padding-bottom:5px}.swagger-section .api-popup-dialog .api-popup-content{max-height:500px;overflow-y:auto}.swagger-section .api-popup-dialog .api-popup-authbtn,.swagger-section .api-popup-dialog .api-popup-cancel{height:30px}.swagger-section .api-popup-scopes{padding:10px 20px}.swagger-section .api-popup-scopes li{padding:5px 0;line-height:20px}.swagger-section .api-popup-scopes li input{position:relative;top:2px}.swagger-section .api-popup-scopes .api-scope-desc{padding-left:20px;font-style:italic}.swagger-section .api-popup-actions{padding-top:10px}.swagger-section fieldset{padding-bottom:10px;padding-left:20px}#header{display:none}.swagger-section .swagger-ui-wrap .model-signature pre{max-height:none}.swagger-section .swagger-ui-wrap .body-textarea,.swagger-section .swagger-ui-wrap input.parameter{width:100px}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options{display:none}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content{display:block!important}
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/reset.css b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/reset.css
index b2b078943c4..40dc8301c57 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/reset.css
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/reset.css
@@ -1,125 +1 @@
-/* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 */
-html,
-body,
-div,
-span,
-applet,
-object,
-iframe,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-big,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-ins,
-kbd,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-b,
-u,
-i,
-center,
-dl,
-dt,
-dd,
-ol,
-ul,
-li,
-fieldset,
-form,
-label,
-legend,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td,
-article,
-aside,
-canvas,
-details,
-embed,
-figure,
-figcaption,
-footer,
-header,
-hgroup,
-menu,
-nav,
-output,
-ruby,
-section,
-summary,
-time,
-mark,
-audio,
-video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-menu,
-nav,
-section {
-  display: block;
-}
-body {
-  line-height: 1;
-}
-ol,
-ul {
-  list-style: none;
-}
-blockquote,
-q {
-  quotes: none;
-}
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
-  content: '';
-  content: none;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
+a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}table{border-collapse:collapse;border-spacing:0}
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
index ea3a4153c15..1f069f6abe3 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
@@ -1,1304 +1 @@
-/* Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org> */
-.swagger-section pre code {
-  display: block;
-  padding: 0.5em;
-  background: #F0F0F0;
-}
-.swagger-section pre code,
-.swagger-section pre .subst,
-.swagger-section pre .tag .title,
-.swagger-section pre .lisp .title,
-.swagger-section pre .clojure .built_in,
-.swagger-section pre .nginx .title {
-  color: black;
-}
-.swagger-section pre .string,
-.swagger-section pre .title,
-.swagger-section pre .constant,
-.swagger-section pre .parent,
-.swagger-section pre .tag .value,
-.swagger-section pre .rules .value,
-.swagger-section pre .rules .value .number,
-.swagger-section pre .preprocessor,
-.swagger-section pre .ruby .symbol,
-.swagger-section pre .ruby .symbol .string,
-.swagger-section pre .aggregate,
-.swagger-section pre .template_tag,
-.swagger-section pre .django .variable,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .addition,
-.swagger-section pre .flow,
-.swagger-section pre .stream,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .apache .cbracket,
-.swagger-section pre .tex .command,
-.swagger-section pre .tex .special,
-.swagger-section pre .erlang_repl .function_or_atom,
-.swagger-section pre .markdown .header {
-  color: #800;
-}
-.swagger-section pre .comment,
-.swagger-section pre .annotation,
-.swagger-section pre .template_comment,
-.swagger-section pre .diff .header,
-.swagger-section pre .chunk,
-.swagger-section pre .markdown .blockquote {
-  color: #888;
-}
-.swagger-section pre .number,
-.swagger-section pre .date,
-.swagger-section pre .regexp,
-.swagger-section pre .literal,
-.swagger-section pre .smalltalk .symbol,
-.swagger-section pre .smalltalk .char,
-.swagger-section pre .go .constant,
-.swagger-section pre .change,
-.swagger-section pre .markdown .bullet,
-.swagger-section pre .markdown .link_url {
-  color: #080;
-}
-.swagger-section pre .label,
-.swagger-section pre .javadoc,
-.swagger-section pre .ruby .string,
-.swagger-section pre .decorator,
-.swagger-section pre .filter .argument,
-.swagger-section pre .localvars,
-.swagger-section pre .array,
-.swagger-section pre .attr_selector,
-.swagger-section pre .important,
-.swagger-section pre .pseudo,
-.swagger-section pre .pi,
-.swagger-section pre .doctype,
-.swagger-section pre .deletion,
-.swagger-section pre .envvar,
-.swagger-section pre .shebang,
-.swagger-section pre .apache .sqbracket,
-.swagger-section pre .nginx .built_in,
-.swagger-section pre .tex .formula,
-.swagger-section pre .erlang_repl .reserved,
-.swagger-section pre .prompt,
-.swagger-section pre .markdown .link_label,
-.swagger-section pre .vhdl .attribute,
-.swagger-section pre .clojure .attribute,
-.swagger-section pre .coffeescript .property {
-  color: #8888ff;
-}
-.swagger-section pre .keyword,
-.swagger-section pre .id,
-.swagger-section pre .phpdoc,
-.swagger-section pre .title,
-.swagger-section pre .built_in,
-.swagger-section pre .aggregate,
-.swagger-section pre .css .tag,
-.swagger-section pre .javadoctag,
-.swagger-section pre .phpdoc,
-.swagger-section pre .yardoctag,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .winutils,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .go .typename,
-.swagger-section pre .tex .command,
-.swagger-section pre .markdown .strong,
-.swagger-section pre .request,
-.swagger-section pre .status {
-  font-weight: bold;
-}
-.swagger-section pre .markdown .emphasis {
-  font-style: italic;
-}
-.swagger-section pre .nginx .built_in {
-  font-weight: normal;
-}
-.swagger-section pre .coffeescript .javascript,
-.swagger-section pre .javascript .xml,
-.swagger-section pre .tex .formula,
-.swagger-section pre .xml .javascript,
-.swagger-section pre .xml .vbscript,
-.swagger-section pre .xml .css,
-.swagger-section pre .xml .cdata {
-  opacity: 0.5;
-}
-.swagger-section .swagger-ui-wrap {
-  line-height: 1;
-  font-family: "Droid Sans", sans-serif;
-  max-width: 960px;
-  margin-left: auto;
-  margin-right: auto;
-  /* JSONEditor specific styling */
-}
-.swagger-section .swagger-ui-wrap b,
-.swagger-section .swagger-ui-wrap strong {
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap q,
-.swagger-section .swagger-ui-wrap blockquote {
-  quotes: none;
-}
-.swagger-section .swagger-ui-wrap p {
-  line-height: 1.4em;
-  padding: 0 0 10px;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap q:before,
-.swagger-section .swagger-ui-wrap q:after,
-.swagger-section .swagger-ui-wrap blockquote:before,
-.swagger-section .swagger-ui-wrap blockquote:after {
-  content: none;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu h1,
-.swagger-section .swagger-ui-wrap .heading_with_menu h2,
-.swagger-section .swagger-ui-wrap .heading_with_menu h3,
-.swagger-section .swagger-ui-wrap .heading_with_menu h4,
-.swagger-section .swagger-ui-wrap .heading_with_menu h5,
-.swagger-section .swagger-ui-wrap .heading_with_menu h6 {
-  display: block;
-  clear: none;
-  float: left;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 60%;
-}
-.swagger-section .swagger-ui-wrap table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.swagger-section .swagger-ui-wrap table thead tr th {
-  padding: 5px;
-  font-size: 0.9em;
-  color: #666666;
-  border-bottom: 1px solid #999999;
-}
-.swagger-section .swagger-ui-wrap table tbody tr:last-child td {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap table tbody tr.offset {
-  background-color: #f0f0f0;
-}
-.swagger-section .swagger-ui-wrap table tbody tr td {
-  padding: 6px;
-  font-size: 0.9em;
-  border-bottom: 1px solid #cccccc;
-  vertical-align: top;
-  line-height: 1.3em;
-}
-.swagger-section .swagger-ui-wrap ol {
-  margin: 0px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: decimal;
-}
-.swagger-section .swagger-ui-wrap ol li {
-  padding: 5px 0px;
-  font-size: 0.9em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap ol,
-.swagger-section .swagger-ui-wrap ul {
-  list-style: none;
-}
-.swagger-section .swagger-ui-wrap h1 a,
-.swagger-section .swagger-ui-wrap h2 a,
-.swagger-section .swagger-ui-wrap h3 a,
-.swagger-section .swagger-ui-wrap h4 a,
-.swagger-section .swagger-ui-wrap h5 a,
-.swagger-section .swagger-ui-wrap h6 a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap h1 a:hover,
-.swagger-section .swagger-ui-wrap h2 a:hover,
-.swagger-section .swagger-ui-wrap h3 a:hover,
-.swagger-section .swagger-ui-wrap h4 a:hover,
-.swagger-section .swagger-ui-wrap h5 a:hover,
-.swagger-section .swagger-ui-wrap h6 a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap h1 span.divider,
-.swagger-section .swagger-ui-wrap h2 span.divider,
-.swagger-section .swagger-ui-wrap h3 span.divider,
-.swagger-section .swagger-ui-wrap h4 span.divider,
-.swagger-section .swagger-ui-wrap h5 span.divider,
-.swagger-section .swagger-ui-wrap h6 span.divider {
-  color: #aaaaaa;
-}
-.swagger-section .swagger-ui-wrap a {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap a img {
-  border: none;
-}
-.swagger-section .swagger-ui-wrap article,
-.swagger-section .swagger-ui-wrap aside,
-.swagger-section .swagger-ui-wrap details,
-.swagger-section .swagger-ui-wrap figcaption,
-.swagger-section .swagger-ui-wrap figure,
-.swagger-section .swagger-ui-wrap footer,
-.swagger-section .swagger-ui-wrap header,
-.swagger-section .swagger-ui-wrap hgroup,
-.swagger-section .swagger-ui-wrap menu,
-.swagger-section .swagger-ui-wrap nav,
-.swagger-section .swagger-ui-wrap section,
-.swagger-section .swagger-ui-wrap summary {
-  display: block;
-}
-.swagger-section .swagger-ui-wrap pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap pre code {
-  line-height: 1.6em;
-  background: none;
-}
-.swagger-section .swagger-ui-wrap .content > .content-type > div > label {
-  clear: both;
-  display: block;
-  color: #0F6AB4;
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap .content pre {
-  font-size: 12px;
-  margin-top: 5px;
-  padding: 5px;
-}
-.swagger-section .swagger-ui-wrap .icon-btn {
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .info_title {
-  padding-bottom: 10px;
-  font-weight: bold;
-  font-size: 25px;
-}
-.swagger-section .swagger-ui-wrap .footer {
-  margin-top: 20px;
-}
-.swagger-section .swagger-ui-wrap p.big,
-.swagger-section .swagger-ui-wrap div.big p {
-  font-size: 1em;
-  margin-bottom: 10px;
-}
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.string input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.url input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.text textarea,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.numeric input {
-  width: 500px !important;
-}
-.swagger-section .swagger-ui-wrap .info_license {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_tos {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .message-fail {
-  color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap .info_url {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_email {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_name {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_description {
-  padding-bottom: 10px;
-  font-size: 15px;
-}
-.swagger-section .swagger-ui-wrap .markdown ol li,
-.swagger-section .swagger-ui-wrap .markdown ul li {
-  padding: 3px 0px;
-  line-height: 1.4em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input {
-  display: block;
-  padding: 4px;
-  width: auto;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input.title {
-  font-size: 1.3em;
-}
-.swagger-section .swagger-ui-wrap table.fullwidth {
-  width: 100%;
-}
-.swagger-section .swagger-ui-wrap .model-signature {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 1em;
-  line-height: 1.5em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a {
-  text-decoration: none;
-  color: #AAA;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav .selected {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propType {
-  color: #5555aa;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre:hover {
-  background-color: #ffffdd;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre {
-  font-size: .85em;
-  line-height: 1.2em;
-  overflow: auto;
-  max-height: 400px;
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav {
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li:last-child {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li {
-  float: left;
-  margin: 0 5px 5px 0;
-  padding: 2px 5px 2px 0;
-  border-right: 1px solid #ddd;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOpt {
-  color: #555;
-}
-.swagger-section .swagger-ui-wrap .model-signature .snippet small {
-  font-size: 0.75em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOptKey {
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .strong {
-  font-weight: bold;
-  color: #000;
-  font-size: .9em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description div {
-  font-size: 0.9em;
-  line-height: 1.5em;
-  margin-left: 1em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .stronger {
-  font-weight: bold;
-  color: #000;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper {
-  border-spacing: 0;
-  position: absolute;
-  background-color: #ffffff;
-  border: 1px solid #bbbbbb;
-  display: none;
-  font-size: 11px;
-  max-width: 400px;
-  line-height: 30px;
-  color: black;
-  padding: 5px;
-  margin-left: 10px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper th {
-  text-align: center;
-  background-color: #eeeeee;
-  border: 1px solid #bbbbbb;
-  font-size: 11px;
-  color: #666666;
-  font-weight: bold;
-  padding: 5px;
-  line-height: 15px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:first-child,
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:last-child {
-  display: inline;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:not(:first-child):before {
-  display: block;
-  content: '';
-}
-.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown > p:only-child {
-  margin-right: -3px;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propName {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-container {
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap .body-textarea {
-  width: 300px;
-  height: 100px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap .markdown p code,
-.swagger-section .swagger-ui-wrap .markdown li code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #f0f0f0;
-  color: black;
-  padding: 1px 3px;
-}
-.swagger-section .swagger-ui-wrap .required {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .editor_holder {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap .editor_holder label {
-  font-weight: normal!important;
-  /* JSONEditor uses bold by default for all labels, we revert that back to normal to not give the impression that by default fields are required */
-}
-.swagger-section .swagger-ui-wrap .editor_holder label.required {
-  font-weight: bold!important;
-}
-.swagger-section .swagger-ui-wrap input.parameter {
-  width: 300px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap h1 {
-  color: black;
-  font-size: 1.5em;
-  line-height: 1.3em;
-  padding: 10px 0 10px 0;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu ul {
-  display: block;
-  clear: none;
-  float: right;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  margin-top: 10px;
-}
-.swagger-section .swagger-ui-wrap h2 {
-  color: black;
-  font-size: 1.3em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub {
-  font-size: 0.7em;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub a {
-  color: #777777;
-}
-.swagger-section .swagger-ui-wrap span.weak {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .message-success {
-  color: #89BF04;
-}
-.swagger-section .swagger-ui-wrap caption,
-.swagger-section .swagger-ui-wrap th,
-.swagger-section .swagger-ui-wrap td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-.swagger-section .swagger-ui-wrap .code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.text textarea {
-  font-family: "Droid Sans", sans-serif;
-  height: 250px;
-  padding: 4px;
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.select select {
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean label {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean input {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0 5px 0 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.required label {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label {
-  display: block;
-  clear: both;
-  width: auto;
-  padding: 0 0 3px;
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label abbr {
-  padding-left: 3px;
-  color: #888888;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li p.inline-hints {
-  margin-left: 0;
-  font-style: italic;
-  font-size: 0.9em;
-  margin: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.buttons {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap span.blank,
-.swagger-section .swagger-ui-wrap span.empty {
-  color: #888888;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .markdown h3 {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap .markdown h4 {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .markdown pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-  margin: 0 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown pre code {
-  line-height: 1.6em;
-}
-.swagger-section .swagger-ui-wrap div.gist {
-  margin: 20px 0 25px 0 !important;
-}
-.swagger-section .swagger-ui-wrap ul#resources {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource {
-  border-bottom: 1px solid #dddddd;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading h2 a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading ul.options li a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading ul.options li a {
-  color: #555555;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:last-child {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading {
-  border: 1px solid transparent;
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 14px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  border-right: 1px solid #dddddd;
-  color: #666666;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a {
-  color: #aaaaaa;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
-  color: #999999;
-  padding-left: 0;
-  display: block;
-  clear: none;
-  float: left;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
-  color: #999999;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0 0 10px;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 {
-  display: block;
-  clear: none;
-  float: left;
-  width: auto;
-  margin: 0;
-  padding: 0;
-  line-height: 1.1em;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path {
-  padding-left: 10px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  text-decoration: none;
-  color: white;
-  display: inline-block;
-  width: 50px;
-  font-size: 0.7em;
-  text-align: center;
-  padding: 7px 0 4px;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  -o-border-radius: 2px;
-  -ms-border-radius: 2px;
-  -khtml-border-radius: 2px;
-  border-radius: 2px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 6px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li.access {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content {
-  border-top: none;
-  padding: 10px;
-  -moz-border-radius-bottomleft: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-  -o-border-bottom-left-radius: 6px;
-  -ms-border-bottom-left-radius: 6px;
-  -khtml-border-bottom-left-radius: 6px;
-  border-bottom-left-radius: 6px;
-  -moz-border-radius-bottomright: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-  -o-border-bottom-right-radius: 6px;
-  -ms-border-bottom-right-radius: 6px;
-  -khtml-border-bottom-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-  margin: 0 0 20px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content h4 {
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header a {
-  padding: 4px 0 0 10px;
-  display: inline-block;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit {
-  display: block;
-  clear: none;
-  float: left;
-  padding: 6px 8px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber {
-  background-image: url('../images/throbber.gif');
-  width: 128px;
-  height: 16px;
-  display: block;
-  clear: none;
-  float: right;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type='text'].error {
-  outline: 2px solid black;
-  outline-color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
-  max-width: 300px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  padding: 10px;
-  font-size: 0.9em;
-  max-height: 400px;
-  overflow-y: auto;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading {
-  background-color: #f9f2e9;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a {
-  background-color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0e0ca;
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content {
-  background-color: #faf5ee;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4 {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #ffd20f;
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li a {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content h4 {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading {
-  background-color: #f5e8e8;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #e8c6c7;
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  background-color: #f7eded;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4 {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a {
-  color: #c8787a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading {
-  background-color: #e7f6ec;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a {
-  background-color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3e8d1;
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content {
-  background-color: #ebf7f0;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4 {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading {
-  background-color: #FCE9E3;
-  border: 1px solid #F5D5C3;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a {
-  background-color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0cecb;
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content {
-  background-color: #faf0ef;
-  border: 1px solid #f0cecb;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4 {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  border-top: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap p#colophon {
-  margin: 0 15px 40px 15px;
-  padding: 10px 0;
-  font-size: 0.8em;
-  border-top: 1px solid #dddddd;
-  font-family: "Droid Sans", sans-serif;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap p#colophon a {
-  text-decoration: none;
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap h3 {
-  color: black;
-  font-size: 1.1em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown ol,
-.swagger-section .swagger-ui-wrap .markdown ul {
-  font-family: "Droid Sans", sans-serif;
-  margin: 5px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: disc;
-}
-.swagger-section .swagger-ui-wrap form.form_box {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box label {
-  color: #0f6ab4 !important;
-}
-.swagger-section .swagger-ui-wrap form.form_box input[type=submit] {
-  display: block;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box p.weak {
-  font-size: 0.8em;
-}
-.swagger-section .swagger-ui-wrap form.form_box p {
-  font-size: 0.9em;
-  padding: 0 0 15px;
-  color: #7e7b6d;
-}
-.swagger-section .swagger-ui-wrap form.form_box p a {
-  color: #646257;
-}
-.swagger-section .swagger-ui-wrap form.form_box p strong {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
-  padding-bottom: 0;
-}
-.swagger-section .title {
-  font-style: bold;
-}
-.swagger-section .secondary_form {
-  display: none;
-}
-.swagger-section .main_image {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-section .oauth_body {
-  margin-left: 100px;
-  margin-right: 100px;
-}
-.swagger-section .oauth_submit {
-  text-align: center;
-}
-.swagger-section .api-popup-dialog {
-  z-index: 10000;
-  position: absolute;
-  width: 500px;
-  background: #FFF;
-  padding: 20px;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  display: none;
-  font-size: 13px;
-  color: #777;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog .error-msg {
-  padding-left: 5px;
-  padding-bottom: 5px;
-}
-.swagger-section .api-popup-dialog .api-popup-authbtn {
-  height: 30px;
-}
-.swagger-section .api-popup-dialog .api-popup-cancel {
-  height: 30px;
-}
-.swagger-section .api-popup-scopes {
-  padding: 10px 20px;
-}
-.swagger-section .api-popup-scopes li {
-  padding: 5px 0;
-  line-height: 20px;
-}
-.swagger-section .api-popup-scopes li input {
-  position: relative;
-  top: 2px;
-}
-.swagger-section .api-popup-scopes .api-scope-desc {
-  padding-left: 20px;
-  font-style: italic;
-}
-.swagger-section .api-popup-actions {
-  padding-top: 10px;
-}
-.swagger-section .access {
-  float: right;
-}
-.swagger-section .auth {
-  float: right;
-}
-.swagger-section .api-ic {
-  height: 18px;
-  vertical-align: middle;
-  display: inline-block;
-  background: url(../images/explorer_icons.png) no-repeat;
-}
-.swagger-section .api-ic .api_information_panel {
-  position: relative;
-  margin-top: 20px;
-  margin-left: -5px;
-  background: #FFF;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  display: none;
-  font-size: 13px;
-  max-width: 300px;
-  line-height: 30px;
-  color: black;
-  padding: 5px;
-}
-.swagger-section .api-ic .api_information_panel p .api-msg-enabled {
-  color: green;
-}
-.swagger-section .api-ic .api_information_panel p .api-msg-disabled {
-  color: red;
-}
-.swagger-section .api-ic:hover .api_information_panel {
-  position: absolute;
-  display: block;
-}
-.swagger-section .ic-info {
-  background-position: 0 0;
-  width: 18px;
-  margin-top: -6px;
-  margin-left: 4px;
-}
-.swagger-section .ic-warning {
-  background-position: -60px 0;
-  width: 18px;
-  margin-top: -6px;
-  margin-left: 4px;
-}
-.swagger-section .ic-error {
-  background-position: -30px 0;
-  width: 18px;
-  margin-top: -6px;
-  margin-left: 4px;
-}
-.swagger-section .ic-off {
-  background-position: -90px 0;
-  width: 58px;
-  margin-top: -4px;
-  cursor: pointer;
-}
-.swagger-section .ic-on {
-  background-position: -160px 0;
-  width: 58px;
-  margin-top: -4px;
-  cursor: pointer;
-}
-.swagger-section #header {
-  background-color: rgb(163, 188, 210);
-  padding: 14px;
-}
-.swagger-section #input_baseUrl {
-  width: 400px;
-}
-.swagger-section #api_selector {
-  display: block;
-  clear: none;
-  float: right;
-}
-.swagger-section #api_selector .input {
-  display: block;
-  clear: none;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.swagger-section #api_selector input {
-  font-size: 0.9em;
-  padding: 3px;
-  margin: 0;
-}
-.swagger-section #input_apiKey {
-  width: 200px;
-}
-.swagger-section #explore {
-  display: block;
-  text-decoration: none;
-  font-weight: bold;
-  padding: 6px 8px;
-  font-size: 0.9em;
-  color: white;
-  background-color: #000000;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -o-border-radius: 4px;
-  -ms-border-radius: 4px;
-  -khtml-border-radius: 4px;
-  border-radius: 4px;
-}
-.swagger-section #explore:hover {
-  background-color: #a41e22;
-}
-.swagger-section #header #logo {
-  font-size: 1.5em;
-  font-weight: bold;
-  text-decoration: none;
-  background: transparent url(../../../../theme/eldy/img/favicon.ico) no-repeat left center;
-  padding: 20px 0 20px 40px;
-  color: white;
-}
-.swagger-section #content_message {
-  margin: 10px 15px;
-  font-style: italic;
-  color: #999999;
-}
-.swagger-section #message-bar {
-  min-height: 30px;
-  text-align: center;
-  padding-top: 10px;
-}
-.swagger-section .swagger-collapse:before {
-  content: "-";
-}
-.swagger-section .swagger-expand:before {
-  content: "+";
-}
-
-#input_baseUrl {
-  display: none;
-}
+.swagger-section pre code{display:block;padding:.5em;background:#f0f0f0}.swagger-section pre .clojure .built_in,.swagger-section pre .lisp .title,.swagger-section pre .nginx .title,.swagger-section pre .subst,.swagger-section pre .tag .title,.swagger-section pre code{color:#000}.swagger-section pre .addition,.swagger-section pre .aggregate,.swagger-section pre .apache .cbracket,.swagger-section pre .apache .tag,.swagger-section pre .bash .variable,.swagger-section pre .constant,.swagger-section pre .django .variable,.swagger-section pre .erlang_repl .function_or_atom,.swagger-section pre .flow,.swagger-section pre .markdown .header,.swagger-section pre .parent,.swagger-section pre .preprocessor,.swagger-section pre .ruby .symbol,.swagger-section pre .ruby .symbol .string,.swagger-section pre .rules .value,.swagger-section pre .rules .value .number,.swagger-section pre .smalltalk .class,.swagger-section pre .stream,.swagger-section pre .string,.swagger-section pre .tag .value,.swagger-section pre .template_tag,.swagger-section pre .tex .command,.swagger-section pre .tex .special,.swagger-section pre .title{color:#800}.swagger-section pre .annotation,.swagger-section pre .chunk,.swagger-section pre .comment,.swagger-section pre .diff .header,.swagger-section pre .markdown .blockquote,.swagger-section pre .template_comment{color:#888}.swagger-section pre .change,.swagger-section pre .date,.swagger-section pre .go .constant,.swagger-section pre .literal,.swagger-section pre .markdown .bullet,.swagger-section pre .markdown .link_url,.swagger-section pre .number,.swagger-section pre .regexp,.swagger-section pre .smalltalk .char,.swagger-section pre .smalltalk .symbol{color:#080}.swagger-section pre .apache .sqbracket,.swagger-section pre .array,.swagger-section pre .attr_selector,.swagger-section pre .clojure .attribute,.swagger-section pre .coffeescript .property,.swagger-section pre .decorator,.swagger-section pre .deletion,.swagger-section pre .doctype,.swagger-section pre .envvar,.swagger-section pre .erlang_repl .reserved,.swagger-section pre .filter .argument,.swagger-section pre .important,.swagger-section pre .javadoc,.swagger-section pre .label,.swagger-section pre .localvars,.swagger-section pre .markdown .link_label,.swagger-section pre .nginx .built_in,.swagger-section pre .pi,.swagger-section pre .prompt,.swagger-section pre .pseudo,.swagger-section pre .ruby .string,.swagger-section pre .shebang,.swagger-section pre .tex .formula,.swagger-section pre .vhdl .attribute{color:#88f}.swagger-section pre .aggregate,.swagger-section pre .apache .tag,.swagger-section pre .bash .variable,.swagger-section pre .built_in,.swagger-section pre .css .tag,.swagger-section pre .go .typename,.swagger-section pre .id,.swagger-section pre .javadoctag,.swagger-section pre .keyword,.swagger-section pre .markdown .strong,.swagger-section pre .phpdoc,.swagger-section pre .request,.swagger-section pre .smalltalk .class,.swagger-section pre .status,.swagger-section pre .tex .command,.swagger-section pre .title,.swagger-section pre .winutils,.swagger-section pre .yardoctag{font-weight:700}.swagger-section pre .markdown .emphasis{font-style:italic}.swagger-section pre .nginx .built_in{font-weight:400}.swagger-section pre .coffeescript .javascript,.swagger-section pre .javascript .xml,.swagger-section pre .tex .formula,.swagger-section pre .xml .cdata,.swagger-section pre .xml .css,.swagger-section pre .xml .javascript,.swagger-section pre .xml .vbscript{opacity:.5}.swagger-section .hljs{display:block;overflow-x:auto;padding:.5em;background:#f0f0f0}.swagger-section .hljs,.swagger-section .hljs-subst{color:#444}.swagger-section .hljs-attribute,.swagger-section .hljs-doctag,.swagger-section .hljs-keyword,.swagger-section .hljs-meta-keyword,.swagger-section .hljs-name,.swagger-section .hljs-selector-tag{font-weight:700}.swagger-section .hljs-addition,.swagger-section .hljs-built_in,.swagger-section .hljs-bullet,.swagger-section .hljs-code,.swagger-section .hljs-literal{color:#1f811f}.swagger-section .hljs-link,.swagger-section .hljs-regexp,.swagger-section .hljs-selector-attr,.swagger-section .hljs-selector-pseudo,.swagger-section .hljs-symbol,.swagger-section .hljs-template-variable,.swagger-section .hljs-variable{color:#bc6060}.swagger-section .hljs-deletion,.swagger-section .hljs-number,.swagger-section .hljs-quote,.swagger-section .hljs-selector-class,.swagger-section .hljs-selector-id,.swagger-section .hljs-string,.swagger-section .hljs-template-tag,.swagger-section .hljs-type{color:#800}.swagger-section .hljs-section,.swagger-section .hljs-title{color:#800;font-weight:700}.swagger-section .hljs-comment{color:#888}.swagger-section .hljs-meta{color:#2b6ea1}.swagger-section .hljs-emphasis{font-style:italic}.swagger-section .hljs-strong{font-weight:700}.swagger-section .swagger-ui-wrap{line-height:1;font-family:Droid Sans,sans-serif;min-width:760px;max-width:960px;margin-left:auto;margin-right:auto}.swagger-section .swagger-ui-wrap b,.swagger-section .swagger-ui-wrap strong{font-family:Droid Sans,sans-serif;font-weight:700}.swagger-section .swagger-ui-wrap blockquote,.swagger-section .swagger-ui-wrap q{quotes:none}.swagger-section .swagger-ui-wrap p{line-height:1.4em;padding:0 0 10px;color:#333}.swagger-section .swagger-ui-wrap blockquote:after,.swagger-section .swagger-ui-wrap blockquote:before,.swagger-section .swagger-ui-wrap q:after,.swagger-section .swagger-ui-wrap q:before{content:none}.swagger-section .swagger-ui-wrap .heading_with_menu h1,.swagger-section .swagger-ui-wrap .heading_with_menu h2,.swagger-section .swagger-ui-wrap .heading_with_menu h3,.swagger-section .swagger-ui-wrap .heading_with_menu h4,.swagger-section .swagger-ui-wrap .heading_with_menu h5,.swagger-section .swagger-ui-wrap .heading_with_menu h6{display:block;clear:none;float:left;-ms-box-sizing:border-box;box-sizing:border-box;width:60%}.swagger-section .swagger-ui-wrap table{border-collapse:collapse;border-spacing:0}.swagger-section .swagger-ui-wrap table thead tr th{padding:5px;font-size:.9em;color:#666;border-bottom:1px solid #999}.swagger-section .swagger-ui-wrap table tbody tr:last-child td{border-bottom:none}.swagger-section .swagger-ui-wrap table tbody tr.offset{background-color:#f0f0f0}.swagger-section .swagger-ui-wrap table tbody tr td{padding:6px;font-size:.9em;border-bottom:1px solid #ccc;vertical-align:top;line-height:1.3em}.swagger-section .swagger-ui-wrap ol{margin:0 0 10px;padding:0 0 0 18px;list-style-type:decimal}.swagger-section .swagger-ui-wrap ol li{padding:5px 0;font-size:.9em;color:#333}.swagger-section .swagger-ui-wrap ol,.swagger-section .swagger-ui-wrap ul{list-style:none}.swagger-section .swagger-ui-wrap h1 a,.swagger-section .swagger-ui-wrap h2 a,.swagger-section .swagger-ui-wrap h3 a,.swagger-section .swagger-ui-wrap h4 a,.swagger-section .swagger-ui-wrap h5 a,.swagger-section .swagger-ui-wrap h6 a{text-decoration:none}.swagger-section .swagger-ui-wrap h1 a:hover,.swagger-section .swagger-ui-wrap h2 a:hover,.swagger-section .swagger-ui-wrap h3 a:hover,.swagger-section .swagger-ui-wrap h4 a:hover,.swagger-section .swagger-ui-wrap h5 a:hover,.swagger-section .swagger-ui-wrap h6 a:hover{text-decoration:underline}.swagger-section .swagger-ui-wrap h1 span.divider,.swagger-section .swagger-ui-wrap h2 span.divider,.swagger-section .swagger-ui-wrap h3 span.divider,.swagger-section .swagger-ui-wrap h4 span.divider,.swagger-section .swagger-ui-wrap h5 span.divider,.swagger-section .swagger-ui-wrap h6 span.divider{color:#aaa}.swagger-section .swagger-ui-wrap a{color:#547f00}.swagger-section .swagger-ui-wrap a img{border:none}.swagger-section .swagger-ui-wrap article,.swagger-section .swagger-ui-wrap aside,.swagger-section .swagger-ui-wrap details,.swagger-section .swagger-ui-wrap figcaption,.swagger-section .swagger-ui-wrap figure,.swagger-section .swagger-ui-wrap footer,.swagger-section .swagger-ui-wrap header,.swagger-section .swagger-ui-wrap hgroup,.swagger-section .swagger-ui-wrap menu,.swagger-section .swagger-ui-wrap nav,.swagger-section .swagger-ui-wrap section,.swagger-section .swagger-ui-wrap summary{display:block}.swagger-section .swagger-ui-wrap pre{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;background-color:#fcf6db;border:1px solid #e5e0c6;padding:10px}.swagger-section .swagger-ui-wrap pre code{line-height:1.6em;background:none}.swagger-section .swagger-ui-wrap .content>.content-type>div>label{clear:both;display:block;color:#0f6ab4;font-size:1.1em;margin:0;padding:15px 0 5px}.swagger-section .swagger-ui-wrap .content pre{font-size:12px;margin-top:5px;padding:5px}.swagger-section .swagger-ui-wrap .icon-btn{cursor:pointer}.swagger-section .swagger-ui-wrap .info_title{padding-bottom:10px;font-weight:700;font-size:25px}.swagger-section .swagger-ui-wrap .footer{margin-top:20px}.swagger-section .swagger-ui-wrap div.big p,.swagger-section .swagger-ui-wrap p.big{font-size:1em;margin-bottom:10px}.swagger-section .swagger-ui-wrap form.fullwidth ol li.numeric input,.swagger-section .swagger-ui-wrap form.fullwidth ol li.string input,.swagger-section .swagger-ui-wrap form.fullwidth ol li.text textarea,.swagger-section .swagger-ui-wrap form.fullwidth ol li.url input{width:500px!important}.swagger-section .swagger-ui-wrap .info_license,.swagger-section .swagger-ui-wrap .info_tos{padding-bottom:5px}.swagger-section .swagger-ui-wrap .message-fail{color:#c00}.swagger-section .swagger-ui-wrap .info_email,.swagger-section .swagger-ui-wrap .info_name,.swagger-section .swagger-ui-wrap .info_url{padding-bottom:5px}.swagger-section .swagger-ui-wrap .info_description{padding-bottom:10px;font-size:15px}.swagger-section .swagger-ui-wrap .markdown ol li,.swagger-section .swagger-ui-wrap .markdown ul li{padding:3px 0;line-height:1.4em;color:#333}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input,.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input,.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input{display:block;padding:4px;width:auto;clear:both}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input.title,.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input.title,.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input.title{font-size:1.3em}.swagger-section .swagger-ui-wrap table.fullwidth{width:100%}.swagger-section .swagger-ui-wrap .model-signature{font-family:Droid Sans,sans-serif;font-size:1em;line-height:1.5em}.swagger-section .swagger-ui-wrap .model-signature .signature-nav a{text-decoration:none;color:#aaa}.swagger-section .swagger-ui-wrap .model-signature .signature-nav a:hover{text-decoration:underline;color:#000}.swagger-section .swagger-ui-wrap .model-signature .signature-nav .selected{color:#000;text-decoration:none}.swagger-section .swagger-ui-wrap .model-signature .propType{color:#55a}.swagger-section .swagger-ui-wrap .model-signature pre:hover{background-color:#ffd}.swagger-section .swagger-ui-wrap .model-signature pre{font-size:.85em;line-height:1.2em;overflow:auto;height:200px;resize:vertical;cursor:pointer}.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav{display:block;min-width:230px;margin:0;padding:0}.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li:last-child{padding-right:0;border-right:none}.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li{float:left;margin:0 5px 5px 0;padding:2px 5px 2px 0;border-right:1px solid #ddd}.swagger-section .swagger-ui-wrap .model-signature .propOpt{color:#555}.swagger-section .swagger-ui-wrap .model-signature .snippet small{font-size:.75em}.swagger-section .swagger-ui-wrap .model-signature .propOptKey{font-style:italic}.swagger-section .swagger-ui-wrap .model-signature .description .strong{font-weight:700;color:#000;font-size:.9em}.swagger-section .swagger-ui-wrap .model-signature .description div{font-size:.9em;line-height:1.5em;margin-left:1em}.swagger-section .swagger-ui-wrap .model-signature .description .stronger{font-weight:700;color:#000}.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper{border-spacing:0;position:absolute;background-color:#fff;border:1px solid #bbb;display:none;font-size:11px;max-width:400px;line-height:30px;color:#000;padding:5px;margin-left:10px}.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper th{text-align:center;background-color:#eee;border:1px solid #bbb;font-size:11px;color:#666;font-weight:700;padding:5px;line-height:15px}.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName{font-weight:700}.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown>p:first-child,.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown>p:last-child{display:inline}.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown>p:not(:first-child):before{display:block;content:''}.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown>p:only-child{margin-right:-3px}.swagger-section .swagger-ui-wrap .model-signature .propName{font-weight:700}.swagger-section .swagger-ui-wrap .model-signature .signature-container{clear:both}.swagger-section .swagger-ui-wrap .body-textarea{width:300px;height:100px;border:1px solid #aaa}.swagger-section .swagger-ui-wrap .markdown li code,.swagger-section .swagger-ui-wrap .markdown p code{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;background-color:#f0f0f0;color:#000;padding:1px 3px}.swagger-section .swagger-ui-wrap .required{font-weight:700}.swagger-section .swagger-ui-wrap .editor_holder{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;font-size:.9em}.swagger-section .swagger-ui-wrap .editor_holder label{font-weight:400!important}.swagger-section .swagger-ui-wrap .editor_holder label.required{font-weight:700!important}.swagger-section .swagger-ui-wrap input.parameter{width:300px;border:1px solid #aaa}.swagger-section .swagger-ui-wrap h1{color:#000;font-size:1.5em;line-height:1.3em;padding:10px 0;font-family:Droid Sans,sans-serif;font-weight:700}.swagger-section .swagger-ui-wrap .heading_with_menu{float:none;clear:both;overflow:hidden;display:block}.swagger-section .swagger-ui-wrap .heading_with_menu ul{display:block;clear:none;float:right;-ms-box-sizing:border-box;box-sizing:border-box;margin-top:10px}.swagger-section .swagger-ui-wrap h2{color:#000;font-size:1.3em;padding:10px 0}.swagger-section .swagger-ui-wrap h2 a{color:#000}.swagger-section .swagger-ui-wrap h2 span.sub{font-size:.7em;color:#999;font-style:italic}.swagger-section .swagger-ui-wrap h2 span.sub a{color:#777}.swagger-section .swagger-ui-wrap span.weak{color:#666}.swagger-section .swagger-ui-wrap .message-success{color:#89bf04}.swagger-section .swagger-ui-wrap caption,.swagger-section .swagger-ui-wrap td,.swagger-section .swagger-ui-wrap th{text-align:left;font-weight:400;vertical-align:middle}.swagger-section .swagger-ui-wrap .code{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.text textarea{font-family:Droid Sans,sans-serif;height:250px;padding:4px;display:block;clear:both}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.select select{display:block;clear:both}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean{float:none;clear:both;overflow:hidden;display:block}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean label{display:block;float:left;clear:none;margin:0;padding:0}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean input{display:block;float:left;clear:none;margin:0 5px 0 0}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.required label{color:#000}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label{display:block;clear:both;width:auto;padding:0 0 3px;color:#666}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label abbr{padding-left:3px;color:#888}.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li p.inline-hints{margin-left:0;font-style:italic;font-size:.9em;margin:0}.swagger-section .swagger-ui-wrap form.formtastic fieldset.buttons{margin:0;padding:0}.swagger-section .swagger-ui-wrap span.blank,.swagger-section .swagger-ui-wrap span.empty{color:#888;font-style:italic}.swagger-section .swagger-ui-wrap .markdown h3{color:#547f00}.swagger-section .swagger-ui-wrap .markdown h4{color:#666}.swagger-section .swagger-ui-wrap .markdown pre{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;background-color:#fcf6db;border:1px solid #e5e0c6;padding:10px;margin:0 0 10px}.swagger-section .swagger-ui-wrap .markdown pre code{line-height:1.6em;overflow:auto}.swagger-section .swagger-ui-wrap div.gist{margin:20px 0 25px!important}.swagger-section .swagger-ui-wrap ul#resources{font-family:Droid Sans,sans-serif;font-size:.9em}.swagger-section .swagger-ui-wrap ul#resources li.resource{border-bottom:1px solid #ddd}.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading h2 a,.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading h2 a{color:#000}.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading ul.options li a,.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading ul.options li a{color:#555}.swagger-section .swagger-ui-wrap ul#resources li.resource:last-child{border-bottom:none}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading{border:1px solid transparent;float:none;clear:both;overflow:hidden;display:block}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options{overflow:hidden;padding:0;display:block;clear:none;float:right;margin:14px 10px 0 0}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li{float:left;clear:none;margin:0;padding:2px 10px;border-right:1px solid #ddd;color:#666;font-size:.9em}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a{color:#aaa;text-decoration:none}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover{text-decoration:underline;color:#000}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a.active,.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:active,.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover{text-decoration:underline}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.first,.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:first-child{padding-left:0}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:last-child{padding-right:0;border-right:none}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options.first,.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options:first-child{padding-left:0}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2{color:#999;padding-left:0;display:block;clear:none;float:left;font-family:Droid Sans,sans-serif;font-weight:700}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a{color:#999}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover{color:#000}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation{float:none;clear:both;overflow:hidden;display:block;margin:0 0 10px;padding:0}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading{float:none;clear:both;overflow:hidden;display:block;margin:0;padding:0}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3{display:block;clear:none;float:left;width:auto;margin:0;padding:0;line-height:1.1em;color:#000}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path{padding-left:10px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a{color:#000;text-decoration:none}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a.toggleOperation.deprecated{text-decoration:line-through}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a:hover{text-decoration:underline}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.http_method a{text-transform:uppercase;text-decoration:none;color:#fff;display:inline-block;width:50px;font-size:.7em;text-align:center;padding:7px 0 4px;border-radius:2px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span{margin:0;padding:0}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options{overflow:hidden;padding:0;display:block;clear:none;float:right;margin:6px 10px 0 0}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li{float:left;clear:none;margin:0;padding:2px 10px;font-size:.9em}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a{text-decoration:none}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a .markdown p{color:inherit;padding:0;line-height:inherit}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a .nickname{color:#aaa;padding:0;line-height:inherit}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li.access{color:#000}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content{border-top:none;padding:10px;border-bottom-left-radius:6px;border-bottom-right-radius:6px;margin:0 0 20px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content h4{font-size:1.1em;margin:0;padding:15px 0 5px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header{float:none;clear:both;overflow:hidden;display:block}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header a{padding:4px 0 0 10px;display:inline-block;font-size:.9em}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit{display:block;clear:none;float:left;padding:6px 8px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber{background-image:url(../images/throbber.gif);width:128px;height:16px;display:block;clear:none;float:right}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type=text].error{outline:2px solid #000;outline-color:#c00}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name=parameterContentType]{max-width:300px}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre{font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;padding:10px;font-size:.9em;max-height:400px;overflow-y:auto}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading{background-color:#f9f2e9;border:1px solid #f0e0ca}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a{background-color:#c5862b}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#f0e0ca;color:#c5862b}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a{color:#c5862b}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content{background-color:#faf5ee;border:1px solid #f0e0ca}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4{color:#c5862b}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a{color:#dcb67f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading{background-color:#fcffcd;border:1px solid #000;border-color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading h3 span.http_method a{text-transform:uppercase;background-color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#ffd20f;color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li a{color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content{background-color:#fcffcd;border:1px solid #000;border-color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content h4{color:#ffd20f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content div.sandbox_header a{color:#6fc992}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading{background-color:#f5e8e8;border:1px solid #e8c6c7}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a{text-transform:uppercase;background-color:#a41e22}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#e8c6c7;color:#a41e22}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a{color:#a41e22}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content{background-color:#f7eded;border:1px solid #e8c6c7}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4{color:#a41e22}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a{color:#c8787a}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading{background-color:#e7f6ec;border:1px solid #c3e8d1}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a{background-color:#10a54a}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#c3e8d1;color:#10a54a}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a{color:#10a54a}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content{background-color:#ebf7f0;border:1px solid #c3e8d1}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4{color:#10a54a}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a{color:#6fc992}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading{background-color:#fce9e3;border:1px solid #f5d5c3}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a{background-color:#d38042}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#f0cecb;color:#d38042}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a{color:#d38042}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content{background-color:#faf0ef;border:1px solid #f0cecb}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4{color:#d38042}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a{color:#dcb67f}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading{background-color:#e7f0f7;border:1px solid #c3d9ec}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a{background-color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#c3d9ec;color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a{color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content{background-color:#ebf3f9;border:1px solid #c3d9ec}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4{color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a{color:#6fa5d2}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading{background-color:#e7f0f7;border:1px solid #c3d9ec}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading h3 span.http_method a{background-color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li{border-right:1px solid #ddd;border-right-color:#c3d9ec;color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li a{color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content{background-color:#ebf3f9;border:1px solid #c3d9ec}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content h4{color:#0f6ab4}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content div.sandbox_header a{color:#6fa5d2}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content{border-top:none}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li:last-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child{padding-right:0;border-right:none}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a.active,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:active,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:hover{text-decoration:underline}.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations.first,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations:first-child,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li.first,.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li:first-child{padding-left:0}.swagger-section .swagger-ui-wrap p#colophon{margin:0 15px 40px;padding:10px 0;font-size:.8em;border-top:1px solid #ddd;font-family:Droid Sans,sans-serif;color:#999;font-style:italic}.swagger-section .swagger-ui-wrap p#colophon a{text-decoration:none;color:#547f00}.swagger-section .swagger-ui-wrap h3{color:#000;font-size:1.1em;padding:10px 0}.swagger-section .swagger-ui-wrap .markdown ol,.swagger-section .swagger-ui-wrap .markdown ul{font-family:Droid Sans,sans-serif;margin:5px 0 10px;padding:0 0 0 18px;list-style-type:disc}.swagger-section .swagger-ui-wrap form.form_box{background-color:#ebf3f9;border:1px solid #c3d9ec;padding:10px}.swagger-section .swagger-ui-wrap form.form_box label{color:#0f6ab4!important}.swagger-section .swagger-ui-wrap form.form_box input[type=submit]{display:block;padding:10px}.swagger-section .swagger-ui-wrap form.form_box p.weak{font-size:.8em}.swagger-section .swagger-ui-wrap form.form_box p{font-size:.9em;padding:0 0 15px;color:#7e7b6d}.swagger-section .swagger-ui-wrap form.form_box p a{color:#646257}.swagger-section .swagger-ui-wrap form.form_box p strong{color:#000}.swagger-section .swagger-ui-wrap .operation-status td.markdown>p:last-child{padding-bottom:0}.swagger-section .title{font-style:bold}.swagger-section .secondary_form{display:none}.swagger-section .main_image{display:block;margin-left:auto;margin-right:auto}.swagger-section .oauth_body{margin-left:100px;margin-right:100px}.swagger-section .oauth_submit{text-align:center;display:inline-block}.swagger-section .authorize-wrapper{margin:15px 0 10px}.swagger-section .authorize-wrapper_operation{float:right}.swagger-section .authorize__btn:hover{text-decoration:underline;cursor:pointer}.swagger-section .authorize__btn_operation:hover .authorize-scopes{display:block}.swagger-section .authorize-scopes{position:absolute;margin-top:20px;background:#fff;border:1px solid #ccc;border-radius:5px;display:none;font-size:13px;max-width:300px;line-height:30px;color:#000;padding:5px}.swagger-section .authorize-scopes .authorize__scope{text-decoration:none}.swagger-section .authorize__btn_operation{height:18px;vertical-align:middle;display:inline-block;background:url(../images/explorer_icons.png) no-repeat}.swagger-section .authorize__btn_operation_login{background-position:0 0;width:18px;margin-top:-6px;margin-left:4px}.swagger-section .authorize__btn_operation_logout{background-position:-30px 0;width:18px;margin-top:-6px;margin-left:4px}.swagger-section #auth_container{color:#fff;display:inline-block;border:none;padding:5px;width:87px;height:13px}.swagger-section #auth_container .authorize__btn{color:#fff}.swagger-section .auth_container{padding:0 0 10px;margin-bottom:5px;border-bottom:1px solid #ccc;font-size:.9em}.swagger-section .auth_container .auth__title{color:#547f00;font-size:1.2em}.swagger-section .auth_container .basic_auth__label{display:inline-block;width:60px}.swagger-section .auth_container .auth__description{color:#999;margin-bottom:5px}.swagger-section .auth_container .auth__button{margin-top:10px;height:30px}.swagger-section .auth_container .key_auth__field{margin:5px 0}.swagger-section .auth_container .key_auth__label{display:inline-block;width:60px}.swagger-section .api-popup-dialog{position:absolute;display:none}.swagger-section .api-popup-dialog-wrapper{z-index:2;width:500px;background:#fff;padding:20px;border:1px solid #ccc;border-radius:5px;font-size:13px;color:#777;position:fixed;top:50%;left:50%;transform:translate(-50%,-50%)}.swagger-section .api-popup-dialog-shadow{position:fixed;top:0;left:0;width:100%;height:100%;opacity:.2;background-color:gray;z-index:1}.swagger-section .api-popup-dialog .api-popup-title{font-size:24px;padding:10px 0}.swagger-section .api-popup-dialog .error-msg{padding-left:5px;padding-bottom:5px}.swagger-section .api-popup-dialog .api-popup-content{max-height:500px;overflow-y:auto}.swagger-section .api-popup-dialog .api-popup-authbtn,.swagger-section .api-popup-dialog .api-popup-cancel{height:30px}.swagger-section .api-popup-scopes{padding:10px 20px}.swagger-section .api-popup-scopes li{padding:5px 0;line-height:20px}.swagger-section .api-popup-scopes li input{position:relative;top:2px}.swagger-section .api-popup-scopes .api-scope-desc{padding-left:20px;font-style:italic}.swagger-section .api-popup-actions{padding-top:10px}.swagger-section fieldset{padding-bottom:10px;padding-left:20px}.swagger-section .access,.swagger-section .auth{float:right}.swagger-section .api-ic{height:18px;vertical-align:middle;display:inline-block;background:url(../images/explorer_icons.png) no-repeat}.swagger-section .api-ic .api_information_panel{position:relative;margin-top:20px;margin-left:-5px;background:#fff;border:1px solid #ccc;border-radius:5px;display:none;font-size:13px;max-width:300px;line-height:30px;color:#000;padding:5px}.swagger-section .api-ic .api_information_panel p .api-msg-enabled{color:green}.swagger-section .api-ic .api_information_panel p .api-msg-disabled{color:red}.swagger-section .api-ic:hover .api_information_panel{position:absolute;display:block}.swagger-section .ic-info{background-position:0 0;width:18px;margin-top:-6px;margin-left:4px}.swagger-section .ic-warning{background-position:-60px 0;width:18px;margin-top:-6px;margin-left:4px}.swagger-section .ic-error{background-position:-30px 0;width:18px;margin-top:-6px;margin-left:4px}.swagger-section .ic-off{background-position:-90px 0;width:58px;margin-top:-4px;cursor:pointer}.swagger-section .ic-on{background-position:-160px 0;width:58px;margin-top:-4px;cursor:pointer}.swagger-section #header{background-color:#89bf04;padding:9px 14px 19px;height:23px;min-width:775px}.swagger-section #input_baseUrl{width:400px}.swagger-section #api_selector{display:block;clear:none;float:right}.swagger-section #api_selector .input{display:inline-block;clear:none;margin:0 10px 0 0}.swagger-section #api_selector input{font-size:.9em;padding:3px;margin:0}.swagger-section #input_apiKey{width:200px}.swagger-section #auth_container .authorize__btn,.swagger-section #explore{display:block;text-decoration:none;font-weight:700;padding:6px 8px;font-size:.9em;color:#fff;background-color:#547f00;border-radius:4px}.swagger-section #auth_container .authorize__btn:hover,.swagger-section #explore:hover{background-color:#547f00}.swagger-section #header #logo{font-size:1.5em;font-weight:700;text-decoration:none;color:#fff}.swagger-section #header #logo .logo__img{display:block;float:left;margin-top:2px}.swagger-section #header #logo .logo__title{display:inline-block;padding:5px 0 0 10px}.swagger-section #content_message{margin:10px 15px;font-style:italic;color:#999}.swagger-section #message-bar{min-height:30px;text-align:center;padding-top:10px}.swagger-section .swagger-collapse:before{content:"-"}.swagger-section .swagger-expand:before{content:"+"}.swagger-section .error{outline-color:#c00;background-color:#f2dede}
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/style.css b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/style.css
index fc21a31db54..52907e46365 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/style.css
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/style.css
@@ -1,250 +1 @@
-.swagger-section #header a#logo {
-  font-size: 1.5em;
-  font-weight: bold;
-  text-decoration: none;
-  background: transparent url(../images/logo.png) no-repeat left center;
-  padding: 20px 0 20px 40px;
-}
-#text-head {
-  font-size: 80px;
-  font-family: 'Roboto', sans-serif;
-  color: #ffffff;
-  float: right;
-  margin-right: 20%;
-}
-.navbar-fixed-top .navbar-nav {
-  height: auto;
-}
-.navbar-fixed-top .navbar-brand {
-  height: auto;
-}
-.navbar-header {
-  height: auto;
-}
-.navbar-inverse {
-  background-color: #000;
-  border-color: #000;
-}
-#navbar-brand {
-  margin-left: 20%;
-}
-.navtext {
-  font-size: 10px;
-}
-.h1,
-h1 {
-  font-size: 60px;
-}
-.navbar-default .navbar-header .navbar-brand {
-  color: #a2dfee;
-}
-/* tag titles */
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
-  color: #393939;
-  font-family: 'Arvo', serif;
-  font-size: 1.5em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
-  color: #525252;
-  padding-left: 0px;
-  display: block;
-  clear: none;
-  float: left;
-  font-family: 'Arvo', serif;
-  font-weight: bold;
-}
-.navbar-default .navbar-collapse,
-.navbar-default .navbar-form {
-  border-color: #0A0A0A;
-}
-.container1 {
-  width: 1500px;
-  margin: auto;
-  margin-top: 0;
-  background-image: url('../images/shield.png');
-  background-repeat: no-repeat;
-  background-position: -40px -20px;
-  margin-bottom: 210px;
-}
-.container-inner {
-  width: 1200px;
-  margin: auto;
-  background-color: rgba(223, 227, 228, 0.75);
-  padding-bottom: 40px;
-  padding-top: 40px;
-  border-radius: 15px;
-}
-.header-content {
-  padding: 0;
-  width: 1000px;
-}
-.title1 {
-  font-size: 80px;
-  font-family: 'Vollkorn', serif;
-  color: #404040;
-  text-align: center;
-  padding-top: 40px;
-  padding-bottom: 100px;
-}
-#icon {
-  margin-top: -18px;
-}
-.subtext {
-  font-size: 25px;
-  font-style: italic;
-  color: #08b;
-  text-align: right;
-  padding-right: 250px;
-}
-.bg-primary {
-  background-color: #00468b;
-}
-.navbar-default .nav > li > a,
-.navbar-default .nav > li > a:focus {
-  color: #08b;
-}
-.navbar-default .nav > li > a,
-.navbar-default .nav > li > a:hover {
-  color: #08b;
-}
-.navbar-default .nav > li > a,
-.navbar-default .nav > li > a:focus:hover {
-  color: #08b;
-}
-.text-faded {
-  font-size: 25px;
-  font-family: 'Vollkorn', serif;
-}
-.section-heading {
-  font-family: 'Vollkorn', serif;
-  font-size: 45px;
-  padding-bottom: 10px;
-}
-hr {
-  border-color: #00468b;
-  padding-bottom: 10px;
-}
-.description {
-  margin-top: 20px;
-  padding-bottom: 200px;
-}
-.description li {
-  font-family: 'Vollkorn', serif;
-  font-size: 25px;
-  color: #525252;
-  margin-left: 28%;
-  padding-top: 5px;
-}
-.gap {
-  margin-top: 200px;
-}
-.troubleshootingtext {
-  color: rgba(255, 255, 255, 0.7);
-  padding-left: 30%;
-}
-.troubleshootingtext li {
-  list-style-type: circle;
-  font-size: 25px;
-  padding-bottom: 5px;
-}
-.overlay {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 1000;
-}
-.block.response_body.json:hover {
-  cursor: pointer;
-}
-.backdrop {
-  color: blue;
-}
-#myModal {
-  height: 100%;
-}
-.modal-backdrop {
-  bottom: 0;
-  position: fixed;
-}
-.curl {
-  padding: 10px;
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  font-size: 0.9em;
-  max-height: 400px;
-  margin-top: 5px;
-  overflow-y: auto;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  border-radius: 4px;
-}
-.curl_title {
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-  font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
-  font-weight: 500;
-  line-height: 1.1;
-}
-.footer {
-  display: none;
-}
-.swagger-section .swagger-ui-wrap h2 {
-  padding: 0;
-}
-h2 {
-  margin: 0;
-  margin-bottom: 5px;
-}
-.markdown p {
-  font-size: 15px;
-  font-family: 'Arvo', serif;
-}
-.swagger-section .swagger-ui-wrap .code {
-  font-size: 15px;
-  font-family: 'Arvo', serif;
-}
-.swagger-section .swagger-ui-wrap b {
-  font-family: 'Arvo', serif;
-}
-#signin:hover {
-  cursor: pointer;
-}
-.dropdown-menu {
-  padding: 15px;
-}
-.navbar-right .dropdown-menu {
-  left: 0;
-  right: auto;
-}
-#signinbutton {
-  width: 100%;
-  height: 32px;
-  font-size: 13px;
-  font-weight: bold;
-  color: #08b;
-}
-.navbar-default .nav > li .details {
-  color: #000000;
-  text-transform: none;
-  font-size: 15px;
-  font-weight: normal;
-  font-family: 'Open Sans', sans-serif;
-  font-style: italic;
-  line-height: 20px;
-  top: -2px;
-}
-.navbar-default .nav > li .details:hover {
-  color: black;
-}
-#signout {
-  width: 100%;
-  height: 32px;
-  font-size: 13px;
-  font-weight: bold;
-  color: #08b;
-}
+.swagger-section #header a#logo{font-size:1.5em;font-weight:700;text-decoration:none;padding:20px 0 20px 40px}#text-head{font-size:80px;font-family:Roboto,sans-serif;color:#fff;float:right;margin-right:20%}.navbar-fixed-top .navbar-brand,.navbar-fixed-top .navbar-nav,.navbar-header{height:auto}.navbar-inverse{background-color:#000;border-color:#000}#navbar-brand{margin-left:20%}.navtext{font-size:10px}.h1,h1{font-size:60px}.navbar-default .navbar-header .navbar-brand{color:#a2dfee}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a{color:#393939;font-family:Arvo,serif;font-size:1.5em}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover{color:#000}.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2{color:#525252;padding-left:0;display:block;clear:none;float:left;font-family:Arvo,serif;font-weight:700}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#0a0a0a}.container1{width:1500px;margin:auto;margin-top:0;background-repeat:no-repeat;background-position:-40px -20px;margin-bottom:210px}.container-inner{width:1200px;margin:auto;background-color:hsla(192,8%,88%,.75);padding-bottom:40px;padding-top:40px;border-radius:15px}.header-content{padding:0;width:1000px}.title1{font-size:80px;font-family:Vollkorn,serif;color:#404040;text-align:center;padding-top:40px;padding-bottom:100px}#icon{margin-top:-18px}.subtext{font-size:25px;font-style:italic;color:#08b;text-align:right;padding-right:250px}.bg-primary{background-color:#00468b}.navbar-default .nav>li>a,.navbar-default .nav>li>a:focus,.navbar-default .nav>li>a:focus:hover,.navbar-default .nav>li>a:hover{color:#08b}.text-faded{font-size:25px;font-family:Vollkorn,serif}.section-heading{font-family:Vollkorn,serif;font-size:45px;padding-bottom:10px}hr{border-color:#00468b;padding-bottom:10px}.description{margin-top:20px;padding-bottom:200px}.description li{font-family:Vollkorn,serif;font-size:25px;color:#525252;margin-left:28%;padding-top:5px}.gap{margin-top:200px}.troubleshootingtext{color:hsla(0,0%,100%,.7);padding-left:30%}.troubleshootingtext li{list-style-type:circle;font-size:25px;padding-bottom:5px}.overlay{position:absolute;top:0;left:0;width:100%;height:100%;z-index:1}.block.response_body.json:hover{cursor:pointer}.backdrop{color:blue}#myModal{height:100%}.modal-backdrop{bottom:0;position:fixed}.curl{padding:10px;font-family:Anonymous Pro,Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;font-size:.9em;max-height:400px;margin-top:5px;overflow-y:auto;background-color:#fcf6db;border:1px solid #e5e0c6;border-radius:4px}.curl_title{font-size:1.1em;margin:0;padding:15px 0 5px;font-family:Open Sans,Helvetica Neue,Arial,sans-serif;font-weight:500;line-height:1.1}.footer{display:none}.swagger-section .swagger-ui-wrap h2{padding:0}h2{margin:0;margin-bottom:5px}.markdown p,.swagger-section .swagger-ui-wrap .code{font-size:15px;font-family:Arvo,serif}.swagger-section .swagger-ui-wrap b{font-family:Arvo,serif}#signin:hover{cursor:pointer}.dropdown-menu{padding:15px}.navbar-right .dropdown-menu{left:0;right:auto}#signinbutton{width:100%;height:32px;font-size:13px;font-weight:700;color:#08b}.navbar-default .nav>li .details{color:#000;text-transform:none;font-size:15px;font-weight:400;font-family:Open Sans,sans-serif;font-style:italic;line-height:20px;top:-2px}.navbar-default .nav>li .details:hover{color:#000}#signout{width:100%;height:32px;font-size:13px;font-weight:700;color:#08b}
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/typography.css b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/typography.css
index 3235edd9503..e69de29bb2d 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/typography.css
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/typography.css
@@ -1,14 +0,0 @@
-/* Google Font's Droid Sans */
-@font-face {
-  font-family: 'Droid Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf') format('truetype');
-}
-/* Google Font's Droid Sans Bold */
-@font-face {
-  font-family: 'Droid Sans';
-  font-style: normal;
-  font-weight: 700;
-  src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf') format('truetype');
-}
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/fonts/DroidSans-Bold.ttf b/htdocs/includes/restler/framework/Luracast/Restler/explorer/fonts/DroidSans-Bold.ttf
index 942bbf5ba3aa04288175d094bc9c11d109c5726c..036c4d135bf954ef3c2b15bc6493f72a01909aee 100644
GIT binary patch
delta 24
gcmexxn(4!7rU?No3=DjaH-^MAGBRx5#Avq!0DWEv`~Uy|

delta 24
gcmexxn(4!7rU?Noi#WGW+ZYnd$jGsI6QkV{0E~kQ3jhEB

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/fonts/DroidSans.ttf b/htdocs/includes/restler/framework/Luracast/Restler/explorer/fonts/DroidSans.ttf
index efd1f8bbd882a6a434159fa1da7238babbaa2fb3..e517a0c5b9dfcdde4c4dee7569fa191b40f208bb 100644
GIT binary patch
delta 24
gcmX?dfa%BqrU?No3=Djg8$)6l85uTjVw^M&0B>^$asU7T

delta 24
gcmX?dfa%BqrU?No3odU>-53(f$jGsI6XT?L0E`$4fB*mh

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png
index ed9d2fffb64a2e6e282b90e489d83fc4ddfac3cd..be43b27394052f1808eccb2758c6d0911a777f6b 100644
GIT binary patch
delta 2459
zcmXw4dpy(o8=tL-jc6t<6UrKzE=wemDA#C4d_%;1Ez!w1xgI7Vxn%CiNFvTrnS0Ca
z7|z(xaZS19mfKj#spD3^Ip_R7|9qb3{eFF(=lyzK&+~llYHi>d2g^@6Bj}P;i}UB~
zgT(|)xUV9APi!&aWI^0#%^R(o59M|un)#iboj^^33{P}-V$~~KI_={E#)NJ`&xa~T
z35AWR^}TOLvnvf#17Ev!6Mprxinm)YN^DflnM~cw-7zoO-;%Gg<hC_}xnCY*f}&Vf
zV$a+O-P;~xw$TwI0N4z={6T6(C{!M2nLfVjj#9e)Z~QMm#q;eX3gz<9)C~h!ne<T-
zdH%jI%2*}$6S@%JU6-5kFBoz~Xc^)4WSVM$H}E&~$(shbFc3pf)bVBXJT>F9+*=68
zf1V?)t<653$#RRB&{;q5$MY+dYIwX^#MN|*hcNcT6J+`aVCCWD(0hNE<Ad0MaNp;0
zZDlEfl}(t(4H)Wyz2nBnv~4d^UEhzY_Aizf&AyP`(GXbyi(62ZwNqq#^6btS>2x*9
z2AiYcL~1vd9k}#JTSvzUs`t=mf)nHau@jRgNbwkN3@3s-w4UFGNCglTB50CdDN8A$
zuhdSYOkFau!ri`@y)-qg6qYZNP@5uHHIP?-CUgjFZ>p8+V9qJS@K{Qb0?EOz7-uMA
z;vY9<E?CH!H>a6wdX&`Ipo{fF#Xxx6oQ6uo$bL<-!G-piVp!X4<CR_!E-rL)sU6nJ
zI&w8NV7B{;NEv^|zoRQhw}@U<rF{U6Mz_Zx6{cJ7%Ml|sgOBpm482b=L76Cz4X(uU
zo0ISFl>ctnn^Es3y}?_i^~z^e*r30soql%45WwA@G`%-Bv-YbPt=AB#UWqQmweBn}
zbh@OZ(131Qzj)0>g?+^+`@#xw>aGJhskp7yCE}opjh9FhmYO#bLJtWE{M}`Y`L@h0
zIh|!rqa8o2m4FAcKscrxwZ8QRH=W#+&U%3>q5zfBuVjK5ReOc8v<hdy*8QBJ-m_?U
zYVHy&k_eklqZk9Pd-p-oF)9pf00%l-DGmW;wFu7VY;5$6J3RTBS}UVL;~o0KdXq!e
zkJM^^8ujoMj?o(g$jGe(g`>On^)*R<cp_=VrwTGd*<np4EjsJjl!ZLguUkQ8cgvvq
z;foLKwW}y~i=2wI5|*IFdA`+qZ7&nG{*o#NqJx}_u`?7Kpgs?tZtHhO^TFit!vvQ%
zP@al`MwtuS<M2du_3cFm%Rj<;Y8x9}c|4xy-=8MXbRZ;zEf{Zl{5eTcm+0!~h_9}$
zCSSd(WtDXV6il`yGy>MvN%r>k=gGhbwWH?{Z+1ANS`ZduiW_$JcOqS0i*9R-w%tr(
zHjLujX+M_t;kO$oY-yo|#0d>eHFJGr<M}7>6+RUaZx;#ycbLzbeBm7UmY{rTUMzjL
z3O!e*3z;yI#ZUeQ;Ypktsvq;jKZ%B`+Fm?pnwamaqKcSZo$o{U)Z84N{?L5a>3X8$
z<;xZzh<ht4C`D>OZ1}YJ`~`c!dy22|G<##;);j(tN?RN9qg|k`->~y#>+xap`}2rJ
zw}W+u2svC0O+wD$=kL(TYz<Y+DF=^8IuROuVz_`+cx-exOr(eTZZI0&P34M|Vtri;
zYtl#@<3vuj?ydbGtcT=*!{G$?7*#CoP+q&HC9?EHsbiVfvN>Y06g-*UbJS;XbG-@R
zMXY(!k}d&fU%o6VWV~gu1j@xFEMIgc^~Gg(T-`Dk3Puml-}iZeK=#pjKz?H6{5vN;
zhsTeHZ<hcan>(kUT*BCl%vaA|`!XBwNMWeSqYa@Kx~g8Qduxo))z#J8-#?x6UA22?
zpw#hQvh!-FQ@erK5G^;BcrFH=DRdlImqdm~9B6qopiuMqM>RR{W37LDNlX!44*Ex(
z53``6+!|1#yg>NS8FuSXaEAnyz_`|52B_WCqnh_1lVi|>O9V5w{6vU*lC(xae8vH5
zw(*gM)<)UYlL1+>eVU@Sb~q&)udJn|wX*eXT&~^xTO}$g?r%Z==P52b3HfDgtGeoy
zYxNCzO3B!!NBeGcTvr7PWlG~Iq&83SG*rtHGnH?7&Cm<WY?H>F-h3}Ubosjb=l6q(
zm8I&xm4e@@SjIE>j+eywSXw-S|Ir7yt0n1^$dyjFMfA#v+ZlYM!9a97<(Mq;RhQvl
z<PENau|z`DopklwjKhwh8^HY}tX?Y0$H(U>>*tsO3)7K74hK$Y0)mi8GGb?G{%xw$
zF9ZE<^w<plt9|`P>W)^CPX)-3fE8Y+=5n%T!cDE`$JQ{SSr=s=Ls)qb9DrM*F%yPG
zJ@K^vI&;te+k1I$pwgg_h3Lg@GmZGYmZrLmd%PQtkl8v+))?_Hfw@_OG6oW>Yih_&
zuIJ7fdakd|kIg;<PAcgK5-K>v<2ZW%oc^6h@OwGG9QUmhF0luEDP1~+Uw^MhXKqcQ
z<ukY5xZjqNKJ>Js?zE@Xt`zQfxxIKT7}r8MzcZ366)T=*%YPDHkR@x!$t>uMHZ;l>
zgJSmCoBnlAwCF<hRBW8o@Rc$o(`K3%NWr&vERq?fe`+Fo5u4IrOj?{z6`d{f{!T^T
zM#a$soOsB8Nk=*UuL^a?4%T0k#5B*ZAxU2BGp#*}D{QQKA#eBDxMB=`Am#34w>g4*
z755#kUTNM<X;6L4H`??|MtR?gef6LqSLr<PjxNTN3Kox7cp)6EqwefH87Kh829T<#
zaBIsJolgn#HHUtt6SUcEHjy@YUbOX@sPB8C|7v3$^;O0ThhSi?dSlXbIf_DZN``?M
z&e=cWdwLfTwS7t=SH7bwQRJa!Pblx?5rS>AFEMnrwd1%`<vaY3y?th#6Krg>FC{9d
z*{hq`!BvYSO1eeZ1YU3jFmk+`{|}$5NPk|nx_V4%_S3REmZZ~cX?01)BsDX5*G8)t
zC@0$I2sNo$BP=OXc7h^aa{cB;y;R)av*4#mVpIRMzrGOLn_b$y&!*_V{P*w1U8km6
zt%nKsKYM+eS@L>tYN8jjX*&4ut6Aj25d<-Ho0<$ii&v}O-w6?pb^966q4q(lYnUy1
zL)hGoMcml{@urlFtgRn`3;7U;1Oz&S+iejPlMf%F$U9_0sO{I~jQ|J-8Vy$=K-|SR
zP}x0^ERi9BGy+7%HvA7SyXPNX0{IUg4d3Sfd$w&%nyC;XCB;>}oMdy>YWG7#$Kry`
K`IpAmqW%Ynh?biG

delta 3111
zcmb7_cTm&I8iqs1BLdO{M4I$ogdj=>rAw6n1`IvKh|)s;iFi;DL<B*aAdrBN&<PNl
z7`pTlN+@cOt{_#K+?;dgp7ZzJnSFP6cAxpa+4=U}Bgq)~mzOy~XC4?k27o|kIsfW3
zpv-LEN)hNE07%%~*v0|`3KIu`9>st_2dC6=1q2FG0)bZVf<T&YK%fhLuUtEBP`NS_
zLp{5Y>Gf>n1G{m)E@0`0Syd>FSiHI}x>nS<L@!RCZfcW5?&UL#P0eUq0`3<YXZ{@`
zpvmB680b{=l?k5lo{mMecUemRQE&*~D_wa;;Fa-tjFj<^jn$cCk7|>>x$r|+kGNQ)
zNH|JlGBipRHMu_3d>a0vVX1X+dnUlT9X4lUVapHqQKci2;Rnnc2Z>dbNEd{Ks1(|*
z1qhkT@u*uYgcG}!<TRVLxd&#emP*!EiQA6`t_<<zU4u(vCGMGIlnFEUj3V|d0X?8d
z+S9=YLYuHo@+jEVyxXzBI{5S3CwtSxf`_EkE4YL|+?Hh^-m=YZV^3BozM;P7%!J-%
z#d<pA?QmG7?>khoI^#Z<{p_-5gI$P4&xdblX&)|M7ELy`iNVx%;*qH~1L{@_i;Ff^
zR=QD9QGILgTcN%_K6!Y2+Gx=&HVEKaLmKeny)m*hzO=1;e@0_*ASbJ@;k+Av8p%9-
zSi!D>(|F^^>@bMDB{y?&%~Kp9!0(f7YxnH7!x+N}p=(n?z_H<4DD<3wjI80XBJ>_l
z$+77KVU2_v#lUUs?Aqn)W?qfu<y;MjU0wC{)(^S<mZtI1K(5YU^5vV|pFRPXd07aV
zsrL5vhp%HRvk{d_-=niwFy~_E;&1xRWR5)C3TwXp`xnIxBK?89>o#qAbRHd28t&eP
z;wCa0xo&9ZpFz1~V~ZtIy96DMUn$INlg%*SVmlq%ZVsidG5%;~8?*q^v6oE8u|92F
zUpzy`cSdTL)<0<9(=u7vDz5@=E)Tm_ZP3hH3{Uji->thw;7u468j!I=`JvF^TMH&K
zGBQ301SRE`w#n+y=;&yMvOA++(@(|}$y*Za%q-m<oN<Pm2N50~9#*!t21>kvwYk&N
zP6PNvM&W+cw@{=bzjF+(&1$%xVx3;Q8^NY<atWmZ$voam&rqgZkOnRl)gmV1M+-+P
zyqbLGFyU_)KN#$PJgGBcYS?QRClb0(1j$a#f$v==RkhYz9l2*Q_I|VLRsOULoHRZ<
zzi2S-ki0KZoXt*(p0L54iure^PtkRHeo%i?k#PN;ATubK7{7Pn8x*%Y@@Fsl0RkbL
z<|%&Zypia6CuirCWnlROo=HLM=RpJupUM+sF?}g6|K?mPDf$w?i(6SOhX)co_JoBy
zG4sU9UCIYsfD|-Hw%k$uV!Si2t79(v9GjYy@=~9edBBwDIqlcjCzXpesdk~a6cbPw
z%r<FUeNa>yvSo+dG%D6iu6OLGN8i~?m%MsssiYNJs2RB?3#j2rOWil-ny;v-(Y#Dg
zzX^v+udJ*HXoaOFUIgzQ4jdnBUyVGZ?y5CU^C-HQhaG;Ks)q4Sth?39Sv-B8fpV32
zF37vkblN+wxJhCXi4ZjENR^8c>~q^K<5B;?29tt7lZkZ!O{wLFw1c3;l$WB!Dsu!^
z@i8PZi}fR*qy572S=!#@H6<>yN4erMGe6)-rR4Is_+a$&tt8s5ln2Zx!lQ|`W-mHt
zSJ%PC{;UkGaP^LkjweJI3F}DAR6{^&e3IR-1T6N6@Um!jc#-i}0~T38w{%Xf5TCN4
z=D-%5pQ;$w-PDkfoe#pMTeQc&bG-J1HtsH1u>nBDJt<1;5u{}Wu~eO8(YugChcv|c
zER2_%QQRW8onEB8<c%fyS~hi3yw!pv3!IDi1~tYWuP83J2k3LV*5zJ<Y#tCtp$qvv
zYpVrpjlI#4+ODQ`^)bG@V`F1VZtcvE+k`Rjulq-TrEOthF*ZJaH5OgldBwte)CtuH
zD8Gv{6n$ZR&g1Zmk{I#sTx7;Q&B@N+luMupl1C-XRaQKdhLI_i^Wj@f@2$x~bMtFX
zYpbS0<wXxU?i?@6qPHot4<o(s{=N{M(Ei2eXDjz%A>AMjdA9}0@b%!QYQls!Wr5{W
zim016nW*6t1huA>MbTUh4Go|xU~meMk#Xh&9!Z|WBePOesJ<{iHCS5Svf88|E&Z;d
z;(@Lr=^?Qo<y2=$F=>nNyCtB$)j4>mv)qf-?PRVUVax%8cEvLI`i#^vkauFh@6KRh
zK2`gnNaPVGm{se_inua9_+5CA#N+vmu8sXJbE+XyE$EXdri>Z82I=hudf#XU$v7e8
zKKYY`X|8YgsZz~S6NyK5VKdO8@tgd^xWVqO(y+*`8bu?^D7Ie;Jma?_U?W45J-5zQ
z6UNbYx%?Pj68K|<cJ#t+WOyz3OHZlr4=u_7r%-`{CGDk^1V1eoVn6Qvul*9Dq%Jf&
zf>2!^g9<WR_bp_qWC3K^nO~-)5G&ogHjhp$W%j4Mb7_?BO)7Pz5)`k0SE>7fjD=~y
z-I{0tnL~7{f1kvjAAR<*im$YLK;*iHK<A#6Xxidp+c51xPr3R1R`D=77q)vdLT=xZ
z{PG&U+sKgXVq1JEVujrmHKfMZUmf=y_!F06M>2j*?A%X`e-DtGewUw28BrQW<#P%+
zbUx3r7qxnWcg)fU{DKIYQxnVS&Ik(=lQVuT2NKS8_dTgKPkoHmj*cdlmaHif7Wwbq
zwH@4R>h8gRuSYu29sQx=iig}gQ8GVx!onIgt=C`4ib=4f#O2GCoX%R>b_Y{GO0J>-
zqXO*L%9R&zU>7|+E^(d|1SP8M>2q}0^=~uf+EggDaWCPgODRv5;O^VJhhvIx9lODU
ziBo~2BPT7LFQ41m-3?-zA2wzwGx}f9UlY-&R-Y4m>%d9M+jT8_&Mf;DW|7Sc?ZUfv
zu?ByiX87>yCq-ITwh<$d+O6z-QqST_4vjulcgDT}P%+zc7f)HJmA>Zr+-Ot*ljJvn
zx4y1EYjRcI*%eF?t5?E82j36vyxvn8`V^*4di$u{NkO6I`6b&LK0)`Ki(mXsaWaAa
z!NV$6&4En)C+B~YH$DJIm+pjkU%tJ4z)Qf(LSNU37qY#Urwd#0r^K-TatS>0<$TlM
z99X#nXii8T$sGH4h0Wn)eKR#4ic;@1o=<Hya(@=<RNMRhR!~t*&6qMi`c5Z%5{m6f
z$iD76HiFo4TYbIJ&gXRJ6LWxzb~yCL$H%4oJdk2;#zSiccLMmnW^p+e)PnpI>wh9v
zj!)$79ZDK80M~d+uIzIS%~?I&-JMX*m&E{ySZweqedRaD=&n_?Spc_3;!_e^+p%Vv
zmbopZ&Txj`%-Q+k)YOzTUwv8{4{fyW%%53MYde&|T6_tiC>l!kOn%|H>sY;Nq9I^e
z;z~VPyt(_cc$Pt-Fe00A>&wn5I9v7Vck!G!q|h?lDblKC?do8omZU*`a$DSpG>{RC
z6v)dZ@Z0~+L59B~jh{nj@RrOIq@ZOjt}9Nclf&I<B^JSmO}(nBs#p9qB+_klzq!88
zZ86evasoqK7&Q9N-d@wr1U>_6>*Uf5M<^6`YNr!>7S=eAK$kIM&SgY(6o5C3S2U*Z
z{f`;Ww%6LgA)pS~+KCt!4p}W={YJA5A!5mGqvtLB8QE@eREQ`1HB2$?wP0{SNm#0a
zP%Tc=lR)?_q9}+k>D#Gr2BQ6gCejK6X_|w-JMmw<Xlt{vLfB4^KV=l>Q&ClwmXcZy
z+nm}36m9M8jgUyB&7hb|($X%;*$<tcFPaf>xm^{jfGHc}GbP)ypn=EgVOafK`{FR%
z&YpVf(%4b!3n<tGzc-@c?aMfwNh?zflY78ZJYkC5_X^DBKOh}B7&!=KrqFb92{R`!
zMDpNP^^lUO!KNplafLw)ddAVPo_0?9FIkU8igelOmF4vQEA18ZdhGuSk%PLV3h=k;
yv6!*b|11AMf8+l`f6x9${y*S9jIsRbMbOiFy5!Q(4h)Fem`#i<4a@ZJKK>8p-T!+4

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/favicon-16x16.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/favicon-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f7e13b0d9903d27a9129950b1dad362361504e4
GIT binary patch
literal 445
zcmV;u0Yd(XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mNkl<Zcmb7D
z159;s9Q};(!|X7pDa~QFYc{f*`Lb)sH80zZad^g*ZOnV`e^3AOY~1bg;Qsi@|4<YW
zFBDs&P{g6UKk;-vHxhFb1BJ>rNm2=6wQ7&2F}_`h_PI>(9Fx!5<0%l6W{u<q6VKi}
zo6$6tijsj(LC;2s-8`EhP3C<}<OdbS_2d6Z413m%|8to%x^re|u0OA98gO!V5Fk9c
z+sB5c(HTh!sIk|Cc{67hF;pbAV}Eh`VsXD~jwc;au)-{o3wV4xM&<DD0E6<OA9#E}
zalOmJ7Jynt@We{<<K%8J%ol55I(^G|=$Okw$9y(=mvYfGod(nSisY1#i?-PeQ0rqr
z(0sls$u!8Pm?zC>0OQ#*rglqx3__&vD?|#%fhn*Mn&YY1i+JQHqPvZ34FR@_E%P@x
zzTL;Bw#nJXWY}D7^bC>-bx{t|^|R6Oci&MKvov8Op~S=}R=h^p-=vZ0uqG@LE6tP7
n92{cY$^db6>&z__iT?Z#Z8B<z?96i*00000NkvXXu0mjfDd^H+

literal 0
HcmV?d00001

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/favicon-32x32.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/favicon-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0a3352ffd3fec6f2afb4cfcc34ec3a2976f45e3
GIT binary patch
literal 1141
zcmV-*1d98KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000C$Nkl<Zcmcgv
z1I%Sv41R0dwr#{-$6njEJx1``wr$(CZS$hjZ}QGFe>G|DVcT0DjiaEd>Z!7_`J}8!
zKk_$1lGm$vJOY&DjT-(&VGn0;R<l!}sPctO_<Kc>`iN9=1aOuG`H}BlY>&R3KbGER
zB2$7euhH;y1C_LTQex%L6khZpkjFn!ajOUK)f3JLz+I;CE@(N)T)CM4AWjfl-(04=
zrsMQ)#NG6nr^Y7!6LA;iHXh?UOFE%hhy>7dl=;<sp+Q`(>I$J>g0BH_r|_4ctEsXx
z2sDIQnwa*rcK=*3XUC$D{I@}DTNs@GCb7dB2%%nV%jR){xktt;Ah09op7x@l5D6B2
z0uBdt0YmcN!o?lMpu9Io(1&B1s{TUu*a>2&>Iycx__fbDRM8PYtLt+#G*xSt(cn}K
zt!~W2{`9r)xkh^xodLS&FbYw`x$t&Vhl?)#f&k-lZIs<`$gTj{^#^HewuJz(WnUZZ
z{Ty_aE;^93bhc-^^k6ZM!^e~$q5!Zz`XPta{a@651gPzaFx$&%IHL6hx$mSeAa#n6
zLkyc<Xc<f)!0(|qIV=FQ2xuKlGu!(+{0?1cGViA~Pz5H)VmM$fKpFvl3%TB50e%d;
z989QnDBaRNd`U#a&(J^wCMB&N77zE0mqAkc%I9o{1^CkY41^sGOjcRkFKTrY8i>-M
zs$qhBZhCNE^aIEV)H_~^IeqSRnvo!21Qc`Z;S9!IqXl4K(RUImejotzuG65LVuGS#
zcqp@OA8~ln^4c^VihUew)IOX^E9<lLYshtAOq26nG_}yf<1^Xr*YepJ>KMtvSvnZ|
zC@rl{f(B*PA26aFR`|X!!I(7x_|kq{rlqwhCia+CfNbOg_yYt0bDCc4g#h#`3jpCd
zNAhr%4#Ye{i>ni$fzY%r0IS%l3HHZ4tTjOi=JW-t_iG~)oC!2C!52Cc<ii9I-mVEE
zFe$d?gcHIE&vM!c`zI?cJ7J4(LMdi<!Z5&Q7$RK@0T70gK_a?y4-(Ps28l>|TAPaH
zJ}l%m9yPmA-4#lJea@uf$a`(1;={rL2f*8;7%icbF}e^_`X#ndU=SI0nIn8hXPXHS
zSN4rbF}jl0HWx(_`q`-SRa9jP8<m}bX5|>Ab!}sThNkQ634k=qXBVM4`o{M>qrLJD
ze*%D)S;wpxG$d%FcDf-6%zMqWA+gw!C1~T5+|ys$G3Ksm&x59Lyd?0l+LWSk6hc4~
z+yC>|4f;X3#cq3!)>#Mvb-^co7LMrzqWeKB$21I>tJgaGFwu6eB%&j?@d*8GAx~In
zI1p-lXVKtcvY7;$TX~wjYw|QhB%q!npQES%F~%Aqz~pJB%rNu!xAj;>xZt75!VHju
zfFy%B-`3;Qf<{h94~I62zcHv}D5pS-QCN`M8K1>jN9mpbrFk=5no8j!00000NkvXX
Hu0mjfOavUK

literal 0
HcmV?d00001

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/favicon.ico b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8b60bcf06a7685b9ea53983c125e7058906fbcbd
GIT binary patch
literal 5430
zcmcgwYiv|S6douFYJ&9<MKoz+5Q#?d6-EANqW&-%|4ZVF5W)|62np1JhG6AgFww|E
zA(Xb*((O`+SU_r5u@nl@QlUyKOM!x=U3nC2mv-+Szi;l&dT;mcc8QIXOlIzxbIy0>
zoHH|LSE(UtsLIS#7_-&1VM>ivN@Zu;-zA{00&N^<n1aKmWAJPuqMY4|Mjwnst;JT<
zI)E|6&N(`0(J@Y5=R6vX4kJ&WW%c@k_3~!bCV6h#O5Hgx1C49cO<oUK|M81|%HzHz
zqSjCM>|8r`@w~u}3a1X>=27;pf_a{DPJMTR$JSvjrVZRL?J~Ga>i0<Pg;NQ7YTJXd
zwBdVAe++i?S&?4Ka?jka!D!NU<ix)X{f<p@<+n@iaeCRwdhEmY^CbAk@CC1gWW<Kq
z@oz)F`RiE{><Y!{^eN<Zj3!j%Yx?w>GO0Y%B;(7M$}2m+kcrz@>Hae2Pk^@b^f8%H
z<I}v1jft<3e;@L@&O+X|R4DU&g)RTmx1VeI@6H?-V$dcdPaFE%e@hbkPkGy)R~~GL
z?<;Np!RNOB?D)}U+O@cTw;b?_A83p%c^GTPobj`Bz{*R8Yy59U<_~j?*d~XWi}0nN
zI*c8L-#Ly4ZcNsdztj`ckw?4ek4aSp!nm;0zdq1xn-kBEvBTbr_xa_yGy8S&hqIJw
z9j;U$L#c&B?CyC{fN0jqOBu@Yp2<dk5uNu@vgX80HK!kXt;huIH5a2V9O*lP`FVDG
z9`WJq<)Tk?-T|p}rn3hBWCAY-dRxJtR)bBgkjbSi1YGxMy5HEtP+(4hjt&C~n$(BR
z%9^HqGVkDanflW=x^qt2k<PP19@CJEA=ojMy3)lZAMzm+dtfeVRabk%lHd4)j4fRh
zKabA*b<Q6uStKiuR!J9R*r)?G?4VA34(JQ;jRtn3k=@)}C!-2;2gG&S!1=w9DL8R3
z?vIFN9fK{SQ`r#Px5h?J$-9A~8^-N#$J^DLg}T^iLoz=wMu>L>`N;qJuC@Oe+t~7I
z<(F|AfU$#EfN{kFKA+53u@A<+4YnEIf**{2=Cu<aIX)7(s`H%jHZmOfW)y;U<$90K
zedn6joM)g5yjxlh%WWIyxO8ngae(gS9o^wPo3Ljt>CE#{h4Wo9v-X#BN#D=ro%g~u
zG`=OQBiQEDZgc6n2RYf*+oRWbKVZW9eJJuGNa8A-F{8(f+y@)q2tylad}QmVTBh{m
zkpvl@O*Y<9#KzvA<u_w9w)B$({+)Q+*|N5LoUoS6j{Az{YZ=xY{dvaVejpYbuyLP9
zayV}YwI%RUwlaqQK=DVO>;3if`|g4qjlr75YyFqbGlV2Q--{B?*ERj@$;+A#v6A5%
zKJZ-k(ti_bGM?eOj#f{ZHOKc6lK8&sk-j?4Kdjr4z{}bU>r#UnlQ<b)&2-g(to_)H
z4I^M9dH5YT-=gh)+P^%$Zut0Ku)#*Wp^-Mur|m0o@iEtNS4n5jRWUmDw*4-b!rj7H
zaE~Xibn4oZHjFM>AQ!`bOZB;Ct>?+|WpbgrOY2zPu-B!V?-m<!5bw7)KF<;HLp|5z
z8UG3`zX$llxW9OT#&5aYp>447=gVK<tvYu?^FD=rcXVIXI+n%ibF+UZK75eW|E%Zf
z|NU|Q&w&5`%>(*?-RQObKSO{281uhZ-RJZ_ax0d9HE}&gAII8uJO7-x&ULT3$-hG#
zr#*GDR$v46R``GL&)??M=Z|+Z8{*GeE`I+!{6E}3tWV7S1MCU*9ccYQdsa7AC-|$l
z<q(%r*6;me@Mu}``!_#!|MJc!HdHIbK)*lN@c!`bbn2VA->32U8*#-^_c?O%nK{oI
ze@n2<uJyZgu_odh#}<pbt^sh)M&dneC%p*!HM%(R{be1+bI-Ur*SzMuTQ6Vl)^GN$
z8{NNG3z`oSg1;|a?=ML7LA?HWFHk%nju&<++B?;SI_``;uw3;A@$Ec__-P-{{2RO1
z4Vn$FRjzf^U%IYNsK00fYeU%9U~HH?2!3EK$G3<L=dBU@Oj(D+hEc`_`ilAAKPOZ9
z*{rdSV%<g^1{=Cl*5BYW`N-c~ek03s@!7A{GOjdlz?kq3S&cf%<T-U<KNa+?(Vxx;
zIo3v#nX9y)jk=DaPFdenBe{65`DU{7?PmSJ8pha6e#%0}6zamKtKLrc8#+cp$6UlN
zXnT^HQ#bO$e>sr7p*=%uQX9Dk-qo-r2V)7}P0ZWaab6B%)NcuSZfL*ZERjG4kd;J~
udLgV-)@7w`Z&hkIdqAlS_J#Nx!E}|RnRSkVm|Sa24|P&EF^Huxf&C8$As%)B

literal 0
HcmV?d00001

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png
index 2ed3cf64be72132f93719f8014a6f440b06d818a..ce3908e3f275ee790b38b28bdd03084cdf46bfe8 100644
GIT binary patch
literal 455
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TG2?0JKu0T4Zo>){e-JpKHLwvhH
zX1~Ig<Ng2t|6jGgp>uh_m+$ZAZ!g$?e*UTJ>#yA34>a)p^YgFX-=DHR;hT%5Ezl0x
zk|4ie1_1|y`S<^yFHqRu|30Ass2u?UjxX+x1S<UL>Eakt!8mnNYh!~056i`)Z#nY*
zhX35OV=vFSIcgXGHRnmR{d~l8nyoPAy<V-%20dP;Ih>0h&*95EvU}OyNBesBB<QSW
z^1Q_3vb4)Tdik?i6T6ovw0i9H&u{PuUB6d4^Wf9^?CguOCqC}|f9cz9zJ1?#7Wq{%
zeB8dWSaSk{mh-fPi13}S{Myz`i#pj6HfhVGM@x!VP73le-F8Ad)Z28fiQ37HhF;s=
z@~Bit?cD$TvFCB06QTLawc^v*gFF{ITym7!cjK1a)s?q`jnry7SL_w&x47lgqJC)Y
zlC|HHDm9mHxX$-w`cK)uJ&TXGvzcA5aqHJ%yTJb~(w;Hygt&usWFR*%5EwjN{an^L
HB{Ts5?1|19

literal 1620
zcmbu8c~BEq7{J#C1BpOmK+ed-7%-9;0wG}uAtalG+)D@{k_bw;BwWEHRcI>}?}J(t
ztryN<J0exF8LK!Roe`yK5S13if~DXf2$IrDJ^s)ReFVqx-%fwCyKm=v@9p<{-@dm)
zi^}})VR#6F{1kGD4zv+7w+{w9eJ5Aeg9c+q6nY;YpGS|=h9Kx8u~w~@PESvJd3k|O
z5XWM%;GIY$5(or;e}7+JUpyX<!{L3reLy^Lh5*p@J{}cC4Gjqi3JRK?@<DtFnM{s|
zhyY!)<Bdkca)Vx<q1EZqbUHL$i)yv%G*peEDvesHQ7cqRxl);`RLJFWiCiv~r6Q@|
zk|Gj`P>cu>M1Y8rg+jhiC`b|TlKDJ7A5P}ONxTFekIUo1iHR@_b6}X8z-4neaq(;x
zi?xi&WX3QVOeUSdpfMQH0DAP2=x7>kN#s&mB#jmY{Hatjl}cGej_~+~FC>MBg@u4M
z0d3%>RmwaX5>H-%K)?s75kAbHVKzGqCvdr3jwf$CNX=%mLH4*fR$MF-IIvhTK*Qs}
zc&`B*fC&(oHSuTw6Ut%=DBEo1B7g~r6y_lW6xmbe1>gsOQm@i#bTX-0z>}vWNxAVL
zBUl<3X_89~QW2V*l+K3{4m(dFH7le!GO-B}7)AW76n>_Fmn{)xBZ4BCxG)vTmk0|a
zh#3*&A%a{{a<N2M1R`Q#J|d{DE?H~M`=l(_Vac%<nrwMlYgT1iSLiCTwB?zavUF7`
zDlbt<Eiy5f#p%881{<i|p+hsE`SU3h3Q+PO@sRnBA`k2S2iyNUhu(2=hRd^bbq&li
z2>=J+L!d<qmxIOND&<By1kEGP+;e^zsCf&5B!@K1kzp-ztTWpRAyI)fuaKN-u@$bf
z+Dh$YaRztn%Go+FZo$krv8~YTuvja|dP{jB1jod3Vq)VS(nqd=lebqP5$S1r@^d#}
zqRd-DTU(E=N7TMqkkwsxkUQ8}-`2~l2*epIIK|v?T)@Uh*X)f`>z{q}EO5*5<5lFX
ztT~aF-W=wwXlAasy!KA#{!_vCc8`r){wOYAfK|}Zg9PJbxS`Drk;)p~zY|Tt-88>*
zwriWWb1zVDZt<?aifzb#J=Jt2Yh}~u*r$K$2jZKCb}!3y=1<pRp7-wvx_E5vly5*k
zCcN=MKv4wj{45~QEvU@>TG?paYc|7T*|z0vmc|>Drcq6j5NpMz|2?cHb`i@?uwOi^
zq83NCbnz;42Pc0dj34#(XLPH(clD@>^Tx(273Y3H^+xZ#{TS}&gSD83m-~j}1AOfv
zMVs~g)RU1HH|1RUc<k(*Bd<s>D`si?r4G*GZO0OveK+}{)fDYSTMi+hjRZR>cge1S
zR@On$u^Zq1me^ji^p@q(E2tf<f1%t|HB3E1tj6{>BTvg3>Jq*E-5aaR-qd1lcM;WU
z`vf>j9jA6B>rS5l-}&OHq0;I0;+3!cMzi&fqek1LqNjZyefrl8q?U<>9#!evrstg<
z9UZRNU`5UKvUD!GPtvYGoKo%T9HASStIj)gc|l1glldggnPy|@c4zEtP{iK5USC1K
ziz=MEGQLy=x@c#Hg$F8HUC&hyzUtY|{)^#UHYzzVSzcQ3^7e(a`*rm1RIaV^#o0IS
z_w{vkWbY|374IK1=xA3vqFX{vwfG#EEU9>G9xCaaa>Z+G%+t}diAF+FEzVq};smoa
zbi)HvbN`b!s}nDrr&Ia{2953Bcl~x&Cvp!-BYU1?)gSHc36Gp-R=&RcbjO;eQEGE&
ta!w9m(NDOMo}d5m!&kLnqYQAv9LOHZ7#!&yyal!|q>!SLGf3{ne*t=UPFDZ`

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/pet_store_api.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/pet_store_api.png
new file mode 100644
index 0000000000000000000000000000000000000000..1192ad8cd6a715fb011b90239abb2ab39c18e508
GIT binary patch
literal 631
zcmV--0*L*IP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0006$Nkl<Zcmb@H
z18gQy6oqGPD_R?|&Dw4Uwd1wDbsLq@+Kf@HZQJI&-#&Zq+UU$lPMq(1eiCQyyanCj
z;u9B#hDAIN4he^mGJ{x4m??1zi;8>2CnRl`6%{3=WvHubFjQv9iUwvfTZ)ZKT%oAx
z*uQ^2%*y@)2f$2bOEjgYYf4ICc1lXhz{@4^y4BS;!0go5H-gzL;I+fQ#zVE7+5%@q
zG+Zs!2;kS@L3c>tdvpfxvid@gqozslUD;=@z<=jBghKGl@enzK;og}6@43zJnI?FA
z43>g^5E<hj3MN8i4~CFC!PQ!AToBOjz_w@_MCKS8{W$0uRBb%;gx+vAh8YtCUR{NC
z?pWx`2pTmlPudVz^83M(+Xp-&&-pza7x)Qon>PV^>M#gx6oCi9dSD&=kB(E1!T;?1
z|825|>b-j&zU#-~y?zwd#WSGGH1c$U=k$T|^rjz==l=;TC$`{iN<Ug#YVv?jYffve
z42I+E_D^sF0(Vn5L~?HkK8o4n2u_uUK(uW50yiY^wAVl=o%smzQRE{@8`&5B7v}*p
z1RU?VEpYG1;L8L(V?19j`0gAxPr%`4K*$pG#J(izPbcP#xdM)7e+`@s(ePf}3r>dw
z{Ir^#`i4)>HGep(SFeHDS+k~uKAgzs5`EAM(qt8FZS62C?d|))%((cZMbfO<bGs!Z
zCU25e4W(t}ymp4l4E~Raxq06Fxm_g=OK2v`X-aQ+-HenO%zD3~;!<$41puqpLakTU
Rgi-(i002ovPDHLkV1l}pEDitw

literal 0
HcmV?d00001

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/wordnik_api.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/wordnik_api.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc0ddab138f12d90a530d7bb5f460da6dc6472ad
GIT binary patch
literal 670
zcmV;P0%84$P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0007INkl<Zcmb`=
zQ`Fp06b0a0+iruK)P3$-t+(>2wr$(CZQHhO+t&P1dAl<!(+Pi{wZ6g5J|`r;V=Uq7
zz!unOEafVY<Q`)&w;PycMe-hB#N{#;azB7sz9P%!?rB@N6tN!Cm+-0ex%_rmr_bR_
zM{@ih2+U=m?RgbA1$*_yd>a4b)A>yLEdDSsn@w;YSb%e|)s-E@t@Pd(%;0lq)A`T9
zlIRI;Wh8#1O%b{POB%ij2^wtzO{+~59szThVDbKUyQ7bjQ<9(wt<0W69Vgrd7B&`3
z<AjYc0**y;^S704L?@hC?kh72r1CwkjuSJeqr^VIEPvHeLIZmT|5ut^Sp&0c+v}%}
z5i>^%!^E;MUL7tz0cLZOI0s#t&E(0^b?v^z&ACvUs6)iN$`FL0IISh|9J6cRRihpe
zWgvY4Oc^LT4WJ*9=Z*6?I%e0k57hLEDE;V2c&PM6VCv^^L>)#`2OZa^(v;{Na_mI!
zT!LQVqSBM5SNhOuF}>+dU=F?LnwX(tO80Ry!?V@yKJ3D+a!Ol@9rscfnkA+?{RGSj
zFBvSQ{NEc%Q<#~zhuy9;tNX6&CDK`7K6WZSq;w|y-Wt%k8td^;2dR9hqx2hCfPEGg
z;4f~}@IT&CN*QV=9R!v{*F&wP4Bi*Cmb1cRU}3Go-ygvM=4L%N;G^|B;w|JSe)GM#
zTngU9r|&J~!QYw{&ik#oTpa(m0<**O9e7s4?BI7dWG~^JnUUD$dlOjz&XF~iMPz?~
zMIbBX>f}J4k0f@!H!QptnB_c4?)g@)aBpCivGLve2Sz_7uG`HszyJUM07*qoM6N<$
Ef*R;Uh5!Hn

literal 0
HcmV?d00001

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
index 01fb8ee2a0e..7fedb694c17 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
@@ -1,24 +1,28 @@
-
 <!DOCTYPE html>
 <html>
 <head>
   <meta charset="UTF-8">
-  <title>REST API Explorer</title>
+  <meta http-equiv="x-ua-compatible" content="IE=edge">
+  <title>Swagger UI</title>
+  <link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16" />
   <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
   <link href='css/print.css' media='print' rel='stylesheet' type='text/css'/>
-  <!-- @CHANGE LDR Remove external links <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet"> -->
+
+  <script src='lib/object-assign-pollyfill.js' type='text/javascript'></script>
   <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
   <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
   <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
   <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
-  <script src='lib/handlebars-2.0.0.js' type='text/javascript'></script>
-  <script src='lib/underscore-min.js' type='text/javascript'></script>
+  <script src='lib/handlebars-4.0.5.js' type='text/javascript'></script>
+  <script src='lib/lodash.min.js' type='text/javascript'></script>
   <script src='lib/backbone-min.js' type='text/javascript'></script>
   <script src='swagger-ui.js' type='text/javascript'></script>
-  <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
+  <script src='lib/highlight.9.1.0.pack.js' type='text/javascript'></script>
+  <script src='lib/highlight.9.1.0.pack_extended.js' type='text/javascript'></script>
   <script src='lib/jsoneditor.min.js' type='text/javascript'></script>
   <script src='lib/marked.js' type='text/javascript'></script>
   <script src='lib/swagger-oauth.js' type='text/javascript'></script>
@@ -37,6 +41,10 @@
         url = "swagger.json";
       }
 
+      hljs.configure({
+        highlightSizeThreshold: 5000
+      });
+
       // Pre load translate...
       if(window.SwaggerTranslator) {
         window.SwaggerTranslator.translate();
@@ -51,8 +59,8 @@
               clientId: "your-client-id",
               clientSecret: "your-client-secret-if-required",
               realm: "your-realms",
-              appName: "your-app-name", 
-              scopeSeparator: ",",
+              appName: "your-app-name",
+              scopeSeparator: " ",
               additionalQueryStringParams: {}
             });
           }
@@ -60,11 +68,7 @@
           if(window.SwaggerTranslator) {
             window.SwaggerTranslator.translate();
           }
-
-          $('pre code').each(function(i, e) {
-            hljs.highlightBlock(e)
-          });
-
+          
           addApiKeyAuthorization();
         },
         onFailure: function(data) {
@@ -74,8 +78,12 @@
         jsonEditor: false,
         apisSorter: "alpha",
         operationsSorter: "alpha",
-        defaultModelRendering: 'schema',
-        showRequestHeaders: false
+        defaultModelRendering: 'model',		/* example or model or schema */
+        defaultModelsExpandDepth: -1,
+        showRequestHeaders: false,
+        showOperationIds: false,
+        displayOperationIds: false,
+        displayRequestDuration: true
       });
 
       function addApiKeyAuthorization(){
@@ -100,13 +108,7 @@
       }
 
       $('#input_apiKey').change(addApiKeyAuthorization);
-
-      // if you have an apiKey you would like to pre-populate on the page for demonstration purposes...
-      /*
-        var apiKey = "myApiKeyXXXX123456789";
-        $('#input_apiKey').val(apiKey);
-      */
-
+      
       window.swaggerUi.load();
 
       function log() {
@@ -118,14 +120,14 @@
   </script>
   
   <style>
-	.info_title, .info_description, .info_contact, .info_name, .info_url, .info_email, .info_license {
-		display: none;
+	.info_title, .info_description, .info_contact, .info_name, .info_url, .info_email, .info_license, #api_info, #input_baseUrl {
+		display: none !important;
 	}
   </style>  
 </head>
 
 <body class="swagger-section">
-<div id='header'>
+<div id="header" style="background-color: rgb(38,60,92); height: 17px;">
   <div class="swagger-ui-wrap">
     <a id="logo" href="#">Dolibarr REST API Explorer</a>
     <form id='api_selector'>
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ca.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ca.js
new file mode 100644
index 00000000000..f8c815aa92c
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ca.js
@@ -0,0 +1,53 @@
+'use strict';
+
+/* jshint quotmark: double */
+window.SwaggerTranslator.learn({
+    "Warning: Deprecated":"Advertència: Obsolet",
+    "Implementation Notes":"Notes d'implementació",
+    "Response Class":"Classe de la Resposta",
+    "Status":"Estatus",
+    "Parameters":"Paràmetres",
+    "Parameter":"Paràmetre",
+    "Value":"Valor",
+    "Description":"Descripció",
+    "Parameter Type":"Tipus del Paràmetre",
+    "Data Type":"Tipus de la Dada",
+    "Response Messages":"Missatges de la Resposta",
+    "HTTP Status Code":"Codi d'Estatus HTTP",
+    "Reason":"Raó",
+    "Response Model":"Model de la Resposta",
+    "Request URL":"URL de la Sol·licitud",
+    "Response Body":"Cos de la Resposta",
+    "Response Code":"Codi de la Resposta",
+    "Response Headers":"Capçaleres de la Resposta",
+    "Hide Response":"Amagar Resposta",
+    "Try it out!":"Prova-ho!",
+    "Show/Hide":"Mostrar/Amagar",
+    "List Operations":"Llista Operacions",
+    "Expand Operations":"Expandir Operacions",
+    "Raw":"Cru",
+    "can't parse JSON.  Raw result":"no puc analitzar el JSON.  Resultat cru",
+    "Example Value":"Valor d'Exemple",
+    "Model Schema":"Esquema del Model",
+    "Model":"Model",
+    "apply":"aplicar",
+    "Username":"Nom d'usuari",
+    "Password":"Contrasenya",
+    "Terms of service":"Termes del servei",
+    "Created by":"Creat per",
+    "See more at":"Veure més en",
+    "Contact the developer":"Contactar amb el desenvolupador",
+    "api version":"versió de la api",
+    "Response Content Type":"Tipus de Contingut de la Resposta",
+    "fetching resource":"recollint recurs",
+    "fetching resource list":"recollins llista de recursos",
+    "Explore":"Explorant",
+    "Show Swagger Petstore Example Apis":"Mostrar API d'Exemple Swagger Petstore",
+    "Can't read from server.  It may not have the appropriate access-control-origin settings.":"No es pot llegir del servidor. Potser no teniu la configuració de control d'accés apropiada.",
+    "Please specify the protocol for":"Si us plau, especifiqueu el protocol per a",
+    "Can't read swagger JSON from":"No es pot llegir el JSON de swagger des de",
+    "Finished Loading Resource Information. Rendering Swagger UI":"Finalitzada la càrrega del recurs informatiu. Renderitzant Swagger UI",
+    "Unable to read api":"No es pot llegir l'api",
+    "from path":"des de la ruta",
+    "server returned":"el servidor ha retornat"
+});
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/el.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/el.js
new file mode 100644
index 00000000000..fcd1ffdd5a9
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/el.js
@@ -0,0 +1,56 @@
+'use strict';
+
+/* jshint quotmark: double */
+window.SwaggerTranslator.learn({
+    "Warning: Deprecated":"Προειδοποίηση: Έχει αποσυρθεί",
+    "Implementation Notes":"Σημειώσεις Υλοποίησης",
+    "Response Class":"Απόκριση",
+    "Status":"Κατάσταση",
+    "Parameters":"Παράμετροι",
+    "Parameter":"Παράμετρος",
+    "Value":"Τιμή",
+    "Description":"Περιγραφή",
+    "Parameter Type":"Τύπος Παραμέτρου",
+    "Data Type":"Τύπος Δεδομένων",
+    "Response Messages":"Μηνύματα Απόκρισης",
+    "HTTP Status Code":"Κωδικός Κατάστασης HTTP",
+    "Reason":"Αιτιολογία",
+    "Response Model":"Μοντέλο Απόκρισης",
+    "Request URL":"URL Αιτήματος",
+    "Response Body":"Σώμα Απόκρισης",
+    "Response Code":"Κωδικός Απόκρισης",
+    "Response Headers":"Επικεφαλίδες Απόκρισης",
+    "Hide Response":"Απόκρυψη Απόκρισης",
+    "Headers":"Επικεφαλίδες",
+    "Try it out!":"Δοκιμάστε το!",
+    "Show/Hide":"Εμφάνιση/Απόκρυψη",
+    "List Operations":"Λίστα Λειτουργιών",
+    "Expand Operations":"Ανάπτυξη Λειτουργιών",
+    "Raw":"Ακατέργαστο",
+    "can't parse JSON.  Raw result":"αδυναμία ανάλυσης JSON.  Ακατέργαστο αποτέλεσμα",
+    "Example Value":"Παράδειγμα Τιμής",
+    "Model Schema":"Σχήμα Μοντέλου",
+    "Model":"Μοντέλο",
+    "Click to set as parameter value":"Πατήστε για να θέσετε τιμή παραμέτρου",
+    "apply":"εφαρμογή",
+    "Username":"Όνομα χρήση",
+    "Password":"Κωδικός πρόσβασης",
+    "Terms of service":"Όροι χρήσης",
+    "Created by":"Δημιουργήθηκε από",
+    "See more at":"Δείτε περισσότερα στο",
+    "Contact the developer":"Επικοινωνήστε με τον προγραμματιστή",
+    "api version":"έκδοση api",
+    "Response Content Type":"Τύπος Περιεχομένου Απόκρισης",
+    "Parameter content type:":"Τύπος περιεχομένου παραμέτρου:",
+    "fetching resource":"παραλαβή πόρου",
+    "fetching resource list":"παραλαβή λίστας πόρων",
+    "Explore":"Εξερεύνηση",
+    "Show Swagger Petstore Example Apis":"Εμφάνιση Api Δειγμάτων Petstore του Swagger",
+    "Can't read from server.  It may not have the appropriate access-control-origin settings.":"Αδυναμία ανάγνωσης από τον εξυπηρετητή.  Μπορεί να μην έχει κατάλληλες ρυθμίσεις για access-control-origin.",
+    "Please specify the protocol for":"Παρακαλώ προσδιορίστε το πρωτόκολλο για",
+    "Can't read swagger JSON from":"Αδυναμία ανάγνωσης swagger JSON από",
+    "Finished Loading Resource Information. Rendering Swagger UI":"Ολοκλήρωση Φόρτωσης Πληροφορικών Πόρου. Παρουσίαση Swagger UI",
+    "Unable to read api":"Αδυναμία ανάγνωσης api",
+    "from path":"από το μονοπάτι",
+    "server returned":"ο εξυπηρετηρής επέστρεψε"
+});
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/en.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/en.js
index 9ccd65ad1d7..918313665db 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/en.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/en.js
@@ -28,6 +28,7 @@ window.SwaggerTranslator.learn({
     "Expand Operations":"Expand Operations",
     "Raw":"Raw",
     "can't parse JSON.  Raw result":"can't parse JSON.  Raw result",
+    "Example Value":"Example Value",
     "Model Schema":"Model Schema",
     "Model":"Model",
     "Click to set as parameter value":"Click to set as parameter value",
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/es.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/es.js
index a8dff60b6a9..13fa015e6df 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/es.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/es.js
@@ -27,6 +27,7 @@ window.SwaggerTranslator.learn({
     "Expand Operations":"Expandir Operaciones",
     "Raw":"Crudo",
     "can't parse JSON.  Raw result":"no puede parsear el JSON.  Resultado crudo",
+    "Example Value":"Valor de Ejemplo",
     "Model Schema":"Esquema del Modelo",
     "Model":"Modelo",
     "apply":"aplicar",
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/fr.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/fr.js
index 2e095ad0948..388dff14bac 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/fr.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/fr.js
@@ -3,7 +3,7 @@
 /* jshint quotmark: double */
 window.SwaggerTranslator.learn({
     "Warning: Deprecated":"Avertissement : Obsolète",
-    "Implementation Notes":"Notes d'implementation",
+    "Implementation Notes":"Notes d'implémentation",
     "Response Class":"Classe de la réponse",
     "Status":"Statut",
     "Parameters":"Paramètres",
@@ -28,6 +28,7 @@ window.SwaggerTranslator.learn({
     "Expand Operations":"Développer les opérations",
     "Raw":"Brut",
     "can't parse JSON.  Raw result":"impossible de décoder le JSON.  Résultat brut",
+    "Example Value":"Exemple la valeur",
     "Model Schema":"Définition du modèle",
     "Model":"Modèle",
     "apply":"appliquer",
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/geo.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/geo.js
new file mode 100644
index 00000000000..609c20d9c86
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/geo.js
@@ -0,0 +1,56 @@
+'use strict';
+
+/* jshint quotmark: double */
+window.SwaggerTranslator.learn({
+    "Warning: Deprecated":"ყურადღება: აღარ გამოიყენება",
+    "Implementation Notes":"იმპლემენტაციის აღწერა",
+    "Response Class":"რესპონს კლასი",
+    "Status":"სტატუსი",
+    "Parameters":"პარამეტრები",
+    "Parameter":"პარამეტრი",
+    "Value":"მნიშვნელობა",
+    "Description":"აღწერა",
+    "Parameter Type":"პარამეტრის ტიპი",
+    "Data Type":"მონაცემის ტიპი",
+    "Response Messages":"პასუხი",
+    "HTTP Status Code":"HTTP სტატუსი",
+    "Reason":"მიზეზი",
+    "Response Model":"რესპონს მოდელი",
+    "Request URL":"მოთხოვნის URL",
+    "Response Body":"პასუხის სხეული",
+    "Response Code":"პასუხის კოდი",
+    "Response Headers":"პასუხის ჰედერები",
+    "Hide Response":"დამალე პასუხი",
+    "Headers":"ჰედერები",
+    "Try it out!":"ცადე !",
+    "Show/Hide":"გამოჩენა/დამალვა",
+    "List Operations":"ოპერაციების სია",
+    "Expand Operations":"ოპერაციები ვრცლად",
+    "Raw":"ნედლი",
+    "can't parse JSON.  Raw result":"JSON-ის დამუშავება ვერ მოხერხდა.  ნედლი პასუხი",
+    "Example Value":"მაგალითი",
+    "Model Schema":"მოდელის სტრუქტურა",
+    "Model":"მოდელი",
+    "Click to set as parameter value":"პარამეტრისთვის მნიშვნელობის მისანიჭებლად, დააკლიკე",
+    "apply":"გამოყენება",
+    "Username":"მოხმარებელი",
+    "Password":"პაროლი",
+    "Terms of service":"მომსახურების პირობები",
+    "Created by":"შექმნა",
+    "See more at":"ნახე ვრცლად",
+    "Contact the developer":"დაუკავშირდი დეველოპერს",
+    "api version":"api ვერსია",
+    "Response Content Type":"პასუხის კონტენტის ტიპი",
+    "Parameter content type:":"პარამეტრის კონტენტის ტიპი:",
+    "fetching resource":"რესურსების მიღება",
+    "fetching resource list":"რესურსების სიის მიღება",
+    "Explore":"ნახვა",
+    "Show Swagger Petstore Example Apis":"ნახე Swagger Petstore სამაგალითო Api",
+    "Can't read from server.  It may not have the appropriate access-control-origin settings.":"სერვერთან დაკავშირება ვერ ხერხდება.  შეამოწმეთ access-control-origin.",
+    "Please specify the protocol for":"მიუთითეთ პროტოკოლი",
+    "Can't read swagger JSON from":"swagger JSON წაკითხვა ვერ მოხერხდა",
+    "Finished Loading Resource Information. Rendering Swagger UI":"რესურსების ჩატვირთვა სრულდება. Swagger UI რენდერდება",
+    "Unable to read api":"api წაკითხვა ვერ მოხერხდა",
+    "from path":"მისამართიდან",
+    "server returned":"სერვერმა დააბრუნა"
+});
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ja.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ja.js
index 3207bfc0baf..1cbeb374ac1 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ja.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ja.js
@@ -26,22 +26,25 @@ window.SwaggerTranslator.learn({
     "Show/Hide":"表示/非表示",
     "List Operations":"操作一覧",
     "Expand Operations":"操作の展開",
-    "Raw":"Raw",
+    "Raw":"未加工",
     "can't parse JSON.  Raw result":"JSONへ解釈できません.  未加工の結果",
+    "Example Value":"値の例",
     "Model Schema":"モデルスキーマ",
     "Model":"モデル",
+    "Click to set as parameter value":"パラメータ値と設定するにはクリック",
     "apply":"実行",
     "Username":"ユーザ名",
     "Password":"パスワード",
     "Terms of service":"サービス利用規約",
     "Created by":"Created by",
-    "See more at":"See more at",
+    "See more at":"詳細を見る",
     "Contact the developer":"開発者に連絡",
     "api version":"APIバージョン",
     "Response Content Type":"レスポンス コンテンツタイプ",
+    "Parameter content type:":"パラメータコンテンツタイプ:",
     "fetching resource":"リソースの取得",
     "fetching resource list":"リソース一覧の取得",
-    "Explore":"Explore",
+    "Explore":"調査",
     "Show Swagger Petstore Example Apis":"SwaggerペットストアAPIの表示",
     "Can't read from server.  It may not have the appropriate access-control-origin settings.":"サーバから読み込めません.  適切なaccess-control-origin設定を持っていない可能性があります.",
     "Please specify the protocol for":"プロトコルを指定してください",
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ko-kr.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ko-kr.js
new file mode 100644
index 00000000000..03c7626d7f9
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ko-kr.js
@@ -0,0 +1,53 @@
+'use strict';
+
+/* jshint quotmark: double */
+window.SwaggerTranslator.learn({
+    "Warning: Deprecated":"경고：폐기예정됨",
+    "Implementation Notes":"구현 노트",
+    "Response Class":"응답 클래스",
+    "Status":"상태",
+    "Parameters":"매개변수들",
+    "Parameter":"매개변수",
+    "Value":"값",
+    "Description":"설명",
+    "Parameter Type":"매개변수 타입",
+    "Data Type":"데이터 타입",
+    "Response Messages":"응답 메세지",
+    "HTTP Status Code":"HTTP 상태 코드",
+    "Reason":"원인",
+    "Response Model":"응답 모델",
+    "Request URL":"요청 URL",
+    "Response Body":"응답 본문",
+    "Response Code":"응답 코드",
+    "Response Headers":"응답 헤더",
+    "Hide Response":"응답 숨기기",
+    "Headers":"헤더",
+    "Try it out!":"써보기！",
+    "Show/Hide":"보이기/숨기기",
+    "List Operations":"목록 작업",
+    "Expand Operations":"전개 작업",
+    "Raw":"원본",
+    "can't parse JSON.  Raw result":"JSON을 파싱할수 없음. 원본결과:",
+    "Model Schema":"모델 스키마",
+    "Model":"모델",
+    "apply":"적용",
+    "Username":"사용자 이름",
+    "Password":"암호",
+    "Terms of service":"이용약관",
+    "Created by":"작성자",
+    "See more at":"추가정보：",
+    "Contact the developer":"개발자에게 문의",
+    "api version":"api버전",
+    "Response Content Type":"응답Content Type",
+    "fetching resource":"리소스 가져오기",
+    "fetching resource list":"리소스 목록 가져오기",
+    "Explore":"탐색",
+    "Show Swagger Petstore Example Apis":"Swagger Petstore 예제 보기",
+    "Can't read from server.  It may not have the appropriate access-control-origin settings.":"서버로부터 읽어들일수 없습니다. access-control-origin 설정이 올바르지 않을수 있습니다.",
+    "Please specify the protocol for":"다음을 위한 프로토콜을 정하세요",
+    "Can't read swagger JSON from":"swagger JSON 을 다음으로 부터 읽을수 없습니다",
+    "Finished Loading Resource Information. Rendering Swagger UI":"리소스 정보 불러오기 완료. Swagger UI 랜더링",
+    "Unable to read api":"api를 읽을 수 없습니다.",
+    "from path":"다음 경로로 부터",
+    "server returned":"서버 응답함."
+});
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ru.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ru.js
index 381f1b3fd0d..592744e957f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ru.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/ru.js
@@ -28,6 +28,7 @@ window.SwaggerTranslator.learn({
     "Expand Operations":"Операции подробно",
     "Raw":"В сыром виде",
     "can't parse JSON.  Raw result":"Не удается распарсить ответ:",
+    "Example Value":"Пример",
     "Model Schema":"Структура",
     "Model":"Описание",
     "Click to set as parameter value":"Нажмите, чтобы испльзовать в качестве значения параметра",
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/translator.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/translator.js
index 591f6d40943..ffb879f9a27 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/translator.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/translator.js
@@ -7,7 +7,7 @@
  * after <script src='lang/translator.js' type='text/javascript'></script>.
  * For example - <script src='lang/ru.js' type='text/javascript'></script>
  *
- * If you wish to translate some new texsts you should do two things:
+ * If you wish to translate some new texts you should do two things:
  * 1. Add a new phrase pair ("New Phrase": "New Translation") into your language file (for example lang/ru.js). It will be great if you add it in other language files too.
  * 2. Mark that text it templates this way <anyHtmlTag data-sw-translate>New Phrase</anyHtmlTag> or <anyHtmlTag data-sw-translate value='New Phrase'/>.
  * The main thing here is attribute data-sw-translate. Only inner html, title-attribute and value-attribute are going to translate.
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/zh-cn.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/zh-cn.js
index 570319ba156..3af61ad6e4c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/zh-cn.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lang/zh-cn.js
@@ -28,6 +28,8 @@ window.SwaggerTranslator.learn({
     "Expand Operations":"展开操作",
     "Raw":"原始",
     "can't parse JSON.  Raw result":"无法解析JSON. 原始结果",
+    "Example Value":"示例",
+    "Click to set as parameter value":"点击设置参数",
     "Model Schema":"模型架构",
     "Model":"模型",
     "apply":"应用",
@@ -39,6 +41,7 @@ window.SwaggerTranslator.learn({
     "Contact the developer":"联系开发者",
     "api version":"api版本",
     "Response Content Type":"响应Content Type",
+    "Parameter content type:":"参数类型:",
     "fetching resource":"正在获取资源",
     "fetching resource list":"正在获取资源列表",
     "Explore":"浏览",
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js
index a3f544be6d9..8eff02e9842 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js
@@ -1,15 +1 @@
-// Backbone.js 1.1.2
-
-(function(t,e){if(typeof define==="function"&&define.amd){define(["underscore","jquery","exports"],function(i,r,s){t.Backbone=e(t,s,i,r)})}else if(typeof exports!=="undefined"){var i=require("underscore");e(t,exports,i)}else{t.Backbone=e(t,{},t._,t.jQuery||t.Zepto||t.ender||t.$)}})(this,function(t,e,i,r){var s=t.Backbone;var n=[];var a=n.push;var o=n.slice;var h=n.splice;e.VERSION="1.1.2";e.$=r;e.noConflict=function(){t.Backbone=s;return this};e.emulateHTTP=false;e.emulateJSON=false;var u=e.Events={on:function(t,e,i){if(!c(this,"on",t,[e,i])||!e)return this;this._events||(this._events={});var r=this._events[t]||(this._events[t]=[]);r.push({callback:e,context:i,ctx:i||this});return this},once:function(t,e,r){if(!c(this,"once",t,[e,r])||!e)return this;var s=this;var n=i.once(function(){s.off(t,n);e.apply(this,arguments)});n._callback=e;return this.on(t,n,r)},off:function(t,e,r){var s,n,a,o,h,u,l,f;if(!this._events||!c(this,"off",t,[e,r]))return this;if(!t&&!e&&!r){this._events=void 0;return this}o=t?[t]:i.keys(this._events);for(h=0,u=o.length;h<u;h++){t=o[h];if(a=this._events[t]){this._events[t]=s=[];if(e||r){for(l=0,f=a.length;l<f;l++){n=a[l];if(e&&e!==n.callback&&e!==n.callback._callback||r&&r!==n.context){s.push(n)}}}if(!s.length)delete this._events[t]}}return this},trigger:function(t){if(!this._events)return this;var e=o.call(arguments,1);if(!c(this,"trigger",t,e))return this;var i=this._events[t];var r=this._events.all;if(i)f(i,e);if(r)f(r,arguments);return this},stopListening:function(t,e,r){var s=this._listeningTo;if(!s)return this;var n=!e&&!r;if(!r&&typeof e==="object")r=this;if(t)(s={})[t._listenId]=t;for(var a in s){t=s[a];t.off(e,r,this);if(n||i.isEmpty(t._events))delete this._listeningTo[a]}return this}};var l=/\s+/;var c=function(t,e,i,r){if(!i)return true;if(typeof i==="object"){for(var s in i){t[e].apply(t,[s,i[s]].concat(r))}return false}if(l.test(i)){var n=i.split(l);for(var a=0,o=n.length;a<o;a++){t[e].apply(t,[n[a]].concat(r))}return false}return true};var f=function(t,e){var i,r=-1,s=t.length,n=e[0],a=e[1],o=e[2];switch(e.length){case 0:while(++r<s)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<s)(i=t[r]).callback.call(i.ctx,n);return;case 2:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a);return;case 3:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a,o);return;default:while(++r<s)(i=t[r]).callback.apply(i.ctx,e);return}};var d={listenTo:"on",listenToOnce:"once"};i.each(d,function(t,e){u[e]=function(e,r,s){var n=this._listeningTo||(this._listeningTo={});var a=e._listenId||(e._listenId=i.uniqueId("l"));n[a]=e;if(!s&&typeof r==="object")s=this;e[t](r,s,this);return this}});u.bind=u.on;u.unbind=u.off;i.extend(e,u);var p=e.Model=function(t,e){var r=t||{};e||(e={});this.cid=i.uniqueId("c");this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)r=this.parse(r,e)||{};r=i.defaults({},r,i.result(this,"defaults"));this.set(r,e);this.changed={};this.initialize.apply(this,arguments)};i.extend(p.prototype,u,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return this.get(t)!=null},set:function(t,e,r){var s,n,a,o,h,u,l,c;if(t==null)return this;if(typeof t==="object"){n=t;r=e}else{(n={})[t]=e}r||(r={});if(!this._validate(n,r))return false;a=r.unset;h=r.silent;o=[];u=this._changing;this._changing=true;if(!u){this._previousAttributes=i.clone(this.attributes);this.changed={}}c=this.attributes,l=this._previousAttributes;if(this.idAttribute in n)this.id=n[this.idAttribute];for(s in n){e=n[s];if(!i.isEqual(c[s],e))o.push(s);if(!i.isEqual(l[s],e)){this.changed[s]=e}else{delete this.changed[s]}a?delete c[s]:c[s]=e}if(!h){if(o.length)this._pending=r;for(var f=0,d=o.length;f<d;f++){this.trigger("change:"+o[f],this,c[o[f]],r)}}if(u)return this;if(!h){while(this._pending){r=this._pending;this._pending=false;this.trigger("change",this,r)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:true}))},clear:function(t){var e={};for(var r in this.attributes)e[r]=void 0;return this.set(e,i.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!i.isEmpty(this.changed);return i.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?i.clone(this.changed):false;var e,r=false;var s=this._changing?this._previousAttributes:this.attributes;for(var n in t){if(i.isEqual(s[n],e=t[n]))continue;(r||(r={}))[n]=e}return r},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=this;var r=t.success;t.success=function(i){if(!e.set(e.parse(i,t),t))return false;if(r)r(e,i,t);e.trigger("sync",e,i,t)};q(this,t);return this.sync("read",this,t)},save:function(t,e,r){var s,n,a,o=this.attributes;if(t==null||typeof t==="object"){s=t;r=e}else{(s={})[t]=e}r=i.extend({validate:true},r);if(s&&!r.wait){if(!this.set(s,r))return false}else{if(!this._validate(s,r))return false}if(s&&r.wait){this.attributes=i.extend({},o,s)}if(r.parse===void 0)r.parse=true;var h=this;var u=r.success;r.success=function(t){h.attributes=o;var e=h.parse(t,r);if(r.wait)e=i.extend(s||{},e);if(i.isObject(e)&&!h.set(e,r)){return false}if(u)u(h,t,r);h.trigger("sync",h,t,r)};q(this,r);n=this.isNew()?"create":r.patch?"patch":"update";if(n==="patch")r.attrs=s;a=this.sync(n,this,r);if(s&&r.wait)this.attributes=o;return a},destroy:function(t){t=t?i.clone(t):{};var e=this;var r=t.success;var s=function(){e.trigger("destroy",e,e.collection,t)};t.success=function(i){if(t.wait||e.isNew())s();if(r)r(e,i,t);if(!e.isNew())e.trigger("sync",e,i,t)};if(this.isNew()){t.success();return false}q(this,t);var n=this.sync("delete",this,t);if(!t.wait)s();return n},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||M();if(this.isNew())return t;return t.replace(/([^\/])$/,"$1/")+encodeURIComponent(this.id)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.extend(t||{},{validate:true}))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=i.extend({},this.attributes,t);var r=this.validationError=this.validate(t,e)||null;if(!r)return true;this.trigger("invalid",this,r,i.extend(e,{validationError:r}));return false}});var v=["keys","values","pairs","invert","pick","omit"];i.each(v,function(t){p.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.attributes);return i[t].apply(i,e)}});var g=e.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,i.extend({silent:true},e))};var m={add:true,remove:true,merge:true};var y={add:true,remove:false};i.extend(g.prototype,u,{model:p,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:false},e,y))},remove:function(t,e){var r=!i.isArray(t);t=r?[t]:i.clone(t);e||(e={});var s,n,a,o;for(s=0,n=t.length;s<n;s++){o=t[s]=this.get(t[s]);if(!o)continue;delete this._byId[o.id];delete this._byId[o.cid];a=this.indexOf(o);this.models.splice(a,1);this.length--;if(!e.silent){e.index=a;o.trigger("remove",o,this,e)}this._removeReference(o,e)}return r?t[0]:t},set:function(t,e){e=i.defaults({},e,m);if(e.parse)t=this.parse(t,e);var r=!i.isArray(t);t=r?t?[t]:[]:i.clone(t);var s,n,a,o,h,u,l;var c=e.at;var f=this.model;var d=this.comparator&&c==null&&e.sort!==false;var v=i.isString(this.comparator)?this.comparator:null;var g=[],y=[],_={};var b=e.add,w=e.merge,x=e.remove;var E=!d&&b&&x?[]:false;for(s=0,n=t.length;s<n;s++){h=t[s]||{};if(h instanceof p){a=o=h}else{a=h[f.prototype.idAttribute||"id"]}if(u=this.get(a)){if(x)_[u.cid]=true;if(w){h=h===o?o.attributes:h;if(e.parse)h=u.parse(h,e);u.set(h,e);if(d&&!l&&u.hasChanged(v))l=true}t[s]=u}else if(b){o=t[s]=this._prepareModel(h,e);if(!o)continue;g.push(o);this._addReference(o,e)}o=u||o;if(E&&(o.isNew()||!_[o.id]))E.push(o);_[o.id]=true}if(x){for(s=0,n=this.length;s<n;++s){if(!_[(o=this.models[s]).cid])y.push(o)}if(y.length)this.remove(y,e)}if(g.length||E&&E.length){if(d)l=true;this.length+=g.length;if(c!=null){for(s=0,n=g.length;s<n;s++){this.models.splice(c+s,0,g[s])}}else{if(E)this.models.length=0;var k=E||g;for(s=0,n=k.length;s<n;s++){this.models.push(k[s])}}}if(l)this.sort({silent:true});if(!e.silent){for(s=0,n=g.length;s<n;s++){(o=g[s]).trigger("add",o,this,e)}if(l||E&&E.length)this.trigger("sort",this,e)}return r?t[0]:t},reset:function(t,e){e||(e={});for(var r=0,s=this.models.length;r<s;r++){this._removeReference(this.models[r],e)}e.previousModels=this.models;this._reset();t=this.add(t,i.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);this.remove(e,t);return e},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);this.remove(e,t);return e},slice:function(){return o.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;return this._byId[t]||this._byId[t.id]||this._byId[t.cid]},at:function(t){return this.models[t]},where:function(t,e){if(i.isEmpty(t))return e?void 0:[];return this[e?"find":"filter"](function(e){for(var i in t){if(t[i]!==e.get(i))return false}return true})},findWhere:function(t){return this.where(t,true)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");t||(t={});if(i.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(i.bind(this.comparator,this))}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return i.invoke(this.models,"get",t)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=t.success;var r=this;t.success=function(i){var s=t.reset?"reset":"set";r[s](i,t);if(e)e(r,i,t);r.trigger("sync",r,i,t)};q(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?i.clone(e):{};if(!(t=this._prepareModel(t,e)))return false;if(!e.wait)this.add(t,e);var r=this;var s=e.success;e.success=function(t,i){if(e.wait)r.add(t,e);if(s)s(t,i,e)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(t instanceof p)return t;e=e?i.clone(e):{};e.collection=this;var r=new this.model(t,e);if(!r.validationError)return r;this.trigger("invalid",this,r.validationError,e);return false},_addReference:function(t,e){this._byId[t.cid]=t;if(t.id!=null)this._byId[t.id]=t;if(!t.collection)t.collection=this;t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(e&&t==="change:"+e.idAttribute){delete this._byId[e.previous(e.idAttribute)];if(e.id!=null)this._byId[e.id]=e}this.trigger.apply(this,arguments)}});var _=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain","sample"];i.each(_,function(t){g.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.models);return i[t].apply(i,e)}});var b=["groupBy","countBy","sortBy","indexBy"];i.each(b,function(t){g.prototype[t]=function(e,r){var s=i.isFunction(e)?e:function(t){return t.get(e)};return i[t](this.models,s,r)}});var w=e.View=function(t){this.cid=i.uniqueId("view");t||(t={});i.extend(this,i.pick(t,E));this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()};var x=/^(\S+)\s*(.*)$/;var E=["model","collection","el","id","attributes","className","tagName","events"];i.extend(w.prototype,u,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();this.stopListening();return this},setElement:function(t,i){if(this.$el)this.undelegateEvents();this.$el=t instanceof e.$?t:e.$(t);this.el=this.$el[0];if(i!==false)this.delegateEvents();return this},delegateEvents:function(t){if(!(t||(t=i.result(this,"events"))))return this;this.undelegateEvents();for(var e in t){var r=t[e];if(!i.isFunction(r))r=this[t[e]];if(!r)continue;var s=e.match(x);var n=s[1],a=s[2];r=i.bind(r,this);n+=".delegateEvents"+this.cid;if(a===""){this.$el.on(n,r)}else{this.$el.on(n,a,r)}}return this},undelegateEvents:function(){this.$el.off(".delegateEvents"+this.cid);return this},_ensureElement:function(){if(!this.el){var t=i.extend({},i.result(this,"attributes"));if(this.id)t.id=i.result(this,"id");if(this.className)t["class"]=i.result(this,"className");var r=e.$("<"+i.result(this,"tagName")+">").attr(t);this.setElement(r,false)}else{this.setElement(i.result(this,"el"),false)}}});e.sync=function(t,r,s){var n=T[t];i.defaults(s||(s={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:n,dataType:"json"};if(!s.url){a.url=i.result(r,"url")||M()}if(s.data==null&&r&&(t==="create"||t==="update"||t==="patch")){a.contentType="application/json";a.data=JSON.stringify(s.attrs||r.toJSON(s))}if(s.emulateJSON){a.contentType="application/x-www-form-urlencoded";a.data=a.data?{model:a.data}:{}}if(s.emulateHTTP&&(n==="PUT"||n==="DELETE"||n==="PATCH")){a.type="POST";if(s.emulateJSON)a.data._method=n;var o=s.beforeSend;s.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",n);if(o)return o.apply(this,arguments)}}if(a.type!=="GET"&&!s.emulateJSON){a.processData=false}if(a.type==="PATCH"&&k){a.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")}}var h=s.xhr=e.ajax(i.extend(a,s));r.trigger("request",r,h,s);return h};var k=typeof window!=="undefined"&&!!window.ActiveXObject&&!(window.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent);var T={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var $=e.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var S=/\((.*?)\)/g;var H=/(\(\?)?:\w+/g;var A=/\*\w+/g;var I=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend($.prototype,u,{initialize:function(){},route:function(t,r,s){if(!i.isRegExp(t))t=this._routeToRegExp(t);if(i.isFunction(r)){s=r;r=""}if(!s)s=this[r];var n=this;e.history.route(t,function(i){var a=n._extractParameters(t,i);n.execute(s,a);n.trigger.apply(n,["route:"+r].concat(a));n.trigger("route",r,a);e.history.trigger("route",n,r,a)});return this},execute:function(t,e){if(t)t.apply(this,e)},navigate:function(t,i){e.history.navigate(t,i);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=i.result(this,"routes");var t,e=i.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(I,"\\$&").replace(S,"(?:$1)?").replace(H,function(t,e){return e?t:"([^/?]+)"}).replace(A,"([^?]*?)");return new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var r=t.exec(e).slice(1);return i.map(r,function(t,e){if(e===r.length-1)return t||null;return t?decodeURIComponent(t):null})}});var N=e.History=function(){this.handlers=[];i.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var R=/^[#\/]|\s+$/g;var O=/^\/+|\/+$/g;var P=/msie [\w.]+/;var C=/\/$/;var j=/#.*$/;N.started=false;i.extend(N.prototype,u,{interval:50,atRoot:function(){return this.location.pathname.replace(/[^\/]$/,"$&/")===this.root},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getFragment:function(t,e){if(t==null){if(this._hasPushState||!this._wantsHashChange||e){t=decodeURI(this.location.pathname+this.location.search);var i=this.root.replace(C,"");if(!t.indexOf(i))t=t.slice(i.length)}else{t=this.getHash()}}return t.replace(R,"")},start:function(t){if(N.started)throw new Error("Backbone.history has already been started");N.started=true;this.options=i.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var r=this.getFragment();var s=document.documentMode;var n=P.exec(navigator.userAgent.toLowerCase())&&(!s||s<=7);this.root=("/"+this.root+"/").replace(O,"/");if(n&&this._wantsHashChange){var a=e.$('<iframe src="javascript:0" tabindex="-1">');this.iframe=a.hide().appendTo("body")[0].contentWindow;this.navigate(r)}if(this._hasPushState){e.$(window).on("popstate",this.checkUrl)}else if(this._wantsHashChange&&"onhashchange"in window&&!n){e.$(window).on("hashchange",this.checkUrl)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}this.fragment=r;var o=this.location;if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot()){this.fragment=this.getFragment(null,true);this.location.replace(this.root+"#"+this.fragment);return true}else if(this._hasPushState&&this.atRoot()&&o.hash){this.fragment=this.getHash().replace(R,"");this.history.replaceState({},document.title,this.root+this.fragment)}}if(!this.options.silent)return this.loadUrl()},stop:function(){e.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl);if(this._checkUrlInterval)clearInterval(this._checkUrlInterval);N.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getFragment(this.getHash(this.iframe))}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){t=this.fragment=this.getFragment(t);return i.any(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!N.started)return false;if(!e||e===true)e={trigger:!!e};var i=this.root+(t=this.getFragment(t||""));t=t.replace(j,"");if(this.fragment===t)return;this.fragment=t;if(t===""&&i!=="/")i=i.slice(0,-1);if(this._hasPushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,i)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getFragment(this.getHash(this.iframe))){if(!e.replace)this.iframe.document.open().close();this._updateHash(this.iframe.location,t,e.replace)}}else{return this.location.assign(i)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});e.history=new N;var U=function(t,e){var r=this;var s;if(t&&i.has(t,"constructor")){s=t.constructor}else{s=function(){return r.apply(this,arguments)}}i.extend(s,r,e);var n=function(){this.constructor=s};n.prototype=r.prototype;s.prototype=new n;if(t)i.extend(s.prototype,t);s.__super__=r.prototype;return s};p.extend=g.extend=$.extend=w.extend=N.extend=U;var M=function(){throw new Error('A "url" property or function must be specified')};var q=function(t,e){var i=e.error;e.error=function(r){if(i)i(t,r,e);t.trigger("error",t,r,e)}};return e});
-
-// From http://stackoverflow.com/a/19431552
-// Compatibility override - Backbone 1.1 got rid of the 'options' binding
-// automatically to views in the constructor - we need to keep that.
-Backbone.View = (function(View) {
-   return View.extend({
-        constructor: function(options) {
-            this.options = options || {};
-            View.apply(this, arguments);
-        }
-    });
-})(Backbone.View);
\ No newline at end of file
+!function(t,e){if("function"==typeof define&&define.amd)define(["underscore","jquery","exports"],function(i,n,s){t.Backbone=e(t,s,i,n)});else if("undefined"!=typeof exports){var i=require("underscore");e(t,exports,i)}else t.Backbone=e(t,{},t._,t.jQuery||t.Zepto||t.ender||t.$)}(this,function(t,e,i,n){var s=t.Backbone,r=[],a=(r.push,r.slice);r.splice;e.VERSION="1.1.2",e.$=n,e.noConflict=function(){return t.Backbone=s,this},e.emulateHTTP=!1,e.emulateJSON=!1;var o=e.Events={on:function(t,e,i){if(!c(this,"on",t,[e,i])||!e)return this;this._events||(this._events={});var n=this._events[t]||(this._events[t]=[]);return n.push({callback:e,context:i,ctx:i||this}),this},once:function(t,e,n){if(!c(this,"once",t,[e,n])||!e)return this;var s=this,r=i.once(function(){s.off(t,r),e.apply(this,arguments)});return r._callback=e,this.on(t,r,n)},off:function(t,e,n){var s,r,a,o,h,u,l,d;if(!this._events||!c(this,"off",t,[e,n]))return this;if(!t&&!e&&!n)return this._events=void 0,this;for(o=t?[t]:i.keys(this._events),h=0,u=o.length;h<u;h++)if(t=o[h],a=this._events[t]){if(this._events[t]=s=[],e||n)for(l=0,d=a.length;l<d;l++)r=a[l],(e&&e!==r.callback&&e!==r.callback._callback||n&&n!==r.context)&&s.push(r);s.length||delete this._events[t]}return this},trigger:function(t){if(!this._events)return this;var e=a.call(arguments,1);if(!c(this,"trigger",t,e))return this;var i=this._events[t],n=this._events.all;return i&&u(i,e),n&&u(n,arguments),this},stopListening:function(t,e,n){var s=this._listeningTo;if(!s)return this;var r=!e&&!n;n||"object"!=typeof e||(n=this),t&&((s={})[t._listenId]=t);for(var a in s)t=s[a],t.off(e,n,this),(r||i.isEmpty(t._events))&&delete this._listeningTo[a];return this}},h=/\s+/,c=function(t,e,i,n){if(!i)return!0;if("object"==typeof i){for(var s in i)t[e].apply(t,[s,i[s]].concat(n));return!1}if(h.test(i)){for(var r=i.split(h),a=0,o=r.length;a<o;a++)t[e].apply(t,[r[a]].concat(n));return!1}return!0},u=function(t,e){var i,n=-1,s=t.length,r=e[0],a=e[1],o=e[2];switch(e.length){case 0:for(;++n<s;)(i=t[n]).callback.call(i.ctx);return;case 1:for(;++n<s;)(i=t[n]).callback.call(i.ctx,r);return;case 2:for(;++n<s;)(i=t[n]).callback.call(i.ctx,r,a);return;case 3:for(;++n<s;)(i=t[n]).callback.call(i.ctx,r,a,o);return;default:for(;++n<s;)(i=t[n]).callback.apply(i.ctx,e);return}},l={listenTo:"on",listenToOnce:"once"};i.each(l,function(t,e){o[e]=function(e,n,s){var r=this._listeningTo||(this._listeningTo={}),a=e._listenId||(e._listenId=i.uniqueId("l"));return r[a]=e,s||"object"!=typeof n||(s=this),e[t](n,s,this),this}}),o.bind=o.on,o.unbind=o.off,i.extend(e,o);var d=e.Model=function(t,e){var n=t||{};e||(e={}),this.cid=i.uniqueId("c"),this.attributes={},e.collection&&(this.collection=e.collection),e.parse&&(n=this.parse(n,e)||{}),n=i.defaults({},n,i.result(this,"defaults")),this.set(n,e),this.changed={},this.initialize.apply(this,arguments)};i.extend(d.prototype,o,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return null!=this.get(t)},set:function(t,e,n){var s,r,a,o,h,c,u,l;if(null==t)return this;if("object"==typeof t?(r=t,n=e):(r={})[t]=e,n||(n={}),!this._validate(r,n))return!1;a=n.unset,h=n.silent,o=[],c=this._changing,this._changing=!0,c||(this._previousAttributes=i.clone(this.attributes),this.changed={}),l=this.attributes,u=this._previousAttributes,this.idAttribute in r&&(this.id=r[this.idAttribute]);for(s in r)e=r[s],i.isEqual(l[s],e)||o.push(s),i.isEqual(u[s],e)?delete this.changed[s]:this.changed[s]=e,a?delete l[s]:l[s]=e;if(!h){o.length&&(this._pending=n);for(var d=0,f=o.length;d<f;d++)this.trigger("change:"+o[d],this,l[o[d]],n)}if(c)return this;if(!h)for(;this._pending;)n=this._pending,this._pending=!1,this.trigger("change",this,n);return this._pending=!1,this._changing=!1,this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:!0}))},clear:function(t){var e={};for(var n in this.attributes)e[n]=void 0;return this.set(e,i.extend({},t,{unset:!0}))},hasChanged:function(t){return null==t?!i.isEmpty(this.changed):i.has(this.changed,t)},changedAttributes:function(t){if(!t)return!!this.hasChanged()&&i.clone(this.changed);var e,n=!1,s=this._changing?this._previousAttributes:this.attributes;for(var r in t)i.isEqual(s[r],e=t[r])||((n||(n={}))[r]=e);return n},previous:function(t){return null!=t&&this._previousAttributes?this._previousAttributes[t]:null},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=t?i.clone(t):{},void 0===t.parse&&(t.parse=!0);var e=this,n=t.success;return t.success=function(i){return!!e.set(e.parse(i,t),t)&&(n&&n(e,i,t),void e.trigger("sync",e,i,t))},U(this,t),this.sync("read",this,t)},save:function(t,e,n){var s,r,a,o=this.attributes;if(null==t||"object"==typeof t?(s=t,n=e):(s={})[t]=e,n=i.extend({validate:!0},n),s&&!n.wait){if(!this.set(s,n))return!1}else if(!this._validate(s,n))return!1;s&&n.wait&&(this.attributes=i.extend({},o,s)),void 0===n.parse&&(n.parse=!0);var h=this,c=n.success;return n.success=function(t){h.attributes=o;var e=h.parse(t,n);return n.wait&&(e=i.extend(s||{},e)),!(i.isObject(e)&&!h.set(e,n))&&(c&&c(h,t,n),void h.trigger("sync",h,t,n))},U(this,n),r=this.isNew()?"create":n.patch?"patch":"update","patch"===r&&(n.attrs=s),a=this.sync(r,this,n),s&&n.wait&&(this.attributes=o),a},destroy:function(t){t=t?i.clone(t):{};var e=this,n=t.success,s=function(){e.trigger("destroy",e,e.collection,t)};if(t.success=function(i){(t.wait||e.isNew())&&s(),n&&n(e,i,t),e.isNew()||e.trigger("sync",e,i,t)},this.isNew())return t.success(),!1;U(this,t);var r=this.sync("delete",this,t);return t.wait||s(),r},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||j();return this.isNew()?t:t.replace(/([^\/])$/,"$1/")+encodeURIComponent(this.id)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.extend(t||{},{validate:!0}))},_validate:function(t,e){if(!e.validate||!this.validate)return!0;t=i.extend({},this.attributes,t);var n=this.validationError=this.validate(t,e)||null;return!n||(this.trigger("invalid",this,n,i.extend(e,{validationError:n})),!1)}});var f=["keys","values","pairs","invert","pick","omit"];i.each(f,function(t){d.prototype[t]=function(){var e=a.call(arguments);return e.unshift(this.attributes),i[t].apply(i,e)}});var p=e.Collection=function(t,e){e||(e={}),e.model&&(this.model=e.model),void 0!==e.comparator&&(this.comparator=e.comparator),this._reset(),this.initialize.apply(this,arguments),t&&this.reset(t,i.extend({silent:!0},e))},g={add:!0,remove:!0,merge:!0},v={add:!0,remove:!1};i.extend(p.prototype,o,{model:d,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:!1},e,v))},remove:function(t,e){var n=!i.isArray(t);t=n?[t]:i.clone(t),e||(e={});var s,r,a,o;for(s=0,r=t.length;s<r;s++)o=t[s]=this.get(t[s]),o&&(delete this._byId[o.id],delete this._byId[o.cid],a=this.indexOf(o),this.models.splice(a,1),this.length--,e.silent||(e.index=a,o.trigger("remove",o,this,e)),this._removeReference(o,e));return n?t[0]:t},set:function(t,e){e=i.defaults({},e,g),e.parse&&(t=this.parse(t,e));var n=!i.isArray(t);t=n?t?[t]:[]:i.clone(t);var s,r,a,o,h,c,u,l=e.at,f=this.model,p=this.comparator&&null==l&&e.sort!==!1,v=i.isString(this.comparator)?this.comparator:null,m=[],y=[],_={},b=e.add,w=e.merge,x=e.remove,E=!(p||!b||!x)&&[];for(s=0,r=t.length;s<r;s++){if(h=t[s]||{},a=h instanceof d?o=h:h[f.prototype.idAttribute||"id"],c=this.get(a))x&&(_[c.cid]=!0),w&&(h=h===o?o.attributes:h,e.parse&&(h=c.parse(h,e)),c.set(h,e),p&&!u&&c.hasChanged(v)&&(u=!0)),t[s]=c;else if(b){if(o=t[s]=this._prepareModel(h,e),!o)continue;m.push(o),this._addReference(o,e)}o=c||o,!E||!o.isNew()&&_[o.id]||E.push(o),_[o.id]=!0}if(x){for(s=0,r=this.length;s<r;++s)_[(o=this.models[s]).cid]||y.push(o);y.length&&this.remove(y,e)}if(m.length||E&&E.length)if(p&&(u=!0),this.length+=m.length,null!=l)for(s=0,r=m.length;s<r;s++)this.models.splice(l+s,0,m[s]);else{E&&(this.models.length=0);var k=E||m;for(s=0,r=k.length;s<r;s++)this.models.push(k[s])}if(u&&this.sort({silent:!0}),!e.silent){for(s=0,r=m.length;s<r;s++)(o=m[s]).trigger("add",o,this,e);(u||E&&E.length)&&this.trigger("sort",this,e)}return n?t[0]:t},reset:function(t,e){e||(e={});for(var n=0,s=this.models.length;n<s;n++)this._removeReference(this.models[n],e);return e.previousModels=this.models,this._reset(),t=this.add(t,i.extend({silent:!0},e)),e.silent||this.trigger("reset",this,e),t},push:function(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);return this.remove(e,t),e},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);return this.remove(e,t),e},slice:function(){return a.apply(this.models,arguments)},get:function(t){if(null!=t)return this._byId[t]||this._byId[t.id]||this._byId[t.cid]},at:function(t){return this.models[t]},where:function(t,e){return i.isEmpty(t)?e?void 0:[]:this[e?"find":"filter"](function(e){for(var i in t)if(t[i]!==e.get(i))return!1;return!0})},findWhere:function(t){return this.where(t,!0)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");return t||(t={}),i.isString(this.comparator)||1===this.comparator.length?this.models=this.sortBy(this.comparator,this):this.models.sort(i.bind(this.comparator,this)),t.silent||this.trigger("sort",this,t),this},pluck:function(t){return i.invoke(this.models,"get",t)},fetch:function(t){t=t?i.clone(t):{},void 0===t.parse&&(t.parse=!0);var e=t.success,n=this;return t.success=function(i){var s=t.reset?"reset":"set";n[s](i,t),e&&e(n,i,t),n.trigger("sync",n,i,t)},U(this,t),this.sync("read",this,t)},create:function(t,e){if(e=e?i.clone(e):{},!(t=this._prepareModel(t,e)))return!1;e.wait||this.add(t,e);var n=this,s=e.success;return e.success=function(t,i){e.wait&&n.add(t,e),s&&s(t,i,e)},t.save(null,e),t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0,this.models=[],this._byId={}},_prepareModel:function(t,e){if(t instanceof d)return t;e=e?i.clone(e):{},e.collection=this;var n=new this.model(t,e);return n.validationError?(this.trigger("invalid",this,n.validationError,e),!1):n},_addReference:function(t,e){this._byId[t.cid]=t,null!=t.id&&(this._byId[t.id]=t),t.collection||(t.collection=this),t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){this===t.collection&&delete t.collection,t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,n){("add"!==t&&"remove"!==t||i===this)&&("destroy"===t&&this.remove(e,n),e&&t==="change:"+e.idAttribute&&(delete this._byId[e.previous(e.idAttribute)],null!=e.id&&(this._byId[e.id]=e)),this.trigger.apply(this,arguments))}});var m=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain","sample"];i.each(m,function(t){p.prototype[t]=function(){var e=a.call(arguments);return e.unshift(this.models),i[t].apply(i,e)}});var y=["groupBy","countBy","sortBy","indexBy"];i.each(y,function(t){p.prototype[t]=function(e,n){var s=i.isFunction(e)?e:function(t){return t.get(e)};return i[t](this.models,s,n)}});var _=e.View=function(t){this.cid=i.uniqueId("view"),t||(t={}),i.extend(this,i.pick(t,w)),this._ensureElement(),this.initialize.apply(this,arguments),this.delegateEvents()},b=/^(\S+)\s*(.*)$/,w=["model","collection","el","id","attributes","className","tagName","events"];i.extend(_.prototype,o,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){return this.$el.remove(),this.stopListening(),this},setElement:function(t,i){return this.$el&&this.undelegateEvents(),this.$el=t instanceof e.$?t:e.$(t),this.el=this.$el[0],i!==!1&&this.delegateEvents(),this},delegateEvents:function(t){if(!t&&!(t=i.result(this,"events")))return this;this.undelegateEvents();for(var e in t){var n=t[e];if(i.isFunction(n)||(n=this[t[e]]),n){var s=e.match(b),r=s[1],a=s[2];n=i.bind(n,this),r+=".delegateEvents"+this.cid,""===a?this.$el.on(r,n):this.$el.on(r,a,n)}}return this},undelegateEvents:function(){return this.$el.off(".delegateEvents"+this.cid),this},_ensureElement:function(){if(this.el)this.setElement(i.result(this,"el"),!1);else{var t=i.extend({},i.result(this,"attributes"));this.id&&(t.id=i.result(this,"id")),this.className&&(t["class"]=i.result(this,"className"));var n=e.$("<"+i.result(this,"tagName")+">").attr(t);this.setElement(n,!1)}}}),e.sync=function(t,n,s){var r=E[t];i.defaults(s||(s={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:r,dataType:"json"};if(s.url||(a.url=i.result(n,"url")||j()),null!=s.data||!n||"create"!==t&&"update"!==t&&"patch"!==t||(a.contentType="application/json",a.data=JSON.stringify(s.attrs||n.toJSON(s))),s.emulateJSON&&(a.contentType="application/x-www-form-urlencoded",a.data=a.data?{model:a.data}:{}),s.emulateHTTP&&("PUT"===r||"DELETE"===r||"PATCH"===r)){a.type="POST",s.emulateJSON&&(a.data._method=r);var o=s.beforeSend;s.beforeSend=function(t){if(t.setRequestHeader("X-HTTP-Method-Override",r),o)return o.apply(this,arguments)}}"GET"===a.type||s.emulateJSON||(a.processData=!1),"PATCH"===a.type&&x&&(a.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")});var h=s.xhr=e.ajax(i.extend(a,s));return n.trigger("request",n,h,s),h};var x=!("undefined"==typeof window||!window.ActiveXObject||window.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent),E={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var k=e.Router=function(t){t||(t={}),t.routes&&(this.routes=t.routes),this._bindRoutes(),this.initialize.apply(this,arguments)},T=/\((.*?)\)/g,$=/(\(\?)?:\w+/g,S=/\*\w+/g,H=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend(k.prototype,o,{initialize:function(){},route:function(t,n,s){i.isRegExp(t)||(t=this._routeToRegExp(t)),i.isFunction(n)&&(s=n,n=""),s||(s=this[n]);var r=this;return e.history.route(t,function(i){var a=r._extractParameters(t,i);r.execute(s,a),r.trigger.apply(r,["route:"+n].concat(a)),r.trigger("route",n,a),e.history.trigger("route",r,n,a)}),this},execute:function(t,e){t&&t.apply(this,e)},navigate:function(t,i){return e.history.navigate(t,i),this},_bindRoutes:function(){if(this.routes){this.routes=i.result(this,"routes");for(var t,e=i.keys(this.routes);null!=(t=e.pop());)this.route(t,this.routes[t])}},_routeToRegExp:function(t){return t=t.replace(H,"\\$&").replace(T,"(?:$1)?").replace($,function(t,e){return e?t:"([^/?]+)"}).replace(S,"([^?]*?)"),new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var n=t.exec(e).slice(1);return i.map(n,function(t,e){return e===n.length-1?t||null:t?decodeURIComponent(t):null})}});var A=e.History=function(){this.handlers=[],i.bindAll(this,"checkUrl"),"undefined"!=typeof window&&(this.location=window.location,this.history=window.history)},I=/^[#\/]|\s+$/g,N=/^\/+|\/+$/g,R=/msie [\w.]+/,O=/\/$/,P=/#.*$/;A.started=!1,i.extend(A.prototype,o,{interval:50,atRoot:function(){return this.location.pathname.replace(/[^\/]$/,"$&/")===this.root},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getFragment:function(t,e){if(null==t)if(this._hasPushState||!this._wantsHashChange||e){t=decodeURI(this.location.pathname+this.location.search);var i=this.root.replace(O,"");t.indexOf(i)||(t=t.slice(i.length))}else t=this.getHash();return t.replace(I,"")},start:function(t){if(A.started)throw new Error("Backbone.history has already been started");A.started=!0,this.options=i.extend({root:"/"},this.options,t),this.root=this.options.root,this._wantsHashChange=this.options.hashChange!==!1,this._wantsPushState=!!this.options.pushState,this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var n=this.getFragment(),s=document.documentMode,r=R.exec(navigator.userAgent.toLowerCase())&&(!s||s<=7);if(this.root=("/"+this.root+"/").replace(N,"/"),r&&this._wantsHashChange){var a=e.$('<iframe src="javascript:0" tabindex="-1">');this.iframe=a.hide().appendTo("body")[0].contentWindow,this.navigate(n)}this._hasPushState?e.$(window).on("popstate",this.checkUrl):this._wantsHashChange&&"onhashchange"in window&&!r?e.$(window).on("hashchange",this.checkUrl):this._wantsHashChange&&(this._checkUrlInterval=setInterval(this.checkUrl,this.interval)),this.fragment=n;var o=this.location;if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot())return this.fragment=this.getFragment(null,!0),this.location.replace(this.root+"#"+this.fragment),!0;this._hasPushState&&this.atRoot()&&o.hash&&(this.fragment=this.getHash().replace(I,""),this.history.replaceState({},document.title,this.root+this.fragment))}if(!this.options.silent)return this.loadUrl()},stop:function(){e.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl),this._checkUrlInterval&&clearInterval(this._checkUrlInterval),A.started=!1},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();return e===this.fragment&&this.iframe&&(e=this.getFragment(this.getHash(this.iframe))),e!==this.fragment&&(this.iframe&&this.navigate(e),void this.loadUrl())},loadUrl:function(t){return t=this.fragment=this.getFragment(t),i.any(this.handlers,function(e){if(e.route.test(t))return e.callback(t),!0})},navigate:function(t,e){if(!A.started)return!1;e&&e!==!0||(e={trigger:!!e});var i=this.root+(t=this.getFragment(t||""));if(t=t.replace(P,""),this.fragment!==t){if(this.fragment=t,""===t&&"/"!==i&&(i=i.slice(0,-1)),this._hasPushState)this.history[e.replace?"replaceState":"pushState"]({},document.title,i);else{if(!this._wantsHashChange)return this.location.assign(i);this._updateHash(this.location,t,e.replace),this.iframe&&t!==this.getFragment(this.getHash(this.iframe))&&(e.replace||this.iframe.document.open().close(),this._updateHash(this.iframe.location,t,e.replace))}return e.trigger?this.loadUrl(t):void 0}},_updateHash:function(t,e,i){if(i){var n=t.href.replace(/(javascript:|#).*$/,"");t.replace(n+"#"+e)}else t.hash="#"+e}}),e.history=new A;var C=function(t,e){var n,s=this;n=t&&i.has(t,"constructor")?t.constructor:function(){return s.apply(this,arguments)},i.extend(n,s,e);var r=function(){this.constructor=n};return r.prototype=s.prototype,n.prototype=new r,t&&i.extend(n.prototype,t),n.__super__=s.prototype,n};d.extend=p.extend=k.extend=_.extend=A.extend=C;var j=function(){throw new Error('A "url" property or function must be specified')},U=function(t,e){var i=e.error;e.error=function(n){i&&i(t,n,e),t.trigger("error",t,n,e)}};return e}),Backbone.View=function(t){return t.extend({constructor:function(e){this.options=e||{},t.apply(this,arguments)}})}(Backbone.View);
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/es5-shim.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/es5-shim.js
new file mode 100644
index 00000000000..4c0fcab0444
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/es5-shim.js
@@ -0,0 +1 @@
+!function(t,e){"use strict";"function"==typeof define&&define.amd?define(e):"object"==typeof exports?module.exports=e():t.returnExports=e()}(this,function(){var t,e,r=Array,n=r.prototype,o=Object,i=o.prototype,a=Function,u=a.prototype,f=String,s=f.prototype,l=Number,c=l.prototype,h=n.slice,p=n.splice,y=n.push,d=n.unshift,g=n.concat,v=n.join,b=u.call,w=u.apply,T=Math.max,m=Math.min,D=i.toString,x="function"==typeof Symbol&&"symbol"==typeof Symbol.toStringTag,S=Function.prototype.toString,O=/^\s*class /,j=function(t){try{var e=S.call(t),r=e.replace(/\/\/.*\n/g,""),n=r.replace(/\/\*[.\s\S]*\*\//g,""),o=n.replace(/\n/gm," ").replace(/ {2}/g," ");return O.test(o)}catch(i){return!1}},E=function(t){try{return!j(t)&&(S.call(t),!0)}catch(e){return!1}},M="[object Function]",I="[object GeneratorFunction]",t=function(t){if(!t)return!1;if("function"!=typeof t&&"object"!=typeof t)return!1;if(x)return E(t);if(j(t))return!1;var e=D.call(t);return e===M||e===I},U=RegExp.prototype.exec,F=function(t){try{return U.call(t),!0}catch(e){return!1}},N="[object RegExp]";e=function(t){return"object"==typeof t&&(x?F(t):D.call(t)===N)};var k,C=String.prototype.valueOf,R=function(t){try{return C.call(t),!0}catch(e){return!1}},A="[object String]";k=function(t){return"string"==typeof t||"object"==typeof t&&(x?R(t):D.call(t)===A)};var $=o.defineProperty&&function(){try{var t={};o.defineProperty(t,"x",{enumerable:!1,value:t});for(var e in t)return!1;return t.x===t}catch(r){return!1}}(),P=function(t){var e;return e=$?function(t,e,r,n){!n&&e in t||o.defineProperty(t,e,{configurable:!0,enumerable:!1,writable:!0,value:r})}:function(t,e,r,n){!n&&e in t||(t[e]=r)},function(r,n,o){for(var i in n)t.call(n,i)&&e(r,i,n[i],o)}}(i.hasOwnProperty),J=function(t){var e=typeof t;return null===t||"object"!==e&&"function"!==e},Z=l.isNaN||function(t){return t!==t},z={ToInteger:function(t){var e=+t;return Z(e)?e=0:0!==e&&e!==1/0&&e!==-(1/0)&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e},ToPrimitive:function(e){var r,n,o;if(J(e))return e;if(n=e.valueOf,t(n)&&(r=n.call(e),J(r)))return r;if(o=e.toString,t(o)&&(r=o.call(e),J(r)))return r;throw new TypeError},ToObject:function(t){if(null==t)throw new TypeError("can't convert "+t+" to object");return o(t)},ToUint32:function(t){return t>>>0}},G=function(){};P(u,{bind:function(e){var r=this;if(!t(r))throw new TypeError("Function.prototype.bind called on incompatible "+r);for(var n,i=h.call(arguments,1),u=function(){if(this instanceof n){var t=w.call(r,this,g.call(i,h.call(arguments)));return o(t)===t?t:this}return w.call(r,e,g.call(i,h.call(arguments)))},f=T(0,r.length-i.length),s=[],l=0;l<f;l++)y.call(s,"$"+l);return n=a("binder","return function ("+v.call(s,",")+"){ return binder.apply(this, arguments); }")(u),r.prototype&&(G.prototype=r.prototype,n.prototype=new G,G.prototype=null),n}});var Y=b.bind(i.hasOwnProperty),B=b.bind(i.toString),H=b.bind(h),W=w.bind(h),L=b.bind(s.slice),X=b.bind(s.split),q=b.bind(s.indexOf),K=b.bind(y),Q=b.bind(i.propertyIsEnumerable),V=b.bind(n.sort),_=r.isArray||function(t){return"[object Array]"===B(t)},tt=1!==[].unshift(0);P(n,{unshift:function(){return d.apply(this,arguments),this.length}},tt),P(r,{isArray:_});var et=o("a"),rt="a"!==et[0]||!(0 in et),nt=function(t){var e=!0,r=!0,n=!1;if(t)try{t.call("foo",function(t,r,n){"object"!=typeof n&&(e=!1)}),t.call([1],function(){"use strict";r="string"==typeof this},"x")}catch(o){n=!0}return!!t&&!n&&e&&r};P(n,{forEach:function(e){var r,n=z.ToObject(this),o=rt&&k(this)?X(this,""):n,i=-1,a=z.ToUint32(o.length);if(arguments.length>1&&(r=arguments[1]),!t(e))throw new TypeError("Array.prototype.forEach callback must be a function");for(;++i<a;)i in o&&("undefined"==typeof r?e(o[i],i,n):e.call(r,o[i],i,n))}},!nt(n.forEach)),P(n,{map:function(e){var n,o=z.ToObject(this),i=rt&&k(this)?X(this,""):o,a=z.ToUint32(i.length),u=r(a);if(arguments.length>1&&(n=arguments[1]),!t(e))throw new TypeError("Array.prototype.map callback must be a function");for(var f=0;f<a;f++)f in i&&("undefined"==typeof n?u[f]=e(i[f],f,o):u[f]=e.call(n,i[f],f,o));return u}},!nt(n.map)),P(n,{filter:function(e){var r,n,o=z.ToObject(this),i=rt&&k(this)?X(this,""):o,a=z.ToUint32(i.length),u=[];if(arguments.length>1&&(n=arguments[1]),!t(e))throw new TypeError("Array.prototype.filter callback must be a function");for(var f=0;f<a;f++)f in i&&(r=i[f],("undefined"==typeof n?e(r,f,o):e.call(n,r,f,o))&&K(u,r));return u}},!nt(n.filter)),P(n,{every:function(e){var r,n=z.ToObject(this),o=rt&&k(this)?X(this,""):n,i=z.ToUint32(o.length);if(arguments.length>1&&(r=arguments[1]),!t(e))throw new TypeError("Array.prototype.every callback must be a function");for(var a=0;a<i;a++)if(a in o&&!("undefined"==typeof r?e(o[a],a,n):e.call(r,o[a],a,n)))return!1;return!0}},!nt(n.every)),P(n,{some:function(e){var r,n=z.ToObject(this),o=rt&&k(this)?X(this,""):n,i=z.ToUint32(o.length);if(arguments.length>1&&(r=arguments[1]),!t(e))throw new TypeError("Array.prototype.some callback must be a function");for(var a=0;a<i;a++)if(a in o&&("undefined"==typeof r?e(o[a],a,n):e.call(r,o[a],a,n)))return!0;return!1}},!nt(n.some));var ot=!1;n.reduce&&(ot="object"==typeof n.reduce.call("es5",function(t,e,r,n){return n})),P(n,{reduce:function(e){var r=z.ToObject(this),n=rt&&k(this)?X(this,""):r,o=z.ToUint32(n.length);if(!t(e))throw new TypeError("Array.prototype.reduce callback must be a function");if(0===o&&1===arguments.length)throw new TypeError("reduce of empty array with no initial value");var i,a=0;if(arguments.length>=2)i=arguments[1];else for(;;){if(a in n){i=n[a++];break}if(++a>=o)throw new TypeError("reduce of empty array with no initial value")}for(;a<o;a++)a in n&&(i=e(i,n[a],a,r));return i}},!ot);var it=!1;n.reduceRight&&(it="object"==typeof n.reduceRight.call("es5",function(t,e,r,n){return n})),P(n,{reduceRight:function(e){var r=z.ToObject(this),n=rt&&k(this)?X(this,""):r,o=z.ToUint32(n.length);if(!t(e))throw new TypeError("Array.prototype.reduceRight callback must be a function");if(0===o&&1===arguments.length)throw new TypeError("reduceRight of empty array with no initial value");var i,a=o-1;if(arguments.length>=2)i=arguments[1];else for(;;){if(a in n){i=n[a--];break}if(--a<0)throw new TypeError("reduceRight of empty array with no initial value")}if(a<0)return i;do a in n&&(i=e(i,n[a],a,r));while(a--);return i}},!it);var at=n.indexOf&&[0,1].indexOf(1,2)!==-1;P(n,{indexOf:function(t){var e=rt&&k(this)?X(this,""):z.ToObject(this),r=z.ToUint32(e.length);if(0===r)return-1;var n=0;for(arguments.length>1&&(n=z.ToInteger(arguments[1])),n=n>=0?n:T(0,r+n);n<r;n++)if(n in e&&e[n]===t)return n;return-1}},at);var ut=n.lastIndexOf&&[0,1].lastIndexOf(0,-3)!==-1;P(n,{lastIndexOf:function(t){var e=rt&&k(this)?X(this,""):z.ToObject(this),r=z.ToUint32(e.length);if(0===r)return-1;var n=r-1;for(arguments.length>1&&(n=m(n,z.ToInteger(arguments[1]))),n=n>=0?n:r-Math.abs(n);n>=0;n--)if(n in e&&t===e[n])return n;return-1}},ut);var ft=function(){var t=[1,2],e=t.splice();return 2===t.length&&_(e)&&0===e.length}();P(n,{splice:function(t,e){return 0===arguments.length?[]:p.apply(this,arguments)}},!ft);var st=function(){var t={};return n.splice.call(t,0,0,1),1===t.length}();P(n,{splice:function(t,e){if(0===arguments.length)return[];var r=arguments;return this.length=T(z.ToInteger(this.length),0),arguments.length>0&&"number"!=typeof e&&(r=H(arguments),r.length<2?K(r,this.length-t):r[1]=z.ToInteger(e)),p.apply(this,r)}},!st);var lt=function(){var t=new r(1e5);return t[8]="x",t.splice(1,1),7===t.indexOf("x")}(),ct=function(){var t=256,e=[];return e[t]="a",e.splice(t+1,0,"b"),"a"===e[t]}();P(n,{splice:function(t,e){for(var r,n=z.ToObject(this),o=[],i=z.ToUint32(n.length),a=z.ToInteger(t),u=a<0?T(i+a,0):m(a,i),s=m(T(z.ToInteger(e),0),i-u),l=0;l<s;)r=f(u+l),Y(n,r)&&(o[l]=n[r]),l+=1;var c,h=H(arguments,2),p=h.length;if(p<s){l=u;for(var y=i-s;l<y;)r=f(l+s),c=f(l+p),Y(n,r)?n[c]=n[r]:delete n[c],l+=1;l=i;for(var d=i-s+p;l>d;)delete n[l-1],l-=1}else if(p>s)for(l=i-s;l>u;)r=f(l+s-1),c=f(l+p-1),Y(n,r)?n[c]=n[r]:delete n[c],l-=1;l=u;for(var g=0;g<h.length;++g)n[l]=h[g],l+=1;return n.length=i-s+p,o}},!lt||!ct);var ht,pt=n.join;try{ht="1,2,3"!==Array.prototype.join.call("123",",")}catch(yt){ht=!0}ht&&P(n,{join:function(t){var e="undefined"==typeof t?",":t;return pt.call(k(this)?X(this,""):this,e)}},ht);var dt="1,2"!==[1,2].join(void 0);dt&&P(n,{join:function(t){var e="undefined"==typeof t?",":t;return pt.call(this,e)}},dt);var gt=function(t){for(var e=z.ToObject(this),r=z.ToUint32(e.length),n=0;n<arguments.length;)e[r+n]=arguments[n],n+=1;return e.length=r+n,r+n},vt=function(){var t={},e=Array.prototype.push.call(t,void 0);return 1!==e||1!==t.length||"undefined"!=typeof t[0]||!Y(t,0)}();P(n,{push:function(t){return _(this)?y.apply(this,arguments):gt.apply(this,arguments)}},vt);var bt=function(){var t=[],e=t.push(void 0);return 1!==e||1!==t.length||"undefined"!=typeof t[0]||!Y(t,0)}();P(n,{push:gt},bt),P(n,{slice:function(t,e){var r=k(this)?X(this,""):this;return W(r,arguments)}},rt);var wt=function(){try{return[1,2].sort(null),[1,2].sort({}),!0}catch(t){}return!1}(),Tt=function(){try{return[1,2].sort(/a/),!1}catch(t){}return!0}(),mt=function(){try{return[1,2].sort(void 0),!0}catch(t){}return!1}();P(n,{sort:function(e){if("undefined"==typeof e)return V(this);if(!t(e))throw new TypeError("Array.prototype.sort callback must be a function");return V(this,e)}},wt||!mt||!Tt);var Dt=!Q({toString:null},"toString"),xt=Q(function(){},"prototype"),St=!Y("x","0"),Ot=function(t){var e=t.constructor;return e&&e.prototype===t},jt={$window:!0,$console:!0,$parent:!0,$self:!0,$frame:!0,$frames:!0,$frameElement:!0,$webkitIndexedDB:!0,$webkitStorageInfo:!0,$external:!0},Et=function(){if("undefined"==typeof window)return!1;for(var t in window)try{!jt["$"+t]&&Y(window,t)&&null!==window[t]&&"object"==typeof window[t]&&Ot(window[t])}catch(e){return!0}return!1}(),Mt=function(t){if("undefined"==typeof window||!Et)return Ot(t);try{return Ot(t)}catch(e){return!1}},It=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],Ut=It.length,Ft=function(t){return"[object Arguments]"===B(t)},Nt=function(e){return null!==e&&"object"==typeof e&&"number"==typeof e.length&&e.length>=0&&!_(e)&&t(e.callee)},kt=Ft(arguments)?Ft:Nt;P(o,{keys:function(e){var r=t(e),n=kt(e),o=null!==e&&"object"==typeof e,i=o&&k(e);if(!o&&!r&&!n)throw new TypeError("Object.keys called on a non-object");var a=[],u=xt&&r;if(i&&St||n)for(var s=0;s<e.length;++s)K(a,f(s));if(!n)for(var l in e)u&&"prototype"===l||!Y(e,l)||K(a,f(l));if(Dt)for(var c=Mt(e),h=0;h<Ut;h++){var p=It[h];c&&"constructor"===p||!Y(e,p)||K(a,p)}return a}});var Ct=o.keys&&function(){return 2===o.keys(arguments).length}(1,2),Rt=o.keys&&function(){var t=o.keys(arguments);return 1!==arguments.length||1!==t.length||1!==t[0]}(1),At=o.keys;P(o,{keys:function(t){return At(kt(t)?H(t):t)}},!Ct||Rt);var $t,Pt,Jt=0!==new Date((-0xc782b5b342b24)).getUTCMonth(),Zt=new Date((-0x55d318d56a724)),zt=new Date(14496624e5),Gt="Mon, 01 Jan -45875 11:59:59 GMT"!==Zt.toUTCString(),Yt=Zt.getTimezoneOffset();Yt<-720?($t="Tue Jan 02 -45875"!==Zt.toDateString(),Pt=!/^Thu Dec 10 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/.test(zt.toString())):($t="Mon Jan 01 -45875"!==Zt.toDateString(),Pt=!/^Wed Dec 09 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/.test(zt.toString()));var Bt=b.bind(Date.prototype.getFullYear),Ht=b.bind(Date.prototype.getMonth),Wt=b.bind(Date.prototype.getDate),Lt=b.bind(Date.prototype.getUTCFullYear),Xt=b.bind(Date.prototype.getUTCMonth),qt=b.bind(Date.prototype.getUTCDate),Kt=b.bind(Date.prototype.getUTCDay),Qt=b.bind(Date.prototype.getUTCHours),Vt=b.bind(Date.prototype.getUTCMinutes),_t=b.bind(Date.prototype.getUTCSeconds),te=b.bind(Date.prototype.getUTCMilliseconds),ee=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],re=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],ne=function(t,e){return Wt(new Date(e,t,0))};P(Date.prototype,{getFullYear:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var t=Bt(this);return t<0&&Ht(this)>11?t+1:t},getMonth:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var t=Bt(this),e=Ht(this);return t<0&&e>11?0:e},getDate:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var t=Bt(this),e=Ht(this),r=Wt(this);if(t<0&&e>11){if(12===e)return r;var n=ne(0,t+1);return n-r+1}return r},getUTCFullYear:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var t=Lt(this);return t<0&&Xt(this)>11?t+1:t},getUTCMonth:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var t=Lt(this),e=Xt(this);return t<0&&e>11?0:e},getUTCDate:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var t=Lt(this),e=Xt(this),r=qt(this);if(t<0&&e>11){if(12===e)return r;var n=ne(0,t+1);return n-r+1}return r}},Jt),P(Date.prototype,{toUTCString:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var t=Kt(this),e=qt(this),r=Xt(this),n=Lt(this),o=Qt(this),i=Vt(this),a=_t(this);return ee[t]+", "+(e<10?"0"+e:e)+" "+re[r]+" "+n+" "+(o<10?"0"+o:o)+":"+(i<10?"0"+i:i)+":"+(a<10?"0"+a:a)+" GMT"}},Jt||Gt),P(Date.prototype,{toDateString:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var t=this.getDay(),e=this.getDate(),r=this.getMonth(),n=this.getFullYear();return ee[t]+" "+re[r]+" "+(e<10?"0"+e:e)+" "+n}},Jt||$t),(Jt||Pt)&&(Date.prototype.toString=function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var t=this.getDay(),e=this.getDate(),r=this.getMonth(),n=this.getFullYear(),o=this.getHours(),i=this.getMinutes(),a=this.getSeconds(),u=this.getTimezoneOffset(),f=Math.floor(Math.abs(u)/60),s=Math.floor(Math.abs(u)%60);return ee[t]+" "+re[r]+" "+(e<10?"0"+e:e)+" "+n+" "+(o<10?"0"+o:o)+":"+(i<10?"0"+i:i)+":"+(a<10?"0"+a:a)+" GMT"+(u>0?"-":"+")+(f<10?"0"+f:f)+(s<10?"0"+s:s)},$&&o.defineProperty(Date.prototype,"toString",{configurable:!0,enumerable:!1,writable:!0}));var oe=-621987552e5,ie="-000001",ae=Date.prototype.toISOString&&new Date(oe).toISOString().indexOf(ie)===-1,ue=Date.prototype.toISOString&&"1969-12-31T23:59:59.999Z"!==new Date((-1)).toISOString(),fe=b.bind(Date.prototype.getTime);P(Date.prototype,{toISOString:function(){if(!isFinite(this)||!isFinite(fe(this)))throw new RangeError("Date.prototype.toISOString called on non-finite value.");var t=Lt(this),e=Xt(this);t+=Math.floor(e/12),e=(e%12+12)%12;var r=[e+1,qt(this),Qt(this),Vt(this),_t(this)];t=(t<0?"-":t>9999?"+":"")+L("00000"+Math.abs(t),0<=t&&t<=9999?-4:-6);for(var n=0;n<r.length;++n)r[n]=L("00"+r[n],-2);return t+"-"+H(r,0,2).join("-")+"T"+H(r,2).join(":")+"."+L("000"+te(this),-3)+"Z"}},ae||ue);var se=function(){try{return Date.prototype.toJSON&&null===new Date(NaN).toJSON()&&new Date(oe).toJSON().indexOf(ie)!==-1&&Date.prototype.toJSON.call({toISOString:function(){return!0}})}catch(t){return!1}}();se||(Date.prototype.toJSON=function(e){var r=o(this),n=z.ToPrimitive(r);if("number"==typeof n&&!isFinite(n))return null;var i=r.toISOString;if(!t(i))throw new TypeError("toISOString property is not callable");return i.call(r)});var le=1e15===Date.parse("+033658-09-27T01:46:40.000Z"),ce=!isNaN(Date.parse("2012-04-04T24:00:00.500Z"))||!isNaN(Date.parse("2012-11-31T23:59:59.000Z"))||!isNaN(Date.parse("2012-12-31T23:59:60.000Z")),he=isNaN(Date.parse("2000-01-01T00:00:00.000Z"));if(he||ce||!le){var pe=Math.pow(2,31)-1,ye=Z(new Date(1970,0,1,0,0,0,pe+1).getTime());Date=function(t){var e=function(r,n,o,i,a,u,s){var l,c=arguments.length;if(this instanceof t){var h=u,p=s;if(ye&&c>=7&&s>pe){var y=Math.floor(s/pe)*pe,d=Math.floor(y/1e3);h+=d,p-=1e3*d}l=1===c&&f(r)===r?new t(e.parse(r)):c>=7?new t(r,n,o,i,a,h,p):c>=6?new t(r,n,o,i,a,h):c>=5?new t(r,n,o,i,a):c>=4?new t(r,n,o,i):c>=3?new t(r,n,o):c>=2?new t(r,n):c>=1?new t(r instanceof t?+r:r):new t}else l=t.apply(this,arguments);return J(l)||P(l,{constructor:e},!0),l},r=new RegExp("^(\\d{4}|[+-]\\d{6})(?:-(\\d{2})(?:-(\\d{2})(?:T(\\d{2}):(\\d{2})(?::(\\d{2})(?:(\\.\\d{1,}))?)?(Z|(?:([-+])(\\d{2}):(\\d{2})))?)?)?)?$"),n=[0,31,59,90,120,151,181,212,243,273,304,334,365],o=function(t,e){var r=e>1?1:0;return n[e]+Math.floor((t-1969+r)/4)-Math.floor((t-1901+r)/100)+Math.floor((t-1601+r)/400)+365*(t-1970)},i=function(e){var r=0,n=e;if(ye&&n>pe){var o=Math.floor(n/pe)*pe,i=Math.floor(o/1e3);r+=i,n-=1e3*i}return l(new t(1970,0,1,0,0,r,n))};for(var a in t)Y(t,a)&&(e[a]=t[a]);P(e,{now:t.now,UTC:t.UTC},!0),e.prototype=t.prototype,P(e.prototype,{constructor:e},!0);var u=function(e){var n=r.exec(e);if(n){var a,u=l(n[1]),f=l(n[2]||1)-1,s=l(n[3]||1)-1,c=l(n[4]||0),h=l(n[5]||0),p=l(n[6]||0),y=Math.floor(1e3*l(n[7]||0)),d=Boolean(n[4]&&!n[8]),g="-"===n[9]?1:-1,v=l(n[10]||0),b=l(n[11]||0),w=h>0||p>0||y>0;return c<(w?24:25)&&h<60&&p<60&&y<1e3&&f>-1&&f<12&&v<24&&b<60&&s>-1&&s<o(u,f+1)-o(u,f)&&(a=60*(24*(o(u,f)+s)+c+v*g),a=1e3*(60*(a+h+b*g)+p)+y,d&&(a=i(a)),-864e13<=a&&a<=864e13)?a:NaN}return t.parse.apply(this,arguments)};return P(e,{parse:u}),e}(Date)}Date.now||(Date.now=function(){return(new Date).getTime()});var de=c.toFixed&&("0.000"!==8e-5.toFixed(3)||"1"!==.9.toFixed(0)||"1.25"!==1.255.toFixed(2)||"1000000000000000128"!==(0xde0b6b3a7640080).toFixed(0)),ge={base:1e7,size:6,data:[0,0,0,0,0,0],multiply:function(t,e){for(var r=-1,n=e;++r<ge.size;)n+=t*ge.data[r],ge.data[r]=n%ge.base,n=Math.floor(n/ge.base)},divide:function(t){for(var e=ge.size,r=0;--e>=0;)r+=ge.data[e],ge.data[e]=Math.floor(r/t),r=r%t*ge.base},numToString:function(){for(var t=ge.size,e="";--t>=0;)if(""!==e||0===t||0!==ge.data[t]){var r=f(ge.data[t]);""===e?e=r:e+=L("0000000",0,7-r.length)+r}return e},pow:function Ae(t,e,r){return 0===e?r:e%2===1?Ae(t,e-1,r*t):Ae(t*t,e/2,r)},log:function(t){for(var e=0,r=t;r>=4096;)e+=12,r/=4096;for(;r>=2;)e+=1,r/=2;return e}},ve=function(t){var e,r,n,o,i,a,u,s;if(e=l(t),e=Z(e)?0:Math.floor(e),e<0||e>20)throw new RangeError("Number.toFixed called with invalid number of decimals");if(r=l(this),Z(r))return"NaN";if(r<=-1e21||r>=1e21)return f(r);if(n="",r<0&&(n="-",r=-r),o="0",r>1e-21)if(i=ge.log(r*ge.pow(2,69,1))-69,a=i<0?r*ge.pow(2,-i,1):r/ge.pow(2,i,1),a*=4503599627370496,i=52-i,i>0){for(ge.multiply(0,a),u=e;u>=7;)ge.multiply(1e7,0),u-=7;for(ge.multiply(ge.pow(10,u,1),0),u=i-1;u>=23;)ge.divide(1<<23),u-=23;ge.divide(1<<u),ge.multiply(1,1),ge.divide(2),o=ge.numToString()}else ge.multiply(0,a),ge.multiply(1<<-i,0),o=ge.numToString()+L("0.00000000000000000000",2,2+e);return e>0?(s=o.length,o=s<=e?n+L("0.0000000000000000000",0,e-s+2)+o:n+L(o,0,s-e)+"."+L(o,s-e)):o=n+o,o};P(c,{toFixed:ve},de);var be=function(){try{return"1"===1..toPrecision(void 0)}catch(t){return!0}}(),we=c.toPrecision;P(c,{toPrecision:function(t){return"undefined"==typeof t?we.call(this):we.call(this,t)}},be),2!=="ab".split(/(?:ab)*/).length||4!==".".split(/(.?)(.?)/).length||"t"==="tesst".split(/(s)*/)[1]||4!=="test".split(/(?:)/,-1).length||"".split(/.?/).length||".".split(/()()/).length>1?!function(){var t="undefined"==typeof/()??/.exec("")[1],r=Math.pow(2,32)-1;s.split=function(n,o){var i=String(this);if("undefined"==typeof n&&0===o)return[];if(!e(n))return X(this,n,o);var a,u,f,s,l=[],c=(n.ignoreCase?"i":"")+(n.multiline?"m":"")+(n.unicode?"u":"")+(n.sticky?"y":""),h=0,p=new RegExp(n.source,c+"g");t||(a=new RegExp("^"+p.source+"$(?!\\s)",c));var d="undefined"==typeof o?r:z.ToUint32(o);for(u=p.exec(i);u&&(f=u.index+u[0].length,!(f>h&&(K(l,L(i,h,u.index)),!t&&u.length>1&&u[0].replace(a,function(){for(var t=1;t<arguments.length-2;t++)"undefined"==typeof arguments[t]&&(u[t]=void 0)}),u.length>1&&u.index<i.length&&y.apply(l,H(u,1)),s=u[0].length,h=f,l.length>=d)));)p.lastIndex===u.index&&p.lastIndex++,u=p.exec(i);return h===i.length?!s&&p.test("")||K(l,""):K(l,L(i,h)),l.length>d?H(l,0,d):l}}():"0".split(void 0,0).length&&(s.split=function(t,e){return"undefined"==typeof t&&0===e?[]:X(this,t,e)});var Te=s.replace,me=function(){var t=[];return"x".replace(/x(.)?/g,function(e,r){K(t,r)}),1===t.length&&"undefined"==typeof t[0]}();me||(s.replace=function(r,n){var o=t(n),i=e(r)&&/\)[*?]/.test(r.source);if(o&&i){var a=function(t){var e=arguments.length,o=r.lastIndex;r.lastIndex=0;var i=r.exec(t)||[];return r.lastIndex=o,K(i,arguments[e-2],arguments[e-1]),n.apply(this,i)};return Te.call(this,r,a)}return Te.call(this,r,n)});var De=s.substr,xe="".substr&&"b"!=="0b".substr(-1);P(s,{substr:function(t,e){var r=t;return t<0&&(r=T(this.length+t,0)),De.call(this,r,e)}},xe);var Se="\t\n\x0B\f\r   ᠎             　\u2028\u2029\ufeff",Oe="​",je="["+Se+"]",Ee=new RegExp("^"+je+je+"*"),Me=new RegExp(je+je+"*$"),Ie=s.trim&&(Se.trim()||!Oe.trim());P(s,{trim:function(){if("undefined"==typeof this||null===this)throw new TypeError("can't convert "+this+" to object");return f(this).replace(Ee,"").replace(Me,"")}},Ie);var Ue=b.bind(String.prototype.trim),Fe=s.lastIndexOf&&"abcあい".lastIndexOf("あい",2)!==-1;P(s,{lastIndexOf:function(t){if("undefined"==typeof this||null===this)throw new TypeError("can't convert "+this+" to object");for(var e=f(this),r=f(t),n=arguments.length>1?l(arguments[1]):NaN,o=Z(n)?1/0:z.ToInteger(n),i=m(T(o,0),e.length),a=r.length,u=i+a;u>0;){u=T(0,u-a);var s=q(L(e,u,i+a),r);if(s!==-1)return u+s}return-1}},Fe);var Ne=s.lastIndexOf;if(P(s,{lastIndexOf:function(t){return Ne.apply(this,arguments)}},1!==s.lastIndexOf.length),8===parseInt(Se+"08")&&22===parseInt(Se+"0x16")||(parseInt=function(t){var e=/^[\-+]?0[xX]/;return function(r,n){var o=Ue(String(r)),i=l(n)||(e.test(o)?16:10);return t(o,i)}}(parseInt)),1/parseFloat("-0")!==-(1/0)&&(parseFloat=function(t){return function(e){var r=Ue(String(e)),n=t(r);return 0===n&&"-"===L(r,0,1)?-0:n}}(parseFloat)),"RangeError: test"!==String(new RangeError("test"))){var ke=function(){if("undefined"==typeof this||null===this)throw new TypeError("can't convert "+this+" to object");var t=this.name;"undefined"==typeof t?t="Error":"string"!=typeof t&&(t=f(t));var e=this.message;return"undefined"==typeof e?e="":"string"!=typeof e&&(e=f(e)),t?e?t+": "+e:t:e};Error.prototype.toString=ke}if($){var Ce=function(t,e){if(Q(t,e)){var r=Object.getOwnPropertyDescriptor(t,e);r.configurable&&(r.enumerable=!1,Object.defineProperty(t,e,r))}};Ce(Error.prototype,"message"),""!==Error.prototype.message&&(Error.prototype.message=""),Ce(Error.prototype,"name")}if("/a/gim"!==String(/a/gim)){var Re=function(){var t="/"+this.source+"/";return this.global&&(t+="g"),this.ignoreCase&&(t+="i"),this.multiline&&(t+="m"),t};RegExp.prototype.toString=Re}});
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js
deleted file mode 100644
index c70f09d1de6..00000000000
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js
+++ /dev/null
@@ -1,2278 +0,0 @@
-/*
-
-Copyright (C) 2011 by Yehuda Katz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-// lib/handlebars/browser-prefix.js
-var Handlebars = {};
-
-(function(Handlebars, undefined) {
-;
-// lib/handlebars/base.js
-
-Handlebars.VERSION = "1.0.0";
-Handlebars.COMPILER_REVISION = 4;
-
-Handlebars.REVISION_CHANGES = {
-  1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
-  2: '== 1.0.0-rc.3',
-  3: '== 1.0.0-rc.4',
-  4: '>= 1.0.0'
-};
-
-Handlebars.helpers  = {};
-Handlebars.partials = {};
-
-var toString = Object.prototype.toString,
-    functionType = '[object Function]',
-    objectType = '[object Object]';
-
-Handlebars.registerHelper = function(name, fn, inverse) {
-  if (toString.call(name) === objectType) {
-    if (inverse || fn) { throw new Handlebars.Exception('Arg not supported with multiple helpers'); }
-    Handlebars.Utils.extend(this.helpers, name);
-  } else {
-    if (inverse) { fn.not = inverse; }
-    this.helpers[name] = fn;
-  }
-};
-
-Handlebars.registerPartial = function(name, str) {
-  if (toString.call(name) === objectType) {
-    Handlebars.Utils.extend(this.partials,  name);
-  } else {
-    this.partials[name] = str;
-  }
-};
-
-Handlebars.registerHelper('helperMissing', function(arg) {
-  if(arguments.length === 2) {
-    return undefined;
-  } else {
-    throw new Error("Missing helper: '" + arg + "'");
-  }
-});
-
-Handlebars.registerHelper('blockHelperMissing', function(context, options) {
-  var inverse = options.inverse || function() {}, fn = options.fn;
-
-  var type = toString.call(context);
-
-  if(type === functionType) { context = context.call(this); }
-
-  if(context === true) {
-    return fn(this);
-  } else if(context === false || context == null) {
-    return inverse(this);
-  } else if(type === "[object Array]") {
-    if(context.length > 0) {
-      return Handlebars.helpers.each(context, options);
-    } else {
-      return inverse(this);
-    }
-  } else {
-    return fn(context);
-  }
-});
-
-Handlebars.K = function() {};
-
-Handlebars.createFrame = Object.create || function(object) {
-  Handlebars.K.prototype = object;
-  var obj = new Handlebars.K();
-  Handlebars.K.prototype = null;
-  return obj;
-};
-
-Handlebars.logger = {
-  DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3, level: 3,
-
-  methodMap: {0: 'debug', 1: 'info', 2: 'warn', 3: 'error'},
-
-  // can be overridden in the host environment
-  log: function(level, obj) {
-    if (Handlebars.logger.level <= level) {
-      var method = Handlebars.logger.methodMap[level];
-      if (typeof console !== 'undefined' && console[method]) {
-        console[method].call(console, obj);
-      }
-    }
-  }
-};
-
-Handlebars.log = function(level, obj) { Handlebars.logger.log(level, obj); };
-
-Handlebars.registerHelper('each', function(context, options) {
-  var fn = options.fn, inverse = options.inverse;
-  var i = 0, ret = "", data;
-
-  var type = toString.call(context);
-  if(type === functionType) { context = context.call(this); }
-
-  if (options.data) {
-    data = Handlebars.createFrame(options.data);
-  }
-
-  if(context && typeof context === 'object') {
-    if(context instanceof Array){
-      for(var j = context.length; i<j; i++) {
-        if (data) { data.index = i; }
-        ret = ret + fn(context[i], { data: data });
-      }
-    } else {
-      for(var key in context) {
-        if(context.hasOwnProperty(key)) {
-          if(data) { data.key = key; }
-          ret = ret + fn(context[key], {data: data});
-          i++;
-        }
-      }
-    }
-  }
-
-  if(i === 0){
-    ret = inverse(this);
-  }
-
-  return ret;
-});
-
-Handlebars.registerHelper('if', function(conditional, options) {
-  var type = toString.call(conditional);
-  if(type === functionType) { conditional = conditional.call(this); }
-
-  if(!conditional || Handlebars.Utils.isEmpty(conditional)) {
-    return options.inverse(this);
-  } else {
-    return options.fn(this);
-  }
-});
-
-Handlebars.registerHelper('unless', function(conditional, options) {
-  return Handlebars.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn});
-});
-
-Handlebars.registerHelper('with', function(context, options) {
-  var type = toString.call(context);
-  if(type === functionType) { context = context.call(this); }
-
-  if (!Handlebars.Utils.isEmpty(context)) return options.fn(context);
-});
-
-Handlebars.registerHelper('log', function(context, options) {
-  var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
-  Handlebars.log(level, context);
-});
-;
-// lib/handlebars/compiler/parser.js
-/* Jison generated parser */
-var handlebars = (function(){
-var parser = {trace: function trace() { },
-yy: {},
-symbols_: {"error":2,"root":3,"program":4,"EOF":5,"simpleInverse":6,"statements":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"CLOSE_UNESCAPED":24,"OPEN_PARTIAL":25,"partialName":26,"params":27,"hash":28,"dataName":29,"param":30,"STRING":31,"INTEGER":32,"BOOLEAN":33,"hashSegments":34,"hashSegment":35,"ID":36,"EQUALS":37,"DATA":38,"pathSegments":39,"SEP":40,"$accept":0,"$end":1},
-terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"CLOSE_UNESCAPED",25:"OPEN_PARTIAL",31:"STRING",32:"INTEGER",33:"BOOLEAN",36:"ID",37:"EQUALS",38:"DATA",40:"SEP"},
-productions_: [0,[3,2],[4,2],[4,3],[4,2],[4,1],[4,1],[4,0],[7,1],[7,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,3],[13,4],[6,2],[17,3],[17,2],[17,2],[17,1],[17,1],[27,2],[27,1],[30,1],[30,1],[30,1],[30,1],[30,1],[28,1],[34,2],[34,1],[35,3],[35,3],[35,3],[35,3],[35,3],[26,1],[26,1],[26,1],[29,2],[21,1],[39,3],[39,1]],
-performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
-
-var $0 = $$.length - 1;
-switch (yystate) {
-case 1: return $$[$0-1]; 
-break;
-case 2: this.$ = new yy.ProgramNode([], $$[$0]); 
-break;
-case 3: this.$ = new yy.ProgramNode($$[$0-2], $$[$0]); 
-break;
-case 4: this.$ = new yy.ProgramNode($$[$0-1], []); 
-break;
-case 5: this.$ = new yy.ProgramNode($$[$0]); 
-break;
-case 6: this.$ = new yy.ProgramNode([], []); 
-break;
-case 7: this.$ = new yy.ProgramNode([]); 
-break;
-case 8: this.$ = [$$[$0]]; 
-break;
-case 9: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
-break;
-case 10: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1].inverse, $$[$0-1], $$[$0]); 
-break;
-case 11: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0-1].inverse, $$[$0]); 
-break;
-case 12: this.$ = $$[$0]; 
-break;
-case 13: this.$ = $$[$0]; 
-break;
-case 14: this.$ = new yy.ContentNode($$[$0]); 
-break;
-case 15: this.$ = new yy.CommentNode($$[$0]); 
-break;
-case 16: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]); 
-break;
-case 17: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]); 
-break;
-case 18: this.$ = $$[$0-1]; 
-break;
-case 19:
-    // Parsing out the '&' escape token at this level saves ~500 bytes after min due to the removal of one parser node.
-    this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2][2] === '&');
-  
-break;
-case 20: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], true); 
-break;
-case 21: this.$ = new yy.PartialNode($$[$0-1]); 
-break;
-case 22: this.$ = new yy.PartialNode($$[$0-2], $$[$0-1]); 
-break;
-case 23: 
-break;
-case 24: this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]]; 
-break;
-case 25: this.$ = [[$$[$0-1]].concat($$[$0]), null]; 
-break;
-case 26: this.$ = [[$$[$0-1]], $$[$0]]; 
-break;
-case 27: this.$ = [[$$[$0]], null]; 
-break;
-case 28: this.$ = [[$$[$0]], null]; 
-break;
-case 29: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
-break;
-case 30: this.$ = [$$[$0]]; 
-break;
-case 31: this.$ = $$[$0]; 
-break;
-case 32: this.$ = new yy.StringNode($$[$0]); 
-break;
-case 33: this.$ = new yy.IntegerNode($$[$0]); 
-break;
-case 34: this.$ = new yy.BooleanNode($$[$0]); 
-break;
-case 35: this.$ = $$[$0]; 
-break;
-case 36: this.$ = new yy.HashNode($$[$0]); 
-break;
-case 37: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
-break;
-case 38: this.$ = [$$[$0]]; 
-break;
-case 39: this.$ = [$$[$0-2], $$[$0]]; 
-break;
-case 40: this.$ = [$$[$0-2], new yy.StringNode($$[$0])]; 
-break;
-case 41: this.$ = [$$[$0-2], new yy.IntegerNode($$[$0])]; 
-break;
-case 42: this.$ = [$$[$0-2], new yy.BooleanNode($$[$0])]; 
-break;
-case 43: this.$ = [$$[$0-2], $$[$0]]; 
-break;
-case 44: this.$ = new yy.PartialNameNode($$[$0]); 
-break;
-case 45: this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0])); 
-break;
-case 46: this.$ = new yy.PartialNameNode(new yy.IntegerNode($$[$0])); 
-break;
-case 47: this.$ = new yy.DataNode($$[$0]); 
-break;
-case 48: this.$ = new yy.IdNode($$[$0]); 
-break;
-case 49: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2]; 
-break;
-case 50: this.$ = [{part: $$[$0]}]; 
-break;
-}
-},
-table: [{3:1,4:2,5:[2,7],6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],22:[1,14],23:[1,15],25:[1,16]},{1:[3]},{5:[1,17]},{5:[2,6],7:18,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,6],22:[1,14],23:[1,15],25:[1,16]},{5:[2,5],6:20,8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,5],22:[1,14],23:[1,15],25:[1,16]},{17:23,18:[1,22],21:24,29:25,36:[1,28],38:[1,27],39:26},{5:[2,8],14:[2,8],15:[2,8],16:[2,8],19:[2,8],20:[2,8],22:[2,8],23:[2,8],25:[2,8]},{4:29,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],25:[1,16]},{4:30,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],25:[1,16]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],25:[2,12]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],25:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],25:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],25:[2,15]},{17:31,21:24,29:25,36:[1,28],38:[1,27],39:26},{17:32,21:24,29:25,36:[1,28],38:[1,27],39:26},{17:33,21:24,29:25,36:[1,28],38:[1,27],39:26},{21:35,26:34,31:[1,36],32:[1,37],36:[1,28],39:26},{1:[2,1]},{5:[2,2],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,2],22:[1,14],23:[1,15],25:[1,16]},{17:23,21:24,29:25,36:[1,28],38:[1,27],39:26},{5:[2,4],7:38,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,4],22:[1,14],23:[1,15],25:[1,16]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],25:[2,9]},{5:[2,23],14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],25:[2,23]},{18:[1,39]},{18:[2,27],21:44,24:[2,27],27:40,28:41,29:48,30:42,31:[1,45],32:[1,46],33:[1,47],34:43,35:49,36:[1,50],38:[1,27],39:26},{18:[2,28],24:[2,28]},{18:[2,48],24:[2,48],31:[2,48],32:[2,48],33:[2,48],36:[2,48],38:[2,48],40:[1,51]},{21:52,36:[1,28],39:26},{18:[2,50],24:[2,50],31:[2,50],32:[2,50],33:[2,50],36:[2,50],38:[2,50],40:[2,50]},{10:53,20:[1,54]},{10:55,20:[1,54]},{18:[1,56]},{18:[1,57]},{24:[1,58]},{18:[1,59],21:60,36:[1,28],39:26},{18:[2,44],36:[2,44]},{18:[2,45],36:[2,45]},{18:[2,46],36:[2,46]},{5:[2,3],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,3],22:[1,14],23:[1,15],25:[1,16]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],25:[2,17]},{18:[2,25],21:44,24:[2,25],28:61,29:48,30:62,31:[1,45],32:[1,46],33:[1,47],34:43,35:49,36:[1,50],38:[1,27],39:26},{18:[2,26],24:[2,26]},{18:[2,30],24:[2,30],31:[2,30],32:[2,30],33:[2,30],36:[2,30],38:[2,30]},{18:[2,36],24:[2,36],35:63,36:[1,64]},{18:[2,31],24:[2,31],31:[2,31],32:[2,31],33:[2,31],36:[2,31],38:[2,31]},{18:[2,32],24:[2,32],31:[2,32],32:[2,32],33:[2,32],36:[2,32],38:[2,32]},{18:[2,33],24:[2,33],31:[2,33],32:[2,33],33:[2,33],36:[2,33],38:[2,33]},{18:[2,34],24:[2,34],31:[2,34],32:[2,34],33:[2,34],36:[2,34],38:[2,34]},{18:[2,35],24:[2,35],31:[2,35],32:[2,35],33:[2,35],36:[2,35],38:[2,35]},{18:[2,38],24:[2,38],36:[2,38]},{18:[2,50],24:[2,50],31:[2,50],32:[2,50],33:[2,50],36:[2,50],37:[1,65],38:[2,50],40:[2,50]},{36:[1,66]},{18:[2,47],24:[2,47],31:[2,47],32:[2,47],33:[2,47],36:[2,47],38:[2,47]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],25:[2,10]},{21:67,36:[1,28],39:26},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],25:[2,11]},{14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],25:[2,16]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],25:[2,19]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],25:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],25:[2,21]},{18:[1,68]},{18:[2,24],24:[2,24]},{18:[2,29],24:[2,29],31:[2,29],32:[2,29],33:[2,29],36:[2,29],38:[2,29]},{18:[2,37],24:[2,37],36:[2,37]},{37:[1,65]},{21:69,29:73,31:[1,70],32:[1,71],33:[1,72],36:[1,28],38:[1,27],39:26},{18:[2,49],24:[2,49],31:[2,49],32:[2,49],33:[2,49],36:[2,49],38:[2,49],40:[2,49]},{18:[1,74]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],25:[2,22]},{18:[2,39],24:[2,39],36:[2,39]},{18:[2,40],24:[2,40],36:[2,40]},{18:[2,41],24:[2,41],36:[2,41]},{18:[2,42],24:[2,42],36:[2,42]},{18:[2,43],24:[2,43],36:[2,43]},{5:[2,18],14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],25:[2,18]}],
-defaultActions: {17:[2,1]},
-parseError: function parseError(str, hash) {
-    throw new Error(str);
-},
-parse: function parse(input) {
-    var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
-    this.lexer.setInput(input);
-    this.lexer.yy = this.yy;
-    this.yy.lexer = this.lexer;
-    this.yy.parser = this;
-    if (typeof this.lexer.yylloc == "undefined")
-        this.lexer.yylloc = {};
-    var yyloc = this.lexer.yylloc;
-    lstack.push(yyloc);
-    var ranges = this.lexer.options && this.lexer.options.ranges;
-    if (typeof this.yy.parseError === "function")
-        this.parseError = this.yy.parseError;
-    function popStack(n) {
-        stack.length = stack.length - 2 * n;
-        vstack.length = vstack.length - n;
-        lstack.length = lstack.length - n;
-    }
-    function lex() {
-        var token;
-        token = self.lexer.lex() || 1;
-        if (typeof token !== "number") {
-            token = self.symbols_[token] || token;
-        }
-        return token;
-    }
-    var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
-    while (true) {
-        state = stack[stack.length - 1];
-        if (this.defaultActions[state]) {
-            action = this.defaultActions[state];
-        } else {
-            if (symbol === null || typeof symbol == "undefined") {
-                symbol = lex();
-            }
-            action = table[state] && table[state][symbol];
-        }
-        if (typeof action === "undefined" || !action.length || !action[0]) {
-            var errStr = "";
-            if (!recovering) {
-                expected = [];
-                for (p in table[state])
-                    if (this.terminals_[p] && p > 2) {
-                        expected.push("'" + this.terminals_[p] + "'");
-                    }
-                if (this.lexer.showPosition) {
-                    errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'";
-                } else {
-                    errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'");
-                }
-                this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
-            }
-        }
-        if (action[0] instanceof Array && action.length > 1) {
-            throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol);
-        }
-        switch (action[0]) {
-        case 1:
-            stack.push(symbol);
-            vstack.push(this.lexer.yytext);
-            lstack.push(this.lexer.yylloc);
-            stack.push(action[1]);
-            symbol = null;
-            if (!preErrorSymbol) {
-                yyleng = this.lexer.yyleng;
-                yytext = this.lexer.yytext;
-                yylineno = this.lexer.yylineno;
-                yyloc = this.lexer.yylloc;
-                if (recovering > 0)
-                    recovering--;
-            } else {
-                symbol = preErrorSymbol;
-                preErrorSymbol = null;
-            }
-            break;
-        case 2:
-            len = this.productions_[action[1]][1];
-            yyval.$ = vstack[vstack.length - len];
-            yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column};
-            if (ranges) {
-                yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
-            }
-            r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
-            if (typeof r !== "undefined") {
-                return r;
-            }
-            if (len) {
-                stack = stack.slice(0, -1 * len * 2);
-                vstack = vstack.slice(0, -1 * len);
-                lstack = lstack.slice(0, -1 * len);
-            }
-            stack.push(this.productions_[action[1]][0]);
-            vstack.push(yyval.$);
-            lstack.push(yyval._$);
-            newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
-            stack.push(newState);
-            break;
-        case 3:
-            return true;
-        }
-    }
-    return true;
-}
-};
-/* Jison generated lexer */
-var lexer = (function(){
-var lexer = ({EOF:1,
-parseError:function parseError(str, hash) {
-        if (this.yy.parser) {
-            this.yy.parser.parseError(str, hash);
-        } else {
-            throw new Error(str);
-        }
-    },
-setInput:function (input) {
-        this._input = input;
-        this._more = this._less = this.done = false;
-        this.yylineno = this.yyleng = 0;
-        this.yytext = this.matched = this.match = '';
-        this.conditionStack = ['INITIAL'];
-        this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0};
-        if (this.options.ranges) this.yylloc.range = [0,0];
-        this.offset = 0;
-        return this;
-    },
-input:function () {
-        var ch = this._input[0];
-        this.yytext += ch;
-        this.yyleng++;
-        this.offset++;
-        this.match += ch;
-        this.matched += ch;
-        var lines = ch.match(/(?:\r\n?|\n).*/g);
-        if (lines) {
-            this.yylineno++;
-            this.yylloc.last_line++;
-        } else {
-            this.yylloc.last_column++;
-        }
-        if (this.options.ranges) this.yylloc.range[1]++;
-
-        this._input = this._input.slice(1);
-        return ch;
-    },
-unput:function (ch) {
-        var len = ch.length;
-        var lines = ch.split(/(?:\r\n?|\n)/g);
-
-        this._input = ch + this._input;
-        this.yytext = this.yytext.substr(0, this.yytext.length-len-1);
-        //this.yyleng -= len;
-        this.offset -= len;
-        var oldLines = this.match.split(/(?:\r\n?|\n)/g);
-        this.match = this.match.substr(0, this.match.length-1);
-        this.matched = this.matched.substr(0, this.matched.length-1);
-
-        if (lines.length-1) this.yylineno -= lines.length-1;
-        var r = this.yylloc.range;
-
-        this.yylloc = {first_line: this.yylloc.first_line,
-          last_line: this.yylineno+1,
-          first_column: this.yylloc.first_column,
-          last_column: lines ?
-              (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length:
-              this.yylloc.first_column - len
-          };
-
-        if (this.options.ranges) {
-            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
-        }
-        return this;
-    },
-more:function () {
-        this._more = true;
-        return this;
-    },
-less:function (n) {
-        this.unput(this.match.slice(n));
-    },
-pastInput:function () {
-        var past = this.matched.substr(0, this.matched.length - this.match.length);
-        return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
-    },
-upcomingInput:function () {
-        var next = this.match;
-        if (next.length < 20) {
-            next += this._input.substr(0, 20-next.length);
-        }
-        return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, "");
-    },
-showPosition:function () {
-        var pre = this.pastInput();
-        var c = new Array(pre.length + 1).join("-");
-        return pre + this.upcomingInput() + "\n" + c+"^";
-    },
-next:function () {
-        if (this.done) {
-            return this.EOF;
-        }
-        if (!this._input) this.done = true;
-
-        var token,
-            match,
-            tempMatch,
-            index,
-            col,
-            lines;
-        if (!this._more) {
-            this.yytext = '';
-            this.match = '';
-        }
-        var rules = this._currentRules();
-        for (var i=0;i < rules.length; i++) {
-            tempMatch = this._input.match(this.rules[rules[i]]);
-            if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
-                match = tempMatch;
-                index = i;
-                if (!this.options.flex) break;
-            }
-        }
-        if (match) {
-            lines = match[0].match(/(?:\r\n?|\n).*/g);
-            if (lines) this.yylineno += lines.length;
-            this.yylloc = {first_line: this.yylloc.last_line,
-                           last_line: this.yylineno+1,
-                           first_column: this.yylloc.last_column,
-                           last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length};
-            this.yytext += match[0];
-            this.match += match[0];
-            this.matches = match;
-            this.yyleng = this.yytext.length;
-            if (this.options.ranges) {
-                this.yylloc.range = [this.offset, this.offset += this.yyleng];
-            }
-            this._more = false;
-            this._input = this._input.slice(match[0].length);
-            this.matched += match[0];
-            token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]);
-            if (this.done && this._input) this.done = false;
-            if (token) return token;
-            else return;
-        }
-        if (this._input === "") {
-            return this.EOF;
-        } else {
-            return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
-                    {text: "", token: null, line: this.yylineno});
-        }
-    },
-lex:function lex() {
-        var r = this.next();
-        if (typeof r !== 'undefined') {
-            return r;
-        } else {
-            return this.lex();
-        }
-    },
-begin:function begin(condition) {
-        this.conditionStack.push(condition);
-    },
-popState:function popState() {
-        return this.conditionStack.pop();
-    },
-_currentRules:function _currentRules() {
-        return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules;
-    },
-topState:function () {
-        return this.conditionStack[this.conditionStack.length-2];
-    },
-pushState:function begin(condition) {
-        this.begin(condition);
-    }});
-lexer.options = {};
-lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
-
-var YYSTATE=YY_START
-switch($avoiding_name_collisions) {
-case 0: yy_.yytext = "\\"; return 14; 
-break;
-case 1:
-                                   if(yy_.yytext.slice(-1) !== "\\") this.begin("mu");
-                                   if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1), this.begin("emu");
-                                   if(yy_.yytext) return 14;
-                                 
-break;
-case 2: return 14; 
-break;
-case 3:
-                                   if(yy_.yytext.slice(-1) !== "\\") this.popState();
-                                   if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1);
-                                   return 14;
-                                 
-break;
-case 4: yy_.yytext = yy_.yytext.substr(0, yy_.yyleng-4); this.popState(); return 15; 
-break;
-case 5: return 25; 
-break;
-case 6: return 16; 
-break;
-case 7: return 20; 
-break;
-case 8: return 19; 
-break;
-case 9: return 19; 
-break;
-case 10: return 23; 
-break;
-case 11: return 22; 
-break;
-case 12: this.popState(); this.begin('com'); 
-break;
-case 13: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.popState(); return 15; 
-break;
-case 14: return 22; 
-break;
-case 15: return 37; 
-break;
-case 16: return 36; 
-break;
-case 17: return 36; 
-break;
-case 18: return 40; 
-break;
-case 19: /*ignore whitespace*/ 
-break;
-case 20: this.popState(); return 24; 
-break;
-case 21: this.popState(); return 18; 
-break;
-case 22: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 31; 
-break;
-case 23: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\'/g,"'"); return 31; 
-break;
-case 24: return 38; 
-break;
-case 25: return 33; 
-break;
-case 26: return 33; 
-break;
-case 27: return 32; 
-break;
-case 28: return 36; 
-break;
-case 29: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 36; 
-break;
-case 30: return 'INVALID'; 
-break;
-case 31: return 5; 
-break;
-}
-};
-lexer.rules = [/^(?:\\\\(?=(\{\{)))/,/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\{\{>)/,/^(?:\{\{#)/,/^(?:\{\{\/)/,/^(?:\{\{\^)/,/^(?:\{\{\s*else\b)/,/^(?:\{\{\{)/,/^(?:\{\{&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{)/,/^(?:=)/,/^(?:\.(?=[}\/ ]))/,/^(?:\.\.)/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}\}\})/,/^(?:\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=[}\s]))/,/^(?:false(?=[}\s]))/,/^(?:-?[0-9]+(?=[}\s]))/,/^(?:[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.]))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
-lexer.conditions = {"mu":{"rules":[5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31],"inclusive":false},"emu":{"rules":[3],"inclusive":false},"com":{"rules":[4],"inclusive":false},"INITIAL":{"rules":[0,1,2,31],"inclusive":true}};
-return lexer;})()
-parser.lexer = lexer;
-function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
-return new Parser;
-})();;
-// lib/handlebars/compiler/base.js
-
-Handlebars.Parser = handlebars;
-
-Handlebars.parse = function(input) {
-
-  // Just return if an already-compile AST was passed in.
-  if(input.constructor === Handlebars.AST.ProgramNode) { return input; }
-
-  Handlebars.Parser.yy = Handlebars.AST;
-  return Handlebars.Parser.parse(input);
-};
-;
-// lib/handlebars/compiler/ast.js
-Handlebars.AST = {};
-
-Handlebars.AST.ProgramNode = function(statements, inverse) {
-  this.type = "program";
-  this.statements = statements;
-  if(inverse) { this.inverse = new Handlebars.AST.ProgramNode(inverse); }
-};
-
-Handlebars.AST.MustacheNode = function(rawParams, hash, unescaped) {
-  this.type = "mustache";
-  this.escaped = !unescaped;
-  this.hash = hash;
-
-  var id = this.id = rawParams[0];
-  var params = this.params = rawParams.slice(1);
-
-  // a mustache is an eligible helper if:
-  // * its id is simple (a single part, not `this` or `..`)
-  var eligibleHelper = this.eligibleHelper = id.isSimple;
-
-  // a mustache is definitely a helper if:
-  // * it is an eligible helper, and
-  // * it has at least one parameter or hash segment
-  this.isHelper = eligibleHelper && (params.length || hash);
-
-  // if a mustache is an eligible helper but not a definite
-  // helper, it is ambiguous, and will be resolved in a later
-  // pass or at runtime.
-};
-
-Handlebars.AST.PartialNode = function(partialName, context) {
-  this.type         = "partial";
-  this.partialName  = partialName;
-  this.context      = context;
-};
-
-Handlebars.AST.BlockNode = function(mustache, program, inverse, close) {
-  var verifyMatch = function(open, close) {
-    if(open.original !== close.original) {
-      throw new Handlebars.Exception(open.original + " doesn't match " + close.original);
-    }
-  };
-
-  verifyMatch(mustache.id, close);
-  this.type = "block";
-  this.mustache = mustache;
-  this.program  = program;
-  this.inverse  = inverse;
-
-  if (this.inverse && !this.program) {
-    this.isInverse = true;
-  }
-};
-
-Handlebars.AST.ContentNode = function(string) {
-  this.type = "content";
-  this.string = string;
-};
-
-Handlebars.AST.HashNode = function(pairs) {
-  this.type = "hash";
-  this.pairs = pairs;
-};
-
-Handlebars.AST.IdNode = function(parts) {
-  this.type = "ID";
-
-  var original = "",
-      dig = [],
-      depth = 0;
-
-  for(var i=0,l=parts.length; i<l; i++) {
-    var part = parts[i].part;
-    original += (parts[i].separator || '') + part;
-
-    if (part === ".." || part === "." || part === "this") {
-      if (dig.length > 0) { throw new Handlebars.Exception("Invalid path: " + original); }
-      else if (part === "..") { depth++; }
-      else { this.isScoped = true; }
-    }
-    else { dig.push(part); }
-  }
-
-  this.original = original;
-  this.parts    = dig;
-  this.string   = dig.join('.');
-  this.depth    = depth;
-
-  // an ID is simple if it only has one part, and that part is not
-  // `..` or `this`.
-  this.isSimple = parts.length === 1 && !this.isScoped && depth === 0;
-
-  this.stringModeValue = this.string;
-};
-
-Handlebars.AST.PartialNameNode = function(name) {
-  this.type = "PARTIAL_NAME";
-  this.name = name.original;
-};
-
-Handlebars.AST.DataNode = function(id) {
-  this.type = "DATA";
-  this.id = id;
-};
-
-Handlebars.AST.StringNode = function(string) {
-  this.type = "STRING";
-  this.original =
-    this.string =
-    this.stringModeValue = string;
-};
-
-Handlebars.AST.IntegerNode = function(integer) {
-  this.type = "INTEGER";
-  this.original =
-    this.integer = integer;
-  this.stringModeValue = Number(integer);
-};
-
-Handlebars.AST.BooleanNode = function(bool) {
-  this.type = "BOOLEAN";
-  this.bool = bool;
-  this.stringModeValue = bool === "true";
-};
-
-Handlebars.AST.CommentNode = function(comment) {
-  this.type = "comment";
-  this.comment = comment;
-};
-;
-// lib/handlebars/utils.js
-
-var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
-
-Handlebars.Exception = function(message) {
-  var tmp = Error.prototype.constructor.apply(this, arguments);
-
-  // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
-  for (var idx = 0; idx < errorProps.length; idx++) {
-    this[errorProps[idx]] = tmp[errorProps[idx]];
-  }
-};
-Handlebars.Exception.prototype = new Error();
-
-// Build out our basic SafeString type
-Handlebars.SafeString = function(string) {
-  this.string = string;
-};
-Handlebars.SafeString.prototype.toString = function() {
-  return this.string.toString();
-};
-
-var escape = {
-  "&": "&amp;",
-  "<": "&lt;",
-  ">": "&gt;",
-  '"': "&quot;",
-  "'": "&#x27;",
-  "`": "&#x60;"
-};
-
-var badChars = /[&<>"'`]/g;
-var possible = /[&<>"'`]/;
-
-var escapeChar = function(chr) {
-  return escape[chr] || "&amp;";
-};
-
-Handlebars.Utils = {
-  extend: function(obj, value) {
-    for(var key in value) {
-      if(value.hasOwnProperty(key)) {
-        obj[key] = value[key];
-      }
-    }
-  },
-
-  escapeExpression: function(string) {
-    // don't escape SafeStrings, since they're already safe
-    if (string instanceof Handlebars.SafeString) {
-      return string.toString();
-    } else if (string == null || string === false) {
-      return "";
-    }
-
-    // Force a string conversion as this will be done by the append regardless and
-    // the regex test will do this transparently behind the scenes, causing issues if
-    // an object's to string has escaped characters in it.
-    string = string.toString();
-
-    if(!possible.test(string)) { return string; }
-    return string.replace(badChars, escapeChar);
-  },
-
-  isEmpty: function(value) {
-    if (!value && value !== 0) {
-      return true;
-    } else if(toString.call(value) === "[object Array]" && value.length === 0) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-};
-;
-// lib/handlebars/compiler/compiler.js
-
-/*jshint eqnull:true*/
-var Compiler = Handlebars.Compiler = function() {};
-var JavaScriptCompiler = Handlebars.JavaScriptCompiler = function() {};
-
-// the foundHelper register will disambiguate helper lookup from finding a
-// function in a context. This is necessary for mustache compatibility, which
-// requires that context functions in blocks are evaluated by blockHelperMissing,
-// and then proceed as if the resulting value was provided to blockHelperMissing.
-
-Compiler.prototype = {
-  compiler: Compiler,
-
-  disassemble: function() {
-    var opcodes = this.opcodes, opcode, out = [], params, param;
-
-    for (var i=0, l=opcodes.length; i<l; i++) {
-      opcode = opcodes[i];
-
-      if (opcode.opcode === 'DECLARE') {
-        out.push("DECLARE " + opcode.name + "=" + opcode.value);
-      } else {
-        params = [];
-        for (var j=0; j<opcode.args.length; j++) {
-          param = opcode.args[j];
-          if (typeof param === "string") {
-            param = "\"" + param.replace("\n", "\\n") + "\"";
-          }
-          params.push(param);
-        }
-        out.push(opcode.opcode + " " + params.join(" "));
-      }
-    }
-
-    return out.join("\n");
-  },
-  equals: function(other) {
-    var len = this.opcodes.length;
-    if (other.opcodes.length !== len) {
-      return false;
-    }
-
-    for (var i = 0; i < len; i++) {
-      var opcode = this.opcodes[i],
-          otherOpcode = other.opcodes[i];
-      if (opcode.opcode !== otherOpcode.opcode || opcode.args.length !== otherOpcode.args.length) {
-        return false;
-      }
-      for (var j = 0; j < opcode.args.length; j++) {
-        if (opcode.args[j] !== otherOpcode.args[j]) {
-          return false;
-        }
-      }
-    }
-
-    len = this.children.length;
-    if (other.children.length !== len) {
-      return false;
-    }
-    for (i = 0; i < len; i++) {
-      if (!this.children[i].equals(other.children[i])) {
-        return false;
-      }
-    }
-
-    return true;
-  },
-
-  guid: 0,
-
-  compile: function(program, options) {
-    this.children = [];
-    this.depths = {list: []};
-    this.options = options;
-
-    // These changes will propagate to the other compiler components
-    var knownHelpers = this.options.knownHelpers;
-    this.options.knownHelpers = {
-      'helperMissing': true,
-      'blockHelperMissing': true,
-      'each': true,
-      'if': true,
-      'unless': true,
-      'with': true,
-      'log': true
-    };
-    if (knownHelpers) {
-      for (var name in knownHelpers) {
-        this.options.knownHelpers[name] = knownHelpers[name];
-      }
-    }
-
-    return this.program(program);
-  },
-
-  accept: function(node) {
-    return this[node.type](node);
-  },
-
-  program: function(program) {
-    var statements = program.statements, statement;
-    this.opcodes = [];
-
-    for(var i=0, l=statements.length; i<l; i++) {
-      statement = statements[i];
-      this[statement.type](statement);
-    }
-    this.isSimple = l === 1;
-
-    this.depths.list = this.depths.list.sort(function(a, b) {
-      return a - b;
-    });
-
-    return this;
-  },
-
-  compileProgram: function(program) {
-    var result = new this.compiler().compile(program, this.options);
-    var guid = this.guid++, depth;
-
-    this.usePartial = this.usePartial || result.usePartial;
-
-    this.children[guid] = result;
-
-    for(var i=0, l=result.depths.list.length; i<l; i++) {
-      depth = result.depths.list[i];
-
-      if(depth < 2) { continue; }
-      else { this.addDepth(depth - 1); }
-    }
-
-    return guid;
-  },
-
-  block: function(block) {
-    var mustache = block.mustache,
-        program = block.program,
-        inverse = block.inverse;
-
-    if (program) {
-      program = this.compileProgram(program);
-    }
-
-    if (inverse) {
-      inverse = this.compileProgram(inverse);
-    }
-
-    var type = this.classifyMustache(mustache);
-
-    if (type === "helper") {
-      this.helperMustache(mustache, program, inverse);
-    } else if (type === "simple") {
-      this.simpleMustache(mustache);
-
-      // now that the simple mustache is resolved, we need to
-      // evaluate it by executing `blockHelperMissing`
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-      this.opcode('emptyHash');
-      this.opcode('blockValue');
-    } else {
-      this.ambiguousMustache(mustache, program, inverse);
-
-      // now that the simple mustache is resolved, we need to
-      // evaluate it by executing `blockHelperMissing`
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-      this.opcode('emptyHash');
-      this.opcode('ambiguousBlockValue');
-    }
-
-    this.opcode('append');
-  },
-
-  hash: function(hash) {
-    var pairs = hash.pairs, pair, val;
-
-    this.opcode('pushHash');
-
-    for(var i=0, l=pairs.length; i<l; i++) {
-      pair = pairs[i];
-      val  = pair[1];
-
-      if (this.options.stringParams) {
-        if(val.depth) {
-          this.addDepth(val.depth);
-        }
-        this.opcode('getContext', val.depth || 0);
-        this.opcode('pushStringParam', val.stringModeValue, val.type);
-      } else {
-        this.accept(val);
-      }
-
-      this.opcode('assignToHash', pair[0]);
-    }
-    this.opcode('popHash');
-  },
-
-  partial: function(partial) {
-    var partialName = partial.partialName;
-    this.usePartial = true;
-
-    if(partial.context) {
-      this.ID(partial.context);
-    } else {
-      this.opcode('push', 'depth0');
-    }
-
-    this.opcode('invokePartial', partialName.name);
-    this.opcode('append');
-  },
-
-  content: function(content) {
-    this.opcode('appendContent', content.string);
-  },
-
-  mustache: function(mustache) {
-    var options = this.options;
-    var type = this.classifyMustache(mustache);
-
-    if (type === "simple") {
-      this.simpleMustache(mustache);
-    } else if (type === "helper") {
-      this.helperMustache(mustache);
-    } else {
-      this.ambiguousMustache(mustache);
-    }
-
-    if(mustache.escaped && !options.noEscape) {
-      this.opcode('appendEscaped');
-    } else {
-      this.opcode('append');
-    }
-  },
-
-  ambiguousMustache: function(mustache, program, inverse) {
-    var id = mustache.id,
-        name = id.parts[0],
-        isBlock = program != null || inverse != null;
-
-    this.opcode('getContext', id.depth);
-
-    this.opcode('pushProgram', program);
-    this.opcode('pushProgram', inverse);
-
-    this.opcode('invokeAmbiguous', name, isBlock);
-  },
-
-  simpleMustache: function(mustache) {
-    var id = mustache.id;
-
-    if (id.type === 'DATA') {
-      this.DATA(id);
-    } else if (id.parts.length) {
-      this.ID(id);
-    } else {
-      // Simplified ID for `this`
-      this.addDepth(id.depth);
-      this.opcode('getContext', id.depth);
-      this.opcode('pushContext');
-    }
-
-    this.opcode('resolvePossibleLambda');
-  },
-
-  helperMustache: function(mustache, program, inverse) {
-    var params = this.setupFullMustacheParams(mustache, program, inverse),
-        name = mustache.id.parts[0];
-
-    if (this.options.knownHelpers[name]) {
-      this.opcode('invokeKnownHelper', params.length, name);
-    } else if (this.options.knownHelpersOnly) {
-      throw new Error("You specified knownHelpersOnly, but used the unknown helper " + name);
-    } else {
-      this.opcode('invokeHelper', params.length, name);
-    }
-  },
-
-  ID: function(id) {
-    this.addDepth(id.depth);
-    this.opcode('getContext', id.depth);
-
-    var name = id.parts[0];
-    if (!name) {
-      this.opcode('pushContext');
-    } else {
-      this.opcode('lookupOnContext', id.parts[0]);
-    }
-
-    for(var i=1, l=id.parts.length; i<l; i++) {
-      this.opcode('lookup', id.parts[i]);
-    }
-  },
-
-  DATA: function(data) {
-    this.options.data = true;
-    if (data.id.isScoped || data.id.depth) {
-      throw new Handlebars.Exception('Scoped data references are not supported: ' + data.original);
-    }
-
-    this.opcode('lookupData');
-    var parts = data.id.parts;
-    for(var i=0, l=parts.length; i<l; i++) {
-      this.opcode('lookup', parts[i]);
-    }
-  },
-
-  STRING: function(string) {
-    this.opcode('pushString', string.string);
-  },
-
-  INTEGER: function(integer) {
-    this.opcode('pushLiteral', integer.integer);
-  },
-
-  BOOLEAN: function(bool) {
-    this.opcode('pushLiteral', bool.bool);
-  },
-
-  comment: function() {},
-
-  // HELPERS
-  opcode: function(name) {
-    this.opcodes.push({ opcode: name, args: [].slice.call(arguments, 1) });
-  },
-
-  declare: function(name, value) {
-    this.opcodes.push({ opcode: 'DECLARE', name: name, value: value });
-  },
-
-  addDepth: function(depth) {
-    if(isNaN(depth)) { throw new Error("EWOT"); }
-    if(depth === 0) { return; }
-
-    if(!this.depths[depth]) {
-      this.depths[depth] = true;
-      this.depths.list.push(depth);
-    }
-  },
-
-  classifyMustache: function(mustache) {
-    var isHelper   = mustache.isHelper;
-    var isEligible = mustache.eligibleHelper;
-    var options    = this.options;
-
-    // if ambiguous, we can possibly resolve the ambiguity now
-    if (isEligible && !isHelper) {
-      var name = mustache.id.parts[0];
-
-      if (options.knownHelpers[name]) {
-        isHelper = true;
-      } else if (options.knownHelpersOnly) {
-        isEligible = false;
-      }
-    }
-
-    if (isHelper) { return "helper"; }
-    else if (isEligible) { return "ambiguous"; }
-    else { return "simple"; }
-  },
-
-  pushParams: function(params) {
-    var i = params.length, param;
-
-    while(i--) {
-      param = params[i];
-
-      if(this.options.stringParams) {
-        if(param.depth) {
-          this.addDepth(param.depth);
-        }
-
-        this.opcode('getContext', param.depth || 0);
-        this.opcode('pushStringParam', param.stringModeValue, param.type);
-      } else {
-        this[param.type](param);
-      }
-    }
-  },
-
-  setupMustacheParams: function(mustache) {
-    var params = mustache.params;
-    this.pushParams(params);
-
-    if(mustache.hash) {
-      this.hash(mustache.hash);
-    } else {
-      this.opcode('emptyHash');
-    }
-
-    return params;
-  },
-
-  // this will replace setupMustacheParams when we're done
-  setupFullMustacheParams: function(mustache, program, inverse) {
-    var params = mustache.params;
-    this.pushParams(params);
-
-    this.opcode('pushProgram', program);
-    this.opcode('pushProgram', inverse);
-
-    if(mustache.hash) {
-      this.hash(mustache.hash);
-    } else {
-      this.opcode('emptyHash');
-    }
-
-    return params;
-  }
-};
-
-var Literal = function(value) {
-  this.value = value;
-};
-
-JavaScriptCompiler.prototype = {
-  // PUBLIC API: You can override these methods in a subclass to provide
-  // alternative compiled forms for name lookup and buffering semantics
-  nameLookup: function(parent, name /* , type*/) {
-    if (/^[0-9]+$/.test(name)) {
-      return parent + "[" + name + "]";
-    } else if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
-      return parent + "." + name;
-    }
-    else {
-      return parent + "['" + name + "']";
-    }
-  },
-
-  appendToBuffer: function(string) {
-    if (this.environment.isSimple) {
-      return "return " + string + ";";
-    } else {
-      return {
-        appendToBuffer: true,
-        content: string,
-        toString: function() { return "buffer += " + string + ";"; }
-      };
-    }
-  },
-
-  initializeBuffer: function() {
-    return this.quotedString("");
-  },
-
-  namespace: "Handlebars",
-  // END PUBLIC API
-
-  compile: function(environment, options, context, asObject) {
-    this.environment = environment;
-    this.options = options || {};
-
-    Handlebars.log(Handlebars.logger.DEBUG, this.environment.disassemble() + "\n\n");
-
-    this.name = this.environment.name;
-    this.isChild = !!context;
-    this.context = context || {
-      programs: [],
-      environments: [],
-      aliases: { }
-    };
-
-    this.preamble();
-
-    this.stackSlot = 0;
-    this.stackVars = [];
-    this.registers = { list: [] };
-    this.compileStack = [];
-    this.inlineStack = [];
-
-    this.compileChildren(environment, options);
-
-    var opcodes = environment.opcodes, opcode;
-
-    this.i = 0;
-
-    for(l=opcodes.length; this.i<l; this.i++) {
-      opcode = opcodes[this.i];
-
-      if(opcode.opcode === 'DECLARE') {
-        this[opcode.name] = opcode.value;
-      } else {
-        this[opcode.opcode].apply(this, opcode.args);
-      }
-    }
-
-    return this.createFunctionContext(asObject);
-  },
-
-  nextOpcode: function() {
-    var opcodes = this.environment.opcodes;
-    return opcodes[this.i + 1];
-  },
-
-  eat: function() {
-    this.i = this.i + 1;
-  },
-
-  preamble: function() {
-    var out = [];
-
-    if (!this.isChild) {
-      var namespace = this.namespace;
-
-      var copies = "helpers = this.merge(helpers, " + namespace + ".helpers);";
-      if (this.environment.usePartial) { copies = copies + " partials = this.merge(partials, " + namespace + ".partials);"; }
-      if (this.options.data) { copies = copies + " data = data || {};"; }
-      out.push(copies);
-    } else {
-      out.push('');
-    }
-
-    if (!this.environment.isSimple) {
-      out.push(", buffer = " + this.initializeBuffer());
-    } else {
-      out.push("");
-    }
-
-    // track the last context pushed into place to allow skipping the
-    // getContext opcode when it would be a noop
-    this.lastContext = 0;
-    this.source = out;
-  },
-
-  createFunctionContext: function(asObject) {
-    var locals = this.stackVars.concat(this.registers.list);
-
-    if(locals.length > 0) {
-      this.source[1] = this.source[1] + ", " + locals.join(", ");
-    }
-
-    // Generate minimizer alias mappings
-    if (!this.isChild) {
-      for (var alias in this.context.aliases) {
-        if (this.context.aliases.hasOwnProperty(alias)) {
-          this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias];
-        }
-      }
-    }
-
-    if (this.source[1]) {
-      this.source[1] = "var " + this.source[1].substring(2) + ";";
-    }
-
-    // Merge children
-    if (!this.isChild) {
-      this.source[1] += '\n' + this.context.programs.join('\n') + '\n';
-    }
-
-    if (!this.environment.isSimple) {
-      this.source.push("return buffer;");
-    }
-
-    var params = this.isChild ? ["depth0", "data"] : ["Handlebars", "depth0", "helpers", "partials", "data"];
-
-    for(var i=0, l=this.environment.depths.list.length; i<l; i++) {
-      params.push("depth" + this.environment.depths.list[i]);
-    }
-
-    // Perform a second pass over the output to merge content when possible
-    var source = this.mergeSource();
-
-    if (!this.isChild) {
-      var revision = Handlebars.COMPILER_REVISION,
-          versions = Handlebars.REVISION_CHANGES[revision];
-      source = "this.compilerInfo = ["+revision+",'"+versions+"'];\n"+source;
-    }
-
-    if (asObject) {
-      params.push(source);
-
-      return Function.apply(this, params);
-    } else {
-      var functionSource = 'function ' + (this.name || '') + '(' + params.join(',') + ') {\n  ' + source + '}';
-      Handlebars.log(Handlebars.logger.DEBUG, functionSource + "\n\n");
-      return functionSource;
-    }
-  },
-  mergeSource: function() {
-    // WARN: We are not handling the case where buffer is still populated as the source should
-    // not have buffer append operations as their final action.
-    var source = '',
-        buffer;
-    for (var i = 0, len = this.source.length; i < len; i++) {
-      var line = this.source[i];
-      if (line.appendToBuffer) {
-        if (buffer) {
-          buffer = buffer + '\n    + ' + line.content;
-        } else {
-          buffer = line.content;
-        }
-      } else {
-        if (buffer) {
-          source += 'buffer += ' + buffer + ';\n  ';
-          buffer = undefined;
-        }
-        source += line + '\n  ';
-      }
-    }
-    return source;
-  },
-
-  // [blockValue]
-  //
-  // On stack, before: hash, inverse, program, value
-  // On stack, after: return value of blockHelperMissing
-  //
-  // The purpose of this opcode is to take a block of the form
-  // `{{#foo}}...{{/foo}}`, resolve the value of `foo`, and
-  // replace it on the stack with the result of properly
-  // invoking blockHelperMissing.
-  blockValue: function() {
-    this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
-    var params = ["depth0"];
-    this.setupParams(0, params);
-
-    this.replaceStack(function(current) {
-      params.splice(1, 0, current);
-      return "blockHelperMissing.call(" + params.join(", ") + ")";
-    });
-  },
-
-  // [ambiguousBlockValue]
-  //
-  // On stack, before: hash, inverse, program, value
-  // Compiler value, before: lastHelper=value of last found helper, if any
-  // On stack, after, if no lastHelper: same as [blockValue]
-  // On stack, after, if lastHelper: value
-  ambiguousBlockValue: function() {
-    this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
-    var params = ["depth0"];
-    this.setupParams(0, params);
-
-    var current = this.topStack();
-    params.splice(1, 0, current);
-
-    // Use the options value generated from the invocation
-    params[params.length-1] = 'options';
-
-    this.source.push("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }");
-  },
-
-  // [appendContent]
-  //
-  // On stack, before: ...
-  // On stack, after: ...
-  //
-  // Appends the string value of `content` to the current buffer
-  appendContent: function(content) {
-    this.source.push(this.appendToBuffer(this.quotedString(content)));
-  },
-
-  // [append]
-  //
-  // On stack, before: value, ...
-  // On stack, after: ...
-  //
-  // Coerces `value` to a String and appends it to the current buffer.
-  //
-  // If `value` is truthy, or 0, it is coerced into a string and appended
-  // Otherwise, the empty string is appended
-  append: function() {
-    // Force anything that is inlined onto the stack so we don't have duplication
-    // when we examine local
-    this.flushInline();
-    var local = this.popStack();
-    this.source.push("if(" + local + " || " + local + " === 0) { " + this.appendToBuffer(local) + " }");
-    if (this.environment.isSimple) {
-      this.source.push("else { " + this.appendToBuffer("''") + " }");
-    }
-  },
-
-  // [appendEscaped]
-  //
-  // On stack, before: value, ...
-  // On stack, after: ...
-  //
-  // Escape `value` and append it to the buffer
-  appendEscaped: function() {
-    this.context.aliases.escapeExpression = 'this.escapeExpression';
-
-    this.source.push(this.appendToBuffer("escapeExpression(" + this.popStack() + ")"));
-  },
-
-  // [getContext]
-  //
-  // On stack, before: ...
-  // On stack, after: ...
-  // Compiler value, after: lastContext=depth
-  //
-  // Set the value of the `lastContext` compiler value to the depth
-  getContext: function(depth) {
-    if(this.lastContext !== depth) {
-      this.lastContext = depth;
-    }
-  },
-
-  // [lookupOnContext]
-  //
-  // On stack, before: ...
-  // On stack, after: currentContext[name], ...
-  //
-  // Looks up the value of `name` on the current context and pushes
-  // it onto the stack.
-  lookupOnContext: function(name) {
-    this.push(this.nameLookup('depth' + this.lastContext, name, 'context'));
-  },
-
-  // [pushContext]
-  //
-  // On stack, before: ...
-  // On stack, after: currentContext, ...
-  //
-  // Pushes the value of the current context onto the stack.
-  pushContext: function() {
-    this.pushStackLiteral('depth' + this.lastContext);
-  },
-
-  // [resolvePossibleLambda]
-  //
-  // On stack, before: value, ...
-  // On stack, after: resolved value, ...
-  //
-  // If the `value` is a lambda, replace it on the stack by
-  // the return value of the lambda
-  resolvePossibleLambda: function() {
-    this.context.aliases.functionType = '"function"';
-
-    this.replaceStack(function(current) {
-      return "typeof " + current + " === functionType ? " + current + ".apply(depth0) : " + current;
-    });
-  },
-
-  // [lookup]
-  //
-  // On stack, before: value, ...
-  // On stack, after: value[name], ...
-  //
-  // Replace the value on the stack with the result of looking
-  // up `name` on `value`
-  lookup: function(name) {
-    this.replaceStack(function(current) {
-      return current + " == null || " + current + " === false ? " + current + " : " + this.nameLookup(current, name, 'context');
-    });
-  },
-
-  // [lookupData]
-  //
-  // On stack, before: ...
-  // On stack, after: data[id], ...
-  //
-  // Push the result of looking up `id` on the current data
-  lookupData: function(id) {
-    this.push('data');
-  },
-
-  // [pushStringParam]
-  //
-  // On stack, before: ...
-  // On stack, after: string, currentContext, ...
-  //
-  // This opcode is designed for use in string mode, which
-  // provides the string value of a parameter along with its
-  // depth rather than resolving it immediately.
-  pushStringParam: function(string, type) {
-    this.pushStackLiteral('depth' + this.lastContext);
-
-    this.pushString(type);
-
-    if (typeof string === 'string') {
-      this.pushString(string);
-    } else {
-      this.pushStackLiteral(string);
-    }
-  },
-
-  emptyHash: function() {
-    this.pushStackLiteral('{}');
-
-    if (this.options.stringParams) {
-      this.register('hashTypes', '{}');
-      this.register('hashContexts', '{}');
-    }
-  },
-  pushHash: function() {
-    this.hash = {values: [], types: [], contexts: []};
-  },
-  popHash: function() {
-    var hash = this.hash;
-    this.hash = undefined;
-
-    if (this.options.stringParams) {
-      this.register('hashContexts', '{' + hash.contexts.join(',') + '}');
-      this.register('hashTypes', '{' + hash.types.join(',') + '}');
-    }
-    this.push('{\n    ' + hash.values.join(',\n    ') + '\n  }');
-  },
-
-  // [pushString]
-  //
-  // On stack, before: ...
-  // On stack, after: quotedString(string), ...
-  //
-  // Push a quoted version of `string` onto the stack
-  pushString: function(string) {
-    this.pushStackLiteral(this.quotedString(string));
-  },
-
-  // [push]
-  //
-  // On stack, before: ...
-  // On stack, after: expr, ...
-  //
-  // Push an expression onto the stack
-  push: function(expr) {
-    this.inlineStack.push(expr);
-    return expr;
-  },
-
-  // [pushLiteral]
-  //
-  // On stack, before: ...
-  // On stack, after: value, ...
-  //
-  // Pushes a value onto the stack. This operation prevents
-  // the compiler from creating a temporary variable to hold
-  // it.
-  pushLiteral: function(value) {
-    this.pushStackLiteral(value);
-  },
-
-  // [pushProgram]
-  //
-  // On stack, before: ...
-  // On stack, after: program(guid), ...
-  //
-  // Push a program expression onto the stack. This takes
-  // a compile-time guid and converts it into a runtime-accessible
-  // expression.
-  pushProgram: function(guid) {
-    if (guid != null) {
-      this.pushStackLiteral(this.programExpression(guid));
-    } else {
-      this.pushStackLiteral(null);
-    }
-  },
-
-  // [invokeHelper]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of helper invocation
-  //
-  // Pops off the helper's parameters, invokes the helper,
-  // and pushes the helper's return value onto the stack.
-  //
-  // If the helper is not found, `helperMissing` is called.
-  invokeHelper: function(paramSize, name) {
-    this.context.aliases.helperMissing = 'helpers.helperMissing';
-
-    var helper = this.lastHelper = this.setupHelper(paramSize, name, true);
-    var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
-
-    this.push(helper.name + ' || ' + nonHelper);
-    this.replaceStack(function(name) {
-      return name + ' ? ' + name + '.call(' +
-          helper.callParams + ") " + ": helperMissing.call(" +
-          helper.helperMissingParams + ")";
-    });
-  },
-
-  // [invokeKnownHelper]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of helper invocation
-  //
-  // This operation is used when the helper is known to exist,
-  // so a `helperMissing` fallback is not required.
-  invokeKnownHelper: function(paramSize, name) {
-    var helper = this.setupHelper(paramSize, name);
-    this.push(helper.name + ".call(" + helper.callParams + ")");
-  },
-
-  // [invokeAmbiguous]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of disambiguation
-  //
-  // This operation is used when an expression like `{{foo}}`
-  // is provided, but we don't know at compile-time whether it
-  // is a helper or a path.
-  //
-  // This operation emits more code than the other options,
-  // and can be avoided by passing the `knownHelpers` and
-  // `knownHelpersOnly` flags at compile-time.
-  invokeAmbiguous: function(name, helperCall) {
-    this.context.aliases.functionType = '"function"';
-
-    this.pushStackLiteral('{}');    // Hash value
-    var helper = this.setupHelper(0, name, helperCall);
-
-    var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
-
-    var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
-    var nextStack = this.nextStack();
-
-    this.source.push('if (' + nextStack + ' = ' + helperName + ') { ' + nextStack + ' = ' + nextStack + '.call(' + helper.callParams + '); }');
-    this.source.push('else { ' + nextStack + ' = ' + nonHelper + '; ' + nextStack + ' = typeof ' + nextStack + ' === functionType ? ' + nextStack + '.apply(depth0) : ' + nextStack + '; }');
-  },
-
-  // [invokePartial]
-  //
-  // On stack, before: context, ...
-  // On stack after: result of partial invocation
-  //
-  // This operation pops off a context, invokes a partial with that context,
-  // and pushes the result of the invocation back.
-  invokePartial: function(name) {
-    var params = [this.nameLookup('partials', name, 'partial'), "'" + name + "'", this.popStack(), "helpers", "partials"];
-
-    if (this.options.data) {
-      params.push("data");
-    }
-
-    this.context.aliases.self = "this";
-    this.push("self.invokePartial(" + params.join(", ") + ")");
-  },
-
-  // [assignToHash]
-  //
-  // On stack, before: value, hash, ...
-  // On stack, after: hash, ...
-  //
-  // Pops a value and hash off the stack, assigns `hash[key] = value`
-  // and pushes the hash back onto the stack.
-  assignToHash: function(key) {
-    var value = this.popStack(),
-        context,
-        type;
-
-    if (this.options.stringParams) {
-      type = this.popStack();
-      context = this.popStack();
-    }
-
-    var hash = this.hash;
-    if (context) {
-      hash.contexts.push("'" + key + "': " + context);
-    }
-    if (type) {
-      hash.types.push("'" + key + "': " + type);
-    }
-    hash.values.push("'" + key + "': (" + value + ")");
-  },
-
-  // HELPERS
-
-  compiler: JavaScriptCompiler,
-
-  compileChildren: function(environment, options) {
-    var children = environment.children, child, compiler;
-
-    for(var i=0, l=children.length; i<l; i++) {
-      child = children[i];
-      compiler = new this.compiler();
-
-      var index = this.matchExistingProgram(child);
-
-      if (index == null) {
-        this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
-        index = this.context.programs.length;
-        child.index = index;
-        child.name = 'program' + index;
-        this.context.programs[index] = compiler.compile(child, options, this.context);
-        this.context.environments[index] = child;
-      } else {
-        child.index = index;
-        child.name = 'program' + index;
-      }
-    }
-  },
-  matchExistingProgram: function(child) {
-    for (var i = 0, len = this.context.environments.length; i < len; i++) {
-      var environment = this.context.environments[i];
-      if (environment && environment.equals(child)) {
-        return i;
-      }
-    }
-  },
-
-  programExpression: function(guid) {
-    this.context.aliases.self = "this";
-
-    if(guid == null) {
-      return "self.noop";
-    }
-
-    var child = this.environment.children[guid],
-        depths = child.depths.list, depth;
-
-    var programParams = [child.index, child.name, "data"];
-
-    for(var i=0, l = depths.length; i<l; i++) {
-      depth = depths[i];
-
-      if(depth === 1) { programParams.push("depth0"); }
-      else { programParams.push("depth" + (depth - 1)); }
-    }
-
-    return (depths.length === 0 ? "self.program(" : "self.programWithDepth(") + programParams.join(", ") + ")";
-  },
-
-  register: function(name, val) {
-    this.useRegister(name);
-    this.source.push(name + " = " + val + ";");
-  },
-
-  useRegister: function(name) {
-    if(!this.registers[name]) {
-      this.registers[name] = true;
-      this.registers.list.push(name);
-    }
-  },
-
-  pushStackLiteral: function(item) {
-    return this.push(new Literal(item));
-  },
-
-  pushStack: function(item) {
-    this.flushInline();
-
-    var stack = this.incrStack();
-    if (item) {
-      this.source.push(stack + " = " + item + ";");
-    }
-    this.compileStack.push(stack);
-    return stack;
-  },
-
-  replaceStack: function(callback) {
-    var prefix = '',
-        inline = this.isInline(),
-        stack;
-
-    // If we are currently inline then we want to merge the inline statement into the
-    // replacement statement via ','
-    if (inline) {
-      var top = this.popStack(true);
-
-      if (top instanceof Literal) {
-        // Literals do not need to be inlined
-        stack = top.value;
-      } else {
-        // Get or create the current stack name for use by the inline
-        var name = this.stackSlot ? this.topStackName() : this.incrStack();
-
-        prefix = '(' + this.push(name) + ' = ' + top + '),';
-        stack = this.topStack();
-      }
-    } else {
-      stack = this.topStack();
-    }
-
-    var item = callback.call(this, stack);
-
-    if (inline) {
-      if (this.inlineStack.length || this.compileStack.length) {
-        this.popStack();
-      }
-      this.push('(' + prefix + item + ')');
-    } else {
-      // Prevent modification of the context depth variable. Through replaceStack
-      if (!/^stack/.test(stack)) {
-        stack = this.nextStack();
-      }
-
-      this.source.push(stack + " = (" + prefix + item + ");");
-    }
-    return stack;
-  },
-
-  nextStack: function() {
-    return this.pushStack();
-  },
-
-  incrStack: function() {
-    this.stackSlot++;
-    if(this.stackSlot > this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); }
-    return this.topStackName();
-  },
-  topStackName: function() {
-    return "stack" + this.stackSlot;
-  },
-  flushInline: function() {
-    var inlineStack = this.inlineStack;
-    if (inlineStack.length) {
-      this.inlineStack = [];
-      for (var i = 0, len = inlineStack.length; i < len; i++) {
-        var entry = inlineStack[i];
-        if (entry instanceof Literal) {
-          this.compileStack.push(entry);
-        } else {
-          this.pushStack(entry);
-        }
-      }
-    }
-  },
-  isInline: function() {
-    return this.inlineStack.length;
-  },
-
-  popStack: function(wrapped) {
-    var inline = this.isInline(),
-        item = (inline ? this.inlineStack : this.compileStack).pop();
-
-    if (!wrapped && (item instanceof Literal)) {
-      return item.value;
-    } else {
-      if (!inline) {
-        this.stackSlot--;
-      }
-      return item;
-    }
-  },
-
-  topStack: function(wrapped) {
-    var stack = (this.isInline() ? this.inlineStack : this.compileStack),
-        item = stack[stack.length - 1];
-
-    if (!wrapped && (item instanceof Literal)) {
-      return item.value;
-    } else {
-      return item;
-    }
-  },
-
-  quotedString: function(str) {
-    return '"' + str
-      .replace(/\\/g, '\\\\')
-      .replace(/"/g, '\\"')
-      .replace(/\n/g, '\\n')
-      .replace(/\r/g, '\\r')
-      .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
-      .replace(/\u2029/g, '\\u2029') + '"';
-  },
-
-  setupHelper: function(paramSize, name, missingParams) {
-    var params = [];
-    this.setupParams(paramSize, params, missingParams);
-    var foundHelper = this.nameLookup('helpers', name, 'helper');
-
-    return {
-      params: params,
-      name: foundHelper,
-      callParams: ["depth0"].concat(params).join(", "),
-      helperMissingParams: missingParams && ["depth0", this.quotedString(name)].concat(params).join(", ")
-    };
-  },
-
-  // the params and contexts arguments are passed in arrays
-  // to fill in
-  setupParams: function(paramSize, params, useRegister) {
-    var options = [], contexts = [], types = [], param, inverse, program;
-
-    options.push("hash:" + this.popStack());
-
-    inverse = this.popStack();
-    program = this.popStack();
-
-    // Avoid setting fn and inverse if neither are set. This allows
-    // helpers to do a check for `if (options.fn)`
-    if (program || inverse) {
-      if (!program) {
-        this.context.aliases.self = "this";
-        program = "self.noop";
-      }
-
-      if (!inverse) {
-       this.context.aliases.self = "this";
-        inverse = "self.noop";
-      }
-
-      options.push("inverse:" + inverse);
-      options.push("fn:" + program);
-    }
-
-    for(var i=0; i<paramSize; i++) {
-      param = this.popStack();
-      params.push(param);
-
-      if(this.options.stringParams) {
-        types.push(this.popStack());
-        contexts.push(this.popStack());
-      }
-    }
-
-    if (this.options.stringParams) {
-      options.push("contexts:[" + contexts.join(",") + "]");
-      options.push("types:[" + types.join(",") + "]");
-      options.push("hashContexts:hashContexts");
-      options.push("hashTypes:hashTypes");
-    }
-
-    if(this.options.data) {
-      options.push("data:data");
-    }
-
-    options = "{" + options.join(",") + "}";
-    if (useRegister) {
-      this.register('options', options);
-      params.push('options');
-    } else {
-      params.push(options);
-    }
-    return params.join(", ");
-  }
-};
-
-var reservedWords = (
-  "break else new var" +
-  " case finally return void" +
-  " catch for switch while" +
-  " continue function this with" +
-  " default if throw" +
-  " delete in try" +
-  " do instanceof typeof" +
-  " abstract enum int short" +
-  " boolean export interface static" +
-  " byte extends long super" +
-  " char final native synchronized" +
-  " class float package throws" +
-  " const goto private transient" +
-  " debugger implements protected volatile" +
-  " double import public let yield"
-).split(" ");
-
-var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
-
-for(var i=0, l=reservedWords.length; i<l; i++) {
-  compilerWords[reservedWords[i]] = true;
-}
-
-JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
-  if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]+$/.test(name)) {
-    return true;
-  }
-  return false;
-};
-
-Handlebars.precompile = function(input, options) {
-  if (input == null || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
-    throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input);
-  }
-
-  options = options || {};
-  if (!('data' in options)) {
-    options.data = true;
-  }
-  var ast = Handlebars.parse(input);
-  var environment = new Compiler().compile(ast, options);
-  return new JavaScriptCompiler().compile(environment, options);
-};
-
-Handlebars.compile = function(input, options) {
-  if (input == null || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
-    throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
-  }
-
-  options = options || {};
-  if (!('data' in options)) {
-    options.data = true;
-  }
-  var compiled;
-  function compile() {
-    var ast = Handlebars.parse(input);
-    var environment = new Compiler().compile(ast, options);
-    var templateSpec = new JavaScriptCompiler().compile(environment, options, undefined, true);
-    return Handlebars.template(templateSpec);
-  }
-
-  // Template is only compiled on first use and cached after that point.
-  return function(context, options) {
-    if (!compiled) {
-      compiled = compile();
-    }
-    return compiled.call(this, context, options);
-  };
-};
-
-;
-// lib/handlebars/runtime.js
-
-Handlebars.VM = {
-  template: function(templateSpec) {
-    // Just add water
-    var container = {
-      escapeExpression: Handlebars.Utils.escapeExpression,
-      invokePartial: Handlebars.VM.invokePartial,
-      programs: [],
-      program: function(i, fn, data) {
-        var programWrapper = this.programs[i];
-        if(data) {
-          programWrapper = Handlebars.VM.program(i, fn, data);
-        } else if (!programWrapper) {
-          programWrapper = this.programs[i] = Handlebars.VM.program(i, fn);
-        }
-        return programWrapper;
-      },
-      merge: function(param, common) {
-        var ret = param || common;
-
-        if (param && common) {
-          ret = {};
-          Handlebars.Utils.extend(ret, common);
-          Handlebars.Utils.extend(ret, param);
-        }
-        return ret;
-      },
-      programWithDepth: Handlebars.VM.programWithDepth,
-      noop: Handlebars.VM.noop,
-      compilerInfo: null
-    };
-
-    return function(context, options) {
-      options = options || {};
-      var result = templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
-
-      var compilerInfo = container.compilerInfo || [],
-          compilerRevision = compilerInfo[0] || 1,
-          currentRevision = Handlebars.COMPILER_REVISION;
-
-      if (compilerRevision !== currentRevision) {
-        if (compilerRevision < currentRevision) {
-          var runtimeVersions = Handlebars.REVISION_CHANGES[currentRevision],
-              compilerVersions = Handlebars.REVISION_CHANGES[compilerRevision];
-          throw "Template was precompiled with an older version of Handlebars than the current runtime. "+
-                "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").";
-        } else {
-          // Use the embedded version info since the runtime doesn't know about this revision yet
-          throw "Template was precompiled with a newer version of Handlebars than the current runtime. "+
-                "Please update your runtime to a newer version ("+compilerInfo[1]+").";
-        }
-      }
-
-      return result;
-    };
-  },
-
-  programWithDepth: function(i, fn, data /*, $depth */) {
-    var args = Array.prototype.slice.call(arguments, 3);
-
-    var program = function(context, options) {
-      options = options || {};
-
-      return fn.apply(this, [context, options.data || data].concat(args));
-    };
-    program.program = i;
-    program.depth = args.length;
-    return program;
-  },
-  program: function(i, fn, data) {
-    var program = function(context, options) {
-      options = options || {};
-
-      return fn(context, options.data || data);
-    };
-    program.program = i;
-    program.depth = 0;
-    return program;
-  },
-  noop: function() { return ""; },
-  invokePartial: function(partial, name, context, helpers, partials, data) {
-    var options = { helpers: helpers, partials: partials, data: data };
-
-    if(partial === undefined) {
-      throw new Handlebars.Exception("The partial " + name + " could not be found");
-    } else if(partial instanceof Function) {
-      return partial(context, options);
-    } else if (!Handlebars.compile) {
-      throw new Handlebars.Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
-    } else {
-      partials[name] = Handlebars.compile(partial, {data: data !== undefined});
-      return partials[name](context, options);
-    }
-  }
-};
-
-Handlebars.template = Handlebars.VM.template;
-;
-// lib/handlebars/browser-suffix.js
-})(Handlebars);
-;
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-2.0.0.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-2.0.0.js
deleted file mode 100644
index 53cf921d4f5..00000000000
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-2.0.0.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*!
-
- handlebars v2.0.0
-
-Copyright (C) 2011-2014 by Yehuda Katz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-@license
-*/
-!function(a,b){"function"==typeof define&&define.amd?define([],b):"object"==typeof exports?module.exports=b():a.Handlebars=a.Handlebars||b()}(this,function(){var a=function(){"use strict";function a(a){this.string=a}var b;return a.prototype.toString=function(){return""+this.string},b=a}(),b=function(a){"use strict";function b(a){return i[a]}function c(a){for(var b=1;b<arguments.length;b++)for(var c in arguments[b])Object.prototype.hasOwnProperty.call(arguments[b],c)&&(a[c]=arguments[b][c]);return a}function d(a){return a instanceof h?a.toString():null==a?"":a?(a=""+a,k.test(a)?a.replace(j,b):a):a+""}function e(a){return a||0===a?n(a)&&0===a.length?!0:!1:!0}function f(a,b){return(a?a+".":"")+b}var g={},h=a,i={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},j=/[&<>"'`]/g,k=/[&<>"'`]/;g.extend=c;var l=Object.prototype.toString;g.toString=l;var m=function(a){return"function"==typeof a};m(/x/)&&(m=function(a){return"function"==typeof a&&"[object Function]"===l.call(a)});var m;g.isFunction=m;var n=Array.isArray||function(a){return a&&"object"==typeof a?"[object Array]"===l.call(a):!1};return g.isArray=n,g.escapeExpression=d,g.isEmpty=e,g.appendContextPath=f,g}(a),c=function(){"use strict";function a(a,b){var d;b&&b.firstLine&&(d=b.firstLine,a+=" - "+d+":"+b.firstColumn);for(var e=Error.prototype.constructor.call(this,a),f=0;f<c.length;f++)this[c[f]]=e[c[f]];d&&(this.lineNumber=d,this.column=b.firstColumn)}var b,c=["description","fileName","lineNumber","message","name","number","stack"];return a.prototype=new Error,b=a}(),d=function(a,b){"use strict";function c(a,b){this.helpers=a||{},this.partials=b||{},d(this)}function d(a){a.registerHelper("helperMissing",function(){if(1===arguments.length)return void 0;throw new g("Missing helper: '"+arguments[arguments.length-1].name+"'")}),a.registerHelper("blockHelperMissing",function(b,c){var d=c.inverse,e=c.fn;if(b===!0)return e(this);if(b===!1||null==b)return d(this);if(k(b))return b.length>0?(c.ids&&(c.ids=[c.name]),a.helpers.each(b,c)):d(this);if(c.data&&c.ids){var g=q(c.data);g.contextPath=f.appendContextPath(c.data.contextPath,c.name),c={data:g}}return e(b,c)}),a.registerHelper("each",function(a,b){if(!b)throw new g("Must pass iterator to #each");var c,d,e=b.fn,h=b.inverse,i=0,j="";if(b.data&&b.ids&&(d=f.appendContextPath(b.data.contextPath,b.ids[0])+"."),l(a)&&(a=a.call(this)),b.data&&(c=q(b.data)),a&&"object"==typeof a)if(k(a))for(var m=a.length;m>i;i++)c&&(c.index=i,c.first=0===i,c.last=i===a.length-1,d&&(c.contextPath=d+i)),j+=e(a[i],{data:c});else for(var n in a)a.hasOwnProperty(n)&&(c&&(c.key=n,c.index=i,c.first=0===i,d&&(c.contextPath=d+n)),j+=e(a[n],{data:c}),i++);return 0===i&&(j=h(this)),j}),a.registerHelper("if",function(a,b){return l(a)&&(a=a.call(this)),!b.hash.includeZero&&!a||f.isEmpty(a)?b.inverse(this):b.fn(this)}),a.registerHelper("unless",function(b,c){return a.helpers["if"].call(this,b,{fn:c.inverse,inverse:c.fn,hash:c.hash})}),a.registerHelper("with",function(a,b){l(a)&&(a=a.call(this));var c=b.fn;if(f.isEmpty(a))return b.inverse(this);if(b.data&&b.ids){var d=q(b.data);d.contextPath=f.appendContextPath(b.data.contextPath,b.ids[0]),b={data:d}}return c(a,b)}),a.registerHelper("log",function(b,c){var d=c.data&&null!=c.data.level?parseInt(c.data.level,10):1;a.log(d,b)}),a.registerHelper("lookup",function(a,b){return a&&a[b]})}var e={},f=a,g=b,h="2.0.0";e.VERSION=h;var i=6;e.COMPILER_REVISION=i;var j={1:"<= 1.0.rc.2",2:"== 1.0.0-rc.3",3:"== 1.0.0-rc.4",4:"== 1.x.x",5:"== 2.0.0-alpha.x",6:">= 2.0.0-beta.1"};e.REVISION_CHANGES=j;var k=f.isArray,l=f.isFunction,m=f.toString,n="[object Object]";e.HandlebarsEnvironment=c,c.prototype={constructor:c,logger:o,log:p,registerHelper:function(a,b){if(m.call(a)===n){if(b)throw new g("Arg not supported with multiple helpers");f.extend(this.helpers,a)}else this.helpers[a]=b},unregisterHelper:function(a){delete this.helpers[a]},registerPartial:function(a,b){m.call(a)===n?f.extend(this.partials,a):this.partials[a]=b},unregisterPartial:function(a){delete this.partials[a]}};var o={methodMap:{0:"debug",1:"info",2:"warn",3:"error"},DEBUG:0,INFO:1,WARN:2,ERROR:3,level:3,log:function(a,b){if(o.level<=a){var c=o.methodMap[a];"undefined"!=typeof console&&console[c]&&console[c].call(console,b)}}};e.logger=o;var p=o.log;e.log=p;var q=function(a){var b=f.extend({},a);return b._parent=a,b};return e.createFrame=q,e}(b,c),e=function(a,b,c){"use strict";function d(a){var b=a&&a[0]||1,c=m;if(b!==c){if(c>b){var d=n[c],e=n[b];throw new l("Template was precompiled with an older version of Handlebars than the current runtime. Please update your precompiler to a newer version ("+d+") or downgrade your runtime to an older version ("+e+").")}throw new l("Template was precompiled with a newer version of Handlebars than the current runtime. Please update your runtime to a newer version ("+a[1]+").")}}function e(a,b){if(!b)throw new l("No environment passed to template");if(!a||!a.main)throw new l("Unknown template object: "+typeof a);b.VM.checkRevision(a.compiler);var c=function(c,d,e,f,g,h,i,j,m){g&&(f=k.extend({},f,g));var n=b.VM.invokePartial.call(this,c,e,f,h,i,j,m);if(null==n&&b.compile){var o={helpers:h,partials:i,data:j,depths:m};i[e]=b.compile(c,{data:void 0!==j,compat:a.compat},b),n=i[e](f,o)}if(null!=n){if(d){for(var p=n.split("\n"),q=0,r=p.length;r>q&&(p[q]||q+1!==r);q++)p[q]=d+p[q];n=p.join("\n")}return n}throw new l("The partial "+e+" could not be compiled when running in runtime-only mode")},d={lookup:function(a,b){for(var c=a.length,d=0;c>d;d++)if(a[d]&&null!=a[d][b])return a[d][b]},lambda:function(a,b){return"function"==typeof a?a.call(b):a},escapeExpression:k.escapeExpression,invokePartial:c,fn:function(b){return a[b]},programs:[],program:function(a,b,c){var d=this.programs[a],e=this.fn(a);return b||c?d=f(this,a,e,b,c):d||(d=this.programs[a]=f(this,a,e)),d},data:function(a,b){for(;a&&b--;)a=a._parent;return a},merge:function(a,b){var c=a||b;return a&&b&&a!==b&&(c=k.extend({},b,a)),c},noop:b.VM.noop,compilerInfo:a.compiler},e=function(b,c){c=c||{};var f=c.data;e._setup(c),!c.partial&&a.useData&&(f=i(b,f));var g;return a.useDepths&&(g=c.depths?[b].concat(c.depths):[b]),a.main.call(d,b,d.helpers,d.partials,f,g)};return e.isTop=!0,e._setup=function(c){c.partial?(d.helpers=c.helpers,d.partials=c.partials):(d.helpers=d.merge(c.helpers,b.helpers),a.usePartial&&(d.partials=d.merge(c.partials,b.partials)))},e._child=function(b,c,e){if(a.useDepths&&!e)throw new l("must pass parent depths");return f(d,b,a[b],c,e)},e}function f(a,b,c,d,e){var f=function(b,f){return f=f||{},c.call(a,b,a.helpers,a.partials,f.data||d,e&&[b].concat(e))};return f.program=b,f.depth=e?e.length:0,f}function g(a,b,c,d,e,f,g){var h={partial:!0,helpers:d,partials:e,data:f,depths:g};if(void 0===a)throw new l("The partial "+b+" could not be found");return a instanceof Function?a(c,h):void 0}function h(){return""}function i(a,b){return b&&"root"in b||(b=b?o(b):{},b.root=a),b}var j={},k=a,l=b,m=c.COMPILER_REVISION,n=c.REVISION_CHANGES,o=c.createFrame;return j.checkRevision=d,j.template=e,j.program=f,j.invokePartial=g,j.noop=h,j}(b,c,d),f=function(a,b,c,d,e){"use strict";var f,g=a,h=b,i=c,j=d,k=e,l=function(){var a=new g.HandlebarsEnvironment;return j.extend(a,g),a.SafeString=h,a.Exception=i,a.Utils=j,a.escapeExpression=j.escapeExpression,a.VM=k,a.template=function(b){return k.template(b,a)},a},m=l();return m.create=l,m["default"]=m,f=m}(d,a,c,b,e),g=function(a){"use strict";function b(a){a=a||{},this.firstLine=a.first_line,this.firstColumn=a.first_column,this.lastColumn=a.last_column,this.lastLine=a.last_line}var c,d=a,e={ProgramNode:function(a,c,d){b.call(this,d),this.type="program",this.statements=a,this.strip=c},MustacheNode:function(a,c,d,f,g){if(b.call(this,g),this.type="mustache",this.strip=f,null!=d&&d.charAt){var h=d.charAt(3)||d.charAt(2);this.escaped="{"!==h&&"&"!==h}else this.escaped=!!d;this.sexpr=a instanceof e.SexprNode?a:new e.SexprNode(a,c),this.id=this.sexpr.id,this.params=this.sexpr.params,this.hash=this.sexpr.hash,this.eligibleHelper=this.sexpr.eligibleHelper,this.isHelper=this.sexpr.isHelper},SexprNode:function(a,c,d){b.call(this,d),this.type="sexpr",this.hash=c;var e=this.id=a[0],f=this.params=a.slice(1);this.isHelper=!(!f.length&&!c),this.eligibleHelper=this.isHelper||e.isSimple},PartialNode:function(a,c,d,e,f){b.call(this,f),this.type="partial",this.partialName=a,this.context=c,this.hash=d,this.strip=e,this.strip.inlineStandalone=!0},BlockNode:function(a,c,d,e,f){b.call(this,f),this.type="block",this.mustache=a,this.program=c,this.inverse=d,this.strip=e,d&&!c&&(this.isInverse=!0)},RawBlockNode:function(a,c,f,g){if(b.call(this,g),a.sexpr.id.original!==f)throw new d(a.sexpr.id.original+" doesn't match "+f,this);c=new e.ContentNode(c,g),this.type="block",this.mustache=a,this.program=new e.ProgramNode([c],{},g)},ContentNode:function(a,c){b.call(this,c),this.type="content",this.original=this.string=a},HashNode:function(a,c){b.call(this,c),this.type="hash",this.pairs=a},IdNode:function(a,c){b.call(this,c),this.type="ID";for(var e="",f=[],g=0,h="",i=0,j=a.length;j>i;i++){var k=a[i].part;if(e+=(a[i].separator||"")+k,".."===k||"."===k||"this"===k){if(f.length>0)throw new d("Invalid path: "+e,this);".."===k?(g++,h+="../"):this.isScoped=!0}else f.push(k)}this.original=e,this.parts=f,this.string=f.join("."),this.depth=g,this.idName=h+this.string,this.isSimple=1===a.length&&!this.isScoped&&0===g,this.stringModeValue=this.string},PartialNameNode:function(a,c){b.call(this,c),this.type="PARTIAL_NAME",this.name=a.original},DataNode:function(a,c){b.call(this,c),this.type="DATA",this.id=a,this.stringModeValue=a.stringModeValue,this.idName="@"+a.stringModeValue},StringNode:function(a,c){b.call(this,c),this.type="STRING",this.original=this.string=this.stringModeValue=a},NumberNode:function(a,c){b.call(this,c),this.type="NUMBER",this.original=this.number=a,this.stringModeValue=Number(a)},BooleanNode:function(a,c){b.call(this,c),this.type="BOOLEAN",this.bool=a,this.stringModeValue="true"===a},CommentNode:function(a,c){b.call(this,c),this.type="comment",this.comment=a,this.strip={inlineStandalone:!0}}};return c=e}(c),h=function(){"use strict";var a,b=function(){function a(){this.yy={}}var b={trace:function(){},yy:{},symbols_:{error:2,root:3,program:4,EOF:5,program_repetition0:6,statement:7,mustache:8,block:9,rawBlock:10,partial:11,CONTENT:12,COMMENT:13,openRawBlock:14,END_RAW_BLOCK:15,OPEN_RAW_BLOCK:16,sexpr:17,CLOSE_RAW_BLOCK:18,openBlock:19,block_option0:20,closeBlock:21,openInverse:22,block_option1:23,OPEN_BLOCK:24,CLOSE:25,OPEN_INVERSE:26,inverseAndProgram:27,INVERSE:28,OPEN_ENDBLOCK:29,path:30,OPEN:31,OPEN_UNESCAPED:32,CLOSE_UNESCAPED:33,OPEN_PARTIAL:34,partialName:35,param:36,partial_option0:37,partial_option1:38,sexpr_repetition0:39,sexpr_option0:40,dataName:41,STRING:42,NUMBER:43,BOOLEAN:44,OPEN_SEXPR:45,CLOSE_SEXPR:46,hash:47,hash_repetition_plus0:48,hashSegment:49,ID:50,EQUALS:51,DATA:52,pathSegments:53,SEP:54,$accept:0,$end:1},terminals_:{2:"error",5:"EOF",12:"CONTENT",13:"COMMENT",15:"END_RAW_BLOCK",16:"OPEN_RAW_BLOCK",18:"CLOSE_RAW_BLOCK",24:"OPEN_BLOCK",25:"CLOSE",26:"OPEN_INVERSE",28:"INVERSE",29:"OPEN_ENDBLOCK",31:"OPEN",32:"OPEN_UNESCAPED",33:"CLOSE_UNESCAPED",34:"OPEN_PARTIAL",42:"STRING",43:"NUMBER",44:"BOOLEAN",45:"OPEN_SEXPR",46:"CLOSE_SEXPR",50:"ID",51:"EQUALS",52:"DATA",54:"SEP"},productions_:[0,[3,2],[4,1],[7,1],[7,1],[7,1],[7,1],[7,1],[7,1],[10,3],[14,3],[9,4],[9,4],[19,3],[22,3],[27,2],[21,3],[8,3],[8,3],[11,5],[11,4],[17,3],[17,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,3],[47,1],[49,3],[35,1],[35,1],[35,1],[41,2],[30,1],[53,3],[53,1],[6,0],[6,2],[20,0],[20,1],[23,0],[23,1],[37,0],[37,1],[38,0],[38,1],[39,0],[39,2],[40,0],[40,1],[48,1],[48,2]],performAction:function(a,b,c,d,e,f){var g=f.length-1;switch(e){case 1:return d.prepareProgram(f[g-1].statements,!0),f[g-1];case 2:this.$=new d.ProgramNode(d.prepareProgram(f[g]),{},this._$);break;case 3:this.$=f[g];break;case 4:this.$=f[g];break;case 5:this.$=f[g];break;case 6:this.$=f[g];break;case 7:this.$=new d.ContentNode(f[g],this._$);break;case 8:this.$=new d.CommentNode(f[g],this._$);break;case 9:this.$=new d.RawBlockNode(f[g-2],f[g-1],f[g],this._$);break;case 10:this.$=new d.MustacheNode(f[g-1],null,"","",this._$);break;case 11:this.$=d.prepareBlock(f[g-3],f[g-2],f[g-1],f[g],!1,this._$);break;case 12:this.$=d.prepareBlock(f[g-3],f[g-2],f[g-1],f[g],!0,this._$);break;case 13:this.$=new d.MustacheNode(f[g-1],null,f[g-2],d.stripFlags(f[g-2],f[g]),this._$);break;case 14:this.$=new d.MustacheNode(f[g-1],null,f[g-2],d.stripFlags(f[g-2],f[g]),this._$);break;case 15:this.$={strip:d.stripFlags(f[g-1],f[g-1]),program:f[g]};break;case 16:this.$={path:f[g-1],strip:d.stripFlags(f[g-2],f[g])};break;case 17:this.$=new d.MustacheNode(f[g-1],null,f[g-2],d.stripFlags(f[g-2],f[g]),this._$);break;case 18:this.$=new d.MustacheNode(f[g-1],null,f[g-2],d.stripFlags(f[g-2],f[g]),this._$);break;case 19:this.$=new d.PartialNode(f[g-3],f[g-2],f[g-1],d.stripFlags(f[g-4],f[g]),this._$);break;case 20:this.$=new d.PartialNode(f[g-2],void 0,f[g-1],d.stripFlags(f[g-3],f[g]),this._$);break;case 21:this.$=new d.SexprNode([f[g-2]].concat(f[g-1]),f[g],this._$);break;case 22:this.$=new d.SexprNode([f[g]],null,this._$);break;case 23:this.$=f[g];break;case 24:this.$=new d.StringNode(f[g],this._$);break;case 25:this.$=new d.NumberNode(f[g],this._$);break;case 26:this.$=new d.BooleanNode(f[g],this._$);break;case 27:this.$=f[g];break;case 28:f[g-1].isHelper=!0,this.$=f[g-1];break;case 29:this.$=new d.HashNode(f[g],this._$);break;case 30:this.$=[f[g-2],f[g]];break;case 31:this.$=new d.PartialNameNode(f[g],this._$);break;case 32:this.$=new d.PartialNameNode(new d.StringNode(f[g],this._$),this._$);break;case 33:this.$=new d.PartialNameNode(new d.NumberNode(f[g],this._$));break;case 34:this.$=new d.DataNode(f[g],this._$);break;case 35:this.$=new d.IdNode(f[g],this._$);break;case 36:f[g-2].push({part:f[g],separator:f[g-1]}),this.$=f[g-2];break;case 37:this.$=[{part:f[g]}];break;case 38:this.$=[];break;case 39:f[g-1].push(f[g]);break;case 48:this.$=[];break;case 49:f[g-1].push(f[g]);break;case 52:this.$=[f[g]];break;case 53:f[g-1].push(f[g])}},table:[{3:1,4:2,5:[2,38],6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],31:[2,38],32:[2,38],34:[2,38]},{1:[3]},{5:[1,4]},{5:[2,2],7:5,8:6,9:7,10:8,11:9,12:[1,10],13:[1,11],14:16,16:[1,20],19:14,22:15,24:[1,18],26:[1,19],28:[2,2],29:[2,2],31:[1,12],32:[1,13],34:[1,17]},{1:[2,1]},{5:[2,39],12:[2,39],13:[2,39],16:[2,39],24:[2,39],26:[2,39],28:[2,39],29:[2,39],31:[2,39],32:[2,39],34:[2,39]},{5:[2,3],12:[2,3],13:[2,3],16:[2,3],24:[2,3],26:[2,3],28:[2,3],29:[2,3],31:[2,3],32:[2,3],34:[2,3]},{5:[2,4],12:[2,4],13:[2,4],16:[2,4],24:[2,4],26:[2,4],28:[2,4],29:[2,4],31:[2,4],32:[2,4],34:[2,4]},{5:[2,5],12:[2,5],13:[2,5],16:[2,5],24:[2,5],26:[2,5],28:[2,5],29:[2,5],31:[2,5],32:[2,5],34:[2,5]},{5:[2,6],12:[2,6],13:[2,6],16:[2,6],24:[2,6],26:[2,6],28:[2,6],29:[2,6],31:[2,6],32:[2,6],34:[2,6]},{5:[2,7],12:[2,7],13:[2,7],16:[2,7],24:[2,7],26:[2,7],28:[2,7],29:[2,7],31:[2,7],32:[2,7],34:[2,7]},{5:[2,8],12:[2,8],13:[2,8],16:[2,8],24:[2,8],26:[2,8],28:[2,8],29:[2,8],31:[2,8],32:[2,8],34:[2,8]},{17:21,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:27,30:22,41:23,50:[1,26],52:[1,25],53:24},{4:28,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{4:29,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{12:[1,30]},{30:32,35:31,42:[1,33],43:[1,34],50:[1,26],53:24},{17:35,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:36,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:37,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[1,38]},{18:[2,48],25:[2,48],33:[2,48],39:39,42:[2,48],43:[2,48],44:[2,48],45:[2,48],46:[2,48],50:[2,48],52:[2,48]},{18:[2,22],25:[2,22],33:[2,22],46:[2,22]},{18:[2,35],25:[2,35],33:[2,35],42:[2,35],43:[2,35],44:[2,35],45:[2,35],46:[2,35],50:[2,35],52:[2,35],54:[1,40]},{30:41,50:[1,26],53:24},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],52:[2,37],54:[2,37]},{33:[1,42]},{20:43,27:44,28:[1,45],29:[2,40]},{23:46,27:47,28:[1,45],29:[2,42]},{15:[1,48]},{25:[2,46],30:51,36:49,38:50,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],47:57,48:58,49:60,50:[1,59],52:[1,25],53:24},{25:[2,31],42:[2,31],43:[2,31],44:[2,31],45:[2,31],50:[2,31],52:[2,31]},{25:[2,32],42:[2,32],43:[2,32],44:[2,32],45:[2,32],50:[2,32],52:[2,32]},{25:[2,33],42:[2,33],43:[2,33],44:[2,33],45:[2,33],50:[2,33],52:[2,33]},{25:[1,61]},{25:[1,62]},{18:[1,63]},{5:[2,17],12:[2,17],13:[2,17],16:[2,17],24:[2,17],26:[2,17],28:[2,17],29:[2,17],31:[2,17],32:[2,17],34:[2,17]},{18:[2,50],25:[2,50],30:51,33:[2,50],36:65,40:64,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],46:[2,50],47:66,48:58,49:60,50:[1,59],52:[1,25],53:24},{50:[1,67]},{18:[2,34],25:[2,34],33:[2,34],42:[2,34],43:[2,34],44:[2,34],45:[2,34],46:[2,34],50:[2,34],52:[2,34]},{5:[2,18],12:[2,18],13:[2,18],16:[2,18],24:[2,18],26:[2,18],28:[2,18],29:[2,18],31:[2,18],32:[2,18],34:[2,18]},{21:68,29:[1,69]},{29:[2,41]},{4:70,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{21:71,29:[1,69]},{29:[2,43]},{5:[2,9],12:[2,9],13:[2,9],16:[2,9],24:[2,9],26:[2,9],28:[2,9],29:[2,9],31:[2,9],32:[2,9],34:[2,9]},{25:[2,44],37:72,47:73,48:58,49:60,50:[1,74]},{25:[1,75]},{18:[2,23],25:[2,23],33:[2,23],42:[2,23],43:[2,23],44:[2,23],45:[2,23],46:[2,23],50:[2,23],52:[2,23]},{18:[2,24],25:[2,24],33:[2,24],42:[2,24],43:[2,24],44:[2,24],45:[2,24],46:[2,24],50:[2,24],52:[2,24]},{18:[2,25],25:[2,25],33:[2,25],42:[2,25],43:[2,25],44:[2,25],45:[2,25],46:[2,25],50:[2,25],52:[2,25]},{18:[2,26],25:[2,26],33:[2,26],42:[2,26],43:[2,26],44:[2,26],45:[2,26],46:[2,26],50:[2,26],52:[2,26]},{18:[2,27],25:[2,27],33:[2,27],42:[2,27],43:[2,27],44:[2,27],45:[2,27],46:[2,27],50:[2,27],52:[2,27]},{17:76,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[2,47]},{18:[2,29],25:[2,29],33:[2,29],46:[2,29],49:77,50:[1,74]},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],51:[1,78],52:[2,37],54:[2,37]},{18:[2,52],25:[2,52],33:[2,52],46:[2,52],50:[2,52]},{12:[2,13],13:[2,13],16:[2,13],24:[2,13],26:[2,13],28:[2,13],29:[2,13],31:[2,13],32:[2,13],34:[2,13]},{12:[2,14],13:[2,14],16:[2,14],24:[2,14],26:[2,14],28:[2,14],29:[2,14],31:[2,14],32:[2,14],34:[2,14]},{12:[2,10]},{18:[2,21],25:[2,21],33:[2,21],46:[2,21]},{18:[2,49],25:[2,49],33:[2,49],42:[2,49],43:[2,49],44:[2,49],45:[2,49],46:[2,49],50:[2,49],52:[2,49]},{18:[2,51],25:[2,51],33:[2,51],46:[2,51]},{18:[2,36],25:[2,36],33:[2,36],42:[2,36],43:[2,36],44:[2,36],45:[2,36],46:[2,36],50:[2,36],52:[2,36],54:[2,36]},{5:[2,11],12:[2,11],13:[2,11],16:[2,11],24:[2,11],26:[2,11],28:[2,11],29:[2,11],31:[2,11],32:[2,11],34:[2,11]},{30:79,50:[1,26],53:24},{29:[2,15]},{5:[2,12],12:[2,12],13:[2,12],16:[2,12],24:[2,12],26:[2,12],28:[2,12],29:[2,12],31:[2,12],32:[2,12],34:[2,12]},{25:[1,80]},{25:[2,45]},{51:[1,78]},{5:[2,20],12:[2,20],13:[2,20],16:[2,20],24:[2,20],26:[2,20],28:[2,20],29:[2,20],31:[2,20],32:[2,20],34:[2,20]},{46:[1,81]},{18:[2,53],25:[2,53],33:[2,53],46:[2,53],50:[2,53]},{30:51,36:82,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],50:[1,26],52:[1,25],53:24},{25:[1,83]},{5:[2,19],12:[2,19],13:[2,19],16:[2,19],24:[2,19],26:[2,19],28:[2,19],29:[2,19],31:[2,19],32:[2,19],34:[2,19]},{18:[2,28],25:[2,28],33:[2,28],42:[2,28],43:[2,28],44:[2,28],45:[2,28],46:[2,28],50:[2,28],52:[2,28]},{18:[2,30],25:[2,30],33:[2,30],46:[2,30],50:[2,30]},{5:[2,16],12:[2,16],13:[2,16],16:[2,16],24:[2,16],26:[2,16],28:[2,16],29:[2,16],31:[2,16],32:[2,16],34:[2,16]}],defaultActions:{4:[2,1],44:[2,41],47:[2,43],57:[2,47],63:[2,10],70:[2,15],73:[2,45]},parseError:function(a){throw new Error(a)},parse:function(a){function b(){var a;return a=c.lexer.lex()||1,"number"!=typeof a&&(a=c.symbols_[a]||a),a}var c=this,d=[0],e=[null],f=[],g=this.table,h="",i=0,j=0,k=0;this.lexer.setInput(a),this.lexer.yy=this.yy,this.yy.lexer=this.lexer,this.yy.parser=this,"undefined"==typeof this.lexer.yylloc&&(this.lexer.yylloc={});var l=this.lexer.yylloc;f.push(l);var m=this.lexer.options&&this.lexer.options.ranges;"function"==typeof this.yy.parseError&&(this.parseError=this.yy.parseError);for(var n,o,p,q,r,s,t,u,v,w={};;){if(p=d[d.length-1],this.defaultActions[p]?q=this.defaultActions[p]:((null===n||"undefined"==typeof n)&&(n=b()),q=g[p]&&g[p][n]),"undefined"==typeof q||!q.length||!q[0]){var x="";if(!k){v=[];for(s in g[p])this.terminals_[s]&&s>2&&v.push("'"+this.terminals_[s]+"'");x=this.lexer.showPosition?"Parse error on line "+(i+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+v.join(", ")+", got '"+(this.terminals_[n]||n)+"'":"Parse error on line "+(i+1)+": Unexpected "+(1==n?"end of input":"'"+(this.terminals_[n]||n)+"'"),this.parseError(x,{text:this.lexer.match,token:this.terminals_[n]||n,line:this.lexer.yylineno,loc:l,expected:v})}}if(q[0]instanceof Array&&q.length>1)throw new Error("Parse Error: multiple actions possible at state: "+p+", token: "+n);switch(q[0]){case 1:d.push(n),e.push(this.lexer.yytext),f.push(this.lexer.yylloc),d.push(q[1]),n=null,o?(n=o,o=null):(j=this.lexer.yyleng,h=this.lexer.yytext,i=this.lexer.yylineno,l=this.lexer.yylloc,k>0&&k--);break;case 2:if(t=this.productions_[q[1]][1],w.$=e[e.length-t],w._$={first_line:f[f.length-(t||1)].first_line,last_line:f[f.length-1].last_line,first_column:f[f.length-(t||1)].first_column,last_column:f[f.length-1].last_column},m&&(w._$.range=[f[f.length-(t||1)].range[0],f[f.length-1].range[1]]),r=this.performAction.call(w,h,j,i,this.yy,q[1],e,f),"undefined"!=typeof r)return r;t&&(d=d.slice(0,-1*t*2),e=e.slice(0,-1*t),f=f.slice(0,-1*t)),d.push(this.productions_[q[1]][0]),e.push(w.$),f.push(w._$),u=g[d[d.length-2]][d[d.length-1]],d.push(u);break;case 3:return!0}}return!0}},c=function(){var a={EOF:1,parseError:function(a,b){if(!this.yy.parser)throw new Error(a);this.yy.parser.parseError(a,b)},setInput:function(a){return this._input=a,this._more=this._less=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},input:function(){var a=this._input[0];this.yytext+=a,this.yyleng++,this.offset++,this.match+=a,this.matched+=a;var b=a.match(/(?:\r\n?|\n).*/g);return b?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),a},unput:function(a){var b=a.length,c=a.split(/(?:\r\n?|\n)/g);this._input=a+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-b-1),this.offset-=b;var d=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),c.length-1&&(this.yylineno-=c.length-1);var e=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:c?(c.length===d.length?this.yylloc.first_column:0)+d[d.length-c.length].length-c[0].length:this.yylloc.first_column-b},this.options.ranges&&(this.yylloc.range=[e[0],e[0]+this.yyleng-b]),this},more:function(){return this._more=!0,this},less:function(a){this.unput(this.match.slice(a))},pastInput:function(){var a=this.matched.substr(0,this.matched.length-this.match.length);return(a.length>20?"...":"")+a.substr(-20).replace(/\n/g,"")},upcomingInput:function(){var a=this.match;return a.length<20&&(a+=this._input.substr(0,20-a.length)),(a.substr(0,20)+(a.length>20?"...":"")).replace(/\n/g,"")},showPosition:function(){var a=this.pastInput(),b=new Array(a.length+1).join("-");return a+this.upcomingInput()+"\n"+b+"^"},next:function(){if(this.done)return this.EOF;this._input||(this.done=!0);var a,b,c,d,e;this._more||(this.yytext="",this.match="");for(var f=this._currentRules(),g=0;g<f.length&&(c=this._input.match(this.rules[f[g]]),!c||b&&!(c[0].length>b[0].length)||(b=c,d=g,this.options.flex));g++);return b?(e=b[0].match(/(?:\r\n?|\n).*/g),e&&(this.yylineno+=e.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:e?e[e.length-1].length-e[e.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+b[0].length},this.yytext+=b[0],this.match+=b[0],this.matches=b,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._input=this._input.slice(b[0].length),this.matched+=b[0],a=this.performAction.call(this,this.yy,this,f[d],this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),a?a:void 0):""===this._input?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+". Unrecognized text.\n"+this.showPosition(),{text:"",token:null,line:this.yylineno})},lex:function(){var a=this.next();return"undefined"!=typeof a?a:this.lex()},begin:function(a){this.conditionStack.push(a)},popState:function(){return this.conditionStack.pop()},_currentRules:function(){return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules},topState:function(){return this.conditionStack[this.conditionStack.length-2]},pushState:function(a){this.begin(a)}};return a.options={},a.performAction=function(a,b,c,d){function e(a,c){return b.yytext=b.yytext.substr(a,b.yyleng-c)}switch(c){case 0:if("\\\\"===b.yytext.slice(-2)?(e(0,1),this.begin("mu")):"\\"===b.yytext.slice(-1)?(e(0,1),this.begin("emu")):this.begin("mu"),b.yytext)return 12;break;case 1:return 12;case 2:return this.popState(),12;case 3:return b.yytext=b.yytext.substr(5,b.yyleng-9),this.popState(),15;case 4:return 12;case 5:return e(0,4),this.popState(),13;case 6:return 45;case 7:return 46;case 8:return 16;case 9:return this.popState(),this.begin("raw"),18;case 10:return 34;case 11:return 24;case 12:return 29;case 13:return this.popState(),28;case 14:return this.popState(),28;case 15:return 26;case 16:return 26;case 17:return 32;case 18:return 31;case 19:this.popState(),this.begin("com");break;case 20:return e(3,5),this.popState(),13;case 21:return 31;case 22:return 51;case 23:return 50;case 24:return 50;case 25:return 54;case 26:break;case 27:return this.popState(),33;case 28:return this.popState(),25;case 29:return b.yytext=e(1,2).replace(/\\"/g,'"'),42;case 30:return b.yytext=e(1,2).replace(/\\'/g,"'"),42;case 31:return 52;case 32:return 44;case 33:return 44;case 34:return 43;case 35:return 50;case 36:return b.yytext=e(1,2),50;case 37:return"INVALID";case 38:return 5}},a.rules=[/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:\{\{\{\{\/[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.])\}\}\}\})/,/^(?:[^\x00]*?(?=(\{\{\{\{\/)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\()/,/^(?:\))/,/^(?:\{\{\{\{)/,/^(?:\}\}\}\})/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^\s*(~)?\}\})/,/^(?:\{\{(~)?\s*else\s*(~)?\}\})/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.)])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s)])))/,/^(?:false(?=([~}\s)])))/,/^(?:-?[0-9]+(?:\.[0-9]+)?(?=([~}\s)])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.)]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/],a.conditions={mu:{rules:[6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38],inclusive:!1},emu:{rules:[2],inclusive:!1},com:{rules:[5],inclusive:!1},raw:{rules:[3,4],inclusive:!1},INITIAL:{rules:[0,1,38],inclusive:!0}},a}();return b.lexer=c,a.prototype=b,b.Parser=a,new a}();return a=b}(),i=function(a){"use strict";function b(a,b){return{left:"~"===a.charAt(2),right:"~"===b.charAt(b.length-3)}}function c(a,b,c,d,i,k){if(a.sexpr.id.original!==d.path.original)throw new j(a.sexpr.id.original+" doesn't match "+d.path.original,a);var l=c&&c.program,m={left:a.strip.left,right:d.strip.right,openStandalone:f(b.statements),closeStandalone:e((l||b).statements)};if(a.strip.right&&g(b.statements,null,!0),l){var n=c.strip;n.left&&h(b.statements,null,!0),n.right&&g(l.statements,null,!0),d.strip.left&&h(l.statements,null,!0),e(b.statements)&&f(l.statements)&&(h(b.statements),g(l.statements))}else d.strip.left&&h(b.statements,null,!0);return i?new this.BlockNode(a,l,b,m,k):new this.BlockNode(a,b,l,m,k)}function d(a,b){for(var c=0,d=a.length;d>c;c++){var i=a[c],j=i.strip;if(j){var k=e(a,c,b,"partial"===i.type),l=f(a,c,b),m=j.openStandalone&&k,n=j.closeStandalone&&l,o=j.inlineStandalone&&k&&l;j.right&&g(a,c,!0),j.left&&h(a,c,!0),o&&(g(a,c),h(a,c)&&"partial"===i.type&&(i.indent=/([ \t]+$)/.exec(a[c-1].original)?RegExp.$1:"")),m&&(g((i.program||i.inverse).statements),h(a,c)),n&&(g(a,c),h((i.inverse||i.program).statements))}}return a}function e(a,b,c){void 0===b&&(b=a.length);var d=a[b-1],e=a[b-2];return d?"content"===d.type?(e||!c?/\r?\n\s*?$/:/(^|\r?\n)\s*?$/).test(d.original):void 0:c}function f(a,b,c){void 0===b&&(b=-1);var d=a[b+1],e=a[b+2];return d?"content"===d.type?(e||!c?/^\s*?\r?\n/:/^\s*?(\r?\n|$)/).test(d.original):void 0:c}function g(a,b,c){var d=a[null==b?0:b+1];if(d&&"content"===d.type&&(c||!d.rightStripped)){var e=d.string;d.string=d.string.replace(c?/^\s+/:/^[ \t]*\r?\n?/,""),d.rightStripped=d.string!==e}}function h(a,b,c){var d=a[null==b?a.length-1:b-1];if(d&&"content"===d.type&&(c||!d.leftStripped)){var e=d.string;return d.string=d.string.replace(c?/\s+$/:/[ \t]+$/,""),d.leftStripped=d.string!==e,d.leftStripped}}var i={},j=a;return i.stripFlags=b,i.prepareBlock=c,i.prepareProgram=d,i}(c),j=function(a,b,c,d){"use strict";function e(a){return a.constructor===h.ProgramNode?a:(g.yy=k,g.parse(a))}var f={},g=a,h=b,i=c,j=d.extend;f.parser=g;var k={};return j(k,i,h),f.parse=e,f}(h,g,i,b),k=function(a,b){"use strict";function c(){}function d(a,b,c){if(null==a||"string"!=typeof a&&a.constructor!==c.AST.ProgramNode)throw new h("You must pass a string or Handlebars AST to Handlebars.precompile. You passed "+a);b=b||{},"data"in b||(b.data=!0),b.compat&&(b.useDepths=!0);var d=c.parse(a),e=(new c.Compiler).compile(d,b);return(new c.JavaScriptCompiler).compile(e,b)}function e(a,b,c){function d(){var d=c.parse(a),e=(new c.Compiler).compile(d,b),f=(new c.JavaScriptCompiler).compile(e,b,void 0,!0);return c.template(f)}if(null==a||"string"!=typeof a&&a.constructor!==c.AST.ProgramNode)throw new h("You must pass a string or Handlebars AST to Handlebars.compile. You passed "+a);b=b||{},"data"in b||(b.data=!0),b.compat&&(b.useDepths=!0);var e,f=function(a,b){return e||(e=d()),e.call(this,a,b)};return f._setup=function(a){return e||(e=d()),e._setup(a)},f._child=function(a,b,c){return e||(e=d()),e._child(a,b,c)},f}function f(a,b){if(a===b)return!0;if(i(a)&&i(b)&&a.length===b.length){for(var c=0;c<a.length;c++)if(!f(a[c],b[c]))return!1;return!0}}var g={},h=a,i=b.isArray,j=[].slice;return g.Compiler=c,c.prototype={compiler:c,equals:function(a){var b=this.opcodes.length;if(a.opcodes.length!==b)return!1;for(var c=0;b>c;c++){var d=this.opcodes[c],e=a.opcodes[c];if(d.opcode!==e.opcode||!f(d.args,e.args))return!1}for(b=this.children.length,c=0;b>c;c++)if(!this.children[c].equals(a.children[c]))return!1;return!0},guid:0,compile:function(a,b){this.opcodes=[],this.children=[],this.depths={list:[]},this.options=b,this.stringParams=b.stringParams,this.trackIds=b.trackIds;var c=this.options.knownHelpers;if(this.options.knownHelpers={helperMissing:!0,blockHelperMissing:!0,each:!0,"if":!0,unless:!0,"with":!0,log:!0,lookup:!0},c)for(var d in c)this.options.knownHelpers[d]=c[d];return this.accept(a)},accept:function(a){return this[a.type](a)},program:function(a){for(var b=a.statements,c=0,d=b.length;d>c;c++)this.accept(b[c]);return this.isSimple=1===d,this.depths.list=this.depths.list.sort(function(a,b){return a-b}),this},compileProgram:function(a){var b,c=(new this.compiler).compile(a,this.options),d=this.guid++;
-this.usePartial=this.usePartial||c.usePartial,this.children[d]=c;for(var e=0,f=c.depths.list.length;f>e;e++)b=c.depths.list[e],2>b||this.addDepth(b-1);return d},block:function(a){var b=a.mustache,c=a.program,d=a.inverse;c&&(c=this.compileProgram(c)),d&&(d=this.compileProgram(d));var e=b.sexpr,f=this.classifySexpr(e);"helper"===f?this.helperSexpr(e,c,d):"simple"===f?(this.simpleSexpr(e),this.opcode("pushProgram",c),this.opcode("pushProgram",d),this.opcode("emptyHash"),this.opcode("blockValue",e.id.original)):(this.ambiguousSexpr(e,c,d),this.opcode("pushProgram",c),this.opcode("pushProgram",d),this.opcode("emptyHash"),this.opcode("ambiguousBlockValue")),this.opcode("append")},hash:function(a){var b,c,d=a.pairs;for(this.opcode("pushHash"),b=0,c=d.length;c>b;b++)this.pushParam(d[b][1]);for(;b--;)this.opcode("assignToHash",d[b][0]);this.opcode("popHash")},partial:function(a){var b=a.partialName;this.usePartial=!0,a.hash?this.accept(a.hash):this.opcode("push","undefined"),a.context?this.accept(a.context):(this.opcode("getContext",0),this.opcode("pushContext")),this.opcode("invokePartial",b.name,a.indent||""),this.opcode("append")},content:function(a){a.string&&this.opcode("appendContent",a.string)},mustache:function(a){this.sexpr(a.sexpr),a.escaped&&!this.options.noEscape?this.opcode("appendEscaped"):this.opcode("append")},ambiguousSexpr:function(a,b,c){var d=a.id,e=d.parts[0],f=null!=b||null!=c;this.opcode("getContext",d.depth),this.opcode("pushProgram",b),this.opcode("pushProgram",c),this.ID(d),this.opcode("invokeAmbiguous",e,f)},simpleSexpr:function(a){var b=a.id;"DATA"===b.type?this.DATA(b):b.parts.length?this.ID(b):(this.addDepth(b.depth),this.opcode("getContext",b.depth),this.opcode("pushContext")),this.opcode("resolvePossibleLambda")},helperSexpr:function(a,b,c){var d=this.setupFullMustacheParams(a,b,c),e=a.id,f=e.parts[0];if(this.options.knownHelpers[f])this.opcode("invokeKnownHelper",d.length,f);else{if(this.options.knownHelpersOnly)throw new h("You specified knownHelpersOnly, but used the unknown helper "+f,a);e.falsy=!0,this.ID(e),this.opcode("invokeHelper",d.length,e.original,e.isSimple)}},sexpr:function(a){var b=this.classifySexpr(a);"simple"===b?this.simpleSexpr(a):"helper"===b?this.helperSexpr(a):this.ambiguousSexpr(a)},ID:function(a){this.addDepth(a.depth),this.opcode("getContext",a.depth);var b=a.parts[0];b?this.opcode("lookupOnContext",a.parts,a.falsy,a.isScoped):this.opcode("pushContext")},DATA:function(a){this.options.data=!0,this.opcode("lookupData",a.id.depth,a.id.parts)},STRING:function(a){this.opcode("pushString",a.string)},NUMBER:function(a){this.opcode("pushLiteral",a.number)},BOOLEAN:function(a){this.opcode("pushLiteral",a.bool)},comment:function(){},opcode:function(a){this.opcodes.push({opcode:a,args:j.call(arguments,1)})},addDepth:function(a){0!==a&&(this.depths[a]||(this.depths[a]=!0,this.depths.list.push(a)))},classifySexpr:function(a){var b=a.isHelper,c=a.eligibleHelper,d=this.options;if(c&&!b){var e=a.id.parts[0];d.knownHelpers[e]?b=!0:d.knownHelpersOnly&&(c=!1)}return b?"helper":c?"ambiguous":"simple"},pushParams:function(a){for(var b=0,c=a.length;c>b;b++)this.pushParam(a[b])},pushParam:function(a){this.stringParams?(a.depth&&this.addDepth(a.depth),this.opcode("getContext",a.depth||0),this.opcode("pushStringParam",a.stringModeValue,a.type),"sexpr"===a.type&&this.sexpr(a)):(this.trackIds&&this.opcode("pushId",a.type,a.idName||a.stringModeValue),this.accept(a))},setupFullMustacheParams:function(a,b,c){var d=a.params;return this.pushParams(d),this.opcode("pushProgram",b),this.opcode("pushProgram",c),a.hash?this.hash(a.hash):this.opcode("emptyHash"),d}},g.precompile=d,g.compile=e,g}(c,b),l=function(a,b){"use strict";function c(a){this.value=a}function d(){}var e,f=a.COMPILER_REVISION,g=a.REVISION_CHANGES,h=b;d.prototype={nameLookup:function(a,b){return d.isValidJavaScriptVariableName(b)?a+"."+b:a+"['"+b+"']"},depthedLookup:function(a){return this.aliases.lookup="this.lookup",'lookup(depths, "'+a+'")'},compilerInfo:function(){var a=f,b=g[a];return[a,b]},appendToBuffer:function(a){return this.environment.isSimple?"return "+a+";":{appendToBuffer:!0,content:a,toString:function(){return"buffer += "+a+";"}}},initializeBuffer:function(){return this.quotedString("")},namespace:"Handlebars",compile:function(a,b,c,d){this.environment=a,this.options=b,this.stringParams=this.options.stringParams,this.trackIds=this.options.trackIds,this.precompile=!d,this.name=this.environment.name,this.isChild=!!c,this.context=c||{programs:[],environments:[]},this.preamble(),this.stackSlot=0,this.stackVars=[],this.aliases={},this.registers={list:[]},this.hashes=[],this.compileStack=[],this.inlineStack=[],this.compileChildren(a,b),this.useDepths=this.useDepths||a.depths.list.length||this.options.compat;var e,f,g,i=a.opcodes;for(f=0,g=i.length;g>f;f++)e=i[f],this[e.opcode].apply(this,e.args);if(this.pushSource(""),this.stackSlot||this.inlineStack.length||this.compileStack.length)throw new h("Compile completed with content left on stack");var j=this.createFunctionContext(d);if(this.isChild)return j;var k={compiler:this.compilerInfo(),main:j},l=this.context.programs;for(f=0,g=l.length;g>f;f++)l[f]&&(k[f]=l[f]);return this.environment.usePartial&&(k.usePartial=!0),this.options.data&&(k.useData=!0),this.useDepths&&(k.useDepths=!0),this.options.compat&&(k.compat=!0),d||(k.compiler=JSON.stringify(k.compiler),k=this.objectLiteral(k)),k},preamble:function(){this.lastContext=0,this.source=[]},createFunctionContext:function(a){var b="",c=this.stackVars.concat(this.registers.list);c.length>0&&(b+=", "+c.join(", "));for(var d in this.aliases)this.aliases.hasOwnProperty(d)&&(b+=", "+d+"="+this.aliases[d]);var e=["depth0","helpers","partials","data"];this.useDepths&&e.push("depths");var f=this.mergeSource(b);return a?(e.push(f),Function.apply(this,e)):"function("+e.join(",")+") {\n  "+f+"}"},mergeSource:function(a){for(var b,c,d="",e=!this.forceBuffer,f=0,g=this.source.length;g>f;f++){var h=this.source[f];h.appendToBuffer?b=b?b+"\n    + "+h.content:h.content:(b&&(d?d+="buffer += "+b+";\n  ":(c=!0,d=b+";\n  "),b=void 0),d+=h+"\n  ",this.environment.isSimple||(e=!1))}return e?(b||!d)&&(d+="return "+(b||'""')+";\n"):(a+=", buffer = "+(c?"":this.initializeBuffer()),d+=b?"return buffer + "+b+";\n":"return buffer;\n"),a&&(d="var "+a.substring(2)+(c?"":";\n  ")+d),d},blockValue:function(a){this.aliases.blockHelperMissing="helpers.blockHelperMissing";var b=[this.contextName(0)];this.setupParams(a,0,b);var c=this.popStack();b.splice(1,0,c),this.push("blockHelperMissing.call("+b.join(", ")+")")},ambiguousBlockValue:function(){this.aliases.blockHelperMissing="helpers.blockHelperMissing";var a=[this.contextName(0)];this.setupParams("",0,a,!0),this.flushInline();var b=this.topStack();a.splice(1,0,b),this.pushSource("if (!"+this.lastHelper+") { "+b+" = blockHelperMissing.call("+a.join(", ")+"); }")},appendContent:function(a){this.pendingContent&&(a=this.pendingContent+a),this.pendingContent=a},append:function(){this.flushInline();var a=this.popStack();this.pushSource("if ("+a+" != null) { "+this.appendToBuffer(a)+" }"),this.environment.isSimple&&this.pushSource("else { "+this.appendToBuffer("''")+" }")},appendEscaped:function(){this.aliases.escapeExpression="this.escapeExpression",this.pushSource(this.appendToBuffer("escapeExpression("+this.popStack()+")"))},getContext:function(a){this.lastContext=a},pushContext:function(){this.pushStackLiteral(this.contextName(this.lastContext))},lookupOnContext:function(a,b,c){var d=0,e=a.length;for(c||!this.options.compat||this.lastContext?this.pushContext():this.push(this.depthedLookup(a[d++]));e>d;d++)this.replaceStack(function(c){var e=this.nameLookup(c,a[d],"context");return b?" && "+e:" != null ? "+e+" : "+c})},lookupData:function(a,b){a?this.pushStackLiteral("this.data(data, "+a+")"):this.pushStackLiteral("data");for(var c=b.length,d=0;c>d;d++)this.replaceStack(function(a){return" && "+this.nameLookup(a,b[d],"data")})},resolvePossibleLambda:function(){this.aliases.lambda="this.lambda",this.push("lambda("+this.popStack()+", "+this.contextName(0)+")")},pushStringParam:function(a,b){this.pushContext(),this.pushString(b),"sexpr"!==b&&("string"==typeof a?this.pushString(a):this.pushStackLiteral(a))},emptyHash:function(){this.pushStackLiteral("{}"),this.trackIds&&this.push("{}"),this.stringParams&&(this.push("{}"),this.push("{}"))},pushHash:function(){this.hash&&this.hashes.push(this.hash),this.hash={values:[],types:[],contexts:[],ids:[]}},popHash:function(){var a=this.hash;this.hash=this.hashes.pop(),this.trackIds&&this.push("{"+a.ids.join(",")+"}"),this.stringParams&&(this.push("{"+a.contexts.join(",")+"}"),this.push("{"+a.types.join(",")+"}")),this.push("{\n    "+a.values.join(",\n    ")+"\n  }")},pushString:function(a){this.pushStackLiteral(this.quotedString(a))},push:function(a){return this.inlineStack.push(a),a},pushLiteral:function(a){this.pushStackLiteral(a)},pushProgram:function(a){null!=a?this.pushStackLiteral(this.programExpression(a)):this.pushStackLiteral(null)},invokeHelper:function(a,b,c){this.aliases.helperMissing="helpers.helperMissing";var d=this.popStack(),e=this.setupHelper(a,b),f=(c?e.name+" || ":"")+d+" || helperMissing";this.push("(("+f+").call("+e.callParams+"))")},invokeKnownHelper:function(a,b){var c=this.setupHelper(a,b);this.push(c.name+".call("+c.callParams+")")},invokeAmbiguous:function(a,b){this.aliases.functionType='"function"',this.aliases.helperMissing="helpers.helperMissing",this.useRegister("helper");var c=this.popStack();this.emptyHash();var d=this.setupHelper(0,a,b),e=this.lastHelper=this.nameLookup("helpers",a,"helper");this.push("((helper = (helper = "+e+" || "+c+") != null ? helper : helperMissing"+(d.paramsInit?"),("+d.paramsInit:"")+"),(typeof helper === functionType ? helper.call("+d.callParams+") : helper))")},invokePartial:function(a,b){var c=[this.nameLookup("partials",a,"partial"),"'"+b+"'","'"+a+"'",this.popStack(),this.popStack(),"helpers","partials"];this.options.data?c.push("data"):this.options.compat&&c.push("undefined"),this.options.compat&&c.push("depths"),this.push("this.invokePartial("+c.join(", ")+")")},assignToHash:function(a){var b,c,d,e=this.popStack();this.trackIds&&(d=this.popStack()),this.stringParams&&(c=this.popStack(),b=this.popStack());var f=this.hash;b&&f.contexts.push("'"+a+"': "+b),c&&f.types.push("'"+a+"': "+c),d&&f.ids.push("'"+a+"': "+d),f.values.push("'"+a+"': ("+e+")")},pushId:function(a,b){"ID"===a||"DATA"===a?this.pushString(b):"sexpr"===a?this.pushStackLiteral("true"):this.pushStackLiteral("null")},compiler:d,compileChildren:function(a,b){for(var c,d,e=a.children,f=0,g=e.length;g>f;f++){c=e[f],d=new this.compiler;var h=this.matchExistingProgram(c);null==h?(this.context.programs.push(""),h=this.context.programs.length,c.index=h,c.name="program"+h,this.context.programs[h]=d.compile(c,b,this.context,!this.precompile),this.context.environments[h]=c,this.useDepths=this.useDepths||d.useDepths):(c.index=h,c.name="program"+h)}},matchExistingProgram:function(a){for(var b=0,c=this.context.environments.length;c>b;b++){var d=this.context.environments[b];if(d&&d.equals(a))return b}},programExpression:function(a){var b=this.environment.children[a],c=(b.depths.list,this.useDepths),d=[b.index,"data"];return c&&d.push("depths"),"this.program("+d.join(", ")+")"},useRegister:function(a){this.registers[a]||(this.registers[a]=!0,this.registers.list.push(a))},pushStackLiteral:function(a){return this.push(new c(a))},pushSource:function(a){this.pendingContent&&(this.source.push(this.appendToBuffer(this.quotedString(this.pendingContent))),this.pendingContent=void 0),a&&this.source.push(a)},pushStack:function(a){this.flushInline();var b=this.incrStack();return this.pushSource(b+" = "+a+";"),this.compileStack.push(b),b},replaceStack:function(a){{var b,d,e,f="";this.isInline()}if(!this.isInline())throw new h("replaceStack on non-inline");var g=this.popStack(!0);if(g instanceof c)f=b=g.value,e=!0;else{d=!this.stackSlot;var i=d?this.incrStack():this.topStackName();f="("+this.push(i)+" = "+g+")",b=this.topStack()}var j=a.call(this,b);e||this.popStack(),d&&this.stackSlot--,this.push("("+f+j+")")},incrStack:function(){return this.stackSlot++,this.stackSlot>this.stackVars.length&&this.stackVars.push("stack"+this.stackSlot),this.topStackName()},topStackName:function(){return"stack"+this.stackSlot},flushInline:function(){var a=this.inlineStack;if(a.length){this.inlineStack=[];for(var b=0,d=a.length;d>b;b++){var e=a[b];e instanceof c?this.compileStack.push(e):this.pushStack(e)}}},isInline:function(){return this.inlineStack.length},popStack:function(a){var b=this.isInline(),d=(b?this.inlineStack:this.compileStack).pop();if(!a&&d instanceof c)return d.value;if(!b){if(!this.stackSlot)throw new h("Invalid stack pop");this.stackSlot--}return d},topStack:function(){var a=this.isInline()?this.inlineStack:this.compileStack,b=a[a.length-1];return b instanceof c?b.value:b},contextName:function(a){return this.useDepths&&a?"depths["+a+"]":"depth"+a},quotedString:function(a){return'"'+a.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\u2028/g,"\\u2028").replace(/\u2029/g,"\\u2029")+'"'},objectLiteral:function(a){var b=[];for(var c in a)a.hasOwnProperty(c)&&b.push(this.quotedString(c)+":"+a[c]);return"{"+b.join(",")+"}"},setupHelper:function(a,b,c){var d=[],e=this.setupParams(b,a,d,c),f=this.nameLookup("helpers",b,"helper");return{params:d,paramsInit:e,name:f,callParams:[this.contextName(0)].concat(d).join(", ")}},setupOptions:function(a,b,c){var d,e,f,g={},h=[],i=[],j=[];g.name=this.quotedString(a),g.hash=this.popStack(),this.trackIds&&(g.hashIds=this.popStack()),this.stringParams&&(g.hashTypes=this.popStack(),g.hashContexts=this.popStack()),e=this.popStack(),f=this.popStack(),(f||e)&&(f||(f="this.noop"),e||(e="this.noop"),g.fn=f,g.inverse=e);for(var k=b;k--;)d=this.popStack(),c[k]=d,this.trackIds&&(j[k]=this.popStack()),this.stringParams&&(i[k]=this.popStack(),h[k]=this.popStack());return this.trackIds&&(g.ids="["+j.join(",")+"]"),this.stringParams&&(g.types="["+i.join(",")+"]",g.contexts="["+h.join(",")+"]"),this.options.data&&(g.data="data"),g},setupParams:function(a,b,c,d){var e=this.objectLiteral(this.setupOptions(a,b,c));return d?(this.useRegister("options"),c.push("options"),"options="+e):(c.push(e),"")}};for(var i="break else new var case finally return void catch for switch while continue function this with default if throw delete in try do instanceof typeof abstract enum int short boolean export interface static byte extends long super char final native synchronized class float package throws const goto private transient debugger implements protected volatile double import public let yield".split(" "),j=d.RESERVED_WORDS={},k=0,l=i.length;l>k;k++)j[i[k]]=!0;return d.isValidJavaScriptVariableName=function(a){return!d.RESERVED_WORDS[a]&&/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(a)},e=d}(d,c),m=function(a,b,c,d,e){"use strict";var f,g=a,h=b,i=c.parser,j=c.parse,k=d.Compiler,l=d.compile,m=d.precompile,n=e,o=g.create,p=function(){var a=o();return a.compile=function(b,c){return l(b,c,a)},a.precompile=function(b,c){return m(b,c,a)},a.AST=h,a.Compiler=k,a.JavaScriptCompiler=n,a.Parser=i,a.parse=j,a};return g=p(),g.create=p,g["default"]=g,f=g}(f,g,j,k,l);return m});
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-4.0.5.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-4.0.5.js
new file mode 100644
index 00000000000..57025bc9b4a
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-4.0.5.js
@@ -0,0 +1,3 @@
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Handlebars=e():t.Handlebars=e()}(this,function(){return function(t){function e(s){if(r[s])return r[s].exports;var i=r[s]={exports:{},id:s,loaded:!1};return t[s].call(i.exports,i,i.exports,e),i.loaded=!0,i.exports}var r={};return e.m=t,e.c=r,e.p="",e(0)}([function(t,e,r){"use strict";function s(){var t=v();return t.compile=function(e,r){return l.compile(e,r,t)},t.precompile=function(e,r){return l.precompile(e,r,t)},t.AST=c["default"],t.Compiler=l.Compiler,t.JavaScriptCompiler=u["default"],t.Parser=h.parser,t.parse=h.parse,t}var i=r(1)["default"];e.__esModule=!0;var a=r(2),n=i(a),o=r(21),c=i(o),h=r(22),l=r(27),p=r(28),u=i(p),f=r(25),d=i(f),m=r(20),g=i(m),v=n["default"].create,y=s();y.create=s,g["default"](y),y.Visitor=d["default"],y["default"]=y,e["default"]=y,t.exports=e["default"]},function(t,e){"use strict";e["default"]=function(t){return t&&t.__esModule?t:{"default":t}},e.__esModule=!0},function(t,e,r){"use strict";function s(){var t=new o.HandlebarsEnvironment;return f.extend(t,o),t.SafeString=h["default"],t.Exception=p["default"],t.Utils=f,t.escapeExpression=f.escapeExpression,t.VM=m,t.template=function(e){return m.template(e,t)},t}var i=r(3)["default"],a=r(1)["default"];e.__esModule=!0;var n=r(4),o=i(n),c=r(18),h=a(c),l=r(6),p=a(l),u=r(5),f=i(u),d=r(19),m=i(d),g=r(20),v=a(g),y=s();y.create=s,v["default"](y),y["default"]=y,e["default"]=y,t.exports=e["default"]},function(t,e){"use strict";e["default"]=function(t){if(t&&t.__esModule)return t;var e={};if(null!=t)for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e["default"]=t,e},e.__esModule=!0},function(t,e,r){"use strict";function s(t,e,r){this.helpers=t||{},this.partials=e||{},this.decorators=r||{},c.registerDefaultHelpers(this),h.registerDefaultDecorators(this)}var i=r(1)["default"];e.__esModule=!0,e.HandlebarsEnvironment=s;var a=r(5),n=r(6),o=i(n),c=r(7),h=r(15),l=r(17),p=i(l),u="4.0.5";e.VERSION=u;var f=7;e.COMPILER_REVISION=f;var d={1:"<= 1.0.rc.2",2:"== 1.0.0-rc.3",3:"== 1.0.0-rc.4",4:"== 1.x.x",5:"== 2.0.0-alpha.x",6:">= 2.0.0-beta.1",7:">= 4.0.0"};e.REVISION_CHANGES=d;var m="[object Object]";s.prototype={constructor:s,logger:p["default"],log:p["default"].log,registerHelper:function(t,e){if(a.toString.call(t)===m){if(e)throw new o["default"]("Arg not supported with multiple helpers");a.extend(this.helpers,t)}else this.helpers[t]=e},unregisterHelper:function(t){delete this.helpers[t]},registerPartial:function(t,e){if(a.toString.call(t)===m)a.extend(this.partials,t);else{if("undefined"==typeof e)throw new o["default"]('Attempting to register a partial called "'+t+'" as undefined');this.partials[t]=e}},unregisterPartial:function(t){delete this.partials[t]},registerDecorator:function(t,e){if(a.toString.call(t)===m){if(e)throw new o["default"]("Arg not supported with multiple decorators");a.extend(this.decorators,t)}else this.decorators[t]=e},unregisterDecorator:function(t){delete this.decorators[t]}};var g=p["default"].log;e.log=g,e.createFrame=a.createFrame,e.logger=p["default"]},function(t,e){"use strict";function r(t){return l[t]}function s(t){for(var e=1;e<arguments.length;e++)for(var r in arguments[e])Object.prototype.hasOwnProperty.call(arguments[e],r)&&(t[r]=arguments[e][r]);return t}function i(t,e){for(var r=0,s=t.length;r<s;r++)if(t[r]===e)return r;return-1}function a(t){if("string"!=typeof t){if(t&&t.toHTML)return t.toHTML();if(null==t)return"";if(!t)return t+"";t=""+t}return u.test(t)?t.replace(p,r):t}function n(t){return!t&&0!==t||!(!m(t)||0!==t.length)}function o(t){var e=s({},t);return e._parent=t,e}function c(t,e){return t.path=e,t}function h(t,e){return(t?t+".":"")+e}e.__esModule=!0,e.extend=s,e.indexOf=i,e.escapeExpression=a,e.isEmpty=n,e.createFrame=o,e.blockParams=c,e.appendContextPath=h;var l={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;","=":"&#x3D;"},p=/[&<>"'`=]/g,u=/[&<>"'`=]/,f=Object.prototype.toString;e.toString=f;var d=function(t){return"function"==typeof t};d(/x/)&&(e.isFunction=d=function(t){return"function"==typeof t&&"[object Function]"===f.call(t)}),e.isFunction=d;var m=Array.isArray||function(t){return!(!t||"object"!=typeof t)&&"[object Array]"===f.call(t)};e.isArray=m},function(t,e){"use strict";function r(t,e){var i=e&&e.loc,a=void 0,n=void 0;i&&(a=i.start.line,n=i.start.column,t+=" - "+a+":"+n);for(var o=Error.prototype.constructor.call(this,t),c=0;c<s.length;c++)this[s[c]]=o[s[c]];Error.captureStackTrace&&Error.captureStackTrace(this,r),i&&(this.lineNumber=a,this.column=n)}e.__esModule=!0;var s=["description","fileName","lineNumber","message","name","number","stack"];r.prototype=new Error,e["default"]=r,t.exports=e["default"]},function(t,e,r){"use strict";function s(t){n["default"](t),c["default"](t),l["default"](t),u["default"](t),d["default"](t),g["default"](t),y["default"](t)}var i=r(1)["default"];e.__esModule=!0,e.registerDefaultHelpers=s;var a=r(8),n=i(a),o=r(9),c=i(o),h=r(10),l=i(h),p=r(11),u=i(p),f=r(12),d=i(f),m=r(13),g=i(m),v=r(14),y=i(v)},function(t,e,r){"use strict";e.__esModule=!0;var s=r(5);e["default"]=function(t){t.registerHelper("blockHelperMissing",function(e,r){var i=r.inverse,a=r.fn;if(e===!0)return a(this);if(e===!1||null==e)return i(this);if(s.isArray(e))return e.length>0?(r.ids&&(r.ids=[r.name]),t.helpers.each(e,r)):i(this);if(r.data&&r.ids){var n=s.createFrame(r.data);n.contextPath=s.appendContextPath(r.data.contextPath,r.name),r={data:n}}return a(e,r)})},t.exports=e["default"]},function(t,e,r){"use strict";var s=r(1)["default"];e.__esModule=!0;var i=r(5),a=r(6),n=s(a);e["default"]=function(t){t.registerHelper("each",function(t,e){function r(e,r,a){h&&(h.key=e,h.index=r,h.first=0===r,h.last=!!a,l&&(h.contextPath=l+e)),c+=s(t[e],{data:h,blockParams:i.blockParams([t[e],e],[l+e,null])})}if(!e)throw new n["default"]("Must pass iterator to #each");var s=e.fn,a=e.inverse,o=0,c="",h=void 0,l=void 0;if(e.data&&e.ids&&(l=i.appendContextPath(e.data.contextPath,e.ids[0])+"."),i.isFunction(t)&&(t=t.call(this)),e.data&&(h=i.createFrame(e.data)),t&&"object"==typeof t)if(i.isArray(t))for(var p=t.length;o<p;o++)o in t&&r(o,o,o===t.length-1);else{var u=void 0;for(var f in t)t.hasOwnProperty(f)&&(void 0!==u&&r(u,o-1),u=f,o++);void 0!==u&&r(u,o-1,!0)}return 0===o&&(c=a(this)),c})},t.exports=e["default"]},function(t,e,r){"use strict";var s=r(1)["default"];e.__esModule=!0;var i=r(6),a=s(i);e["default"]=function(t){t.registerHelper("helperMissing",function(){if(1!==arguments.length)throw new a["default"]('Missing helper: "'+arguments[arguments.length-1].name+'"')})},t.exports=e["default"]},function(t,e,r){"use strict";e.__esModule=!0;var s=r(5);e["default"]=function(t){t.registerHelper("if",function(t,e){return s.isFunction(t)&&(t=t.call(this)),!e.hash.includeZero&&!t||s.isEmpty(t)?e.inverse(this):e.fn(this)}),t.registerHelper("unless",function(e,r){return t.helpers["if"].call(this,e,{fn:r.inverse,inverse:r.fn,hash:r.hash})})},t.exports=e["default"]},function(t,e){"use strict";e.__esModule=!0,e["default"]=function(t){t.registerHelper("log",function(){for(var e=[void 0],r=arguments[arguments.length-1],s=0;s<arguments.length-1;s++)e.push(arguments[s]);var i=1;null!=r.hash.level?i=r.hash.level:r.data&&null!=r.data.level&&(i=r.data.level),e[0]=i,t.log.apply(t,e)})},t.exports=e["default"]},function(t,e){"use strict";e.__esModule=!0,e["default"]=function(t){t.registerHelper("lookup",function(t,e){return t&&t[e]})},t.exports=e["default"]},function(t,e,r){"use strict";e.__esModule=!0;var s=r(5);e["default"]=function(t){t.registerHelper("with",function(t,e){s.isFunction(t)&&(t=t.call(this));var r=e.fn;if(s.isEmpty(t))return e.inverse(this);var i=e.data;return e.data&&e.ids&&(i=s.createFrame(e.data),i.contextPath=s.appendContextPath(e.data.contextPath,e.ids[0])),r(t,{data:i,blockParams:s.blockParams([t],[i&&i.contextPath])})})},t.exports=e["default"]},function(t,e,r){"use strict";function s(t){n["default"](t)}var i=r(1)["default"];e.__esModule=!0,e.registerDefaultDecorators=s;var a=r(16),n=i(a)},function(t,e,r){"use strict";e.__esModule=!0;var s=r(5);e["default"]=function(t){t.registerDecorator("inline",function(t,e,r,i){var a=t;return e.partials||(e.partials={},a=function(i,a){var n=r.partials;r.partials=s.extend({},n,e.partials);var o=t(i,a);return r.partials=n,o}),e.partials[i.args[0]]=i.fn,a})},t.exports=e["default"]},function(t,e,r){"use strict";e.__esModule=!0;var s=r(5),i={methodMap:["debug","info","warn","error"],level:"info",lookupLevel:function(t){if("string"==typeof t){var e=s.indexOf(i.methodMap,t.toLowerCase());t=e>=0?e:parseInt(t,10)}return t},log:function(t){if(t=i.lookupLevel(t),"undefined"!=typeof console&&i.lookupLevel(i.level)<=t){var e=i.methodMap[t];console[e]||(e="log");for(var r=arguments.length,s=Array(r>1?r-1:0),a=1;a<r;a++)s[a-1]=arguments[a];console[e].apply(console,s)}}};e["default"]=i,t.exports=e["default"]},function(t,e){"use strict";function r(t){this.string=t}e.__esModule=!0,r.prototype.toString=r.prototype.toHTML=function(){return""+this.string},e["default"]=r,t.exports=e["default"]},function(t,e,r){"use strict";function s(t){var e=t&&t[0]||1,r=v.COMPILER_REVISION;if(e!==r){if(e<r){var s=v.REVISION_CHANGES[r],i=v.REVISION_CHANGES[e];throw new g["default"]("Template was precompiled with an older version of Handlebars than the current runtime. Please update your precompiler to a newer version ("+s+") or downgrade your runtime to an older version ("+i+").")}throw new g["default"]("Template was precompiled with a newer version of Handlebars than the current runtime. Please update your runtime to a newer version ("+t[1]+").")}}function i(t,e){function r(r,s,i){i.hash&&(s=d.extend({},s,i.hash),i.ids&&(i.ids[0]=!0)),r=e.VM.resolvePartial.call(this,r,s,i);var a=e.VM.invokePartial.call(this,r,s,i);if(null==a&&e.compile&&(i.partials[i.name]=e.compile(r,t.compilerOptions,e),a=i.partials[i.name](s,i)),null!=a){if(i.indent){for(var n=a.split("\n"),o=0,c=n.length;o<c&&(n[o]||o+1!==c);o++)n[o]=i.indent+n[o];a=n.join("\n")}return a}throw new g["default"]("The partial "+i.name+" could not be compiled when running in runtime-only mode")}function s(e){function r(e){return""+t.main(i,e,i.helpers,i.partials,n,c,o)}var a=arguments.length<=1||void 0===arguments[1]?{}:arguments[1],n=a.data;s._setup(a),!a.partial&&t.useData&&(n=h(e,n));var o=void 0,c=t.useBlockParams?[]:void 0;return t.useDepths&&(o=a.depths?e!==a.depths[0]?[e].concat(a.depths):a.depths:[e]),(r=l(t.main,r,i,a.depths||[],n,c))(e,a)}if(!e)throw new g["default"]("No environment passed to template");if(!t||!t.main)throw new g["default"]("Unknown template object: "+typeof t);t.main.decorator=t.main_d,e.VM.checkRevision(t.compiler);var i={strict:function(t,e){if(!(e in t))throw new g["default"]('"'+e+'" not defined in '+t);return t[e]},lookup:function(t,e){for(var r=t.length,s=0;s<r;s++)if(t[s]&&null!=t[s][e])return t[s][e]},lambda:function(t,e){return"function"==typeof t?t.call(e):t},escapeExpression:d.escapeExpression,invokePartial:r,fn:function(e){var r=t[e];return r.decorator=t[e+"_d"],r},programs:[],program:function(t,e,r,s,i){var n=this.programs[t],o=this.fn(t);return e||i||s||r?n=a(this,t,o,e,r,s,i):n||(n=this.programs[t]=a(this,t,o)),n},data:function(t,e){for(;t&&e--;)t=t._parent;return t},merge:function(t,e){var r=t||e;return t&&e&&t!==e&&(r=d.extend({},e,t)),r},noop:e.VM.noop,compilerInfo:t.compiler};return s.isTop=!0,s._setup=function(r){r.partial?(i.helpers=r.helpers,i.partials=r.partials,i.decorators=r.decorators):(i.helpers=i.merge(r.helpers,e.helpers),t.usePartial&&(i.partials=i.merge(r.partials,e.partials)),(t.usePartial||t.useDecorators)&&(i.decorators=i.merge(r.decorators,e.decorators)))},s._child=function(e,r,s,n){if(t.useBlockParams&&!s)throw new g["default"]("must pass block params");if(t.useDepths&&!n)throw new g["default"]("must pass parent depths");return a(i,e,t[e],r,0,s,n)},s}function a(t,e,r,s,i,a,n){function o(e){var i=arguments.length<=1||void 0===arguments[1]?{}:arguments[1],o=n;return n&&e!==n[0]&&(o=[e].concat(n)),r(t,e,t.helpers,t.partials,i.data||s,a&&[i.blockParams].concat(a),o)}return o=l(r,o,t,n,s,a),o.program=e,o.depth=n?n.length:0,o.blockParams=i||0,o}function n(t,e,r){return t?t.call||r.name||(r.name=t,t=r.partials[t]):t="@partial-block"===r.name?r.data["partial-block"]:r.partials[r.name],t}function o(t,e,r){r.partial=!0,r.ids&&(r.data.contextPath=r.ids[0]||r.data.contextPath);var s=void 0;if(r.fn&&r.fn!==c&&(r.data=v.createFrame(r.data),s=r.data["partial-block"]=r.fn,s.partials&&(r.partials=d.extend({},r.partials,s.partials))),void 0===t&&s&&(t=s),void 0===t)throw new g["default"]("The partial "+r.name+" could not be found");if(t instanceof Function)return t(e,r)}function c(){return""}function h(t,e){return e&&"root"in e||(e=e?v.createFrame(e):{},e.root=t),e}function l(t,e,r,s,i,a){if(t.decorator){var n={};e=t.decorator(e,n,r,s&&s[0],i,a,s),d.extend(e,n)}return e}var p=r(3)["default"],u=r(1)["default"];e.__esModule=!0,e.checkRevision=s,e.template=i,e.wrapProgram=a,e.resolvePartial=n,e.invokePartial=o,e.noop=c;var f=r(5),d=p(f),m=r(6),g=u(m),v=r(4)},function(t,e){(function(r){"use strict";e.__esModule=!0,e["default"]=function(t){var e="undefined"!=typeof r?r:window,s=e.Handlebars;t.noConflict=function(){return e.Handlebars===t&&(e.Handlebars=s),t}},t.exports=e["default"]}).call(e,function(){return this}())},function(t,e){"use strict";e.__esModule=!0;var r={helpers:{helperExpression:function(t){return"SubExpression"===t.type||("MustacheStatement"===t.type||"BlockStatement"===t.type)&&!!(t.params&&t.params.length||t.hash)},scopedId:function(t){return/^\.|this\b/.test(t.original)},simpleId:function(t){return 1===t.parts.length&&!r.helpers.scopedId(t)&&!t.depth}}};e["default"]=r,t.exports=e["default"]},function(t,e,r){"use strict";function s(t,e){if("Program"===t.type)return t;o["default"].yy=f,f.locInfo=function(t){return new f.SourceLocation(e&&e.srcName,t)};var r=new h["default"](e);return r.accept(o["default"].parse(t))}var i=r(1)["default"],a=r(3)["default"];e.__esModule=!0,e.parse=s;var n=r(23),o=i(n),c=r(24),h=i(c),l=r(26),p=a(l),u=r(5);e.parser=o["default"];var f={};u.extend(f,p)},function(t,e){"use strict";var r=function(){function t(){this.yy={}}var e={trace:function(){},yy:{},symbols_:{error:2,root:3,program:4,EOF:5,program_repetition0:6,statement:7,mustache:8,block:9,rawBlock:10,partial:11,partialBlock:12,content:13,COMMENT:14,CONTENT:15,openRawBlock:16,rawBlock_repetition_plus0:17,END_RAW_BLOCK:18,OPEN_RAW_BLOCK:19,helperName:20,openRawBlock_repetition0:21,openRawBlock_option0:22,CLOSE_RAW_BLOCK:23,openBlock:24,block_option0:25,closeBlock:26,openInverse:27,block_option1:28,OPEN_BLOCK:29,openBlock_repetition0:30,openBlock_option0:31,openBlock_option1:32,CLOSE:33,OPEN_INVERSE:34,openInverse_repetition0:35,openInverse_option0:36,openInverse_option1:37,openInverseChain:38,OPEN_INVERSE_CHAIN:39,openInverseChain_repetition0:40,openInverseChain_option0:41,openInverseChain_option1:42,inverseAndProgram:43,INVERSE:44,inverseChain:45,inverseChain_option0:46,OPEN_ENDBLOCK:47,OPEN:48,mustache_repetition0:49,mustache_option0:50,OPEN_UNESCAPED:51,mustache_repetition1:52,mustache_option1:53,CLOSE_UNESCAPED:54,OPEN_PARTIAL:55,partialName:56,partial_repetition0:57,partial_option0:58,openPartialBlock:59,OPEN_PARTIAL_BLOCK:60,openPartialBlock_repetition0:61,openPartialBlock_option0:62,param:63,sexpr:64,OPEN_SEXPR:65,sexpr_repetition0:66,sexpr_option0:67,CLOSE_SEXPR:68,hash:69,hash_repetition_plus0:70,hashSegment:71,ID:72,EQUALS:73,blockParams:74,OPEN_BLOCK_PARAMS:75,blockParams_repetition_plus0:76,CLOSE_BLOCK_PARAMS:77,path:78,dataName:79,STRING:80,NUMBER:81,BOOLEAN:82,UNDEFINED:83,NULL:84,DATA:85,pathSegments:86,SEP:87,$accept:0,$end:1},terminals_:{2:"error",5:"EOF",14:"COMMENT",15:"CONTENT",18:"END_RAW_BLOCK",19:"OPEN_RAW_BLOCK",23:"CLOSE_RAW_BLOCK",29:"OPEN_BLOCK",33:"CLOSE",34:"OPEN_INVERSE",39:"OPEN_INVERSE_CHAIN",44:"INVERSE",47:"OPEN_ENDBLOCK",48:"OPEN",51:"OPEN_UNESCAPED",54:"CLOSE_UNESCAPED",55:"OPEN_PARTIAL",60:"OPEN_PARTIAL_BLOCK",65:"OPEN_SEXPR",68:"CLOSE_SEXPR",72:"ID",73:"EQUALS",75:"OPEN_BLOCK_PARAMS",77:"CLOSE_BLOCK_PARAMS",80:"STRING",81:"NUMBER",82:"BOOLEAN",83:"UNDEFINED",84:"NULL",85:"DATA",87:"SEP"},productions_:[0,[3,2],[4,1],[7,1],[7,1],[7,1],[7,1],[7,1],[7,1],[7,1],[13,1],[10,3],[16,5],[9,4],[9,4],[24,6],[27,6],[38,6],[43,2],[45,3],[45,1],[26,3],[8,5],[8,5],[11,5],[12,3],[59,5],[63,1],[63,1],[64,5],[69,1],[71,3],[74,3],[20,1],[20,1],[20,1],[20,1],[20,1],[20,1],[20,1],[56,1],[56,1],[79,2],[78,1],[86,3],[86,1],[6,0],[6,2],[17,1],[17,2],[21,0],[21,2],[22,0],[22,1],[25,0],[25,1],[28,0],[28,1],[30,0],[30,2],[31,0],[31,1],[32,0],[32,1],[35,0],[35,2],[36,0],[36,1],[37,0],[37,1],[40,0],[40,2],[41,0],[41,1],[42,0],[42,1],[46,0],[46,1],[49,0],[49,2],[50,0],[50,1],[52,0],[52,2],[53,0],[53,1],[57,0],[57,2],[58,0],[58,1],[61,0],[61,2],[62,0],[62,1],[66,0],[66,2],[67,0],[67,1],[70,1],[70,2],[76,1],[76,2]],performAction:function(t,e,r,s,i,a,n){var o=a.length-1;switch(i){case 1:return a[o-1];case 2:this.$=s.prepareProgram(a[o]);break;case 3:this.$=a[o];break;case 4:this.$=a[o];break;case 5:this.$=a[o];break;case 6:this.$=a[o];break;case 7:this.$=a[o];break;case 8:this.$=a[o];break;case 9:this.$={type:"CommentStatement",value:s.stripComment(a[o]),strip:s.stripFlags(a[o],a[o]),loc:s.locInfo(this._$)};break;case 10:this.$={type:"ContentStatement",original:a[o],value:a[o],loc:s.locInfo(this._$)};break;case 11:this.$=s.prepareRawBlock(a[o-2],a[o-1],a[o],this._$);break;case 12:this.$={path:a[o-3],params:a[o-2],hash:a[o-1]};break;case 13:this.$=s.prepareBlock(a[o-3],a[o-2],a[o-1],a[o],!1,this._$);break;case 14:this.$=s.prepareBlock(a[o-3],a[o-2],a[o-1],a[o],!0,this._$);break;case 15:this.$={open:a[o-5],path:a[o-4],params:a[o-3],hash:a[o-2],blockParams:a[o-1],strip:s.stripFlags(a[o-5],a[o])};break;case 16:this.$={path:a[o-4],params:a[o-3],hash:a[o-2],blockParams:a[o-1],strip:s.stripFlags(a[o-5],a[o])};break;case 17:this.$={path:a[o-4],params:a[o-3],hash:a[o-2],blockParams:a[o-1],strip:s.stripFlags(a[o-5],a[o])};break;case 18:this.$={strip:s.stripFlags(a[o-1],a[o-1]),program:a[o]};break;case 19:var c=s.prepareBlock(a[o-2],a[o-1],a[o],a[o],!1,this._$),h=s.prepareProgram([c],a[o-1].loc);h.chained=!0,this.$={strip:a[o-2].strip,program:h,chain:!0};break;case 20:this.$=a[o];break;case 21:this.$={path:a[o-1],strip:s.stripFlags(a[o-2],a[o])};break;case 22:this.$=s.prepareMustache(a[o-3],a[o-2],a[o-1],a[o-4],s.stripFlags(a[o-4],a[o]),this._$);break;case 23:this.$=s.prepareMustache(a[o-3],a[o-2],a[o-1],a[o-4],s.stripFlags(a[o-4],a[o]),this._$);break;case 24:this.$={type:"PartialStatement",name:a[o-3],params:a[o-2],hash:a[o-1],indent:"",strip:s.stripFlags(a[o-4],a[o]),loc:s.locInfo(this._$)};break;case 25:this.$=s.preparePartialBlock(a[o-2],a[o-1],a[o],this._$);break;case 26:this.$={path:a[o-3],params:a[o-2],hash:a[o-1],strip:s.stripFlags(a[o-4],a[o])};break;case 27:this.$=a[o];break;case 28:this.$=a[o];break;case 29:this.$={type:"SubExpression",path:a[o-3],params:a[o-2],hash:a[o-1],loc:s.locInfo(this._$)};break;case 30:this.$={type:"Hash",pairs:a[o],loc:s.locInfo(this._$)};break;case 31:this.$={type:"HashPair",key:s.id(a[o-2]),value:a[o],loc:s.locInfo(this._$)};break;case 32:this.$=s.id(a[o-1]);break;case 33:this.$=a[o];break;case 34:this.$=a[o];break;case 35:this.$={type:"StringLiteral",value:a[o],original:a[o],loc:s.locInfo(this._$)};break;case 36:this.$={type:"NumberLiteral",value:Number(a[o]),original:Number(a[o]),loc:s.locInfo(this._$)};break;case 37:this.$={type:"BooleanLiteral",value:"true"===a[o],original:"true"===a[o],loc:s.locInfo(this._$)};break;case 38:this.$={type:"UndefinedLiteral",original:void 0,value:void 0,loc:s.locInfo(this._$)};break;case 39:this.$={type:"NullLiteral",original:null,value:null,loc:s.locInfo(this._$)};break;case 40:this.$=a[o];break;case 41:this.$=a[o];break;case 42:this.$=s.preparePath(!0,a[o],this._$);break;case 43:this.$=s.preparePath(!1,a[o],this._$);break;case 44:a[o-2].push({part:s.id(a[o]),original:a[o],separator:a[o-1]}),this.$=a[o-2];break;case 45:this.$=[{part:s.id(a[o]),original:a[o]}];break;case 46:this.$=[];break;case 47:a[o-1].push(a[o]);break;case 48:this.$=[a[o]];break;case 49:a[o-1].push(a[o]);break;case 50:this.$=[];break;case 51:a[o-1].push(a[o]);break;case 58:this.$=[];break;case 59:a[o-1].push(a[o]);break;case 64:this.$=[];break;case 65:a[o-1].push(a[o]);break;case 70:this.$=[];break;case 71:a[o-1].push(a[o]);break;case 78:this.$=[];break;case 79:a[o-1].push(a[o]);break;case 82:this.$=[];break;case 83:a[o-1].push(a[o]);break;case 86:this.$=[];break;case 87:a[o-1].push(a[o]);break;case 90:this.$=[];break;case 91:a[o-1].push(a[o]);break;case 94:this.$=[];break;case 95:a[o-1].push(a[o]);break;case 98:this.$=[a[o]];break;case 99:a[o-1].push(a[o]);break;case 100:this.$=[a[o]];break;case 101:a[o-1].push(a[o])}},table:[{3:1,4:2,5:[2,46],6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{1:[3]},{5:[1,4]},{5:[2,2],7:5,8:6,9:7,10:8,11:9,12:10,13:11,14:[1,12],15:[1,20],16:17,19:[1,23],24:15,27:16,29:[1,21],34:[1,22],39:[2,2],44:[2,2],47:[2,2],48:[1,13],51:[1,14],55:[1,18],59:19,60:[1,24]},{1:[2,1]},{5:[2,47],14:[2,47],15:[2,47],19:[2,47],29:[2,47],34:[2,47],39:[2,47],44:[2,47],47:[2,47],48:[2,47],51:[2,47],55:[2,47],60:[2,47]},{5:[2,3],14:[2,3],15:[2,3],19:[2,3],29:[2,3],34:[2,3],39:[2,3],44:[2,3],47:[2,3],48:[2,3],51:[2,3],55:[2,3],60:[2,3]},{5:[2,4],14:[2,4],15:[2,4],19:[2,4],29:[2,4],34:[2,4],39:[2,4],44:[2,4],47:[2,4],48:[2,4],51:[2,4],55:[2,4],60:[2,4]},{5:[2,5],14:[2,5],15:[2,5],19:[2,5],29:[2,5],34:[2,5],39:[2,5],44:[2,5],47:[2,5],48:[2,5],51:[2,5],55:[2,5],60:[2,5]},{5:[2,6],14:[2,6],15:[2,6],19:[2,6],29:[2,6],34:[2,6],39:[2,6],44:[2,6],47:[2,6],48:[2,6],51:[2,6],55:[2,6],60:[2,6]},{5:[2,7],14:[2,7],15:[2,7],19:[2,7],29:[2,7],34:[2,7],39:[2,7],44:[2,7],47:[2,7],48:[2,7],51:[2,7],55:[2,7],60:[2,7]},{5:[2,8],14:[2,8],15:[2,8],19:[2,8],29:[2,8],34:[2,8],39:[2,8],44:[2,8],47:[2,8],48:[2,8],51:[2,8],55:[2,8],60:[2,8]},{5:[2,9],14:[2,9],15:[2,9],19:[2,9],29:[2,9],34:[2,9],39:[2,9],44:[2,9],47:[2,9],48:[2,9],51:[2,9],55:[2,9],60:[2,9]},{20:25,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:36,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{4:37,6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],39:[2,46],44:[2,46],47:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{4:38,6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],44:[2,46],47:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{13:40,15:[1,20],17:39},{20:42,56:41,64:43,65:[1,44],72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{4:45,6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],47:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{5:[2,10],14:[2,10],15:[2,10],18:[2,10],19:[2,10],29:[2,10],34:[2,10],39:[2,10],44:[2,10],47:[2,10],48:[2,10],51:[2,10],55:[2,10],60:[2,10]},{20:46,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:47,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:48,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:42,56:49,64:43,65:[1,44],72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{33:[2,78],49:50,65:[2,78],72:[2,78],80:[2,78],81:[2,78],82:[2,78],83:[2,78],84:[2,78],85:[2,78]},{23:[2,33],33:[2,33],54:[2,33],65:[2,33],68:[2,33],72:[2,33],75:[2,33],80:[2,33],81:[2,33],82:[2,33],83:[2,33],84:[2,33],85:[2,33]},{23:[2,34],33:[2,34],54:[2,34],65:[2,34],68:[2,34],72:[2,34],75:[2,34],80:[2,34],81:[2,34],82:[2,34],83:[2,34],84:[2,34],85:[2,34]},{23:[2,35],33:[2,35],54:[2,35],65:[2,35],68:[2,35],72:[2,35],75:[2,35],80:[2,35],81:[2,35],82:[2,35],83:[2,35],84:[2,35],85:[2,35]},{23:[2,36],33:[2,36],54:[2,36],65:[2,36],68:[2,36],72:[2,36],75:[2,36],80:[2,36],81:[2,36],82:[2,36],83:[2,36],84:[2,36],85:[2,36]},{23:[2,37],33:[2,37],54:[2,37],65:[2,37],68:[2,37],72:[2,37],75:[2,37],80:[2,37],81:[2,37],82:[2,37],83:[2,37],84:[2,37],85:[2,37]},{23:[2,38],33:[2,38],54:[2,38],65:[2,38],68:[2,38],72:[2,38],75:[2,38],80:[2,38],81:[2,38],82:[2,38],83:[2,38],84:[2,38],85:[2,38]},{23:[2,39],33:[2,39],54:[2,39],65:[2,39],68:[2,39],72:[2,39],75:[2,39],80:[2,39],81:[2,39],82:[2,39],83:[2,39],84:[2,39],85:[2,39]},{23:[2,43],33:[2,43],54:[2,43],65:[2,43],68:[2,43],72:[2,43],75:[2,43],80:[2,43],81:[2,43],82:[2,43],83:[2,43],84:[2,43],85:[2,43],87:[1,51]},{72:[1,35],86:52},{23:[2,45],33:[2,45],54:[2,45],65:[2,45],68:[2,45],72:[2,45],75:[2,45],80:[2,45],81:[2,45],82:[2,45],83:[2,45],84:[2,45],85:[2,45],87:[2,45]},{52:53,54:[2,82],65:[2,82],72:[2,82],80:[2,82],81:[2,82],82:[2,82],83:[2,82],84:[2,82],85:[2,82]},{25:54,38:56,39:[1,58],43:57,44:[1,59],45:55,47:[2,54]},{28:60,43:61,44:[1,59],47:[2,56]},{13:63,15:[1,20],18:[1,62]},{15:[2,48],18:[2,48]},{33:[2,86],57:64,65:[2,86],72:[2,86],80:[2,86],81:[2,86],82:[2,86],83:[2,86],84:[2,86],85:[2,86]},{33:[2,40],65:[2,40],72:[2,40],80:[2,40],81:[2,40],82:[2,40],83:[2,40],84:[2,40],85:[2,40]},{33:[2,41],65:[2,41],72:[2,41],80:[2,41],81:[2,41],82:[2,41],83:[2,41],84:[2,41],85:[2,41]},{20:65,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{26:66,47:[1,67]},{30:68,33:[2,58],65:[2,58],72:[2,58],75:[2,58],80:[2,58],81:[2,58],82:[2,58],83:[2,58],84:[2,58],85:[2,58]},{33:[2,64],35:69,65:[2,64],72:[2,64],75:[2,64],80:[2,64],81:[2,64],82:[2,64],83:[2,64],84:[2,64],85:[2,64]},{21:70,23:[2,50],65:[2,50],72:[2,50],80:[2,50],81:[2,50],82:[2,50],83:[2,50],84:[2,50],85:[2,50]},{33:[2,90],61:71,65:[2,90],72:[2,90],80:[2,90],81:[2,90],82:[2,90],83:[2,90],84:[2,90],85:[2,90]},{20:75,33:[2,80],50:72,63:73,64:76,65:[1,44],69:74,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{72:[1,80]},{23:[2,42],33:[2,42],54:[2,42],65:[2,42],68:[2,42],72:[2,42],75:[2,42],80:[2,42],81:[2,42],82:[2,42],83:[2,42],84:[2,42],85:[2,42],87:[1,51]},{20:75,53:81,54:[2,84],63:82,64:76,65:[1,44],69:83,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{26:84,47:[1,67]},{47:[2,55]},{4:85,6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],39:[2,46],44:[2,46],47:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{47:[2,20]},{20:86,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{4:87,6:3,14:[2,46],15:[2,46],19:[2,46],29:[2,46],34:[2,46],47:[2,46],48:[2,46],51:[2,46],55:[2,46],60:[2,46]},{26:88,47:[1,67]},{47:[2,57]},{5:[2,11],14:[2,11],15:[2,11],19:[2,11],29:[2,11],34:[2,11],39:[2,11],44:[2,11],47:[2,11],48:[2,11],51:[2,11],55:[2,11],60:[2,11]},{15:[2,49],18:[2,49]},{20:75,33:[2,88],58:89,63:90,64:76,65:[1,44],69:91,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{65:[2,94],66:92,68:[2,94],72:[2,94],80:[2,94],81:[2,94],82:[2,94],83:[2,94],84:[2,94],85:[2,94]},{5:[2,25],14:[2,25],15:[2,25],19:[2,25],29:[2,25],34:[2,25],39:[2,25],44:[2,25],47:[2,25],48:[2,25],51:[2,25],55:[2,25],60:[2,25]},{20:93,72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:75,31:94,33:[2,60],63:95,64:76,65:[1,44],69:96,70:77,71:78,72:[1,79],75:[2,60],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:75,33:[2,66],36:97,63:98,64:76,65:[1,44],69:99,70:77,71:78,72:[1,79],75:[2,66],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:75,22:100,23:[2,52],63:101,64:76,65:[1,44],69:102,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{20:75,33:[2,92],62:103,63:104,64:76,65:[1,44],69:105,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{33:[1,106]},{33:[2,79],65:[2,79],72:[2,79],80:[2,79],81:[2,79],82:[2,79],83:[2,79],84:[2,79],85:[2,79]},{33:[2,81]},{23:[2,27],33:[2,27],54:[2,27],65:[2,27],68:[2,27],72:[2,27],75:[2,27],80:[2,27],81:[2,27],82:[2,27],83:[2,27],84:[2,27],85:[2,27]},{23:[2,28],33:[2,28],54:[2,28],65:[2,28],68:[2,28],72:[2,28],75:[2,28],80:[2,28],81:[2,28],82:[2,28],83:[2,28],84:[2,28],85:[2,28]},{23:[2,30],33:[2,30],54:[2,30],68:[2,30],71:107,72:[1,108],75:[2,30]},{23:[2,98],33:[2,98],54:[2,98],68:[2,98],72:[2,98],75:[2,98]},{23:[2,45],33:[2,45],54:[2,45],65:[2,45],68:[2,45],72:[2,45],73:[1,109],75:[2,45],80:[2,45],81:[2,45],82:[2,45],83:[2,45],84:[2,45],85:[2,45],87:[2,45]},{23:[2,44],33:[2,44],54:[2,44],65:[2,44],68:[2,44],72:[2,44],75:[2,44],80:[2,44],81:[2,44],82:[2,44],83:[2,44],84:[2,44],85:[2,44],87:[2,44]},{54:[1,110]},{54:[2,83],65:[2,83],72:[2,83],80:[2,83],81:[2,83],82:[2,83],83:[2,83],84:[2,83],85:[2,83]},{54:[2,85]},{5:[2,13],14:[2,13],15:[2,13],19:[2,13],29:[2,13],34:[2,13],39:[2,13],44:[2,13],47:[2,13],48:[2,13],51:[2,13],55:[2,13],60:[2,13]},{38:56,39:[1,58],43:57,44:[1,59],45:112,46:111,47:[2,76]},{33:[2,70],40:113,65:[2,70],72:[2,70],75:[2,70],80:[2,70],81:[2,70],82:[2,70],83:[2,70],84:[2,70],85:[2,70]},{47:[2,18]},{5:[2,14],14:[2,14],15:[2,14],19:[2,14],29:[2,14],34:[2,14],39:[2,14],44:[2,14],47:[2,14],48:[2,14],51:[2,14],55:[2,14],60:[2,14]},{33:[1,114]},{33:[2,87],65:[2,87],72:[2,87],80:[2,87],81:[2,87],82:[2,87],83:[2,87],84:[2,87],85:[2,87]},{33:[2,89]},{20:75,63:116,64:76,65:[1,44],67:115,68:[2,96],69:117,70:77,71:78,72:[1,79],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{33:[1,118]},{32:119,33:[2,62],74:120,75:[1,121]},{33:[2,59],65:[2,59],72:[2,59],75:[2,59],80:[2,59],81:[2,59],82:[2,59],83:[2,59],84:[2,59],85:[2,59]},{33:[2,61],75:[2,61]},{33:[2,68],37:122,74:123,75:[1,121]},{33:[2,65],65:[2,65],72:[2,65],75:[2,65],80:[2,65],81:[2,65],82:[2,65],83:[2,65],84:[2,65],85:[2,65]},{33:[2,67],75:[2,67]},{23:[1,124]},{23:[2,51],65:[2,51],72:[2,51],80:[2,51],81:[2,51],82:[2,51],83:[2,51],84:[2,51],85:[2,51]},{23:[2,53]},{33:[1,125]},{33:[2,91],65:[2,91],72:[2,91],80:[2,91],81:[2,91],82:[2,91],83:[2,91],84:[2,91],85:[2,91]},{33:[2,93]},{5:[2,22],14:[2,22],15:[2,22],19:[2,22],29:[2,22],34:[2,22],39:[2,22],44:[2,22],47:[2,22],48:[2,22],51:[2,22],55:[2,22],60:[2,22]},{23:[2,99],33:[2,99],54:[2,99],68:[2,99],72:[2,99],75:[2,99]},{73:[1,109]},{20:75,63:126,64:76,65:[1,44],72:[1,35],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{5:[2,23],14:[2,23],15:[2,23],19:[2,23],29:[2,23],34:[2,23],39:[2,23],44:[2,23],47:[2,23],48:[2,23],51:[2,23],55:[2,23],60:[2,23]},{47:[2,19]},{47:[2,77]},{20:75,33:[2,72],41:127,63:128,64:76,65:[1,44],69:129,70:77,71:78,72:[1,79],75:[2,72],78:26,79:27,80:[1,28],81:[1,29],82:[1,30],83:[1,31],84:[1,32],85:[1,34],86:33},{5:[2,24],14:[2,24],15:[2,24],19:[2,24],29:[2,24],34:[2,24],39:[2,24],44:[2,24],47:[2,24],48:[2,24],51:[2,24],55:[2,24],60:[2,24]},{68:[1,130]},{65:[2,95],68:[2,95],72:[2,95],80:[2,95],81:[2,95],82:[2,95],83:[2,95],84:[2,95],85:[2,95]},{68:[2,97]},{5:[2,21],14:[2,21],15:[2,21],19:[2,21],29:[2,21],34:[2,21],39:[2,21],44:[2,21],47:[2,21],48:[2,21],51:[2,21],55:[2,21],60:[2,21]},{33:[1,131]},{33:[2,63]},{72:[1,133],76:132},{33:[1,134]},{33:[2,69]},{15:[2,12]},{14:[2,26],15:[2,26],19:[2,26],29:[2,26],34:[2,26],47:[2,26],48:[2,26],51:[2,26],55:[2,26],60:[2,26]},{23:[2,31],33:[2,31],54:[2,31],68:[2,31],72:[2,31],75:[2,31]},{33:[2,74],42:135,74:136,75:[1,121]},{33:[2,71],65:[2,71],72:[2,71],75:[2,71],80:[2,71],81:[2,71],82:[2,71],83:[2,71],84:[2,71],85:[2,71]},{33:[2,73],75:[2,73]},{23:[2,29],33:[2,29],54:[2,29],65:[2,29],68:[2,29],72:[2,29],75:[2,29],80:[2,29],81:[2,29],82:[2,29],83:[2,29],84:[2,29],85:[2,29]},{14:[2,15],15:[2,15],19:[2,15],29:[2,15],34:[2,15],39:[2,15],44:[2,15],47:[2,15],48:[2,15],51:[2,15],55:[2,15],60:[2,15]},{72:[1,138],77:[1,137]},{72:[2,100],77:[2,100]},{14:[2,16],15:[2,16],19:[2,16],29:[2,16],34:[2,16],44:[2,16],47:[2,16],
+48:[2,16],51:[2,16],55:[2,16],60:[2,16]},{33:[1,139]},{33:[2,75]},{33:[2,32]},{72:[2,101],77:[2,101]},{14:[2,17],15:[2,17],19:[2,17],29:[2,17],34:[2,17],39:[2,17],44:[2,17],47:[2,17],48:[2,17],51:[2,17],55:[2,17],60:[2,17]}],defaultActions:{4:[2,1],55:[2,55],57:[2,20],61:[2,57],74:[2,81],83:[2,85],87:[2,18],91:[2,89],102:[2,53],105:[2,93],111:[2,19],112:[2,77],117:[2,97],120:[2,63],123:[2,69],124:[2,12],136:[2,75],137:[2,32]},parseError:function(t,e){throw new Error(t)},parse:function(t){function e(){var t;return t=r.lexer.lex()||1,"number"!=typeof t&&(t=r.symbols_[t]||t),t}var r=this,s=[0],i=[null],a=[],n=this.table,o="",c=0,h=0,l=0;this.lexer.setInput(t),this.lexer.yy=this.yy,this.yy.lexer=this.lexer,this.yy.parser=this,"undefined"==typeof this.lexer.yylloc&&(this.lexer.yylloc={});var p=this.lexer.yylloc;a.push(p);var u=this.lexer.options&&this.lexer.options.ranges;"function"==typeof this.yy.parseError&&(this.parseError=this.yy.parseError);for(var f,d,m,g,v,y,k,S,b,_={};;){if(m=s[s.length-1],this.defaultActions[m]?g=this.defaultActions[m]:(null!==f&&"undefined"!=typeof f||(f=e()),g=n[m]&&n[m][f]),"undefined"==typeof g||!g.length||!g[0]){var P="";if(!l){b=[];for(y in n[m])this.terminals_[y]&&y>2&&b.push("'"+this.terminals_[y]+"'");P=this.lexer.showPosition?"Parse error on line "+(c+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+b.join(", ")+", got '"+(this.terminals_[f]||f)+"'":"Parse error on line "+(c+1)+": Unexpected "+(1==f?"end of input":"'"+(this.terminals_[f]||f)+"'"),this.parseError(P,{text:this.lexer.match,token:this.terminals_[f]||f,line:this.lexer.yylineno,loc:p,expected:b})}}if(g[0]instanceof Array&&g.length>1)throw new Error("Parse Error: multiple actions possible at state: "+m+", token: "+f);switch(g[0]){case 1:s.push(f),i.push(this.lexer.yytext),a.push(this.lexer.yylloc),s.push(g[1]),f=null,d?(f=d,d=null):(h=this.lexer.yyleng,o=this.lexer.yytext,c=this.lexer.yylineno,p=this.lexer.yylloc,l>0&&l--);break;case 2:if(k=this.productions_[g[1]][1],_.$=i[i.length-k],_._$={first_line:a[a.length-(k||1)].first_line,last_line:a[a.length-1].last_line,first_column:a[a.length-(k||1)].first_column,last_column:a[a.length-1].last_column},u&&(_._$.range=[a[a.length-(k||1)].range[0],a[a.length-1].range[1]]),v=this.performAction.call(_,o,h,c,this.yy,g[1],i,a),"undefined"!=typeof v)return v;k&&(s=s.slice(0,-1*k*2),i=i.slice(0,-1*k),a=a.slice(0,-1*k)),s.push(this.productions_[g[1]][0]),i.push(_.$),a.push(_._$),S=n[s[s.length-2]][s[s.length-1]],s.push(S);break;case 3:return!0}}return!0}},r=function(){var t={EOF:1,parseError:function(t,e){if(!this.yy.parser)throw new Error(t);this.yy.parser.parseError(t,e)},setInput:function(t){return this._input=t,this._more=this._less=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},input:function(){var t=this._input[0];this.yytext+=t,this.yyleng++,this.offset++,this.match+=t,this.matched+=t;var e=t.match(/(?:\r\n?|\n).*/g);return e?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),t},unput:function(t){var e=t.length,r=t.split(/(?:\r\n?|\n)/g);this._input=t+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-e-1),this.offset-=e;var s=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),r.length-1&&(this.yylineno-=r.length-1);var i=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:r?(r.length===s.length?this.yylloc.first_column:0)+s[s.length-r.length].length-r[0].length:this.yylloc.first_column-e},this.options.ranges&&(this.yylloc.range=[i[0],i[0]+this.yyleng-e]),this},more:function(){return this._more=!0,this},less:function(t){this.unput(this.match.slice(t))},pastInput:function(){var t=this.matched.substr(0,this.matched.length-this.match.length);return(t.length>20?"...":"")+t.substr(-20).replace(/\n/g,"")},upcomingInput:function(){var t=this.match;return t.length<20&&(t+=this._input.substr(0,20-t.length)),(t.substr(0,20)+(t.length>20?"...":"")).replace(/\n/g,"")},showPosition:function(){var t=this.pastInput(),e=new Array(t.length+1).join("-");return t+this.upcomingInput()+"\n"+e+"^"},next:function(){if(this.done)return this.EOF;this._input||(this.done=!0);var t,e,r,s,i;this._more||(this.yytext="",this.match="");for(var a=this._currentRules(),n=0;n<a.length&&(r=this._input.match(this.rules[a[n]]),!r||e&&!(r[0].length>e[0].length)||(e=r,s=n,this.options.flex));n++);return e?(i=e[0].match(/(?:\r\n?|\n).*/g),i&&(this.yylineno+=i.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:i?i[i.length-1].length-i[i.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+e[0].length},this.yytext+=e[0],this.match+=e[0],this.matches=e,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._input=this._input.slice(e[0].length),this.matched+=e[0],t=this.performAction.call(this,this.yy,this,a[s],this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),t?t:void 0):""===this._input?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+". Unrecognized text.\n"+this.showPosition(),{text:"",token:null,line:this.yylineno})},lex:function(){var t=this.next();return"undefined"!=typeof t?t:this.lex()},begin:function(t){this.conditionStack.push(t)},popState:function(){return this.conditionStack.pop()},_currentRules:function(){return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules},topState:function(){return this.conditionStack[this.conditionStack.length-2]},pushState:function(t){this.begin(t)}};return t.options={},t.performAction=function(t,e,r,s){function i(t,r){return e.yytext=e.yytext.substr(t,e.yyleng-r)}switch(r){case 0:if("\\\\"===e.yytext.slice(-2)?(i(0,1),this.begin("mu")):"\\"===e.yytext.slice(-1)?(i(0,1),this.begin("emu")):this.begin("mu"),e.yytext)return 15;break;case 1:return 15;case 2:return this.popState(),15;case 3:return this.begin("raw"),15;case 4:return this.popState(),"raw"===this.conditionStack[this.conditionStack.length-1]?15:(e.yytext=e.yytext.substr(5,e.yyleng-9),"END_RAW_BLOCK");case 5:return 15;case 6:return this.popState(),14;case 7:return 65;case 8:return 68;case 9:return 19;case 10:return this.popState(),this.begin("raw"),23;case 11:return 55;case 12:return 60;case 13:return 29;case 14:return 47;case 15:return this.popState(),44;case 16:return this.popState(),44;case 17:return 34;case 18:return 39;case 19:return 51;case 20:return 48;case 21:this.unput(e.yytext),this.popState(),this.begin("com");break;case 22:return this.popState(),14;case 23:return 48;case 24:return 73;case 25:return 72;case 26:return 72;case 27:return 87;case 28:break;case 29:return this.popState(),54;case 30:return this.popState(),33;case 31:return e.yytext=i(1,2).replace(/\\"/g,'"'),80;case 32:return e.yytext=i(1,2).replace(/\\'/g,"'"),80;case 33:return 85;case 34:return 82;case 35:return 82;case 36:return 83;case 37:return 84;case 38:return 81;case 39:return 75;case 40:return 77;case 41:return 72;case 42:return e.yytext=e.yytext.replace(/\\([\\\]])/g,"$1"),72;case 43:return"INVALID";case 44:return 5}},t.rules=[/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:\{\{\{\{(?=[^\/]))/,/^(?:\{\{\{\{\/[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.])\}\}\}\})/,/^(?:[^\x00]*?(?=(\{\{\{\{)))/,/^(?:[\s\S]*?--(~)?\}\})/,/^(?:\()/,/^(?:\))/,/^(?:\{\{\{\{)/,/^(?:\}\}\}\})/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#>)/,/^(?:\{\{(~)?#\*?)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^\s*(~)?\}\})/,/^(?:\{\{(~)?\s*else\s*(~)?\}\})/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{(~)?!--)/,/^(?:\{\{(~)?![\s\S]*?\}\})/,/^(?:\{\{(~)?\*?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.)|])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s)])))/,/^(?:false(?=([~}\s)])))/,/^(?:undefined(?=([~}\s)])))/,/^(?:null(?=([~}\s)])))/,/^(?:-?[0-9]+(?:\.[0-9]+)?(?=([~}\s)])))/,/^(?:as\s+\|)/,/^(?:\|)/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.)|]))))/,/^(?:\[(\\\]|[^\]])*\])/,/^(?:.)/,/^(?:$)/],t.conditions={mu:{rules:[7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44],inclusive:!1},emu:{rules:[2],inclusive:!1},com:{rules:[6],inclusive:!1},raw:{rules:[3,4,5],inclusive:!1},INITIAL:{rules:[0,1,44],inclusive:!0}},t}();return e.lexer=r,t.prototype=e,e.Parser=t,new t}();e.__esModule=!0,e["default"]=r},function(t,e,r){"use strict";function s(){var t=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.options=t}function i(t,e,r){void 0===e&&(e=t.length);var s=t[e-1],i=t[e-2];return s?"ContentStatement"===s.type?(i||!r?/\r?\n\s*?$/:/(^|\r?\n)\s*?$/).test(s.original):void 0:r}function a(t,e,r){void 0===e&&(e=-1);var s=t[e+1],i=t[e+2];return s?"ContentStatement"===s.type?(i||!r?/^\s*?\r?\n/:/^\s*?(\r?\n|$)/).test(s.original):void 0:r}function n(t,e,r){var s=t[null==e?0:e+1];if(s&&"ContentStatement"===s.type&&(r||!s.rightStripped)){var i=s.value;s.value=s.value.replace(r?/^\s+/:/^[ \t]*\r?\n?/,""),s.rightStripped=s.value!==i}}function o(t,e,r){var s=t[null==e?t.length-1:e-1];if(s&&"ContentStatement"===s.type&&(r||!s.leftStripped)){var i=s.value;return s.value=s.value.replace(r?/\s+$/:/[ \t]+$/,""),s.leftStripped=s.value!==i,s.leftStripped}}var c=r(1)["default"];e.__esModule=!0;var h=r(25),l=c(h);s.prototype=new l["default"],s.prototype.Program=function(t){var e=!this.options.ignoreStandalone,r=!this.isRootSeen;this.isRootSeen=!0;for(var s=t.body,c=0,h=s.length;c<h;c++){var l=s[c],p=this.accept(l);if(p){var u=i(s,c,r),f=a(s,c,r),d=p.openStandalone&&u,m=p.closeStandalone&&f,g=p.inlineStandalone&&u&&f;p.close&&n(s,c,!0),p.open&&o(s,c,!0),e&&g&&(n(s,c),o(s,c)&&"PartialStatement"===l.type&&(l.indent=/([ \t]+$)/.exec(s[c-1].original)[1])),e&&d&&(n((l.program||l.inverse).body),o(s,c)),e&&m&&(n(s,c),o((l.inverse||l.program).body))}}return t},s.prototype.BlockStatement=s.prototype.DecoratorBlock=s.prototype.PartialBlockStatement=function(t){this.accept(t.program),this.accept(t.inverse);var e=t.program||t.inverse,r=t.program&&t.inverse,s=r,c=r;if(r&&r.chained)for(s=r.body[0].program;c.chained;)c=c.body[c.body.length-1].program;var h={open:t.openStrip.open,close:t.closeStrip.close,openStandalone:a(e.body),closeStandalone:i((s||e).body)};if(t.openStrip.close&&n(e.body,null,!0),r){var l=t.inverseStrip;l.open&&o(e.body,null,!0),l.close&&n(s.body,null,!0),t.closeStrip.open&&o(c.body,null,!0),!this.options.ignoreStandalone&&i(e.body)&&a(s.body)&&(o(e.body),n(s.body))}else t.closeStrip.open&&o(e.body,null,!0);return h},s.prototype.Decorator=s.prototype.MustacheStatement=function(t){return t.strip},s.prototype.PartialStatement=s.prototype.CommentStatement=function(t){var e=t.strip||{};return{inlineStandalone:!0,open:e.open,close:e.close}},e["default"]=s,t.exports=e["default"]},function(t,e,r){"use strict";function s(){this.parents=[]}function i(t){this.acceptRequired(t,"path"),this.acceptArray(t.params),this.acceptKey(t,"hash")}function a(t){i.call(this,t),this.acceptKey(t,"program"),this.acceptKey(t,"inverse")}function n(t){this.acceptRequired(t,"name"),this.acceptArray(t.params),this.acceptKey(t,"hash")}var o=r(1)["default"];e.__esModule=!0;var c=r(6),h=o(c);s.prototype={constructor:s,mutating:!1,acceptKey:function(t,e){var r=this.accept(t[e]);if(this.mutating){if(r&&!s.prototype[r.type])throw new h["default"]('Unexpected node type "'+r.type+'" found when accepting '+e+" on "+t.type);t[e]=r}},acceptRequired:function(t,e){if(this.acceptKey(t,e),!t[e])throw new h["default"](t.type+" requires "+e)},acceptArray:function(t){for(var e=0,r=t.length;e<r;e++)this.acceptKey(t,e),t[e]||(t.splice(e,1),e--,r--)},accept:function(t){if(t){if(!this[t.type])throw new h["default"]("Unknown type: "+t.type,t);this.current&&this.parents.unshift(this.current),this.current=t;var e=this[t.type](t);return this.current=this.parents.shift(),!this.mutating||e?e:e!==!1?t:void 0}},Program:function(t){this.acceptArray(t.body)},MustacheStatement:i,Decorator:i,BlockStatement:a,DecoratorBlock:a,PartialStatement:n,PartialBlockStatement:function(t){n.call(this,t),this.acceptKey(t,"program")},ContentStatement:function(){},CommentStatement:function(){},SubExpression:i,PathExpression:function(){},StringLiteral:function(){},NumberLiteral:function(){},BooleanLiteral:function(){},UndefinedLiteral:function(){},NullLiteral:function(){},Hash:function(t){this.acceptArray(t.pairs)},HashPair:function(t){this.acceptRequired(t,"value")}},e["default"]=s,t.exports=e["default"]},function(t,e,r){"use strict";function s(t,e){if(e=e.path?e.path.original:e,t.path.original!==e){var r={loc:t.path.loc};throw new g["default"](t.path.original+" doesn't match "+e,r)}}function i(t,e){this.source=t,this.start={line:e.first_line,column:e.first_column},this.end={line:e.last_line,column:e.last_column}}function a(t){return/^\[.*\]$/.test(t)?t.substr(1,t.length-2):t}function n(t,e){return{open:"~"===t.charAt(2),close:"~"===e.charAt(e.length-3)}}function o(t){return t.replace(/^\{\{~?\!-?-?/,"").replace(/-?-?~?\}\}$/,"")}function c(t,e,r){r=this.locInfo(r);for(var s=t?"@":"",i=[],a=0,n="",o=0,c=e.length;o<c;o++){var h=e[o].part,l=e[o].original!==h;if(s+=(e[o].separator||"")+h,l||".."!==h&&"."!==h&&"this"!==h)i.push(h);else{if(i.length>0)throw new g["default"]("Invalid path: "+s,{loc:r});".."===h&&(a++,n+="../")}}return{type:"PathExpression",data:t,depth:a,parts:i,original:s,loc:r}}function h(t,e,r,s,i,a){var n=s.charAt(3)||s.charAt(2),o="{"!==n&&"&"!==n,c=/\*/.test(s);return{type:c?"Decorator":"MustacheStatement",path:t,params:e,hash:r,escaped:o,strip:i,loc:this.locInfo(a)}}function l(t,e,r,i){s(t,r),i=this.locInfo(i);var a={type:"Program",body:e,strip:{},loc:i};return{type:"BlockStatement",path:t.path,params:t.params,hash:t.hash,program:a,openStrip:{},inverseStrip:{},closeStrip:{},loc:i}}function p(t,e,r,i,a,n){i&&i.path&&s(t,i);var o=/\*/.test(t.open);e.blockParams=t.blockParams;var c=void 0,h=void 0;if(r){if(o)throw new g["default"]("Unexpected inverse block on decorator",r);r.chain&&(r.program.body[0].closeStrip=i.strip),h=r.strip,c=r.program}return a&&(a=c,c=e,e=a),{type:o?"DecoratorBlock":"BlockStatement",path:t.path,params:t.params,hash:t.hash,program:e,inverse:c,openStrip:t.strip,inverseStrip:h,closeStrip:i&&i.strip,loc:this.locInfo(n)}}function u(t,e){if(!e&&t.length){var r=t[0].loc,s=t[t.length-1].loc;r&&s&&(e={source:r.source,start:{line:r.start.line,column:r.start.column},end:{line:s.end.line,column:s.end.column}})}return{type:"Program",body:t,strip:{},loc:e}}function f(t,e,r,i){return s(t,r),{type:"PartialBlockStatement",name:t.path,params:t.params,hash:t.hash,program:e,openStrip:t.strip,closeStrip:r&&r.strip,loc:this.locInfo(i)}}var d=r(1)["default"];e.__esModule=!0,e.SourceLocation=i,e.id=a,e.stripFlags=n,e.stripComment=o,e.preparePath=c,e.prepareMustache=h,e.prepareRawBlock=l,e.prepareBlock=p,e.prepareProgram=u,e.preparePartialBlock=f;var m=r(6),g=d(m)},function(t,e,r){"use strict";function s(){}function i(t,e,r){if(null==t||"string"!=typeof t&&"Program"!==t.type)throw new l["default"]("You must pass a string or Handlebars AST to Handlebars.precompile. You passed "+t);e=e||{},"data"in e||(e.data=!0),e.compat&&(e.useDepths=!0);var s=r.parse(t,e),i=(new r.Compiler).compile(s,e);return(new r.JavaScriptCompiler).compile(i,e)}function a(t,e,r){function s(){var s=r.parse(t,e),i=(new r.Compiler).compile(s,e),a=(new r.JavaScriptCompiler).compile(i,e,void 0,!0);return r.template(a)}function i(t,e){return a||(a=s()),a.call(this,t,e)}if(void 0===e&&(e={}),null==t||"string"!=typeof t&&"Program"!==t.type)throw new l["default"]("You must pass a string or Handlebars AST to Handlebars.compile. You passed "+t);"data"in e||(e.data=!0),e.compat&&(e.useDepths=!0);var a=void 0;return i._setup=function(t){return a||(a=s()),a._setup(t)},i._child=function(t,e,r,i){return a||(a=s()),a._child(t,e,r,i)},i}function n(t,e){if(t===e)return!0;if(p.isArray(t)&&p.isArray(e)&&t.length===e.length){for(var r=0;r<t.length;r++)if(!n(t[r],e[r]))return!1;return!0}}function o(t){if(!t.path.parts){var e=t.path;t.path={type:"PathExpression",data:!1,depth:0,parts:[e.original+""],original:e.original+"",loc:e.loc}}}var c=r(1)["default"];e.__esModule=!0,e.Compiler=s,e.precompile=i,e.compile=a;var h=r(6),l=c(h),p=r(5),u=r(21),f=c(u),d=[].slice;s.prototype={compiler:s,equals:function(t){var e=this.opcodes.length;if(t.opcodes.length!==e)return!1;for(var r=0;r<e;r++){var s=this.opcodes[r],i=t.opcodes[r];if(s.opcode!==i.opcode||!n(s.args,i.args))return!1}e=this.children.length;for(var r=0;r<e;r++)if(!this.children[r].equals(t.children[r]))return!1;return!0},guid:0,compile:function(t,e){this.sourceNode=[],this.opcodes=[],this.children=[],this.options=e,this.stringParams=e.stringParams,this.trackIds=e.trackIds,e.blockParams=e.blockParams||[];var r=e.knownHelpers;if(e.knownHelpers={helperMissing:!0,blockHelperMissing:!0,each:!0,"if":!0,unless:!0,"with":!0,log:!0,lookup:!0},r)for(var s in r)s in r&&(e.knownHelpers[s]=r[s]);return this.accept(t)},compileProgram:function(t){var e=new this.compiler,r=e.compile(t,this.options),s=this.guid++;return this.usePartial=this.usePartial||r.usePartial,this.children[s]=r,this.useDepths=this.useDepths||r.useDepths,s},accept:function(t){if(!this[t.type])throw new l["default"]("Unknown type: "+t.type,t);this.sourceNode.unshift(t);var e=this[t.type](t);return this.sourceNode.shift(),e},Program:function(t){this.options.blockParams.unshift(t.blockParams);for(var e=t.body,r=e.length,s=0;s<r;s++)this.accept(e[s]);return this.options.blockParams.shift(),this.isSimple=1===r,this.blockParams=t.blockParams?t.blockParams.length:0,this},BlockStatement:function(t){o(t);var e=t.program,r=t.inverse;e=e&&this.compileProgram(e),r=r&&this.compileProgram(r);var s=this.classifySexpr(t);"helper"===s?this.helperSexpr(t,e,r):"simple"===s?(this.simpleSexpr(t),this.opcode("pushProgram",e),this.opcode("pushProgram",r),this.opcode("emptyHash"),this.opcode("blockValue",t.path.original)):(this.ambiguousSexpr(t,e,r),this.opcode("pushProgram",e),this.opcode("pushProgram",r),this.opcode("emptyHash"),this.opcode("ambiguousBlockValue")),this.opcode("append")},DecoratorBlock:function(t){var e=t.program&&this.compileProgram(t.program),r=this.setupFullMustacheParams(t,e,void 0),s=t.path;this.useDecorators=!0,this.opcode("registerDecorator",r.length,s.original)},PartialStatement:function(t){this.usePartial=!0;var e=t.program;e&&(e=this.compileProgram(t.program));var r=t.params;if(r.length>1)throw new l["default"]("Unsupported number of partial arguments: "+r.length,t);r.length||(this.options.explicitPartialContext?this.opcode("pushLiteral","undefined"):r.push({type:"PathExpression",parts:[],depth:0}));var s=t.name.original,i="SubExpression"===t.name.type;i&&this.accept(t.name),this.setupFullMustacheParams(t,e,void 0,!0);var a=t.indent||"";this.options.preventIndent&&a&&(this.opcode("appendContent",a),a=""),this.opcode("invokePartial",i,s,a),this.opcode("append")},PartialBlockStatement:function(t){this.PartialStatement(t)},MustacheStatement:function(t){this.SubExpression(t),t.escaped&&!this.options.noEscape?this.opcode("appendEscaped"):this.opcode("append")},Decorator:function(t){this.DecoratorBlock(t)},ContentStatement:function(t){t.value&&this.opcode("appendContent",t.value)},CommentStatement:function(){},SubExpression:function(t){o(t);var e=this.classifySexpr(t);"simple"===e?this.simpleSexpr(t):"helper"===e?this.helperSexpr(t):this.ambiguousSexpr(t)},ambiguousSexpr:function(t,e,r){var s=t.path,i=s.parts[0],a=null!=e||null!=r;this.opcode("getContext",s.depth),this.opcode("pushProgram",e),this.opcode("pushProgram",r),s.strict=!0,this.accept(s),this.opcode("invokeAmbiguous",i,a)},simpleSexpr:function(t){var e=t.path;e.strict=!0,this.accept(e),this.opcode("resolvePossibleLambda")},helperSexpr:function(t,e,r){var s=this.setupFullMustacheParams(t,e,r),i=t.path,a=i.parts[0];if(this.options.knownHelpers[a])this.opcode("invokeKnownHelper",s.length,a);else{if(this.options.knownHelpersOnly)throw new l["default"]("You specified knownHelpersOnly, but used the unknown helper "+a,t);i.strict=!0,i.falsy=!0,this.accept(i),this.opcode("invokeHelper",s.length,i.original,f["default"].helpers.simpleId(i))}},PathExpression:function(t){this.addDepth(t.depth),this.opcode("getContext",t.depth);var e=t.parts[0],r=f["default"].helpers.scopedId(t),s=!t.depth&&!r&&this.blockParamIndex(e);s?this.opcode("lookupBlockParam",s,t.parts):e?t.data?(this.options.data=!0,this.opcode("lookupData",t.depth,t.parts,t.strict)):this.opcode("lookupOnContext",t.parts,t.falsy,t.strict,r):this.opcode("pushContext")},StringLiteral:function(t){this.opcode("pushString",t.value)},NumberLiteral:function(t){this.opcode("pushLiteral",t.value)},BooleanLiteral:function(t){this.opcode("pushLiteral",t.value)},UndefinedLiteral:function(){this.opcode("pushLiteral","undefined")},NullLiteral:function(){this.opcode("pushLiteral","null")},Hash:function(t){var e=t.pairs,r=0,s=e.length;for(this.opcode("pushHash");r<s;r++)this.pushParam(e[r].value);for(;r--;)this.opcode("assignToHash",e[r].key);this.opcode("popHash")},opcode:function(t){this.opcodes.push({opcode:t,args:d.call(arguments,1),loc:this.sourceNode[0].loc})},addDepth:function(t){t&&(this.useDepths=!0)},classifySexpr:function(t){var e=f["default"].helpers.simpleId(t.path),r=e&&!!this.blockParamIndex(t.path.parts[0]),s=!r&&f["default"].helpers.helperExpression(t),i=!r&&(s||e);if(i&&!s){var a=t.path.parts[0],n=this.options;n.knownHelpers[a]?s=!0:n.knownHelpersOnly&&(i=!1)}return s?"helper":i?"ambiguous":"simple"},pushParams:function(t){for(var e=0,r=t.length;e<r;e++)this.pushParam(t[e])},pushParam:function(t){var e=null!=t.value?t.value:t.original||"";if(this.stringParams)e.replace&&(e=e.replace(/^(\.?\.\/)*/g,"").replace(/\//g,".")),t.depth&&this.addDepth(t.depth),this.opcode("getContext",t.depth||0),this.opcode("pushStringParam",e,t.type),"SubExpression"===t.type&&this.accept(t);else{if(this.trackIds){var r=void 0;if(!t.parts||f["default"].helpers.scopedId(t)||t.depth||(r=this.blockParamIndex(t.parts[0])),r){var s=t.parts.slice(1).join(".");this.opcode("pushId","BlockParam",r,s)}else e=t.original||e,e.replace&&(e=e.replace(/^this(?:\.|$)/,"").replace(/^\.\//,"").replace(/^\.$/,"")),this.opcode("pushId",t.type,e)}this.accept(t)}},setupFullMustacheParams:function(t,e,r,s){var i=t.params;return this.pushParams(i),this.opcode("pushProgram",e),this.opcode("pushProgram",r),t.hash?this.accept(t.hash):this.opcode("emptyHash",s),i},blockParamIndex:function(t){for(var e=0,r=this.options.blockParams.length;e<r;e++){var s=this.options.blockParams[e],i=s&&p.indexOf(s,t);if(s&&i>=0)return[e,i]}}}},function(t,e,r){"use strict";function s(t){this.value=t}function i(){}function a(t,e,r,s){var i=e.popStack(),a=0,n=r.length;for(t&&n--;a<n;a++)i=e.nameLookup(i,r[a],s);return t?[e.aliasable("container.strict"),"(",i,", ",e.quotedString(r[a]),")"]:i}var n=r(1)["default"];e.__esModule=!0;var o=r(4),c=r(6),h=n(c),l=r(5),p=r(29),u=n(p);i.prototype={nameLookup:function(t,e){return i.isValidJavaScriptVariableName(e)?[t,".",e]:[t,"[",JSON.stringify(e),"]"]},depthedLookup:function(t){return[this.aliasable("container.lookup"),'(depths, "',t,'")']},compilerInfo:function(){var t=o.COMPILER_REVISION,e=o.REVISION_CHANGES[t];return[t,e]},appendToBuffer:function(t,e,r){return l.isArray(t)||(t=[t]),t=this.source.wrap(t,e),this.environment.isSimple?["return ",t,";"]:r?["buffer += ",t,";"]:(t.appendToBuffer=!0,t)},initializeBuffer:function(){return this.quotedString("")},compile:function(t,e,r,s){this.environment=t,this.options=e,this.stringParams=this.options.stringParams,this.trackIds=this.options.trackIds,this.precompile=!s,this.name=this.environment.name,this.isChild=!!r,this.context=r||{decorators:[],programs:[],environments:[]},this.preamble(),this.stackSlot=0,this.stackVars=[],this.aliases={},this.registers={list:[]},this.hashes=[],this.compileStack=[],this.inlineStack=[],this.blockParams=[],this.compileChildren(t,e),this.useDepths=this.useDepths||t.useDepths||t.useDecorators||this.options.compat,this.useBlockParams=this.useBlockParams||t.useBlockParams;var i=t.opcodes,a=void 0,n=void 0,o=void 0,c=void 0;for(o=0,c=i.length;o<c;o++)a=i[o],this.source.currentLocation=a.loc,n=n||a.loc,this[a.opcode].apply(this,a.args);if(this.source.currentLocation=n,this.pushSource(""),this.stackSlot||this.inlineStack.length||this.compileStack.length)throw new h["default"]("Compile completed with content left on stack");this.decorators.isEmpty()?this.decorators=void 0:(this.useDecorators=!0,this.decorators.prepend("var decorators = container.decorators;\n"),this.decorators.push("return fn;"),s?this.decorators=Function.apply(this,["fn","props","container","depth0","data","blockParams","depths",this.decorators.merge()]):(this.decorators.prepend("function(fn, props, container, depth0, data, blockParams, depths) {\n"),this.decorators.push("}\n"),this.decorators=this.decorators.merge()));var l=this.createFunctionContext(s);if(this.isChild)return l;var p={compiler:this.compilerInfo(),main:l};this.decorators&&(p.main_d=this.decorators,p.useDecorators=!0);var u=this.context,f=u.programs,d=u.decorators;for(o=0,c=f.length;o<c;o++)f[o]&&(p[o]=f[o],d[o]&&(p[o+"_d"]=d[o],p.useDecorators=!0));return this.environment.usePartial&&(p.usePartial=!0),this.options.data&&(p.useData=!0),this.useDepths&&(p.useDepths=!0),this.useBlockParams&&(p.useBlockParams=!0),this.options.compat&&(p.compat=!0),s?p.compilerOptions=this.options:(p.compiler=JSON.stringify(p.compiler),this.source.currentLocation={start:{line:1,column:0}},p=this.objectLiteral(p),e.srcName?(p=p.toStringWithSourceMap({file:e.destName}),p.map=p.map&&p.map.toString()):p=p.toString()),p},preamble:function(){this.lastContext=0,this.source=new u["default"](this.options.srcName),this.decorators=new u["default"](this.options.srcName)},createFunctionContext:function(t){var e="",r=this.stackVars.concat(this.registers.list);r.length>0&&(e+=", "+r.join(", "));var s=0;for(var i in this.aliases){var a=this.aliases[i];this.aliases.hasOwnProperty(i)&&a.children&&a.referenceCount>1&&(e+=", alias"+ ++s+"="+i,a.children[0]="alias"+s)}var n=["container","depth0","helpers","partials","data"];(this.useBlockParams||this.useDepths)&&n.push("blockParams"),this.useDepths&&n.push("depths");var o=this.mergeSource(e);return t?(n.push(o),Function.apply(this,n)):this.source.wrap(["function(",n.join(","),") {\n  ",o,"}"])},mergeSource:function(t){var e=this.environment.isSimple,r=!this.forceBuffer,s=void 0,i=void 0,a=void 0,n=void 0;return this.source.each(function(t){t.appendToBuffer?(a?t.prepend("  + "):a=t,n=t):(a&&(i?a.prepend("buffer += "):s=!0,n.add(";"),a=n=void 0),i=!0,e||(r=!1))}),r?a?(a.prepend("return "),n.add(";")):i||this.source.push('return "";'):(t+=", buffer = "+(s?"":this.initializeBuffer()),a?(a.prepend("return buffer + "),n.add(";")):this.source.push("return buffer;")),t&&this.source.prepend("var "+t.substring(2)+(s?"":";\n")),this.source.merge()},blockValue:function(t){var e=this.aliasable("helpers.blockHelperMissing"),r=[this.contextName(0)];this.setupHelperArgs(t,0,r);var s=this.popStack();r.splice(1,0,s),this.push(this.source.functionCall(e,"call",r))},ambiguousBlockValue:function(){var t=this.aliasable("helpers.blockHelperMissing"),e=[this.contextName(0)];this.setupHelperArgs("",0,e,!0),this.flushInline();var r=this.topStack();e.splice(1,0,r),this.pushSource(["if (!",this.lastHelper,") { ",r," = ",this.source.functionCall(t,"call",e),"}"])},appendContent:function(t){this.pendingContent?t=this.pendingContent+t:this.pendingLocation=this.source.currentLocation,this.pendingContent=t},append:function(){if(this.isInline())this.replaceStack(function(t){return[" != null ? ",t,' : ""']}),this.pushSource(this.appendToBuffer(this.popStack()));else{var t=this.popStack();this.pushSource(["if (",t," != null) { ",this.appendToBuffer(t,void 0,!0)," }"]),this.environment.isSimple&&this.pushSource(["else { ",this.appendToBuffer("''",void 0,!0)," }"])}},appendEscaped:function(){this.pushSource(this.appendToBuffer([this.aliasable("container.escapeExpression"),"(",this.popStack(),")"]))},getContext:function(t){this.lastContext=t},pushContext:function(){this.pushStackLiteral(this.contextName(this.lastContext))},lookupOnContext:function(t,e,r,s){var i=0;s||!this.options.compat||this.lastContext?this.pushContext():this.push(this.depthedLookup(t[i++])),this.resolvePath("context",t,i,e,r)},lookupBlockParam:function(t,e){this.useBlockParams=!0,this.push(["blockParams[",t[0],"][",t[1],"]"]),this.resolvePath("context",e,1)},lookupData:function(t,e,r){t?this.pushStackLiteral("container.data(data, "+t+")"):this.pushStackLiteral("data"),this.resolvePath("data",e,0,!0,r)},resolvePath:function(t,e,r,s,i){var n=this;if(this.options.strict||this.options.assumeObjects)return void this.push(a(this.options.strict&&i,this,e,t));for(var o=e.length;r<o;r++)this.replaceStack(function(i){var a=n.nameLookup(i,e[r],t);return s?[" && ",a]:[" != null ? ",a," : ",i]})},resolvePossibleLambda:function(){this.push([this.aliasable("container.lambda"),"(",this.popStack(),", ",this.contextName(0),")"])},pushStringParam:function(t,e){this.pushContext(),this.pushString(e),"SubExpression"!==e&&("string"==typeof t?this.pushString(t):this.pushStackLiteral(t))},emptyHash:function(t){this.trackIds&&this.push("{}"),this.stringParams&&(this.push("{}"),this.push("{}")),this.pushStackLiteral(t?"undefined":"{}")},pushHash:function(){this.hash&&this.hashes.push(this.hash),this.hash={values:[],types:[],contexts:[],ids:[]}},popHash:function(){var t=this.hash;this.hash=this.hashes.pop(),this.trackIds&&this.push(this.objectLiteral(t.ids)),this.stringParams&&(this.push(this.objectLiteral(t.contexts)),this.push(this.objectLiteral(t.types))),this.push(this.objectLiteral(t.values))},pushString:function(t){this.pushStackLiteral(this.quotedString(t))},pushLiteral:function(t){this.pushStackLiteral(t)},pushProgram:function(t){null!=t?this.pushStackLiteral(this.programExpression(t)):this.pushStackLiteral(null)},registerDecorator:function(t,e){var r=this.nameLookup("decorators",e,"decorator"),s=this.setupHelperArgs(e,t);this.decorators.push(["fn = ",this.decorators.functionCall(r,"",["fn","props","container",s])," || fn;"])},invokeHelper:function(t,e,r){var s=this.popStack(),i=this.setupHelper(t,e),a=r?[i.name," || "]:"",n=["("].concat(a,s);this.options.strict||n.push(" || ",this.aliasable("helpers.helperMissing")),n.push(")"),this.push(this.source.functionCall(n,"call",i.callParams))},invokeKnownHelper:function(t,e){var r=this.setupHelper(t,e);this.push(this.source.functionCall(r.name,"call",r.callParams))},invokeAmbiguous:function(t,e){this.useRegister("helper");var r=this.popStack();this.emptyHash();var s=this.setupHelper(0,t,e),i=this.lastHelper=this.nameLookup("helpers",t,"helper"),a=["(","(helper = ",i," || ",r,")"];this.options.strict||(a[0]="(helper = ",a.push(" != null ? helper : ",this.aliasable("helpers.helperMissing"))),this.push(["(",a,s.paramsInit?["),(",s.paramsInit]:[],"),","(typeof helper === ",this.aliasable('"function"')," ? ",this.source.functionCall("helper","call",s.callParams)," : helper))"])},invokePartial:function(t,e,r){var s=[],i=this.setupParams(e,1,s);t&&(e=this.popStack(),delete i.name),r&&(i.indent=JSON.stringify(r)),i.helpers="helpers",i.partials="partials",i.decorators="container.decorators",t?s.unshift(e):s.unshift(this.nameLookup("partials",e,"partial")),this.options.compat&&(i.depths="depths"),i=this.objectLiteral(i),
+s.push(i),this.push(this.source.functionCall("container.invokePartial","",s))},assignToHash:function(t){var e=this.popStack(),r=void 0,s=void 0,i=void 0;this.trackIds&&(i=this.popStack()),this.stringParams&&(s=this.popStack(),r=this.popStack());var a=this.hash;r&&(a.contexts[t]=r),s&&(a.types[t]=s),i&&(a.ids[t]=i),a.values[t]=e},pushId:function(t,e,r){"BlockParam"===t?this.pushStackLiteral("blockParams["+e[0]+"].path["+e[1]+"]"+(r?" + "+JSON.stringify("."+r):"")):"PathExpression"===t?this.pushString(e):"SubExpression"===t?this.pushStackLiteral("true"):this.pushStackLiteral("null")},compiler:i,compileChildren:function(t,e){for(var r=t.children,s=void 0,i=void 0,a=0,n=r.length;a<n;a++){s=r[a],i=new this.compiler;var o=this.matchExistingProgram(s);null==o?(this.context.programs.push(""),o=this.context.programs.length,s.index=o,s.name="program"+o,this.context.programs[o]=i.compile(s,e,this.context,!this.precompile),this.context.decorators[o]=i.decorators,this.context.environments[o]=s,this.useDepths=this.useDepths||i.useDepths,this.useBlockParams=this.useBlockParams||i.useBlockParams):(s.index=o,s.name="program"+o,this.useDepths=this.useDepths||s.useDepths,this.useBlockParams=this.useBlockParams||s.useBlockParams)}},matchExistingProgram:function(t){for(var e=0,r=this.context.environments.length;e<r;e++){var s=this.context.environments[e];if(s&&s.equals(t))return e}},programExpression:function(t){var e=this.environment.children[t],r=[e.index,"data",e.blockParams];return(this.useBlockParams||this.useDepths)&&r.push("blockParams"),this.useDepths&&r.push("depths"),"container.program("+r.join(", ")+")"},useRegister:function(t){this.registers[t]||(this.registers[t]=!0,this.registers.list.push(t))},push:function(t){return t instanceof s||(t=this.source.wrap(t)),this.inlineStack.push(t),t},pushStackLiteral:function(t){this.push(new s(t))},pushSource:function(t){this.pendingContent&&(this.source.push(this.appendToBuffer(this.source.quotedString(this.pendingContent),this.pendingLocation)),this.pendingContent=void 0),t&&this.source.push(t)},replaceStack:function(t){var e=["("],r=void 0,i=void 0,a=void 0;if(!this.isInline())throw new h["default"]("replaceStack on non-inline");var n=this.popStack(!0);if(n instanceof s)r=[n.value],e=["(",r],a=!0;else{i=!0;var o=this.incrStack();e=["((",this.push(o)," = ",n,")"],r=this.topStack()}var c=t.call(this,r);a||this.popStack(),i&&this.stackSlot--,this.push(e.concat(c,")"))},incrStack:function(){return this.stackSlot++,this.stackSlot>this.stackVars.length&&this.stackVars.push("stack"+this.stackSlot),this.topStackName()},topStackName:function(){return"stack"+this.stackSlot},flushInline:function(){var t=this.inlineStack;this.inlineStack=[];for(var e=0,r=t.length;e<r;e++){var i=t[e];if(i instanceof s)this.compileStack.push(i);else{var a=this.incrStack();this.pushSource([a," = ",i,";"]),this.compileStack.push(a)}}},isInline:function(){return this.inlineStack.length},popStack:function(t){var e=this.isInline(),r=(e?this.inlineStack:this.compileStack).pop();if(!t&&r instanceof s)return r.value;if(!e){if(!this.stackSlot)throw new h["default"]("Invalid stack pop");this.stackSlot--}return r},topStack:function(){var t=this.isInline()?this.inlineStack:this.compileStack,e=t[t.length-1];return e instanceof s?e.value:e},contextName:function(t){return this.useDepths&&t?"depths["+t+"]":"depth"+t},quotedString:function(t){return this.source.quotedString(t)},objectLiteral:function(t){return this.source.objectLiteral(t)},aliasable:function(t){var e=this.aliases[t];return e?(e.referenceCount++,e):(e=this.aliases[t]=this.source.wrap(t),e.aliasable=!0,e.referenceCount=1,e)},setupHelper:function(t,e,r){var s=[],i=this.setupHelperArgs(e,t,s,r),a=this.nameLookup("helpers",e,"helper"),n=this.aliasable(this.contextName(0)+" != null ? "+this.contextName(0)+" : {}");return{params:s,paramsInit:i,name:a,callParams:[n].concat(s)}},setupParams:function(t,e,r){var s={},i=[],a=[],n=[],o=!r,c=void 0;o&&(r=[]),s.name=this.quotedString(t),s.hash=this.popStack(),this.trackIds&&(s.hashIds=this.popStack()),this.stringParams&&(s.hashTypes=this.popStack(),s.hashContexts=this.popStack());var h=this.popStack(),l=this.popStack();(l||h)&&(s.fn=l||"container.noop",s.inverse=h||"container.noop");for(var p=e;p--;)c=this.popStack(),r[p]=c,this.trackIds&&(n[p]=this.popStack()),this.stringParams&&(a[p]=this.popStack(),i[p]=this.popStack());return o&&(s.args=this.source.generateArray(r)),this.trackIds&&(s.ids=this.source.generateArray(n)),this.stringParams&&(s.types=this.source.generateArray(a),s.contexts=this.source.generateArray(i)),this.options.data&&(s.data="data"),this.useBlockParams&&(s.blockParams="blockParams"),s},setupHelperArgs:function(t,e,r,s){var i=this.setupParams(t,e,r);return i=this.objectLiteral(i),s?(this.useRegister("options"),r.push("options"),["options=",i]):r?(r.push(i),""):i}},function(){for(var t="break else new var case finally return void catch for switch while continue function this with default if throw delete in try do instanceof typeof abstract enum int short boolean export interface static byte extends long super char final native synchronized class float package throws const goto private transient debugger implements protected volatile double import public let yield await null true false".split(" "),e=i.RESERVED_WORDS={},r=0,s=t.length;r<s;r++)e[t[r]]=!0}(),i.isValidJavaScriptVariableName=function(t){return!i.RESERVED_WORDS[t]&&/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(t)},e["default"]=i,t.exports=e["default"]},function(t,e,r){"use strict";function s(t,e,r){if(a.isArray(t)){for(var s=[],i=0,n=t.length;i<n;i++)s.push(e.wrap(t[i],r));return s}return"boolean"==typeof t||"number"==typeof t?t+"":t}function i(t){this.srcFile=t,this.source=[]}e.__esModule=!0;var a=r(5),n=void 0;try{}catch(o){}n||(n=function(t,e,r,s){this.src="",s&&this.add(s)},n.prototype={add:function(t){a.isArray(t)&&(t=t.join("")),this.src+=t},prepend:function(t){a.isArray(t)&&(t=t.join("")),this.src=t+this.src},toStringWithSourceMap:function(){return{code:this.toString()}},toString:function(){return this.src}}),i.prototype={isEmpty:function(){return!this.source.length},prepend:function(t,e){this.source.unshift(this.wrap(t,e))},push:function(t,e){this.source.push(this.wrap(t,e))},merge:function(){var t=this.empty();return this.each(function(e){t.add(["  ",e,"\n"])}),t},each:function(t){for(var e=0,r=this.source.length;e<r;e++)t(this.source[e])},empty:function(){var t=this.currentLocation||{start:{}};return new n(t.start.line,t.start.column,this.srcFile)},wrap:function(t){var e=arguments.length<=1||void 0===arguments[1]?this.currentLocation||{start:{}}:arguments[1];return t instanceof n?t:(t=s(t,this,e),new n(e.start.line,e.start.column,this.srcFile,t))},functionCall:function(t,e,r){return r=this.generateList(r),this.wrap([t,e?"."+e+"(":"(",r,")"])},quotedString:function(t){return'"'+(t+"").replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\u2028/g,"\\u2028").replace(/\u2029/g,"\\u2029")+'"'},objectLiteral:function(t){var e=[];for(var r in t)if(t.hasOwnProperty(r)){var i=s(t[r],this);"undefined"!==i&&e.push([this.quotedString(r),":",i])}var a=this.generateList(e);return a.prepend("{"),a.add("}"),a},generateList:function(t){for(var e=this.empty(),r=0,i=t.length;r<i;r++)r&&e.add(","),e.add(s(t[r],this));return e},generateArray:function(t){var e=this.generateList(t);return e.prepend("["),e.add("]"),e}},e["default"]=i,t.exports=e["default"]}])});
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js
deleted file mode 100644
index 9a95a75ea16..00000000000
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js
+++ /dev/null
@@ -1 +0,0 @@
-var hljs=new function(){function l(o){return o.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function b(p){for(var o=p.firstChild;o;o=o.nextSibling){if(o.nodeName=="CODE"){return o}if(!(o.nodeType==3&&o.nodeValue.match(/\s+/))){break}}}function h(p,o){return Array.prototype.map.call(p.childNodes,function(q){if(q.nodeType==3){return o?q.nodeValue.replace(/\n/g,""):q.nodeValue}if(q.nodeName=="BR"){return"\n"}return h(q,o)}).join("")}function a(q){var p=(q.className+" "+q.parentNode.className).split(/\s+/);p=p.map(function(r){return r.replace(/^language-/,"")});for(var o=0;o<p.length;o++){if(e[p[o]]||p[o]=="no-highlight"){return p[o]}}}function c(q){var o=[];(function p(r,s){for(var t=r.firstChild;t;t=t.nextSibling){if(t.nodeType==3){s+=t.nodeValue.length}else{if(t.nodeName=="BR"){s+=1}else{if(t.nodeType==1){o.push({event:"start",offset:s,node:t});s=p(t,s);o.push({event:"stop",offset:s,node:t})}}}}return s})(q,0);return o}function j(x,v,w){var p=0;var y="";var r=[];function t(){if(x.length&&v.length){if(x[0].offset!=v[0].offset){return(x[0].offset<v[0].offset)?x:v}else{return v[0].event=="start"?x:v}}else{return x.length?x:v}}function s(A){function z(B){return" "+B.nodeName+'="'+l(B.value)+'"'}return"<"+A.nodeName+Array.prototype.map.call(A.attributes,z).join("")+">"}while(x.length||v.length){var u=t().splice(0,1)[0];y+=l(w.substr(p,u.offset-p));p=u.offset;if(u.event=="start"){y+=s(u.node);r.push(u.node)}else{if(u.event=="stop"){var o,q=r.length;do{q--;o=r[q];y+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);r.splice(q,1);while(q<r.length){y+=s(r[q]);q++}}}}return y+l(w.substr(p))}function f(q){function o(s,r){return RegExp(s,"m"+(q.cI?"i":"")+(r?"g":""))}function p(y,w){if(y.compiled){return}y.compiled=true;var s=[];if(y.k){var r={};function z(A,t){t.split(" ").forEach(function(B){var C=B.split("|");r[C[0]]=[A,C[1]?Number(C[1]):1];s.push(C[0])})}y.lR=o(y.l||hljs.IR,true);if(typeof y.k=="string"){z("keyword",y.k)}else{for(var x in y.k){if(!y.k.hasOwnProperty(x)){continue}z(x,y.k[x])}}y.k=r}if(w){if(y.bWK){y.b="\\b("+s.join("|")+")\\s"}y.bR=o(y.b?y.b:"\\B|\\b");if(!y.e&&!y.eW){y.e="\\B|\\b"}if(y.e){y.eR=o(y.e)}y.tE=y.e||"";if(y.eW&&w.tE){y.tE+=(y.e?"|":"")+w.tE}}if(y.i){y.iR=o(y.i)}if(y.r===undefined){y.r=1}if(!y.c){y.c=[]}for(var v=0;v<y.c.length;v++){if(y.c[v]=="self"){y.c[v]=y}p(y.c[v],y)}if(y.starts){p(y.starts,w)}var u=[];for(var v=0;v<y.c.length;v++){u.push(y.c[v].b)}if(y.tE){u.push(y.tE)}if(y.i){u.push(y.i)}y.t=u.length?o(u.join("|"),true):{exec:function(t){return null}}}p(q)}function d(D,E){function o(r,M){for(var L=0;L<M.c.length;L++){var K=M.c[L].bR.exec(r);if(K&&K.index==0){return M.c[L]}}}function s(K,r){if(K.e&&K.eR.test(r)){return K}if(K.eW){return s(K.parent,r)}}function t(r,K){return K.i&&K.iR.test(r)}function y(L,r){var K=F.cI?r[0].toLowerCase():r[0];return L.k.hasOwnProperty(K)&&L.k[K]}function G(){var K=l(w);if(!A.k){return K}var r="";var N=0;A.lR.lastIndex=0;var L=A.lR.exec(K);while(L){r+=K.substr(N,L.index-N);var M=y(A,L);if(M){v+=M[1];r+='<span class="'+M[0]+'">'+L[0]+"</span>"}else{r+=L[0]}N=A.lR.lastIndex;L=A.lR.exec(K)}return r+K.substr(N)}function z(){if(A.sL&&!e[A.sL]){return l(w)}var r=A.sL?d(A.sL,w):g(w);if(A.r>0){v+=r.keyword_count;B+=r.r}return'<span class="'+r.language+'">'+r.value+"</span>"}function J(){return A.sL!==undefined?z():G()}function I(L,r){var K=L.cN?'<span class="'+L.cN+'">':"";if(L.rB){x+=K;w=""}else{if(L.eB){x+=l(r)+K;w=""}else{x+=K;w=r}}A=Object.create(L,{parent:{value:A}});B+=L.r}function C(K,r){w+=K;if(r===undefined){x+=J();return 0}var L=o(r,A);if(L){x+=J();I(L,r);return L.rB?0:r.length}var M=s(A,r);if(M){if(!(M.rE||M.eE)){w+=r}x+=J();do{if(A.cN){x+="</span>"}A=A.parent}while(A!=M.parent);if(M.eE){x+=l(r)}w="";if(M.starts){I(M.starts,"")}return M.rE?0:r.length}if(t(r,A)){throw"Illegal"}w+=r;return r.length||1}var F=e[D];f(F);var A=F;var w="";var B=0;var v=0;var x="";try{var u,q,p=0;while(true){A.t.lastIndex=p;u=A.t.exec(E);if(!u){break}q=C(E.substr(p,u.index-p),u[0]);p=u.index+q}C(E.substr(p));return{r:B,keyword_count:v,value:x,language:D}}catch(H){if(H=="Illegal"){return{r:0,keyword_count:0,value:l(E)}}else{throw H}}}function g(s){var o={keyword_count:0,r:0,value:l(s)};var q=o;for(var p in e){if(!e.hasOwnProperty(p)){continue}var r=d(p,s);r.language=p;if(r.keyword_count+r.r>q.keyword_count+q.r){q=r}if(r.keyword_count+r.r>o.keyword_count+o.r){q=o;o=r}}if(q.language){o.second_best=q}return o}function i(q,p,o){if(p){q=q.replace(/^((<[^>]+>|\t)+)/gm,function(r,v,u,t){return v.replace(/\t/g,p)})}if(o){q=q.replace(/\n/g,"<br>")}return q}function m(r,u,p){var v=h(r,p);var t=a(r);if(t=="no-highlight"){return}var w=t?d(t,v):g(v);t=w.language;var o=c(r);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=j(o,c(q),v)}w.value=i(w.value,u,p);var s=r.className;if(!s.match("(\\s|^)(language-)?"+t+"(\\s|$)")){s=s?(s+" "+t):t}r.innerHTML=w.value;r.className=s;r.result={language:t,kw:w.keyword_count,re:w.r};if(w.second_best){r.second_best={language:w.second_best.language,kw:w.second_best.keyword_count,re:w.second_best.r}}}function n(){if(n.called){return}n.called=true;Array.prototype.map.call(document.getElementsByTagName("pre"),b).filter(Boolean).forEach(function(o){m(o,hljs.tabReplace)})}function k(){window.addEventListener("DOMContentLoaded",n,false);window.addEventListener("load",n,false)}var e={};this.LANGUAGES=e;this.highlight=d;this.highlightAuto=g;this.fixMarkup=i;this.highlightBlock=m;this.initHighlighting=n;this.initHighlightingOnLoad=k;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.inherit=function(q,r){var o={};for(var p in q){o[p]=q[p]}if(r){for(var p in r){o[p]=r[p]}}return o}}();hljs.LANGUAGES.xml=function(a){var c="[A-Za-z0-9\\._:-]+";var b={eW:true,c:[{cN:"attribute",b:c,r:0},{b:'="',rB:true,e:'"',c:[{cN:"value",b:'"',eW:true}]},{b:"='",rB:true,e:"'",c:[{cN:"value",b:"'",eW:true}]},{b:"=",c:[{cN:"value",b:"[^\\s/>]+"}]}]};return{cI:true,c:[{cN:"pi",b:"<\\?",e:"\\?>",r:10},{cN:"doctype",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"<!--",e:"-->",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{title:"style"},c:[b],starts:{e:"</style>",rE:true,sL:"css"}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{title:"script"},c:[b],starts:{e:"<\/script>",rE:true,sL:"javascript"}},{b:"<%",e:"%>",sL:"vbscript"},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"title",b:"[^ />]+"},b]}]}}(hljs);hljs.LANGUAGES.json=function(a){var e={literal:"true false null"};var d=[a.QSM,a.CNM];var c={cN:"value",e:",",eW:true,eE:true,c:d,k:e};var b={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:true,eE:true,c:[a.BE],i:"\\n",starts:c}],i:"\\S"};var f={b:"\\[",e:"\\]",c:[a.inherit(c,{cN:null})],i:"\\S"};d.splice(d.length,0,b,f);return{c:d,k:e,i:"\\S"}}(hljs);
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.9.1.0.pack.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.9.1.0.pack.js
new file mode 100644
index 00000000000..7b00c68d365
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.9.1.0.pack.js
@@ -0,0 +1 @@
+!function(e){"undefined"!=typeof exports?e(exports):(self.hljs=e({}),"function"==typeof define&&define.amd&&define("hljs",[],function(){return self.hljs}))}(function(e){function r(e){return e.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function n(e,r){var t=e&&e.exec(r);return t&&0==t.index}function a(e){return/^(no-?highlight|plain|text)$/i.test(e)}function c(e){var r,t,n,c=e.className+" ";if(c+=e.parentNode?e.parentNode.className:"",t=/\blang(?:uage)?-([\w-]+)\b/i.exec(c))return E(t[1])?t[1]:"no-highlight";for(c=c.split(/\s+/),r=0,n=c.length;n>r;r++)if(E(c[r])||a(c[r]))return c[r]}function i(e,r){var t,n={};for(t in e)n[t]=e[t];if(r)for(t in r)n[t]=r[t];return n}function o(e){var r=[];return function n(e,a){for(var c=e.firstChild;c;c=c.nextSibling)3==c.nodeType?a+=c.nodeValue.length:1==c.nodeType&&(r.push({event:"start",offset:a,node:c}),a=n(c,a),t(c).match(/br|hr|img|input/)||r.push({event:"stop",offset:a,node:c}));return a}(e,0),r}function s(e,n,a){function c(){return e.length&&n.length?e[0].offset!=n[0].offset?e[0].offset<n[0].offset?e:n:"start"==n[0].event?e:n:e.length?e:n}function i(e){function n(e){return" "+e.nodeName+'="'+r(e.value)+'"'}l+="<"+t(e)+Array.prototype.map.call(e.attributes,n).join("")+">"}function o(e){l+="</"+t(e)+">"}function s(e){("start"==e.event?i:o)(e.node)}for(var u=0,l="",f=[];e.length||n.length;){var b=c();if(l+=r(a.substr(u,b[0].offset-u)),u=b[0].offset,b==e){f.reverse().forEach(o);do s(b.splice(0,1)[0]),b=c();while(b==e&&b.length&&b[0].offset==u);f.reverse().forEach(i)}else"start"==b[0].event?f.push(b[0].node):f.pop(),s(b.splice(0,1)[0])}return l+r(a.substr(u))}function u(e){function r(e){return e&&e.source||e}function t(t,n){return new RegExp(r(t),"m"+(e.cI?"i":"")+(n?"g":""))}function n(a,c){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},s=function(r,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[r,t[1]?Number(t[1]):1]})};"string"==typeof a.k?s("keyword",a.k):Object.keys(a.k).forEach(function(e){s(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\b\w+\b/,!0),c&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=r(a.e)||"",a.eW&&c.tE&&(a.tE+=(a.e?"|":"")+c.tE)),a.i&&(a.iR=t(a.i)),void 0===a.r&&(a.r=1),a.c||(a.c=[]);var u=[];a.c.forEach(function(e){e.v?e.v.forEach(function(r){u.push(i(e,r))}):u.push("self"==e?a:e)}),a.c=u,a.c.forEach(function(e){n(e,a)}),a.starts&&n(a.starts,c);var l=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(r).filter(Boolean);a.t=l.length?t(l.join("|"),!0):{exec:function(){return null}}}}n(e)}function l(e,t,a,c){function i(e,r){for(var t=0;t<r.c.length;t++)if(n(r.c[t].bR,e))return r.c[t]}function o(e,r){if(n(e.eR,r)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?o(e.parent,r):void 0}function s(e,r){return!a&&n(r.iR,e)}function b(e,r){var t=N.cI?r[0].toLowerCase():r[0];return e.k.hasOwnProperty(t)&&e.k[t]}function g(e,r,t,n){var a=n?"":w.classPrefix,c='<span class="'+a,i=t?"":"</span>";return c+=e+'">',c+r+i}function p(){if(!M.k)return r(B);var e="",t=0;M.lR.lastIndex=0;for(var n=M.lR.exec(B);n;){e+=r(B.substr(t,n.index-t));var a=b(M,n);a?(L+=a[1],e+=g(a[0],r(n[0]))):e+=r(n[0]),t=M.lR.lastIndex,n=M.lR.exec(B)}return e+r(B.substr(t))}function h(){var e="string"==typeof M.sL;if(e&&!y[M.sL])return r(B);var t=e?l(M.sL,B,!0,R[M.sL]):f(B,M.sL.length?M.sL:void 0);return M.r>0&&(L+=t.r),e&&(R[M.sL]=t.top),g(t.language,t.value,!1,!0)}function d(){return void 0!==M.sL?h():p()}function m(e,t){var n=e.cN?g(e.cN,"",!0):"";e.rB?(x+=n,B=""):e.eB?(x+=r(t)+n,B=""):(x+=n,B=t),M=Object.create(e,{parent:{value:M}})}function v(e,t){if(B+=e,void 0===t)return x+=d(),0;var n=i(t,M);if(n)return x+=d(),m(n,t),n.rB?0:t.length;var a=o(M,t);if(a){var c=M;c.rE||c.eE||(B+=t),x+=d();do M.cN&&(x+="</span>"),L+=M.r,M=M.parent;while(M!=a.parent);return c.eE&&(x+=r(t)),B="",a.starts&&m(a.starts,""),c.rE?0:t.length}if(s(t,M))throw new Error('Illegal lexeme "'+t+'" for mode "'+(M.cN||"<unnamed>")+'"');return B+=t,t.length||1}var N=E(e);if(!N)throw new Error('Unknown language: "'+e+'"');u(N);var C,M=c||N,R={},x="";for(C=M;C!=N;C=C.parent)C.cN&&(x=g(C.cN,"",!0)+x);var B="",L=0;try{for(var S,A,k=0;M.t.lastIndex=k,S=M.t.exec(t),S;)A=v(t.substr(k,S.index-k),S[0]),k=S.index+A;for(v(t.substr(k)),C=M;C.parent;C=C.parent)C.cN&&(x+="</span>");return{r:L,value:x,language:e,top:M}}catch(I){if(-1!=I.message.indexOf("Illegal"))return{r:0,value:r(t)};throw I}}function f(e,t){t=t||w.languages||Object.keys(y);var n={r:0,value:r(e)},a=n;return t.forEach(function(r){if(E(r)){var t=l(r,e,!1);t.language=r,t.r>a.r&&(a=t),t.r>n.r&&(a=n,n=t)}}),a.language&&(n.second_best=a),n}function b(e){return w.tabReplace&&(e=e.replace(/^((<[^>]+>|\t)+)/gm,function(e,r){return r.replace(/\t/g,w.tabReplace)})),w.useBR&&(e=e.replace(/\n/g,"<br>")),e}function g(e,r,t){var n=r?C[r]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(n)&&a.push(n),a.join(" ").trim()}function p(e){var r=c(e);if(!a(r)){var t;w.useBR?(t=document.createElementNS("http://www.w3.org/1999/xhtml","div"),t.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):t=e;var n=t.textContent,i=r?l(r,n,!0):f(n),u=o(t);if(u.length){var p=document.createElementNS("http://www.w3.org/1999/xhtml","div");p.innerHTML=i.value,i.value=s(u,o(p),n)}i.value=b(i.value),e.innerHTML=i.value,e.className=g(e.className,r,i.language),e.result={language:i.language,re:i.r},i.second_best&&(e.second_best={language:i.second_best.language,re:i.second_best.r})}}function h(e){w=i(w,e)}function d(){if(!d.called){d.called=!0;var e=document.querySelectorAll("pre code");Array.prototype.forEach.call(e,p)}}function m(){addEventListener("DOMContentLoaded",d,!1),addEventListener("load",d,!1)}function v(r,t){var n=y[r]=t(e);n.aliases&&n.aliases.forEach(function(e){C[e]=r})}function N(){return Object.keys(y)}function E(e){return e=(e||"").toLowerCase(),y[e]||y[C[e]]}var w={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},y={},C={};return e.highlight=l,e.highlightAuto=f,e.fixMarkup=b,e.highlightBlock=p,e.configure=h,e.initHighlighting=d,e.initHighlightingOnLoad=m,e.registerLanguage=v,e.listLanguages=N,e.getLanguage=E,e.inherit=i,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/},e.C=function(r,t,n){var a=e.inherit({cN:"comment",b:r,e:t,c:[]},n||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e}),hljs.registerLanguage("json",function(e){var r={literal:"true false null"},t=[e.QSM,e.CNM],n={e:",",eW:!0,eE:!0,c:t,k:r},a={b:"{",e:"}",c:[{cN:"attr",b:'\\s*"',e:'"\\s*:\\s*',eB:!0,eE:!0,c:[e.BE],i:"\\n",starts:n}],i:"\\S"},c={b:"\\[",e:"\\]",c:[e.inherit(n)],i:"\\S"};return t.splice(t.length,0,a,c),{c:t,k:r,i:"\\S"}}),hljs.registerLanguage("xml",function(e){var r="[A-Za-z0-9\\._:-]+",t={b:/<\?(php)?(?!\w)/,e:/\?>/,sL:"php"},n={eW:!0,i:/</,r:0,c:[t,{cN:"attr",b:r,r:0},{b:"=",r:0,c:[{cN:"string",c:[t],v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s\/>]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},e.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[n],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[n],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},t,{cN:"meta",b:/<\?\w+/,e:/\?>/,r:10},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},n]}]}}),hljs.registerLanguage("javascript",function(e){return{aliases:["js"],k:{keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},c:[{cN:"meta",r:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/</,e:/>\s*[);\]]/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[e.CLCM,e.CBCM]}],i:/\[|%/},{b:/\$[(.]/},{b:"\\."+e.IR,r:0},{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor",e:/\{/,eE:!0}],i:/#(?!!)/}}),hljs.registerLanguage("css",function(e){var r="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\s*\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",c:[{cN:"keyword",b:/\S+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:r,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.9.1.0.pack_extended.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.9.1.0.pack_extended.js
new file mode 100644
index 00000000000..162a224ddd6
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.9.1.0.pack_extended.js
@@ -0,0 +1 @@
+"use strict";!function(){var h,l;h=hljs.configure,hljs.configure=function(l){var i=l.highlightSizeThreshold;hljs.highlightSizeThreshold=i===+i?i:null,h.call(this,l)},l=hljs.highlightBlock,hljs.highlightBlock=function(h){var i=h.innerHTML,g=hljs.highlightSizeThreshold;(null==g||g>i.length)&&l.call(hljs,h)}}();
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js
index 066d72c7e3a..e2e2b7f754f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js
@@ -1,2 +1,3 @@
-/*! jQuery v@1.8.0 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bX(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bV.length;while(e--){b=bV[e]+c;if(b in a)return b}return d}function bY(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function bZ(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bY(c)&&(e[f]=p._data(c,"olddisplay",cb(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b$(a,b,c){var d=bO.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function b_(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bU[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bU[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bU[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bU[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bU[e]+"Width"))||0));return f}function ca(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bP.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+b_(a,b,c||(f?"border":"content"),e)+"px"}function cb(a){if(bR[a])return bR[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bR[a]=c,c}function ch(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||cd.test(a)?d(a,e):ch(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ch(a+"["+e+"]",b[e],c,d);else d(a,b)}function cy(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cz(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cu;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cz(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cz(a,c,d,e,"*",g)),h}function cA(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cB(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cC(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function cK(){try{return new a.XMLHttpRequest}catch(b){}}function cL(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cT(){return setTimeout(function(){cM=b},0),cM=p.now()}function cU(a,b){p.each(b,function(b,c){var d=(cS[b]||[]).concat(cS["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cV(a,b,c){var d,e=0,f=0,g=cR.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cM||cT(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cM||cT(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cW(k,j.opts.specialEasing);for(;e<g;e++){d=cR[e].call(j,a,k,j.opts);if(d)return d}return cU(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cW(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cX(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bY(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cb(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cO.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cY(a,b,c,d,e){return new cY.prototype.init(a,b,c,d,e)}function cZ(a,b){var c,d={height:a},e=0;for(;e<4;e+=2-b)c=bU[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function c_(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=r.test(" ")?/^[\s\xA0]+|[\s\xA0]+$/g:/^\s+|\s+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.0",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)continue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":a.toString().replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||f.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete"||e.readyState!=="loading"&&e.addEventListener)setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){p.isFunction(c)&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/^(?:\{.*\}|\[.*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")===0&&(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.shift(),e=p._queueHooks(a,b),f=function(){p.dequeue(a,b)};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),delete e.stop,d.call(a,f,e)),!c.length&&e&&e.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)(d=p._data(g[h],a+"queueHooks"))&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)~f.indexOf(" "+b[g]+" ")||(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,k,l,m,n,o=(p._data(this,"events")||{})[c.type]||[],q=o.delegateCount,r=[].slice.call(arguments),s=!c.exclusive&&!c.namespace,t=p.event.special[c.type]||{},u=[];r[0]=c,c.delegateTarget=this;if(t.preDispatch&&t.preDispatch.call(this,c)===!1)return;if(q&&(!c.button||c.type!=="click")){g=p(this),g.context=this;for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){i={},k=[],g[0]=f;for(d=0;d<q;d++)l=o[d],m=l.selector,i[m]===b&&(i[m]=g.is(m)),i[m]&&k.push(l);k.length&&u.push({elem:f,matches:k})}}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d<u.length&&!c.isPropagationStopped();d++){j=u[d],c.currentTarget=j.elem;for(e=0;e<j.matches.length&&!c.isImmediatePropagationStopped();e++){l=j.matches[e];if(s||!c.namespace&&!l.namespace||c.namespace_re&&c.namespace_re.test(l.namespace))c.data=l.data,c.handleObj=l,h=((p.event.special[l.origType]||{}).handle||l.handler).apply(j.elem,r),h!==b&&(c.result=h,h===!1&&(c.preventDefault(),c.stopPropagation()))}}return t.postDispatch&&t.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{ready:{setup:p.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simulate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bd(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)Z(a,b[e],c,d)}function be(a,b,c,d,e,f){var g,h=$.setFilters[b.toLowerCase()];return h||Z.error(b),(a||!(g=e))&&bd(a||"*",d,g=[],e),g.length>0?h(g,c,f):[]}function bf(a,c,d,e,f){var g,h,i,j,k,l,m,n,p=0,q=f.length,s=L.POS,t=new RegExp("^"+s.source+"(?!"+r+")","i"),u=function(){var a=1,c=arguments.length-2;for(;a<c;a++)arguments[a]===b&&(g[a]=b)};for(;p<q;p++){s.exec(""),a=f[p],j=[],i=0,k=e;while(g=s.exec(a)){n=s.lastIndex=g.index+g[0].length;if(n>i){m=a.slice(i,g.index),i=n,l=[c],B.test(m)&&(k&&(l=k),k=e);if(h=H.test(m))m=m.slice(0,-5).replace(B,"$&*");g.length>1&&g[0].replace(t,u),k=be(m,g[1],g[2],l,k,h)}}k?(j=j.concat(k),(m=a.slice(i))&&m!==")"?B.test(m)?bd(m,j,d,e):Z(m,c,d,e?e.concat(k):k):o.apply(d,j)):Z(a,c,d,e)}return q===1?d:Z.uniqueSort(d)}function bg(a,b,c){var d,e,f,g=[],i=0,j=D.exec(a),k=!j.pop()&&!j.pop(),l=k&&a.match(C)||[""],m=$.preFilter,n=$.filter,o=!c&&b!==h;for(;(e=l[i])!=null&&k;i++){g.push(d=[]),o&&(e=" "+e);while(e){k=!1;if(j=B.exec(e))e=e.slice(j[0].length),k=d.push({part:j.pop().replace(A," "),captures:j});for(f in n)(j=L[f].exec(e))&&(!m[f]||(j=m[f](j,b,c)))&&(e=e.slice(j.shift().length),k=d.push({part:f,captures:j}));if(!k)break}}return k||Z.error(a),g}function bh(a,b,e){var f=b.dir,g=m++;return a||(a=function(a){return a===e}),b.first?function(b,c){while(b=b[f])if(b.nodeType===1)return a(b,c)&&b}:function(b,e){var h,i=g+"."+d,j=i+"."+c;while(b=b[f])if(b.nodeType===1){if((h=b[q])===j)return b.sizset;if(typeof h=="string"&&h.indexOf(i)===0){if(b.sizset)return b}else{b[q]=j;if(a(b,e))return b.sizset=!0,b;b.sizset=!1}}}}function bi(a,b){return a?function(c,d){var e=b(c,d);return e&&a(e===!0?c:e,d)}:b}function bj(a,b,c){var d,e,f=0;for(;d=a[f];f++)$.relative[d.part]?e=bh(e,$.relative[d.part],b):(d.captures.push(b,c),e=bi(e,$.filter[d.part].apply(null,d.captures)));return e}function bk(a){return function(b,c){var d,e=0;for(;d=a[e];e++)if(d(b,c))return!0;return!1}}var c,d,e,f,g,h=a.document,i=h.documentElement,j="undefined",k=!1,l=!0,m=0,n=[].slice,o=[].push,q=("sizcache"+Math.random()).replace(".",""),r="[\\x20\\t\\r\\n\\f]",s="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",t=s.replace("w","w#"),u="([*^$|!~]?=)",v="\\["+r+"*("+s+")"+r+"*(?:"+u+r+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+t+")|)|)"+r+"*\\]",w=":("+s+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|((?:[^,]|\\\\,|(?:,(?=[^\\[]*\\]))|(?:,(?=[^\\(]*\\))))*))\\)|)",x=":(nth|eq|gt|lt|first|last|even|odd)(?:\\((\\d*)\\)|)(?=[^-]|$)",y=r+"*([\\x20\\t\\r\\n\\f>+~])"+r+"*",z="(?=[^\\x20\\t\\r\\n\\f])(?:\\\\.|"+v+"|"+w.replace(2,7)+"|[^\\\\(),])+",A=new RegExp("^"+r+"+|((?:^|[^\\\\])(?:\\\\.)*)"+r+"+$","g"),B=new RegExp("^"+y),C=new RegExp(z+"?(?="+r+"*,|$)","g"),D=new RegExp("^(?:(?!,)(?:(?:^|,)"+r+"*"+z+")*?|"+r+"*(.*?))(\\)|$)"),E=new RegExp(z.slice(19,-6)+"\\x20\\t\\r\\n\\f>+~])+|"+y,"g"),F=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,G=/[\x20\t\r\n\f]*[+~]/,H=/:not\($/,I=/h\d/i,J=/input|select|textarea|button/i,K=/\\(?!\\)/g,L={ID:new RegExp("^#("+s+")"),CLASS:new RegExp("^\\.("+s+")"),NAME:new RegExp("^\\[name=['\"]?("+s+")['\"]?\\]"),TAG:new RegExp("^("+s.replace("[-","[-\\*")+")"),ATTR:new RegExp("^"+v),PSEUDO:new RegExp("^"+w),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+r+"*(even|odd|(([+-]|)(\\d*)n|)"+r+"*(?:([+-]|)"+r+"*(\\d+)|))"+r+"*\\)|)","i"),POS:new RegExp(x,"ig"),needsContext:new RegExp("^"+r+"*[>+~]|"+x,"i")},M={},N=[],O={},P=[],Q=function(a){return a.sizzleFilter=!0,a},R=function(a){return function(b){return b.nodeName.toLowerCase()==="input"&&b.type===a}},S=function(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}},T=function(a){var b=!1,c=h.createElement("div");try{b=a(c)}catch(d){}return c=null,b},U=T(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),V=T(function(a){a.id=q+0,a.innerHTML="<a name='"+q+"'></a><div name='"+q+"'></div>",i.insertBefore(a,i.firstChild);var b=h.getElementsByName&&h.getElementsByName(q).length===2+h.getElementsByName(q+0).length;return g=!h.getElementById(q),i.removeChild(a),b}),W=T(function(a){return a.appendChild(h.createComment("")),a.getElementsByTagName("*").length===0}),X=T(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==j&&a.firstChild.getAttribute("href")==="#"}),Y=T(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||a.getElementsByClassName("e").length===0?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length!==1)}),Z=function(a,b,c,d){c=c||[],b=b||h;var e,f,g,i,j=b.nodeType;if(j!==1&&j!==9)return[];if(!a||typeof a!="string")return c;g=ba(b);if(!g&&!d)if(e=F.exec(a))if(i=e[1]){if(j===9){f=b.getElementById(i);if(!f||!f.parentNode)return c;if(f.id===i)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(i))&&bb(b,f)&&f.id===i)return c.push(f),c}else{if(e[2])return o.apply(c,n.call(b.getElementsByTagName(a),0)),c;if((i=e[3])&&Y&&b.getElementsByClassName)return o.apply(c,n.call(b.getElementsByClassName(i),0)),c}return bm(a,b,c,d,g)},$=Z.selectors={cacheLength:50,match:L,order:["ID","TAG"],attrHandle:{},createPseudo:Q,find:{ID:g?function(a,b,c){if(typeof b.getElementById!==j&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==j&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==j&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:W?function(a,b){if(typeof b.getElementsByTagName!==j)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(K,""),a[3]=(a[4]||a[5]||"").replace(K,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||Z.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&Z.error(a[0]),a},PSEUDO:function(a){var b,c=a[4];return L.CHILD.test(a[0])?null:(c&&(b=D.exec(c))&&b.pop()&&(a[0]=a[0].slice(0,b[0].length-c.length-1),c=b[0].slice(0,-1)),a.splice(2,3,c||a[3]),a)}},filter:{ID:g?function(a){return a=a.replace(K,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(K,""),function(b){var c=typeof b.getAttributeNode!==j&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(K,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=M[a];return b||(b=M[a]=new RegExp("(^|"+r+")"+a+"("+r+"|$)"),N.push(a),N.length>$.cacheLength&&delete M[N.shift()]),function(a){return b.test(a.className||typeof a.getAttribute!==j&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=Z.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return Z.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=m++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[q]!==e||!a.sizset)){for(h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[q]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e=$.pseudos[a]||$.pseudos[a.toLowerCase()];return e||Z.error("unsupported pseudo: "+a),e.sizzleFilter?e(b,c,d):e}},pseudos:{not:Q(function(a,b,c){var d=bl(a.replace(A,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!$.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:Q(function(a){return function(b){return(b.textContent||b.innerText||bc(b)).indexOf(a)>-1}}),has:Q(function(a){return function(b){return Z(a,b).length>0}}),header:function(a){return I.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:R("radio"),checkbox:R("checkbox"),file:R("file"),password:R("password"),image:R("image"),submit:S("submit"),reset:S("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return J.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(a,b,c){var d=[],e=c?1:0,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},odd:function(a,b,c){var d=[],e=c?0:1,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},lt:function(a,b,c){return c?a.slice(+b):a.slice(0,+b)},gt:function(a,b,c){return c?a.slice(0,+b+1):a.slice(+b+1)},eq:function(a,b,c){var d=a.splice(+b,1);return c?a:d}}};$.setFilters.nth=$.setFilters.eq,$.filters=$.pseudos,X||($.attrHandle={href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}}),V&&($.order.push("NAME"),$.find.NAME=function(a,b){if(typeof b.getElementsByName!==j)return b.getElementsByName(a)}),Y&&($.order.splice(1,0,"CLASS"),$.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!==j&&!c)return b.getElementsByClassName(a)});try{n.call(i.childNodes,0)[0].nodeType}catch(_){n=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}var ba=Z.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},bb=Z.contains=i.compareDocumentPosition?function(a,b){return!!(a.compareDocumentPosition(b)&16)}:i.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc=Z.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=bc(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=bc(b);return c};Z.attr=function(a,b){var c,d=ba(a);return d||(b=b.toLowerCase()),$.attrHandle[b]?$.attrHandle[b](a):U||d?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},Z.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},[0,0].sort(function(){return l=0}),i.compareDocumentPosition?e=function(a,b){return a===b?(k=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:(e=function(a,b){if(a===b)return k=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],g=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return f(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)g.unshift(j),j=j.parentNode;c=e.length,d=g.length;for(var l=0;l<c&&l<d;l++)if(e[l]!==g[l])return f(e[l],g[l]);return l===c?f(a,g[l],-1):f(e[l],b,1)},f=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),Z.uniqueSort=function(a){var b,c=1;if(e){k=l,a.sort(e);if(k)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1)}return a};var bl=Z.compile=function(a,b,c){var d,e,f,g=O[a];if(g&&g.context===b)return g;e=bg(a,b,c);for(f=0;d=e[f];f++)e[f]=bj(d,b,c);return g=O[a]=bk(e),g.context=b,g.runs=g.dirruns=0,P.push(a),P.length>$.cacheLength&&delete O[P.shift()],g};Z.matches=function(a,b){return Z(a,null,null,b)},Z.matchesSelector=function(a,b){return Z(b,null,null,[a]).length>0};var bm=function(a,b,e,f,g){a=a.replace(A,"$1");var h,i,j,k,l,m,p,q,r,s=a.match(C),t=a.match(E),u=b.nodeType;if(L.POS.test(a))return bf(a,b,e,f,s);if(f)h=n.call(f,0);else if(s&&s.length===1){if(t.length>1&&u===9&&!g&&(s=L.ID.exec(t[0]))){b=$.find.ID(s[1],b,g)[0];if(!b)return e;a=a.slice(t.shift().length)}q=(s=G.exec(t[0]))&&!s.index&&b.parentNode||b,r=t.pop(),m=r.split(":not")[0];for(j=0,k=$.order.length;j<k;j++){p=$.order[j];if(s=L[p].exec(m)){h=$.find[p]((s[1]||"").replace(K,""),q,g);if(h==null)continue;m===r&&(a=a.slice(0,a.length-r.length)+m.replace(L[p],""),a||o.apply(e,n.call(h,0)));break}}}if(a){i=bl(a,b,g),d=i.dirruns++,h==null&&(h=$.find.TAG("*",G.test(a)&&b.parentNode||b));for(j=0;l=h[j];j++)c=i.runs++,i(l,b)&&e.push(l)}return e};h.querySelectorAll&&function(){var a,b=bm,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[],f=[":active"],g=i.matchesSelector||i.mozMatchesSelector||i.webkitMatchesSelector||i.oMatchesSelector||i.msMatchesSelector;T(function(a){a.innerHTML="<select><option selected></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+r+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+r+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bm=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return o.apply(f,n.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j=d.getAttribute("id"),k=j||q,l=G.test(a)&&d.parentNode||d;j?k=k.replace(c,"\\$&"):d.setAttribute("id",k);try{return o.apply(f,n.call(l.querySelectorAll(a.replace(C,"[id='"+k+"'] $&")),0)),f}catch(i){}finally{j||d.removeAttribute("id")}}return b(a,d,f,g,h)},g&&(T(function(b){a=g.call(b,"div");try{g.call(b,"[test!='']:sizzle"),f.push($.match.PSEUDO)}catch(c){}}),f=new RegExp(f.join("|")),Z.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!ba(b)&&!f.test(c)&&(!e||!e.test(c)))try{var h=g.call(b,c);if(h||a||b.document&&b.document.nodeType!==11)return h}catch(i){}return Z(c,null,null,[b]).length>0})}(),Z.attr=p.attr,p.find=Z,p.expr=Z.selectors,p.expr[":"]=p.expr.pseudos,p.unique=Z.uniqueSort,p.text=Z.getText,p.isXMLDoc=Z.isXML,p.contains=Z.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new RegExp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=(c[0]||c).ownerDocument||c[0]||c,typeof c.createDocumentFragment=="undefined"&&(c=e),a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=0,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(g=b===e&&bA;(h=a[s])!=null;s++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{g=g||bk(b),l=l||g.appendChild(b.createElement("div")),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(f=n.length-1;f>=0;--f)p.nodeName(n[f],"tbody")&&!n[f].childNodes.length&&n[f].parentNode.removeChild(n[f])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l=g.lastChild}h.nodeType?t.push(h):t=p.merge(t,h)}l&&(g.removeChild(l),h=l=g=null);if(!p.support.appendChecked)for(s=0;(h=t[s])!=null;s++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(s=0;(h=t[s])!=null;s++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[s+1,0].concat(r)),s+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^margin/,bO=new RegExp("^("+q+")(.*)$","i"),bP=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bQ=new RegExp("^([-+])=("+q+")","i"),bR={},bS={position:"absolute",visibility:"hidden",display:"block"},bT={letterSpacing:0,fontWeight:400,lineHeight:1},bU=["Top","Right","Bottom","Left"],bV=["Webkit","O","Moz","ms"],bW=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return bZ(this,!0)},hide:function(){return bZ(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bW.apply(this,arguments):this.each(function(){(c?a:bY(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bX(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bQ.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bX(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bT&&(f=bT[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(a,b){var c,d,e,f,g=getComputedStyle(a,null),h=a.style;return g&&(c=g[b],c===""&&!p.contains(a.ownerDocument.documentElement,a)&&(c=p.style(a,b)),bP.test(c)&&bN.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=c,c=g.width,h.width=d,h.minWidth=e,h.maxWidth=f)),c}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bP.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0||bH(a,"display")!=="none"?ca(a,b,d):p.swap(a,bS,function(){return ca(a,b,d)})},set:function(a,c,d){return b$(a,c,d?b_(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bP.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bU[d]+b]=e[d]||e[d-2]||e[0];return f}},bN.test(a)||(p.cssHooks[a+b].set=b$)});var cc=/%20/g,cd=/\[\]$/,ce=/\r?\n/g,cf=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,cg=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||cg.test(this.nodeName)||cf.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(ce,"\r\n")}}):{name:b.name,value:c.replace(ce,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ch(d,a[d],c,f);return e.join("&").replace(cc,"+")};var ci,cj,ck=/#.*$/,cl=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cm=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,cn=/^(?:GET|HEAD)$/,co=/^\/\//,cp=/\?/,cq=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cr=/([?&])_=[^&]*/,cs=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,ct=p.fn.load,cu={},cv={},cw=["*/"]+["*"];try{ci=f.href}catch(cx){ci=e.createElement("a"),ci.href="",ci=ci.href}cj=cs.exec(ci.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&ct)return ct.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cq,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cA(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cA(a,b),a},ajaxSettings:{url:ci,isLocal:cm.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cw},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cy(cu),ajaxTransport:cy(cv),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cB(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cC(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cl.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(ck,"").replace(co,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=cs.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==cj[1]&&i[2]==cj[2]&&(i[3]||(i[1]==="http:"?80:443))==(cj[3]||(cj[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cz(cu,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!cn.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cp.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cr,"$1_="+z);l.url=A+(A===l.url?(cp.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cw+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cz(cv,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cD=[],cE=/\?/,cF=/(=)\?(?=&|$)|\?\?/,cG=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cD.pop()||p.expando+"_"+cG++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cF.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cF.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cF,"$1"+f):m?c.data=i.replace(cF,"$1"+f):k&&(c.url+=(cE.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cD.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cH,cI=a.ActiveXObject?function(){for(var a in cH)cH[a](0,1)}:!1,cJ=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cK()||cL()}:cK,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cI&&delete cH[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cJ,cI&&(cH||(cH={},p(a).unload(cI)),cH[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cM,cN,cO=/^(?:toggle|show|hide)$/,cP=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cQ=/queueHooks$/,cR=[cX],cS={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cP.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cV,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cS[c]=cS[c]||[],cS[c].unshift(b)},prefilter:function(a,b){b?cR.unshift(a):cR.push(a)}}),p.Tween=cY,cY.prototype={constructor:cY,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cY.propHooks[this.prop];return a&&a.get?a.get(this):cY.propHooks._default.get(this)},run:function(a){var b,c=cY.propHooks[this.prop];return this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration),this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cY.propHooks._default.set(this),this}},cY.prototype.init.prototype=cY.prototype,cY.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cY.propHooks.scrollTop=cY.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,arguments):this.animate(cZ(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bY).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cV(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cQ.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:cZ("show"),slideUp:cZ("hide"),slideToggle:cZ("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in p.fx.speeds?p.fx.speeds[d.duration]:p.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";return d.old=d.complete,d.complete=function(){p.isFunction(d.old)&&d.old.call(this),d.queue&&p.dequeue(this,d.queue)},d},p.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},p.timers=[],p.fx=cY.prototype.init,p.fx.tick=function(){var a,b=p.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||p.fx.stop()},p.fx.timer=function(a){a()&&p.timers.push(a)&&!cN&&(cN=setInterval(p.fx.tick,p.fx.interval))},p.fx.interval=13,p.fx.stop=function(){clearInterval(cN),cN=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fx.step={},p.expr&&p.expr.filters&&(p.expr.filters.animated=function(a){return p.grep(p.timers,function(b){return a===b.elem}).length});var c$=/^(?:body|html)$/i;p.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){p.offset.setOffset(this,a,b)});var c,d,e,f,g,h,i,j,k,l,m=this[0],n=m&&m.ownerDocument;if(!n)return;return(e=n.body)===m?p.offset.bodyOffset(m):(d=n.documentElement,p.contains(d,m)?(c=m.getBoundingClientRect(),f=c_(n),g=d.clientTop||e.clientTop||0,h=d.clientLeft||e.clientLeft||0,i=f.pageYOffset||d.scrollTop,j=f.pageXOffset||d.scrollLeft,k=c.top+i-g,l=c.left+j-h,{top:k,left:l}):{top:0,left:0})},p.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;return p.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(p.css(a,"marginTop"))||0,c+=parseFloat(p.css(a,"marginLeft"))||0),{top:b,left:c}},setOffset:function(a,b,c){var d=p.css(a,"position");d==="static"&&(a.style.position="relative");var e=p(a),f=e.offset(),g=p.css(a,"top"),h=p.css(a,"left"),i=(d==="absolute"||d==="fixed")&&p.inArray("auto",[g,h])>-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c$.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c$.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=c_(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
+!function(e,t){function n(e){var t=he[e]={};return K.each(e.split(te),function(e,n){t[n]=!0}),t}function r(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(me,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r||"false"!==r&&("null"===r?null:+r+""===r?+r:ge.test(r)?K.parseJSON(r):r)}catch(o){}K.data(e,n,r)}else r=t}return r}function i(e){var t;for(t in e)if(("data"!==t||!K.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function o(){return!1}function a(){return!0}function s(e){return!e||!e.parentNode||11===e.parentNode.nodeType}function l(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function u(e,t,n){if(t=t||0,K.isFunction(t))return K.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return K.grep(e,function(e,r){return e===t===n});if("string"==typeof t){var r=K.grep(e,function(e){return 1===e.nodeType});if(_e.test(t))return K.filter(t,r,!n);t=K.filter(t,r)}return K.grep(e,function(e,r){return K.inArray(e,t)>=0===n})}function c(e){var t=We.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function f(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function p(e,t){if(1===t.nodeType&&K.hasData(e)){var n,r,i,o=K._data(e),a=K._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;r<i;r++)K.event.add(t,n,s[n][r])}a.data&&(a.data=K.extend({},a.data))}}function d(e,t){var n;1===t.nodeType&&(t.clearAttributes&&t.clearAttributes(),t.mergeAttributes&&t.mergeAttributes(e),n=t.nodeName.toLowerCase(),"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),K.support.html5Clone&&e.innerHTML&&!K.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ve.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.selected=e.defaultSelected:"input"===n||"textarea"===n?t.defaultValue=e.defaultValue:"script"===n&&t.text!==e.text&&(t.text=e.text),t.removeAttribute(K.expando))}function h(e){return"undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName("*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll("*"):[]}function g(e){Ve.test(e.type)&&(e.defaultChecked=e.checked)}function m(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=mt.length;i--;)if(t=mt[i]+n,t in e)return t;return r}function y(e,t){return e=t||e,"none"===K.css(e,"display")||!K.contains(e.ownerDocument,e)}function v(e,t){for(var n,r,i=[],o=0,a=e.length;o<a;o++)n=e[o],n.style&&(i[o]=K._data(n,"olddisplay"),t?(!i[o]&&"none"===n.style.display&&(n.style.display=""),""===n.style.display&&y(n)&&(i[o]=K._data(n,"olddisplay",T(n.nodeName)))):(r=nt(n,"display"),!i[o]&&"none"!==r&&K._data(n,"olddisplay",r)));for(o=0;o<a;o++)n=e[o],n.style&&(t&&"none"!==n.style.display&&""!==n.style.display||(n.style.display=t?i[o]||"":"none"));return e}function b(e,t,n){var r=ut.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function x(e,t,n,r){for(var i=n===(r?"border":"content")?4:"width"===t?1:0,o=0;i<4;i+=2)"margin"===n&&(o+=K.css(e,n+gt[i],!0)),r?("content"===n&&(o-=parseFloat(nt(e,"padding"+gt[i]))||0),"margin"!==n&&(o-=parseFloat(nt(e,"border"+gt[i]+"Width"))||0)):(o+=parseFloat(nt(e,"padding"+gt[i]))||0,"padding"!==n&&(o+=parseFloat(nt(e,"border"+gt[i]+"Width"))||0));return o}function w(e,t,n){var r="width"===t?e.offsetWidth:e.offsetHeight,i=!0,o=K.support.boxSizing&&"border-box"===K.css(e,"boxSizing");if(r<=0){if(r=nt(e,t),(r<0||null==r)&&(r=e.style[t]),ct.test(r))return r;i=o&&(K.support.boxSizingReliable||r===e.style[t]),r=parseFloat(r)||0}return r+x(e,t,n||(o?"border":"content"),i)+"px"}function T(e){if(pt[e])return pt[e];var t=K("<"+e+">").appendTo(R.body),n=t.css("display");return t.remove(),"none"!==n&&""!==n||(rt=R.body.appendChild(rt||K.extend(R.createElement("iframe"),{frameBorder:0,width:0,height:0})),it&&rt.createElement||(it=(rt.contentWindow||rt.contentDocument).document,it.write("<!doctype html><html><body>"),it.close()),t=it.body.appendChild(it.createElement(e)),n=nt(t,"display"),R.body.removeChild(rt)),pt[e]=n,n}function N(e,t,n,r){var i;if(K.isArray(t))K.each(t,function(t,i){n||bt.test(e)?r(e,i):N(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==K.type(t))r(e,t);else for(i in t)N(e+"["+i+"]",t[i],n,r)}function C(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i,o,a=t.toLowerCase().split(te),s=0,l=a.length;if(K.isFunction(n))for(;s<l;s++)r=a[s],o=/^\+/.test(r),o&&(r=r.substr(1)||"*"),i=e[r]=e[r]||[],i[o?"unshift":"push"](n)}}function E(e,n,r,i,o,a){o=o||n.dataTypes[0],a=a||{},a[o]=!0;for(var s,l=e[o],u=0,c=l?l.length:0,f=e===Ot;u<c&&(f||!s);u++)s=l[u](n,r,i),"string"==typeof s&&(!f||a[s]?s=t:(n.dataTypes.unshift(s),s=E(e,n,r,i,s,a)));return(f||!s)&&!a["*"]&&(s=E(e,n,r,i,"*",a)),s}function k(e,n){var r,i,o=K.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((o[r]?e:i||(i={}))[r]=n[r]);i&&K.extend(!0,e,i)}function S(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes,c=e.responseFields;for(o in c)o in r&&(n[c[o]]=r[o]);for(;"*"===u[0];)u.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("content-type"));if(i)for(o in l)if(l[o]&&l[o].test(i)){u.unshift(o);break}if(u[0]in r)a=u[0];else{for(o in r){if(!u[0]||e.converters[o+" "+u[0]]){a=o;break}s||(s=o)}a=a||s}if(a)return a!==u[0]&&u.unshift(a),r[a]}function A(e,t){var n,r,i,o,a=e.dataTypes.slice(),s=a[0],l={},u=0;if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),a[1])for(n in e.converters)l[n.toLowerCase()]=e.converters[n];for(;i=a[++u];)if("*"!==i){if("*"!==s&&s!==i){if(n=l[s+" "+i]||l["* "+i],!n)for(r in l)if(o=r.split(" "),o[1]===i&&(n=l[s+" "+o[0]]||l["* "+o[0]])){n===!0?n=l[r]:l[r]!==!0&&(i=o[0],a.splice(u--,0,i));break}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(c){return{state:"parsererror",error:n?c:"No conversion from "+s+" to "+i}}}s=i}return{state:"success",data:t}}function j(){try{return new e.XMLHttpRequest}catch(t){}}function D(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function L(){return setTimeout(function(){Ut=t},0),Ut=K.now()}function H(e,t){K.each(t,function(t,n){for(var r=(Kt[t]||[]).concat(Kt["*"]),i=0,o=r.length;i<o;i++)if(r[i].call(e,t,n))return})}function F(e,t,n){var r,i=0,o=Qt.length,a=K.Deferred().always(function(){delete s.elem}),s=function(){for(var t=Ut||L(),n=Math.max(0,l.startTime+l.duration-t),r=1-(n/l.duration||0),i=0,o=l.tweens.length;i<o;i++)l.tweens[i].run(r);return a.notifyWith(e,[l,r,n]),r<1&&o?n:(a.resolveWith(e,[l]),!1)},l=a.promise({elem:e,props:K.extend({},t),opts:K.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Ut||L(),duration:n.duration,tweens:[],createTween:function(t,n,r){var i=K.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(i),i},stop:function(t){for(var n=0,r=t?l.tweens.length:0;n<r;n++)l.tweens[n].run(1);return t?a.resolveWith(e,[l,t]):a.rejectWith(e,[l,t]),this}}),u=l.props;for(M(u,l.opts.specialEasing);i<o;i++)if(r=Qt[i].call(l,e,u,l.opts))return r;return H(l,u),K.isFunction(l.opts.start)&&l.opts.start.call(e,l),K.fx.timer(K.extend(s,{anim:l,queue:l.opts.queue,elem:e})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function M(e,t){var n,r,i,o,a;for(n in e)if(r=K.camelCase(n),i=t[r],o=e[n],K.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=K.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function O(e,t,n){var r,i,o,a,s,l,u,c,f=this,p=e.style,d={},h=[],g=e.nodeType&&y(e);n.queue||(u=K._queueHooks(e,"fx"),null==u.unqueued&&(u.unqueued=0,c=u.empty.fire,u.empty.fire=function(){u.unqueued||c()}),u.unqueued++,f.always(function(){f.always(function(){u.unqueued--,K.queue(e,"fx").length||u.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===K.css(e,"display")&&"none"===K.css(e,"float")&&(K.support.inlineBlockNeedsLayout&&"inline"!==T(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",K.support.shrinkWrapBlocks||f.done(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(o=t[r],Jt.exec(o)){if(delete t[r],o===(g?"hide":"show"))continue;h.push(r)}if(a=h.length)for(s=K._data(e,"fxshow")||K._data(e,"fxshow",{}),g?K(e).show():f.done(function(){K(e).hide()}),f.done(function(){var t;K.removeData(e,"fxshow",!0);for(t in d)K.style(e,t,d[t])}),r=0;r<a;r++)i=h[r],l=f.createTween(i,g?s[i]:0),d[i]=s[i]||K.style(e,i),i in s||(s[i]=l.start,g&&(l.end=l.start,l.start="width"===i||"height"===i?1:0))}function _(e,t,n,r,i){return new _.prototype.init(e,t,n,r,i)}function q(e,t){for(var n,r={height:e},i=0;i<4;i+=2-t)n=gt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function B(e){return K.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}var W,P,R=e.document,$=e.location,I=e.navigator,z=e.jQuery,X=e.$,U=Array.prototype.push,Y=Array.prototype.slice,J=Array.prototype.indexOf,V=Object.prototype.toString,G=Object.prototype.hasOwnProperty,Q=String.prototype.trim,K=function(e,t){return new K.fn.init(e,t,W)},Z=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,ee=/\S/,te=/\s+/,ne=ee.test(" ")?/^[\s\xA0]+|[\s\xA0]+$/g:/^\s+|\s+$/g,re=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,ie=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,oe=/^[\],:{}\s]*$/,ae=/(?:^|:|,)(?:\s*\[)+/g,se=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,le=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,ue=/^-ms-/,ce=/-([\da-z])/gi,fe=function(e,t){return(t+"").toUpperCase()},pe=function(){R.addEventListener?(R.removeEventListener("DOMContentLoaded",pe,!1),K.ready()):"complete"===R.readyState&&(R.detachEvent("onreadystatechange",pe),K.ready())},de={};K.fn=K.prototype={constructor:K,init:function(e,n,r){var i,o,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:re.exec(e),i&&(i[1]||!n)){if(i[1])return n=n instanceof K?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:R,e=K.parseHTML(i[1],a,!0),ie.test(i[1])&&K.isPlainObject(n)&&this.attr.call(e,n,!0),K.merge(this,e);if(o=R.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=R,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return K.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),K.makeArray(e,this))},selector:"",jquery:"1.8.0",length:0,size:function(){return this.length},toArray:function(){return Y.call(this)},get:function(e){return null==e?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=K.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,"find"===t?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return K.each(this,e,t)},ready:function(e){return K.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(Y.apply(this,arguments),"slice",Y.call(arguments).join(","))},map:function(e){return this.pushStack(K.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:U,sort:[].sort,splice:[].splice},K.fn.init.prototype=K.fn,K.extend=K.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"!=typeof s&&!K.isFunction(s)&&(s={}),u===l&&(s=this,--l);l<u;l++)if(null!=(e=arguments[l]))for(n in e)r=s[n],i=e[n],s!==i&&(c&&i&&(K.isPlainObject(i)||(o=K.isArray(i)))?(o?(o=!1,a=r&&K.isArray(r)?r:[]):a=r&&K.isPlainObject(r)?r:{},s[n]=K.extend(c,a,i)):i!==t&&(s[n]=i));return s},K.extend({noConflict:function(t){return e.$===K&&(e.$=X),t&&e.jQuery===K&&(e.jQuery=z),K},isReady:!1,readyWait:1,holdReady:function(e){e?K.readyWait++:K.ready(!0)},ready:function(e){if(e===!0?!--K.readyWait:!K.isReady){if(!R.body)return setTimeout(K.ready,1);K.isReady=!0,e!==!0&&--K.readyWait>0||(P.resolveWith(R,[K]),K.fn.trigger&&K(R).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===K.type(e)},isArray:Array.isArray||function(e){return"array"===K.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?String(e):de[V.call(e)]||"object"},isPlainObject:function(e){if(!e||"object"!==K.type(e)||e.nodeType||K.isWindow(e))return!1;try{if(e.constructor&&!G.call(e,"constructor")&&!G.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||G.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return e&&"string"==typeof e?("boolean"==typeof t&&(n=t,t=0),t=t||R,(r=ie.exec(e))?[t.createElement(r[1])]:(r=K.buildFragment([e],t,n?null:[]),K.merge([],(r.cacheable?K.clone(r.fragment):r.fragment).childNodes))):null},parseJSON:function(t){return t&&"string"==typeof t?(t=K.trim(t),e.JSON&&e.JSON.parse?e.JSON.parse(t):oe.test(t.replace(se,"@").replace(le,"]").replace(ae,""))?new Function("return "+t)():void K.error("Invalid JSON: "+t)):null},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&K.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&ee.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(ue,"ms-").replace(ce,fe)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toUpperCase()===t.toUpperCase()},each:function(e,n,r){var i,o=0,a=e.length,s=a===t||K.isFunction(e);if(r)if(s){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;o<a&&n.apply(e[o++],r)!==!1;);else if(s){for(i in e)if(n.call(e[i],i,e[i])===!1)break}else for(;o<a&&n.call(e[o],o,e[o++])!==!1;);return e},trim:Q?function(e){return null==e?"":Q.call(e)}:function(e){return null==e?"":e.toString().replace(ne,"")},makeArray:function(e,t){var n,r=t||[];return null!=e&&(n=K.type(e),null==e.length||"string"===n||"function"===n||"regexp"===n||K.isWindow(e)?U.call(r,e):K.merge(r,e)),r},inArray:function(e,t,n){var r;if(t){if(J)return J.call(t,e,n);for(r=t.length,n=n?n<0?Math.max(0,r+n):n:0;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;o<r;o++)e[i++]=n[o];else for(;n[o]!==t;)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;o<a;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,n,r){var i,o,a=[],s=0,l=e.length,u=e instanceof K||l!==t&&"number"==typeof l&&(l>0&&e[0]&&e[l-1]||0===l||K.isArray(e));if(u)for(;s<l;s++)i=n(e[s],s,r),null!=i&&(a[a.length]=i);else for(o in e)i=n(e[o],o,r),null!=i&&(a[a.length]=i);return a.concat.apply([],a)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(r=e[n],n=e,e=r),K.isFunction(e)?(i=Y.call(arguments,2),o=function(){return e.apply(n,i.concat(Y.call(arguments)))},o.guid=e.guid=e.guid||o.guid||K.guid++,o):t},access:function(e,n,r,i,o,a,s){var l,u=null==r,c=0,f=e.length;if(r&&"object"==typeof r){for(c in r)K.access(e,n,c,r[c],1,a,i);o=1}else if(i!==t){if(l=s===t&&K.isFunction(i),u&&(l?(l=n,n=function(e,t,n){return l.call(K(e),n)}):(n.call(e,i),n=null)),n)for(;c<f;c++)n(e[c],r,l?i.call(e[c],c,n(e[c],r)):i,s);o=1}return o?e:u?n.call(e):f?n(e[0],r):a},now:function(){return(new Date).getTime()}}),K.ready.promise=function(t){if(!P)if(P=K.Deferred(),"complete"===R.readyState||"loading"!==R.readyState&&R.addEventListener)setTimeout(K.ready,1);else if(R.addEventListener)R.addEventListener("DOMContentLoaded",pe,!1),e.addEventListener("load",K.ready,!1);else{R.attachEvent("onreadystatechange",pe),e.attachEvent("onload",K.ready);var n=!1;try{n=null==e.frameElement&&R.documentElement}catch(r){}n&&n.doScroll&&function i(){if(!K.isReady){try{n.doScroll("left")}catch(e){return setTimeout(i,50)}K.ready()}}()}return P.promise(t)},K.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(e,t){de["[object "+t+"]"]=t.toLowerCase()}),W=K(R);var he={};K.Callbacks=function(e){e="string"==typeof e?he[e]||n(e):K.extend({},e);var r,i,o,a,s,l,u=[],c=!e.once&&[],f=function(t){for(r=e.memory&&t,i=!0,l=a||0,a=0,s=u.length,o=!0;u&&l<s;l++)if(u[l].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}o=!1,u&&(c?c.length&&f(c.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;!function n(t){K.each(t,function(t,r){!K.isFunction(r)||e.unique&&p.has(r)?r&&r.length&&n(r):u.push(r)})}(arguments),o?s=u.length:r&&(a=t,f(r))}return this},remove:function(){return u&&K.each(arguments,function(e,t){for(var n;(n=K.inArray(t,u,n))>-1;)u.splice(n,1),o&&(n<=s&&s--,n<=l&&l--)}),this},has:function(e){return K.inArray(e,u)>-1},empty:function(){return u=[],this},disable:function(){return u=c=r=t,this},disabled:function(){return!u},lock:function(){return c=t,r||p.disable(),this},locked:function(){return!c},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],u&&(!i||c)&&(o?c.push(t):f(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},K.extend({Deferred:function(e){var t=[["resolve","done",K.Callbacks("once memory"),"resolved"],["reject","fail",K.Callbacks("once memory"),"rejected"],["notify","progress",K.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return K.Deferred(function(n){K.each(t,function(t,r){var o=r[0],a=e[t];i[r[1]](K.isFunction(a)?function(){var e=a.apply(this,arguments);e&&K.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[o+"With"](this===i?n:this,[e])}:n[o])}),e=null}).promise()},promise:function(e){return"object"==typeof e?K.extend(e,r):r}},i={};return r.pipe=r.then,K.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=a.fire,i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=Y.call(arguments),a=o.length,s=1!==a||e&&K.isFunction(e.promise)?a:0,l=1===s?e:K.Deferred(),u=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?Y.call(arguments):i,r===t?l.notifyWith(n,r):--s||l.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i<a;i++)o[i]&&K.isFunction(o[i].promise)?o[i].promise().done(u(i,r,o)).fail(l.reject).progress(u(i,n,t)):--s;return s||l.resolveWith(r,o),l.promise()}}),K.support=function(){var t,n,r,i,o,a,s,l,u,c,f,p=R.createElement("div");if(p.setAttribute("className","t"),p.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0],r.style.cssText="top:1px;float:left;opacity:.5",!n||!n.length||!r)return{};i=R.createElement("select"),o=i.appendChild(R.createElement("option")),a=p.getElementsByTagName("input")[0],t={leadingWhitespace:3===p.firstChild.nodeType,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:"on"===a.value,optSelected:o.selected,getSetAttribute:"t"!==p.className,enctype:!!R.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==R.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===R.compatMode,submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,i.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}if(!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",f=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",f)),a=R.createElement("input"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","checked"),a.setAttribute("name","t"),p.appendChild(a),s=R.createDocumentFragment(),s.appendChild(p.lastChild),t.checkClone=s.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=a.checked,s.removeChild(a),s.appendChild(p),p.attachEvent)for(u in{submit:!0,change:!0,focusin:!0})l="on"+u,c=l in p,c||(p.setAttribute(l,"return;"),c="function"==typeof p[l]),t[u+"Bubbles"]=c;return K(function(){var n,r,i,o,a="padding:0;margin:0;border:0;display:block;overflow:hidden;",s=R.getElementsByTagName("body")[0];s&&(n=R.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",s.insertBefore(n,s.firstChild),r=R.createElement("div"),n.appendChild(r),r.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=r.getElementsByTagName("td"),i[0].style.cssText="padding:0;margin:0;border:0;display:none",c=0===i[0].offsetHeight,i[0].style.display="",i[1].style.display="none",t.reliableHiddenOffsets=c&&0===i[0].offsetHeight,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===r.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==s.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(r,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(r,null)||{width:"4px"}).width,o=R.createElement("div"),o.style.cssText=r.style.cssText=a,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),"undefined"!=typeof r.style.zoom&&(r.innerHTML="",r.style.cssText=a+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===r.offsetWidth,r.style.display="block",r.style.overflow="visible",r.innerHTML="<div></div>",r.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==r.offsetWidth,n.style.zoom=1),s.removeChild(n),n=r=i=o=null)}),s.removeChild(p),n=r=i=o=a=s=p=null,t}();var ge=/^(?:\{.*\}|\[.*\])$/,me=/([A-Z])/g;K.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(K.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?K.cache[e[K.expando]]:e[K.expando],!!e&&!i(e)},data:function(e,n,r,i){if(K.acceptData(e)){var o,a,s=K.expando,l="string"==typeof n,u=e.nodeType,c=u?K.cache:e,f=u?e[s]:e[s]&&s;if(f&&c[f]&&(i||c[f].data)||!l||r!==t)return f||(u?e[s]=f=K.deletedIds.pop()||++K.uuid:f=s),c[f]||(c[f]={},u||(c[f].toJSON=K.noop)),"object"!=typeof n&&"function"!=typeof n||(i?c[f]=K.extend(c[f],n):c[f].data=K.extend(c[f].data,n)),o=c[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[K.camelCase(n)]=r),l?(a=o[n],null==a&&(a=o[K.camelCase(n)])):a=o,a}},removeData:function(e,t,n){if(K.acceptData(e)){var r,o,a,s=e.nodeType,l=s?K.cache:e,u=s?e[K.expando]:K.expando;if(l[u]){if(t&&(r=n?l[u]:l[u].data)){K.isArray(t)||(t in r?t=[t]:(t=K.camelCase(t),t=t in r?[t]:t.split(" ")));for(o=0,a=t.length;o<a;o++)delete r[t[o]];if(!(n?i:K.isEmptyObject)(r))return}(n||(delete l[u].data,i(l[u])))&&(s?K.cleanData([e],!0):K.support.deleteExpando||l!=l.window?delete l[u]:l[u]=null)}}},_data:function(e,t,n){return K.data(e,t,n,!0)},acceptData:function(e){var t=e.nodeName&&K.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),K.fn.extend({data:function(e,n){var i,o,a,s,l,u=this[0],c=0,f=null;if(e===t){if(this.length&&(f=K.data(u),1===u.nodeType&&!K._data(u,"parsedAttrs"))){for(a=u.attributes,l=a.length;c<l;c++)s=a[c].name,0===s.indexOf("data-")&&(s=K.camelCase(s.substring(5)),r(u,s,f[s]));K._data(u,"parsedAttrs",!0)}return f}return"object"==typeof e?this.each(function(){K.data(this,e)}):(i=e.split(".",2),i[1]=i[1]?"."+i[1]:"",o=i[1]+"!",K.access(this,function(n){return n===t?(f=this.triggerHandler("getData"+o,[i[0]]),f===t&&u&&(f=K.data(u,e),f=r(u,e,f)),f===t&&i[1]?this.data(i[0]):f):(i[1]=n,void this.each(function(){var t=K(this);t.triggerHandler("setData"+o,i),K.data(this,e,n),t.triggerHandler("changeData"+o,i)}))},null,n,arguments.length>1,null,!1))},removeData:function(e){return this.each(function(){K.removeData(this,e)})}}),K.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=K._data(e,t),n&&(!r||K.isArray(n)?r=K._data(e,t,K.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=K.queue(e,t),r=n.shift(),i=K._queueHooks(e,t),o=function(){K.dequeue(e,t)};"inprogress"===r&&(r=n.shift()),r&&("fx"===t&&n.unshift("inprogress"),delete i.stop,r.call(e,o,i)),!n.length&&i&&i.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return K._data(e,n)||K._data(e,n,{empty:K.Callbacks("once memory").add(function(){K.removeData(e,t+"queue",!0),K.removeData(e,n,!0)})})}}),K.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),arguments.length<r?K.queue(this[0],e):n===t?this:this.each(function(){var t=K.queue(this,e,n);K._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&K.dequeue(this,e)})},dequeue:function(e){return this.each(function(){K.dequeue(this,e)})},delay:function(e,t){return e=K.fx?K.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=K.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};for("string"!=typeof e&&(n=e,e=t),e=e||"fx";s--;)(r=K._data(a[s],e+"queueHooks"))&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var ye,ve,be,xe=/[\t\r\n]/g,we=/\r/g,Te=/^(?:button|input)$/i,Ne=/^(?:button|input|object|select|textarea)$/i,Ce=/^a(?:rea|)$/i,Ee=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,ke=K.support.getSetAttribute;K.fn.extend({attr:function(e,t){return K.access(this,K.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){K.removeAttr(this,e)})},prop:function(e,t){return K.access(this,K.prop,e,t,arguments.length>1)},removeProp:function(e){return e=K.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a,s;if(K.isFunction(e))return this.each(function(t){K(this).addClass(e.call(this,t,this.className))});if(e&&"string"==typeof e)for(t=e.split(te),n=0,r=this.length;n<r;n++)if(i=this[n],1===i.nodeType)if(i.className||1!==t.length){for(o=" "+i.className+" ",a=0,s=t.length;a<s;a++)~o.indexOf(" "+t[a]+" ")||(o+=t[a]+" ");i.className=K.trim(o)}else i.className=e;return this},removeClass:function(e){var n,r,i,o,a,s,l;if(K.isFunction(e))return this.each(function(t){K(this).removeClass(e.call(this,t,this.className))});if(e&&"string"==typeof e||e===t)for(n=(e||"").split(te),s=0,l=this.length;s<l;s++)if(i=this[s],1===i.nodeType&&i.className){for(r=(" "+i.className+" ").replace(xe," "),o=0,a=n.length;o<a;o++)for(;r.indexOf(" "+n[o]+" ")>-1;)r=r.replace(" "+n[o]+" "," ");i.className=e?K.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return K.isFunction(e)?this.each(function(n){K(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n)for(var i,o=0,a=K(this),s=t,l=e.split(te);i=l[o++];)s=r?s:!a.hasClass(i),a[s?"addClass":"removeClass"](i);else"undefined"!==n&&"boolean"!==n||(this.className&&K._data(this,"__className__",this.className),this.className=this.className||e===!1?"":K._data(this,"__className__")||"")})},hasClass:function(e){for(var t=" "+e+" ",n=0,r=this.length;n<r;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(xe," ").indexOf(t)>-1)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=K.isFunction(e),this.each(function(r){var o,a=K(this);1===this.nodeType&&(o=i?e.call(this,r,a.val()):e,null==o?o="":"number"==typeof o?o+="":K.isArray(o)&&(o=K.map(o,function(e){return null==e?"":e+""})),n=K.valHooks[this.type]||K.valHooks[this.nodeName.toLowerCase()],n&&"set"in n&&n.set(this,o,"value")!==t||(this.value=o))});if(o)return n=K.valHooks[o.type]||K.valHooks[o.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(o,"value"))!==t?r:(r=o.value,"string"==typeof r?r.replace(we,""):null==r?"":r)}}}),K.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r,i,o=e.selectedIndex,a=[],s=e.options,l="select-one"===e.type;if(o<0)return null;for(n=l?o:0,r=l?o+1:s.length;n<r;n++)if(i=s[n],i.selected&&(K.support.optDisabled?!i.disabled:null===i.getAttribute("disabled"))&&(!i.parentNode.disabled||!K.nodeName(i.parentNode,"optgroup"))){if(t=K(i).val(),l)return t;a.push(t)}return l&&!a.length&&s.length?K(s[o]).val():a},set:function(e,t){var n=K.makeArray(t);return K(e).find("option").each(function(){this.selected=K.inArray(K(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var o,a,s,l=e.nodeType;if(e&&3!==l&&8!==l&&2!==l)return i&&K.isFunction(K.fn[n])?K(e)[n](r):"undefined"==typeof e.getAttribute?K.prop(e,n,r):(s=1!==l||!K.isXMLDoc(e),s&&(n=n.toLowerCase(),a=K.attrHooks[n]||(Ee.test(n)?ve:ye)),r!==t?null===r?void K.removeAttr(e,n):a&&"set"in a&&s&&(o=a.set(e,r,n))!==t?o:(e.setAttribute(n,""+r),r):a&&"get"in a&&s&&null!==(o=a.get(e,n))?o:(o=e.getAttribute(n),null===o?t:o))},removeAttr:function(e,t){var n,r,i,o,a=0;if(t&&1===e.nodeType)for(r=t.split(te);a<r.length;a++)i=r[a],i&&(n=K.propFix[i]||i,o=Ee.test(i),o||K.attr(e,i,""),e.removeAttribute(ke?i:n),o&&n in e&&(e[n]=!1))},attrHooks:{type:{set:function(e,t){if(Te.test(e.nodeName)&&e.parentNode)K.error("type property can't be changed");else if(!K.support.radioValue&&"radio"===t&&K.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}},value:{get:function(e,t){return ye&&K.nodeName(e,"button")?ye.get(e,t):t in e?e.value:null},set:function(e,t,n){return ye&&K.nodeName(e,"button")?ye.set(e,t,n):void(e.value=t)}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!K.isXMLDoc(e),a&&(n=K.propFix[n]||n,o=K.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):Ne.test(e.nodeName)||Ce.test(e.nodeName)&&e.href?0:t}}}}),ve={get:function(e,n){var r,i=K.prop(e,n);return i===!0||"boolean"!=typeof i&&(r=e.getAttributeNode(n))&&r.nodeValue!==!1?n.toLowerCase():t},set:function(e,t,n){var r;return t===!1?K.removeAttr(e,n):(r=K.propFix[n]||n,r in e&&(e[r]=!0),e.setAttribute(n,n.toLowerCase())),n}},ke||(be={name:!0,id:!0,coords:!0},ye=K.valHooks.button={get:function(e,n){var r;return r=e.getAttributeNode(n),r&&(be[n]?""!==r.value:r.specified)?r.value:t},set:function(e,t,n){var r=e.getAttributeNode(n);return r||(r=R.createAttribute(n),e.setAttributeNode(r)),r.value=t+""}},K.each(["width","height"],function(e,t){K.attrHooks[t]=K.extend(K.attrHooks[t],{set:function(e,n){if(""===n)return e.setAttribute(t,"auto"),
+n}})}),K.attrHooks.contenteditable={get:ye.get,set:function(e,t,n){""===t&&(t="false"),ye.set(e,t,n)}}),K.support.hrefNormalized||K.each(["href","src","width","height"],function(e,n){K.attrHooks[n]=K.extend(K.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null===r?t:r}})}),K.support.style||(K.attrHooks.style={get:function(e){return e.style.cssText.toLowerCase()||t},set:function(e,t){return e.style.cssText=""+t}}),K.support.optSelected||(K.propHooks.selected=K.extend(K.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),K.support.enctype||(K.propFix.enctype="encoding"),K.support.checkOn||K.each(["radio","checkbox"],function(){K.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),K.each(["radio","checkbox"],function(){K.valHooks[this]=K.extend(K.valHooks[this],{set:function(e,t){if(K.isArray(t))return e.checked=K.inArray(K(e).val(),t)>=0}})});var Se=/^(?:textarea|input|select)$/i,Ae=/^([^\.]*|)(?:\.(.+)|)$/,je=/(?:^|\s)hover(\.\S+|)\b/,De=/^key/,Le=/^(?:mouse|contextmenu)|click/,He=/^(?:focusinfocus|focusoutblur)$/,Fe=function(e){return K.event.special.hover?e:e.replace(je,"mouseenter$1 mouseleave$1")};K.event={add:function(e,n,r,i,o){var a,s,l,u,c,f,p,d,h,g,m;if(3!==e.nodeType&&8!==e.nodeType&&n&&r&&(a=K._data(e))){for(r.handler&&(h=r,r=h.handler,o=h.selector),r.guid||(r.guid=K.guid++),l=a.events,l||(a.events=l={}),s=a.handle,s||(a.handle=s=function(e){return"undefined"==typeof K||e&&K.event.triggered===e.type?t:K.event.dispatch.apply(s.elem,arguments)},s.elem=e),n=K.trim(Fe(n)).split(" "),u=0;u<n.length;u++)c=Ae.exec(n[u])||[],f=c[1],p=(c[2]||"").split(".").sort(),m=K.event.special[f]||{},f=(o?m.delegateType:m.bindType)||f,m=K.event.special[f]||{},d=K.extend({type:f,origType:c[1],data:i,handler:r,guid:r.guid,selector:o,namespace:p.join(".")},h),g=l[f],g||(g=l[f]=[],g.delegateCount=0,m.setup&&m.setup.call(e,i,p,s)!==!1||(e.addEventListener?e.addEventListener(f,s,!1):e.attachEvent&&e.attachEvent("on"+f,s))),m.add&&(m.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),o?g.splice(g.delegateCount++,0,d):g.push(d),K.event.global[f]=!0;e=null}},global:{},remove:function(e,t,n,r,i){var o,a,s,l,u,c,f,p,d,h,g,m=K.hasData(e)&&K._data(e);if(m&&(p=m.events)){for(t=K.trim(Fe(t||"")).split(" "),o=0;o<t.length;o++)if(a=Ae.exec(t[o])||[],s=l=a[1],u=a[2],s){for(d=K.event.special[s]||{},s=(r?d.delegateType:d.bindType)||s,h=p[s]||[],c=h.length,u=u?new RegExp("(^|\\.)"+u.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null,f=0;f<h.length;f++)g=h[f],(i||l===g.origType)&&(!n||n.guid===g.guid)&&(!u||u.test(g.namespace))&&(!r||r===g.selector||"**"===r&&g.selector)&&(h.splice(f--,1),g.selector&&h.delegateCount--,d.remove&&d.remove.call(e,g));0===h.length&&c!==h.length&&((!d.teardown||d.teardown.call(e,u,m.handle)===!1)&&K.removeEvent(e,s,m.handle),delete p[s])}else for(s in p)K.event.remove(e,s+t[o],n,r,!0);K.isEmptyObject(p)&&(delete m.handle,K.removeData(e,"events",!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(n,r,i,o){if(!i||3!==i.nodeType&&8!==i.nodeType){var a,s,l,u,c,f,p,d,h,g,m=n.type||n,y=[];if(He.test(m+K.event.triggered))return;if(m.indexOf("!")>=0&&(m=m.slice(0,-1),s=!0),m.indexOf(".")>=0&&(y=m.split("."),m=y.shift(),y.sort()),(!i||K.event.customEvent[m])&&!K.event.global[m])return;if(n="object"==typeof n?n[K.expando]?n:new K.Event(m,n):new K.Event(m),n.type=m,n.isTrigger=!0,n.exclusive=s,n.namespace=y.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+y.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,f=m.indexOf(":")<0?"on"+m:"",!i){a=K.cache;for(l in a)a[l].events&&a[l].events[m]&&K.event.trigger(n,r,a[l].handle.elem,!0);return}if(n.result=t,n.target||(n.target=i),r=null!=r?K.makeArray(r):[],r.unshift(n),p=K.event.special[m]||{},p.trigger&&p.trigger.apply(i,r)===!1)return;if(h=[[i,p.bindType||m]],!o&&!p.noBubble&&!K.isWindow(i)){for(g=p.delegateType||m,u=He.test(g+m)?i:i.parentNode,c=i;u;u=u.parentNode)h.push([u,g]),c=u;c===(i.ownerDocument||R)&&h.push([c.defaultView||c.parentWindow||e,g])}for(l=0;l<h.length&&!n.isPropagationStopped();l++)u=h[l][0],n.type=h[l][1],d=(K._data(u,"events")||{})[n.type]&&K._data(u,"handle"),d&&d.apply(u,r),d=f&&u[f],d&&K.acceptData(u)&&d.apply(u,r)===!1&&n.preventDefault();return n.type=m,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(i.ownerDocument,r)===!1)&&("click"!==m||!K.nodeName(i,"a"))&&K.acceptData(i)&&f&&i[m]&&("focus"!==m&&"blur"!==m||0!==n.target.offsetWidth)&&!K.isWindow(i)&&(c=i[f],c&&(i[f]=null),K.event.triggered=m,i[m](),K.event.triggered=t,c&&(i[f]=c)),n.result}},dispatch:function(n){n=K.event.fix(n||e.event);var r,i,o,a,s,l,u,c,f,p,d=(K._data(this,"events")||{})[n.type]||[],h=d.delegateCount,g=[].slice.call(arguments),m=!n.exclusive&&!n.namespace,y=K.event.special[n.type]||{},v=[];if(g[0]=n,n.delegateTarget=this,!y.preDispatch||y.preDispatch.call(this,n)!==!1){if(h&&(!n.button||"click"!==n.type))for(a=K(this),a.context=this,o=n.target;o!=this;o=o.parentNode||this)if(o.disabled!==!0||"click"!==n.type){for(l={},c=[],a[0]=o,r=0;r<h;r++)f=d[r],p=f.selector,l[p]===t&&(l[p]=a.is(p)),l[p]&&c.push(f);c.length&&v.push({elem:o,matches:c})}for(d.length>h&&v.push({elem:this,matches:d.slice(h)}),r=0;r<v.length&&!n.isPropagationStopped();r++)for(u=v[r],n.currentTarget=u.elem,i=0;i<u.matches.length&&!n.isImmediatePropagationStopped();i++)f=u.matches[i],(m||!n.namespace&&!f.namespace||n.namespace_re&&n.namespace_re.test(f.namespace))&&(n.data=f.data,n.handleObj=f,s=((K.event.special[f.origType]||{}).handle||f.handler).apply(u.elem,g),s!==t&&(n.result=s,s===!1&&(n.preventDefault(),n.stopPropagation())));return y.postDispatch&&y.postDispatch.call(this,n),n.result}},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,a=n.button,s=n.fromElement;return null==e.pageX&&null!=n.clientX&&(r=e.target.ownerDocument||R,i=r.documentElement,o=r.body,e.pageX=n.clientX+(i&&i.scrollLeft||o&&o.scrollLeft||0)-(i&&i.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(i&&i.scrollTop||o&&o.scrollTop||0)-(i&&i.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&s&&(e.relatedTarget=s===e.target?n.toElement:s),!e.which&&a!==t&&(e.which=1&a?1:2&a?3:4&a?2:0),e}},fix:function(e){if(e[K.expando])return e;var t,n,r=e,i=K.event.fixHooks[e.type]||{},o=i.props?this.props.concat(i.props):this.props;for(e=K.Event(r),t=o.length;t;)n=o[--t],e[n]=r[n];return e.target||(e.target=r.srcElement||R),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,i.filter?i.filter(e,r):e},special:{ready:{setup:K.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(e,t,n){K.isWindow(this)&&(this.onbeforeunload=n)},teardown:function(e,t){this.onbeforeunload===t&&(this.onbeforeunload=null)}}},simulate:function(e,t,n,r){var i=K.extend(new K.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?K.event.trigger(i,null,t):K.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},K.event.handle=K.event.dispatch,K.removeEvent=R.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&("undefined"==typeof e[r]&&(e[r]=null),e.detachEvent(r,n))},K.Event=function(e,t){return this instanceof K.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?a:o):this.type=e,t&&K.extend(this,t),this.timeStamp=e&&e.timeStamp||K.now(),this[K.expando]=!0,void 0):new K.Event(e,t)},K.Event.prototype={preventDefault:function(){this.isDefaultPrevented=a;var e=this.originalEvent;e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=a;var e=this.originalEvent;e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=a,this.stopPropagation()},isDefaultPrevented:o,isPropagationStopped:o,isImmediatePropagationStopped:o},K.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){K.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;o.selector;return i&&(i===r||K.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),K.support.submitBubbles||(K.event.special.submit={setup:function(){return!K.nodeName(this,"form")&&void K.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=K.nodeName(n,"input")||K.nodeName(n,"button")?n.form:t;r&&!K._data(r,"_submit_attached")&&(K.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),K._data(r,"_submit_attached",!0))})},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&K.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return!K.nodeName(this,"form")&&void K.event.remove(this,"._submit")}}),K.support.changeBubbles||(K.event.special.change={setup:function(){return Se.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(K.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),K.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),K.event.simulate("change",this,e,!0)})),!1):void K.event.add(this,"beforeactivate._change",function(e){var t=e.target;Se.test(t.nodeName)&&!K._data(t,"_change_attached")&&(K.event.add(t,"change._change",function(e){this.parentNode&&!e.isSimulated&&!e.isTrigger&&K.event.simulate("change",this.parentNode,e,!0)}),K._data(t,"_change_attached",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return K.event.remove(this,"._change"),Se.test(this.nodeName)}}),K.support.focusinBubbles||K.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){K.event.simulate(t,e.target,K.event.fix(e),!0)};K.event.special[t]={setup:function(){0===n++&&R.addEventListener(e,r,!0)},teardown:function(){0===--n&&R.removeEventListener(e,r,!0)}}}),K.fn.extend({on:function(e,n,r,i,a){var s,l;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(l in e)this.on(l,n,r,e[l],a);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=o;else if(!i)return this;return 1===a&&(s=i,i=function(e){return K().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=K.guid++)),this.each(function(){K.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,a;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,K(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(a in e)this.off(a,n,e[a]);return this}return n!==!1&&"function"!=typeof n||(r=n,n=t),r===!1&&(r=o),this.each(function(){K.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},live:function(e,t,n){return K(this.context).on(e,this.selector,t,n),this},die:function(e,t){return K(this.context).off(e,this.selector||"**",t),this},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1==arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){K.event.trigger(e,t,this)})},triggerHandler:function(e,t){if(this[0])return K.event.trigger(e,t,this[0],!0)},toggle:function(e){var t=arguments,n=e.guid||K.guid++,r=0,i=function(n){var i=(K._data(this,"lastToggle"+e.guid)||0)%r;return K._data(this,"lastToggle"+e.guid,i+1),n.preventDefault(),t[i].apply(this,arguments)||!1};for(i.guid=n;r<t.length;)t[r++].guid=n;return this.click(i)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),K.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){K.fn[t]=function(e,n){return null==n&&(n=e,e=null),arguments.length>0?this.on(t,null,e,n):this.trigger(t)},De.test(t)&&(K.event.fixHooks[t]=K.event.keyHooks),Le.test(t)&&(K.event.fixHooks[t]=K.event.mouseHooks)}),function(e,t){function n(e,t,n,r){for(var i=0,o=t.length;i<o;i++)oe(e,t[i],n,r)}function r(e,t,r,i,o,a){var s,l=ae.setFilters[t.toLowerCase()];return l||oe.error(t),(e||!(s=o))&&n(e||"*",i,s=[],o),s.length>0?l(s,r,a):[]}function i(e,i,o,a,s){for(var l,u,c,f,p,d,h,g,m=0,y=s.length,v=z.POS,b=new RegExp("^"+v.source+"(?!"+C+")","i"),x=function(){for(var e=1,n=arguments.length-2;e<n;e++)arguments[e]===t&&(l[e]=t)};m<y;m++){for(v.exec(""),e=s[m],f=[],c=0,p=a;l=v.exec(e);)g=v.lastIndex=l.index+l[0].length,g>c&&(h=e.slice(c,l.index),c=g,d=[i],M.test(h)&&(p&&(d=p),p=a),(u=P.test(h))&&(h=h.slice(0,-5).replace(M,"$&*")),l.length>1&&l[0].replace(b,x),p=r(h,l[1],l[2],d,p,u));p?(f=f.concat(p),(h=e.slice(c))&&")"!==h?M.test(h)?n(h,f,o,a):oe(h,i,o,a?a.concat(p):p):T.apply(o,f)):oe(e,i,o,a)}return 1===y?o:oe.uniqueSort(o)}function o(e,t,n){for(var r,i,o,a=[],s=0,l=_.exec(e),u=!l.pop()&&!l.pop(),c=u&&e.match(O)||[""],f=ae.preFilter,p=ae.filter,d=!n&&t!==g;null!=(i=c[s])&&u;s++)for(a.push(r=[]),d&&(i=" "+i);i;){u=!1,(l=M.exec(i))&&(i=i.slice(l[0].length),u=r.push({part:l.pop().replace(F," "),captures:l}));for(o in p)(l=z[o].exec(i))&&(!f[o]||(l=f[o](l,t,n)))&&(i=i.slice(l.shift().length),u=r.push({part:o,captures:l}));if(!u)break}return u||oe.error(e),a}function a(e,t,n){var r=t.dir,i=x++;return e||(e=function(e){return e===n}),t.first?function(t,n){for(;t=t[r];)if(1===t.nodeType)return e(t,n)&&t}:function(t,n){for(var o,a=i+"."+f,s=a+"."+c;t=t[r];)if(1===t.nodeType){if((o=t[N])===s)return t.sizset;if("string"==typeof o&&0===o.indexOf(a)){if(t.sizset)return t}else{if(t[N]=s,e(t,n))return t.sizset=!0,t;t.sizset=!1}}}}function s(e,t){return e?function(n,r){var i=t(n,r);return i&&e(i===!0?n:i,r)}:t}function l(e,t,n){for(var r,i,o=0;r=e[o];o++)ae.relative[r.part]?i=a(i,ae.relative[r.part],t):(r.captures.push(t,n),i=s(i,ae.filter[r.part].apply(null,r.captures)));return i}function u(e){return function(t,n){for(var r,i=0;r=e[i];i++)if(r(t,n))return!0;return!1}}var c,f,p,d,h,g=e.document,m=g.documentElement,y="undefined",v=!1,b=!0,x=0,w=[].slice,T=[].push,N=("sizcache"+Math.random()).replace(".",""),C="[\\x20\\t\\r\\n\\f]",E="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",k=E.replace("w","w#"),S="([*^$|!~]?=)",A="\\["+C+"*("+E+")"+C+"*(?:"+S+C+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+k+")|)|)"+C+"*\\]",j=":("+E+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|((?:[^,]|\\\\,|(?:,(?=[^\\[]*\\]))|(?:,(?=[^\\(]*\\))))*))\\)|)",D=":(nth|eq|gt|lt|first|last|even|odd)(?:\\((\\d*)\\)|)(?=[^-]|$)",L=C+"*([\\x20\\t\\r\\n\\f>+~])"+C+"*",H="(?=[^\\x20\\t\\r\\n\\f])(?:\\\\.|"+A+"|"+j.replace(2,7)+"|[^\\\\(),])+",F=new RegExp("^"+C+"+|((?:^|[^\\\\])(?:\\\\.)*)"+C+"+$","g"),M=new RegExp("^"+L),O=new RegExp(H+"?(?="+C+"*,|$)","g"),_=new RegExp("^(?:(?!,)(?:(?:^|,)"+C+"*"+H+")*?|"+C+"*(.*?))(\\)|$)"),q=new RegExp(H.slice(19,-6)+"\\x20\\t\\r\\n\\f>+~])+|"+L,"g"),B=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,W=/[\x20\t\r\n\f]*[+~]/,P=/:not\($/,R=/h\d/i,$=/input|select|textarea|button/i,I=/\\(?!\\)/g,z={ID:new RegExp("^#("+E+")"),CLASS:new RegExp("^\\.("+E+")"),NAME:new RegExp("^\\[name=['\"]?("+E+")['\"]?\\]"),TAG:new RegExp("^("+E.replace("[-","[-\\*")+")"),ATTR:new RegExp("^"+A),PSEUDO:new RegExp("^"+j),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+C+"*(even|odd|(([+-]|)(\\d*)n|)"+C+"*(?:([+-]|)"+C+"*(\\d+)|))"+C+"*\\)|)","i"),POS:new RegExp(D,"ig"),needsContext:new RegExp("^"+C+"*[>+~]|"+D,"i")},X={},U=[],Y={},J=[],V=function(e){return e.sizzleFilter=!0,e},G=function(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}},Q=function(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}},Z=function(e){var t=!1,n=g.createElement("div");try{t=e(n)}catch(r){}return n=null,t},ee=Z(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),te=Z(function(e){e.id=N+0,e.innerHTML="<a name='"+N+"'></a><div name='"+N+"'></div>",m.insertBefore(e,m.firstChild);var t=g.getElementsByName&&g.getElementsByName(N).length===2+g.getElementsByName(N+0).length;return h=!g.getElementById(N),m.removeChild(e),t}),ne=Z(function(e){return e.appendChild(g.createComment("")),0===e.getElementsByTagName("*").length}),re=Z(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==y&&"#"===e.firstChild.getAttribute("href")}),ie=Z(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!(!e.getElementsByClassName||0===e.getElementsByClassName("e").length)&&(e.lastChild.className="e",1!==e.getElementsByClassName("e").length)}),oe=function(e,t,n,r){n=n||[],t=t||g;var i,o,a,s,l=t.nodeType;if(1!==l&&9!==l)return[];if(!e||"string"!=typeof e)return n;if(a=le(t),!a&&!r&&(i=B.exec(e)))if(s=i[1]){if(9===l){if(o=t.getElementById(s),!o||!o.parentNode)return n;if(o.id===s)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(s))&&ue(t,o)&&o.id===s)return n.push(o),n}else{if(i[2])return T.apply(n,w.call(t.getElementsByTagName(e),0)),n;if((s=i[3])&&ie&&t.getElementsByClassName)return T.apply(n,w.call(t.getElementsByClassName(s),0)),n}return pe(e,t,n,r,a)},ae=oe.selectors={cacheLength:50,match:z,order:["ID","TAG"],attrHandle:{},createPseudo:V,find:{ID:h?function(e,t,n){if(typeof t.getElementById!==y&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==y&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==y&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:ne?function(e,t){if(typeof t.getElementsByTagName!==y)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if("*"===e){for(var r,i=[],o=0;r=n[o];o++)1===r.nodeType&&i.push(r);return i}return n}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(I,""),e[3]=(e[4]||e[5]||"").replace(I,""),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1]?(e[2]||oe.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*("even"===e[2]||"odd"===e[2])),e[4]=+(e[6]+e[7]||"odd"===e[2])):e[2]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=e[4];return z.CHILD.test(e[0])?null:(n&&(t=_.exec(n))&&t.pop()&&(e[0]=e[0].slice(0,t[0].length-n.length-1),n=t[0].slice(0,-1)),e.splice(2,3,n||e[3]),e)}},filter:{ID:h?function(e){return e=e.replace(I,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace(I,""),function(t){var n=typeof t.getAttributeNode!==y&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(I,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=X[e];return t||(t=X[e]=new RegExp("(^|"+C+")"+e+"("+C+"|$)"),U.push(e),U.length>ae.cacheLength&&delete X[U.shift()]),function(e){return t.test(e.className||typeof e.getAttribute!==y&&e.getAttribute("class")||"")}},ATTR:function(e,t,n){return t?function(r){var i=oe.attr(r,e),o=i+"";if(null==i)return"!="===t;switch(t){case"=":return o===n;case"!=":return o!==n;case"^=":return n&&0===o.indexOf(n);case"*=":return n&&o.indexOf(n)>-1;case"$=":return n&&o.substr(o.length-n.length)===n;case"~=":return(" "+o+" ").indexOf(n)>-1;case"|=":return o===n||o.substr(0,n.length+1)===n+"-"}}:function(t){return null!=oe.attr(t,e)}},CHILD:function(e,t,n,r){if("nth"===e){var i=x++;return function(e){var t,o,a=0,s=e;if(1===n&&0===r)return!0;if(t=e.parentNode,t&&(t[N]!==i||!e.sizset)){for(s=t.firstChild;s&&(1!==s.nodeType||(s.sizset=++a,s!==e));s=s.nextSibling);t[N]=i}return o=e.sizset-r,0===n?0===o:o%n===0&&o/n>=0}}return function(t){var n=t;switch(e){case"only":case"first":for(;n=n.previousSibling;)if(1===n.nodeType)return!1;if("first"===e)return!0;n=t;case"last":for(;n=n.nextSibling;)if(1===n.nodeType)return!1;return!0}}},PSEUDO:function(e,t,n,r){var i=ae.pseudos[e]||ae.pseudos[e.toLowerCase()];return i||oe.error("unsupported pseudo: "+e),i.sizzleFilter?i(t,n,r):i}},pseudos:{not:V(function(e,t,n){var r=fe(e.replace(F,"$1"),t,n);return function(e){return!r(e)}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!ae.pseudos.empty(e)},empty:function(e){var t;for(e=e.firstChild;e;){if(e.nodeName>"@"||3===(t=e.nodeType)||4===t)return!1;e=e.nextSibling}return!0},contains:V(function(e){return function(t){return(t.textContent||t.innerText||ce(t)).indexOf(e)>-1}}),has:V(function(e){return function(t){return oe(e,t).length>0}}),header:function(e){return R.test(e.nodeName)},text:function(e){var t,n;return"input"===e.nodeName.toLowerCase()&&"text"===(t=e.type)&&(null==(n=e.getAttribute("type"))||n.toLowerCase()===t)},radio:G("radio"),checkbox:G("checkbox"),file:G("file"),password:G("password"),image:G("image"),submit:Q("submit"),reset:Q("reset"),button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},input:function(e){return $.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&(!!e.type||!!e.href)},active:function(e){return e===e.ownerDocument.activeElement}},setFilters:{first:function(e,t,n){return n?e.slice(1):[e[0]]},last:function(e,t,n){var r=e.pop();return n?e:[r]},even:function(e,t,n){for(var r=[],i=n?1:0,o=e.length;i<o;i+=2)r.push(e[i]);return r},odd:function(e,t,n){for(var r=[],i=n?0:1,o=e.length;i<o;i+=2)r.push(e[i]);return r},lt:function(e,t,n){return n?e.slice(+t):e.slice(0,+t)},gt:function(e,t,n){return n?e.slice(0,+t+1):e.slice(+t+1)},eq:function(e,t,n){var r=e.splice(+t,1);return n?e:r}}};ae.setFilters.nth=ae.setFilters.eq,ae.filters=ae.pseudos,re||(ae.attrHandle={href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}}),te&&(ae.order.push("NAME"),ae.find.NAME=function(e,t){if(typeof t.getElementsByName!==y)return t.getElementsByName(e)}),ie&&(ae.order.splice(1,0,"CLASS"),ae.find.CLASS=function(e,t,n){if(typeof t.getElementsByClassName!==y&&!n)return t.getElementsByClassName(e)});try{w.call(m.childNodes,0)[0].nodeType}catch(se){w=function(e){for(var t,n=[];t=this[e];e++)n.push(t);return n}}var le=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},ue=oe.contains=m.compareDocumentPosition?function(e,t){return!!(16&e.compareDocumentPosition(t))}:m.contains?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t.parentNode;return e===r||!!(r&&1===r.nodeType&&n.contains&&n.contains(r))}:function(e,t){for(;t=t.parentNode;)if(t===e)return!0;return!1},ce=oe.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=ce(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=ce(t);return n};oe.attr=function(e,t){var n,r=le(e);return r||(t=t.toLowerCase()),ae.attrHandle[t]?ae.attrHandle[t](e):ee||r?e.getAttribute(t):(n=e.getAttributeNode(t),n?"boolean"==typeof e[t]?e[t]?t:null:n.specified?n.value:null:null)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},[0,0].sort(function(){return b=0}),m.compareDocumentPosition?p=function(e,t){return e===t?(v=!0,0):(e.compareDocumentPosition&&t.compareDocumentPosition?4&e.compareDocumentPosition(t):e.compareDocumentPosition)?-1:1}:(p=function(e,t){if(e===t)return v=!0,0;if(e.sourceIndex&&t.sourceIndex)return e.sourceIndex-t.sourceIndex;var n,r,i=[],o=[],a=e.parentNode,s=t.parentNode,l=a;if(a===s)return d(e,t);if(!a)return-1;if(!s)return 1;for(;l;)i.unshift(l),l=l.parentNode;for(l=s;l;)o.unshift(l),l=l.parentNode;n=i.length,r=o.length;for(var u=0;u<n&&u<r;u++)if(i[u]!==o[u])return d(i[u],o[u]);return u===n?d(e,o[u],-1):d(i[u],t,1)},d=function(e,t,n){if(e===t)return n;for(var r=e.nextSibling;r;){if(r===t)return-1;r=r.nextSibling}return 1}),oe.uniqueSort=function(e){var t,n=1;if(p&&(v=b,e.sort(p),v))for(;t=e[n];n++)t===e[n-1]&&e.splice(n--,1);return e};var fe=oe.compile=function(e,t,n){var r,i,a,s=Y[e];if(s&&s.context===t)return s;for(i=o(e,t,n),a=0;r=i[a];a++)i[a]=l(r,t,n);return s=Y[e]=u(i),s.context=t,s.runs=s.dirruns=0,J.push(e),J.length>ae.cacheLength&&delete Y[J.shift()],s};oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){return oe(t,null,null,[e]).length>0};var pe=function(e,t,n,r,o){e=e.replace(F,"$1");var a,s,l,u,p,d,h,g,m,y=e.match(O),v=e.match(q),b=t.nodeType;if(z.POS.test(e))return i(e,t,n,r,y);if(r)a=w.call(r,0);else if(y&&1===y.length){if(v.length>1&&9===b&&!o&&(y=z.ID.exec(v[0]))){if(t=ae.find.ID(y[1],t,o)[0],!t)return n;e=e.slice(v.shift().length)}for(g=(y=W.exec(v[0]))&&!y.index&&t.parentNode||t,m=v.pop(),d=m.split(":not")[0],l=0,u=ae.order.length;l<u;l++)if(h=ae.order[l],y=z[h].exec(d)){if(a=ae.find[h]((y[1]||"").replace(I,""),g,o),null==a)continue;d===m&&(e=e.slice(0,e.length-m.length)+d.replace(z[h],""),e||T.apply(n,w.call(a,0)));break}}if(e)for(s=fe(e,t,o),f=s.dirruns++,null==a&&(a=ae.find.TAG("*",W.test(e)&&t.parentNode||t)),l=0;p=a[l];l++)c=s.runs++,s(p,t)&&n.push(p);return n};g.querySelectorAll&&function(){var e,t=pe,n=/'|\\/g,r=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,i=[],o=[":active"],a=m.matchesSelector||m.mozMatchesSelector||m.webkitMatchesSelector||m.oMatchesSelector||m.msMatchesSelector;Z(function(e){e.innerHTML="<select><option selected></option></select>",e.querySelectorAll("[selected]").length||i.push("\\["+C+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),Z(function(e){e.innerHTML="<p test=''></p>",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+C+"*(?:\"\"|'')"),e.innerHTML="<input type='hidden'>",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=i.length&&new RegExp(i.join("|")),pe=function(e,r,o,a,s){if(!(a||s||i&&i.test(e)))if(9===r.nodeType)try{return T.apply(o,w.call(r.querySelectorAll(e),0)),o}catch(l){}else if(1===r.nodeType&&"object"!==r.nodeName.toLowerCase()){var u=r.getAttribute("id"),c=u||N,f=W.test(e)&&r.parentNode||r;u?c=c.replace(n,"\\$&"):r.setAttribute("id",c);try{return T.apply(o,w.call(f.querySelectorAll(e.replace(O,"[id='"+c+"'] $&")),0)),o}catch(l){}finally{u||r.removeAttribute("id")}}return t(e,r,o,a,s)},a&&(Z(function(t){e=a.call(t,"div");try{a.call(t,"[test!='']:sizzle"),o.push(ae.match.PSEUDO)}catch(n){}}),o=new RegExp(o.join("|")),oe.matchesSelector=function(t,n){if(n=n.replace(r,"='$1']"),!(le(t)||o.test(n)||i&&i.test(n)))try{var s=a.call(t,n);if(s||e||t.document&&11!==t.document.nodeType)return s}catch(l){}return oe(n,null,null,[t]).length>0})}(),oe.attr=K.attr,K.find=oe,K.expr=oe.selectors,K.expr[":"]=K.expr.pseudos,K.unique=oe.uniqueSort,K.text=oe.getText,K.isXMLDoc=oe.isXML,K.contains=oe.contains}(e);var Me=/Until$/,Oe=/^(?:parents|prev(?:Until|All))/,_e=/^.[^:#\[\.,]*$/,qe=K.expr.match.needsContext,Be={children:!0,contents:!0,next:!0,prev:!0};K.fn.extend({find:function(e){var t,n,r,i,o,a,s=this;if("string"!=typeof e)return K(e).filter(function(){for(t=0,n=s.length;t<n;t++)if(K.contains(s[t],this))return!0});for(a=this.pushStack("","find",e),t=0,n=this.length;t<n;t++)if(r=a.length,K.find(e,this[t],a),t>0)for(i=r;i<a.length;i++)for(o=0;o<r;o++)if(a[o]===a[i]){a.splice(i--,1);break}return a},has:function(e){var t,n=K(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(K.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(u(this,e,!1),"not",e)},filter:function(e){return this.pushStack(u(this,e,!0),"filter",e)},is:function(e){return!!e&&("string"==typeof e?qe.test(e)?K(e,this.context).index(this[0])>=0:K.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=qe.test(e)||"string"!=typeof e?K(e,t||this.context):0;r<i;r++)for(n=this[r];n&&n.ownerDocument&&n!==t&&11!==n.nodeType;){if(a?a.index(n)>-1:K.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}return o=o.length>1?K.unique(o):o,this.pushStack(o,"closest",e)},index:function(e){return e?"string"==typeof e?K.inArray(this[0],K(e)):K.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n="string"==typeof e?K(e,t):K.makeArray(e&&e.nodeType?[e]:e),r=K.merge(this.get(),n);return this.pushStack(s(n[0])||s(r[0])?r:K.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),K.fn.andSelf=K.fn.addBack,K.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return K.dir(e,"parentNode")},parentsUntil:function(e,t,n){return K.dir(e,"parentNode",n)},next:function(e){return l(e,"nextSibling")},prev:function(e){return l(e,"previousSibling")},nextAll:function(e){return K.dir(e,"nextSibling")},prevAll:function(e){return K.dir(e,"previousSibling")},nextUntil:function(e,t,n){return K.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return K.dir(e,"previousSibling",n)},siblings:function(e){return K.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return K.sibling(e.firstChild)},contents:function(e){return K.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:K.merge([],e.childNodes)}},function(e,t){K.fn[e]=function(n,r){var i=K.map(this,t,n);return Me.test(e)||(r=n),r&&"string"==typeof r&&(i=K.filter(r,i)),i=this.length>1&&!Be[e]?K.unique(i):i,this.length>1&&Oe.test(e)&&(i=i.reverse()),this.pushStack(i,e,Y.call(arguments).join(","))}}),K.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?K.find.matchesSelector(t[0],e)?[t[0]]:[]:K.find.matches(e,t)},dir:function(e,n,r){for(var i=[],o=e[n];o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!K(o).is(r));)1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});var We="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",Pe=/ jQuery\d+="(?:null|\d+)"/g,Re=/^\s+/,$e=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Ie=/<([\w:]+)/,ze=/<tbody/i,Xe=/<|&#?\w+;/,Ue=/<(?:script|style|link)/i,Ye=/<(?:script|object|embed|option|style)/i,Je=new RegExp("<(?:"+We+")[\\s/>]","i"),Ve=/^(?:checkbox|radio)$/,Ge=/checked\s*(?:[^=]|=\s*.checked.)/i,Qe=/\/(java|ecma)script/i,Ke=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,Ze={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},et=c(R),tt=et.appendChild(R.createElement("div"));
+Ze.optgroup=Ze.option,Ze.tbody=Ze.tfoot=Ze.colgroup=Ze.caption=Ze.thead,Ze.th=Ze.td,K.support.htmlSerialize||(Ze._default=[1,"X<div>","</div>"]),K.fn.extend({text:function(e){return K.access(this,function(e){return e===t?K.text(this):this.empty().append((this[0]&&this[0].ownerDocument||R).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(K.isFunction(e))return this.each(function(t){K(this).wrapAll(e.call(this,t))});if(this[0]){var t=K(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return K.isFunction(e)?this.each(function(t){K(this).wrapInner(e.call(this,t))}):this.each(function(){var t=K(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=K.isFunction(e);return this.each(function(n){K(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){K.nodeName(this,"body")||K(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!s(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=K.clean(arguments);return this.pushStack(K.merge(e,this),"before",this.selector)}},after:function(){if(!s(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=K.clean(arguments);return this.pushStack(K.merge(this,e),"after",this.selector)}},remove:function(e,t){for(var n,r=0;null!=(n=this[r]);r++)e&&!K.filter(e,[n]).length||(!t&&1===n.nodeType&&(K.cleanData(n.getElementsByTagName("*")),K.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n));return this},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)for(1===e.nodeType&&K.cleanData(e.getElementsByTagName("*"));e.firstChild;)e.removeChild(e.firstChild);return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return K.clone(this,e,t)})},html:function(e){return K.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(Pe,""):t;if("string"==typeof e&&!Ue.test(e)&&(K.support.htmlSerialize||!Je.test(e))&&(K.support.leadingWhitespace||!Re.test(e))&&!Ze[(Ie.exec(e)||["",""])[1].toLowerCase()]){e=e.replace($e,"<$1></$2>");try{for(;r<i;r++)n=this[r]||{},1===n.nodeType&&(K.cleanData(n.getElementsByTagName("*")),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){return s(this[0])?this.length?this.pushStack(K(K.isFunction(e)?e():e),"replaceWith",e):this:K.isFunction(e)?this.each(function(t){var n=K(this),r=n.html();n.replaceWith(e.call(this,t,r))}):("string"!=typeof e&&(e=K(e).detach()),this.each(function(){var t=this.nextSibling,n=this.parentNode;K(this).remove(),t?K(t).before(e):K(n).append(e)}))},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=[].concat.apply([],e);var i,o,a,s,l=0,u=e[0],c=[],p=this.length;if(!K.support.checkClone&&p>1&&"string"==typeof u&&Ge.test(u))return this.each(function(){K(this).domManip(e,n,r)});if(K.isFunction(u))return this.each(function(i){var o=K(this);e[0]=u.call(this,i,n?o.html():t),o.domManip(e,n,r)});if(this[0]){if(i=K.buildFragment(e,this,c),a=i.fragment,o=a.firstChild,1===a.childNodes.length&&(a=o),o)for(n=n&&K.nodeName(o,"tr"),s=i.cacheable||p-1;l<p;l++)r.call(n&&K.nodeName(this[l],"table")?f(this[l],"tbody"):this[l],l===s?a:K.clone(a,!0,!0));a=o=null,c.length&&K.each(c,function(e,t){t.src?K.ajax?K.ajax({url:t.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):K.error("no ajax"):K.globalEval((t.text||t.textContent||t.innerHTML||"").replace(Ke,"")),t.parentNode&&t.parentNode.removeChild(t)})}return this}}),K.buildFragment=function(e,n,r){var i,o,a,s=e[0];return n=n||R,n=(n[0]||n).ownerDocument||n[0]||n,"undefined"==typeof n.createDocumentFragment&&(n=R),1===e.length&&"string"==typeof s&&s.length<512&&n===R&&"<"===s.charAt(0)&&!Ye.test(s)&&(K.support.checkClone||!Ge.test(s))&&(K.support.html5Clone||!Je.test(s))&&(o=!0,i=K.fragments[s],a=i!==t),i||(i=n.createDocumentFragment(),K.clean(e,n,i,r),o&&(K.fragments[s]=a&&i)),{fragment:i,cacheable:o}},K.fragments={},K.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){K.fn[e]=function(n){var r,i=0,o=[],a=K(n),s=a.length,l=1===this.length&&this[0].parentNode;if((null==l||l&&11===l.nodeType&&1===l.childNodes.length)&&1===s)return a[t](this[0]),this;for(;i<s;i++)r=(i>0?this.clone(!0):this).get(),K(a[i])[t](r),o=o.concat(r);return this.pushStack(o,e,a.selector)}}),K.extend({clone:function(e,t,n){var r,i,o,a;if(K.support.html5Clone||K.isXMLDoc(e)||!Je.test("<"+e.nodeName+">")?a=e.cloneNode(!0):(tt.innerHTML=e.outerHTML,tt.removeChild(a=tt.firstChild)),!(K.support.noCloneEvent&&K.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||K.isXMLDoc(e)))for(d(e,a),r=h(e),i=h(a),o=0;r[o];++o)i[o]&&d(r[o],i[o]);if(t&&(p(e,a),n))for(r=h(e),i=h(a),o=0;r[o];++o)p(r[o],i[o]);return r=i=null,a},clean:function(e,t,n,r){var i,o,a,s,l,u,f,p,d,h,m,y=0,v=[];for(t&&"undefined"!=typeof t.createDocumentFragment||(t=R),o=t===R&&et;null!=(a=e[y]);y++)if("number"==typeof a&&(a+=""),a){if("string"==typeof a)if(Xe.test(a)){for(o=o||c(t),f=f||o.appendChild(t.createElement("div")),a=a.replace($e,"<$1></$2>"),s=(Ie.exec(a)||["",""])[1].toLowerCase(),l=Ze[s]||Ze._default,u=l[0],f.innerHTML=l[1]+a+l[2];u--;)f=f.lastChild;if(!K.support.tbody)for(p=ze.test(a),d="table"!==s||p?"<table>"!==l[1]||p?[]:f.childNodes:f.firstChild&&f.firstChild.childNodes,i=d.length-1;i>=0;--i)K.nodeName(d[i],"tbody")&&!d[i].childNodes.length&&d[i].parentNode.removeChild(d[i]);!K.support.leadingWhitespace&&Re.test(a)&&f.insertBefore(t.createTextNode(Re.exec(a)[0]),f.firstChild),a=f.childNodes,f=o.lastChild}else a=t.createTextNode(a);a.nodeType?v.push(a):v=K.merge(v,a)}if(f&&(o.removeChild(f),a=f=o=null),!K.support.appendChecked)for(y=0;null!=(a=v[y]);y++)K.nodeName(a,"input")?g(a):"undefined"!=typeof a.getElementsByTagName&&K.grep(a.getElementsByTagName("input"),g);if(n)for(h=function(e){if(!e.type||Qe.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)},y=0;null!=(a=v[y]);y++)K.nodeName(a,"script")&&h(a)||(n.appendChild(a),"undefined"!=typeof a.getElementsByTagName&&(m=K.grep(K.merge([],a.getElementsByTagName("script")),h),v.splice.apply(v,[y+1,0].concat(m)),y+=m.length));return v},cleanData:function(e,t){for(var n,r,i,o,a=0,s=K.expando,l=K.cache,u=K.support.deleteExpando,c=K.event.special;null!=(i=e[a]);a++)if((t||K.acceptData(i))&&(r=i[s],n=r&&l[r])){if(n.events)for(o in n.events)c[o]?K.event.remove(i,o):K.removeEvent(i,o,n.handle);l[r]&&(delete l[r],u?delete i[s]:i.removeAttribute?i.removeAttribute(s):i[s]=null,K.deletedIds.push(r))}}}),function(){var e,t;K.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=K.uaMatch(I.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.webkit&&(t.safari=!0),K.browser=t,K.sub=function(){function e(t,n){return new e.fn.init(t,n)}K.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function n(n,r){return r&&r instanceof K&&!(r instanceof e)&&(r=e(r)),K.fn.init.call(this,n,r,t)},e.fn.init.prototype=e.fn;var t=e(R);return e}}();var nt,rt,it,ot=/alpha\([^)]*\)/i,at=/opacity=([^)]*)/,st=/^(top|right|bottom|left)$/,lt=/^margin/,ut=new RegExp("^("+Z+")(.*)$","i"),ct=new RegExp("^("+Z+")(?!px)[a-z%]+$","i"),ft=new RegExp("^([-+])=("+Z+")","i"),pt={},dt={position:"absolute",visibility:"hidden",display:"block"},ht={letterSpacing:0,fontWeight:400,lineHeight:1},gt=["Top","Right","Bottom","Left"],mt=["Webkit","O","Moz","ms"],yt=K.fn.toggle;K.fn.extend({css:function(e,n){return K.access(this,function(e,n,r){return r!==t?K.style(e,n,r):K.css(e,n)},e,n,arguments.length>1)},show:function(){return v(this,!0)},hide:function(){return v(this)},toggle:function(e,t){var n="boolean"==typeof e;return K.isFunction(e)&&K.isFunction(t)?yt.apply(this,arguments):this.each(function(){(n?e:y(this))?K(this).show():K(this).hide()})}}),K.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=nt(e,"opacity");return""===n?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":K.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=K.camelCase(n),u=e.style;if(n=K.cssProps[l]||(K.cssProps[l]=m(u,l)),s=K.cssHooks[n]||K.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=ft.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(K.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"===a&&!K.cssNumber[l]&&(r+="px"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=K.camelCase(n);return n=K.cssProps[l]||(K.cssProps[l]=m(e.style,l)),s=K.cssHooks[n]||K.cssHooks[l],s&&"get"in s&&(o=s.get(e,!0,i)),o===t&&(o=nt(e,n)),"normal"===o&&n in ht&&(o=ht[n]),r||i!==t?(a=parseFloat(o),r||K.isNumeric(a)?a||0:o):o},swap:function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=o[i];return r}}),e.getComputedStyle?nt=function(e,t){var n,r,i,o,a=getComputedStyle(e,null),s=e.style;return a&&(n=a[t],""===n&&!K.contains(e.ownerDocument.documentElement,e)&&(n=K.style(e,t)),ct.test(n)&&lt.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=n,n=a.width,s.width=r,s.minWidth=i,s.maxWidth=o)),n}:R.documentElement.currentStyle&&(nt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],o=e.style;return null==i&&o&&o[t]&&(i=o[t]),ct.test(i)&&!st.test(t)&&(n=o.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),o.left="fontSize"===t?"1em":i,i=o.pixelLeft+"px",o.left=n,r&&(e.runtimeStyle.left=r)),""===i?"auto":i}),K.each(["height","width"],function(e,t){K.cssHooks[t]={get:function(e,n,r){if(n)return 0!==e.offsetWidth||"none"!==nt(e,"display")?w(e,t,r):K.swap(e,dt,function(){return w(e,t,r)})},set:function(e,n,r){return b(e,n,r?x(e,t,r,K.support.boxSizing&&"border-box"===K.css(e,"boxSizing")):0)}}}),K.support.opacity||(K.cssHooks.opacity={get:function(e,t){return at.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=K.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,t>=1&&""===K.trim(o.replace(ot,""))&&n.removeAttribute&&(n.removeAttribute("filter"),r&&!r.filter)||(n.filter=ot.test(o)?o.replace(ot,i):o+" "+i)}}),K(function(){K.support.reliableMarginRight||(K.cssHooks.marginRight={get:function(e,t){return K.swap(e,{display:"inline-block"},function(){if(t)return nt(e,"marginRight")})}}),!K.support.pixelPosition&&K.fn.position&&K.each(["top","left"],function(e,t){K.cssHooks[t]={get:function(e,n){if(n){var r=nt(e,t);return ct.test(r)?K(e).position()[t]+"px":r}}}})}),K.expr&&K.expr.filters&&(K.expr.filters.hidden=function(e){return 0===e.offsetWidth&&0===e.offsetHeight||!K.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||nt(e,"display"))},K.expr.filters.visible=function(e){return!K.expr.filters.hidden(e)}),K.each({margin:"",padding:"",border:"Width"},function(e,t){K.cssHooks[e+t]={expand:function(n){var r,i="string"==typeof n?n.split(" "):[n],o={};for(r=0;r<4;r++)o[e+gt[r]+t]=i[r]||i[r-2]||i[0];return o}},lt.test(e)||(K.cssHooks[e+t].set=b)});var vt=/%20/g,bt=/\[\]$/,xt=/\r?\n/g,wt=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,Tt=/^(?:select|textarea)/i;K.fn.extend({serialize:function(){return K.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?K.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||Tt.test(this.nodeName)||wt.test(this.type))}).map(function(e,t){var n=K(this).val();return null==n?null:K.isArray(n)?K.map(n,function(e,n){return{name:t.name,value:e.replace(xt,"\r\n")}}):{name:t.name,value:n.replace(xt,"\r\n")}}).get()}}),K.param=function(e,n){var r,i=[],o=function(e,t){t=K.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=K.ajaxSettings&&K.ajaxSettings.traditional),K.isArray(e)||e.jquery&&!K.isPlainObject(e))K.each(e,function(){o(this.name,this.value)});else for(r in e)N(r,e[r],n,o);return i.join("&").replace(vt,"+")};var Nt,Ct,Et=/#.*$/,kt=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,St=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,At=/^(?:GET|HEAD)$/,jt=/^\/\//,Dt=/\?/,Lt=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,Ht=/([?&])_=[^&]*/,Ft=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Mt=K.fn.load,Ot={},_t={},qt=["*/"]+["*"];try{Nt=$.href}catch(Bt){Nt=R.createElement("a"),Nt.href="",Nt=Nt.href}Ct=Ft.exec(Nt.toLowerCase())||[],K.fn.load=function(e,n,r){if("string"!=typeof e&&Mt)return Mt.apply(this,arguments);if(!this.length)return this;var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),K.isFunction(n)?(r=n,n=t):"object"==typeof n&&(o="POST"),K.ajax({url:e,type:o,dataType:"html",data:n,complete:function(e,t){r&&s.each(r,a||[e.responseText,t,e])}}).done(function(e){a=arguments,s.html(i?K("<div>").append(e.replace(Lt,"")).find(i):e)}),this},K.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){K.fn[t]=function(e){return this.on(t,e)}}),K.each(["get","post"],function(e,n){K[n]=function(e,r,i,o){return K.isFunction(r)&&(o=o||i,i=r,r=t),K.ajax({type:n,url:e,data:r,success:i,dataType:o})}}),K.extend({getScript:function(e,n){return K.get(e,t,n,"script")},getJSON:function(e,t,n){return K.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?k(e,K.ajaxSettings):(t=e,e=K.ajaxSettings),k(e,t),e},ajaxSettings:{url:Nt,isLocal:St.test(Ct[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":qt},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":K.parseJSON,"text xml":K.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:C(Ot),ajaxTransport:C(_t),ajax:function(e,n){function r(e,n,r,a){var u,f,v,b,w,N=n;2!==x&&(x=2,l&&clearTimeout(l),s=t,o=a||"",T.readyState=e>0?4:0,r&&(b=S(p,T,r)),e>=200&&e<300||304===e?(p.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(K.lastModified[i]=w),w=T.getResponseHeader("Etag"),w&&(K.etag[i]=w)),304===e?(N="notmodified",u=!0):(u=A(p,b),N=u.state,f=u.data,v=u.error,u=!v)):(v=N,N&&!e||(N="error",e<0&&(e=0))),T.status=e,T.statusText=""+(n||N),u?g.resolveWith(d,[f,N,T]):g.rejectWith(d,[T,N,v]),T.statusCode(y),y=t,c&&h.trigger("ajax"+(u?"Success":"Error"),[T,p,u?f:v]),m.fireWith(d,[T,N]),c&&(h.trigger("ajaxComplete",[T,p]),--K.active||K.event.trigger("ajaxStop")))}"object"==typeof e&&(n=e,e=t),n=n||{};var i,o,a,s,l,u,c,f,p=K.ajaxSetup({},n),d=p.context||p,h=d!==p&&(d.nodeType||d instanceof K)?K(d):K.event,g=K.Deferred(),m=K.Callbacks("once memory"),y=p.statusCode||{},v={},b={},x=0,w="canceled",T={readyState:0,setRequestHeader:function(e,t){if(!x){var n=e.toLowerCase();e=b[n]=b[n]||e,v[e]=t}return this},getAllResponseHeaders:function(){return 2===x?o:null},getResponseHeader:function(e){var n;if(2===x){if(!a)for(a={};n=kt.exec(o);)a[n[1].toLowerCase()]=n[2];n=a[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return x||(p.mimeType=e),this},abort:function(e){return e=e||w,s&&s.abort(e),r(0,e),this}};if(g.promise(T),T.success=T.done,T.error=T.fail,T.complete=m.add,T.statusCode=function(e){if(e){var t;if(x<2)for(t in e)y[t]=[y[t],e[t]];else t=e[T.status],T.always(t)}return this},p.url=((e||p.url)+"").replace(Et,"").replace(jt,Ct[1]+"//"),p.dataTypes=K.trim(p.dataType||"*").toLowerCase().split(te),null==p.crossDomain&&(u=Ft.exec(p.url.toLowerCase()),p.crossDomain=!(!u||u[1]==Ct[1]&&u[2]==Ct[2]&&(u[3]||("http:"===u[1]?80:443))==(Ct[3]||("http:"===Ct[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=K.param(p.data,p.traditional)),E(Ot,p,n,T),2===x)return T;if(c=p.global,p.type=p.type.toUpperCase(),p.hasContent=!At.test(p.type),c&&0===K.active++&&K.event.trigger("ajaxStart"),!p.hasContent&&(p.data&&(p.url+=(Dt.test(p.url)?"&":"?")+p.data,delete p.data),i=p.url,p.cache===!1)){var N=K.now(),C=p.url.replace(Ht,"$1_="+N);p.url=C+(C===p.url?(Dt.test(p.url)?"&":"?")+"_="+N:"")}(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&T.setRequestHeader("Content-Type",p.contentType),p.ifModified&&(i=i||p.url,K.lastModified[i]&&T.setRequestHeader("If-Modified-Since",K.lastModified[i]),K.etag[i]&&T.setRequestHeader("If-None-Match",K.etag[i])),T.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+qt+"; q=0.01":""):p.accepts["*"]);for(f in p.headers)T.setRequestHeader(f,p.headers[f]);if(!p.beforeSend||p.beforeSend.call(d,T,p)!==!1&&2!==x){w="abort";for(f in{success:1,error:1,complete:1})T[f](p[f]);if(s=E(_t,p,n,T)){T.readyState=1,c&&h.trigger("ajaxSend",[T,p]),p.async&&p.timeout>0&&(l=setTimeout(function(){T.abort("timeout")},p.timeout));try{x=1,s.send(v,r)}catch(k){if(!(x<2))throw k;r(-1,k)}}else r(-1,"No Transport");return T}return T.abort()},active:0,lastModified:{},etag:{}});var Wt=[],Pt=/\?/,Rt=/(=)\?(?=&|$)|\?\?/,$t=K.now();K.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Wt.pop()||K.expando+"_"+$t++;return this[e]=!0,e}}),K.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.data,u=n.url,c=n.jsonp!==!1,f=c&&Rt.test(u),p=c&&!f&&"string"==typeof l&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Rt.test(l);if("jsonp"===n.dataTypes[0]||f||p)return o=n.jsonpCallback=K.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,a=e[o],f?n.url=u.replace(Rt,"$1"+o):p?n.data=l.replace(Rt,"$1"+o):c&&(n.url+=(Pt.test(u)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||K.error(o+" was not called"),s[0]},n.dataTypes[0]="json",e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Wt.push(o)),s&&K.isFunction(a)&&a(s[0]),s=a=t}),"script"}),K.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return K.globalEval(e),e}}}),K.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),K.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=R.head||R.getElementsByTagName("head")[0]||R.documentElement;return{send:function(i,o){n=R.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){(i||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var It,zt=!!e.ActiveXObject&&function(){for(var e in It)It[e](0,1)},Xt=0;K.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&j()||D()}:j,function(e){K.extend(K.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(K.ajaxSettings.xhr()),K.support.ajax&&K.ajaxTransport(function(n){if(!n.crossDomain||K.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,f,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=K.noop,zt&&delete It[a]),i)4!==l.readyState&&l.abort();else{s=l.status,c=l.getAllResponseHeaders(),f={},p=l.responseXML,p&&p.documentElement&&(f.xml=p);try{f.text=l.responseText}catch(e){}try{u=l.statusText}catch(d){u=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=f.text?200:404}}catch(h){i||o(-1,h)}f&&o(s,u,f,c)},n.async?4===l.readyState?setTimeout(r,0):(a=++Xt,zt&&(It||(It={},K(e).unload(zt)),It[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var Ut,Yt,Jt=/^(?:toggle|show|hide)$/,Vt=new RegExp("^(?:([-+])=|)("+Z+")([a-z%]*)$","i"),Gt=/queueHooks$/,Qt=[O],Kt={"*":[function(e,t){var n,r,i,o=this.createTween(e,t),a=Vt.exec(t),s=o.cur(),l=+s||0,u=1;if(a){if(n=+a[2],r=a[3]||(K.cssNumber[e]?"":"px"),"px"!==r&&l){l=K.css(o.elem,e,!0)||n||1;do i=u=u||".5",l/=u,K.style(o.elem,e,l+r),u=o.cur()/s;while(1!==u&&u!==i)}o.unit=r,o.start=l,o.end=a[1]?l+(a[1]+1)*n:n}return o}]};K.Animation=K.extend(F,{tweener:function(e,t){K.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");for(var n,r=0,i=e.length;r<i;r++)n=e[r],Kt[n]=Kt[n]||[],Kt[n].unshift(t)},prefilter:function(e,t){t?Qt.unshift(e):Qt.push(e)}}),K.Tween=_,_.prototype={constructor:_,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(K.cssNumber[n]?"":"px")},cur:function(){var e=_.propHooks[this.prop];return e&&e.get?e.get(this):_.propHooks._default.get(this)},run:function(e){var t,n=_.propHooks[this.prop];return this.pos=t=K.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration),this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):_.propHooks._default.set(this),this}},_.prototype.init.prototype=_.prototype,_.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=K.css(e.elem,e.prop,!1,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){K.fx.step[e.prop]?K.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[K.cssProps[e.prop]]||K.cssHooks[e.prop])?K.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},_.propHooks.scrollTop=_.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},K.each(["toggle","show","hide"],function(e,t){var n=K.fn[t];K.fn[t]=function(r,i,o){return null==r||"boolean"==typeof r||!e&&K.isFunction(r)&&K.isFunction(i)?n.apply(this,arguments):this.animate(q(t,!0),r,i,o)}}),K.fn.extend({fadeTo:function(e,t,n,r){return this.filter(y).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=K.isEmptyObject(e),o=K.speed(t,n,r),a=function(){var t=F(this,K.extend({},e),o);i&&t.stop(!0)};return i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=K.timers,a=K._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Gt.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem===this&&(null==e||o[n].queue===e)&&(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&K.dequeue(this,e)})}}),K.each({slideDown:q("show"),slideUp:q("hide"),slideToggle:q("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){K.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),K.speed=function(e,t,n){var r=e&&"object"==typeof e?K.extend({},e):{complete:n||!n&&t||K.isFunction(e)&&e,duration:e,easing:n&&t||t&&!K.isFunction(t)&&t};return r.duration=K.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in K.fx.speeds?K.fx.speeds[r.duration]:K.fx.speeds._default,null!=r.queue&&r.queue!==!0||(r.queue="fx"),r.old=r.complete,r.complete=function(){K.isFunction(r.old)&&r.old.call(this),r.queue&&K.dequeue(this,r.queue)},r},K.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},K.timers=[],K.fx=_.prototype.init,K.fx.tick=function(){for(var e,t=K.timers,n=0;n<t.length;n++)e=t[n],!e()&&t[n]===e&&t.splice(n--,1);t.length||K.fx.stop()},K.fx.timer=function(e){e()&&K.timers.push(e)&&!Yt&&(Yt=setInterval(K.fx.tick,K.fx.interval))},K.fx.interval=13,K.fx.stop=function(){clearInterval(Yt),Yt=null},K.fx.speeds={slow:600,fast:200,_default:400},K.fx.step={},K.expr&&K.expr.filters&&(K.expr.filters.animated=function(e){return K.grep(K.timers,function(t){return e===t.elem}).length});var Zt=/^(?:body|html)$/i;K.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){K.offset.setOffset(this,e,t)});var n,r,i,o,a,s,l,u,c,f,p=this[0],d=p&&p.ownerDocument;if(d)return(i=d.body)===p?K.offset.bodyOffset(p):(r=d.documentElement,K.contains(r,p)?(n=p.getBoundingClientRect(),o=B(d),a=r.clientTop||i.clientTop||0,s=r.clientLeft||i.clientLeft||0,l=o.pageYOffset||r.scrollTop,u=o.pageXOffset||r.scrollLeft,c=n.top+l-a,f=n.left+u-s,{top:c,left:f}):{top:0,left:0})},K.offset={bodyOffset:function(e){var t=e.offsetTop,n=e.offsetLeft;return K.support.doesNotIncludeMarginInBodyOffset&&(t+=parseFloat(K.css(e,"marginTop"))||0,n+=parseFloat(K.css(e,"marginLeft"))||0),{top:t,left:n}},setOffset:function(e,t,n){var r=K.css(e,"position");"static"===r&&(e.style.position="relative");var i,o,a=K(e),s=a.offset(),l=K.css(e,"top"),u=K.css(e,"left"),c=("absolute"===r||"fixed"===r)&&K.inArray("auto",[l,u])>-1,f={},p={};c?(p=a.position(),i=p.top,o=p.left):(i=parseFloat(l)||0,o=parseFloat(u)||0),K.isFunction(t)&&(t=t.call(e,n,s)),null!=t.top&&(f.top=t.top-s.top+i),null!=t.left&&(f.left=t.left-s.left+o),"using"in t?t.using.call(e,f):a.css(f)}},K.fn.extend({position:function(){if(this[0]){var e=this[0],t=this.offsetParent(),n=this.offset(),r=Zt.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(K.css(e,"marginTop"))||0,n.left-=parseFloat(K.css(e,"marginLeft"))||0,r.top+=parseFloat(K.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(K.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}}},offsetParent:function(){return this.map(function(){for(var e=this.offsetParent||R.body;e&&!Zt.test(e.nodeName)&&"static"===K.css(e,"position");)e=e.offsetParent;return e||R.body})}}),K.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);K.fn[e]=function(i){return K.access(this,function(e,i,o){var a=B(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:void(a?a.scrollTo(r?K(a).scrollLeft():o,r?o:K(a).scrollTop()):e[i]=o)},e,i,arguments.length,null)}}),K.each({Height:"height",Width:"width"},function(e,n){K.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){K.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return K.access(this,function(n,r,i){var o;return K.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?K.css(n,r,i,s):K.style(n,r,i,s)},n,a?i:t,a)}})}),e.jQuery=e.$=K,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return K})}(window);
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js
index bcbf24834ac..78d1ff58e46 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js
@@ -1,18 +1 @@
-/*
- * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
- * http://benalman.com/projects/jquery-bbq-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,p){var i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return function(){return G.apply(this,F.concat(m.call(arguments)))}}function n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.noEscape(",/");$.deparam=l=function(I,F){var H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," ").split("&"),function(L,Q){var K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=M<N?O[P]||(R[M+1]&&isNaN(R[M+1])?{}:[]):J}}else{if($.isArray(H[P])){H[P].push(J)}else{if(H[P]!==i){H[P]=[H[P],J]}else{H[P]=J}}}}else{if(P){H[P]=F?i:""}}});return H};function z(H,F,G){if(F===i||typeof F==="boolean"){G=F;F=a[H?D:A]()}else{F=E(F)?F.replace(H?w:x,""):F}return l(F,G)}l[A]=B(z,0);l[D]=v=B(z,1);$[y]||($[y]=function(F){return $.extend(C,F)})({a:k,base:k,iframe:t,img:t,input:t,form:"action",link:k,script:t});j=$[y];function s(I,G,H,F){if(!E(H)&&typeof H!=="object"){F=H;H=G;G=i}return this.each(function(){var L=$(this),J=G||j()[(this.nodeName||"").toLowerCase()]||"",K=J&&L.attr(J)||"";L.attr(J,a[I](K,H,F))})}$.fn[A]=B(s,A);$.fn[D]=B(s,D);b.pushState=q=function(I,F){if(E(I)&&/^#/.test(I)&&F===i){F=2}var H=I!==i,G=c(p[g][k],H?I:{},H?F:2);p[g][k]=G+(/#/.test(G)?"":"#")};b.getState=u=function(F,G){return F===i||typeof F==="boolean"?v(F):v(G)[F]};b.removeState=function(F){var G={};if(F!==i){G=u();$.each($.isArray(F)?F:arguments,function(I,H){delete G[H]})}q(G,2)};e[d]=$.extend(e[d],{add:function(F){var H;function G(J){var I=J[D]=c();J.getState=function(K,L){return K===i||typeof K==="boolean"?l(I,K):l(I,L)[K]};H.apply(this,arguments)}if($.isFunction(F)){H=F;return G}else{H=F.handler;F.handler=G}}})})(jQuery,this);
-/*
- * jQuery hashchange event - v1.2 - 2/11/2010
- * http://benalman.com/projects/jquery-hashchange-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);
\ No newline at end of file
+!function(e,t){function n(e){return"string"==typeof e}function r(e){var t=g.call(arguments,1);return function(){return e.apply(this,t.concat(g.call(arguments)))}}function o(e){return e.replace(/^[^#]*#?(.*)$/,"$1")}function a(e){return e.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function i(r,o,a,i,c){var u,s,p,h,d;return i!==f?(p=a.match(r?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/),d=p[3]||"",2===c&&n(i)?s=i.replace(r?R:E,""):(h=l(p[2]),i=n(i)?l[r?A:w](i):i,s=2===c?i:1===c?e.extend({},i,h):e.extend({},h,i),s=b(s),r&&(s=s.replace(m,y))),u=p[1]+(r?"#":s||!p[1]?"?":"")+s+d):u=o(a!==f?a:t[S][q]),u}function c(e,t,r){return t===f||"boolean"==typeof t?(r=t,t=b[e?A:w]()):t=n(t)?t.replace(e?R:E,""):t,l(t,r)}function u(t,r,o,a){return n(o)||"object"==typeof o||(a=o,o=r,r=f),this.each(function(){var n=e(this),i=r||v()[(this.nodeName||"").toLowerCase()]||"",c=i&&n.attr(i)||"";n.attr(i,b[t](c,o,a))})}var f,s,l,p,h,d,v,m,g=Array.prototype.slice,y=decodeURIComponent,b=e.param,$=e.bbq=e.bbq||{},x=e.event.special,j="hashchange",w="querystring",A="fragment",N="elemUrlAttr",S="location",q="href",C="src",E=/^.*\?|#.*$/g,R=/^.*\#/,U={};b[w]=r(i,0,a),b[A]=s=r(i,1,o),s.noEscape=function(t){t=t||"";var n=e.map(t.split(""),encodeURIComponent);m=new RegExp(n.join("|"),"g")},s.noEscape(",/"),e.deparam=l=function(t,n){var r={},o={"true":!0,"false":!1,"null":null};return e.each(t.replace(/\+/g," ").split("&"),function(t,a){var i,c=a.split("="),u=y(c[0]),s=r,l=0,p=u.split("]["),h=p.length-1;if(/\[/.test(p[0])&&/\]$/.test(p[h])?(p[h]=p[h].replace(/\]$/,""),p=p.shift().split("[").concat(p),h=p.length-1):h=0,2===c.length)if(i=y(c[1]),n&&(i=i&&!isNaN(i)?+i:"undefined"===i?f:o[i]!==f?o[i]:i),h)for(;l<=h;l++)u=""===p[l]?s.length:p[l],s=s[u]=l<h?s[u]||(p[l+1]&&isNaN(p[l+1])?{}:[]):i;else e.isArray(r[u])?r[u].push(i):r[u]!==f?r[u]=[r[u],i]:r[u]=i;else u&&(r[u]=n?f:"")}),r},l[w]=r(c,0),l[A]=p=r(c,1),e[N]||(e[N]=function(t){return e.extend(U,t)})({a:q,base:q,iframe:C,img:C,input:C,form:"action",link:q,script:C}),v=e[N],e.fn[w]=r(u,w),e.fn[A]=r(u,A),$.pushState=h=function(e,r){n(e)&&/^#/.test(e)&&r===f&&(r=2);var o=e!==f,a=s(t[S][q],o?e:{},o?r:2);t[S][q]=a+(/#/.test(a)?"":"#")},$.getState=d=function(e,t){return e===f||"boolean"==typeof e?p(e):p(t)[e]},$.removeState=function(t){var n={};t!==f&&(n=d(),e.each(e.isArray(t)?t:arguments,function(e,t){delete n[t]})),h(n,2)},x[j]=e.extend(x[j],{add:function(t){function n(e){var t=e[A]=s();e.getState=function(e,n){return e===f||"boolean"==typeof e?l(t,e):l(t,n)[e]},r.apply(this,arguments)}var r;return e.isFunction(t)?(r=t,n):(r=t.handler,void(t.handler=n))}})}(jQuery,this),function(e,t,n){function r(e){return e=e||t[i][u],e.replace(/^[^#]*#?(.*)$/,"$1")}var o,a=e.event.special,i="location",c="hashchange",u="href",f=e.browser,s=document.documentMode,l=f.msie&&(s===n||s<8),p="on"+c in t&&!l;e[c+"Delay"]=100,a[c]=e.extend(a[c],{setup:function(){return!p&&void e(o.start)},teardown:function(){return!p&&void e(o.stop)}}),o=function(){function n(){f=s=function(e){return e},l&&(a=e('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow,s=function(){return r(a.document[i][u])},(f=function(e,t){if(e!==t){var n=a.document;n.open().close(),n[i].hash="#"+e}})(r()))}var o,a,f,s,p={};return p.start=function(){if(!o){var a=r();f||n(),function l(){var n=r(),p=s(a);n!==a?(f(a=n,p),e(t).trigger(c)):p!==a&&(t[i][u]=t[i][u].replace(/#.*/,"")+"#"+p),o=setTimeout(l,e[c+"Delay"])}()}},p.stop=function(){a||(o&&clearTimeout(o),o=0)},p}()}(jQuery,this);
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js
index ba32cff3651..b15997b9102 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js
@@ -1 +1 @@
-(function(b){b.fn.slideto=function(a){a=b.extend({slide_duration:"slow",highlight_duration:3E3,highlight:true,highlight_color:"#FFFF99"},a);return this.each(function(){obj=b(this);b("body").animate({scrollTop:obj.offset().top},a.slide_duration,function(){a.highlight&&b.ui.version&&obj.effect("highlight",{color:a.highlight_color},a.highlight_duration)})})}})(jQuery);
+!function(i){i.fn.slideto=function(o){return o=i.extend({slide_duration:"slow",highlight_duration:3e3,highlight:!0,highlight_color:"#FFFF99"},o),this.each(function(){obj=i(this),i("body").animate({scrollTop:obj.offset().top},o.slide_duration,function(){o.highlight&&i.ui.version&&obj.effect("highlight",{color:o.highlight_color},o.highlight_duration)})})}}(jQuery);
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js
index 2adb0d6d54a..6b4e261cc48 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js
@@ -1,8 +1 @@
-/*
-jQuery Wiggle
-Author: WonderGroup, Jordan Thomas
-URL: http://labs.wondergroup.com/demos/mini-ui/index.html
-License: MIT (http://en.wikipedia.org/wiki/MIT_License)
-*/
-jQuery.fn.wiggle=function(o){var d={speed:50,wiggles:3,travel:5,callback:null};var o=jQuery.extend(d,o);return this.each(function(){var cache=this;var wrap=jQuery(this).wrap('<div class="wiggle-wrap"></div>').css("position","relative");var calls=0;for(i=1;i<=o.wiggles;i++){jQuery(this).animate({left:"-="+o.travel},o.speed).animate({left:"+="+o.travel*2},o.speed*2).animate({left:"-="+o.travel},o.speed,function(){calls++;if(jQuery(cache).parent().hasClass('wiggle-wrap')){jQuery(cache).parent().replaceWith(cache);}
-if(calls==o.wiggles&&jQuery.isFunction(o.callback)){o.callback();}});}});};
\ No newline at end of file
+jQuery.fn.wiggle=function(e){var a={speed:50,wiggles:3,travel:5,callback:null},e=jQuery.extend(a,e);return this.each(function(){var a=this,l=(jQuery(this).wrap('<div class="wiggle-wrap"></div>').css("position","relative"),0);for(i=1;i<=e.wiggles;i++)jQuery(this).animate({left:"-="+e.travel},e.speed).animate({left:"+="+2*e.travel},2*e.speed).animate({left:"-="+e.travel},e.speed,function(){l++,jQuery(a).parent().hasClass("wiggle-wrap")&&jQuery(a).parent().replaceWith(a),l==e.wiggles&&jQuery.isFunction(e.callback)&&e.callback()})})};
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/js-yaml.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/js-yaml.min.js
new file mode 100644
index 00000000000..2514a410c84
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/js-yaml.min.js
@@ -0,0 +1,2 @@
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,e.jsyaml=t()}}(function(){var t;return function e(t,n,i){function r(a,s){if(!n[a]){if(!t[a]){var c="function"==typeof require&&require;if(!s&&c)return c(a,!0);if(o)return o(a,!0);var u=new Error("Cannot find module '"+a+"'");throw u.code="MODULE_NOT_FOUND",u}var l=n[a]={exports:{}};t[a][0].call(l.exports,function(e){var n=t[a][1][e];return r(n?n:e)},l,l.exports,e,t,n,i)}return n[a].exports}for(var o="function"==typeof require&&require,a=0;a<i.length;a++)r(i[a]);return r}({1:[function(t,e,n){"use strict";function i(t){return function(){throw new Error("Function "+t+" is deprecated and cannot be used.")}}var r=t("./js-yaml/loader"),o=t("./js-yaml/dumper");e.exports.Type=t("./js-yaml/type"),e.exports.Schema=t("./js-yaml/schema"),e.exports.FAILSAFE_SCHEMA=t("./js-yaml/schema/failsafe"),e.exports.JSON_SCHEMA=t("./js-yaml/schema/json"),e.exports.CORE_SCHEMA=t("./js-yaml/schema/core"),e.exports.DEFAULT_SAFE_SCHEMA=t("./js-yaml/schema/default_safe"),e.exports.DEFAULT_FULL_SCHEMA=t("./js-yaml/schema/default_full"),e.exports.load=r.load,e.exports.loadAll=r.loadAll,e.exports.safeLoad=r.safeLoad,e.exports.safeLoadAll=r.safeLoadAll,e.exports.dump=o.dump,e.exports.safeDump=o.safeDump,e.exports.YAMLException=t("./js-yaml/exception"),e.exports.MINIMAL_SCHEMA=t("./js-yaml/schema/failsafe"),e.exports.SAFE_SCHEMA=t("./js-yaml/schema/default_safe"),e.exports.DEFAULT_SCHEMA=t("./js-yaml/schema/default_full"),e.exports.scan=i("scan"),e.exports.parse=i("parse"),e.exports.compose=i("compose"),e.exports.addConstructor=i("addConstructor")},{"./js-yaml/dumper":3,"./js-yaml/exception":4,"./js-yaml/loader":5,"./js-yaml/schema":7,"./js-yaml/schema/core":8,"./js-yaml/schema/default_full":9,"./js-yaml/schema/default_safe":10,"./js-yaml/schema/failsafe":11,"./js-yaml/schema/json":12,"./js-yaml/type":13}],2:[function(t,e,n){"use strict";function i(t){return"undefined"==typeof t||null===t}function r(t){return"object"==typeof t&&null!==t}function o(t){return Array.isArray(t)?t:i(t)?[]:[t]}function a(t,e){var n,i,r,o;if(e)for(o=Object.keys(e),n=0,i=o.length;i>n;n+=1)r=o[n],t[r]=e[r];return t}function s(t,e){var n,i="";for(n=0;e>n;n+=1)i+=t;return i}function c(t){return 0===t&&Number.NEGATIVE_INFINITY===1/t}e.exports.isNothing=i,e.exports.isObject=r,e.exports.toArray=o,e.exports.repeat=s,e.exports.isNegativeZero=c,e.exports.extend=a},{}],3:[function(t,e,n){"use strict";function i(t,e){var n,i,r,o,a,s,c;if(null===e)return{};for(n={},i=Object.keys(e),r=0,o=i.length;o>r;r+=1)a=i[r],s=String(e[a]),"!!"===a.slice(0,2)&&(a="tag:yaml.org,2002:"+a.slice(2)),c=t.compiledTypeMap[a],c&&E.call(c.styleAliases,s)&&(s=c.styleAliases[s]),n[a]=s;return n}function r(t){var e,n,i;if(e=t.toString(16).toUpperCase(),255>=t)n="x",i=2;else if(65535>=t)n="u",i=4;else{if(!(4294967295>=t))throw new O("code point within a string may not be greater than 0xFFFFFFFF");n="U",i=8}return"\\"+n+j.repeat("0",i-e.length)+e}function o(t){this.schema=t.schema||S,this.indent=Math.max(1,t.indent||2),this.skipInvalid=t.skipInvalid||!1,this.flowLevel=j.isNothing(t.flowLevel)?-1:t.flowLevel,this.styleMap=i(this.schema,t.styles||null),this.sortKeys=t.sortKeys||!1,this.lineWidth=t.lineWidth||80,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function a(t,e){for(var n,i=j.repeat(" ",e),r=0,o=-1,a="",s=t.length;s>r;)o=t.indexOf("\n",r),-1===o?(n=t.slice(r),r=s):(n=t.slice(r,o+1),r=o+1),n.length&&"\n"!==n&&(a+=i),a+=n;return a}function s(t,e){return"\n"+j.repeat(" ",t.indent*e)}function c(t,e){var n,i,r;for(n=0,i=t.implicitTypes.length;i>n;n+=1)if(r=t.implicitTypes[n],r.resolve(e))return!0;return!1}function u(t){this.source=t,this.result="",this.checkpoint=0}function l(t,e,n,i){var r,o,s,l,f,m,y,g,v,x,A,b,w,k,C,j,O,S,_,I,E;if(0===e.length)return void(t.dump="''");if(-1!==et.indexOf(e))return void(t.dump="'"+e+"'");for(r=!0,o=e.length?e.charCodeAt(0):0,s=M===o||M===e.charCodeAt(e.length-1),(K===o||W===o||G===o||z===o)&&(r=!1),s?(r=!1,l=!1,f=!1):(l=!i,f=!i),m=!0,y=new u(e),g=!1,v=0,x=0,A=t.indent*n,b=t.lineWidth,-1===b&&(b=9007199254740991),40>A?b-=A:b=40,k=0;k<e.length;k++){if(w=e.charCodeAt(k),r){if(h(w))continue;r=!1}m&&w===P&&(m=!1),C=tt[w],j=d(w),(C||j)&&(w!==N&&w!==D&&w!==P?(l=!1,f=!1):w===N&&(g=!0,m=!1,k>0&&(O=e.charCodeAt(k-1),O===M&&(f=!1,l=!1)),l&&(S=k-v,v=k,S>x&&(x=S))),w!==D&&(m=!1),y.takeUpTo(k),y.escapeChar())}if(r&&c(t,e)&&(r=!1),_="",(l||f)&&(I=0,e.charCodeAt(e.length-1)===N&&(I+=1,e.charCodeAt(e.length-2)===N&&(I+=1)),0===I?_="-":2===I&&(_="+")),f&&b>x&&(l=!1),g||(f=!1),r)t.dump=e;else if(m)t.dump="'"+e+"'";else if(l)E=p(e,b),t.dump=">"+_+"\n"+a(E,A);else if(f)_||(e=e.replace(/\n$/,"")),t.dump="|"+_+"\n"+a(e,A);else{if(!y)throw new Error("Failed to dump scalar value");y.finish(),t.dump='"'+y.result+'"'}}function p(t,e){var n,i="",r=0,o=t.length,a=/\n+$/.exec(t);for(a&&(o=a.index+1);o>r;)n=t.indexOf("\n",r),n>o||-1===n?(i&&(i+="\n\n"),i+=f(t.slice(r,o),e),r=o):(i&&(i+="\n\n"),i+=f(t.slice(r,n),e),r=n+1);return a&&"\n"!==a[0]&&(i+=a[0]),i}function f(t,e){if(""===t)return t;for(var n,i,r,o=/[^\s] [^\s]/g,a="",s=0,c=0,u=o.exec(t);u;)n=u.index,n-c>e&&(i=s!==c?s:n,a&&(a+="\n"),r=t.slice(c,i),a+=r,c=i+1),s=n+1,u=o.exec(t);return a&&(a+="\n"),a+=c!==s&&t.length-c>e?t.slice(c,s)+"\n"+t.slice(s+1):t.slice(c)}function h(t){return F!==t&&N!==t&&T!==t&&$!==t&&V!==t&&Z!==t&&J!==t&&X!==t&&U!==t&&Y!==t&&B!==t&&L!==t&&Q!==t&&R!==t&&P!==t&&D!==t&&q!==t&&H!==t&&!tt[t]&&!d(t)}function d(t){return!(t>=32&&126>=t||133===t||t>=160&&55295>=t||t>=57344&&65533>=t||t>=65536&&1114111>=t)}function m(t,e,n){var i,r,o="",a=t.tag;for(i=0,r=n.length;r>i;i+=1)A(t,e,n[i],!1,!1)&&(0!==i&&(o+=", "),o+=t.dump);t.tag=a,t.dump="["+o+"]"}function y(t,e,n,i){var r,o,a="",c=t.tag;for(r=0,o=n.length;o>r;r+=1)A(t,e+1,n[r],!0,!0)&&(i&&0===r||(a+=s(t,e)),a+="- "+t.dump);t.tag=c,t.dump=a||"[]"}function g(t,e,n){var i,r,o,a,s,c="",u=t.tag,l=Object.keys(n);for(i=0,r=l.length;r>i;i+=1)s="",0!==i&&(s+=", "),o=l[i],a=n[o],A(t,e,o,!1,!1)&&(t.dump.length>1024&&(s+="? "),s+=t.dump+": ",A(t,e,a,!1,!1)&&(s+=t.dump,c+=s));t.tag=u,t.dump="{"+c+"}"}function v(t,e,n,i){var r,o,a,c,u,l,p="",f=t.tag,h=Object.keys(n);if(t.sortKeys===!0)h.sort();else if("function"==typeof t.sortKeys)h.sort(t.sortKeys);else if(t.sortKeys)throw new O("sortKeys must be a boolean or a function");for(r=0,o=h.length;o>r;r+=1)l="",i&&0===r||(l+=s(t,e)),a=h[r],c=n[a],A(t,e+1,a,!0,!0,!0)&&(u=null!==t.tag&&"?"!==t.tag||t.dump&&t.dump.length>1024,u&&(l+=t.dump&&N===t.dump.charCodeAt(0)?"?":"? "),l+=t.dump,u&&(l+=s(t,e)),A(t,e+1,c,!0,u)&&(l+=t.dump&&N===t.dump.charCodeAt(0)?":":": ",l+=t.dump,p+=l));t.tag=f,t.dump=p||"{}"}function x(t,e,n){var i,r,o,a,s,c;for(r=n?t.explicitTypes:t.implicitTypes,o=0,a=r.length;a>o;o+=1)if(s=r[o],(s.instanceOf||s.predicate)&&(!s.instanceOf||"object"==typeof e&&e instanceof s.instanceOf)&&(!s.predicate||s.predicate(e))){if(t.tag=n?s.tag:"?",s.represent){if(c=t.styleMap[s.tag]||s.defaultStyle,"[object Function]"===I.call(s.represent))i=s.represent(e,c);else{if(!E.call(s.represent,c))throw new O("!<"+s.tag+'> tag resolver accepts not "'+c+'" style');i=s.represent[c](e,c)}t.dump=i}return!0}return!1}function A(t,e,n,i,r,o){t.tag=null,t.dump=n,x(t,n,!1)||x(t,n,!0);var a=I.call(t.dump);i&&(i=0>t.flowLevel||t.flowLevel>e);var s,c,u="[object Object]"===a||"[object Array]"===a;if(u&&(s=t.duplicates.indexOf(n),c=-1!==s),(null!==t.tag&&"?"!==t.tag||c||2!==t.indent&&e>0)&&(r=!1),c&&t.usedDuplicates[s])t.dump="*ref_"+s;else{if(u&&c&&!t.usedDuplicates[s]&&(t.usedDuplicates[s]=!0),"[object Object]"===a)i&&0!==Object.keys(t.dump).length?(v(t,e,t.dump,r),c&&(t.dump="&ref_"+s+t.dump)):(g(t,e,t.dump),c&&(t.dump="&ref_"+s+" "+t.dump));else if("[object Array]"===a)i&&0!==t.dump.length?(y(t,e,t.dump,r),c&&(t.dump="&ref_"+s+t.dump)):(m(t,e,t.dump),c&&(t.dump="&ref_"+s+" "+t.dump));else{if("[object String]"!==a){if(t.skipInvalid)return!1;throw new O("unacceptable kind of an object to dump "+a)}"?"!==t.tag&&l(t,t.dump,e,o)}null!==t.tag&&"?"!==t.tag&&(t.dump="!<"+t.tag+"> "+t.dump)}return!0}function b(t,e){var n,i,r=[],o=[];for(w(t,r,o),n=0,i=o.length;i>n;n+=1)e.duplicates.push(r[o[n]]);e.usedDuplicates=new Array(i)}function w(t,e,n){var i,r,o;if(null!==t&&"object"==typeof t)if(r=e.indexOf(t),-1!==r)-1===n.indexOf(r)&&n.push(r);else if(e.push(t),Array.isArray(t))for(r=0,o=t.length;o>r;r+=1)w(t[r],e,n);else for(i=Object.keys(t),r=0,o=i.length;o>r;r+=1)w(t[i[r]],e,n)}function k(t,e){e=e||{};var n=new o(e);return b(t,n),A(n,0,t,!0,!0)?n.dump+"\n":""}function C(t,e){return k(t,j.extend({schema:_},e))}var j=t("./common"),O=t("./exception"),S=t("./schema/default_full"),_=t("./schema/default_safe"),I=Object.prototype.toString,E=Object.prototype.hasOwnProperty,F=9,N=10,T=13,M=32,L=33,D=34,U=35,q=37,Y=38,P=39,B=42,$=44,K=45,H=58,R=62,W=63,G=64,V=91,Z=93,z=96,J=123,Q=124,X=125,tt={};tt[0]="\\0",tt[7]="\\a",tt[8]="\\b",tt[9]="\\t",tt[10]="\\n",tt[11]="\\v",tt[12]="\\f",tt[13]="\\r",tt[27]="\\e",tt[34]='\\"',tt[92]="\\\\",tt[133]="\\N",tt[160]="\\_",tt[8232]="\\L",tt[8233]="\\P";var et=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"];u.prototype.takeUpTo=function(t){var e;if(t<this.checkpoint)throw e=new Error("position should be > checkpoint"),e.position=t,e.checkpoint=this.checkpoint,e;return this.result+=this.source.slice(this.checkpoint,t),this.checkpoint=t,this},u.prototype.escapeChar=function(){var t,e;return t=this.source.charCodeAt(this.checkpoint),e=tt[t]||r(t),this.result+=e,this.checkpoint+=1,this},u.prototype.finish=function(){this.source.length>this.checkpoint&&this.takeUpTo(this.source.length)},e.exports.dump=k,e.exports.safeDump=C},{"./common":2,"./exception":4,"./schema/default_full":9,"./schema/default_safe":10}],4:[function(t,e,n){"use strict";function i(t,e){Error.call(this),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack||"",this.name="YAMLException",this.reason=t,this.mark=e,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():"")}var r=t("inherit");r(i,Error),i.prototype.toString=function(t){var e=this.name+": ";return e+=this.reason||"(unknown reason)",!t&&this.mark&&(e+=" "+this.mark.toString()),e},e.exports=i},{inherit:31}],5:[function(t,e,n){"use strict";function i(t){return 10===t||13===t}function r(t){return 9===t||32===t}function o(t){return 9===t||32===t||10===t||13===t}function a(t){return 44===t||91===t||93===t||123===t||125===t}function s(t){var e;return t>=48&&57>=t?t-48:(e=32|t,e>=97&&102>=e?e-97+10:-1)}function c(t){return 120===t?2:117===t?4:85===t?8:0}function u(t){return t>=48&&57>=t?t-48:-1}function l(t){return 48===t?"\0":97===t?"":98===t?"\b":116===t?"\t":9===t?"\t":110===t?"\n":118===t?"\x0B":102===t?"\f":114===t?"\r":101===t?"":32===t?" ":34===t?'"':47===t?"/":92===t?"\\":78===t?"…":95===t?" ":76===t?"\u2028":80===t?"\u2029":""}function p(t){return 65535>=t?String.fromCharCode(t):String.fromCharCode((t-65536>>10)+55296,(t-65536&1023)+56320)}function f(t,e){this.input=t,this.filename=e.filename||null,this.schema=e.schema||H,this.onWarning=e.onWarning||null,this.legacy=e.legacy||!1,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=t.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function h(t,e){return new B(e,new $(t.filename,t.input,t.position,t.line,t.position-t.lineStart))}function d(t,e){throw h(t,e)}function m(t,e){t.onWarning&&t.onWarning.call(null,h(t,e))}function y(t,e,n,i){var r,o,a,s;if(n>e){if(s=t.input.slice(e,n),i)for(r=0,o=s.length;o>r;r+=1)a=s.charCodeAt(r),9===a||a>=32&&1114111>=a||d(t,"expected valid JSON character");else X.test(s)&&d(t,"the stream contains non-printable characters");t.result+=s}}function g(t,e,n){var i,r,o,a;for(P.isObject(n)||d(t,"cannot merge mappings; the provided source object is unacceptable"),i=Object.keys(n),o=0,a=i.length;a>o;o+=1)r=i[o],R.call(e,r)||(e[r]=n[r])}function v(t,e,n,i,r){var o,a;if(i=String(i),null===e&&(e={}),"tag:yaml.org,2002:merge"===n)if(Array.isArray(r))for(o=0,a=r.length;a>o;o+=1)g(t,e,r[o]);else g(t,e,r);else e[i]=r;return e}function x(t){var e;e=t.input.charCodeAt(t.position),10===e?t.position++:13===e?(t.position++,10===t.input.charCodeAt(t.position)&&t.position++):d(t,"a line break is expected"),t.line+=1,t.lineStart=t.position}function A(t,e,n){for(var o=0,a=t.input.charCodeAt(t.position);0!==a;){for(;r(a);)a=t.input.charCodeAt(++t.position);if(e&&35===a)do a=t.input.charCodeAt(++t.position);while(10!==a&&13!==a&&0!==a);if(!i(a))break;for(x(t),a=t.input.charCodeAt(t.position),o++,t.lineIndent=0;32===a;)t.lineIndent++,a=t.input.charCodeAt(++t.position)}return-1!==n&&0!==o&&t.lineIndent<n&&m(t,"deficient indentation"),o}function b(t){var e,n=t.position;return e=t.input.charCodeAt(n),!(45!==e&&46!==e||t.input.charCodeAt(n+1)!==e||t.input.charCodeAt(n+2)!==e||(n+=3,e=t.input.charCodeAt(n),0!==e&&!o(e)))}function w(t,e){1===e?t.result+=" ":e>1&&(t.result+=P.repeat("\n",e-1))}function k(t,e,n){var s,c,u,l,p,f,h,d,m,g=t.kind,v=t.result;if(m=t.input.charCodeAt(t.position),o(m)||a(m)||35===m||38===m||42===m||33===m||124===m||62===m||39===m||34===m||37===m||64===m||96===m)return!1;if((63===m||45===m)&&(c=t.input.charCodeAt(t.position+1),o(c)||n&&a(c)))return!1;for(t.kind="scalar",t.result="",u=l=t.position,p=!1;0!==m;){if(58===m){if(c=t.input.charCodeAt(t.position+1),o(c)||n&&a(c))break}else if(35===m){if(s=t.input.charCodeAt(t.position-1),o(s))break}else{if(t.position===t.lineStart&&b(t)||n&&a(m))break;if(i(m)){if(f=t.line,h=t.lineStart,d=t.lineIndent,A(t,!1,-1),t.lineIndent>=e){p=!0,m=t.input.charCodeAt(t.position);continue}t.position=l,t.line=f,t.lineStart=h,t.lineIndent=d;break}}p&&(y(t,u,l,!1),w(t,t.line-f),u=l=t.position,p=!1),r(m)||(l=t.position+1),m=t.input.charCodeAt(++t.position)}return y(t,u,l,!1),!!t.result||(t.kind=g,t.result=v,!1)}function C(t,e){var n,r,o;if(n=t.input.charCodeAt(t.position),39!==n)return!1;for(t.kind="scalar",t.result="",t.position++,r=o=t.position;0!==(n=t.input.charCodeAt(t.position));)if(39===n){if(y(t,r,t.position,!0),n=t.input.charCodeAt(++t.position),39!==n)return!0;r=o=t.position,t.position++}else i(n)?(y(t,r,o,!0),w(t,A(t,!1,e)),r=o=t.position):t.position===t.lineStart&&b(t)?d(t,"unexpected end of the document within a single quoted scalar"):(t.position++,o=t.position);d(t,"unexpected end of the stream within a single quoted scalar")}function j(t,e){var n,r,o,a,u,l;if(l=t.input.charCodeAt(t.position),34!==l)return!1;for(t.kind="scalar",t.result="",t.position++,n=r=t.position;0!==(l=t.input.charCodeAt(t.position));){if(34===l)return y(t,n,t.position,!0),t.position++,!0;if(92===l){if(y(t,n,t.position,!0),l=t.input.charCodeAt(++t.position),i(l))A(t,!1,e);else if(256>l&&rt[l])t.result+=ot[l],t.position++;else if((u=c(l))>0){for(o=u,a=0;o>0;o--)l=t.input.charCodeAt(++t.position),(u=s(l))>=0?a=(a<<4)+u:d(t,"expected hexadecimal character");t.result+=p(a),t.position++}else d(t,"unknown escape sequence");n=r=t.position}else i(l)?(y(t,n,r,!0),w(t,A(t,!1,e)),n=r=t.position):t.position===t.lineStart&&b(t)?d(t,"unexpected end of the document within a double quoted scalar"):(t.position++,r=t.position)}d(t,"unexpected end of the stream within a double quoted scalar")}function O(t,e){var n,i,r,a,s,c,u,l,p,f,h,m=!0,y=t.tag,g=t.anchor;if(h=t.input.charCodeAt(t.position),91===h)a=93,u=!1,i=[];else{if(123!==h)return!1;a=125,u=!0,i={}}for(null!==t.anchor&&(t.anchorMap[t.anchor]=i),h=t.input.charCodeAt(++t.position);0!==h;){if(A(t,!0,e),h=t.input.charCodeAt(t.position),h===a)return t.position++,t.tag=y,t.anchor=g,t.kind=u?"mapping":"sequence",t.result=i,!0;m||d(t,"missed comma between flow collection entries"),p=l=f=null,s=c=!1,63===h&&(r=t.input.charCodeAt(t.position+1),o(r)&&(s=c=!0,t.position++,A(t,!0,e))),n=t.line,T(t,e,W,!1,!0),p=t.tag,l=t.result,A(t,!0,e),h=t.input.charCodeAt(t.position),!c&&t.line!==n||58!==h||(s=!0,h=t.input.charCodeAt(++t.position),A(t,!0,e),T(t,e,W,!1,!0),f=t.result),u?v(t,i,p,l,f):i.push(s?v(t,null,p,l,f):l),A(t,!0,e),h=t.input.charCodeAt(t.position),44===h?(m=!0,h=t.input.charCodeAt(++t.position)):m=!1}d(t,"unexpected end of the stream within a flow collection")}function S(t,e){var n,o,a,s,c=z,l=!1,p=e,f=0,h=!1;if(s=t.input.charCodeAt(t.position),124===s)o=!1;else{if(62!==s)return!1;o=!0}for(t.kind="scalar",t.result="";0!==s;)if(s=t.input.charCodeAt(++t.position),43===s||45===s)z===c?c=43===s?Q:J:d(t,"repeat of a chomping mode identifier");else{if(!((a=u(s))>=0))break;0===a?d(t,"bad explicit indentation width of a block scalar; it cannot be less than one"):l?d(t,"repeat of an indentation width identifier"):(p=e+a-1,l=!0)}if(r(s)){do s=t.input.charCodeAt(++t.position);while(r(s));if(35===s)do s=t.input.charCodeAt(++t.position);while(!i(s)&&0!==s)}for(;0!==s;){for(x(t),t.lineIndent=0,s=t.input.charCodeAt(t.position);(!l||t.lineIndent<p)&&32===s;)t.lineIndent++,s=t.input.charCodeAt(++t.position);if(!l&&t.lineIndent>p&&(p=t.lineIndent),i(s))f++;else{if(t.lineIndent<p){c===Q?t.result+=P.repeat("\n",f):c===z&&l&&(t.result+="\n");break}for(o?r(s)?(h=!0,t.result+=P.repeat("\n",f+1)):h?(h=!1,t.result+=P.repeat("\n",f+1)):0===f?l&&(t.result+=" "):t.result+=P.repeat("\n",f):l?t.result+=P.repeat("\n",f+1):t.result+=P.repeat("\n",f),l=!0,f=0,n=t.position;!i(s)&&0!==s;)s=t.input.charCodeAt(++t.position);y(t,n,t.position,!1)}}return!0}function _(t,e){var n,i,r,a=t.tag,s=t.anchor,c=[],u=!1;for(null!==t.anchor&&(t.anchorMap[t.anchor]=c),r=t.input.charCodeAt(t.position);0!==r&&45===r&&(i=t.input.charCodeAt(t.position+1),o(i));)if(u=!0,t.position++,A(t,!0,-1)&&t.lineIndent<=e)c.push(null),r=t.input.charCodeAt(t.position);else if(n=t.line,T(t,e,V,!1,!0),c.push(t.result),A(t,!0,-1),r=t.input.charCodeAt(t.position),(t.line===n||t.lineIndent>e)&&0!==r)d(t,"bad indentation of a sequence entry");else if(t.lineIndent<e)break;return!!u&&(t.tag=a,t.anchor=s,t.kind="sequence",t.result=c,!0)}function I(t,e,n){var i,a,s,c,u=t.tag,l=t.anchor,p={},f=null,h=null,m=null,y=!1,g=!1;for(null!==t.anchor&&(t.anchorMap[t.anchor]=p),c=t.input.charCodeAt(t.position);0!==c;){if(i=t.input.charCodeAt(t.position+1),s=t.line,63!==c&&58!==c||!o(i)){if(!T(t,n,G,!1,!0))break;if(t.line===s){for(c=t.input.charCodeAt(t.position);r(c);)c=t.input.charCodeAt(++t.position);if(58===c)c=t.input.charCodeAt(++t.position),o(c)||d(t,"a whitespace character is expected after the key-value separator within a block mapping"),y&&(v(t,p,f,h,null),f=h=m=null),g=!0,y=!1,a=!1,f=t.tag,h=t.result;else{if(!g)return t.tag=u,t.anchor=l,!0;d(t,"can not read an implicit mapping pair; a colon is missed")}}else{if(!g)return t.tag=u,t.anchor=l,!0;d(t,"can not read a block mapping entry; a multiline key may not be an implicit key")}}else 63===c?(y&&(v(t,p,f,h,null),f=h=m=null),g=!0,y=!0,a=!0):y?(y=!1,a=!0):d(t,"incomplete explicit mapping pair; a key node is missed"),t.position+=1,c=i;if((t.line===s||t.lineIndent>e)&&(T(t,e,Z,!0,a)&&(y?h=t.result:m=t.result),y||(v(t,p,f,h,m),f=h=m=null),A(t,!0,-1),c=t.input.charCodeAt(t.position)),t.lineIndent>e&&0!==c)d(t,"bad indentation of a mapping entry");else if(t.lineIndent<e)break}return y&&v(t,p,f,h,null),g&&(t.tag=u,t.anchor=l,t.kind="mapping",t.result=p),g}function E(t){var e,n,i,r,a=!1,s=!1;if(r=t.input.charCodeAt(t.position),33!==r)return!1;if(null!==t.tag&&d(t,"duplication of a tag property"),r=t.input.charCodeAt(++t.position),60===r?(a=!0,r=t.input.charCodeAt(++t.position)):33===r?(s=!0,n="!!",r=t.input.charCodeAt(++t.position)):n="!",e=t.position,a){do r=t.input.charCodeAt(++t.position);while(0!==r&&62!==r);t.position<t.length?(i=t.input.slice(e,t.position),r=t.input.charCodeAt(++t.position)):d(t,"unexpected end of the stream within a verbatim tag")}else{for(;0!==r&&!o(r);)33===r&&(s?d(t,"tag suffix cannot contain exclamation marks"):(n=t.input.slice(e-1,t.position+1),nt.test(n)||d(t,"named tag handle cannot contain such characters"),s=!0,e=t.position+1)),r=t.input.charCodeAt(++t.position);i=t.input.slice(e,t.position),et.test(i)&&d(t,"tag suffix cannot contain flow indicator characters")}return i&&!it.test(i)&&d(t,"tag name cannot contain such characters: "+i),a?t.tag=i:R.call(t.tagMap,n)?t.tag=t.tagMap[n]+i:"!"===n?t.tag="!"+i:"!!"===n?t.tag="tag:yaml.org,2002:"+i:d(t,'undeclared tag handle "'+n+'"'),!0}function F(t){var e,n;if(n=t.input.charCodeAt(t.position),38!==n)return!1;for(null!==t.anchor&&d(t,"duplication of an anchor property"),n=t.input.charCodeAt(++t.position),e=t.position;0!==n&&!o(n)&&!a(n);)n=t.input.charCodeAt(++t.position);return t.position===e&&d(t,"name of an anchor node must contain at least one character"),t.anchor=t.input.slice(e,t.position),!0}function N(t){var e,n,i;if(i=t.input.charCodeAt(t.position),42!==i)return!1;for(i=t.input.charCodeAt(++t.position),e=t.position;0!==i&&!o(i)&&!a(i);)i=t.input.charCodeAt(++t.position);return t.position===e&&d(t,"name of an alias node must contain at least one character"),n=t.input.slice(e,t.position),t.anchorMap.hasOwnProperty(n)||d(t,'unidentified alias "'+n+'"'),t.result=t.anchorMap[n],A(t,!0,-1),!0}function T(t,e,n,i,r){var o,a,s,c,u,l,p,f,h=1,m=!1,y=!1;if(t.tag=null,t.anchor=null,t.kind=null,t.result=null,o=a=s=Z===n||V===n,i&&A(t,!0,-1)&&(m=!0,t.lineIndent>e?h=1:t.lineIndent===e?h=0:t.lineIndent<e&&(h=-1)),1===h)for(;E(t)||F(t);)A(t,!0,-1)?(m=!0,s=o,t.lineIndent>e?h=1:t.lineIndent===e?h=0:t.lineIndent<e&&(h=-1)):s=!1;if(s&&(s=m||r),(1===h||Z===n)&&(p=W===n||G===n?e:e+1,f=t.position-t.lineStart,1===h?s&&(_(t,f)||I(t,f,p))||O(t,p)?y=!0:(a&&S(t,p)||C(t,p)||j(t,p)?y=!0:N(t)?(y=!0,(null!==t.tag||null!==t.anchor)&&d(t,"alias node should not have any properties")):k(t,p,W===n)&&(y=!0,null===t.tag&&(t.tag="?")),null!==t.anchor&&(t.anchorMap[t.anchor]=t.result)):0===h&&(y=s&&_(t,f))),null!==t.tag&&"!"!==t.tag)if("?"===t.tag){for(c=0,u=t.implicitTypes.length;u>c;c+=1)if(l=t.implicitTypes[c],l.resolve(t.result)){t.result=l.construct(t.result),t.tag=l.tag,null!==t.anchor&&(t.anchorMap[t.anchor]=t.result);break}}else R.call(t.typeMap,t.tag)?(l=t.typeMap[t.tag],null!==t.result&&l.kind!==t.kind&&d(t,"unacceptable node kind for !<"+t.tag+'> tag; it should be "'+l.kind+'", not "'+t.kind+'"'),l.resolve(t.result)?(t.result=l.construct(t.result),null!==t.anchor&&(t.anchorMap[t.anchor]=t.result)):d(t,"cannot resolve a node with !<"+t.tag+"> explicit tag")):d(t,"unknown tag !<"+t.tag+">");return null!==t.tag||null!==t.anchor||y}function M(t){var e,n,a,s,c=t.position,u=!1;for(t.version=null,t.checkLineBreaks=t.legacy,t.tagMap={},t.anchorMap={};0!==(s=t.input.charCodeAt(t.position))&&(A(t,!0,-1),s=t.input.charCodeAt(t.position),!(t.lineIndent>0||37!==s));){for(u=!0,s=t.input.charCodeAt(++t.position),e=t.position;0!==s&&!o(s);)s=t.input.charCodeAt(++t.position);for(n=t.input.slice(e,t.position),a=[],n.length<1&&d(t,"directive name must not be less than one character in length");0!==s;){for(;r(s);)s=t.input.charCodeAt(++t.position);if(35===s){do s=t.input.charCodeAt(++t.position);while(0!==s&&!i(s));break}if(i(s))break;for(e=t.position;0!==s&&!o(s);)s=t.input.charCodeAt(++t.position);a.push(t.input.slice(e,t.position))}0!==s&&x(t),R.call(st,n)?st[n](t,n,a):m(t,'unknown document directive "'+n+'"')}return A(t,!0,-1),0===t.lineIndent&&45===t.input.charCodeAt(t.position)&&45===t.input.charCodeAt(t.position+1)&&45===t.input.charCodeAt(t.position+2)?(t.position+=3,A(t,!0,-1)):u&&d(t,"directives end mark is expected"),T(t,t.lineIndent-1,Z,!1,!0),A(t,!0,-1),t.checkLineBreaks&&tt.test(t.input.slice(c,t.position))&&m(t,"non-ASCII line breaks are interpreted as content"),t.documents.push(t.result),t.position===t.lineStart&&b(t)?void(46===t.input.charCodeAt(t.position)&&(t.position+=3,A(t,!0,-1))):void(t.position<t.length-1&&d(t,"end of the stream or a document separator is expected"))}function L(t,e){t=String(t),e=e||{},0!==t.length&&(10!==t.charCodeAt(t.length-1)&&13!==t.charCodeAt(t.length-1)&&(t+="\n"),65279===t.charCodeAt(0)&&(t=t.slice(1)));var n=new f(t,e);for(n.input+="\0";32===n.input.charCodeAt(n.position);)n.lineIndent+=1,n.position+=1;for(;n.position<n.length-1;)M(n);return n.documents}function D(t,e,n){var i,r,o=L(t,n);for(i=0,r=o.length;r>i;i+=1)e(o[i])}function U(t,e){var n=L(t,e);if(0!==n.length){if(1===n.length)return n[0];throw new B("expected a single document in the stream, but found more")}}function q(t,e,n){D(t,e,P.extend({schema:K},n))}function Y(t,e){return U(t,P.extend({schema:K},e))}for(var P=t("./common"),B=t("./exception"),$=t("./mark"),K=t("./schema/default_safe"),H=t("./schema/default_full"),R=Object.prototype.hasOwnProperty,W=1,G=2,V=3,Z=4,z=1,J=2,Q=3,X=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,tt=/[\x85\u2028\u2029]/,et=/[,\[\]\{\}]/,nt=/^(?:!|!!|![a-z\-]+!)$/i,it=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i,rt=new Array(256),ot=new Array(256),at=0;256>at;at++)rt[at]=l(at)?1:0,ot[at]=l(at);var st={YAML:function(t,e,n){var i,r,o;null!==t.version&&d(t,"duplication of %YAML directive"),1!==n.length&&d(t,"YAML directive accepts exactly one argument"),i=/^([0-9]+)\.([0-9]+)$/.exec(n[0]),null===i&&d(t,"ill-formed argument of the YAML directive"),r=parseInt(i[1],10),o=parseInt(i[2],10),1!==r&&d(t,"unacceptable YAML version of the document"),t.version=n[0],t.checkLineBreaks=2>o,1!==o&&2!==o&&m(t,"unsupported YAML version of the document")},TAG:function(t,e,n){var i,r;2!==n.length&&d(t,"TAG directive accepts exactly two arguments"),i=n[0],r=n[1],nt.test(i)||d(t,"ill-formed tag handle (first argument) of the TAG directive"),R.call(t.tagMap,i)&&d(t,'there is a previously declared suffix for "'+i+'" tag handle'),it.test(r)||d(t,"ill-formed tag prefix (second argument) of the TAG directive"),t.tagMap[i]=r}};e.exports.loadAll=D,e.exports.load=U,e.exports.safeLoadAll=q,e.exports.safeLoad=Y},{"./common":2,"./exception":4,"./mark":6,"./schema/default_full":9,"./schema/default_safe":10}],6:[function(t,e,n){"use strict";function i(t,e,n,i,r){this.name=t,this.buffer=e,this.position=n,this.line=i,this.column=r}var r=t("./common");i.prototype.getSnippet=function(t,e){var n,i,o,a,s;if(!this.buffer)return null;for(t=t||4,e=e||75,n="",i=this.position;i>0&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(i-1));)if(i-=1,this.position-i>e/2-1){n=" ... ",i+=5;break}for(o="",a=this.position;a<this.buffer.length&&-1==="\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(a));)if(a+=1,a-this.position>e/2-1){o=" ... ",a-=5;break}return s=this.buffer.slice(i,a),r.repeat(" ",t)+n+s+o+"\n"+r.repeat(" ",t+this.position-i+n.length)+"^"},i.prototype.toString=function(t){var e,n="";return this.name&&(n+='in "'+this.name+'" '),n+="at line "+(this.line+1)+", column "+(this.column+1),t||(e=this.getSnippet(),e&&(n+=":\n"+e)),n},e.exports=i},{"./common":2}],7:[function(t,e,n){"use strict";function i(t,e,n){var r=[];return t.include.forEach(function(t){n=i(t,e,n)}),t[e].forEach(function(t){n.forEach(function(e,n){e.tag===t.tag&&r.push(n)}),n.push(t)}),n.filter(function(t,e){return-1===r.indexOf(e)})}function r(){function t(t){i[t.tag]=t}var e,n,i={};for(e=0,n=arguments.length;n>e;e+=1)arguments[e].forEach(t);return i}function o(t){this.include=t.include||[],this.implicit=t.implicit||[],this.explicit=t.explicit||[],this.implicit.forEach(function(t){if(t.loadKind&&"scalar"!==t.loadKind)throw new s("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")}),this.compiledImplicit=i(this,"implicit",[]),this.compiledExplicit=i(this,"explicit",[]),this.compiledTypeMap=r(this.compiledImplicit,this.compiledExplicit)}var a=t("./common"),s=t("./exception"),c=t("./type");o.DEFAULT=null,o.create=function(){var t,e;switch(arguments.length){case 1:t=o.DEFAULT,e=arguments[0];break;case 2:t=arguments[0],e=arguments[1];break;default:throw new s("Wrong number of arguments for Schema.create function")}if(t=a.toArray(t),e=a.toArray(e),!t.every(function(t){return t instanceof o}))throw new s("Specified list of super schemas (or a single Schema object) contains a non-Schema object.");if(!e.every(function(t){return t instanceof c}))throw new s("Specified list of YAML types (or a single Type object) contains a non-Type object.");return new o({include:t,explicit:e})},e.exports=o},{"./common":2,"./exception":4,"./type":13}],8:[function(t,e,n){"use strict";var i=t("../schema");e.exports=new i({include:[t("./json")]})},{"../schema":7,"./json":12}],9:[function(t,e,n){"use strict";var i=t("../schema");e.exports=i.DEFAULT=new i({include:[t("./default_safe")],explicit:[t("../type/js/undefined"),t("../type/js/regexp"),t("../type/js/function")]})},{"../schema":7,"../type/js/function":18,"../type/js/regexp":19,"../type/js/undefined":20,"./default_safe":10}],10:[function(t,e,n){"use strict";var i=t("../schema");e.exports=new i({include:[t("./core")],implicit:[t("../type/timestamp"),t("../type/merge")],explicit:[t("../type/binary"),t("../type/omap"),t("../type/pairs"),t("../type/set")]})},{"../schema":7,"../type/binary":14,"../type/merge":22,"../type/omap":24,"../type/pairs":25,"../type/set":27,"../type/timestamp":29,"./core":8}],11:[function(t,e,n){"use strict";var i=t("../schema");e.exports=new i({explicit:[t("../type/str"),t("../type/seq"),t("../type/map")]})},{"../schema":7,"../type/map":21,"../type/seq":26,"../type/str":28}],12:[function(t,e,n){"use strict";var i=t("../schema");e.exports=new i({include:[t("./failsafe")],implicit:[t("../type/null"),t("../type/bool"),t("../type/int"),t("../type/float")]})},{"../schema":7,"../type/bool":15,"../type/float":16,"../type/int":17,"../type/null":23,"./failsafe":11}],13:[function(t,e,n){"use strict";function i(t){var e={};return null!==t&&Object.keys(t).forEach(function(n){t[n].forEach(function(t){e[String(t)]=n})}),e}function r(t,e){if(e=e||{},Object.keys(e).forEach(function(e){if(-1===a.indexOf(e))throw new o('Unknown option "'+e+'" is met in definition of "'+t+'" YAML type.')}),this.tag=t,this.kind=e.kind||null,this.resolve=e.resolve||function(){return!0},this.construct=e.construct||function(t){return t},this.instanceOf=e.instanceOf||null,this.predicate=e.predicate||null,this.represent=e.represent||null,this.defaultStyle=e.defaultStyle||null,this.styleAliases=i(e.styleAliases||null),-1===s.indexOf(this.kind))throw new o('Unknown kind "'+this.kind+'" is specified for "'+t+'" YAML type.')}var o=t("./exception"),a=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],s=["scalar","sequence","mapping"];e.exports=r},{"./exception":4}],14:[function(t,e,n){"use strict";function i(t){if(null===t)return!1;var e,n,i=0,r=t.length,o=u;for(n=0;r>n;n++)if(e=o.indexOf(t.charAt(n)),!(e>64)){if(0>e)return!1;i+=6}return i%8===0}function r(t){var e,n,i=t.replace(/[\r\n=]/g,""),r=i.length,o=u,a=0,c=[];for(e=0;r>e;e++)e%4===0&&e&&(c.push(a>>16&255),c.push(a>>8&255),c.push(255&a)),a=a<<6|o.indexOf(i.charAt(e));return n=r%4*6,0===n?(c.push(a>>16&255),c.push(a>>8&255),c.push(255&a)):18===n?(c.push(a>>10&255),c.push(a>>2&255)):12===n&&c.push(a>>4&255),s?new s(c):c}function o(t){var e,n,i="",r=0,o=t.length,a=u;for(e=0;o>e;e++)e%3===0&&e&&(i+=a[r>>18&63],i+=a[r>>12&63],i+=a[r>>6&63],i+=a[63&r]),r=(r<<8)+t[e];return n=o%3,0===n?(i+=a[r>>18&63],i+=a[r>>12&63],i+=a[r>>6&63],i+=a[63&r]):2===n?(i+=a[r>>10&63],i+=a[r>>4&63],i+=a[r<<2&63],i+=a[64]):1===n&&(i+=a[r>>2&63],i+=a[r<<4&63],i+=a[64],i+=a[64]),i}function a(t){return s&&s.isBuffer(t)}var s=t("buffer").Buffer,c=t("../type"),u="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r";e.exports=new c("tag:yaml.org,2002:binary",{kind:"scalar",resolve:i,construct:r,
+predicate:a,represent:o})},{"../type":13,buffer:30}],15:[function(t,e,n){"use strict";function i(t){if(null===t)return!1;var e=t.length;return 4===e&&("true"===t||"True"===t||"TRUE"===t)||5===e&&("false"===t||"False"===t||"FALSE"===t)}function r(t){return"true"===t||"True"===t||"TRUE"===t}function o(t){return"[object Boolean]"===Object.prototype.toString.call(t)}var a=t("../type");e.exports=new a("tag:yaml.org,2002:bool",{kind:"scalar",resolve:i,construct:r,predicate:o,represent:{lowercase:function(t){return t?"true":"false"},uppercase:function(t){return t?"TRUE":"FALSE"},camelcase:function(t){return t?"True":"False"}},defaultStyle:"lowercase"})},{"../type":13}],16:[function(t,e,n){"use strict";function i(t){return null!==t&&!!u.test(t)}function r(t){var e,n,i,r;return e=t.replace(/_/g,"").toLowerCase(),n="-"===e[0]?-1:1,r=[],0<="+-".indexOf(e[0])&&(e=e.slice(1)),".inf"===e?1===n?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:".nan"===e?NaN:0<=e.indexOf(":")?(e.split(":").forEach(function(t){r.unshift(parseFloat(t,10))}),e=0,i=1,r.forEach(function(t){e+=t*i,i*=60}),n*e):n*parseFloat(e,10)}function o(t,e){var n;if(isNaN(t))switch(e){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===t)switch(e){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===t)switch(e){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(s.isNegativeZero(t))return"-0.0";return n=t.toString(10),l.test(n)?n.replace("e",".e"):n}function a(t){return"[object Number]"===Object.prototype.toString.call(t)&&(0!==t%1||s.isNegativeZero(t))}var s=t("../common"),c=t("../type"),u=new RegExp("^(?:[-+]?(?:[0-9][0-9_]*)\\.[0-9_]*(?:[eE][-+][0-9]+)?|\\.[0-9_]+(?:[eE][-+][0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$"),l=/^[-+]?[0-9]+e/;e.exports=new c("tag:yaml.org,2002:float",{kind:"scalar",resolve:i,construct:r,predicate:a,represent:o,defaultStyle:"lowercase"})},{"../common":2,"../type":13}],17:[function(t,e,n){"use strict";function i(t){return t>=48&&57>=t||t>=65&&70>=t||t>=97&&102>=t}function r(t){return t>=48&&55>=t}function o(t){return t>=48&&57>=t}function a(t){if(null===t)return!1;var e,n=t.length,a=0,s=!1;if(!n)return!1;if(e=t[a],("-"===e||"+"===e)&&(e=t[++a]),"0"===e){if(a+1===n)return!0;if(e=t[++a],"b"===e){for(a++;n>a;a++)if(e=t[a],"_"!==e){if("0"!==e&&"1"!==e)return!1;s=!0}return s}if("x"===e){for(a++;n>a;a++)if(e=t[a],"_"!==e){if(!i(t.charCodeAt(a)))return!1;s=!0}return s}for(;n>a;a++)if(e=t[a],"_"!==e){if(!r(t.charCodeAt(a)))return!1;s=!0}return s}for(;n>a;a++)if(e=t[a],"_"!==e){if(":"===e)break;if(!o(t.charCodeAt(a)))return!1;s=!0}return!!s&&(":"!==e||/^(:[0-5]?[0-9])+$/.test(t.slice(a)))}function s(t){var e,n,i=t,r=1,o=[];return-1!==i.indexOf("_")&&(i=i.replace(/_/g,"")),e=i[0],("-"===e||"+"===e)&&("-"===e&&(r=-1),i=i.slice(1),e=i[0]),"0"===i?0:"0"===e?"b"===i[1]?r*parseInt(i.slice(2),2):"x"===i[1]?r*parseInt(i,16):r*parseInt(i,8):-1!==i.indexOf(":")?(i.split(":").forEach(function(t){o.unshift(parseInt(t,10))}),i=0,n=1,o.forEach(function(t){i+=t*n,n*=60}),r*i):r*parseInt(i,10)}function c(t){return"[object Number]"===Object.prototype.toString.call(t)&&0===t%1&&!u.isNegativeZero(t)}var u=t("../common"),l=t("../type");e.exports=new l("tag:yaml.org,2002:int",{kind:"scalar",resolve:a,construct:s,predicate:c,represent:{binary:function(t){return"0b"+t.toString(2)},octal:function(t){return"0"+t.toString(8)},decimal:function(t){return t.toString(10)},hexadecimal:function(t){return"0x"+t.toString(16).toUpperCase()}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})},{"../common":2,"../type":13}],18:[function(t,e,n){"use strict";function i(t){if(null===t)return!1;try{var e="("+t+")",n=s.parse(e,{range:!0});return"Program"===n.type&&1===n.body.length&&"ExpressionStatement"===n.body[0].type&&"FunctionExpression"===n.body[0].expression.type}catch(i){return!1}}function r(t){var e,n="("+t+")",i=s.parse(n,{range:!0}),r=[];if("Program"!==i.type||1!==i.body.length||"ExpressionStatement"!==i.body[0].type||"FunctionExpression"!==i.body[0].expression.type)throw new Error("Failed to resolve function");return i.body[0].expression.params.forEach(function(t){r.push(t.name)}),e=i.body[0].expression.body.range,new Function(r,n.slice(e[0]+1,e[1]-1))}function o(t){return t.toString()}function a(t){return"[object Function]"===Object.prototype.toString.call(t)}var s;try{s=t("esprima")}catch(c){"undefined"!=typeof window&&(s=window.esprima)}var u=t("../../type");e.exports=new u("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:i,construct:r,predicate:a,represent:o})},{"../../type":13,esprima:"esprima"}],19:[function(t,e,n){"use strict";function i(t){if(null===t)return!1;if(0===t.length)return!1;var e=t,n=/\/([gim]*)$/.exec(t),i="";if("/"===e[0]){if(n&&(i=n[1]),i.length>3)return!1;if("/"!==e[e.length-i.length-1])return!1;e=e.slice(1,e.length-i.length-1)}try{return!0}catch(r){return!1}}function r(t){var e=t,n=/\/([gim]*)$/.exec(t),i="";return"/"===e[0]&&(n&&(i=n[1]),e=e.slice(1,e.length-i.length-1)),new RegExp(e,i)}function o(t){var e="/"+t.source+"/";return t.global&&(e+="g"),t.multiline&&(e+="m"),t.ignoreCase&&(e+="i"),e}function a(t){return"[object RegExp]"===Object.prototype.toString.call(t)}var s=t("../../type");e.exports=new s("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:i,construct:r,predicate:a,represent:o})},{"../../type":13}],20:[function(t,e,n){"use strict";function i(){return!0}function r(){}function o(){return""}function a(t){return"undefined"==typeof t}var s=t("../../type");e.exports=new s("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:i,construct:r,predicate:a,represent:o})},{"../../type":13}],21:[function(t,e,n){"use strict";var i=t("../type");e.exports=new i("tag:yaml.org,2002:map",{kind:"mapping",construct:function(t){return null!==t?t:{}}})},{"../type":13}],22:[function(t,e,n){"use strict";function i(t){return"<<"===t||null===t}var r=t("../type");e.exports=new r("tag:yaml.org,2002:merge",{kind:"scalar",resolve:i})},{"../type":13}],23:[function(t,e,n){"use strict";function i(t){if(null===t)return!0;var e=t.length;return 1===e&&"~"===t||4===e&&("null"===t||"Null"===t||"NULL"===t)}function r(){return null}function o(t){return null===t}var a=t("../type");e.exports=new a("tag:yaml.org,2002:null",{kind:"scalar",resolve:i,construct:r,predicate:o,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})},{"../type":13}],24:[function(t,e,n){"use strict";function i(t){if(null===t)return!0;var e,n,i,r,o,c=[],u=t;for(e=0,n=u.length;n>e;e+=1){if(i=u[e],o=!1,"[object Object]"!==s.call(i))return!1;for(r in i)if(a.call(i,r)){if(o)return!1;o=!0}if(!o)return!1;if(-1!==c.indexOf(r))return!1;c.push(r)}return!0}function r(t){return null!==t?t:[]}var o=t("../type"),a=Object.prototype.hasOwnProperty,s=Object.prototype.toString;e.exports=new o("tag:yaml.org,2002:omap",{kind:"sequence",resolve:i,construct:r})},{"../type":13}],25:[function(t,e,n){"use strict";function i(t){if(null===t)return!0;var e,n,i,r,o,s=t;for(o=new Array(s.length),e=0,n=s.length;n>e;e+=1){if(i=s[e],"[object Object]"!==a.call(i))return!1;if(r=Object.keys(i),1!==r.length)return!1;o[e]=[r[0],i[r[0]]]}return!0}function r(t){if(null===t)return[];var e,n,i,r,o,a=t;for(o=new Array(a.length),e=0,n=a.length;n>e;e+=1)i=a[e],r=Object.keys(i),o[e]=[r[0],i[r[0]]];return o}var o=t("../type"),a=Object.prototype.toString;e.exports=new o("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:i,construct:r})},{"../type":13}],26:[function(t,e,n){"use strict";var i=t("../type");e.exports=new i("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(t){return null!==t?t:[]}})},{"../type":13}],27:[function(t,e,n){"use strict";function i(t){if(null===t)return!0;var e,n=t;for(e in n)if(a.call(n,e)&&null!==n[e])return!1;return!0}function r(t){return null!==t?t:{}}var o=t("../type"),a=Object.prototype.hasOwnProperty;e.exports=new o("tag:yaml.org,2002:set",{kind:"mapping",resolve:i,construct:r})},{"../type":13}],28:[function(t,e,n){"use strict";var i=t("../type");e.exports=new i("tag:yaml.org,2002:str",{kind:"scalar",construct:function(t){return null!==t?t:""}})},{"../type":13}],29:[function(t,e,n){"use strict";function i(t){return null!==t&&null!==s.exec(t)}function r(t){var e,n,i,r,o,a,c,u,l,p,f=0,h=null;if(e=s.exec(t),null===e)throw new Error("Date resolve error");if(n=+e[1],i=+e[2]-1,r=+e[3],!e[4])return new Date(Date.UTC(n,i,r));if(o=+e[4],a=+e[5],c=+e[6],e[7]){for(f=e[7].slice(0,3);f.length<3;)f+="0";f=+f}return e[9]&&(u=+e[10],l=+(e[11]||0),h=6e4*(60*u+l),"-"===e[9]&&(h=-h)),p=new Date(Date.UTC(n,i,r,o,a,c,f)),h&&p.setTime(p.getTime()-h),p}function o(t){return t.toISOString()}var a=t("../type"),s=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?)?$");e.exports=new a("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:i,construct:r,instanceOf:Date,represent:o})},{"../type":13}],30:[function(t,e,n){},{}],31:[function(t,e,n){e.exports=t("./lib/inherit")},{"./lib/inherit":32}],32:[function(e,n,i){!function(e){function r(t){var e=f(t);if(v)for(var n,i=0;n=b[i++];)t.hasOwnProperty(n)&&e.push(n);return e}function o(t,e,n){for(var i,o,a=r(n),s=0,u=a.length;u>s;)"__self"!==(i=a[s++])&&(o=n[i],y(o)&&(!c||o.toString().indexOf(".__base")>-1)?e[i]=function(n,i){var r=t[n]?t[n]:"__constructor"===n?e.__self.__parent:g;return function(){var t=this.__base;this.__base=r;var e=i.apply(this,arguments);return this.__base=t,e}}(i,o):e[i]=o)}function a(t,e){for(var n,i=1;n=t[i++];)e?y(n)?s.self(e,n.prototype,n):s.self(e,n):e=y(n)?s(t[0],n.prototype,n):s(t[0],n);return e||t[0]}function s(){var t=arguments,e=m(t[0]),n=e||y(t[0]),i=n?e?a(t[0]):t[0]:u,r=t[n?1:0]||{},s=t[n?2:1],c=r.__constructor||n&&i.prototype.__constructor?function(){return this.__constructor.apply(this,arguments)}:n?function(){return i.apply(this,arguments)}:function(){};if(!n)return c.prototype=r,c.prototype.__self=c.prototype.constructor=c,h(c,s);h(c,i),c.__parent=i;var l=i.prototype,f=c.prototype=p(l);return f.__self=f.constructor=c,r&&o(l,f,r),s&&o(i,c,s),c}var c=function(){}.toString().indexOf("_")>-1,u=function(){},l=Object.prototype.hasOwnProperty,p=Object.create||function(t){var e=function(){};return e.prototype=t,new e},f=Object.keys||function(t){var e=[];for(var n in t)l.call(t,n)&&e.push(n);return e},h=function(t,e){for(var n in e)l.call(e,n)&&(t[n]=e[n]);return t},d=Object.prototype.toString,m=Array.isArray||function(t){return"[object Array]"===d.call(t)},y=function(t){return"[object Function]"===d.call(t)},g=function(){},v=!0,x={toString:""};for(var A in x)x.hasOwnProperty(A)&&(v=!1);var b=v?["toString","valueOf"]:null;s.self=function(){var t=arguments,e=m(t[0]),n=e?a(t[0],t[0][0]):t[0],i=t[1],r=t[2],s=n.prototype;return i&&o(s,s,i),r&&o(n,n,r),n};var w=!0;"object"==typeof i&&(n.exports=s,w=!1),"object"==typeof modules&&(modules.define("inherit",function(t){t(s)}),w=!1),"function"==typeof t&&(t(function(t,e,n){n.exports=s}),w=!1),w&&(e.inherit=s)}(this)},{}],"/":[function(t,e,n){"use strict";var i=t("./lib/js-yaml.js");e.exports=i},{"./lib/js-yaml.js":1}]},{},[])("/")});
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jsoneditor.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jsoneditor.min.js
index 343397f955f..21db1ab3e11 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jsoneditor.min.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jsoneditor.min.js
@@ -1,11 +1,5 @@
-/*! JSON Editor v0.7.22 - JSON Schema -> HTML Editor
- * By Jeremy Dorn - https://github.com/jdorn/json-editor/
- * Released under the MIT license
- *
- * Date: 2015-08-12
- */
-!function(){var a;!function(){var b=!1,c=/xyz/.test(function(){window.postMessage("xyz")})?/\b_super\b/:/.*/;return a=function(){},a.extend=function(a){function d(){!b&&this.init&&this.init.apply(this,arguments)}var e=this.prototype;b=!0;var f=new this;b=!1;for(var g in a)f[g]="function"==typeof a[g]&&"function"==typeof e[g]&&c.test(a[g])?function(a,b){return function(){var c=this._super;this._super=e[a];var d=b.apply(this,arguments);return this._super=c,d}}(g,a[g]):a[g];return d.prototype=f,d.prototype.constructor=d,d.extend=arguments.callee,d},a}(),function(){function a(a,b){b=b||{bubbles:!1,cancelable:!1,detail:void 0};var c=document.createEvent("CustomEvent");return c.initCustomEvent(a,b.bubbles,b.cancelable,b.detail),c}a.prototype=window.Event.prototype,window.CustomEvent=a}(),function(){for(var a=0,b=["ms","moz","webkit","o"],c=0;c<b.length&&!window.requestAnimationFrame;++c)window.requestAnimationFrame=window[b[c]+"RequestAnimationFrame"],window.cancelAnimationFrame=window[b[c]+"CancelAnimationFrame"]||window[b[c]+"CancelRequestAnimationFrame"];window.requestAnimationFrame||(window.requestAnimationFrame=function(b,c){var d=(new Date).getTime(),e=Math.max(0,16-(d-a)),f=window.setTimeout(function(){b(d+e)},e);return a=d+e,f}),window.cancelAnimationFrame||(window.cancelAnimationFrame=function(a){clearTimeout(a)})}(),function(){Array.isArray||(Array.isArray=function(a){return"[object Array]"===Object.prototype.toString.call(a)})}();var b=function(a){return"object"!=typeof a||a.nodeType||null!==a&&a===a.window?!1:a.constructor&&!Object.prototype.hasOwnProperty.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},c=function(a){var d,e,f;for(e=1;e<arguments.length;e++){d=arguments[e];for(f in d)d.hasOwnProperty(f)&&(d[f]&&b(d[f])?(a.hasOwnProperty(f)||(a[f]={}),c(a[f],d[f])):a[f]=d[f])}return a},d=function(a,b){if(a&&"object"==typeof a){var c;if(Array.isArray(a)||"number"==typeof a.length&&a.length>0&&a.length-1 in a){for(c=0;c<a.length;c++)if(b(c,a[c])===!1)return}else if(Object.keys){var d=Object.keys(a);for(c=0;c<d.length;c++)if(b(d[c],a[d[c]])===!1)return}else for(c in a)if(a.hasOwnProperty(c)&&b(c,a[c])===!1)return}},e=function(a,b){var c=document.createEvent("HTMLEvents");c.initEvent(b,!0,!0),a.dispatchEvent(c)},f=function(a,b){if(!(a instanceof Element))throw new Error("element should be an instance of Element");b=c({},f.defaults.options,b||{}),this.element=a,this.options=b,this.init()};f.prototype={constructor:f,init:function(){var a=this;this.ready=!1;var b=f.defaults.themes[this.options.theme||f.defaults.theme];if(!b)throw"Unknown theme "+(this.options.theme||f.defaults.theme);this.schema=this.options.schema,this.theme=new b,this.template=this.options.template,this.refs=this.options.refs||{},this.uuid=0,this.__data={};var c=f.defaults.iconlibs[this.options.iconlib||f.defaults.iconlib];c&&(this.iconlib=new c),this.root_container=this.theme.getContainer(),this.element.appendChild(this.root_container),this.translate=this.options.translate||f.defaults.translate,this._loadExternalRefs(this.schema,function(){a._getDefinitions(a.schema),a.validator=new f.Validator(a);var b=a.getEditorClass(a.schema);a.root=a.createEditor(b,{jsoneditor:a,schema:a.schema,required:!0,container:a.root_container}),a.root.preBuild(),a.root.build(),a.root.postBuild(),a.options.startval&&a.root.setValue(a.options.startval),a.validation_results=a.validator.validate(a.root.getValue()),a.root.showValidationErrors(a.validation_results),a.ready=!0,window.requestAnimationFrame(function(){a.ready&&(a.validation_results=a.validator.validate(a.root.getValue()),a.root.showValidationErrors(a.validation_results),a.trigger("ready"),a.trigger("change"))})})},getValue:function(){if(!this.ready)throw"JSON Editor not ready yet.  Listen for 'ready' event before getting the value";return this.root.getValue()},setValue:function(a){if(!this.ready)throw"JSON Editor not ready yet.  Listen for 'ready' event before setting the value";return this.root.setValue(a),this},validate:function(a){if(!this.ready)throw"JSON Editor not ready yet.  Listen for 'ready' event before validating";return 1===arguments.length?this.validator.validate(a):this.validation_results},destroy:function(){this.destroyed||this.ready&&(this.schema=null,this.options=null,this.root.destroy(),this.root=null,this.root_container=null,this.validator=null,this.validation_results=null,this.theme=null,this.iconlib=null,this.template=null,this.__data=null,this.ready=!1,this.element.innerHTML="",this.destroyed=!0)},on:function(a,b){return this.callbacks=this.callbacks||{},this.callbacks[a]=this.callbacks[a]||[],this.callbacks[a].push(b),this},off:function(a,b){if(a&&b){this.callbacks=this.callbacks||{},this.callbacks[a]=this.callbacks[a]||[];for(var c=[],d=0;d<this.callbacks[a].length;d++)this.callbacks[a][d]!==b&&c.push(this.callbacks[a][d]);this.callbacks[a]=c}else a?(this.callbacks=this.callbacks||{},this.callbacks[a]=[]):this.callbacks={};return this},trigger:function(a){if(this.callbacks&&this.callbacks[a]&&this.callbacks[a].length)for(var b=0;b<this.callbacks[a].length;b++)this.callbacks[a][b]();return this},setOption:function(a,b){if("show_errors"!==a)throw"Option "+a+" must be set during instantiation and cannot be changed later";return this.options.show_errors=b,this.onChange(),this},getEditorClass:function(a){var b;if(a=this.expandSchema(a),d(f.defaults.resolvers,function(c,d){var e=d(a);return e&&f.defaults.editors[e]?(b=e,!1):void 0}),!b)throw"Unknown editor for schema "+JSON.stringify(a);if(!f.defaults.editors[b])throw"Unknown editor "+b;return f.defaults.editors[b]},createEditor:function(a,b){return b=c({},a.options||{},b),new a(b)},onChange:function(){if(this.ready&&!this.firing_change){this.firing_change=!0;var a=this;return window.requestAnimationFrame(function(){a.firing_change=!1,a.ready&&(a.validation_results=a.validator.validate(a.root.getValue()),"never"!==a.options.show_errors?a.root.showValidationErrors(a.validation_results):a.root.showValidationErrors([]),a.trigger("change"))}),this}},compileTemplate:function(a,b){b=b||f.defaults.template;var c;if("string"==typeof b){if(!f.defaults.templates[b])throw"Unknown template engine "+b;if(c=f.defaults.templates[b](),!c)throw"Template engine "+b+" missing required library."}else c=b;if(!c)throw"No template engine set";if(!c.compile)throw"Invalid template engine set";return c.compile(a)},_data:function(a,b,c){if(3!==arguments.length)return a.hasAttribute("data-jsoneditor-"+b)?this.__data[a.getAttribute("data-jsoneditor-"+b)]:null;var d;a.hasAttribute("data-jsoneditor-"+b)?d=a.getAttribute("data-jsoneditor-"+b):(d=this.uuid++,a.setAttribute("data-jsoneditor-"+b,d)),this.__data[d]=c},registerEditor:function(a){return this.editors=this.editors||{},this.editors[a.path]=a,this},unregisterEditor:function(a){return this.editors=this.editors||{},this.editors[a.path]=null,this},getEditor:function(a){return this.editors?this.editors[a]:void 0},watch:function(a,b){return this.watchlist=this.watchlist||{},this.watchlist[a]=this.watchlist[a]||[],this.watchlist[a].push(b),this},unwatch:function(a,b){if(!this.watchlist||!this.watchlist[a])return this;if(!b)return this.watchlist[a]=null,this;for(var c=[],d=0;d<this.watchlist[a].length;d++)this.watchlist[a][d]!==b&&c.push(this.watchlist[a][d]);return this.watchlist[a]=c.length?c:null,this},notifyWatchers:function(a){if(!this.watchlist||!this.watchlist[a])return this;for(var b=0;b<this.watchlist[a].length;b++)this.watchlist[a][b]()},isEnabled:function(){return!this.root||this.root.isEnabled()},enable:function(){this.root.enable()},disable:function(){this.root.disable()},_getDefinitions:function(a,b){if(b=b||"#/definitions/",a.definitions)for(var c in a.definitions)a.definitions.hasOwnProperty(c)&&(this.refs[b+c]=a.definitions[c],a.definitions[c].definitions&&this._getDefinitions(a.definitions[c],b+c+"/definitions/"))},_getExternalRefs:function(a){var b={},c=function(a){for(var c in a)a.hasOwnProperty(c)&&(b[c]=!0)};a.$ref&&"object"!=typeof a.$ref&&"#"!==a.$ref.substr(0,1)&&!this.refs[a.$ref]&&(b[a.$ref]=!0);for(var d in a)if(a.hasOwnProperty(d))if(a[d]&&"object"==typeof a[d]&&Array.isArray(a[d]))for(var e=0;e<a[d].length;e++)"object"==typeof a[d][e]&&c(this._getExternalRefs(a[d][e]));else a[d]&&"object"==typeof a[d]&&c(this._getExternalRefs(a[d]));return b},_loadExternalRefs:function(a,b){var c=this,e=this._getExternalRefs(a),f=0,g=0,h=!1;d(e,function(a){if(!c.refs[a]){if(!c.options.ajax)throw"Must set ajax option to true to load external ref "+a;c.refs[a]="loading",g++;var d=new XMLHttpRequest;d.open("GET",a,!0),d.onreadystatechange=function(){if(4==d.readyState){if(200!==d.status)throw window.console.log(d),"Failed to fetch ref via ajax- "+a;var e;try{e=JSON.parse(d.responseText)}catch(i){throw window.console.log(i),"Failed to parse external ref "+a}if(!e||"object"!=typeof e)throw"External ref does not contain a valid schema - "+a;c.refs[a]=e,c._loadExternalRefs(e,function(){f++,f>=g&&!h&&(h=!0,b())})}},d.send()}}),g||b()},expandRefs:function(a){for(a=c({},a);a.$ref;){var b=a.$ref;delete a.$ref,this.refs[b]||(b=decodeURIComponent(b)),a=this.extendSchemas(a,this.refs[b])}return a},expandSchema:function(a){var b,e=this,f=c({},a);if("object"==typeof a.type&&(Array.isArray(a.type)?d(a.type,function(b,c){"object"==typeof c&&(a.type[b]=e.expandSchema(c))}):a.type=e.expandSchema(a.type)),"object"==typeof a.disallow&&(Array.isArray(a.disallow)?d(a.disallow,function(b,c){"object"==typeof c&&(a.disallow[b]=e.expandSchema(c))}):a.disallow=e.expandSchema(a.disallow)),a.anyOf&&d(a.anyOf,function(b,c){a.anyOf[b]=e.expandSchema(c)}),a.dependencies&&d(a.dependencies,function(b,c){"object"!=typeof c||Array.isArray(c)||(a.dependencies[b]=e.expandSchema(c))}),a.not&&(a.not=this.expandSchema(a.not)),a.allOf){for(b=0;b<a.allOf.length;b++)f=this.extendSchemas(f,this.expandSchema(a.allOf[b]));delete f.allOf}if(a["extends"]){if(Array.isArray(a["extends"]))for(b=0;b<a["extends"].length;b++)f=this.extendSchemas(f,this.expandSchema(a["extends"][b]));else f=this.extendSchemas(f,this.expandSchema(a["extends"]));delete f["extends"]}if(a.oneOf){var g=c({},f);for(delete g.oneOf,b=0;b<a.oneOf.length;b++)f.oneOf[b]=this.extendSchemas(this.expandSchema(a.oneOf[b]),g)}return this.expandRefs(f)},extendSchemas:function(a,b){a=c({},a),b=c({},b);var e=this,f={};return d(a,function(a,c){"undefined"!=typeof b[a]?"required"===a&&"object"==typeof c&&Array.isArray(c)?f.required=c.concat(b[a]).reduce(function(a,b){return a.indexOf(b)<0&&a.push(b),a},[]):"type"!==a||"string"!=typeof c&&!Array.isArray(c)?"object"==typeof c&&Array.isArray(c)?f[a]=c.filter(function(c){return-1!==b[a].indexOf(c)}):"object"==typeof c&&null!==c?f[a]=e.extendSchemas(c,b[a]):f[a]=c:("string"==typeof c&&(c=[c]),"string"==typeof b.type&&(b.type=[b.type]),f.type=c.filter(function(a){return-1!==b.type.indexOf(a)}),1===f.type.length&&"string"==typeof f.type[0]&&(f.type=f.type[0])):f[a]=c}),d(b,function(b,c){"undefined"==typeof a[b]&&(f[b]=c)}),f}},f.defaults={themes:{},templates:{},iconlibs:{},editors:{},languages:{},resolvers:[],custom_validators:[]},f.Validator=a.extend({init:function(a,b){this.jsoneditor=a,this.schema=b||this.jsoneditor.schema,this.options={},this.translate=this.jsoneditor.translate||f.defaults.translate},validate:function(a){return this._validateSchema(this.schema,a)},_validateSchema:function(a,b,e){var g,h,i,j=this,k=[],l=JSON.stringify(b);if(e=e||"root",a=c({},this.jsoneditor.expandRefs(a)),a.required&&a.required===!0){if("undefined"==typeof b)return k.push({path:e,property:"required",message:this.translate("error_notset")}),k}else if("undefined"==typeof b){if(!this.jsoneditor.options.required_by_default)return k;k.push({path:e,property:"required",message:this.translate("error_notset")})}if(a["enum"]){for(g=!1,h=0;h<a["enum"].length;h++)l===JSON.stringify(a["enum"][h])&&(g=!0);g||k.push({path:e,property:"enum",message:this.translate("error_enum")})}if(a["extends"])for(h=0;h<a["extends"].length;h++)k=k.concat(this._validateSchema(a["extends"][h],b,e));if(a.allOf)for(h=0;h<a.allOf.length;h++)k=k.concat(this._validateSchema(a.allOf[h],b,e));if(a.anyOf){for(g=!1,h=0;h<a.anyOf.length;h++)if(!this._validateSchema(a.anyOf[h],b,e).length){g=!0;break}g||k.push({path:e,property:"anyOf",message:this.translate("error_anyOf")})}if(a.oneOf){g=0;var m=[];for(h=0;h<a.oneOf.length;h++){var n=this._validateSchema(a.oneOf[h],b,e);for(n.length||g++,i=0;i<n.length;i++)n[i].path=e+".oneOf["+h+"]"+n[i].path.substr(e.length);m=m.concat(n)}1!==g&&(k.push({path:e,property:"oneOf",message:this.translate("error_oneOf",[g])}),k=k.concat(m))}if(a.not&&(this._validateSchema(a.not,b,e).length||k.push({path:e,property:"not",message:this.translate("error_not")})),a.type)if(Array.isArray(a.type)){for(g=!1,h=0;h<a.type.length;h++)if(this._checkType(a.type[h],b)){g=!0;break}g||k.push({path:e,property:"type",message:this.translate("error_type_union")})}else this._checkType(a.type,b)||k.push({path:e,property:"type",message:this.translate("error_type",[a.type])});if(a.disallow)if(Array.isArray(a.disallow)){for(g=!0,h=0;h<a.disallow.length;h++)if(this._checkType(a.disallow[h],b)){g=!1;break}g||k.push({path:e,property:"disallow",message:this.translate("error_disallow_union")})}else this._checkType(a.disallow,b)&&k.push({path:e,property:"disallow",message:this.translate("error_disallow",[a.disallow])});if("number"==typeof b)(a.multipleOf||a.divisibleBy)&&(g=b/(a.multipleOf||a.divisibleBy),g!==Math.floor(g)&&k.push({path:e,property:a.multipleOf?"multipleOf":"divisibleBy",message:this.translate("error_multipleOf",[a.multipleOf||a.divisibleBy])})),a.hasOwnProperty("maximum")&&(a.exclusiveMaximum&&b>=a.maximum?k.push({path:e,property:"maximum",message:this.translate("error_maximum_excl",[a.maximum])}):!a.exclusiveMaximum&&b>a.maximum&&k.push({path:e,property:"maximum",message:this.translate("error_maximum_incl",[a.maximum])})),a.hasOwnProperty("minimum")&&(a.exclusiveMinimum&&b<=a.minimum?k.push({path:e,property:"minimum",message:this.translate("error_minimum_excl",[a.minimum])}):!a.exclusiveMinimum&&b<a.minimum&&k.push({path:e,property:"minimum",message:this.translate("error_minimum_incl",[a.minimum])}));else if("string"==typeof b)a.maxLength&&(b+"").length>a.maxLength&&k.push({path:e,property:"maxLength",message:this.translate("error_maxLength",[a.maxLength])}),a.minLength&&(b+"").length<a.minLength&&k.push({path:e,property:"minLength",message:this.translate(1===a.minLength?"error_notempty":"error_minLength",[a.minLength])}),a.pattern&&(new RegExp(a.pattern).test(b)||k.push({path:e,property:"pattern",message:this.translate("error_pattern")}));else if("object"==typeof b&&null!==b&&Array.isArray(b)){if(a.items)if(Array.isArray(a.items))for(h=0;h<b.length;h++)if(a.items[h])k=k.concat(this._validateSchema(a.items[h],b[h],e+"."+h));else{if(a.additionalItems===!0)break;if(!a.additionalItems){if(a.additionalItems===!1){k.push({path:e,property:"additionalItems",message:this.translate("error_additionalItems")});break}break}k=k.concat(this._validateSchema(a.additionalItems,b[h],e+"."+h))}else for(h=0;h<b.length;h++)k=k.concat(this._validateSchema(a.items,b[h],e+"."+h));if(a.maxItems&&b.length>a.maxItems&&k.push({path:e,property:"maxItems",message:this.translate("error_maxItems",[a.maxItems])}),a.minItems&&b.length<a.minItems&&k.push({path:e,property:"minItems",message:this.translate("error_minItems",[a.minItems])}),a.uniqueItems){var o={};for(h=0;h<b.length;h++){if(g=JSON.stringify(b[h]),o[g]){k.push({path:e,property:"uniqueItems",message:this.translate("error_uniqueItems")});break}o[g]=!0}}}else if("object"==typeof b&&null!==b){if(a.maxProperties){g=0;for(h in b)b.hasOwnProperty(h)&&g++;g>a.maxProperties&&k.push({path:e,property:"maxProperties",message:this.translate("error_maxProperties",[a.maxProperties])})}if(a.minProperties){g=0;for(h in b)b.hasOwnProperty(h)&&g++;g<a.minProperties&&k.push({path:e,property:"minProperties",message:this.translate("error_minProperties",[a.minProperties])})}if(a.required&&Array.isArray(a.required))for(h=0;h<a.required.length;h++)"undefined"==typeof b[a.required[h]]&&k.push({path:e,property:"required",message:this.translate("error_required",[a.required[h]])});var p={};if(a.properties)for(h in a.properties)a.properties.hasOwnProperty(h)&&(p[h]=!0,k=k.concat(this._validateSchema(a.properties[h],b[h],e+"."+h)));if(a.patternProperties)for(h in a.patternProperties)if(a.patternProperties.hasOwnProperty(h)){var q=new RegExp(h);for(i in b)b.hasOwnProperty(i)&&q.test(i)&&(p[i]=!0,k=k.concat(this._validateSchema(a.patternProperties[h],b[i],e+"."+i)))}if("undefined"!=typeof a.additionalProperties||!this.jsoneditor.options.no_additional_properties||a.oneOf||a.anyOf||(a.additionalProperties=!1),"undefined"!=typeof a.additionalProperties)for(h in b)if(b.hasOwnProperty(h)&&!p[h]){if(!a.additionalProperties){k.push({path:e,property:"additionalProperties",message:this.translate("error_additional_properties",[h])});break}if(a.additionalProperties===!0)break;k=k.concat(this._validateSchema(a.additionalProperties,b[h],e+"."+h))}if(a.dependencies)for(h in a.dependencies)if(a.dependencies.hasOwnProperty(h)&&"undefined"!=typeof b[h])if(Array.isArray(a.dependencies[h]))for(i=0;i<a.dependencies[h].length;i++)"undefined"==typeof b[a.dependencies[h][i]]&&k.push({path:e,property:"dependencies",message:this.translate("error_dependency",[a.dependencies[h][i]])});else k=k.concat(this._validateSchema(a.dependencies[h],b,e))}return d(f.defaults.custom_validators,function(c,d){k=k.concat(d.call(j,a,b,e))}),k},_checkType:function(a,b){return"string"==typeof a?"string"===a?"string"==typeof b:"number"===a?"number"==typeof b:"integer"===a?"number"==typeof b&&b===Math.floor(b):"boolean"===a?"boolean"==typeof b:"array"===a?Array.isArray(b):"object"===a?null!==b&&!Array.isArray(b)&&"object"==typeof b:"null"===a?null===b:!0:!this._validateSchema(a,b).length}}),f.AbstractEditor=a.extend({onChildEditorChange:function(a){this.onChange(!0)},notify:function(){this.jsoneditor.notifyWatchers(this.path)},change:function(){this.parent?this.parent.onChildEditorChange(this):this.jsoneditor.onChange()},onChange:function(a){this.notify(),this.watch_listener&&this.watch_listener(),a&&this.change()},register:function(){this.jsoneditor.registerEditor(this),this.onChange()},unregister:function(){this.jsoneditor&&this.jsoneditor.unregisterEditor(this)},getNumColumns:function(){return 12},init:function(a){this.jsoneditor=a.jsoneditor,this.theme=this.jsoneditor.theme,this.template_engine=this.jsoneditor.template,this.iconlib=this.jsoneditor.iconlib,this.original_schema=a.schema,this.schema=this.jsoneditor.expandSchema(this.original_schema),this.options=c({},this.options||{},a.schema.options||{},a),a.path||this.schema.id||(this.schema.id="root"),this.path=a.path||"root",this.formname=a.formname||this.path.replace(/\.([^.]+)/g,"[$1]"),this.jsoneditor.options.form_name_root&&(this.formname=this.formname.replace(/^root\[/,this.jsoneditor.options.form_name_root+"[")),this.key=this.path.split(".").pop(),this.parent=a.parent,this.link_watchers=[],a.container&&this.setContainer(a.container)},setContainer:function(a){this.container=a,this.schema.id&&this.container.setAttribute("data-schemaid",this.schema.id),this.schema.type&&"string"==typeof this.schema.type&&this.container.setAttribute("data-schematype",this.schema.type),this.container.setAttribute("data-schemapath",this.path)},preBuild:function(){},build:function(){},postBuild:function(){this.setupWatchListeners(),this.addLinks(),this.setValue(this.getDefault(),!0),this.updateHeaderText(),this.register(),this.onWatchedFieldChange()},setupWatchListeners:function(){var a=this;if(this.watched={},this.schema.vars&&(this.schema.watch=this.schema.vars),this.watched_values={},this.watch_listener=function(){a.refreshWatchedFieldValues()&&a.onWatchedFieldChange()},this.register(),this.schema.hasOwnProperty("watch")){var b,c,d,e,f;for(var g in this.schema.watch)if(this.schema.watch.hasOwnProperty(g)){if(b=this.schema.watch[g],Array.isArray(b)?c=[b[0]].concat(b[1].split(".")):(c=b.split("."),a.theme.closest(a.container,'[data-schemaid="'+c[0]+'"]')||c.unshift("#")),d=c.shift(),"#"===d&&(d=a.jsoneditor.schema.id||"root"),e=a.theme.closest(a.container,'[data-schemaid="'+d+'"]'),!e)throw"Could not find ancestor node with id "+d;f=e.getAttribute("data-schemapath")+"."+c.join("."),a.jsoneditor.watch(f,a.watch_listener),a.watched[g]=f}}this.schema.headerTemplate&&(this.header_template=this.jsoneditor.compileTemplate(this.schema.headerTemplate,this.template_engine))},addLinks:function(){if(!this.no_link_holder&&(this.link_holder=this.theme.getLinksHolder(),this.container.appendChild(this.link_holder),this.schema.links))for(var a=0;a<this.schema.links.length;a++)this.addLink(this.getLink(this.schema.links[a]))},getButton:function(a,b,c){var d="json-editor-btn-"+b;b=this.iconlib?this.iconlib.getIcon(b):null,!b&&c&&(a=c,c=null);var e=this.theme.getButton(a,b,c);return e.className+=" "+d+" ",e},setButtonText:function(a,b,c,d){return c=this.iconlib?this.iconlib.getIcon(c):null,!c&&d&&(b=d,d=null),this.theme.setButtonText(a,b,c,d)},addLink:function(a){this.link_holder&&this.link_holder.appendChild(a)},getLink:function(a){var b,c,d=a.mediaType||"application/javascript",e=d.split("/")[0],f=this.jsoneditor.compileTemplate(a.href,this.template_engine);if("image"===e){b=this.theme.getBlockLinkHolder(),c=document.createElement("a"),c.setAttribute("target","_blank");var g=document.createElement("img");this.theme.createImageLink(b,c,g),this.link_watchers.push(function(b){var d=f(b);c.setAttribute("href",d),c.setAttribute("title",a.rel||d),g.setAttribute("src",d)})}else if(["audio","video"].indexOf(e)>=0){b=this.theme.getBlockLinkHolder(),c=this.theme.getBlockLink(),c.setAttribute("target","_blank");var h=document.createElement(e);h.setAttribute("controls","controls"),this.theme.createMediaLink(b,c,h),this.link_watchers.push(function(b){var d=f(b);c.setAttribute("href",d),c.textContent=a.rel||d,h.setAttribute("src",d)})}else b=this.theme.getBlockLink(),b.setAttribute("target","_blank"),b.textContent=a.rel,this.link_watchers.push(function(c){var d=f(c);b.setAttribute("href",d),b.textContent=a.rel||d});return b},refreshWatchedFieldValues:function(){if(this.watched_values){var a={},b=!1,c=this;if(this.watched){var d,e;for(var f in this.watched)this.watched.hasOwnProperty(f)&&(e=c.jsoneditor.getEditor(this.watched[f]),d=e?e.getValue():null,c.watched_values[f]!==d&&(b=!0),a[f]=d)}return a.self=this.getValue(),this.watched_values.self!==a.self&&(b=!0),this.watched_values=a,b}},getWatchedFieldValues:function(){return this.watched_values},updateHeaderText:function(){if(this.header)if(this.header.children.length){for(var a=0;a<this.header.childNodes.length;a++)if(3===this.header.childNodes[a].nodeType){this.header.childNodes[a].nodeValue=this.getHeaderText();break}}else this.header.textContent=this.getHeaderText()},getHeaderText:function(a){return this.header_text?this.header_text:a?this.schema.title:this.getTitle()},onWatchedFieldChange:function(){var a;if(this.header_template){a=c(this.getWatchedFieldValues(),{key:this.key,i:this.key,i0:1*this.key,i1:1*this.key+1,title:this.getTitle()});var b=this.header_template(a);b!==this.header_text&&(this.header_text=b,this.updateHeaderText(),this.notify())}if(this.link_watchers.length){a=this.getWatchedFieldValues();for(var d=0;d<this.link_watchers.length;d++)this.link_watchers[d](a)}},setValue:function(a){this.value=a},getValue:function(){return this.value},refreshValue:function(){},getChildEditors:function(){return!1},destroy:function(){var a=this;this.unregister(this),d(this.watched,function(b,c){a.jsoneditor.unwatch(c,a.watch_listener)}),this.watched=null,this.watched_values=null,this.watch_listener=null,this.header_text=null,this.header_template=null,this.value=null,this.container&&this.container.parentNode&&this.container.parentNode.removeChild(this.container),this.container=null,this.jsoneditor=null,this.schema=null,this.path=null,this.key=null,this.parent=null},getDefault:function(){if(this.schema["default"])return this.schema["default"];if(this.schema["enum"])return this.schema["enum"][0];var a=this.schema.type||this.schema.oneOf;if(a&&Array.isArray(a)&&(a=a[0]),a&&"object"==typeof a&&(a=a.type),a&&Array.isArray(a)&&(a=a[0]),"string"==typeof a){if("number"===a)return 0;if("boolean"===a)return!1;if("integer"===a)return 0;if("string"===a)return"";if("object"===a)return{};if("array"===a)return[]}return null},getTitle:function(){return this.schema.title||this.key},enable:function(){this.disabled=!1},disable:function(){this.disabled=!0},isEnabled:function(){return!this.disabled},isRequired:function(){return"boolean"==typeof this.schema.required?this.schema.required:this.parent&&this.parent.schema&&Array.isArray(this.parent.schema.required)?this.parent.schema.required.indexOf(this.key)>-1:this.jsoneditor.options.required_by_default?!0:!1},getDisplayText:function(a){var b=[],c={};d(a,function(a,b){b.title&&(c[b.title]=c[b.title]||0,c[b.title]++),b.description&&(c[b.description]=c[b.description]||0,c[b.description]++),b.format&&(c[b.format]=c[b.format]||0,c[b.format]++),b.type&&(c[b.type]=c[b.type]||0,c[b.type]++)}),d(a,function(a,d){var e;e="string"==typeof d?d:d.title&&c[d.title]<=1?d.title:d.format&&c[d.format]<=1?d.format:d.type&&c[d.type]<=1?d.type:d.description&&c[d.description]<=1?d.descripton:d.title?d.title:d.format?d.format:d.type?d.type:d.description?d.description:JSON.stringify(d).length<50?JSON.stringify(d):"type",b.push(e)});var e={};return d(b,function(a,d){e[d]=e[d]||0,e[d]++,c[d]>1&&(b[a]=d+" "+e[d])}),b},getOption:function(a){try{throw"getOption is deprecated"}catch(b){window.console.error(b)}return this.options[a]},showValidationErrors:function(a){}}),f.defaults.editors["null"]=f.AbstractEditor.extend({getValue:function(){return null},setValue:function(){this.onChange()},getNumColumns:function(){return 2}}),f.defaults.editors.string=f.AbstractEditor.extend({register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},setValue:function(a,b,c){if((!this.template||c)&&(null===a||"undefined"==typeof a?a="":"object"==typeof a?a=JSON.stringify(a):"string"!=typeof a&&(a=""+a),a!==this.serialized)){var d=this.sanitize(a);if(this.input.value!==d){this.input.value=d,this.sceditor_instance?this.sceditor_instance.val(d):this.epiceditor?this.epiceditor.importFile(null,d):this.ace_editor&&this.ace_editor.setValue(d);var e=c||this.getValue()!==a;this.refreshValue(),b?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.adjust_height&&this.adjust_height(this.input),this.onChange(e)}}},getNumColumns:function(){var a,b=Math.ceil(Math.max(this.getTitle().length,this.schema.maxLength||0,this.schema.minLength||0)/5);return a="textarea"===this.input_type?6:["text","email"].indexOf(this.input_type)>=0?4:2,Math.min(12,Math.max(b,a))},build:function(){var a=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.format=this.schema.format,!this.format&&this.schema.media&&this.schema.media.type&&(this.format=this.schema.media.type.replace(/(^(application|text)\/(x-)?(script\.)?)|(-source$)/g,"")),!this.format&&this.options.default_format&&(this.format=this.options.default_format),this.options.format&&(this.format=this.options.format),this.format)if("textarea"===this.format)this.input_type="textarea",this.input=this.theme.getTextareaInput();else if("range"===this.format){this.input_type="range";var b=this.schema.minimum||0,c=this.schema.maximum||Math.max(100,b+1),d=1;this.schema.multipleOf&&(b%this.schema.multipleOf&&(b=Math.ceil(b/this.schema.multipleOf)*this.schema.multipleOf),c%this.schema.multipleOf&&(c=Math.floor(c/this.schema.multipleOf)*this.schema.multipleOf),d=this.schema.multipleOf),this.input=this.theme.getRangeInput(b,c,d)}else["actionscript","batchfile","bbcode","c","c++","cpp","coffee","csharp","css","dart","django","ejs","erlang","golang","handlebars","haskell","haxe","html","ini","jade","java","javascript","json","less","lisp","lua","makefile","markdown","matlab","mysql","objectivec","pascal","perl","pgsql","php","python","r","ruby","sass","scala","scss","smarty","sql","stylus","svg","twig","vbscript","xml","yaml"].indexOf(this.format)>=0?(this.input_type=this.format,this.source_code=!0,this.input=this.theme.getTextareaInput()):(this.input_type=this.format,this.input=this.theme.getFormInputField(this.input_type));else this.input_type="text",this.input=this.theme.getFormInputField(this.input_type);"undefined"!=typeof this.schema.maxLength&&this.input.setAttribute("maxlength",this.schema.maxLength),"undefined"!=typeof this.schema.pattern?this.input.setAttribute("pattern",this.schema.pattern):"undefined"!=typeof this.schema.minLength&&this.input.setAttribute("pattern",".{"+this.schema.minLength+",}"),this.options.compact?this.container.className+=" compact":this.options.input_width&&(this.input.style.width=this.options.input_width),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.always_disabled=!0,this.input.disabled=!0),this.input.addEventListener("change",function(b){if(b.preventDefault(),b.stopPropagation(),a.schema.template)return void(this.value=a.value);var c=this.value,d=a.sanitize(c);c!==d&&(this.value=d),a.is_dirty=!0,a.refreshValue(),a.onChange(!0)}),this.options.input_height&&(this.input.style.height=this.options.input_height),this.options.expand_height&&(this.adjust_height=function(a){if(a){var b,c=a.offsetHeight;if(a.offsetHeight<a.scrollHeight)for(b=0;a.offsetHeight<a.scrollHeight+3&&!(b>100);)b++,c++,a.style.height=c+"px";else{for(b=0;a.offsetHeight>=a.scrollHeight+3&&!(b>100);)b++,c--,a.style.height=c+"px";a.style.height=c+1+"px"}}},this.input.addEventListener("keyup",function(b){a.adjust_height(this)}),this.input.addEventListener("change",function(b){a.adjust_height(this)}),this.adjust_height()),this.format&&this.input.setAttribute("data-schemaformat",this.format),this.control=this.theme.getFormControl(this.label,this.input,this.description),this.container.appendChild(this.control),window.requestAnimationFrame(function(){a.input.parentNode&&a.afterInputReady(),a.adjust_height&&a.adjust_height(a.input)}),this.schema.template?(this.template=this.jsoneditor.compileTemplate(this.schema.template,this.template_engine),this.refreshValue()):this.refreshValue()},enable:function(){this.always_disabled||(this.input.disabled=!1),this._super()},disable:function(){this.input.disabled=!0,this._super()},afterInputReady:function(){var a,b=this;if(this.source_code)if(this.options.wysiwyg&&["html","bbcode"].indexOf(this.input_type)>=0&&window.jQuery&&window.jQuery.fn&&window.jQuery.fn.sceditor)a=c({},{plugins:"html"===b.input_type?"xhtml":"bbcode",emoticonsEnabled:!1,width:"100%",height:300},f.plugins.sceditor,b.options.sceditor_options||{}),window.jQuery(b.input).sceditor(a),b.sceditor_instance=window.jQuery(b.input).sceditor("instance"),b.sceditor_instance.blur(function(){var a=window.jQuery("<div>"+b.sceditor_instance.val()+"</div>");window.jQuery("#sceditor-start-marker,#sceditor-end-marker,.sceditor-nlf",a).remove(),b.input.value=a.html(),b.value=b.input.value,b.is_dirty=!0,b.onChange(!0)});else if("markdown"===this.input_type&&window.EpicEditor)this.epiceditor_container=document.createElement("div"),this.input.parentNode.insertBefore(this.epiceditor_container,this.input),this.input.style.display="none",a=c({},f.plugins.epiceditor,{container:this.epiceditor_container,clientSideStorage:!1}),this.epiceditor=new window.EpicEditor(a).load(),this.epiceditor.importFile(null,this.getValue()),this.epiceditor.on("update",function(){var a=b.epiceditor.exportFile();b.input.value=a,b.value=a,b.is_dirty=!0,b.onChange(!0);
-});else if(window.ace){var d=this.input_type;("cpp"===d||"c++"===d||"c"===d)&&(d="c_cpp"),this.ace_container=document.createElement("div"),this.ace_container.style.width="100%",this.ace_container.style.position="relative",this.ace_container.style.height="400px",this.input.parentNode.insertBefore(this.ace_container,this.input),this.input.style.display="none",this.ace_editor=window.ace.edit(this.ace_container),this.ace_editor.setValue(this.getValue()),f.plugins.ace.theme&&this.ace_editor.setTheme("ace/theme/"+f.plugins.ace.theme),d=window.ace.require("ace/mode/"+d),d&&this.ace_editor.getSession().setMode(new d.Mode),this.ace_editor.on("change",function(){var a=b.ace_editor.getValue();b.input.value=a,b.refreshValue(),b.is_dirty=!0,b.onChange(!0)})}b.theme.afterInputReady(b.input)},refreshValue:function(){this.value=this.input.value,"string"!=typeof this.value&&(this.value=""),this.serialized=this.value},destroy:function(){this.sceditor_instance?this.sceditor_instance.destroy():this.epiceditor?this.epiceditor.unload():this.ace_editor&&this.ace_editor.destroy(),this.template=null,this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this._super()},sanitize:function(a){return a},onWatchedFieldChange:function(){var a;this.template&&(a=this.getWatchedFieldValues(),this.setValue(this.template(a),!1,!0)),this._super()},showValidationErrors:function(a){var b=this;if("always"===this.jsoneditor.options.show_errors);else if(!this.is_dirty&&this.previous_error_setting===this.jsoneditor.options.show_errors)return;this.previous_error_setting=this.jsoneditor.options.show_errors;var c=[];d(a,function(a,d){d.path===b.path&&c.push(d.message)}),c.length?this.theme.addInputError(this.input,c.join(". ")+"."):this.theme.removeInputError(this.input)}}),f.defaults.editors.number=f.defaults.editors.string.extend({sanitize:function(a){return(a+"").replace(/[^0-9\.\-eE]/g,"")},getNumColumns:function(){return 2},getValue:function(){return 1*this.value}}),f.defaults.editors.integer=f.defaults.editors.number.extend({sanitize:function(a){return a+="",a.replace(/[^0-9\-]/g,"")},getNumColumns:function(){return 2}}),f.defaults.editors.object=f.AbstractEditor.extend({getDefault:function(){return c({},this.schema["default"]||{})},getChildEditors:function(){return this.editors},register:function(){if(this._super(),this.editors)for(var a in this.editors)this.editors.hasOwnProperty(a)&&this.editors[a].register()},unregister:function(){if(this._super(),this.editors)for(var a in this.editors)this.editors.hasOwnProperty(a)&&this.editors[a].unregister()},getNumColumns:function(){return Math.max(Math.min(12,this.maxwidth),3)},enable:function(){if(this.editjson_button&&(this.editjson_button.disabled=!1),this.addproperty_button&&(this.addproperty_button.disabled=!1),this._super(),this.editors)for(var a in this.editors)this.editors.hasOwnProperty(a)&&this.editors[a].enable()},disable:function(){if(this.editjson_button&&(this.editjson_button.disabled=!0),this.addproperty_button&&(this.addproperty_button.disabled=!0),this.hideEditJSON(),this._super(),this.editors)for(var a in this.editors)this.editors.hasOwnProperty(a)&&this.editors[a].disable()},layoutEditors:function(){var a,b,c=this;if(this.row_container){this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort(function(a,b){var d=c.editors[a].schema.propertyOrder,e=c.editors[b].schema.propertyOrder;return"number"!=typeof d&&(d=1e3),"number"!=typeof e&&(e=1e3),d-e});var e;if("grid"===this.format){var f=[];for(d(this.property_order,function(a,b){var d=c.editors[b];if(!d.property_removed){for(var e=!1,g=d.options.hidden?0:d.options.grid_columns||d.getNumColumns(),h=d.options.hidden?0:d.container.offsetHeight,i=0;i<f.length;i++)f[i].width+g<=12&&(!h||.5*f[i].minh<h&&2*f[i].maxh>h)&&(e=i);e===!1&&(f.push({width:0,minh:999999,maxh:0,editors:[]}),e=f.length-1),f[e].editors.push({key:b,width:g,height:h}),f[e].width+=g,f[e].minh=Math.min(f[e].minh,h),f[e].maxh=Math.max(f[e].maxh,h)}}),a=0;a<f.length;a++)if(f[a].width<12){var g=!1,h=0;for(b=0;b<f[a].editors.length;b++)g===!1?g=b:f[a].editors[b].width>f[a].editors[g].width&&(g=b),f[a].editors[b].width*=12/f[a].width,f[a].editors[b].width=Math.floor(f[a].editors[b].width),h+=f[a].editors[b].width;12>h&&(f[a].editors[g].width+=12-h),f[a].width=12}if(this.layout===JSON.stringify(f))return!1;for(this.layout=JSON.stringify(f),e=document.createElement("div"),a=0;a<f.length;a++){var i=this.theme.getGridRow();for(e.appendChild(i),b=0;b<f[a].editors.length;b++){var j=f[a].editors[b].key,k=this.editors[j];k.options.hidden?k.container.style.display="none":this.theme.setGridColumnSize(k.container,f[a].editors[b].width),i.appendChild(k.container)}}}else e=document.createElement("div"),d(this.property_order,function(a,b){var d=c.editors[b];if(!d.property_removed){var f=c.theme.getGridRow();e.appendChild(f),d.options.hidden?d.container.style.display="none":c.theme.setGridColumnSize(d.container,12),f.appendChild(d.container)}});this.row_container.innerHTML="",this.row_container.appendChild(e)}},getPropertySchema:function(a){var b=this.schema.properties[a]||{};b=c({},b);var d=this.schema.properties[a]?!0:!1;if(this.schema.patternProperties)for(var e in this.schema.patternProperties)if(this.schema.patternProperties.hasOwnProperty(e)){var f=new RegExp(e);f.test(a)&&(b.allOf=b.allOf||[],b.allOf.push(this.schema.patternProperties[e]),d=!0)}return!d&&this.schema.additionalProperties&&"object"==typeof this.schema.additionalProperties&&(b=c({},this.schema.additionalProperties)),b},preBuild:function(){this._super(),this.editors={},this.cached_editors={};var a=this;if(this.format=this.options.layout||this.options.object_layout||this.schema.format||this.jsoneditor.options.object_layout||"normal",this.schema.properties=this.schema.properties||{},this.minwidth=0,this.maxwidth=0,this.options.table_row)d(this.schema.properties,function(b,c){var d=a.jsoneditor.getEditorClass(c);a.editors[b]=a.jsoneditor.createEditor(d,{jsoneditor:a.jsoneditor,schema:c,path:a.path+"."+b,parent:a,compact:!0,required:!0}),a.editors[b].preBuild();var e=a.editors[b].options.hidden?0:a.editors[b].options.grid_columns||a.editors[b].getNumColumns();a.minwidth+=e,a.maxwidth+=e}),this.no_link_holder=!0;else{if(this.options.table)throw"Not supported yet";this.defaultProperties=this.schema.defaultProperties||Object.keys(this.schema.properties),a.maxwidth+=1,d(this.defaultProperties,function(b,c){a.addObjectProperty(c,!0),a.editors[c]&&(a.minwidth=Math.max(a.minwidth,a.editors[c].options.grid_columns||a.editors[c].getNumColumns()),a.maxwidth+=a.editors[c].options.grid_columns||a.editors[c].getNumColumns())})}this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort(function(b,c){var d=a.editors[b].schema.propertyOrder,e=a.editors[c].schema.propertyOrder;return"number"!=typeof d&&(d=1e3),"number"!=typeof e&&(e=1e3),d-e})},build:function(){var a=this;if(this.options.table_row)this.editor_holder=this.container,d(this.editors,function(b,c){var d=a.theme.getTableCell();a.editor_holder.appendChild(d),c.setContainer(d),c.build(),c.postBuild(),a.editors[b].options.hidden&&(d.style.display="none"),a.editors[b].options.input_width&&(d.style.width=a.editors[b].options.input_width)});else{if(this.options.table)throw"Not supported yet";this.header=document.createElement("span"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header),this.container.appendChild(this.title),this.container.style.position="relative",this.editjson_holder=this.theme.getModal(),this.editjson_textarea=this.theme.getTextareaInput(),this.editjson_textarea.style.height="170px",this.editjson_textarea.style.width="300px",this.editjson_textarea.style.display="block",this.editjson_save=this.getButton("Save","save","Save"),this.editjson_save.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation(),a.saveJSON()}),this.editjson_cancel=this.getButton("Cancel","cancel","Cancel"),this.editjson_cancel.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation(),a.hideEditJSON()}),this.editjson_holder.appendChild(this.editjson_textarea),this.editjson_holder.appendChild(this.editjson_save),this.editjson_holder.appendChild(this.editjson_cancel),this.addproperty_holder=this.theme.getModal(),this.addproperty_list=document.createElement("div"),this.addproperty_list.style.width="295px",this.addproperty_list.style.maxHeight="160px",this.addproperty_list.style.padding="5px 0",this.addproperty_list.style.overflowY="auto",this.addproperty_list.style.overflowX="hidden",this.addproperty_list.style.paddingLeft="5px",this.addproperty_list.setAttribute("class","property-selector"),this.addproperty_add=this.getButton("add","add","add"),this.addproperty_input=this.theme.getFormInputField("text"),this.addproperty_input.setAttribute("placeholder","Property name..."),this.addproperty_input.style.width="220px",this.addproperty_input.style.marginBottom="0",this.addproperty_input.style.display="inline-block",this.addproperty_add.addEventListener("click",function(b){if(b.preventDefault(),b.stopPropagation(),a.addproperty_input.value){if(a.editors[a.addproperty_input.value])return void window.alert("there is already a property with that name");a.addObjectProperty(a.addproperty_input.value),a.editors[a.addproperty_input.value]&&a.editors[a.addproperty_input.value].disable(),a.onChange(!0)}}),this.addproperty_holder.appendChild(this.addproperty_list),this.addproperty_holder.appendChild(this.addproperty_input),this.addproperty_holder.appendChild(this.addproperty_add);var b=document.createElement("div");b.style.clear="both",this.addproperty_holder.appendChild(b),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),this.editor_holder=this.theme.getIndentedPanel(),this.editor_holder.style.paddingBottom="0",this.container.appendChild(this.editor_holder),this.row_container=this.theme.getGridContainer(),this.editor_holder.appendChild(this.row_container),d(this.editors,function(b,c){var d=a.theme.getGridColumn();a.row_container.appendChild(d),c.setContainer(d),c.build(),c.postBuild()}),this.title_controls=this.theme.getHeaderButtonHolder(),this.editjson_controls=this.theme.getHeaderButtonHolder(),this.addproperty_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.title.appendChild(this.editjson_controls),this.title.appendChild(this.addproperty_controls),this.collapsed=!1,this.toggle_button=this.getButton("","collapse","Collapse"),this.title_controls.appendChild(this.toggle_button),this.toggle_button.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation(),a.collapsed?(a.editor_holder.style.display="",a.collapsed=!1,a.setButtonText(a.toggle_button,"","collapse","Collapse")):(a.editor_holder.style.display="none",a.collapsed=!0,a.setButtonText(a.toggle_button,"","expand","Expand"))}),this.options.collapsed&&e(this.toggle_button,"click"),this.schema.options&&"undefined"!=typeof this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none"),this.editjson_button=this.getButton("JSON","edit","Edit JSON"),this.editjson_button.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation(),a.toggleEditJSON()}),this.editjson_controls.appendChild(this.editjson_button),this.editjson_controls.appendChild(this.editjson_holder),this.schema.options&&"undefined"!=typeof this.schema.options.disable_edit_json?this.schema.options.disable_edit_json&&(this.editjson_button.style.display="none"):this.jsoneditor.options.disable_edit_json&&(this.editjson_button.style.display="none"),this.addproperty_button=this.getButton("Properties","edit","Object Properties"),this.addproperty_button.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation(),a.toggleAddProperty()}),this.addproperty_controls.appendChild(this.addproperty_button),this.addproperty_controls.appendChild(this.addproperty_holder),this.refreshAddProperties()}this.options.table_row?(this.editor_holder=this.container,d(this.property_order,function(b,c){a.editor_holder.appendChild(a.editors[c].container)})):(this.layoutEditors(),this.layoutEditors())},showEditJSON:function(){this.editjson_holder&&(this.hideAddProperty(),this.editjson_holder.style.left=this.editjson_button.offsetLeft+"px",this.editjson_holder.style.top=this.editjson_button.offsetTop+this.editjson_button.offsetHeight+"px",this.editjson_textarea.value=JSON.stringify(this.getValue(),null,2),this.disable(),this.editjson_holder.style.display="",this.editjson_button.disabled=!1,this.editing_json=!0)},hideEditJSON:function(){this.editjson_holder&&this.editing_json&&(this.editjson_holder.style.display="none",this.enable(),this.editing_json=!1)},saveJSON:function(){if(this.editjson_holder)try{var a=JSON.parse(this.editjson_textarea.value);this.setValue(a),this.hideEditJSON()}catch(b){throw window.alert("invalid JSON"),b}},toggleEditJSON:function(){this.editing_json?this.hideEditJSON():this.showEditJSON()},insertPropertyControlUsingPropertyOrder:function(a,b,c){var d;this.schema.properties[a]&&(d=this.schema.properties[a].propertyOrder),"number"!=typeof d&&(d=1e3),b.propertyOrder=d;for(var e=0;e<c.childNodes.length;e++){var f=c.childNodes[e];if(b.propertyOrder<f.propertyOrder){this.addproperty_list.insertBefore(b,f),b=null;break}}b&&this.addproperty_list.appendChild(b)},addPropertyCheckbox:function(a){var b,c,d,e,f=this;return b=f.theme.getCheckbox(),b.style.width="auto",d=this.schema.properties[a]&&this.schema.properties[a].title?this.schema.properties[a].title:a,c=f.theme.getCheckboxLabel(d),e=f.theme.getFormControl(c,b),e.style.paddingBottom=e.style.marginBottom=e.style.paddingTop=e.style.marginTop=0,e.style.height="auto",this.insertPropertyControlUsingPropertyOrder(a,e,this.addproperty_list),b.checked=a in this.editors,b.addEventListener("change",function(){b.checked?f.addObjectProperty(a):f.removeObjectProperty(a),f.onChange(!0)}),f.addproperty_checkboxes[a]=b,b},showAddProperty:function(){this.addproperty_holder&&(this.hideEditJSON(),this.addproperty_holder.style.left=this.addproperty_button.offsetLeft+"px",this.addproperty_holder.style.top=this.addproperty_button.offsetTop+this.addproperty_button.offsetHeight+"px",this.disable(),this.adding_property=!0,this.addproperty_button.disabled=!1,this.addproperty_holder.style.display="",this.refreshAddProperties())},hideAddProperty:function(){this.addproperty_holder&&this.adding_property&&(this.addproperty_holder.style.display="none",this.enable(),this.adding_property=!1)},toggleAddProperty:function(){this.adding_property?this.hideAddProperty():this.showAddProperty()},removeObjectProperty:function(a){this.editors[a]&&(this.editors[a].unregister(),delete this.editors[a],this.refreshValue(),this.layoutEditors())},addObjectProperty:function(a,b){var c=this;if(!this.editors[a]){if(this.cached_editors[a]){if(this.editors[a]=this.cached_editors[a],b)return;this.editors[a].register()}else{if(!(this.canHaveAdditionalProperties()||this.schema.properties&&this.schema.properties[a]))return;var d=c.getPropertySchema(a),e=c.jsoneditor.getEditorClass(d);if(c.editors[a]=c.jsoneditor.createEditor(e,{jsoneditor:c.jsoneditor,schema:d,path:c.path+"."+a,parent:c}),c.editors[a].preBuild(),!b){var f=c.theme.getChildEditorHolder();c.editor_holder.appendChild(f),c.editors[a].setContainer(f),c.editors[a].build(),c.editors[a].postBuild()}c.cached_editors[a]=c.editors[a]}b||(c.refreshValue(),c.layoutEditors())}},onChildEditorChange:function(a){this.refreshValue(),this._super(a)},canHaveAdditionalProperties:function(){return"boolean"==typeof this.schema.additionalProperties?this.schema.additionalProperties:!this.jsoneditor.options.no_additional_properties},destroy:function(){d(this.cached_editors,function(a,b){b.destroy()}),this.editor_holder&&(this.editor_holder.innerHTML=""),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.error_holder&&this.error_holder.parentNode&&this.error_holder.parentNode.removeChild(this.error_holder),this.editors=null,this.cached_editors=null,this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.editor_holder=null,this._super()},getValue:function(){var a=this._super();if(this.jsoneditor.options.remove_empty_properties||this.options.remove_empty_properties)for(var b in a)a.hasOwnProperty(b)&&(a[b]||delete a[b]);return a},refreshValue:function(){this.value={};for(var a in this.editors)this.editors.hasOwnProperty(a)&&(this.value[a]=this.editors[a].getValue());this.adding_property&&this.refreshAddProperties()},refreshAddProperties:function(){if(this.options.disable_properties||this.options.disable_properties!==!1&&this.jsoneditor.options.disable_properties)return void(this.addproperty_controls.style.display="none");var a,b=!1,c=!1,d=0,e=!1;for(a in this.editors)this.editors.hasOwnProperty(a)&&d++;b=this.canHaveAdditionalProperties()&&!("undefined"!=typeof this.schema.maxProperties&&d>=this.schema.maxProperties),this.addproperty_checkboxes&&(this.addproperty_list.innerHTML=""),this.addproperty_checkboxes={};for(a in this.cached_editors)this.cached_editors.hasOwnProperty(a)&&(this.addPropertyCheckbox(a),this.isRequired(this.cached_editors[a])&&a in this.editors&&(this.addproperty_checkboxes[a].disabled=!0),"undefined"!=typeof this.schema.minProperties&&d<=this.schema.minProperties?(this.addproperty_checkboxes[a].disabled=this.addproperty_checkboxes[a].checked,this.addproperty_checkboxes[a].checked||(e=!0)):a in this.editors?(e=!0,c=!0):b||this.schema.properties.hasOwnProperty(a)?(this.addproperty_checkboxes[a].disabled=!1,e=!0):this.addproperty_checkboxes[a].disabled=!0);this.canHaveAdditionalProperties()&&(e=!0);for(a in this.schema.properties)this.schema.properties.hasOwnProperty(a)&&(this.cached_editors[a]||(e=!0,this.addPropertyCheckbox(a)));e?this.canHaveAdditionalProperties()?b?this.addproperty_add.disabled=!1:this.addproperty_add.disabled=!0:(this.addproperty_add.style.display="none",this.addproperty_input.style.display="none"):(this.hideAddProperty(),this.addproperty_controls.style.display="none")},isRequired:function(a){return"boolean"==typeof a.schema.required?a.schema.required:Array.isArray(this.schema.required)?this.schema.required.indexOf(a.key)>-1:this.jsoneditor.options.required_by_default?!0:!1},setValue:function(a,b){var c=this;a=a||{},("object"!=typeof a||Array.isArray(a))&&(a={}),d(this.cached_editors,function(d,e){"undefined"!=typeof a[d]?(c.addObjectProperty(d),e.setValue(a[d],b)):b||c.isRequired(e)?e.setValue(e.getDefault(),b):c.removeObjectProperty(d)}),d(a,function(a,d){c.cached_editors[a]||(c.addObjectProperty(a),c.editors[a]&&c.editors[a].setValue(d,b))}),this.refreshValue(),this.layoutEditors(),this.onChange()},showValidationErrors:function(a){var b=this,c=[],e=[];if(d(a,function(a,d){d.path===b.path?c.push(d):e.push(d)}),this.error_holder)if(c.length){this.error_holder.innerHTML="",this.error_holder.style.display="",d(c,function(a,c){b.error_holder.appendChild(b.theme.getErrorMessage(c.message))})}else this.error_holder.style.display="none";this.options.table_row&&(c.length?this.theme.addTableRowError(this.container):this.theme.removeTableRowError(this.container)),d(this.editors,function(a,b){b.showValidationErrors(e)})}}),f.defaults.editors.array=f.AbstractEditor.extend({getDefault:function(){return this.schema["default"]||[]},register:function(){if(this._super(),this.rows)for(var a=0;a<this.rows.length;a++)this.rows[a].register()},unregister:function(){if(this._super(),this.rows)for(var a=0;a<this.rows.length;a++)this.rows[a].unregister()},getNumColumns:function(){var a=this.getItemInfo(0);return this.tabs_holder?Math.max(Math.min(12,a.width+2),4):a.width},enable:function(){if(this.add_row_button&&(this.add_row_button.disabled=!1),this.remove_all_rows_button&&(this.remove_all_rows_button.disabled=!1),this.delete_last_row_button&&(this.delete_last_row_button.disabled=!1),this.rows)for(var a=0;a<this.rows.length;a++)this.rows[a].enable(),this.rows[a].moveup_button&&(this.rows[a].moveup_button.disabled=!1),this.rows[a].movedown_button&&(this.rows[a].movedown_button.disabled=!1),this.rows[a].delete_button&&(this.rows[a].delete_button.disabled=!1);this._super()},disable:function(){if(this.add_row_button&&(this.add_row_button.disabled=!0),this.remove_all_rows_button&&(this.remove_all_rows_button.disabled=!0),this.delete_last_row_button&&(this.delete_last_row_button.disabled=!0),this.rows)for(var a=0;a<this.rows.length;a++)this.rows[a].disable(),this.rows[a].moveup_button&&(this.rows[a].moveup_button.disabled=!0),this.rows[a].movedown_button&&(this.rows[a].movedown_button.disabled=!0),this.rows[a].delete_button&&(this.rows[a].delete_button.disabled=!0);this._super()},preBuild:function(){this._super(),this.rows=[],this.row_cache=[],this.hide_delete_buttons=this.options.disable_array_delete||this.jsoneditor.options.disable_array_delete,this.hide_move_buttons=this.options.disable_array_reorder||this.jsoneditor.options.disable_array_reorder,this.hide_add_button=this.options.disable_array_add||this.jsoneditor.options.disable_array_add},build:function(){this.options.compact?(this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.controls=this.theme.getButtonHolder(),this.panel.appendChild(this.controls),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder)):(this.header=document.createElement("span"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header,this.isRequired()),this.container.appendChild(this.title),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),"tabs"===this.schema.format?(this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.tabs_holder=this.theme.getTabHolder(),this.container.appendChild(this.tabs_holder),this.row_holder=this.theme.getTabContentHolder(this.tabs_holder),this.active_tab=null):(this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder),this.controls=this.theme.getButtonHolder(),this.panel.appendChild(this.controls))),this.addControls()},onChildEditorChange:function(a){this.refreshValue(),this.refreshTabs(!0),this._super(a)},getItemTitle:function(){if(!this.item_title)if(this.schema.items&&!Array.isArray(this.schema.items)){var a=this.jsoneditor.expandRefs(this.schema.items);this.item_title=a.title||"item"}else this.item_title="item";return this.item_title},getItemSchema:function(a){return Array.isArray(this.schema.items)?a>=this.schema.items.length?this.schema.additionalItems===!0?{}:this.schema.additionalItems?c({},this.schema.additionalItems):void 0:c({},this.schema.items[a]):this.schema.items?c({},this.schema.items):{}},getItemInfo:function(a){var b=this.getItemSchema(a);this.item_info=this.item_info||{};var c=JSON.stringify(b);return"undefined"!=typeof this.item_info[c]?this.item_info[c]:(b=this.jsoneditor.expandRefs(b),this.item_info[c]={title:b.title||"item","default":b["default"],width:12,child_editors:b.properties||b.items},this.item_info[c])},getElementEditor:function(a){var b=this.getItemInfo(a),c=this.getItemSchema(a);c=this.jsoneditor.expandRefs(c),c.title=b.title+" "+(a+1);var d,e=this.jsoneditor.getEditorClass(c);d=this.tabs_holder?this.theme.getTabContent():b.child_editors?this.theme.getChildEditorHolder():this.theme.getIndentedPanel(),this.row_holder.appendChild(d);var f=this.jsoneditor.createEditor(e,{jsoneditor:this.jsoneditor,schema:c,container:d,path:this.path+"."+a,parent:this,required:!0});return f.preBuild(),f.build(),f.postBuild(),f.title_controls||(f.array_controls=this.theme.getButtonHolder(),d.appendChild(f.array_controls)),f},destroy:function(){this.empty(!0),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.row_holder&&this.row_holder.parentNode&&this.row_holder.parentNode.removeChild(this.row_holder),this.controls&&this.controls.parentNode&&this.controls.parentNode.removeChild(this.controls),this.panel&&this.panel.parentNode&&this.panel.parentNode.removeChild(this.panel),this.rows=this.row_cache=this.title=this.description=this.row_holder=this.panel=this.controls=null,this._super()},empty:function(a){if(this.rows){var b=this;d(this.rows,function(c,d){a&&(d.tab&&d.tab.parentNode&&d.tab.parentNode.removeChild(d.tab),b.destroyRow(d,!0),b.row_cache[c]=null),b.rows[c]=null}),b.rows=[],a&&(b.row_cache=[])}},destroyRow:function(a,b){var c=a.container;b?(a.destroy(),c.parentNode&&c.parentNode.removeChild(c),a.tab&&a.tab.parentNode&&a.tab.parentNode.removeChild(a.tab)):(a.tab&&(a.tab.style.display="none"),c.style.display="none",a.unregister())},getMax:function(){return Array.isArray(this.schema.items)&&this.schema.additionalItems===!1?Math.min(this.schema.items.length,this.schema.maxItems||1/0):this.schema.maxItems||1/0},refreshTabs:function(a){var b=this;d(this.rows,function(c,d){d.tab&&(a?d.tab_text.textContent=d.getHeaderText():d.tab===b.active_tab?(b.theme.markTabActive(d.tab),d.container.style.display=""):(b.theme.markTabInactive(d.tab),d.container.style.display="none"))})},setValue:function(a,b){a=a||[],Array.isArray(a)||(a=[a]);var c=JSON.stringify(a);if(c!==this.serialized){if(this.schema.minItems)for(;a.length<this.schema.minItems;)a.push(this.getItemInfo(a.length)["default"]);this.getMax()&&a.length>this.getMax()&&(a=a.slice(0,this.getMax()));var e=this;d(a,function(a,c){e.rows[a]?e.rows[a].setValue(c,b):e.row_cache[a]?(e.rows[a]=e.row_cache[a],e.rows[a].setValue(c,b),e.rows[a].container.style.display="",e.rows[a].tab&&(e.rows[a].tab.style.display=""),e.rows[a].register()):e.addRow(c,b)});for(var f=a.length;f<e.rows.length;f++)e.destroyRow(e.rows[f]),e.rows[f]=null;e.rows=e.rows.slice(0,a.length);var g=null;d(e.rows,function(a,b){return b.tab===e.active_tab?(g=b.tab,!1):void 0}),!g&&e.rows.length&&(g=e.rows[0].tab),e.active_tab=g,e.refreshValue(b),e.refreshTabs(!0),e.refreshTabs(),e.onChange()}},refreshValue:function(a){var b=this,c=this.value?this.value.length:0;if(this.value=[],d(this.rows,function(a,c){b.value[a]=c.getValue()}),c!==this.value.length||a){var e=this.schema.minItems&&this.schema.minItems>=this.rows.length;d(this.rows,function(a,c){c.movedown_button&&(a===b.rows.length-1?c.movedown_button.style.display="none":c.movedown_button.style.display=""),c.delete_button&&(e?c.delete_button.style.display="none":c.delete_button.style.display=""),b.value[a]=c.getValue()});var f=!1;this.value.length?1===this.value.length?(this.remove_all_rows_button.style.display="none",e||this.hide_delete_buttons?this.delete_last_row_button.style.display="none":(this.delete_last_row_button.style.display="",f=!0)):e||this.hide_delete_buttons?(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none"):(this.delete_last_row_button.style.display="",this.remove_all_rows_button.style.display="",f=!0):(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none"),this.getMax()&&this.getMax()<=this.rows.length||this.hide_add_button?this.add_row_button.style.display="none":(this.add_row_button.style.display="",f=!0),!this.collapsed&&f?this.controls.style.display="inline-block":this.controls.style.display="none"}},addRow:function(a,b){var c=this,e=this.rows.length;c.rows[e]=this.getElementEditor(e),c.row_cache[e]=c.rows[e],c.tabs_holder&&(c.rows[e].tab_text=document.createElement("span"),c.rows[e].tab_text.textContent=c.rows[e].getHeaderText(),c.rows[e].tab=c.theme.getTab(c.rows[e].tab_text),c.rows[e].tab.addEventListener("click",function(a){c.active_tab=c.rows[e].tab,c.refreshTabs(),a.preventDefault(),a.stopPropagation()}),c.theme.addTab(c.tabs_holder,c.rows[e].tab));var f=c.rows[e].title_controls||c.rows[e].array_controls;c.hide_delete_buttons||(c.rows[e].delete_button=this.getButton(c.getItemTitle(),"delete","Delete "+c.getItemTitle()),c.rows[e].delete_button.className+=" delete",c.rows[e].delete_button.setAttribute("data-i",e),c.rows[e].delete_button.addEventListener("click",function(a){a.preventDefault(),a.stopPropagation();var b=1*this.getAttribute("data-i"),e=c.getValue(),f=[],g=null;d(e,function(a,d){return a===b?void(c.rows[a].tab===c.active_tab&&(c.rows[a+1]?g=c.rows[a].tab:a&&(g=c.rows[a-1].tab))):void f.push(d)}),c.setValue(f),g&&(c.active_tab=g,c.refreshTabs()),c.onChange(!0)}),f&&f.appendChild(c.rows[e].delete_button)),e&&!c.hide_move_buttons&&(c.rows[e].moveup_button=this.getButton("","moveup","Move up"),c.rows[e].moveup_button.className+=" moveup",c.rows[e].moveup_button.setAttribute("data-i",e),c.rows[e].moveup_button.addEventListener("click",function(a){a.preventDefault(),a.stopPropagation();var b=1*this.getAttribute("data-i");if(!(0>=b)){var d=c.getValue(),e=d[b-1];d[b-1]=d[b],d[b]=e,c.setValue(d),c.active_tab=c.rows[b-1].tab,c.refreshTabs(),c.onChange(!0)}}),f&&f.appendChild(c.rows[e].moveup_button)),c.hide_move_buttons||(c.rows[e].movedown_button=this.getButton("","movedown","Move down"),c.rows[e].movedown_button.className+=" movedown",c.rows[e].movedown_button.setAttribute("data-i",e),c.rows[e].movedown_button.addEventListener("click",function(a){a.preventDefault(),a.stopPropagation();var b=1*this.getAttribute("data-i"),d=c.getValue();if(!(b>=d.length-1)){var e=d[b+1];d[b+1]=d[b],d[b]=e,c.setValue(d),c.active_tab=c.rows[b+1].tab,c.refreshTabs(),c.onChange(!0)}}),f&&f.appendChild(c.rows[e].movedown_button)),a&&c.rows[e].setValue(a,b),c.refreshTabs()},addControls:function(){var a=this;this.collapsed=!1,this.toggle_button=this.getButton("","collapse","Collapse"),this.title_controls.appendChild(this.toggle_button);var b=a.row_holder.style.display,c=a.controls.style.display;this.toggle_button.addEventListener("click",function(d){d.preventDefault(),d.stopPropagation(),a.collapsed?(a.collapsed=!1,a.panel&&(a.panel.style.display=""),a.row_holder.style.display=b,a.tabs_holder&&(a.tabs_holder.style.display=""),a.controls.style.display=c,a.setButtonText(this,"","collapse","Collapse")):(a.collapsed=!0,a.row_holder.style.display="none",a.tabs_holder&&(a.tabs_holder.style.display="none"),a.controls.style.display="none",a.panel&&(a.panel.style.display="none"),a.setButtonText(this,"","expand","Expand"))}),this.options.collapsed&&e(this.toggle_button,"click"),this.schema.options&&"undefined"!=typeof this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none"),this.add_row_button=this.getButton(this.getItemTitle(),"add","Add "+this.getItemTitle()),this.add_row_button.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation();var c=a.rows.length;a.row_cache[c]?(a.rows[c]=a.row_cache[c],a.rows[c].setValue(a.rows[c].getDefault()),a.rows[c].container.style.display="",a.rows[c].tab&&(a.rows[c].tab.style.display=""),a.rows[c].register()):a.addRow(),a.active_tab=a.rows[c].tab,a.refreshTabs(),a.refreshValue(),a.onChange(!0)}),a.controls.appendChild(this.add_row_button),this.delete_last_row_button=this.getButton("Last "+this.getItemTitle(),"delete","Delete Last "+this.getItemTitle()),
-this.delete_last_row_button.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation();var c=a.getValue(),d=null;a.rows.length>1&&a.rows[a.rows.length-1].tab===a.active_tab&&(d=a.rows[a.rows.length-2].tab),c.pop(),a.setValue(c),d&&(a.active_tab=d,a.refreshTabs()),a.onChange(!0)}),a.controls.appendChild(this.delete_last_row_button),this.remove_all_rows_button=this.getButton("All","delete","Delete All"),this.remove_all_rows_button.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation(),a.setValue([]),a.onChange(!0)}),a.controls.appendChild(this.remove_all_rows_button),a.tabs&&(this.add_row_button.style.width="100%",this.add_row_button.style.textAlign="left",this.add_row_button.style.marginBottom="3px",this.delete_last_row_button.style.width="100%",this.delete_last_row_button.style.textAlign="left",this.delete_last_row_button.style.marginBottom="3px",this.remove_all_rows_button.style.width="100%",this.remove_all_rows_button.style.textAlign="left",this.remove_all_rows_button.style.marginBottom="3px")},showValidationErrors:function(a){var b=this,c=[],e=[];if(d(a,function(a,d){d.path===b.path?c.push(d):e.push(d)}),this.error_holder)if(c.length){this.error_holder.innerHTML="",this.error_holder.style.display="",d(c,function(a,c){b.error_holder.appendChild(b.theme.getErrorMessage(c.message))})}else this.error_holder.style.display="none";d(this.rows,function(a,b){b.showValidationErrors(e)})}}),f.defaults.editors.table=f.defaults.editors.array.extend({register:function(){if(this._super(),this.rows)for(var a=0;a<this.rows.length;a++)this.rows[a].register()},unregister:function(){if(this._super(),this.rows)for(var a=0;a<this.rows.length;a++)this.rows[a].unregister()},getNumColumns:function(){return Math.max(Math.min(12,this.width),3)},preBuild:function(){var a=this.jsoneditor.expandRefs(this.schema.items||{});this.item_title=a.title||"row",this.item_default=a["default"]||null,this.item_has_child_editors=a.properties||a.items,this.width=12,this._super()},build:function(){var a=this;this.table=this.theme.getTable(),this.container.appendChild(this.table),this.thead=this.theme.getTableHead(),this.table.appendChild(this.thead),this.header_row=this.theme.getTableRow(),this.thead.appendChild(this.header_row),this.row_holder=this.theme.getTableBody(),this.table.appendChild(this.row_holder);var b=this.getElementEditor(0,!0);if(this.item_default=b.getDefault(),this.width=b.getNumColumns()+2,this.options.compact?(this.panel=document.createElement("div"),this.container.appendChild(this.panel)):(this.title=this.theme.getHeader(this.getTitle(),this.isRequired()),this.container.appendChild(this.title),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.error_holder=document.createElement("div"),this.panel.appendChild(this.error_holder)),this.panel.appendChild(this.table),this.controls=this.theme.getButtonHolder(),this.panel.appendChild(this.controls),this.item_has_child_editors)for(var c=b.getChildEditors(),d=b.property_order||Object.keys(c),e=0;e<d.length;e++){var f=a.theme.getTableHeaderCell(c[d[e]].getTitle());c[d[e]].options.hidden&&(f.style.display="none"),a.header_row.appendChild(f)}else a.header_row.appendChild(a.theme.getTableHeaderCell(this.item_title));b.destroy(),this.row_holder.innerHTML="",this.controls_header_cell=a.theme.getTableHeaderCell(" "),a.header_row.appendChild(this.controls_header_cell),this.addControls()},onChildEditorChange:function(a){this.refreshValue(),this._super()},getItemDefault:function(){return c({},{"default":this.item_default})["default"]},getItemTitle:function(){return this.item_title},getElementEditor:function(a,b){var d=c({},this.schema.items),e=this.jsoneditor.getEditorClass(d,this.jsoneditor),f=this.row_holder.appendChild(this.theme.getTableRow()),g=f;this.item_has_child_editors||(g=this.theme.getTableCell(),f.appendChild(g));var h=this.jsoneditor.createEditor(e,{jsoneditor:this.jsoneditor,schema:d,container:g,path:this.path+"."+a,parent:this,compact:!0,table_row:!0});return h.preBuild(),b||(h.build(),h.postBuild(),h.controls_cell=f.appendChild(this.theme.getTableCell()),h.row=f,h.table_controls=this.theme.getButtonHolder(),h.controls_cell.appendChild(h.table_controls),h.table_controls.style.margin=0,h.table_controls.style.padding=0),h},destroy:function(){this.innerHTML="",this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.row_holder&&this.row_holder.parentNode&&this.row_holder.parentNode.removeChild(this.row_holder),this.table&&this.table.parentNode&&this.table.parentNode.removeChild(this.table),this.panel&&this.panel.parentNode&&this.panel.parentNode.removeChild(this.panel),this.rows=this.title=this.description=this.row_holder=this.table=this.panel=null,this._super()},setValue:function(a,b){if(a=a||[],this.schema.minItems)for(;a.length<this.schema.minItems;)a.push(this.getItemDefault());this.schema.maxItems&&a.length>this.schema.maxItems&&(a=a.slice(0,this.schema.maxItems));var c=JSON.stringify(a);if(c!==this.serialized){var e=!1,f=this;d(a,function(a,b){f.rows[a]?f.rows[a].setValue(b):(f.addRow(b),e=!0)});for(var g=a.length;g<f.rows.length;g++){var h=f.rows[g].container;f.item_has_child_editors||f.rows[g].row.parentNode.removeChild(f.rows[g].row),f.rows[g].destroy(),h.parentNode&&h.parentNode.removeChild(h),f.rows[g]=null,e=!0}f.rows=f.rows.slice(0,a.length),f.refreshValue(),(e||b)&&f.refreshRowButtons(),f.onChange()}},refreshRowButtons:function(){var a=this,b=this.schema.minItems&&this.schema.minItems>=this.rows.length,c=!1;d(this.rows,function(d,e){e.movedown_button&&(d===a.rows.length-1?e.movedown_button.style.display="none":(c=!0,e.movedown_button.style.display="")),e.delete_button&&(b?e.delete_button.style.display="none":(c=!0,e.delete_button.style.display="")),e.moveup_button&&(c=!0)}),d(this.rows,function(a,b){c?b.controls_cell.style.display="":b.controls_cell.style.display="none"}),c?this.controls_header_cell.style.display="":this.controls_header_cell.style.display="none";var e=!1;this.value.length?1===this.value.length||this.hide_delete_buttons?(this.table.style.display="",this.remove_all_rows_button.style.display="none",b||this.hide_delete_buttons?this.delete_last_row_button.style.display="none":(this.delete_last_row_button.style.display="",e=!0)):(this.table.style.display="",b||this.hide_delete_buttons?(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none"):(this.delete_last_row_button.style.display="",this.remove_all_rows_button.style.display="",e=!0)):(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none",this.table.style.display="none"),this.schema.maxItems&&this.schema.maxItems<=this.rows.length||this.hide_add_button?this.add_row_button.style.display="none":(this.add_row_button.style.display="",e=!0),e?this.controls.style.display="":this.controls.style.display="none"},refreshValue:function(){var a=this;this.value=[],d(this.rows,function(b,c){a.value[b]=c.getValue()}),this.serialized=JSON.stringify(this.value)},addRow:function(a){var b=this,c=this.rows.length;b.rows[c]=this.getElementEditor(c);var e=b.rows[c].table_controls;this.hide_delete_buttons||(b.rows[c].delete_button=this.getButton("","delete","Delete"),b.rows[c].delete_button.className+=" delete",b.rows[c].delete_button.setAttribute("data-i",c),b.rows[c].delete_button.addEventListener("click",function(a){a.preventDefault(),a.stopPropagation();var c=1*this.getAttribute("data-i"),e=b.getValue(),f=[];d(e,function(a,b){a!==c&&f.push(b)}),b.setValue(f),b.onChange(!0)}),e.appendChild(b.rows[c].delete_button)),c&&!this.hide_move_buttons&&(b.rows[c].moveup_button=this.getButton("","moveup","Move up"),b.rows[c].moveup_button.className+=" moveup",b.rows[c].moveup_button.setAttribute("data-i",c),b.rows[c].moveup_button.addEventListener("click",function(a){a.preventDefault(),a.stopPropagation();var c=1*this.getAttribute("data-i");if(!(0>=c)){var d=b.getValue(),e=d[c-1];d[c-1]=d[c],d[c]=e,b.setValue(d),b.onChange(!0)}}),e.appendChild(b.rows[c].moveup_button)),this.hide_move_buttons||(b.rows[c].movedown_button=this.getButton("","movedown","Move down"),b.rows[c].movedown_button.className+=" movedown",b.rows[c].movedown_button.setAttribute("data-i",c),b.rows[c].movedown_button.addEventListener("click",function(a){a.preventDefault(),a.stopPropagation();var c=1*this.getAttribute("data-i"),d=b.getValue();if(!(c>=d.length-1)){var e=d[c+1];d[c+1]=d[c],d[c]=e,b.setValue(d),b.onChange(!0)}}),e.appendChild(b.rows[c].movedown_button)),a&&b.rows[c].setValue(a)},addControls:function(){var a=this;this.collapsed=!1,this.toggle_button=this.getButton("","collapse","Collapse"),this.title_controls&&(this.title_controls.appendChild(this.toggle_button),this.toggle_button.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation(),a.collapsed?(a.collapsed=!1,a.panel.style.display="",a.setButtonText(this,"","collapse","Collapse")):(a.collapsed=!0,a.panel.style.display="none",a.setButtonText(this,"","expand","Expand"))}),this.options.collapsed&&e(this.toggle_button,"click"),this.schema.options&&"undefined"!=typeof this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none")),this.add_row_button=this.getButton(this.getItemTitle(),"add","Add "+this.getItemTitle()),this.add_row_button.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation(),a.addRow(),a.refreshValue(),a.refreshRowButtons(),a.onChange(!0)}),a.controls.appendChild(this.add_row_button),this.delete_last_row_button=this.getButton("Last "+this.getItemTitle(),"delete","Delete Last "+this.getItemTitle()),this.delete_last_row_button.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation();var c=a.getValue();c.pop(),a.setValue(c),a.onChange(!0)}),a.controls.appendChild(this.delete_last_row_button),this.remove_all_rows_button=this.getButton("All","delete","Delete All"),this.remove_all_rows_button.addEventListener("click",function(b){b.preventDefault(),b.stopPropagation(),a.setValue([]),a.onChange(!0)}),a.controls.appendChild(this.remove_all_rows_button)}}),f.defaults.editors.multiple=f.AbstractEditor.extend({register:function(){if(this.editors){for(var a=0;a<this.editors.length;a++)this.editors[a]&&this.editors[a].unregister();this.editors[this.type]&&this.editors[this.type].register()}this._super()},unregister:function(){if(this._super(),this.editors)for(var a=0;a<this.editors.length;a++)this.editors[a]&&this.editors[a].unregister()},getNumColumns:function(){return this.editors[this.type]?Math.max(this.editors[this.type].getNumColumns(),4):4},enable:function(){if(this.editors)for(var a=0;a<this.editors.length;a++)this.editors[a]&&this.editors[a].enable();this.switcher.disabled=!1,this._super()},disable:function(){if(this.editors)for(var a=0;a<this.editors.length;a++)this.editors[a]&&this.editors[a].disable();this.switcher.disabled=!0,this._super()},switchEditor:function(a){var b=this;this.editors[a]||this.buildChildEditor(a),b.type=a,b.register();var c=b.getValue();d(b.editors,function(a,d){d&&(b.type===a?(b.keep_values&&d.setValue(c,!0),d.container.style.display=""):d.container.style.display="none")}),b.refreshValue(),b.refreshHeaderText()},buildChildEditor:function(a){var b=this,d=this.types[a],e=b.theme.getChildEditorHolder();b.editor_holder.appendChild(e);var f;"string"==typeof d?(f=c({},b.schema),f.type=d):(f=c({},b.schema,d),f=b.jsoneditor.expandRefs(f),d.required&&Array.isArray(d.required)&&b.schema.required&&Array.isArray(b.schema.required)&&(f.required=b.schema.required.concat(d.required)));var g=b.jsoneditor.getEditorClass(f);b.editors[a]=b.jsoneditor.createEditor(g,{jsoneditor:b.jsoneditor,schema:f,container:e,path:b.path,parent:b,required:!0}),b.editors[a].preBuild(),b.editors[a].build(),b.editors[a].postBuild(),b.editors[a].header&&(b.editors[a].header.style.display="none"),b.editors[a].option=b.switcher_options[a],e.addEventListener("change_header_text",function(){b.refreshHeaderText()}),a!==b.type&&(e.style.display="none")},preBuild:function(){if(this.types=[],this.type=0,this.editors=[],this.validators=[],this.keep_values=!0,"undefined"!=typeof this.jsoneditor.options.keep_oneof_values&&(this.keep_values=this.jsoneditor.options.keep_oneof_values),"undefined"!=typeof this.options.keep_oneof_values&&(this.keep_values=this.options.keep_oneof_values),this.schema.oneOf)this.oneOf=!0,this.types=this.schema.oneOf,d(this.types,function(a,b){}),delete this.schema.oneOf;else{if(this.schema.type&&"any"!==this.schema.type)Array.isArray(this.schema.type)?this.types=this.schema.type:this.types=[this.schema.type];else if(this.types=["string","number","integer","boolean","object","array","null"],this.schema.disallow){var a=this.schema.disallow;"object"==typeof a&&Array.isArray(a)||(a=[a]);var b=[];d(this.types,function(c,d){-1===a.indexOf(d)&&b.push(d)}),this.types=b}delete this.schema.type}this.display_text=this.getDisplayText(this.types)},build:function(){var a=this,b=this.container;this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.container.appendChild(this.header),this.switcher=this.theme.getSwitcher(this.display_text),b.appendChild(this.switcher),this.switcher.addEventListener("change",function(b){b.preventDefault(),b.stopPropagation(),a.switchEditor(a.display_text.indexOf(this.value)),a.onChange(!0)}),this.editor_holder=document.createElement("div"),b.appendChild(this.editor_holder),this.switcher_options=this.theme.getSwitcherOptions(this.switcher),d(this.types,function(b,d){a.editors[b]=!1;var e;"string"==typeof d?(e=c({},a.schema),e.type=d):(e=c({},a.schema,d),d.required&&Array.isArray(d.required)&&a.schema.required&&Array.isArray(a.schema.required)&&(e.required=a.schema.required.concat(d.required))),a.validators[b]=new f.Validator(a.jsoneditor,e)}),this.switchEditor(0)},onChildEditorChange:function(a){this.editors[this.type]&&(this.refreshValue(),this.refreshHeaderText()),this._super()},refreshHeaderText:function(){var a=this.getDisplayText(this.types);d(this.switcher_options,function(b,c){c.textContent=a[b]})},refreshValue:function(){this.value=this.editors[this.type].getValue()},setValue:function(a,b){var c=this;d(this.validators,function(b,d){return d.validate(a).length?void 0:(c.type=b,c.switcher.value=c.display_text[b],!1)}),this.switchEditor(this.type),this.editors[this.type].setValue(a,b),this.refreshValue(),c.onChange()},destroy:function(){d(this.editors,function(a,b){b&&b.destroy()}),this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),this._super()},showValidationErrors:function(a){var b=this;this.oneOf?d(this.editors,function(e,f){if(f){var g=b.path+".oneOf["+e+"]",h=[];d(a,function(a,d){if(d.path.substr(0,g.length)===g){var e=c({},d);e.path=b.path+e.path.substr(g.length),h.push(e)}}),f.showValidationErrors(h)}}):d(this.editors,function(b,c){c&&c.showValidationErrors(a)})}}),f.defaults.editors["enum"]=f.AbstractEditor.extend({getNumColumns:function(){return 4},build:function(){this.container;this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.container.appendChild(this.title),this.options.enum_titles=this.options.enum_titles||[],this["enum"]=this.schema["enum"],this.selected=0,this.select_options=[],this.html_values=[];for(var a=this,b=0;b<this["enum"].length;b++)this.select_options[b]=this.options.enum_titles[b]||"Value "+(b+1),this.html_values[b]=this.getHTML(this["enum"][b]);this.switcher=this.theme.getSwitcher(this.select_options),this.container.appendChild(this.switcher),this.display_area=this.theme.getIndentedPanel(),this.container.appendChild(this.display_area),this.options.hide_display&&(this.display_area.style.display="none"),this.switcher.addEventListener("change",function(){a.selected=a.select_options.indexOf(this.value),a.value=a["enum"][a.selected],a.refreshValue(),a.onChange(!0)}),this.value=this["enum"][0],this.refreshValue(),1===this["enum"].length&&(this.switcher.style.display="none")},refreshValue:function(){var a=this;a.selected=-1;var b=JSON.stringify(this.value);return d(this["enum"],function(c,d){return b===JSON.stringify(d)?(a.selected=c,!1):void 0}),a.selected<0?void a.setValue(a["enum"][0]):(this.switcher.value=this.select_options[this.selected],void(this.display_area.innerHTML=this.html_values[this.selected]))},enable:function(){this.always_disabled||(this.switcher.disabled=!1),this._super()},disable:function(){this.switcher.disabled=!0,this._super()},getHTML:function(a){var b=this;if(null===a)return"<em>null</em>";if("object"==typeof a){var c="";return d(a,function(d,e){var f=b.getHTML(e);Array.isArray(a)||(f="<div><em>"+d+"</em>: "+f+"</div>"),c+="<li>"+f+"</li>"}),c=Array.isArray(a)?"<ol>"+c+"</ol>":"<ul style='margin-top:0;margin-bottom:0;padding-top:0;padding-bottom:0;'>"+c+"</ul>"}return"boolean"==typeof a?a?"true":"false":"string"==typeof a?a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;"):a},setValue:function(a){this.value!==a&&(this.value=a,this.refreshValue(),this.onChange())},destroy:function(){this.display_area&&this.display_area.parentNode&&this.display_area.parentNode.removeChild(this.display_area),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),this._super()}}),f.defaults.editors.select=f.AbstractEditor.extend({setValue:function(a,b){a=this.typecast(a||"");var c=a;this.enum_values.indexOf(c)<0&&(c=this.enum_values[0]),this.value!==c&&(this.input.value=this.enum_options[this.enum_values.indexOf(c)],this.select2&&this.select2.select2("val",this.input.value),this.value=c,this.onChange())},register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},getNumColumns:function(){if(!this.enum_options)return 3;for(var a=this.getTitle().length,b=0;b<this.enum_options.length;b++)a=Math.max(a,this.enum_options[b].length+4);return Math.min(12,Math.max(a/7,2))},typecast:function(a){return"boolean"===this.schema.type?!!a:"number"===this.schema.type?1*a:"integer"===this.schema.type?Math.floor(1*a):""+a},getValue:function(){return this.value},preBuild:function(){var a=this;if(this.input_type="select",this.enum_options=[],this.enum_values=[],this.enum_display=[],this.schema["enum"]){var b=this.schema.options&&this.schema.options.enum_titles||[];d(this.schema["enum"],function(c,d){a.enum_options[c]=""+d,a.enum_display[c]=""+(b[c]||d),a.enum_values[c]=a.typecast(d)}),this.isRequired()||(a.enum_display.unshift(" "),a.enum_options.unshift("undefined"),a.enum_values.unshift(void 0))}else if("boolean"===this.schema.type)a.enum_display=this.schema.options&&this.schema.options.enum_titles||["true","false"],a.enum_options=["1",""],a.enum_values=[!0,!1],this.isRequired()||(a.enum_display.unshift(" "),a.enum_options.unshift("undefined"),a.enum_values.unshift(void 0));else{if(!this.schema.enumSource)throw"'select' editor requires the enum property to be set.";if(this.enumSource=[],this.enum_display=[],this.enum_options=[],this.enum_values=[],Array.isArray(this.schema.enumSource))for(h=0;h<this.schema.enumSource.length;h++)"string"==typeof this.schema.enumSource[h]?this.enumSource[h]={source:this.schema.enumSource[h]}:Array.isArray(this.schema.enumSource[h])?this.enumSource[h]=this.schema.enumSource[h]:this.enumSource[h]=c({},this.schema.enumSource[h]);else this.schema.enumValue?this.enumSource=[{source:this.schema.enumSource,value:this.schema.enumValue}]:this.enumSource=[{source:this.schema.enumSource}];for(h=0;h<this.enumSource.length;h++)this.enumSource[h].value&&(this.enumSource[h].value=this.jsoneditor.compileTemplate(this.enumSource[h].value,this.template_engine)),this.enumSource[h].title&&(this.enumSource[h].title=this.jsoneditor.compileTemplate(this.enumSource[h].title,this.template_engine)),this.enumSource[h].filter&&(this.enumSource[h].filter=this.jsoneditor.compileTemplate(this.enumSource[h].filter,this.template_engine))}},build:function(){var a=this;this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.compact&&(this.container.className+=" compact"),this.input=this.theme.getSelectInput(this.enum_options),this.theme.setSelectOptions(this.input,this.enum_options,this.enum_display),(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,this.input.disabled=!0),this.input.addEventListener("change",function(b){b.preventDefault(),b.stopPropagation(),a.onInputChange()}),this.control=this.theme.getFormControl(this.label,this.input,this.description),this.container.appendChild(this.control),this.value=this.enum_values[0]},onInputChange:function(){var a=this.input.value,b=a;-1===this.enum_options.indexOf(a)&&(b=this.enum_options[0]),this.value=this.enum_values[this.enum_options.indexOf(a)],this.onChange(!0)},setupSelect2:function(){if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2&&(this.enum_options.length>2||this.enum_options.length&&this.enumSource)){var a=c({},f.plugins.select2);this.schema.options&&this.schema.options.select2_options&&(a=c(a,this.schema.options.select2_options)),this.select2=window.jQuery(this.input).select2(a);var b=this;this.select2.on("select2-blur",function(){b.input.value=b.select2.select2("val"),b.onInputChange()})}else this.select2=null},postBuild:function(){this._super(),this.theme.afterInputReady(this.input),this.setupSelect2()},onWatchedFieldChange:function(){var a,b;if(this.enumSource){a=this.getWatchedFieldValues();for(var c=[],d=[],e=0;e<this.enumSource.length;e++)if(Array.isArray(this.enumSource[e]))c=c.concat(this.enumSource[e]),d=d.concat(this.enumSource[e]);else{var f=[];if(f=Array.isArray(this.enumSource[e].source)?this.enumSource[e].source:a[this.enumSource[e].source]){if(this.enumSource[e].slice&&(f=Array.prototype.slice.apply(f,this.enumSource[e].slice)),this.enumSource[e].filter){var g=[];for(b=0;b<f.length;b++)this.enumSource[e].filter({i:b,item:f[b],watched:a})&&g.push(f[b]);f=g}var h=[],i=[];for(b=0;b<f.length;b++){var j=f[b];this.enumSource[e].value?i[b]=this.enumSource[e].value({i:b,item:j}):i[b]=f[b],this.enumSource[e].title?h[b]=this.enumSource[e].title({i:b,item:j}):h[b]=i[b]}c=c.concat(i),d=d.concat(h)}}var k=this.value;this.theme.setSelectOptions(this.input,c,d),this.enum_options=c,this.enum_display=d,this.enum_values=c,this.select2&&this.select2.select2("destroy"),-1!==c.indexOf(k)?(this.input.value=k,this.value=k):(this.input.value=c[0],this.value=c[0]||"",this.parent?this.parent.onChildEditorChange(this):this.jsoneditor.onChange(),this.jsoneditor.notifyWatchers(this.path)),this.setupSelect2()}this._super()},enable:function(){this.always_disabled||(this.input.disabled=!1,this.select2&&this.select2.select2("enable",!0)),this._super()},disable:function(){this.input.disabled=!0,this.select2&&this.select2.select2("enable",!1),this._super()},destroy:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.select2&&(this.select2.select2("destroy"),this.select2=null),this._super()}}),f.defaults.editors.multiselect=f.AbstractEditor.extend({preBuild:function(){this._super(),this.select_options={},this.select_values={};var a=this.jsoneditor.expandRefs(this.schema.items||{}),b=a["enum"]||[];for(this.option_keys=[],h=0;h<b.length;h++)this.sanitize(b[h])===b[h]&&(this.option_keys.push(b[h]+""),this.select_values[b[h]+""]=b[h])},build:function(){var a,b=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),!this.schema.format&&this.option_keys.length<8||"checkbox"===this.schema.format){for(this.input_type="checkboxes",this.inputs={},this.controls={},a=0;a<this.option_keys.length;a++){this.inputs[this.option_keys[a]]=this.theme.getCheckbox(),this.select_options[this.option_keys[a]]=this.inputs[this.option_keys[a]];var c=this.theme.getCheckboxLabel(this.option_keys[a]);this.controls[this.option_keys[a]]=this.theme.getFormControl(c,this.inputs[this.option_keys[a]])}this.control=this.theme.getMultiCheckboxHolder(this.controls,this.label,this.description)}else{for(this.input_type="select",this.input=this.theme.getSelectInput(this.option_keys),this.input.multiple=!0,this.input.size=Math.min(10,this.option_keys.length),a=0;a<this.option_keys.length;a++)this.select_options[this.option_keys[a]]=this.input.children[a];(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,this.input.disabled=!0),this.control=this.theme.getFormControl(this.label,this.input,this.description)}this.container.appendChild(this.control),this.control.addEventListener("change",function(c){c.preventDefault(),c.stopPropagation();var d=[];for(a=0;a<b.option_keys.length;a++)(b.select_options[b.option_keys[a]].selected||b.select_options[b.option_keys[a]].checked)&&d.push(b.select_values[b.option_keys[a]]);b.updateValue(d),b.onChange(!0)})},setValue:function(a,b){var c;for(a=a||[],"object"!=typeof a?a=[a]:Array.isArray(a)||(a=[]),c=0;c<a.length;c++)"string"!=typeof a[c]&&(a[c]+="");for(c in this.select_options)this.select_options.hasOwnProperty(c)&&(this.select_options[c]["select"===this.input_type?"selected":"checked"]=-1!==a.indexOf(c));this.updateValue(a),this.onChange()},setupSelect2:function(){if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2){var a=window.jQuery.extend({},f.plugins.select2);this.schema.options&&this.schema.options.select2_options&&(a=c(a,this.schema.options.select2_options)),this.select2=window.jQuery(this.input).select2(a);var b=this;this.select2.on("select2-blur",function(){var a=b.select2.select2("val");b.value=a,b.onChange(!0)})}else this.select2=null},onInputChange:function(){this.value=this.input.value,this.onChange(!0)},postBuild:function(){this._super(),this.setupSelect2()},register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},getNumColumns:function(){var a=this.getTitle().length;for(var b in this.select_values)this.select_values.hasOwnProperty(b)&&(a=Math.max(a,(this.select_values[b]+"").length+4));return Math.min(12,Math.max(a/7,2))},updateValue:function(a){for(var b=!1,c=[],d=0;d<a.length;d++)if(this.select_options[a[d]+""]){var e=this.sanitize(this.select_values[a[d]]);c.push(e),e!==a[d]&&(b=!0)}else b=!0;return this.value=c,this.select2&&this.select2.select2("val",this.value),b},sanitize:function(a){return"number"===this.schema.items.type?1*a:"integer"===this.schema.items.type?Math.floor(1*a):""+a},enable:function(){if(!this.always_disabled){if(this.input)this.input.disabled=!1;else if(this.inputs)for(var a in this.inputs)this.inputs.hasOwnProperty(a)&&(this.inputs[a].disabled=!1);this.select2&&this.select2.select2("enable",!0)}this._super()},disable:function(){if(this.input)this.input.disabled=!0;else if(this.inputs)for(var a in this.inputs)this.inputs.hasOwnProperty(a)&&(this.inputs[a].disabled=!0);this.select2&&this.select2.select2("enable",!1),this._super()},destroy:function(){this.select2&&(this.select2.select2("destroy"),this.select2=null),this._super()}}),f.defaults.editors.base64=f.AbstractEditor.extend({getNumColumns:function(){return 4},build:function(){var a=this;if(this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if(!window.FileReader)throw"FileReader required for base64 editor";this.uploader=this.theme.getFormInputField("file"),this.uploader.addEventListener("change",function(b){if(b.preventDefault(),b.stopPropagation(),this.files&&this.files.length){var c=new FileReader;c.onload=function(b){a.value=b.target.result,a.refreshPreview(),a.onChange(!0),c=null},c.readAsDataURL(this.files[0])}})}this.preview=this.theme.getFormInputDescription(this.schema.description),this.container.appendChild(this.preview),this.control=this.theme.getFormControl(this.label,this.uploader||this.input,this.preview),this.container.appendChild(this.control)},refreshPreview:function(){if(this.last_preview!==this.value&&(this.last_preview=this.value,this.preview.innerHTML="",this.value)){var a=this.value.match(/^data:([^;,]+)[;,]/);if(a&&(a=a[1]),a){if(this.preview.innerHTML="<strong>Type:</strong> "+a+", <strong>Size:</strong> "+Math.floor((this.value.length-this.value.split(",")[0].length-1)/1.33333)+" bytes","image"===a.substr(0,5)){this.preview.innerHTML+="<br>";var b=document.createElement("img");b.style.maxWidth="100%",b.style.maxHeight="100px",b.src=this.value,this.preview.appendChild(b)}}else this.preview.innerHTML="<em>Invalid data URI</em>"}},enable:function(){this.uploader&&(this.uploader.disabled=!1),this._super()},disable:function(){this.uploader&&(this.uploader.disabled=!0),this._super()},setValue:function(a){this.value!==a&&(this.value=a,this.input.value=this.value,this.refreshPreview(),this.onChange())},destroy:function(){this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.uploader&&this.uploader.parentNode&&this.uploader.parentNode.removeChild(this.uploader),this._super()}}),f.defaults.editors.upload=f.AbstractEditor.extend({getNumColumns:function(){return 4},build:function(){var a=this;if(this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if(!this.jsoneditor.options.upload)throw"Upload handler required for upload editor";this.uploader=this.theme.getFormInputField("file"),this.uploader.addEventListener("change",function(b){if(b.preventDefault(),b.stopPropagation(),this.files&&this.files.length){var c=new FileReader;c.onload=function(b){a.preview_value=b.target.result,a.refreshPreview(),a.onChange(!0),c=null},c.readAsDataURL(this.files[0])}})}var b=this.schema.description;b||(b=""),this.preview=this.theme.getFormInputDescription(b),this.container.appendChild(this.preview),this.control=this.theme.getFormControl(this.label,this.uploader||this.input,this.preview),this.container.appendChild(this.control)},refreshPreview:function(){if(this.last_preview!==this.preview_value&&(this.last_preview=this.preview_value,this.preview.innerHTML="",this.preview_value)){var a=this,b=this.preview_value.match(/^data:([^;,]+)[;,]/);b&&(b=b[1]),b||(b="unknown");var c=this.uploader.files[0];if(this.preview.innerHTML="<strong>Type:</strong> "+b+", <strong>Size:</strong> "+c.size+" bytes","image"===b.substr(0,5)){this.preview.innerHTML+="<br>";var d=document.createElement("img");d.style.maxWidth="100%",d.style.maxHeight="100px",d.src=this.preview_value,
-this.preview.appendChild(d)}this.preview.innerHTML+="<br>";var e=this.getButton("Upload","upload","Upload");this.preview.appendChild(e),e.addEventListener("click",function(b){b.preventDefault(),e.setAttribute("disabled","disabled"),a.theme.removeInputError(a.uploader),a.theme.getProgressBar&&(a.progressBar=a.theme.getProgressBar(),a.preview.appendChild(a.progressBar)),a.jsoneditor.options.upload(a.path,c,{success:function(b){a.setValue(b),a.parent?a.parent.onChildEditorChange(a):a.jsoneditor.onChange(),a.progressBar&&a.preview.removeChild(a.progressBar),e.removeAttribute("disabled")},failure:function(b){a.theme.addInputError(a.uploader,b),a.progressBar&&a.preview.removeChild(a.progressBar),e.removeAttribute("disabled")},updateProgress:function(b){a.progressBar&&(b?a.theme.updateProgressBar(a.progressBar,b):a.theme.updateProgressBarUnknown(a.progressBar))}})})}},enable:function(){this.uploader&&(this.uploader.disabled=!1),this._super()},disable:function(){this.uploader&&(this.uploader.disabled=!0),this._super()},setValue:function(a){this.value!==a&&(this.value=a,this.input.value=this.value,this.onChange())},destroy:function(){this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.uploader&&this.uploader.parentNode&&this.uploader.parentNode.removeChild(this.uploader),this._super()}}),f.defaults.editors.checkbox=f.AbstractEditor.extend({setValue:function(a,b){this.value=!!a,this.input.checked=this.value,this.onChange()},register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},getNumColumns:function(){return Math.min(12,Math.max(this.getTitle().length/7,2))},build:function(){var a=this;this.options.compact||(this.label=this.header=this.theme.getCheckboxLabel(this.getTitle())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.compact&&(this.container.className+=" compact"),this.input=this.theme.getCheckbox(),this.control=this.theme.getFormControl(this.label,this.input,this.description),(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,this.input.disabled=!0),this.input.addEventListener("change",function(b){b.preventDefault(),b.stopPropagation(),a.value=this.checked,a.onChange(!0)}),this.container.appendChild(this.control)},enable:function(){this.always_disabled||(this.input.disabled=!1),this._super()},disable:function(){this.input.disabled=!0,this._super()},destroy:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this._super()}});var g=function(){var a=document.documentElement;return a.matches?"matches":a.webkitMatchesSelector?"webkitMatchesSelector":a.mozMatchesSelector?"mozMatchesSelector":a.msMatchesSelector?"msMatchesSelector":a.oMatchesSelector?"oMatchesSelector":void 0}();f.AbstractTheme=a.extend({getContainer:function(){return document.createElement("div")},getFloatRightLinkHolder:function(){var a=document.createElement("div");return a.style=a.style||{},a.style.cssFloat="right",a.style.marginLeft="10px",a},getModal:function(){var a=document.createElement("div");return a.style.backgroundColor="white",a.style.border="1px solid black",a.style.boxShadow="3px 3px black",a.style.position="absolute",a.style.zIndex="10",a.style.display="none",a},getGridContainer:function(){var a=document.createElement("div");return a},getGridRow:function(){var a=document.createElement("div");return a.className="row",a},getGridColumn:function(){var a=document.createElement("div");return a},setGridColumnSize:function(a,b){},getLink:function(a){var b=document.createElement("a");return b.setAttribute("href","#"),b.appendChild(document.createTextNode(a)),b},disableHeader:function(a){a.style.color="#ccc"},disableLabel:function(a){a.style.color="#ccc"},enableHeader:function(a){a.style.color=""},enableLabel:function(a){a.style.color=""},getFormInputLabel:function(a){var b=document.createElement("label");return b.appendChild(document.createTextNode(a)),b},getCheckboxLabel:function(a){var b=this.getFormInputLabel(a);return b.style.fontWeight="normal",b},getHeader:function(a,b){var c=document.createElement("h3");return"string"==typeof a?c.textContent=a:c.appendChild(a),b&&(c.className+=" required"),c},getCheckbox:function(){var a=this.getFormInputField("checkbox");return a.style.display="inline-block",a.style.width="auto",a},getMultiCheckboxHolder:function(a,b,c){var d=document.createElement("div");b&&(b.style.display="block",d.appendChild(b));for(var e in a)a.hasOwnProperty(e)&&(a[e].style.display="inline-block",a[e].style.marginRight="20px",d.appendChild(a[e]));return c&&d.appendChild(c),d},getSelectInput:function(a){var b=document.createElement("select");return a&&this.setSelectOptions(b,a),b},getSwitcher:function(a){var b=this.getSelectInput(a);return b.style.backgroundColor="transparent",b.style.display="inline-block",b.style.fontStyle="italic",b.style.fontWeight="normal",b.style.height="auto",b.style.marginBottom=0,b.style.marginLeft="5px",b.style.padding="0 0 0 3px",b.style.width="auto",b},getSwitcherOptions:function(a){return a.getElementsByTagName("option")},setSwitcherOptions:function(a,b,c){this.setSelectOptions(a,b,c)},setSelectOptions:function(a,b,c){c=c||[],a.innerHTML="";for(var d=0;d<b.length;d++){var e=document.createElement("option");e.setAttribute("value",b[d]),e.textContent=c[d]||b[d],a.appendChild(e)}},getTextareaInput:function(){var a=document.createElement("textarea");return a.style=a.style||{},a.style.width="100%",a.style.height="300px",a.style.boxSizing="border-box",a},getRangeInput:function(a,b,c){var d=this.getFormInputField("range");return d.setAttribute("min",a),d.setAttribute("max",b),d.setAttribute("step",c),d},getFormInputField:function(a){var b=document.createElement("input");return b.setAttribute("type",a),b},afterInputReady:function(a){},getFormControl:function(a,b,c){var d=document.createElement("div");return d.className="form-control",a&&d.appendChild(a),"checkbox"===b.type?a.insertBefore(b,a.firstChild):d.appendChild(b),c&&d.appendChild(c),d},getIndentedPanel:function(){var a=document.createElement("div");return a.style=a.style||{},a.style.paddingLeft="10px",a.style.marginLeft="10px",a.style.borderLeft="1px solid #ccc",a},getChildEditorHolder:function(){return document.createElement("div")},getDescription:function(a){var b=document.createElement("p");return b.innerHTML=a,b},getCheckboxDescription:function(a){return this.getDescription(a)},getFormInputDescription:function(a){return this.getDescription(a)},getHeaderButtonHolder:function(){return this.getButtonHolder()},getButtonHolder:function(){return document.createElement("div")},getButton:function(a,b,c){var d=document.createElement("button");return d.type="button",this.setButtonText(d,a,b,c),d},setButtonText:function(a,b,c,d){a.innerHTML="",c&&(a.appendChild(c),a.innerHTML+=" "),a.appendChild(document.createTextNode(b)),d&&a.setAttribute("title",d)},getTable:function(){return document.createElement("table")},getTableRow:function(){return document.createElement("tr")},getTableHead:function(){return document.createElement("thead")},getTableBody:function(){return document.createElement("tbody")},getTableHeaderCell:function(a){var b=document.createElement("th");return b.textContent=a,b},getTableCell:function(){var a=document.createElement("td");return a},getErrorMessage:function(a){var b=document.createElement("p");return b.style=b.style||{},b.style.color="red",b.appendChild(document.createTextNode(a)),b},addInputError:function(a,b){},removeInputError:function(a){},addTableRowError:function(a){},removeTableRowError:function(a){},getTabHolder:function(){var a=document.createElement("div");return a.innerHTML="<div style='float: left; width: 130px;' class='tabs'></div><div class='content' style='margin-left: 130px;'></div><div style='clear:both;'></div>",a},applyStyles:function(a,b){a.style=a.style||{};for(var c in b)b.hasOwnProperty(c)&&(a.style[c]=b[c])},closest:function(a,b){for(;a&&a!==document;){if(!g)return!1;if(a[g](b))return a;a=a.parentNode}return!1},getTab:function(a){var b=document.createElement("div");return b.appendChild(a),b.style=b.style||{},this.applyStyles(b,{border:"1px solid #ccc",borderWidth:"1px 0 1px 1px",textAlign:"center",lineHeight:"30px",borderRadius:"5px",borderBottomRightRadius:0,borderTopRightRadius:0,fontWeight:"bold",cursor:"pointer"}),b},getTabContentHolder:function(a){return a.children[1]},getTabContent:function(){return this.getIndentedPanel()},markTabActive:function(a){this.applyStyles(a,{opacity:1,background:"white"})},markTabInactive:function(a){this.applyStyles(a,{opacity:.5,background:""})},addTab:function(a,b){a.children[0].appendChild(b)},getBlockLink:function(){var a=document.createElement("a");return a.style.display="block",a},getBlockLinkHolder:function(){var a=document.createElement("div");return a},getLinksHolder:function(){var a=document.createElement("div");return a},createMediaLink:function(a,b,c){a.appendChild(b),c.style.width="100%",a.appendChild(c)},createImageLink:function(a,b,c){a.appendChild(b),b.appendChild(c)}}),f.defaults.themes.bootstrap2=f.AbstractTheme.extend({getRangeInput:function(a,b,c){return this._super(a,b,c)},getGridContainer:function(){var a=document.createElement("div");return a.className="container-fluid",a},getGridRow:function(){var a=document.createElement("div");return a.className="row-fluid",a},getFormInputLabel:function(a,b){var c=this._super(a);return c.style.display="inline-block",c.style.fontWeight="bold",b&&(c.className+=" required"),c},setGridColumnSize:function(a,b){a.className="span"+b},getSelectInput:function(a){var b=this._super(a);return b.style.width="auto",b.style.maxWidth="98%",b},getFormInputField:function(a){var b=this._super(a);return b.style.width="98%",b},afterInputReady:function(a){a.controlgroup||(a.controlgroup=this.closest(a,".control-group"),a.controls=this.closest(a,".controls"),this.closest(a,".compact")&&(a.controlgroup.className=a.controlgroup.className.replace(/control-group/g,"").replace(/[ ]{2,}/g," "),a.controls.className=a.controlgroup.className.replace(/controls/g,"").replace(/[ ]{2,}/g," "),a.style.marginBottom=0))},getIndentedPanel:function(){var a=document.createElement("div");return a.className="well well-small",a},getFormInputDescription:function(a){var b=document.createElement("p");return b.className="help-inline",b.textContent=a,b},getFormControl:function(a,b,c){var d=document.createElement("div");d.className="control-group";var e=document.createElement("div");return e.className="controls",a&&"checkbox"===b.getAttribute("type")?(d.appendChild(e),a.className+=" checkbox",a.appendChild(b),e.appendChild(a),e.style.height="30px"):(a&&(a.className+=" control-label",d.appendChild(a)),e.appendChild(b),d.appendChild(e)),c&&e.appendChild(c),d},getHeaderButtonHolder:function(){var a=this.getButtonHolder();return a.style.marginLeft="10px",a},getButtonHolder:function(){var a=document.createElement("div");return a.className="btn-group",a},getButton:function(a,b,c){var d=this._super(a,b,c);return d.className+=" btn btn-default",d},getTable:function(){var a=document.createElement("table");return a.className="table table-bordered",a.style.width="auto",a.style.maxWidth="none",a},addInputError:function(a,b){a.controlgroup&&a.controls&&(a.controlgroup.className+=" error",a.errmsg?a.errmsg.style.display="":(a.errmsg=document.createElement("p"),a.errmsg.className="help-block errormsg",a.controls.appendChild(a.errmsg)),a.errmsg.textContent=b)},removeInputError:function(a){a.errmsg&&(a.errmsg.style.display="none",a.controlgroup.className=a.controlgroup.className.replace(/\s?error/g,""))},getTabHolder:function(){var a=document.createElement("div");return a.className="tabbable tabs-left",a.innerHTML="<ul class='nav nav-tabs span2' style='margin-right: 0;'></ul><div class='tab-content span10' style='overflow:visible;'></div>",a},getTab:function(a){var b=document.createElement("li"),c=document.createElement("a");return c.setAttribute("href","#"),c.appendChild(a),b.appendChild(c),b},getTabContentHolder:function(a){return a.children[1]},getTabContent:function(){var a=document.createElement("div");return a.className="tab-pane active",a},markTabActive:function(a){a.className+=" active"},markTabInactive:function(a){a.className=a.className.replace(/\s?active/g,"")},addTab:function(a,b){a.children[0].appendChild(b)},getProgressBar:function(){var a=document.createElement("div");a.className="progress";var b=document.createElement("div");return b.className="bar",b.style.width="0%",a.appendChild(b),a},updateProgressBar:function(a,b){a&&(a.firstChild.style.width=b+"%")},updateProgressBarUnknown:function(a){a&&(a.className="progress progress-striped active",a.firstChild.style.width="100%")}}),f.defaults.themes.bootstrap3=f.AbstractTheme.extend({getSelectInput:function(a){var b=this._super(a);return b.className+="form-control",b},setGridColumnSize:function(a,b){a.className="col-md-"+b},afterInputReady:function(a){a.controlgroup||(a.controlgroup=this.closest(a,".form-group"),this.closest(a,".compact")&&(a.controlgroup.style.marginBottom=0))},getTextareaInput:function(){var a=document.createElement("textarea");return a.className="form-control",a},getRangeInput:function(a,b,c){return this._super(a,b,c)},getFormInputField:function(a){var b=this._super(a);return"checkbox"!==a&&(b.className+="form-control"),b},getFormControl:function(a,b,c){var d=document.createElement("div");return a&&"checkbox"===b.type?(d.className+=" checkbox",a.appendChild(b),a.style.fontSize="14px",d.style.marginTop="0",d.appendChild(a),b.style.position="relative",b.style.cssFloat="left"):(d.className+=" form-group",a&&(a.className+=" control-label",d.appendChild(a)),d.appendChild(b)),c&&d.appendChild(c),d},getIndentedPanel:function(){var a=document.createElement("div");return a.className="well well-sm",a},getFormInputDescription:function(a){var b=document.createElement("p");return b.className="help-block",b.innerHTML=a,b},getHeaderButtonHolder:function(){var a=this.getButtonHolder();return a.style.marginLeft="10px",a},getButtonHolder:function(){var a=document.createElement("div");return a.className="btn-group",a},getButton:function(a,b,c){var d=this._super(a,b,c);return d.className+="btn btn-default",d},getTable:function(){var a=document.createElement("table");return a.className="table table-bordered",a.style.width="auto",a.style.maxWidth="none",a},addInputError:function(a,b){a.controlgroup&&(a.controlgroup.className+=" has-error",a.errmsg?a.errmsg.style.display="":(a.errmsg=document.createElement("p"),a.errmsg.className="help-block errormsg",a.controlgroup.appendChild(a.errmsg)),a.errmsg.textContent=b)},removeInputError:function(a){a.errmsg&&(a.errmsg.style.display="none",a.controlgroup.className=a.controlgroup.className.replace(/\s?has-error/g,""))},getTabHolder:function(){var a=document.createElement("div");return a.innerHTML="<div class='tabs list-group col-md-2'></div><div class='col-md-10'></div>",a.className="rows",a},getTab:function(a){var b=document.createElement("a");return b.className="list-group-item",b.setAttribute("href","#"),b.appendChild(a),b},markTabActive:function(a){a.className+=" active"},markTabInactive:function(a){a.className=a.className.replace(/\s?active/g,"")},getProgressBar:function(){var a=0,b=100,c=0,d=document.createElement("div");d.className="progress";var e=document.createElement("div");return e.className="progress-bar",e.setAttribute("role","progressbar"),e.setAttribute("aria-valuenow",c),e.setAttribute("aria-valuemin",a),e.setAttribute("aria-valuenax",b),e.innerHTML=c+"%",d.appendChild(e),d},updateProgressBar:function(a,b){if(a){var c=a.firstChild,d=b+"%";c.setAttribute("aria-valuenow",b),c.style.width=d,c.innerHTML=d}},updateProgressBarUnknown:function(a){if(a){var b=a.firstChild;a.className="progress progress-striped active",b.removeAttribute("aria-valuenow"),b.style.width="100%",b.innerHTML=""}}}),f.defaults.themes.foundation=f.AbstractTheme.extend({getChildEditorHolder:function(){var a=document.createElement("div");return a.style.marginBottom="15px",a},getSelectInput:function(a){var b=this._super(a);return b.style.minWidth="none",b.style.padding="5px",b.style.marginTop="3px",b},getSwitcher:function(a){var b=this._super(a);return b.style.paddingRight="8px",b},afterInputReady:function(a){this.closest(a,".compact")&&(a.style.marginBottom=0),a.group=this.closest(a,".form-control")},getFormInputLabel:function(a,b){var c=this._super(a);return c.style.display="inline-block",b&&(c.className+=" required"),c},getFormInputField:function(a){var b=this._super(a);return b.style.width="100%",b.style.marginBottom="checkbox"===a?"0":"12px",b},getFormInputDescription:function(a){var b=document.createElement("p");return b.textContent=a,b.style.marginTop="-10px",b.style.fontStyle="italic",b},getIndentedPanel:function(){var a=document.createElement("div");return a.className="panel",a},getHeaderButtonHolder:function(){var a=this.getButtonHolder();return a.style.display="inline-block",a.style.marginLeft="10px",a.style.verticalAlign="middle",a},getButtonHolder:function(){var a=document.createElement("div");return a.className="button-group",a},getButton:function(a,b,c){var d=this._super(a,b,c);return d.className+=" small button",d},addInputError:function(a,b){a.group&&(a.group.className+=" error",a.errmsg?a.errmsg.style.display="":(a.insertAdjacentHTML("afterend",'<small class="error"></small>'),a.errmsg=a.parentNode.getElementsByClassName("error")[0]),a.errmsg.textContent=b)},removeInputError:function(a){a.errmsg&&(a.group.className=a.group.className.replace(/ error/g,""),a.errmsg.style.display="none")},getProgressBar:function(){var a=document.createElement("div");a.className="progress";var b=document.createElement("span");return b.className="meter",b.style.width="0%",a.appendChild(b),a},updateProgressBar:function(a,b){a&&(a.firstChild.style.width=b+"%")},updateProgressBarUnknown:function(a){a&&(a.firstChild.style.width="100%")}}),f.defaults.themes.foundation3=f.defaults.themes.foundation.extend({getHeaderButtonHolder:function(){var a=this._super();return a.style.fontSize=".6em",a},getFormInputLabel:function(a,b){var c=this._super(a);return c.style.fontWeight="bold",b&&(c.className+=" required"),c},getTabHolder:function(){var a=document.createElement("div");return a.className="row",a.innerHTML="<dl class='tabs vertical two columns'></dl><div class='tabs-content ten columns'></div>",a},setGridColumnSize:function(a,b){var c=["zero","one","two","three","four","five","six","seven","eight","nine","ten","eleven","twelve"];a.className="columns "+c[b]},getTab:function(a){var b=document.createElement("dd"),c=document.createElement("a");return c.setAttribute("href","#"),c.appendChild(a),b.appendChild(c),b},getTabContentHolder:function(a){return a.children[1]},getTabContent:function(){var a=document.createElement("div");return a.className="content active",a.style.paddingLeft="5px",a},markTabActive:function(a){a.className+=" active"},markTabInactive:function(a){a.className=a.className.replace(/\s*active/g,"")},addTab:function(a,b){a.children[0].appendChild(b)}}),f.defaults.themes.foundation4=f.defaults.themes.foundation.extend({getHeaderButtonHolder:function(){var a=this._super();return a.style.fontSize=".6em",a},setGridColumnSize:function(a,b){a.className="columns large-"+b},getFormInputDescription:function(a){var b=this._super(a);return b.style.fontSize=".8rem",b},getFormInputLabel:function(a,b){var c=this._super(a);return c.style.fontWeight="bold",b&&(c.className+=" required"),c}}),f.defaults.themes.foundation5=f.defaults.themes.foundation.extend({getFormInputDescription:function(a){var b=this._super(a);return b.style.fontSize=".8rem",b},setGridColumnSize:function(a,b){a.className="columns medium-"+b},getButton:function(a,b,c){var d=this._super(a,b,c);return d.className=d.className.replace(/\s*small/g,"")+" tiny",d},getTabHolder:function(){var a=document.createElement("div");return a.innerHTML="<dl class='tabs vertical'></dl><div class='tabs-content vertical'></div>",a},getTab:function(a){var b=document.createElement("dd"),c=document.createElement("a");return c.setAttribute("href","#"),c.appendChild(a),b.appendChild(c),b},getTabContentHolder:function(a){return a.children[1]},getTabContent:function(){var a=document.createElement("div");return a.className="content active",a.style.paddingLeft="5px",a},markTabActive:function(a){a.className+=" active"},markTabInactive:function(a){a.className=a.className.replace(/\s*active/g,"")},addTab:function(a,b){a.children[0].appendChild(b)}}),f.defaults.themes.html=f.AbstractTheme.extend({getFormInputLabel:function(a,b){var c=this._super(a);return c.style.display="block",c.style.marginBottom="3px",c.style.fontWeight="bold",b&&(c.className+=" required"),c},getFormInputDescription:function(a){var b=this._super(a);return b.style.fontSize=".8em",b.style.margin=0,b.style.display="inline-block",b.style.fontStyle="italic",b},getIndentedPanel:function(){var a=this._super();return a.style.border="1px solid #ddd",a.style.padding="5px",a.style.margin="5px",a.style.borderRadius="3px",a},getChildEditorHolder:function(){var a=this._super();return a.style.marginBottom="8px",a},getHeaderButtonHolder:function(){var a=this.getButtonHolder();return a.style.display="inline-block",a.style.marginLeft="10px",a.style.fontSize=".8em",a.style.verticalAlign="middle",a},getTable:function(){var a=this._super();return a.style.borderBottom="1px solid #ccc",a.style.marginBottom="5px",a},addInputError:function(a,b){if(a.style.borderColor="red",a.errmsg)a.errmsg.style.display="block";else{var c=this.closest(a,".form-control");a.errmsg=document.createElement("div"),a.errmsg.setAttribute("class","errmsg"),a.errmsg.style=a.errmsg.style||{},a.errmsg.style.color="red",c.appendChild(a.errmsg)}a.errmsg.innerHTML="",a.errmsg.appendChild(document.createTextNode(b))},removeInputError:function(a){a.style.borderColor="",a.errmsg&&(a.errmsg.style.display="none")},getProgressBar:function(){var a=100,b=0,c=document.createElement("progress");return c.setAttribute("max",a),c.setAttribute("value",b),c},updateProgressBar:function(a,b){a&&a.setAttribute("value",b)},updateProgressBarUnknown:function(a){a&&a.removeAttribute("value")}}),f.defaults.themes.jqueryui=f.AbstractTheme.extend({getTable:function(){var a=this._super();return a.setAttribute("cellpadding",5),a.setAttribute("cellspacing",0),a},getTableHeaderCell:function(a){var b=this._super(a);return b.className="ui-state-active",b.style.fontWeight="bold",b},getTableCell:function(){var a=this._super();return a.className="ui-widget-content",a},getHeaderButtonHolder:function(){var a=this.getButtonHolder();return a.style.marginLeft="10px",a.style.fontSize=".6em",a.style.display="inline-block",a},getFormInputDescription:function(a){var b=this.getDescription(a);return b.style.marginLeft="10px",b.style.display="inline-block",b},getFormControl:function(a,b,c){var d=this._super(a,b,c);return"checkbox"===b.type?(d.style.lineHeight="25px",d.style.padding="3px 0"):d.style.padding="4px 0 8px 0",d},getDescription:function(a){var b=document.createElement("span");return b.style.fontSize=".8em",b.style.fontStyle="italic",b.textContent=a,b},getButtonHolder:function(){var a=document.createElement("div");return a.className="ui-buttonset",a.style.fontSize=".7em",a},getFormInputLabel:function(a,b){var c=document.createElement("label");return c.style.fontWeight="bold",c.style.display="block",b&&(c.className+=" required"),c.textContent=a,c},getButton:function(a,b,c){var d=document.createElement("button");d.className="ui-button ui-widget ui-state-default ui-corner-all",b&&!a?(d.className+=" ui-button-icon-only",b.className+=" ui-button-icon-primary ui-icon-primary",d.appendChild(b)):b?(d.className+=" ui-button-text-icon-primary",b.className+=" ui-button-icon-primary ui-icon-primary",d.appendChild(b)):d.className+=" ui-button-text-only";var e=document.createElement("span");return e.className="ui-button-text",e.textContent=a||c||".",d.appendChild(e),d.setAttribute("title",c),d},setButtonText:function(a,b,c,d){a.innerHTML="",a.className="ui-button ui-widget ui-state-default ui-corner-all",c&&!b?(a.className+=" ui-button-icon-only",c.className+=" ui-button-icon-primary ui-icon-primary",a.appendChild(c)):c?(a.className+=" ui-button-text-icon-primary",c.className+=" ui-button-icon-primary ui-icon-primary",a.appendChild(c)):a.className+=" ui-button-text-only";var e=document.createElement("span");e.className="ui-button-text",e.textContent=b||d||".",a.appendChild(e),a.setAttribute("title",d)},getIndentedPanel:function(){var a=document.createElement("div");return a.className="ui-widget-content ui-corner-all",a.style.padding="1em 1.4em",a.style.marginBottom="20px",a},afterInputReady:function(a){a.controls||(a.controls=this.closest(a,".form-control"))},addInputError:function(a,b){a.controls&&(a.errmsg?a.errmsg.style.display="":(a.errmsg=document.createElement("div"),a.errmsg.className="ui-state-error",a.controls.appendChild(a.errmsg)),a.errmsg.textContent=b)},removeInputError:function(a){a.errmsg&&(a.errmsg.style.display="none")},markTabActive:function(a){a.className=a.className.replace(/\s*ui-widget-header/g,"")+" ui-state-active"},markTabInactive:function(a){a.className=a.className.replace(/\s*ui-state-active/g,"")+" ui-widget-header"}}),f.AbstractIconLib=a.extend({mapping:{collapse:"",expand:"","delete":"",edit:"",add:"",cancel:"",save:"",moveup:"",movedown:""},icon_prefix:"",getIconClass:function(a){return this.mapping[a]?this.icon_prefix+this.mapping[a]:null},getIcon:function(a){var b=this.getIconClass(a);if(!b)return null;var c=document.createElement("i");return c.className=b,c}}),f.defaults.iconlibs.bootstrap2=f.AbstractIconLib.extend({mapping:{collapse:"chevron-down",expand:"chevron-up","delete":"trash",edit:"pencil",add:"plus",cancel:"ban-circle",save:"ok",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"icon-"}),f.defaults.iconlibs.bootstrap3=f.AbstractIconLib.extend({mapping:{collapse:"chevron-down",expand:"chevron-right","delete":"remove",edit:"pencil",add:"plus",cancel:"floppy-remove",save:"floppy-saved",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"glyphicon glyphicon-"}),f.defaults.iconlibs.fontawesome3=f.AbstractIconLib.extend({mapping:{collapse:"chevron-down",expand:"chevron-right","delete":"remove",edit:"pencil",add:"plus",cancel:"ban-circle",save:"save",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"icon-"}),f.defaults.iconlibs.fontawesome4=f.AbstractIconLib.extend({mapping:{collapse:"caret-square-o-down",expand:"caret-square-o-right","delete":"times",edit:"pencil",add:"plus",cancel:"ban",save:"save",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"fa fa-"}),f.defaults.iconlibs.foundation2=f.AbstractIconLib.extend({mapping:{collapse:"minus",expand:"plus","delete":"remove",edit:"edit",add:"add-doc",cancel:"error",save:"checkmark",moveup:"up-arrow",movedown:"down-arrow"},icon_prefix:"foundicon-"}),f.defaults.iconlibs.foundation3=f.AbstractIconLib.extend({mapping:{collapse:"minus",expand:"plus","delete":"x",edit:"pencil",add:"page-add",cancel:"x-circle",save:"save",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"fi-"}),f.defaults.iconlibs.jqueryui=f.AbstractIconLib.extend({mapping:{collapse:"triangle-1-s",expand:"triangle-1-e","delete":"trash",edit:"pencil",add:"plusthick",cancel:"closethick",save:"disk",moveup:"arrowthick-1-n",movedown:"arrowthick-1-s"},icon_prefix:"ui-icon ui-icon-"}),f.defaults.templates["default"]=function(){return{compile:function(a){var b=a.match(/{{\s*([a-zA-Z0-9\-_ \.]+)\s*}}/g),c=b&&b.length;if(!c)return function(){return a};for(var d=[],e=function(a){var c,e=b[a].replace(/[{}]+/g,"").trim().split("."),f=e.length;if(f>1){var g;c=function(b){for(g=b,a=0;f>a&&(g=g[e[a]],g);a++);return g}}else e=e[0],c=function(a){return a[e]};d.push({s:b[a],r:c})},f=0;c>f;f++)e(f);return function(b){var e,g=a+"";for(f=0;c>f;f++)e=d[f],g=g.replace(e.s,e.r(b));return g}}}},f.defaults.templates.ejs=function(){return window.EJS?{compile:function(a){var b=new window.EJS({text:a});return function(a){return b.render(a)}}}:!1},f.defaults.templates.handlebars=function(){return window.Handlebars},f.defaults.templates.hogan=function(){return window.Hogan?{compile:function(a){var b=window.Hogan.compile(a);return function(a){return b.render(a)}}}:!1},f.defaults.templates.markup=function(){return window.Mark&&window.Mark.up?{compile:function(a){return function(b){return window.Mark.up(a,b)}}}:!1},f.defaults.templates.mustache=function(){return window.Mustache?{compile:function(a){return function(b){return window.Mustache.render(a,b)}}}:!1},f.defaults.templates.swig=function(){return window.swig},f.defaults.templates.underscore=function(){return window._?{compile:function(a){return function(b){return window._.template(a,b)}}}:!1},f.defaults.theme="html",f.defaults.template="default",f.defaults.options={},f.defaults.translate=function(a,b){var c=f.defaults.languages[f.defaults.language];if(!c)throw"Unknown language "+f.defaults.language;var d=c[a]||f.defaults.languages[f.defaults.default_language][a];if("undefined"==typeof d)throw"Unknown translate string "+a;if(b)for(var e=0;e<b.length;e++)d=d.replace(new RegExp("\\{\\{"+e+"}}","g"),b[e]);return d},f.defaults.default_language="en",f.defaults.language=f.defaults.default_language,f.defaults.languages.en={error_notset:"Property must be set",error_notempty:"Value required",error_enum:"Value must be one of the enumerated values",error_anyOf:"Value must validate against at least one of the provided schemas",error_oneOf:"Value must validate against exactly one of the provided schemas. It currently validates against {{0}} of the schemas.",error_not:"Value must not validate against the provided schema",error_type_union:"Value must be one of the provided types",error_type:"Value must be of type {{0}}",error_disallow_union:"Value must not be one of the provided disallowed types",error_disallow:"Value must not be of type {{0}}",error_multipleOf:"Value must be a multiple of {{0}}",error_maximum_excl:"Value must be less than {{0}}",error_maximum_incl:"Value must at most {{0}}",error_minimum_excl:"Value must be greater than {{0}}",error_minimum_incl:"Value must be at least {{0}}",error_maxLength:"Value must be at most {{0}} characters long",error_minLength:"Value must be at least {{0}} characters long",error_pattern:"Value must match the provided pattern",error_additionalItems:"No additional items allowed in this array",error_maxItems:"Value must have at most {{0}} items",error_minItems:"Value must have at least {{0}} items",error_uniqueItems:"Array must have unique items",error_maxProperties:"Object must have at most {{0}} properties",error_minProperties:"Object must have at least {{0}} properties",error_required:"Object is missing the required property '{{0}}'",error_additional_properties:"No additional properties allowed, but property {{0}} is set",error_dependency:"Must have property {{0}}"},f.plugins={ace:{theme:""},epiceditor:{},sceditor:{},select2:{}};for(var h in f.defaults.editors)f.defaults.editors.hasOwnProperty(h)&&(f.defaults.editors[h].options=f.defaults.editors.options||{});f.defaults.resolvers.unshift(function(a){return"string"!=typeof a.type?"multiple":void 0}),f.defaults.resolvers.unshift(function(a){return!a.type&&a.properties?"object":void 0}),f.defaults.resolvers.unshift(function(a){return"string"==typeof a.type?a.type:void 0}),f.defaults.resolvers.unshift(function(a){return"boolean"===a.type?"checkbox"===a.format||a.options&&a.options.checkbox?"checkbox":"select":void 0;
-}),f.defaults.resolvers.unshift(function(a){return"any"===a.type?"multiple":void 0}),f.defaults.resolvers.unshift(function(a){return"string"===a.type&&a.media&&"base64"===a.media.binaryEncoding?"base64":void 0}),f.defaults.resolvers.unshift(function(a){return"string"===a.type&&"url"===a.format&&a.options&&a.options.upload===!0&&window.FileReader?"upload":void 0}),f.defaults.resolvers.unshift(function(a){return"array"==a.type&&"table"==a.format?"table":void 0}),f.defaults.resolvers.unshift(function(a){return a.enumSource?"select":void 0}),f.defaults.resolvers.unshift(function(a){if(a["enum"]){if("array"===a.type||"object"===a.type)return"enum";if("number"===a.type||"integer"===a.type||"string"===a.type)return"select"}}),f.defaults.resolvers.unshift(function(a){return"array"===a.type&&a.items&&!Array.isArray(a.items)&&a.uniqueItems&&a.items["enum"]&&["string","number","integer"].indexOf(a.items.type)>=0?"multiselect":void 0}),f.defaults.resolvers.unshift(function(a){return a.oneOf?"multiple":void 0}),function(){if(window.jQuery||window.Zepto){var a=window.jQuery||window.Zepto;a.jsoneditor=f.defaults,a.fn.jsoneditor=function(a){var b=this,c=this.data("jsoneditor");if("value"===a){if(!c)throw"Must initialize jsoneditor before getting/setting the value";if(!(arguments.length>1))return c.getValue();c.setValue(arguments[1])}else{if("validate"===a){if(!c)throw"Must initialize jsoneditor before validating";return arguments.length>1?c.validate(arguments[1]):c.validate()}"destroy"===a?c&&(c.destroy(),this.data("jsoneditor",null)):(c&&c.destroy(),c=new f(this.get(0),a),this.data("jsoneditor",c),c.on("change",function(){b.trigger("change")}),c.on("ready",function(){b.trigger("ready")}))}return this}}}(),window.JSONEditor=f}();
\ No newline at end of file
+!function(){var t;!function(){var e=!1,i=/xyz/.test(function(){window.postMessage("xyz")})?/\b_super\b/:/.*/;return t=function(){},t.extend=function(t){function s(){!e&&this.init&&this.init.apply(this,arguments)}var r=this.prototype;e=!0;var n=new this;e=!1;for(var o in t)n[o]="function"==typeof t[o]&&"function"==typeof r[o]&&i.test(t[o])?function(t,e){return function(){var i=this._super;this._super=r[t];var s=e.apply(this,arguments);return this._super=i,s}}(o,t[o]):t[o];return s.prototype=n,s.prototype.constructor=s,s.extend=arguments.callee,s},t}(),function(){function t(t,e){e=e||{bubbles:!1,cancelable:!1,detail:void 0};var i=document.createEvent("CustomEvent");return i.initCustomEvent(t,e.bubbles,e.cancelable,e.detail),i}t.prototype=window.Event.prototype,window.CustomEvent=t}(),function(){for(var t=0,e=["ms","moz","webkit","o"],i=0;i<e.length&&!window.requestAnimationFrame;++i)window.requestAnimationFrame=window[e[i]+"RequestAnimationFrame"],window.cancelAnimationFrame=window[e[i]+"CancelAnimationFrame"]||window[e[i]+"CancelRequestAnimationFrame"];window.requestAnimationFrame||(window.requestAnimationFrame=function(e,i){var s=(new Date).getTime(),r=Math.max(0,16-(s-t)),n=window.setTimeout(function(){e(s+r)},r);return t=s+r,n}),window.cancelAnimationFrame||(window.cancelAnimationFrame=function(t){clearTimeout(t)})}(),function(){Array.isArray||(Array.isArray=function(t){return"[object Array]"===Object.prototype.toString.call(t)})}();var e=function(t){return!("object"!=typeof t||t.nodeType||null!==t&&t===t.window)&&!(t.constructor&&!Object.prototype.hasOwnProperty.call(t.constructor.prototype,"isPrototypeOf"))},i=function(t){var s,r,n;for(r=1;r<arguments.length;r++){s=arguments[r];for(n in s)s.hasOwnProperty(n)&&(s[n]&&e(s[n])?(t.hasOwnProperty(n)||(t[n]={}),i(t[n],s[n])):t[n]=s[n])}return t},s=function(t,e){if(t&&"object"==typeof t){var i;if(Array.isArray(t)||"number"==typeof t.length&&t.length>0&&t.length-1 in t){for(i=0;i<t.length;i++)if(e(i,t[i])===!1)return}else if(Object.keys){var s=Object.keys(t);for(i=0;i<s.length;i++)if(e(s[i],t[s[i]])===!1)return}else for(i in t)if(t.hasOwnProperty(i)&&e(i,t[i])===!1)return}},r=function(t,e){var i=document.createEvent("HTMLEvents");i.initEvent(e,!0,!0),t.dispatchEvent(i)},n=function(t,e){if(!(t instanceof Element))throw new Error("element should be an instance of Element");e=i({},n.defaults.options,e||{}),this.element=t,this.options=e,this.init()};n.prototype={constructor:n,init:function(){var t=this;this.ready=!1;var e=n.defaults.themes[this.options.theme||n.defaults.theme];if(!e)throw"Unknown theme "+(this.options.theme||n.defaults.theme);this.schema=this.options.schema,this.theme=new e,this.template=this.options.template,this.refs=this.options.refs||{},this.uuid=0,this.__data={};var i=n.defaults.iconlibs[this.options.iconlib||n.defaults.iconlib];i&&(this.iconlib=new i),this.root_container=this.theme.getContainer(),this.element.appendChild(this.root_container),this.translate=this.options.translate||n.defaults.translate,this._loadExternalRefs(this.schema,function(){t._getDefinitions(t.schema),t.validator=new n.Validator(t);var e=t.getEditorClass(t.schema);t.root=t.createEditor(e,{jsoneditor:t,schema:t.schema,required:!0,container:t.root_container}),t.root.preBuild(),t.root.build(),t.root.postBuild(),t.options.startval&&t.root.setValue(t.options.startval),t.validation_results=t.validator.validate(t.root.getValue()),t.root.showValidationErrors(t.validation_results),t.ready=!0,window.requestAnimationFrame(function(){t.ready&&(t.validation_results=t.validator.validate(t.root.getValue()),t.root.showValidationErrors(t.validation_results),t.trigger("ready"),t.trigger("change"))})})},getValue:function(){if(!this.ready)throw"JSON Editor not ready yet.  Listen for 'ready' event before getting the value";return this.root.getValue()},setValue:function(t){if(!this.ready)throw"JSON Editor not ready yet.  Listen for 'ready' event before setting the value";return this.root.setValue(t),this},validate:function(t){if(!this.ready)throw"JSON Editor not ready yet.  Listen for 'ready' event before validating";return 1===arguments.length?this.validator.validate(t):this.validation_results},destroy:function(){this.destroyed||this.ready&&(this.schema=null,this.options=null,this.root.destroy(),this.root=null,this.root_container=null,this.validator=null,this.validation_results=null,this.theme=null,this.iconlib=null,this.template=null,this.__data=null,this.ready=!1,this.element.innerHTML="",this.destroyed=!0)},on:function(t,e){return this.callbacks=this.callbacks||{},this.callbacks[t]=this.callbacks[t]||[],this.callbacks[t].push(e),this},off:function(t,e){if(t&&e){this.callbacks=this.callbacks||{},this.callbacks[t]=this.callbacks[t]||[];for(var i=[],s=0;s<this.callbacks[t].length;s++)this.callbacks[t][s]!==e&&i.push(this.callbacks[t][s]);this.callbacks[t]=i}else t?(this.callbacks=this.callbacks||{},this.callbacks[t]=[]):this.callbacks={};return this},trigger:function(t){if(this.callbacks&&this.callbacks[t]&&this.callbacks[t].length)for(var e=0;e<this.callbacks[t].length;e++)this.callbacks[t][e]();return this},setOption:function(t,e){if("show_errors"!==t)throw"Option "+t+" must be set during instantiation and cannot be changed later";return this.options.show_errors=e,this.onChange(),this},getEditorClass:function(t){var e;if(t=this.expandSchema(t),s(n.defaults.resolvers,function(i,s){var r=s(t);return r&&n.defaults.editors[r]?(e=r,!1):void 0}),!e)throw"Unknown editor for schema "+JSON.stringify(t);if(!n.defaults.editors[e])throw"Unknown editor "+e;return n.defaults.editors[e]},createEditor:function(t,e){return e=i({},t.options||{},e),new t(e)},onChange:function(){if(this.ready&&!this.firing_change){this.firing_change=!0;var t=this;return window.requestAnimationFrame(function(){t.firing_change=!1,t.ready&&(t.validation_results=t.validator.validate(t.root.getValue()),"never"!==t.options.show_errors?t.root.showValidationErrors(t.validation_results):t.root.showValidationErrors([]),t.trigger("change"))}),this}},compileTemplate:function(t,e){e=e||n.defaults.template;var i;if("string"==typeof e){if(!n.defaults.templates[e])throw"Unknown template engine "+e;if(i=n.defaults.templates[e](),!i)throw"Template engine "+e+" missing required library."}else i=e;if(!i)throw"No template engine set";if(!i.compile)throw"Invalid template engine set";return i.compile(t)},_data:function(t,e,i){if(3!==arguments.length)return t.hasAttribute("data-jsoneditor-"+e)?this.__data[t.getAttribute("data-jsoneditor-"+e)]:null;var s;t.hasAttribute("data-jsoneditor-"+e)?s=t.getAttribute("data-jsoneditor-"+e):(s=this.uuid++,t.setAttribute("data-jsoneditor-"+e,s)),this.__data[s]=i},registerEditor:function(t){return this.editors=this.editors||{},this.editors[t.path]=t,this},unregisterEditor:function(t){return this.editors=this.editors||{},this.editors[t.path]=null,this},getEditor:function(t){return this.editors?this.editors[t]:void 0},watch:function(t,e){return this.watchlist=this.watchlist||{},this.watchlist[t]=this.watchlist[t]||[],this.watchlist[t].push(e),this},unwatch:function(t,e){if(!this.watchlist||!this.watchlist[t])return this;if(!e)return this.watchlist[t]=null,this;for(var i=[],s=0;s<this.watchlist[t].length;s++)this.watchlist[t][s]!==e&&i.push(this.watchlist[t][s]);return this.watchlist[t]=i.length?i:null,this},notifyWatchers:function(t){if(!this.watchlist||!this.watchlist[t])return this;for(var e=0;e<this.watchlist[t].length;e++)this.watchlist[t][e]()},isEnabled:function(){return!this.root||this.root.isEnabled()},enable:function(){this.root.enable()},disable:function(){this.root.disable()},_getDefinitions:function(t,e){if(e=e||"#/definitions/",t.definitions)for(var i in t.definitions)t.definitions.hasOwnProperty(i)&&(this.refs[e+i]=t.definitions[i],t.definitions[i].definitions&&this._getDefinitions(t.definitions[i],e+i+"/definitions/"))},_getExternalRefs:function(t){var e={},i=function(t){for(var i in t)t.hasOwnProperty(i)&&(e[i]=!0)};t.$ref&&"object"!=typeof t.$ref&&"#"!==t.$ref.substr(0,1)&&!this.refs[t.$ref]&&(e[t.$ref]=!0);for(var s in t)if(t.hasOwnProperty(s))if(t[s]&&"object"==typeof t[s]&&Array.isArray(t[s]))for(var r=0;r<t[s].length;r++)"object"==typeof t[s][r]&&i(this._getExternalRefs(t[s][r]));else t[s]&&"object"==typeof t[s]&&i(this._getExternalRefs(t[s]));return e},_loadExternalRefs:function(t,e){var i=this,r=this._getExternalRefs(t),n=0,o=0,a=!1;s(r,function(t){if(!i.refs[t]){if(!i.options.ajax)throw"Must set ajax option to true to load external ref "+t;i.refs[t]="loading",o++;var s=new XMLHttpRequest;s.open("GET",t,!0),s.onreadystatechange=function(){if(4==s.readyState){if(200!==s.status)throw window.console.log(s),"Failed to fetch ref via ajax- "+t;var r;try{r=JSON.parse(s.responseText)}catch(h){throw window.console.log(h),"Failed to parse external ref "+t}if(!r||"object"!=typeof r)throw"External ref does not contain a valid schema - "+t;i.refs[t]=r,i._loadExternalRefs(r,function(){n++,n>=o&&!a&&(a=!0,e())})}},s.send()}}),o||e()},expandRefs:function(t){for(t=i({},t);t.$ref;){var e=t.$ref;delete t.$ref,this.refs[e]||(e=decodeURIComponent(e)),t=this.extendSchemas(t,this.refs[e])}return t},expandSchema:function(t){var e,r=this,n=i({},t);if("object"==typeof t.type&&(Array.isArray(t.type)?s(t.type,function(e,i){"object"==typeof i&&(t.type[e]=r.expandSchema(i))}):t.type=r.expandSchema(t.type)),"object"==typeof t.disallow&&(Array.isArray(t.disallow)?s(t.disallow,function(e,i){"object"==typeof i&&(t.disallow[e]=r.expandSchema(i))}):t.disallow=r.expandSchema(t.disallow)),t.anyOf&&s(t.anyOf,function(e,i){t.anyOf[e]=r.expandSchema(i)}),t.dependencies&&s(t.dependencies,function(e,i){"object"!=typeof i||Array.isArray(i)||(t.dependencies[e]=r.expandSchema(i))}),t.not&&(t.not=this.expandSchema(t.not)),t.allOf){for(e=0;e<t.allOf.length;e++)n=this.extendSchemas(n,this.expandSchema(t.allOf[e]));delete n.allOf}if(t["extends"]){if(Array.isArray(t["extends"]))for(e=0;e<t["extends"].length;e++)n=this.extendSchemas(n,this.expandSchema(t["extends"][e]));else n=this.extendSchemas(n,this.expandSchema(t["extends"]));delete n["extends"]}if(t.oneOf){var o=i({},n);for(delete o.oneOf,e=0;e<t.oneOf.length;e++)n.oneOf[e]=this.extendSchemas(this.expandSchema(t.oneOf[e]),o)}return this.expandRefs(n)},extendSchemas:function(t,e){t=i({},t),e=i({},e);var r=this,n={};return s(t,function(t,i){"undefined"!=typeof e[t]?"required"===t&&"object"==typeof i&&Array.isArray(i)?n.required=i.concat(e[t]).reduce(function(t,e){return t.indexOf(e)<0&&t.push(e),t},[]):"type"!==t||"string"!=typeof i&&!Array.isArray(i)?"object"==typeof i&&Array.isArray(i)?n[t]=i.filter(function(i){return-1!==e[t].indexOf(i)}):"object"==typeof i&&null!==i?n[t]=r.extendSchemas(i,e[t]):n[t]=i:("string"==typeof i&&(i=[i]),"string"==typeof e.type&&(e.type=[e.type]),n.type=i.filter(function(t){return-1!==e.type.indexOf(t)}),1===n.type.length&&"string"==typeof n.type[0]&&(n.type=n.type[0])):n[t]=i}),s(e,function(e,i){"undefined"==typeof t[e]&&(n[e]=i)}),n}},n.defaults={themes:{},templates:{},iconlibs:{},editors:{},languages:{},resolvers:[],custom_validators:[]},n.Validator=t.extend({init:function(t,e){this.jsoneditor=t,this.schema=e||this.jsoneditor.schema,this.options={},this.translate=this.jsoneditor.translate||n.defaults.translate},validate:function(t){return this._validateSchema(this.schema,t)},_validateSchema:function(t,e,r){var o,a,h,l=this,d=[],u=JSON.stringify(e);if(r=r||"root",t=i({},this.jsoneditor.expandRefs(t)),t.required&&t.required===!0){if("undefined"==typeof e)return d.push({path:r,property:"required",message:this.translate("error_notset")}),d}else if("undefined"==typeof e){if(!this.jsoneditor.options.required_by_default)return d;d.push({path:r,property:"required",message:this.translate("error_notset")})}if(t["enum"]){for(o=!1,a=0;a<t["enum"].length;a++)u===JSON.stringify(t["enum"][a])&&(o=!0);o||d.push({path:r,property:"enum",message:this.translate("error_enum")})}if(t["extends"])for(a=0;a<t["extends"].length;a++)d=d.concat(this._validateSchema(t["extends"][a],e,r));if(t.allOf)for(a=0;a<t.allOf.length;a++)d=d.concat(this._validateSchema(t.allOf[a],e,r));if(t.anyOf){for(o=!1,a=0;a<t.anyOf.length;a++)if(!this._validateSchema(t.anyOf[a],e,r).length){o=!0;break}o||d.push({path:r,property:"anyOf",message:this.translate("error_anyOf")})}if(t.oneOf){o=0;var p=[];for(a=0;a<t.oneOf.length;a++){var c=this._validateSchema(t.oneOf[a],e,r);for(c.length||o++,h=0;h<c.length;h++)c[h].path=r+".oneOf["+a+"]"+c[h].path.substr(r.length);p=p.concat(c)}1!==o&&(d.push({path:r,property:"oneOf",message:this.translate("error_oneOf",[o])}),d=d.concat(p))}if(t.not&&(this._validateSchema(t.not,e,r).length||d.push({path:r,property:"not",message:this.translate("error_not")})),t.type)if(Array.isArray(t.type)){for(o=!1,a=0;a<t.type.length;a++)if(this._checkType(t.type[a],e)){o=!0;break}o||d.push({path:r,property:"type",message:this.translate("error_type_union")})}else this._checkType(t.type,e)||d.push({path:r,property:"type",message:this.translate("error_type",[t.type])});if(t.disallow)if(Array.isArray(t.disallow)){for(o=!0,a=0;a<t.disallow.length;a++)if(this._checkType(t.disallow[a],e)){o=!1;break}o||d.push({path:r,property:"disallow",message:this.translate("error_disallow_union")})}else this._checkType(t.disallow,e)&&d.push({path:r,property:"disallow",message:this.translate("error_disallow",[t.disallow])});if("number"==typeof e)(t.multipleOf||t.divisibleBy)&&(o=e/(t.multipleOf||t.divisibleBy),o!==Math.floor(o)&&d.push({path:r,property:t.multipleOf?"multipleOf":"divisibleBy",message:this.translate("error_multipleOf",[t.multipleOf||t.divisibleBy])})),t.hasOwnProperty("maximum")&&(t.exclusiveMaximum&&e>=t.maximum?d.push({path:r,property:"maximum",message:this.translate("error_maximum_excl",[t.maximum])}):!t.exclusiveMaximum&&e>t.maximum&&d.push({path:r,property:"maximum",message:this.translate("error_maximum_incl",[t.maximum])})),t.hasOwnProperty("minimum")&&(t.exclusiveMinimum&&e<=t.minimum?d.push({path:r,property:"minimum",message:this.translate("error_minimum_excl",[t.minimum])}):!t.exclusiveMinimum&&e<t.minimum&&d.push({path:r,property:"minimum",message:this.translate("error_minimum_incl",[t.minimum])}));else if("string"==typeof e)t.maxLength&&(e+"").length>t.maxLength&&d.push({path:r,property:"maxLength",message:this.translate("error_maxLength",[t.maxLength])}),t.minLength&&(e+"").length<t.minLength&&d.push({path:r,property:"minLength",message:this.translate(1===t.minLength?"error_notempty":"error_minLength",[t.minLength])}),t.pattern&&(new RegExp(t.pattern).test(e)||d.push({path:r,property:"pattern",message:this.translate("error_pattern")}));else if("object"==typeof e&&null!==e&&Array.isArray(e)){if(t.items)if(Array.isArray(t.items))for(a=0;a<e.length;a++)if(t.items[a])d=d.concat(this._validateSchema(t.items[a],e[a],r+"."+a));else{if(t.additionalItems===!0)break;if(!t.additionalItems){if(t.additionalItems===!1){d.push({path:r,property:"additionalItems",message:this.translate("error_additionalItems")});break}break}d=d.concat(this._validateSchema(t.additionalItems,e[a],r+"."+a))}else for(a=0;a<e.length;a++)d=d.concat(this._validateSchema(t.items,e[a],r+"."+a));if(t.maxItems&&e.length>t.maxItems&&d.push({path:r,property:"maxItems",message:this.translate("error_maxItems",[t.maxItems])}),t.minItems&&e.length<t.minItems&&d.push({path:r,property:"minItems",message:this.translate("error_minItems",[t.minItems])}),t.uniqueItems){var m={};for(a=0;a<e.length;a++){if(o=JSON.stringify(e[a]),m[o]){d.push({path:r,property:"uniqueItems",message:this.translate("error_uniqueItems")});break}m[o]=!0}}}else if("object"==typeof e&&null!==e){if(t.maxProperties){o=0;for(a in e)e.hasOwnProperty(a)&&o++;o>t.maxProperties&&d.push({path:r,property:"maxProperties",message:this.translate("error_maxProperties",[t.maxProperties])})}if(t.minProperties){o=0;for(a in e)e.hasOwnProperty(a)&&o++;o<t.minProperties&&d.push({path:r,property:"minProperties",message:this.translate("error_minProperties",[t.minProperties])})}if(t.required&&Array.isArray(t.required))for(a=0;a<t.required.length;a++)"undefined"==typeof e[t.required[a]]&&d.push({path:r,property:"required",message:this.translate("error_required",[t.required[a]])});var f={};if(t.properties)for(a in t.properties)t.properties.hasOwnProperty(a)&&(f[a]=!0,d=d.concat(this._validateSchema(t.properties[a],e[a],r+"."+a)));if(t.patternProperties)for(a in t.patternProperties)if(t.patternProperties.hasOwnProperty(a)){var g=new RegExp(a);for(h in e)e.hasOwnProperty(h)&&g.test(h)&&(f[h]=!0,d=d.concat(this._validateSchema(t.patternProperties[a],e[h],r+"."+h)))}if("undefined"!=typeof t.additionalProperties||!this.jsoneditor.options.no_additional_properties||t.oneOf||t.anyOf||(t.additionalProperties=!1),"undefined"!=typeof t.additionalProperties)for(a in e)if(e.hasOwnProperty(a)&&!f[a]){if(!t.additionalProperties){d.push({path:r,property:"additionalProperties",message:this.translate("error_additional_properties",[a])});break}if(t.additionalProperties===!0)break;d=d.concat(this._validateSchema(t.additionalProperties,e[a],r+"."+a))}if(t.dependencies)for(a in t.dependencies)if(t.dependencies.hasOwnProperty(a)&&"undefined"!=typeof e[a])if(Array.isArray(t.dependencies[a]))for(h=0;h<t.dependencies[a].length;h++)"undefined"==typeof e[t.dependencies[a][h]]&&d.push({path:r,property:"dependencies",message:this.translate("error_dependency",[t.dependencies[a][h]])});else d=d.concat(this._validateSchema(t.dependencies[a],e,r))}return s(n.defaults.custom_validators,function(i,s){d=d.concat(s.call(l,t,e,r))}),d},_checkType:function(t,e){return"string"==typeof t?"string"===t?"string"==typeof e:"number"===t?"number"==typeof e:"integer"===t?"number"==typeof e&&e===Math.floor(e):"boolean"===t?"boolean"==typeof e:"array"===t?Array.isArray(e):"object"===t?null!==e&&!Array.isArray(e)&&"object"==typeof e:"null"!==t||null===e:!this._validateSchema(t,e).length}}),n.AbstractEditor=t.extend({onChildEditorChange:function(t){this.onChange(!0)},notify:function(){this.jsoneditor.notifyWatchers(this.path)},change:function(){this.parent?this.parent.onChildEditorChange(this):this.jsoneditor.onChange()},onChange:function(t){this.notify(),this.watch_listener&&this.watch_listener(),t&&this.change()},register:function(){this.jsoneditor.registerEditor(this),this.onChange()},unregister:function(){this.jsoneditor&&this.jsoneditor.unregisterEditor(this)},getNumColumns:function(){return 12},init:function(t){this.jsoneditor=t.jsoneditor,this.theme=this.jsoneditor.theme,this.template_engine=this.jsoneditor.template,this.iconlib=this.jsoneditor.iconlib,this.original_schema=t.schema,this.schema=this.jsoneditor.expandSchema(this.original_schema),this.options=i({},this.options||{},t.schema.options||{},t),t.path||this.schema.id||(this.schema.id="root"),this.path=t.path||"root",this.formname=t.formname||this.path.replace(/\.([^.]+)/g,"[$1]"),this.jsoneditor.options.form_name_root&&(this.formname=this.formname.replace(/^root\[/,this.jsoneditor.options.form_name_root+"[")),this.key=this.path.split(".").pop(),this.parent=t.parent,this.link_watchers=[],t.container&&this.setContainer(t.container)},setContainer:function(t){this.container=t,this.schema.id&&this.container.setAttribute("data-schemaid",this.schema.id),this.schema.type&&"string"==typeof this.schema.type&&this.container.setAttribute("data-schematype",this.schema.type),this.container.setAttribute("data-schemapath",this.path)},preBuild:function(){},build:function(){},postBuild:function(){this.setupWatchListeners(),this.addLinks(),this.setValue(this.getDefault(),!0),this.updateHeaderText(),this.register(),this.onWatchedFieldChange()},setupWatchListeners:function(){var t=this;if(this.watched={},this.schema.vars&&(this.schema.watch=this.schema.vars),this.watched_values={},this.watch_listener=function(){t.refreshWatchedFieldValues()&&t.onWatchedFieldChange()},this.register(),this.schema.hasOwnProperty("watch")){var e,i,s,r,n;for(var o in this.schema.watch)if(this.schema.watch.hasOwnProperty(o)){if(e=this.schema.watch[o],Array.isArray(e)?i=[e[0]].concat(e[1].split(".")):(i=e.split("."),t.theme.closest(t.container,'[data-schemaid="'+i[0]+'"]')||i.unshift("#")),s=i.shift(),"#"===s&&(s=t.jsoneditor.schema.id||"root"),r=t.theme.closest(t.container,'[data-schemaid="'+s+'"]'),!r)throw"Could not find ancestor node with id "+s;n=r.getAttribute("data-schemapath")+"."+i.join("."),t.jsoneditor.watch(n,t.watch_listener),t.watched[o]=n}}this.schema.headerTemplate&&(this.header_template=this.jsoneditor.compileTemplate(this.schema.headerTemplate,this.template_engine))},addLinks:function(){if(!this.no_link_holder&&(this.link_holder=this.theme.getLinksHolder(),this.container.appendChild(this.link_holder),this.schema.links))for(var t=0;t<this.schema.links.length;t++)this.addLink(this.getLink(this.schema.links[t]))},getButton:function(t,e,i){var s="json-editor-btn-"+e;e=this.iconlib?this.iconlib.getIcon(e):null,!e&&i&&(t=i,i=null);var r=this.theme.getButton(t,e,i);return r.className+=" "+s+" ",r},setButtonText:function(t,e,i,s){return i=this.iconlib?this.iconlib.getIcon(i):null,!i&&s&&(e=s,s=null),this.theme.setButtonText(t,e,i,s)},addLink:function(t){this.link_holder&&this.link_holder.appendChild(t)},getLink:function(t){var e,i,s=t.mediaType||"application/javascript",r=s.split("/")[0],n=this.jsoneditor.compileTemplate(t.href,this.template_engine);if("image"===r){e=this.theme.getBlockLinkHolder(),i=document.createElement("a"),i.setAttribute("target","_blank");var o=document.createElement("img");this.theme.createImageLink(e,i,o),this.link_watchers.push(function(e){var s=n(e);i.setAttribute("href",s),i.setAttribute("title",t.rel||s),o.setAttribute("src",s)})}else if(["audio","video"].indexOf(r)>=0){e=this.theme.getBlockLinkHolder(),i=this.theme.getBlockLink(),i.setAttribute("target","_blank");var a=document.createElement(r);a.setAttribute("controls","controls"),this.theme.createMediaLink(e,i,a),this.link_watchers.push(function(e){var s=n(e);i.setAttribute("href",s),i.textContent=t.rel||s,a.setAttribute("src",s)})}else e=this.theme.getBlockLink(),e.setAttribute("target","_blank"),e.textContent=t.rel,this.link_watchers.push(function(i){var s=n(i);e.setAttribute("href",s),e.textContent=t.rel||s});return e},refreshWatchedFieldValues:function(){if(this.watched_values){var t={},e=!1,i=this;if(this.watched){var s,r;for(var n in this.watched)this.watched.hasOwnProperty(n)&&(r=i.jsoneditor.getEditor(this.watched[n]),s=r?r.getValue():null,i.watched_values[n]!==s&&(e=!0),t[n]=s)}return t.self=this.getValue(),this.watched_values.self!==t.self&&(e=!0),this.watched_values=t,e}},getWatchedFieldValues:function(){return this.watched_values},updateHeaderText:function(){if(this.header)if(this.header.children.length){for(var t=0;t<this.header.childNodes.length;t++)if(3===this.header.childNodes[t].nodeType){this.header.childNodes[t].nodeValue=this.getHeaderText();break}}else this.header.textContent=this.getHeaderText()},getHeaderText:function(t){return this.header_text?this.header_text:t?this.schema.title:this.getTitle()},onWatchedFieldChange:function(){var t;if(this.header_template){t=i(this.getWatchedFieldValues(),{key:this.key,i:this.key,i0:1*this.key,i1:1*this.key+1,title:this.getTitle()});var e=this.header_template(t);e!==this.header_text&&(this.header_text=e,this.updateHeaderText(),this.notify())}if(this.link_watchers.length){t=this.getWatchedFieldValues();for(var s=0;s<this.link_watchers.length;s++)this.link_watchers[s](t)}},setValue:function(t){this.value=t},getValue:function(){return this.value},refreshValue:function(){},getChildEditors:function(){return!1},destroy:function(){var t=this;this.unregister(this),s(this.watched,function(e,i){t.jsoneditor.unwatch(i,t.watch_listener)}),this.watched=null,this.watched_values=null,this.watch_listener=null,this.header_text=null,this.header_template=null,this.value=null,this.container&&this.container.parentNode&&this.container.parentNode.removeChild(this.container),this.container=null,this.jsoneditor=null,this.schema=null,this.path=null,this.key=null,this.parent=null},getDefault:function(){if(this.schema["default"])return this.schema["default"];if(this.schema["enum"])return this.schema["enum"][0];var t=this.schema.type||this.schema.oneOf;if(t&&Array.isArray(t)&&(t=t[0]),t&&"object"==typeof t&&(t=t.type),t&&Array.isArray(t)&&(t=t[0]),"string"==typeof t){if("number"===t)return 0;if("boolean"===t)return!1;if("integer"===t)return 0;if("string"===t)return"";if("object"===t)return{};if("array"===t)return[]}return null},getTitle:function(){return this.schema.title||this.key},enable:function(){this.disabled=!1},disable:function(){this.disabled=!0},isEnabled:function(){return!this.disabled},isRequired:function(){return"boolean"==typeof this.schema.required?this.schema.required:this.parent&&this.parent.schema&&Array.isArray(this.parent.schema.required)?this.parent.schema.required.indexOf(this.key)>-1:!!this.jsoneditor.options.required_by_default},getDisplayText:function(t){var e=[],i={};s(t,function(t,e){e.title&&(i[e.title]=i[e.title]||0,i[e.title]++),e.description&&(i[e.description]=i[e.description]||0,i[e.description]++),e.format&&(i[e.format]=i[e.format]||0,i[e.format]++),e.type&&(i[e.type]=i[e.type]||0,i[e.type]++)}),s(t,function(t,s){var r;r="string"==typeof s?s:s.title&&i[s.title]<=1?s.title:s.format&&i[s.format]<=1?s.format:s.type&&i[s.type]<=1?s.type:s.description&&i[s.description]<=1?s.descripton:s.title?s.title:s.format?s.format:s.type?s.type:s.description?s.description:JSON.stringify(s).length<50?JSON.stringify(s):"type",e.push(r)});var r={};return s(e,function(t,s){r[s]=r[s]||0,r[s]++,i[s]>1&&(e[t]=s+" "+r[s])}),e},getOption:function(t){try{throw"getOption is deprecated"}catch(e){window.console.error(e)}return this.options[t]},showValidationErrors:function(t){}}),n.defaults.editors["null"]=n.AbstractEditor.extend({getValue:function(){return null},setValue:function(){this.onChange()},getNumColumns:function(){return 2}}),n.defaults.editors.string=n.AbstractEditor.extend({register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},setValue:function(t,e,i){if((!this.template||i)&&(null===t||"undefined"==typeof t?t="":"object"==typeof t?t=JSON.stringify(t):"string"!=typeof t&&(t=""+t),t!==this.serialized)){var s=this.sanitize(t);if(this.input.value!==s){this.input.value=s,this.sceditor_instance?this.sceditor_instance.val(s):this.epiceditor?this.epiceditor.importFile(null,s):this.ace_editor&&this.ace_editor.setValue(s);var r=i||this.getValue()!==t;this.refreshValue(),e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.adjust_height&&this.adjust_height(this.input),this.onChange(r)}}},getNumColumns:function(){var t,e=Math.ceil(Math.max(this.getTitle().length,this.schema.maxLength||0,this.schema.minLength||0)/5);return t="textarea"===this.input_type?6:["text","email"].indexOf(this.input_type)>=0?4:2,Math.min(12,Math.max(e,t))},build:function(){var t=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.format=this.schema.format,!this.format&&this.schema.media&&this.schema.media.type&&(this.format=this.schema.media.type.replace(/(^(application|text)\/(x-)?(script\.)?)|(-source$)/g,"")),!this.format&&this.options.default_format&&(this.format=this.options.default_format),this.options.format&&(this.format=this.options.format),this.format)if("textarea"===this.format)this.input_type="textarea",this.input=this.theme.getTextareaInput();else if("range"===this.format){this.input_type="range";var e=this.schema.minimum||0,i=this.schema.maximum||Math.max(100,e+1),s=1;this.schema.multipleOf&&(e%this.schema.multipleOf&&(e=Math.ceil(e/this.schema.multipleOf)*this.schema.multipleOf),i%this.schema.multipleOf&&(i=Math.floor(i/this.schema.multipleOf)*this.schema.multipleOf),s=this.schema.multipleOf),this.input=this.theme.getRangeInput(e,i,s)}else["actionscript","batchfile","bbcode","c","c++","cpp","coffee","csharp","css","dart","django","ejs","erlang","golang","handlebars","haskell","haxe","html","ini","jade","java","javascript","json","less","lisp","lua","makefile","markdown","matlab","mysql","objectivec","pascal","perl","pgsql","php","python","r","ruby","sass","scala","scss","smarty","sql","stylus","svg","twig","vbscript","xml","yaml"].indexOf(this.format)>=0?(this.input_type=this.format,this.source_code=!0,this.input=this.theme.getTextareaInput()):(this.input_type=this.format,this.input=this.theme.getFormInputField(this.input_type));else this.input_type="text",this.input=this.theme.getFormInputField(this.input_type);"undefined"!=typeof this.schema.maxLength&&this.input.setAttribute("maxlength",this.schema.maxLength),"undefined"!=typeof this.schema.pattern?this.input.setAttribute("pattern",this.schema.pattern):"undefined"!=typeof this.schema.minLength&&this.input.setAttribute("pattern",".{"+this.schema.minLength+",}"),this.options.compact?this.container.className+=" compact":this.options.input_width&&(this.input.style.width=this.options.input_width),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.always_disabled=!0,this.input.disabled=!0),this.input.addEventListener("change",function(e){if(e.preventDefault(),e.stopPropagation(),t.schema.template)return void(this.value=t.value);var i=this.value,s=t.sanitize(i);i!==s&&(this.value=s),t.is_dirty=!0,t.refreshValue(),t.onChange(!0)}),this.options.input_height&&(this.input.style.height=this.options.input_height),this.options.expand_height&&(this.adjust_height=function(t){if(t){var e,i=t.offsetHeight;if(t.offsetHeight<t.scrollHeight)for(e=0;t.offsetHeight<t.scrollHeight+3&&!(e>100);)e++,i++,t.style.height=i+"px";else{for(e=0;t.offsetHeight>=t.scrollHeight+3&&!(e>100);)e++,i--,t.style.height=i+"px";t.style.height=i+1+"px"}}},this.input.addEventListener("keyup",function(e){t.adjust_height(this)}),this.input.addEventListener("change",function(e){t.adjust_height(this)}),this.adjust_height()),this.format&&this.input.setAttribute("data-schemaformat",this.format),this.control=this.theme.getFormControl(this.label,this.input,this.description),this.container.appendChild(this.control),window.requestAnimationFrame(function(){t.input.parentNode&&t.afterInputReady(),t.adjust_height&&t.adjust_height(t.input)}),this.schema.template?(this.template=this.jsoneditor.compileTemplate(this.schema.template,this.template_engine),this.refreshValue()):this.refreshValue()},enable:function(){this.always_disabled||(this.input.disabled=!1),this._super()},disable:function(){this.input.disabled=!0,this._super()},afterInputReady:function(){var t,e=this;if(this.source_code)if(this.options.wysiwyg&&["html","bbcode"].indexOf(this.input_type)>=0&&window.jQuery&&window.jQuery.fn&&window.jQuery.fn.sceditor)t=i({},{plugins:"html"===e.input_type?"xhtml":"bbcode",emoticonsEnabled:!1,width:"100%",height:300},n.plugins.sceditor,e.options.sceditor_options||{}),window.jQuery(e.input).sceditor(t),e.sceditor_instance=window.jQuery(e.input).sceditor("instance"),e.sceditor_instance.blur(function(){var t=window.jQuery("<div>"+e.sceditor_instance.val()+"</div>");window.jQuery("#sceditor-start-marker,#sceditor-end-marker,.sceditor-nlf",t).remove(),e.input.value=t.html(),e.value=e.input.value,e.is_dirty=!0,e.onChange(!0)});else if("markdown"===this.input_type&&window.EpicEditor)this.epiceditor_container=document.createElement("div"),this.input.parentNode.insertBefore(this.epiceditor_container,this.input),this.input.style.display="none",t=i({},n.plugins.epiceditor,{container:this.epiceditor_container,clientSideStorage:!1}),this.epiceditor=new window.EpicEditor(t).load(),this.epiceditor.importFile(null,this.getValue()),this.epiceditor.on("update",function(){var t=e.epiceditor.exportFile();e.input.value=t,e.value=t,e.is_dirty=!0,e.onChange(!0)});else if(window.ace){
+var s=this.input_type;("cpp"===s||"c++"===s||"c"===s)&&(s="c_cpp"),this.ace_container=document.createElement("div"),this.ace_container.style.width="100%",this.ace_container.style.position="relative",this.ace_container.style.height="400px",this.input.parentNode.insertBefore(this.ace_container,this.input),this.input.style.display="none",this.ace_editor=window.ace.edit(this.ace_container),this.ace_editor.setValue(this.getValue()),n.plugins.ace.theme&&this.ace_editor.setTheme("ace/theme/"+n.plugins.ace.theme),s=window.ace.require("ace/mode/"+s),s&&this.ace_editor.getSession().setMode(new s.Mode),this.ace_editor.on("change",function(){var t=e.ace_editor.getValue();e.input.value=t,e.refreshValue(),e.is_dirty=!0,e.onChange(!0)})}e.theme.afterInputReady(e.input)},refreshValue:function(){this.value=this.input.value,"string"!=typeof this.value&&(this.value=""),this.serialized=this.value},destroy:function(){this.sceditor_instance?this.sceditor_instance.destroy():this.epiceditor?this.epiceditor.unload():this.ace_editor&&this.ace_editor.destroy(),this.template=null,this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this._super()},sanitize:function(t){return t},onWatchedFieldChange:function(){var t;this.template&&(t=this.getWatchedFieldValues(),this.setValue(this.template(t),!1,!0)),this._super()},showValidationErrors:function(t){var e=this;if("always"===this.jsoneditor.options.show_errors);else if(!this.is_dirty&&this.previous_error_setting===this.jsoneditor.options.show_errors)return;this.previous_error_setting=this.jsoneditor.options.show_errors;var i=[];s(t,function(t,s){s.path===e.path&&i.push(s.message)}),i.length?this.theme.addInputError(this.input,i.join(". ")+"."):this.theme.removeInputError(this.input)}}),n.defaults.editors.number=n.defaults.editors.string.extend({sanitize:function(t){return(t+"").replace(/[^0-9\.\-eE]/g,"")},getNumColumns:function(){return 2},getValue:function(){return 1*this.value}}),n.defaults.editors.integer=n.defaults.editors.number.extend({sanitize:function(t){return t+="",t.replace(/[^0-9\-]/g,"")},getNumColumns:function(){return 2}}),n.defaults.editors.object=n.AbstractEditor.extend({getDefault:function(){return i({},this.schema["default"]||{})},getChildEditors:function(){return this.editors},register:function(){if(this._super(),this.editors)for(var t in this.editors)this.editors.hasOwnProperty(t)&&this.editors[t].register()},unregister:function(){if(this._super(),this.editors)for(var t in this.editors)this.editors.hasOwnProperty(t)&&this.editors[t].unregister()},getNumColumns:function(){return Math.max(Math.min(12,this.maxwidth),3)},enable:function(){if(this.editjson_button&&(this.editjson_button.disabled=!1),this.addproperty_button&&(this.addproperty_button.disabled=!1),this._super(),this.editors)for(var t in this.editors)this.editors.hasOwnProperty(t)&&this.editors[t].enable()},disable:function(){if(this.editjson_button&&(this.editjson_button.disabled=!0),this.addproperty_button&&(this.addproperty_button.disabled=!0),this.hideEditJSON(),this._super(),this.editors)for(var t in this.editors)this.editors.hasOwnProperty(t)&&this.editors[t].disable()},layoutEditors:function(){var t,e,i=this;if(this.row_container){this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort(function(t,e){var s=i.editors[t].schema.propertyOrder,r=i.editors[e].schema.propertyOrder;return"number"!=typeof s&&(s=1e3),"number"!=typeof r&&(r=1e3),s-r});var r;if("grid"===this.format){var n=[];for(s(this.property_order,function(t,e){var s=i.editors[e];if(!s.property_removed){for(var r=!1,o=s.options.hidden?0:s.options.grid_columns||s.getNumColumns(),a=s.options.hidden?0:s.container.offsetHeight,h=0;h<n.length;h++)n[h].width+o<=12&&(!a||.5*n[h].minh<a&&2*n[h].maxh>a)&&(r=h);r===!1&&(n.push({width:0,minh:999999,maxh:0,editors:[]}),r=n.length-1),n[r].editors.push({key:e,width:o,height:a}),n[r].width+=o,n[r].minh=Math.min(n[r].minh,a),n[r].maxh=Math.max(n[r].maxh,a)}}),t=0;t<n.length;t++)if(n[t].width<12){var o=!1,a=0;for(e=0;e<n[t].editors.length;e++)o===!1?o=e:n[t].editors[e].width>n[t].editors[o].width&&(o=e),n[t].editors[e].width*=12/n[t].width,n[t].editors[e].width=Math.floor(n[t].editors[e].width),a+=n[t].editors[e].width;12>a&&(n[t].editors[o].width+=12-a),n[t].width=12}if(this.layout===JSON.stringify(n))return!1;for(this.layout=JSON.stringify(n),r=document.createElement("div"),t=0;t<n.length;t++){var h=this.theme.getGridRow();for(r.appendChild(h),e=0;e<n[t].editors.length;e++){var l=n[t].editors[e].key,d=this.editors[l];d.options.hidden?d.container.style.display="none":this.theme.setGridColumnSize(d.container,n[t].editors[e].width),h.appendChild(d.container)}}}else r=document.createElement("div"),s(this.property_order,function(t,e){var s=i.editors[e];if(!s.property_removed){var n=i.theme.getGridRow();r.appendChild(n),s.options.hidden?s.container.style.display="none":i.theme.setGridColumnSize(s.container,12),n.appendChild(s.container)}});this.row_container.innerHTML="",this.row_container.appendChild(r)}},getPropertySchema:function(t){var e=this.schema.properties[t]||{};e=i({},e);var s=!!this.schema.properties[t];if(this.schema.patternProperties)for(var r in this.schema.patternProperties)if(this.schema.patternProperties.hasOwnProperty(r)){var n=new RegExp(r);n.test(t)&&(e.allOf=e.allOf||[],e.allOf.push(this.schema.patternProperties[r]),s=!0)}return!s&&this.schema.additionalProperties&&"object"==typeof this.schema.additionalProperties&&(e=i({},this.schema.additionalProperties)),e},preBuild:function(){this._super(),this.editors={},this.cached_editors={};var t=this;if(this.format=this.options.layout||this.options.object_layout||this.schema.format||this.jsoneditor.options.object_layout||"normal",this.schema.properties=this.schema.properties||{},this.minwidth=0,this.maxwidth=0,this.options.table_row)s(this.schema.properties,function(e,i){var s=t.jsoneditor.getEditorClass(i);t.editors[e]=t.jsoneditor.createEditor(s,{jsoneditor:t.jsoneditor,schema:i,path:t.path+"."+e,parent:t,compact:!0,required:!0}),t.editors[e].preBuild();var r=t.editors[e].options.hidden?0:t.editors[e].options.grid_columns||t.editors[e].getNumColumns();t.minwidth+=r,t.maxwidth+=r}),this.no_link_holder=!0;else{if(this.options.table)throw"Not supported yet";this.defaultProperties=this.schema.defaultProperties||Object.keys(this.schema.properties),t.maxwidth+=1,s(this.defaultProperties,function(e,i){t.addObjectProperty(i,!0),t.editors[i]&&(t.minwidth=Math.max(t.minwidth,t.editors[i].options.grid_columns||t.editors[i].getNumColumns()),t.maxwidth+=t.editors[i].options.grid_columns||t.editors[i].getNumColumns())})}this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort(function(e,i){var s=t.editors[e].schema.propertyOrder,r=t.editors[i].schema.propertyOrder;return"number"!=typeof s&&(s=1e3),"number"!=typeof r&&(r=1e3),s-r})},build:function(){var t=this;if(this.options.table_row)this.editor_holder=this.container,s(this.editors,function(e,i){var s=t.theme.getTableCell();t.editor_holder.appendChild(s),i.setContainer(s),i.build(),i.postBuild(),t.editors[e].options.hidden&&(s.style.display="none"),t.editors[e].options.input_width&&(s.style.width=t.editors[e].options.input_width)});else{if(this.options.table)throw"Not supported yet";this.header=document.createElement("span"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header),this.container.appendChild(this.title),this.container.style.position="relative",this.editjson_holder=this.theme.getModal(),this.editjson_textarea=this.theme.getTextareaInput(),this.editjson_textarea.style.height="170px",this.editjson_textarea.style.width="300px",this.editjson_textarea.style.display="block",this.editjson_save=this.getButton("Save","save","Save"),this.editjson_save.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.saveJSON()}),this.editjson_cancel=this.getButton("Cancel","cancel","Cancel"),this.editjson_cancel.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.hideEditJSON()}),this.editjson_holder.appendChild(this.editjson_textarea),this.editjson_holder.appendChild(this.editjson_save),this.editjson_holder.appendChild(this.editjson_cancel),this.addproperty_holder=this.theme.getModal(),this.addproperty_list=document.createElement("div"),this.addproperty_list.style.width="295px",this.addproperty_list.style.maxHeight="160px",this.addproperty_list.style.padding="5px 0",this.addproperty_list.style.overflowY="auto",this.addproperty_list.style.overflowX="hidden",this.addproperty_list.style.paddingLeft="5px",this.addproperty_list.setAttribute("class","property-selector"),this.addproperty_add=this.getButton("add","add","add"),this.addproperty_input=this.theme.getFormInputField("text"),this.addproperty_input.setAttribute("placeholder","Property name..."),this.addproperty_input.style.width="220px",this.addproperty_input.style.marginBottom="0",this.addproperty_input.style.display="inline-block",this.addproperty_add.addEventListener("click",function(e){if(e.preventDefault(),e.stopPropagation(),t.addproperty_input.value){if(t.editors[t.addproperty_input.value])return void window.alert("there is already a property with that name");t.addObjectProperty(t.addproperty_input.value),t.editors[t.addproperty_input.value]&&t.editors[t.addproperty_input.value].disable(),t.onChange(!0)}}),this.addproperty_holder.appendChild(this.addproperty_list),this.addproperty_holder.appendChild(this.addproperty_input),this.addproperty_holder.appendChild(this.addproperty_add);var e=document.createElement("div");e.style.clear="both",this.addproperty_holder.appendChild(e),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),this.editor_holder=this.theme.getIndentedPanel(),this.editor_holder.style.paddingBottom="0",this.container.appendChild(this.editor_holder),this.row_container=this.theme.getGridContainer(),this.editor_holder.appendChild(this.row_container),s(this.editors,function(e,i){var s=t.theme.getGridColumn();t.row_container.appendChild(s),i.setContainer(s),i.build(),i.postBuild()}),this.title_controls=this.theme.getHeaderButtonHolder(),this.editjson_controls=this.theme.getHeaderButtonHolder(),this.addproperty_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.title.appendChild(this.editjson_controls),this.title.appendChild(this.addproperty_controls),this.collapsed=!1,this.toggle_button=this.getButton("","collapse","Collapse"),this.title_controls.appendChild(this.toggle_button),this.toggle_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.collapsed?(t.editor_holder.style.display="",t.collapsed=!1,t.setButtonText(t.toggle_button,"","collapse","Collapse")):(t.editor_holder.style.display="none",t.collapsed=!0,t.setButtonText(t.toggle_button,"","expand","Expand"))}),this.options.collapsed&&r(this.toggle_button,"click"),this.schema.options&&"undefined"!=typeof this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none"),this.editjson_button=this.getButton("JSON","edit","Edit JSON"),this.editjson_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.toggleEditJSON()}),this.editjson_controls.appendChild(this.editjson_button),this.editjson_controls.appendChild(this.editjson_holder),this.schema.options&&"undefined"!=typeof this.schema.options.disable_edit_json?this.schema.options.disable_edit_json&&(this.editjson_button.style.display="none"):this.jsoneditor.options.disable_edit_json&&(this.editjson_button.style.display="none"),this.addproperty_button=this.getButton("Properties","edit","Object Properties"),this.addproperty_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.toggleAddProperty()}),this.addproperty_controls.appendChild(this.addproperty_button),this.addproperty_controls.appendChild(this.addproperty_holder),this.refreshAddProperties()}this.options.table_row?(this.editor_holder=this.container,s(this.property_order,function(e,i){t.editor_holder.appendChild(t.editors[i].container)})):(this.layoutEditors(),this.layoutEditors())},showEditJSON:function(){this.editjson_holder&&(this.hideAddProperty(),this.editjson_holder.style.left=this.editjson_button.offsetLeft+"px",this.editjson_holder.style.top=this.editjson_button.offsetTop+this.editjson_button.offsetHeight+"px",this.editjson_textarea.value=JSON.stringify(this.getValue(),null,2),this.disable(),this.editjson_holder.style.display="",this.editjson_button.disabled=!1,this.editing_json=!0)},hideEditJSON:function(){this.editjson_holder&&this.editing_json&&(this.editjson_holder.style.display="none",this.enable(),this.editing_json=!1)},saveJSON:function(){if(this.editjson_holder)try{var t=JSON.parse(this.editjson_textarea.value);this.setValue(t),this.hideEditJSON()}catch(e){throw window.alert("invalid JSON"),e}},toggleEditJSON:function(){this.editing_json?this.hideEditJSON():this.showEditJSON()},insertPropertyControlUsingPropertyOrder:function(t,e,i){var s;this.schema.properties[t]&&(s=this.schema.properties[t].propertyOrder),"number"!=typeof s&&(s=1e3),e.propertyOrder=s;for(var r=0;r<i.childNodes.length;r++){var n=i.childNodes[r];if(e.propertyOrder<n.propertyOrder){this.addproperty_list.insertBefore(e,n),e=null;break}}e&&this.addproperty_list.appendChild(e)},addPropertyCheckbox:function(t){var e,i,s,r,n=this;return e=n.theme.getCheckbox(),e.style.width="auto",s=this.schema.properties[t]&&this.schema.properties[t].title?this.schema.properties[t].title:t,i=n.theme.getCheckboxLabel(s),r=n.theme.getFormControl(i,e),r.style.paddingBottom=r.style.marginBottom=r.style.paddingTop=r.style.marginTop=0,r.style.height="auto",this.insertPropertyControlUsingPropertyOrder(t,r,this.addproperty_list),e.checked=t in this.editors,e.addEventListener("change",function(){e.checked?n.addObjectProperty(t):n.removeObjectProperty(t),n.onChange(!0)}),n.addproperty_checkboxes[t]=e,e},showAddProperty:function(){this.addproperty_holder&&(this.hideEditJSON(),this.addproperty_holder.style.left=this.addproperty_button.offsetLeft+"px",this.addproperty_holder.style.top=this.addproperty_button.offsetTop+this.addproperty_button.offsetHeight+"px",this.disable(),this.adding_property=!0,this.addproperty_button.disabled=!1,this.addproperty_holder.style.display="",this.refreshAddProperties())},hideAddProperty:function(){this.addproperty_holder&&this.adding_property&&(this.addproperty_holder.style.display="none",this.enable(),this.adding_property=!1)},toggleAddProperty:function(){this.adding_property?this.hideAddProperty():this.showAddProperty()},removeObjectProperty:function(t){this.editors[t]&&(this.editors[t].unregister(),delete this.editors[t],this.refreshValue(),this.layoutEditors())},addObjectProperty:function(t,e){var i=this;if(!this.editors[t]){if(this.cached_editors[t]){if(this.editors[t]=this.cached_editors[t],e)return;this.editors[t].register()}else{if(!(this.canHaveAdditionalProperties()||this.schema.properties&&this.schema.properties[t]))return;var s=i.getPropertySchema(t),r=i.jsoneditor.getEditorClass(s);if(i.editors[t]=i.jsoneditor.createEditor(r,{jsoneditor:i.jsoneditor,schema:s,path:i.path+"."+t,parent:i}),i.editors[t].preBuild(),!e){var n=i.theme.getChildEditorHolder();i.editor_holder.appendChild(n),i.editors[t].setContainer(n),i.editors[t].build(),i.editors[t].postBuild()}i.cached_editors[t]=i.editors[t]}e||(i.refreshValue(),i.layoutEditors())}},onChildEditorChange:function(t){this.refreshValue(),this._super(t)},canHaveAdditionalProperties:function(){return"boolean"==typeof this.schema.additionalProperties?this.schema.additionalProperties:!this.jsoneditor.options.no_additional_properties},destroy:function(){s(this.cached_editors,function(t,e){e.destroy()}),this.editor_holder&&(this.editor_holder.innerHTML=""),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.error_holder&&this.error_holder.parentNode&&this.error_holder.parentNode.removeChild(this.error_holder),this.editors=null,this.cached_editors=null,this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.editor_holder=null,this._super()},getValue:function(){var t=this._super();if(this.jsoneditor.options.remove_empty_properties||this.options.remove_empty_properties)for(var e in t)t.hasOwnProperty(e)&&(t[e]||delete t[e]);return t},refreshValue:function(){this.value={};for(var t in this.editors)this.editors.hasOwnProperty(t)&&(this.value[t]=this.editors[t].getValue());this.adding_property&&this.refreshAddProperties()},refreshAddProperties:function(){if(this.options.disable_properties||this.options.disable_properties!==!1&&this.jsoneditor.options.disable_properties)return void(this.addproperty_controls.style.display="none");var t,e=!1,i=!1,s=0,r=!1;for(t in this.editors)this.editors.hasOwnProperty(t)&&s++;e=this.canHaveAdditionalProperties()&&!("undefined"!=typeof this.schema.maxProperties&&s>=this.schema.maxProperties),this.addproperty_checkboxes&&(this.addproperty_list.innerHTML=""),this.addproperty_checkboxes={};for(t in this.cached_editors)this.cached_editors.hasOwnProperty(t)&&(this.addPropertyCheckbox(t),this.isRequired(this.cached_editors[t])&&t in this.editors&&(this.addproperty_checkboxes[t].disabled=!0),"undefined"!=typeof this.schema.minProperties&&s<=this.schema.minProperties?(this.addproperty_checkboxes[t].disabled=this.addproperty_checkboxes[t].checked,this.addproperty_checkboxes[t].checked||(r=!0)):t in this.editors?(r=!0,i=!0):e||this.schema.properties.hasOwnProperty(t)?(this.addproperty_checkboxes[t].disabled=!1,r=!0):this.addproperty_checkboxes[t].disabled=!0);this.canHaveAdditionalProperties()&&(r=!0);for(t in this.schema.properties)this.schema.properties.hasOwnProperty(t)&&(this.cached_editors[t]||(r=!0,this.addPropertyCheckbox(t)));r?this.canHaveAdditionalProperties()?e?this.addproperty_add.disabled=!1:this.addproperty_add.disabled=!0:(this.addproperty_add.style.display="none",this.addproperty_input.style.display="none"):(this.hideAddProperty(),this.addproperty_controls.style.display="none")},isRequired:function(t){return"boolean"==typeof t.schema.required?t.schema.required:Array.isArray(this.schema.required)?this.schema.required.indexOf(t.key)>-1:!!this.jsoneditor.options.required_by_default},setValue:function(t,e){var i=this;t=t||{},("object"!=typeof t||Array.isArray(t))&&(t={}),s(this.cached_editors,function(s,r){"undefined"!=typeof t[s]?(i.addObjectProperty(s),r.setValue(t[s],e)):e||i.isRequired(r)?r.setValue(r.getDefault(),e):i.removeObjectProperty(s)}),s(t,function(t,s){i.cached_editors[t]||(i.addObjectProperty(t),i.editors[t]&&i.editors[t].setValue(s,e))}),this.refreshValue(),this.layoutEditors(),this.onChange()},showValidationErrors:function(t){var e=this,i=[],r=[];s(t,function(t,s){s.path===e.path?i.push(s):r.push(s)}),this.error_holder&&(i.length?(this.error_holder.innerHTML="",this.error_holder.style.display="",s(i,function(t,i){e.error_holder.appendChild(e.theme.getErrorMessage(i.message))})):this.error_holder.style.display="none"),this.options.table_row&&(i.length?this.theme.addTableRowError(this.container):this.theme.removeTableRowError(this.container)),s(this.editors,function(t,e){e.showValidationErrors(r)})}}),n.defaults.editors.array=n.AbstractEditor.extend({getDefault:function(){return this.schema["default"]||[]},register:function(){if(this._super(),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].register()},unregister:function(){if(this._super(),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].unregister()},getNumColumns:function(){var t=this.getItemInfo(0);return this.tabs_holder?Math.max(Math.min(12,t.width+2),4):t.width},enable:function(){if(this.add_row_button&&(this.add_row_button.disabled=!1),this.remove_all_rows_button&&(this.remove_all_rows_button.disabled=!1),this.delete_last_row_button&&(this.delete_last_row_button.disabled=!1),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].enable(),this.rows[t].moveup_button&&(this.rows[t].moveup_button.disabled=!1),this.rows[t].movedown_button&&(this.rows[t].movedown_button.disabled=!1),this.rows[t].delete_button&&(this.rows[t].delete_button.disabled=!1);this._super()},disable:function(){if(this.add_row_button&&(this.add_row_button.disabled=!0),this.remove_all_rows_button&&(this.remove_all_rows_button.disabled=!0),this.delete_last_row_button&&(this.delete_last_row_button.disabled=!0),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].disable(),this.rows[t].moveup_button&&(this.rows[t].moveup_button.disabled=!0),this.rows[t].movedown_button&&(this.rows[t].movedown_button.disabled=!0),this.rows[t].delete_button&&(this.rows[t].delete_button.disabled=!0);this._super()},preBuild:function(){this._super(),this.rows=[],this.row_cache=[],this.hide_delete_buttons=this.options.disable_array_delete||this.jsoneditor.options.disable_array_delete,this.hide_move_buttons=this.options.disable_array_reorder||this.jsoneditor.options.disable_array_reorder,this.hide_add_button=this.options.disable_array_add||this.jsoneditor.options.disable_array_add},build:function(){this.options.compact?(this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.controls=this.theme.getButtonHolder(),this.panel.appendChild(this.controls),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder)):(this.header=document.createElement("span"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header,this.isRequired()),this.container.appendChild(this.title),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),"tabs"===this.schema.format?(this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.tabs_holder=this.theme.getTabHolder(),this.container.appendChild(this.tabs_holder),this.row_holder=this.theme.getTabContentHolder(this.tabs_holder),this.active_tab=null):(this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder),this.controls=this.theme.getButtonHolder(),this.panel.appendChild(this.controls))),this.addControls()},onChildEditorChange:function(t){this.refreshValue(),this.refreshTabs(!0),this._super(t)},getItemTitle:function(){if(!this.item_title)if(this.schema.items&&!Array.isArray(this.schema.items)){var t=this.jsoneditor.expandRefs(this.schema.items);this.item_title=t.title||"item"}else this.item_title="item";return this.item_title},getItemSchema:function(t){return Array.isArray(this.schema.items)?t>=this.schema.items.length?this.schema.additionalItems===!0?{}:this.schema.additionalItems?i({},this.schema.additionalItems):void 0:i({},this.schema.items[t]):this.schema.items?i({},this.schema.items):{}},getItemInfo:function(t){var e=this.getItemSchema(t);this.item_info=this.item_info||{};var i=JSON.stringify(e);return"undefined"!=typeof this.item_info[i]?this.item_info[i]:(e=this.jsoneditor.expandRefs(e),this.item_info[i]={title:e.title||"item","default":e["default"],width:12,child_editors:e.properties||e.items},this.item_info[i])},getElementEditor:function(t){var e=this.getItemInfo(t),i=this.getItemSchema(t);i=this.jsoneditor.expandRefs(i),i.title=e.title+" "+(t+1);var s,r=this.jsoneditor.getEditorClass(i);s=this.tabs_holder?this.theme.getTabContent():e.child_editors?this.theme.getChildEditorHolder():this.theme.getIndentedPanel(),this.row_holder.appendChild(s);var n=this.jsoneditor.createEditor(r,{jsoneditor:this.jsoneditor,schema:i,container:s,path:this.path+"."+t,parent:this,required:!0});return n.preBuild(),n.build(),n.postBuild(),n.title_controls||(n.array_controls=this.theme.getButtonHolder(),s.appendChild(n.array_controls)),n},destroy:function(){this.empty(!0),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.row_holder&&this.row_holder.parentNode&&this.row_holder.parentNode.removeChild(this.row_holder),this.controls&&this.controls.parentNode&&this.controls.parentNode.removeChild(this.controls),this.panel&&this.panel.parentNode&&this.panel.parentNode.removeChild(this.panel),this.rows=this.row_cache=this.title=this.description=this.row_holder=this.panel=this.controls=null,this._super()},empty:function(t){if(this.rows){var e=this;s(this.rows,function(i,s){t&&(s.tab&&s.tab.parentNode&&s.tab.parentNode.removeChild(s.tab),e.destroyRow(s,!0),e.row_cache[i]=null),e.rows[i]=null}),e.rows=[],t&&(e.row_cache=[])}},destroyRow:function(t,e){var i=t.container;e?(t.destroy(),i.parentNode&&i.parentNode.removeChild(i),t.tab&&t.tab.parentNode&&t.tab.parentNode.removeChild(t.tab)):(t.tab&&(t.tab.style.display="none"),i.style.display="none",t.unregister())},getMax:function(){return Array.isArray(this.schema.items)&&this.schema.additionalItems===!1?Math.min(this.schema.items.length,this.schema.maxItems||1/0):this.schema.maxItems||1/0},refreshTabs:function(t){var e=this;s(this.rows,function(i,s){s.tab&&(t?s.tab_text.textContent=s.getHeaderText():s.tab===e.active_tab?(e.theme.markTabActive(s.tab),s.container.style.display=""):(e.theme.markTabInactive(s.tab),s.container.style.display="none"))})},setValue:function(t,e){t=t||[],Array.isArray(t)||(t=[t]);var i=JSON.stringify(t);if(i!==this.serialized){if(this.schema.minItems)for(;t.length<this.schema.minItems;)t.push(this.getItemInfo(t.length)["default"]);this.getMax()&&t.length>this.getMax()&&(t=t.slice(0,this.getMax()));var r=this;s(t,function(t,i){r.rows[t]?r.rows[t].setValue(i,e):r.row_cache[t]?(r.rows[t]=r.row_cache[t],r.rows[t].setValue(i,e),r.rows[t].container.style.display="",r.rows[t].tab&&(r.rows[t].tab.style.display=""),r.rows[t].register()):r.addRow(i,e)});for(var n=t.length;n<r.rows.length;n++)r.destroyRow(r.rows[n]),r.rows[n]=null;r.rows=r.rows.slice(0,t.length);var o=null;s(r.rows,function(t,e){return e.tab===r.active_tab?(o=e.tab,!1):void 0}),!o&&r.rows.length&&(o=r.rows[0].tab),r.active_tab=o,r.refreshValue(e),r.refreshTabs(!0),r.refreshTabs(),r.onChange()}},refreshValue:function(t){var e=this,i=this.value?this.value.length:0;if(this.value=[],s(this.rows,function(t,i){e.value[t]=i.getValue()}),i!==this.value.length||t){var r=this.schema.minItems&&this.schema.minItems>=this.rows.length;s(this.rows,function(t,i){i.movedown_button&&(t===e.rows.length-1?i.movedown_button.style.display="none":i.movedown_button.style.display=""),i.delete_button&&(r?i.delete_button.style.display="none":i.delete_button.style.display=""),e.value[t]=i.getValue()});var n=!1;this.value.length?1===this.value.length?(this.remove_all_rows_button.style.display="none",r||this.hide_delete_buttons?this.delete_last_row_button.style.display="none":(this.delete_last_row_button.style.display="",n=!0)):r||this.hide_delete_buttons?(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none"):(this.delete_last_row_button.style.display="",this.remove_all_rows_button.style.display="",n=!0):(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none"),this.getMax()&&this.getMax()<=this.rows.length||this.hide_add_button?this.add_row_button.style.display="none":(this.add_row_button.style.display="",n=!0),!this.collapsed&&n?this.controls.style.display="inline-block":this.controls.style.display="none"}},addRow:function(t,e){var i=this,r=this.rows.length;i.rows[r]=this.getElementEditor(r),i.row_cache[r]=i.rows[r],i.tabs_holder&&(i.rows[r].tab_text=document.createElement("span"),i.rows[r].tab_text.textContent=i.rows[r].getHeaderText(),i.rows[r].tab=i.theme.getTab(i.rows[r].tab_text),i.rows[r].tab.addEventListener("click",function(t){i.active_tab=i.rows[r].tab,i.refreshTabs(),t.preventDefault(),t.stopPropagation()}),i.theme.addTab(i.tabs_holder,i.rows[r].tab));var n=i.rows[r].title_controls||i.rows[r].array_controls;i.hide_delete_buttons||(i.rows[r].delete_button=this.getButton(i.getItemTitle(),"delete","Delete "+i.getItemTitle()),i.rows[r].delete_button.className+=" delete",i.rows[r].delete_button.setAttribute("data-i",r),i.rows[r].delete_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var e=1*this.getAttribute("data-i"),r=i.getValue(),n=[],o=null;s(r,function(t,s){return t===e?void(i.rows[t].tab===i.active_tab&&(i.rows[t+1]?o=i.rows[t].tab:t&&(o=i.rows[t-1].tab))):void n.push(s)}),i.setValue(n),o&&(i.active_tab=o,i.refreshTabs()),i.onChange(!0)}),n&&n.appendChild(i.rows[r].delete_button)),r&&!i.hide_move_buttons&&(i.rows[r].moveup_button=this.getButton("","moveup","Move up"),i.rows[r].moveup_button.className+=" moveup",i.rows[r].moveup_button.setAttribute("data-i",r),i.rows[r].moveup_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var e=1*this.getAttribute("data-i");if(!(0>=e)){var s=i.getValue(),r=s[e-1];s[e-1]=s[e],s[e]=r,i.setValue(s),i.active_tab=i.rows[e-1].tab,i.refreshTabs(),i.onChange(!0)}}),n&&n.appendChild(i.rows[r].moveup_button)),i.hide_move_buttons||(i.rows[r].movedown_button=this.getButton("","movedown","Move down"),i.rows[r].movedown_button.className+=" movedown",i.rows[r].movedown_button.setAttribute("data-i",r),i.rows[r].movedown_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var e=1*this.getAttribute("data-i"),s=i.getValue();if(!(e>=s.length-1)){var r=s[e+1];s[e+1]=s[e],s[e]=r,i.setValue(s),i.active_tab=i.rows[e+1].tab,i.refreshTabs(),i.onChange(!0)}}),n&&n.appendChild(i.rows[r].movedown_button)),t&&i.rows[r].setValue(t,e),i.refreshTabs()},addControls:function(){var t=this;this.collapsed=!1,this.toggle_button=this.getButton("","collapse","Collapse"),this.title_controls.appendChild(this.toggle_button);var e=t.row_holder.style.display,i=t.controls.style.display;this.toggle_button.addEventListener("click",function(s){s.preventDefault(),s.stopPropagation(),t.collapsed?(t.collapsed=!1,t.panel&&(t.panel.style.display=""),t.row_holder.style.display=e,t.tabs_holder&&(t.tabs_holder.style.display=""),t.controls.style.display=i,t.setButtonText(this,"","collapse","Collapse")):(t.collapsed=!0,t.row_holder.style.display="none",t.tabs_holder&&(t.tabs_holder.style.display="none"),t.controls.style.display="none",t.panel&&(t.panel.style.display="none"),t.setButtonText(this,"","expand","Expand"))}),this.options.collapsed&&r(this.toggle_button,"click"),this.schema.options&&"undefined"!=typeof this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none"),this.add_row_button=this.getButton(this.getItemTitle(),"add","Add "+this.getItemTitle()),this.add_row_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation();var i=t.rows.length;t.row_cache[i]?(t.rows[i]=t.row_cache[i],t.rows[i].setValue(t.rows[i].getDefault()),t.rows[i].container.style.display="",t.rows[i].tab&&(t.rows[i].tab.style.display=""),t.rows[i].register()):t.addRow(),t.active_tab=t.rows[i].tab,t.refreshTabs(),t.refreshValue(),t.onChange(!0)}),t.controls.appendChild(this.add_row_button),this.delete_last_row_button=this.getButton("Last "+this.getItemTitle(),"delete","Delete Last "+this.getItemTitle()),
+this.delete_last_row_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation();var i=t.getValue(),s=null;t.rows.length>1&&t.rows[t.rows.length-1].tab===t.active_tab&&(s=t.rows[t.rows.length-2].tab),i.pop(),t.setValue(i),s&&(t.active_tab=s,t.refreshTabs()),t.onChange(!0)}),t.controls.appendChild(this.delete_last_row_button),this.remove_all_rows_button=this.getButton("All","delete","Delete All"),this.remove_all_rows_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.setValue([]),t.onChange(!0)}),t.controls.appendChild(this.remove_all_rows_button),t.tabs&&(this.add_row_button.style.width="100%",this.add_row_button.style.textAlign="left",this.add_row_button.style.marginBottom="3px",this.delete_last_row_button.style.width="100%",this.delete_last_row_button.style.textAlign="left",this.delete_last_row_button.style.marginBottom="3px",this.remove_all_rows_button.style.width="100%",this.remove_all_rows_button.style.textAlign="left",this.remove_all_rows_button.style.marginBottom="3px")},showValidationErrors:function(t){var e=this,i=[],r=[];s(t,function(t,s){s.path===e.path?i.push(s):r.push(s)}),this.error_holder&&(i.length?(this.error_holder.innerHTML="",this.error_holder.style.display="",s(i,function(t,i){e.error_holder.appendChild(e.theme.getErrorMessage(i.message))})):this.error_holder.style.display="none"),s(this.rows,function(t,e){e.showValidationErrors(r)})}}),n.defaults.editors.table=n.defaults.editors.array.extend({register:function(){if(this._super(),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].register()},unregister:function(){if(this._super(),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].unregister()},getNumColumns:function(){return Math.max(Math.min(12,this.width),3)},preBuild:function(){var t=this.jsoneditor.expandRefs(this.schema.items||{});this.item_title=t.title||"row",this.item_default=t["default"]||null,this.item_has_child_editors=t.properties||t.items,this.width=12,this._super()},build:function(){var t=this;this.table=this.theme.getTable(),this.container.appendChild(this.table),this.thead=this.theme.getTableHead(),this.table.appendChild(this.thead),this.header_row=this.theme.getTableRow(),this.thead.appendChild(this.header_row),this.row_holder=this.theme.getTableBody(),this.table.appendChild(this.row_holder);var e=this.getElementEditor(0,!0);if(this.item_default=e.getDefault(),this.width=e.getNumColumns()+2,this.options.compact?(this.panel=document.createElement("div"),this.container.appendChild(this.panel)):(this.title=this.theme.getHeader(this.getTitle(),this.isRequired()),this.container.appendChild(this.title),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.schema.description),this.container.appendChild(this.description)),this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.error_holder=document.createElement("div"),this.panel.appendChild(this.error_holder)),this.panel.appendChild(this.table),this.controls=this.theme.getButtonHolder(),this.panel.appendChild(this.controls),this.item_has_child_editors)for(var i=e.getChildEditors(),s=e.property_order||Object.keys(i),r=0;r<s.length;r++){var n=t.theme.getTableHeaderCell(i[s[r]].getTitle());i[s[r]].options.hidden&&(n.style.display="none"),t.header_row.appendChild(n)}else t.header_row.appendChild(t.theme.getTableHeaderCell(this.item_title));e.destroy(),this.row_holder.innerHTML="",this.controls_header_cell=t.theme.getTableHeaderCell(" "),t.header_row.appendChild(this.controls_header_cell),this.addControls()},onChildEditorChange:function(t){this.refreshValue(),this._super()},getItemDefault:function(){return i({},{"default":this.item_default})["default"]},getItemTitle:function(){return this.item_title},getElementEditor:function(t,e){var s=i({},this.schema.items),r=this.jsoneditor.getEditorClass(s,this.jsoneditor),n=this.row_holder.appendChild(this.theme.getTableRow()),o=n;this.item_has_child_editors||(o=this.theme.getTableCell(),n.appendChild(o));var a=this.jsoneditor.createEditor(r,{jsoneditor:this.jsoneditor,schema:s,container:o,path:this.path+"."+t,parent:this,compact:!0,table_row:!0});return a.preBuild(),e||(a.build(),a.postBuild(),a.controls_cell=n.appendChild(this.theme.getTableCell()),a.row=n,a.table_controls=this.theme.getButtonHolder(),a.controls_cell.appendChild(a.table_controls),a.table_controls.style.margin=0,a.table_controls.style.padding=0),a},destroy:function(){this.innerHTML="",this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.row_holder&&this.row_holder.parentNode&&this.row_holder.parentNode.removeChild(this.row_holder),this.table&&this.table.parentNode&&this.table.parentNode.removeChild(this.table),this.panel&&this.panel.parentNode&&this.panel.parentNode.removeChild(this.panel),this.rows=this.title=this.description=this.row_holder=this.table=this.panel=null,this._super()},setValue:function(t,e){if(t=t||[],this.schema.minItems)for(;t.length<this.schema.minItems;)t.push(this.getItemDefault());this.schema.maxItems&&t.length>this.schema.maxItems&&(t=t.slice(0,this.schema.maxItems));var i=JSON.stringify(t);if(i!==this.serialized){var r=!1,n=this;s(t,function(t,e){n.rows[t]?n.rows[t].setValue(e):(n.addRow(e),r=!0)});for(var o=t.length;o<n.rows.length;o++){var a=n.rows[o].container;n.item_has_child_editors||n.rows[o].row.parentNode.removeChild(n.rows[o].row),n.rows[o].destroy(),a.parentNode&&a.parentNode.removeChild(a),n.rows[o]=null,r=!0}n.rows=n.rows.slice(0,t.length),n.refreshValue(),(r||e)&&n.refreshRowButtons(),n.onChange()}},refreshRowButtons:function(){var t=this,e=this.schema.minItems&&this.schema.minItems>=this.rows.length,i=!1;s(this.rows,function(s,r){r.movedown_button&&(s===t.rows.length-1?r.movedown_button.style.display="none":(i=!0,r.movedown_button.style.display="")),r.delete_button&&(e?r.delete_button.style.display="none":(i=!0,r.delete_button.style.display="")),r.moveup_button&&(i=!0)}),s(this.rows,function(t,e){i?e.controls_cell.style.display="":e.controls_cell.style.display="none"}),i?this.controls_header_cell.style.display="":this.controls_header_cell.style.display="none";var r=!1;this.value.length?1===this.value.length||this.hide_delete_buttons?(this.table.style.display="",this.remove_all_rows_button.style.display="none",e||this.hide_delete_buttons?this.delete_last_row_button.style.display="none":(this.delete_last_row_button.style.display="",r=!0)):(this.table.style.display="",e||this.hide_delete_buttons?(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none"):(this.delete_last_row_button.style.display="",this.remove_all_rows_button.style.display="",r=!0)):(this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none",this.table.style.display="none"),this.schema.maxItems&&this.schema.maxItems<=this.rows.length||this.hide_add_button?this.add_row_button.style.display="none":(this.add_row_button.style.display="",r=!0),r?this.controls.style.display="":this.controls.style.display="none"},refreshValue:function(){var t=this;this.value=[],s(this.rows,function(e,i){t.value[e]=i.getValue()}),this.serialized=JSON.stringify(this.value)},addRow:function(t){var e=this,i=this.rows.length;e.rows[i]=this.getElementEditor(i);var r=e.rows[i].table_controls;this.hide_delete_buttons||(e.rows[i].delete_button=this.getButton("","delete","Delete"),e.rows[i].delete_button.className+=" delete",e.rows[i].delete_button.setAttribute("data-i",i),e.rows[i].delete_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var i=1*this.getAttribute("data-i"),r=e.getValue(),n=[];s(r,function(t,e){t!==i&&n.push(e)}),e.setValue(n),e.onChange(!0)}),r.appendChild(e.rows[i].delete_button)),i&&!this.hide_move_buttons&&(e.rows[i].moveup_button=this.getButton("","moveup","Move up"),e.rows[i].moveup_button.className+=" moveup",e.rows[i].moveup_button.setAttribute("data-i",i),e.rows[i].moveup_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var i=1*this.getAttribute("data-i");if(!(0>=i)){var s=e.getValue(),r=s[i-1];s[i-1]=s[i],s[i]=r,e.setValue(s),e.onChange(!0)}}),r.appendChild(e.rows[i].moveup_button)),this.hide_move_buttons||(e.rows[i].movedown_button=this.getButton("","movedown","Move down"),e.rows[i].movedown_button.className+=" movedown",e.rows[i].movedown_button.setAttribute("data-i",i),e.rows[i].movedown_button.addEventListener("click",function(t){t.preventDefault(),t.stopPropagation();var i=1*this.getAttribute("data-i"),s=e.getValue();if(!(i>=s.length-1)){var r=s[i+1];s[i+1]=s[i],s[i]=r,e.setValue(s),e.onChange(!0)}}),r.appendChild(e.rows[i].movedown_button)),t&&e.rows[i].setValue(t)},addControls:function(){var t=this;this.collapsed=!1,this.toggle_button=this.getButton("","collapse","Collapse"),this.title_controls&&(this.title_controls.appendChild(this.toggle_button),this.toggle_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.collapsed?(t.collapsed=!1,t.panel.style.display="",t.setButtonText(this,"","collapse","Collapse")):(t.collapsed=!0,t.panel.style.display="none",t.setButtonText(this,"","expand","Expand"))}),this.options.collapsed&&r(this.toggle_button,"click"),this.schema.options&&"undefined"!=typeof this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none")),this.add_row_button=this.getButton(this.getItemTitle(),"add","Add "+this.getItemTitle()),this.add_row_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.addRow(),t.refreshValue(),t.refreshRowButtons(),t.onChange(!0)}),t.controls.appendChild(this.add_row_button),this.delete_last_row_button=this.getButton("Last "+this.getItemTitle(),"delete","Delete Last "+this.getItemTitle()),this.delete_last_row_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation();var i=t.getValue();i.pop(),t.setValue(i),t.onChange(!0)}),t.controls.appendChild(this.delete_last_row_button),this.remove_all_rows_button=this.getButton("All","delete","Delete All"),this.remove_all_rows_button.addEventListener("click",function(e){e.preventDefault(),e.stopPropagation(),t.setValue([]),t.onChange(!0)}),t.controls.appendChild(this.remove_all_rows_button)}}),n.defaults.editors.multiple=n.AbstractEditor.extend({register:function(){if(this.editors){for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister();this.editors[this.type]&&this.editors[this.type].register()}this._super()},unregister:function(){if(this._super(),this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister()},getNumColumns:function(){return this.editors[this.type]?Math.max(this.editors[this.type].getNumColumns(),4):4},enable:function(){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].enable();this.switcher.disabled=!1,this._super()},disable:function(){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].disable();this.switcher.disabled=!0,this._super()},switchEditor:function(t){var e=this;this.editors[t]||this.buildChildEditor(t),e.type=t,e.register();var i=e.getValue();s(e.editors,function(t,s){s&&(e.type===t?(e.keep_values&&s.setValue(i,!0),s.container.style.display=""):s.container.style.display="none")}),e.refreshValue(),e.refreshHeaderText()},buildChildEditor:function(t){var e=this,s=this.types[t],r=e.theme.getChildEditorHolder();e.editor_holder.appendChild(r);var n;"string"==typeof s?(n=i({},e.schema),n.type=s):(n=i({},e.schema,s),n=e.jsoneditor.expandRefs(n),s.required&&Array.isArray(s.required)&&e.schema.required&&Array.isArray(e.schema.required)&&(n.required=e.schema.required.concat(s.required)));var o=e.jsoneditor.getEditorClass(n);e.editors[t]=e.jsoneditor.createEditor(o,{jsoneditor:e.jsoneditor,schema:n,container:r,path:e.path,parent:e,required:!0}),e.editors[t].preBuild(),e.editors[t].build(),e.editors[t].postBuild(),e.editors[t].header&&(e.editors[t].header.style.display="none"),e.editors[t].option=e.switcher_options[t],r.addEventListener("change_header_text",function(){e.refreshHeaderText()}),t!==e.type&&(r.style.display="none")},preBuild:function(){if(this.types=[],this.type=0,this.editors=[],this.validators=[],this.keep_values=!0,"undefined"!=typeof this.jsoneditor.options.keep_oneof_values&&(this.keep_values=this.jsoneditor.options.keep_oneof_values),"undefined"!=typeof this.options.keep_oneof_values&&(this.keep_values=this.options.keep_oneof_values),this.schema.oneOf)this.oneOf=!0,this.types=this.schema.oneOf,s(this.types,function(t,e){}),delete this.schema.oneOf;else{if(this.schema.type&&"any"!==this.schema.type)Array.isArray(this.schema.type)?this.types=this.schema.type:this.types=[this.schema.type];else if(this.types=["string","number","integer","boolean","object","array","null"],this.schema.disallow){var t=this.schema.disallow;"object"==typeof t&&Array.isArray(t)||(t=[t]);var e=[];s(this.types,function(i,s){-1===t.indexOf(s)&&e.push(s)}),this.types=e}delete this.schema.type}this.display_text=this.getDisplayText(this.types)},build:function(){var t=this,e=this.container;this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.container.appendChild(this.header),this.switcher=this.theme.getSwitcher(this.display_text),e.appendChild(this.switcher),this.switcher.addEventListener("change",function(e){e.preventDefault(),e.stopPropagation(),t.switchEditor(t.display_text.indexOf(this.value)),t.onChange(!0)}),this.editor_holder=document.createElement("div"),e.appendChild(this.editor_holder),this.switcher_options=this.theme.getSwitcherOptions(this.switcher),s(this.types,function(e,s){t.editors[e]=!1;var r;"string"==typeof s?(r=i({},t.schema),r.type=s):(r=i({},t.schema,s),s.required&&Array.isArray(s.required)&&t.schema.required&&Array.isArray(t.schema.required)&&(r.required=t.schema.required.concat(s.required))),t.validators[e]=new n.Validator(t.jsoneditor,r)}),this.switchEditor(0)},onChildEditorChange:function(t){this.editors[this.type]&&(this.refreshValue(),this.refreshHeaderText()),this._super()},refreshHeaderText:function(){var t=this.getDisplayText(this.types);s(this.switcher_options,function(e,i){i.textContent=t[e]})},refreshValue:function(){this.value=this.editors[this.type].getValue()},setValue:function(t,e){var i=this;s(this.validators,function(e,s){return s.validate(t).length?void 0:(i.type=e,i.switcher.value=i.display_text[e],!1)}),this.switchEditor(this.type),this.editors[this.type].setValue(t,e),this.refreshValue(),i.onChange()},destroy:function(){s(this.editors,function(t,e){e&&e.destroy()}),this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),this._super()},showValidationErrors:function(t){var e=this;this.oneOf?s(this.editors,function(r,n){if(n){var o=e.path+".oneOf["+r+"]",a=[];s(t,function(t,s){if(s.path.substr(0,o.length)===o){var r=i({},s);r.path=e.path+r.path.substr(o.length),a.push(r)}}),n.showValidationErrors(a)}}):s(this.editors,function(e,i){i&&i.showValidationErrors(t)})}}),n.defaults.editors["enum"]=n.AbstractEditor.extend({getNumColumns:function(){return 4},build:function(){this.container,this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.container.appendChild(this.title),this.options.enum_titles=this.options.enum_titles||[],this["enum"]=this.schema["enum"],this.selected=0,this.select_options=[],this.html_values=[];for(var t=this,e=0;e<this["enum"].length;e++)this.select_options[e]=this.options.enum_titles[e]||"Value "+(e+1),this.html_values[e]=this.getHTML(this["enum"][e]);this.switcher=this.theme.getSwitcher(this.select_options),this.container.appendChild(this.switcher),this.display_area=this.theme.getIndentedPanel(),this.container.appendChild(this.display_area),this.options.hide_display&&(this.display_area.style.display="none"),this.switcher.addEventListener("change",function(){t.selected=t.select_options.indexOf(this.value),t.value=t["enum"][t.selected],t.refreshValue(),t.onChange(!0)}),this.value=this["enum"][0],this.refreshValue(),1===this["enum"].length&&(this.switcher.style.display="none")},refreshValue:function(){var t=this;t.selected=-1;var e=JSON.stringify(this.value);return s(this["enum"],function(i,s){return e===JSON.stringify(s)?(t.selected=i,!1):void 0}),t.selected<0?void t.setValue(t["enum"][0]):(this.switcher.value=this.select_options[this.selected],void(this.display_area.innerHTML=this.html_values[this.selected]))},enable:function(){this.always_disabled||(this.switcher.disabled=!1),this._super()},disable:function(){this.switcher.disabled=!0,this._super()},getHTML:function(t){var e=this;if(null===t)return"<em>null</em>";if("object"==typeof t){var i="";return s(t,function(s,r){var n=e.getHTML(r);Array.isArray(t)||(n="<div><em>"+s+"</em>: "+n+"</div>"),i+="<li>"+n+"</li>"}),i=Array.isArray(t)?"<ol>"+i+"</ol>":"<ul style='margin-top:0;margin-bottom:0;padding-top:0;padding-bottom:0;'>"+i+"</ul>"}return"boolean"==typeof t?t?"true":"false":"string"==typeof t?t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;"):t},setValue:function(t){this.value!==t&&(this.value=t,this.refreshValue(),this.onChange())},destroy:function(){this.display_area&&this.display_area.parentNode&&this.display_area.parentNode.removeChild(this.display_area),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),this._super()}}),n.defaults.editors.select=n.AbstractEditor.extend({setValue:function(t,e){t=this.typecast(t||"");var i=t;this.enum_values.indexOf(i)<0&&(i=this.enum_values[0]),this.value!==i&&(this.input.value=this.enum_options[this.enum_values.indexOf(i)],this.select2&&this.select2.select2("val",this.input.value),this.value=i,this.onChange())},register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},getNumColumns:function(){if(!this.enum_options)return 3;for(var t=this.getTitle().length,e=0;e<this.enum_options.length;e++)t=Math.max(t,this.enum_options[e].length+4);return Math.min(12,Math.max(t/7,2))},typecast:function(t){return"boolean"===this.schema.type?!!t:"number"===this.schema.type?1*t:"integer"===this.schema.type?Math.floor(1*t):""+t},getValue:function(){return this.value},preBuild:function(){var t=this;if(this.input_type="select",this.enum_options=[],this.enum_values=[],this.enum_display=[],this.schema["enum"]){var e=this.schema.options&&this.schema.options.enum_titles||[];s(this.schema["enum"],function(i,s){t.enum_options[i]=""+s,t.enum_display[i]=""+(e[i]||s),t.enum_values[i]=t.typecast(s)}),this.isRequired()||(t.enum_display.unshift(" "),t.enum_options.unshift("undefined"),t.enum_values.unshift(void 0))}else if("boolean"===this.schema.type)t.enum_display=this.schema.options&&this.schema.options.enum_titles||["true","false"],t.enum_options=["1",""],t.enum_values=[!0,!1],this.isRequired()||(t.enum_display.unshift(" "),t.enum_options.unshift("undefined"),t.enum_values.unshift(void 0));else{if(!this.schema.enumSource)throw"'select' editor requires the enum property to be set.";if(this.enumSource=[],this.enum_display=[],this.enum_options=[],this.enum_values=[],Array.isArray(this.schema.enumSource))for(a=0;a<this.schema.enumSource.length;a++)"string"==typeof this.schema.enumSource[a]?this.enumSource[a]={source:this.schema.enumSource[a]}:Array.isArray(this.schema.enumSource[a])?this.enumSource[a]=this.schema.enumSource[a]:this.enumSource[a]=i({},this.schema.enumSource[a]);else this.schema.enumValue?this.enumSource=[{source:this.schema.enumSource,value:this.schema.enumValue}]:this.enumSource=[{source:this.schema.enumSource}];for(a=0;a<this.enumSource.length;a++)this.enumSource[a].value&&(this.enumSource[a].value=this.jsoneditor.compileTemplate(this.enumSource[a].value,this.template_engine)),this.enumSource[a].title&&(this.enumSource[a].title=this.jsoneditor.compileTemplate(this.enumSource[a].title,this.template_engine)),this.enumSource[a].filter&&(this.enumSource[a].filter=this.jsoneditor.compileTemplate(this.enumSource[a].filter,this.template_engine))}},build:function(){var t=this;this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.compact&&(this.container.className+=" compact"),this.input=this.theme.getSelectInput(this.enum_options),this.theme.setSelectOptions(this.input,this.enum_options,this.enum_display),(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,this.input.disabled=!0),this.input.addEventListener("change",function(e){e.preventDefault(),e.stopPropagation(),t.onInputChange()}),this.control=this.theme.getFormControl(this.label,this.input,this.description),this.container.appendChild(this.control),this.value=this.enum_values[0]},onInputChange:function(){var t=this.input.value,e=t;-1===this.enum_options.indexOf(t)&&(e=this.enum_options[0]),this.value=this.enum_values[this.enum_options.indexOf(t)],this.onChange(!0)},setupSelect2:function(){if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2&&(this.enum_options.length>2||this.enum_options.length&&this.enumSource)){var t=i({},n.plugins.select2);this.schema.options&&this.schema.options.select2_options&&(t=i(t,this.schema.options.select2_options)),this.select2=window.jQuery(this.input).select2(t);var e=this;this.select2.on("select2-blur",function(){e.input.value=e.select2.select2("val"),e.onInputChange()})}else this.select2=null},postBuild:function(){this._super(),this.theme.afterInputReady(this.input),this.setupSelect2()},onWatchedFieldChange:function(){var t,e;if(this.enumSource){t=this.getWatchedFieldValues();for(var i=[],s=[],r=0;r<this.enumSource.length;r++)if(Array.isArray(this.enumSource[r]))i=i.concat(this.enumSource[r]),s=s.concat(this.enumSource[r]);else{var n=[];if(n=Array.isArray(this.enumSource[r].source)?this.enumSource[r].source:t[this.enumSource[r].source]){if(this.enumSource[r].slice&&(n=Array.prototype.slice.apply(n,this.enumSource[r].slice)),this.enumSource[r].filter){var o=[];for(e=0;e<n.length;e++)this.enumSource[r].filter({i:e,item:n[e],watched:t})&&o.push(n[e]);n=o}var a=[],h=[];for(e=0;e<n.length;e++){var l=n[e];this.enumSource[r].value?h[e]=this.enumSource[r].value({i:e,item:l}):h[e]=n[e],this.enumSource[r].title?a[e]=this.enumSource[r].title({i:e,item:l}):a[e]=h[e]}i=i.concat(h),s=s.concat(a)}}var d=this.value;this.theme.setSelectOptions(this.input,i,s),this.enum_options=i,this.enum_display=s,this.enum_values=i,this.select2&&this.select2.select2("destroy"),-1!==i.indexOf(d)?(this.input.value=d,this.value=d):(this.input.value=i[0],this.value=i[0]||"",this.parent?this.parent.onChildEditorChange(this):this.jsoneditor.onChange(),this.jsoneditor.notifyWatchers(this.path)),this.setupSelect2()}this._super()},enable:function(){this.always_disabled||(this.input.disabled=!1,this.select2&&this.select2.select2("enable",!0)),this._super()},disable:function(){this.input.disabled=!0,this.select2&&this.select2.select2("enable",!1),this._super()},destroy:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.select2&&(this.select2.select2("destroy"),this.select2=null),this._super()}}),n.defaults.editors.multiselect=n.AbstractEditor.extend({preBuild:function(){this._super(),this.select_options={},this.select_values={};var t=this.jsoneditor.expandRefs(this.schema.items||{}),e=t["enum"]||[];for(this.option_keys=[],a=0;a<e.length;a++)this.sanitize(e[a])===e[a]&&(this.option_keys.push(e[a]+""),this.select_values[e[a]+""]=e[a])},build:function(){var t,e=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),!this.schema.format&&this.option_keys.length<8||"checkbox"===this.schema.format){for(this.input_type="checkboxes",this.inputs={},this.controls={},t=0;t<this.option_keys.length;t++){this.inputs[this.option_keys[t]]=this.theme.getCheckbox(),this.select_options[this.option_keys[t]]=this.inputs[this.option_keys[t]];var i=this.theme.getCheckboxLabel(this.option_keys[t]);this.controls[this.option_keys[t]]=this.theme.getFormControl(i,this.inputs[this.option_keys[t]])}this.control=this.theme.getMultiCheckboxHolder(this.controls,this.label,this.description)}else{for(this.input_type="select",this.input=this.theme.getSelectInput(this.option_keys),this.input.multiple=!0,this.input.size=Math.min(10,this.option_keys.length),t=0;t<this.option_keys.length;t++)this.select_options[this.option_keys[t]]=this.input.children[t];(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,this.input.disabled=!0),this.control=this.theme.getFormControl(this.label,this.input,this.description)}this.container.appendChild(this.control),this.control.addEventListener("change",function(i){i.preventDefault(),i.stopPropagation();var s=[];for(t=0;t<e.option_keys.length;t++)(e.select_options[e.option_keys[t]].selected||e.select_options[e.option_keys[t]].checked)&&s.push(e.select_values[e.option_keys[t]]);e.updateValue(s),e.onChange(!0)})},setValue:function(t,e){var i;for(t=t||[],"object"!=typeof t?t=[t]:Array.isArray(t)||(t=[]),i=0;i<t.length;i++)"string"!=typeof t[i]&&(t[i]+="");for(i in this.select_options)this.select_options.hasOwnProperty(i)&&(this.select_options[i]["select"===this.input_type?"selected":"checked"]=-1!==t.indexOf(i));this.updateValue(t),this.onChange()},setupSelect2:function(){if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2){var t=window.jQuery.extend({},n.plugins.select2);this.schema.options&&this.schema.options.select2_options&&(t=i(t,this.schema.options.select2_options)),this.select2=window.jQuery(this.input).select2(t);var e=this;this.select2.on("select2-blur",function(){var t=e.select2.select2("val");e.value=t,e.onChange(!0)})}else this.select2=null},onInputChange:function(){this.value=this.input.value,this.onChange(!0)},postBuild:function(){this._super(),this.setupSelect2()},register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},getNumColumns:function(){var t=this.getTitle().length;for(var e in this.select_values)this.select_values.hasOwnProperty(e)&&(t=Math.max(t,(this.select_values[e]+"").length+4));return Math.min(12,Math.max(t/7,2))},updateValue:function(t){for(var e=!1,i=[],s=0;s<t.length;s++)if(this.select_options[t[s]+""]){var r=this.sanitize(this.select_values[t[s]]);i.push(r),r!==t[s]&&(e=!0)}else e=!0;return this.value=i,this.select2&&this.select2.select2("val",this.value),e},sanitize:function(t){return"number"===this.schema.items.type?1*t:"integer"===this.schema.items.type?Math.floor(1*t):""+t},enable:function(){if(!this.always_disabled){if(this.input)this.input.disabled=!1;else if(this.inputs)for(var t in this.inputs)this.inputs.hasOwnProperty(t)&&(this.inputs[t].disabled=!1);this.select2&&this.select2.select2("enable",!0)}this._super()},disable:function(){if(this.input)this.input.disabled=!0;else if(this.inputs)for(var t in this.inputs)this.inputs.hasOwnProperty(t)&&(this.inputs[t].disabled=!0);this.select2&&this.select2.select2("enable",!1),this._super()},destroy:function(){this.select2&&(this.select2.select2("destroy"),this.select2=null),this._super()}}),n.defaults.editors.base64=n.AbstractEditor.extend({getNumColumns:function(){return 4},build:function(){var t=this;if(this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if(!window.FileReader)throw"FileReader required for base64 editor";this.uploader=this.theme.getFormInputField("file"),this.uploader.addEventListener("change",function(e){if(e.preventDefault(),e.stopPropagation(),this.files&&this.files.length){var i=new FileReader;i.onload=function(e){t.value=e.target.result,t.refreshPreview(),t.onChange(!0),i=null},i.readAsDataURL(this.files[0])}})}this.preview=this.theme.getFormInputDescription(this.schema.description),this.container.appendChild(this.preview),this.control=this.theme.getFormControl(this.label,this.uploader||this.input,this.preview),this.container.appendChild(this.control)},refreshPreview:function(){if(this.last_preview!==this.value&&(this.last_preview=this.value,this.preview.innerHTML="",this.value)){var t=this.value.match(/^data:([^;,]+)[;,]/);if(t&&(t=t[1]),t){if(this.preview.innerHTML="<strong>Type:</strong> "+t+", <strong>Size:</strong> "+Math.floor((this.value.length-this.value.split(",")[0].length-1)/1.33333)+" bytes","image"===t.substr(0,5)){this.preview.innerHTML+="<br>";var e=document.createElement("img");e.style.maxWidth="100%",e.style.maxHeight="100px",e.src=this.value,this.preview.appendChild(e)}}else this.preview.innerHTML="<em>Invalid data URI</em>"}},enable:function(){this.uploader&&(this.uploader.disabled=!1),this._super()},disable:function(){this.uploader&&(this.uploader.disabled=!0),this._super()},setValue:function(t){this.value!==t&&(this.value=t,this.input.value=this.value,this.refreshPreview(),this.onChange())},destroy:function(){this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.uploader&&this.uploader.parentNode&&this.uploader.parentNode.removeChild(this.uploader),this._super()}}),n.defaults.editors.upload=n.AbstractEditor.extend({getNumColumns:function(){return 4},build:function(){var t=this;if(this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if(!this.jsoneditor.options.upload)throw"Upload handler required for upload editor";this.uploader=this.theme.getFormInputField("file"),this.uploader.addEventListener("change",function(e){if(e.preventDefault(),e.stopPropagation(),this.files&&this.files.length){var i=new FileReader;i.onload=function(e){t.preview_value=e.target.result,t.refreshPreview(),t.onChange(!0),i=null},i.readAsDataURL(this.files[0])}})}var e=this.schema.description;e||(e=""),this.preview=this.theme.getFormInputDescription(e),this.container.appendChild(this.preview),this.control=this.theme.getFormControl(this.label,this.uploader||this.input,this.preview),this.container.appendChild(this.control)},refreshPreview:function(){if(this.last_preview!==this.preview_value&&(this.last_preview=this.preview_value,this.preview.innerHTML="",this.preview_value)){var t=this,e=this.preview_value.match(/^data:([^;,]+)[;,]/);e&&(e=e[1]),e||(e="unknown");var i=this.uploader.files[0];if(this.preview.innerHTML="<strong>Type:</strong> "+e+", <strong>Size:</strong> "+i.size+" bytes","image"===e.substr(0,5)){this.preview.innerHTML+="<br>";var s=document.createElement("img");s.style.maxWidth="100%",s.style.maxHeight="100px",s.src=this.preview_value,
+this.preview.appendChild(s)}this.preview.innerHTML+="<br>";var r=this.getButton("Upload","upload","Upload");this.preview.appendChild(r),r.addEventListener("click",function(e){e.preventDefault(),r.setAttribute("disabled","disabled"),t.theme.removeInputError(t.uploader),t.theme.getProgressBar&&(t.progressBar=t.theme.getProgressBar(),t.preview.appendChild(t.progressBar)),t.jsoneditor.options.upload(t.path,i,{success:function(e){t.setValue(e),t.parent?t.parent.onChildEditorChange(t):t.jsoneditor.onChange(),t.progressBar&&t.preview.removeChild(t.progressBar),r.removeAttribute("disabled")},failure:function(e){t.theme.addInputError(t.uploader,e),t.progressBar&&t.preview.removeChild(t.progressBar),r.removeAttribute("disabled")},updateProgress:function(e){t.progressBar&&(e?t.theme.updateProgressBar(t.progressBar,e):t.theme.updateProgressBarUnknown(t.progressBar))}})})}},enable:function(){this.uploader&&(this.uploader.disabled=!1),this._super()},disable:function(){this.uploader&&(this.uploader.disabled=!0),this._super()},setValue:function(t){this.value!==t&&(this.value=t,this.input.value=this.value,this.onChange())},destroy:function(){this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.uploader&&this.uploader.parentNode&&this.uploader.parentNode.removeChild(this.uploader),this._super()}}),n.defaults.editors.checkbox=n.AbstractEditor.extend({setValue:function(t,e){this.value=!!t,this.input.checked=this.value,this.onChange()},register:function(){this._super(),this.input&&this.input.setAttribute("name",this.formname)},unregister:function(){this._super(),this.input&&this.input.removeAttribute("name")},getNumColumns:function(){return Math.min(12,Math.max(this.getTitle().length/7,2))},build:function(){var t=this;this.options.compact||(this.label=this.header=this.theme.getCheckboxLabel(this.getTitle())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.schema.description)),this.options.compact&&(this.container.className+=" compact"),this.input=this.theme.getCheckbox(),this.control=this.theme.getFormControl(this.label,this.input,this.description),(this.schema.readOnly||this.schema.readonly)&&(this.always_disabled=!0,this.input.disabled=!0),this.input.addEventListener("change",function(e){e.preventDefault(),e.stopPropagation(),t.value=this.checked,t.onChange(!0)}),this.container.appendChild(this.control)},enable:function(){this.always_disabled||(this.input.disabled=!1),this._super()},disable:function(){this.input.disabled=!0,this._super()},destroy:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this._super()}});var o=function(){var t=document.documentElement;return t.matches?"matches":t.webkitMatchesSelector?"webkitMatchesSelector":t.mozMatchesSelector?"mozMatchesSelector":t.msMatchesSelector?"msMatchesSelector":t.oMatchesSelector?"oMatchesSelector":void 0}();n.AbstractTheme=t.extend({getContainer:function(){return document.createElement("div")},getFloatRightLinkHolder:function(){var t=document.createElement("div");return t.style=t.style||{},t.style.cssFloat="right",t.style.marginLeft="10px",t},getModal:function(){var t=document.createElement("div");return t.style.backgroundColor="white",t.style.border="1px solid black",t.style.boxShadow="3px 3px black",t.style.position="absolute",t.style.zIndex="10",t.style.display="none",t},getGridContainer:function(){var t=document.createElement("div");return t},getGridRow:function(){var t=document.createElement("div");return t.className="row",t},getGridColumn:function(){var t=document.createElement("div");return t},setGridColumnSize:function(t,e){},getLink:function(t){var e=document.createElement("a");return e.setAttribute("href","#"),e.appendChild(document.createTextNode(t)),e},disableHeader:function(t){t.style.color="#ccc"},disableLabel:function(t){t.style.color="#ccc"},enableHeader:function(t){t.style.color=""},enableLabel:function(t){t.style.color=""},getFormInputLabel:function(t){var e=document.createElement("label");return e.appendChild(document.createTextNode(t)),e},getCheckboxLabel:function(t){var e=this.getFormInputLabel(t);return e.style.fontWeight="normal",e},getHeader:function(t,e){var i=document.createElement("h3");return"string"==typeof t?i.textContent=t:i.appendChild(t),e&&(i.className+=" required"),i},getCheckbox:function(){var t=this.getFormInputField("checkbox");return t.style.display="inline-block",t.style.width="auto",t},getMultiCheckboxHolder:function(t,e,i){var s=document.createElement("div");e&&(e.style.display="block",s.appendChild(e));for(var r in t)t.hasOwnProperty(r)&&(t[r].style.display="inline-block",t[r].style.marginRight="20px",s.appendChild(t[r]));return i&&s.appendChild(i),s},getSelectInput:function(t){var e=document.createElement("select");return t&&this.setSelectOptions(e,t),e},getSwitcher:function(t){var e=this.getSelectInput(t);return e.style.backgroundColor="transparent",e.style.display="inline-block",e.style.fontStyle="italic",e.style.fontWeight="normal",e.style.height="auto",e.style.marginBottom=0,e.style.marginLeft="5px",e.style.padding="0 0 0 3px",e.style.width="auto",e},getSwitcherOptions:function(t){return t.getElementsByTagName("option")},setSwitcherOptions:function(t,e,i){this.setSelectOptions(t,e,i)},setSelectOptions:function(t,e,i){i=i||[],t.innerHTML="";for(var s=0;s<e.length;s++){var r=document.createElement("option");r.setAttribute("value",e[s]),r.textContent=i[s]||e[s],t.appendChild(r)}},getTextareaInput:function(){var t=document.createElement("textarea");return t.style=t.style||{},t.style.width="100%",t.style.height="300px",t.style.boxSizing="border-box",t},getRangeInput:function(t,e,i){var s=this.getFormInputField("range");return s.setAttribute("min",t),s.setAttribute("max",e),s.setAttribute("step",i),s},getFormInputField:function(t){var e=document.createElement("input");return e.setAttribute("type",t),e},afterInputReady:function(t){},getFormControl:function(t,e,i){var s=document.createElement("div");return s.className="form-control",t&&s.appendChild(t),"checkbox"===e.type?t.insertBefore(e,t.firstChild):s.appendChild(e),i&&s.appendChild(i),s},getIndentedPanel:function(){var t=document.createElement("div");return t.style=t.style||{},t.style.paddingLeft="10px",t.style.marginLeft="10px",t.style.borderLeft="1px solid #ccc",t},getChildEditorHolder:function(){return document.createElement("div")},getDescription:function(t){var e=document.createElement("p");return e.innerHTML=t,e},getCheckboxDescription:function(t){return this.getDescription(t)},getFormInputDescription:function(t){return this.getDescription(t)},getHeaderButtonHolder:function(){return this.getButtonHolder()},getButtonHolder:function(){return document.createElement("div")},getButton:function(t,e,i){var s=document.createElement("button");return s.type="button",this.setButtonText(s,t,e,i),s},setButtonText:function(t,e,i,s){t.innerHTML="",i&&(t.appendChild(i),t.innerHTML+=" "),t.appendChild(document.createTextNode(e)),s&&t.setAttribute("title",s)},getTable:function(){return document.createElement("table")},getTableRow:function(){return document.createElement("tr")},getTableHead:function(){return document.createElement("thead")},getTableBody:function(){return document.createElement("tbody")},getTableHeaderCell:function(t){var e=document.createElement("th");return e.textContent=t,e},getTableCell:function(){var t=document.createElement("td");return t},getErrorMessage:function(t){var e=document.createElement("p");return e.style=e.style||{},e.style.color="red",e.appendChild(document.createTextNode(t)),e},addInputError:function(t,e){},removeInputError:function(t){},addTableRowError:function(t){},removeTableRowError:function(t){},getTabHolder:function(){var t=document.createElement("div");return t.innerHTML="<div style='float: left; width: 130px;' class='tabs'></div><div class='content' style='margin-left: 130px;'></div><div style='clear:both;'></div>",t},applyStyles:function(t,e){t.style=t.style||{};for(var i in e)e.hasOwnProperty(i)&&(t.style[i]=e[i])},closest:function(t,e){for(;t&&t!==document;){if(!o)return!1;if(t[o](e))return t;t=t.parentNode}return!1},getTab:function(t){var e=document.createElement("div");return e.appendChild(t),e.style=e.style||{},this.applyStyles(e,{border:"1px solid #ccc",borderWidth:"1px 0 1px 1px",textAlign:"center",lineHeight:"30px",borderRadius:"5px",borderBottomRightRadius:0,borderTopRightRadius:0,fontWeight:"bold",cursor:"pointer"}),e},getTabContentHolder:function(t){return t.children[1]},getTabContent:function(){return this.getIndentedPanel()},markTabActive:function(t){this.applyStyles(t,{opacity:1,background:"white"})},markTabInactive:function(t){this.applyStyles(t,{opacity:.5,background:""})},addTab:function(t,e){t.children[0].appendChild(e)},getBlockLink:function(){var t=document.createElement("a");return t.style.display="block",t},getBlockLinkHolder:function(){var t=document.createElement("div");return t},getLinksHolder:function(){var t=document.createElement("div");return t},createMediaLink:function(t,e,i){t.appendChild(e),i.style.width="100%",t.appendChild(i)},createImageLink:function(t,e,i){t.appendChild(e),e.appendChild(i)}}),n.defaults.themes.bootstrap2=n.AbstractTheme.extend({getRangeInput:function(t,e,i){return this._super(t,e,i)},getGridContainer:function(){var t=document.createElement("div");return t.className="container-fluid",t},getGridRow:function(){var t=document.createElement("div");return t.className="row-fluid",t},getFormInputLabel:function(t,e){var i=this._super(t);return i.style.display="inline-block",i.style.fontWeight="bold",e&&(i.className+=" required"),i},setGridColumnSize:function(t,e){t.className="span"+e},getSelectInput:function(t){var e=this._super(t);return e.style.width="auto",e.style.maxWidth="98%",e},getFormInputField:function(t){var e=this._super(t);return e.style.width="98%",e},afterInputReady:function(t){t.controlgroup||(t.controlgroup=this.closest(t,".control-group"),t.controls=this.closest(t,".controls"),this.closest(t,".compact")&&(t.controlgroup.className=t.controlgroup.className.replace(/control-group/g,"").replace(/[ ]{2,}/g," "),t.controls.className=t.controlgroup.className.replace(/controls/g,"").replace(/[ ]{2,}/g," "),t.style.marginBottom=0))},getIndentedPanel:function(){var t=document.createElement("div");return t.className="well well-small",t},getFormInputDescription:function(t){var e=document.createElement("p");return e.className="help-inline",e.textContent=t,e},getFormControl:function(t,e,i){var s=document.createElement("div");s.className="control-group";var r=document.createElement("div");return r.className="controls",t&&"checkbox"===e.getAttribute("type")?(s.appendChild(r),t.className+=" checkbox",t.appendChild(e),r.appendChild(t),r.style.height="30px"):(t&&(t.className+=" control-label",s.appendChild(t)),r.appendChild(e),s.appendChild(r)),i&&r.appendChild(i),s},getHeaderButtonHolder:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t},getButtonHolder:function(){var t=document.createElement("div");return t.className="btn-group",t},getButton:function(t,e,i){var s=this._super(t,e,i);return s.className+=" btn btn-default",s},getTable:function(){var t=document.createElement("table");return t.className="table table-bordered",t.style.width="auto",t.style.maxWidth="none",t},addInputError:function(t,e){t.controlgroup&&t.controls&&(t.controlgroup.className+=" error",t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("p"),t.errmsg.className="help-block errormsg",t.controls.appendChild(t.errmsg)),t.errmsg.textContent=e)},removeInputError:function(t){t.errmsg&&(t.errmsg.style.display="none",t.controlgroup.className=t.controlgroup.className.replace(/\s?error/g,""))},getTabHolder:function(){var t=document.createElement("div");return t.className="tabbable tabs-left",t.innerHTML="<ul class='nav nav-tabs span2' style='margin-right: 0;'></ul><div class='tab-content span10' style='overflow:visible;'></div>",t},getTab:function(t){var e=document.createElement("li"),i=document.createElement("a");return i.setAttribute("href","#"),i.appendChild(t),e.appendChild(i),e},getTabContentHolder:function(t){return t.children[1]},getTabContent:function(){var t=document.createElement("div");return t.className="tab-pane active",t},markTabActive:function(t){t.className+=" active"},markTabInactive:function(t){t.className=t.className.replace(/\s?active/g,"")},addTab:function(t,e){t.children[0].appendChild(e)},getProgressBar:function(){var t=document.createElement("div");t.className="progress";var e=document.createElement("div");return e.className="bar",e.style.width="0%",t.appendChild(e),t},updateProgressBar:function(t,e){t&&(t.firstChild.style.width=e+"%")},updateProgressBarUnknown:function(t){t&&(t.className="progress progress-striped active",t.firstChild.style.width="100%")}}),n.defaults.themes.bootstrap3=n.AbstractTheme.extend({getSelectInput:function(t){var e=this._super(t);return e.className+="form-control",e},setGridColumnSize:function(t,e){t.className="col-md-"+e},afterInputReady:function(t){t.controlgroup||(t.controlgroup=this.closest(t,".form-group"),this.closest(t,".compact")&&(t.controlgroup.style.marginBottom=0))},getTextareaInput:function(){var t=document.createElement("textarea");return t.className="form-control",t},getRangeInput:function(t,e,i){return this._super(t,e,i)},getFormInputField:function(t){var e=this._super(t);return"checkbox"!==t&&(e.className+="form-control"),e},getFormControl:function(t,e,i){var s=document.createElement("div");return t&&"checkbox"===e.type?(s.className+=" checkbox",t.appendChild(e),t.style.fontSize="14px",s.style.marginTop="0",s.appendChild(t),e.style.position="relative",e.style.cssFloat="left"):(s.className+=" form-group",t&&(t.className+=" control-label",s.appendChild(t)),s.appendChild(e)),i&&s.appendChild(i),s},getIndentedPanel:function(){var t=document.createElement("div");return t.className="well well-sm",t},getFormInputDescription:function(t){var e=document.createElement("p");return e.className="help-block",e.innerHTML=t,e},getHeaderButtonHolder:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t},getButtonHolder:function(){var t=document.createElement("div");return t.className="btn-group",t},getButton:function(t,e,i){var s=this._super(t,e,i);return s.className+="btn btn-default",s},getTable:function(){var t=document.createElement("table");return t.className="table table-bordered",t.style.width="auto",t.style.maxWidth="none",t},addInputError:function(t,e){t.controlgroup&&(t.controlgroup.className+=" has-error",t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("p"),t.errmsg.className="help-block errormsg",t.controlgroup.appendChild(t.errmsg)),t.errmsg.textContent=e)},removeInputError:function(t){t.errmsg&&(t.errmsg.style.display="none",t.controlgroup.className=t.controlgroup.className.replace(/\s?has-error/g,""))},getTabHolder:function(){var t=document.createElement("div");return t.innerHTML="<div class='tabs list-group col-md-2'></div><div class='col-md-10'></div>",t.className="rows",t},getTab:function(t){var e=document.createElement("a");return e.className="list-group-item",e.setAttribute("href","#"),e.appendChild(t),e},markTabActive:function(t){t.className+=" active"},markTabInactive:function(t){t.className=t.className.replace(/\s?active/g,"")},getProgressBar:function(){var t=0,e=100,i=0,s=document.createElement("div");s.className="progress";var r=document.createElement("div");return r.className="progress-bar",r.setAttribute("role","progressbar"),r.setAttribute("aria-valuenow",i),r.setAttribute("aria-valuemin",t),r.setAttribute("aria-valuenax",e),r.innerHTML=i+"%",s.appendChild(r),s},updateProgressBar:function(t,e){if(t){var i=t.firstChild,s=e+"%";i.setAttribute("aria-valuenow",e),i.style.width=s,i.innerHTML=s}},updateProgressBarUnknown:function(t){if(t){var e=t.firstChild;t.className="progress progress-striped active",e.removeAttribute("aria-valuenow"),e.style.width="100%",e.innerHTML=""}}}),n.defaults.themes.foundation=n.AbstractTheme.extend({getChildEditorHolder:function(){var t=document.createElement("div");return t.style.marginBottom="15px",t},getSelectInput:function(t){var e=this._super(t);return e.style.minWidth="none",e.style.padding="5px",e.style.marginTop="3px",e},getSwitcher:function(t){var e=this._super(t);return e.style.paddingRight="8px",e},afterInputReady:function(t){this.closest(t,".compact")&&(t.style.marginBottom=0),t.group=this.closest(t,".form-control")},getFormInputLabel:function(t,e){var i=this._super(t);return i.style.display="inline-block",e&&(i.className+=" required"),i},getFormInputField:function(t){var e=this._super(t);return e.style.width="100%",e.style.marginBottom="checkbox"===t?"0":"12px",e},getFormInputDescription:function(t){var e=document.createElement("p");return e.textContent=t,e.style.marginTop="-10px",e.style.fontStyle="italic",e},getIndentedPanel:function(){var t=document.createElement("div");return t.className="panel",t},getHeaderButtonHolder:function(){var t=this.getButtonHolder();return t.style.display="inline-block",t.style.marginLeft="10px",t.style.verticalAlign="middle",t},getButtonHolder:function(){var t=document.createElement("div");return t.className="button-group",t},getButton:function(t,e,i){var s=this._super(t,e,i);return s.className+=" small button",s},addInputError:function(t,e){t.group&&(t.group.className+=" error",t.errmsg?t.errmsg.style.display="":(t.insertAdjacentHTML("afterend",'<small class="error"></small>'),t.errmsg=t.parentNode.getElementsByClassName("error")[0]),t.errmsg.textContent=e)},removeInputError:function(t){t.errmsg&&(t.group.className=t.group.className.replace(/ error/g,""),t.errmsg.style.display="none")},getProgressBar:function(){var t=document.createElement("div");t.className="progress";var e=document.createElement("span");return e.className="meter",e.style.width="0%",t.appendChild(e),t},updateProgressBar:function(t,e){t&&(t.firstChild.style.width=e+"%")},updateProgressBarUnknown:function(t){t&&(t.firstChild.style.width="100%")}}),n.defaults.themes.foundation3=n.defaults.themes.foundation.extend({getHeaderButtonHolder:function(){var t=this._super();return t.style.fontSize=".6em",t},getFormInputLabel:function(t,e){var i=this._super(t);return i.style.fontWeight="bold",e&&(i.className+=" required"),i},getTabHolder:function(){var t=document.createElement("div");return t.className="row",t.innerHTML="<dl class='tabs vertical two columns'></dl><div class='tabs-content ten columns'></div>",t},setGridColumnSize:function(t,e){var i=["zero","one","two","three","four","five","six","seven","eight","nine","ten","eleven","twelve"];t.className="columns "+i[e]},getTab:function(t){var e=document.createElement("dd"),i=document.createElement("a");return i.setAttribute("href","#"),i.appendChild(t),e.appendChild(i),e},getTabContentHolder:function(t){return t.children[1]},getTabContent:function(){var t=document.createElement("div");return t.className="content active",t.style.paddingLeft="5px",t},markTabActive:function(t){t.className+=" active"},markTabInactive:function(t){t.className=t.className.replace(/\s*active/g,"")},addTab:function(t,e){t.children[0].appendChild(e)}}),n.defaults.themes.foundation4=n.defaults.themes.foundation.extend({getHeaderButtonHolder:function(){var t=this._super();return t.style.fontSize=".6em",t},setGridColumnSize:function(t,e){t.className="columns large-"+e},getFormInputDescription:function(t){var e=this._super(t);return e.style.fontSize=".8rem",e},getFormInputLabel:function(t,e){var i=this._super(t);return i.style.fontWeight="bold",e&&(i.className+=" required"),i}}),n.defaults.themes.foundation5=n.defaults.themes.foundation.extend({getFormInputDescription:function(t){var e=this._super(t);return e.style.fontSize=".8rem",e},setGridColumnSize:function(t,e){t.className="columns medium-"+e},getButton:function(t,e,i){var s=this._super(t,e,i);return s.className=s.className.replace(/\s*small/g,"")+" tiny",s},getTabHolder:function(){var t=document.createElement("div");return t.innerHTML="<dl class='tabs vertical'></dl><div class='tabs-content vertical'></div>",t},getTab:function(t){var e=document.createElement("dd"),i=document.createElement("a");return i.setAttribute("href","#"),i.appendChild(t),e.appendChild(i),e},getTabContentHolder:function(t){return t.children[1]},getTabContent:function(){var t=document.createElement("div");return t.className="content active",t.style.paddingLeft="5px",t},markTabActive:function(t){t.className+=" active"},markTabInactive:function(t){t.className=t.className.replace(/\s*active/g,"")},addTab:function(t,e){t.children[0].appendChild(e)}}),n.defaults.themes.html=n.AbstractTheme.extend({getFormInputLabel:function(t,e){var i=this._super(t);return i.style.display="block",i.style.marginBottom="3px",i.style.fontWeight="bold",e&&(i.className+=" required"),i},getFormInputDescription:function(t){var e=this._super(t);return e.style.fontSize=".8em",e.style.margin=0,e.style.display="inline-block",e.style.fontStyle="italic",e},getIndentedPanel:function(){var t=this._super();return t.style.border="1px solid #ddd",t.style.padding="5px",t.style.margin="5px",t.style.borderRadius="3px",t},getChildEditorHolder:function(){var t=this._super();return t.style.marginBottom="8px",t},getHeaderButtonHolder:function(){var t=this.getButtonHolder();return t.style.display="inline-block",t.style.marginLeft="10px",t.style.fontSize=".8em",t.style.verticalAlign="middle",t},getTable:function(){var t=this._super();return t.style.borderBottom="1px solid #ccc",t.style.marginBottom="5px",t},addInputError:function(t,e){if(t.style.borderColor="red",t.errmsg)t.errmsg.style.display="block";else{var i=this.closest(t,".form-control");t.errmsg=document.createElement("div"),t.errmsg.setAttribute("class","errmsg"),t.errmsg.style=t.errmsg.style||{},t.errmsg.style.color="red",i.appendChild(t.errmsg)}t.errmsg.innerHTML="",t.errmsg.appendChild(document.createTextNode(e))},removeInputError:function(t){t.style.borderColor="",t.errmsg&&(t.errmsg.style.display="none")},getProgressBar:function(){var t=100,e=0,i=document.createElement("progress");return i.setAttribute("max",t),i.setAttribute("value",e),i},updateProgressBar:function(t,e){t&&t.setAttribute("value",e)},updateProgressBarUnknown:function(t){t&&t.removeAttribute("value")}}),n.defaults.themes.jqueryui=n.AbstractTheme.extend({getTable:function(){var t=this._super();return t.setAttribute("cellpadding",5),t.setAttribute("cellspacing",0),t},getTableHeaderCell:function(t){var e=this._super(t);return e.className="ui-state-active",e.style.fontWeight="bold",e},getTableCell:function(){var t=this._super();return t.className="ui-widget-content",t},getHeaderButtonHolder:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t.style.fontSize=".6em",t.style.display="inline-block",t},getFormInputDescription:function(t){var e=this.getDescription(t);return e.style.marginLeft="10px",e.style.display="inline-block",e},getFormControl:function(t,e,i){var s=this._super(t,e,i);return"checkbox"===e.type?(s.style.lineHeight="25px",s.style.padding="3px 0"):s.style.padding="4px 0 8px 0",s},getDescription:function(t){var e=document.createElement("span");return e.style.fontSize=".8em",e.style.fontStyle="italic",e.textContent=t,e},getButtonHolder:function(){var t=document.createElement("div");return t.className="ui-buttonset",t.style.fontSize=".7em",t},getFormInputLabel:function(t,e){var i=document.createElement("label");return i.style.fontWeight="bold",i.style.display="block",e&&(i.className+=" required"),i.textContent=t,i},getButton:function(t,e,i){var s=document.createElement("button");s.className="ui-button ui-widget ui-state-default ui-corner-all",e&&!t?(s.className+=" ui-button-icon-only",e.className+=" ui-button-icon-primary ui-icon-primary",s.appendChild(e)):e?(s.className+=" ui-button-text-icon-primary",e.className+=" ui-button-icon-primary ui-icon-primary",s.appendChild(e)):s.className+=" ui-button-text-only";var r=document.createElement("span");return r.className="ui-button-text",r.textContent=t||i||".",s.appendChild(r),s.setAttribute("title",i),s},setButtonText:function(t,e,i,s){t.innerHTML="",t.className="ui-button ui-widget ui-state-default ui-corner-all",i&&!e?(t.className+=" ui-button-icon-only",i.className+=" ui-button-icon-primary ui-icon-primary",t.appendChild(i)):i?(t.className+=" ui-button-text-icon-primary",i.className+=" ui-button-icon-primary ui-icon-primary",t.appendChild(i)):t.className+=" ui-button-text-only";var r=document.createElement("span");r.className="ui-button-text",r.textContent=e||s||".",t.appendChild(r),t.setAttribute("title",s)},getIndentedPanel:function(){var t=document.createElement("div");return t.className="ui-widget-content ui-corner-all",t.style.padding="1em 1.4em",t.style.marginBottom="20px",t},afterInputReady:function(t){t.controls||(t.controls=this.closest(t,".form-control"))},addInputError:function(t,e){t.controls&&(t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("div"),t.errmsg.className="ui-state-error",t.controls.appendChild(t.errmsg)),t.errmsg.textContent=e)},removeInputError:function(t){t.errmsg&&(t.errmsg.style.display="none")},markTabActive:function(t){t.className=t.className.replace(/\s*ui-widget-header/g,"")+" ui-state-active"},markTabInactive:function(t){t.className=t.className.replace(/\s*ui-state-active/g,"")+" ui-widget-header"}}),n.AbstractIconLib=t.extend({mapping:{collapse:"",expand:"","delete":"",edit:"",add:"",cancel:"",save:"",moveup:"",movedown:""},icon_prefix:"",getIconClass:function(t){return this.mapping[t]?this.icon_prefix+this.mapping[t]:null},getIcon:function(t){var e=this.getIconClass(t);if(!e)return null;var i=document.createElement("i");return i.className=e,i}}),n.defaults.iconlibs.bootstrap2=n.AbstractIconLib.extend({mapping:{collapse:"chevron-down",expand:"chevron-up","delete":"trash",edit:"pencil",add:"plus",cancel:"ban-circle",save:"ok",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"icon-"}),n.defaults.iconlibs.bootstrap3=n.AbstractIconLib.extend({mapping:{collapse:"chevron-down",expand:"chevron-right","delete":"remove",edit:"pencil",add:"plus",cancel:"floppy-remove",save:"floppy-saved",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"glyphicon glyphicon-"}),n.defaults.iconlibs.fontawesome3=n.AbstractIconLib.extend({mapping:{collapse:"chevron-down",expand:"chevron-right","delete":"remove",edit:"pencil",add:"plus",cancel:"ban-circle",save:"save",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"icon-"}),n.defaults.iconlibs.fontawesome4=n.AbstractIconLib.extend({mapping:{collapse:"caret-square-o-down",expand:"caret-square-o-right","delete":"times",edit:"pencil",add:"plus",cancel:"ban",save:"save",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"fa fa-"}),n.defaults.iconlibs.foundation2=n.AbstractIconLib.extend({mapping:{collapse:"minus",expand:"plus","delete":"remove",edit:"edit",add:"add-doc",cancel:"error",save:"checkmark",moveup:"up-arrow",movedown:"down-arrow"},icon_prefix:"foundicon-"}),n.defaults.iconlibs.foundation3=n.AbstractIconLib.extend({mapping:{collapse:"minus",expand:"plus","delete":"x",edit:"pencil",add:"page-add",cancel:"x-circle",save:"save",moveup:"arrow-up",movedown:"arrow-down"},icon_prefix:"fi-"}),n.defaults.iconlibs.jqueryui=n.AbstractIconLib.extend({mapping:{collapse:"triangle-1-s",expand:"triangle-1-e","delete":"trash",edit:"pencil",add:"plusthick",cancel:"closethick",save:"disk",moveup:"arrowthick-1-n",movedown:"arrowthick-1-s"},icon_prefix:"ui-icon ui-icon-"}),n.defaults.templates["default"]=function(){return{compile:function(t){var e=t.match(/{{\s*([a-zA-Z0-9\-_ \.]+)\s*}}/g),i=e&&e.length;if(!i)return function(){return t};for(var s=[],r=function(t){var i,r=e[t].replace(/[{}]+/g,"").trim().split("."),n=r.length;if(n>1){var o;i=function(e){for(o=e,t=0;n>t&&(o=o[r[t]]);t++);return o}}else r=r[0],i=function(t){return t[r]};s.push({s:e[t],r:i})},n=0;i>n;n++)r(n);return function(e){var r,o=t+"";for(n=0;i>n;n++)r=s[n],o=o.replace(r.s,r.r(e));return o}}}},n.defaults.templates.ejs=function(){return!!window.EJS&&{compile:function(t){var e=new window.EJS({text:t});return function(t){return e.render(t)}}}},n.defaults.templates.handlebars=function(){return window.Handlebars},n.defaults.templates.hogan=function(){return!!window.Hogan&&{compile:function(t){var e=window.Hogan.compile(t);return function(t){return e.render(t)}}}},n.defaults.templates.markup=function(){return!(!window.Mark||!window.Mark.up)&&{compile:function(t){return function(e){return window.Mark.up(t,e)}}}},n.defaults.templates.mustache=function(){return!!window.Mustache&&{compile:function(t){return function(e){return window.Mustache.render(t,e)}}}},n.defaults.templates.swig=function(){return window.swig},n.defaults.templates.underscore=function(){return!!window._&&{compile:function(t){return function(e){return window._.template(t,e)}}}},n.defaults.theme="html",n.defaults.template="default",n.defaults.options={},n.defaults.translate=function(t,e){var i=n.defaults.languages[n.defaults.language];if(!i)throw"Unknown language "+n.defaults.language;var s=i[t]||n.defaults.languages[n.defaults.default_language][t];if("undefined"==typeof s)throw"Unknown translate string "+t;if(e)for(var r=0;r<e.length;r++)s=s.replace(new RegExp("\\{\\{"+r+"}}","g"),e[r]);return s},n.defaults.default_language="en",n.defaults.language=n.defaults.default_language,n.defaults.languages.en={error_notset:"Property must be set",error_notempty:"Value required",error_enum:"Value must be one of the enumerated values",error_anyOf:"Value must validate against at least one of the provided schemas",error_oneOf:"Value must validate against exactly one of the provided schemas. It currently validates against {{0}} of the schemas.",error_not:"Value must not validate against the provided schema",error_type_union:"Value must be one of the provided types",error_type:"Value must be of type {{0}}",error_disallow_union:"Value must not be one of the provided disallowed types",error_disallow:"Value must not be of type {{0}}",error_multipleOf:"Value must be a multiple of {{0}}",error_maximum_excl:"Value must be less than {{0}}",error_maximum_incl:"Value must at most {{0}}",error_minimum_excl:"Value must be greater than {{0}}",error_minimum_incl:"Value must be at least {{0}}",error_maxLength:"Value must be at most {{0}} characters long",error_minLength:"Value must be at least {{0}} characters long",error_pattern:"Value must match the provided pattern",error_additionalItems:"No additional items allowed in this array",error_maxItems:"Value must have at most {{0}} items",error_minItems:"Value must have at least {{0}} items",error_uniqueItems:"Array must have unique items",error_maxProperties:"Object must have at most {{0}} properties",error_minProperties:"Object must have at least {{0}} properties",error_required:"Object is missing the required property '{{0}}'",error_additional_properties:"No additional properties allowed, but property {{0}} is set",error_dependency:"Must have property {{0}}"},n.plugins={ace:{theme:""},epiceditor:{},sceditor:{},select2:{}};for(var a in n.defaults.editors)n.defaults.editors.hasOwnProperty(a)&&(n.defaults.editors[a].options=n.defaults.editors.options||{});n.defaults.resolvers.unshift(function(t){return"string"!=typeof t.type?"multiple":void 0}),n.defaults.resolvers.unshift(function(t){return!t.type&&t.properties?"object":void 0}),n.defaults.resolvers.unshift(function(t){return"string"==typeof t.type?t.type:void 0}),n.defaults.resolvers.unshift(function(t){return"boolean"===t.type?"checkbox"===t.format||t.options&&t.options.checkbox?"checkbox":"select":void 0;
+}),n.defaults.resolvers.unshift(function(t){return"any"===t.type?"multiple":void 0}),n.defaults.resolvers.unshift(function(t){return"string"===t.type&&t.media&&"base64"===t.media.binaryEncoding?"base64":void 0}),n.defaults.resolvers.unshift(function(t){return"string"===t.type&&"url"===t.format&&t.options&&t.options.upload===!0&&window.FileReader?"upload":void 0}),n.defaults.resolvers.unshift(function(t){return"array"==t.type&&"table"==t.format?"table":void 0}),n.defaults.resolvers.unshift(function(t){return t.enumSource?"select":void 0}),n.defaults.resolvers.unshift(function(t){if(t["enum"]){if("array"===t.type||"object"===t.type)return"enum";if("number"===t.type||"integer"===t.type||"string"===t.type)return"select"}}),n.defaults.resolvers.unshift(function(t){return"array"===t.type&&t.items&&!Array.isArray(t.items)&&t.uniqueItems&&t.items["enum"]&&["string","number","integer"].indexOf(t.items.type)>=0?"multiselect":void 0}),n.defaults.resolvers.unshift(function(t){return t.oneOf?"multiple":void 0}),function(){if(window.jQuery||window.Zepto){var t=window.jQuery||window.Zepto;t.jsoneditor=n.defaults,t.fn.jsoneditor=function(t){var e=this,i=this.data("jsoneditor");if("value"===t){if(!i)throw"Must initialize jsoneditor before getting/setting the value";if(!(arguments.length>1))return i.getValue();i.setValue(arguments[1])}else{if("validate"===t){if(!i)throw"Must initialize jsoneditor before validating";return arguments.length>1?i.validate(arguments[1]):i.validate()}"destroy"===t?i&&(i.destroy(),this.data("jsoneditor",null)):(i&&i.destroy(),i=new n(this.get(0),t),this.data("jsoneditor",i),i.on("change",function(){e.trigger("change")}),i.on("ready",function(){e.trigger("ready")}))}return this}}}(),window.JSONEditor=n}();
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/lodash.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/lodash.min.js
new file mode 100644
index 00000000000..3625da8d552
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/lodash.min.js
@@ -0,0 +1,2 @@
+(function(){function n(n,t){if(n!==t){var r=null===n,e=n===x,u=n===n,o=null===t,i=t===x,f=t===t;if(n>t&&!o||!u||r&&!i&&f||e&&f)return 1;if(n<t&&!r||!f||o&&!e&&u||i&&u)return-1}return 0}function t(n,t,r){for(var e=n.length,u=r?e:-1;r?u--:++u<e;)if(t(n[u],u,n))return u;return-1}function r(n,t,r){if(t!==t)return p(n,r);r-=1;for(var e=n.length;++r<e;)if(n[r]===t)return r;return-1}function e(n){return"function"==typeof n||!1}function u(n){return null==n?"":n+""}function o(n,t){for(var r=-1,e=n.length;++r<e&&-1<t.indexOf(n.charAt(r)););return r}function i(n,t){for(var r=n.length;r--&&-1<t.indexOf(n.charAt(r)););return r}function f(t,r){return n(t.a,r.a)||t.b-r.b}function c(n){return Nn[n]}function a(n){return Tn[n]}function l(n,t,r){return t?n=Bn[n]:r&&(n=Dn[n]),"\\"+n}function s(n){return"\\"+Dn[n]}function p(n,t,r){var e=n.length;for(t+=r?0:-1;r?t--:++t<e;){var u=n[t];if(u!==u)return t}return-1}function h(n){return!!n&&"object"==typeof n}function _(n){return 160>=n&&9<=n&&13>=n||32==n||160==n||5760==n||6158==n||8192<=n&&(8202>=n||8232==n||8233==n||8239==n||8287==n||12288==n||65279==n)}function v(n,t){for(var r=-1,e=n.length,u=-1,o=[];++r<e;)n[r]===t&&(n[r]=P,o[++u]=r);return o}function g(n){for(var t=-1,r=n.length;++t<r&&_(n.charCodeAt(t)););return t}function y(n){for(var t=n.length;t--&&_(n.charCodeAt(t)););return t}function d(n){return Pn[n]}function w(_){function Nn(n){if(h(n)&&!(Wo(n)||n instanceof zn)){if(n instanceof Pn)return n;if(eu.call(n,"__chain__")&&eu.call(n,"__wrapped__"))return qr(n)}return new Pn(n)}function Tn(){}function Pn(n,t,r){this.__wrapped__=n,this.__actions__=r||[],this.__chain__=!!t}function zn(n){this.__wrapped__=n,this.__actions__=[],this.__dir__=1,this.__filtered__=!1,this.__iteratees__=[],this.__takeCount__=Cu,this.__views__=[]}function Bn(){this.__data__={}}function Dn(n){var t=n?n.length:0;for(this.data={hash:wu(null),set:new hu};t--;)this.push(n[t])}function Mn(n,t){var r=n.data;return("string"==typeof t||de(t)?r.set.has(t):r.hash[t])?0:-1}function qn(n,t){var r=-1,e=n.length;for(t||(t=De(e));++r<e;)t[r]=n[r];return t}function Kn(n,t){for(var r=-1,e=n.length;++r<e&&!1!==t(n[r],r,n););return n}function Vn(n,t){for(var r=-1,e=n.length;++r<e;)if(!t(n[r],r,n))return!1;return!0}function Zn(n,t){for(var r=-1,e=n.length,u=-1,o=[];++r<e;){var i=n[r];t(i,r,n)&&(o[++u]=i)}return o}function Xn(n,t){for(var r=-1,e=n.length,u=De(e);++r<e;)u[r]=t(n[r],r,n);return u}function Hn(n,t){for(var r=-1,e=t.length,u=n.length;++r<e;)n[u+r]=t[r];return n}function Qn(n,t,r,e){var u=-1,o=n.length;for(e&&o&&(r=n[++u]);++u<o;)r=t(r,n[u],u,n);return r}function nt(n,t){for(var r=-1,e=n.length;++r<e;)if(t(n[r],r,n))return!0;return!1}function tt(n,t,r,e){return n!==x&&eu.call(e,r)?n:t}function rt(n,t,r){for(var e=-1,u=Ko(t),o=u.length;++e<o;){var i=u[e],f=n[i],c=r(f,t[i],i,n,t);(c===c?c===f:f!==f)&&(f!==x||i in n)||(n[i]=c)}return n}function et(n,t){return null==t?n:ot(t,Ko(t),n)}function ut(n,t){for(var r=-1,e=null==n,u=!e&&Sr(n),o=u?n.length:0,i=t.length,f=De(i);++r<i;){var c=t[r];f[r]=u?Ur(c,o)?n[c]:x:e?x:n[c]}return f}function ot(n,t,r){r||(r={});for(var e=-1,u=t.length;++e<u;){var o=t[e];r[o]=n[o]}return r}function it(n,t,r){var e=typeof n;return"function"==e?t===x?n:Dt(n,t,r):null==n?Ne:"object"==e?At(n):t===x?Be(n):jt(n,t)}function ft(n,t,r,e,u,o,i){var f;if(r&&(f=u?r(n,e,u):r(n)),f!==x)return f;if(!de(n))return n;if(e=Wo(n)){if(f=Ir(n),!t)return qn(n,f)}else{var c=ou.call(n),a=c==K;if(c!=Z&&c!=z&&(!a||u))return Ln[c]?Er(n,c,t):u?n:{};if(Gn(n))return u?n:{};if(f=Rr(a?{}:n),!t)return et(f,n)}for(o||(o=[]),i||(i=[]),u=o.length;u--;)if(o[u]==n)return i[u];return o.push(n),i.push(f),(e?Kn:gt)(n,function(e,u){f[u]=ft(e,t,r,u,n,o,i)}),f}function ct(n,t,r){if("function"!=typeof n)throw new Xe(T);return _u(function(){n.apply(x,r)},t)}function at(n,t){var e=n?n.length:0,u=[];if(!e)return u;var o=-1,i=jr(),f=i===r,c=f&&t.length>=F&&wu&&hu?new Dn(t):null,a=t.length;c&&(i=Mn,f=!1,t=c);n:for(;++o<e;)if(c=n[o],f&&c===c){for(var l=a;l--;)if(t[l]===c)continue n;u.push(c)}else 0>i(t,c,0)&&u.push(c);return u}function lt(n,t){var r=!0;return zu(n,function(n,e,u){return r=!!t(n,e,u)}),r}function st(n,t,r,e){var u=e,o=u;return zu(n,function(n,i,f){i=+t(n,i,f),(r(i,u)||i===e&&i===o)&&(u=i,o=n)}),o}function pt(n,t){var r=[];return zu(n,function(n,e,u){t(n,e,u)&&r.push(n)}),r}function ht(n,t,r,e){var u;return r(n,function(n,r,o){return t(n,r,o)?(u=e?r:n,!1):void 0}),u}function _t(n,t,r,e){e||(e=[]);for(var u=-1,o=n.length;++u<o;){var i=n[u];h(i)&&Sr(i)&&(r||Wo(i)||_e(i))?t?_t(i,t,r,e):Hn(e,i):r||(e[e.length]=i)}return e}function vt(n,t){return Du(n,t,Ee)}function gt(n,t){return Du(n,t,Ko)}function yt(n,t){return Mu(n,t,Ko)}function dt(n,t){for(var r=-1,e=t.length,u=-1,o=[];++r<e;){var i=t[r];ye(n[i])&&(o[++u]=i)}return o}function wt(n,t,r){if(null!=n){n=Dr(n),r!==x&&r in n&&(t=[r]),r=0;for(var e=t.length;null!=n&&r<e;)n=Dr(n)[t[r++]];return r&&r==e?n:x}}function xt(n,t,r,e,u,o){if(n===t)return!0;if(null==n||null==t||!de(n)&&!h(t))return n!==n&&t!==t;n:{var i=xt,f=Wo(n),c=Wo(t),a=B,l=B;f||(a=ou.call(n),a==z?a=Z:a!=Z&&(f=je(n))),c||(l=ou.call(t),l==z?l=Z:l!=Z&&je(t));var s=a==Z&&!Gn(n),c=l==Z&&!Gn(t),l=a==l;if(!l||f||s){if(!e&&(a=s&&eu.call(n,"__wrapped__"),c=c&&eu.call(t,"__wrapped__"),a||c)){n=i(a?n.value():n,c?t.value():t,r,e,u,o);break n}if(l){for(u||(u=[]),o||(o=[]),a=u.length;a--;)if(u[a]==n){n=o[a]==t;break n}u.push(n),o.push(t),n=(f?wr:br)(n,t,i,r,e,u,o),u.pop(),o.pop()}else n=!1}else n=xr(n,t,a)}return n}function bt(n,t,r){var e=t.length,u=e,o=!r;if(null==n)return!u;for(n=Dr(n);e--;){var i=t[e];if(o&&i[2]?i[1]!==n[i[0]]:!(i[0]in n))return!1}for(;++e<u;){var i=t[e],f=i[0],c=n[f],a=i[1];if(o&&i[2]){if(c===x&&!(f in n))return!1}else if(i=r?r(c,a,f):x,i===x?!xt(a,c,r,!0):!i)return!1}return!0}function mt(n,t){var r=-1,e=Sr(n)?De(n.length):[];return zu(n,function(n,u,o){e[++r]=t(n,u,o)}),e}function At(n){var t=kr(n);if(1==t.length&&t[0][2]){var r=t[0][0],e=t[0][1];return function(n){return null!=n&&(n=Dr(n),n[r]===e&&(e!==x||r in n))}}return function(n){return bt(n,t)}}function jt(n,t){var r=Wo(n),e=Wr(n)&&t===t&&!de(t),u=n+"";return n=Mr(n),function(o){if(null==o)return!1;var i=u;if(o=Dr(o),!(!r&&e||i in o)){if(o=1==n.length?o:wt(o,St(n,0,-1)),null==o)return!1;i=Gr(n),o=Dr(o)}return o[i]===t?t!==x||i in o:xt(t,o[i],x,!0)}}function kt(n,t,r,e,u){if(!de(n))return n;var o=Sr(t)&&(Wo(t)||je(t)),i=o?x:Ko(t);return Kn(i||t,function(f,c){if(i&&(c=f,f=t[c]),h(f)){e||(e=[]),u||(u=[]);n:{for(var a=c,l=e,s=u,p=l.length,_=t[a];p--;)if(l[p]==_){n[a]=s[p];break n}var p=n[a],v=r?r(p,_,a,n,t):x,g=v===x;g&&(v=_,Sr(_)&&(Wo(_)||je(_))?v=Wo(p)?p:Sr(p)?qn(p):[]:be(_)||_e(_)?v=_e(p)?Ie(p):be(p)?p:{}:g=!1),l.push(_),s.push(v),g?n[a]=kt(v,_,r,l,s):(v===v?v!==p:p===p)&&(n[a]=v)}}else a=n[c],l=r?r(a,f,c,n,t):x,(s=l===x)&&(l=f),l===x&&(!o||c in n)||!s&&(l===l?l===a:a!==a)||(n[c]=l)}),n}function Ot(n){return function(t){return null==t?x:Dr(t)[n]}}function It(n){var t=n+"";return n=Mr(n),function(r){return wt(r,n,t)}}function Rt(n,t){for(var r=n?t.length:0;r--;){var e=t[r];if(e!=u&&Ur(e)){var u=e;vu.call(n,e,1)}}return n}function Et(n,t){return n+xu(Ru()*(t-n+1))}function Ct(n,t,r,e,u){return u(n,function(n,u,o){r=e?(e=!1,n):t(r,n,u,o)}),r}function St(n,t,r){var e=-1,u=n.length;for(t=null==t?0:+t||0,0>t&&(t=-t>u?0:u+t),r=r===x||r>u?u:+r||0,0>r&&(r+=u),u=t>r?0:r-t>>>0,t>>>=0,r=De(u);++e<u;)r[e]=n[e+t];return r}function Ut(n,t){var r;return zu(n,function(n,e,u){return r=t(n,e,u),!r}),!!r}function $t(n,t){var r=n.length;for(n.sort(t);r--;)n[r]=n[r].c;return n}function Wt(t,r,e){var u=mr(),o=-1;return r=Xn(r,function(n){return u(n)}),t=mt(t,function(n){return{a:Xn(r,function(t){return t(n)}),b:++o,c:n}}),$t(t,function(t,r){var u;n:{for(var o=-1,i=t.a,f=r.a,c=i.length,a=e.length;++o<c;)if(u=n(i[o],f[o])){if(o>=a)break n;o=e[o],u*="asc"===o||!0===o?1:-1;break n}u=t.b-r.b}return u})}function Ft(n,t){var r=0;return zu(n,function(n,e,u){r+=+t(n,e,u)||0}),r}function Lt(n,t){var e=-1,u=jr(),o=n.length,i=u===r,f=i&&o>=F,c=f&&wu&&hu?new Dn((void 0)):null,a=[];c?(u=Mn,i=!1):(f=!1,c=t?[]:a);n:for(;++e<o;){var l=n[e],s=t?t(l,e,n):l;if(i&&l===l){for(var p=c.length;p--;)if(c[p]===s)continue n;t&&c.push(s),a.push(l)}else 0>u(c,s,0)&&((t||f)&&c.push(s),a.push(l))}return a}function Nt(n,t){for(var r=-1,e=t.length,u=De(e);++r<e;)u[r]=n[t[r]];return u}function Tt(n,t,r,e){for(var u=n.length,o=e?u:-1;(e?o--:++o<u)&&t(n[o],o,n););return r?St(n,e?0:o,e?o+1:u):St(n,e?o+1:0,e?u:o)}function Pt(n,t){var r=n;r instanceof zn&&(r=r.value());for(var e=-1,u=t.length;++e<u;)var o=t[e],r=o.func.apply(o.thisArg,Hn([r],o.args));return r}function zt(n,t,r){var e=0,u=n?n.length:e;if("number"==typeof t&&t===t&&u<=Uu){for(;e<u;){var o=e+u>>>1,i=n[o];(r?i<=t:i<t)&&null!==i?e=o+1:u=o}return u}return Bt(n,t,Ne,r)}function Bt(n,t,r,e){t=r(t);for(var u=0,o=n?n.length:0,i=t!==t,f=null===t,c=t===x;u<o;){var a=xu((u+o)/2),l=r(n[a]),s=l!==x,p=l===l;(i?p||e:f?p&&s&&(e||null!=l):c?p&&(e||s):null==l?0:e?l<=t:l<t)?u=a+1:o=a}return ku(o,Su)}function Dt(n,t,r){if("function"!=typeof n)return Ne;if(t===x)return n;switch(r){case 1:return function(r){return n.call(t,r)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,o){return n.call(t,r,e,u,o)};case 5:return function(r,e,u,o,i){return n.call(t,r,e,u,o,i)}}return function(){return n.apply(t,arguments)}}function Mt(n){var t=new cu(n.byteLength);return new gu(t).set(new gu(n)),t}function qt(n,t,r){for(var e=r.length,u=-1,o=ju(n.length-e,0),i=-1,f=t.length,c=De(f+o);++i<f;)c[i]=t[i];for(;++u<e;)c[r[u]]=n[u];for(;o--;)c[i++]=n[u++];return c}function Kt(n,t,r){for(var e=-1,u=r.length,o=-1,i=ju(n.length-u,0),f=-1,c=t.length,a=De(i+c);++o<i;)a[o]=n[o];for(i=o;++f<c;)a[i+f]=t[f];for(;++e<u;)a[i+r[e]]=n[o++];return a}function Vt(n,t){return function(r,e,u){var o=t?t():{};if(e=mr(e,u,3),Wo(r)){u=-1;for(var i=r.length;++u<i;){var f=r[u];n(o,f,e(f,u,r),r)}}else zu(r,function(t,r,u){n(o,t,e(t,r,u),u)});return o}}function Zt(n){return pe(function(t,r){var e=-1,u=null==t?0:r.length,o=2<u?r[u-2]:x,i=2<u?r[2]:x,f=1<u?r[u-1]:x;for("function"==typeof o?(o=Dt(o,f,5),u-=2):(o="function"==typeof f?f:x,u-=o?1:0),i&&$r(r[0],r[1],i)&&(o=3>u?x:o,u=1);++e<u;)(i=r[e])&&n(t,i,o);return t})}function Yt(n,t){return function(r,e){var u=r?Vu(r):0;if(!Lr(u))return n(r,e);for(var o=t?u:-1,i=Dr(r);(t?o--:++o<u)&&!1!==e(i[o],o,i););return r}}function Gt(n){return function(t,r,e){var u=Dr(t);e=e(t);for(var o=e.length,i=n?o:-1;n?i--:++i<o;){var f=e[i];if(!1===r(u[f],f,u))break}return t}}function Jt(n,t){function r(){return(this&&this!==Yn&&this instanceof r?e:n).apply(t,arguments)}var e=Ht(n);return r}function Xt(n){return function(t){var r=-1;t=Fe(Ue(t));for(var e=t.length,u="";++r<e;)u=n(u,t[r],r);return u}}function Ht(n){return function(){var t=arguments;switch(t.length){case 0:return new n;case 1:return new n(t[0]);case 2:return new n(t[0],t[1]);case 3:return new n(t[0],t[1],t[2]);case 4:return new n(t[0],t[1],t[2],t[3]);case 5:return new n(t[0],t[1],t[2],t[3],t[4]);case 6:return new n(t[0],t[1],t[2],t[3],t[4],t[5]);case 7:return new n(t[0],t[1],t[2],t[3],t[4],t[5],t[6])}var r=Pu(n.prototype),t=n.apply(r,t);return de(t)?t:r}}function Qt(n){function t(r,e,u){return u&&$r(r,e,u)&&(e=x),r=dr(r,n,x,x,x,x,x,e),r.placeholder=t.placeholder,r}return t}function nr(n,t){return pe(function(r){var e=r[0];return null==e?e:(r.push(t),n.apply(x,r))})}function tr(n,t){return function(r,e,u){if(u&&$r(r,e,u)&&(e=x),e=mr(e,u,3),1==e.length){u=r=Wo(r)?r:Br(r);for(var o=e,i=-1,f=u.length,c=t,a=c;++i<f;){var l=u[i],s=+o(l);n(s,c)&&(c=s,a=l)}if(u=a,!r.length||u!==t)return u}return st(r,e,n,t)}}function rr(n,r){return function(e,u,o){return u=mr(u,o,3),Wo(e)?(u=t(e,u,r),-1<u?e[u]:x):ht(e,u,n)}}function er(n){return function(r,e,u){return r&&r.length?(e=mr(e,u,3),t(r,e,n)):-1}}function ur(n){return function(t,r,e){return r=mr(r,e,3),ht(t,r,n,!0)}}function or(n){return function(){for(var t,r=arguments.length,e=n?r:-1,u=0,o=De(r);n?e--:++e<r;){var i=o[u++]=arguments[e];if("function"!=typeof i)throw new Xe(T);!t&&Pn.prototype.thru&&"wrapper"==Ar(i)&&(t=new Pn([],(!0)))}for(e=t?-1:r;++e<r;){var i=o[e],u=Ar(i),f="wrapper"==u?Ku(i):x;t=f&&Fr(f[0])&&f[1]==(E|k|I|C)&&!f[4].length&&1==f[9]?t[Ar(f[0])].apply(t,f[3]):1==i.length&&Fr(i)?t[u]():t.thru(i)}return function(){var n=arguments,e=n[0];if(t&&1==n.length&&Wo(e)&&e.length>=F)return t.plant(e).value();for(var u=0,n=r?o[u].apply(this,n):e;++u<r;)n=o[u].call(this,n);return n}}}function ir(n,t){return function(r,e,u){return"function"==typeof e&&u===x&&Wo(r)?n(r,e):t(r,Dt(e,u,3))}}function fr(n){return function(t,r,e){return("function"!=typeof r||e!==x)&&(r=Dt(r,e,3)),n(t,r,Ee)}}function cr(n){return function(t,r,e){return("function"!=typeof r||e!==x)&&(r=Dt(r,e,3)),n(t,r)}}function ar(n){return function(t,r,e){var u={};return r=mr(r,e,3),gt(t,function(t,e,o){o=r(t,e,o),e=n?o:e,t=n?t:o,u[e]=t}),u}}function lr(n){return function(t,r,e){return t=u(t),(n?t:"")+_r(t,r,e)+(n?"":t)}}function sr(n){var t=pe(function(r,e){var u=v(e,t.placeholder);return dr(r,n,x,e,u)});return t}function pr(n,t){return function(r,e,u,o){var i=3>arguments.length;return"function"==typeof e&&o===x&&Wo(r)?n(r,e,u,i):Ct(r,mr(e,o,4),u,i,t)}}function hr(n,t,r,e,u,o,i,f,c,a){function l(){for(var w=arguments.length,b=w,j=De(w);b--;)j[b]=arguments[b];if(e&&(j=qt(j,e,u)),o&&(j=Kt(j,o,i)),_||y){var b=l.placeholder,k=v(j,b),w=w-k.length;if(w<a){var O=f?qn(f):x,w=ju(a-w,0),E=_?k:x,k=_?x:k,C=_?j:x,j=_?x:j;return t|=_?I:R,t&=~(_?R:I),g||(t&=~(m|A)),j=[n,t,r,C,E,j,k,O,c,w],O=hr.apply(x,j),Fr(n)&&Zu(O,j),O.placeholder=b,O}}if(b=p?r:this,O=h?b[n]:n,f)for(w=j.length,E=ku(f.length,w),k=qn(j);E--;)C=f[E],j[E]=Ur(C,w)?k[C]:x;return s&&c<j.length&&(j.length=c),this&&this!==Yn&&this instanceof l&&(O=d||Ht(n)),O.apply(b,j)}var s=t&E,p=t&m,h=t&A,_=t&k,g=t&j,y=t&O,d=h?x:Ht(n);return l}function _r(n,t,r){return n=n.length,t=+t,n<t&&mu(t)?(t-=n,r=null==r?" ":r+"",$e(r,du(t/r.length)).slice(0,t)):""}function vr(n,t,r,e){function u(){for(var t=-1,f=arguments.length,c=-1,a=e.length,l=De(a+f);++c<a;)l[c]=e[c];for(;f--;)l[c++]=arguments[++t];return(this&&this!==Yn&&this instanceof u?i:n).apply(o?r:this,l)}var o=t&m,i=Ht(n);return u}function gr(n){var t=Ve[n];return function(n,r){return(r=r===x?0:+r||0)?(r=su(10,r),t(n*r)/r):t(n)}}function yr(n){return function(t,r,e,u){var o=mr(e);return null==e&&o===it?zt(t,r,n):Bt(t,r,o(e,u,1),n)}}function dr(n,t,r,e,u,o,i,f){var c=t&A;if(!c&&"function"!=typeof n)throw new Xe(T);var a=e?e.length:0;if(a||(t&=~(I|R),e=u=x),a-=u?u.length:0,t&R){var l=e,s=u;e=u=x}var p=c?x:Ku(n);return r=[n,t,r,e,u,l,s,o,i,f],p&&(e=r[1],t=p[1],f=e|t,u=t==E&&e==k||t==E&&e==C&&r[7].length<=p[8]||t==(E|C)&&e==k,(f<E||u)&&(t&m&&(r[2]=p[2],f|=e&m?0:j),(e=p[3])&&(u=r[3],r[3]=u?qt(u,e,p[4]):qn(e),r[4]=u?v(r[3],P):qn(p[4])),(e=p[5])&&(u=r[5],r[5]=u?Kt(u,e,p[6]):qn(e),r[6]=u?v(r[5],P):qn(p[6])),(e=p[7])&&(r[7]=qn(e)),t&E&&(r[8]=null==r[8]?p[8]:ku(r[8],p[8])),null==r[9]&&(r[9]=p[9]),r[0]=p[0],r[1]=f),t=r[1],f=r[9]),r[9]=null==f?c?0:n.length:ju(f-a,0)||0,n=t==m?Jt(r[0],r[2]):t!=I&&t!=(m|I)||r[4].length?hr.apply(x,r):vr.apply(x,r),(p?qu:Zu)(n,r)}function wr(n,t,r,e,u,o,i){var f=-1,c=n.length,a=t.length;if(c!=a&&(!u||a<=c))return!1;for(;++f<c;){var l=n[f],a=t[f],s=e?e(u?a:l,u?l:a,f):x;if(s!==x){if(s)continue;return!1}if(u){if(!nt(t,function(n){return l===n||r(l,n,e,u,o,i)}))return!1}else if(l!==a&&!r(l,a,e,u,o,i))return!1}return!0}function xr(n,t,r){switch(r){case D:case M:return+n==+t;case q:return n.name==t.name&&n.message==t.message;case V:return n!=+n?t!=+t:n==+t;case Y:case G:return n==t+""}return!1}function br(n,t,r,e,u,o,i){var f=Ko(n),c=f.length,a=Ko(t).length;if(c!=a&&!u)return!1;for(a=c;a--;){var l=f[a];if(!(u?l in t:eu.call(t,l)))return!1}for(var s=u;++a<c;){var l=f[a],p=n[l],h=t[l],_=e?e(u?h:p,u?p:h,l):x;if(_===x?!r(p,h,e,u,o,i):!_)return!1;s||(s="constructor"==l)}return!(!s&&(r=n.constructor,e=t.constructor,r!=e&&"constructor"in n&&"constructor"in t&&!("function"==typeof r&&r instanceof r&&"function"==typeof e&&e instanceof e)))}function mr(n,t,r){var e=Nn.callback||Le,e=e===Le?it:e;return r?e(n,t,r):e}function Ar(n){for(var t=n.name+"",r=Fu[t],e=r?r.length:0;e--;){var u=r[e],o=u.func;if(null==o||o==n)return u.name}return t}function jr(n,t,e){var u=Nn.indexOf||Yr,u=u===Yr?r:u;return n?u(n,t,e):u}function kr(n){n=Ce(n);for(var t=n.length;t--;){var r,e=n[t];r=n[t][1],r=r===r&&!de(r),e[2]=r}return n}function Or(n,t){var r=null==n?x:n[t];return we(r)?r:x}function Ir(n){var t=n.length,r=new n.constructor(t);return t&&"string"==typeof n[0]&&eu.call(n,"index")&&(r.index=n.index,r.input=n.input),r}function Rr(n){return n=n.constructor,"function"==typeof n&&n instanceof n||(n=Ye),new n}function Er(n,t,r){var e=n.constructor;switch(t){case J:return Mt(n);case D:case M:return new e((+n));case X:case H:case Q:case nn:case tn:case rn:case en:case un:case on:return e instanceof e&&(e=Lu[t]),t=n.buffer,new e(r?Mt(t):t,n.byteOffset,n.length);case V:case G:return new e(n);case Y:var u=new e(n.source,kn.exec(n));u.lastIndex=n.lastIndex}return u}function Cr(n,t,r){return null==n||Wr(t,n)||(t=Mr(t),n=1==t.length?n:wt(n,St(t,0,-1)),t=Gr(t)),t=null==n?n:n[t],null==t?x:t.apply(n,r)}function Sr(n){return null!=n&&Lr(Vu(n))}function Ur(n,t){return n="number"==typeof n||Rn.test(n)?+n:-1,t=null==t?$u:t,-1<n&&0==n%1&&n<t}function $r(n,t,r){if(!de(r))return!1;var e=typeof t;return!!("number"==e?Sr(r)&&Ur(t,r.length):"string"==e&&t in r)&&(t=r[t],n===n?n===t:t!==t)}function Wr(n,t){var r=typeof n;return!!("string"==r&&dn.test(n)||"number"==r)||!Wo(n)&&(!yn.test(n)||null!=t&&n in Dr(t))}function Fr(n){var t=Ar(n),r=Nn[t];return"function"==typeof r&&t in zn.prototype&&(n===r||(t=Ku(r),!!t&&n===t[0]))}function Lr(n){return"number"==typeof n&&-1<n&&0==n%1&&n<=$u}function Nr(n,t){return n===x?t:Fo(n,t,Nr)}function Tr(n,t){n=Dr(n);for(var r=-1,e=t.length,u={};++r<e;){var o=t[r];o in n&&(u[o]=n[o])}return u}function Pr(n,t){var r={};return vt(n,function(n,e,u){t(n,e,u)&&(r[e]=n)}),r}function zr(n){for(var t=Ee(n),r=t.length,e=r&&n.length,u=!!e&&Lr(e)&&(Wo(n)||_e(n)||Ae(n)),o=-1,i=[];++o<r;){var f=t[o];(u&&Ur(f,e)||eu.call(n,f))&&i.push(f)}return i}function Br(n){return null==n?[]:Sr(n)?Nn.support.unindexedChars&&Ae(n)?n.split(""):de(n)?n:Ye(n):Se(n)}function Dr(n){if(Nn.support.unindexedChars&&Ae(n)){for(var t=-1,r=n.length,e=Ye(n);++t<r;)e[t]=n.charAt(t);return e}return de(n)?n:Ye(n)}function Mr(n){if(Wo(n))return n;var t=[];return u(n).replace(wn,function(n,r,e,u){t.push(e?u.replace(An,"$1"):r||n)}),t}function qr(n){return n instanceof zn?n.clone():new Pn(n.__wrapped__,n.__chain__,qn(n.__actions__))}function Kr(n,t,r){return n&&n.length?((r?$r(n,t,r):null==t)&&(t=1),St(n,0>t?0:t)):[]}function Vr(n,t,r){var e=n?n.length:0;return e?((r?$r(n,t,r):null==t)&&(t=1),t=e-(+t||0),St(n,0,0>t?0:t)):[]}function Zr(n){return n?n[0]:x}function Yr(n,t,e){var u=n?n.length:0;if(!u)return-1;if("number"==typeof e)e=0>e?ju(u+e,0):e;else if(e)return e=zt(n,t),e<u&&(t===t?t===n[e]:n[e]!==n[e])?e:-1;return r(n,t,e||0)}function Gr(n){var t=n?n.length:0;return t?n[t-1]:x}function Jr(n){return Kr(n,1)}function Xr(n,t,e,u){if(!n||!n.length)return[];null!=t&&"boolean"!=typeof t&&(u=e,e=$r(n,t,u)?x:t,t=!1);var o=mr();if((null!=e||o!==it)&&(e=o(e,u,3)),t&&jr()===r){t=e;var i;e=-1,u=n.length;for(var o=-1,f=[];++e<u;){var c=n[e],a=t?t(c,e,n):c;e&&i===a||(i=a,f[++o]=c)}n=f}else n=Lt(n,e);return n}function Hr(n){if(!n||!n.length)return[];var t=-1,r=0;n=Zn(n,function(n){return Sr(n)?(r=ju(n.length,r),!0):void 0});for(var e=De(r);++t<r;)e[t]=Xn(n,Ot(t));return e}function Qr(n,t,r){return n&&n.length?(n=Hr(n),null==t?n:(t=Dt(t,r,4),Xn(n,function(n){return Qn(n,t,x,!0)}))):[]}function ne(n,t){var r=-1,e=n?n.length:0,u={};for(!e||t||Wo(n[0])||(t=[]);++r<e;){var o=n[r];t?u[o]=t[r]:o&&(u[o[0]]=o[1])}return u}function te(n){return n=Nn(n),n.__chain__=!0,n}function re(n,t,r){return t.call(r,n)}function ee(n,t,r){var e=Wo(n)?Vn:lt;return r&&$r(n,t,r)&&(t=x),("function"!=typeof t||r!==x)&&(t=mr(t,r,3)),e(n,t)}function ue(n,t,r){var e=Wo(n)?Zn:pt;return t=mr(t,r,3),e(n,t)}function oe(n,t,r,e){var u=n?Vu(n):0;return Lr(u)||(n=Se(n),u=n.length),r="number"!=typeof r||e&&$r(t,r,e)?0:0>r?ju(u+r,0):r||0,"string"==typeof n||!Wo(n)&&Ae(n)?r<=u&&-1<n.indexOf(t,r):!!u&&-1<jr(n,t,r)}function ie(n,t,r){var e=Wo(n)?Xn:mt;return t=mr(t,r,3),e(n,t)}function fe(n,t,r){if(r?$r(n,t,r):null==t){n=Br(n);var e=n.length;return 0<e?n[Et(0,e-1)]:x}r=-1,n=Oe(n);var e=n.length,u=e-1;for(t=ku(0>t?0:+t||0,e);++r<t;){var e=Et(r,u),o=n[e];n[e]=n[r],n[r]=o}return n.length=t,n}function ce(n,t,r){var e=Wo(n)?nt:Ut;return r&&$r(n,t,r)&&(t=x),("function"!=typeof t||r!==x)&&(t=mr(t,r,3)),e(n,t)}function ae(n,t){var r;if("function"!=typeof t){if("function"!=typeof n)throw new Xe(T);var e=n;n=t,t=e}return function(){return 0<--n&&(r=t.apply(this,arguments)),1>=n&&(t=x),r}}function le(n,t,r){function e(t,r){r&&au(r),c=p=h=x,t&&(_=xo(),a=n.apply(s,f),p||c||(f=s=x))}function u(){var n=t-(xo()-l);0>=n||n>t?e(h,c):p=_u(u,n)}function o(){e(g,p)}function i(){if(f=arguments,l=xo(),s=this,h=g&&(p||!y),!1===v)var r=y&&!p;else{c||y||(_=l);var e=v-(l-_),i=0>=e||e>v;i?(c&&(c=au(c)),_=l,a=n.apply(s,f)):c||(c=_u(o,e))}return i&&p?p=au(p):p||t===v||(p=_u(u,t)),r&&(i=!0,a=n.apply(s,f)),!i||p||c||(f=s=x),a}var f,c,a,l,s,p,h,_=0,v=!1,g=!0;if("function"!=typeof n)throw new Xe(T);if(t=0>t?0:+t||0,!0===r)var y=!0,g=!1;else de(r)&&(y=!!r.leading,v="maxWait"in r&&ju(+r.maxWait||0,t),g="trailing"in r?!!r.trailing:g);return i.cancel=function(){p&&au(p),c&&au(c),_=0,c=p=h=x},i}function se(n,t){if("function"!=typeof n||t&&"function"!=typeof t)throw new Xe(T);var r=function(){var e=arguments,u=t?t.apply(this,e):e[0],o=r.cache;return o.has(u)?o.get(u):(e=n.apply(this,e),r.cache=o.set(u,e),e)};return r.cache=new se.Cache,r}function pe(n,t){if("function"!=typeof n)throw new Xe(T);return t=ju(t===x?n.length-1:+t||0,0),function(){for(var r=arguments,e=-1,u=ju(r.length-t,0),o=De(u);++e<u;)o[e]=r[t+e];switch(t){case 0:return n.call(this,o);case 1:return n.call(this,r[0],o);case 2:return n.call(this,r[0],r[1],o)}for(u=De(t+1),e=-1;++e<t;)u[e]=r[e];return u[t]=o,n.apply(this,u)}}function he(n,t){return n>t}function _e(n){return h(n)&&Sr(n)&&eu.call(n,"callee")&&!pu.call(n,"callee")}function ve(n,t,r,e){return e=(r="function"==typeof r?Dt(r,e,3):x)?r(n,t):x,e===x?xt(n,t,r):!!e}function ge(n){return h(n)&&"string"==typeof n.message&&ou.call(n)==q}function ye(n){return de(n)&&ou.call(n)==K}function de(n){var t=typeof n;return!!n&&("object"==t||"function"==t)}function we(n){return null!=n&&(ye(n)?fu.test(ru.call(n)):h(n)&&(Gn(n)?fu:In).test(n))}function xe(n){return"number"==typeof n||h(n)&&ou.call(n)==V}function be(n){var t;if(!h(n)||ou.call(n)!=Z||Gn(n)||_e(n)||!(eu.call(n,"constructor")||(t=n.constructor,"function"!=typeof t||t instanceof t)))return!1;var r;return Nn.support.ownLast?(vt(n,function(n,t,e){return r=eu.call(e,t),!1}),!1!==r):(vt(n,function(n,t){r=t}),r===x||eu.call(n,r))}function me(n){return de(n)&&ou.call(n)==Y}function Ae(n){return"string"==typeof n||h(n)&&ou.call(n)==G}function je(n){return h(n)&&Lr(n.length)&&!!Fn[ou.call(n)]}function ke(n,t){return n<t}function Oe(n){var t=n?Vu(n):0;return Lr(t)?t?Nn.support.unindexedChars&&Ae(n)?n.split(""):qn(n):[]:Se(n)}function Ie(n){return ot(n,Ee(n))}function Re(n){return dt(n,Ee(n))}function Ee(n){if(null==n)return[];de(n)||(n=Ye(n));for(var t=n.length,r=Nn.support,t=t&&Lr(t)&&(Wo(n)||_e(n)||Ae(n))&&t||0,e=n.constructor,u=-1,e=ye(e)&&e.prototype||nu,o=e===n,i=De(t),f=0<t,c=r.enumErrorProps&&(n===Qe||n instanceof qe),a=r.enumPrototypes&&ye(n);++u<t;)i[u]=u+"";for(var l in n)a&&"prototype"==l||c&&("message"==l||"name"==l)||f&&Ur(l,t)||"constructor"==l&&(o||!eu.call(n,l))||i.push(l);if(r.nonEnumShadows&&n!==nu)for(t=n===tu?G:n===Qe?q:ou.call(n),r=Nu[t]||Nu[Z],t==Z&&(e=nu),t=Wn.length;t--;)l=Wn[t],u=r[l],o&&u||(u?!eu.call(n,l):n[l]===e[l])||i.push(l);return i}function Ce(n){n=Dr(n);for(var t=-1,r=Ko(n),e=r.length,u=De(e);++t<e;){var o=r[t];u[t]=[o,n[o]]}return u}function Se(n){return Nt(n,Ko(n))}function Ue(n){return(n=u(n))&&n.replace(En,c).replace(mn,"")}function $e(n,t){var r="";if(n=u(n),t=+t,1>t||!n||!mu(t))return r;do t%2&&(r+=n),t=xu(t/2),n+=n;while(t);return r}function We(n,t,r){var e=n;return(n=u(n))?(r?$r(e,t,r):null==t)?n.slice(g(n),y(n)+1):(t+="",n.slice(o(n,t),i(n,t)+1)):n}function Fe(n,t,r){return r&&$r(n,t,r)&&(t=x),n=u(n),n.match(t||Un)||[]}function Le(n,t,r){return r&&$r(n,t,r)&&(t=x),h(n)?Te(n):it(n,t)}function Ne(n){return n}function Te(n){return At(ft(n,!0))}function Pe(n,t,r){if(null==r){var e=de(t),u=e?Ko(t):x;((u=u&&u.length?dt(t,u):x)?u.length:e)||(u=!1,r=t,t=n,n=this)}u||(u=dt(t,Ko(t)));var o=!0,e=-1,i=ye(n),f=u.length;!1===r?o=!1:de(r)&&"chain"in r&&(o=r.chain);for(;++e<f;){r=u[e];var c=t[r];n[r]=c,i&&(n.prototype[r]=function(t){return function(){var r=this.__chain__;if(o||r){var e=n(this.__wrapped__);return(e.__actions__=qn(this.__actions__)).push({func:t,args:arguments,thisArg:n}),e.__chain__=r,e}return t.apply(n,Hn([this.value()],arguments))}}(c))}return n}function ze(){}function Be(n){return Wr(n)?Ot(n):It(n)}_=_?Jn.defaults(Yn.Object(),_,Jn.pick(Yn,$n)):Yn;var De=_.Array,Me=_.Date,qe=_.Error,Ke=_.Function,Ve=_.Math,Ze=_.Number,Ye=_.Object,Ge=_.RegExp,Je=_.String,Xe=_.TypeError,He=De.prototype,Qe=qe.prototype,nu=Ye.prototype,tu=Je.prototype,ru=Ke.prototype.toString,eu=nu.hasOwnProperty,uu=0,ou=nu.toString,iu=Yn._,fu=Ge("^"+ru.call(eu).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),cu=_.ArrayBuffer,au=_.clearTimeout,lu=_.parseFloat,su=Ve.pow,pu=nu.propertyIsEnumerable,hu=Or(_,"Set"),_u=_.setTimeout,vu=He.splice,gu=_.Uint8Array,yu=Or(_,"WeakMap"),du=Ve.ceil,wu=Or(Ye,"create"),xu=Ve.floor,bu=Or(De,"isArray"),mu=_.isFinite,Au=Or(Ye,"keys"),ju=Ve.max,ku=Ve.min,Ou=Or(Me,"now"),Iu=_.parseInt,Ru=Ve.random,Eu=Ze.NEGATIVE_INFINITY,Cu=Ze.POSITIVE_INFINITY,Su=4294967294,Uu=2147483647,$u=9007199254740991,Wu=yu&&new yu,Fu={},Lu={};Lu[X]=_.Float32Array,Lu[H]=_.Float64Array,Lu[Q]=_.Int8Array,Lu[nn]=_.Int16Array,Lu[tn]=_.Int32Array,Lu[rn]=gu,Lu[en]=_.Uint8ClampedArray,Lu[un]=_.Uint16Array,Lu[on]=_.Uint32Array;var Nu={};Nu[B]=Nu[M]=Nu[V]={constructor:!0,toLocaleString:!0,toString:!0,valueOf:!0},Nu[D]=Nu[G]={constructor:!0,toString:!0,valueOf:!0},Nu[q]=Nu[K]=Nu[Y]={constructor:!0,toString:!0},Nu[Z]={constructor:!0},Kn(Wn,function(n){for(var t in Nu)if(eu.call(Nu,t)){var r=Nu[t];r[n]=eu.call(r,n)}});var Tu=Nn.support={};!function(n){var t=function(){this.x=n},r={0:n,length:n},e=[];t.prototype={valueOf:n,y:n};for(var u in new t)e.push(u);Tu.enumErrorProps=pu.call(Qe,"message")||pu.call(Qe,"name"),Tu.enumPrototypes=pu.call(t,"prototype"),Tu.nonEnumShadows=!/valueOf/.test(e),Tu.ownLast="x"!=e[0],Tu.spliceObjects=(vu.call(r,0,1),!r[0]),Tu.unindexedChars="xx"!="x"[0]+Ye("x")[0]}(1,0),Nn.templateSettings={escape:_n,evaluate:vn,interpolate:gn,variable:"",imports:{_:Nn}};var Pu=function(){function n(){}return function(t){if(de(t)){n.prototype=t;var r=new n;n.prototype=x}return r||{}}}(),zu=Yt(gt),Bu=Yt(yt,!0),Du=Gt(),Mu=Gt(!0),qu=Wu?function(n,t){return Wu.set(n,t),n}:Ne,Ku=Wu?function(n){return Wu.get(n)}:ze,Vu=Ot("length"),Zu=function(){var n=0,t=0;return function(r,e){var u=xo(),o=W-(u-t);if(t=u,0<o){if(++n>=$)return r}else n=0;return qu(r,e)}}(),Yu=pe(function(n,t){return h(n)&&Sr(n)?at(n,_t(t,!1,!0)):[]}),Gu=er(),Ju=er(!0),Xu=pe(function(n){for(var t=n.length,e=t,u=De(l),o=jr(),i=o===r,f=[];e--;){var c=n[e]=Sr(c=n[e])?c:[];u[e]=i&&120<=c.length&&wu&&hu?new Dn(e&&c):null}var i=n[0],a=-1,l=i?i.length:0,s=u[0];n:for(;++a<l;)if(c=i[a],0>(s?Mn(s,c):o(f,c,0))){for(e=t;--e;){var p=u[e];if(0>(p?Mn(p,c):o(n[e],c,0)))continue n}s&&s.push(c),f.push(c)}return f}),Hu=pe(function(t,r){r=_t(r);var e=ut(t,r);return Rt(t,r.sort(n)),e}),Qu=yr(),no=yr(!0),to=pe(function(n){return Lt(_t(n,!1,!0))}),ro=pe(function(n,t){return Sr(n)?at(n,t):[]}),eo=pe(Hr),uo=pe(function(n){var t=n.length,r=2<t?n[t-2]:x,e=1<t?n[t-1]:x;return 2<t&&"function"==typeof r?t-=2:(r=1<t&&"function"==typeof e?(--t,e):x,e=x),n.length=t,Qr(n,r,e)}),oo=pe(function(n){return n=_t(n),this.thru(function(t){t=Wo(t)?t:[Dr(t)];for(var r=n,e=-1,u=t.length,o=-1,i=r.length,f=De(u+i);++e<u;)f[e]=t[e];for(;++o<i;)f[e++]=r[o];return f})}),io=pe(function(n,t){return Sr(n)&&(n=Br(n)),ut(n,_t(t))}),fo=Vt(function(n,t,r){eu.call(n,r)?++n[r]:n[r]=1}),co=rr(zu),ao=rr(Bu,!0),lo=ir(Kn,zu),so=ir(function(n,t){for(var r=n.length;r--&&!1!==t(n[r],r,n););return n},Bu),po=Vt(function(n,t,r){eu.call(n,r)?n[r].push(t):n[r]=[t]}),ho=Vt(function(n,t,r){n[r]=t}),_o=pe(function(n,t,r){var e=-1,u="function"==typeof t,o=Wr(t),i=Sr(n)?De(n.length):[];return zu(n,function(n){var f=u?t:o&&null!=n?n[t]:x;i[++e]=f?f.apply(n,r):Cr(n,t,r)}),i}),vo=Vt(function(n,t,r){n[r?0:1].push(t)},function(){return[[],[]]}),go=pr(Qn,zu),yo=pr(function(n,t,r,e){var u=n.length;for(e&&u&&(r=n[--u]);u--;)r=t(r,n[u],u,n);return r},Bu),wo=pe(function(n,t){if(null==n)return[];var r=t[2];return r&&$r(t[0],t[1],r)&&(t.length=1),Wt(n,_t(t),[])}),xo=Ou||function(){return(new Me).getTime()},bo=pe(function(n,t,r){var e=m;if(r.length)var u=v(r,bo.placeholder),e=e|I;return dr(n,e,t,r,u)}),mo=pe(function(n,t){t=t.length?_t(t):Re(n);for(var r=-1,e=t.length;++r<e;){var u=t[r];n[u]=dr(n[u],m,n)}return n}),Ao=pe(function(n,t,r){var e=m|A;if(r.length)var u=v(r,Ao.placeholder),e=e|I;return dr(t,e,n,r,u)}),jo=Qt(k),ko=Qt(O),Oo=pe(function(n,t){return ct(n,1,t)}),Io=pe(function(n,t,r){return ct(n,t,r)}),Ro=or(),Eo=or(!0),Co=pe(function(n,t){if(t=_t(t),"function"!=typeof n||!Vn(t,e))throw new Xe(T);var r=t.length;return pe(function(e){for(var u=ku(e.length,r);u--;)e[u]=t[u](e[u]);return n.apply(this,e)})}),So=sr(I),Uo=sr(R),$o=pe(function(n,t){return dr(n,C,x,x,x,_t(t))}),Wo=bu||function(n){return h(n)&&Lr(n.length)&&ou.call(n)==B},Fo=Zt(kt),Lo=Zt(function(n,t,r){return r?rt(n,t,r):et(n,t)}),No=nr(Lo,function(n,t){return n===x?t:n}),To=nr(Fo,Nr),Po=ur(gt),zo=ur(yt),Bo=fr(Du),Do=fr(Mu),Mo=cr(gt),qo=cr(yt),Ko=Au?function(n){var t=null==n?x:n.constructor;return"function"==typeof t&&t.prototype===n||("function"==typeof n?Nn.support.enumPrototypes:Sr(n))?zr(n):de(n)?Au(n):[]}:zr,Vo=ar(!0),Zo=ar(),Yo=pe(function(n,t){if(null==n)return{};if("function"!=typeof t[0])return t=Xn(_t(t),Je),Tr(n,at(Ee(n),t));var r=Dt(t[0],t[1],3);return Pr(n,function(n,t,e){return!r(n,t,e)})}),Go=pe(function(n,t){return null==n?{}:"function"==typeof t[0]?Pr(n,Dt(t[0],t[1],3)):Tr(n,_t(t))}),Jo=Xt(function(n,t,r){return t=t.toLowerCase(),n+(r?t.charAt(0).toUpperCase()+t.slice(1):t)}),Xo=Xt(function(n,t,r){return n+(r?"-":"")+t.toLowerCase()}),Ho=lr(),Qo=lr(!0),ni=Xt(function(n,t,r){return n+(r?"_":"")+t.toLowerCase()}),ti=Xt(function(n,t,r){return n+(r?" ":"")+(t.charAt(0).toUpperCase()+t.slice(1))}),ri=pe(function(n,t){try{return n.apply(x,t)}catch(r){return ge(r)?r:new qe(r)}}),ei=pe(function(n,t){return function(r){return Cr(r,n,t)}}),ui=pe(function(n,t){return function(r){return Cr(n,r,t)}}),oi=gr("ceil"),ii=gr("floor"),fi=tr(he,Eu),ci=tr(ke,Cu),ai=gr("round");return Nn.prototype=Tn.prototype,Pn.prototype=Pu(Tn.prototype),Pn.prototype.constructor=Pn,zn.prototype=Pu(Tn.prototype),zn.prototype.constructor=zn,Bn.prototype["delete"]=function(n){return this.has(n)&&delete this.__data__[n]},Bn.prototype.get=function(n){return"__proto__"==n?x:this.__data__[n]},Bn.prototype.has=function(n){return"__proto__"!=n&&eu.call(this.__data__,n)},Bn.prototype.set=function(n,t){return"__proto__"!=n&&(this.__data__[n]=t),this},Dn.prototype.push=function(n){var t=this.data;"string"==typeof n||de(n)?t.set.add(n):t.hash[n]=!0},se.Cache=Bn,Nn.after=function(n,t){if("function"!=typeof t){if("function"!=typeof n)throw new Xe(T);var r=n;n=t,t=r}return n=mu(n=+n)?n:0,function(){return 1>--n?t.apply(this,arguments):void 0}},Nn.ary=function(n,t,r){return r&&$r(n,t,r)&&(t=x),t=n&&null==t?n.length:ju(+t||0,0),dr(n,E,x,x,x,x,t)},Nn.assign=Lo,Nn.at=io,Nn.before=ae,Nn.bind=bo,Nn.bindAll=mo,
+Nn.bindKey=Ao,Nn.callback=Le,Nn.chain=te,Nn.chunk=function(n,t,r){t=(r?$r(n,t,r):null==t)?1:ju(xu(t)||1,1),r=0;for(var e=n?n.length:0,u=-1,o=De(du(e/t));r<e;)o[++u]=St(n,r,r+=t);return o},Nn.compact=function(n){for(var t=-1,r=n?n.length:0,e=-1,u=[];++t<r;){var o=n[t];o&&(u[++e]=o)}return u},Nn.constant=function(n){return function(){return n}},Nn.countBy=fo,Nn.create=function(n,t,r){var e=Pu(n);return r&&$r(n,t,r)&&(t=x),t?et(e,t):e},Nn.curry=jo,Nn.curryRight=ko,Nn.debounce=le,Nn.defaults=No,Nn.defaultsDeep=To,Nn.defer=Oo,Nn.delay=Io,Nn.difference=Yu,Nn.drop=Kr,Nn.dropRight=Vr,Nn.dropRightWhile=function(n,t,r){return n&&n.length?Tt(n,mr(t,r,3),!0,!0):[]},Nn.dropWhile=function(n,t,r){return n&&n.length?Tt(n,mr(t,r,3),!0):[]},Nn.fill=function(n,t,r,e){var u=n?n.length:0;if(!u)return[];for(r&&"number"!=typeof r&&$r(n,t,r)&&(r=0,e=u),u=n.length,r=null==r?0:+r||0,0>r&&(r=-r>u?0:u+r),e=e===x||e>u?u:+e||0,0>e&&(e+=u),u=r>e?0:e>>>0,r>>>=0;r<u;)n[r++]=t;return n},Nn.filter=ue,Nn.flatten=function(n,t,r){var e=n?n.length:0;return r&&$r(n,t,r)&&(t=!1),e?_t(n,t):[]},Nn.flattenDeep=function(n){return n&&n.length?_t(n,!0):[]},Nn.flow=Ro,Nn.flowRight=Eo,Nn.forEach=lo,Nn.forEachRight=so,Nn.forIn=Bo,Nn.forInRight=Do,Nn.forOwn=Mo,Nn.forOwnRight=qo,Nn.functions=Re,Nn.groupBy=po,Nn.indexBy=ho,Nn.initial=function(n){return Vr(n,1)},Nn.intersection=Xu,Nn.invert=function(n,t,r){r&&$r(n,t,r)&&(t=x),r=-1;for(var e=Ko(n),u=e.length,o={};++r<u;){var i=e[r],f=n[i];t?eu.call(o,f)?o[f].push(i):o[f]=[i]:o[f]=i}return o},Nn.invoke=_o,Nn.keys=Ko,Nn.keysIn=Ee,Nn.map=ie,Nn.mapKeys=Vo,Nn.mapValues=Zo,Nn.matches=Te,Nn.matchesProperty=function(n,t){return jt(n,ft(t,!0))},Nn.memoize=se,Nn.merge=Fo,Nn.method=ei,Nn.methodOf=ui,Nn.mixin=Pe,Nn.modArgs=Co,Nn.negate=function(n){if("function"!=typeof n)throw new Xe(T);return function(){return!n.apply(this,arguments)}},Nn.omit=Yo,Nn.once=function(n){return ae(2,n)},Nn.pairs=Ce,Nn.partial=So,Nn.partialRight=Uo,Nn.partition=vo,Nn.pick=Go,Nn.pluck=function(n,t){return ie(n,Be(t))},Nn.property=Be,Nn.propertyOf=function(n){return function(t){return wt(n,Mr(t),t+"")}},Nn.pull=function(){var n=arguments,t=n[0];if(!t||!t.length)return t;for(var r=0,e=jr(),u=n.length;++r<u;)for(var o=0,i=n[r];-1<(o=e(t,i,o));)vu.call(t,o,1);return t},Nn.pullAt=Hu,Nn.range=function(n,t,r){r&&$r(n,t,r)&&(t=r=x),n=+n||0,r=null==r?1:+r||0,null==t?(t=n,n=0):t=+t||0;var e=-1;t=ju(du((t-n)/(r||1)),0);for(var u=De(t);++e<t;)u[e]=n,n+=r;return u},Nn.rearg=$o,Nn.reject=function(n,t,r){var e=Wo(n)?Zn:pt;return t=mr(t,r,3),e(n,function(n,r,e){return!t(n,r,e)})},Nn.remove=function(n,t,r){var e=[];if(!n||!n.length)return e;var u=-1,o=[],i=n.length;for(t=mr(t,r,3);++u<i;)r=n[u],t(r,u,n)&&(e.push(r),o.push(u));return Rt(n,o),e},Nn.rest=Jr,Nn.restParam=pe,Nn.set=function(n,t,r){if(null==n)return n;var e=t+"";t=null!=n[e]||Wr(t,n)?[e]:Mr(t);for(var e=-1,u=t.length,o=u-1,i=n;null!=i&&++e<u;){var f=t[e];de(i)&&(e==o?i[f]=r:null==i[f]&&(i[f]=Ur(t[e+1])?[]:{})),i=i[f]}return n},Nn.shuffle=function(n){return fe(n,Cu)},Nn.slice=function(n,t,r){var e=n?n.length:0;return e?(r&&"number"!=typeof r&&$r(n,t,r)&&(t=0,r=e),St(n,t,r)):[]},Nn.sortBy=function(n,t,r){if(null==n)return[];r&&$r(n,t,r)&&(t=x);var e=-1;return t=mr(t,r,3),n=mt(n,function(n,r,u){return{a:t(n,r,u),b:++e,c:n}}),$t(n,f)},Nn.sortByAll=wo,Nn.sortByOrder=function(n,t,r,e){return null==n?[]:(e&&$r(t,r,e)&&(r=x),Wo(t)||(t=null==t?[]:[t]),Wo(r)||(r=null==r?[]:[r]),Wt(n,t,r))},Nn.spread=function(n){if("function"!=typeof n)throw new Xe(T);return function(t){return n.apply(this,t)}},Nn.take=function(n,t,r){return n&&n.length?((r?$r(n,t,r):null==t)&&(t=1),St(n,0,0>t?0:t)):[]},Nn.takeRight=function(n,t,r){var e=n?n.length:0;return e?((r?$r(n,t,r):null==t)&&(t=1),t=e-(+t||0),St(n,0>t?0:t)):[]},Nn.takeRightWhile=function(n,t,r){return n&&n.length?Tt(n,mr(t,r,3),!1,!0):[]},Nn.takeWhile=function(n,t,r){return n&&n.length?Tt(n,mr(t,r,3)):[]},Nn.tap=function(n,t,r){return t.call(r,n),n},Nn.throttle=function(n,t,r){var e=!0,u=!0;if("function"!=typeof n)throw new Xe(T);return!1===r?e=!1:de(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),le(n,t,{leading:e,maxWait:+t,trailing:u})},Nn.thru=re,Nn.times=function(n,t,r){if(n=xu(n),1>n||!mu(n))return[];var e=-1,u=De(ku(n,4294967295));for(t=Dt(t,r,1);++e<n;)4294967295>e?u[e]=t(e):t(e);return u},Nn.toArray=Oe,Nn.toPlainObject=Ie,Nn.transform=function(n,t,r,e){var u=Wo(n)||je(n);return t=mr(t,e,4),null==r&&(u||de(n)?(e=n.constructor,r=u?Wo(n)?new e:[]:Pu(ye(e)?e.prototype:x)):r={}),(u?Kn:gt)(n,function(n,e,u){return t(r,n,e,u)}),r},Nn.union=to,Nn.uniq=Xr,Nn.unzip=Hr,Nn.unzipWith=Qr,Nn.values=Se,Nn.valuesIn=function(n){return Nt(n,Ee(n))},Nn.where=function(n,t){return ue(n,At(t))},Nn.without=ro,Nn.wrap=function(n,t){return t=null==t?Ne:t,dr(t,I,x,[n],[])},Nn.xor=function(){for(var n=-1,t=arguments.length;++n<t;){var r=arguments[n];if(Sr(r))var e=e?Hn(at(e,r),at(r,e)):r}return e?Lt(e):[]},Nn.zip=eo,Nn.zipObject=ne,Nn.zipWith=uo,Nn.backflow=Eo,Nn.collect=ie,Nn.compose=Eo,Nn.each=lo,Nn.eachRight=so,Nn.extend=Lo,Nn.iteratee=Le,Nn.methods=Re,Nn.object=ne,Nn.select=ue,Nn.tail=Jr,Nn.unique=Xr,Pe(Nn,Nn),Nn.add=function(n,t){return(+n||0)+(+t||0)},Nn.attempt=ri,Nn.camelCase=Jo,Nn.capitalize=function(n){return(n=u(n))&&n.charAt(0).toUpperCase()+n.slice(1)},Nn.ceil=oi,Nn.clone=function(n,t,r,e){return t&&"boolean"!=typeof t&&$r(n,t,r)?t=!1:"function"==typeof t&&(e=r,r=t,t=!1),"function"==typeof r?ft(n,t,Dt(r,e,3)):ft(n,t)},Nn.cloneDeep=function(n,t,r){return"function"==typeof t?ft(n,!0,Dt(t,r,3)):ft(n,!0)},Nn.deburr=Ue,Nn.endsWith=function(n,t,r){n=u(n),t+="";var e=n.length;return r=r===x?e:ku(0>r?0:+r||0,e),r-=t.length,0<=r&&n.indexOf(t,r)==r},Nn.escape=function(n){return(n=u(n))&&hn.test(n)?n.replace(sn,a):n},Nn.escapeRegExp=function(n){return(n=u(n))&&bn.test(n)?n.replace(xn,l):n||"(?:)"},Nn.every=ee,Nn.find=co,Nn.findIndex=Gu,Nn.findKey=Po,Nn.findLast=ao,Nn.findLastIndex=Ju,Nn.findLastKey=zo,Nn.findWhere=function(n,t){return co(n,At(t))},Nn.first=Zr,Nn.floor=ii,Nn.get=function(n,t,r){return n=null==n?x:wt(n,Mr(t),t+""),n===x?r:n},Nn.gt=he,Nn.gte=function(n,t){return n>=t},Nn.has=function(n,t){if(null==n)return!1;var r=eu.call(n,t);if(!r&&!Wr(t)){if(t=Mr(t),n=1==t.length?n:wt(n,St(t,0,-1)),null==n)return!1;t=Gr(t),r=eu.call(n,t)}return r||Lr(n.length)&&Ur(t,n.length)&&(Wo(n)||_e(n)||Ae(n))},Nn.identity=Ne,Nn.includes=oe,Nn.indexOf=Yr,Nn.inRange=function(n,t,r){return t=+t||0,r===x?(r=t,t=0):r=+r||0,n>=ku(t,r)&&n<ju(t,r)},Nn.isArguments=_e,Nn.isArray=Wo,Nn.isBoolean=function(n){return!0===n||!1===n||h(n)&&ou.call(n)==D},Nn.isDate=function(n){return h(n)&&ou.call(n)==M},Nn.isElement=function(n){return!!n&&1===n.nodeType&&h(n)&&!be(n)},Nn.isEmpty=function(n){return null==n||(Sr(n)&&(Wo(n)||Ae(n)||_e(n)||h(n)&&ye(n.splice))?!n.length:!Ko(n).length)},Nn.isEqual=ve,Nn.isError=ge,Nn.isFinite=function(n){return"number"==typeof n&&mu(n)},Nn.isFunction=ye,Nn.isMatch=function(n,t,r,e){return r="function"==typeof r?Dt(r,e,3):x,bt(n,kr(t),r)},Nn.isNaN=function(n){return xe(n)&&n!=+n},Nn.isNative=we,Nn.isNull=function(n){return null===n},Nn.isNumber=xe,Nn.isObject=de,Nn.isPlainObject=be,Nn.isRegExp=me,Nn.isString=Ae,Nn.isTypedArray=je,Nn.isUndefined=function(n){return n===x},Nn.kebabCase=Xo,Nn.last=Gr,Nn.lastIndexOf=function(n,t,r){var e=n?n.length:0;if(!e)return-1;var u=e;if("number"==typeof r)u=(0>r?ju(e+r,0):ku(r||0,e-1))+1;else if(r)return u=zt(n,t,!0)-1,n=n[u],(t===t?t===n:n!==n)?u:-1;if(t!==t)return p(n,u,!0);for(;u--;)if(n[u]===t)return u;return-1},Nn.lt=ke,Nn.lte=function(n,t){return n<=t},Nn.max=fi,Nn.min=ci,Nn.noConflict=function(){return Yn._=iu,this},Nn.noop=ze,Nn.now=xo,Nn.pad=function(n,t,r){n=u(n),t=+t;var e=n.length;return e<t&&mu(t)?(e=(t-e)/2,t=xu(e),e=du(e),r=_r("",e,r),r.slice(0,t)+n+r):n},Nn.padLeft=Ho,Nn.padRight=Qo,Nn.parseInt=function(n,t,r){return(r?$r(n,t,r):null==t)?t=0:t&&(t=+t),n=We(n),Iu(n,t||(On.test(n)?16:10))},Nn.random=function(n,t,r){r&&$r(n,t,r)&&(t=r=x);var e=null==n,u=null==t;return null==r&&(u&&"boolean"==typeof n?(r=n,n=1):"boolean"==typeof t&&(r=t,u=!0)),e&&u&&(t=1,u=!1),n=+n||0,u?(t=n,n=0):t=+t||0,r||n%1||t%1?(r=Ru(),ku(n+r*(t-n+lu("1e-"+((r+"").length-1))),t)):Et(n,t)},Nn.reduce=go,Nn.reduceRight=yo,Nn.repeat=$e,Nn.result=function(n,t,r){var e=null==n?x:Dr(n)[t];return e===x&&(null==n||Wr(t,n)||(t=Mr(t),n=1==t.length?n:wt(n,St(t,0,-1)),e=null==n?x:Dr(n)[Gr(t)]),e=e===x?r:e),ye(e)?e.call(n):e},Nn.round=ai,Nn.runInContext=w,Nn.size=function(n){var t=n?Vu(n):0;return Lr(t)?t:Ko(n).length},Nn.snakeCase=ni,Nn.some=ce,Nn.sortedIndex=Qu,Nn.sortedLastIndex=no,Nn.startCase=ti,Nn.startsWith=function(n,t,r){return n=u(n),r=null==r?0:ku(0>r?0:+r||0,n.length),n.lastIndexOf(t,r)==r},Nn.sum=function(n,t,r){if(r&&$r(n,t,r)&&(t=x),t=mr(t,r,3),1==t.length){n=Wo(n)?n:Br(n),r=n.length;for(var e=0;r--;)e+=+t(n[r])||0;n=e}else n=Ft(n,t);return n},Nn.template=function(n,t,r){var e=Nn.templateSettings;r&&$r(n,t,r)&&(t=r=x),n=u(n),t=rt(et({},r||t),e,tt),r=rt(et({},t.imports),e.imports,tt);var o,i,f=Ko(r),c=Nt(r,f),a=0;r=t.interpolate||Cn;var l="__p+='";r=Ge((t.escape||Cn).source+"|"+r.source+"|"+(r===gn?jn:Cn).source+"|"+(t.evaluate||Cn).source+"|$","g");var p="sourceURL"in t?"//# sourceURL="+t.sourceURL+"\n":"";if(n.replace(r,function(t,r,e,u,f,c){return e||(e=u),l+=n.slice(a,c).replace(Sn,s),r&&(o=!0,l+="'+__e("+r+")+'"),f&&(i=!0,l+="';"+f+";\n__p+='"),e&&(l+="'+((__t=("+e+"))==null?'':__t)+'"),a=c+t.length,t}),l+="';",(t=t.variable)||(l="with(obj){"+l+"}"),l=(i?l.replace(fn,""):l).replace(cn,"$1").replace(an,"$1;"),l="function("+(t||"obj")+"){"+(t?"":"obj||(obj={});")+"var __t,__p=''"+(o?",__e=_.escape":"")+(i?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}",t=ri(function(){return Ke(f,p+"return "+l).apply(x,c)}),t.source=l,ge(t))throw t;return t},Nn.trim=We,Nn.trimLeft=function(n,t,r){var e=n;return(n=u(n))?n.slice((r?$r(e,t,r):null==t)?g(n):o(n,t+"")):n},Nn.trimRight=function(n,t,r){var e=n;return(n=u(n))?(r?$r(e,t,r):null==t)?n.slice(0,y(n)+1):n.slice(0,i(n,t+"")+1):n},Nn.trunc=function(n,t,r){r&&$r(n,t,r)&&(t=x);var e=S;if(r=U,null!=t)if(de(t)){var o="separator"in t?t.separator:o,e="length"in t?+t.length||0:e;r="omission"in t?u(t.omission):r}else e=+t||0;if(n=u(n),e>=n.length)return n;if(e-=r.length,1>e)return r;if(t=n.slice(0,e),null==o)return t+r;if(me(o)){if(n.slice(e).search(o)){var i,f=n.slice(0,e);for(o.global||(o=Ge(o.source,(kn.exec(o)||"")+"g")),o.lastIndex=0;n=o.exec(f);)i=n.index;t=t.slice(0,null==i?e:i)}}else n.indexOf(o,e)!=e&&(o=t.lastIndexOf(o),-1<o&&(t=t.slice(0,o)));return t+r},Nn.unescape=function(n){return(n=u(n))&&pn.test(n)?n.replace(ln,d):n},Nn.uniqueId=function(n){var t=++uu;return u(n)+t},Nn.words=Fe,Nn.all=ee,Nn.any=ce,Nn.contains=oe,Nn.eq=ve,Nn.detect=co,Nn.foldl=go,Nn.foldr=yo,Nn.head=Zr,Nn.include=oe,Nn.inject=go,Pe(Nn,function(){var n={};return gt(Nn,function(t,r){Nn.prototype[r]||(n[r]=t)}),n}(),!1),Nn.sample=fe,Nn.prototype.sample=function(n){return this.__chain__||null!=n?this.thru(function(t){return fe(t,n)}):fe(this.value())},Nn.VERSION=b,Kn("bind bindKey curry curryRight partial partialRight".split(" "),function(n){Nn[n].placeholder=Nn}),Kn(["drop","take"],function(n,t){zn.prototype[n]=function(r){var e=this.__filtered__;if(e&&!t)return new zn(this);r=null==r?1:ju(xu(r)||0,0);var u=this.clone();return e?u.__takeCount__=ku(u.__takeCount__,r):u.__views__.push({size:r,type:n+(0>u.__dir__?"Right":"")}),u},zn.prototype[n+"Right"]=function(t){return this.reverse()[n](t).reverse()}}),Kn(["filter","map","takeWhile"],function(n,t){var r=t+1,e=r!=N;zn.prototype[n]=function(n,t){var u=this.clone();return u.__iteratees__.push({iteratee:mr(n,t,1),type:r}),u.__filtered__=u.__filtered__||e,u}}),Kn(["first","last"],function(n,t){var r="take"+(t?"Right":"");zn.prototype[n]=function(){return this[r](1).value()[0]}}),Kn(["initial","rest"],function(n,t){var r="drop"+(t?"":"Right");zn.prototype[n]=function(){return this.__filtered__?new zn(this):this[r](1)}}),Kn(["pluck","where"],function(n,t){var r=t?"filter":"map",e=t?At:Be;zn.prototype[n]=function(n){return this[r](e(n))}}),zn.prototype.compact=function(){return this.filter(Ne)},zn.prototype.reject=function(n,t){return n=mr(n,t,1),this.filter(function(t){return!n(t)})},zn.prototype.slice=function(n,t){n=null==n?0:+n||0;var r=this;return r.__filtered__&&(0<n||0>t)?new zn(r):(0>n?r=r.takeRight(-n):n&&(r=r.drop(n)),t!==x&&(t=+t||0,r=0>t?r.dropRight(-t):r.take(t-n)),r)},zn.prototype.takeRightWhile=function(n,t){return this.reverse().takeWhile(n,t).reverse()},zn.prototype.toArray=function(){return this.take(Cu)},gt(zn.prototype,function(n,t){var r=/^(?:filter|map|reject)|While$/.test(t),e=/^(?:first|last)$/.test(t),u=Nn[e?"take"+("last"==t?"Right":""):t];u&&(Nn.prototype[t]=function(){var t=e?[1]:arguments,o=this.__chain__,i=this.__wrapped__,f=!!this.__actions__.length,c=i instanceof zn,a=t[0],l=c||Wo(i);l&&r&&"function"==typeof a&&1!=a.length&&(c=l=!1);var s=function(n){return e&&o?u(n,1)[0]:u.apply(x,Hn([n],t))},a={func:re,args:[s],thisArg:x},f=c&&!f;return e&&!o?f?(i=i.clone(),i.__actions__.push(a),n.call(i)):u.call(x,this.value())[0]:!e&&l?(i=f?i:new zn(this),i=n.apply(i,t),i.__actions__.push(a),new Pn(i,o)):this.thru(s)})}),Kn("join pop push replace shift sort splice split unshift".split(" "),function(n){var t=(/^(?:replace|split)$/.test(n)?tu:He)[n],r=/^(?:push|sort|unshift)$/.test(n)?"tap":"thru",e=!Tu.spliceObjects&&/^(?:pop|shift|splice)$/.test(n),u=/^(?:join|pop|replace|shift)$/.test(n),o=e?function(){var n=t.apply(this,arguments);return 0===this.length&&delete this[0],n}:t;Nn.prototype[n]=function(){var n=arguments;return u&&!this.__chain__?o.apply(this.value(),n):this[r](function(t){return o.apply(t,n)})}}),gt(zn.prototype,function(n,t){var r=Nn[t];if(r){var e=r.name+"";(Fu[e]||(Fu[e]=[])).push({name:t,func:r})}}),Fu[hr(x,A).name]=[{name:"wrapper",func:x}],zn.prototype.clone=function(){var n=new zn(this.__wrapped__);return n.__actions__=qn(this.__actions__),n.__dir__=this.__dir__,n.__filtered__=this.__filtered__,n.__iteratees__=qn(this.__iteratees__),n.__takeCount__=this.__takeCount__,n.__views__=qn(this.__views__),n},zn.prototype.reverse=function(){if(this.__filtered__){var n=new zn(this);n.__dir__=-1,n.__filtered__=!0}else n=this.clone(),n.__dir__*=-1;return n},zn.prototype.value=function(){var n,t=this.__wrapped__.value(),r=this.__dir__,e=Wo(t),u=0>r,o=e?t.length:0;n=0;for(var i=o,f=this.__views__,c=-1,a=f.length;++c<a;){var l=f[c],s=l.size;switch(l.type){case"drop":n+=s;break;case"dropRight":i-=s;break;case"take":i=ku(i,n+s);break;case"takeRight":n=ju(n,i-s)}}if(n={start:n,end:i},i=n.start,f=n.end,n=f-i,u=u?f:i-1,i=this.__iteratees__,f=i.length,c=0,a=ku(n,this.__takeCount__),!e||o<F||o==n&&a==n)return Pt(t,this.__actions__);e=[];n:for(;n--&&c<a;){for(u+=r,o=-1,l=t[u];++o<f;){var p=i[o],s=p.type,p=p.iteratee(l);if(s==N)l=p;else if(!p){if(s==L)continue n;break n}}e[c++]=l}return e},Nn.prototype.chain=function(){return te(this)},Nn.prototype.commit=function(){return new Pn(this.value(),this.__chain__)},Nn.prototype.concat=oo,Nn.prototype.plant=function(n){for(var t,r=this;r instanceof Tn;){var e=qr(r);t?u.__wrapped__=e:t=e;var u=e,r=r.__wrapped__}return u.__wrapped__=n,t},Nn.prototype.reverse=function(){var n=this.__wrapped__,t=function(n){return n.reverse()};return n instanceof zn?(this.__actions__.length&&(n=new zn(this)),n=n.reverse(),n.__actions__.push({func:re,args:[t],thisArg:x}),new Pn(n,this.__chain__)):this.thru(t)},Nn.prototype.toString=function(){return this.value()+""},Nn.prototype.run=Nn.prototype.toJSON=Nn.prototype.valueOf=Nn.prototype.value=function(){return Pt(this.__wrapped__,this.__actions__)},Nn.prototype.collect=Nn.prototype.map,Nn.prototype.head=Nn.prototype.first,Nn.prototype.select=Nn.prototype.filter,Nn.prototype.tail=Nn.prototype.rest,Nn}var x,b="3.10.1",m=1,A=2,j=4,k=8,O=16,I=32,R=64,E=128,C=256,S=30,U="...",$=150,W=16,F=200,L=1,N=2,T="Expected a function",P="__lodash_placeholder__",z="[object Arguments]",B="[object Array]",D="[object Boolean]",M="[object Date]",q="[object Error]",K="[object Function]",V="[object Number]",Z="[object Object]",Y="[object RegExp]",G="[object String]",J="[object ArrayBuffer]",X="[object Float32Array]",H="[object Float64Array]",Q="[object Int8Array]",nn="[object Int16Array]",tn="[object Int32Array]",rn="[object Uint8Array]",en="[object Uint8ClampedArray]",un="[object Uint16Array]",on="[object Uint32Array]",fn=/\b__p\+='';/g,cn=/\b(__p\+=)''\+/g,an=/(__e\(.*?\)|\b__t\))\+'';/g,ln=/&(?:amp|lt|gt|quot|#39|#96);/g,sn=/[&<>"'`]/g,pn=RegExp(ln.source),hn=RegExp(sn.source),_n=/<%-([\s\S]+?)%>/g,vn=/<%([\s\S]+?)%>/g,gn=/<%=([\s\S]+?)%>/g,yn=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\n\\]|\\.)*?\1)\]/,dn=/^\w*$/,wn=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g,xn=/^[:!,]|[\\^$.*+?()[\]{}|\/]|(^[0-9a-fA-Fnrtuvx])|([\n\r\u2028\u2029])/g,bn=RegExp(xn.source),mn=/[\u0300-\u036f\ufe20-\ufe23]/g,An=/\\(\\)?/g,jn=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,kn=/\w*$/,On=/^0[xX]/,In=/^\[object .+?Constructor\]$/,Rn=/^\d+$/,En=/[\xc0-\xd6\xd8-\xde\xdf-\xf6\xf8-\xff]/g,Cn=/($^)/,Sn=/['\n\r\u2028\u2029\\]/g,Un=RegExp("[A-Z\\xc0-\\xd6\\xd8-\\xde]+(?=[A-Z\\xc0-\\xd6\\xd8-\\xde][a-z\\xdf-\\xf6\\xf8-\\xff]+)|[A-Z\\xc0-\\xd6\\xd8-\\xde]?[a-z\\xdf-\\xf6\\xf8-\\xff]+|[A-Z\\xc0-\\xd6\\xd8-\\xde]+|[0-9]+","g"),$n="Array ArrayBuffer Date Error Float32Array Float64Array Function Int8Array Int16Array Int32Array Math Number Object RegExp Set String _ clearTimeout isFinite parseFloat parseInt setTimeout TypeError Uint8Array Uint8ClampedArray Uint16Array Uint32Array WeakMap".split(" "),Wn="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),Fn={};Fn[X]=Fn[H]=Fn[Q]=Fn[nn]=Fn[tn]=Fn[rn]=Fn[en]=Fn[un]=Fn[on]=!0,Fn[z]=Fn[B]=Fn[J]=Fn[D]=Fn[M]=Fn[q]=Fn[K]=Fn["[object Map]"]=Fn[V]=Fn[Z]=Fn[Y]=Fn["[object Set]"]=Fn[G]=Fn["[object WeakMap]"]=!1;var Ln={};Ln[z]=Ln[B]=Ln[J]=Ln[D]=Ln[M]=Ln[X]=Ln[H]=Ln[Q]=Ln[nn]=Ln[tn]=Ln[V]=Ln[Z]=Ln[Y]=Ln[G]=Ln[rn]=Ln[en]=Ln[un]=Ln[on]=!0,Ln[q]=Ln[K]=Ln["[object Map]"]=Ln["[object Set]"]=Ln["[object WeakMap]"]=!1;var Nn={"À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","Ç":"C","ç":"c","Ð":"D","ð":"d","È":"E","É":"E","Ê":"E","Ë":"E","è":"e","é":"e","ê":"e","ë":"e","Ì":"I","Í":"I","Î":"I","Ï":"I","ì":"i","í":"i","î":"i","ï":"i","Ñ":"N","ñ":"n","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","Ù":"U","Ú":"U","Û":"U","Ü":"U","ù":"u","ú":"u","û":"u","ü":"u","Ý":"Y","ý":"y","ÿ":"y","Æ":"Ae","æ":"ae","Þ":"Th","þ":"th","ß":"ss"},Tn={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","`":"&#96;"},Pn={"&amp;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#39;":"'","&#96;":"`"},zn={"function":!0,object:!0},Bn={0:"x30",1:"x31",2:"x32",3:"x33",4:"x34",5:"x35",6:"x36",7:"x37",8:"x38",9:"x39",A:"x41",B:"x42",C:"x43",D:"x44",E:"x45",F:"x46",a:"x61",b:"x62",c:"x63",d:"x64",e:"x65",f:"x66",n:"x6e",r:"x72",t:"x74",u:"x75",v:"x76",x:"x78"},Dn={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Mn=zn[typeof exports]&&exports&&!exports.nodeType&&exports,qn=zn[typeof module]&&module&&!module.nodeType&&module,Kn=zn[typeof self]&&self&&self.Object&&self,Vn=zn[typeof window]&&window&&window.Object&&window,Zn=qn&&qn.exports===Mn&&Mn,Yn=Mn&&qn&&"object"==typeof global&&global&&global.Object&&global||Vn!==(this&&this.window)&&Vn||Kn||this,Gn=function(){try{Object({toString:0}+"")}catch(n){return function(){return!1}}return function(n){return"function"!=typeof n.toString&&"string"==typeof(n+"")}}(),Jn=w();"function"==typeof define&&"object"==typeof define.amd&&define.amd?(Yn._=Jn,define(function(){return Jn})):Mn&&qn?Zn?(qn.exports=Jn)._=Jn:Mn._=Jn:Yn._=Jn}).call(this);
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/marked.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/marked.js
index c2a678d5504..c334bffeac7 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/marked.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/marked.js
@@ -1,1272 +1 @@
-/**
- * marked - a markdown parser
- * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
- * https://github.com/chjj/marked
- */
-
-;(function() {
-
-/**
- * Block-Level Grammar
- */
-
-var block = {
-  newline: /^\n+/,
-  code: /^( {4}[^\n]+\n*)+/,
-  fences: noop,
-  hr: /^( *[-*_]){3,} *(?:\n+|$)/,
-  heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,
-  nptable: noop,
-  lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
-  blockquote: /^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,
-  list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
-  html: /^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,
-  def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
-  table: noop,
-  paragraph: /^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,
-  text: /^[^\n]+/
-};
-
-block.bullet = /(?:[*+-]|\d+\.)/;
-block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;
-block.item = replace(block.item, 'gm')
-  (/bull/g, block.bullet)
-  ();
-
-block.list = replace(block.list)
-  (/bull/g, block.bullet)
-  ('hr', '\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))')
-  ('def', '\\n+(?=' + block.def.source + ')')
-  ();
-
-block.blockquote = replace(block.blockquote)
-  ('def', block.def)
-  ();
-
-block._tag = '(?!(?:'
-  + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
-  + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'
-  + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b';
-
-block.html = replace(block.html)
-  ('comment', /<!--[\s\S]*?-->/)
-  ('closed', /<(tag)[\s\S]+?<\/\1>/)
-  ('closing', /<tag(?:"[^"]*"|'[^']*'|[^'">])*?>/)
-  (/tag/g, block._tag)
-  ();
-
-block.paragraph = replace(block.paragraph)
-  ('hr', block.hr)
-  ('heading', block.heading)
-  ('lheading', block.lheading)
-  ('blockquote', block.blockquote)
-  ('tag', '<' + block._tag)
-  ('def', block.def)
-  ();
-
-/**
- * Normal Block Grammar
- */
-
-block.normal = merge({}, block);
-
-/**
- * GFM Block Grammar
- */
-
-block.gfm = merge({}, block.normal, {
-  fences: /^ *(`{3,}|~{3,}) *(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,
-  paragraph: /^/
-});
-
-block.gfm.paragraph = replace(block.paragraph)
-  ('(?!', '(?!'
-    + block.gfm.fences.source.replace('\\1', '\\2') + '|'
-    + block.list.source.replace('\\1', '\\3') + '|')
-  ();
-
-/**
- * GFM + Tables Block Grammar
- */
-
-block.tables = merge({}, block.gfm, {
-  nptable: /^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,
-  table: /^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/
-});
-
-/**
- * Block Lexer
- */
-
-function Lexer(options) {
-  this.tokens = [];
-  this.tokens.links = {};
-  this.options = options || marked.defaults;
-  this.rules = block.normal;
-
-  if (this.options.gfm) {
-    if (this.options.tables) {
-      this.rules = block.tables;
-    } else {
-      this.rules = block.gfm;
-    }
-  }
-}
-
-/**
- * Expose Block Rules
- */
-
-Lexer.rules = block;
-
-/**
- * Static Lex Method
- */
-
-Lexer.lex = function(src, options) {
-  var lexer = new Lexer(options);
-  return lexer.lex(src);
-};
-
-/**
- * Preprocessing
- */
-
-Lexer.prototype.lex = function(src) {
-  src = src
-    .replace(/\r\n|\r/g, '\n')
-    .replace(/\t/g, '    ')
-    .replace(/\u00a0/g, ' ')
-    .replace(/\u2424/g, '\n');
-
-  return this.token(src, true);
-};
-
-/**
- * Lexing
- */
-
-Lexer.prototype.token = function(src, top, bq) {
-  var src = src.replace(/^ +$/gm, '')
-    , next
-    , loose
-    , cap
-    , bull
-    , b
-    , item
-    , space
-    , i
-    , l;
-
-  while (src) {
-    // newline
-    if (cap = this.rules.newline.exec(src)) {
-      src = src.substring(cap[0].length);
-      if (cap[0].length > 1) {
-        this.tokens.push({
-          type: 'space'
-        });
-      }
-    }
-
-    // code
-    if (cap = this.rules.code.exec(src)) {
-      src = src.substring(cap[0].length);
-      cap = cap[0].replace(/^ {4}/gm, '');
-      this.tokens.push({
-        type: 'code',
-        text: !this.options.pedantic
-          ? cap.replace(/\n+$/, '')
-          : cap
-      });
-      continue;
-    }
-
-    // fences (gfm)
-    if (cap = this.rules.fences.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'code',
-        lang: cap[2],
-        text: cap[3]
-      });
-      continue;
-    }
-
-    // heading
-    if (cap = this.rules.heading.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'heading',
-        depth: cap[1].length,
-        text: cap[2]
-      });
-      continue;
-    }
-
-    // table no leading pipe (gfm)
-    if (top && (cap = this.rules.nptable.exec(src))) {
-      src = src.substring(cap[0].length);
-
-      item = {
-        type: 'table',
-        header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */),
-        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
-        cells: cap[3].replace(/\n$/, '').split('\n')
-      };
-
-      for (i = 0; i < item.align.length; i++) {
-        if (/^ *-+: *$/.test(item.align[i])) {
-          item.align[i] = 'right';
-        } else if (/^ *:-+: *$/.test(item.align[i])) {
-          item.align[i] = 'center';
-        } else if (/^ *:-+ *$/.test(item.align[i])) {
-          item.align[i] = 'left';
-        } else {
-          item.align[i] = null;
-        }
-      }
-
-      for (i = 0; i < item.cells.length; i++) {
-        item.cells[i] = item.cells[i].split(/ *\| */);
-      }
-
-      this.tokens.push(item);
-
-      continue;
-    }
-
-    // lheading
-    if (cap = this.rules.lheading.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'heading',
-        depth: cap[2] === '=' ? 1 : 2,
-        text: cap[1]
-      });
-      continue;
-    }
-
-    // hr
-    if (cap = this.rules.hr.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'hr'
-      });
-      continue;
-    }
-
-    // blockquote
-    if (cap = this.rules.blockquote.exec(src)) {
-      src = src.substring(cap[0].length);
-
-      this.tokens.push({
-        type: 'blockquote_start'
-      });
-
-      cap = cap[0].replace(/^ *> ?/gm, '');
-
-      // Pass `top` to keep the current
-      // "toplevel" state. This is exactly
-      // how markdown.pl works.
-      this.token(cap, top, true);
-
-      this.tokens.push({
-        type: 'blockquote_end'
-      });
-
-      continue;
-    }
-
-    // list
-    if (cap = this.rules.list.exec(src)) {
-      src = src.substring(cap[0].length);
-      bull = cap[2];
-
-      this.tokens.push({
-        type: 'list_start',
-        ordered: bull.length > 1
-      });
-
-      // Get each top-level item.
-      cap = cap[0].match(this.rules.item);
-
-      next = false;
-      l = cap.length;
-      i = 0;
-
-      for (; i < l; i++) {
-        item = cap[i];
-
-        // Remove the list item's bullet
-        // so it is seen as the next token.
-        space = item.length;
-        item = item.replace(/^ *([*+-]|\d+\.) +/, '');
-
-        // Outdent whatever the
-        // list item contains. Hacky.
-        if (~item.indexOf('\n ')) {
-          space -= item.length;
-          item = !this.options.pedantic
-            ? item.replace(new RegExp('^ {1,' + space + '}', 'gm'), '')
-            : item.replace(/^ {1,4}/gm, '');
-        }
-
-        // Determine whether the next list item belongs here.
-        // Backpedal if it does not belong in this list.
-        if (this.options.smartLists && i !== l - 1) {
-          b = block.bullet.exec(cap[i + 1])[0];
-          if (bull !== b && !(bull.length > 1 && b.length > 1)) {
-            src = cap.slice(i + 1).join('\n') + src;
-            i = l - 1;
-          }
-        }
-
-        // Determine whether item is loose or not.
-        // Use: /(^|\n)(?! )[^\n]+\n\n(?!\s*$)/
-        // for discount behavior.
-        loose = next || /\n\n(?!\s*$)/.test(item);
-        if (i !== l - 1) {
-          next = item.charAt(item.length - 1) === '\n';
-          if (!loose) loose = next;
-        }
-
-        this.tokens.push({
-          type: loose
-            ? 'loose_item_start'
-            : 'list_item_start'
-        });
-
-        // Recurse.
-        this.token(item, false, bq);
-
-        this.tokens.push({
-          type: 'list_item_end'
-        });
-      }
-
-      this.tokens.push({
-        type: 'list_end'
-      });
-
-      continue;
-    }
-
-    // html
-    if (cap = this.rules.html.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: this.options.sanitize
-          ? 'paragraph'
-          : 'html',
-        pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style',
-        text: cap[0]
-      });
-      continue;
-    }
-
-    // def
-    if ((!bq && top) && (cap = this.rules.def.exec(src))) {
-      src = src.substring(cap[0].length);
-      this.tokens.links[cap[1].toLowerCase()] = {
-        href: cap[2],
-        title: cap[3]
-      };
-      continue;
-    }
-
-    // table (gfm)
-    if (top && (cap = this.rules.table.exec(src))) {
-      src = src.substring(cap[0].length);
-
-      item = {
-        type: 'table',
-        header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */),
-        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
-        cells: cap[3].replace(/(?: *\| *)?\n$/, '').split('\n')
-      };
-
-      for (i = 0; i < item.align.length; i++) {
-        if (/^ *-+: *$/.test(item.align[i])) {
-          item.align[i] = 'right';
-        } else if (/^ *:-+: *$/.test(item.align[i])) {
-          item.align[i] = 'center';
-        } else if (/^ *:-+ *$/.test(item.align[i])) {
-          item.align[i] = 'left';
-        } else {
-          item.align[i] = null;
-        }
-      }
-
-      for (i = 0; i < item.cells.length; i++) {
-        item.cells[i] = item.cells[i]
-          .replace(/^ *\| *| *\| *$/g, '')
-          .split(/ *\| */);
-      }
-
-      this.tokens.push(item);
-
-      continue;
-    }
-
-    // top-level paragraph
-    if (top && (cap = this.rules.paragraph.exec(src))) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'paragraph',
-        text: cap[1].charAt(cap[1].length - 1) === '\n'
-          ? cap[1].slice(0, -1)
-          : cap[1]
-      });
-      continue;
-    }
-
-    // text
-    if (cap = this.rules.text.exec(src)) {
-      // Top-level should never reach here.
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'text',
-        text: cap[0]
-      });
-      continue;
-    }
-
-    if (src) {
-      throw new
-        Error('Infinite loop on byte: ' + src.charCodeAt(0));
-    }
-  }
-
-  return this.tokens;
-};
-
-/**
- * Inline-Level Grammar
- */
-
-var inline = {
-  escape: /^\\([\\`*{}\[\]()#+\-.!_>])/,
-  autolink: /^<([^ >]+(@|:\/)[^ >]+)>/,
-  url: noop,
-  tag: /^<!--[\s\S]*?-->|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,
-  link: /^!?\[(inside)\]\(href\)/,
-  reflink: /^!?\[(inside)\]\s*\[([^\]]*)\]/,
-  nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,
-  strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,
-  em: /^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,
-  code: /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,
-  br: /^ {2,}\n(?!\s*$)/,
-  del: noop,
-  text: /^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/
-};
-
-inline._inside = /(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/;
-inline._href = /\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;
-
-inline.link = replace(inline.link)
-  ('inside', inline._inside)
-  ('href', inline._href)
-  ();
-
-inline.reflink = replace(inline.reflink)
-  ('inside', inline._inside)
-  ();
-
-/**
- * Normal Inline Grammar
- */
-
-inline.normal = merge({}, inline);
-
-/**
- * Pedantic Inline Grammar
- */
-
-inline.pedantic = merge({}, inline.normal, {
-  strong: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,
-  em: /^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/
-});
-
-/**
- * GFM Inline Grammar
- */
-
-inline.gfm = merge({}, inline.normal, {
-  escape: replace(inline.escape)('])', '~|])')(),
-  url: /^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,
-  del: /^~~(?=\S)([\s\S]*?\S)~~/,
-  text: replace(inline.text)
-    (']|', '~]|')
-    ('|', '|https?://|')
-    ()
-});
-
-/**
- * GFM + Line Breaks Inline Grammar
- */
-
-inline.breaks = merge({}, inline.gfm, {
-  br: replace(inline.br)('{2,}', '*')(),
-  text: replace(inline.gfm.text)('{2,}', '*')()
-});
-
-/**
- * Inline Lexer & Compiler
- */
-
-function InlineLexer(links, options) {
-  this.options = options || marked.defaults;
-  this.links = links;
-  this.rules = inline.normal;
-  this.renderer = this.options.renderer || new Renderer;
-  this.renderer.options = this.options;
-
-  if (!this.links) {
-    throw new
-      Error('Tokens array requires a `links` property.');
-  }
-
-  if (this.options.gfm) {
-    if (this.options.breaks) {
-      this.rules = inline.breaks;
-    } else {
-      this.rules = inline.gfm;
-    }
-  } else if (this.options.pedantic) {
-    this.rules = inline.pedantic;
-  }
-}
-
-/**
- * Expose Inline Rules
- */
-
-InlineLexer.rules = inline;
-
-/**
- * Static Lexing/Compiling Method
- */
-
-InlineLexer.output = function(src, links, options) {
-  var inline = new InlineLexer(links, options);
-  return inline.output(src);
-};
-
-/**
- * Lexing/Compiling
- */
-
-InlineLexer.prototype.output = function(src) {
-  var out = ''
-    , link
-    , text
-    , href
-    , cap;
-
-  while (src) {
-    // escape
-    if (cap = this.rules.escape.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += cap[1];
-      continue;
-    }
-
-    // autolink
-    if (cap = this.rules.autolink.exec(src)) {
-      src = src.substring(cap[0].length);
-      if (cap[2] === '@') {
-        text = cap[1].charAt(6) === ':'
-          ? this.mangle(cap[1].substring(7))
-          : this.mangle(cap[1]);
-        href = this.mangle('mailto:') + text;
-      } else {
-        text = escape(cap[1]);
-        href = text;
-      }
-      out += this.renderer.link(href, null, text);
-      continue;
-    }
-
-    // url (gfm)
-    if (!this.inLink && (cap = this.rules.url.exec(src))) {
-      src = src.substring(cap[0].length);
-      text = escape(cap[1]);
-      href = text;
-      out += this.renderer.link(href, null, text);
-      continue;
-    }
-
-    // tag
-    if (cap = this.rules.tag.exec(src)) {
-      if (!this.inLink && /^<a /i.test(cap[0])) {
-        this.inLink = true;
-      } else if (this.inLink && /^<\/a>/i.test(cap[0])) {
-        this.inLink = false;
-      }
-      src = src.substring(cap[0].length);
-      out += this.options.sanitize
-        ? escape(cap[0])
-        : cap[0];
-      continue;
-    }
-
-    // link
-    if (cap = this.rules.link.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.inLink = true;
-      out += this.outputLink(cap, {
-        href: cap[2],
-        title: cap[3]
-      });
-      this.inLink = false;
-      continue;
-    }
-
-    // reflink, nolink
-    if ((cap = this.rules.reflink.exec(src))
-        || (cap = this.rules.nolink.exec(src))) {
-      src = src.substring(cap[0].length);
-      link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
-      link = this.links[link.toLowerCase()];
-      if (!link || !link.href) {
-        out += cap[0].charAt(0);
-        src = cap[0].substring(1) + src;
-        continue;
-      }
-      this.inLink = true;
-      out += this.outputLink(cap, link);
-      this.inLink = false;
-      continue;
-    }
-
-    // strong
-    if (cap = this.rules.strong.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += this.renderer.strong(this.output(cap[2] || cap[1]));
-      continue;
-    }
-
-    // em
-    if (cap = this.rules.em.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += this.renderer.em(this.output(cap[2] || cap[1]));
-      continue;
-    }
-
-    // code
-    if (cap = this.rules.code.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += this.renderer.codespan(escape(cap[2], true));
-      continue;
-    }
-
-    // br
-    if (cap = this.rules.br.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += this.renderer.br();
-      continue;
-    }
-
-    // del (gfm)
-    if (cap = this.rules.del.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += this.renderer.del(this.output(cap[1]));
-      continue;
-    }
-
-    // text
-    if (cap = this.rules.text.exec(src)) {
-      src = src.substring(cap[0].length);
-      out += escape(this.smartypants(cap[0]));
-      continue;
-    }
-
-    if (src) {
-      throw new
-        Error('Infinite loop on byte: ' + src.charCodeAt(0));
-    }
-  }
-
-  return out;
-};
-
-/**
- * Compile Link
- */
-
-InlineLexer.prototype.outputLink = function(cap, link) {
-  var href = escape(link.href)
-    , title = link.title ? escape(link.title) : null;
-
-  return cap[0].charAt(0) !== '!'
-    ? this.renderer.link(href, title, this.output(cap[1]))
-    : this.renderer.image(href, title, escape(cap[1]));
-};
-
-/**
- * Smartypants Transformations
- */
-
-InlineLexer.prototype.smartypants = function(text) {
-  if (!this.options.smartypants) return text;
-  return text
-    // em-dashes
-    .replace(/--/g, '\u2014')
-    // opening singles
-    .replace(/(^|[-\u2014/(\[{"\s])'/g, '$1\u2018')
-    // closing singles & apostrophes
-    .replace(/'/g, '\u2019')
-    // opening doubles
-    .replace(/(^|[-\u2014/(\[{\u2018\s])"/g, '$1\u201c')
-    // closing doubles
-    .replace(/"/g, '\u201d')
-    // ellipses
-    .replace(/\.{3}/g, '\u2026');
-};
-
-/**
- * Mangle Links
- */
-
-InlineLexer.prototype.mangle = function(text) {
-  var out = ''
-    , l = text.length
-    , i = 0
-    , ch;
-
-  for (; i < l; i++) {
-    ch = text.charCodeAt(i);
-    if (Math.random() > 0.5) {
-      ch = 'x' + ch.toString(16);
-    }
-    out += '&#' + ch + ';';
-  }
-
-  return out;
-};
-
-/**
- * Renderer
- */
-
-function Renderer(options) {
-  this.options = options || {};
-}
-
-Renderer.prototype.code = function(code, lang, escaped) {
-  if (this.options.highlight) {
-    var out = this.options.highlight(code, lang);
-    if (out != null && out !== code) {
-      escaped = true;
-      code = out;
-    }
-  }
-
-  if (!lang) {
-    return '<pre><code>'
-      + (escaped ? code : escape(code, true))
-      + '\n</code></pre>';
-  }
-
-  return '<pre><code class="'
-    + this.options.langPrefix
-    + escape(lang, true)
-    + '">'
-    + (escaped ? code : escape(code, true))
-    + '\n</code></pre>\n';
-};
-
-Renderer.prototype.blockquote = function(quote) {
-  return '<blockquote>\n' + quote + '</blockquote>\n';
-};
-
-Renderer.prototype.html = function(html) {
-  return html;
-};
-
-Renderer.prototype.heading = function(text, level, raw) {
-  return '<h'
-    + level
-    + ' id="'
-    + this.options.headerPrefix
-    + raw.toLowerCase().replace(/[^\w]+/g, '-')
-    + '">'
-    + text
-    + '</h'
-    + level
-    + '>\n';
-};
-
-Renderer.prototype.hr = function() {
-  return this.options.xhtml ? '<hr/>\n' : '<hr>\n';
-};
-
-Renderer.prototype.list = function(body, ordered) {
-  var type = ordered ? 'ol' : 'ul';
-  return '<' + type + '>\n' + body + '</' + type + '>\n';
-};
-
-Renderer.prototype.listitem = function(text) {
-  return '<li>' + text + '</li>\n';
-};
-
-Renderer.prototype.paragraph = function(text) {
-  return '<p>' + text + '</p>\n';
-};
-
-Renderer.prototype.table = function(header, body) {
-  return '<table>\n'
-    + '<thead>\n'
-    + header
-    + '</thead>\n'
-    + '<tbody>\n'
-    + body
-    + '</tbody>\n'
-    + '</table>\n';
-};
-
-Renderer.prototype.tablerow = function(content) {
-  return '<tr>\n' + content + '</tr>\n';
-};
-
-Renderer.prototype.tablecell = function(content, flags) {
-  var type = flags.header ? 'th' : 'td';
-  var tag = flags.align
-    ? '<' + type + ' style="text-align:' + flags.align + '">'
-    : '<' + type + '>';
-  return tag + content + '</' + type + '>\n';
-};
-
-// span level renderer
-Renderer.prototype.strong = function(text) {
-  return '<strong>' + text + '</strong>';
-};
-
-Renderer.prototype.em = function(text) {
-  return '<em>' + text + '</em>';
-};
-
-Renderer.prototype.codespan = function(text) {
-  return '<code>' + text + '</code>';
-};
-
-Renderer.prototype.br = function() {
-  return this.options.xhtml ? '<br/>' : '<br>';
-};
-
-Renderer.prototype.del = function(text) {
-  return '<del>' + text + '</del>';
-};
-
-Renderer.prototype.link = function(href, title, text) {
-  if (this.options.sanitize) {
-    try {
-      var prot = decodeURIComponent(unescape(href))
-        .replace(/[^\w:]/g, '')
-        .toLowerCase();
-    } catch (e) {
-      return '';
-    }
-    if (prot.indexOf('javascript:') === 0) {
-      return '';
-    }
-  }
-  var out = '<a href="' + href + '"';
-  if (title) {
-    out += ' title="' + title + '"';
-  }
-  out += '>' + text + '</a>';
-  return out;
-};
-
-Renderer.prototype.image = function(href, title, text) {
-  var out = '<img src="' + href + '" alt="' + text + '"';
-  if (title) {
-    out += ' title="' + title + '"';
-  }
-  out += this.options.xhtml ? '/>' : '>';
-  return out;
-};
-
-/**
- * Parsing & Compiling
- */
-
-function Parser(options) {
-  this.tokens = [];
-  this.token = null;
-  this.options = options || marked.defaults;
-  this.options.renderer = this.options.renderer || new Renderer;
-  this.renderer = this.options.renderer;
-  this.renderer.options = this.options;
-}
-
-/**
- * Static Parse Method
- */
-
-Parser.parse = function(src, options, renderer) {
-  var parser = new Parser(options, renderer);
-  return parser.parse(src);
-};
-
-/**
- * Parse Loop
- */
-
-Parser.prototype.parse = function(src) {
-  this.inline = new InlineLexer(src.links, this.options, this.renderer);
-  this.tokens = src.reverse();
-
-  var out = '';
-  while (this.next()) {
-    out += this.tok();
-  }
-
-  return out;
-};
-
-/**
- * Next Token
- */
-
-Parser.prototype.next = function() {
-  return this.token = this.tokens.pop();
-};
-
-/**
- * Preview Next Token
- */
-
-Parser.prototype.peek = function() {
-  return this.tokens[this.tokens.length - 1] || 0;
-};
-
-/**
- * Parse Text Tokens
- */
-
-Parser.prototype.parseText = function() {
-  var body = this.token.text;
-
-  while (this.peek().type === 'text') {
-    body += '\n' + this.next().text;
-  }
-
-  return this.inline.output(body);
-};
-
-/**
- * Parse Current Token
- */
-
-Parser.prototype.tok = function() {
-  switch (this.token.type) {
-    case 'space': {
-      return '';
-    }
-    case 'hr': {
-      return this.renderer.hr();
-    }
-    case 'heading': {
-      return this.renderer.heading(
-        this.inline.output(this.token.text),
-        this.token.depth,
-        this.token.text);
-    }
-    case 'code': {
-      return this.renderer.code(this.token.text,
-        this.token.lang,
-        this.token.escaped);
-    }
-    case 'table': {
-      var header = ''
-        , body = ''
-        , i
-        , row
-        , cell
-        , flags
-        , j;
-
-      // header
-      cell = '';
-      for (i = 0; i < this.token.header.length; i++) {
-        flags = { header: true, align: this.token.align[i] };
-        cell += this.renderer.tablecell(
-          this.inline.output(this.token.header[i]),
-          { header: true, align: this.token.align[i] }
-        );
-      }
-      header += this.renderer.tablerow(cell);
-
-      for (i = 0; i < this.token.cells.length; i++) {
-        row = this.token.cells[i];
-
-        cell = '';
-        for (j = 0; j < row.length; j++) {
-          cell += this.renderer.tablecell(
-            this.inline.output(row[j]),
-            { header: false, align: this.token.align[j] }
-          );
-        }
-
-        body += this.renderer.tablerow(cell);
-      }
-      return this.renderer.table(header, body);
-    }
-    case 'blockquote_start': {
-      var body = '';
-
-      while (this.next().type !== 'blockquote_end') {
-        body += this.tok();
-      }
-
-      return this.renderer.blockquote(body);
-    }
-    case 'list_start': {
-      var body = ''
-        , ordered = this.token.ordered;
-
-      while (this.next().type !== 'list_end') {
-        body += this.tok();
-      }
-
-      return this.renderer.list(body, ordered);
-    }
-    case 'list_item_start': {
-      var body = '';
-
-      while (this.next().type !== 'list_item_end') {
-        body += this.token.type === 'text'
-          ? this.parseText()
-          : this.tok();
-      }
-
-      return this.renderer.listitem(body);
-    }
-    case 'loose_item_start': {
-      var body = '';
-
-      while (this.next().type !== 'list_item_end') {
-        body += this.tok();
-      }
-
-      return this.renderer.listitem(body);
-    }
-    case 'html': {
-      var html = !this.token.pre && !this.options.pedantic
-        ? this.inline.output(this.token.text)
-        : this.token.text;
-      return this.renderer.html(html);
-    }
-    case 'paragraph': {
-      return this.renderer.paragraph(this.inline.output(this.token.text));
-    }
-    case 'text': {
-      return this.renderer.paragraph(this.parseText());
-    }
-  }
-};
-
-/**
- * Helpers
- */
-
-function escape(html, encode) {
-  return html
-    .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;');
-}
-
-function unescape(html) {
-  return html.replace(/&([#\w]+);/g, function(_, n) {
-    n = n.toLowerCase();
-    if (n === 'colon') return ':';
-    if (n.charAt(0) === '#') {
-      return n.charAt(1) === 'x'
-        ? String.fromCharCode(parseInt(n.substring(2), 16))
-        : String.fromCharCode(+n.substring(1));
-    }
-    return '';
-  });
-}
-
-function replace(regex, opt) {
-  regex = regex.source;
-  opt = opt || '';
-  return function self(name, val) {
-    if (!name) return new RegExp(regex, opt);
-    val = val.source || val;
-    val = val.replace(/(^|[^\[])\^/g, '$1');
-    regex = regex.replace(name, val);
-    return self;
-  };
-}
-
-function noop() {}
-noop.exec = noop;
-
-function merge(obj) {
-  var i = 1
-    , target
-    , key;
-
-  for (; i < arguments.length; i++) {
-    target = arguments[i];
-    for (key in target) {
-      if (Object.prototype.hasOwnProperty.call(target, key)) {
-        obj[key] = target[key];
-      }
-    }
-  }
-
-  return obj;
-}
-
-
-/**
- * Marked
- */
-
-function marked(src, opt, callback) {
-  if (callback || typeof opt === 'function') {
-    if (!callback) {
-      callback = opt;
-      opt = null;
-    }
-
-    opt = merge({}, marked.defaults, opt || {});
-
-    var highlight = opt.highlight
-      , tokens
-      , pending
-      , i = 0;
-
-    try {
-      tokens = Lexer.lex(src, opt)
-    } catch (e) {
-      return callback(e);
-    }
-
-    pending = tokens.length;
-
-    var done = function(err) {
-      if (err) {
-        opt.highlight = highlight;
-        return callback(err);
-      }
-
-      var out;
-
-      try {
-        out = Parser.parse(tokens, opt);
-      } catch (e) {
-        err = e;
-      }
-
-      opt.highlight = highlight;
-
-      return err
-        ? callback(err)
-        : callback(null, out);
-    };
-
-    if (!highlight || highlight.length < 3) {
-      return done();
-    }
-
-    delete opt.highlight;
-
-    if (!pending) return done();
-
-    for (; i < tokens.length; i++) {
-      (function(token) {
-        if (token.type !== 'code') {
-          return --pending || done();
-        }
-        return highlight(token.text, token.lang, function(err, code) {
-          if (err) return done(err);
-          if (code == null || code === token.text) {
-            return --pending || done();
-          }
-          token.text = code;
-          token.escaped = true;
-          --pending || done();
-        });
-      })(tokens[i]);
-    }
-
-    return;
-  }
-  try {
-    if (opt) opt = merge({}, marked.defaults, opt);
-    return Parser.parse(Lexer.lex(src, opt), opt);
-  } catch (e) {
-    e.message += '\nPlease report this to https://github.com/chjj/marked.';
-    if ((opt || marked.defaults).silent) {
-      return '<p>An error occured:</p><pre>'
-        + escape(e.message + '', true)
-        + '</pre>';
-    }
-    throw e;
-  }
-}
-
-/**
- * Options
- */
-
-marked.options =
-marked.setOptions = function(opt) {
-  merge(marked.defaults, opt);
-  return marked;
-};
-
-marked.defaults = {
-  gfm: true,
-  tables: true,
-  breaks: false,
-  pedantic: false,
-  sanitize: false,
-  smartLists: false,
-  silent: false,
-  highlight: null,
-  langPrefix: 'lang-',
-  smartypants: false,
-  headerPrefix: '',
-  renderer: new Renderer,
-  xhtml: false
-};
-
-/**
- * Expose
- */
-
-marked.Parser = Parser;
-marked.parser = Parser.parse;
-
-marked.Renderer = Renderer;
-
-marked.Lexer = Lexer;
-marked.lexer = Lexer.lex;
-
-marked.InlineLexer = InlineLexer;
-marked.inlineLexer = InlineLexer.output;
-
-marked.parse = marked;
-
-if (typeof module !== 'undefined' && typeof exports === 'object') {
-  module.exports = marked;
-} else if (typeof define === 'function' && define.amd) {
-  define(function() { return marked; });
-} else {
-  this.marked = marked;
-}
-
-}).call(function() {
-  return this || (typeof window !== 'undefined' ? window : global);
-}());
\ No newline at end of file
+(function(){function e(e){this.tokens=[],this.tokens.links={},this.options=e||a.defaults,this.rules=p.normal,this.options.gfm&&(this.options.tables?this.rules=p.tables:this.rules=p.gfm)}function t(e,t){if(this.options=t||a.defaults,this.links=e,this.rules=u.normal,this.renderer=this.options.renderer||new n,this.renderer.options=this.options,!this.links)throw new Error("Tokens array requires a `links` property.");this.options.gfm?this.options.breaks?this.rules=u.breaks:this.rules=u.gfm:this.options.pedantic&&(this.rules=u.pedantic)}function n(e){this.options=e||{}}function r(e){this.tokens=[],this.token=null,this.options=e||a.defaults,this.options.renderer=this.options.renderer||new n,this.renderer=this.options.renderer,this.renderer.options=this.options}function s(e,t){return e.replace(t?/&/g:/&(?!#?\w+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;")}function i(e){return e.replace(/&([#\w]+);/g,function(e,t){return t=t.toLowerCase(),"colon"===t?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}function l(e,t){return e=e.source,t=t||"",function n(r,s){return r?(s=s.source||s,s=s.replace(/(^|[^\[])\^/g,"$1"),e=e.replace(r,s),n):new RegExp(e,t)}}function o(){}function h(e){for(var t,n,r=1;r<arguments.length;r++){t=arguments[r];for(n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])}return e}function a(t,n,i){if(i||"function"==typeof n){i||(i=n,n=null),n=h({},a.defaults,n||{});var l,o,p=n.highlight,u=0;try{l=e.lex(t,n)}catch(c){return i(c)}o=l.length;var g=function(e){if(e)return n.highlight=p,i(e);var t;try{t=r.parse(l,n)}catch(s){e=s}return n.highlight=p,e?i(e):i(null,t)};if(!p||p.length<3)return g();if(delete n.highlight,!o)return g();for(;u<l.length;u++)!function(e){return"code"!==e.type?--o||g():p(e.text,e.lang,function(t,n){return t?g(t):null==n||n===e.text?--o||g():(e.text=n,e.escaped=!0,void(--o||g()))})}(l[u])}else try{return n&&(n=h({},a.defaults,n)),r.parse(e.lex(t,n),n)}catch(c){if(c.message+="\nPlease report this to https://github.com/chjj/marked.",(n||a.defaults).silent)return"<p>An error occured:</p><pre>"+s(c.message+"",!0)+"</pre>";throw c}}var p={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:o,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:o,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:o,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};p.bullet=/(?:[*+-]|\d+\.)/,p.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/,p.item=l(p.item,"gm")(/bull/g,p.bullet)(),p.list=l(p.list)(/bull/g,p.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+p.def.source+")")(),p.blockquote=l(p.blockquote)("def",p.def)(),p._tag="(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b",p.html=l(p.html)("comment",/<!--[\s\S]*?-->/)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/<tag(?:"[^"]*"|'[^']*'|[^'">])*?>/)(/tag/g,p._tag)(),p.paragraph=l(p.paragraph)("hr",p.hr)("heading",p.heading)("lheading",p.lheading)("blockquote",p.blockquote)("tag","<"+p._tag)("def",p.def)(),p.normal=h({},p),p.gfm=h({},p.normal,{fences:/^ *(`{3,}|~{3,}) *(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,paragraph:/^/}),p.gfm.paragraph=l(p.paragraph)("(?!","(?!"+p.gfm.fences.source.replace("\\1","\\2")+"|"+p.list.source.replace("\\1","\\3")+"|")(),p.tables=h({},p.gfm,{nptable:/^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/}),e.rules=p,e.lex=function(t,n){var r=new e(n);return r.lex(t)},e.prototype.lex=function(e){return e=e.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n"),this.token(e,!0)},e.prototype.token=function(e,t,n){for(var r,s,i,l,o,h,a,u,c,e=e.replace(/^ +$/gm,"");e;)if((i=this.rules.newline.exec(e))&&(e=e.substring(i[0].length),i[0].length>1&&this.tokens.push({type:"space"})),i=this.rules.code.exec(e))e=e.substring(i[0].length),i=i[0].replace(/^ {4}/gm,""),this.tokens.push({type:"code",text:this.options.pedantic?i:i.replace(/\n+$/,"")});else if(i=this.rules.fences.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"code",lang:i[2],text:i[3]});else if(i=this.rules.heading.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"heading",depth:i[1].length,text:i[2]});else if(t&&(i=this.rules.nptable.exec(e))){for(e=e.substring(i[0].length),h={type:"table",header:i[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:i[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:i[3].replace(/\n$/,"").split("\n")},u=0;u<h.align.length;u++)/^ *-+: *$/.test(h.align[u])?h.align[u]="right":/^ *:-+: *$/.test(h.align[u])?h.align[u]="center":/^ *:-+ *$/.test(h.align[u])?h.align[u]="left":h.align[u]=null;for(u=0;u<h.cells.length;u++)h.cells[u]=h.cells[u].split(/ *\| */);this.tokens.push(h)}else if(i=this.rules.lheading.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"heading",depth:"="===i[2]?1:2,text:i[1]});else if(i=this.rules.hr.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"hr"});else if(i=this.rules.blockquote.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"blockquote_start"}),i=i[0].replace(/^ *> ?/gm,""),this.token(i,t,!0),this.tokens.push({type:"blockquote_end"});else if(i=this.rules.list.exec(e)){for(e=e.substring(i[0].length),l=i[2],this.tokens.push({type:"list_start",ordered:l.length>1}),i=i[0].match(this.rules.item),r=!1,c=i.length,u=0;u<c;u++)h=i[u],a=h.length,h=h.replace(/^ *([*+-]|\d+\.) +/,""),~h.indexOf("\n ")&&(a-=h.length,h=this.options.pedantic?h.replace(/^ {1,4}/gm,""):h.replace(new RegExp("^ {1,"+a+"}","gm"),"")),this.options.smartLists&&u!==c-1&&(o=p.bullet.exec(i[u+1])[0],l===o||l.length>1&&o.length>1||(e=i.slice(u+1).join("\n")+e,u=c-1)),s=r||/\n\n(?!\s*$)/.test(h),u!==c-1&&(r="\n"===h.charAt(h.length-1),s||(s=r)),this.tokens.push({type:s?"loose_item_start":"list_item_start"}),this.token(h,!1,n),this.tokens.push({type:"list_item_end"});this.tokens.push({type:"list_end"})}else if(i=this.rules.html.exec(e))e=e.substring(i[0].length),this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:"pre"===i[1]||"script"===i[1]||"style"===i[1],text:i[0]});else if(!n&&t&&(i=this.rules.def.exec(e)))e=e.substring(i[0].length),this.tokens.links[i[1].toLowerCase()]={href:i[2],title:i[3]};else if(t&&(i=this.rules.table.exec(e))){for(e=e.substring(i[0].length),h={type:"table",header:i[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:i[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:i[3].replace(/(?: *\| *)?\n$/,"").split("\n")},u=0;u<h.align.length;u++)/^ *-+: *$/.test(h.align[u])?h.align[u]="right":/^ *:-+: *$/.test(h.align[u])?h.align[u]="center":/^ *:-+ *$/.test(h.align[u])?h.align[u]="left":h.align[u]=null;for(u=0;u<h.cells.length;u++)h.cells[u]=h.cells[u].replace(/^ *\| *| *\| *$/g,"").split(/ *\| */);this.tokens.push(h)}else if(t&&(i=this.rules.paragraph.exec(e)))e=e.substring(i[0].length),this.tokens.push({type:"paragraph",text:"\n"===i[1].charAt(i[1].length-1)?i[1].slice(0,-1):i[1]});else if(i=this.rules.text.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"text",text:i[0]});else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0));return this.tokens};var u={escape:/^\\([\\`*{}\[\]()#+\-.!_>])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:o,tag:/^<!--[\s\S]*?-->|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]\(href\)/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:o,text:/^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/};u._inside=/(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/,u._href=/\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/,u.link=l(u.link)("inside",u._inside)("href",u._href)(),u.reflink=l(u.reflink)("inside",u._inside)(),u.normal=h({},u),u.pedantic=h({},u.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/}),u.gfm=h({},u.normal,{escape:l(u.escape)("])","~|])")(),url:/^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:l(u.text)("]|","~]|")("|","|https?://|")()}),u.breaks=h({},u.gfm,{br:l(u.br)("{2,}","*")(),text:l(u.gfm.text)("{2,}","*")()}),t.rules=u,t.output=function(e,n,r){var s=new t(n,r);return s.output(e)},t.prototype.output=function(e){for(var t,n,r,i,l="";e;)if(i=this.rules.escape.exec(e))e=e.substring(i[0].length),l+=i[1];else if(i=this.rules.autolink.exec(e))e=e.substring(i[0].length),"@"===i[2]?(n=":"===i[1].charAt(6)?this.mangle(i[1].substring(7)):this.mangle(i[1]),r=this.mangle("mailto:")+n):(n=s(i[1]),r=n),l+=this.renderer.link(r,null,n);else if(this.inLink||!(i=this.rules.url.exec(e))){if(i=this.rules.tag.exec(e))!this.inLink&&/^<a /i.test(i[0])?this.inLink=!0:this.inLink&&/^<\/a>/i.test(i[0])&&(this.inLink=!1),e=e.substring(i[0].length),l+=this.options.sanitize?s(i[0]):i[0];else if(i=this.rules.link.exec(e))e=e.substring(i[0].length),this.inLink=!0,l+=this.outputLink(i,{href:i[2],title:i[3]}),this.inLink=!1;else if((i=this.rules.reflink.exec(e))||(i=this.rules.nolink.exec(e))){if(e=e.substring(i[0].length),t=(i[2]||i[1]).replace(/\s+/g," "),t=this.links[t.toLowerCase()],!t||!t.href){l+=i[0].charAt(0),e=i[0].substring(1)+e;continue}this.inLink=!0,l+=this.outputLink(i,t),this.inLink=!1}else if(i=this.rules.strong.exec(e))e=e.substring(i[0].length),l+=this.renderer.strong(this.output(i[2]||i[1]));else if(i=this.rules.em.exec(e))e=e.substring(i[0].length),l+=this.renderer.em(this.output(i[2]||i[1]));else if(i=this.rules.code.exec(e))e=e.substring(i[0].length),l+=this.renderer.codespan(s(i[2],!0));else if(i=this.rules.br.exec(e))e=e.substring(i[0].length),l+=this.renderer.br();else if(i=this.rules.del.exec(e))e=e.substring(i[0].length),l+=this.renderer.del(this.output(i[1]));else if(i=this.rules.text.exec(e))e=e.substring(i[0].length),l+=s(this.smartypants(i[0]));else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0))}else e=e.substring(i[0].length),n=s(i[1]),r=n,l+=this.renderer.link(r,null,n);return l},t.prototype.outputLink=function(e,t){var n=s(t.href),r=t.title?s(t.title):null;return"!"!==e[0].charAt(0)?this.renderer.link(n,r,this.output(e[1])):this.renderer.image(n,r,s(e[1]))},t.prototype.smartypants=function(e){return this.options.smartypants?e.replace(/--/g,"—").replace(/(^|[-\u2014\/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014\/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…"):e},t.prototype.mangle=function(e){for(var t,n="",r=e.length,s=0;s<r;s++)t=e.charCodeAt(s),Math.random()>.5&&(t="x"+t.toString(16)),n+="&#"+t+";";return n},n.prototype.code=function(e,t,n){if(this.options.highlight){var r=this.options.highlight(e,t);null!=r&&r!==e&&(n=!0,e=r)}return t?'<pre><code class="'+this.options.langPrefix+s(t,!0)+'">'+(n?e:s(e,!0))+"\n</code></pre>\n":"<pre><code>"+(n?e:s(e,!0))+"\n</code></pre>"},n.prototype.blockquote=function(e){return"<blockquote>\n"+e+"</blockquote>\n"},n.prototype.html=function(e){return e},n.prototype.heading=function(e,t,n){return"<h"+t+' id="'+this.options.headerPrefix+n.toLowerCase().replace(/[^\w]+/g,"-")+'">'+e+"</h"+t+">\n"},n.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"},n.prototype.list=function(e,t){var n=t?"ol":"ul";return"<"+n+">\n"+e+"</"+n+">\n"},n.prototype.listitem=function(e){return"<li>"+e+"</li>\n"},n.prototype.paragraph=function(e){return"<p>"+e+"</p>\n"},n.prototype.table=function(e,t){return"<table>\n<thead>\n"+e+"</thead>\n<tbody>\n"+t+"</tbody>\n</table>\n"},n.prototype.tablerow=function(e){return"<tr>\n"+e+"</tr>\n"},n.prototype.tablecell=function(e,t){var n=t.header?"th":"td",r=t.align?"<"+n+' style="text-align:'+t.align+'">':"<"+n+">";return r+e+"</"+n+">\n"},n.prototype.strong=function(e){return"<strong>"+e+"</strong>"},n.prototype.em=function(e){return"<em>"+e+"</em>"},n.prototype.codespan=function(e){return"<code>"+e+"</code>"},n.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"},n.prototype.del=function(e){return"<del>"+e+"</del>"},n.prototype.link=function(e,t,n){if(this.options.sanitize){try{var r=decodeURIComponent(i(e)).replace(/[^\w:]/g,"").toLowerCase()}catch(s){return""}if(0===r.indexOf("javascript:"))return""}var l='<a href="'+e+'"';return t&&(l+=' title="'+t+'"'),l+=">"+n+"</a>"},n.prototype.image=function(e,t,n){var r='<img src="'+e+'" alt="'+n+'"';return t&&(r+=' title="'+t+'"'),r+=this.options.xhtml?"/>":">"},r.parse=function(e,t,n){var s=new r(t,n);return s.parse(e)},r.prototype.parse=function(e){this.inline=new t(e.links,this.options,this.renderer),this.tokens=e.reverse();for(var n="";this.next();)n+=this.tok();return n},r.prototype.next=function(){return this.token=this.tokens.pop()},r.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0},r.prototype.parseText=function(){for(var e=this.token.text;"text"===this.peek().type;)e+="\n"+this.next().text;return this.inline.output(e)},r.prototype.tok=function(){switch(this.token.type){case"space":return"";case"hr":return this.renderer.hr();case"heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,this.token.text);case"code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case"table":var e,t,n,r,s,i="",l="";for(n="",e=0;e<this.token.header.length;e++)r={header:!0,align:this.token.align[e]},n+=this.renderer.tablecell(this.inline.output(this.token.header[e]),{header:!0,align:this.token.align[e]});for(i+=this.renderer.tablerow(n),e=0;e<this.token.cells.length;e++){for(t=this.token.cells[e],n="",s=0;s<t.length;s++)n+=this.renderer.tablecell(this.inline.output(t[s]),{header:!1,align:this.token.align[s]});l+=this.renderer.tablerow(n)}return this.renderer.table(i,l);case"blockquote_start":for(var l="";"blockquote_end"!==this.next().type;)l+=this.tok();return this.renderer.blockquote(l);case"list_start":for(var l="",o=this.token.ordered;"list_end"!==this.next().type;)l+=this.tok();return this.renderer.list(l,o);case"list_item_start":for(var l="";"list_item_end"!==this.next().type;)l+="text"===this.token.type?this.parseText():this.tok();return this.renderer.listitem(l);case"loose_item_start":for(var l="";"list_item_end"!==this.next().type;)l+=this.tok();return this.renderer.listitem(l);case"html":var h=this.token.pre||this.options.pedantic?this.token.text:this.inline.output(this.token.text);return this.renderer.html(h);case"paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case"text":return this.renderer.paragraph(this.parseText())}},o.exec=o,a.options=a.setOptions=function(e){return h(a.defaults,e),a},a.defaults={gfm:!0,tables:!0,breaks:!1,pedantic:!1,sanitize:!1,smartLists:!1,silent:!1,highlight:null,langPrefix:"lang-",smartypants:!1,headerPrefix:"",renderer:new n,xhtml:!1},a.Parser=r,a.parser=r.parse,a.Renderer=n,a.Lexer=e,a.lexer=e.lex,a.InlineLexer=t,a.inlineLexer=t.output,a.parse=a,"undefined"!=typeof module&&"object"==typeof exports?module.exports=a:"function"==typeof define&&define.amd?define(function(){return a}):this.marked=a}).call(function(){return this||("undefined"!=typeof window?window:global)}());
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/object-assign-pollyfill.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/object-assign-pollyfill.js
new file mode 100644
index 00000000000..b34d63c859d
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/object-assign-pollyfill.js
@@ -0,0 +1 @@
+"function"!=typeof Object.assign&&!function(){Object.assign=function(n){"use strict";if(void 0===n||null===n)throw new TypeError("Cannot convert undefined or null to object");for(var t=Object(n),o=1;o<arguments.length;o++){var r=arguments[o];if(void 0!==r&&null!==r)for(var e in r)Object.prototype.hasOwnProperty.call(r,e)&&(t[e]=r[e])}return t}}();
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/sanitize-html.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/sanitize-html.min.js
new file mode 100644
index 00000000000..ade25089a43
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/sanitize-html.min.js
@@ -0,0 +1,4 @@
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,e.sanitizeHtml=t()}}(function(){return function t(e,r,n){function i(o,a){if(!r[o]){if(!e[o]){var c="function"==typeof require&&require;if(!a&&c)return c(o,!0);if(s)return s(o,!0);var u=new Error("Cannot find module '"+o+"'");throw u.code="MODULE_NOT_FOUND",u}var h=r[o]={exports:{}};e[o][0].call(h.exports,function(t){var r=e[o][1][t];return i(r?r:t)},h,h.exports,t,e,r,n)}return r[o].exports}for(var s="function"==typeof require&&require,o=0;o<n.length;o++)i(n[o]);return i}({1:[function(t,e,r){function n(t,e){t&&Object.keys(t).forEach(function(r){e(t[r],r)})}function i(t,e){return{}.hasOwnProperty.call(t,e)}function s(t,e,r){function h(t,e){var r=this;this.tag=t,this.attribs=e||{},this.tagPosition=d.length,this.text="",this.updateParentNodeText=function(){if(x.length){var t=x[x.length-1];t.text+=r.text}}}function l(t){return"string"!=typeof t&&(t+=""),t.replace(/\&/g,"&amp;").replace(/</g,"&lt;").replace(/\>/g,"&gt;").replace(/\"/g,"&quot;")}function f(t,r){r=r.replace(/[\x00-\x20]+/g,""),r=r.replace(/<\!\-\-.*?\-\-\>/g,"");var n=r.match(/^([a-zA-Z]+)\:/);if(!n)return!1;var s=n[1].toLowerCase();return i(e.allowedSchemesByTag,t)?e.allowedSchemesByTag[t].indexOf(s)===-1:!e.allowedSchemes||e.allowedSchemes.indexOf(s)===-1}function p(t,e){return e?(t=t.split(/\s+/),t.filter(function(t){return e.indexOf(t)!==-1}).join(" ")):t}var d="";e?(e=a(s.defaults,e),e.parser?e.parser=a(u,e.parser):e.parser=u):(e=s.defaults,e.parser=u);var g,_,m=e.nonTextTags||["script","style","textarea"];e.allowedAttributes&&(g={},_={},n(e.allowedAttributes,function(t,e){g[e]=[];var r=[];t.forEach(function(t){t.indexOf("*")>=0?r.push(c(t).replace(/\\\*/g,".*")):g[e].push(t)}),_[e]=new RegExp("^("+r.join("|")+")$")}));var b={};n(e.allowedClasses,function(t,e){g&&(i(g,e)||(g[e]=[]),g[e].push("class")),b[e]=t});var y,v={};n(e.transformTags,function(t,e){var r;"function"==typeof t?r=t:"string"==typeof t&&(r=s.simpleTransform(t)),"*"===e?y=r:v[e]=r});var w=0,x=[],S={},E={},T=!1,A=0,k=new o.Parser({onopentag:function(t,r){if(T)return void A++;var s=new h(t,r);x.push(s);var o,a=!1,c=!!s.text;i(v,t)&&(o=v[t](t,r),s.attribs=r=o.attribs,void 0!==o.text&&(s.innerText=o.text),t!==o.tagName&&(s.name=t=o.tagName,E[w]=o.tagName)),y&&(o=y(t,r),s.attribs=r=o.attribs,t!==o.tagName&&(s.name=t=o.tagName,E[w]=o.tagName)),e.allowedTags&&e.allowedTags.indexOf(t)===-1&&(a=!0,m.indexOf(t)!==-1&&(T=!0,A=1),S[w]=!0),w++,a||(d+="<"+t,(!g||i(g,t)||g["*"])&&n(r,function(e,r){if(!g||i(g,t)&&g[t].indexOf(r)!==-1||g["*"]&&g["*"].indexOf(r)!==-1||i(_,t)&&_[t].test(r)||_["*"]&&_["*"].test(r)){if(("href"===r||"src"===r)&&f(t,e))return void delete s.attribs[r];if("class"===r&&(e=p(e,b[t]),!e.length))return void delete s.attribs[r];d+=" "+r,e.length&&(d+='="'+l(e)+'"')}else delete s.attribs[r]}),e.selfClosing.indexOf(t)!==-1?d+=" />":(d+=">",!s.innerText||c||e.textFilter||(d+=s.innerText)))},ontext:function(t){if(!T){var r,n=x[x.length-1];if(n&&(r=n.tag,t=void 0!==n.innerText?n.innerText:t),"script"===r||"style"===r)d+=t;else{var i=l(t);d+=e.textFilter?e.textFilter(i):i}if(x.length){var s=x[x.length-1];s.text+=t}}},onclosetag:function(t){if(T){if(A--,A)return;T=!1}var r=x.pop();if(r){if(T=!1,w--,S[w])return delete S[w],void r.updateParentNodeText();if(E[w]&&(t=E[w],delete E[w]),e.exclusiveFilter&&e.exclusiveFilter(r))return void(d=d.substr(0,r.tagPosition));r.updateParentNodeText(),e.selfClosing.indexOf(t)===-1&&(d+="</"+t+">")}}},e.parser);return k.write(t),k.end(),d}var o=t("htmlparser2"),a=t("xtend"),c=t("regexp-quote");e.exports=s;var u={decodeEntities:!0};s.defaults={allowedTags:["h3","h4","h5","h6","blockquote","p","a","ul","ol","nl","li","b","i","strong","em","strike","code","hr","br","div","table","thead","caption","tbody","tr","th","td","pre"],allowedAttributes:{a:["href","name","target"],img:["src"]},selfClosing:["img","br","hr","area","base","basefont","input","link","meta"],allowedSchemes:["http","https","ftp","mailto"],allowedSchemesByTag:{}},s.simpleTransform=function(t,e,r){return r=void 0===r||r,e=e||{},function(n,i){var s;if(r)for(s in e)i[s]=e[s];else i=e;return{tagName:t,attribs:i}}}},{htmlparser2:36,"regexp-quote":54,xtend:58}],2:[function(t,e,r){"use strict";function n(){for(var t="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",e=0,r=t.length;e<r;++e)c[e]=t[e],u[t.charCodeAt(e)]=e;u["-".charCodeAt(0)]=62,u["_".charCodeAt(0)]=63}function i(t){var e,r,n,i,s,o,a=t.length;if(a%4>0)throw new Error("Invalid string. Length must be a multiple of 4");s="="===t[a-2]?2:"="===t[a-1]?1:0,o=new h(3*a/4-s),n=s>0?a-4:a;var c=0;for(e=0,r=0;e<n;e+=4,r+=3)i=u[t.charCodeAt(e)]<<18|u[t.charCodeAt(e+1)]<<12|u[t.charCodeAt(e+2)]<<6|u[t.charCodeAt(e+3)],o[c++]=i>>16&255,o[c++]=i>>8&255,o[c++]=255&i;return 2===s?(i=u[t.charCodeAt(e)]<<2|u[t.charCodeAt(e+1)]>>4,o[c++]=255&i):1===s&&(i=u[t.charCodeAt(e)]<<10|u[t.charCodeAt(e+1)]<<4|u[t.charCodeAt(e+2)]>>2,o[c++]=i>>8&255,o[c++]=255&i),o}function s(t){return c[t>>18&63]+c[t>>12&63]+c[t>>6&63]+c[63&t]}function o(t,e,r){for(var n,i=[],o=e;o<r;o+=3)n=(t[o]<<16)+(t[o+1]<<8)+t[o+2],i.push(s(n));return i.join("")}function a(t){for(var e,r=t.length,n=r%3,i="",s=[],a=16383,u=0,h=r-n;u<h;u+=a)s.push(o(t,u,u+a>h?h:u+a));return 1===n?(e=t[r-1],i+=c[e>>2],i+=c[e<<4&63],i+="=="):2===n&&(e=(t[r-2]<<8)+t[r-1],i+=c[e>>10],i+=c[e>>4&63],i+=c[e<<2&63],i+="="),s.push(i),s.join("")}r.toByteArray=i,r.fromByteArray=a;var c=[],u=[],h="undefined"!=typeof Uint8Array?Uint8Array:Array;n()},{}],3:[function(t,e,r){},{}],4:[function(t,e,r){(function(e){"use strict";var n=t("buffer"),i=n.Buffer,s=n.SlowBuffer,o=n.kMaxLength||2147483647;r.alloc=function(t,e,r){if("function"==typeof i.alloc)return i.alloc(t,e,r);if("number"==typeof r)throw new TypeError("encoding must not be number");if("number"!=typeof t)throw new TypeError("size must be a number");if(t>o)throw new RangeError("size is too large");var n=r,s=e;void 0===s&&(n=void 0,s=0);var a=new i(t);if("string"==typeof s)for(var c=new i(s,n),u=c.length,h=-1;++h<t;)a[h]=c[h%u];else a.fill(s);return a},r.allocUnsafe=function(t){if("function"==typeof i.allocUnsafe)return i.allocUnsafe(t);if("number"!=typeof t)throw new TypeError("size must be a number");if(t>o)throw new RangeError("size is too large");return new i(t)},r.from=function(t,r,n){if("function"==typeof i.from&&(!e.Uint8Array||Uint8Array.from!==i.from))return i.from(t,r,n);if("number"==typeof t)throw new TypeError('"value" argument must not be a number');if("string"==typeof t)return new i(t,r);if("undefined"!=typeof ArrayBuffer&&t instanceof ArrayBuffer){var s=r;if(1===arguments.length)return new i(t);"undefined"==typeof s&&(s=0);var o=n;if("undefined"==typeof o&&(o=t.byteLength-s),s>=t.byteLength)throw new RangeError("'offset' is out of bounds");if(o>t.byteLength-s)throw new RangeError("'length' is out of bounds");return new i(t.slice(s,s+o))}if(i.isBuffer(t)){var a=new i(t.length);return t.copy(a,0,0,t.length),a}if(t){if(Array.isArray(t)||"undefined"!=typeof ArrayBuffer&&t.buffer instanceof ArrayBuffer||"length"in t)return new i(t);if("Buffer"===t.type&&Array.isArray(t.data))return new i(t.data)}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")},r.allocUnsafeSlow=function(t){if("function"==typeof i.allocUnsafeSlow)return i.allocUnsafeSlow(t);if("number"!=typeof t)throw new TypeError("size must be a number");if(t>=o)throw new RangeError("size is too large");return new s(t)}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{buffer:5}],5:[function(t,e,r){(function(e){"use strict";function n(){try{var t=new Uint8Array(1);return t.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}},42===t.foo()&&"function"==typeof t.subarray&&0===t.subarray(1,1).byteLength}catch(e){return!1}}function i(){return o.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function s(t,e){if(i()<e)throw new RangeError("Invalid typed array length");return o.TYPED_ARRAY_SUPPORT?(t=new Uint8Array(e),t.__proto__=o.prototype):(null===t&&(t=new o(e)),t.length=e),t}function o(t,e,r){if(!(o.TYPED_ARRAY_SUPPORT||this instanceof o))return new o(t,e,r);if("number"==typeof t){if("string"==typeof e)throw new Error("If encoding is specified then the first argument must be a string");return h(this,t)}return a(this,t,e,r)}function a(t,e,r,n){if("number"==typeof e)throw new TypeError('"value" argument must not be a number');return"undefined"!=typeof ArrayBuffer&&e instanceof ArrayBuffer?p(t,e,r,n):"string"==typeof e?l(t,e,r):d(t,e)}function c(t){if("number"!=typeof t)throw new TypeError('"size" argument must be a number');if(t<0)throw new RangeError('"size" argument must not be negative')}function u(t,e,r,n){return c(e),e<=0?s(t,e):void 0!==r?"string"==typeof n?s(t,e).fill(r,n):s(t,e).fill(r):s(t,e)}function h(t,e){if(c(e),t=s(t,e<0?0:0|g(e)),!o.TYPED_ARRAY_SUPPORT)for(var r=0;r<e;++r)t[r]=0;return t}function l(t,e,r){if("string"==typeof r&&""!==r||(r="utf8"),!o.isEncoding(r))throw new TypeError('"encoding" must be a valid string encoding');var n=0|m(e,r);t=s(t,n);var i=t.write(e,r);return i!==n&&(t=t.slice(0,i)),t}function f(t,e){var r=e.length<0?0:0|g(e.length);t=s(t,r);for(var n=0;n<r;n+=1)t[n]=255&e[n];return t}function p(t,e,r,n){if(e.byteLength,r<0||e.byteLength<r)throw new RangeError("'offset' is out of bounds");if(e.byteLength<r+(n||0))throw new RangeError("'length' is out of bounds");return e=void 0===r&&void 0===n?new Uint8Array(e):void 0===n?new Uint8Array(e,r):new Uint8Array(e,r,n),o.TYPED_ARRAY_SUPPORT?(t=e,t.__proto__=o.prototype):t=f(t,e),t}function d(t,e){if(o.isBuffer(e)){var r=0|g(e.length);return t=s(t,r),0===t.length?t:(e.copy(t,0,0,r),t)}if(e){if("undefined"!=typeof ArrayBuffer&&e.buffer instanceof ArrayBuffer||"length"in e)return"number"!=typeof e.length||J(e.length)?s(t,0):f(t,e);if("Buffer"===e.type&&$(e.data))return f(t,e.data)}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")}function g(t){if(t>=i())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+i().toString(16)+" bytes");return 0|t}function _(t){return+t!=t&&(t=0),o.alloc(+t)}function m(t,e){if(o.isBuffer(t))return t.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(t)||t instanceof ArrayBuffer))return t.byteLength;"string"!=typeof t&&(t=""+t);var r=t.length;if(0===r)return 0;for(var n=!1;;)switch(e){case"ascii":case"latin1":case"binary":return r;case"utf8":case"utf-8":case void 0:return F(t).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*r;case"hex":return r>>>1;case"base64":return X(t).length;default:if(n)return F(t).length;e=(""+e).toLowerCase(),n=!0}}function b(t,e,r){var n=!1;if((void 0===e||e<0)&&(e=0),e>this.length)return"";if((void 0===r||r>this.length)&&(r=this.length),r<=0)return"";if(r>>>=0,e>>>=0,r<=e)return"";for(t||(t="utf8");;)switch(t){case"hex":return D(this,e,r);case"utf8":case"utf-8":return q(this,e,r);case"ascii":return C(this,e,r);case"latin1":case"binary":return B(this,e,r);case"base64":return L(this,e,r);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return j(this,e,r);default:if(n)throw new TypeError("Unknown encoding: "+t);t=(t+"").toLowerCase(),n=!0}}function y(t,e,r){var n=t[e];t[e]=t[r],t[r]=n}function v(t,e,r,n,i){if(0===t.length)return-1;if("string"==typeof r?(n=r,r=0):r>2147483647?r=2147483647:r<-2147483648&&(r=-2147483648),r=+r,isNaN(r)&&(r=i?0:t.length-1),r<0&&(r=t.length+r),r>=t.length){if(i)return-1;r=t.length-1}else if(r<0){if(!i)return-1;r=0}if("string"==typeof e&&(e=o.from(e,n)),o.isBuffer(e))return 0===e.length?-1:w(t,e,r,n,i);if("number"==typeof e)return e=255&e,o.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?i?Uint8Array.prototype.indexOf.call(t,e,r):Uint8Array.prototype.lastIndexOf.call(t,e,r):w(t,[e],r,n,i);throw new TypeError("val must be string, number or Buffer")}function w(t,e,r,n,i){function s(t,e){return 1===o?t[e]:t.readUInt16BE(e*o)}var o=1,a=t.length,c=e.length;if(void 0!==n&&(n=String(n).toLowerCase(),"ucs2"===n||"ucs-2"===n||"utf16le"===n||"utf-16le"===n)){if(t.length<2||e.length<2)return-1;o=2,a/=2,c/=2,r/=2}var u;if(i){var h=-1;for(u=r;u<a;u++)if(s(t,u)===s(e,h===-1?0:u-h)){if(h===-1&&(h=u),u-h+1===c)return h*o}else h!==-1&&(u-=u-h),h=-1}else for(r+c>a&&(r=a-c),u=r;u>=0;u--){for(var l=!0,f=0;f<c;f++)if(s(t,u+f)!==s(e,f)){l=!1;break}if(l)return u}return-1}function x(t,e,r,n){r=Number(r)||0;var i=t.length-r;n?(n=Number(n),n>i&&(n=i)):n=i;var s=e.length;if(s%2!==0)throw new TypeError("Invalid hex string");n>s/2&&(n=s/2);for(var o=0;o<n;++o){var a=parseInt(e.substr(2*o,2),16);if(isNaN(a))return o;t[r+o]=a}return o}function S(t,e,r,n){return Q(F(e,t.length-r),t,r,n)}function E(t,e,r,n){return Q(G(e),t,r,n)}function T(t,e,r,n){return E(t,e,r,n)}function A(t,e,r,n){return Q(X(e),t,r,n)}function k(t,e,r,n){return Q(W(e,t.length-r),t,r,n)}function L(t,e,r){return 0===e&&r===t.length?Z.fromByteArray(t):Z.fromByteArray(t.slice(e,r))}function q(t,e,r){r=Math.min(t.length,r);for(var n=[],i=e;i<r;){var s=t[i],o=null,a=s>239?4:s>223?3:s>191?2:1;if(i+a<=r){var c,u,h,l;switch(a){case 1:s<128&&(o=s);break;case 2:c=t[i+1],128===(192&c)&&(l=(31&s)<<6|63&c,l>127&&(o=l));break;case 3:c=t[i+1],u=t[i+2],128===(192&c)&&128===(192&u)&&(l=(15&s)<<12|(63&c)<<6|63&u,l>2047&&(l<55296||l>57343)&&(o=l));break;case 4:c=t[i+1],u=t[i+2],h=t[i+3],128===(192&c)&&128===(192&u)&&128===(192&h)&&(l=(15&s)<<18|(63&c)<<12|(63&u)<<6|63&h,l>65535&&l<1114112&&(o=l))}}null===o?(o=65533,a=1):o>65535&&(o-=65536,n.push(o>>>10&1023|55296),o=56320|1023&o),n.push(o),i+=a}return R(n)}function R(t){var e=t.length;if(e<=tt)return String.fromCharCode.apply(String,t);for(var r="",n=0;n<e;)r+=String.fromCharCode.apply(String,t.slice(n,n+=tt));return r}function C(t,e,r){var n="";r=Math.min(t.length,r);for(var i=e;i<r;++i)n+=String.fromCharCode(127&t[i]);return n}function B(t,e,r){var n="";r=Math.min(t.length,r);for(var i=e;i<r;++i)n+=String.fromCharCode(t[i]);return n}function D(t,e,r){var n=t.length;(!e||e<0)&&(e=0),(!r||r<0||r>n)&&(r=n);for(var i="",s=e;s<r;++s)i+=Y(t[s]);return i}function j(t,e,r){for(var n=t.slice(e,r),i="",s=0;s<n.length;s+=2)i+=String.fromCharCode(n[s]+256*n[s+1]);return i}function N(t,e,r){if(t%1!==0||t<0)throw new RangeError("offset is not uint");if(t+e>r)throw new RangeError("Trying to access beyond buffer length")}function O(t,e,r,n,i,s){if(!o.isBuffer(t))throw new TypeError('"buffer" argument must be a Buffer instance');if(e>i||e<s)throw new RangeError('"value" argument is out of bounds');if(r+n>t.length)throw new RangeError("Index out of range")}function M(t,e,r,n){e<0&&(e=65535+e+1);for(var i=0,s=Math.min(t.length-r,2);i<s;++i)t[r+i]=(e&255<<8*(n?i:1-i))>>>8*(n?i:1-i)}function I(t,e,r,n){e<0&&(e=4294967295+e+1);for(var i=0,s=Math.min(t.length-r,4);i<s;++i)t[r+i]=e>>>8*(n?i:3-i)&255}function P(t,e,r,n,i,s){if(r+n>t.length)throw new RangeError("Index out of range");if(r<0)throw new RangeError("Index out of range")}function U(t,e,r,n,i){return i||P(t,e,r,4,3.4028234663852886e38,-3.4028234663852886e38),K.write(t,e,r,n,23,4),r+4}function H(t,e,r,n,i){return i||P(t,e,r,8,1.7976931348623157e308,-1.7976931348623157e308),K.write(t,e,r,n,52,8),r+8}function V(t){if(t=z(t).replace(et,""),t.length<2)return"";for(;t.length%4!==0;)t+="=";return t}function z(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")}function Y(t){return t<16?"0"+t.toString(16):t.toString(16)}function F(t,e){e=e||1/0;for(var r,n=t.length,i=null,s=[],o=0;o<n;++o){if(r=t.charCodeAt(o),r>55295&&r<57344){if(!i){if(r>56319){(e-=3)>-1&&s.push(239,191,189);continue}if(o+1===n){(e-=3)>-1&&s.push(239,191,189);continue}i=r;continue}if(r<56320){(e-=3)>-1&&s.push(239,191,189),i=r;continue}r=(i-55296<<10|r-56320)+65536}else i&&(e-=3)>-1&&s.push(239,191,189);if(i=null,r<128){if((e-=1)<0)break;s.push(r)}else if(r<2048){if((e-=2)<0)break;s.push(r>>6|192,63&r|128)}else if(r<65536){if((e-=3)<0)break;s.push(r>>12|224,r>>6&63|128,63&r|128)}else{if(!(r<1114112))throw new Error("Invalid code point");if((e-=4)<0)break;s.push(r>>18|240,r>>12&63|128,r>>6&63|128,63&r|128)}}return s}function G(t){for(var e=[],r=0;r<t.length;++r)e.push(255&t.charCodeAt(r));return e}function W(t,e){for(var r,n,i,s=[],o=0;o<t.length&&!((e-=2)<0);++o)r=t.charCodeAt(o),n=r>>8,i=r%256,s.push(i),s.push(n);return s}function X(t){return Z.toByteArray(V(t))}function Q(t,e,r,n){for(var i=0;i<n&&!(i+r>=e.length||i>=t.length);++i)e[i+r]=t[i];return i}function J(t){return t!==t}var Z=t("base64-js"),K=t("ieee754"),$=t("isarray");r.Buffer=o,r.SlowBuffer=_,r.INSPECT_MAX_BYTES=50,o.TYPED_ARRAY_SUPPORT=void 0!==e.TYPED_ARRAY_SUPPORT?e.TYPED_ARRAY_SUPPORT:n(),r.kMaxLength=i(),o.poolSize=8192,o._augment=function(t){return t.__proto__=o.prototype,t},o.from=function(t,e,r){return a(null,t,e,r)},o.TYPED_ARRAY_SUPPORT&&(o.prototype.__proto__=Uint8Array.prototype,o.__proto__=Uint8Array,"undefined"!=typeof Symbol&&Symbol.species&&o[Symbol.species]===o&&Object.defineProperty(o,Symbol.species,{value:null,configurable:!0})),o.alloc=function(t,e,r){return u(null,t,e,r)},o.allocUnsafe=function(t){return h(null,t)},o.allocUnsafeSlow=function(t){return h(null,t)},o.isBuffer=function(t){return!(null==t||!t._isBuffer)},o.compare=function(t,e){if(!o.isBuffer(t)||!o.isBuffer(e))throw new TypeError("Arguments must be Buffers");if(t===e)return 0;for(var r=t.length,n=e.length,i=0,s=Math.min(r,n);i<s;++i)if(t[i]!==e[i]){r=t[i],n=e[i];break}return r<n?-1:n<r?1:0},o.isEncoding=function(t){switch(String(t).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"latin1":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return!0;default:return!1}},o.concat=function(t,e){if(!$(t))throw new TypeError('"list" argument must be an Array of Buffers');if(0===t.length)return o.alloc(0);var r;if(void 0===e)for(e=0,r=0;r<t.length;++r)e+=t[r].length;var n=o.allocUnsafe(e),i=0;for(r=0;r<t.length;++r){var s=t[r];if(!o.isBuffer(s))throw new TypeError('"list" argument must be an Array of Buffers');s.copy(n,i),i+=s.length}return n},o.byteLength=m,o.prototype._isBuffer=!0,o.prototype.swap16=function(){var t=this.length;if(t%2!==0)throw new RangeError("Buffer size must be a multiple of 16-bits");for(var e=0;e<t;e+=2)y(this,e,e+1);return this},o.prototype.swap32=function(){var t=this.length;if(t%4!==0)throw new RangeError("Buffer size must be a multiple of 32-bits");for(var e=0;e<t;e+=4)y(this,e,e+3),y(this,e+1,e+2);return this},o.prototype.swap64=function(){var t=this.length;if(t%8!==0)throw new RangeError("Buffer size must be a multiple of 64-bits");for(var e=0;e<t;e+=8)y(this,e,e+7),y(this,e+1,e+6),y(this,e+2,e+5),y(this,e+3,e+4);return this},o.prototype.toString=function(){var t=0|this.length;return 0===t?"":0===arguments.length?q(this,0,t):b.apply(this,arguments)},o.prototype.equals=function(t){if(!o.isBuffer(t))throw new TypeError("Argument must be a Buffer");return this===t||0===o.compare(this,t)},o.prototype.inspect=function(){var t="",e=r.INSPECT_MAX_BYTES;return this.length>0&&(t=this.toString("hex",0,e).match(/.{2}/g).join(" "),this.length>e&&(t+=" ... ")),"<Buffer "+t+">"},o.prototype.compare=function(t,e,r,n,i){if(!o.isBuffer(t))throw new TypeError("Argument must be a Buffer");if(void 0===e&&(e=0),void 0===r&&(r=t?t.length:0),void 0===n&&(n=0),void 0===i&&(i=this.length),e<0||r>t.length||n<0||i>this.length)throw new RangeError("out of range index");if(n>=i&&e>=r)return 0;if(n>=i)return-1;if(e>=r)return 1;if(e>>>=0,r>>>=0,n>>>=0,i>>>=0,this===t)return 0;for(var s=i-n,a=r-e,c=Math.min(s,a),u=this.slice(n,i),h=t.slice(e,r),l=0;l<c;++l)if(u[l]!==h[l]){s=u[l],a=h[l];break}return s<a?-1:a<s?1:0},o.prototype.includes=function(t,e,r){return this.indexOf(t,e,r)!==-1},o.prototype.indexOf=function(t,e,r){return v(this,t,e,r,!0)},o.prototype.lastIndexOf=function(t,e,r){return v(this,t,e,r,!1)},o.prototype.write=function(t,e,r,n){if(void 0===e)n="utf8",r=this.length,e=0;else if(void 0===r&&"string"==typeof e)n=e,r=this.length,e=0;else{if(!isFinite(e))throw new Error("Buffer.write(string, encoding, offset[, length]) is no longer supported");e=0|e,isFinite(r)?(r=0|r,void 0===n&&(n="utf8")):(n=r,r=void 0)}var i=this.length-e;if((void 0===r||r>i)&&(r=i),t.length>0&&(r<0||e<0)||e>this.length)throw new RangeError("Attempt to write outside buffer bounds");n||(n="utf8");for(var s=!1;;)switch(n){case"hex":return x(this,t,e,r);case"utf8":case"utf-8":return S(this,t,e,r);case"ascii":return E(this,t,e,r);case"latin1":case"binary":return T(this,t,e,r);case"base64":return A(this,t,e,r);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return k(this,t,e,r);default:if(s)throw new TypeError("Unknown encoding: "+n);n=(""+n).toLowerCase(),s=!0}},o.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var tt=4096;o.prototype.slice=function(t,e){var r=this.length;t=~~t,e=void 0===e?r:~~e,t<0?(t+=r,t<0&&(t=0)):t>r&&(t=r),e<0?(e+=r,e<0&&(e=0)):e>r&&(e=r),e<t&&(e=t);var n;if(o.TYPED_ARRAY_SUPPORT)n=this.subarray(t,e),n.__proto__=o.prototype;else{var i=e-t;n=new o(i,(void 0));for(var s=0;s<i;++s)n[s]=this[s+t]}return n},o.prototype.readUIntLE=function(t,e,r){t=0|t,e=0|e,r||N(t,e,this.length);for(var n=this[t],i=1,s=0;++s<e&&(i*=256);)n+=this[t+s]*i;return n},o.prototype.readUIntBE=function(t,e,r){t=0|t,e=0|e,r||N(t,e,this.length);for(var n=this[t+--e],i=1;e>0&&(i*=256);)n+=this[t+--e]*i;return n},o.prototype.readUInt8=function(t,e){return e||N(t,1,this.length),this[t]},o.prototype.readUInt16LE=function(t,e){return e||N(t,2,this.length),this[t]|this[t+1]<<8},o.prototype.readUInt16BE=function(t,e){return e||N(t,2,this.length),this[t]<<8|this[t+1]},o.prototype.readUInt32LE=function(t,e){return e||N(t,4,this.length),(this[t]|this[t+1]<<8|this[t+2]<<16)+16777216*this[t+3]},o.prototype.readUInt32BE=function(t,e){return e||N(t,4,this.length),16777216*this[t]+(this[t+1]<<16|this[t+2]<<8|this[t+3])},o.prototype.readIntLE=function(t,e,r){t=0|t,e=0|e,r||N(t,e,this.length);for(var n=this[t],i=1,s=0;++s<e&&(i*=256);)n+=this[t+s]*i;return i*=128,n>=i&&(n-=Math.pow(2,8*e)),n},o.prototype.readIntBE=function(t,e,r){t=0|t,e=0|e,r||N(t,e,this.length);for(var n=e,i=1,s=this[t+--n];n>0&&(i*=256);)s+=this[t+--n]*i;return i*=128,s>=i&&(s-=Math.pow(2,8*e)),s},o.prototype.readInt8=function(t,e){return e||N(t,1,this.length),128&this[t]?(255-this[t]+1)*-1:this[t]},o.prototype.readInt16LE=function(t,e){e||N(t,2,this.length);var r=this[t]|this[t+1]<<8;return 32768&r?4294901760|r:r},o.prototype.readInt16BE=function(t,e){e||N(t,2,this.length);var r=this[t+1]|this[t]<<8;return 32768&r?4294901760|r:r},o.prototype.readInt32LE=function(t,e){return e||N(t,4,this.length),this[t]|this[t+1]<<8|this[t+2]<<16|this[t+3]<<24},o.prototype.readInt32BE=function(t,e){return e||N(t,4,this.length),this[t]<<24|this[t+1]<<16|this[t+2]<<8|this[t+3]},o.prototype.readFloatLE=function(t,e){return e||N(t,4,this.length),K.read(this,t,!0,23,4)},o.prototype.readFloatBE=function(t,e){return e||N(t,4,this.length),K.read(this,t,!1,23,4)},o.prototype.readDoubleLE=function(t,e){return e||N(t,8,this.length),K.read(this,t,!0,52,8)},o.prototype.readDoubleBE=function(t,e){return e||N(t,8,this.length),K.read(this,t,!1,52,8)},o.prototype.writeUIntLE=function(t,e,r,n){if(t=+t,e=0|e,r=0|r,!n){var i=Math.pow(2,8*r)-1;O(this,t,e,r,i,0)}var s=1,o=0;for(this[e]=255&t;++o<r&&(s*=256);)this[e+o]=t/s&255;return e+r},o.prototype.writeUIntBE=function(t,e,r,n){if(t=+t,e=0|e,r=0|r,!n){var i=Math.pow(2,8*r)-1;O(this,t,e,r,i,0)}var s=r-1,o=1;for(this[e+s]=255&t;--s>=0&&(o*=256);)this[e+s]=t/o&255;return e+r},o.prototype.writeUInt8=function(t,e,r){return t=+t,e=0|e,r||O(this,t,e,1,255,0),o.TYPED_ARRAY_SUPPORT||(t=Math.floor(t)),this[e]=255&t,e+1},o.prototype.writeUInt16LE=function(t,e,r){return t=+t,e=0|e,r||O(this,t,e,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8):M(this,t,e,!0),e+2},o.prototype.writeUInt16BE=function(t,e,r){return t=+t,e=0|e,r||O(this,t,e,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>8,this[e+1]=255&t):M(this,t,e,!1),e+2},o.prototype.writeUInt32LE=function(t,e,r){return t=+t,e=0|e,r||O(this,t,e,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[e+3]=t>>>24,this[e+2]=t>>>16,this[e+1]=t>>>8,this[e]=255&t):I(this,t,e,!0),e+4},o.prototype.writeUInt32BE=function(t,e,r){return t=+t,e=0|e,r||O(this,t,e,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>24,this[e+1]=t>>>16,this[e+2]=t>>>8,this[e+3]=255&t):I(this,t,e,!1),e+4},o.prototype.writeIntLE=function(t,e,r,n){if(t=+t,e=0|e,!n){var i=Math.pow(2,8*r-1);O(this,t,e,r,i-1,-i)}var s=0,o=1,a=0;for(this[e]=255&t;++s<r&&(o*=256);)t<0&&0===a&&0!==this[e+s-1]&&(a=1),this[e+s]=(t/o>>0)-a&255;return e+r},o.prototype.writeIntBE=function(t,e,r,n){if(t=+t,e=0|e,!n){var i=Math.pow(2,8*r-1);O(this,t,e,r,i-1,-i)}var s=r-1,o=1,a=0;for(this[e+s]=255&t;--s>=0&&(o*=256);)t<0&&0===a&&0!==this[e+s+1]&&(a=1),this[e+s]=(t/o>>0)-a&255;return e+r},o.prototype.writeInt8=function(t,e,r){return t=+t,e=0|e,r||O(this,t,e,1,127,-128),o.TYPED_ARRAY_SUPPORT||(t=Math.floor(t)),t<0&&(t=255+t+1),this[e]=255&t,e+1},o.prototype.writeInt16LE=function(t,e,r){return t=+t,e=0|e,r||O(this,t,e,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8):M(this,t,e,!0),e+2},o.prototype.writeInt16BE=function(t,e,r){return t=+t,e=0|e,r||O(this,t,e,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>8,this[e+1]=255&t):M(this,t,e,!1),e+2},o.prototype.writeInt32LE=function(t,e,r){return t=+t,e=0|e,r||O(this,t,e,4,2147483647,-2147483648),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8,this[e+2]=t>>>16,this[e+3]=t>>>24):I(this,t,e,!0),e+4},o.prototype.writeInt32BE=function(t,e,r){return t=+t,e=0|e,r||O(this,t,e,4,2147483647,-2147483648),t<0&&(t=4294967295+t+1),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>24,this[e+1]=t>>>16,this[e+2]=t>>>8,this[e+3]=255&t):I(this,t,e,!1),e+4},o.prototype.writeFloatLE=function(t,e,r){return U(this,t,e,!0,r)},o.prototype.writeFloatBE=function(t,e,r){return U(this,t,e,!1,r)},o.prototype.writeDoubleLE=function(t,e,r){return H(this,t,e,!0,r)},o.prototype.writeDoubleBE=function(t,e,r){return H(this,t,e,!1,r)},o.prototype.copy=function(t,e,r,n){if(r||(r=0),n||0===n||(n=this.length),e>=t.length&&(e=t.length),e||(e=0),n>0&&n<r&&(n=r),n===r)return 0;if(0===t.length||0===this.length)return 0;if(e<0)throw new RangeError("targetStart out of bounds");if(r<0||r>=this.length)throw new RangeError("sourceStart out of bounds");if(n<0)throw new RangeError("sourceEnd out of bounds");n>this.length&&(n=this.length),t.length-e<n-r&&(n=t.length-e+r);var i,s=n-r;if(this===t&&r<e&&e<n)for(i=s-1;i>=0;--i)t[i+e]=this[i+r];else if(s<1e3||!o.TYPED_ARRAY_SUPPORT)for(i=0;i<s;++i)t[i+e]=this[i+r];else Uint8Array.prototype.set.call(t,this.subarray(r,r+s),e);return s},o.prototype.fill=function(t,e,r,n){if("string"==typeof t){if("string"==typeof e?(n=e,e=0,r=this.length):"string"==typeof r&&(n=r,r=this.length),1===t.length){var i=t.charCodeAt(0);i<256&&(t=i)}if(void 0!==n&&"string"!=typeof n)throw new TypeError("encoding must be a string");if("string"==typeof n&&!o.isEncoding(n))throw new TypeError("Unknown encoding: "+n)}else"number"==typeof t&&(t=255&t);if(e<0||this.length<e||this.length<r)throw new RangeError("Out of range index");if(r<=e)return this;e>>>=0,r=void 0===r?this.length:r>>>0,t||(t=0);var s;if("number"==typeof t)for(s=e;s<r;++s)this[s]=t;else{var a=o.isBuffer(t)?t:F(new o(t,n).toString()),c=a.length;for(s=0;s<r-e;++s)this[s+e]=a[s%c]}return this};var et=/[^+\/0-9A-Za-z-_]/g}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"base64-js":2,ieee754:37,isarray:40}],6:[function(t,e,r){(function(t){function e(t){return Array.isArray?Array.isArray(t):"[object Array]"===_(t)}function n(t){return"boolean"==typeof t}function i(t){return null===t}function s(t){return null==t}function o(t){return"number"==typeof t}function a(t){return"string"==typeof t}function c(t){return"symbol"==typeof t}function u(t){return void 0===t}function h(t){return"[object RegExp]"===_(t)}function l(t){return"object"==typeof t&&null!==t}function f(t){return"[object Date]"===_(t)}function p(t){return"[object Error]"===_(t)||t instanceof Error}function d(t){return"function"==typeof t}function g(t){return null===t||"boolean"==typeof t||"number"==typeof t||"string"==typeof t||"symbol"==typeof t||"undefined"==typeof t}function _(t){return Object.prototype.toString.call(t)}r.isArray=e,r.isBoolean=n,r.isNull=i,r.isNullOrUndefined=s,r.isNumber=o,r.isString=a,r.isSymbol=c,r.isUndefined=u,r.isRegExp=h,r.isObject=l,r.isDate=f,r.isError=p,r.isFunction=d,r.isPrimitive=g,r.isBuffer=t.isBuffer}).call(this,{isBuffer:t("../../is-buffer/index.js")})},{"../../is-buffer/index.js":39}],7:[function(t,e,r){function n(t,e){if(t){var r,n="";for(var i in t)r=t[i],n&&(n+=" "),n+=!r&&l[i]?i:i+'="'+(e.decodeEntities?h.encodeXML(r):r)+'"';return n}}function i(t,e){"svg"===t.name&&(e={decodeEntities:e.decodeEntities,xmlMode:!0});var r="<"+t.name,i=n(t.attribs,e);return i&&(r+=" "+i),!e.xmlMode||t.children&&0!==t.children.length?(r+=">",t.children&&(r+=d(t.children,e)),p[t.name]&&!e.xmlMode||(r+="</"+t.name+">")):r+="/>",r}function s(t){return"<"+t.data+">"}function o(t,e){var r=t.data||"";return!e.decodeEntities||t.parent&&t.parent.name in f||(r=h.encodeXML(r)),r}function a(t){return"<![CDATA["+t.children[0].data+"]]>"}function c(t){return"<!--"+t.data+"-->"}var u=t("domelementtype"),h=t("entities"),l={__proto__:null,allowfullscreen:!0,async:!0,autofocus:!0,autoplay:!0,checked:!0,controls:!0,"default":!0,defer:!0,disabled:!0,hidden:!0,ismap:!0,loop:!0,multiple:!0,muted:!0,open:!0,readonly:!0,required:!0,reversed:!0,scoped:!0,seamless:!0,selected:!0,typemustmatch:!0},f={__proto__:null,style:!0,script:!0,xmp:!0,iframe:!0,noembed:!0,noframes:!0,plaintext:!0,noscript:!0},p={__proto__:null,area:!0,base:!0,basefont:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,isindex:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},d=e.exports=function(t,e){Array.isArray(t)||t.cheerio||(t=[t]),e=e||{};for(var r="",n=0;n<t.length;n++){var h=t[n];r+="root"===h.type?d(h.children,e):u.isTag(h)?i(h,e):h.type===u.Directive?s(h):h.type===u.Comment?c(h):h.type===u.CDATA?a(h):o(h,e)}return r}},{domelementtype:8,entities:20}],8:[function(t,e,r){e.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",isTag:function(t){return"tag"===t.type||"script"===t.type||"style"===t.type}}},{}],9:[function(t,e,r){e.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",Doctype:"doctype",isTag:function(t){return"tag"===t.type||"script"===t.type||"style"===t.type}}},{}],10:[function(t,e,r){function n(t,e,r){"object"==typeof t?(r=e,e=t,t=null):"function"==typeof e&&(r=e,e=c),this._callback=t,this._options=e||c,this._elementCB=r,this.dom=[],this._done=!1,this._tagStack=[],this._parser=this._parser||null}var i=t("domelementtype"),s=/\s+/g,o=t("./lib/node"),a=t("./lib/element"),c={normalizeWhitespace:!1,withStartIndices:!1};n.prototype.onparserinit=function(t){this._parser=t},n.prototype.onreset=function(){n.call(this,this._callback,this._options,this._elementCB)},n.prototype.onend=function(){this._done||(this._done=!0,this._parser=null,this._handleCallback(null))},n.prototype._handleCallback=n.prototype.onerror=function(t){if("function"==typeof this._callback)this._callback(t,this.dom);else if(t)throw t},n.prototype.onclosetag=function(){var t=this._tagStack.pop();this._elementCB&&this._elementCB(t)},n.prototype._addDomElement=function(t){var e=this._tagStack[this._tagStack.length-1],r=e?e.children:this.dom,n=r[r.length-1];
+t.next=null,this._options.withStartIndices&&(t.startIndex=this._parser.startIndex),this._options.withDomLvl1&&(t.__proto__="tag"===t.type?a:o),n?(t.prev=n,n.next=t):t.prev=null,r.push(t),t.parent=e||null},n.prototype.onopentag=function(t,e){var r={type:"script"===t?i.Script:"style"===t?i.Style:i.Tag,name:t,attribs:e,children:[]};this._addDomElement(r),this._tagStack.push(r)},n.prototype.ontext=function(t){var e,r=this._options.normalizeWhitespace||this._options.ignoreWhitespace;!this._tagStack.length&&this.dom.length&&(e=this.dom[this.dom.length-1]).type===i.Text?r?e.data=(e.data+t).replace(s," "):e.data+=t:this._tagStack.length&&(e=this._tagStack[this._tagStack.length-1])&&(e=e.children[e.children.length-1])&&e.type===i.Text?r?e.data=(e.data+t).replace(s," "):e.data+=t:(r&&(t=t.replace(s," ")),this._addDomElement({data:t,type:i.Text}))},n.prototype.oncomment=function(t){var e=this._tagStack[this._tagStack.length-1];if(e&&e.type===i.Comment)return void(e.data+=t);var r={data:t,type:i.Comment};this._addDomElement(r),this._tagStack.push(r)},n.prototype.oncdatastart=function(){var t={children:[{data:"",type:i.Text}],type:i.CDATA};this._addDomElement(t),this._tagStack.push(t)},n.prototype.oncommentend=n.prototype.oncdataend=function(){this._tagStack.pop()},n.prototype.onprocessinginstruction=function(t,e){this._addDomElement({name:t,data:e,type:i.Directive})},e.exports=n},{"./lib/element":11,"./lib/node":12,domelementtype:9}],11:[function(t,e,r){var n=t("./node"),i=e.exports=Object.create(n),s={tagName:"name"};Object.keys(s).forEach(function(t){var e=s[t];Object.defineProperty(i,t,{get:function(){return this[e]||null},set:function(t){return this[e]=t,t}})})},{"./node":12}],12:[function(t,e,r){var n=e.exports={get firstChild(){var t=this.children;return t&&t[0]||null},get lastChild(){var t=this.children;return t&&t[t.length-1]||null},get nodeType(){return s[this.type]||s.element}},i={tagName:"name",childNodes:"children",parentNode:"parent",previousSibling:"prev",nextSibling:"next",nodeValue:"data"},s={element:1,text:3,cdata:4,comment:8};Object.keys(i).forEach(function(t){var e=i[t];Object.defineProperty(n,t,{get:function(){return this[e]||null},set:function(t){return this[e]=t,t}})})},{}],13:[function(t,e,r){var n=e.exports;[t("./lib/stringify"),t("./lib/traversal"),t("./lib/manipulation"),t("./lib/querying"),t("./lib/legacy"),t("./lib/helpers")].forEach(function(t){Object.keys(t).forEach(function(e){n[e]=t[e].bind(n)})})},{"./lib/helpers":14,"./lib/legacy":15,"./lib/manipulation":16,"./lib/querying":17,"./lib/stringify":18,"./lib/traversal":19}],14:[function(t,e,r){r.removeSubsets=function(t){for(var e,r,n,i=t.length;--i>-1;){for(e=r=t[i],t[i]=null,n=!0;r;){if(t.indexOf(r)>-1){n=!1,t.splice(i,1);break}r=r.parent}n&&(t[i]=e)}return t};var n={DISCONNECTED:1,PRECEDING:2,FOLLOWING:4,CONTAINS:8,CONTAINED_BY:16},i=r.compareDocumentPosition=function(t,e){var r,i,s,o,a,c,u=[],h=[];if(t===e)return 0;for(r=t;r;)u.unshift(r),r=r.parent;for(r=e;r;)h.unshift(r),r=r.parent;for(c=0;u[c]===h[c];)c++;return 0===c?n.DISCONNECTED:(i=u[c-1],s=i.children,o=u[c],a=h[c],s.indexOf(o)>s.indexOf(a)?i===e?n.FOLLOWING|n.CONTAINED_BY:n.FOLLOWING:i===t?n.PRECEDING|n.CONTAINS:n.PRECEDING)};r.uniqueSort=function(t){var e,r,s=t.length;for(t=t.slice();--s>-1;)e=t[s],r=t.indexOf(e),r>-1&&r<s&&t.splice(s,1);return t.sort(function(t,e){var r=i(t,e);return r&n.PRECEDING?-1:r&n.FOLLOWING?1:0}),t}},{}],15:[function(t,e,r){function n(t,e){return"function"==typeof e?function(r){return r.attribs&&e(r.attribs[t])}:function(r){return r.attribs&&r.attribs[t]===e}}function i(t,e){return function(r){return t(r)||e(r)}}var s=t("domelementtype"),o=r.isTag=s.isTag;r.testElement=function(t,e){for(var r in t)if(t.hasOwnProperty(r)){if("tag_name"===r){if(!o(e)||!t.tag_name(e.name))return!1}else if("tag_type"===r){if(!t.tag_type(e.type))return!1}else if("tag_contains"===r){if(o(e)||!t.tag_contains(e.data))return!1}else if(!e.attribs||!t[r](e.attribs[r]))return!1}else;return!0};var a={tag_name:function(t){return"function"==typeof t?function(e){return o(e)&&t(e.name)}:"*"===t?o:function(e){return o(e)&&e.name===t}},tag_type:function(t){return"function"==typeof t?function(e){return t(e.type)}:function(e){return e.type===t}},tag_contains:function(t){return"function"==typeof t?function(e){return!o(e)&&t(e.data)}:function(e){return!o(e)&&e.data===t}}};r.getElements=function(t,e,r,s){var o=Object.keys(t).map(function(e){var r=t[e];return e in a?a[e](r):n(e,r)});return 0===o.length?[]:this.filter(o.reduce(i),e,r,s)},r.getElementById=function(t,e,r){return Array.isArray(e)||(e=[e]),this.findOne(n("id",t),e,r!==!1)},r.getElementsByTagName=function(t,e,r,n){return this.filter(a.tag_name(t),e,r,n)},r.getElementsByTagType=function(t,e,r,n){return this.filter(a.tag_type(t),e,r,n)}},{domelementtype:9}],16:[function(t,e,r){r.removeElement=function(t){if(t.prev&&(t.prev.next=t.next),t.next&&(t.next.prev=t.prev),t.parent){var e=t.parent.children;e.splice(e.lastIndexOf(t),1)}},r.replaceElement=function(t,e){var r=e.prev=t.prev;r&&(r.next=e);var n=e.next=t.next;n&&(n.prev=e);var i=e.parent=t.parent;if(i){var s=i.children;s[s.lastIndexOf(t)]=e}},r.appendChild=function(t,e){if(e.parent=t,1!==t.children.push(e)){var r=t.children[t.children.length-2];r.next=e,e.prev=r,e.next=null}},r.append=function(t,e){var r=t.parent,n=t.next;if(e.next=n,e.prev=t,t.next=e,e.parent=r,n){if(n.prev=e,r){var i=r.children;i.splice(i.lastIndexOf(n),0,e)}}else r&&r.children.push(e)},r.prepend=function(t,e){var r=t.parent;if(r){var n=r.children;n.splice(n.lastIndexOf(t),0,e)}t.prev&&(t.prev.next=e),e.parent=r,e.prev=t.prev,e.next=t,t.prev=e}},{}],17:[function(t,e,r){function n(t,e,r,n){return Array.isArray(e)||(e=[e]),"number"==typeof n&&isFinite(n)||(n=1/0),i(t,e,r!==!1,n)}function i(t,e,r,n){for(var s,o=[],a=0,c=e.length;a<c&&!(t(e[a])&&(o.push(e[a]),--n<=0))&&(s=e[a].children,!(r&&s&&s.length>0&&(s=i(t,s,r,n),o=o.concat(s),n-=s.length,n<=0)));a++);return o}function s(t,e){for(var r=0,n=e.length;r<n;r++)if(t(e[r]))return e[r];return null}function o(t,e){for(var r=null,n=0,i=e.length;n<i&&!r;n++)u(e[n])&&(t(e[n])?r=e[n]:e[n].children.length>0&&(r=o(t,e[n].children)));return r}function a(t,e){for(var r=0,n=e.length;r<n;r++)if(u(e[r])&&(t(e[r])||e[r].children.length>0&&a(t,e[r].children)))return!0;return!1}function c(t,e){for(var r=[],n=0,i=e.length;n<i;n++)u(e[n])&&(t(e[n])&&r.push(e[n]),e[n].children.length>0&&(r=r.concat(c(t,e[n].children))));return r}var u=t("domelementtype").isTag;e.exports={filter:n,find:i,findOneChild:s,findOne:o,existsOne:a,findAll:c}},{domelementtype:9}],18:[function(t,e,r){function n(t,e){return t.children?t.children.map(function(t){return o(t,e)}).join(""):""}function i(t){return Array.isArray(t)?t.map(i).join(""):a(t)||t.type===s.CDATA?i(t.children):t.type===s.Text?t.data:""}var s=t("domelementtype"),o=t("dom-serializer"),a=s.isTag;e.exports={getInnerHTML:n,getOuterHTML:o,getText:i}},{"dom-serializer":7,domelementtype:9}],19:[function(t,e,r){var n=r.getChildren=function(t){return t.children},i=r.getParent=function(t){return t.parent};r.getSiblings=function(t){var e=i(t);return e?n(e):[t]},r.getAttributeValue=function(t,e){return t.attribs&&t.attribs[e]},r.hasAttrib=function(t,e){return!!t.attribs&&hasOwnProperty.call(t.attribs,e)},r.getName=function(t){return t.name}},{}],20:[function(t,e,r){var n=t("./lib/encode.js"),i=t("./lib/decode.js");r.decode=function(t,e){return(!e||e<=0?i.XML:i.HTML)(t)},r.decodeStrict=function(t,e){return(!e||e<=0?i.XML:i.HTMLStrict)(t)},r.encode=function(t,e){return(!e||e<=0?n.XML:n.HTML)(t)},r.encodeXML=n.XML,r.encodeHTML4=r.encodeHTML5=r.encodeHTML=n.HTML,r.decodeXML=r.decodeXMLStrict=i.XML,r.decodeHTML4=r.decodeHTML5=r.decodeHTML=i.HTML,r.decodeHTML4Strict=r.decodeHTML5Strict=r.decodeHTMLStrict=i.HTMLStrict,r.escape=n.escape},{"./lib/decode.js":21,"./lib/encode.js":23}],21:[function(t,e,r){function n(t){var e=Object.keys(t).join("|"),r=s(t);e+="|#[xX][\\da-fA-F]+|#\\d+";var n=new RegExp("&(?:"+e+");","g");return function(t){return String(t).replace(n,r)}}function i(t,e){return t<e?1:-1}function s(t){return function(e){return"#"===e.charAt(1)?u("X"===e.charAt(2)||"x"===e.charAt(2)?parseInt(e.substr(3),16):parseInt(e.substr(2),10)):t[e.slice(1,-1)]}}var o=t("../maps/entities.json"),a=t("../maps/legacy.json"),c=t("../maps/xml.json"),u=t("./decode_codepoint.js"),h=n(c),l=n(o),f=function(){function t(t){return";"!==t.substr(-1)&&(t+=";"),h(t)}for(var e=Object.keys(a).sort(i),r=Object.keys(o).sort(i),n=0,c=0;n<r.length;n++)e[c]===r[n]?(r[n]+=";?",c++):r[n]+=";";var u=new RegExp("&(?:"+r.join("|")+"|#[xX][\\da-fA-F]+;?|#\\d+;?)","g"),h=s(o);return function(e){return String(e).replace(u,t)}}();e.exports={XML:h,HTML:f,HTMLStrict:l}},{"../maps/entities.json":25,"../maps/legacy.json":26,"../maps/xml.json":27,"./decode_codepoint.js":22}],22:[function(t,e,r){function n(t){if(t>=55296&&t<=57343||t>1114111)return"�";t in i&&(t=i[t]);var e="";return t>65535&&(t-=65536,e+=String.fromCharCode(t>>>10&1023|55296),t=56320|1023&t),e+=String.fromCharCode(t)}var i=t("../maps/decode.json");e.exports=n},{"../maps/decode.json":24}],23:[function(t,e,r){function n(t){return Object.keys(t).sort().reduce(function(e,r){return e[t[r]]="&"+r+";",e},{})}function i(t){var e=[],r=[];return Object.keys(t).forEach(function(t){1===t.length?e.push("\\"+t):r.push(t)}),r.unshift("["+e.join("")+"]"),new RegExp(r.join("|"),"g")}function s(t){return"&#x"+t.charCodeAt(0).toString(16).toUpperCase()+";"}function o(t){var e=t.charCodeAt(0),r=t.charCodeAt(1),n=1024*(e-55296)+r-56320+65536;return"&#x"+n.toString(16).toUpperCase()+";"}function a(t,e){function r(e){return t[e]}return function(t){return t.replace(e,r).replace(d,o).replace(p,s)}}function c(t){return t.replace(g,s).replace(d,o).replace(p,s)}var u=n(t("../maps/xml.json")),h=i(u);r.XML=a(u,h);var l=n(t("../maps/entities.json")),f=i(l);r.HTML=a(l,f);var p=/[^\0-\x7F]/g,d=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,g=i(u);r.escape=c},{"../maps/entities.json":25,"../maps/xml.json":27}],24:[function(t,e,r){e.exports={0:65533,128:8364,130:8218,131:402,132:8222,133:8230,134:8224,135:8225,136:710,137:8240,138:352,139:8249,140:338,142:381,145:8216,146:8217,147:8220,148:8221,149:8226,150:8211,151:8212,152:732,153:8482,154:353,155:8250,156:339,158:382,159:376}},{}],25:[function(t,e,r){e.exports={Aacute:"Á",aacute:"á",Abreve:"Ă",abreve:"ă",ac:"∾",acd:"∿",acE:"∾̳",Acirc:"Â",acirc:"â",acute:"´",Acy:"А",acy:"а",AElig:"Æ",aelig:"æ",af:"⁡",Afr:"𝔄",afr:"𝔞",Agrave:"À",agrave:"à",alefsym:"ℵ",aleph:"ℵ",Alpha:"Α",alpha:"α",Amacr:"Ā",amacr:"ā",amalg:"⨿",amp:"&",AMP:"&",andand:"⩕",And:"⩓",and:"∧",andd:"⩜",andslope:"⩘",andv:"⩚",ang:"∠",ange:"⦤",angle:"∠",angmsdaa:"⦨",angmsdab:"⦩",angmsdac:"⦪",angmsdad:"⦫",angmsdae:"⦬",angmsdaf:"⦭",angmsdag:"⦮",angmsdah:"⦯",angmsd:"∡",angrt:"∟",angrtvb:"⊾",angrtvbd:"⦝",angsph:"∢",angst:"Å",angzarr:"⍼",Aogon:"Ą",aogon:"ą",Aopf:"𝔸",aopf:"𝕒",apacir:"⩯",ap:"≈",apE:"⩰",ape:"≊",apid:"≋",apos:"'",ApplyFunction:"⁡",approx:"≈",approxeq:"≊",Aring:"Å",aring:"å",Ascr:"𝒜",ascr:"𝒶",Assign:"≔",ast:"*",asymp:"≈",asympeq:"≍",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",awconint:"∳",awint:"⨑",backcong:"≌",backepsilon:"϶",backprime:"‵",backsim:"∽",backsimeq:"⋍",Backslash:"∖",Barv:"⫧",barvee:"⊽",barwed:"⌅",Barwed:"⌆",barwedge:"⌅",bbrk:"⎵",bbrktbrk:"⎶",bcong:"≌",Bcy:"Б",bcy:"б",bdquo:"„",becaus:"∵",because:"∵",Because:"∵",bemptyv:"⦰",bepsi:"϶",bernou:"ℬ",Bernoullis:"ℬ",Beta:"Β",beta:"β",beth:"ℶ",between:"≬",Bfr:"𝔅",bfr:"𝔟",bigcap:"⋂",bigcirc:"◯",bigcup:"⋃",bigodot:"⨀",bigoplus:"⨁",bigotimes:"⨂",bigsqcup:"⨆",bigstar:"★",bigtriangledown:"▽",bigtriangleup:"△",biguplus:"⨄",bigvee:"⋁",bigwedge:"⋀",bkarow:"⤍",blacklozenge:"⧫",blacksquare:"▪",blacktriangle:"▴",blacktriangledown:"▾",blacktriangleleft:"◂",blacktriangleright:"▸",blank:"␣",blk12:"▒",blk14:"░",blk34:"▓",block:"█",bne:"=⃥",bnequiv:"≡⃥",bNot:"⫭",bnot:"⌐",Bopf:"𝔹",bopf:"𝕓",bot:"⊥",bottom:"⊥",bowtie:"⋈",boxbox:"⧉",boxdl:"┐",boxdL:"╕",boxDl:"╖",boxDL:"╗",boxdr:"┌",boxdR:"╒",boxDr:"╓",boxDR:"╔",boxh:"─",boxH:"═",boxhd:"┬",boxHd:"╤",boxhD:"╥",boxHD:"╦",boxhu:"┴",boxHu:"╧",boxhU:"╨",boxHU:"╩",boxminus:"⊟",boxplus:"⊞",boxtimes:"⊠",boxul:"┘",boxuL:"╛",boxUl:"╜",boxUL:"╝",boxur:"└",boxuR:"╘",boxUr:"╙",boxUR:"╚",boxv:"│",boxV:"║",boxvh:"┼",boxvH:"╪",boxVh:"╫",boxVH:"╬",boxvl:"┤",boxvL:"╡",boxVl:"╢",boxVL:"╣",boxvr:"├",boxvR:"╞",boxVr:"╟",boxVR:"╠",bprime:"‵",breve:"˘",Breve:"˘",brvbar:"¦",bscr:"𝒷",Bscr:"ℬ",bsemi:"⁏",bsim:"∽",bsime:"⋍",bsolb:"⧅",bsol:"\\",bsolhsub:"⟈",bull:"•",bullet:"•",bump:"≎",bumpE:"⪮",bumpe:"≏",Bumpeq:"≎",bumpeq:"≏",Cacute:"Ć",cacute:"ć",capand:"⩄",capbrcup:"⩉",capcap:"⩋",cap:"∩",Cap:"⋒",capcup:"⩇",capdot:"⩀",CapitalDifferentialD:"ⅅ",caps:"∩︀",caret:"⁁",caron:"ˇ",Cayleys:"ℭ",ccaps:"⩍",Ccaron:"Č",ccaron:"č",Ccedil:"Ç",ccedil:"ç",Ccirc:"Ĉ",ccirc:"ĉ",Cconint:"∰",ccups:"⩌",ccupssm:"⩐",Cdot:"Ċ",cdot:"ċ",cedil:"¸",Cedilla:"¸",cemptyv:"⦲",cent:"¢",centerdot:"·",CenterDot:"·",cfr:"𝔠",Cfr:"ℭ",CHcy:"Ч",chcy:"ч",check:"✓",checkmark:"✓",Chi:"Χ",chi:"χ",circ:"ˆ",circeq:"≗",circlearrowleft:"↺",circlearrowright:"↻",circledast:"⊛",circledcirc:"⊚",circleddash:"⊝",CircleDot:"⊙",circledR:"®",circledS:"Ⓢ",CircleMinus:"⊖",CirclePlus:"⊕",CircleTimes:"⊗",cir:"○",cirE:"⧃",cire:"≗",cirfnint:"⨐",cirmid:"⫯",cirscir:"⧂",ClockwiseContourIntegral:"∲",CloseCurlyDoubleQuote:"”",CloseCurlyQuote:"’",clubs:"♣",clubsuit:"♣",colon:":",Colon:"∷",Colone:"⩴",colone:"≔",coloneq:"≔",comma:",",commat:"@",comp:"∁",compfn:"∘",complement:"∁",complexes:"ℂ",cong:"≅",congdot:"⩭",Congruent:"≡",conint:"∮",Conint:"∯",ContourIntegral:"∮",copf:"𝕔",Copf:"ℂ",coprod:"∐",Coproduct:"∐",copy:"©",COPY:"©",copysr:"℗",CounterClockwiseContourIntegral:"∳",crarr:"↵",cross:"✗",Cross:"⨯",Cscr:"𝒞",cscr:"𝒸",csub:"⫏",csube:"⫑",csup:"⫐",csupe:"⫒",ctdot:"⋯",cudarrl:"⤸",cudarrr:"⤵",cuepr:"⋞",cuesc:"⋟",cularr:"↶",cularrp:"⤽",cupbrcap:"⩈",cupcap:"⩆",CupCap:"≍",cup:"∪",Cup:"⋓",cupcup:"⩊",cupdot:"⊍",cupor:"⩅",cups:"∪︀",curarr:"↷",curarrm:"⤼",curlyeqprec:"⋞",curlyeqsucc:"⋟",curlyvee:"⋎",curlywedge:"⋏",curren:"¤",curvearrowleft:"↶",curvearrowright:"↷",cuvee:"⋎",cuwed:"⋏",cwconint:"∲",cwint:"∱",cylcty:"⌭",dagger:"†",Dagger:"‡",daleth:"ℸ",darr:"↓",Darr:"↡",dArr:"⇓",dash:"‐",Dashv:"⫤",dashv:"⊣",dbkarow:"⤏",dblac:"˝",Dcaron:"Ď",dcaron:"ď",Dcy:"Д",dcy:"д",ddagger:"‡",ddarr:"⇊",DD:"ⅅ",dd:"ⅆ",DDotrahd:"⤑",ddotseq:"⩷",deg:"°",Del:"∇",Delta:"Δ",delta:"δ",demptyv:"⦱",dfisht:"⥿",Dfr:"𝔇",dfr:"𝔡",dHar:"⥥",dharl:"⇃",dharr:"⇂",DiacriticalAcute:"´",DiacriticalDot:"˙",DiacriticalDoubleAcute:"˝",DiacriticalGrave:"`",DiacriticalTilde:"˜",diam:"⋄",diamond:"⋄",Diamond:"⋄",diamondsuit:"♦",diams:"♦",die:"¨",DifferentialD:"ⅆ",digamma:"ϝ",disin:"⋲",div:"÷",divide:"÷",divideontimes:"⋇",divonx:"⋇",DJcy:"Ђ",djcy:"ђ",dlcorn:"⌞",dlcrop:"⌍",dollar:"$",Dopf:"𝔻",dopf:"𝕕",Dot:"¨",dot:"˙",DotDot:"⃜",doteq:"≐",doteqdot:"≑",DotEqual:"≐",dotminus:"∸",dotplus:"∔",dotsquare:"⊡",doublebarwedge:"⌆",DoubleContourIntegral:"∯",DoubleDot:"¨",DoubleDownArrow:"⇓",DoubleLeftArrow:"⇐",DoubleLeftRightArrow:"⇔",DoubleLeftTee:"⫤",DoubleLongLeftArrow:"⟸",DoubleLongLeftRightArrow:"⟺",DoubleLongRightArrow:"⟹",DoubleRightArrow:"⇒",DoubleRightTee:"⊨",DoubleUpArrow:"⇑",DoubleUpDownArrow:"⇕",DoubleVerticalBar:"∥",DownArrowBar:"⤓",downarrow:"↓",DownArrow:"↓",Downarrow:"⇓",DownArrowUpArrow:"⇵",DownBreve:"̑",downdownarrows:"⇊",downharpoonleft:"⇃",downharpoonright:"⇂",DownLeftRightVector:"⥐",DownLeftTeeVector:"⥞",DownLeftVectorBar:"⥖",DownLeftVector:"↽",DownRightTeeVector:"⥟",DownRightVectorBar:"⥗",DownRightVector:"⇁",DownTeeArrow:"↧",DownTee:"⊤",drbkarow:"⤐",drcorn:"⌟",drcrop:"⌌",Dscr:"𝒟",dscr:"𝒹",DScy:"Ѕ",dscy:"ѕ",dsol:"⧶",Dstrok:"Đ",dstrok:"đ",dtdot:"⋱",dtri:"▿",dtrif:"▾",duarr:"⇵",duhar:"⥯",dwangle:"⦦",DZcy:"Џ",dzcy:"џ",dzigrarr:"⟿",Eacute:"É",eacute:"é",easter:"⩮",Ecaron:"Ě",ecaron:"ě",Ecirc:"Ê",ecirc:"ê",ecir:"≖",ecolon:"≕",Ecy:"Э",ecy:"э",eDDot:"⩷",Edot:"Ė",edot:"ė",eDot:"≑",ee:"ⅇ",efDot:"≒",Efr:"𝔈",efr:"𝔢",eg:"⪚",Egrave:"È",egrave:"è",egs:"⪖",egsdot:"⪘",el:"⪙",Element:"∈",elinters:"⏧",ell:"ℓ",els:"⪕",elsdot:"⪗",Emacr:"Ē",emacr:"ē",empty:"∅",emptyset:"∅",EmptySmallSquare:"◻",emptyv:"∅",EmptyVerySmallSquare:"▫",emsp13:" ",emsp14:" ",emsp:" ",ENG:"Ŋ",eng:"ŋ",ensp:" ",Eogon:"Ę",eogon:"ę",Eopf:"𝔼",eopf:"𝕖",epar:"⋕",eparsl:"⧣",eplus:"⩱",epsi:"ε",Epsilon:"Ε",epsilon:"ε",epsiv:"ϵ",eqcirc:"≖",eqcolon:"≕",eqsim:"≂",eqslantgtr:"⪖",eqslantless:"⪕",Equal:"⩵",equals:"=",EqualTilde:"≂",equest:"≟",Equilibrium:"⇌",equiv:"≡",equivDD:"⩸",eqvparsl:"⧥",erarr:"⥱",erDot:"≓",escr:"ℯ",Escr:"ℰ",esdot:"≐",Esim:"⩳",esim:"≂",Eta:"Η",eta:"η",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",euro:"€",excl:"!",exist:"∃",Exists:"∃",expectation:"ℰ",exponentiale:"ⅇ",ExponentialE:"ⅇ",fallingdotseq:"≒",Fcy:"Ф",fcy:"ф",female:"♀",ffilig:"ffi",fflig:"ff",ffllig:"ffl",Ffr:"𝔉",ffr:"𝔣",filig:"fi",FilledSmallSquare:"◼",FilledVerySmallSquare:"▪",fjlig:"fj",flat:"♭",fllig:"fl",fltns:"▱",fnof:"ƒ",Fopf:"𝔽",fopf:"𝕗",forall:"∀",ForAll:"∀",fork:"⋔",forkv:"⫙",Fouriertrf:"ℱ",fpartint:"⨍",frac12:"½",frac13:"⅓",frac14:"¼",frac15:"⅕",frac16:"⅙",frac18:"⅛",frac23:"⅔",frac25:"⅖",frac34:"¾",frac35:"⅗",frac38:"⅜",frac45:"⅘",frac56:"⅚",frac58:"⅝",frac78:"⅞",frasl:"⁄",frown:"⌢",fscr:"𝒻",Fscr:"ℱ",gacute:"ǵ",Gamma:"Γ",gamma:"γ",Gammad:"Ϝ",gammad:"ϝ",gap:"⪆",Gbreve:"Ğ",gbreve:"ğ",Gcedil:"Ģ",Gcirc:"Ĝ",gcirc:"ĝ",Gcy:"Г",gcy:"г",Gdot:"Ġ",gdot:"ġ",ge:"≥",gE:"≧",gEl:"⪌",gel:"⋛",geq:"≥",geqq:"≧",geqslant:"⩾",gescc:"⪩",ges:"⩾",gesdot:"⪀",gesdoto:"⪂",gesdotol:"⪄",gesl:"⋛︀",gesles:"⪔",Gfr:"𝔊",gfr:"𝔤",gg:"≫",Gg:"⋙",ggg:"⋙",gimel:"ℷ",GJcy:"Ѓ",gjcy:"ѓ",gla:"⪥",gl:"≷",glE:"⪒",glj:"⪤",gnap:"⪊",gnapprox:"⪊",gne:"⪈",gnE:"≩",gneq:"⪈",gneqq:"≩",gnsim:"⋧",Gopf:"𝔾",gopf:"𝕘",grave:"`",GreaterEqual:"≥",GreaterEqualLess:"⋛",GreaterFullEqual:"≧",GreaterGreater:"⪢",GreaterLess:"≷",GreaterSlantEqual:"⩾",GreaterTilde:"≳",Gscr:"𝒢",gscr:"ℊ",gsim:"≳",gsime:"⪎",gsiml:"⪐",gtcc:"⪧",gtcir:"⩺",gt:">",GT:">",Gt:"≫",gtdot:"⋗",gtlPar:"⦕",gtquest:"⩼",gtrapprox:"⪆",gtrarr:"⥸",gtrdot:"⋗",gtreqless:"⋛",gtreqqless:"⪌",gtrless:"≷",gtrsim:"≳",gvertneqq:"≩︀",gvnE:"≩︀",Hacek:"ˇ",hairsp:" ",half:"½",hamilt:"ℋ",HARDcy:"Ъ",hardcy:"ъ",harrcir:"⥈",harr:"↔",hArr:"⇔",harrw:"↭",Hat:"^",hbar:"ℏ",Hcirc:"Ĥ",hcirc:"ĥ",hearts:"♥",heartsuit:"♥",hellip:"…",hercon:"⊹",hfr:"𝔥",Hfr:"ℌ",HilbertSpace:"ℋ",hksearow:"⤥",hkswarow:"⤦",hoarr:"⇿",homtht:"∻",hookleftarrow:"↩",hookrightarrow:"↪",hopf:"𝕙",Hopf:"ℍ",horbar:"―",HorizontalLine:"─",hscr:"𝒽",Hscr:"ℋ",hslash:"ℏ",Hstrok:"Ħ",hstrok:"ħ",HumpDownHump:"≎",HumpEqual:"≏",hybull:"⁃",hyphen:"‐",Iacute:"Í",iacute:"í",ic:"⁣",Icirc:"Î",icirc:"î",Icy:"И",icy:"и",Idot:"İ",IEcy:"Е",iecy:"е",iexcl:"¡",iff:"⇔",ifr:"𝔦",Ifr:"ℑ",Igrave:"Ì",igrave:"ì",ii:"ⅈ",iiiint:"⨌",iiint:"∭",iinfin:"⧜",iiota:"℩",IJlig:"IJ",ijlig:"ij",Imacr:"Ī",imacr:"ī",image:"ℑ",ImaginaryI:"ⅈ",imagline:"ℐ",imagpart:"ℑ",imath:"ı",Im:"ℑ",imof:"⊷",imped:"Ƶ",Implies:"⇒",incare:"℅","in":"∈",infin:"∞",infintie:"⧝",inodot:"ı",intcal:"⊺","int":"∫",Int:"∬",integers:"ℤ",Integral:"∫",intercal:"⊺",Intersection:"⋂",intlarhk:"⨗",intprod:"⨼",InvisibleComma:"⁣",InvisibleTimes:"⁢",IOcy:"Ё",iocy:"ё",Iogon:"Į",iogon:"į",Iopf:"𝕀",iopf:"𝕚",Iota:"Ι",iota:"ι",iprod:"⨼",iquest:"¿",iscr:"𝒾",Iscr:"ℐ",isin:"∈",isindot:"⋵",isinE:"⋹",isins:"⋴",isinsv:"⋳",isinv:"∈",it:"⁢",Itilde:"Ĩ",itilde:"ĩ",Iukcy:"І",iukcy:"і",Iuml:"Ï",iuml:"ï",Jcirc:"Ĵ",jcirc:"ĵ",Jcy:"Й",jcy:"й",Jfr:"𝔍",jfr:"𝔧",jmath:"ȷ",Jopf:"𝕁",jopf:"𝕛",Jscr:"𝒥",jscr:"𝒿",Jsercy:"Ј",jsercy:"ј",Jukcy:"Є",jukcy:"є",Kappa:"Κ",kappa:"κ",kappav:"ϰ",Kcedil:"Ķ",kcedil:"ķ",Kcy:"К",kcy:"к",Kfr:"𝔎",kfr:"𝔨",kgreen:"ĸ",KHcy:"Х",khcy:"х",KJcy:"Ќ",kjcy:"ќ",Kopf:"𝕂",kopf:"𝕜",Kscr:"𝒦",kscr:"𝓀",lAarr:"⇚",Lacute:"Ĺ",lacute:"ĺ",laemptyv:"⦴",lagran:"ℒ",Lambda:"Λ",lambda:"λ",lang:"⟨",Lang:"⟪",langd:"⦑",langle:"⟨",lap:"⪅",Laplacetrf:"ℒ",laquo:"«",larrb:"⇤",larrbfs:"⤟",larr:"←",Larr:"↞",lArr:"⇐",larrfs:"⤝",larrhk:"↩",larrlp:"↫",larrpl:"⤹",larrsim:"⥳",larrtl:"↢",latail:"⤙",lAtail:"⤛",lat:"⪫",late:"⪭",lates:"⪭︀",lbarr:"⤌",lBarr:"⤎",lbbrk:"❲",lbrace:"{",lbrack:"[",lbrke:"⦋",lbrksld:"⦏",lbrkslu:"⦍",Lcaron:"Ľ",lcaron:"ľ",Lcedil:"Ļ",lcedil:"ļ",lceil:"⌈",lcub:"{",Lcy:"Л",lcy:"л",ldca:"⤶",ldquo:"“",ldquor:"„",ldrdhar:"⥧",ldrushar:"⥋",ldsh:"↲",le:"≤",lE:"≦",LeftAngleBracket:"⟨",LeftArrowBar:"⇤",leftarrow:"←",LeftArrow:"←",Leftarrow:"⇐",LeftArrowRightArrow:"⇆",leftarrowtail:"↢",LeftCeiling:"⌈",LeftDoubleBracket:"⟦",LeftDownTeeVector:"⥡",LeftDownVectorBar:"⥙",LeftDownVector:"⇃",LeftFloor:"⌊",leftharpoondown:"↽",leftharpoonup:"↼",leftleftarrows:"⇇",leftrightarrow:"↔",LeftRightArrow:"↔",Leftrightarrow:"⇔",leftrightarrows:"⇆",leftrightharpoons:"⇋",leftrightsquigarrow:"↭",LeftRightVector:"⥎",LeftTeeArrow:"↤",LeftTee:"⊣",LeftTeeVector:"⥚",leftthreetimes:"⋋",LeftTriangleBar:"⧏",LeftTriangle:"⊲",LeftTriangleEqual:"⊴",LeftUpDownVector:"⥑",LeftUpTeeVector:"⥠",LeftUpVectorBar:"⥘",LeftUpVector:"↿",LeftVectorBar:"⥒",LeftVector:"↼",lEg:"⪋",leg:"⋚",leq:"≤",leqq:"≦",leqslant:"⩽",lescc:"⪨",les:"⩽",lesdot:"⩿",lesdoto:"⪁",lesdotor:"⪃",lesg:"⋚︀",lesges:"⪓",lessapprox:"⪅",lessdot:"⋖",lesseqgtr:"⋚",lesseqqgtr:"⪋",LessEqualGreater:"⋚",LessFullEqual:"≦",LessGreater:"≶",lessgtr:"≶",LessLess:"⪡",lesssim:"≲",LessSlantEqual:"⩽",LessTilde:"≲",lfisht:"⥼",lfloor:"⌊",Lfr:"𝔏",lfr:"𝔩",lg:"≶",lgE:"⪑",lHar:"⥢",lhard:"↽",lharu:"↼",lharul:"⥪",lhblk:"▄",LJcy:"Љ",ljcy:"љ",llarr:"⇇",ll:"≪",Ll:"⋘",llcorner:"⌞",Lleftarrow:"⇚",llhard:"⥫",lltri:"◺",Lmidot:"Ŀ",lmidot:"ŀ",lmoustache:"⎰",lmoust:"⎰",lnap:"⪉",lnapprox:"⪉",lne:"⪇",lnE:"≨",lneq:"⪇",lneqq:"≨",lnsim:"⋦",loang:"⟬",loarr:"⇽",lobrk:"⟦",longleftarrow:"⟵",LongLeftArrow:"⟵",Longleftarrow:"⟸",longleftrightarrow:"⟷",LongLeftRightArrow:"⟷",Longleftrightarrow:"⟺",longmapsto:"⟼",longrightarrow:"⟶",LongRightArrow:"⟶",Longrightarrow:"⟹",looparrowleft:"↫",looparrowright:"↬",lopar:"⦅",Lopf:"𝕃",lopf:"𝕝",loplus:"⨭",lotimes:"⨴",lowast:"∗",lowbar:"_",LowerLeftArrow:"↙",LowerRightArrow:"↘",loz:"◊",lozenge:"◊",lozf:"⧫",lpar:"(",lparlt:"⦓",lrarr:"⇆",lrcorner:"⌟",lrhar:"⇋",lrhard:"⥭",lrm:"‎",lrtri:"⊿",lsaquo:"‹",lscr:"𝓁",Lscr:"ℒ",lsh:"↰",Lsh:"↰",lsim:"≲",lsime:"⪍",lsimg:"⪏",lsqb:"[",lsquo:"‘",lsquor:"‚",Lstrok:"Ł",lstrok:"ł",ltcc:"⪦",ltcir:"⩹",lt:"<",LT:"<",Lt:"≪",ltdot:"⋖",lthree:"⋋",ltimes:"⋉",ltlarr:"⥶",ltquest:"⩻",ltri:"◃",ltrie:"⊴",ltrif:"◂",ltrPar:"⦖",lurdshar:"⥊",luruhar:"⥦",lvertneqq:"≨︀",lvnE:"≨︀",macr:"¯",male:"♂",malt:"✠",maltese:"✠",Map:"⤅",map:"↦",mapsto:"↦",mapstodown:"↧",mapstoleft:"↤",mapstoup:"↥",marker:"▮",mcomma:"⨩",Mcy:"М",mcy:"м",mdash:"—",mDDot:"∺",measuredangle:"∡",MediumSpace:" ",Mellintrf:"ℳ",Mfr:"𝔐",mfr:"𝔪",mho:"℧",micro:"µ",midast:"*",midcir:"⫰",mid:"∣",middot:"·",minusb:"⊟",minus:"−",minusd:"∸",minusdu:"⨪",MinusPlus:"∓",mlcp:"⫛",mldr:"…",mnplus:"∓",models:"⊧",Mopf:"𝕄",mopf:"𝕞",mp:"∓",mscr:"𝓂",Mscr:"ℳ",mstpos:"∾",Mu:"Μ",mu:"μ",multimap:"⊸",mumap:"⊸",nabla:"∇",Nacute:"Ń",nacute:"ń",nang:"∠⃒",nap:"≉",napE:"⩰̸",napid:"≋̸",napos:"ʼn",napprox:"≉",natural:"♮",naturals:"ℕ",natur:"♮",nbsp:" ",nbump:"≎̸",nbumpe:"≏̸",ncap:"⩃",Ncaron:"Ň",ncaron:"ň",Ncedil:"Ņ",ncedil:"ņ",ncong:"≇",ncongdot:"⩭̸",ncup:"⩂",Ncy:"Н",ncy:"н",ndash:"–",nearhk:"⤤",nearr:"↗",neArr:"⇗",nearrow:"↗",ne:"≠",nedot:"≐̸",NegativeMediumSpace:"​",NegativeThickSpace:"​",NegativeThinSpace:"​",NegativeVeryThinSpace:"​",nequiv:"≢",nesear:"⤨",nesim:"≂̸",NestedGreaterGreater:"≫",NestedLessLess:"≪",NewLine:"\n",nexist:"∄",nexists:"∄",Nfr:"𝔑",nfr:"𝔫",ngE:"≧̸",nge:"≱",ngeq:"≱",ngeqq:"≧̸",ngeqslant:"⩾̸",nges:"⩾̸",nGg:"⋙̸",ngsim:"≵",nGt:"≫⃒",ngt:"≯",ngtr:"≯",nGtv:"≫̸",nharr:"↮",nhArr:"⇎",nhpar:"⫲",ni:"∋",nis:"⋼",nisd:"⋺",niv:"∋",NJcy:"Њ",njcy:"њ",nlarr:"↚",nlArr:"⇍",nldr:"‥",nlE:"≦̸",nle:"≰",nleftarrow:"↚",nLeftarrow:"⇍",nleftrightarrow:"↮",nLeftrightarrow:"⇎",nleq:"≰",nleqq:"≦̸",nleqslant:"⩽̸",nles:"⩽̸",nless:"≮",nLl:"⋘̸",nlsim:"≴",nLt:"≪⃒",nlt:"≮",nltri:"⋪",nltrie:"⋬",nLtv:"≪̸",nmid:"∤",NoBreak:"⁠",NonBreakingSpace:" ",nopf:"𝕟",Nopf:"ℕ",Not:"⫬",not:"¬",NotCongruent:"≢",NotCupCap:"≭",NotDoubleVerticalBar:"∦",NotElement:"∉",NotEqual:"≠",NotEqualTilde:"≂̸",NotExists:"∄",NotGreater:"≯",NotGreaterEqual:"≱",NotGreaterFullEqual:"≧̸",NotGreaterGreater:"≫̸",NotGreaterLess:"≹",NotGreaterSlantEqual:"⩾̸",NotGreaterTilde:"≵",NotHumpDownHump:"≎̸",NotHumpEqual:"≏̸",notin:"∉",notindot:"⋵̸",notinE:"⋹̸",notinva:"∉",notinvb:"⋷",notinvc:"⋶",NotLeftTriangleBar:"⧏̸",NotLeftTriangle:"⋪",NotLeftTriangleEqual:"⋬",NotLess:"≮",NotLessEqual:"≰",NotLessGreater:"≸",NotLessLess:"≪̸",NotLessSlantEqual:"⩽̸",NotLessTilde:"≴",NotNestedGreaterGreater:"⪢̸",NotNestedLessLess:"⪡̸",notni:"∌",notniva:"∌",notnivb:"⋾",notnivc:"⋽",NotPrecedes:"⊀",NotPrecedesEqual:"⪯̸",NotPrecedesSlantEqual:"⋠",NotReverseElement:"∌",NotRightTriangleBar:"⧐̸",NotRightTriangle:"⋫",NotRightTriangleEqual:"⋭",NotSquareSubset:"⊏̸",NotSquareSubsetEqual:"⋢",NotSquareSuperset:"⊐̸",NotSquareSupersetEqual:"⋣",NotSubset:"⊂⃒",NotSubsetEqual:"⊈",NotSucceeds:"⊁",NotSucceedsEqual:"⪰̸",NotSucceedsSlantEqual:"⋡",NotSucceedsTilde:"≿̸",NotSuperset:"⊃⃒",NotSupersetEqual:"⊉",NotTilde:"≁",NotTildeEqual:"≄",NotTildeFullEqual:"≇",NotTildeTilde:"≉",NotVerticalBar:"∤",nparallel:"∦",npar:"∦",nparsl:"⫽⃥",npart:"∂̸",npolint:"⨔",npr:"⊀",nprcue:"⋠",nprec:"⊀",npreceq:"⪯̸",npre:"⪯̸",nrarrc:"⤳̸",nrarr:"↛",nrArr:"⇏",nrarrw:"↝̸",nrightarrow:"↛",nRightarrow:"⇏",nrtri:"⋫",nrtrie:"⋭",nsc:"⊁",nsccue:"⋡",nsce:"⪰̸",Nscr:"𝒩",nscr:"𝓃",nshortmid:"∤",nshortparallel:"∦",nsim:"≁",nsime:"≄",nsimeq:"≄",nsmid:"∤",nspar:"∦",nsqsube:"⋢",nsqsupe:"⋣",nsub:"⊄",nsubE:"⫅̸",nsube:"⊈",nsubset:"⊂⃒",nsubseteq:"⊈",nsubseteqq:"⫅̸",nsucc:"⊁",nsucceq:"⪰̸",nsup:"⊅",nsupE:"⫆̸",nsupe:"⊉",nsupset:"⊃⃒",nsupseteq:"⊉",nsupseteqq:"⫆̸",ntgl:"≹",Ntilde:"Ñ",ntilde:"ñ",ntlg:"≸",ntriangleleft:"⋪",ntrianglelefteq:"⋬",ntriangleright:"⋫",ntrianglerighteq:"⋭",Nu:"Ν",nu:"ν",num:"#",numero:"№",numsp:" ",nvap:"≍⃒",nvdash:"⊬",nvDash:"⊭",nVdash:"⊮",nVDash:"⊯",nvge:"≥⃒",nvgt:">⃒",nvHarr:"⤄",nvinfin:"⧞",nvlArr:"⤂",nvle:"≤⃒",nvlt:"<⃒",nvltrie:"⊴⃒",nvrArr:"⤃",nvrtrie:"⊵⃒",nvsim:"∼⃒",nwarhk:"⤣",nwarr:"↖",nwArr:"⇖",nwarrow:"↖",nwnear:"⤧",Oacute:"Ó",oacute:"ó",oast:"⊛",Ocirc:"Ô",ocirc:"ô",ocir:"⊚",Ocy:"О",ocy:"о",odash:"⊝",Odblac:"Ő",odblac:"ő",odiv:"⨸",odot:"⊙",odsold:"⦼",OElig:"Œ",oelig:"œ",ofcir:"⦿",Ofr:"𝔒",ofr:"𝔬",ogon:"˛",Ograve:"Ò",ograve:"ò",ogt:"⧁",ohbar:"⦵",ohm:"Ω",oint:"∮",olarr:"↺",olcir:"⦾",olcross:"⦻",oline:"‾",olt:"⧀",Omacr:"Ō",omacr:"ō",Omega:"Ω",omega:"ω",Omicron:"Ο",omicron:"ο",omid:"⦶",ominus:"⊖",Oopf:"𝕆",oopf:"𝕠",opar:"⦷",OpenCurlyDoubleQuote:"“",OpenCurlyQuote:"‘",operp:"⦹",oplus:"⊕",orarr:"↻",Or:"⩔",or:"∨",ord:"⩝",order:"ℴ",orderof:"ℴ",ordf:"ª",ordm:"º",origof:"⊶",oror:"⩖",orslope:"⩗",orv:"⩛",oS:"Ⓢ",Oscr:"𝒪",oscr:"ℴ",Oslash:"Ø",oslash:"ø",osol:"⊘",Otilde:"Õ",otilde:"õ",otimesas:"⨶",Otimes:"⨷",otimes:"⊗",Ouml:"Ö",ouml:"ö",ovbar:"⌽",OverBar:"‾",OverBrace:"⏞",OverBracket:"⎴",OverParenthesis:"⏜",para:"¶",parallel:"∥",par:"∥",parsim:"⫳",parsl:"⫽",part:"∂",PartialD:"∂",Pcy:"П",pcy:"п",percnt:"%",period:".",permil:"‰",perp:"⊥",pertenk:"‱",Pfr:"𝔓",pfr:"𝔭",Phi:"Φ",phi:"φ",phiv:"ϕ",phmmat:"ℳ",phone:"☎",Pi:"Π",pi:"π",pitchfork:"⋔",piv:"ϖ",planck:"ℏ",planckh:"ℎ",plankv:"ℏ",plusacir:"⨣",plusb:"⊞",pluscir:"⨢",plus:"+",plusdo:"∔",plusdu:"⨥",pluse:"⩲",PlusMinus:"±",plusmn:"±",plussim:"⨦",plustwo:"⨧",pm:"±",Poincareplane:"ℌ",pointint:"⨕",popf:"𝕡",Popf:"ℙ",pound:"£",prap:"⪷",Pr:"⪻",pr:"≺",prcue:"≼",precapprox:"⪷",prec:"≺",preccurlyeq:"≼",Precedes:"≺",PrecedesEqual:"⪯",PrecedesSlantEqual:"≼",PrecedesTilde:"≾",preceq:"⪯",precnapprox:"⪹",precneqq:"⪵",precnsim:"⋨",pre:"⪯",prE:"⪳",precsim:"≾",prime:"′",Prime:"″",primes:"ℙ",prnap:"⪹",prnE:"⪵",prnsim:"⋨",prod:"∏",Product:"∏",profalar:"⌮",profline:"⌒",profsurf:"⌓",prop:"∝",Proportional:"∝",Proportion:"∷",propto:"∝",prsim:"≾",prurel:"⊰",Pscr:"𝒫",pscr:"𝓅",Psi:"Ψ",psi:"ψ",puncsp:" ",Qfr:"𝔔",qfr:"𝔮",qint:"⨌",qopf:"𝕢",Qopf:"ℚ",qprime:"⁗",Qscr:"𝒬",qscr:"𝓆",quaternions:"ℍ",quatint:"⨖",quest:"?",questeq:"≟",quot:'"',QUOT:'"',rAarr:"⇛",race:"∽̱",Racute:"Ŕ",racute:"ŕ",radic:"√",raemptyv:"⦳",rang:"⟩",Rang:"⟫",rangd:"⦒",range:"⦥",rangle:"⟩",raquo:"»",rarrap:"⥵",rarrb:"⇥",rarrbfs:"⤠",rarrc:"⤳",rarr:"→",Rarr:"↠",rArr:"⇒",rarrfs:"⤞",rarrhk:"↪",rarrlp:"↬",rarrpl:"⥅",rarrsim:"⥴",Rarrtl:"⤖",rarrtl:"↣",rarrw:"↝",ratail:"⤚",rAtail:"⤜",ratio:"∶",rationals:"ℚ",rbarr:"⤍",rBarr:"⤏",RBarr:"⤐",rbbrk:"❳",rbrace:"}",rbrack:"]",rbrke:"⦌",rbrksld:"⦎",rbrkslu:"⦐",Rcaron:"Ř",rcaron:"ř",Rcedil:"Ŗ",rcedil:"ŗ",rceil:"⌉",rcub:"}",Rcy:"Р",rcy:"р",rdca:"⤷",rdldhar:"⥩",rdquo:"”",rdquor:"”",rdsh:"↳",real:"ℜ",realine:"ℛ",realpart:"ℜ",reals:"ℝ",Re:"ℜ",rect:"▭",reg:"®",REG:"®",ReverseElement:"∋",ReverseEquilibrium:"⇋",ReverseUpEquilibrium:"⥯",rfisht:"⥽",rfloor:"⌋",rfr:"𝔯",Rfr:"ℜ",rHar:"⥤",rhard:"⇁",rharu:"⇀",rharul:"⥬",Rho:"Ρ",rho:"ρ",rhov:"ϱ",RightAngleBracket:"⟩",RightArrowBar:"⇥",rightarrow:"→",RightArrow:"→",Rightarrow:"⇒",RightArrowLeftArrow:"⇄",rightarrowtail:"↣",RightCeiling:"⌉",RightDoubleBracket:"⟧",RightDownTeeVector:"⥝",RightDownVectorBar:"⥕",RightDownVector:"⇂",RightFloor:"⌋",rightharpoondown:"⇁",rightharpoonup:"⇀",rightleftarrows:"⇄",rightleftharpoons:"⇌",rightrightarrows:"⇉",rightsquigarrow:"↝",RightTeeArrow:"↦",RightTee:"⊢",RightTeeVector:"⥛",rightthreetimes:"⋌",RightTriangleBar:"⧐",RightTriangle:"⊳",RightTriangleEqual:"⊵",RightUpDownVector:"⥏",RightUpTeeVector:"⥜",RightUpVectorBar:"⥔",RightUpVector:"↾",RightVectorBar:"⥓",RightVector:"⇀",ring:"˚",risingdotseq:"≓",rlarr:"⇄",rlhar:"⇌",rlm:"‏",rmoustache:"⎱",rmoust:"⎱",rnmid:"⫮",roang:"⟭",roarr:"⇾",robrk:"⟧",ropar:"⦆",ropf:"𝕣",Ropf:"ℝ",roplus:"⨮",rotimes:"⨵",RoundImplies:"⥰",rpar:")",rpargt:"⦔",rppolint:"⨒",rrarr:"⇉",Rrightarrow:"⇛",rsaquo:"›",rscr:"𝓇",Rscr:"ℛ",rsh:"↱",Rsh:"↱",rsqb:"]",rsquo:"’",rsquor:"’",rthree:"⋌",rtimes:"⋊",rtri:"▹",rtrie:"⊵",rtrif:"▸",rtriltri:"⧎",RuleDelayed:"⧴",ruluhar:"⥨",rx:"℞",Sacute:"Ś",sacute:"ś",sbquo:"‚",scap:"⪸",Scaron:"Š",scaron:"š",Sc:"⪼",sc:"≻",sccue:"≽",sce:"⪰",scE:"⪴",Scedil:"Ş",scedil:"ş",Scirc:"Ŝ",scirc:"ŝ",scnap:"⪺",scnE:"⪶",scnsim:"⋩",scpolint:"⨓",scsim:"≿",Scy:"С",scy:"с",sdotb:"⊡",sdot:"⋅",sdote:"⩦",searhk:"⤥",searr:"↘",seArr:"⇘",searrow:"↘",sect:"§",semi:";",seswar:"⤩",setminus:"∖",setmn:"∖",sext:"✶",Sfr:"𝔖",sfr:"𝔰",sfrown:"⌢",sharp:"♯",SHCHcy:"Щ",shchcy:"щ",SHcy:"Ш",shcy:"ш",ShortDownArrow:"↓",ShortLeftArrow:"←",shortmid:"∣",shortparallel:"∥",ShortRightArrow:"→",ShortUpArrow:"↑",shy:"­",Sigma:"Σ",sigma:"σ",sigmaf:"ς",sigmav:"ς",sim:"∼",simdot:"⩪",sime:"≃",simeq:"≃",simg:"⪞",simgE:"⪠",siml:"⪝",simlE:"⪟",simne:"≆",simplus:"⨤",simrarr:"⥲",slarr:"←",SmallCircle:"∘",smallsetminus:"∖",smashp:"⨳",smeparsl:"⧤",smid:"∣",smile:"⌣",smt:"⪪",smte:"⪬",smtes:"⪬︀",SOFTcy:"Ь",softcy:"ь",solbar:"⌿",solb:"⧄",sol:"/",Sopf:"𝕊",sopf:"𝕤",spades:"♠",spadesuit:"♠",spar:"∥",sqcap:"⊓",sqcaps:"⊓︀",sqcup:"⊔",sqcups:"⊔︀",Sqrt:"√",sqsub:"⊏",sqsube:"⊑",sqsubset:"⊏",sqsubseteq:"⊑",sqsup:"⊐",sqsupe:"⊒",sqsupset:"⊐",sqsupseteq:"⊒",square:"□",Square:"□",SquareIntersection:"⊓",SquareSubset:"⊏",SquareSubsetEqual:"⊑",SquareSuperset:"⊐",SquareSupersetEqual:"⊒",SquareUnion:"⊔",squarf:"▪",squ:"□",squf:"▪",srarr:"→",Sscr:"𝒮",sscr:"𝓈",ssetmn:"∖",ssmile:"⌣",sstarf:"⋆",Star:"⋆",star:"☆",starf:"★",straightepsilon:"ϵ",straightphi:"ϕ",strns:"¯",sub:"⊂",Sub:"⋐",subdot:"⪽",subE:"⫅",sube:"⊆",subedot:"⫃",submult:"⫁",subnE:"⫋",subne:"⊊",subplus:"⪿",subrarr:"⥹",subset:"⊂",Subset:"⋐",subseteq:"⊆",subseteqq:"⫅",SubsetEqual:"⊆",subsetneq:"⊊",subsetneqq:"⫋",subsim:"⫇",subsub:"⫕",subsup:"⫓",succapprox:"⪸",succ:"≻",succcurlyeq:"≽",Succeeds:"≻",SucceedsEqual:"⪰",SucceedsSlantEqual:"≽",SucceedsTilde:"≿",succeq:"⪰",succnapprox:"⪺",succneqq:"⪶",succnsim:"⋩",succsim:"≿",SuchThat:"∋",sum:"∑",Sum:"∑",sung:"♪",sup1:"¹",sup2:"²",sup3:"³",sup:"⊃",Sup:"⋑",supdot:"⪾",supdsub:"⫘",supE:"⫆",supe:"⊇",supedot:"⫄",Superset:"⊃",SupersetEqual:"⊇",suphsol:"⟉",suphsub:"⫗",suplarr:"⥻",supmult:"⫂",supnE:"⫌",supne:"⊋",supplus:"⫀",supset:"⊃",Supset:"⋑",supseteq:"⊇",supseteqq:"⫆",supsetneq:"⊋",supsetneqq:"⫌",supsim:"⫈",supsub:"⫔",supsup:"⫖",swarhk:"⤦",swarr:"↙",swArr:"⇙",swarrow:"↙",swnwar:"⤪",szlig:"ß",Tab:"\t",target:"⌖",Tau:"Τ",tau:"τ",tbrk:"⎴",Tcaron:"Ť",tcaron:"ť",Tcedil:"Ţ",tcedil:"ţ",Tcy:"Т",tcy:"т",tdot:"⃛",telrec:"⌕",Tfr:"𝔗",tfr:"𝔱",there4:"∴",therefore:"∴",Therefore:"∴",Theta:"Θ",theta:"θ",thetasym:"ϑ",thetav:"ϑ",thickapprox:"≈",thicksim:"∼",
+ThickSpace:"  ",ThinSpace:" ",thinsp:" ",thkap:"≈",thksim:"∼",THORN:"Þ",thorn:"þ",tilde:"˜",Tilde:"∼",TildeEqual:"≃",TildeFullEqual:"≅",TildeTilde:"≈",timesbar:"⨱",timesb:"⊠",times:"×",timesd:"⨰",tint:"∭",toea:"⤨",topbot:"⌶",topcir:"⫱",top:"⊤",Topf:"𝕋",topf:"𝕥",topfork:"⫚",tosa:"⤩",tprime:"‴",trade:"™",TRADE:"™",triangle:"▵",triangledown:"▿",triangleleft:"◃",trianglelefteq:"⊴",triangleq:"≜",triangleright:"▹",trianglerighteq:"⊵",tridot:"◬",trie:"≜",triminus:"⨺",TripleDot:"⃛",triplus:"⨹",trisb:"⧍",tritime:"⨻",trpezium:"⏢",Tscr:"𝒯",tscr:"𝓉",TScy:"Ц",tscy:"ц",TSHcy:"Ћ",tshcy:"ћ",Tstrok:"Ŧ",tstrok:"ŧ",twixt:"≬",twoheadleftarrow:"↞",twoheadrightarrow:"↠",Uacute:"Ú",uacute:"ú",uarr:"↑",Uarr:"↟",uArr:"⇑",Uarrocir:"⥉",Ubrcy:"Ў",ubrcy:"ў",Ubreve:"Ŭ",ubreve:"ŭ",Ucirc:"Û",ucirc:"û",Ucy:"У",ucy:"у",udarr:"⇅",Udblac:"Ű",udblac:"ű",udhar:"⥮",ufisht:"⥾",Ufr:"𝔘",ufr:"𝔲",Ugrave:"Ù",ugrave:"ù",uHar:"⥣",uharl:"↿",uharr:"↾",uhblk:"▀",ulcorn:"⌜",ulcorner:"⌜",ulcrop:"⌏",ultri:"◸",Umacr:"Ū",umacr:"ū",uml:"¨",UnderBar:"_",UnderBrace:"⏟",UnderBracket:"⎵",UnderParenthesis:"⏝",Union:"⋃",UnionPlus:"⊎",Uogon:"Ų",uogon:"ų",Uopf:"𝕌",uopf:"𝕦",UpArrowBar:"⤒",uparrow:"↑",UpArrow:"↑",Uparrow:"⇑",UpArrowDownArrow:"⇅",updownarrow:"↕",UpDownArrow:"↕",Updownarrow:"⇕",UpEquilibrium:"⥮",upharpoonleft:"↿",upharpoonright:"↾",uplus:"⊎",UpperLeftArrow:"↖",UpperRightArrow:"↗",upsi:"υ",Upsi:"ϒ",upsih:"ϒ",Upsilon:"Υ",upsilon:"υ",UpTeeArrow:"↥",UpTee:"⊥",upuparrows:"⇈",urcorn:"⌝",urcorner:"⌝",urcrop:"⌎",Uring:"Ů",uring:"ů",urtri:"◹",Uscr:"𝒰",uscr:"𝓊",utdot:"⋰",Utilde:"Ũ",utilde:"ũ",utri:"▵",utrif:"▴",uuarr:"⇈",Uuml:"Ü",uuml:"ü",uwangle:"⦧",vangrt:"⦜",varepsilon:"ϵ",varkappa:"ϰ",varnothing:"∅",varphi:"ϕ",varpi:"ϖ",varpropto:"∝",varr:"↕",vArr:"⇕",varrho:"ϱ",varsigma:"ς",varsubsetneq:"⊊︀",varsubsetneqq:"⫋︀",varsupsetneq:"⊋︀",varsupsetneqq:"⫌︀",vartheta:"ϑ",vartriangleleft:"⊲",vartriangleright:"⊳",vBar:"⫨",Vbar:"⫫",vBarv:"⫩",Vcy:"В",vcy:"в",vdash:"⊢",vDash:"⊨",Vdash:"⊩",VDash:"⊫",Vdashl:"⫦",veebar:"⊻",vee:"∨",Vee:"⋁",veeeq:"≚",vellip:"⋮",verbar:"|",Verbar:"‖",vert:"|",Vert:"‖",VerticalBar:"∣",VerticalLine:"|",VerticalSeparator:"❘",VerticalTilde:"≀",VeryThinSpace:" ",Vfr:"𝔙",vfr:"𝔳",vltri:"⊲",vnsub:"⊂⃒",vnsup:"⊃⃒",Vopf:"𝕍",vopf:"𝕧",vprop:"∝",vrtri:"⊳",Vscr:"𝒱",vscr:"𝓋",vsubnE:"⫋︀",vsubne:"⊊︀",vsupnE:"⫌︀",vsupne:"⊋︀",Vvdash:"⊪",vzigzag:"⦚",Wcirc:"Ŵ",wcirc:"ŵ",wedbar:"⩟",wedge:"∧",Wedge:"⋀",wedgeq:"≙",weierp:"℘",Wfr:"𝔚",wfr:"𝔴",Wopf:"𝕎",wopf:"𝕨",wp:"℘",wr:"≀",wreath:"≀",Wscr:"𝒲",wscr:"𝓌",xcap:"⋂",xcirc:"◯",xcup:"⋃",xdtri:"▽",Xfr:"𝔛",xfr:"𝔵",xharr:"⟷",xhArr:"⟺",Xi:"Ξ",xi:"ξ",xlarr:"⟵",xlArr:"⟸",xmap:"⟼",xnis:"⋻",xodot:"⨀",Xopf:"𝕏",xopf:"𝕩",xoplus:"⨁",xotime:"⨂",xrarr:"⟶",xrArr:"⟹",Xscr:"𝒳",xscr:"𝓍",xsqcup:"⨆",xuplus:"⨄",xutri:"△",xvee:"⋁",xwedge:"⋀",Yacute:"Ý",yacute:"ý",YAcy:"Я",yacy:"я",Ycirc:"Ŷ",ycirc:"ŷ",Ycy:"Ы",ycy:"ы",yen:"¥",Yfr:"𝔜",yfr:"𝔶",YIcy:"Ї",yicy:"ї",Yopf:"𝕐",yopf:"𝕪",Yscr:"𝒴",yscr:"𝓎",YUcy:"Ю",yucy:"ю",yuml:"ÿ",Yuml:"Ÿ",Zacute:"Ź",zacute:"ź",Zcaron:"Ž",zcaron:"ž",Zcy:"З",zcy:"з",Zdot:"Ż",zdot:"ż",zeetrf:"ℨ",ZeroWidthSpace:"​",Zeta:"Ζ",zeta:"ζ",zfr:"𝔷",Zfr:"ℨ",ZHcy:"Ж",zhcy:"ж",zigrarr:"⇝",zopf:"𝕫",Zopf:"ℤ",Zscr:"𝒵",zscr:"𝓏",zwj:"‍",zwnj:"‌"}},{}],26:[function(t,e,r){e.exports={Aacute:"Á",aacute:"á",Acirc:"Â",acirc:"â",acute:"´",AElig:"Æ",aelig:"æ",Agrave:"À",agrave:"à",amp:"&",AMP:"&",Aring:"Å",aring:"å",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",brvbar:"¦",Ccedil:"Ç",ccedil:"ç",cedil:"¸",cent:"¢",copy:"©",COPY:"©",curren:"¤",deg:"°",divide:"÷",Eacute:"É",eacute:"é",Ecirc:"Ê",ecirc:"ê",Egrave:"È",egrave:"è",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",frac12:"½",frac14:"¼",frac34:"¾",gt:">",GT:">",Iacute:"Í",iacute:"í",Icirc:"Î",icirc:"î",iexcl:"¡",Igrave:"Ì",igrave:"ì",iquest:"¿",Iuml:"Ï",iuml:"ï",laquo:"«",lt:"<",LT:"<",macr:"¯",micro:"µ",middot:"·",nbsp:" ",not:"¬",Ntilde:"Ñ",ntilde:"ñ",Oacute:"Ó",oacute:"ó",Ocirc:"Ô",ocirc:"ô",Ograve:"Ò",ograve:"ò",ordf:"ª",ordm:"º",Oslash:"Ø",oslash:"ø",Otilde:"Õ",otilde:"õ",Ouml:"Ö",ouml:"ö",para:"¶",plusmn:"±",pound:"£",quot:'"',QUOT:'"',raquo:"»",reg:"®",REG:"®",sect:"§",shy:"­",sup1:"¹",sup2:"²",sup3:"³",szlig:"ß",THORN:"Þ",thorn:"þ",times:"×",Uacute:"Ú",uacute:"ú",Ucirc:"Û",ucirc:"û",Ugrave:"Ù",ugrave:"ù",uml:"¨",Uuml:"Ü",uuml:"ü",Yacute:"Ý",yacute:"ý",yen:"¥",yuml:"ÿ"}},{}],27:[function(t,e,r){e.exports={amp:"&",apos:"'",gt:">",lt:"<",quot:'"'}},{}],28:[function(t,e,r){function n(){this._events=this._events||{},this._maxListeners=this._maxListeners||void 0}function i(t){return"function"==typeof t}function s(t){return"number"==typeof t}function o(t){return"object"==typeof t&&null!==t}function a(t){return void 0===t}e.exports=n,n.EventEmitter=n,n.prototype._events=void 0,n.prototype._maxListeners=void 0,n.defaultMaxListeners=10,n.prototype.setMaxListeners=function(t){if(!s(t)||t<0||isNaN(t))throw TypeError("n must be a positive number");return this._maxListeners=t,this},n.prototype.emit=function(t){var e,r,n,s,c,u;if(this._events||(this._events={}),"error"===t&&(!this._events.error||o(this._events.error)&&!this._events.error.length)){if(e=arguments[1],e instanceof Error)throw e;var h=new Error('Uncaught, unspecified "error" event. ('+e+")");throw h.context=e,h}if(r=this._events[t],a(r))return!1;if(i(r))switch(arguments.length){case 1:r.call(this);break;case 2:r.call(this,arguments[1]);break;case 3:r.call(this,arguments[1],arguments[2]);break;default:s=Array.prototype.slice.call(arguments,1),r.apply(this,s)}else if(o(r))for(s=Array.prototype.slice.call(arguments,1),u=r.slice(),n=u.length,c=0;c<n;c++)u[c].apply(this,s);return!0},n.prototype.addListener=function(t,e){var r;if(!i(e))throw TypeError("listener must be a function");return this._events||(this._events={}),this._events.newListener&&this.emit("newListener",t,i(e.listener)?e.listener:e),this._events[t]?o(this._events[t])?this._events[t].push(e):this._events[t]=[this._events[t],e]:this._events[t]=e,o(this._events[t])&&!this._events[t].warned&&(r=a(this._maxListeners)?n.defaultMaxListeners:this._maxListeners,r&&r>0&&this._events[t].length>r&&(this._events[t].warned=!0,console.error("(node) warning: possible EventEmitter memory leak detected. %d listeners added. Use emitter.setMaxListeners() to increase limit.",this._events[t].length),"function"==typeof console.trace&&console.trace())),this},n.prototype.on=n.prototype.addListener,n.prototype.once=function(t,e){function r(){this.removeListener(t,r),n||(n=!0,e.apply(this,arguments))}if(!i(e))throw TypeError("listener must be a function");var n=!1;return r.listener=e,this.on(t,r),this},n.prototype.removeListener=function(t,e){var r,n,s,a;if(!i(e))throw TypeError("listener must be a function");if(!this._events||!this._events[t])return this;if(r=this._events[t],s=r.length,n=-1,r===e||i(r.listener)&&r.listener===e)delete this._events[t],this._events.removeListener&&this.emit("removeListener",t,e);else if(o(r)){for(a=s;a-- >0;)if(r[a]===e||r[a].listener&&r[a].listener===e){n=a;break}if(n<0)return this;1===r.length?(r.length=0,delete this._events[t]):r.splice(n,1),this._events.removeListener&&this.emit("removeListener",t,e)}return this},n.prototype.removeAllListeners=function(t){var e,r;if(!this._events)return this;if(!this._events.removeListener)return 0===arguments.length?this._events={}:this._events[t]&&delete this._events[t],this;if(0===arguments.length){for(e in this._events)"removeListener"!==e&&this.removeAllListeners(e);return this.removeAllListeners("removeListener"),this._events={},this}if(r=this._events[t],i(r))this.removeListener(t,r);else if(r)for(;r.length;)this.removeListener(t,r[r.length-1]);return delete this._events[t],this},n.prototype.listeners=function(t){var e;return e=this._events&&this._events[t]?i(this._events[t])?[this._events[t]]:this._events[t].slice():[]},n.prototype.listenerCount=function(t){if(this._events){var e=this._events[t];if(i(e))return 1;if(e)return e.length}return 0},n.listenerCount=function(t,e){return t.listenerCount(e)}},{}],29:[function(t,e,r){function n(t){this._cbs=t||{},this.events=[]}e.exports=n;var i=t("./").EVENTS;Object.keys(i).forEach(function(t){if(0===i[t])t="on"+t,n.prototype[t]=function(){this.events.push([t]),this._cbs[t]&&this._cbs[t]()};else if(1===i[t])t="on"+t,n.prototype[t]=function(e){this.events.push([t,e]),this._cbs[t]&&this._cbs[t](e)};else{if(2!==i[t])throw Error("wrong number of arguments");t="on"+t,n.prototype[t]=function(e,r){this.events.push([t,e,r]),this._cbs[t]&&this._cbs[t](e,r)}}}),n.prototype.onreset=function(){this.events=[],this._cbs.onreset&&this._cbs.onreset()},n.prototype.restart=function(){this._cbs.onreset&&this._cbs.onreset();for(var t=0,e=this.events.length;t<e;t++)if(this._cbs[this.events[t][0]]){var r=this.events[t].length;1===r?this._cbs[this.events[t][0]]():2===r?this._cbs[this.events[t][0]](this.events[t][1]):this._cbs[this.events[t][0]](this.events[t][1],this.events[t][2])}}},{"./":36}],30:[function(t,e,r){function n(t,e){this.init(t,e)}function i(t,e){return h.getElementsByTagName(t,e,!0)}function s(t,e){return h.getElementsByTagName(t,e,!0,1)[0]}function o(t,e,r){return h.getText(h.getElementsByTagName(t,e,r,1)).trim()}function a(t,e,r,n,i){var s=o(r,n,i);s&&(t[e]=s)}var c=t("./index.js"),u=c.DomHandler,h=c.DomUtils;t("inherits")(n,u),n.prototype.init=u;var l=function(t){return"rss"===t||"feed"===t||"rdf:RDF"===t};n.prototype.onend=function(){var t,e,r={},n=s(l,this.dom);n&&("feed"===n.name?(e=n.children,r.type="atom",a(r,"id","id",e),a(r,"title","title",e),(t=s("link",e))&&(t=t.attribs)&&(t=t.href)&&(r.link=t),a(r,"description","subtitle",e),(t=o("updated",e))&&(r.updated=new Date(t)),a(r,"author","email",e,!0),r.items=i("entry",e).map(function(t){var e,r={};return t=t.children,a(r,"id","id",t),a(r,"title","title",t),(e=s("link",t))&&(e=e.attribs)&&(e=e.href)&&(r.link=e),(e=o("summary",t)||o("content",t))&&(r.description=e),(e=o("updated",t))&&(r.pubDate=new Date(e)),r})):(e=s("channel",n.children).children,r.type=n.name.substr(0,3),r.id="",a(r,"title","title",e),a(r,"link","link",e),a(r,"description","description",e),(t=o("lastBuildDate",e))&&(r.updated=new Date(t)),a(r,"author","managingEditor",e,!0),r.items=i("item",n.children).map(function(t){var e,r={};return t=t.children,a(r,"id","guid",t),a(r,"title","title",t),a(r,"link","link",t),a(r,"description","description",t),(e=o("pubDate",t))&&(r.pubDate=new Date(e)),r}))),this.dom=r,u.prototype._handleCallback.call(this,n?null:Error("couldn't find root of feed"))},e.exports=n},{"./index.js":36,inherits:38}],31:[function(t,e,r){function n(t,e){this._options=e||{},this._cbs=t||{},this._tagname="",this._attribname="",this._attribvalue="",this._attribs=null,this._stack=[],this.startIndex=0,this.endIndex=null,this._lowerCaseTagNames="lowerCaseTags"in this._options?!!this._options.lowerCaseTags:!this._options.xmlMode,this._lowerCaseAttributeNames="lowerCaseAttributeNames"in this._options?!!this._options.lowerCaseAttributeNames:!this._options.xmlMode,this._options.Tokenizer&&(i=this._options.Tokenizer),this._tokenizer=new i(this._options,this),this._cbs.onparserinit&&this._cbs.onparserinit(this)}var i=t("./Tokenizer.js"),s={input:!0,option:!0,optgroup:!0,select:!0,button:!0,datalist:!0,textarea:!0},o={tr:{tr:!0,th:!0,td:!0},th:{th:!0},td:{thead:!0,th:!0,td:!0},body:{head:!0,link:!0,script:!0},li:{li:!0},p:{p:!0},h1:{p:!0},h2:{p:!0},h3:{p:!0},h4:{p:!0},h5:{p:!0},h6:{p:!0},select:s,input:s,output:s,button:s,datalist:s,textarea:s,option:{option:!0},optgroup:{optgroup:!0}},a={__proto__:null,area:!0,base:!0,basefont:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,isindex:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,path:!0,circle:!0,ellipse:!0,line:!0,rect:!0,use:!0,stop:!0,polyline:!0,polygon:!0},c=/\s|\//;t("inherits")(n,t("events").EventEmitter),n.prototype._updatePosition=function(t){null===this.endIndex?this._tokenizer._sectionStart<=t?this.startIndex=0:this.startIndex=this._tokenizer._sectionStart-t:this.startIndex=this.endIndex+1,this.endIndex=this._tokenizer.getAbsoluteIndex()},n.prototype.ontext=function(t){this._updatePosition(1),this.endIndex--,this._cbs.ontext&&this._cbs.ontext(t)},n.prototype.onopentagname=function(t){if(this._lowerCaseTagNames&&(t=t.toLowerCase()),this._tagname=t,!this._options.xmlMode&&t in o)for(var e;(e=this._stack[this._stack.length-1])in o[t];this.onclosetag(e));!this._options.xmlMode&&t in a||this._stack.push(t),this._cbs.onopentagname&&this._cbs.onopentagname(t),this._cbs.onopentag&&(this._attribs={})},n.prototype.onopentagend=function(){this._updatePosition(1),this._attribs&&(this._cbs.onopentag&&this._cbs.onopentag(this._tagname,this._attribs),this._attribs=null),!this._options.xmlMode&&this._cbs.onclosetag&&this._tagname in a&&this._cbs.onclosetag(this._tagname),this._tagname=""},n.prototype.onclosetag=function(t){if(this._updatePosition(1),this._lowerCaseTagNames&&(t=t.toLowerCase()),!this._stack.length||t in a&&!this._options.xmlMode)this._options.xmlMode||"br"!==t&&"p"!==t||(this.onopentagname(t),this._closeCurrentTag());else{var e=this._stack.lastIndexOf(t);if(e!==-1)if(this._cbs.onclosetag)for(e=this._stack.length-e;e--;)this._cbs.onclosetag(this._stack.pop());else this._stack.length=e;else"p"!==t||this._options.xmlMode||(this.onopentagname(t),this._closeCurrentTag())}},n.prototype.onselfclosingtag=function(){this._options.xmlMode||this._options.recognizeSelfClosing?this._closeCurrentTag():this.onopentagend()},n.prototype._closeCurrentTag=function(){var t=this._tagname;this.onopentagend(),this._stack[this._stack.length-1]===t&&(this._cbs.onclosetag&&this._cbs.onclosetag(t),this._stack.pop())},n.prototype.onattribname=function(t){this._lowerCaseAttributeNames&&(t=t.toLowerCase()),this._attribname=t},n.prototype.onattribdata=function(t){this._attribvalue+=t},n.prototype.onattribend=function(){this._cbs.onattribute&&this._cbs.onattribute(this._attribname,this._attribvalue),this._attribs&&!Object.prototype.hasOwnProperty.call(this._attribs,this._attribname)&&(this._attribs[this._attribname]=this._attribvalue),this._attribname="",this._attribvalue=""},n.prototype._getInstructionName=function(t){var e=t.search(c),r=e<0?t:t.substr(0,e);return this._lowerCaseTagNames&&(r=r.toLowerCase()),r},n.prototype.ondeclaration=function(t){if(this._cbs.onprocessinginstruction){var e=this._getInstructionName(t);this._cbs.onprocessinginstruction("!"+e,"!"+t)}},n.prototype.onprocessinginstruction=function(t){if(this._cbs.onprocessinginstruction){var e=this._getInstructionName(t);this._cbs.onprocessinginstruction("?"+e,"?"+t)}},n.prototype.oncomment=function(t){this._updatePosition(4),this._cbs.oncomment&&this._cbs.oncomment(t),this._cbs.oncommentend&&this._cbs.oncommentend()},n.prototype.oncdata=function(t){this._updatePosition(1),this._options.xmlMode||this._options.recognizeCDATA?(this._cbs.oncdatastart&&this._cbs.oncdatastart(),this._cbs.ontext&&this._cbs.ontext(t),this._cbs.oncdataend&&this._cbs.oncdataend()):this.oncomment("[CDATA["+t+"]]")},n.prototype.onerror=function(t){this._cbs.onerror&&this._cbs.onerror(t)},n.prototype.onend=function(){if(this._cbs.onclosetag)for(var t=this._stack.length;t>0;this._cbs.onclosetag(this._stack[--t]));this._cbs.onend&&this._cbs.onend()},n.prototype.reset=function(){this._cbs.onreset&&this._cbs.onreset(),this._tokenizer.reset(),this._tagname="",this._attribname="",this._attribs=null,this._stack=[],this._cbs.onparserinit&&this._cbs.onparserinit(this)},n.prototype.parseComplete=function(t){this.reset(),this.end(t)},n.prototype.write=function(t){this._tokenizer.write(t)},n.prototype.end=function(t){this._tokenizer.end(t)},n.prototype.pause=function(){this._tokenizer.pause()},n.prototype.resume=function(){this._tokenizer.resume()},n.prototype.parseChunk=n.prototype.write,n.prototype.done=n.prototype.end,e.exports=n},{"./Tokenizer.js":34,events:28,inherits:38}],32:[function(t,e,r){function n(t){this._cbs=t||{}}e.exports=n;var i=t("./").EVENTS;Object.keys(i).forEach(function(t){if(0===i[t])t="on"+t,n.prototype[t]=function(){this._cbs[t]&&this._cbs[t]()};else if(1===i[t])t="on"+t,n.prototype[t]=function(e){this._cbs[t]&&this._cbs[t](e)};else{if(2!==i[t])throw Error("wrong number of arguments");t="on"+t,n.prototype[t]=function(e,r){this._cbs[t]&&this._cbs[t](e,r)}}})},{"./":36}],33:[function(t,e,r){function n(t){s.call(this,new i(this),t)}function i(t){this.scope=t}e.exports=n;var s=t("./WritableStream.js");t("inherits")(n,s),n.prototype.readable=!0;var o=t("../").EVENTS;Object.keys(o).forEach(function(t){if(0===o[t])i.prototype["on"+t]=function(){this.scope.emit(t)};else if(1===o[t])i.prototype["on"+t]=function(e){this.scope.emit(t,e)};else{if(2!==o[t])throw Error("wrong number of arguments!");i.prototype["on"+t]=function(e,r){this.scope.emit(t,e,r)}}})},{"../":36,"./WritableStream.js":35,inherits:38}],34:[function(t,e,r){function n(t){return" "===t||"\n"===t||"\t"===t||"\f"===t||"\r"===t}function i(t,e){return function(r){r===t&&(this._state=e)}}function s(t,e,r){var n=t.toLowerCase();return t===n?function(t){t===n?this._state=e:(this._state=r,this._index--)}:function(i){i===n||i===t?this._state=e:(this._state=r,this._index--)}}function o(t,e){var r=t.toLowerCase();return function(n){n===r||n===t?this._state=e:(this._state=g,this._index--)}}function a(t,e){this._state=p,this._buffer="",this._sectionStart=0,this._index=0,this._bufferOffset=0,this._baseState=p,this._special=gt,this._cbs=e,this._running=!0,this._ended=!1,this._xmlMode=!(!t||!t.xmlMode),this._decodeEntities=!(!t||!t.decodeEntities)}e.exports=a;var c=t("entities/lib/decode_codepoint.js"),u=t("entities/maps/entities.json"),h=t("entities/maps/legacy.json"),l=t("entities/maps/xml.json"),f=0,p=f++,d=f++,g=f++,_=f++,m=f++,b=f++,y=f++,v=f++,w=f++,x=f++,S=f++,E=f++,T=f++,A=f++,k=f++,L=f++,q=f++,R=f++,C=f++,B=f++,D=f++,j=f++,N=f++,O=f++,M=f++,I=f++,P=f++,U=f++,H=f++,V=f++,z=f++,Y=f++,F=f++,G=f++,W=f++,X=f++,Q=f++,J=f++,Z=f++,K=f++,$=f++,tt=f++,et=f++,rt=f++,nt=f++,it=f++,st=f++,ot=f++,at=f++,ct=f++,ut=f++,ht=f++,lt=f++,ft=f++,pt=f++,dt=0,gt=dt++,_t=dt++,mt=dt++;a.prototype._stateText=function(t){"<"===t?(this._index>this._sectionStart&&this._cbs.ontext(this._getSection()),this._state=d,this._sectionStart=this._index):this._decodeEntities&&this._special===gt&&"&"===t&&(this._index>this._sectionStart&&this._cbs.ontext(this._getSection()),this._baseState=p,this._state=ut,this._sectionStart=this._index)},a.prototype._stateBeforeTagName=function(t){"/"===t?this._state=m:"<"===t?(this._cbs.ontext(this._getSection()),this._sectionStart=this._index):">"===t||this._special!==gt||n(t)?this._state=p:"!"===t?(this._state=k,this._sectionStart=this._index+1):"?"===t?(this._state=q,this._sectionStart=this._index+1):(this._state=this._xmlMode||"s"!==t&&"S"!==t?g:z,this._sectionStart=this._index)},a.prototype._stateInTagName=function(t){("/"===t||">"===t||n(t))&&(this._emitToken("onopentagname"),this._state=v,this._index--)},a.prototype._stateBeforeCloseingTagName=function(t){n(t)||(">"===t?this._state=p:this._special!==gt?"s"===t||"S"===t?this._state=Y:(this._state=p,this._index--):(this._state=b,this._sectionStart=this._index))},a.prototype._stateInCloseingTagName=function(t){(">"===t||n(t))&&(this._emitToken("onclosetag"),this._state=y,this._index--)},a.prototype._stateAfterCloseingTagName=function(t){">"===t&&(this._state=p,this._sectionStart=this._index+1)},a.prototype._stateBeforeAttributeName=function(t){">"===t?(this._cbs.onopentagend(),this._state=p,this._sectionStart=this._index+1):"/"===t?this._state=_:n(t)||(this._state=w,this._sectionStart=this._index)},a.prototype._stateInSelfClosingTag=function(t){">"===t?(this._cbs.onselfclosingtag(),this._state=p,this._sectionStart=this._index+1):n(t)||(this._state=v,this._index--)},a.prototype._stateInAttributeName=function(t){("="===t||"/"===t||">"===t||n(t))&&(this._cbs.onattribname(this._getSection()),this._sectionStart=-1,this._state=x,this._index--)},a.prototype._stateAfterAttributeName=function(t){"="===t?this._state=S:"/"===t||">"===t?(this._cbs.onattribend(),this._state=v,this._index--):n(t)||(this._cbs.onattribend(),this._state=w,this._sectionStart=this._index)},a.prototype._stateBeforeAttributeValue=function(t){'"'===t?(this._state=E,this._sectionStart=this._index+1):"'"===t?(this._state=T,this._sectionStart=this._index+1):n(t)||(this._state=A,this._sectionStart=this._index,this._index--)},a.prototype._stateInAttributeValueDoubleQuotes=function(t){'"'===t?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=v):this._decodeEntities&&"&"===t&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ut,this._sectionStart=this._index)},a.prototype._stateInAttributeValueSingleQuotes=function(t){"'"===t?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=v):this._decodeEntities&&"&"===t&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ut,this._sectionStart=this._index)},a.prototype._stateInAttributeValueNoQuotes=function(t){n(t)||">"===t?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=v,this._index--):this._decodeEntities&&"&"===t&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ut,this._sectionStart=this._index)},a.prototype._stateBeforeDeclaration=function(t){this._state="["===t?j:"-"===t?R:L},a.prototype._stateInDeclaration=function(t){">"===t&&(this._cbs.ondeclaration(this._getSection()),this._state=p,this._sectionStart=this._index+1)},a.prototype._stateInProcessingInstruction=function(t){">"===t&&(this._cbs.onprocessinginstruction(this._getSection()),this._state=p,this._sectionStart=this._index+1)},a.prototype._stateBeforeComment=function(t){"-"===t?(this._state=C,this._sectionStart=this._index+1):this._state=L},a.prototype._stateInComment=function(t){"-"===t&&(this._state=B)},a.prototype._stateAfterComment1=function(t){"-"===t?this._state=D:this._state=C},a.prototype._stateAfterComment2=function(t){">"===t?(this._cbs.oncomment(this._buffer.substring(this._sectionStart,this._index-2)),this._state=p,this._sectionStart=this._index+1):"-"!==t&&(this._state=C)},a.prototype._stateBeforeCdata1=s("C",N,L),a.prototype._stateBeforeCdata2=s("D",O,L),a.prototype._stateBeforeCdata3=s("A",M,L),a.prototype._stateBeforeCdata4=s("T",I,L),a.prototype._stateBeforeCdata5=s("A",P,L),a.prototype._stateBeforeCdata6=function(t){"["===t?(this._state=U,this._sectionStart=this._index+1):(this._state=L,this._index--)},a.prototype._stateInCdata=function(t){"]"===t&&(this._state=H)},a.prototype._stateAfterCdata1=i("]",V),a.prototype._stateAfterCdata2=function(t){">"===t?(this._cbs.oncdata(this._buffer.substring(this._sectionStart,this._index-2)),this._state=p,this._sectionStart=this._index+1):"]"!==t&&(this._state=U)},a.prototype._stateBeforeSpecial=function(t){"c"===t||"C"===t?this._state=F:"t"===t||"T"===t?this._state=et:(this._state=g,this._index--)},a.prototype._stateBeforeSpecialEnd=function(t){this._special!==_t||"c"!==t&&"C"!==t?this._special!==mt||"t"!==t&&"T"!==t?this._state=p:this._state=st:this._state=J},a.prototype._stateBeforeScript1=o("R",G),a.prototype._stateBeforeScript2=o("I",W),a.prototype._stateBeforeScript3=o("P",X),a.prototype._stateBeforeScript4=o("T",Q),a.prototype._stateBeforeScript5=function(t){("/"===t||">"===t||n(t))&&(this._special=_t),this._state=g,this._index--},a.prototype._stateAfterScript1=s("R",Z,p),a.prototype._stateAfterScript2=s("I",K,p),a.prototype._stateAfterScript3=s("P",$,p),a.prototype._stateAfterScript4=s("T",tt,p),a.prototype._stateAfterScript5=function(t){">"===t||n(t)?(this._special=gt,this._state=b,this._sectionStart=this._index-6,this._index--):this._state=p},a.prototype._stateBeforeStyle1=o("Y",rt),a.prototype._stateBeforeStyle2=o("L",nt),a.prototype._stateBeforeStyle3=o("E",it),a.prototype._stateBeforeStyle4=function(t){("/"===t||">"===t||n(t))&&(this._special=mt),this._state=g,this._index--},a.prototype._stateAfterStyle1=s("Y",ot,p),a.prototype._stateAfterStyle2=s("L",at,p),a.prototype._stateAfterStyle3=s("E",ct,p),a.prototype._stateAfterStyle4=function(t){">"===t||n(t)?(this._special=gt,this._state=b,this._sectionStart=this._index-5,this._index--):this._state=p},a.prototype._stateBeforeEntity=s("#",ht,lt),a.prototype._stateBeforeNumericEntity=s("X",pt,ft),a.prototype._parseNamedEntityStrict=function(){if(this._sectionStart+1<this._index){var t=this._buffer.substring(this._sectionStart+1,this._index),e=this._xmlMode?l:u;e.hasOwnProperty(t)&&(this._emitPartial(e[t]),this._sectionStart=this._index+1)}},a.prototype._parseLegacyEntity=function(){var t=this._sectionStart+1,e=this._index-t;for(e>6&&(e=6);e>=2;){var r=this._buffer.substr(t,e);if(h.hasOwnProperty(r))return this._emitPartial(h[r]),void(this._sectionStart+=e+1);e--}},a.prototype._stateInNamedEntity=function(t){";"===t?(this._parseNamedEntityStrict(),this._sectionStart+1<this._index&&!this._xmlMode&&this._parseLegacyEntity(),this._state=this._baseState):(t<"a"||t>"z")&&(t<"A"||t>"Z")&&(t<"0"||t>"9")&&(this._xmlMode||this._sectionStart+1===this._index||(this._baseState!==p?"="!==t&&this._parseNamedEntityStrict():this._parseLegacyEntity()),this._state=this._baseState,this._index--)},a.prototype._decodeNumericEntity=function(t,e){var r=this._sectionStart+t;if(r!==this._index){var n=this._buffer.substring(r,this._index),i=parseInt(n,e);this._emitPartial(c(i)),this._sectionStart=this._index}else this._sectionStart--;this._state=this._baseState},a.prototype._stateInNumericEntity=function(t){";"===t?(this._decodeNumericEntity(2,10),this._sectionStart++):(t<"0"||t>"9")&&(this._xmlMode?this._state=this._baseState:this._decodeNumericEntity(2,10),this._index--)},a.prototype._stateInHexEntity=function(t){";"===t?(this._decodeNumericEntity(3,16),this._sectionStart++):(t<"a"||t>"f")&&(t<"A"||t>"F")&&(t<"0"||t>"9")&&(this._xmlMode?this._state=this._baseState:this._decodeNumericEntity(3,16),this._index--)},a.prototype._cleanup=function(){this._sectionStart<0?(this._buffer="",this._index=0,this._bufferOffset+=this._index):this._running&&(this._state===p?(this._sectionStart!==this._index&&this._cbs.ontext(this._buffer.substr(this._sectionStart)),this._buffer="",this._bufferOffset+=this._index,this._index=0):this._sectionStart===this._index?(this._buffer="",this._bufferOffset+=this._index,this._index=0):(this._buffer=this._buffer.substr(this._sectionStart),this._index-=this._sectionStart,this._bufferOffset+=this._sectionStart),this._sectionStart=0)},a.prototype.write=function(t){this._ended&&this._cbs.onerror(Error(".write() after done!")),this._buffer+=t,this._parse()},a.prototype._parse=function(){for(;this._index<this._buffer.length&&this._running;){var t=this._buffer.charAt(this._index);this._state===p?this._stateText(t):this._state===d?this._stateBeforeTagName(t):this._state===g?this._stateInTagName(t):this._state===m?this._stateBeforeCloseingTagName(t):this._state===b?this._stateInCloseingTagName(t):this._state===y?this._stateAfterCloseingTagName(t):this._state===_?this._stateInSelfClosingTag(t):this._state===v?this._stateBeforeAttributeName(t):this._state===w?this._stateInAttributeName(t):this._state===x?this._stateAfterAttributeName(t):this._state===S?this._stateBeforeAttributeValue(t):this._state===E?this._stateInAttributeValueDoubleQuotes(t):this._state===T?this._stateInAttributeValueSingleQuotes(t):this._state===A?this._stateInAttributeValueNoQuotes(t):this._state===k?this._stateBeforeDeclaration(t):this._state===L?this._stateInDeclaration(t):this._state===q?this._stateInProcessingInstruction(t):this._state===R?this._stateBeforeComment(t):this._state===C?this._stateInComment(t):this._state===B?this._stateAfterComment1(t):this._state===D?this._stateAfterComment2(t):this._state===j?this._stateBeforeCdata1(t):this._state===N?this._stateBeforeCdata2(t):this._state===O?this._stateBeforeCdata3(t):this._state===M?this._stateBeforeCdata4(t):this._state===I?this._stateBeforeCdata5(t):this._state===P?this._stateBeforeCdata6(t):this._state===U?this._stateInCdata(t):this._state===H?this._stateAfterCdata1(t):this._state===V?this._stateAfterCdata2(t):this._state===z?this._stateBeforeSpecial(t):this._state===Y?this._stateBeforeSpecialEnd(t):this._state===F?this._stateBeforeScript1(t):this._state===G?this._stateBeforeScript2(t):this._state===W?this._stateBeforeScript3(t):this._state===X?this._stateBeforeScript4(t):this._state===Q?this._stateBeforeScript5(t):this._state===J?this._stateAfterScript1(t):this._state===Z?this._stateAfterScript2(t):this._state===K?this._stateAfterScript3(t):this._state===$?this._stateAfterScript4(t):this._state===tt?this._stateAfterScript5(t):this._state===et?this._stateBeforeStyle1(t):this._state===rt?this._stateBeforeStyle2(t):this._state===nt?this._stateBeforeStyle3(t):this._state===it?this._stateBeforeStyle4(t):this._state===st?this._stateAfterStyle1(t):this._state===ot?this._stateAfterStyle2(t):this._state===at?this._stateAfterStyle3(t):this._state===ct?this._stateAfterStyle4(t):this._state===ut?this._stateBeforeEntity(t):this._state===ht?this._stateBeforeNumericEntity(t):this._state===lt?this._stateInNamedEntity(t):this._state===ft?this._stateInNumericEntity(t):this._state===pt?this._stateInHexEntity(t):this._cbs.onerror(Error("unknown _state"),this._state),this._index++}this._cleanup()},a.prototype.pause=function(){this._running=!1},a.prototype.resume=function(){this._running=!0,this._index<this._buffer.length&&this._parse(),this._ended&&this._finish()},a.prototype.end=function(t){this._ended&&this._cbs.onerror(Error(".end() after done!")),t&&this.write(t),this._ended=!0,this._running&&this._finish()},a.prototype._finish=function(){this._sectionStart<this._index&&this._handleTrailingData(),this._cbs.onend()},a.prototype._handleTrailingData=function(){var t=this._buffer.substr(this._sectionStart);this._state===U||this._state===H||this._state===V?this._cbs.oncdata(t):this._state===C||this._state===B||this._state===D?this._cbs.oncomment(t):this._state!==lt||this._xmlMode?this._state!==ft||this._xmlMode?this._state!==pt||this._xmlMode?this._state!==g&&this._state!==v&&this._state!==S&&this._state!==x&&this._state!==w&&this._state!==T&&this._state!==E&&this._state!==A&&this._state!==b&&this._cbs.ontext(t):(this._decodeNumericEntity(3,16),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData())):(this._decodeNumericEntity(2,10),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData())):(this._parseLegacyEntity(),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData()))},a.prototype.reset=function(){a.call(this,{xmlMode:this._xmlMode,decodeEntities:this._decodeEntities},this._cbs)},a.prototype.getAbsoluteIndex=function(){return this._bufferOffset+this._index},a.prototype._getSection=function(){return this._buffer.substring(this._sectionStart,this._index)},a.prototype._emitToken=function(t){this._cbs[t](this._getSection()),this._sectionStart=-1},a.prototype._emitPartial=function(t){this._baseState!==p?this._cbs.onattribdata(t):this._cbs.ontext(t)}},{"entities/lib/decode_codepoint.js":22,"entities/maps/entities.json":25,"entities/maps/legacy.json":26,"entities/maps/xml.json":27}],35:[function(t,e,r){function n(t,e){var r=this._parser=new i(t,e),n=this._decoder=new o;s.call(this,{decodeStrings:!1}),this.once("finish",function(){r.end(n.end())})}e.exports=n;var i=t("./Parser.js"),s=t("stream").Writable||t("readable-stream").Writable,o=t("string_decoder").StringDecoder,a=t("buffer").Buffer;t("inherits")(n,s),s.prototype._write=function(t,e,r){t instanceof a&&(t=this._decoder.write(t)),this._parser.write(t),r()}},{"./Parser.js":31,buffer:5,inherits:38,"readable-stream":3,stream:55,string_decoder:56}],36:[function(t,e,r){function n(t,r){return delete e.exports[t],e.exports[t]=r,r}var i=t("./Parser.js"),s=t("domhandler");e.exports={Parser:i,Tokenizer:t("./Tokenizer.js"),ElementType:t("domelementtype"),DomHandler:s,get FeedHandler(){return n("FeedHandler",t("./FeedHandler.js"))},get Stream(){return n("Stream",t("./Stream.js"))},get WritableStream(){return n("WritableStream",t("./WritableStream.js"));
+},get ProxyHandler(){return n("ProxyHandler",t("./ProxyHandler.js"))},get DomUtils(){return n("DomUtils",t("domutils"))},get CollectingHandler(){return n("CollectingHandler",t("./CollectingHandler.js"))},DefaultHandler:s,get RssHandler(){return n("RssHandler",this.FeedHandler)},parseDOM:function(t,e){var r=new s(e);return new i(r,e).end(t),r.dom},parseFeed:function(t,r){var n=new e.exports.FeedHandler(r);return new i(n,r).end(t),n.dom},createDomStream:function(t,e,r){var n=new s(t,e,r);return new i(n,e)},EVENTS:{attribute:2,cdatastart:0,cdataend:0,text:1,processinginstruction:2,comment:1,commentend:0,closetag:1,opentag:2,opentagname:1,error:1,end:0}}},{"./CollectingHandler.js":29,"./FeedHandler.js":30,"./Parser.js":31,"./ProxyHandler.js":32,"./Stream.js":33,"./Tokenizer.js":34,"./WritableStream.js":35,domelementtype:9,domhandler:10,domutils:13}],37:[function(t,e,r){r.read=function(t,e,r,n,i){var s,o,a=8*i-n-1,c=(1<<a)-1,u=c>>1,h=-7,l=r?i-1:0,f=r?-1:1,p=t[e+l];for(l+=f,s=p&(1<<-h)-1,p>>=-h,h+=a;h>0;s=256*s+t[e+l],l+=f,h-=8);for(o=s&(1<<-h)-1,s>>=-h,h+=n;h>0;o=256*o+t[e+l],l+=f,h-=8);if(0===s)s=1-u;else{if(s===c)return o?NaN:(p?-1:1)*(1/0);o+=Math.pow(2,n),s-=u}return(p?-1:1)*o*Math.pow(2,s-n)},r.write=function(t,e,r,n,i,s){var o,a,c,u=8*s-i-1,h=(1<<u)-1,l=h>>1,f=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,p=n?0:s-1,d=n?1:-1,g=e<0||0===e&&1/e<0?1:0;for(e=Math.abs(e),isNaN(e)||e===1/0?(a=isNaN(e)?1:0,o=h):(o=Math.floor(Math.log(e)/Math.LN2),e*(c=Math.pow(2,-o))<1&&(o--,c*=2),e+=o+l>=1?f/c:f*Math.pow(2,1-l),e*c>=2&&(o++,c/=2),o+l>=h?(a=0,o=h):o+l>=1?(a=(e*c-1)*Math.pow(2,i),o+=l):(a=e*Math.pow(2,l-1)*Math.pow(2,i),o=0));i>=8;t[r+p]=255&a,p+=d,a/=256,i-=8);for(o=o<<i|a,u+=i;u>0;t[r+p]=255&o,p+=d,o/=256,u-=8);t[r+p-d]|=128*g}},{}],38:[function(t,e,r){"function"==typeof Object.create?e.exports=function(t,e){t.super_=e,t.prototype=Object.create(e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(t,e){t.super_=e;var r=function(){};r.prototype=e.prototype,t.prototype=new r,t.prototype.constructor=t}},{}],39:[function(t,e,r){function n(t){return!!t.constructor&&"function"==typeof t.constructor.isBuffer&&t.constructor.isBuffer(t)}function i(t){return"function"==typeof t.readFloatLE&&"function"==typeof t.slice&&n(t.slice(0,0))}e.exports=function(t){return null!=t&&(n(t)||i(t)||!!t._isBuffer)}},{}],40:[function(t,e,r){var n={}.toString;e.exports=Array.isArray||function(t){return"[object Array]"==n.call(t)}},{}],41:[function(t,e,r){(function(t){"use strict";function r(e,r,n,i){if("function"!=typeof e)throw new TypeError('"callback" argument must be a function');var s,o,a=arguments.length;switch(a){case 0:case 1:return t.nextTick(e);case 2:return t.nextTick(function(){e.call(null,r)});case 3:return t.nextTick(function(){e.call(null,r,n)});case 4:return t.nextTick(function(){e.call(null,r,n,i)});default:for(s=new Array(a-1),o=0;o<s.length;)s[o++]=arguments[o];return t.nextTick(function(){e.apply(null,s)})}}!t.version||0===t.version.indexOf("v0.")||0===t.version.indexOf("v1.")&&0!==t.version.indexOf("v1.8.")?e.exports=r:e.exports=t.nextTick}).call(this,t("_process"))},{_process:42}],42:[function(t,e,r){function n(){throw new Error("setTimeout has not been defined")}function i(){throw new Error("clearTimeout has not been defined")}function s(t){if(l===setTimeout)return setTimeout(t,0);if((l===n||!l)&&setTimeout)return l=setTimeout,setTimeout(t,0);try{return l(t,0)}catch(e){try{return l.call(null,t,0)}catch(e){return l.call(this,t,0)}}}function o(t){if(f===clearTimeout)return clearTimeout(t);if((f===i||!f)&&clearTimeout)return f=clearTimeout,clearTimeout(t);try{return f(t)}catch(e){try{return f.call(null,t)}catch(e){return f.call(this,t)}}}function a(){_&&d&&(_=!1,d.length?g=d.concat(g):m=-1,g.length&&c())}function c(){if(!_){var t=s(a);_=!0;for(var e=g.length;e;){for(d=g,g=[];++m<e;)d&&d[m].run();m=-1,e=g.length}d=null,_=!1,o(t)}}function u(t,e){this.fun=t,this.array=e}function h(){}var l,f,p=e.exports={};!function(){try{l="function"==typeof setTimeout?setTimeout:n}catch(t){l=n}try{f="function"==typeof clearTimeout?clearTimeout:i}catch(t){f=i}}();var d,g=[],_=!1,m=-1;p.nextTick=function(t){var e=new Array(arguments.length-1);if(arguments.length>1)for(var r=1;r<arguments.length;r++)e[r-1]=arguments[r];g.push(new u(t,e)),1!==g.length||_||s(c)},u.prototype.run=function(){this.fun.apply(null,this.array)},p.title="browser",p.browser=!0,p.env={},p.argv=[],p.version="",p.versions={},p.on=h,p.addListener=h,p.once=h,p.off=h,p.removeListener=h,p.removeAllListeners=h,p.emit=h,p.binding=function(t){throw new Error("process.binding is not supported")},p.cwd=function(){return"/"},p.chdir=function(t){throw new Error("process.chdir is not supported")},p.umask=function(){return 0}},{}],43:[function(t,e,r){e.exports=t("./lib/_stream_duplex.js")},{"./lib/_stream_duplex.js":44}],44:[function(t,e,r){"use strict";function n(t){return this instanceof n?(u.call(this,t),h.call(this,t),t&&t.readable===!1&&(this.readable=!1),t&&t.writable===!1&&(this.writable=!1),this.allowHalfOpen=!0,t&&t.allowHalfOpen===!1&&(this.allowHalfOpen=!1),void this.once("end",i)):new n(t)}function i(){this.allowHalfOpen||this._writableState.ended||a(s,this)}function s(t){t.end()}var o=Object.keys||function(t){var e=[];for(var r in t)e.push(r);return e};e.exports=n;var a=t("process-nextick-args"),c=t("core-util-is");c.inherits=t("inherits");var u=t("./_stream_readable"),h=t("./_stream_writable");c.inherits(n,u);for(var l=o(h.prototype),f=0;f<l.length;f++){var p=l[f];n.prototype[p]||(n.prototype[p]=h.prototype[p])}},{"./_stream_readable":46,"./_stream_writable":48,"core-util-is":6,inherits:38,"process-nextick-args":41}],45:[function(t,e,r){"use strict";function n(t){return this instanceof n?void i.call(this,t):new n(t)}e.exports=n;var i=t("./_stream_transform"),s=t("core-util-is");s.inherits=t("inherits"),s.inherits(n,i),n.prototype._transform=function(t,e,r){r(null,t)}},{"./_stream_transform":47,"core-util-is":6,inherits:38}],46:[function(t,e,r){(function(r){"use strict";function n(t,e,r){return"function"==typeof t.prependListener?t.prependListener(e,r):void(t._events&&t._events[e]?R(t._events[e])?t._events[e].unshift(r):t._events[e]=[r,t._events[e]]:t.on(e,r))}function i(e,r){U=U||t("./_stream_duplex"),e=e||{},this.objectMode=!!e.objectMode,r instanceof U&&(this.objectMode=this.objectMode||!!e.readableObjectMode);var n=e.highWaterMark,i=this.objectMode?16:16384;this.highWaterMark=n||0===n?n:i,this.highWaterMark=~~this.highWaterMark,this.buffer=new P,this.length=0,this.pipes=null,this.pipesCount=0,this.flowing=null,this.ended=!1,this.endEmitted=!1,this.reading=!1,this.sync=!0,this.needReadable=!1,this.emittedReadable=!1,this.readableListening=!1,this.resumeScheduled=!1,this.defaultEncoding=e.defaultEncoding||"utf8",this.ranOut=!1,this.awaitDrain=0,this.readingMore=!1,this.decoder=null,this.encoding=null,e.encoding&&(I||(I=t("string_decoder/").StringDecoder),this.decoder=new I(e.encoding),this.encoding=e.encoding)}function s(e){return U=U||t("./_stream_duplex"),this instanceof s?(this._readableState=new i(e,this),this.readable=!0,e&&"function"==typeof e.read&&(this._read=e.read),void C.call(this)):new s(e)}function o(t,e,r,n,i){var s=h(e,r);if(s)t.emit("error",s);else if(null===r)e.reading=!1,l(t,e);else if(e.objectMode||r&&r.length>0)if(e.ended&&!i){var o=new Error("stream.push() after EOF");t.emit("error",o)}else if(e.endEmitted&&i){var c=new Error("stream.unshift() after end event");t.emit("error",c)}else{var u;!e.decoder||i||n||(r=e.decoder.write(r),u=!e.objectMode&&0===r.length),i||(e.reading=!1),u||(e.flowing&&0===e.length&&!e.sync?(t.emit("data",r),t.read(0)):(e.length+=e.objectMode?1:r.length,i?e.buffer.unshift(r):e.buffer.push(r),e.needReadable&&f(t))),d(t,e)}else i||(e.reading=!1);return a(e)}function a(t){return!t.ended&&(t.needReadable||t.length<t.highWaterMark||0===t.length)}function c(t){return t>=H?t=H:(t--,t|=t>>>1,t|=t>>>2,t|=t>>>4,t|=t>>>8,t|=t>>>16,t++),t}function u(t,e){return t<=0||0===e.length&&e.ended?0:e.objectMode?1:t!==t?e.flowing&&e.length?e.buffer.head.data.length:e.length:(t>e.highWaterMark&&(e.highWaterMark=c(t)),t<=e.length?t:e.ended?e.length:(e.needReadable=!0,0))}function h(t,e){var r=null;return D.isBuffer(e)||"string"==typeof e||null===e||void 0===e||t.objectMode||(r=new TypeError("Invalid non-string/buffer chunk")),r}function l(t,e){if(!e.ended){if(e.decoder){var r=e.decoder.end();r&&r.length&&(e.buffer.push(r),e.length+=e.objectMode?1:r.length)}e.ended=!0,f(t)}}function f(t){var e=t._readableState;e.needReadable=!1,e.emittedReadable||(M("emitReadable",e.flowing),e.emittedReadable=!0,e.sync?q(p,t):p(t))}function p(t){M("emit readable"),t.emit("readable"),v(t)}function d(t,e){e.readingMore||(e.readingMore=!0,q(g,t,e))}function g(t,e){for(var r=e.length;!e.reading&&!e.flowing&&!e.ended&&e.length<e.highWaterMark&&(M("maybeReadMore read 0"),t.read(0),r!==e.length);)r=e.length;e.readingMore=!1}function _(t){return function(){var e=t._readableState;M("pipeOnDrain",e.awaitDrain),e.awaitDrain&&e.awaitDrain--,0===e.awaitDrain&&B(t,"data")&&(e.flowing=!0,v(t))}}function m(t){M("readable nexttick read 0"),t.read(0)}function b(t,e){e.resumeScheduled||(e.resumeScheduled=!0,q(y,t,e))}function y(t,e){e.reading||(M("resume read 0"),t.read(0)),e.resumeScheduled=!1,e.awaitDrain=0,t.emit("resume"),v(t),e.flowing&&!e.reading&&t.read(0)}function v(t){var e=t._readableState;for(M("flow",e.flowing);e.flowing&&null!==t.read(););}function w(t,e){if(0===e.length)return null;var r;return e.objectMode?r=e.buffer.shift():!t||t>=e.length?(r=e.decoder?e.buffer.join(""):1===e.buffer.length?e.buffer.head.data:e.buffer.concat(e.length),e.buffer.clear()):r=x(t,e.buffer,e.decoder),r}function x(t,e,r){var n;return t<e.head.data.length?(n=e.head.data.slice(0,t),e.head.data=e.head.data.slice(t)):n=t===e.head.data.length?e.shift():r?S(t,e):E(t,e),n}function S(t,e){var r=e.head,n=1,i=r.data;for(t-=i.length;r=r.next;){var s=r.data,o=t>s.length?s.length:t;if(i+=o===s.length?s:s.slice(0,t),t-=o,0===t){o===s.length?(++n,r.next?e.head=r.next:e.head=e.tail=null):(e.head=r,r.data=s.slice(o));break}++n}return e.length-=n,i}function E(t,e){var r=j.allocUnsafe(t),n=e.head,i=1;for(n.data.copy(r),t-=n.data.length;n=n.next;){var s=n.data,o=t>s.length?s.length:t;if(s.copy(r,r.length-t,0,o),t-=o,0===t){o===s.length?(++i,n.next?e.head=n.next:e.head=e.tail=null):(e.head=n,n.data=s.slice(o));break}++i}return e.length-=i,r}function T(t){var e=t._readableState;if(e.length>0)throw new Error('"endReadable()" called on non-empty stream');e.endEmitted||(e.ended=!0,q(A,e,t))}function A(t,e){t.endEmitted||0!==t.length||(t.endEmitted=!0,e.readable=!1,e.emit("end"))}function k(t,e){for(var r=0,n=t.length;r<n;r++)e(t[r],r)}function L(t,e){for(var r=0,n=t.length;r<n;r++)if(t[r]===e)return r;return-1}e.exports=s;var q=t("process-nextick-args"),R=t("isarray");s.ReadableState=i;var C,B=(t("events").EventEmitter,function(t,e){return t.listeners(e).length});!function(){try{C=t("stream")}catch(e){}finally{C||(C=t("events").EventEmitter)}}();var D=t("buffer").Buffer,j=t("buffer-shims"),N=t("core-util-is");N.inherits=t("inherits");var O=t("util"),M=void 0;M=O&&O.debuglog?O.debuglog("stream"):function(){};var I,P=t("./internal/streams/BufferList");N.inherits(s,C);var U,U;s.prototype.push=function(t,e){var r=this._readableState;return r.objectMode||"string"!=typeof t||(e=e||r.defaultEncoding,e!==r.encoding&&(t=j.from(t,e),e="")),o(this,r,t,e,!1)},s.prototype.unshift=function(t){var e=this._readableState;return o(this,e,t,"",!0)},s.prototype.isPaused=function(){return this._readableState.flowing===!1},s.prototype.setEncoding=function(e){return I||(I=t("string_decoder/").StringDecoder),this._readableState.decoder=new I(e),this._readableState.encoding=e,this};var H=8388608;s.prototype.read=function(t){M("read",t),t=parseInt(t,10);var e=this._readableState,r=t;if(0!==t&&(e.emittedReadable=!1),0===t&&e.needReadable&&(e.length>=e.highWaterMark||e.ended))return M("read: emitReadable",e.length,e.ended),0===e.length&&e.ended?T(this):f(this),null;if(t=u(t,e),0===t&&e.ended)return 0===e.length&&T(this),null;var n=e.needReadable;M("need readable",n),(0===e.length||e.length-t<e.highWaterMark)&&(n=!0,M("length less than watermark",n)),e.ended||e.reading?(n=!1,M("reading or ended",n)):n&&(M("do read"),e.reading=!0,e.sync=!0,0===e.length&&(e.needReadable=!0),this._read(e.highWaterMark),e.sync=!1,e.reading||(t=u(r,e)));var i;return i=t>0?w(t,e):null,null===i?(e.needReadable=!0,t=0):e.length-=t,0===e.length&&(e.ended||(e.needReadable=!0),r!==t&&e.ended&&T(this)),null!==i&&this.emit("data",i),i},s.prototype._read=function(t){this.emit("error",new Error("not implemented"))},s.prototype.pipe=function(t,e){function i(t){M("onunpipe"),t===f&&o()}function s(){M("onend"),t.end()}function o(){M("cleanup"),t.removeListener("close",u),t.removeListener("finish",h),t.removeListener("drain",m),t.removeListener("error",c),t.removeListener("unpipe",i),f.removeListener("end",s),f.removeListener("end",o),f.removeListener("data",a),b=!0,!p.awaitDrain||t._writableState&&!t._writableState.needDrain||m()}function a(e){M("ondata"),y=!1;var r=t.write(e);!1!==r||y||((1===p.pipesCount&&p.pipes===t||p.pipesCount>1&&L(p.pipes,t)!==-1)&&!b&&(M("false write response, pause",f._readableState.awaitDrain),f._readableState.awaitDrain++,y=!0),f.pause())}function c(e){M("onerror",e),l(),t.removeListener("error",c),0===B(t,"error")&&t.emit("error",e)}function u(){t.removeListener("finish",h),l()}function h(){M("onfinish"),t.removeListener("close",u),l()}function l(){M("unpipe"),f.unpipe(t)}var f=this,p=this._readableState;switch(p.pipesCount){case 0:p.pipes=t;break;case 1:p.pipes=[p.pipes,t];break;default:p.pipes.push(t)}p.pipesCount+=1,M("pipe count=%d opts=%j",p.pipesCount,e);var d=(!e||e.end!==!1)&&t!==r.stdout&&t!==r.stderr,g=d?s:o;p.endEmitted?q(g):f.once("end",g),t.on("unpipe",i);var m=_(f);t.on("drain",m);var b=!1,y=!1;return f.on("data",a),n(t,"error",c),t.once("close",u),t.once("finish",h),t.emit("pipe",f),p.flowing||(M("pipe resume"),f.resume()),t},s.prototype.unpipe=function(t){var e=this._readableState;if(0===e.pipesCount)return this;if(1===e.pipesCount)return t&&t!==e.pipes?this:(t||(t=e.pipes),e.pipes=null,e.pipesCount=0,e.flowing=!1,t&&t.emit("unpipe",this),this);if(!t){var r=e.pipes,n=e.pipesCount;e.pipes=null,e.pipesCount=0,e.flowing=!1;for(var i=0;i<n;i++)r[i].emit("unpipe",this);return this}var s=L(e.pipes,t);return s===-1?this:(e.pipes.splice(s,1),e.pipesCount-=1,1===e.pipesCount&&(e.pipes=e.pipes[0]),t.emit("unpipe",this),this)},s.prototype.on=function(t,e){var r=C.prototype.on.call(this,t,e);if("data"===t)this._readableState.flowing!==!1&&this.resume();else if("readable"===t){var n=this._readableState;n.endEmitted||n.readableListening||(n.readableListening=n.needReadable=!0,n.emittedReadable=!1,n.reading?n.length&&f(this,n):q(m,this))}return r},s.prototype.addListener=s.prototype.on,s.prototype.resume=function(){var t=this._readableState;return t.flowing||(M("resume"),t.flowing=!0,b(this,t)),this},s.prototype.pause=function(){return M("call pause flowing=%j",this._readableState.flowing),!1!==this._readableState.flowing&&(M("pause"),this._readableState.flowing=!1,this.emit("pause")),this},s.prototype.wrap=function(t){var e=this._readableState,r=!1,n=this;t.on("end",function(){if(M("wrapped end"),e.decoder&&!e.ended){var t=e.decoder.end();t&&t.length&&n.push(t)}n.push(null)}),t.on("data",function(i){if(M("wrapped data"),e.decoder&&(i=e.decoder.write(i)),(!e.objectMode||null!==i&&void 0!==i)&&(e.objectMode||i&&i.length)){var s=n.push(i);s||(r=!0,t.pause())}});for(var i in t)void 0===this[i]&&"function"==typeof t[i]&&(this[i]=function(e){return function(){return t[e].apply(t,arguments)}}(i));var s=["error","close","destroy","pause","resume"];return k(s,function(e){t.on(e,n.emit.bind(n,e))}),n._read=function(e){M("wrapped _read",e),r&&(r=!1,t.resume())},n},s._fromList=w}).call(this,t("_process"))},{"./_stream_duplex":44,"./internal/streams/BufferList":49,_process:42,buffer:5,"buffer-shims":4,"core-util-is":6,events:28,inherits:38,isarray:40,"process-nextick-args":41,"string_decoder/":56,util:3}],47:[function(t,e,r){"use strict";function n(t){this.afterTransform=function(e,r){return i(t,e,r)},this.needTransform=!1,this.transforming=!1,this.writecb=null,this.writechunk=null,this.writeencoding=null}function i(t,e,r){var n=t._transformState;n.transforming=!1;var i=n.writecb;if(!i)return t.emit("error",new Error("no writecb in Transform class"));n.writechunk=null,n.writecb=null,null!==r&&void 0!==r&&t.push(r),i(e);var s=t._readableState;s.reading=!1,(s.needReadable||s.length<s.highWaterMark)&&t._read(s.highWaterMark)}function s(t){if(!(this instanceof s))return new s(t);a.call(this,t),this._transformState=new n(this);var e=this;this._readableState.needReadable=!0,this._readableState.sync=!1,t&&("function"==typeof t.transform&&(this._transform=t.transform),"function"==typeof t.flush&&(this._flush=t.flush)),this.once("prefinish",function(){"function"==typeof this._flush?this._flush(function(t){o(e,t)}):o(e)})}function o(t,e){if(e)return t.emit("error",e);var r=t._writableState,n=t._transformState;if(r.length)throw new Error("Calling transform done when ws.length != 0");if(n.transforming)throw new Error("Calling transform done when still transforming");return t.push(null)}e.exports=s;var a=t("./_stream_duplex"),c=t("core-util-is");c.inherits=t("inherits"),c.inherits(s,a),s.prototype.push=function(t,e){return this._transformState.needTransform=!1,a.prototype.push.call(this,t,e)},s.prototype._transform=function(t,e,r){throw new Error("Not implemented")},s.prototype._write=function(t,e,r){var n=this._transformState;if(n.writecb=r,n.writechunk=t,n.writeencoding=e,!n.transforming){var i=this._readableState;(n.needTransform||i.needReadable||i.length<i.highWaterMark)&&this._read(i.highWaterMark)}},s.prototype._read=function(t){var e=this._transformState;null!==e.writechunk&&e.writecb&&!e.transforming?(e.transforming=!0,this._transform(e.writechunk,e.writeencoding,e.afterTransform)):e.needTransform=!0}},{"./_stream_duplex":44,"core-util-is":6,inherits:38}],48:[function(t,e,r){(function(r){"use strict";function n(){}function i(t,e,r){this.chunk=t,this.encoding=e,this.callback=r,this.next=null}function s(e,r){R=R||t("./_stream_duplex"),e=e||{},this.objectMode=!!e.objectMode,r instanceof R&&(this.objectMode=this.objectMode||!!e.writableObjectMode);var n=e.highWaterMark,i=this.objectMode?16:16384;this.highWaterMark=n||0===n?n:i,this.highWaterMark=~~this.highWaterMark,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1;var s=e.decodeStrings===!1;this.decodeStrings=!s,this.defaultEncoding=e.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(t){d(r,t)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.bufferedRequestCount=0,this.corkedRequestsFree=new x(this)}function o(e){return R=R||t("./_stream_duplex"),this instanceof o||this instanceof R?(this._writableState=new s(e,this),this.writable=!0,e&&("function"==typeof e.write&&(this._write=e.write),"function"==typeof e.writev&&(this._writev=e.writev)),void A.call(this)):new o(e)}function a(t,e){var r=new Error("write after end");t.emit("error",r),S(e,r)}function c(t,e,r,n){var i=!0,s=!1;return null===r?s=new TypeError("May not write null values to stream"):L.isBuffer(r)||"string"==typeof r||void 0===r||e.objectMode||(s=new TypeError("Invalid non-string/buffer chunk")),s&&(t.emit("error",s),S(n,s),i=!1),i}function u(t,e,r){return t.objectMode||t.decodeStrings===!1||"string"!=typeof e||(e=q.from(e,r)),e}function h(t,e,r,n,s){r=u(e,r,n),L.isBuffer(r)&&(n="buffer");var o=e.objectMode?1:r.length;e.length+=o;var a=e.length<e.highWaterMark;if(a||(e.needDrain=!0),e.writing||e.corked){var c=e.lastBufferedRequest;e.lastBufferedRequest=new i(r,n,s),c?c.next=e.lastBufferedRequest:e.bufferedRequest=e.lastBufferedRequest,e.bufferedRequestCount+=1}else l(t,e,!1,o,r,n,s);return a}function l(t,e,r,n,i,s,o){e.writelen=n,e.writecb=o,e.writing=!0,e.sync=!0,r?t._writev(i,e.onwrite):t._write(i,s,e.onwrite),e.sync=!1}function f(t,e,r,n,i){--e.pendingcb,r?S(i,n):i(n),t._writableState.errorEmitted=!0,t.emit("error",n)}function p(t){t.writing=!1,t.writecb=null,t.length-=t.writelen,t.writelen=0}function d(t,e){var r=t._writableState,n=r.sync,i=r.writecb;if(p(r),e)f(t,r,n,e,i);else{var s=b(r);s||r.corked||r.bufferProcessing||!r.bufferedRequest||m(t,r),n?E(g,t,r,s,i):g(t,r,s,i)}}function g(t,e,r,n){r||_(t,e),e.pendingcb--,n(),v(t,e)}function _(t,e){0===e.length&&e.needDrain&&(e.needDrain=!1,t.emit("drain"))}function m(t,e){e.bufferProcessing=!0;var r=e.bufferedRequest;if(t._writev&&r&&r.next){var n=e.bufferedRequestCount,i=new Array(n),s=e.corkedRequestsFree;s.entry=r;for(var o=0;r;)i[o]=r,r=r.next,o+=1;l(t,e,!0,e.length,i,"",s.finish),e.pendingcb++,e.lastBufferedRequest=null,s.next?(e.corkedRequestsFree=s.next,s.next=null):e.corkedRequestsFree=new x(e)}else{for(;r;){var a=r.chunk,c=r.encoding,u=r.callback,h=e.objectMode?1:a.length;if(l(t,e,!1,h,a,c,u),r=r.next,e.writing)break}null===r&&(e.lastBufferedRequest=null)}e.bufferedRequestCount=0,e.bufferedRequest=r,e.bufferProcessing=!1}function b(t){return t.ending&&0===t.length&&null===t.bufferedRequest&&!t.finished&&!t.writing}function y(t,e){e.prefinished||(e.prefinished=!0,t.emit("prefinish"))}function v(t,e){var r=b(e);return r&&(0===e.pendingcb?(y(t,e),e.finished=!0,t.emit("finish")):y(t,e)),r}function w(t,e,r){e.ending=!0,v(t,e),r&&(e.finished?S(r):t.once("finish",r)),e.ended=!0,t.writable=!1}function x(t){var e=this;this.next=null,this.entry=null,this.finish=function(r){var n=e.entry;for(e.entry=null;n;){var i=n.callback;t.pendingcb--,i(r),n=n.next}t.corkedRequestsFree?t.corkedRequestsFree.next=e:t.corkedRequestsFree=e}}e.exports=o;var S=t("process-nextick-args"),E=!r.browser&&["v0.10","v0.9."].indexOf(r.version.slice(0,5))>-1?setImmediate:S;o.WritableState=s;var T=t("core-util-is");T.inherits=t("inherits");var A,k={deprecate:t("util-deprecate")};!function(){try{A=t("stream")}catch(e){}finally{A||(A=t("events").EventEmitter)}}();var L=t("buffer").Buffer,q=t("buffer-shims");T.inherits(o,A);var R;s.prototype.getBuffer=function(){for(var t=this.bufferedRequest,e=[];t;)e.push(t),t=t.next;return e},function(){try{Object.defineProperty(s.prototype,"buffer",{get:k.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.")})}catch(t){}}();var R;o.prototype.pipe=function(){this.emit("error",new Error("Cannot pipe, not readable"))},o.prototype.write=function(t,e,r){var i=this._writableState,s=!1;return"function"==typeof e&&(r=e,e=null),L.isBuffer(t)?e="buffer":e||(e=i.defaultEncoding),"function"!=typeof r&&(r=n),i.ended?a(this,r):c(this,i,t,r)&&(i.pendingcb++,s=h(this,i,t,e,r)),s},o.prototype.cork=function(){var t=this._writableState;t.corked++},o.prototype.uncork=function(){var t=this._writableState;t.corked&&(t.corked--,t.writing||t.corked||t.finished||t.bufferProcessing||!t.bufferedRequest||m(this,t))},o.prototype.setDefaultEncoding=function(t){if("string"==typeof t&&(t=t.toLowerCase()),!(["hex","utf8","utf-8","ascii","binary","base64","ucs2","ucs-2","utf16le","utf-16le","raw"].indexOf((t+"").toLowerCase())>-1))throw new TypeError("Unknown encoding: "+t);return this._writableState.defaultEncoding=t,this},o.prototype._write=function(t,e,r){r(new Error("not implemented"))},o.prototype._writev=null,o.prototype.end=function(t,e,r){var n=this._writableState;"function"==typeof t?(r=t,t=null,e=null):"function"==typeof e&&(r=e,e=null),null!==t&&void 0!==t&&this.write(t,e),n.corked&&(n.corked=1,this.uncork()),n.ending||n.finished||w(this,n,r)}}).call(this,t("_process"))},{"./_stream_duplex":44,_process:42,buffer:5,"buffer-shims":4,"core-util-is":6,events:28,inherits:38,"process-nextick-args":41,"util-deprecate":57}],49:[function(t,e,r){"use strict";function n(){this.head=null,this.tail=null,this.length=0}var i=(t("buffer").Buffer,t("buffer-shims"));e.exports=n,n.prototype.push=function(t){var e={data:t,next:null};this.length>0?this.tail.next=e:this.head=e,this.tail=e,++this.length},n.prototype.unshift=function(t){var e={data:t,next:this.head};0===this.length&&(this.tail=e),this.head=e,++this.length},n.prototype.shift=function(){if(0!==this.length){var t=this.head.data;return 1===this.length?this.head=this.tail=null:this.head=this.head.next,--this.length,t}},n.prototype.clear=function(){this.head=this.tail=null,this.length=0},n.prototype.join=function(t){if(0===this.length)return"";for(var e=this.head,r=""+e.data;e=e.next;)r+=t+e.data;return r},n.prototype.concat=function(t){if(0===this.length)return i.alloc(0);if(1===this.length)return this.head.data;for(var e=i.allocUnsafe(t>>>0),r=this.head,n=0;r;)r.data.copy(e,n),n+=r.data.length,r=r.next;return e}},{buffer:5,"buffer-shims":4}],50:[function(t,e,r){e.exports=t("./lib/_stream_passthrough.js")},{"./lib/_stream_passthrough.js":45}],51:[function(t,e,r){(function(n){var i=function(){try{return t("stream")}catch(e){}}();r=e.exports=t("./lib/_stream_readable.js"),r.Stream=i||r,r.Readable=r,r.Writable=t("./lib/_stream_writable.js"),r.Duplex=t("./lib/_stream_duplex.js"),r.Transform=t("./lib/_stream_transform.js"),r.PassThrough=t("./lib/_stream_passthrough.js"),!n.browser&&"disable"===n.env.READABLE_STREAM&&i&&(e.exports=i)}).call(this,t("_process"))},{"./lib/_stream_duplex.js":44,"./lib/_stream_passthrough.js":45,"./lib/_stream_readable.js":46,"./lib/_stream_transform.js":47,"./lib/_stream_writable.js":48,_process:42}],52:[function(t,e,r){e.exports=t("./lib/_stream_transform.js")},{"./lib/_stream_transform.js":47}],53:[function(t,e,r){e.exports=t("./lib/_stream_writable.js")},{"./lib/_stream_writable.js":48}],54:[function(t,e,r){e.exports=function(t){return t.replace(/[-\\^$*+?.()|[\]{}]/g,"\\$&")}},{}],55:[function(t,e,r){function n(){i.call(this)}e.exports=n;var i=t("events").EventEmitter,s=t("inherits");s(n,i),n.Readable=t("readable-stream/readable.js"),n.Writable=t("readable-stream/writable.js"),n.Duplex=t("readable-stream/duplex.js"),n.Transform=t("readable-stream/transform.js"),n.PassThrough=t("readable-stream/passthrough.js"),n.Stream=n,n.prototype.pipe=function(t,e){function r(e){t.writable&&!1===t.write(e)&&u.pause&&u.pause()}function n(){u.readable&&u.resume&&u.resume()}function s(){h||(h=!0,t.end())}function o(){h||(h=!0,"function"==typeof t.destroy&&t.destroy())}function a(t){if(c(),0===i.listenerCount(this,"error"))throw t}function c(){u.removeListener("data",r),t.removeListener("drain",n),u.removeListener("end",s),u.removeListener("close",o),u.removeListener("error",a),t.removeListener("error",a),u.removeListener("end",c),u.removeListener("close",c),t.removeListener("close",c)}var u=this;u.on("data",r),t.on("drain",n),t._isStdio||e&&e.end===!1||(u.on("end",s),u.on("close",o));var h=!1;return u.on("error",a),t.on("error",a),u.on("end",c),u.on("close",c),t.on("close",c),t.emit("pipe",u),t}},{events:28,inherits:38,"readable-stream/duplex.js":43,"readable-stream/passthrough.js":50,"readable-stream/readable.js":51,"readable-stream/transform.js":52,"readable-stream/writable.js":53}],56:[function(t,e,r){function n(t){if(t&&!c(t))throw new Error("Unknown encoding: "+t)}function i(t){return t.toString(this.encoding)}function s(t){this.charReceived=t.length%2,this.charLength=this.charReceived?2:0}function o(t){this.charReceived=t.length%3,this.charLength=this.charReceived?3:0}var a=t("buffer").Buffer,c=a.isEncoding||function(t){switch(t&&t.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}},u=r.StringDecoder=function(t){switch(this.encoding=(t||"utf8").toLowerCase().replace(/[-_]/,""),n(t),this.encoding){case"utf8":this.surrogateSize=3;break;case"ucs2":case"utf16le":this.surrogateSize=2,this.detectIncompleteChar=s;break;case"base64":this.surrogateSize=3,this.detectIncompleteChar=o;break;default:return void(this.write=i)}this.charBuffer=new a(6),this.charReceived=0,this.charLength=0};u.prototype.write=function(t){for(var e="";this.charLength;){var r=t.length>=this.charLength-this.charReceived?this.charLength-this.charReceived:t.length;if(t.copy(this.charBuffer,this.charReceived,0,r),this.charReceived+=r,this.charReceived<this.charLength)return"";t=t.slice(r,t.length),e=this.charBuffer.slice(0,this.charLength).toString(this.encoding);var n=e.charCodeAt(e.length-1);if(!(n>=55296&&n<=56319)){if(this.charReceived=this.charLength=0,0===t.length)return e;break}this.charLength+=this.surrogateSize,e=""}this.detectIncompleteChar(t);var i=t.length;this.charLength&&(t.copy(this.charBuffer,0,t.length-this.charReceived,i),i-=this.charReceived),e+=t.toString(this.encoding,0,i);var i=e.length-1,n=e.charCodeAt(i);if(n>=55296&&n<=56319){var s=this.surrogateSize;return this.charLength+=s,this.charReceived+=s,this.charBuffer.copy(this.charBuffer,s,0,s),t.copy(this.charBuffer,0,0,s),e.substring(0,i)}return e},u.prototype.detectIncompleteChar=function(t){for(var e=t.length>=3?3:t.length;e>0;e--){var r=t[t.length-e];if(1==e&&r>>5==6){this.charLength=2;break}if(e<=2&&r>>4==14){this.charLength=3;break}if(e<=3&&r>>3==30){this.charLength=4;break}}this.charReceived=e},u.prototype.end=function(t){var e="";if(t&&t.length&&(e=this.write(t)),this.charReceived){var r=this.charReceived,n=this.charBuffer,i=this.encoding;e+=n.slice(0,r).toString(i)}return e}},{buffer:5}],57:[function(t,e,r){(function(t){function r(t,e){function r(){if(!i){if(n("throwDeprecation"))throw new Error(e);n("traceDeprecation")?console.trace(e):console.warn(e),i=!0}return t.apply(this,arguments)}if(n("noDeprecation"))return t;var i=!1;return r}function n(e){try{if(!t.localStorage)return!1}catch(r){return!1}var n=t.localStorage[e];return null!=n&&"true"===String(n).toLowerCase()}e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],58:[function(t,e,r){function n(){for(var t={},e=0;e<arguments.length;e++){var r=arguments[e];for(var n in r)i.call(r,n)&&(t[n]=r[n])}return t}e.exports=n;var i=Object.prototype.hasOwnProperty},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js
deleted file mode 100644
index 74d08168922..00000000000
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js
+++ /dev/null
@@ -1,2765 +0,0 @@
-var require = function (file, cwd) {
-    var resolved = require.resolve(file, cwd || '/');
-    var mod = require.modules[resolved];
-    if (!mod) throw new Error(
-        'Failed to resolve module ' + file + ', tried ' + resolved
-    );
-    var res = mod._cached ? mod._cached : mod();
-    return res;
-}
-
-require.paths = [];
-require.modules = {};
-require.extensions = [".js",".coffee"];
-
-require._core = {
-    'assert': true,
-    'events': true,
-    'fs': true,
-    'path': true,
-    'vm': true
-};
-
-require.resolve = (function () {
-    return function (x, cwd) {
-        if (!cwd) cwd = '/';
-        
-        if (require._core[x]) return x;
-        var path = require.modules.path();
-        var y = cwd || '.';
-        
-        if (x.match(/^(?:\.\.?\/|\/)/)) {
-            var m = loadAsFileSync(path.resolve(y, x))
-                || loadAsDirectorySync(path.resolve(y, x));
-            if (m) return m;
-        }
-        
-        var n = loadNodeModulesSync(x, y);
-        if (n) return n;
-        
-        throw new Error("Cannot find module '" + x + "'");
-        
-        function loadAsFileSync (x) {
-            if (require.modules[x]) {
-                return x;
-            }
-            
-            for (var i = 0; i < require.extensions.length; i++) {
-                var ext = require.extensions[i];
-                if (require.modules[x + ext]) return x + ext;
-            }
-        }
-        
-        function loadAsDirectorySync (x) {
-            x = x.replace(/\/+$/, '');
-            var pkgfile = x + '/package.json';
-            if (require.modules[pkgfile]) {
-                var pkg = require.modules[pkgfile]();
-                var b = pkg.browserify;
-                if (typeof b === 'object' && b.main) {
-                    var m = loadAsFileSync(path.resolve(x, b.main));
-                    if (m) return m;
-                }
-                else if (typeof b === 'string') {
-                    var m = loadAsFileSync(path.resolve(x, b));
-                    if (m) return m;
-                }
-                else if (pkg.main) {
-                    var m = loadAsFileSync(path.resolve(x, pkg.main));
-                    if (m) return m;
-                }
-            }
-            
-            return loadAsFileSync(x + '/index');
-        }
-        
-        function loadNodeModulesSync (x, start) {
-            var dirs = nodeModulesPathsSync(start);
-            for (var i = 0; i < dirs.length; i++) {
-                var dir = dirs[i];
-                var m = loadAsFileSync(dir + '/' + x);
-                if (m) return m;
-                var n = loadAsDirectorySync(dir + '/' + x);
-                if (n) return n;
-            }
-            
-            var m = loadAsFileSync(x);
-            if (m) return m;
-        }
-        
-        function nodeModulesPathsSync (start) {
-            var parts;
-            if (start === '/') parts = [ '' ];
-            else parts = path.normalize(start).split('/');
-            
-            var dirs = [];
-            for (var i = parts.length - 1; i >= 0; i--) {
-                if (parts[i] === 'node_modules') continue;
-                var dir = parts.slice(0, i + 1).join('/') + '/node_modules';
-                dirs.push(dir);
-            }
-            
-            return dirs;
-        }
-    };
-})();
-
-require.alias = function (from, to) {
-    var path = require.modules.path();
-    var res = null;
-    try {
-        res = require.resolve(from + '/package.json', '/');
-    }
-    catch (err) {
-        res = require.resolve(from, '/');
-    }
-    var basedir = path.dirname(res);
-    
-    var keys = (Object.keys || function (obj) {
-        var res = [];
-        for (var key in obj) res.push(key)
-        return res;
-    })(require.modules);
-    
-    for (var i = 0; i < keys.length; i++) {
-        var key = keys[i];
-        if (key.slice(0, basedir.length + 1) === basedir + '/') {
-            var f = key.slice(basedir.length);
-            require.modules[to + f] = require.modules[basedir + f];
-        }
-        else if (key === basedir) {
-            require.modules[to] = require.modules[basedir];
-        }
-    }
-};
-
-require.define = function (filename, fn) {
-    var dirname = require._core[filename]
-        ? ''
-        : require.modules.path().dirname(filename)
-    ;
-    
-    var require_ = function (file) {
-        return require(file, dirname)
-    };
-    require_.resolve = function (name) {
-        return require.resolve(name, dirname);
-    };
-    require_.modules = require.modules;
-    require_.define = require.define;
-    var module_ = { exports : {} };
-    
-    require.modules[filename] = function () {
-        require.modules[filename]._cached = module_.exports;
-        fn.call(
-            module_.exports,
-            require_,
-            module_,
-            module_.exports,
-            dirname,
-            filename
-        );
-        require.modules[filename]._cached = module_.exports;
-        return module_.exports;
-    };
-};
-
-if (typeof process === 'undefined') process = {};
-
-if (!process.nextTick) process.nextTick = (function () {
-    var queue = [];
-    var canPost = typeof window !== 'undefined'
-        && window.postMessage && window.addEventListener
-    ;
-    
-    if (canPost) {
-        window.addEventListener('message', function (ev) {
-            if (ev.source === window && ev.data === 'browserify-tick') {
-                ev.stopPropagation();
-                if (queue.length > 0) {
-                    var fn = queue.shift();
-                    fn();
-                }
-            }
-        }, true);
-    }
-    
-    return function (fn) {
-        if (canPost) {
-            queue.push(fn);
-            window.postMessage('browserify-tick', '*');
-        }
-        else setTimeout(fn, 0);
-    };
-})();
-
-if (!process.title) process.title = 'browser';
-
-if (!process.binding) process.binding = function (name) {
-    if (name === 'evals') return require('vm')
-    else throw new Error('No such module')
-};
-
-if (!process.cwd) process.cwd = function () { return '.' };
-
-require.define("path", function (require, module, exports, __dirname, __filename) {
-    function filter (xs, fn) {
-    var res = [];
-    for (var i = 0; i < xs.length; i++) {
-        if (fn(xs[i], i, xs)) res.push(xs[i]);
-    }
-    return res;
-}
-
-// resolves . and .. elements in a path array with directory names there
-// must be no slashes, empty elements, or device names (c:\) in the array
-// (so also no leading and trailing slashes - it does not distinguish
-// relative and absolute paths)
-function normalizeArray(parts, allowAboveRoot) {
-  // if the path tries to go above the root, `up` ends up > 0
-  var up = 0;
-  for (var i = parts.length; i >= 0; i--) {
-    var last = parts[i];
-    if (last == '.') {
-      parts.splice(i, 1);
-    } else if (last === '..') {
-      parts.splice(i, 1);
-      up++;
-    } else if (up) {
-      parts.splice(i, 1);
-      up--;
-    }
-  }
-
-  // if the path is allowed to go above the root, restore leading ..s
-  if (allowAboveRoot) {
-    for (; up--; up) {
-      parts.unshift('..');
-    }
-  }
-
-  return parts;
-}
-
-// Regex to split a filename into [*, dir, basename, ext]
-// posix version
-var splitPathRe = /^(.+\/(?!$)|\/)?((?:.+?)?(\.[^.]*)?)$/;
-
-// path.resolve([from ...], to)
-// posix version
-exports.resolve = function() {
-var resolvedPath = '',
-    resolvedAbsolute = false;
-
-for (var i = arguments.length; i >= -1 && !resolvedAbsolute; i--) {
-  var path = (i >= 0)
-      ? arguments[i]
-      : process.cwd();
-
-  // Skip empty and invalid entries
-  if (typeof path !== 'string' || !path) {
-    continue;
-  }
-
-  resolvedPath = path + '/' + resolvedPath;
-  resolvedAbsolute = path.charAt(0) === '/';
-}
-
-// At this point the path should be resolved to a full absolute path, but
-// handle relative paths to be safe (might happen when process.cwd() fails)
-
-// Normalize the path
-resolvedPath = normalizeArray(filter(resolvedPath.split('/'), function(p) {
-    return !!p;
-  }), !resolvedAbsolute).join('/');
-
-  return ((resolvedAbsolute ? '/' : '') + resolvedPath) || '.';
-};
-
-// path.normalize(path)
-// posix version
-exports.normalize = function(path) {
-var isAbsolute = path.charAt(0) === '/',
-    trailingSlash = path.slice(-1) === '/';
-
-// Normalize the path
-path = normalizeArray(filter(path.split('/'), function(p) {
-    return !!p;
-  }), !isAbsolute).join('/');
-
-  if (!path && !isAbsolute) {
-    path = '.';
-  }
-  if (path && trailingSlash) {
-    path += '/';
-  }
-  
-  return (isAbsolute ? '/' : '') + path;
-};
-
-
-// posix version
-exports.join = function() {
-  var paths = Array.prototype.slice.call(arguments, 0);
-  return exports.normalize(filter(paths, function(p, index) {
-    return p && typeof p === 'string';
-  }).join('/'));
-};
-
-
-exports.dirname = function(path) {
-  var dir = splitPathRe.exec(path)[1] || '';
-  var isWindows = false;
-  if (!dir) {
-    // No dirname
-    return '.';
-  } else if (dir.length === 1 ||
-      (isWindows && dir.length <= 3 && dir.charAt(1) === ':')) {
-    // It is just a slash or a drive letter with a slash
-    return dir;
-  } else {
-    // It is a full dirname, strip trailing slash
-    return dir.substring(0, dir.length - 1);
-  }
-};
-
-
-exports.basename = function(path, ext) {
-  var f = splitPathRe.exec(path)[2] || '';
-  // TODO: make this comparison case-insensitive on windows?
-  if (ext && f.substr(-1 * ext.length) === ext) {
-    f = f.substr(0, f.length - ext.length);
-  }
-  return f;
-};
-
-
-exports.extname = function(path) {
-  return splitPathRe.exec(path)[3] || '';
-};
-
-});
-
-require.define("/shred.js", function (require, module, exports, __dirname, __filename) {
-    // Shred is an HTTP client library intended to simplify the use of Node's
-// built-in HTTP library. In particular, we wanted to make it easier to interact
-// with HTTP-based APIs.
-// 
-// See the [examples](./examples.html) for more details.
-
-// Ax is a nice logging library we wrote. You can use any logger, providing it
-// has `info`, `warn`, `debug`, and `error` methods that take a string.
-var Ax = require("ax")
-  , CookieJarLib = require( "cookiejar" )
-  , CookieJar = CookieJarLib.CookieJar
-;
-
-// Shred takes some options, including a logger and request defaults.
-
-var Shred = function(options) {
-  options = (options||{});
-  this.agent = options.agent;
-  this.defaults = options.defaults||{};
-  this.log = options.logger||(new Ax({ level: "info" }));
-  this._sharedCookieJar = new CookieJar();
-  this.logCurl = options.logCurl || false;
-};
-
-// Most of the real work is done in the request and reponse classes.
- 
-Shred.Request = require("./shred/request");
-Shred.Response = require("./shred/response");
-
-// The `request` method kicks off a new request, instantiating a new `Request`
-// object and passing along whatever default options we were given.
-
-Shred.prototype = {
-  request: function(options) {
-    options.logger = this.log;
-    options.logCurl = options.logCurl || this.logCurl;
-    options.cookieJar = ( 'cookieJar' in options ) ? options.cookieJar : this._sharedCookieJar; // let them set cookieJar = null
-    options.agent = options.agent || this.agent;
-    // fill in default options
-    for (var key in this.defaults) {
-      if (this.defaults.hasOwnProperty(key) && !options[key]) {
-        options[key] = this.defaults[key]
-      }
-    }
-    return new Shred.Request(options);
-  }
-};
-
-// Define a bunch of convenience methods so that you don't have to include
-// a `method` property in your request options.
-
-"get put post delete".split(" ").forEach(function(method) {
-  Shred.prototype[method] = function(options) {
-    options.method = method;
-    return this.request(options);
-  };
-});
-
-
-module.exports = Shred;
-
-});
-
-require.define("/node_modules/ax/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"./lib/ax.js"}
-});
-
-require.define("/node_modules/ax/lib/ax.js", function (require, module, exports, __dirname, __filename) {
-    var inspect = require("util").inspect
-  , fs = require("fs")
-;
-
-
-// this is a quick-and-dirty logger. there are other nicer loggers out there
-// but the ones i found were also somewhat involved. this one has a Ruby
-// logger type interface
-//
-// we can easily replace this, provide the info, debug, etc. methods are the
-// same. or, we can change Haiku to use a more standard node.js interface
-
-var format = function(level,message) {
-  var debug = (level=="debug"||level=="error");
-  if (!message) { return message.toString(); }
-  if (typeof(message) == "object") {
-    if (message instanceof Error && debug) {
-      return message.stack;
-    } else {
-      return inspect(message);
-    }
-  } else {
-    return message.toString();
-  }
-};
-
-var noOp = function(message) { return this; }
-var makeLogger = function(level,fn) {
-  return function(message) { 
-    this.stream.write(this.format(level, message)+"\n");
-    return this;
-  }
-};
-
-var Logger = function(options) {
-  var logger = this;
-  var options = options||{};
-
-  // Default options
-  options.level = options.level || "info";
-  options.timestamp = options.timestamp || true;
-  options.prefix = options.prefix || "";
-  logger.options = options;
-
-  // Allows a prefix to be added to the message.
-  //
-  //    var logger = new Ax({ module: 'Haiku' })
-  //    logger.warn('this is going to be awesome!');
-  //    //=> Haiku: this is going to be awesome!
-  //
-  if (logger.options.module){
-    logger.options.prefix = logger.options.module;
-  }
-
-  // Write to stderr or a file
-  if (logger.options.file){
-    logger.stream = fs.createWriteStream(logger.options.file, {"flags": "a"});
-  } else {
-      if(process.title === "node")
-    logger.stream = process.stderr;
-      else if(process.title === "browser")
-    logger.stream = function () {
-      // Work around weird console context issue: http://code.google.com/p/chromium/issues/detail?id=48662
-      return console[logger.options.level].apply(console, arguments);
-    };
-  }
-
-  switch(logger.options.level){
-    case 'debug':
-      ['debug', 'info', 'warn'].forEach(function (level) {
-        logger[level] = Logger.writer(level);
-      });
-    case 'info':
-      ['info', 'warn'].forEach(function (level) {
-        logger[level] = Logger.writer(level);
-      });
-    case 'warn':
-      logger.warn = Logger.writer('warn');
-  }
-}
-
-// Used to define logger methods
-Logger.writer = function(level){
-  return function(message){
-    var logger = this;
-
-    if(process.title === "node")
-  logger.stream.write(logger.format(level, message) + '\n');
-    else if(process.title === "browser")
-  logger.stream(logger.format(level, message) + '\n');
-
-  };
-}
-
-
-Logger.prototype = {
-  info: function(){},
-  debug: function(){},
-  warn: function(){},
-  error: Logger.writer('error'),
-  format: function(level, message){
-    if (! message) return '';
-
-    var logger = this
-      , prefix = logger.options.prefix
-      , timestamp = logger.options.timestamp ? " " + (new Date().toISOString()) : ""
-    ;
-
-    return (prefix + timestamp + ": " + message);
-  }
-};
-
-module.exports = Logger;
-
-});
-
-require.define("util", function (require, module, exports, __dirname, __filename) {
-    // todo
-
-});
-
-require.define("fs", function (require, module, exports, __dirname, __filename) {
-    // nothing to see here... no file methods for the browser
-
-});
-
-require.define("/node_modules/cookiejar/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"cookiejar.js"}
-});
-
-require.define("/node_modules/cookiejar/cookiejar.js", function (require, module, exports, __dirname, __filename) {
-    exports.CookieAccessInfo=CookieAccessInfo=function CookieAccessInfo(domain,path,secure,script) {
-    if(this instanceof CookieAccessInfo) {
-      this.domain=domain||undefined;
-      this.path=path||"/";
-      this.secure=!!secure;
-      this.script=!!script;
-      return this;
-    }
-    else {
-        return new CookieAccessInfo(domain,path,secure,script)    
-    }
-}
-
-exports.Cookie=Cookie=function Cookie(cookiestr) {
-  if(cookiestr instanceof Cookie) {
-    return cookiestr;
-  }
-    else {
-        if(this instanceof Cookie) {
-          this.name = null;
-          this.value = null;
-          this.expiration_date = Infinity;
-          this.path = "/";
-          this.domain = null;
-          this.secure = false; //how to define?
-          this.noscript = false; //httponly
-          if(cookiestr) {
-            this.parse(cookiestr)
-          }
-          return this;
-        }
-        return new Cookie(cookiestr)
-    }
-}
-
-Cookie.prototype.toString = function toString() {
-  var str=[this.name+"="+this.value];
-  if(this.expiration_date !== Infinity) {
-    str.push("expires="+(new Date(this.expiration_date)).toGMTString());
-  }
-  if(this.domain) {
-    str.push("domain="+this.domain);
-  }
-  if(this.path) {
-    str.push("path="+this.path);
-  }
-  if(this.secure) {
-    str.push("secure");
-  }
-  if(this.noscript) {
-    str.push("httponly");
-  }
-  return str.join("; ");
-}
-
-Cookie.prototype.toValueString = function toValueString() {
-  return this.name+"="+this.value;
-}
-
-var cookie_str_splitter=/[:](?=\s*[a-zA-Z0-9_\-]+\s*[=])/g
-Cookie.prototype.parse = function parse(str) {
-  if(this instanceof Cookie) {
-      var parts=str.split(";")
-      , pair=parts[0].match(/([^=]+)=((?:.|\n)*)/)
-      , key=pair[1]
-      , value=pair[2];
-      this.name = key;
-      this.value = value;
-    
-      for(var i=1;i<parts.length;i++) {
-        pair=parts[i].match(/([^=]+)(?:=((?:.|\n)*))?/)
-        , key=pair[1].trim().toLowerCase()
-        , value=pair[2];
-        switch(key) {
-          case "httponly":
-            this.noscript = true;
-          break;
-          case "expires":
-            this.expiration_date = value
-              ? Number(Date.parse(value))
-              : Infinity;
-          break;
-          case "path":
-            this.path = value
-              ? value.trim()
-              : "";
-          break;
-          case "domain":
-            this.domain = value
-              ? value.trim()
-              : "";
-          break;
-          case "secure":
-            this.secure = true;
-          break
-        }
-      }
-    
-      return this;
-  }
-    return new Cookie().parse(str)
-}
-
-Cookie.prototype.matches = function matches(access_info) {
-  if(this.noscript && access_info.script
-  || this.secure && !access_info.secure
-  || !this.collidesWith(access_info)) {
-    return false
-  }
-  return true;
-}
-
-Cookie.prototype.collidesWith = function collidesWith(access_info) {
-  if((this.path && !access_info.path) || (this.domain && !access_info.domain)) {
-    return false
-  }
-  if(this.path && access_info.path.indexOf(this.path) !== 0) {
-    return false;
-  }
-  if (this.domain===access_info.domain) {
-    return true;
-  }
-  else if(this.domain && this.domain.charAt(0)===".")
-  {
-    var wildcard=access_info.domain.indexOf(this.domain.slice(1))
-    if(wildcard===-1 || wildcard!==access_info.domain.length-this.domain.length+1) {
-      return false;
-    }
-  }
-  else if(this.domain){
-    return false
-  }
-  return true;
-}
-
-exports.CookieJar=CookieJar=function CookieJar() {
-  if(this instanceof CookieJar) {
-      var cookies = {} //name: [Cookie]
-    
-      this.setCookie = function setCookie(cookie) {
-        cookie = Cookie(cookie);
-        //Delete the cookie if the set is past the current time
-        var remove = cookie.expiration_date <= Date.now();
-        if(cookie.name in cookies) {
-          var cookies_list = cookies[cookie.name];
-          for(var i=0;i<cookies_list.length;i++) {
-            var collidable_cookie = cookies_list[i];
-            if(collidable_cookie.collidesWith(cookie)) {
-              if(remove) {
-                cookies_list.splice(i,1);
-                if(cookies_list.length===0) {
-                  delete cookies[cookie.name]
-                }
-                return false;
-              }
-              else {
-                return cookies_list[i]=cookie;
-              }
-            }
-          }
-          if(remove) {
-            return false;
-          }
-          cookies_list.push(cookie);
-          return cookie;
-        }
-        else if(remove){
-          return false;
-        }
-        else {
-          return cookies[cookie.name]=[cookie];
-        }
-      }
-      //returns a cookie
-      this.getCookie = function getCookie(cookie_name,access_info) {
-        var cookies_list = cookies[cookie_name];
-        for(var i=0;i<cookies_list.length;i++) {
-          var cookie = cookies_list[i];
-          if(cookie.expiration_date <= Date.now()) {
-            if(cookies_list.length===0) {
-              delete cookies[cookie.name]
-            }
-            continue;
-          }
-          if(cookie.matches(access_info)) {
-            return cookie;
-          }
-        }
-      }
-      //returns a list of cookies
-      this.getCookies = function getCookies(access_info) {
-        var matches=[];
-        for(var cookie_name in cookies) {
-          var cookie=this.getCookie(cookie_name,access_info);
-          if (cookie) {
-            matches.push(cookie);
-          }
-        }
-        matches.toString=function toString(){return matches.join(":");}
-            matches.toValueString=function() {return matches.map(function(c){return c.toValueString();}).join(';');}
-        return matches;
-      }
-    
-      return this;
-  }
-    return new CookieJar()
-}
-
-
-//returns list of cookies that were set correctly
-CookieJar.prototype.setCookies = function setCookies(cookies) {
-  cookies=Array.isArray(cookies)
-    ?cookies
-    :cookies.split(cookie_str_splitter);
-  var successful=[]
-  for(var i=0;i<cookies.length;i++) {
-    var cookie = Cookie(cookies[i]);
-    if(this.setCookie(cookie)) {
-      successful.push(cookie);
-    }
-  }
-  return successful;
-}
-
-});
-
-require.define("/shred/request.js", function (require, module, exports, __dirname, __filename) {
-    // The request object encapsulates a request, creating a Node.js HTTP request and
-// then handling the response.
-
-var HTTP = require("http")
-  , HTTPS = require("https")
-  , parseUri = require("./parseUri")
-  , Emitter = require('events').EventEmitter
-  , sprintf = require("sprintf").sprintf
-  , Response = require("./response")
-  , HeaderMixins = require("./mixins/headers")
-  , Content = require("./content")
-;
-
-var STATUS_CODES = HTTP.STATUS_CODES || {
-    100 : 'Continue',
-    101 : 'Switching Protocols',
-    102 : 'Processing', // RFC 2518, obsoleted by RFC 4918
-    200 : 'OK',
-    201 : 'Created',
-    202 : 'Accepted',
-    203 : 'Non-Authoritative Information',
-    204 : 'No Content',
-    205 : 'Reset Content',
-    206 : 'Partial Content',
-    207 : 'Multi-Status', // RFC 4918
-    300 : 'Multiple Choices',
-    301 : 'Moved Permanently',
-    302 : 'Moved Temporarily',
-    303 : 'See Other',
-    304 : 'Not Modified',
-    305 : 'Use Proxy',
-    307 : 'Temporary Redirect',
-    400 : 'Bad Request',
-    401 : 'Unauthorized',
-    402 : 'Payment Required',
-    403 : 'Forbidden',
-    404 : 'Not Found',
-    405 : 'Method Not Allowed',
-    406 : 'Not Acceptable',
-    407 : 'Proxy Authentication Required',
-    408 : 'Request Time-out',
-    409 : 'Conflict',
-    410 : 'Gone',
-    411 : 'Length Required',
-    412 : 'Precondition Failed',
-    413 : 'Request Entity Too Large',
-    414 : 'Request-URI Too Large',
-    415 : 'Unsupported Media Type',
-    416 : 'Requested Range Not Satisfiable',
-    417 : 'Expectation Failed',
-    418 : 'I\'m a teapot', // RFC 2324
-    422 : 'Unprocessable Entity', // RFC 4918
-    423 : 'Locked', // RFC 4918
-    424 : 'Failed Dependency', // RFC 4918
-    425 : 'Unordered Collection', // RFC 4918
-    426 : 'Upgrade Required', // RFC 2817
-    500 : 'Internal Server Error',
-    501 : 'Not Implemented',
-    502 : 'Bad Gateway',
-    503 : 'Service Unavailable',
-    504 : 'Gateway Time-out',
-    505 : 'HTTP Version not supported',
-    506 : 'Variant Also Negotiates', // RFC 2295
-    507 : 'Insufficient Storage', // RFC 4918
-    509 : 'Bandwidth Limit Exceeded',
-    510 : 'Not Extended' // RFC 2774
-};
-
-// The Shred object itself constructs the `Request` object. You should rarely
-// need to do this directly.
-
-var Request = function(options) {
-  this.log = options.logger;
-  this.cookieJar = options.cookieJar;
-  this.encoding = options.encoding;
-  this.logCurl = options.logCurl;
-  processOptions(this,options||{});
-  createRequest(this);
-};
-
-// A `Request` has a number of properties, many of which help with details like
-// URL parsing or defaulting the port for the request.
-
-Object.defineProperties(Request.prototype, {
-
-// - **url**. You can set the `url` property with a valid URL string and all the
-//   URL-related properties (host, port, etc.) will be automatically set on the
-//   request object.
-
-  url: {
-    get: function() {
-      if (!this.scheme) { return null; }
-      return sprintf("%s://%s:%s%s",
-          this.scheme, this.host, this.port,
-          (this.proxy ? "/" : this.path) +
-          (this.query ? ("?" + this.query) : ""));
-    },
-    set: function(_url) {
-      _url = parseUri(_url);
-      this.scheme = _url.protocol;
-      this.host = _url.host;
-      this.port = _url.port;
-      this.path = _url.path;
-      this.query = _url.query;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **headers**. Returns a hash representing the request headers. You can't set
-//   this directly, only get it. You can add or modify headers by using the
-//   `setHeader` or `setHeaders` method. This ensures that the headers are
-//   normalized - that is, you don't accidentally send `Content-Type` and
-//   `content-type` headers. Keep in mind that if you modify the returned hash,
-//   it will *not* modify the request headers.
-
-  headers: {
-    get: function() {
-      return this.getHeaders();
-    },
-    enumerable: true
-  },
-
-// - **port**. Unless you set the `port` explicitly or include it in the URL, it
-//   will default based on the scheme.
-
-  port: {
-    get: function() {
-      if (!this._port) {
-        switch(this.scheme) {
-          case "https": return this._port = 443;
-          case "http":
-          default: return this._port = 80;
-        }
-      }
-      return this._port;
-    },
-    set: function(value) { this._port = value; return this; },
-    enumerable: true
-  },
-
-// - **method**. The request method - `get`, `put`, `post`, etc. that will be
-//   used to make the request. Defaults to `get`.
-
-  method: {
-    get: function() {
-      return this._method = (this._method||"GET");
-    },
-    set: function(value) {
-      this._method = value; return this;
-    },
-    enumerable: true
-  },
-
-// - **query**. Can be set either with a query string or a hash (object). Get
-//   will always return a properly escaped query string or null if there is no
-//   query component for the request.
-
-  query: {
-    get: function() {return this._query;},
-    set: function(value) {
-      var stringify = function (hash) {
-        var query = "";
-        for (var key in hash) {
-          query += encodeURIComponent(key) + '=' + encodeURIComponent(hash[key]) + '&';
-        }
-        // Remove the last '&'
-        query = query.slice(0, -1);
-        return query;
-      }
-
-      if (value) {
-        if (typeof value === 'object') {
-          value = stringify(value);
-        }
-        this._query = value;
-      } else {
-        this._query = "";
-      }
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **parameters**. This will return the query parameters in the form of a hash
-//   (object).
-
-  parameters: {
-    get: function() { return QueryString.parse(this._query||""); },
-    enumerable: true
-  },
-
-// - **content**. (Aliased as `body`.) Set this to add a content entity to the
-//   request. Attempts to use the `content-type` header to determine what to do
-//   with the content value. Get this to get back a [`Content`
-//   object](./content.html).
-
-  body: {
-    get: function() { return this._body; },
-    set: function(value) {
-      this._body = new Content({
-        data: value,
-        type: this.getHeader("Content-Type")
-      });
-      this.setHeader("Content-Type",this.content.type);
-      this.setHeader("Content-Length",this.content.length);
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **timeout**. Used to determine how long to wait for a response. Does not
-//   distinguish between connect timeouts versus request timeouts. Set either in
-//   milliseconds or with an object with temporal attributes (hours, minutes,
-//   seconds) and convert it into milliseconds. Get will always return
-//   milliseconds.
-
-  timeout: {
-    get: function() { return this._timeout; }, // in milliseconds
-    set: function(timeout) {
-      var request = this
-        , milliseconds = 0;
-      ;
-      if (!timeout) return this;
-      if (typeof timeout==="number") { milliseconds = timeout; }
-      else {
-        milliseconds = (timeout.milliseconds||0) +
-          (1000 * ((timeout.seconds||0) +
-              (60 * ((timeout.minutes||0) +
-                (60 * (timeout.hours||0))))));
-      }
-      this._timeout = milliseconds;
-      return this;
-    },
-    enumerable: true
-  }
-});
-
-// Alias `body` property to `content`. Since the [content object](./content.html)
-// has a `body` attribute, it's preferable to use `content` since you can then
-// access the raw content data using `content.body`.
-
-Object.defineProperty(Request.prototype,"content",
-    Object.getOwnPropertyDescriptor(Request.prototype, "body"));
-
-// The `Request` object can be pretty overwhelming to view using the built-in
-// Node.js inspect method. We want to make it a bit more manageable. This
-// probably goes [too far in the other
-// direction](https://github.com/spire-io/shred/issues/2).
-
-Request.prototype.inspect = function () {
-  var request = this;
-  var headers = this.format_headers();
-  var summary = ["<Shred Request> ", request.method.toUpperCase(),
-      request.url].join(" ")
-  return [ summary, "- Headers:", headers].join("\n");
-};
-
-Request.prototype.format_headers = function () {
-  var array = []
-  var headers = this._headers
-  for (var key in headers) {
-    if (headers.hasOwnProperty(key)) {
-      var value = headers[key]
-      array.push("\t" + key + ": " + value);
-    }
-  }
-  return array.join("\n");
-};
-
-// Allow chainable 'on's:  shred.get({ ... }).on( ... ).  You can pass in a
-// single function, a pair (event, function), or a hash:
-// { event: function, event: function }
-Request.prototype.on = function (eventOrHash, listener) {
-  var emitter = this.emitter;
-  // Pass in a single argument as a function then make it the default response handler
-  if (arguments.length === 1 && typeof(eventOrHash) === 'function') {
-    emitter.on('response', eventOrHash);
-  } else if (arguments.length === 1 && typeof(eventOrHash) === 'object') {
-    for (var key in eventOrHash) {
-      if (eventOrHash.hasOwnProperty(key)) {
-        emitter.on(key, eventOrHash[key]);
-      }
-    }
-  } else {
-    emitter.on(eventOrHash, listener);
-  }
-  return this;
-};
-
-// Add in the header methods. Again, these ensure we don't get the same header
-// multiple times with different case conventions.
-HeaderMixins.gettersAndSetters(Request);
-
-// `processOptions` is called from the constructor to handle all the work
-// associated with making sure we do our best to ensure we have a valid request.
-
-var processOptions = function(request,options) {
-
-  request.log.debug("Processing request options ..");
-
-  // We'll use `request.emitter` to manage the `on` event handlers.
-  request.emitter = (new Emitter);
-
-  request.agent = options.agent;
-
-  // Set up the handlers ...
-  if (options.on) {
-    for (var key in options.on) {
-      if (options.on.hasOwnProperty(key)) {
-        request.emitter.on(key, options.on[key]);
-      }
-    }
-  }
-
-  // Make sure we were give a URL or a host
-  if (!options.url && !options.host) {
-    request.emitter.emit("request_error",
-        new Error("No url or url options (host, port, etc.)"));
-    return;
-  }
-
-  // Allow for the [use of a proxy](http://www.jmarshall.com/easy/http/#proxies).
-
-  if (options.url) {
-    if (options.proxy) {
-      request.url = options.proxy;
-      request.path = options.url;
-    } else {
-      request.url = options.url;
-    }
-  }
-
-  // Set the remaining options.
-  request.query = options.query||options.parameters||request.query ;
-  request.method = options.method;
-  request.setHeader("user-agent",options.agent||"Shred");
-  request.setHeaders(options.headers);
-
-  if (request.cookieJar) {
-    var cookies = request.cookieJar.getCookies( CookieAccessInfo( request.host, request.path ) );
-    if (cookies.length) {
-      var cookieString = request.getHeader('cookie')||'';
-      for (var cookieIndex = 0; cookieIndex < cookies.length; ++cookieIndex) {
-          if ( cookieString.length && cookieString[ cookieString.length - 1 ] != ';' )
-          {
-              cookieString += ';';
-          }
-          cookieString += cookies[ cookieIndex ].name + '=' + cookies[ cookieIndex ].value + ';';
-      }
-      request.setHeader("cookie", cookieString);
-    }
-  }
-  
-  // The content entity can be set either using the `body` or `content` attributes.
-  if (options.body||options.content) {
-    request.content = options.body||options.content;
-  }
-  request.timeout = options.timeout;
-
-};
-
-// `createRequest` is also called by the constructor, after `processOptions`.
-// This actually makes the request and processes the response, so `createRequest`
-// is a bit of a misnomer.
-
-var createRequest = function(request) {
-  var timeout ;
-
-  request.log.debug("Creating request ..");
-  request.log.debug(request);
-
-  var reqParams = {
-    host: request.host,
-    port: request.port,
-    method: request.method,
-    path: request.path + (request.query ? '?'+request.query : ""),
-    headers: request.getHeaders(),
-    // Node's HTTP/S modules will ignore this, but we are using the
-    // browserify-http module in the browser for both HTTP and HTTPS, and this
-    // is how you differentiate the two.
-    scheme: request.scheme,
-    // Use a provided agent.  'Undefined' is the default, which uses a global
-    // agent.
-    agent: request.agent
-  };
-
-  if (request.logCurl) {
-    logCurl(request);
-  }
-
-  var http = request.scheme == "http" ? HTTP : HTTPS;
-
-  // Set up the real request using the selected library. The request won't be
-  // sent until we call `.end()`.
-  request._raw = http.request(reqParams, function(response) {
-    request.log.debug("Received response ..");
-
-    // We haven't timed out and we have a response, so make sure we clear the
-    // timeout so it doesn't fire while we're processing the response.
-    clearTimeout(timeout);
-
-    // Construct a Shred `Response` object from the response. This will stream
-    // the response, thus the need for the callback. We can access the response
-    // entity safely once we're in the callback.
-    response = new Response(response, request, function(response) {
-
-      // Set up some event magic. The precedence is given first to
-      // status-specific handlers, then to responses for a given event, and then
-      // finally to the more general `response` handler. In the last case, we
-      // need to first make sure we're not dealing with a a redirect.
-      var emit = function(event) {
-        var emitter = request.emitter;
-        var textStatus = STATUS_CODES[response.status] ? STATUS_CODES[response.status].toLowerCase() : null;
-        if (emitter.listeners(response.status).length > 0 || emitter.listeners(textStatus).length > 0) {
-          emitter.emit(response.status, response);
-          emitter.emit(textStatus, response);
-        } else {
-          if (emitter.listeners(event).length>0) {
-            emitter.emit(event, response);
-          } else if (!response.isRedirect) {
-            emitter.emit("response", response);
-            //console.warn("Request has no event listener for status code " + response.status);
-          }
-        }
-      };
-
-      // Next, check for a redirect. We simply repeat the request with the URL
-      // given in the `Location` header. We fire a `redirect` event.
-      if (response.isRedirect) {
-        request.log.debug("Redirecting to "
-            + response.getHeader("Location"));
-        request.url = response.getHeader("Location");
-        emit("redirect");
-        createRequest(request);
-
-      // Okay, it's not a redirect. Is it an error of some kind?
-      } else if (response.isError) {
-        emit("error");
-      } else {
-      // It looks like we're good shape. Trigger the `success` event.
-        emit("success");
-      }
-    });
-  });
-
-  // We're still setting up the request. Next, we're going to handle error cases
-  // where we have no response. We don't emit an error event because that event
-  // takes a response. We don't response handlers to have to check for a null
-  // value. However, we [should introduce a different event
-  // type](https://github.com/spire-io/shred/issues/3) for this type of error.
-  request._raw.on("error", function(error) {
-    request.emitter.emit("request_error", error);
-  });
-
-  request._raw.on("socket", function(socket) {
-    request.emitter.emit("socket", socket);
-  });
-
-  // TCP timeouts should also trigger the "response_error" event.
-  request._raw.on('socket', function () {
-    request._raw.socket.on('timeout', function () {
-      // This should trigger the "error" event on the raw request, which will
-      // trigger the "response_error" on the shred request.
-      request._raw.abort();
-    });
-  });
-
-
-  // We're almost there. Next, we need to write the request entity to the
-  // underlying request object.
-  if (request.content) {
-    request.log.debug("Streaming body: '" +
-        request.content.data.slice(0,59) + "' ... ");
-    request._raw.write(request.content.data);
-  }
-
-  // Finally, we need to set up the timeout. We do this last so that we don't
-  // start the clock ticking until the last possible moment.
-  if (request.timeout) {
-    timeout = setTimeout(function() {
-      request.log.debug("Timeout fired, aborting request ...");
-      request._raw.abort();
-      request.emitter.emit("timeout", request);
-    },request.timeout);
-  }
-
-  // The `.end()` method will cause the request to fire. Technically, it might
-  // have already sent the headers and body.
-  request.log.debug("Sending request ...");
-  request._raw.end();
-};
-
-// Logs the curl command for the request.
-var logCurl = function (req) {
-  var headers = req.getHeaders();
-  var headerString = "";
-
-  for (var key in headers) {
-    headerString += '-H "' + key + ": " + headers[key] + '" ';
-  }
-
-  var bodyString = ""
-
-  if (req.content) {
-    bodyString += "-d '" + req.content.body + "' ";
-  }
-
-  var query = req.query ? '?' + req.query : "";
-
-  console.log("curl " +
-    "-X " + req.method.toUpperCase() + " " +
-    req.scheme + "://" + req.host + ":" + req.port + req.path + query + " " +
-    headerString +
-    bodyString
-  );
-};
-
-
-module.exports = Request;
-
-});
-
-require.define("http", function (require, module, exports, __dirname, __filename) {
-    // todo
-
-});
-
-require.define("https", function (require, module, exports, __dirname, __filename) {
-    // todo
-
-});
-
-require.define("/shred/parseUri.js", function (require, module, exports, __dirname, __filename) {
-    // parseUri 1.2.2
-// (c) Steven Levithan <stevenlevithan.com>
-// MIT License
-
-function parseUri (str) {
-  var o   = parseUri.options,
-    m   = o.parser[o.strictMode ? "strict" : "loose"].exec(str),
-    uri = {},
-    i   = 14;
-
-  while (i--) uri[o.key[i]] = m[i] || "";
-
-  uri[o.q.name] = {};
-  uri[o.key[12]].replace(o.q.parser, function ($0, $1, $2) {
-    if ($1) uri[o.q.name][$1] = $2;
-  });
-
-  return uri;
-};
-
-parseUri.options = {
-  strictMode: false,
-  key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],
-  q:   {
-    name:   "queryKey",
-    parser: /(?:^|&)([^&=]*)=?([^&]*)/g
-  },
-  parser: {
-    strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,
-    loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/
-  }
-};
-
-module.exports = parseUri;
-
-});
-
-require.define("events", function (require, module, exports, __dirname, __filename) {
-    if (!process.EventEmitter) process.EventEmitter = function () {};
-
-var EventEmitter = exports.EventEmitter = process.EventEmitter;
-var isArray = typeof Array.isArray === 'function'
-    ? Array.isArray
-    : function (xs) {
-        return Object.toString.call(xs) === '[object Array]'
-    }
-;
-
-// By default EventEmitters will print a warning if more than
-// 10 listeners are added to it. This is a useful default which
-// helps finding memory leaks.
-//
-// Obviously not all Emitters should be limited to 10. This function allows
-// that to be increased. Set to zero for unlimited.
-var defaultMaxListeners = 10;
-EventEmitter.prototype.setMaxListeners = function(n) {
-  if (!this._events) this._events = {};
-  this._events.maxListeners = n;
-};
-
-
-EventEmitter.prototype.emit = function(type) {
-  // If there is no 'error' event listener then throw.
-  if (type === 'error') {
-    if (!this._events || !this._events.error ||
-        (isArray(this._events.error) && !this._events.error.length))
-    {
-      if (arguments[1] instanceof Error) {
-        throw arguments[1]; // Unhandled 'error' event
-      } else {
-        throw new Error("Uncaught, unspecified 'error' event.");
-      }
-      return false;
-    }
-  }
-
-  if (!this._events) return false;
-  var handler = this._events[type];
-  if (!handler) return false;
-
-  if (typeof handler == 'function') {
-    switch (arguments.length) {
-      // fast cases
-      case 1:
-        handler.call(this);
-        break;
-      case 2:
-        handler.call(this, arguments[1]);
-        break;
-      case 3:
-        handler.call(this, arguments[1], arguments[2]);
-        break;
-      // slower
-      default:
-        var args = Array.prototype.slice.call(arguments, 1);
-        handler.apply(this, args);
-    }
-    return true;
-
-  } else if (isArray(handler)) {
-    var args = Array.prototype.slice.call(arguments, 1);
-
-    var listeners = handler.slice();
-    for (var i = 0, l = listeners.length; i < l; i++) {
-      listeners[i].apply(this, args);
-    }
-    return true;
-
-  } else {
-    return false;
-  }
-};
-
-// EventEmitter is defined in src/node_events.cc
-// EventEmitter.prototype.emit() is also defined there.
-EventEmitter.prototype.addListener = function(type, listener) {
-  if ('function' !== typeof listener) {
-    throw new Error('addListener only takes instances of Function');
-  }
-
-  if (!this._events) this._events = {};
-
-  // To avoid recursion in the case that type == "newListeners"! Before
-  // adding it to the listeners, first emit "newListeners".
-  this.emit('newListener', type, listener);
-
-  if (!this._events[type]) {
-    // Optimize the case of one listener. Don't need the extra array object.
-    this._events[type] = listener;
-  } else if (isArray(this._events[type])) {
-
-    // Check for listener leak
-    if (!this._events[type].warned) {
-      var m;
-      if (this._events.maxListeners !== undefined) {
-        m = this._events.maxListeners;
-      } else {
-        m = defaultMaxListeners;
-      }
-
-      if (m && m > 0 && this._events[type].length > m) {
-        this._events[type].warned = true;
-        console.error('(node) warning: possible EventEmitter memory ' +
-                      'leak detected. %d listeners added. ' +
-                      'Use emitter.setMaxListeners() to increase limit.',
-                      this._events[type].length);
-        console.trace();
-      }
-    }
-
-    // If we've already got an array, just append.
-    this._events[type].push(listener);
-  } else {
-    // Adding the second element, need to change to array.
-    this._events[type] = [this._events[type], listener];
-  }
-
-  return this;
-};
-
-EventEmitter.prototype.on = EventEmitter.prototype.addListener;
-
-EventEmitter.prototype.once = function(type, listener) {
-  var self = this;
-  self.on(type, function g() {
-    self.removeListener(type, g);
-    listener.apply(this, arguments);
-  });
-
-  return this;
-};
-
-EventEmitter.prototype.removeListener = function(type, listener) {
-  if ('function' !== typeof listener) {
-    throw new Error('removeListener only takes instances of Function');
-  }
-
-  // does not use listeners(), so no side effect of creating _events[type]
-  if (!this._events || !this._events[type]) return this;
-
-  var list = this._events[type];
-
-  if (isArray(list)) {
-    var i = list.indexOf(listener);
-    if (i < 0) return this;
-    list.splice(i, 1);
-    if (list.length == 0)
-      delete this._events[type];
-  } else if (this._events[type] === listener) {
-    delete this._events[type];
-  }
-
-  return this;
-};
-
-EventEmitter.prototype.removeAllListeners = function(type) {
-  // does not use listeners(), so no side effect of creating _events[type]
-  if (type && this._events && this._events[type]) this._events[type] = null;
-  return this;
-};
-
-EventEmitter.prototype.listeners = function(type) {
-  if (!this._events) this._events = {};
-  if (!this._events[type]) this._events[type] = [];
-  if (!isArray(this._events[type])) {
-    this._events[type] = [this._events[type]];
-  }
-  return this._events[type];
-};
-
-});
-
-require.define("/node_modules/sprintf/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"./lib/sprintf"}
-});
-
-require.define("/node_modules/sprintf/lib/sprintf.js", function (require, module, exports, __dirname, __filename) {
-    /**
-sprintf() for JavaScript 0.7-beta1
-http://www.diveintojavascript.com/projects/javascript-sprintf
-
-Copyright (c) Alexandru Marasteanu <alexaholic [at) gmail (dot] com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of sprintf() for JavaScript nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL Alexandru Marasteanu BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Changelog:
-2010.11.07 - 0.7-beta1-node
-  - converted it to a node.js compatible module
-
-2010.09.06 - 0.7-beta1
-  - features: vsprintf, support for named placeholders
-  - enhancements: format cache, reduced global namespace pollution
-
-2010.05.22 - 0.6:
- - reverted to 0.4 and fixed the bug regarding the sign of the number 0
- Note:
- Thanks to Raphael Pigulla <raph (at] n3rd [dot) org> (http://www.n3rd.org/)
- who warned me about a bug in 0.5, I discovered that the last update was
- a regress. I appologize for that.
-
-2010.05.09 - 0.5:
- - bug fix: 0 is now preceeded with a + sign
- - bug fix: the sign was not at the right position on padded results (Kamal Abdali)
- - switched from GPL to BSD license
-
-2007.10.21 - 0.4:
- - unit test and patch (David Baird)
-
-2007.09.17 - 0.3:
- - bug fix: no longer throws exception on empty paramenters (Hans Pufal)
-
-2007.09.11 - 0.2:
- - feature: added argument swapping
-
-2007.04.03 - 0.1:
- - initial release
-**/
-
-var sprintf = (function() {
-  function get_type(variable) {
-    return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase();
-  }
-  function str_repeat(input, multiplier) {
-    for (var output = []; multiplier > 0; output[--multiplier] = input) {/* do nothing */}
-    return output.join('');
-  }
-
-  var str_format = function() {
-    if (!str_format.cache.hasOwnProperty(arguments[0])) {
-      str_format.cache[arguments[0]] = str_format.parse(arguments[0]);
-    }
-    return str_format.format.call(null, str_format.cache[arguments[0]], arguments);
-  };
-
-  str_format.format = function(parse_tree, argv) {
-    var cursor = 1, tree_length = parse_tree.length, node_type = '', arg, output = [], i, k, match, pad, pad_character, pad_length;
-    for (i = 0; i < tree_length; i++) {
-      node_type = get_type(parse_tree[i]);
-      if (node_type === 'string') {
-        output.push(parse_tree[i]);
-      }
-      else if (node_type === 'array') {
-        match = parse_tree[i]; // convenience purposes only
-        if (match[2]) { // keyword argument
-          arg = argv[cursor];
-          for (k = 0; k < match[2].length; k++) {
-            if (!arg.hasOwnProperty(match[2][k])) {
-              throw(sprintf('[sprintf] property "%s" does not exist', match[2][k]));
-            }
-            arg = arg[match[2][k]];
-          }
-        }
-        else if (match[1]) { // positional argument (explicit)
-          arg = argv[match[1]];
-        }
-        else { // positional argument (implicit)
-          arg = argv[cursor++];
-        }
-
-        if (/[^s]/.test(match[8]) && (get_type(arg) != 'number')) {
-          throw(sprintf('[sprintf] expecting number but found %s', get_type(arg)));
-        }
-        switch (match[8]) {
-          case 'b': arg = arg.toString(2); break;
-          case 'c': arg = String.fromCharCode(arg); break;
-          case 'd': arg = parseInt(arg, 10); break;
-          case 'e': arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential(); break;
-          case 'f': arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg); break;
-          case 'o': arg = arg.toString(8); break;
-          case 's': arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg); break;
-          case 'u': arg = Math.abs(arg); break;
-          case 'x': arg = arg.toString(16); break;
-          case 'X': arg = arg.toString(16).toUpperCase(); break;
-        }
-        arg = (/[def]/.test(match[8]) && match[3] && arg >= 0 ? '+'+ arg : arg);
-        pad_character = match[4] ? match[4] == '0' ? '0' : match[4].charAt(1) : ' ';
-        pad_length = match[6] - String(arg).length;
-        pad = match[6] ? str_repeat(pad_character, pad_length) : '';
-        output.push(match[5] ? arg + pad : pad + arg);
-      }
-    }
-    return output.join('');
-  };
-
-  str_format.cache = {};
-
-  str_format.parse = function(fmt) {
-    var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
-    while (_fmt) {
-      if ((match = /^[^\x25]+/.exec(_fmt)) !== null) {
-        parse_tree.push(match[0]);
-      }
-      else if ((match = /^\x25{2}/.exec(_fmt)) !== null) {
-        parse_tree.push('%');
-      }
-      else if ((match = /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(_fmt)) !== null) {
-        if (match[2]) {
-          arg_names |= 1;
-          var field_list = [], replacement_field = match[2], field_match = [];
-          if ((field_match = /^([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
-            field_list.push(field_match[1]);
-            while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') {
-              if ((field_match = /^\.([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
-                field_list.push(field_match[1]);
-              }
-              else if ((field_match = /^\[(\d+)\]/.exec(replacement_field)) !== null) {
-                field_list.push(field_match[1]);
-              }
-              else {
-                throw('[sprintf] huh?');
-              }
-            }
-          }
-          else {
-            throw('[sprintf] huh?');
-          }
-          match[2] = field_list;
-        }
-        else {
-          arg_names |= 2;
-        }
-        if (arg_names === 3) {
-          throw('[sprintf] mixing positional and named placeholders is not (yet) supported');
-        }
-        parse_tree.push(match);
-      }
-      else {
-        throw('[sprintf] huh?');
-      }
-      _fmt = _fmt.substring(match[0].length);
-    }
-    return parse_tree;
-  };
-
-  return str_format;
-})();
-
-var vsprintf = function(fmt, argv) {
-  argv.unshift(fmt);
-  return sprintf.apply(null, argv);
-};
-
-exports.sprintf = sprintf;
-exports.vsprintf = vsprintf;
-});
-
-require.define("/shred/response.js", function (require, module, exports, __dirname, __filename) {
-    // The `Response object` encapsulates a Node.js HTTP response.
-
-var Content = require("./content")
-  , HeaderMixins = require("./mixins/headers")
-  , CookieJarLib = require( "cookiejar" )
-  , Cookie = CookieJarLib.Cookie
-;
-
-// Browser doesn't have zlib.
-var zlib = null;
-try {
-  zlib = require('zlib');
-} catch (e) {
-  console.warn("no zlib library");
-}
-
-// Iconv doesn't work in browser
-var Iconv = null;
-try {
-  Iconv = require('iconv-lite');
-} catch (e) {
-  console.warn("no iconv library");
-}
-
-// Construct a `Response` object. You should never have to do this directly. The
-// `Request` object handles this, getting the raw response object and passing it
-// in here, along with the request. The callback allows us to stream the response
-// and then use the callback to let the request know when it's ready.
-var Response = function(raw, request, callback) { 
-  var response = this;
-  this._raw = raw;
-
-  // The `._setHeaders` method is "private"; you can't otherwise set headers on
-  // the response.
-  this._setHeaders.call(this,raw.headers);
-  
-  // store any cookies
-  if (request.cookieJar && this.getHeader('set-cookie')) {
-    var cookieStrings = this.getHeader('set-cookie');
-    var cookieObjs = []
-      , cookie;
-
-    for (var i = 0; i < cookieStrings.length; i++) {
-      var cookieString = cookieStrings[i];
-      if (!cookieString) {
-        continue;
-      }
-
-      if (!cookieString.match(/domain\=/i)) {
-        cookieString += '; domain=' + request.host;
-      }
-
-      if (!cookieString.match(/path\=/i)) {
-        cookieString += '; path=' + request.path;
-      }
-
-      try {
-        cookie = new Cookie(cookieString);
-        if (cookie) {
-          cookieObjs.push(cookie);
-        }
-      } catch (e) {
-        console.warn("Tried to set bad cookie: " + cookieString);
-      }
-    }
-
-    request.cookieJar.setCookies(cookieObjs);
-  }
-
-  this.request = request;
-  this.client = request.client;
-  this.log = this.request.log;
-
-  // Stream the response content entity and fire the callback when we're done.
-  // Store the incoming data in a array of Buffers which we concatinate into one
-  // buffer at the end.  We need to use buffers instead of strings here in order
-  // to preserve binary data.
-  var chunkBuffers = [];
-  var dataLength = 0;
-  raw.on("data", function(chunk) {
-    chunkBuffers.push(chunk);
-    dataLength += chunk.length;
-  });
-  raw.on("end", function() {
-    var body;
-    if (typeof Buffer === 'undefined') {
-      // Just concatinate into a string
-      body = chunkBuffers.join('');
-    } else {
-      // Initialize new buffer and add the chunks one-at-a-time.
-      body = new Buffer(dataLength);
-      for (var i = 0, pos = 0; i < chunkBuffers.length; i++) {
-        chunkBuffers[i].copy(body, pos);
-        pos += chunkBuffers[i].length;
-      }
-    }
-
-    var setBodyAndFinish = function (body) {
-      response._body = new Content({ 
-        body: body,
-        type: response.getHeader("Content-Type")
-      });
-      callback(response);
-    }
-
-    if (zlib && response.getHeader("Content-Encoding") === 'gzip'){
-      zlib.gunzip(body, function (err, gunzippedBody) {
-        if (Iconv && response.request.encoding){
-          body = Iconv.fromEncoding(gunzippedBody,response.request.encoding);
-        } else {
-          body = gunzippedBody.toString();
-        }
-        setBodyAndFinish(body);
-      })
-    }
-    else{
-       if (response.request.encoding){
-            body = Iconv.fromEncoding(body,response.request.encoding);
-        }        
-      setBodyAndFinish(body);
-    }
-  });
-};
-
-// The `Response` object can be pretty overwhelming to view using the built-in
-// Node.js inspect method. We want to make it a bit more manageable. This
-// probably goes [too far in the other
-// direction](https://github.com/spire-io/shred/issues/2).
-
-Response.prototype = {
-  inspect: function() {
-    var response = this;
-    var headers = this.format_headers();
-    var summary = ["<Shred Response> ", response.status].join(" ")
-    return [ summary, "- Headers:", headers].join("\n");
-  },
-  format_headers: function () {
-    var array = []
-    var headers = this._headers
-    for (var key in headers) {
-      if (headers.hasOwnProperty(key)) {
-        var value = headers[key]
-        array.push("\t" + key + ": " + value);
-      }
-    }
-    return array.join("\n");
-  }
-};
-
-// `Response` object properties, all of which are read-only:
-Object.defineProperties(Response.prototype, {
-  
-// - **status**. The HTTP status code for the response. 
-  status: {
-    get: function() { return this._raw.statusCode; },
-    enumerable: true
-  },
-
-// - **content**. The HTTP content entity, if any. Provided as a [content
-//   object](./content.html), which will attempt to convert the entity based upon
-//   the `content-type` header. The converted value is available as
-//   `content.data`. The original raw content entity is available as
-//   `content.body`.
-  body: {
-    get: function() { return this._body; }
-  },
-  content: {
-    get: function() { return this.body; },
-    enumerable: true
-  },
-
-// - **isRedirect**. Is the response a redirect? These are responses with 3xx
-//   status and a `Location` header.
-  isRedirect: {
-    get: function() {
-      return (this.status>299
-          &&this.status<400
-          &&this.getHeader("Location"));
-    },
-    enumerable: true
-  },
-
-// - **isError**. Is the response an error? These are responses with status of
-//   400 or greater.
-  isError: {
-    get: function() {
-      return (this.status === 0 || this.status > 399)
-    },
-    enumerable: true
-  }
-});
-
-// Add in the [getters for accessing the normalized headers](./headers.js).
-HeaderMixins.getters(Response);
-HeaderMixins.privateSetters(Response);
-
-// Work around Mozilla bug #608735 [https://bugzil.la/608735], which causes
-// getAllResponseHeaders() to return {} if the response is a CORS request.
-// xhr.getHeader still works correctly.
-var getHeader = Response.prototype.getHeader;
-Response.prototype.getHeader = function (name) {
-  return (getHeader.call(this,name) ||
-    (typeof this._raw.getHeader === 'function' && this._raw.getHeader(name)));
-};
-
-module.exports = Response;
-
-});
-
-require.define("/shred/content.js", function (require, module, exports, __dirname, __filename) {
-    
-// The purpose of the `Content` object is to abstract away the data conversions
-// to and from raw content entities as strings. For example, you want to be able
-// to pass in a Javascript object and have it be automatically converted into a
-// JSON string if the `content-type` is set to a JSON-based media type.
-// Conversely, you want to be able to transparently get back a Javascript object
-// in the response if the `content-type` is a JSON-based media-type.
-
-// One limitation of the current implementation is that it [assumes the `charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
-
-// The `Content` constructor takes an options object, which *must* have either a
-// `body` or `data` property and *may* have a `type` property indicating the
-// media type. If there is no `type` attribute, a default will be inferred.
-var Content = function(options) {
-  this.body = options.body;
-  this.data = options.data;
-  this.type = options.type;
-};
-
-Content.prototype = {
-  // Treat `toString()` as asking for the `content.body`. That is, the raw content entity.
-  //
-  //     toString: function() { return this.body; }
-  //
-  // Commented out, but I've forgotten why. :/
-};
-
-
-// `Content` objects have the following attributes:
-Object.defineProperties(Content.prototype,{
-  
-// - **type**. Typically accessed as `content.type`, reflects the `content-type`
-//   header associated with the request or response. If not passed as an options
-//   to the constructor or set explicitly, it will infer the type the `data`
-//   attribute, if possible, and, failing that, will default to `text/plain`.
-  type: {
-    get: function() {
-      if (this._type) {
-        return this._type;
-      } else {
-        if (this._data) {
-          switch(typeof this._data) {
-            case "string": return "text/plain";
-            case "object": return "application/json";
-          }
-        }
-      }
-      return "text/plain";
-    },
-    set: function(value) {
-      this._type = value;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **data**. Typically accessed as `content.data`, reflects the content entity
-//   converted into Javascript data. This can be a string, if the `type` is, say,
-//   `text/plain`, but can also be a Javascript object. The conversion applied is
-//   based on the `processor` attribute. The `data` attribute can also be set
-//   directly, in which case the conversion will be done the other way, to infer
-//   the `body` attribute.
-  data: {
-    get: function() {
-      if (this._body) {
-        return this.processor.parser(this._body);
-      } else {
-        return this._data;
-      }
-    },
-    set: function(data) {
-      if (this._body&&data) Errors.setDataWithBody(this);
-      this._data = data;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **body**. Typically accessed as `content.body`, reflects the content entity
-//   as a UTF-8 string. It is the mirror of the `data` attribute. If you set the
-//   `data` attribute, the `body` attribute will be inferred and vice-versa. If
-//   you attempt to set both, an exception is raised.
-  body: {
-    get: function() {
-      if (this._data) {
-        return this.processor.stringify(this._data);
-      } else {
-        return this.processor.stringify(this._body);
-      }
-    },
-    set: function(body) {
-      if (this._data&&body) Errors.setBodyWithData(this);
-      this._body = body;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **processor**. The functions that will be used to convert to/from `data` and
-//   `body` attributes. You can add processors. The two that are built-in are for
-//   `text/plain`, which is basically an identity transformation and
-//   `application/json` and other JSON-based media types (including custom media
-//   types with `+json`). You can add your own processors. See below.
-  processor: {
-    get: function() {
-      var processor = Content.processors[this.type];
-      if (processor) {
-        return processor;
-      } else {
-        // Return the first processor that matches any part of the
-        // content type. ex: application/vnd.foobar.baz+json will match json.
-        var main = this.type.split(";")[0];
-        var parts = main.split(/\+|\//);
-        for (var i=0, l=parts.length; i < l; i++) {
-          processor = Content.processors[parts[i]]
-        }
-        return processor || {parser:identity,stringify:toString};
-      }
-    },
-    enumerable: true
-  },
-
-// - **length**. Typically accessed as `content.length`, returns the length in
-//   bytes of the raw content entity.
-  length: {
-    get: function() {
-      if (typeof Buffer !== 'undefined') {
-        return Buffer.byteLength(this.body);
-      }
-      return this.body.length;
-    }
-  }
-});
-
-Content.processors = {};
-
-// The `registerProcessor` function allows you to add your own processors to
-// convert content entities. Each processor consists of a Javascript object with
-// two properties:
-// - **parser**. The function used to parse a raw content entity and convert it
-//   into a Javascript data type.
-// - **stringify**. The function used to convert a Javascript data type into a
-//   raw content entity.
-Content.registerProcessor = function(types,processor) {
-  
-// You can pass an array of types that will trigger this processor, or just one.
-// We determine the array via duck-typing here.
-  if (types.forEach) {
-    types.forEach(function(type) {
-      Content.processors[type] = processor;
-    });
-  } else {
-    // If you didn't pass an array, we just use what you pass in.
-    Content.processors[types] = processor;
-  }
-};
-
-// Register the identity processor, which is used for text-based media types.
-var identity = function(x) { return x; }
-  , toString = function(x) { return x.toString(); }
-Content.registerProcessor(
-  ["text/html","text/plain","text"],
-  { parser: identity, stringify: toString });
-
-// Register the JSON processor, which is used for JSON-based media types.
-Content.registerProcessor(
-  ["application/json; charset=utf-8","application/json","json"],
-  {
-    parser: function(string) {
-      return JSON.parse(string);
-    },
-    stringify: function(data) {
-      return JSON.stringify(data); }});
-
-// Error functions are defined separately here in an attempt to make the code
-// easier to read.
-var Errors = {
-  setDataWithBody: function(object) {
-    throw new Error("Attempt to set data attribute of a content object " +
-        "when the body attributes was already set.");
-  },
-  setBodyWithData: function(object) {
-    throw new Error("Attempt to set body attribute of a content object " +
-        "when the data attributes was already set.");
-  }
-}
-module.exports = Content;
-
-});
-
-require.define("/shred/mixins/headers.js", function (require, module, exports, __dirname, __filename) {
-    // The header mixins allow you to add HTTP header support to any object. This
-// might seem pointless: why not simply use a hash? The main reason is that, per
-// the [HTTP spec](http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2),
-// headers are case-insensitive. So, for example, `content-type` is the same as
-// `CONTENT-TYPE` which is the same as `Content-Type`. Since there is no way to
-// overload the index operator in Javascript, using a hash to represent the
-// headers means it's possible to have two conflicting values for a single
-// header.
-// 
-// The solution to this is to provide explicit methods to set or get headers.
-// This also has the benefit of allowing us to introduce additional variations,
-// including snake case, which we automatically convert to what Matthew King has
-// dubbed "corset case" - the hyphen-separated names with initial caps:
-// `Content-Type`. We use corset-case just in case we're dealing with servers
-// that haven't properly implemented the spec.
-
-// Convert headers to corset-case. **Example:** `CONTENT-TYPE` will be converted
-// to `Content-Type`.
-
-var corsetCase = function(string) {
-  return string.toLowerCase()
-      //.replace("_","-")
-      .replace(/(^|-)(\w)/g, 
-          function(s) { return s.toUpperCase(); });
-};
-
-// We suspect that `initializeHeaders` was once more complicated ...
-var initializeHeaders = function(object) {
-  return {};
-};
-
-// Access the `_headers` property using lazy initialization. **Warning:** If you
-// mix this into an object that is using the `_headers` property already, you're
-// going to have trouble.
-var $H = function(object) {
-  return object._headers||(object._headers=initializeHeaders(object));
-};
-
-// Hide the implementations as private functions, separate from how we expose them.
-
-// The "real" `getHeader` function: get the header after normalizing the name.
-var getHeader = function(object,name) {
-  return $H(object)[corsetCase(name)];
-};
-
-// The "real" `getHeader` function: get one or more headers, or all of them
-// if you don't ask for any specifics. 
-var getHeaders = function(object,names) {
-  var keys = (names && names.length>0) ? names : Object.keys($H(object));
-  var hash = keys.reduce(function(hash,key) {
-    hash[key] = getHeader(object,key);
-    return hash;
-  },{});
-  // Freeze the resulting hash so you don't mistakenly think you're modifying
-  // the real headers.
-  Object.freeze(hash);
-  return hash;
-};
-
-// The "real" `setHeader` function: set a header, after normalizing the name.
-var setHeader = function(object,name,value) {
-  $H(object)[corsetCase(name)] = value;
-  return object;
-};
-
-// The "real" `setHeaders` function: set multiple headers based on a hash.
-var setHeaders = function(object,hash) {
-  for( var key in hash ) { setHeader(object,key,hash[key]); };
-  return this;
-};
-
-// Here's where we actually bind the functionality to an object. These mixins work by
-// exposing mixin functions. Each function mixes in a specific batch of features.
-module.exports = {
-  
-  // Add getters.
-  getters: function(constructor) {
-    constructor.prototype.getHeader = function(name) { return getHeader(this,name); };
-    constructor.prototype.getHeaders = function() { return getHeaders(this,arguments); };
-  },
-  // Add setters but as "private" methods.
-  privateSetters: function(constructor) {
-    constructor.prototype._setHeader = function(key,value) { return setHeader(this,key,value); };
-    constructor.prototype._setHeaders = function(hash) { return setHeaders(this,hash); };
-  },
-  // Add setters.
-  setters: function(constructor) {
-    constructor.prototype.setHeader = function(key,value) { return setHeader(this,key,value); };
-    constructor.prototype.setHeaders = function(hash) { return setHeaders(this,hash); };
-  },
-  // Add both getters and setters.
-  gettersAndSetters: function(constructor) {
-    constructor.prototype.getHeader = function(name) { return getHeader(this,name); };
-    constructor.prototype.getHeaders = function() { return getHeaders(this,arguments); };
-    constructor.prototype.setHeader = function(key,value) { return setHeader(this,key,value); };
-    constructor.prototype.setHeaders = function(hash) { return setHeaders(this,hash); };
-  },
-};
-
-});
-
-require.define("/node_modules/iconv-lite/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {}
-});
-
-require.define("/node_modules/iconv-lite/index.js", function (require, module, exports, __dirname, __filename) {
-    // Module exports
-var iconv = module.exports = {
-    toEncoding: function(str, encoding) {
-        return iconv.getCodec(encoding).toEncoding(str);
-    },
-    fromEncoding: function(buf, encoding) {
-        return iconv.getCodec(encoding).fromEncoding(buf);
-    },
-    
-    defaultCharUnicode: '�',
-    defaultCharSingleByte: '?',
-    
-    // Get correct codec for given encoding.
-    getCodec: function(encoding) {
-        var enc = encoding || "utf8";
-        var codecOptions = undefined;
-        while (1) {
-            if (getType(enc) === "String")
-                enc = enc.replace(/[- ]/g, "").toLowerCase();
-            var codec = iconv.encodings[enc];
-            var type = getType(codec);
-            if (type === "String") {
-                // Link to other encoding.
-                codecOptions = {originalEncoding: enc};
-                enc = codec;
-            }
-            else if (type === "Object" && codec.type != undefined) {
-                // Options for other encoding.
-                codecOptions = codec;
-                enc = codec.type;
-            } 
-            else if (type === "Function")
-                // Codec itself.
-                return codec(codecOptions);
-            else
-                throw new Error("Encoding not recognized: '" + encoding + "' (searched as: '"+enc+"')");
-        }
-    },
-    
-    // Define basic encodings
-    encodings: {
-        internal: function(options) {
-            return {
-                toEncoding: function(str) {
-                    return new Buffer(ensureString(str), options.originalEncoding);
-                },
-                fromEncoding: function(buf) {
-                    return ensureBuffer(buf).toString(options.originalEncoding);
-                }
-            };
-        },
-        utf8: "internal",
-        ucs2: "internal",
-        binary: "internal",
-        ascii: "internal",
-        base64: "internal",
-        
-        // Codepage single-byte encodings.
-        singlebyte: function(options) {
-            // Prepare chars if needed
-            if (!options.chars || (options.chars.length !== 128 && options.chars.length !== 256))
-                throw new Error("Encoding '"+options.type+"' has incorrect 'chars' (must be of len 128 or 256)");
-            
-            if (options.chars.length === 128)
-                options.chars = asciiString + options.chars;
-            
-            if (!options.charsBuf) {
-                options.charsBuf = new Buffer(options.chars, 'ucs2');
-            }
-            
-            if (!options.revCharsBuf) {
-                options.revCharsBuf = new Buffer(65536);
-                var defChar = iconv.defaultCharSingleByte.charCodeAt(0);
-                for (var i = 0; i < options.revCharsBuf.length; i++)
-                    options.revCharsBuf[i] = defChar;
-                for (var i = 0; i < options.chars.length; i++)
-                    options.revCharsBuf[options.chars.charCodeAt(i)] = i;
-            }
-            
-            return {
-                toEncoding: function(str) {
-                    str = ensureString(str);
-                    
-                    var buf = new Buffer(str.length);
-                    var revCharsBuf = options.revCharsBuf;
-                    for (var i = 0; i < str.length; i++)
-                        buf[i] = revCharsBuf[str.charCodeAt(i)];
-                    
-                    return buf;
-                },
-                fromEncoding: function(buf) {
-                    buf = ensureBuffer(buf);
-                    
-                    // Strings are immutable in JS -> we use ucs2 buffer to speed up computations.
-                    var charsBuf = options.charsBuf;
-                    var newBuf = new Buffer(buf.length*2);
-                    var idx1 = 0, idx2 = 0;
-                    for (var i = 0, _len = buf.length; i < _len; i++) {
-                        idx1 = buf[i]*2; idx2 = i*2;
-                        newBuf[idx2] = charsBuf[idx1];
-                        newBuf[idx2+1] = charsBuf[idx1+1];
-                    }
-                    return newBuf.toString('ucs2');
-                }
-            };
-        },
-
-        // Codepage double-byte encodings.
-        table: function(options) {
-            var table = options.table, key, revCharsTable = options.revCharsTable;
-            if (!table) {
-                throw new Error("Encoding '" + options.type +"' has incorect 'table' option");
-            }
-            if(!revCharsTable) {
-                revCharsTable = options.revCharsTable = {};
-                for (key in table) {
-                    revCharsTable[table[key]] = parseInt(key);
-                }
-            }
-            
-            return {
-                toEncoding: function(str) {
-                    str = ensureString(str);
-                    var strLen = str.length;
-                    var bufLen = strLen;
-                    for (var i = 0; i < strLen; i++)
-                        if (str.charCodeAt(i) >> 7)
-                            bufLen++;
-
-                    var newBuf = new Buffer(bufLen), gbkcode, unicode, 
-                        defaultChar = revCharsTable[iconv.defaultCharUnicode.charCodeAt(0)];
-
-                    for (var i = 0, j = 0; i < strLen; i++) {
-                        unicode = str.charCodeAt(i);
-                        if (unicode >> 7) {
-                            gbkcode = revCharsTable[unicode] || defaultChar;
-                            newBuf[j++] = gbkcode >> 8; //high byte;
-                            newBuf[j++] = gbkcode & 0xFF; //low byte
-                        } else {//ascii
-                            newBuf[j++] = unicode;
-                        }
-                    }
-                    return newBuf;
-                },
-                fromEncoding: function(buf) {
-                    buf = ensureBuffer(buf);
-                    var bufLen = buf.length, strLen = 0;
-                    for (var i = 0; i < bufLen; i++) {
-                        strLen++;
-                        if (buf[i] & 0x80) //the high bit is 1, so this byte is gbkcode's high byte.skip next byte
-                            i++;
-                    }
-                    var newBuf = new Buffer(strLen*2), unicode, gbkcode,
-                        defaultChar = iconv.defaultCharUnicode.charCodeAt(0);
-                    
-                    for (var i = 0, j = 0; i < bufLen; i++, j+=2) {
-                        gbkcode = buf[i];
-                        if (gbkcode & 0x80) {
-                            gbkcode = (gbkcode << 8) + buf[++i];
-                            unicode = table[gbkcode] || defaultChar;
-                        } else {
-                            unicode = gbkcode;
-                        }
-                        newBuf[j] = unicode & 0xFF; //low byte
-                        newBuf[j+1] = unicode >> 8; //high byte
-                    }
-                    return newBuf.toString('ucs2');
-                }
-            }
-        }
-    }
-};
-
-// Add aliases to convert functions
-iconv.encode = iconv.toEncoding;
-iconv.decode = iconv.fromEncoding;
-
-// Load other encodings from files in /encodings dir.
-var encodingsDir = __dirname+"/encodings/",
-    fs = require('fs');
-fs.readdirSync(encodingsDir).forEach(function(file) {
-    if(fs.statSync(encodingsDir + file).isDirectory()) return;
-    var encodings = require(encodingsDir + file)
-    for (var key in encodings)
-        iconv.encodings[key] = encodings[key]
-});
-
-// Utilities
-var asciiString = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f'+
-              ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f';
-
-var ensureBuffer = function(buf) {
-    buf = buf || new Buffer(0);
-    return (buf instanceof Buffer) ? buf : new Buffer(buf.toString(), "utf8");
-}
-
-var ensureString = function(str) {
-    str = str || "";
-    return (str instanceof String) ? str : str.toString((str instanceof Buffer) ? 'utf8' : undefined);
-}
-
-var getType = function(obj) {
-    return Object.prototype.toString.call(obj).slice(8, -1);
-}
-
-
-});
-
-require.define("/node_modules/http-browserify/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"index.js","browserify":"browser.js"}
-});
-
-require.define("/node_modules/http-browserify/browser.js", function (require, module, exports, __dirname, __filename) {
-    var http = module.exports;
-var EventEmitter = require('events').EventEmitter;
-var Request = require('./lib/request');
-
-http.request = function (params, cb) {
-    if (!params) params = {};
-    if (!params.host) params.host = window.location.host.split(':')[0];
-    if (!params.port) params.port = window.location.port;
-    
-    var req = new Request(new xhrHttp, params);
-    if (cb) req.on('response', cb);
-    return req;
-};
-
-http.get = function (params, cb) {
-    params.method = 'GET';
-    var req = http.request(params, cb);
-    req.end();
-    return req;
-};
-
-var xhrHttp = (function () {
-    if (typeof window === 'undefined') {
-        throw new Error('no window object present');
-    }
-    else if (window.XMLHttpRequest) {
-        return window.XMLHttpRequest;
-    }
-    else if (window.ActiveXObject) {
-        var axs = [
-            'Msxml2.XMLHTTP.6.0',
-            'Msxml2.XMLHTTP.3.0',
-            'Microsoft.XMLHTTP'
-        ];
-        for (var i = 0; i < axs.length; i++) {
-            try {
-                var ax = new(window.ActiveXObject)(axs[i]);
-                return function () {
-                    if (ax) {
-                        var ax_ = ax;
-                        ax = null;
-                        return ax_;
-                    }
-                    else {
-                        return new(window.ActiveXObject)(axs[i]);
-                    }
-                };
-            }
-            catch (e) {}
-        }
-        throw new Error('ajax not supported in this browser')
-    }
-    else {
-        throw new Error('ajax not supported in this browser');
-    }
-})();
-
-http.STATUS_CODES = {
-    100 : 'Continue',
-    101 : 'Switching Protocols',
-    102 : 'Processing', // RFC 2518, obsoleted by RFC 4918
-    200 : 'OK',
-    201 : 'Created',
-    202 : 'Accepted',
-    203 : 'Non-Authoritative Information',
-    204 : 'No Content',
-    205 : 'Reset Content',
-    206 : 'Partial Content',
-    207 : 'Multi-Status', // RFC 4918
-    300 : 'Multiple Choices',
-    301 : 'Moved Permanently',
-    302 : 'Moved Temporarily',
-    303 : 'See Other',
-    304 : 'Not Modified',
-    305 : 'Use Proxy',
-    307 : 'Temporary Redirect',
-    400 : 'Bad Request',
-    401 : 'Unauthorized',
-    402 : 'Payment Required',
-    403 : 'Forbidden',
-    404 : 'Not Found',
-    405 : 'Method Not Allowed',
-    406 : 'Not Acceptable',
-    407 : 'Proxy Authentication Required',
-    408 : 'Request Time-out',
-    409 : 'Conflict',
-    410 : 'Gone',
-    411 : 'Length Required',
-    412 : 'Precondition Failed',
-    413 : 'Request Entity Too Large',
-    414 : 'Request-URI Too Large',
-    415 : 'Unsupported Media Type',
-    416 : 'Requested Range Not Satisfiable',
-    417 : 'Expectation Failed',
-    418 : 'I\'m a teapot', // RFC 2324
-    422 : 'Unprocessable Entity', // RFC 4918
-    423 : 'Locked', // RFC 4918
-    424 : 'Failed Dependency', // RFC 4918
-    425 : 'Unordered Collection', // RFC 4918
-    426 : 'Upgrade Required', // RFC 2817
-    500 : 'Internal Server Error',
-    501 : 'Not Implemented',
-    502 : 'Bad Gateway',
-    503 : 'Service Unavailable',
-    504 : 'Gateway Time-out',
-    505 : 'HTTP Version not supported',
-    506 : 'Variant Also Negotiates', // RFC 2295
-    507 : 'Insufficient Storage', // RFC 4918
-    509 : 'Bandwidth Limit Exceeded',
-    510 : 'Not Extended' // RFC 2774
-};
-
-});
-
-require.define("/node_modules/http-browserify/lib/request.js", function (require, module, exports, __dirname, __filename) {
-    var EventEmitter = require('events').EventEmitter;
-var Response = require('./response');
-var isSafeHeader = require('./isSafeHeader');
-
-var Request = module.exports = function (xhr, params) {
-    var self = this;
-    self.xhr = xhr;
-    self.body = '';
-    
-    var uri = params.host + ':' + params.port + (params.path || '/');
-    
-    xhr.open(
-        params.method || 'GET',
-        (params.scheme || 'http') + '://' + uri,
-        true
-    );
-    
-    if (params.headers) {
-        Object.keys(params.headers).forEach(function (key) {
-            if (!isSafeHeader(key)) return;
-            var value = params.headers[key];
-            if (Array.isArray(value)) {
-                value.forEach(function (v) {
-                    xhr.setRequestHeader(key, v);
-                });
-            }
-            else xhr.setRequestHeader(key, value)
-        });
-    }
-    
-    var res = new Response(xhr);
-    res.on('ready', function () {
-        self.emit('response', res);
-    });
-    
-    xhr.onreadystatechange = function () {
-        res.handle(xhr);
-    };
-};
-
-Request.prototype = new EventEmitter;
-
-Request.prototype.setHeader = function (key, value) {
-    if ((Array.isArray && Array.isArray(value))
-    || value instanceof Array) {
-        for (var i = 0; i < value.length; i++) {
-            this.xhr.setRequestHeader(key, value[i]);
-        }
-    }
-    else {
-        this.xhr.setRequestHeader(key, value);
-    }
-};
-
-Request.prototype.write = function (s) {
-    this.body += s;
-};
-
-Request.prototype.end = function (s) {
-    if (s !== undefined) this.write(s);
-    this.xhr.send(this.body);
-};
-
-});
-
-require.define("/node_modules/http-browserify/lib/response.js", function (require, module, exports, __dirname, __filename) {
-    var EventEmitter = require('events').EventEmitter;
-var isSafeHeader = require('./isSafeHeader');
-
-var Response = module.exports = function (xhr) {
-    this.xhr = xhr;
-    this.offset = 0;
-};
-
-Response.prototype = new EventEmitter;
-
-var capable = {
-    streaming : true,
-    status2 : true
-};
-
-function parseHeaders (xhr) {
-    var lines = xhr.getAllResponseHeaders().split(/\r?\n/);
-    var headers = {};
-    for (var i = 0; i < lines.length; i++) {
-        var line = lines[i];
-        if (line === '') continue;
-        
-        var m = line.match(/^([^:]+):\s*(.*)/);
-        if (m) {
-            var key = m[1].toLowerCase(), value = m[2];
-            
-            if (headers[key] !== undefined) {
-                if ((Array.isArray && Array.isArray(headers[key]))
-                || headers[key] instanceof Array) {
-                    headers[key].push(value);
-                }
-                else {
-                    headers[key] = [ headers[key], value ];
-                }
-            }
-            else {
-                headers[key] = value;
-            }
-        }
-        else {
-            headers[line] = true;
-        }
-    }
-    return headers;
-}
-
-Response.prototype.getHeader = function (key) {
-    var header = this.headers ? this.headers[key.toLowerCase()] : null;
-    if (header) return header;
-
-    // Work around Mozilla bug #608735 [https://bugzil.la/608735], which causes
-    // getAllResponseHeaders() to return {} if the response is a CORS request.
-    // xhr.getHeader still works correctly.
-    if (isSafeHeader(key)) {
-      return this.xhr.getResponseHeader(key);
-    }
-    return null;
-};
-
-Response.prototype.handle = function () {
-    var xhr = this.xhr;
-    if (xhr.readyState === 2 && capable.status2) {
-        try {
-            this.statusCode = xhr.status;
-            this.headers = parseHeaders(xhr);
-        }
-        catch (err) {
-            capable.status2 = false;
-        }
-        
-        if (capable.status2) {
-            this.emit('ready');
-        }
-    }
-    else if (capable.streaming && xhr.readyState === 3) {
-        try {
-            if (!this.statusCode) {
-                this.statusCode = xhr.status;
-                this.headers = parseHeaders(xhr);
-                this.emit('ready');
-            }
-        }
-        catch (err) {}
-        
-        try {
-            this.write();
-        }
-        catch (err) {
-            capable.streaming = false;
-        }
-    }
-    else if (xhr.readyState === 4) {
-        if (!this.statusCode) {
-            this.statusCode = xhr.status;
-            this.emit('ready');
-        }
-        this.write();
-        
-        if (xhr.error) {
-            this.emit('error', xhr.responseText);
-        }
-        else this.emit('end');
-    }
-};
-
-Response.prototype.write = function () {
-    var xhr = this.xhr;
-    if (xhr.responseText.length > this.offset) {
-        this.emit('data', xhr.responseText.slice(this.offset));
-        this.offset = xhr.responseText.length;
-    }
-};
-
-});
-
-require.define("/node_modules/http-browserify/lib/isSafeHeader.js", function (require, module, exports, __dirname, __filename) {
-    // Taken from http://dxr.mozilla.org/mozilla/mozilla-central/content/base/src/nsXMLHttpRequest.cpp.html
-var unsafeHeaders = [
-    "accept-charset",
-    "accept-encoding",
-    "access-control-request-headers",
-    "access-control-request-method",
-    "connection",
-    "content-length",
-    "cookie",
-    "cookie2",
-    "content-transfer-encoding",
-    "date",
-    "expect",
-    "host",
-    "keep-alive",
-    "origin",
-    "referer",
-    "set-cookie",
-    "te",
-    "trailer",
-    "transfer-encoding",
-    "upgrade",
-    "user-agent",
-    "via"
-];
-
-module.exports = function (headerName) {
-    if (!headerName) return false;
-    return (unsafeHeaders.indexOf(headerName.toLowerCase()) === -1)
-};
-
-});
-
-require.alias("http-browserify", "/node_modules/http");
-
-require.alias("http-browserify", "/node_modules/https");
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js
deleted file mode 100644
index b8051fedd9e..00000000000
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js
+++ /dev/null
@@ -1,193 +0,0 @@
-
-// The purpose of the `Content` object is to abstract away the data conversions
-// to and from raw content entities as strings. For example, you want to be able
-// to pass in a Javascript object and have it be automatically converted into a
-// JSON string if the `content-type` is set to a JSON-based media type.
-// Conversely, you want to be able to transparently get back a Javascript object
-// in the response if the `content-type` is a JSON-based media-type.
-
-// One limitation of the current implementation is that it [assumes the `charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
-
-// The `Content` constructor takes an options object, which *must* have either a
-// `body` or `data` property and *may* have a `type` property indicating the
-// media type. If there is no `type` attribute, a default will be inferred.
-var Content = function(options) {
-  this.body = options.body;
-  this.data = options.data;
-  this.type = options.type;
-};
-
-Content.prototype = {
-  // Treat `toString()` as asking for the `content.body`. That is, the raw content entity.
-  //
-  //     toString: function() { return this.body; }
-  //
-  // Commented out, but I've forgotten why. :/
-};
-
-
-// `Content` objects have the following attributes:
-Object.defineProperties(Content.prototype,{
-  
-// - **type**. Typically accessed as `content.type`, reflects the `content-type`
-//   header associated with the request or response. If not passed as an options
-//   to the constructor or set explicitly, it will infer the type the `data`
-//   attribute, if possible, and, failing that, will default to `text/plain`.
-  type: {
-    get: function() {
-      if (this._type) {
-        return this._type;
-      } else {
-        if (this._data) {
-          switch(typeof this._data) {
-            case "string": return "text/plain";
-            case "object": return "application/json";
-          }
-        }
-      }
-      return "text/plain";
-    },
-    set: function(value) {
-      this._type = value;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **data**. Typically accessed as `content.data`, reflects the content entity
-//   converted into Javascript data. This can be a string, if the `type` is, say,
-//   `text/plain`, but can also be a Javascript object. The conversion applied is
-//   based on the `processor` attribute. The `data` attribute can also be set
-//   directly, in which case the conversion will be done the other way, to infer
-//   the `body` attribute.
-  data: {
-    get: function() {
-      if (this._body) {
-        return this.processor.parser(this._body);
-      } else {
-        return this._data;
-      }
-    },
-    set: function(data) {
-      if (this._body&&data) Errors.setDataWithBody(this);
-      this._data = data;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **body**. Typically accessed as `content.body`, reflects the content entity
-//   as a UTF-8 string. It is the mirror of the `data` attribute. If you set the
-//   `data` attribute, the `body` attribute will be inferred and vice-versa. If
-//   you attempt to set both, an exception is raised.
-  body: {
-    get: function() {
-      if (this._data) {
-        return this.processor.stringify(this._data);
-      } else {
-        return this._body.toString();
-      }
-    },
-    set: function(body) {
-      if (this._data&&body) Errors.setBodyWithData(this);
-      this._body = body;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **processor**. The functions that will be used to convert to/from `data` and
-//   `body` attributes. You can add processors. The two that are built-in are for
-//   `text/plain`, which is basically an identity transformation and
-//   `application/json` and other JSON-based media types (including custom media
-//   types with `+json`). You can add your own processors. See below.
-  processor: {
-    get: function() {
-      var processor = Content.processors[this.type];
-      if (processor) {
-        return processor;
-      } else {
-        // Return the first processor that matches any part of the
-        // content type. ex: application/vnd.foobar.baz+json will match json.
-        var main = this.type.split(";")[0];
-        var parts = main.split(/\+|\//);
-        for (var i=0, l=parts.length; i < l; i++) {
-          processor = Content.processors[parts[i]]
-        }
-        return processor || {parser:identity,stringify:toString};
-      }
-    },
-    enumerable: true
-  },
-
-// - **length**. Typically accessed as `content.length`, returns the length in
-//   bytes of the raw content entity.
-  length: {
-    get: function() {
-      if (typeof Buffer !== 'undefined') {
-        return Buffer.byteLength(this.body);
-      }
-      return this.body.length;
-    }
-  }
-});
-
-Content.processors = {};
-
-// The `registerProcessor` function allows you to add your own processors to
-// convert content entities. Each processor consists of a Javascript object with
-// two properties:
-// - **parser**. The function used to parse a raw content entity and convert it
-//   into a Javascript data type.
-// - **stringify**. The function used to convert a Javascript data type into a
-//   raw content entity.
-Content.registerProcessor = function(types,processor) {
-  
-// You can pass an array of types that will trigger this processor, or just one.
-// We determine the array via duck-typing here.
-  if (types.forEach) {
-    types.forEach(function(type) {
-      Content.processors[type] = processor;
-    });
-  } else {
-    // If you didn't pass an array, we just use what you pass in.
-    Content.processors[types] = processor;
-  }
-};
-
-// Register the identity processor, which is used for text-based media types.
-var identity = function(x) { return x; }
-  , toString = function(x) { return x.toString(); }
-Content.registerProcessor(
-  ["text/html","text/plain","text"],
-  { parser: identity, stringify: toString });
-
-// Register the JSON processor, which is used for JSON-based media types.
-Content.registerProcessor(
-  ["application/json; charset=utf-8","application/json","json"],
-  {
-    parser: function(string) {
-      return JSON.parse(string);
-    },
-    stringify: function(data) {
-      return JSON.stringify(data); }});
-
-var qs = require('querystring');
-// Register the post processor, which is used for JSON-based media types.
-Content.registerProcessor(
-  ["application/x-www-form-urlencoded"],
-  { parser : qs.parse, stringify : qs.stringify });
-
-// Error functions are defined separately here in an attempt to make the code
-// easier to read.
-var Errors = {
-  setDataWithBody: function(object) {
-    throw new Error("Attempt to set data attribute of a content object " +
-        "when the body attributes was already set.");
-  },
-  setBodyWithData: function(object) {
-    throw new Error("Attempt to set body attribute of a content object " +
-        "when the data attributes was already set.");
-  }
-}
-module.exports = Content;
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
index 576fcd33bf9..7160291dc07 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
@@ -1,338 +1 @@
-var appName;
-var popupMask;
-var popupDialog;
-var clientId;
-var realm;
-var redirect_uri;
-var clientSecret;
-var scopeSeparator;
-var additionalQueryStringParams;
-
-function handleLogin() {
-  var scopes = [];
-
-  var auths = window.swaggerUi.api.authSchemes || window.swaggerUi.api.securityDefinitions;
-  if(auths) {
-    var key;
-    var defs = auths;
-    for(key in defs) {
-      var auth = defs[key];
-      if(auth.type === 'oauth2' && auth.scopes) {
-        var scope;
-        if(Array.isArray(auth.scopes)) {
-          // 1.2 support
-          var i;
-          for(i = 0; i < auth.scopes.length; i++) {
-            scopes.push(auth.scopes[i]);
-          }
-        }
-        else {
-          // 2.0 support
-          for(scope in auth.scopes) {
-            scopes.push({scope: scope, description: auth.scopes[scope], OAuthSchemeKey: key});
-          }
-        }
-      }
-    }
-  }
-
-  if(window.swaggerUi.api
-    && window.swaggerUi.api.info) {
-    appName = window.swaggerUi.api.info.title;
-  }
-
-  $('.api-popup-dialog').remove(); 
-  popupDialog = $(
-    [
-      '<div class="api-popup-dialog">',
-      '<div class="api-popup-title">Select OAuth2.0 Scopes</div>',
-      '<div class="api-popup-content">',
-        '<p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.',
-          '<a href="#">Learn how to use</a>',
-        '</p>',
-        '<p><strong>' + appName + '</strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>',
-        '<ul class="api-popup-scopes">',
-        '</ul>',
-        '<p class="error-msg"></p>',
-        '<div class="api-popup-actions"><button class="api-popup-authbtn api-button green" type="button">Authorize</button><button class="api-popup-cancel api-button gray" type="button">Cancel</button></div>',
-      '</div>',
-      '</div>'].join(''));
-  $(document.body).append(popupDialog);
-
-  //TODO: only display applicable scopes (will need to pass them into handleLogin)
-  popup = popupDialog.find('ul.api-popup-scopes').empty();
-  for (i = 0; i < scopes.length; i ++) {
-    scope = scopes[i];
-    str = '<li><input type="checkbox" id="scope_' + i + '" scope="' + scope.scope + '"' +'" oauthtype="' + scope.OAuthSchemeKey +'"/>' + '<label for="scope_' + i + '">' + scope.scope ;
-    if (scope.description) {
-      if ($.map(auths, function(n, i) { return i; }).length > 1) //if we have more than one scheme, display schemes
-	    str += '<br/><span class="api-scope-desc">' + scope.description + ' ('+ scope.OAuthSchemeKey+')' +'</span>';
-	  else
-	    str += '<br/><span class="api-scope-desc">' + scope.description + '</span>';
-    }
-    str += '</label></li>';
-    popup.append(str);
-  }
-
-  var $win = $(window),
-    dw = $win.width(),
-    dh = $win.height(),
-    st = $win.scrollTop(),
-    dlgWd = popupDialog.outerWidth(),
-    dlgHt = popupDialog.outerHeight(),
-    top = (dh -dlgHt)/2 + st,
-    left = (dw - dlgWd)/2;
-
-  popupDialog.css({
-    top: (top < 0? 0 : top) + 'px',
-    left: (left < 0? 0 : left) + 'px'
-  });
-
-  popupDialog.find('button.api-popup-cancel').click(function() {
-    popupMask.hide();
-    popupDialog.hide();
-    popupDialog.empty();
-    popupDialog = [];
-  });
-
-  $('button.api-popup-authbtn').unbind();
-  popupDialog.find('button.api-popup-authbtn').click(function() {
-    popupMask.hide();
-    popupDialog.hide();
-
-    var authSchemes = window.swaggerUi.api.authSchemes;
-    var host = window.location;
-    var pathname = location.pathname.substring(0, location.pathname.lastIndexOf("/"));
-    var defaultRedirectUrl = host.protocol + '//' + host.host + pathname + '/o2c.html';
-    var redirectUrl = window.oAuthRedirectUrl || defaultRedirectUrl;
-    var url = null;
-    var scopes = []
-    var o = popup.find('input:checked'); 
-    var OAuthSchemeKeys = [];
-    var state;
-    for(k =0; k < o.length; k++) {
-      var scope = $(o[k]).attr('scope');
-      if (scopes.indexOf(scope) === -1)
-        scopes.push(scope);
-      var OAuthSchemeKey = $(o[k]).attr('oauthtype');      
-      if (OAuthSchemeKeys.indexOf(OAuthSchemeKey) === -1)
-          OAuthSchemeKeys.push(OAuthSchemeKey);
-    }
-    
-    //TODO: merge not replace if scheme is different from any existing 
-    //(needs to be aware of schemes to do so correctly)
-    window.enabledScopes=scopes;    
-    
-    for (var key in authSchemes) { 
-      if (authSchemes.hasOwnProperty(key) && OAuthSchemeKeys.indexOf(key) != -1) { //only look at keys that match this scope.
-        var flow = authSchemes[key].flow;
-
-        if(authSchemes[key].type === 'oauth2' && flow && (flow === 'implicit' || flow === 'accessCode')) {
-          var dets = authSchemes[key];
-          url = dets.authorizationUrl + '?response_type=' + (flow === 'implicit' ? 'token' : 'code');
-          window.swaggerUi.tokenName = dets.tokenName || 'access_token';
-          window.swaggerUi.tokenUrl = (flow === 'accessCode' ? dets.tokenUrl : null);
-          state = key;
-        }
-        else if(authSchemes[key].type === 'oauth2' && flow && (flow === 'application')) {
-            var dets = authSchemes[key];
-            window.swaggerUi.tokenName = dets.tokenName || 'access_token';
-            clientCredentialsFlow(scopes, dets.tokenUrl, key);
-            return;
-        }        
-        else if(authSchemes[key].grantTypes) {
-          // 1.2 support
-          var o = authSchemes[key].grantTypes;
-          for(var t in o) {
-            if(o.hasOwnProperty(t) && t === 'implicit') {
-              var dets = o[t];
-              var ep = dets.loginEndpoint.url;
-              url = dets.loginEndpoint.url + '?response_type=token';
-              window.swaggerUi.tokenName = dets.tokenName;
-            }
-            else if (o.hasOwnProperty(t) && t === 'accessCode') {
-              var dets = o[t];
-              var ep = dets.tokenRequestEndpoint.url;
-              url = dets.tokenRequestEndpoint.url + '?response_type=code';
-              window.swaggerUi.tokenName = dets.tokenName;
-            }
-          }
-        }
-      }
-    }
-
-    redirect_uri = redirectUrl;
-
-    url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
-    url += '&realm=' + encodeURIComponent(realm);
-    url += '&client_id=' + encodeURIComponent(clientId);
-    url += '&scope=' + encodeURIComponent(scopes.join(scopeSeparator));
-    url += '&state=' + encodeURIComponent(state);
-    for (var key in additionalQueryStringParams) {
-        url += '&' + key + '=' + encodeURIComponent(additionalQueryStringParams[key]);
-    }
-
-    window.open(url);
-  });
-
-  popupMask.show();
-  popupDialog.show();
-  return;
-}
-
-
-function handleLogout() {
-  for(key in window.swaggerUi.api.clientAuthorizations.authz){
-    window.swaggerUi.api.clientAuthorizations.remove(key)
-  }
-  window.enabledScopes = null;
-  $('.api-ic.ic-on').addClass('ic-off');
-  $('.api-ic.ic-on').removeClass('ic-on');
-
-  // set the info box
-  $('.api-ic.ic-warning').addClass('ic-error');
-  $('.api-ic.ic-warning').removeClass('ic-warning');
-}
-
-function initOAuth(opts) {
-  var o = (opts||{});
-  var errors = [];
-
-  appName = (o.appName||errors.push('missing appName'));
-  popupMask = (o.popupMask||$('#api-common-mask'));
-  popupDialog = (o.popupDialog||$('.api-popup-dialog'));
-  clientId = (o.clientId||errors.push('missing client id'));
-  clientSecret = (o.clientSecret||null);
-  realm = (o.realm||errors.push('missing realm'));
-  scopeSeparator = (o.scopeSeparator||' ');
-  additionalQueryStringParams = (o.additionalQueryStringParams||{});
-
-  if(errors.length > 0){
-    log('auth unable initialize oauth: ' + errors);
-    return;
-  }
-
-  $('pre code').each(function(i, e) {hljs.highlightBlock(e)});
-  $('.api-ic').unbind();
-  $('.api-ic').click(function(s) {
-    if($(s.target).hasClass('ic-off'))
-      handleLogin();
-    else {
-      handleLogout();
-    }
-    false;
-  });
-}
-
-function clientCredentialsFlow(scopes, tokenUrl, OAuthSchemeKey) {
-    var params = {
-      'client_id': clientId,
-      'client_secret': clientSecret,
-      'scope': scopes.join(' '),
-      'grant_type': 'client_credentials'
-    }
-    $.ajax(
-    {
-      url : tokenUrl,
-      type: "POST",
-      data: params,
-      success:function(data, textStatus, jqXHR)
-      {
-        onOAuthComplete(data,OAuthSchemeKey);
-      },
-      error: function(jqXHR, textStatus, errorThrown)
-      {
-        onOAuthComplete("");
-      }
-    });
-    
-  }
-
-window.processOAuthCode = function processOAuthCode(data) {
-  var OAuthSchemeKey = data.state;
-  var params = {
-    'client_id': clientId,
-    'code': data.code,
-    'grant_type': 'authorization_code',
-    'redirect_uri': redirect_uri
-  };
-
-  if (clientSecret) {
-    params.client_secret = clientSecret;
-  }
-
-  $.ajax(
-  {
-    url : window.swaggerUi.tokenUrl,
-    type: "POST",
-    data: params,
-    success:function(data, textStatus, jqXHR)
-    {
-      onOAuthComplete(data, OAuthSchemeKey);
-    },
-    error: function(jqXHR, textStatus, errorThrown)
-    {
-      onOAuthComplete("");
-    }
-  });
-};
-
-window.onOAuthComplete = function onOAuthComplete(token,OAuthSchemeKey) {
-  if(token) {
-    if(token.error) {
-      var checkbox = $('input[type=checkbox],.secured')
-      checkbox.each(function(pos){
-        checkbox[pos].checked = false;
-      });
-      alert(token.error);
-    }
-    else {
-      var b = token[window.swaggerUi.tokenName];      
-      if (!OAuthSchemeKey){
-          OAuthSchemeKey = token.state;
-      }
-      if(b){
-        // if all roles are satisfied
-        var o = null;
-        $.each($('.auth .api-ic .api_information_panel'), function(k, v) { 
-          var children = v;
-          if(children && children.childNodes) {
-            var requiredScopes = [];
-            $.each((children.childNodes), function (k1, v1){
-              var inner = v1.innerHTML;
-              if(inner)
-                requiredScopes.push(inner);
-            });
-            var diff = [];
-            for(var i=0; i < requiredScopes.length; i++) {
-              var s = requiredScopes[i];
-              if(window.enabledScopes && window.enabledScopes.indexOf(s) == -1) {
-                diff.push(s);
-              }
-            }
-            if(diff.length > 0){
-              o = v.parentNode.parentNode;
-              $(o.parentNode).find('.api-ic.ic-on').addClass('ic-off');
-              $(o.parentNode).find('.api-ic.ic-on').removeClass('ic-on');
-
-              // sorry, not all scopes are satisfied
-              $(o).find('.api-ic').addClass('ic-warning');
-              $(o).find('.api-ic').removeClass('ic-error');
-            }
-            else {
-              o = v.parentNode.parentNode;
-              $(o.parentNode).find('.api-ic.ic-off').addClass('ic-on');
-              $(o.parentNode).find('.api-ic.ic-off').removeClass('ic-off');
-
-              // all scopes are satisfied
-              $(o).find('.api-ic').addClass('ic-info');
-              $(o).find('.api-ic').removeClass('ic-warning');
-              $(o).find('.api-ic').removeClass('ic-error');
-            }
-          }
-        });
-        window.swaggerUi.api.clientAuthorizations.add(OAuthSchemeKey, new SwaggerClient.ApiKeyAuthorization('Authorization', 'Bearer ' + b, 'header'));
-      }
-    }
-  }
-};
+function handleLogin(){var e=[],o=window.swaggerUiAuth.authSchemes||window.swaggerUiAuth.securityDefinitions;if(o){var i,n=o;for(i in n){var a=n[i];if("oauth2"===a.type&&a.scopes){var t;if(Array.isArray(a.scopes)){var p;for(p=0;p<a.scopes.length;p++)e.push(a.scopes[p])}else for(t in a.scopes)e.push({scope:t,description:a.scopes[t],OAuthSchemeKey:i})}}}for(window.swaggerUi.api&&window.swaggerUi.api.info&&(appName=window.swaggerUi.api.info.title),$(".api-popup-dialog").remove(),popupDialog=$(['<div class="api-popup-dialog">','<div class="api-popup-title">Select OAuth2.0 Scopes</div>','<div class="api-popup-content">',"<p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.",'<a href="#">Learn how to use</a>',"</p>","<p><strong>"+appName+"</strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>",'<ul class="api-popup-scopes">',"</ul>",'<p class="error-msg"></p>','<div class="api-popup-actions"><button class="api-popup-authbtn api-button green" type="button">Authorize</button><button class="api-popup-cancel api-button gray" type="button">Cancel</button></div>',"</div>","</div>"].join("")),$(document.body).append(popupDialog),popup=popupDialog.find("ul.api-popup-scopes").empty(),p=0;p<e.length;p++)t=e[p],str='<li><input type="checkbox" id="scope_'+p+'" scope="'+t.scope+'"" oauthtype="'+t.OAuthSchemeKey+'"/><label for="scope_'+p+'">'+t.scope,t.description&&($.map(o,function(e,o){return o}).length>1?str+='<br/><span class="api-scope-desc">'+t.description+" ("+t.OAuthSchemeKey+")</span>":str+='<br/><span class="api-scope-desc">'+t.description+"</span>"),str+="</label></li>",popup.append(str);var r=$(window),s=r.width(),c=r.height(),l=r.scrollTop(),d=popupDialog.outerWidth(),u=popupDialog.outerHeight(),h=(c-u)/2+l,g=(s-d)/2;popupDialog.css({top:(h<0?0:h)+"px",left:(g<0?0:g)+"px"}),popupDialog.find("button.api-popup-cancel").click(function(){popupMask.hide(),popupDialog.hide(),popupDialog.empty(),popupDialog=[]}),$("button.api-popup-authbtn").unbind(),popupDialog.find("button.api-popup-authbtn").click(function(){function e(e){return e.vendorExtensions["x-tokenName"]||e.tokenName}popupMask.hide(),popupDialog.hide();var o,i=window.swaggerUi.api.authSchemes,n=window.location,a=location.pathname.substring(0,location.pathname.lastIndexOf("/")),t=n.protocol+"//"+n.host+a+"/o2c.html",p=window.oAuthRedirectUrl||t,r=null,s=[],c=popup.find("input:checked"),l=[];for(k=0;k<c.length;k++){var d=$(c[k]).attr("scope");s.indexOf(d)===-1&&s.push(d);var u=$(c[k]).attr("oauthtype");l.indexOf(u)===-1&&l.push(u)}window.enabledScopes=s;for(var h in i)if(i.hasOwnProperty(h)&&l.indexOf(h)!=-1){var g=i[h].flow;if("oauth2"!==i[h].type||!g||"implicit"!==g&&"accessCode"!==g){if("oauth2"===i[h].type&&g&&"application"===g){var w=i[h];return window.swaggerUi.tokenName=e(w)||"access_token",void clientCredentialsFlow(s,w.tokenUrl,h)}if(i[h].grantTypes){var c=i[h].grantTypes;for(var f in c)if(c.hasOwnProperty(f)&&"implicit"===f){var w=c[f];w.loginEndpoint.url;r=w.loginEndpoint.url+"?response_type=token",window.swaggerUi.tokenName=e(w)}else if(c.hasOwnProperty(f)&&"accessCode"===f){var w=c[f];w.tokenRequestEndpoint.url;r=w.tokenRequestEndpoint.url+"?response_type=code",window.swaggerUi.tokenName=e(w)}}}else{var w=i[h];r=w.authorizationUrl+"?response_type="+("implicit"===g?"token":"code"),window.swaggerUi.tokenName=e(w)||"access_token",window.swaggerUi.tokenUrl="accessCode"===g?w.tokenUrl:null,o=h}}redirect_uri=p,r+="&redirect_uri="+encodeURIComponent(p),r+="&realm="+encodeURIComponent(realm),r+="&client_id="+encodeURIComponent(clientId),r+="&scope="+encodeURIComponent(s.join(scopeSeparator)),r+="&state="+encodeURIComponent(o);for(var h in additionalQueryStringParams)r+="&"+h+"="+encodeURIComponent(additionalQueryStringParams[h]);window.open(r)}),popupMask.show(),popupDialog.show()}function handleLogout(){for(key in window.swaggerUi.api.clientAuthorizations.authz)window.swaggerUi.api.clientAuthorizations.remove(key);window.enabledScopes=null,$(".api-ic.ic-on").addClass("ic-off"),$(".api-ic.ic-on").removeClass("ic-on"),$(".api-ic.ic-warning").addClass("ic-error"),$(".api-ic.ic-warning").removeClass("ic-warning")}function initOAuth(e){var o=e||{},i=[];return appName=o.appName||i.push("missing appName"),popupMask=o.popupMask||$("#api-common-mask"),popupDialog=o.popupDialog||$(".api-popup-dialog"),clientId=o.clientId||i.push("missing client id"),clientSecret=o.clientSecret||null,realm=o.realm||i.push("missing realm"),scopeSeparator=o.scopeSeparator||" ",additionalQueryStringParams=o.additionalQueryStringParams||{},i.length>0?void log("auth unable initialize oauth: "+i):($("pre code").each(function(e,o){hljs.highlightBlock(o)}),$(".api-ic").unbind(),void $(".api-ic").click(function(e){$(e.target).hasClass("ic-off")?handleLogin():handleLogout()}))}function clientCredentialsFlow(e,o,i){var n={client_id:clientId,client_secret:clientSecret,scope:e.join(" "),grant_type:"client_credentials"};$.ajax({url:o,type:"POST",data:n,success:function(e,o,n){onOAuthComplete(e,i)},error:function(e,o,i){onOAuthComplete("")}})}var appName,popupMask,popupDialog,clientId,realm,redirect_uri,clientSecret,scopeSeparator,additionalQueryStringParams;window.processOAuthCode=function(e){var o=e.state,i=window.location,n=location.pathname.substring(0,location.pathname.lastIndexOf("/")),a=i.protocol+"//"+i.host+n+"/o2c.html",t=window.oAuthRedirectUrl||a,p={client_id:clientId,code:e.code,grant_type:"authorization_code",redirect_uri:t};clientSecret&&(p.client_secret=clientSecret),$.ajax({url:window.swaggerUiAuth.tokenUrl,type:"POST",data:p,success:function(e,i,n){onOAuthComplete(e,o)},error:function(e,o,i){onOAuthComplete("")}})},window.onOAuthComplete=function(e,o){if(e)if(e.error){var i=$("input[type=checkbox],.secured");i.each(function(e){i[e].checked=!1}),alert(e.error)}else{var n=e[window.swaggerUiAuth.tokenName];if(o||(o=e.state),n){var a=null;$.each($(".auth .api-ic .api_information_panel"),function(e,o){var i=o;if(i&&i.childNodes){var n=[];$.each(i.childNodes,function(e,o){var i=o.innerHTML;i&&n.push(i)});for(var t=[],p=0;p<n.length;p++){var r=n[p];window.enabledScopes&&window.enabledScopes.indexOf(r)==-1&&t.push(r)}t.length>0?(a=o.parentNode.parentNode,$(a.parentNode).find(".api-ic.ic-on").addClass("ic-off"),$(a.parentNode).find(".api-ic.ic-on").removeClass("ic-on"),$(a).find(".api-ic").addClass("ic-warning"),$(a).find(".api-ic").removeClass("ic-error")):(a=o.parentNode.parentNode,$(a.parentNode).find(".api-ic.ic-off").addClass("ic-on"),$(a.parentNode).find(".api-ic.ic-off").removeClass("ic-off"),$(a).find(".api-ic").addClass("ic-info"),$(a).find(".api-ic").removeClass("ic-warning"),$(a).find(".api-ic").removeClass("ic-error"))}}),"undefined"!=typeof window.swaggerUi&&(window.swaggerUi.api.clientAuthorizations.add(window.swaggerUiAuth.OAuthSchemeKey,new SwaggerClient.ApiKeyAuthorization("Authorization","Bearer "+n,"header")),window.swaggerUi.load())}}};
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
deleted file mode 100644
index 9e73a9b33e2..00000000000
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
+++ /dev/null
@@ -1,1653 +0,0 @@
-// swagger.js
-// version 2.0.39
-
-var __bind = function(fn, me){
-  return function(){
-    return fn.apply(me, arguments);
-  };
-};
-
-log = function(){
-  log.history = log.history || [];
-  log.history.push(arguments);
-  if(this.console){
-    console.log( Array.prototype.slice.call(arguments)[0] );
-  }
-};
-
-// if you want to apply conditional formatting of parameter values
-parameterMacro = function(value) {
-  return value;
-}
-
-// if you want to apply conditional formatting of model property values
-modelPropertyMacro = function(value) {
-  return value;
-}
-
-if (!Array.prototype.indexOf) {
-  Array.prototype.indexOf = function(obj, start) {
-    for (var i = (start || 0), j = this.length; i < j; i++) {
-      if (this[i] === obj) { return i; }
-    }
-    return -1;
-  }
-}
-
-if (!('filter' in Array.prototype)) {
-  Array.prototype.filter= function(filter, that /*opt*/) {
-    var other= [], v;
-    for (var i=0, n= this.length; i<n; i++)
-      if (i in this && filter.call(that, v= this[i], i, this))
-        other.push(v);
-    return other;
-  };
-}
-
-if (!('map' in Array.prototype)) {
-  Array.prototype.map= function(mapper, that /*opt*/) {
-    var other= new Array(this.length);
-    for (var i= 0, n= this.length; i<n; i++)
-      if (i in this)
-        other[i]= mapper.call(that, this[i], i, this);
-    return other;
-  };
-}
-
-Object.keys = Object.keys || (function () {
-  var hasOwnProperty = Object.prototype.hasOwnProperty,
-    hasDontEnumBug = !{toString:null}.propertyIsEnumerable("toString"),
-    DontEnums = [
-      'toString',
-      'toLocaleString',
-      'valueOf',
-      'hasOwnProperty',
-      'isPrototypeOf',
-      'propertyIsEnumerable',
-      'constructor'
-    ],
-  DontEnumsLength = DontEnums.length;
-
-  return function (o) {
-    if (typeof o != "object" && typeof o != "function" || o === null)
-      throw new TypeError("Object.keys called on a non-object");
-
-    var result = [];
-    for (var name in o) {
-      if (hasOwnProperty.call(o, name))
-        result.push(name);
-    }
-
-    if (hasDontEnumBug) {
-      for (var i = 0; i < DontEnumsLength; i++) {
-        if (hasOwnProperty.call(o, DontEnums[i]))
-          result.push(DontEnums[i]);
-      }
-    }
-
-    return result;
-  };
-})();
-
-var SwaggerApi = function(url, options) {
-  this.isBuilt = false;
-  this.url = null;
-  this.debug = false;
-  this.basePath = null;
-  this.authorizations = null;
-  this.authorizationScheme = null;
-  this.info = null;
-  this.useJQuery = false;
-  this.modelsArray = [];
-
-  options = (options||{});
-  if (url)
-    if (url.url)
-      options = url;
-    else
-      this.url = url;
-  else
-    options = url;
-
-  if (options.url != null)
-    this.url = options.url;
-
-  if (options.success != null)
-    this.success = options.success;
-
-  if (typeof options.useJQuery === 'boolean')
-    this.useJQuery = options.useJQuery;
-
-  this.failure = options.failure != null ? options.failure : function() {};
-  this.progress = options.progress != null ? options.progress : function() {};
-  if (options.success != null) {
-    this.build();
-    this.isBuilt = true;
-  }
-}
-
-SwaggerApi.prototype.build = function() {
-  if(this.isBuilt)
-    return this;
-  var _this = this;
-  this.progress('fetching resource list: ' + this.url);
-  var obj = {
-    useJQuery: this.useJQuery,
-    url: this.url,
-    method: "get",
-    headers: {
-      accept: "application/json,application/json;charset=\"utf-8\",*/*"
-    },
-    on: {
-      error: function(response) {
-        if (_this.url.substring(0, 4) !== 'http') {
-          return _this.fail('Please specify the protocol for ' + _this.url);
-        } else if (response.status === 0) {
-          return _this.fail('Can\'t read from server.  It may not have the appropriate access-control-origin settings.');
-        } else if (response.status === 404) {
-          return _this.fail('Can\'t read swagger JSON from ' + _this.url);
-        } else {
-          return _this.fail(response.status + ' : ' + response.statusText + ' ' + _this.url);
-        }
-      },
-      response: function(resp) {
-        var responseObj = resp.obj || JSON.parse(resp.data);
-        _this.swaggerVersion = responseObj.swaggerVersion;
-        if (_this.swaggerVersion === "1.2") {
-          return _this.buildFromSpec(responseObj);
-        } else {
-          return _this.buildFrom1_1Spec(responseObj);
-        }
-      }
-    }
-  };
-  var e = (typeof window !== 'undefined' ? window : exports);
-  e.authorizations.apply(obj);
-  new SwaggerHttp().execute(obj);
-  return this;
-};
-
-SwaggerApi.prototype.buildFromSpec = function(response) {
-  if (response.apiVersion != null) {
-    this.apiVersion = response.apiVersion;
-  }
-  this.apis = {};
-  this.apisArray = [];
-  this.consumes = response.consumes;
-  this.produces = response.produces;
-  this.authSchemes = response.authorizations;
-  if (response.info != null) {
-    this.info = response.info;
-  }
-  var isApi = false;
-  var i;
-  for (i = 0; i < response.apis.length; i++) {
-    var api = response.apis[i];
-    if (api.operations) {
-      var j;
-      for (j = 0; j < api.operations.length; j++) {
-        operation = api.operations[j];
-        isApi = true;
-      }
-    }
-  }
-  if (response.basePath)
-    this.basePath = response.basePath;
-  else if (this.url.indexOf('?') > 0)
-    this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
-  else
-    this.basePath = this.url;
-
-  if (isApi) {
-    var newName = response.resourcePath.replace(/\//g, '');
-    this.resourcePath = response.resourcePath;
-    res = new SwaggerResource(response, this);
-    this.apis[newName] = res;
-    this.apisArray.push(res);
-  } else {
-    var k;
-    for (k = 0; k < response.apis.length; k++) {
-      var resource = response.apis[k];
-      res = new SwaggerResource(resource, this);
-      this.apis[res.name] = res;
-      this.apisArray.push(res);
-    }
-  }
-  if (this.success) {
-    this.success();
-  }
-  return this;
-};
-
-SwaggerApi.prototype.buildFrom1_1Spec = function(response) {
-  log("This API is using a deprecated version of Swagger!  Please see http://github.com/wordnik/swagger-core/wiki for more info");
-  if (response.apiVersion != null)
-    this.apiVersion = response.apiVersion;
-  this.apis = {};
-  this.apisArray = [];
-  this.produces = response.produces;
-  if (response.info != null) {
-    this.info = response.info;
-  }
-  var isApi = false;
-  for (var i = 0; i < response.apis.length; i++) {
-    var api = response.apis[i];
-    if (api.operations) {
-      for (var j = 0; j < api.operations.length; j++) {
-        operation = api.operations[j];
-        isApi = true;
-      }
-    }
-  }
-  if (response.basePath) {
-    this.basePath = response.basePath;
-  } else if (this.url.indexOf('?') > 0) {
-    this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
-  } else {
-    this.basePath = this.url;
-  }
-  if (isApi) {
-    var newName = response.resourcePath.replace(/\//g, '');
-    this.resourcePath = response.resourcePath;
-    var res = new SwaggerResource(response, this);
-    this.apis[newName] = res;
-    this.apisArray.push(res);
-  } else {
-    for (k = 0; k < response.apis.length; k++) {
-      resource = response.apis[k];
-      res = new SwaggerResource(resource, this);
-      this.apis[res.name] = res;
-      this.apisArray.push(res);
-    }
-  }
-  if (this.success) {
-    this.success();
-  }
-  return this;
-};
-
-SwaggerApi.prototype.selfReflect = function() {
-  var resource, resource_name, _ref;
-  if (this.apis == null) {
-    return false;
-  }
-  _ref = this.apis;
-  for (resource_name in _ref) {
-    resource = _ref[resource_name];
-    if (resource.ready == null) {
-      return false;
-    }
-  }
-  this.setConsolidatedModels();
-  this.ready = true;
-  if (this.success != null) {
-    return this.success();
-  }
-};
-
-SwaggerApi.prototype.fail = function(message) {
-  this.failure(message);
-  throw message;
-};
-
-SwaggerApi.prototype.setConsolidatedModels = function() {
-  var model, modelName, resource, resource_name, _i, _len, _ref, _ref1, _results;
-  this.models = {};
-  _ref = this.apis;
-  for (resource_name in _ref) {
-    resource = _ref[resource_name];
-    for (modelName in resource.models) {
-      if (this.models[modelName] == null) {
-        this.models[modelName] = resource.models[modelName];
-        this.modelsArray.push(resource.models[modelName]);
-      }
-    }
-  }
-  _ref1 = this.modelsArray;
-  _results = [];
-  for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-    model = _ref1[_i];
-    _results.push(model.setReferencedModels(this.models));
-  }
-  return _results;
-};
-
-SwaggerApi.prototype.help = function() {
-  var operation, operation_name, parameter, resource, resource_name, _i, _len, _ref, _ref1, _ref2;
-  _ref = this.apis;
-  for (resource_name in _ref) {
-    resource = _ref[resource_name];
-    log(resource_name);
-    _ref1 = resource.operations;
-    for (operation_name in _ref1) {
-      operation = _ref1[operation_name];
-      log("  " + operation.nickname);
-      _ref2 = operation.parameters;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        parameter = _ref2[_i];
-        log("    " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
-      }
-    }
-  }
-  return this;
-};
-
-var SwaggerResource = function(resourceObj, api) {
-  var _this = this;
-  this.api = api;
-  this.api = this.api;
-  consumes = (this.consumes | []);
-  produces = (this.produces | []);
-  this.path = this.api.resourcePath != null ? this.api.resourcePath : resourceObj.path;
-  this.description = resourceObj.description;
-
-  var parts = this.path.split("/");
-  this.name = parts[parts.length - 1].replace('.{format}', '');
-  this.basePath = this.api.basePath;
-  this.operations = {};
-  this.operationsArray = [];
-  this.modelsArray = [];
-  this.models = {};
-  this.rawModels = {};
-  this.useJQuery = (typeof api.useJQuery !== 'undefined' ? api.useJQuery : null);
-
-  if ((resourceObj.apis != null) && (this.api.resourcePath != null)) {
-    this.addApiDeclaration(resourceObj);
-  } else {
-    if (this.path == null) {
-      this.api.fail("SwaggerResources must have a path.");
-    }
-    if (this.path.substring(0, 4) === 'http') {
-      this.url = this.path.replace('{format}', 'json');
-    } else {
-      this.url = this.api.basePath + this.path.replace('{format}', 'json');
-    }
-    this.api.progress('fetching resource ' + this.name + ': ' + this.url);
-    obj = {
-      url: this.url,
-      method: "get",
-      useJQuery: this.useJQuery,
-      headers: {
-        accept: "application/json,application/json;charset=\"utf-8\",*/*"
-      },
-      on: {
-        response: function(resp) {
-          var responseObj = resp.obj || JSON.parse(resp.data);
-          return _this.addApiDeclaration(responseObj);
-        },
-        error: function(response) {
-          return _this.api.fail("Unable to read api '" +
-            _this.name + "' from path " + _this.url + " (server returned " + response.statusText + ")");
-        }
-      }
-    };
-    var e = typeof window !== 'undefined' ? window : exports;
-    e.authorizations.apply(obj);
-    new SwaggerHttp().execute(obj);
-  }
-}
-
-SwaggerResource.prototype.getAbsoluteBasePath = function (relativeBasePath) {
-  var pos, url;
-  url = this.api.basePath;
-  pos = url.lastIndexOf(relativeBasePath);
-  var parts = url.split("/");
-  var rootUrl = parts[0] + "//" + parts[2];
-
-  if(relativeBasePath.indexOf("http") === 0)
-    return relativeBasePath;
-  if(relativeBasePath === "/")
-    return rootUrl;
-  if(relativeBasePath.substring(0, 1) == "/") {
-    // use root + relative
-    return rootUrl + relativeBasePath;
-  }
-  else {
-    var pos = this.basePath.lastIndexOf("/");
-    var base = this.basePath.substring(0, pos);
-    if(base.substring(base.length - 1) == "/")
-      return base + relativeBasePath;
-    else
-      return base + "/" + relativeBasePath;
-  }
-};
-
-SwaggerResource.prototype.addApiDeclaration = function(response) {
-  if (response.produces != null)
-    this.produces = response.produces;
-  if (response.consumes != null)
-    this.consumes = response.consumes;
-  if ((response.basePath != null) && response.basePath.replace(/\s/g, '').length > 0)
-    this.basePath = response.basePath.indexOf("http") === -1 ? this.getAbsoluteBasePath(response.basePath) : response.basePath;
-
-  this.addModels(response.models);
-  if (response.apis) {
-    for (var i = 0 ; i < response.apis.length; i++) {
-      var endpoint = response.apis[i];
-      this.addOperations(endpoint.path, endpoint.operations, response.consumes, response.produces);
-    }
-  }
-  this.api[this.name] = this;
-  this.ready = true;
-  return this.api.selfReflect();
-};
-
-SwaggerResource.prototype.addModels = function(models) {
-  if (models != null) {
-    var modelName;
-    for (modelName in models) {
-      if (this.models[modelName] == null) {
-        var swaggerModel = new SwaggerModel(modelName, models[modelName]);
-        this.modelsArray.push(swaggerModel);
-        this.models[modelName] = swaggerModel;
-        this.rawModels[modelName] = models[modelName];
-      }
-    }
-    var output = [];
-    for (var i = 0; i < this.modelsArray.length; i++) {
-      model = this.modelsArray[i];
-      output.push(model.setReferencedModels(this.models));
-    }
-    return output;
-  }
-};
-
-SwaggerResource.prototype.addOperations = function(resource_path, ops, consumes, produces) {
-  if (ops) {
-    output = [];
-    for (var i = 0; i < ops.length; i++) {
-      o = ops[i];
-      consumes = this.consumes;
-      produces = this.produces;
-      if (o.consumes != null)
-        consumes = o.consumes;
-      else
-        consumes = this.consumes;
-
-      if (o.produces != null)
-        produces = o.produces;
-      else
-        produces = this.produces;
-      type = (o.type||o.responseClass);
-
-      if (type === "array") {
-        ref = null;
-        if (o.items)
-          ref = o.items["type"] || o.items["$ref"];
-        type = "array[" + ref + "]";
-      }
-      responseMessages = o.responseMessages;
-      method = o.method;
-      if (o.httpMethod) {
-        method = o.httpMethod;
-      }
-      if (o.supportedContentTypes) {
-        consumes = o.supportedContentTypes;
-      }
-      if (o.errorResponses) {
-        responseMessages = o.errorResponses;
-        for (var j = 0; j < responseMessages.length; j++) {
-          r = responseMessages[j];
-          r.message = r.reason;
-          r.reason = null;
-        }
-      }
-      o.nickname = this.sanitize(o.nickname);
-      op = new SwaggerOperation(o.nickname, resource_path, method, o.parameters, o.summary, o.notes, type, responseMessages, this, consumes, produces, o.authorizations);
-      this.operations[op.nickname] = op;
-      output.push(this.operationsArray.push(op));
-    }
-    return output;
-  }
-};
-
-SwaggerResource.prototype.sanitize = function(nickname) {
-  var op;
-  op = nickname.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|.\/?,\\'""-]/g, '_');
-  op = op.replace(/((_){2,})/g, '_');
-  op = op.replace(/^(_)*/g, '');
-  op = op.replace(/([_])*$/g, '');
-  return op;
-};
-
-SwaggerResource.prototype.help = function() {
-  var op = this.operations;
-  var output = [];
-  var operation_name;
-  for (operation_name in op) {
-    operation = op[operation_name];
-    var msg = "  " + operation.nickname;
-    for (var i = 0; i < operation.parameters; i++) {
-      parameter = operation.parameters[i];
-      msg.concat("    " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
-    }
-    output.push(msg);
-  }
-  return output;
-};
-
-var SwaggerModel = function(modelName, obj) {
-  this.name = obj.id != null ? obj.id : modelName;
-  this.properties = [];
-  var propertyName;
-  for (propertyName in obj.properties) {
-    if (obj.required != null) {
-      var value;
-      for (value in obj.required) {
-        if (propertyName === obj.required[value]) {
-          obj.properties[propertyName].required = true;
-        }
-      }
-    }
-    prop = new SwaggerModelProperty(propertyName, obj.properties[propertyName]);
-    this.properties.push(prop);
-  }
-}
-
-SwaggerModel.prototype.setReferencedModels = function(allModels) {
-  var results = [];
-  for (var i = 0; i < this.properties.length; i++) {
-    var property = this.properties[i];
-    var type = property.type || property.dataType;
-    if (allModels[type] != null)
-      results.push(property.refModel = allModels[type]);
-    else if ((property.refDataType != null) && (allModels[property.refDataType] != null))
-      results.push(property.refModel = allModels[property.refDataType]);
-    else
-      results.push(void 0);
-  }
-  return results;
-};
-
-SwaggerModel.prototype.getMockSignature = function(modelsToIgnore) {
-  var propertiesStr = [];
-  for (var i = 0; i < this.properties.length; i++) {
-    prop = this.properties[i];
-    propertiesStr.push(prop.toString());
-  }
-
-  var strong = '<span class="strong">';
-  var stronger = '<span class="stronger">';
-  var strongClose = '</span>';
-  var classOpen = strong + this.name + ' {' + strongClose;
-  var classClose = strong + '}' + strongClose;
-  var returnVal = classOpen + '<div>' + propertiesStr.join(',</div><div>') + '</div>' + classClose;
-  if (!modelsToIgnore)
-    modelsToIgnore = [];
-  modelsToIgnore.push(this.name);
-
-  for (var i = 0; i < this.properties.length; i++) {
-    prop = this.properties[i];
-    if ((prop.refModel != null) && modelsToIgnore.indexOf(prop.refModel.name) === -1) {
-      returnVal = returnVal + ('<br>' + prop.refModel.getMockSignature(modelsToIgnore));
-    }
-  }
-  return returnVal;
-};
-
-SwaggerModel.prototype.createJSONSample = function(modelsToIgnore) {
-  if(sampleModels[this.name]) {
-    return sampleModels[this.name];
-  }
-  else {
-    var result = {};
-    var modelsToIgnore = (modelsToIgnore||[])
-    modelsToIgnore.push(this.name);
-    for (var i = 0; i < this.properties.length; i++) {
-      prop = this.properties[i];
-      result[prop.name] = prop.getSampleValue(modelsToIgnore);
-    }
-    modelsToIgnore.pop(this.name);
-    return result;
-  }
-};
-
-var SwaggerModelProperty = function(name, obj) {
-  this.name = name;
-  this.dataType = obj.type || obj.dataType || obj["$ref"];
-  this.isCollection = this.dataType && (this.dataType.toLowerCase() === 'array' || this.dataType.toLowerCase() === 'list' || this.dataType.toLowerCase() === 'set');
-  this.descr = obj.description;
-  this.required = obj.required;
-  this.defaultValue = modelPropertyMacro(obj.defaultValue);
-  if (obj.items != null) {
-    if (obj.items.type != null) {
-      this.refDataType = obj.items.type;
-    }
-    if (obj.items.$ref != null) {
-      this.refDataType = obj.items.$ref;
-    }
-  }
-  this.dataTypeWithRef = this.refDataType != null ? (this.dataType + '[' + this.refDataType + ']') : this.dataType;
-  if (obj.allowableValues != null) {
-    this.valueType = obj.allowableValues.valueType;
-    this.values = obj.allowableValues.values;
-    if (this.values != null) {
-      this.valuesString = "'" + this.values.join("' or '") + "'";
-    }
-  }
-  if (obj["enum"] != null) {
-    this.valueType = "string";
-    this.values = obj["enum"];
-    if (this.values != null) {
-      this.valueString = "'" + this.values.join("' or '") + "'";
-    }
-  }
-}
-
-SwaggerModelProperty.prototype.getSampleValue = function(modelsToIgnore) {
-  var result;
-  if ((this.refModel != null) && (modelsToIgnore.indexOf(prop.refModel.name) === -1)) {
-    result = this.refModel.createJSONSample(modelsToIgnore);
-  } else {
-    if (this.isCollection) {
-      result = this.toSampleValue(this.refDataType);
-    } else {
-      result = this.toSampleValue(this.dataType);
-    }
-  }
-  if (this.isCollection) {
-    return [result];
-  } else {
-    return result;
-  }
-};
-
-SwaggerModelProperty.prototype.toSampleValue = function(value) {
-  var result;
-  if ((typeof this.defaultValue !== 'undefined') && this.defaultValue !== null) {
-    result = this.defaultValue;
-  } else if (value === "integer") {
-    result = 0;
-  } else if (value === "boolean") {
-    result = false;
-  } else if (value === "double" || value === "number") {
-    result = 0.0;
-  } else if (value === "string") {
-    result = "";
-  } else {
-    result = value;
-  }
-  return result;
-};
-
-SwaggerModelProperty.prototype.toString = function() {
-  var req = this.required ? 'propReq' : 'propOpt';
-  var str = '<span class="propName ' + req + '">' + this.name + '</span> (<span class="propType">' + this.dataTypeWithRef + '</span>';
-  if (!this.required) {
-    str += ', <span class="propOptKey">optional</span>';
-  }
-  str += ')';
-  if (this.values != null) {
-    str += " = <span class='propVals'>['" + this.values.join("' or '") + "']</span>";
-  }
-  if (this.descr != null) {
-    str += ': <span class="propDesc">' + this.descr + '</span>';
-  }
-  return str;
-};
-
-var SwaggerOperation = function(nickname, path, method, parameters, summary, notes, type, responseMessages, resource, consumes, produces, authorizations) {
-  var _this = this;
-
-  var errors = [];
-  this.nickname = (nickname||errors.push("SwaggerOperations must have a nickname."));
-  this.path = (path||errors.push("SwaggerOperation " + nickname + " is missing path."));
-  this.method = (method||errors.push("SwaggerOperation " + nickname + " is missing method."));
-  this.parameters = parameters != null ? parameters : [];
-  this.summary = summary;
-  this.notes = notes;
-  this.type = type;
-  this.responseMessages = (responseMessages||[]);
-  this.resource = (resource||errors.push("Resource is required"));
-  this.consumes = consumes;
-  this.produces = produces;
-  this.authorizations = authorizations;
-  this["do"] = __bind(this["do"], this);
-
-  if (errors.length > 0)
-    this.resource.api.fail(errors);
-
-  this.path = this.path.replace('{format}', 'json');
-  this.method = this.method.toLowerCase();
-  this.isGetMethod = this.method === "get";
-
-  this.resourceName = this.resource.name;
-  if(typeof this.type !== 'undefined' && this.type === 'void')
-    this.type = null;
-  else {
-    this.responseClassSignature = this.getSignature(this.type, this.resource.models);
-    this.responseSampleJSON = this.getSampleJSON(this.type, this.resource.models);
-  }
-
-  for(var i = 0; i < this.parameters.length; i ++) {
-    var param = this.parameters[i];
-    // might take this away
-    param.name = param.name || param.type || param.dataType;
-
-    // for 1.1 compatibility
-    var type = param.type || param.dataType;
-    if(type === 'array') {
-      type = 'array[' + (param.items.$ref ? param.items.$ref : param.items.type) + ']';
-    }
-    param.type = type;
-
-    if(type.toLowerCase() === 'boolean') {
-      param.allowableValues = {};
-      param.allowableValues.values = ["true", "false"];
-    }
-    param.signature = this.getSignature(type, this.resource.models);
-    param.sampleJSON = this.getSampleJSON(type, this.resource.models);
-
-    var enumValue = param["enum"];
-    if(enumValue != null) {
-      param.isList = true;
-      param.allowableValues = {};
-      param.allowableValues.descriptiveValues = [];
-
-      for(var j = 0; j < enumValue.length; j++) {
-        var v = enumValue[j];
-        if(param.defaultValue != null) {
-          param.allowableValues.descriptiveValues.push ({
-            value: String(v),
-            isDefault: (v === param.defaultValue)
-          });
-        }
-        else {
-          param.allowableValues.descriptiveValues.push ({
-            value: String(v),
-            isDefault: false
-          });
-        }
-      }
-    }
-    else if(param.allowableValues != null) {
-      if(param.allowableValues.valueType === "RANGE")
-        param.isRange = true;
-      else
-        param.isList = true;
-      if(param.allowableValues != null) {
-        param.allowableValues.descriptiveValues = [];
-        if(param.allowableValues.values) {
-          for(var j = 0; j < param.allowableValues.values.length; j++){
-            var v = param.allowableValues.values[j];
-            if(param.defaultValue != null) {
-              param.allowableValues.descriptiveValues.push ({
-                value: String(v),
-                isDefault: (v === param.defaultValue)
-              });
-            }
-            else {
-              param.allowableValues.descriptiveValues.push ({
-                value: String(v),
-                isDefault: false
-              });
-            }
-          }
-        }
-      }
-    }
-    param.defaultValue = parameterMacro(param.defaultValue);
-  }
-  this.resource[this.nickname] = function(args, callback, error) {
-    return _this["do"](args, callback, error);
-  };
-  this.resource[this.nickname].help = function() {
-    return _this.help();
-  };
-}
-
-SwaggerOperation.prototype.isListType = function(type) {
-  if (type && type.indexOf('[') >= 0) {
-    return type.substring(type.indexOf('[') + 1, type.indexOf(']'));
-  } else {
-    return void 0;
-  }
-};
-
-SwaggerOperation.prototype.getSignature = function(type, models) {
-  var isPrimitive, listType;
-  listType = this.isListType(type);
-  isPrimitive = ((listType != null) && models[listType]) || (models[type] != null) ? false : true;
-  if (isPrimitive) {
-    return type;
-  } else {
-    if (listType != null) {
-      return models[listType].getMockSignature();
-    } else {
-      return models[type].getMockSignature();
-    }
-  }
-};
-
-SwaggerOperation.prototype.getSampleJSON = function(type, models) {
-  var isPrimitive, listType, val;
-  listType = this.isListType(type);
-  isPrimitive = ((listType != null) && models[listType]) || (models[type] != null) ? false : true;
-  val = isPrimitive ? void 0 : (listType != null ? models[listType].createJSONSample() : models[type].createJSONSample());
-  if (val) {
-    val = listType ? [val] : val;
-    if(typeof val == "string")
-      return val;
-    else if(typeof val === "object") {
-      var t = val;
-      if(val instanceof Array && val.length > 0) {
-        t = val[0];
-      }
-      if(t.nodeName) {
-        var xmlString = new XMLSerializer().serializeToString(t);
-        return this.formatXml(xmlString);
-      }
-      else
-        return JSON.stringify(val, null, 2);
-    }
-    else
-      return val;
-  }
-};
-
-SwaggerOperation.prototype["do"] = function(args, opts, callback, error) {
-  var key, param, params, possibleParams, req, requestContentType, responseContentType, value, _i, _len, _ref;
-  if (args == null) {
-    args = {};
-  }
-  if (opts == null) {
-    opts = {};
-  }
-  requestContentType = null;
-  responseContentType = null;
-  if ((typeof args) === "function") {
-    error = opts;
-    callback = args;
-    args = {};
-  }
-  if ((typeof opts) === "function") {
-    error = callback;
-    callback = opts;
-  }
-  if (error == null) {
-    error = function(xhr, textStatus, error) {
-      return log(xhr, textStatus, error);
-    };
-  }
-  if (callback == null) {
-    callback = function(response) {
-      var content;
-      content = null;
-      if (response != null) {
-        content = response.data;
-      } else {
-        content = "no data";
-      }
-      return log("default callback: " + content);
-    };
-  }
-  params = {};
-  params.headers = [];
-  if (args.headers != null) {
-    params.headers = args.headers;
-    delete args.headers;
-  }
-
-  var possibleParams = [];
-  for(var i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
-    if(param.paramType === 'header') {
-      if(args[param.name])
-        params.headers[param.name] = args[param.name];
-    }
-    else if(param.paramType === 'form' || param.paramType.toLowerCase() === 'file')
-      possibleParams.push(param);
-  }
-
-  if (args.body != null) {
-    params.body = args.body;
-    delete args.body;
-  }
-
-  if (possibleParams) {
-    var key;
-    for (key in possibleParams) {
-      value = possibleParams[key];
-      if (args[value.name]) {
-        params[value.name] = args[value.name];
-      }
-    }
-  }
-
-  req = new SwaggerRequest(this.method, this.urlify(args), params, opts, callback, error, this);
-  if (opts.mock != null) {
-    return req;
-  } else {
-    return true;
-  }
-};
-
-SwaggerOperation.prototype.pathJson = function() {
-  return this.path.replace("{format}", "json");
-};
-
-SwaggerOperation.prototype.pathXml = function() {
-  return this.path.replace("{format}", "xml");
-};
-
-SwaggerOperation.prototype.encodePathParam = function(pathParam) {
-  var encParts, part, parts, _i, _len;
-  pathParam = pathParam.toString();
-  if (pathParam.indexOf("/") === -1) {
-    return encodeURIComponent(pathParam);
-  } else {
-    parts = pathParam.split("/");
-    encParts = [];
-    for (_i = 0, _len = parts.length; _i < _len; _i++) {
-      part = parts[_i];
-      encParts.push(encodeURIComponent(part));
-    }
-    return encParts.join("/");
-  }
-};
-
-SwaggerOperation.prototype.urlify = function(args) {
-  var url = this.resource.basePath + this.pathJson();
-  var params = this.parameters;
-  for(var i = 0; i < params.length; i ++){
-    var param = params[i];
-    if (param.paramType === 'path') {
-      if(args[param.name]) {
-        // apply path params and remove from args
-        var reg = new RegExp('\{' + param.name + '[^\}]*\}', 'gi');
-        url = url.replace(reg, this.encodePathParam(args[param.name]));
-        delete args[param.name];
-      }
-      else
-        throw "" + param.name + " is a required path param.";
-    }
-  }
-
-  var queryParams = "";
-  for(var i = 0; i < params.length; i ++){
-    var param = params[i];
-    if(param.paramType === 'query') {
-      if (args[param.name] !== undefined) {
-        if (queryParams !== '')
-          queryParams += "&";
-        queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
-      }
-    }
-  }
-  if ((queryParams != null) && queryParams.length > 0)
-    url += '?' + queryParams;
-  return url;
-};
-
-SwaggerOperation.prototype.supportHeaderParams = function() {
-  return this.resource.api.supportHeaderParams;
-};
-
-SwaggerOperation.prototype.supportedSubmitMethods = function() {
-  return this.resource.api.supportedSubmitMethods;
-};
-
-SwaggerOperation.prototype.getQueryParams = function(args) {
-  return this.getMatchingParams(['query'], args);
-};
-
-SwaggerOperation.prototype.getHeaderParams = function(args) {
-  return this.getMatchingParams(['header'], args);
-};
-
-SwaggerOperation.prototype.getMatchingParams = function(paramTypes, args) {
-  var matchingParams = {};
-  var params = this.parameters;
-  for (var i = 0; i < params.length; i++) {
-    param = params[i];
-    if (args && args[param.name])
-      matchingParams[param.name] = args[param.name];
-  }
-  var headers = this.resource.api.headers;
-  var name;
-  for (name in headers) {
-    var value = headers[name];
-    matchingParams[name] = value;
-  }
-  return matchingParams;
-};
-
-SwaggerOperation.prototype.help = function() {
-  var msg = "";
-  var params = this.parameters;
-  for (var i = 0; i < params.length; i++) {
-    var param = params[i];
-    if (msg !== "")
-      msg += "\n";
-    msg += "* " + param.name + (param.required ? ' (required)' : '') + " - " + param.description;
-  }
-  return msg;
-};
-
-
-SwaggerOperation.prototype.formatXml = function(xml) {
-  var contexp, formatted, indent, lastType, lines, ln, pad, reg, transitions, wsexp, _fn, _i, _len;
-  reg = /(>)(<)(\/*)/g;
-  wsexp = /[ ]*(.*)[ ]+\n/g;
-  contexp = /(<.+>)(.+\n)/g;
-  xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
-  pad = 0;
-  formatted = '';
-  lines = xml.split('\n');
-  indent = 0;
-  lastType = 'other';
-  transitions = {
-    'single->single': 0,
-    'single->closing': -1,
-    'single->opening': 0,
-    'single->other': 0,
-    'closing->single': 0,
-    'closing->closing': -1,
-    'closing->opening': 0,
-    'closing->other': 0,
-    'opening->single': 1,
-    'opening->closing': 0,
-    'opening->opening': 1,
-    'opening->other': 1,
-    'other->single': 0,
-    'other->closing': -1,
-    'other->opening': 0,
-    'other->other': 0
-  };
-  _fn = function(ln) {
-    var fromTo, j, key, padding, type, types, value;
-    types = {
-      single: Boolean(ln.match(/<.+\/>/)),
-      closing: Boolean(ln.match(/<\/.+>/)),
-      opening: Boolean(ln.match(/<[^!?].*>/))
-    };
-    type = ((function() {
-      var _results;
-      _results = [];
-      for (key in types) {
-        value = types[key];
-        if (value) {
-          _results.push(key);
-        }
-      }
-      return _results;
-    })())[0];
-    type = type === void 0 ? 'other' : type;
-    fromTo = lastType + '->' + type;
-    lastType = type;
-    padding = '';
-    indent += transitions[fromTo];
-    padding = ((function() {
-      var _j, _ref5, _results;
-      _results = [];
-      for (j = _j = 0, _ref5 = indent; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; j = 0 <= _ref5 ? ++_j : --_j) {
-        _results.push('  ');
-      }
-      return _results;
-    })()).join('');
-    if (fromTo === 'opening->closing') {
-      return formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
-    } else {
-      return formatted += padding + ln + '\n';
-    }
-  };
-  for (_i = 0, _len = lines.length; _i < _len; _i++) {
-    ln = lines[_i];
-    _fn(ln);
-  }
-  return formatted;
-};
-
-var SwaggerRequest = function(type, url, params, opts, successCallback, errorCallback, operation, execution) {
-  var _this = this;
-  var errors = [];
-  this.useJQuery = (typeof operation.resource.useJQuery !== 'undefined' ? operation.resource.useJQuery : null);
-  this.type = (type||errors.push("SwaggerRequest type is required (get/post/put/delete/patch/options)."));
-  this.url = (url||errors.push("SwaggerRequest url is required."));
-  this.params = params;
-  this.opts = opts;
-  this.successCallback = (successCallback||errors.push("SwaggerRequest successCallback is required."));
-  this.errorCallback = (errorCallback||errors.push("SwaggerRequest error callback is required."));
-  this.operation = (operation||errors.push("SwaggerRequest operation is required."));
-  this.execution = execution;
-  this.headers = (params.headers||{});
-
-  if(errors.length > 0) {
-    throw errors;
-  }
-
-  this.type = this.type.toUpperCase();
-
-  // set request, response content type headers
-  var headers = this.setHeaders(params, this.operation);
-  var body = params.body;
-
-  // encode the body for form submits
-  if (headers["Content-Type"]) {
-    var values = {};
-    var i;
-    var operationParams = this.operation.parameters;
-    for(i = 0; i < operationParams.length; i++) {
-      var param = operationParams[i];
-      if(param.paramType === "form")
-        values[param.name] = param;
-    }
-
-    if(headers["Content-Type"].indexOf("application/x-www-form-urlencoded") === 0) {
-      var encoded = "";
-      var key;
-      for(key in values) {
-        value = this.params[key];
-        if(typeof value !== 'undefined'){
-          if(encoded !== "")
-            encoded += "&";
-          encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
-        }
-      }
-      body = encoded;
-    }
-    else if (headers["Content-Type"].indexOf("multipart/form-data") === 0) {
-      // encode the body for form submits
-      var data = "";
-      var boundary = "----SwaggerFormBoundary" + Date.now();
-      var key;
-      for(key in values) {
-        value = this.params[key];
-        if(typeof value !== 'undefined') {
-          data += '--' + boundary + '\n';
-          data += 'Content-Disposition: form-data; name="' + key + '"';
-          data += '\n\n';
-          data += value + "\n";
-        }
-      }
-      data += "--" + boundary + "--\n";
-      headers["Content-Type"] = "multipart/form-data; boundary=" + boundary;
-      body = data;
-    }
-  }
-
-  if (!((this.headers != null) && (this.headers.mock != null))) {
-    obj = {
-      url: this.url,
-      method: this.type,
-      headers: headers,
-      body: body,
-      useJQuery: this.useJQuery,
-      on: {
-        error: function(response) {
-          return _this.errorCallback(response, _this.opts.parent);
-        },
-        redirect: function(response) {
-          return _this.successCallback(response, _this.opts.parent);
-        },
-        307: function(response) {
-          return _this.successCallback(response, _this.opts.parent);
-        },
-        response: function(response) {
-          return _this.successCallback(response, _this.opts.parent);
-        }
-      }
-    };
-    var e;
-    if (typeof window !== 'undefined') {
-      e = window;
-    } else {
-      e = exports;
-    }
-    status = e.authorizations.apply(obj, this.operation.authorizations);
-    if (opts.mock == null) {
-      if (status !== false) {
-        new SwaggerHttp().execute(obj);
-      } else {
-        obj.canceled = true;
-      }
-    } else {
-      return obj;
-    }
-  }
-};
-
-SwaggerRequest.prototype.setHeaders = function(params, operation) {
-  // default type
-  var accepts = "application/json";
-  var consumes = "application/json";
-
-  var allDefinedParams = this.operation.parameters;
-  var definedFormParams = [];
-  var definedFileParams = [];
-  var body = params.body;
-  var headers = {};
-
-  // get params from the operation and set them in definedFileParams, definedFormParams, headers
-  var i;
-  for(i = 0; i < allDefinedParams.length; i++) {
-    var param = allDefinedParams[i];
-    if(param.paramType === "form")
-      definedFormParams.push(param);
-    else if(param.paramType === "file")
-      definedFileParams.push(param);
-    else if(param.paramType === "header" && this.params.headers) {
-      var key = param.name;
-      var headerValue = this.params.headers[param.name];
-      if(typeof this.params.headers[param.name] !== 'undefined')
-        headers[key] = headerValue;
-    }
-  }
-
-  // if there's a body, need to set the accepts header via requestContentType
-  if (body && (this.type === "POST" || this.type === "PUT" || this.type === "PATCH" || this.type === "DELETE")) {
-    if (this.opts.requestContentType)
-      consumes = this.opts.requestContentType;
-  } else {
-    // if any form params, content type must be set
-    if(definedFormParams.length > 0) {
-      if(definedFileParams.length > 0)
-        consumes = "multipart/form-data";
-      else
-        consumes = "application/x-www-form-urlencoded";
-    }
-    else if (this.type === "DELETE")
-      body = "{}";
-    else if (this.type != "DELETE")
-      accepts = null;
-  }
-
-  if (consumes && this.operation.consumes) {
-    if (this.operation.consumes.indexOf(consumes) === -1) {
-      log("server doesn't consume " + consumes + ", try " + JSON.stringify(this.operation.consumes));
-      consumes = this.operation.consumes[0];
-    }
-  }
-
-  if (this.opts.responseContentType) {
-    accepts = this.opts.responseContentType;
-  } else {
-    accepts = "application/json";
-  }
-  if (accepts && this.operation.produces) {
-    if (this.operation.produces.indexOf(accepts) === -1) {
-      log("server can't produce " + accepts);
-      accepts = this.operation.produces[0];
-    }
-  }
-
-  if ((consumes && body !== "") || (consumes === "application/x-www-form-urlencoded"))
-    headers["Content-Type"] = consumes;
-  if (accepts)
-    headers["Accept"] = accepts;
-  return headers;
-}
-
-SwaggerRequest.prototype.asCurl = function() {
-  var results = [];
-  if(this.headers) {
-    var key;
-    for(key in this.headers) {
-      results.push("--header \"" + key + ": " + this.headers[v] + "\"");
-    }
-  }
-  return "curl " + (results.join(" ")) + " " + this.url;
-};
-
-/**
- * SwaggerHttp is a wrapper for executing requests
- */
-var SwaggerHttp = function() {};
-
-SwaggerHttp.prototype.execute = function(obj) {
-  if(obj && (typeof obj.useJQuery === 'boolean'))
-    this.useJQuery = obj.useJQuery;
-  else
-    this.useJQuery = this.isIE8();
-
-  if(this.useJQuery)
-    return new JQueryHttpClient().execute(obj);
-  else
-    return new ShredHttpClient().execute(obj);
-}
-
-SwaggerHttp.prototype.isIE8 = function() {
-  var detectedIE = false;
-  if (typeof navigator !== 'undefined' && navigator.userAgent) {
-    nav = navigator.userAgent.toLowerCase();
-    if (nav.indexOf('msie') !== -1) {
-      var version = parseInt(nav.split('msie')[1]);
-      if (version <= 8) {
-        detectedIE = true;
-      }
-    }
-  }
-  return detectedIE;
-};
-
-/*
- * JQueryHttpClient lets a browser take advantage of JQuery's cross-browser magic.
- * NOTE: when jQuery is available it will export both '$' and 'jQuery' to the global space.
- *       Since we are using closures here we need to alias it for internal use.
- */
-var JQueryHttpClient = function(options) {
-  "use strict";
-  if(!jQuery){
-    var jQuery = window.jQuery;
-  }
-}
-
-JQueryHttpClient.prototype.execute = function(obj) {
-  var cb = obj.on;
-  var request = obj;
-
-  obj.type = obj.method;
-  obj.cache = false;
-
-  obj.beforeSend = function(xhr) {
-    var key, results;
-    if (obj.headers) {
-      results = [];
-      var key;
-      for (key in obj.headers) {
-        if (key.toLowerCase() === "content-type") {
-          results.push(obj.contentType = obj.headers[key]);
-        } else if (key.toLowerCase() === "accept") {
-          results.push(obj.accepts = obj.headers[key]);
-        } else {
-          results.push(xhr.setRequestHeader(key, obj.headers[key]));
-        }
-      }
-      return results;
-    }
-  };
-
-  obj.data = obj.body;
-  obj.complete = function(response, textStatus, opts) {
-    var headers = {},
-        headerArray = response.getAllResponseHeaders().split("\n");
-
-    for(var i = 0; i < headerArray.length; i++) {
-      var toSplit = headerArray[i].trim();
-      if(toSplit.length === 0)
-        continue;
-      var separator = toSplit.indexOf(":");
-      if(separator === -1) {
-        // Name but no value in the header
-        headers[toSplit] = null;
-        continue;
-      }
-      var name = toSplit.substring(0, separator).trim(),
-          value = toSplit.substring(separator + 1).trim();
-      headers[name] = value;
-    }
-
-    var out = {
-      url: request.url,
-      method: request.method,
-      status: response.status,
-      data: response.responseText,
-      headers: headers
-    };
-
-    var contentType = (headers["content-type"]||headers["Content-Type"]||null)
-
-    if(contentType != null) {
-      if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
-        if(response.responseText && response.responseText !== "")
-          out.obj = JSON.parse(response.responseText);
-        else
-          out.obj = {}
-      }
-    }
-
-    if(response.status >= 200 && response.status < 300)
-      cb.response(out);
-    else if(response.status === 0 || (response.status >= 400 && response.status < 599))
-      cb.error(out);
-    else
-      return cb.response(out);
-  };
-
-  jQuery.support.cors = true;
-  return jQuery.ajax(obj);
-}
-
-/*
- * ShredHttpClient is a light-weight, node or browser HTTP client
- */
-var ShredHttpClient = function(options) {
-  this.options = (options||{});
-  this.isInitialized = false;
-
-  var identity, toString;
-
-  if (typeof window !== 'undefined') {
-    this.Shred = require("./shred");
-    this.content = require("./shred/content");
-  }
-  else
-    this.Shred = require("shred");
-  this.shred = new this.Shred();
-}
-
-ShredHttpClient.prototype.initShred = function () {
-  this.isInitialized = true;
-  this.registerProcessors(this.shred);
-}
-
-ShredHttpClient.prototype.registerProcessors = function(shred) {
-  var identity = function(x) {
-    return x;
-  };
-  var toString = function(x) {
-    return x.toString();
-  };
-
-  if (typeof window !== 'undefined') {
-    this.content.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
-      parser: identity,
-      stringify: toString
-    });
-  } else {
-    this.Shred.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
-      parser: identity,
-      stringify: toString
-    });
-  }
-}
-
-ShredHttpClient.prototype.execute = function(obj) {
-  if(!this.isInitialized)
-    this.initShred();
-
-  var cb = obj.on, res;
-
-  var transform = function(response) {
-    var out = {
-      headers: response._headers,
-      url: response.request.url,
-      method: response.request.method,
-      status: response.status,
-      data: response.content.data
-    };
-
-    var contentType = (response._headers["content-type"]||response._headers["Content-Type"]||null)
-
-    if(contentType != null) {
-      if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
-        if(response.content.data && response.content.data !== "")
-          out.obj = JSON.parse(response.content.data);
-        else
-          out.obj = {}
-      }
-    }
-    return out;
-  };
-
-  // Transform an error into a usable response-like object
-  var transformError = function(error) {
-    var out = {
-      // Default to a status of 0 - The client will treat this as a generic permissions sort of error
-      status: 0,
-      data: error.message || error
-    };
-
-    if(error.code) {
-      out.obj = error;
-
-      if(error.code === 'ENOTFOUND' || error.code === 'ECONNREFUSED' ) {
-        // We can tell the client that this should be treated as a missing resource and not as a permissions thing
-        out.status = 404;
-      }
-    }
-
-    return out;
-  };
-
-  res = {
-    error: function(response) {
-      if (obj)
-        return cb.error(transform(response));
-    },
-    // Catch the Shred error raised when the request errors as it is made (i.e. No Response is coming)
-    request_error: function(err) {
-      if(obj)
-        return cb.error(transformError(err));
-    },
-    redirect: function(response) {
-      if (obj)
-        return cb.redirect(transform(response));
-    },
-    307: function(response) {
-      if (obj)
-        return cb.redirect(transform(response));
-    },
-    response: function(response) {
-      if (obj)
-        return cb.response(transform(response));
-    }
-  };
-  if (obj) {
-    obj.on = res;
-  }
-  return this.shred.request(obj);
-};
-
-/**
- * SwaggerAuthorizations applys the correct authorization to an operation being executed
- */
-var SwaggerAuthorizations = function() {
-  this.authz = {};
-};
-
-SwaggerAuthorizations.prototype.add = function(name, auth) {
-  this.authz[name] = auth;
-  return auth;
-};
-
-SwaggerAuthorizations.prototype.remove = function(name) {
-  return delete this.authz[name];
-};
-
-SwaggerAuthorizations.prototype.apply = function(obj, authorizations) {
-  var status = null;
-  var key;
-
-  // if the "authorizations" key is undefined, or has an empty array, add all keys
-  if(typeof authorizations === 'undefined' || Object.keys(authorizations).length == 0) {
-    for (key in this.authz) {
-      value = this.authz[key];
-      result = value.apply(obj, authorizations);
-      if (result === true)
-        status = true;
-    }
-  }
-  else {
-    for(name in authorizations) {
-      for (key in this.authz) {
-        if(key == name) {
-          value = this.authz[key];
-          result = value.apply(obj, authorizations);
-          if (result === true)
-            status = true;
-        }
-      }      
-    }
-  }
-
-  return status;
-};
-
-/**
- * ApiKeyAuthorization allows a query param or header to be injected
- */
-var ApiKeyAuthorization = function(name, value, type, delimiter) {
-  this.name = name;
-  this.value = value;
-  this.type = type;
-  this.delimiter = delimiter;
-};
-
-ApiKeyAuthorization.prototype.apply = function(obj, authorizations) {
-  if (this.type === "query") {
-    if (obj.url.indexOf('?') > 0)
-      obj.url = obj.url + "&" + this.name + "=" + this.value;
-    else
-      obj.url = obj.url + "?" + this.name + "=" + this.value;
-    return true;
-  } else if (this.type === "header") {
-    if(typeof obj.headers[this.name] !== 'undefined') {
-      if(typeof this.delimiter !== 'undefined')
-        obj.headers[this.name] = obj.headers[this.name] + this.delimiter +  this.value;
-    }
-    else
-      obj.headers[this.name] = this.value;
-    return true;
-  }
-};
-
-var CookieAuthorization = function(cookie) {
-  this.cookie = cookie;
-}
-
-CookieAuthorization.prototype.apply = function(obj, authorizations) {
-  obj.cookieJar = obj.cookieJar || CookieJar();
-  obj.cookieJar.setCookie(this.cookie);
-  return true;
-}
-
-/**
- * Password Authorization is a basic auth implementation
- */
-var PasswordAuthorization = function(name, username, password) {
-  this.name = name;
-  this.username = username;
-  this.password = password;
-  this._btoa = null;
-  if (typeof window !== 'undefined')
-    this._btoa = btoa;
-  else
-    this._btoa = require("btoa");
-};
-
-PasswordAuthorization.prototype.apply = function(obj, authorizations) {
-  var base64encoder = this._btoa;
-  obj.headers["Authorization"] = "Basic " + base64encoder(this.username + ":" + this.password);
-  return true;
-};
-
-var e = (typeof window !== 'undefined' ? window : exports);
-
-var sampleModels = {};
-var cookies = {};
-
-e.SampleModels = sampleModels;
-e.SwaggerHttp = SwaggerHttp;
-e.SwaggerRequest = SwaggerRequest;
-e.authorizations = new SwaggerAuthorizations();
-e.ApiKeyAuthorization = ApiKeyAuthorization;
-e.PasswordAuthorization = PasswordAuthorization;
-e.CookieAuthorization = CookieAuthorization;
-e.JQueryHttpClient = JQueryHttpClient;
-e.ShredHttpClient = ShredHttpClient;
-e.SwaggerOperation = SwaggerOperation;
-e.SwaggerModel = SwaggerModel;
-e.SwaggerModelProperty = SwaggerModelProperty;
-e.SwaggerResource = SwaggerResource;
-e.SwaggerApi = SwaggerApi;
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js
deleted file mode 100644
index 11f1d96f533..00000000000
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//     Underscore.js 1.7.0
-//     http://underscorejs.org
-//     (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
-//     Underscore may be freely distributed under the MIT license.
-(function(){var n=this,t=n._,r=Array.prototype,e=Object.prototype,u=Function.prototype,i=r.push,a=r.slice,o=r.concat,l=e.toString,c=e.hasOwnProperty,f=Array.isArray,s=Object.keys,p=u.bind,h=function(n){return n instanceof h?n:this instanceof h?void(this._wrapped=n):new h(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=h),exports._=h):n._=h,h.VERSION="1.7.0";var g=function(n,t,r){if(t===void 0)return n;switch(null==r?3:r){case 1:return function(r){return n.call(t,r)};case 2:return function(r,e){return n.call(t,r,e)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,i){return n.call(t,r,e,u,i)}}return function(){return n.apply(t,arguments)}};h.iteratee=function(n,t,r){return null==n?h.identity:h.isFunction(n)?g(n,t,r):h.isObject(n)?h.matches(n):h.property(n)},h.each=h.forEach=function(n,t,r){if(null==n)return n;t=g(t,r);var e,u=n.length;if(u===+u)for(e=0;u>e;e++)t(n[e],e,n);else{var i=h.keys(n);for(e=0,u=i.length;u>e;e++)t(n[i[e]],i[e],n)}return n},h.map=h.collect=function(n,t,r){if(null==n)return[];t=h.iteratee(t,r);for(var e,u=n.length!==+n.length&&h.keys(n),i=(u||n).length,a=Array(i),o=0;i>o;o++)e=u?u[o]:o,a[o]=t(n[e],e,n);return a};var v="Reduce of empty array with no initial value";h.reduce=h.foldl=h.inject=function(n,t,r,e){null==n&&(n=[]),t=g(t,e,4);var u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length,o=0;if(arguments.length<3){if(!a)throw new TypeError(v);r=n[i?i[o++]:o++]}for(;a>o;o++)u=i?i[o]:o,r=t(r,n[u],u,n);return r},h.reduceRight=h.foldr=function(n,t,r,e){null==n&&(n=[]),t=g(t,e,4);var u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;if(arguments.length<3){if(!a)throw new TypeError(v);r=n[i?i[--a]:--a]}for(;a--;)u=i?i[a]:a,r=t(r,n[u],u,n);return r},h.find=h.detect=function(n,t,r){var e;return t=h.iteratee(t,r),h.some(n,function(n,r,u){return t(n,r,u)?(e=n,!0):void 0}),e},h.filter=h.select=function(n,t,r){var e=[];return null==n?e:(t=h.iteratee(t,r),h.each(n,function(n,r,u){t(n,r,u)&&e.push(n)}),e)},h.reject=function(n,t,r){return h.filter(n,h.negate(h.iteratee(t)),r)},h.every=h.all=function(n,t,r){if(null==n)return!0;t=h.iteratee(t,r);var e,u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;for(e=0;a>e;e++)if(u=i?i[e]:e,!t(n[u],u,n))return!1;return!0},h.some=h.any=function(n,t,r){if(null==n)return!1;t=h.iteratee(t,r);var e,u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;for(e=0;a>e;e++)if(u=i?i[e]:e,t(n[u],u,n))return!0;return!1},h.contains=h.include=function(n,t){return null==n?!1:(n.length!==+n.length&&(n=h.values(n)),h.indexOf(n,t)>=0)},h.invoke=function(n,t){var r=a.call(arguments,2),e=h.isFunction(t);return h.map(n,function(n){return(e?t:n[t]).apply(n,r)})},h.pluck=function(n,t){return h.map(n,h.property(t))},h.where=function(n,t){return h.filter(n,h.matches(t))},h.findWhere=function(n,t){return h.find(n,h.matches(t))},h.max=function(n,t,r){var e,u,i=-1/0,a=-1/0;if(null==t&&null!=n){n=n.length===+n.length?n:h.values(n);for(var o=0,l=n.length;l>o;o++)e=n[o],e>i&&(i=e)}else t=h.iteratee(t,r),h.each(n,function(n,r,e){u=t(n,r,e),(u>a||u===-1/0&&i===-1/0)&&(i=n,a=u)});return i},h.min=function(n,t,r){var e,u,i=1/0,a=1/0;if(null==t&&null!=n){n=n.length===+n.length?n:h.values(n);for(var o=0,l=n.length;l>o;o++)e=n[o],i>e&&(i=e)}else t=h.iteratee(t,r),h.each(n,function(n,r,e){u=t(n,r,e),(a>u||1/0===u&&1/0===i)&&(i=n,a=u)});return i},h.shuffle=function(n){for(var t,r=n&&n.length===+n.length?n:h.values(n),e=r.length,u=Array(e),i=0;e>i;i++)t=h.random(0,i),t!==i&&(u[i]=u[t]),u[t]=r[i];return u},h.sample=function(n,t,r){return null==t||r?(n.length!==+n.length&&(n=h.values(n)),n[h.random(n.length-1)]):h.shuffle(n).slice(0,Math.max(0,t))},h.sortBy=function(n,t,r){return t=h.iteratee(t,r),h.pluck(h.map(n,function(n,r,e){return{value:n,index:r,criteria:t(n,r,e)}}).sort(function(n,t){var r=n.criteria,e=t.criteria;if(r!==e){if(r>e||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var m=function(n){return function(t,r,e){var u={};return r=h.iteratee(r,e),h.each(t,function(e,i){var a=r(e,i,t);n(u,e,a)}),u}};h.groupBy=m(function(n,t,r){h.has(n,r)?n[r].push(t):n[r]=[t]}),h.indexBy=m(function(n,t,r){n[r]=t}),h.countBy=m(function(n,t,r){h.has(n,r)?n[r]++:n[r]=1}),h.sortedIndex=function(n,t,r,e){r=h.iteratee(r,e,1);for(var u=r(t),i=0,a=n.length;a>i;){var o=i+a>>>1;r(n[o])<u?i=o+1:a=o}return i},h.toArray=function(n){return n?h.isArray(n)?a.call(n):n.length===+n.length?h.map(n,h.identity):h.values(n):[]},h.size=function(n){return null==n?0:n.length===+n.length?n.length:h.keys(n).length},h.partition=function(n,t,r){t=h.iteratee(t,r);var e=[],u=[];return h.each(n,function(n,r,i){(t(n,r,i)?e:u).push(n)}),[e,u]},h.first=h.head=h.take=function(n,t,r){return null==n?void 0:null==t||r?n[0]:0>t?[]:a.call(n,0,t)},h.initial=function(n,t,r){return a.call(n,0,Math.max(0,n.length-(null==t||r?1:t)))},h.last=function(n,t,r){return null==n?void 0:null==t||r?n[n.length-1]:a.call(n,Math.max(n.length-t,0))},h.rest=h.tail=h.drop=function(n,t,r){return a.call(n,null==t||r?1:t)},h.compact=function(n){return h.filter(n,h.identity)};var y=function(n,t,r,e){if(t&&h.every(n,h.isArray))return o.apply(e,n);for(var u=0,a=n.length;a>u;u++){var l=n[u];h.isArray(l)||h.isArguments(l)?t?i.apply(e,l):y(l,t,r,e):r||e.push(l)}return e};h.flatten=function(n,t){return y(n,t,!1,[])},h.without=function(n){return h.difference(n,a.call(arguments,1))},h.uniq=h.unique=function(n,t,r,e){if(null==n)return[];h.isBoolean(t)||(e=r,r=t,t=!1),null!=r&&(r=h.iteratee(r,e));for(var u=[],i=[],a=0,o=n.length;o>a;a++){var l=n[a];if(t)a&&i===l||u.push(l),i=l;else if(r){var c=r(l,a,n);h.indexOf(i,c)<0&&(i.push(c),u.push(l))}else h.indexOf(u,l)<0&&u.push(l)}return u},h.union=function(){return h.uniq(y(arguments,!0,!0,[]))},h.intersection=function(n){if(null==n)return[];for(var t=[],r=arguments.length,e=0,u=n.length;u>e;e++){var i=n[e];if(!h.contains(t,i)){for(var a=1;r>a&&h.contains(arguments[a],i);a++);a===r&&t.push(i)}}return t},h.difference=function(n){var t=y(a.call(arguments,1),!0,!0,[]);return h.filter(n,function(n){return!h.contains(t,n)})},h.zip=function(n){if(null==n)return[];for(var t=h.max(arguments,"length").length,r=Array(t),e=0;t>e;e++)r[e]=h.pluck(arguments,e);return r},h.object=function(n,t){if(null==n)return{};for(var r={},e=0,u=n.length;u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},h.indexOf=function(n,t,r){if(null==n)return-1;var e=0,u=n.length;if(r){if("number"!=typeof r)return e=h.sortedIndex(n,t),n[e]===t?e:-1;e=0>r?Math.max(0,u+r):r}for(;u>e;e++)if(n[e]===t)return e;return-1},h.lastIndexOf=function(n,t,r){if(null==n)return-1;var e=n.length;for("number"==typeof r&&(e=0>r?e+r+1:Math.min(e,r+1));--e>=0;)if(n[e]===t)return e;return-1},h.range=function(n,t,r){arguments.length<=1&&(t=n||0,n=0),r=r||1;for(var e=Math.max(Math.ceil((t-n)/r),0),u=Array(e),i=0;e>i;i++,n+=r)u[i]=n;return u};var d=function(){};h.bind=function(n,t){var r,e;if(p&&n.bind===p)return p.apply(n,a.call(arguments,1));if(!h.isFunction(n))throw new TypeError("Bind must be called on a function");return r=a.call(arguments,2),e=function(){if(!(this instanceof e))return n.apply(t,r.concat(a.call(arguments)));d.prototype=n.prototype;var u=new d;d.prototype=null;var i=n.apply(u,r.concat(a.call(arguments)));return h.isObject(i)?i:u}},h.partial=function(n){var t=a.call(arguments,1);return function(){for(var r=0,e=t.slice(),u=0,i=e.length;i>u;u++)e[u]===h&&(e[u]=arguments[r++]);for(;r<arguments.length;)e.push(arguments[r++]);return n.apply(this,e)}},h.bindAll=function(n){var t,r,e=arguments.length;if(1>=e)throw new Error("bindAll must be passed function names");for(t=1;e>t;t++)r=arguments[t],n[r]=h.bind(n[r],n);return n},h.memoize=function(n,t){var r=function(e){var u=r.cache,i=t?t.apply(this,arguments):e;return h.has(u,i)||(u[i]=n.apply(this,arguments)),u[i]};return r.cache={},r},h.delay=function(n,t){var r=a.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},h.defer=function(n){return h.delay.apply(h,[n,1].concat(a.call(arguments,1)))},h.throttle=function(n,t,r){var e,u,i,a=null,o=0;r||(r={});var l=function(){o=r.leading===!1?0:h.now(),a=null,i=n.apply(e,u),a||(e=u=null)};return function(){var c=h.now();o||r.leading!==!1||(o=c);var f=t-(c-o);return e=this,u=arguments,0>=f||f>t?(clearTimeout(a),a=null,o=c,i=n.apply(e,u),a||(e=u=null)):a||r.trailing===!1||(a=setTimeout(l,f)),i}},h.debounce=function(n,t,r){var e,u,i,a,o,l=function(){var c=h.now()-a;t>c&&c>0?e=setTimeout(l,t-c):(e=null,r||(o=n.apply(i,u),e||(i=u=null)))};return function(){i=this,u=arguments,a=h.now();var c=r&&!e;return e||(e=setTimeout(l,t)),c&&(o=n.apply(i,u),i=u=null),o}},h.wrap=function(n,t){return h.partial(t,n)},h.negate=function(n){return function(){return!n.apply(this,arguments)}},h.compose=function(){var n=arguments,t=n.length-1;return function(){for(var r=t,e=n[t].apply(this,arguments);r--;)e=n[r].call(this,e);return e}},h.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},h.before=function(n,t){var r;return function(){return--n>0?r=t.apply(this,arguments):t=null,r}},h.once=h.partial(h.before,2),h.keys=function(n){if(!h.isObject(n))return[];if(s)return s(n);var t=[];for(var r in n)h.has(n,r)&&t.push(r);return t},h.values=function(n){for(var t=h.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},h.pairs=function(n){for(var t=h.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},h.invert=function(n){for(var t={},r=h.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},h.functions=h.methods=function(n){var t=[];for(var r in n)h.isFunction(n[r])&&t.push(r);return t.sort()},h.extend=function(n){if(!h.isObject(n))return n;for(var t,r,e=1,u=arguments.length;u>e;e++){t=arguments[e];for(r in t)c.call(t,r)&&(n[r]=t[r])}return n},h.pick=function(n,t,r){var e,u={};if(null==n)return u;if(h.isFunction(t)){t=g(t,r);for(e in n){var i=n[e];t(i,e,n)&&(u[e]=i)}}else{var l=o.apply([],a.call(arguments,1));n=new Object(n);for(var c=0,f=l.length;f>c;c++)e=l[c],e in n&&(u[e]=n[e])}return u},h.omit=function(n,t,r){if(h.isFunction(t))t=h.negate(t);else{var e=h.map(o.apply([],a.call(arguments,1)),String);t=function(n,t){return!h.contains(e,t)}}return h.pick(n,t,r)},h.defaults=function(n){if(!h.isObject(n))return n;for(var t=1,r=arguments.length;r>t;t++){var e=arguments[t];for(var u in e)n[u]===void 0&&(n[u]=e[u])}return n},h.clone=function(n){return h.isObject(n)?h.isArray(n)?n.slice():h.extend({},n):n},h.tap=function(n,t){return t(n),n};var b=function(n,t,r,e){if(n===t)return 0!==n||1/n===1/t;if(null==n||null==t)return n===t;n instanceof h&&(n=n._wrapped),t instanceof h&&(t=t._wrapped);var u=l.call(n);if(u!==l.call(t))return!1;switch(u){case"[object RegExp]":case"[object String]":return""+n==""+t;case"[object Number]":return+n!==+n?+t!==+t:0===+n?1/+n===1/t:+n===+t;case"[object Date]":case"[object Boolean]":return+n===+t}if("object"!=typeof n||"object"!=typeof t)return!1;for(var i=r.length;i--;)if(r[i]===n)return e[i]===t;var a=n.constructor,o=t.constructor;if(a!==o&&"constructor"in n&&"constructor"in t&&!(h.isFunction(a)&&a instanceof a&&h.isFunction(o)&&o instanceof o))return!1;r.push(n),e.push(t);var c,f;if("[object Array]"===u){if(c=n.length,f=c===t.length)for(;c--&&(f=b(n[c],t[c],r,e)););}else{var s,p=h.keys(n);if(c=p.length,f=h.keys(t).length===c)for(;c--&&(s=p[c],f=h.has(t,s)&&b(n[s],t[s],r,e)););}return r.pop(),e.pop(),f};h.isEqual=function(n,t){return b(n,t,[],[])},h.isEmpty=function(n){if(null==n)return!0;if(h.isArray(n)||h.isString(n)||h.isArguments(n))return 0===n.length;for(var t in n)if(h.has(n,t))return!1;return!0},h.isElement=function(n){return!(!n||1!==n.nodeType)},h.isArray=f||function(n){return"[object Array]"===l.call(n)},h.isObject=function(n){var t=typeof n;return"function"===t||"object"===t&&!!n},h.each(["Arguments","Function","String","Number","Date","RegExp"],function(n){h["is"+n]=function(t){return l.call(t)==="[object "+n+"]"}}),h.isArguments(arguments)||(h.isArguments=function(n){return h.has(n,"callee")}),"function"!=typeof/./&&(h.isFunction=function(n){return"function"==typeof n||!1}),h.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},h.isNaN=function(n){return h.isNumber(n)&&n!==+n},h.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"===l.call(n)},h.isNull=function(n){return null===n},h.isUndefined=function(n){return n===void 0},h.has=function(n,t){return null!=n&&c.call(n,t)},h.noConflict=function(){return n._=t,this},h.identity=function(n){return n},h.constant=function(n){return function(){return n}},h.noop=function(){},h.property=function(n){return function(t){return t[n]}},h.matches=function(n){var t=h.pairs(n),r=t.length;return function(n){if(null==n)return!r;n=new Object(n);for(var e=0;r>e;e++){var u=t[e],i=u[0];if(u[1]!==n[i]||!(i in n))return!1}return!0}},h.times=function(n,t,r){var e=Array(Math.max(0,n));t=g(t,r,1);for(var u=0;n>u;u++)e[u]=t(u);return e},h.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))},h.now=Date.now||function(){return(new Date).getTime()};var _={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},w=h.invert(_),j=function(n){var t=function(t){return n[t]},r="(?:"+h.keys(n).join("|")+")",e=RegExp(r),u=RegExp(r,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,t):n}};h.escape=j(_),h.unescape=j(w),h.result=function(n,t){if(null==n)return void 0;var r=n[t];return h.isFunction(r)?n[t]():r};var x=0;h.uniqueId=function(n){var t=++x+"";return n?n+t:t},h.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var A=/(.)^/,k={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},O=/\\|'|\r|\n|\u2028|\u2029/g,F=function(n){return"\\"+k[n]};h.template=function(n,t,r){!t&&r&&(t=r),t=h.defaults({},t,h.templateSettings);var e=RegExp([(t.escape||A).source,(t.interpolate||A).source,(t.evaluate||A).source].join("|")+"|$","g"),u=0,i="__p+='";n.replace(e,function(t,r,e,a,o){return i+=n.slice(u,o).replace(O,F),u=o+t.length,r?i+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'":e?i+="'+\n((__t=("+e+"))==null?'':__t)+\n'":a&&(i+="';\n"+a+"\n__p+='"),t}),i+="';\n",t.variable||(i="with(obj||{}){\n"+i+"}\n"),i="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+i+"return __p;\n";try{var a=new Function(t.variable||"obj","_",i)}catch(o){throw o.source=i,o}var l=function(n){return a.call(this,n,h)},c=t.variable||"obj";return l.source="function("+c+"){\n"+i+"}",l},h.chain=function(n){var t=h(n);return t._chain=!0,t};var E=function(n){return this._chain?h(n).chain():n};h.mixin=function(n){h.each(h.functions(n),function(t){var r=h[t]=n[t];h.prototype[t]=function(){var n=[this._wrapped];return i.apply(n,arguments),E.call(this,r.apply(h,n))}})},h.mixin(h),h.each(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=r[n];h.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!==n&&"splice"!==n||0!==r.length||delete r[0],E.call(this,r)}}),h.each(["concat","join","slice"],function(n){var t=r[n];h.prototype[n]=function(){return E.call(this,t.apply(this._wrapped,arguments))}}),h.prototype.value=function(){return this._wrapped},"function"==typeof define&&define.amd&&define("underscore",[],function(){return h})}).call(this);
-//# sourceMappingURL=underscore-min.map
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.map b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.map
deleted file mode 100644
index b31e43590a0..00000000000
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"underscore-min.js","sources":["underscore.js"],"names":["createReduce","dir","iterator","obj","iteratee","memo","keys","index","length","currentKey","context","optimizeCb","isArrayLike","_","arguments","createIndexFinder","array","predicate","cb","collectNonEnumProps","nonEnumIdx","nonEnumerableProps","constructor","proto","isFunction","prototype","ObjProto","prop","has","contains","push","root","this","previousUnderscore","ArrayProto","Array","Object","FuncProto","Function","slice","toString","hasOwnProperty","nativeIsArray","isArray","nativeKeys","nativeBind","bind","nativeCreate","create","Ctor","_wrapped","exports","module","VERSION","func","argCount","value","call","other","collection","accumulator","apply","identity","isObject","matcher","property","Infinity","createAssigner","keysFunc","undefinedOnly","source","l","i","key","baseCreate","result","MAX_ARRAY_INDEX","Math","pow","each","forEach","map","collect","results","reduce","foldl","inject","reduceRight","foldr","find","detect","findIndex","findKey","filter","select","list","reject","negate","every","all","some","any","includes","include","target","fromIndex","values","indexOf","invoke","method","args","isFunc","pluck","where","attrs","findWhere","max","computed","lastComputed","min","shuffle","rand","set","shuffled","random","sample","n","guard","sortBy","criteria","sort","left","right","a","b","group","behavior","groupBy","indexBy","countBy","toArray","size","partition","pass","fail","first","head","take","initial","last","rest","tail","drop","compact","flatten","input","shallow","strict","startIndex","output","idx","isArguments","j","len","without","difference","uniq","unique","isSorted","isBoolean","seen","union","intersection","argsLength","item","zip","unzip","object","sortedIndex","isNaN","lastIndexOf","from","findLastIndex","low","high","mid","floor","range","start","stop","step","ceil","executeBound","sourceFunc","boundFunc","callingContext","self","TypeError","bound","concat","partial","boundArgs","position","bindAll","Error","memoize","hasher","cache","address","delay","wait","setTimeout","defer","throttle","options","timeout","previous","later","leading","now","remaining","clearTimeout","trailing","debounce","immediate","timestamp","callNow","wrap","wrapper","compose","after","times","before","once","hasEnumBug","propertyIsEnumerable","allKeys","mapObject","pairs","invert","functions","methods","names","extend","extendOwn","assign","pick","oiteratee","omit","String","defaults","clone","tap","interceptor","isMatch","eq","aStack","bStack","className","areArrays","aCtor","bCtor","pop","isEqual","isEmpty","isString","isElement","nodeType","type","name","Int8Array","isFinite","parseFloat","isNumber","isNull","isUndefined","noConflict","constant","noop","propertyOf","matches","accum","Date","getTime","escapeMap","&","<",">","\"","'","`","unescapeMap","createEscaper","escaper","match","join","testRegexp","RegExp","replaceRegexp","string","test","replace","escape","unescape","fallback","idCounter","uniqueId","prefix","id","templateSettings","evaluate","interpolate","noMatch","escapes","\\","\r","\n","
","
","escapeChar","template","text","settings","oldSettings","offset","variable","render","e","data","argument","chain","instance","_chain","mixin","valueOf","toJSON","define","amd"],"mappings":";;;;CAKC,WAoKC,QAASA,GAAaC,GAGpB,QAASC,GAASC,EAAKC,EAAUC,EAAMC,EAAMC,EAAOC,GAClD,KAAOD,GAAS,GAAaC,EAARD,EAAgBA,GAASN,EAAK,CACjD,GAAIQ,GAAaH,EAAOA,EAAKC,GAASA,CACtCF,GAAOD,EAASC,EAAMF,EAAIM,GAAaA,EAAYN,GAErD,MAAOE,GAGT,MAAO,UAASF,EAAKC,EAAUC,EAAMK,GACnCN,EAAWO,EAAWP,EAAUM,EAAS,EACzC,IAAIJ,IAAQM,EAAYT,IAAQU,EAAEP,KAAKH,GACnCK,GAAUF,GAAQH,GAAKK,OACvBD,EAAQN,EAAM,EAAI,EAAIO,EAAS,CAMnC,OAJIM,WAAUN,OAAS,IACrBH,EAAOF,EAAIG,EAAOA,EAAKC,GAASA,GAChCA,GAASN,GAEJC,EAASC,EAAKC,EAAUC,EAAMC,EAAMC,EAAOC,IA+btD,QAASO,GAAkBd,GACzB,MAAO,UAASe,EAAOC,EAAWP,GAChCO,EAAYC,EAAGD,EAAWP,EAG1B,KAFA,GAAIF,GAAkB,MAATQ,GAAiBA,EAAMR,OAChCD,EAAQN,EAAM,EAAI,EAAIO,EAAS,EAC5BD,GAAS,GAAaC,EAARD,EAAgBA,GAASN,EAC5C,GAAIgB,EAAUD,EAAMT,GAAQA,EAAOS,GAAQ,MAAOT,EAEpD,QAAQ,GAgQZ,QAASY,GAAoBhB,EAAKG,GAChC,GAAIc,GAAaC,EAAmBb,OAChCc,EAAcnB,EAAImB,YAClBC,EAASV,EAAEW,WAAWF,IAAgBA,EAAYG,WAAcC,EAGhEC,EAAO,aAGX,KAFId,EAAEe,IAAIzB,EAAKwB,KAAUd,EAAEgB,SAASvB,EAAMqB,IAAOrB,EAAKwB,KAAKH,GAEpDP,KACLO,EAAON,EAAmBD,GACtBO,IAAQxB,IAAOA,EAAIwB,KAAUJ,EAAMI,KAAUd,EAAEgB,SAASvB,EAAMqB,IAChErB,EAAKwB,KAAKH,GAt4BhB,GAAII,GAAOC,KAGPC,EAAqBF,EAAKlB,EAG1BqB,EAAaC,MAAMV,UAAWC,EAAWU,OAAOX,UAAWY,EAAYC,SAASb,UAIlFK,EAAmBI,EAAWJ,KAC9BS,EAAmBL,EAAWK,MAC9BC,EAAmBd,EAASc,SAC5BC,EAAmBf,EAASe,eAK5BC,EAAqBP,MAAMQ,QAC3BC,EAAqBR,OAAO9B,KAC5BuC,EAAqBR,EAAUS,KAC/BC,EAAqBX,OAAOY,OAG1BC,EAAO,aAGPpC,EAAI,SAASV,GACf,MAAIA,aAAeU,GAAUV,EACvB6B,eAAgBnB,QACtBmB,KAAKkB,SAAW/C,GADiB,GAAIU,GAAEV,GAOlB,oBAAZgD,UACa,mBAAXC,SAA0BA,OAAOD,UAC1CA,QAAUC,OAAOD,QAAUtC,GAE7BsC,QAAQtC,EAAIA,GAEZkB,EAAKlB,EAAIA,EAIXA,EAAEwC,QAAU,OAKZ,IAAI1C,GAAa,SAAS2C,EAAM5C,EAAS6C,GACvC,GAAI7C,QAAiB,GAAG,MAAO4C,EAC/B,QAAoB,MAAZC,EAAmB,EAAIA,GAC7B,IAAK,GAAG,MAAO,UAASC,GACtB,MAAOF,GAAKG,KAAK/C,EAAS8C,GAE5B,KAAK,GAAG,MAAO,UAASA,EAAOE,GAC7B,MAAOJ,GAAKG,KAAK/C,EAAS8C,EAAOE,GAEnC,KAAK,GAAG,MAAO,UAASF,EAAOjD,EAAOoD,GACpC,MAAOL,GAAKG,KAAK/C,EAAS8C,EAAOjD,EAAOoD,GAE1C,KAAK,GAAG,MAAO,UAASC,EAAaJ,EAAOjD,EAAOoD,GACjD,MAAOL,GAAKG,KAAK/C,EAASkD,EAAaJ,EAAOjD,EAAOoD,IAGzD,MAAO,YACL,MAAOL,GAAKO,MAAMnD,EAASI,aAO3BI,EAAK,SAASsC,EAAO9C,EAAS6C,GAChC,MAAa,OAATC,EAAsB3C,EAAEiD,SACxBjD,EAAEW,WAAWgC,GAAe7C,EAAW6C,EAAO9C,EAAS6C,GACvD1C,EAAEkD,SAASP,GAAe3C,EAAEmD,QAAQR,GACjC3C,EAAEoD,SAAST,GAEpB3C,GAAET,SAAW,SAASoD,EAAO9C,GAC3B,MAAOQ,GAAGsC,EAAO9C,EAASwD,KAI5B,IAAIC,GAAiB,SAASC,EAAUC,GACtC,MAAO,UAASlE,GACd,GAAIK,GAASM,UAAUN,MACvB,IAAa,EAATA,GAAqB,MAAPL,EAAa,MAAOA,EACtC,KAAK,GAAII,GAAQ,EAAWC,EAARD,EAAgBA,IAIlC,IAAK,GAHD+D,GAASxD,UAAUP,GACnBD,EAAO8D,EAASE,GAChBC,EAAIjE,EAAKE,OACJgE,EAAI,EAAOD,EAAJC,EAAOA,IAAK,CAC1B,GAAIC,GAAMnE,EAAKkE,EACVH,IAAiBlE,EAAIsE,SAAc,KAAGtE,EAAIsE,GAAOH,EAAOG,IAGjE,MAAOtE,KAKPuE,EAAa,SAASjD,GACxB,IAAKZ,EAAEkD,SAAStC,GAAY,QAC5B,IAAIsB,EAAc,MAAOA,GAAatB,EACtCwB,GAAKxB,UAAYA,CACjB,IAAIkD,GAAS,GAAI1B,EAEjB,OADAA,GAAKxB,UAAY,KACVkD,GAMLC,EAAkBC,KAAKC,IAAI,EAAG,IAAM,EACpClE,EAAc,SAAS+C,GACzB,GAAInD,GAASmD,GAAcA,EAAWnD,MACtC,OAAwB,gBAAVA,IAAsBA,GAAU,GAAeoE,GAAVpE,EASrDK,GAAEkE,KAAOlE,EAAEmE,QAAU,SAAS7E,EAAKC,EAAUM,GAC3CN,EAAWO,EAAWP,EAAUM,EAChC,IAAI8D,GAAGhE,CACP,IAAII,EAAYT,GACd,IAAKqE,EAAI,EAAGhE,EAASL,EAAIK,OAAYA,EAAJgE,EAAYA,IAC3CpE,EAASD,EAAIqE,GAAIA,EAAGrE,OAEjB,CACL,GAAIG,GAAOO,EAAEP,KAAKH,EAClB,KAAKqE,EAAI,EAAGhE,EAASF,EAAKE,OAAYA,EAAJgE,EAAYA,IAC5CpE,EAASD,EAAIG,EAAKkE,IAAKlE,EAAKkE,GAAIrE,GAGpC,MAAOA,IAITU,EAAEoE,IAAMpE,EAAEqE,QAAU,SAAS/E,EAAKC,EAAUM,GAC1CN,EAAWc,EAAGd,EAAUM,EAIxB,KAAK,GAHDJ,IAAQM,EAAYT,IAAQU,EAAEP,KAAKH,GACnCK,GAAUF,GAAQH,GAAKK,OACvB2E,EAAUhD,MAAM3B,GACXD,EAAQ,EAAWC,EAARD,EAAgBA,IAAS,CAC3C,GAAIE,GAAaH,EAAOA,EAAKC,GAASA,CACtC4E,GAAQ5E,GAASH,EAASD,EAAIM,GAAaA,EAAYN,GAEzD,MAAOgF,IA+BTtE,EAAEuE,OAASvE,EAAEwE,MAAQxE,EAAEyE,OAAStF,EAAa,GAG7Ca,EAAE0E,YAAc1E,EAAE2E,MAAQxF,GAAc,GAGxCa,EAAE4E,KAAO5E,EAAE6E,OAAS,SAASvF,EAAKc,EAAWP,GAC3C,GAAI+D,EAMJ,OAJEA,GADE7D,EAAYT,GACRU,EAAE8E,UAAUxF,EAAKc,EAAWP,GAE5BG,EAAE+E,QAAQzF,EAAKc,EAAWP,GAE9B+D,QAAa,IAAKA,KAAS,EAAUtE,EAAIsE,GAA7C,QAKF5D,EAAEgF,OAAShF,EAAEiF,OAAS,SAAS3F,EAAKc,EAAWP,GAC7C,GAAIyE,KAKJ,OAJAlE,GAAYC,EAAGD,EAAWP,GAC1BG,EAAEkE,KAAK5E,EAAK,SAASqD,EAAOjD,EAAOwF,GAC7B9E,EAAUuC,EAAOjD,EAAOwF,IAAOZ,EAAQrD,KAAK0B,KAE3C2B,GAITtE,EAAEmF,OAAS,SAAS7F,EAAKc,EAAWP,GAClC,MAAOG,GAAEgF,OAAO1F,EAAKU,EAAEoF,OAAO/E,EAAGD,IAAaP,IAKhDG,EAAEqF,MAAQrF,EAAEsF,IAAM,SAAShG,EAAKc,EAAWP,GACzCO,EAAYC,EAAGD,EAAWP,EAG1B,KAAK,GAFDJ,IAAQM,EAAYT,IAAQU,EAAEP,KAAKH,GACnCK,GAAUF,GAAQH,GAAKK,OAClBD,EAAQ,EAAWC,EAARD,EAAgBA,IAAS,CAC3C,GAAIE,GAAaH,EAAOA,EAAKC,GAASA,CACtC,KAAKU,EAAUd,EAAIM,GAAaA,EAAYN,GAAM,OAAO,EAE3D,OAAO,GAKTU,EAAEuF,KAAOvF,EAAEwF,IAAM,SAASlG,EAAKc,EAAWP,GACxCO,EAAYC,EAAGD,EAAWP,EAG1B,KAAK,GAFDJ,IAAQM,EAAYT,IAAQU,EAAEP,KAAKH,GACnCK,GAAUF,GAAQH,GAAKK,OAClBD,EAAQ,EAAWC,EAARD,EAAgBA,IAAS,CAC3C,GAAIE,GAAaH,EAAOA,EAAKC,GAASA,CACtC,IAAIU,EAAUd,EAAIM,GAAaA,EAAYN,GAAM,OAAO,EAE1D,OAAO,GAKTU,EAAEgB,SAAWhB,EAAEyF,SAAWzF,EAAE0F,QAAU,SAASpG,EAAKqG,EAAQC,GAE1D,MADK7F,GAAYT,KAAMA,EAAMU,EAAE6F,OAAOvG,IAC/BU,EAAE8F,QAAQxG,EAAKqG,EAA4B,gBAAbC,IAAyBA,IAAc,GAI9E5F,EAAE+F,OAAS,SAASzG,EAAK0G,GACvB,GAAIC,GAAOvE,EAAMkB,KAAK3C,UAAW,GAC7BiG,EAASlG,EAAEW,WAAWqF,EAC1B,OAAOhG,GAAEoE,IAAI9E,EAAK,SAASqD,GACzB,GAAIF,GAAOyD,EAASF,EAASrD,EAAMqD,EACnC,OAAe,OAARvD,EAAeA,EAAOA,EAAKO,MAAML,EAAOsD,MAKnDjG,EAAEmG,MAAQ,SAAS7G,EAAKsE,GACtB,MAAO5D,GAAEoE,IAAI9E,EAAKU,EAAEoD,SAASQ,KAK/B5D,EAAEoG,MAAQ,SAAS9G,EAAK+G,GACtB,MAAOrG,GAAEgF,OAAO1F,EAAKU,EAAEmD,QAAQkD,KAKjCrG,EAAEsG,UAAY,SAAShH,EAAK+G,GAC1B,MAAOrG,GAAE4E,KAAKtF,EAAKU,EAAEmD,QAAQkD,KAI/BrG,EAAEuG,IAAM,SAASjH,EAAKC,EAAUM,GAC9B,GACI8C,GAAO6D,EADP1C,GAAUT,IAAUoD,GAAgBpD,GAExC,IAAgB,MAAZ9D,GAA2B,MAAPD,EAAa,CACnCA,EAAMS,EAAYT,GAAOA,EAAMU,EAAE6F,OAAOvG,EACxC,KAAK,GAAIqE,GAAI,EAAGhE,EAASL,EAAIK,OAAYA,EAAJgE,EAAYA,IAC/ChB,EAAQrD,EAAIqE,GACRhB,EAAQmB,IACVA,EAASnB,OAIbpD,GAAWc,EAAGd,EAAUM,GACxBG,EAAEkE,KAAK5E,EAAK,SAASqD,EAAOjD,EAAOwF,GACjCsB,EAAWjH,EAASoD,EAAOjD,EAAOwF,IAC9BsB,EAAWC,GAAgBD,KAAcnD,KAAYS,KAAYT,OACnES,EAASnB,EACT8D,EAAeD,IAIrB,OAAO1C,IAIT9D,EAAE0G,IAAM,SAASpH,EAAKC,EAAUM,GAC9B,GACI8C,GAAO6D,EADP1C,EAAST,IAAUoD,EAAepD,GAEtC,IAAgB,MAAZ9D,GAA2B,MAAPD,EAAa,CACnCA,EAAMS,EAAYT,GAAOA,EAAMU,EAAE6F,OAAOvG,EACxC,KAAK,GAAIqE,GAAI,EAAGhE,EAASL,EAAIK,OAAYA,EAAJgE,EAAYA,IAC/ChB,EAAQrD,EAAIqE,GACAG,EAARnB,IACFmB,EAASnB,OAIbpD,GAAWc,EAAGd,EAAUM,GACxBG,EAAEkE,KAAK5E,EAAK,SAASqD,EAAOjD,EAAOwF,GACjCsB,EAAWjH,EAASoD,EAAOjD,EAAOwF,IACnBuB,EAAXD,GAAwCnD,MAAbmD,GAAoCnD,MAAXS,KACtDA,EAASnB,EACT8D,EAAeD,IAIrB,OAAO1C,IAKT9D,EAAE2G,QAAU,SAASrH,GAInB,IAAK,GAAesH,GAHhBC,EAAM9G,EAAYT,GAAOA,EAAMU,EAAE6F,OAAOvG,GACxCK,EAASkH,EAAIlH,OACbmH,EAAWxF,MAAM3B,GACZD,EAAQ,EAAiBC,EAARD,EAAgBA,IACxCkH,EAAO5G,EAAE+G,OAAO,EAAGrH,GACfkH,IAASlH,IAAOoH,EAASpH,GAASoH,EAASF,IAC/CE,EAASF,GAAQC,EAAInH,EAEvB,OAAOoH,IAMT9G,EAAEgH,OAAS,SAAS1H,EAAK2H,EAAGC,GAC1B,MAAS,OAALD,GAAaC,GACVnH,EAAYT,KAAMA,EAAMU,EAAE6F,OAAOvG,IAC/BA,EAAIU,EAAE+G,OAAOzH,EAAIK,OAAS,KAE5BK,EAAE2G,QAAQrH,GAAKoC,MAAM,EAAGsC,KAAKuC,IAAI,EAAGU,KAI7CjH,EAAEmH,OAAS,SAAS7H,EAAKC,EAAUM,GAEjC,MADAN,GAAWc,EAAGd,EAAUM,GACjBG,EAAEmG,MAAMnG,EAAEoE,IAAI9E,EAAK,SAASqD,EAAOjD,EAAOwF,GAC/C,OACEvC,MAAOA,EACPjD,MAAOA,EACP0H,SAAU7H,EAASoD,EAAOjD,EAAOwF,MAElCmC,KAAK,SAASC,EAAMC,GACrB,GAAIC,GAAIF,EAAKF,SACTK,EAAIF,EAAMH,QACd,IAAII,IAAMC,EAAG,CACX,GAAID,EAAIC,GAAKD,QAAW,GAAG,MAAO,EAClC,IAAQC,EAAJD,GAASC,QAAW,GAAG,OAAQ,EAErC,MAAOH,GAAK5H,MAAQ6H,EAAM7H,QACxB,SAIN,IAAIgI,GAAQ,SAASC,GACnB,MAAO,UAASrI,EAAKC,EAAUM,GAC7B,GAAIiE,KAMJ,OALAvE,GAAWc,EAAGd,EAAUM,GACxBG,EAAEkE,KAAK5E,EAAK,SAASqD,EAAOjD,GAC1B,GAAIkE,GAAMrE,EAASoD,EAAOjD,EAAOJ,EACjCqI,GAAS7D,EAAQnB,EAAOiB,KAEnBE,GAMX9D,GAAE4H,QAAUF,EAAM,SAAS5D,EAAQnB,EAAOiB,GACpC5D,EAAEe,IAAI+C,EAAQF,GAAME,EAAOF,GAAK3C,KAAK0B,GAAamB,EAAOF,IAAQjB,KAKvE3C,EAAE6H,QAAUH,EAAM,SAAS5D,EAAQnB,EAAOiB,GACxCE,EAAOF,GAAOjB,IAMhB3C,EAAE8H,QAAUJ,EAAM,SAAS5D,EAAQnB,EAAOiB,GACpC5D,EAAEe,IAAI+C,EAAQF,GAAME,EAAOF,KAAaE,EAAOF,GAAO,IAI5D5D,EAAE+H,QAAU,SAASzI,GACnB,MAAKA,GACDU,EAAE8B,QAAQxC,GAAaoC,EAAMkB,KAAKtD,GAClCS,EAAYT,GAAaU,EAAEoE,IAAI9E,EAAKU,EAAEiD,UACnCjD,EAAE6F,OAAOvG,OAIlBU,EAAEgI,KAAO,SAAS1I,GAChB,MAAW,OAAPA,EAAoB,EACjBS,EAAYT,GAAOA,EAAIK,OAASK,EAAEP,KAAKH,GAAKK,QAKrDK,EAAEiI,UAAY,SAAS3I,EAAKc,EAAWP,GACrCO,EAAYC,EAAGD,EAAWP,EAC1B,IAAIqI,MAAWC,IAIf,OAHAnI,GAAEkE,KAAK5E,EAAK,SAASqD,EAAOiB,EAAKtE,IAC9Bc,EAAUuC,EAAOiB,EAAKtE,GAAO4I,EAAOC,GAAMlH,KAAK0B,MAE1CuF,EAAMC,IAShBnI,EAAEoI,MAAQpI,EAAEqI,KAAOrI,EAAEsI,KAAO,SAASnI,EAAO8G,EAAGC,GAC7C,MAAa,OAAT/G,MAA2B,GACtB,MAAL8G,GAAaC,EAAc/G,EAAM,GAC9BH,EAAEuI,QAAQpI,EAAOA,EAAMR,OAASsH,IAMzCjH,EAAEuI,QAAU,SAASpI,EAAO8G,EAAGC,GAC7B,MAAOxF,GAAMkB,KAAKzC,EAAO,EAAG6D,KAAKuC,IAAI,EAAGpG,EAAMR,QAAe,MAALsH,GAAaC,EAAQ,EAAID,MAKnFjH,EAAEwI,KAAO,SAASrI,EAAO8G,EAAGC,GAC1B,MAAa,OAAT/G,MAA2B,GACtB,MAAL8G,GAAaC,EAAc/G,EAAMA,EAAMR,OAAS,GAC7CK,EAAEyI,KAAKtI,EAAO6D,KAAKuC,IAAI,EAAGpG,EAAMR,OAASsH,KAMlDjH,EAAEyI,KAAOzI,EAAE0I,KAAO1I,EAAE2I,KAAO,SAASxI,EAAO8G,EAAGC,GAC5C,MAAOxF,GAAMkB,KAAKzC,EAAY,MAAL8G,GAAaC,EAAQ,EAAID,IAIpDjH,EAAE4I,QAAU,SAASzI,GACnB,MAAOH,GAAEgF,OAAO7E,EAAOH,EAAEiD,UAI3B,IAAI4F,GAAU,SAASC,EAAOC,EAASC,EAAQC,GAE7C,IAAK,GADDC,MAAaC,EAAM,EACdxF,EAAIsF,GAAc,EAAGtJ,EAASmJ,GAASA,EAAMnJ,OAAYA,EAAJgE,EAAYA,IAAK,CAC7E,GAAIhB,GAAQmG,EAAMnF,EAClB,IAAI5D,EAAY4C,KAAW3C,EAAE8B,QAAQa,IAAU3C,EAAEoJ,YAAYzG,IAAS,CAE/DoG,IAASpG,EAAQkG,EAAQlG,EAAOoG,EAASC,GAC9C,IAAIK,GAAI,EAAGC,EAAM3G,EAAMhD,MAEvB,KADAuJ,EAAOvJ,QAAU2J,EACNA,EAAJD,GACLH,EAAOC,KAASxG,EAAM0G,SAEdL,KACVE,EAAOC,KAASxG,GAGpB,MAAOuG,GAITlJ,GAAE6I,QAAU,SAAS1I,EAAO4I,GAC1B,MAAOF,GAAQ1I,EAAO4I,GAAS,IAIjC/I,EAAEuJ,QAAU,SAASpJ,GACnB,MAAOH,GAAEwJ,WAAWrJ,EAAOuB,EAAMkB,KAAK3C,UAAW,KAMnDD,EAAEyJ,KAAOzJ,EAAE0J,OAAS,SAASvJ,EAAOwJ,EAAUpK,EAAUM,GACtD,GAAa,MAATM,EAAe,QACdH,GAAE4J,UAAUD,KACf9J,EAAUN,EACVA,EAAWoK,EACXA,GAAW,GAEG,MAAZpK,IAAkBA,EAAWc,EAAGd,EAAUM,GAG9C,KAAK,GAFDiE,MACA+F,KACKlG,EAAI,EAAGhE,EAASQ,EAAMR,OAAYA,EAAJgE,EAAYA,IAAK,CACtD,GAAIhB,GAAQxC,EAAMwD,GACd6C,EAAWjH,EAAWA,EAASoD,EAAOgB,EAAGxD,GAASwC,CAClDgH,IACGhG,GAAKkG,IAASrD,GAAU1C,EAAO7C,KAAK0B,GACzCkH,EAAOrD,GACEjH,EACJS,EAAEgB,SAAS6I,EAAMrD,KACpBqD,EAAK5I,KAAKuF,GACV1C,EAAO7C,KAAK0B,IAEJ3C,EAAEgB,SAAS8C,EAAQnB,IAC7BmB,EAAO7C,KAAK0B,GAGhB,MAAOmB,IAKT9D,EAAE8J,MAAQ,WACR,MAAO9J,GAAEyJ,KAAKZ,EAAQ5I,WAAW,GAAM,KAKzCD,EAAE+J,aAAe,SAAS5J,GACxB,GAAa,MAATA,EAAe,QAGnB,KAAK,GAFD2D,MACAkG,EAAa/J,UAAUN,OAClBgE,EAAI,EAAGhE,EAASQ,EAAMR,OAAYA,EAAJgE,EAAYA,IAAK,CACtD,GAAIsG,GAAO9J,EAAMwD,EACjB,KAAI3D,EAAEgB,SAAS8C,EAAQmG,GAAvB,CACA,IAAK,GAAIZ,GAAI,EAAOW,EAAJX,GACTrJ,EAAEgB,SAASf,UAAUoJ,GAAIY,GADAZ,KAG5BA,IAAMW,GAAYlG,EAAO7C,KAAKgJ,IAEpC,MAAOnG,IAKT9D,EAAEwJ,WAAa,SAASrJ,GACtB,GAAIsI,GAAOI,EAAQ5I,WAAW,GAAM,EAAM,EAC1C,OAAOD,GAAEgF,OAAO7E,EAAO,SAASwC,GAC9B,OAAQ3C,EAAEgB,SAASyH,EAAM9F,MAM7B3C,EAAEkK,IAAM,WACN,MAAOlK,GAAEmK,MAAMlK,YAKjBD,EAAEmK,MAAQ,SAAShK,GAIjB,IAAK,GAHDR,GAASQ,GAASH,EAAEuG,IAAIpG,EAAO,UAAUR,QAAU,EACnDmE,EAASxC,MAAM3B,GAEVD,EAAQ,EAAWC,EAARD,EAAgBA,IAClCoE,EAAOpE,GAASM,EAAEmG,MAAMhG,EAAOT,EAEjC,OAAOoE,IAMT9D,EAAEoK,OAAS,SAASlF,EAAMW,GAExB,IAAK,GADD/B,MACKH,EAAI,EAAGhE,EAASuF,GAAQA,EAAKvF,OAAYA,EAAJgE,EAAYA,IACpDkC,EACF/B,EAAOoB,EAAKvB,IAAMkC,EAAOlC,GAEzBG,EAAOoB,EAAKvB,GAAG,IAAMuB,EAAKvB,GAAG,EAGjC,OAAOG,IAOT9D,EAAE8F,QAAU,SAAS3F,EAAO8J,EAAMN,GAChC,GAAIhG,GAAI,EAAGhE,EAASQ,GAASA,EAAMR,MACnC,IAAuB,gBAAZgK,GACThG,EAAe,EAAXgG,EAAe3F,KAAKuC,IAAI,EAAG5G,EAASgK,GAAYA,MAC/C,IAAIA,GAAYhK,EAErB,MADAgE,GAAI3D,EAAEqK,YAAYlK,EAAO8J,GAClB9J,EAAMwD,KAAOsG,EAAOtG,GAAK,CAElC,IAAIsG,IAASA,EACX,MAAOjK,GAAE8E,UAAUpD,EAAMkB,KAAKzC,EAAOwD,GAAI3D,EAAEsK,MAE7C,MAAW3K,EAAJgE,EAAYA,IAAK,GAAIxD,EAAMwD,KAAOsG,EAAM,MAAOtG,EACtD,QAAQ,GAGV3D,EAAEuK,YAAc,SAASpK,EAAO8J,EAAMO,GACpC,GAAIrB,GAAMhJ,EAAQA,EAAMR,OAAS,CAIjC,IAHmB,gBAAR6K,KACTrB,EAAa,EAAPqB,EAAWrB,EAAMqB,EAAO,EAAIxG,KAAK0C,IAAIyC,EAAKqB,EAAO,IAErDP,IAASA,EACX,MAAOjK,GAAEyK,cAAc/I,EAAMkB,KAAKzC,EAAO,EAAGgJ,GAAMnJ,EAAEsK,MAEtD,QAASnB,GAAO,GAAG,GAAIhJ,EAAMgJ,KAASc,EAAM,MAAOd,EACnD,QAAQ,GAiBVnJ,EAAE8E,UAAY5E,EAAkB,GAEhCF,EAAEyK,cAAgBvK,GAAmB,GAIrCF,EAAEqK,YAAc,SAASlK,EAAOb,EAAKC,EAAUM,GAC7CN,EAAWc,EAAGd,EAAUM,EAAS,EAGjC,KAFA,GAAI8C,GAAQpD,EAASD,GACjBoL,EAAM,EAAGC,EAAOxK,EAAMR,OACbgL,EAAND,GAAY,CACjB,GAAIE,GAAM5G,KAAK6G,OAAOH,EAAMC,GAAQ,EAChCpL,GAASY,EAAMyK,IAAQjI,EAAO+H,EAAME,EAAM,EAAQD,EAAOC,EAE/D,MAAOF,IAMT1K,EAAE8K,MAAQ,SAASC,EAAOC,EAAMC,GAC1BhL,UAAUN,QAAU,IACtBqL,EAAOD,GAAS,EAChBA,EAAQ,GAEVE,EAAOA,GAAQ,CAKf,KAAK,GAHDtL,GAASqE,KAAKuC,IAAIvC,KAAKkH,MAAMF,EAAOD,GAASE,GAAO,GACpDH,EAAQxJ,MAAM3B,GAETwJ,EAAM,EAASxJ,EAANwJ,EAAcA,IAAO4B,GAASE,EAC9CH,EAAM3B,GAAO4B,CAGf,OAAOD,GAQT,IAAIK,GAAe,SAASC,EAAYC,EAAWxL,EAASyL,EAAgBrF,GAC1E,KAAMqF,YAA0BD,IAAY,MAAOD,GAAWpI,MAAMnD,EAASoG,EAC7E,IAAIsF,GAAO1H,EAAWuH,EAAWxK,WAC7BkD,EAASsH,EAAWpI,MAAMuI,EAAMtF,EACpC,OAAIjG,GAAEkD,SAASY,GAAgBA,EACxByH,EAMTvL,GAAEiC,KAAO,SAASQ,EAAM5C,GACtB,GAAImC,GAAcS,EAAKR,OAASD,EAAY,MAAOA,GAAWgB,MAAMP,EAAMf,EAAMkB,KAAK3C,UAAW,GAChG,KAAKD,EAAEW,WAAW8B,GAAO,KAAM,IAAI+I,WAAU,oCAC7C,IAAIvF,GAAOvE,EAAMkB,KAAK3C,UAAW,GAC7BwL,EAAQ,WACV,MAAON,GAAa1I,EAAMgJ,EAAO5L,EAASsB,KAAM8E,EAAKyF,OAAOhK,EAAMkB,KAAK3C,aAEzE,OAAOwL,IAMTzL,EAAE2L,QAAU,SAASlJ,GACnB,GAAImJ,GAAYlK,EAAMkB,KAAK3C,UAAW,GAClCwL,EAAQ,WAGV,IAAK,GAFDI,GAAW,EAAGlM,EAASiM,EAAUjM,OACjCsG,EAAO3E,MAAM3B,GACRgE,EAAI,EAAOhE,EAAJgE,EAAYA,IAC1BsC,EAAKtC,GAAKiI,EAAUjI,KAAO3D,EAAIC,UAAU4L,KAAcD,EAAUjI,EAEnE,MAAOkI,EAAW5L,UAAUN,QAAQsG,EAAKhF,KAAKhB,UAAU4L,KACxD,OAAOV,GAAa1I,EAAMgJ,EAAOtK,KAAMA,KAAM8E,GAE/C,OAAOwF,IAMTzL,EAAE8L,QAAU,SAASxM,GACnB,GAAIqE,GAA8BC,EAA3BjE,EAASM,UAAUN,MAC1B,IAAc,GAAVA,EAAa,KAAM,IAAIoM,OAAM,wCACjC,KAAKpI,EAAI,EAAOhE,EAAJgE,EAAYA,IACtBC,EAAM3D,UAAU0D,GAChBrE,EAAIsE,GAAO5D,EAAEiC,KAAK3C,EAAIsE,GAAMtE,EAE9B,OAAOA,IAITU,EAAEgM,QAAU,SAASvJ,EAAMwJ,GACzB,GAAID,GAAU,SAASpI,GACrB,GAAIsI,GAAQF,EAAQE,MAChBC,EAAU,IAAMF,EAASA,EAAOjJ,MAAM7B,KAAMlB,WAAa2D,EAE7D,OADK5D,GAAEe,IAAImL,EAAOC,KAAUD,EAAMC,GAAW1J,EAAKO,MAAM7B,KAAMlB,YACvDiM,EAAMC,GAGf,OADAH,GAAQE,SACDF,GAKThM,EAAEoM,MAAQ,SAAS3J,EAAM4J,GACvB,GAAIpG,GAAOvE,EAAMkB,KAAK3C,UAAW,EACjC,OAAOqM,YAAW,WAChB,MAAO7J,GAAKO,MAAM,KAAMiD,IACvBoG,IAKLrM,EAAEuM,MAAQvM,EAAE2L,QAAQ3L,EAAEoM,MAAOpM,EAAG,GAOhCA,EAAEwM,SAAW,SAAS/J,EAAM4J,EAAMI,GAChC,GAAI5M,GAASoG,EAAMnC,EACf4I,EAAU,KACVC,EAAW,CACVF,KAASA,KACd,IAAIG,GAAQ,WACVD,EAAWF,EAAQI,WAAY,EAAQ,EAAI7M,EAAE8M,MAC7CJ,EAAU,KACV5I,EAASrB,EAAKO,MAAMnD,EAASoG,GACxByG,IAAS7M,EAAUoG,EAAO,MAEjC,OAAO,YACL,GAAI6G,GAAM9M,EAAE8M,KACPH,IAAYF,EAAQI,WAAY,IAAOF,EAAWG,EACvD,IAAIC,GAAYV,GAAQS,EAAMH,EAc9B,OAbA9M,GAAUsB,KACV8E,EAAOhG,UACU,GAAb8M,GAAkBA,EAAYV,GAC5BK,IACFM,aAAaN,GACbA,EAAU,MAEZC,EAAWG,EACXhJ,EAASrB,EAAKO,MAAMnD,EAASoG,GACxByG,IAAS7M,EAAUoG,EAAO,OACrByG,GAAWD,EAAQQ,YAAa,IAC1CP,EAAUJ,WAAWM,EAAOG,IAEvBjJ,IAQX9D,EAAEkN,SAAW,SAASzK,EAAM4J,EAAMc,GAChC,GAAIT,GAASzG,EAAMpG,EAASuN,EAAWtJ,EAEnC8I,EAAQ,WACV,GAAIpE,GAAOxI,EAAE8M,MAAQM,CAEVf,GAAP7D,GAAeA,GAAQ,EACzBkE,EAAUJ,WAAWM,EAAOP,EAAO7D,IAEnCkE,EAAU,KACLS,IACHrJ,EAASrB,EAAKO,MAAMnD,EAASoG,GACxByG,IAAS7M,EAAUoG,EAAO,QAKrC,OAAO,YACLpG,EAAUsB,KACV8E,EAAOhG,UACPmN,EAAYpN,EAAE8M,KACd,IAAIO,GAAUF,IAAcT,CAO5B,OANKA,KAASA,EAAUJ,WAAWM,EAAOP,IACtCgB,IACFvJ,EAASrB,EAAKO,MAAMnD,EAASoG,GAC7BpG,EAAUoG,EAAO,MAGZnC,IAOX9D,EAAEsN,KAAO,SAAS7K,EAAM8K,GACtB,MAAOvN,GAAE2L,QAAQ4B,EAAS9K,IAI5BzC,EAAEoF,OAAS,SAAShF,GAClB,MAAO,YACL,OAAQA,EAAU4C,MAAM7B,KAAMlB,aAMlCD,EAAEwN,QAAU,WACV,GAAIvH,GAAOhG,UACP8K,EAAQ9E,EAAKtG,OAAS,CAC1B,OAAO,YAGL,IAFA,GAAIgE,GAAIoH,EACJjH,EAASmC,EAAK8E,GAAO/H,MAAM7B,KAAMlB,WAC9B0D,KAAKG,EAASmC,EAAKtC,GAAGf,KAAKzB,KAAM2C,EACxC,OAAOA,KAKX9D,EAAEyN,MAAQ,SAASC,EAAOjL,GACxB,MAAO,YACL,QAAMiL,EAAQ,EACLjL,EAAKO,MAAM7B,KAAMlB,WAD1B,SAOJD,EAAE2N,OAAS,SAASD,EAAOjL,GACzB,GAAIjD,EACJ,OAAO,YAKL,QAJMkO,EAAQ,IACZlO,EAAOiD,EAAKO,MAAM7B,KAAMlB,YAEb,GAATyN,IAAYjL,EAAO,MAChBjD,IAMXQ,EAAE4N,KAAO5N,EAAE2L,QAAQ3L,EAAE2N,OAAQ,EAM7B,IAAIE,KAAelM,SAAU,MAAMmM,qBAAqB,YACpDtN,GAAsB,UAAW,gBAAiB,WAClC,uBAAwB,iBAAkB,iBAqB9DR,GAAEP,KAAO,SAASH,GAChB,IAAKU,EAAEkD,SAAS5D,GAAM,QACtB,IAAIyC,EAAY,MAAOA,GAAWzC,EAClC,IAAIG,KACJ,KAAK,GAAImE,KAAOtE,GAASU,EAAEe,IAAIzB,EAAKsE,IAAMnE,EAAKwB,KAAK2C,EAGpD,OADIiK,IAAYvN,EAAoBhB,EAAKG,GAClCA,GAITO,EAAE+N,QAAU,SAASzO,GACnB,IAAKU,EAAEkD,SAAS5D,GAAM,QACtB,IAAIG,KACJ,KAAK,GAAImE,KAAOtE,GAAKG,EAAKwB,KAAK2C,EAG/B,OADIiK,IAAYvN,EAAoBhB,EAAKG,GAClCA,GAITO,EAAE6F,OAAS,SAASvG,GAIlB,IAAK,GAHDG,GAAOO,EAAEP,KAAKH,GACdK,EAASF,EAAKE,OACdkG,EAASvE,MAAM3B,GACVgE,EAAI,EAAOhE,EAAJgE,EAAYA,IAC1BkC,EAAOlC,GAAKrE,EAAIG,EAAKkE,GAEvB,OAAOkC,IAKT7F,EAAEgO,UAAY,SAAS1O,EAAKC,EAAUM,GACpCN,EAAWc,EAAGd,EAAUM,EAKtB,KAAK,GADDD,GAHFH,EAAQO,EAAEP,KAAKH,GACbK,EAASF,EAAKE,OACd2E,KAEK5E,EAAQ,EAAWC,EAARD,EAAgBA,IAClCE,EAAaH,EAAKC,GAClB4E,EAAQ1E,GAAcL,EAASD,EAAIM,GAAaA,EAAYN,EAE9D,OAAOgF,IAIXtE,EAAEiO,MAAQ,SAAS3O,GAIjB,IAAK,GAHDG,GAAOO,EAAEP,KAAKH,GACdK,EAASF,EAAKE,OACdsO,EAAQ3M,MAAM3B,GACTgE,EAAI,EAAOhE,EAAJgE,EAAYA,IAC1BsK,EAAMtK,IAAMlE,EAAKkE,GAAIrE,EAAIG,EAAKkE,IAEhC,OAAOsK,IAITjO,EAAEkO,OAAS,SAAS5O,GAGlB,IAAK,GAFDwE,MACArE,EAAOO,EAAEP,KAAKH,GACTqE,EAAI,EAAGhE,EAASF,EAAKE,OAAYA,EAAJgE,EAAYA,IAChDG,EAAOxE,EAAIG,EAAKkE,KAAOlE,EAAKkE,EAE9B,OAAOG,IAKT9D,EAAEmO,UAAYnO,EAAEoO,QAAU,SAAS9O,GACjC,GAAI+O,KACJ,KAAK,GAAIzK,KAAOtE,GACVU,EAAEW,WAAWrB,EAAIsE,KAAOyK,EAAMpN,KAAK2C,EAEzC,OAAOyK,GAAMhH,QAIfrH,EAAEsO,OAAShL,EAAetD,EAAE+N,SAI5B/N,EAAEuO,UAAYvO,EAAEwO,OAASlL,EAAetD,EAAEP,MAG1CO,EAAE+E,QAAU,SAASzF,EAAKc,EAAWP,GACnCO,EAAYC,EAAGD,EAAWP,EAE1B,KAAK,GADmB+D,GAApBnE,EAAOO,EAAEP,KAAKH,GACTqE,EAAI,EAAGhE,EAASF,EAAKE,OAAYA,EAAJgE,EAAYA,IAEhD,GADAC,EAAMnE,EAAKkE,GACPvD,EAAUd,EAAIsE,GAAMA,EAAKtE,GAAM,MAAOsE,IAK9C5D,EAAEyO,KAAO,SAASrE,EAAQsE,EAAW7O,GACnC,GAA+BN,GAAUE,EAArCqE,KAAaxE,EAAM8K,CACvB,IAAW,MAAP9K,EAAa,MAAOwE,EACpB9D,GAAEW,WAAW+N,IACfjP,EAAOO,EAAE+N,QAAQzO,GACjBC,EAAWO,EAAW4O,EAAW7O,KAEjCJ,EAAOoJ,EAAQ5I,WAAW,GAAO,EAAO,GACxCV,EAAW,SAASoD,EAAOiB,EAAKtE,GAAO,MAAOsE,KAAOtE,IACrDA,EAAMiC,OAAOjC,GAEf,KAAK,GAAIqE,GAAI,EAAGhE,EAASF,EAAKE,OAAYA,EAAJgE,EAAYA,IAAK,CACrD,GAAIC,GAAMnE,EAAKkE,GACXhB,EAAQrD,EAAIsE,EACZrE,GAASoD,EAAOiB,EAAKtE,KAAMwE,EAAOF,GAAOjB,GAE/C,MAAOmB,IAIT9D,EAAE2O,KAAO,SAASrP,EAAKC,EAAUM,GAC/B,GAAIG,EAAEW,WAAWpB,GACfA,EAAWS,EAAEoF,OAAO7F,OACf,CACL,GAAIE,GAAOO,EAAEoE,IAAIyE,EAAQ5I,WAAW,GAAO,EAAO,GAAI2O,OACtDrP,GAAW,SAASoD,EAAOiB,GACzB,OAAQ5D,EAAEgB,SAASvB,EAAMmE,IAG7B,MAAO5D,GAAEyO,KAAKnP,EAAKC,EAAUM,IAI/BG,EAAE6O,SAAWvL,EAAetD,EAAE+N,SAAS,GAGvC/N,EAAE8O,MAAQ,SAASxP,GACjB,MAAKU,GAAEkD,SAAS5D,GACTU,EAAE8B,QAAQxC,GAAOA,EAAIoC,QAAU1B,EAAEsO,UAAWhP,GADtBA,GAO/BU,EAAE+O,IAAM,SAASzP,EAAK0P,GAEpB,MADAA,GAAY1P,GACLA,GAITU,EAAEiP,QAAU,SAAS7E,EAAQ/D,GAC3B,GAAI5G,GAAOO,EAAEP,KAAK4G,GAAQ1G,EAASF,EAAKE,MACxC,IAAc,MAAVyK,EAAgB,OAAQzK,CAE5B,KAAK,GADDL,GAAMiC,OAAO6I,GACRzG,EAAI,EAAOhE,EAAJgE,EAAYA,IAAK,CAC/B,GAAIC,GAAMnE,EAAKkE,EACf,IAAI0C,EAAMzC,KAAStE,EAAIsE,MAAUA,IAAOtE,IAAM,OAAO,EAEvD,OAAO,EAKT,IAAI4P,GAAK,SAAS1H,EAAGC,EAAG0H,EAAQC,GAG9B,GAAI5H,IAAMC,EAAG,MAAa,KAAND,GAAW,EAAIA,IAAM,EAAIC,CAE7C,IAAS,MAALD,GAAkB,MAALC,EAAW,MAAOD,KAAMC,CAErCD,aAAaxH,KAAGwH,EAAIA,EAAEnF,UACtBoF,YAAazH,KAAGyH,EAAIA,EAAEpF,SAE1B,IAAIgN,GAAY1N,EAASiB,KAAK4E,EAC9B,IAAI6H,IAAc1N,EAASiB,KAAK6E,GAAI,OAAO,CAC3C,QAAQ4H,GAEN,IAAK,kBAEL,IAAK,kBAGH,MAAO,GAAK7H,GAAM,GAAKC,CACzB,KAAK,kBAGH,OAAKD,KAAOA,GAAWC,KAAOA,EAEhB,KAAND,EAAU,GAAKA,IAAM,EAAIC,GAAKD,KAAOC,CAC/C,KAAK,gBACL,IAAK,mBAIH,OAAQD,KAAOC,EAGnB,GAAI6H,GAA0B,mBAAdD,CAChB,KAAKC,EAAW,CACd,GAAgB,gBAAL9H,IAA6B,gBAALC,GAAe,OAAO,CAIzD,IAAI8H,GAAQ/H,EAAE/G,YAAa+O,EAAQ/H,EAAEhH,WACrC,IAAI8O,IAAUC,KAAWxP,EAAEW,WAAW4O,IAAUA,YAAiBA,IACxCvP,EAAEW,WAAW6O,IAAUA,YAAiBA,KACzC,eAAiBhI,IAAK,eAAiBC,GAC7D,OAAO,EAQX0H,EAASA,MACTC,EAASA,KAET,KADA,GAAIzP,GAASwP,EAAOxP,OACbA,KAGL,GAAIwP,EAAOxP,KAAY6H,EAAG,MAAO4H,GAAOzP,KAAY8H,CAQtD,IAJA0H,EAAOlO,KAAKuG,GACZ4H,EAAOnO,KAAKwG,GAGR6H,EAAW,CAGb,GADA3P,EAAS6H,EAAE7H,OACPA,IAAW8H,EAAE9H,OAAQ,OAAO,CAEhC,MAAOA,KACL,IAAKuP,EAAG1H,EAAE7H,GAAS8H,EAAE9H,GAASwP,EAAQC,GAAS,OAAO,MAEnD,CAEL,GAAsBxL,GAAlBnE,EAAOO,EAAEP,KAAK+H,EAGlB,IAFA7H,EAASF,EAAKE,OAEVK,EAAEP,KAAKgI,GAAG9H,SAAWA,EAAQ,OAAO,CACxC,MAAOA,KAGL,GADAiE,EAAMnE,EAAKE,IACLK,EAAEe,IAAI0G,EAAG7D,KAAQsL,EAAG1H,EAAE5D,GAAM6D,EAAE7D,GAAMuL,EAAQC,GAAU,OAAO,EAMvE,MAFAD,GAAOM,MACPL,EAAOK,OACA,EAITzP,GAAE0P,QAAU,SAASlI,EAAGC,GACtB,MAAOyH,GAAG1H,EAAGC,IAKfzH,EAAE2P,QAAU,SAASrQ,GACnB,MAAW,OAAPA,GAAoB,EACpBS,EAAYT,KAASU,EAAE8B,QAAQxC,IAAQU,EAAE4P,SAAStQ,IAAQU,EAAEoJ,YAAY9J,IAA6B,IAAfA,EAAIK,OAChE,IAAvBK,EAAEP,KAAKH,GAAKK,QAIrBK,EAAE6P,UAAY,SAASvQ,GACrB,SAAUA,GAAwB,IAAjBA,EAAIwQ,WAKvB9P,EAAE8B,QAAUD,GAAiB,SAASvC,GACpC,MAA8B,mBAAvBqC,EAASiB,KAAKtD,IAIvBU,EAAEkD,SAAW,SAAS5D,GACpB,GAAIyQ,SAAczQ,EAClB,OAAgB,aAATyQ,GAAgC,WAATA,KAAuBzQ,GAIvDU,EAAEkE,MAAM,YAAa,WAAY,SAAU,SAAU,OAAQ,SAAU,SAAU,SAAS8L,GACxFhQ,EAAE,KAAOgQ,GAAQ,SAAS1Q,GACxB,MAAOqC,GAASiB,KAAKtD,KAAS,WAAa0Q,EAAO,OAMjDhQ,EAAEoJ,YAAYnJ,aACjBD,EAAEoJ,YAAc,SAAS9J,GACvB,MAAOU,GAAEe,IAAIzB,EAAK,YAMJ,kBAAP,KAAyC,gBAAb2Q,aACrCjQ,EAAEW,WAAa,SAASrB,GACtB,MAAqB,kBAAPA,KAAqB,IAKvCU,EAAEkQ,SAAW,SAAS5Q,GACpB,MAAO4Q,UAAS5Q,KAASgL,MAAM6F,WAAW7Q,KAI5CU,EAAEsK,MAAQ,SAAShL,GACjB,MAAOU,GAAEoQ,SAAS9Q,IAAQA,KAASA,GAIrCU,EAAE4J,UAAY,SAAStK,GACrB,MAAOA,MAAQ,GAAQA,KAAQ,GAAgC,qBAAvBqC,EAASiB,KAAKtD,IAIxDU,EAAEqQ,OAAS,SAAS/Q,GAClB,MAAe,QAARA,GAITU,EAAEsQ,YAAc,SAAShR,GACvB,MAAOA,SAAa,IAKtBU,EAAEe,IAAM,SAASzB,EAAKsE,GACpB,MAAc,OAAPtE,GAAesC,EAAegB,KAAKtD,EAAKsE,IAQjD5D,EAAEuQ,WAAa,WAEb,MADArP,GAAKlB,EAAIoB,EACFD,MAITnB,EAAEiD,SAAW,SAASN,GACpB,MAAOA,IAIT3C,EAAEwQ,SAAW,SAAS7N,GACpB,MAAO,YACL,MAAOA,KAIX3C,EAAEyQ,KAAO,aAETzQ,EAAEoD,SAAW,SAASQ,GACpB,MAAO,UAAStE,GACd,MAAc,OAAPA,MAAmB,GAAIA,EAAIsE,KAKtC5D,EAAE0Q,WAAa,SAASpR,GACtB,MAAc,OAAPA,EAAc,aAAe,SAASsE,GAC3C,MAAOtE,GAAIsE,KAMf5D,EAAEmD,QAAUnD,EAAE2Q,QAAU,SAAStK,GAE/B,MADAA,GAAQrG,EAAEuO,aAAclI,GACjB,SAAS/G,GACd,MAAOU,GAAEiP,QAAQ3P,EAAK+G,KAK1BrG,EAAE0N,MAAQ,SAASzG,EAAG1H,EAAUM,GAC9B,GAAI+Q,GAAQtP,MAAM0C,KAAKuC,IAAI,EAAGU,GAC9B1H,GAAWO,EAAWP,EAAUM,EAAS,EACzC,KAAK,GAAI8D,GAAI,EAAOsD,EAAJtD,EAAOA,IAAKiN,EAAMjN,GAAKpE,EAASoE,EAChD,OAAOiN,IAIT5Q,EAAE+G,OAAS,SAASL,EAAKH,GAKvB,MAJW,OAAPA,IACFA,EAAMG,EACNA,EAAM,GAEDA,EAAM1C,KAAK6G,MAAM7G,KAAK+C,UAAYR,EAAMG,EAAM,KAIvD1G,EAAE8M,IAAM+D,KAAK/D,KAAO,WAClB,OAAO,GAAI+D,OAAOC,UAIpB,IAAIC,IACFC,IAAK,QACLC,IAAK,OACLC,IAAK,OACLC,IAAK,SACLC,IAAK,SACLC,IAAK,UAEHC,EAActR,EAAEkO,OAAO6C,GAGvBQ,EAAgB,SAASnN,GAC3B,GAAIoN,GAAU,SAASC,GACrB,MAAOrN,GAAIqN,IAGThO,EAAS,MAAQzD,EAAEP,KAAK2E,GAAKsN,KAAK,KAAO,IACzCC,EAAaC,OAAOnO,GACpBoO,EAAgBD,OAAOnO,EAAQ,IACnC,OAAO,UAASqO,GAEd,MADAA,GAAmB,MAAVA,EAAiB,GAAK,GAAKA,EAC7BH,EAAWI,KAAKD,GAAUA,EAAOE,QAAQH,EAAeL,GAAWM,GAG9E9R,GAAEiS,OAASV,EAAcR,GACzB/Q,EAAEkS,SAAWX,EAAcD,GAI3BtR,EAAE8D,OAAS,SAASsG,EAAQhH,EAAU+O,GACpC,GAAIxP,GAAkB,MAAVyH,MAAsB,GAAIA,EAAOhH,EAI7C,OAHIT,SAAe,KACjBA,EAAQwP,GAEHnS,EAAEW,WAAWgC,GAASA,EAAMC,KAAKwH,GAAUzH,EAKpD,IAAIyP,GAAY,CAChBpS,GAAEqS,SAAW,SAASC,GACpB,GAAIC,KAAOH,EAAY,EACvB,OAAOE,GAASA,EAASC,EAAKA,GAKhCvS,EAAEwS,kBACAC,SAAc,kBACdC,YAAc,mBACdT,OAAc,mBAMhB,IAAIU,GAAU,OAIVC,GACFxB,IAAU,IACVyB,KAAU,KACVC,KAAU,IACVC,KAAU,IACVC,SAAU,QACVC,SAAU,SAGRzB,EAAU,4BAEV0B,EAAa,SAASzB,GACxB,MAAO,KAAOmB,EAAQnB,GAOxBzR,GAAEmT,SAAW,SAASC,EAAMC,EAAUC,IAC/BD,GAAYC,IAAaD,EAAWC,GACzCD,EAAWrT,EAAE6O,YAAawE,EAAUrT,EAAEwS,iBAGtC,IAAIrP,GAAUyO,SACXyB,EAASpB,QAAUU,GAASlP,QAC5B4P,EAASX,aAAeC,GAASlP,QACjC4P,EAASZ,UAAYE,GAASlP,QAC/BiO,KAAK,KAAO,KAAM,KAGhBhS,EAAQ,EACR+D,EAAS,QACb2P,GAAKpB,QAAQ7O,EAAS,SAASsO,EAAOQ,EAAQS,EAAaD,EAAUc,GAanE,MAZA9P,IAAU2P,EAAK1R,MAAMhC,EAAO6T,GAAQvB,QAAQR,EAAS0B,GACrDxT,EAAQ6T,EAAS9B,EAAM9R,OAEnBsS,EACFxO,GAAU,cAAgBwO,EAAS,iCAC1BS,EACTjP,GAAU,cAAgBiP,EAAc,uBAC/BD,IACThP,GAAU,OAASgP,EAAW,YAIzBhB,IAEThO,GAAU,OAGL4P,EAASG,WAAU/P,EAAS,mBAAqBA,EAAS,OAE/DA,EAAS,2CACP,oDACAA,EAAS,eAEX,KACE,GAAIgQ,GAAS,GAAIhS,UAAS4R,EAASG,UAAY,MAAO,IAAK/P,GAC3D,MAAOiQ,GAEP,KADAA,GAAEjQ,OAASA,EACLiQ,EAGR,GAAIP,GAAW,SAASQ,GACtB,MAAOF,GAAO7Q,KAAKzB,KAAMwS,EAAM3T,IAI7B4T,EAAWP,EAASG,UAAY,KAGpC,OAFAL,GAAS1P,OAAS,YAAcmQ,EAAW,OAASnQ,EAAS,IAEtD0P,GAITnT,EAAE6T,MAAQ,SAASvU,GACjB,GAAIwU,GAAW9T,EAAEV,EAEjB,OADAwU,GAASC,QAAS,EACXD,EAUT,IAAIhQ,GAAS,SAASgQ,EAAUxU,GAC9B,MAAOwU,GAASC,OAAS/T,EAAEV,GAAKuU,QAAUvU,EAI5CU,GAAEgU,MAAQ,SAAS1U,GACjBU,EAAEkE,KAAKlE,EAAEmO,UAAU7O,GAAM,SAAS0Q,GAChC,GAAIvN,GAAOzC,EAAEgQ,GAAQ1Q,EAAI0Q,EACzBhQ,GAAEY,UAAUoP,GAAQ,WAClB,GAAI/J,IAAQ9E,KAAKkB,SAEjB,OADApB,GAAK+B,MAAMiD,EAAMhG,WACV6D,EAAO3C,KAAMsB,EAAKO,MAAMhD,EAAGiG,QAMxCjG,EAAEgU,MAAMhU,GAGRA,EAAEkE,MAAM,MAAO,OAAQ,UAAW,QAAS,OAAQ,SAAU,WAAY,SAAS8L,GAChF,GAAIhK,GAAS3E,EAAW2O,EACxBhQ,GAAEY,UAAUoP,GAAQ,WAClB,GAAI1Q,GAAM6B,KAAKkB,QAGf,OAFA2D,GAAOhD,MAAM1D,EAAKW,WACJ,UAAT+P,GAA6B,WAATA,GAAqC,IAAf1Q,EAAIK,cAAqBL,GAAI,GACrEwE,EAAO3C,KAAM7B,MAKxBU,EAAEkE,MAAM,SAAU,OAAQ,SAAU,SAAS8L,GAC3C,GAAIhK,GAAS3E,EAAW2O,EACxBhQ,GAAEY,UAAUoP,GAAQ,WAClB,MAAOlM,GAAO3C,KAAM6E,EAAOhD,MAAM7B,KAAKkB,SAAUpC,eAKpDD,EAAEY,UAAU+B,MAAQ,WAClB,MAAOxB,MAAKkB,UAKdrC,EAAEY,UAAUqT,QAAUjU,EAAEY,UAAUsT,OAASlU,EAAEY,UAAU+B,MAEvD3C,EAAEY,UAAUe,SAAW,WACrB,MAAO,GAAKR,KAAKkB,UAUG,kBAAX8R,SAAyBA,OAAOC,KACzCD,OAAO,gBAAkB,WACvB,MAAOnU,OAGX4C,KAAKzB"}
\ No newline at end of file
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/o2c.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/o2c.html
index 88e8bf114b1..0cde1d3960b 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/o2c.html
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/o2c.html
@@ -1,6 +1,6 @@
 <script>
 var qp = null;
-if(window.location.hash) {
+if(/code|token|error/.test(window.location.hash)) {
   qp = location.hash.substring(1);
 }
 else {
@@ -11,10 +11,10 @@ qp = qp ? JSON.parse('{"' + qp.replace(/&/g, '","').replace(/=/g,'":"') + '"}',
     return key===""?value:decodeURIComponent(value) }
   ):{}
 
-if (window.opener.swaggerUi.tokenUrl)
+if (window.opener.swaggerUiAuth.tokenUrl)
     window.opener.processOAuthCode(qp);
 else
     window.opener.onOAuthComplete(qp);
 
 window.close();
-</script>
\ No newline at end of file
+</script>
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
index b1c2e3f2767..5219d0335c9 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
@@ -1,44 +1,804 @@
 /**
  * swagger-ui - Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API
- * @version v2.1.4
+ * @version v2.2.10
  * @link http://swagger.io
  * @license Apache-2.0
  */
-(function(){this["Handlebars"] = this["Handlebars"] || {};
-this["Handlebars"]["templates"] = this["Handlebars"]["templates"] || {};
-this["Handlebars"]["templates"]["apikey_button_view"] = Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "<!--div class='auth_button' id='apikey_button'><img class='auth_icon' alt='apply api key' src='images/apikey.jpeg'></div-->\n<div class='auth_container' id='apikey_container'>\n  <div class='key_input_container'>\n    <div class='auth_label'><label for='input_apiKey_entry'>"
-    + escapeExpression(((helper = (helper = helpers.keyName || (depth0 != null ? depth0.keyName : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"keyName","hash":{},"data":data}) : helper)))
-    + "</label></div>\n    <input placeholder='api_key' class='auth_input' id='input_apiKey_entry' name='apiKey' type='text'/>\n    <div class='auth_submit'><a class='auth_submit_button' id='apply_api_key' href='#' data-sw-translate>apply</a></div>\n  </div>\n</div>\n";
+(function(){/* jshint ignore:start */ 
+ {(function() {
+  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
+templates['apikey_auth'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "                <span class=\"key_auth__value\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.value : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</span>\n";
+},"3":function(container,depth0,helpers,partials,data) {
+    return "                <input placeholder=\"api_key\" class=\"auth_input input_apiKey_entry\" name=\"apiKey\" type=\"text\"/>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<div class=\"key_input_container\">\n    <h3 class=\"auth__title\">Api key authorization</h3>\n    <div class=\"auth__description\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</div>\n    <div>\n        <div class=\"key_auth__field\">\n            <span class=\"key_auth__label\">name:</span>\n            <span class=\"key_auth__value\">"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</span>\n        </div>\n        <div class=\"key_auth__field\">\n            <span class=\"key_auth__label\">in:</span>\n            <span class=\"key_auth__value\">"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0["in"] : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</span>\n        </div>\n        <div class=\"key_auth__field\">\n            <span class=\"key_auth__label\">value:</span>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(3, data, 0),"data":data})) != null ? stack1 : "")
+    + "        </div>\n    </div>\n</div>\n";
 },"useData":true});
-this["Handlebars"]["templates"]["basic_auth_button_view"] = Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  return "<div class='auth_button' id='basic_auth_button'><img class='auth_icon' src='images/password.jpeg'></div>\n<div class='auth_container' id='basic_auth_container'>\n  <div class='key_input_container'>\n    <div class=\"auth_label\"><label for=\"input_username\" data-sw-translate>Username</label></div>\n    <input placeholder=\"username\" class=\"auth_input\" id=\"input_username\" name=\"username\" type=\"text\"/>\n    <div class=\"auth_label\"><label for=\"password\" data-sw-translate>Password</label></div>\n    <input placeholder=\"password\" class=\"auth_input\" id=\"input_password\" name=\"password\" type=\"password\"/>\n    <div class='auth_submit'><a class='auth_submit_button' id=\"apply_basic_auth\" href=\"#\">apply</a></div>\n  </div>\n</div>\n\n";
-  },"useData":true});
-this["Handlebars"]["templates"]["content_type"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "";
-  stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.produces : depth0), {"name":"each","hash":{},"fn":this.program(2, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"2":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression, buffer = "	<option value=\""
-    + escapeExpression(lambda(depth0, depth0))
-    + "\">";
-  stack1 = lambda(depth0, depth0);
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</option>\n";
-},"4":function(depth0,helpers,partials,data) {
-  return "  <option value=\"application/json\">application/json</option>\n";
-  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<label data-sw-translate for=\""
-    + escapeExpression(((helper = (helper = helpers.contentTypeId || (depth0 != null ? depth0.contentTypeId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"contentTypeId","hash":{},"data":data}) : helper)))
+templates['auth_button'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    return "<a class='authorize__btn' href=\"#\">Authorize</a>\n";
+},"useData":true});
+templates['auth_button_operation'] = template({"1":function(container,depth0,helpers,partials,data) {
+    return "        authorize__btn_operation_login\n";
+},"3":function(container,depth0,helpers,partials,data) {
+    return "        authorize__btn_operation_logout\n";
+},"5":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "        <ul class=\"authorize-scopes\">\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.scopes : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "        </ul>\n";
+},"6":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "                <li class=\"authorize__scope\" title=\""
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\">"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</li>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {};
+
+  return "<div class=\"authorize__btn authorize__btn_operation\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(3, data, 0),"data":data})) != null ? stack1 : "")
+    + "\">\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.scopes : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</div>\n";
+},"useData":true});
+templates['auth_view'] = template({"1":function(container,depth0,helpers,partials,data) {
+    return "            <button type=\"button\" class=\"auth__button auth_submit__button\" data-sw-translate>Authorize</button>\n";
+},"3":function(container,depth0,helpers,partials,data) {
+    return "            <button type=\"button\" class=\"auth__button auth_logout__button\" data-sw-translate>Logout</button>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {};
+
+  return "<div class=\"auth_container\">\n\n    <div class=\"auth_inner\"></div>\n    <div class=\"auth_submit\">\n"
+    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isAuthorized : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "    </div>\n\n</div>\n";
+},"useData":true});
+templates['basic_auth'] = template({"1":function(container,depth0,helpers,partials,data) {
+    return " - authorized";
+},"3":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "                <span class=\"basic_auth__value\">"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.username : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</span>\n";
+},"5":function(container,depth0,helpers,partials,data) {
+    return "                <input required placeholder=\"username\" class=\"basic_auth__username auth_input\" name=\"username\" type=\"text\"/>\n";
+},"7":function(container,depth0,helpers,partials,data) {
+    return "            <div class=\"auth_label\">\n                <span class=\"basic_auth__label\" data-sw-translate>password:</span>\n                <input required placeholder=\"password\" class=\"basic_auth__password auth_input\" name=\"password\" type=\"password\"/></label>\n            </div>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {};
+
+  return "<div class='basic_auth_container'>\n    <h3 class=\"auth__title\">Basic authentication"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</h3>\n    <form class=\"basic_input_container\">\n        <div class=\"auth__description\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</div>\n        <div class=\"auth_label\">\n            <span class=\"basic_auth__label\" data-sw-translate>username:</span>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.program(5, data, 0),"data":data})) != null ? stack1 : "")
+    + "        </div>\n"
+    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.isLogout : depth0),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "    </form>\n</div>\n";
+},"useData":true});
+templates['content_type'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.produces : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"2":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "	<option value=\""
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</option>\n";
+},"4":function(container,depth0,helpers,partials,data) {
+    return "  <option value=\"application/json\">application/json</option>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<label data-sw-translate for=\""
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.contentTypeId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
     + "\">Response Content Type</label>\n<select name=\"contentType\" id=\""
-    + escapeExpression(((helper = (helper = helpers.contentTypeId || (depth0 != null ? depth0.contentTypeId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"contentTypeId","hash":{},"data":data}) : helper)))
-    + "\">\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.produces : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(4, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</select>\n";
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.contentTypeId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\">\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.produces : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
+    + "</select>\n";
 },"useData":true});
+templates['main'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "  <div class=\"info_title\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</div>\n  <div class=\"info_description markdown\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.description : stack1),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</div>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.externalDocs : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "  "
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n  "
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1),{"name":"if","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n  "
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n  "
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1),{"name":"if","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n  "
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1),{"name":"if","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n";
+},"2":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "  <p>"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.description : stack1),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</p>\n  <a href=\""
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.url : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\" target=\"_blank\">"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.url : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</a>\n";
+},"4":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "<div class=\"info_tos\"><a target=\"_blank\" href=\""
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\" data-sw-translate>Terms of service</a></div>";
+},"6":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "<div><div class='info_name' style=\"display: inline\" data-sw-translate>Created by </div> "
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</div>";
+},"8":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<div class='info_url' data-sw-translate>See more at <a href=\""
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\">"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</a></div>";
+},"10":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<div class='info_email'><a target=\"_parent\" href=\"mailto:"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "?subject="
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\" data-sw-translate>Contact the developer</a></div>";
+},"12":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<div class='info_license'><a target=\"_blank\" href='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.url : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.name : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</a></div>";
+},"14":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "  , <span style=\"font-variant: small-caps\" data-sw-translate>api version</span>: "
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\n    ";
+},"16":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "    <span style=\"float:right\"><a target=\"_blank\" href=\""
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "/debug?url="
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.url : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\"><img id=\"validator\" src=\""
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "?url="
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.url : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\"></a>\n    </span>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {};
+
+  return "<div class='info' id='api_info'>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.info : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</div>\n<div class='container' id='resources_container'>\n  <div class='authorize-wrapper'></div>\n\n  <ul id='resources'></ul>\n\n  <div class=\"footer\">\n    <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: "
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.basePath : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\n"
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1),{"name":"if","hash":{},"fn":container.program(14, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "]\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{"name":"if","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "    </h4>\n    </div>\n</div>\n";
+},"useData":true});
+templates['oauth2'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "<p>Authorization URL: "
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.authorizationUrl : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</p>";
+},"3":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "<p>Token URL: "
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tokenUrl : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</p>";
+},"5":function(container,depth0,helpers,partials,data) {
+    return "        <p>Please input username and password for password flow authorization</p>\n        <fieldset>\n            <div><label>Username: <input class=\"oauth-username\" type=\"text\" name=\"username\"></label></div>\n            <div><label>Password: <input class=\"oauth-password\" type=\"password\" name=\"password\"></label></div>\n        </fieldset>\n";
+},"7":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "        <p>Setup client authentication."
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.requireClientAuthenticaiton : depth0),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</p>\n        <fieldset>\n            <div><label>Type:\n                <select class=\"oauth-client-authentication-type\" name=\"client-authentication-type\">\n                    <option value=\"none\" selected>None or other</option>\n                    <option value=\"basic\">Basic auth</option>\n                    <option value=\"request-body\">Request body</option>\n                </select>\n            </label></div>\n            <div class=\"oauth-client-authentication\" hidden>\n                <div><label>ClientId: <input class=\"oauth-client-id\" type=\"text\" name=\"client-id\"></label></div>\n                <div><label>Secret: <input class=\"oauth-client-secret\" type=\"text\" name=\"client-secret\"></label></div>\n            </div>\n        </fieldset>\n";
+},"8":function(container,depth0,helpers,partials,data) {
+    return "(Required)";
+},"10":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "            <li>\n                <input class=\"oauth-scope\" type=\"checkbox\" data-scope=\""
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\" oauthtype=\""
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.OAuthSchemeKey : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\"/>\n                <label>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</label><br/>\n                <span class=\"api-scope-desc\">"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.OAuthSchemeKey : depth0),{"name":"if","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "                </span>\n            </li>\n";
+},"11":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "                        ("
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.OAuthSchemeKey : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + ")\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<div>\n    <h3 class=\"auth__title\">OAuth2.0</h3>\n    <p>"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</p>\n    "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.authorizationUrl : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n    "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tokenUrl : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n    <p>flow: "
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.flow : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</p>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isPasswordFlow : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.clientAuthentication : depth0),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "    <p><strong> "
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.appName : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + " </strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>\n    <p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.\n        <a href=\"#\">Learn how to use</a>\n    </p>\n    <ul class=\"api-popup-scopes\">\n"
+    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.scopes : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "    </ul>\n</div>";
+},"useData":true});
+templates['operation'] = template({"1":function(container,depth0,helpers,partials,data) {
+    return "deprecated";
+},"3":function(container,depth0,helpers,partials,data) {
+    return "            <h4><span data-sw-translate>Warning: Deprecated</span></h4>\n";
+},"5":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "        <h4><span data-sw-translate>Implementation Notes</span></h4>\n        <div class=\"markdown\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</div>\n";
+},"7":function(container,depth0,helpers,partials,data) {
+    return "            <div class='authorize-wrapper authorize-wrapper_operation'></div>\n";
+},"9":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {};
+
+  return "          <div class=\"response-class\">\n            <h4><span data-sw-translate>Response Class</span> (<span data-sw-translate>Status</span> "
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.successCode : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + ")</h4>\n              "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.successDescription : depth0),{"name":"if","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n            <p><span class=\"model-signature\" /></p>\n            <br/>\n            <div class=\"response-content-type\" />\n            </div>\n";
+},"10":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "<div class=\"markdown\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.successDescription : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</div>";
+},"12":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "          <h4 data-sw-translate>Headers</h4>\n          <table class=\"headers\">\n            <thead>\n              <tr>\n                <th style=\"width: 100px; max-width: 100px\" data-sw-translate>Header</th>\n                <th style=\"width: 310px; max-width: 310px\" data-sw-translate>Description</th>\n                <th style=\"width: 200px; max-width: 200px\" data-sw-translate>Type</th>\n                <th style=\"width: 320px; max-width: 320px\" data-sw-translate>Other</th>\n              </tr>\n            </thead>\n            <tbody>\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.headers : depth0),{"name":"each","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "            </tbody>\n          </table>\n";
+},"13":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "              <tr>\n                <td>"
+    + container.escapeExpression(((helper = (helper = helpers.key || (data && data.key)) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"key","hash":{},"data":data}) : helper)))
+    + "</td>\n                <td>"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n                <td>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.type : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n                <td>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.other : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n              </tr>\n";
+},"15":function(container,depth0,helpers,partials,data) {
+    return "          <h4 data-sw-translate>Parameters</h4>\n          <table class='fullwidth parameters'>\n          <thead>\n            <tr>\n            <th style=\"width: 100px; max-width: 100px\" data-sw-translate>Parameter</th>\n            <th style=\"width: 310px; max-width: 310px\" data-sw-translate>Value</th>\n            <th style=\"width: 200px; max-width: 200px\" data-sw-translate>Description</th>\n            <th style=\"width: 100px; max-width: 100px\" data-sw-translate>Parameter Type</th>\n            <th style=\"width: 220px; max-width: 230px\" data-sw-translate>Data Type</th>\n            </tr>\n          </thead>\n          <tbody class=\"operation-params\">\n\n          </tbody>\n          </table>\n";
+},"17":function(container,depth0,helpers,partials,data) {
+    return "          <div style='margin:0;padding:0;display:inline'></div>\n          <h4 data-sw-translate>Response Messages</h4>\n          <table class='fullwidth response-messages'>\n            <thead>\n            <tr>\n              <th data-sw-translate>HTTP Status Code</th>\n              <th data-sw-translate>Reason</th>\n              <th data-sw-translate>Response Model</th>\n              <th data-sw-translate>Headers</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            </tbody>\n          </table>\n";
+},"19":function(container,depth0,helpers,partials,data) {
+    return "";
+},"21":function(container,depth0,helpers,partials,data) {
+    return "          <div class='sandbox_header'>\n            <input class='submit' type='submit' value='Try it out!' data-sw-translate/>\n            <a href='#' class='response_hider' style='display:none' data-sw-translate>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n";
+},"23":function(container,depth0,helpers,partials,data) {
+    return "          <h4 data-sw-translate>Request Headers</h4>\n          <div class='block request_headers'></div>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3=container.escapeExpression;
+
+  return "  <ul class='operations' >\n    <li class='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.method : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + " operation' id='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.parentId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "_"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/"
+    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{"name":"sanitize","hash":{},"data":data}))
+    + "/"
+    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{"name":"sanitize","hash":{},"data":data}))
+    + "' class=\"toggleOperation\">"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.method : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</a>\n          </span>\n          <span class='path'>\n          <a href='#!/"
+    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{"name":"sanitize","hash":{},"data":data}))
+    + "/"
+    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{"name":"sanitize","hash":{},"data":data}))
+    + "' class=\"toggleOperation "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.deprecated : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\">"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.path : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/"
+    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{"name":"sanitize","hash":{},"data":data}))
+    + "/"
+    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{"name":"sanitize","hash":{},"data":data}))
+    + "' class=\"toggleOperation\"><span class=\"markdown\">"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.summary : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</span></a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='"
+    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{"name":"sanitize","hash":{},"data":data}))
+    + "_"
+    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{"name":"sanitize","hash":{},"data":data}))
+    + "_content' style='display:none'>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.deprecated : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.security : depth0),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.type : depth0),{"name":"if","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.headers : depth0),{"name":"if","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.parameters : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.responseMessages : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isReadOnly : depth0),{"name":"if","hash":{},"fn":container.program(19, data, 0),"inverse":container.program(21, data, 0),"data":data})) != null ? stack1 : "")
+    + "        </form>\n        <div class='response' style='display:none'>\n          <h4 class='curl'>Curl</h4>\n          <div class='block curl'></div>\n          <h4 data-sw-translate>Request URL</h4>\n          <div class='block request_url'></div>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.showRequestHeaders : depth0),{"name":"if","hash":{},"fn":container.program(23, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "          <h4 data-sw-translate>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4 data-sw-translate>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4 data-sw-translate>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n";
+},"useData":true});
+templates['param'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "");
+},"2":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "			<input type=\"file\" name='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "' id='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'/>\n			<div class=\"parameter-content-type\" />\n";
+},"4":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.program(7, data, 0),"data":data})) != null ? stack1 : "");
+},"5":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "				<div class=\"editor_holder\"></div>\n				<textarea class='body-textarea' name='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "' id='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0["default"] : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</textarea>\n        <br />\n        <div class=\"parameter-content-type\" />\n";
+},"7":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "				<textarea class='body-textarea' name='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "' id='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'></textarea>\n				<div class=\"editor_holder\"></div>\n				<br />\n				<div class=\"parameter-content-type\" />\n";
+},"9":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(10, data, 0),"data":data})) != null ? stack1 : "");
+},"10":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = (helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helpers.helperMissing).call(depth0 != null ? depth0 : {},depth0,{"name":"renderTextParam","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"11":function(container,depth0,helpers,partials,data) {
+    return "";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<td class='code'><label for='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</label></td>\n<td>\n\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(9, data, 0),"data":data})) != null ? stack1 : "")
+    + "\n</td>\n<td class=\"markdown\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n<td>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n<td>\n	<span class=\"model-signature\"></span>\n</td>\n";
+},"useData":true});
+templates['param_list'] = template({"1":function(container,depth0,helpers,partials,data) {
+    return " required";
+},"3":function(container,depth0,helpers,partials,data) {
+    return " multiple=\"multiple\"";
+},"5":function(container,depth0,helpers,partials,data) {
+    return " required ";
+},"7":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "      <option "
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.hasDefault : depth0),{"name":"unless","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + " value=''></option>\n";
+},"8":function(container,depth0,helpers,partials,data) {
+    return "  selected=\"\" ";
+},"10":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "\n      <option "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isDefault : depth0),{"name":"if","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "  value='"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.value : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "'> "
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.value : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + " "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isDefault : depth0),{"name":"if","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + " </option>\n\n";
+},"11":function(container,depth0,helpers,partials,data) {
+    return " selected=\"\"  ";
+},"13":function(container,depth0,helpers,partials,data) {
+    return " (default) ";
+},"15":function(container,depth0,helpers,partials,data) {
+    return "<strong>";
+},"17":function(container,depth0,helpers,partials,data) {
+    return "</strong>";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<td class='code"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.required : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "'><label for='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'>"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</label></td>\n<td>\n  <select "
+    + ((stack1 = (helpers.isArray || (depth0 && depth0.isArray) || alias2).call(alias1,depth0,{"name":"isArray","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + " class=\"parameter "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.required : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\" name=\""
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\" id=\""
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\">\n\n"
+    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.required : depth0),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n"
+    + ((stack1 = helpers.each.call(alias1,((stack1 = (depth0 != null ? depth0.allowableValues : depth0)) != null ? stack1.descriptiveValues : stack1),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n  </select>\n</td>\n<td class=\"markdown\">"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.required : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"description","hash":{},"data":data}) : helper))) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.required : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</td>\n<td>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
+},"useData":true});
+templates['param_readonly'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "        <textarea class='body-textarea' readonly='readonly' name='"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "' id='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'>"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0["default"] : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</textarea>\n        <div class=\"parameter-content-type\" />\n";
+},"3":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.program(6, data, 0),"data":data})) != null ? stack1 : "");
+},"4":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "            "
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\n";
+},"6":function(container,depth0,helpers,partials,data) {
+    return "            (empty)\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<td class='code'><label for='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'>"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</label></td>\n<td>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(3, data, 0),"data":data})) != null ? stack1 : "")
+    + "</td>\n<td class=\"markdown\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n<td>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
+},"useData":true});
+templates['param_readonly_required'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "        <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "' id='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'>"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0["default"] : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</textarea>\n";
+},"3":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.program(6, data, 0),"data":data})) != null ? stack1 : "");
+},"4":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "            "
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\n";
+},"6":function(container,depth0,helpers,partials,data) {
+    return "            (empty)\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<td class='code required'><label for='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'>"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</label></td>\n<td>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(3, data, 0),"data":data})) != null ? stack1 : "")
+    + "</td>\n<td class=\"markdown\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n<td>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
+},"useData":true});
+templates['param_required'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "");
+},"2":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "			<input type=\"file\" name='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "' id='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'/>\n";
+},"4":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0["default"] : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.program(7, data, 0),"data":data})) != null ? stack1 : "");
+},"5":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "				<div class=\"editor_holder\"></div>\n				<textarea class='body-textarea required' placeholder='(required)' name='"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "' id=\""
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0["default"] : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</textarea>\n        <br />\n        <div class=\"parameter-content-type\" />\n";
+},"7":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "				<textarea class='body-textarea required' placeholder='(required)' name='"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "' id='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'></textarea>\n				<div class=\"editor_holder\"></div>\n				<br />\n				<div class=\"parameter-content-type\" />\n";
+},"9":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{"name":"if","hash":{},"fn":container.program(10, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "");
+},"10":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "			<input class='parameter required' type='file' name='"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "' id='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'/>\n";
+},"12":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = (helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helpers.helperMissing).call(depth0 != null ? depth0 : {},depth0,{"name":"renderTextParam","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"13":function(container,depth0,helpers,partials,data) {
+    return "";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<td class='code required'><label for='"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "'>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</label></td>\n<td>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(9, data, 0),"data":data})) != null ? stack1 : "")
+    + "</td>\n<td>\n	<strong><span class=\"markdown\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</span></strong>\n</td>\n<td>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
+},"useData":true});
+templates['parameter_content_type'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.consumes : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"2":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "  <option value=\""
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</option>\n";
+},"4":function(container,depth0,helpers,partials,data) {
+    return "  <option value=\"application/json\">application/json</option>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<label for=\""
+    + container.escapeExpression(((helper = (helper = helpers.parameterContentTypeId || (depth0 != null ? depth0.parameterContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"parameterContentTypeId","hash":{},"data":data}) : helper)))
+    + "\" data-sw-translate>Parameter content type:</label>\n<select name=\"parameterContentType\" id=\""
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.parameterContentTypeId : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\">\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.consumes : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
+    + "</select>\n";
+},"useData":true});
+templates['popup'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var helper;
+
+  return "<div class=\"api-popup-dialog-wrapper\">\n    <div class=\"api-popup-title\">"
+    + container.escapeExpression(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"title","hash":{},"data":data}) : helper)))
+    + "</div>\n    <div class=\"api-popup-content\"></div>\n    <p class=\"error-msg\"></p>\n    <div class=\"api-popup-actions\">\n        <button class=\"api-popup-cancel api-button gray\" type=\"button\">Cancel</button>\n    </div>\n</div>\n<div class=\"api-popup-dialog-shadow\"></div>";
+},"useData":true});
+templates['resource'] = template({"1":function(container,depth0,helpers,partials,data) {
+    return " : ";
+},"3":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "    <li>\n      <a href='"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.url : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "' data-sw-translate>Raw</a>\n    </li>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, buffer = 
+  "<div class='heading'>\n  <h2>\n    <a href='#!/"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "' class=\"toggleEndpointList\" data-id=\""
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</a> ";
+  stack1 = ((helper = (helper = helpers.summary || (depth0 != null ? depth0.summary : depth0)) != null ? helper : alias2),(options={"name":"summary","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(alias1,options) : helper));
+  if (!helpers.summary) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.summary : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "' id='endpointListTogger_"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "' class=\"toggleEndpointList\" data-id=\""
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\" data-sw-translate>Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' class=\"collapseResource\" data-id=\""
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\" data-sw-translate>\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' class=\"expandResource\" data-id=\""
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\" data-sw-translate>\n        Expand Operations\n      </a>\n    </li>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.url : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "  </ul>\n</div>\n<ul class='endpoints' id='"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "_endpoint_list' style='display:none'>\n\n</ul>\n";
+},"useData":true});
+templates['response_content_type'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.produces : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"2":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "  <option value=\""
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "\">"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</option>\n";
+},"4":function(container,depth0,helpers,partials,data) {
+    return "  <option value=\"application/json\">application/json</option>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "<label data-sw-translate for=\""
+    + alias4(((helper = (helper = helpers.responseContentTypeId || (depth0 != null ? depth0.responseContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"responseContentTypeId","hash":{},"data":data}) : helper)))
+    + "\">Response Content Type</label>\n<select name=\"responseContentType\" id=\""
+    + alias4(((helper = (helper = helpers.responseContentTypeId || (depth0 != null ? depth0.responseContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"responseContentTypeId","hash":{},"data":data}) : helper)))
+    + "\">\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.produces : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
+    + "</select>\n";
+},"useData":true});
+templates['signature'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {};
+
+  return "\n<div>\n<ul class=\"signature-nav\">\n  <li><a class=\"description-link\" href=\"#\" data-sw-translate>Model</a></li>\n  <li><a class=\"snippet-link\" href=\"#\" data-sw-translate>Example Value</a></li>\n</ul>\n<div>\n\n<div class=\"signature-container\">\n  <div class=\"description\">\n      "
+    + container.escapeExpression((helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.signature : depth0),{"name":"sanitize","hash":{},"data":data}))
+    + "\n  </div>\n\n  <div class=\"snippet\">\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.sampleJSON : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.sampleXML : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "  </div>\n</div>\n";
+},"2":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {};
+
+  return "      <div class=\"snippet_json\">\n        <pre><code>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.sampleJSON : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</code></pre>\n        "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isParam : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n      </div>\n";
+},"3":function(container,depth0,helpers,partials,data) {
+    return "<small class=\"notice\" data-sw-translate></small>";
+},"5":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {};
+
+  return "    <div class=\"snippet_xml\">\n      <pre><code>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.sampleXML : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</code></pre>\n      "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isParam : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n    </div>\n";
+},"7":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "    "
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.signature : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = (helpers.ifCond || (depth0 && depth0.ifCond) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.sampleJSON : depth0),"||",(depth0 != null ? depth0.sampleXML : depth0),{"name":"ifCond","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(7, data, 0),"data":data})) != null ? stack1 : "");
+},"useData":true});
+templates['status_code'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "      <tr>\n        <td>"
+    + container.escapeExpression(((helper = (helper = helpers.key || (data && data.key)) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"key","hash":{},"data":data}) : helper)))
+    + "</td>\n        <td>"
+    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{"name":"sanitize","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n        <td>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.type : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n      </tr>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;
+
+  return "<td width='15%' class='code'>"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.code : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n<td class=\"markdown\">"
+    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.message : depth0),{"name":"escape","hash":{},"data":data})) != null ? stack1 : "")
+    + "</td>\n<td width='50%'><span class=\"model-signature\" /></td>\n<td class=\"headers\">\n  <table>\n    <tbody>\n"
+    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.headers : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "    </tbody>\n  </table>\n</td>";
+},"useData":true});
+})();} 
+ /* jshint ignore:end */
 'use strict';
 
 
@@ -240,19 +1000,2103 @@ window.Docs = {
 	}
 };
 
-'use strict';
+/*!
+ * https://github.com/es-shims/es5-shim
+ * @license es5-shim Copyright 2009-2015 by contributors, MIT License
+ * see https://github.com/es-shims/es5-shim/blob/master/LICENSE
+ */
 
-Handlebars.registerHelper('sanitize', function(html) {
-    // Strip the script tags from the html, and return it as a Handlebars.SafeString
-    html = html.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
-    return new Handlebars.SafeString(html);
+// vim: ts=4 sts=4 sw=4 expandtab
+
+// Add semicolon to prevent IIFE from being passed as argument to concatenated code.
+;
+
+// UMD (Universal Module Definition)
+// see https://github.com/umdjs/umd/blob/master/templates/returnExports.js
+(function (root, factory) {
+    'use strict';
+
+    /* global define, exports, module */
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(factory);
+    } else if (typeof exports === 'object') {
+        // Node. Does not work with strict CommonJS, but
+        // only CommonJS-like enviroments that support module.exports,
+        // like Node.
+        module.exports = factory();
+    } else {
+        // Browser globals (root is window)
+        root.returnExports = factory();
+    }
+}(this, function () {
+    /**
+     * Brings an environment as close to ECMAScript 5 compliance
+     * as is possible with the facilities of erstwhile engines.
+     *
+     * Annotated ES5: http://es5.github.com/ (specific links below)
+     * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
+     * Required reading: http://javascriptweblog.wordpress.com/2011/12/05/extending-javascript-natives/
+     */
+
+    // Shortcut to an often accessed properties, in order to avoid multiple
+    // dereference that costs universally. This also holds a reference to known-good
+    // functions.
+    var $Array = Array;
+    var ArrayPrototype = $Array.prototype;
+    var $Object = Object;
+    var ObjectPrototype = $Object.prototype;
+    var $Function = Function;
+    var FunctionPrototype = $Function.prototype;
+    var $String = String;
+    var StringPrototype = $String.prototype;
+    var $Number = Number;
+    var NumberPrototype = $Number.prototype;
+    var array_slice = ArrayPrototype.slice;
+    var array_splice = ArrayPrototype.splice;
+    var array_push = ArrayPrototype.push;
+    var array_unshift = ArrayPrototype.unshift;
+    var array_concat = ArrayPrototype.concat;
+    var array_join = ArrayPrototype.join;
+    var call = FunctionPrototype.call;
+    var apply = FunctionPrototype.apply;
+    var max = Math.max;
+    var min = Math.min;
+
+    // Having a toString local variable name breaks in Opera so use to_string.
+    var to_string = ObjectPrototype.toString;
+
+    /* global Symbol */
+    /* eslint-disable one-var-declaration-per-line, no-redeclare, max-statements-per-line */
+    var hasToStringTag = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';
+    var isCallable; /* inlined from https://npmjs.com/is-callable */ var fnToStr = Function.prototype.toString, constructorRegex = /^\s*class /, isES6ClassFn = function isES6ClassFn(value) { try { var fnStr = fnToStr.call(value); var singleStripped = fnStr.replace(/\/\/.*\n/g, ''); var multiStripped = singleStripped.replace(/\/\*[.\s\S]*\*\//g, ''); var spaceStripped = multiStripped.replace(/\n/mg, ' ').replace(/ {2}/g, ' '); return constructorRegex.test(spaceStripped); } catch (e) { return false; /* not a function */ } }, tryFunctionObject = function tryFunctionObject(value) { try { if (isES6ClassFn(value)) { return false; } fnToStr.call(value); return true; } catch (e) { return false; } }, fnClass = '[object Function]', genClass = '[object GeneratorFunction]', isCallable = function isCallable(value) { if (!value) { return false; } if (typeof value !== 'function' && typeof value !== 'object') { return false; } if (hasToStringTag) { return tryFunctionObject(value); } if (isES6ClassFn(value)) { return false; } var strClass = to_string.call(value); return strClass === fnClass || strClass === genClass; };
+
+    var isRegex; /* inlined from https://npmjs.com/is-regex */ var regexExec = RegExp.prototype.exec, tryRegexExec = function tryRegexExec(value) { try { regexExec.call(value); return true; } catch (e) { return false; } }, regexClass = '[object RegExp]'; isRegex = function isRegex(value) { if (typeof value !== 'object') { return false; } return hasToStringTag ? tryRegexExec(value) : to_string.call(value) === regexClass; };
+    var isString; /* inlined from https://npmjs.com/is-string */ var strValue = String.prototype.valueOf, tryStringObject = function tryStringObject(value) { try { strValue.call(value); return true; } catch (e) { return false; } }, stringClass = '[object String]'; isString = function isString(value) { if (typeof value === 'string') { return true; } if (typeof value !== 'object') { return false; } return hasToStringTag ? tryStringObject(value) : to_string.call(value) === stringClass; };
+    /* eslint-enable one-var-declaration-per-line, no-redeclare, max-statements-per-line */
+
+    /* inlined from http://npmjs.com/define-properties */
+    var supportsDescriptors = $Object.defineProperty && (function () {
+        try {
+            var obj = {};
+            $Object.defineProperty(obj, 'x', { enumerable: false, value: obj });
+            for (var _ in obj) { // jscs:ignore disallowUnusedVariables
+                return false;
+            }
+            return obj.x === obj;
+        } catch (e) { /* this is ES3 */
+            return false;
+        }
+    }());
+    var defineProperties = (function (has) {
+        // Define configurable, writable, and non-enumerable props
+        // if they don't exist.
+        var defineProperty;
+        if (supportsDescriptors) {
+            defineProperty = function (object, name, method, forceAssign) {
+                if (!forceAssign && (name in object)) {
+                    return;
+                }
+                $Object.defineProperty(object, name, {
+                    configurable: true,
+                    enumerable: false,
+                    writable: true,
+                    value: method
+                });
+            };
+        } else {
+            defineProperty = function (object, name, method, forceAssign) {
+                if (!forceAssign && (name in object)) {
+                    return;
+                }
+                object[name] = method;
+            };
+        }
+        return function defineProperties(object, map, forceAssign) {
+            for (var name in map) {
+                if (has.call(map, name)) {
+                    defineProperty(object, name, map[name], forceAssign);
+                }
+            }
+        };
+    }(ObjectPrototype.hasOwnProperty));
+
+    //
+    // Util
+    // ======
+    //
+
+    /* replaceable with https://npmjs.com/package/es-abstract /helpers/isPrimitive */
+    var isPrimitive = function isPrimitive(input) {
+        var type = typeof input;
+        return input === null || (type !== 'object' && type !== 'function');
+    };
+
+    var isActualNaN = $Number.isNaN || function isActualNaN(x) {
+        return x !== x;
+    };
+
+    var ES = {
+        // ES5 9.4
+        // http://es5.github.com/#x9.4
+        // http://jsperf.com/to-integer
+        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToInteger */
+        ToInteger: function ToInteger(num) {
+            var n = +num;
+            if (isActualNaN(n)) {
+                n = 0;
+            } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
+                n = (n > 0 || -1) * Math.floor(Math.abs(n));
+            }
+            return n;
+        },
+
+        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToPrimitive */
+        ToPrimitive: function ToPrimitive(input) {
+            var val, valueOf, toStr;
+            if (isPrimitive(input)) {
+                return input;
+            }
+            valueOf = input.valueOf;
+            if (isCallable(valueOf)) {
+                val = valueOf.call(input);
+                if (isPrimitive(val)) {
+                    return val;
+                }
+            }
+            toStr = input.toString;
+            if (isCallable(toStr)) {
+                val = toStr.call(input);
+                if (isPrimitive(val)) {
+                    return val;
+                }
+            }
+            throw new TypeError();
+        },
+
+        // ES5 9.9
+        // http://es5.github.com/#x9.9
+        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToObject */
+        ToObject: function (o) {
+            if (o == null) { // this matches both null and undefined
+                throw new TypeError("can't convert " + o + ' to object');
+            }
+            return $Object(o);
+        },
+
+        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToUint32 */
+        ToUint32: function ToUint32(x) {
+            return x >>> 0;
+        }
+    };
+
+    //
+    // Function
+    // ========
+    //
+
+    // ES-5 15.3.4.5
+    // http://es5.github.com/#x15.3.4.5
+
+    var Empty = function Empty() {};
+
+    defineProperties(FunctionPrototype, {
+        bind: function bind(that) { // .length is 1
+            // 1. Let Target be the this value.
+            var target = this;
+            // 2. If IsCallable(Target) is false, throw a TypeError exception.
+            if (!isCallable(target)) {
+                throw new TypeError('Function.prototype.bind called on incompatible ' + target);
+            }
+            // 3. Let A be a new (possibly empty) internal list of all of the
+            //   argument values provided after thisArg (arg1, arg2 etc), in order.
+            // XXX slicedArgs will stand in for "A" if used
+            var args = array_slice.call(arguments, 1); // for normal call
+            // 4. Let F be a new native ECMAScript object.
+            // 11. Set the [[Prototype]] internal property of F to the standard
+            //   built-in Function prototype object as specified in 15.3.3.1.
+            // 12. Set the [[Call]] internal property of F as described in
+            //   15.3.4.5.1.
+            // 13. Set the [[Construct]] internal property of F as described in
+            //   15.3.4.5.2.
+            // 14. Set the [[HasInstance]] internal property of F as described in
+            //   15.3.4.5.3.
+            var bound;
+            var binder = function () {
+
+                if (this instanceof bound) {
+                    // 15.3.4.5.2 [[Construct]]
+                    // When the [[Construct]] internal method of a function object,
+                    // F that was created using the bind function is called with a
+                    // list of arguments ExtraArgs, the following steps are taken:
+                    // 1. Let target be the value of F's [[TargetFunction]]
+                    //   internal property.
+                    // 2. If target has no [[Construct]] internal method, a
+                    //   TypeError exception is thrown.
+                    // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
+                    //   property.
+                    // 4. Let args be a new list containing the same values as the
+                    //   list boundArgs in the same order followed by the same
+                    //   values as the list ExtraArgs in the same order.
+                    // 5. Return the result of calling the [[Construct]] internal
+                    //   method of target providing args as the arguments.
+
+                    var result = apply.call(
+                        target,
+                        this,
+                        array_concat.call(args, array_slice.call(arguments))
+                    );
+                    if ($Object(result) === result) {
+                        return result;
+                    }
+                    return this;
+
+                } else {
+                    // 15.3.4.5.1 [[Call]]
+                    // When the [[Call]] internal method of a function object, F,
+                    // which was created using the bind function is called with a
+                    // this value and a list of arguments ExtraArgs, the following
+                    // steps are taken:
+                    // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
+                    //   property.
+                    // 2. Let boundThis be the value of F's [[BoundThis]] internal
+                    //   property.
+                    // 3. Let target be the value of F's [[TargetFunction]] internal
+                    //   property.
+                    // 4. Let args be a new list containing the same values as the
+                    //   list boundArgs in the same order followed by the same
+                    //   values as the list ExtraArgs in the same order.
+                    // 5. Return the result of calling the [[Call]] internal method
+                    //   of target providing boundThis as the this value and
+                    //   providing args as the arguments.
+
+                    // equiv: target.call(this, ...boundArgs, ...args)
+                    return apply.call(
+                        target,
+                        that,
+                        array_concat.call(args, array_slice.call(arguments))
+                    );
+
+                }
+
+            };
+
+            // 15. If the [[Class]] internal property of Target is "Function", then
+            //     a. Let L be the length property of Target minus the length of A.
+            //     b. Set the length own property of F to either 0 or L, whichever is
+            //       larger.
+            // 16. Else set the length own property of F to 0.
+
+            var boundLength = max(0, target.length - args.length);
+
+            // 17. Set the attributes of the length own property of F to the values
+            //   specified in 15.3.5.1.
+            var boundArgs = [];
+            for (var i = 0; i < boundLength; i++) {
+                array_push.call(boundArgs, '$' + i);
+            }
+
+            // XXX Build a dynamic function with desired amount of arguments is the only
+            // way to set the length property of a function.
+            // In environments where Content Security Policies enabled (Chrome extensions,
+            // for ex.) all use of eval or Function costructor throws an exception.
+            // However in all of these environments Function.prototype.bind exists
+            // and so this code will never be executed.
+            bound = $Function('binder', 'return function (' + array_join.call(boundArgs, ',') + '){ return binder.apply(this, arguments); }')(binder);
+
+            if (target.prototype) {
+                Empty.prototype = target.prototype;
+                bound.prototype = new Empty();
+                // Clean up dangling references.
+                Empty.prototype = null;
+            }
+
+            // TODO
+            // 18. Set the [[Extensible]] internal property of F to true.
+
+            // TODO
+            // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
+            // 20. Call the [[DefineOwnProperty]] internal method of F with
+            //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
+            //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and
+            //   false.
+            // 21. Call the [[DefineOwnProperty]] internal method of F with
+            //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower,
+            //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
+            //   and false.
+
+            // TODO
+            // NOTE Function objects created using Function.prototype.bind do not
+            // have a prototype property or the [[Code]], [[FormalParameters]], and
+            // [[Scope]] internal properties.
+            // XXX can't delete prototype in pure-js.
+
+            // 22. Return F.
+            return bound;
+        }
+    });
+
+    // _Please note: Shortcuts are defined after `Function.prototype.bind` as we
+    // use it in defining shortcuts.
+    var owns = call.bind(ObjectPrototype.hasOwnProperty);
+    var toStr = call.bind(ObjectPrototype.toString);
+    var arraySlice = call.bind(array_slice);
+    var arraySliceApply = apply.bind(array_slice);
+    var strSlice = call.bind(StringPrototype.slice);
+    var strSplit = call.bind(StringPrototype.split);
+    var strIndexOf = call.bind(StringPrototype.indexOf);
+    var pushCall = call.bind(array_push);
+    var isEnum = call.bind(ObjectPrototype.propertyIsEnumerable);
+    var arraySort = call.bind(ArrayPrototype.sort);
+
+    //
+    // Array
+    // =====
+    //
+
+    var isArray = $Array.isArray || function isArray(obj) {
+        return toStr(obj) === '[object Array]';
+    };
+
+    // ES5 15.4.4.12
+    // http://es5.github.com/#x15.4.4.13
+    // Return len+argCount.
+    // [bugfix, ielt8]
+    // IE < 8 bug: [].unshift(0) === undefined but should be "1"
+    var hasUnshiftReturnValueBug = [].unshift(0) !== 1;
+    defineProperties(ArrayPrototype, {
+        unshift: function () {
+            array_unshift.apply(this, arguments);
+            return this.length;
+        }
+    }, hasUnshiftReturnValueBug);
+
+    // ES5 15.4.3.2
+    // http://es5.github.com/#x15.4.3.2
+    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
+    defineProperties($Array, { isArray: isArray });
+
+    // The IsCallable() check in the Array functions
+    // has been replaced with a strict check on the
+    // internal class of the object to trap cases where
+    // the provided function was actually a regular
+    // expression literal, which in V8 and
+    // JavaScriptCore is a typeof "function".  Only in
+    // V8 are regular expression literals permitted as
+    // reduce parameters, so it is desirable in the
+    // general case for the shim to match the more
+    // strict and common behavior of rejecting regular
+    // expressions.
+
+    // ES5 15.4.4.18
+    // http://es5.github.com/#x15.4.4.18
+    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
+
+    // Check failure of by-index access of string characters (IE < 9)
+    // and failure of `0 in boxedString` (Rhino)
+    var boxedString = $Object('a');
+    var splitString = boxedString[0] !== 'a' || !(0 in boxedString);
+
+    var properlyBoxesContext = function properlyBoxed(method) {
+        // Check node 0.6.21 bug where third parameter is not boxed
+        var properlyBoxesNonStrict = true;
+        var properlyBoxesStrict = true;
+        var threwException = false;
+        if (method) {
+            try {
+                method.call('foo', function (_, __, context) {
+                    if (typeof context !== 'object') {
+                        properlyBoxesNonStrict = false;
+                    }
+                });
+
+                method.call([1], function () {
+                    'use strict';
+
+                    properlyBoxesStrict = typeof this === 'string';
+                }, 'x');
+            } catch (e) {
+                threwException = true;
+            }
+        }
+        return !!method && !threwException && properlyBoxesNonStrict && properlyBoxesStrict;
+    };
+
+    defineProperties(ArrayPrototype, {
+        forEach: function forEach(callbackfn/*, thisArg*/) {
+            var object = ES.ToObject(this);
+            var self = splitString && isString(this) ? strSplit(this, '') : object;
+            var i = -1;
+            var length = ES.ToUint32(self.length);
+            var T;
+            if (arguments.length > 1) {
+                T = arguments[1];
+            }
+
+            // If no callback function or if callback is not a callable function
+            if (!isCallable(callbackfn)) {
+                throw new TypeError('Array.prototype.forEach callback must be a function');
+            }
+
+            while (++i < length) {
+                if (i in self) {
+                    // Invoke the callback function with call, passing arguments:
+                    // context, property value, property key, thisArg object
+                    if (typeof T === 'undefined') {
+                        callbackfn(self[i], i, object);
+                    } else {
+                        callbackfn.call(T, self[i], i, object);
+                    }
+                }
+            }
+        }
+    }, !properlyBoxesContext(ArrayPrototype.forEach));
+
+    // ES5 15.4.4.19
+    // http://es5.github.com/#x15.4.4.19
+    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
+    defineProperties(ArrayPrototype, {
+        map: function map(callbackfn/*, thisArg*/) {
+            var object = ES.ToObject(this);
+            var self = splitString && isString(this) ? strSplit(this, '') : object;
+            var length = ES.ToUint32(self.length);
+            var result = $Array(length);
+            var T;
+            if (arguments.length > 1) {
+                T = arguments[1];
+            }
+
+            // If no callback function or if callback is not a callable function
+            if (!isCallable(callbackfn)) {
+                throw new TypeError('Array.prototype.map callback must be a function');
+            }
+
+            for (var i = 0; i < length; i++) {
+                if (i in self) {
+                    if (typeof T === 'undefined') {
+                        result[i] = callbackfn(self[i], i, object);
+                    } else {
+                        result[i] = callbackfn.call(T, self[i], i, object);
+                    }
+                }
+            }
+            return result;
+        }
+    }, !properlyBoxesContext(ArrayPrototype.map));
+
+    // ES5 15.4.4.20
+    // http://es5.github.com/#x15.4.4.20
+    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
+    defineProperties(ArrayPrototype, {
+        filter: function filter(callbackfn/*, thisArg*/) {
+            var object = ES.ToObject(this);
+            var self = splitString && isString(this) ? strSplit(this, '') : object;
+            var length = ES.ToUint32(self.length);
+            var result = [];
+            var value;
+            var T;
+            if (arguments.length > 1) {
+                T = arguments[1];
+            }
+
+            // If no callback function or if callback is not a callable function
+            if (!isCallable(callbackfn)) {
+                throw new TypeError('Array.prototype.filter callback must be a function');
+            }
+
+            for (var i = 0; i < length; i++) {
+                if (i in self) {
+                    value = self[i];
+                    if (typeof T === 'undefined' ? callbackfn(value, i, object) : callbackfn.call(T, value, i, object)) {
+                        pushCall(result, value);
+                    }
+                }
+            }
+            return result;
+        }
+    }, !properlyBoxesContext(ArrayPrototype.filter));
+
+    // ES5 15.4.4.16
+    // http://es5.github.com/#x15.4.4.16
+    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
+    defineProperties(ArrayPrototype, {
+        every: function every(callbackfn/*, thisArg*/) {
+            var object = ES.ToObject(this);
+            var self = splitString && isString(this) ? strSplit(this, '') : object;
+            var length = ES.ToUint32(self.length);
+            var T;
+            if (arguments.length > 1) {
+                T = arguments[1];
+            }
+
+            // If no callback function or if callback is not a callable function
+            if (!isCallable(callbackfn)) {
+                throw new TypeError('Array.prototype.every callback must be a function');
+            }
+
+            for (var i = 0; i < length; i++) {
+                if (i in self && !(typeof T === 'undefined' ? callbackfn(self[i], i, object) : callbackfn.call(T, self[i], i, object))) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }, !properlyBoxesContext(ArrayPrototype.every));
+
+    // ES5 15.4.4.17
+    // http://es5.github.com/#x15.4.4.17
+    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
+    defineProperties(ArrayPrototype, {
+        some: function some(callbackfn/*, thisArg */) {
+            var object = ES.ToObject(this);
+            var self = splitString && isString(this) ? strSplit(this, '') : object;
+            var length = ES.ToUint32(self.length);
+            var T;
+            if (arguments.length > 1) {
+                T = arguments[1];
+            }
+
+            // If no callback function or if callback is not a callable function
+            if (!isCallable(callbackfn)) {
+                throw new TypeError('Array.prototype.some callback must be a function');
+            }
+
+            for (var i = 0; i < length; i++) {
+                if (i in self && (typeof T === 'undefined' ? callbackfn(self[i], i, object) : callbackfn.call(T, self[i], i, object))) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }, !properlyBoxesContext(ArrayPrototype.some));
+
+    // ES5 15.4.4.21
+    // http://es5.github.com/#x15.4.4.21
+    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
+    var reduceCoercesToObject = false;
+    if (ArrayPrototype.reduce) {
+        reduceCoercesToObject = typeof ArrayPrototype.reduce.call('es5', function (_, __, ___, list) {
+            return list;
+        }) === 'object';
+    }
+    defineProperties(ArrayPrototype, {
+        reduce: function reduce(callbackfn/*, initialValue*/) {
+            var object = ES.ToObject(this);
+            var self = splitString && isString(this) ? strSplit(this, '') : object;
+            var length = ES.ToUint32(self.length);
+
+            // If no callback function or if callback is not a callable function
+            if (!isCallable(callbackfn)) {
+                throw new TypeError('Array.prototype.reduce callback must be a function');
+            }
+
+            // no value to return if no initial value and an empty array
+            if (length === 0 && arguments.length === 1) {
+                throw new TypeError('reduce of empty array with no initial value');
+            }
+
+            var i = 0;
+            var result;
+            if (arguments.length >= 2) {
+                result = arguments[1];
+            } else {
+                do {
+                    if (i in self) {
+                        result = self[i++];
+                        break;
+                    }
+
+                    // if array contains no values, no initial value to return
+                    if (++i >= length) {
+                        throw new TypeError('reduce of empty array with no initial value');
+                    }
+                } while (true);
+            }
+
+            for (; i < length; i++) {
+                if (i in self) {
+                    result = callbackfn(result, self[i], i, object);
+                }
+            }
+
+            return result;
+        }
+    }, !reduceCoercesToObject);
+
+    // ES5 15.4.4.22
+    // http://es5.github.com/#x15.4.4.22
+    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
+    var reduceRightCoercesToObject = false;
+    if (ArrayPrototype.reduceRight) {
+        reduceRightCoercesToObject = typeof ArrayPrototype.reduceRight.call('es5', function (_, __, ___, list) {
+            return list;
+        }) === 'object';
+    }
+    defineProperties(ArrayPrototype, {
+        reduceRight: function reduceRight(callbackfn/*, initial*/) {
+            var object = ES.ToObject(this);
+            var self = splitString && isString(this) ? strSplit(this, '') : object;
+            var length = ES.ToUint32(self.length);
+
+            // If no callback function or if callback is not a callable function
+            if (!isCallable(callbackfn)) {
+                throw new TypeError('Array.prototype.reduceRight callback must be a function');
+            }
+
+            // no value to return if no initial value, empty array
+            if (length === 0 && arguments.length === 1) {
+                throw new TypeError('reduceRight of empty array with no initial value');
+            }
+
+            var result;
+            var i = length - 1;
+            if (arguments.length >= 2) {
+                result = arguments[1];
+            } else {
+                do {
+                    if (i in self) {
+                        result = self[i--];
+                        break;
+                    }
+
+                    // if array contains no values, no initial value to return
+                    if (--i < 0) {
+                        throw new TypeError('reduceRight of empty array with no initial value');
+                    }
+                } while (true);
+            }
+
+            if (i < 0) {
+                return result;
+            }
+
+            do {
+                if (i in self) {
+                    result = callbackfn(result, self[i], i, object);
+                }
+            } while (i--);
+
+            return result;
+        }
+    }, !reduceRightCoercesToObject);
+
+    // ES5 15.4.4.14
+    // http://es5.github.com/#x15.4.4.14
+    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
+    var hasFirefox2IndexOfBug = ArrayPrototype.indexOf && [0, 1].indexOf(1, 2) !== -1;
+    defineProperties(ArrayPrototype, {
+        indexOf: function indexOf(searchElement/*, fromIndex */) {
+            var self = splitString && isString(this) ? strSplit(this, '') : ES.ToObject(this);
+            var length = ES.ToUint32(self.length);
+
+            if (length === 0) {
+                return -1;
+            }
+
+            var i = 0;
+            if (arguments.length > 1) {
+                i = ES.ToInteger(arguments[1]);
+            }
+
+            // handle negative indices
+            i = i >= 0 ? i : max(0, length + i);
+            for (; i < length; i++) {
+                if (i in self && self[i] === searchElement) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+    }, hasFirefox2IndexOfBug);
+
+    // ES5 15.4.4.15
+    // http://es5.github.com/#x15.4.4.15
+    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
+    var hasFirefox2LastIndexOfBug = ArrayPrototype.lastIndexOf && [0, 1].lastIndexOf(0, -3) !== -1;
+    defineProperties(ArrayPrototype, {
+        lastIndexOf: function lastIndexOf(searchElement/*, fromIndex */) {
+            var self = splitString && isString(this) ? strSplit(this, '') : ES.ToObject(this);
+            var length = ES.ToUint32(self.length);
+
+            if (length === 0) {
+                return -1;
+            }
+            var i = length - 1;
+            if (arguments.length > 1) {
+                i = min(i, ES.ToInteger(arguments[1]));
+            }
+            // handle negative indices
+            i = i >= 0 ? i : length - Math.abs(i);
+            for (; i >= 0; i--) {
+                if (i in self && searchElement === self[i]) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+    }, hasFirefox2LastIndexOfBug);
+
+    // ES5 15.4.4.12
+    // http://es5.github.com/#x15.4.4.12
+    var spliceNoopReturnsEmptyArray = (function () {
+        var a = [1, 2];
+        var result = a.splice();
+        return a.length === 2 && isArray(result) && result.length === 0;
+    }());
+    defineProperties(ArrayPrototype, {
+        // Safari 5.0 bug where .splice() returns undefined
+        splice: function splice(start, deleteCount) {
+            if (arguments.length === 0) {
+                return [];
+            } else {
+                return array_splice.apply(this, arguments);
+            }
+        }
+    }, !spliceNoopReturnsEmptyArray);
+
+    var spliceWorksWithEmptyObject = (function () {
+        var obj = {};
+        ArrayPrototype.splice.call(obj, 0, 0, 1);
+        return obj.length === 1;
+    }());
+    defineProperties(ArrayPrototype, {
+        splice: function splice(start, deleteCount) {
+            if (arguments.length === 0) {
+                return [];
+            }
+            var args = arguments;
+            this.length = max(ES.ToInteger(this.length), 0);
+            if (arguments.length > 0 && typeof deleteCount !== 'number') {
+                args = arraySlice(arguments);
+                if (args.length < 2) {
+                    pushCall(args, this.length - start);
+                } else {
+                    args[1] = ES.ToInteger(deleteCount);
+                }
+            }
+            return array_splice.apply(this, args);
+        }
+    }, !spliceWorksWithEmptyObject);
+    var spliceWorksWithLargeSparseArrays = (function () {
+        // Per https://github.com/es-shims/es5-shim/issues/295
+        // Safari 7/8 breaks with sparse arrays of size 1e5 or greater
+        var arr = new $Array(1e5);
+        // note: the index MUST be 8 or larger or the test will false pass
+        arr[8] = 'x';
+        arr.splice(1, 1);
+        // note: this test must be defined *after* the indexOf shim
+        // per https://github.com/es-shims/es5-shim/issues/313
+        return arr.indexOf('x') === 7;
+    }());
+    var spliceWorksWithSmallSparseArrays = (function () {
+        // Per https://github.com/es-shims/es5-shim/issues/295
+        // Opera 12.15 breaks on this, no idea why.
+        var n = 256;
+        var arr = [];
+        arr[n] = 'a';
+        arr.splice(n + 1, 0, 'b');
+        return arr[n] === 'a';
+    }());
+    defineProperties(ArrayPrototype, {
+        splice: function splice(start, deleteCount) {
+            var O = ES.ToObject(this);
+            var A = [];
+            var len = ES.ToUint32(O.length);
+            var relativeStart = ES.ToInteger(start);
+            var actualStart = relativeStart < 0 ? max((len + relativeStart), 0) : min(relativeStart, len);
+            var actualDeleteCount = min(max(ES.ToInteger(deleteCount), 0), len - actualStart);
+
+            var k = 0;
+            var from;
+            while (k < actualDeleteCount) {
+                from = $String(actualStart + k);
+                if (owns(O, from)) {
+                    A[k] = O[from];
+                }
+                k += 1;
+            }
+
+            var items = arraySlice(arguments, 2);
+            var itemCount = items.length;
+            var to;
+            if (itemCount < actualDeleteCount) {
+                k = actualStart;
+                var maxK = len - actualDeleteCount;
+                while (k < maxK) {
+                    from = $String(k + actualDeleteCount);
+                    to = $String(k + itemCount);
+                    if (owns(O, from)) {
+                        O[to] = O[from];
+                    } else {
+                        delete O[to];
+                    }
+                    k += 1;
+                }
+                k = len;
+                var minK = len - actualDeleteCount + itemCount;
+                while (k > minK) {
+                    delete O[k - 1];
+                    k -= 1;
+                }
+            } else if (itemCount > actualDeleteCount) {
+                k = len - actualDeleteCount;
+                while (k > actualStart) {
+                    from = $String(k + actualDeleteCount - 1);
+                    to = $String(k + itemCount - 1);
+                    if (owns(O, from)) {
+                        O[to] = O[from];
+                    } else {
+                        delete O[to];
+                    }
+                    k -= 1;
+                }
+            }
+            k = actualStart;
+            for (var i = 0; i < items.length; ++i) {
+                O[k] = items[i];
+                k += 1;
+            }
+            O.length = len - actualDeleteCount + itemCount;
+
+            return A;
+        }
+    }, !spliceWorksWithLargeSparseArrays || !spliceWorksWithSmallSparseArrays);
+
+    var originalJoin = ArrayPrototype.join;
+    var hasStringJoinBug;
+    try {
+        hasStringJoinBug = Array.prototype.join.call('123', ',') !== '1,2,3';
+    } catch (e) {
+        hasStringJoinBug = true;
+    }
+    if (hasStringJoinBug) {
+        defineProperties(ArrayPrototype, {
+            join: function join(separator) {
+                var sep = typeof separator === 'undefined' ? ',' : separator;
+                return originalJoin.call(isString(this) ? strSplit(this, '') : this, sep);
+            }
+        }, hasStringJoinBug);
+    }
+
+    var hasJoinUndefinedBug = [1, 2].join(undefined) !== '1,2';
+    if (hasJoinUndefinedBug) {
+        defineProperties(ArrayPrototype, {
+            join: function join(separator) {
+                var sep = typeof separator === 'undefined' ? ',' : separator;
+                return originalJoin.call(this, sep);
+            }
+        }, hasJoinUndefinedBug);
+    }
+
+    var pushShim = function push(item) {
+        var O = ES.ToObject(this);
+        var n = ES.ToUint32(O.length);
+        var i = 0;
+        while (i < arguments.length) {
+            O[n + i] = arguments[i];
+            i += 1;
+        }
+        O.length = n + i;
+        return n + i;
+    };
+
+    var pushIsNotGeneric = (function () {
+        var obj = {};
+        var result = Array.prototype.push.call(obj, undefined);
+        return result !== 1 || obj.length !== 1 || typeof obj[0] !== 'undefined' || !owns(obj, 0);
+    }());
+    defineProperties(ArrayPrototype, {
+        push: function push(item) {
+            if (isArray(this)) {
+                return array_push.apply(this, arguments);
+            }
+            return pushShim.apply(this, arguments);
+        }
+    }, pushIsNotGeneric);
+
+    // This fixes a very weird bug in Opera 10.6 when pushing `undefined
+    var pushUndefinedIsWeird = (function () {
+        var arr = [];
+        var result = arr.push(undefined);
+        return result !== 1 || arr.length !== 1 || typeof arr[0] !== 'undefined' || !owns(arr, 0);
+    }());
+    defineProperties(ArrayPrototype, { push: pushShim }, pushUndefinedIsWeird);
+
+    // ES5 15.2.3.14
+    // http://es5.github.io/#x15.4.4.10
+    // Fix boxed string bug
+    defineProperties(ArrayPrototype, {
+        slice: function (start, end) {
+            var arr = isString(this) ? strSplit(this, '') : this;
+            return arraySliceApply(arr, arguments);
+        }
+    }, splitString);
+
+    var sortIgnoresNonFunctions = (function () {
+        try {
+            [1, 2].sort(null);
+            [1, 2].sort({});
+            return true;
+        } catch (e) {}
+        return false;
+    }());
+    var sortThrowsOnRegex = (function () {
+        // this is a problem in Firefox 4, in which `typeof /a/ === 'function'`
+        try {
+            [1, 2].sort(/a/);
+            return false;
+        } catch (e) {}
+        return true;
+    }());
+    var sortIgnoresUndefined = (function () {
+        // applies in IE 8, for one.
+        try {
+            [1, 2].sort(undefined);
+            return true;
+        } catch (e) {}
+        return false;
+    }());
+    defineProperties(ArrayPrototype, {
+        sort: function sort(compareFn) {
+            if (typeof compareFn === 'undefined') {
+                return arraySort(this);
+            }
+            if (!isCallable(compareFn)) {
+                throw new TypeError('Array.prototype.sort callback must be a function');
+            }
+            return arraySort(this, compareFn);
+        }
+    }, sortIgnoresNonFunctions || !sortIgnoresUndefined || !sortThrowsOnRegex);
+
+    //
+    // Object
+    // ======
+    //
+
+    // ES5 15.2.3.14
+    // http://es5.github.com/#x15.2.3.14
+
+    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
+    var hasDontEnumBug = !isEnum({ 'toString': null }, 'toString');
+    var hasProtoEnumBug = isEnum(function () {}, 'prototype');
+    var hasStringEnumBug = !owns('x', '0');
+    var equalsConstructorPrototype = function (o) {
+        var ctor = o.constructor;
+        return ctor && ctor.prototype === o;
+    };
+    var blacklistedKeys = {
+        $window: true,
+        $console: true,
+        $parent: true,
+        $self: true,
+        $frame: true,
+        $frames: true,
+        $frameElement: true,
+        $webkitIndexedDB: true,
+        $webkitStorageInfo: true,
+        $external: true
+    };
+    var hasAutomationEqualityBug = (function () {
+        /* globals window */
+        if (typeof window === 'undefined') {
+            return false;
+        }
+        for (var k in window) {
+            try {
+                if (!blacklistedKeys['$' + k] && owns(window, k) && window[k] !== null && typeof window[k] === 'object') {
+                    equalsConstructorPrototype(window[k]);
+                }
+            } catch (e) {
+                return true;
+            }
+        }
+        return false;
+    }());
+    var equalsConstructorPrototypeIfNotBuggy = function (object) {
+        if (typeof window === 'undefined' || !hasAutomationEqualityBug) {
+            return equalsConstructorPrototype(object);
+        }
+        try {
+            return equalsConstructorPrototype(object);
+        } catch (e) {
+            return false;
+        }
+    };
+    var dontEnums = [
+        'toString',
+        'toLocaleString',
+        'valueOf',
+        'hasOwnProperty',
+        'isPrototypeOf',
+        'propertyIsEnumerable',
+        'constructor'
+    ];
+    var dontEnumsLength = dontEnums.length;
+
+    // taken directly from https://github.com/ljharb/is-arguments/blob/master/index.js
+    // can be replaced with require('is-arguments') if we ever use a build process instead
+    var isStandardArguments = function isArguments(value) {
+        return toStr(value) === '[object Arguments]';
+    };
+    var isLegacyArguments = function isArguments(value) {
+        return value !== null &&
+            typeof value === 'object' &&
+            typeof value.length === 'number' &&
+            value.length >= 0 &&
+            !isArray(value) &&
+            isCallable(value.callee);
+    };
+    var isArguments = isStandardArguments(arguments) ? isStandardArguments : isLegacyArguments;
+
+    defineProperties($Object, {
+        keys: function keys(object) {
+            var isFn = isCallable(object);
+            var isArgs = isArguments(object);
+            var isObject = object !== null && typeof object === 'object';
+            var isStr = isObject && isString(object);
+
+            if (!isObject && !isFn && !isArgs) {
+                throw new TypeError('Object.keys called on a non-object');
+            }
+
+            var theKeys = [];
+            var skipProto = hasProtoEnumBug && isFn;
+            if ((isStr && hasStringEnumBug) || isArgs) {
+                for (var i = 0; i < object.length; ++i) {
+                    pushCall(theKeys, $String(i));
+                }
+            }
+
+            if (!isArgs) {
+                for (var name in object) {
+                    if (!(skipProto && name === 'prototype') && owns(object, name)) {
+                        pushCall(theKeys, $String(name));
+                    }
+                }
+            }
+
+            if (hasDontEnumBug) {
+                var skipConstructor = equalsConstructorPrototypeIfNotBuggy(object);
+                for (var j = 0; j < dontEnumsLength; j++) {
+                    var dontEnum = dontEnums[j];
+                    if (!(skipConstructor && dontEnum === 'constructor') && owns(object, dontEnum)) {
+                        pushCall(theKeys, dontEnum);
+                    }
+                }
+            }
+            return theKeys;
+        }
+    });
+
+    var keysWorksWithArguments = $Object.keys && (function () {
+        // Safari 5.0 bug
+        return $Object.keys(arguments).length === 2;
+    }(1, 2));
+    var keysHasArgumentsLengthBug = $Object.keys && (function () {
+        var argKeys = $Object.keys(arguments);
+        return arguments.length !== 1 || argKeys.length !== 1 || argKeys[0] !== 1;
+    }(1));
+    var originalKeys = $Object.keys;
+    defineProperties($Object, {
+        keys: function keys(object) {
+            if (isArguments(object)) {
+                return originalKeys(arraySlice(object));
+            } else {
+                return originalKeys(object);
+            }
+        }
+    }, !keysWorksWithArguments || keysHasArgumentsLengthBug);
+
+    //
+    // Date
+    // ====
+    //
+
+    var hasNegativeMonthYearBug = new Date(-3509827329600292).getUTCMonth() !== 0;
+    var aNegativeTestDate = new Date(-1509842289600292);
+    var aPositiveTestDate = new Date(1449662400000);
+    var hasToUTCStringFormatBug = aNegativeTestDate.toUTCString() !== 'Mon, 01 Jan -45875 11:59:59 GMT';
+    var hasToDateStringFormatBug;
+    var hasToStringFormatBug;
+    var timeZoneOffset = aNegativeTestDate.getTimezoneOffset();
+    if (timeZoneOffset < -720) {
+        hasToDateStringFormatBug = aNegativeTestDate.toDateString() !== 'Tue Jan 02 -45875';
+        hasToStringFormatBug = !(/^Thu Dec 10 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/).test(aPositiveTestDate.toString());
+    } else {
+        hasToDateStringFormatBug = aNegativeTestDate.toDateString() !== 'Mon Jan 01 -45875';
+        hasToStringFormatBug = !(/^Wed Dec 09 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/).test(aPositiveTestDate.toString());
+    }
+
+    var originalGetFullYear = call.bind(Date.prototype.getFullYear);
+    var originalGetMonth = call.bind(Date.prototype.getMonth);
+    var originalGetDate = call.bind(Date.prototype.getDate);
+    var originalGetUTCFullYear = call.bind(Date.prototype.getUTCFullYear);
+    var originalGetUTCMonth = call.bind(Date.prototype.getUTCMonth);
+    var originalGetUTCDate = call.bind(Date.prototype.getUTCDate);
+    var originalGetUTCDay = call.bind(Date.prototype.getUTCDay);
+    var originalGetUTCHours = call.bind(Date.prototype.getUTCHours);
+    var originalGetUTCMinutes = call.bind(Date.prototype.getUTCMinutes);
+    var originalGetUTCSeconds = call.bind(Date.prototype.getUTCSeconds);
+    var originalGetUTCMilliseconds = call.bind(Date.prototype.getUTCMilliseconds);
+    var dayName = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+    var monthName = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+    var daysInMonth = function daysInMonth(month, year) {
+        return originalGetDate(new Date(year, month, 0));
+    };
+
+    defineProperties(Date.prototype, {
+        getFullYear: function getFullYear() {
+            if (!this || !(this instanceof Date)) {
+                throw new TypeError('this is not a Date object.');
+            }
+            var year = originalGetFullYear(this);
+            if (year < 0 && originalGetMonth(this) > 11) {
+                return year + 1;
+            }
+            return year;
+        },
+        getMonth: function getMonth() {
+            if (!this || !(this instanceof Date)) {
+                throw new TypeError('this is not a Date object.');
+            }
+            var year = originalGetFullYear(this);
+            var month = originalGetMonth(this);
+            if (year < 0 && month > 11) {
+                return 0;
+            }
+            return month;
+        },
+        getDate: function getDate() {
+            if (!this || !(this instanceof Date)) {
+                throw new TypeError('this is not a Date object.');
+            }
+            var year = originalGetFullYear(this);
+            var month = originalGetMonth(this);
+            var date = originalGetDate(this);
+            if (year < 0 && month > 11) {
+                if (month === 12) {
+                    return date;
+                }
+                var days = daysInMonth(0, year + 1);
+                return (days - date) + 1;
+            }
+            return date;
+        },
+        getUTCFullYear: function getUTCFullYear() {
+            if (!this || !(this instanceof Date)) {
+                throw new TypeError('this is not a Date object.');
+            }
+            var year = originalGetUTCFullYear(this);
+            if (year < 0 && originalGetUTCMonth(this) > 11) {
+                return year + 1;
+            }
+            return year;
+        },
+        getUTCMonth: function getUTCMonth() {
+            if (!this || !(this instanceof Date)) {
+                throw new TypeError('this is not a Date object.');
+            }
+            var year = originalGetUTCFullYear(this);
+            var month = originalGetUTCMonth(this);
+            if (year < 0 && month > 11) {
+                return 0;
+            }
+            return month;
+        },
+        getUTCDate: function getUTCDate() {
+            if (!this || !(this instanceof Date)) {
+                throw new TypeError('this is not a Date object.');
+            }
+            var year = originalGetUTCFullYear(this);
+            var month = originalGetUTCMonth(this);
+            var date = originalGetUTCDate(this);
+            if (year < 0 && month > 11) {
+                if (month === 12) {
+                    return date;
+                }
+                var days = daysInMonth(0, year + 1);
+                return (days - date) + 1;
+            }
+            return date;
+        }
+    }, hasNegativeMonthYearBug);
+
+    defineProperties(Date.prototype, {
+        toUTCString: function toUTCString() {
+            if (!this || !(this instanceof Date)) {
+                throw new TypeError('this is not a Date object.');
+            }
+            var day = originalGetUTCDay(this);
+            var date = originalGetUTCDate(this);
+            var month = originalGetUTCMonth(this);
+            var year = originalGetUTCFullYear(this);
+            var hour = originalGetUTCHours(this);
+            var minute = originalGetUTCMinutes(this);
+            var second = originalGetUTCSeconds(this);
+            return dayName[day] + ', ' +
+                (date < 10 ? '0' + date : date) + ' ' +
+                monthName[month] + ' ' +
+                year + ' ' +
+                (hour < 10 ? '0' + hour : hour) + ':' +
+                (minute < 10 ? '0' + minute : minute) + ':' +
+                (second < 10 ? '0' + second : second) + ' GMT';
+        }
+    }, hasNegativeMonthYearBug || hasToUTCStringFormatBug);
+
+    // Opera 12 has `,`
+    defineProperties(Date.prototype, {
+        toDateString: function toDateString() {
+            if (!this || !(this instanceof Date)) {
+                throw new TypeError('this is not a Date object.');
+            }
+            var day = this.getDay();
+            var date = this.getDate();
+            var month = this.getMonth();
+            var year = this.getFullYear();
+            return dayName[day] + ' ' +
+                monthName[month] + ' ' +
+                (date < 10 ? '0' + date : date) + ' ' +
+                year;
+        }
+    }, hasNegativeMonthYearBug || hasToDateStringFormatBug);
+
+    // can't use defineProperties here because of toString enumeration issue in IE <= 8
+    if (hasNegativeMonthYearBug || hasToStringFormatBug) {
+        Date.prototype.toString = function toString() {
+            if (!this || !(this instanceof Date)) {
+                throw new TypeError('this is not a Date object.');
+            }
+            var day = this.getDay();
+            var date = this.getDate();
+            var month = this.getMonth();
+            var year = this.getFullYear();
+            var hour = this.getHours();
+            var minute = this.getMinutes();
+            var second = this.getSeconds();
+            var timezoneOffset = this.getTimezoneOffset();
+            var hoursOffset = Math.floor(Math.abs(timezoneOffset) / 60);
+            var minutesOffset = Math.floor(Math.abs(timezoneOffset) % 60);
+            return dayName[day] + ' ' +
+                monthName[month] + ' ' +
+                (date < 10 ? '0' + date : date) + ' ' +
+                year + ' ' +
+                (hour < 10 ? '0' + hour : hour) + ':' +
+                (minute < 10 ? '0' + minute : minute) + ':' +
+                (second < 10 ? '0' + second : second) + ' GMT' +
+                (timezoneOffset > 0 ? '-' : '+') +
+                (hoursOffset < 10 ? '0' + hoursOffset : hoursOffset) +
+                (minutesOffset < 10 ? '0' + minutesOffset : minutesOffset);
+        };
+        if (supportsDescriptors) {
+            $Object.defineProperty(Date.prototype, 'toString', {
+                configurable: true,
+                enumerable: false,
+                writable: true
+            });
+        }
+    }
+
+    // ES5 15.9.5.43
+    // http://es5.github.com/#x15.9.5.43
+    // This function returns a String value represent the instance in time
+    // represented by this Date object. The format of the String is the Date Time
+    // string format defined in 15.9.1.15. All fields are present in the String.
+    // The time zone is always UTC, denoted by the suffix Z. If the time value of
+    // this object is not a finite Number a RangeError exception is thrown.
+    var negativeDate = -62198755200000;
+    var negativeYearString = '-000001';
+    var hasNegativeDateBug = Date.prototype.toISOString && new Date(negativeDate).toISOString().indexOf(negativeYearString) === -1;
+    var hasSafari51DateBug = Date.prototype.toISOString && new Date(-1).toISOString() !== '1969-12-31T23:59:59.999Z';
+
+    var getTime = call.bind(Date.prototype.getTime);
+
+    defineProperties(Date.prototype, {
+        toISOString: function toISOString() {
+            if (!isFinite(this) || !isFinite(getTime(this))) {
+                // Adope Photoshop requires the second check.
+                throw new RangeError('Date.prototype.toISOString called on non-finite value.');
+            }
+
+            var year = originalGetUTCFullYear(this);
+
+            var month = originalGetUTCMonth(this);
+            // see https://github.com/es-shims/es5-shim/issues/111
+            year += Math.floor(month / 12);
+            month = (month % 12 + 12) % 12;
+
+            // the date time string format is specified in 15.9.1.15.
+            var result = [month + 1, originalGetUTCDate(this), originalGetUTCHours(this), originalGetUTCMinutes(this), originalGetUTCSeconds(this)];
+            year = (
+                (year < 0 ? '-' : (year > 9999 ? '+' : '')) +
+                strSlice('00000' + Math.abs(year), (0 <= year && year <= 9999) ? -4 : -6)
+            );
+
+            for (var i = 0; i < result.length; ++i) {
+                // pad months, days, hours, minutes, and seconds to have two digits.
+                result[i] = strSlice('00' + result[i], -2);
+            }
+            // pad milliseconds to have three digits.
+            return (
+                year + '-' + arraySlice(result, 0, 2).join('-') +
+                'T' + arraySlice(result, 2).join(':') + '.' +
+                strSlice('000' + originalGetUTCMilliseconds(this), -3) + 'Z'
+            );
+        }
+    }, hasNegativeDateBug || hasSafari51DateBug);
+
+    // ES5 15.9.5.44
+    // http://es5.github.com/#x15.9.5.44
+    // This function provides a String representation of a Date object for use by
+    // JSON.stringify (15.12.3).
+    var dateToJSONIsSupported = (function () {
+        try {
+            return Date.prototype.toJSON &&
+                new Date(NaN).toJSON() === null &&
+                new Date(negativeDate).toJSON().indexOf(negativeYearString) !== -1 &&
+                Date.prototype.toJSON.call({ // generic
+                    toISOString: function () { return true; }
+                });
+        } catch (e) {
+            return false;
+        }
+    }());
+    if (!dateToJSONIsSupported) {
+        Date.prototype.toJSON = function toJSON(key) {
+            // When the toJSON method is called with argument key, the following
+            // steps are taken:
+
+            // 1.  Let O be the result of calling ToObject, giving it the this
+            // value as its argument.
+            // 2. Let tv be ES.ToPrimitive(O, hint Number).
+            var O = $Object(this);
+            var tv = ES.ToPrimitive(O);
+            // 3. If tv is a Number and is not finite, return null.
+            if (typeof tv === 'number' && !isFinite(tv)) {
+                return null;
+            }
+            // 4. Let toISO be the result of calling the [[Get]] internal method of
+            // O with argument "toISOString".
+            var toISO = O.toISOString;
+            // 5. If IsCallable(toISO) is false, throw a TypeError exception.
+            if (!isCallable(toISO)) {
+                throw new TypeError('toISOString property is not callable');
+            }
+            // 6. Return the result of calling the [[Call]] internal method of
+            //  toISO with O as the this value and an empty argument list.
+            return toISO.call(O);
+
+            // NOTE 1 The argument is ignored.
+
+            // NOTE 2 The toJSON function is intentionally generic; it does not
+            // require that its this value be a Date object. Therefore, it can be
+            // transferred to other kinds of objects for use as a method. However,
+            // it does require that any such object have a toISOString method. An
+            // object is free to use the argument key to filter its
+            // stringification.
+        };
+    }
+
+    // ES5 15.9.4.2
+    // http://es5.github.com/#x15.9.4.2
+    // based on work shared by Daniel Friesen (dantman)
+    // http://gist.github.com/303249
+    var supportsExtendedYears = Date.parse('+033658-09-27T01:46:40.000Z') === 1e15;
+    var acceptsInvalidDates = !isNaN(Date.parse('2012-04-04T24:00:00.500Z')) || !isNaN(Date.parse('2012-11-31T23:59:59.000Z')) || !isNaN(Date.parse('2012-12-31T23:59:60.000Z'));
+    var doesNotParseY2KNewYear = isNaN(Date.parse('2000-01-01T00:00:00.000Z'));
+    if (doesNotParseY2KNewYear || acceptsInvalidDates || !supportsExtendedYears) {
+        // XXX global assignment won't work in embeddings that use
+        // an alternate object for the context.
+        /* global Date: true */
+        /* eslint-disable no-undef */
+        var maxSafeUnsigned32Bit = Math.pow(2, 31) - 1;
+        var hasSafariSignedIntBug = isActualNaN(new Date(1970, 0, 1, 0, 0, 0, maxSafeUnsigned32Bit + 1).getTime());
+        /* eslint-disable no-implicit-globals */
+        Date = (function (NativeDate) {
+        /* eslint-enable no-implicit-globals */
+        /* eslint-enable no-undef */
+            // Date.length === 7
+            var DateShim = function Date(Y, M, D, h, m, s, ms) {
+                var length = arguments.length;
+                var date;
+                if (this instanceof NativeDate) {
+                    var seconds = s;
+                    var millis = ms;
+                    if (hasSafariSignedIntBug && length >= 7 && ms > maxSafeUnsigned32Bit) {
+                        // work around a Safari 8/9 bug where it treats the seconds as signed
+                        var msToShift = Math.floor(ms / maxSafeUnsigned32Bit) * maxSafeUnsigned32Bit;
+                        var sToShift = Math.floor(msToShift / 1e3);
+                        seconds += sToShift;
+                        millis -= sToShift * 1e3;
+                    }
+                    date = length === 1 && $String(Y) === Y ? // isString(Y)
+                        // We explicitly pass it through parse:
+                        new NativeDate(DateShim.parse(Y)) :
+                        // We have to manually make calls depending on argument
+                        // length here
+                        length >= 7 ? new NativeDate(Y, M, D, h, m, seconds, millis) :
+                        length >= 6 ? new NativeDate(Y, M, D, h, m, seconds) :
+                        length >= 5 ? new NativeDate(Y, M, D, h, m) :
+                        length >= 4 ? new NativeDate(Y, M, D, h) :
+                        length >= 3 ? new NativeDate(Y, M, D) :
+                        length >= 2 ? new NativeDate(Y, M) :
+                        length >= 1 ? new NativeDate(Y instanceof NativeDate ? +Y : Y) :
+                                      new NativeDate();
+                } else {
+                    date = NativeDate.apply(this, arguments);
+                }
+                if (!isPrimitive(date)) {
+                    // Prevent mixups with unfixed Date object
+                    defineProperties(date, { constructor: DateShim }, true);
+                }
+                return date;
+            };
+
+            // 15.9.1.15 Date Time String Format.
+            var isoDateExpression = new RegExp('^' +
+                '(\\d{4}|[+-]\\d{6})' + // four-digit year capture or sign +
+                                          // 6-digit extended year
+                '(?:-(\\d{2})' + // optional month capture
+                '(?:-(\\d{2})' + // optional day capture
+                '(?:' + // capture hours:minutes:seconds.milliseconds
+                    'T(\\d{2})' + // hours capture
+                    ':(\\d{2})' + // minutes capture
+                    '(?:' + // optional :seconds.milliseconds
+                        ':(\\d{2})' + // seconds capture
+                        '(?:(\\.\\d{1,}))?' + // milliseconds capture
+                    ')?' +
+                '(' + // capture UTC offset component
+                    'Z|' + // UTC capture
+                    '(?:' + // offset specifier +/-hours:minutes
+                        '([-+])' + // sign capture
+                        '(\\d{2})' + // hours offset capture
+                        ':(\\d{2})' + // minutes offset capture
+                    ')' +
+                ')?)?)?)?' +
+            '$');
+
+            var months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365];
+
+            var dayFromMonth = function dayFromMonth(year, month) {
+                var t = month > 1 ? 1 : 0;
+                return (
+                    months[month] +
+                    Math.floor((year - 1969 + t) / 4) -
+                    Math.floor((year - 1901 + t) / 100) +
+                    Math.floor((year - 1601 + t) / 400) +
+                    365 * (year - 1970)
+                );
+            };
+
+            var toUTC = function toUTC(t) {
+                var s = 0;
+                var ms = t;
+                if (hasSafariSignedIntBug && ms > maxSafeUnsigned32Bit) {
+                    // work around a Safari 8/9 bug where it treats the seconds as signed
+                    var msToShift = Math.floor(ms / maxSafeUnsigned32Bit) * maxSafeUnsigned32Bit;
+                    var sToShift = Math.floor(msToShift / 1e3);
+                    s += sToShift;
+                    ms -= sToShift * 1e3;
+                }
+                return $Number(new NativeDate(1970, 0, 1, 0, 0, s, ms));
+            };
+
+            // Copy any custom methods a 3rd party library may have added
+            for (var key in NativeDate) {
+                if (owns(NativeDate, key)) {
+                    DateShim[key] = NativeDate[key];
+                }
+            }
+
+            // Copy "native" methods explicitly; they may be non-enumerable
+            defineProperties(DateShim, {
+                now: NativeDate.now,
+                UTC: NativeDate.UTC
+            }, true);
+            DateShim.prototype = NativeDate.prototype;
+            defineProperties(DateShim.prototype, {
+                constructor: DateShim
+            }, true);
+
+            // Upgrade Date.parse to handle simplified ISO 8601 strings
+            var parseShim = function parse(string) {
+                var match = isoDateExpression.exec(string);
+                if (match) {
+                    // parse months, days, hours, minutes, seconds, and milliseconds
+                    // provide default values if necessary
+                    // parse the UTC offset component
+                    var year = $Number(match[1]),
+                        month = $Number(match[2] || 1) - 1,
+                        day = $Number(match[3] || 1) - 1,
+                        hour = $Number(match[4] || 0),
+                        minute = $Number(match[5] || 0),
+                        second = $Number(match[6] || 0),
+                        millisecond = Math.floor($Number(match[7] || 0) * 1000),
+                        // When time zone is missed, local offset should be used
+                        // (ES 5.1 bug)
+                        // see https://bugs.ecmascript.org/show_bug.cgi?id=112
+                        isLocalTime = Boolean(match[4] && !match[8]),
+                        signOffset = match[9] === '-' ? 1 : -1,
+                        hourOffset = $Number(match[10] || 0),
+                        minuteOffset = $Number(match[11] || 0),
+                        result;
+                    var hasMinutesOrSecondsOrMilliseconds = minute > 0 || second > 0 || millisecond > 0;
+                    if (
+                        hour < (hasMinutesOrSecondsOrMilliseconds ? 24 : 25) &&
+                        minute < 60 && second < 60 && millisecond < 1000 &&
+                        month > -1 && month < 12 && hourOffset < 24 &&
+                        minuteOffset < 60 && // detect invalid offsets
+                        day > -1 &&
+                        day < (dayFromMonth(year, month + 1) - dayFromMonth(year, month))
+                    ) {
+                        result = (
+                            (dayFromMonth(year, month) + day) * 24 +
+                            hour +
+                            hourOffset * signOffset
+                        ) * 60;
+                        result = (
+                            (result + minute + minuteOffset * signOffset) * 60 +
+                            second
+                        ) * 1000 + millisecond;
+                        if (isLocalTime) {
+                            result = toUTC(result);
+                        }
+                        if (-8.64e15 <= result && result <= 8.64e15) {
+                            return result;
+                        }
+                    }
+                    return NaN;
+                }
+                return NativeDate.parse.apply(this, arguments);
+            };
+            defineProperties(DateShim, { parse: parseShim });
+
+            return DateShim;
+        }(Date));
+        /* global Date: false */
+    }
+
+    // ES5 15.9.4.4
+    // http://es5.github.com/#x15.9.4.4
+    if (!Date.now) {
+        Date.now = function now() {
+            return new Date().getTime();
+        };
+    }
+
+    //
+    // Number
+    // ======
+    //
+
+    // ES5.1 15.7.4.5
+    // http://es5.github.com/#x15.7.4.5
+    var hasToFixedBugs = NumberPrototype.toFixed && (
+      (0.00008).toFixed(3) !== '0.000' ||
+      (0.9).toFixed(0) !== '1' ||
+      (1.255).toFixed(2) !== '1.25' ||
+      (1000000000000000128).toFixed(0) !== '1000000000000000128'
+    );
+
+    var toFixedHelpers = {
+        base: 1e7,
+        size: 6,
+        data: [0, 0, 0, 0, 0, 0],
+        multiply: function multiply(n, c) {
+            var i = -1;
+            var c2 = c;
+            while (++i < toFixedHelpers.size) {
+                c2 += n * toFixedHelpers.data[i];
+                toFixedHelpers.data[i] = c2 % toFixedHelpers.base;
+                c2 = Math.floor(c2 / toFixedHelpers.base);
+            }
+        },
+        divide: function divide(n) {
+            var i = toFixedHelpers.size;
+            var c = 0;
+            while (--i >= 0) {
+                c += toFixedHelpers.data[i];
+                toFixedHelpers.data[i] = Math.floor(c / n);
+                c = (c % n) * toFixedHelpers.base;
+            }
+        },
+        numToString: function numToString() {
+            var i = toFixedHelpers.size;
+            var s = '';
+            while (--i >= 0) {
+                if (s !== '' || i === 0 || toFixedHelpers.data[i] !== 0) {
+                    var t = $String(toFixedHelpers.data[i]);
+                    if (s === '') {
+                        s = t;
+                    } else {
+                        s += strSlice('0000000', 0, 7 - t.length) + t;
+                    }
+                }
+            }
+            return s;
+        },
+        pow: function pow(x, n, acc) {
+            return (n === 0 ? acc : (n % 2 === 1 ? pow(x, n - 1, acc * x) : pow(x * x, n / 2, acc)));
+        },
+        log: function log(x) {
+            var n = 0;
+            var x2 = x;
+            while (x2 >= 4096) {
+                n += 12;
+                x2 /= 4096;
+            }
+            while (x2 >= 2) {
+                n += 1;
+                x2 /= 2;
+            }
+            return n;
+        }
+    };
+
+    var toFixedShim = function toFixed(fractionDigits) {
+        var f, x, s, m, e, z, j, k;
+
+        // Test for NaN and round fractionDigits down
+        f = $Number(fractionDigits);
+        f = isActualNaN(f) ? 0 : Math.floor(f);
+
+        if (f < 0 || f > 20) {
+            throw new RangeError('Number.toFixed called with invalid number of decimals');
+        }
+
+        x = $Number(this);
+
+        if (isActualNaN(x)) {
+            return 'NaN';
+        }
+
+        // If it is too big or small, return the string value of the number
+        if (x <= -1e21 || x >= 1e21) {
+            return $String(x);
+        }
+
+        s = '';
+
+        if (x < 0) {
+            s = '-';
+            x = -x;
+        }
+
+        m = '0';
+
+        if (x > 1e-21) {
+            // 1e-21 < x < 1e21
+            // -70 < log2(x) < 70
+            e = toFixedHelpers.log(x * toFixedHelpers.pow(2, 69, 1)) - 69;
+            z = (e < 0 ? x * toFixedHelpers.pow(2, -e, 1) : x / toFixedHelpers.pow(2, e, 1));
+            z *= 0x10000000000000; // Math.pow(2, 52);
+            e = 52 - e;
+
+            // -18 < e < 122
+            // x = z / 2 ^ e
+            if (e > 0) {
+                toFixedHelpers.multiply(0, z);
+                j = f;
+
+                while (j >= 7) {
+                    toFixedHelpers.multiply(1e7, 0);
+                    j -= 7;
+                }
+
+                toFixedHelpers.multiply(toFixedHelpers.pow(10, j, 1), 0);
+                j = e - 1;
+
+                while (j >= 23) {
+                    toFixedHelpers.divide(1 << 23);
+                    j -= 23;
+                }
+
+                toFixedHelpers.divide(1 << j);
+                toFixedHelpers.multiply(1, 1);
+                toFixedHelpers.divide(2);
+                m = toFixedHelpers.numToString();
+            } else {
+                toFixedHelpers.multiply(0, z);
+                toFixedHelpers.multiply(1 << (-e), 0);
+                m = toFixedHelpers.numToString() + strSlice('0.00000000000000000000', 2, 2 + f);
+            }
+        }
+
+        if (f > 0) {
+            k = m.length;
+
+            if (k <= f) {
+                m = s + strSlice('0.0000000000000000000', 0, f - k + 2) + m;
+            } else {
+                m = s + strSlice(m, 0, k - f) + '.' + strSlice(m, k - f);
+            }
+        } else {
+            m = s + m;
+        }
+
+        return m;
+    };
+    defineProperties(NumberPrototype, { toFixed: toFixedShim }, hasToFixedBugs);
+
+    var hasToPrecisionUndefinedBug = (function () {
+        try {
+            return 1.0.toPrecision(undefined) === '1';
+        } catch (e) {
+            return true;
+        }
+    }());
+    var originalToPrecision = NumberPrototype.toPrecision;
+    defineProperties(NumberPrototype, {
+        toPrecision: function toPrecision(precision) {
+            return typeof precision === 'undefined' ? originalToPrecision.call(this) : originalToPrecision.call(this, precision);
+        }
+    }, hasToPrecisionUndefinedBug);
+
+    //
+    // String
+    // ======
+    //
+
+    // ES5 15.5.4.14
+    // http://es5.github.com/#x15.5.4.14
+
+    // [bugfix, IE lt 9, firefox 4, Konqueror, Opera, obscure browsers]
+    // Many browsers do not split properly with regular expressions or they
+    // do not perform the split correctly under obscure conditions.
+    // See http://blog.stevenlevithan.com/archives/cross-browser-split
+    // I've tested in many browsers and this seems to cover the deviant ones:
+    //    'ab'.split(/(?:ab)*/) should be ["", ""], not [""]
+    //    '.'.split(/(.?)(.?)/) should be ["", ".", "", ""], not ["", ""]
+    //    'tesst'.split(/(s)*/) should be ["t", undefined, "e", "s", "t"], not
+    //       [undefined, "t", undefined, "e", ...]
+    //    ''.split(/.?/) should be [], not [""]
+    //    '.'.split(/()()/) should be ["."], not ["", "", "."]
+
+    if (
+        'ab'.split(/(?:ab)*/).length !== 2 ||
+        '.'.split(/(.?)(.?)/).length !== 4 ||
+        'tesst'.split(/(s)*/)[1] === 't' ||
+        'test'.split(/(?:)/, -1).length !== 4 ||
+        ''.split(/.?/).length ||
+        '.'.split(/()()/).length > 1
+    ) {
+        (function () {
+            var compliantExecNpcg = typeof (/()??/).exec('')[1] === 'undefined'; // NPCG: nonparticipating capturing group
+            var maxSafe32BitInt = Math.pow(2, 32) - 1;
+
+            StringPrototype.split = function (separator, limit) {
+                var string = String(this);
+                if (typeof separator === 'undefined' && limit === 0) {
+                    return [];
+                }
+
+                // If `separator` is not a regex, use native split
+                if (!isRegex(separator)) {
+                    return strSplit(this, separator, limit);
+                }
+
+                var output = [];
+                var flags = (separator.ignoreCase ? 'i' : '') +
+                            (separator.multiline ? 'm' : '') +
+                            (separator.unicode ? 'u' : '') + // in ES6
+                            (separator.sticky ? 'y' : ''), // Firefox 3+ and ES6
+                    lastLastIndex = 0,
+                    // Make `global` and avoid `lastIndex` issues by working with a copy
+                    separator2, match, lastIndex, lastLength;
+                var separatorCopy = new RegExp(separator.source, flags + 'g');
+                if (!compliantExecNpcg) {
+                    // Doesn't need flags gy, but they don't hurt
+                    separator2 = new RegExp('^' + separatorCopy.source + '$(?!\\s)', flags);
+                }
+                /* Values for `limit`, per the spec:
+                 * If undefined: 4294967295 // maxSafe32BitInt
+                 * If 0, Infinity, or NaN: 0
+                 * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
+                 * If negative number: 4294967296 - Math.floor(Math.abs(limit))
+                 * If other: Type-convert, then use the above rules
+                 */
+                var splitLimit = typeof limit === 'undefined' ? maxSafe32BitInt : ES.ToUint32(limit);
+                match = separatorCopy.exec(string);
+                while (match) {
+                    // `separatorCopy.lastIndex` is not reliable cross-browser
+                    lastIndex = match.index + match[0].length;
+                    if (lastIndex > lastLastIndex) {
+                        pushCall(output, strSlice(string, lastLastIndex, match.index));
+                        // Fix browsers whose `exec` methods don't consistently return `undefined` for
+                        // nonparticipating capturing groups
+                        if (!compliantExecNpcg && match.length > 1) {
+                            /* eslint-disable no-loop-func */
+                            match[0].replace(separator2, function () {
+                                for (var i = 1; i < arguments.length - 2; i++) {
+                                    if (typeof arguments[i] === 'undefined') {
+                                        match[i] = void 0;
+                                    }
+                                }
+                            });
+                            /* eslint-enable no-loop-func */
+                        }
+                        if (match.length > 1 && match.index < string.length) {
+                            array_push.apply(output, arraySlice(match, 1));
+                        }
+                        lastLength = match[0].length;
+                        lastLastIndex = lastIndex;
+                        if (output.length >= splitLimit) {
+                            break;
+                        }
+                    }
+                    if (separatorCopy.lastIndex === match.index) {
+                        separatorCopy.lastIndex++; // Avoid an infinite loop
+                    }
+                    match = separatorCopy.exec(string);
+                }
+                if (lastLastIndex === string.length) {
+                    if (lastLength || !separatorCopy.test('')) {
+                        pushCall(output, '');
+                    }
+                } else {
+                    pushCall(output, strSlice(string, lastLastIndex));
+                }
+                return output.length > splitLimit ? arraySlice(output, 0, splitLimit) : output;
+            };
+        }());
+
+    // [bugfix, chrome]
+    // If separator is undefined, then the result array contains just one String,
+    // which is the this value (converted to a String). If limit is not undefined,
+    // then the output array is truncated so that it contains no more than limit
+    // elements.
+    // "0".split(undefined, 0) -> []
+    } else if ('0'.split(void 0, 0).length) {
+        StringPrototype.split = function split(separator, limit) {
+            if (typeof separator === 'undefined' && limit === 0) {
+                return [];
+            }
+            return strSplit(this, separator, limit);
+        };
+    }
+
+    var str_replace = StringPrototype.replace;
+    var replaceReportsGroupsCorrectly = (function () {
+        var groups = [];
+        'x'.replace(/x(.)?/g, function (match, group) {
+            pushCall(groups, group);
+        });
+        return groups.length === 1 && typeof groups[0] === 'undefined';
+    }());
+
+    if (!replaceReportsGroupsCorrectly) {
+        StringPrototype.replace = function replace(searchValue, replaceValue) {
+            var isFn = isCallable(replaceValue);
+            var hasCapturingGroups = isRegex(searchValue) && (/\)[*?]/).test(searchValue.source);
+            if (!isFn || !hasCapturingGroups) {
+                return str_replace.call(this, searchValue, replaceValue);
+            } else {
+                var wrappedReplaceValue = function (match) {
+                    var length = arguments.length;
+                    var originalLastIndex = searchValue.lastIndex;
+                    searchValue.lastIndex = 0;
+                    var args = searchValue.exec(match) || [];
+                    searchValue.lastIndex = originalLastIndex;
+                    pushCall(args, arguments[length - 2], arguments[length - 1]);
+                    return replaceValue.apply(this, args);
+                };
+                return str_replace.call(this, searchValue, wrappedReplaceValue);
+            }
+        };
+    }
+
+    // ECMA-262, 3rd B.2.3
+    // Not an ECMAScript standard, although ECMAScript 3rd Edition has a
+    // non-normative section suggesting uniform semantics and it should be
+    // normalized across all browsers
+    // [bugfix, IE lt 9] IE < 9 substr() with negative value not working in IE
+    var string_substr = StringPrototype.substr;
+    var hasNegativeSubstrBug = ''.substr && '0b'.substr(-1) !== 'b';
+    defineProperties(StringPrototype, {
+        substr: function substr(start, length) {
+            var normalizedStart = start;
+            if (start < 0) {
+                normalizedStart = max(this.length + start, 0);
+            }
+            return string_substr.call(this, normalizedStart, length);
+        }
+    }, hasNegativeSubstrBug);
+
+    // ES5 15.5.4.20
+    // whitespace from: http://es5.github.io/#x15.5.4.20
+    var ws = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003' +
+        '\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028' +
+        '\u2029\uFEFF';
+    var zeroWidth = '\u200b';
+    var wsRegexChars = '[' + ws + ']';
+    var trimBeginRegexp = new RegExp('^' + wsRegexChars + wsRegexChars + '*');
+    var trimEndRegexp = new RegExp(wsRegexChars + wsRegexChars + '*$');
+    var hasTrimWhitespaceBug = StringPrototype.trim && (ws.trim() || !zeroWidth.trim());
+    defineProperties(StringPrototype, {
+        // http://blog.stevenlevithan.com/archives/faster-trim-javascript
+        // http://perfectionkills.com/whitespace-deviations/
+        trim: function trim() {
+            if (typeof this === 'undefined' || this === null) {
+                throw new TypeError("can't convert " + this + ' to object');
+            }
+            return $String(this).replace(trimBeginRegexp, '').replace(trimEndRegexp, '');
+        }
+    }, hasTrimWhitespaceBug);
+    var trim = call.bind(String.prototype.trim);
+
+    var hasLastIndexBug = StringPrototype.lastIndexOf && 'abcあい'.lastIndexOf('あい', 2) !== -1;
+    defineProperties(StringPrototype, {
+        lastIndexOf: function lastIndexOf(searchString) {
+            if (typeof this === 'undefined' || this === null) {
+                throw new TypeError("can't convert " + this + ' to object');
+            }
+            var S = $String(this);
+            var searchStr = $String(searchString);
+            var numPos = arguments.length > 1 ? $Number(arguments[1]) : NaN;
+            var pos = isActualNaN(numPos) ? Infinity : ES.ToInteger(numPos);
+            var start = min(max(pos, 0), S.length);
+            var searchLen = searchStr.length;
+            var k = start + searchLen;
+            while (k > 0) {
+                k = max(0, k - searchLen);
+                var index = strIndexOf(strSlice(S, k, start + searchLen), searchStr);
+                if (index !== -1) {
+                    return k + index;
+                }
+            }
+            return -1;
+        }
+    }, hasLastIndexBug);
+
+    var originalLastIndexOf = StringPrototype.lastIndexOf;
+    defineProperties(StringPrototype, {
+        lastIndexOf: function lastIndexOf(searchString) {
+            return originalLastIndexOf.apply(this, arguments);
+        }
+    }, StringPrototype.lastIndexOf.length !== 1);
+
+    // ES-5 15.1.2.2
+    /* eslint-disable radix */
+    if (parseInt(ws + '08') !== 8 || parseInt(ws + '0x16') !== 22) {
+    /* eslint-enable radix */
+        /* global parseInt: true */
+        parseInt = (function (origParseInt) {
+            var hexRegex = /^[\-+]?0[xX]/;
+            return function parseInt(str, radix) {
+                var string = trim(String(str));
+                var defaultedRadix = $Number(radix) || (hexRegex.test(string) ? 16 : 10);
+                return origParseInt(string, defaultedRadix);
+            };
+        }(parseInt));
+    }
+
+    // https://es5.github.io/#x15.1.2.3
+    if (1 / parseFloat('-0') !== -Infinity) {
+        /* global parseFloat: true */
+        parseFloat = (function (origParseFloat) {
+            return function parseFloat(string) {
+                var inputString = trim(String(string));
+                var result = origParseFloat(inputString);
+                return result === 0 && strSlice(inputString, 0, 1) === '-' ? -0 : result;
+            };
+        }(parseFloat));
+    }
+
+    if (String(new RangeError('test')) !== 'RangeError: test') {
+        var errorToStringShim = function toString() {
+            if (typeof this === 'undefined' || this === null) {
+                throw new TypeError("can't convert " + this + ' to object');
+            }
+            var name = this.name;
+            if (typeof name === 'undefined') {
+                name = 'Error';
+            } else if (typeof name !== 'string') {
+                name = $String(name);
+            }
+            var msg = this.message;
+            if (typeof msg === 'undefined') {
+                msg = '';
+            } else if (typeof msg !== 'string') {
+                msg = $String(msg);
+            }
+            if (!name) {
+                return msg;
+            }
+            if (!msg) {
+                return name;
+            }
+            return name + ': ' + msg;
+        };
+        // can't use defineProperties here because of toString enumeration issue in IE <= 8
+        Error.prototype.toString = errorToStringShim;
+    }
+
+    if (supportsDescriptors) {
+        var ensureNonEnumerable = function (obj, prop) {
+            if (isEnum(obj, prop)) {
+                var desc = Object.getOwnPropertyDescriptor(obj, prop);
+                if (desc.configurable) {
+                    desc.enumerable = false;
+                    Object.defineProperty(obj, prop, desc);
+                }
+            }
+        };
+        ensureNonEnumerable(Error.prototype, 'message');
+        if (Error.prototype.message !== '') {
+            Error.prototype.message = '';
+        }
+        ensureNonEnumerable(Error.prototype, 'name');
+    }
+
+    if (String(/a/mig) !== '/a/gim') {
+        var regexToString = function toString() {
+            var str = '/' + this.source + '/';
+            if (this.global) {
+                str += 'g';
+            }
+            if (this.ignoreCase) {
+                str += 'i';
+            }
+            if (this.multiline) {
+                str += 'm';
+            }
+            return str;
+        };
+        // can't use defineProperties here because of toString enumeration issue in IE <= 8
+        RegExp.prototype.toString = regexToString;
+    }
+}));
+
+'use strict';
+/*jslint eqeq: true*/
+
+Handlebars.registerHelper('sanitize', function (text) {
+    var result;
+
+    if (text === undefined) { return ''; }
+
+    result = sanitizeHtml(text, {
+        allowedTags: [ 'div', 'span', 'b', 'i', 'em', 'strong', 'a', 'br', 'table', 'tbody', 'tr', 'th', 'td' ],
+        allowedAttributes: {
+            'div': [ 'class' ],
+            'span': [ 'class' ],
+            'table': [ 'class' ],
+            'td': [ 'class' ],
+            'th': [ 'colspan' ],
+            'a': [ 'href' ]
+        }
+    });
+
+    return new Handlebars.SafeString(result);
 });
 
 Handlebars.registerHelper('renderTextParam', function(param) {
     var result, type = 'text', idAtt = '';
-    var paramType = param.type || param.schema.type || '';
+    var paramType = param.type || param.schema && param.schema.type || '';
     var isArray = paramType.toLowerCase() === 'array' || param.allowMultiple;
     var defaultValue = isArray && Array.isArray(param.default) ? param.default.join('\n') : param.default;
+    var name = Handlebars.Utils.escapeExpression(param.name);
+    var valueId = Handlebars.Utils.escapeExpression(param.valueId);
+    paramType = Handlebars.Utils.escapeExpression(paramType);
 
     var dataVendorExtensions = Object.keys(param).filter(function(property) {
         // filter X-data- properties
@@ -262,24 +3106,22 @@ Handlebars.registerHelper('renderTextParam', function(param) {
         return result += ' ' + property.substring(2, property.length) + '=\'' + param[property] + '\'';
     }, '');
 
-    if (typeof defaultValue === 'undefined') {
-        defaultValue = '';
-    }
-
     if(param.format && param.format === 'password') {
         type = 'password';
     }
 
-    if(param.valueId) {
-        idAtt = ' id=\'' + param.valueId + '\'';
+    if(valueId) {
+        idAtt = ' id=\'' + valueId + '\'';
     }
 
-    if (typeof defaultValue === 'string' || defaultValue instanceof String) {
-        defaultValue = defaultValue.replace(/'/g,'&apos;');
+    if (defaultValue) {
+      defaultValue = sanitizeHtml(defaultValue);
+    } else {
+      defaultValue = '';
     }
 
     if(isArray) {
-        result = '<textarea class=\'body-textarea' + (param.required ? ' required' : '') + '\' name=\'' + param.name + '\'' + idAtt + dataVendorExtensions;
+        result = '<textarea class=\'body-textarea' + (param.required ? ' required' : '') + '\' name=\'' + name + '\'' + idAtt + dataVendorExtensions;
         result += ' placeholder=\'Provide multiple values in new lines' + (param.required ? ' (at least one required).' : '.') + '\'>';
         result += defaultValue + '</textarea>';
     } else {
@@ -288,629 +3130,52 @@ Handlebars.registerHelper('renderTextParam', function(param) {
           parameterClass += ' required';
         }
         result = '<input class=\'' + parameterClass + '\' minlength=\'' + (param.required ? 1 : 0) + '\'';
-        result += ' name=\'' + param.name +'\' placeholder=\'' + (param.required ? '(required)' : '') + '\'' + idAtt + dataVendorExtensions;
+        result += ' name=\'' + name +'\' placeholder=\'' + (param.required ? '(required)' : '') + '\'' + idAtt + dataVendorExtensions;
         result += ' type=\'' + type + '\' value=\'' + defaultValue + '\'/>';
     }
     return new Handlebars.SafeString(result);
 });
 
-this["Handlebars"]["templates"]["main"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression, buffer = "  <div class=\"info_title\">"
-    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1), depth0))
-    + "</div>\n  <div class=\"info_description markdown\">";
-  stack1 = lambda(((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.description : stack1), depth0);
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</div>\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.externalDocs : depth0), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "  ";
-  stack1 = helpers['if'].call(depth0, ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1), {"name":"if","hash":{},"fn":this.program(4, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n  ";
-  stack1 = helpers['if'].call(depth0, ((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1), {"name":"if","hash":{},"fn":this.program(6, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n  ";
-  stack1 = helpers['if'].call(depth0, ((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1), {"name":"if","hash":{},"fn":this.program(8, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n  ";
-  stack1 = helpers['if'].call(depth0, ((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1), {"name":"if","hash":{},"fn":this.program(10, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n  ";
-  stack1 = helpers['if'].call(depth0, ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1), {"name":"if","hash":{},"fn":this.program(12, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "\n";
-},"2":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
-  return "  <p>"
-    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.description : stack1), depth0))
-    + "</p>\n  <a href=\""
-    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.url : stack1), depth0))
-    + "\" target=\"_blank\">"
-    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.url : stack1), depth0))
-    + "</a>\n";
-},"4":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
-  return "<div class=\"info_tos\"><a href=\""
-    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1), depth0))
-    + "\" data-sw-translate>Terms of service</a></div>";
-},"6":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
-  return "<div class='info_name' data-sw-translate>Created by "
-    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1), depth0))
-    + "</div>";
-},"8":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
-  return "<div class='info_url' data-sw-translate>See more at <a href=\""
-    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1), depth0))
-    + "\">"
-    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1), depth0))
-    + "</a></div>";
-},"10":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
-  return "<div class='info_email'><a href=\"mailto:"
-    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1), depth0))
-    + "?subject="
-    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1), depth0))
-    + "\" data-sw-translate>Contact the developer</a></div>";
-},"12":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
-  return "<div class='info_license'><a href='"
-    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.url : stack1), depth0))
-    + "'>"
-    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.name : stack1), depth0))
-    + "</a></div>";
-},"14":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
-  return "  , <span style=\"font-variant: small-caps\" data-sw-translate>api version</span>: "
-    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1), depth0))
-    + "\n    ";
-},"16":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "    <span style=\"float:right\"><a href=\""
-    + escapeExpression(((helper = (helper = helpers.validatorUrl || (depth0 != null ? depth0.validatorUrl : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"validatorUrl","hash":{},"data":data}) : helper)))
-    + "/debug?url="
-    + escapeExpression(((helper = (helper = helpers.url || (depth0 != null ? depth0.url : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"url","hash":{},"data":data}) : helper)))
-    + "\"><img id=\"validator\" src=\""
-    + escapeExpression(((helper = (helper = helpers.validatorUrl || (depth0 != null ? depth0.validatorUrl : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"validatorUrl","hash":{},"data":data}) : helper)))
-    + "?url="
-    + escapeExpression(((helper = (helper = helpers.url || (depth0 != null ? depth0.url : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"url","hash":{},"data":data}) : helper)))
-    + "\"></a>\n    </span>\n";
-},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div class='info' id='api_info'>\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.info : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</div>\n<div class='container' id='resources_container'>\n  <ul id='resources'></ul>\n\n  <div class=\"footer\">\n    <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: "
-    + escapeExpression(((helper = (helper = helpers.basePath || (depth0 != null ? depth0.basePath : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"basePath","hash":{},"data":data}) : helper)))
-    + "\n";
-  stack1 = helpers['if'].call(depth0, ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1), {"name":"if","hash":{},"fn":this.program(14, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "]\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.validatorUrl : depth0), {"name":"if","hash":{},"fn":this.program(16, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "    </h4>\n    </div>\n</div>\n";
-},"useData":true});
-this["Handlebars"]["templates"]["operation"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  return "deprecated";
-  },"3":function(depth0,helpers,partials,data) {
-  return "            <h4><span data-sw-translate>Warning: Deprecated</span></h4>\n";
-  },"5":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, buffer = "        <h4><span data-sw-translate>Implementation Notes</span></h4>\n        <div class=\"markdown\">";
-  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</div>\n";
-},"7":function(depth0,helpers,partials,data) {
-  return "        <div class=\"auth\">\n        <span class=\"api-ic ic-error\">";
-  },"9":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "          <div class=\"api_information_panel\">\n";
-  stack1 = helpers.each.call(depth0, depth0, {"name":"each","hash":{},"fn":this.program(10, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "          </div>\n";
-},"10":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression, buffer = "            <div title='";
-  stack1 = lambda((depth0 != null ? depth0.description : depth0), depth0);
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "'>"
-    + escapeExpression(lambda((depth0 != null ? depth0.scope : depth0), depth0))
-    + "</div>\n";
-},"12":function(depth0,helpers,partials,data) {
-  return "</span></div>";
-  },"14":function(depth0,helpers,partials,data) {
-  return "        <div class='access'>\n          <span class=\"api-ic ic-off\" title=\"click to authenticate\"></span>\n        </div>\n";
-  },"16":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "          <h4><span data-sw-translate>Response Class</span> (<span data-sw-translate>Status</span> "
-    + escapeExpression(((helper = (helper = helpers.successCode || (depth0 != null ? depth0.successCode : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"successCode","hash":{},"data":data}) : helper)))
-    + ")</h4>\n            ";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.successDescription : depth0), {"name":"if","hash":{},"fn":this.program(17, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "\n          <p><span class=\"model-signature\" /></p>\n          <br/>\n          <div class=\"response-content-type\" />\n\n";
-},"17":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, buffer = "<div class=\"markdown\">";
-  stack1 = ((helper = (helper = helpers.successDescription || (depth0 != null ? depth0.successDescription : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"successDescription","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</div>";
-},"19":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "          <h4 data-sw-translate>Headers</h4>\n          <table class=\"headers\">\n            <thead>\n              <tr>\n                <th style=\"width: 100px; max-width: 100px\" data-sw-translate>Header</th>\n                <th style=\"width: 310px; max-width: 310px\" data-sw-translate>Description</th>\n                <th style=\"width: 200px; max-width: 200px\" data-sw-translate>Type</th>\n                <th style=\"width: 320px; max-width: 320px\" data-sw-translate>Other</th>\n              </tr>\n            </thead>\n            <tbody>\n";
-  stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.headers : depth0), {"name":"each","hash":{},"fn":this.program(20, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "            </tbody>\n          </table>\n";
-},"20":function(depth0,helpers,partials,data) {
-  var lambda=this.lambda, escapeExpression=this.escapeExpression;
-  return "              <tr>\n                <td>"
-    + escapeExpression(lambda((data && data.key), depth0))
-    + "</td>\n                <td>"
-    + escapeExpression(lambda((depth0 != null ? depth0.description : depth0), depth0))
-    + "</td>\n                <td>"
-    + escapeExpression(lambda((depth0 != null ? depth0.type : depth0), depth0))
-    + "</td>\n                <td>"
-    + escapeExpression(lambda((depth0 != null ? depth0.other : depth0), depth0))
-    + "</td>\n              </tr>\n";
-},"22":function(depth0,helpers,partials,data) {
-  return "          <h4 data-sw-translate>Parameters</h4>\n          <table class='fullwidth'>\n          <thead>\n            <tr>\n            <th style=\"width: 100px; max-width: 100px\" data-sw-translate>Parameter</th>\n            <th style=\"width: 310px; max-width: 310px\" data-sw-translate>Value</th>\n            <th style=\"width: 200px; max-width: 200px\" data-sw-translate>Description</th>\n            <th style=\"width: 100px; max-width: 100px\" data-sw-translate>Parameter Type</th>\n            <th style=\"width: 220px; max-width: 230px\" data-sw-translate>Data Type</th>\n            </tr>\n          </thead>\n          <tbody class=\"operation-params\">\n\n          </tbody>\n          </table>\n";
-  },"24":function(depth0,helpers,partials,data) {
-  return "          <div style='margin:0;padding:0;display:inline'></div>\n          <h4 data-sw-translate>Response Messages</h4>\n          <table class='fullwidth'>\n            <thead>\n            <tr>\n              <th data-sw-translate>HTTP Status Code</th>\n              <th data-sw-translate>Reason</th>\n              <th data-sw-translate>Response Model</th>\n              <th data-sw-translate>Headers</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            </tbody>\n          </table>\n";
-  },"26":function(depth0,helpers,partials,data) {
-  return "";
-},"28":function(depth0,helpers,partials,data) {
-  return "          <div class='sandbox_header'>\n            <input class='submit' type='submit' value='Try it out!' data-sw-translate/>\n            <a href='#' class='response_hider' style='display:none' data-sw-translate>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n";
-  },"30":function(depth0,helpers,partials,data) {
-  return "          <h4 data-sw-translate>Request Headers</h4>\n          <div class='block request_headers'></div>\n";
-  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, options, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, blockHelperMissing=helpers.blockHelperMissing, buffer = "\n  <ul class='operations' >\n    <li class='"
-    + escapeExpression(((helper = (helper = helpers.method || (depth0 != null ? depth0.method : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"method","hash":{},"data":data}) : helper)))
-    + " operation' id='"
-    + escapeExpression(((helper = (helper = helpers.parentId || (depth0 != null ? depth0.parentId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"parentId","hash":{},"data":data}) : helper)))
-    + "_"
-    + escapeExpression(((helper = (helper = helpers.nickname || (depth0 != null ? depth0.nickname : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"nickname","hash":{},"data":data}) : helper)))
-    + "'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/"
-    + escapeExpression(((helper = (helper = helpers.encodedParentId || (depth0 != null ? depth0.encodedParentId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"encodedParentId","hash":{},"data":data}) : helper)))
-    + "/"
-    + escapeExpression(((helper = (helper = helpers.nickname || (depth0 != null ? depth0.nickname : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"nickname","hash":{},"data":data}) : helper)))
-    + "' class=\"toggleOperation\">"
-    + escapeExpression(((helper = (helper = helpers.method || (depth0 != null ? depth0.method : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"method","hash":{},"data":data}) : helper)))
-    + "</a>\n          </span>\n          <span class='path'>\n          <a href='#!/"
-    + escapeExpression(((helper = (helper = helpers.encodedParentId || (depth0 != null ? depth0.encodedParentId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"encodedParentId","hash":{},"data":data}) : helper)))
-    + "/"
-    + escapeExpression(((helper = (helper = helpers.nickname || (depth0 != null ? depth0.nickname : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"nickname","hash":{},"data":data}) : helper)))
-    + "' class=\"toggleOperation ";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.deprecated : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\">"
-    + escapeExpression(((helper = (helper = helpers.path || (depth0 != null ? depth0.path : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"path","hash":{},"data":data}) : helper)))
-    + "</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/"
-    + escapeExpression(((helper = (helper = helpers.encodedParentId || (depth0 != null ? depth0.encodedParentId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"encodedParentId","hash":{},"data":data}) : helper)))
-    + "/"
-    + escapeExpression(((helper = (helper = helpers.nickname || (depth0 != null ? depth0.nickname : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"nickname","hash":{},"data":data}) : helper)))
-    + "' class=\"toggleOperation\">";
-  stack1 = ((helper = (helper = helpers.summary || (depth0 != null ? depth0.summary : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"summary","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='"
-    + escapeExpression(((helper = (helper = helpers.parentId || (depth0 != null ? depth0.parentId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"parentId","hash":{},"data":data}) : helper)))
-    + "_"
-    + escapeExpression(((helper = (helper = helpers.nickname || (depth0 != null ? depth0.nickname : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"nickname","hash":{},"data":data}) : helper)))
-    + "_content' style='display:none'>\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.deprecated : depth0), {"name":"if","hash":{},"fn":this.program(3, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.description : depth0), {"name":"if","hash":{},"fn":this.program(5, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  stack1 = ((helper = (helper = helpers.oauth || (depth0 != null ? depth0.oauth : depth0)) != null ? helper : helperMissing),(options={"name":"oauth","hash":{},"fn":this.program(7, data),"inverse":this.noop,"data":data}),(typeof helper === functionType ? helper.call(depth0, options) : helper));
-  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n";
-  stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.oauth : depth0), {"name":"each","hash":{},"fn":this.program(9, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "        ";
-  stack1 = ((helper = (helper = helpers.oauth || (depth0 != null ? depth0.oauth : depth0)) != null ? helper : helperMissing),(options={"name":"oauth","hash":{},"fn":this.program(12, data),"inverse":this.noop,"data":data}),(typeof helper === functionType ? helper.call(depth0, options) : helper));
-  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n";
-  stack1 = ((helper = (helper = helpers.oauth || (depth0 != null ? depth0.oauth : depth0)) != null ? helper : helperMissing),(options={"name":"oauth","hash":{},"fn":this.program(14, data),"inverse":this.noop,"data":data}),(typeof helper === functionType ? helper.call(depth0, options) : helper));
-  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if (stack1 != null) { buffer += stack1; }
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.type : depth0), {"name":"if","hash":{},"fn":this.program(16, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.headers : depth0), {"name":"if","hash":{},"fn":this.program(19, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.parameters : depth0), {"name":"if","hash":{},"fn":this.program(22, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.responseMessages : depth0), {"name":"if","hash":{},"fn":this.program(24, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isReadOnly : depth0), {"name":"if","hash":{},"fn":this.program(26, data),"inverse":this.program(28, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "        </form>\n        <div class='response' style='display:none'>\n          <h4 class='curl'>Curl</h4>\n          <div class='block curl'></div>\n          <h4 data-sw-translate>Request URL</h4>\n          <div class='block request_url'></div>\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.showRequestHeaders : depth0), {"name":"if","hash":{},"fn":this.program(30, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "          <h4 data-sw-translate>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4 data-sw-translate>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4 data-sw-translate>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n";
-},"useData":true});
-this["Handlebars"]["templates"]["param_list"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  return " required";
-  },"3":function(depth0,helpers,partials,data) {
-  return " multiple=\"multiple\"";
-  },"5":function(depth0,helpers,partials,data) {
-  return " required ";
-  },"7":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "      <option ";
-  stack1 = helpers.unless.call(depth0, (depth0 != null ? depth0.hasDefault : depth0), {"name":"unless","hash":{},"fn":this.program(8, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + " value=''></option>\n";
-},"8":function(depth0,helpers,partials,data) {
-  return "  selected=\"\" ";
-  },"10":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "\n      <option ";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isDefault : depth0), {"name":"if","hash":{},"fn":this.program(11, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "  value='"
-    + escapeExpression(((helper = (helper = helpers.value || (depth0 != null ? depth0.value : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"value","hash":{},"data":data}) : helper)))
-    + "'> "
-    + escapeExpression(((helper = (helper = helpers.value || (depth0 != null ? depth0.value : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"value","hash":{},"data":data}) : helper)))
-    + " ";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isDefault : depth0), {"name":"if","hash":{},"fn":this.program(13, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + " </option>\n\n";
-},"11":function(depth0,helpers,partials,data) {
-  return " selected=\"\"  ";
-  },"13":function(depth0,helpers,partials,data) {
-  return " (default) ";
-  },"15":function(depth0,helpers,partials,data) {
-  return "<strong>";
-  },"17":function(depth0,helpers,partials,data) {
-  return "</strong>";
-  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.required : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "'><label for='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'>"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "</label></td>\n<td>\n  <select ";
-  stack1 = ((helpers.isArray || (depth0 && depth0.isArray) || helperMissing).call(depth0, depth0, {"name":"isArray","hash":{},"fn":this.program(3, data),"inverse":this.noop,"data":data}));
-  if (stack1 != null) { buffer += stack1; }
-  buffer += " class=\"parameter ";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.required : depth0), {"name":"if","hash":{},"fn":this.program(5, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\" name=\""
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "\" id=\""
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "\">\n\n";
-  stack1 = helpers.unless.call(depth0, (depth0 != null ? depth0.required : depth0), {"name":"unless","hash":{},"fn":this.program(7, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n";
-  stack1 = helpers.each.call(depth0, ((stack1 = (depth0 != null ? depth0.allowableValues : depth0)) != null ? stack1.descriptiveValues : stack1), {"name":"each","hash":{},"fn":this.program(10, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n  </select>\n</td>\n<td class=\"markdown\">";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.required : depth0), {"name":"if","hash":{},"fn":this.program(15, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.required : depth0), {"name":"if","hash":{},"fn":this.program(17, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</td>\n<td>";
-  stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-},"useData":true});
-this["Handlebars"]["templates"]["param_readonly_required"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "        <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "' id='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'>"
-    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
-    + "</textarea>\n";
-},"3":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(4, data),"inverse":this.program(6, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"4":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "            "
-    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
-    + "\n";
-},"6":function(depth0,helpers,partials,data) {
-  return "            (empty)\n";
-  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code required'><label for='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'>"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "</label></td>\n<td>\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isBody : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(3, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</td>\n<td class=\"markdown\">";
-  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</td>\n<td>";
-  stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-},"useData":true});
-this["Handlebars"]["templates"]["param_readonly"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "        <textarea class='body-textarea' readonly='readonly' name='"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "' id='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'>"
-    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
-    + "</textarea>\n        <div class=\"parameter-content-type\" />\n";
-},"3":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(4, data),"inverse":this.program(6, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"4":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "            "
-    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
-    + "\n";
-},"6":function(depth0,helpers,partials,data) {
-  return "            (empty)\n";
-  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code'><label for='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'>"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "</label></td>\n<td>\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isBody : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(3, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</td>\n<td class=\"markdown\">";
-  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</td>\n<td>";
-  stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-},"useData":true});
-this["Handlebars"]["templates"]["param_required"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.program(4, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"2":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "			<input type=\"file\" name='"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "' id='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'/>\n";
-},"4":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(5, data),"inverse":this.program(7, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"5":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "				<div class=\"editor_holder\"></div>\n				<textarea class='body-textarea required' placeholder='(required)' name='"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "' id=\""
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "\">"
-    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
-    + "</textarea>\n        <br />\n        <div class=\"parameter-content-type\" />\n";
-},"7":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "				<textarea class='body-textarea required' placeholder='(required)' name='"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "' id='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'></textarea>\n				<div class=\"editor_holder\"></div>\n				<br />\n				<div class=\"parameter-content-type\" />\n";
-},"9":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(10, data),"inverse":this.program(12, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"10":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "			<input class='parameter' class='required' type='file' name='"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "' id='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'/>\n";
-},"12":function(depth0,helpers,partials,data) {
-  var stack1, helperMissing=helpers.helperMissing, buffer = "";
-  stack1 = ((helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helperMissing).call(depth0, depth0, {"name":"renderTextParam","hash":{},"fn":this.program(13, data),"inverse":this.noop,"data":data}));
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"13":function(depth0,helpers,partials,data) {
-  return "";
-},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code required'><label for='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'>"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "</label></td>\n<td>\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isBody : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(9, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</td>\n<td>\n	<strong><span class=\"markdown\">";
-  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</span></strong>\n</td>\n<td>";
-  stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-},"useData":true});
-this["Handlebars"]["templates"]["param"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.program(4, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"2":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "			<input type=\"file\" name='"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "' id='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'/>\n			<div class=\"parameter-content-type\" />\n";
-},"4":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(5, data),"inverse":this.program(7, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"5":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "				<div class=\"editor_holder\"></div>\n				<textarea class='body-textarea' name='"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "' id='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'>"
-    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
-    + "</textarea>\n        <br />\n        <div class=\"parameter-content-type\" />\n";
-},"7":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "				<textarea class='body-textarea' name='"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "' id='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'></textarea>\n				<div class=\"editor_holder\"></div>\n				<br />\n				<div class=\"parameter-content-type\" />\n";
-},"9":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.program(10, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"10":function(depth0,helpers,partials,data) {
-  var stack1, helperMissing=helpers.helperMissing, buffer = "";
-  stack1 = ((helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helperMissing).call(depth0, depth0, {"name":"renderTextParam","hash":{},"fn":this.program(11, data),"inverse":this.noop,"data":data}));
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"11":function(depth0,helpers,partials,data) {
-  return "";
-},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code'><label for='"
-    + escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
-    + "'>"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "</label></td>\n<td>\n\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isBody : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(9, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n</td>\n<td class=\"markdown\">";
-  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</td>\n<td>";
-  stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</td>\n<td>\n	<span class=\"model-signature\"></span>\n</td>\n";
-},"useData":true});
-this["Handlebars"]["templates"]["parameter_content_type"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "";
-  stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.consumes : depth0), {"name":"each","hash":{},"fn":this.program(2, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"2":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression, buffer = "  <option value=\""
-    + escapeExpression(lambda(depth0, depth0))
-    + "\">";
-  stack1 = lambda(depth0, depth0);
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</option>\n";
-},"4":function(depth0,helpers,partials,data) {
-  return "  <option value=\"application/json\">application/json</option>\n";
-  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<label for=\""
-    + escapeExpression(((helper = (helper = helpers.parameterContentTypeId || (depth0 != null ? depth0.parameterContentTypeId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"parameterContentTypeId","hash":{},"data":data}) : helper)))
-    + "\" data-sw-translate>Parameter content type:</label>\n<select name=\"parameterContentType\" id=\""
-    + escapeExpression(((helper = (helper = helpers.parameterContentTypeId || (depth0 != null ? depth0.parameterContentTypeId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"parameterContentTypeId","hash":{},"data":data}) : helper)))
-    + "\">\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.consumes : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(4, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</select>\n";
-},"useData":true});
-this["Handlebars"]["templates"]["resource"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  return " : ";
-  },"3":function(depth0,helpers,partials,data) {
-  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
-  return "    <li>\n      <a href='"
-    + escapeExpression(((helper = (helper = helpers.url || (depth0 != null ? depth0.url : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"url","hash":{},"data":data}) : helper)))
-    + "' data-sw-translate>Raw</a>\n    </li>\n";
-},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, options, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, blockHelperMissing=helpers.blockHelperMissing, buffer = "<div class='heading'>\n  <h2>\n    <a href='#!/"
-    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
-    + "' class=\"toggleEndpointList\" data-id=\""
-    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
-    + "\">"
-    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
-    + "</a> ";
-  stack1 = ((helper = (helper = helpers.summary || (depth0 != null ? depth0.summary : depth0)) != null ? helper : helperMissing),(options={"name":"summary","hash":{},"fn":this.program(1, data),"inverse":this.noop,"data":data}),(typeof helper === functionType ? helper.call(depth0, options) : helper));
-  if (!helpers.summary) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if (stack1 != null) { buffer += stack1; }
-  stack1 = ((helper = (helper = helpers.summary || (depth0 != null ? depth0.summary : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"summary","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/"
-    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
-    + "' id='endpointListTogger_"
-    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
-    + "' class=\"toggleEndpointList\" data-id=\""
-    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
-    + "\" data-sw-translate>Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' class=\"collapseResource\" data-id=\""
-    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
-    + "\" data-sw-translate>\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' class=\"expandResource\" data-id=\""
-    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
-    + "\" data-sw-translate>\n        Expand Operations\n      </a>\n    </li>\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.url : depth0), {"name":"if","hash":{},"fn":this.program(3, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "  </ul>\n</div>\n<ul class='endpoints' id='"
-    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
-    + "_endpoint_list' style='display:none'>\n\n</ul>\n";
-},"useData":true});
-this["Handlebars"]["templates"]["response_content_type"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  var stack1, buffer = "";
-  stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.produces : depth0), {"name":"each","hash":{},"fn":this.program(2, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer;
-},"2":function(depth0,helpers,partials,data) {
-  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression, buffer = "  <option value=\""
-    + escapeExpression(lambda(depth0, depth0))
-    + "\">";
-  stack1 = lambda(depth0, depth0);
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</option>\n";
-},"4":function(depth0,helpers,partials,data) {
-  return "  <option value=\"application/json\">application/json</option>\n";
-  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<label data-sw-translate for=\""
-    + escapeExpression(((helper = (helper = helpers.responseContentTypeId || (depth0 != null ? depth0.responseContentTypeId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"responseContentTypeId","hash":{},"data":data}) : helper)))
-    + "\">Response Content Type</label>\n<select name=\"responseContentType\" id=\""
-    + escapeExpression(((helper = (helper = helpers.responseContentTypeId || (depth0 != null ? depth0.responseContentTypeId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"responseContentTypeId","hash":{},"data":data}) : helper)))
-    + "\">\n";
-  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.produces : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(4, data),"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "</select>\n";
-},"useData":true});
-this["Handlebars"]["templates"]["signature"] = Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div>\n<ul class=\"signature-nav\">\n  <li><a class=\"description-link\" href=\"#\" data-sw-translate>Model</a></li>\n  <li><a class=\"snippet-link\" href=\"#\" data-sw-translate>Model Schema</a></li>\n</ul>\n<div>\n\n<div class=\"signature-container\">\n  <div class=\"description\">\n    ";
-  stack1 = ((helper = (helper = helpers.signature || (depth0 != null ? depth0.signature : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signature","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "\n  </div>\n\n  <div class=\"snippet\">\n    <pre><code>"
-    + escapeExpression(((helper = (helper = helpers.sampleJSON || (depth0 != null ? depth0.sampleJSON : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"sampleJSON","hash":{},"data":data}) : helper)))
-    + "</code></pre>\n    <small class=\"notice\" data-sw-translate></small>\n  </div>\n</div>\n\n";
-},"useData":true});
-this["Handlebars"]["templates"]["status_code"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
-  var lambda=this.lambda, escapeExpression=this.escapeExpression;
-  return "      <tr>\n        <td>"
-    + escapeExpression(lambda((data && data.key), depth0))
-    + "</td>\n        <td>"
-    + escapeExpression(lambda((depth0 != null ? depth0.description : depth0), depth0))
-    + "</td>\n        <td>"
-    + escapeExpression(lambda((depth0 != null ? depth0.type : depth0), depth0))
-    + "</td>\n      </tr>\n";
-},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td width='15%' class='code'>"
-    + escapeExpression(((helper = (helper = helpers.code || (depth0 != null ? depth0.code : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"code","hash":{},"data":data}) : helper)))
-    + "</td>\n<td class=\"markdown\">";
-  stack1 = ((helper = (helper = helpers.message || (depth0 != null ? depth0.message : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"message","hash":{},"data":data}) : helper));
-  if (stack1 != null) { buffer += stack1; }
-  buffer += "</td>\n<td width='50%'><span class=\"model-signature\" /></td>\n<td class=\"headers\">\n  <table>\n    <tbody>\n";
-  stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.headers : depth0), {"name":"each","hash":{},"fn":this.program(1, data),"inverse":this.noop,"data":data});
-  if (stack1 != null) { buffer += stack1; }
-  return buffer + "    </tbody>\n  </table>\n</td>";
-},"useData":true});
+Handlebars.registerHelper('ifCond', function (v1, operator, v2, options) {
+
+    switch (operator) {
+        case '==':
+            return (v1 == v2) ? options.fn(this) : options.inverse(this);
+        case '===':
+            return (v1 === v2) ? options.fn(this) : options.inverse(this);
+        case '<':
+            return (v1 < v2) ? options.fn(this) : options.inverse(this);
+        case '<=':
+            return (v1 <= v2) ? options.fn(this) : options.inverse(this);
+        case '>':
+            return (v1 > v2) ? options.fn(this) : options.inverse(this);
+        case '>=':
+            return (v1 >= v2) ? options.fn(this) : options.inverse(this);
+        case '&&':
+            return (v1 && v2) ? options.fn(this) : options.inverse(this);
+        case '||':
+            return (v1 || v2) ? options.fn(this) : options.inverse(this);
+        default:
+            return options.inverse(this);
+    }
+});
+
+Handlebars.registerHelper('escape', function (value) {
+    var text = Handlebars.Utils.escapeExpression(value);
+
+    return new Handlebars.SafeString(text);
+});
+
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.sanitizeHtml=f()}})(function(){var define,module,exports;return function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}({1:[function(require,module,exports){var htmlparser=require("htmlparser2");var extend=require("xtend");var quoteRegexp=require("regexp-quote");function each(obj,cb){if(obj)Object.keys(obj).forEach(function(key){cb(obj[key],key)})}function has(obj,key){return{}.hasOwnProperty.call(obj,key)}module.exports=sanitizeHtml;function sanitizeHtml(html,options,_recursing){var result="";function Frame(tag,attribs){var that=this;this.tag=tag;this.attribs=attribs||{};this.tagPosition=result.length;this.text="";this.updateParentNodeText=function(){if(stack.length){var parentFrame=stack[stack.length-1];parentFrame.text+=that.text}}}if(!options){options=sanitizeHtml.defaults;options.parser=htmlParserDefaults}else{options=extend(sanitizeHtml.defaults,options);if(options.parser){options.parser=extend(htmlParserDefaults,options.parser)}else{options.parser=htmlParserDefaults}}var nonTextTagsArray=options.nonTextTags||["script","style","textarea"];var allowedAttributesMap;var allowedAttributesGlobMap;if(options.allowedAttributes){allowedAttributesMap={};allowedAttributesGlobMap={};each(options.allowedAttributes,function(attributes,tag){allowedAttributesMap[tag]=[];var globRegex=[];attributes.forEach(function(name){if(name.indexOf("*")>=0){globRegex.push(quoteRegexp(name).replace(/\\\*/g,".*"))}else{allowedAttributesMap[tag].push(name)}});allowedAttributesGlobMap[tag]=new RegExp("^("+globRegex.join("|")+")$")})}var allowedClassesMap={};each(options.allowedClasses,function(classes,tag){if(allowedAttributesMap){if(!has(allowedAttributesMap,tag)){allowedAttributesMap[tag]=[]}allowedAttributesMap[tag].push("class")}allowedClassesMap[tag]=classes});var transformTagsMap={};var transformTagsAll;each(options.transformTags,function(transform,tag){var transFun;if(typeof transform==="function"){transFun=transform}else if(typeof transform==="string"){transFun=sanitizeHtml.simpleTransform(transform)}if(tag==="*"){transformTagsAll=transFun}else{transformTagsMap[tag]=transFun}});var depth=0;var stack=[];var skipMap={};var transformMap={};var skipText=false;var skipTextDepth=0;var parser=new htmlparser.Parser({onopentag:function(name,attribs){if(skipText){skipTextDepth++;return}var frame=new Frame(name,attribs);stack.push(frame);var skip=false;var hasText=frame.text?true:false;var transformedTag;if(has(transformTagsMap,name)){transformedTag=transformTagsMap[name](name,attribs);frame.attribs=attribs=transformedTag.attribs;if(transformedTag.text!==undefined){frame.innerText=transformedTag.text}if(name!==transformedTag.tagName){frame.name=name=transformedTag.tagName;transformMap[depth]=transformedTag.tagName}}if(transformTagsAll){transformedTag=transformTagsAll(name,attribs);frame.attribs=attribs=transformedTag.attribs;if(name!==transformedTag.tagName){frame.name=name=transformedTag.tagName;transformMap[depth]=transformedTag.tagName}}if(options.allowedTags&&options.allowedTags.indexOf(name)===-1){skip=true;if(nonTextTagsArray.indexOf(name)!==-1){skipText=true;skipTextDepth=1}skipMap[depth]=true}depth++;if(skip){return}result+="<"+name;if(!allowedAttributesMap||has(allowedAttributesMap,name)||allowedAttributesMap["*"]){each(attribs,function(value,a){if(!allowedAttributesMap||has(allowedAttributesMap,name)&&allowedAttributesMap[name].indexOf(a)!==-1||allowedAttributesMap["*"]&&allowedAttributesMap["*"].indexOf(a)!==-1||has(allowedAttributesGlobMap,name)&&allowedAttributesGlobMap[name].test(a)||allowedAttributesGlobMap["*"]&&allowedAttributesGlobMap["*"].test(a)){if(a==="href"||a==="src"){if(naughtyHref(name,value)){delete frame.attribs[a];return}}if(a==="class"){value=filterClasses(value,allowedClassesMap[name]);if(!value.length){delete frame.attribs[a];return}}result+=" "+a;if(value.length){result+='="'+escapeHtml(value)+'"'}}else{delete frame.attribs[a]}})}if(options.selfClosing.indexOf(name)!==-1){result+=" />"}else{result+=">";if(frame.innerText&&!hasText&&!options.textFilter){result+=frame.innerText}}},ontext:function(text){if(skipText){return}var lastFrame=stack[stack.length-1];var tag;if(lastFrame){tag=lastFrame.tag;text=lastFrame.innerText!==undefined?lastFrame.innerText:text}if(tag==="script"||tag==="style"){result+=text}else{var escaped=escapeHtml(text);if(options.textFilter){result+=options.textFilter(escaped)}else{result+=escaped}}if(stack.length){var frame=stack[stack.length-1];frame.text+=text}},onclosetag:function(name){if(skipText){skipTextDepth--;if(!skipTextDepth){skipText=false}else{return}}var frame=stack.pop();if(!frame){return}skipText=false;depth--;if(skipMap[depth]){delete skipMap[depth];frame.updateParentNodeText();return}if(transformMap[depth]){name=transformMap[depth];delete transformMap[depth]}if(options.exclusiveFilter&&options.exclusiveFilter(frame)){result=result.substr(0,frame.tagPosition);return}frame.updateParentNodeText();if(options.selfClosing.indexOf(name)!==-1){return}result+="</"+name+">"}},options.parser);parser.write(html);parser.end();return result;function escapeHtml(s){if(typeof s!=="string"){s=s+""}return s.replace(/\&/g,"&amp;").replace(/</g,"&lt;").replace(/\>/g,"&gt;").replace(/\"/g,"&quot;")}function naughtyHref(name,href){href=href.replace(/[\x00-\x20]+/g,"");href=href.replace(/<\!\-\-.*?\-\-\>/g,"");var matches=href.match(/^([a-zA-Z]+)\:/);if(!matches){return false}var scheme=matches[1].toLowerCase();if(has(options.allowedSchemesByTag,name)){return options.allowedSchemesByTag[name].indexOf(scheme)===-1}return!options.allowedSchemes||options.allowedSchemes.indexOf(scheme)===-1}function filterClasses(classes,allowed){if(!allowed){return classes}classes=classes.split(/\s+/);return classes.filter(function(clss){return allowed.indexOf(clss)!==-1}).join(" ")}}var htmlParserDefaults={decodeEntities:true};sanitizeHtml.defaults={allowedTags:["h3","h4","h5","h6","blockquote","p","a","ul","ol","nl","li","b","i","strong","em","strike","code","hr","br","div","table","thead","caption","tbody","tr","th","td","pre"],allowedAttributes:{a:["href","name","target"],img:["src"]},selfClosing:["img","br","hr","area","base","basefont","input","link","meta"],allowedSchemes:["http","https","ftp","mailto"],allowedSchemesByTag:{}};sanitizeHtml.simpleTransform=function(newTagName,newAttribs,merge){merge=merge===undefined?true:merge;newAttribs=newAttribs||{};return function(tagName,attribs){var attrib;if(merge){for(attrib in newAttribs){attribs[attrib]=newAttribs[attrib]}}else{attribs=newAttribs}return{tagName:newTagName,attribs:attribs}}}},{htmlparser2:36,"regexp-quote":54,xtend:58}],2:[function(require,module,exports){"use strict";exports.toByteArray=toByteArray;exports.fromByteArray=fromByteArray;var lookup=[];var revLookup=[];var Arr=typeof Uint8Array!=="undefined"?Uint8Array:Array;function init(){var code="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";for(var i=0,len=code.length;i<len;++i){lookup[i]=code[i];revLookup[code.charCodeAt(i)]=i}revLookup["-".charCodeAt(0)]=62;revLookup["_".charCodeAt(0)]=63}init();function toByteArray(b64){var i,j,l,tmp,placeHolders,arr;var len=b64.length;if(len%4>0){throw new Error("Invalid string. Length must be a multiple of 4")}placeHolders=b64[len-2]==="="?2:b64[len-1]==="="?1:0;arr=new Arr(len*3/4-placeHolders);l=placeHolders>0?len-4:len;var L=0;for(i=0,j=0;i<l;i+=4,j+=3){tmp=revLookup[b64.charCodeAt(i)]<<18|revLookup[b64.charCodeAt(i+1)]<<12|revLookup[b64.charCodeAt(i+2)]<<6|revLookup[b64.charCodeAt(i+3)];arr[L++]=tmp>>16&255;arr[L++]=tmp>>8&255;arr[L++]=tmp&255}if(placeHolders===2){tmp=revLookup[b64.charCodeAt(i)]<<2|revLookup[b64.charCodeAt(i+1)]>>4;arr[L++]=tmp&255}else if(placeHolders===1){tmp=revLookup[b64.charCodeAt(i)]<<10|revLookup[b64.charCodeAt(i+1)]<<4|revLookup[b64.charCodeAt(i+2)]>>2;arr[L++]=tmp>>8&255;arr[L++]=tmp&255}return arr}function tripletToBase64(num){return lookup[num>>18&63]+lookup[num>>12&63]+lookup[num>>6&63]+lookup[num&63]}function encodeChunk(uint8,start,end){var tmp;var output=[];for(var i=start;i<end;i+=3){tmp=(uint8[i]<<16)+(uint8[i+1]<<8)+uint8[i+2];output.push(tripletToBase64(tmp))}return output.join("")}function fromByteArray(uint8){var tmp;var len=uint8.length;var extraBytes=len%3;var output="";var parts=[];var maxChunkLength=16383;for(var i=0,len2=len-extraBytes;i<len2;i+=maxChunkLength){parts.push(encodeChunk(uint8,i,i+maxChunkLength>len2?len2:i+maxChunkLength))}if(extraBytes===1){tmp=uint8[len-1];output+=lookup[tmp>>2];output+=lookup[tmp<<4&63];output+="=="}else if(extraBytes===2){tmp=(uint8[len-2]<<8)+uint8[len-1];output+=lookup[tmp>>10];output+=lookup[tmp>>4&63];output+=lookup[tmp<<2&63];output+="="}parts.push(output);return parts.join("")}},{}],3:[function(require,module,exports){},{}],4:[function(require,module,exports){(function(global){"use strict";var buffer=require("buffer");var Buffer=buffer.Buffer;var SlowBuffer=buffer.SlowBuffer;var MAX_LEN=buffer.kMaxLength||2147483647;exports.alloc=function alloc(size,fill,encoding){if(typeof Buffer.alloc==="function"){return Buffer.alloc(size,fill,encoding)}if(typeof encoding==="number"){throw new TypeError("encoding must not be number")}if(typeof size!=="number"){throw new TypeError("size must be a number")}if(size>MAX_LEN){throw new RangeError("size is too large")}var enc=encoding;var _fill=fill;if(_fill===undefined){enc=undefined;_fill=0}var buf=new Buffer(size);if(typeof _fill==="string"){var fillBuf=new Buffer(_fill,enc);var flen=fillBuf.length;var i=-1;while(++i<size){buf[i]=fillBuf[i%flen]}}else{buf.fill(_fill)}return buf};exports.allocUnsafe=function allocUnsafe(size){if(typeof Buffer.allocUnsafe==="function"){return Buffer.allocUnsafe(size)}if(typeof size!=="number"){throw new TypeError("size must be a number")}if(size>MAX_LEN){throw new RangeError("size is too large")}return new Buffer(size)};exports.from=function from(value,encodingOrOffset,length){if(typeof Buffer.from==="function"&&(!global.Uint8Array||Uint8Array.from!==Buffer.from)){return Buffer.from(value,encodingOrOffset,length)}if(typeof value==="number"){throw new TypeError('"value" argument must not be a number')}if(typeof value==="string"){return new Buffer(value,encodingOrOffset)}if(typeof ArrayBuffer!=="undefined"&&value instanceof ArrayBuffer){var offset=encodingOrOffset;if(arguments.length===1){return new Buffer(value)}if(typeof offset==="undefined"){offset=0}var len=length;if(typeof len==="undefined"){len=value.byteLength-offset}if(offset>=value.byteLength){throw new RangeError("'offset' is out of bounds")}if(len>value.byteLength-offset){throw new RangeError("'length' is out of bounds")}return new Buffer(value.slice(offset,offset+len))}if(Buffer.isBuffer(value)){var out=new Buffer(value.length);value.copy(out,0,0,value.length);return out}if(value){if(Array.isArray(value)||typeof ArrayBuffer!=="undefined"&&value.buffer instanceof ArrayBuffer||"length"in value){return new Buffer(value)}if(value.type==="Buffer"&&Array.isArray(value.data)){return new Buffer(value.data)}}throw new TypeError("First argument must be a string, Buffer, "+"ArrayBuffer, Array, or array-like object.")};exports.allocUnsafeSlow=function allocUnsafeSlow(size){if(typeof Buffer.allocUnsafeSlow==="function"){return Buffer.allocUnsafeSlow(size)}if(typeof size!=="number"){throw new TypeError("size must be a number")}if(size>=MAX_LEN){throw new RangeError("size is too large")}return new SlowBuffer(size)}}).call(this,typeof global!=="undefined"?global:typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{buffer:5}],5:[function(require,module,exports){(function(global){"use strict";var base64=require("base64-js");var ieee754=require("ieee754");var isArray=require("isarray");exports.Buffer=Buffer;exports.SlowBuffer=SlowBuffer;exports.INSPECT_MAX_BYTES=50;Buffer.TYPED_ARRAY_SUPPORT=global.TYPED_ARRAY_SUPPORT!==undefined?global.TYPED_ARRAY_SUPPORT:typedArraySupport();exports.kMaxLength=kMaxLength();function typedArraySupport(){try{var arr=new Uint8Array(1);arr.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}};return arr.foo()===42&&typeof arr.subarray==="function"&&arr.subarray(1,1).byteLength===0}catch(e){return false}}function kMaxLength(){return Buffer.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function createBuffer(that,length){if(kMaxLength()<length){throw new RangeError("Invalid typed array length")}if(Buffer.TYPED_ARRAY_SUPPORT){that=new Uint8Array(length);that.__proto__=Buffer.prototype}else{if(that===null){that=new Buffer(length)}that.length=length}return that}function Buffer(arg,encodingOrOffset,length){if(!Buffer.TYPED_ARRAY_SUPPORT&&!(this instanceof Buffer)){return new Buffer(arg,encodingOrOffset,length)}if(typeof arg==="number"){if(typeof encodingOrOffset==="string"){throw new Error("If encoding is specified then the first argument must be a string")}return allocUnsafe(this,arg)}return from(this,arg,encodingOrOffset,length)}Buffer.poolSize=8192;Buffer._augment=function(arr){arr.__proto__=Buffer.prototype;return arr};function from(that,value,encodingOrOffset,length){if(typeof value==="number"){throw new TypeError('"value" argument must not be a number')}if(typeof ArrayBuffer!=="undefined"&&value instanceof ArrayBuffer){return fromArrayBuffer(that,value,encodingOrOffset,length)}if(typeof value==="string"){return fromString(that,value,encodingOrOffset)}return fromObject(that,value)}Buffer.from=function(value,encodingOrOffset,length){return from(null,value,encodingOrOffset,length)};if(Buffer.TYPED_ARRAY_SUPPORT){Buffer.prototype.__proto__=Uint8Array.prototype;Buffer.__proto__=Uint8Array;if(typeof Symbol!=="undefined"&&Symbol.species&&Buffer[Symbol.species]===Buffer){Object.defineProperty(Buffer,Symbol.species,{value:null,configurable:true})}}function assertSize(size){if(typeof size!=="number"){throw new TypeError('"size" argument must be a number')}else if(size<0){throw new RangeError('"size" argument must not be negative')}}function alloc(that,size,fill,encoding){assertSize(size);if(size<=0){return createBuffer(that,size)}if(fill!==undefined){return typeof encoding==="string"?createBuffer(that,size).fill(fill,encoding):createBuffer(that,size).fill(fill)}return createBuffer(that,size)}Buffer.alloc=function(size,fill,encoding){return alloc(null,size,fill,encoding)};function allocUnsafe(that,size){assertSize(size);that=createBuffer(that,size<0?0:checked(size)|0);if(!Buffer.TYPED_ARRAY_SUPPORT){for(var i=0;i<size;++i){that[i]=0}}return that}Buffer.allocUnsafe=function(size){return allocUnsafe(null,size)};Buffer.allocUnsafeSlow=function(size){return allocUnsafe(null,size)};function fromString(that,string,encoding){if(typeof encoding!=="string"||encoding===""){encoding="utf8"}if(!Buffer.isEncoding(encoding)){throw new TypeError('"encoding" must be a valid string encoding')}var length=byteLength(string,encoding)|0;that=createBuffer(that,length);var actual=that.write(string,encoding);if(actual!==length){that=that.slice(0,actual)}return that}function fromArrayLike(that,array){var length=array.length<0?0:checked(array.length)|0;that=createBuffer(that,length);for(var i=0;i<length;i+=1){that[i]=array[i]&255}return that}function fromArrayBuffer(that,array,byteOffset,length){array.byteLength;if(byteOffset<0||array.byteLength<byteOffset){throw new RangeError("'offset' is out of bounds")}if(array.byteLength<byteOffset+(length||0)){throw new RangeError("'length' is out of bounds")}if(byteOffset===undefined&&length===undefined){array=new Uint8Array(array)}else if(length===undefined){array=new Uint8Array(array,byteOffset)}else{array=new Uint8Array(array,byteOffset,length)}if(Buffer.TYPED_ARRAY_SUPPORT){that=array;that.__proto__=Buffer.prototype}else{that=fromArrayLike(that,array)}return that}function fromObject(that,obj){if(Buffer.isBuffer(obj)){var len=checked(obj.length)|0;that=createBuffer(that,len);if(that.length===0){return that}obj.copy(that,0,0,len);return that}if(obj){if(typeof ArrayBuffer!=="undefined"&&obj.buffer instanceof ArrayBuffer||"length"in obj){if(typeof obj.length!=="number"||isnan(obj.length)){return createBuffer(that,0)}return fromArrayLike(that,obj)}if(obj.type==="Buffer"&&isArray(obj.data)){return fromArrayLike(that,obj.data)}}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")}function checked(length){if(length>=kMaxLength()){throw new RangeError("Attempt to allocate Buffer larger than maximum "+"size: 0x"+kMaxLength().toString(16)+" bytes")}return length|0}function SlowBuffer(length){if(+length!=length){length=0}return Buffer.alloc(+length)}Buffer.isBuffer=function isBuffer(b){return!!(b!=null&&b._isBuffer)};Buffer.compare=function compare(a,b){if(!Buffer.isBuffer(a)||!Buffer.isBuffer(b)){throw new TypeError("Arguments must be Buffers")}if(a===b)return 0;var x=a.length;var y=b.length;for(var i=0,len=Math.min(x,y);i<len;++i){if(a[i]!==b[i]){x=a[i];y=b[i];break}}if(x<y)return-1;if(y<x)return 1;return 0};Buffer.isEncoding=function isEncoding(encoding){switch(String(encoding).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"latin1":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return true;default:return false}};Buffer.concat=function concat(list,length){if(!isArray(list)){throw new TypeError('"list" argument must be an Array of Buffers')}if(list.length===0){return Buffer.alloc(0)}var i;if(length===undefined){length=0;for(i=0;i<list.length;++i){length+=list[i].length}}var buffer=Buffer.allocUnsafe(length);var pos=0;for(i=0;i<list.length;++i){var buf=list[i];if(!Buffer.isBuffer(buf)){throw new TypeError('"list" argument must be an Array of Buffers')}buf.copy(buffer,pos);pos+=buf.length}return buffer};function byteLength(string,encoding){if(Buffer.isBuffer(string)){return string.length}if(typeof ArrayBuffer!=="undefined"&&typeof ArrayBuffer.isView==="function"&&(ArrayBuffer.isView(string)||string instanceof ArrayBuffer)){return string.byteLength}if(typeof string!=="string"){string=""+string}var len=string.length;if(len===0)return 0;var loweredCase=false;for(;;){switch(encoding){case"ascii":case"latin1":case"binary":return len;case"utf8":case"utf-8":case undefined:return utf8ToBytes(string).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return len*2;case"hex":return len>>>1;case"base64":return base64ToBytes(string).length;default:if(loweredCase)return utf8ToBytes(string).length;encoding=(""+encoding).toLowerCase();loweredCase=true}}}Buffer.byteLength=byteLength;function slowToString(encoding,start,end){var loweredCase=false;if(start===undefined||start<0){start=0}if(start>this.length){return""}if(end===undefined||end>this.length){end=this.length}if(end<=0){return""}end>>>=0;start>>>=0;if(end<=start){return""}if(!encoding)encoding="utf8";while(true){switch(encoding){case"hex":return hexSlice(this,start,end);case"utf8":case"utf-8":return utf8Slice(this,start,end);case"ascii":return asciiSlice(this,start,end);case"latin1":case"binary":return latin1Slice(this,start,end);case"base64":return base64Slice(this,start,end);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return utf16leSlice(this,start,end);default:if(loweredCase)throw new TypeError("Unknown encoding: "+encoding);encoding=(encoding+"").toLowerCase();loweredCase=true}}}Buffer.prototype._isBuffer=true;function swap(b,n,m){var i=b[n];b[n]=b[m];b[m]=i}Buffer.prototype.swap16=function swap16(){var len=this.length;if(len%2!==0){throw new RangeError("Buffer size must be a multiple of 16-bits")}for(var i=0;i<len;i+=2){swap(this,i,i+1)}return this};Buffer.prototype.swap32=function swap32(){var len=this.length;if(len%4!==0){throw new RangeError("Buffer size must be a multiple of 32-bits")}for(var i=0;i<len;i+=4){swap(this,i,i+3);swap(this,i+1,i+2)}return this};Buffer.prototype.swap64=function swap64(){var len=this.length;if(len%8!==0){throw new RangeError("Buffer size must be a multiple of 64-bits")}for(var i=0;i<len;i+=8){swap(this,i,i+7);swap(this,i+1,i+6);swap(this,i+2,i+5);swap(this,i+3,i+4)}return this};Buffer.prototype.toString=function toString(){var length=this.length|0;if(length===0)return"";if(arguments.length===0)return utf8Slice(this,0,length);return slowToString.apply(this,arguments)};Buffer.prototype.equals=function equals(b){if(!Buffer.isBuffer(b))throw new TypeError("Argument must be a Buffer");if(this===b)return true;return Buffer.compare(this,b)===0};Buffer.prototype.inspect=function inspect(){var str="";var max=exports.INSPECT_MAX_BYTES;if(this.length>0){str=this.toString("hex",0,max).match(/.{2}/g).join(" ");if(this.length>max)str+=" ... "}return"<Buffer "+str+">"};Buffer.prototype.compare=function compare(target,start,end,thisStart,thisEnd){if(!Buffer.isBuffer(target)){throw new TypeError("Argument must be a Buffer")}if(start===undefined){start=0}if(end===undefined){end=target?target.length:0}if(thisStart===undefined){thisStart=0}if(thisEnd===undefined){thisEnd=this.length}if(start<0||end>target.length||thisStart<0||thisEnd>this.length){throw new RangeError("out of range index")}if(thisStart>=thisEnd&&start>=end){return 0}if(thisStart>=thisEnd){return-1}if(start>=end){return 1}start>>>=0;end>>>=0;thisStart>>>=0;thisEnd>>>=0;if(this===target)return 0;var x=thisEnd-thisStart;var y=end-start;var len=Math.min(x,y);var thisCopy=this.slice(thisStart,thisEnd);var targetCopy=target.slice(start,end);for(var i=0;i<len;++i){if(thisCopy[i]!==targetCopy[i]){x=thisCopy[i];y=targetCopy[i];break}}if(x<y)return-1;if(y<x)return 1;return 0};function bidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){if(buffer.length===0)return-1;if(typeof byteOffset==="string"){encoding=byteOffset;byteOffset=0}else if(byteOffset>2147483647){byteOffset=2147483647}else if(byteOffset<-2147483648){byteOffset=-2147483648}byteOffset=+byteOffset;if(isNaN(byteOffset)){byteOffset=dir?0:buffer.length-1}if(byteOffset<0)byteOffset=buffer.length+byteOffset;if(byteOffset>=buffer.length){if(dir)return-1;else byteOffset=buffer.length-1}else if(byteOffset<0){if(dir)byteOffset=0;else return-1}if(typeof val==="string"){val=Buffer.from(val,encoding)}if(Buffer.isBuffer(val)){if(val.length===0){return-1}return arrayIndexOf(buffer,val,byteOffset,encoding,dir)}else if(typeof val==="number"){val=val&255;if(Buffer.TYPED_ARRAY_SUPPORT&&typeof Uint8Array.prototype.indexOf==="function"){if(dir){return Uint8Array.prototype.indexOf.call(buffer,val,byteOffset)}else{return Uint8Array.prototype.lastIndexOf.call(buffer,val,byteOffset)}}return arrayIndexOf(buffer,[val],byteOffset,encoding,dir)}throw new TypeError("val must be string, number or Buffer")}function arrayIndexOf(arr,val,byteOffset,encoding,dir){var indexSize=1;var arrLength=arr.length;var valLength=val.length;if(encoding!==undefined){encoding=String(encoding).toLowerCase();if(encoding==="ucs2"||encoding==="ucs-2"||encoding==="utf16le"||encoding==="utf-16le"){if(arr.length<2||val.length<2){return-1}indexSize=2;arrLength/=2;valLength/=2;byteOffset/=2}}function read(buf,i){if(indexSize===1){return buf[i]}else{return buf.readUInt16BE(i*indexSize)}}var i;if(dir){var foundIndex=-1;for(i=byteOffset;i<arrLength;i++){if(read(arr,i)===read(val,foundIndex===-1?0:i-foundIndex)){if(foundIndex===-1)foundIndex=i;if(i-foundIndex+1===valLength)return foundIndex*indexSize}else{if(foundIndex!==-1)i-=i-foundIndex;foundIndex=-1}}}else{if(byteOffset+valLength>arrLength)byteOffset=arrLength-valLength;for(i=byteOffset;i>=0;i--){var found=true;for(var j=0;j<valLength;j++){if(read(arr,i+j)!==read(val,j)){found=false;break}}if(found)return i}}return-1}Buffer.prototype.includes=function includes(val,byteOffset,encoding){return this.indexOf(val,byteOffset,encoding)!==-1};Buffer.prototype.indexOf=function indexOf(val,byteOffset,encoding){return bidirectionalIndexOf(this,val,byteOffset,encoding,true)};Buffer.prototype.lastIndexOf=function lastIndexOf(val,byteOffset,encoding){return bidirectionalIndexOf(this,val,byteOffset,encoding,false)};function hexWrite(buf,string,offset,length){offset=Number(offset)||0;var remaining=buf.length-offset;if(!length){length=remaining}else{length=Number(length);if(length>remaining){length=remaining}}var strLen=string.length;if(strLen%2!==0)throw new TypeError("Invalid hex string");if(length>strLen/2){length=strLen/2}for(var i=0;i<length;++i){var parsed=parseInt(string.substr(i*2,2),16);if(isNaN(parsed))return i;buf[offset+i]=parsed}return i}function utf8Write(buf,string,offset,length){return blitBuffer(utf8ToBytes(string,buf.length-offset),buf,offset,length)}function asciiWrite(buf,string,offset,length){return blitBuffer(asciiToBytes(string),buf,offset,length)}function latin1Write(buf,string,offset,length){return asciiWrite(buf,string,offset,length)}function base64Write(buf,string,offset,length){return blitBuffer(base64ToBytes(string),buf,offset,length)}function ucs2Write(buf,string,offset,length){return blitBuffer(utf16leToBytes(string,buf.length-offset),buf,offset,length)}Buffer.prototype.write=function write(string,offset,length,encoding){if(offset===undefined){encoding="utf8";length=this.length;offset=0}else if(length===undefined&&typeof offset==="string"){encoding=offset;length=this.length;offset=0}else if(isFinite(offset)){offset=offset|0;if(isFinite(length)){length=length|0;if(encoding===undefined)encoding="utf8"}else{encoding=length;length=undefined}}else{throw new Error("Buffer.write(string, encoding, offset[, length]) is no longer supported")}var remaining=this.length-offset;if(length===undefined||length>remaining)length=remaining;if(string.length>0&&(length<0||offset<0)||offset>this.length){throw new RangeError("Attempt to write outside buffer bounds")}if(!encoding)encoding="utf8";var loweredCase=false;for(;;){switch(encoding){case"hex":return hexWrite(this,string,offset,length);case"utf8":case"utf-8":return utf8Write(this,string,offset,length);case"ascii":return asciiWrite(this,string,offset,length);case"latin1":case"binary":return latin1Write(this,string,offset,length);case"base64":return base64Write(this,string,offset,length);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return ucs2Write(this,string,offset,length);default:if(loweredCase)throw new TypeError("Unknown encoding: "+encoding);encoding=(""+encoding).toLowerCase();loweredCase=true}}};Buffer.prototype.toJSON=function toJSON(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};function base64Slice(buf,start,end){if(start===0&&end===buf.length){return base64.fromByteArray(buf)}else{return base64.fromByteArray(buf.slice(start,end))}}function utf8Slice(buf,start,end){end=Math.min(buf.length,end);var res=[];var i=start;while(i<end){var firstByte=buf[i];var codePoint=null;var bytesPerSequence=firstByte>239?4:firstByte>223?3:firstByte>191?2:1;if(i+bytesPerSequence<=end){var secondByte,thirdByte,fourthByte,tempCodePoint;switch(bytesPerSequence){case 1:if(firstByte<128){codePoint=firstByte}break;case 2:secondByte=buf[i+1];if((secondByte&192)===128){tempCodePoint=(firstByte&31)<<6|secondByte&63;if(tempCodePoint>127){codePoint=tempCodePoint}}break;case 3:secondByte=buf[i+1];thirdByte=buf[i+2];if((secondByte&192)===128&&(thirdByte&192)===128){tempCodePoint=(firstByte&15)<<12|(secondByte&63)<<6|thirdByte&63;if(tempCodePoint>2047&&(tempCodePoint<55296||tempCodePoint>57343)){codePoint=tempCodePoint}}break;case 4:secondByte=buf[i+1];thirdByte=buf[i+2];fourthByte=buf[i+3];if((secondByte&192)===128&&(thirdByte&192)===128&&(fourthByte&192)===128){tempCodePoint=(firstByte&15)<<18|(secondByte&63)<<12|(thirdByte&63)<<6|fourthByte&63;if(tempCodePoint>65535&&tempCodePoint<1114112){codePoint=tempCodePoint}}}}if(codePoint===null){codePoint=65533;bytesPerSequence=1}else if(codePoint>65535){codePoint-=65536;res.push(codePoint>>>10&1023|55296);codePoint=56320|codePoint&1023}res.push(codePoint);i+=bytesPerSequence}return decodeCodePointsArray(res)}var MAX_ARGUMENTS_LENGTH=4096;function decodeCodePointsArray(codePoints){var len=codePoints.length;if(len<=MAX_ARGUMENTS_LENGTH){return String.fromCharCode.apply(String,codePoints)}var res="";var i=0;while(i<len){res+=String.fromCharCode.apply(String,codePoints.slice(i,i+=MAX_ARGUMENTS_LENGTH))}return res}function asciiSlice(buf,start,end){var ret="";end=Math.min(buf.length,end);for(var i=start;i<end;++i){ret+=String.fromCharCode(buf[i]&127)}return ret}function latin1Slice(buf,start,end){var ret="";end=Math.min(buf.length,end);for(var i=start;i<end;++i){ret+=String.fromCharCode(buf[i])}return ret}function hexSlice(buf,start,end){var len=buf.length;if(!start||start<0)start=0;if(!end||end<0||end>len)end=len;var out="";for(var i=start;i<end;++i){out+=toHex(buf[i])}return out}function utf16leSlice(buf,start,end){var bytes=buf.slice(start,end);var res="";for(var i=0;i<bytes.length;i+=2){res+=String.fromCharCode(bytes[i]+bytes[i+1]*256)}return res}Buffer.prototype.slice=function slice(start,end){var len=this.length;start=~~start;end=end===undefined?len:~~end;if(start<0){start+=len;if(start<0)start=0}else if(start>len){start=len}if(end<0){end+=len;if(end<0)end=0}else if(end>len){end=len}if(end<start)end=start;var newBuf;if(Buffer.TYPED_ARRAY_SUPPORT){newBuf=this.subarray(start,end);newBuf.__proto__=Buffer.prototype}else{var sliceLen=end-start;newBuf=new Buffer(sliceLen,undefined);for(var i=0;i<sliceLen;++i){newBuf[i]=this[i+start]}}return newBuf};function checkOffset(offset,ext,length){if(offset%1!==0||offset<0)throw new RangeError("offset is not uint");if(offset+ext>length)throw new RangeError("Trying to access beyond buffer length")}Buffer.prototype.readUIntLE=function readUIntLE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);var val=this[offset];var mul=1;var i=0;while(++i<byteLength&&(mul*=256)){val+=this[offset+i]*mul}return val};Buffer.prototype.readUIntBE=function readUIntBE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert){checkOffset(offset,byteLength,this.length)}var val=this[offset+--byteLength];var mul=1;while(byteLength>0&&(mul*=256)){val+=this[offset+--byteLength]*mul}return val};Buffer.prototype.readUInt8=function readUInt8(offset,noAssert){if(!noAssert)checkOffset(offset,1,this.length);return this[offset]};Buffer.prototype.readUInt16LE=function readUInt16LE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);return this[offset]|this[offset+1]<<8};Buffer.prototype.readUInt16BE=function readUInt16BE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);return this[offset]<<8|this[offset+1]};Buffer.prototype.readUInt32LE=function readUInt32LE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return(this[offset]|this[offset+1]<<8|this[offset+2]<<16)+this[offset+3]*16777216};Buffer.prototype.readUInt32BE=function readUInt32BE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]*16777216+(this[offset+1]<<16|this[offset+2]<<8|this[offset+3])};Buffer.prototype.readIntLE=function readIntLE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);var val=this[offset];var mul=1;var i=0;while(++i<byteLength&&(mul*=256)){val+=this[offset+i]*mul}mul*=128;if(val>=mul)val-=Math.pow(2,8*byteLength);return val};Buffer.prototype.readIntBE=function readIntBE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);
+var i=byteLength;var mul=1;var val=this[offset+--i];while(i>0&&(mul*=256)){val+=this[offset+--i]*mul}mul*=128;if(val>=mul)val-=Math.pow(2,8*byteLength);return val};Buffer.prototype.readInt8=function readInt8(offset,noAssert){if(!noAssert)checkOffset(offset,1,this.length);if(!(this[offset]&128))return this[offset];return(255-this[offset]+1)*-1};Buffer.prototype.readInt16LE=function readInt16LE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);var val=this[offset]|this[offset+1]<<8;return val&32768?val|4294901760:val};Buffer.prototype.readInt16BE=function readInt16BE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);var val=this[offset+1]|this[offset]<<8;return val&32768?val|4294901760:val};Buffer.prototype.readInt32LE=function readInt32LE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]|this[offset+1]<<8|this[offset+2]<<16|this[offset+3]<<24};Buffer.prototype.readInt32BE=function readInt32BE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]<<24|this[offset+1]<<16|this[offset+2]<<8|this[offset+3]};Buffer.prototype.readFloatLE=function readFloatLE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return ieee754.read(this,offset,true,23,4)};Buffer.prototype.readFloatBE=function readFloatBE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return ieee754.read(this,offset,false,23,4)};Buffer.prototype.readDoubleLE=function readDoubleLE(offset,noAssert){if(!noAssert)checkOffset(offset,8,this.length);return ieee754.read(this,offset,true,52,8)};Buffer.prototype.readDoubleBE=function readDoubleBE(offset,noAssert){if(!noAssert)checkOffset(offset,8,this.length);return ieee754.read(this,offset,false,52,8)};function checkInt(buf,value,offset,ext,max,min){if(!Buffer.isBuffer(buf))throw new TypeError('"buffer" argument must be a Buffer instance');if(value>max||value<min)throw new RangeError('"value" argument is out of bounds');if(offset+ext>buf.length)throw new RangeError("Index out of range")}Buffer.prototype.writeUIntLE=function writeUIntLE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;byteLength=byteLength|0;if(!noAssert){var maxBytes=Math.pow(2,8*byteLength)-1;checkInt(this,value,offset,byteLength,maxBytes,0)}var mul=1;var i=0;this[offset]=value&255;while(++i<byteLength&&(mul*=256)){this[offset+i]=value/mul&255}return offset+byteLength};Buffer.prototype.writeUIntBE=function writeUIntBE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;byteLength=byteLength|0;if(!noAssert){var maxBytes=Math.pow(2,8*byteLength)-1;checkInt(this,value,offset,byteLength,maxBytes,0)}var i=byteLength-1;var mul=1;this[offset+i]=value&255;while(--i>=0&&(mul*=256)){this[offset+i]=value/mul&255}return offset+byteLength};Buffer.prototype.writeUInt8=function writeUInt8(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,1,255,0);if(!Buffer.TYPED_ARRAY_SUPPORT)value=Math.floor(value);this[offset]=value&255;return offset+1};function objectWriteUInt16(buf,value,offset,littleEndian){if(value<0)value=65535+value+1;for(var i=0,j=Math.min(buf.length-offset,2);i<j;++i){buf[offset+i]=(value&255<<8*(littleEndian?i:1-i))>>>(littleEndian?i:1-i)*8}}Buffer.prototype.writeUInt16LE=function writeUInt16LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,65535,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8}else{objectWriteUInt16(this,value,offset,true)}return offset+2};Buffer.prototype.writeUInt16BE=function writeUInt16BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,65535,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>8;this[offset+1]=value&255}else{objectWriteUInt16(this,value,offset,false)}return offset+2};function objectWriteUInt32(buf,value,offset,littleEndian){if(value<0)value=4294967295+value+1;for(var i=0,j=Math.min(buf.length-offset,4);i<j;++i){buf[offset+i]=value>>>(littleEndian?i:3-i)*8&255}}Buffer.prototype.writeUInt32LE=function writeUInt32LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,4294967295,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset+3]=value>>>24;this[offset+2]=value>>>16;this[offset+1]=value>>>8;this[offset]=value&255}else{objectWriteUInt32(this,value,offset,true)}return offset+4};Buffer.prototype.writeUInt32BE=function writeUInt32BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,4294967295,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>24;this[offset+1]=value>>>16;this[offset+2]=value>>>8;this[offset+3]=value&255}else{objectWriteUInt32(this,value,offset,false)}return offset+4};Buffer.prototype.writeIntLE=function writeIntLE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;if(!noAssert){var limit=Math.pow(2,8*byteLength-1);checkInt(this,value,offset,byteLength,limit-1,-limit)}var i=0;var mul=1;var sub=0;this[offset]=value&255;while(++i<byteLength&&(mul*=256)){if(value<0&&sub===0&&this[offset+i-1]!==0){sub=1}this[offset+i]=(value/mul>>0)-sub&255}return offset+byteLength};Buffer.prototype.writeIntBE=function writeIntBE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;if(!noAssert){var limit=Math.pow(2,8*byteLength-1);checkInt(this,value,offset,byteLength,limit-1,-limit)}var i=byteLength-1;var mul=1;var sub=0;this[offset+i]=value&255;while(--i>=0&&(mul*=256)){if(value<0&&sub===0&&this[offset+i+1]!==0){sub=1}this[offset+i]=(value/mul>>0)-sub&255}return offset+byteLength};Buffer.prototype.writeInt8=function writeInt8(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,1,127,-128);if(!Buffer.TYPED_ARRAY_SUPPORT)value=Math.floor(value);if(value<0)value=255+value+1;this[offset]=value&255;return offset+1};Buffer.prototype.writeInt16LE=function writeInt16LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,32767,-32768);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8}else{objectWriteUInt16(this,value,offset,true)}return offset+2};Buffer.prototype.writeInt16BE=function writeInt16BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,32767,-32768);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>8;this[offset+1]=value&255}else{objectWriteUInt16(this,value,offset,false)}return offset+2};Buffer.prototype.writeInt32LE=function writeInt32LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,2147483647,-2147483648);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8;this[offset+2]=value>>>16;this[offset+3]=value>>>24}else{objectWriteUInt32(this,value,offset,true)}return offset+4};Buffer.prototype.writeInt32BE=function writeInt32BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,2147483647,-2147483648);if(value<0)value=4294967295+value+1;if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>24;this[offset+1]=value>>>16;this[offset+2]=value>>>8;this[offset+3]=value&255}else{objectWriteUInt32(this,value,offset,false)}return offset+4};function checkIEEE754(buf,value,offset,ext,max,min){if(offset+ext>buf.length)throw new RangeError("Index out of range");if(offset<0)throw new RangeError("Index out of range")}function writeFloat(buf,value,offset,littleEndian,noAssert){if(!noAssert){checkIEEE754(buf,value,offset,4,3.4028234663852886e38,-3.4028234663852886e38)}ieee754.write(buf,value,offset,littleEndian,23,4);return offset+4}Buffer.prototype.writeFloatLE=function writeFloatLE(value,offset,noAssert){return writeFloat(this,value,offset,true,noAssert)};Buffer.prototype.writeFloatBE=function writeFloatBE(value,offset,noAssert){return writeFloat(this,value,offset,false,noAssert)};function writeDouble(buf,value,offset,littleEndian,noAssert){if(!noAssert){checkIEEE754(buf,value,offset,8,1.7976931348623157e308,-1.7976931348623157e308)}ieee754.write(buf,value,offset,littleEndian,52,8);return offset+8}Buffer.prototype.writeDoubleLE=function writeDoubleLE(value,offset,noAssert){return writeDouble(this,value,offset,true,noAssert)};Buffer.prototype.writeDoubleBE=function writeDoubleBE(value,offset,noAssert){return writeDouble(this,value,offset,false,noAssert)};Buffer.prototype.copy=function copy(target,targetStart,start,end){if(!start)start=0;if(!end&&end!==0)end=this.length;if(targetStart>=target.length)targetStart=target.length;if(!targetStart)targetStart=0;if(end>0&&end<start)end=start;if(end===start)return 0;if(target.length===0||this.length===0)return 0;if(targetStart<0){throw new RangeError("targetStart out of bounds")}if(start<0||start>=this.length)throw new RangeError("sourceStart out of bounds");if(end<0)throw new RangeError("sourceEnd out of bounds");if(end>this.length)end=this.length;if(target.length-targetStart<end-start){end=target.length-targetStart+start}var len=end-start;var i;if(this===target&&start<targetStart&&targetStart<end){for(i=len-1;i>=0;--i){target[i+targetStart]=this[i+start]}}else if(len<1e3||!Buffer.TYPED_ARRAY_SUPPORT){for(i=0;i<len;++i){target[i+targetStart]=this[i+start]}}else{Uint8Array.prototype.set.call(target,this.subarray(start,start+len),targetStart)}return len};Buffer.prototype.fill=function fill(val,start,end,encoding){if(typeof val==="string"){if(typeof start==="string"){encoding=start;start=0;end=this.length}else if(typeof end==="string"){encoding=end;end=this.length}if(val.length===1){var code=val.charCodeAt(0);if(code<256){val=code}}if(encoding!==undefined&&typeof encoding!=="string"){throw new TypeError("encoding must be a string")}if(typeof encoding==="string"&&!Buffer.isEncoding(encoding)){throw new TypeError("Unknown encoding: "+encoding)}}else if(typeof val==="number"){val=val&255}if(start<0||this.length<start||this.length<end){throw new RangeError("Out of range index")}if(end<=start){return this}start=start>>>0;end=end===undefined?this.length:end>>>0;if(!val)val=0;var i;if(typeof val==="number"){for(i=start;i<end;++i){this[i]=val}}else{var bytes=Buffer.isBuffer(val)?val:utf8ToBytes(new Buffer(val,encoding).toString());var len=bytes.length;for(i=0;i<end-start;++i){this[i+start]=bytes[i%len]}}return this};var INVALID_BASE64_RE=/[^+\/0-9A-Za-z-_]/g;function base64clean(str){str=stringtrim(str).replace(INVALID_BASE64_RE,"");if(str.length<2)return"";while(str.length%4!==0){str=str+"="}return str}function stringtrim(str){if(str.trim)return str.trim();return str.replace(/^\s+|\s+$/g,"")}function toHex(n){if(n<16)return"0"+n.toString(16);return n.toString(16)}function utf8ToBytes(string,units){units=units||Infinity;var codePoint;var length=string.length;var leadSurrogate=null;var bytes=[];for(var i=0;i<length;++i){codePoint=string.charCodeAt(i);if(codePoint>55295&&codePoint<57344){if(!leadSurrogate){if(codePoint>56319){if((units-=3)>-1)bytes.push(239,191,189);continue}else if(i+1===length){if((units-=3)>-1)bytes.push(239,191,189);continue}leadSurrogate=codePoint;continue}if(codePoint<56320){if((units-=3)>-1)bytes.push(239,191,189);leadSurrogate=codePoint;continue}codePoint=(leadSurrogate-55296<<10|codePoint-56320)+65536}else if(leadSurrogate){if((units-=3)>-1)bytes.push(239,191,189)}leadSurrogate=null;if(codePoint<128){if((units-=1)<0)break;bytes.push(codePoint)}else if(codePoint<2048){if((units-=2)<0)break;bytes.push(codePoint>>6|192,codePoint&63|128)}else if(codePoint<65536){if((units-=3)<0)break;bytes.push(codePoint>>12|224,codePoint>>6&63|128,codePoint&63|128)}else if(codePoint<1114112){if((units-=4)<0)break;bytes.push(codePoint>>18|240,codePoint>>12&63|128,codePoint>>6&63|128,codePoint&63|128)}else{throw new Error("Invalid code point")}}return bytes}function asciiToBytes(str){var byteArray=[];for(var i=0;i<str.length;++i){byteArray.push(str.charCodeAt(i)&255)}return byteArray}function utf16leToBytes(str,units){var c,hi,lo;var byteArray=[];for(var i=0;i<str.length;++i){if((units-=2)<0)break;c=str.charCodeAt(i);hi=c>>8;lo=c%256;byteArray.push(lo);byteArray.push(hi)}return byteArray}function base64ToBytes(str){return base64.toByteArray(base64clean(str))}function blitBuffer(src,dst,offset,length){for(var i=0;i<length;++i){if(i+offset>=dst.length||i>=src.length)break;dst[i+offset]=src[i]}return i}function isnan(val){return val!==val}}).call(this,typeof global!=="undefined"?global:typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{"base64-js":2,ieee754:37,isarray:40}],6:[function(require,module,exports){(function(Buffer){function isArray(arg){if(Array.isArray){return Array.isArray(arg)}return objectToString(arg)==="[object Array]"}exports.isArray=isArray;function isBoolean(arg){return typeof arg==="boolean"}exports.isBoolean=isBoolean;function isNull(arg){return arg===null}exports.isNull=isNull;function isNullOrUndefined(arg){return arg==null}exports.isNullOrUndefined=isNullOrUndefined;function isNumber(arg){return typeof arg==="number"}exports.isNumber=isNumber;function isString(arg){return typeof arg==="string"}exports.isString=isString;function isSymbol(arg){return typeof arg==="symbol"}exports.isSymbol=isSymbol;function isUndefined(arg){return arg===void 0}exports.isUndefined=isUndefined;function isRegExp(re){return objectToString(re)==="[object RegExp]"}exports.isRegExp=isRegExp;function isObject(arg){return typeof arg==="object"&&arg!==null}exports.isObject=isObject;function isDate(d){return objectToString(d)==="[object Date]"}exports.isDate=isDate;function isError(e){return objectToString(e)==="[object Error]"||e instanceof Error}exports.isError=isError;function isFunction(arg){return typeof arg==="function"}exports.isFunction=isFunction;function isPrimitive(arg){return arg===null||typeof arg==="boolean"||typeof arg==="number"||typeof arg==="string"||typeof arg==="symbol"||typeof arg==="undefined"}exports.isPrimitive=isPrimitive;exports.isBuffer=Buffer.isBuffer;function objectToString(o){return Object.prototype.toString.call(o)}}).call(this,{isBuffer:require("../../is-buffer/index.js")})},{"../../is-buffer/index.js":39}],7:[function(require,module,exports){var ElementType=require("domelementtype");var entities=require("entities");var booleanAttributes={__proto__:null,allowfullscreen:true,async:true,autofocus:true,autoplay:true,checked:true,controls:true,default:true,defer:true,disabled:true,hidden:true,ismap:true,loop:true,multiple:true,muted:true,open:true,readonly:true,required:true,reversed:true,scoped:true,seamless:true,selected:true,typemustmatch:true};var unencodedElements={__proto__:null,style:true,script:true,xmp:true,iframe:true,noembed:true,noframes:true,plaintext:true,noscript:true};function formatAttrs(attributes,opts){if(!attributes)return;var output="",value;for(var key in attributes){value=attributes[key];if(output){output+=" "}if(!value&&booleanAttributes[key]){output+=key}else{output+=key+'="'+(opts.decodeEntities?entities.encodeXML(value):value)+'"'}}return output}var singleTag={__proto__:null,area:true,base:true,basefont:true,br:true,col:true,command:true,embed:true,frame:true,hr:true,img:true,input:true,isindex:true,keygen:true,link:true,meta:true,param:true,source:true,track:true,wbr:true};var render=module.exports=function(dom,opts){if(!Array.isArray(dom)&&!dom.cheerio)dom=[dom];opts=opts||{};var output="";for(var i=0;i<dom.length;i++){var elem=dom[i];if(elem.type==="root")output+=render(elem.children,opts);else if(ElementType.isTag(elem))output+=renderTag(elem,opts);else if(elem.type===ElementType.Directive)output+=renderDirective(elem);else if(elem.type===ElementType.Comment)output+=renderComment(elem);else if(elem.type===ElementType.CDATA)output+=renderCdata(elem);else output+=renderText(elem,opts)}return output};function renderTag(elem,opts){if(elem.name==="svg")opts={decodeEntities:opts.decodeEntities,xmlMode:true};var tag="<"+elem.name,attribs=formatAttrs(elem.attribs,opts);if(attribs){tag+=" "+attribs}if(opts.xmlMode&&(!elem.children||elem.children.length===0)){tag+="/>"}else{tag+=">";if(elem.children){tag+=render(elem.children,opts)}if(!singleTag[elem.name]||opts.xmlMode){tag+="</"+elem.name+">"}}return tag}function renderDirective(elem){return"<"+elem.data+">"}function renderText(elem,opts){var data=elem.data||"";if(opts.decodeEntities&&!(elem.parent&&elem.parent.name in unencodedElements)){data=entities.encodeXML(data)}return data}function renderCdata(elem){return"<![CDATA["+elem.children[0].data+"]]>"}function renderComment(elem){return"<!--"+elem.data+"-->"}},{domelementtype:8,entities:20}],8:[function(require,module,exports){module.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",isTag:function(elem){return elem.type==="tag"||elem.type==="script"||elem.type==="style"}}},{}],9:[function(require,module,exports){module.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",Doctype:"doctype",isTag:function(elem){return elem.type==="tag"||elem.type==="script"||elem.type==="style"}}},{}],10:[function(require,module,exports){var ElementType=require("domelementtype");var re_whitespace=/\s+/g;var NodePrototype=require("./lib/node");var ElementPrototype=require("./lib/element");function DomHandler(callback,options,elementCB){if(typeof callback==="object"){elementCB=options;options=callback;callback=null}else if(typeof options==="function"){elementCB=options;options=defaultOpts}this._callback=callback;this._options=options||defaultOpts;this._elementCB=elementCB;this.dom=[];this._done=false;this._tagStack=[];this._parser=this._parser||null}var defaultOpts={normalizeWhitespace:false,withStartIndices:false};DomHandler.prototype.onparserinit=function(parser){this._parser=parser};DomHandler.prototype.onreset=function(){DomHandler.call(this,this._callback,this._options,this._elementCB)};DomHandler.prototype.onend=function(){if(this._done)return;this._done=true;this._parser=null;this._handleCallback(null)};DomHandler.prototype._handleCallback=DomHandler.prototype.onerror=function(error){if(typeof this._callback==="function"){this._callback(error,this.dom)}else{if(error)throw error}};DomHandler.prototype.onclosetag=function(){var elem=this._tagStack.pop();if(this._elementCB)this._elementCB(elem)};DomHandler.prototype._addDomElement=function(element){var parent=this._tagStack[this._tagStack.length-1];var siblings=parent?parent.children:this.dom;var previousSibling=siblings[siblings.length-1];element.next=null;if(this._options.withStartIndices){element.startIndex=this._parser.startIndex}if(this._options.withDomLvl1){element.__proto__=element.type==="tag"?ElementPrototype:NodePrototype}if(previousSibling){element.prev=previousSibling;previousSibling.next=element}else{element.prev=null}siblings.push(element);element.parent=parent||null};DomHandler.prototype.onopentag=function(name,attribs){var element={type:name==="script"?ElementType.Script:name==="style"?ElementType.Style:ElementType.Tag,name:name,attribs:attribs,children:[]};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.ontext=function(data){var normalize=this._options.normalizeWhitespace||this._options.ignoreWhitespace;var lastTag;if(!this._tagStack.length&&this.dom.length&&(lastTag=this.dom[this.dom.length-1]).type===ElementType.Text){if(normalize){lastTag.data=(lastTag.data+data).replace(re_whitespace," ")}else{lastTag.data+=data}}else{if(this._tagStack.length&&(lastTag=this._tagStack[this._tagStack.length-1])&&(lastTag=lastTag.children[lastTag.children.length-1])&&lastTag.type===ElementType.Text){if(normalize){lastTag.data=(lastTag.data+data).replace(re_whitespace," ")}else{lastTag.data+=data}}else{if(normalize){data=data.replace(re_whitespace," ")}this._addDomElement({data:data,type:ElementType.Text})}}};DomHandler.prototype.oncomment=function(data){var lastTag=this._tagStack[this._tagStack.length-1];if(lastTag&&lastTag.type===ElementType.Comment){lastTag.data+=data;return}var element={data:data,type:ElementType.Comment};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.oncdatastart=function(){var element={children:[{data:"",type:ElementType.Text}],type:ElementType.CDATA};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.oncommentend=DomHandler.prototype.oncdataend=function(){this._tagStack.pop()};DomHandler.prototype.onprocessinginstruction=function(name,data){this._addDomElement({name:name,data:data,type:ElementType.Directive})};module.exports=DomHandler},{"./lib/element":11,"./lib/node":12,domelementtype:9}],11:[function(require,module,exports){var NodePrototype=require("./node");var ElementPrototype=module.exports=Object.create(NodePrototype);var domLvl1={tagName:"name"};Object.keys(domLvl1).forEach(function(key){var shorthand=domLvl1[key];Object.defineProperty(ElementPrototype,key,{get:function(){return this[shorthand]||null},set:function(val){this[shorthand]=val;return val}})})},{"./node":12}],12:[function(require,module,exports){var NodePrototype=module.exports={get firstChild(){var children=this.children;return children&&children[0]||null},get lastChild(){var children=this.children;return children&&children[children.length-1]||null},get nodeType(){return nodeTypes[this.type]||nodeTypes.element}};var domLvl1={tagName:"name",childNodes:"children",parentNode:"parent",previousSibling:"prev",nextSibling:"next",nodeValue:"data"};var nodeTypes={element:1,text:3,cdata:4,comment:8};Object.keys(domLvl1).forEach(function(key){var shorthand=domLvl1[key];Object.defineProperty(NodePrototype,key,{get:function(){return this[shorthand]||null},set:function(val){this[shorthand]=val;return val}})})},{}],13:[function(require,module,exports){var DomUtils=module.exports;[require("./lib/stringify"),require("./lib/traversal"),require("./lib/manipulation"),require("./lib/querying"),require("./lib/legacy"),require("./lib/helpers")].forEach(function(ext){Object.keys(ext).forEach(function(key){DomUtils[key]=ext[key].bind(DomUtils)})})},{"./lib/helpers":14,"./lib/legacy":15,"./lib/manipulation":16,"./lib/querying":17,"./lib/stringify":18,"./lib/traversal":19}],14:[function(require,module,exports){exports.removeSubsets=function(nodes){var idx=nodes.length,node,ancestor,replace;while(--idx>-1){node=ancestor=nodes[idx];nodes[idx]=null;replace=true;while(ancestor){if(nodes.indexOf(ancestor)>-1){replace=false;nodes.splice(idx,1);break}ancestor=ancestor.parent}if(replace){nodes[idx]=node}}return nodes};var POSITION={DISCONNECTED:1,PRECEDING:2,FOLLOWING:4,CONTAINS:8,CONTAINED_BY:16};var comparePos=exports.compareDocumentPosition=function(nodeA,nodeB){var aParents=[];var bParents=[];var current,sharedParent,siblings,aSibling,bSibling,idx;if(nodeA===nodeB){return 0}current=nodeA;while(current){aParents.unshift(current);current=current.parent}current=nodeB;while(current){bParents.unshift(current);current=current.parent}idx=0;while(aParents[idx]===bParents[idx]){idx++}if(idx===0){return POSITION.DISCONNECTED}sharedParent=aParents[idx-1];siblings=sharedParent.children;aSibling=aParents[idx];bSibling=bParents[idx];if(siblings.indexOf(aSibling)>siblings.indexOf(bSibling)){if(sharedParent===nodeB){return POSITION.FOLLOWING|POSITION.CONTAINED_BY}return POSITION.FOLLOWING}else{if(sharedParent===nodeA){return POSITION.PRECEDING|POSITION.CONTAINS}return POSITION.PRECEDING}};exports.uniqueSort=function(nodes){var idx=nodes.length,node,position;nodes=nodes.slice();while(--idx>-1){node=nodes[idx];position=nodes.indexOf(node);if(position>-1&&position<idx){nodes.splice(idx,1)}}nodes.sort(function(a,b){var relative=comparePos(a,b);if(relative&POSITION.PRECEDING){return-1}else if(relative&POSITION.FOLLOWING){return 1}return 0});return nodes}},{}],15:[function(require,module,exports){var ElementType=require("domelementtype");var isTag=exports.isTag=ElementType.isTag;exports.testElement=function(options,element){for(var key in options){if(!options.hasOwnProperty(key));else if(key==="tag_name"){if(!isTag(element)||!options.tag_name(element.name)){return false}}else if(key==="tag_type"){if(!options.tag_type(element.type))return false}else if(key==="tag_contains"){if(isTag(element)||!options.tag_contains(element.data)){return false}}else if(!element.attribs||!options[key](element.attribs[key])){return false}}return true};var Checks={tag_name:function(name){if(typeof name==="function"){return function(elem){return isTag(elem)&&name(elem.name)}}else if(name==="*"){return isTag}else{return function(elem){return isTag(elem)&&elem.name===name}}},tag_type:function(type){if(typeof type==="function"){return function(elem){return type(elem.type)}}else{return function(elem){return elem.type===type}}},tag_contains:function(data){if(typeof data==="function"){return function(elem){return!isTag(elem)&&data(elem.data)}}else{return function(elem){return!isTag(elem)&&elem.data===data}}}};function getAttribCheck(attrib,value){if(typeof value==="function"){return function(elem){return elem.attribs&&value(elem.attribs[attrib])}}else{return function(elem){return elem.attribs&&elem.attribs[attrib]===value}}}function combineFuncs(a,b){return function(elem){return a(elem)||b(elem)}}exports.getElements=function(options,element,recurse,limit){var funcs=Object.keys(options).map(function(key){var value=options[key];return key in Checks?Checks[key](value):getAttribCheck(key,value)});return funcs.length===0?[]:this.filter(funcs.reduce(combineFuncs),element,recurse,limit)};exports.getElementById=function(id,element,recurse){if(!Array.isArray(element))element=[element];return this.findOne(getAttribCheck("id",id),element,recurse!==false)};exports.getElementsByTagName=function(name,element,recurse,limit){return this.filter(Checks.tag_name(name),element,recurse,limit)};exports.getElementsByTagType=function(type,element,recurse,limit){return this.filter(Checks.tag_type(type),element,recurse,limit)}},{domelementtype:9}],16:[function(require,module,exports){exports.removeElement=function(elem){if(elem.prev)elem.prev.next=elem.next;if(elem.next)elem.next.prev=elem.prev;if(elem.parent){var childs=elem.parent.children;childs.splice(childs.lastIndexOf(elem),1)}};exports.replaceElement=function(elem,replacement){var prev=replacement.prev=elem.prev;if(prev){prev.next=replacement}var next=replacement.next=elem.next;if(next){next.prev=replacement}var parent=replacement.parent=elem.parent;if(parent){var childs=parent.children;childs[childs.lastIndexOf(elem)]=replacement}};exports.appendChild=function(elem,child){child.parent=elem;if(elem.children.push(child)!==1){var sibling=elem.children[elem.children.length-2];sibling.next=child;child.prev=sibling;child.next=null}};exports.append=function(elem,next){var parent=elem.parent,currNext=elem.next;next.next=currNext;next.prev=elem;elem.next=next;next.parent=parent;if(currNext){currNext.prev=next;if(parent){var childs=parent.children;childs.splice(childs.lastIndexOf(currNext),0,next)}}else if(parent){parent.children.push(next)}};exports.prepend=function(elem,prev){var parent=elem.parent;if(parent){var childs=parent.children;childs.splice(childs.lastIndexOf(elem),0,prev)}if(elem.prev){elem.prev.next=prev}prev.parent=parent;prev.prev=elem.prev;prev.next=elem;elem.prev=prev}},{}],17:[function(require,module,exports){var isTag=require("domelementtype").isTag;module.exports={filter:filter,find:find,findOneChild:findOneChild,findOne:findOne,existsOne:existsOne,findAll:findAll};function filter(test,element,recurse,limit){if(!Array.isArray(element))element=[element];if(typeof limit!=="number"||!isFinite(limit)){limit=Infinity}return find(test,element,recurse!==false,limit)}function find(test,elems,recurse,limit){var result=[],childs;for(var i=0,j=elems.length;i<j;i++){if(test(elems[i])){result.push(elems[i]);if(--limit<=0)break}childs=elems[i].children;if(recurse&&childs&&childs.length>0){childs=find(test,childs,recurse,limit);result=result.concat(childs);limit-=childs.length;if(limit<=0)break}}return result}function findOneChild(test,elems){for(var i=0,l=elems.length;i<l;i++){if(test(elems[i]))return elems[i]}return null}function findOne(test,elems){var elem=null;for(var i=0,l=elems.length;i<l&&!elem;i++){if(!isTag(elems[i])){continue}else if(test(elems[i])){elem=elems[i]}else if(elems[i].children.length>0){elem=findOne(test,elems[i].children)}}return elem}function existsOne(test,elems){for(var i=0,l=elems.length;i<l;i++){if(isTag(elems[i])&&(test(elems[i])||elems[i].children.length>0&&existsOne(test,elems[i].children))){return true}}return false}function findAll(test,elems){var result=[];for(var i=0,j=elems.length;i<j;i++){if(!isTag(elems[i]))continue;if(test(elems[i]))result.push(elems[i]);if(elems[i].children.length>0){result=result.concat(findAll(test,elems[i].children))}}return result}},{domelementtype:9}],18:[function(require,module,exports){var ElementType=require("domelementtype"),getOuterHTML=require("dom-serializer"),isTag=ElementType.isTag;module.exports={getInnerHTML:getInnerHTML,getOuterHTML:getOuterHTML,getText:getText};function getInnerHTML(elem,opts){return elem.children?elem.children.map(function(elem){return getOuterHTML(elem,opts)}).join(""):""}function getText(elem){if(Array.isArray(elem))return elem.map(getText).join("");if(isTag(elem)||elem.type===ElementType.CDATA)return getText(elem.children);if(elem.type===ElementType.Text)return elem.data;return""}},{"dom-serializer":7,domelementtype:9}],19:[function(require,module,exports){var getChildren=exports.getChildren=function(elem){return elem.children};var getParent=exports.getParent=function(elem){return elem.parent};exports.getSiblings=function(elem){var parent=getParent(elem);return parent?getChildren(parent):[elem]};exports.getAttributeValue=function(elem,name){return elem.attribs&&elem.attribs[name]};exports.hasAttrib=function(elem,name){return!!elem.attribs&&hasOwnProperty.call(elem.attribs,name)};exports.getName=function(elem){return elem.name}},{}],20:[function(require,module,exports){var encode=require("./lib/encode.js"),decode=require("./lib/decode.js");exports.decode=function(data,level){return(!level||level<=0?decode.XML:decode.HTML)(data)};exports.decodeStrict=function(data,level){return(!level||level<=0?decode.XML:decode.HTMLStrict)(data)};exports.encode=function(data,level){return(!level||level<=0?encode.XML:encode.HTML)(data)};exports.encodeXML=encode.XML;exports.encodeHTML4=exports.encodeHTML5=exports.encodeHTML=encode.HTML;exports.decodeXML=exports.decodeXMLStrict=decode.XML;exports.decodeHTML4=exports.decodeHTML5=exports.decodeHTML=decode.HTML;exports.decodeHTML4Strict=exports.decodeHTML5Strict=exports.decodeHTMLStrict=decode.HTMLStrict;exports.escape=encode.escape},{"./lib/decode.js":21,"./lib/encode.js":23}],21:[function(require,module,exports){var entityMap=require("../maps/entities.json"),legacyMap=require("../maps/legacy.json"),xmlMap=require("../maps/xml.json"),decodeCodePoint=require("./decode_codepoint.js");var decodeXMLStrict=getStrictDecoder(xmlMap),decodeHTMLStrict=getStrictDecoder(entityMap);function getStrictDecoder(map){var keys=Object.keys(map).join("|"),replace=getReplacer(map);keys+="|#[xX][\\da-fA-F]+|#\\d+";var re=new RegExp("&(?:"+keys+");","g");return function(str){return String(str).replace(re,replace)}}var decodeHTML=function(){var legacy=Object.keys(legacyMap).sort(sorter);var keys=Object.keys(entityMap).sort(sorter);for(var i=0,j=0;i<keys.length;i++){if(legacy[j]===keys[i]){keys[i]+=";?";j++}else{keys[i]+=";"}}var re=new RegExp("&(?:"+keys.join("|")+"|#[xX][\\da-fA-F]+;?|#\\d+;?)","g"),replace=getReplacer(entityMap);function replacer(str){if(str.substr(-1)!==";")str+=";";return replace(str)}return function(str){return String(str).replace(re,replacer)}}();function sorter(a,b){return a<b?1:-1}function getReplacer(map){return function replace(str){if(str.charAt(1)==="#"){if(str.charAt(2)==="X"||str.charAt(2)==="x"){return decodeCodePoint(parseInt(str.substr(3),16))}return decodeCodePoint(parseInt(str.substr(2),10))}return map[str.slice(1,-1)];
+}}module.exports={XML:decodeXMLStrict,HTML:decodeHTML,HTMLStrict:decodeHTMLStrict}},{"../maps/entities.json":25,"../maps/legacy.json":26,"../maps/xml.json":27,"./decode_codepoint.js":22}],22:[function(require,module,exports){var decodeMap=require("../maps/decode.json");module.exports=decodeCodePoint;function decodeCodePoint(codePoint){if(codePoint>=55296&&codePoint<=57343||codePoint>1114111){return"�"}if(codePoint in decodeMap){codePoint=decodeMap[codePoint]}var output="";if(codePoint>65535){codePoint-=65536;output+=String.fromCharCode(codePoint>>>10&1023|55296);codePoint=56320|codePoint&1023}output+=String.fromCharCode(codePoint);return output}},{"../maps/decode.json":24}],23:[function(require,module,exports){var inverseXML=getInverseObj(require("../maps/xml.json")),xmlReplacer=getInverseReplacer(inverseXML);exports.XML=getInverse(inverseXML,xmlReplacer);var inverseHTML=getInverseObj(require("../maps/entities.json")),htmlReplacer=getInverseReplacer(inverseHTML);exports.HTML=getInverse(inverseHTML,htmlReplacer);function getInverseObj(obj){return Object.keys(obj).sort().reduce(function(inverse,name){inverse[obj[name]]="&"+name+";";return inverse},{})}function getInverseReplacer(inverse){var single=[],multiple=[];Object.keys(inverse).forEach(function(k){if(k.length===1){single.push("\\"+k)}else{multiple.push(k)}});multiple.unshift("["+single.join("")+"]");return new RegExp(multiple.join("|"),"g")}var re_nonASCII=/[^\0-\x7F]/g,re_astralSymbols=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g;function singleCharReplacer(c){return"&#x"+c.charCodeAt(0).toString(16).toUpperCase()+";"}function astralReplacer(c){var high=c.charCodeAt(0);var low=c.charCodeAt(1);var codePoint=(high-55296)*1024+low-56320+65536;return"&#x"+codePoint.toString(16).toUpperCase()+";"}function getInverse(inverse,re){function func(name){return inverse[name]}return function(data){return data.replace(re,func).replace(re_astralSymbols,astralReplacer).replace(re_nonASCII,singleCharReplacer)}}var re_xmlChars=getInverseReplacer(inverseXML);function escapeXML(data){return data.replace(re_xmlChars,singleCharReplacer).replace(re_astralSymbols,astralReplacer).replace(re_nonASCII,singleCharReplacer)}exports.escape=escapeXML},{"../maps/entities.json":25,"../maps/xml.json":27}],24:[function(require,module,exports){module.exports={0:65533,128:8364,130:8218,131:402,132:8222,133:8230,134:8224,135:8225,136:710,137:8240,138:352,139:8249,140:338,142:381,145:8216,146:8217,147:8220,148:8221,149:8226,150:8211,151:8212,152:732,153:8482,154:353,155:8250,156:339,158:382,159:376}},{}],25:[function(require,module,exports){module.exports={Aacute:"Á",aacute:"á",Abreve:"Ă",abreve:"ă",ac:"∾",acd:"∿",acE:"∾̳",Acirc:"Â",acirc:"â",acute:"´",Acy:"А",acy:"а",AElig:"Æ",aelig:"æ",af:"⁡",Afr:"𝔄",afr:"𝔞",Agrave:"À",agrave:"à",alefsym:"ℵ",aleph:"ℵ",Alpha:"Α",alpha:"α",Amacr:"Ā",amacr:"ā",amalg:"⨿",amp:"&",AMP:"&",andand:"⩕",And:"⩓",and:"∧",andd:"⩜",andslope:"⩘",andv:"⩚",ang:"∠",ange:"⦤",angle:"∠",angmsdaa:"⦨",angmsdab:"⦩",angmsdac:"⦪",angmsdad:"⦫",angmsdae:"⦬",angmsdaf:"⦭",angmsdag:"⦮",angmsdah:"⦯",angmsd:"∡",angrt:"∟",angrtvb:"⊾",angrtvbd:"⦝",angsph:"∢",angst:"Å",angzarr:"⍼",Aogon:"Ą",aogon:"ą",Aopf:"𝔸",aopf:"𝕒",apacir:"⩯",ap:"≈",apE:"⩰",ape:"≊",apid:"≋",apos:"'",ApplyFunction:"⁡",approx:"≈",approxeq:"≊",Aring:"Å",aring:"å",Ascr:"𝒜",ascr:"𝒶",Assign:"≔",ast:"*",asymp:"≈",asympeq:"≍",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",awconint:"∳",awint:"⨑",backcong:"≌",backepsilon:"϶",backprime:"‵",backsim:"∽",backsimeq:"⋍",Backslash:"∖",Barv:"⫧",barvee:"⊽",barwed:"⌅",Barwed:"⌆",barwedge:"⌅",bbrk:"⎵",bbrktbrk:"⎶",bcong:"≌",Bcy:"Б",bcy:"б",bdquo:"„",becaus:"∵",because:"∵",Because:"∵",bemptyv:"⦰",bepsi:"϶",bernou:"ℬ",Bernoullis:"ℬ",Beta:"Β",beta:"β",beth:"ℶ",between:"≬",Bfr:"𝔅",bfr:"𝔟",bigcap:"⋂",bigcirc:"◯",bigcup:"⋃",bigodot:"⨀",bigoplus:"⨁",bigotimes:"⨂",bigsqcup:"⨆",bigstar:"★",bigtriangledown:"▽",bigtriangleup:"△",biguplus:"⨄",bigvee:"⋁",bigwedge:"⋀",bkarow:"⤍",blacklozenge:"⧫",blacksquare:"▪",blacktriangle:"▴",blacktriangledown:"▾",blacktriangleleft:"◂",blacktriangleright:"▸",blank:"␣",blk12:"▒",blk14:"░",blk34:"▓",block:"█",bne:"=⃥",bnequiv:"≡⃥",bNot:"⫭",bnot:"⌐",Bopf:"𝔹",bopf:"𝕓",bot:"⊥",bottom:"⊥",bowtie:"⋈",boxbox:"⧉",boxdl:"┐",boxdL:"╕",boxDl:"╖",boxDL:"╗",boxdr:"┌",boxdR:"╒",boxDr:"╓",boxDR:"╔",boxh:"─",boxH:"═",boxhd:"┬",boxHd:"╤",boxhD:"╥",boxHD:"╦",boxhu:"┴",boxHu:"╧",boxhU:"╨",boxHU:"╩",boxminus:"⊟",boxplus:"⊞",boxtimes:"⊠",boxul:"┘",boxuL:"╛",boxUl:"╜",boxUL:"╝",boxur:"└",boxuR:"╘",boxUr:"╙",boxUR:"╚",boxv:"│",boxV:"║",boxvh:"┼",boxvH:"╪",boxVh:"╫",boxVH:"╬",boxvl:"┤",boxvL:"╡",boxVl:"╢",boxVL:"╣",boxvr:"├",boxvR:"╞",boxVr:"╟",boxVR:"╠",bprime:"‵",breve:"˘",Breve:"˘",brvbar:"¦",bscr:"𝒷",Bscr:"ℬ",bsemi:"⁏",bsim:"∽",bsime:"⋍",bsolb:"⧅",bsol:"\\",bsolhsub:"⟈",bull:"•",bullet:"•",bump:"≎",bumpE:"⪮",bumpe:"≏",Bumpeq:"≎",bumpeq:"≏",Cacute:"Ć",cacute:"ć",capand:"⩄",capbrcup:"⩉",capcap:"⩋",cap:"∩",Cap:"⋒",capcup:"⩇",capdot:"⩀",CapitalDifferentialD:"ⅅ",caps:"∩︀",caret:"⁁",caron:"ˇ",Cayleys:"ℭ",ccaps:"⩍",Ccaron:"Č",ccaron:"č",Ccedil:"Ç",ccedil:"ç",Ccirc:"Ĉ",ccirc:"ĉ",Cconint:"∰",ccups:"⩌",ccupssm:"⩐",Cdot:"Ċ",cdot:"ċ",cedil:"¸",Cedilla:"¸",cemptyv:"⦲",cent:"¢",centerdot:"·",CenterDot:"·",cfr:"𝔠",Cfr:"ℭ",CHcy:"Ч",chcy:"ч",check:"✓",checkmark:"✓",Chi:"Χ",chi:"χ",circ:"ˆ",circeq:"≗",circlearrowleft:"↺",circlearrowright:"↻",circledast:"⊛",circledcirc:"⊚",circleddash:"⊝",CircleDot:"⊙",circledR:"®",circledS:"Ⓢ",CircleMinus:"⊖",CirclePlus:"⊕",CircleTimes:"⊗",cir:"○",cirE:"⧃",cire:"≗",cirfnint:"⨐",cirmid:"⫯",cirscir:"⧂",ClockwiseContourIntegral:"∲",CloseCurlyDoubleQuote:"”",CloseCurlyQuote:"’",clubs:"♣",clubsuit:"♣",colon:":",Colon:"∷",Colone:"⩴",colone:"≔",coloneq:"≔",comma:",",commat:"@",comp:"∁",compfn:"∘",complement:"∁",complexes:"ℂ",cong:"≅",congdot:"⩭",Congruent:"≡",conint:"∮",Conint:"∯",ContourIntegral:"∮",copf:"𝕔",Copf:"ℂ",coprod:"∐",Coproduct:"∐",copy:"©",COPY:"©",copysr:"℗",CounterClockwiseContourIntegral:"∳",crarr:"↵",cross:"✗",Cross:"⨯",Cscr:"𝒞",cscr:"𝒸",csub:"⫏",csube:"⫑",csup:"⫐",csupe:"⫒",ctdot:"⋯",cudarrl:"⤸",cudarrr:"⤵",cuepr:"⋞",cuesc:"⋟",cularr:"↶",cularrp:"⤽",cupbrcap:"⩈",cupcap:"⩆",CupCap:"≍",cup:"∪",Cup:"⋓",cupcup:"⩊",cupdot:"⊍",cupor:"⩅",cups:"∪︀",curarr:"↷",curarrm:"⤼",curlyeqprec:"⋞",curlyeqsucc:"⋟",curlyvee:"⋎",curlywedge:"⋏",curren:"¤",curvearrowleft:"↶",curvearrowright:"↷",cuvee:"⋎",cuwed:"⋏",cwconint:"∲",cwint:"∱",cylcty:"⌭",dagger:"†",Dagger:"‡",daleth:"ℸ",darr:"↓",Darr:"↡",dArr:"⇓",dash:"‐",Dashv:"⫤",dashv:"⊣",dbkarow:"⤏",dblac:"˝",Dcaron:"Ď",dcaron:"ď",Dcy:"Д",dcy:"д",ddagger:"‡",ddarr:"⇊",DD:"ⅅ",dd:"ⅆ",DDotrahd:"⤑",ddotseq:"⩷",deg:"°",Del:"∇",Delta:"Δ",delta:"δ",demptyv:"⦱",dfisht:"⥿",Dfr:"𝔇",dfr:"𝔡",dHar:"⥥",dharl:"⇃",dharr:"⇂",DiacriticalAcute:"´",DiacriticalDot:"˙",DiacriticalDoubleAcute:"˝",DiacriticalGrave:"`",DiacriticalTilde:"˜",diam:"⋄",diamond:"⋄",Diamond:"⋄",diamondsuit:"♦",diams:"♦",die:"¨",DifferentialD:"ⅆ",digamma:"ϝ",disin:"⋲",div:"÷",divide:"÷",divideontimes:"⋇",divonx:"⋇",DJcy:"Ђ",djcy:"ђ",dlcorn:"⌞",dlcrop:"⌍",dollar:"$",Dopf:"𝔻",dopf:"𝕕",Dot:"¨",dot:"˙",DotDot:"⃜",doteq:"≐",doteqdot:"≑",DotEqual:"≐",dotminus:"∸",dotplus:"∔",dotsquare:"⊡",doublebarwedge:"⌆",DoubleContourIntegral:"∯",DoubleDot:"¨",DoubleDownArrow:"⇓",DoubleLeftArrow:"⇐",DoubleLeftRightArrow:"⇔",DoubleLeftTee:"⫤",DoubleLongLeftArrow:"⟸",DoubleLongLeftRightArrow:"⟺",DoubleLongRightArrow:"⟹",DoubleRightArrow:"⇒",DoubleRightTee:"⊨",DoubleUpArrow:"⇑",DoubleUpDownArrow:"⇕",DoubleVerticalBar:"∥",DownArrowBar:"⤓",downarrow:"↓",DownArrow:"↓",Downarrow:"⇓",DownArrowUpArrow:"⇵",DownBreve:"̑",downdownarrows:"⇊",downharpoonleft:"⇃",downharpoonright:"⇂",DownLeftRightVector:"⥐",DownLeftTeeVector:"⥞",DownLeftVectorBar:"⥖",DownLeftVector:"↽",DownRightTeeVector:"⥟",DownRightVectorBar:"⥗",DownRightVector:"⇁",DownTeeArrow:"↧",DownTee:"⊤",drbkarow:"⤐",drcorn:"⌟",drcrop:"⌌",Dscr:"𝒟",dscr:"𝒹",DScy:"Ѕ",dscy:"ѕ",dsol:"⧶",Dstrok:"Đ",dstrok:"đ",dtdot:"⋱",dtri:"▿",dtrif:"▾",duarr:"⇵",duhar:"⥯",dwangle:"⦦",DZcy:"Џ",dzcy:"џ",dzigrarr:"⟿",Eacute:"É",eacute:"é",easter:"⩮",Ecaron:"Ě",ecaron:"ě",Ecirc:"Ê",ecirc:"ê",ecir:"≖",ecolon:"≕",Ecy:"Э",ecy:"э",eDDot:"⩷",Edot:"Ė",edot:"ė",eDot:"≑",ee:"ⅇ",efDot:"≒",Efr:"𝔈",efr:"𝔢",eg:"⪚",Egrave:"È",egrave:"è",egs:"⪖",egsdot:"⪘",el:"⪙",Element:"∈",elinters:"⏧",ell:"ℓ",els:"⪕",elsdot:"⪗",Emacr:"Ē",emacr:"ē",empty:"∅",emptyset:"∅",EmptySmallSquare:"◻",emptyv:"∅",EmptyVerySmallSquare:"▫",emsp13:" ",emsp14:" ",emsp:" ",ENG:"Ŋ",eng:"ŋ",ensp:" ",Eogon:"Ę",eogon:"ę",Eopf:"𝔼",eopf:"𝕖",epar:"⋕",eparsl:"⧣",eplus:"⩱",epsi:"ε",Epsilon:"Ε",epsilon:"ε",epsiv:"ϵ",eqcirc:"≖",eqcolon:"≕",eqsim:"≂",eqslantgtr:"⪖",eqslantless:"⪕",Equal:"⩵",equals:"=",EqualTilde:"≂",equest:"≟",Equilibrium:"⇌",equiv:"≡",equivDD:"⩸",eqvparsl:"⧥",erarr:"⥱",erDot:"≓",escr:"ℯ",Escr:"ℰ",esdot:"≐",Esim:"⩳",esim:"≂",Eta:"Η",eta:"η",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",euro:"€",excl:"!",exist:"∃",Exists:"∃",expectation:"ℰ",exponentiale:"ⅇ",ExponentialE:"ⅇ",fallingdotseq:"≒",Fcy:"Ф",fcy:"ф",female:"♀",ffilig:"ffi",fflig:"ff",ffllig:"ffl",Ffr:"𝔉",ffr:"𝔣",filig:"fi",FilledSmallSquare:"◼",FilledVerySmallSquare:"▪",fjlig:"fj",flat:"♭",fllig:"fl",fltns:"▱",fnof:"ƒ",Fopf:"𝔽",fopf:"𝕗",forall:"∀",ForAll:"∀",fork:"⋔",forkv:"⫙",Fouriertrf:"ℱ",fpartint:"⨍",frac12:"½",frac13:"⅓",frac14:"¼",frac15:"⅕",frac16:"⅙",frac18:"⅛",frac23:"⅔",frac25:"⅖",frac34:"¾",frac35:"⅗",frac38:"⅜",frac45:"⅘",frac56:"⅚",frac58:"⅝",frac78:"⅞",frasl:"⁄",frown:"⌢",fscr:"𝒻",Fscr:"ℱ",gacute:"ǵ",Gamma:"Γ",gamma:"γ",Gammad:"Ϝ",gammad:"ϝ",gap:"⪆",Gbreve:"Ğ",gbreve:"ğ",Gcedil:"Ģ",Gcirc:"Ĝ",gcirc:"ĝ",Gcy:"Г",gcy:"г",Gdot:"Ġ",gdot:"ġ",ge:"≥",gE:"≧",gEl:"⪌",gel:"⋛",geq:"≥",geqq:"≧",geqslant:"⩾",gescc:"⪩",ges:"⩾",gesdot:"⪀",gesdoto:"⪂",gesdotol:"⪄",gesl:"⋛︀",gesles:"⪔",Gfr:"𝔊",gfr:"𝔤",gg:"≫",Gg:"⋙",ggg:"⋙",gimel:"ℷ",GJcy:"Ѓ",gjcy:"ѓ",gla:"⪥",gl:"≷",glE:"⪒",glj:"⪤",gnap:"⪊",gnapprox:"⪊",gne:"⪈",gnE:"≩",gneq:"⪈",gneqq:"≩",gnsim:"⋧",Gopf:"𝔾",gopf:"𝕘",grave:"`",GreaterEqual:"≥",GreaterEqualLess:"⋛",GreaterFullEqual:"≧",GreaterGreater:"⪢",GreaterLess:"≷",GreaterSlantEqual:"⩾",GreaterTilde:"≳",Gscr:"𝒢",gscr:"ℊ",gsim:"≳",gsime:"⪎",gsiml:"⪐",gtcc:"⪧",gtcir:"⩺",gt:">",GT:">",Gt:"≫",gtdot:"⋗",gtlPar:"⦕",gtquest:"⩼",gtrapprox:"⪆",gtrarr:"⥸",gtrdot:"⋗",gtreqless:"⋛",gtreqqless:"⪌",gtrless:"≷",gtrsim:"≳",gvertneqq:"≩︀",gvnE:"≩︀",Hacek:"ˇ",hairsp:" ",half:"½",hamilt:"ℋ",HARDcy:"Ъ",hardcy:"ъ",harrcir:"⥈",harr:"↔",hArr:"⇔",harrw:"↭",Hat:"^",hbar:"ℏ",Hcirc:"Ĥ",hcirc:"ĥ",hearts:"♥",heartsuit:"♥",hellip:"…",hercon:"⊹",hfr:"𝔥",Hfr:"ℌ",HilbertSpace:"ℋ",hksearow:"⤥",hkswarow:"⤦",hoarr:"⇿",homtht:"∻",hookleftarrow:"↩",hookrightarrow:"↪",hopf:"𝕙",Hopf:"ℍ",horbar:"―",HorizontalLine:"─",hscr:"𝒽",Hscr:"ℋ",hslash:"ℏ",Hstrok:"Ħ",hstrok:"ħ",HumpDownHump:"≎",HumpEqual:"≏",hybull:"⁃",hyphen:"‐",Iacute:"Í",iacute:"í",ic:"⁣",Icirc:"Î",icirc:"î",Icy:"И",icy:"и",Idot:"İ",IEcy:"Е",iecy:"е",iexcl:"¡",iff:"⇔",ifr:"𝔦",Ifr:"ℑ",Igrave:"Ì",igrave:"ì",ii:"ⅈ",iiiint:"⨌",iiint:"∭",iinfin:"⧜",iiota:"℩",IJlig:"IJ",ijlig:"ij",Imacr:"Ī",imacr:"ī",image:"ℑ",ImaginaryI:"ⅈ",imagline:"ℐ",imagpart:"ℑ",imath:"ı",Im:"ℑ",imof:"⊷",imped:"Ƶ",Implies:"⇒",incare:"℅",in:"∈",infin:"∞",infintie:"⧝",inodot:"ı",intcal:"⊺",int:"∫",Int:"∬",integers:"ℤ",Integral:"∫",intercal:"⊺",Intersection:"⋂",intlarhk:"⨗",intprod:"⨼",InvisibleComma:"⁣",InvisibleTimes:"⁢",IOcy:"Ё",iocy:"ё",Iogon:"Į",iogon:"į",Iopf:"𝕀",iopf:"𝕚",Iota:"Ι",iota:"ι",iprod:"⨼",iquest:"¿",iscr:"𝒾",Iscr:"ℐ",isin:"∈",isindot:"⋵",isinE:"⋹",isins:"⋴",isinsv:"⋳",isinv:"∈",it:"⁢",Itilde:"Ĩ",itilde:"ĩ",Iukcy:"І",iukcy:"і",Iuml:"Ï",iuml:"ï",Jcirc:"Ĵ",jcirc:"ĵ",Jcy:"Й",jcy:"й",Jfr:"𝔍",jfr:"𝔧",jmath:"ȷ",Jopf:"𝕁",jopf:"𝕛",Jscr:"𝒥",jscr:"𝒿",Jsercy:"Ј",jsercy:"ј",Jukcy:"Є",jukcy:"є",Kappa:"Κ",kappa:"κ",kappav:"ϰ",Kcedil:"Ķ",kcedil:"ķ",Kcy:"К",kcy:"к",Kfr:"𝔎",kfr:"𝔨",kgreen:"ĸ",KHcy:"Х",khcy:"х",KJcy:"Ќ",kjcy:"ќ",Kopf:"𝕂",kopf:"𝕜",Kscr:"𝒦",kscr:"𝓀",lAarr:"⇚",Lacute:"Ĺ",lacute:"ĺ",laemptyv:"⦴",lagran:"ℒ",Lambda:"Λ",lambda:"λ",lang:"⟨",Lang:"⟪",langd:"⦑",langle:"⟨",lap:"⪅",Laplacetrf:"ℒ",laquo:"«",larrb:"⇤",larrbfs:"⤟",larr:"←",Larr:"↞",lArr:"⇐",larrfs:"⤝",larrhk:"↩",larrlp:"↫",larrpl:"⤹",larrsim:"⥳",larrtl:"↢",latail:"⤙",lAtail:"⤛",lat:"⪫",late:"⪭",lates:"⪭︀",lbarr:"⤌",lBarr:"⤎",lbbrk:"❲",lbrace:"{",lbrack:"[",lbrke:"⦋",lbrksld:"⦏",lbrkslu:"⦍",Lcaron:"Ľ",lcaron:"ľ",Lcedil:"Ļ",lcedil:"ļ",lceil:"⌈",lcub:"{",Lcy:"Л",lcy:"л",ldca:"⤶",ldquo:"“",ldquor:"„",ldrdhar:"⥧",ldrushar:"⥋",ldsh:"↲",le:"≤",lE:"≦",LeftAngleBracket:"⟨",LeftArrowBar:"⇤",leftarrow:"←",LeftArrow:"←",Leftarrow:"⇐",LeftArrowRightArrow:"⇆",leftarrowtail:"↢",LeftCeiling:"⌈",LeftDoubleBracket:"⟦",LeftDownTeeVector:"⥡",LeftDownVectorBar:"⥙",LeftDownVector:"⇃",LeftFloor:"⌊",leftharpoondown:"↽",leftharpoonup:"↼",leftleftarrows:"⇇",leftrightarrow:"↔",LeftRightArrow:"↔",Leftrightarrow:"⇔",leftrightarrows:"⇆",leftrightharpoons:"⇋",leftrightsquigarrow:"↭",LeftRightVector:"⥎",LeftTeeArrow:"↤",LeftTee:"⊣",LeftTeeVector:"⥚",leftthreetimes:"⋋",LeftTriangleBar:"⧏",LeftTriangle:"⊲",LeftTriangleEqual:"⊴",LeftUpDownVector:"⥑",LeftUpTeeVector:"⥠",LeftUpVectorBar:"⥘",LeftUpVector:"↿",LeftVectorBar:"⥒",LeftVector:"↼",lEg:"⪋",leg:"⋚",leq:"≤",leqq:"≦",leqslant:"⩽",lescc:"⪨",les:"⩽",lesdot:"⩿",lesdoto:"⪁",lesdotor:"⪃",lesg:"⋚︀",lesges:"⪓",lessapprox:"⪅",lessdot:"⋖",lesseqgtr:"⋚",lesseqqgtr:"⪋",LessEqualGreater:"⋚",LessFullEqual:"≦",LessGreater:"≶",lessgtr:"≶",LessLess:"⪡",lesssim:"≲",LessSlantEqual:"⩽",LessTilde:"≲",lfisht:"⥼",lfloor:"⌊",Lfr:"𝔏",lfr:"𝔩",lg:"≶",lgE:"⪑",lHar:"⥢",lhard:"↽",lharu:"↼",lharul:"⥪",lhblk:"▄",LJcy:"Љ",ljcy:"љ",llarr:"⇇",ll:"≪",Ll:"⋘",llcorner:"⌞",Lleftarrow:"⇚",llhard:"⥫",lltri:"◺",Lmidot:"Ŀ",lmidot:"ŀ",lmoustache:"⎰",lmoust:"⎰",lnap:"⪉",lnapprox:"⪉",lne:"⪇",lnE:"≨",lneq:"⪇",lneqq:"≨",lnsim:"⋦",loang:"⟬",loarr:"⇽",lobrk:"⟦",longleftarrow:"⟵",LongLeftArrow:"⟵",Longleftarrow:"⟸",longleftrightarrow:"⟷",LongLeftRightArrow:"⟷",Longleftrightarrow:"⟺",longmapsto:"⟼",longrightarrow:"⟶",LongRightArrow:"⟶",Longrightarrow:"⟹",looparrowleft:"↫",looparrowright:"↬",lopar:"⦅",Lopf:"𝕃",lopf:"𝕝",loplus:"⨭",lotimes:"⨴",lowast:"∗",lowbar:"_",LowerLeftArrow:"↙",LowerRightArrow:"↘",loz:"◊",lozenge:"◊",lozf:"⧫",lpar:"(",lparlt:"⦓",lrarr:"⇆",lrcorner:"⌟",lrhar:"⇋",lrhard:"⥭",lrm:"‎",lrtri:"⊿",lsaquo:"‹",lscr:"𝓁",Lscr:"ℒ",lsh:"↰",Lsh:"↰",lsim:"≲",lsime:"⪍",lsimg:"⪏",lsqb:"[",lsquo:"‘",lsquor:"‚",Lstrok:"Ł",lstrok:"ł",ltcc:"⪦",ltcir:"⩹",lt:"<",LT:"<",Lt:"≪",ltdot:"⋖",lthree:"⋋",ltimes:"⋉",ltlarr:"⥶",ltquest:"⩻",ltri:"◃",ltrie:"⊴",ltrif:"◂",ltrPar:"⦖",lurdshar:"⥊",luruhar:"⥦",lvertneqq:"≨︀",lvnE:"≨︀",macr:"¯",male:"♂",malt:"✠",maltese:"✠",Map:"⤅",map:"↦",mapsto:"↦",mapstodown:"↧",mapstoleft:"↤",mapstoup:"↥",marker:"▮",mcomma:"⨩",Mcy:"М",mcy:"м",mdash:"—",mDDot:"∺",measuredangle:"∡",MediumSpace:" ",Mellintrf:"ℳ",Mfr:"𝔐",mfr:"𝔪",mho:"℧",micro:"µ",midast:"*",midcir:"⫰",mid:"∣",middot:"·",minusb:"⊟",minus:"−",minusd:"∸",minusdu:"⨪",MinusPlus:"∓",mlcp:"⫛",mldr:"…",mnplus:"∓",models:"⊧",Mopf:"𝕄",mopf:"𝕞",mp:"∓",mscr:"𝓂",Mscr:"ℳ",mstpos:"∾",Mu:"Μ",mu:"μ",multimap:"⊸",mumap:"⊸",nabla:"∇",Nacute:"Ń",nacute:"ń",nang:"∠⃒",nap:"≉",napE:"⩰̸",napid:"≋̸",napos:"ʼn",napprox:"≉",natural:"♮",naturals:"ℕ",natur:"♮",nbsp:" ",nbump:"≎̸",nbumpe:"≏̸",ncap:"⩃",Ncaron:"Ň",ncaron:"ň",Ncedil:"Ņ",ncedil:"ņ",ncong:"≇",ncongdot:"⩭̸",ncup:"⩂",Ncy:"Н",ncy:"н",ndash:"–",nearhk:"⤤",nearr:"↗",neArr:"⇗",nearrow:"↗",ne:"≠",nedot:"≐̸",NegativeMediumSpace:"​",NegativeThickSpace:"​",NegativeThinSpace:"​",NegativeVeryThinSpace:"​",nequiv:"≢",nesear:"⤨",nesim:"≂̸",NestedGreaterGreater:"≫",NestedLessLess:"≪",NewLine:"\n",nexist:"∄",nexists:"∄",Nfr:"𝔑",nfr:"𝔫",ngE:"≧̸",nge:"≱",ngeq:"≱",ngeqq:"≧̸",ngeqslant:"⩾̸",nges:"⩾̸",nGg:"⋙̸",ngsim:"≵",nGt:"≫⃒",ngt:"≯",ngtr:"≯",nGtv:"≫̸",nharr:"↮",nhArr:"⇎",nhpar:"⫲",ni:"∋",nis:"⋼",nisd:"⋺",niv:"∋",NJcy:"Њ",njcy:"њ",nlarr:"↚",nlArr:"⇍",nldr:"‥",nlE:"≦̸",nle:"≰",nleftarrow:"↚",nLeftarrow:"⇍",nleftrightarrow:"↮",nLeftrightarrow:"⇎",nleq:"≰",nleqq:"≦̸",nleqslant:"⩽̸",nles:"⩽̸",nless:"≮",nLl:"⋘̸",nlsim:"≴",nLt:"≪⃒",nlt:"≮",nltri:"⋪",nltrie:"⋬",nLtv:"≪̸",nmid:"∤",NoBreak:"⁠",NonBreakingSpace:" ",nopf:"𝕟",Nopf:"ℕ",Not:"⫬",not:"¬",NotCongruent:"≢",NotCupCap:"≭",NotDoubleVerticalBar:"∦",NotElement:"∉",NotEqual:"≠",NotEqualTilde:"≂̸",NotExists:"∄",NotGreater:"≯",NotGreaterEqual:"≱",NotGreaterFullEqual:"≧̸",NotGreaterGreater:"≫̸",NotGreaterLess:"≹",NotGreaterSlantEqual:"⩾̸",NotGreaterTilde:"≵",NotHumpDownHump:"≎̸",NotHumpEqual:"≏̸",notin:"∉",notindot:"⋵̸",notinE:"⋹̸",notinva:"∉",notinvb:"⋷",notinvc:"⋶",NotLeftTriangleBar:"⧏̸",NotLeftTriangle:"⋪",NotLeftTriangleEqual:"⋬",NotLess:"≮",NotLessEqual:"≰",NotLessGreater:"≸",NotLessLess:"≪̸",NotLessSlantEqual:"⩽̸",NotLessTilde:"≴",NotNestedGreaterGreater:"⪢̸",NotNestedLessLess:"⪡̸",notni:"∌",notniva:"∌",notnivb:"⋾",notnivc:"⋽",NotPrecedes:"⊀",NotPrecedesEqual:"⪯̸",NotPrecedesSlantEqual:"⋠",NotReverseElement:"∌",NotRightTriangleBar:"⧐̸",NotRightTriangle:"⋫",NotRightTriangleEqual:"⋭",NotSquareSubset:"⊏̸",NotSquareSubsetEqual:"⋢",NotSquareSuperset:"⊐̸",NotSquareSupersetEqual:"⋣",NotSubset:"⊂⃒",NotSubsetEqual:"⊈",NotSucceeds:"⊁",NotSucceedsEqual:"⪰̸",NotSucceedsSlantEqual:"⋡",NotSucceedsTilde:"≿̸",NotSuperset:"⊃⃒",NotSupersetEqual:"⊉",NotTilde:"≁",NotTildeEqual:"≄",NotTildeFullEqual:"≇",NotTildeTilde:"≉",NotVerticalBar:"∤",nparallel:"∦",npar:"∦",nparsl:"⫽⃥",npart:"∂̸",npolint:"⨔",npr:"⊀",nprcue:"⋠",nprec:"⊀",npreceq:"⪯̸",npre:"⪯̸",nrarrc:"⤳̸",nrarr:"↛",nrArr:"⇏",nrarrw:"↝̸",nrightarrow:"↛",nRightarrow:"⇏",nrtri:"⋫",nrtrie:"⋭",nsc:"⊁",nsccue:"⋡",nsce:"⪰̸",Nscr:"𝒩",nscr:"𝓃",nshortmid:"∤",nshortparallel:"∦",nsim:"≁",nsime:"≄",nsimeq:"≄",nsmid:"∤",nspar:"∦",nsqsube:"⋢",nsqsupe:"⋣",nsub:"⊄",nsubE:"⫅̸",nsube:"⊈",nsubset:"⊂⃒",nsubseteq:"⊈",nsubseteqq:"⫅̸",nsucc:"⊁",nsucceq:"⪰̸",nsup:"⊅",nsupE:"⫆̸",nsupe:"⊉",nsupset:"⊃⃒",nsupseteq:"⊉",nsupseteqq:"⫆̸",ntgl:"≹",Ntilde:"Ñ",ntilde:"ñ",ntlg:"≸",ntriangleleft:"⋪",ntrianglelefteq:"⋬",ntriangleright:"⋫",ntrianglerighteq:"⋭",Nu:"Ν",nu:"ν",num:"#",numero:"№",numsp:" ",nvap:"≍⃒",nvdash:"⊬",nvDash:"⊭",nVdash:"⊮",nVDash:"⊯",nvge:"≥⃒",nvgt:">⃒",nvHarr:"⤄",nvinfin:"⧞",nvlArr:"⤂",nvle:"≤⃒",nvlt:"<⃒",nvltrie:"⊴⃒",nvrArr:"⤃",nvrtrie:"⊵⃒",nvsim:"∼⃒",nwarhk:"⤣",nwarr:"↖",nwArr:"⇖",nwarrow:"↖",nwnear:"⤧",Oacute:"Ó",oacute:"ó",oast:"⊛",Ocirc:"Ô",ocirc:"ô",ocir:"⊚",Ocy:"О",ocy:"о",odash:"⊝",Odblac:"Ő",odblac:"ő",odiv:"⨸",odot:"⊙",odsold:"⦼",OElig:"Œ",oelig:"œ",ofcir:"⦿",Ofr:"𝔒",ofr:"𝔬",ogon:"˛",Ograve:"Ò",ograve:"ò",ogt:"⧁",ohbar:"⦵",ohm:"Ω",oint:"∮",olarr:"↺",olcir:"⦾",olcross:"⦻",oline:"‾",olt:"⧀",Omacr:"Ō",omacr:"ō",Omega:"Ω",omega:"ω",Omicron:"Ο",omicron:"ο",omid:"⦶",ominus:"⊖",Oopf:"𝕆",oopf:"𝕠",opar:"⦷",OpenCurlyDoubleQuote:"“",OpenCurlyQuote:"‘",operp:"⦹",oplus:"⊕",orarr:"↻",Or:"⩔",or:"∨",ord:"⩝",order:"ℴ",orderof:"ℴ",ordf:"ª",ordm:"º",origof:"⊶",oror:"⩖",orslope:"⩗",orv:"⩛",oS:"Ⓢ",Oscr:"𝒪",oscr:"ℴ",Oslash:"Ø",oslash:"ø",osol:"⊘",Otilde:"Õ",otilde:"õ",otimesas:"⨶",Otimes:"⨷",otimes:"⊗",Ouml:"Ö",ouml:"ö",ovbar:"⌽",OverBar:"‾",OverBrace:"⏞",OverBracket:"⎴",OverParenthesis:"⏜",para:"¶",parallel:"∥",par:"∥",parsim:"⫳",parsl:"⫽",part:"∂",PartialD:"∂",Pcy:"П",pcy:"п",percnt:"%",period:".",permil:"‰",perp:"⊥",pertenk:"‱",Pfr:"𝔓",pfr:"𝔭",Phi:"Φ",phi:"φ",phiv:"ϕ",phmmat:"ℳ",phone:"☎",Pi:"Π",pi:"π",pitchfork:"⋔",piv:"ϖ",planck:"ℏ",planckh:"ℎ",plankv:"ℏ",plusacir:"⨣",plusb:"⊞",pluscir:"⨢",plus:"+",plusdo:"∔",plusdu:"⨥",pluse:"⩲",PlusMinus:"±",plusmn:"±",plussim:"⨦",plustwo:"⨧",pm:"±",Poincareplane:"ℌ",pointint:"⨕",popf:"𝕡",Popf:"ℙ",pound:"£",prap:"⪷",Pr:"⪻",pr:"≺",prcue:"≼",precapprox:"⪷",prec:"≺",preccurlyeq:"≼",Precedes:"≺",PrecedesEqual:"⪯",PrecedesSlantEqual:"≼",PrecedesTilde:"≾",preceq:"⪯",precnapprox:"⪹",precneqq:"⪵",precnsim:"⋨",pre:"⪯",prE:"⪳",precsim:"≾",prime:"′",Prime:"″",primes:"ℙ",prnap:"⪹",prnE:"⪵",prnsim:"⋨",prod:"∏",Product:"∏",profalar:"⌮",profline:"⌒",profsurf:"⌓",prop:"∝",Proportional:"∝",Proportion:"∷",propto:"∝",prsim:"≾",prurel:"⊰",Pscr:"𝒫",pscr:"𝓅",Psi:"Ψ",psi:"ψ",puncsp:" ",Qfr:"𝔔",qfr:"𝔮",qint:"⨌",qopf:"𝕢",Qopf:"ℚ",qprime:"⁗",Qscr:"𝒬",qscr:"𝓆",quaternions:"ℍ",quatint:"⨖",quest:"?",questeq:"≟",quot:'"',QUOT:'"',rAarr:"⇛",race:"∽̱",Racute:"Ŕ",racute:"ŕ",radic:"√",raemptyv:"⦳",rang:"⟩",Rang:"⟫",rangd:"⦒",range:"⦥",rangle:"⟩",raquo:"»",rarrap:"⥵",rarrb:"⇥",rarrbfs:"⤠",rarrc:"⤳",rarr:"→",Rarr:"↠",rArr:"⇒",rarrfs:"⤞",rarrhk:"↪",rarrlp:"↬",rarrpl:"⥅",rarrsim:"⥴",Rarrtl:"⤖",rarrtl:"↣",rarrw:"↝",ratail:"⤚",rAtail:"⤜",ratio:"∶",rationals:"ℚ",rbarr:"⤍",rBarr:"⤏",RBarr:"⤐",rbbrk:"❳",rbrace:"}",rbrack:"]",rbrke:"⦌",rbrksld:"⦎",rbrkslu:"⦐",Rcaron:"Ř",rcaron:"ř",Rcedil:"Ŗ",rcedil:"ŗ",rceil:"⌉",rcub:"}",Rcy:"Р",rcy:"р",rdca:"⤷",rdldhar:"⥩",rdquo:"”",rdquor:"”",rdsh:"↳",real:"ℜ",realine:"ℛ",realpart:"ℜ",reals:"ℝ",Re:"ℜ",rect:"▭",reg:"®",REG:"®",ReverseElement:"∋",ReverseEquilibrium:"⇋",ReverseUpEquilibrium:"⥯",rfisht:"⥽",rfloor:"⌋",rfr:"𝔯",Rfr:"ℜ",rHar:"⥤",rhard:"⇁",rharu:"⇀",rharul:"⥬",Rho:"Ρ",rho:"ρ",rhov:"ϱ",RightAngleBracket:"⟩",RightArrowBar:"⇥",rightarrow:"→",RightArrow:"→",Rightarrow:"⇒",RightArrowLeftArrow:"⇄",rightarrowtail:"↣",RightCeiling:"⌉",RightDoubleBracket:"⟧",RightDownTeeVector:"⥝",RightDownVectorBar:"⥕",RightDownVector:"⇂",RightFloor:"⌋",rightharpoondown:"⇁",rightharpoonup:"⇀",rightleftarrows:"⇄",rightleftharpoons:"⇌",rightrightarrows:"⇉",rightsquigarrow:"↝",RightTeeArrow:"↦",RightTee:"⊢",RightTeeVector:"⥛",rightthreetimes:"⋌",RightTriangleBar:"⧐",RightTriangle:"⊳",RightTriangleEqual:"⊵",RightUpDownVector:"⥏",RightUpTeeVector:"⥜",RightUpVectorBar:"⥔",RightUpVector:"↾",RightVectorBar:"⥓",RightVector:"⇀",ring:"˚",risingdotseq:"≓",rlarr:"⇄",rlhar:"⇌",rlm:"‏",rmoustache:"⎱",rmoust:"⎱",rnmid:"⫮",roang:"⟭",roarr:"⇾",robrk:"⟧",ropar:"⦆",ropf:"𝕣",Ropf:"ℝ",roplus:"⨮",rotimes:"⨵",RoundImplies:"⥰",rpar:")",rpargt:"⦔",rppolint:"⨒",rrarr:"⇉",Rrightarrow:"⇛",rsaquo:"›",rscr:"𝓇",Rscr:"ℛ",rsh:"↱",Rsh:"↱",rsqb:"]",rsquo:"’",rsquor:"’",rthree:"⋌",rtimes:"⋊",rtri:"▹",rtrie:"⊵",rtrif:"▸",rtriltri:"⧎",RuleDelayed:"⧴",ruluhar:"⥨",rx:"℞",Sacute:"Ś",sacute:"ś",sbquo:"‚",scap:"⪸",Scaron:"Š",scaron:"š",Sc:"⪼",sc:"≻",sccue:"≽",sce:"⪰",scE:"⪴",Scedil:"Ş",scedil:"ş",Scirc:"Ŝ",scirc:"ŝ",scnap:"⪺",scnE:"⪶",scnsim:"⋩",scpolint:"⨓",scsim:"≿",Scy:"С",scy:"с",sdotb:"⊡",sdot:"⋅",sdote:"⩦",searhk:"⤥",searr:"↘",seArr:"⇘",searrow:"↘",sect:"§",semi:";",seswar:"⤩",setminus:"∖",setmn:"∖",sext:"✶",Sfr:"𝔖",sfr:"𝔰",sfrown:"⌢",sharp:"♯",SHCHcy:"Щ",shchcy:"щ",SHcy:"Ш",shcy:"ш",ShortDownArrow:"↓",ShortLeftArrow:"←",shortmid:"∣",shortparallel:"∥",ShortRightArrow:"→",ShortUpArrow:"↑",shy:"­",Sigma:"Σ",sigma:"σ",sigmaf:"ς",sigmav:"ς",sim:"∼",simdot:"⩪",sime:"≃",simeq:"≃",simg:"⪞",simgE:"⪠",siml:"⪝",simlE:"⪟",simne:"≆",simplus:"⨤",simrarr:"⥲",slarr:"←",SmallCircle:"∘",smallsetminus:"∖",smashp:"⨳",smeparsl:"⧤",smid:"∣",smile:"⌣",smt:"⪪",smte:"⪬",smtes:"⪬︀",SOFTcy:"Ь",softcy:"ь",solbar:"⌿",solb:"⧄",sol:"/",Sopf:"𝕊",sopf:"𝕤",spades:"♠",spadesuit:"♠",spar:"∥",sqcap:"⊓",sqcaps:"⊓︀",sqcup:"⊔",sqcups:"⊔︀",Sqrt:"√",sqsub:"⊏",sqsube:"⊑",sqsubset:"⊏",sqsubseteq:"⊑",sqsup:"⊐",sqsupe:"⊒",sqsupset:"⊐",sqsupseteq:"⊒",square:"□",Square:"□",SquareIntersection:"⊓",SquareSubset:"⊏",SquareSubsetEqual:"⊑",SquareSuperset:"⊐",SquareSupersetEqual:"⊒",SquareUnion:"⊔",squarf:"▪",squ:"□",squf:"▪",srarr:"→",Sscr:"𝒮",sscr:"𝓈",ssetmn:"∖",ssmile:"⌣",sstarf:"⋆",Star:"⋆",star:"☆",starf:"★",straightepsilon:"ϵ",straightphi:"ϕ",strns:"¯",sub:"⊂",Sub:"⋐",subdot:"⪽",subE:"⫅",sube:"⊆",subedot:"⫃",submult:"⫁",subnE:"⫋",subne:"⊊",subplus:"⪿",subrarr:"⥹",subset:"⊂",Subset:"⋐",subseteq:"⊆",subseteqq:"⫅",SubsetEqual:"⊆",subsetneq:"⊊",subsetneqq:"⫋",subsim:"⫇",subsub:"⫕",subsup:"⫓",succapprox:"⪸",succ:"≻",succcurlyeq:"≽",Succeeds:"≻",SucceedsEqual:"⪰",SucceedsSlantEqual:"≽",SucceedsTilde:"≿",succeq:"⪰",succnapprox:"⪺",succneqq:"⪶",succnsim:"⋩",succsim:"≿",SuchThat:"∋",sum:"∑",Sum:"∑",sung:"♪",sup1:"¹",sup2:"²",sup3:"³",sup:"⊃",Sup:"⋑",supdot:"⪾",supdsub:"⫘",supE:"⫆",supe:"⊇",supedot:"⫄",Superset:"⊃",SupersetEqual:"⊇",suphsol:"⟉",suphsub:"⫗",suplarr:"⥻",supmult:"⫂",supnE:"⫌",supne:"⊋",supplus:"⫀",supset:"⊃",Supset:"⋑",supseteq:"⊇",supseteqq:"⫆",supsetneq:"⊋",supsetneqq:"⫌",supsim:"⫈",supsub:"⫔",supsup:"⫖",swarhk:"⤦",swarr:"↙",swArr:"⇙",swarrow:"↙",swnwar:"⤪",szlig:"ß",Tab:"\t",target:"⌖",Tau:"Τ",tau:"τ",tbrk:"⎴",Tcaron:"Ť",tcaron:"ť",Tcedil:"Ţ",tcedil:"ţ",Tcy:"Т",tcy:"т",tdot:"⃛",telrec:"⌕",Tfr:"𝔗",tfr:"𝔱",there4:"∴",therefore:"∴",Therefore:"∴",Theta:"Θ",theta:"θ",thetasym:"ϑ",thetav:"ϑ",thickapprox:"≈",thicksim:"∼",ThickSpace:"  ",ThinSpace:" ",thinsp:" ",thkap:"≈",thksim:"∼",THORN:"Þ",thorn:"þ",tilde:"˜",Tilde:"∼",TildeEqual:"≃",TildeFullEqual:"≅",TildeTilde:"≈",timesbar:"⨱",timesb:"⊠",times:"×",timesd:"⨰",tint:"∭",toea:"⤨",topbot:"⌶",topcir:"⫱",top:"⊤",Topf:"𝕋",topf:"𝕥",topfork:"⫚",tosa:"⤩",tprime:"‴",trade:"™",TRADE:"™",triangle:"▵",triangledown:"▿",triangleleft:"◃",trianglelefteq:"⊴",triangleq:"≜",triangleright:"▹",trianglerighteq:"⊵",tridot:"◬",trie:"≜",triminus:"⨺",TripleDot:"⃛",triplus:"⨹",trisb:"⧍",tritime:"⨻",trpezium:"⏢",Tscr:"𝒯",tscr:"𝓉",TScy:"Ц",tscy:"ц",TSHcy:"Ћ",tshcy:"ћ",Tstrok:"Ŧ",tstrok:"ŧ",twixt:"≬",twoheadleftarrow:"↞",twoheadrightarrow:"↠",Uacute:"Ú",uacute:"ú",uarr:"↑",Uarr:"↟",uArr:"⇑",Uarrocir:"⥉",Ubrcy:"Ў",ubrcy:"ў",Ubreve:"Ŭ",ubreve:"ŭ",Ucirc:"Û",ucirc:"û",Ucy:"У",ucy:"у",udarr:"⇅",Udblac:"Ű",udblac:"ű",udhar:"⥮",ufisht:"⥾",Ufr:"𝔘",ufr:"𝔲",Ugrave:"Ù",ugrave:"ù",uHar:"⥣",uharl:"↿",uharr:"↾",uhblk:"▀",ulcorn:"⌜",ulcorner:"⌜",ulcrop:"⌏",ultri:"◸",Umacr:"Ū",umacr:"ū",uml:"¨",UnderBar:"_",UnderBrace:"⏟",UnderBracket:"⎵",UnderParenthesis:"⏝",Union:"⋃",UnionPlus:"⊎",Uogon:"Ų",uogon:"ų",Uopf:"𝕌",uopf:"𝕦",UpArrowBar:"⤒",uparrow:"↑",UpArrow:"↑",Uparrow:"⇑",UpArrowDownArrow:"⇅",updownarrow:"↕",UpDownArrow:"↕",Updownarrow:"⇕",UpEquilibrium:"⥮",upharpoonleft:"↿",upharpoonright:"↾",uplus:"⊎",UpperLeftArrow:"↖",UpperRightArrow:"↗",upsi:"υ",Upsi:"ϒ",upsih:"ϒ",Upsilon:"Υ",upsilon:"υ",UpTeeArrow:"↥",UpTee:"⊥",upuparrows:"⇈",urcorn:"⌝",urcorner:"⌝",urcrop:"⌎",Uring:"Ů",uring:"ů",urtri:"◹",Uscr:"𝒰",uscr:"𝓊",utdot:"⋰",Utilde:"Ũ",utilde:"ũ",utri:"▵",utrif:"▴",uuarr:"⇈",Uuml:"Ü",uuml:"ü",uwangle:"⦧",vangrt:"⦜",varepsilon:"ϵ",varkappa:"ϰ",varnothing:"∅",varphi:"ϕ",varpi:"ϖ",varpropto:"∝",varr:"↕",vArr:"⇕",varrho:"ϱ",varsigma:"ς",varsubsetneq:"⊊︀",varsubsetneqq:"⫋︀",varsupsetneq:"⊋︀",varsupsetneqq:"⫌︀",vartheta:"ϑ",vartriangleleft:"⊲",vartriangleright:"⊳",vBar:"⫨",Vbar:"⫫",vBarv:"⫩",Vcy:"В",vcy:"в",vdash:"⊢",vDash:"⊨",Vdash:"⊩",VDash:"⊫",Vdashl:"⫦",veebar:"⊻",vee:"∨",Vee:"⋁",veeeq:"≚",vellip:"⋮",verbar:"|",Verbar:"‖",vert:"|",Vert:"‖",VerticalBar:"∣",VerticalLine:"|",VerticalSeparator:"❘",VerticalTilde:"≀",VeryThinSpace:" ",Vfr:"𝔙",vfr:"𝔳",vltri:"⊲",vnsub:"⊂⃒",vnsup:"⊃⃒",Vopf:"𝕍",vopf:"𝕧",vprop:"∝",vrtri:"⊳",Vscr:"𝒱",vscr:"𝓋",vsubnE:"⫋︀",vsubne:"⊊︀",vsupnE:"⫌︀",vsupne:"⊋︀",Vvdash:"⊪",vzigzag:"⦚",Wcirc:"Ŵ",wcirc:"ŵ",wedbar:"⩟",wedge:"∧",Wedge:"⋀",wedgeq:"≙",weierp:"℘",Wfr:"𝔚",wfr:"𝔴",Wopf:"𝕎",wopf:"𝕨",wp:"℘",wr:"≀",wreath:"≀",Wscr:"𝒲",wscr:"𝓌",xcap:"⋂",xcirc:"◯",xcup:"⋃",xdtri:"▽",Xfr:"𝔛",xfr:"𝔵",xharr:"⟷",xhArr:"⟺",Xi:"Ξ",xi:"ξ",xlarr:"⟵",xlArr:"⟸",xmap:"⟼",xnis:"⋻",xodot:"⨀",Xopf:"𝕏",xopf:"𝕩",xoplus:"⨁",xotime:"⨂",xrarr:"⟶",xrArr:"⟹",Xscr:"𝒳",xscr:"𝓍",xsqcup:"⨆",xuplus:"⨄",xutri:"△",xvee:"⋁",xwedge:"⋀",Yacute:"Ý",yacute:"ý",YAcy:"Я",yacy:"я",Ycirc:"Ŷ",ycirc:"ŷ",Ycy:"Ы",ycy:"ы",yen:"¥",Yfr:"𝔜",yfr:"𝔶",YIcy:"Ї",yicy:"ї",Yopf:"𝕐",yopf:"𝕪",Yscr:"𝒴",yscr:"𝓎",YUcy:"Ю",yucy:"ю",yuml:"ÿ",Yuml:"Ÿ",Zacute:"Ź",zacute:"ź",Zcaron:"Ž",zcaron:"ž",Zcy:"З",zcy:"з",Zdot:"Ż",zdot:"ż",zeetrf:"ℨ",ZeroWidthSpace:"​",Zeta:"Ζ",zeta:"ζ",zfr:"𝔷",Zfr:"ℨ",ZHcy:"Ж",zhcy:"ж",zigrarr:"⇝",zopf:"𝕫",Zopf:"ℤ",Zscr:"𝒵",zscr:"𝓏",zwj:"‍",zwnj:"‌"}},{}],26:[function(require,module,exports){module.exports={Aacute:"Á",aacute:"á",Acirc:"Â",acirc:"â",acute:"´",AElig:"Æ",aelig:"æ",Agrave:"À",agrave:"à",amp:"&",AMP:"&",Aring:"Å",aring:"å",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",brvbar:"¦",Ccedil:"Ç",ccedil:"ç",cedil:"¸",cent:"¢",copy:"©",COPY:"©",curren:"¤",deg:"°",divide:"÷",Eacute:"É",eacute:"é",Ecirc:"Ê",ecirc:"ê",Egrave:"È",egrave:"è",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",frac12:"½",frac14:"¼",frac34:"¾",gt:">",GT:">",Iacute:"Í",iacute:"í",Icirc:"Î",icirc:"î",iexcl:"¡",Igrave:"Ì",igrave:"ì",iquest:"¿",Iuml:"Ï",iuml:"ï",laquo:"«",lt:"<",LT:"<",macr:"¯",micro:"µ",middot:"·",nbsp:" ",not:"¬",Ntilde:"Ñ",ntilde:"ñ",Oacute:"Ó",oacute:"ó",Ocirc:"Ô",ocirc:"ô",Ograve:"Ò",ograve:"ò",ordf:"ª",ordm:"º",Oslash:"Ø",oslash:"ø",Otilde:"Õ",otilde:"õ",Ouml:"Ö",ouml:"ö",para:"¶",plusmn:"±",pound:"£",quot:'"',QUOT:'"',raquo:"»",reg:"®",REG:"®",sect:"§",shy:"­",sup1:"¹",sup2:"²",sup3:"³",szlig:"ß",THORN:"Þ",thorn:"þ",times:"×",Uacute:"Ú",uacute:"ú",Ucirc:"Û",ucirc:"û",Ugrave:"Ù",ugrave:"ù",uml:"¨",Uuml:"Ü",uuml:"ü",Yacute:"Ý",yacute:"ý",yen:"¥",yuml:"ÿ"}},{}],27:[function(require,module,exports){module.exports={amp:"&",apos:"'",gt:">",lt:"<",quot:'"'}},{}],28:[function(require,module,exports){function EventEmitter(){this._events=this._events||{};this._maxListeners=this._maxListeners||undefined}module.exports=EventEmitter;EventEmitter.EventEmitter=EventEmitter;EventEmitter.prototype._events=undefined;EventEmitter.prototype._maxListeners=undefined;EventEmitter.defaultMaxListeners=10;EventEmitter.prototype.setMaxListeners=function(n){if(!isNumber(n)||n<0||isNaN(n))throw TypeError("n must be a positive number");this._maxListeners=n;return this};EventEmitter.prototype.emit=function(type){var er,handler,len,args,i,listeners;if(!this._events)this._events={};if(type==="error"){if(!this._events.error||isObject(this._events.error)&&!this._events.error.length){er=arguments[1];if(er instanceof Error){throw er}else{var err=new Error('Uncaught, unspecified "error" event. ('+er+")");err.context=er;throw err}}}handler=this._events[type];if(isUndefined(handler))return false;if(isFunction(handler)){switch(arguments.length){case 1:handler.call(this);break;case 2:handler.call(this,arguments[1]);break;case 3:handler.call(this,arguments[1],arguments[2]);break;default:args=Array.prototype.slice.call(arguments,1);handler.apply(this,args)}}else if(isObject(handler)){args=Array.prototype.slice.call(arguments,1);listeners=handler.slice();len=listeners.length;for(i=0;i<len;i++)listeners[i].apply(this,args)}return true};EventEmitter.prototype.addListener=function(type,listener){var m;if(!isFunction(listener))throw TypeError("listener must be a function");if(!this._events)this._events={};if(this._events.newListener)this.emit("newListener",type,isFunction(listener.listener)?listener.listener:listener);if(!this._events[type])this._events[type]=listener;else if(isObject(this._events[type]))this._events[type].push(listener);else this._events[type]=[this._events[type],listener];if(isObject(this._events[type])&&!this._events[type].warned){if(!isUndefined(this._maxListeners)){m=this._maxListeners}else{m=EventEmitter.defaultMaxListeners}if(m&&m>0&&this._events[type].length>m){this._events[type].warned=true;console.error("(node) warning: possible EventEmitter memory "+"leak detected. %d listeners added. "+"Use emitter.setMaxListeners() to increase limit.",this._events[type].length);if(typeof console.trace==="function"){console.trace()}}}return this};EventEmitter.prototype.on=EventEmitter.prototype.addListener;EventEmitter.prototype.once=function(type,listener){if(!isFunction(listener))throw TypeError("listener must be a function");var fired=false;function g(){this.removeListener(type,g);if(!fired){fired=true;listener.apply(this,arguments)}}g.listener=listener;this.on(type,g);return this};EventEmitter.prototype.removeListener=function(type,listener){var list,position,length,i;if(!isFunction(listener))throw TypeError("listener must be a function");if(!this._events||!this._events[type])return this;list=this._events[type];length=list.length;position=-1;if(list===listener||isFunction(list.listener)&&list.listener===listener){delete this._events[type];if(this._events.removeListener)this.emit("removeListener",type,listener)}else if(isObject(list)){for(i=length;i-- >0;){if(list[i]===listener||list[i].listener&&list[i].listener===listener){position=i;break}}if(position<0)return this;if(list.length===1){list.length=0;delete this._events[type]}else{list.splice(position,1);
+}if(this._events.removeListener)this.emit("removeListener",type,listener)}return this};EventEmitter.prototype.removeAllListeners=function(type){var key,listeners;if(!this._events)return this;if(!this._events.removeListener){if(arguments.length===0)this._events={};else if(this._events[type])delete this._events[type];return this}if(arguments.length===0){for(key in this._events){if(key==="removeListener")continue;this.removeAllListeners(key)}this.removeAllListeners("removeListener");this._events={};return this}listeners=this._events[type];if(isFunction(listeners)){this.removeListener(type,listeners)}else if(listeners){while(listeners.length)this.removeListener(type,listeners[listeners.length-1])}delete this._events[type];return this};EventEmitter.prototype.listeners=function(type){var ret;if(!this._events||!this._events[type])ret=[];else if(isFunction(this._events[type]))ret=[this._events[type]];else ret=this._events[type].slice();return ret};EventEmitter.prototype.listenerCount=function(type){if(this._events){var evlistener=this._events[type];if(isFunction(evlistener))return 1;else if(evlistener)return evlistener.length}return 0};EventEmitter.listenerCount=function(emitter,type){return emitter.listenerCount(type)};function isFunction(arg){return typeof arg==="function"}function isNumber(arg){return typeof arg==="number"}function isObject(arg){return typeof arg==="object"&&arg!==null}function isUndefined(arg){return arg===void 0}},{}],29:[function(require,module,exports){module.exports=CollectingHandler;function CollectingHandler(cbs){this._cbs=cbs||{};this.events=[]}var EVENTS=require("./").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){name="on"+name;CollectingHandler.prototype[name]=function(){this.events.push([name]);if(this._cbs[name])this._cbs[name]()}}else if(EVENTS[name]===1){name="on"+name;CollectingHandler.prototype[name]=function(a){this.events.push([name,a]);if(this._cbs[name])this._cbs[name](a)}}else if(EVENTS[name]===2){name="on"+name;CollectingHandler.prototype[name]=function(a,b){this.events.push([name,a,b]);if(this._cbs[name])this._cbs[name](a,b)}}else{throw Error("wrong number of arguments")}});CollectingHandler.prototype.onreset=function(){this.events=[];if(this._cbs.onreset)this._cbs.onreset()};CollectingHandler.prototype.restart=function(){if(this._cbs.onreset)this._cbs.onreset();for(var i=0,len=this.events.length;i<len;i++){if(this._cbs[this.events[i][0]]){var num=this.events[i].length;if(num===1){this._cbs[this.events[i][0]]()}else if(num===2){this._cbs[this.events[i][0]](this.events[i][1])}else{this._cbs[this.events[i][0]](this.events[i][1],this.events[i][2])}}}}},{"./":36}],30:[function(require,module,exports){var index=require("./index.js"),DomHandler=index.DomHandler,DomUtils=index.DomUtils;function FeedHandler(callback,options){this.init(callback,options)}require("inherits")(FeedHandler,DomHandler);FeedHandler.prototype.init=DomHandler;function getElements(what,where){return DomUtils.getElementsByTagName(what,where,true)}function getOneElement(what,where){return DomUtils.getElementsByTagName(what,where,true,1)[0]}function fetch(what,where,recurse){return DomUtils.getText(DomUtils.getElementsByTagName(what,where,recurse,1)).trim()}function addConditionally(obj,prop,what,where,recurse){var tmp=fetch(what,where,recurse);if(tmp)obj[prop]=tmp}var isValidFeed=function(value){return value==="rss"||value==="feed"||value==="rdf:RDF"};FeedHandler.prototype.onend=function(){var feed={},feedRoot=getOneElement(isValidFeed,this.dom),tmp,childs;if(feedRoot){if(feedRoot.name==="feed"){childs=feedRoot.children;feed.type="atom";addConditionally(feed,"id","id",childs);addConditionally(feed,"title","title",childs);if((tmp=getOneElement("link",childs))&&(tmp=tmp.attribs)&&(tmp=tmp.href))feed.link=tmp;addConditionally(feed,"description","subtitle",childs);if(tmp=fetch("updated",childs))feed.updated=new Date(tmp);addConditionally(feed,"author","email",childs,true);feed.items=getElements("entry",childs).map(function(item){var entry={},tmp;item=item.children;addConditionally(entry,"id","id",item);addConditionally(entry,"title","title",item);if((tmp=getOneElement("link",item))&&(tmp=tmp.attribs)&&(tmp=tmp.href))entry.link=tmp;if(tmp=fetch("summary",item)||fetch("content",item))entry.description=tmp;if(tmp=fetch("updated",item))entry.pubDate=new Date(tmp);return entry})}else{childs=getOneElement("channel",feedRoot.children).children;feed.type=feedRoot.name.substr(0,3);feed.id="";addConditionally(feed,"title","title",childs);addConditionally(feed,"link","link",childs);addConditionally(feed,"description","description",childs);if(tmp=fetch("lastBuildDate",childs))feed.updated=new Date(tmp);addConditionally(feed,"author","managingEditor",childs,true);feed.items=getElements("item",feedRoot.children).map(function(item){var entry={},tmp;item=item.children;addConditionally(entry,"id","guid",item);addConditionally(entry,"title","title",item);addConditionally(entry,"link","link",item);addConditionally(entry,"description","description",item);if(tmp=fetch("pubDate",item))entry.pubDate=new Date(tmp);return entry})}}this.dom=feed;DomHandler.prototype._handleCallback.call(this,feedRoot?null:Error("couldn't find root of feed"))};module.exports=FeedHandler},{"./index.js":36,inherits:38}],31:[function(require,module,exports){var Tokenizer=require("./Tokenizer.js");var formTags={input:true,option:true,optgroup:true,select:true,button:true,datalist:true,textarea:true};var openImpliesClose={tr:{tr:true,th:true,td:true},th:{th:true},td:{thead:true,th:true,td:true},body:{head:true,link:true,script:true},li:{li:true},p:{p:true},h1:{p:true},h2:{p:true},h3:{p:true},h4:{p:true},h5:{p:true},h6:{p:true},select:formTags,input:formTags,output:formTags,button:formTags,datalist:formTags,textarea:formTags,option:{option:true},optgroup:{optgroup:true}};var voidElements={__proto__:null,area:true,base:true,basefont:true,br:true,col:true,command:true,embed:true,frame:true,hr:true,img:true,input:true,isindex:true,keygen:true,link:true,meta:true,param:true,source:true,track:true,wbr:true,path:true,circle:true,ellipse:true,line:true,rect:true,use:true,stop:true,polyline:true,polygon:true};var re_nameEnd=/\s|\//;function Parser(cbs,options){this._options=options||{};this._cbs=cbs||{};this._tagname="";this._attribname="";this._attribvalue="";this._attribs=null;this._stack=[];this.startIndex=0;this.endIndex=null;this._lowerCaseTagNames="lowerCaseTags"in this._options?!!this._options.lowerCaseTags:!this._options.xmlMode;this._lowerCaseAttributeNames="lowerCaseAttributeNames"in this._options?!!this._options.lowerCaseAttributeNames:!this._options.xmlMode;if(this._options.Tokenizer){Tokenizer=this._options.Tokenizer}this._tokenizer=new Tokenizer(this._options,this);if(this._cbs.onparserinit)this._cbs.onparserinit(this)}require("inherits")(Parser,require("events").EventEmitter);Parser.prototype._updatePosition=function(initialOffset){if(this.endIndex===null){if(this._tokenizer._sectionStart<=initialOffset){this.startIndex=0}else{this.startIndex=this._tokenizer._sectionStart-initialOffset}}else this.startIndex=this.endIndex+1;this.endIndex=this._tokenizer.getAbsoluteIndex()};Parser.prototype.ontext=function(data){this._updatePosition(1);this.endIndex--;if(this._cbs.ontext)this._cbs.ontext(data)};Parser.prototype.onopentagname=function(name){if(this._lowerCaseTagNames){name=name.toLowerCase()}this._tagname=name;if(!this._options.xmlMode&&name in openImpliesClose){for(var el;(el=this._stack[this._stack.length-1])in openImpliesClose[name];this.onclosetag(el));}if(this._options.xmlMode||!(name in voidElements)){this._stack.push(name)}if(this._cbs.onopentagname)this._cbs.onopentagname(name);if(this._cbs.onopentag)this._attribs={}};Parser.prototype.onopentagend=function(){this._updatePosition(1);if(this._attribs){if(this._cbs.onopentag)this._cbs.onopentag(this._tagname,this._attribs);this._attribs=null}if(!this._options.xmlMode&&this._cbs.onclosetag&&this._tagname in voidElements){this._cbs.onclosetag(this._tagname)}this._tagname=""};Parser.prototype.onclosetag=function(name){this._updatePosition(1);if(this._lowerCaseTagNames){name=name.toLowerCase()}if(this._stack.length&&(!(name in voidElements)||this._options.xmlMode)){var pos=this._stack.lastIndexOf(name);if(pos!==-1){if(this._cbs.onclosetag){pos=this._stack.length-pos;while(pos--)this._cbs.onclosetag(this._stack.pop())}else this._stack.length=pos}else if(name==="p"&&!this._options.xmlMode){this.onopentagname(name);this._closeCurrentTag()}}else if(!this._options.xmlMode&&(name==="br"||name==="p")){this.onopentagname(name);this._closeCurrentTag()}};Parser.prototype.onselfclosingtag=function(){if(this._options.xmlMode||this._options.recognizeSelfClosing){this._closeCurrentTag()}else{this.onopentagend()}};Parser.prototype._closeCurrentTag=function(){var name=this._tagname;this.onopentagend();if(this._stack[this._stack.length-1]===name){if(this._cbs.onclosetag){this._cbs.onclosetag(name)}this._stack.pop()}};Parser.prototype.onattribname=function(name){if(this._lowerCaseAttributeNames){name=name.toLowerCase()}this._attribname=name};Parser.prototype.onattribdata=function(value){this._attribvalue+=value};Parser.prototype.onattribend=function(){if(this._cbs.onattribute)this._cbs.onattribute(this._attribname,this._attribvalue);if(this._attribs&&!Object.prototype.hasOwnProperty.call(this._attribs,this._attribname)){this._attribs[this._attribname]=this._attribvalue}this._attribname="";this._attribvalue=""};Parser.prototype._getInstructionName=function(value){var idx=value.search(re_nameEnd),name=idx<0?value:value.substr(0,idx);if(this._lowerCaseTagNames){name=name.toLowerCase()}return name};Parser.prototype.ondeclaration=function(value){if(this._cbs.onprocessinginstruction){var name=this._getInstructionName(value);this._cbs.onprocessinginstruction("!"+name,"!"+value)}};Parser.prototype.onprocessinginstruction=function(value){if(this._cbs.onprocessinginstruction){var name=this._getInstructionName(value);this._cbs.onprocessinginstruction("?"+name,"?"+value)}};Parser.prototype.oncomment=function(value){this._updatePosition(4);if(this._cbs.oncomment)this._cbs.oncomment(value);if(this._cbs.oncommentend)this._cbs.oncommentend()};Parser.prototype.oncdata=function(value){this._updatePosition(1);if(this._options.xmlMode||this._options.recognizeCDATA){if(this._cbs.oncdatastart)this._cbs.oncdatastart();if(this._cbs.ontext)this._cbs.ontext(value);if(this._cbs.oncdataend)this._cbs.oncdataend()}else{this.oncomment("[CDATA["+value+"]]")}};Parser.prototype.onerror=function(err){if(this._cbs.onerror)this._cbs.onerror(err)};Parser.prototype.onend=function(){if(this._cbs.onclosetag){for(var i=this._stack.length;i>0;this._cbs.onclosetag(this._stack[--i]));}if(this._cbs.onend)this._cbs.onend()};Parser.prototype.reset=function(){if(this._cbs.onreset)this._cbs.onreset();this._tokenizer.reset();this._tagname="";this._attribname="";this._attribs=null;this._stack=[];if(this._cbs.onparserinit)this._cbs.onparserinit(this)};Parser.prototype.parseComplete=function(data){this.reset();this.end(data)};Parser.prototype.write=function(chunk){this._tokenizer.write(chunk)};Parser.prototype.end=function(chunk){this._tokenizer.end(chunk)};Parser.prototype.pause=function(){this._tokenizer.pause()};Parser.prototype.resume=function(){this._tokenizer.resume()};Parser.prototype.parseChunk=Parser.prototype.write;Parser.prototype.done=Parser.prototype.end;module.exports=Parser},{"./Tokenizer.js":34,events:28,inherits:38}],32:[function(require,module,exports){module.exports=ProxyHandler;function ProxyHandler(cbs){this._cbs=cbs||{}}var EVENTS=require("./").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){name="on"+name;ProxyHandler.prototype[name]=function(){if(this._cbs[name])this._cbs[name]()}}else if(EVENTS[name]===1){name="on"+name;ProxyHandler.prototype[name]=function(a){if(this._cbs[name])this._cbs[name](a)}}else if(EVENTS[name]===2){name="on"+name;ProxyHandler.prototype[name]=function(a,b){if(this._cbs[name])this._cbs[name](a,b)}}else{throw Error("wrong number of arguments")}})},{"./":36}],33:[function(require,module,exports){module.exports=Stream;var Parser=require("./WritableStream.js");function Stream(options){Parser.call(this,new Cbs(this),options)}require("inherits")(Stream,Parser);Stream.prototype.readable=true;function Cbs(scope){this.scope=scope}var EVENTS=require("../").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){Cbs.prototype["on"+name]=function(){this.scope.emit(name)}}else if(EVENTS[name]===1){Cbs.prototype["on"+name]=function(a){this.scope.emit(name,a)}}else if(EVENTS[name]===2){Cbs.prototype["on"+name]=function(a,b){this.scope.emit(name,a,b)}}else{throw Error("wrong number of arguments!")}})},{"../":36,"./WritableStream.js":35,inherits:38}],34:[function(require,module,exports){module.exports=Tokenizer;var decodeCodePoint=require("entities/lib/decode_codepoint.js"),entityMap=require("entities/maps/entities.json"),legacyMap=require("entities/maps/legacy.json"),xmlMap=require("entities/maps/xml.json"),i=0,TEXT=i++,BEFORE_TAG_NAME=i++,IN_TAG_NAME=i++,IN_SELF_CLOSING_TAG=i++,BEFORE_CLOSING_TAG_NAME=i++,IN_CLOSING_TAG_NAME=i++,AFTER_CLOSING_TAG_NAME=i++,BEFORE_ATTRIBUTE_NAME=i++,IN_ATTRIBUTE_NAME=i++,AFTER_ATTRIBUTE_NAME=i++,BEFORE_ATTRIBUTE_VALUE=i++,IN_ATTRIBUTE_VALUE_DQ=i++,IN_ATTRIBUTE_VALUE_SQ=i++,IN_ATTRIBUTE_VALUE_NQ=i++,BEFORE_DECLARATION=i++,IN_DECLARATION=i++,IN_PROCESSING_INSTRUCTION=i++,BEFORE_COMMENT=i++,IN_COMMENT=i++,AFTER_COMMENT_1=i++,AFTER_COMMENT_2=i++,BEFORE_CDATA_1=i++,BEFORE_CDATA_2=i++,BEFORE_CDATA_3=i++,BEFORE_CDATA_4=i++,BEFORE_CDATA_5=i++,BEFORE_CDATA_6=i++,IN_CDATA=i++,AFTER_CDATA_1=i++,AFTER_CDATA_2=i++,BEFORE_SPECIAL=i++,BEFORE_SPECIAL_END=i++,BEFORE_SCRIPT_1=i++,BEFORE_SCRIPT_2=i++,BEFORE_SCRIPT_3=i++,BEFORE_SCRIPT_4=i++,BEFORE_SCRIPT_5=i++,AFTER_SCRIPT_1=i++,AFTER_SCRIPT_2=i++,AFTER_SCRIPT_3=i++,AFTER_SCRIPT_4=i++,AFTER_SCRIPT_5=i++,BEFORE_STYLE_1=i++,BEFORE_STYLE_2=i++,BEFORE_STYLE_3=i++,BEFORE_STYLE_4=i++,AFTER_STYLE_1=i++,AFTER_STYLE_2=i++,AFTER_STYLE_3=i++,AFTER_STYLE_4=i++,BEFORE_ENTITY=i++,BEFORE_NUMERIC_ENTITY=i++,IN_NAMED_ENTITY=i++,IN_NUMERIC_ENTITY=i++,IN_HEX_ENTITY=i++,j=0,SPECIAL_NONE=j++,SPECIAL_SCRIPT=j++,SPECIAL_STYLE=j++;function whitespace(c){return c===" "||c==="\n"||c==="\t"||c==="\f"||c==="\r"}function characterState(char,SUCCESS){return function(c){if(c===char)this._state=SUCCESS}}function ifElseState(upper,SUCCESS,FAILURE){var lower=upper.toLowerCase();if(upper===lower){return function(c){if(c===lower){this._state=SUCCESS}else{this._state=FAILURE;this._index--}}}else{return function(c){if(c===lower||c===upper){this._state=SUCCESS}else{this._state=FAILURE;this._index--}}}}function consumeSpecialNameChar(upper,NEXT_STATE){var lower=upper.toLowerCase();return function(c){if(c===lower||c===upper){this._state=NEXT_STATE}else{this._state=IN_TAG_NAME;this._index--}}}function Tokenizer(options,cbs){this._state=TEXT;this._buffer="";this._sectionStart=0;this._index=0;this._bufferOffset=0;this._baseState=TEXT;this._special=SPECIAL_NONE;this._cbs=cbs;this._running=true;this._ended=false;this._xmlMode=!!(options&&options.xmlMode);this._decodeEntities=!!(options&&options.decodeEntities)}Tokenizer.prototype._stateText=function(c){if(c==="<"){if(this._index>this._sectionStart){this._cbs.ontext(this._getSection())}this._state=BEFORE_TAG_NAME;this._sectionStart=this._index}else if(this._decodeEntities&&this._special===SPECIAL_NONE&&c==="&"){if(this._index>this._sectionStart){this._cbs.ontext(this._getSection())}this._baseState=TEXT;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeTagName=function(c){if(c==="/"){this._state=BEFORE_CLOSING_TAG_NAME}else if(c==="<"){this._cbs.ontext(this._getSection());this._sectionStart=this._index}else if(c===">"||this._special!==SPECIAL_NONE||whitespace(c)){this._state=TEXT}else if(c==="!"){this._state=BEFORE_DECLARATION;this._sectionStart=this._index+1}else if(c==="?"){this._state=IN_PROCESSING_INSTRUCTION;this._sectionStart=this._index+1}else{this._state=!this._xmlMode&&(c==="s"||c==="S")?BEFORE_SPECIAL:IN_TAG_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInTagName=function(c){if(c==="/"||c===">"||whitespace(c)){this._emitToken("onopentagname");this._state=BEFORE_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateBeforeCloseingTagName=function(c){if(whitespace(c));else if(c===">"){this._state=TEXT}else if(this._special!==SPECIAL_NONE){if(c==="s"||c==="S"){this._state=BEFORE_SPECIAL_END}else{this._state=TEXT;this._index--}}else{this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInCloseingTagName=function(c){if(c===">"||whitespace(c)){this._emitToken("onclosetag");this._state=AFTER_CLOSING_TAG_NAME;this._index--}};Tokenizer.prototype._stateAfterCloseingTagName=function(c){if(c===">"){this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateBeforeAttributeName=function(c){if(c===">"){this._cbs.onopentagend();this._state=TEXT;this._sectionStart=this._index+1}else if(c==="/"){this._state=IN_SELF_CLOSING_TAG}else if(!whitespace(c)){this._state=IN_ATTRIBUTE_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInSelfClosingTag=function(c){if(c===">"){this._cbs.onselfclosingtag();this._state=TEXT;this._sectionStart=this._index+1}else if(!whitespace(c)){this._state=BEFORE_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateInAttributeName=function(c){if(c==="="||c==="/"||c===">"||whitespace(c)){this._cbs.onattribname(this._getSection());this._sectionStart=-1;this._state=AFTER_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateAfterAttributeName=function(c){if(c==="="){this._state=BEFORE_ATTRIBUTE_VALUE}else if(c==="/"||c===">"){this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME;this._index--}else if(!whitespace(c)){this._cbs.onattribend();this._state=IN_ATTRIBUTE_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeAttributeValue=function(c){if(c==='"'){this._state=IN_ATTRIBUTE_VALUE_DQ;this._sectionStart=this._index+1}else if(c==="'"){this._state=IN_ATTRIBUTE_VALUE_SQ;this._sectionStart=this._index+1}else if(!whitespace(c)){this._state=IN_ATTRIBUTE_VALUE_NQ;this._sectionStart=this._index;this._index--}};Tokenizer.prototype._stateInAttributeValueDoubleQuotes=function(c){if(c==='"'){this._emitToken("onattribdata");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME}else if(this._decodeEntities&&c==="&"){this._emitToken("onattribdata");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateInAttributeValueSingleQuotes=function(c){if(c==="'"){this._emitToken("onattribdata");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME}else if(this._decodeEntities&&c==="&"){this._emitToken("onattribdata");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateInAttributeValueNoQuotes=function(c){if(whitespace(c)||c===">"){this._emitToken("onattribdata");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME;this._index--}else if(this._decodeEntities&&c==="&"){this._emitToken("onattribdata");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeDeclaration=function(c){this._state=c==="["?BEFORE_CDATA_1:c==="-"?BEFORE_COMMENT:IN_DECLARATION};Tokenizer.prototype._stateInDeclaration=function(c){if(c===">"){this._cbs.ondeclaration(this._getSection());this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateInProcessingInstruction=function(c){if(c===">"){this._cbs.onprocessinginstruction(this._getSection());this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateBeforeComment=function(c){if(c==="-"){this._state=IN_COMMENT;this._sectionStart=this._index+1}else{this._state=IN_DECLARATION}};Tokenizer.prototype._stateInComment=function(c){if(c==="-")this._state=AFTER_COMMENT_1};Tokenizer.prototype._stateAfterComment1=function(c){if(c==="-"){this._state=AFTER_COMMENT_2}else{this._state=IN_COMMENT}};Tokenizer.prototype._stateAfterComment2=function(c){if(c===">"){this._cbs.oncomment(this._buffer.substring(this._sectionStart,this._index-2));this._state=TEXT;this._sectionStart=this._index+1}else if(c!=="-"){this._state=IN_COMMENT}};Tokenizer.prototype._stateBeforeCdata1=ifElseState("C",BEFORE_CDATA_2,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata2=ifElseState("D",BEFORE_CDATA_3,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata3=ifElseState("A",BEFORE_CDATA_4,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata4=ifElseState("T",BEFORE_CDATA_5,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata5=ifElseState("A",BEFORE_CDATA_6,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata6=function(c){if(c==="["){this._state=IN_CDATA;this._sectionStart=this._index+1}else{this._state=IN_DECLARATION;this._index--}};Tokenizer.prototype._stateInCdata=function(c){if(c==="]")this._state=AFTER_CDATA_1};Tokenizer.prototype._stateAfterCdata1=characterState("]",AFTER_CDATA_2);Tokenizer.prototype._stateAfterCdata2=function(c){if(c===">"){this._cbs.oncdata(this._buffer.substring(this._sectionStart,this._index-2));this._state=TEXT;this._sectionStart=this._index+1}else if(c!=="]"){this._state=IN_CDATA}};Tokenizer.prototype._stateBeforeSpecial=function(c){if(c==="c"||c==="C"){this._state=BEFORE_SCRIPT_1}else if(c==="t"||c==="T"){this._state=BEFORE_STYLE_1}else{this._state=IN_TAG_NAME;this._index--}};Tokenizer.prototype._stateBeforeSpecialEnd=function(c){if(this._special===SPECIAL_SCRIPT&&(c==="c"||c==="C")){this._state=AFTER_SCRIPT_1}else if(this._special===SPECIAL_STYLE&&(c==="t"||c==="T")){this._state=AFTER_STYLE_1}else this._state=TEXT};Tokenizer.prototype._stateBeforeScript1=consumeSpecialNameChar("R",BEFORE_SCRIPT_2);Tokenizer.prototype._stateBeforeScript2=consumeSpecialNameChar("I",BEFORE_SCRIPT_3);Tokenizer.prototype._stateBeforeScript3=consumeSpecialNameChar("P",BEFORE_SCRIPT_4);Tokenizer.prototype._stateBeforeScript4=consumeSpecialNameChar("T",BEFORE_SCRIPT_5);Tokenizer.prototype._stateBeforeScript5=function(c){if(c==="/"||c===">"||whitespace(c)){this._special=SPECIAL_SCRIPT}this._state=IN_TAG_NAME;this._index--};Tokenizer.prototype._stateAfterScript1=ifElseState("R",AFTER_SCRIPT_2,TEXT);Tokenizer.prototype._stateAfterScript2=ifElseState("I",AFTER_SCRIPT_3,TEXT);Tokenizer.prototype._stateAfterScript3=ifElseState("P",AFTER_SCRIPT_4,TEXT);Tokenizer.prototype._stateAfterScript4=ifElseState("T",AFTER_SCRIPT_5,TEXT);Tokenizer.prototype._stateAfterScript5=function(c){if(c===">"||whitespace(c)){this._special=SPECIAL_NONE;this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index-6;this._index--}else this._state=TEXT};Tokenizer.prototype._stateBeforeStyle1=consumeSpecialNameChar("Y",BEFORE_STYLE_2);Tokenizer.prototype._stateBeforeStyle2=consumeSpecialNameChar("L",BEFORE_STYLE_3);Tokenizer.prototype._stateBeforeStyle3=consumeSpecialNameChar("E",BEFORE_STYLE_4);Tokenizer.prototype._stateBeforeStyle4=function(c){if(c==="/"||c===">"||whitespace(c)){this._special=SPECIAL_STYLE}this._state=IN_TAG_NAME;this._index--};Tokenizer.prototype._stateAfterStyle1=ifElseState("Y",AFTER_STYLE_2,TEXT);Tokenizer.prototype._stateAfterStyle2=ifElseState("L",AFTER_STYLE_3,TEXT);Tokenizer.prototype._stateAfterStyle3=ifElseState("E",AFTER_STYLE_4,TEXT);Tokenizer.prototype._stateAfterStyle4=function(c){if(c===">"||whitespace(c)){this._special=SPECIAL_NONE;this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index-5;this._index--}else this._state=TEXT};Tokenizer.prototype._stateBeforeEntity=ifElseState("#",BEFORE_NUMERIC_ENTITY,IN_NAMED_ENTITY);Tokenizer.prototype._stateBeforeNumericEntity=ifElseState("X",IN_HEX_ENTITY,IN_NUMERIC_ENTITY);Tokenizer.prototype._parseNamedEntityStrict=function(){if(this._sectionStart+1<this._index){var entity=this._buffer.substring(this._sectionStart+1,this._index),map=this._xmlMode?xmlMap:entityMap;if(map.hasOwnProperty(entity)){this._emitPartial(map[entity]);this._sectionStart=this._index+1}}};Tokenizer.prototype._parseLegacyEntity=function(){var start=this._sectionStart+1,limit=this._index-start;if(limit>6)limit=6;while(limit>=2){var entity=this._buffer.substr(start,limit);if(legacyMap.hasOwnProperty(entity)){this._emitPartial(legacyMap[entity]);this._sectionStart+=limit+1;return}else{limit--}}};Tokenizer.prototype._stateInNamedEntity=function(c){if(c===";"){this._parseNamedEntityStrict();if(this._sectionStart+1<this._index&&!this._xmlMode){this._parseLegacyEntity()}this._state=this._baseState}else if((c<"a"||c>"z")&&(c<"A"||c>"Z")&&(c<"0"||c>"9")){if(this._xmlMode);else if(this._sectionStart+1===this._index);else if(this._baseState!==TEXT){if(c!=="="){this._parseNamedEntityStrict()}}else{this._parseLegacyEntity()}this._state=this._baseState;this._index--}};Tokenizer.prototype._decodeNumericEntity=function(offset,base){var sectionStart=this._sectionStart+offset;if(sectionStart!==this._index){var entity=this._buffer.substring(sectionStart,this._index);var parsed=parseInt(entity,base);this._emitPartial(decodeCodePoint(parsed));this._sectionStart=this._index}else{this._sectionStart--}this._state=this._baseState};Tokenizer.prototype._stateInNumericEntity=function(c){if(c===";"){this._decodeNumericEntity(2,10);this._sectionStart++}else if(c<"0"||c>"9"){if(!this._xmlMode){this._decodeNumericEntity(2,10)}else{this._state=this._baseState}this._index--}};Tokenizer.prototype._stateInHexEntity=function(c){if(c===";"){this._decodeNumericEntity(3,16);this._sectionStart++}else if((c<"a"||c>"f")&&(c<"A"||c>"F")&&(c<"0"||c>"9")){if(!this._xmlMode){this._decodeNumericEntity(3,16)}else{this._state=this._baseState}this._index--}};Tokenizer.prototype._cleanup=function(){if(this._sectionStart<0){this._buffer="";this._index=0;this._bufferOffset+=this._index}else if(this._running){if(this._state===TEXT){if(this._sectionStart!==this._index){this._cbs.ontext(this._buffer.substr(this._sectionStart))}this._buffer="";this._bufferOffset+=this._index;this._index=0}else if(this._sectionStart===this._index){this._buffer="";this._bufferOffset+=this._index;this._index=0}else{this._buffer=this._buffer.substr(this._sectionStart);this._index-=this._sectionStart;this._bufferOffset+=this._sectionStart}this._sectionStart=0}};Tokenizer.prototype.write=function(chunk){if(this._ended)this._cbs.onerror(Error(".write() after done!"));this._buffer+=chunk;this._parse()};Tokenizer.prototype._parse=function(){while(this._index<this._buffer.length&&this._running){var c=this._buffer.charAt(this._index);if(this._state===TEXT){this._stateText(c)}else if(this._state===BEFORE_TAG_NAME){this._stateBeforeTagName(c)}else if(this._state===IN_TAG_NAME){this._stateInTagName(c)}else if(this._state===BEFORE_CLOSING_TAG_NAME){this._stateBeforeCloseingTagName(c)}else if(this._state===IN_CLOSING_TAG_NAME){this._stateInCloseingTagName(c)}else if(this._state===AFTER_CLOSING_TAG_NAME){this._stateAfterCloseingTagName(c)}else if(this._state===IN_SELF_CLOSING_TAG){this._stateInSelfClosingTag(c)}else if(this._state===BEFORE_ATTRIBUTE_NAME){this._stateBeforeAttributeName(c)}else if(this._state===IN_ATTRIBUTE_NAME){this._stateInAttributeName(c)}else if(this._state===AFTER_ATTRIBUTE_NAME){this._stateAfterAttributeName(c)}else if(this._state===BEFORE_ATTRIBUTE_VALUE){this._stateBeforeAttributeValue(c)}else if(this._state===IN_ATTRIBUTE_VALUE_DQ){this._stateInAttributeValueDoubleQuotes(c)}else if(this._state===IN_ATTRIBUTE_VALUE_SQ){this._stateInAttributeValueSingleQuotes(c)}else if(this._state===IN_ATTRIBUTE_VALUE_NQ){this._stateInAttributeValueNoQuotes(c)}else if(this._state===BEFORE_DECLARATION){this._stateBeforeDeclaration(c)}else if(this._state===IN_DECLARATION){this._stateInDeclaration(c)}else if(this._state===IN_PROCESSING_INSTRUCTION){this._stateInProcessingInstruction(c)}else if(this._state===BEFORE_COMMENT){this._stateBeforeComment(c)}else if(this._state===IN_COMMENT){this._stateInComment(c)}else if(this._state===AFTER_COMMENT_1){this._stateAfterComment1(c)}else if(this._state===AFTER_COMMENT_2){this._stateAfterComment2(c)}else if(this._state===BEFORE_CDATA_1){this._stateBeforeCdata1(c)}else if(this._state===BEFORE_CDATA_2){this._stateBeforeCdata2(c)}else if(this._state===BEFORE_CDATA_3){this._stateBeforeCdata3(c)}else if(this._state===BEFORE_CDATA_4){this._stateBeforeCdata4(c)}else if(this._state===BEFORE_CDATA_5){this._stateBeforeCdata5(c)}else if(this._state===BEFORE_CDATA_6){this._stateBeforeCdata6(c)}else if(this._state===IN_CDATA){this._stateInCdata(c)}else if(this._state===AFTER_CDATA_1){this._stateAfterCdata1(c)}else if(this._state===AFTER_CDATA_2){this._stateAfterCdata2(c)}else if(this._state===BEFORE_SPECIAL){this._stateBeforeSpecial(c)}else if(this._state===BEFORE_SPECIAL_END){this._stateBeforeSpecialEnd(c)}else if(this._state===BEFORE_SCRIPT_1){this._stateBeforeScript1(c)}else if(this._state===BEFORE_SCRIPT_2){this._stateBeforeScript2(c)}else if(this._state===BEFORE_SCRIPT_3){this._stateBeforeScript3(c)}else if(this._state===BEFORE_SCRIPT_4){this._stateBeforeScript4(c)}else if(this._state===BEFORE_SCRIPT_5){this._stateBeforeScript5(c)}else if(this._state===AFTER_SCRIPT_1){this._stateAfterScript1(c)}else if(this._state===AFTER_SCRIPT_2){this._stateAfterScript2(c)}else if(this._state===AFTER_SCRIPT_3){this._stateAfterScript3(c)}else if(this._state===AFTER_SCRIPT_4){this._stateAfterScript4(c)}else if(this._state===AFTER_SCRIPT_5){this._stateAfterScript5(c)}else if(this._state===BEFORE_STYLE_1){this._stateBeforeStyle1(c)}else if(this._state===BEFORE_STYLE_2){this._stateBeforeStyle2(c)}else if(this._state===BEFORE_STYLE_3){this._stateBeforeStyle3(c)}else if(this._state===BEFORE_STYLE_4){this._stateBeforeStyle4(c)}else if(this._state===AFTER_STYLE_1){this._stateAfterStyle1(c)}else if(this._state===AFTER_STYLE_2){this._stateAfterStyle2(c)}else if(this._state===AFTER_STYLE_3){this._stateAfterStyle3(c)}else if(this._state===AFTER_STYLE_4){this._stateAfterStyle4(c)}else if(this._state===BEFORE_ENTITY){this._stateBeforeEntity(c)}else if(this._state===BEFORE_NUMERIC_ENTITY){this._stateBeforeNumericEntity(c)}else if(this._state===IN_NAMED_ENTITY){this._stateInNamedEntity(c)}else if(this._state===IN_NUMERIC_ENTITY){this._stateInNumericEntity(c)}else if(this._state===IN_HEX_ENTITY){this._stateInHexEntity(c)}else{this._cbs.onerror(Error("unknown _state"),this._state)}this._index++}this._cleanup()};Tokenizer.prototype.pause=function(){this._running=false};Tokenizer.prototype.resume=function(){this._running=true;if(this._index<this._buffer.length){this._parse()}if(this._ended){this._finish()}};Tokenizer.prototype.end=function(chunk){if(this._ended)this._cbs.onerror(Error(".end() after done!"));if(chunk)this.write(chunk);this._ended=true;if(this._running)this._finish()};Tokenizer.prototype._finish=function(){if(this._sectionStart<this._index){this._handleTrailingData()}this._cbs.onend()};Tokenizer.prototype._handleTrailingData=function(){var data=this._buffer.substr(this._sectionStart);if(this._state===IN_CDATA||this._state===AFTER_CDATA_1||this._state===AFTER_CDATA_2){this._cbs.oncdata(data)}else if(this._state===IN_COMMENT||this._state===AFTER_COMMENT_1||this._state===AFTER_COMMENT_2){this._cbs.oncomment(data)}else if(this._state===IN_NAMED_ENTITY&&!this._xmlMode){this._parseLegacyEntity();if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state===IN_NUMERIC_ENTITY&&!this._xmlMode){this._decodeNumericEntity(2,10);if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state===IN_HEX_ENTITY&&!this._xmlMode){this._decodeNumericEntity(3,16);if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state!==IN_TAG_NAME&&this._state!==BEFORE_ATTRIBUTE_NAME&&this._state!==BEFORE_ATTRIBUTE_VALUE&&this._state!==AFTER_ATTRIBUTE_NAME&&this._state!==IN_ATTRIBUTE_NAME&&this._state!==IN_ATTRIBUTE_VALUE_SQ&&this._state!==IN_ATTRIBUTE_VALUE_DQ&&this._state!==IN_ATTRIBUTE_VALUE_NQ&&this._state!==IN_CLOSING_TAG_NAME){
+this._cbs.ontext(data)}};Tokenizer.prototype.reset=function(){Tokenizer.call(this,{xmlMode:this._xmlMode,decodeEntities:this._decodeEntities},this._cbs)};Tokenizer.prototype.getAbsoluteIndex=function(){return this._bufferOffset+this._index};Tokenizer.prototype._getSection=function(){return this._buffer.substring(this._sectionStart,this._index)};Tokenizer.prototype._emitToken=function(name){this._cbs[name](this._getSection());this._sectionStart=-1};Tokenizer.prototype._emitPartial=function(value){if(this._baseState!==TEXT){this._cbs.onattribdata(value)}else{this._cbs.ontext(value)}}},{"entities/lib/decode_codepoint.js":22,"entities/maps/entities.json":25,"entities/maps/legacy.json":26,"entities/maps/xml.json":27}],35:[function(require,module,exports){module.exports=Stream;var Parser=require("./Parser.js"),WritableStream=require("stream").Writable||require("readable-stream").Writable,StringDecoder=require("string_decoder").StringDecoder,Buffer=require("buffer").Buffer;function Stream(cbs,options){var parser=this._parser=new Parser(cbs,options);var decoder=this._decoder=new StringDecoder;WritableStream.call(this,{decodeStrings:false});this.once("finish",function(){parser.end(decoder.end())})}require("inherits")(Stream,WritableStream);WritableStream.prototype._write=function(chunk,encoding,cb){if(chunk instanceof Buffer)chunk=this._decoder.write(chunk);this._parser.write(chunk);cb()}},{"./Parser.js":31,buffer:5,inherits:38,"readable-stream":3,stream:55,string_decoder:56}],36:[function(require,module,exports){var Parser=require("./Parser.js"),DomHandler=require("domhandler");function defineProp(name,value){delete module.exports[name];module.exports[name]=value;return value}module.exports={Parser:Parser,Tokenizer:require("./Tokenizer.js"),ElementType:require("domelementtype"),DomHandler:DomHandler,get FeedHandler(){return defineProp("FeedHandler",require("./FeedHandler.js"))},get Stream(){return defineProp("Stream",require("./Stream.js"))},get WritableStream(){return defineProp("WritableStream",require("./WritableStream.js"))},get ProxyHandler(){return defineProp("ProxyHandler",require("./ProxyHandler.js"))},get DomUtils(){return defineProp("DomUtils",require("domutils"))},get CollectingHandler(){return defineProp("CollectingHandler",require("./CollectingHandler.js"))},DefaultHandler:DomHandler,get RssHandler(){return defineProp("RssHandler",this.FeedHandler)},parseDOM:function(data,options){var handler=new DomHandler(options);new Parser(handler,options).end(data);return handler.dom},parseFeed:function(feed,options){var handler=new module.exports.FeedHandler(options);new Parser(handler,options).end(feed);return handler.dom},createDomStream:function(cb,options,elementCb){var handler=new DomHandler(cb,options,elementCb);return new Parser(handler,options)},EVENTS:{attribute:2,cdatastart:0,cdataend:0,text:1,processinginstruction:2,comment:1,commentend:0,closetag:1,opentag:2,opentagname:1,error:1,end:0}}},{"./CollectingHandler.js":29,"./FeedHandler.js":30,"./Parser.js":31,"./ProxyHandler.js":32,"./Stream.js":33,"./Tokenizer.js":34,"./WritableStream.js":35,domelementtype:9,domhandler:10,domutils:13}],37:[function(require,module,exports){exports.read=function(buffer,offset,isLE,mLen,nBytes){var e,m;var eLen=nBytes*8-mLen-1;var eMax=(1<<eLen)-1;var eBias=eMax>>1;var nBits=-7;var i=isLE?nBytes-1:0;var d=isLE?-1:1;var s=buffer[offset+i];i+=d;e=s&(1<<-nBits)-1;s>>=-nBits;nBits+=eLen;for(;nBits>0;e=e*256+buffer[offset+i],i+=d,nBits-=8){}m=e&(1<<-nBits)-1;e>>=-nBits;nBits+=mLen;for(;nBits>0;m=m*256+buffer[offset+i],i+=d,nBits-=8){}if(e===0){e=1-eBias}else if(e===eMax){return m?NaN:(s?-1:1)*Infinity}else{m=m+Math.pow(2,mLen);e=e-eBias}return(s?-1:1)*m*Math.pow(2,e-mLen)};exports.write=function(buffer,value,offset,isLE,mLen,nBytes){var e,m,c;var eLen=nBytes*8-mLen-1;var eMax=(1<<eLen)-1;var eBias=eMax>>1;var rt=mLen===23?Math.pow(2,-24)-Math.pow(2,-77):0;var i=isLE?0:nBytes-1;var d=isLE?1:-1;var s=value<0||value===0&&1/value<0?1:0;value=Math.abs(value);if(isNaN(value)||value===Infinity){m=isNaN(value)?1:0;e=eMax}else{e=Math.floor(Math.log(value)/Math.LN2);if(value*(c=Math.pow(2,-e))<1){e--;c*=2}if(e+eBias>=1){value+=rt/c}else{value+=rt*Math.pow(2,1-eBias)}if(value*c>=2){e++;c/=2}if(e+eBias>=eMax){m=0;e=eMax}else if(e+eBias>=1){m=(value*c-1)*Math.pow(2,mLen);e=e+eBias}else{m=value*Math.pow(2,eBias-1)*Math.pow(2,mLen);e=0}}for(;mLen>=8;buffer[offset+i]=m&255,i+=d,m/=256,mLen-=8){}e=e<<mLen|m;eLen+=mLen;for(;eLen>0;buffer[offset+i]=e&255,i+=d,e/=256,eLen-=8){}buffer[offset+i-d]|=s*128}},{}],38:[function(require,module,exports){if(typeof Object.create==="function"){module.exports=function inherits(ctor,superCtor){ctor.super_=superCtor;ctor.prototype=Object.create(superCtor.prototype,{constructor:{value:ctor,enumerable:false,writable:true,configurable:true}})}}else{module.exports=function inherits(ctor,superCtor){ctor.super_=superCtor;var TempCtor=function(){};TempCtor.prototype=superCtor.prototype;ctor.prototype=new TempCtor;ctor.prototype.constructor=ctor}}},{}],39:[function(require,module,exports){module.exports=function(obj){return obj!=null&&(isBuffer(obj)||isSlowBuffer(obj)||!!obj._isBuffer)};function isBuffer(obj){return!!obj.constructor&&typeof obj.constructor.isBuffer==="function"&&obj.constructor.isBuffer(obj)}function isSlowBuffer(obj){return typeof obj.readFloatLE==="function"&&typeof obj.slice==="function"&&isBuffer(obj.slice(0,0))}},{}],40:[function(require,module,exports){var toString={}.toString;module.exports=Array.isArray||function(arr){return toString.call(arr)=="[object Array]"}},{}],41:[function(require,module,exports){(function(process){"use strict";if(!process.version||process.version.indexOf("v0.")===0||process.version.indexOf("v1.")===0&&process.version.indexOf("v1.8.")!==0){module.exports=nextTick}else{module.exports=process.nextTick}function nextTick(fn,arg1,arg2,arg3){if(typeof fn!=="function"){throw new TypeError('"callback" argument must be a function')}var len=arguments.length;var args,i;switch(len){case 0:case 1:return process.nextTick(fn);case 2:return process.nextTick(function afterTickOne(){fn.call(null,arg1)});case 3:return process.nextTick(function afterTickTwo(){fn.call(null,arg1,arg2)});case 4:return process.nextTick(function afterTickThree(){fn.call(null,arg1,arg2,arg3)});default:args=new Array(len-1);i=0;while(i<args.length){args[i++]=arguments[i]}return process.nextTick(function afterTick(){fn.apply(null,args)})}}}).call(this,require("_process"))},{_process:42}],42:[function(require,module,exports){var process=module.exports={};var cachedSetTimeout;var cachedClearTimeout;function defaultSetTimout(){throw new Error("setTimeout has not been defined")}function defaultClearTimeout(){throw new Error("clearTimeout has not been defined")}(function(){try{if(typeof setTimeout==="function"){cachedSetTimeout=setTimeout}else{cachedSetTimeout=defaultSetTimout}}catch(e){cachedSetTimeout=defaultSetTimout}try{if(typeof clearTimeout==="function"){cachedClearTimeout=clearTimeout}else{cachedClearTimeout=defaultClearTimeout}}catch(e){cachedClearTimeout=defaultClearTimeout}})();function runTimeout(fun){if(cachedSetTimeout===setTimeout){return setTimeout(fun,0)}if((cachedSetTimeout===defaultSetTimout||!cachedSetTimeout)&&setTimeout){cachedSetTimeout=setTimeout;return setTimeout(fun,0)}try{return cachedSetTimeout(fun,0)}catch(e){try{return cachedSetTimeout.call(null,fun,0)}catch(e){return cachedSetTimeout.call(this,fun,0)}}}function runClearTimeout(marker){if(cachedClearTimeout===clearTimeout){return clearTimeout(marker)}if((cachedClearTimeout===defaultClearTimeout||!cachedClearTimeout)&&clearTimeout){cachedClearTimeout=clearTimeout;return clearTimeout(marker)}try{return cachedClearTimeout(marker)}catch(e){try{return cachedClearTimeout.call(null,marker)}catch(e){return cachedClearTimeout.call(this,marker)}}}var queue=[];var draining=false;var currentQueue;var queueIndex=-1;function cleanUpNextTick(){if(!draining||!currentQueue){return}draining=false;if(currentQueue.length){queue=currentQueue.concat(queue)}else{queueIndex=-1}if(queue.length){drainQueue()}}function drainQueue(){if(draining){return}var timeout=runTimeout(cleanUpNextTick);draining=true;var len=queue.length;while(len){currentQueue=queue;queue=[];while(++queueIndex<len){if(currentQueue){currentQueue[queueIndex].run()}}queueIndex=-1;len=queue.length}currentQueue=null;draining=false;runClearTimeout(timeout)}process.nextTick=function(fun){var args=new Array(arguments.length-1);if(arguments.length>1){for(var i=1;i<arguments.length;i++){args[i-1]=arguments[i]}}queue.push(new Item(fun,args));if(queue.length===1&&!draining){runTimeout(drainQueue)}};function Item(fun,array){this.fun=fun;this.array=array}Item.prototype.run=function(){this.fun.apply(null,this.array)};process.title="browser";process.browser=true;process.env={};process.argv=[];process.version="";process.versions={};function noop(){}process.on=noop;process.addListener=noop;process.once=noop;process.off=noop;process.removeListener=noop;process.removeAllListeners=noop;process.emit=noop;process.binding=function(name){throw new Error("process.binding is not supported")};process.cwd=function(){return"/"};process.chdir=function(dir){throw new Error("process.chdir is not supported")};process.umask=function(){return 0}},{}],43:[function(require,module,exports){module.exports=require("./lib/_stream_duplex.js")},{"./lib/_stream_duplex.js":44}],44:[function(require,module,exports){"use strict";var objectKeys=Object.keys||function(obj){var keys=[];for(var key in obj){keys.push(key)}return keys};module.exports=Duplex;var processNextTick=require("process-nextick-args");var util=require("core-util-is");util.inherits=require("inherits");var Readable=require("./_stream_readable");var Writable=require("./_stream_writable");util.inherits(Duplex,Readable);var keys=objectKeys(Writable.prototype);for(var v=0;v<keys.length;v++){var method=keys[v];if(!Duplex.prototype[method])Duplex.prototype[method]=Writable.prototype[method]}function Duplex(options){if(!(this instanceof Duplex))return new Duplex(options);Readable.call(this,options);Writable.call(this,options);if(options&&options.readable===false)this.readable=false;if(options&&options.writable===false)this.writable=false;this.allowHalfOpen=true;if(options&&options.allowHalfOpen===false)this.allowHalfOpen=false;this.once("end",onend)}function onend(){if(this.allowHalfOpen||this._writableState.ended)return;processNextTick(onEndNT,this)}function onEndNT(self){self.end()}function forEach(xs,f){for(var i=0,l=xs.length;i<l;i++){f(xs[i],i)}}},{"./_stream_readable":46,"./_stream_writable":48,"core-util-is":6,inherits:38,"process-nextick-args":41}],45:[function(require,module,exports){"use strict";module.exports=PassThrough;var Transform=require("./_stream_transform");var util=require("core-util-is");util.inherits=require("inherits");util.inherits(PassThrough,Transform);function PassThrough(options){if(!(this instanceof PassThrough))return new PassThrough(options);Transform.call(this,options)}PassThrough.prototype._transform=function(chunk,encoding,cb){cb(null,chunk)}},{"./_stream_transform":47,"core-util-is":6,inherits:38}],46:[function(require,module,exports){(function(process){"use strict";module.exports=Readable;var processNextTick=require("process-nextick-args");var isArray=require("isarray");Readable.ReadableState=ReadableState;var EE=require("events").EventEmitter;var EElistenerCount=function(emitter,type){return emitter.listeners(type).length};var Stream;(function(){try{Stream=require("st"+"ream")}catch(_){}finally{if(!Stream)Stream=require("events").EventEmitter}})();var Buffer=require("buffer").Buffer;var bufferShim=require("buffer-shims");var util=require("core-util-is");util.inherits=require("inherits");var debugUtil=require("util");var debug=void 0;if(debugUtil&&debugUtil.debuglog){debug=debugUtil.debuglog("stream")}else{debug=function(){}}var BufferList=require("./internal/streams/BufferList");var StringDecoder;util.inherits(Readable,Stream);function prependListener(emitter,event,fn){if(typeof emitter.prependListener==="function"){return emitter.prependListener(event,fn)}else{if(!emitter._events||!emitter._events[event])emitter.on(event,fn);else if(isArray(emitter._events[event]))emitter._events[event].unshift(fn);else emitter._events[event]=[fn,emitter._events[event]]}}var Duplex;function ReadableState(options,stream){Duplex=Duplex||require("./_stream_duplex");options=options||{};this.objectMode=!!options.objectMode;if(stream instanceof Duplex)this.objectMode=this.objectMode||!!options.readableObjectMode;var hwm=options.highWaterMark;var defaultHwm=this.objectMode?16:16*1024;this.highWaterMark=hwm||hwm===0?hwm:defaultHwm;this.highWaterMark=~~this.highWaterMark;this.buffer=new BufferList;this.length=0;this.pipes=null;this.pipesCount=0;this.flowing=null;this.ended=false;this.endEmitted=false;this.reading=false;this.sync=true;this.needReadable=false;this.emittedReadable=false;this.readableListening=false;this.resumeScheduled=false;this.defaultEncoding=options.defaultEncoding||"utf8";this.ranOut=false;this.awaitDrain=0;this.readingMore=false;this.decoder=null;this.encoding=null;if(options.encoding){if(!StringDecoder)StringDecoder=require("string_decoder/").StringDecoder;this.decoder=new StringDecoder(options.encoding);this.encoding=options.encoding}}var Duplex;function Readable(options){Duplex=Duplex||require("./_stream_duplex");if(!(this instanceof Readable))return new Readable(options);this._readableState=new ReadableState(options,this);this.readable=true;if(options&&typeof options.read==="function")this._read=options.read;Stream.call(this)}Readable.prototype.push=function(chunk,encoding){var state=this._readableState;if(!state.objectMode&&typeof chunk==="string"){encoding=encoding||state.defaultEncoding;if(encoding!==state.encoding){chunk=bufferShim.from(chunk,encoding);encoding=""}}return readableAddChunk(this,state,chunk,encoding,false)};Readable.prototype.unshift=function(chunk){var state=this._readableState;return readableAddChunk(this,state,chunk,"",true)};Readable.prototype.isPaused=function(){return this._readableState.flowing===false};function readableAddChunk(stream,state,chunk,encoding,addToFront){var er=chunkInvalid(state,chunk);if(er){stream.emit("error",er)}else if(chunk===null){state.reading=false;onEofChunk(stream,state)}else if(state.objectMode||chunk&&chunk.length>0){if(state.ended&&!addToFront){var e=new Error("stream.push() after EOF");stream.emit("error",e)}else if(state.endEmitted&&addToFront){var _e=new Error("stream.unshift() after end event");stream.emit("error",_e)}else{var skipAdd;if(state.decoder&&!addToFront&&!encoding){chunk=state.decoder.write(chunk);skipAdd=!state.objectMode&&chunk.length===0}if(!addToFront)state.reading=false;if(!skipAdd){if(state.flowing&&state.length===0&&!state.sync){stream.emit("data",chunk);stream.read(0)}else{state.length+=state.objectMode?1:chunk.length;if(addToFront)state.buffer.unshift(chunk);else state.buffer.push(chunk);if(state.needReadable)emitReadable(stream)}}maybeReadMore(stream,state)}}else if(!addToFront){state.reading=false}return needMoreData(state)}function needMoreData(state){return!state.ended&&(state.needReadable||state.length<state.highWaterMark||state.length===0)}Readable.prototype.setEncoding=function(enc){if(!StringDecoder)StringDecoder=require("string_decoder/").StringDecoder;this._readableState.decoder=new StringDecoder(enc);this._readableState.encoding=enc;return this};var MAX_HWM=8388608;function computeNewHighWaterMark(n){if(n>=MAX_HWM){n=MAX_HWM}else{n--;n|=n>>>1;n|=n>>>2;n|=n>>>4;n|=n>>>8;n|=n>>>16;n++}return n}function howMuchToRead(n,state){if(n<=0||state.length===0&&state.ended)return 0;if(state.objectMode)return 1;if(n!==n){if(state.flowing&&state.length)return state.buffer.head.data.length;else return state.length}if(n>state.highWaterMark)state.highWaterMark=computeNewHighWaterMark(n);if(n<=state.length)return n;if(!state.ended){state.needReadable=true;return 0}return state.length}Readable.prototype.read=function(n){debug("read",n);n=parseInt(n,10);var state=this._readableState;var nOrig=n;if(n!==0)state.emittedReadable=false;if(n===0&&state.needReadable&&(state.length>=state.highWaterMark||state.ended)){debug("read: emitReadable",state.length,state.ended);if(state.length===0&&state.ended)endReadable(this);else emitReadable(this);return null}n=howMuchToRead(n,state);if(n===0&&state.ended){if(state.length===0)endReadable(this);return null}var doRead=state.needReadable;debug("need readable",doRead);if(state.length===0||state.length-n<state.highWaterMark){doRead=true;debug("length less than watermark",doRead)}if(state.ended||state.reading){doRead=false;debug("reading or ended",doRead)}else if(doRead){debug("do read");state.reading=true;state.sync=true;if(state.length===0)state.needReadable=true;this._read(state.highWaterMark);state.sync=false;if(!state.reading)n=howMuchToRead(nOrig,state)}var ret;if(n>0)ret=fromList(n,state);else ret=null;if(ret===null){state.needReadable=true;n=0}else{state.length-=n}if(state.length===0){if(!state.ended)state.needReadable=true;if(nOrig!==n&&state.ended)endReadable(this)}if(ret!==null)this.emit("data",ret);return ret};function chunkInvalid(state,chunk){var er=null;if(!Buffer.isBuffer(chunk)&&typeof chunk!=="string"&&chunk!==null&&chunk!==undefined&&!state.objectMode){er=new TypeError("Invalid non-string/buffer chunk")}return er}function onEofChunk(stream,state){if(state.ended)return;if(state.decoder){var chunk=state.decoder.end();if(chunk&&chunk.length){state.buffer.push(chunk);state.length+=state.objectMode?1:chunk.length}}state.ended=true;emitReadable(stream)}function emitReadable(stream){var state=stream._readableState;state.needReadable=false;if(!state.emittedReadable){debug("emitReadable",state.flowing);state.emittedReadable=true;if(state.sync)processNextTick(emitReadable_,stream);else emitReadable_(stream)}}function emitReadable_(stream){debug("emit readable");stream.emit("readable");flow(stream)}function maybeReadMore(stream,state){if(!state.readingMore){state.readingMore=true;processNextTick(maybeReadMore_,stream,state)}}function maybeReadMore_(stream,state){var len=state.length;while(!state.reading&&!state.flowing&&!state.ended&&state.length<state.highWaterMark){debug("maybeReadMore read 0");stream.read(0);if(len===state.length)break;else len=state.length}state.readingMore=false}Readable.prototype._read=function(n){this.emit("error",new Error("not implemented"))};Readable.prototype.pipe=function(dest,pipeOpts){var src=this;var state=this._readableState;switch(state.pipesCount){case 0:state.pipes=dest;break;case 1:state.pipes=[state.pipes,dest];break;default:state.pipes.push(dest);break}state.pipesCount+=1;debug("pipe count=%d opts=%j",state.pipesCount,pipeOpts);var doEnd=(!pipeOpts||pipeOpts.end!==false)&&dest!==process.stdout&&dest!==process.stderr;var endFn=doEnd?onend:cleanup;if(state.endEmitted)processNextTick(endFn);else src.once("end",endFn);dest.on("unpipe",onunpipe);function onunpipe(readable){debug("onunpipe");if(readable===src){cleanup()}}function onend(){debug("onend");dest.end()}var ondrain=pipeOnDrain(src);dest.on("drain",ondrain);var cleanedUp=false;function cleanup(){debug("cleanup");dest.removeListener("close",onclose);dest.removeListener("finish",onfinish);dest.removeListener("drain",ondrain);dest.removeListener("error",onerror);dest.removeListener("unpipe",onunpipe);src.removeListener("end",onend);src.removeListener("end",cleanup);src.removeListener("data",ondata);cleanedUp=true;if(state.awaitDrain&&(!dest._writableState||dest._writableState.needDrain))ondrain()}var increasedAwaitDrain=false;src.on("data",ondata);function ondata(chunk){debug("ondata");increasedAwaitDrain=false;var ret=dest.write(chunk);if(false===ret&&!increasedAwaitDrain){if((state.pipesCount===1&&state.pipes===dest||state.pipesCount>1&&indexOf(state.pipes,dest)!==-1)&&!cleanedUp){debug("false write response, pause",src._readableState.awaitDrain);src._readableState.awaitDrain++;increasedAwaitDrain=true}src.pause()}}function onerror(er){debug("onerror",er);unpipe();dest.removeListener("error",onerror);if(EElistenerCount(dest,"error")===0)dest.emit("error",er)}prependListener(dest,"error",onerror);function onclose(){dest.removeListener("finish",onfinish);unpipe()}dest.once("close",onclose);function onfinish(){debug("onfinish");dest.removeListener("close",onclose);unpipe()}dest.once("finish",onfinish);function unpipe(){debug("unpipe");src.unpipe(dest)}dest.emit("pipe",src);if(!state.flowing){debug("pipe resume");src.resume()}return dest};function pipeOnDrain(src){return function(){var state=src._readableState;debug("pipeOnDrain",state.awaitDrain);if(state.awaitDrain)state.awaitDrain--;if(state.awaitDrain===0&&EElistenerCount(src,"data")){state.flowing=true;flow(src)}}}Readable.prototype.unpipe=function(dest){var state=this._readableState;if(state.pipesCount===0)return this;if(state.pipesCount===1){if(dest&&dest!==state.pipes)return this;if(!dest)dest=state.pipes;state.pipes=null;state.pipesCount=0;state.flowing=false;if(dest)dest.emit("unpipe",this);return this}if(!dest){var dests=state.pipes;var len=state.pipesCount;state.pipes=null;state.pipesCount=0;state.flowing=false;for(var _i=0;_i<len;_i++){dests[_i].emit("unpipe",this)}return this}var i=indexOf(state.pipes,dest);if(i===-1)return this;state.pipes.splice(i,1);state.pipesCount-=1;if(state.pipesCount===1)state.pipes=state.pipes[0];dest.emit("unpipe",this);return this};Readable.prototype.on=function(ev,fn){var res=Stream.prototype.on.call(this,ev,fn);if(ev==="data"){if(this._readableState.flowing!==false)this.resume()}else if(ev==="readable"){var state=this._readableState;if(!state.endEmitted&&!state.readableListening){state.readableListening=state.needReadable=true;state.emittedReadable=false;if(!state.reading){processNextTick(nReadingNextTick,this)}else if(state.length){emitReadable(this,state)}}}return res};Readable.prototype.addListener=Readable.prototype.on;function nReadingNextTick(self){debug("readable nexttick read 0");self.read(0)}Readable.prototype.resume=function(){var state=this._readableState;if(!state.flowing){debug("resume");state.flowing=true;resume(this,state)}return this};function resume(stream,state){if(!state.resumeScheduled){state.resumeScheduled=true;processNextTick(resume_,stream,state)}}function resume_(stream,state){if(!state.reading){debug("resume read 0");stream.read(0)}state.resumeScheduled=false;state.awaitDrain=0;stream.emit("resume");flow(stream);if(state.flowing&&!state.reading)stream.read(0)}Readable.prototype.pause=function(){debug("call pause flowing=%j",this._readableState.flowing);if(false!==this._readableState.flowing){debug("pause");this._readableState.flowing=false;this.emit("pause")}return this};function flow(stream){var state=stream._readableState;debug("flow",state.flowing);while(state.flowing&&stream.read()!==null){}}Readable.prototype.wrap=function(stream){var state=this._readableState;var paused=false;var self=this;stream.on("end",function(){debug("wrapped end");if(state.decoder&&!state.ended){var chunk=state.decoder.end();if(chunk&&chunk.length)self.push(chunk)}self.push(null)});stream.on("data",function(chunk){debug("wrapped data");if(state.decoder)chunk=state.decoder.write(chunk);if(state.objectMode&&(chunk===null||chunk===undefined))return;else if(!state.objectMode&&(!chunk||!chunk.length))return;var ret=self.push(chunk);if(!ret){paused=true;stream.pause()}});for(var i in stream){if(this[i]===undefined&&typeof stream[i]==="function"){this[i]=function(method){return function(){return stream[method].apply(stream,arguments)}}(i)}}var events=["error","close","destroy","pause","resume"];forEach(events,function(ev){stream.on(ev,self.emit.bind(self,ev))});self._read=function(n){debug("wrapped _read",n);if(paused){paused=false;stream.resume()}};return self};Readable._fromList=fromList;function fromList(n,state){if(state.length===0)return null;var ret;if(state.objectMode)ret=state.buffer.shift();else if(!n||n>=state.length){if(state.decoder)ret=state.buffer.join("");else if(state.buffer.length===1)ret=state.buffer.head.data;else ret=state.buffer.concat(state.length);state.buffer.clear()}else{ret=fromListPartial(n,state.buffer,state.decoder)}return ret}function fromListPartial(n,list,hasStrings){var ret;if(n<list.head.data.length){ret=list.head.data.slice(0,n);list.head.data=list.head.data.slice(n)}else if(n===list.head.data.length){ret=list.shift()}else{ret=hasStrings?copyFromBufferString(n,list):copyFromBuffer(n,list)}return ret}function copyFromBufferString(n,list){var p=list.head;var c=1;var ret=p.data;n-=ret.length;while(p=p.next){var str=p.data;var nb=n>str.length?str.length:n;if(nb===str.length)ret+=str;else ret+=str.slice(0,n);n-=nb;if(n===0){if(nb===str.length){++c;if(p.next)list.head=p.next;else list.head=list.tail=null}else{list.head=p;p.data=str.slice(nb)}break}++c}list.length-=c;return ret}function copyFromBuffer(n,list){var ret=bufferShim.allocUnsafe(n);var p=list.head;var c=1;p.data.copy(ret);n-=p.data.length;while(p=p.next){var buf=p.data;var nb=n>buf.length?buf.length:n;buf.copy(ret,ret.length-n,0,nb);n-=nb;if(n===0){if(nb===buf.length){++c;if(p.next)list.head=p.next;else list.head=list.tail=null}else{list.head=p;p.data=buf.slice(nb)}break}++c}list.length-=c;return ret}function endReadable(stream){var state=stream._readableState;if(state.length>0)throw new Error('"endReadable()" called on non-empty stream');if(!state.endEmitted){state.ended=true;processNextTick(endReadableNT,state,stream)}}function endReadableNT(state,stream){if(!state.endEmitted&&state.length===0){state.endEmitted=true;stream.readable=false;stream.emit("end")}}function forEach(xs,f){for(var i=0,l=xs.length;i<l;i++){f(xs[i],i)}}function indexOf(xs,x){for(var i=0,l=xs.length;i<l;i++){if(xs[i]===x)return i}return-1}}).call(this,require("_process"))},{"./_stream_duplex":44,"./internal/streams/BufferList":49,_process:42,buffer:5,"buffer-shims":4,"core-util-is":6,events:28,inherits:38,isarray:40,"process-nextick-args":41,"string_decoder/":56,util:3}],47:[function(require,module,exports){"use strict";module.exports=Transform;var Duplex=require("./_stream_duplex");var util=require("core-util-is");util.inherits=require("inherits");util.inherits(Transform,Duplex);function TransformState(stream){this.afterTransform=function(er,data){return afterTransform(stream,er,data)};this.needTransform=false;this.transforming=false;this.writecb=null;this.writechunk=null;this.writeencoding=null}function afterTransform(stream,er,data){var ts=stream._transformState;ts.transforming=false;var cb=ts.writecb;if(!cb)return stream.emit("error",new Error("no writecb in Transform class"));ts.writechunk=null;ts.writecb=null;if(data!==null&&data!==undefined)stream.push(data);cb(er);var rs=stream._readableState;rs.reading=false;if(rs.needReadable||rs.length<rs.highWaterMark){stream._read(rs.highWaterMark)}}function Transform(options){if(!(this instanceof Transform))return new Transform(options);Duplex.call(this,options);this._transformState=new TransformState(this);var stream=this;this._readableState.needReadable=true;this._readableState.sync=false;if(options){if(typeof options.transform==="function")this._transform=options.transform;if(typeof options.flush==="function")this._flush=options.flush}this.once("prefinish",function(){if(typeof this._flush==="function")this._flush(function(er){done(stream,er)});else done(stream)})}Transform.prototype.push=function(chunk,encoding){this._transformState.needTransform=false;return Duplex.prototype.push.call(this,chunk,encoding)};Transform.prototype._transform=function(chunk,encoding,cb){throw new Error("Not implemented")};Transform.prototype._write=function(chunk,encoding,cb){var ts=this._transformState;ts.writecb=cb;ts.writechunk=chunk;ts.writeencoding=encoding;if(!ts.transforming){var rs=this._readableState;if(ts.needTransform||rs.needReadable||rs.length<rs.highWaterMark)this._read(rs.highWaterMark)}};Transform.prototype._read=function(n){var ts=this._transformState;if(ts.writechunk!==null&&ts.writecb&&!ts.transforming){ts.transforming=true;this._transform(ts.writechunk,ts.writeencoding,ts.afterTransform)}else{ts.needTransform=true}};function done(stream,er){if(er)return stream.emit("error",er);var ws=stream._writableState;var ts=stream._transformState;if(ws.length)throw new Error("Calling transform done when ws.length != 0");if(ts.transforming)throw new Error("Calling transform done when still transforming");return stream.push(null)}},{"./_stream_duplex":44,"core-util-is":6,inherits:38}],48:[function(require,module,exports){(function(process){"use strict";module.exports=Writable;var processNextTick=require("process-nextick-args");var asyncWrite=!process.browser&&["v0.10","v0.9."].indexOf(process.version.slice(0,5))>-1?setImmediate:processNextTick;Writable.WritableState=WritableState;var util=require("core-util-is");util.inherits=require("inherits");var internalUtil={deprecate:require("util-deprecate")};var Stream;(function(){try{Stream=require("st"+"ream")}catch(_){}finally{if(!Stream)Stream=require("events").EventEmitter}})();var Buffer=require("buffer").Buffer;var bufferShim=require("buffer-shims");util.inherits(Writable,Stream);function nop(){}function WriteReq(chunk,encoding,cb){this.chunk=chunk;this.encoding=encoding;this.callback=cb;this.next=null}var Duplex;function WritableState(options,stream){Duplex=Duplex||require("./_stream_duplex");options=options||{};this.objectMode=!!options.objectMode;if(stream instanceof Duplex)this.objectMode=this.objectMode||!!options.writableObjectMode;var hwm=options.highWaterMark;var defaultHwm=this.objectMode?16:16*1024;this.highWaterMark=hwm||hwm===0?hwm:defaultHwm;this.highWaterMark=~~this.highWaterMark;this.needDrain=false;this.ending=false;this.ended=false;this.finished=false;var noDecode=options.decodeStrings===false;this.decodeStrings=!noDecode;this.defaultEncoding=options.defaultEncoding||"utf8";this.length=0;this.writing=false;this.corked=0;this.sync=true;this.bufferProcessing=false;this.onwrite=function(er){onwrite(stream,er)};this.writecb=null;this.writelen=0;this.bufferedRequest=null;this.lastBufferedRequest=null;this.pendingcb=0;this.prefinished=false;this.errorEmitted=false;this.bufferedRequestCount=0;this.corkedRequestsFree=new CorkedRequest(this)}WritableState.prototype.getBuffer=function writableStateGetBuffer(){var current=this.bufferedRequest;var out=[];while(current){out.push(current);current=current.next}return out};(function(){try{Object.defineProperty(WritableState.prototype,"buffer",{get:internalUtil.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer "+"instead.")})}catch(_){}})();var Duplex;function Writable(options){Duplex=Duplex||require("./_stream_duplex");if(!(this instanceof Writable)&&!(this instanceof Duplex))return new Writable(options);this._writableState=new WritableState(options,this);this.writable=true;if(options){if(typeof options.write==="function")this._write=options.write;if(typeof options.writev==="function")this._writev=options.writev}Stream.call(this)}Writable.prototype.pipe=function(){this.emit("error",new Error("Cannot pipe, not readable"))};function writeAfterEnd(stream,cb){var er=new Error("write after end");stream.emit("error",er);processNextTick(cb,er)}function validChunk(stream,state,chunk,cb){var valid=true;var er=false;if(chunk===null){er=new TypeError("May not write null values to stream")}else if(!Buffer.isBuffer(chunk)&&typeof chunk!=="string"&&chunk!==undefined&&!state.objectMode){er=new TypeError("Invalid non-string/buffer chunk")}if(er){stream.emit("error",er);processNextTick(cb,er);valid=false}return valid}Writable.prototype.write=function(chunk,encoding,cb){var state=this._writableState;var ret=false;if(typeof encoding==="function"){cb=encoding;encoding=null}if(Buffer.isBuffer(chunk))encoding="buffer";else if(!encoding)encoding=state.defaultEncoding;if(typeof cb!=="function")cb=nop;if(state.ended)writeAfterEnd(this,cb);else if(validChunk(this,state,chunk,cb)){
+state.pendingcb++;ret=writeOrBuffer(this,state,chunk,encoding,cb)}return ret};Writable.prototype.cork=function(){var state=this._writableState;state.corked++};Writable.prototype.uncork=function(){var state=this._writableState;if(state.corked){state.corked--;if(!state.writing&&!state.corked&&!state.finished&&!state.bufferProcessing&&state.bufferedRequest)clearBuffer(this,state)}};Writable.prototype.setDefaultEncoding=function setDefaultEncoding(encoding){if(typeof encoding==="string")encoding=encoding.toLowerCase();if(!(["hex","utf8","utf-8","ascii","binary","base64","ucs2","ucs-2","utf16le","utf-16le","raw"].indexOf((encoding+"").toLowerCase())>-1))throw new TypeError("Unknown encoding: "+encoding);this._writableState.defaultEncoding=encoding;return this};function decodeChunk(state,chunk,encoding){if(!state.objectMode&&state.decodeStrings!==false&&typeof chunk==="string"){chunk=bufferShim.from(chunk,encoding)}return chunk}function writeOrBuffer(stream,state,chunk,encoding,cb){chunk=decodeChunk(state,chunk,encoding);if(Buffer.isBuffer(chunk))encoding="buffer";var len=state.objectMode?1:chunk.length;state.length+=len;var ret=state.length<state.highWaterMark;if(!ret)state.needDrain=true;if(state.writing||state.corked){var last=state.lastBufferedRequest;state.lastBufferedRequest=new WriteReq(chunk,encoding,cb);if(last){last.next=state.lastBufferedRequest}else{state.bufferedRequest=state.lastBufferedRequest}state.bufferedRequestCount+=1}else{doWrite(stream,state,false,len,chunk,encoding,cb)}return ret}function doWrite(stream,state,writev,len,chunk,encoding,cb){state.writelen=len;state.writecb=cb;state.writing=true;state.sync=true;if(writev)stream._writev(chunk,state.onwrite);else stream._write(chunk,encoding,state.onwrite);state.sync=false}function onwriteError(stream,state,sync,er,cb){--state.pendingcb;if(sync)processNextTick(cb,er);else cb(er);stream._writableState.errorEmitted=true;stream.emit("error",er)}function onwriteStateUpdate(state){state.writing=false;state.writecb=null;state.length-=state.writelen;state.writelen=0}function onwrite(stream,er){var state=stream._writableState;var sync=state.sync;var cb=state.writecb;onwriteStateUpdate(state);if(er)onwriteError(stream,state,sync,er,cb);else{var finished=needFinish(state);if(!finished&&!state.corked&&!state.bufferProcessing&&state.bufferedRequest){clearBuffer(stream,state)}if(sync){asyncWrite(afterWrite,stream,state,finished,cb)}else{afterWrite(stream,state,finished,cb)}}}function afterWrite(stream,state,finished,cb){if(!finished)onwriteDrain(stream,state);state.pendingcb--;cb();finishMaybe(stream,state)}function onwriteDrain(stream,state){if(state.length===0&&state.needDrain){state.needDrain=false;stream.emit("drain")}}function clearBuffer(stream,state){state.bufferProcessing=true;var entry=state.bufferedRequest;if(stream._writev&&entry&&entry.next){var l=state.bufferedRequestCount;var buffer=new Array(l);var holder=state.corkedRequestsFree;holder.entry=entry;var count=0;while(entry){buffer[count]=entry;entry=entry.next;count+=1}doWrite(stream,state,true,state.length,buffer,"",holder.finish);state.pendingcb++;state.lastBufferedRequest=null;if(holder.next){state.corkedRequestsFree=holder.next;holder.next=null}else{state.corkedRequestsFree=new CorkedRequest(state)}}else{while(entry){var chunk=entry.chunk;var encoding=entry.encoding;var cb=entry.callback;var len=state.objectMode?1:chunk.length;doWrite(stream,state,false,len,chunk,encoding,cb);entry=entry.next;if(state.writing){break}}if(entry===null)state.lastBufferedRequest=null}state.bufferedRequestCount=0;state.bufferedRequest=entry;state.bufferProcessing=false}Writable.prototype._write=function(chunk,encoding,cb){cb(new Error("not implemented"))};Writable.prototype._writev=null;Writable.prototype.end=function(chunk,encoding,cb){var state=this._writableState;if(typeof chunk==="function"){cb=chunk;chunk=null;encoding=null}else if(typeof encoding==="function"){cb=encoding;encoding=null}if(chunk!==null&&chunk!==undefined)this.write(chunk,encoding);if(state.corked){state.corked=1;this.uncork()}if(!state.ending&&!state.finished)endWritable(this,state,cb)};function needFinish(state){return state.ending&&state.length===0&&state.bufferedRequest===null&&!state.finished&&!state.writing}function prefinish(stream,state){if(!state.prefinished){state.prefinished=true;stream.emit("prefinish")}}function finishMaybe(stream,state){var need=needFinish(state);if(need){if(state.pendingcb===0){prefinish(stream,state);state.finished=true;stream.emit("finish")}else{prefinish(stream,state)}}return need}function endWritable(stream,state,cb){state.ending=true;finishMaybe(stream,state);if(cb){if(state.finished)processNextTick(cb);else stream.once("finish",cb)}state.ended=true;stream.writable=false}function CorkedRequest(state){var _this=this;this.next=null;this.entry=null;this.finish=function(err){var entry=_this.entry;_this.entry=null;while(entry){var cb=entry.callback;state.pendingcb--;cb(err);entry=entry.next}if(state.corkedRequestsFree){state.corkedRequestsFree.next=_this}else{state.corkedRequestsFree=_this}}}}).call(this,require("_process"))},{"./_stream_duplex":44,_process:42,buffer:5,"buffer-shims":4,"core-util-is":6,events:28,inherits:38,"process-nextick-args":41,"util-deprecate":57}],49:[function(require,module,exports){"use strict";var Buffer=require("buffer").Buffer;var bufferShim=require("buffer-shims");module.exports=BufferList;function BufferList(){this.head=null;this.tail=null;this.length=0}BufferList.prototype.push=function(v){var entry={data:v,next:null};if(this.length>0)this.tail.next=entry;else this.head=entry;this.tail=entry;++this.length};BufferList.prototype.unshift=function(v){var entry={data:v,next:this.head};if(this.length===0)this.tail=entry;this.head=entry;++this.length};BufferList.prototype.shift=function(){if(this.length===0)return;var ret=this.head.data;if(this.length===1)this.head=this.tail=null;else this.head=this.head.next;--this.length;return ret};BufferList.prototype.clear=function(){this.head=this.tail=null;this.length=0};BufferList.prototype.join=function(s){if(this.length===0)return"";var p=this.head;var ret=""+p.data;while(p=p.next){ret+=s+p.data}return ret};BufferList.prototype.concat=function(n){if(this.length===0)return bufferShim.alloc(0);if(this.length===1)return this.head.data;var ret=bufferShim.allocUnsafe(n>>>0);var p=this.head;var i=0;while(p){p.data.copy(ret,i);i+=p.data.length;p=p.next}return ret}},{buffer:5,"buffer-shims":4}],50:[function(require,module,exports){module.exports=require("./lib/_stream_passthrough.js")},{"./lib/_stream_passthrough.js":45}],51:[function(require,module,exports){(function(process){var Stream=function(){try{return require("st"+"ream")}catch(_){}}();exports=module.exports=require("./lib/_stream_readable.js");exports.Stream=Stream||exports;exports.Readable=exports;exports.Writable=require("./lib/_stream_writable.js");exports.Duplex=require("./lib/_stream_duplex.js");exports.Transform=require("./lib/_stream_transform.js");exports.PassThrough=require("./lib/_stream_passthrough.js");if(!process.browser&&process.env.READABLE_STREAM==="disable"&&Stream){module.exports=Stream}}).call(this,require("_process"))},{"./lib/_stream_duplex.js":44,"./lib/_stream_passthrough.js":45,"./lib/_stream_readable.js":46,"./lib/_stream_transform.js":47,"./lib/_stream_writable.js":48,_process:42}],52:[function(require,module,exports){module.exports=require("./lib/_stream_transform.js")},{"./lib/_stream_transform.js":47}],53:[function(require,module,exports){module.exports=require("./lib/_stream_writable.js")},{"./lib/_stream_writable.js":48}],54:[function(require,module,exports){module.exports=function(string){return string.replace(/[-\\^$*+?.()|[\]{}]/g,"\\$&")}},{}],55:[function(require,module,exports){module.exports=Stream;var EE=require("events").EventEmitter;var inherits=require("inherits");inherits(Stream,EE);Stream.Readable=require("readable-stream/readable.js");Stream.Writable=require("readable-stream/writable.js");Stream.Duplex=require("readable-stream/duplex.js");Stream.Transform=require("readable-stream/transform.js");Stream.PassThrough=require("readable-stream/passthrough.js");Stream.Stream=Stream;function Stream(){EE.call(this)}Stream.prototype.pipe=function(dest,options){var source=this;function ondata(chunk){if(dest.writable){if(false===dest.write(chunk)&&source.pause){source.pause()}}}source.on("data",ondata);function ondrain(){if(source.readable&&source.resume){source.resume()}}dest.on("drain",ondrain);if(!dest._isStdio&&(!options||options.end!==false)){source.on("end",onend);source.on("close",onclose)}var didOnEnd=false;function onend(){if(didOnEnd)return;didOnEnd=true;dest.end()}function onclose(){if(didOnEnd)return;didOnEnd=true;if(typeof dest.destroy==="function")dest.destroy()}function onerror(er){cleanup();if(EE.listenerCount(this,"error")===0){throw er}}source.on("error",onerror);dest.on("error",onerror);function cleanup(){source.removeListener("data",ondata);dest.removeListener("drain",ondrain);source.removeListener("end",onend);source.removeListener("close",onclose);source.removeListener("error",onerror);dest.removeListener("error",onerror);source.removeListener("end",cleanup);source.removeListener("close",cleanup);dest.removeListener("close",cleanup)}source.on("end",cleanup);source.on("close",cleanup);dest.on("close",cleanup);dest.emit("pipe",source);return dest}},{events:28,inherits:38,"readable-stream/duplex.js":43,"readable-stream/passthrough.js":50,"readable-stream/readable.js":51,"readable-stream/transform.js":52,"readable-stream/writable.js":53}],56:[function(require,module,exports){var Buffer=require("buffer").Buffer;var isBufferEncoding=Buffer.isEncoding||function(encoding){switch(encoding&&encoding.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return true;default:return false}};function assertEncoding(encoding){if(encoding&&!isBufferEncoding(encoding)){throw new Error("Unknown encoding: "+encoding)}}var StringDecoder=exports.StringDecoder=function(encoding){this.encoding=(encoding||"utf8").toLowerCase().replace(/[-_]/,"");assertEncoding(encoding);switch(this.encoding){case"utf8":this.surrogateSize=3;break;case"ucs2":case"utf16le":this.surrogateSize=2;this.detectIncompleteChar=utf16DetectIncompleteChar;break;case"base64":this.surrogateSize=3;this.detectIncompleteChar=base64DetectIncompleteChar;break;default:this.write=passThroughWrite;return}this.charBuffer=new Buffer(6);this.charReceived=0;this.charLength=0};StringDecoder.prototype.write=function(buffer){var charStr="";while(this.charLength){var available=buffer.length>=this.charLength-this.charReceived?this.charLength-this.charReceived:buffer.length;buffer.copy(this.charBuffer,this.charReceived,0,available);this.charReceived+=available;if(this.charReceived<this.charLength){return""}buffer=buffer.slice(available,buffer.length);charStr=this.charBuffer.slice(0,this.charLength).toString(this.encoding);var charCode=charStr.charCodeAt(charStr.length-1);if(charCode>=55296&&charCode<=56319){this.charLength+=this.surrogateSize;charStr="";continue}this.charReceived=this.charLength=0;if(buffer.length===0){return charStr}break}this.detectIncompleteChar(buffer);var end=buffer.length;if(this.charLength){buffer.copy(this.charBuffer,0,buffer.length-this.charReceived,end);end-=this.charReceived}charStr+=buffer.toString(this.encoding,0,end);var end=charStr.length-1;var charCode=charStr.charCodeAt(end);if(charCode>=55296&&charCode<=56319){var size=this.surrogateSize;this.charLength+=size;this.charReceived+=size;this.charBuffer.copy(this.charBuffer,size,0,size);buffer.copy(this.charBuffer,0,0,size);return charStr.substring(0,end)}return charStr};StringDecoder.prototype.detectIncompleteChar=function(buffer){var i=buffer.length>=3?3:buffer.length;for(;i>0;i--){var c=buffer[buffer.length-i];if(i==1&&c>>5==6){this.charLength=2;break}if(i<=2&&c>>4==14){this.charLength=3;break}if(i<=3&&c>>3==30){this.charLength=4;break}}this.charReceived=i};StringDecoder.prototype.end=function(buffer){var res="";if(buffer&&buffer.length)res=this.write(buffer);if(this.charReceived){var cr=this.charReceived;var buf=this.charBuffer;var enc=this.encoding;res+=buf.slice(0,cr).toString(enc)}return res};function passThroughWrite(buffer){return buffer.toString(this.encoding)}function utf16DetectIncompleteChar(buffer){this.charReceived=buffer.length%2;this.charLength=this.charReceived?2:0}function base64DetectIncompleteChar(buffer){this.charReceived=buffer.length%3;this.charLength=this.charReceived?3:0}},{buffer:5}],57:[function(require,module,exports){(function(global){module.exports=deprecate;function deprecate(fn,msg){if(config("noDeprecation")){return fn}var warned=false;function deprecated(){if(!warned){if(config("throwDeprecation")){throw new Error(msg)}else if(config("traceDeprecation")){console.trace(msg)}else{console.warn(msg)}warned=true}return fn.apply(this,arguments)}return deprecated}function config(name){try{if(!global.localStorage)return false}catch(_){return false}var val=global.localStorage[name];if(null==val)return false;return String(val).toLowerCase()==="true"}}).call(this,typeof global!=="undefined"?global:typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{}],58:[function(require,module,exports){module.exports=extend;var hasOwnProperty=Object.prototype.hasOwnProperty;function extend(){var target={};for(var i=0;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(hasOwnProperty.call(source,key)){target[key]=source[key]}}}return target}},{}]},{},[1])(1)});
+
 /**
  * swagger-client - swagger-client is a javascript client for use with swaggering APIs.
- * @version v2.1.10
+ * @version v2.1.29
  * @link http://swagger.io
  * @license Apache-2.0
  */
@@ -973,7 +3238,7 @@ var _ = {
 };
 
 /**
- * SwaggerAuthorizations applys the correct authorization to an operation being executed
+ * SwaggerAuthorizations applies the correct authorization to an operation being executed
  */
 var SwaggerAuthorizations = module.exports.SwaggerAuthorizations = function (authz) {
   this.authz = authz || {};
@@ -1005,6 +3270,9 @@ SwaggerAuthorizations.prototype.apply = function (obj, securities) {
   var applyAll = !securities;
   var flattenedSecurities = [];
 
+  // favor the object-level authorizations over global
+  var authz = obj.clientAuthorizations || this.authz;
+
   // Securities could be [ {} ]
   _.each(securities, function (obj, key) {
 
@@ -1019,7 +3287,7 @@ SwaggerAuthorizations.prototype.apply = function (obj, securities) {
     });
   });
 
-  _.each(this.authz, function (auth, authName) {
+  _.each(authz, function (auth, authName) {
     if(applyAll || _.includes(flattenedSecurities, authName)) {
       var newStatus = auth.apply(obj);
       status = status && !!newStatus; // logical ORs regarding status
@@ -1107,7 +3375,7 @@ PasswordAuthorization.prototype.apply = function (obj) {
   return true;
 };
 
-},{"./helpers":4,"btoa":14,"cookiejar":19,"lodash-compat/collection/each":56,"lodash-compat/collection/includes":59,"lodash-compat/lang/isArray":144,"lodash-compat/lang/isObject":148}],3:[function(require,module,exports){
+},{"./helpers":4,"btoa":13,"cookiejar":18,"lodash-compat/collection/each":52,"lodash-compat/collection/includes":55,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isObject":144}],3:[function(require,module,exports){
 'use strict';
 
 var _ = {
@@ -1153,6 +3421,7 @@ var reservedClientTags = [
   'failure',
   'finish',
   'help',
+  'host',
   'idFromOp',
   'info',
   'initialize',
@@ -1175,7 +3444,8 @@ var reservedClientTags = [
   'tagFromLabel',
   'title',
   'url',
-  'useJQuery'
+  'useJQuery',
+  'jqueryAjaxCache'
 ];
 // We have to keep track of the function/property names to avoid collisions for tag names which are used to allow the
 // following usage: 'client.apis.{tagName}'
@@ -1193,7 +3463,7 @@ var reservedApiTags = [
   'path',
   'tag'
 ];
-var supportedOperationMethods = ['head', 'options', 'get', 'post', 'put', 'patch', 'delete'];
+var supportedOperationMethods = ['delete', 'get', 'head', 'options', 'patch', 'post', 'put'];
 var SwaggerClient = module.exports = function (url, options) {
   this.authorizations = null;
   this.authorizationScheme = null;
@@ -1207,8 +3477,9 @@ var SwaggerClient = module.exports = function (url, options) {
   this.resourceCount = 0;
   this.url = null;
   this.useJQuery = false;
+  this.jqueryAjaxCache = false;
   this.swaggerObject = {};
-  this.deferredClient = Q.defer();
+  this.deferredClient = undefined;
 
   this.clientAuthorizations = new auth.SwaggerAuthorizations();
 
@@ -1230,29 +3501,54 @@ SwaggerClient.prototype.initialize = function (url, options) {
     this.url = options.url;
   }
 
+  if(this.url && this.url.indexOf('http:') === -1 && this.url.indexOf('https:') === -1) {
+    // no protocol, so we can only use window if it exists
+    if(typeof(window) !== 'undefined' && window && window.location) {
+      this.url = window.location.origin + this.url;
+    }
+  }
+
   options = options || {};
   this.clientAuthorizations.add(options.authorizations);
   this.swaggerRequestHeaders = options.swaggerRequestHeaders || 'application/json;charset=utf-8,*/*';
   this.defaultSuccessCallback = options.defaultSuccessCallback || null;
   this.defaultErrorCallback = options.defaultErrorCallback || null;
   this.modelPropertyMacro = options.modelPropertyMacro || null;
+  this.connectionAgent = options.connectionAgent || null;
   this.parameterMacro = options.parameterMacro || null;
   this.usePromise = options.usePromise || null;
 
+  // operation request timeout default
+  this.timeout = options.timeout || null;
+  // default to request timeout when not specified
+  this.fetchSpecTimeout = typeof options.fetchSpecTimeout !== 'undefined' ?
+      options.fetchSpecTimeout : options.timeout || null;
+
+  if(this.usePromise) {
+    this.deferredClient = Q.defer();
+  }
+
   if (typeof options.success === 'function') {
     this.success = options.success;
   }
-
   if (options.useJQuery) {
     this.useJQuery = options.useJQuery;
   }
 
+  if (options.jqueryAjaxCache) {
+    this.jqueryAjaxCache = options.jqueryAjaxCache;
+  }
+
   if (options.enableCookies) {
     this.enableCookies = options.enableCookies;
   }
 
   this.options = options || {};
 
+  // maybe don't need this?
+  this.options.timeout = this.timeout;
+  this.options.fetchSpecTimeout = this.fetchSpecTimeout;
+
   this.supportedSubmitMethods = options.supportedSubmitMethods || [];
   this.failure = options.failure || function (err) { throw err; };
   this.progress = options.progress || function () {};
@@ -1275,10 +3571,17 @@ SwaggerClient.prototype.build = function (mock) {
 
   var self = this;
 
-  this.progress('fetching resource list: ' + this.url + '; Please wait.');
+  if (this.spec) {
+    this.progress('fetching resource list; Please wait.');
+  } else {
+    this.progress('fetching resource list: ' + this.url + '; Please wait.');
+  }
 
   var obj = {
     useJQuery: this.useJQuery,
+    jqueryAjaxCache: this.jqueryAjaxCache,
+    connectionAgent: this.connectionAgent,
+    enableCookies: this.enableCookies,
     url: this.url,
     method: 'get',
     headers: {
@@ -1288,6 +3591,8 @@ SwaggerClient.prototype.build = function (mock) {
       error: function (response) {
         if (self.url.substring(0, 4) !== 'http') {
           return self.fail('Please specify the protocol for ' + self.url);
+        } else if (response.errObj && (response.errObj.code === 'ECONNABORTED' || response.errObj.message.indexOf('timeout') !== -1)) {
+          return self.fail('Request timed out after ' + self.fetchSpecTimeout + 'ms');
         } else if (response.status === 0) {
           return self.fail('Can\'t read from server.  It may not have the appropriate access-control-origin settings.');
         } else if (response.status === 404) {
@@ -1327,10 +3632,15 @@ SwaggerClient.prototype.build = function (mock) {
     }
   };
 
+  // only set timeout when specified
+  if (this.fetchSpecTimeout) {
+    obj.timeout = this.fetchSpecTimeout;
+  }
+
   if (this.spec) {
     self.swaggerObject = this.spec;
     setTimeout(function () {
-      new Resolver().resolve(self.spec, self.buildFromSpec, self);
+      new Resolver().resolve(self.spec, self.url, self.buildFromSpec, self);
     }, 10);
   } else {
     this.clientAuthorizations.apply(obj);
@@ -1358,36 +3668,95 @@ SwaggerClient.prototype.buildFromSpec = function (response) {
   this.info = response.info || {};
   this.produces = response.produces;
   this.schemes = response.schemes || [];
-  this.securityDefinitions = response.securityDefinitions;
+  this.securityDefinitions = _.cloneDeep(response.securityDefinitions);
+  this.security = response.security;
   this.title = response.title || '';
 
+  var key, definedTags = {}, k, location, self = this, i;
+
   if (response.externalDocs) {
     this.externalDocs = response.externalDocs;
   }
 
   // legacy support
-  this.authSchemes = response.securityDefinitions;
+  this.authSchemes = this.securityDefinitions;
 
-  var definedTags = {};
-  var k;
+  if(this.securityDefinitions) {
+    for(key in this.securityDefinitions) {
+      var securityDefinition = this.securityDefinitions[key];
+      securityDefinition.vendorExtensions = {};
+      for(var ext in securityDefinition) {
+        helpers.extractExtensions(ext, securityDefinition);
+        if (ext === 'scopes') {
+          var scopes = securityDefinition[ext];
+          if(typeof scopes === 'object') {
+            scopes.vendorExtensions = {};
+            for (var s in scopes) {
+              helpers.extractExtensions(s, scopes);
+              if(s.indexOf('x-') === 0) {
+                delete scopes[s];
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 
   if (Array.isArray(response.tags)) {
     definedTags = {};
 
     for (k = 0; k < response.tags.length; k++) {
-      var t = response.tags[k];
+      var t = _.cloneDeep(response.tags[k]);
       definedTags[t.name] = t;
+      for(i in t) {
+        if(i === 'externalDocs' && typeof t[i] === 'object') {
+          for(var j in t[i]) {
+            helpers.extractExtensions(j, t[i]);
+          }
+        }
+        helpers.extractExtensions(i, t);
+      }
     }
   }
 
-  var location;
 
   if (typeof this.url === 'string') {
     location = this.parseUri(this.url);
     if (typeof this.scheme === 'undefined' && typeof this.schemes === 'undefined' || this.schemes.length === 0) {
-      this.scheme = location.scheme || 'http';
-    } else if (typeof this.scheme === 'undefined') {
-      this.scheme = this.schemes[0] || location.scheme;
+      if(typeof window !== 'undefined') {
+        // use the window scheme
+        this.scheme = window.location.protocol.replace(':','');
+      }
+      else {
+        this.scheme = location.scheme || 'http';
+      }
+    } else if (typeof window !== 'undefined' && window.location.protocol.indexOf('chrome-extension') === 0) {
+		// if it is chrome swagger ui extension scheme then let swagger doc url scheme decide the protocol
+		this.scheme = location.scheme;
+	} else if (typeof this.scheme === 'undefined') {
+      if(typeof window !== 'undefined') {
+        var scheme = window.location.protocol.replace(':','');
+        if(scheme === 'https' && this.schemes.indexOf(scheme) === -1) {
+          // can't call http from https served page in a browser!
+          helpers.log('Cannot call a http server from https inside a browser!');
+          this.scheme = 'http';
+        }
+        else if(this.schemes.indexOf(scheme) !== -1) {
+          this.scheme = scheme;
+        }
+        else {
+          if(this.schemes.indexOf('https') !== -1) {
+            this.scheme = 'https';
+          }
+          else {
+            this.scheme = 'http';
+          }
+        }
+      }
+      else {
+        this.scheme = this.schemes[0] || location.scheme;
+      }
     }
 
     if (typeof this.host === 'undefined' || this.host === '') {
@@ -1409,8 +3778,6 @@ SwaggerClient.prototype.buildFromSpec = function (response) {
 
   this.definitions = response.definitions;
 
-  var key;
-
   for (key in this.definitions) {
     var model = new Model(key, this.definitions[key], this.models, this.modelPropertyMacro);
 
@@ -1420,7 +3787,6 @@ SwaggerClient.prototype.buildFromSpec = function (response) {
   }
 
   // get paths, create functions for each operationId
-  var self = this;
 
   // Bind help to 'client.apis'
   self.apis.help = _.bind(self.help, self);
@@ -1462,6 +3828,20 @@ SwaggerClient.prototype.buildFromSpec = function (response) {
         self.models,
         self.clientAuthorizations);
 
+      operationObject.connectionAgent = self.connectionAgent;
+      operationObject.vendorExtensions = {};
+      for(i in operation) {
+        helpers.extractExtensions(i, operationObject, operation[i]);
+      }
+      operationObject.externalDocs = operation.externalDocs;
+      if(operationObject.externalDocs) {
+        operationObject.externalDocs = _.cloneDeep(operationObject.externalDocs);
+        operationObject.externalDocs.vendorExtensions = {};
+        for(i in operationObject.externalDocs) {
+          helpers.extractExtensions(i, operationObject.externalDocs);
+        }
+      }
+
       // bind self operation's execute command to the api
       _.forEach(tags, function (tag) {
         var clientProperty = _.indexOf(reservedClientTags, tag) > -1 ? '_' + tag : tag;
@@ -1499,6 +3879,7 @@ SwaggerClient.prototype.buildFromSpec = function (response) {
           if (!_.isUndefined(tagDef)) {
             operationGroup.description = tagDef.description;
             operationGroup.externalDocs = tagDef.externalDocs;
+            operationGroup.vendorExtensions = tagDef.vendorExtensions;
           }
 
           self[clientProperty].help = _.bind(self.help, operationGroup);
@@ -1534,6 +3915,32 @@ SwaggerClient.prototype.buildFromSpec = function (response) {
     });
   });
 
+  // sort the apisArray according to the tags
+  var sortedApis = [];
+  _.forEach(Object.keys(definedTags), function (tag) {
+    var pos;
+    for(pos in self.apisArray) {
+      var _api = self.apisArray[pos];
+      if(_api && tag === _api.name) {
+        sortedApis.push(_api);
+        self.apisArray[pos] = null;
+      }
+    }
+  });
+  // add anything left
+  _.forEach(self.apisArray, function (api) {
+    if(api) {
+      sortedApis.push(api);
+    }
+  });
+  self.apisArray = sortedApis;
+
+  _.forEach(response.definitions, function (definitionObj, definition) {
+    definitionObj.id = definition.toLowerCase();
+    definitionObj.name = definition;
+    self.modelsArray.push(definitionObj);
+  });
+
   this.isBuilt = true;
 
   if (this.usePromise) {
@@ -1661,6 +4068,22 @@ SwaggerClient.prototype.setBasePath = function (basePath) {
   }
 };
 
+SwaggerClient.prototype.setSchemes = function (schemes) {
+  this.schemes = schemes;
+
+  if(schemes && schemes.length > 0) {
+    if(this.apis) {
+      _.forEach(this.apis, function (api) {
+        if (api.operations) {
+          _.forEach(api.operations, function (operation) {
+            operation.scheme = schemes[0];
+          });
+        }
+      });
+    }
+  }
+};
+
 SwaggerClient.prototype.fail = function (message) {
   if (this.usePromise) {
     this.deferredClient.reject(message);
@@ -1675,7 +4098,7 @@ SwaggerClient.prototype.fail = function (message) {
   }
 };
 
-},{"./auth":2,"./helpers":4,"./http":5,"./resolver":6,"./spec-converter":8,"./types/model":9,"./types/operation":10,"./types/operationGroup":11,"lodash-compat/array/indexOf":53,"lodash-compat/collection/find":57,"lodash-compat/collection/forEach":58,"lodash-compat/function/bind":62,"lodash-compat/lang/cloneDeep":142,"lodash-compat/lang/isArray":144,"lodash-compat/lang/isFunction":146,"lodash-compat/lang/isObject":148,"lodash-compat/lang/isPlainObject":149,"lodash-compat/lang/isUndefined":152,"q":161}],4:[function(require,module,exports){
+},{"./auth":2,"./helpers":4,"./http":5,"./resolver":6,"./spec-converter":8,"./types/model":9,"./types/operation":10,"./types/operationGroup":11,"lodash-compat/array/indexOf":49,"lodash-compat/collection/find":53,"lodash-compat/collection/forEach":54,"lodash-compat/function/bind":58,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isFunction":142,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isPlainObject":145,"lodash-compat/lang/isUndefined":148,"q":157}],4:[function(require,module,exports){
 (function (process){
 'use strict';
 
@@ -1701,7 +4124,7 @@ module.exports.fail = function (message) {
   log(message);
 };
 
-var optionHtml = module.exports.optionHtml = function (label, value) {
+module.exports.optionHtml = function (label, value) {
   return '<tr><td class="optionName">' + label + ':</td><td>' + value + '</td></tr>';
 };
 
@@ -1713,7 +4136,7 @@ var resolveSchema = module.exports.resolveSchema = function (schema) {
   return schema;
 };
 
-var simpleRef = module.exports.simpleRef = function (name) {
+module.exports.simpleRef = function (name) {
   if (typeof name === 'undefined') {
     return null;
   }
@@ -1725,28 +4148,54 @@ var simpleRef = module.exports.simpleRef = function (name) {
   }
 };
 
+/**
+ * helper to remove extensions and add them to an object
+ *
+ * @param keyname
+ * @param obj
+ */
+module.exports.extractExtensions = function (keyname, obj, value) {
+  if(!keyname || !obj) {
+    return;
+  }
 
+  if (typeof keyname === 'string' && keyname.indexOf('x-') === 0) {
+    obj.vendorExtensions = obj.vendorExtensions || {};
+    if(value) {
+      obj.vendorExtensions[keyname] = value;
+    }
+    else {
+      obj.vendorExtensions[keyname] = obj[keyname];
+    }
+  }
+};
 }).call(this,require('_process'))
-//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9oZWxwZXJzLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgXyA9IHtcbiAgaXNQbGFpbk9iamVjdDogcmVxdWlyZSgnbG9kYXNoLWNvbXBhdC9sYW5nL2lzUGxhaW5PYmplY3QnKSxcbiAgaW5kZXhPZjogcmVxdWlyZSgnbG9kYXNoLWNvbXBhdC9hcnJheS9pbmRleE9mJylcbn07XG5cbm1vZHVsZS5leHBvcnRzLl9fYmluZCA9IGZ1bmN0aW9uIChmbiwgbWUpIHtcbiAgcmV0dXJuIGZ1bmN0aW9uKCl7XG4gICAgcmV0dXJuIGZuLmFwcGx5KG1lLCBhcmd1bWVudHMpO1xuICB9O1xufTtcblxudmFyIGxvZyA9IG1vZHVsZS5leHBvcnRzLmxvZyA9IGZ1bmN0aW9uKCkge1xuICAvLyBPbmx5IGxvZyBpZiBhdmFpbGFibGUgYW5kIHdlJ3JlIG5vdCB0ZXN0aW5nXG4gIGlmIChjb25zb2xlICYmIHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAndGVzdCcpIHtcbiAgICBjb25zb2xlLmxvZyhBcnJheS5wcm90b3R5cGUuc2xpY2UuY2FsbChhcmd1bWVudHMpWzBdKTtcbiAgfVxufTtcblxubW9kdWxlLmV4cG9ydHMuZmFpbCA9IGZ1bmN0aW9uIChtZXNzYWdlKSB7XG4gIGxvZyhtZXNzYWdlKTtcbn07XG5cbnZhciBvcHRpb25IdG1sID0gbW9kdWxlLmV4cG9ydHMub3B0aW9uSHRtbCA9IGZ1bmN0aW9uIChsYWJlbCwgdmFsdWUpIHtcbiAgcmV0dXJuICc8dHI+PHRkIGNsYXNzPVwib3B0aW9uTmFtZVwiPicgKyBsYWJlbCArICc6PC90ZD48dGQ+JyArIHZhbHVlICsgJzwvdGQ+PC90cj4nO1xufTtcblxudmFyIHJlc29sdmVTY2hlbWEgPSBtb2R1bGUuZXhwb3J0cy5yZXNvbHZlU2NoZW1hID0gZnVuY3Rpb24gKHNjaGVtYSkge1xuICBpZiAoXy5pc1BsYWluT2JqZWN0KHNjaGVtYS5zY2hlbWEpKSB7XG4gICAgc2NoZW1hID0gcmVzb2x2ZVNjaGVtYShzY2hlbWEuc2NoZW1hKTtcbiAgfVxuXG4gIHJldHVybiBzY2hlbWE7XG59O1xuXG52YXIgc2ltcGxlUmVmID0gbW9kdWxlLmV4cG9ydHMuc2ltcGxlUmVmID0gZnVuY3Rpb24gKG5hbWUpIHtcbiAgaWYgKHR5cGVvZiBuYW1lID09PSAndW5kZWZpbmVkJykge1xuICAgIHJldHVybiBudWxsO1xuICB9XG5cbiAgaWYgKG5hbWUuaW5kZXhPZignIy9kZWZpbml0aW9ucy8nKSA9PT0gMCkge1xuICAgIHJldHVybiBuYW1lLnN1YnN0cmluZygnIy9kZWZpbml0aW9ucy8nLmxlbmd0aCk7XG4gIH0gZWxzZSB7XG4gICAgcmV0dXJuIG5hbWU7XG4gIH1cbn07XG5cbiJdfQ==
-},{"_process":13,"lodash-compat/array/indexOf":53,"lodash-compat/lang/isPlainObject":149}],5:[function(require,module,exports){
+
+},{"_process":12,"lodash-compat/array/indexOf":49,"lodash-compat/lang/isPlainObject":145}],5:[function(require,module,exports){
+(function (Buffer){
 'use strict';
 
 var helpers = require('./helpers');
 var request = require('superagent');
 var jsyaml = require('js-yaml');
 var _ = {
-  isObject: require('lodash-compat/lang/isObject')
+  isObject: require('lodash-compat/lang/isObject'),
+  keys: require('lodash-compat/object/keys')
 };
 
 /*
  * JQueryHttpClient is a light-weight, node or browser HTTP client
  */
-var JQueryHttpClient = function () {};
+var JQueryHttpClient = function () {
+  this.type = 'JQueryHttpClient';
+};
 
 /*
  * SuperagentHttpClient is a light-weight, node or browser HTTP client
  */
-var SuperagentHttpClient = function () {};
+var SuperagentHttpClient = function () {
+  this.type = 'SuperagentHttpClient';
+};
 
 /**
  * SwaggerHttp is a wrapper for executing requests
@@ -1764,6 +4213,10 @@ SwaggerHttp.prototype.execute = function (obj, opts) {
   }
   client.opts = opts || {};
 
+  if (opts && opts.requestAgent) {
+    request = opts.requestAgent;
+  }
+
   // legacy support
   var hasJQuery = false;
   if(typeof window !== 'undefined') {
@@ -1771,6 +4224,11 @@ SwaggerHttp.prototype.execute = function (obj, opts) {
       hasJQuery = true;
     }
   }
+  // OPTIONS support
+  if(obj.method.toLowerCase() === 'options' && client.type === 'SuperagentHttpClient') {
+    log('forcing jQuery as OPTIONS are not supported by SuperAgent');
+    obj.useJQuery = true;
+  }
   if(this.isInternetExplorer() && (obj.useJQuery === false || !hasJQuery )) {
     throw new Error('Unsupported configuration! JQuery is required but not available');
   }
@@ -1779,6 +4237,7 @@ SwaggerHttp.prototype.execute = function (obj, opts) {
   }
 
   var success = obj.on.response;
+  var error = obj.on.error;
 
   var requestInterceptor = function(data) {
     if(opts && opts.requestInterceptor) {
@@ -1789,29 +4248,50 @@ SwaggerHttp.prototype.execute = function (obj, opts) {
 
   var responseInterceptor = function(data) {
     if(opts && opts.responseInterceptor) {
-      data = opts.responseInterceptor.apply(data);
+      data = opts.responseInterceptor.apply(data, [obj]);
     }
     return success(data);
   };
 
-  obj.on.response = function(data) {
-    responseInterceptor(data);
+  var errorInterceptor = function(data) {
+    if(opts && opts.responseInterceptor) {
+      data = opts.responseInterceptor.apply(data, [obj]);
+    }
+    error(data);
   };
 
+  obj.on.error = function(data) {
+    errorInterceptor(data);
+  };
+
+  obj.on.response = function(data) {
+    if(data && data.status >= 400) {
+      errorInterceptor(data);
+    }
+    else {
+      responseInterceptor(data);
+    }
+  };
 
   if (_.isObject(obj) && _.isObject(obj.body)) {
     // special processing for file uploads via jquery
     if (obj.body.type && obj.body.type === 'formData'){
-      obj.contentType = false;
-      obj.processData = false;
-
-      delete obj.headers['Content-Type'];
-    } else {
-      obj.body = JSON.stringify(obj.body);
+      if(opts.useJQuery) {
+        obj.contentType = false;
+        obj.processData = false;
+        delete obj.headers['Content-Type'];
+      }
     }
   }
 
-  client.execute(requestInterceptor(obj));
+  obj = requestInterceptor(obj) || obj;
+  if (obj.beforeSend) {
+    obj.beforeSend(function(_obj) {
+      client.execute(_obj || obj);
+    });
+  } else {
+    client.execute(obj);
+  }
 
   return (obj.deferred) ? obj.deferred.promise : obj;
 };
@@ -1835,34 +4315,19 @@ SwaggerHttp.prototype.isInternetExplorer = function () {
 };
 
 JQueryHttpClient.prototype.execute = function (obj) {
-  var jq = this.jQuery || window.jQuery;
+  var jq = this.jQuery || (typeof window !== 'undefined' && window.jQuery);
   var cb = obj.on;
   var request = obj;
 
+  if(typeof jq === 'undefined' || jq === false) {
+    throw new Error('Unsupported configuration! JQuery is required but not available');
+  }
+
   obj.type = obj.method;
-  obj.cache = false;
-  delete obj.useJQuery;
-
-  /*
-  obj.beforeSend = function (xhr) {
-    var key, results;
-    if (obj.headers) {
-      results = [];
-      for (key in obj.headers) {
-        if (key.toLowerCase() === 'content-type') {
-          results.push(obj.contentType = obj.headers[key]);
-        } else if (key.toLowerCase() === 'accept') {
-          results.push(obj.accepts = obj.headers[key]);
-        } else {
-          results.push(xhr.setRequestHeader(key, obj.headers[key]));
-        }
-      }
-      return results;
-    }
-  };*/
-
+  obj.cache = obj.jqueryAjaxCache;
   obj.data = obj.body;
-
+  delete obj.jqueryAjaxCache;
+  delete obj.useJQuery;
   delete obj.body;
 
   obj.complete = function (response) {
@@ -1927,23 +4392,74 @@ JQueryHttpClient.prototype.execute = function (obj) {
 
 SuperagentHttpClient.prototype.execute = function (obj) {
   var method = obj.method.toLowerCase();
+  var timeout = obj.timeout;
 
   if (method === 'delete') {
     method = 'del';
   }
   var headers = obj.headers || {};
+
   var r = request[method](obj.url);
-  var name;
-  for (name in headers) {
-    r.set(name, headers[name]);
+
+  if (obj.connectionAgent) {
+    r.agent(obj.connectionAgent);
+  }
+
+  if (timeout) {
+    r.timeout(timeout);
   }
 
   if (obj.enableCookies) {
     r.withCredentials();
   }
 
-  if (obj.body) {
-    r.send(obj.body);
+  var accept = obj.headers.Accept;
+
+  if(this.binaryRequest(accept)) {
+    r.on('request', function () {
+      if(this.xhr) {
+        this.xhr.responseType = 'blob';
+      }
+    });
+  }
+
+  if(obj.body) {
+    if(_.isObject(obj.body)) {
+      var contentType = obj.headers['Content-Type'] || '';
+      if (contentType.indexOf('multipart/form-data') === 0) {
+        delete headers['Content-Type'];
+        if({}.toString.apply(obj.body) === '[object FormData]') {
+          r.send(obj.body);
+        }
+        else {
+          var keyname, value, v;
+          for (keyname in obj.body) {
+            value = obj.body[keyname];
+            if(Array.isArray(value)) {
+              for(v in value) {
+                r.field(keyname, v);
+              }
+            }
+            else {
+              r.field(keyname, value);
+            }
+          }
+        }
+      }
+      else if (_.isObject(obj.body)) {
+        // non multipart/form-data
+        obj.body = JSON.stringify(obj.body);
+        r.send(obj.body);
+      }
+    }
+    else {
+      r.send(obj.body);
+    }
+  }
+
+  var name;
+  for (name in headers) {
+    r.set(name, headers[name]);
   }
 
   if(typeof r.buffer === 'function') {
@@ -1970,8 +4486,8 @@ SuperagentHttpClient.prototype.execute = function (obj) {
       response.errObj = err;
       response.status = res ? res.status : 500;
       response.statusText = res ? res.text : err.message;
-      if(res.headers && res.headers['content-type']) {
-        if(res.headers['content-type'].indexOf('application/json') >= 0) {
+      if (res.headers && res.headers['content-type']) {
+        if (res.headers['content-type'].indexOf('application/json') >= 0) {
           try {
             response.obj = JSON.parse(response.statusText);
           }
@@ -1985,26 +4501,36 @@ SuperagentHttpClient.prototype.execute = function (obj) {
       var possibleObj;
 
       // Already parsed by by superagent?
-      if(res.body && Object.keys(res.body).length > 0) {
+      if (res.body && _.keys(res.body).length > 0) {
         possibleObj = res.body;
       } else {
-          try {
-            possibleObj = jsyaml.safeLoad(res.text);
-            // can parse into a string... which we don't need running around in the system
-            possibleObj = (typeof possibleObj === 'string') ? null : possibleObj;
-          } catch(e) {
-            helpers.log('cannot parse JSON/YAML content');
-          }
+        try {
+          possibleObj = jsyaml.safeLoad(res.text);
+          // can parse into a string... which we don't need running around in the system
+          possibleObj = (typeof possibleObj === 'string') ? null : possibleObj;
+        } catch (e) {
+          helpers.log('cannot parse JSON/YAML content');
+        }
       }
 
       // null means we can't parse into object
-      response.obj = (typeof possibleObj === 'object') ? possibleObj : null;
+      if(typeof Buffer === 'function' && Buffer.isBuffer(possibleObj)) {
+        response.data = possibleObj;
+      }
+      else {
+        response.obj = (typeof possibleObj === 'object') ? possibleObj : null;
+      }
 
       response.status = res.status;
       response.statusText = res.text;
       cb = obj.on.response;
     }
-    response.data = response.statusText;
+    if (res.xhr && res.xhr.response) {
+      response.data = res.xhr.response;
+    }
+    else if(!response.data) {
+      response.data = response.statusText;
+    }
 
     if (cb) {
       cb(response);
@@ -2012,21 +4538,37 @@ SuperagentHttpClient.prototype.execute = function (obj) {
   });
 };
 
-},{"./helpers":4,"js-yaml":20,"lodash-compat/lang/isObject":148,"superagent":162}],6:[function(require,module,exports){
+SuperagentHttpClient.prototype. binaryRequest = function (accept) {
+  if(!accept) {
+    return false;
+  }
+  return (/^image/i).test(accept)
+    || (/^application\/pdf/).test(accept)
+    || (/^application\/octet-stream/).test(accept);
+};
+
+}).call(this,require("buffer").Buffer)
+
+},{"./helpers":4,"buffer":14,"js-yaml":19,"lodash-compat/lang/isObject":144,"lodash-compat/object/keys":149,"superagent":158}],6:[function(require,module,exports){
 'use strict';
 
 var SwaggerHttp = require('./http');
 var _ = {
   isObject: require('lodash-compat/lang/isObject'),
   cloneDeep: require('lodash-compat/lang/cloneDeep'),
-  isArray: require('lodash-compat/lang/isArray')
+  isArray: require('lodash-compat/lang/isArray'),
+  isString: require('lodash-compat/lang/isString')
 };
 
 
 /**
  * Resolves a spec's remote references
  */
-var Resolver = module.exports = function () {};
+var Resolver = module.exports = function () {
+  this.failedUrls = [];
+  this.resolverCache = {};
+  this.pendingUrls = {};
+};
 
 Resolver.prototype.processAllOf = function(root, name, definition, resolutionTable, unresolvedRefs, spec) {
   var i, location, property;
@@ -2054,7 +4596,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
     callback = arg1;
     scope = arg2;
   }
-  var _root = root;
+  var _root = root, modelName;
   this.scope = (scope || this);
   this.iteration = this.iteration || 0;
 
@@ -2066,7 +4608,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
     opts.responseInterceptor = this.scope.options.responseInterceptor;
   }
 
-  var name, path, property, propertyName;
+  var name, path, property, propertyName, parameter, done, counter;
   var processedCalls = 0, resolvedRefs = {}, unresolvedRefs = {};
   var resolutionTable = []; // store objects for dereferencing
 
@@ -2074,18 +4616,57 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
   // definitions
   for (name in spec.definitions) {
     var definition = spec.definitions[name];
-    for (propertyName in definition.properties) {
-      property = definition.properties[propertyName];
-      if(_.isArray(property.allOf)) {
-        this.processAllOf(root, name, property, resolutionTable, unresolvedRefs, spec);
+    if(definition.$ref) {
+      this.resolveInline(root, spec, definition, resolutionTable, unresolvedRefs, definition);
+    }
+    else {
+      for (propertyName in definition.properties) {
+        property = definition.properties[propertyName];
+        if (_.isArray(property.allOf)) {
+          this.processAllOf(root, name, property, resolutionTable, unresolvedRefs, spec);
+        }
+        else {
+          this.resolveTo(root, property, resolutionTable, '/definitions');
+        }
+      }
+
+      if (definition.allOf) {
+        this.processAllOf(root, name, definition, resolutionTable, unresolvedRefs, spec);
+      }
+    }
+  }
+
+  // shared parameters
+  spec.parameters = spec.parameters || {};
+  for(name in spec.parameters) {
+    parameter = spec.parameters[name];
+    if (parameter.in === 'body' && parameter.schema) {
+      if(_.isArray(parameter.schema.allOf)) {
+        // move to a definition
+        modelName = 'inline_model';
+        var _name = modelName;
+        done = false; counter = 0;
+        while(!done) {
+          if(typeof spec.definitions[_name] === 'undefined') {
+            done = true;
+            break;
+          }
+          _name = modelName + '_' + counter;
+          counter ++;
+        }
+        spec.definitions[_name] = { allOf: parameter.schema.allOf };
+        delete parameter.schema.allOf;
+        parameter.schema.$ref = '#/definitions/' + _name;
+        this.processAllOf(root, _name, spec.definitions[_name], resolutionTable, unresolvedRefs, spec);
       }
       else {
-        this.resolveTo(root, property, resolutionTable, '/definitions');
+        this.resolveTo(root, parameter.schema, resolutionTable, location);
       }
     }
 
-    if(definition.allOf) {
-      this.processAllOf(root, name, definition, resolutionTable, unresolvedRefs, spec);
+    if (parameter.$ref) {
+      // parameter reference
+      this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);
     }
   }
 
@@ -2094,78 +4675,110 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
     var method, operation, responseCode;
     path = spec.paths[name];
 
-    for (method in path) {
-      // operation reference
-      if(method === '$ref') {
-        // location = path[method];
-        location = '/paths' + name;
-        this.resolveInline(root, spec, path, resolutionTable, unresolvedRefs, location);
-      }
-      else {
-        operation = path[method];
-        var sharedParameters = path.parameters || [];
-        var parameters = operation.parameters || [];
-
-        for (i in sharedParameters) {
-          var parameter = sharedParameters[i];
-          parameters.unshift(parameter);
-        }
-        if(method !== 'parameters' && _.isObject(operation)) {
-          operation.parameters = operation.parameters || parameters;
+    if(typeof path === 'object') {
+      for (method in path) {
+        // operation reference
+        if (method === '$ref') {
+          // location = path[method];
+          location = '/paths' + name;
+          this.resolveInline(root, spec, path, resolutionTable, unresolvedRefs, location);
         }
+        else {
+          operation = path[method];
+          var sharedParameters = path.parameters || [];
+          var parameters = operation.parameters || [];
 
-        for (i in parameters) {
-          var parameter = parameters[i];
-          location = '/paths' + name + '/' + method + '/parameters';
+          sharedParameters.forEach(function(parameter) {
+            parameters.unshift(parameter);
+          });
 
-          if (parameter.in === 'body' && parameter.schema) {
-            if(_.isArray(parameter.schema.allOf)) {
-              // move to a definition
-              var modelName = 'inline_model';
-              var name = modelName;
-              var done = false; var counter = 0;
-              while(!done) {
-                if(typeof spec.definitions[name] === 'undefined') {
-                  done = true;
-                  break;
+          if (method !== 'parameters' && _.isObject(operation)) {
+            operation.parameters = operation.parameters || parameters;
+          }
+
+          for (i in parameters) {
+            parameter = parameters[i];
+            location = '/paths' + name + '/' + method + '/parameters';
+
+            if (parameter.in === 'body' && parameter.schema) {
+              if (_.isArray(parameter.schema.allOf)) {
+                // move to a definition
+                modelName = 'inline_model';
+                name = modelName;
+                done = false;
+                counter = 0;
+                while (!done) {
+                  if (typeof spec.definitions[name] === 'undefined') {
+                    done = true;
+                    break;
+                  }
+                  name = modelName + '_' + counter;
+                  counter++;
                 }
-                name = modelName + '_' + counter;
-                counter ++;
+                spec.definitions[name] = {allOf: parameter.schema.allOf};
+                delete parameter.schema.allOf;
+                parameter.schema.$ref = '#/definitions/' + name;
+                this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);
+              }
+              else {
+                this.resolveTo(root, parameter.schema, resolutionTable, location);
               }
-              spec.definitions[name] = { allOf: parameter.schema.allOf };
-              delete parameter.schema.allOf;
-              parameter.schema.$ref = '#/definitions/' + name;
-              this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);
             }
-            else {
-              this.resolveTo(root, parameter.schema, resolutionTable, location);
+
+            if (parameter.$ref) {
+              // parameter reference
+              this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);
             }
           }
 
-          if (parameter.$ref) {
-            // parameter reference
-            this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);
-          }
-        }
+          for (responseCode in operation.responses) {
+            var response = operation.responses[responseCode];
+            location = '/paths' + name + '/' + method + '/responses/' + responseCode;
 
-        for (responseCode in operation.responses) {
-          var response = operation.responses[responseCode];
-          location = '/paths' + name + '/' + method + '/responses/' + responseCode;
-
-          if(_.isObject(response)) {
-            if(response.$ref) {
-              // response reference
-              this.resolveInline(root, spec, response, resolutionTable, unresolvedRefs, location);
-            }
-            if (response.schema) {
-              this.resolveTo(root, response.schema, resolutionTable, location);
+            if (_.isObject(response)) {
+              if (response.$ref) {
+                // response reference
+                this.resolveInline(root, spec, response, resolutionTable, unresolvedRefs, location);
+              }
+              if (response.schema) {
+                var responseObj = response;
+                if (_.isArray(responseObj.schema.allOf)) {
+                  // move to a definition
+                  modelName = 'inline_model';
+                  name = modelName;
+                  done = false;
+                  counter = 0;
+                  while (!done) {
+                    if (typeof spec.definitions[name] === 'undefined') {
+                      done = true;
+                      break;
+                    }
+                    name = modelName + '_' + counter;
+                    counter++;
+                  }
+                  spec.definitions[name] = {allOf: responseObj.schema.allOf};
+                  delete responseObj.schema.allOf;
+                  delete responseObj.schema.type;
+                  responseObj.schema.$ref = '#/definitions/' + name;
+                  this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);
+                }
+                else if ('array' === responseObj.schema.type) {
+                  if (responseObj.schema.items && responseObj.schema.items.$ref) {
+                    // response reference
+                    this.resolveInline(root, spec, responseObj.schema.items, resolutionTable, unresolvedRefs, location);
+                  }
+                }
+                else {
+                  this.resolveTo(root, response.schema, resolutionTable, location);
+                }
+              }
             }
           }
         }
       }
+      // clear them out to avoid multiple resolutions
+      path.parameters = [];
     }
-    // clear them out to avoid multiple resolutions
-    path.parameters = [];
   }
 
   var expectedCalls = 0, toResolve = [];
@@ -2205,7 +4818,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
         else {
           parts = a.key.split('#');
           if(parts.length === 2) {
-            if(parts[0].indexOf('http://') === 0 || parts[0].indexOf('https://') === 0) {
+            if(parts[0].indexOf('http:') === 0 || parts[0].indexOf('https:') === 0) {
               a.root = parts[0];
             }
             location = parts[1].split('/');
@@ -2255,9 +4868,11 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
   expectedCalls = toResolve.length;
 
   // resolve anything that is local
+
+  var lock = {};
   for(var ii = 0; ii < toResolve.length; ii++) {
-    (function(item, spec, self) {
-      if(item.root === null || item.root === root) {
+    (function(item, spec, self, lock, ii) {
+      if(!item.root || item.root === root) {
         // local resolve
         self.resolveItem(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, item);
         processedCalls += 1;
@@ -2266,7 +4881,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
           self.finish(spec, root, resolutionTable, resolvedRefs, unresolvedRefs, callback, true);
         }
       }
-      else {
+      else if(self.failedUrls.indexOf(item.root) === -1) {
         var obj = {
           useJQuery: false,  // TODO
           url: item.root,
@@ -2277,6 +4892,11 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
           on: {
             error: function (error) {
               processedCalls += 1;
+              console.log('failed url: ' + obj.url);
+              self.failedUrls.push(obj.url);
+              if (lock) {
+                delete lock[item.root];
+              }
               unresolvedRefs[item.key] = {
                 root: item.root,
                 location: item.location
@@ -2288,6 +4908,12 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
             },  // jshint ignore:line
             response: function (response) {
               var swagger = response.obj;
+              if (lock) {
+                delete lock[item.root];
+              }
+              if (self.resolverCache) {
+                self.resolverCache[item.root] = swagger;
+              }
               self.resolveItem(swagger, item.root, resolutionTable, resolvedRefs, unresolvedRefs, item);
               processedCalls += 1;
 
@@ -2298,13 +4924,45 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
           } // jshint ignore:line
         };
 
+        // apply timeout only when specified
+        if (scope && scope.fetchSpecTimeout) {
+          obj.timeout = scope.fetchSpecTimeout;
+        }
+
         if (scope && scope.clientAuthorizations) {
           scope.clientAuthorizations.apply(obj);
         }
 
-        new SwaggerHttp().execute(obj, opts);
+        (function waitForUnlock() {
+          setTimeout(function() {
+            if (lock[obj.url]) {
+              waitForUnlock();
+            }
+            else {
+              var cached = self.resolverCache[obj.url];
+              if (_.isObject(cached)) {
+                obj.on.response({obj: cached});
+              }
+              else {
+                lock[obj.url] = true;
+                new SwaggerHttp().execute(obj, opts);
+              }
+            }
+          }, 0);
+        })();
       }
-    }(toResolve[ii], spec, this));
+
+      else {
+        processedCalls += 1;
+        unresolvedRefs[item.key] = {
+          root: item.root,
+          location: item.location
+        };
+        if (processedCalls === expectedCalls) {
+          self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);
+        }
+      }
+    }(toResolve[ii], spec, this, lock, ii));
   }
 
   if (Object.keys(toResolve).length === 0) {
@@ -2361,7 +5019,7 @@ Resolver.prototype.resolveItem = function(spec, root, resolutionTable, resolvedR
 
 Resolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs, unresolvedRefs, callback, localResolve) {
   // walk resolution table and replace with resolved refs
-  var ref;
+  var ref, abs;
   for (ref in resolutionTable) {
     var item = resolutionTable[ref];
 
@@ -2373,7 +5031,8 @@ Resolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs,
         if (localResolve !== true) {
           // don't retain root for local definitions
           for (key in resolvedTo.obj) {
-            var abs = this.retainRoot(resolvedTo.obj[key], item.root);
+            abs = this.retainRoot(key, resolvedTo.obj[key], item.root);
+            resolvedTo.obj[key] = abs;
           }
         }
         spec.definitions[resolvedTo.name] = resolvedTo.obj;
@@ -2384,11 +5043,11 @@ Resolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs,
         delete targetObj.$ref;
 
         for (key in resolvedTo.obj) {
-          var abs = resolvedTo.obj[key];
-          
+          abs = resolvedTo.obj[key];
+
           if (localResolve !== true) {
             // don't retain root for local definitions
-            abs = this.retainRoot(resolvedTo.obj[key], item.root);
+            abs = this.retainRoot(key, resolvedTo.obj[key], item.root);
           }
           targetObj[key] = abs;
         }
@@ -2399,6 +5058,7 @@ Resolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs,
 
   if(existingUnresolved === 0 || this.iteration > 5) {
     this.resolveAllOf(spec.definitions);
+    this.resolverCache = null;
     callback.call(this.scope, spec, unresolvedRefs);
   }
   else {
@@ -2462,23 +5122,94 @@ Resolver.prototype.getRefs = function(spec, obj) {
   return output;
 };
 
-Resolver.prototype.retainRoot = function(obj, root) {
+function splitUrl(url) {
+  var result = {};
+  var proto = /[a-z]+:\/\//i.exec(url);
+  if (proto) {
+    result.proto = proto[0].slice(0, -3);
+    url = url.slice(result.proto.length + 1);
+  }
+  if (url.slice(0, 2) === '//') {
+    result.domain = url.slice(2).split('/')[0];
+    url = url.slice(2 + result.domain.length);
+  }
+  var p = url.split('#');
+  if (p[0].length) {
+    result.path = p[0];
+  }
+  if (p.length > 1) {
+    result.fragment = p.slice(1).join('#');
+  }
+  return result;
+}
+
+function unsplitUrl(url) {
+  var result = url.path;
+  if (result === undefined) {
+    result = '';
+  }
+  if (url.fragment !== undefined) {
+    result += '#' + url.fragment;
+  }
+  if (url.domain !== undefined) {
+    if (result.slice(0, 1) === '/') {
+      result = result.slice(1);
+    }
+    result = '//' + url.domain + '/' + result;
+    if (url.proto !== undefined) {
+      result = url.proto + ':' + result;
+    }
+  }
+  return result;
+}
+
+function joinUrl(base, rel) {
+  var relsp = splitUrl(rel);
+  if (relsp.domain !== undefined) {
+    return rel;
+  }
+  var result = splitUrl(base);
+  if (relsp.path === undefined) {
+    // change only fragment part
+    result.fragment = relsp.fragment;
+  } else if (relsp.path.slice(0, 1) === '/') {
+    // relative to domain
+    result.path = relsp.path;
+    result.fragment = relsp.fragment;
+  } else {
+    // relative to path
+    var path = result.path === undefined ? [] : result.path.split('/');
+    var relpath = relsp.path.split('/');
+    if (path.length) {
+      path.pop();
+    }
+    while (relpath[0] === '..' || relpath[0] === '.') {
+      if (relpath[0] === '..') {
+        path.pop();
+      }
+      relpath.shift();
+    }
+    result.path = path.concat(relpath).join('/');
+    result.fragment = relsp.fragment;
+  }
+  return unsplitUrl(result);
+}
+
+Resolver.prototype.retainRoot = function(origKey, obj, root) {
   // walk object and look for relative $refs
-  for(var key in obj) {
-    var item = obj[key];
-    if(key === '$ref' && typeof item === 'string') {
-      // stop and inspect
-      if(item.indexOf('http://') !== 0 && item.indexOf('https://') !== 0) {
-        if(item.indexOf('#') !== 0) {
-          item = '#' + item;
-        }
-        item = (root || '') + item;
-        obj[key] = item;
+  if(_.isObject(obj)) {
+    for(var key in obj) {
+      var item = obj[key];
+      if (key === '$ref' && typeof item === 'string') {
+        obj[key] = joinUrl(root, item);
+      }
+      else if (_.isObject(item)) {
+        this.retainRoot(key, item, root);
       }
     }
-    else if(_.isObject(item)) {
-      this.retainRoot(item, root);
-    }
+  }
+  else if(_.isString(obj) && origKey === '$ref') {
+    obj = joinUrl(root, obj);
   }
   return obj;
 };
@@ -2490,6 +5221,10 @@ Resolver.prototype.retainRoot = function(obj, root) {
 Resolver.prototype.resolveInline = function (root, spec, property, resolutionTable, unresolvedRefs, location) {
   var key = property.$ref, ref = property.$ref, i, p, p2, rs;
   var rootTrimmed = false;
+
+  root = root || ''; // Guard against .split. @fehguy, you'll need to check if this logic fits
+  // More imporantly is how do we gracefully handle relative urls, when provided just a 'spec', not a 'url' ?
+
   if (ref) {
     if(ref.indexOf('../') === 0) {
       // reset root
@@ -2536,7 +5271,7 @@ Resolver.prototype.resolveInline = function (root, spec, property, resolutionTab
         location = rs[1];
       }
     }
-    if (ref.indexOf('http') === 0) {
+    if (ref.indexOf('http:') === 0 || ref.indexOf('https:') === 0) {
       if(ref.indexOf('#') >= 0) {
         root = ref.split('#')[0];
         location = ref.split('#')[1];
@@ -2549,6 +5284,14 @@ Resolver.prototype.resolveInline = function (root, spec, property, resolutionTab
     } else if (ref.indexOf('#') === 0) {
       location = ref.split('#')[1];
       resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});
+    } else if (ref.indexOf('/') === 0 && ref.indexOf('#') === -1) {
+      location = ref;
+      var matches = root.match(/^https?\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
+      if(matches) {
+        root = matches[0] + ref.substring(1);
+        location = '';
+      }
+      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});
     }
     else {
       resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});
@@ -2563,7 +5306,7 @@ Resolver.prototype.resolveTo = function (root, property, resolutionTable, locati
   var sp, i;
   var ref = property.$ref;
   var lroot = root;
-  if (typeof ref !== 'undefined') {
+  if ((typeof ref !== 'undefined') && (ref !== null)) {
     if(ref.indexOf('#') >= 0) {
       var parts = ref.split('#');
 
@@ -2572,7 +5315,7 @@ Resolver.prototype.resolveTo = function (root, property, resolutionTable, locati
       if(parts[0] && ref.indexOf('/') === 0) {
 
       }
-      else if(parts[0] && parts[0].indexOf('http') === 0) {
+      else if(parts[0] && (parts[0].indexOf('http:') === 0 || parts[0].indexOf('https:') === 0)) {
         lroot = parts[0];
         ref = parts[1];
       }
@@ -2591,7 +5334,7 @@ Resolver.prototype.resolveTo = function (root, property, resolutionTable, locati
 
       location = parts[1];
     }
-    else if (ref.indexOf('http://') === 0 || ref.indexOf('https://') === 0) {
+    else if (ref.indexOf('http:') === 0 || ref.indexOf('https:') === 0) {
       lroot = ref;
       location = '';
     }
@@ -2612,10 +5355,14 @@ Resolver.prototype.resolveTo = function (root, property, resolutionTable, locati
     var items = property.items;
     this.resolveTo(root, items, resolutionTable, location);
   } else {
-    if(property && property.properties) {
+    if(property && (property.properties || property.additionalProperties)) {
       var name = this.uniqueName('inline_model');
+      if (property.title) {
+        name = this.uniqueName(property.title);
+      }
+      delete property.title;
       this.spec.definitions[name] = _.cloneDeep(property);
-      property['$ref'] = '#/definitions/' + name;
+      property.$ref = '#/definitions/' + name;
       delete property.type;
       delete property.properties;
     }
@@ -2711,13 +5458,10 @@ Resolver.prototype.resolveAllOf = function(spec, obj, depth) {
         obj[key] = output;
       }
     }
-    if(_.isObject(item)) {
-      this.resolveAllOf(spec, item, depth + 1);
-    }
   }
 };
 
-},{"./http":5,"lodash-compat/lang/cloneDeep":142,"lodash-compat/lang/isArray":144,"lodash-compat/lang/isObject":148}],7:[function(require,module,exports){
+},{"./http":5,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isString":146}],7:[function(require,module,exports){
 'use strict';
 
 var Helpers = require('./helpers');
@@ -2735,17 +5479,11 @@ var _ = {
   forEach: require('lodash-compat/collection/forEach')
 };
 
-module.exports.optionHtml = optionHtml;
-module.exports.typeFromJsonSchema = typeFromJsonSchema;
-module.exports.getStringSignature = getStringSignature;
-module.exports.schemaToHTML = schemaToHTML;
-module.exports.schemaToJSON = schemaToJSON;
-
-function optionHtml(label, value) {
+var optionHtml = module.exports.optionHtml = function  (label, value) {
   return '<tr><td class="optionName">' + label + ':</td><td>' + value + '</td></tr>';
-}
+};
 
-function typeFromJsonSchema(type, format) {
+module.exports.typeFromJsonSchema = function (type, format) {
   var str;
 
   if (type === 'integer' && format === 'int32') {
@@ -2771,9 +5509,9 @@ function typeFromJsonSchema(type, format) {
   }
 
   return str;
-}
+};
 
-function getStringSignature(obj, baseComponent) {
+var getStringSignature = module.exports.getStringSignature = function (obj, baseComponent) {
   var str = '';
 
   if (typeof obj.$ref !== 'undefined') {
@@ -2815,9 +5553,9 @@ function getStringSignature(obj, baseComponent) {
   }
 
   return str;
-}
+};
 
-function schemaToJSON(schema, models, modelsToIgnore, modelPropertyMacro) {
+var schemaToJSON = module.exports.schemaToJSON = function (schema, models, modelsToIgnore, modelPropertyMacro) {
   // Resolve the schema (Handle nested schemas)
   schema = Helpers.resolveSchema(schema);
 
@@ -2902,10 +5640,9 @@ function schemaToJSON(schema, models, modelsToIgnore, modelPropertyMacro) {
   }
 
   return output;
-}
-
-function schemaToHTML(name, schema, models, modelPropertyMacro) {
+};
 
+module.exports.schemaToHTML =function (name, schema, models, modelPropertyMacro) {
   var strongOpen = '<span class="strong">';
   var strongClose = '</span>';
 
@@ -3194,7 +5931,7 @@ function schemaToHTML(name, schema, models, modelPropertyMacro) {
             var cProperty = _.cloneDeep(property);
 
             var requiredClass = propertyIsRequired ? 'required' : '';
-            var html = '<div' + (property.readOnly ? ' class="readOnly"' : '') + '><span class="propName ' + requiredClass + '">' + name + '</span> (';
+            var html = '<span class="propName ' + requiredClass + '">' + name + '</span> (';
             var model;
             var propDescription;
 
@@ -3236,12 +5973,12 @@ function schemaToHTML(name, schema, models, modelPropertyMacro) {
               html += ' = <span class="propVals">[\'' + cProperty.enum.join('\', \'') + '\']</span>';
             }
 
-            return primitiveToOptionsHTML(cProperty, html);
+            return '<div' + (property.readOnly ? ' class="readOnly"' : '') + '>' + primitiveToOptionsHTML(cProperty, html);
           }).join(',</div>');
-        }
 
-        if (contents) {
-          html += contents + '</div>';
+          if (contents) {
+            html += contents + '</div>';
+          }
         }
       } else {
         html += '<div>' + primitiveToOptionsHTML(schema, type) + '</div>';
@@ -3250,9 +5987,8 @@ function schemaToHTML(name, schema, models, modelPropertyMacro) {
 
     return html + strongOpen + (isArray ? ']' : '}') + strongClose;
   }
-}
-
-},{"./helpers":4,"lodash-compat/array/indexOf":53,"lodash-compat/collection/forEach":58,"lodash-compat/collection/map":60,"lodash-compat/lang/cloneDeep":142,"lodash-compat/lang/isArray":144,"lodash-compat/lang/isEmpty":145,"lodash-compat/lang/isObject":148,"lodash-compat/lang/isPlainObject":149,"lodash-compat/lang/isUndefined":152,"lodash-compat/object/keys":153}],8:[function(require,module,exports){
+};
+},{"./helpers":4,"lodash-compat/array/indexOf":49,"lodash-compat/collection/forEach":54,"lodash-compat/collection/map":56,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isEmpty":141,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isPlainObject":145,"lodash-compat/lang/isUndefined":148,"lodash-compat/object/keys":149}],8:[function(require,module,exports){
 'use strict';
 
 var SwaggerHttp = require('./http');
@@ -3386,7 +6122,7 @@ SwaggerSpecConverter.prototype.models = function(obj, swagger) {
   swagger.definitions = swagger.definitions || {};
   for(name in obj) {
     var existingModel = obj[name];
-    var _enum = [];
+    var _required = [];
     var schema = { properties: {}};
     var propertyName;
     for(propertyName in existingModel.properties) {
@@ -3400,18 +6136,18 @@ SwaggerSpecConverter.prototype.models = function(obj, swagger) {
         property['enum'] = existingProperty['enum'];
       }
       if(typeof existingProperty.required === 'boolean' && existingProperty.required === true) {
-        _enum.push(propertyName);
+        _required.push(propertyName);
       }
       if(typeof existingProperty.required === 'string' && existingProperty.required === 'true') {
-        _enum.push(propertyName);
+        _required.push(propertyName);
       }
       schema.properties[propertyName] = property;
     }
-    if(_enum.length > 0) {
-      schema['enum'] = _enum;
+    if(_required.length > 0) {
+      schema.required = _required;
+    } else {
+      schema.required = existingModel.required;
     }
-
-    schema.required = existingModel.required;
     swagger.definitions[name] = schema;
   }
 };
@@ -3725,6 +6461,12 @@ SwaggerSpecConverter.prototype.resourceListing = function(obj, swagger, opts, ca
     _opts.responseInterceptor = opts.responseInterceptor;
   }
 
+  var swaggerRequestHeaders = 'application/json';
+
+  if(opts && opts.swaggerRequestHeaders) {
+    swaggerRequestHeaders = opts.swaggerRequestHeaders;
+  }
+
   if(expectedCount === 0) {
     this.finish(callback, swagger);
   }
@@ -3743,9 +6485,10 @@ SwaggerSpecConverter.prototype.resourceListing = function(obj, swagger, opts, ca
     }
     var http = {
       url: absolutePath,
-      headers: {accept: 'application/json'},
+      headers: { accept: swaggerRequestHeaders },
       on: {},
-      method: 'get'
+      method: 'get',
+      timeout: opts.timeout
     };
     /* jshint ignore:start */
     http.on.response = function(data) {
@@ -3787,7 +6530,7 @@ SwaggerSpecConverter.prototype.getAbsolutePath = function(version, docLocation,
   }
 
   var location = docLocation;
-  if(path.indexOf('http://') === 0 || path.indexOf('https://') === 0) {
+  if(path.indexOf('http:') === 0 || path.indexOf('https:') === 0) {
     location = path;
   }
   else {
@@ -3805,7 +6548,9 @@ SwaggerSpecConverter.prototype.securityDefinitions = function(obj, swagger) {
     var name;
     for(name in obj.authorizations) {
       var isValid = false;
-      var securityDefinition = {};
+      var securityDefinition = {
+        vendorExtensions: {}
+      };
       var definition = obj.authorizations[name];
       if(definition.type === 'apiKey') {
         securityDefinition.type = 'apiKey';
@@ -3896,9 +6641,10 @@ SwaggerSpecConverter.prototype.finish = function (callback, obj) {
   callback(obj);
 };
 
-},{"./http":5,"lodash-compat/lang/isObject":148}],9:[function(require,module,exports){
+},{"./http":5,"lodash-compat/lang/isObject":144}],9:[function(require,module,exports){
 'use strict';
 
+var log = require('../helpers').log;
 var _ = {
   isPlainObject: require('lodash-compat/lang/isPlainObject'),
   isString: require('lodash-compat/lang/isString'),
@@ -3911,7 +6657,7 @@ var Model = module.exports = function (name, definition, models, modelPropertyMa
   this.definition = definition || {};
   this.isArray = definition.type === 'array';
   this.models = models || {};
-  this.name = definition.title || name || 'Inline Model';
+  this.name = name || definition.title || 'Inline Model';
   this.modelPropertyMacro = modelPropertyMacro || function (property) {
     return property.default;
   };
@@ -3919,6 +6665,7 @@ var Model = module.exports = function (name, definition, models, modelPropertyMa
   return this;
 };
 
+// Note!  This function will be removed in 2.2.x!
 Model.prototype.createJSONSample = Model.prototype.getSampleValue = function (modelsToIgnore) {
   modelsToIgnore = modelsToIgnore || {};
 
@@ -3942,7 +6689,7 @@ Model.prototype.getMockSignature = function () {
   return SchemaMarkup.schemaToHTML(this.name, this.definition, this.models, this.modelPropertyMacro);
 };
 
-},{"../schema-markup.js":7,"js-yaml":20,"lodash-compat/lang/isPlainObject":149,"lodash-compat/lang/isString":150}],10:[function(require,module,exports){
+},{"../helpers":4,"../schema-markup.js":7,"js-yaml":19,"lodash-compat/lang/isPlainObject":145,"lodash-compat/lang/isString":146}],10:[function(require,module,exports){
 'use strict';
 
 var _ = {
@@ -3966,6 +6713,7 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
     this.client = parent.options.client || null;
     this.requestInterceptor = parent.options.requestInterceptor || null;
     this.responseInterceptor = parent.options.responseInterceptor || null;
+    this.requestAgent = parent.options.requestAgent;
   }
   this.authorizations = args.security;
   this.basePath = parent.basePath || '/';
@@ -3974,7 +6722,7 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
   this.produces = args.produces || parent.produces || ['application/json'];
   this.deprecated = args.deprecated;
   this.description = args.description;
-  this.host = parent.host || 'localhost';
+  this.host = parent.host;
   this.method = (httpMethod || errors.push('Operation ' + operationId + ' is missing method.'));
   this.models = models || {};
   this.nickname = (operationId || errors.push('Operations must have a nickname.'));
@@ -3986,17 +6734,34 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
   this.responses = (args.responses || {});
   this.scheme = scheme || parent.scheme || 'http';
   this.schemes = args.schemes || parent.schemes;
-  this.security = args.security;
+  this.security = args.security || parent.security;
   this.summary = args.summary || '';
+  this.timeout = parent.timeout;
   this.type = null;
   this.useJQuery = parent.useJQuery;
+  this.jqueryAjaxCache = parent.jqueryAjaxCache;
   this.enableCookies = parent.enableCookies;
+
+  var key;
+
+  if(!this.host) {
+    if(typeof window !== 'undefined') {
+      this.host = window.location.host;
+    }
+    else {
+      this.host = 'localhost';
+    }
+  }
   this.parameterMacro = parent.parameterMacro || function (operation, parameter) {
     return parameter.default;
   };
 
   this.inlineModels = [];
 
+  if(this.basePath !== '/' && this.basePath.slice(-1) === '/') {
+    this.basePath = this.basePath.slice(0, -1);
+  }
+
   if (typeof this.deprecated === 'string') {
     switch(this.deprecated.toLowerCase()) {
       case 'true': case 'yes': case '1': {
@@ -4017,8 +6782,6 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
 
   if (definitions) {
     // add to global models
-    var key;
-
     for (key in definitions) {
       model = new Model(key, definitions[key], this.models, parent.modelPropertyMacro);
 
@@ -4032,7 +6795,7 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
   }
 
   for (i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
+    var d, param = this.parameters[i];
 
     // Allow macro to set the default value
     param.default = this.parameterMacro(this, param);
@@ -4040,10 +6803,6 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
     if (param.type === 'array') {
       param.isList = true;
       param.allowMultiple = true;
-      // the enum can be defined at the items level
-      //if (param.items && param.items.enum) {
-      //  param['enum'] = param.items.enum;
-      //}
     }
 
     var innerType = this.getType(param);
@@ -4054,26 +6813,31 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
       param['enum'] = [true, false]; // use actual primitives
     }
 
+    for(key in param) {
+      helpers.extractExtensions(key, param);
+    }
     if(typeof param['x-example'] !== 'undefined') {
-      var d = param['x-example'];
+      d = param['x-example'];
       param.default = d;
     }
     if(param['x-examples']) {
-      var d = param['x-examples'].default;
+      d = param['x-examples'].default;
       if(typeof d !== 'undefined') {
         param.default = d;
       }
     }
 
-    if (typeof param['enum'] !== 'undefined') {
+    var enumValues = param['enum'] || (param.items && param.items['enum']);
+
+    if (typeof enumValues !== 'undefined') {
       var id;
 
       param.allowableValues = {};
       param.allowableValues.values = [];
       param.allowableValues.descriptiveValues = [];
 
-      for (id = 0; id < param['enum'].length; id++) {
-        var value = param['enum'][id];
+      for (id = 0; id < enumValues.length; id++) {
+        var value = enumValues[id];
         var isDefault = (value === param.default || value+'' === param.default);
 
         param.allowableValues.values.push(value);
@@ -4092,12 +6856,13 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
       }
     }
 
+    param.modelSignature = {type: innerType, definitions: this.models};
     param.signature = this.getModelSignature(innerType, this.models).toString();
     param.sampleJSON = this.getModelSampleJSON(innerType, this.models);
     param.responseClassSignature = param.signature;
   }
 
-  var defaultResponseCode, response, responses = this.responses;
+  var keyname, defaultResponseCode, response, responses = this.responses;
 
   if (responses['200']) {
     response = responses['200'];
@@ -4125,6 +6890,30 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
     defaultResponseCode = 'default';
   }
 
+  for(keyname in responses) {
+    helpers.extractExtensions(keyname, responses);
+    if(typeof keyname === 'string' && keyname.indexOf('x-') === -1) {
+      var responseObject = responses[keyname];
+      if(typeof responseObject === 'object' && typeof responseObject.headers === 'object') {
+        var headers = responseObject.headers;
+        for(var headerName in headers) {
+          var header = headers[headerName];
+          if(typeof header === 'object') {
+            for(var headerKey in header) {
+              helpers.extractExtensions(headerKey, header);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  if (response) {
+    for(keyname in response) {
+      helpers.extractExtensions(keyname, response);
+    }
+  }
+
   if (response && response.schema) {
     var resolvedModel = this.resolveModel(response.schema, definitions);
     var successResponse;
@@ -4145,6 +6934,7 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
     }
 
     if (successResponse) {
+      successResponse.vendorExtensions = response.vendorExtensions;
       // Attach response properties
       if (response.description) {
         successResponse.description = response.description;
@@ -4367,48 +7157,59 @@ Operation.prototype.supportedSubmitMethods = function () {
 
 Operation.prototype.getHeaderParams = function (args) {
   var headers = this.setContentTypes(args, {});
+  var headerParamsByLowerCase = {};
 
   for (var i = 0; i < this.parameters.length; i++) {
     var param = this.parameters[i];
 
-    if (typeof args[param.name] !== 'undefined') {
-      if (param.in === 'header') {
-        var value = args[param.name];
+    if (param.in === 'header') {
+      headerParamsByLowerCase[param.name.toLowerCase()] = param;
+    }
+  }
 
-        if (Array.isArray(value)) {
-          value = value.toString();
-        }
+  for (var arg in args) {
+    var headerParam = headerParamsByLowerCase[arg.toLowerCase()];
+    if (typeof headerParam !== 'undefined') {
+      var value = args[arg];
 
-        headers[param.name] = value;
+      if (Array.isArray(value)) {
+        value = value.toString();
       }
+
+      headers[headerParam.name] = value;
     }
   }
 
   return headers;
 };
 
-Operation.prototype.urlify = function (args) {
+Operation.prototype.urlify = function (args, maskPasswords) {
   var formParams = {};
-  var requestUrl = this.path;
+  var requestUrl = this.path.replace(/#.*/, ''); // remove URL fragment
   var querystring = ''; // grab params from the args, build the querystring along the way
 
   for (var i = 0; i < this.parameters.length; i++) {
     var param = this.parameters[i];
 
     if (typeof args[param.name] !== 'undefined') {
+      var isPassword;
+      if(param.type === 'string' && param.format === 'password' && maskPasswords) {
+        isPassword = true;
+      }
+
       if (param.in === 'path') {
         var reg = new RegExp('\{' + param.name + '\}', 'gi');
         var value = args[param.name];
 
         if (Array.isArray(value)) {
-          value = this.encodePathCollection(param.collectionFormat, param.name, value);
+          value = this.encodePathCollection(param.collectionFormat, param.name, value, isPassword);
         } else {
-          value = this.encodePathParam(value);
+          value = this.encodePathParam(value, isPassword);
         }
 
         requestUrl = requestUrl.replace(reg, value);
       } else if (param.in === 'query' && typeof args[param.name] !== 'undefined') {
-        if (querystring === '') {
+        if (querystring === '' && requestUrl.indexOf('?') < 0) {
           querystring += '?';
         } else {
           querystring += '&';
@@ -4418,12 +7219,12 @@ Operation.prototype.urlify = function (args) {
           var qp = args[param.name];
 
           if (Array.isArray(qp)) {
-            querystring += this.encodeQueryCollection(param.collectionFormat, param.name, qp);
+            querystring += this.encodeQueryCollection(param.collectionFormat, param.name, qp, isPassword);
           } else {
-            querystring += this.encodeQueryParam(param.name) + '=' + this.encodeQueryParam(args[param.name]);
+            querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name], isPassword);
           }
         } else {
-          querystring += this.encodeQueryParam(param.name) + '=' + this.encodeQueryParam(args[param.name]);
+          querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name], isPassword);
         }
       } else if (param.in === 'formData') {
         formParams[param.name] = args[param.name];
@@ -4456,16 +7257,24 @@ Operation.prototype.getMissingParams = function (args) {
 };
 
 Operation.prototype.getBody = function (headers, args, opts) {
-  var formParams = {}, hasFormParams, body, key, value, hasBody = false;
+  var formParams = {}, hasFormParams, param, body, key, value, hasBody = false;
 
   // look at each param and put form params in an object
   for (var i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
+    param = this.parameters[i];
     if (typeof args[param.name] !== 'undefined') {
+      var isPassword;
+      if(param.type === 'string' && param.format === 'password') {
+        isPassword = 'password';
+      }
       if (param.in === 'body') {
         body = args[param.name];
       } else if (param.in === 'formData') {
-        formParams[param.name] = args[param.name];
+        formParams[param.name] = {
+          param: param,
+          value: args[param.name],
+          password: isPassword
+        };
         hasFormParams = true;
       }
     }
@@ -4494,41 +7303,111 @@ Operation.prototype.getBody = function (headers, args, opts) {
     var encoded = '';
 
     for (key in formParams) {
-      value = formParams[key];
+      param = formParams[key].param;
+      value = formParams[key].value;
+      var password;
+
+      if(opts && opts.maskPasswords) {
+        password = formParams[key].password;
+      }
 
       if (typeof value !== 'undefined') {
-        if (encoded !== '') {
-          encoded += '&';
+        if (Array.isArray(value)) {
+          if (encoded !== '') {
+            encoded += '&';
+          }
+          encoded += this.encodeQueryCollection(param.collectionFormat, key, value, password);
         }
+        else {
+          if (encoded !== '') {
+            encoded += '&';
+          }
 
-        encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
+          encoded += encodeURIComponent(key) + '=' + mask(encodeURIComponent(value), password);
+        }
       }
     }
 
     body = encoded;
   } else if (isMultiPart) {
-    if (opts.useJQuery) {
-      var bodyParam = new FormData();
+    var bodyParam;
+    if (typeof FormData === 'function') {
+      bodyParam = new FormData();
 
       bodyParam.type = 'formData';
 
       for (key in formParams) {
+        param = formParams[key].param;
         value = args[key];
 
         if (typeof value !== 'undefined') {
-          // required for jquery file upload
-          if (value.type === 'file' && value.value) {
-            delete headers['Content-Type'];
-
+          if({}.toString.apply(value) === '[object File]') {
+            bodyParam.append(key, value);
+          }
+          else if (value.type === 'file' && value.value) {
             bodyParam.append(key, value.value);
           } else {
-            bodyParam.append(key, value);
+            if (Array.isArray(value)) {
+              if(param.collectionFormat === 'multi') {
+                bodyParam.delete(key);
+                for(var v in value) {
+                  bodyParam.append(key, value[v]);
+                }
+              }
+              else {
+                bodyParam.append(key, this.encodeQueryCollection(param.collectionFormat, key, value).split('=').slice(1).join('='));
+              }
+            }
+            else {
+              bodyParam.append(key, value);
+            }
           }
         }
       }
-
       body = bodyParam;
     }
+    else {
+      bodyParam = {};
+      for (key in formParams) {
+        value = args[key];
+        if (Array.isArray(value)) {
+          var delimeter;
+          var format = param.collectionFormat || 'multi';
+          if(format === 'ssv') {
+            delimeter = ' ';
+          }
+          else if(format === 'pipes') {
+            delimeter = '|';
+          }
+          else if(format === 'tsv') {
+            delimeter = '\t';
+          }
+          else if(format === 'multi') {
+            bodyParam[key] = value;
+            break;
+          }
+          else {
+            delimeter = ',';
+          }
+          var data;
+          value.forEach(function(v) {
+            if(data) {
+              data += delimeter;
+            }
+            else {
+              data = '';
+            }
+            data += v;
+          });
+          bodyParam[key] = data;
+        }
+        else {
+          bodyParam[key] = value;
+        }
+      }
+      body = bodyParam;
+    }
+    headers['Content-Type'] = 'multipart/form-data';
   }
 
   return body;
@@ -4588,7 +7467,7 @@ Operation.prototype.do = function (args, opts, callback, error, parent) {
  **/
 Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
   var args = arg1 || {};
-  var opts = {}, success, error, deferred;
+  var opts = {}, success, error, deferred, timeout;
 
   if (_.isObject(arg2)) {
     opts = arg2;
@@ -4596,10 +7475,16 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
     error = arg4;
   }
 
+  timeout = typeof opts.timeout !== 'undefined' ? opts.timeout : this.timeout;
+
   if(this.client) {
     opts.client = this.client;
   }
 
+  if(this.requestAgent) {
+    opts.requestAgent = this.requestAgent;
+  }
+
   // add the request interceptor from parent, if none sent from client
   if(!opts.requestInterceptor && this.requestInterceptor ) {
     opts.requestInterceptor = this.requestInterceptor ;
@@ -4621,11 +7506,14 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
     error = (error || this.parent.defaultErrorCallback || helpers.log);
   }
 
-
   if (typeof opts.useJQuery === 'undefined') {
     opts.useJQuery = this.useJQuery;
   }
 
+  if (typeof opts.jqueryAjaxCache === 'undefined') {
+    opts.jqueryAjaxCache = this.jqueryAjaxCache;
+  }
+
   if (typeof opts.enableCookies === 'undefined') {
     opts.enableCookies = this.enableCookies;
   }
@@ -4654,7 +7542,7 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
   for (attrname in contentTypeHeaders) { headers[attrname] = contentTypeHeaders[attrname]; }
 
   var body = this.getBody(contentTypeHeaders, args, opts);
-  var url = this.urlify(args);
+  var url = this.urlify(args, opts.maskPasswords);
 
   if(url.indexOf('.{format}') > 0) {
     if(headers) {
@@ -4674,8 +7562,12 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
     body: body,
     enableCookies: opts.enableCookies,
     useJQuery: opts.useJQuery,
+    jqueryAjaxCache: opts.jqueryAjaxCache,
     deferred: deferred,
     headers: headers,
+    clientAuthorizations: opts.clientAuthorizations,
+    operation: this,
+    connectionAgent: this.connectionAgent,
     on: {
       response: function (response) {
         if (deferred) {
@@ -4696,6 +7588,10 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
     }
   };
 
+  if (timeout) {
+    obj.timeout = timeout;
+  }
+
   this.clientAuthorizations.apply(obj, this.operation.security);
   if (opts.mock === true) {
     return obj;
@@ -4755,18 +7651,32 @@ Operation.prototype.setContentTypes = function (args, opts) {
   }
 
   // if there's a body, need to set the consumes header via requestContentType
+  var hasBody = body || definedFileParams.length || definedFormParams.length;
   if (this.method === 'post' || this.method === 'put' || this.method === 'patch' ||
-      ((this.method === 'delete' || this.method === 'get') && body) ) {
+      ((this.method === 'delete' || this.method === 'get') && hasBody)) {
     if (opts.requestContentType) {
       consumes = opts.requestContentType;
     }
     // if any form params, content type must be set
     if (definedFormParams.length > 0) {
+      consumes = undefined;
       if (opts.requestContentType) {             // override if set
         consumes = opts.requestContentType;
       } else if (definedFileParams.length > 0) { // if a file, must be multipart/form-data
         consumes = 'multipart/form-data';
-      } else {                                   // default to x-www-from-urlencoded
+      } else {
+        if (this.consumes && this.consumes.length > 0) {
+          // use the consumes setting
+          for(var c in this.consumes) {
+            var chk = this.consumes[c];
+            if(chk.indexOf('application/x-www-form-urlencoded') === 0 || chk.indexOf('multipart/form-data') === 0) {
+              consumes = chk;
+            }
+          }
+        }
+      }
+      if(typeof consumes === 'undefined') {
+        // default to x-www-from-urlencoded
         consumes = 'application/x-www-form-urlencoded';
       }
     }
@@ -4788,6 +7698,9 @@ Operation.prototype.setContentTypes = function (args, opts) {
   if ((consumes && body !== '') || (consumes === 'application/x-www-form-urlencoded')) {
     headers['Content-Type'] = consumes;
   }
+  else if(this.consumes && this.consumes.length > 0 && this.consumes[0] === 'application/x-www-form-urlencoded') {
+    headers['Content-Type'] = this.consumes[0];
+  }
 
   if (accepts) {
     headers.Accept = accepts;
@@ -4811,7 +7724,7 @@ Operation.prototype.matchesAccept = function(accepts) {
 };
 
 Operation.prototype.asCurl = function (args1, args2) {
-  var opts = {mock: true};
+  var opts = {mock: true, maskPasswords: true};
   if (typeof args2 === 'object') {
     for (var argKey in args2) {
       opts[argKey] = args2[argKey];
@@ -4836,23 +7749,87 @@ Operation.prototype.asCurl = function (args1, args2) {
       results.push('--header \'' + key + ': ' + value + '\'');
     }
   }
+  var isFormData = false;
+  var isMultipart = false;
+
+  var type = obj.headers['Content-Type'];
+  if(type && type.indexOf('application/x-www-form-urlencoded') === 0) {
+    isFormData = true;
+  }
+  else if (type && type.indexOf('multipart/form-data') === 0) {
+    isFormData = true;
+    isMultipart = true;
+  }
 
   if (obj.body) {
     var body;
-
     if (_.isObject(obj.body)) {
-      body = JSON.stringify(obj.body);
+      if(isMultipart) {
+        isMultipart = true;
+        // add the form data
+        for(var i = 0; i < this.parameters.length; i++) {
+          var parameter = this.parameters[i];
+          if(parameter.in === 'formData') {
+            if (!body) {
+              body = '';
+            }
+
+            var paramValue;
+            if(typeof FormData === 'function' && obj.body instanceof FormData) {
+              paramValue = obj.body.getAll(parameter.name);
+            }
+            else {
+              paramValue = obj.body[parameter.name];
+            }
+            if (paramValue) {
+              if (parameter.type === 'file') {
+                if(paramValue.name) {
+                  body += '-F ' + parameter.name + '=@"' + paramValue.name + '" ';
+                }
+              }
+              else {
+                if (Array.isArray(paramValue)) {
+                  if(parameter.collectionFormat === 'multi') {
+                    for(var v in paramValue) {
+                      body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + mask(paramValue[v], parameter.format) + ' ';
+                    }
+                  }
+                  else {
+                    body += '-F ' + this.encodeQueryCollection(parameter.collectionFormat, parameter.name, mask(paramValue, parameter.format)) + ' ';
+                  }
+                } else {
+                  body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + mask(paramValue, parameter.format) + ' ';
+                }
+              }
+            }
+          }
+        }
+      }
+      if(!body) {
+        body = JSON.stringify(obj.body);
+      }
     } else {
       body = obj.body;
     }
+    // escape @ => %40, ' => %27
+    body = body.replace(/\'/g, '%27').replace(/\n/g, ' \\ \n ');
 
-    results.push('-d \'' + body.replace(/\'/g, '\\u0027') + '\'');
+    if(!isFormData) {
+      // escape & => %26
+      body = body.replace(/&/g, '%26');
+    }
+    if(isMultipart) {
+      results.push(body);
+    }
+    else {
+      results.push('-d \'' + body.replace(/@/g, '%40') + '\'');
+    }
   }
 
   return 'curl ' + (results.join(' ')) + ' \'' + obj.url + '\'';
 };
 
-Operation.prototype.encodePathCollection = function (type, name, value) {
+Operation.prototype.encodePathCollection = function (type, name, value, maskPasswords) {
   var encoded = '';
   var i;
   var separator = '';
@@ -4860,7 +7837,7 @@ Operation.prototype.encodePathCollection = function (type, name, value) {
   if (type === 'ssv') {
     separator = '%20';
   } else if (type === 'tsv') {
-    separator = '\\t';
+    separator = '%09';
   } else if (type === 'pipes') {
     separator = '|';
   } else {
@@ -4869,24 +7846,25 @@ Operation.prototype.encodePathCollection = function (type, name, value) {
 
   for (i = 0; i < value.length; i++) {
     if (i === 0) {
-      encoded = this.encodeQueryParam(value[i]);
+      encoded = this.encodeQueryParam(value[i], maskPasswords);
     } else {
-      encoded += separator + this.encodeQueryParam(value[i]);
+      encoded += separator + this.encodeQueryParam(value[i], maskPasswords);
     }
   }
 
   return encoded;
 };
 
-Operation.prototype.encodeQueryCollection = function (type, name, value) {
+Operation.prototype.encodeQueryCollection = function (type, name, value, maskPasswords) {
   var encoded = '';
   var i;
 
+  type = type || 'default';
   if (type === 'default' || type === 'multi') {
     for (i = 0; i < value.length; i++) {
       if (i > 0) {encoded += '&';}
 
-      encoded += this.encodeQueryParam(name) + '=' + this.encodeQueryParam(value[i]);
+      encoded += this.encodeQueryKey(name) + '=' + mask(this.encodeQueryParam(value[i]), maskPasswords);
     }
   } else {
     var separator = '';
@@ -4896,7 +7874,7 @@ Operation.prototype.encodeQueryCollection = function (type, name, value) {
     } else if (type === 'ssv') {
       separator = '%20';
     } else if (type === 'tsv') {
-      separator = '\\t';
+      separator = '%09';
     } else if (type === 'pipes') {
       separator = '|';
     } else if (type === 'brackets') {
@@ -4904,15 +7882,14 @@ Operation.prototype.encodeQueryCollection = function (type, name, value) {
         if (i !== 0) {
           encoded += '&';
         }
-
-        encoded += this.encodeQueryParam(name) + '[]=' + this.encodeQueryParam(value[i]);
+        encoded += this.encodeQueryKey(name) + '[]=' + mask(this.encodeQueryParam(value[i]), maskPasswords);
       }
     }
 
     if (separator !== '') {
       for (i = 0; i < value.length; i++) {
         if (i === 0) {
-          encoded = this.encodeQueryParam(name) + '=' + this.encodeQueryParam(value[i]);
+          encoded = this.encodeQueryKey(name) + '=' + this.encodeQueryParam(value[i]);
         } else {
           encoded += separator + this.encodeQueryParam(value[i]);
         }
@@ -4923,18 +7900,32 @@ Operation.prototype.encodeQueryCollection = function (type, name, value) {
   return encoded;
 };
 
-Operation.prototype.encodeQueryParam = function (arg) {
+Operation.prototype.encodeQueryKey = function (arg) {
+  return encodeURIComponent(arg)
+      .replace('%5B','[').replace('%5D', ']').replace('%24', '$');
+};
+
+Operation.prototype.encodeQueryParam = function (arg, maskPasswords) {
+  if(maskPasswords) {
+    return "******";
+  }
   return encodeURIComponent(arg);
 };
 
 /**
  * TODO revisit, might not want to leave '/'
  **/
-Operation.prototype.encodePathParam = function (pathParam) {
-  return encodeURIComponent(pathParam);
+Operation.prototype.encodePathParam = function (pathParam, maskPasswords) {
+  return encodeURIComponent(pathParam, maskPasswords);
 };
 
-},{"../helpers":4,"../http":5,"./model":9,"lodash-compat/lang/cloneDeep":142,"lodash-compat/lang/isEmpty":145,"lodash-compat/lang/isObject":148,"lodash-compat/lang/isUndefined":152,"q":161}],11:[function(require,module,exports){
+var mask = function(value, format) {
+  if(typeof format === 'string' && format === 'password') {
+    return '******';
+  }
+  return value;
+}
+},{"../helpers":4,"../http":5,"./model":9,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isEmpty":141,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isUndefined":148,"q":157}],11:[function(require,module,exports){
 'use strict';
 
 var OperationGroup = module.exports = function (tag, description, externalDocs, operation) {
@@ -4953,8 +7944,6 @@ OperationGroup.prototype.sort = function () {
 
 
 },{}],12:[function(require,module,exports){
-
-},{}],13:[function(require,module,exports){
 // shim for using process in browser
 
 var process = module.exports = {};
@@ -5014,7 +8003,7 @@ process.chdir = function (dir) {
 };
 process.umask = function() { return 0; };
 
-},{}],14:[function(require,module,exports){
+},{}],13:[function(require,module,exports){
 (function (Buffer){
 (function () {
   "use strict";
@@ -5036,8 +8025,8 @@ process.umask = function() { return 0; };
 }());
 
 }).call(this,require("buffer").Buffer)
-//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9idG9hL2luZGV4LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiKGZ1bmN0aW9uICgpIHtcbiAgXCJ1c2Ugc3RyaWN0XCI7XG5cbiAgZnVuY3Rpb24gYnRvYShzdHIpIHtcbiAgICB2YXIgYnVmZmVyXG4gICAgICA7XG5cbiAgICBpZiAoc3RyIGluc3RhbmNlb2YgQnVmZmVyKSB7XG4gICAgICBidWZmZXIgPSBzdHI7XG4gICAgfSBlbHNlIHtcbiAgICAgIGJ1ZmZlciA9IG5ldyBCdWZmZXIoc3RyLnRvU3RyaW5nKCksICdiaW5hcnknKTtcbiAgICB9XG5cbiAgICByZXR1cm4gYnVmZmVyLnRvU3RyaW5nKCdiYXNlNjQnKTtcbiAgfVxuXG4gIG1vZHVsZS5leHBvcnRzID0gYnRvYTtcbn0oKSk7XG4iXX0=
-},{"buffer":15}],15:[function(require,module,exports){
+
+},{"buffer":14}],14:[function(require,module,exports){
 /*!
  * The buffer module from node.js, for the browser.
  *
@@ -6572,7 +9561,7 @@ function blitBuffer (src, dst, offset, length) {
   return i
 }
 
-},{"base64-js":16,"ieee754":17,"is-array":18}],16:[function(require,module,exports){
+},{"base64-js":15,"ieee754":16,"is-array":17}],15:[function(require,module,exports){
 var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 
 ;(function (exports) {
@@ -6698,7 +9687,7 @@ var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 	exports.fromByteArray = uint8ToBase64
 }(typeof exports === 'undefined' ? (this.base64js = {}) : exports))
 
-},{}],17:[function(require,module,exports){
+},{}],16:[function(require,module,exports){
 exports.read = function (buffer, offset, isLE, mLen, nBytes) {
   var e, m
   var eLen = nBytes * 8 - mLen - 1
@@ -6784,7 +9773,7 @@ exports.write = function (buffer, value, offset, isLE, mLen, nBytes) {
   buffer[offset + i - d] |= s * 128
 }
 
-},{}],18:[function(require,module,exports){
+},{}],17:[function(require,module,exports){
 
 /**
  * isArray
@@ -6819,7 +9808,7 @@ module.exports = isArray || function (val) {
   return !! val && '[object Array]' == str.call(val);
 };
 
-},{}],19:[function(require,module,exports){
+},{}],18:[function(require,module,exports){
 /* jshint node: true */
 (function () {
     "use strict";
@@ -7082,7 +10071,7 @@ module.exports = isArray || function (val) {
     };
 }());
 
-},{}],20:[function(require,module,exports){
+},{}],19:[function(require,module,exports){
 'use strict';
 
 
@@ -7091,7 +10080,7 @@ var yaml = require('./lib/js-yaml.js');
 
 module.exports = yaml;
 
-},{"./lib/js-yaml.js":21}],21:[function(require,module,exports){
+},{"./lib/js-yaml.js":20}],20:[function(require,module,exports){
 'use strict';
 
 
@@ -7132,26 +10121,24 @@ module.exports.parse          = deprecated('parse');
 module.exports.compose        = deprecated('compose');
 module.exports.addConstructor = deprecated('addConstructor');
 
-},{"./js-yaml/dumper":23,"./js-yaml/exception":24,"./js-yaml/loader":25,"./js-yaml/schema":27,"./js-yaml/schema/core":28,"./js-yaml/schema/default_full":29,"./js-yaml/schema/default_safe":30,"./js-yaml/schema/failsafe":31,"./js-yaml/schema/json":32,"./js-yaml/type":33}],22:[function(require,module,exports){
+},{"./js-yaml/dumper":22,"./js-yaml/exception":23,"./js-yaml/loader":24,"./js-yaml/schema":26,"./js-yaml/schema/core":27,"./js-yaml/schema/default_full":28,"./js-yaml/schema/default_safe":29,"./js-yaml/schema/failsafe":30,"./js-yaml/schema/json":31,"./js-yaml/type":32}],21:[function(require,module,exports){
 'use strict';
 
 
 function isNothing(subject) {
-  return (typeof subject === 'undefined') || (null === subject);
+  return (typeof subject === 'undefined') || (subject === null);
 }
 
 
 function isObject(subject) {
-  return (typeof subject === 'object') && (null !== subject);
+  return (typeof subject === 'object') && (subject !== null);
 }
 
 
 function toArray(sequence) {
-  if (Array.isArray(sequence)) {
-    return sequence;
-  } else if (isNothing(sequence)) {
-    return [];
-  }
+  if (Array.isArray(sequence)) return sequence;
+  else if (isNothing(sequence)) return [];
+
   return [ sequence ];
 }
 
@@ -7184,7 +10171,7 @@ function repeat(string, count) {
 
 
 function isNegativeZero(number) {
-  return (0 === number) && (Number.NEGATIVE_INFINITY === 1 / number);
+  return (number === 0) && (Number.NEGATIVE_INFINITY === 1 / number);
 }
 
 
@@ -7195,7 +10182,7 @@ module.exports.repeat         = repeat;
 module.exports.isNegativeZero = isNegativeZero;
 module.exports.extend         = extend;
 
-},{}],23:[function(require,module,exports){
+},{}],22:[function(require,module,exports){
 'use strict';
 
 /*eslint-disable no-use-before-define*/
@@ -7210,7 +10197,6 @@ var _hasOwnProperty = Object.prototype.hasOwnProperty;
 
 var CHAR_TAB                  = 0x09; /* Tab */
 var CHAR_LINE_FEED            = 0x0A; /* LF */
-var CHAR_CARRIAGE_RETURN      = 0x0D; /* CR */
 var CHAR_SPACE                = 0x20; /* Space */
 var CHAR_EXCLAMATION          = 0x21; /* ! */
 var CHAR_DOUBLE_QUOTE         = 0x22; /* " */
@@ -7258,9 +10244,7 @@ var DEPRECATED_BOOLEANS_SYNTAX = [
 function compileStyleMap(schema, map) {
   var result, keys, index, length, tag, style, type;
 
-  if (null === map) {
-    return {};
-  }
+  if (map === null) return {};
 
   result = {};
   keys = Object.keys(map);
@@ -7269,7 +10253,7 @@ function compileStyleMap(schema, map) {
     tag = keys[index];
     style = String(map[tag]);
 
-    if ('!!' === tag.slice(0, 2)) {
+    if (tag.slice(0, 2) === '!!') {
       tag = 'tag:yaml.org,2002:' + tag.slice(2);
     }
 
@@ -7307,13 +10291,15 @@ function encodeHex(character) {
 }
 
 function State(options) {
-  this.schema      = options['schema'] || DEFAULT_FULL_SCHEMA;
-  this.indent      = Math.max(1, (options['indent'] || 2));
-  this.skipInvalid = options['skipInvalid'] || false;
-  this.flowLevel   = (common.isNothing(options['flowLevel']) ? -1 : options['flowLevel']);
-  this.styleMap    = compileStyleMap(this.schema, options['styles'] || null);
-  this.sortKeys    = options['sortKeys'] || false;
+  this.schema       = options['schema'] || DEFAULT_FULL_SCHEMA;
+  this.indent       = Math.max(1, (options['indent'] || 2));
+  this.skipInvalid  = options['skipInvalid'] || false;
+  this.flowLevel    = (common.isNothing(options['flowLevel']) ? -1 : options['flowLevel']);
+  this.styleMap     = compileStyleMap(this.schema, options['styles'] || null);
+  this.sortKeys     = options['sortKeys'] || false;
   this.lineWidth    = options['lineWidth'] || 80;
+  this.noRefs       = options['noRefs'] || false;
+  this.noCompatMode = options['noCompatMode'] || false;
 
   this.implicitTypes = this.schema.compiledImplicit;
   this.explicitTypes = this.schema.compiledExplicit;
@@ -7325,6 +10311,7 @@ function State(options) {
   this.usedDuplicates = null;
 }
 
+// Indents every line in a string. Empty lines (\n only) are not indented.
 function indentString(string, spaces) {
   var ind = common.repeat(' ', spaces),
       position = 0,
@@ -7342,9 +10329,9 @@ function indentString(string, spaces) {
       line = string.slice(position, next + 1);
       position = next + 1;
     }
-    if (line.length && line !== '\n') {
-      result += ind;
-    }
+
+    if (line.length && line !== '\n') result += ind;
+
     result += line;
   }
 
@@ -7369,347 +10356,310 @@ function testImplicitResolving(state, str) {
   return false;
 }
 
-function StringBuilder(source) {
-  this.source = source;
-  this.result = '';
-  this.checkpoint = 0;
+// [33] s-white ::= s-space | s-tab
+function isWhitespace(c) {
+  return c === CHAR_SPACE || c === CHAR_TAB;
 }
 
-StringBuilder.prototype.takeUpTo = function (position) {
-  var er;
-
-  if (position < this.checkpoint) {
-    er = new Error('position should be > checkpoint');
-    er.position = position;
-    er.checkpoint = this.checkpoint;
-    throw er;
-  }
-
-  this.result += this.source.slice(this.checkpoint, position);
-  this.checkpoint = position;
-  return this;
-};
-
-StringBuilder.prototype.escapeChar = function () {
-  var character, esc;
-
-  character = this.source.charCodeAt(this.checkpoint);
-  esc = ESCAPE_SEQUENCES[character] || encodeHex(character);
-  this.result += esc;
-  this.checkpoint += 1;
-
-  return this;
-};
-
-StringBuilder.prototype.finish = function () {
-  if (this.source.length > this.checkpoint) {
-    this.takeUpTo(this.source.length);
-  }
-};
-
-function writeScalar(state, object, level, iskey) {
-  var simple, first, spaceWrap, folded, literal, single, double,
-      sawLineFeed, linePosition, longestLine, indent, max, character,
-      position, escapeSeq, hexEsc, previous, lineLength, modifier,
-      trailingLineBreaks, result;
-
-  if (0 === object.length) {
-    state.dump = "''";
-    return;
-  }
-
-  if (-1 !== DEPRECATED_BOOLEANS_SYNTAX.indexOf(object)) {
-    state.dump = "'" + object + "'";
-    return;
-  }
-
-  simple = true;
-  first = object.length ? object.charCodeAt(0) : 0;
-  spaceWrap = (CHAR_SPACE === first ||
-               CHAR_SPACE === object.charCodeAt(object.length - 1));
-
-  // Simplified check for restricted first characters
-  // http://www.yaml.org/spec/1.2/spec.html#ns-plain-first%28c%29
-  if (CHAR_MINUS         === first ||
-      CHAR_QUESTION      === first ||
-      CHAR_COMMERCIAL_AT === first ||
-      CHAR_GRAVE_ACCENT  === first) {
-    simple = false;
-  }
-
-  // can only use > and | if not wrapped in spaces or is not a key.
-  if (spaceWrap) {
-    simple = false;
-    folded = false;
-    literal = false;
-  } else {
-    folded = !iskey;
-    literal = !iskey;
-  }
-
-  single = true;
-  double = new StringBuilder(object);
-
-  sawLineFeed = false;
-  linePosition = 0;
-  longestLine = 0;
-
-  indent = state.indent * level;
-  max = state.lineWidth;
-  if (max === -1) {
-    // Replace -1 with biggest ingeger number according to
-    // http://ecma262-5.com/ELS5_HTML.htm#Section_8.5
-    max = 9007199254740991;
-  }
-
-  if (indent < 40) {
-    max -= indent;
-  } else {
-    max = 40;
-  }
-
-  for (position = 0; position < object.length; position++) {
-    character = object.charCodeAt(position);
-    if (simple) {
-      // Characters that can never appear in the simple scalar
-      if (!simpleChar(character)) {
-        simple = false;
-      } else {
-        // Still simple.  If we make it all the way through like
-        // this, then we can just dump the string as-is.
-        continue;
-      }
-    }
-
-    if (single && character === CHAR_SINGLE_QUOTE) {
-      single = false;
-    }
-
-    escapeSeq = ESCAPE_SEQUENCES[character];
-    hexEsc = needsHexEscape(character);
-
-    if (!escapeSeq && !hexEsc) {
-      continue;
-    }
-
-    if (character !== CHAR_LINE_FEED &&
-        character !== CHAR_DOUBLE_QUOTE &&
-        character !== CHAR_SINGLE_QUOTE) {
-      folded = false;
-      literal = false;
-    } else if (character === CHAR_LINE_FEED) {
-      sawLineFeed = true;
-      single = false;
-      if (position > 0) {
-        previous = object.charCodeAt(position - 1);
-        if (previous === CHAR_SPACE) {
-          literal = false;
-          folded = false;
-        }
-      }
-      if (folded) {
-        lineLength = position - linePosition;
-        linePosition = position;
-        if (lineLength > longestLine) {
-          longestLine = lineLength;
-        }
-      }
-    }
-
-    if (character !== CHAR_DOUBLE_QUOTE) {
-      single = false;
-    }
-
-    double.takeUpTo(position);
-    double.escapeChar();
-  }
-
-  if (simple && testImplicitResolving(state, object)) {
-    simple = false;
-  }
-
-  modifier = '';
-  if (folded || literal) {
-    trailingLineBreaks = 0;
-    if (object.charCodeAt(object.length - 1) === CHAR_LINE_FEED) {
-      trailingLineBreaks += 1;
-      if (object.charCodeAt(object.length - 2) === CHAR_LINE_FEED) {
-        trailingLineBreaks += 1;
-      }
-    }
-
-    if (trailingLineBreaks === 0) {
-      modifier = '-';
-    } else if (trailingLineBreaks === 2) {
-      modifier = '+';
-    }
-  }
-
-  if (literal && longestLine < max) {
-    folded = false;
-  }
-
-  // If it's literally one line, then don't bother with the literal.
-  // We may still want to do a fold, though, if it's a super long line.
-  if (!sawLineFeed) {
-    literal = false;
-  }
-
-  if (simple) {
-    state.dump = object;
-  } else if (single) {
-    state.dump = '\'' + object + '\'';
-  } else if (folded) {
-    result = fold(object, max);
-    state.dump = '>' + modifier + '\n' + indentString(result, indent);
-  } else if (literal) {
-    if (!modifier) {
-      object = object.replace(/\n$/, '');
-    }
-    state.dump = '|' + modifier + '\n' + indentString(object, indent);
-  } else if (double) {
-    double.finish();
-    state.dump = '"' + double.result + '"';
-  } else {
-    throw new Error('Failed to dump scalar value');
-  }
-
-  return;
+// Returns true if the character can be printed without escaping.
+// From YAML 1.2: "any allowed characters known to be non-printable
+// should also be escaped. [However,] This isn’t mandatory"
+// Derived from nb-char - \t - #x85 - #xA0 - #x2028 - #x2029.
+function isPrintable(c) {
+  return  (0x00020 <= c && c <= 0x00007E)
+      || ((0x000A1 <= c && c <= 0x00D7FF) && c !== 0x2028 && c !== 0x2029)
+      || ((0x0E000 <= c && c <= 0x00FFFD) && c !== 0xFEFF /* BOM */)
+      ||  (0x10000 <= c && c <= 0x10FFFF);
 }
 
-// The `trailing` var is a regexp match of any trailing `\n` characters.
-//
-// There are three cases we care about:
-//
-// 1. One trailing `\n` on the string.  Just use `|` or `>`.
-//    This is the assumed default. (trailing = null)
-// 2. No trailing `\n` on the string.  Use `|-` or `>-` to "chomp" the end.
-// 3. More than one trailing `\n` on the string.  Use `|+` or `>+`.
-//
-// In the case of `>+`, these line breaks are *not* doubled (like the line
-// breaks within the string), so it's important to only end with the exact
-// same number as we started.
-function fold(object, max) {
-  var result = '',
-      position = 0,
-      length = object.length,
-      trailing = /\n+$/.exec(object),
-      newLine;
+// Simplified test for values allowed after the first character in plain style.
+function isPlainSafe(c) {
+  // Uses a subset of nb-char - c-flow-indicator - ":" - "#"
+  // where nb-char ::= c-printable - b-char - c-byte-order-mark.
+  return isPrintable(c) && c !== 0xFEFF
+    // - c-flow-indicator
+    && c !== CHAR_COMMA
+    && c !== CHAR_LEFT_SQUARE_BRACKET
+    && c !== CHAR_RIGHT_SQUARE_BRACKET
+    && c !== CHAR_LEFT_CURLY_BRACKET
+    && c !== CHAR_RIGHT_CURLY_BRACKET
+    // - ":" - "#"
+    && c !== CHAR_COLON
+    && c !== CHAR_SHARP;
+}
 
-  if (trailing) {
-    length = trailing.index + 1;
-  }
+// Simplified test for values allowed as the first character in plain style.
+function isPlainSafeFirst(c) {
+  // Uses a subset of ns-char - c-indicator
+  // where ns-char = nb-char - s-white.
+  return isPrintable(c) && c !== 0xFEFF
+    && !isWhitespace(c) // - s-white
+    // - (c-indicator ::=
+    // “-” | “?” | “:” | “,” | “[” | “]” | “{” | “}”
+    && c !== CHAR_MINUS
+    && c !== CHAR_QUESTION
+    && c !== CHAR_COLON
+    && c !== CHAR_COMMA
+    && c !== CHAR_LEFT_SQUARE_BRACKET
+    && c !== CHAR_RIGHT_SQUARE_BRACKET
+    && c !== CHAR_LEFT_CURLY_BRACKET
+    && c !== CHAR_RIGHT_CURLY_BRACKET
+    // | “#” | “&” | “*” | “!” | “|” | “>” | “'” | “"”
+    && c !== CHAR_SHARP
+    && c !== CHAR_AMPERSAND
+    && c !== CHAR_ASTERISK
+    && c !== CHAR_EXCLAMATION
+    && c !== CHAR_VERTICAL_LINE
+    && c !== CHAR_GREATER_THAN
+    && c !== CHAR_SINGLE_QUOTE
+    && c !== CHAR_DOUBLE_QUOTE
+    // | “%” | “@” | “`”)
+    && c !== CHAR_PERCENT
+    && c !== CHAR_COMMERCIAL_AT
+    && c !== CHAR_GRAVE_ACCENT;
+}
 
-  while (position < length) {
-    newLine = object.indexOf('\n', position);
-    if (newLine > length || newLine === -1) {
-      if (result) {
-        result += '\n\n';
+var STYLE_PLAIN   = 1,
+    STYLE_SINGLE  = 2,
+    STYLE_LITERAL = 3,
+    STYLE_FOLDED  = 4,
+    STYLE_DOUBLE  = 5;
+
+// Determines which scalar styles are possible and returns the preferred style.
+// lineWidth = -1 => no limit.
+// Pre-conditions: str.length > 0.
+// Post-conditions:
+//    STYLE_PLAIN or STYLE_SINGLE => no \n are in the string.
+//    STYLE_LITERAL => no lines are suitable for folding (or lineWidth is -1).
+//    STYLE_FOLDED => a line > lineWidth and can be folded (and lineWidth != -1).
+function chooseScalarStyle(string, singleLineOnly, indentPerLevel, lineWidth, testAmbiguousType) {
+  var i;
+  var char;
+  var hasLineBreak = false;
+  var hasFoldableLine = false; // only checked if shouldTrackWidth
+  var shouldTrackWidth = lineWidth !== -1;
+  var previousLineBreak = -1; // count the first line correctly
+  var plain = isPlainSafeFirst(string.charCodeAt(0))
+          && !isWhitespace(string.charCodeAt(string.length - 1));
+
+  if (singleLineOnly) {
+    // Case: no block styles.
+    // Check for disallowed characters to rule out plain and single.
+    for (i = 0; i < string.length; i++) {
+      char = string.charCodeAt(i);
+      if (!isPrintable(char)) {
+        return STYLE_DOUBLE;
       }
-      result += foldLine(object.slice(position, length), max);
-      position = length;
-    } else {
-      if (result) {
-        result += '\n\n';
-      }
-      result += foldLine(object.slice(position, newLine), max);
-      position = newLine + 1;
+      plain = plain && isPlainSafe(char);
     }
+  } else {
+    // Case: block styles permitted.
+    for (i = 0; i < string.length; i++) {
+      char = string.charCodeAt(i);
+      if (char === CHAR_LINE_FEED) {
+        hasLineBreak = true;
+        // Check if any line can be folded.
+        if (shouldTrackWidth) {
+          hasFoldableLine = hasFoldableLine ||
+            // Foldable line = too long, and not more-indented.
+            (i - previousLineBreak - 1 > lineWidth &&
+             string[previousLineBreak + 1] !== ' ');
+          previousLineBreak = i;
+        }
+      } else if (!isPrintable(char)) {
+        return STYLE_DOUBLE;
+      }
+      plain = plain && isPlainSafe(char);
+    }
+    // in case the end is missing a \n
+    hasFoldableLine = hasFoldableLine || (shouldTrackWidth &&
+      (i - previousLineBreak - 1 > lineWidth &&
+       string[previousLineBreak + 1] !== ' '));
   }
-  if (trailing && trailing[0] !== '\n') {
-    result += trailing[0];
+  // Although every style can represent \n without escaping, prefer block styles
+  // for multiline, since they're more readable and they don't add empty lines.
+  // Also prefer folding a super-long line.
+  if (!hasLineBreak && !hasFoldableLine) {
+    // Strings interpretable as another type have to be quoted;
+    // e.g. the string 'true' vs. the boolean true.
+    return plain && !testAmbiguousType(string)
+      ? STYLE_PLAIN : STYLE_SINGLE;
+  }
+  // Edge case: block indentation indicator can only have one digit.
+  if (string[0] === ' ' && indentPerLevel > 9) {
+    return STYLE_DOUBLE;
+  }
+  // At this point we know block styles are valid.
+  // Prefer literal style unless we want to fold.
+  return hasFoldableLine ? STYLE_FOLDED : STYLE_LITERAL;
+}
+
+// Note: line breaking/folding is implemented for only the folded style.
+// NB. We drop the last trailing newline (if any) of a returned block scalar
+//  since the dumper adds its own newline. This always works:
+//    • No ending newline => unaffected; already using strip "-" chomping.
+//    • Ending newline    => removed then restored.
+//  Importantly, this keeps the "+" chomp indicator from gaining an extra line.
+function writeScalar(state, string, level, iskey) {
+  state.dump = (function () {
+    if (string.length === 0) {
+      return "''";
+    }
+    if (!state.noCompatMode &&
+        DEPRECATED_BOOLEANS_SYNTAX.indexOf(string) !== -1) {
+      return "'" + string + "'";
+    }
+
+    var indent = state.indent * Math.max(1, level); // no 0-indent scalars
+    // As indentation gets deeper, let the width decrease monotonically
+    // to the lower bound min(state.lineWidth, 40).
+    // Note that this implies
+    //  state.lineWidth ≤ 40 + state.indent: width is fixed at the lower bound.
+    //  state.lineWidth > 40 + state.indent: width decreases until the lower bound.
+    // This behaves better than a constant minimum width which disallows narrower options,
+    // or an indent threshold which causes the width to suddenly increase.
+    var lineWidth = state.lineWidth === -1
+      ? -1 : Math.max(Math.min(state.lineWidth, 40), state.lineWidth - indent);
+
+    // Without knowing if keys are implicit/explicit, assume implicit for safety.
+    var singleLineOnly = iskey
+      // No block styles in flow mode.
+      || (state.flowLevel > -1 && level >= state.flowLevel);
+    function testAmbiguity(string) {
+      return testImplicitResolving(state, string);
+    }
+
+    switch (chooseScalarStyle(string, singleLineOnly, state.indent, lineWidth, testAmbiguity)) {
+      case STYLE_PLAIN:
+        return string;
+      case STYLE_SINGLE:
+        return "'" + string.replace(/'/g, "''") + "'";
+      case STYLE_LITERAL:
+        return '|' + blockHeader(string, state.indent)
+          + dropEndingNewline(indentString(string, indent));
+      case STYLE_FOLDED:
+        return '>' + blockHeader(string, state.indent)
+          + dropEndingNewline(indentString(foldString(string, lineWidth), indent));
+      case STYLE_DOUBLE:
+        return '"' + escapeString(string, lineWidth) + '"';
+      default:
+        throw new YAMLException('impossible error: invalid scalar style');
+    }
+  }());
+}
+
+// Pre-conditions: string is valid for a block scalar, 1 <= indentPerLevel <= 9.
+function blockHeader(string, indentPerLevel) {
+  var indentIndicator = (string[0] === ' ') ? String(indentPerLevel) : '';
+
+  // note the special case: the string '\n' counts as a "trailing" empty line.
+  var clip =          string[string.length - 1] === '\n';
+  var keep = clip && (string[string.length - 2] === '\n' || string === '\n');
+  var chomp = keep ? '+' : (clip ? '' : '-');
+
+  return indentIndicator + chomp + '\n';
+}
+
+// (See the note for writeScalar.)
+function dropEndingNewline(string) {
+  return string[string.length - 1] === '\n' ? string.slice(0, -1) : string;
+}
+
+// Note: a long line without a suitable break point will exceed the width limit.
+// Pre-conditions: every char in str isPrintable, str.length > 0, width > 0.
+function foldString(string, width) {
+  // In folded style, $k$ consecutive newlines output as $k+1$ newlines—
+  // unless they're before or after a more-indented line, or at the very
+  // beginning or end, in which case $k$ maps to $k$.
+  // Therefore, parse each chunk as newline(s) followed by a content line.
+  var lineRe = /(\n+)([^\n]*)/g;
+
+  // first line (possibly an empty line)
+  var result = (function () {
+    var nextLF = string.indexOf('\n');
+    nextLF = nextLF !== -1 ? nextLF : string.length;
+    lineRe.lastIndex = nextLF;
+    return foldLine(string.slice(0, nextLF), width);
+  }());
+  // If we haven't reached the first content line yet, don't add an extra \n.
+  var prevMoreIndented = string[0] === '\n' || string[0] === ' ';
+  var moreIndented;
+
+  // rest of the lines
+  var match;
+  while ((match = lineRe.exec(string))) {
+    var prefix = match[1], line = match[2];
+    moreIndented = (line[0] === ' ');
+    result += prefix
+      + (!prevMoreIndented && !moreIndented && line !== ''
+        ? '\n' : '')
+      + foldLine(line, width);
+    prevMoreIndented = moreIndented;
   }
 
   return result;
 }
 
-function foldLine(line, max) {
-  if (line === '') {
-    return line;
-  }
+// Greedy line breaking.
+// Picks the longest line under the limit each time,
+// otherwise settles for the shortest line over the limit.
+// NB. More-indented lines *cannot* be folded, as that would add an extra \n.
+function foldLine(line, width) {
+  if (line === '' || line[0] === ' ') return line;
 
-  var foldRe = /[^\s] [^\s]/g,
-      result = '',
-      prevMatch = 0,
-      foldStart = 0,
-      match = foldRe.exec(line),
-      index,
-      foldEnd,
-      folded;
+  // Since a more-indented line adds a \n, breaks can't be followed by a space.
+  var breakRe = / [^ ]/g; // note: the match index will always be <= length-2.
+  var match;
+  // start is an inclusive index. end, curr, and next are exclusive.
+  var start = 0, end, curr = 0, next = 0;
+  var result = '';
 
-  while (match) {
-    index = match.index;
-
-    // when we cross the max len, if the previous match would've
-    // been ok, use that one, and carry on.  If there was no previous
-    // match on this fold section, then just have a long line.
-    if (index - foldStart > max) {
-      if (prevMatch !== foldStart) {
-        foldEnd = prevMatch;
-      } else {
-        foldEnd = index;
-      }
-
-      if (result) {
-        result += '\n';
-      }
-      folded = line.slice(foldStart, foldEnd);
-      result += folded;
-      foldStart = foldEnd + 1;
+  // Invariants: 0 <= start <= length-1.
+  //   0 <= curr <= next <= max(0, length-2). curr - start <= width.
+  // Inside the loop:
+  //   A match implies length >= 2, so curr and next are <= length-2.
+  while ((match = breakRe.exec(line))) {
+    next = match.index;
+    // maintain invariant: curr - start <= width
+    if (next - start > width) {
+      end = (curr > start) ? curr : next; // derive end <= length-2
+      result += '\n' + line.slice(start, end);
+      // skip the space that was output as \n
+      start = end + 1;                    // derive start <= length-1
     }
-    prevMatch = index + 1;
-    match = foldRe.exec(line);
+    curr = next;
   }
 
-  if (result) {
-    result += '\n';
-  }
-
-  // if we end up with one last word at the end, then the last bit might
-  // be slightly bigger than we wanted, because we exited out of the loop.
-  if (foldStart !== prevMatch && line.length - foldStart > max) {
-    result += line.slice(foldStart, prevMatch) + '\n' +
-              line.slice(prevMatch + 1);
+  // By the invariants, start <= length-1, so there is something left over.
+  // It is either the whole string or a part starting from non-whitespace.
+  result += '\n';
+  // Insert a break if the remainder is too long and there is a break available.
+  if (line.length - start > width && curr > start) {
+    result += line.slice(start, curr) + '\n' + line.slice(curr + 1);
   } else {
-    result += line.slice(foldStart);
+    result += line.slice(start);
+  }
+
+  return result.slice(1); // drop extra \n joiner
+}
+
+// Escapes a double-quoted string.
+function escapeString(string) {
+  var result = '';
+  var char;
+  var escapeSeq;
+
+  for (var i = 0; i < string.length; i++) {
+    char = string.charCodeAt(i);
+    escapeSeq = ESCAPE_SEQUENCES[char];
+    result += !escapeSeq && isPrintable(char)
+      ? string[i]
+      : escapeSeq || encodeHex(char);
   }
 
   return result;
 }
 
-// Returns true if character can be found in a simple scalar
-function simpleChar(character) {
-  return CHAR_TAB                  !== character &&
-         CHAR_LINE_FEED            !== character &&
-         CHAR_CARRIAGE_RETURN      !== character &&
-         CHAR_COMMA                !== character &&
-         CHAR_LEFT_SQUARE_BRACKET  !== character &&
-         CHAR_RIGHT_SQUARE_BRACKET !== character &&
-         CHAR_LEFT_CURLY_BRACKET   !== character &&
-         CHAR_RIGHT_CURLY_BRACKET  !== character &&
-         CHAR_SHARP                !== character &&
-         CHAR_AMPERSAND            !== character &&
-         CHAR_ASTERISK             !== character &&
-         CHAR_EXCLAMATION          !== character &&
-         CHAR_VERTICAL_LINE        !== character &&
-         CHAR_GREATER_THAN         !== character &&
-         CHAR_SINGLE_QUOTE         !== character &&
-         CHAR_DOUBLE_QUOTE         !== character &&
-         CHAR_PERCENT              !== character &&
-         CHAR_COLON                !== character &&
-         !ESCAPE_SEQUENCES[character]            &&
-         !needsHexEscape(character);
-}
-
-// Returns true if the character code needs to be escaped.
-function needsHexEscape(character) {
-  return !((0x00020 <= character && character <= 0x00007E) ||
-           (0x00085 === character)                         ||
-           (0x000A0 <= character && character <= 0x00D7FF) ||
-           (0x0E000 <= character && character <= 0x00FFFD) ||
-           (0x10000 <= character && character <= 0x10FFFF));
-}
-
 function writeFlowSequence(state, level, object) {
   var _result = '',
       _tag    = state.tag,
@@ -7719,9 +10669,7 @@ function writeFlowSequence(state, level, object) {
   for (index = 0, length = object.length; index < length; index += 1) {
     // Write only valid elements.
     if (writeNode(state, level, object[index], false, false)) {
-      if (0 !== index) {
-        _result += ', ';
-      }
+      if (index !== 0) _result += ', ';
       _result += state.dump;
     }
   }
@@ -7739,7 +10687,7 @@ function writeBlockSequence(state, level, object, compact) {
   for (index = 0, length = object.length; index < length; index += 1) {
     // Write only valid elements.
     if (writeNode(state, level + 1, object[index], true, true)) {
-      if (!compact || 0 !== index) {
+      if (!compact || index !== 0) {
         _result += generateNextLine(state, level);
       }
       _result += '- ' + state.dump;
@@ -7763,9 +10711,7 @@ function writeFlowMapping(state, level, object) {
   for (index = 0, length = objectKeyList.length; index < length; index += 1) {
     pairBuffer = '';
 
-    if (0 !== index) {
-      pairBuffer += ', ';
-    }
+    if (index !== 0) pairBuffer += ', ';
 
     objectKey = objectKeyList[index];
     objectValue = object[objectKey];
@@ -7774,9 +10720,7 @@ function writeFlowMapping(state, level, object) {
       continue; // Skip this pair because of invalid key;
     }
 
-    if (state.dump.length > 1024) {
-      pairBuffer += '? ';
-    }
+    if (state.dump.length > 1024) pairBuffer += '? ';
 
     pairBuffer += state.dump + ': ';
 
@@ -7820,7 +10764,7 @@ function writeBlockMapping(state, level, object, compact) {
   for (index = 0, length = objectKeyList.length; index < length; index += 1) {
     pairBuffer = '';
 
-    if (!compact || 0 !== index) {
+    if (!compact || index !== 0) {
       pairBuffer += generateNextLine(state, level);
     }
 
@@ -7831,7 +10775,7 @@ function writeBlockMapping(state, level, object, compact) {
       continue; // Skip this pair because of invalid key.
     }
 
-    explicitPair = (null !== state.tag && '?' !== state.tag) ||
+    explicitPair = (state.tag !== null && state.tag !== '?') ||
                    (state.dump && state.dump.length > 1024);
 
     if (explicitPair) {
@@ -7877,7 +10821,7 @@ function detectType(state, object, explicit) {
     type = typeList[index];
 
     if ((type.instanceOf  || type.predicate) &&
-        (!type.instanceOf || (('object' === typeof object) && (object instanceof type.instanceOf))) &&
+        (!type.instanceOf || ((typeof object === 'object') && (object instanceof type.instanceOf))) &&
         (!type.predicate  || type.predicate(object))) {
 
       state.tag = explicit ? type.tag : '?';
@@ -7885,7 +10829,7 @@ function detectType(state, object, explicit) {
       if (type.represent) {
         style = state.styleMap[type.tag] || type.defaultStyle;
 
-        if ('[object Function]' === _toString.call(type.represent)) {
+        if (_toString.call(type.represent) === '[object Function]') {
           _result = type.represent(object, style);
         } else if (_hasOwnProperty.call(type.represent, style)) {
           _result = type.represent[style](object, style);
@@ -7917,10 +10861,10 @@ function writeNode(state, level, object, block, compact, iskey) {
   var type = _toString.call(state.dump);
 
   if (block) {
-    block = (0 > state.flowLevel || state.flowLevel > level);
+    block = (state.flowLevel < 0 || state.flowLevel > level);
   }
 
-  var objectOrArray = '[object Object]' === type || '[object Array]' === type,
+  var objectOrArray = type === '[object Object]' || type === '[object Array]',
       duplicateIndex,
       duplicate;
 
@@ -7929,7 +10873,7 @@ function writeNode(state, level, object, block, compact, iskey) {
     duplicate = duplicateIndex !== -1;
   }
 
-  if ((null !== state.tag && '?' !== state.tag) || duplicate || (2 !== state.indent && level > 0)) {
+  if ((state.tag !== null && state.tag !== '?') || duplicate || (state.indent !== 2 && level > 0)) {
     compact = false;
   }
 
@@ -7939,8 +10883,8 @@ function writeNode(state, level, object, block, compact, iskey) {
     if (objectOrArray && duplicate && !state.usedDuplicates[duplicateIndex]) {
       state.usedDuplicates[duplicateIndex] = true;
     }
-    if ('[object Object]' === type) {
-      if (block && (0 !== Object.keys(state.dump).length)) {
+    if (type === '[object Object]') {
+      if (block && (Object.keys(state.dump).length !== 0)) {
         writeBlockMapping(state, level, state.dump, compact);
         if (duplicate) {
           state.dump = '&ref_' + duplicateIndex + state.dump;
@@ -7951,8 +10895,8 @@ function writeNode(state, level, object, block, compact, iskey) {
           state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;
         }
       }
-    } else if ('[object Array]' === type) {
-      if (block && (0 !== state.dump.length)) {
+    } else if (type === '[object Array]') {
+      if (block && (state.dump.length !== 0)) {
         writeBlockSequence(state, level, state.dump, compact);
         if (duplicate) {
           state.dump = '&ref_' + duplicateIndex + state.dump;
@@ -7963,18 +10907,16 @@ function writeNode(state, level, object, block, compact, iskey) {
           state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;
         }
       }
-    } else if ('[object String]' === type) {
-      if ('?' !== state.tag) {
+    } else if (type === '[object String]') {
+      if (state.tag !== '?') {
         writeScalar(state, state.dump, level, iskey);
       }
     } else {
-      if (state.skipInvalid) {
-        return false;
-      }
+      if (state.skipInvalid) return false;
       throw new YAMLException('unacceptable kind of an object to dump ' + type);
     }
 
-    if (null !== state.tag && '?' !== state.tag) {
+    if (state.tag !== null && state.tag !== '?') {
       state.dump = '!<' + state.tag + '> ' + state.dump;
     }
   }
@@ -8001,10 +10943,10 @@ function inspectNode(object, objects, duplicatesIndexes) {
       index,
       length;
 
-  if (null !== object && 'object' === typeof object) {
+  if (object !== null && typeof object === 'object') {
     index = objects.indexOf(object);
-    if (-1 !== index) {
-      if (-1 === duplicatesIndexes.indexOf(index)) {
+    if (index !== -1) {
+      if (duplicatesIndexes.indexOf(index) === -1) {
         duplicatesIndexes.push(index);
       }
     } else {
@@ -8030,11 +10972,10 @@ function dump(input, options) {
 
   var state = new State(options);
 
-  getDuplicateReferences(input, state);
+  if (!state.noRefs) getDuplicateReferences(input, state);
+
+  if (writeNode(state, 0, input, true, true)) return state.dump + '\n';
 
-  if (writeNode(state, 0, input, true, true)) {
-    return state.dump + '\n';
-  }
   return '';
 }
 
@@ -8045,15 +10986,11 @@ function safeDump(input, options) {
 module.exports.dump     = dump;
 module.exports.safeDump = safeDump;
 
-},{"./common":22,"./exception":24,"./schema/default_full":29,"./schema/default_safe":30}],24:[function(require,module,exports){
+},{"./common":21,"./exception":23,"./schema/default_full":28,"./schema/default_safe":29}],23:[function(require,module,exports){
 // YAML error class. http://stackoverflow.com/questions/8458984
 //
 'use strict';
 
-
-var inherits = require('inherit');
-
-
 function YAMLException(reason, mark) {
   // Super constructor
   Error.call(this);
@@ -8075,7 +11012,8 @@ function YAMLException(reason, mark) {
 
 
 // Inherit from Error
-inherits(YAMLException, Error);
+YAMLException.prototype = Object.create(Error.prototype);
+YAMLException.prototype.constructor = YAMLException;
 
 
 YAMLException.prototype.toString = function toString(compact) {
@@ -8093,7 +11031,7 @@ YAMLException.prototype.toString = function toString(compact) {
 
 module.exports = YAMLException;
 
-},{"inherit":51}],25:[function(require,module,exports){
+},{}],24:[function(require,module,exports){
 'use strict';
 
 /*eslint-disable max-len,no-use-before-define*/
@@ -8142,11 +11080,11 @@ function is_WS_OR_EOL(c) {
 }
 
 function is_FLOW_INDICATOR(c) {
-  return 0x2C/* , */ === c ||
-         0x5B/* [ */ === c ||
-         0x5D/* ] */ === c ||
-         0x7B/* { */ === c ||
-         0x7D/* } */ === c;
+  return c === 0x2C/* , */ ||
+         c === 0x5B/* [ */ ||
+         c === 0x5D/* ] */ ||
+         c === 0x7B/* { */ ||
+         c === 0x7D/* } */;
 }
 
 function fromHexCode(c) {
@@ -8227,6 +11165,8 @@ function State(input, options) {
   this.schema    = options['schema']    || DEFAULT_FULL_SCHEMA;
   this.onWarning = options['onWarning'] || null;
   this.legacy    = options['legacy']    || false;
+  this.json      = options['json']      || false;
+  this.listener  = options['listener']  || null;
 
   this.implicitTypes = this.schema.compiledImplicit;
   this.typeMap       = this.schema.compiledTypeMap;
@@ -8273,62 +11213,62 @@ var directiveHandlers = {
 
   YAML: function handleYamlDirective(state, name, args) {
 
-      var match, major, minor;
+    var match, major, minor;
 
-      if (null !== state.version) {
-        throwError(state, 'duplication of %YAML directive');
-      }
+    if (state.version !== null) {
+      throwError(state, 'duplication of %YAML directive');
+    }
 
-      if (1 !== args.length) {
-        throwError(state, 'YAML directive accepts exactly one argument');
-      }
+    if (args.length !== 1) {
+      throwError(state, 'YAML directive accepts exactly one argument');
+    }
 
-      match = /^([0-9]+)\.([0-9]+)$/.exec(args[0]);
+    match = /^([0-9]+)\.([0-9]+)$/.exec(args[0]);
 
-      if (null === match) {
-        throwError(state, 'ill-formed argument of the YAML directive');
-      }
+    if (match === null) {
+      throwError(state, 'ill-formed argument of the YAML directive');
+    }
 
-      major = parseInt(match[1], 10);
-      minor = parseInt(match[2], 10);
+    major = parseInt(match[1], 10);
+    minor = parseInt(match[2], 10);
 
-      if (1 !== major) {
-        throwError(state, 'unacceptable YAML version of the document');
-      }
+    if (major !== 1) {
+      throwError(state, 'unacceptable YAML version of the document');
+    }
 
-      state.version = args[0];
-      state.checkLineBreaks = (minor < 2);
+    state.version = args[0];
+    state.checkLineBreaks = (minor < 2);
 
-      if (1 !== minor && 2 !== minor) {
-        throwWarning(state, 'unsupported YAML version of the document');
-      }
-    },
+    if (minor !== 1 && minor !== 2) {
+      throwWarning(state, 'unsupported YAML version of the document');
+    }
+  },
 
   TAG: function handleTagDirective(state, name, args) {
 
-      var handle, prefix;
+    var handle, prefix;
 
-      if (2 !== args.length) {
-        throwError(state, 'TAG directive accepts exactly two arguments');
-      }
-
-      handle = args[0];
-      prefix = args[1];
-
-      if (!PATTERN_TAG_HANDLE.test(handle)) {
-        throwError(state, 'ill-formed tag handle (first argument) of the TAG directive');
-      }
-
-      if (_hasOwnProperty.call(state.tagMap, handle)) {
-        throwError(state, 'there is a previously declared suffix for "' + handle + '" tag handle');
-      }
-
-      if (!PATTERN_TAG_URI.test(prefix)) {
-        throwError(state, 'ill-formed tag prefix (second argument) of the TAG directive');
-      }
-
-      state.tagMap[handle] = prefix;
+    if (args.length !== 2) {
+      throwError(state, 'TAG directive accepts exactly two arguments');
     }
+
+    handle = args[0];
+    prefix = args[1];
+
+    if (!PATTERN_TAG_HANDLE.test(handle)) {
+      throwError(state, 'ill-formed tag handle (first argument) of the TAG directive');
+    }
+
+    if (_hasOwnProperty.call(state.tagMap, handle)) {
+      throwError(state, 'there is a previously declared suffix for "' + handle + '" tag handle');
+    }
+
+    if (!PATTERN_TAG_URI.test(prefix)) {
+      throwError(state, 'ill-formed tag prefix (second argument) of the TAG directive');
+    }
+
+    state.tagMap[handle] = prefix;
+  }
 };
 
 
@@ -8343,8 +11283,8 @@ function captureSegment(state, start, end, checkJson) {
            _position < _length;
            _position += 1) {
         _character = _result.charCodeAt(_position);
-        if (!(0x09 === _character ||
-              0x20 <= _character && _character <= 0x10FFFF)) {
+        if (!(_character === 0x09 ||
+              (0x20 <= _character && _character <= 0x10FFFF))) {
           throwError(state, 'expected valid JSON character');
         }
       }
@@ -8356,7 +11296,7 @@ function captureSegment(state, start, end, checkJson) {
   }
 }
 
-function mergeMappings(state, destination, source) {
+function mergeMappings(state, destination, source, overridableKeys) {
   var sourceKeys, key, index, quantity;
 
   if (!common.isObject(source)) {
@@ -8370,29 +11310,36 @@ function mergeMappings(state, destination, source) {
 
     if (!_hasOwnProperty.call(destination, key)) {
       destination[key] = source[key];
+      overridableKeys[key] = true;
     }
   }
 }
 
-function storeMappingPair(state, _result, keyTag, keyNode, valueNode) {
+function storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode) {
   var index, quantity;
 
   keyNode = String(keyNode);
 
-  if (null === _result) {
+  if (_result === null) {
     _result = {};
   }
 
-  if ('tag:yaml.org,2002:merge' === keyTag) {
+  if (keyTag === 'tag:yaml.org,2002:merge') {
     if (Array.isArray(valueNode)) {
       for (index = 0, quantity = valueNode.length; index < quantity; index += 1) {
-        mergeMappings(state, _result, valueNode[index]);
+        mergeMappings(state, _result, valueNode[index], overridableKeys);
       }
     } else {
-      mergeMappings(state, _result, valueNode);
+      mergeMappings(state, _result, valueNode, overridableKeys);
     }
   } else {
+    if (!state.json &&
+        !_hasOwnProperty.call(overridableKeys, keyNode) &&
+        _hasOwnProperty.call(_result, keyNode)) {
+      throwError(state, 'duplicated mapping key');
+    }
     _result[keyNode] = valueNode;
+    delete overridableKeys[keyNode];
   }
 
   return _result;
@@ -8403,11 +11350,11 @@ function readLineBreak(state) {
 
   ch = state.input.charCodeAt(state.position);
 
-  if (0x0A/* LF */ === ch) {
+  if (ch === 0x0A/* LF */) {
     state.position++;
-  } else if (0x0D/* CR */ === ch) {
+  } else if (ch === 0x0D/* CR */) {
     state.position++;
-    if (0x0A/* LF */ === state.input.charCodeAt(state.position)) {
+    if (state.input.charCodeAt(state.position) === 0x0A/* LF */) {
       state.position++;
     }
   } else {
@@ -8422,15 +11369,15 @@ function skipSeparationSpace(state, allowComments, checkIndent) {
   var lineBreaks = 0,
       ch = state.input.charCodeAt(state.position);
 
-  while (0 !== ch) {
+  while (ch !== 0) {
     while (is_WHITE_SPACE(ch)) {
       ch = state.input.charCodeAt(++state.position);
     }
 
-    if (allowComments && 0x23/* # */ === ch) {
+    if (allowComments && ch === 0x23/* # */) {
       do {
         ch = state.input.charCodeAt(++state.position);
-      } while (ch !== 0x0A/* LF */ && ch !== 0x0D/* CR */ && 0 !== ch);
+      } while (ch !== 0x0A/* LF */ && ch !== 0x0D/* CR */ && ch !== 0);
     }
 
     if (is_EOL(ch)) {
@@ -8440,7 +11387,7 @@ function skipSeparationSpace(state, allowComments, checkIndent) {
       lineBreaks++;
       state.lineIndent = 0;
 
-      while (0x20/* Space */ === ch) {
+      while (ch === 0x20/* Space */) {
         state.lineIndent++;
         ch = state.input.charCodeAt(++state.position);
       }
@@ -8449,7 +11396,7 @@ function skipSeparationSpace(state, allowComments, checkIndent) {
     }
   }
 
-  if (-1 !== checkIndent && 0 !== lineBreaks && state.lineIndent < checkIndent) {
+  if (checkIndent !== -1 && lineBreaks !== 0 && state.lineIndent < checkIndent) {
     throwWarning(state, 'deficient indentation');
   }
 
@@ -8464,9 +11411,9 @@ function testDocumentSeparator(state) {
 
   // Condition state.position === state.lineStart is tested
   // in parent on each call, for efficiency. No needs to test here again.
-  if ((0x2D/* - */ === ch || 0x2E/* . */ === ch) &&
-      state.input.charCodeAt(_position + 1) === ch &&
-      state.input.charCodeAt(_position + 2) === ch) {
+  if ((ch === 0x2D/* - */ || ch === 0x2E/* . */) &&
+      ch === state.input.charCodeAt(_position + 1) &&
+      ch === state.input.charCodeAt(_position + 2)) {
 
     _position += 3;
 
@@ -8481,7 +11428,7 @@ function testDocumentSeparator(state) {
 }
 
 function writeFoldedLines(state, count) {
-  if (1 === count) {
+  if (count === 1) {
     state.result += ' ';
   } else if (count > 1) {
     state.result += common.repeat('\n', count - 1);
@@ -8504,23 +11451,23 @@ function readPlainScalar(state, nodeIndent, withinFlowCollection) {
 
   ch = state.input.charCodeAt(state.position);
 
-  if (is_WS_OR_EOL(ch)             ||
-      is_FLOW_INDICATOR(ch)        ||
-      0x23/* # */           === ch ||
-      0x26/* & */           === ch ||
-      0x2A/* * */           === ch ||
-      0x21/* ! */           === ch ||
-      0x7C/* | */           === ch ||
-      0x3E/* > */           === ch ||
-      0x27/* ' */           === ch ||
-      0x22/* " */           === ch ||
-      0x25/* % */           === ch ||
-      0x40/* @ */           === ch ||
-      0x60/* ` */           === ch) {
+  if (is_WS_OR_EOL(ch)      ||
+      is_FLOW_INDICATOR(ch) ||
+      ch === 0x23/* # */    ||
+      ch === 0x26/* & */    ||
+      ch === 0x2A/* * */    ||
+      ch === 0x21/* ! */    ||
+      ch === 0x7C/* | */    ||
+      ch === 0x3E/* > */    ||
+      ch === 0x27/* ' */    ||
+      ch === 0x22/* " */    ||
+      ch === 0x25/* % */    ||
+      ch === 0x40/* @ */    ||
+      ch === 0x60/* ` */) {
     return false;
   }
 
-  if (0x3F/* ? */ === ch || 0x2D/* - */ === ch) {
+  if (ch === 0x3F/* ? */ || ch === 0x2D/* - */) {
     following = state.input.charCodeAt(state.position + 1);
 
     if (is_WS_OR_EOL(following) ||
@@ -8534,8 +11481,8 @@ function readPlainScalar(state, nodeIndent, withinFlowCollection) {
   captureStart = captureEnd = state.position;
   hasPendingContent = false;
 
-  while (0 !== ch) {
-    if (0x3A/* : */ === ch) {
+  while (ch !== 0) {
+    if (ch === 0x3A/* : */) {
       following = state.input.charCodeAt(state.position + 1);
 
       if (is_WS_OR_EOL(following) ||
@@ -8543,7 +11490,7 @@ function readPlainScalar(state, nodeIndent, withinFlowCollection) {
         break;
       }
 
-    } else if (0x23/* # */ === ch) {
+    } else if (ch === 0x23/* # */) {
       preceding = state.input.charCodeAt(state.position - 1);
 
       if (is_WS_OR_EOL(preceding)) {
@@ -8604,7 +11551,7 @@ function readSingleQuotedScalar(state, nodeIndent) {
 
   ch = state.input.charCodeAt(state.position);
 
-  if (0x27/* ' */ !== ch) {
+  if (ch !== 0x27/* ' */) {
     return false;
   }
 
@@ -8613,12 +11560,12 @@ function readSingleQuotedScalar(state, nodeIndent) {
   state.position++;
   captureStart = captureEnd = state.position;
 
-  while (0 !== (ch = state.input.charCodeAt(state.position))) {
-    if (0x27/* ' */ === ch) {
+  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
+    if (ch === 0x27/* ' */) {
       captureSegment(state, captureStart, state.position, true);
       ch = state.input.charCodeAt(++state.position);
 
-      if (0x27/* ' */ === ch) {
+      if (ch === 0x27/* ' */) {
         captureStart = captureEnd = state.position;
         state.position++;
       } else {
@@ -8652,7 +11599,7 @@ function readDoubleQuotedScalar(state, nodeIndent) {
 
   ch = state.input.charCodeAt(state.position);
 
-  if (0x22/* " */ !== ch) {
+  if (ch !== 0x22/* " */) {
     return false;
   }
 
@@ -8661,13 +11608,13 @@ function readDoubleQuotedScalar(state, nodeIndent) {
   state.position++;
   captureStart = captureEnd = state.position;
 
-  while (0 !== (ch = state.input.charCodeAt(state.position))) {
-    if (0x22/* " */ === ch) {
+  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
+    if (ch === 0x22/* " */) {
       captureSegment(state, captureStart, state.position, true);
       state.position++;
       return true;
 
-    } else if (0x5C/* \ */ === ch) {
+    } else if (ch === 0x5C/* \ */) {
       captureSegment(state, captureStart, state.position, true);
       ch = state.input.charCodeAt(++state.position);
 
@@ -8732,6 +11679,7 @@ function readFlowCollection(state, nodeIndent) {
       isPair,
       isExplicitPair,
       isMapping,
+      overridableKeys = {},
       keyNode,
       keyTag,
       valueNode,
@@ -8751,13 +11699,13 @@ function readFlowCollection(state, nodeIndent) {
     return false;
   }
 
-  if (null !== state.anchor) {
+  if (state.anchor !== null) {
     state.anchorMap[state.anchor] = _result;
   }
 
   ch = state.input.charCodeAt(++state.position);
 
-  while (0 !== ch) {
+  while (ch !== 0) {
     skipSeparationSpace(state, true, nodeIndent);
 
     ch = state.input.charCodeAt(state.position);
@@ -8776,7 +11724,7 @@ function readFlowCollection(state, nodeIndent) {
     keyTag = keyNode = valueNode = null;
     isPair = isExplicitPair = false;
 
-    if (0x3F/* ? */ === ch) {
+    if (ch === 0x3F/* ? */) {
       following = state.input.charCodeAt(state.position + 1);
 
       if (is_WS_OR_EOL(following)) {
@@ -8794,7 +11742,7 @@ function readFlowCollection(state, nodeIndent) {
 
     ch = state.input.charCodeAt(state.position);
 
-    if ((isExplicitPair || state.line === _line) && 0x3A/* : */ === ch) {
+    if ((isExplicitPair || state.line === _line) && ch === 0x3A/* : */) {
       isPair = true;
       ch = state.input.charCodeAt(++state.position);
       skipSeparationSpace(state, true, nodeIndent);
@@ -8803,9 +11751,9 @@ function readFlowCollection(state, nodeIndent) {
     }
 
     if (isMapping) {
-      storeMappingPair(state, _result, keyTag, keyNode, valueNode);
+      storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode);
     } else if (isPair) {
-      _result.push(storeMappingPair(state, null, keyTag, keyNode, valueNode));
+      _result.push(storeMappingPair(state, null, overridableKeys, keyTag, keyNode, valueNode));
     } else {
       _result.push(keyNode);
     }
@@ -8814,7 +11762,7 @@ function readFlowCollection(state, nodeIndent) {
 
     ch = state.input.charCodeAt(state.position);
 
-    if (0x2C/* , */ === ch) {
+    if (ch === 0x2C/* , */) {
       readNext = true;
       ch = state.input.charCodeAt(++state.position);
     } else {
@@ -8829,6 +11777,7 @@ function readBlockScalar(state, nodeIndent) {
   var captureStart,
       folding,
       chomping       = CHOMPING_CLIP,
+      didReadContent = false,
       detectedIndent = false,
       textIndent     = nodeIndent,
       emptyLines     = 0,
@@ -8849,12 +11798,12 @@ function readBlockScalar(state, nodeIndent) {
   state.kind = 'scalar';
   state.result = '';
 
-  while (0 !== ch) {
+  while (ch !== 0) {
     ch = state.input.charCodeAt(++state.position);
 
-    if (0x2B/* + */ === ch || 0x2D/* - */ === ch) {
+    if (ch === 0x2B/* + */ || ch === 0x2D/* - */) {
       if (CHOMPING_CLIP === chomping) {
-        chomping = (0x2B/* + */ === ch) ? CHOMPING_KEEP : CHOMPING_STRIP;
+        chomping = (ch === 0x2B/* + */) ? CHOMPING_KEEP : CHOMPING_STRIP;
       } else {
         throwError(state, 'repeat of a chomping mode identifier');
       }
@@ -8878,20 +11827,20 @@ function readBlockScalar(state, nodeIndent) {
     do { ch = state.input.charCodeAt(++state.position); }
     while (is_WHITE_SPACE(ch));
 
-    if (0x23/* # */ === ch) {
+    if (ch === 0x23/* # */) {
       do { ch = state.input.charCodeAt(++state.position); }
-      while (!is_EOL(ch) && (0 !== ch));
+      while (!is_EOL(ch) && (ch !== 0));
     }
   }
 
-  while (0 !== ch) {
+  while (ch !== 0) {
     readLineBreak(state);
     state.lineIndent = 0;
 
     ch = state.input.charCodeAt(state.position);
 
     while ((!detectedIndent || state.lineIndent < textIndent) &&
-           (0x20/* Space */ === ch)) {
+           (ch === 0x20/* Space */)) {
       state.lineIndent++;
       ch = state.input.charCodeAt(++state.position);
     }
@@ -8910,9 +11859,9 @@ function readBlockScalar(state, nodeIndent) {
 
       // Perform the chomping.
       if (chomping === CHOMPING_KEEP) {
-        state.result += common.repeat('\n', emptyLines);
+        state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
       } else if (chomping === CHOMPING_CLIP) {
-        if (detectedIndent) { // i.e. only if the scalar is not empty.
+        if (didReadContent) { // i.e. only if the scalar is not empty.
           state.result += '\n';
         }
       }
@@ -8927,7 +11876,8 @@ function readBlockScalar(state, nodeIndent) {
       // Lines starting with white space characters (more-indented lines) are not folded.
       if (is_WHITE_SPACE(ch)) {
         atMoreIndented = true;
-        state.result += common.repeat('\n', emptyLines + 1);
+        // except for the first content line (cf. Example 8.1)
+        state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
 
       // End of more-indented block.
       } else if (atMoreIndented) {
@@ -8935,8 +11885,8 @@ function readBlockScalar(state, nodeIndent) {
         state.result += common.repeat('\n', emptyLines + 1);
 
       // Just one line break - perceive as the same line.
-      } else if (0 === emptyLines) {
-        if (detectedIndent) { // i.e. only if we have already read some scalar content.
+      } else if (emptyLines === 0) {
+        if (didReadContent) { // i.e. only if we have already read some scalar content.
           state.result += ' ';
         }
 
@@ -8946,19 +11896,17 @@ function readBlockScalar(state, nodeIndent) {
       }
 
     // Literal style: just add exact number of line breaks between content lines.
-    } else if (detectedIndent) {
-      // If current line isn't the first one - count line break from the last content line.
-      state.result += common.repeat('\n', emptyLines + 1);
     } else {
-      // In case of the first content line - count only empty lines.
-      state.result += common.repeat('\n', emptyLines);
+      // Keep all line breaks except the header line break.
+      state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
     }
 
+    didReadContent = true;
     detectedIndent = true;
     emptyLines = 0;
     captureStart = state.position;
 
-    while (!is_EOL(ch) && (0 !== ch)) {
+    while (!is_EOL(ch) && (ch !== 0)) {
       ch = state.input.charCodeAt(++state.position);
     }
 
@@ -8977,15 +11925,15 @@ function readBlockSequence(state, nodeIndent) {
       detected  = false,
       ch;
 
-  if (null !== state.anchor) {
+  if (state.anchor !== null) {
     state.anchorMap[state.anchor] = _result;
   }
 
   ch = state.input.charCodeAt(state.position);
 
-  while (0 !== ch) {
+  while (ch !== 0) {
 
-    if (0x2D/* - */ !== ch) {
+    if (ch !== 0x2D/* - */) {
       break;
     }
 
@@ -9013,7 +11961,7 @@ function readBlockSequence(state, nodeIndent) {
 
     ch = state.input.charCodeAt(state.position);
 
-    if ((state.line === _line || state.lineIndent > nodeIndent) && (0 !== ch)) {
+    if ((state.line === _line || state.lineIndent > nodeIndent) && (ch !== 0)) {
       throwError(state, 'bad indentation of a sequence entry');
     } else if (state.lineIndent < nodeIndent) {
       break;
@@ -9037,6 +11985,7 @@ function readBlockMapping(state, nodeIndent, flowIndent) {
       _tag          = state.tag,
       _anchor       = state.anchor,
       _result       = {},
+      overridableKeys = {},
       keyTag        = null,
       keyNode       = null,
       valueNode     = null,
@@ -9044,13 +11993,13 @@ function readBlockMapping(state, nodeIndent, flowIndent) {
       detected      = false,
       ch;
 
-  if (null !== state.anchor) {
+  if (state.anchor !== null) {
     state.anchorMap[state.anchor] = _result;
   }
 
   ch = state.input.charCodeAt(state.position);
 
-  while (0 !== ch) {
+  while (ch !== 0) {
     following = state.input.charCodeAt(state.position + 1);
     _line = state.line; // Save the current line.
 
@@ -9058,11 +12007,11 @@ function readBlockMapping(state, nodeIndent, flowIndent) {
     // Explicit notation case. There are two separate blocks:
     // first for the key (denoted by "?") and second for the value (denoted by ":")
     //
-    if ((0x3F/* ? */ === ch || 0x3A/* : */  === ch) && is_WS_OR_EOL(following)) {
+    if ((ch === 0x3F/* ? */ || ch === 0x3A/* : */) && is_WS_OR_EOL(following)) {
 
-      if (0x3F/* ? */ === ch) {
+      if (ch === 0x3F/* ? */) {
         if (atExplicitKey) {
-          storeMappingPair(state, _result, keyTag, keyNode, null);
+          storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
           keyTag = keyNode = valueNode = null;
         }
 
@@ -9094,7 +12043,7 @@ function readBlockMapping(state, nodeIndent, flowIndent) {
           ch = state.input.charCodeAt(++state.position);
         }
 
-        if (0x3A/* : */ === ch) {
+        if (ch === 0x3A/* : */) {
           ch = state.input.charCodeAt(++state.position);
 
           if (!is_WS_OR_EOL(ch)) {
@@ -9102,7 +12051,7 @@ function readBlockMapping(state, nodeIndent, flowIndent) {
           }
 
           if (atExplicitKey) {
-            storeMappingPair(state, _result, keyTag, keyNode, null);
+            storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
             keyTag = keyNode = valueNode = null;
           }
 
@@ -9147,7 +12096,7 @@ function readBlockMapping(state, nodeIndent, flowIndent) {
       }
 
       if (!atExplicitKey) {
-        storeMappingPair(state, _result, keyTag, keyNode, valueNode);
+        storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode);
         keyTag = keyNode = valueNode = null;
       }
 
@@ -9155,7 +12104,7 @@ function readBlockMapping(state, nodeIndent, flowIndent) {
       ch = state.input.charCodeAt(state.position);
     }
 
-    if (state.lineIndent > nodeIndent && (0 !== ch)) {
+    if (state.lineIndent > nodeIndent && (ch !== 0)) {
       throwError(state, 'bad indentation of a mapping entry');
     } else if (state.lineIndent < nodeIndent) {
       break;
@@ -9168,7 +12117,7 @@ function readBlockMapping(state, nodeIndent, flowIndent) {
 
   // Special case: last mapping's node contains only the key in explicit notation.
   if (atExplicitKey) {
-    storeMappingPair(state, _result, keyTag, keyNode, null);
+    storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
   }
 
   // Expose the resulting mapping.
@@ -9192,21 +12141,19 @@ function readTagProperty(state) {
 
   ch = state.input.charCodeAt(state.position);
 
-  if (0x21/* ! */ !== ch) {
-    return false;
-  }
+  if (ch !== 0x21/* ! */) return false;
 
-  if (null !== state.tag) {
+  if (state.tag !== null) {
     throwError(state, 'duplication of a tag property');
   }
 
   ch = state.input.charCodeAt(++state.position);
 
-  if (0x3C/* < */ === ch) {
+  if (ch === 0x3C/* < */) {
     isVerbatim = true;
     ch = state.input.charCodeAt(++state.position);
 
-  } else if (0x21/* ! */ === ch) {
+  } else if (ch === 0x21/* ! */) {
     isNamed = true;
     tagHandle = '!!';
     ch = state.input.charCodeAt(++state.position);
@@ -9219,7 +12166,7 @@ function readTagProperty(state) {
 
   if (isVerbatim) {
     do { ch = state.input.charCodeAt(++state.position); }
-    while (0 !== ch && 0x3E/* > */ !== ch);
+    while (ch !== 0 && ch !== 0x3E/* > */);
 
     if (state.position < state.length) {
       tagName = state.input.slice(_position, state.position);
@@ -9228,9 +12175,9 @@ function readTagProperty(state) {
       throwError(state, 'unexpected end of the stream within a verbatim tag');
     }
   } else {
-    while (0 !== ch && !is_WS_OR_EOL(ch)) {
+    while (ch !== 0 && !is_WS_OR_EOL(ch)) {
 
-      if (0x21/* ! */ === ch) {
+      if (ch === 0x21/* ! */) {
         if (!isNamed) {
           tagHandle = state.input.slice(_position - 1, state.position + 1);
 
@@ -9265,10 +12212,10 @@ function readTagProperty(state) {
   } else if (_hasOwnProperty.call(state.tagMap, tagHandle)) {
     state.tag = state.tagMap[tagHandle] + tagName;
 
-  } else if ('!' === tagHandle) {
+  } else if (tagHandle === '!') {
     state.tag = '!' + tagName;
 
-  } else if ('!!' === tagHandle) {
+  } else if (tagHandle === '!!') {
     state.tag = 'tag:yaml.org,2002:' + tagName;
 
   } else {
@@ -9284,18 +12231,16 @@ function readAnchorProperty(state) {
 
   ch = state.input.charCodeAt(state.position);
 
-  if (0x26/* & */ !== ch) {
-    return false;
-  }
+  if (ch !== 0x26/* & */) return false;
 
-  if (null !== state.anchor) {
+  if (state.anchor !== null) {
     throwError(state, 'duplication of an anchor property');
   }
 
   ch = state.input.charCodeAt(++state.position);
   _position = state.position;
 
-  while (0 !== ch && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {
+  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {
     ch = state.input.charCodeAt(++state.position);
   }
 
@@ -9313,14 +12258,12 @@ function readAlias(state) {
 
   ch = state.input.charCodeAt(state.position);
 
-  if (0x2A/* * */ !== ch) {
-    return false;
-  }
+  if (ch !== 0x2A/* * */) return false;
 
   ch = state.input.charCodeAt(++state.position);
   _position = state.position;
 
-  while (0 !== ch && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {
+  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {
     ch = state.input.charCodeAt(++state.position);
   }
 
@@ -9352,6 +12295,10 @@ function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact
       flowIndent,
       blockIndent;
 
+  if (state.listener !== null) {
+    state.listener('open', state);
+  }
+
   state.tag    = null;
   state.anchor = null;
   state.kind   = null;
@@ -9375,7 +12322,7 @@ function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact
     }
   }
 
-  if (1 === indentStatus) {
+  if (indentStatus === 1) {
     while (readTagProperty(state) || readAnchorProperty(state)) {
       if (skipSeparationSpace(state, true, -1)) {
         atNewLine = true;
@@ -9398,7 +12345,7 @@ function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact
     allowBlockCollections = atNewLine || allowCompact;
   }
 
-  if (1 === indentStatus || CONTEXT_BLOCK_OUT === nodeContext) {
+  if (indentStatus === 1 || CONTEXT_BLOCK_OUT === nodeContext) {
     if (CONTEXT_FLOW_IN === nodeContext || CONTEXT_FLOW_OUT === nodeContext) {
       flowIndent = parentIndent;
     } else {
@@ -9407,7 +12354,7 @@ function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact
 
     blockIndent = state.position - state.lineStart;
 
-    if (1 === indentStatus) {
+    if (indentStatus === 1) {
       if (allowBlockCollections &&
           (readBlockSequence(state, blockIndent) ||
            readBlockMapping(state, blockIndent, flowIndent)) ||
@@ -9422,31 +12369,31 @@ function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact
         } else if (readAlias(state)) {
           hasContent = true;
 
-          if (null !== state.tag || null !== state.anchor) {
+          if (state.tag !== null || state.anchor !== null) {
             throwError(state, 'alias node should not have any properties');
           }
 
         } else if (readPlainScalar(state, flowIndent, CONTEXT_FLOW_IN === nodeContext)) {
           hasContent = true;
 
-          if (null === state.tag) {
+          if (state.tag === null) {
             state.tag = '?';
           }
         }
 
-        if (null !== state.anchor) {
+        if (state.anchor !== null) {
           state.anchorMap[state.anchor] = state.result;
         }
       }
-    } else if (0 === indentStatus) {
+    } else if (indentStatus === 0) {
       // Special case: block sequences are allowed to have same indentation level as the parent.
       // http://www.yaml.org/spec/1.2/spec.html#id2799784
       hasContent = allowBlockCollections && readBlockSequence(state, blockIndent);
     }
   }
 
-  if (null !== state.tag && '!' !== state.tag) {
-    if ('?' === state.tag) {
+  if (state.tag !== null && state.tag !== '!') {
+    if (state.tag === '?') {
       for (typeIndex = 0, typeQuantity = state.implicitTypes.length;
            typeIndex < typeQuantity;
            typeIndex += 1) {
@@ -9459,7 +12406,7 @@ function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact
         if (type.resolve(state.result)) { // `state.result` updated in resolver if matched
           state.result = type.construct(state.result);
           state.tag = type.tag;
-          if (null !== state.anchor) {
+          if (state.anchor !== null) {
             state.anchorMap[state.anchor] = state.result;
           }
           break;
@@ -9468,7 +12415,7 @@ function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact
     } else if (_hasOwnProperty.call(state.typeMap, state.tag)) {
       type = state.typeMap[state.tag];
 
-      if (null !== state.result && type.kind !== state.kind) {
+      if (state.result !== null && type.kind !== state.kind) {
         throwError(state, 'unacceptable node kind for !<' + state.tag + '> tag; it should be "' + type.kind + '", not "' + state.kind + '"');
       }
 
@@ -9476,7 +12423,7 @@ function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact
         throwError(state, 'cannot resolve a node with !<' + state.tag + '> explicit tag');
       } else {
         state.result = type.construct(state.result);
-        if (null !== state.anchor) {
+        if (state.anchor !== null) {
           state.anchorMap[state.anchor] = state.result;
         }
       }
@@ -9485,7 +12432,10 @@ function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact
     }
   }
 
-  return null !== state.tag || null !== state.anchor || hasContent;
+  if (state.listener !== null) {
+    state.listener('close', state);
+  }
+  return state.tag !== null ||  state.anchor !== null || hasContent;
 }
 
 function readDocument(state) {
@@ -9501,12 +12451,12 @@ function readDocument(state) {
   state.tagMap = {};
   state.anchorMap = {};
 
-  while (0 !== (ch = state.input.charCodeAt(state.position))) {
+  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
     skipSeparationSpace(state, true, -1);
 
     ch = state.input.charCodeAt(state.position);
 
-    if (state.lineIndent > 0 || 0x25/* % */ !== ch) {
+    if (state.lineIndent > 0 || ch !== 0x25/* % */) {
       break;
     }
 
@@ -9514,7 +12464,7 @@ function readDocument(state) {
     ch = state.input.charCodeAt(++state.position);
     _position = state.position;
 
-    while (0 !== ch && !is_WS_OR_EOL(ch)) {
+    while (ch !== 0 && !is_WS_OR_EOL(ch)) {
       ch = state.input.charCodeAt(++state.position);
     }
 
@@ -9525,33 +12475,29 @@ function readDocument(state) {
       throwError(state, 'directive name must not be less than one character in length');
     }
 
-    while (0 !== ch) {
+    while (ch !== 0) {
       while (is_WHITE_SPACE(ch)) {
         ch = state.input.charCodeAt(++state.position);
       }
 
-      if (0x23/* # */ === ch) {
+      if (ch === 0x23/* # */) {
         do { ch = state.input.charCodeAt(++state.position); }
-        while (0 !== ch && !is_EOL(ch));
+        while (ch !== 0 && !is_EOL(ch));
         break;
       }
 
-      if (is_EOL(ch)) {
-        break;
-      }
+      if (is_EOL(ch)) break;
 
       _position = state.position;
 
-      while (0 !== ch && !is_WS_OR_EOL(ch)) {
+      while (ch !== 0 && !is_WS_OR_EOL(ch)) {
         ch = state.input.charCodeAt(++state.position);
       }
 
       directiveArgs.push(state.input.slice(_position, state.position));
     }
 
-    if (0 !== ch) {
-      readLineBreak(state);
-    }
+    if (ch !== 0) readLineBreak(state);
 
     if (_hasOwnProperty.call(directiveHandlers, directiveName)) {
       directiveHandlers[directiveName](state, directiveName, directiveArgs);
@@ -9562,10 +12508,10 @@ function readDocument(state) {
 
   skipSeparationSpace(state, true, -1);
 
-  if (0 === state.lineIndent &&
-      0x2D/* - */ === state.input.charCodeAt(state.position) &&
-      0x2D/* - */ === state.input.charCodeAt(state.position + 1) &&
-      0x2D/* - */ === state.input.charCodeAt(state.position + 2)) {
+  if (state.lineIndent === 0 &&
+      state.input.charCodeAt(state.position)     === 0x2D/* - */ &&
+      state.input.charCodeAt(state.position + 1) === 0x2D/* - */ &&
+      state.input.charCodeAt(state.position + 2) === 0x2D/* - */) {
     state.position += 3;
     skipSeparationSpace(state, true, -1);
 
@@ -9585,7 +12531,7 @@ function readDocument(state) {
 
   if (state.position === state.lineStart && testDocumentSeparator(state)) {
 
-    if (0x2E/* . */ === state.input.charCodeAt(state.position)) {
+    if (state.input.charCodeAt(state.position) === 0x2E/* . */) {
       state.position += 3;
       skipSeparationSpace(state, true, -1);
     }
@@ -9607,8 +12553,8 @@ function loadDocuments(input, options) {
   if (input.length !== 0) {
 
     // Add tailing `\n` if not exists
-    if (0x0A/* LF */ !== input.charCodeAt(input.length - 1) &&
-        0x0D/* CR */ !== input.charCodeAt(input.length - 1)) {
+    if (input.charCodeAt(input.length - 1) !== 0x0A/* LF */ &&
+        input.charCodeAt(input.length - 1) !== 0x0D/* CR */) {
       input += '\n';
     }
 
@@ -9623,7 +12569,7 @@ function loadDocuments(input, options) {
   // Use 0 as string terminator. That significantly simplifies bounds check.
   state.input += '\0';
 
-  while (0x20/* Space */ === state.input.charCodeAt(state.position)) {
+  while (state.input.charCodeAt(state.position) === 0x20/* Space */) {
     state.lineIndent += 1;
     state.position += 1;
   }
@@ -9648,10 +12594,10 @@ function loadAll(input, iterator, options) {
 function load(input, options) {
   var documents = loadDocuments(input, options);
 
-  if (0 === documents.length) {
+  if (documents.length === 0) {
     /*eslint-disable no-undefined*/
     return undefined;
-  } else if (1 === documents.length) {
+  } else if (documents.length === 1) {
     return documents[0];
   }
   throw new YAMLException('expected a single document in the stream, but found more');
@@ -9673,7 +12619,7 @@ module.exports.load        = load;
 module.exports.safeLoadAll = safeLoadAll;
 module.exports.safeLoad    = safeLoad;
 
-},{"./common":22,"./exception":24,"./mark":26,"./schema/default_full":29,"./schema/default_safe":30}],26:[function(require,module,exports){
+},{"./common":21,"./exception":23,"./mark":25,"./schema/default_full":28,"./schema/default_safe":29}],25:[function(require,module,exports){
 'use strict';
 
 
@@ -9692,9 +12638,7 @@ function Mark(name, buffer, position, line, column) {
 Mark.prototype.getSnippet = function getSnippet(indent, maxLength) {
   var head, start, tail, end, snippet;
 
-  if (!this.buffer) {
-    return null;
-  }
+  if (!this.buffer) return null;
 
   indent = indent || 4;
   maxLength = maxLength || 75;
@@ -9702,7 +12646,7 @@ Mark.prototype.getSnippet = function getSnippet(indent, maxLength) {
   head = '';
   start = this.position;
 
-  while (start > 0 && -1 === '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(start - 1))) {
+  while (start > 0 && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(start - 1)) === -1) {
     start -= 1;
     if (this.position - start > (maxLength / 2 - 1)) {
       head = ' ... ';
@@ -9714,7 +12658,7 @@ Mark.prototype.getSnippet = function getSnippet(indent, maxLength) {
   tail = '';
   end = this.position;
 
-  while (end < this.buffer.length && -1 === '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(end))) {
+  while (end < this.buffer.length && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(end)) === -1) {
     end += 1;
     if (end - this.position > (maxLength / 2 - 1)) {
       tail = ' ... ';
@@ -9753,7 +12697,7 @@ Mark.prototype.toString = function toString(compact) {
 
 module.exports = Mark;
 
-},{"./common":22}],27:[function(require,module,exports){
+},{"./common":21}],26:[function(require,module,exports){
 'use strict';
 
 /*eslint-disable max-len*/
@@ -9781,7 +12725,7 @@ function compileList(schema, name, result) {
   });
 
   return result.filter(function (type, index) {
-    return -1 === exclude.indexOf(index);
+    return exclude.indexOf(index) === -1;
   });
 }
 
@@ -9807,7 +12751,7 @@ function Schema(definition) {
   this.explicit = definition.explicit || [];
 
   this.implicit.forEach(function (type) {
-    if (type.loadKind && 'scalar' !== type.loadKind) {
+    if (type.loadKind && type.loadKind !== 'scalar') {
       throw new YAMLException('There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.');
     }
   });
@@ -9825,18 +12769,18 @@ Schema.create = function createSchema() {
   var schemas, types;
 
   switch (arguments.length) {
-  case 1:
-    schemas = Schema.DEFAULT;
-    types = arguments[0];
-    break;
+    case 1:
+      schemas = Schema.DEFAULT;
+      types = arguments[0];
+      break;
 
-  case 2:
-    schemas = arguments[0];
-    types = arguments[1];
-    break;
+    case 2:
+      schemas = arguments[0];
+      types = arguments[1];
+      break;
 
-  default:
-    throw new YAMLException('Wrong number of arguments for Schema.create function');
+    default:
+      throw new YAMLException('Wrong number of arguments for Schema.create function');
   }
 
   schemas = common.toArray(schemas);
@@ -9859,7 +12803,7 @@ Schema.create = function createSchema() {
 
 module.exports = Schema;
 
-},{"./common":22,"./exception":24,"./type":33}],28:[function(require,module,exports){
+},{"./common":21,"./exception":23,"./type":32}],27:[function(require,module,exports){
 // Standard YAML's Core schema.
 // http://www.yaml.org/spec/1.2/spec.html#id2804923
 //
@@ -9879,7 +12823,7 @@ module.exports = new Schema({
   ]
 });
 
-},{"../schema":27,"./json":32}],29:[function(require,module,exports){
+},{"../schema":26,"./json":31}],28:[function(require,module,exports){
 // JS-YAML's default schema for `load` function.
 // It is not described in the YAML specification.
 //
@@ -9906,7 +12850,7 @@ module.exports = Schema.DEFAULT = new Schema({
   ]
 });
 
-},{"../schema":27,"../type/js/function":38,"../type/js/regexp":39,"../type/js/undefined":40,"./default_safe":30}],30:[function(require,module,exports){
+},{"../schema":26,"../type/js/function":37,"../type/js/regexp":38,"../type/js/undefined":39,"./default_safe":29}],29:[function(require,module,exports){
 // JS-YAML's default schema for `safeLoad` function.
 // It is not described in the YAML specification.
 //
@@ -9936,7 +12880,7 @@ module.exports = new Schema({
   ]
 });
 
-},{"../schema":27,"../type/binary":34,"../type/merge":42,"../type/omap":44,"../type/pairs":45,"../type/set":47,"../type/timestamp":49,"./core":28}],31:[function(require,module,exports){
+},{"../schema":26,"../type/binary":33,"../type/merge":41,"../type/omap":43,"../type/pairs":44,"../type/set":46,"../type/timestamp":48,"./core":27}],30:[function(require,module,exports){
 // Standard YAML's Failsafe schema.
 // http://www.yaml.org/spec/1.2/spec.html#id2802346
 
@@ -9955,7 +12899,7 @@ module.exports = new Schema({
   ]
 });
 
-},{"../schema":27,"../type/map":41,"../type/seq":46,"../type/str":48}],32:[function(require,module,exports){
+},{"../schema":26,"../type/map":40,"../type/seq":45,"../type/str":47}],31:[function(require,module,exports){
 // Standard YAML's JSON schema.
 // http://www.yaml.org/spec/1.2/spec.html#id2803231
 //
@@ -9982,7 +12926,7 @@ module.exports = new Schema({
   ]
 });
 
-},{"../schema":27,"../type/bool":35,"../type/float":36,"../type/int":37,"../type/null":43,"./failsafe":31}],33:[function(require,module,exports){
+},{"../schema":26,"../type/bool":34,"../type/float":35,"../type/int":36,"../type/null":42,"./failsafe":30}],32:[function(require,module,exports){
 'use strict';
 
 var YAMLException = require('./exception');
@@ -10007,7 +12951,7 @@ var YAML_NODE_KINDS = [
 function compileStyleAliases(map) {
   var result = {};
 
-  if (null !== map) {
+  if (map !== null) {
     Object.keys(map).forEach(function (style) {
       map[style].forEach(function (alias) {
         result[String(alias)] = style;
@@ -10022,7 +12966,7 @@ function Type(tag, options) {
   options = options || {};
 
   Object.keys(options).forEach(function (name) {
-    if (-1 === TYPE_CONSTRUCTOR_OPTIONS.indexOf(name)) {
+    if (TYPE_CONSTRUCTOR_OPTIONS.indexOf(name) === -1) {
       throw new YAMLException('Unknown option "' + name + '" is met in definition of "' + tag + '" YAML type.');
     }
   });
@@ -10038,21 +12982,26 @@ function Type(tag, options) {
   this.defaultStyle = options['defaultStyle'] || null;
   this.styleAliases = compileStyleAliases(options['styleAliases'] || null);
 
-  if (-1 === YAML_NODE_KINDS.indexOf(this.kind)) {
+  if (YAML_NODE_KINDS.indexOf(this.kind) === -1) {
     throw new YAMLException('Unknown kind "' + this.kind + '" is specified for "' + tag + '" YAML type.');
   }
 }
 
 module.exports = Type;
 
-},{"./exception":24}],34:[function(require,module,exports){
+},{"./exception":23}],33:[function(require,module,exports){
 'use strict';
 
 /*eslint-disable no-bitwise*/
 
-// A trick for browserified version.
-// Since we make browserifier to ignore `buffer` module, NodeBuffer will be undefined
-var NodeBuffer = require('buffer').Buffer;
+var NodeBuffer;
+
+try {
+  // A trick for browserified version, to not include `Buffer` shim
+  var _require = require;
+  NodeBuffer = _require('buffer').Buffer;
+} catch (__) {}
+
 var Type       = require('../type');
 
 
@@ -10061,9 +13010,7 @@ var BASE64_MAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789
 
 
 function resolveYamlBinary(data) {
-  if (null === data) {
-    return false;
-  }
+  if (data === null) return false;
 
   var code, idx, bitlen = 0, max = data.length, map = BASE64_MAP;
 
@@ -10072,10 +13019,10 @@ function resolveYamlBinary(data) {
     code = map.indexOf(data.charAt(idx));
 
     // Skip CR/LF
-    if (code > 64) { continue; }
+    if (code > 64) continue;
 
     // Fail on illegal characters
-    if (code < 0) { return false; }
+    if (code < 0) return false;
 
     bitlen += 6;
   }
@@ -10120,9 +13067,7 @@ function constructYamlBinary(data) {
   }
 
   // Wrap into Buffer for NodeJS and leave Array for browser
-  if (NodeBuffer) {
-    return new NodeBuffer(result);
-  }
+  if (NodeBuffer) return new NodeBuffer(result);
 
   return result;
 }
@@ -10181,15 +13126,13 @@ module.exports = new Type('tag:yaml.org,2002:binary', {
   represent: representYamlBinary
 });
 
-},{"../type":33,"buffer":12}],35:[function(require,module,exports){
+},{"../type":32}],34:[function(require,module,exports){
 'use strict';
 
 var Type = require('../type');
 
 function resolveYamlBoolean(data) {
-  if (null === data) {
-    return false;
-  }
+  if (data === null) return false;
 
   var max = data.length;
 
@@ -10204,7 +13147,7 @@ function constructYamlBoolean(data) {
 }
 
 function isBoolean(object) {
-  return '[object Boolean]' === Object.prototype.toString.call(object);
+  return Object.prototype.toString.call(object) === '[object Boolean]';
 }
 
 module.exports = new Type('tag:yaml.org,2002:bool', {
@@ -10220,7 +13163,7 @@ module.exports = new Type('tag:yaml.org,2002:bool', {
   defaultStyle: 'lowercase'
 });
 
-},{"../type":33}],36:[function(require,module,exports){
+},{"../type":32}],35:[function(require,module,exports){
 'use strict';
 
 var common = require('../common');
@@ -10234,13 +13177,10 @@ var YAML_FLOAT_PATTERN = new RegExp(
   '|\\.(?:nan|NaN|NAN))$');
 
 function resolveYamlFloat(data) {
-  if (null === data) {
-    return false;
-  }
+  if (data === null) return false;
+
+  if (!YAML_FLOAT_PATTERN.test(data)) return false;
 
-  if (!YAML_FLOAT_PATTERN.test(data)) {
-    return false;
-  }
   return true;
 }
 
@@ -10248,20 +13188,20 @@ function constructYamlFloat(data) {
   var value, sign, base, digits;
 
   value  = data.replace(/_/g, '').toLowerCase();
-  sign   = '-' === value[0] ? -1 : 1;
+  sign   = value[0] === '-' ? -1 : 1;
   digits = [];
 
-  if (0 <= '+-'.indexOf(value[0])) {
+  if ('+-'.indexOf(value[0]) >= 0) {
     value = value.slice(1);
   }
 
-  if ('.inf' === value) {
-    return (1 === sign) ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY;
+  if (value === '.inf') {
+    return (sign === 1) ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY;
 
-  } else if ('.nan' === value) {
+  } else if (value === '.nan') {
     return NaN;
 
-  } else if (0 <= value.indexOf(':')) {
+  } else if (value.indexOf(':') >= 0) {
     value.split(':').forEach(function (v) {
       digits.unshift(parseFloat(v, 10));
     });
@@ -10288,30 +13228,21 @@ function representYamlFloat(object, style) {
 
   if (isNaN(object)) {
     switch (style) {
-    case 'lowercase':
-      return '.nan';
-    case 'uppercase':
-      return '.NAN';
-    case 'camelcase':
-      return '.NaN';
+      case 'lowercase': return '.nan';
+      case 'uppercase': return '.NAN';
+      case 'camelcase': return '.NaN';
     }
   } else if (Number.POSITIVE_INFINITY === object) {
     switch (style) {
-    case 'lowercase':
-      return '.inf';
-    case 'uppercase':
-      return '.INF';
-    case 'camelcase':
-      return '.Inf';
+      case 'lowercase': return '.inf';
+      case 'uppercase': return '.INF';
+      case 'camelcase': return '.Inf';
     }
   } else if (Number.NEGATIVE_INFINITY === object) {
     switch (style) {
-    case 'lowercase':
-      return '-.inf';
-    case 'uppercase':
-      return '-.INF';
-    case 'camelcase':
-      return '-.Inf';
+      case 'lowercase': return '-.inf';
+      case 'uppercase': return '-.INF';
+      case 'camelcase': return '-.Inf';
     }
   } else if (common.isNegativeZero(object)) {
     return '-0.0';
@@ -10326,8 +13257,8 @@ function representYamlFloat(object, style) {
 }
 
 function isFloat(object) {
-  return ('[object Number]' === Object.prototype.toString.call(object)) &&
-         (0 !== object % 1 || common.isNegativeZero(object));
+  return (Object.prototype.toString.call(object) === '[object Number]') &&
+         (object % 1 !== 0 || common.isNegativeZero(object));
 }
 
 module.exports = new Type('tag:yaml.org,2002:float', {
@@ -10339,7 +13270,7 @@ module.exports = new Type('tag:yaml.org,2002:float', {
   defaultStyle: 'lowercase'
 });
 
-},{"../common":22,"../type":33}],37:[function(require,module,exports){
+},{"../common":21,"../type":32}],36:[function(require,module,exports){
 'use strict';
 
 var common = require('../common');
@@ -10360,16 +13291,14 @@ function isDecCode(c) {
 }
 
 function resolveYamlInteger(data) {
-  if (null === data) {
-    return false;
-  }
+  if (data === null) return false;
 
   var max = data.length,
       index = 0,
       hasDigits = false,
       ch;
 
-  if (!max) { return false; }
+  if (!max) return false;
 
   ch = data[index];
 
@@ -10380,7 +13309,7 @@ function resolveYamlInteger(data) {
 
   if (ch === '0') {
     // 0
-    if (index + 1 === max) { return true; }
+    if (index + 1 === max) return true;
     ch = data[++index];
 
     // base 2, base 8, base 16
@@ -10391,10 +13320,8 @@ function resolveYamlInteger(data) {
 
       for (; index < max; index++) {
         ch = data[index];
-        if (ch === '_') { continue; }
-        if (ch !== '0' && ch !== '1') {
-          return false;
-        }
+        if (ch === '_') continue;
+        if (ch !== '0' && ch !== '1') return false;
         hasDigits = true;
       }
       return hasDigits;
@@ -10407,10 +13334,8 @@ function resolveYamlInteger(data) {
 
       for (; index < max; index++) {
         ch = data[index];
-        if (ch === '_') { continue; }
-        if (!isHexCode(data.charCodeAt(index))) {
-          return false;
-        }
+        if (ch === '_') continue;
+        if (!isHexCode(data.charCodeAt(index))) return false;
         hasDigits = true;
       }
       return hasDigits;
@@ -10419,10 +13344,8 @@ function resolveYamlInteger(data) {
     // base 8
     for (; index < max; index++) {
       ch = data[index];
-      if (ch === '_') { continue; }
-      if (!isOctCode(data.charCodeAt(index))) {
-        return false;
-      }
+      if (ch === '_') continue;
+      if (!isOctCode(data.charCodeAt(index))) return false;
       hasDigits = true;
     }
     return hasDigits;
@@ -10432,18 +13355,18 @@ function resolveYamlInteger(data) {
 
   for (; index < max; index++) {
     ch = data[index];
-    if (ch === '_') { continue; }
-    if (ch === ':') { break; }
+    if (ch === '_') continue;
+    if (ch === ':') break;
     if (!isDecCode(data.charCodeAt(index))) {
       return false;
     }
     hasDigits = true;
   }
 
-  if (!hasDigits) { return false; }
+  if (!hasDigits) return false;
 
   // if !base60 - done;
-  if (ch !== ':') { return true; }
+  if (ch !== ':') return true;
 
   // base60 almost not used, no needs to optimize
   return /^(:[0-5]?[0-9])+$/.test(data.slice(index));
@@ -10459,24 +13382,17 @@ function constructYamlInteger(data) {
   ch = value[0];
 
   if (ch === '-' || ch === '+') {
-    if (ch === '-') { sign = -1; }
+    if (ch === '-') sign = -1;
     value = value.slice(1);
     ch = value[0];
   }
 
-  if ('0' === value) {
-    return 0;
-  }
+  if (value === '0') return 0;
 
   if (ch === '0') {
-    if (value[1] === 'b') {
-      return sign * parseInt(value.slice(2), 2);
-    }
-    if (value[1] === 'x') {
-      return sign * parseInt(value, 16);
-    }
+    if (value[1] === 'b') return sign * parseInt(value.slice(2), 2);
+    if (value[1] === 'x') return sign * parseInt(value, 16);
     return sign * parseInt(value, 8);
-
   }
 
   if (value.indexOf(':') !== -1) {
@@ -10500,8 +13416,8 @@ function constructYamlInteger(data) {
 }
 
 function isInteger(object) {
-  return ('[object Number]' === Object.prototype.toString.call(object)) &&
-         (0 === object % 1 && !common.isNegativeZero(object));
+  return (Object.prototype.toString.call(object)) === '[object Number]' &&
+         (object % 1 === 0 && !common.isNegativeZero(object));
 }
 
 module.exports = new Type('tag:yaml.org,2002:int', {
@@ -10524,7 +13440,7 @@ module.exports = new Type('tag:yaml.org,2002:int', {
   }
 });
 
-},{"../common":22,"../type":33}],38:[function(require,module,exports){
+},{"../common":21,"../type":32}],37:[function(require,module,exports){
 'use strict';
 
 var esprima;
@@ -10537,27 +13453,27 @@ var esprima;
 //    found too - then fail to parse.
 //
 try {
-  esprima = require('esprima');
+  // workaround to exclude package from browserify list.
+  var _require = require;
+  esprima = _require('esprima');
 } catch (_) {
   /*global window */
-  if (typeof window !== 'undefined') { esprima = window.esprima; }
+  if (typeof window !== 'undefined') esprima = window.esprima;
 }
 
 var Type = require('../../type');
 
 function resolveJavascriptFunction(data) {
-  if (null === data) {
-    return false;
-  }
+  if (data === null) return false;
 
   try {
     var source = '(' + data + ')',
         ast    = esprima.parse(source, { range: true });
 
-    if ('Program'             !== ast.type         ||
-        1                     !== ast.body.length  ||
-        'ExpressionStatement' !== ast.body[0].type ||
-        'FunctionExpression'  !== ast.body[0].expression.type) {
+    if (ast.type                    !== 'Program'             ||
+        ast.body.length             !== 1                     ||
+        ast.body[0].type            !== 'ExpressionStatement' ||
+        ast.body[0].expression.type !== 'FunctionExpression') {
       return false;
     }
 
@@ -10575,10 +13491,10 @@ function constructJavascriptFunction(data) {
       params = [],
       body;
 
-  if ('Program'             !== ast.type         ||
-      1                     !== ast.body.length  ||
-      'ExpressionStatement' !== ast.body[0].type ||
-      'FunctionExpression'  !== ast.body[0].expression.type) {
+  if (ast.type                    !== 'Program'             ||
+      ast.body.length             !== 1                     ||
+      ast.body[0].type            !== 'ExpressionStatement' ||
+      ast.body[0].expression.type !== 'FunctionExpression') {
     throw new Error('Failed to resolve function');
   }
 
@@ -10599,7 +13515,7 @@ function representJavascriptFunction(object /*, style*/) {
 }
 
 function isFunction(object) {
-  return '[object Function]' === Object.prototype.toString.call(object);
+  return Object.prototype.toString.call(object) === '[object Function]';
 }
 
 module.exports = new Type('tag:yaml.org,2002:js/function', {
@@ -10610,19 +13526,14 @@ module.exports = new Type('tag:yaml.org,2002:js/function', {
   represent: representJavascriptFunction
 });
 
-},{"../../type":33,"esprima":50}],39:[function(require,module,exports){
+},{"../../type":32}],38:[function(require,module,exports){
 'use strict';
 
 var Type = require('../../type');
 
 function resolveJavascriptRegExp(data) {
-  if (null === data) {
-    return false;
-  }
-
-  if (0 === data.length) {
-    return false;
-  }
+  if (data === null) return false;
+  if (data.length === 0) return false;
 
   var regexp = data,
       tail   = /\/([gim]*)$/.exec(data),
@@ -10630,23 +13541,15 @@ function resolveJavascriptRegExp(data) {
 
   // if regexp starts with '/' it can have modifiers and must be properly closed
   // `/foo/gim` - modifiers tail can be maximum 3 chars
-  if ('/' === regexp[0]) {
-    if (tail) {
-      modifiers = tail[1];
-    }
+  if (regexp[0] === '/') {
+    if (tail) modifiers = tail[1];
 
-    if (modifiers.length > 3) { return false; }
+    if (modifiers.length > 3) return false;
     // if expression starts with /, is should be properly terminated
-    if (regexp[regexp.length - modifiers.length - 1] !== '/') { return false; }
-
-    regexp = regexp.slice(1, regexp.length - modifiers.length - 1);
+    if (regexp[regexp.length - modifiers.length - 1] !== '/') return false;
   }
 
-  try {
-    return true;
-  } catch (error) {
-    return false;
-  }
+  return true;
 }
 
 function constructJavascriptRegExp(data) {
@@ -10655,10 +13558,8 @@ function constructJavascriptRegExp(data) {
       modifiers = '';
 
   // `/foo/gim` - tail can be maximum 4 chars
-  if ('/' === regexp[0]) {
-    if (tail) {
-      modifiers = tail[1];
-    }
+  if (regexp[0] === '/') {
+    if (tail) modifiers = tail[1];
     regexp = regexp.slice(1, regexp.length - modifiers.length - 1);
   }
 
@@ -10668,23 +13569,15 @@ function constructJavascriptRegExp(data) {
 function representJavascriptRegExp(object /*, style*/) {
   var result = '/' + object.source + '/';
 
-  if (object.global) {
-    result += 'g';
-  }
-
-  if (object.multiline) {
-    result += 'm';
-  }
-
-  if (object.ignoreCase) {
-    result += 'i';
-  }
+  if (object.global) result += 'g';
+  if (object.multiline) result += 'm';
+  if (object.ignoreCase) result += 'i';
 
   return result;
 }
 
 function isRegExp(object) {
-  return '[object RegExp]' === Object.prototype.toString.call(object);
+  return Object.prototype.toString.call(object) === '[object RegExp]';
 }
 
 module.exports = new Type('tag:yaml.org,2002:js/regexp', {
@@ -10695,7 +13588,7 @@ module.exports = new Type('tag:yaml.org,2002:js/regexp', {
   represent: representJavascriptRegExp
 });
 
-},{"../../type":33}],40:[function(require,module,exports){
+},{"../../type":32}],39:[function(require,module,exports){
 'use strict';
 
 var Type = require('../../type');
@@ -10714,7 +13607,7 @@ function representJavascriptUndefined() {
 }
 
 function isUndefined(object) {
-  return 'undefined' === typeof object;
+  return typeof object === 'undefined';
 }
 
 module.exports = new Type('tag:yaml.org,2002:js/undefined', {
@@ -10725,23 +13618,23 @@ module.exports = new Type('tag:yaml.org,2002:js/undefined', {
   represent: representJavascriptUndefined
 });
 
-},{"../../type":33}],41:[function(require,module,exports){
+},{"../../type":32}],40:[function(require,module,exports){
 'use strict';
 
 var Type = require('../type');
 
 module.exports = new Type('tag:yaml.org,2002:map', {
   kind: 'mapping',
-  construct: function (data) { return null !== data ? data : {}; }
+  construct: function (data) { return data !== null ? data : {}; }
 });
 
-},{"../type":33}],42:[function(require,module,exports){
+},{"../type":32}],41:[function(require,module,exports){
 'use strict';
 
 var Type = require('../type');
 
 function resolveYamlMerge(data) {
-  return '<<' === data || null === data;
+  return data === '<<' || data === null;
 }
 
 module.exports = new Type('tag:yaml.org,2002:merge', {
@@ -10749,15 +13642,13 @@ module.exports = new Type('tag:yaml.org,2002:merge', {
   resolve: resolveYamlMerge
 });
 
-},{"../type":33}],43:[function(require,module,exports){
+},{"../type":32}],42:[function(require,module,exports){
 'use strict';
 
 var Type = require('../type');
 
 function resolveYamlNull(data) {
-  if (null === data) {
-    return true;
-  }
+  if (data === null) return true;
 
   var max = data.length;
 
@@ -10770,7 +13661,7 @@ function constructYamlNull() {
 }
 
 function isNull(object) {
-  return null === object;
+  return object === null;
 }
 
 module.exports = new Type('tag:yaml.org,2002:null', {
@@ -10787,7 +13678,7 @@ module.exports = new Type('tag:yaml.org,2002:null', {
   defaultStyle: 'lowercase'
 });
 
-},{"../type":33}],44:[function(require,module,exports){
+},{"../type":32}],43:[function(require,module,exports){
 'use strict';
 
 var Type = require('../type');
@@ -10796,9 +13687,7 @@ var _hasOwnProperty = Object.prototype.hasOwnProperty;
 var _toString       = Object.prototype.toString;
 
 function resolveYamlOmap(data) {
-  if (null === data) {
-    return true;
-  }
+  if (data === null) return true;
 
   var objectKeys = [], index, length, pair, pairKey, pairHasKey,
       object = data;
@@ -10807,36 +13696,26 @@ function resolveYamlOmap(data) {
     pair = object[index];
     pairHasKey = false;
 
-    if ('[object Object]' !== _toString.call(pair)) {
-      return false;
-    }
+    if (_toString.call(pair) !== '[object Object]') return false;
 
     for (pairKey in pair) {
       if (_hasOwnProperty.call(pair, pairKey)) {
-        if (!pairHasKey) {
-          pairHasKey = true;
-        } else {
-          return false;
-        }
+        if (!pairHasKey) pairHasKey = true;
+        else return false;
       }
     }
 
-    if (!pairHasKey) {
-      return false;
-    }
+    if (!pairHasKey) return false;
 
-    if (-1 === objectKeys.indexOf(pairKey)) {
-      objectKeys.push(pairKey);
-    } else {
-      return false;
-    }
+    if (objectKeys.indexOf(pairKey) === -1) objectKeys.push(pairKey);
+    else return false;
   }
 
   return true;
 }
 
 function constructYamlOmap(data) {
-  return null !== data ? data : [];
+  return data !== null ? data : [];
 }
 
 module.exports = new Type('tag:yaml.org,2002:omap', {
@@ -10845,7 +13724,7 @@ module.exports = new Type('tag:yaml.org,2002:omap', {
   construct: constructYamlOmap
 });
 
-},{"../type":33}],45:[function(require,module,exports){
+},{"../type":32}],44:[function(require,module,exports){
 'use strict';
 
 var Type = require('../type');
@@ -10853,9 +13732,7 @@ var Type = require('../type');
 var _toString = Object.prototype.toString;
 
 function resolveYamlPairs(data) {
-  if (null === data) {
-    return true;
-  }
+  if (data === null) return true;
 
   var index, length, pair, keys, result,
       object = data;
@@ -10865,15 +13742,11 @@ function resolveYamlPairs(data) {
   for (index = 0, length = object.length; index < length; index += 1) {
     pair = object[index];
 
-    if ('[object Object]' !== _toString.call(pair)) {
-      return false;
-    }
+    if (_toString.call(pair) !== '[object Object]') return false;
 
     keys = Object.keys(pair);
 
-    if (1 !== keys.length) {
-      return false;
-    }
+    if (keys.length !== 1) return false;
 
     result[index] = [ keys[0], pair[keys[0]] ];
   }
@@ -10882,9 +13755,7 @@ function resolveYamlPairs(data) {
 }
 
 function constructYamlPairs(data) {
-  if (null === data) {
-    return [];
-  }
+  if (data === null) return [];
 
   var index, length, pair, keys, result,
       object = data;
@@ -10908,17 +13779,17 @@ module.exports = new Type('tag:yaml.org,2002:pairs', {
   construct: constructYamlPairs
 });
 
-},{"../type":33}],46:[function(require,module,exports){
+},{"../type":32}],45:[function(require,module,exports){
 'use strict';
 
 var Type = require('../type');
 
 module.exports = new Type('tag:yaml.org,2002:seq', {
   kind: 'sequence',
-  construct: function (data) { return null !== data ? data : []; }
+  construct: function (data) { return data !== null ? data : []; }
 });
 
-},{"../type":33}],47:[function(require,module,exports){
+},{"../type":32}],46:[function(require,module,exports){
 'use strict';
 
 var Type = require('../type');
@@ -10926,17 +13797,13 @@ var Type = require('../type');
 var _hasOwnProperty = Object.prototype.hasOwnProperty;
 
 function resolveYamlSet(data) {
-  if (null === data) {
-    return true;
-  }
+  if (data === null) return true;
 
   var key, object = data;
 
   for (key in object) {
     if (_hasOwnProperty.call(object, key)) {
-      if (null !== object[key]) {
-        return false;
-      }
+      if (object[key] !== null) return false;
     }
   }
 
@@ -10944,7 +13811,7 @@ function resolveYamlSet(data) {
 }
 
 function constructYamlSet(data) {
-  return null !== data ? data : {};
+  return data !== null ? data : {};
 }
 
 module.exports = new Type('tag:yaml.org,2002:set', {
@@ -10953,54 +13820,53 @@ module.exports = new Type('tag:yaml.org,2002:set', {
   construct: constructYamlSet
 });
 
-},{"../type":33}],48:[function(require,module,exports){
+},{"../type":32}],47:[function(require,module,exports){
 'use strict';
 
 var Type = require('../type');
 
 module.exports = new Type('tag:yaml.org,2002:str', {
   kind: 'scalar',
-  construct: function (data) { return null !== data ? data : ''; }
+  construct: function (data) { return data !== null ? data : ''; }
 });
 
-},{"../type":33}],49:[function(require,module,exports){
+},{"../type":32}],48:[function(require,module,exports){
 'use strict';
 
 var Type = require('../type');
 
+var YAML_DATE_REGEXP = new RegExp(
+  '^([0-9][0-9][0-9][0-9])'          + // [1] year
+  '-([0-9][0-9])'                    + // [2] month
+  '-([0-9][0-9])$');                   // [3] day
+
 var YAML_TIMESTAMP_REGEXP = new RegExp(
   '^([0-9][0-9][0-9][0-9])'          + // [1] year
   '-([0-9][0-9]?)'                   + // [2] month
   '-([0-9][0-9]?)'                   + // [3] day
-  '(?:(?:[Tt]|[ \\t]+)'              + // ...
+  '(?:[Tt]|[ \\t]+)'                 + // ...
   '([0-9][0-9]?)'                    + // [4] hour
   ':([0-9][0-9])'                    + // [5] minute
   ':([0-9][0-9])'                    + // [6] second
   '(?:\\.([0-9]*))?'                 + // [7] fraction
   '(?:[ \\t]*(Z|([-+])([0-9][0-9]?)' + // [8] tz [9] tz_sign [10] tz_hour
-  '(?::([0-9][0-9]))?))?)?$');         // [11] tz_minute
+  '(?::([0-9][0-9]))?))?$');           // [11] tz_minute
 
 function resolveYamlTimestamp(data) {
-  if (null === data) {
-    return false;
-  }
-
-  if (YAML_TIMESTAMP_REGEXP.exec(data) === null) {
-    return false;
-  }
-
-  return true;
+  if (data === null) return false;
+  if (YAML_DATE_REGEXP.exec(data) !== null) return true;
+  if (YAML_TIMESTAMP_REGEXP.exec(data) !== null) return true;
+  return false;
 }
 
 function constructYamlTimestamp(data) {
   var match, year, month, day, hour, minute, second, fraction = 0,
       delta = null, tz_hour, tz_minute, date;
 
-  match = YAML_TIMESTAMP_REGEXP.exec(data);
+  match = YAML_DATE_REGEXP.exec(data);
+  if (match === null) match = YAML_TIMESTAMP_REGEXP.exec(data);
 
-  if (null === match) {
-    throw new Error('Date resolve error');
-  }
+  if (match === null) throw new Error('Date resolve error');
 
   // match: [1] year [2] month [3] day
 
@@ -11032,16 +13898,12 @@ function constructYamlTimestamp(data) {
     tz_hour = +(match[10]);
     tz_minute = +(match[11] || 0);
     delta = (tz_hour * 60 + tz_minute) * 60000; // delta in mili-seconds
-    if ('-' === match[9]) {
-      delta = -delta;
-    }
+    if (match[9] === '-') delta = -delta;
   }
 
   date = new Date(Date.UTC(year, month, day, hour, minute, second, fraction));
 
-  if (delta) {
-    date.setTime(date.getTime() - delta);
-  }
+  if (delta) date.setTime(date.getTime() - delta);
 
   return date;
 }
@@ -11058,5949 +13920,7 @@ module.exports = new Type('tag:yaml.org,2002:timestamp', {
   represent: representYamlTimestamp
 });
 
-},{"../type":33}],50:[function(require,module,exports){
-/*
-  Copyright (c) jQuery Foundation, Inc. and Contributors, All Rights Reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-(function (root, factory) {
-    'use strict';
-
-    // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js,
-    // Rhino, and plain browser loading.
-
-    /* istanbul ignore next */
-    if (typeof define === 'function' && define.amd) {
-        define(['exports'], factory);
-    } else if (typeof exports !== 'undefined') {
-        factory(exports);
-    } else {
-        factory((root.esprima = {}));
-    }
-}(this, function (exports) {
-    'use strict';
-
-    var Token,
-        TokenName,
-        FnExprTokens,
-        Syntax,
-        PlaceHolders,
-        Messages,
-        Regex,
-        source,
-        strict,
-        index,
-        lineNumber,
-        lineStart,
-        hasLineTerminator,
-        lastIndex,
-        lastLineNumber,
-        lastLineStart,
-        startIndex,
-        startLineNumber,
-        startLineStart,
-        scanning,
-        length,
-        lookahead,
-        state,
-        extra,
-        isBindingElement,
-        isAssignmentTarget,
-        firstCoverInitializedNameError;
-
-    Token = {
-        BooleanLiteral: 1,
-        EOF: 2,
-        Identifier: 3,
-        Keyword: 4,
-        NullLiteral: 5,
-        NumericLiteral: 6,
-        Punctuator: 7,
-        StringLiteral: 8,
-        RegularExpression: 9,
-        Template: 10
-    };
-
-    TokenName = {};
-    TokenName[Token.BooleanLiteral] = 'Boolean';
-    TokenName[Token.EOF] = '<end>';
-    TokenName[Token.Identifier] = 'Identifier';
-    TokenName[Token.Keyword] = 'Keyword';
-    TokenName[Token.NullLiteral] = 'Null';
-    TokenName[Token.NumericLiteral] = 'Numeric';
-    TokenName[Token.Punctuator] = 'Punctuator';
-    TokenName[Token.StringLiteral] = 'String';
-    TokenName[Token.RegularExpression] = 'RegularExpression';
-    TokenName[Token.Template] = 'Template';
-
-    // A function following one of those tokens is an expression.
-    FnExprTokens = ['(', '{', '[', 'in', 'typeof', 'instanceof', 'new',
-                    'return', 'case', 'delete', 'throw', 'void',
-                    // assignment operators
-                    '=', '+=', '-=', '*=', '/=', '%=', '<<=', '>>=', '>>>=',
-                    '&=', '|=', '^=', ',',
-                    // binary/unary operators
-                    '+', '-', '*', '/', '%', '++', '--', '<<', '>>', '>>>', '&',
-                    '|', '^', '!', '~', '&&', '||', '?', ':', '===', '==', '>=',
-                    '<=', '<', '>', '!=', '!=='];
-
-    Syntax = {
-        AssignmentExpression: 'AssignmentExpression',
-        AssignmentPattern: 'AssignmentPattern',
-        ArrayExpression: 'ArrayExpression',
-        ArrayPattern: 'ArrayPattern',
-        ArrowFunctionExpression: 'ArrowFunctionExpression',
-        BlockStatement: 'BlockStatement',
-        BinaryExpression: 'BinaryExpression',
-        BreakStatement: 'BreakStatement',
-        CallExpression: 'CallExpression',
-        CatchClause: 'CatchClause',
-        ClassBody: 'ClassBody',
-        ClassDeclaration: 'ClassDeclaration',
-        ClassExpression: 'ClassExpression',
-        ConditionalExpression: 'ConditionalExpression',
-        ContinueStatement: 'ContinueStatement',
-        DoWhileStatement: 'DoWhileStatement',
-        DebuggerStatement: 'DebuggerStatement',
-        EmptyStatement: 'EmptyStatement',
-        ExportAllDeclaration: 'ExportAllDeclaration',
-        ExportDefaultDeclaration: 'ExportDefaultDeclaration',
-        ExportNamedDeclaration: 'ExportNamedDeclaration',
-        ExportSpecifier: 'ExportSpecifier',
-        ExpressionStatement: 'ExpressionStatement',
-        ForStatement: 'ForStatement',
-        ForOfStatement: 'ForOfStatement',
-        ForInStatement: 'ForInStatement',
-        FunctionDeclaration: 'FunctionDeclaration',
-        FunctionExpression: 'FunctionExpression',
-        Identifier: 'Identifier',
-        IfStatement: 'IfStatement',
-        ImportDeclaration: 'ImportDeclaration',
-        ImportDefaultSpecifier: 'ImportDefaultSpecifier',
-        ImportNamespaceSpecifier: 'ImportNamespaceSpecifier',
-        ImportSpecifier: 'ImportSpecifier',
-        Literal: 'Literal',
-        LabeledStatement: 'LabeledStatement',
-        LogicalExpression: 'LogicalExpression',
-        MemberExpression: 'MemberExpression',
-        MetaProperty: 'MetaProperty',
-        MethodDefinition: 'MethodDefinition',
-        NewExpression: 'NewExpression',
-        ObjectExpression: 'ObjectExpression',
-        ObjectPattern: 'ObjectPattern',
-        Program: 'Program',
-        Property: 'Property',
-        RestElement: 'RestElement',
-        ReturnStatement: 'ReturnStatement',
-        SequenceExpression: 'SequenceExpression',
-        SpreadElement: 'SpreadElement',
-        Super: 'Super',
-        SwitchCase: 'SwitchCase',
-        SwitchStatement: 'SwitchStatement',
-        TaggedTemplateExpression: 'TaggedTemplateExpression',
-        TemplateElement: 'TemplateElement',
-        TemplateLiteral: 'TemplateLiteral',
-        ThisExpression: 'ThisExpression',
-        ThrowStatement: 'ThrowStatement',
-        TryStatement: 'TryStatement',
-        UnaryExpression: 'UnaryExpression',
-        UpdateExpression: 'UpdateExpression',
-        VariableDeclaration: 'VariableDeclaration',
-        VariableDeclarator: 'VariableDeclarator',
-        WhileStatement: 'WhileStatement',
-        WithStatement: 'WithStatement',
-        YieldExpression: 'YieldExpression'
-    };
-
-    PlaceHolders = {
-        ArrowParameterPlaceHolder: 'ArrowParameterPlaceHolder'
-    };
-
-    // Error messages should be identical to V8.
-    Messages = {
-        UnexpectedToken: 'Unexpected token %0',
-        UnexpectedNumber: 'Unexpected number',
-        UnexpectedString: 'Unexpected string',
-        UnexpectedIdentifier: 'Unexpected identifier',
-        UnexpectedReserved: 'Unexpected reserved word',
-        UnexpectedTemplate: 'Unexpected quasi %0',
-        UnexpectedEOS: 'Unexpected end of input',
-        NewlineAfterThrow: 'Illegal newline after throw',
-        InvalidRegExp: 'Invalid regular expression',
-        UnterminatedRegExp: 'Invalid regular expression: missing /',
-        InvalidLHSInAssignment: 'Invalid left-hand side in assignment',
-        InvalidLHSInForIn: 'Invalid left-hand side in for-in',
-        InvalidLHSInForLoop: 'Invalid left-hand side in for-loop',
-        MultipleDefaultsInSwitch: 'More than one default clause in switch statement',
-        NoCatchOrFinally: 'Missing catch or finally after try',
-        UnknownLabel: 'Undefined label \'%0\'',
-        Redeclaration: '%0 \'%1\' has already been declared',
-        IllegalContinue: 'Illegal continue statement',
-        IllegalBreak: 'Illegal break statement',
-        IllegalReturn: 'Illegal return statement',
-        StrictModeWith: 'Strict mode code may not include a with statement',
-        StrictCatchVariable: 'Catch variable may not be eval or arguments in strict mode',
-        StrictVarName: 'Variable name may not be eval or arguments in strict mode',
-        StrictParamName: 'Parameter name eval or arguments is not allowed in strict mode',
-        StrictParamDupe: 'Strict mode function may not have duplicate parameter names',
-        StrictFunctionName: 'Function name may not be eval or arguments in strict mode',
-        StrictOctalLiteral: 'Octal literals are not allowed in strict mode.',
-        StrictDelete: 'Delete of an unqualified identifier in strict mode.',
-        StrictLHSAssignment: 'Assignment to eval or arguments is not allowed in strict mode',
-        StrictLHSPostfix: 'Postfix increment/decrement may not have eval or arguments operand in strict mode',
-        StrictLHSPrefix: 'Prefix increment/decrement may not have eval or arguments operand in strict mode',
-        StrictReservedWord: 'Use of future reserved word in strict mode',
-        TemplateOctalLiteral: 'Octal literals are not allowed in template strings.',
-        ParameterAfterRestParameter: 'Rest parameter must be last formal parameter',
-        DefaultRestParameter: 'Unexpected token =',
-        ObjectPatternAsRestParameter: 'Unexpected token {',
-        DuplicateProtoProperty: 'Duplicate __proto__ fields are not allowed in object literals',
-        ConstructorSpecialMethod: 'Class constructor may not be an accessor',
-        DuplicateConstructor: 'A class may only have one constructor',
-        StaticPrototype: 'Classes may not have static property named prototype',
-        MissingFromClause: 'Unexpected token',
-        NoAsAfterImportNamespace: 'Unexpected token',
-        InvalidModuleSpecifier: 'Unexpected token',
-        IllegalImportDeclaration: 'Unexpected token',
-        IllegalExportDeclaration: 'Unexpected token',
-        DuplicateBinding: 'Duplicate binding %0'
-    };
-
-    // See also tools/generate-unicode-regex.js.
-    Regex = {
-        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierStart:
-        NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B2\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDE00-\uDE11\uDE13-\uDE2B\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDE00-\uDE2F\uDE44\uDE80-\uDEAA]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF98]|\uD809[\uDC00-\uDC6E]|[\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D]|\uD87E[\uDC00-\uDE1D]/,
-
-        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierPart:
-        NonAsciiIdentifierPart: /[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDD0-\uDDDA\uDE00-\uDE11\uDE13-\uDE37\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF01-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF98]|\uD809[\uDC00-\uDC6E]|[\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/
-    };
-
-    // Ensure the condition is true, otherwise throw an error.
-    // This is only to have a better contract semantic, i.e. another safety net
-    // to catch a logic error. The condition shall be fulfilled in normal case.
-    // Do NOT use this to enforce a certain condition on any user input.
-
-    function assert(condition, message) {
-        /* istanbul ignore if */
-        if (!condition) {
-            throw new Error('ASSERT: ' + message);
-        }
-    }
-
-    function isDecimalDigit(ch) {
-        return (ch >= 0x30 && ch <= 0x39);   // 0..9
-    }
-
-    function isHexDigit(ch) {
-        return '0123456789abcdefABCDEF'.indexOf(ch) >= 0;
-    }
-
-    function isOctalDigit(ch) {
-        return '01234567'.indexOf(ch) >= 0;
-    }
-
-    function octalToDecimal(ch) {
-        // \0 is not octal escape sequence
-        var octal = (ch !== '0'), code = '01234567'.indexOf(ch);
-
-        if (index < length && isOctalDigit(source[index])) {
-            octal = true;
-            code = code * 8 + '01234567'.indexOf(source[index++]);
-
-            // 3 digits are only allowed when string starts
-            // with 0, 1, 2, 3
-            if ('0123'.indexOf(ch) >= 0 &&
-                    index < length &&
-                    isOctalDigit(source[index])) {
-                code = code * 8 + '01234567'.indexOf(source[index++]);
-            }
-        }
-
-        return {
-            code: code,
-            octal: octal
-        };
-    }
-
-    // ECMA-262 11.2 White Space
-
-    function isWhiteSpace(ch) {
-        return (ch === 0x20) || (ch === 0x09) || (ch === 0x0B) || (ch === 0x0C) || (ch === 0xA0) ||
-            (ch >= 0x1680 && [0x1680, 0x180E, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202F, 0x205F, 0x3000, 0xFEFF].indexOf(ch) >= 0);
-    }
-
-    // ECMA-262 11.3 Line Terminators
-
-    function isLineTerminator(ch) {
-        return (ch === 0x0A) || (ch === 0x0D) || (ch === 0x2028) || (ch === 0x2029);
-    }
-
-    // ECMA-262 11.6 Identifier Names and Identifiers
-
-    function fromCodePoint(cp) {
-        return (cp < 0x10000) ? String.fromCharCode(cp) :
-            String.fromCharCode(0xD800 + ((cp - 0x10000) >> 10)) +
-            String.fromCharCode(0xDC00 + ((cp - 0x10000) & 1023));
-    }
-
-    function isIdentifierStart(ch) {
-        return (ch === 0x24) || (ch === 0x5F) ||  // $ (dollar) and _ (underscore)
-            (ch >= 0x41 && ch <= 0x5A) ||         // A..Z
-            (ch >= 0x61 && ch <= 0x7A) ||         // a..z
-            (ch === 0x5C) ||                      // \ (backslash)
-            ((ch >= 0x80) && Regex.NonAsciiIdentifierStart.test(fromCodePoint(ch)));
-    }
-
-    function isIdentifierPart(ch) {
-        return (ch === 0x24) || (ch === 0x5F) ||  // $ (dollar) and _ (underscore)
-            (ch >= 0x41 && ch <= 0x5A) ||         // A..Z
-            (ch >= 0x61 && ch <= 0x7A) ||         // a..z
-            (ch >= 0x30 && ch <= 0x39) ||         // 0..9
-            (ch === 0x5C) ||                      // \ (backslash)
-            ((ch >= 0x80) && Regex.NonAsciiIdentifierPart.test(fromCodePoint(ch)));
-    }
-
-    // ECMA-262 11.6.2.2 Future Reserved Words
-
-    function isFutureReservedWord(id) {
-        switch (id) {
-        case 'enum':
-        case 'export':
-        case 'import':
-        case 'super':
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    function isStrictModeReservedWord(id) {
-        switch (id) {
-        case 'implements':
-        case 'interface':
-        case 'package':
-        case 'private':
-        case 'protected':
-        case 'public':
-        case 'static':
-        case 'yield':
-        case 'let':
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    function isRestrictedWord(id) {
-        return id === 'eval' || id === 'arguments';
-    }
-
-    // ECMA-262 11.6.2.1 Keywords
-
-    function isKeyword(id) {
-        switch (id.length) {
-        case 2:
-            return (id === 'if') || (id === 'in') || (id === 'do');
-        case 3:
-            return (id === 'var') || (id === 'for') || (id === 'new') ||
-                (id === 'try') || (id === 'let');
-        case 4:
-            return (id === 'this') || (id === 'else') || (id === 'case') ||
-                (id === 'void') || (id === 'with') || (id === 'enum');
-        case 5:
-            return (id === 'while') || (id === 'break') || (id === 'catch') ||
-                (id === 'throw') || (id === 'const') || (id === 'yield') ||
-                (id === 'class') || (id === 'super');
-        case 6:
-            return (id === 'return') || (id === 'typeof') || (id === 'delete') ||
-                (id === 'switch') || (id === 'export') || (id === 'import');
-        case 7:
-            return (id === 'default') || (id === 'finally') || (id === 'extends');
-        case 8:
-            return (id === 'function') || (id === 'continue') || (id === 'debugger');
-        case 10:
-            return (id === 'instanceof');
-        default:
-            return false;
-        }
-    }
-
-    // ECMA-262 11.4 Comments
-
-    function addComment(type, value, start, end, loc) {
-        var comment;
-
-        assert(typeof start === 'number', 'Comment must have valid position');
-
-        state.lastCommentStart = start;
-
-        comment = {
-            type: type,
-            value: value
-        };
-        if (extra.range) {
-            comment.range = [start, end];
-        }
-        if (extra.loc) {
-            comment.loc = loc;
-        }
-        extra.comments.push(comment);
-        if (extra.attachComment) {
-            extra.leadingComments.push(comment);
-            extra.trailingComments.push(comment);
-        }
-        if (extra.tokenize) {
-            comment.type = comment.type + 'Comment';
-            if (extra.delegate) {
-                comment = extra.delegate(comment);
-            }
-            extra.tokens.push(comment);
-        }
-    }
-
-    function skipSingleLineComment(offset) {
-        var start, loc, ch, comment;
-
-        start = index - offset;
-        loc = {
-            start: {
-                line: lineNumber,
-                column: index - lineStart - offset
-            }
-        };
-
-        while (index < length) {
-            ch = source.charCodeAt(index);
-            ++index;
-            if (isLineTerminator(ch)) {
-                hasLineTerminator = true;
-                if (extra.comments) {
-                    comment = source.slice(start + offset, index - 1);
-                    loc.end = {
-                        line: lineNumber,
-                        column: index - lineStart - 1
-                    };
-                    addComment('Line', comment, start, index - 1, loc);
-                }
-                if (ch === 13 && source.charCodeAt(index) === 10) {
-                    ++index;
-                }
-                ++lineNumber;
-                lineStart = index;
-                return;
-            }
-        }
-
-        if (extra.comments) {
-            comment = source.slice(start + offset, index);
-            loc.end = {
-                line: lineNumber,
-                column: index - lineStart
-            };
-            addComment('Line', comment, start, index, loc);
-        }
-    }
-
-    function skipMultiLineComment() {
-        var start, loc, ch, comment;
-
-        if (extra.comments) {
-            start = index - 2;
-            loc = {
-                start: {
-                    line: lineNumber,
-                    column: index - lineStart - 2
-                }
-            };
-        }
-
-        while (index < length) {
-            ch = source.charCodeAt(index);
-            if (isLineTerminator(ch)) {
-                if (ch === 0x0D && source.charCodeAt(index + 1) === 0x0A) {
-                    ++index;
-                }
-                hasLineTerminator = true;
-                ++lineNumber;
-                ++index;
-                lineStart = index;
-            } else if (ch === 0x2A) {
-                // Block comment ends with '*/'.
-                if (source.charCodeAt(index + 1) === 0x2F) {
-                    ++index;
-                    ++index;
-                    if (extra.comments) {
-                        comment = source.slice(start + 2, index - 2);
-                        loc.end = {
-                            line: lineNumber,
-                            column: index - lineStart
-                        };
-                        addComment('Block', comment, start, index, loc);
-                    }
-                    return;
-                }
-                ++index;
-            } else {
-                ++index;
-            }
-        }
-
-        // Ran off the end of the file - the whole thing is a comment
-        if (extra.comments) {
-            loc.end = {
-                line: lineNumber,
-                column: index - lineStart
-            };
-            comment = source.slice(start + 2, index);
-            addComment('Block', comment, start, index, loc);
-        }
-        tolerateUnexpectedToken();
-    }
-
-    function skipComment() {
-        var ch, start;
-        hasLineTerminator = false;
-
-        start = (index === 0);
-        while (index < length) {
-            ch = source.charCodeAt(index);
-
-            if (isWhiteSpace(ch)) {
-                ++index;
-            } else if (isLineTerminator(ch)) {
-                hasLineTerminator = true;
-                ++index;
-                if (ch === 0x0D && source.charCodeAt(index) === 0x0A) {
-                    ++index;
-                }
-                ++lineNumber;
-                lineStart = index;
-                start = true;
-            } else if (ch === 0x2F) { // U+002F is '/'
-                ch = source.charCodeAt(index + 1);
-                if (ch === 0x2F) {
-                    ++index;
-                    ++index;
-                    skipSingleLineComment(2);
-                    start = true;
-                } else if (ch === 0x2A) {  // U+002A is '*'
-                    ++index;
-                    ++index;
-                    skipMultiLineComment();
-                } else {
-                    break;
-                }
-            } else if (start && ch === 0x2D) { // U+002D is '-'
-                // U+003E is '>'
-                if ((source.charCodeAt(index + 1) === 0x2D) && (source.charCodeAt(index + 2) === 0x3E)) {
-                    // '-->' is a single-line comment
-                    index += 3;
-                    skipSingleLineComment(3);
-                } else {
-                    break;
-                }
-            } else if (ch === 0x3C) { // U+003C is '<'
-                if (source.slice(index + 1, index + 4) === '!--') {
-                    ++index; // `<`
-                    ++index; // `!`
-                    ++index; // `-`
-                    ++index; // `-`
-                    skipSingleLineComment(4);
-                } else {
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-    }
-
-    function scanHexEscape(prefix) {
-        var i, len, ch, code = 0;
-
-        len = (prefix === 'u') ? 4 : 2;
-        for (i = 0; i < len; ++i) {
-            if (index < length && isHexDigit(source[index])) {
-                ch = source[index++];
-                code = code * 16 + '0123456789abcdef'.indexOf(ch.toLowerCase());
-            } else {
-                return '';
-            }
-        }
-        return String.fromCharCode(code);
-    }
-
-    function scanUnicodeCodePointEscape() {
-        var ch, code;
-
-        ch = source[index];
-        code = 0;
-
-        // At least, one hex digit is required.
-        if (ch === '}') {
-            throwUnexpectedToken();
-        }
-
-        while (index < length) {
-            ch = source[index++];
-            if (!isHexDigit(ch)) {
-                break;
-            }
-            code = code * 16 + '0123456789abcdef'.indexOf(ch.toLowerCase());
-        }
-
-        if (code > 0x10FFFF || ch !== '}') {
-            throwUnexpectedToken();
-        }
-
-        return fromCodePoint(code);
-    }
-
-    function codePointAt(i) {
-        var cp, first, second;
-
-        cp = source.charCodeAt(i);
-        if (cp >= 0xD800 && cp <= 0xDBFF) {
-            second = source.charCodeAt(i + 1);
-            if (second >= 0xDC00 && second <= 0xDFFF) {
-                first = cp;
-                cp = (first - 0xD800) * 0x400 + second - 0xDC00 + 0x10000;
-            }
-        }
-
-        return cp;
-    }
-
-    function getComplexIdentifier() {
-        var cp, ch, id;
-
-        cp = codePointAt(index);
-        id = fromCodePoint(cp);
-        index += id.length;
-
-        // '\u' (U+005C, U+0075) denotes an escaped character.
-        if (cp === 0x5C) {
-            if (source.charCodeAt(index) !== 0x75) {
-                throwUnexpectedToken();
-            }
-            ++index;
-            if (source[index] === '{') {
-                ++index;
-                ch = scanUnicodeCodePointEscape();
-            } else {
-                ch = scanHexEscape('u');
-                cp = ch.charCodeAt(0);
-                if (!ch || ch === '\\' || !isIdentifierStart(cp)) {
-                    throwUnexpectedToken();
-                }
-            }
-            id = ch;
-        }
-
-        while (index < length) {
-            cp = codePointAt(index);
-            if (!isIdentifierPart(cp)) {
-                break;
-            }
-            ch = fromCodePoint(cp);
-            id += ch;
-            index += ch.length;
-
-            // '\u' (U+005C, U+0075) denotes an escaped character.
-            if (cp === 0x5C) {
-                id = id.substr(0, id.length - 1);
-                if (source.charCodeAt(index) !== 0x75) {
-                    throwUnexpectedToken();
-                }
-                ++index;
-                if (source[index] === '{') {
-                    ++index;
-                    ch = scanUnicodeCodePointEscape();
-                } else {
-                    ch = scanHexEscape('u');
-                    cp = ch.charCodeAt(0);
-                    if (!ch || ch === '\\' || !isIdentifierPart(cp)) {
-                        throwUnexpectedToken();
-                    }
-                }
-                id += ch;
-            }
-        }
-
-        return id;
-    }
-
-    function getIdentifier() {
-        var start, ch;
-
-        start = index++;
-        while (index < length) {
-            ch = source.charCodeAt(index);
-            if (ch === 0x5C) {
-                // Blackslash (U+005C) marks Unicode escape sequence.
-                index = start;
-                return getComplexIdentifier();
-            } else if (ch >= 0xD800 && ch < 0xDFFF) {
-                // Need to handle surrogate pairs.
-                index = start;
-                return getComplexIdentifier();
-            }
-            if (isIdentifierPart(ch)) {
-                ++index;
-            } else {
-                break;
-            }
-        }
-
-        return source.slice(start, index);
-    }
-
-    function scanIdentifier() {
-        var start, id, type;
-
-        start = index;
-
-        // Backslash (U+005C) starts an escaped character.
-        id = (source.charCodeAt(index) === 0x5C) ? getComplexIdentifier() : getIdentifier();
-
-        // There is no keyword or literal with only one character.
-        // Thus, it must be an identifier.
-        if (id.length === 1) {
-            type = Token.Identifier;
-        } else if (isKeyword(id)) {
-            type = Token.Keyword;
-        } else if (id === 'null') {
-            type = Token.NullLiteral;
-        } else if (id === 'true' || id === 'false') {
-            type = Token.BooleanLiteral;
-        } else {
-            type = Token.Identifier;
-        }
-
-        return {
-            type: type,
-            value: id,
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            start: start,
-            end: index
-        };
-    }
-
-
-    // ECMA-262 11.7 Punctuators
-
-    function scanPunctuator() {
-        var token, str;
-
-        token = {
-            type: Token.Punctuator,
-            value: '',
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            start: index,
-            end: index
-        };
-
-        // Check for most common single-character punctuators.
-        str = source[index];
-        switch (str) {
-
-        case '(':
-            if (extra.tokenize) {
-                extra.openParenToken = extra.tokenValues.length;
-            }
-            ++index;
-            break;
-
-        case '{':
-            if (extra.tokenize) {
-                extra.openCurlyToken = extra.tokenValues.length;
-            }
-            state.curlyStack.push('{');
-            ++index;
-            break;
-
-        case '.':
-            ++index;
-            if (source[index] === '.' && source[index + 1] === '.') {
-                // Spread operator: ...
-                index += 2;
-                str = '...';
-            }
-            break;
-
-        case '}':
-            ++index;
-            state.curlyStack.pop();
-            break;
-        case ')':
-        case ';':
-        case ',':
-        case '[':
-        case ']':
-        case ':':
-        case '?':
-        case '~':
-            ++index;
-            break;
-
-        default:
-            // 4-character punctuator.
-            str = source.substr(index, 4);
-            if (str === '>>>=') {
-                index += 4;
-            } else {
-
-                // 3-character punctuators.
-                str = str.substr(0, 3);
-                if (str === '===' || str === '!==' || str === '>>>' ||
-                    str === '<<=' || str === '>>=') {
-                    index += 3;
-                } else {
-
-                    // 2-character punctuators.
-                    str = str.substr(0, 2);
-                    if (str === '&&' || str === '||' || str === '==' || str === '!=' ||
-                        str === '+=' || str === '-=' || str === '*=' || str === '/=' ||
-                        str === '++' || str === '--' || str === '<<' || str === '>>' ||
-                        str === '&=' || str === '|=' || str === '^=' || str === '%=' ||
-                        str === '<=' || str === '>=' || str === '=>') {
-                        index += 2;
-                    } else {
-
-                        // 1-character punctuators.
-                        str = source[index];
-                        if ('<>=!+-*%&|^/'.indexOf(str) >= 0) {
-                            ++index;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (index === token.start) {
-            throwUnexpectedToken();
-        }
-
-        token.end = index;
-        token.value = str;
-        return token;
-    }
-
-    // ECMA-262 11.8.3 Numeric Literals
-
-    function scanHexLiteral(start) {
-        var number = '';
-
-        while (index < length) {
-            if (!isHexDigit(source[index])) {
-                break;
-            }
-            number += source[index++];
-        }
-
-        if (number.length === 0) {
-            throwUnexpectedToken();
-        }
-
-        if (isIdentifierStart(source.charCodeAt(index))) {
-            throwUnexpectedToken();
-        }
-
-        return {
-            type: Token.NumericLiteral,
-            value: parseInt('0x' + number, 16),
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            start: start,
-            end: index
-        };
-    }
-
-    function scanBinaryLiteral(start) {
-        var ch, number;
-
-        number = '';
-
-        while (index < length) {
-            ch = source[index];
-            if (ch !== '0' && ch !== '1') {
-                break;
-            }
-            number += source[index++];
-        }
-
-        if (number.length === 0) {
-            // only 0b or 0B
-            throwUnexpectedToken();
-        }
-
-        if (index < length) {
-            ch = source.charCodeAt(index);
-            /* istanbul ignore else */
-            if (isIdentifierStart(ch) || isDecimalDigit(ch)) {
-                throwUnexpectedToken();
-            }
-        }
-
-        return {
-            type: Token.NumericLiteral,
-            value: parseInt(number, 2),
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            start: start,
-            end: index
-        };
-    }
-
-    function scanOctalLiteral(prefix, start) {
-        var number, octal;
-
-        if (isOctalDigit(prefix)) {
-            octal = true;
-            number = '0' + source[index++];
-        } else {
-            octal = false;
-            ++index;
-            number = '';
-        }
-
-        while (index < length) {
-            if (!isOctalDigit(source[index])) {
-                break;
-            }
-            number += source[index++];
-        }
-
-        if (!octal && number.length === 0) {
-            // only 0o or 0O
-            throwUnexpectedToken();
-        }
-
-        if (isIdentifierStart(source.charCodeAt(index)) || isDecimalDigit(source.charCodeAt(index))) {
-            throwUnexpectedToken();
-        }
-
-        return {
-            type: Token.NumericLiteral,
-            value: parseInt(number, 8),
-            octal: octal,
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            start: start,
-            end: index
-        };
-    }
-
-    function isImplicitOctalLiteral() {
-        var i, ch;
-
-        // Implicit octal, unless there is a non-octal digit.
-        // (Annex B.1.1 on Numeric Literals)
-        for (i = index + 1; i < length; ++i) {
-            ch = source[i];
-            if (ch === '8' || ch === '9') {
-                return false;
-            }
-            if (!isOctalDigit(ch)) {
-                return true;
-            }
-        }
-
-        return true;
-    }
-
-    function scanNumericLiteral() {
-        var number, start, ch;
-
-        ch = source[index];
-        assert(isDecimalDigit(ch.charCodeAt(0)) || (ch === '.'),
-            'Numeric literal must start with a decimal digit or a decimal point');
-
-        start = index;
-        number = '';
-        if (ch !== '.') {
-            number = source[index++];
-            ch = source[index];
-
-            // Hex number starts with '0x'.
-            // Octal number starts with '0'.
-            // Octal number in ES6 starts with '0o'.
-            // Binary number in ES6 starts with '0b'.
-            if (number === '0') {
-                if (ch === 'x' || ch === 'X') {
-                    ++index;
-                    return scanHexLiteral(start);
-                }
-                if (ch === 'b' || ch === 'B') {
-                    ++index;
-                    return scanBinaryLiteral(start);
-                }
-                if (ch === 'o' || ch === 'O') {
-                    return scanOctalLiteral(ch, start);
-                }
-
-                if (isOctalDigit(ch)) {
-                    if (isImplicitOctalLiteral()) {
-                        return scanOctalLiteral(ch, start);
-                    }
-                }
-            }
-
-            while (isDecimalDigit(source.charCodeAt(index))) {
-                number += source[index++];
-            }
-            ch = source[index];
-        }
-
-        if (ch === '.') {
-            number += source[index++];
-            while (isDecimalDigit(source.charCodeAt(index))) {
-                number += source[index++];
-            }
-            ch = source[index];
-        }
-
-        if (ch === 'e' || ch === 'E') {
-            number += source[index++];
-
-            ch = source[index];
-            if (ch === '+' || ch === '-') {
-                number += source[index++];
-            }
-            if (isDecimalDigit(source.charCodeAt(index))) {
-                while (isDecimalDigit(source.charCodeAt(index))) {
-                    number += source[index++];
-                }
-            } else {
-                throwUnexpectedToken();
-            }
-        }
-
-        if (isIdentifierStart(source.charCodeAt(index))) {
-            throwUnexpectedToken();
-        }
-
-        return {
-            type: Token.NumericLiteral,
-            value: parseFloat(number),
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            start: start,
-            end: index
-        };
-    }
-
-    // ECMA-262 11.8.4 String Literals
-
-    function scanStringLiteral() {
-        var str = '', quote, start, ch, unescaped, octToDec, octal = false;
-
-        quote = source[index];
-        assert((quote === '\'' || quote === '"'),
-            'String literal must starts with a quote');
-
-        start = index;
-        ++index;
-
-        while (index < length) {
-            ch = source[index++];
-
-            if (ch === quote) {
-                quote = '';
-                break;
-            } else if (ch === '\\') {
-                ch = source[index++];
-                if (!ch || !isLineTerminator(ch.charCodeAt(0))) {
-                    switch (ch) {
-                    case 'u':
-                    case 'x':
-                        if (source[index] === '{') {
-                            ++index;
-                            str += scanUnicodeCodePointEscape();
-                        } else {
-                            unescaped = scanHexEscape(ch);
-                            if (!unescaped) {
-                                throw throwUnexpectedToken();
-                            }
-                            str += unescaped;
-                        }
-                        break;
-                    case 'n':
-                        str += '\n';
-                        break;
-                    case 'r':
-                        str += '\r';
-                        break;
-                    case 't':
-                        str += '\t';
-                        break;
-                    case 'b':
-                        str += '\b';
-                        break;
-                    case 'f':
-                        str += '\f';
-                        break;
-                    case 'v':
-                        str += '\x0B';
-                        break;
-                    case '8':
-                    case '9':
-                        str += ch;
-                        tolerateUnexpectedToken();
-                        break;
-
-                    default:
-                        if (isOctalDigit(ch)) {
-                            octToDec = octalToDecimal(ch);
-
-                            octal = octToDec.octal || octal;
-                            str += String.fromCharCode(octToDec.code);
-                        } else {
-                            str += ch;
-                        }
-                        break;
-                    }
-                } else {
-                    ++lineNumber;
-                    if (ch === '\r' && source[index] === '\n') {
-                        ++index;
-                    }
-                    lineStart = index;
-                }
-            } else if (isLineTerminator(ch.charCodeAt(0))) {
-                break;
-            } else {
-                str += ch;
-            }
-        }
-
-        if (quote !== '') {
-            throwUnexpectedToken();
-        }
-
-        return {
-            type: Token.StringLiteral,
-            value: str,
-            octal: octal,
-            lineNumber: startLineNumber,
-            lineStart: startLineStart,
-            start: start,
-            end: index
-        };
-    }
-
-    // ECMA-262 11.8.6 Template Literal Lexical Components
-
-    function scanTemplate() {
-        var cooked = '', ch, start, rawOffset, terminated, head, tail, restore, unescaped;
-
-        terminated = false;
-        tail = false;
-        start = index;
-        head = (source[index] === '`');
-        rawOffset = 2;
-
-        ++index;
-
-        while (index < length) {
-            ch = source[index++];
-            if (ch === '`') {
-                rawOffset = 1;
-                tail = true;
-                terminated = true;
-                break;
-            } else if (ch === '$') {
-                if (source[index] === '{') {
-                    state.curlyStack.push('${');
-                    ++index;
-                    terminated = true;
-                    break;
-                }
-                cooked += ch;
-            } else if (ch === '\\') {
-                ch = source[index++];
-                if (!isLineTerminator(ch.charCodeAt(0))) {
-                    switch (ch) {
-                    case 'n':
-                        cooked += '\n';
-                        break;
-                    case 'r':
-                        cooked += '\r';
-                        break;
-                    case 't':
-                        cooked += '\t';
-                        break;
-                    case 'u':
-                    case 'x':
-                        if (source[index] === '{') {
-                            ++index;
-                            cooked += scanUnicodeCodePointEscape();
-                        } else {
-                            restore = index;
-                            unescaped = scanHexEscape(ch);
-                            if (unescaped) {
-                                cooked += unescaped;
-                            } else {
-                                index = restore;
-                                cooked += ch;
-                            }
-                        }
-                        break;
-                    case 'b':
-                        cooked += '\b';
-                        break;
-                    case 'f':
-                        cooked += '\f';
-                        break;
-                    case 'v':
-                        cooked += '\v';
-                        break;
-
-                    default:
-                        if (ch === '0') {
-                            if (isDecimalDigit(source.charCodeAt(index))) {
-                                // Illegal: \01 \02 and so on
-                                throwError(Messages.TemplateOctalLiteral);
-                            }
-                            cooked += '\0';
-                        } else if (isOctalDigit(ch)) {
-                            // Illegal: \1 \2
-                            throwError(Messages.TemplateOctalLiteral);
-                        } else {
-                            cooked += ch;
-                        }
-                        break;
-                    }
-                } else {
-                    ++lineNumber;
-                    if (ch === '\r' && source[index] === '\n') {
-                        ++index;
-                    }
-                    lineStart = index;
-                }
-            } else if (isLineTerminator(ch.charCodeAt(0))) {
-                ++lineNumber;
-                if (ch === '\r' && source[index] === '\n') {
-                    ++index;
-                }
-                lineStart = index;
-                cooked += '\n';
-            } else {
-                cooked += ch;
-            }
-        }
-
-        if (!terminated) {
-            throwUnexpectedToken();
-        }
-
-        if (!head) {
-            state.curlyStack.pop();
-        }
-
-        return {
-            type: Token.Template,
-            value: {
-                cooked: cooked,
-                raw: source.slice(start + 1, index - rawOffset)
-            },
-            head: head,
-            tail: tail,
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            start: start,
-            end: index
-        };
-    }
-
-    // ECMA-262 11.8.5 Regular Expression Literals
-
-    function testRegExp(pattern, flags) {
-        // The BMP character to use as a replacement for astral symbols when
-        // translating an ES6 "u"-flagged pattern to an ES5-compatible
-        // approximation.
-        // Note: replacing with '\uFFFF' enables false positives in unlikely
-        // scenarios. For example, `[\u{1044f}-\u{10440}]` is an invalid
-        // pattern that would not be detected by this substitution.
-        var astralSubstitute = '\uFFFF',
-            tmp = pattern;
-
-        if (flags.indexOf('u') >= 0) {
-            tmp = tmp
-                // Replace every Unicode escape sequence with the equivalent
-                // BMP character or a constant ASCII code point in the case of
-                // astral symbols. (See the above note on `astralSubstitute`
-                // for more information.)
-                .replace(/\\u\{([0-9a-fA-F]+)\}|\\u([a-fA-F0-9]{4})/g, function ($0, $1, $2) {
-                    var codePoint = parseInt($1 || $2, 16);
-                    if (codePoint > 0x10FFFF) {
-                        throwUnexpectedToken(null, Messages.InvalidRegExp);
-                    }
-                    if (codePoint <= 0xFFFF) {
-                        return String.fromCharCode(codePoint);
-                    }
-                    return astralSubstitute;
-                })
-                // Replace each paired surrogate with a single ASCII symbol to
-                // avoid throwing on regular expressions that are only valid in
-                // combination with the "u" flag.
-                .replace(
-                    /[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
-                    astralSubstitute
-                );
-        }
-
-        // First, detect invalid regular expressions.
-        try {
-            RegExp(tmp);
-        } catch (e) {
-            throwUnexpectedToken(null, Messages.InvalidRegExp);
-        }
-
-        // Return a regular expression object for this pattern-flag pair, or
-        // `null` in case the current environment doesn't support the flags it
-        // uses.
-        try {
-            return new RegExp(pattern, flags);
-        } catch (exception) {
-            return null;
-        }
-    }
-
-    function scanRegExpBody() {
-        var ch, str, classMarker, terminated, body;
-
-        ch = source[index];
-        assert(ch === '/', 'Regular expression literal must start with a slash');
-        str = source[index++];
-
-        classMarker = false;
-        terminated = false;
-        while (index < length) {
-            ch = source[index++];
-            str += ch;
-            if (ch === '\\') {
-                ch = source[index++];
-                // ECMA-262 7.8.5
-                if (isLineTerminator(ch.charCodeAt(0))) {
-                    throwUnexpectedToken(null, Messages.UnterminatedRegExp);
-                }
-                str += ch;
-            } else if (isLineTerminator(ch.charCodeAt(0))) {
-                throwUnexpectedToken(null, Messages.UnterminatedRegExp);
-            } else if (classMarker) {
-                if (ch === ']') {
-                    classMarker = false;
-                }
-            } else {
-                if (ch === '/') {
-                    terminated = true;
-                    break;
-                } else if (ch === '[') {
-                    classMarker = true;
-                }
-            }
-        }
-
-        if (!terminated) {
-            throwUnexpectedToken(null, Messages.UnterminatedRegExp);
-        }
-
-        // Exclude leading and trailing slash.
-        body = str.substr(1, str.length - 2);
-        return {
-            value: body,
-            literal: str
-        };
-    }
-
-    function scanRegExpFlags() {
-        var ch, str, flags, restore;
-
-        str = '';
-        flags = '';
-        while (index < length) {
-            ch = source[index];
-            if (!isIdentifierPart(ch.charCodeAt(0))) {
-                break;
-            }
-
-            ++index;
-            if (ch === '\\' && index < length) {
-                ch = source[index];
-                if (ch === 'u') {
-                    ++index;
-                    restore = index;
-                    ch = scanHexEscape('u');
-                    if (ch) {
-                        flags += ch;
-                        for (str += '\\u'; restore < index; ++restore) {
-                            str += source[restore];
-                        }
-                    } else {
-                        index = restore;
-                        flags += 'u';
-                        str += '\\u';
-                    }
-                    tolerateUnexpectedToken();
-                } else {
-                    str += '\\';
-                    tolerateUnexpectedToken();
-                }
-            } else {
-                flags += ch;
-                str += ch;
-            }
-        }
-
-        return {
-            value: flags,
-            literal: str
-        };
-    }
-
-    function scanRegExp() {
-        var start, body, flags, value;
-        scanning = true;
-
-        lookahead = null;
-        skipComment();
-        start = index;
-
-        body = scanRegExpBody();
-        flags = scanRegExpFlags();
-        value = testRegExp(body.value, flags.value);
-        scanning = false;
-        if (extra.tokenize) {
-            return {
-                type: Token.RegularExpression,
-                value: value,
-                regex: {
-                    pattern: body.value,
-                    flags: flags.value
-                },
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                start: start,
-                end: index
-            };
-        }
-
-        return {
-            literal: body.literal + flags.literal,
-            value: value,
-            regex: {
-                pattern: body.value,
-                flags: flags.value
-            },
-            start: start,
-            end: index
-        };
-    }
-
-    function collectRegex() {
-        var pos, loc, regex, token;
-
-        skipComment();
-
-        pos = index;
-        loc = {
-            start: {
-                line: lineNumber,
-                column: index - lineStart
-            }
-        };
-
-        regex = scanRegExp();
-
-        loc.end = {
-            line: lineNumber,
-            column: index - lineStart
-        };
-
-        /* istanbul ignore next */
-        if (!extra.tokenize) {
-            // Pop the previous token, which is likely '/' or '/='
-            if (extra.tokens.length > 0) {
-                token = extra.tokens[extra.tokens.length - 1];
-                if (token.range[0] === pos && token.type === 'Punctuator') {
-                    if (token.value === '/' || token.value === '/=') {
-                        extra.tokens.pop();
-                    }
-                }
-            }
-
-            extra.tokens.push({
-                type: 'RegularExpression',
-                value: regex.literal,
-                regex: regex.regex,
-                range: [pos, index],
-                loc: loc
-            });
-        }
-
-        return regex;
-    }
-
-    function isIdentifierName(token) {
-        return token.type === Token.Identifier ||
-            token.type === Token.Keyword ||
-            token.type === Token.BooleanLiteral ||
-            token.type === Token.NullLiteral;
-    }
-
-    // Using the following algorithm:
-    // https://github.com/mozilla/sweet.js/wiki/design
-
-    function advanceSlash() {
-        var regex, previous, check;
-
-        function testKeyword(value) {
-            return value && (value.length > 1) && (value[0] >= 'a') && (value[0] <= 'z');
-        }
-
-        previous = extra.tokenValues[extra.tokens.length - 1];
-        regex = (previous !== null);
-
-        switch (previous) {
-        case 'this':
-        case ']':
-            regex = false;
-            break;
-
-        case ')':
-            check = extra.tokenValues[extra.openParenToken - 1];
-            regex = (check === 'if' || check === 'while' || check === 'for' || check === 'with');
-            break;
-
-        case '}':
-            // Dividing a function by anything makes little sense,
-            // but we have to check for that.
-            regex = false;
-            if (testKeyword(extra.tokenValues[extra.openCurlyToken - 3])) {
-                // Anonymous function, e.g. function(){} /42
-                check = extra.tokenValues[extra.openCurlyToken - 4];
-                regex = check ? (FnExprTokens.indexOf(check) < 0) : false;
-            } else if (testKeyword(extra.tokenValues[extra.openCurlyToken - 4])) {
-                // Named function, e.g. function f(){} /42/
-                check = extra.tokenValues[extra.openCurlyToken - 5];
-                regex = check ? (FnExprTokens.indexOf(check) < 0) : true;
-            }
-        }
-
-        return regex ? collectRegex() : scanPunctuator();
-    }
-
-    function advance() {
-        var cp, token;
-
-        if (index >= length) {
-            return {
-                type: Token.EOF,
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                start: index,
-                end: index
-            };
-        }
-
-        cp = source.charCodeAt(index);
-
-        if (isIdentifierStart(cp)) {
-            token = scanIdentifier();
-            if (strict && isStrictModeReservedWord(token.value)) {
-                token.type = Token.Keyword;
-            }
-            return token;
-        }
-
-        // Very common: ( and ) and ;
-        if (cp === 0x28 || cp === 0x29 || cp === 0x3B) {
-            return scanPunctuator();
-        }
-
-        // String literal starts with single quote (U+0027) or double quote (U+0022).
-        if (cp === 0x27 || cp === 0x22) {
-            return scanStringLiteral();
-        }
-
-        // Dot (.) U+002E can also start a floating-point number, hence the need
-        // to check the next character.
-        if (cp === 0x2E) {
-            if (isDecimalDigit(source.charCodeAt(index + 1))) {
-                return scanNumericLiteral();
-            }
-            return scanPunctuator();
-        }
-
-        if (isDecimalDigit(cp)) {
-            return scanNumericLiteral();
-        }
-
-        // Slash (/) U+002F can also start a regex.
-        if (extra.tokenize && cp === 0x2F) {
-            return advanceSlash();
-        }
-
-        // Template literals start with ` (U+0060) for template head
-        // or } (U+007D) for template middle or template tail.
-        if (cp === 0x60 || (cp === 0x7D && state.curlyStack[state.curlyStack.length - 1] === '${')) {
-            return scanTemplate();
-        }
-
-        // Possible identifier start in a surrogate pair.
-        if (cp >= 0xD800 && cp < 0xDFFF) {
-            cp = codePointAt(index);
-            if (isIdentifierStart(cp)) {
-                return scanIdentifier();
-            }
-        }
-
-        return scanPunctuator();
-    }
-
-    function collectToken() {
-        var loc, token, value, entry;
-
-        loc = {
-            start: {
-                line: lineNumber,
-                column: index - lineStart
-            }
-        };
-
-        token = advance();
-        loc.end = {
-            line: lineNumber,
-            column: index - lineStart
-        };
-
-        if (token.type !== Token.EOF) {
-            value = source.slice(token.start, token.end);
-            entry = {
-                type: TokenName[token.type],
-                value: value,
-                range: [token.start, token.end],
-                loc: loc
-            };
-            if (token.regex) {
-                entry.regex = {
-                    pattern: token.regex.pattern,
-                    flags: token.regex.flags
-                };
-            }
-            if (extra.tokenValues) {
-                extra.tokenValues.push((entry.type === 'Punctuator' || entry.type === 'Keyword') ? entry.value : null);
-            }
-            if (extra.tokenize) {
-                if (!extra.range) {
-                    delete entry.range;
-                }
-                if (!extra.loc) {
-                    delete entry.loc;
-                }
-                if (extra.delegate) {
-                    entry = extra.delegate(entry);
-                }
-            }
-            extra.tokens.push(entry);
-        }
-
-        return token;
-    }
-
-    function lex() {
-        var token;
-        scanning = true;
-
-        lastIndex = index;
-        lastLineNumber = lineNumber;
-        lastLineStart = lineStart;
-
-        skipComment();
-
-        token = lookahead;
-
-        startIndex = index;
-        startLineNumber = lineNumber;
-        startLineStart = lineStart;
-
-        lookahead = (typeof extra.tokens !== 'undefined') ? collectToken() : advance();
-        scanning = false;
-        return token;
-    }
-
-    function peek() {
-        scanning = true;
-
-        skipComment();
-
-        lastIndex = index;
-        lastLineNumber = lineNumber;
-        lastLineStart = lineStart;
-
-        startIndex = index;
-        startLineNumber = lineNumber;
-        startLineStart = lineStart;
-
-        lookahead = (typeof extra.tokens !== 'undefined') ? collectToken() : advance();
-        scanning = false;
-    }
-
-    function Position() {
-        this.line = startLineNumber;
-        this.column = startIndex - startLineStart;
-    }
-
-    function SourceLocation() {
-        this.start = new Position();
-        this.end = null;
-    }
-
-    function WrappingSourceLocation(startToken) {
-        this.start = {
-            line: startToken.lineNumber,
-            column: startToken.start - startToken.lineStart
-        };
-        this.end = null;
-    }
-
-    function Node() {
-        if (extra.range) {
-            this.range = [startIndex, 0];
-        }
-        if (extra.loc) {
-            this.loc = new SourceLocation();
-        }
-    }
-
-    function WrappingNode(startToken) {
-        if (extra.range) {
-            this.range = [startToken.start, 0];
-        }
-        if (extra.loc) {
-            this.loc = new WrappingSourceLocation(startToken);
-        }
-    }
-
-    WrappingNode.prototype = Node.prototype = {
-
-        processComment: function () {
-            var lastChild,
-                innerComments,
-                leadingComments,
-                trailingComments,
-                bottomRight = extra.bottomRightStack,
-                i,
-                comment,
-                last = bottomRight[bottomRight.length - 1];
-
-            if (this.type === Syntax.Program) {
-                if (this.body.length > 0) {
-                    return;
-                }
-            }
-            /**
-             * patch innnerComments for properties empty block
-             * `function a() {/** comments **\/}`
-             */
-
-            if (this.type === Syntax.BlockStatement && this.body.length === 0) {
-                innerComments = [];
-                for (i = extra.leadingComments.length - 1; i >= 0; --i) {
-                    comment = extra.leadingComments[i];
-                    if (this.range[1] >= comment.range[1]) {
-                        innerComments.unshift(comment);
-                        extra.leadingComments.splice(i, 1);
-                        extra.trailingComments.splice(i, 1);
-                    }
-                }
-                if (innerComments.length) {
-                    this.innerComments = innerComments;
-                    //bottomRight.push(this);
-                    return;
-                }
-            }
-
-            if (extra.trailingComments.length > 0) {
-                trailingComments = [];
-                for (i = extra.trailingComments.length - 1; i >= 0; --i) {
-                    comment = extra.trailingComments[i];
-                    if (comment.range[0] >= this.range[1]) {
-                        trailingComments.unshift(comment);
-                        extra.trailingComments.splice(i, 1);
-                    }
-                }
-                extra.trailingComments = [];
-            } else {
-                if (last && last.trailingComments && last.trailingComments[0].range[0] >= this.range[1]) {
-                    trailingComments = last.trailingComments;
-                    delete last.trailingComments;
-                }
-            }
-
-            // Eating the stack.
-            while (last && last.range[0] >= this.range[0]) {
-                lastChild = bottomRight.pop();
-                last = bottomRight[bottomRight.length - 1];
-            }
-
-            if (lastChild) {
-                if (lastChild.leadingComments) {
-                    leadingComments = [];
-                    for (i = lastChild.leadingComments.length - 1; i >= 0; --i) {
-                        comment = lastChild.leadingComments[i];
-                        if (comment.range[1] <= this.range[0]) {
-                            leadingComments.unshift(comment);
-                            lastChild.leadingComments.splice(i, 1);
-                        }
-                    }
-
-                    if (!lastChild.leadingComments.length) {
-                        lastChild.leadingComments = undefined;
-                    }
-                }
-            } else if (extra.leadingComments.length > 0) {
-                leadingComments = [];
-                for (i = extra.leadingComments.length - 1; i >= 0; --i) {
-                    comment = extra.leadingComments[i];
-                    if (comment.range[1] <= this.range[0]) {
-                        leadingComments.unshift(comment);
-                        extra.leadingComments.splice(i, 1);
-                    }
-                }
-            }
-
-
-            if (leadingComments && leadingComments.length > 0) {
-                this.leadingComments = leadingComments;
-            }
-            if (trailingComments && trailingComments.length > 0) {
-                this.trailingComments = trailingComments;
-            }
-
-            bottomRight.push(this);
-        },
-
-        finish: function () {
-            if (extra.range) {
-                this.range[1] = lastIndex;
-            }
-            if (extra.loc) {
-                this.loc.end = {
-                    line: lastLineNumber,
-                    column: lastIndex - lastLineStart
-                };
-                if (extra.source) {
-                    this.loc.source = extra.source;
-                }
-            }
-
-            if (extra.attachComment) {
-                this.processComment();
-            }
-        },
-
-        finishArrayExpression: function (elements) {
-            this.type = Syntax.ArrayExpression;
-            this.elements = elements;
-            this.finish();
-            return this;
-        },
-
-        finishArrayPattern: function (elements) {
-            this.type = Syntax.ArrayPattern;
-            this.elements = elements;
-            this.finish();
-            return this;
-        },
-
-        finishArrowFunctionExpression: function (params, defaults, body, expression) {
-            this.type = Syntax.ArrowFunctionExpression;
-            this.id = null;
-            this.params = params;
-            this.defaults = defaults;
-            this.body = body;
-            this.generator = false;
-            this.expression = expression;
-            this.finish();
-            return this;
-        },
-
-        finishAssignmentExpression: function (operator, left, right) {
-            this.type = Syntax.AssignmentExpression;
-            this.operator = operator;
-            this.left = left;
-            this.right = right;
-            this.finish();
-            return this;
-        },
-
-        finishAssignmentPattern: function (left, right) {
-            this.type = Syntax.AssignmentPattern;
-            this.left = left;
-            this.right = right;
-            this.finish();
-            return this;
-        },
-
-        finishBinaryExpression: function (operator, left, right) {
-            this.type = (operator === '||' || operator === '&&') ? Syntax.LogicalExpression : Syntax.BinaryExpression;
-            this.operator = operator;
-            this.left = left;
-            this.right = right;
-            this.finish();
-            return this;
-        },
-
-        finishBlockStatement: function (body) {
-            this.type = Syntax.BlockStatement;
-            this.body = body;
-            this.finish();
-            return this;
-        },
-
-        finishBreakStatement: function (label) {
-            this.type = Syntax.BreakStatement;
-            this.label = label;
-            this.finish();
-            return this;
-        },
-
-        finishCallExpression: function (callee, args) {
-            this.type = Syntax.CallExpression;
-            this.callee = callee;
-            this.arguments = args;
-            this.finish();
-            return this;
-        },
-
-        finishCatchClause: function (param, body) {
-            this.type = Syntax.CatchClause;
-            this.param = param;
-            this.body = body;
-            this.finish();
-            return this;
-        },
-
-        finishClassBody: function (body) {
-            this.type = Syntax.ClassBody;
-            this.body = body;
-            this.finish();
-            return this;
-        },
-
-        finishClassDeclaration: function (id, superClass, body) {
-            this.type = Syntax.ClassDeclaration;
-            this.id = id;
-            this.superClass = superClass;
-            this.body = body;
-            this.finish();
-            return this;
-        },
-
-        finishClassExpression: function (id, superClass, body) {
-            this.type = Syntax.ClassExpression;
-            this.id = id;
-            this.superClass = superClass;
-            this.body = body;
-            this.finish();
-            return this;
-        },
-
-        finishConditionalExpression: function (test, consequent, alternate) {
-            this.type = Syntax.ConditionalExpression;
-            this.test = test;
-            this.consequent = consequent;
-            this.alternate = alternate;
-            this.finish();
-            return this;
-        },
-
-        finishContinueStatement: function (label) {
-            this.type = Syntax.ContinueStatement;
-            this.label = label;
-            this.finish();
-            return this;
-        },
-
-        finishDebuggerStatement: function () {
-            this.type = Syntax.DebuggerStatement;
-            this.finish();
-            return this;
-        },
-
-        finishDoWhileStatement: function (body, test) {
-            this.type = Syntax.DoWhileStatement;
-            this.body = body;
-            this.test = test;
-            this.finish();
-            return this;
-        },
-
-        finishEmptyStatement: function () {
-            this.type = Syntax.EmptyStatement;
-            this.finish();
-            return this;
-        },
-
-        finishExpressionStatement: function (expression) {
-            this.type = Syntax.ExpressionStatement;
-            this.expression = expression;
-            this.finish();
-            return this;
-        },
-
-        finishForStatement: function (init, test, update, body) {
-            this.type = Syntax.ForStatement;
-            this.init = init;
-            this.test = test;
-            this.update = update;
-            this.body = body;
-            this.finish();
-            return this;
-        },
-
-        finishForOfStatement: function (left, right, body) {
-            this.type = Syntax.ForOfStatement;
-            this.left = left;
-            this.right = right;
-            this.body = body;
-            this.finish();
-            return this;
-        },
-
-        finishForInStatement: function (left, right, body) {
-            this.type = Syntax.ForInStatement;
-            this.left = left;
-            this.right = right;
-            this.body = body;
-            this.each = false;
-            this.finish();
-            return this;
-        },
-
-        finishFunctionDeclaration: function (id, params, defaults, body, generator) {
-            this.type = Syntax.FunctionDeclaration;
-            this.id = id;
-            this.params = params;
-            this.defaults = defaults;
-            this.body = body;
-            this.generator = generator;
-            this.expression = false;
-            this.finish();
-            return this;
-        },
-
-        finishFunctionExpression: function (id, params, defaults, body, generator) {
-            this.type = Syntax.FunctionExpression;
-            this.id = id;
-            this.params = params;
-            this.defaults = defaults;
-            this.body = body;
-            this.generator = generator;
-            this.expression = false;
-            this.finish();
-            return this;
-        },
-
-        finishIdentifier: function (name) {
-            this.type = Syntax.Identifier;
-            this.name = name;
-            this.finish();
-            return this;
-        },
-
-        finishIfStatement: function (test, consequent, alternate) {
-            this.type = Syntax.IfStatement;
-            this.test = test;
-            this.consequent = consequent;
-            this.alternate = alternate;
-            this.finish();
-            return this;
-        },
-
-        finishLabeledStatement: function (label, body) {
-            this.type = Syntax.LabeledStatement;
-            this.label = label;
-            this.body = body;
-            this.finish();
-            return this;
-        },
-
-        finishLiteral: function (token) {
-            this.type = Syntax.Literal;
-            this.value = token.value;
-            this.raw = source.slice(token.start, token.end);
-            if (token.regex) {
-                this.regex = token.regex;
-            }
-            this.finish();
-            return this;
-        },
-
-        finishMemberExpression: function (accessor, object, property) {
-            this.type = Syntax.MemberExpression;
-            this.computed = accessor === '[';
-            this.object = object;
-            this.property = property;
-            this.finish();
-            return this;
-        },
-
-        finishMetaProperty: function (meta, property) {
-            this.type = Syntax.MetaProperty;
-            this.meta = meta;
-            this.property = property;
-            this.finish();
-            return this;
-        },
-
-        finishNewExpression: function (callee, args) {
-            this.type = Syntax.NewExpression;
-            this.callee = callee;
-            this.arguments = args;
-            this.finish();
-            return this;
-        },
-
-        finishObjectExpression: function (properties) {
-            this.type = Syntax.ObjectExpression;
-            this.properties = properties;
-            this.finish();
-            return this;
-        },
-
-        finishObjectPattern: function (properties) {
-            this.type = Syntax.ObjectPattern;
-            this.properties = properties;
-            this.finish();
-            return this;
-        },
-
-        finishPostfixExpression: function (operator, argument) {
-            this.type = Syntax.UpdateExpression;
-            this.operator = operator;
-            this.argument = argument;
-            this.prefix = false;
-            this.finish();
-            return this;
-        },
-
-        finishProgram: function (body, sourceType) {
-            this.type = Syntax.Program;
-            this.body = body;
-            this.sourceType = sourceType;
-            this.finish();
-            return this;
-        },
-
-        finishProperty: function (kind, key, computed, value, method, shorthand) {
-            this.type = Syntax.Property;
-            this.key = key;
-            this.computed = computed;
-            this.value = value;
-            this.kind = kind;
-            this.method = method;
-            this.shorthand = shorthand;
-            this.finish();
-            return this;
-        },
-
-        finishRestElement: function (argument) {
-            this.type = Syntax.RestElement;
-            this.argument = argument;
-            this.finish();
-            return this;
-        },
-
-        finishReturnStatement: function (argument) {
-            this.type = Syntax.ReturnStatement;
-            this.argument = argument;
-            this.finish();
-            return this;
-        },
-
-        finishSequenceExpression: function (expressions) {
-            this.type = Syntax.SequenceExpression;
-            this.expressions = expressions;
-            this.finish();
-            return this;
-        },
-
-        finishSpreadElement: function (argument) {
-            this.type = Syntax.SpreadElement;
-            this.argument = argument;
-            this.finish();
-            return this;
-        },
-
-        finishSwitchCase: function (test, consequent) {
-            this.type = Syntax.SwitchCase;
-            this.test = test;
-            this.consequent = consequent;
-            this.finish();
-            return this;
-        },
-
-        finishSuper: function () {
-            this.type = Syntax.Super;
-            this.finish();
-            return this;
-        },
-
-        finishSwitchStatement: function (discriminant, cases) {
-            this.type = Syntax.SwitchStatement;
-            this.discriminant = discriminant;
-            this.cases = cases;
-            this.finish();
-            return this;
-        },
-
-        finishTaggedTemplateExpression: function (tag, quasi) {
-            this.type = Syntax.TaggedTemplateExpression;
-            this.tag = tag;
-            this.quasi = quasi;
-            this.finish();
-            return this;
-        },
-
-        finishTemplateElement: function (value, tail) {
-            this.type = Syntax.TemplateElement;
-            this.value = value;
-            this.tail = tail;
-            this.finish();
-            return this;
-        },
-
-        finishTemplateLiteral: function (quasis, expressions) {
-            this.type = Syntax.TemplateLiteral;
-            this.quasis = quasis;
-            this.expressions = expressions;
-            this.finish();
-            return this;
-        },
-
-        finishThisExpression: function () {
-            this.type = Syntax.ThisExpression;
-            this.finish();
-            return this;
-        },
-
-        finishThrowStatement: function (argument) {
-            this.type = Syntax.ThrowStatement;
-            this.argument = argument;
-            this.finish();
-            return this;
-        },
-
-        finishTryStatement: function (block, handler, finalizer) {
-            this.type = Syntax.TryStatement;
-            this.block = block;
-            this.guardedHandlers = [];
-            this.handlers = handler ? [handler] : [];
-            this.handler = handler;
-            this.finalizer = finalizer;
-            this.finish();
-            return this;
-        },
-
-        finishUnaryExpression: function (operator, argument) {
-            this.type = (operator === '++' || operator === '--') ? Syntax.UpdateExpression : Syntax.UnaryExpression;
-            this.operator = operator;
-            this.argument = argument;
-            this.prefix = true;
-            this.finish();
-            return this;
-        },
-
-        finishVariableDeclaration: function (declarations) {
-            this.type = Syntax.VariableDeclaration;
-            this.declarations = declarations;
-            this.kind = 'var';
-            this.finish();
-            return this;
-        },
-
-        finishLexicalDeclaration: function (declarations, kind) {
-            this.type = Syntax.VariableDeclaration;
-            this.declarations = declarations;
-            this.kind = kind;
-            this.finish();
-            return this;
-        },
-
-        finishVariableDeclarator: function (id, init) {
-            this.type = Syntax.VariableDeclarator;
-            this.id = id;
-            this.init = init;
-            this.finish();
-            return this;
-        },
-
-        finishWhileStatement: function (test, body) {
-            this.type = Syntax.WhileStatement;
-            this.test = test;
-            this.body = body;
-            this.finish();
-            return this;
-        },
-
-        finishWithStatement: function (object, body) {
-            this.type = Syntax.WithStatement;
-            this.object = object;
-            this.body = body;
-            this.finish();
-            return this;
-        },
-
-        finishExportSpecifier: function (local, exported) {
-            this.type = Syntax.ExportSpecifier;
-            this.exported = exported || local;
-            this.local = local;
-            this.finish();
-            return this;
-        },
-
-        finishImportDefaultSpecifier: function (local) {
-            this.type = Syntax.ImportDefaultSpecifier;
-            this.local = local;
-            this.finish();
-            return this;
-        },
-
-        finishImportNamespaceSpecifier: function (local) {
-            this.type = Syntax.ImportNamespaceSpecifier;
-            this.local = local;
-            this.finish();
-            return this;
-        },
-
-        finishExportNamedDeclaration: function (declaration, specifiers, src) {
-            this.type = Syntax.ExportNamedDeclaration;
-            this.declaration = declaration;
-            this.specifiers = specifiers;
-            this.source = src;
-            this.finish();
-            return this;
-        },
-
-        finishExportDefaultDeclaration: function (declaration) {
-            this.type = Syntax.ExportDefaultDeclaration;
-            this.declaration = declaration;
-            this.finish();
-            return this;
-        },
-
-        finishExportAllDeclaration: function (src) {
-            this.type = Syntax.ExportAllDeclaration;
-            this.source = src;
-            this.finish();
-            return this;
-        },
-
-        finishImportSpecifier: function (local, imported) {
-            this.type = Syntax.ImportSpecifier;
-            this.local = local || imported;
-            this.imported = imported;
-            this.finish();
-            return this;
-        },
-
-        finishImportDeclaration: function (specifiers, src) {
-            this.type = Syntax.ImportDeclaration;
-            this.specifiers = specifiers;
-            this.source = src;
-            this.finish();
-            return this;
-        },
-
-        finishYieldExpression: function (argument, delegate) {
-            this.type = Syntax.YieldExpression;
-            this.argument = argument;
-            this.delegate = delegate;
-            this.finish();
-            return this;
-        }
-    };
-
-
-    function recordError(error) {
-        var e, existing;
-
-        for (e = 0; e < extra.errors.length; e++) {
-            existing = extra.errors[e];
-            // Prevent duplicated error.
-            /* istanbul ignore next */
-            if (existing.index === error.index && existing.message === error.message) {
-                return;
-            }
-        }
-
-        extra.errors.push(error);
-    }
-
-    function constructError(msg, column) {
-        var error = new Error(msg);
-        try {
-            throw error;
-        } catch (base) {
-            /* istanbul ignore else */
-            if (Object.create && Object.defineProperty) {
-                error = Object.create(base);
-                Object.defineProperty(error, 'column', { value: column });
-            }
-        } finally {
-            return error;
-        }
-    }
-
-    function createError(line, pos, description) {
-        var msg, column, error;
-
-        msg = 'Line ' + line + ': ' + description;
-        column = pos - (scanning ? lineStart : lastLineStart) + 1;
-        error = constructError(msg, column);
-        error.lineNumber = line;
-        error.description = description;
-        error.index = pos;
-        return error;
-    }
-
-    // Throw an exception
-
-    function throwError(messageFormat) {
-        var args, msg;
-
-        args = Array.prototype.slice.call(arguments, 1);
-        msg = messageFormat.replace(/%(\d)/g,
-            function (whole, idx) {
-                assert(idx < args.length, 'Message reference must be in range');
-                return args[idx];
-            }
-        );
-
-        throw createError(lastLineNumber, lastIndex, msg);
-    }
-
-    function tolerateError(messageFormat) {
-        var args, msg, error;
-
-        args = Array.prototype.slice.call(arguments, 1);
-        /* istanbul ignore next */
-        msg = messageFormat.replace(/%(\d)/g,
-            function (whole, idx) {
-                assert(idx < args.length, 'Message reference must be in range');
-                return args[idx];
-            }
-        );
-
-        error = createError(lineNumber, lastIndex, msg);
-        if (extra.errors) {
-            recordError(error);
-        } else {
-            throw error;
-        }
-    }
-
-    // Throw an exception because of the token.
-
-    function unexpectedTokenError(token, message) {
-        var value, msg = message || Messages.UnexpectedToken;
-
-        if (token) {
-            if (!message) {
-                msg = (token.type === Token.EOF) ? Messages.UnexpectedEOS :
-                    (token.type === Token.Identifier) ? Messages.UnexpectedIdentifier :
-                    (token.type === Token.NumericLiteral) ? Messages.UnexpectedNumber :
-                    (token.type === Token.StringLiteral) ? Messages.UnexpectedString :
-                    (token.type === Token.Template) ? Messages.UnexpectedTemplate :
-                    Messages.UnexpectedToken;
-
-                if (token.type === Token.Keyword) {
-                    if (isFutureReservedWord(token.value)) {
-                        msg = Messages.UnexpectedReserved;
-                    } else if (strict && isStrictModeReservedWord(token.value)) {
-                        msg = Messages.StrictReservedWord;
-                    }
-                }
-            }
-
-            value = (token.type === Token.Template) ? token.value.raw : token.value;
-        } else {
-            value = 'ILLEGAL';
-        }
-
-        msg = msg.replace('%0', value);
-
-        return (token && typeof token.lineNumber === 'number') ?
-            createError(token.lineNumber, token.start, msg) :
-            createError(scanning ? lineNumber : lastLineNumber, scanning ? index : lastIndex, msg);
-    }
-
-    function throwUnexpectedToken(token, message) {
-        throw unexpectedTokenError(token, message);
-    }
-
-    function tolerateUnexpectedToken(token, message) {
-        var error = unexpectedTokenError(token, message);
-        if (extra.errors) {
-            recordError(error);
-        } else {
-            throw error;
-        }
-    }
-
-    // Expect the next token to match the specified punctuator.
-    // If not, an exception will be thrown.
-
-    function expect(value) {
-        var token = lex();
-        if (token.type !== Token.Punctuator || token.value !== value) {
-            throwUnexpectedToken(token);
-        }
-    }
-
-    /**
-     * @name expectCommaSeparator
-     * @description Quietly expect a comma when in tolerant mode, otherwise delegates
-     * to <code>expect(value)</code>
-     * @since 2.0
-     */
-    function expectCommaSeparator() {
-        var token;
-
-        if (extra.errors) {
-            token = lookahead;
-            if (token.type === Token.Punctuator && token.value === ',') {
-                lex();
-            } else if (token.type === Token.Punctuator && token.value === ';') {
-                lex();
-                tolerateUnexpectedToken(token);
-            } else {
-                tolerateUnexpectedToken(token, Messages.UnexpectedToken);
-            }
-        } else {
-            expect(',');
-        }
-    }
-
-    // Expect the next token to match the specified keyword.
-    // If not, an exception will be thrown.
-
-    function expectKeyword(keyword) {
-        var token = lex();
-        if (token.type !== Token.Keyword || token.value !== keyword) {
-            throwUnexpectedToken(token);
-        }
-    }
-
-    // Return true if the next token matches the specified punctuator.
-
-    function match(value) {
-        return lookahead.type === Token.Punctuator && lookahead.value === value;
-    }
-
-    // Return true if the next token matches the specified keyword
-
-    function matchKeyword(keyword) {
-        return lookahead.type === Token.Keyword && lookahead.value === keyword;
-    }
-
-    // Return true if the next token matches the specified contextual keyword
-    // (where an identifier is sometimes a keyword depending on the context)
-
-    function matchContextualKeyword(keyword) {
-        return lookahead.type === Token.Identifier && lookahead.value === keyword;
-    }
-
-    // Return true if the next token is an assignment operator
-
-    function matchAssign() {
-        var op;
-
-        if (lookahead.type !== Token.Punctuator) {
-            return false;
-        }
-        op = lookahead.value;
-        return op === '=' ||
-            op === '*=' ||
-            op === '/=' ||
-            op === '%=' ||
-            op === '+=' ||
-            op === '-=' ||
-            op === '<<=' ||
-            op === '>>=' ||
-            op === '>>>=' ||
-            op === '&=' ||
-            op === '^=' ||
-            op === '|=';
-    }
-
-    function consumeSemicolon() {
-        // Catch the very common case first: immediately a semicolon (U+003B).
-        if (source.charCodeAt(startIndex) === 0x3B || match(';')) {
-            lex();
-            return;
-        }
-
-        if (hasLineTerminator) {
-            return;
-        }
-
-        // FIXME(ikarienator): this is seemingly an issue in the previous location info convention.
-        lastIndex = startIndex;
-        lastLineNumber = startLineNumber;
-        lastLineStart = startLineStart;
-
-        if (lookahead.type !== Token.EOF && !match('}')) {
-            throwUnexpectedToken(lookahead);
-        }
-    }
-
-    // Cover grammar support.
-    //
-    // When an assignment expression position starts with an left parenthesis, the determination of the type
-    // of the syntax is to be deferred arbitrarily long until the end of the parentheses pair (plus a lookahead)
-    // or the first comma. This situation also defers the determination of all the expressions nested in the pair.
-    //
-    // There are three productions that can be parsed in a parentheses pair that needs to be determined
-    // after the outermost pair is closed. They are:
-    //
-    //   1. AssignmentExpression
-    //   2. BindingElements
-    //   3. AssignmentTargets
-    //
-    // In order to avoid exponential backtracking, we use two flags to denote if the production can be
-    // binding element or assignment target.
-    //
-    // The three productions have the relationship:
-    //
-    //   BindingElements ⊆ AssignmentTargets ⊆ AssignmentExpression
-    //
-    // with a single exception that CoverInitializedName when used directly in an Expression, generates
-    // an early error. Therefore, we need the third state, firstCoverInitializedNameError, to track the
-    // first usage of CoverInitializedName and report it when we reached the end of the parentheses pair.
-    //
-    // isolateCoverGrammar function runs the given parser function with a new cover grammar context, and it does not
-    // effect the current flags. This means the production the parser parses is only used as an expression. Therefore
-    // the CoverInitializedName check is conducted.
-    //
-    // inheritCoverGrammar function runs the given parse function with a new cover grammar context, and it propagates
-    // the flags outside of the parser. This means the production the parser parses is used as a part of a potential
-    // pattern. The CoverInitializedName check is deferred.
-    function isolateCoverGrammar(parser) {
-        var oldIsBindingElement = isBindingElement,
-            oldIsAssignmentTarget = isAssignmentTarget,
-            oldFirstCoverInitializedNameError = firstCoverInitializedNameError,
-            result;
-        isBindingElement = true;
-        isAssignmentTarget = true;
-        firstCoverInitializedNameError = null;
-        result = parser();
-        if (firstCoverInitializedNameError !== null) {
-            throwUnexpectedToken(firstCoverInitializedNameError);
-        }
-        isBindingElement = oldIsBindingElement;
-        isAssignmentTarget = oldIsAssignmentTarget;
-        firstCoverInitializedNameError = oldFirstCoverInitializedNameError;
-        return result;
-    }
-
-    function inheritCoverGrammar(parser) {
-        var oldIsBindingElement = isBindingElement,
-            oldIsAssignmentTarget = isAssignmentTarget,
-            oldFirstCoverInitializedNameError = firstCoverInitializedNameError,
-            result;
-        isBindingElement = true;
-        isAssignmentTarget = true;
-        firstCoverInitializedNameError = null;
-        result = parser();
-        isBindingElement = isBindingElement && oldIsBindingElement;
-        isAssignmentTarget = isAssignmentTarget && oldIsAssignmentTarget;
-        firstCoverInitializedNameError = oldFirstCoverInitializedNameError || firstCoverInitializedNameError;
-        return result;
-    }
-
-    // ECMA-262 13.3.3 Destructuring Binding Patterns
-
-    function parseArrayPattern(params, kind) {
-        var node = new Node(), elements = [], rest, restNode;
-        expect('[');
-
-        while (!match(']')) {
-            if (match(',')) {
-                lex();
-                elements.push(null);
-            } else {
-                if (match('...')) {
-                    restNode = new Node();
-                    lex();
-                    params.push(lookahead);
-                    rest = parseVariableIdentifier(kind);
-                    elements.push(restNode.finishRestElement(rest));
-                    break;
-                } else {
-                    elements.push(parsePatternWithDefault(params, kind));
-                }
-                if (!match(']')) {
-                    expect(',');
-                }
-            }
-
-        }
-
-        expect(']');
-
-        return node.finishArrayPattern(elements);
-    }
-
-    function parsePropertyPattern(params, kind) {
-        var node = new Node(), key, keyToken, computed = match('['), init;
-        if (lookahead.type === Token.Identifier) {
-            keyToken = lookahead;
-            key = parseVariableIdentifier();
-            if (match('=')) {
-                params.push(keyToken);
-                lex();
-                init = parseAssignmentExpression();
-
-                return node.finishProperty(
-                    'init', key, false,
-                    new WrappingNode(keyToken).finishAssignmentPattern(key, init), false, false);
-            } else if (!match(':')) {
-                params.push(keyToken);
-                return node.finishProperty('init', key, false, key, false, true);
-            }
-        } else {
-            key = parseObjectPropertyKey();
-        }
-        expect(':');
-        init = parsePatternWithDefault(params, kind);
-        return node.finishProperty('init', key, computed, init, false, false);
-    }
-
-    function parseObjectPattern(params, kind) {
-        var node = new Node(), properties = [];
-
-        expect('{');
-
-        while (!match('}')) {
-            properties.push(parsePropertyPattern(params, kind));
-            if (!match('}')) {
-                expect(',');
-            }
-        }
-
-        lex();
-
-        return node.finishObjectPattern(properties);
-    }
-
-    function parsePattern(params, kind) {
-        if (match('[')) {
-            return parseArrayPattern(params, kind);
-        } else if (match('{')) {
-            return parseObjectPattern(params, kind);
-        } else if (matchKeyword('let')) {
-            if (kind === 'const' || kind === 'let') {
-                tolerateUnexpectedToken(lookahead, Messages.UnexpectedToken);
-            }
-        }
-
-        params.push(lookahead);
-        return parseVariableIdentifier(kind);
-    }
-
-    function parsePatternWithDefault(params, kind) {
-        var startToken = lookahead, pattern, previousAllowYield, right;
-        pattern = parsePattern(params, kind);
-        if (match('=')) {
-            lex();
-            previousAllowYield = state.allowYield;
-            state.allowYield = true;
-            right = isolateCoverGrammar(parseAssignmentExpression);
-            state.allowYield = previousAllowYield;
-            pattern = new WrappingNode(startToken).finishAssignmentPattern(pattern, right);
-        }
-        return pattern;
-    }
-
-    // ECMA-262 12.2.5 Array Initializer
-
-    function parseArrayInitializer() {
-        var elements = [], node = new Node(), restSpread;
-
-        expect('[');
-
-        while (!match(']')) {
-            if (match(',')) {
-                lex();
-                elements.push(null);
-            } else if (match('...')) {
-                restSpread = new Node();
-                lex();
-                restSpread.finishSpreadElement(inheritCoverGrammar(parseAssignmentExpression));
-
-                if (!match(']')) {
-                    isAssignmentTarget = isBindingElement = false;
-                    expect(',');
-                }
-                elements.push(restSpread);
-            } else {
-                elements.push(inheritCoverGrammar(parseAssignmentExpression));
-
-                if (!match(']')) {
-                    expect(',');
-                }
-            }
-        }
-
-        lex();
-
-        return node.finishArrayExpression(elements);
-    }
-
-    // ECMA-262 12.2.6 Object Initializer
-
-    function parsePropertyFunction(node, paramInfo, isGenerator) {
-        var previousStrict, body;
-
-        isAssignmentTarget = isBindingElement = false;
-
-        previousStrict = strict;
-        body = isolateCoverGrammar(parseFunctionSourceElements);
-
-        if (strict && paramInfo.firstRestricted) {
-            tolerateUnexpectedToken(paramInfo.firstRestricted, paramInfo.message);
-        }
-        if (strict && paramInfo.stricted) {
-            tolerateUnexpectedToken(paramInfo.stricted, paramInfo.message);
-        }
-
-        strict = previousStrict;
-        return node.finishFunctionExpression(null, paramInfo.params, paramInfo.defaults, body, isGenerator);
-    }
-
-    function parsePropertyMethodFunction() {
-        var params, method, node = new Node(),
-            previousAllowYield = state.allowYield;
-
-        state.allowYield = false;
-        params = parseParams();
-        state.allowYield = previousAllowYield;
-
-        state.allowYield = false;
-        method = parsePropertyFunction(node, params, false);
-        state.allowYield = previousAllowYield;
-
-        return method;
-    }
-
-    function parseObjectPropertyKey() {
-        var token, node = new Node(), expr;
-
-        token = lex();
-
-        // Note: This function is called only from parseObjectProperty(), where
-        // EOF and Punctuator tokens are already filtered out.
-
-        switch (token.type) {
-        case Token.StringLiteral:
-        case Token.NumericLiteral:
-            if (strict && token.octal) {
-                tolerateUnexpectedToken(token, Messages.StrictOctalLiteral);
-            }
-            return node.finishLiteral(token);
-        case Token.Identifier:
-        case Token.BooleanLiteral:
-        case Token.NullLiteral:
-        case Token.Keyword:
-            return node.finishIdentifier(token.value);
-        case Token.Punctuator:
-            if (token.value === '[') {
-                expr = isolateCoverGrammar(parseAssignmentExpression);
-                expect(']');
-                return expr;
-            }
-            break;
-        }
-        throwUnexpectedToken(token);
-    }
-
-    function lookaheadPropertyName() {
-        switch (lookahead.type) {
-        case Token.Identifier:
-        case Token.StringLiteral:
-        case Token.BooleanLiteral:
-        case Token.NullLiteral:
-        case Token.NumericLiteral:
-        case Token.Keyword:
-            return true;
-        case Token.Punctuator:
-            return lookahead.value === '[';
-        }
-        return false;
-    }
-
-    // This function is to try to parse a MethodDefinition as defined in 14.3. But in the case of object literals,
-    // it might be called at a position where there is in fact a short hand identifier pattern or a data property.
-    // This can only be determined after we consumed up to the left parentheses.
-    //
-    // In order to avoid back tracking, it returns `null` if the position is not a MethodDefinition and the caller
-    // is responsible to visit other options.
-    function tryParseMethodDefinition(token, key, computed, node) {
-        var value, options, methodNode, params,
-            previousAllowYield = state.allowYield;
-
-        if (token.type === Token.Identifier) {
-            // check for `get` and `set`;
-
-            if (token.value === 'get' && lookaheadPropertyName()) {
-                computed = match('[');
-                key = parseObjectPropertyKey();
-                methodNode = new Node();
-                expect('(');
-                expect(')');
-
-                state.allowYield = false;
-                value = parsePropertyFunction(methodNode, {
-                    params: [],
-                    defaults: [],
-                    stricted: null,
-                    firstRestricted: null,
-                    message: null
-                }, false);
-                state.allowYield = previousAllowYield;
-
-                return node.finishProperty('get', key, computed, value, false, false);
-            } else if (token.value === 'set' && lookaheadPropertyName()) {
-                computed = match('[');
-                key = parseObjectPropertyKey();
-                methodNode = new Node();
-                expect('(');
-
-                options = {
-                    params: [],
-                    defaultCount: 0,
-                    defaults: [],
-                    firstRestricted: null,
-                    paramSet: {}
-                };
-                if (match(')')) {
-                    tolerateUnexpectedToken(lookahead);
-                } else {
-                    state.allowYield = false;
-                    parseParam(options);
-                    state.allowYield = previousAllowYield;
-                    if (options.defaultCount === 0) {
-                        options.defaults = [];
-                    }
-                }
-                expect(')');
-
-                state.allowYield = false;
-                value = parsePropertyFunction(methodNode, options, false);
-                state.allowYield = previousAllowYield;
-
-                return node.finishProperty('set', key, computed, value, false, false);
-            }
-        } else if (token.type === Token.Punctuator && token.value === '*' && lookaheadPropertyName()) {
-            computed = match('[');
-            key = parseObjectPropertyKey();
-            methodNode = new Node();
-
-            state.allowYield = true;
-            params = parseParams();
-            state.allowYield = previousAllowYield;
-
-            state.allowYield = false;
-            value = parsePropertyFunction(methodNode, params, true);
-            state.allowYield = previousAllowYield;
-
-            return node.finishProperty('init', key, computed, value, true, false);
-        }
-
-        if (key && match('(')) {
-            value = parsePropertyMethodFunction();
-            return node.finishProperty('init', key, computed, value, true, false);
-        }
-
-        // Not a MethodDefinition.
-        return null;
-    }
-
-    function parseObjectProperty(hasProto) {
-        var token = lookahead, node = new Node(), computed, key, maybeMethod, proto, value;
-
-        computed = match('[');
-        if (match('*')) {
-            lex();
-        } else {
-            key = parseObjectPropertyKey();
-        }
-        maybeMethod = tryParseMethodDefinition(token, key, computed, node);
-        if (maybeMethod) {
-            return maybeMethod;
-        }
-
-        if (!key) {
-            throwUnexpectedToken(lookahead);
-        }
-
-        // Check for duplicated __proto__
-        if (!computed) {
-            proto = (key.type === Syntax.Identifier && key.name === '__proto__') ||
-                (key.type === Syntax.Literal && key.value === '__proto__');
-            if (hasProto.value && proto) {
-                tolerateError(Messages.DuplicateProtoProperty);
-            }
-            hasProto.value |= proto;
-        }
-
-        if (match(':')) {
-            lex();
-            value = inheritCoverGrammar(parseAssignmentExpression);
-            return node.finishProperty('init', key, computed, value, false, false);
-        }
-
-        if (token.type === Token.Identifier) {
-            if (match('=')) {
-                firstCoverInitializedNameError = lookahead;
-                lex();
-                value = isolateCoverGrammar(parseAssignmentExpression);
-                return node.finishProperty('init', key, computed,
-                    new WrappingNode(token).finishAssignmentPattern(key, value), false, true);
-            }
-            return node.finishProperty('init', key, computed, key, false, true);
-        }
-
-        throwUnexpectedToken(lookahead);
-    }
-
-    function parseObjectInitializer() {
-        var properties = [], hasProto = {value: false}, node = new Node();
-
-        expect('{');
-
-        while (!match('}')) {
-            properties.push(parseObjectProperty(hasProto));
-
-            if (!match('}')) {
-                expectCommaSeparator();
-            }
-        }
-
-        expect('}');
-
-        return node.finishObjectExpression(properties);
-    }
-
-    function reinterpretExpressionAsPattern(expr) {
-        var i;
-        switch (expr.type) {
-        case Syntax.Identifier:
-        case Syntax.MemberExpression:
-        case Syntax.RestElement:
-        case Syntax.AssignmentPattern:
-            break;
-        case Syntax.SpreadElement:
-            expr.type = Syntax.RestElement;
-            reinterpretExpressionAsPattern(expr.argument);
-            break;
-        case Syntax.ArrayExpression:
-            expr.type = Syntax.ArrayPattern;
-            for (i = 0; i < expr.elements.length; i++) {
-                if (expr.elements[i] !== null) {
-                    reinterpretExpressionAsPattern(expr.elements[i]);
-                }
-            }
-            break;
-        case Syntax.ObjectExpression:
-            expr.type = Syntax.ObjectPattern;
-            for (i = 0; i < expr.properties.length; i++) {
-                reinterpretExpressionAsPattern(expr.properties[i].value);
-            }
-            break;
-        case Syntax.AssignmentExpression:
-            expr.type = Syntax.AssignmentPattern;
-            reinterpretExpressionAsPattern(expr.left);
-            break;
-        default:
-            // Allow other node type for tolerant parsing.
-            break;
-        }
-    }
-
-    // ECMA-262 12.2.9 Template Literals
-
-    function parseTemplateElement(option) {
-        var node, token;
-
-        if (lookahead.type !== Token.Template || (option.head && !lookahead.head)) {
-            throwUnexpectedToken();
-        }
-
-        node = new Node();
-        token = lex();
-
-        return node.finishTemplateElement({ raw: token.value.raw, cooked: token.value.cooked }, token.tail);
-    }
-
-    function parseTemplateLiteral() {
-        var quasi, quasis, expressions, node = new Node();
-
-        quasi = parseTemplateElement({ head: true });
-        quasis = [quasi];
-        expressions = [];
-
-        while (!quasi.tail) {
-            expressions.push(parseExpression());
-            quasi = parseTemplateElement({ head: false });
-            quasis.push(quasi);
-        }
-
-        return node.finishTemplateLiteral(quasis, expressions);
-    }
-
-    // ECMA-262 12.2.10 The Grouping Operator
-
-    function parseGroupExpression() {
-        var expr, expressions, startToken, i, params = [];
-
-        expect('(');
-
-        if (match(')')) {
-            lex();
-            if (!match('=>')) {
-                expect('=>');
-            }
-            return {
-                type: PlaceHolders.ArrowParameterPlaceHolder,
-                params: [],
-                rawParams: []
-            };
-        }
-
-        startToken = lookahead;
-        if (match('...')) {
-            expr = parseRestElement(params);
-            expect(')');
-            if (!match('=>')) {
-                expect('=>');
-            }
-            return {
-                type: PlaceHolders.ArrowParameterPlaceHolder,
-                params: [expr]
-            };
-        }
-
-        isBindingElement = true;
-        expr = inheritCoverGrammar(parseAssignmentExpression);
-
-        if (match(',')) {
-            isAssignmentTarget = false;
-            expressions = [expr];
-
-            while (startIndex < length) {
-                if (!match(',')) {
-                    break;
-                }
-                lex();
-
-                if (match('...')) {
-                    if (!isBindingElement) {
-                        throwUnexpectedToken(lookahead);
-                    }
-                    expressions.push(parseRestElement(params));
-                    expect(')');
-                    if (!match('=>')) {
-                        expect('=>');
-                    }
-                    isBindingElement = false;
-                    for (i = 0; i < expressions.length; i++) {
-                        reinterpretExpressionAsPattern(expressions[i]);
-                    }
-                    return {
-                        type: PlaceHolders.ArrowParameterPlaceHolder,
-                        params: expressions
-                    };
-                }
-
-                expressions.push(inheritCoverGrammar(parseAssignmentExpression));
-            }
-
-            expr = new WrappingNode(startToken).finishSequenceExpression(expressions);
-        }
-
-
-        expect(')');
-
-        if (match('=>')) {
-            if (expr.type === Syntax.Identifier && expr.name === 'yield') {
-                return {
-                    type: PlaceHolders.ArrowParameterPlaceHolder,
-                    params: [expr]
-                };
-            }
-
-            if (!isBindingElement) {
-                throwUnexpectedToken(lookahead);
-            }
-
-            if (expr.type === Syntax.SequenceExpression) {
-                for (i = 0; i < expr.expressions.length; i++) {
-                    reinterpretExpressionAsPattern(expr.expressions[i]);
-                }
-            } else {
-                reinterpretExpressionAsPattern(expr);
-            }
-
-            expr = {
-                type: PlaceHolders.ArrowParameterPlaceHolder,
-                params: expr.type === Syntax.SequenceExpression ? expr.expressions : [expr]
-            };
-        }
-        isBindingElement = false;
-        return expr;
-    }
-
-
-    // ECMA-262 12.2 Primary Expressions
-
-    function parsePrimaryExpression() {
-        var type, token, expr, node;
-
-        if (match('(')) {
-            isBindingElement = false;
-            return inheritCoverGrammar(parseGroupExpression);
-        }
-
-        if (match('[')) {
-            return inheritCoverGrammar(parseArrayInitializer);
-        }
-
-        if (match('{')) {
-            return inheritCoverGrammar(parseObjectInitializer);
-        }
-
-        type = lookahead.type;
-        node = new Node();
-
-        if (type === Token.Identifier) {
-            if (state.sourceType === 'module' && lookahead.value === 'await') {
-                tolerateUnexpectedToken(lookahead);
-            }
-            expr = node.finishIdentifier(lex().value);
-        } else if (type === Token.StringLiteral || type === Token.NumericLiteral) {
-            isAssignmentTarget = isBindingElement = false;
-            if (strict && lookahead.octal) {
-                tolerateUnexpectedToken(lookahead, Messages.StrictOctalLiteral);
-            }
-            expr = node.finishLiteral(lex());
-        } else if (type === Token.Keyword) {
-            if (!strict && state.allowYield && matchKeyword('yield')) {
-                return parseNonComputedProperty();
-            }
-            if (!strict && matchKeyword('let')) {
-                return node.finishIdentifier(lex().value);
-            }
-            isAssignmentTarget = isBindingElement = false;
-            if (matchKeyword('function')) {
-                return parseFunctionExpression();
-            }
-            if (matchKeyword('this')) {
-                lex();
-                return node.finishThisExpression();
-            }
-            if (matchKeyword('class')) {
-                return parseClassExpression();
-            }
-            throwUnexpectedToken(lex());
-        } else if (type === Token.BooleanLiteral) {
-            isAssignmentTarget = isBindingElement = false;
-            token = lex();
-            token.value = (token.value === 'true');
-            expr = node.finishLiteral(token);
-        } else if (type === Token.NullLiteral) {
-            isAssignmentTarget = isBindingElement = false;
-            token = lex();
-            token.value = null;
-            expr = node.finishLiteral(token);
-        } else if (match('/') || match('/=')) {
-            isAssignmentTarget = isBindingElement = false;
-            index = startIndex;
-
-            if (typeof extra.tokens !== 'undefined') {
-                token = collectRegex();
-            } else {
-                token = scanRegExp();
-            }
-            lex();
-            expr = node.finishLiteral(token);
-        } else if (type === Token.Template) {
-            expr = parseTemplateLiteral();
-        } else {
-            throwUnexpectedToken(lex());
-        }
-
-        return expr;
-    }
-
-    // ECMA-262 12.3 Left-Hand-Side Expressions
-
-    function parseArguments() {
-        var args = [], expr;
-
-        expect('(');
-
-        if (!match(')')) {
-            while (startIndex < length) {
-                if (match('...')) {
-                    expr = new Node();
-                    lex();
-                    expr.finishSpreadElement(isolateCoverGrammar(parseAssignmentExpression));
-                } else {
-                    expr = isolateCoverGrammar(parseAssignmentExpression);
-                }
-                args.push(expr);
-                if (match(')')) {
-                    break;
-                }
-                expectCommaSeparator();
-            }
-        }
-
-        expect(')');
-
-        return args;
-    }
-
-    function parseNonComputedProperty() {
-        var token, node = new Node();
-
-        token = lex();
-
-        if (!isIdentifierName(token)) {
-            throwUnexpectedToken(token);
-        }
-
-        return node.finishIdentifier(token.value);
-    }
-
-    function parseNonComputedMember() {
-        expect('.');
-
-        return parseNonComputedProperty();
-    }
-
-    function parseComputedMember() {
-        var expr;
-
-        expect('[');
-
-        expr = isolateCoverGrammar(parseExpression);
-
-        expect(']');
-
-        return expr;
-    }
-
-    // ECMA-262 12.3.3 The new Operator
-
-    function parseNewExpression() {
-        var callee, args, node = new Node();
-
-        expectKeyword('new');
-
-        if (match('.')) {
-            lex();
-            if (lookahead.type === Token.Identifier && lookahead.value === 'target') {
-                if (state.inFunctionBody) {
-                    lex();
-                    return node.finishMetaProperty('new', 'target');
-                }
-            }
-            throwUnexpectedToken(lookahead);
-        }
-
-        callee = isolateCoverGrammar(parseLeftHandSideExpression);
-        args = match('(') ? parseArguments() : [];
-
-        isAssignmentTarget = isBindingElement = false;
-
-        return node.finishNewExpression(callee, args);
-    }
-
-    // ECMA-262 12.3.4 Function Calls
-
-    function parseLeftHandSideExpressionAllowCall() {
-        var quasi, expr, args, property, startToken, previousAllowIn = state.allowIn;
-
-        startToken = lookahead;
-        state.allowIn = true;
-
-        if (matchKeyword('super') && state.inFunctionBody) {
-            expr = new Node();
-            lex();
-            expr = expr.finishSuper();
-            if (!match('(') && !match('.') && !match('[')) {
-                throwUnexpectedToken(lookahead);
-            }
-        } else {
-            expr = inheritCoverGrammar(matchKeyword('new') ? parseNewExpression : parsePrimaryExpression);
-        }
-
-        for (;;) {
-            if (match('.')) {
-                isBindingElement = false;
-                isAssignmentTarget = true;
-                property = parseNonComputedMember();
-                expr = new WrappingNode(startToken).finishMemberExpression('.', expr, property);
-            } else if (match('(')) {
-                isBindingElement = false;
-                isAssignmentTarget = false;
-                args = parseArguments();
-                expr = new WrappingNode(startToken).finishCallExpression(expr, args);
-            } else if (match('[')) {
-                isBindingElement = false;
-                isAssignmentTarget = true;
-                property = parseComputedMember();
-                expr = new WrappingNode(startToken).finishMemberExpression('[', expr, property);
-            } else if (lookahead.type === Token.Template && lookahead.head) {
-                quasi = parseTemplateLiteral();
-                expr = new WrappingNode(startToken).finishTaggedTemplateExpression(expr, quasi);
-            } else {
-                break;
-            }
-        }
-        state.allowIn = previousAllowIn;
-
-        return expr;
-    }
-
-    // ECMA-262 12.3 Left-Hand-Side Expressions
-
-    function parseLeftHandSideExpression() {
-        var quasi, expr, property, startToken;
-        assert(state.allowIn, 'callee of new expression always allow in keyword.');
-
-        startToken = lookahead;
-
-        if (matchKeyword('super') && state.inFunctionBody) {
-            expr = new Node();
-            lex();
-            expr = expr.finishSuper();
-            if (!match('[') && !match('.')) {
-                throwUnexpectedToken(lookahead);
-            }
-        } else {
-            expr = inheritCoverGrammar(matchKeyword('new') ? parseNewExpression : parsePrimaryExpression);
-        }
-
-        for (;;) {
-            if (match('[')) {
-                isBindingElement = false;
-                isAssignmentTarget = true;
-                property = parseComputedMember();
-                expr = new WrappingNode(startToken).finishMemberExpression('[', expr, property);
-            } else if (match('.')) {
-                isBindingElement = false;
-                isAssignmentTarget = true;
-                property = parseNonComputedMember();
-                expr = new WrappingNode(startToken).finishMemberExpression('.', expr, property);
-            } else if (lookahead.type === Token.Template && lookahead.head) {
-                quasi = parseTemplateLiteral();
-                expr = new WrappingNode(startToken).finishTaggedTemplateExpression(expr, quasi);
-            } else {
-                break;
-            }
-        }
-        return expr;
-    }
-
-    // ECMA-262 12.4 Postfix Expressions
-
-    function parsePostfixExpression() {
-        var expr, token, startToken = lookahead;
-
-        expr = inheritCoverGrammar(parseLeftHandSideExpressionAllowCall);
-
-        if (!hasLineTerminator && lookahead.type === Token.Punctuator) {
-            if (match('++') || match('--')) {
-                // ECMA-262 11.3.1, 11.3.2
-                if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
-                    tolerateError(Messages.StrictLHSPostfix);
-                }
-
-                if (!isAssignmentTarget) {
-                    tolerateError(Messages.InvalidLHSInAssignment);
-                }
-
-                isAssignmentTarget = isBindingElement = false;
-
-                token = lex();
-                expr = new WrappingNode(startToken).finishPostfixExpression(token.value, expr);
-            }
-        }
-
-        return expr;
-    }
-
-    // ECMA-262 12.5 Unary Operators
-
-    function parseUnaryExpression() {
-        var token, expr, startToken;
-
-        if (lookahead.type !== Token.Punctuator && lookahead.type !== Token.Keyword) {
-            expr = parsePostfixExpression();
-        } else if (match('++') || match('--')) {
-            startToken = lookahead;
-            token = lex();
-            expr = inheritCoverGrammar(parseUnaryExpression);
-            // ECMA-262 11.4.4, 11.4.5
-            if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
-                tolerateError(Messages.StrictLHSPrefix);
-            }
-
-            if (!isAssignmentTarget) {
-                tolerateError(Messages.InvalidLHSInAssignment);
-            }
-            expr = new WrappingNode(startToken).finishUnaryExpression(token.value, expr);
-            isAssignmentTarget = isBindingElement = false;
-        } else if (match('+') || match('-') || match('~') || match('!')) {
-            startToken = lookahead;
-            token = lex();
-            expr = inheritCoverGrammar(parseUnaryExpression);
-            expr = new WrappingNode(startToken).finishUnaryExpression(token.value, expr);
-            isAssignmentTarget = isBindingElement = false;
-        } else if (matchKeyword('delete') || matchKeyword('void') || matchKeyword('typeof')) {
-            startToken = lookahead;
-            token = lex();
-            expr = inheritCoverGrammar(parseUnaryExpression);
-            expr = new WrappingNode(startToken).finishUnaryExpression(token.value, expr);
-            if (strict && expr.operator === 'delete' && expr.argument.type === Syntax.Identifier) {
-                tolerateError(Messages.StrictDelete);
-            }
-            isAssignmentTarget = isBindingElement = false;
-        } else {
-            expr = parsePostfixExpression();
-        }
-
-        return expr;
-    }
-
-    function binaryPrecedence(token, allowIn) {
-        var prec = 0;
-
-        if (token.type !== Token.Punctuator && token.type !== Token.Keyword) {
-            return 0;
-        }
-
-        switch (token.value) {
-        case '||':
-            prec = 1;
-            break;
-
-        case '&&':
-            prec = 2;
-            break;
-
-        case '|':
-            prec = 3;
-            break;
-
-        case '^':
-            prec = 4;
-            break;
-
-        case '&':
-            prec = 5;
-            break;
-
-        case '==':
-        case '!=':
-        case '===':
-        case '!==':
-            prec = 6;
-            break;
-
-        case '<':
-        case '>':
-        case '<=':
-        case '>=':
-        case 'instanceof':
-            prec = 7;
-            break;
-
-        case 'in':
-            prec = allowIn ? 7 : 0;
-            break;
-
-        case '<<':
-        case '>>':
-        case '>>>':
-            prec = 8;
-            break;
-
-        case '+':
-        case '-':
-            prec = 9;
-            break;
-
-        case '*':
-        case '/':
-        case '%':
-            prec = 11;
-            break;
-
-        default:
-            break;
-        }
-
-        return prec;
-    }
-
-    // ECMA-262 12.6 Multiplicative Operators
-    // ECMA-262 12.7 Additive Operators
-    // ECMA-262 12.8 Bitwise Shift Operators
-    // ECMA-262 12.9 Relational Operators
-    // ECMA-262 12.10 Equality Operators
-    // ECMA-262 12.11 Binary Bitwise Operators
-    // ECMA-262 12.12 Binary Logical Operators
-
-    function parseBinaryExpression() {
-        var marker, markers, expr, token, prec, stack, right, operator, left, i;
-
-        marker = lookahead;
-        left = inheritCoverGrammar(parseUnaryExpression);
-
-        token = lookahead;
-        prec = binaryPrecedence(token, state.allowIn);
-        if (prec === 0) {
-            return left;
-        }
-        isAssignmentTarget = isBindingElement = false;
-        token.prec = prec;
-        lex();
-
-        markers = [marker, lookahead];
-        right = isolateCoverGrammar(parseUnaryExpression);
-
-        stack = [left, token, right];
-
-        while ((prec = binaryPrecedence(lookahead, state.allowIn)) > 0) {
-
-            // Reduce: make a binary expression from the three topmost entries.
-            while ((stack.length > 2) && (prec <= stack[stack.length - 2].prec)) {
-                right = stack.pop();
-                operator = stack.pop().value;
-                left = stack.pop();
-                markers.pop();
-                expr = new WrappingNode(markers[markers.length - 1]).finishBinaryExpression(operator, left, right);
-                stack.push(expr);
-            }
-
-            // Shift.
-            token = lex();
-            token.prec = prec;
-            stack.push(token);
-            markers.push(lookahead);
-            expr = isolateCoverGrammar(parseUnaryExpression);
-            stack.push(expr);
-        }
-
-        // Final reduce to clean-up the stack.
-        i = stack.length - 1;
-        expr = stack[i];
-        markers.pop();
-        while (i > 1) {
-            expr = new WrappingNode(markers.pop()).finishBinaryExpression(stack[i - 1].value, stack[i - 2], expr);
-            i -= 2;
-        }
-
-        return expr;
-    }
-
-
-    // ECMA-262 12.13 Conditional Operator
-
-    function parseConditionalExpression() {
-        var expr, previousAllowIn, consequent, alternate, startToken;
-
-        startToken = lookahead;
-
-        expr = inheritCoverGrammar(parseBinaryExpression);
-        if (match('?')) {
-            lex();
-            previousAllowIn = state.allowIn;
-            state.allowIn = true;
-            consequent = isolateCoverGrammar(parseAssignmentExpression);
-            state.allowIn = previousAllowIn;
-            expect(':');
-            alternate = isolateCoverGrammar(parseAssignmentExpression);
-
-            expr = new WrappingNode(startToken).finishConditionalExpression(expr, consequent, alternate);
-            isAssignmentTarget = isBindingElement = false;
-        }
-
-        return expr;
-    }
-
-    // ECMA-262 14.2 Arrow Function Definitions
-
-    function parseConciseBody() {
-        if (match('{')) {
-            return parseFunctionSourceElements();
-        }
-        return isolateCoverGrammar(parseAssignmentExpression);
-    }
-
-    function checkPatternParam(options, param) {
-        var i;
-        switch (param.type) {
-        case Syntax.Identifier:
-            validateParam(options, param, param.name);
-            break;
-        case Syntax.RestElement:
-            checkPatternParam(options, param.argument);
-            break;
-        case Syntax.AssignmentPattern:
-            checkPatternParam(options, param.left);
-            break;
-        case Syntax.ArrayPattern:
-            for (i = 0; i < param.elements.length; i++) {
-                if (param.elements[i] !== null) {
-                    checkPatternParam(options, param.elements[i]);
-                }
-            }
-            break;
-        case Syntax.YieldExpression:
-            break;
-        default:
-            assert(param.type === Syntax.ObjectPattern, 'Invalid type');
-            for (i = 0; i < param.properties.length; i++) {
-                checkPatternParam(options, param.properties[i].value);
-            }
-            break;
-        }
-    }
-    function reinterpretAsCoverFormalsList(expr) {
-        var i, len, param, params, defaults, defaultCount, options, token;
-
-        defaults = [];
-        defaultCount = 0;
-        params = [expr];
-
-        switch (expr.type) {
-        case Syntax.Identifier:
-            break;
-        case PlaceHolders.ArrowParameterPlaceHolder:
-            params = expr.params;
-            break;
-        default:
-            return null;
-        }
-
-        options = {
-            paramSet: {}
-        };
-
-        for (i = 0, len = params.length; i < len; i += 1) {
-            param = params[i];
-            switch (param.type) {
-            case Syntax.AssignmentPattern:
-                params[i] = param.left;
-                if (param.right.type === Syntax.YieldExpression) {
-                    if (param.right.argument) {
-                        throwUnexpectedToken(lookahead);
-                    }
-                    param.right.type = Syntax.Identifier;
-                    param.right.name = 'yield';
-                    delete param.right.argument;
-                    delete param.right.delegate;
-                }
-                defaults.push(param.right);
-                ++defaultCount;
-                checkPatternParam(options, param.left);
-                break;
-            default:
-                checkPatternParam(options, param);
-                params[i] = param;
-                defaults.push(null);
-                break;
-            }
-        }
-
-        if (strict || !state.allowYield) {
-            for (i = 0, len = params.length; i < len; i += 1) {
-                param = params[i];
-                if (param.type === Syntax.YieldExpression) {
-                    throwUnexpectedToken(lookahead);
-                }
-            }
-        }
-
-        if (options.message === Messages.StrictParamDupe) {
-            token = strict ? options.stricted : options.firstRestricted;
-            throwUnexpectedToken(token, options.message);
-        }
-
-        if (defaultCount === 0) {
-            defaults = [];
-        }
-
-        return {
-            params: params,
-            defaults: defaults,
-            stricted: options.stricted,
-            firstRestricted: options.firstRestricted,
-            message: options.message
-        };
-    }
-
-    function parseArrowFunctionExpression(options, node) {
-        var previousStrict, previousAllowYield, body;
-
-        if (hasLineTerminator) {
-            tolerateUnexpectedToken(lookahead);
-        }
-        expect('=>');
-
-        previousStrict = strict;
-        previousAllowYield = state.allowYield;
-        state.allowYield = true;
-
-        body = parseConciseBody();
-
-        if (strict && options.firstRestricted) {
-            throwUnexpectedToken(options.firstRestricted, options.message);
-        }
-        if (strict && options.stricted) {
-            tolerateUnexpectedToken(options.stricted, options.message);
-        }
-
-        strict = previousStrict;
-        state.allowYield = previousAllowYield;
-
-        return node.finishArrowFunctionExpression(options.params, options.defaults, body, body.type !== Syntax.BlockStatement);
-    }
-
-    // ECMA-262 14.4 Yield expression
-
-    function parseYieldExpression() {
-        var argument, expr, delegate, previousAllowYield;
-
-        argument = null;
-        expr = new Node();
-        delegate = false;
-
-        expectKeyword('yield');
-
-        if (!hasLineTerminator) {
-            previousAllowYield = state.allowYield;
-            state.allowYield = false;
-            delegate = match('*');
-            if (delegate) {
-                lex();
-                argument = parseAssignmentExpression();
-            } else {
-                if (!match(';') && !match('}') && !match(')') && lookahead.type !== Token.EOF) {
-                    argument = parseAssignmentExpression();
-                }
-            }
-            state.allowYield = previousAllowYield;
-        }
-
-        return expr.finishYieldExpression(argument, delegate);
-    }
-
-    // ECMA-262 12.14 Assignment Operators
-
-    function parseAssignmentExpression() {
-        var token, expr, right, list, startToken;
-
-        startToken = lookahead;
-        token = lookahead;
-
-        if (!state.allowYield && matchKeyword('yield')) {
-            return parseYieldExpression();
-        }
-
-        expr = parseConditionalExpression();
-
-        if (expr.type === PlaceHolders.ArrowParameterPlaceHolder || match('=>')) {
-            isAssignmentTarget = isBindingElement = false;
-            list = reinterpretAsCoverFormalsList(expr);
-
-            if (list) {
-                firstCoverInitializedNameError = null;
-                return parseArrowFunctionExpression(list, new WrappingNode(startToken));
-            }
-
-            return expr;
-        }
-
-        if (matchAssign()) {
-            if (!isAssignmentTarget) {
-                tolerateError(Messages.InvalidLHSInAssignment);
-            }
-
-            // ECMA-262 12.1.1
-            if (strict && expr.type === Syntax.Identifier) {
-                if (isRestrictedWord(expr.name)) {
-                    tolerateUnexpectedToken(token, Messages.StrictLHSAssignment);
-                }
-                if (isStrictModeReservedWord(expr.name)) {
-                    tolerateUnexpectedToken(token, Messages.StrictReservedWord);
-                }
-            }
-
-            if (!match('=')) {
-                isAssignmentTarget = isBindingElement = false;
-            } else {
-                reinterpretExpressionAsPattern(expr);
-            }
-
-            token = lex();
-            right = isolateCoverGrammar(parseAssignmentExpression);
-            expr = new WrappingNode(startToken).finishAssignmentExpression(token.value, expr, right);
-            firstCoverInitializedNameError = null;
-        }
-
-        return expr;
-    }
-
-    // ECMA-262 12.15 Comma Operator
-
-    function parseExpression() {
-        var expr, startToken = lookahead, expressions;
-
-        expr = isolateCoverGrammar(parseAssignmentExpression);
-
-        if (match(',')) {
-            expressions = [expr];
-
-            while (startIndex < length) {
-                if (!match(',')) {
-                    break;
-                }
-                lex();
-                expressions.push(isolateCoverGrammar(parseAssignmentExpression));
-            }
-
-            expr = new WrappingNode(startToken).finishSequenceExpression(expressions);
-        }
-
-        return expr;
-    }
-
-    // ECMA-262 13.2 Block
-
-    function parseStatementListItem() {
-        if (lookahead.type === Token.Keyword) {
-            switch (lookahead.value) {
-            case 'export':
-                if (state.sourceType !== 'module') {
-                    tolerateUnexpectedToken(lookahead, Messages.IllegalExportDeclaration);
-                }
-                return parseExportDeclaration();
-            case 'import':
-                if (state.sourceType !== 'module') {
-                    tolerateUnexpectedToken(lookahead, Messages.IllegalImportDeclaration);
-                }
-                return parseImportDeclaration();
-            case 'const':
-                return parseLexicalDeclaration({inFor: false});
-            case 'function':
-                return parseFunctionDeclaration(new Node());
-            case 'class':
-                return parseClassDeclaration();
-            }
-        }
-
-        if (matchKeyword('let') && isLexicalDeclaration()) {
-            return parseLexicalDeclaration({inFor: false});
-        }
-
-        return parseStatement();
-    }
-
-    function parseStatementList() {
-        var list = [];
-        while (startIndex < length) {
-            if (match('}')) {
-                break;
-            }
-            list.push(parseStatementListItem());
-        }
-
-        return list;
-    }
-
-    function parseBlock() {
-        var block, node = new Node();
-
-        expect('{');
-
-        block = parseStatementList();
-
-        expect('}');
-
-        return node.finishBlockStatement(block);
-    }
-
-    // ECMA-262 13.3.2 Variable Statement
-
-    function parseVariableIdentifier(kind) {
-        var token, node = new Node();
-
-        token = lex();
-
-        if (token.type === Token.Keyword && token.value === 'yield') {
-            if (strict) {
-                tolerateUnexpectedToken(token, Messages.StrictReservedWord);
-            } if (!state.allowYield) {
-                throwUnexpectedToken(token);
-            }
-        } else if (token.type !== Token.Identifier) {
-            if (strict && token.type === Token.Keyword && isStrictModeReservedWord(token.value)) {
-                tolerateUnexpectedToken(token, Messages.StrictReservedWord);
-            } else {
-                if (strict || token.value !== 'let' || kind !== 'var') {
-                    throwUnexpectedToken(token);
-                }
-            }
-        } else if (state.sourceType === 'module' && token.type === Token.Identifier && token.value === 'await') {
-            tolerateUnexpectedToken(token);
-        }
-
-        return node.finishIdentifier(token.value);
-    }
-
-    function parseVariableDeclaration(options) {
-        var init = null, id, node = new Node(), params = [];
-
-        id = parsePattern(params, 'var');
-
-        // ECMA-262 12.2.1
-        if (strict && isRestrictedWord(id.name)) {
-            tolerateError(Messages.StrictVarName);
-        }
-
-        if (match('=')) {
-            lex();
-            init = isolateCoverGrammar(parseAssignmentExpression);
-        } else if (id.type !== Syntax.Identifier && !options.inFor) {
-            expect('=');
-        }
-
-        return node.finishVariableDeclarator(id, init);
-    }
-
-    function parseVariableDeclarationList(options) {
-        var opt, list;
-
-        opt = { inFor: options.inFor };
-        list = [parseVariableDeclaration(opt)];
-
-        while (match(',')) {
-            lex();
-            list.push(parseVariableDeclaration(opt));
-        }
-
-        return list;
-    }
-
-    function parseVariableStatement(node) {
-        var declarations;
-
-        expectKeyword('var');
-
-        declarations = parseVariableDeclarationList({ inFor: false });
-
-        consumeSemicolon();
-
-        return node.finishVariableDeclaration(declarations);
-    }
-
-    // ECMA-262 13.3.1 Let and Const Declarations
-
-    function parseLexicalBinding(kind, options) {
-        var init = null, id, node = new Node(), params = [];
-
-        id = parsePattern(params, kind);
-
-        // ECMA-262 12.2.1
-        if (strict && id.type === Syntax.Identifier && isRestrictedWord(id.name)) {
-            tolerateError(Messages.StrictVarName);
-        }
-
-        if (kind === 'const') {
-            if (!matchKeyword('in') && !matchContextualKeyword('of')) {
-                expect('=');
-                init = isolateCoverGrammar(parseAssignmentExpression);
-            }
-        } else if ((!options.inFor && id.type !== Syntax.Identifier) || match('=')) {
-            expect('=');
-            init = isolateCoverGrammar(parseAssignmentExpression);
-        }
-
-        return node.finishVariableDeclarator(id, init);
-    }
-
-    function parseBindingList(kind, options) {
-        var list = [parseLexicalBinding(kind, options)];
-
-        while (match(',')) {
-            lex();
-            list.push(parseLexicalBinding(kind, options));
-        }
-
-        return list;
-    }
-
-
-    function tokenizerState() {
-        return {
-            index: index,
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            hasLineTerminator: hasLineTerminator,
-            lastIndex: lastIndex,
-            lastLineNumber: lastLineNumber,
-            lastLineStart: lastLineStart,
-            startIndex: startIndex,
-            startLineNumber: startLineNumber,
-            startLineStart: startLineStart,
-            lookahead: lookahead,
-            tokenCount: extra.tokens ? extra.tokens.length : 0
-        };
-    }
-
-    function resetTokenizerState(ts) {
-        index = ts.index;
-        lineNumber = ts.lineNumber;
-        lineStart = ts.lineStart;
-        hasLineTerminator = ts.hasLineTerminator;
-        lastIndex = ts.lastIndex;
-        lastLineNumber = ts.lastLineNumber;
-        lastLineStart = ts.lastLineStart;
-        startIndex = ts.startIndex;
-        startLineNumber = ts.startLineNumber;
-        startLineStart = ts.startLineStart;
-        lookahead = ts.lookahead;
-        if (extra.tokens) {
-            extra.tokens.splice(ts.tokenCount, extra.tokens.length);
-        }
-    }
-
-    function isLexicalDeclaration() {
-        var lexical, ts;
-
-        ts = tokenizerState();
-
-        lex();
-        lexical = (lookahead.type === Token.Identifier) || match('[') || match('{') ||
-            matchKeyword('let') || matchKeyword('yield');
-
-        resetTokenizerState(ts);
-
-        return lexical;
-    }
-
-    function parseLexicalDeclaration(options) {
-        var kind, declarations, node = new Node();
-
-        kind = lex().value;
-        assert(kind === 'let' || kind === 'const', 'Lexical declaration must be either let or const');
-
-        declarations = parseBindingList(kind, options);
-
-        consumeSemicolon();
-
-        return node.finishLexicalDeclaration(declarations, kind);
-    }
-
-    function parseRestElement(params) {
-        var param, node = new Node();
-
-        lex();
-
-        if (match('{')) {
-            throwError(Messages.ObjectPatternAsRestParameter);
-        }
-
-        params.push(lookahead);
-
-        param = parseVariableIdentifier();
-
-        if (match('=')) {
-            throwError(Messages.DefaultRestParameter);
-        }
-
-        if (!match(')')) {
-            throwError(Messages.ParameterAfterRestParameter);
-        }
-
-        return node.finishRestElement(param);
-    }
-
-    // ECMA-262 13.4 Empty Statement
-
-    function parseEmptyStatement(node) {
-        expect(';');
-        return node.finishEmptyStatement();
-    }
-
-    // ECMA-262 12.4 Expression Statement
-
-    function parseExpressionStatement(node) {
-        var expr = parseExpression();
-        consumeSemicolon();
-        return node.finishExpressionStatement(expr);
-    }
-
-    // ECMA-262 13.6 If statement
-
-    function parseIfStatement(node) {
-        var test, consequent, alternate;
-
-        expectKeyword('if');
-
-        expect('(');
-
-        test = parseExpression();
-
-        expect(')');
-
-        consequent = parseStatement();
-
-        if (matchKeyword('else')) {
-            lex();
-            alternate = parseStatement();
-        } else {
-            alternate = null;
-        }
-
-        return node.finishIfStatement(test, consequent, alternate);
-    }
-
-    // ECMA-262 13.7 Iteration Statements
-
-    function parseDoWhileStatement(node) {
-        var body, test, oldInIteration;
-
-        expectKeyword('do');
-
-        oldInIteration = state.inIteration;
-        state.inIteration = true;
-
-        body = parseStatement();
-
-        state.inIteration = oldInIteration;
-
-        expectKeyword('while');
-
-        expect('(');
-
-        test = parseExpression();
-
-        expect(')');
-
-        if (match(';')) {
-            lex();
-        }
-
-        return node.finishDoWhileStatement(body, test);
-    }
-
-    function parseWhileStatement(node) {
-        var test, body, oldInIteration;
-
-        expectKeyword('while');
-
-        expect('(');
-
-        test = parseExpression();
-
-        expect(')');
-
-        oldInIteration = state.inIteration;
-        state.inIteration = true;
-
-        body = parseStatement();
-
-        state.inIteration = oldInIteration;
-
-        return node.finishWhileStatement(test, body);
-    }
-
-    function parseForStatement(node) {
-        var init, forIn, initSeq, initStartToken, test, update, left, right, kind, declarations,
-            body, oldInIteration, previousAllowIn = state.allowIn;
-
-        init = test = update = null;
-        forIn = true;
-
-        expectKeyword('for');
-
-        expect('(');
-
-        if (match(';')) {
-            lex();
-        } else {
-            if (matchKeyword('var')) {
-                init = new Node();
-                lex();
-
-                state.allowIn = false;
-                declarations = parseVariableDeclarationList({ inFor: true });
-                state.allowIn = previousAllowIn;
-
-                if (declarations.length === 1 && matchKeyword('in')) {
-                    init = init.finishVariableDeclaration(declarations);
-                    lex();
-                    left = init;
-                    right = parseExpression();
-                    init = null;
-                } else if (declarations.length === 1 && declarations[0].init === null && matchContextualKeyword('of')) {
-                    init = init.finishVariableDeclaration(declarations);
-                    lex();
-                    left = init;
-                    right = parseAssignmentExpression();
-                    init = null;
-                    forIn = false;
-                } else {
-                    init = init.finishVariableDeclaration(declarations);
-                    expect(';');
-                }
-            } else if (matchKeyword('const') || matchKeyword('let')) {
-                init = new Node();
-                kind = lex().value;
-
-                if (!strict && lookahead.value === 'in') {
-                    init = init.finishIdentifier(kind);
-                    lex();
-                    left = init;
-                    right = parseExpression();
-                    init = null;
-                } else {
-                    state.allowIn = false;
-                    declarations = parseBindingList(kind, {inFor: true});
-                    state.allowIn = previousAllowIn;
-
-                    if (declarations.length === 1 && declarations[0].init === null && matchKeyword('in')) {
-                        init = init.finishLexicalDeclaration(declarations, kind);
-                        lex();
-                        left = init;
-                        right = parseExpression();
-                        init = null;
-                    } else if (declarations.length === 1 && declarations[0].init === null && matchContextualKeyword('of')) {
-                        init = init.finishLexicalDeclaration(declarations, kind);
-                        lex();
-                        left = init;
-                        right = parseAssignmentExpression();
-                        init = null;
-                        forIn = false;
-                    } else {
-                        consumeSemicolon();
-                        init = init.finishLexicalDeclaration(declarations, kind);
-                    }
-                }
-            } else {
-                initStartToken = lookahead;
-                state.allowIn = false;
-                init = inheritCoverGrammar(parseAssignmentExpression);
-                state.allowIn = previousAllowIn;
-
-                if (matchKeyword('in')) {
-                    if (!isAssignmentTarget) {
-                        tolerateError(Messages.InvalidLHSInForIn);
-                    }
-
-                    lex();
-                    reinterpretExpressionAsPattern(init);
-                    left = init;
-                    right = parseExpression();
-                    init = null;
-                } else if (matchContextualKeyword('of')) {
-                    if (!isAssignmentTarget) {
-                        tolerateError(Messages.InvalidLHSInForLoop);
-                    }
-
-                    lex();
-                    reinterpretExpressionAsPattern(init);
-                    left = init;
-                    right = parseAssignmentExpression();
-                    init = null;
-                    forIn = false;
-                } else {
-                    if (match(',')) {
-                        initSeq = [init];
-                        while (match(',')) {
-                            lex();
-                            initSeq.push(isolateCoverGrammar(parseAssignmentExpression));
-                        }
-                        init = new WrappingNode(initStartToken).finishSequenceExpression(initSeq);
-                    }
-                    expect(';');
-                }
-            }
-        }
-
-        if (typeof left === 'undefined') {
-
-            if (!match(';')) {
-                test = parseExpression();
-            }
-            expect(';');
-
-            if (!match(')')) {
-                update = parseExpression();
-            }
-        }
-
-        expect(')');
-
-        oldInIteration = state.inIteration;
-        state.inIteration = true;
-
-        body = isolateCoverGrammar(parseStatement);
-
-        state.inIteration = oldInIteration;
-
-        return (typeof left === 'undefined') ?
-                node.finishForStatement(init, test, update, body) :
-                forIn ? node.finishForInStatement(left, right, body) :
-                    node.finishForOfStatement(left, right, body);
-    }
-
-    // ECMA-262 13.8 The continue statement
-
-    function parseContinueStatement(node) {
-        var label = null, key;
-
-        expectKeyword('continue');
-
-        // Optimize the most common form: 'continue;'.
-        if (source.charCodeAt(startIndex) === 0x3B) {
-            lex();
-
-            if (!state.inIteration) {
-                throwError(Messages.IllegalContinue);
-            }
-
-            return node.finishContinueStatement(null);
-        }
-
-        if (hasLineTerminator) {
-            if (!state.inIteration) {
-                throwError(Messages.IllegalContinue);
-            }
-
-            return node.finishContinueStatement(null);
-        }
-
-        if (lookahead.type === Token.Identifier) {
-            label = parseVariableIdentifier();
-
-            key = '$' + label.name;
-            if (!Object.prototype.hasOwnProperty.call(state.labelSet, key)) {
-                throwError(Messages.UnknownLabel, label.name);
-            }
-        }
-
-        consumeSemicolon();
-
-        if (label === null && !state.inIteration) {
-            throwError(Messages.IllegalContinue);
-        }
-
-        return node.finishContinueStatement(label);
-    }
-
-    // ECMA-262 13.9 The break statement
-
-    function parseBreakStatement(node) {
-        var label = null, key;
-
-        expectKeyword('break');
-
-        // Catch the very common case first: immediately a semicolon (U+003B).
-        if (source.charCodeAt(lastIndex) === 0x3B) {
-            lex();
-
-            if (!(state.inIteration || state.inSwitch)) {
-                throwError(Messages.IllegalBreak);
-            }
-
-            return node.finishBreakStatement(null);
-        }
-
-        if (hasLineTerminator) {
-            if (!(state.inIteration || state.inSwitch)) {
-                throwError(Messages.IllegalBreak);
-            }
-        } else if (lookahead.type === Token.Identifier) {
-            label = parseVariableIdentifier();
-
-            key = '$' + label.name;
-            if (!Object.prototype.hasOwnProperty.call(state.labelSet, key)) {
-                throwError(Messages.UnknownLabel, label.name);
-            }
-        }
-
-        consumeSemicolon();
-
-        if (label === null && !(state.inIteration || state.inSwitch)) {
-            throwError(Messages.IllegalBreak);
-        }
-
-        return node.finishBreakStatement(label);
-    }
-
-    // ECMA-262 13.10 The return statement
-
-    function parseReturnStatement(node) {
-        var argument = null;
-
-        expectKeyword('return');
-
-        if (!state.inFunctionBody) {
-            tolerateError(Messages.IllegalReturn);
-        }
-
-        // 'return' followed by a space and an identifier is very common.
-        if (source.charCodeAt(lastIndex) === 0x20) {
-            if (isIdentifierStart(source.charCodeAt(lastIndex + 1))) {
-                argument = parseExpression();
-                consumeSemicolon();
-                return node.finishReturnStatement(argument);
-            }
-        }
-
-        if (hasLineTerminator) {
-            // HACK
-            return node.finishReturnStatement(null);
-        }
-
-        if (!match(';')) {
-            if (!match('}') && lookahead.type !== Token.EOF) {
-                argument = parseExpression();
-            }
-        }
-
-        consumeSemicolon();
-
-        return node.finishReturnStatement(argument);
-    }
-
-    // ECMA-262 13.11 The with statement
-
-    function parseWithStatement(node) {
-        var object, body;
-
-        if (strict) {
-            tolerateError(Messages.StrictModeWith);
-        }
-
-        expectKeyword('with');
-
-        expect('(');
-
-        object = parseExpression();
-
-        expect(')');
-
-        body = parseStatement();
-
-        return node.finishWithStatement(object, body);
-    }
-
-    // ECMA-262 13.12 The switch statement
-
-    function parseSwitchCase() {
-        var test, consequent = [], statement, node = new Node();
-
-        if (matchKeyword('default')) {
-            lex();
-            test = null;
-        } else {
-            expectKeyword('case');
-            test = parseExpression();
-        }
-        expect(':');
-
-        while (startIndex < length) {
-            if (match('}') || matchKeyword('default') || matchKeyword('case')) {
-                break;
-            }
-            statement = parseStatementListItem();
-            consequent.push(statement);
-        }
-
-        return node.finishSwitchCase(test, consequent);
-    }
-
-    function parseSwitchStatement(node) {
-        var discriminant, cases, clause, oldInSwitch, defaultFound;
-
-        expectKeyword('switch');
-
-        expect('(');
-
-        discriminant = parseExpression();
-
-        expect(')');
-
-        expect('{');
-
-        cases = [];
-
-        if (match('}')) {
-            lex();
-            return node.finishSwitchStatement(discriminant, cases);
-        }
-
-        oldInSwitch = state.inSwitch;
-        state.inSwitch = true;
-        defaultFound = false;
-
-        while (startIndex < length) {
-            if (match('}')) {
-                break;
-            }
-            clause = parseSwitchCase();
-            if (clause.test === null) {
-                if (defaultFound) {
-                    throwError(Messages.MultipleDefaultsInSwitch);
-                }
-                defaultFound = true;
-            }
-            cases.push(clause);
-        }
-
-        state.inSwitch = oldInSwitch;
-
-        expect('}');
-
-        return node.finishSwitchStatement(discriminant, cases);
-    }
-
-    // ECMA-262 13.14 The throw statement
-
-    function parseThrowStatement(node) {
-        var argument;
-
-        expectKeyword('throw');
-
-        if (hasLineTerminator) {
-            throwError(Messages.NewlineAfterThrow);
-        }
-
-        argument = parseExpression();
-
-        consumeSemicolon();
-
-        return node.finishThrowStatement(argument);
-    }
-
-    // ECMA-262 13.15 The try statement
-
-    function parseCatchClause() {
-        var param, params = [], paramMap = {}, key, i, body, node = new Node();
-
-        expectKeyword('catch');
-
-        expect('(');
-        if (match(')')) {
-            throwUnexpectedToken(lookahead);
-        }
-
-        param = parsePattern(params);
-        for (i = 0; i < params.length; i++) {
-            key = '$' + params[i].value;
-            if (Object.prototype.hasOwnProperty.call(paramMap, key)) {
-                tolerateError(Messages.DuplicateBinding, params[i].value);
-            }
-            paramMap[key] = true;
-        }
-
-        // ECMA-262 12.14.1
-        if (strict && isRestrictedWord(param.name)) {
-            tolerateError(Messages.StrictCatchVariable);
-        }
-
-        expect(')');
-        body = parseBlock();
-        return node.finishCatchClause(param, body);
-    }
-
-    function parseTryStatement(node) {
-        var block, handler = null, finalizer = null;
-
-        expectKeyword('try');
-
-        block = parseBlock();
-
-        if (matchKeyword('catch')) {
-            handler = parseCatchClause();
-        }
-
-        if (matchKeyword('finally')) {
-            lex();
-            finalizer = parseBlock();
-        }
-
-        if (!handler && !finalizer) {
-            throwError(Messages.NoCatchOrFinally);
-        }
-
-        return node.finishTryStatement(block, handler, finalizer);
-    }
-
-    // ECMA-262 13.16 The debugger statement
-
-    function parseDebuggerStatement(node) {
-        expectKeyword('debugger');
-
-        consumeSemicolon();
-
-        return node.finishDebuggerStatement();
-    }
-
-    // 13 Statements
-
-    function parseStatement() {
-        var type = lookahead.type,
-            expr,
-            labeledBody,
-            key,
-            node;
-
-        if (type === Token.EOF) {
-            throwUnexpectedToken(lookahead);
-        }
-
-        if (type === Token.Punctuator && lookahead.value === '{') {
-            return parseBlock();
-        }
-        isAssignmentTarget = isBindingElement = true;
-        node = new Node();
-
-        if (type === Token.Punctuator) {
-            switch (lookahead.value) {
-            case ';':
-                return parseEmptyStatement(node);
-            case '(':
-                return parseExpressionStatement(node);
-            default:
-                break;
-            }
-        } else if (type === Token.Keyword) {
-            switch (lookahead.value) {
-            case 'break':
-                return parseBreakStatement(node);
-            case 'continue':
-                return parseContinueStatement(node);
-            case 'debugger':
-                return parseDebuggerStatement(node);
-            case 'do':
-                return parseDoWhileStatement(node);
-            case 'for':
-                return parseForStatement(node);
-            case 'function':
-                return parseFunctionDeclaration(node);
-            case 'if':
-                return parseIfStatement(node);
-            case 'return':
-                return parseReturnStatement(node);
-            case 'switch':
-                return parseSwitchStatement(node);
-            case 'throw':
-                return parseThrowStatement(node);
-            case 'try':
-                return parseTryStatement(node);
-            case 'var':
-                return parseVariableStatement(node);
-            case 'while':
-                return parseWhileStatement(node);
-            case 'with':
-                return parseWithStatement(node);
-            default:
-                break;
-            }
-        }
-
-        expr = parseExpression();
-
-        // ECMA-262 12.12 Labelled Statements
-        if ((expr.type === Syntax.Identifier) && match(':')) {
-            lex();
-
-            key = '$' + expr.name;
-            if (Object.prototype.hasOwnProperty.call(state.labelSet, key)) {
-                throwError(Messages.Redeclaration, 'Label', expr.name);
-            }
-
-            state.labelSet[key] = true;
-            labeledBody = parseStatement();
-            delete state.labelSet[key];
-            return node.finishLabeledStatement(expr, labeledBody);
-        }
-
-        consumeSemicolon();
-
-        return node.finishExpressionStatement(expr);
-    }
-
-    // ECMA-262 14.1 Function Definition
-
-    function parseFunctionSourceElements() {
-        var statement, body = [], token, directive, firstRestricted,
-            oldLabelSet, oldInIteration, oldInSwitch, oldInFunctionBody, oldParenthesisCount,
-            node = new Node();
-
-        expect('{');
-
-        while (startIndex < length) {
-            if (lookahead.type !== Token.StringLiteral) {
-                break;
-            }
-            token = lookahead;
-
-            statement = parseStatementListItem();
-            body.push(statement);
-            if (statement.expression.type !== Syntax.Literal) {
-                // this is not directive
-                break;
-            }
-            directive = source.slice(token.start + 1, token.end - 1);
-            if (directive === 'use strict') {
-                strict = true;
-                if (firstRestricted) {
-                    tolerateUnexpectedToken(firstRestricted, Messages.StrictOctalLiteral);
-                }
-            } else {
-                if (!firstRestricted && token.octal) {
-                    firstRestricted = token;
-                }
-            }
-        }
-
-        oldLabelSet = state.labelSet;
-        oldInIteration = state.inIteration;
-        oldInSwitch = state.inSwitch;
-        oldInFunctionBody = state.inFunctionBody;
-        oldParenthesisCount = state.parenthesizedCount;
-
-        state.labelSet = {};
-        state.inIteration = false;
-        state.inSwitch = false;
-        state.inFunctionBody = true;
-        state.parenthesizedCount = 0;
-
-        while (startIndex < length) {
-            if (match('}')) {
-                break;
-            }
-            body.push(parseStatementListItem());
-        }
-
-        expect('}');
-
-        state.labelSet = oldLabelSet;
-        state.inIteration = oldInIteration;
-        state.inSwitch = oldInSwitch;
-        state.inFunctionBody = oldInFunctionBody;
-        state.parenthesizedCount = oldParenthesisCount;
-
-        return node.finishBlockStatement(body);
-    }
-
-    function validateParam(options, param, name) {
-        var key = '$' + name;
-        if (strict) {
-            if (isRestrictedWord(name)) {
-                options.stricted = param;
-                options.message = Messages.StrictParamName;
-            }
-            if (Object.prototype.hasOwnProperty.call(options.paramSet, key)) {
-                options.stricted = param;
-                options.message = Messages.StrictParamDupe;
-            }
-        } else if (!options.firstRestricted) {
-            if (isRestrictedWord(name)) {
-                options.firstRestricted = param;
-                options.message = Messages.StrictParamName;
-            } else if (isStrictModeReservedWord(name)) {
-                options.firstRestricted = param;
-                options.message = Messages.StrictReservedWord;
-            } else if (Object.prototype.hasOwnProperty.call(options.paramSet, key)) {
-                options.stricted = param;
-                options.message = Messages.StrictParamDupe;
-            }
-        }
-        options.paramSet[key] = true;
-    }
-
-    function parseParam(options) {
-        var token, param, params = [], i, def;
-
-        token = lookahead;
-        if (token.value === '...') {
-            param = parseRestElement(params);
-            validateParam(options, param.argument, param.argument.name);
-            options.params.push(param);
-            options.defaults.push(null);
-            return false;
-        }
-
-        param = parsePatternWithDefault(params);
-        for (i = 0; i < params.length; i++) {
-            validateParam(options, params[i], params[i].value);
-        }
-
-        if (param.type === Syntax.AssignmentPattern) {
-            def = param.right;
-            param = param.left;
-            ++options.defaultCount;
-        }
-
-        options.params.push(param);
-        options.defaults.push(def);
-
-        return !match(')');
-    }
-
-    function parseParams(firstRestricted) {
-        var options;
-
-        options = {
-            params: [],
-            defaultCount: 0,
-            defaults: [],
-            firstRestricted: firstRestricted
-        };
-
-        expect('(');
-
-        if (!match(')')) {
-            options.paramSet = {};
-            while (startIndex < length) {
-                if (!parseParam(options)) {
-                    break;
-                }
-                expect(',');
-            }
-        }
-
-        expect(')');
-
-        if (options.defaultCount === 0) {
-            options.defaults = [];
-        }
-
-        return {
-            params: options.params,
-            defaults: options.defaults,
-            stricted: options.stricted,
-            firstRestricted: options.firstRestricted,
-            message: options.message
-        };
-    }
-
-    function parseFunctionDeclaration(node, identifierIsOptional) {
-        var id = null, params = [], defaults = [], body, token, stricted, tmp, firstRestricted, message, previousStrict,
-            isGenerator, previousAllowYield;
-
-        previousAllowYield = state.allowYield;
-
-        expectKeyword('function');
-
-        isGenerator = match('*');
-        if (isGenerator) {
-            lex();
-        }
-
-        if (!identifierIsOptional || !match('(')) {
-            token = lookahead;
-            id = parseVariableIdentifier();
-            if (strict) {
-                if (isRestrictedWord(token.value)) {
-                    tolerateUnexpectedToken(token, Messages.StrictFunctionName);
-                }
-            } else {
-                if (isRestrictedWord(token.value)) {
-                    firstRestricted = token;
-                    message = Messages.StrictFunctionName;
-                } else if (isStrictModeReservedWord(token.value)) {
-                    firstRestricted = token;
-                    message = Messages.StrictReservedWord;
-                }
-            }
-        }
-
-        state.allowYield = !isGenerator;
-        tmp = parseParams(firstRestricted);
-        params = tmp.params;
-        defaults = tmp.defaults;
-        stricted = tmp.stricted;
-        firstRestricted = tmp.firstRestricted;
-        if (tmp.message) {
-            message = tmp.message;
-        }
-
-
-        previousStrict = strict;
-        body = parseFunctionSourceElements();
-        if (strict && firstRestricted) {
-            throwUnexpectedToken(firstRestricted, message);
-        }
-        if (strict && stricted) {
-            tolerateUnexpectedToken(stricted, message);
-        }
-
-        strict = previousStrict;
-        state.allowYield = previousAllowYield;
-
-        return node.finishFunctionDeclaration(id, params, defaults, body, isGenerator);
-    }
-
-    function parseFunctionExpression() {
-        var token, id = null, stricted, firstRestricted, message, tmp,
-            params = [], defaults = [], body, previousStrict, node = new Node(),
-            isGenerator, previousAllowYield;
-
-        previousAllowYield = state.allowYield;
-
-        expectKeyword('function');
-
-        isGenerator = match('*');
-        if (isGenerator) {
-            lex();
-        }
-
-        state.allowYield = !isGenerator;
-        if (!match('(')) {
-            token = lookahead;
-            id = (!strict && !isGenerator && matchKeyword('yield')) ? parseNonComputedProperty() : parseVariableIdentifier();
-            if (strict) {
-                if (isRestrictedWord(token.value)) {
-                    tolerateUnexpectedToken(token, Messages.StrictFunctionName);
-                }
-            } else {
-                if (isRestrictedWord(token.value)) {
-                    firstRestricted = token;
-                    message = Messages.StrictFunctionName;
-                } else if (isStrictModeReservedWord(token.value)) {
-                    firstRestricted = token;
-                    message = Messages.StrictReservedWord;
-                }
-            }
-        }
-
-        tmp = parseParams(firstRestricted);
-        params = tmp.params;
-        defaults = tmp.defaults;
-        stricted = tmp.stricted;
-        firstRestricted = tmp.firstRestricted;
-        if (tmp.message) {
-            message = tmp.message;
-        }
-
-        previousStrict = strict;
-        body = parseFunctionSourceElements();
-        if (strict && firstRestricted) {
-            throwUnexpectedToken(firstRestricted, message);
-        }
-        if (strict && stricted) {
-            tolerateUnexpectedToken(stricted, message);
-        }
-        strict = previousStrict;
-        state.allowYield = previousAllowYield;
-
-        return node.finishFunctionExpression(id, params, defaults, body, isGenerator);
-    }
-
-    // ECMA-262 14.5 Class Definitions
-
-    function parseClassBody() {
-        var classBody, token, isStatic, hasConstructor = false, body, method, computed, key;
-
-        classBody = new Node();
-
-        expect('{');
-        body = [];
-        while (!match('}')) {
-            if (match(';')) {
-                lex();
-            } else {
-                method = new Node();
-                token = lookahead;
-                isStatic = false;
-                computed = match('[');
-                if (match('*')) {
-                    lex();
-                } else {
-                    key = parseObjectPropertyKey();
-                    if (key.name === 'static' && (lookaheadPropertyName() || match('*'))) {
-                        token = lookahead;
-                        isStatic = true;
-                        computed = match('[');
-                        if (match('*')) {
-                            lex();
-                        } else {
-                            key = parseObjectPropertyKey();
-                        }
-                    }
-                }
-                method = tryParseMethodDefinition(token, key, computed, method);
-                if (method) {
-                    method['static'] = isStatic; // jscs:ignore requireDotNotation
-                    if (method.kind === 'init') {
-                        method.kind = 'method';
-                    }
-                    if (!isStatic) {
-                        if (!method.computed && (method.key.name || method.key.value.toString()) === 'constructor') {
-                            if (method.kind !== 'method' || !method.method || method.value.generator) {
-                                throwUnexpectedToken(token, Messages.ConstructorSpecialMethod);
-                            }
-                            if (hasConstructor) {
-                                throwUnexpectedToken(token, Messages.DuplicateConstructor);
-                            } else {
-                                hasConstructor = true;
-                            }
-                            method.kind = 'constructor';
-                        }
-                    } else {
-                        if (!method.computed && (method.key.name || method.key.value.toString()) === 'prototype') {
-                            throwUnexpectedToken(token, Messages.StaticPrototype);
-                        }
-                    }
-                    method.type = Syntax.MethodDefinition;
-                    delete method.method;
-                    delete method.shorthand;
-                    body.push(method);
-                } else {
-                    throwUnexpectedToken(lookahead);
-                }
-            }
-        }
-        lex();
-        return classBody.finishClassBody(body);
-    }
-
-    function parseClassDeclaration(identifierIsOptional) {
-        var id = null, superClass = null, classNode = new Node(), classBody, previousStrict = strict;
-        strict = true;
-
-        expectKeyword('class');
-
-        if (!identifierIsOptional || lookahead.type === Token.Identifier) {
-            id = parseVariableIdentifier();
-        }
-
-        if (matchKeyword('extends')) {
-            lex();
-            superClass = isolateCoverGrammar(parseLeftHandSideExpressionAllowCall);
-        }
-        classBody = parseClassBody();
-        strict = previousStrict;
-
-        return classNode.finishClassDeclaration(id, superClass, classBody);
-    }
-
-    function parseClassExpression() {
-        var id = null, superClass = null, classNode = new Node(), classBody, previousStrict = strict;
-        strict = true;
-
-        expectKeyword('class');
-
-        if (lookahead.type === Token.Identifier) {
-            id = parseVariableIdentifier();
-        }
-
-        if (matchKeyword('extends')) {
-            lex();
-            superClass = isolateCoverGrammar(parseLeftHandSideExpressionAllowCall);
-        }
-        classBody = parseClassBody();
-        strict = previousStrict;
-
-        return classNode.finishClassExpression(id, superClass, classBody);
-    }
-
-    // ECMA-262 15.2 Modules
-
-    function parseModuleSpecifier() {
-        var node = new Node();
-
-        if (lookahead.type !== Token.StringLiteral) {
-            throwError(Messages.InvalidModuleSpecifier);
-        }
-        return node.finishLiteral(lex());
-    }
-
-    // ECMA-262 15.2.3 Exports
-
-    function parseExportSpecifier() {
-        var exported, local, node = new Node(), def;
-        if (matchKeyword('default')) {
-            // export {default} from 'something';
-            def = new Node();
-            lex();
-            local = def.finishIdentifier('default');
-        } else {
-            local = parseVariableIdentifier();
-        }
-        if (matchContextualKeyword('as')) {
-            lex();
-            exported = parseNonComputedProperty();
-        }
-        return node.finishExportSpecifier(local, exported);
-    }
-
-    function parseExportNamedDeclaration(node) {
-        var declaration = null,
-            isExportFromIdentifier,
-            src = null, specifiers = [];
-
-        // non-default export
-        if (lookahead.type === Token.Keyword) {
-            // covers:
-            // export var f = 1;
-            switch (lookahead.value) {
-                case 'let':
-                case 'const':
-                    declaration = parseLexicalDeclaration({inFor: false});
-                    return node.finishExportNamedDeclaration(declaration, specifiers, null);
-                case 'var':
-                case 'class':
-                case 'function':
-                    declaration = parseStatementListItem();
-                    return node.finishExportNamedDeclaration(declaration, specifiers, null);
-            }
-        }
-
-        expect('{');
-        while (!match('}')) {
-            isExportFromIdentifier = isExportFromIdentifier || matchKeyword('default');
-            specifiers.push(parseExportSpecifier());
-            if (!match('}')) {
-                expect(',');
-                if (match('}')) {
-                    break;
-                }
-            }
-        }
-        expect('}');
-
-        if (matchContextualKeyword('from')) {
-            // covering:
-            // export {default} from 'foo';
-            // export {foo} from 'foo';
-            lex();
-            src = parseModuleSpecifier();
-            consumeSemicolon();
-        } else if (isExportFromIdentifier) {
-            // covering:
-            // export {default}; // missing fromClause
-            throwError(lookahead.value ?
-                    Messages.UnexpectedToken : Messages.MissingFromClause, lookahead.value);
-        } else {
-            // cover
-            // export {foo};
-            consumeSemicolon();
-        }
-        return node.finishExportNamedDeclaration(declaration, specifiers, src);
-    }
-
-    function parseExportDefaultDeclaration(node) {
-        var declaration = null,
-            expression = null;
-
-        // covers:
-        // export default ...
-        expectKeyword('default');
-
-        if (matchKeyword('function')) {
-            // covers:
-            // export default function foo () {}
-            // export default function () {}
-            declaration = parseFunctionDeclaration(new Node(), true);
-            return node.finishExportDefaultDeclaration(declaration);
-        }
-        if (matchKeyword('class')) {
-            declaration = parseClassDeclaration(true);
-            return node.finishExportDefaultDeclaration(declaration);
-        }
-
-        if (matchContextualKeyword('from')) {
-            throwError(Messages.UnexpectedToken, lookahead.value);
-        }
-
-        // covers:
-        // export default {};
-        // export default [];
-        // export default (1 + 2);
-        if (match('{')) {
-            expression = parseObjectInitializer();
-        } else if (match('[')) {
-            expression = parseArrayInitializer();
-        } else {
-            expression = parseAssignmentExpression();
-        }
-        consumeSemicolon();
-        return node.finishExportDefaultDeclaration(expression);
-    }
-
-    function parseExportAllDeclaration(node) {
-        var src;
-
-        // covers:
-        // export * from 'foo';
-        expect('*');
-        if (!matchContextualKeyword('from')) {
-            throwError(lookahead.value ?
-                    Messages.UnexpectedToken : Messages.MissingFromClause, lookahead.value);
-        }
-        lex();
-        src = parseModuleSpecifier();
-        consumeSemicolon();
-
-        return node.finishExportAllDeclaration(src);
-    }
-
-    function parseExportDeclaration() {
-        var node = new Node();
-        if (state.inFunctionBody) {
-            throwError(Messages.IllegalExportDeclaration);
-        }
-
-        expectKeyword('export');
-
-        if (matchKeyword('default')) {
-            return parseExportDefaultDeclaration(node);
-        }
-        if (match('*')) {
-            return parseExportAllDeclaration(node);
-        }
-        return parseExportNamedDeclaration(node);
-    }
-
-    // ECMA-262 15.2.2 Imports
-
-    function parseImportSpecifier() {
-        // import {<foo as bar>} ...;
-        var local, imported, node = new Node();
-
-        imported = parseNonComputedProperty();
-        if (matchContextualKeyword('as')) {
-            lex();
-            local = parseVariableIdentifier();
-        }
-
-        return node.finishImportSpecifier(local, imported);
-    }
-
-    function parseNamedImports() {
-        var specifiers = [];
-        // {foo, bar as bas}
-        expect('{');
-        while (!match('}')) {
-            specifiers.push(parseImportSpecifier());
-            if (!match('}')) {
-                expect(',');
-                if (match('}')) {
-                    break;
-                }
-            }
-        }
-        expect('}');
-        return specifiers;
-    }
-
-    function parseImportDefaultSpecifier() {
-        // import <foo> ...;
-        var local, node = new Node();
-
-        local = parseNonComputedProperty();
-
-        return node.finishImportDefaultSpecifier(local);
-    }
-
-    function parseImportNamespaceSpecifier() {
-        // import <* as foo> ...;
-        var local, node = new Node();
-
-        expect('*');
-        if (!matchContextualKeyword('as')) {
-            throwError(Messages.NoAsAfterImportNamespace);
-        }
-        lex();
-        local = parseNonComputedProperty();
-
-        return node.finishImportNamespaceSpecifier(local);
-    }
-
-    function parseImportDeclaration() {
-        var specifiers = [], src, node = new Node();
-
-        if (state.inFunctionBody) {
-            throwError(Messages.IllegalImportDeclaration);
-        }
-
-        expectKeyword('import');
-
-        if (lookahead.type === Token.StringLiteral) {
-            // import 'foo';
-            src = parseModuleSpecifier();
-        } else {
-
-            if (match('{')) {
-                // import {bar}
-                specifiers = specifiers.concat(parseNamedImports());
-            } else if (match('*')) {
-                // import * as foo
-                specifiers.push(parseImportNamespaceSpecifier());
-            } else if (isIdentifierName(lookahead) && !matchKeyword('default')) {
-                // import foo
-                specifiers.push(parseImportDefaultSpecifier());
-                if (match(',')) {
-                    lex();
-                    if (match('*')) {
-                        // import foo, * as foo
-                        specifiers.push(parseImportNamespaceSpecifier());
-                    } else if (match('{')) {
-                        // import foo, {bar}
-                        specifiers = specifiers.concat(parseNamedImports());
-                    } else {
-                        throwUnexpectedToken(lookahead);
-                    }
-                }
-            } else {
-                throwUnexpectedToken(lex());
-            }
-
-            if (!matchContextualKeyword('from')) {
-                throwError(lookahead.value ?
-                        Messages.UnexpectedToken : Messages.MissingFromClause, lookahead.value);
-            }
-            lex();
-            src = parseModuleSpecifier();
-        }
-
-        consumeSemicolon();
-        return node.finishImportDeclaration(specifiers, src);
-    }
-
-    // ECMA-262 15.1 Scripts
-
-    function parseScriptBody() {
-        var statement, body = [], token, directive, firstRestricted;
-
-        while (startIndex < length) {
-            token = lookahead;
-            if (token.type !== Token.StringLiteral) {
-                break;
-            }
-
-            statement = parseStatementListItem();
-            body.push(statement);
-            if (statement.expression.type !== Syntax.Literal) {
-                // this is not directive
-                break;
-            }
-            directive = source.slice(token.start + 1, token.end - 1);
-            if (directive === 'use strict') {
-                strict = true;
-                if (firstRestricted) {
-                    tolerateUnexpectedToken(firstRestricted, Messages.StrictOctalLiteral);
-                }
-            } else {
-                if (!firstRestricted && token.octal) {
-                    firstRestricted = token;
-                }
-            }
-        }
-
-        while (startIndex < length) {
-            statement = parseStatementListItem();
-            /* istanbul ignore if */
-            if (typeof statement === 'undefined') {
-                break;
-            }
-            body.push(statement);
-        }
-        return body;
-    }
-
-    function parseProgram() {
-        var body, node;
-
-        peek();
-        node = new Node();
-
-        body = parseScriptBody();
-        return node.finishProgram(body, state.sourceType);
-    }
-
-    function filterTokenLocation() {
-        var i, entry, token, tokens = [];
-
-        for (i = 0; i < extra.tokens.length; ++i) {
-            entry = extra.tokens[i];
-            token = {
-                type: entry.type,
-                value: entry.value
-            };
-            if (entry.regex) {
-                token.regex = {
-                    pattern: entry.regex.pattern,
-                    flags: entry.regex.flags
-                };
-            }
-            if (extra.range) {
-                token.range = entry.range;
-            }
-            if (extra.loc) {
-                token.loc = entry.loc;
-            }
-            tokens.push(token);
-        }
-
-        extra.tokens = tokens;
-    }
-
-    function tokenize(code, options, delegate) {
-        var toString,
-            tokens;
-
-        toString = String;
-        if (typeof code !== 'string' && !(code instanceof String)) {
-            code = toString(code);
-        }
-
-        source = code;
-        index = 0;
-        lineNumber = (source.length > 0) ? 1 : 0;
-        lineStart = 0;
-        startIndex = index;
-        startLineNumber = lineNumber;
-        startLineStart = lineStart;
-        length = source.length;
-        lookahead = null;
-        state = {
-            allowIn: true,
-            allowYield: true,
-            labelSet: {},
-            inFunctionBody: false,
-            inIteration: false,
-            inSwitch: false,
-            lastCommentStart: -1,
-            curlyStack: []
-        };
-
-        extra = {};
-
-        // Options matching.
-        options = options || {};
-
-        // Of course we collect tokens here.
-        options.tokens = true;
-        extra.tokens = [];
-        extra.tokenValues = [];
-        extra.tokenize = true;
-        extra.delegate = delegate;
-
-        // The following two fields are necessary to compute the Regex tokens.
-        extra.openParenToken = -1;
-        extra.openCurlyToken = -1;
-
-        extra.range = (typeof options.range === 'boolean') && options.range;
-        extra.loc = (typeof options.loc === 'boolean') && options.loc;
-
-        if (typeof options.comment === 'boolean' && options.comment) {
-            extra.comments = [];
-        }
-        if (typeof options.tolerant === 'boolean' && options.tolerant) {
-            extra.errors = [];
-        }
-
-        try {
-            peek();
-            if (lookahead.type === Token.EOF) {
-                return extra.tokens;
-            }
-
-            lex();
-            while (lookahead.type !== Token.EOF) {
-                try {
-                    lex();
-                } catch (lexError) {
-                    if (extra.errors) {
-                        recordError(lexError);
-                        // We have to break on the first error
-                        // to avoid infinite loops.
-                        break;
-                    } else {
-                        throw lexError;
-                    }
-                }
-            }
-
-            tokens = extra.tokens;
-            if (typeof extra.errors !== 'undefined') {
-                tokens.errors = extra.errors;
-            }
-        } catch (e) {
-            throw e;
-        } finally {
-            extra = {};
-        }
-        return tokens;
-    }
-
-    function parse(code, options) {
-        var program, toString;
-
-        toString = String;
-        if (typeof code !== 'string' && !(code instanceof String)) {
-            code = toString(code);
-        }
-
-        source = code;
-        index = 0;
-        lineNumber = (source.length > 0) ? 1 : 0;
-        lineStart = 0;
-        startIndex = index;
-        startLineNumber = lineNumber;
-        startLineStart = lineStart;
-        length = source.length;
-        lookahead = null;
-        state = {
-            allowIn: true,
-            allowYield: true,
-            labelSet: {},
-            inFunctionBody: false,
-            inIteration: false,
-            inSwitch: false,
-            lastCommentStart: -1,
-            curlyStack: [],
-            sourceType: 'script'
-        };
-        strict = false;
-
-        extra = {};
-        if (typeof options !== 'undefined') {
-            extra.range = (typeof options.range === 'boolean') && options.range;
-            extra.loc = (typeof options.loc === 'boolean') && options.loc;
-            extra.attachComment = (typeof options.attachComment === 'boolean') && options.attachComment;
-
-            if (extra.loc && options.source !== null && options.source !== undefined) {
-                extra.source = toString(options.source);
-            }
-
-            if (typeof options.tokens === 'boolean' && options.tokens) {
-                extra.tokens = [];
-            }
-            if (typeof options.comment === 'boolean' && options.comment) {
-                extra.comments = [];
-            }
-            if (typeof options.tolerant === 'boolean' && options.tolerant) {
-                extra.errors = [];
-            }
-            if (extra.attachComment) {
-                extra.range = true;
-                extra.comments = [];
-                extra.bottomRightStack = [];
-                extra.trailingComments = [];
-                extra.leadingComments = [];
-            }
-            if (options.sourceType === 'module') {
-                // very restrictive condition for now
-                state.sourceType = options.sourceType;
-                strict = true;
-            }
-        }
-
-        try {
-            program = parseProgram();
-            if (typeof extra.comments !== 'undefined') {
-                program.comments = extra.comments;
-            }
-            if (typeof extra.tokens !== 'undefined') {
-                filterTokenLocation();
-                program.tokens = extra.tokens;
-            }
-            if (typeof extra.errors !== 'undefined') {
-                program.errors = extra.errors;
-            }
-        } catch (e) {
-            throw e;
-        } finally {
-            extra = {};
-        }
-
-        return program;
-    }
-
-    // Sync with *.json manifests.
-    exports.version = '2.7.1';
-
-    exports.tokenize = tokenize;
-
-    exports.parse = parse;
-
-    // Deep copy.
-    /* istanbul ignore next */
-    exports.Syntax = (function () {
-        var name, types = {};
-
-        if (typeof Object.create === 'function') {
-            types = Object.create(null);
-        }
-
-        for (name in Syntax) {
-            if (Syntax.hasOwnProperty(name)) {
-                types[name] = Syntax[name];
-            }
-        }
-
-        if (typeof Object.freeze === 'function') {
-            Object.freeze(types);
-        }
-
-        return types;
-    }());
-
-}));
-/* vim: set sw=4 ts=4 et tw=80 : */
-
-},{}],51:[function(require,module,exports){
-/*!
- * node-inherit
- * Copyright(c) 2011 Dmitry Filatov <dfilatov@yandex-team.ru>
- * MIT Licensed
- */
-
-module.exports = require('./lib/inherit');
-
-},{"./lib/inherit":52}],52:[function(require,module,exports){
-/**
- * @module inherit
- * @version 2.2.2
- * @author Filatov Dmitry <dfilatov@yandex-team.ru>
- * @description This module provides some syntax sugar for "class" declarations, constructors, mixins, "super" calls and static members.
- */
-
-(function(global) {
-
-var hasIntrospection = (function(){'_';}).toString().indexOf('_') > -1,
-    emptyBase = function() {},
-    hasOwnProperty = Object.prototype.hasOwnProperty,
-    objCreate = Object.create || function(ptp) {
-        var inheritance = function() {};
-        inheritance.prototype = ptp;
-        return new inheritance();
-    },
-    objKeys = Object.keys || function(obj) {
-        var res = [];
-        for(var i in obj) {
-            hasOwnProperty.call(obj, i) && res.push(i);
-        }
-        return res;
-    },
-    extend = function(o1, o2) {
-        for(var i in o2) {
-            hasOwnProperty.call(o2, i) && (o1[i] = o2[i]);
-        }
-
-        return o1;
-    },
-    toStr = Object.prototype.toString,
-    isArray = Array.isArray || function(obj) {
-        return toStr.call(obj) === '[object Array]';
-    },
-    isFunction = function(obj) {
-        return toStr.call(obj) === '[object Function]';
-    },
-    noOp = function() {},
-    needCheckProps = true,
-    testPropObj = { toString : '' };
-
-for(var i in testPropObj) { // fucking ie hasn't toString, valueOf in for
-    testPropObj.hasOwnProperty(i) && (needCheckProps = false);
-}
-
-var specProps = needCheckProps? ['toString', 'valueOf'] : null;
-
-function getPropList(obj) {
-    var res = objKeys(obj);
-    if(needCheckProps) {
-        var specProp, i = 0;
-        while(specProp = specProps[i++]) {
-            obj.hasOwnProperty(specProp) && res.push(specProp);
-        }
-    }
-
-    return res;
-}
-
-function override(base, res, add) {
-    var addList = getPropList(add),
-        j = 0, len = addList.length,
-        name, prop;
-    while(j < len) {
-        if((name = addList[j++]) === '__self') {
-            continue;
-        }
-        prop = add[name];
-        if(isFunction(prop) &&
-                (!hasIntrospection || prop.toString().indexOf('.__base') > -1)) {
-            res[name] = (function(name, prop) {
-                var baseMethod = base[name]?
-                        base[name] :
-                        name === '__constructor'? // case of inheritance from plane function
-                            res.__self.__parent :
-                            noOp;
-                return function() {
-                    var baseSaved = this.__base;
-                    this.__base = baseMethod;
-                    var res = prop.apply(this, arguments);
-                    this.__base = baseSaved;
-                    return res;
-                };
-            })(name, prop);
-        } else {
-            res[name] = prop;
-        }
-    }
-}
-
-function applyMixins(mixins, res) {
-    var i = 1, mixin;
-    while(mixin = mixins[i++]) {
-        res?
-            isFunction(mixin)?
-                inherit.self(res, mixin.prototype, mixin) :
-                inherit.self(res, mixin) :
-            res = isFunction(mixin)?
-                inherit(mixins[0], mixin.prototype, mixin) :
-                inherit(mixins[0], mixin);
-    }
-    return res || mixins[0];
-}
-
-/**
-* Creates class
-* @exports
-* @param {Function|Array} [baseClass|baseClassAndMixins] class (or class and mixins) to inherit from
-* @param {Object} prototypeFields
-* @param {Object} [staticFields]
-* @returns {Function} class
-*/
-function inherit() {
-    var args = arguments,
-        withMixins = isArray(args[0]),
-        hasBase = withMixins || isFunction(args[0]),
-        base = hasBase? withMixins? applyMixins(args[0]) : args[0] : emptyBase,
-        props = args[hasBase? 1 : 0] || {},
-        staticProps = args[hasBase? 2 : 1],
-        res = props.__constructor || (hasBase && base.prototype.__constructor)?
-            function() {
-                return this.__constructor.apply(this, arguments);
-            } :
-            hasBase?
-                function() {
-                    return base.apply(this, arguments);
-                } :
-                function() {};
-
-    if(!hasBase) {
-        res.prototype = props;
-        res.prototype.__self = res.prototype.constructor = res;
-        return extend(res, staticProps);
-    }
-
-    extend(res, base);
-
-    res.__parent = base;
-
-    var basePtp = base.prototype,
-        resPtp = res.prototype = objCreate(basePtp);
-
-    resPtp.__self = resPtp.constructor = res;
-
-    props && override(basePtp, resPtp, props);
-    staticProps && override(base, res, staticProps);
-
-    return res;
-}
-
-inherit.self = function() {
-    var args = arguments,
-        withMixins = isArray(args[0]),
-        base = withMixins? applyMixins(args[0], args[0][0]) : args[0],
-        props = args[1],
-        staticProps = args[2],
-        basePtp = base.prototype;
-
-    props && override(basePtp, basePtp, props);
-    staticProps && override(base, base, staticProps);
-
-    return base;
-};
-
-var defineAsGlobal = true;
-if(typeof exports === 'object') {
-    module.exports = inherit;
-    defineAsGlobal = false;
-}
-
-if(typeof modules === 'object') {
-    modules.define('inherit', function(provide) {
-        provide(inherit);
-    });
-    defineAsGlobal = false;
-}
-
-if(typeof define === 'function') {
-    define(function(require, exports, module) {
-        module.exports = inherit;
-    });
-    defineAsGlobal = false;
-}
-
-defineAsGlobal && (global.inherit = inherit);
-
-})(this);
-
-},{}],53:[function(require,module,exports){
+},{"../type":32}],49:[function(require,module,exports){
 var baseIndexOf = require('../internal/baseIndexOf'),
     binaryIndex = require('../internal/binaryIndex');
 
@@ -17055,7 +13975,7 @@ function indexOf(array, value, fromIndex) {
 
 module.exports = indexOf;
 
-},{"../internal/baseIndexOf":82,"../internal/binaryIndex":96}],54:[function(require,module,exports){
+},{"../internal/baseIndexOf":78,"../internal/binaryIndex":92}],50:[function(require,module,exports){
 /**
  * Gets the last element of `array`.
  *
@@ -17076,7 +13996,7 @@ function last(array) {
 
 module.exports = last;
 
-},{}],55:[function(require,module,exports){
+},{}],51:[function(require,module,exports){
 var LazyWrapper = require('../internal/LazyWrapper'),
     LodashWrapper = require('../internal/LodashWrapper'),
     baseLodash = require('../internal/baseLodash'),
@@ -17203,10 +14123,10 @@ lodash.prototype = baseLodash.prototype;
 
 module.exports = lodash;
 
-},{"../internal/LazyWrapper":64,"../internal/LodashWrapper":65,"../internal/baseLodash":86,"../internal/isObjectLike":130,"../internal/wrapperClone":141,"../lang/isArray":144}],56:[function(require,module,exports){
+},{"../internal/LazyWrapper":60,"../internal/LodashWrapper":61,"../internal/baseLodash":82,"../internal/isObjectLike":126,"../internal/wrapperClone":137,"../lang/isArray":140}],52:[function(require,module,exports){
 module.exports = require('./forEach');
 
-},{"./forEach":58}],57:[function(require,module,exports){
+},{"./forEach":54}],53:[function(require,module,exports){
 var baseEach = require('../internal/baseEach'),
     createFind = require('../internal/createFind');
 
@@ -17264,7 +14184,7 @@ var find = createFind(baseEach);
 
 module.exports = find;
 
-},{"../internal/baseEach":75,"../internal/createFind":106}],58:[function(require,module,exports){
+},{"../internal/baseEach":71,"../internal/createFind":102}],54:[function(require,module,exports){
 var arrayEach = require('../internal/arrayEach'),
     baseEach = require('../internal/baseEach'),
     createForEach = require('../internal/createForEach');
@@ -17303,7 +14223,7 @@ var forEach = createForEach(arrayEach, baseEach);
 
 module.exports = forEach;
 
-},{"../internal/arrayEach":67,"../internal/baseEach":75,"../internal/createForEach":107}],59:[function(require,module,exports){
+},{"../internal/arrayEach":63,"../internal/baseEach":71,"../internal/createForEach":103}],55:[function(require,module,exports){
 var baseIndexOf = require('../internal/baseIndexOf'),
     getLength = require('../internal/getLength'),
     isArray = require('../lang/isArray'),
@@ -17362,7 +14282,7 @@ function includes(collection, target, fromIndex, guard) {
 
 module.exports = includes;
 
-},{"../internal/baseIndexOf":82,"../internal/getLength":116,"../internal/isIterateeCall":126,"../internal/isLength":129,"../lang/isArray":144,"../lang/isString":150,"../object/values":156}],60:[function(require,module,exports){
+},{"../internal/baseIndexOf":78,"../internal/getLength":112,"../internal/isIterateeCall":122,"../internal/isLength":125,"../lang/isArray":140,"../lang/isString":146,"../object/values":152}],56:[function(require,module,exports){
 var arrayMap = require('../internal/arrayMap'),
     baseCallback = require('../internal/baseCallback'),
     baseMap = require('../internal/baseMap'),
@@ -17432,7 +14352,7 @@ function map(collection, iteratee, thisArg) {
 
 module.exports = map;
 
-},{"../internal/arrayMap":68,"../internal/baseCallback":71,"../internal/baseMap":87,"../lang/isArray":144}],61:[function(require,module,exports){
+},{"../internal/arrayMap":64,"../internal/baseCallback":67,"../internal/baseMap":83,"../lang/isArray":140}],57:[function(require,module,exports){
 var getNative = require('../internal/getNative');
 
 /* Native method references for those with the same name as other `lodash` methods. */
@@ -17458,7 +14378,7 @@ var now = nativeNow || function() {
 
 module.exports = now;
 
-},{"../internal/getNative":118}],62:[function(require,module,exports){
+},{"../internal/getNative":114}],58:[function(require,module,exports){
 var createWrapper = require('../internal/createWrapper'),
     replaceHolders = require('../internal/replaceHolders'),
     restParam = require('./restParam');
@@ -17516,7 +14436,7 @@ bind.placeholder = {};
 
 module.exports = bind;
 
-},{"../internal/createWrapper":110,"../internal/replaceHolders":136,"./restParam":63}],63:[function(require,module,exports){
+},{"../internal/createWrapper":106,"../internal/replaceHolders":132,"./restParam":59}],59:[function(require,module,exports){
 /** Used as the `TypeError` message for "Functions" methods. */
 var FUNC_ERROR_TEXT = 'Expected a function';
 
@@ -17576,7 +14496,7 @@ function restParam(func, start) {
 
 module.exports = restParam;
 
-},{}],64:[function(require,module,exports){
+},{}],60:[function(require,module,exports){
 var baseCreate = require('./baseCreate'),
     baseLodash = require('./baseLodash');
 
@@ -17604,7 +14524,7 @@ LazyWrapper.prototype.constructor = LazyWrapper;
 
 module.exports = LazyWrapper;
 
-},{"./baseCreate":74,"./baseLodash":86}],65:[function(require,module,exports){
+},{"./baseCreate":70,"./baseLodash":82}],61:[function(require,module,exports){
 var baseCreate = require('./baseCreate'),
     baseLodash = require('./baseLodash');
 
@@ -17627,7 +14547,7 @@ LodashWrapper.prototype.constructor = LodashWrapper;
 
 module.exports = LodashWrapper;
 
-},{"./baseCreate":74,"./baseLodash":86}],66:[function(require,module,exports){
+},{"./baseCreate":70,"./baseLodash":82}],62:[function(require,module,exports){
 /**
  * Copies the values of `source` to `array`.
  *
@@ -17649,7 +14569,7 @@ function arrayCopy(source, array) {
 
 module.exports = arrayCopy;
 
-},{}],67:[function(require,module,exports){
+},{}],63:[function(require,module,exports){
 /**
  * A specialized version of `_.forEach` for arrays without support for callback
  * shorthands and `this` binding.
@@ -17673,7 +14593,7 @@ function arrayEach(array, iteratee) {
 
 module.exports = arrayEach;
 
-},{}],68:[function(require,module,exports){
+},{}],64:[function(require,module,exports){
 /**
  * A specialized version of `_.map` for arrays without support for callback
  * shorthands and `this` binding.
@@ -17696,7 +14616,7 @@ function arrayMap(array, iteratee) {
 
 module.exports = arrayMap;
 
-},{}],69:[function(require,module,exports){
+},{}],65:[function(require,module,exports){
 /**
  * A specialized version of `_.some` for arrays without support for callback
  * shorthands and `this` binding.
@@ -17721,7 +14641,7 @@ function arraySome(array, predicate) {
 
 module.exports = arraySome;
 
-},{}],70:[function(require,module,exports){
+},{}],66:[function(require,module,exports){
 var baseCopy = require('./baseCopy'),
     keys = require('../object/keys');
 
@@ -17742,7 +14662,7 @@ function baseAssign(object, source) {
 
 module.exports = baseAssign;
 
-},{"../object/keys":153,"./baseCopy":73}],71:[function(require,module,exports){
+},{"../object/keys":149,"./baseCopy":69}],67:[function(require,module,exports){
 var baseMatches = require('./baseMatches'),
     baseMatchesProperty = require('./baseMatchesProperty'),
     bindCallback = require('./bindCallback'),
@@ -17779,7 +14699,7 @@ function baseCallback(func, thisArg, argCount) {
 
 module.exports = baseCallback;
 
-},{"../utility/identity":158,"../utility/property":160,"./baseMatches":88,"./baseMatchesProperty":89,"./bindCallback":98}],72:[function(require,module,exports){
+},{"../utility/identity":154,"../utility/property":156,"./baseMatches":84,"./baseMatchesProperty":85,"./bindCallback":94}],68:[function(require,module,exports){
 var arrayCopy = require('./arrayCopy'),
     arrayEach = require('./arrayEach'),
     baseAssign = require('./baseAssign'),
@@ -17913,7 +14833,7 @@ function baseClone(value, isDeep, customizer, key, object, stackA, stackB) {
 
 module.exports = baseClone;
 
-},{"../lang/isArray":144,"../lang/isObject":148,"./arrayCopy":66,"./arrayEach":67,"./baseAssign":70,"./baseForOwn":80,"./initCloneArray":120,"./initCloneByTag":121,"./initCloneObject":122,"./isHostObject":124}],73:[function(require,module,exports){
+},{"../lang/isArray":140,"../lang/isObject":144,"./arrayCopy":62,"./arrayEach":63,"./baseAssign":66,"./baseForOwn":76,"./initCloneArray":116,"./initCloneByTag":117,"./initCloneObject":118,"./isHostObject":120}],69:[function(require,module,exports){
 /**
  * Copies properties of `source` to `object`.
  *
@@ -17938,7 +14858,7 @@ function baseCopy(source, props, object) {
 
 module.exports = baseCopy;
 
-},{}],74:[function(require,module,exports){
+},{}],70:[function(require,module,exports){
 var isObject = require('../lang/isObject');
 
 /**
@@ -17963,7 +14883,7 @@ var baseCreate = (function() {
 
 module.exports = baseCreate;
 
-},{"../lang/isObject":148}],75:[function(require,module,exports){
+},{"../lang/isObject":144}],71:[function(require,module,exports){
 var baseForOwn = require('./baseForOwn'),
     createBaseEach = require('./createBaseEach');
 
@@ -17980,7 +14900,7 @@ var baseEach = createBaseEach(baseForOwn);
 
 module.exports = baseEach;
 
-},{"./baseForOwn":80,"./createBaseEach":102}],76:[function(require,module,exports){
+},{"./baseForOwn":76,"./createBaseEach":98}],72:[function(require,module,exports){
 /**
  * The base implementation of `_.find`, `_.findLast`, `_.findKey`, and `_.findLastKey`,
  * without support for callback shorthands and `this` binding, which iterates
@@ -18007,7 +14927,7 @@ function baseFind(collection, predicate, eachFunc, retKey) {
 
 module.exports = baseFind;
 
-},{}],77:[function(require,module,exports){
+},{}],73:[function(require,module,exports){
 /**
  * The base implementation of `_.findIndex` and `_.findLastIndex` without
  * support for callback shorthands and `this` binding.
@@ -18032,7 +14952,7 @@ function baseFindIndex(array, predicate, fromRight) {
 
 module.exports = baseFindIndex;
 
-},{}],78:[function(require,module,exports){
+},{}],74:[function(require,module,exports){
 var createBaseFor = require('./createBaseFor');
 
 /**
@@ -18051,7 +14971,7 @@ var baseFor = createBaseFor();
 
 module.exports = baseFor;
 
-},{"./createBaseFor":103}],79:[function(require,module,exports){
+},{"./createBaseFor":99}],75:[function(require,module,exports){
 var baseFor = require('./baseFor'),
     keysIn = require('../object/keysIn');
 
@@ -18070,7 +14990,7 @@ function baseForIn(object, iteratee) {
 
 module.exports = baseForIn;
 
-},{"../object/keysIn":154,"./baseFor":78}],80:[function(require,module,exports){
+},{"../object/keysIn":150,"./baseFor":74}],76:[function(require,module,exports){
 var baseFor = require('./baseFor'),
     keys = require('../object/keys');
 
@@ -18089,7 +15009,7 @@ function baseForOwn(object, iteratee) {
 
 module.exports = baseForOwn;
 
-},{"../object/keys":153,"./baseFor":78}],81:[function(require,module,exports){
+},{"../object/keys":149,"./baseFor":74}],77:[function(require,module,exports){
 var toObject = require('./toObject');
 
 /**
@@ -18121,7 +15041,7 @@ function baseGet(object, path, pathKey) {
 
 module.exports = baseGet;
 
-},{"./toObject":139}],82:[function(require,module,exports){
+},{"./toObject":135}],78:[function(require,module,exports){
 var indexOfNaN = require('./indexOfNaN');
 
 /**
@@ -18150,7 +15070,7 @@ function baseIndexOf(array, value, fromIndex) {
 
 module.exports = baseIndexOf;
 
-},{"./indexOfNaN":119}],83:[function(require,module,exports){
+},{"./indexOfNaN":115}],79:[function(require,module,exports){
 var baseIsEqualDeep = require('./baseIsEqualDeep'),
     isObject = require('../lang/isObject'),
     isObjectLike = require('./isObjectLike');
@@ -18180,7 +15100,7 @@ function baseIsEqual(value, other, customizer, isLoose, stackA, stackB) {
 
 module.exports = baseIsEqual;
 
-},{"../lang/isObject":148,"./baseIsEqualDeep":84,"./isObjectLike":130}],84:[function(require,module,exports){
+},{"../lang/isObject":144,"./baseIsEqualDeep":80,"./isObjectLike":126}],80:[function(require,module,exports){
 var equalArrays = require('./equalArrays'),
     equalByTag = require('./equalByTag'),
     equalObjects = require('./equalObjects'),
@@ -18285,7 +15205,7 @@ function baseIsEqualDeep(object, other, equalFunc, customizer, isLoose, stackA,
 
 module.exports = baseIsEqualDeep;
 
-},{"../lang/isArray":144,"../lang/isTypedArray":151,"./equalArrays":111,"./equalByTag":112,"./equalObjects":113,"./isHostObject":124}],85:[function(require,module,exports){
+},{"../lang/isArray":140,"../lang/isTypedArray":147,"./equalArrays":107,"./equalByTag":108,"./equalObjects":109,"./isHostObject":120}],81:[function(require,module,exports){
 var baseIsEqual = require('./baseIsEqual'),
     toObject = require('./toObject');
 
@@ -18339,7 +15259,7 @@ function baseIsMatch(object, matchData, customizer) {
 
 module.exports = baseIsMatch;
 
-},{"./baseIsEqual":83,"./toObject":139}],86:[function(require,module,exports){
+},{"./baseIsEqual":79,"./toObject":135}],82:[function(require,module,exports){
 /**
  * The function whose prototype all chaining wrappers inherit from.
  *
@@ -18351,7 +15271,7 @@ function baseLodash() {
 
 module.exports = baseLodash;
 
-},{}],87:[function(require,module,exports){
+},{}],83:[function(require,module,exports){
 var baseEach = require('./baseEach'),
     isArrayLike = require('./isArrayLike');
 
@@ -18376,7 +15296,7 @@ function baseMap(collection, iteratee) {
 
 module.exports = baseMap;
 
-},{"./baseEach":75,"./isArrayLike":123}],88:[function(require,module,exports){
+},{"./baseEach":71,"./isArrayLike":119}],84:[function(require,module,exports){
 var baseIsMatch = require('./baseIsMatch'),
     getMatchData = require('./getMatchData'),
     toObject = require('./toObject');
@@ -18409,7 +15329,7 @@ function baseMatches(source) {
 
 module.exports = baseMatches;
 
-},{"./baseIsMatch":85,"./getMatchData":117,"./toObject":139}],89:[function(require,module,exports){
+},{"./baseIsMatch":81,"./getMatchData":113,"./toObject":135}],85:[function(require,module,exports){
 var baseGet = require('./baseGet'),
     baseIsEqual = require('./baseIsEqual'),
     baseSlice = require('./baseSlice'),
@@ -18456,7 +15376,7 @@ function baseMatchesProperty(path, srcValue) {
 
 module.exports = baseMatchesProperty;
 
-},{"../array/last":54,"../lang/isArray":144,"./baseGet":81,"./baseIsEqual":83,"./baseSlice":93,"./isKey":127,"./isStrictComparable":131,"./toObject":139,"./toPath":140}],90:[function(require,module,exports){
+},{"../array/last":50,"../lang/isArray":140,"./baseGet":77,"./baseIsEqual":79,"./baseSlice":89,"./isKey":123,"./isStrictComparable":127,"./toObject":135,"./toPath":136}],86:[function(require,module,exports){
 var toObject = require('./toObject');
 
 /**
@@ -18474,7 +15394,7 @@ function baseProperty(key) {
 
 module.exports = baseProperty;
 
-},{"./toObject":139}],91:[function(require,module,exports){
+},{"./toObject":135}],87:[function(require,module,exports){
 var baseGet = require('./baseGet'),
     toPath = require('./toPath');
 
@@ -18495,7 +15415,7 @@ function basePropertyDeep(path) {
 
 module.exports = basePropertyDeep;
 
-},{"./baseGet":81,"./toPath":140}],92:[function(require,module,exports){
+},{"./baseGet":77,"./toPath":136}],88:[function(require,module,exports){
 var identity = require('../utility/identity'),
     metaMap = require('./metaMap');
 
@@ -18514,7 +15434,7 @@ var baseSetData = !metaMap ? identity : function(func, data) {
 
 module.exports = baseSetData;
 
-},{"../utility/identity":158,"./metaMap":133}],93:[function(require,module,exports){
+},{"../utility/identity":154,"./metaMap":129}],89:[function(require,module,exports){
 /**
  * The base implementation of `_.slice` without an iteratee call guard.
  *
@@ -18548,7 +15468,7 @@ function baseSlice(array, start, end) {
 
 module.exports = baseSlice;
 
-},{}],94:[function(require,module,exports){
+},{}],90:[function(require,module,exports){
 /**
  * Converts `value` to a string if it's not one. An empty string is returned
  * for `null` or `undefined` values.
@@ -18563,7 +15483,7 @@ function baseToString(value) {
 
 module.exports = baseToString;
 
-},{}],95:[function(require,module,exports){
+},{}],91:[function(require,module,exports){
 /**
  * The base implementation of `_.values` and `_.valuesIn` which creates an
  * array of `object` property values corresponding to the property names
@@ -18587,7 +15507,7 @@ function baseValues(object, props) {
 
 module.exports = baseValues;
 
-},{}],96:[function(require,module,exports){
+},{}],92:[function(require,module,exports){
 var binaryIndexBy = require('./binaryIndexBy'),
     identity = require('../utility/identity');
 
@@ -18628,7 +15548,7 @@ function binaryIndex(array, value, retHighest) {
 
 module.exports = binaryIndex;
 
-},{"../utility/identity":158,"./binaryIndexBy":97}],97:[function(require,module,exports){
+},{"../utility/identity":154,"./binaryIndexBy":93}],93:[function(require,module,exports){
 /* Native method references for those with the same name as other `lodash` methods. */
 var nativeFloor = Math.floor,
     nativeMin = Math.min;
@@ -18687,7 +15607,7 @@ function binaryIndexBy(array, value, iteratee, retHighest) {
 
 module.exports = binaryIndexBy;
 
-},{}],98:[function(require,module,exports){
+},{}],94:[function(require,module,exports){
 var identity = require('../utility/identity');
 
 /**
@@ -18728,7 +15648,7 @@ function bindCallback(func, thisArg, argCount) {
 
 module.exports = bindCallback;
 
-},{"../utility/identity":158}],99:[function(require,module,exports){
+},{"../utility/identity":154}],95:[function(require,module,exports){
 (function (global){
 /** Native method references. */
 var ArrayBuffer = global.ArrayBuffer,
@@ -18752,8 +15672,8 @@ function bufferClone(buffer) {
 module.exports = bufferClone;
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2J1ZmZlckNsb25lLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIi8qKiBOYXRpdmUgbWV0aG9kIHJlZmVyZW5jZXMuICovXG52YXIgQXJyYXlCdWZmZXIgPSBnbG9iYWwuQXJyYXlCdWZmZXIsXG4gICAgVWludDhBcnJheSA9IGdsb2JhbC5VaW50OEFycmF5O1xuXG4vKipcbiAqIENyZWF0ZXMgYSBjbG9uZSBvZiB0aGUgZ2l2ZW4gYXJyYXkgYnVmZmVyLlxuICpcbiAqIEBwcml2YXRlXG4gKiBAcGFyYW0ge0FycmF5QnVmZmVyfSBidWZmZXIgVGhlIGFycmF5IGJ1ZmZlciB0byBjbG9uZS5cbiAqIEByZXR1cm5zIHtBcnJheUJ1ZmZlcn0gUmV0dXJucyB0aGUgY2xvbmVkIGFycmF5IGJ1ZmZlci5cbiAqL1xuZnVuY3Rpb24gYnVmZmVyQ2xvbmUoYnVmZmVyKSB7XG4gIHZhciByZXN1bHQgPSBuZXcgQXJyYXlCdWZmZXIoYnVmZmVyLmJ5dGVMZW5ndGgpLFxuICAgICAgdmlldyA9IG5ldyBVaW50OEFycmF5KHJlc3VsdCk7XG5cbiAgdmlldy5zZXQobmV3IFVpbnQ4QXJyYXkoYnVmZmVyKSk7XG4gIHJldHVybiByZXN1bHQ7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gYnVmZmVyQ2xvbmU7XG4iXX0=
-},{}],100:[function(require,module,exports){
+
+},{}],96:[function(require,module,exports){
 /* Native method references for those with the same name as other `lodash` methods. */
 var nativeMax = Math.max;
 
@@ -18789,7 +15709,7 @@ function composeArgs(args, partials, holders) {
 
 module.exports = composeArgs;
 
-},{}],101:[function(require,module,exports){
+},{}],97:[function(require,module,exports){
 /* Native method references for those with the same name as other `lodash` methods. */
 var nativeMax = Math.max;
 
@@ -18827,7 +15747,7 @@ function composeArgsRight(args, partials, holders) {
 
 module.exports = composeArgsRight;
 
-},{}],102:[function(require,module,exports){
+},{}],98:[function(require,module,exports){
 var getLength = require('./getLength'),
     isLength = require('./isLength'),
     toObject = require('./toObject');
@@ -18860,7 +15780,7 @@ function createBaseEach(eachFunc, fromRight) {
 
 module.exports = createBaseEach;
 
-},{"./getLength":116,"./isLength":129,"./toObject":139}],103:[function(require,module,exports){
+},{"./getLength":112,"./isLength":125,"./toObject":135}],99:[function(require,module,exports){
 var toObject = require('./toObject');
 
 /**
@@ -18889,7 +15809,7 @@ function createBaseFor(fromRight) {
 
 module.exports = createBaseFor;
 
-},{"./toObject":139}],104:[function(require,module,exports){
+},{"./toObject":135}],100:[function(require,module,exports){
 (function (global){
 var createCtorWrapper = require('./createCtorWrapper');
 
@@ -18915,8 +15835,8 @@ function createBindWrapper(func, thisArg) {
 module.exports = createBindWrapper;
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZUJpbmRXcmFwcGVyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyk7XG5cbi8qKlxuICogQ3JlYXRlcyBhIGZ1bmN0aW9uIHRoYXQgd3JhcHMgYGZ1bmNgIGFuZCBpbnZva2VzIGl0IHdpdGggdGhlIGB0aGlzYFxuICogYmluZGluZyBvZiBgdGhpc0FyZ2AuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7RnVuY3Rpb259IGZ1bmMgVGhlIGZ1bmN0aW9uIHRvIGJpbmQuXG4gKiBAcGFyYW0geyp9IFt0aGlzQXJnXSBUaGUgYHRoaXNgIGJpbmRpbmcgb2YgYGZ1bmNgLlxuICogQHJldHVybnMge0Z1bmN0aW9ufSBSZXR1cm5zIHRoZSBuZXcgYm91bmQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZUJpbmRXcmFwcGVyKGZ1bmMsIHRoaXNBcmcpIHtcbiAgdmFyIEN0b3IgPSBjcmVhdGVDdG9yV3JhcHBlcihmdW5jKTtcblxuICBmdW5jdGlvbiB3cmFwcGVyKCkge1xuICAgIHZhciBmbiA9ICh0aGlzICYmIHRoaXMgIT09IGdsb2JhbCAmJiB0aGlzIGluc3RhbmNlb2Ygd3JhcHBlcikgPyBDdG9yIDogZnVuYztcbiAgICByZXR1cm4gZm4uYXBwbHkodGhpc0FyZywgYXJndW1lbnRzKTtcbiAgfVxuICByZXR1cm4gd3JhcHBlcjtcbn1cblxubW9kdWxlLmV4cG9ydHMgPSBjcmVhdGVCaW5kV3JhcHBlcjtcbiJdfQ==
-},{"./createCtorWrapper":105}],105:[function(require,module,exports){
+
+},{"./createCtorWrapper":101}],101:[function(require,module,exports){
 var baseCreate = require('./baseCreate'),
     isObject = require('../lang/isObject');
 
@@ -18955,7 +15875,7 @@ function createCtorWrapper(Ctor) {
 
 module.exports = createCtorWrapper;
 
-},{"../lang/isObject":148,"./baseCreate":74}],106:[function(require,module,exports){
+},{"../lang/isObject":144,"./baseCreate":70}],102:[function(require,module,exports){
 var baseCallback = require('./baseCallback'),
     baseFind = require('./baseFind'),
     baseFindIndex = require('./baseFindIndex'),
@@ -18982,7 +15902,7 @@ function createFind(eachFunc, fromRight) {
 
 module.exports = createFind;
 
-},{"../lang/isArray":144,"./baseCallback":71,"./baseFind":76,"./baseFindIndex":77}],107:[function(require,module,exports){
+},{"../lang/isArray":140,"./baseCallback":67,"./baseFind":72,"./baseFindIndex":73}],103:[function(require,module,exports){
 var bindCallback = require('./bindCallback'),
     isArray = require('../lang/isArray');
 
@@ -19004,7 +15924,7 @@ function createForEach(arrayFunc, eachFunc) {
 
 module.exports = createForEach;
 
-},{"../lang/isArray":144,"./bindCallback":98}],108:[function(require,module,exports){
+},{"../lang/isArray":140,"./bindCallback":94}],104:[function(require,module,exports){
 (function (global){
 var arrayCopy = require('./arrayCopy'),
     composeArgs = require('./composeArgs'),
@@ -19119,8 +16039,8 @@ function createHybridWrapper(func, bitmask, thisArg, partials, holders, partials
 module.exports = createHybridWrapper;
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZUh5YnJpZFdyYXBwZXIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYXJyYXlDb3B5ID0gcmVxdWlyZSgnLi9hcnJheUNvcHknKSxcbiAgICBjb21wb3NlQXJncyA9IHJlcXVpcmUoJy4vY29tcG9zZUFyZ3MnKSxcbiAgICBjb21wb3NlQXJnc1JpZ2h0ID0gcmVxdWlyZSgnLi9jb21wb3NlQXJnc1JpZ2h0JyksXG4gICAgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyksXG4gICAgaXNMYXppYWJsZSA9IHJlcXVpcmUoJy4vaXNMYXppYWJsZScpLFxuICAgIHJlb3JkZXIgPSByZXF1aXJlKCcuL3Jlb3JkZXInKSxcbiAgICByZXBsYWNlSG9sZGVycyA9IHJlcXVpcmUoJy4vcmVwbGFjZUhvbGRlcnMnKSxcbiAgICBzZXREYXRhID0gcmVxdWlyZSgnLi9zZXREYXRhJyk7XG5cbi8qKiBVc2VkIHRvIGNvbXBvc2UgYml0bWFza3MgZm9yIHdyYXBwZXIgbWV0YWRhdGEuICovXG52YXIgQklORF9GTEFHID0gMSxcbiAgICBCSU5EX0tFWV9GTEFHID0gMixcbiAgICBDVVJSWV9CT1VORF9GTEFHID0gNCxcbiAgICBDVVJSWV9GTEFHID0gOCxcbiAgICBDVVJSWV9SSUdIVF9GTEFHID0gMTYsXG4gICAgUEFSVElBTF9GTEFHID0gMzIsXG4gICAgUEFSVElBTF9SSUdIVF9GTEFHID0gNjQsXG4gICAgQVJZX0ZMQUcgPSAxMjg7XG5cbi8qIE5hdGl2ZSBtZXRob2QgcmVmZXJlbmNlcyBmb3IgdGhvc2Ugd2l0aCB0aGUgc2FtZSBuYW1lIGFzIG90aGVyIGBsb2Rhc2hgIG1ldGhvZHMuICovXG52YXIgbmF0aXZlTWF4ID0gTWF0aC5tYXg7XG5cbi8qKlxuICogQ3JlYXRlcyBhIGZ1bmN0aW9uIHRoYXQgd3JhcHMgYGZ1bmNgIGFuZCBpbnZva2VzIGl0IHdpdGggb3B0aW9uYWwgYHRoaXNgXG4gKiBiaW5kaW5nIG9mLCBwYXJ0aWFsIGFwcGxpY2F0aW9uLCBhbmQgY3VycnlpbmcuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7RnVuY3Rpb258c3RyaW5nfSBmdW5jIFRoZSBmdW5jdGlvbiBvciBtZXRob2QgbmFtZSB0byByZWZlcmVuY2UuXG4gKiBAcGFyYW0ge251bWJlcn0gYml0bWFzayBUaGUgYml0bWFzayBvZiBmbGFncy4gU2VlIGBjcmVhdGVXcmFwcGVyYCBmb3IgbW9yZSBkZXRhaWxzLlxuICogQHBhcmFtIHsqfSBbdGhpc0FyZ10gVGhlIGB0aGlzYCBiaW5kaW5nIG9mIGBmdW5jYC5cbiAqIEBwYXJhbSB7QXJyYXl9IFtwYXJ0aWFsc10gVGhlIGFyZ3VtZW50cyB0byBwcmVwZW5kIHRvIHRob3NlIHByb3ZpZGVkIHRvIHRoZSBuZXcgZnVuY3Rpb24uXG4gKiBAcGFyYW0ge0FycmF5fSBbaG9sZGVyc10gVGhlIGBwYXJ0aWFsc2AgcGxhY2Vob2xkZXIgaW5kZXhlcy5cbiAqIEBwYXJhbSB7QXJyYXl9IFtwYXJ0aWFsc1JpZ2h0XSBUaGUgYXJndW1lbnRzIHRvIGFwcGVuZCB0byB0aG9zZSBwcm92aWRlZCB0byB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHBhcmFtIHtBcnJheX0gW2hvbGRlcnNSaWdodF0gVGhlIGBwYXJ0aWFsc1JpZ2h0YCBwbGFjZWhvbGRlciBpbmRleGVzLlxuICogQHBhcmFtIHtBcnJheX0gW2FyZ1Bvc10gVGhlIGFyZ3VtZW50IHBvc2l0aW9ucyBvZiB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHBhcmFtIHtudW1iZXJ9IFthcnldIFRoZSBhcml0eSBjYXAgb2YgYGZ1bmNgLlxuICogQHBhcmFtIHtudW1iZXJ9IFthcml0eV0gVGhlIGFyaXR5IG9mIGBmdW5jYC5cbiAqIEByZXR1cm5zIHtGdW5jdGlvbn0gUmV0dXJucyB0aGUgbmV3IHdyYXBwZWQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZUh5YnJpZFdyYXBwZXIoZnVuYywgYml0bWFzaywgdGhpc0FyZywgcGFydGlhbHMsIGhvbGRlcnMsIHBhcnRpYWxzUmlnaHQsIGhvbGRlcnNSaWdodCwgYXJnUG9zLCBhcnksIGFyaXR5KSB7XG4gIHZhciBpc0FyeSA9IGJpdG1hc2sgJiBBUllfRkxBRyxcbiAgICAgIGlzQmluZCA9IGJpdG1hc2sgJiBCSU5EX0ZMQUcsXG4gICAgICBpc0JpbmRLZXkgPSBiaXRtYXNrICYgQklORF9LRVlfRkxBRyxcbiAgICAgIGlzQ3VycnkgPSBiaXRtYXNrICYgQ1VSUllfRkxBRyxcbiAgICAgIGlzQ3VycnlCb3VuZCA9IGJpdG1hc2sgJiBDVVJSWV9CT1VORF9GTEFHLFxuICAgICAgaXNDdXJyeVJpZ2h0ID0gYml0bWFzayAmIENVUlJZX1JJR0hUX0ZMQUcsXG4gICAgICBDdG9yID0gaXNCaW5kS2V5ID8gdW5kZWZpbmVkIDogY3JlYXRlQ3RvcldyYXBwZXIoZnVuYyk7XG5cbiAgZnVuY3Rpb24gd3JhcHBlcigpIHtcbiAgICAvLyBBdm9pZCBgYXJndW1lbnRzYCBvYmplY3QgdXNlIGRpc3F1YWxpZnlpbmcgb3B0aW1pemF0aW9ucyBieVxuICAgIC8vIGNvbnZlcnRpbmcgaXQgdG8gYW4gYXJyYXkgYmVmb3JlIHByb3ZpZGluZyBpdCB0byBvdGhlciBmdW5jdGlvbnMuXG4gICAgdmFyIGxlbmd0aCA9IGFyZ3VtZW50cy5sZW5ndGgsXG4gICAgICAgIGluZGV4ID0gbGVuZ3RoLFxuICAgICAgICBhcmdzID0gQXJyYXkobGVuZ3RoKTtcblxuICAgIHdoaWxlIChpbmRleC0tKSB7XG4gICAgICBhcmdzW2luZGV4XSA9IGFyZ3VtZW50c1tpbmRleF07XG4gICAgfVxuICAgIGlmIChwYXJ0aWFscykge1xuICAgICAgYXJncyA9IGNvbXBvc2VBcmdzKGFyZ3MsIHBhcnRpYWxzLCBob2xkZXJzKTtcbiAgICB9XG4gICAgaWYgKHBhcnRpYWxzUmlnaHQpIHtcbiAgICAgIGFyZ3MgPSBjb21wb3NlQXJnc1JpZ2h0KGFyZ3MsIHBhcnRpYWxzUmlnaHQsIGhvbGRlcnNSaWdodCk7XG4gICAgfVxuICAgIGlmIChpc0N1cnJ5IHx8IGlzQ3VycnlSaWdodCkge1xuICAgICAgdmFyIHBsYWNlaG9sZGVyID0gd3JhcHBlci5wbGFjZWhvbGRlcixcbiAgICAgICAgICBhcmdzSG9sZGVycyA9IHJlcGxhY2VIb2xkZXJzKGFyZ3MsIHBsYWNlaG9sZGVyKTtcblxuICAgICAgbGVuZ3RoIC09IGFyZ3NIb2xkZXJzLmxlbmd0aDtcbiAgICAgIGlmIChsZW5ndGggPCBhcml0eSkge1xuICAgICAgICB2YXIgbmV3QXJnUG9zID0gYXJnUG9zID8gYXJyYXlDb3B5KGFyZ1BvcykgOiB1bmRlZmluZWQsXG4gICAgICAgICAgICBuZXdBcml0eSA9IG5hdGl2ZU1heChhcml0eSAtIGxlbmd0aCwgMCksXG4gICAgICAgICAgICBuZXdzSG9sZGVycyA9IGlzQ3VycnkgPyBhcmdzSG9sZGVycyA6IHVuZGVmaW5lZCxcbiAgICAgICAgICAgIG5ld0hvbGRlcnNSaWdodCA9IGlzQ3VycnkgPyB1bmRlZmluZWQgOiBhcmdzSG9sZGVycyxcbiAgICAgICAgICAgIG5ld1BhcnRpYWxzID0gaXNDdXJyeSA/IGFyZ3MgOiB1bmRlZmluZWQsXG4gICAgICAgICAgICBuZXdQYXJ0aWFsc1JpZ2h0ID0gaXNDdXJyeSA/IHVuZGVmaW5lZCA6IGFyZ3M7XG5cbiAgICAgICAgYml0bWFzayB8PSAoaXNDdXJyeSA/IFBBUlRJQUxfRkxBRyA6IFBBUlRJQUxfUklHSFRfRkxBRyk7XG4gICAgICAgIGJpdG1hc2sgJj0gfihpc0N1cnJ5ID8gUEFSVElBTF9SSUdIVF9GTEFHIDogUEFSVElBTF9GTEFHKTtcblxuICAgICAgICBpZiAoIWlzQ3VycnlCb3VuZCkge1xuICAgICAgICAgIGJpdG1hc2sgJj0gfihCSU5EX0ZMQUcgfCBCSU5EX0tFWV9GTEFHKTtcbiAgICAgICAgfVxuICAgICAgICB2YXIgbmV3RGF0YSA9IFtmdW5jLCBiaXRtYXNrLCB0aGlzQXJnLCBuZXdQYXJ0aWFscywgbmV3c0hvbGRlcnMsIG5ld1BhcnRpYWxzUmlnaHQsIG5ld0hvbGRlcnNSaWdodCwgbmV3QXJnUG9zLCBhcnksIG5ld0FyaXR5XSxcbiAgICAgICAgICAgIHJlc3VsdCA9IGNyZWF0ZUh5YnJpZFdyYXBwZXIuYXBwbHkodW5kZWZpbmVkLCBuZXdEYXRhKTtcblxuICAgICAgICBpZiAoaXNMYXppYWJsZShmdW5jKSkge1xuICAgICAgICAgIHNldERhdGEocmVzdWx0LCBuZXdEYXRhKTtcbiAgICAgICAgfVxuICAgICAgICByZXN1bHQucGxhY2Vob2xkZXIgPSBwbGFjZWhvbGRlcjtcbiAgICAgICAgcmV0dXJuIHJlc3VsdDtcbiAgICAgIH1cbiAgICB9XG4gICAgdmFyIHRoaXNCaW5kaW5nID0gaXNCaW5kID8gdGhpc0FyZyA6IHRoaXMsXG4gICAgICAgIGZuID0gaXNCaW5kS2V5ID8gdGhpc0JpbmRpbmdbZnVuY10gOiBmdW5jO1xuXG4gICAgaWYgKGFyZ1Bvcykge1xuICAgICAgYXJncyA9IHJlb3JkZXIoYXJncywgYXJnUG9zKTtcbiAgICB9XG4gICAgaWYgKGlzQXJ5ICYmIGFyeSA8IGFyZ3MubGVuZ3RoKSB7XG4gICAgICBhcmdzLmxlbmd0aCA9IGFyeTtcbiAgICB9XG4gICAgaWYgKHRoaXMgJiYgdGhpcyAhPT0gZ2xvYmFsICYmIHRoaXMgaW5zdGFuY2VvZiB3cmFwcGVyKSB7XG4gICAgICBmbiA9IEN0b3IgfHwgY3JlYXRlQ3RvcldyYXBwZXIoZnVuYyk7XG4gICAgfVxuICAgIHJldHVybiBmbi5hcHBseSh0aGlzQmluZGluZywgYXJncyk7XG4gIH1cbiAgcmV0dXJuIHdyYXBwZXI7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gY3JlYXRlSHlicmlkV3JhcHBlcjtcbiJdfQ==
-},{"./arrayCopy":66,"./composeArgs":100,"./composeArgsRight":101,"./createCtorWrapper":105,"./isLaziable":128,"./reorder":135,"./replaceHolders":136,"./setData":137}],109:[function(require,module,exports){
+
+},{"./arrayCopy":62,"./composeArgs":96,"./composeArgsRight":97,"./createCtorWrapper":101,"./isLaziable":124,"./reorder":131,"./replaceHolders":132,"./setData":133}],105:[function(require,module,exports){
 (function (global){
 var createCtorWrapper = require('./createCtorWrapper');
 
@@ -19167,8 +16087,8 @@ function createPartialWrapper(func, bitmask, thisArg, partials) {
 module.exports = createPartialWrapper;
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZVBhcnRpYWxXcmFwcGVyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyk7XG5cbi8qKiBVc2VkIHRvIGNvbXBvc2UgYml0bWFza3MgZm9yIHdyYXBwZXIgbWV0YWRhdGEuICovXG52YXIgQklORF9GTEFHID0gMTtcblxuLyoqXG4gKiBDcmVhdGVzIGEgZnVuY3Rpb24gdGhhdCB3cmFwcyBgZnVuY2AgYW5kIGludm9rZXMgaXQgd2l0aCB0aGUgb3B0aW9uYWwgYHRoaXNgXG4gKiBiaW5kaW5nIG9mIGB0aGlzQXJnYCBhbmQgdGhlIGBwYXJ0aWFsc2AgcHJlcGVuZGVkIHRvIHRob3NlIHByb3ZpZGVkIHRvXG4gKiB0aGUgd3JhcHBlci5cbiAqXG4gKiBAcHJpdmF0ZVxuICogQHBhcmFtIHtGdW5jdGlvbn0gZnVuYyBUaGUgZnVuY3Rpb24gdG8gcGFydGlhbGx5IGFwcGx5IGFyZ3VtZW50cyB0by5cbiAqIEBwYXJhbSB7bnVtYmVyfSBiaXRtYXNrIFRoZSBiaXRtYXNrIG9mIGZsYWdzLiBTZWUgYGNyZWF0ZVdyYXBwZXJgIGZvciBtb3JlIGRldGFpbHMuXG4gKiBAcGFyYW0geyp9IHRoaXNBcmcgVGhlIGB0aGlzYCBiaW5kaW5nIG9mIGBmdW5jYC5cbiAqIEBwYXJhbSB7QXJyYXl9IHBhcnRpYWxzIFRoZSBhcmd1bWVudHMgdG8gcHJlcGVuZCB0byB0aG9zZSBwcm92aWRlZCB0byB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHJldHVybnMge0Z1bmN0aW9ufSBSZXR1cm5zIHRoZSBuZXcgYm91bmQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZVBhcnRpYWxXcmFwcGVyKGZ1bmMsIGJpdG1hc2ssIHRoaXNBcmcsIHBhcnRpYWxzKSB7XG4gIHZhciBpc0JpbmQgPSBiaXRtYXNrICYgQklORF9GTEFHLFxuICAgICAgQ3RvciA9IGNyZWF0ZUN0b3JXcmFwcGVyKGZ1bmMpO1xuXG4gIGZ1bmN0aW9uIHdyYXBwZXIoKSB7XG4gICAgLy8gQXZvaWQgYGFyZ3VtZW50c2Agb2JqZWN0IHVzZSBkaXNxdWFsaWZ5aW5nIG9wdGltaXphdGlvbnMgYnlcbiAgICAvLyBjb252ZXJ0aW5nIGl0IHRvIGFuIGFycmF5IGJlZm9yZSBwcm92aWRpbmcgaXQgYGZ1bmNgLlxuICAgIHZhciBhcmdzSW5kZXggPSAtMSxcbiAgICAgICAgYXJnc0xlbmd0aCA9IGFyZ3VtZW50cy5sZW5ndGgsXG4gICAgICAgIGxlZnRJbmRleCA9IC0xLFxuICAgICAgICBsZWZ0TGVuZ3RoID0gcGFydGlhbHMubGVuZ3RoLFxuICAgICAgICBhcmdzID0gQXJyYXkobGVmdExlbmd0aCArIGFyZ3NMZW5ndGgpO1xuXG4gICAgd2hpbGUgKCsrbGVmdEluZGV4IDwgbGVmdExlbmd0aCkge1xuICAgICAgYXJnc1tsZWZ0SW5kZXhdID0gcGFydGlhbHNbbGVmdEluZGV4XTtcbiAgICB9XG4gICAgd2hpbGUgKGFyZ3NMZW5ndGgtLSkge1xuICAgICAgYXJnc1tsZWZ0SW5kZXgrK10gPSBhcmd1bWVudHNbKythcmdzSW5kZXhdO1xuICAgIH1cbiAgICB2YXIgZm4gPSAodGhpcyAmJiB0aGlzICE9PSBnbG9iYWwgJiYgdGhpcyBpbnN0YW5jZW9mIHdyYXBwZXIpID8gQ3RvciA6IGZ1bmM7XG4gICAgcmV0dXJuIGZuLmFwcGx5KGlzQmluZCA/IHRoaXNBcmcgOiB0aGlzLCBhcmdzKTtcbiAgfVxuICByZXR1cm4gd3JhcHBlcjtcbn1cblxubW9kdWxlLmV4cG9ydHMgPSBjcmVhdGVQYXJ0aWFsV3JhcHBlcjtcbiJdfQ==
-},{"./createCtorWrapper":105}],110:[function(require,module,exports){
+
+},{"./createCtorWrapper":101}],106:[function(require,module,exports){
 var baseSetData = require('./baseSetData'),
     createBindWrapper = require('./createBindWrapper'),
     createHybridWrapper = require('./createHybridWrapper'),
@@ -19256,7 +16176,7 @@ function createWrapper(func, bitmask, thisArg, partials, holders, argPos, ary, a
 
 module.exports = createWrapper;
 
-},{"./baseSetData":92,"./createBindWrapper":104,"./createHybridWrapper":108,"./createPartialWrapper":109,"./getData":114,"./mergeData":132,"./setData":137}],111:[function(require,module,exports){
+},{"./baseSetData":88,"./createBindWrapper":100,"./createHybridWrapper":104,"./createPartialWrapper":105,"./getData":110,"./mergeData":128,"./setData":133}],107:[function(require,module,exports){
 var arraySome = require('./arraySome');
 
 /**
@@ -19309,7 +16229,7 @@ function equalArrays(array, other, equalFunc, customizer, isLoose, stackA, stack
 
 module.exports = equalArrays;
 
-},{"./arraySome":69}],112:[function(require,module,exports){
+},{"./arraySome":65}],108:[function(require,module,exports){
 /** `Object#toString` result references. */
 var boolTag = '[object Boolean]',
     dateTag = '[object Date]',
@@ -19359,7 +16279,7 @@ function equalByTag(object, other, tag) {
 
 module.exports = equalByTag;
 
-},{}],113:[function(require,module,exports){
+},{}],109:[function(require,module,exports){
 var keys = require('../object/keys');
 
 /** Used for native method references. */
@@ -19428,7 +16348,7 @@ function equalObjects(object, other, equalFunc, customizer, isLoose, stackA, sta
 
 module.exports = equalObjects;
 
-},{"../object/keys":153}],114:[function(require,module,exports){
+},{"../object/keys":149}],110:[function(require,module,exports){
 var metaMap = require('./metaMap'),
     noop = require('../utility/noop');
 
@@ -19445,7 +16365,7 @@ var getData = !metaMap ? noop : function(func) {
 
 module.exports = getData;
 
-},{"../utility/noop":159,"./metaMap":133}],115:[function(require,module,exports){
+},{"../utility/noop":155,"./metaMap":129}],111:[function(require,module,exports){
 var realNames = require('./realNames');
 
 /**
@@ -19472,7 +16392,7 @@ function getFuncName(func) {
 
 module.exports = getFuncName;
 
-},{"./realNames":134}],116:[function(require,module,exports){
+},{"./realNames":130}],112:[function(require,module,exports){
 var baseProperty = require('./baseProperty');
 
 /**
@@ -19489,7 +16409,7 @@ var getLength = baseProperty('length');
 
 module.exports = getLength;
 
-},{"./baseProperty":90}],117:[function(require,module,exports){
+},{"./baseProperty":86}],113:[function(require,module,exports){
 var isStrictComparable = require('./isStrictComparable'),
     pairs = require('../object/pairs');
 
@@ -19512,7 +16432,7 @@ function getMatchData(object) {
 
 module.exports = getMatchData;
 
-},{"../object/pairs":155,"./isStrictComparable":131}],118:[function(require,module,exports){
+},{"../object/pairs":151,"./isStrictComparable":127}],114:[function(require,module,exports){
 var isNative = require('../lang/isNative');
 
 /**
@@ -19530,7 +16450,7 @@ function getNative(object, key) {
 
 module.exports = getNative;
 
-},{"../lang/isNative":147}],119:[function(require,module,exports){
+},{"../lang/isNative":143}],115:[function(require,module,exports){
 /**
  * Gets the index at which the first occurrence of `NaN` is found in `array`.
  *
@@ -19555,7 +16475,7 @@ function indexOfNaN(array, fromIndex, fromRight) {
 
 module.exports = indexOfNaN;
 
-},{}],120:[function(require,module,exports){
+},{}],116:[function(require,module,exports){
 /** Used for native method references. */
 var objectProto = Object.prototype;
 
@@ -19583,7 +16503,7 @@ function initCloneArray(array) {
 
 module.exports = initCloneArray;
 
-},{}],121:[function(require,module,exports){
+},{}],117:[function(require,module,exports){
 (function (global){
 var bufferClone = require('./bufferClone');
 
@@ -19669,8 +16589,8 @@ function initCloneByTag(object, tag, isDeep) {
 module.exports = initCloneByTag;
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2luaXRDbG9uZUJ5VGFnLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYnVmZmVyQ2xvbmUgPSByZXF1aXJlKCcuL2J1ZmZlckNsb25lJyk7XG5cbi8qKiBgT2JqZWN0I3RvU3RyaW5nYCByZXN1bHQgcmVmZXJlbmNlcy4gKi9cbnZhciBib29sVGFnID0gJ1tvYmplY3QgQm9vbGVhbl0nLFxuICAgIGRhdGVUYWcgPSAnW29iamVjdCBEYXRlXScsXG4gICAgbnVtYmVyVGFnID0gJ1tvYmplY3QgTnVtYmVyXScsXG4gICAgcmVnZXhwVGFnID0gJ1tvYmplY3QgUmVnRXhwXScsXG4gICAgc3RyaW5nVGFnID0gJ1tvYmplY3QgU3RyaW5nXSc7XG5cbnZhciBhcnJheUJ1ZmZlclRhZyA9ICdbb2JqZWN0IEFycmF5QnVmZmVyXScsXG4gICAgZmxvYXQzMlRhZyA9ICdbb2JqZWN0IEZsb2F0MzJBcnJheV0nLFxuICAgIGZsb2F0NjRUYWcgPSAnW29iamVjdCBGbG9hdDY0QXJyYXldJyxcbiAgICBpbnQ4VGFnID0gJ1tvYmplY3QgSW50OEFycmF5XScsXG4gICAgaW50MTZUYWcgPSAnW29iamVjdCBJbnQxNkFycmF5XScsXG4gICAgaW50MzJUYWcgPSAnW29iamVjdCBJbnQzMkFycmF5XScsXG4gICAgdWludDhUYWcgPSAnW29iamVjdCBVaW50OEFycmF5XScsXG4gICAgdWludDhDbGFtcGVkVGFnID0gJ1tvYmplY3QgVWludDhDbGFtcGVkQXJyYXldJyxcbiAgICB1aW50MTZUYWcgPSAnW29iamVjdCBVaW50MTZBcnJheV0nLFxuICAgIHVpbnQzMlRhZyA9ICdbb2JqZWN0IFVpbnQzMkFycmF5XSc7XG5cbi8qKiBVc2VkIHRvIG1hdGNoIGBSZWdFeHBgIGZsYWdzIGZyb20gdGhlaXIgY29lcmNlZCBzdHJpbmcgdmFsdWVzLiAqL1xudmFyIHJlRmxhZ3MgPSAvXFx3KiQvO1xuXG4vKiogTmF0aXZlIG1ldGhvZCByZWZlcmVuY2VzLiAqL1xudmFyIFVpbnQ4QXJyYXkgPSBnbG9iYWwuVWludDhBcnJheTtcblxuLyoqIFVzZWQgdG8gbG9va3VwIGEgdHlwZSBhcnJheSBjb25zdHJ1Y3RvcnMgYnkgYHRvU3RyaW5nVGFnYC4gKi9cbnZhciBjdG9yQnlUYWcgPSB7fTtcbmN0b3JCeVRhZ1tmbG9hdDMyVGFnXSA9IGdsb2JhbC5GbG9hdDMyQXJyYXk7XG5jdG9yQnlUYWdbZmxvYXQ2NFRhZ10gPSBnbG9iYWwuRmxvYXQ2NEFycmF5O1xuY3RvckJ5VGFnW2ludDhUYWddID0gZ2xvYmFsLkludDhBcnJheTtcbmN0b3JCeVRhZ1tpbnQxNlRhZ10gPSBnbG9iYWwuSW50MTZBcnJheTtcbmN0b3JCeVRhZ1tpbnQzMlRhZ10gPSBnbG9iYWwuSW50MzJBcnJheTtcbmN0b3JCeVRhZ1t1aW50OFRhZ10gPSBVaW50OEFycmF5O1xuY3RvckJ5VGFnW3VpbnQ4Q2xhbXBlZFRhZ10gPSBnbG9iYWwuVWludDhDbGFtcGVkQXJyYXk7XG5jdG9yQnlUYWdbdWludDE2VGFnXSA9IGdsb2JhbC5VaW50MTZBcnJheTtcbmN0b3JCeVRhZ1t1aW50MzJUYWddID0gZ2xvYmFsLlVpbnQzMkFycmF5O1xuXG4vKipcbiAqIEluaXRpYWxpemVzIGFuIG9iamVjdCBjbG9uZSBiYXNlZCBvbiBpdHMgYHRvU3RyaW5nVGFnYC5cbiAqXG4gKiAqKk5vdGU6KiogVGhpcyBmdW5jdGlvbiBvbmx5IHN1cHBvcnRzIGNsb25pbmcgdmFsdWVzIHdpdGggdGFncyBvZlxuICogYEJvb2xlYW5gLCBgRGF0ZWAsIGBFcnJvcmAsIGBOdW1iZXJgLCBgUmVnRXhwYCwgb3IgYFN0cmluZ2AuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7T2JqZWN0fSBvYmplY3QgVGhlIG9iamVjdCB0byBjbG9uZS5cbiAqIEBwYXJhbSB7c3RyaW5nfSB0YWcgVGhlIGB0b1N0cmluZ1RhZ2Agb2YgdGhlIG9iamVjdCB0byBjbG9uZS5cbiAqIEBwYXJhbSB7Ym9vbGVhbn0gW2lzRGVlcF0gU3BlY2lmeSBhIGRlZXAgY2xvbmUuXG4gKiBAcmV0dXJucyB7T2JqZWN0fSBSZXR1cm5zIHRoZSBpbml0aWFsaXplZCBjbG9uZS5cbiAqL1xuZnVuY3Rpb24gaW5pdENsb25lQnlUYWcob2JqZWN0LCB0YWcsIGlzRGVlcCkge1xuICB2YXIgQ3RvciA9IG9iamVjdC5jb25zdHJ1Y3RvcjtcbiAgc3dpdGNoICh0YWcpIHtcbiAgICBjYXNlIGFycmF5QnVmZmVyVGFnOlxuICAgICAgcmV0dXJuIGJ1ZmZlckNsb25lKG9iamVjdCk7XG5cbiAgICBjYXNlIGJvb2xUYWc6XG4gICAgY2FzZSBkYXRlVGFnOlxuICAgICAgcmV0dXJuIG5ldyBDdG9yKCtvYmplY3QpO1xuXG4gICAgY2FzZSBmbG9hdDMyVGFnOiBjYXNlIGZsb2F0NjRUYWc6XG4gICAgY2FzZSBpbnQ4VGFnOiBjYXNlIGludDE2VGFnOiBjYXNlIGludDMyVGFnOlxuICAgIGNhc2UgdWludDhUYWc6IGNhc2UgdWludDhDbGFtcGVkVGFnOiBjYXNlIHVpbnQxNlRhZzogY2FzZSB1aW50MzJUYWc6XG4gICAgICAvLyBTYWZhcmkgNSBtb2JpbGUgaW5jb3JyZWN0bHkgaGFzIGBPYmplY3RgIGFzIHRoZSBjb25zdHJ1Y3RvciBvZiB0eXBlZCBhcnJheXMuXG4gICAgICBpZiAoQ3RvciBpbnN0YW5jZW9mIEN0b3IpIHtcbiAgICAgICAgQ3RvciA9IGN0b3JCeVRhZ1t0YWddO1xuICAgICAgfVxuICAgICAgdmFyIGJ1ZmZlciA9IG9iamVjdC5idWZmZXI7XG4gICAgICByZXR1cm4gbmV3IEN0b3IoaXNEZWVwID8gYnVmZmVyQ2xvbmUoYnVmZmVyKSA6IGJ1ZmZlciwgb2JqZWN0LmJ5dGVPZmZzZXQsIG9iamVjdC5sZW5ndGgpO1xuXG4gICAgY2FzZSBudW1iZXJUYWc6XG4gICAgY2FzZSBzdHJpbmdUYWc6XG4gICAgICByZXR1cm4gbmV3IEN0b3Iob2JqZWN0KTtcblxuICAgIGNhc2UgcmVnZXhwVGFnOlxuICAgICAgdmFyIHJlc3VsdCA9IG5ldyBDdG9yKG9iamVjdC5zb3VyY2UsIHJlRmxhZ3MuZXhlYyhvYmplY3QpKTtcbiAgICAgIHJlc3VsdC5sYXN0SW5kZXggPSBvYmplY3QubGFzdEluZGV4O1xuICB9XG4gIHJldHVybiByZXN1bHQ7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gaW5pdENsb25lQnlUYWc7XG4iXX0=
-},{"./bufferClone":99}],122:[function(require,module,exports){
+
+},{"./bufferClone":95}],118:[function(require,module,exports){
 /**
  * Initializes an object clone.
  *
@@ -19688,7 +16608,7 @@ function initCloneObject(object) {
 
 module.exports = initCloneObject;
 
-},{}],123:[function(require,module,exports){
+},{}],119:[function(require,module,exports){
 var getLength = require('./getLength'),
     isLength = require('./isLength');
 
@@ -19705,7 +16625,7 @@ function isArrayLike(value) {
 
 module.exports = isArrayLike;
 
-},{"./getLength":116,"./isLength":129}],124:[function(require,module,exports){
+},{"./getLength":112,"./isLength":125}],120:[function(require,module,exports){
 /**
  * Checks if `value` is a host object in IE < 9.
  *
@@ -19728,7 +16648,7 @@ var isHostObject = (function() {
 
 module.exports = isHostObject;
 
-},{}],125:[function(require,module,exports){
+},{}],121:[function(require,module,exports){
 /** Used to detect unsigned integer values. */
 var reIsUint = /^\d+$/;
 
@@ -19754,7 +16674,7 @@ function isIndex(value, length) {
 
 module.exports = isIndex;
 
-},{}],126:[function(require,module,exports){
+},{}],122:[function(require,module,exports){
 var isArrayLike = require('./isArrayLike'),
     isIndex = require('./isIndex'),
     isObject = require('../lang/isObject');
@@ -19784,7 +16704,7 @@ function isIterateeCall(value, index, object) {
 
 module.exports = isIterateeCall;
 
-},{"../lang/isObject":148,"./isArrayLike":123,"./isIndex":125}],127:[function(require,module,exports){
+},{"../lang/isObject":144,"./isArrayLike":119,"./isIndex":121}],123:[function(require,module,exports){
 var isArray = require('../lang/isArray'),
     toObject = require('./toObject');
 
@@ -19814,7 +16734,7 @@ function isKey(value, object) {
 
 module.exports = isKey;
 
-},{"../lang/isArray":144,"./toObject":139}],128:[function(require,module,exports){
+},{"../lang/isArray":140,"./toObject":135}],124:[function(require,module,exports){
 var LazyWrapper = require('./LazyWrapper'),
     getData = require('./getData'),
     getFuncName = require('./getFuncName'),
@@ -19843,7 +16763,7 @@ function isLaziable(func) {
 
 module.exports = isLaziable;
 
-},{"../chain/lodash":55,"./LazyWrapper":64,"./getData":114,"./getFuncName":115}],129:[function(require,module,exports){
+},{"../chain/lodash":51,"./LazyWrapper":60,"./getData":110,"./getFuncName":111}],125:[function(require,module,exports){
 /**
  * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)
  * of an array-like value.
@@ -19865,7 +16785,7 @@ function isLength(value) {
 
 module.exports = isLength;
 
-},{}],130:[function(require,module,exports){
+},{}],126:[function(require,module,exports){
 /**
  * Checks if `value` is object-like.
  *
@@ -19879,7 +16799,7 @@ function isObjectLike(value) {
 
 module.exports = isObjectLike;
 
-},{}],131:[function(require,module,exports){
+},{}],127:[function(require,module,exports){
 var isObject = require('../lang/isObject');
 
 /**
@@ -19896,7 +16816,7 @@ function isStrictComparable(value) {
 
 module.exports = isStrictComparable;
 
-},{"../lang/isObject":148}],132:[function(require,module,exports){
+},{"../lang/isObject":144}],128:[function(require,module,exports){
 var arrayCopy = require('./arrayCopy'),
     composeArgs = require('./composeArgs'),
     composeArgsRight = require('./composeArgsRight'),
@@ -19987,7 +16907,7 @@ function mergeData(data, source) {
 
 module.exports = mergeData;
 
-},{"./arrayCopy":66,"./composeArgs":100,"./composeArgsRight":101,"./replaceHolders":136}],133:[function(require,module,exports){
+},{"./arrayCopy":62,"./composeArgs":96,"./composeArgsRight":97,"./replaceHolders":132}],129:[function(require,module,exports){
 (function (global){
 var getNative = require('./getNative');
 
@@ -20000,14 +16920,14 @@ var metaMap = WeakMap && new WeakMap;
 module.exports = metaMap;
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL21ldGFNYXAuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgZ2V0TmF0aXZlID0gcmVxdWlyZSgnLi9nZXROYXRpdmUnKTtcblxuLyoqIE5hdGl2ZSBtZXRob2QgcmVmZXJlbmNlcy4gKi9cbnZhciBXZWFrTWFwID0gZ2V0TmF0aXZlKGdsb2JhbCwgJ1dlYWtNYXAnKTtcblxuLyoqIFVzZWQgdG8gc3RvcmUgZnVuY3Rpb24gbWV0YWRhdGEuICovXG52YXIgbWV0YU1hcCA9IFdlYWtNYXAgJiYgbmV3IFdlYWtNYXA7XG5cbm1vZHVsZS5leHBvcnRzID0gbWV0YU1hcDtcbiJdfQ==
-},{"./getNative":118}],134:[function(require,module,exports){
+
+},{"./getNative":114}],130:[function(require,module,exports){
 /** Used to lookup unminified function names. */
 var realNames = {};
 
 module.exports = realNames;
 
-},{}],135:[function(require,module,exports){
+},{}],131:[function(require,module,exports){
 var arrayCopy = require('./arrayCopy'),
     isIndex = require('./isIndex');
 
@@ -20038,7 +16958,7 @@ function reorder(array, indexes) {
 
 module.exports = reorder;
 
-},{"./arrayCopy":66,"./isIndex":125}],136:[function(require,module,exports){
+},{"./arrayCopy":62,"./isIndex":121}],132:[function(require,module,exports){
 /** Used as the internal argument placeholder. */
 var PLACEHOLDER = '__lodash_placeholder__';
 
@@ -20068,7 +16988,7 @@ function replaceHolders(array, placeholder) {
 
 module.exports = replaceHolders;
 
-},{}],137:[function(require,module,exports){
+},{}],133:[function(require,module,exports){
 var baseSetData = require('./baseSetData'),
     now = require('../date/now');
 
@@ -20111,7 +17031,7 @@ var setData = (function() {
 
 module.exports = setData;
 
-},{"../date/now":61,"./baseSetData":92}],138:[function(require,module,exports){
+},{"../date/now":57,"./baseSetData":88}],134:[function(require,module,exports){
 var isArguments = require('../lang/isArguments'),
     isArray = require('../lang/isArray'),
     isIndex = require('./isIndex'),
@@ -20155,7 +17075,7 @@ function shimKeys(object) {
 
 module.exports = shimKeys;
 
-},{"../lang/isArguments":143,"../lang/isArray":144,"../lang/isString":150,"../object/keysIn":154,"./isIndex":125,"./isLength":129}],139:[function(require,module,exports){
+},{"../lang/isArguments":139,"../lang/isArray":140,"../lang/isString":146,"../object/keysIn":150,"./isIndex":121,"./isLength":125}],135:[function(require,module,exports){
 var isObject = require('../lang/isObject'),
     isString = require('../lang/isString'),
     support = require('../support');
@@ -20183,7 +17103,7 @@ function toObject(value) {
 
 module.exports = toObject;
 
-},{"../lang/isObject":148,"../lang/isString":150,"../support":157}],140:[function(require,module,exports){
+},{"../lang/isObject":144,"../lang/isString":146,"../support":153}],136:[function(require,module,exports){
 var baseToString = require('./baseToString'),
     isArray = require('../lang/isArray');
 
@@ -20213,7 +17133,7 @@ function toPath(value) {
 
 module.exports = toPath;
 
-},{"../lang/isArray":144,"./baseToString":94}],141:[function(require,module,exports){
+},{"../lang/isArray":140,"./baseToString":90}],137:[function(require,module,exports){
 var LazyWrapper = require('./LazyWrapper'),
     LodashWrapper = require('./LodashWrapper'),
     arrayCopy = require('./arrayCopy');
@@ -20233,7 +17153,7 @@ function wrapperClone(wrapper) {
 
 module.exports = wrapperClone;
 
-},{"./LazyWrapper":64,"./LodashWrapper":65,"./arrayCopy":66}],142:[function(require,module,exports){
+},{"./LazyWrapper":60,"./LodashWrapper":61,"./arrayCopy":62}],138:[function(require,module,exports){
 var baseClone = require('../internal/baseClone'),
     bindCallback = require('../internal/bindCallback');
 
@@ -20290,7 +17210,7 @@ function cloneDeep(value, customizer, thisArg) {
 
 module.exports = cloneDeep;
 
-},{"../internal/baseClone":72,"../internal/bindCallback":98}],143:[function(require,module,exports){
+},{"../internal/baseClone":68,"../internal/bindCallback":94}],139:[function(require,module,exports){
 var isArrayLike = require('../internal/isArrayLike'),
     isObjectLike = require('../internal/isObjectLike');
 
@@ -20326,7 +17246,7 @@ function isArguments(value) {
 
 module.exports = isArguments;
 
-},{"../internal/isArrayLike":123,"../internal/isObjectLike":130}],144:[function(require,module,exports){
+},{"../internal/isArrayLike":119,"../internal/isObjectLike":126}],140:[function(require,module,exports){
 var getNative = require('../internal/getNative'),
     isLength = require('../internal/isLength'),
     isObjectLike = require('../internal/isObjectLike');
@@ -20368,7 +17288,7 @@ var isArray = nativeIsArray || function(value) {
 
 module.exports = isArray;
 
-},{"../internal/getNative":118,"../internal/isLength":129,"../internal/isObjectLike":130}],145:[function(require,module,exports){
+},{"../internal/getNative":114,"../internal/isLength":125,"../internal/isObjectLike":126}],141:[function(require,module,exports){
 var isArguments = require('./isArguments'),
     isArray = require('./isArray'),
     isArrayLike = require('../internal/isArrayLike'),
@@ -20417,7 +17337,7 @@ function isEmpty(value) {
 
 module.exports = isEmpty;
 
-},{"../internal/isArrayLike":123,"../internal/isObjectLike":130,"../object/keys":153,"./isArguments":143,"./isArray":144,"./isFunction":146,"./isString":150}],146:[function(require,module,exports){
+},{"../internal/isArrayLike":119,"../internal/isObjectLike":126,"../object/keys":149,"./isArguments":139,"./isArray":140,"./isFunction":142,"./isString":146}],142:[function(require,module,exports){
 var isObject = require('./isObject');
 
 /** `Object#toString` result references. */
@@ -20457,7 +17377,7 @@ function isFunction(value) {
 
 module.exports = isFunction;
 
-},{"./isObject":148}],147:[function(require,module,exports){
+},{"./isObject":144}],143:[function(require,module,exports){
 var isFunction = require('./isFunction'),
     isHostObject = require('../internal/isHostObject'),
     isObjectLike = require('../internal/isObjectLike');
@@ -20508,7 +17428,7 @@ function isNative(value) {
 
 module.exports = isNative;
 
-},{"../internal/isHostObject":124,"../internal/isObjectLike":130,"./isFunction":146}],148:[function(require,module,exports){
+},{"../internal/isHostObject":120,"../internal/isObjectLike":126,"./isFunction":142}],144:[function(require,module,exports){
 /**
  * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
  * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
@@ -20538,7 +17458,7 @@ function isObject(value) {
 
 module.exports = isObject;
 
-},{}],149:[function(require,module,exports){
+},{}],145:[function(require,module,exports){
 var baseForIn = require('../internal/baseForIn'),
     isArguments = require('./isArguments'),
     isHostObject = require('../internal/isHostObject'),
@@ -20620,7 +17540,7 @@ function isPlainObject(value) {
 
 module.exports = isPlainObject;
 
-},{"../internal/baseForIn":79,"../internal/isHostObject":124,"../internal/isObjectLike":130,"../support":157,"./isArguments":143}],150:[function(require,module,exports){
+},{"../internal/baseForIn":75,"../internal/isHostObject":120,"../internal/isObjectLike":126,"../support":153,"./isArguments":139}],146:[function(require,module,exports){
 var isObjectLike = require('../internal/isObjectLike');
 
 /** `Object#toString` result references. */
@@ -20657,7 +17577,7 @@ function isString(value) {
 
 module.exports = isString;
 
-},{"../internal/isObjectLike":130}],151:[function(require,module,exports){
+},{"../internal/isObjectLike":126}],147:[function(require,module,exports){
 var isLength = require('../internal/isLength'),
     isObjectLike = require('../internal/isObjectLike');
 
@@ -20733,7 +17653,7 @@ function isTypedArray(value) {
 
 module.exports = isTypedArray;
 
-},{"../internal/isLength":129,"../internal/isObjectLike":130}],152:[function(require,module,exports){
+},{"../internal/isLength":125,"../internal/isObjectLike":126}],148:[function(require,module,exports){
 /**
  * Checks if `value` is `undefined`.
  *
@@ -20756,7 +17676,7 @@ function isUndefined(value) {
 
 module.exports = isUndefined;
 
-},{}],153:[function(require,module,exports){
+},{}],149:[function(require,module,exports){
 var getNative = require('../internal/getNative'),
     isArrayLike = require('../internal/isArrayLike'),
     isObject = require('../lang/isObject'),
@@ -20804,7 +17724,7 @@ var keys = !nativeKeys ? shimKeys : function(object) {
 
 module.exports = keys;
 
-},{"../internal/getNative":118,"../internal/isArrayLike":123,"../internal/shimKeys":138,"../lang/isObject":148,"../support":157}],154:[function(require,module,exports){
+},{"../internal/getNative":114,"../internal/isArrayLike":119,"../internal/shimKeys":134,"../lang/isObject":144,"../support":153}],150:[function(require,module,exports){
 var arrayEach = require('../internal/arrayEach'),
     isArguments = require('../lang/isArguments'),
     isArray = require('../lang/isArray'),
@@ -20942,7 +17862,7 @@ function keysIn(object) {
 
 module.exports = keysIn;
 
-},{"../internal/arrayEach":67,"../internal/isIndex":125,"../internal/isLength":129,"../lang/isArguments":143,"../lang/isArray":144,"../lang/isFunction":146,"../lang/isObject":148,"../lang/isString":150,"../support":157}],155:[function(require,module,exports){
+},{"../internal/arrayEach":63,"../internal/isIndex":121,"../internal/isLength":125,"../lang/isArguments":139,"../lang/isArray":140,"../lang/isFunction":142,"../lang/isObject":144,"../lang/isString":146,"../support":153}],151:[function(require,module,exports){
 var keys = require('./keys'),
     toObject = require('../internal/toObject');
 
@@ -20977,7 +17897,7 @@ function pairs(object) {
 
 module.exports = pairs;
 
-},{"../internal/toObject":139,"./keys":153}],156:[function(require,module,exports){
+},{"../internal/toObject":135,"./keys":149}],152:[function(require,module,exports){
 var baseValues = require('../internal/baseValues'),
     keys = require('./keys');
 
@@ -21012,7 +17932,7 @@ function values(object) {
 
 module.exports = values;
 
-},{"../internal/baseValues":95,"./keys":153}],157:[function(require,module,exports){
+},{"../internal/baseValues":91,"./keys":149}],153:[function(require,module,exports){
 /** Used for native method references. */
 var arrayProto = Array.prototype,
     errorProto = Error.prototype,
@@ -21110,7 +18030,7 @@ var support = {};
 
 module.exports = support;
 
-},{}],158:[function(require,module,exports){
+},{}],154:[function(require,module,exports){
 /**
  * This method returns the first argument provided to it.
  *
@@ -21132,7 +18052,7 @@ function identity(value) {
 
 module.exports = identity;
 
-},{}],159:[function(require,module,exports){
+},{}],155:[function(require,module,exports){
 /**
  * A no-operation function that returns `undefined` regardless of the
  * arguments it receives.
@@ -21153,7 +18073,7 @@ function noop() {
 
 module.exports = noop;
 
-},{}],160:[function(require,module,exports){
+},{}],156:[function(require,module,exports){
 var baseProperty = require('../internal/baseProperty'),
     basePropertyDeep = require('../internal/basePropertyDeep'),
     isKey = require('../internal/isKey');
@@ -21186,7 +18106,7 @@ function property(path) {
 
 module.exports = property;
 
-},{"../internal/baseProperty":90,"../internal/basePropertyDeep":91,"../internal/isKey":127}],161:[function(require,module,exports){
+},{"../internal/baseProperty":86,"../internal/basePropertyDeep":87,"../internal/isKey":123}],157:[function(require,module,exports){
 (function (process){
 // vim:ts=4:sts=4:sw=4:
 /*!
@@ -23238,15 +20158,8 @@ return Q;
 });
 
 }).call(this,require('_process'))
-//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["node_modules/q/q.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["// vim:ts=4:sts=4:sw=4:\n/*!\n *\n * Copyright 2009-2012 Kris Kowal under the terms of the MIT\n * license found at http://github.com/kriskowal/q/raw/master/LICENSE\n *\n * With parts by Tyler Close\n * Copyright 2007-2009 Tyler Close under the terms of the MIT X license found\n * at http://www.opensource.org/licenses/mit-license.html\n * Forked at ref_send.js version: 2009-05-11\n *\n * With parts by Mark Miller\n * Copyright (C) 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\n\n(function (definition) {\n    \"use strict\";\n\n    // This file will function properly as a <script> tag, or a module\n    // using CommonJS and NodeJS or RequireJS module formats.  In\n    // Common/Node/RequireJS, the module exports the Q API and when\n    // executed as a simple <script>, it creates a Q global instead.\n\n    // Montage Require\n    if (typeof bootstrap === \"function\") {\n        bootstrap(\"promise\", definition);\n\n    // CommonJS\n    } else if (typeof exports === \"object\" && typeof module === \"object\") {\n        module.exports = definition();\n\n    // RequireJS\n    } else if (typeof define === \"function\" && define.amd) {\n        define(definition);\n\n    // SES (Secure EcmaScript)\n    } else if (typeof ses !== \"undefined\") {\n        if (!ses.ok()) {\n            return;\n        } else {\n            ses.makeQ = definition;\n        }\n\n    // <script>\n    } else if (typeof window !== \"undefined\" || typeof self !== \"undefined\") {\n        // Prefer window over self for add-on scripts. Use self for\n        // non-windowed contexts.\n        var global = typeof window !== \"undefined\" ? window : self;\n\n        // Get the `window` object, save the previous Q global\n        // and initialize Q as a global.\n        var previousQ = global.Q;\n        global.Q = definition();\n\n        // Add a noConflict function so Q can be removed from the\n        // global namespace.\n        global.Q.noConflict = function () {\n            global.Q = previousQ;\n            return this;\n        };\n\n    } else {\n        throw new Error(\"This environment was not anticipated by Q. Please file a bug.\");\n    }\n\n})(function () {\n\"use strict\";\n\nvar hasStacks = false;\ntry {\n    throw new Error();\n} catch (e) {\n    hasStacks = !!e.stack;\n}\n\n// All code after this point will be filtered from stack traces reported\n// by Q.\nvar qStartingLine = captureLine();\nvar qFileName;\n\n// shims\n\n// used for fallback in \"allResolved\"\nvar noop = function () {};\n\n// Use the fastest possible means to execute a task in a future turn\n// of the event loop.\nvar nextTick =(function () {\n    // linked list of tasks (single, with head node)\n    var head = {task: void 0, next: null};\n    var tail = head;\n    var flushing = false;\n    var requestTick = void 0;\n    var isNodeJS = false;\n    // queue for late tasks, used by unhandled rejection tracking\n    var laterQueue = [];\n\n    function flush() {\n        /* jshint loopfunc: true */\n        var task, domain;\n\n        while (head.next) {\n            head = head.next;\n            task = head.task;\n            head.task = void 0;\n            domain = head.domain;\n\n            if (domain) {\n                head.domain = void 0;\n                domain.enter();\n            }\n            runSingle(task, domain);\n\n        }\n        while (laterQueue.length) {\n            task = laterQueue.pop();\n            runSingle(task);\n        }\n        flushing = false;\n    }\n    // runs a single function in the async queue\n    function runSingle(task, domain) {\n        try {\n            task();\n\n        } catch (e) {\n            if (isNodeJS) {\n                // In node, uncaught exceptions are considered fatal errors.\n                // Re-throw them synchronously to interrupt flushing!\n\n                // Ensure continuation if the uncaught exception is suppressed\n                // listening \"uncaughtException\" events (as domains does).\n                // Continue in next event to avoid tick recursion.\n                if (domain) {\n                    domain.exit();\n                }\n                setTimeout(flush, 0);\n                if (domain) {\n                    domain.enter();\n                }\n\n                throw e;\n\n            } else {\n                // In browsers, uncaught exceptions are not fatal.\n                // Re-throw them asynchronously to avoid slow-downs.\n                setTimeout(function () {\n                    throw e;\n                }, 0);\n            }\n        }\n\n        if (domain) {\n            domain.exit();\n        }\n    }\n\n    nextTick = function (task) {\n        tail = tail.next = {\n            task: task,\n            domain: isNodeJS && process.domain,\n            next: null\n        };\n\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n\n    if (typeof process === \"object\" &&\n        process.toString() === \"[object process]\" && process.nextTick) {\n        // Ensure Q is in a real Node environment, with a `process.nextTick`.\n        // To see through fake Node environments:\n        // * Mocha test runner - exposes a `process` global without a `nextTick`\n        // * Browserify - exposes a `process.nexTick` function that uses\n        //   `setTimeout`. In this case `setImmediate` is preferred because\n        //    it is faster. Browserify's `process.toString()` yields\n        //   \"[object Object]\", while in a real Node environment\n        //   `process.nextTick()` yields \"[object process]\".\n        isNodeJS = true;\n\n        requestTick = function () {\n            process.nextTick(flush);\n        };\n\n    } else if (typeof setImmediate === \"function\") {\n        // In IE10, Node.js 0.9+, or https://github.com/NobleJS/setImmediate\n        if (typeof window !== \"undefined\") {\n            requestTick = setImmediate.bind(window, flush);\n        } else {\n            requestTick = function () {\n                setImmediate(flush);\n            };\n        }\n\n    } else if (typeof MessageChannel !== \"undefined\") {\n        // modern browsers\n        // http://www.nonblocking.io/2011/06/windownexttick.html\n        var channel = new MessageChannel();\n        // At least Safari Version 6.0.5 (8536.30.1) intermittently cannot create\n        // working message ports the first time a page loads.\n        channel.port1.onmessage = function () {\n            requestTick = requestPortTick;\n            channel.port1.onmessage = flush;\n            flush();\n        };\n        var requestPortTick = function () {\n            // Opera requires us to provide a message payload, regardless of\n            // whether we use it.\n            channel.port2.postMessage(0);\n        };\n        requestTick = function () {\n            setTimeout(flush, 0);\n            requestPortTick();\n        };\n\n    } else {\n        // old browsers\n        requestTick = function () {\n            setTimeout(flush, 0);\n        };\n    }\n    // runs a task after all other tasks have been run\n    // this is useful for unhandled rejection tracking that needs to happen\n    // after all `then`d tasks have been run.\n    nextTick.runAfter = function (task) {\n        laterQueue.push(task);\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n    return nextTick;\n})();\n\n// Attempt to make generics safe in the face of downstream\n// modifications.\n// There is no situation where this is necessary.\n// If you need a security guarantee, these primordials need to be\n// deeply frozen anyway, and if you don’t need a security guarantee,\n// this is just plain paranoid.\n// However, this **might** have the nice side-effect of reducing the size of\n// the minified code by reducing x.call() to merely x()\n// See Mark Miller’s explanation of what this does.\n// http://wiki.ecmascript.org/doku.php?id=conventions:safe_meta_programming\nvar call = Function.call;\nfunction uncurryThis(f) {\n    return function () {\n        return call.apply(f, arguments);\n    };\n}\n// This is equivalent, but slower:\n// uncurryThis = Function_bind.bind(Function_bind.call);\n// http://jsperf.com/uncurrythis\n\nvar array_slice = uncurryThis(Array.prototype.slice);\n\nvar array_reduce = uncurryThis(\n    Array.prototype.reduce || function (callback, basis) {\n        var index = 0,\n            length = this.length;\n        // concerning the initial value, if one is not provided\n        if (arguments.length === 1) {\n            // seek to the first value in the array, accounting\n            // for the possibility that is is a sparse array\n            do {\n                if (index in this) {\n                    basis = this[index++];\n                    break;\n                }\n                if (++index >= length) {\n                    throw new TypeError();\n                }\n            } while (1);\n        }\n        // reduce\n        for (; index < length; index++) {\n            // account for the possibility that the array is sparse\n            if (index in this) {\n                basis = callback(basis, this[index], index);\n            }\n        }\n        return basis;\n    }\n);\n\nvar array_indexOf = uncurryThis(\n    Array.prototype.indexOf || function (value) {\n        // not a very good shim, but good enough for our one use of it\n        for (var i = 0; i < this.length; i++) {\n            if (this[i] === value) {\n                return i;\n            }\n        }\n        return -1;\n    }\n);\n\nvar array_map = uncurryThis(\n    Array.prototype.map || function (callback, thisp) {\n        var self = this;\n        var collect = [];\n        array_reduce(self, function (undefined, value, index) {\n            collect.push(callback.call(thisp, value, index, self));\n        }, void 0);\n        return collect;\n    }\n);\n\nvar object_create = Object.create || function (prototype) {\n    function Type() { }\n    Type.prototype = prototype;\n    return new Type();\n};\n\nvar object_hasOwnProperty = uncurryThis(Object.prototype.hasOwnProperty);\n\nvar object_keys = Object.keys || function (object) {\n    var keys = [];\n    for (var key in object) {\n        if (object_hasOwnProperty(object, key)) {\n            keys.push(key);\n        }\n    }\n    return keys;\n};\n\nvar object_toString = uncurryThis(Object.prototype.toString);\n\nfunction isObject(value) {\n    return value === Object(value);\n}\n\n// generator related shims\n\n// FIXME: Remove this function once ES6 generators are in SpiderMonkey.\nfunction isStopIteration(exception) {\n    return (\n        object_toString(exception) === \"[object StopIteration]\" ||\n        exception instanceof QReturnValue\n    );\n}\n\n// FIXME: Remove this helper and Q.return once ES6 generators are in\n// SpiderMonkey.\nvar QReturnValue;\nif (typeof ReturnValue !== \"undefined\") {\n    QReturnValue = ReturnValue;\n} else {\n    QReturnValue = function (value) {\n        this.value = value;\n    };\n}\n\n// long stack traces\n\nvar STACK_JUMP_SEPARATOR = \"From previous event:\";\n\nfunction makeStackTraceLong(error, promise) {\n    // If possible, transform the error stack trace by removing Node and Q\n    // cruft, then concatenating with the stack trace of `promise`. See #57.\n    if (hasStacks &&\n        promise.stack &&\n        typeof error === \"object\" &&\n        error !== null &&\n        error.stack &&\n        error.stack.indexOf(STACK_JUMP_SEPARATOR) === -1\n    ) {\n        var stacks = [];\n        for (var p = promise; !!p; p = p.source) {\n            if (p.stack) {\n                stacks.unshift(p.stack);\n            }\n        }\n        stacks.unshift(error.stack);\n\n        var concatedStacks = stacks.join(\"\\n\" + STACK_JUMP_SEPARATOR + \"\\n\");\n        error.stack = filterStackString(concatedStacks);\n    }\n}\n\nfunction filterStackString(stackString) {\n    var lines = stackString.split(\"\\n\");\n    var desiredLines = [];\n    for (var i = 0; i < lines.length; ++i) {\n        var line = lines[i];\n\n        if (!isInternalFrame(line) && !isNodeFrame(line) && line) {\n            desiredLines.push(line);\n        }\n    }\n    return desiredLines.join(\"\\n\");\n}\n\nfunction isNodeFrame(stackLine) {\n    return stackLine.indexOf(\"(module.js:\") !== -1 ||\n           stackLine.indexOf(\"(node.js:\") !== -1;\n}\n\nfunction getFileNameAndLineNumber(stackLine) {\n    // Named functions: \"at functionName (filename:lineNumber:columnNumber)\"\n    // In IE10 function name can have spaces (\"Anonymous function\") O_o\n    var attempt1 = /at .+ \\((.+):(\\d+):(?:\\d+)\\)$/.exec(stackLine);\n    if (attempt1) {\n        return [attempt1[1], Number(attempt1[2])];\n    }\n\n    // Anonymous functions: \"at filename:lineNumber:columnNumber\"\n    var attempt2 = /at ([^ ]+):(\\d+):(?:\\d+)$/.exec(stackLine);\n    if (attempt2) {\n        return [attempt2[1], Number(attempt2[2])];\n    }\n\n    // Firefox style: \"function@filename:lineNumber or @filename:lineNumber\"\n    var attempt3 = /.*@(.+):(\\d+)$/.exec(stackLine);\n    if (attempt3) {\n        return [attempt3[1], Number(attempt3[2])];\n    }\n}\n\nfunction isInternalFrame(stackLine) {\n    var fileNameAndLineNumber = getFileNameAndLineNumber(stackLine);\n\n    if (!fileNameAndLineNumber) {\n        return false;\n    }\n\n    var fileName = fileNameAndLineNumber[0];\n    var lineNumber = fileNameAndLineNumber[1];\n\n    return fileName === qFileName &&\n        lineNumber >= qStartingLine &&\n        lineNumber <= qEndingLine;\n}\n\n// discover own file name and line number range for filtering stack\n// traces\nfunction captureLine() {\n    if (!hasStacks) {\n        return;\n    }\n\n    try {\n        throw new Error();\n    } catch (e) {\n        var lines = e.stack.split(\"\\n\");\n        var firstLine = lines[0].indexOf(\"@\") > 0 ? lines[1] : lines[2];\n        var fileNameAndLineNumber = getFileNameAndLineNumber(firstLine);\n        if (!fileNameAndLineNumber) {\n            return;\n        }\n\n        qFileName = fileNameAndLineNumber[0];\n        return fileNameAndLineNumber[1];\n    }\n}\n\nfunction deprecate(callback, name, alternative) {\n    return function () {\n        if (typeof console !== \"undefined\" &&\n            typeof console.warn === \"function\") {\n            console.warn(name + \" is deprecated, use \" + alternative +\n                         \" instead.\", new Error(\"\").stack);\n        }\n        return callback.apply(callback, arguments);\n    };\n}\n\n// end of shims\n// beginning of real work\n\n/**\n * Constructs a promise for an immediate reference, passes promises through, or\n * coerces promises from different systems.\n * @param value immediate reference or promise\n */\nfunction Q(value) {\n    // If the object is already a Promise, return it directly.  This enables\n    // the resolve function to both be used to created references from objects,\n    // but to tolerably coerce non-promises to promises.\n    if (value instanceof Promise) {\n        return value;\n    }\n\n    // assimilate thenables\n    if (isPromiseAlike(value)) {\n        return coerce(value);\n    } else {\n        return fulfill(value);\n    }\n}\nQ.resolve = Q;\n\n/**\n * Performs a task in a future turn of the event loop.\n * @param {Function} task\n */\nQ.nextTick = nextTick;\n\n/**\n * Controls whether or not long stack traces will be on\n */\nQ.longStackSupport = false;\n\n// enable long stacks if Q_DEBUG is set\nif (typeof process === \"object\" && process && process.env && process.env.Q_DEBUG) {\n    Q.longStackSupport = true;\n}\n\n/**\n * Constructs a {promise, resolve, reject} object.\n *\n * `resolve` is a callback to invoke with a more resolved value for the\n * promise. To fulfill the promise, invoke `resolve` with any value that is\n * not a thenable. To reject the promise, invoke `resolve` with a rejected\n * thenable, or invoke `reject` with the reason directly. To resolve the\n * promise to another thenable, thus putting it in the same state, invoke\n * `resolve` with that other thenable.\n */\nQ.defer = defer;\nfunction defer() {\n    // if \"messages\" is an \"Array\", that indicates that the promise has not yet\n    // been resolved.  If it is \"undefined\", it has been resolved.  Each\n    // element of the messages array is itself an array of complete arguments to\n    // forward to the resolved promise.  We coerce the resolution value to a\n    // promise using the `resolve` function because it handles both fully\n    // non-thenable values and other thenables gracefully.\n    var messages = [], progressListeners = [], resolvedPromise;\n\n    var deferred = object_create(defer.prototype);\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, operands) {\n        var args = array_slice(arguments);\n        if (messages) {\n            messages.push(args);\n            if (op === \"when\" && operands[1]) { // progress operand\n                progressListeners.push(operands[1]);\n            }\n        } else {\n            Q.nextTick(function () {\n                resolvedPromise.promiseDispatch.apply(resolvedPromise, args);\n            });\n        }\n    };\n\n    // XXX deprecated\n    promise.valueOf = function () {\n        if (messages) {\n            return promise;\n        }\n        var nearerValue = nearer(resolvedPromise);\n        if (isPromise(nearerValue)) {\n            resolvedPromise = nearerValue; // shorten chain\n        }\n        return nearerValue;\n    };\n\n    promise.inspect = function () {\n        if (!resolvedPromise) {\n            return { state: \"pending\" };\n        }\n        return resolvedPromise.inspect();\n    };\n\n    if (Q.longStackSupport && hasStacks) {\n        try {\n            throw new Error();\n        } catch (e) {\n            // NOTE: don't try to use `Error.captureStackTrace` or transfer the\n            // accessor around; that causes memory leaks as per GH-111. Just\n            // reify the stack trace as a string ASAP.\n            //\n            // At the same time, cut off the first line; it's always just\n            // \"[object Promise]\\n\", as per the `toString`.\n            promise.stack = e.stack.substring(e.stack.indexOf(\"\\n\") + 1);\n        }\n    }\n\n    // NOTE: we do the checks for `resolvedPromise` in each method, instead of\n    // consolidating them into `become`, since otherwise we'd create new\n    // promises with the lines `become(whatever(value))`. See e.g. GH-252.\n\n    function become(newPromise) {\n        resolvedPromise = newPromise;\n        promise.source = newPromise;\n\n        array_reduce(messages, function (undefined, message) {\n            Q.nextTick(function () {\n                newPromise.promiseDispatch.apply(newPromise, message);\n            });\n        }, void 0);\n\n        messages = void 0;\n        progressListeners = void 0;\n    }\n\n    deferred.promise = promise;\n    deferred.resolve = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(Q(value));\n    };\n\n    deferred.fulfill = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(fulfill(value));\n    };\n    deferred.reject = function (reason) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(reject(reason));\n    };\n    deferred.notify = function (progress) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        array_reduce(progressListeners, function (undefined, progressListener) {\n            Q.nextTick(function () {\n                progressListener(progress);\n            });\n        }, void 0);\n    };\n\n    return deferred;\n}\n\n/**\n * Creates a Node-style callback that will resolve or reject the deferred\n * promise.\n * @returns a nodeback\n */\ndefer.prototype.makeNodeResolver = function () {\n    var self = this;\n    return function (error, value) {\n        if (error) {\n            self.reject(error);\n        } else if (arguments.length > 2) {\n            self.resolve(array_slice(arguments, 1));\n        } else {\n            self.resolve(value);\n        }\n    };\n};\n\n/**\n * @param resolver {Function} a function that returns nothing and accepts\n * the resolve, reject, and notify functions for a deferred.\n * @returns a promise that may be resolved with the given resolve and reject\n * functions, or rejected by a thrown exception in resolver\n */\nQ.Promise = promise; // ES6\nQ.promise = promise;\nfunction promise(resolver) {\n    if (typeof resolver !== \"function\") {\n        throw new TypeError(\"resolver must be a function.\");\n    }\n    var deferred = defer();\n    try {\n        resolver(deferred.resolve, deferred.reject, deferred.notify);\n    } catch (reason) {\n        deferred.reject(reason);\n    }\n    return deferred.promise;\n}\n\npromise.race = race; // ES6\npromise.all = all; // ES6\npromise.reject = reject; // ES6\npromise.resolve = Q; // ES6\n\n// XXX experimental.  This method is a way to denote that a local value is\n// serializable and should be immediately dispatched to a remote upon request,\n// instead of passing a reference.\nQ.passByCopy = function (object) {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return object;\n};\n\nPromise.prototype.passByCopy = function () {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return this;\n};\n\n/**\n * If two promises eventually fulfill to the same value, promises that value,\n * but otherwise rejects.\n * @param x {Any*}\n * @param y {Any*}\n * @returns {Any*} a promise for x and y if they are the same, but a rejection\n * otherwise.\n *\n */\nQ.join = function (x, y) {\n    return Q(x).join(y);\n};\n\nPromise.prototype.join = function (that) {\n    return Q([this, that]).spread(function (x, y) {\n        if (x === y) {\n            // TODO: \"===\" should be Object.is or equiv\n            return x;\n        } else {\n            throw new Error(\"Can't join: not the same: \" + x + \" \" + y);\n        }\n    });\n};\n\n/**\n * Returns a promise for the first of an array of promises to become settled.\n * @param answers {Array[Any*]} promises to race\n * @returns {Any*} the first promise to be settled\n */\nQ.race = race;\nfunction race(answerPs) {\n    return promise(function (resolve, reject) {\n        // Switch to this once we can assume at least ES5\n        // answerPs.forEach(function (answerP) {\n        //     Q(answerP).then(resolve, reject);\n        // });\n        // Use this in the meantime\n        for (var i = 0, len = answerPs.length; i < len; i++) {\n            Q(answerPs[i]).then(resolve, reject);\n        }\n    });\n}\n\nPromise.prototype.race = function () {\n    return this.then(Q.race);\n};\n\n/**\n * Constructs a Promise with a promise descriptor object and optional fallback\n * function.  The descriptor contains methods like when(rejected), get(name),\n * set(name, value), post(name, args), and delete(name), which all\n * return either a value, a promise for a value, or a rejection.  The fallback\n * accepts the operation name, a resolver, and any further arguments that would\n * have been forwarded to the appropriate method above had a method been\n * provided with the proper name.  The API makes no guarantees about the nature\n * of the returned object, apart from that it is usable whereever promises are\n * bought and sold.\n */\nQ.makePromise = Promise;\nfunction Promise(descriptor, fallback, inspect) {\n    if (fallback === void 0) {\n        fallback = function (op) {\n            return reject(new Error(\n                \"Promise does not support operation: \" + op\n            ));\n        };\n    }\n    if (inspect === void 0) {\n        inspect = function () {\n            return {state: \"unknown\"};\n        };\n    }\n\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, args) {\n        var result;\n        try {\n            if (descriptor[op]) {\n                result = descriptor[op].apply(promise, args);\n            } else {\n                result = fallback.call(promise, op, args);\n            }\n        } catch (exception) {\n            result = reject(exception);\n        }\n        if (resolve) {\n            resolve(result);\n        }\n    };\n\n    promise.inspect = inspect;\n\n    // XXX deprecated `valueOf` and `exception` support\n    if (inspect) {\n        var inspected = inspect();\n        if (inspected.state === \"rejected\") {\n            promise.exception = inspected.reason;\n        }\n\n        promise.valueOf = function () {\n            var inspected = inspect();\n            if (inspected.state === \"pending\" ||\n                inspected.state === \"rejected\") {\n                return promise;\n            }\n            return inspected.value;\n        };\n    }\n\n    return promise;\n}\n\nPromise.prototype.toString = function () {\n    return \"[object Promise]\";\n};\n\nPromise.prototype.then = function (fulfilled, rejected, progressed) {\n    var self = this;\n    var deferred = defer();\n    var done = false;   // ensure the untrusted promise makes at most a\n                        // single call to one of the callbacks\n\n    function _fulfilled(value) {\n        try {\n            return typeof fulfilled === \"function\" ? fulfilled(value) : value;\n        } catch (exception) {\n            return reject(exception);\n        }\n    }\n\n    function _rejected(exception) {\n        if (typeof rejected === \"function\") {\n            makeStackTraceLong(exception, self);\n            try {\n                return rejected(exception);\n            } catch (newException) {\n                return reject(newException);\n            }\n        }\n        return reject(exception);\n    }\n\n    function _progressed(value) {\n        return typeof progressed === \"function\" ? progressed(value) : value;\n    }\n\n    Q.nextTick(function () {\n        self.promiseDispatch(function (value) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_fulfilled(value));\n        }, \"when\", [function (exception) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_rejected(exception));\n        }]);\n    });\n\n    // Progress propagator need to be attached in the current tick.\n    self.promiseDispatch(void 0, \"when\", [void 0, function (value) {\n        var newValue;\n        var threw = false;\n        try {\n            newValue = _progressed(value);\n        } catch (e) {\n            threw = true;\n            if (Q.onerror) {\n                Q.onerror(e);\n            } else {\n                throw e;\n            }\n        }\n\n        if (!threw) {\n            deferred.notify(newValue);\n        }\n    }]);\n\n    return deferred.promise;\n};\n\nQ.tap = function (promise, callback) {\n    return Q(promise).tap(callback);\n};\n\n/**\n * Works almost like \"finally\", but not called for rejections.\n * Original resolution value is passed through callback unaffected.\n * Callback may return a promise that will be awaited for.\n * @param {Function} callback\n * @returns {Q.Promise}\n * @example\n * doSomething()\n *   .then(...)\n *   .tap(console.log)\n *   .then(...);\n */\nPromise.prototype.tap = function (callback) {\n    callback = Q(callback);\n\n    return this.then(function (value) {\n        return callback.fcall(value).thenResolve(value);\n    });\n};\n\n/**\n * Registers an observer on a promise.\n *\n * Guarantees:\n *\n * 1. that fulfilled and rejected will be called only once.\n * 2. that either the fulfilled callback or the rejected callback will be\n *    called, but not both.\n * 3. that fulfilled and rejected will not be called in this turn.\n *\n * @param value      promise or immediate reference to observe\n * @param fulfilled  function to be called with the fulfilled value\n * @param rejected   function to be called with the rejection exception\n * @param progressed function to be called on any progress notifications\n * @return promise for the return value from the invoked callback\n */\nQ.when = when;\nfunction when(value, fulfilled, rejected, progressed) {\n    return Q(value).then(fulfilled, rejected, progressed);\n}\n\nPromise.prototype.thenResolve = function (value) {\n    return this.then(function () { return value; });\n};\n\nQ.thenResolve = function (promise, value) {\n    return Q(promise).thenResolve(value);\n};\n\nPromise.prototype.thenReject = function (reason) {\n    return this.then(function () { throw reason; });\n};\n\nQ.thenReject = function (promise, reason) {\n    return Q(promise).thenReject(reason);\n};\n\n/**\n * If an object is not a promise, it is as \"near\" as possible.\n * If a promise is rejected, it is as \"near\" as possible too.\n * If it’s a fulfilled promise, the fulfillment value is nearer.\n * If it’s a deferred promise and the deferred has been resolved, the\n * resolution is \"nearer\".\n * @param object\n * @returns most resolved (nearest) form of the object\n */\n\n// XXX should we re-do this?\nQ.nearer = nearer;\nfunction nearer(value) {\n    if (isPromise(value)) {\n        var inspected = value.inspect();\n        if (inspected.state === \"fulfilled\") {\n            return inspected.value;\n        }\n    }\n    return value;\n}\n\n/**\n * @returns whether the given object is a promise.\n * Otherwise it is a fulfilled value.\n */\nQ.isPromise = isPromise;\nfunction isPromise(object) {\n    return object instanceof Promise;\n}\n\nQ.isPromiseAlike = isPromiseAlike;\nfunction isPromiseAlike(object) {\n    return isObject(object) && typeof object.then === \"function\";\n}\n\n/**\n * @returns whether the given object is a pending promise, meaning not\n * fulfilled or rejected.\n */\nQ.isPending = isPending;\nfunction isPending(object) {\n    return isPromise(object) && object.inspect().state === \"pending\";\n}\n\nPromise.prototype.isPending = function () {\n    return this.inspect().state === \"pending\";\n};\n\n/**\n * @returns whether the given object is a value or fulfilled\n * promise.\n */\nQ.isFulfilled = isFulfilled;\nfunction isFulfilled(object) {\n    return !isPromise(object) || object.inspect().state === \"fulfilled\";\n}\n\nPromise.prototype.isFulfilled = function () {\n    return this.inspect().state === \"fulfilled\";\n};\n\n/**\n * @returns whether the given object is a rejected promise.\n */\nQ.isRejected = isRejected;\nfunction isRejected(object) {\n    return isPromise(object) && object.inspect().state === \"rejected\";\n}\n\nPromise.prototype.isRejected = function () {\n    return this.inspect().state === \"rejected\";\n};\n\n//// BEGIN UNHANDLED REJECTION TRACKING\n\n// This promise library consumes exceptions thrown in handlers so they can be\n// handled by a subsequent promise.  The exceptions get added to this array when\n// they are created, and removed when they are handled.  Note that in ES6 or\n// shimmed environments, this would naturally be a `Set`.\nvar unhandledReasons = [];\nvar unhandledRejections = [];\nvar reportedUnhandledRejections = [];\nvar trackUnhandledRejections = true;\n\nfunction resetUnhandledRejections() {\n    unhandledReasons.length = 0;\n    unhandledRejections.length = 0;\n\n    if (!trackUnhandledRejections) {\n        trackUnhandledRejections = true;\n    }\n}\n\nfunction trackRejection(promise, reason) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n    if (typeof process === \"object\" && typeof process.emit === \"function\") {\n        Q.nextTick.runAfter(function () {\n            if (array_indexOf(unhandledRejections, promise) !== -1) {\n                process.emit(\"unhandledRejection\", reason, promise);\n                reportedUnhandledRejections.push(promise);\n            }\n        });\n    }\n\n    unhandledRejections.push(promise);\n    if (reason && typeof reason.stack !== \"undefined\") {\n        unhandledReasons.push(reason.stack);\n    } else {\n        unhandledReasons.push(\"(no stack) \" + reason);\n    }\n}\n\nfunction untrackRejection(promise) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n\n    var at = array_indexOf(unhandledRejections, promise);\n    if (at !== -1) {\n        if (typeof process === \"object\" && typeof process.emit === \"function\") {\n            Q.nextTick.runAfter(function () {\n                var atReport = array_indexOf(reportedUnhandledRejections, promise);\n                if (atReport !== -1) {\n                    process.emit(\"rejectionHandled\", unhandledReasons[at], promise);\n                    reportedUnhandledRejections.splice(atReport, 1);\n                }\n            });\n        }\n        unhandledRejections.splice(at, 1);\n        unhandledReasons.splice(at, 1);\n    }\n}\n\nQ.resetUnhandledRejections = resetUnhandledRejections;\n\nQ.getUnhandledReasons = function () {\n    // Make a copy so that consumers can't interfere with our internal state.\n    return unhandledReasons.slice();\n};\n\nQ.stopUnhandledRejectionTracking = function () {\n    resetUnhandledRejections();\n    trackUnhandledRejections = false;\n};\n\nresetUnhandledRejections();\n\n//// END UNHANDLED REJECTION TRACKING\n\n/**\n * Constructs a rejected promise.\n * @param reason value describing the failure\n */\nQ.reject = reject;\nfunction reject(reason) {\n    var rejection = Promise({\n        \"when\": function (rejected) {\n            // note that the error has been handled\n            if (rejected) {\n                untrackRejection(this);\n            }\n            return rejected ? rejected(reason) : this;\n        }\n    }, function fallback() {\n        return this;\n    }, function inspect() {\n        return { state: \"rejected\", reason: reason };\n    });\n\n    // Note that the reason has not been handled.\n    trackRejection(rejection, reason);\n\n    return rejection;\n}\n\n/**\n * Constructs a fulfilled promise for an immediate reference.\n * @param value immediate reference\n */\nQ.fulfill = fulfill;\nfunction fulfill(value) {\n    return Promise({\n        \"when\": function () {\n            return value;\n        },\n        \"get\": function (name) {\n            return value[name];\n        },\n        \"set\": function (name, rhs) {\n            value[name] = rhs;\n        },\n        \"delete\": function (name) {\n            delete value[name];\n        },\n        \"post\": function (name, args) {\n            // Mark Miller proposes that post with no name should apply a\n            // promised function.\n            if (name === null || name === void 0) {\n                return value.apply(void 0, args);\n            } else {\n                return value[name].apply(value, args);\n            }\n        },\n        \"apply\": function (thisp, args) {\n            return value.apply(thisp, args);\n        },\n        \"keys\": function () {\n            return object_keys(value);\n        }\n    }, void 0, function inspect() {\n        return { state: \"fulfilled\", value: value };\n    });\n}\n\n/**\n * Converts thenables to Q promises.\n * @param promise thenable promise\n * @returns a Q promise\n */\nfunction coerce(promise) {\n    var deferred = defer();\n    Q.nextTick(function () {\n        try {\n            promise.then(deferred.resolve, deferred.reject, deferred.notify);\n        } catch (exception) {\n            deferred.reject(exception);\n        }\n    });\n    return deferred.promise;\n}\n\n/**\n * Annotates an object such that it will never be\n * transferred away from this process over any promise\n * communication channel.\n * @param object\n * @returns promise a wrapping of that object that\n * additionally responds to the \"isDef\" message\n * without a rejection.\n */\nQ.master = master;\nfunction master(object) {\n    return Promise({\n        \"isDef\": function () {}\n    }, function fallback(op, args) {\n        return dispatch(object, op, args);\n    }, function () {\n        return Q(object).inspect();\n    });\n}\n\n/**\n * Spreads the values of a promised array of arguments into the\n * fulfillment callback.\n * @param fulfilled callback that receives variadic arguments from the\n * promised array\n * @param rejected callback that receives the exception if the promise\n * is rejected.\n * @returns a promise for the return value or thrown exception of\n * either callback.\n */\nQ.spread = spread;\nfunction spread(value, fulfilled, rejected) {\n    return Q(value).spread(fulfilled, rejected);\n}\n\nPromise.prototype.spread = function (fulfilled, rejected) {\n    return this.all().then(function (array) {\n        return fulfilled.apply(void 0, array);\n    }, rejected);\n};\n\n/**\n * The async function is a decorator for generator functions, turning\n * them into asynchronous generators.  Although generators are only part\n * of the newest ECMAScript 6 drafts, this code does not cause syntax\n * errors in older engines.  This code should continue to work and will\n * in fact improve over time as the language improves.\n *\n * ES6 generators are currently part of V8 version 3.19 with the\n * --harmony-generators runtime flag enabled.  SpiderMonkey has had them\n * for longer, but under an older Python-inspired form.  This function\n * works on both kinds of generators.\n *\n * Decorates a generator function such that:\n *  - it may yield promises\n *  - execution will continue when that promise is fulfilled\n *  - the value of the yield expression will be the fulfilled value\n *  - it returns a promise for the return value (when the generator\n *    stops iterating)\n *  - the decorated function returns a promise for the return value\n *    of the generator or the first rejected promise among those\n *    yielded.\n *  - if an error is thrown in the generator, it propagates through\n *    every following yield until it is caught, or until it escapes\n *    the generator function altogether, and is translated into a\n *    rejection for the promise returned by the decorated generator.\n */\nQ.async = async;\nfunction async(makeGenerator) {\n    return function () {\n        // when verb is \"send\", arg is a value\n        // when verb is \"throw\", arg is an exception\n        function continuer(verb, arg) {\n            var result;\n\n            // Until V8 3.19 / Chromium 29 is released, SpiderMonkey is the only\n            // engine that has a deployed base of browsers that support generators.\n            // However, SM's generators use the Python-inspired semantics of\n            // outdated ES6 drafts.  We would like to support ES6, but we'd also\n            // like to make it possible to use generators in deployed browsers, so\n            // we also support Python-style generators.  At some point we can remove\n            // this block.\n\n            if (typeof StopIteration === \"undefined\") {\n                // ES6 Generators\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    return reject(exception);\n                }\n                if (result.done) {\n                    return Q(result.value);\n                } else {\n                    return when(result.value, callback, errback);\n                }\n            } else {\n                // SpiderMonkey Generators\n                // FIXME: Remove this case when SM does ES6 generators.\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    if (isStopIteration(exception)) {\n                        return Q(exception.value);\n                    } else {\n                        return reject(exception);\n                    }\n                }\n                return when(result, callback, errback);\n            }\n        }\n        var generator = makeGenerator.apply(this, arguments);\n        var callback = continuer.bind(continuer, \"next\");\n        var errback = continuer.bind(continuer, \"throw\");\n        return callback();\n    };\n}\n\n/**\n * The spawn function is a small wrapper around async that immediately\n * calls the generator and also ends the promise chain, so that any\n * unhandled errors are thrown instead of forwarded to the error\n * handler. This is useful because it's extremely common to run\n * generators at the top-level to work with libraries.\n */\nQ.spawn = spawn;\nfunction spawn(makeGenerator) {\n    Q.done(Q.async(makeGenerator)());\n}\n\n// FIXME: Remove this interface once ES6 generators are in SpiderMonkey.\n/**\n * Throws a ReturnValue exception to stop an asynchronous generator.\n *\n * This interface is a stop-gap measure to support generator return\n * values in older Firefox/SpiderMonkey.  In browsers that support ES6\n * generators like Chromium 29, just use \"return\" in your generator\n * functions.\n *\n * @param value the return value for the surrounding generator\n * @throws ReturnValue exception with the value.\n * @example\n * // ES6 style\n * Q.async(function* () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      return foo + bar;\n * })\n * // Older SpiderMonkey style\n * Q.async(function () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      Q.return(foo + bar);\n * })\n */\nQ[\"return\"] = _return;\nfunction _return(value) {\n    throw new QReturnValue(value);\n}\n\n/**\n * The promised function decorator ensures that any promise arguments\n * are settled and passed as values (`this` is also settled and passed\n * as a value).  It will also ensure that the result of a function is\n * always a promise.\n *\n * @example\n * var add = Q.promised(function (a, b) {\n *     return a + b;\n * });\n * add(Q(a), Q(B));\n *\n * @param {function} callback The function to decorate\n * @returns {function} a function that has been decorated.\n */\nQ.promised = promised;\nfunction promised(callback) {\n    return function () {\n        return spread([this, all(arguments)], function (self, args) {\n            return callback.apply(self, args);\n        });\n    };\n}\n\n/**\n * sends a message to a value in a future turn\n * @param object* the recipient\n * @param op the name of the message operation, e.g., \"when\",\n * @param args further arguments to be forwarded to the operation\n * @returns result {Promise} a promise for the result of the operation\n */\nQ.dispatch = dispatch;\nfunction dispatch(object, op, args) {\n    return Q(object).dispatch(op, args);\n}\n\nPromise.prototype.dispatch = function (op, args) {\n    var self = this;\n    var deferred = defer();\n    Q.nextTick(function () {\n        self.promiseDispatch(deferred.resolve, op, args);\n    });\n    return deferred.promise;\n};\n\n/**\n * Gets the value of a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to get\n * @return promise for the property value\n */\nQ.get = function (object, key) {\n    return Q(object).dispatch(\"get\", [key]);\n};\n\nPromise.prototype.get = function (key) {\n    return this.dispatch(\"get\", [key]);\n};\n\n/**\n * Sets the value of a property in a future turn.\n * @param object    promise or immediate reference for object object\n * @param name      name of property to set\n * @param value     new value of property\n * @return promise for the return value\n */\nQ.set = function (object, key, value) {\n    return Q(object).dispatch(\"set\", [key, value]);\n};\n\nPromise.prototype.set = function (key, value) {\n    return this.dispatch(\"set\", [key, value]);\n};\n\n/**\n * Deletes a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to delete\n * @return promise for the return value\n */\nQ.del = // XXX legacy\nQ[\"delete\"] = function (object, key) {\n    return Q(object).dispatch(\"delete\", [key]);\n};\n\nPromise.prototype.del = // XXX legacy\nPromise.prototype[\"delete\"] = function (key) {\n    return this.dispatch(\"delete\", [key]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param value     a value to post, typically an array of\n *                  invocation arguments for promises that\n *                  are ultimately backed with `resolve` values,\n *                  as opposed to those backed with URLs\n *                  wherein the posted value can be any\n *                  JSON serializable object.\n * @return promise for the return value\n */\n// bound locally because it is used by other methods\nQ.mapply = // XXX As proposed by \"Redsandro\"\nQ.post = function (object, name, args) {\n    return Q(object).dispatch(\"post\", [name, args]);\n};\n\nPromise.prototype.mapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.post = function (name, args) {\n    return this.dispatch(\"post\", [name, args]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param ...args   array of invocation arguments\n * @return promise for the return value\n */\nQ.send = // XXX Mark Miller's proposed parlance\nQ.mcall = // XXX As proposed by \"Redsandro\"\nQ.invoke = function (object, name /*...args*/) {\n    return Q(object).dispatch(\"post\", [name, array_slice(arguments, 2)]);\n};\n\nPromise.prototype.send = // XXX Mark Miller's proposed parlance\nPromise.prototype.mcall = // XXX As proposed by \"Redsandro\"\nPromise.prototype.invoke = function (name /*...args*/) {\n    return this.dispatch(\"post\", [name, array_slice(arguments, 1)]);\n};\n\n/**\n * Applies the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param args      array of application arguments\n */\nQ.fapply = function (object, args) {\n    return Q(object).dispatch(\"apply\", [void 0, args]);\n};\n\nPromise.prototype.fapply = function (args) {\n    return this.dispatch(\"apply\", [void 0, args]);\n};\n\n/**\n * Calls the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ[\"try\"] =\nQ.fcall = function (object /* ...args*/) {\n    return Q(object).dispatch(\"apply\", [void 0, array_slice(arguments, 1)]);\n};\n\nPromise.prototype.fcall = function (/*...args*/) {\n    return this.dispatch(\"apply\", [void 0, array_slice(arguments)]);\n};\n\n/**\n * Binds the promised function, transforming return values into a fulfilled\n * promise and thrown errors into a rejected one.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ.fbind = function (object /*...args*/) {\n    var promise = Q(object);\n    var args = array_slice(arguments, 1);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\nPromise.prototype.fbind = function (/*...args*/) {\n    var promise = this;\n    var args = array_slice(arguments);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\n\n/**\n * Requests the names of the owned properties of a promised\n * object in a future turn.\n * @param object    promise or immediate reference for target object\n * @return promise for the keys of the eventually settled object\n */\nQ.keys = function (object) {\n    return Q(object).dispatch(\"keys\", []);\n};\n\nPromise.prototype.keys = function () {\n    return this.dispatch(\"keys\", []);\n};\n\n/**\n * Turns an array of promises into a promise for an array.  If any of\n * the promises gets rejected, the whole array is rejected immediately.\n * @param {Array*} an array (or promise for an array) of values (or\n * promises for values)\n * @returns a promise for an array of the corresponding values\n */\n// By Mark Miller\n// http://wiki.ecmascript.org/doku.php?id=strawman:concurrency&rev=1308776521#allfulfilled\nQ.all = all;\nfunction all(promises) {\n    return when(promises, function (promises) {\n        var pendingCount = 0;\n        var deferred = defer();\n        array_reduce(promises, function (undefined, promise, index) {\n            var snapshot;\n            if (\n                isPromise(promise) &&\n                (snapshot = promise.inspect()).state === \"fulfilled\"\n            ) {\n                promises[index] = snapshot.value;\n            } else {\n                ++pendingCount;\n                when(\n                    promise,\n                    function (value) {\n                        promises[index] = value;\n                        if (--pendingCount === 0) {\n                            deferred.resolve(promises);\n                        }\n                    },\n                    deferred.reject,\n                    function (progress) {\n                        deferred.notify({ index: index, value: progress });\n                    }\n                );\n            }\n        }, void 0);\n        if (pendingCount === 0) {\n            deferred.resolve(promises);\n        }\n        return deferred.promise;\n    });\n}\n\nPromise.prototype.all = function () {\n    return all(this);\n};\n\n/**\n * Returns the first resolved promise of an array. Prior rejected promises are\n * ignored.  Rejects only if all promises are rejected.\n * @param {Array*} an array containing values or promises for values\n * @returns a promise fulfilled with the value of the first resolved promise,\n * or a rejected promise if all promises are rejected.\n */\nQ.any = any;\n\nfunction any(promises) {\n    if (promises.length === 0) {\n        return Q.resolve();\n    }\n\n    var deferred = Q.defer();\n    var pendingCount = 0;\n    array_reduce(promises, function (prev, current, index) {\n        var promise = promises[index];\n\n        pendingCount++;\n\n        when(promise, onFulfilled, onRejected, onProgress);\n        function onFulfilled(result) {\n            deferred.resolve(result);\n        }\n        function onRejected() {\n            pendingCount--;\n            if (pendingCount === 0) {\n                deferred.reject(new Error(\n                    \"Can't get fulfillment value from any promise, all \" +\n                    \"promises were rejected.\"\n                ));\n            }\n        }\n        function onProgress(progress) {\n            deferred.notify({\n                index: index,\n                value: progress\n            });\n        }\n    }, undefined);\n\n    return deferred.promise;\n}\n\nPromise.prototype.any = function () {\n    return any(this);\n};\n\n/**\n * Waits for all promises to be settled, either fulfilled or\n * rejected.  This is distinct from `all` since that would stop\n * waiting at the first rejection.  The promise returned by\n * `allResolved` will never be rejected.\n * @param promises a promise for an array (or an array) of promises\n * (or values)\n * @return a promise for an array of promises\n */\nQ.allResolved = deprecate(allResolved, \"allResolved\", \"allSettled\");\nfunction allResolved(promises) {\n    return when(promises, function (promises) {\n        promises = array_map(promises, Q);\n        return when(all(array_map(promises, function (promise) {\n            return when(promise, noop, noop);\n        })), function () {\n            return promises;\n        });\n    });\n}\n\nPromise.prototype.allResolved = function () {\n    return allResolved(this);\n};\n\n/**\n * @see Promise#allSettled\n */\nQ.allSettled = allSettled;\nfunction allSettled(promises) {\n    return Q(promises).allSettled();\n}\n\n/**\n * Turns an array of promises into a promise for an array of their states (as\n * returned by `inspect`) when they have all settled.\n * @param {Array[Any*]} values an array (or promise for an array) of values (or\n * promises for values)\n * @returns {Array[State]} an array of states for the respective values.\n */\nPromise.prototype.allSettled = function () {\n    return this.then(function (promises) {\n        return all(array_map(promises, function (promise) {\n            promise = Q(promise);\n            function regardless() {\n                return promise.inspect();\n            }\n            return promise.then(regardless, regardless);\n        }));\n    });\n};\n\n/**\n * Captures the failure of a promise, giving an oportunity to recover\n * with a callback.  If the given promise is fulfilled, the returned\n * promise is fulfilled.\n * @param {Any*} promise for something\n * @param {Function} callback to fulfill the returned promise if the\n * given promise is rejected\n * @returns a promise for the return value of the callback\n */\nQ.fail = // XXX legacy\nQ[\"catch\"] = function (object, rejected) {\n    return Q(object).then(void 0, rejected);\n};\n\nPromise.prototype.fail = // XXX legacy\nPromise.prototype[\"catch\"] = function (rejected) {\n    return this.then(void 0, rejected);\n};\n\n/**\n * Attaches a listener that can respond to progress notifications from a\n * promise's originating deferred. This listener receives the exact arguments\n * passed to ``deferred.notify``.\n * @param {Any*} promise for something\n * @param {Function} callback to receive any progress notifications\n * @returns the given promise, unchanged\n */\nQ.progress = progress;\nfunction progress(object, progressed) {\n    return Q(object).then(void 0, void 0, progressed);\n}\n\nPromise.prototype.progress = function (progressed) {\n    return this.then(void 0, void 0, progressed);\n};\n\n/**\n * Provides an opportunity to observe the settling of a promise,\n * regardless of whether the promise is fulfilled or rejected.  Forwards\n * the resolution to the returned promise when the callback is done.\n * The callback can return a promise to defer completion.\n * @param {Any*} promise\n * @param {Function} callback to observe the resolution of the given\n * promise, takes no arguments.\n * @returns a promise for the resolution of the given promise when\n * ``fin`` is done.\n */\nQ.fin = // XXX legacy\nQ[\"finally\"] = function (object, callback) {\n    return Q(object)[\"finally\"](callback);\n};\n\nPromise.prototype.fin = // XXX legacy\nPromise.prototype[\"finally\"] = function (callback) {\n    callback = Q(callback);\n    return this.then(function (value) {\n        return callback.fcall().then(function () {\n            return value;\n        });\n    }, function (reason) {\n        // TODO attempt to recycle the rejection with \"this\".\n        return callback.fcall().then(function () {\n            throw reason;\n        });\n    });\n};\n\n/**\n * Terminates a chain of promises, forcing rejections to be\n * thrown as exceptions.\n * @param {Any*} promise at the end of a chain of promises\n * @returns nothing\n */\nQ.done = function (object, fulfilled, rejected, progress) {\n    return Q(object).done(fulfilled, rejected, progress);\n};\n\nPromise.prototype.done = function (fulfilled, rejected, progress) {\n    var onUnhandledError = function (error) {\n        // forward to a future turn so that ``when``\n        // does not catch it and turn it into a rejection.\n        Q.nextTick(function () {\n            makeStackTraceLong(error, promise);\n            if (Q.onerror) {\n                Q.onerror(error);\n            } else {\n                throw error;\n            }\n        });\n    };\n\n    // Avoid unnecessary `nextTick`ing via an unnecessary `when`.\n    var promise = fulfilled || rejected || progress ?\n        this.then(fulfilled, rejected, progress) :\n        this;\n\n    if (typeof process === \"object\" && process && process.domain) {\n        onUnhandledError = process.domain.bind(onUnhandledError);\n    }\n\n    promise.then(void 0, onUnhandledError);\n};\n\n/**\n * Causes a promise to be rejected if it does not get fulfilled before\n * some milliseconds time out.\n * @param {Any*} promise\n * @param {Number} milliseconds timeout\n * @param {Any*} custom error message or Error object (optional)\n * @returns a promise for the resolution of the given promise if it is\n * fulfilled before the timeout, otherwise rejected.\n */\nQ.timeout = function (object, ms, error) {\n    return Q(object).timeout(ms, error);\n};\n\nPromise.prototype.timeout = function (ms, error) {\n    var deferred = defer();\n    var timeoutId = setTimeout(function () {\n        if (!error || \"string\" === typeof error) {\n            error = new Error(error || \"Timed out after \" + ms + \" ms\");\n            error.code = \"ETIMEDOUT\";\n        }\n        deferred.reject(error);\n    }, ms);\n\n    this.then(function (value) {\n        clearTimeout(timeoutId);\n        deferred.resolve(value);\n    }, function (exception) {\n        clearTimeout(timeoutId);\n        deferred.reject(exception);\n    }, deferred.notify);\n\n    return deferred.promise;\n};\n\n/**\n * Returns a promise for the given value (or promised value), some\n * milliseconds after it resolved. Passes rejections immediately.\n * @param {Any*} promise\n * @param {Number} milliseconds\n * @returns a promise for the resolution of the given promise after milliseconds\n * time has elapsed since the resolution of the given promise.\n * If the given promise rejects, that is passed immediately.\n */\nQ.delay = function (object, timeout) {\n    if (timeout === void 0) {\n        timeout = object;\n        object = void 0;\n    }\n    return Q(object).delay(timeout);\n};\n\nPromise.prototype.delay = function (timeout) {\n    return this.then(function (value) {\n        var deferred = defer();\n        setTimeout(function () {\n            deferred.resolve(value);\n        }, timeout);\n        return deferred.promise;\n    });\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided as an array, and returns a promise.\n *\n *      Q.nfapply(FS.readFile, [__filename])\n *      .then(function (content) {\n *      })\n *\n */\nQ.nfapply = function (callback, args) {\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfapply = function (args) {\n    var deferred = defer();\n    var nodeArgs = array_slice(args);\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided individually, and returns a promise.\n * @example\n * Q.nfcall(FS.readFile, __filename)\n * .then(function (content) {\n * })\n *\n */\nQ.nfcall = function (callback /*...args*/) {\n    var args = array_slice(arguments, 1);\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfcall = function (/*...args*/) {\n    var nodeArgs = array_slice(arguments);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Wraps a NodeJS continuation passing function and returns an equivalent\n * version that returns a promise.\n * @example\n * Q.nfbind(FS.readFile, __filename)(\"utf-8\")\n * .then(console.log)\n * .done()\n */\nQ.nfbind =\nQ.denodeify = function (callback /*...args*/) {\n    var baseArgs = array_slice(arguments, 1);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        Q(callback).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nfbind =\nPromise.prototype.denodeify = function (/*...args*/) {\n    var args = array_slice(arguments);\n    args.unshift(this);\n    return Q.denodeify.apply(void 0, args);\n};\n\nQ.nbind = function (callback, thisp /*...args*/) {\n    var baseArgs = array_slice(arguments, 2);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        function bound() {\n            return callback.apply(thisp, arguments);\n        }\n        Q(bound).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nbind = function (/*thisp, ...args*/) {\n    var args = array_slice(arguments, 0);\n    args.unshift(this);\n    return Q.nbind.apply(void 0, args);\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback with a given array of arguments, plus a provided callback.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param {Array} args arguments to pass to the method; the callback\n * will be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nmapply = // XXX As proposed by \"Redsandro\"\nQ.npost = function (object, name, args) {\n    return Q(object).npost(name, args);\n};\n\nPromise.prototype.nmapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.npost = function (name, args) {\n    var nodeArgs = array_slice(args || []);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback, forwarding the given variadic arguments, plus a provided\n * callback argument.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param ...args arguments to pass to the method; the callback will\n * be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nsend = // XXX Based on Mark Miller's proposed \"send\"\nQ.nmcall = // XXX Based on \"Redsandro's\" proposal\nQ.ninvoke = function (object, name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 2);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    Q(object).dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\nPromise.prototype.nsend = // XXX Based on Mark Miller's proposed \"send\"\nPromise.prototype.nmcall = // XXX Based on \"Redsandro's\" proposal\nPromise.prototype.ninvoke = function (name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 1);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * If a function would like to support both Node continuation-passing-style and\n * promise-returning-style, it can end its internal promise chain with\n * `nodeify(nodeback)`, forwarding the optional nodeback argument.  If the user\n * elects to use a nodeback, the result will be sent there.  If they do not\n * pass a nodeback, they will receive the result promise.\n * @param object a result (or a promise for a result)\n * @param {Function} nodeback a Node.js-style callback\n * @returns either the promise or nothing\n */\nQ.nodeify = nodeify;\nfunction nodeify(object, nodeback) {\n    return Q(object).nodeify(nodeback);\n}\n\nPromise.prototype.nodeify = function (nodeback) {\n    if (nodeback) {\n        this.then(function (value) {\n            Q.nextTick(function () {\n                nodeback(null, value);\n            });\n        }, function (error) {\n            Q.nextTick(function () {\n                nodeback(error);\n            });\n        });\n    } else {\n        return this;\n    }\n};\n\nQ.noConflict = function() {\n    throw new Error(\"Q.noConflict only works when Q is used as a global\");\n};\n\n// All code before this point will be filtered from stack traces.\nvar qEndingLine = captureLine();\n\nreturn Q;\n\n});\n"]}
-},{"_process":13}],162:[function(require,module,exports){
-/**
- * Module dependencies.
- */
-
-var Emitter = require('emitter');
-var reduce = require('reduce');
 
+},{"_process":12}],158:[function(require,module,exports){
 /**
  * Root reference for iframes.
  */
@@ -23257,9 +20170,14 @@ if (typeof window !== 'undefined') { // Browser window
 } else if (typeof self !== 'undefined') { // Web Worker
   root = self;
 } else { // Other environments
+  console.warn("Using browser-only version of superagent in non-browser environment");
   root = this;
 }
 
+var Emitter = require('emitter');
+var requestBase = require('./request-base');
+var isObject = require('./is-object');
+
 /**
  * Noop.
  */
@@ -23267,28 +20185,10 @@ if (typeof window !== 'undefined') { // Browser window
 function noop(){};
 
 /**
- * Check if `obj` is a host object,
- * we don't want to serialize these :)
- *
- * TODO: future proof, move to compoent land
- *
- * @param {Object} obj
- * @return {Boolean}
- * @api private
+ * Expose `request`.
  */
 
-function isHost(obj) {
-  var str = {}.toString.call(obj);
-
-  switch (str) {
-    case '[object File]':
-    case '[object Blob]':
-    case '[object FormData]':
-      return true;
-    default:
-      return false;
-  }
-}
+var request = module.exports = require('./request').bind(null, Request);
 
 /**
  * Determine XHR.
@@ -23305,7 +20205,7 @@ request.getXHR = function () {
     try { return new ActiveXObject('Msxml2.XMLHTTP.3.0'); } catch(e) {}
     try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch(e) {}
   }
-  return false;
+  throw Error("Browser-only verison of superagent could not find XHR");
 };
 
 /**
@@ -23320,18 +20220,6 @@ var trim = ''.trim
   ? function(s) { return s.trim(); }
   : function(s) { return s.replace(/(^\s*|\s*$)/g, ''); };
 
-/**
- * Check if `obj` is an object.
- *
- * @param {Object} obj
- * @return {Boolean}
- * @api private
- */
-
-function isObject(obj) {
-  return obj === Object(obj);
-}
-
 /**
  * Serialize the given `obj`.
  *
@@ -23344,10 +20232,8 @@ function serialize(obj) {
   if (!isObject(obj)) return obj;
   var pairs = [];
   for (var key in obj) {
-    if (null != obj[key]) {
-      pushEncodedKeyValuePair(pairs, key, obj[key]);
-        }
-      }
+    pushEncodedKeyValuePair(pairs, key, obj[key]);
+  }
   return pairs.join('&');
 }
 
@@ -23361,13 +20247,22 @@ function serialize(obj) {
  */
 
 function pushEncodedKeyValuePair(pairs, key, val) {
-  if (Array.isArray(val)) {
-    return val.forEach(function(v) {
-      pushEncodedKeyValuePair(pairs, key, v);
-    });
+  if (val != null) {
+    if (Array.isArray(val)) {
+      val.forEach(function(v) {
+        pushEncodedKeyValuePair(pairs, key, v);
+      });
+    } else if (isObject(val)) {
+      for(var subkey in val) {
+        pushEncodedKeyValuePair(pairs, key + '[' + subkey + ']', val[subkey]);
+      }
+    } else {
+      pairs.push(encodeURIComponent(key)
+        + '=' + encodeURIComponent(val));
+    }
+  } else if (val === null) {
+    pairs.push(encodeURIComponent(key));
   }
-  pairs.push(encodeURIComponent(key)
-    + '=' + encodeURIComponent(val));
 }
 
 /**
@@ -23387,13 +20282,18 @@ function pushEncodedKeyValuePair(pairs, key, val) {
 function parseString(str) {
   var obj = {};
   var pairs = str.split('&');
-  var parts;
   var pair;
+  var pos;
 
   for (var i = 0, len = pairs.length; i < len; ++i) {
     pair = pairs[i];
-    parts = pair.split('=');
-    obj[decodeURIComponent(parts[0])] = decodeURIComponent(parts[1]);
+    pos = pair.indexOf('=');
+    if (pos == -1) {
+      obj[decodeURIComponent(pair)] = '';
+    } else {
+      obj[decodeURIComponent(pair.slice(0, pos))] =
+        decodeURIComponent(pair.slice(pos + 1));
+    }
   }
 
   return obj;
@@ -23479,6 +20379,18 @@ function parseHeader(str) {
   return fields;
 }
 
+/**
+ * Check if `mime` is json or has +json structured syntax suffix.
+ *
+ * @param {String} mime
+ * @return {Boolean}
+ * @api private
+ */
+
+function isJSON(mime) {
+  return /[\/+]json\b/.test(mime);
+}
+
 /**
  * Return the mime type for the given `str`.
  *
@@ -23500,10 +20412,10 @@ function type(str){
  */
 
 function params(str){
-  return reduce(str.split(/ *; */), function(obj, str){
-    var parts = str.split(/ *= */)
-      , key = parts.shift()
-      , val = parts.shift();
+  return str.split(/ *; */).reduce(function(obj, str){
+    var parts = str.split(/ *= */),
+        key = parts.shift(),
+        val = parts.shift();
 
     if (key && val) obj[key] = val;
     return obj;
@@ -23565,15 +20477,15 @@ function Response(req, options) {
      ? this.xhr.responseText
      : null;
   this.statusText = this.req.xhr.statusText;
-  this.setStatusProperties(this.xhr.status);
+  this._setStatusProperties(this.xhr.status);
   this.header = this.headers = parseHeader(this.xhr.getAllResponseHeaders());
   // getAllResponseHeaders sometimes falsely returns "" for CORS requests, but
   // getResponseHeader still works. so we get content-type even if getting
   // other headers fails.
   this.header['content-type'] = this.xhr.getResponseHeader('content-type');
-  this.setHeaderProperties(this.header);
+  this._setHeaderProperties(this.header);
   this.body = this.req.method != 'HEAD'
-    ? this.parseBody(this.text ? this.text : this.xhr.response)
+    ? this._parseBody(this.text ? this.text : this.xhr.response)
     : null;
 }
 
@@ -23601,7 +20513,7 @@ Response.prototype.get = function(field){
  * @api private
  */
 
-Response.prototype.setHeaderProperties = function(header){
+Response.prototype._setHeaderProperties = function(header){
   // content-type
   var ct = this.header['content-type'] || '';
   this.type = type(ct);
@@ -23622,8 +20534,11 @@ Response.prototype.setHeaderProperties = function(header){
  * @api private
  */
 
-Response.prototype.parseBody = function(str){
+Response.prototype._parseBody = function(str){
   var parse = request.parse[this.type];
+  if (!parse && isJSON(this.type)) {
+    parse = request.parse['application/json'];
+  }
   return parse && str && (str.length || str instanceof Object)
     ? parse(str)
     : null;
@@ -23650,7 +20565,7 @@ Response.prototype.parseBody = function(str){
  * @api private
  */
 
-Response.prototype.setStatusProperties = function(status){
+Response.prototype._setStatusProperties = function(status){
   // handle IE9 bug: http://stackoverflow.com/questions/10046972/msie-returns-status-code-of-1223-for-ajax-request
   if (status === 1223) {
     status = 204;
@@ -23718,12 +20633,11 @@ request.Response = Response;
 
 function Request(method, url) {
   var self = this;
-  Emitter.call(this);
   this._query = this._query || [];
   this.method = method;
   this.url = url;
-  this.header = {};
-  this._header = {};
+  this.header = {}; // preserves header name case
+  this._header = {}; // coerces header names to lowercase
   this.on('end', function(){
     var err = null;
     var res = null;
@@ -23734,149 +20648,45 @@ function Request(method, url) {
       err = new Error('Parser is unable to parse the response');
       err.parse = true;
       err.original = e;
+      // issue #675: return the raw response if the response parsing fails
+      err.rawResponse = self.xhr && self.xhr.responseText ? self.xhr.responseText : null;
+      // issue #876: return the http status code if the response parsing fails
+      err.statusCode = self.xhr && self.xhr.status ? self.xhr.status : null;
       return self.callback(err);
     }
 
     self.emit('response', res);
 
-    if (err) {
-      return self.callback(err, res);
+    var new_err;
+    try {
+      if (res.status < 200 || res.status >= 300) {
+        new_err = new Error(res.statusText || 'Unsuccessful HTTP response');
+        new_err.original = err;
+        new_err.response = res;
+        new_err.status = res.status;
+      }
+    } catch(e) {
+      new_err = e; // #985 touching res may cause INVALID_STATE_ERR on old Android
     }
 
-    if (res.status >= 200 && res.status < 300) {
-      return self.callback(err, res);
+    // #1000 don't catch errors from the callback to avoid double calling it
+    if (new_err) {
+      self.callback(new_err, res);
+    } else {
+      self.callback(null, res);
     }
-
-    var new_err = new Error(res.statusText || 'Unsuccessful HTTP response');
-    new_err.original = err;
-    new_err.response = res;
-    new_err.status = res.status;
-
-    self.callback(new_err, res);
   });
 }
 
 /**
- * Mixin `Emitter`.
+ * Mixin `Emitter` and `requestBase`.
  */
 
 Emitter(Request.prototype);
-
-/**
- * Allow for extension
- */
-
-Request.prototype.use = function(fn) {
-  fn(this);
-  return this;
+for (var key in requestBase) {
+  Request.prototype[key] = requestBase[key];
 }
 
-/**
- * Set timeout to `ms`.
- *
- * @param {Number} ms
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.timeout = function(ms){
-  this._timeout = ms;
-  return this;
-};
-
-/**
- * Clear previous timeout.
- *
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.clearTimeout = function(){
-  this._timeout = 0;
-  clearTimeout(this._timer);
-  return this;
-};
-
-/**
- * Abort the request, and clear potential timeout.
- *
- * @return {Request}
- * @api public
- */
-
-Request.prototype.abort = function(){
-  if (this.aborted) return;
-  this.aborted = true;
-  this.xhr.abort();
-  this.clearTimeout();
-  this.emit('abort');
-  return this;
-};
-
-/**
- * Set header `field` to `val`, or multiple fields with one object.
- *
- * Examples:
- *
- *      req.get('/')
- *        .set('Accept', 'application/json')
- *        .set('X-API-Key', 'foobar')
- *        .end(callback);
- *
- *      req.get('/')
- *        .set({ Accept: 'application/json', 'X-API-Key': 'foobar' })
- *        .end(callback);
- *
- * @param {String|Object} field
- * @param {String} val
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.set = function(field, val){
-  if (isObject(field)) {
-    for (var key in field) {
-      this.set(key, field[key]);
-    }
-    return this;
-  }
-  this._header[field.toLowerCase()] = val;
-  this.header[field] = val;
-  return this;
-};
-
-/**
- * Remove header `field`.
- *
- * Example:
- *
- *      req.get('/')
- *        .unset('User-Agent')
- *        .end(callback);
- *
- * @param {String} field
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.unset = function(field){
-  delete this._header[field.toLowerCase()];
-  delete this.header[field];
-  return this;
-};
-
-/**
- * Get case-insensitive header `field` value.
- *
- * @param {String} field
- * @return {String}
- * @api private
- */
-
-Request.prototype.getHeader = function(field){
-  return this._header[field.toLowerCase()];
-};
-
 /**
  * Set Content-Type to `type`, mapping values from `request.types`.
  *
@@ -23905,16 +20715,22 @@ Request.prototype.type = function(type){
 };
 
 /**
- * Force given parser
+ * Set responseType to `val`. Presently valid responseTypes are 'blob' and
+ * 'arraybuffer'.
  *
- * Sets the body parser no matter type.
+ * Examples:
  *
- * @param {Function}
+ *      req.get('/')
+ *        .responseType('blob')
+ *        .end(callback);
+ *
+ * @param {String} val
+ * @return {Request} for chaining
  * @api public
  */
 
-Request.prototype.parse = function(fn){
-  this._parser = fn;
+Request.prototype.responseType = function(val){
+  this._responseType = val;
   return this;
 };
 
@@ -23948,13 +20764,29 @@ Request.prototype.accept = function(type){
  *
  * @param {String} user
  * @param {String} pass
+ * @param {Object} options with 'type' property 'auto' or 'basic' (default 'basic')
  * @return {Request} for chaining
  * @api public
  */
 
-Request.prototype.auth = function(user, pass){
-  var str = btoa(user + ':' + pass);
-  this.set('Authorization', 'Basic ' + str);
+Request.prototype.auth = function(user, pass, options){
+  if (!options) {
+    options = {
+      type: 'basic'
+    }
+  }
+
+  switch (options.type) {
+    case 'basic':
+      var str = btoa(user + ':' + pass);
+      this.set('Authorization', 'Basic ' + str);
+    break;
+
+    case 'auto':
+      this.username = user;
+      this.password = pass;
+    break;
+  }
   return this;
 };
 
@@ -23978,35 +20810,13 @@ Request.prototype.query = function(val){
   return this;
 };
 
-/**
- * Write the field `name` and `val` for "multipart/form-data"
- * request bodies.
- *
- * ``` js
- * request.post('/upload')
- *   .field('foo', 'bar')
- *   .end(callback);
- * ```
- *
- * @param {String} name
- * @param {String|Blob|File} val
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.field = function(name, val){
-  if (!this._formData) this._formData = new root.FormData();
-  this._formData.append(name, val);
-  return this;
-};
-
 /**
  * Queue the given `file` as an attachment to the specified `field`,
  * with optional `filename`.
  *
  * ``` js
  * request.post('/upload')
- *   .attach(new Blob(['<a id="a"><b id="b">hey!</b></a>'], { type: "text/html"}))
+ *   .attach('content', new Blob(['<a id="a"><b id="b">hey!</b></a>'], { type: "text/html"}))
  *   .end(callback);
  * ```
  *
@@ -24018,27 +20828,613 @@ Request.prototype.field = function(name, val){
  */
 
 Request.prototype.attach = function(field, file, filename){
-  if (!this._formData) this._formData = new root.FormData();
-  this._formData.append(field, file, filename);
+  this._getFormData().append(field, file, filename || file.name);
+  return this;
+};
+
+Request.prototype._getFormData = function(){
+  if (!this._formData) {
+    this._formData = new root.FormData();
+  }
+  return this._formData;
+};
+
+/**
+ * Invoke the callback with `err` and `res`
+ * and handle arity check.
+ *
+ * @param {Error} err
+ * @param {Response} res
+ * @api private
+ */
+
+Request.prototype.callback = function(err, res){
+  var fn = this._callback;
+  this.clearTimeout();
+  fn(err, res);
+};
+
+/**
+ * Invoke callback with x-domain error.
+ *
+ * @api private
+ */
+
+Request.prototype.crossDomainError = function(){
+  var err = new Error('Request has been terminated\nPossible causes: the network is offline, Origin is not allowed by Access-Control-Allow-Origin, the page is being unloaded, etc.');
+  err.crossDomain = true;
+
+  err.status = this.status;
+  err.method = this.method;
+  err.url = this.url;
+
+  this.callback(err);
+};
+
+/**
+ * Invoke callback with timeout error.
+ *
+ * @api private
+ */
+
+Request.prototype._timeoutError = function(){
+  var timeout = this._timeout;
+  var err = new Error('timeout of ' + timeout + 'ms exceeded');
+  err.timeout = timeout;
+  this.callback(err);
+};
+
+/**
+ * Compose querystring to append to req.url
+ *
+ * @api private
+ */
+
+Request.prototype._appendQueryString = function(){
+  var query = this._query.join('&');
+  if (query) {
+    this.url += ~this.url.indexOf('?')
+      ? '&' + query
+      : '?' + query;
+  }
+};
+
+/**
+ * Initiate request, invoking callback `fn(res)`
+ * with an instanceof `Response`.
+ *
+ * @param {Function} fn
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.end = function(fn){
+  var self = this;
+  var xhr = this.xhr = request.getXHR();
+  var timeout = this._timeout;
+  var data = this._formData || this._data;
+
+  // store callback
+  this._callback = fn || noop;
+
+  // state change
+  xhr.onreadystatechange = function(){
+    if (4 != xhr.readyState) return;
+
+    // In IE9, reads to any property (e.g. status) off of an aborted XHR will
+    // result in the error "Could not complete the operation due to error c00c023f"
+    var status;
+    try { status = xhr.status } catch(e) { status = 0; }
+
+    if (0 == status) {
+      if (self.timedout) return self._timeoutError();
+      if (self._aborted) return;
+      return self.crossDomainError();
+    }
+    self.emit('end');
+  };
+
+  // progress
+  var handleProgress = function(e){
+    if (e.total > 0) {
+      e.percent = e.loaded / e.total * 100;
+    }
+    e.direction = 'download';
+    self.emit('progress', e);
+  };
+  if (this.hasListeners('progress')) {
+    xhr.onprogress = handleProgress;
+  }
+  try {
+    if (xhr.upload && this.hasListeners('progress')) {
+      xhr.upload.onprogress = handleProgress;
+    }
+  } catch(e) {
+    // Accessing xhr.upload fails in IE from a web worker, so just pretend it doesn't exist.
+    // Reported here:
+    // https://connect.microsoft.com/IE/feedback/details/837245/xmlhttprequest-upload-throws-invalid-argument-when-used-from-web-worker-context
+  }
+
+  // timeout
+  if (timeout && !this._timer) {
+    this._timer = setTimeout(function(){
+      self.timedout = true;
+      self.abort();
+    }, timeout);
+  }
+
+  // querystring
+  this._appendQueryString();
+
+  // initiate request
+  if (this.username && this.password) {
+    xhr.open(this.method, this.url, true, this.username, this.password);
+  } else {
+    xhr.open(this.method, this.url, true);
+  }
+
+  // CORS
+  if (this._withCredentials) xhr.withCredentials = true;
+
+  // body
+  if ('GET' != this.method && 'HEAD' != this.method && 'string' != typeof data && !this._isHost(data)) {
+    // serialize stuff
+    var contentType = this._header['content-type'];
+    var serialize = this._serializer || request.serialize[contentType ? contentType.split(';')[0] : ''];
+    if (!serialize && isJSON(contentType)) serialize = request.serialize['application/json'];
+    if (serialize) data = serialize(data);
+  }
+
+  // set header fields
+  for (var field in this.header) {
+    if (null == this.header[field]) continue;
+    xhr.setRequestHeader(field, this.header[field]);
+  }
+
+  if (this._responseType) {
+    xhr.responseType = this._responseType;
+  }
+
+  // send stuff
+  this.emit('request', this);
+
+  // IE11 xhr.send(undefined) sends 'undefined' string as POST payload (instead of nothing)
+  // We need null here if data is undefined
+  xhr.send(typeof data !== 'undefined' ? data : null);
+  return this;
+};
+
+
+/**
+ * Expose `Request`.
+ */
+
+request.Request = Request;
+
+/**
+ * GET `url` with optional callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Mixed|Function} [data] or fn
+ * @param {Function} [fn]
+ * @return {Request}
+ * @api public
+ */
+
+request.get = function(url, data, fn){
+  var req = request('GET', url);
+  if ('function' == typeof data) fn = data, data = null;
+  if (data) req.query(data);
+  if (fn) req.end(fn);
+  return req;
+};
+
+/**
+ * HEAD `url` with optional callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Mixed|Function} [data] or fn
+ * @param {Function} [fn]
+ * @return {Request}
+ * @api public
+ */
+
+request.head = function(url, data, fn){
+  var req = request('HEAD', url);
+  if ('function' == typeof data) fn = data, data = null;
+  if (data) req.send(data);
+  if (fn) req.end(fn);
+  return req;
+};
+
+/**
+ * OPTIONS query to `url` with optional callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Mixed|Function} [data] or fn
+ * @param {Function} [fn]
+ * @return {Request}
+ * @api public
+ */
+
+request.options = function(url, data, fn){
+  var req = request('OPTIONS', url);
+  if ('function' == typeof data) fn = data, data = null;
+  if (data) req.send(data);
+  if (fn) req.end(fn);
+  return req;
+};
+
+/**
+ * DELETE `url` with optional callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Function} [fn]
+ * @return {Request}
+ * @api public
+ */
+
+function del(url, fn){
+  var req = request('DELETE', url);
+  if (fn) req.end(fn);
+  return req;
+};
+
+request['del'] = del;
+request['delete'] = del;
+
+/**
+ * PATCH `url` with optional `data` and callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Mixed} [data]
+ * @param {Function} [fn]
+ * @return {Request}
+ * @api public
+ */
+
+request.patch = function(url, data, fn){
+  var req = request('PATCH', url);
+  if ('function' == typeof data) fn = data, data = null;
+  if (data) req.send(data);
+  if (fn) req.end(fn);
+  return req;
+};
+
+/**
+ * POST `url` with optional `data` and callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Mixed} [data]
+ * @param {Function} [fn]
+ * @return {Request}
+ * @api public
+ */
+
+request.post = function(url, data, fn){
+  var req = request('POST', url);
+  if ('function' == typeof data) fn = data, data = null;
+  if (data) req.send(data);
+  if (fn) req.end(fn);
+  return req;
+};
+
+/**
+ * PUT `url` with optional `data` and callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Mixed|Function} [data] or fn
+ * @param {Function} [fn]
+ * @return {Request}
+ * @api public
+ */
+
+request.put = function(url, data, fn){
+  var req = request('PUT', url);
+  if ('function' == typeof data) fn = data, data = null;
+  if (data) req.send(data);
+  if (fn) req.end(fn);
+  return req;
+};
+
+},{"./is-object":159,"./request":161,"./request-base":160,"emitter":162}],159:[function(require,module,exports){
+/**
+ * Check if `obj` is an object.
+ *
+ * @param {Object} obj
+ * @return {Boolean}
+ * @api private
+ */
+
+function isObject(obj) {
+  return null !== obj && 'object' === typeof obj;
+}
+
+module.exports = isObject;
+
+},{}],160:[function(require,module,exports){
+/**
+ * Module of mixed-in functions shared between node and client code
+ */
+var isObject = require('./is-object');
+
+/**
+ * Clear previous timeout.
+ *
+ * @return {Request} for chaining
+ * @api public
+ */
+
+exports.clearTimeout = function _clearTimeout(){
+  this._timeout = 0;
+  clearTimeout(this._timer);
   return this;
 };
 
 /**
- * Send `data`, defaulting the `.type()` to "json" when
- * an object is given.
+ * Override default response body parser
+ *
+ * This function will be called to convert incoming data into request.body
+ *
+ * @param {Function}
+ * @api public
+ */
+
+exports.parse = function parse(fn){
+  this._parser = fn;
+  return this;
+};
+
+/**
+ * Override default request body serializer
+ *
+ * This function will be called to convert data set via .send or .attach into payload to send
+ *
+ * @param {Function}
+ * @api public
+ */
+
+exports.serialize = function serialize(fn){
+  this._serializer = fn;
+  return this;
+};
+
+/**
+ * Set timeout to `ms`.
+ *
+ * @param {Number} ms
+ * @return {Request} for chaining
+ * @api public
+ */
+
+exports.timeout = function timeout(ms){
+  this._timeout = ms;
+  return this;
+};
+
+/**
+ * Promise support
+ *
+ * @param {Function} resolve
+ * @param {Function} reject
+ * @return {Request}
+ */
+
+exports.then = function then(resolve, reject) {
+  if (!this._fullfilledPromise) {
+    var self = this;
+    this._fullfilledPromise = new Promise(function(innerResolve, innerReject){
+      self.end(function(err, res){
+        if (err) innerReject(err); else innerResolve(res);
+      });
+    });
+  }
+  return this._fullfilledPromise.then(resolve, reject);
+}
+
+/**
+ * Allow for extension
+ */
+
+exports.use = function use(fn) {
+  fn(this);
+  return this;
+}
+
+
+/**
+ * Get request header `field`.
+ * Case-insensitive.
+ *
+ * @param {String} field
+ * @return {String}
+ * @api public
+ */
+
+exports.get = function(field){
+  return this._header[field.toLowerCase()];
+};
+
+/**
+ * Get case-insensitive header `field` value.
+ * This is a deprecated internal API. Use `.get(field)` instead.
+ *
+ * (getHeader is no longer used internally by the superagent code base)
+ *
+ * @param {String} field
+ * @return {String}
+ * @api private
+ * @deprecated
+ */
+
+exports.getHeader = exports.get;
+
+/**
+ * Set header `field` to `val`, or multiple fields with one object.
+ * Case-insensitive.
  *
  * Examples:
  *
- *       // querystring
- *       request.get('/search')
- *         .end(callback)
+ *      req.get('/')
+ *        .set('Accept', 'application/json')
+ *        .set('X-API-Key', 'foobar')
+ *        .end(callback);
  *
- *       // multiple data "writes"
- *       request.get('/search')
- *         .send({ search: 'query' })
- *         .send({ range: '1..5' })
- *         .send({ order: 'desc' })
- *         .end(callback)
+ *      req.get('/')
+ *        .set({ Accept: 'application/json', 'X-API-Key': 'foobar' })
+ *        .end(callback);
+ *
+ * @param {String|Object} field
+ * @param {String} val
+ * @return {Request} for chaining
+ * @api public
+ */
+
+exports.set = function(field, val){
+  if (isObject(field)) {
+    for (var key in field) {
+      this.set(key, field[key]);
+    }
+    return this;
+  }
+  this._header[field.toLowerCase()] = val;
+  this.header[field] = val;
+  return this;
+};
+
+/**
+ * Remove header `field`.
+ * Case-insensitive.
+ *
+ * Example:
+ *
+ *      req.get('/')
+ *        .unset('User-Agent')
+ *        .end(callback);
+ *
+ * @param {String} field
+ */
+exports.unset = function(field){
+  delete this._header[field.toLowerCase()];
+  delete this.header[field];
+  return this;
+};
+
+/**
+ * Write the field `name` and `val` for "multipart/form-data"
+ * request bodies.
+ *
+ * ``` js
+ * request.post('/upload')
+ *   .field('foo', 'bar')
+ *   .end(callback);
+ * ```
+ *
+ * @param {String} name
+ * @param {String|Blob|File|Buffer|fs.ReadStream} val
+ * @return {Request} for chaining
+ * @api public
+ */
+exports.field = function(name, val) {
+  this._getFormData().append(name, val);
+  return this;
+};
+
+/**
+ * Abort the request, and clear potential timeout.
+ *
+ * @return {Request}
+ * @api public
+ */
+exports.abort = function(){
+  if (this._aborted) {
+    return this;
+  }
+  this._aborted = true;
+  this.xhr && this.xhr.abort(); // browser
+  this.req && this.req.abort(); // node
+  this.clearTimeout();
+  this.emit('abort');
+  return this;
+};
+
+/**
+ * Enable transmission of cookies with x-domain requests.
+ *
+ * Note that for this to work the origin must not be
+ * using "Access-Control-Allow-Origin" with a wildcard,
+ * and also must set "Access-Control-Allow-Credentials"
+ * to "true".
+ *
+ * @api public
+ */
+
+exports.withCredentials = function(){
+  // This is browser-only functionality. Node side is no-op.
+  this._withCredentials = true;
+  return this;
+};
+
+/**
+ * Set the max redirects to `n`. Does noting in browser XHR implementation.
+ *
+ * @param {Number} n
+ * @return {Request} for chaining
+ * @api public
+ */
+
+exports.redirects = function(n){
+  this._maxRedirects = n;
+  return this;
+};
+
+/**
+ * Convert to a plain javascript object (not JSON string) of scalar properties.
+ * Note as this method is designed to return a useful non-this value,
+ * it cannot be chained.
+ *
+ * @return {Object} describing method, url, and data of this request
+ * @api public
+ */
+
+exports.toJSON = function(){
+  return {
+    method: this.method,
+    url: this.url,
+    data: this._data,
+    headers: this._header
+  };
+};
+
+/**
+ * Check if `obj` is a host object,
+ * we don't want to serialize these :)
+ *
+ * TODO: future proof, move to compoent land
+ *
+ * @param {Object} obj
+ * @return {Boolean}
+ * @api private
+ */
+
+exports._isHost = function _isHost(obj) {
+  var str = {}.toString.call(obj);
+
+  switch (str) {
+    case '[object File]':
+    case '[object Blob]':
+    case '[object FormData]':
+      return true;
+    default:
+      return false;
+  }
+}
+
+/**
+ * Send `data` as the request body, defaulting the `.type()` to "json" when
+ * an object is given.
+ *
+ * Examples:
  *
  *       // manual json
  *       request.post('/user')
@@ -24064,19 +21460,19 @@ Request.prototype.attach = function(field, file, filename){
  *         .end(callback)
  *
  *       // defaults to x-www-form-urlencoded
-  *      request.post('/user')
-  *        .send('name=tobi')
-  *        .send('species=ferret')
-  *        .end(callback)
+ *      request.post('/user')
+ *        .send('name=tobi')
+ *        .send('species=ferret')
+ *        .end(callback)
  *
  * @param {String|Object} data
  * @return {Request} for chaining
  * @api public
  */
 
-Request.prototype.send = function(data){
+exports.send = function(data){
   var obj = isObject(data);
-  var type = this.getHeader('Content-Type');
+  var type = this._header['content-type'];
 
   // merge
   if (obj && isObject(this._data)) {
@@ -24084,8 +21480,9 @@ Request.prototype.send = function(data){
       this._data[key] = data[key];
     }
   } else if ('string' == typeof data) {
+    // default to x-www-form-urlencoded
     if (!type) this.type('form');
-    type = this.getHeader('Content-Type');
+    type = this._header['content-type'];
     if ('application/x-www-form-urlencoded' == type) {
       this._data = this._data
         ? this._data + '&' + data
@@ -24097,188 +21494,16 @@ Request.prototype.send = function(data){
     this._data = data;
   }
 
-  if (!obj || isHost(data)) return this;
+  if (!obj || this._isHost(data)) return this;
+
+  // default to json
   if (!type) this.type('json');
   return this;
 };
 
-/**
- * Invoke the callback with `err` and `res`
- * and handle arity check.
- *
- * @param {Error} err
- * @param {Response} res
- * @api private
- */
-
-Request.prototype.callback = function(err, res){
-  var fn = this._callback;
-  this.clearTimeout();
-  fn(err, res);
-};
-
-/**
- * Invoke callback with x-domain error.
- *
- * @api private
- */
-
-Request.prototype.crossDomainError = function(){
-  var err = new Error('Origin is not allowed by Access-Control-Allow-Origin');
-  err.crossDomain = true;
-  this.callback(err);
-};
-
-/**
- * Invoke callback with timeout error.
- *
- * @api private
- */
-
-Request.prototype.timeoutError = function(){
-  var timeout = this._timeout;
-  var err = new Error('timeout of ' + timeout + 'ms exceeded');
-  err.timeout = timeout;
-  this.callback(err);
-};
-
-/**
- * Enable transmission of cookies with x-domain requests.
- *
- * Note that for this to work the origin must not be
- * using "Access-Control-Allow-Origin" with a wildcard,
- * and also must set "Access-Control-Allow-Credentials"
- * to "true".
- *
- * @api public
- */
-
-Request.prototype.withCredentials = function(){
-  this._withCredentials = true;
-  return this;
-};
-
-/**
- * Initiate request, invoking callback `fn(res)`
- * with an instanceof `Response`.
- *
- * @param {Function} fn
- * @return {Request} for chaining
- * @api public
- */
-
-Request.prototype.end = function(fn){
-  var self = this;
-  var xhr = this.xhr = request.getXHR();
-  var query = this._query.join('&');
-  var timeout = this._timeout;
-  var data = this._formData || this._data;
-
-  // store callback
-  this._callback = fn || noop;
-
-  // state change
-  xhr.onreadystatechange = function(){
-    if (4 != xhr.readyState) return;
-
-    // In IE9, reads to any property (e.g. status) off of an aborted XHR will
-    // result in the error "Could not complete the operation due to error c00c023f"
-    var status;
-    try { status = xhr.status } catch(e) { status = 0; }
-
-    if (0 == status) {
-      if (self.timedout) return self.timeoutError();
-      if (self.aborted) return;
-      return self.crossDomainError();
-    }
-    self.emit('end');
-  };
-
-  // progress
-  var handleProgress = function(e){
-    if (e.total > 0) {
-      e.percent = e.loaded / e.total * 100;
-    }
-    self.emit('progress', e);
-  };
-  if (this.hasListeners('progress')) {
-    xhr.onprogress = handleProgress;
-  }
-  try {
-    if (xhr.upload && this.hasListeners('progress')) {
-      xhr.upload.onprogress = handleProgress;
-    }
-  } catch(e) {
-    // Accessing xhr.upload fails in IE from a web worker, so just pretend it doesn't exist.
-    // Reported here:
-    // https://connect.microsoft.com/IE/feedback/details/837245/xmlhttprequest-upload-throws-invalid-argument-when-used-from-web-worker-context
-  }
-
-  // timeout
-  if (timeout && !this._timer) {
-    this._timer = setTimeout(function(){
-      self.timedout = true;
-      self.abort();
-    }, timeout);
-  }
-
-  // querystring
-  if (query) {
-    query = request.serializeObject(query);
-    this.url += ~this.url.indexOf('?')
-      ? '&' + query
-      : '?' + query;
-  }
-
-  // initiate request
-  xhr.open(this.method, this.url, true);
-
-  // CORS
-  if (this._withCredentials) xhr.withCredentials = true;
-
-  // body
-  if ('GET' != this.method && 'HEAD' != this.method && 'string' != typeof data && !isHost(data)) {
-    // serialize stuff
-    var contentType = this.getHeader('Content-Type');
-    var serialize = this._parser || request.serialize[contentType ? contentType.split(';')[0] : ''];
-    if (serialize) data = serialize(data);
-  }
-
-  // set header fields
-  for (var field in this.header) {
-    if (null == this.header[field]) continue;
-    xhr.setRequestHeader(field, this.header[field]);
-  }
-
-  // send stuff
-  this.emit('request', this);
-
-  // IE11 xhr.send(undefined) sends 'undefined' string as POST payload (instead of nothing)
-  // We need null here if data is undefined
-  xhr.send(typeof data !== 'undefined' ? data : null);
-  return this;
-};
-
-/**
- * Faux promise support
- *
- * @param {Function} fulfill
- * @param {Function} reject
- * @return {Request}
- */
-
-Request.prototype.then = function (fulfill, reject) {
-  return this.end(function(err, res) {
-    err ? reject(err) : fulfill(res);
-  });
-}
-
-/**
- * Expose `Request`.
- */
-
-request.Request = Request;
-
+},{"./is-object":159}],161:[function(require,module,exports){
+// The node and browser modules expose versions of this with the
+// appropriate constructor function bound as first argument
 /**
  * Issue a request:
  *
@@ -24294,141 +21519,31 @@ request.Request = Request;
  * @api public
  */
 
-function request(method, url) {
+function request(RequestConstructor, method, url) {
   // callback
   if ('function' == typeof url) {
-    return new Request('GET', method).end(url);
+    return new RequestConstructor('GET', method).end(url);
   }
 
   // url first
-  if (1 == arguments.length) {
-    return new Request('GET', method);
+  if (2 == arguments.length) {
+    return new RequestConstructor('GET', method);
   }
 
-  return new Request(method, url);
+  return new RequestConstructor(method, url);
 }
 
-/**
- * GET `url` with optional callback `fn(res)`.
- *
- * @param {String} url
- * @param {Mixed|Function} data or fn
- * @param {Function} fn
- * @return {Request}
- * @api public
- */
-
-request.get = function(url, data, fn){
-  var req = request('GET', url);
-  if ('function' == typeof data) fn = data, data = null;
-  if (data) req.query(data);
-  if (fn) req.end(fn);
-  return req;
-};
-
-/**
- * HEAD `url` with optional callback `fn(res)`.
- *
- * @param {String} url
- * @param {Mixed|Function} data or fn
- * @param {Function} fn
- * @return {Request}
- * @api public
- */
-
-request.head = function(url, data, fn){
-  var req = request('HEAD', url);
-  if ('function' == typeof data) fn = data, data = null;
-  if (data) req.send(data);
-  if (fn) req.end(fn);
-  return req;
-};
-
-/**
- * DELETE `url` with optional callback `fn(res)`.
- *
- * @param {String} url
- * @param {Function} fn
- * @return {Request}
- * @api public
- */
-
-function del(url, fn){
-  var req = request('DELETE', url);
-  if (fn) req.end(fn);
-  return req;
-};
-
-request.del = del;
-request.delete = del;
-
-/**
- * PATCH `url` with optional `data` and callback `fn(res)`.
- *
- * @param {String} url
- * @param {Mixed} data
- * @param {Function} fn
- * @return {Request}
- * @api public
- */
-
-request.patch = function(url, data, fn){
-  var req = request('PATCH', url);
-  if ('function' == typeof data) fn = data, data = null;
-  if (data) req.send(data);
-  if (fn) req.end(fn);
-  return req;
-};
-
-/**
- * POST `url` with optional `data` and callback `fn(res)`.
- *
- * @param {String} url
- * @param {Mixed} data
- * @param {Function} fn
- * @return {Request}
- * @api public
- */
-
-request.post = function(url, data, fn){
-  var req = request('POST', url);
-  if ('function' == typeof data) fn = data, data = null;
-  if (data) req.send(data);
-  if (fn) req.end(fn);
-  return req;
-};
-
-/**
- * PUT `url` with optional `data` and callback `fn(res)`.
- *
- * @param {String} url
- * @param {Mixed|Function} data or fn
- * @param {Function} fn
- * @return {Request}
- * @api public
- */
-
-request.put = function(url, data, fn){
-  var req = request('PUT', url);
-  if ('function' == typeof data) fn = data, data = null;
-  if (data) req.send(data);
-  if (fn) req.end(fn);
-  return req;
-};
-
-/**
- * Expose `request`.
- */
-
 module.exports = request;
 
-},{"emitter":163,"reduce":164}],163:[function(require,module,exports){
+},{}],162:[function(require,module,exports){
 
 /**
  * Expose `Emitter`.
  */
 
-module.exports = Emitter;
+if (typeof module !== 'undefined') {
+  module.exports = Emitter;
+}
 
 /**
  * Initialize a new `Emitter`.
@@ -24467,7 +21582,7 @@ function mixin(obj) {
 Emitter.prototype.on =
 Emitter.prototype.addEventListener = function(event, fn){
   this._callbacks = this._callbacks || {};
-  (this._callbacks[event] = this._callbacks[event] || [])
+  (this._callbacks['$' + event] = this._callbacks['$' + event] || [])
     .push(fn);
   return this;
 };
@@ -24483,11 +21598,8 @@ Emitter.prototype.addEventListener = function(event, fn){
  */
 
 Emitter.prototype.once = function(event, fn){
-  var self = this;
-  this._callbacks = this._callbacks || {};
-
   function on() {
-    self.off(event, on);
+    this.off(event, on);
     fn.apply(this, arguments);
   }
 
@@ -24519,12 +21631,12 @@ Emitter.prototype.removeEventListener = function(event, fn){
   }
 
   // specific event
-  var callbacks = this._callbacks[event];
+  var callbacks = this._callbacks['$' + event];
   if (!callbacks) return this;
 
   // remove all handlers
   if (1 == arguments.length) {
-    delete this._callbacks[event];
+    delete this._callbacks['$' + event];
     return this;
   }
 
@@ -24551,7 +21663,7 @@ Emitter.prototype.removeEventListener = function(event, fn){
 Emitter.prototype.emit = function(event){
   this._callbacks = this._callbacks || {};
   var args = [].slice.call(arguments, 1)
-    , callbacks = this._callbacks[event];
+    , callbacks = this._callbacks['$' + event];
 
   if (callbacks) {
     callbacks = callbacks.slice(0);
@@ -24573,7 +21685,7 @@ Emitter.prototype.emit = function(event){
 
 Emitter.prototype.listeners = function(event){
   this._callbacks = this._callbacks || {};
-  return this._callbacks[event] || [];
+  return this._callbacks['$' + event] || [];
 };
 
 /**
@@ -24588,36 +21700,11 @@ Emitter.prototype.hasListeners = function(event){
   return !! this.listeners(event).length;
 };
 
-},{}],164:[function(require,module,exports){
-
-/**
- * Reduce `arr` with `fn`.
- *
- * @param {Array} arr
- * @param {Function} fn
- * @param {Mixed} initial
- *
- * TODO: combatible error handling?
- */
-
-module.exports = function(arr, fn, initial){  
-  var idx = 0;
-  var len = arr.length;
-  var curr = arguments.length == 3
-    ? initial
-    : arr[idx++];
-
-  while (idx < len) {
-    curr = fn.call(null, curr, arr[idx], ++idx, arr);
-  }
-  
-  return curr;
-};
 },{}]},{},[1])(1)
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["node_modules/browserify/node_modules/browser-pack/_prelude.js","index.js","lib/auth.js","lib/client.js","lib/helpers.js","lib/http.js","lib/resolver.js","lib/schema-markup.js","lib/spec-converter.js","lib/types/model.js","lib/types/operation.js","lib/types/operationGroup.js","node_modules/browserify/node_modules/browser-resolve/empty.js","node_modules/browserify/node_modules/process/browser.js","node_modules/btoa/index.js","node_modules/buffer/index.js","node_modules/buffer/node_modules/base64-js/lib/b64.js","node_modules/buffer/node_modules/ieee754/index.js","node_modules/buffer/node_modules/is-array/index.js","node_modules/cookiejar/cookiejar.js","node_modules/js-yaml/index.js","node_modules/js-yaml/lib/js-yaml.js","node_modules/js-yaml/lib/js-yaml/common.js","node_modules/js-yaml/lib/js-yaml/dumper.js","node_modules/js-yaml/lib/js-yaml/exception.js","node_modules/js-yaml/lib/js-yaml/loader.js","node_modules/js-yaml/lib/js-yaml/mark.js","node_modules/js-yaml/lib/js-yaml/schema.js","node_modules/js-yaml/lib/js-yaml/schema/core.js","node_modules/js-yaml/lib/js-yaml/schema/default_full.js","node_modules/js-yaml/lib/js-yaml/schema/default_safe.js","node_modules/js-yaml/lib/js-yaml/schema/failsafe.js","node_modules/js-yaml/lib/js-yaml/schema/json.js","node_modules/js-yaml/lib/js-yaml/type.js","node_modules/js-yaml/lib/js-yaml/type/binary.js","node_modules/js-yaml/lib/js-yaml/type/bool.js","node_modules/js-yaml/lib/js-yaml/type/float.js","node_modules/js-yaml/lib/js-yaml/type/int.js","node_modules/js-yaml/lib/js-yaml/type/js/function.js","node_modules/js-yaml/lib/js-yaml/type/js/regexp.js","node_modules/js-yaml/lib/js-yaml/type/js/undefined.js","node_modules/js-yaml/lib/js-yaml/type/map.js","node_modules/js-yaml/lib/js-yaml/type/merge.js","node_modules/js-yaml/lib/js-yaml/type/null.js","node_modules/js-yaml/lib/js-yaml/type/omap.js","node_modules/js-yaml/lib/js-yaml/type/pairs.js","node_modules/js-yaml/lib/js-yaml/type/seq.js","node_modules/js-yaml/lib/js-yaml/type/set.js","node_modules/js-yaml/lib/js-yaml/type/str.js","node_modules/js-yaml/lib/js-yaml/type/timestamp.js","node_modules/js-yaml/node_modules/esprima/esprima.js","node_modules/js-yaml/node_modules/inherit/index.js","node_modules/js-yaml/node_modules/inherit/lib/inherit.js","node_modules/lodash-compat/array/indexOf.js","node_modules/lodash-compat/array/last.js","node_modules/lodash-compat/chain/lodash.js","node_modules/lodash-compat/collection/each.js","node_modules/lodash-compat/collection/find.js","node_modules/lodash-compat/collection/forEach.js","node_modules/lodash-compat/collection/includes.js","node_modules/lodash-compat/collection/map.js","node_modules/lodash-compat/date/now.js","node_modules/lodash-compat/function/bind.js","node_modules/lodash-compat/function/restParam.js","node_modules/lodash-compat/internal/LazyWrapper.js","node_modules/lodash-compat/internal/LodashWrapper.js","node_modules/lodash-compat/internal/arrayCopy.js","node_modules/lodash-compat/internal/arrayEach.js","node_modules/lodash-compat/internal/arrayMap.js","node_modules/lodash-compat/internal/arraySome.js","node_modules/lodash-compat/internal/baseAssign.js","node_modules/lodash-compat/internal/baseCallback.js","node_modules/lodash-compat/internal/baseClone.js","node_modules/lodash-compat/internal/baseCopy.js","node_modules/lodash-compat/internal/baseCreate.js","node_modules/lodash-compat/internal/baseEach.js","node_modules/lodash-compat/internal/baseFind.js","node_modules/lodash-compat/internal/baseFindIndex.js","node_modules/lodash-compat/internal/baseFor.js","node_modules/lodash-compat/internal/baseForIn.js","node_modules/lodash-compat/internal/baseForOwn.js","node_modules/lodash-compat/internal/baseGet.js","node_modules/lodash-compat/internal/baseIndexOf.js","node_modules/lodash-compat/internal/baseIsEqual.js","node_modules/lodash-compat/internal/baseIsEqualDeep.js","node_modules/lodash-compat/internal/baseIsMatch.js","node_modules/lodash-compat/internal/baseLodash.js","node_modules/lodash-compat/internal/baseMap.js","node_modules/lodash-compat/internal/baseMatches.js","node_modules/lodash-compat/internal/baseMatchesProperty.js","node_modules/lodash-compat/internal/baseProperty.js","node_modules/lodash-compat/internal/basePropertyDeep.js","node_modules/lodash-compat/internal/baseSetData.js","node_modules/lodash-compat/internal/baseSlice.js","node_modules/lodash-compat/internal/baseToString.js","node_modules/lodash-compat/internal/baseValues.js","node_modules/lodash-compat/internal/binaryIndex.js","node_modules/lodash-compat/internal/binaryIndexBy.js","node_modules/lodash-compat/internal/bindCallback.js","node_modules/lodash-compat/internal/bufferClone.js","node_modules/lodash-compat/internal/composeArgs.js","node_modules/lodash-compat/internal/composeArgsRight.js","node_modules/lodash-compat/internal/createBaseEach.js","node_modules/lodash-compat/internal/createBaseFor.js","node_modules/lodash-compat/internal/createBindWrapper.js","node_modules/lodash-compat/internal/createCtorWrapper.js","node_modules/lodash-compat/internal/createFind.js","node_modules/lodash-compat/internal/createForEach.js","node_modules/lodash-compat/internal/createHybridWrapper.js","node_modules/lodash-compat/internal/createPartialWrapper.js","node_modules/lodash-compat/internal/createWrapper.js","node_modules/lodash-compat/internal/equalArrays.js","node_modules/lodash-compat/internal/equalByTag.js","node_modules/lodash-compat/internal/equalObjects.js","node_modules/lodash-compat/internal/getData.js","node_modules/lodash-compat/internal/getFuncName.js","node_modules/lodash-compat/internal/getLength.js","node_modules/lodash-compat/internal/getMatchData.js","node_modules/lodash-compat/internal/getNative.js","node_modules/lodash-compat/internal/indexOfNaN.js","node_modules/lodash-compat/internal/initCloneArray.js","node_modules/lodash-compat/internal/initCloneByTag.js","node_modules/lodash-compat/internal/initCloneObject.js","node_modules/lodash-compat/internal/isArrayLike.js","node_modules/lodash-compat/internal/isHostObject.js","node_modules/lodash-compat/internal/isIndex.js","node_modules/lodash-compat/internal/isIterateeCall.js","node_modules/lodash-compat/internal/isKey.js","node_modules/lodash-compat/internal/isLaziable.js","node_modules/lodash-compat/internal/isLength.js","node_modules/lodash-compat/internal/isObjectLike.js","node_modules/lodash-compat/internal/isStrictComparable.js","node_modules/lodash-compat/internal/mergeData.js","node_modules/lodash-compat/internal/metaMap.js","node_modules/lodash-compat/internal/realNames.js","node_modules/lodash-compat/internal/reorder.js","node_modules/lodash-compat/internal/replaceHolders.js","node_modules/lodash-compat/internal/setData.js","node_modules/lodash-compat/internal/shimKeys.js","node_modules/lodash-compat/internal/toObject.js","node_modules/lodash-compat/internal/toPath.js","node_modules/lodash-compat/internal/wrapperClone.js","node_modules/lodash-compat/lang/cloneDeep.js","node_modules/lodash-compat/lang/isArguments.js","node_modules/lodash-compat/lang/isArray.js","node_modules/lodash-compat/lang/isEmpty.js","node_modules/lodash-compat/lang/isFunction.js","node_modules/lodash-compat/lang/isNative.js","node_modules/lodash-compat/lang/isObject.js","node_modules/lodash-compat/lang/isPlainObject.js","node_modules/lodash-compat/lang/isString.js","node_modules/lodash-compat/lang/isTypedArray.js","node_modules/lodash-compat/lang/isUndefined.js","node_modules/lodash-compat/object/keys.js","node_modules/lodash-compat/object/keysIn.js","node_modules/lodash-compat/object/pairs.js","node_modules/lodash-compat/object/values.js","node_modules/lodash-compat/support.js","node_modules/lodash-compat/utility/identity.js","node_modules/lodash-compat/utility/noop.js","node_modules/lodash-compat/utility/property.js","node_modules/q/q.js","node_modules/superagent/lib/client.js","node_modules/superagent/node_modules/component-emitter/index.js","node_modules/superagent/node_modules/reduce-component/index.js"],"names":[],"mappings":"AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1RA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/rBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrhBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACloBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC99BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7/CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5HA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACh1BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1iDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrHA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvLA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACRA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACZA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACRA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACRA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7FA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7mLA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5LA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7HA;AACA;;ACDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACVA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACbA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClHA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACZA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACZA;AACA;AACA;AACA;AACA;;ACJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACngEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7pCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","'use strict';\n\nvar auth = require('./lib/auth');\nvar helpers = require('./lib/helpers');\nvar SwaggerClient = require('./lib/client');\nvar deprecationWrapper = function (url, options) {\n  helpers.log('This is deprecated, use \"new SwaggerClient\" instead.');\n\n  return new SwaggerClient(url, options);\n};\n\n/* Here for IE8 Support */\nif (!Array.prototype.indexOf) {\n  Array.prototype.indexOf = function(obj, start) {\n    for (var i = (start || 0), j = this.length; i < j; i++) {\n      if (this[i] === obj) { return i; }\n    }\n    return -1;\n  };\n}\n\n/* Here for IE8 Support */\nif (!String.prototype.trim) {\n  String.prototype.trim = function () {\n    return this.replace(/^\\s+|\\s+$/g, '');\n  };\n}\n\n/* Here for node 10.x support */\nif (!String.prototype.endsWith) {\n  String.prototype.endsWith = function(suffix) {\n    return this.indexOf(suffix, this.length - suffix.length) !== -1;\n  };\n}\n\nmodule.exports = SwaggerClient;\n\nSwaggerClient.ApiKeyAuthorization = auth.ApiKeyAuthorization;\nSwaggerClient.PasswordAuthorization = auth.PasswordAuthorization;\nSwaggerClient.CookieAuthorization = auth.CookieAuthorization;\nSwaggerClient.SwaggerApi = deprecationWrapper;\nSwaggerClient.SwaggerClient = deprecationWrapper;\nSwaggerClient.SchemaMarkup = require('./lib/schema-markup');\n","'use strict';\n\nvar helpers = require('./helpers');\nvar btoa = require('btoa'); // jshint ignore:line\nvar CookieJar = require('cookiejar').CookieJar;\nvar _ = {\n  each: require('lodash-compat/collection/each'),\n  includes: require('lodash-compat/collection/includes'),\n  isObject: require('lodash-compat/lang/isObject'),\n  isArray: require('lodash-compat/lang/isArray')\n};\n\n/**\n * SwaggerAuthorizations applys the correct authorization to an operation being executed\n */\nvar SwaggerAuthorizations = module.exports.SwaggerAuthorizations = function (authz) {\n  this.authz = authz || {};\n};\n\n/**\n * Add auths to the hash\n * Will overwrite any existing\n *\n */\nSwaggerAuthorizations.prototype.add = function (name, auth) {\n  if(_.isObject(name)) {\n    for (var key in name) {\n      this.authz[key] = name[key];\n    }\n  } else if(typeof name === 'string' ){\n    this.authz[name] = auth;\n  }\n\n  return auth;\n};\n\nSwaggerAuthorizations.prototype.remove = function (name) {\n  return delete this.authz[name];\n};\n\nSwaggerAuthorizations.prototype.apply = function (obj, securities) {\n  var status = true;\n  var applyAll = !securities;\n  var flattenedSecurities = [];\n\n  // Securities could be [ {} ]\n  _.each(securities, function (obj, key) {\n\n    // Make sure we account for securities being [ str ]\n    if(typeof key === 'string') {\n      flattenedSecurities.push(key);\n    }\n\n    // Flatten keys in to our array\n    _.each(obj, function (val, key) {\n      flattenedSecurities.push(key);\n    });\n  });\n\n  _.each(this.authz, function (auth, authName) {\n    if(applyAll || _.includes(flattenedSecurities, authName)) {\n      var newStatus = auth.apply(obj);\n      status = status && !!newStatus; // logical ORs regarding status\n    }\n  });\n\n  return status;\n};\n\n/**\n * ApiKeyAuthorization allows a query param or header to be injected\n */\nvar ApiKeyAuthorization = module.exports.ApiKeyAuthorization = function (name, value, type) {\n  this.name = name;\n  this.value = value;\n  this.type = type;\n};\n\nApiKeyAuthorization.prototype.apply = function (obj) {\n  if (this.type === 'query') {\n    // see if already applied.  If so, don't do it again\n\n    var qp;\n    if (obj.url.indexOf('?') > 0) {\n      qp = obj.url.substring(obj.url.indexOf('?') + 1);\n      var parts = qp.split('&');\n      if(parts && parts.length > 0) {\n        for(var i = 0; i < parts.length; i++) {\n          var kv = parts[i].split('=');\n          if(kv && kv.length > 0) {\n            if (kv[0] === this.name) {\n              // skip it\n              return false;\n            }\n          }\n        }\n      }\n    }\n\n    if (obj.url.indexOf('?') > 0) {\n      obj.url = obj.url + '&' + this.name + '=' + this.value;\n    } else {\n      obj.url = obj.url + '?' + this.name + '=' + this.value;\n    }\n\n    return true;\n  } else if (this.type === 'header') {\n    if(typeof obj.headers[this.name] === 'undefined') {\n      obj.headers[this.name] = this.value;\n    }\n\n    return true;\n  }\n};\n\nvar CookieAuthorization = module.exports.CookieAuthorization = function (cookie) {\n  this.cookie = cookie;\n};\n\nCookieAuthorization.prototype.apply = function (obj) {\n  obj.cookieJar = obj.cookieJar || new CookieJar();\n  obj.cookieJar.setCookie(this.cookie);\n\n  return true;\n};\n\n/**\n * Password Authorization is a basic auth implementation\n */\nvar PasswordAuthorization = module.exports.PasswordAuthorization = function (username, password) {\n  if (arguments.length === 3) {\n    helpers.log('PasswordAuthorization: the \\'name\\' argument has been removed, pass only username and password');\n    username = arguments[1];\n    password = arguments[2];\n  }\n  this.username = username;\n  this.password = password;\n};\n\nPasswordAuthorization.prototype.apply = function (obj) {\n  if(typeof obj.headers.Authorization === 'undefined') {\n    obj.headers.Authorization = 'Basic ' + btoa(this.username + ':' + this.password);\n  }\n\n  return true;\n};\n","'use strict';\n\nvar _ = {\n  bind: require('lodash-compat/function/bind'),\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  find: require('lodash-compat/collection/find'),\n  forEach: require('lodash-compat/collection/forEach'),\n  indexOf: require('lodash-compat/array/indexOf'),\n  isArray: require('lodash-compat/lang/isArray'),\n  isObject: require('lodash-compat/lang/isObject'),\n  isFunction: require('lodash-compat/lang/isFunction'),\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  isUndefined: require('lodash-compat/lang/isUndefined')\n};\nvar auth = require('./auth');\nvar helpers = require('./helpers');\nvar Model = require('./types/model');\nvar Operation = require('./types/operation');\nvar OperationGroup = require('./types/operationGroup');\nvar Resolver = require('./resolver');\nvar SwaggerHttp = require('./http');\nvar SwaggerSpecConverter = require('./spec-converter');\nvar Q = require('q');\n\n// We have to keep track of the function/property names to avoid collisions for tag names which are used to allow the\n// following usage: 'client.{tagName}'\nvar reservedClientTags = [\n  'apis',\n  'authorizationScheme',\n  'authorizations',\n  'basePath',\n  'build',\n  'buildFrom1_1Spec',\n  'buildFrom1_2Spec',\n  'buildFromSpec',\n  'clientAuthorizations',\n  'convertInfo',\n  'debug',\n  'defaultErrorCallback',\n  'defaultSuccessCallback',\n  'enableCookies',\n  'fail',\n  'failure',\n  'finish',\n  'help',\n  'idFromOp',\n  'info',\n  'initialize',\n  'isBuilt',\n  'isValid',\n  'modelPropertyMacro',\n  'models',\n  'modelsArray',\n  'options',\n  'parameterMacro',\n  'parseUri',\n  'progress',\n  'resourceCount',\n  'sampleModels',\n  'selfReflect',\n  'setConsolidatedModels',\n  'spec',\n  'supportedSubmitMethods',\n  'swaggerRequestHeaders',\n  'tagFromLabel',\n  'title',\n  'url',\n  'useJQuery'\n];\n// We have to keep track of the function/property names to avoid collisions for tag names which are used to allow the\n// following usage: 'client.apis.{tagName}'\nvar reservedApiTags = [\n  'apis',\n  'asCurl',\n  'description',\n  'externalDocs',\n  'help',\n  'label',\n  'name',\n  'operation',\n  'operations',\n  'operationsArray',\n  'path',\n  'tag'\n];\nvar supportedOperationMethods = ['delete', 'get', 'head', 'options', 'patch', 'post', 'put'];\nvar SwaggerClient = module.exports = function (url, options) {\n  this.authorizations = null;\n  this.authorizationScheme = null;\n  this.basePath = null;\n  this.debug = false;\n  this.enableCookies = false;\n  this.info = null;\n  this.isBuilt = false;\n  this.isValid = false;\n  this.modelsArray = [];\n  this.resourceCount = 0;\n  this.url = null;\n  this.useJQuery = false;\n  this.swaggerObject = {};\n  this.deferredClient = Q.defer();\n\n  this.clientAuthorizations = new auth.SwaggerAuthorizations();\n\n  if (typeof url !== 'undefined') {\n    return this.initialize(url, options);\n  } else {\n    return this;\n  }\n};\n\nSwaggerClient.prototype.initialize = function (url, options) {\n  this.models = {};\n  this.sampleModels = {};\n\n  if (typeof url === 'string') {\n    this.url = url;\n  } else if (_.isObject(url)) {\n    options = url;\n    this.url = options.url;\n  }\n\n  options = options || {};\n  this.clientAuthorizations.add(options.authorizations);\n  this.swaggerRequestHeaders = options.swaggerRequestHeaders || 'application/json;charset=utf-8,*/*';\n  this.defaultSuccessCallback = options.defaultSuccessCallback || null;\n  this.defaultErrorCallback = options.defaultErrorCallback || null;\n  this.modelPropertyMacro = options.modelPropertyMacro || null;\n  this.parameterMacro = options.parameterMacro || null;\n  this.usePromise = options.usePromise || null;\n\n  if (typeof options.success === 'function') {\n    this.success = options.success;\n  }\n\n  if (options.useJQuery) {\n    this.useJQuery = options.useJQuery;\n  }\n\n  if (options.enableCookies) {\n    this.enableCookies = options.enableCookies;\n  }\n\n  this.options = options || {};\n\n  this.supportedSubmitMethods = options.supportedSubmitMethods || [];\n  this.failure = options.failure || function (err) { throw err; };\n  this.progress = options.progress || function () {};\n  this.spec = _.cloneDeep(options.spec); // Clone so we do not alter the provided document\n\n  if (options.scheme) {\n    this.scheme = options.scheme;\n  }\n\n  if (this.usePromise || typeof options.success === 'function') {\n    this.ready = true;\n    return this.build();\n  }\n};\n\nSwaggerClient.prototype.build = function (mock) {\n  if (this.isBuilt) {\n    return this;\n  }\n\n  var self = this;\n\n  this.progress('fetching resource list: ' + this.url + '; Please wait.');\n\n  var obj = {\n    useJQuery: this.useJQuery,\n    url: this.url,\n    method: 'get',\n    headers: {\n      accept: this.swaggerRequestHeaders\n    },\n    on: {\n      error: function (response) {\n        if (self.url.substring(0, 4) !== 'http') {\n          return self.fail('Please specify the protocol for ' + self.url);\n        } else if (response.status === 0) {\n          return self.fail('Can\\'t read from server.  It may not have the appropriate access-control-origin settings.');\n        } else if (response.status === 404) {\n          return self.fail('Can\\'t read swagger JSON from ' + self.url);\n        } else {\n          return self.fail(response.status + ' : ' + response.statusText + ' ' + self.url);\n        }\n      },\n      response: function (resp) {\n\n        var responseObj = resp.obj;\n        if(!responseObj) {\n          return self.fail('failed to parse JSON/YAML response');\n        }\n\n        self.swaggerVersion = responseObj.swaggerVersion;\n        self.swaggerObject = responseObj;\n\n        if (responseObj.swagger && parseInt(responseObj.swagger) === 2) {\n          self.swaggerVersion = responseObj.swagger;\n\n          new Resolver().resolve(responseObj, self.url, self.buildFromSpec, self);\n\n          self.isValid = true;\n        } else {\n          var converter = new SwaggerSpecConverter();\n          self.oldSwaggerObject = self.swaggerObject;\n\n          converter.setDocumentationLocation(self.url);\n          converter.convert(responseObj, self.clientAuthorizations, self.options, function(spec) {\n            self.swaggerObject = spec;\n            new Resolver().resolve(spec, self.url, self.buildFromSpec, self);\n            self.isValid = true;\n          });\n        }\n      }\n    }\n  };\n\n  if (this.spec) {\n    self.swaggerObject = this.spec;\n    setTimeout(function () {\n      new Resolver().resolve(self.spec, self.buildFromSpec, self);\n    }, 10);\n  } else {\n    this.clientAuthorizations.apply(obj);\n\n    if (mock) {\n      return obj;\n    }\n\n    new SwaggerHttp().execute(obj, this.options);\n  }\n\n  return (this.usePromise) ? this.deferredClient.promise : this;\n};\n\nSwaggerClient.prototype.buildFromSpec = function (response) {\n  if (this.isBuilt) {\n    return this;\n  }\n\n  this.apis = {};\n  this.apisArray = [];\n  this.basePath = response.basePath || '';\n  this.consumes = response.consumes;\n  this.host = response.host || '';\n  this.info = response.info || {};\n  this.produces = response.produces;\n  this.schemes = response.schemes || [];\n  this.securityDefinitions = response.securityDefinitions;\n  this.title = response.title || '';\n\n  if (response.externalDocs) {\n    this.externalDocs = response.externalDocs;\n  }\n\n  // legacy support\n  this.authSchemes = response.securityDefinitions;\n\n  var definedTags = {};\n  var k;\n\n  if (Array.isArray(response.tags)) {\n    definedTags = {};\n\n    for (k = 0; k < response.tags.length; k++) {\n      var t = response.tags[k];\n      definedTags[t.name] = t;\n    }\n  }\n\n  var location;\n\n  if (typeof this.url === 'string') {\n    location = this.parseUri(this.url);\n    if (typeof this.scheme === 'undefined' && typeof this.schemes === 'undefined' || this.schemes.length === 0) {\n      this.scheme = location.scheme || 'http';\n    } else if (typeof this.scheme === 'undefined') {\n      this.scheme = this.schemes[0] || location.scheme;\n    }\n\n    if (typeof this.host === 'undefined' || this.host === '') {\n      this.host = location.host;\n\n      if (location.port) {\n        this.host = this.host + ':' + location.port;\n      }\n    }\n  }\n  else {\n    if (typeof this.schemes === 'undefined' || this.schemes.length === 0) {\n      this.scheme = 'http';\n    }\n    else if (typeof this.scheme === 'undefined') {\n      this.scheme = this.schemes[0];\n    }\n  }\n\n  this.definitions = response.definitions;\n\n  var key;\n\n  for (key in this.definitions) {\n    var model = new Model(key, this.definitions[key], this.models, this.modelPropertyMacro);\n\n    if (model) {\n      this.models[key] = model;\n    }\n  }\n\n  // get paths, create functions for each operationId\n  var self = this;\n\n  // Bind help to 'client.apis'\n  self.apis.help = _.bind(self.help, self);\n\n  _.forEach(response.paths, function (pathObj, path) {\n    // Only process a path if it's an object\n    if (!_.isPlainObject(pathObj)) {\n      return;\n    }\n\n    _.forEach(supportedOperationMethods, function (method) {\n      var operation = pathObj[method];\n\n      if (_.isUndefined(operation)) {\n        // Operation does not exist\n        return;\n      } else if (!_.isPlainObject(operation)) {\n        // Operation exists but it is not an Operation Object.  Since this is invalid, log it.\n        helpers.log('The \\'' + method + '\\' operation for \\'' + path + '\\' path is not an Operation Object');\n\n        return;\n      }\n\n      var tags = operation.tags;\n\n      if (_.isUndefined(tags) || !_.isArray(tags) || tags.length === 0) {\n        tags = operation.tags = [ 'default' ];\n      }\n\n      var operationId = self.idFromOp(path, method, operation);\n\n      var operationObject = new Operation(self,\n        operation.scheme,\n        operationId,\n        method,\n        path,\n        operation,\n        self.definitions,\n        self.models,\n        self.clientAuthorizations);\n\n      // bind self operation's execute command to the api\n      _.forEach(tags, function (tag) {\n        var clientProperty = _.indexOf(reservedClientTags, tag) > -1 ? '_' + tag : tag;\n        var apiProperty = _.indexOf(reservedApiTags, tag) > -1 ? '_' + tag : tag;\n        var operationGroup = self[clientProperty];\n\n        if (clientProperty !== tag) {\n          helpers.log('The \\'' + tag + '\\' tag conflicts with a SwaggerClient function/property name.  Use \\'client.' +\n                      clientProperty + '\\' or \\'client.apis.' + tag + '\\' instead of \\'client.' + tag + '\\'.');\n        }\n\n        if (apiProperty !== tag) {\n          helpers.log('The \\'' + tag + '\\' tag conflicts with a SwaggerClient operation function/property name.  Use ' +\n                      '\\'client.apis.' + apiProperty + '\\' instead of \\'client.apis.' + tag + '\\'.');\n        }\n\n        if (_.indexOf(reservedApiTags, operationId) > -1) {\n          helpers.log('The \\'' + operationId + '\\' operationId conflicts with a SwaggerClient operation ' +\n                      'function/property name.  Use \\'client.apis.' + apiProperty + '._' + operationId +\n                      '\\' instead of \\'client.apis.' + apiProperty + '.' + operationId + '\\'.');\n\n          operationId = '_' + operationId;\n          operationObject.nickname = operationId; // So 'client.apis.[tag].operationId.help() works properly\n        }\n\n        if (_.isUndefined(operationGroup)) {\n          operationGroup = self[clientProperty] = self.apis[apiProperty] = {};\n\n          operationGroup.operations = {};\n          operationGroup.label = apiProperty;\n          operationGroup.apis = {};\n\n          var tagDef = definedTags[tag];\n\n          if (!_.isUndefined(tagDef)) {\n            operationGroup.description = tagDef.description;\n            operationGroup.externalDocs = tagDef.externalDocs;\n          }\n\n          self[clientProperty].help = _.bind(self.help, operationGroup);\n          self.apisArray.push(new OperationGroup(tag, operationGroup.description, operationGroup.externalDocs, operationObject));\n        }\n\n        operationId = self.makeUniqueOperationId(operationId, self.apis[apiProperty]);\n\n        // Bind tag help\n        if (!_.isFunction(operationGroup.help)) {\n          operationGroup.help = _.bind(self.help, operationGroup);\n        }\n\n        // bind to the apis object\n        self.apis[apiProperty][operationId] = operationGroup[operationId] = _.bind(operationObject.execute,\n                                                                                  operationObject);\n        self.apis[apiProperty][operationId].help = operationGroup[operationId].help = _.bind(operationObject.help,\n                                                                                             operationObject);\n        self.apis[apiProperty][operationId].asCurl = operationGroup[operationId].asCurl = _.bind(operationObject.asCurl,\n                                                                                                 operationObject);\n\n        operationGroup.apis[operationId] = operationGroup.operations[operationId] = operationObject;\n\n        // legacy UI feature\n        var api = _.find(self.apisArray, function (api) {\n          return api.tag === tag;\n        });\n\n        if (api) {\n          api.operationsArray.push(operationObject);\n        }\n      });\n    });\n  });\n\n  this.isBuilt = true;\n\n  if (this.usePromise) {\n    this.isValid = true;\n    this.isBuilt = true;\n    this.deferredClient.resolve(this);\n\n    return this.deferredClient.promise;\n  }\n\n  if (this.success) {\n    this.success();\n  }\n\n  return this;\n};\n\nSwaggerClient.prototype.makeUniqueOperationId = function(operationId, api) {\n  var count = 0;\n  var name = operationId;\n\n  // make unique across this operation group\n  while(true) {\n    var matched = false;\n    _.forEach(api.operations, function (operation) {\n      if(operation.nickname === name) {\n        matched = true;\n      }\n    });\n    if(!matched) {\n      return name;\n    }\n    name = operationId + '_' + count;\n    count ++;\n  }\n\n  return operationId;\n};\n\nSwaggerClient.prototype.parseUri = function (uri) {\n  var urlParseRE = /^(((([^:\\/#\\?]+:)?(?:(\\/\\/)((?:(([^:@\\/#\\?]+)(?:\\:([^:@\\/#\\?]+))?)@)?(([^:\\/#\\?\\]\\[]+|\\[[^\\/\\]@#?]+\\])(?:\\:([0-9]+))?))?)?)?((\\/?(?:[^\\/\\?#]+\\/+)*)([^\\?#]*)))?(\\?[^#]+)?)(#.*)?/;\n  var parts = urlParseRE.exec(uri);\n\n  return {\n    scheme: parts[4] ? parts[4].replace(':','') : undefined,\n    host: parts[11],\n    port: parts[12],\n    path: parts[15]\n  };\n};\n\nSwaggerClient.prototype.help = function (dontPrint) {\n  var output = '';\n\n  if (this instanceof SwaggerClient) {\n    _.forEach(this.apis, function (api, name) {\n      if (_.isPlainObject(api)) {\n        output += 'operations for the \\'' + name + '\\' tag\\n';\n\n        _.forEach(api.operations, function (operation, name) {\n          output += '  * ' + name + ': ' + operation.summary + '\\n';\n        });\n      }\n    });\n  } else if (this instanceof OperationGroup || _.isPlainObject(this)) {\n    output += 'operations for the \\'' + this.label + '\\' tag\\n';\n\n    _.forEach(this.apis, function (operation, name) {\n      output += '  * ' + name + ': ' + operation.summary + '\\n';\n    });\n  }\n\n  if (dontPrint) {\n    return output;\n  } else {\n    helpers.log(output);\n\n    return output;\n  }\n};\n\nSwaggerClient.prototype.tagFromLabel = function (label) {\n  return label;\n};\n\nSwaggerClient.prototype.idFromOp = function (path, httpMethod, op) {\n  if(!op || !op.operationId) {\n    op = op || {};\n    op.operationId = httpMethod + '_' + path;\n  }\n  var opId = op.operationId.replace(/[\\s!@#$%^&*()_+=\\[{\\]};:<>|.\\/?,\\\\'\"\"-]/g, '_') || (path.substring(1) + '_' + httpMethod);\n\n  opId = opId.replace(/((_){2,})/g, '_');\n  opId = opId.replace(/^(_)*/g, '');\n  opId = opId.replace(/([_])*$/g, '');\n\n  return opId;\n};\n\nSwaggerClient.prototype.setHost = function (host) {\n  this.host = host;\n\n  if(this.apis) {\n    _.forEach(this.apis, function(api) {\n      if(api.operations) {\n        _.forEach(api.operations, function(operation) {\n          operation.host = host;\n        });\n      }\n    });\n  }\n};\n\nSwaggerClient.prototype.setBasePath = function (basePath) {\n  this.basePath = basePath;\n\n  if(this.apis) {\n    _.forEach(this.apis, function(api) {\n      if(api.operations) {\n        _.forEach(api.operations, function(operation) {\n          operation.basePath = basePath;\n        });\n      }\n    });\n  }\n};\n\nSwaggerClient.prototype.fail = function (message) {\n  if (this.usePromise) {\n    this.deferredClient.reject(message);\n    return this.deferredClient.promise;\n  } else {\n    if (this.failure) {\n      this.failure(message);\n    }\n    else {\n      this.failure(message);\n    }\n  }\n};\n","(function (process){\n'use strict';\n\nvar _ = {\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  indexOf: require('lodash-compat/array/indexOf')\n};\n\nmodule.exports.__bind = function (fn, me) {\n  return function(){\n    return fn.apply(me, arguments);\n  };\n};\n\nvar log = module.exports.log = function() {\n  // Only log if available and we're not testing\n  if (console && process.env.NODE_ENV !== 'test') {\n    console.log(Array.prototype.slice.call(arguments)[0]);\n  }\n};\n\nmodule.exports.fail = function (message) {\n  log(message);\n};\n\nvar optionHtml = module.exports.optionHtml = function (label, value) {\n  return '<tr><td class=\"optionName\">' + label + ':</td><td>' + value + '</td></tr>';\n};\n\nvar resolveSchema = module.exports.resolveSchema = function (schema) {\n  if (_.isPlainObject(schema.schema)) {\n    schema = resolveSchema(schema.schema);\n  }\n\n  return schema;\n};\n\nvar simpleRef = module.exports.simpleRef = function (name) {\n  if (typeof name === 'undefined') {\n    return null;\n  }\n\n  if (name.indexOf('#/definitions/') === 0) {\n    return name.substring('#/definitions/'.length);\n  } else {\n    return name;\n  }\n};\n\n\n}).call(this,require('_process'))\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9oZWxwZXJzLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgXyA9IHtcbiAgaXNQbGFpbk9iamVjdDogcmVxdWlyZSgnbG9kYXNoLWNvbXBhdC9sYW5nL2lzUGxhaW5PYmplY3QnKSxcbiAgaW5kZXhPZjogcmVxdWlyZSgnbG9kYXNoLWNvbXBhdC9hcnJheS9pbmRleE9mJylcbn07XG5cbm1vZHVsZS5leHBvcnRzLl9fYmluZCA9IGZ1bmN0aW9uIChmbiwgbWUpIHtcbiAgcmV0dXJuIGZ1bmN0aW9uKCl7XG4gICAgcmV0dXJuIGZuLmFwcGx5KG1lLCBhcmd1bWVudHMpO1xuICB9O1xufTtcblxudmFyIGxvZyA9IG1vZHVsZS5leHBvcnRzLmxvZyA9IGZ1bmN0aW9uKCkge1xuICAvLyBPbmx5IGxvZyBpZiBhdmFpbGFibGUgYW5kIHdlJ3JlIG5vdCB0ZXN0aW5nXG4gIGlmIChjb25zb2xlICYmIHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAndGVzdCcpIHtcbiAgICBjb25zb2xlLmxvZyhBcnJheS5wcm90b3R5cGUuc2xpY2UuY2FsbChhcmd1bWVudHMpWzBdKTtcbiAgfVxufTtcblxubW9kdWxlLmV4cG9ydHMuZmFpbCA9IGZ1bmN0aW9uIChtZXNzYWdlKSB7XG4gIGxvZyhtZXNzYWdlKTtcbn07XG5cbnZhciBvcHRpb25IdG1sID0gbW9kdWxlLmV4cG9ydHMub3B0aW9uSHRtbCA9IGZ1bmN0aW9uIChsYWJlbCwgdmFsdWUpIHtcbiAgcmV0dXJuICc8dHI+PHRkIGNsYXNzPVwib3B0aW9uTmFtZVwiPicgKyBsYWJlbCArICc6PC90ZD48dGQ+JyArIHZhbHVlICsgJzwvdGQ+PC90cj4nO1xufTtcblxudmFyIHJlc29sdmVTY2hlbWEgPSBtb2R1bGUuZXhwb3J0cy5yZXNvbHZlU2NoZW1hID0gZnVuY3Rpb24gKHNjaGVtYSkge1xuICBpZiAoXy5pc1BsYWluT2JqZWN0KHNjaGVtYS5zY2hlbWEpKSB7XG4gICAgc2NoZW1hID0gcmVzb2x2ZVNjaGVtYShzY2hlbWEuc2NoZW1hKTtcbiAgfVxuXG4gIHJldHVybiBzY2hlbWE7XG59O1xuXG52YXIgc2ltcGxlUmVmID0gbW9kdWxlLmV4cG9ydHMuc2ltcGxlUmVmID0gZnVuY3Rpb24gKG5hbWUpIHtcbiAgaWYgKHR5cGVvZiBuYW1lID09PSAndW5kZWZpbmVkJykge1xuICAgIHJldHVybiBudWxsO1xuICB9XG5cbiAgaWYgKG5hbWUuaW5kZXhPZignIy9kZWZpbml0aW9ucy8nKSA9PT0gMCkge1xuICAgIHJldHVybiBuYW1lLnN1YnN0cmluZygnIy9kZWZpbml0aW9ucy8nLmxlbmd0aCk7XG4gIH0gZWxzZSB7XG4gICAgcmV0dXJuIG5hbWU7XG4gIH1cbn07XG5cbiJdfQ==","'use strict';\n\nvar helpers = require('./helpers');\nvar request = require('superagent');\nvar jsyaml = require('js-yaml');\nvar _ = {\n  isObject: require('lodash-compat/lang/isObject')\n};\n\n/*\n * JQueryHttpClient is a light-weight, node or browser HTTP client\n */\nvar JQueryHttpClient = function () {};\n\n/*\n * SuperagentHttpClient is a light-weight, node or browser HTTP client\n */\nvar SuperagentHttpClient = function () {};\n\n/**\n * SwaggerHttp is a wrapper for executing requests\n */\nvar SwaggerHttp = module.exports = function () {};\n\nSwaggerHttp.prototype.execute = function (obj, opts) {\n  var client;\n\n  if(opts && opts.client) {\n    client = opts.client;\n  }\n  else {\n    client = new SuperagentHttpClient(opts);\n  }\n  client.opts = opts || {};\n\n  // legacy support\n  var hasJQuery = false;\n  if(typeof window !== 'undefined') {\n    if(typeof window.jQuery !== 'undefined') {\n      hasJQuery = true;\n    }\n  }\n  if(this.isInternetExplorer() && (obj.useJQuery === false || !hasJQuery )) {\n    throw new Error('Unsupported configuration! JQuery is required but not available');\n  }\n  if ((obj && obj.useJQuery === true) || this.isInternetExplorer() && hasJQuery) {\n    client = new JQueryHttpClient(opts);\n  }\n\n  var success = obj.on.response;\n\n  var requestInterceptor = function(data) {\n    if(opts && opts.requestInterceptor) {\n      data = opts.requestInterceptor.apply(data);\n    }\n    return data;\n  };\n\n  var responseInterceptor = function(data) {\n    if(opts && opts.responseInterceptor) {\n      data = opts.responseInterceptor.apply(data);\n    }\n    return success(data);\n  };\n\n  obj.on.response = function(data) {\n    responseInterceptor(data);\n  };\n\n\n  if (_.isObject(obj) && _.isObject(obj.body)) {\n    // special processing for file uploads via jquery\n    if (obj.body.type && obj.body.type === 'formData'){\n      obj.contentType = false;\n      obj.processData = false;\n\n      delete obj.headers['Content-Type'];\n    } else {\n      obj.body = JSON.stringify(obj.body);\n    }\n  }\n\n  client.execute(requestInterceptor(obj));\n\n  return (obj.deferred) ? obj.deferred.promise : obj;\n};\n\nSwaggerHttp.prototype.isInternetExplorer = function () {\n  var detectedIE = false;\n\n  if (typeof navigator !== 'undefined' && navigator.userAgent) {\n    var nav = navigator.userAgent.toLowerCase();\n\n    if (nav.indexOf('msie') !== -1) {\n      var version = parseInt(nav.split('msie')[1]);\n\n      if (version <= 8) {\n        detectedIE = true;\n      }\n    }\n  }\n\n  return detectedIE;\n};\n\nJQueryHttpClient.prototype.execute = function (obj) {\n  var jq = this.jQuery || window.jQuery;\n  var cb = obj.on;\n  var request = obj;\n\n  obj.type = obj.method;\n  obj.cache = false;\n  delete obj.useJQuery;\n\n  /*\n  obj.beforeSend = function (xhr) {\n    var key, results;\n    if (obj.headers) {\n      results = [];\n      for (key in obj.headers) {\n        if (key.toLowerCase() === 'content-type') {\n          results.push(obj.contentType = obj.headers[key]);\n        } else if (key.toLowerCase() === 'accept') {\n          results.push(obj.accepts = obj.headers[key]);\n        } else {\n          results.push(xhr.setRequestHeader(key, obj.headers[key]));\n        }\n      }\n      return results;\n    }\n  };*/\n\n  obj.data = obj.body;\n\n  delete obj.body;\n\n  obj.complete = function (response) {\n    var headers = {};\n    var headerArray = response.getAllResponseHeaders().split('\\n');\n\n    for (var i = 0; i < headerArray.length; i++) {\n      var toSplit = headerArray[i].trim();\n\n      if (toSplit.length === 0) {\n        continue;\n      }\n\n      var separator = toSplit.indexOf(':');\n\n      if (separator === -1) {\n        // Name but no value in the header\n        headers[toSplit] = null;\n\n        continue;\n      }\n\n      var name = toSplit.substring(0, separator).trim();\n      var value = toSplit.substring(separator + 1).trim();\n\n      headers[name] = value;\n    }\n\n    var out = {\n      url: request.url,\n      method: request.method,\n      status: response.status,\n      statusText: response.statusText,\n      data: response.responseText,\n      headers: headers\n    };\n\n    try {\n      var possibleObj =  response.responseJSON || jsyaml.safeLoad(response.responseText);\n      out.obj = (typeof possibleObj === 'string') ? {} : possibleObj;\n    } catch (ex) {\n      // do not set out.obj\n      helpers.log('unable to parse JSON/YAML content');\n    }\n\n    // I can throw, or parse null?\n    out.obj = out.obj || null;\n\n    if (response.status >= 200 && response.status < 300) {\n      cb.response(out);\n    } else if (response.status === 0 || (response.status >= 400 && response.status < 599)) {\n      cb.error(out);\n    } else {\n      return cb.response(out);\n    }\n  };\n\n  jq.support.cors = true;\n\n  return jq.ajax(obj);\n};\n\nSuperagentHttpClient.prototype.execute = function (obj) {\n  var method = obj.method.toLowerCase();\n\n  if (method === 'delete') {\n    method = 'del';\n  }\n  var headers = obj.headers || {};\n  var r = request[method](obj.url);\n  var name;\n  for (name in headers) {\n    r.set(name, headers[name]);\n  }\n\n  if (obj.enableCookies) {\n    r.withCredentials();\n  }\n\n  if (obj.body) {\n    r.send(obj.body);\n  }\n\n  if(typeof r.buffer === 'function') {\n    r.buffer(); // force superagent to populate res.text with the raw response data\n  }\n\n  r.end(function (err, res) {\n    res = res || {\n      status: 0,\n      headers: {error: 'no response from server'}\n    };\n    var response = {\n      url: obj.url,\n      method: obj.method,\n      headers: res.headers\n    };\n    var cb;\n\n    if (!err && res.error) {\n      err = res.error;\n    }\n\n    if (err && obj.on && obj.on.error) {\n      response.errObj = err;\n      response.status = res ? res.status : 500;\n      response.statusText = res ? res.text : err.message;\n      if(res.headers && res.headers['content-type']) {\n        if(res.headers['content-type'].indexOf('application/json') >= 0) {\n          try {\n            response.obj = JSON.parse(response.statusText);\n          }\n          catch (e) {\n            response.obj = null;\n          }\n        }\n      }\n      cb = obj.on.error;\n    } else if (res && obj.on && obj.on.response) {\n      var possibleObj;\n\n      // Already parsed by by superagent?\n      if(res.body && Object.keys(res.body).length > 0) {\n        possibleObj = res.body;\n      } else {\n          try {\n            possibleObj = jsyaml.safeLoad(res.text);\n            // can parse into a string... which we don't need running around in the system\n            possibleObj = (typeof possibleObj === 'string') ? null : possibleObj;\n          } catch(e) {\n            helpers.log('cannot parse JSON/YAML content');\n          }\n      }\n\n      // null means we can't parse into object\n      response.obj = (typeof possibleObj === 'object') ? possibleObj : null;\n\n      response.status = res.status;\n      response.statusText = res.text;\n      cb = obj.on.response;\n    }\n    response.data = response.statusText;\n\n    if (cb) {\n      cb(response);\n    }\n  });\n};\n","'use strict';\n\nvar SwaggerHttp = require('./http');\nvar _ = {\n  isObject: require('lodash-compat/lang/isObject'),\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  isArray: require('lodash-compat/lang/isArray')\n};\n\n\n/**\n * Resolves a spec's remote references\n */\nvar Resolver = module.exports = function () {};\n\nResolver.prototype.processAllOf = function(root, name, definition, resolutionTable, unresolvedRefs, spec) {\n  var i, location, property;\n\n  definition['x-resolved-from'] = [ '#/definitions/' + name ];\n  var allOf = definition.allOf;\n  // the refs go first\n  allOf.sort(function(a, b) {\n    if(a.$ref && b.$ref) { return 0; }\n    else if(a.$ref) { return -1; }\n    else { return 1; }\n  });\n  for (i = 0; i < allOf.length; i++) {\n    property = allOf[i];\n    location = '/definitions/' + name + '/allOf';\n    this.resolveInline(root, spec, property, resolutionTable, unresolvedRefs, location);\n  }\n};\n\nResolver.prototype.resolve = function (spec, arg1, arg2, arg3) {\n  this.spec = spec;\n  var root = arg1, callback = arg2, scope = arg3, opts = {}, location, i;\n  if(typeof arg1 === 'function') {\n    root = null;\n    callback = arg1;\n    scope = arg2;\n  }\n  var _root = root;\n  this.scope = (scope || this);\n  this.iteration = this.iteration || 0;\n\n  if(this.scope.options && this.scope.options.requestInterceptor){\n    opts.requestInterceptor = this.scope.options.requestInterceptor;\n  }\n\n  if(this.scope.options && this.scope.options.responseInterceptor){\n    opts.responseInterceptor = this.scope.options.responseInterceptor;\n  }\n\n  var name, path, property, propertyName;\n  var processedCalls = 0, resolvedRefs = {}, unresolvedRefs = {};\n  var resolutionTable = []; // store objects for dereferencing\n\n  spec.definitions = spec.definitions || {};\n  // definitions\n  for (name in spec.definitions) {\n    var definition = spec.definitions[name];\n    for (propertyName in definition.properties) {\n      property = definition.properties[propertyName];\n      if(_.isArray(property.allOf)) {\n        this.processAllOf(root, name, property, resolutionTable, unresolvedRefs, spec);\n      }\n      else {\n        this.resolveTo(root, property, resolutionTable, '/definitions');\n      }\n    }\n\n    if(definition.allOf) {\n      this.processAllOf(root, name, definition, resolutionTable, unresolvedRefs, spec);\n    }\n  }\n\n  // operations\n  for (name in spec.paths) {\n    var method, operation, responseCode;\n    path = spec.paths[name];\n\n    for (method in path) {\n      // operation reference\n      if(method === '$ref') {\n        // location = path[method];\n        location = '/paths' + name;\n        this.resolveInline(root, spec, path, resolutionTable, unresolvedRefs, location);\n      }\n      else {\n        operation = path[method];\n        var sharedParameters = path.parameters || [];\n        var parameters = operation.parameters || [];\n\n        for (i in sharedParameters) {\n          var parameter = sharedParameters[i];\n          parameters.unshift(parameter);\n        }\n        if(method !== 'parameters' && _.isObject(operation)) {\n          operation.parameters = operation.parameters || parameters;\n        }\n\n        for (i in parameters) {\n          var parameter = parameters[i];\n          location = '/paths' + name + '/' + method + '/parameters';\n\n          if (parameter.in === 'body' && parameter.schema) {\n            if(_.isArray(parameter.schema.allOf)) {\n              // move to a definition\n              var modelName = 'inline_model';\n              var name = modelName;\n              var done = false; var counter = 0;\n              while(!done) {\n                if(typeof spec.definitions[name] === 'undefined') {\n                  done = true;\n                  break;\n                }\n                name = modelName + '_' + counter;\n                counter ++;\n              }\n              spec.definitions[name] = { allOf: parameter.schema.allOf };\n              delete parameter.schema.allOf;\n              parameter.schema.$ref = '#/definitions/' + name;\n              this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);\n            }\n            else {\n              this.resolveTo(root, parameter.schema, resolutionTable, location);\n            }\n          }\n\n          if (parameter.$ref) {\n            // parameter reference\n            this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);\n          }\n        }\n\n        for (responseCode in operation.responses) {\n          var response = operation.responses[responseCode];\n          location = '/paths' + name + '/' + method + '/responses/' + responseCode;\n\n          if(_.isObject(response)) {\n            if(response.$ref) {\n              // response reference\n              this.resolveInline(root, spec, response, resolutionTable, unresolvedRefs, location);\n            }\n            if (response.schema) {\n              this.resolveTo(root, response.schema, resolutionTable, location);\n            }\n          }\n        }\n      }\n    }\n    // clear them out to avoid multiple resolutions\n    path.parameters = [];\n  }\n\n  var expectedCalls = 0, toResolve = [];\n  // if the root is same as obj[i].root we can resolve locally\n  var all = resolutionTable;\n\n  var parts;\n  for(i = 0; i < all.length; i++) {\n    var a = all[i];\n    if(root === a.root) {\n      if(a.resolveAs === 'ref') {\n        // resolve any path walking\n        var joined = ((a.root || '') + '/' + a.key).split('/');\n        var normalized = [];\n        var url = '';\n        var k;\n\n        if(a.key.indexOf('../') >= 0) {\n          for(var j = 0; j < joined.length; j++) {\n            if(joined[j] === '..') {\n              normalized = normalized.slice(0, normalized.length-1);\n            }\n            else {\n              normalized.push(joined[j]);\n            }\n          }\n          for(k = 0; k < normalized.length; k ++) {\n            if(k > 0) {\n              url += '/';\n            }\n            url += normalized[k];\n          }\n          // we now have to remote resolve this because the path has changed\n          a.root = url;\n          toResolve.push(a);\n        }\n        else {\n          parts = a.key.split('#');\n          if(parts.length === 2) {\n            if(parts[0].indexOf('http://') === 0 || parts[0].indexOf('https://') === 0) {\n              a.root = parts[0];\n            }\n            location = parts[1].split('/');\n            var r;\n            var s = spec;\n            for(k = 0; k < location.length; k++) {\n              var part = location[k];\n              if(part !== '') {\n                s = s[part];\n                if(typeof s !== 'undefined') {\n                  r = s;\n                }\n                else {\n                  r = null;\n                  break;\n                }\n              }\n            }\n            if(r === null) {\n              // must resolve this too\n              toResolve.push(a);\n            }\n          }\n        }\n      }\n      else {\n        if (a.resolveAs === 'inline') {\n          if(a.key && a.key.indexOf('#') === -1 && a.key.charAt(0) !== '/') {\n            // handle relative schema\n            parts = a.root.split('/');\n            location = '';\n            for(i = 0; i < parts.length - 1; i++) {\n              location += parts[i] + '/';\n            }\n            location += a.key;\n            a.root = location;\n            a.location = '';\n          }\n          toResolve.push(a);\n        }\n      }\n    }\n    else {\n      toResolve.push(a);\n    }\n  }\n  expectedCalls = toResolve.length;\n\n  // resolve anything that is local\n  for(var ii = 0; ii < toResolve.length; ii++) {\n    (function(item, spec, self) {\n      if(item.root === null || item.root === root) {\n        // local resolve\n        self.resolveItem(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, item);\n        processedCalls += 1;\n\n        if(processedCalls === expectedCalls) {\n          self.finish(spec, root, resolutionTable, resolvedRefs, unresolvedRefs, callback, true);\n        }\n      }\n      else {\n        var obj = {\n          useJQuery: false,  // TODO\n          url: item.root,\n          method: 'get',\n          headers: {\n            accept: self.scope.swaggerRequestHeaders || 'application/json'\n          },\n          on: {\n            error: function (error) {\n              processedCalls += 1;\n              unresolvedRefs[item.key] = {\n                root: item.root,\n                location: item.location\n              };\n\n              if (processedCalls === expectedCalls) {\n                self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);\n              }\n            },  // jshint ignore:line\n            response: function (response) {\n              var swagger = response.obj;\n              self.resolveItem(swagger, item.root, resolutionTable, resolvedRefs, unresolvedRefs, item);\n              processedCalls += 1;\n\n              if (processedCalls === expectedCalls) {\n                self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);\n              }\n            }\n          } // jshint ignore:line\n        };\n\n        if (scope && scope.clientAuthorizations) {\n          scope.clientAuthorizations.apply(obj);\n        }\n\n        new SwaggerHttp().execute(obj, opts);\n      }\n    }(toResolve[ii], spec, this));\n  }\n\n  if (Object.keys(toResolve).length === 0) {\n    this.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);\n  }\n};\n\nResolver.prototype.resolveItem = function(spec, root, resolutionTable, resolvedRefs, unresolvedRefs, item) {\n  var path = item.location;\n  var location = spec, parts = path.split('/');\n  if(path !== '') {\n    for (var j = 0; j < parts.length; j++) {\n      var segment = parts[j];\n      if (segment.indexOf('~1') !== -1) {\n        segment = parts[j].replace(/~0/g, '~').replace(/~1/g, '/');\n        if (segment.charAt(0) !== '/') {\n          segment = '/' + segment;\n        }\n      }\n      if (typeof location === 'undefined' || location === null) {\n        break;\n      }\n      if (segment === '' && j === (parts.length - 1) && parts.length > 1) {\n        location = null;\n        break;\n      }\n      if (segment.length > 0) {\n        location = location[segment];\n      }\n    }\n  }\n  var resolved = item.key;\n  parts = item.key.split('/');\n  var resolvedName = parts[parts.length-1];\n\n  if(resolvedName.indexOf('#') >= 0) {\n    resolvedName = resolvedName.split('#')[1];\n  }\n\n  if (location !== null && typeof location !== 'undefined') {\n    resolvedRefs[resolved] = {\n      name: resolvedName,\n      obj: location,\n      key: item.key,\n      root: item.root\n    };\n  } else {\n    unresolvedRefs[resolved] = {\n      root: item.root,\n      location: item.location\n    };\n  }\n};\n\nResolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs, unresolvedRefs, callback, localResolve) {\n  // walk resolution table and replace with resolved refs\n  var ref;\n  for (ref in resolutionTable) {\n    var item = resolutionTable[ref];\n\n    var key = item.key;\n    var resolvedTo = resolvedRefs[key];\n    if (resolvedTo) {\n      spec.definitions = spec.definitions || {};\n      if (item.resolveAs === 'ref') {\n        if (localResolve !== true) {\n          // don't retain root for local definitions\n          for (key in resolvedTo.obj) {\n            var abs = this.retainRoot(resolvedTo.obj[key], item.root);\n          }\n        }\n        spec.definitions[resolvedTo.name] = resolvedTo.obj;\n        item.obj.$ref = '#/definitions/' + resolvedTo.name;\n      } else if (item.resolveAs === 'inline') {\n        var targetObj = item.obj;\n        targetObj['x-resolved-from'] = [ item.key ];\n        delete targetObj.$ref;\n\n        for (key in resolvedTo.obj) {\n          var abs = resolvedTo.obj[key];\n          \n          if (localResolve !== true) {\n            // don't retain root for local definitions\n            abs = this.retainRoot(resolvedTo.obj[key], item.root);\n          }\n          targetObj[key] = abs;\n        }\n      }\n    }\n  }\n  var existingUnresolved = this.countUnresolvedRefs(spec);\n\n  if(existingUnresolved === 0 || this.iteration > 5) {\n    this.resolveAllOf(spec.definitions);\n    callback.call(this.scope, spec, unresolvedRefs);\n  }\n  else {\n    this.iteration += 1;\n    this.resolve(spec, root, callback, this.scope);\n  }\n};\n\nResolver.prototype.countUnresolvedRefs = function(spec) {\n  var i;\n  var refs = this.getRefs(spec);\n  var keys = [];\n  var unresolvedKeys = [];\n  for(i in refs) {\n    if(i.indexOf('#') === 0) {\n      keys.push(i.substring(1));\n    }\n    else {\n      unresolvedKeys.push(i);\n    }\n  }\n\n  // verify possible keys\n  for (i = 0; i < keys.length; i++) {\n    var part = keys[i];\n    var parts = part.split('/');\n    var obj = spec;\n\n    for (var k = 0; k < parts.length; k++) {\n      var key = parts[k];\n      if(key !== '') {\n        obj = obj[key];\n        if(typeof obj === 'undefined') {\n          unresolvedKeys.push(part);\n          break;\n        }\n      }\n    }\n  }\n  return unresolvedKeys.length;\n};\n\nResolver.prototype.getRefs = function(spec, obj) {\n  obj = obj || spec;\n  var output = {};\n  for(var key in obj) {\n    if (!obj.hasOwnProperty(key)) {\n      continue;\n    }\n    var item = obj[key];\n    if(key === '$ref' && typeof item === 'string') {\n      output[item] = null;\n    }\n    else if(_.isObject(item)) {\n      var o = this.getRefs(item);\n      for(var k in o) {\n        output[k] = null;\n      }\n    }\n  }\n  return output;\n};\n\nResolver.prototype.retainRoot = function(obj, root) {\n  // walk object and look for relative $refs\n  for(var key in obj) {\n    var item = obj[key];\n    if(key === '$ref' && typeof item === 'string') {\n      // stop and inspect\n      if(item.indexOf('http://') !== 0 && item.indexOf('https://') !== 0) {\n        if(item.indexOf('#') !== 0) {\n          item = '#' + item;\n        }\n        item = (root || '') + item;\n        obj[key] = item;\n      }\n    }\n    else if(_.isObject(item)) {\n      this.retainRoot(item, root);\n    }\n  }\n  return obj;\n};\n\n/**\n * immediately in-lines local refs, queues remote refs\n * for inline resolution\n */\nResolver.prototype.resolveInline = function (root, spec, property, resolutionTable, unresolvedRefs, location) {\n  var key = property.$ref, ref = property.$ref, i, p, p2, rs;\n  var rootTrimmed = false;\n  if (ref) {\n    if(ref.indexOf('../') === 0) {\n      // reset root\n      p = ref.split('../');\n      p2 = root.split('/');\n      ref = '';\n      for(i = 0; i < p.length; i++) {\n        if(p[i] === '') {\n          p2 = p2.slice(0, p2.length-1);\n        }\n        else {\n          ref += p[i];\n        }\n      }\n      root = '';\n      for(i = 0; i < p2.length - 1; i++) {\n        if(i > 0) { root += '/'; }\n        root += p2[i];\n      }\n      rootTrimmed = true;\n    }\n    if(ref.indexOf('#') >= 0) {\n      if(ref.indexOf('/') === 0) {\n        rs = ref.split('#');\n        p  = root.split('//');\n        p2 = p[1].split('/');\n        root = p[0] + '//' + p2[0] + rs[0];\n        location = rs[1];\n      }\n      else {\n        rs = ref.split('#');\n        if(rs[0] !== '') {\n          p2 = root.split('/');\n          p2 = p2.slice(0, p2.length - 1);\n          if(!rootTrimmed) {\n            root = '';\n            for (var k = 0; k < p2.length; k++) {\n              if(k > 0) { root += '/'; }\n              root += p2[k];\n            }\n          }\n          root += '/' + ref.split('#')[0];\n        }\n        location = rs[1];\n      }\n    }\n    if (ref.indexOf('http') === 0) {\n      if(ref.indexOf('#') >= 0) {\n        root = ref.split('#')[0];\n        location = ref.split('#')[1];\n      }\n      else {\n        root = ref;\n        location = '';\n      }\n      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});\n    } else if (ref.indexOf('#') === 0) {\n      location = ref.split('#')[1];\n      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});\n    }\n    else {\n      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});\n    }\n  }\n  else if (property.type === 'array') {\n    this.resolveTo(root, property.items, resolutionTable, location);\n  }\n};\n\nResolver.prototype.resolveTo = function (root, property, resolutionTable, location) {\n  var sp, i;\n  var ref = property.$ref;\n  var lroot = root;\n  if (typeof ref !== 'undefined') {\n    if(ref.indexOf('#') >= 0) {\n      var parts = ref.split('#');\n\n      // #/definitions/foo\n      // foo.json#/bar\n      if(parts[0] && ref.indexOf('/') === 0) {\n\n      }\n      else if(parts[0] && parts[0].indexOf('http') === 0) {\n        lroot = parts[0];\n        ref = parts[1];\n      }\n      else if(parts[0] && parts[0].length > 0) {\n        // relative file\n        sp = root.split('/');\n        lroot = '';\n        for(i = 0; i < sp.length - 1; i++) {\n          lroot += sp[i] + '/';\n        }\n        lroot += parts[0];\n      }\n      else {\n\n      }\n\n      location = parts[1];\n    }\n    else if (ref.indexOf('http://') === 0 || ref.indexOf('https://') === 0) {\n      lroot = ref;\n      location = '';\n    }\n    else {\n      // relative file\n      sp = root.split('/');\n      lroot = '';\n      for(i = 0; i < sp.length - 1; i++) {\n        lroot += sp[i] + '/';\n      }\n      lroot += ref;\n      location = '';\n    }\n    resolutionTable.push({\n      obj: property, resolveAs: 'ref', root: lroot, key: ref, location: location\n    });\n  } else if (property.type === 'array') {\n    var items = property.items;\n    this.resolveTo(root, items, resolutionTable, location);\n  } else {\n    if(property && property.properties) {\n      var name = this.uniqueName('inline_model');\n      this.spec.definitions[name] = _.cloneDeep(property);\n      property['$ref'] = '#/definitions/' + name;\n      delete property.type;\n      delete property.properties;\n    }\n  }\n};\n\nResolver.prototype.uniqueName = function(base) {\n  var name = base;\n  var count = 0;\n  while(true) {\n    if(!_.isObject(this.spec.definitions[name])) {\n      return name;\n    }\n    name = base + '_' + count;\n    count++;\n  }\n};\n\nResolver.prototype.resolveAllOf = function(spec, obj, depth) {\n  depth = depth || 0;\n  obj = obj || spec;\n  var name;\n  for(var key in obj) {\n    if (!obj.hasOwnProperty(key)) {\n      continue;\n    }\n    var item = obj[key];\n    if(item === null) {\n      throw new TypeError('Swagger 2.0 does not support null types (' + obj + ').  See https://github.com/swagger-api/swagger-spec/issues/229.');\n    }\n    if(typeof item === 'object') {\n      this.resolveAllOf(spec, item, depth + 1);\n    }\n    if(item && typeof item.allOf !== 'undefined') {\n      var allOf = item.allOf;\n      if(_.isArray(allOf)) {\n        var output = _.cloneDeep(item);\n        delete output.allOf;\n\n        output['x-composed'] = true;\n        if (typeof item['x-resolved-from'] !== 'undefined') {\n          output['x-resolved-from'] = item['x-resolved-from'];\n        }\n\n        for(var i = 0; i < allOf.length; i++) {\n          var component = allOf[i];\n          var source = 'self';\n          if(typeof component['x-resolved-from'] !== 'undefined') {\n            source = component['x-resolved-from'][0];\n          }\n\n          for(var part in component) {\n            if(!output.hasOwnProperty(part)) {\n              output[part] = _.cloneDeep(component[part]);\n              if(part === 'properties') {\n                for(name in output[part]) {\n                  output[part][name]['x-resolved-from'] = source;\n                }\n              }\n            }\n            else {\n              if(part === 'properties') {\n                var properties = component[part];\n                for(name in properties) {\n                  output.properties[name] = _.cloneDeep(properties[name]);\n                  var resolvedFrom = properties[name]['x-resolved-from'];\n                  if (typeof resolvedFrom === 'undefined' || resolvedFrom === 'self') {\n                    resolvedFrom = source;\n                  }\n                  output.properties[name]['x-resolved-from'] = resolvedFrom;\n                }\n              }\n              else if(part === 'required') {\n                // merge & dedup the required array\n                var a = output.required.concat(component[part]);\n                for(var k = 0; k < a.length; ++k) {\n                  for(var j = k + 1; j < a.length; ++j) {\n                    if(a[k] === a[j]) { a.splice(j--, 1); }\n                  }\n                }\n                output.required = a;\n              }\n              else if(part === 'x-resolved-from') {\n                output['x-resolved-from'].push(source);\n              }\n              else {\n                // TODO: need to merge this property\n                // console.log('what to do with ' + part)\n              }\n            }\n          }\n        }\n        obj[key] = output;\n      }\n    }\n    if(_.isObject(item)) {\n      this.resolveAllOf(spec, item, depth + 1);\n    }\n  }\n};\n","'use strict';\n\nvar Helpers = require('./helpers');\n\nvar _ = {\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  isUndefined: require('lodash-compat/lang/isUndefined'),\n  isArray: require('lodash-compat/lang/isArray'),\n  isObject: require('lodash-compat/lang/isObject'),\n  isEmpty: require('lodash-compat/lang/isEmpty'),\n  map: require('lodash-compat/collection/map'),\n  indexOf: require('lodash-compat/array/indexOf'),\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  keys: require('lodash-compat/object/keys'),\n  forEach: require('lodash-compat/collection/forEach')\n};\n\nmodule.exports.optionHtml = optionHtml;\nmodule.exports.typeFromJsonSchema = typeFromJsonSchema;\nmodule.exports.getStringSignature = getStringSignature;\nmodule.exports.schemaToHTML = schemaToHTML;\nmodule.exports.schemaToJSON = schemaToJSON;\n\nfunction optionHtml(label, value) {\n  return '<tr><td class=\"optionName\">' + label + ':</td><td>' + value + '</td></tr>';\n}\n\nfunction typeFromJsonSchema(type, format) {\n  var str;\n\n  if (type === 'integer' && format === 'int32') {\n    str = 'integer';\n  } else if (type === 'integer' && format === 'int64') {\n    str = 'long';\n  } else if (type === 'integer' && typeof format === 'undefined') {\n    str = 'long';\n  } else if (type === 'string' && format === 'date-time') {\n    str = 'date-time';\n  } else if (type === 'string' && format === 'date') {\n    str = 'date';\n  } else if (type === 'number' && format === 'float') {\n    str = 'float';\n  } else if (type === 'number' && format === 'double') {\n    str = 'double';\n  } else if (type === 'number' && typeof format === 'undefined') {\n    str = 'double';\n  } else if (type === 'boolean') {\n    str = 'boolean';\n  } else if (type === 'string') {\n    str = 'string';\n  }\n\n  return str;\n}\n\nfunction getStringSignature(obj, baseComponent) {\n  var str = '';\n\n  if (typeof obj.$ref !== 'undefined') {\n    str += Helpers.simpleRef(obj.$ref);\n  } else if (typeof obj.type === 'undefined') {\n    str += 'object';\n  } else if (obj.type === 'array') {\n    if (baseComponent) {\n      str += getStringSignature((obj.items || obj.$ref || {}));\n    } else {\n      str += 'Array[';\n      str += getStringSignature((obj.items || obj.$ref || {}));\n      str += ']';\n    }\n  } else if (obj.type === 'integer' && obj.format === 'int32') {\n    str += 'integer';\n  } else if (obj.type === 'integer' && obj.format === 'int64') {\n    str += 'long';\n  } else if (obj.type === 'integer' && typeof obj.format === 'undefined') {\n    str += 'long';\n  } else if (obj.type === 'string' && obj.format === 'date-time') {\n    str += 'date-time';\n  } else if (obj.type === 'string' && obj.format === 'date') {\n    str += 'date';\n  } else if (obj.type === 'string' && typeof obj.format === 'undefined') {\n    str += 'string';\n  } else if (obj.type === 'number' && obj.format === 'float') {\n    str += 'float';\n  } else if (obj.type === 'number' && obj.format === 'double') {\n    str += 'double';\n  } else if (obj.type === 'number' && typeof obj.format === 'undefined') {\n    str += 'double';\n  } else if (obj.type === 'boolean') {\n    str += 'boolean';\n  } else if (obj.$ref) {\n    str += Helpers.simpleRef(obj.$ref);\n  } else {\n    str += obj.type;\n  }\n\n  return str;\n}\n\nfunction schemaToJSON(schema, models, modelsToIgnore, modelPropertyMacro) {\n  // Resolve the schema (Handle nested schemas)\n  schema = Helpers.resolveSchema(schema);\n\n  if(typeof modelPropertyMacro !== 'function') {\n    modelPropertyMacro = function(prop){\n      return (prop || {}).default;\n    };\n  }\n\n  modelsToIgnore= modelsToIgnore || {};\n\n  var type = schema.type || 'object';\n  var format = schema.format;\n  var model;\n  var output;\n\n  if (!_.isUndefined(schema.example)) {\n    output = schema.example;\n  } else if (_.isUndefined(schema.items) && _.isArray(schema.enum)) {\n    output = schema.enum[0];\n  }\n\n  if (_.isUndefined(output)) {\n    if (schema.$ref) {\n      model = models[Helpers.simpleRef(schema.$ref)];\n\n      if (!_.isUndefined(model)) {\n        if (_.isUndefined(modelsToIgnore[model.name])) {\n          modelsToIgnore[model.name] = model;\n          output = schemaToJSON(model.definition, models, modelsToIgnore, modelPropertyMacro);\n          delete modelsToIgnore[model.name];\n        } else {\n          if (model.type === 'array') {\n            output = [];\n          } else {\n            output = {};\n          }\n        }\n      }\n    } else if (!_.isUndefined(schema.default)) {\n      output = schema.default;\n    } else if (type === 'string') {\n      if (format === 'date-time') {\n        output = new Date().toISOString();\n      } else if (format === 'date') {\n        output = new Date().toISOString().split('T')[0];\n      } else {\n        output = 'string';\n      }\n    } else if (type === 'integer') {\n      output = 0;\n    } else if (type === 'number') {\n      output = 0.0;\n    } else if (type === 'boolean') {\n      output = true;\n    } else if (type === 'object') {\n      output = {};\n\n      _.forEach(schema.properties, function (property, name) {\n        var cProperty = _.cloneDeep(property);\n\n        // Allow macro to set the default value\n        cProperty.default = modelPropertyMacro(property);\n\n        output[name] = schemaToJSON(cProperty, models, modelsToIgnore, modelPropertyMacro);\n      });\n    } else if (type === 'array') {\n      output = [];\n\n      if (_.isArray(schema.items)) {\n        _.forEach(schema.items, function (item) {\n          output.push(schemaToJSON(item, models, modelsToIgnore, modelPropertyMacro));\n        });\n      } else if (_.isPlainObject(schema.items)) {\n        output.push(schemaToJSON(schema.items, models, modelsToIgnore, modelPropertyMacro));\n      } else if (_.isUndefined(schema.items)) {\n        output.push({});\n      } else {\n        Helpers.log('Array type\\'s \\'items\\' property is not an array or an object, cannot process');\n      }\n    }\n  }\n\n  return output;\n}\n\nfunction schemaToHTML(name, schema, models, modelPropertyMacro) {\n\n  var strongOpen = '<span class=\"strong\">';\n  var strongClose = '</span>';\n\n  // Allow for ignoring the 'name' argument.... shifting the rest\n  if(_.isObject(arguments[0])) {\n    name = void 0;\n    schema = arguments[0];\n    models = arguments[1];\n    modelPropertyMacro = arguments[2];\n  }\n\n  models = models || {};\n\n  // Resolve the schema (Handle nested schemas)\n  schema = Helpers.resolveSchema(schema);\n\n  // Return for empty object\n  if(_.isEmpty(schema)) {\n    return strongOpen + 'Empty' + strongClose;\n  }\n\n  // Dereference $ref from 'models'\n  if(typeof schema.$ref === 'string') {\n    name = Helpers.simpleRef(schema.$ref);\n    schema = models[name];\n    if(typeof schema === 'undefined')\n    {\n      return strongOpen + name + ' is not defined!' + strongClose;\n    }\n  }\n\n  if(typeof name !== 'string') {\n    name = schema.title || 'Inline Model';\n  }\n\n  // If we are a Model object... adjust accordingly\n  if(schema.definition) {\n    schema = schema.definition;\n  }\n\n  if(typeof modelPropertyMacro !== 'function') {\n    modelPropertyMacro = function(prop){\n      return (prop || {}).default;\n    };\n  }\n\n  var references = {};\n  var seenModels = [];\n  var inlineModels = 0;\n\n\n\n  // Generate current HTML\n  var html = processModel(schema, name);\n\n  // Generate references HTML\n  while (_.keys(references).length > 0) {\n    /* jshint ignore:start */\n    _.forEach(references, function (schema, name) {\n      var seenModel = _.indexOf(seenModels, name) > -1;\n\n      delete references[name];\n\n      if (!seenModel) {\n        seenModels.push(name);\n\n        html += '<br />' + processModel(schema, name);\n      }\n    });\n    /* jshint ignore:end */\n  }\n\n  return html;\n\n  /////////////////////////////////\n\n  function addReference(schema, name, skipRef) {\n    var modelName = name;\n    var model;\n\n    if (schema.$ref) {\n      modelName = schema.title || Helpers.simpleRef(schema.$ref);\n      model = models[modelName];\n    } else if (_.isUndefined(name)) {\n      modelName = schema.title || 'Inline Model ' + (++inlineModels);\n      model = {definition: schema};\n    }\n\n    if (skipRef !== true) {\n      references[modelName] = _.isUndefined(model) ? {} : model.definition;\n    }\n\n    return modelName;\n  }\n\n  function primitiveToHTML(schema) {\n    var html = '<span class=\"propType\">';\n    var type = schema.type || 'object';\n\n    if (schema.$ref) {\n      html += addReference(schema, Helpers.simpleRef(schema.$ref));\n    } else if (type === 'object') {\n      if (!_.isUndefined(schema.properties)) {\n        html += addReference(schema);\n      } else {\n        html += 'object';\n      }\n    } else if (type === 'array') {\n      html += 'Array[';\n\n      if (_.isArray(schema.items)) {\n        html += _.map(schema.items, addReference).join(',');\n      } else if (_.isPlainObject(schema.items)) {\n        if (_.isUndefined(schema.items.$ref)) {\n          if (!_.isUndefined(schema.items.type) && _.indexOf(['array', 'object'], schema.items.type) === -1) {\n            html += schema.items.type;\n          } else {\n            html += addReference(schema.items);\n          }\n        } else {\n          html += addReference(schema.items, Helpers.simpleRef(schema.items.$ref));\n        }\n      } else {\n        Helpers.log('Array type\\'s \\'items\\' schema is not an array or an object, cannot process');\n        html += 'object';\n      }\n\n      html += ']';\n    } else {\n      html += schema.type;\n    }\n\n    html += '</span>';\n\n    return html;\n  }\n\n  function primitiveToOptionsHTML(schema, html) {\n    var options = '';\n    var type = schema.type || 'object';\n    var isArray = type === 'array';\n\n    if (isArray) {\n      if (_.isPlainObject(schema.items) && !_.isUndefined(schema.items.type)) {\n        type = schema.items.type;\n      } else {\n        type = 'object';\n      }\n    }\n\n    if (!_.isUndefined(schema.default)) {\n      options += optionHtml('Default', schema.default);\n    }\n\n    switch (type) {\n    case 'string':\n      if (schema.minLength) {\n        options += optionHtml('Min. Length', schema.minLength);\n      }\n\n      if (schema.maxLength) {\n        options += optionHtml('Max. Length', schema.maxLength);\n      }\n\n      if (schema.pattern) {\n        options += optionHtml('Reg. Exp.', schema.pattern);\n      }\n      break;\n    case 'integer':\n    case 'number':\n      if (schema.minimum) {\n        options += optionHtml('Min. Value', schema.minimum);\n      }\n\n      if (schema.exclusiveMinimum) {\n        options += optionHtml('Exclusive Min.', 'true');\n      }\n\n      if (schema.maximum) {\n        options += optionHtml('Max. Value', schema.maximum);\n      }\n\n      if (schema.exclusiveMaximum) {\n        options += optionHtml('Exclusive Max.', 'true');\n      }\n\n      if (schema.multipleOf) {\n        options += optionHtml('Multiple Of', schema.multipleOf);\n      }\n\n      break;\n    }\n\n    if (isArray) {\n      if (schema.minItems) {\n        options += optionHtml('Min. Items', schema.minItems);\n      }\n\n      if (schema.maxItems) {\n        options += optionHtml('Max. Items', schema.maxItems);\n      }\n\n      if (schema.uniqueItems) {\n        options += optionHtml('Unique Items', 'true');\n      }\n\n      if (schema.collectionFormat) {\n        options += optionHtml('Coll. Format', schema.collectionFormat);\n      }\n    }\n\n    if (_.isUndefined(schema.items)) {\n      if (_.isArray(schema.enum)) {\n        var enumString;\n\n        if (type === 'number' || type === 'integer') {\n          enumString = schema.enum.join(', ');\n        } else {\n          enumString = '\"' + schema.enum.join('\", \"') + '\"';\n        }\n\n        options += optionHtml('Enum', enumString);\n      }\n    }\n\n    if (options.length > 0) {\n      html = '<span class=\"propWrap\">' + html + '<table class=\"optionsWrapper\"><tr><th colspan=\"2\">' + type + '</th></tr>' + options + '</table></span>';\n    }\n\n    return html;\n  }\n\n  function processModel(schema, name) {\n    var type = schema.type || 'object';\n    var isArray = schema.type === 'array';\n    var html = strongOpen + name + ' ' + (isArray ? '[' : '{') + strongClose;\n\n    if (name) {\n      seenModels.push(name);\n    }\n\n    if (isArray) {\n      if (_.isArray(schema.items)) {\n        html += '<div>' + _.map(schema.items, function (item) {\n          var type = item.type || 'object';\n\n          if (_.isUndefined(item.$ref)) {\n            if (_.indexOf(['array', 'object'], type) > -1) {\n              if (type === 'object' && _.isUndefined(item.properties)) {\n                return 'object';\n              } else {\n                return addReference(item);\n              }\n            } else {\n              return primitiveToOptionsHTML(item, type);\n            }\n          } else {\n            return addReference(item, Helpers.simpleRef(item.$ref));\n          }\n        }).join(',</div><div>');\n      } else if (_.isPlainObject(schema.items)) {\n        if (_.isUndefined(schema.items.$ref)) {\n          if (_.indexOf(['array', 'object'], schema.items.type || 'object') > -1) {\n            if ((_.isUndefined(schema.items.type) || schema.items.type === 'object') && _.isUndefined(schema.items.properties)) {\n              html += '<div>object</div>';\n            } else {\n              html += '<div>' + addReference(schema.items) + '</div>';\n            }\n          } else {\n            html += '<div>' + primitiveToOptionsHTML(schema.items, schema.items.type) + '</div>';\n          }\n        } else {\n          html += '<div>' + addReference(schema.items, Helpers.simpleRef(schema.items.$ref)) + '</div>';\n        }\n      } else {\n        Helpers.log('Array type\\'s \\'items\\' property is not an array or an object, cannot process');\n        html += '<div>object</div>';\n      }\n    } else {\n      if (schema.$ref) {\n        html += '<div>' + addReference(schema, name) + '</div>';\n      } else if (type === 'object') {\n        if (_.isPlainObject(schema.properties)) {\n          var contents = _.map(schema.properties, function (property, name) {\n            var propertyIsRequired = (_.indexOf(schema.required, name) >= 0);\n            var cProperty = _.cloneDeep(property);\n\n            var requiredClass = propertyIsRequired ? 'required' : '';\n            var html = '<div' + (property.readOnly ? ' class=\"readOnly\"' : '') + '><span class=\"propName ' + requiredClass + '\">' + name + '</span> (';\n            var model;\n            var propDescription;\n\n            // Allow macro to set the default value\n            cProperty.default = modelPropertyMacro(cProperty);\n\n            // Resolve the schema (Handle nested schemas)\n            cProperty = Helpers.resolveSchema(cProperty);\n\n            propDescription = property.description || cProperty.description;\n\n            // We need to handle property references to primitives (Issue 339)\n            if (!_.isUndefined(cProperty.$ref)) {\n              model = models[Helpers.simpleRef(cProperty.$ref)];\n\n              if (!_.isUndefined(model) && _.indexOf([undefined, 'array', 'object'], model.definition.type) === -1) {\n                // Use referenced schema\n                cProperty = Helpers.resolveSchema(model.definition);\n              }\n            }\n\n            html += primitiveToHTML(cProperty);\n\n            if(!propertyIsRequired) {\n              html += ', <span class=\"propOptKey\">optional</span>';\n            }\n\n            if(property.readOnly) {\n                html += ', <span class=\"propReadOnly\">read only</span>';\n            }\n\n            html += ')';\n\n            if (!_.isUndefined(propDescription)) {\n              html += ': ' + '<span class=\"propDesc\">' + propDescription + '</span>';\n            }\n\n            if (cProperty.enum) {\n              html += ' = <span class=\"propVals\">[\\'' + cProperty.enum.join('\\', \\'') + '\\']</span>';\n            }\n\n            return primitiveToOptionsHTML(cProperty, html);\n          }).join(',</div>');\n        }\n\n        if (contents) {\n          html += contents + '</div>';\n        }\n      } else {\n        html += '<div>' + primitiveToOptionsHTML(schema, type) + '</div>';\n      }\n    }\n\n    return html + strongOpen + (isArray ? ']' : '}') + strongClose;\n  }\n}\n","'use strict';\n\nvar SwaggerHttp = require('./http');\nvar _ = {\n  isObject: require('lodash-compat/lang/isObject')\n};\n\nvar SwaggerSpecConverter = module.exports = function () {\n  this.errors = [];\n  this.warnings = [];\n  this.modelMap = {};\n};\n\nSwaggerSpecConverter.prototype.setDocumentationLocation = function (location) {\n  this.docLocation = location;\n};\n\n/**\n * converts a resource listing OR api declaration\n **/\nSwaggerSpecConverter.prototype.convert = function (obj, clientAuthorizations, opts, callback) {\n  // not a valid spec\n  if(!obj || !Array.isArray(obj.apis)) {\n    return this.finish(callback, null);\n  }\n  this.clientAuthorizations = clientAuthorizations;\n\n  // create a new swagger object to return\n  var swagger = { swagger: '2.0' };\n\n  swagger.originalVersion = obj.swaggerVersion;\n\n  // add the info\n  this.apiInfo(obj, swagger);\n\n  // add security definitions\n  this.securityDefinitions(obj, swagger);\n\n  // take basePath into account\n  if (obj.basePath) {\n    this.setDocumentationLocation(obj.basePath);\n  }\n\n  // see if this is a single-file swagger definition\n  var isSingleFileSwagger = false;\n  var i;\n  for(i = 0; i < obj.apis.length; i++) {\n    var api = obj.apis[i];\n    if(Array.isArray(api.operations)) {\n      isSingleFileSwagger = true;\n    }\n  }\n  if(isSingleFileSwagger) {\n    this.declaration(obj, swagger);\n    this.finish(callback, swagger);\n  }\n  else {\n    this.resourceListing(obj, swagger, opts, callback);\n  }\n};\n\nSwaggerSpecConverter.prototype.declaration = function(obj, swagger) {\n  var name, i, p, pos;\n  if(!obj.apis) {\n    return;\n  }\n\n  if (obj.basePath.indexOf('http://') === 0) {\n    p = obj.basePath.substring('http://'.length);\n    pos = p.indexOf('/');\n    if (pos > 0) {\n      swagger.host = p.substring(0, pos);\n      swagger.basePath = p.substring(pos);\n    }\n    else {\n      swagger.host = p;\n      swagger.basePath = '/';\n    }\n  } else if (obj.basePath.indexOf('https://') === 0) {\n    p = obj.basePath.substring('https://'.length);\n    pos = p.indexOf('/');\n    if (pos > 0) {\n      swagger.host = p.substring(0, pos);\n      swagger.basePath = p.substring(pos);\n    }\n    else {\n      swagger.host = p;\n      swagger.basePath = '/';\n    }\n  } else {\n    swagger.basePath = obj.basePath;\n  }\n\n  var resourceLevelAuth;\n  if(obj.authorizations) {\n    resourceLevelAuth = obj.authorizations;\n  }\n  if(obj.consumes) {\n    swagger.consumes = obj.consumes;\n  }\n  if(obj.produces) {\n    swagger.produces = obj.produces;\n  }\n\n  // build a mapping of id to name for 1.0 model resolutions\n  if(_.isObject(obj)) {\n    for(name in obj.models) {\n      var existingModel = obj.models[name];\n      var key = (existingModel.id || name);\n      this.modelMap[key] = name;\n    }\n  }\n\n  for(i = 0; i < obj.apis.length; i++) {\n    var api = obj.apis[i];\n    var path = api.path;\n    var operations = api.operations;\n    this.operations(path, obj.resourcePath, operations, resourceLevelAuth, swagger);\n  }\n\n  var models = obj.models || {};\n  this.models(models, swagger);\n};\n\nSwaggerSpecConverter.prototype.models = function(obj, swagger) {\n  if(!_.isObject(obj)) {\n    return;\n  }\n  var name;\n\n  swagger.definitions = swagger.definitions || {};\n  for(name in obj) {\n    var existingModel = obj[name];\n    var _enum = [];\n    var schema = { properties: {}};\n    var propertyName;\n    for(propertyName in existingModel.properties) {\n      var existingProperty = existingModel.properties[propertyName];\n      var property = {};\n      this.dataType(existingProperty, property);\n      if(existingProperty.description) {\n        property.description = existingProperty.description;\n      }\n      if(existingProperty['enum']) {\n        property['enum'] = existingProperty['enum'];\n      }\n      if(typeof existingProperty.required === 'boolean' && existingProperty.required === true) {\n        _enum.push(propertyName);\n      }\n      if(typeof existingProperty.required === 'string' && existingProperty.required === 'true') {\n        _enum.push(propertyName);\n      }\n      schema.properties[propertyName] = property;\n    }\n    if(_enum.length > 0) {\n      schema['enum'] = _enum;\n    }\n\n    schema.required = existingModel.required;\n    swagger.definitions[name] = schema;\n  }\n};\n\nSwaggerSpecConverter.prototype.extractTag = function(resourcePath) {\n  var pathString = resourcePath || 'default';\n  if(pathString.indexOf('http:') === 0 || pathString.indexOf('https:') === 0) {\n    pathString = pathString.split(['/']);\n    pathString = pathString[pathString.length -1].substring();\n  }\n  if(pathString.endsWith('.json')) {\n    pathString = pathString.substring(0, pathString.length - '.json'.length);\n  }\n  return pathString.replace('/','');\n};\n\nSwaggerSpecConverter.prototype.operations = function(path, resourcePath, obj, resourceLevelAuth, swagger) {\n  if(!Array.isArray(obj)) {\n    return;\n  }\n  var i;\n\n  if(!swagger.paths) {\n    swagger.paths = {};\n  }\n\n  var pathObj = swagger.paths[path] || {};\n  var tag = this.extractTag(resourcePath);\n  swagger.tags = swagger.tags || [];\n  var matched = false;\n  for(i = 0; i < swagger.tags.length; i++) {\n    var tagObject = swagger.tags[i];\n    if(tagObject.name === tag) {\n      matched = true;\n    }\n  }\n  if(!matched) {\n    swagger.tags.push({name: tag});\n  }\n\n  for(i = 0; i < obj.length; i++) {\n    var existingOperation = obj[i];\n    var method = (existingOperation.method || existingOperation.httpMethod).toLowerCase();\n    var operation = {tags: [tag]};\n    var existingAuthorizations = existingOperation.authorizations;\n\n    if(existingAuthorizations && Object.keys(existingAuthorizations).length === 0) {\n      existingAuthorizations = resourceLevelAuth;\n    }\n\n    if(typeof existingAuthorizations !== 'undefined') {\n      var scopesObject;\n      for(var key in existingAuthorizations) {\n        operation.security = operation.security || [];\n        var scopes = existingAuthorizations[key];\n        if(scopes) {\n          var securityScopes = [];\n          for(var j in scopes) {\n            securityScopes.push(scopes[j].scope);\n          }\n          scopesObject = {};\n          scopesObject[key] = securityScopes;\n          operation.security.push(scopesObject);\n        }\n        else {\n          scopesObject = {};\n          scopesObject[key] = [];\n          operation.security.push(scopesObject);\n        }\n      }\n    }\n\n    if(existingOperation.consumes) {\n      operation.consumes = existingOperation.consumes;\n    }\n    else if(swagger.consumes) {\n      operation.consumes = swagger.consumes;\n    }\n    if(existingOperation.produces) {\n      operation.produces = existingOperation.produces;\n    }\n    else if(swagger.produces) {\n      operation.produces = swagger.produces;\n    }\n    if(existingOperation.summary) {\n      operation.summary = existingOperation.summary;\n    }\n    if(existingOperation.notes) {\n      operation.description = existingOperation.notes;\n    }\n    if(existingOperation.nickname) {\n      operation.operationId = existingOperation.nickname;\n    }\n    if(existingOperation.deprecated) {\n      operation.deprecated = existingOperation.deprecated;\n    }\n\n    this.authorizations(existingAuthorizations, swagger);\n    this.parameters(operation, existingOperation.parameters, swagger);\n    this.responseMessages(operation, existingOperation, swagger);\n\n    pathObj[method] = operation;\n  }\n\n  swagger.paths[path] = pathObj;\n};\n\nSwaggerSpecConverter.prototype.responseMessages = function(operation, existingOperation) {\n  if(!_.isObject(existingOperation)) {\n    return;\n  }\n  // build default response from the operation (1.x)\n  var defaultResponse = {};\n  this.dataType(existingOperation, defaultResponse);\n  // TODO: look into the real problem of rendering responses in swagger-ui\n  // ....should reponseType have an implicit schema?\n  if(!defaultResponse.schema && defaultResponse.type) {\n    defaultResponse = {schema: defaultResponse};\n  }\n\n  operation.responses = operation.responses || {};\n\n  // grab from responseMessages (1.2)\n  var has200 = false;\n  if(Array.isArray(existingOperation.responseMessages)) {\n    var i;\n    var existingResponses = existingOperation.responseMessages;\n    for(i = 0; i < existingResponses.length; i++) {\n      var existingResponse = existingResponses[i];\n      var response = { description: existingResponse.message };\n      if(existingResponse.code === 200) {\n        has200 = true;\n      }\n      // Convert responseModel -> schema{$ref: responseModel}\n      if(existingResponse.responseModel) {\n        response.schema = {'$ref': '#/definitions/' + existingResponse.responseModel};\n      }\n      operation.responses['' + existingResponse.code] = response;\n    }\n  }\n\n  if(has200) {\n    operation.responses['default'] = defaultResponse;\n  }\n  else {\n    operation.responses['200'] = defaultResponse;\n  }\n};\n\nSwaggerSpecConverter.prototype.authorizations = function(obj) {\n  // TODO\n  if(!_.isObject(obj)) {\n    return;\n  }\n};\n\nSwaggerSpecConverter.prototype.parameters = function(operation, obj) {\n  if(!Array.isArray(obj)) {\n    return;\n  }\n  var i;\n  for(i = 0; i < obj.length; i++) {\n    var existingParameter = obj[i];\n    var parameter = {};\n    parameter.name = existingParameter.name;\n    parameter.description = existingParameter.description;\n    parameter.required = existingParameter.required;\n    parameter.in = existingParameter.paramType;\n\n    // per #168\n    if(parameter.in === 'body') {\n      parameter.name = 'body';\n    }\n    if(parameter.in === 'form') {\n      parameter.in = 'formData';\n    }\n\n    if(existingParameter.enum) {\n      parameter.enum = existingParameter.enum;\n    }\n\n    if(existingParameter.allowMultiple === true || existingParameter.allowMultiple === 'true') {\n      var innerType = {};\n      this.dataType(existingParameter, innerType);\n      parameter.type = 'array';\n      parameter.items = innerType;\n\n      if(existingParameter.allowableValues) {\n        var av = existingParameter.allowableValues;\n        if(av.valueType === 'LIST') {\n          parameter['enum'] = av.values;\n        }\n      }\n    }\n    else {\n      this.dataType(existingParameter, parameter);\n    }\n    if(typeof existingParameter.defaultValue !== 'undefined') {\n      parameter.default = existingParameter.defaultValue;\n    }\n\n    operation.parameters = operation.parameters || [];\n    operation.parameters.push(parameter);\n  }\n};\n\nSwaggerSpecConverter.prototype.dataType = function(source, target) {\n  if(!_.isObject(source)) {\n    return;\n  }\n\n  if(source.minimum) {\n    target.minimum = source.minimum;\n  }\n  if(source.maximum) {\n    target.maximum = source.maximum;\n  }\n  if (source.format) {\n    target.format = source.format;\n  }\n\n  // default can be 'false'\n  if(typeof source.defaultValue !== 'undefined') {\n    target.default = source.defaultValue;\n  }\n\n  var jsonSchemaType = this.toJsonSchema(source);\n  if(jsonSchemaType) {\n    target = target || {};\n    if(jsonSchemaType.type) {\n      target.type = jsonSchemaType.type;\n    }\n    if(jsonSchemaType.format) {\n      target.format = jsonSchemaType.format;\n    }\n    if(jsonSchemaType.$ref) {\n      target.schema = {$ref: jsonSchemaType.$ref};\n    }\n    if(jsonSchemaType.items) {\n      target.items = jsonSchemaType.items;\n    }\n  }\n};\n\nSwaggerSpecConverter.prototype.toJsonSchema = function(source) {\n  if(!source) {\n    return 'object';\n  }\n  var detectedType = (source.type || source.dataType || source.responseClass || '');\n  var lcType = detectedType.toLowerCase();\n  var format = (source.format || '').toLowerCase();\n\n  if(lcType.indexOf('list[') === 0) {\n    var innerType = detectedType.substring(5, detectedType.length - 1);\n    var jsonType = this.toJsonSchema({type: innerType});\n    return {type: 'array', items: jsonType};\n  } else if(lcType === 'int' || (lcType === 'integer' && format === 'int32')) {\n    {return {type: 'integer', format: 'int32'};}\n  } else if(lcType === 'long' || (lcType === 'integer' && format === 'int64')) {\n    {return {type: 'integer', format: 'int64'};}\n  } else if(lcType === 'integer') {\n    {return {type: 'integer', format: 'int64'};}\n  } else if(lcType === 'float' || (lcType === 'number' && format === 'float')) {\n    {return {type: 'number', format: 'float'};}\n  } else if(lcType === 'double' || (lcType === 'number' && format === 'double')) {\n    {return {type: 'number', format: 'double'};}\n  } else if((lcType === 'string' && format === 'date-time') || (lcType === 'date')) {\n    {return {type: 'string', format: 'date-time'};}\n  } else if(lcType === 'string') {\n    {return {type: 'string'};}\n  } else if(lcType === 'file') {\n    {return {type: 'file'};}\n  } else if(lcType === 'boolean') {\n    {return {type: 'boolean'};}\n  } else if(lcType === 'boolean') {\n    {return {type: 'boolean'};}\n  } else if(lcType === 'array' || lcType === 'list') {\n    if(source.items) {\n      var it = this.toJsonSchema(source.items);\n      return {type: 'array', items: it};\n    }\n    else {\n      return {type: 'array', items: {type: 'object'}};\n    }\n  } else if(source.$ref) {\n    return {$ref: this.modelMap[source.$ref] ? '#/definitions/' + this.modelMap[source.$ref] : source.$ref};\n  } else if(lcType === 'void' || lcType === '') {\n    {return {};}\n  } else if (this.modelMap[source.type]) {\n    // If this a model using `type` instead of `$ref`, that's fine.\n    return {$ref: '#/definitions/' + this.modelMap[source.type]};\n  } else {\n    // Unknown model type or 'object', pass it along.\n    return {type: source.type};\n  }\n};\n\nSwaggerSpecConverter.prototype.resourceListing = function(obj, swagger, opts, callback) {\n  var i;\n  var processedCount = 0;   // jshint ignore:line\n  var self = this;          // jshint ignore:line\n  var expectedCount = obj.apis.length;\n  var _swagger = swagger;   // jshint ignore:line\n  var _opts = {};\n\n  if(opts && opts.requestInterceptor){\n    _opts.requestInterceptor = opts.requestInterceptor;\n  }\n\n  if(opts && opts.responseInterceptor){\n    _opts.responseInterceptor = opts.responseInterceptor;\n  }\n\n  if(expectedCount === 0) {\n    this.finish(callback, swagger);\n  }\n\n  for(i = 0; i < expectedCount; i++) {\n    var api = obj.apis[i];\n    var path = api.path;\n    var absolutePath = this.getAbsolutePath(obj.swaggerVersion, this.docLocation, path);\n\n    if(api.description) {\n      swagger.tags = swagger.tags || [];\n      swagger.tags.push({\n        name : this.extractTag(api.path),\n        description : api.description || ''\n      });\n    }\n    var http = {\n      url: absolutePath,\n      headers: {accept: 'application/json'},\n      on: {},\n      method: 'get'\n    };\n    /* jshint ignore:start */\n    http.on.response = function(data) {\n      processedCount += 1;\n      var obj = data.obj;\n      if(obj) {\n        self.declaration(obj, _swagger);\n      }\n      if(processedCount === expectedCount) {\n        self.finish(callback, _swagger);\n      }\n    };\n    http.on.error = function(data) {\n      console.error(data);\n      processedCount += 1;\n      if(processedCount === expectedCount) {\n        self.finish(callback, _swagger);\n      }\n    };\n    /* jshint ignore:end */\n\n    if(this.clientAuthorizations && typeof this.clientAuthorizations.apply === 'function') {\n      this.clientAuthorizations.apply(http);\n    }\n\n    new SwaggerHttp().execute(http, _opts);\n  }\n};\n\nSwaggerSpecConverter.prototype.getAbsolutePath = function(version, docLocation, path)  {\n  if(version === '1.0') {\n    if(docLocation.endsWith('.json')) {\n      // get root path\n      var pos = docLocation.lastIndexOf('/');\n      if(pos > 0) {\n        docLocation = docLocation.substring(0, pos);\n      }\n    }\n  }\n\n  var location = docLocation;\n  if(path.indexOf('http://') === 0 || path.indexOf('https://') === 0) {\n    location = path;\n  }\n  else {\n    if(docLocation.endsWith('/')) {\n      location = docLocation.substring(0, docLocation.length - 1);\n    }\n    location += path;\n  }\n  location = location.replace('{format}', 'json');\n  return location;\n};\n\nSwaggerSpecConverter.prototype.securityDefinitions = function(obj, swagger) {\n  if(obj.authorizations) {\n    var name;\n    for(name in obj.authorizations) {\n      var isValid = false;\n      var securityDefinition = {};\n      var definition = obj.authorizations[name];\n      if(definition.type === 'apiKey') {\n        securityDefinition.type = 'apiKey';\n        securityDefinition.in = definition.passAs;\n        securityDefinition.name = definition.keyname || name;\n        isValid = true;\n      }\n      else if(definition.type === 'basicAuth') {\n        securityDefinition.type = 'basicAuth';\n        isValid = true;\n      }\n      else if(definition.type === 'oauth2') {\n        var existingScopes = definition.scopes || [];\n        var scopes = {};\n        var i;\n        for(i in existingScopes) {\n          var scope = existingScopes[i];\n          scopes[scope.scope] = scope.description;\n        }\n        securityDefinition.type = 'oauth2';\n        if(i > 0) {\n          securityDefinition.scopes = scopes;\n        }\n        if(definition.grantTypes) {\n          if(definition.grantTypes.implicit) {\n            var implicit = definition.grantTypes.implicit;\n            securityDefinition.flow = 'implicit';\n            securityDefinition.authorizationUrl = implicit.loginEndpoint;\n            isValid = true;\n          }\n          /* jshint ignore:start */\n          if(definition.grantTypes['authorization_code']) {\n            if(!securityDefinition.flow) {\n              // cannot set if flow is already defined\n              var authCode = definition.grantTypes['authorization_code'];\n              securityDefinition.flow = 'accessCode';\n              securityDefinition.authorizationUrl = authCode.tokenRequestEndpoint.url;\n              securityDefinition.tokenUrl = authCode.tokenEndpoint.url;\n              isValid = true;\n            }\n          }\n          /* jshint ignore:end */\n        }\n      }\n      if(isValid) {\n        swagger.securityDefinitions = swagger.securityDefinitions || {};\n        swagger.securityDefinitions[name] = securityDefinition;\n      }\n    }\n  }\n};\n\nSwaggerSpecConverter.prototype.apiInfo = function(obj, swagger) {\n  // info section\n  if(obj.info) {\n    var info = obj.info;\n    swagger.info = {};\n\n    if(info.contact) {\n      swagger.info.contact = {};\n      swagger.info.contact.email = info.contact;\n    }\n    if(info.description) {\n      swagger.info.description = info.description;\n    }\n    if(info.title) {\n      swagger.info.title = info.title;\n    }\n    if(info.termsOfServiceUrl) {\n      swagger.info.termsOfService = info.termsOfServiceUrl;\n    }\n    if(info.license || info.licenseUrl) {\n      swagger.license = {};\n      if(info.license) {\n        swagger.license.name = info.license;\n      }\n      if(info.licenseUrl) {\n        swagger.license.url = info.licenseUrl;\n      }\n    }\n  }\n  else {\n    this.warnings.push('missing info section');\n  }\n};\n\nSwaggerSpecConverter.prototype.finish = function (callback, obj) {\n  callback(obj);\n};\n","'use strict';\n\nvar _ = {\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  isString: require('lodash-compat/lang/isString'),\n};\n\nvar SchemaMarkup = require('../schema-markup.js');\nvar jsyaml = require('js-yaml');\n\nvar Model = module.exports = function (name, definition, models, modelPropertyMacro) {\n  this.definition = definition || {};\n  this.isArray = definition.type === 'array';\n  this.models = models || {};\n  this.name = definition.title || name || 'Inline Model';\n  this.modelPropertyMacro = modelPropertyMacro || function (property) {\n    return property.default;\n  };\n\n  return this;\n};\n\nModel.prototype.createJSONSample = Model.prototype.getSampleValue = function (modelsToIgnore) {\n  modelsToIgnore = modelsToIgnore || {};\n\n  modelsToIgnore[this.name] = this;\n\n  // Response support\n  if (this.examples && _.isPlainObject(this.examples) && this.examples['application/json']) {\n    this.definition.example = this.examples['application/json'];\n\n    if (_.isString(this.definition.example)) {\n      this.definition.example = jsyaml.safeLoad(this.definition.example);\n    }\n  } else if (!this.definition.example) {\n    this.definition.example = this.examples;\n  }\n\n  return SchemaMarkup.schemaToJSON(this.definition, this.models, modelsToIgnore, this.modelPropertyMacro);\n};\n\nModel.prototype.getMockSignature = function () {\n  return SchemaMarkup.schemaToHTML(this.name, this.definition, this.models, this.modelPropertyMacro);\n};\n","'use strict';\n\nvar _ = {\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  isUndefined: require('lodash-compat/lang/isUndefined'),\n  isEmpty: require('lodash-compat/lang/isEmpty'),\n  isObject: require('lodash-compat/lang/isObject')\n};\nvar helpers = require('../helpers');\nvar Model = require('./model');\nvar SwaggerHttp = require('../http');\nvar Q = require('q');\n\nvar Operation = module.exports = function (parent, scheme, operationId, httpMethod, path, args, definitions, models, clientAuthorizations) {\n  var errors = [];\n\n  parent = parent || {};\n  args = args || {};\n\n  if(parent && parent.options) {\n    this.client = parent.options.client || null;\n    this.requestInterceptor = parent.options.requestInterceptor || null;\n    this.responseInterceptor = parent.options.responseInterceptor || null;\n  }\n  this.authorizations = args.security;\n  this.basePath = parent.basePath || '/';\n  this.clientAuthorizations = clientAuthorizations;\n  this.consumes = args.consumes || parent.consumes || ['application/json'];\n  this.produces = args.produces || parent.produces || ['application/json'];\n  this.deprecated = args.deprecated;\n  this.description = args.description;\n  this.host = parent.host || 'localhost';\n  this.method = (httpMethod || errors.push('Operation ' + operationId + ' is missing method.'));\n  this.models = models || {};\n  this.nickname = (operationId || errors.push('Operations must have a nickname.'));\n  this.operation = args;\n  this.operations = {};\n  this.parameters = args !== null ? (args.parameters || []) : {};\n  this.parent = parent;\n  this.path = (path || errors.push('Operation ' + this.nickname + ' is missing path.'));\n  this.responses = (args.responses || {});\n  this.scheme = scheme || parent.scheme || 'http';\n  this.schemes = args.schemes || parent.schemes;\n  this.security = args.security;\n  this.summary = args.summary || '';\n  this.type = null;\n  this.useJQuery = parent.useJQuery;\n  this.enableCookies = parent.enableCookies;\n  this.parameterMacro = parent.parameterMacro || function (operation, parameter) {\n    return parameter.default;\n  };\n\n  this.inlineModels = [];\n\n  if (typeof this.deprecated === 'string') {\n    switch(this.deprecated.toLowerCase()) {\n      case 'true': case 'yes': case '1': {\n        this.deprecated = true;\n        break;\n      }\n\n      case 'false': case 'no': case '0': case null: {\n        this.deprecated = false;\n        break;\n      }\n\n      default: this.deprecated = Boolean(this.deprecated);\n    }\n  }\n\n  var i, model;\n\n  if (definitions) {\n    // add to global models\n    var key;\n\n    for (key in definitions) {\n      model = new Model(key, definitions[key], this.models, parent.modelPropertyMacro);\n\n      if (model) {\n        this.models[key] = model;\n      }\n    }\n  }\n  else {\n    definitions = {};\n  }\n\n  for (i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n\n    // Allow macro to set the default value\n    param.default = this.parameterMacro(this, param);\n\n    if (param.type === 'array') {\n      param.isList = true;\n      param.allowMultiple = true;\n      // the enum can be defined at the items level\n      //if (param.items && param.items.enum) {\n      //  param['enum'] = param.items.enum;\n      //}\n    }\n\n    var innerType = this.getType(param);\n\n    if (innerType && innerType.toString().toLowerCase() === 'boolean') {\n      param.allowableValues = {};\n      param.isList = true;\n      param['enum'] = [true, false]; // use actual primitives\n    }\n\n    if(typeof param['x-example'] !== 'undefined') {\n      var d = param['x-example'];\n      param.default = d;\n    }\n    if(param['x-examples']) {\n      var d = param['x-examples'].default;\n      if(typeof d !== 'undefined') {\n        param.default = d;\n      }\n    }\n\n    if (typeof param['enum'] !== 'undefined') {\n      var id;\n\n      param.allowableValues = {};\n      param.allowableValues.values = [];\n      param.allowableValues.descriptiveValues = [];\n\n      for (id = 0; id < param['enum'].length; id++) {\n        var value = param['enum'][id];\n        var isDefault = (value === param.default || value+'' === param.default);\n\n        param.allowableValues.values.push(value);\n        // Always have string for descriptive values....\n        param.allowableValues.descriptiveValues.push({value : value+'', isDefault: isDefault});\n      }\n    }\n\n    if (param.type === 'array') {\n      innerType = [innerType];\n\n      if (typeof param.allowableValues === 'undefined') {\n        // can't show as a list if no values to select from\n        delete param.isList;\n        delete param.allowMultiple;\n      }\n    }\n\n    param.signature = this.getModelSignature(innerType, this.models).toString();\n    param.sampleJSON = this.getModelSampleJSON(innerType, this.models);\n    param.responseClassSignature = param.signature;\n  }\n\n  var defaultResponseCode, response, responses = this.responses;\n\n  if (responses['200']) {\n    response = responses['200'];\n    defaultResponseCode = '200';\n  } else if (responses['201']) {\n    response = responses['201'];\n    defaultResponseCode = '201';\n  } else if (responses['202']) {\n    response = responses['202'];\n    defaultResponseCode = '202';\n  } else if (responses['203']) {\n    response = responses['203'];\n    defaultResponseCode = '203';\n  } else if (responses['204']) {\n    response = responses['204'];\n    defaultResponseCode = '204';\n  } else if (responses['205']) {\n    response = responses['205'];\n    defaultResponseCode = '205';\n  } else if (responses['206']) {\n    response = responses['206'];\n    defaultResponseCode = '206';\n  } else if (responses['default']) {\n    response = responses['default'];\n    defaultResponseCode = 'default';\n  }\n\n  if (response && response.schema) {\n    var resolvedModel = this.resolveModel(response.schema, definitions);\n    var successResponse;\n\n    delete responses[defaultResponseCode];\n\n    if (resolvedModel) {\n      this.successResponse = {};\n      successResponse = this.successResponse[defaultResponseCode] = resolvedModel;\n    } else if (!response.schema.type || response.schema.type === 'object' || response.schema.type === 'array') {\n      // Inline model\n      this.successResponse = {};\n      successResponse = this.successResponse[defaultResponseCode] = new Model(undefined, response.schema || {}, this.models, parent.modelPropertyMacro);\n    } else {\n      // Primitive\n      this.successResponse = {};\n      successResponse = this.successResponse[defaultResponseCode] = response.schema;\n    }\n\n    if (successResponse) {\n      // Attach response properties\n      if (response.description) {\n        successResponse.description = response.description;\n      }\n\n      if (response.examples) {\n        successResponse.examples = response.examples;\n      }\n\n      if (response.headers) {\n        successResponse.headers = response.headers;\n      }\n    }\n\n    this.type = response;\n  }\n\n  if (errors.length > 0) {\n    if (this.resource && this.resource.api && this.resource.api.fail) {\n      this.resource.api.fail(errors);\n    }\n  }\n\n  return this;\n};\n\nOperation.prototype.isDefaultArrayItemValue = function(value, param) {\n  if (param.default && Array.isArray(param.default)) {\n    return param.default.indexOf(value) !== -1;\n  }\n  return value === param.default;\n};\n\nOperation.prototype.getType = function (param) {\n  var type = param.type;\n  var format = param.format;\n  var isArray = false;\n  var str;\n\n  if (type === 'integer' && format === 'int32') {\n    str = 'integer';\n  } else if (type === 'integer' && format === 'int64') {\n    str = 'long';\n  } else if (type === 'integer') {\n    str = 'integer';\n  } else if (type === 'string') {\n    if (format === 'date-time') {\n      str = 'date-time';\n    } else if (format === 'date') {\n      str = 'date';\n    } else {\n      str = 'string';\n    }\n  } else if (type === 'number' && format === 'float') {\n    str = 'float';\n  } else if (type === 'number' && format === 'double') {\n    str = 'double';\n  } else if (type === 'number') {\n    str = 'double';\n  } else if (type === 'boolean') {\n    str = 'boolean';\n  } else if (type === 'array') {\n    isArray = true;\n\n    if (param.items) {\n      str = this.getType(param.items);\n    }\n  } else if (type === 'file') {\n    str = 'file';\n  }\n\n  if (param.$ref) {\n    str = helpers.simpleRef(param.$ref);\n  }\n\n  var schema = param.schema;\n\n  if (schema) {\n    var ref = schema.$ref;\n\n    if (ref) {\n      ref = helpers.simpleRef(ref);\n\n      if (isArray) {\n        return [ ref ];\n      } else {\n        return ref;\n      }\n    } else {\n      // If inline schema, we add it our interal hash -> which gives us it's ID (int)\n      if(schema.type === 'object') {\n        return this.addInlineModel(schema);\n      }\n      return this.getType(schema);\n    }\n  }\n  if (isArray) {\n    return [ str ];\n  } else {\n    return str;\n  }\n};\n\n/**\n * adds an inline schema (model) to a hash, where we can ref it later\n * @param {object} schema a schema\n * @return {number} the ID of the schema being added, or null\n **/\nOperation.prototype.addInlineModel = function (schema) {\n  var len = this.inlineModels.length;\n  var model = this.resolveModel(schema, {});\n  if(model) {\n    this.inlineModels.push(model);\n    return 'Inline Model '+len; // return string ref of the inline model (used with #getInlineModel)\n  }\n  return null; // report errors?\n};\n\n/**\n * gets the internal ref to an inline model\n * @param {string} inline_str a string reference to an inline model\n * @return {Model} the model being referenced. Or null\n **/\nOperation.prototype.getInlineModel = function(inlineStr) {\n  if(/^Inline Model \\d+$/.test(inlineStr)) {\n    var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); //\n    var model = this.inlineModels[id];\n    return model;\n  }\n  // I'm returning null here, should I rather throw an error?\n  return null;\n};\n\nOperation.prototype.resolveModel = function (schema, definitions) {\n  if (typeof schema.$ref !== 'undefined') {\n    var ref = schema.$ref;\n\n    if (ref.indexOf('#/definitions/') === 0) {\n      ref = ref.substring('#/definitions/'.length);\n    }\n\n    if (definitions[ref]) {\n      return new Model(ref, definitions[ref], this.models, this.parent.modelPropertyMacro);\n    }\n  // schema must at least be an object to get resolved to an inline Model\n  } else if (schema && typeof schema === 'object' &&\n            (schema.type === 'object' || _.isUndefined(schema.type))) {\n    return new Model(undefined, schema, this.models, this.parent.modelPropertyMacro);\n  }\n\n  return null;\n};\n\nOperation.prototype.help = function (dontPrint) {\n  var out = this.nickname + ': ' + this.summary + '\\n';\n\n  for (var i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n    var typeInfo = param.signature;\n\n    out += '\\n  * ' + param.name + ' (' + typeInfo + '): ' + param.description;\n  }\n\n  if (typeof dontPrint === 'undefined') {\n    helpers.log(out);\n  }\n\n  return out;\n};\n\nOperation.prototype.getModelSignature = function (type, definitions) {\n  var isPrimitive, listType;\n\n  if (type instanceof Array) {\n    listType = true;\n    type = type[0];\n  }\n\n  // Convert undefined to string of 'undefined'\n  if (typeof type === 'undefined') {\n    type = 'undefined';\n    isPrimitive = true;\n\n  } else if (definitions[type]){\n    // a model def exists?\n    type = definitions[type]; /* Model */\n    isPrimitive = false;\n\n  } else if (this.getInlineModel(type)) {\n    type = this.getInlineModel(type); /* Model */\n    isPrimitive = false;\n\n  } else {\n    // We default to primitive\n    isPrimitive = true;\n  }\n\n  if (isPrimitive) {\n    if (listType) {\n      return 'Array[' + type + ']';\n    } else {\n      return type.toString();\n    }\n  } else {\n    if (listType) {\n      return 'Array[' + type.getMockSignature() + ']';\n    } else {\n      return type.getMockSignature();\n    }\n  }\n};\n\nOperation.prototype.supportHeaderParams = function () {\n  return true;\n};\n\nOperation.prototype.supportedSubmitMethods = function () {\n  return this.parent.supportedSubmitMethods;\n};\n\nOperation.prototype.getHeaderParams = function (args) {\n  var headers = this.setContentTypes(args, {});\n\n  for (var i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n\n    if (typeof args[param.name] !== 'undefined') {\n      if (param.in === 'header') {\n        var value = args[param.name];\n\n        if (Array.isArray(value)) {\n          value = value.toString();\n        }\n\n        headers[param.name] = value;\n      }\n    }\n  }\n\n  return headers;\n};\n\nOperation.prototype.urlify = function (args) {\n  var formParams = {};\n  var requestUrl = this.path;\n  var querystring = ''; // grab params from the args, build the querystring along the way\n\n  for (var i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n\n    if (typeof args[param.name] !== 'undefined') {\n      if (param.in === 'path') {\n        var reg = new RegExp('\\{' + param.name + '\\}', 'gi');\n        var value = args[param.name];\n\n        if (Array.isArray(value)) {\n          value = this.encodePathCollection(param.collectionFormat, param.name, value);\n        } else {\n          value = this.encodePathParam(value);\n        }\n\n        requestUrl = requestUrl.replace(reg, value);\n      } else if (param.in === 'query' && typeof args[param.name] !== 'undefined') {\n        if (querystring === '') {\n          querystring += '?';\n        } else {\n          querystring += '&';\n        }\n\n        if (typeof param.collectionFormat !== 'undefined') {\n          var qp = args[param.name];\n\n          if (Array.isArray(qp)) {\n            querystring += this.encodeQueryCollection(param.collectionFormat, param.name, qp);\n          } else {\n            querystring += this.encodeQueryParam(param.name) + '=' + this.encodeQueryParam(args[param.name]);\n          }\n        } else {\n          querystring += this.encodeQueryParam(param.name) + '=' + this.encodeQueryParam(args[param.name]);\n        }\n      } else if (param.in === 'formData') {\n        formParams[param.name] = args[param.name];\n      }\n    }\n  }\n  var url = this.scheme + '://' + this.host;\n\n  if (this.basePath !== '/') {\n    url += this.basePath;\n  }\n  return url + requestUrl + querystring;\n};\n\nOperation.prototype.getMissingParams = function (args) {\n  var missingParams = []; // check required params, track the ones that are missing\n  var i;\n\n  for (i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n\n    if (param.required === true) {\n      if (typeof args[param.name] === 'undefined') {\n        missingParams = param.name;\n      }\n    }\n  }\n\n  return missingParams;\n};\n\nOperation.prototype.getBody = function (headers, args, opts) {\n  var formParams = {}, hasFormParams, body, key, value, hasBody = false;\n\n  // look at each param and put form params in an object\n  for (var i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n    if (typeof args[param.name] !== 'undefined') {\n      if (param.in === 'body') {\n        body = args[param.name];\n      } else if (param.in === 'formData') {\n        formParams[param.name] = args[param.name];\n        hasFormParams = true;\n      }\n    }\n    else {\n      if(param.in === 'body') {\n        hasBody = true;\n      }\n    }\n  }\n\n  // if body is null and hasBody is true, AND a JSON body is requested, send empty {}\n  if(hasBody && typeof body === 'undefined') {\n    var contentType = headers['Content-Type'];\n    if(contentType && contentType.indexOf('application/json') === 0) {\n      body = '{}';\n    }\n  }\n\n  var isMultiPart = false;\n  if(headers['Content-Type'] && headers['Content-Type'].indexOf('multipart/form-data') >= 0) {\n    isMultiPart = true;\n  }\n\n  // handle form params\n  if (hasFormParams && !isMultiPart) {\n    var encoded = '';\n\n    for (key in formParams) {\n      value = formParams[key];\n\n      if (typeof value !== 'undefined') {\n        if (encoded !== '') {\n          encoded += '&';\n        }\n\n        encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);\n      }\n    }\n\n    body = encoded;\n  } else if (isMultiPart) {\n    if (opts.useJQuery) {\n      var bodyParam = new FormData();\n\n      bodyParam.type = 'formData';\n\n      for (key in formParams) {\n        value = args[key];\n\n        if (typeof value !== 'undefined') {\n          // required for jquery file upload\n          if (value.type === 'file' && value.value) {\n            delete headers['Content-Type'];\n\n            bodyParam.append(key, value.value);\n          } else {\n            bodyParam.append(key, value);\n          }\n        }\n      }\n\n      body = bodyParam;\n    }\n  }\n\n  return body;\n};\n\n/**\n * gets sample response for a single operation\n **/\nOperation.prototype.getModelSampleJSON = function (type, models) {\n  var listType, sampleJson, innerType;\n  models = models || {};\n\n  listType = (type instanceof Array);\n  innerType = listType ? type[0] : type;\n\n  if(models[innerType]) {\n    sampleJson = models[innerType].createJSONSample();\n  } else if (this.getInlineModel(innerType)){\n    sampleJson = this.getInlineModel(innerType).createJSONSample(); // may return null, if type isn't correct\n  }\n\n\n  if (sampleJson) {\n    sampleJson = listType ? [sampleJson] : sampleJson;\n\n    if (typeof sampleJson === 'string') {\n      return sampleJson;\n    } else if (_.isObject(sampleJson)) {\n      var t = sampleJson;\n\n      if (sampleJson instanceof Array && sampleJson.length > 0) {\n        t = sampleJson[0];\n      }\n\n      if (t.nodeName && typeof t === 'Node') {\n        var xmlString = new XMLSerializer().serializeToString(t);\n\n        return this.formatXml(xmlString);\n      } else {\n        return JSON.stringify(sampleJson, null, 2);\n      }\n    } else {\n      return sampleJson;\n    }\n  }\n};\n\n/**\n * legacy binding\n **/\nOperation.prototype.do = function (args, opts, callback, error, parent) {\n  return this.execute(args, opts, callback, error, parent);\n};\n\n/**\n * executes an operation\n **/\nOperation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {\n  var args = arg1 || {};\n  var opts = {}, success, error, deferred;\n\n  if (_.isObject(arg2)) {\n    opts = arg2;\n    success = arg3;\n    error = arg4;\n  }\n\n  if(this.client) {\n    opts.client = this.client;\n  }\n\n  // add the request interceptor from parent, if none sent from client\n  if(!opts.requestInterceptor && this.requestInterceptor ) {\n    opts.requestInterceptor = this.requestInterceptor ;\n  }\n\n  if(!opts.responseInterceptor && this.responseInterceptor) {\n    opts.responseInterceptor = this.responseInterceptor;\n  }\n\n  if (typeof arg2 === 'function') {\n    success = arg2;\n    error = arg3;\n  }\n\n  if (this.parent.usePromise) {\n    deferred = Q.defer();\n  } else {\n    success = (success || this.parent.defaultSuccessCallback || helpers.log);\n    error = (error || this.parent.defaultErrorCallback || helpers.log);\n  }\n\n\n  if (typeof opts.useJQuery === 'undefined') {\n    opts.useJQuery = this.useJQuery;\n  }\n\n  if (typeof opts.enableCookies === 'undefined') {\n    opts.enableCookies = this.enableCookies;\n  }\n\n  var missingParams = this.getMissingParams(args);\n\n  if (missingParams.length > 0) {\n    var message = 'missing required params: ' + missingParams;\n\n    helpers.fail(message);\n\n    if (this.parent.usePromise) {\n      deferred.reject(message);\n      return deferred.promise;\n    } else {\n      error(message, parent);\n      return {};\n    }\n  }\n\n  var allHeaders = this.getHeaderParams(args);\n  var contentTypeHeaders = this.setContentTypes(args, opts);\n  var headers = {}, attrname;\n\n  for (attrname in allHeaders) { headers[attrname] = allHeaders[attrname]; }\n  for (attrname in contentTypeHeaders) { headers[attrname] = contentTypeHeaders[attrname]; }\n\n  var body = this.getBody(contentTypeHeaders, args, opts);\n  var url = this.urlify(args);\n\n  if(url.indexOf('.{format}') > 0) {\n    if(headers) {\n      var format = headers.Accept || headers.accept;\n      if(format && format.indexOf('json') > 0) {\n        url = url.replace('.{format}', '.json');\n      }\n      else if(format && format.indexOf('xml') > 0) {\n        url = url.replace('.{format}', '.xml');\n      }\n    }\n  }\n\n  var obj = {\n    url: url,\n    method: this.method.toUpperCase(),\n    body: body,\n    enableCookies: opts.enableCookies,\n    useJQuery: opts.useJQuery,\n    deferred: deferred,\n    headers: headers,\n    on: {\n      response: function (response) {\n        if (deferred) {\n          deferred.resolve(response);\n          return deferred.promise;\n        } else {\n          return success(response, parent);\n        }\n      },\n      error: function (response) {\n        if (deferred) {\n          deferred.reject(response);\n          return deferred.promise;\n        } else {\n          return error(response, parent);\n        }\n      }\n    }\n  };\n\n  this.clientAuthorizations.apply(obj, this.operation.security);\n  if (opts.mock === true) {\n    return obj;\n  } else {\n    return new SwaggerHttp().execute(obj, opts);\n  }\n};\n\nfunction itemByPriority(col, itemPriority) {\n\n  // No priorities? return first...\n  if(_.isEmpty(itemPriority)) {\n    return col[0];\n  }\n\n  for (var i = 0, len = itemPriority.length; i < len; i++) {\n    if(col.indexOf(itemPriority[i]) > -1) {\n      return itemPriority[i];\n    }\n  }\n\n  // Otherwise return first\n  return col[0];\n}\n\nOperation.prototype.setContentTypes = function (args, opts) {\n  // default type\n  var allDefinedParams = this.parameters;\n  var body;\n  var consumes = args.parameterContentType || itemByPriority(this.consumes, ['application/json', 'application/yaml']);\n  var accepts = opts.responseContentType || itemByPriority(this.produces, ['application/json', 'application/yaml']);\n  var definedFileParams = [];\n  var definedFormParams = [];\n  var headers = {};\n  var i;\n\n  // get params from the operation and set them in definedFileParams, definedFormParams, headers\n  for (i = 0; i < allDefinedParams.length; i++) {\n    var param = allDefinedParams[i];\n\n    if (param.in === 'formData') {\n      if (param.type === 'file') {\n        definedFileParams.push(param);\n      } else {\n        definedFormParams.push(param);\n      }\n    } else if (param.in === 'header' && opts) {\n      var key = param.name;\n      var headerValue = opts[param.name];\n\n      if (typeof opts[param.name] !== 'undefined') {\n        headers[key] = headerValue;\n      }\n    } else if (param.in === 'body' && typeof args[param.name] !== 'undefined') {\n      body = args[param.name];\n    }\n  }\n\n  // if there's a body, need to set the consumes header via requestContentType\n  if (this.method === 'post' || this.method === 'put' || this.method === 'patch' ||\n      ((this.method === 'delete' || this.method === 'get') && body) ) {\n    if (opts.requestContentType) {\n      consumes = opts.requestContentType;\n    }\n    // if any form params, content type must be set\n    if (definedFormParams.length > 0) {\n      if (opts.requestContentType) {             // override if set\n        consumes = opts.requestContentType;\n      } else if (definedFileParams.length > 0) { // if a file, must be multipart/form-data\n        consumes = 'multipart/form-data';\n      } else {                                   // default to x-www-from-urlencoded\n        consumes = 'application/x-www-form-urlencoded';\n      }\n    }\n  }\n  else {\n    consumes = null;\n  }\n\n  if (consumes && this.consumes) {\n    if (this.consumes.indexOf(consumes) === -1) {\n      helpers.log('server doesn\\'t consume ' + consumes + ', try ' + JSON.stringify(this.consumes));\n    }\n  }\n\n  if (!this.matchesAccept(accepts)) {\n    helpers.log('server can\\'t produce ' + accepts);\n  }\n\n  if ((consumes && body !== '') || (consumes === 'application/x-www-form-urlencoded')) {\n    headers['Content-Type'] = consumes;\n  }\n\n  if (accepts) {\n    headers.Accept = accepts;\n  }\n\n  return headers;\n};\n\n/**\n * Returns true if the request accepts header matches anything in this.produces.\n *  If this.produces contains * / *, ignore the accept header.\n * @param {string=} accepts The client request accept header.\n * @return {boolean}\n */\nOperation.prototype.matchesAccept = function(accepts) {\n  // no accepts or produces, no problem!\n  if (!accepts || !this.produces) {\n    return true;\n  }\n  return this.produces.indexOf(accepts) !== -1 || this.produces.indexOf('*/*') !== -1;\n};\n\nOperation.prototype.asCurl = function (args1, args2) {\n  var opts = {mock: true};\n  if (typeof args2 === 'object') {\n    for (var argKey in args2) {\n      opts[argKey] = args2[argKey];\n    }\n  }\n  var obj = this.execute(args1, opts);\n\n  this.clientAuthorizations.apply(obj, this.operation.security);\n\n  var results = [];\n\n  results.push('-X ' + this.method.toUpperCase());\n\n  if (typeof obj.headers !== 'undefined') {\n    var key;\n\n    for (key in obj.headers) {\n      var value = obj.headers[key];\n      if(typeof value === 'string'){\n        value = value.replace(/\\'/g, '\\\\u0027');\n      }\n      results.push('--header \\'' + key + ': ' + value + '\\'');\n    }\n  }\n\n  if (obj.body) {\n    var body;\n\n    if (_.isObject(obj.body)) {\n      body = JSON.stringify(obj.body);\n    } else {\n      body = obj.body;\n    }\n\n    results.push('-d \\'' + body.replace(/\\'/g, '\\\\u0027') + '\\'');\n  }\n\n  return 'curl ' + (results.join(' ')) + ' \\'' + obj.url + '\\'';\n};\n\nOperation.prototype.encodePathCollection = function (type, name, value) {\n  var encoded = '';\n  var i;\n  var separator = '';\n\n  if (type === 'ssv') {\n    separator = '%20';\n  } else if (type === 'tsv') {\n    separator = '\\\\t';\n  } else if (type === 'pipes') {\n    separator = '|';\n  } else {\n    separator = ',';\n  }\n\n  for (i = 0; i < value.length; i++) {\n    if (i === 0) {\n      encoded = this.encodeQueryParam(value[i]);\n    } else {\n      encoded += separator + this.encodeQueryParam(value[i]);\n    }\n  }\n\n  return encoded;\n};\n\nOperation.prototype.encodeQueryCollection = function (type, name, value) {\n  var encoded = '';\n  var i;\n\n  if (type === 'default' || type === 'multi') {\n    for (i = 0; i < value.length; i++) {\n      if (i > 0) {encoded += '&';}\n\n      encoded += this.encodeQueryParam(name) + '=' + this.encodeQueryParam(value[i]);\n    }\n  } else {\n    var separator = '';\n\n    if (type === 'csv') {\n      separator = ',';\n    } else if (type === 'ssv') {\n      separator = '%20';\n    } else if (type === 'tsv') {\n      separator = '\\\\t';\n    } else if (type === 'pipes') {\n      separator = '|';\n    } else if (type === 'brackets') {\n      for (i = 0; i < value.length; i++) {\n        if (i !== 0) {\n          encoded += '&';\n        }\n\n        encoded += this.encodeQueryParam(name) + '[]=' + this.encodeQueryParam(value[i]);\n      }\n    }\n\n    if (separator !== '') {\n      for (i = 0; i < value.length; i++) {\n        if (i === 0) {\n          encoded = this.encodeQueryParam(name) + '=' + this.encodeQueryParam(value[i]);\n        } else {\n          encoded += separator + this.encodeQueryParam(value[i]);\n        }\n      }\n    }\n  }\n\n  return encoded;\n};\n\nOperation.prototype.encodeQueryParam = function (arg) {\n  return encodeURIComponent(arg);\n};\n\n/**\n * TODO revisit, might not want to leave '/'\n **/\nOperation.prototype.encodePathParam = function (pathParam) {\n  return encodeURIComponent(pathParam);\n};\n","'use strict';\n\nvar OperationGroup = module.exports = function (tag, description, externalDocs, operation) {\n  this.description = description;\n  this.externalDocs = externalDocs;\n  this.name = tag;\n  this.operation = operation;\n  this.operationsArray = [];\n  this.path = tag;\n  this.tag = tag;\n};\n\nOperationGroup.prototype.sort = function () {\n\n};\n\n",null,"// shim for using process in browser\n\nvar process = module.exports = {};\nvar queue = [];\nvar draining = false;\n\nfunction drainQueue() {\n    if (draining) {\n        return;\n    }\n    draining = true;\n    var currentQueue;\n    var len = queue.length;\n    while(len) {\n        currentQueue = queue;\n        queue = [];\n        var i = -1;\n        while (++i < len) {\n            currentQueue[i]();\n        }\n        len = queue.length;\n    }\n    draining = false;\n}\nprocess.nextTick = function (fun) {\n    queue.push(fun);\n    if (!draining) {\n        setTimeout(drainQueue, 0);\n    }\n};\n\nprocess.title = 'browser';\nprocess.browser = true;\nprocess.env = {};\nprocess.argv = [];\nprocess.version = ''; // empty string to avoid regexp issues\nprocess.versions = {};\n\nfunction noop() {}\n\nprocess.on = noop;\nprocess.addListener = noop;\nprocess.once = noop;\nprocess.off = noop;\nprocess.removeListener = noop;\nprocess.removeAllListeners = noop;\nprocess.emit = noop;\n\nprocess.binding = function (name) {\n    throw new Error('process.binding is not supported');\n};\n\n// TODO(shtylman)\nprocess.cwd = function () { return '/' };\nprocess.chdir = function (dir) {\n    throw new Error('process.chdir is not supported');\n};\nprocess.umask = function() { return 0; };\n","(function (Buffer){\n(function () {\n  \"use strict\";\n\n  function btoa(str) {\n    var buffer\n      ;\n\n    if (str instanceof Buffer) {\n      buffer = str;\n    } else {\n      buffer = new Buffer(str.toString(), 'binary');\n    }\n\n    return buffer.toString('base64');\n  }\n\n  module.exports = btoa;\n}());\n\n}).call(this,require(\"buffer\").Buffer)\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9idG9hL2luZGV4LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiKGZ1bmN0aW9uICgpIHtcbiAgXCJ1c2Ugc3RyaWN0XCI7XG5cbiAgZnVuY3Rpb24gYnRvYShzdHIpIHtcbiAgICB2YXIgYnVmZmVyXG4gICAgICA7XG5cbiAgICBpZiAoc3RyIGluc3RhbmNlb2YgQnVmZmVyKSB7XG4gICAgICBidWZmZXIgPSBzdHI7XG4gICAgfSBlbHNlIHtcbiAgICAgIGJ1ZmZlciA9IG5ldyBCdWZmZXIoc3RyLnRvU3RyaW5nKCksICdiaW5hcnknKTtcbiAgICB9XG5cbiAgICByZXR1cm4gYnVmZmVyLnRvU3RyaW5nKCdiYXNlNjQnKTtcbiAgfVxuXG4gIG1vZHVsZS5leHBvcnRzID0gYnRvYTtcbn0oKSk7XG4iXX0=","/*!\n * The buffer module from node.js, for the browser.\n *\n * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>\n * @license  MIT\n */\n\nvar base64 = require('base64-js')\nvar ieee754 = require('ieee754')\nvar isArray = require('is-array')\n\nexports.Buffer = Buffer\nexports.SlowBuffer = SlowBuffer\nexports.INSPECT_MAX_BYTES = 50\nBuffer.poolSize = 8192 // not used by this implementation\n\nvar rootParent = {}\n\n/**\n * If `Buffer.TYPED_ARRAY_SUPPORT`:\n *   === true    Use Uint8Array implementation (fastest)\n *   === false   Use Object implementation (most compatible, even IE6)\n *\n * Browsers that support typed arrays are IE 10+, Firefox 4+, Chrome 7+, Safari 5.1+,\n * Opera 11.6+, iOS 4.2+.\n *\n * Due to various browser bugs, sometimes the Object implementation will be used even\n * when the browser supports typed arrays.\n *\n * Note:\n *\n *   - Firefox 4-29 lacks support for adding new properties to `Uint8Array` instances,\n *     See: https://bugzilla.mozilla.org/show_bug.cgi?id=695438.\n *\n *   - Safari 5-7 lacks support for changing the `Object.prototype.constructor` property\n *     on objects.\n *\n *   - Chrome 9-10 is missing the `TypedArray.prototype.subarray` function.\n *\n *   - IE10 has a broken `TypedArray.prototype.subarray` function which returns arrays of\n *     incorrect length in some situations.\n\n * We detect these buggy browsers and set `Buffer.TYPED_ARRAY_SUPPORT` to `false` so they\n * get the Object implementation, which is slower but behaves correctly.\n */\nBuffer.TYPED_ARRAY_SUPPORT = (function () {\n  function Bar () {}\n  try {\n    var arr = new Uint8Array(1)\n    arr.foo = function () { return 42 }\n    arr.constructor = Bar\n    return arr.foo() === 42 && // typed array instances can be augmented\n        arr.constructor === Bar && // constructor can be set\n        typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray`\n        arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray`\n  } catch (e) {\n    return false\n  }\n})()\n\nfunction kMaxLength () {\n  return Buffer.TYPED_ARRAY_SUPPORT\n    ? 0x7fffffff\n    : 0x3fffffff\n}\n\n/**\n * Class: Buffer\n * =============\n *\n * The Buffer constructor returns instances of `Uint8Array` that are augmented\n * with function properties for all the node `Buffer` API functions. We use\n * `Uint8Array` so that square bracket notation works as expected -- it returns\n * a single octet.\n *\n * By augmenting the instances, we can avoid modifying the `Uint8Array`\n * prototype.\n */\nfunction Buffer (arg) {\n  if (!(this instanceof Buffer)) {\n    // Avoid going through an ArgumentsAdaptorTrampoline in the common case.\n    if (arguments.length > 1) return new Buffer(arg, arguments[1])\n    return new Buffer(arg)\n  }\n\n  this.length = 0\n  this.parent = undefined\n\n  // Common case.\n  if (typeof arg === 'number') {\n    return fromNumber(this, arg)\n  }\n\n  // Slightly less common case.\n  if (typeof arg === 'string') {\n    return fromString(this, arg, arguments.length > 1 ? arguments[1] : 'utf8')\n  }\n\n  // Unusual.\n  return fromObject(this, arg)\n}\n\nfunction fromNumber (that, length) {\n  that = allocate(that, length < 0 ? 0 : checked(length) | 0)\n  if (!Buffer.TYPED_ARRAY_SUPPORT) {\n    for (var i = 0; i < length; i++) {\n      that[i] = 0\n    }\n  }\n  return that\n}\n\nfunction fromString (that, string, encoding) {\n  if (typeof encoding !== 'string' || encoding === '') encoding = 'utf8'\n\n  // Assumption: byteLength() return value is always < kMaxLength.\n  var length = byteLength(string, encoding) | 0\n  that = allocate(that, length)\n\n  that.write(string, encoding)\n  return that\n}\n\nfunction fromObject (that, object) {\n  if (Buffer.isBuffer(object)) return fromBuffer(that, object)\n\n  if (isArray(object)) return fromArray(that, object)\n\n  if (object == null) {\n    throw new TypeError('must start with number, buffer, array or string')\n  }\n\n  if (typeof ArrayBuffer !== 'undefined') {\n    if (object.buffer instanceof ArrayBuffer) {\n      return fromTypedArray(that, object)\n    }\n    if (object instanceof ArrayBuffer) {\n      return fromArrayBuffer(that, object)\n    }\n  }\n\n  if (object.length) return fromArrayLike(that, object)\n\n  return fromJsonObject(that, object)\n}\n\nfunction fromBuffer (that, buffer) {\n  var length = checked(buffer.length) | 0\n  that = allocate(that, length)\n  buffer.copy(that, 0, 0, length)\n  return that\n}\n\nfunction fromArray (that, array) {\n  var length = checked(array.length) | 0\n  that = allocate(that, length)\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\n// Duplicate of fromArray() to keep fromArray() monomorphic.\nfunction fromTypedArray (that, array) {\n  var length = checked(array.length) | 0\n  that = allocate(that, length)\n  // Truncating the elements is probably not what people expect from typed\n  // arrays with BYTES_PER_ELEMENT > 1 but it's compatible with the behavior\n  // of the old Buffer constructor.\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\nfunction fromArrayBuffer (that, array) {\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    // Return an augmented `Uint8Array` instance, for best performance\n    array.byteLength\n    that = Buffer._augment(new Uint8Array(array))\n  } else {\n    // Fallback: Return an object instance of the Buffer class\n    that = fromTypedArray(that, new Uint8Array(array))\n  }\n  return that\n}\n\nfunction fromArrayLike (that, array) {\n  var length = checked(array.length) | 0\n  that = allocate(that, length)\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\n// Deserialize { type: 'Buffer', data: [1,2,3,...] } into a Buffer object.\n// Returns a zero-length buffer for inputs that don't conform to the spec.\nfunction fromJsonObject (that, object) {\n  var array\n  var length = 0\n\n  if (object.type === 'Buffer' && isArray(object.data)) {\n    array = object.data\n    length = checked(array.length) | 0\n  }\n  that = allocate(that, length)\n\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\nfunction allocate (that, length) {\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    // Return an augmented `Uint8Array` instance, for best performance\n    that = Buffer._augment(new Uint8Array(length))\n  } else {\n    // Fallback: Return an object instance of the Buffer class\n    that.length = length\n    that._isBuffer = true\n  }\n\n  var fromPool = length !== 0 && length <= Buffer.poolSize >>> 1\n  if (fromPool) that.parent = rootParent\n\n  return that\n}\n\nfunction checked (length) {\n  // Note: cannot use `length < kMaxLength` here because that fails when\n  // length is NaN (which is otherwise coerced to zero.)\n  if (length >= kMaxLength()) {\n    throw new RangeError('Attempt to allocate Buffer larger than maximum ' +\n                         'size: 0x' + kMaxLength().toString(16) + ' bytes')\n  }\n  return length | 0\n}\n\nfunction SlowBuffer (subject, encoding) {\n  if (!(this instanceof SlowBuffer)) return new SlowBuffer(subject, encoding)\n\n  var buf = new Buffer(subject, encoding)\n  delete buf.parent\n  return buf\n}\n\nBuffer.isBuffer = function isBuffer (b) {\n  return !!(b != null && b._isBuffer)\n}\n\nBuffer.compare = function compare (a, b) {\n  if (!Buffer.isBuffer(a) || !Buffer.isBuffer(b)) {\n    throw new TypeError('Arguments must be Buffers')\n  }\n\n  if (a === b) return 0\n\n  var x = a.length\n  var y = b.length\n\n  var i = 0\n  var len = Math.min(x, y)\n  while (i < len) {\n    if (a[i] !== b[i]) break\n\n    ++i\n  }\n\n  if (i !== len) {\n    x = a[i]\n    y = b[i]\n  }\n\n  if (x < y) return -1\n  if (y < x) return 1\n  return 0\n}\n\nBuffer.isEncoding = function isEncoding (encoding) {\n  switch (String(encoding).toLowerCase()) {\n    case 'hex':\n    case 'utf8':\n    case 'utf-8':\n    case 'ascii':\n    case 'binary':\n    case 'base64':\n    case 'raw':\n    case 'ucs2':\n    case 'ucs-2':\n    case 'utf16le':\n    case 'utf-16le':\n      return true\n    default:\n      return false\n  }\n}\n\nBuffer.concat = function concat (list, length) {\n  if (!isArray(list)) throw new TypeError('list argument must be an Array of Buffers.')\n\n  if (list.length === 0) {\n    return new Buffer(0)\n  }\n\n  var i\n  if (length === undefined) {\n    length = 0\n    for (i = 0; i < list.length; i++) {\n      length += list[i].length\n    }\n  }\n\n  var buf = new Buffer(length)\n  var pos = 0\n  for (i = 0; i < list.length; i++) {\n    var item = list[i]\n    item.copy(buf, pos)\n    pos += item.length\n  }\n  return buf\n}\n\nfunction byteLength (string, encoding) {\n  if (typeof string !== 'string') string = '' + string\n\n  var len = string.length\n  if (len === 0) return 0\n\n  // Use a for loop to avoid recursion\n  var loweredCase = false\n  for (;;) {\n    switch (encoding) {\n      case 'ascii':\n      case 'binary':\n      // Deprecated\n      case 'raw':\n      case 'raws':\n        return len\n      case 'utf8':\n      case 'utf-8':\n        return utf8ToBytes(string).length\n      case 'ucs2':\n      case 'ucs-2':\n      case 'utf16le':\n      case 'utf-16le':\n        return len * 2\n      case 'hex':\n        return len >>> 1\n      case 'base64':\n        return base64ToBytes(string).length\n      default:\n        if (loweredCase) return utf8ToBytes(string).length // assume utf8\n        encoding = ('' + encoding).toLowerCase()\n        loweredCase = true\n    }\n  }\n}\nBuffer.byteLength = byteLength\n\n// pre-set for values that may exist in the future\nBuffer.prototype.length = undefined\nBuffer.prototype.parent = undefined\n\nfunction slowToString (encoding, start, end) {\n  var loweredCase = false\n\n  start = start | 0\n  end = end === undefined || end === Infinity ? this.length : end | 0\n\n  if (!encoding) encoding = 'utf8'\n  if (start < 0) start = 0\n  if (end > this.length) end = this.length\n  if (end <= start) return ''\n\n  while (true) {\n    switch (encoding) {\n      case 'hex':\n        return hexSlice(this, start, end)\n\n      case 'utf8':\n      case 'utf-8':\n        return utf8Slice(this, start, end)\n\n      case 'ascii':\n        return asciiSlice(this, start, end)\n\n      case 'binary':\n        return binarySlice(this, start, end)\n\n      case 'base64':\n        return base64Slice(this, start, end)\n\n      case 'ucs2':\n      case 'ucs-2':\n      case 'utf16le':\n      case 'utf-16le':\n        return utf16leSlice(this, start, end)\n\n      default:\n        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding)\n        encoding = (encoding + '').toLowerCase()\n        loweredCase = true\n    }\n  }\n}\n\nBuffer.prototype.toString = function toString () {\n  var length = this.length | 0\n  if (length === 0) return ''\n  if (arguments.length === 0) return utf8Slice(this, 0, length)\n  return slowToString.apply(this, arguments)\n}\n\nBuffer.prototype.equals = function equals (b) {\n  if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer')\n  if (this === b) return true\n  return Buffer.compare(this, b) === 0\n}\n\nBuffer.prototype.inspect = function inspect () {\n  var str = ''\n  var max = exports.INSPECT_MAX_BYTES\n  if (this.length > 0) {\n    str = this.toString('hex', 0, max).match(/.{2}/g).join(' ')\n    if (this.length > max) str += ' ... '\n  }\n  return '<Buffer ' + str + '>'\n}\n\nBuffer.prototype.compare = function compare (b) {\n  if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer')\n  if (this === b) return 0\n  return Buffer.compare(this, b)\n}\n\nBuffer.prototype.indexOf = function indexOf (val, byteOffset) {\n  if (byteOffset > 0x7fffffff) byteOffset = 0x7fffffff\n  else if (byteOffset < -0x80000000) byteOffset = -0x80000000\n  byteOffset >>= 0\n\n  if (this.length === 0) return -1\n  if (byteOffset >= this.length) return -1\n\n  // Negative offsets start from the end of the buffer\n  if (byteOffset < 0) byteOffset = Math.max(this.length + byteOffset, 0)\n\n  if (typeof val === 'string') {\n    if (val.length === 0) return -1 // special case: looking for empty string always fails\n    return String.prototype.indexOf.call(this, val, byteOffset)\n  }\n  if (Buffer.isBuffer(val)) {\n    return arrayIndexOf(this, val, byteOffset)\n  }\n  if (typeof val === 'number') {\n    if (Buffer.TYPED_ARRAY_SUPPORT && Uint8Array.prototype.indexOf === 'function') {\n      return Uint8Array.prototype.indexOf.call(this, val, byteOffset)\n    }\n    return arrayIndexOf(this, [ val ], byteOffset)\n  }\n\n  function arrayIndexOf (arr, val, byteOffset) {\n    var foundIndex = -1\n    for (var i = 0; byteOffset + i < arr.length; i++) {\n      if (arr[byteOffset + i] === val[foundIndex === -1 ? 0 : i - foundIndex]) {\n        if (foundIndex === -1) foundIndex = i\n        if (i - foundIndex + 1 === val.length) return byteOffset + foundIndex\n      } else {\n        foundIndex = -1\n      }\n    }\n    return -1\n  }\n\n  throw new TypeError('val must be string, number or Buffer')\n}\n\n// `get` is deprecated\nBuffer.prototype.get = function get (offset) {\n  console.log('.get() is deprecated. Access using array indexes instead.')\n  return this.readUInt8(offset)\n}\n\n// `set` is deprecated\nBuffer.prototype.set = function set (v, offset) {\n  console.log('.set() is deprecated. Access using array indexes instead.')\n  return this.writeUInt8(v, offset)\n}\n\nfunction hexWrite (buf, string, offset, length) {\n  offset = Number(offset) || 0\n  var remaining = buf.length - offset\n  if (!length) {\n    length = remaining\n  } else {\n    length = Number(length)\n    if (length > remaining) {\n      length = remaining\n    }\n  }\n\n  // must be an even number of digits\n  var strLen = string.length\n  if (strLen % 2 !== 0) throw new Error('Invalid hex string')\n\n  if (length > strLen / 2) {\n    length = strLen / 2\n  }\n  for (var i = 0; i < length; i++) {\n    var parsed = parseInt(string.substr(i * 2, 2), 16)\n    if (isNaN(parsed)) throw new Error('Invalid hex string')\n    buf[offset + i] = parsed\n  }\n  return i\n}\n\nfunction utf8Write (buf, string, offset, length) {\n  return blitBuffer(utf8ToBytes(string, buf.length - offset), buf, offset, length)\n}\n\nfunction asciiWrite (buf, string, offset, length) {\n  return blitBuffer(asciiToBytes(string), buf, offset, length)\n}\n\nfunction binaryWrite (buf, string, offset, length) {\n  return asciiWrite(buf, string, offset, length)\n}\n\nfunction base64Write (buf, string, offset, length) {\n  return blitBuffer(base64ToBytes(string), buf, offset, length)\n}\n\nfunction ucs2Write (buf, string, offset, length) {\n  return blitBuffer(utf16leToBytes(string, buf.length - offset), buf, offset, length)\n}\n\nBuffer.prototype.write = function write (string, offset, length, encoding) {\n  // Buffer#write(string)\n  if (offset === undefined) {\n    encoding = 'utf8'\n    length = this.length\n    offset = 0\n  // Buffer#write(string, encoding)\n  } else if (length === undefined && typeof offset === 'string') {\n    encoding = offset\n    length = this.length\n    offset = 0\n  // Buffer#write(string, offset[, length][, encoding])\n  } else if (isFinite(offset)) {\n    offset = offset | 0\n    if (isFinite(length)) {\n      length = length | 0\n      if (encoding === undefined) encoding = 'utf8'\n    } else {\n      encoding = length\n      length = undefined\n    }\n  // legacy write(string, encoding, offset, length) - remove in v0.13\n  } else {\n    var swap = encoding\n    encoding = offset\n    offset = length | 0\n    length = swap\n  }\n\n  var remaining = this.length - offset\n  if (length === undefined || length > remaining) length = remaining\n\n  if ((string.length > 0 && (length < 0 || offset < 0)) || offset > this.length) {\n    throw new RangeError('attempt to write outside buffer bounds')\n  }\n\n  if (!encoding) encoding = 'utf8'\n\n  var loweredCase = false\n  for (;;) {\n    switch (encoding) {\n      case 'hex':\n        return hexWrite(this, string, offset, length)\n\n      case 'utf8':\n      case 'utf-8':\n        return utf8Write(this, string, offset, length)\n\n      case 'ascii':\n        return asciiWrite(this, string, offset, length)\n\n      case 'binary':\n        return binaryWrite(this, string, offset, length)\n\n      case 'base64':\n        // Warning: maxLength not taken into account in base64Write\n        return base64Write(this, string, offset, length)\n\n      case 'ucs2':\n      case 'ucs-2':\n      case 'utf16le':\n      case 'utf-16le':\n        return ucs2Write(this, string, offset, length)\n\n      default:\n        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding)\n        encoding = ('' + encoding).toLowerCase()\n        loweredCase = true\n    }\n  }\n}\n\nBuffer.prototype.toJSON = function toJSON () {\n  return {\n    type: 'Buffer',\n    data: Array.prototype.slice.call(this._arr || this, 0)\n  }\n}\n\nfunction base64Slice (buf, start, end) {\n  if (start === 0 && end === buf.length) {\n    return base64.fromByteArray(buf)\n  } else {\n    return base64.fromByteArray(buf.slice(start, end))\n  }\n}\n\nfunction utf8Slice (buf, start, end) {\n  end = Math.min(buf.length, end)\n  var res = []\n\n  var i = start\n  while (i < end) {\n    var firstByte = buf[i]\n    var codePoint = null\n    var bytesPerSequence = (firstByte > 0xEF) ? 4\n      : (firstByte > 0xDF) ? 3\n      : (firstByte > 0xBF) ? 2\n      : 1\n\n    if (i + bytesPerSequence <= end) {\n      var secondByte, thirdByte, fourthByte, tempCodePoint\n\n      switch (bytesPerSequence) {\n        case 1:\n          if (firstByte < 0x80) {\n            codePoint = firstByte\n          }\n          break\n        case 2:\n          secondByte = buf[i + 1]\n          if ((secondByte & 0xC0) === 0x80) {\n            tempCodePoint = (firstByte & 0x1F) << 0x6 | (secondByte & 0x3F)\n            if (tempCodePoint > 0x7F) {\n              codePoint = tempCodePoint\n            }\n          }\n          break\n        case 3:\n          secondByte = buf[i + 1]\n          thirdByte = buf[i + 2]\n          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80) {\n            tempCodePoint = (firstByte & 0xF) << 0xC | (secondByte & 0x3F) << 0x6 | (thirdByte & 0x3F)\n            if (tempCodePoint > 0x7FF && (tempCodePoint < 0xD800 || tempCodePoint > 0xDFFF)) {\n              codePoint = tempCodePoint\n            }\n          }\n          break\n        case 4:\n          secondByte = buf[i + 1]\n          thirdByte = buf[i + 2]\n          fourthByte = buf[i + 3]\n          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80 && (fourthByte & 0xC0) === 0x80) {\n            tempCodePoint = (firstByte & 0xF) << 0x12 | (secondByte & 0x3F) << 0xC | (thirdByte & 0x3F) << 0x6 | (fourthByte & 0x3F)\n            if (tempCodePoint > 0xFFFF && tempCodePoint < 0x110000) {\n              codePoint = tempCodePoint\n            }\n          }\n      }\n    }\n\n    if (codePoint === null) {\n      // we did not generate a valid codePoint so insert a\n      // replacement char (U+FFFD) and advance only 1 byte\n      codePoint = 0xFFFD\n      bytesPerSequence = 1\n    } else if (codePoint > 0xFFFF) {\n      // encode to utf16 (surrogate pair dance)\n      codePoint -= 0x10000\n      res.push(codePoint >>> 10 & 0x3FF | 0xD800)\n      codePoint = 0xDC00 | codePoint & 0x3FF\n    }\n\n    res.push(codePoint)\n    i += bytesPerSequence\n  }\n\n  return decodeCodePointsArray(res)\n}\n\n// Based on http://stackoverflow.com/a/22747272/680742, the browser with\n// the lowest limit is Chrome, with 0x10000 args.\n// We go 1 magnitude less, for safety\nvar MAX_ARGUMENTS_LENGTH = 0x1000\n\nfunction decodeCodePointsArray (codePoints) {\n  var len = codePoints.length\n  if (len <= MAX_ARGUMENTS_LENGTH) {\n    return String.fromCharCode.apply(String, codePoints) // avoid extra slice()\n  }\n\n  // Decode in chunks to avoid \"call stack size exceeded\".\n  var res = ''\n  var i = 0\n  while (i < len) {\n    res += String.fromCharCode.apply(\n      String,\n      codePoints.slice(i, i += MAX_ARGUMENTS_LENGTH)\n    )\n  }\n  return res\n}\n\nfunction asciiSlice (buf, start, end) {\n  var ret = ''\n  end = Math.min(buf.length, end)\n\n  for (var i = start; i < end; i++) {\n    ret += String.fromCharCode(buf[i] & 0x7F)\n  }\n  return ret\n}\n\nfunction binarySlice (buf, start, end) {\n  var ret = ''\n  end = Math.min(buf.length, end)\n\n  for (var i = start; i < end; i++) {\n    ret += String.fromCharCode(buf[i])\n  }\n  return ret\n}\n\nfunction hexSlice (buf, start, end) {\n  var len = buf.length\n\n  if (!start || start < 0) start = 0\n  if (!end || end < 0 || end > len) end = len\n\n  var out = ''\n  for (var i = start; i < end; i++) {\n    out += toHex(buf[i])\n  }\n  return out\n}\n\nfunction utf16leSlice (buf, start, end) {\n  var bytes = buf.slice(start, end)\n  var res = ''\n  for (var i = 0; i < bytes.length; i += 2) {\n    res += String.fromCharCode(bytes[i] + bytes[i + 1] * 256)\n  }\n  return res\n}\n\nBuffer.prototype.slice = function slice (start, end) {\n  var len = this.length\n  start = ~~start\n  end = end === undefined ? len : ~~end\n\n  if (start < 0) {\n    start += len\n    if (start < 0) start = 0\n  } else if (start > len) {\n    start = len\n  }\n\n  if (end < 0) {\n    end += len\n    if (end < 0) end = 0\n  } else if (end > len) {\n    end = len\n  }\n\n  if (end < start) end = start\n\n  var newBuf\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    newBuf = Buffer._augment(this.subarray(start, end))\n  } else {\n    var sliceLen = end - start\n    newBuf = new Buffer(sliceLen, undefined)\n    for (var i = 0; i < sliceLen; i++) {\n      newBuf[i] = this[i + start]\n    }\n  }\n\n  if (newBuf.length) newBuf.parent = this.parent || this\n\n  return newBuf\n}\n\n/*\n * Need to make sure that buffer isn't trying to write out of bounds.\n */\nfunction checkOffset (offset, ext, length) {\n  if ((offset % 1) !== 0 || offset < 0) throw new RangeError('offset is not uint')\n  if (offset + ext > length) throw new RangeError('Trying to access beyond buffer length')\n}\n\nBuffer.prototype.readUIntLE = function readUIntLE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkOffset(offset, byteLength, this.length)\n\n  var val = this[offset]\n  var mul = 1\n  var i = 0\n  while (++i < byteLength && (mul *= 0x100)) {\n    val += this[offset + i] * mul\n  }\n\n  return val\n}\n\nBuffer.prototype.readUIntBE = function readUIntBE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) {\n    checkOffset(offset, byteLength, this.length)\n  }\n\n  var val = this[offset + --byteLength]\n  var mul = 1\n  while (byteLength > 0 && (mul *= 0x100)) {\n    val += this[offset + --byteLength] * mul\n  }\n\n  return val\n}\n\nBuffer.prototype.readUInt8 = function readUInt8 (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 1, this.length)\n  return this[offset]\n}\n\nBuffer.prototype.readUInt16LE = function readUInt16LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  return this[offset] | (this[offset + 1] << 8)\n}\n\nBuffer.prototype.readUInt16BE = function readUInt16BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  return (this[offset] << 8) | this[offset + 1]\n}\n\nBuffer.prototype.readUInt32LE = function readUInt32LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return ((this[offset]) |\n      (this[offset + 1] << 8) |\n      (this[offset + 2] << 16)) +\n      (this[offset + 3] * 0x1000000)\n}\n\nBuffer.prototype.readUInt32BE = function readUInt32BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return (this[offset] * 0x1000000) +\n    ((this[offset + 1] << 16) |\n    (this[offset + 2] << 8) |\n    this[offset + 3])\n}\n\nBuffer.prototype.readIntLE = function readIntLE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkOffset(offset, byteLength, this.length)\n\n  var val = this[offset]\n  var mul = 1\n  var i = 0\n  while (++i < byteLength && (mul *= 0x100)) {\n    val += this[offset + i] * mul\n  }\n  mul *= 0x80\n\n  if (val >= mul) val -= Math.pow(2, 8 * byteLength)\n\n  return val\n}\n\nBuffer.prototype.readIntBE = function readIntBE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkOffset(offset, byteLength, this.length)\n\n  var i = byteLength\n  var mul = 1\n  var val = this[offset + --i]\n  while (i > 0 && (mul *= 0x100)) {\n    val += this[offset + --i] * mul\n  }\n  mul *= 0x80\n\n  if (val >= mul) val -= Math.pow(2, 8 * byteLength)\n\n  return val\n}\n\nBuffer.prototype.readInt8 = function readInt8 (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 1, this.length)\n  if (!(this[offset] & 0x80)) return (this[offset])\n  return ((0xff - this[offset] + 1) * -1)\n}\n\nBuffer.prototype.readInt16LE = function readInt16LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  var val = this[offset] | (this[offset + 1] << 8)\n  return (val & 0x8000) ? val | 0xFFFF0000 : val\n}\n\nBuffer.prototype.readInt16BE = function readInt16BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  var val = this[offset + 1] | (this[offset] << 8)\n  return (val & 0x8000) ? val | 0xFFFF0000 : val\n}\n\nBuffer.prototype.readInt32LE = function readInt32LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return (this[offset]) |\n    (this[offset + 1] << 8) |\n    (this[offset + 2] << 16) |\n    (this[offset + 3] << 24)\n}\n\nBuffer.prototype.readInt32BE = function readInt32BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return (this[offset] << 24) |\n    (this[offset + 1] << 16) |\n    (this[offset + 2] << 8) |\n    (this[offset + 3])\n}\n\nBuffer.prototype.readFloatLE = function readFloatLE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n  return ieee754.read(this, offset, true, 23, 4)\n}\n\nBuffer.prototype.readFloatBE = function readFloatBE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n  return ieee754.read(this, offset, false, 23, 4)\n}\n\nBuffer.prototype.readDoubleLE = function readDoubleLE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 8, this.length)\n  return ieee754.read(this, offset, true, 52, 8)\n}\n\nBuffer.prototype.readDoubleBE = function readDoubleBE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 8, this.length)\n  return ieee754.read(this, offset, false, 52, 8)\n}\n\nfunction checkInt (buf, value, offset, ext, max, min) {\n  if (!Buffer.isBuffer(buf)) throw new TypeError('buffer must be a Buffer instance')\n  if (value > max || value < min) throw new RangeError('value is out of bounds')\n  if (offset + ext > buf.length) throw new RangeError('index out of range')\n}\n\nBuffer.prototype.writeUIntLE = function writeUIntLE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkInt(this, value, offset, byteLength, Math.pow(2, 8 * byteLength), 0)\n\n  var mul = 1\n  var i = 0\n  this[offset] = value & 0xFF\n  while (++i < byteLength && (mul *= 0x100)) {\n    this[offset + i] = (value / mul) & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeUIntBE = function writeUIntBE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkInt(this, value, offset, byteLength, Math.pow(2, 8 * byteLength), 0)\n\n  var i = byteLength - 1\n  var mul = 1\n  this[offset + i] = value & 0xFF\n  while (--i >= 0 && (mul *= 0x100)) {\n    this[offset + i] = (value / mul) & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 1, 0xff, 0)\n  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value)\n  this[offset] = value\n  return offset + 1\n}\n\nfunction objectWriteUInt16 (buf, value, offset, littleEndian) {\n  if (value < 0) value = 0xffff + value + 1\n  for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; i++) {\n    buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>>\n      (littleEndian ? i : 1 - i) * 8\n  }\n}\n\nBuffer.prototype.writeUInt16LE = function writeUInt16LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = value\n    this[offset + 1] = (value >>> 8)\n  } else {\n    objectWriteUInt16(this, value, offset, true)\n  }\n  return offset + 2\n}\n\nBuffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 8)\n    this[offset + 1] = value\n  } else {\n    objectWriteUInt16(this, value, offset, false)\n  }\n  return offset + 2\n}\n\nfunction objectWriteUInt32 (buf, value, offset, littleEndian) {\n  if (value < 0) value = 0xffffffff + value + 1\n  for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; i++) {\n    buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff\n  }\n}\n\nBuffer.prototype.writeUInt32LE = function writeUInt32LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset + 3] = (value >>> 24)\n    this[offset + 2] = (value >>> 16)\n    this[offset + 1] = (value >>> 8)\n    this[offset] = value\n  } else {\n    objectWriteUInt32(this, value, offset, true)\n  }\n  return offset + 4\n}\n\nBuffer.prototype.writeUInt32BE = function writeUInt32BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 24)\n    this[offset + 1] = (value >>> 16)\n    this[offset + 2] = (value >>> 8)\n    this[offset + 3] = value\n  } else {\n    objectWriteUInt32(this, value, offset, false)\n  }\n  return offset + 4\n}\n\nBuffer.prototype.writeIntLE = function writeIntLE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) {\n    var limit = Math.pow(2, 8 * byteLength - 1)\n\n    checkInt(this, value, offset, byteLength, limit - 1, -limit)\n  }\n\n  var i = 0\n  var mul = 1\n  var sub = value < 0 ? 1 : 0\n  this[offset] = value & 0xFF\n  while (++i < byteLength && (mul *= 0x100)) {\n    this[offset + i] = ((value / mul) >> 0) - sub & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeIntBE = function writeIntBE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) {\n    var limit = Math.pow(2, 8 * byteLength - 1)\n\n    checkInt(this, value, offset, byteLength, limit - 1, -limit)\n  }\n\n  var i = byteLength - 1\n  var mul = 1\n  var sub = value < 0 ? 1 : 0\n  this[offset + i] = value & 0xFF\n  while (--i >= 0 && (mul *= 0x100)) {\n    this[offset + i] = ((value / mul) >> 0) - sub & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeInt8 = function writeInt8 (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 1, 0x7f, -0x80)\n  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value)\n  if (value < 0) value = 0xff + value + 1\n  this[offset] = value\n  return offset + 1\n}\n\nBuffer.prototype.writeInt16LE = function writeInt16LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = value\n    this[offset + 1] = (value >>> 8)\n  } else {\n    objectWriteUInt16(this, value, offset, true)\n  }\n  return offset + 2\n}\n\nBuffer.prototype.writeInt16BE = function writeInt16BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 8)\n    this[offset + 1] = value\n  } else {\n    objectWriteUInt16(this, value, offset, false)\n  }\n  return offset + 2\n}\n\nBuffer.prototype.writeInt32LE = function writeInt32LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = value\n    this[offset + 1] = (value >>> 8)\n    this[offset + 2] = (value >>> 16)\n    this[offset + 3] = (value >>> 24)\n  } else {\n    objectWriteUInt32(this, value, offset, true)\n  }\n  return offset + 4\n}\n\nBuffer.prototype.writeInt32BE = function writeInt32BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000)\n  if (value < 0) value = 0xffffffff + value + 1\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 24)\n    this[offset + 1] = (value >>> 16)\n    this[offset + 2] = (value >>> 8)\n    this[offset + 3] = value\n  } else {\n    objectWriteUInt32(this, value, offset, false)\n  }\n  return offset + 4\n}\n\nfunction checkIEEE754 (buf, value, offset, ext, max, min) {\n  if (value > max || value < min) throw new RangeError('value is out of bounds')\n  if (offset + ext > buf.length) throw new RangeError('index out of range')\n  if (offset < 0) throw new RangeError('index out of range')\n}\n\nfunction writeFloat (buf, value, offset, littleEndian, noAssert) {\n  if (!noAssert) {\n    checkIEEE754(buf, value, offset, 4, 3.4028234663852886e+38, -3.4028234663852886e+38)\n  }\n  ieee754.write(buf, value, offset, littleEndian, 23, 4)\n  return offset + 4\n}\n\nBuffer.prototype.writeFloatLE = function writeFloatLE (value, offset, noAssert) {\n  return writeFloat(this, value, offset, true, noAssert)\n}\n\nBuffer.prototype.writeFloatBE = function writeFloatBE (value, offset, noAssert) {\n  return writeFloat(this, value, offset, false, noAssert)\n}\n\nfunction writeDouble (buf, value, offset, littleEndian, noAssert) {\n  if (!noAssert) {\n    checkIEEE754(buf, value, offset, 8, 1.7976931348623157E+308, -1.7976931348623157E+308)\n  }\n  ieee754.write(buf, value, offset, littleEndian, 52, 8)\n  return offset + 8\n}\n\nBuffer.prototype.writeDoubleLE = function writeDoubleLE (value, offset, noAssert) {\n  return writeDouble(this, value, offset, true, noAssert)\n}\n\nBuffer.prototype.writeDoubleBE = function writeDoubleBE (value, offset, noAssert) {\n  return writeDouble(this, value, offset, false, noAssert)\n}\n\n// copy(targetBuffer, targetStart=0, sourceStart=0, sourceEnd=buffer.length)\nBuffer.prototype.copy = function copy (target, targetStart, start, end) {\n  if (!start) start = 0\n  if (!end && end !== 0) end = this.length\n  if (targetStart >= target.length) targetStart = target.length\n  if (!targetStart) targetStart = 0\n  if (end > 0 && end < start) end = start\n\n  // Copy 0 bytes; we're done\n  if (end === start) return 0\n  if (target.length === 0 || this.length === 0) return 0\n\n  // Fatal error conditions\n  if (targetStart < 0) {\n    throw new RangeError('targetStart out of bounds')\n  }\n  if (start < 0 || start >= this.length) throw new RangeError('sourceStart out of bounds')\n  if (end < 0) throw new RangeError('sourceEnd out of bounds')\n\n  // Are we oob?\n  if (end > this.length) end = this.length\n  if (target.length - targetStart < end - start) {\n    end = target.length - targetStart + start\n  }\n\n  var len = end - start\n  var i\n\n  if (this === target && start < targetStart && targetStart < end) {\n    // descending copy from end\n    for (i = len - 1; i >= 0; i--) {\n      target[i + targetStart] = this[i + start]\n    }\n  } else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) {\n    // ascending copy from start\n    for (i = 0; i < len; i++) {\n      target[i + targetStart] = this[i + start]\n    }\n  } else {\n    target._set(this.subarray(start, start + len), targetStart)\n  }\n\n  return len\n}\n\n// fill(value, start=0, end=buffer.length)\nBuffer.prototype.fill = function fill (value, start, end) {\n  if (!value) value = 0\n  if (!start) start = 0\n  if (!end) end = this.length\n\n  if (end < start) throw new RangeError('end < start')\n\n  // Fill 0 bytes; we're done\n  if (end === start) return\n  if (this.length === 0) return\n\n  if (start < 0 || start >= this.length) throw new RangeError('start out of bounds')\n  if (end < 0 || end > this.length) throw new RangeError('end out of bounds')\n\n  var i\n  if (typeof value === 'number') {\n    for (i = start; i < end; i++) {\n      this[i] = value\n    }\n  } else {\n    var bytes = utf8ToBytes(value.toString())\n    var len = bytes.length\n    for (i = start; i < end; i++) {\n      this[i] = bytes[i % len]\n    }\n  }\n\n  return this\n}\n\n/**\n * Creates a new `ArrayBuffer` with the *copied* memory of the buffer instance.\n * Added in Node 0.12. Only available in browsers that support ArrayBuffer.\n */\nBuffer.prototype.toArrayBuffer = function toArrayBuffer () {\n  if (typeof Uint8Array !== 'undefined') {\n    if (Buffer.TYPED_ARRAY_SUPPORT) {\n      return (new Buffer(this)).buffer\n    } else {\n      var buf = new Uint8Array(this.length)\n      for (var i = 0, len = buf.length; i < len; i += 1) {\n        buf[i] = this[i]\n      }\n      return buf.buffer\n    }\n  } else {\n    throw new TypeError('Buffer.toArrayBuffer not supported in this browser')\n  }\n}\n\n// HELPER FUNCTIONS\n// ================\n\nvar BP = Buffer.prototype\n\n/**\n * Augment a Uint8Array *instance* (not the Uint8Array class!) with Buffer methods\n */\nBuffer._augment = function _augment (arr) {\n  arr.constructor = Buffer\n  arr._isBuffer = true\n\n  // save reference to original Uint8Array set method before overwriting\n  arr._set = arr.set\n\n  // deprecated\n  arr.get = BP.get\n  arr.set = BP.set\n\n  arr.write = BP.write\n  arr.toString = BP.toString\n  arr.toLocaleString = BP.toString\n  arr.toJSON = BP.toJSON\n  arr.equals = BP.equals\n  arr.compare = BP.compare\n  arr.indexOf = BP.indexOf\n  arr.copy = BP.copy\n  arr.slice = BP.slice\n  arr.readUIntLE = BP.readUIntLE\n  arr.readUIntBE = BP.readUIntBE\n  arr.readUInt8 = BP.readUInt8\n  arr.readUInt16LE = BP.readUInt16LE\n  arr.readUInt16BE = BP.readUInt16BE\n  arr.readUInt32LE = BP.readUInt32LE\n  arr.readUInt32BE = BP.readUInt32BE\n  arr.readIntLE = BP.readIntLE\n  arr.readIntBE = BP.readIntBE\n  arr.readInt8 = BP.readInt8\n  arr.readInt16LE = BP.readInt16LE\n  arr.readInt16BE = BP.readInt16BE\n  arr.readInt32LE = BP.readInt32LE\n  arr.readInt32BE = BP.readInt32BE\n  arr.readFloatLE = BP.readFloatLE\n  arr.readFloatBE = BP.readFloatBE\n  arr.readDoubleLE = BP.readDoubleLE\n  arr.readDoubleBE = BP.readDoubleBE\n  arr.writeUInt8 = BP.writeUInt8\n  arr.writeUIntLE = BP.writeUIntLE\n  arr.writeUIntBE = BP.writeUIntBE\n  arr.writeUInt16LE = BP.writeUInt16LE\n  arr.writeUInt16BE = BP.writeUInt16BE\n  arr.writeUInt32LE = BP.writeUInt32LE\n  arr.writeUInt32BE = BP.writeUInt32BE\n  arr.writeIntLE = BP.writeIntLE\n  arr.writeIntBE = BP.writeIntBE\n  arr.writeInt8 = BP.writeInt8\n  arr.writeInt16LE = BP.writeInt16LE\n  arr.writeInt16BE = BP.writeInt16BE\n  arr.writeInt32LE = BP.writeInt32LE\n  arr.writeInt32BE = BP.writeInt32BE\n  arr.writeFloatLE = BP.writeFloatLE\n  arr.writeFloatBE = BP.writeFloatBE\n  arr.writeDoubleLE = BP.writeDoubleLE\n  arr.writeDoubleBE = BP.writeDoubleBE\n  arr.fill = BP.fill\n  arr.inspect = BP.inspect\n  arr.toArrayBuffer = BP.toArrayBuffer\n\n  return arr\n}\n\nvar INVALID_BASE64_RE = /[^+\\/0-9A-Za-z-_]/g\n\nfunction base64clean (str) {\n  // Node strips out invalid characters like \\n and \\t from the string, base64-js does not\n  str = stringtrim(str).replace(INVALID_BASE64_RE, '')\n  // Node converts strings with length < 2 to ''\n  if (str.length < 2) return ''\n  // Node allows for non-padded base64 strings (missing trailing ===), base64-js does not\n  while (str.length % 4 !== 0) {\n    str = str + '='\n  }\n  return str\n}\n\nfunction stringtrim (str) {\n  if (str.trim) return str.trim()\n  return str.replace(/^\\s+|\\s+$/g, '')\n}\n\nfunction toHex (n) {\n  if (n < 16) return '0' + n.toString(16)\n  return n.toString(16)\n}\n\nfunction utf8ToBytes (string, units) {\n  units = units || Infinity\n  var codePoint\n  var length = string.length\n  var leadSurrogate = null\n  var bytes = []\n\n  for (var i = 0; i < length; i++) {\n    codePoint = string.charCodeAt(i)\n\n    // is surrogate component\n    if (codePoint > 0xD7FF && codePoint < 0xE000) {\n      // last char was a lead\n      if (!leadSurrogate) {\n        // no lead yet\n        if (codePoint > 0xDBFF) {\n          // unexpected trail\n          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n          continue\n        } else if (i + 1 === length) {\n          // unpaired lead\n          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n          continue\n        }\n\n        // valid lead\n        leadSurrogate = codePoint\n\n        continue\n      }\n\n      // 2 leads in a row\n      if (codePoint < 0xDC00) {\n        if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n        leadSurrogate = codePoint\n        continue\n      }\n\n      // valid surrogate pair\n      codePoint = leadSurrogate - 0xD800 << 10 | codePoint - 0xDC00 | 0x10000\n    } else if (leadSurrogate) {\n      // valid bmp char, but last char was a lead\n      if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n    }\n\n    leadSurrogate = null\n\n    // encode utf8\n    if (codePoint < 0x80) {\n      if ((units -= 1) < 0) break\n      bytes.push(codePoint)\n    } else if (codePoint < 0x800) {\n      if ((units -= 2) < 0) break\n      bytes.push(\n        codePoint >> 0x6 | 0xC0,\n        codePoint & 0x3F | 0x80\n      )\n    } else if (codePoint < 0x10000) {\n      if ((units -= 3) < 0) break\n      bytes.push(\n        codePoint >> 0xC | 0xE0,\n        codePoint >> 0x6 & 0x3F | 0x80,\n        codePoint & 0x3F | 0x80\n      )\n    } else if (codePoint < 0x110000) {\n      if ((units -= 4) < 0) break\n      bytes.push(\n        codePoint >> 0x12 | 0xF0,\n        codePoint >> 0xC & 0x3F | 0x80,\n        codePoint >> 0x6 & 0x3F | 0x80,\n        codePoint & 0x3F | 0x80\n      )\n    } else {\n      throw new Error('Invalid code point')\n    }\n  }\n\n  return bytes\n}\n\nfunction asciiToBytes (str) {\n  var byteArray = []\n  for (var i = 0; i < str.length; i++) {\n    // Node's code seems to be doing this and not & 0x7F..\n    byteArray.push(str.charCodeAt(i) & 0xFF)\n  }\n  return byteArray\n}\n\nfunction utf16leToBytes (str, units) {\n  var c, hi, lo\n  var byteArray = []\n  for (var i = 0; i < str.length; i++) {\n    if ((units -= 2) < 0) break\n\n    c = str.charCodeAt(i)\n    hi = c >> 8\n    lo = c % 256\n    byteArray.push(lo)\n    byteArray.push(hi)\n  }\n\n  return byteArray\n}\n\nfunction base64ToBytes (str) {\n  return base64.toByteArray(base64clean(str))\n}\n\nfunction blitBuffer (src, dst, offset, length) {\n  for (var i = 0; i < length; i++) {\n    if ((i + offset >= dst.length) || (i >= src.length)) break\n    dst[i + offset] = src[i]\n  }\n  return i\n}\n","var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';\n\n;(function (exports) {\n\t'use strict';\n\n  var Arr = (typeof Uint8Array !== 'undefined')\n    ? Uint8Array\n    : Array\n\n\tvar PLUS   = '+'.charCodeAt(0)\n\tvar SLASH  = '/'.charCodeAt(0)\n\tvar NUMBER = '0'.charCodeAt(0)\n\tvar LOWER  = 'a'.charCodeAt(0)\n\tvar UPPER  = 'A'.charCodeAt(0)\n\tvar PLUS_URL_SAFE = '-'.charCodeAt(0)\n\tvar SLASH_URL_SAFE = '_'.charCodeAt(0)\n\n\tfunction decode (elt) {\n\t\tvar code = elt.charCodeAt(0)\n\t\tif (code === PLUS ||\n\t\t    code === PLUS_URL_SAFE)\n\t\t\treturn 62 // '+'\n\t\tif (code === SLASH ||\n\t\t    code === SLASH_URL_SAFE)\n\t\t\treturn 63 // '/'\n\t\tif (code < NUMBER)\n\t\t\treturn -1 //no match\n\t\tif (code < NUMBER + 10)\n\t\t\treturn code - NUMBER + 26 + 26\n\t\tif (code < UPPER + 26)\n\t\t\treturn code - UPPER\n\t\tif (code < LOWER + 26)\n\t\t\treturn code - LOWER + 26\n\t}\n\n\tfunction b64ToByteArray (b64) {\n\t\tvar i, j, l, tmp, placeHolders, arr\n\n\t\tif (b64.length % 4 > 0) {\n\t\t\tthrow new Error('Invalid string. Length must be a multiple of 4')\n\t\t}\n\n\t\t// the number of equal signs (place holders)\n\t\t// if there are two placeholders, than the two characters before it\n\t\t// represent one byte\n\t\t// if there is only one, then the three characters before it represent 2 bytes\n\t\t// this is just a cheap hack to not do indexOf twice\n\t\tvar len = b64.length\n\t\tplaceHolders = '=' === b64.charAt(len - 2) ? 2 : '=' === b64.charAt(len - 1) ? 1 : 0\n\n\t\t// base64 is 4/3 + up to two characters of the original data\n\t\tarr = new Arr(b64.length * 3 / 4 - placeHolders)\n\n\t\t// if there are placeholders, only get up to the last complete 4 chars\n\t\tl = placeHolders > 0 ? b64.length - 4 : b64.length\n\n\t\tvar L = 0\n\n\t\tfunction push (v) {\n\t\t\tarr[L++] = v\n\t\t}\n\n\t\tfor (i = 0, j = 0; i < l; i += 4, j += 3) {\n\t\t\ttmp = (decode(b64.charAt(i)) << 18) | (decode(b64.charAt(i + 1)) << 12) | (decode(b64.charAt(i + 2)) << 6) | decode(b64.charAt(i + 3))\n\t\t\tpush((tmp & 0xFF0000) >> 16)\n\t\t\tpush((tmp & 0xFF00) >> 8)\n\t\t\tpush(tmp & 0xFF)\n\t\t}\n\n\t\tif (placeHolders === 2) {\n\t\t\ttmp = (decode(b64.charAt(i)) << 2) | (decode(b64.charAt(i + 1)) >> 4)\n\t\t\tpush(tmp & 0xFF)\n\t\t} else if (placeHolders === 1) {\n\t\t\ttmp = (decode(b64.charAt(i)) << 10) | (decode(b64.charAt(i + 1)) << 4) | (decode(b64.charAt(i + 2)) >> 2)\n\t\t\tpush((tmp >> 8) & 0xFF)\n\t\t\tpush(tmp & 0xFF)\n\t\t}\n\n\t\treturn arr\n\t}\n\n\tfunction uint8ToBase64 (uint8) {\n\t\tvar i,\n\t\t\textraBytes = uint8.length % 3, // if we have 1 byte left, pad 2 bytes\n\t\t\toutput = \"\",\n\t\t\ttemp, length\n\n\t\tfunction encode (num) {\n\t\t\treturn lookup.charAt(num)\n\t\t}\n\n\t\tfunction tripletToBase64 (num) {\n\t\t\treturn encode(num >> 18 & 0x3F) + encode(num >> 12 & 0x3F) + encode(num >> 6 & 0x3F) + encode(num & 0x3F)\n\t\t}\n\n\t\t// go through the array every three bytes, we'll deal with trailing stuff later\n\t\tfor (i = 0, length = uint8.length - extraBytes; i < length; i += 3) {\n\t\t\ttemp = (uint8[i] << 16) + (uint8[i + 1] << 8) + (uint8[i + 2])\n\t\t\toutput += tripletToBase64(temp)\n\t\t}\n\n\t\t// pad the end with zeros, but make sure to not forget the extra bytes\n\t\tswitch (extraBytes) {\n\t\t\tcase 1:\n\t\t\t\ttemp = uint8[uint8.length - 1]\n\t\t\t\toutput += encode(temp >> 2)\n\t\t\t\toutput += encode((temp << 4) & 0x3F)\n\t\t\t\toutput += '=='\n\t\t\t\tbreak\n\t\t\tcase 2:\n\t\t\t\ttemp = (uint8[uint8.length - 2] << 8) + (uint8[uint8.length - 1])\n\t\t\t\toutput += encode(temp >> 10)\n\t\t\t\toutput += encode((temp >> 4) & 0x3F)\n\t\t\t\toutput += encode((temp << 2) & 0x3F)\n\t\t\t\toutput += '='\n\t\t\t\tbreak\n\t\t}\n\n\t\treturn output\n\t}\n\n\texports.toByteArray = b64ToByteArray\n\texports.fromByteArray = uint8ToBase64\n}(typeof exports === 'undefined' ? (this.base64js = {}) : exports))\n","exports.read = function (buffer, offset, isLE, mLen, nBytes) {\n  var e, m\n  var eLen = nBytes * 8 - mLen - 1\n  var eMax = (1 << eLen) - 1\n  var eBias = eMax >> 1\n  var nBits = -7\n  var i = isLE ? (nBytes - 1) : 0\n  var d = isLE ? -1 : 1\n  var s = buffer[offset + i]\n\n  i += d\n\n  e = s & ((1 << (-nBits)) - 1)\n  s >>= (-nBits)\n  nBits += eLen\n  for (; nBits > 0; e = e * 256 + buffer[offset + i], i += d, nBits -= 8) {}\n\n  m = e & ((1 << (-nBits)) - 1)\n  e >>= (-nBits)\n  nBits += mLen\n  for (; nBits > 0; m = m * 256 + buffer[offset + i], i += d, nBits -= 8) {}\n\n  if (e === 0) {\n    e = 1 - eBias\n  } else if (e === eMax) {\n    return m ? NaN : ((s ? -1 : 1) * Infinity)\n  } else {\n    m = m + Math.pow(2, mLen)\n    e = e - eBias\n  }\n  return (s ? -1 : 1) * m * Math.pow(2, e - mLen)\n}\n\nexports.write = function (buffer, value, offset, isLE, mLen, nBytes) {\n  var e, m, c\n  var eLen = nBytes * 8 - mLen - 1\n  var eMax = (1 << eLen) - 1\n  var eBias = eMax >> 1\n  var rt = (mLen === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0)\n  var i = isLE ? 0 : (nBytes - 1)\n  var d = isLE ? 1 : -1\n  var s = value < 0 || (value === 0 && 1 / value < 0) ? 1 : 0\n\n  value = Math.abs(value)\n\n  if (isNaN(value) || value === Infinity) {\n    m = isNaN(value) ? 1 : 0\n    e = eMax\n  } else {\n    e = Math.floor(Math.log(value) / Math.LN2)\n    if (value * (c = Math.pow(2, -e)) < 1) {\n      e--\n      c *= 2\n    }\n    if (e + eBias >= 1) {\n      value += rt / c\n    } else {\n      value += rt * Math.pow(2, 1 - eBias)\n    }\n    if (value * c >= 2) {\n      e++\n      c /= 2\n    }\n\n    if (e + eBias >= eMax) {\n      m = 0\n      e = eMax\n    } else if (e + eBias >= 1) {\n      m = (value * c - 1) * Math.pow(2, mLen)\n      e = e + eBias\n    } else {\n      m = value * Math.pow(2, eBias - 1) * Math.pow(2, mLen)\n      e = 0\n    }\n  }\n\n  for (; mLen >= 8; buffer[offset + i] = m & 0xff, i += d, m /= 256, mLen -= 8) {}\n\n  e = (e << mLen) | m\n  eLen += mLen\n  for (; eLen > 0; buffer[offset + i] = e & 0xff, i += d, e /= 256, eLen -= 8) {}\n\n  buffer[offset + i - d] |= s * 128\n}\n","\n/**\n * isArray\n */\n\nvar isArray = Array.isArray;\n\n/**\n * toString\n */\n\nvar str = Object.prototype.toString;\n\n/**\n * Whether or not the given `val`\n * is an array.\n *\n * example:\n *\n *        isArray([]);\n *        // > true\n *        isArray(arguments);\n *        // > false\n *        isArray('');\n *        // > false\n *\n * @param {mixed} val\n * @return {bool}\n */\n\nmodule.exports = isArray || function (val) {\n  return !! val && '[object Array]' == str.call(val);\n};\n","/* jshint node: true */\n(function () {\n    \"use strict\";\n\n    function CookieAccessInfo(domain, path, secure, script) {\n        if (this instanceof CookieAccessInfo) {\n            this.domain = domain || undefined;\n            this.path = path || \"/\";\n            this.secure = !!secure;\n            this.script = !!script;\n            return this;\n        }\n        return new CookieAccessInfo(domain, path, secure, script);\n    }\n    exports.CookieAccessInfo = CookieAccessInfo;\n\n    function Cookie(cookiestr, request_domain, request_path) {\n        if (cookiestr instanceof Cookie) {\n            return cookiestr;\n        }\n        if (this instanceof Cookie) {\n            this.name = null;\n            this.value = null;\n            this.expiration_date = Infinity;\n            this.path = String(request_path || \"/\");\n            this.explicit_path = false;\n            this.domain = request_domain || null;\n            this.explicit_domain = false;\n            this.secure = false; //how to define default?\n            this.noscript = false; //httponly\n            if (cookiestr) {\n                this.parse(cookiestr, request_domain, request_path);\n            }\n            return this;\n        }\n        return new Cookie(cookiestr, request_domain, request_path);\n    }\n    exports.Cookie = Cookie;\n\n    Cookie.prototype.toString = function toString() {\n        var str = [this.name + \"=\" + this.value];\n        if (this.expiration_date !== Infinity) {\n            str.push(\"expires=\" + (new Date(this.expiration_date)).toGMTString());\n        }\n        if (this.domain) {\n            str.push(\"domain=\" + this.domain);\n        }\n        if (this.path) {\n            str.push(\"path=\" + this.path);\n        }\n        if (this.secure) {\n            str.push(\"secure\");\n        }\n        if (this.noscript) {\n            str.push(\"httponly\");\n        }\n        return str.join(\"; \");\n    };\n\n    Cookie.prototype.toValueString = function toValueString() {\n        return this.name + \"=\" + this.value;\n    };\n\n    var cookie_str_splitter = /[:](?=\\s*[a-zA-Z0-9_\\-]+\\s*[=])/g;\n    Cookie.prototype.parse = function parse(str, request_domain, request_path) {\n        if (this instanceof Cookie) {\n            var parts = str.split(\";\").filter(function (value) {\n                    return !!value;\n                }),\n                pair = parts[0].match(/([^=]+)=([\\s\\S]*)/),\n                key = pair[1],\n                value = pair[2],\n                i;\n            this.name = key;\n            this.value = value;\n\n            for (i = 1; i < parts.length; i += 1) {\n                pair = parts[i].match(/([^=]+)(?:=([\\s\\S]*))?/);\n                key = pair[1].trim().toLowerCase();\n                value = pair[2];\n                switch (key) {\n                case \"httponly\":\n                    this.noscript = true;\n                    break;\n                case \"expires\":\n                    this.expiration_date = value ?\n                            Number(Date.parse(value)) :\n                            Infinity;\n                    break;\n                case \"path\":\n                    this.path = value ?\n                            value.trim() :\n                            \"\";\n                    this.explicit_path = true;\n                    break;\n                case \"domain\":\n                    this.domain = value ?\n                            value.trim() :\n                            \"\";\n                    this.explicit_domain = !!this.domain;\n                    break;\n                case \"secure\":\n                    this.secure = true;\n                    break;\n                }\n            }\n\n            if (!this.explicit_path) {\n               this.path = request_path || \"/\";\n            }\n            if (!this.explicit_domain) {\n               this.domain = request_domain;\n            }\n\n            return this;\n        }\n        return new Cookie().parse(str, request_domain, request_path);\n    };\n\n    Cookie.prototype.matches = function matches(access_info) {\n        if (this.noscript && access_info.script ||\n                this.secure && !access_info.secure ||\n                !this.collidesWith(access_info)) {\n            return false;\n        }\n        return true;\n    };\n\n    Cookie.prototype.collidesWith = function collidesWith(access_info) {\n        if ((this.path && !access_info.path) || (this.domain && !access_info.domain)) {\n            return false;\n        }\n        if (this.path && access_info.path.indexOf(this.path) !== 0) {\n            return false;\n        }\n        if (this.explicit_path && access_info.path.indexOf( this.path ) !== 0) {\n           return false;\n        }\n        var access_domain = access_info.domain && access_info.domain.replace(/^[\\.]/,'');\n        var cookie_domain = this.domain && this.domain.replace(/^[\\.]/,'');\n        if (cookie_domain === access_domain) {\n            return true;\n        }\n        if (cookie_domain) {\n            if (!this.explicit_domain) {\n                return false; // we already checked if the domains were exactly the same\n            }\n            var wildcard = access_domain.indexOf(cookie_domain);\n            if (wildcard === -1 || wildcard !== access_domain.length - cookie_domain.length) {\n                return false;\n            }\n            return true;\n        }\n        return true;\n    };\n\n    function CookieJar() {\n        var cookies, cookies_list, collidable_cookie;\n        if (this instanceof CookieJar) {\n            cookies = Object.create(null); //name: [Cookie]\n\n            this.setCookie = function setCookie(cookie, request_domain, request_path) {\n                var remove, i;\n                cookie = new Cookie(cookie, request_domain, request_path);\n                //Delete the cookie if the set is past the current time\n                remove = cookie.expiration_date <= Date.now();\n                if (cookies[cookie.name] !== undefined) {\n                    cookies_list = cookies[cookie.name];\n                    for (i = 0; i < cookies_list.length; i += 1) {\n                        collidable_cookie = cookies_list[i];\n                        if (collidable_cookie.collidesWith(cookie)) {\n                            if (remove) {\n                                cookies_list.splice(i, 1);\n                                if (cookies_list.length === 0) {\n                                    delete cookies[cookie.name];\n                                }\n                                return false;\n                            }\n                            cookies_list[i] = cookie;\n                            return cookie;\n                        }\n                    }\n                    if (remove) {\n                        return false;\n                    }\n                    cookies_list.push(cookie);\n                    return cookie;\n                }\n                if (remove) {\n                    return false;\n                }\n                cookies[cookie.name] = [cookie];\n                return cookies[cookie.name];\n            };\n            //returns a cookie\n            this.getCookie = function getCookie(cookie_name, access_info) {\n                var cookie, i;\n                cookies_list = cookies[cookie_name];\n                if (!cookies_list) {\n                    return;\n                }\n                for (i = 0; i < cookies_list.length; i += 1) {\n                    cookie = cookies_list[i];\n                    if (cookie.expiration_date <= Date.now()) {\n                        if (cookies_list.length === 0) {\n                            delete cookies[cookie.name];\n                        }\n                        continue;\n                    }\n\n                    if (cookie.matches(access_info)) {\n                        return cookie;\n                    }\n                }\n            };\n            //returns a list of cookies\n            this.getCookies = function getCookies(access_info) {\n                var matches = [], cookie_name, cookie;\n                for (cookie_name in cookies) {\n                    cookie = this.getCookie(cookie_name, access_info);\n                    if (cookie) {\n                        matches.push(cookie);\n                    }\n                }\n                matches.toString = function toString() {\n                    return matches.join(\":\");\n                };\n                matches.toValueString = function toValueString() {\n                    return matches.map(function (c) {\n                        return c.toValueString();\n                    }).join(';');\n                };\n                return matches;\n            };\n\n            return this;\n        }\n        return new CookieJar();\n    }\n    exports.CookieJar = CookieJar;\n\n    //returns list of cookies that were set correctly. Cookies that are expired and removed are not returned.\n    CookieJar.prototype.setCookies = function setCookies(cookies, request_domain, request_path) {\n        cookies = Array.isArray(cookies) ?\n                cookies :\n                cookies.split(cookie_str_splitter);\n        var successful = [],\n            i,\n            cookie;\n        cookies = cookies.map(function(item){\n            return new Cookie(item, request_domain, request_path);\n        });\n        for (i = 0; i < cookies.length; i += 1) {\n            cookie = cookies[i];\n            if (this.setCookie(cookie, request_domain, request_path)) {\n                successful.push(cookie);\n            }\n        }\n        return successful;\n    };\n}());\n","'use strict';\n\n\nvar yaml = require('./lib/js-yaml.js');\n\n\nmodule.exports = yaml;\n","'use strict';\n\n\nvar loader = require('./js-yaml/loader');\nvar dumper = require('./js-yaml/dumper');\n\n\nfunction deprecated(name) {\n  return function () {\n    throw new Error('Function ' + name + ' is deprecated and cannot be used.');\n  };\n}\n\n\nmodule.exports.Type                = require('./js-yaml/type');\nmodule.exports.Schema              = require('./js-yaml/schema');\nmodule.exports.FAILSAFE_SCHEMA     = require('./js-yaml/schema/failsafe');\nmodule.exports.JSON_SCHEMA         = require('./js-yaml/schema/json');\nmodule.exports.CORE_SCHEMA         = require('./js-yaml/schema/core');\nmodule.exports.DEFAULT_SAFE_SCHEMA = require('./js-yaml/schema/default_safe');\nmodule.exports.DEFAULT_FULL_SCHEMA = require('./js-yaml/schema/default_full');\nmodule.exports.load                = loader.load;\nmodule.exports.loadAll             = loader.loadAll;\nmodule.exports.safeLoad            = loader.safeLoad;\nmodule.exports.safeLoadAll         = loader.safeLoadAll;\nmodule.exports.dump                = dumper.dump;\nmodule.exports.safeDump            = dumper.safeDump;\nmodule.exports.YAMLException       = require('./js-yaml/exception');\n\n// Deprecated schema names from JS-YAML 2.0.x\nmodule.exports.MINIMAL_SCHEMA = require('./js-yaml/schema/failsafe');\nmodule.exports.SAFE_SCHEMA    = require('./js-yaml/schema/default_safe');\nmodule.exports.DEFAULT_SCHEMA = require('./js-yaml/schema/default_full');\n\n// Deprecated functions from JS-YAML 1.x.x\nmodule.exports.scan           = deprecated('scan');\nmodule.exports.parse          = deprecated('parse');\nmodule.exports.compose        = deprecated('compose');\nmodule.exports.addConstructor = deprecated('addConstructor');\n","'use strict';\n\n\nfunction isNothing(subject) {\n  return (typeof subject === 'undefined') || (null === subject);\n}\n\n\nfunction isObject(subject) {\n  return (typeof subject === 'object') && (null !== subject);\n}\n\n\nfunction toArray(sequence) {\n  if (Array.isArray(sequence)) {\n    return sequence;\n  } else if (isNothing(sequence)) {\n    return [];\n  }\n  return [ sequence ];\n}\n\n\nfunction extend(target, source) {\n  var index, length, key, sourceKeys;\n\n  if (source) {\n    sourceKeys = Object.keys(source);\n\n    for (index = 0, length = sourceKeys.length; index < length; index += 1) {\n      key = sourceKeys[index];\n      target[key] = source[key];\n    }\n  }\n\n  return target;\n}\n\n\nfunction repeat(string, count) {\n  var result = '', cycle;\n\n  for (cycle = 0; cycle < count; cycle += 1) {\n    result += string;\n  }\n\n  return result;\n}\n\n\nfunction isNegativeZero(number) {\n  return (0 === number) && (Number.NEGATIVE_INFINITY === 1 / number);\n}\n\n\nmodule.exports.isNothing      = isNothing;\nmodule.exports.isObject       = isObject;\nmodule.exports.toArray        = toArray;\nmodule.exports.repeat         = repeat;\nmodule.exports.isNegativeZero = isNegativeZero;\nmodule.exports.extend         = extend;\n","'use strict';\n\n/*eslint-disable no-use-before-define*/\n\nvar common              = require('./common');\nvar YAMLException       = require('./exception');\nvar DEFAULT_FULL_SCHEMA = require('./schema/default_full');\nvar DEFAULT_SAFE_SCHEMA = require('./schema/default_safe');\n\nvar _toString       = Object.prototype.toString;\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\n\nvar CHAR_TAB                  = 0x09; /* Tab */\nvar CHAR_LINE_FEED            = 0x0A; /* LF */\nvar CHAR_CARRIAGE_RETURN      = 0x0D; /* CR */\nvar CHAR_SPACE                = 0x20; /* Space */\nvar CHAR_EXCLAMATION          = 0x21; /* ! */\nvar CHAR_DOUBLE_QUOTE         = 0x22; /* \" */\nvar CHAR_SHARP                = 0x23; /* # */\nvar CHAR_PERCENT              = 0x25; /* % */\nvar CHAR_AMPERSAND            = 0x26; /* & */\nvar CHAR_SINGLE_QUOTE         = 0x27; /* ' */\nvar CHAR_ASTERISK             = 0x2A; /* * */\nvar CHAR_COMMA                = 0x2C; /* , */\nvar CHAR_MINUS                = 0x2D; /* - */\nvar CHAR_COLON                = 0x3A; /* : */\nvar CHAR_GREATER_THAN         = 0x3E; /* > */\nvar CHAR_QUESTION             = 0x3F; /* ? */\nvar CHAR_COMMERCIAL_AT        = 0x40; /* @ */\nvar CHAR_LEFT_SQUARE_BRACKET  = 0x5B; /* [ */\nvar CHAR_RIGHT_SQUARE_BRACKET = 0x5D; /* ] */\nvar CHAR_GRAVE_ACCENT         = 0x60; /* ` */\nvar CHAR_LEFT_CURLY_BRACKET   = 0x7B; /* { */\nvar CHAR_VERTICAL_LINE        = 0x7C; /* | */\nvar CHAR_RIGHT_CURLY_BRACKET  = 0x7D; /* } */\n\nvar ESCAPE_SEQUENCES = {};\n\nESCAPE_SEQUENCES[0x00]   = '\\\\0';\nESCAPE_SEQUENCES[0x07]   = '\\\\a';\nESCAPE_SEQUENCES[0x08]   = '\\\\b';\nESCAPE_SEQUENCES[0x09]   = '\\\\t';\nESCAPE_SEQUENCES[0x0A]   = '\\\\n';\nESCAPE_SEQUENCES[0x0B]   = '\\\\v';\nESCAPE_SEQUENCES[0x0C]   = '\\\\f';\nESCAPE_SEQUENCES[0x0D]   = '\\\\r';\nESCAPE_SEQUENCES[0x1B]   = '\\\\e';\nESCAPE_SEQUENCES[0x22]   = '\\\\\"';\nESCAPE_SEQUENCES[0x5C]   = '\\\\\\\\';\nESCAPE_SEQUENCES[0x85]   = '\\\\N';\nESCAPE_SEQUENCES[0xA0]   = '\\\\_';\nESCAPE_SEQUENCES[0x2028] = '\\\\L';\nESCAPE_SEQUENCES[0x2029] = '\\\\P';\n\nvar DEPRECATED_BOOLEANS_SYNTAX = [\n  'y', 'Y', 'yes', 'Yes', 'YES', 'on', 'On', 'ON',\n  'n', 'N', 'no', 'No', 'NO', 'off', 'Off', 'OFF'\n];\n\nfunction compileStyleMap(schema, map) {\n  var result, keys, index, length, tag, style, type;\n\n  if (null === map) {\n    return {};\n  }\n\n  result = {};\n  keys = Object.keys(map);\n\n  for (index = 0, length = keys.length; index < length; index += 1) {\n    tag = keys[index];\n    style = String(map[tag]);\n\n    if ('!!' === tag.slice(0, 2)) {\n      tag = 'tag:yaml.org,2002:' + tag.slice(2);\n    }\n\n    type = schema.compiledTypeMap[tag];\n\n    if (type && _hasOwnProperty.call(type.styleAliases, style)) {\n      style = type.styleAliases[style];\n    }\n\n    result[tag] = style;\n  }\n\n  return result;\n}\n\nfunction encodeHex(character) {\n  var string, handle, length;\n\n  string = character.toString(16).toUpperCase();\n\n  if (character <= 0xFF) {\n    handle = 'x';\n    length = 2;\n  } else if (character <= 0xFFFF) {\n    handle = 'u';\n    length = 4;\n  } else if (character <= 0xFFFFFFFF) {\n    handle = 'U';\n    length = 8;\n  } else {\n    throw new YAMLException('code point within a string may not be greater than 0xFFFFFFFF');\n  }\n\n  return '\\\\' + handle + common.repeat('0', length - string.length) + string;\n}\n\nfunction State(options) {\n  this.schema      = options['schema'] || DEFAULT_FULL_SCHEMA;\n  this.indent      = Math.max(1, (options['indent'] || 2));\n  this.skipInvalid = options['skipInvalid'] || false;\n  this.flowLevel   = (common.isNothing(options['flowLevel']) ? -1 : options['flowLevel']);\n  this.styleMap    = compileStyleMap(this.schema, options['styles'] || null);\n  this.sortKeys    = options['sortKeys'] || false;\n  this.lineWidth    = options['lineWidth'] || 80;\n\n  this.implicitTypes = this.schema.compiledImplicit;\n  this.explicitTypes = this.schema.compiledExplicit;\n\n  this.tag = null;\n  this.result = '';\n\n  this.duplicates = [];\n  this.usedDuplicates = null;\n}\n\nfunction indentString(string, spaces) {\n  var ind = common.repeat(' ', spaces),\n      position = 0,\n      next = -1,\n      result = '',\n      line,\n      length = string.length;\n\n  while (position < length) {\n    next = string.indexOf('\\n', position);\n    if (next === -1) {\n      line = string.slice(position);\n      position = length;\n    } else {\n      line = string.slice(position, next + 1);\n      position = next + 1;\n    }\n    if (line.length && line !== '\\n') {\n      result += ind;\n    }\n    result += line;\n  }\n\n  return result;\n}\n\nfunction generateNextLine(state, level) {\n  return '\\n' + common.repeat(' ', state.indent * level);\n}\n\nfunction testImplicitResolving(state, str) {\n  var index, length, type;\n\n  for (index = 0, length = state.implicitTypes.length; index < length; index += 1) {\n    type = state.implicitTypes[index];\n\n    if (type.resolve(str)) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nfunction StringBuilder(source) {\n  this.source = source;\n  this.result = '';\n  this.checkpoint = 0;\n}\n\nStringBuilder.prototype.takeUpTo = function (position) {\n  var er;\n\n  if (position < this.checkpoint) {\n    er = new Error('position should be > checkpoint');\n    er.position = position;\n    er.checkpoint = this.checkpoint;\n    throw er;\n  }\n\n  this.result += this.source.slice(this.checkpoint, position);\n  this.checkpoint = position;\n  return this;\n};\n\nStringBuilder.prototype.escapeChar = function () {\n  var character, esc;\n\n  character = this.source.charCodeAt(this.checkpoint);\n  esc = ESCAPE_SEQUENCES[character] || encodeHex(character);\n  this.result += esc;\n  this.checkpoint += 1;\n\n  return this;\n};\n\nStringBuilder.prototype.finish = function () {\n  if (this.source.length > this.checkpoint) {\n    this.takeUpTo(this.source.length);\n  }\n};\n\nfunction writeScalar(state, object, level, iskey) {\n  var simple, first, spaceWrap, folded, literal, single, double,\n      sawLineFeed, linePosition, longestLine, indent, max, character,\n      position, escapeSeq, hexEsc, previous, lineLength, modifier,\n      trailingLineBreaks, result;\n\n  if (0 === object.length) {\n    state.dump = \"''\";\n    return;\n  }\n\n  if (-1 !== DEPRECATED_BOOLEANS_SYNTAX.indexOf(object)) {\n    state.dump = \"'\" + object + \"'\";\n    return;\n  }\n\n  simple = true;\n  first = object.length ? object.charCodeAt(0) : 0;\n  spaceWrap = (CHAR_SPACE === first ||\n               CHAR_SPACE === object.charCodeAt(object.length - 1));\n\n  // Simplified check for restricted first characters\n  // http://www.yaml.org/spec/1.2/spec.html#ns-plain-first%28c%29\n  if (CHAR_MINUS         === first ||\n      CHAR_QUESTION      === first ||\n      CHAR_COMMERCIAL_AT === first ||\n      CHAR_GRAVE_ACCENT  === first) {\n    simple = false;\n  }\n\n  // can only use > and | if not wrapped in spaces or is not a key.\n  if (spaceWrap) {\n    simple = false;\n    folded = false;\n    literal = false;\n  } else {\n    folded = !iskey;\n    literal = !iskey;\n  }\n\n  single = true;\n  double = new StringBuilder(object);\n\n  sawLineFeed = false;\n  linePosition = 0;\n  longestLine = 0;\n\n  indent = state.indent * level;\n  max = state.lineWidth;\n  if (max === -1) {\n    // Replace -1 with biggest ingeger number according to\n    // http://ecma262-5.com/ELS5_HTML.htm#Section_8.5\n    max = 9007199254740991;\n  }\n\n  if (indent < 40) {\n    max -= indent;\n  } else {\n    max = 40;\n  }\n\n  for (position = 0; position < object.length; position++) {\n    character = object.charCodeAt(position);\n    if (simple) {\n      // Characters that can never appear in the simple scalar\n      if (!simpleChar(character)) {\n        simple = false;\n      } else {\n        // Still simple.  If we make it all the way through like\n        // this, then we can just dump the string as-is.\n        continue;\n      }\n    }\n\n    if (single && character === CHAR_SINGLE_QUOTE) {\n      single = false;\n    }\n\n    escapeSeq = ESCAPE_SEQUENCES[character];\n    hexEsc = needsHexEscape(character);\n\n    if (!escapeSeq && !hexEsc) {\n      continue;\n    }\n\n    if (character !== CHAR_LINE_FEED &&\n        character !== CHAR_DOUBLE_QUOTE &&\n        character !== CHAR_SINGLE_QUOTE) {\n      folded = false;\n      literal = false;\n    } else if (character === CHAR_LINE_FEED) {\n      sawLineFeed = true;\n      single = false;\n      if (position > 0) {\n        previous = object.charCodeAt(position - 1);\n        if (previous === CHAR_SPACE) {\n          literal = false;\n          folded = false;\n        }\n      }\n      if (folded) {\n        lineLength = position - linePosition;\n        linePosition = position;\n        if (lineLength > longestLine) {\n          longestLine = lineLength;\n        }\n      }\n    }\n\n    if (character !== CHAR_DOUBLE_QUOTE) {\n      single = false;\n    }\n\n    double.takeUpTo(position);\n    double.escapeChar();\n  }\n\n  if (simple && testImplicitResolving(state, object)) {\n    simple = false;\n  }\n\n  modifier = '';\n  if (folded || literal) {\n    trailingLineBreaks = 0;\n    if (object.charCodeAt(object.length - 1) === CHAR_LINE_FEED) {\n      trailingLineBreaks += 1;\n      if (object.charCodeAt(object.length - 2) === CHAR_LINE_FEED) {\n        trailingLineBreaks += 1;\n      }\n    }\n\n    if (trailingLineBreaks === 0) {\n      modifier = '-';\n    } else if (trailingLineBreaks === 2) {\n      modifier = '+';\n    }\n  }\n\n  if (literal && longestLine < max) {\n    folded = false;\n  }\n\n  // If it's literally one line, then don't bother with the literal.\n  // We may still want to do a fold, though, if it's a super long line.\n  if (!sawLineFeed) {\n    literal = false;\n  }\n\n  if (simple) {\n    state.dump = object;\n  } else if (single) {\n    state.dump = '\\'' + object + '\\'';\n  } else if (folded) {\n    result = fold(object, max);\n    state.dump = '>' + modifier + '\\n' + indentString(result, indent);\n  } else if (literal) {\n    if (!modifier) {\n      object = object.replace(/\\n$/, '');\n    }\n    state.dump = '|' + modifier + '\\n' + indentString(object, indent);\n  } else if (double) {\n    double.finish();\n    state.dump = '\"' + double.result + '\"';\n  } else {\n    throw new Error('Failed to dump scalar value');\n  }\n\n  return;\n}\n\n// The `trailing` var is a regexp match of any trailing `\\n` characters.\n//\n// There are three cases we care about:\n//\n// 1. One trailing `\\n` on the string.  Just use `|` or `>`.\n//    This is the assumed default. (trailing = null)\n// 2. No trailing `\\n` on the string.  Use `|-` or `>-` to \"chomp\" the end.\n// 3. More than one trailing `\\n` on the string.  Use `|+` or `>+`.\n//\n// In the case of `>+`, these line breaks are *not* doubled (like the line\n// breaks within the string), so it's important to only end with the exact\n// same number as we started.\nfunction fold(object, max) {\n  var result = '',\n      position = 0,\n      length = object.length,\n      trailing = /\\n+$/.exec(object),\n      newLine;\n\n  if (trailing) {\n    length = trailing.index + 1;\n  }\n\n  while (position < length) {\n    newLine = object.indexOf('\\n', position);\n    if (newLine > length || newLine === -1) {\n      if (result) {\n        result += '\\n\\n';\n      }\n      result += foldLine(object.slice(position, length), max);\n      position = length;\n    } else {\n      if (result) {\n        result += '\\n\\n';\n      }\n      result += foldLine(object.slice(position, newLine), max);\n      position = newLine + 1;\n    }\n  }\n  if (trailing && trailing[0] !== '\\n') {\n    result += trailing[0];\n  }\n\n  return result;\n}\n\nfunction foldLine(line, max) {\n  if (line === '') {\n    return line;\n  }\n\n  var foldRe = /[^\\s] [^\\s]/g,\n      result = '',\n      prevMatch = 0,\n      foldStart = 0,\n      match = foldRe.exec(line),\n      index,\n      foldEnd,\n      folded;\n\n  while (match) {\n    index = match.index;\n\n    // when we cross the max len, if the previous match would've\n    // been ok, use that one, and carry on.  If there was no previous\n    // match on this fold section, then just have a long line.\n    if (index - foldStart > max) {\n      if (prevMatch !== foldStart) {\n        foldEnd = prevMatch;\n      } else {\n        foldEnd = index;\n      }\n\n      if (result) {\n        result += '\\n';\n      }\n      folded = line.slice(foldStart, foldEnd);\n      result += folded;\n      foldStart = foldEnd + 1;\n    }\n    prevMatch = index + 1;\n    match = foldRe.exec(line);\n  }\n\n  if (result) {\n    result += '\\n';\n  }\n\n  // if we end up with one last word at the end, then the last bit might\n  // be slightly bigger than we wanted, because we exited out of the loop.\n  if (foldStart !== prevMatch && line.length - foldStart > max) {\n    result += line.slice(foldStart, prevMatch) + '\\n' +\n              line.slice(prevMatch + 1);\n  } else {\n    result += line.slice(foldStart);\n  }\n\n  return result;\n}\n\n// Returns true if character can be found in a simple scalar\nfunction simpleChar(character) {\n  return CHAR_TAB                  !== character &&\n         CHAR_LINE_FEED            !== character &&\n         CHAR_CARRIAGE_RETURN      !== character &&\n         CHAR_COMMA                !== character &&\n         CHAR_LEFT_SQUARE_BRACKET  !== character &&\n         CHAR_RIGHT_SQUARE_BRACKET !== character &&\n         CHAR_LEFT_CURLY_BRACKET   !== character &&\n         CHAR_RIGHT_CURLY_BRACKET  !== character &&\n         CHAR_SHARP                !== character &&\n         CHAR_AMPERSAND            !== character &&\n         CHAR_ASTERISK             !== character &&\n         CHAR_EXCLAMATION          !== character &&\n         CHAR_VERTICAL_LINE        !== character &&\n         CHAR_GREATER_THAN         !== character &&\n         CHAR_SINGLE_QUOTE         !== character &&\n         CHAR_DOUBLE_QUOTE         !== character &&\n         CHAR_PERCENT              !== character &&\n         CHAR_COLON                !== character &&\n         !ESCAPE_SEQUENCES[character]            &&\n         !needsHexEscape(character);\n}\n\n// Returns true if the character code needs to be escaped.\nfunction needsHexEscape(character) {\n  return !((0x00020 <= character && character <= 0x00007E) ||\n           (0x00085 === character)                         ||\n           (0x000A0 <= character && character <= 0x00D7FF) ||\n           (0x0E000 <= character && character <= 0x00FFFD) ||\n           (0x10000 <= character && character <= 0x10FFFF));\n}\n\nfunction writeFlowSequence(state, level, object) {\n  var _result = '',\n      _tag    = state.tag,\n      index,\n      length;\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    // Write only valid elements.\n    if (writeNode(state, level, object[index], false, false)) {\n      if (0 !== index) {\n        _result += ', ';\n      }\n      _result += state.dump;\n    }\n  }\n\n  state.tag = _tag;\n  state.dump = '[' + _result + ']';\n}\n\nfunction writeBlockSequence(state, level, object, compact) {\n  var _result = '',\n      _tag    = state.tag,\n      index,\n      length;\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    // Write only valid elements.\n    if (writeNode(state, level + 1, object[index], true, true)) {\n      if (!compact || 0 !== index) {\n        _result += generateNextLine(state, level);\n      }\n      _result += '- ' + state.dump;\n    }\n  }\n\n  state.tag = _tag;\n  state.dump = _result || '[]'; // Empty sequence if no valid values.\n}\n\nfunction writeFlowMapping(state, level, object) {\n  var _result       = '',\n      _tag          = state.tag,\n      objectKeyList = Object.keys(object),\n      index,\n      length,\n      objectKey,\n      objectValue,\n      pairBuffer;\n\n  for (index = 0, length = objectKeyList.length; index < length; index += 1) {\n    pairBuffer = '';\n\n    if (0 !== index) {\n      pairBuffer += ', ';\n    }\n\n    objectKey = objectKeyList[index];\n    objectValue = object[objectKey];\n\n    if (!writeNode(state, level, objectKey, false, false)) {\n      continue; // Skip this pair because of invalid key;\n    }\n\n    if (state.dump.length > 1024) {\n      pairBuffer += '? ';\n    }\n\n    pairBuffer += state.dump + ': ';\n\n    if (!writeNode(state, level, objectValue, false, false)) {\n      continue; // Skip this pair because of invalid value.\n    }\n\n    pairBuffer += state.dump;\n\n    // Both key and value are valid.\n    _result += pairBuffer;\n  }\n\n  state.tag = _tag;\n  state.dump = '{' + _result + '}';\n}\n\nfunction writeBlockMapping(state, level, object, compact) {\n  var _result       = '',\n      _tag          = state.tag,\n      objectKeyList = Object.keys(object),\n      index,\n      length,\n      objectKey,\n      objectValue,\n      explicitPair,\n      pairBuffer;\n\n  // Allow sorting keys so that the output file is deterministic\n  if (state.sortKeys === true) {\n    // Default sorting\n    objectKeyList.sort();\n  } else if (typeof state.sortKeys === 'function') {\n    // Custom sort function\n    objectKeyList.sort(state.sortKeys);\n  } else if (state.sortKeys) {\n    // Something is wrong\n    throw new YAMLException('sortKeys must be a boolean or a function');\n  }\n\n  for (index = 0, length = objectKeyList.length; index < length; index += 1) {\n    pairBuffer = '';\n\n    if (!compact || 0 !== index) {\n      pairBuffer += generateNextLine(state, level);\n    }\n\n    objectKey = objectKeyList[index];\n    objectValue = object[objectKey];\n\n    if (!writeNode(state, level + 1, objectKey, true, true, true)) {\n      continue; // Skip this pair because of invalid key.\n    }\n\n    explicitPair = (null !== state.tag && '?' !== state.tag) ||\n                   (state.dump && state.dump.length > 1024);\n\n    if (explicitPair) {\n      if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {\n        pairBuffer += '?';\n      } else {\n        pairBuffer += '? ';\n      }\n    }\n\n    pairBuffer += state.dump;\n\n    if (explicitPair) {\n      pairBuffer += generateNextLine(state, level);\n    }\n\n    if (!writeNode(state, level + 1, objectValue, true, explicitPair)) {\n      continue; // Skip this pair because of invalid value.\n    }\n\n    if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {\n      pairBuffer += ':';\n    } else {\n      pairBuffer += ': ';\n    }\n\n    pairBuffer += state.dump;\n\n    // Both key and value are valid.\n    _result += pairBuffer;\n  }\n\n  state.tag = _tag;\n  state.dump = _result || '{}'; // Empty mapping if no valid pairs.\n}\n\nfunction detectType(state, object, explicit) {\n  var _result, typeList, index, length, type, style;\n\n  typeList = explicit ? state.explicitTypes : state.implicitTypes;\n\n  for (index = 0, length = typeList.length; index < length; index += 1) {\n    type = typeList[index];\n\n    if ((type.instanceOf  || type.predicate) &&\n        (!type.instanceOf || (('object' === typeof object) && (object instanceof type.instanceOf))) &&\n        (!type.predicate  || type.predicate(object))) {\n\n      state.tag = explicit ? type.tag : '?';\n\n      if (type.represent) {\n        style = state.styleMap[type.tag] || type.defaultStyle;\n\n        if ('[object Function]' === _toString.call(type.represent)) {\n          _result = type.represent(object, style);\n        } else if (_hasOwnProperty.call(type.represent, style)) {\n          _result = type.represent[style](object, style);\n        } else {\n          throw new YAMLException('!<' + type.tag + '> tag resolver accepts not \"' + style + '\" style');\n        }\n\n        state.dump = _result;\n      }\n\n      return true;\n    }\n  }\n\n  return false;\n}\n\n// Serializes `object` and writes it to global `result`.\n// Returns true on success, or false on invalid object.\n//\nfunction writeNode(state, level, object, block, compact, iskey) {\n  state.tag = null;\n  state.dump = object;\n\n  if (!detectType(state, object, false)) {\n    detectType(state, object, true);\n  }\n\n  var type = _toString.call(state.dump);\n\n  if (block) {\n    block = (0 > state.flowLevel || state.flowLevel > level);\n  }\n\n  var objectOrArray = '[object Object]' === type || '[object Array]' === type,\n      duplicateIndex,\n      duplicate;\n\n  if (objectOrArray) {\n    duplicateIndex = state.duplicates.indexOf(object);\n    duplicate = duplicateIndex !== -1;\n  }\n\n  if ((null !== state.tag && '?' !== state.tag) || duplicate || (2 !== state.indent && level > 0)) {\n    compact = false;\n  }\n\n  if (duplicate && state.usedDuplicates[duplicateIndex]) {\n    state.dump = '*ref_' + duplicateIndex;\n  } else {\n    if (objectOrArray && duplicate && !state.usedDuplicates[duplicateIndex]) {\n      state.usedDuplicates[duplicateIndex] = true;\n    }\n    if ('[object Object]' === type) {\n      if (block && (0 !== Object.keys(state.dump).length)) {\n        writeBlockMapping(state, level, state.dump, compact);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + state.dump;\n        }\n      } else {\n        writeFlowMapping(state, level, state.dump);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;\n        }\n      }\n    } else if ('[object Array]' === type) {\n      if (block && (0 !== state.dump.length)) {\n        writeBlockSequence(state, level, state.dump, compact);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + state.dump;\n        }\n      } else {\n        writeFlowSequence(state, level, state.dump);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;\n        }\n      }\n    } else if ('[object String]' === type) {\n      if ('?' !== state.tag) {\n        writeScalar(state, state.dump, level, iskey);\n      }\n    } else {\n      if (state.skipInvalid) {\n        return false;\n      }\n      throw new YAMLException('unacceptable kind of an object to dump ' + type);\n    }\n\n    if (null !== state.tag && '?' !== state.tag) {\n      state.dump = '!<' + state.tag + '> ' + state.dump;\n    }\n  }\n\n  return true;\n}\n\nfunction getDuplicateReferences(object, state) {\n  var objects = [],\n      duplicatesIndexes = [],\n      index,\n      length;\n\n  inspectNode(object, objects, duplicatesIndexes);\n\n  for (index = 0, length = duplicatesIndexes.length; index < length; index += 1) {\n    state.duplicates.push(objects[duplicatesIndexes[index]]);\n  }\n  state.usedDuplicates = new Array(length);\n}\n\nfunction inspectNode(object, objects, duplicatesIndexes) {\n  var objectKeyList,\n      index,\n      length;\n\n  if (null !== object && 'object' === typeof object) {\n    index = objects.indexOf(object);\n    if (-1 !== index) {\n      if (-1 === duplicatesIndexes.indexOf(index)) {\n        duplicatesIndexes.push(index);\n      }\n    } else {\n      objects.push(object);\n\n      if (Array.isArray(object)) {\n        for (index = 0, length = object.length; index < length; index += 1) {\n          inspectNode(object[index], objects, duplicatesIndexes);\n        }\n      } else {\n        objectKeyList = Object.keys(object);\n\n        for (index = 0, length = objectKeyList.length; index < length; index += 1) {\n          inspectNode(object[objectKeyList[index]], objects, duplicatesIndexes);\n        }\n      }\n    }\n  }\n}\n\nfunction dump(input, options) {\n  options = options || {};\n\n  var state = new State(options);\n\n  getDuplicateReferences(input, state);\n\n  if (writeNode(state, 0, input, true, true)) {\n    return state.dump + '\\n';\n  }\n  return '';\n}\n\nfunction safeDump(input, options) {\n  return dump(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));\n}\n\nmodule.exports.dump     = dump;\nmodule.exports.safeDump = safeDump;\n","// YAML error class. http://stackoverflow.com/questions/8458984\n//\n'use strict';\n\n\nvar inherits = require('inherit');\n\n\nfunction YAMLException(reason, mark) {\n  // Super constructor\n  Error.call(this);\n\n  // Include stack trace in error object\n  if (Error.captureStackTrace) {\n    // Chrome and NodeJS\n    Error.captureStackTrace(this, this.constructor);\n  } else {\n    // FF, IE 10+ and Safari 6+. Fallback for others\n    this.stack = (new Error()).stack || '';\n  }\n\n  this.name = 'YAMLException';\n  this.reason = reason;\n  this.mark = mark;\n  this.message = (this.reason || '(unknown reason)') + (this.mark ? ' ' + this.mark.toString() : '');\n}\n\n\n// Inherit from Error\ninherits(YAMLException, Error);\n\n\nYAMLException.prototype.toString = function toString(compact) {\n  var result = this.name + ': ';\n\n  result += this.reason || '(unknown reason)';\n\n  if (!compact && this.mark) {\n    result += ' ' + this.mark.toString();\n  }\n\n  return result;\n};\n\n\nmodule.exports = YAMLException;\n","'use strict';\n\n/*eslint-disable max-len,no-use-before-define*/\n\nvar common              = require('./common');\nvar YAMLException       = require('./exception');\nvar Mark                = require('./mark');\nvar DEFAULT_SAFE_SCHEMA = require('./schema/default_safe');\nvar DEFAULT_FULL_SCHEMA = require('./schema/default_full');\n\n\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\n\n\nvar CONTEXT_FLOW_IN   = 1;\nvar CONTEXT_FLOW_OUT  = 2;\nvar CONTEXT_BLOCK_IN  = 3;\nvar CONTEXT_BLOCK_OUT = 4;\n\n\nvar CHOMPING_CLIP  = 1;\nvar CHOMPING_STRIP = 2;\nvar CHOMPING_KEEP  = 3;\n\n\nvar PATTERN_NON_PRINTABLE         = /[\\x00-\\x08\\x0B\\x0C\\x0E-\\x1F\\x7F-\\x84\\x86-\\x9F\\uFFFE\\uFFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])|(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF]/;\nvar PATTERN_NON_ASCII_LINE_BREAKS = /[\\x85\\u2028\\u2029]/;\nvar PATTERN_FLOW_INDICATORS       = /[,\\[\\]\\{\\}]/;\nvar PATTERN_TAG_HANDLE            = /^(?:!|!!|![a-z\\-]+!)$/i;\nvar PATTERN_TAG_URI               = /^(?:!|[^,\\[\\]\\{\\}])(?:%[0-9a-f]{2}|[0-9a-z\\-#;\\/\\?:@&=\\+\\$,_\\.!~\\*'\\(\\)\\[\\]])*$/i;\n\n\nfunction is_EOL(c) {\n  return (c === 0x0A/* LF */) || (c === 0x0D/* CR */);\n}\n\nfunction is_WHITE_SPACE(c) {\n  return (c === 0x09/* Tab */) || (c === 0x20/* Space */);\n}\n\nfunction is_WS_OR_EOL(c) {\n  return (c === 0x09/* Tab */) ||\n         (c === 0x20/* Space */) ||\n         (c === 0x0A/* LF */) ||\n         (c === 0x0D/* CR */);\n}\n\nfunction is_FLOW_INDICATOR(c) {\n  return 0x2C/* , */ === c ||\n         0x5B/* [ */ === c ||\n         0x5D/* ] */ === c ||\n         0x7B/* { */ === c ||\n         0x7D/* } */ === c;\n}\n\nfunction fromHexCode(c) {\n  var lc;\n\n  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {\n    return c - 0x30;\n  }\n\n  /*eslint-disable no-bitwise*/\n  lc = c | 0x20;\n\n  if ((0x61/* a */ <= lc) && (lc <= 0x66/* f */)) {\n    return lc - 0x61 + 10;\n  }\n\n  return -1;\n}\n\nfunction escapedHexLen(c) {\n  if (c === 0x78/* x */) { return 2; }\n  if (c === 0x75/* u */) { return 4; }\n  if (c === 0x55/* U */) { return 8; }\n  return 0;\n}\n\nfunction fromDecimalCode(c) {\n  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {\n    return c - 0x30;\n  }\n\n  return -1;\n}\n\nfunction simpleEscapeSequence(c) {\n  return (c === 0x30/* 0 */) ? '\\x00' :\n        (c === 0x61/* a */) ? '\\x07' :\n        (c === 0x62/* b */) ? '\\x08' :\n        (c === 0x74/* t */) ? '\\x09' :\n        (c === 0x09/* Tab */) ? '\\x09' :\n        (c === 0x6E/* n */) ? '\\x0A' :\n        (c === 0x76/* v */) ? '\\x0B' :\n        (c === 0x66/* f */) ? '\\x0C' :\n        (c === 0x72/* r */) ? '\\x0D' :\n        (c === 0x65/* e */) ? '\\x1B' :\n        (c === 0x20/* Space */) ? ' ' :\n        (c === 0x22/* \" */) ? '\\x22' :\n        (c === 0x2F/* / */) ? '/' :\n        (c === 0x5C/* \\ */) ? '\\x5C' :\n        (c === 0x4E/* N */) ? '\\x85' :\n        (c === 0x5F/* _ */) ? '\\xA0' :\n        (c === 0x4C/* L */) ? '\\u2028' :\n        (c === 0x50/* P */) ? '\\u2029' : '';\n}\n\nfunction charFromCodepoint(c) {\n  if (c <= 0xFFFF) {\n    return String.fromCharCode(c);\n  }\n  // Encode UTF-16 surrogate pair\n  // https://en.wikipedia.org/wiki/UTF-16#Code_points_U.2B010000_to_U.2B10FFFF\n  return String.fromCharCode(((c - 0x010000) >> 10) + 0xD800,\n                             ((c - 0x010000) & 0x03FF) + 0xDC00);\n}\n\nvar simpleEscapeCheck = new Array(256); // integer, for fast access\nvar simpleEscapeMap = new Array(256);\nfor (var i = 0; i < 256; i++) {\n  simpleEscapeCheck[i] = simpleEscapeSequence(i) ? 1 : 0;\n  simpleEscapeMap[i] = simpleEscapeSequence(i);\n}\n\n\nfunction State(input, options) {\n  this.input = input;\n\n  this.filename  = options['filename']  || null;\n  this.schema    = options['schema']    || DEFAULT_FULL_SCHEMA;\n  this.onWarning = options['onWarning'] || null;\n  this.legacy    = options['legacy']    || false;\n\n  this.implicitTypes = this.schema.compiledImplicit;\n  this.typeMap       = this.schema.compiledTypeMap;\n\n  this.length     = input.length;\n  this.position   = 0;\n  this.line       = 0;\n  this.lineStart  = 0;\n  this.lineIndent = 0;\n\n  this.documents = [];\n\n  /*\n  this.version;\n  this.checkLineBreaks;\n  this.tagMap;\n  this.anchorMap;\n  this.tag;\n  this.anchor;\n  this.kind;\n  this.result;*/\n\n}\n\n\nfunction generateError(state, message) {\n  return new YAMLException(\n    message,\n    new Mark(state.filename, state.input, state.position, state.line, (state.position - state.lineStart)));\n}\n\nfunction throwError(state, message) {\n  throw generateError(state, message);\n}\n\nfunction throwWarning(state, message) {\n  if (state.onWarning) {\n    state.onWarning.call(null, generateError(state, message));\n  }\n}\n\n\nvar directiveHandlers = {\n\n  YAML: function handleYamlDirective(state, name, args) {\n\n      var match, major, minor;\n\n      if (null !== state.version) {\n        throwError(state, 'duplication of %YAML directive');\n      }\n\n      if (1 !== args.length) {\n        throwError(state, 'YAML directive accepts exactly one argument');\n      }\n\n      match = /^([0-9]+)\\.([0-9]+)$/.exec(args[0]);\n\n      if (null === match) {\n        throwError(state, 'ill-formed argument of the YAML directive');\n      }\n\n      major = parseInt(match[1], 10);\n      minor = parseInt(match[2], 10);\n\n      if (1 !== major) {\n        throwError(state, 'unacceptable YAML version of the document');\n      }\n\n      state.version = args[0];\n      state.checkLineBreaks = (minor < 2);\n\n      if (1 !== minor && 2 !== minor) {\n        throwWarning(state, 'unsupported YAML version of the document');\n      }\n    },\n\n  TAG: function handleTagDirective(state, name, args) {\n\n      var handle, prefix;\n\n      if (2 !== args.length) {\n        throwError(state, 'TAG directive accepts exactly two arguments');\n      }\n\n      handle = args[0];\n      prefix = args[1];\n\n      if (!PATTERN_TAG_HANDLE.test(handle)) {\n        throwError(state, 'ill-formed tag handle (first argument) of the TAG directive');\n      }\n\n      if (_hasOwnProperty.call(state.tagMap, handle)) {\n        throwError(state, 'there is a previously declared suffix for \"' + handle + '\" tag handle');\n      }\n\n      if (!PATTERN_TAG_URI.test(prefix)) {\n        throwError(state, 'ill-formed tag prefix (second argument) of the TAG directive');\n      }\n\n      state.tagMap[handle] = prefix;\n    }\n};\n\n\nfunction captureSegment(state, start, end, checkJson) {\n  var _position, _length, _character, _result;\n\n  if (start < end) {\n    _result = state.input.slice(start, end);\n\n    if (checkJson) {\n      for (_position = 0, _length = _result.length;\n           _position < _length;\n           _position += 1) {\n        _character = _result.charCodeAt(_position);\n        if (!(0x09 === _character ||\n              0x20 <= _character && _character <= 0x10FFFF)) {\n          throwError(state, 'expected valid JSON character');\n        }\n      }\n    } else if (PATTERN_NON_PRINTABLE.test(_result)) {\n      throwError(state, 'the stream contains non-printable characters');\n    }\n\n    state.result += _result;\n  }\n}\n\nfunction mergeMappings(state, destination, source) {\n  var sourceKeys, key, index, quantity;\n\n  if (!common.isObject(source)) {\n    throwError(state, 'cannot merge mappings; the provided source object is unacceptable');\n  }\n\n  sourceKeys = Object.keys(source);\n\n  for (index = 0, quantity = sourceKeys.length; index < quantity; index += 1) {\n    key = sourceKeys[index];\n\n    if (!_hasOwnProperty.call(destination, key)) {\n      destination[key] = source[key];\n    }\n  }\n}\n\nfunction storeMappingPair(state, _result, keyTag, keyNode, valueNode) {\n  var index, quantity;\n\n  keyNode = String(keyNode);\n\n  if (null === _result) {\n    _result = {};\n  }\n\n  if ('tag:yaml.org,2002:merge' === keyTag) {\n    if (Array.isArray(valueNode)) {\n      for (index = 0, quantity = valueNode.length; index < quantity; index += 1) {\n        mergeMappings(state, _result, valueNode[index]);\n      }\n    } else {\n      mergeMappings(state, _result, valueNode);\n    }\n  } else {\n    _result[keyNode] = valueNode;\n  }\n\n  return _result;\n}\n\nfunction readLineBreak(state) {\n  var ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (0x0A/* LF */ === ch) {\n    state.position++;\n  } else if (0x0D/* CR */ === ch) {\n    state.position++;\n    if (0x0A/* LF */ === state.input.charCodeAt(state.position)) {\n      state.position++;\n    }\n  } else {\n    throwError(state, 'a line break is expected');\n  }\n\n  state.line += 1;\n  state.lineStart = state.position;\n}\n\nfunction skipSeparationSpace(state, allowComments, checkIndent) {\n  var lineBreaks = 0,\n      ch = state.input.charCodeAt(state.position);\n\n  while (0 !== ch) {\n    while (is_WHITE_SPACE(ch)) {\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    if (allowComments && 0x23/* # */ === ch) {\n      do {\n        ch = state.input.charCodeAt(++state.position);\n      } while (ch !== 0x0A/* LF */ && ch !== 0x0D/* CR */ && 0 !== ch);\n    }\n\n    if (is_EOL(ch)) {\n      readLineBreak(state);\n\n      ch = state.input.charCodeAt(state.position);\n      lineBreaks++;\n      state.lineIndent = 0;\n\n      while (0x20/* Space */ === ch) {\n        state.lineIndent++;\n        ch = state.input.charCodeAt(++state.position);\n      }\n    } else {\n      break;\n    }\n  }\n\n  if (-1 !== checkIndent && 0 !== lineBreaks && state.lineIndent < checkIndent) {\n    throwWarning(state, 'deficient indentation');\n  }\n\n  return lineBreaks;\n}\n\nfunction testDocumentSeparator(state) {\n  var _position = state.position,\n      ch;\n\n  ch = state.input.charCodeAt(_position);\n\n  // Condition state.position === state.lineStart is tested\n  // in parent on each call, for efficiency. No needs to test here again.\n  if ((0x2D/* - */ === ch || 0x2E/* . */ === ch) &&\n      state.input.charCodeAt(_position + 1) === ch &&\n      state.input.charCodeAt(_position + 2) === ch) {\n\n    _position += 3;\n\n    ch = state.input.charCodeAt(_position);\n\n    if (ch === 0 || is_WS_OR_EOL(ch)) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nfunction writeFoldedLines(state, count) {\n  if (1 === count) {\n    state.result += ' ';\n  } else if (count > 1) {\n    state.result += common.repeat('\\n', count - 1);\n  }\n}\n\n\nfunction readPlainScalar(state, nodeIndent, withinFlowCollection) {\n  var preceding,\n      following,\n      captureStart,\n      captureEnd,\n      hasPendingContent,\n      _line,\n      _lineStart,\n      _lineIndent,\n      _kind = state.kind,\n      _result = state.result,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (is_WS_OR_EOL(ch)             ||\n      is_FLOW_INDICATOR(ch)        ||\n      0x23/* # */           === ch ||\n      0x26/* & */           === ch ||\n      0x2A/* * */           === ch ||\n      0x21/* ! */           === ch ||\n      0x7C/* | */           === ch ||\n      0x3E/* > */           === ch ||\n      0x27/* ' */           === ch ||\n      0x22/* \" */           === ch ||\n      0x25/* % */           === ch ||\n      0x40/* @ */           === ch ||\n      0x60/* ` */           === ch) {\n    return false;\n  }\n\n  if (0x3F/* ? */ === ch || 0x2D/* - */ === ch) {\n    following = state.input.charCodeAt(state.position + 1);\n\n    if (is_WS_OR_EOL(following) ||\n        withinFlowCollection && is_FLOW_INDICATOR(following)) {\n      return false;\n    }\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n  captureStart = captureEnd = state.position;\n  hasPendingContent = false;\n\n  while (0 !== ch) {\n    if (0x3A/* : */ === ch) {\n      following = state.input.charCodeAt(state.position + 1);\n\n      if (is_WS_OR_EOL(following) ||\n          withinFlowCollection && is_FLOW_INDICATOR(following)) {\n        break;\n      }\n\n    } else if (0x23/* # */ === ch) {\n      preceding = state.input.charCodeAt(state.position - 1);\n\n      if (is_WS_OR_EOL(preceding)) {\n        break;\n      }\n\n    } else if ((state.position === state.lineStart && testDocumentSeparator(state)) ||\n               withinFlowCollection && is_FLOW_INDICATOR(ch)) {\n      break;\n\n    } else if (is_EOL(ch)) {\n      _line = state.line;\n      _lineStart = state.lineStart;\n      _lineIndent = state.lineIndent;\n      skipSeparationSpace(state, false, -1);\n\n      if (state.lineIndent >= nodeIndent) {\n        hasPendingContent = true;\n        ch = state.input.charCodeAt(state.position);\n        continue;\n      } else {\n        state.position = captureEnd;\n        state.line = _line;\n        state.lineStart = _lineStart;\n        state.lineIndent = _lineIndent;\n        break;\n      }\n    }\n\n    if (hasPendingContent) {\n      captureSegment(state, captureStart, captureEnd, false);\n      writeFoldedLines(state, state.line - _line);\n      captureStart = captureEnd = state.position;\n      hasPendingContent = false;\n    }\n\n    if (!is_WHITE_SPACE(ch)) {\n      captureEnd = state.position + 1;\n    }\n\n    ch = state.input.charCodeAt(++state.position);\n  }\n\n  captureSegment(state, captureStart, captureEnd, false);\n\n  if (state.result) {\n    return true;\n  }\n\n  state.kind = _kind;\n  state.result = _result;\n  return false;\n}\n\nfunction readSingleQuotedScalar(state, nodeIndent) {\n  var ch,\n      captureStart, captureEnd;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (0x27/* ' */ !== ch) {\n    return false;\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n  state.position++;\n  captureStart = captureEnd = state.position;\n\n  while (0 !== (ch = state.input.charCodeAt(state.position))) {\n    if (0x27/* ' */ === ch) {\n      captureSegment(state, captureStart, state.position, true);\n      ch = state.input.charCodeAt(++state.position);\n\n      if (0x27/* ' */ === ch) {\n        captureStart = captureEnd = state.position;\n        state.position++;\n      } else {\n        return true;\n      }\n\n    } else if (is_EOL(ch)) {\n      captureSegment(state, captureStart, captureEnd, true);\n      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));\n      captureStart = captureEnd = state.position;\n\n    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {\n      throwError(state, 'unexpected end of the document within a single quoted scalar');\n\n    } else {\n      state.position++;\n      captureEnd = state.position;\n    }\n  }\n\n  throwError(state, 'unexpected end of the stream within a single quoted scalar');\n}\n\nfunction readDoubleQuotedScalar(state, nodeIndent) {\n  var captureStart,\n      captureEnd,\n      hexLength,\n      hexResult,\n      tmp,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (0x22/* \" */ !== ch) {\n    return false;\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n  state.position++;\n  captureStart = captureEnd = state.position;\n\n  while (0 !== (ch = state.input.charCodeAt(state.position))) {\n    if (0x22/* \" */ === ch) {\n      captureSegment(state, captureStart, state.position, true);\n      state.position++;\n      return true;\n\n    } else if (0x5C/* \\ */ === ch) {\n      captureSegment(state, captureStart, state.position, true);\n      ch = state.input.charCodeAt(++state.position);\n\n      if (is_EOL(ch)) {\n        skipSeparationSpace(state, false, nodeIndent);\n\n        // TODO: rework to inline fn with no type cast?\n      } else if (ch < 256 && simpleEscapeCheck[ch]) {\n        state.result += simpleEscapeMap[ch];\n        state.position++;\n\n      } else if ((tmp = escapedHexLen(ch)) > 0) {\n        hexLength = tmp;\n        hexResult = 0;\n\n        for (; hexLength > 0; hexLength--) {\n          ch = state.input.charCodeAt(++state.position);\n\n          if ((tmp = fromHexCode(ch)) >= 0) {\n            hexResult = (hexResult << 4) + tmp;\n\n          } else {\n            throwError(state, 'expected hexadecimal character');\n          }\n        }\n\n        state.result += charFromCodepoint(hexResult);\n\n        state.position++;\n\n      } else {\n        throwError(state, 'unknown escape sequence');\n      }\n\n      captureStart = captureEnd = state.position;\n\n    } else if (is_EOL(ch)) {\n      captureSegment(state, captureStart, captureEnd, true);\n      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));\n      captureStart = captureEnd = state.position;\n\n    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {\n      throwError(state, 'unexpected end of the document within a double quoted scalar');\n\n    } else {\n      state.position++;\n      captureEnd = state.position;\n    }\n  }\n\n  throwError(state, 'unexpected end of the stream within a double quoted scalar');\n}\n\nfunction readFlowCollection(state, nodeIndent) {\n  var readNext = true,\n      _line,\n      _tag     = state.tag,\n      _result,\n      _anchor  = state.anchor,\n      following,\n      terminator,\n      isPair,\n      isExplicitPair,\n      isMapping,\n      keyNode,\n      keyTag,\n      valueNode,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch === 0x5B/* [ */) {\n    terminator = 0x5D;/* ] */\n    isMapping = false;\n    _result = [];\n  } else if (ch === 0x7B/* { */) {\n    terminator = 0x7D;/* } */\n    isMapping = true;\n    _result = {};\n  } else {\n    return false;\n  }\n\n  if (null !== state.anchor) {\n    state.anchorMap[state.anchor] = _result;\n  }\n\n  ch = state.input.charCodeAt(++state.position);\n\n  while (0 !== ch) {\n    skipSeparationSpace(state, true, nodeIndent);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if (ch === terminator) {\n      state.position++;\n      state.tag = _tag;\n      state.anchor = _anchor;\n      state.kind = isMapping ? 'mapping' : 'sequence';\n      state.result = _result;\n      return true;\n    } else if (!readNext) {\n      throwError(state, 'missed comma between flow collection entries');\n    }\n\n    keyTag = keyNode = valueNode = null;\n    isPair = isExplicitPair = false;\n\n    if (0x3F/* ? */ === ch) {\n      following = state.input.charCodeAt(state.position + 1);\n\n      if (is_WS_OR_EOL(following)) {\n        isPair = isExplicitPair = true;\n        state.position++;\n        skipSeparationSpace(state, true, nodeIndent);\n      }\n    }\n\n    _line = state.line;\n    composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);\n    keyTag = state.tag;\n    keyNode = state.result;\n    skipSeparationSpace(state, true, nodeIndent);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if ((isExplicitPair || state.line === _line) && 0x3A/* : */ === ch) {\n      isPair = true;\n      ch = state.input.charCodeAt(++state.position);\n      skipSeparationSpace(state, true, nodeIndent);\n      composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);\n      valueNode = state.result;\n    }\n\n    if (isMapping) {\n      storeMappingPair(state, _result, keyTag, keyNode, valueNode);\n    } else if (isPair) {\n      _result.push(storeMappingPair(state, null, keyTag, keyNode, valueNode));\n    } else {\n      _result.push(keyNode);\n    }\n\n    skipSeparationSpace(state, true, nodeIndent);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if (0x2C/* , */ === ch) {\n      readNext = true;\n      ch = state.input.charCodeAt(++state.position);\n    } else {\n      readNext = false;\n    }\n  }\n\n  throwError(state, 'unexpected end of the stream within a flow collection');\n}\n\nfunction readBlockScalar(state, nodeIndent) {\n  var captureStart,\n      folding,\n      chomping       = CHOMPING_CLIP,\n      detectedIndent = false,\n      textIndent     = nodeIndent,\n      emptyLines     = 0,\n      atMoreIndented = false,\n      tmp,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch === 0x7C/* | */) {\n    folding = false;\n  } else if (ch === 0x3E/* > */) {\n    folding = true;\n  } else {\n    return false;\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n\n  while (0 !== ch) {\n    ch = state.input.charCodeAt(++state.position);\n\n    if (0x2B/* + */ === ch || 0x2D/* - */ === ch) {\n      if (CHOMPING_CLIP === chomping) {\n        chomping = (0x2B/* + */ === ch) ? CHOMPING_KEEP : CHOMPING_STRIP;\n      } else {\n        throwError(state, 'repeat of a chomping mode identifier');\n      }\n\n    } else if ((tmp = fromDecimalCode(ch)) >= 0) {\n      if (tmp === 0) {\n        throwError(state, 'bad explicit indentation width of a block scalar; it cannot be less than one');\n      } else if (!detectedIndent) {\n        textIndent = nodeIndent + tmp - 1;\n        detectedIndent = true;\n      } else {\n        throwError(state, 'repeat of an indentation width identifier');\n      }\n\n    } else {\n      break;\n    }\n  }\n\n  if (is_WHITE_SPACE(ch)) {\n    do { ch = state.input.charCodeAt(++state.position); }\n    while (is_WHITE_SPACE(ch));\n\n    if (0x23/* # */ === ch) {\n      do { ch = state.input.charCodeAt(++state.position); }\n      while (!is_EOL(ch) && (0 !== ch));\n    }\n  }\n\n  while (0 !== ch) {\n    readLineBreak(state);\n    state.lineIndent = 0;\n\n    ch = state.input.charCodeAt(state.position);\n\n    while ((!detectedIndent || state.lineIndent < textIndent) &&\n           (0x20/* Space */ === ch)) {\n      state.lineIndent++;\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    if (!detectedIndent && state.lineIndent > textIndent) {\n      textIndent = state.lineIndent;\n    }\n\n    if (is_EOL(ch)) {\n      emptyLines++;\n      continue;\n    }\n\n    // End of the scalar.\n    if (state.lineIndent < textIndent) {\n\n      // Perform the chomping.\n      if (chomping === CHOMPING_KEEP) {\n        state.result += common.repeat('\\n', emptyLines);\n      } else if (chomping === CHOMPING_CLIP) {\n        if (detectedIndent) { // i.e. only if the scalar is not empty.\n          state.result += '\\n';\n        }\n      }\n\n      // Break this `while` cycle and go to the funciton's epilogue.\n      break;\n    }\n\n    // Folded style: use fancy rules to handle line breaks.\n    if (folding) {\n\n      // Lines starting with white space characters (more-indented lines) are not folded.\n      if (is_WHITE_SPACE(ch)) {\n        atMoreIndented = true;\n        state.result += common.repeat('\\n', emptyLines + 1);\n\n      // End of more-indented block.\n      } else if (atMoreIndented) {\n        atMoreIndented = false;\n        state.result += common.repeat('\\n', emptyLines + 1);\n\n      // Just one line break - perceive as the same line.\n      } else if (0 === emptyLines) {\n        if (detectedIndent) { // i.e. only if we have already read some scalar content.\n          state.result += ' ';\n        }\n\n      // Several line breaks - perceive as different lines.\n      } else {\n        state.result += common.repeat('\\n', emptyLines);\n      }\n\n    // Literal style: just add exact number of line breaks between content lines.\n    } else if (detectedIndent) {\n      // If current line isn't the first one - count line break from the last content line.\n      state.result += common.repeat('\\n', emptyLines + 1);\n    } else {\n      // In case of the first content line - count only empty lines.\n      state.result += common.repeat('\\n', emptyLines);\n    }\n\n    detectedIndent = true;\n    emptyLines = 0;\n    captureStart = state.position;\n\n    while (!is_EOL(ch) && (0 !== ch)) {\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    captureSegment(state, captureStart, state.position, false);\n  }\n\n  return true;\n}\n\nfunction readBlockSequence(state, nodeIndent) {\n  var _line,\n      _tag      = state.tag,\n      _anchor   = state.anchor,\n      _result   = [],\n      following,\n      detected  = false,\n      ch;\n\n  if (null !== state.anchor) {\n    state.anchorMap[state.anchor] = _result;\n  }\n\n  ch = state.input.charCodeAt(state.position);\n\n  while (0 !== ch) {\n\n    if (0x2D/* - */ !== ch) {\n      break;\n    }\n\n    following = state.input.charCodeAt(state.position + 1);\n\n    if (!is_WS_OR_EOL(following)) {\n      break;\n    }\n\n    detected = true;\n    state.position++;\n\n    if (skipSeparationSpace(state, true, -1)) {\n      if (state.lineIndent <= nodeIndent) {\n        _result.push(null);\n        ch = state.input.charCodeAt(state.position);\n        continue;\n      }\n    }\n\n    _line = state.line;\n    composeNode(state, nodeIndent, CONTEXT_BLOCK_IN, false, true);\n    _result.push(state.result);\n    skipSeparationSpace(state, true, -1);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if ((state.line === _line || state.lineIndent > nodeIndent) && (0 !== ch)) {\n      throwError(state, 'bad indentation of a sequence entry');\n    } else if (state.lineIndent < nodeIndent) {\n      break;\n    }\n  }\n\n  if (detected) {\n    state.tag = _tag;\n    state.anchor = _anchor;\n    state.kind = 'sequence';\n    state.result = _result;\n    return true;\n  }\n  return false;\n}\n\nfunction readBlockMapping(state, nodeIndent, flowIndent) {\n  var following,\n      allowCompact,\n      _line,\n      _tag          = state.tag,\n      _anchor       = state.anchor,\n      _result       = {},\n      keyTag        = null,\n      keyNode       = null,\n      valueNode     = null,\n      atExplicitKey = false,\n      detected      = false,\n      ch;\n\n  if (null !== state.anchor) {\n    state.anchorMap[state.anchor] = _result;\n  }\n\n  ch = state.input.charCodeAt(state.position);\n\n  while (0 !== ch) {\n    following = state.input.charCodeAt(state.position + 1);\n    _line = state.line; // Save the current line.\n\n    //\n    // Explicit notation case. There are two separate blocks:\n    // first for the key (denoted by \"?\") and second for the value (denoted by \":\")\n    //\n    if ((0x3F/* ? */ === ch || 0x3A/* : */  === ch) && is_WS_OR_EOL(following)) {\n\n      if (0x3F/* ? */ === ch) {\n        if (atExplicitKey) {\n          storeMappingPair(state, _result, keyTag, keyNode, null);\n          keyTag = keyNode = valueNode = null;\n        }\n\n        detected = true;\n        atExplicitKey = true;\n        allowCompact = true;\n\n      } else if (atExplicitKey) {\n        // i.e. 0x3A/* : */ === character after the explicit key.\n        atExplicitKey = false;\n        allowCompact = true;\n\n      } else {\n        throwError(state, 'incomplete explicit mapping pair; a key node is missed');\n      }\n\n      state.position += 1;\n      ch = following;\n\n    //\n    // Implicit notation case. Flow-style node as the key first, then \":\", and the value.\n    //\n    } else if (composeNode(state, flowIndent, CONTEXT_FLOW_OUT, false, true)) {\n\n      if (state.line === _line) {\n        ch = state.input.charCodeAt(state.position);\n\n        while (is_WHITE_SPACE(ch)) {\n          ch = state.input.charCodeAt(++state.position);\n        }\n\n        if (0x3A/* : */ === ch) {\n          ch = state.input.charCodeAt(++state.position);\n\n          if (!is_WS_OR_EOL(ch)) {\n            throwError(state, 'a whitespace character is expected after the key-value separator within a block mapping');\n          }\n\n          if (atExplicitKey) {\n            storeMappingPair(state, _result, keyTag, keyNode, null);\n            keyTag = keyNode = valueNode = null;\n          }\n\n          detected = true;\n          atExplicitKey = false;\n          allowCompact = false;\n          keyTag = state.tag;\n          keyNode = state.result;\n\n        } else if (detected) {\n          throwError(state, 'can not read an implicit mapping pair; a colon is missed');\n\n        } else {\n          state.tag = _tag;\n          state.anchor = _anchor;\n          return true; // Keep the result of `composeNode`.\n        }\n\n      } else if (detected) {\n        throwError(state, 'can not read a block mapping entry; a multiline key may not be an implicit key');\n\n      } else {\n        state.tag = _tag;\n        state.anchor = _anchor;\n        return true; // Keep the result of `composeNode`.\n      }\n\n    } else {\n      break; // Reading is done. Go to the epilogue.\n    }\n\n    //\n    // Common reading code for both explicit and implicit notations.\n    //\n    if (state.line === _line || state.lineIndent > nodeIndent) {\n      if (composeNode(state, nodeIndent, CONTEXT_BLOCK_OUT, true, allowCompact)) {\n        if (atExplicitKey) {\n          keyNode = state.result;\n        } else {\n          valueNode = state.result;\n        }\n      }\n\n      if (!atExplicitKey) {\n        storeMappingPair(state, _result, keyTag, keyNode, valueNode);\n        keyTag = keyNode = valueNode = null;\n      }\n\n      skipSeparationSpace(state, true, -1);\n      ch = state.input.charCodeAt(state.position);\n    }\n\n    if (state.lineIndent > nodeIndent && (0 !== ch)) {\n      throwError(state, 'bad indentation of a mapping entry');\n    } else if (state.lineIndent < nodeIndent) {\n      break;\n    }\n  }\n\n  //\n  // Epilogue.\n  //\n\n  // Special case: last mapping's node contains only the key in explicit notation.\n  if (atExplicitKey) {\n    storeMappingPair(state, _result, keyTag, keyNode, null);\n  }\n\n  // Expose the resulting mapping.\n  if (detected) {\n    state.tag = _tag;\n    state.anchor = _anchor;\n    state.kind = 'mapping';\n    state.result = _result;\n  }\n\n  return detected;\n}\n\nfunction readTagProperty(state) {\n  var _position,\n      isVerbatim = false,\n      isNamed    = false,\n      tagHandle,\n      tagName,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (0x21/* ! */ !== ch) {\n    return false;\n  }\n\n  if (null !== state.tag) {\n    throwError(state, 'duplication of a tag property');\n  }\n\n  ch = state.input.charCodeAt(++state.position);\n\n  if (0x3C/* < */ === ch) {\n    isVerbatim = true;\n    ch = state.input.charCodeAt(++state.position);\n\n  } else if (0x21/* ! */ === ch) {\n    isNamed = true;\n    tagHandle = '!!';\n    ch = state.input.charCodeAt(++state.position);\n\n  } else {\n    tagHandle = '!';\n  }\n\n  _position = state.position;\n\n  if (isVerbatim) {\n    do { ch = state.input.charCodeAt(++state.position); }\n    while (0 !== ch && 0x3E/* > */ !== ch);\n\n    if (state.position < state.length) {\n      tagName = state.input.slice(_position, state.position);\n      ch = state.input.charCodeAt(++state.position);\n    } else {\n      throwError(state, 'unexpected end of the stream within a verbatim tag');\n    }\n  } else {\n    while (0 !== ch && !is_WS_OR_EOL(ch)) {\n\n      if (0x21/* ! */ === ch) {\n        if (!isNamed) {\n          tagHandle = state.input.slice(_position - 1, state.position + 1);\n\n          if (!PATTERN_TAG_HANDLE.test(tagHandle)) {\n            throwError(state, 'named tag handle cannot contain such characters');\n          }\n\n          isNamed = true;\n          _position = state.position + 1;\n        } else {\n          throwError(state, 'tag suffix cannot contain exclamation marks');\n        }\n      }\n\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    tagName = state.input.slice(_position, state.position);\n\n    if (PATTERN_FLOW_INDICATORS.test(tagName)) {\n      throwError(state, 'tag suffix cannot contain flow indicator characters');\n    }\n  }\n\n  if (tagName && !PATTERN_TAG_URI.test(tagName)) {\n    throwError(state, 'tag name cannot contain such characters: ' + tagName);\n  }\n\n  if (isVerbatim) {\n    state.tag = tagName;\n\n  } else if (_hasOwnProperty.call(state.tagMap, tagHandle)) {\n    state.tag = state.tagMap[tagHandle] + tagName;\n\n  } else if ('!' === tagHandle) {\n    state.tag = '!' + tagName;\n\n  } else if ('!!' === tagHandle) {\n    state.tag = 'tag:yaml.org,2002:' + tagName;\n\n  } else {\n    throwError(state, 'undeclared tag handle \"' + tagHandle + '\"');\n  }\n\n  return true;\n}\n\nfunction readAnchorProperty(state) {\n  var _position,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (0x26/* & */ !== ch) {\n    return false;\n  }\n\n  if (null !== state.anchor) {\n    throwError(state, 'duplication of an anchor property');\n  }\n\n  ch = state.input.charCodeAt(++state.position);\n  _position = state.position;\n\n  while (0 !== ch && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {\n    ch = state.input.charCodeAt(++state.position);\n  }\n\n  if (state.position === _position) {\n    throwError(state, 'name of an anchor node must contain at least one character');\n  }\n\n  state.anchor = state.input.slice(_position, state.position);\n  return true;\n}\n\nfunction readAlias(state) {\n  var _position, alias,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (0x2A/* * */ !== ch) {\n    return false;\n  }\n\n  ch = state.input.charCodeAt(++state.position);\n  _position = state.position;\n\n  while (0 !== ch && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {\n    ch = state.input.charCodeAt(++state.position);\n  }\n\n  if (state.position === _position) {\n    throwError(state, 'name of an alias node must contain at least one character');\n  }\n\n  alias = state.input.slice(_position, state.position);\n\n  if (!state.anchorMap.hasOwnProperty(alias)) {\n    throwError(state, 'unidentified alias \"' + alias + '\"');\n  }\n\n  state.result = state.anchorMap[alias];\n  skipSeparationSpace(state, true, -1);\n  return true;\n}\n\nfunction composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact) {\n  var allowBlockStyles,\n      allowBlockScalars,\n      allowBlockCollections,\n      indentStatus = 1, // 1: this>parent, 0: this=parent, -1: this<parent\n      atNewLine  = false,\n      hasContent = false,\n      typeIndex,\n      typeQuantity,\n      type,\n      flowIndent,\n      blockIndent;\n\n  state.tag    = null;\n  state.anchor = null;\n  state.kind   = null;\n  state.result = null;\n\n  allowBlockStyles = allowBlockScalars = allowBlockCollections =\n    CONTEXT_BLOCK_OUT === nodeContext ||\n    CONTEXT_BLOCK_IN  === nodeContext;\n\n  if (allowToSeek) {\n    if (skipSeparationSpace(state, true, -1)) {\n      atNewLine = true;\n\n      if (state.lineIndent > parentIndent) {\n        indentStatus = 1;\n      } else if (state.lineIndent === parentIndent) {\n        indentStatus = 0;\n      } else if (state.lineIndent < parentIndent) {\n        indentStatus = -1;\n      }\n    }\n  }\n\n  if (1 === indentStatus) {\n    while (readTagProperty(state) || readAnchorProperty(state)) {\n      if (skipSeparationSpace(state, true, -1)) {\n        atNewLine = true;\n        allowBlockCollections = allowBlockStyles;\n\n        if (state.lineIndent > parentIndent) {\n          indentStatus = 1;\n        } else if (state.lineIndent === parentIndent) {\n          indentStatus = 0;\n        } else if (state.lineIndent < parentIndent) {\n          indentStatus = -1;\n        }\n      } else {\n        allowBlockCollections = false;\n      }\n    }\n  }\n\n  if (allowBlockCollections) {\n    allowBlockCollections = atNewLine || allowCompact;\n  }\n\n  if (1 === indentStatus || CONTEXT_BLOCK_OUT === nodeContext) {\n    if (CONTEXT_FLOW_IN === nodeContext || CONTEXT_FLOW_OUT === nodeContext) {\n      flowIndent = parentIndent;\n    } else {\n      flowIndent = parentIndent + 1;\n    }\n\n    blockIndent = state.position - state.lineStart;\n\n    if (1 === indentStatus) {\n      if (allowBlockCollections &&\n          (readBlockSequence(state, blockIndent) ||\n           readBlockMapping(state, blockIndent, flowIndent)) ||\n          readFlowCollection(state, flowIndent)) {\n        hasContent = true;\n      } else {\n        if ((allowBlockScalars && readBlockScalar(state, flowIndent)) ||\n            readSingleQuotedScalar(state, flowIndent) ||\n            readDoubleQuotedScalar(state, flowIndent)) {\n          hasContent = true;\n\n        } else if (readAlias(state)) {\n          hasContent = true;\n\n          if (null !== state.tag || null !== state.anchor) {\n            throwError(state, 'alias node should not have any properties');\n          }\n\n        } else if (readPlainScalar(state, flowIndent, CONTEXT_FLOW_IN === nodeContext)) {\n          hasContent = true;\n\n          if (null === state.tag) {\n            state.tag = '?';\n          }\n        }\n\n        if (null !== state.anchor) {\n          state.anchorMap[state.anchor] = state.result;\n        }\n      }\n    } else if (0 === indentStatus) {\n      // Special case: block sequences are allowed to have same indentation level as the parent.\n      // http://www.yaml.org/spec/1.2/spec.html#id2799784\n      hasContent = allowBlockCollections && readBlockSequence(state, blockIndent);\n    }\n  }\n\n  if (null !== state.tag && '!' !== state.tag) {\n    if ('?' === state.tag) {\n      for (typeIndex = 0, typeQuantity = state.implicitTypes.length;\n           typeIndex < typeQuantity;\n           typeIndex += 1) {\n        type = state.implicitTypes[typeIndex];\n\n        // Implicit resolving is not allowed for non-scalar types, and '?'\n        // non-specific tag is only assigned to plain scalars. So, it isn't\n        // needed to check for 'kind' conformity.\n\n        if (type.resolve(state.result)) { // `state.result` updated in resolver if matched\n          state.result = type.construct(state.result);\n          state.tag = type.tag;\n          if (null !== state.anchor) {\n            state.anchorMap[state.anchor] = state.result;\n          }\n          break;\n        }\n      }\n    } else if (_hasOwnProperty.call(state.typeMap, state.tag)) {\n      type = state.typeMap[state.tag];\n\n      if (null !== state.result && type.kind !== state.kind) {\n        throwError(state, 'unacceptable node kind for !<' + state.tag + '> tag; it should be \"' + type.kind + '\", not \"' + state.kind + '\"');\n      }\n\n      if (!type.resolve(state.result)) { // `state.result` updated in resolver if matched\n        throwError(state, 'cannot resolve a node with !<' + state.tag + '> explicit tag');\n      } else {\n        state.result = type.construct(state.result);\n        if (null !== state.anchor) {\n          state.anchorMap[state.anchor] = state.result;\n        }\n      }\n    } else {\n      throwError(state, 'unknown tag !<' + state.tag + '>');\n    }\n  }\n\n  return null !== state.tag || null !== state.anchor || hasContent;\n}\n\nfunction readDocument(state) {\n  var documentStart = state.position,\n      _position,\n      directiveName,\n      directiveArgs,\n      hasDirectives = false,\n      ch;\n\n  state.version = null;\n  state.checkLineBreaks = state.legacy;\n  state.tagMap = {};\n  state.anchorMap = {};\n\n  while (0 !== (ch = state.input.charCodeAt(state.position))) {\n    skipSeparationSpace(state, true, -1);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if (state.lineIndent > 0 || 0x25/* % */ !== ch) {\n      break;\n    }\n\n    hasDirectives = true;\n    ch = state.input.charCodeAt(++state.position);\n    _position = state.position;\n\n    while (0 !== ch && !is_WS_OR_EOL(ch)) {\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    directiveName = state.input.slice(_position, state.position);\n    directiveArgs = [];\n\n    if (directiveName.length < 1) {\n      throwError(state, 'directive name must not be less than one character in length');\n    }\n\n    while (0 !== ch) {\n      while (is_WHITE_SPACE(ch)) {\n        ch = state.input.charCodeAt(++state.position);\n      }\n\n      if (0x23/* # */ === ch) {\n        do { ch = state.input.charCodeAt(++state.position); }\n        while (0 !== ch && !is_EOL(ch));\n        break;\n      }\n\n      if (is_EOL(ch)) {\n        break;\n      }\n\n      _position = state.position;\n\n      while (0 !== ch && !is_WS_OR_EOL(ch)) {\n        ch = state.input.charCodeAt(++state.position);\n      }\n\n      directiveArgs.push(state.input.slice(_position, state.position));\n    }\n\n    if (0 !== ch) {\n      readLineBreak(state);\n    }\n\n    if (_hasOwnProperty.call(directiveHandlers, directiveName)) {\n      directiveHandlers[directiveName](state, directiveName, directiveArgs);\n    } else {\n      throwWarning(state, 'unknown document directive \"' + directiveName + '\"');\n    }\n  }\n\n  skipSeparationSpace(state, true, -1);\n\n  if (0 === state.lineIndent &&\n      0x2D/* - */ === state.input.charCodeAt(state.position) &&\n      0x2D/* - */ === state.input.charCodeAt(state.position + 1) &&\n      0x2D/* - */ === state.input.charCodeAt(state.position + 2)) {\n    state.position += 3;\n    skipSeparationSpace(state, true, -1);\n\n  } else if (hasDirectives) {\n    throwError(state, 'directives end mark is expected');\n  }\n\n  composeNode(state, state.lineIndent - 1, CONTEXT_BLOCK_OUT, false, true);\n  skipSeparationSpace(state, true, -1);\n\n  if (state.checkLineBreaks &&\n      PATTERN_NON_ASCII_LINE_BREAKS.test(state.input.slice(documentStart, state.position))) {\n    throwWarning(state, 'non-ASCII line breaks are interpreted as content');\n  }\n\n  state.documents.push(state.result);\n\n  if (state.position === state.lineStart && testDocumentSeparator(state)) {\n\n    if (0x2E/* . */ === state.input.charCodeAt(state.position)) {\n      state.position += 3;\n      skipSeparationSpace(state, true, -1);\n    }\n    return;\n  }\n\n  if (state.position < (state.length - 1)) {\n    throwError(state, 'end of the stream or a document separator is expected');\n  } else {\n    return;\n  }\n}\n\n\nfunction loadDocuments(input, options) {\n  input = String(input);\n  options = options || {};\n\n  if (input.length !== 0) {\n\n    // Add tailing `\\n` if not exists\n    if (0x0A/* LF */ !== input.charCodeAt(input.length - 1) &&\n        0x0D/* CR */ !== input.charCodeAt(input.length - 1)) {\n      input += '\\n';\n    }\n\n    // Strip BOM\n    if (input.charCodeAt(0) === 0xFEFF) {\n      input = input.slice(1);\n    }\n  }\n\n  var state = new State(input, options);\n\n  // Use 0 as string terminator. That significantly simplifies bounds check.\n  state.input += '\\0';\n\n  while (0x20/* Space */ === state.input.charCodeAt(state.position)) {\n    state.lineIndent += 1;\n    state.position += 1;\n  }\n\n  while (state.position < (state.length - 1)) {\n    readDocument(state);\n  }\n\n  return state.documents;\n}\n\n\nfunction loadAll(input, iterator, options) {\n  var documents = loadDocuments(input, options), index, length;\n\n  for (index = 0, length = documents.length; index < length; index += 1) {\n    iterator(documents[index]);\n  }\n}\n\n\nfunction load(input, options) {\n  var documents = loadDocuments(input, options);\n\n  if (0 === documents.length) {\n    /*eslint-disable no-undefined*/\n    return undefined;\n  } else if (1 === documents.length) {\n    return documents[0];\n  }\n  throw new YAMLException('expected a single document in the stream, but found more');\n}\n\n\nfunction safeLoadAll(input, output, options) {\n  loadAll(input, output, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));\n}\n\n\nfunction safeLoad(input, options) {\n  return load(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));\n}\n\n\nmodule.exports.loadAll     = loadAll;\nmodule.exports.load        = load;\nmodule.exports.safeLoadAll = safeLoadAll;\nmodule.exports.safeLoad    = safeLoad;\n","'use strict';\n\n\nvar common = require('./common');\n\n\nfunction Mark(name, buffer, position, line, column) {\n  this.name     = name;\n  this.buffer   = buffer;\n  this.position = position;\n  this.line     = line;\n  this.column   = column;\n}\n\n\nMark.prototype.getSnippet = function getSnippet(indent, maxLength) {\n  var head, start, tail, end, snippet;\n\n  if (!this.buffer) {\n    return null;\n  }\n\n  indent = indent || 4;\n  maxLength = maxLength || 75;\n\n  head = '';\n  start = this.position;\n\n  while (start > 0 && -1 === '\\x00\\r\\n\\x85\\u2028\\u2029'.indexOf(this.buffer.charAt(start - 1))) {\n    start -= 1;\n    if (this.position - start > (maxLength / 2 - 1)) {\n      head = ' ... ';\n      start += 5;\n      break;\n    }\n  }\n\n  tail = '';\n  end = this.position;\n\n  while (end < this.buffer.length && -1 === '\\x00\\r\\n\\x85\\u2028\\u2029'.indexOf(this.buffer.charAt(end))) {\n    end += 1;\n    if (end - this.position > (maxLength / 2 - 1)) {\n      tail = ' ... ';\n      end -= 5;\n      break;\n    }\n  }\n\n  snippet = this.buffer.slice(start, end);\n\n  return common.repeat(' ', indent) + head + snippet + tail + '\\n' +\n         common.repeat(' ', indent + this.position - start + head.length) + '^';\n};\n\n\nMark.prototype.toString = function toString(compact) {\n  var snippet, where = '';\n\n  if (this.name) {\n    where += 'in \"' + this.name + '\" ';\n  }\n\n  where += 'at line ' + (this.line + 1) + ', column ' + (this.column + 1);\n\n  if (!compact) {\n    snippet = this.getSnippet();\n\n    if (snippet) {\n      where += ':\\n' + snippet;\n    }\n  }\n\n  return where;\n};\n\n\nmodule.exports = Mark;\n","'use strict';\n\n/*eslint-disable max-len*/\n\nvar common        = require('./common');\nvar YAMLException = require('./exception');\nvar Type          = require('./type');\n\n\nfunction compileList(schema, name, result) {\n  var exclude = [];\n\n  schema.include.forEach(function (includedSchema) {\n    result = compileList(includedSchema, name, result);\n  });\n\n  schema[name].forEach(function (currentType) {\n    result.forEach(function (previousType, previousIndex) {\n      if (previousType.tag === currentType.tag) {\n        exclude.push(previousIndex);\n      }\n    });\n\n    result.push(currentType);\n  });\n\n  return result.filter(function (type, index) {\n    return -1 === exclude.indexOf(index);\n  });\n}\n\n\nfunction compileMap(/* lists... */) {\n  var result = {}, index, length;\n\n  function collectType(type) {\n    result[type.tag] = type;\n  }\n\n  for (index = 0, length = arguments.length; index < length; index += 1) {\n    arguments[index].forEach(collectType);\n  }\n\n  return result;\n}\n\n\nfunction Schema(definition) {\n  this.include  = definition.include  || [];\n  this.implicit = definition.implicit || [];\n  this.explicit = definition.explicit || [];\n\n  this.implicit.forEach(function (type) {\n    if (type.loadKind && 'scalar' !== type.loadKind) {\n      throw new YAMLException('There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.');\n    }\n  });\n\n  this.compiledImplicit = compileList(this, 'implicit', []);\n  this.compiledExplicit = compileList(this, 'explicit', []);\n  this.compiledTypeMap  = compileMap(this.compiledImplicit, this.compiledExplicit);\n}\n\n\nSchema.DEFAULT = null;\n\n\nSchema.create = function createSchema() {\n  var schemas, types;\n\n  switch (arguments.length) {\n  case 1:\n    schemas = Schema.DEFAULT;\n    types = arguments[0];\n    break;\n\n  case 2:\n    schemas = arguments[0];\n    types = arguments[1];\n    break;\n\n  default:\n    throw new YAMLException('Wrong number of arguments for Schema.create function');\n  }\n\n  schemas = common.toArray(schemas);\n  types = common.toArray(types);\n\n  if (!schemas.every(function (schema) { return schema instanceof Schema; })) {\n    throw new YAMLException('Specified list of super schemas (or a single Schema object) contains a non-Schema object.');\n  }\n\n  if (!types.every(function (type) { return type instanceof Type; })) {\n    throw new YAMLException('Specified list of YAML types (or a single Type object) contains a non-Type object.');\n  }\n\n  return new Schema({\n    include: schemas,\n    explicit: types\n  });\n};\n\n\nmodule.exports = Schema;\n","// Standard YAML's Core schema.\n// http://www.yaml.org/spec/1.2/spec.html#id2804923\n//\n// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.\n// So, Core schema has no distinctions from JSON schema is JS-YAML.\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  include: [\n    require('./json')\n  ]\n});\n","// JS-YAML's default schema for `load` function.\n// It is not described in the YAML specification.\n//\n// This schema is based on JS-YAML's default safe schema and includes\n// JavaScript-specific types: !!js/undefined, !!js/regexp and !!js/function.\n//\n// Also this schema is used as default base schema at `Schema.create` function.\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = Schema.DEFAULT = new Schema({\n  include: [\n    require('./default_safe')\n  ],\n  explicit: [\n    require('../type/js/undefined'),\n    require('../type/js/regexp'),\n    require('../type/js/function')\n  ]\n});\n","// JS-YAML's default schema for `safeLoad` function.\n// It is not described in the YAML specification.\n//\n// This schema is based on standard YAML's Core schema and includes most of\n// extra types described at YAML tag repository. (http://yaml.org/type/)\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  include: [\n    require('./core')\n  ],\n  implicit: [\n    require('../type/timestamp'),\n    require('../type/merge')\n  ],\n  explicit: [\n    require('../type/binary'),\n    require('../type/omap'),\n    require('../type/pairs'),\n    require('../type/set')\n  ]\n});\n","// Standard YAML's Failsafe schema.\n// http://www.yaml.org/spec/1.2/spec.html#id2802346\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  explicit: [\n    require('../type/str'),\n    require('../type/seq'),\n    require('../type/map')\n  ]\n});\n","// Standard YAML's JSON schema.\n// http://www.yaml.org/spec/1.2/spec.html#id2803231\n//\n// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.\n// So, this schema is not such strict as defined in the YAML specification.\n// It allows numbers in binary notaion, use `Null` and `NULL` as `null`, etc.\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  include: [\n    require('./failsafe')\n  ],\n  implicit: [\n    require('../type/null'),\n    require('../type/bool'),\n    require('../type/int'),\n    require('../type/float')\n  ]\n});\n","'use strict';\n\nvar YAMLException = require('./exception');\n\nvar TYPE_CONSTRUCTOR_OPTIONS = [\n  'kind',\n  'resolve',\n  'construct',\n  'instanceOf',\n  'predicate',\n  'represent',\n  'defaultStyle',\n  'styleAliases'\n];\n\nvar YAML_NODE_KINDS = [\n  'scalar',\n  'sequence',\n  'mapping'\n];\n\nfunction compileStyleAliases(map) {\n  var result = {};\n\n  if (null !== map) {\n    Object.keys(map).forEach(function (style) {\n      map[style].forEach(function (alias) {\n        result[String(alias)] = style;\n      });\n    });\n  }\n\n  return result;\n}\n\nfunction Type(tag, options) {\n  options = options || {};\n\n  Object.keys(options).forEach(function (name) {\n    if (-1 === TYPE_CONSTRUCTOR_OPTIONS.indexOf(name)) {\n      throw new YAMLException('Unknown option \"' + name + '\" is met in definition of \"' + tag + '\" YAML type.');\n    }\n  });\n\n  // TODO: Add tag format check.\n  this.tag          = tag;\n  this.kind         = options['kind']         || null;\n  this.resolve      = options['resolve']      || function () { return true; };\n  this.construct    = options['construct']    || function (data) { return data; };\n  this.instanceOf   = options['instanceOf']   || null;\n  this.predicate    = options['predicate']    || null;\n  this.represent    = options['represent']    || null;\n  this.defaultStyle = options['defaultStyle'] || null;\n  this.styleAliases = compileStyleAliases(options['styleAliases'] || null);\n\n  if (-1 === YAML_NODE_KINDS.indexOf(this.kind)) {\n    throw new YAMLException('Unknown kind \"' + this.kind + '\" is specified for \"' + tag + '\" YAML type.');\n  }\n}\n\nmodule.exports = Type;\n","'use strict';\n\n/*eslint-disable no-bitwise*/\n\n// A trick for browserified version.\n// Since we make browserifier to ignore `buffer` module, NodeBuffer will be undefined\nvar NodeBuffer = require('buffer').Buffer;\nvar Type       = require('../type');\n\n\n// [ 64, 65, 66 ] -> [ padding, CR, LF ]\nvar BASE64_MAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\\n\\r';\n\n\nfunction resolveYamlBinary(data) {\n  if (null === data) {\n    return false;\n  }\n\n  var code, idx, bitlen = 0, max = data.length, map = BASE64_MAP;\n\n  // Convert one by one.\n  for (idx = 0; idx < max; idx++) {\n    code = map.indexOf(data.charAt(idx));\n\n    // Skip CR/LF\n    if (code > 64) { continue; }\n\n    // Fail on illegal characters\n    if (code < 0) { return false; }\n\n    bitlen += 6;\n  }\n\n  // If there are any bits left, source was corrupted\n  return (bitlen % 8) === 0;\n}\n\nfunction constructYamlBinary(data) {\n  var idx, tailbits,\n      input = data.replace(/[\\r\\n=]/g, ''), // remove CR/LF & padding to simplify scan\n      max = input.length,\n      map = BASE64_MAP,\n      bits = 0,\n      result = [];\n\n  // Collect by 6*4 bits (3 bytes)\n\n  for (idx = 0; idx < max; idx++) {\n    if ((idx % 4 === 0) && idx) {\n      result.push((bits >> 16) & 0xFF);\n      result.push((bits >> 8) & 0xFF);\n      result.push(bits & 0xFF);\n    }\n\n    bits = (bits << 6) | map.indexOf(input.charAt(idx));\n  }\n\n  // Dump tail\n\n  tailbits = (max % 4) * 6;\n\n  if (tailbits === 0) {\n    result.push((bits >> 16) & 0xFF);\n    result.push((bits >> 8) & 0xFF);\n    result.push(bits & 0xFF);\n  } else if (tailbits === 18) {\n    result.push((bits >> 10) & 0xFF);\n    result.push((bits >> 2) & 0xFF);\n  } else if (tailbits === 12) {\n    result.push((bits >> 4) & 0xFF);\n  }\n\n  // Wrap into Buffer for NodeJS and leave Array for browser\n  if (NodeBuffer) {\n    return new NodeBuffer(result);\n  }\n\n  return result;\n}\n\nfunction representYamlBinary(object /*, style*/) {\n  var result = '', bits = 0, idx, tail,\n      max = object.length,\n      map = BASE64_MAP;\n\n  // Convert every three bytes to 4 ASCII characters.\n\n  for (idx = 0; idx < max; idx++) {\n    if ((idx % 3 === 0) && idx) {\n      result += map[(bits >> 18) & 0x3F];\n      result += map[(bits >> 12) & 0x3F];\n      result += map[(bits >> 6) & 0x3F];\n      result += map[bits & 0x3F];\n    }\n\n    bits = (bits << 8) + object[idx];\n  }\n\n  // Dump tail\n\n  tail = max % 3;\n\n  if (tail === 0) {\n    result += map[(bits >> 18) & 0x3F];\n    result += map[(bits >> 12) & 0x3F];\n    result += map[(bits >> 6) & 0x3F];\n    result += map[bits & 0x3F];\n  } else if (tail === 2) {\n    result += map[(bits >> 10) & 0x3F];\n    result += map[(bits >> 4) & 0x3F];\n    result += map[(bits << 2) & 0x3F];\n    result += map[64];\n  } else if (tail === 1) {\n    result += map[(bits >> 2) & 0x3F];\n    result += map[(bits << 4) & 0x3F];\n    result += map[64];\n    result += map[64];\n  }\n\n  return result;\n}\n\nfunction isBinary(object) {\n  return NodeBuffer && NodeBuffer.isBuffer(object);\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:binary', {\n  kind: 'scalar',\n  resolve: resolveYamlBinary,\n  construct: constructYamlBinary,\n  predicate: isBinary,\n  represent: representYamlBinary\n});\n","'use strict';\n\nvar Type = require('../type');\n\nfunction resolveYamlBoolean(data) {\n  if (null === data) {\n    return false;\n  }\n\n  var max = data.length;\n\n  return (max === 4 && (data === 'true' || data === 'True' || data === 'TRUE')) ||\n         (max === 5 && (data === 'false' || data === 'False' || data === 'FALSE'));\n}\n\nfunction constructYamlBoolean(data) {\n  return data === 'true' ||\n         data === 'True' ||\n         data === 'TRUE';\n}\n\nfunction isBoolean(object) {\n  return '[object Boolean]' === Object.prototype.toString.call(object);\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:bool', {\n  kind: 'scalar',\n  resolve: resolveYamlBoolean,\n  construct: constructYamlBoolean,\n  predicate: isBoolean,\n  represent: {\n    lowercase: function (object) { return object ? 'true' : 'false'; },\n    uppercase: function (object) { return object ? 'TRUE' : 'FALSE'; },\n    camelcase: function (object) { return object ? 'True' : 'False'; }\n  },\n  defaultStyle: 'lowercase'\n});\n","'use strict';\n\nvar common = require('../common');\nvar Type   = require('../type');\n\nvar YAML_FLOAT_PATTERN = new RegExp(\n  '^(?:[-+]?(?:[0-9][0-9_]*)\\\\.[0-9_]*(?:[eE][-+][0-9]+)?' +\n  '|\\\\.[0-9_]+(?:[eE][-+][0-9]+)?' +\n  '|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\\\.[0-9_]*' +\n  '|[-+]?\\\\.(?:inf|Inf|INF)' +\n  '|\\\\.(?:nan|NaN|NAN))$');\n\nfunction resolveYamlFloat(data) {\n  if (null === data) {\n    return false;\n  }\n\n  if (!YAML_FLOAT_PATTERN.test(data)) {\n    return false;\n  }\n  return true;\n}\n\nfunction constructYamlFloat(data) {\n  var value, sign, base, digits;\n\n  value  = data.replace(/_/g, '').toLowerCase();\n  sign   = '-' === value[0] ? -1 : 1;\n  digits = [];\n\n  if (0 <= '+-'.indexOf(value[0])) {\n    value = value.slice(1);\n  }\n\n  if ('.inf' === value) {\n    return (1 === sign) ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY;\n\n  } else if ('.nan' === value) {\n    return NaN;\n\n  } else if (0 <= value.indexOf(':')) {\n    value.split(':').forEach(function (v) {\n      digits.unshift(parseFloat(v, 10));\n    });\n\n    value = 0.0;\n    base = 1;\n\n    digits.forEach(function (d) {\n      value += d * base;\n      base *= 60;\n    });\n\n    return sign * value;\n\n  }\n  return sign * parseFloat(value, 10);\n}\n\n\nvar SCIENTIFIC_WITHOUT_DOT = /^[-+]?[0-9]+e/;\n\nfunction representYamlFloat(object, style) {\n  var res;\n\n  if (isNaN(object)) {\n    switch (style) {\n    case 'lowercase':\n      return '.nan';\n    case 'uppercase':\n      return '.NAN';\n    case 'camelcase':\n      return '.NaN';\n    }\n  } else if (Number.POSITIVE_INFINITY === object) {\n    switch (style) {\n    case 'lowercase':\n      return '.inf';\n    case 'uppercase':\n      return '.INF';\n    case 'camelcase':\n      return '.Inf';\n    }\n  } else if (Number.NEGATIVE_INFINITY === object) {\n    switch (style) {\n    case 'lowercase':\n      return '-.inf';\n    case 'uppercase':\n      return '-.INF';\n    case 'camelcase':\n      return '-.Inf';\n    }\n  } else if (common.isNegativeZero(object)) {\n    return '-0.0';\n  }\n\n  res = object.toString(10);\n\n  // JS stringifier can build scientific format without dots: 5e-100,\n  // while YAML requres dot: 5.e-100. Fix it with simple hack\n\n  return SCIENTIFIC_WITHOUT_DOT.test(res) ? res.replace('e', '.e') : res;\n}\n\nfunction isFloat(object) {\n  return ('[object Number]' === Object.prototype.toString.call(object)) &&\n         (0 !== object % 1 || common.isNegativeZero(object));\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:float', {\n  kind: 'scalar',\n  resolve: resolveYamlFloat,\n  construct: constructYamlFloat,\n  predicate: isFloat,\n  represent: representYamlFloat,\n  defaultStyle: 'lowercase'\n});\n","'use strict';\n\nvar common = require('../common');\nvar Type   = require('../type');\n\nfunction isHexCode(c) {\n  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) ||\n         ((0x41/* A */ <= c) && (c <= 0x46/* F */)) ||\n         ((0x61/* a */ <= c) && (c <= 0x66/* f */));\n}\n\nfunction isOctCode(c) {\n  return ((0x30/* 0 */ <= c) && (c <= 0x37/* 7 */));\n}\n\nfunction isDecCode(c) {\n  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */));\n}\n\nfunction resolveYamlInteger(data) {\n  if (null === data) {\n    return false;\n  }\n\n  var max = data.length,\n      index = 0,\n      hasDigits = false,\n      ch;\n\n  if (!max) { return false; }\n\n  ch = data[index];\n\n  // sign\n  if (ch === '-' || ch === '+') {\n    ch = data[++index];\n  }\n\n  if (ch === '0') {\n    // 0\n    if (index + 1 === max) { return true; }\n    ch = data[++index];\n\n    // base 2, base 8, base 16\n\n    if (ch === 'b') {\n      // base 2\n      index++;\n\n      for (; index < max; index++) {\n        ch = data[index];\n        if (ch === '_') { continue; }\n        if (ch !== '0' && ch !== '1') {\n          return false;\n        }\n        hasDigits = true;\n      }\n      return hasDigits;\n    }\n\n\n    if (ch === 'x') {\n      // base 16\n      index++;\n\n      for (; index < max; index++) {\n        ch = data[index];\n        if (ch === '_') { continue; }\n        if (!isHexCode(data.charCodeAt(index))) {\n          return false;\n        }\n        hasDigits = true;\n      }\n      return hasDigits;\n    }\n\n    // base 8\n    for (; index < max; index++) {\n      ch = data[index];\n      if (ch === '_') { continue; }\n      if (!isOctCode(data.charCodeAt(index))) {\n        return false;\n      }\n      hasDigits = true;\n    }\n    return hasDigits;\n  }\n\n  // base 10 (except 0) or base 60\n\n  for (; index < max; index++) {\n    ch = data[index];\n    if (ch === '_') { continue; }\n    if (ch === ':') { break; }\n    if (!isDecCode(data.charCodeAt(index))) {\n      return false;\n    }\n    hasDigits = true;\n  }\n\n  if (!hasDigits) { return false; }\n\n  // if !base60 - done;\n  if (ch !== ':') { return true; }\n\n  // base60 almost not used, no needs to optimize\n  return /^(:[0-5]?[0-9])+$/.test(data.slice(index));\n}\n\nfunction constructYamlInteger(data) {\n  var value = data, sign = 1, ch, base, digits = [];\n\n  if (value.indexOf('_') !== -1) {\n    value = value.replace(/_/g, '');\n  }\n\n  ch = value[0];\n\n  if (ch === '-' || ch === '+') {\n    if (ch === '-') { sign = -1; }\n    value = value.slice(1);\n    ch = value[0];\n  }\n\n  if ('0' === value) {\n    return 0;\n  }\n\n  if (ch === '0') {\n    if (value[1] === 'b') {\n      return sign * parseInt(value.slice(2), 2);\n    }\n    if (value[1] === 'x') {\n      return sign * parseInt(value, 16);\n    }\n    return sign * parseInt(value, 8);\n\n  }\n\n  if (value.indexOf(':') !== -1) {\n    value.split(':').forEach(function (v) {\n      digits.unshift(parseInt(v, 10));\n    });\n\n    value = 0;\n    base = 1;\n\n    digits.forEach(function (d) {\n      value += (d * base);\n      base *= 60;\n    });\n\n    return sign * value;\n\n  }\n\n  return sign * parseInt(value, 10);\n}\n\nfunction isInteger(object) {\n  return ('[object Number]' === Object.prototype.toString.call(object)) &&\n         (0 === object % 1 && !common.isNegativeZero(object));\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:int', {\n  kind: 'scalar',\n  resolve: resolveYamlInteger,\n  construct: constructYamlInteger,\n  predicate: isInteger,\n  represent: {\n    binary:      function (object) { return '0b' + object.toString(2); },\n    octal:       function (object) { return '0'  + object.toString(8); },\n    decimal:     function (object) { return        object.toString(10); },\n    hexadecimal: function (object) { return '0x' + object.toString(16).toUpperCase(); }\n  },\n  defaultStyle: 'decimal',\n  styleAliases: {\n    binary:      [ 2,  'bin' ],\n    octal:       [ 8,  'oct' ],\n    decimal:     [ 10, 'dec' ],\n    hexadecimal: [ 16, 'hex' ]\n  }\n});\n","'use strict';\n\nvar esprima;\n\n// Browserified version does not have esprima\n//\n// 1. For node.js just require module as deps\n// 2. For browser try to require mudule via external AMD system.\n//    If not found - try to fallback to window.esprima. If not\n//    found too - then fail to parse.\n//\ntry {\n  esprima = require('esprima');\n} catch (_) {\n  /*global window */\n  if (typeof window !== 'undefined') { esprima = window.esprima; }\n}\n\nvar Type = require('../../type');\n\nfunction resolveJavascriptFunction(data) {\n  if (null === data) {\n    return false;\n  }\n\n  try {\n    var source = '(' + data + ')',\n        ast    = esprima.parse(source, { range: true });\n\n    if ('Program'             !== ast.type         ||\n        1                     !== ast.body.length  ||\n        'ExpressionStatement' !== ast.body[0].type ||\n        'FunctionExpression'  !== ast.body[0].expression.type) {\n      return false;\n    }\n\n    return true;\n  } catch (err) {\n    return false;\n  }\n}\n\nfunction constructJavascriptFunction(data) {\n  /*jslint evil:true*/\n\n  var source = '(' + data + ')',\n      ast    = esprima.parse(source, { range: true }),\n      params = [],\n      body;\n\n  if ('Program'             !== ast.type         ||\n      1                     !== ast.body.length  ||\n      'ExpressionStatement' !== ast.body[0].type ||\n      'FunctionExpression'  !== ast.body[0].expression.type) {\n    throw new Error('Failed to resolve function');\n  }\n\n  ast.body[0].expression.params.forEach(function (param) {\n    params.push(param.name);\n  });\n\n  body = ast.body[0].expression.body.range;\n\n  // Esprima's ranges include the first '{' and the last '}' characters on\n  // function expressions. So cut them out.\n  /*eslint-disable no-new-func*/\n  return new Function(params, source.slice(body[0] + 1, body[1] - 1));\n}\n\nfunction representJavascriptFunction(object /*, style*/) {\n  return object.toString();\n}\n\nfunction isFunction(object) {\n  return '[object Function]' === Object.prototype.toString.call(object);\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:js/function', {\n  kind: 'scalar',\n  resolve: resolveJavascriptFunction,\n  construct: constructJavascriptFunction,\n  predicate: isFunction,\n  represent: representJavascriptFunction\n});\n","'use strict';\n\nvar Type = require('../../type');\n\nfunction resolveJavascriptRegExp(data) {\n  if (null === data) {\n    return false;\n  }\n\n  if (0 === data.length) {\n    return false;\n  }\n\n  var regexp = data,\n      tail   = /\\/([gim]*)$/.exec(data),\n      modifiers = '';\n\n  // if regexp starts with '/' it can have modifiers and must be properly closed\n  // `/foo/gim` - modifiers tail can be maximum 3 chars\n  if ('/' === regexp[0]) {\n    if (tail) {\n      modifiers = tail[1];\n    }\n\n    if (modifiers.length > 3) { return false; }\n    // if expression starts with /, is should be properly terminated\n    if (regexp[regexp.length - modifiers.length - 1] !== '/') { return false; }\n\n    regexp = regexp.slice(1, regexp.length - modifiers.length - 1);\n  }\n\n  try {\n    return true;\n  } catch (error) {\n    return false;\n  }\n}\n\nfunction constructJavascriptRegExp(data) {\n  var regexp = data,\n      tail   = /\\/([gim]*)$/.exec(data),\n      modifiers = '';\n\n  // `/foo/gim` - tail can be maximum 4 chars\n  if ('/' === regexp[0]) {\n    if (tail) {\n      modifiers = tail[1];\n    }\n    regexp = regexp.slice(1, regexp.length - modifiers.length - 1);\n  }\n\n  return new RegExp(regexp, modifiers);\n}\n\nfunction representJavascriptRegExp(object /*, style*/) {\n  var result = '/' + object.source + '/';\n\n  if (object.global) {\n    result += 'g';\n  }\n\n  if (object.multiline) {\n    result += 'm';\n  }\n\n  if (object.ignoreCase) {\n    result += 'i';\n  }\n\n  return result;\n}\n\nfunction isRegExp(object) {\n  return '[object RegExp]' === Object.prototype.toString.call(object);\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:js/regexp', {\n  kind: 'scalar',\n  resolve: resolveJavascriptRegExp,\n  construct: constructJavascriptRegExp,\n  predicate: isRegExp,\n  represent: representJavascriptRegExp\n});\n","'use strict';\n\nvar Type = require('../../type');\n\nfunction resolveJavascriptUndefined() {\n  return true;\n}\n\nfunction constructJavascriptUndefined() {\n  /*eslint-disable no-undefined*/\n  return undefined;\n}\n\nfunction representJavascriptUndefined() {\n  return '';\n}\n\nfunction isUndefined(object) {\n  return 'undefined' === typeof object;\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:js/undefined', {\n  kind: 'scalar',\n  resolve: resolveJavascriptUndefined,\n  construct: constructJavascriptUndefined,\n  predicate: isUndefined,\n  represent: representJavascriptUndefined\n});\n","'use strict';\n\nvar Type = require('../type');\n\nmodule.exports = new Type('tag:yaml.org,2002:map', {\n  kind: 'mapping',\n  construct: function (data) { return null !== data ? data : {}; }\n});\n","'use strict';\n\nvar Type = require('../type');\n\nfunction resolveYamlMerge(data) {\n  return '<<' === data || null === data;\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:merge', {\n  kind: 'scalar',\n  resolve: resolveYamlMerge\n});\n","'use strict';\n\nvar Type = require('../type');\n\nfunction resolveYamlNull(data) {\n  if (null === data) {\n    return true;\n  }\n\n  var max = data.length;\n\n  return (max === 1 && data === '~') ||\n         (max === 4 && (data === 'null' || data === 'Null' || data === 'NULL'));\n}\n\nfunction constructYamlNull() {\n  return null;\n}\n\nfunction isNull(object) {\n  return null === object;\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:null', {\n  kind: 'scalar',\n  resolve: resolveYamlNull,\n  construct: constructYamlNull,\n  predicate: isNull,\n  represent: {\n    canonical: function () { return '~';    },\n    lowercase: function () { return 'null'; },\n    uppercase: function () { return 'NULL'; },\n    camelcase: function () { return 'Null'; }\n  },\n  defaultStyle: 'lowercase'\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\nvar _toString       = Object.prototype.toString;\n\nfunction resolveYamlOmap(data) {\n  if (null === data) {\n    return true;\n  }\n\n  var objectKeys = [], index, length, pair, pairKey, pairHasKey,\n      object = data;\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    pair = object[index];\n    pairHasKey = false;\n\n    if ('[object Object]' !== _toString.call(pair)) {\n      return false;\n    }\n\n    for (pairKey in pair) {\n      if (_hasOwnProperty.call(pair, pairKey)) {\n        if (!pairHasKey) {\n          pairHasKey = true;\n        } else {\n          return false;\n        }\n      }\n    }\n\n    if (!pairHasKey) {\n      return false;\n    }\n\n    if (-1 === objectKeys.indexOf(pairKey)) {\n      objectKeys.push(pairKey);\n    } else {\n      return false;\n    }\n  }\n\n  return true;\n}\n\nfunction constructYamlOmap(data) {\n  return null !== data ? data : [];\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:omap', {\n  kind: 'sequence',\n  resolve: resolveYamlOmap,\n  construct: constructYamlOmap\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar _toString = Object.prototype.toString;\n\nfunction resolveYamlPairs(data) {\n  if (null === data) {\n    return true;\n  }\n\n  var index, length, pair, keys, result,\n      object = data;\n\n  result = new Array(object.length);\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    pair = object[index];\n\n    if ('[object Object]' !== _toString.call(pair)) {\n      return false;\n    }\n\n    keys = Object.keys(pair);\n\n    if (1 !== keys.length) {\n      return false;\n    }\n\n    result[index] = [ keys[0], pair[keys[0]] ];\n  }\n\n  return true;\n}\n\nfunction constructYamlPairs(data) {\n  if (null === data) {\n    return [];\n  }\n\n  var index, length, pair, keys, result,\n      object = data;\n\n  result = new Array(object.length);\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    pair = object[index];\n\n    keys = Object.keys(pair);\n\n    result[index] = [ keys[0], pair[keys[0]] ];\n  }\n\n  return result;\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:pairs', {\n  kind: 'sequence',\n  resolve: resolveYamlPairs,\n  construct: constructYamlPairs\n});\n","'use strict';\n\nvar Type = require('../type');\n\nmodule.exports = new Type('tag:yaml.org,2002:seq', {\n  kind: 'sequence',\n  construct: function (data) { return null !== data ? data : []; }\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\n\nfunction resolveYamlSet(data) {\n  if (null === data) {\n    return true;\n  }\n\n  var key, object = data;\n\n  for (key in object) {\n    if (_hasOwnProperty.call(object, key)) {\n      if (null !== object[key]) {\n        return false;\n      }\n    }\n  }\n\n  return true;\n}\n\nfunction constructYamlSet(data) {\n  return null !== data ? data : {};\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:set', {\n  kind: 'mapping',\n  resolve: resolveYamlSet,\n  construct: constructYamlSet\n});\n","'use strict';\n\nvar Type = require('../type');\n\nmodule.exports = new Type('tag:yaml.org,2002:str', {\n  kind: 'scalar',\n  construct: function (data) { return null !== data ? data : ''; }\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar YAML_TIMESTAMP_REGEXP = new RegExp(\n  '^([0-9][0-9][0-9][0-9])'          + // [1] year\n  '-([0-9][0-9]?)'                   + // [2] month\n  '-([0-9][0-9]?)'                   + // [3] day\n  '(?:(?:[Tt]|[ \\\\t]+)'              + // ...\n  '([0-9][0-9]?)'                    + // [4] hour\n  ':([0-9][0-9])'                    + // [5] minute\n  ':([0-9][0-9])'                    + // [6] second\n  '(?:\\\\.([0-9]*))?'                 + // [7] fraction\n  '(?:[ \\\\t]*(Z|([-+])([0-9][0-9]?)' + // [8] tz [9] tz_sign [10] tz_hour\n  '(?::([0-9][0-9]))?))?)?$');         // [11] tz_minute\n\nfunction resolveYamlTimestamp(data) {\n  if (null === data) {\n    return false;\n  }\n\n  if (YAML_TIMESTAMP_REGEXP.exec(data) === null) {\n    return false;\n  }\n\n  return true;\n}\n\nfunction constructYamlTimestamp(data) {\n  var match, year, month, day, hour, minute, second, fraction = 0,\n      delta = null, tz_hour, tz_minute, date;\n\n  match = YAML_TIMESTAMP_REGEXP.exec(data);\n\n  if (null === match) {\n    throw new Error('Date resolve error');\n  }\n\n  // match: [1] year [2] month [3] day\n\n  year = +(match[1]);\n  month = +(match[2]) - 1; // JS month starts with 0\n  day = +(match[3]);\n\n  if (!match[4]) { // no hour\n    return new Date(Date.UTC(year, month, day));\n  }\n\n  // match: [4] hour [5] minute [6] second [7] fraction\n\n  hour = +(match[4]);\n  minute = +(match[5]);\n  second = +(match[6]);\n\n  if (match[7]) {\n    fraction = match[7].slice(0, 3);\n    while (fraction.length < 3) { // milli-seconds\n      fraction += '0';\n    }\n    fraction = +fraction;\n  }\n\n  // match: [8] tz [9] tz_sign [10] tz_hour [11] tz_minute\n\n  if (match[9]) {\n    tz_hour = +(match[10]);\n    tz_minute = +(match[11] || 0);\n    delta = (tz_hour * 60 + tz_minute) * 60000; // delta in mili-seconds\n    if ('-' === match[9]) {\n      delta = -delta;\n    }\n  }\n\n  date = new Date(Date.UTC(year, month, day, hour, minute, second, fraction));\n\n  if (delta) {\n    date.setTime(date.getTime() - delta);\n  }\n\n  return date;\n}\n\nfunction representYamlTimestamp(object /*, style*/) {\n  return object.toISOString();\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:timestamp', {\n  kind: 'scalar',\n  resolve: resolveYamlTimestamp,\n  construct: constructYamlTimestamp,\n  instanceOf: Date,\n  represent: representYamlTimestamp\n});\n","/*\n  Copyright (c) jQuery Foundation, Inc. and Contributors, All Rights Reserved.\n\n  Redistribution and use in source and binary forms, with or without\n  modification, are permitted provided that the following conditions are met:\n\n    * Redistributions of source code must retain the above copyright\n      notice, this list of conditions and the following disclaimer.\n    * Redistributions in binary form must reproduce the above copyright\n      notice, this list of conditions and the following disclaimer in the\n      documentation and/or other materials provided with the distribution.\n\n  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY\n  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\n  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n*/\n\n(function (root, factory) {\n    'use strict';\n\n    // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js,\n    // Rhino, and plain browser loading.\n\n    /* istanbul ignore next */\n    if (typeof define === 'function' && define.amd) {\n        define(['exports'], factory);\n    } else if (typeof exports !== 'undefined') {\n        factory(exports);\n    } else {\n        factory((root.esprima = {}));\n    }\n}(this, function (exports) {\n    'use strict';\n\n    var Token,\n        TokenName,\n        FnExprTokens,\n        Syntax,\n        PlaceHolders,\n        Messages,\n        Regex,\n        source,\n        strict,\n        index,\n        lineNumber,\n        lineStart,\n        hasLineTerminator,\n        lastIndex,\n        lastLineNumber,\n        lastLineStart,\n        startIndex,\n        startLineNumber,\n        startLineStart,\n        scanning,\n        length,\n        lookahead,\n        state,\n        extra,\n        isBindingElement,\n        isAssignmentTarget,\n        firstCoverInitializedNameError;\n\n    Token = {\n        BooleanLiteral: 1,\n        EOF: 2,\n        Identifier: 3,\n        Keyword: 4,\n        NullLiteral: 5,\n        NumericLiteral: 6,\n        Punctuator: 7,\n        StringLiteral: 8,\n        RegularExpression: 9,\n        Template: 10\n    };\n\n    TokenName = {};\n    TokenName[Token.BooleanLiteral] = 'Boolean';\n    TokenName[Token.EOF] = '<end>';\n    TokenName[Token.Identifier] = 'Identifier';\n    TokenName[Token.Keyword] = 'Keyword';\n    TokenName[Token.NullLiteral] = 'Null';\n    TokenName[Token.NumericLiteral] = 'Numeric';\n    TokenName[Token.Punctuator] = 'Punctuator';\n    TokenName[Token.StringLiteral] = 'String';\n    TokenName[Token.RegularExpression] = 'RegularExpression';\n    TokenName[Token.Template] = 'Template';\n\n    // A function following one of those tokens is an expression.\n    FnExprTokens = ['(', '{', '[', 'in', 'typeof', 'instanceof', 'new',\n                    'return', 'case', 'delete', 'throw', 'void',\n                    // assignment operators\n                    '=', '+=', '-=', '*=', '/=', '%=', '<<=', '>>=', '>>>=',\n                    '&=', '|=', '^=', ',',\n                    // binary/unary operators\n                    '+', '-', '*', '/', '%', '++', '--', '<<', '>>', '>>>', '&',\n                    '|', '^', '!', '~', '&&', '||', '?', ':', '===', '==', '>=',\n                    '<=', '<', '>', '!=', '!=='];\n\n    Syntax = {\n        AssignmentExpression: 'AssignmentExpression',\n        AssignmentPattern: 'AssignmentPattern',\n        ArrayExpression: 'ArrayExpression',\n        ArrayPattern: 'ArrayPattern',\n        ArrowFunctionExpression: 'ArrowFunctionExpression',\n        BlockStatement: 'BlockStatement',\n        BinaryExpression: 'BinaryExpression',\n        BreakStatement: 'BreakStatement',\n        CallExpression: 'CallExpression',\n        CatchClause: 'CatchClause',\n        ClassBody: 'ClassBody',\n        ClassDeclaration: 'ClassDeclaration',\n        ClassExpression: 'ClassExpression',\n        ConditionalExpression: 'ConditionalExpression',\n        ContinueStatement: 'ContinueStatement',\n        DoWhileStatement: 'DoWhileStatement',\n        DebuggerStatement: 'DebuggerStatement',\n        EmptyStatement: 'EmptyStatement',\n        ExportAllDeclaration: 'ExportAllDeclaration',\n        ExportDefaultDeclaration: 'ExportDefaultDeclaration',\n        ExportNamedDeclaration: 'ExportNamedDeclaration',\n        ExportSpecifier: 'ExportSpecifier',\n        ExpressionStatement: 'ExpressionStatement',\n        ForStatement: 'ForStatement',\n        ForOfStatement: 'ForOfStatement',\n        ForInStatement: 'ForInStatement',\n        FunctionDeclaration: 'FunctionDeclaration',\n        FunctionExpression: 'FunctionExpression',\n        Identifier: 'Identifier',\n        IfStatement: 'IfStatement',\n        ImportDeclaration: 'ImportDeclaration',\n        ImportDefaultSpecifier: 'ImportDefaultSpecifier',\n        ImportNamespaceSpecifier: 'ImportNamespaceSpecifier',\n        ImportSpecifier: 'ImportSpecifier',\n        Literal: 'Literal',\n        LabeledStatement: 'LabeledStatement',\n        LogicalExpression: 'LogicalExpression',\n        MemberExpression: 'MemberExpression',\n        MetaProperty: 'MetaProperty',\n        MethodDefinition: 'MethodDefinition',\n        NewExpression: 'NewExpression',\n        ObjectExpression: 'ObjectExpression',\n        ObjectPattern: 'ObjectPattern',\n        Program: 'Program',\n        Property: 'Property',\n        RestElement: 'RestElement',\n        ReturnStatement: 'ReturnStatement',\n        SequenceExpression: 'SequenceExpression',\n        SpreadElement: 'SpreadElement',\n        Super: 'Super',\n        SwitchCase: 'SwitchCase',\n        SwitchStatement: 'SwitchStatement',\n        TaggedTemplateExpression: 'TaggedTemplateExpression',\n        TemplateElement: 'TemplateElement',\n        TemplateLiteral: 'TemplateLiteral',\n        ThisExpression: 'ThisExpression',\n        ThrowStatement: 'ThrowStatement',\n        TryStatement: 'TryStatement',\n        UnaryExpression: 'UnaryExpression',\n        UpdateExpression: 'UpdateExpression',\n        VariableDeclaration: 'VariableDeclaration',\n        VariableDeclarator: 'VariableDeclarator',\n        WhileStatement: 'WhileStatement',\n        WithStatement: 'WithStatement',\n        YieldExpression: 'YieldExpression'\n    };\n\n    PlaceHolders = {\n        ArrowParameterPlaceHolder: 'ArrowParameterPlaceHolder'\n    };\n\n    // Error messages should be identical to V8.\n    Messages = {\n        UnexpectedToken: 'Unexpected token %0',\n        UnexpectedNumber: 'Unexpected number',\n        UnexpectedString: 'Unexpected string',\n        UnexpectedIdentifier: 'Unexpected identifier',\n        UnexpectedReserved: 'Unexpected reserved word',\n        UnexpectedTemplate: 'Unexpected quasi %0',\n        UnexpectedEOS: 'Unexpected end of input',\n        NewlineAfterThrow: 'Illegal newline after throw',\n        InvalidRegExp: 'Invalid regular expression',\n        UnterminatedRegExp: 'Invalid regular expression: missing /',\n        InvalidLHSInAssignment: 'Invalid left-hand side in assignment',\n        InvalidLHSInForIn: 'Invalid left-hand side in for-in',\n        InvalidLHSInForLoop: 'Invalid left-hand side in for-loop',\n        MultipleDefaultsInSwitch: 'More than one default clause in switch statement',\n        NoCatchOrFinally: 'Missing catch or finally after try',\n        UnknownLabel: 'Undefined label \\'%0\\'',\n        Redeclaration: '%0 \\'%1\\' has already been declared',\n        IllegalContinue: 'Illegal continue statement',\n        IllegalBreak: 'Illegal break statement',\n        IllegalReturn: 'Illegal return statement',\n        StrictModeWith: 'Strict mode code may not include a with statement',\n        StrictCatchVariable: 'Catch variable may not be eval or arguments in strict mode',\n        StrictVarName: 'Variable name may not be eval or arguments in strict mode',\n        StrictParamName: 'Parameter name eval or arguments is not allowed in strict mode',\n        StrictParamDupe: 'Strict mode function may not have duplicate parameter names',\n        StrictFunctionName: 'Function name may not be eval or arguments in strict mode',\n        StrictOctalLiteral: 'Octal literals are not allowed in strict mode.',\n        StrictDelete: 'Delete of an unqualified identifier in strict mode.',\n        StrictLHSAssignment: 'Assignment to eval or arguments is not allowed in strict mode',\n        StrictLHSPostfix: 'Postfix increment/decrement may not have eval or arguments operand in strict mode',\n        StrictLHSPrefix: 'Prefix increment/decrement may not have eval or arguments operand in strict mode',\n        StrictReservedWord: 'Use of future reserved word in strict mode',\n        TemplateOctalLiteral: 'Octal literals are not allowed in template strings.',\n        ParameterAfterRestParameter: 'Rest parameter must be last formal parameter',\n        DefaultRestParameter: 'Unexpected token =',\n        ObjectPatternAsRestParameter: 'Unexpected token {',\n        DuplicateProtoProperty: 'Duplicate __proto__ fields are not allowed in object literals',\n        ConstructorSpecialMethod: 'Class constructor may not be an accessor',\n        DuplicateConstructor: 'A class may only have one constructor',\n        StaticPrototype: 'Classes may not have static property named prototype',\n        MissingFromClause: 'Unexpected token',\n        NoAsAfterImportNamespace: 'Unexpected token',\n        InvalidModuleSpecifier: 'Unexpected token',\n        IllegalImportDeclaration: 'Unexpected token',\n        IllegalExportDeclaration: 'Unexpected token',\n        DuplicateBinding: 'Duplicate binding %0'\n    };\n\n    // See also tools/generate-unicode-regex.js.\n    Regex = {\n        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierStart:\n        NonAsciiIdentifierStart: /[\\xAA\\xB5\\xBA\\xC0-\\xD6\\xD8-\\xF6\\xF8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u037F\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u048A-\\u052F\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0620-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0800-\\u0815\\u081A\\u0824\\u0828\\u0840-\\u0858\\u08A0-\\u08B2\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0971-\\u0980\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C39\\u0C3D\\u0C58\\u0C59\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0CF1\\u0CF2\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D\\u0D4E\\u0D60\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EDC-\\u0EDF\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8C\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10C7\\u10CD\\u10D0-\\u10FA\\u10FC-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u167F\\u1681-\\u169A\\u16A0-\\u16EA\\u16EE-\\u16F8\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u18B0-\\u18F5\\u1900-\\u191E\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19C1-\\u19C7\\u1A00-\\u1A16\\u1A20-\\u1A54\\u1AA7\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE\\u1BAF\\u1BBA-\\u1BE5\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D\\u1CE9-\\u1CEC\\u1CEE-\\u1CF1\\u1CF5\\u1CF6\\u1D00-\\u1DBF\\u1E00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u209C\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2118-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2160-\\u2188\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2CE4\\u2CEB-\\u2CEE\\u2CF2\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\u2D30-\\u2D67\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u3005-\\u3007\\u3021-\\u3029\\u3031-\\u3035\\u3038-\\u303C\\u3041-\\u3096\\u309B-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FCC\\uA000-\\uA48C\\uA4D0-\\uA4FD\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA66E\\uA67F-\\uA69D\\uA6A0-\\uA6EF\\uA717-\\uA71F\\uA722-\\uA788\\uA78B-\\uA78E\\uA790-\\uA7AD\\uA7B0\\uA7B1\\uA7F7-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA8F2-\\uA8F7\\uA8FB\\uA90A-\\uA925\\uA930-\\uA946\\uA960-\\uA97C\\uA984-\\uA9B2\\uA9CF\\uA9E0-\\uA9E4\\uA9E6-\\uA9EF\\uA9FA-\\uA9FE\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAA60-\\uAA76\\uAA7A\\uAA7E-\\uAAAF\\uAAB1\\uAAB5\\uAAB6\\uAAB9-\\uAABD\\uAAC0\\uAAC2\\uAADB-\\uAADD\\uAAE0-\\uAAEA\\uAAF2-\\uAAF4\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uAB30-\\uAB5A\\uAB5C-\\uAB5F\\uAB64\\uAB65\\uABC0-\\uABE2\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]|\\uD800[\\uDC00-\\uDC0B\\uDC0D-\\uDC26\\uDC28-\\uDC3A\\uDC3C\\uDC3D\\uDC3F-\\uDC4D\\uDC50-\\uDC5D\\uDC80-\\uDCFA\\uDD40-\\uDD74\\uDE80-\\uDE9C\\uDEA0-\\uDED0\\uDF00-\\uDF1F\\uDF30-\\uDF4A\\uDF50-\\uDF75\\uDF80-\\uDF9D\\uDFA0-\\uDFC3\\uDFC8-\\uDFCF\\uDFD1-\\uDFD5]|\\uD801[\\uDC00-\\uDC9D\\uDD00-\\uDD27\\uDD30-\\uDD63\\uDE00-\\uDF36\\uDF40-\\uDF55\\uDF60-\\uDF67]|\\uD802[\\uDC00-\\uDC05\\uDC08\\uDC0A-\\uDC35\\uDC37\\uDC38\\uDC3C\\uDC3F-\\uDC55\\uDC60-\\uDC76\\uDC80-\\uDC9E\\uDD00-\\uDD15\\uDD20-\\uDD39\\uDD80-\\uDDB7\\uDDBE\\uDDBF\\uDE00\\uDE10-\\uDE13\\uDE15-\\uDE17\\uDE19-\\uDE33\\uDE60-\\uDE7C\\uDE80-\\uDE9C\\uDEC0-\\uDEC7\\uDEC9-\\uDEE4\\uDF00-\\uDF35\\uDF40-\\uDF55\\uDF60-\\uDF72\\uDF80-\\uDF91]|\\uD803[\\uDC00-\\uDC48]|\\uD804[\\uDC03-\\uDC37\\uDC83-\\uDCAF\\uDCD0-\\uDCE8\\uDD03-\\uDD26\\uDD50-\\uDD72\\uDD76\\uDD83-\\uDDB2\\uDDC1-\\uDDC4\\uDDDA\\uDE00-\\uDE11\\uDE13-\\uDE2B\\uDEB0-\\uDEDE\\uDF05-\\uDF0C\\uDF0F\\uDF10\\uDF13-\\uDF28\\uDF2A-\\uDF30\\uDF32\\uDF33\\uDF35-\\uDF39\\uDF3D\\uDF5D-\\uDF61]|\\uD805[\\uDC80-\\uDCAF\\uDCC4\\uDCC5\\uDCC7\\uDD80-\\uDDAE\\uDE00-\\uDE2F\\uDE44\\uDE80-\\uDEAA]|\\uD806[\\uDCA0-\\uDCDF\\uDCFF\\uDEC0-\\uDEF8]|\\uD808[\\uDC00-\\uDF98]|\\uD809[\\uDC00-\\uDC6E]|[\\uD80C\\uD840-\\uD868\\uD86A-\\uD86C][\\uDC00-\\uDFFF]|\\uD80D[\\uDC00-\\uDC2E]|\\uD81A[\\uDC00-\\uDE38\\uDE40-\\uDE5E\\uDED0-\\uDEED\\uDF00-\\uDF2F\\uDF40-\\uDF43\\uDF63-\\uDF77\\uDF7D-\\uDF8F]|\\uD81B[\\uDF00-\\uDF44\\uDF50\\uDF93-\\uDF9F]|\\uD82C[\\uDC00\\uDC01]|\\uD82F[\\uDC00-\\uDC6A\\uDC70-\\uDC7C\\uDC80-\\uDC88\\uDC90-\\uDC99]|\\uD835[\\uDC00-\\uDC54\\uDC56-\\uDC9C\\uDC9E\\uDC9F\\uDCA2\\uDCA5\\uDCA6\\uDCA9-\\uDCAC\\uDCAE-\\uDCB9\\uDCBB\\uDCBD-\\uDCC3\\uDCC5-\\uDD05\\uDD07-\\uDD0A\\uDD0D-\\uDD14\\uDD16-\\uDD1C\\uDD1E-\\uDD39\\uDD3B-\\uDD3E\\uDD40-\\uDD44\\uDD46\\uDD4A-\\uDD50\\uDD52-\\uDEA5\\uDEA8-\\uDEC0\\uDEC2-\\uDEDA\\uDEDC-\\uDEFA\\uDEFC-\\uDF14\\uDF16-\\uDF34\\uDF36-\\uDF4E\\uDF50-\\uDF6E\\uDF70-\\uDF88\\uDF8A-\\uDFA8\\uDFAA-\\uDFC2\\uDFC4-\\uDFCB]|\\uD83A[\\uDC00-\\uDCC4]|\\uD83B[\\uDE00-\\uDE03\\uDE05-\\uDE1F\\uDE21\\uDE22\\uDE24\\uDE27\\uDE29-\\uDE32\\uDE34-\\uDE37\\uDE39\\uDE3B\\uDE42\\uDE47\\uDE49\\uDE4B\\uDE4D-\\uDE4F\\uDE51\\uDE52\\uDE54\\uDE57\\uDE59\\uDE5B\\uDE5D\\uDE5F\\uDE61\\uDE62\\uDE64\\uDE67-\\uDE6A\\uDE6C-\\uDE72\\uDE74-\\uDE77\\uDE79-\\uDE7C\\uDE7E\\uDE80-\\uDE89\\uDE8B-\\uDE9B\\uDEA1-\\uDEA3\\uDEA5-\\uDEA9\\uDEAB-\\uDEBB]|\\uD869[\\uDC00-\\uDED6\\uDF00-\\uDFFF]|\\uD86D[\\uDC00-\\uDF34\\uDF40-\\uDFFF]|\\uD86E[\\uDC00-\\uDC1D]|\\uD87E[\\uDC00-\\uDE1D]/,\n\n        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierPart:\n        NonAsciiIdentifierPart: /[\\xAA\\xB5\\xB7\\xBA\\xC0-\\xD6\\xD8-\\xF6\\xF8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0300-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u037F\\u0386-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u0483-\\u0487\\u048A-\\u052F\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u0591-\\u05BD\\u05BF\\u05C1\\u05C2\\u05C4\\u05C5\\u05C7\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0610-\\u061A\\u0620-\\u0669\\u066E-\\u06D3\\u06D5-\\u06DC\\u06DF-\\u06E8\\u06EA-\\u06FC\\u06FF\\u0710-\\u074A\\u074D-\\u07B1\\u07C0-\\u07F5\\u07FA\\u0800-\\u082D\\u0840-\\u085B\\u08A0-\\u08B2\\u08E4-\\u0963\\u0966-\\u096F\\u0971-\\u0983\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BC-\\u09C4\\u09C7\\u09C8\\u09CB-\\u09CE\\u09D7\\u09DC\\u09DD\\u09DF-\\u09E3\\u09E6-\\u09F1\\u0A01-\\u0A03\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A3C\\u0A3E-\\u0A42\\u0A47\\u0A48\\u0A4B-\\u0A4D\\u0A51\\u0A59-\\u0A5C\\u0A5E\\u0A66-\\u0A75\\u0A81-\\u0A83\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABC-\\u0AC5\\u0AC7-\\u0AC9\\u0ACB-\\u0ACD\\u0AD0\\u0AE0-\\u0AE3\\u0AE6-\\u0AEF\\u0B01-\\u0B03\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3C-\\u0B44\\u0B47\\u0B48\\u0B4B-\\u0B4D\\u0B56\\u0B57\\u0B5C\\u0B5D\\u0B5F-\\u0B63\\u0B66-\\u0B6F\\u0B71\\u0B82\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BBE-\\u0BC2\\u0BC6-\\u0BC8\\u0BCA-\\u0BCD\\u0BD0\\u0BD7\\u0BE6-\\u0BEF\\u0C00-\\u0C03\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C39\\u0C3D-\\u0C44\\u0C46-\\u0C48\\u0C4A-\\u0C4D\\u0C55\\u0C56\\u0C58\\u0C59\\u0C60-\\u0C63\\u0C66-\\u0C6F\\u0C81-\\u0C83\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBC-\\u0CC4\\u0CC6-\\u0CC8\\u0CCA-\\u0CCD\\u0CD5\\u0CD6\\u0CDE\\u0CE0-\\u0CE3\\u0CE6-\\u0CEF\\u0CF1\\u0CF2\\u0D01-\\u0D03\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D-\\u0D44\\u0D46-\\u0D48\\u0D4A-\\u0D4E\\u0D57\\u0D60-\\u0D63\\u0D66-\\u0D6F\\u0D7A-\\u0D7F\\u0D82\\u0D83\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0DCA\\u0DCF-\\u0DD4\\u0DD6\\u0DD8-\\u0DDF\\u0DE6-\\u0DEF\\u0DF2\\u0DF3\\u0E01-\\u0E3A\\u0E40-\\u0E4E\\u0E50-\\u0E59\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB9\\u0EBB-\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EC8-\\u0ECD\\u0ED0-\\u0ED9\\u0EDC-\\u0EDF\\u0F00\\u0F18\\u0F19\\u0F20-\\u0F29\\u0F35\\u0F37\\u0F39\\u0F3E-\\u0F47\\u0F49-\\u0F6C\\u0F71-\\u0F84\\u0F86-\\u0F97\\u0F99-\\u0FBC\\u0FC6\\u1000-\\u1049\\u1050-\\u109D\\u10A0-\\u10C5\\u10C7\\u10CD\\u10D0-\\u10FA\\u10FC-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u135D-\\u135F\\u1369-\\u1371\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u167F\\u1681-\\u169A\\u16A0-\\u16EA\\u16EE-\\u16F8\\u1700-\\u170C\\u170E-\\u1714\\u1720-\\u1734\\u1740-\\u1753\\u1760-\\u176C\\u176E-\\u1770\\u1772\\u1773\\u1780-\\u17D3\\u17D7\\u17DC\\u17DD\\u17E0-\\u17E9\\u180B-\\u180D\\u1810-\\u1819\\u1820-\\u1877\\u1880-\\u18AA\\u18B0-\\u18F5\\u1900-\\u191E\\u1920-\\u192B\\u1930-\\u193B\\u1946-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19B0-\\u19C9\\u19D0-\\u19DA\\u1A00-\\u1A1B\\u1A20-\\u1A5E\\u1A60-\\u1A7C\\u1A7F-\\u1A89\\u1A90-\\u1A99\\u1AA7\\u1AB0-\\u1ABD\\u1B00-\\u1B4B\\u1B50-\\u1B59\\u1B6B-\\u1B73\\u1B80-\\u1BF3\\u1C00-\\u1C37\\u1C40-\\u1C49\\u1C4D-\\u1C7D\\u1CD0-\\u1CD2\\u1CD4-\\u1CF6\\u1CF8\\u1CF9\\u1D00-\\u1DF5\\u1DFC-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u200C\\u200D\\u203F\\u2040\\u2054\\u2071\\u207F\\u2090-\\u209C\\u20D0-\\u20DC\\u20E1\\u20E5-\\u20F0\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2118-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2160-\\u2188\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2CE4\\u2CEB-\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\u2D30-\\u2D67\\u2D6F\\u2D7F-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2DE0-\\u2DFF\\u3005-\\u3007\\u3021-\\u302F\\u3031-\\u3035\\u3038-\\u303C\\u3041-\\u3096\\u3099-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FCC\\uA000-\\uA48C\\uA4D0-\\uA4FD\\uA500-\\uA60C\\uA610-\\uA62B\\uA640-\\uA66F\\uA674-\\uA67D\\uA67F-\\uA69D\\uA69F-\\uA6F1\\uA717-\\uA71F\\uA722-\\uA788\\uA78B-\\uA78E\\uA790-\\uA7AD\\uA7B0\\uA7B1\\uA7F7-\\uA827\\uA840-\\uA873\\uA880-\\uA8C4\\uA8D0-\\uA8D9\\uA8E0-\\uA8F7\\uA8FB\\uA900-\\uA92D\\uA930-\\uA953\\uA960-\\uA97C\\uA980-\\uA9C0\\uA9CF-\\uA9D9\\uA9E0-\\uA9FE\\uAA00-\\uAA36\\uAA40-\\uAA4D\\uAA50-\\uAA59\\uAA60-\\uAA76\\uAA7A-\\uAAC2\\uAADB-\\uAADD\\uAAE0-\\uAAEF\\uAAF2-\\uAAF6\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uAB30-\\uAB5A\\uAB5C-\\uAB5F\\uAB64\\uAB65\\uABC0-\\uABEA\\uABEC\\uABED\\uABF0-\\uABF9\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE00-\\uFE0F\\uFE20-\\uFE2D\\uFE33\\uFE34\\uFE4D-\\uFE4F\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF10-\\uFF19\\uFF21-\\uFF3A\\uFF3F\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]|\\uD800[\\uDC00-\\uDC0B\\uDC0D-\\uDC26\\uDC28-\\uDC3A\\uDC3C\\uDC3D\\uDC3F-\\uDC4D\\uDC50-\\uDC5D\\uDC80-\\uDCFA\\uDD40-\\uDD74\\uDDFD\\uDE80-\\uDE9C\\uDEA0-\\uDED0\\uDEE0\\uDF00-\\uDF1F\\uDF30-\\uDF4A\\uDF50-\\uDF7A\\uDF80-\\uDF9D\\uDFA0-\\uDFC3\\uDFC8-\\uDFCF\\uDFD1-\\uDFD5]|\\uD801[\\uDC00-\\uDC9D\\uDCA0-\\uDCA9\\uDD00-\\uDD27\\uDD30-\\uDD63\\uDE00-\\uDF36\\uDF40-\\uDF55\\uDF60-\\uDF67]|\\uD802[\\uDC00-\\uDC05\\uDC08\\uDC0A-\\uDC35\\uDC37\\uDC38\\uDC3C\\uDC3F-\\uDC55\\uDC60-\\uDC76\\uDC80-\\uDC9E\\uDD00-\\uDD15\\uDD20-\\uDD39\\uDD80-\\uDDB7\\uDDBE\\uDDBF\\uDE00-\\uDE03\\uDE05\\uDE06\\uDE0C-\\uDE13\\uDE15-\\uDE17\\uDE19-\\uDE33\\uDE38-\\uDE3A\\uDE3F\\uDE60-\\uDE7C\\uDE80-\\uDE9C\\uDEC0-\\uDEC7\\uDEC9-\\uDEE6\\uDF00-\\uDF35\\uDF40-\\uDF55\\uDF60-\\uDF72\\uDF80-\\uDF91]|\\uD803[\\uDC00-\\uDC48]|\\uD804[\\uDC00-\\uDC46\\uDC66-\\uDC6F\\uDC7F-\\uDCBA\\uDCD0-\\uDCE8\\uDCF0-\\uDCF9\\uDD00-\\uDD34\\uDD36-\\uDD3F\\uDD50-\\uDD73\\uDD76\\uDD80-\\uDDC4\\uDDD0-\\uDDDA\\uDE00-\\uDE11\\uDE13-\\uDE37\\uDEB0-\\uDEEA\\uDEF0-\\uDEF9\\uDF01-\\uDF03\\uDF05-\\uDF0C\\uDF0F\\uDF10\\uDF13-\\uDF28\\uDF2A-\\uDF30\\uDF32\\uDF33\\uDF35-\\uDF39\\uDF3C-\\uDF44\\uDF47\\uDF48\\uDF4B-\\uDF4D\\uDF57\\uDF5D-\\uDF63\\uDF66-\\uDF6C\\uDF70-\\uDF74]|\\uD805[\\uDC80-\\uDCC5\\uDCC7\\uDCD0-\\uDCD9\\uDD80-\\uDDB5\\uDDB8-\\uDDC0\\uDE00-\\uDE40\\uDE44\\uDE50-\\uDE59\\uDE80-\\uDEB7\\uDEC0-\\uDEC9]|\\uD806[\\uDCA0-\\uDCE9\\uDCFF\\uDEC0-\\uDEF8]|\\uD808[\\uDC00-\\uDF98]|\\uD809[\\uDC00-\\uDC6E]|[\\uD80C\\uD840-\\uD868\\uD86A-\\uD86C][\\uDC00-\\uDFFF]|\\uD80D[\\uDC00-\\uDC2E]|\\uD81A[\\uDC00-\\uDE38\\uDE40-\\uDE5E\\uDE60-\\uDE69\\uDED0-\\uDEED\\uDEF0-\\uDEF4\\uDF00-\\uDF36\\uDF40-\\uDF43\\uDF50-\\uDF59\\uDF63-\\uDF77\\uDF7D-\\uDF8F]|\\uD81B[\\uDF00-\\uDF44\\uDF50-\\uDF7E\\uDF8F-\\uDF9F]|\\uD82C[\\uDC00\\uDC01]|\\uD82F[\\uDC00-\\uDC6A\\uDC70-\\uDC7C\\uDC80-\\uDC88\\uDC90-\\uDC99\\uDC9D\\uDC9E]|\\uD834[\\uDD65-\\uDD69\\uDD6D-\\uDD72\\uDD7B-\\uDD82\\uDD85-\\uDD8B\\uDDAA-\\uDDAD\\uDE42-\\uDE44]|\\uD835[\\uDC00-\\uDC54\\uDC56-\\uDC9C\\uDC9E\\uDC9F\\uDCA2\\uDCA5\\uDCA6\\uDCA9-\\uDCAC\\uDCAE-\\uDCB9\\uDCBB\\uDCBD-\\uDCC3\\uDCC5-\\uDD05\\uDD07-\\uDD0A\\uDD0D-\\uDD14\\uDD16-\\uDD1C\\uDD1E-\\uDD39\\uDD3B-\\uDD3E\\uDD40-\\uDD44\\uDD46\\uDD4A-\\uDD50\\uDD52-\\uDEA5\\uDEA8-\\uDEC0\\uDEC2-\\uDEDA\\uDEDC-\\uDEFA\\uDEFC-\\uDF14\\uDF16-\\uDF34\\uDF36-\\uDF4E\\uDF50-\\uDF6E\\uDF70-\\uDF88\\uDF8A-\\uDFA8\\uDFAA-\\uDFC2\\uDFC4-\\uDFCB\\uDFCE-\\uDFFF]|\\uD83A[\\uDC00-\\uDCC4\\uDCD0-\\uDCD6]|\\uD83B[\\uDE00-\\uDE03\\uDE05-\\uDE1F\\uDE21\\uDE22\\uDE24\\uDE27\\uDE29-\\uDE32\\uDE34-\\uDE37\\uDE39\\uDE3B\\uDE42\\uDE47\\uDE49\\uDE4B\\uDE4D-\\uDE4F\\uDE51\\uDE52\\uDE54\\uDE57\\uDE59\\uDE5B\\uDE5D\\uDE5F\\uDE61\\uDE62\\uDE64\\uDE67-\\uDE6A\\uDE6C-\\uDE72\\uDE74-\\uDE77\\uDE79-\\uDE7C\\uDE7E\\uDE80-\\uDE89\\uDE8B-\\uDE9B\\uDEA1-\\uDEA3\\uDEA5-\\uDEA9\\uDEAB-\\uDEBB]|\\uD869[\\uDC00-\\uDED6\\uDF00-\\uDFFF]|\\uD86D[\\uDC00-\\uDF34\\uDF40-\\uDFFF]|\\uD86E[\\uDC00-\\uDC1D]|\\uD87E[\\uDC00-\\uDE1D]|\\uDB40[\\uDD00-\\uDDEF]/\n    };\n\n    // Ensure the condition is true, otherwise throw an error.\n    // This is only to have a better contract semantic, i.e. another safety net\n    // to catch a logic error. The condition shall be fulfilled in normal case.\n    // Do NOT use this to enforce a certain condition on any user input.\n\n    function assert(condition, message) {\n        /* istanbul ignore if */\n        if (!condition) {\n            throw new Error('ASSERT: ' + message);\n        }\n    }\n\n    function isDecimalDigit(ch) {\n        return (ch >= 0x30 && ch <= 0x39);   // 0..9\n    }\n\n    function isHexDigit(ch) {\n        return '0123456789abcdefABCDEF'.indexOf(ch) >= 0;\n    }\n\n    function isOctalDigit(ch) {\n        return '01234567'.indexOf(ch) >= 0;\n    }\n\n    function octalToDecimal(ch) {\n        // \\0 is not octal escape sequence\n        var octal = (ch !== '0'), code = '01234567'.indexOf(ch);\n\n        if (index < length && isOctalDigit(source[index])) {\n            octal = true;\n            code = code * 8 + '01234567'.indexOf(source[index++]);\n\n            // 3 digits are only allowed when string starts\n            // with 0, 1, 2, 3\n            if ('0123'.indexOf(ch) >= 0 &&\n                    index < length &&\n                    isOctalDigit(source[index])) {\n                code = code * 8 + '01234567'.indexOf(source[index++]);\n            }\n        }\n\n        return {\n            code: code,\n            octal: octal\n        };\n    }\n\n    // ECMA-262 11.2 White Space\n\n    function isWhiteSpace(ch) {\n        return (ch === 0x20) || (ch === 0x09) || (ch === 0x0B) || (ch === 0x0C) || (ch === 0xA0) ||\n            (ch >= 0x1680 && [0x1680, 0x180E, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202F, 0x205F, 0x3000, 0xFEFF].indexOf(ch) >= 0);\n    }\n\n    // ECMA-262 11.3 Line Terminators\n\n    function isLineTerminator(ch) {\n        return (ch === 0x0A) || (ch === 0x0D) || (ch === 0x2028) || (ch === 0x2029);\n    }\n\n    // ECMA-262 11.6 Identifier Names and Identifiers\n\n    function fromCodePoint(cp) {\n        return (cp < 0x10000) ? String.fromCharCode(cp) :\n            String.fromCharCode(0xD800 + ((cp - 0x10000) >> 10)) +\n            String.fromCharCode(0xDC00 + ((cp - 0x10000) & 1023));\n    }\n\n    function isIdentifierStart(ch) {\n        return (ch === 0x24) || (ch === 0x5F) ||  // $ (dollar) and _ (underscore)\n            (ch >= 0x41 && ch <= 0x5A) ||         // A..Z\n            (ch >= 0x61 && ch <= 0x7A) ||         // a..z\n            (ch === 0x5C) ||                      // \\ (backslash)\n            ((ch >= 0x80) && Regex.NonAsciiIdentifierStart.test(fromCodePoint(ch)));\n    }\n\n    function isIdentifierPart(ch) {\n        return (ch === 0x24) || (ch === 0x5F) ||  // $ (dollar) and _ (underscore)\n            (ch >= 0x41 && ch <= 0x5A) ||         // A..Z\n            (ch >= 0x61 && ch <= 0x7A) ||         // a..z\n            (ch >= 0x30 && ch <= 0x39) ||         // 0..9\n            (ch === 0x5C) ||                      // \\ (backslash)\n            ((ch >= 0x80) && Regex.NonAsciiIdentifierPart.test(fromCodePoint(ch)));\n    }\n\n    // ECMA-262 11.6.2.2 Future Reserved Words\n\n    function isFutureReservedWord(id) {\n        switch (id) {\n        case 'enum':\n        case 'export':\n        case 'import':\n        case 'super':\n            return true;\n        default:\n            return false;\n        }\n    }\n\n    function isStrictModeReservedWord(id) {\n        switch (id) {\n        case 'implements':\n        case 'interface':\n        case 'package':\n        case 'private':\n        case 'protected':\n        case 'public':\n        case 'static':\n        case 'yield':\n        case 'let':\n            return true;\n        default:\n            return false;\n        }\n    }\n\n    function isRestrictedWord(id) {\n        return id === 'eval' || id === 'arguments';\n    }\n\n    // ECMA-262 11.6.2.1 Keywords\n\n    function isKeyword(id) {\n        switch (id.length) {\n        case 2:\n            return (id === 'if') || (id === 'in') || (id === 'do');\n        case 3:\n            return (id === 'var') || (id === 'for') || (id === 'new') ||\n                (id === 'try') || (id === 'let');\n        case 4:\n            return (id === 'this') || (id === 'else') || (id === 'case') ||\n                (id === 'void') || (id === 'with') || (id === 'enum');\n        case 5:\n            return (id === 'while') || (id === 'break') || (id === 'catch') ||\n                (id === 'throw') || (id === 'const') || (id === 'yield') ||\n                (id === 'class') || (id === 'super');\n        case 6:\n            return (id === 'return') || (id === 'typeof') || (id === 'delete') ||\n                (id === 'switch') || (id === 'export') || (id === 'import');\n        case 7:\n            return (id === 'default') || (id === 'finally') || (id === 'extends');\n        case 8:\n            return (id === 'function') || (id === 'continue') || (id === 'debugger');\n        case 10:\n            return (id === 'instanceof');\n        default:\n            return false;\n        }\n    }\n\n    // ECMA-262 11.4 Comments\n\n    function addComment(type, value, start, end, loc) {\n        var comment;\n\n        assert(typeof start === 'number', 'Comment must have valid position');\n\n        state.lastCommentStart = start;\n\n        comment = {\n            type: type,\n            value: value\n        };\n        if (extra.range) {\n            comment.range = [start, end];\n        }\n        if (extra.loc) {\n            comment.loc = loc;\n        }\n        extra.comments.push(comment);\n        if (extra.attachComment) {\n            extra.leadingComments.push(comment);\n            extra.trailingComments.push(comment);\n        }\n        if (extra.tokenize) {\n            comment.type = comment.type + 'Comment';\n            if (extra.delegate) {\n                comment = extra.delegate(comment);\n            }\n            extra.tokens.push(comment);\n        }\n    }\n\n    function skipSingleLineComment(offset) {\n        var start, loc, ch, comment;\n\n        start = index - offset;\n        loc = {\n            start: {\n                line: lineNumber,\n                column: index - lineStart - offset\n            }\n        };\n\n        while (index < length) {\n            ch = source.charCodeAt(index);\n            ++index;\n            if (isLineTerminator(ch)) {\n                hasLineTerminator = true;\n                if (extra.comments) {\n                    comment = source.slice(start + offset, index - 1);\n                    loc.end = {\n                        line: lineNumber,\n                        column: index - lineStart - 1\n                    };\n                    addComment('Line', comment, start, index - 1, loc);\n                }\n                if (ch === 13 && source.charCodeAt(index) === 10) {\n                    ++index;\n                }\n                ++lineNumber;\n                lineStart = index;\n                return;\n            }\n        }\n\n        if (extra.comments) {\n            comment = source.slice(start + offset, index);\n            loc.end = {\n                line: lineNumber,\n                column: index - lineStart\n            };\n            addComment('Line', comment, start, index, loc);\n        }\n    }\n\n    function skipMultiLineComment() {\n        var start, loc, ch, comment;\n\n        if (extra.comments) {\n            start = index - 2;\n            loc = {\n                start: {\n                    line: lineNumber,\n                    column: index - lineStart - 2\n                }\n            };\n        }\n\n        while (index < length) {\n            ch = source.charCodeAt(index);\n            if (isLineTerminator(ch)) {\n                if (ch === 0x0D && source.charCodeAt(index + 1) === 0x0A) {\n                    ++index;\n                }\n                hasLineTerminator = true;\n                ++lineNumber;\n                ++index;\n                lineStart = index;\n            } else if (ch === 0x2A) {\n                // Block comment ends with '*/'.\n                if (source.charCodeAt(index + 1) === 0x2F) {\n                    ++index;\n                    ++index;\n                    if (extra.comments) {\n                        comment = source.slice(start + 2, index - 2);\n                        loc.end = {\n                            line: lineNumber,\n                            column: index - lineStart\n                        };\n                        addComment('Block', comment, start, index, loc);\n                    }\n                    return;\n                }\n                ++index;\n            } else {\n                ++index;\n            }\n        }\n\n        // Ran off the end of the file - the whole thing is a comment\n        if (extra.comments) {\n            loc.end = {\n                line: lineNumber,\n                column: index - lineStart\n            };\n            comment = source.slice(start + 2, index);\n            addComment('Block', comment, start, index, loc);\n        }\n        tolerateUnexpectedToken();\n    }\n\n    function skipComment() {\n        var ch, start;\n        hasLineTerminator = false;\n\n        start = (index === 0);\n        while (index < length) {\n            ch = source.charCodeAt(index);\n\n            if (isWhiteSpace(ch)) {\n                ++index;\n            } else if (isLineTerminator(ch)) {\n                hasLineTerminator = true;\n                ++index;\n                if (ch === 0x0D && source.charCodeAt(index) === 0x0A) {\n                    ++index;\n                }\n                ++lineNumber;\n                lineStart = index;\n                start = true;\n            } else if (ch === 0x2F) { // U+002F is '/'\n                ch = source.charCodeAt(index + 1);\n                if (ch === 0x2F) {\n                    ++index;\n                    ++index;\n                    skipSingleLineComment(2);\n                    start = true;\n                } else if (ch === 0x2A) {  // U+002A is '*'\n                    ++index;\n                    ++index;\n                    skipMultiLineComment();\n                } else {\n                    break;\n                }\n            } else if (start && ch === 0x2D) { // U+002D is '-'\n                // U+003E is '>'\n                if ((source.charCodeAt(index + 1) === 0x2D) && (source.charCodeAt(index + 2) === 0x3E)) {\n                    // '-->' is a single-line comment\n                    index += 3;\n                    skipSingleLineComment(3);\n                } else {\n                    break;\n                }\n            } else if (ch === 0x3C) { // U+003C is '<'\n                if (source.slice(index + 1, index + 4) === '!--') {\n                    ++index; // `<`\n                    ++index; // `!`\n                    ++index; // `-`\n                    ++index; // `-`\n                    skipSingleLineComment(4);\n                } else {\n                    break;\n                }\n            } else {\n                break;\n            }\n        }\n    }\n\n    function scanHexEscape(prefix) {\n        var i, len, ch, code = 0;\n\n        len = (prefix === 'u') ? 4 : 2;\n        for (i = 0; i < len; ++i) {\n            if (index < length && isHexDigit(source[index])) {\n                ch = source[index++];\n                code = code * 16 + '0123456789abcdef'.indexOf(ch.toLowerCase());\n            } else {\n                return '';\n            }\n        }\n        return String.fromCharCode(code);\n    }\n\n    function scanUnicodeCodePointEscape() {\n        var ch, code;\n\n        ch = source[index];\n        code = 0;\n\n        // At least, one hex digit is required.\n        if (ch === '}') {\n            throwUnexpectedToken();\n        }\n\n        while (index < length) {\n            ch = source[index++];\n            if (!isHexDigit(ch)) {\n                break;\n            }\n            code = code * 16 + '0123456789abcdef'.indexOf(ch.toLowerCase());\n        }\n\n        if (code > 0x10FFFF || ch !== '}') {\n            throwUnexpectedToken();\n        }\n\n        return fromCodePoint(code);\n    }\n\n    function codePointAt(i) {\n        var cp, first, second;\n\n        cp = source.charCodeAt(i);\n        if (cp >= 0xD800 && cp <= 0xDBFF) {\n            second = source.charCodeAt(i + 1);\n            if (second >= 0xDC00 && second <= 0xDFFF) {\n                first = cp;\n                cp = (first - 0xD800) * 0x400 + second - 0xDC00 + 0x10000;\n            }\n        }\n\n        return cp;\n    }\n\n    function getComplexIdentifier() {\n        var cp, ch, id;\n\n        cp = codePointAt(index);\n        id = fromCodePoint(cp);\n        index += id.length;\n\n        // '\\u' (U+005C, U+0075) denotes an escaped character.\n        if (cp === 0x5C) {\n            if (source.charCodeAt(index) !== 0x75) {\n                throwUnexpectedToken();\n            }\n            ++index;\n            if (source[index] === '{') {\n                ++index;\n                ch = scanUnicodeCodePointEscape();\n            } else {\n                ch = scanHexEscape('u');\n                cp = ch.charCodeAt(0);\n                if (!ch || ch === '\\\\' || !isIdentifierStart(cp)) {\n                    throwUnexpectedToken();\n                }\n            }\n            id = ch;\n        }\n\n        while (index < length) {\n            cp = codePointAt(index);\n            if (!isIdentifierPart(cp)) {\n                break;\n            }\n            ch = fromCodePoint(cp);\n            id += ch;\n            index += ch.length;\n\n            // '\\u' (U+005C, U+0075) denotes an escaped character.\n            if (cp === 0x5C) {\n                id = id.substr(0, id.length - 1);\n                if (source.charCodeAt(index) !== 0x75) {\n                    throwUnexpectedToken();\n                }\n                ++index;\n                if (source[index] === '{') {\n                    ++index;\n                    ch = scanUnicodeCodePointEscape();\n                } else {\n                    ch = scanHexEscape('u');\n                    cp = ch.charCodeAt(0);\n                    if (!ch || ch === '\\\\' || !isIdentifierPart(cp)) {\n                        throwUnexpectedToken();\n                    }\n                }\n                id += ch;\n            }\n        }\n\n        return id;\n    }\n\n    function getIdentifier() {\n        var start, ch;\n\n        start = index++;\n        while (index < length) {\n            ch = source.charCodeAt(index);\n            if (ch === 0x5C) {\n                // Blackslash (U+005C) marks Unicode escape sequence.\n                index = start;\n                return getComplexIdentifier();\n            } else if (ch >= 0xD800 && ch < 0xDFFF) {\n                // Need to handle surrogate pairs.\n                index = start;\n                return getComplexIdentifier();\n            }\n            if (isIdentifierPart(ch)) {\n                ++index;\n            } else {\n                break;\n            }\n        }\n\n        return source.slice(start, index);\n    }\n\n    function scanIdentifier() {\n        var start, id, type;\n\n        start = index;\n\n        // Backslash (U+005C) starts an escaped character.\n        id = (source.charCodeAt(index) === 0x5C) ? getComplexIdentifier() : getIdentifier();\n\n        // There is no keyword or literal with only one character.\n        // Thus, it must be an identifier.\n        if (id.length === 1) {\n            type = Token.Identifier;\n        } else if (isKeyword(id)) {\n            type = Token.Keyword;\n        } else if (id === 'null') {\n            type = Token.NullLiteral;\n        } else if (id === 'true' || id === 'false') {\n            type = Token.BooleanLiteral;\n        } else {\n            type = Token.Identifier;\n        }\n\n        return {\n            type: type,\n            value: id,\n            lineNumber: lineNumber,\n            lineStart: lineStart,\n            start: start,\n            end: index\n        };\n    }\n\n\n    // ECMA-262 11.7 Punctuators\n\n    function scanPunctuator() {\n        var token, str;\n\n        token = {\n            type: Token.Punctuator,\n            value: '',\n            lineNumber: lineNumber,\n            lineStart: lineStart,\n            start: index,\n            end: index\n        };\n\n        // Check for most common single-character punctuators.\n        str = source[index];\n        switch (str) {\n\n        case '(':\n            if (extra.tokenize) {\n                extra.openParenToken = extra.tokenValues.length;\n            }\n            ++index;\n            break;\n\n        case '{':\n            if (extra.tokenize) {\n                extra.openCurlyToken = extra.tokenValues.length;\n            }\n            state.curlyStack.push('{');\n            ++index;\n            break;\n\n        case '.':\n            ++index;\n            if (source[index] === '.' && source[index + 1] === '.') {\n                // Spread operator: ...\n                index += 2;\n                str = '...';\n            }\n            break;\n\n        case '}':\n            ++index;\n            state.curlyStack.pop();\n            break;\n        case ')':\n        case ';':\n        case ',':\n        case '[':\n        case ']':\n        case ':':\n        case '?':\n        case '~':\n            ++index;\n            break;\n\n        default:\n            // 4-character punctuator.\n            str = source.substr(index, 4);\n            if (str === '>>>=') {\n                index += 4;\n            } else {\n\n                // 3-character punctuators.\n                str = str.substr(0, 3);\n                if (str === '===' || str === '!==' || str === '>>>' ||\n                    str === '<<=' || str === '>>=') {\n                    index += 3;\n                } else {\n\n                    // 2-character punctuators.\n                    str = str.substr(0, 2);\n                    if (str === '&&' || str === '||' || str === '==' || str === '!=' ||\n                        str === '+=' || str === '-=' || str === '*=' || str === '/=' ||\n                        str === '++' || str === '--' || str === '<<' || str === '>>' ||\n                        str === '&=' || str === '|=' || str === '^=' || str === '%=' ||\n                        str === '<=' || str === '>=' || str === '=>') {\n                        index += 2;\n                    } else {\n\n                        // 1-character punctuators.\n                        str = source[index];\n                        if ('<>=!+-*%&|^/'.indexOf(str) >= 0) {\n                            ++index;\n                        }\n                    }\n                }\n            }\n        }\n\n        if (index === token.start) {\n            throwUnexpectedToken();\n        }\n\n        token.end = index;\n        token.value = str;\n        return token;\n    }\n\n    // ECMA-262 11.8.3 Numeric Literals\n\n    function scanHexLiteral(start) {\n        var number = '';\n\n        while (index < length) {\n            if (!isHexDigit(source[index])) {\n                break;\n            }\n            number += source[index++];\n        }\n\n        if (number.length === 0) {\n            throwUnexpectedToken();\n        }\n\n        if (isIdentifierStart(source.charCodeAt(index))) {\n            throwUnexpectedToken();\n        }\n\n        return {\n            type: Token.NumericLiteral,\n            value: parseInt('0x' + number, 16),\n            lineNumber: lineNumber,\n            lineStart: lineStart,\n            start: start,\n            end: index\n        };\n    }\n\n    function scanBinaryLiteral(start) {\n        var ch, number;\n\n        number = '';\n\n        while (index < length) {\n            ch = source[index];\n            if (ch !== '0' && ch !== '1') {\n                break;\n            }\n            number += source[index++];\n        }\n\n        if (number.length === 0) {\n            // only 0b or 0B\n            throwUnexpectedToken();\n        }\n\n        if (index < length) {\n            ch = source.charCodeAt(index);\n            /* istanbul ignore else */\n            if (isIdentifierStart(ch) || isDecimalDigit(ch)) {\n                throwUnexpectedToken();\n            }\n        }\n\n        return {\n            type: Token.NumericLiteral,\n            value: parseInt(number, 2),\n            lineNumber: lineNumber,\n            lineStart: lineStart,\n            start: start,\n            end: index\n        };\n    }\n\n    function scanOctalLiteral(prefix, start) {\n        var number, octal;\n\n        if (isOctalDigit(prefix)) {\n            octal = true;\n            number = '0' + source[index++];\n        } else {\n            octal = false;\n            ++index;\n            number = '';\n        }\n\n        while (index < length) {\n            if (!isOctalDigit(source[index])) {\n                break;\n            }\n            number += source[index++];\n        }\n\n        if (!octal && number.length === 0) {\n            // only 0o or 0O\n            throwUnexpectedToken();\n        }\n\n        if (isIdentifierStart(source.charCodeAt(index)) || isDecimalDigit(source.charCodeAt(index))) {\n            throwUnexpectedToken();\n        }\n\n        return {\n            type: Token.NumericLiteral,\n            value: parseInt(number, 8),\n            octal: octal,\n            lineNumber: lineNumber,\n            lineStart: lineStart,\n            start: start,\n            end: index\n        };\n    }\n\n    function isImplicitOctalLiteral() {\n        var i, ch;\n\n        // Implicit octal, unless there is a non-octal digit.\n        // (Annex B.1.1 on Numeric Literals)\n        for (i = index + 1; i < length; ++i) {\n            ch = source[i];\n            if (ch === '8' || ch === '9') {\n                return false;\n            }\n            if (!isOctalDigit(ch)) {\n                return true;\n            }\n        }\n\n        return true;\n    }\n\n    function scanNumericLiteral() {\n        var number, start, ch;\n\n        ch = source[index];\n        assert(isDecimalDigit(ch.charCodeAt(0)) || (ch === '.'),\n            'Numeric literal must start with a decimal digit or a decimal point');\n\n        start = index;\n        number = '';\n        if (ch !== '.') {\n            number = source[index++];\n            ch = source[index];\n\n            // Hex number starts with '0x'.\n            // Octal number starts with '0'.\n            // Octal number in ES6 starts with '0o'.\n            // Binary number in ES6 starts with '0b'.\n            if (number === '0') {\n                if (ch === 'x' || ch === 'X') {\n                    ++index;\n                    return scanHexLiteral(start);\n                }\n                if (ch === 'b' || ch === 'B') {\n                    ++index;\n                    return scanBinaryLiteral(start);\n                }\n                if (ch === 'o' || ch === 'O') {\n                    return scanOctalLiteral(ch, start);\n                }\n\n                if (isOctalDigit(ch)) {\n                    if (isImplicitOctalLiteral()) {\n                        return scanOctalLiteral(ch, start);\n                    }\n                }\n            }\n\n            while (isDecimalDigit(source.charCodeAt(index))) {\n                number += source[index++];\n            }\n            ch = source[index];\n        }\n\n        if (ch === '.') {\n            number += source[index++];\n            while (isDecimalDigit(source.charCodeAt(index))) {\n                number += source[index++];\n            }\n            ch = source[index];\n        }\n\n        if (ch === 'e' || ch === 'E') {\n            number += source[index++];\n\n            ch = source[index];\n            if (ch === '+' || ch === '-') {\n                number += source[index++];\n            }\n            if (isDecimalDigit(source.charCodeAt(index))) {\n                while (isDecimalDigit(source.charCodeAt(index))) {\n                    number += source[index++];\n                }\n            } else {\n                throwUnexpectedToken();\n            }\n        }\n\n        if (isIdentifierStart(source.charCodeAt(index))) {\n            throwUnexpectedToken();\n        }\n\n        return {\n            type: Token.NumericLiteral,\n            value: parseFloat(number),\n            lineNumber: lineNumber,\n            lineStart: lineStart,\n            start: start,\n            end: index\n        };\n    }\n\n    // ECMA-262 11.8.4 String Literals\n\n    function scanStringLiteral() {\n        var str = '', quote, start, ch, unescaped, octToDec, octal = false;\n\n        quote = source[index];\n        assert((quote === '\\'' || quote === '\"'),\n            'String literal must starts with a quote');\n\n        start = index;\n        ++index;\n\n        while (index < length) {\n            ch = source[index++];\n\n            if (ch === quote) {\n                quote = '';\n                break;\n            } else if (ch === '\\\\') {\n                ch = source[index++];\n                if (!ch || !isLineTerminator(ch.charCodeAt(0))) {\n                    switch (ch) {\n                    case 'u':\n                    case 'x':\n                        if (source[index] === '{') {\n                            ++index;\n                            str += scanUnicodeCodePointEscape();\n                        } else {\n                            unescaped = scanHexEscape(ch);\n                            if (!unescaped) {\n                                throw throwUnexpectedToken();\n                            }\n                            str += unescaped;\n                        }\n                        break;\n                    case 'n':\n                        str += '\\n';\n                        break;\n                    case 'r':\n                        str += '\\r';\n                        break;\n                    case 't':\n                        str += '\\t';\n                        break;\n                    case 'b':\n                        str += '\\b';\n                        break;\n                    case 'f':\n                        str += '\\f';\n                        break;\n                    case 'v':\n                        str += '\\x0B';\n                        break;\n                    case '8':\n                    case '9':\n                        str += ch;\n                        tolerateUnexpectedToken();\n                        break;\n\n                    default:\n                        if (isOctalDigit(ch)) {\n                            octToDec = octalToDecimal(ch);\n\n                            octal = octToDec.octal || octal;\n                            str += String.fromCharCode(octToDec.code);\n                        } else {\n                            str += ch;\n                        }\n                        break;\n                    }\n                } else {\n                    ++lineNumber;\n                    if (ch === '\\r' && source[index] === '\\n') {\n                        ++index;\n                    }\n                    lineStart = index;\n                }\n            } else if (isLineTerminator(ch.charCodeAt(0))) {\n                break;\n            } else {\n                str += ch;\n            }\n        }\n\n        if (quote !== '') {\n            throwUnexpectedToken();\n        }\n\n        return {\n            type: Token.StringLiteral,\n            value: str,\n            octal: octal,\n            lineNumber: startLineNumber,\n            lineStart: startLineStart,\n            start: start,\n            end: index\n        };\n    }\n\n    // ECMA-262 11.8.6 Template Literal Lexical Components\n\n    function scanTemplate() {\n        var cooked = '', ch, start, rawOffset, terminated, head, tail, restore, unescaped;\n\n        terminated = false;\n        tail = false;\n        start = index;\n        head = (source[index] === '`');\n        rawOffset = 2;\n\n        ++index;\n\n        while (index < length) {\n            ch = source[index++];\n            if (ch === '`') {\n                rawOffset = 1;\n                tail = true;\n                terminated = true;\n                break;\n            } else if (ch === '$') {\n                if (source[index] === '{') {\n                    state.curlyStack.push('${');\n                    ++index;\n                    terminated = true;\n                    break;\n                }\n                cooked += ch;\n            } else if (ch === '\\\\') {\n                ch = source[index++];\n                if (!isLineTerminator(ch.charCodeAt(0))) {\n                    switch (ch) {\n                    case 'n':\n                        cooked += '\\n';\n                        break;\n                    case 'r':\n                        cooked += '\\r';\n                        break;\n                    case 't':\n                        cooked += '\\t';\n                        break;\n                    case 'u':\n                    case 'x':\n                        if (source[index] === '{') {\n                            ++index;\n                            cooked += scanUnicodeCodePointEscape();\n                        } else {\n                            restore = index;\n                            unescaped = scanHexEscape(ch);\n                            if (unescaped) {\n                                cooked += unescaped;\n                            } else {\n                                index = restore;\n                                cooked += ch;\n                            }\n                        }\n                        break;\n                    case 'b':\n                        cooked += '\\b';\n                        break;\n                    case 'f':\n                        cooked += '\\f';\n                        break;\n                    case 'v':\n                        cooked += '\\v';\n                        break;\n\n                    default:\n                        if (ch === '0') {\n                            if (isDecimalDigit(source.charCodeAt(index))) {\n                                // Illegal: \\01 \\02 and so on\n                                throwError(Messages.TemplateOctalLiteral);\n                            }\n                            cooked += '\\0';\n                        } else if (isOctalDigit(ch)) {\n                            // Illegal: \\1 \\2\n                            throwError(Messages.TemplateOctalLiteral);\n                        } else {\n                            cooked += ch;\n                        }\n                        break;\n                    }\n                } else {\n                    ++lineNumber;\n                    if (ch === '\\r' && source[index] === '\\n') {\n                        ++index;\n                    }\n                    lineStart = index;\n                }\n            } else if (isLineTerminator(ch.charCodeAt(0))) {\n                ++lineNumber;\n                if (ch === '\\r' && source[index] === '\\n') {\n                    ++index;\n                }\n                lineStart = index;\n                cooked += '\\n';\n            } else {\n                cooked += ch;\n            }\n        }\n\n        if (!terminated) {\n            throwUnexpectedToken();\n        }\n\n        if (!head) {\n            state.curlyStack.pop();\n        }\n\n        return {\n            type: Token.Template,\n            value: {\n                cooked: cooked,\n                raw: source.slice(start + 1, index - rawOffset)\n            },\n            head: head,\n            tail: tail,\n            lineNumber: lineNumber,\n            lineStart: lineStart,\n            start: start,\n            end: index\n        };\n    }\n\n    // ECMA-262 11.8.5 Regular Expression Literals\n\n    function testRegExp(pattern, flags) {\n        // The BMP character to use as a replacement for astral symbols when\n        // translating an ES6 \"u\"-flagged pattern to an ES5-compatible\n        // approximation.\n        // Note: replacing with '\\uFFFF' enables false positives in unlikely\n        // scenarios. For example, `[\\u{1044f}-\\u{10440}]` is an invalid\n        // pattern that would not be detected by this substitution.\n        var astralSubstitute = '\\uFFFF',\n            tmp = pattern;\n\n        if (flags.indexOf('u') >= 0) {\n            tmp = tmp\n                // Replace every Unicode escape sequence with the equivalent\n                // BMP character or a constant ASCII code point in the case of\n                // astral symbols. (See the above note on `astralSubstitute`\n                // for more information.)\n                .replace(/\\\\u\\{([0-9a-fA-F]+)\\}|\\\\u([a-fA-F0-9]{4})/g, function ($0, $1, $2) {\n                    var codePoint = parseInt($1 || $2, 16);\n                    if (codePoint > 0x10FFFF) {\n                        throwUnexpectedToken(null, Messages.InvalidRegExp);\n                    }\n                    if (codePoint <= 0xFFFF) {\n                        return String.fromCharCode(codePoint);\n                    }\n                    return astralSubstitute;\n                })\n                // Replace each paired surrogate with a single ASCII symbol to\n                // avoid throwing on regular expressions that are only valid in\n                // combination with the \"u\" flag.\n                .replace(\n                    /[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]/g,\n                    astralSubstitute\n                );\n        }\n\n        // First, detect invalid regular expressions.\n        try {\n            RegExp(tmp);\n        } catch (e) {\n            throwUnexpectedToken(null, Messages.InvalidRegExp);\n        }\n\n        // Return a regular expression object for this pattern-flag pair, or\n        // `null` in case the current environment doesn't support the flags it\n        // uses.\n        try {\n            return new RegExp(pattern, flags);\n        } catch (exception) {\n            return null;\n        }\n    }\n\n    function scanRegExpBody() {\n        var ch, str, classMarker, terminated, body;\n\n        ch = source[index];\n        assert(ch === '/', 'Regular expression literal must start with a slash');\n        str = source[index++];\n\n        classMarker = false;\n        terminated = false;\n        while (index < length) {\n            ch = source[index++];\n            str += ch;\n            if (ch === '\\\\') {\n                ch = source[index++];\n                // ECMA-262 7.8.5\n                if (isLineTerminator(ch.charCodeAt(0))) {\n                    throwUnexpectedToken(null, Messages.UnterminatedRegExp);\n                }\n                str += ch;\n            } else if (isLineTerminator(ch.charCodeAt(0))) {\n                throwUnexpectedToken(null, Messages.UnterminatedRegExp);\n            } else if (classMarker) {\n                if (ch === ']') {\n                    classMarker = false;\n                }\n            } else {\n                if (ch === '/') {\n                    terminated = true;\n                    break;\n                } else if (ch === '[') {\n                    classMarker = true;\n                }\n            }\n        }\n\n        if (!terminated) {\n            throwUnexpectedToken(null, Messages.UnterminatedRegExp);\n        }\n\n        // Exclude leading and trailing slash.\n        body = str.substr(1, str.length - 2);\n        return {\n            value: body,\n            literal: str\n        };\n    }\n\n    function scanRegExpFlags() {\n        var ch, str, flags, restore;\n\n        str = '';\n        flags = '';\n        while (index < length) {\n            ch = source[index];\n            if (!isIdentifierPart(ch.charCodeAt(0))) {\n                break;\n            }\n\n            ++index;\n            if (ch === '\\\\' && index < length) {\n                ch = source[index];\n                if (ch === 'u') {\n                    ++index;\n                    restore = index;\n                    ch = scanHexEscape('u');\n                    if (ch) {\n                        flags += ch;\n                        for (str += '\\\\u'; restore < index; ++restore) {\n                            str += source[restore];\n                        }\n                    } else {\n                        index = restore;\n                        flags += 'u';\n                        str += '\\\\u';\n                    }\n                    tolerateUnexpectedToken();\n                } else {\n                    str += '\\\\';\n                    tolerateUnexpectedToken();\n                }\n            } else {\n                flags += ch;\n                str += ch;\n            }\n        }\n\n        return {\n            value: flags,\n            literal: str\n        };\n    }\n\n    function scanRegExp() {\n        var start, body, flags, value;\n        scanning = true;\n\n        lookahead = null;\n        skipComment();\n        start = index;\n\n        body = scanRegExpBody();\n        flags = scanRegExpFlags();\n        value = testRegExp(body.value, flags.value);\n        scanning = false;\n        if (extra.tokenize) {\n            return {\n                type: Token.RegularExpression,\n                value: value,\n                regex: {\n                    pattern: body.value,\n                    flags: flags.value\n                },\n                lineNumber: lineNumber,\n                lineStart: lineStart,\n                start: start,\n                end: index\n            };\n        }\n\n        return {\n            literal: body.literal + flags.literal,\n            value: value,\n            regex: {\n                pattern: body.value,\n                flags: flags.value\n            },\n            start: start,\n            end: index\n        };\n    }\n\n    function collectRegex() {\n        var pos, loc, regex, token;\n\n        skipComment();\n\n        pos = index;\n        loc = {\n            start: {\n                line: lineNumber,\n                column: index - lineStart\n            }\n        };\n\n        regex = scanRegExp();\n\n        loc.end = {\n            line: lineNumber,\n            column: index - lineStart\n        };\n\n        /* istanbul ignore next */\n        if (!extra.tokenize) {\n            // Pop the previous token, which is likely '/' or '/='\n            if (extra.tokens.length > 0) {\n                token = extra.tokens[extra.tokens.length - 1];\n                if (token.range[0] === pos && token.type === 'Punctuator') {\n                    if (token.value === '/' || token.value === '/=') {\n                        extra.tokens.pop();\n                    }\n                }\n            }\n\n            extra.tokens.push({\n                type: 'RegularExpression',\n                value: regex.literal,\n                regex: regex.regex,\n                range: [pos, index],\n                loc: loc\n            });\n        }\n\n        return regex;\n    }\n\n    function isIdentifierName(token) {\n        return token.type === Token.Identifier ||\n            token.type === Token.Keyword ||\n            token.type === Token.BooleanLiteral ||\n            token.type === Token.NullLiteral;\n    }\n\n    // Using the following algorithm:\n    // https://github.com/mozilla/sweet.js/wiki/design\n\n    function advanceSlash() {\n        var regex, previous, check;\n\n        function testKeyword(value) {\n            return value && (value.length > 1) && (value[0] >= 'a') && (value[0] <= 'z');\n        }\n\n        previous = extra.tokenValues[extra.tokens.length - 1];\n        regex = (previous !== null);\n\n        switch (previous) {\n        case 'this':\n        case ']':\n            regex = false;\n            break;\n\n        case ')':\n            check = extra.tokenValues[extra.openParenToken - 1];\n            regex = (check === 'if' || check === 'while' || check === 'for' || check === 'with');\n            break;\n\n        case '}':\n            // Dividing a function by anything makes little sense,\n            // but we have to check for that.\n            regex = false;\n            if (testKeyword(extra.tokenValues[extra.openCurlyToken - 3])) {\n                // Anonymous function, e.g. function(){} /42\n                check = extra.tokenValues[extra.openCurlyToken - 4];\n                regex = check ? (FnExprTokens.indexOf(check) < 0) : false;\n            } else if (testKeyword(extra.tokenValues[extra.openCurlyToken - 4])) {\n                // Named function, e.g. function f(){} /42/\n                check = extra.tokenValues[extra.openCurlyToken - 5];\n                regex = check ? (FnExprTokens.indexOf(check) < 0) : true;\n            }\n        }\n\n        return regex ? collectRegex() : scanPunctuator();\n    }\n\n    function advance() {\n        var cp, token;\n\n        if (index >= length) {\n            return {\n                type: Token.EOF,\n                lineNumber: lineNumber,\n                lineStart: lineStart,\n                start: index,\n                end: index\n            };\n        }\n\n        cp = source.charCodeAt(index);\n\n        if (isIdentifierStart(cp)) {\n            token = scanIdentifier();\n            if (strict && isStrictModeReservedWord(token.value)) {\n                token.type = Token.Keyword;\n            }\n            return token;\n        }\n\n        // Very common: ( and ) and ;\n        if (cp === 0x28 || cp === 0x29 || cp === 0x3B) {\n            return scanPunctuator();\n        }\n\n        // String literal starts with single quote (U+0027) or double quote (U+0022).\n        if (cp === 0x27 || cp === 0x22) {\n            return scanStringLiteral();\n        }\n\n        // Dot (.) U+002E can also start a floating-point number, hence the need\n        // to check the next character.\n        if (cp === 0x2E) {\n            if (isDecimalDigit(source.charCodeAt(index + 1))) {\n                return scanNumericLiteral();\n            }\n            return scanPunctuator();\n        }\n\n        if (isDecimalDigit(cp)) {\n            return scanNumericLiteral();\n        }\n\n        // Slash (/) U+002F can also start a regex.\n        if (extra.tokenize && cp === 0x2F) {\n            return advanceSlash();\n        }\n\n        // Template literals start with ` (U+0060) for template head\n        // or } (U+007D) for template middle or template tail.\n        if (cp === 0x60 || (cp === 0x7D && state.curlyStack[state.curlyStack.length - 1] === '${')) {\n            return scanTemplate();\n        }\n\n        // Possible identifier start in a surrogate pair.\n        if (cp >= 0xD800 && cp < 0xDFFF) {\n            cp = codePointAt(index);\n            if (isIdentifierStart(cp)) {\n                return scanIdentifier();\n            }\n        }\n\n        return scanPunctuator();\n    }\n\n    function collectToken() {\n        var loc, token, value, entry;\n\n        loc = {\n            start: {\n                line: lineNumber,\n                column: index - lineStart\n            }\n        };\n\n        token = advance();\n        loc.end = {\n            line: lineNumber,\n            column: index - lineStart\n        };\n\n        if (token.type !== Token.EOF) {\n            value = source.slice(token.start, token.end);\n            entry = {\n                type: TokenName[token.type],\n                value: value,\n                range: [token.start, token.end],\n                loc: loc\n            };\n            if (token.regex) {\n                entry.regex = {\n                    pattern: token.regex.pattern,\n                    flags: token.regex.flags\n                };\n            }\n            if (extra.tokenValues) {\n                extra.tokenValues.push((entry.type === 'Punctuator' || entry.type === 'Keyword') ? entry.value : null);\n            }\n            if (extra.tokenize) {\n                if (!extra.range) {\n                    delete entry.range;\n                }\n                if (!extra.loc) {\n                    delete entry.loc;\n                }\n                if (extra.delegate) {\n                    entry = extra.delegate(entry);\n                }\n            }\n            extra.tokens.push(entry);\n        }\n\n        return token;\n    }\n\n    function lex() {\n        var token;\n        scanning = true;\n\n        lastIndex = index;\n        lastLineNumber = lineNumber;\n        lastLineStart = lineStart;\n\n        skipComment();\n\n        token = lookahead;\n\n        startIndex = index;\n        startLineNumber = lineNumber;\n        startLineStart = lineStart;\n\n        lookahead = (typeof extra.tokens !== 'undefined') ? collectToken() : advance();\n        scanning = false;\n        return token;\n    }\n\n    function peek() {\n        scanning = true;\n\n        skipComment();\n\n        lastIndex = index;\n        lastLineNumber = lineNumber;\n        lastLineStart = lineStart;\n\n        startIndex = index;\n        startLineNumber = lineNumber;\n        startLineStart = lineStart;\n\n        lookahead = (typeof extra.tokens !== 'undefined') ? collectToken() : advance();\n        scanning = false;\n    }\n\n    function Position() {\n        this.line = startLineNumber;\n        this.column = startIndex - startLineStart;\n    }\n\n    function SourceLocation() {\n        this.start = new Position();\n        this.end = null;\n    }\n\n    function WrappingSourceLocation(startToken) {\n        this.start = {\n            line: startToken.lineNumber,\n            column: startToken.start - startToken.lineStart\n        };\n        this.end = null;\n    }\n\n    function Node() {\n        if (extra.range) {\n            this.range = [startIndex, 0];\n        }\n        if (extra.loc) {\n            this.loc = new SourceLocation();\n        }\n    }\n\n    function WrappingNode(startToken) {\n        if (extra.range) {\n            this.range = [startToken.start, 0];\n        }\n        if (extra.loc) {\n            this.loc = new WrappingSourceLocation(startToken);\n        }\n    }\n\n    WrappingNode.prototype = Node.prototype = {\n\n        processComment: function () {\n            var lastChild,\n                innerComments,\n                leadingComments,\n                trailingComments,\n                bottomRight = extra.bottomRightStack,\n                i,\n                comment,\n                last = bottomRight[bottomRight.length - 1];\n\n            if (this.type === Syntax.Program) {\n                if (this.body.length > 0) {\n                    return;\n                }\n            }\n            /**\n             * patch innnerComments for properties empty block\n             * `function a() {/** comments **\\/}`\n             */\n\n            if (this.type === Syntax.BlockStatement && this.body.length === 0) {\n                innerComments = [];\n                for (i = extra.leadingComments.length - 1; i >= 0; --i) {\n                    comment = extra.leadingComments[i];\n                    if (this.range[1] >= comment.range[1]) {\n                        innerComments.unshift(comment);\n                        extra.leadingComments.splice(i, 1);\n                        extra.trailingComments.splice(i, 1);\n                    }\n                }\n                if (innerComments.length) {\n                    this.innerComments = innerComments;\n                    //bottomRight.push(this);\n                    return;\n                }\n            }\n\n            if (extra.trailingComments.length > 0) {\n                trailingComments = [];\n                for (i = extra.trailingComments.length - 1; i >= 0; --i) {\n                    comment = extra.trailingComments[i];\n                    if (comment.range[0] >= this.range[1]) {\n                        trailingComments.unshift(comment);\n                        extra.trailingComments.splice(i, 1);\n                    }\n                }\n                extra.trailingComments = [];\n            } else {\n                if (last && last.trailingComments && last.trailingComments[0].range[0] >= this.range[1]) {\n                    trailingComments = last.trailingComments;\n                    delete last.trailingComments;\n                }\n            }\n\n            // Eating the stack.\n            while (last && last.range[0] >= this.range[0]) {\n                lastChild = bottomRight.pop();\n                last = bottomRight[bottomRight.length - 1];\n            }\n\n            if (lastChild) {\n                if (lastChild.leadingComments) {\n                    leadingComments = [];\n                    for (i = lastChild.leadingComments.length - 1; i >= 0; --i) {\n                        comment = lastChild.leadingComments[i];\n                        if (comment.range[1] <= this.range[0]) {\n                            leadingComments.unshift(comment);\n                            lastChild.leadingComments.splice(i, 1);\n                        }\n                    }\n\n                    if (!lastChild.leadingComments.length) {\n                        lastChild.leadingComments = undefined;\n                    }\n                }\n            } else if (extra.leadingComments.length > 0) {\n                leadingComments = [];\n                for (i = extra.leadingComments.length - 1; i >= 0; --i) {\n                    comment = extra.leadingComments[i];\n                    if (comment.range[1] <= this.range[0]) {\n                        leadingComments.unshift(comment);\n                        extra.leadingComments.splice(i, 1);\n                    }\n                }\n            }\n\n\n            if (leadingComments && leadingComments.length > 0) {\n                this.leadingComments = leadingComments;\n            }\n            if (trailingComments && trailingComments.length > 0) {\n                this.trailingComments = trailingComments;\n            }\n\n            bottomRight.push(this);\n        },\n\n        finish: function () {\n            if (extra.range) {\n                this.range[1] = lastIndex;\n            }\n            if (extra.loc) {\n                this.loc.end = {\n                    line: lastLineNumber,\n                    column: lastIndex - lastLineStart\n                };\n                if (extra.source) {\n                    this.loc.source = extra.source;\n                }\n            }\n\n            if (extra.attachComment) {\n                this.processComment();\n            }\n        },\n\n        finishArrayExpression: function (elements) {\n            this.type = Syntax.ArrayExpression;\n            this.elements = elements;\n            this.finish();\n            return this;\n        },\n\n        finishArrayPattern: function (elements) {\n            this.type = Syntax.ArrayPattern;\n            this.elements = elements;\n            this.finish();\n            return this;\n        },\n\n        finishArrowFunctionExpression: function (params, defaults, body, expression) {\n            this.type = Syntax.ArrowFunctionExpression;\n            this.id = null;\n            this.params = params;\n            this.defaults = defaults;\n            this.body = body;\n            this.generator = false;\n            this.expression = expression;\n            this.finish();\n            return this;\n        },\n\n        finishAssignmentExpression: function (operator, left, right) {\n            this.type = Syntax.AssignmentExpression;\n            this.operator = operator;\n            this.left = left;\n            this.right = right;\n            this.finish();\n            return this;\n        },\n\n        finishAssignmentPattern: function (left, right) {\n            this.type = Syntax.AssignmentPattern;\n            this.left = left;\n            this.right = right;\n            this.finish();\n            return this;\n        },\n\n        finishBinaryExpression: function (operator, left, right) {\n            this.type = (operator === '||' || operator === '&&') ? Syntax.LogicalExpression : Syntax.BinaryExpression;\n            this.operator = operator;\n            this.left = left;\n            this.right = right;\n            this.finish();\n            return this;\n        },\n\n        finishBlockStatement: function (body) {\n            this.type = Syntax.BlockStatement;\n            this.body = body;\n            this.finish();\n            return this;\n        },\n\n        finishBreakStatement: function (label) {\n            this.type = Syntax.BreakStatement;\n            this.label = label;\n            this.finish();\n            return this;\n        },\n\n        finishCallExpression: function (callee, args) {\n            this.type = Syntax.CallExpression;\n            this.callee = callee;\n            this.arguments = args;\n            this.finish();\n            return this;\n        },\n\n        finishCatchClause: function (param, body) {\n            this.type = Syntax.CatchClause;\n            this.param = param;\n            this.body = body;\n            this.finish();\n            return this;\n        },\n\n        finishClassBody: function (body) {\n            this.type = Syntax.ClassBody;\n            this.body = body;\n            this.finish();\n            return this;\n        },\n\n        finishClassDeclaration: function (id, superClass, body) {\n            this.type = Syntax.ClassDeclaration;\n            this.id = id;\n            this.superClass = superClass;\n            this.body = body;\n            this.finish();\n            return this;\n        },\n\n        finishClassExpression: function (id, superClass, body) {\n            this.type = Syntax.ClassExpression;\n            this.id = id;\n            this.superClass = superClass;\n            this.body = body;\n            this.finish();\n            return this;\n        },\n\n        finishConditionalExpression: function (test, consequent, alternate) {\n            this.type = Syntax.ConditionalExpression;\n            this.test = test;\n            this.consequent = consequent;\n            this.alternate = alternate;\n            this.finish();\n            return this;\n        },\n\n        finishContinueStatement: function (label) {\n            this.type = Syntax.ContinueStatement;\n            this.label = label;\n            this.finish();\n            return this;\n        },\n\n        finishDebuggerStatement: function () {\n            this.type = Syntax.DebuggerStatement;\n            this.finish();\n            return this;\n        },\n\n        finishDoWhileStatement: function (body, test) {\n            this.type = Syntax.DoWhileStatement;\n            this.body = body;\n            this.test = test;\n            this.finish();\n            return this;\n        },\n\n        finishEmptyStatement: function () {\n            this.type = Syntax.EmptyStatement;\n            this.finish();\n            return this;\n        },\n\n        finishExpressionStatement: function (expression) {\n            this.type = Syntax.ExpressionStatement;\n            this.expression = expression;\n            this.finish();\n            return this;\n        },\n\n        finishForStatement: function (init, test, update, body) {\n            this.type = Syntax.ForStatement;\n            this.init = init;\n            this.test = test;\n            this.update = update;\n            this.body = body;\n            this.finish();\n            return this;\n        },\n\n        finishForOfStatement: function (left, right, body) {\n            this.type = Syntax.ForOfStatement;\n            this.left = left;\n            this.right = right;\n            this.body = body;\n            this.finish();\n            return this;\n        },\n\n        finishForInStatement: function (left, right, body) {\n            this.type = Syntax.ForInStatement;\n            this.left = left;\n            this.right = right;\n            this.body = body;\n            this.each = false;\n            this.finish();\n            return this;\n        },\n\n        finishFunctionDeclaration: function (id, params, defaults, body, generator) {\n            this.type = Syntax.FunctionDeclaration;\n            this.id = id;\n            this.params = params;\n            this.defaults = defaults;\n            this.body = body;\n            this.generator = generator;\n            this.expression = false;\n            this.finish();\n            return this;\n        },\n\n        finishFunctionExpression: function (id, params, defaults, body, generator) {\n            this.type = Syntax.FunctionExpression;\n            this.id = id;\n            this.params = params;\n            this.defaults = defaults;\n            this.body = body;\n            this.generator = generator;\n            this.expression = false;\n            this.finish();\n            return this;\n        },\n\n        finishIdentifier: function (name) {\n            this.type = Syntax.Identifier;\n            this.name = name;\n            this.finish();\n            return this;\n        },\n\n        finishIfStatement: function (test, consequent, alternate) {\n            this.type = Syntax.IfStatement;\n            this.test = test;\n            this.consequent = consequent;\n            this.alternate = alternate;\n            this.finish();\n            return this;\n        },\n\n        finishLabeledStatement: function (label, body) {\n            this.type = Syntax.LabeledStatement;\n            this.label = label;\n            this.body = body;\n            this.finish();\n            return this;\n        },\n\n        finishLiteral: function (token) {\n            this.type = Syntax.Literal;\n            this.value = token.value;\n            this.raw = source.slice(token.start, token.end);\n            if (token.regex) {\n                this.regex = token.regex;\n            }\n            this.finish();\n            return this;\n        },\n\n        finishMemberExpression: function (accessor, object, property) {\n            this.type = Syntax.MemberExpression;\n            this.computed = accessor === '[';\n            this.object = object;\n            this.property = property;\n            this.finish();\n            return this;\n        },\n\n        finishMetaProperty: function (meta, property) {\n            this.type = Syntax.MetaProperty;\n            this.meta = meta;\n            this.property = property;\n            this.finish();\n            return this;\n        },\n\n        finishNewExpression: function (callee, args) {\n            this.type = Syntax.NewExpression;\n            this.callee = callee;\n            this.arguments = args;\n            this.finish();\n            return this;\n        },\n\n        finishObjectExpression: function (properties) {\n            this.type = Syntax.ObjectExpression;\n            this.properties = properties;\n            this.finish();\n            return this;\n        },\n\n        finishObjectPattern: function (properties) {\n            this.type = Syntax.ObjectPattern;\n            this.properties = properties;\n            this.finish();\n            return this;\n        },\n\n        finishPostfixExpression: function (operator, argument) {\n            this.type = Syntax.UpdateExpression;\n            this.operator = operator;\n            this.argument = argument;\n            this.prefix = false;\n            this.finish();\n            return this;\n        },\n\n        finishProgram: function (body, sourceType) {\n            this.type = Syntax.Program;\n            this.body = body;\n            this.sourceType = sourceType;\n            this.finish();\n            return this;\n        },\n\n        finishProperty: function (kind, key, computed, value, method, shorthand) {\n            this.type = Syntax.Property;\n            this.key = key;\n            this.computed = computed;\n            this.value = value;\n            this.kind = kind;\n            this.method = method;\n            this.shorthand = shorthand;\n            this.finish();\n            return this;\n        },\n\n        finishRestElement: function (argument) {\n            this.type = Syntax.RestElement;\n            this.argument = argument;\n            this.finish();\n            return this;\n        },\n\n        finishReturnStatement: function (argument) {\n            this.type = Syntax.ReturnStatement;\n            this.argument = argument;\n            this.finish();\n            return this;\n        },\n\n        finishSequenceExpression: function (expressions) {\n            this.type = Syntax.SequenceExpression;\n            this.expressions = expressions;\n            this.finish();\n            return this;\n        },\n\n        finishSpreadElement: function (argument) {\n            this.type = Syntax.SpreadElement;\n            this.argument = argument;\n            this.finish();\n            return this;\n        },\n\n        finishSwitchCase: function (test, consequent) {\n            this.type = Syntax.SwitchCase;\n            this.test = test;\n            this.consequent = consequent;\n            this.finish();\n            return this;\n        },\n\n        finishSuper: function () {\n            this.type = Syntax.Super;\n            this.finish();\n            return this;\n        },\n\n        finishSwitchStatement: function (discriminant, cases) {\n            this.type = Syntax.SwitchStatement;\n            this.discriminant = discriminant;\n            this.cases = cases;\n            this.finish();\n            return this;\n        },\n\n        finishTaggedTemplateExpression: function (tag, quasi) {\n            this.type = Syntax.TaggedTemplateExpression;\n            this.tag = tag;\n            this.quasi = quasi;\n            this.finish();\n            return this;\n        },\n\n        finishTemplateElement: function (value, tail) {\n            this.type = Syntax.TemplateElement;\n            this.value = value;\n            this.tail = tail;\n            this.finish();\n            return this;\n        },\n\n        finishTemplateLiteral: function (quasis, expressions) {\n            this.type = Syntax.TemplateLiteral;\n            this.quasis = quasis;\n            this.expressions = expressions;\n            this.finish();\n            return this;\n        },\n\n        finishThisExpression: function () {\n            this.type = Syntax.ThisExpression;\n            this.finish();\n            return this;\n        },\n\n        finishThrowStatement: function (argument) {\n            this.type = Syntax.ThrowStatement;\n            this.argument = argument;\n            this.finish();\n            return this;\n        },\n\n        finishTryStatement: function (block, handler, finalizer) {\n            this.type = Syntax.TryStatement;\n            this.block = block;\n            this.guardedHandlers = [];\n            this.handlers = handler ? [handler] : [];\n            this.handler = handler;\n            this.finalizer = finalizer;\n            this.finish();\n            return this;\n        },\n\n        finishUnaryExpression: function (operator, argument) {\n            this.type = (operator === '++' || operator === '--') ? Syntax.UpdateExpression : Syntax.UnaryExpression;\n            this.operator = operator;\n            this.argument = argument;\n            this.prefix = true;\n            this.finish();\n            return this;\n        },\n\n        finishVariableDeclaration: function (declarations) {\n            this.type = Syntax.VariableDeclaration;\n            this.declarations = declarations;\n            this.kind = 'var';\n            this.finish();\n            return this;\n        },\n\n        finishLexicalDeclaration: function (declarations, kind) {\n            this.type = Syntax.VariableDeclaration;\n            this.declarations = declarations;\n            this.kind = kind;\n            this.finish();\n            return this;\n        },\n\n        finishVariableDeclarator: function (id, init) {\n            this.type = Syntax.VariableDeclarator;\n            this.id = id;\n            this.init = init;\n            this.finish();\n            return this;\n        },\n\n        finishWhileStatement: function (test, body) {\n            this.type = Syntax.WhileStatement;\n            this.test = test;\n            this.body = body;\n            this.finish();\n            return this;\n        },\n\n        finishWithStatement: function (object, body) {\n            this.type = Syntax.WithStatement;\n            this.object = object;\n            this.body = body;\n            this.finish();\n            return this;\n        },\n\n        finishExportSpecifier: function (local, exported) {\n            this.type = Syntax.ExportSpecifier;\n            this.exported = exported || local;\n            this.local = local;\n            this.finish();\n            return this;\n        },\n\n        finishImportDefaultSpecifier: function (local) {\n            this.type = Syntax.ImportDefaultSpecifier;\n            this.local = local;\n            this.finish();\n            return this;\n        },\n\n        finishImportNamespaceSpecifier: function (local) {\n            this.type = Syntax.ImportNamespaceSpecifier;\n            this.local = local;\n            this.finish();\n            return this;\n        },\n\n        finishExportNamedDeclaration: function (declaration, specifiers, src) {\n            this.type = Syntax.ExportNamedDeclaration;\n            this.declaration = declaration;\n            this.specifiers = specifiers;\n            this.source = src;\n            this.finish();\n            return this;\n        },\n\n        finishExportDefaultDeclaration: function (declaration) {\n            this.type = Syntax.ExportDefaultDeclaration;\n            this.declaration = declaration;\n            this.finish();\n            return this;\n        },\n\n        finishExportAllDeclaration: function (src) {\n            this.type = Syntax.ExportAllDeclaration;\n            this.source = src;\n            this.finish();\n            return this;\n        },\n\n        finishImportSpecifier: function (local, imported) {\n            this.type = Syntax.ImportSpecifier;\n            this.local = local || imported;\n            this.imported = imported;\n            this.finish();\n            return this;\n        },\n\n        finishImportDeclaration: function (specifiers, src) {\n            this.type = Syntax.ImportDeclaration;\n            this.specifiers = specifiers;\n            this.source = src;\n            this.finish();\n            return this;\n        },\n\n        finishYieldExpression: function (argument, delegate) {\n            this.type = Syntax.YieldExpression;\n            this.argument = argument;\n            this.delegate = delegate;\n            this.finish();\n            return this;\n        }\n    };\n\n\n    function recordError(error) {\n        var e, existing;\n\n        for (e = 0; e < extra.errors.length; e++) {\n            existing = extra.errors[e];\n            // Prevent duplicated error.\n            /* istanbul ignore next */\n            if (existing.index === error.index && existing.message === error.message) {\n                return;\n            }\n        }\n\n        extra.errors.push(error);\n    }\n\n    function constructError(msg, column) {\n        var error = new Error(msg);\n        try {\n            throw error;\n        } catch (base) {\n            /* istanbul ignore else */\n            if (Object.create && Object.defineProperty) {\n                error = Object.create(base);\n                Object.defineProperty(error, 'column', { value: column });\n            }\n        } finally {\n            return error;\n        }\n    }\n\n    function createError(line, pos, description) {\n        var msg, column, error;\n\n        msg = 'Line ' + line + ': ' + description;\n        column = pos - (scanning ? lineStart : lastLineStart) + 1;\n        error = constructError(msg, column);\n        error.lineNumber = line;\n        error.description = description;\n        error.index = pos;\n        return error;\n    }\n\n    // Throw an exception\n\n    function throwError(messageFormat) {\n        var args, msg;\n\n        args = Array.prototype.slice.call(arguments, 1);\n        msg = messageFormat.replace(/%(\\d)/g,\n            function (whole, idx) {\n                assert(idx < args.length, 'Message reference must be in range');\n                return args[idx];\n            }\n        );\n\n        throw createError(lastLineNumber, lastIndex, msg);\n    }\n\n    function tolerateError(messageFormat) {\n        var args, msg, error;\n\n        args = Array.prototype.slice.call(arguments, 1);\n        /* istanbul ignore next */\n        msg = messageFormat.replace(/%(\\d)/g,\n            function (whole, idx) {\n                assert(idx < args.length, 'Message reference must be in range');\n                return args[idx];\n            }\n        );\n\n        error = createError(lineNumber, lastIndex, msg);\n        if (extra.errors) {\n            recordError(error);\n        } else {\n            throw error;\n        }\n    }\n\n    // Throw an exception because of the token.\n\n    function unexpectedTokenError(token, message) {\n        var value, msg = message || Messages.UnexpectedToken;\n\n        if (token) {\n            if (!message) {\n                msg = (token.type === Token.EOF) ? Messages.UnexpectedEOS :\n                    (token.type === Token.Identifier) ? Messages.UnexpectedIdentifier :\n                    (token.type === Token.NumericLiteral) ? Messages.UnexpectedNumber :\n                    (token.type === Token.StringLiteral) ? Messages.UnexpectedString :\n                    (token.type === Token.Template) ? Messages.UnexpectedTemplate :\n                    Messages.UnexpectedToken;\n\n                if (token.type === Token.Keyword) {\n                    if (isFutureReservedWord(token.value)) {\n                        msg = Messages.UnexpectedReserved;\n                    } else if (strict && isStrictModeReservedWord(token.value)) {\n                        msg = Messages.StrictReservedWord;\n                    }\n                }\n            }\n\n            value = (token.type === Token.Template) ? token.value.raw : token.value;\n        } else {\n            value = 'ILLEGAL';\n        }\n\n        msg = msg.replace('%0', value);\n\n        return (token && typeof token.lineNumber === 'number') ?\n            createError(token.lineNumber, token.start, msg) :\n            createError(scanning ? lineNumber : lastLineNumber, scanning ? index : lastIndex, msg);\n    }\n\n    function throwUnexpectedToken(token, message) {\n        throw unexpectedTokenError(token, message);\n    }\n\n    function tolerateUnexpectedToken(token, message) {\n        var error = unexpectedTokenError(token, message);\n        if (extra.errors) {\n            recordError(error);\n        } else {\n            throw error;\n        }\n    }\n\n    // Expect the next token to match the specified punctuator.\n    // If not, an exception will be thrown.\n\n    function expect(value) {\n        var token = lex();\n        if (token.type !== Token.Punctuator || token.value !== value) {\n            throwUnexpectedToken(token);\n        }\n    }\n\n    /**\n     * @name expectCommaSeparator\n     * @description Quietly expect a comma when in tolerant mode, otherwise delegates\n     * to <code>expect(value)</code>\n     * @since 2.0\n     */\n    function expectCommaSeparator() {\n        var token;\n\n        if (extra.errors) {\n            token = lookahead;\n            if (token.type === Token.Punctuator && token.value === ',') {\n                lex();\n            } else if (token.type === Token.Punctuator && token.value === ';') {\n                lex();\n                tolerateUnexpectedToken(token);\n            } else {\n                tolerateUnexpectedToken(token, Messages.UnexpectedToken);\n            }\n        } else {\n            expect(',');\n        }\n    }\n\n    // Expect the next token to match the specified keyword.\n    // If not, an exception will be thrown.\n\n    function expectKeyword(keyword) {\n        var token = lex();\n        if (token.type !== Token.Keyword || token.value !== keyword) {\n            throwUnexpectedToken(token);\n        }\n    }\n\n    // Return true if the next token matches the specified punctuator.\n\n    function match(value) {\n        return lookahead.type === Token.Punctuator && lookahead.value === value;\n    }\n\n    // Return true if the next token matches the specified keyword\n\n    function matchKeyword(keyword) {\n        return lookahead.type === Token.Keyword && lookahead.value === keyword;\n    }\n\n    // Return true if the next token matches the specified contextual keyword\n    // (where an identifier is sometimes a keyword depending on the context)\n\n    function matchContextualKeyword(keyword) {\n        return lookahead.type === Token.Identifier && lookahead.value === keyword;\n    }\n\n    // Return true if the next token is an assignment operator\n\n    function matchAssign() {\n        var op;\n\n        if (lookahead.type !== Token.Punctuator) {\n            return false;\n        }\n        op = lookahead.value;\n        return op === '=' ||\n            op === '*=' ||\n            op === '/=' ||\n            op === '%=' ||\n            op === '+=' ||\n            op === '-=' ||\n            op === '<<=' ||\n            op === '>>=' ||\n            op === '>>>=' ||\n            op === '&=' ||\n            op === '^=' ||\n            op === '|=';\n    }\n\n    function consumeSemicolon() {\n        // Catch the very common case first: immediately a semicolon (U+003B).\n        if (source.charCodeAt(startIndex) === 0x3B || match(';')) {\n            lex();\n            return;\n        }\n\n        if (hasLineTerminator) {\n            return;\n        }\n\n        // FIXME(ikarienator): this is seemingly an issue in the previous location info convention.\n        lastIndex = startIndex;\n        lastLineNumber = startLineNumber;\n        lastLineStart = startLineStart;\n\n        if (lookahead.type !== Token.EOF && !match('}')) {\n            throwUnexpectedToken(lookahead);\n        }\n    }\n\n    // Cover grammar support.\n    //\n    // When an assignment expression position starts with an left parenthesis, the determination of the type\n    // of the syntax is to be deferred arbitrarily long until the end of the parentheses pair (plus a lookahead)\n    // or the first comma. This situation also defers the determination of all the expressions nested in the pair.\n    //\n    // There are three productions that can be parsed in a parentheses pair that needs to be determined\n    // after the outermost pair is closed. They are:\n    //\n    //   1. AssignmentExpression\n    //   2. BindingElements\n    //   3. AssignmentTargets\n    //\n    // In order to avoid exponential backtracking, we use two flags to denote if the production can be\n    // binding element or assignment target.\n    //\n    // The three productions have the relationship:\n    //\n    //   BindingElements ⊆ AssignmentTargets ⊆ AssignmentExpression\n    //\n    // with a single exception that CoverInitializedName when used directly in an Expression, generates\n    // an early error. Therefore, we need the third state, firstCoverInitializedNameError, to track the\n    // first usage of CoverInitializedName and report it when we reached the end of the parentheses pair.\n    //\n    // isolateCoverGrammar function runs the given parser function with a new cover grammar context, and it does not\n    // effect the current flags. This means the production the parser parses is only used as an expression. Therefore\n    // the CoverInitializedName check is conducted.\n    //\n    // inheritCoverGrammar function runs the given parse function with a new cover grammar context, and it propagates\n    // the flags outside of the parser. This means the production the parser parses is used as a part of a potential\n    // pattern. The CoverInitializedName check is deferred.\n    function isolateCoverGrammar(parser) {\n        var oldIsBindingElement = isBindingElement,\n            oldIsAssignmentTarget = isAssignmentTarget,\n            oldFirstCoverInitializedNameError = firstCoverInitializedNameError,\n            result;\n        isBindingElement = true;\n        isAssignmentTarget = true;\n        firstCoverInitializedNameError = null;\n        result = parser();\n        if (firstCoverInitializedNameError !== null) {\n            throwUnexpectedToken(firstCoverInitializedNameError);\n        }\n        isBindingElement = oldIsBindingElement;\n        isAssignmentTarget = oldIsAssignmentTarget;\n        firstCoverInitializedNameError = oldFirstCoverInitializedNameError;\n        return result;\n    }\n\n    function inheritCoverGrammar(parser) {\n        var oldIsBindingElement = isBindingElement,\n            oldIsAssignmentTarget = isAssignmentTarget,\n            oldFirstCoverInitializedNameError = firstCoverInitializedNameError,\n            result;\n        isBindingElement = true;\n        isAssignmentTarget = true;\n        firstCoverInitializedNameError = null;\n        result = parser();\n        isBindingElement = isBindingElement && oldIsBindingElement;\n        isAssignmentTarget = isAssignmentTarget && oldIsAssignmentTarget;\n        firstCoverInitializedNameError = oldFirstCoverInitializedNameError || firstCoverInitializedNameError;\n        return result;\n    }\n\n    // ECMA-262 13.3.3 Destructuring Binding Patterns\n\n    function parseArrayPattern(params, kind) {\n        var node = new Node(), elements = [], rest, restNode;\n        expect('[');\n\n        while (!match(']')) {\n            if (match(',')) {\n                lex();\n                elements.push(null);\n            } else {\n                if (match('...')) {\n                    restNode = new Node();\n                    lex();\n                    params.push(lookahead);\n                    rest = parseVariableIdentifier(kind);\n                    elements.push(restNode.finishRestElement(rest));\n                    break;\n                } else {\n                    elements.push(parsePatternWithDefault(params, kind));\n                }\n                if (!match(']')) {\n                    expect(',');\n                }\n            }\n\n        }\n\n        expect(']');\n\n        return node.finishArrayPattern(elements);\n    }\n\n    function parsePropertyPattern(params, kind) {\n        var node = new Node(), key, keyToken, computed = match('['), init;\n        if (lookahead.type === Token.Identifier) {\n            keyToken = lookahead;\n            key = parseVariableIdentifier();\n            if (match('=')) {\n                params.push(keyToken);\n                lex();\n                init = parseAssignmentExpression();\n\n                return node.finishProperty(\n                    'init', key, false,\n                    new WrappingNode(keyToken).finishAssignmentPattern(key, init), false, false);\n            } else if (!match(':')) {\n                params.push(keyToken);\n                return node.finishProperty('init', key, false, key, false, true);\n            }\n        } else {\n            key = parseObjectPropertyKey();\n        }\n        expect(':');\n        init = parsePatternWithDefault(params, kind);\n        return node.finishProperty('init', key, computed, init, false, false);\n    }\n\n    function parseObjectPattern(params, kind) {\n        var node = new Node(), properties = [];\n\n        expect('{');\n\n        while (!match('}')) {\n            properties.push(parsePropertyPattern(params, kind));\n            if (!match('}')) {\n                expect(',');\n            }\n        }\n\n        lex();\n\n        return node.finishObjectPattern(properties);\n    }\n\n    function parsePattern(params, kind) {\n        if (match('[')) {\n            return parseArrayPattern(params, kind);\n        } else if (match('{')) {\n            return parseObjectPattern(params, kind);\n        } else if (matchKeyword('let')) {\n            if (kind === 'const' || kind === 'let') {\n                tolerateUnexpectedToken(lookahead, Messages.UnexpectedToken);\n            }\n        }\n\n        params.push(lookahead);\n        return parseVariableIdentifier(kind);\n    }\n\n    function parsePatternWithDefault(params, kind) {\n        var startToken = lookahead, pattern, previousAllowYield, right;\n        pattern = parsePattern(params, kind);\n        if (match('=')) {\n            lex();\n            previousAllowYield = state.allowYield;\n            state.allowYield = true;\n            right = isolateCoverGrammar(parseAssignmentExpression);\n            state.allowYield = previousAllowYield;\n            pattern = new WrappingNode(startToken).finishAssignmentPattern(pattern, right);\n        }\n        return pattern;\n    }\n\n    // ECMA-262 12.2.5 Array Initializer\n\n    function parseArrayInitializer() {\n        var elements = [], node = new Node(), restSpread;\n\n        expect('[');\n\n        while (!match(']')) {\n            if (match(',')) {\n                lex();\n                elements.push(null);\n            } else if (match('...')) {\n                restSpread = new Node();\n                lex();\n                restSpread.finishSpreadElement(inheritCoverGrammar(parseAssignmentExpression));\n\n                if (!match(']')) {\n                    isAssignmentTarget = isBindingElement = false;\n                    expect(',');\n                }\n                elements.push(restSpread);\n            } else {\n                elements.push(inheritCoverGrammar(parseAssignmentExpression));\n\n                if (!match(']')) {\n                    expect(',');\n                }\n            }\n        }\n\n        lex();\n\n        return node.finishArrayExpression(elements);\n    }\n\n    // ECMA-262 12.2.6 Object Initializer\n\n    function parsePropertyFunction(node, paramInfo, isGenerator) {\n        var previousStrict, body;\n\n        isAssignmentTarget = isBindingElement = false;\n\n        previousStrict = strict;\n        body = isolateCoverGrammar(parseFunctionSourceElements);\n\n        if (strict && paramInfo.firstRestricted) {\n            tolerateUnexpectedToken(paramInfo.firstRestricted, paramInfo.message);\n        }\n        if (strict && paramInfo.stricted) {\n            tolerateUnexpectedToken(paramInfo.stricted, paramInfo.message);\n        }\n\n        strict = previousStrict;\n        return node.finishFunctionExpression(null, paramInfo.params, paramInfo.defaults, body, isGenerator);\n    }\n\n    function parsePropertyMethodFunction() {\n        var params, method, node = new Node(),\n            previousAllowYield = state.allowYield;\n\n        state.allowYield = false;\n        params = parseParams();\n        state.allowYield = previousAllowYield;\n\n        state.allowYield = false;\n        method = parsePropertyFunction(node, params, false);\n        state.allowYield = previousAllowYield;\n\n        return method;\n    }\n\n    function parseObjectPropertyKey() {\n        var token, node = new Node(), expr;\n\n        token = lex();\n\n        // Note: This function is called only from parseObjectProperty(), where\n        // EOF and Punctuator tokens are already filtered out.\n\n        switch (token.type) {\n        case Token.StringLiteral:\n        case Token.NumericLiteral:\n            if (strict && token.octal) {\n                tolerateUnexpectedToken(token, Messages.StrictOctalLiteral);\n            }\n            return node.finishLiteral(token);\n        case Token.Identifier:\n        case Token.BooleanLiteral:\n        case Token.NullLiteral:\n        case Token.Keyword:\n            return node.finishIdentifier(token.value);\n        case Token.Punctuator:\n            if (token.value === '[') {\n                expr = isolateCoverGrammar(parseAssignmentExpression);\n                expect(']');\n                return expr;\n            }\n            break;\n        }\n        throwUnexpectedToken(token);\n    }\n\n    function lookaheadPropertyName() {\n        switch (lookahead.type) {\n        case Token.Identifier:\n        case Token.StringLiteral:\n        case Token.BooleanLiteral:\n        case Token.NullLiteral:\n        case Token.NumericLiteral:\n        case Token.Keyword:\n            return true;\n        case Token.Punctuator:\n            return lookahead.value === '[';\n        }\n        return false;\n    }\n\n    // This function is to try to parse a MethodDefinition as defined in 14.3. But in the case of object literals,\n    // it might be called at a position where there is in fact a short hand identifier pattern or a data property.\n    // This can only be determined after we consumed up to the left parentheses.\n    //\n    // In order to avoid back tracking, it returns `null` if the position is not a MethodDefinition and the caller\n    // is responsible to visit other options.\n    function tryParseMethodDefinition(token, key, computed, node) {\n        var value, options, methodNode, params,\n            previousAllowYield = state.allowYield;\n\n        if (token.type === Token.Identifier) {\n            // check for `get` and `set`;\n\n            if (token.value === 'get' && lookaheadPropertyName()) {\n                computed = match('[');\n                key = parseObjectPropertyKey();\n                methodNode = new Node();\n                expect('(');\n                expect(')');\n\n                state.allowYield = false;\n                value = parsePropertyFunction(methodNode, {\n                    params: [],\n                    defaults: [],\n                    stricted: null,\n                    firstRestricted: null,\n                    message: null\n                }, false);\n                state.allowYield = previousAllowYield;\n\n                return node.finishProperty('get', key, computed, value, false, false);\n            } else if (token.value === 'set' && lookaheadPropertyName()) {\n                computed = match('[');\n                key = parseObjectPropertyKey();\n                methodNode = new Node();\n                expect('(');\n\n                options = {\n                    params: [],\n                    defaultCount: 0,\n                    defaults: [],\n                    firstRestricted: null,\n                    paramSet: {}\n                };\n                if (match(')')) {\n                    tolerateUnexpectedToken(lookahead);\n                } else {\n                    state.allowYield = false;\n                    parseParam(options);\n                    state.allowYield = previousAllowYield;\n                    if (options.defaultCount === 0) {\n                        options.defaults = [];\n                    }\n                }\n                expect(')');\n\n                state.allowYield = false;\n                value = parsePropertyFunction(methodNode, options, false);\n                state.allowYield = previousAllowYield;\n\n                return node.finishProperty('set', key, computed, value, false, false);\n            }\n        } else if (token.type === Token.Punctuator && token.value === '*' && lookaheadPropertyName()) {\n            computed = match('[');\n            key = parseObjectPropertyKey();\n            methodNode = new Node();\n\n            state.allowYield = true;\n            params = parseParams();\n            state.allowYield = previousAllowYield;\n\n            state.allowYield = false;\n            value = parsePropertyFunction(methodNode, params, true);\n            state.allowYield = previousAllowYield;\n\n            return node.finishProperty('init', key, computed, value, true, false);\n        }\n\n        if (key && match('(')) {\n            value = parsePropertyMethodFunction();\n            return node.finishProperty('init', key, computed, value, true, false);\n        }\n\n        // Not a MethodDefinition.\n        return null;\n    }\n\n    function parseObjectProperty(hasProto) {\n        var token = lookahead, node = new Node(), computed, key, maybeMethod, proto, value;\n\n        computed = match('[');\n        if (match('*')) {\n            lex();\n        } else {\n            key = parseObjectPropertyKey();\n        }\n        maybeMethod = tryParseMethodDefinition(token, key, computed, node);\n        if (maybeMethod) {\n            return maybeMethod;\n        }\n\n        if (!key) {\n            throwUnexpectedToken(lookahead);\n        }\n\n        // Check for duplicated __proto__\n        if (!computed) {\n            proto = (key.type === Syntax.Identifier && key.name === '__proto__') ||\n                (key.type === Syntax.Literal && key.value === '__proto__');\n            if (hasProto.value && proto) {\n                tolerateError(Messages.DuplicateProtoProperty);\n            }\n            hasProto.value |= proto;\n        }\n\n        if (match(':')) {\n            lex();\n            value = inheritCoverGrammar(parseAssignmentExpression);\n            return node.finishProperty('init', key, computed, value, false, false);\n        }\n\n        if (token.type === Token.Identifier) {\n            if (match('=')) {\n                firstCoverInitializedNameError = lookahead;\n                lex();\n                value = isolateCoverGrammar(parseAssignmentExpression);\n                return node.finishProperty('init', key, computed,\n                    new WrappingNode(token).finishAssignmentPattern(key, value), false, true);\n            }\n            return node.finishProperty('init', key, computed, key, false, true);\n        }\n\n        throwUnexpectedToken(lookahead);\n    }\n\n    function parseObjectInitializer() {\n        var properties = [], hasProto = {value: false}, node = new Node();\n\n        expect('{');\n\n        while (!match('}')) {\n            properties.push(parseObjectProperty(hasProto));\n\n            if (!match('}')) {\n                expectCommaSeparator();\n            }\n        }\n\n        expect('}');\n\n        return node.finishObjectExpression(properties);\n    }\n\n    function reinterpretExpressionAsPattern(expr) {\n        var i;\n        switch (expr.type) {\n        case Syntax.Identifier:\n        case Syntax.MemberExpression:\n        case Syntax.RestElement:\n        case Syntax.AssignmentPattern:\n            break;\n        case Syntax.SpreadElement:\n            expr.type = Syntax.RestElement;\n            reinterpretExpressionAsPattern(expr.argument);\n            break;\n        case Syntax.ArrayExpression:\n            expr.type = Syntax.ArrayPattern;\n            for (i = 0; i < expr.elements.length; i++) {\n                if (expr.elements[i] !== null) {\n                    reinterpretExpressionAsPattern(expr.elements[i]);\n                }\n            }\n            break;\n        case Syntax.ObjectExpression:\n            expr.type = Syntax.ObjectPattern;\n            for (i = 0; i < expr.properties.length; i++) {\n                reinterpretExpressionAsPattern(expr.properties[i].value);\n            }\n            break;\n        case Syntax.AssignmentExpression:\n            expr.type = Syntax.AssignmentPattern;\n            reinterpretExpressionAsPattern(expr.left);\n            break;\n        default:\n            // Allow other node type for tolerant parsing.\n            break;\n        }\n    }\n\n    // ECMA-262 12.2.9 Template Literals\n\n    function parseTemplateElement(option) {\n        var node, token;\n\n        if (lookahead.type !== Token.Template || (option.head && !lookahead.head)) {\n            throwUnexpectedToken();\n        }\n\n        node = new Node();\n        token = lex();\n\n        return node.finishTemplateElement({ raw: token.value.raw, cooked: token.value.cooked }, token.tail);\n    }\n\n    function parseTemplateLiteral() {\n        var quasi, quasis, expressions, node = new Node();\n\n        quasi = parseTemplateElement({ head: true });\n        quasis = [quasi];\n        expressions = [];\n\n        while (!quasi.tail) {\n            expressions.push(parseExpression());\n            quasi = parseTemplateElement({ head: false });\n            quasis.push(quasi);\n        }\n\n        return node.finishTemplateLiteral(quasis, expressions);\n    }\n\n    // ECMA-262 12.2.10 The Grouping Operator\n\n    function parseGroupExpression() {\n        var expr, expressions, startToken, i, params = [];\n\n        expect('(');\n\n        if (match(')')) {\n            lex();\n            if (!match('=>')) {\n                expect('=>');\n            }\n            return {\n                type: PlaceHolders.ArrowParameterPlaceHolder,\n                params: [],\n                rawParams: []\n            };\n        }\n\n        startToken = lookahead;\n        if (match('...')) {\n            expr = parseRestElement(params);\n            expect(')');\n            if (!match('=>')) {\n                expect('=>');\n            }\n            return {\n                type: PlaceHolders.ArrowParameterPlaceHolder,\n                params: [expr]\n            };\n        }\n\n        isBindingElement = true;\n        expr = inheritCoverGrammar(parseAssignmentExpression);\n\n        if (match(',')) {\n            isAssignmentTarget = false;\n            expressions = [expr];\n\n            while (startIndex < length) {\n                if (!match(',')) {\n                    break;\n                }\n                lex();\n\n                if (match('...')) {\n                    if (!isBindingElement) {\n                        throwUnexpectedToken(lookahead);\n                    }\n                    expressions.push(parseRestElement(params));\n                    expect(')');\n                    if (!match('=>')) {\n                        expect('=>');\n                    }\n                    isBindingElement = false;\n                    for (i = 0; i < expressions.length; i++) {\n                        reinterpretExpressionAsPattern(expressions[i]);\n                    }\n                    return {\n                        type: PlaceHolders.ArrowParameterPlaceHolder,\n                        params: expressions\n                    };\n                }\n\n                expressions.push(inheritCoverGrammar(parseAssignmentExpression));\n            }\n\n            expr = new WrappingNode(startToken).finishSequenceExpression(expressions);\n        }\n\n\n        expect(')');\n\n        if (match('=>')) {\n            if (expr.type === Syntax.Identifier && expr.name === 'yield') {\n                return {\n                    type: PlaceHolders.ArrowParameterPlaceHolder,\n                    params: [expr]\n                };\n            }\n\n            if (!isBindingElement) {\n                throwUnexpectedToken(lookahead);\n            }\n\n            if (expr.type === Syntax.SequenceExpression) {\n                for (i = 0; i < expr.expressions.length; i++) {\n                    reinterpretExpressionAsPattern(expr.expressions[i]);\n                }\n            } else {\n                reinterpretExpressionAsPattern(expr);\n            }\n\n            expr = {\n                type: PlaceHolders.ArrowParameterPlaceHolder,\n                params: expr.type === Syntax.SequenceExpression ? expr.expressions : [expr]\n            };\n        }\n        isBindingElement = false;\n        return expr;\n    }\n\n\n    // ECMA-262 12.2 Primary Expressions\n\n    function parsePrimaryExpression() {\n        var type, token, expr, node;\n\n        if (match('(')) {\n            isBindingElement = false;\n            return inheritCoverGrammar(parseGroupExpression);\n        }\n\n        if (match('[')) {\n            return inheritCoverGrammar(parseArrayInitializer);\n        }\n\n        if (match('{')) {\n            return inheritCoverGrammar(parseObjectInitializer);\n        }\n\n        type = lookahead.type;\n        node = new Node();\n\n        if (type === Token.Identifier) {\n            if (state.sourceType === 'module' && lookahead.value === 'await') {\n                tolerateUnexpectedToken(lookahead);\n            }\n            expr = node.finishIdentifier(lex().value);\n        } else if (type === Token.StringLiteral || type === Token.NumericLiteral) {\n            isAssignmentTarget = isBindingElement = false;\n            if (strict && lookahead.octal) {\n                tolerateUnexpectedToken(lookahead, Messages.StrictOctalLiteral);\n            }\n            expr = node.finishLiteral(lex());\n        } else if (type === Token.Keyword) {\n            if (!strict && state.allowYield && matchKeyword('yield')) {\n                return parseNonComputedProperty();\n            }\n            if (!strict && matchKeyword('let')) {\n                return node.finishIdentifier(lex().value);\n            }\n            isAssignmentTarget = isBindingElement = false;\n            if (matchKeyword('function')) {\n                return parseFunctionExpression();\n            }\n            if (matchKeyword('this')) {\n                lex();\n                return node.finishThisExpression();\n            }\n            if (matchKeyword('class')) {\n                return parseClassExpression();\n            }\n            throwUnexpectedToken(lex());\n        } else if (type === Token.BooleanLiteral) {\n            isAssignmentTarget = isBindingElement = false;\n            token = lex();\n            token.value = (token.value === 'true');\n            expr = node.finishLiteral(token);\n        } else if (type === Token.NullLiteral) {\n            isAssignmentTarget = isBindingElement = false;\n            token = lex();\n            token.value = null;\n            expr = node.finishLiteral(token);\n        } else if (match('/') || match('/=')) {\n            isAssignmentTarget = isBindingElement = false;\n            index = startIndex;\n\n            if (typeof extra.tokens !== 'undefined') {\n                token = collectRegex();\n            } else {\n                token = scanRegExp();\n            }\n            lex();\n            expr = node.finishLiteral(token);\n        } else if (type === Token.Template) {\n            expr = parseTemplateLiteral();\n        } else {\n            throwUnexpectedToken(lex());\n        }\n\n        return expr;\n    }\n\n    // ECMA-262 12.3 Left-Hand-Side Expressions\n\n    function parseArguments() {\n        var args = [], expr;\n\n        expect('(');\n\n        if (!match(')')) {\n            while (startIndex < length) {\n                if (match('...')) {\n                    expr = new Node();\n                    lex();\n                    expr.finishSpreadElement(isolateCoverGrammar(parseAssignmentExpression));\n                } else {\n                    expr = isolateCoverGrammar(parseAssignmentExpression);\n                }\n                args.push(expr);\n                if (match(')')) {\n                    break;\n                }\n                expectCommaSeparator();\n            }\n        }\n\n        expect(')');\n\n        return args;\n    }\n\n    function parseNonComputedProperty() {\n        var token, node = new Node();\n\n        token = lex();\n\n        if (!isIdentifierName(token)) {\n            throwUnexpectedToken(token);\n        }\n\n        return node.finishIdentifier(token.value);\n    }\n\n    function parseNonComputedMember() {\n        expect('.');\n\n        return parseNonComputedProperty();\n    }\n\n    function parseComputedMember() {\n        var expr;\n\n        expect('[');\n\n        expr = isolateCoverGrammar(parseExpression);\n\n        expect(']');\n\n        return expr;\n    }\n\n    // ECMA-262 12.3.3 The new Operator\n\n    function parseNewExpression() {\n        var callee, args, node = new Node();\n\n        expectKeyword('new');\n\n        if (match('.')) {\n            lex();\n            if (lookahead.type === Token.Identifier && lookahead.value === 'target') {\n                if (state.inFunctionBody) {\n                    lex();\n                    return node.finishMetaProperty('new', 'target');\n                }\n            }\n            throwUnexpectedToken(lookahead);\n        }\n\n        callee = isolateCoverGrammar(parseLeftHandSideExpression);\n        args = match('(') ? parseArguments() : [];\n\n        isAssignmentTarget = isBindingElement = false;\n\n        return node.finishNewExpression(callee, args);\n    }\n\n    // ECMA-262 12.3.4 Function Calls\n\n    function parseLeftHandSideExpressionAllowCall() {\n        var quasi, expr, args, property, startToken, previousAllowIn = state.allowIn;\n\n        startToken = lookahead;\n        state.allowIn = true;\n\n        if (matchKeyword('super') && state.inFunctionBody) {\n            expr = new Node();\n            lex();\n            expr = expr.finishSuper();\n            if (!match('(') && !match('.') && !match('[')) {\n                throwUnexpectedToken(lookahead);\n            }\n        } else {\n            expr = inheritCoverGrammar(matchKeyword('new') ? parseNewExpression : parsePrimaryExpression);\n        }\n\n        for (;;) {\n            if (match('.')) {\n                isBindingElement = false;\n                isAssignmentTarget = true;\n                property = parseNonComputedMember();\n                expr = new WrappingNode(startToken).finishMemberExpression('.', expr, property);\n            } else if (match('(')) {\n                isBindingElement = false;\n                isAssignmentTarget = false;\n                args = parseArguments();\n                expr = new WrappingNode(startToken).finishCallExpression(expr, args);\n            } else if (match('[')) {\n                isBindingElement = false;\n                isAssignmentTarget = true;\n                property = parseComputedMember();\n                expr = new WrappingNode(startToken).finishMemberExpression('[', expr, property);\n            } else if (lookahead.type === Token.Template && lookahead.head) {\n                quasi = parseTemplateLiteral();\n                expr = new WrappingNode(startToken).finishTaggedTemplateExpression(expr, quasi);\n            } else {\n                break;\n            }\n        }\n        state.allowIn = previousAllowIn;\n\n        return expr;\n    }\n\n    // ECMA-262 12.3 Left-Hand-Side Expressions\n\n    function parseLeftHandSideExpression() {\n        var quasi, expr, property, startToken;\n        assert(state.allowIn, 'callee of new expression always allow in keyword.');\n\n        startToken = lookahead;\n\n        if (matchKeyword('super') && state.inFunctionBody) {\n            expr = new Node();\n            lex();\n            expr = expr.finishSuper();\n            if (!match('[') && !match('.')) {\n                throwUnexpectedToken(lookahead);\n            }\n        } else {\n            expr = inheritCoverGrammar(matchKeyword('new') ? parseNewExpression : parsePrimaryExpression);\n        }\n\n        for (;;) {\n            if (match('[')) {\n                isBindingElement = false;\n                isAssignmentTarget = true;\n                property = parseComputedMember();\n                expr = new WrappingNode(startToken).finishMemberExpression('[', expr, property);\n            } else if (match('.')) {\n                isBindingElement = false;\n                isAssignmentTarget = true;\n                property = parseNonComputedMember();\n                expr = new WrappingNode(startToken).finishMemberExpression('.', expr, property);\n            } else if (lookahead.type === Token.Template && lookahead.head) {\n                quasi = parseTemplateLiteral();\n                expr = new WrappingNode(startToken).finishTaggedTemplateExpression(expr, quasi);\n            } else {\n                break;\n            }\n        }\n        return expr;\n    }\n\n    // ECMA-262 12.4 Postfix Expressions\n\n    function parsePostfixExpression() {\n        var expr, token, startToken = lookahead;\n\n        expr = inheritCoverGrammar(parseLeftHandSideExpressionAllowCall);\n\n        if (!hasLineTerminator && lookahead.type === Token.Punctuator) {\n            if (match('++') || match('--')) {\n                // ECMA-262 11.3.1, 11.3.2\n                if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {\n                    tolerateError(Messages.StrictLHSPostfix);\n                }\n\n                if (!isAssignmentTarget) {\n                    tolerateError(Messages.InvalidLHSInAssignment);\n                }\n\n                isAssignmentTarget = isBindingElement = false;\n\n                token = lex();\n                expr = new WrappingNode(startToken).finishPostfixExpression(token.value, expr);\n            }\n        }\n\n        return expr;\n    }\n\n    // ECMA-262 12.5 Unary Operators\n\n    function parseUnaryExpression() {\n        var token, expr, startToken;\n\n        if (lookahead.type !== Token.Punctuator && lookahead.type !== Token.Keyword) {\n            expr = parsePostfixExpression();\n        } else if (match('++') || match('--')) {\n            startToken = lookahead;\n            token = lex();\n            expr = inheritCoverGrammar(parseUnaryExpression);\n            // ECMA-262 11.4.4, 11.4.5\n            if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {\n                tolerateError(Messages.StrictLHSPrefix);\n            }\n\n            if (!isAssignmentTarget) {\n                tolerateError(Messages.InvalidLHSInAssignment);\n            }\n            expr = new WrappingNode(startToken).finishUnaryExpression(token.value, expr);\n            isAssignmentTarget = isBindingElement = false;\n        } else if (match('+') || match('-') || match('~') || match('!')) {\n            startToken = lookahead;\n            token = lex();\n            expr = inheritCoverGrammar(parseUnaryExpression);\n            expr = new WrappingNode(startToken).finishUnaryExpression(token.value, expr);\n            isAssignmentTarget = isBindingElement = false;\n        } else if (matchKeyword('delete') || matchKeyword('void') || matchKeyword('typeof')) {\n            startToken = lookahead;\n            token = lex();\n            expr = inheritCoverGrammar(parseUnaryExpression);\n            expr = new WrappingNode(startToken).finishUnaryExpression(token.value, expr);\n            if (strict && expr.operator === 'delete' && expr.argument.type === Syntax.Identifier) {\n                tolerateError(Messages.StrictDelete);\n            }\n            isAssignmentTarget = isBindingElement = false;\n        } else {\n            expr = parsePostfixExpression();\n        }\n\n        return expr;\n    }\n\n    function binaryPrecedence(token, allowIn) {\n        var prec = 0;\n\n        if (token.type !== Token.Punctuator && token.type !== Token.Keyword) {\n            return 0;\n        }\n\n        switch (token.value) {\n        case '||':\n            prec = 1;\n            break;\n\n        case '&&':\n            prec = 2;\n            break;\n\n        case '|':\n            prec = 3;\n            break;\n\n        case '^':\n            prec = 4;\n            break;\n\n        case '&':\n            prec = 5;\n            break;\n\n        case '==':\n        case '!=':\n        case '===':\n        case '!==':\n            prec = 6;\n            break;\n\n        case '<':\n        case '>':\n        case '<=':\n        case '>=':\n        case 'instanceof':\n            prec = 7;\n            break;\n\n        case 'in':\n            prec = allowIn ? 7 : 0;\n            break;\n\n        case '<<':\n        case '>>':\n        case '>>>':\n            prec = 8;\n            break;\n\n        case '+':\n        case '-':\n            prec = 9;\n            break;\n\n        case '*':\n        case '/':\n        case '%':\n            prec = 11;\n            break;\n\n        default:\n            break;\n        }\n\n        return prec;\n    }\n\n    // ECMA-262 12.6 Multiplicative Operators\n    // ECMA-262 12.7 Additive Operators\n    // ECMA-262 12.8 Bitwise Shift Operators\n    // ECMA-262 12.9 Relational Operators\n    // ECMA-262 12.10 Equality Operators\n    // ECMA-262 12.11 Binary Bitwise Operators\n    // ECMA-262 12.12 Binary Logical Operators\n\n    function parseBinaryExpression() {\n        var marker, markers, expr, token, prec, stack, right, operator, left, i;\n\n        marker = lookahead;\n        left = inheritCoverGrammar(parseUnaryExpression);\n\n        token = lookahead;\n        prec = binaryPrecedence(token, state.allowIn);\n        if (prec === 0) {\n            return left;\n        }\n        isAssignmentTarget = isBindingElement = false;\n        token.prec = prec;\n        lex();\n\n        markers = [marker, lookahead];\n        right = isolateCoverGrammar(parseUnaryExpression);\n\n        stack = [left, token, right];\n\n        while ((prec = binaryPrecedence(lookahead, state.allowIn)) > 0) {\n\n            // Reduce: make a binary expression from the three topmost entries.\n            while ((stack.length > 2) && (prec <= stack[stack.length - 2].prec)) {\n                right = stack.pop();\n                operator = stack.pop().value;\n                left = stack.pop();\n                markers.pop();\n                expr = new WrappingNode(markers[markers.length - 1]).finishBinaryExpression(operator, left, right);\n                stack.push(expr);\n            }\n\n            // Shift.\n            token = lex();\n            token.prec = prec;\n            stack.push(token);\n            markers.push(lookahead);\n            expr = isolateCoverGrammar(parseUnaryExpression);\n            stack.push(expr);\n        }\n\n        // Final reduce to clean-up the stack.\n        i = stack.length - 1;\n        expr = stack[i];\n        markers.pop();\n        while (i > 1) {\n            expr = new WrappingNode(markers.pop()).finishBinaryExpression(stack[i - 1].value, stack[i - 2], expr);\n            i -= 2;\n        }\n\n        return expr;\n    }\n\n\n    // ECMA-262 12.13 Conditional Operator\n\n    function parseConditionalExpression() {\n        var expr, previousAllowIn, consequent, alternate, startToken;\n\n        startToken = lookahead;\n\n        expr = inheritCoverGrammar(parseBinaryExpression);\n        if (match('?')) {\n            lex();\n            previousAllowIn = state.allowIn;\n            state.allowIn = true;\n            consequent = isolateCoverGrammar(parseAssignmentExpression);\n            state.allowIn = previousAllowIn;\n            expect(':');\n            alternate = isolateCoverGrammar(parseAssignmentExpression);\n\n            expr = new WrappingNode(startToken).finishConditionalExpression(expr, consequent, alternate);\n            isAssignmentTarget = isBindingElement = false;\n        }\n\n        return expr;\n    }\n\n    // ECMA-262 14.2 Arrow Function Definitions\n\n    function parseConciseBody() {\n        if (match('{')) {\n            return parseFunctionSourceElements();\n        }\n        return isolateCoverGrammar(parseAssignmentExpression);\n    }\n\n    function checkPatternParam(options, param) {\n        var i;\n        switch (param.type) {\n        case Syntax.Identifier:\n            validateParam(options, param, param.name);\n            break;\n        case Syntax.RestElement:\n            checkPatternParam(options, param.argument);\n            break;\n        case Syntax.AssignmentPattern:\n            checkPatternParam(options, param.left);\n            break;\n        case Syntax.ArrayPattern:\n            for (i = 0; i < param.elements.length; i++) {\n                if (param.elements[i] !== null) {\n                    checkPatternParam(options, param.elements[i]);\n                }\n            }\n            break;\n        case Syntax.YieldExpression:\n            break;\n        default:\n            assert(param.type === Syntax.ObjectPattern, 'Invalid type');\n            for (i = 0; i < param.properties.length; i++) {\n                checkPatternParam(options, param.properties[i].value);\n            }\n            break;\n        }\n    }\n    function reinterpretAsCoverFormalsList(expr) {\n        var i, len, param, params, defaults, defaultCount, options, token;\n\n        defaults = [];\n        defaultCount = 0;\n        params = [expr];\n\n        switch (expr.type) {\n        case Syntax.Identifier:\n            break;\n        case PlaceHolders.ArrowParameterPlaceHolder:\n            params = expr.params;\n            break;\n        default:\n            return null;\n        }\n\n        options = {\n            paramSet: {}\n        };\n\n        for (i = 0, len = params.length; i < len; i += 1) {\n            param = params[i];\n            switch (param.type) {\n            case Syntax.AssignmentPattern:\n                params[i] = param.left;\n                if (param.right.type === Syntax.YieldExpression) {\n                    if (param.right.argument) {\n                        throwUnexpectedToken(lookahead);\n                    }\n                    param.right.type = Syntax.Identifier;\n                    param.right.name = 'yield';\n                    delete param.right.argument;\n                    delete param.right.delegate;\n                }\n                defaults.push(param.right);\n                ++defaultCount;\n                checkPatternParam(options, param.left);\n                break;\n            default:\n                checkPatternParam(options, param);\n                params[i] = param;\n                defaults.push(null);\n                break;\n            }\n        }\n\n        if (strict || !state.allowYield) {\n            for (i = 0, len = params.length; i < len; i += 1) {\n                param = params[i];\n                if (param.type === Syntax.YieldExpression) {\n                    throwUnexpectedToken(lookahead);\n                }\n            }\n        }\n\n        if (options.message === Messages.StrictParamDupe) {\n            token = strict ? options.stricted : options.firstRestricted;\n            throwUnexpectedToken(token, options.message);\n        }\n\n        if (defaultCount === 0) {\n            defaults = [];\n        }\n\n        return {\n            params: params,\n            defaults: defaults,\n            stricted: options.stricted,\n            firstRestricted: options.firstRestricted,\n            message: options.message\n        };\n    }\n\n    function parseArrowFunctionExpression(options, node) {\n        var previousStrict, previousAllowYield, body;\n\n        if (hasLineTerminator) {\n            tolerateUnexpectedToken(lookahead);\n        }\n        expect('=>');\n\n        previousStrict = strict;\n        previousAllowYield = state.allowYield;\n        state.allowYield = true;\n\n        body = parseConciseBody();\n\n        if (strict && options.firstRestricted) {\n            throwUnexpectedToken(options.firstRestricted, options.message);\n        }\n        if (strict && options.stricted) {\n            tolerateUnexpectedToken(options.stricted, options.message);\n        }\n\n        strict = previousStrict;\n        state.allowYield = previousAllowYield;\n\n        return node.finishArrowFunctionExpression(options.params, options.defaults, body, body.type !== Syntax.BlockStatement);\n    }\n\n    // ECMA-262 14.4 Yield expression\n\n    function parseYieldExpression() {\n        var argument, expr, delegate, previousAllowYield;\n\n        argument = null;\n        expr = new Node();\n        delegate = false;\n\n        expectKeyword('yield');\n\n        if (!hasLineTerminator) {\n            previousAllowYield = state.allowYield;\n            state.allowYield = false;\n            delegate = match('*');\n            if (delegate) {\n                lex();\n                argument = parseAssignmentExpression();\n            } else {\n                if (!match(';') && !match('}') && !match(')') && lookahead.type !== Token.EOF) {\n                    argument = parseAssignmentExpression();\n                }\n            }\n            state.allowYield = previousAllowYield;\n        }\n\n        return expr.finishYieldExpression(argument, delegate);\n    }\n\n    // ECMA-262 12.14 Assignment Operators\n\n    function parseAssignmentExpression() {\n        var token, expr, right, list, startToken;\n\n        startToken = lookahead;\n        token = lookahead;\n\n        if (!state.allowYield && matchKeyword('yield')) {\n            return parseYieldExpression();\n        }\n\n        expr = parseConditionalExpression();\n\n        if (expr.type === PlaceHolders.ArrowParameterPlaceHolder || match('=>')) {\n            isAssignmentTarget = isBindingElement = false;\n            list = reinterpretAsCoverFormalsList(expr);\n\n            if (list) {\n                firstCoverInitializedNameError = null;\n                return parseArrowFunctionExpression(list, new WrappingNode(startToken));\n            }\n\n            return expr;\n        }\n\n        if (matchAssign()) {\n            if (!isAssignmentTarget) {\n                tolerateError(Messages.InvalidLHSInAssignment);\n            }\n\n            // ECMA-262 12.1.1\n            if (strict && expr.type === Syntax.Identifier) {\n                if (isRestrictedWord(expr.name)) {\n                    tolerateUnexpectedToken(token, Messages.StrictLHSAssignment);\n                }\n                if (isStrictModeReservedWord(expr.name)) {\n                    tolerateUnexpectedToken(token, Messages.StrictReservedWord);\n                }\n            }\n\n            if (!match('=')) {\n                isAssignmentTarget = isBindingElement = false;\n            } else {\n                reinterpretExpressionAsPattern(expr);\n            }\n\n            token = lex();\n            right = isolateCoverGrammar(parseAssignmentExpression);\n            expr = new WrappingNode(startToken).finishAssignmentExpression(token.value, expr, right);\n            firstCoverInitializedNameError = null;\n        }\n\n        return expr;\n    }\n\n    // ECMA-262 12.15 Comma Operator\n\n    function parseExpression() {\n        var expr, startToken = lookahead, expressions;\n\n        expr = isolateCoverGrammar(parseAssignmentExpression);\n\n        if (match(',')) {\n            expressions = [expr];\n\n            while (startIndex < length) {\n                if (!match(',')) {\n                    break;\n                }\n                lex();\n                expressions.push(isolateCoverGrammar(parseAssignmentExpression));\n            }\n\n            expr = new WrappingNode(startToken).finishSequenceExpression(expressions);\n        }\n\n        return expr;\n    }\n\n    // ECMA-262 13.2 Block\n\n    function parseStatementListItem() {\n        if (lookahead.type === Token.Keyword) {\n            switch (lookahead.value) {\n            case 'export':\n                if (state.sourceType !== 'module') {\n                    tolerateUnexpectedToken(lookahead, Messages.IllegalExportDeclaration);\n                }\n                return parseExportDeclaration();\n            case 'import':\n                if (state.sourceType !== 'module') {\n                    tolerateUnexpectedToken(lookahead, Messages.IllegalImportDeclaration);\n                }\n                return parseImportDeclaration();\n            case 'const':\n                return parseLexicalDeclaration({inFor: false});\n            case 'function':\n                return parseFunctionDeclaration(new Node());\n            case 'class':\n                return parseClassDeclaration();\n            }\n        }\n\n        if (matchKeyword('let') && isLexicalDeclaration()) {\n            return parseLexicalDeclaration({inFor: false});\n        }\n\n        return parseStatement();\n    }\n\n    function parseStatementList() {\n        var list = [];\n        while (startIndex < length) {\n            if (match('}')) {\n                break;\n            }\n            list.push(parseStatementListItem());\n        }\n\n        return list;\n    }\n\n    function parseBlock() {\n        var block, node = new Node();\n\n        expect('{');\n\n        block = parseStatementList();\n\n        expect('}');\n\n        return node.finishBlockStatement(block);\n    }\n\n    // ECMA-262 13.3.2 Variable Statement\n\n    function parseVariableIdentifier(kind) {\n        var token, node = new Node();\n\n        token = lex();\n\n        if (token.type === Token.Keyword && token.value === 'yield') {\n            if (strict) {\n                tolerateUnexpectedToken(token, Messages.StrictReservedWord);\n            } if (!state.allowYield) {\n                throwUnexpectedToken(token);\n            }\n        } else if (token.type !== Token.Identifier) {\n            if (strict && token.type === Token.Keyword && isStrictModeReservedWord(token.value)) {\n                tolerateUnexpectedToken(token, Messages.StrictReservedWord);\n            } else {\n                if (strict || token.value !== 'let' || kind !== 'var') {\n                    throwUnexpectedToken(token);\n                }\n            }\n        } else if (state.sourceType === 'module' && token.type === Token.Identifier && token.value === 'await') {\n            tolerateUnexpectedToken(token);\n        }\n\n        return node.finishIdentifier(token.value);\n    }\n\n    function parseVariableDeclaration(options) {\n        var init = null, id, node = new Node(), params = [];\n\n        id = parsePattern(params, 'var');\n\n        // ECMA-262 12.2.1\n        if (strict && isRestrictedWord(id.name)) {\n            tolerateError(Messages.StrictVarName);\n        }\n\n        if (match('=')) {\n            lex();\n            init = isolateCoverGrammar(parseAssignmentExpression);\n        } else if (id.type !== Syntax.Identifier && !options.inFor) {\n            expect('=');\n        }\n\n        return node.finishVariableDeclarator(id, init);\n    }\n\n    function parseVariableDeclarationList(options) {\n        var opt, list;\n\n        opt = { inFor: options.inFor };\n        list = [parseVariableDeclaration(opt)];\n\n        while (match(',')) {\n            lex();\n            list.push(parseVariableDeclaration(opt));\n        }\n\n        return list;\n    }\n\n    function parseVariableStatement(node) {\n        var declarations;\n\n        expectKeyword('var');\n\n        declarations = parseVariableDeclarationList({ inFor: false });\n\n        consumeSemicolon();\n\n        return node.finishVariableDeclaration(declarations);\n    }\n\n    // ECMA-262 13.3.1 Let and Const Declarations\n\n    function parseLexicalBinding(kind, options) {\n        var init = null, id, node = new Node(), params = [];\n\n        id = parsePattern(params, kind);\n\n        // ECMA-262 12.2.1\n        if (strict && id.type === Syntax.Identifier && isRestrictedWord(id.name)) {\n            tolerateError(Messages.StrictVarName);\n        }\n\n        if (kind === 'const') {\n            if (!matchKeyword('in') && !matchContextualKeyword('of')) {\n                expect('=');\n                init = isolateCoverGrammar(parseAssignmentExpression);\n            }\n        } else if ((!options.inFor && id.type !== Syntax.Identifier) || match('=')) {\n            expect('=');\n            init = isolateCoverGrammar(parseAssignmentExpression);\n        }\n\n        return node.finishVariableDeclarator(id, init);\n    }\n\n    function parseBindingList(kind, options) {\n        var list = [parseLexicalBinding(kind, options)];\n\n        while (match(',')) {\n            lex();\n            list.push(parseLexicalBinding(kind, options));\n        }\n\n        return list;\n    }\n\n\n    function tokenizerState() {\n        return {\n            index: index,\n            lineNumber: lineNumber,\n            lineStart: lineStart,\n            hasLineTerminator: hasLineTerminator,\n            lastIndex: lastIndex,\n            lastLineNumber: lastLineNumber,\n            lastLineStart: lastLineStart,\n            startIndex: startIndex,\n            startLineNumber: startLineNumber,\n            startLineStart: startLineStart,\n            lookahead: lookahead,\n            tokenCount: extra.tokens ? extra.tokens.length : 0\n        };\n    }\n\n    function resetTokenizerState(ts) {\n        index = ts.index;\n        lineNumber = ts.lineNumber;\n        lineStart = ts.lineStart;\n        hasLineTerminator = ts.hasLineTerminator;\n        lastIndex = ts.lastIndex;\n        lastLineNumber = ts.lastLineNumber;\n        lastLineStart = ts.lastLineStart;\n        startIndex = ts.startIndex;\n        startLineNumber = ts.startLineNumber;\n        startLineStart = ts.startLineStart;\n        lookahead = ts.lookahead;\n        if (extra.tokens) {\n            extra.tokens.splice(ts.tokenCount, extra.tokens.length);\n        }\n    }\n\n    function isLexicalDeclaration() {\n        var lexical, ts;\n\n        ts = tokenizerState();\n\n        lex();\n        lexical = (lookahead.type === Token.Identifier) || match('[') || match('{') ||\n            matchKeyword('let') || matchKeyword('yield');\n\n        resetTokenizerState(ts);\n\n        return lexical;\n    }\n\n    function parseLexicalDeclaration(options) {\n        var kind, declarations, node = new Node();\n\n        kind = lex().value;\n        assert(kind === 'let' || kind === 'const', 'Lexical declaration must be either let or const');\n\n        declarations = parseBindingList(kind, options);\n\n        consumeSemicolon();\n\n        return node.finishLexicalDeclaration(declarations, kind);\n    }\n\n    function parseRestElement(params) {\n        var param, node = new Node();\n\n        lex();\n\n        if (match('{')) {\n            throwError(Messages.ObjectPatternAsRestParameter);\n        }\n\n        params.push(lookahead);\n\n        param = parseVariableIdentifier();\n\n        if (match('=')) {\n            throwError(Messages.DefaultRestParameter);\n        }\n\n        if (!match(')')) {\n            throwError(Messages.ParameterAfterRestParameter);\n        }\n\n        return node.finishRestElement(param);\n    }\n\n    // ECMA-262 13.4 Empty Statement\n\n    function parseEmptyStatement(node) {\n        expect(';');\n        return node.finishEmptyStatement();\n    }\n\n    // ECMA-262 12.4 Expression Statement\n\n    function parseExpressionStatement(node) {\n        var expr = parseExpression();\n        consumeSemicolon();\n        return node.finishExpressionStatement(expr);\n    }\n\n    // ECMA-262 13.6 If statement\n\n    function parseIfStatement(node) {\n        var test, consequent, alternate;\n\n        expectKeyword('if');\n\n        expect('(');\n\n        test = parseExpression();\n\n        expect(')');\n\n        consequent = parseStatement();\n\n        if (matchKeyword('else')) {\n            lex();\n            alternate = parseStatement();\n        } else {\n            alternate = null;\n        }\n\n        return node.finishIfStatement(test, consequent, alternate);\n    }\n\n    // ECMA-262 13.7 Iteration Statements\n\n    function parseDoWhileStatement(node) {\n        var body, test, oldInIteration;\n\n        expectKeyword('do');\n\n        oldInIteration = state.inIteration;\n        state.inIteration = true;\n\n        body = parseStatement();\n\n        state.inIteration = oldInIteration;\n\n        expectKeyword('while');\n\n        expect('(');\n\n        test = parseExpression();\n\n        expect(')');\n\n        if (match(';')) {\n            lex();\n        }\n\n        return node.finishDoWhileStatement(body, test);\n    }\n\n    function parseWhileStatement(node) {\n        var test, body, oldInIteration;\n\n        expectKeyword('while');\n\n        expect('(');\n\n        test = parseExpression();\n\n        expect(')');\n\n        oldInIteration = state.inIteration;\n        state.inIteration = true;\n\n        body = parseStatement();\n\n        state.inIteration = oldInIteration;\n\n        return node.finishWhileStatement(test, body);\n    }\n\n    function parseForStatement(node) {\n        var init, forIn, initSeq, initStartToken, test, update, left, right, kind, declarations,\n            body, oldInIteration, previousAllowIn = state.allowIn;\n\n        init = test = update = null;\n        forIn = true;\n\n        expectKeyword('for');\n\n        expect('(');\n\n        if (match(';')) {\n            lex();\n        } else {\n            if (matchKeyword('var')) {\n                init = new Node();\n                lex();\n\n                state.allowIn = false;\n                declarations = parseVariableDeclarationList({ inFor: true });\n                state.allowIn = previousAllowIn;\n\n                if (declarations.length === 1 && matchKeyword('in')) {\n                    init = init.finishVariableDeclaration(declarations);\n                    lex();\n                    left = init;\n                    right = parseExpression();\n                    init = null;\n                } else if (declarations.length === 1 && declarations[0].init === null && matchContextualKeyword('of')) {\n                    init = init.finishVariableDeclaration(declarations);\n                    lex();\n                    left = init;\n                    right = parseAssignmentExpression();\n                    init = null;\n                    forIn = false;\n                } else {\n                    init = init.finishVariableDeclaration(declarations);\n                    expect(';');\n                }\n            } else if (matchKeyword('const') || matchKeyword('let')) {\n                init = new Node();\n                kind = lex().value;\n\n                if (!strict && lookahead.value === 'in') {\n                    init = init.finishIdentifier(kind);\n                    lex();\n                    left = init;\n                    right = parseExpression();\n                    init = null;\n                } else {\n                    state.allowIn = false;\n                    declarations = parseBindingList(kind, {inFor: true});\n                    state.allowIn = previousAllowIn;\n\n                    if (declarations.length === 1 && declarations[0].init === null && matchKeyword('in')) {\n                        init = init.finishLexicalDeclaration(declarations, kind);\n                        lex();\n                        left = init;\n                        right = parseExpression();\n                        init = null;\n                    } else if (declarations.length === 1 && declarations[0].init === null && matchContextualKeyword('of')) {\n                        init = init.finishLexicalDeclaration(declarations, kind);\n                        lex();\n                        left = init;\n                        right = parseAssignmentExpression();\n                        init = null;\n                        forIn = false;\n                    } else {\n                        consumeSemicolon();\n                        init = init.finishLexicalDeclaration(declarations, kind);\n                    }\n                }\n            } else {\n                initStartToken = lookahead;\n                state.allowIn = false;\n                init = inheritCoverGrammar(parseAssignmentExpression);\n                state.allowIn = previousAllowIn;\n\n                if (matchKeyword('in')) {\n                    if (!isAssignmentTarget) {\n                        tolerateError(Messages.InvalidLHSInForIn);\n                    }\n\n                    lex();\n                    reinterpretExpressionAsPattern(init);\n                    left = init;\n                    right = parseExpression();\n                    init = null;\n                } else if (matchContextualKeyword('of')) {\n                    if (!isAssignmentTarget) {\n                        tolerateError(Messages.InvalidLHSInForLoop);\n                    }\n\n                    lex();\n                    reinterpretExpressionAsPattern(init);\n                    left = init;\n                    right = parseAssignmentExpression();\n                    init = null;\n                    forIn = false;\n                } else {\n                    if (match(',')) {\n                        initSeq = [init];\n                        while (match(',')) {\n                            lex();\n                            initSeq.push(isolateCoverGrammar(parseAssignmentExpression));\n                        }\n                        init = new WrappingNode(initStartToken).finishSequenceExpression(initSeq);\n                    }\n                    expect(';');\n                }\n            }\n        }\n\n        if (typeof left === 'undefined') {\n\n            if (!match(';')) {\n                test = parseExpression();\n            }\n            expect(';');\n\n            if (!match(')')) {\n                update = parseExpression();\n            }\n        }\n\n        expect(')');\n\n        oldInIteration = state.inIteration;\n        state.inIteration = true;\n\n        body = isolateCoverGrammar(parseStatement);\n\n        state.inIteration = oldInIteration;\n\n        return (typeof left === 'undefined') ?\n                node.finishForStatement(init, test, update, body) :\n                forIn ? node.finishForInStatement(left, right, body) :\n                    node.finishForOfStatement(left, right, body);\n    }\n\n    // ECMA-262 13.8 The continue statement\n\n    function parseContinueStatement(node) {\n        var label = null, key;\n\n        expectKeyword('continue');\n\n        // Optimize the most common form: 'continue;'.\n        if (source.charCodeAt(startIndex) === 0x3B) {\n            lex();\n\n            if (!state.inIteration) {\n                throwError(Messages.IllegalContinue);\n            }\n\n            return node.finishContinueStatement(null);\n        }\n\n        if (hasLineTerminator) {\n            if (!state.inIteration) {\n                throwError(Messages.IllegalContinue);\n            }\n\n            return node.finishContinueStatement(null);\n        }\n\n        if (lookahead.type === Token.Identifier) {\n            label = parseVariableIdentifier();\n\n            key = '$' + label.name;\n            if (!Object.prototype.hasOwnProperty.call(state.labelSet, key)) {\n                throwError(Messages.UnknownLabel, label.name);\n            }\n        }\n\n        consumeSemicolon();\n\n        if (label === null && !state.inIteration) {\n            throwError(Messages.IllegalContinue);\n        }\n\n        return node.finishContinueStatement(label);\n    }\n\n    // ECMA-262 13.9 The break statement\n\n    function parseBreakStatement(node) {\n        var label = null, key;\n\n        expectKeyword('break');\n\n        // Catch the very common case first: immediately a semicolon (U+003B).\n        if (source.charCodeAt(lastIndex) === 0x3B) {\n            lex();\n\n            if (!(state.inIteration || state.inSwitch)) {\n                throwError(Messages.IllegalBreak);\n            }\n\n            return node.finishBreakStatement(null);\n        }\n\n        if (hasLineTerminator) {\n            if (!(state.inIteration || state.inSwitch)) {\n                throwError(Messages.IllegalBreak);\n            }\n        } else if (lookahead.type === Token.Identifier) {\n            label = parseVariableIdentifier();\n\n            key = '$' + label.name;\n            if (!Object.prototype.hasOwnProperty.call(state.labelSet, key)) {\n                throwError(Messages.UnknownLabel, label.name);\n            }\n        }\n\n        consumeSemicolon();\n\n        if (label === null && !(state.inIteration || state.inSwitch)) {\n            throwError(Messages.IllegalBreak);\n        }\n\n        return node.finishBreakStatement(label);\n    }\n\n    // ECMA-262 13.10 The return statement\n\n    function parseReturnStatement(node) {\n        var argument = null;\n\n        expectKeyword('return');\n\n        if (!state.inFunctionBody) {\n            tolerateError(Messages.IllegalReturn);\n        }\n\n        // 'return' followed by a space and an identifier is very common.\n        if (source.charCodeAt(lastIndex) === 0x20) {\n            if (isIdentifierStart(source.charCodeAt(lastIndex + 1))) {\n                argument = parseExpression();\n                consumeSemicolon();\n                return node.finishReturnStatement(argument);\n            }\n        }\n\n        if (hasLineTerminator) {\n            // HACK\n            return node.finishReturnStatement(null);\n        }\n\n        if (!match(';')) {\n            if (!match('}') && lookahead.type !== Token.EOF) {\n                argument = parseExpression();\n            }\n        }\n\n        consumeSemicolon();\n\n        return node.finishReturnStatement(argument);\n    }\n\n    // ECMA-262 13.11 The with statement\n\n    function parseWithStatement(node) {\n        var object, body;\n\n        if (strict) {\n            tolerateError(Messages.StrictModeWith);\n        }\n\n        expectKeyword('with');\n\n        expect('(');\n\n        object = parseExpression();\n\n        expect(')');\n\n        body = parseStatement();\n\n        return node.finishWithStatement(object, body);\n    }\n\n    // ECMA-262 13.12 The switch statement\n\n    function parseSwitchCase() {\n        var test, consequent = [], statement, node = new Node();\n\n        if (matchKeyword('default')) {\n            lex();\n            test = null;\n        } else {\n            expectKeyword('case');\n            test = parseExpression();\n        }\n        expect(':');\n\n        while (startIndex < length) {\n            if (match('}') || matchKeyword('default') || matchKeyword('case')) {\n                break;\n            }\n            statement = parseStatementListItem();\n            consequent.push(statement);\n        }\n\n        return node.finishSwitchCase(test, consequent);\n    }\n\n    function parseSwitchStatement(node) {\n        var discriminant, cases, clause, oldInSwitch, defaultFound;\n\n        expectKeyword('switch');\n\n        expect('(');\n\n        discriminant = parseExpression();\n\n        expect(')');\n\n        expect('{');\n\n        cases = [];\n\n        if (match('}')) {\n            lex();\n            return node.finishSwitchStatement(discriminant, cases);\n        }\n\n        oldInSwitch = state.inSwitch;\n        state.inSwitch = true;\n        defaultFound = false;\n\n        while (startIndex < length) {\n            if (match('}')) {\n                break;\n            }\n            clause = parseSwitchCase();\n            if (clause.test === null) {\n                if (defaultFound) {\n                    throwError(Messages.MultipleDefaultsInSwitch);\n                }\n                defaultFound = true;\n            }\n            cases.push(clause);\n        }\n\n        state.inSwitch = oldInSwitch;\n\n        expect('}');\n\n        return node.finishSwitchStatement(discriminant, cases);\n    }\n\n    // ECMA-262 13.14 The throw statement\n\n    function parseThrowStatement(node) {\n        var argument;\n\n        expectKeyword('throw');\n\n        if (hasLineTerminator) {\n            throwError(Messages.NewlineAfterThrow);\n        }\n\n        argument = parseExpression();\n\n        consumeSemicolon();\n\n        return node.finishThrowStatement(argument);\n    }\n\n    // ECMA-262 13.15 The try statement\n\n    function parseCatchClause() {\n        var param, params = [], paramMap = {}, key, i, body, node = new Node();\n\n        expectKeyword('catch');\n\n        expect('(');\n        if (match(')')) {\n            throwUnexpectedToken(lookahead);\n        }\n\n        param = parsePattern(params);\n        for (i = 0; i < params.length; i++) {\n            key = '$' + params[i].value;\n            if (Object.prototype.hasOwnProperty.call(paramMap, key)) {\n                tolerateError(Messages.DuplicateBinding, params[i].value);\n            }\n            paramMap[key] = true;\n        }\n\n        // ECMA-262 12.14.1\n        if (strict && isRestrictedWord(param.name)) {\n            tolerateError(Messages.StrictCatchVariable);\n        }\n\n        expect(')');\n        body = parseBlock();\n        return node.finishCatchClause(param, body);\n    }\n\n    function parseTryStatement(node) {\n        var block, handler = null, finalizer = null;\n\n        expectKeyword('try');\n\n        block = parseBlock();\n\n        if (matchKeyword('catch')) {\n            handler = parseCatchClause();\n        }\n\n        if (matchKeyword('finally')) {\n            lex();\n            finalizer = parseBlock();\n        }\n\n        if (!handler && !finalizer) {\n            throwError(Messages.NoCatchOrFinally);\n        }\n\n        return node.finishTryStatement(block, handler, finalizer);\n    }\n\n    // ECMA-262 13.16 The debugger statement\n\n    function parseDebuggerStatement(node) {\n        expectKeyword('debugger');\n\n        consumeSemicolon();\n\n        return node.finishDebuggerStatement();\n    }\n\n    // 13 Statements\n\n    function parseStatement() {\n        var type = lookahead.type,\n            expr,\n            labeledBody,\n            key,\n            node;\n\n        if (type === Token.EOF) {\n            throwUnexpectedToken(lookahead);\n        }\n\n        if (type === Token.Punctuator && lookahead.value === '{') {\n            return parseBlock();\n        }\n        isAssignmentTarget = isBindingElement = true;\n        node = new Node();\n\n        if (type === Token.Punctuator) {\n            switch (lookahead.value) {\n            case ';':\n                return parseEmptyStatement(node);\n            case '(':\n                return parseExpressionStatement(node);\n            default:\n                break;\n            }\n        } else if (type === Token.Keyword) {\n            switch (lookahead.value) {\n            case 'break':\n                return parseBreakStatement(node);\n            case 'continue':\n                return parseContinueStatement(node);\n            case 'debugger':\n                return parseDebuggerStatement(node);\n            case 'do':\n                return parseDoWhileStatement(node);\n            case 'for':\n                return parseForStatement(node);\n            case 'function':\n                return parseFunctionDeclaration(node);\n            case 'if':\n                return parseIfStatement(node);\n            case 'return':\n                return parseReturnStatement(node);\n            case 'switch':\n                return parseSwitchStatement(node);\n            case 'throw':\n                return parseThrowStatement(node);\n            case 'try':\n                return parseTryStatement(node);\n            case 'var':\n                return parseVariableStatement(node);\n            case 'while':\n                return parseWhileStatement(node);\n            case 'with':\n                return parseWithStatement(node);\n            default:\n                break;\n            }\n        }\n\n        expr = parseExpression();\n\n        // ECMA-262 12.12 Labelled Statements\n        if ((expr.type === Syntax.Identifier) && match(':')) {\n            lex();\n\n            key = '$' + expr.name;\n            if (Object.prototype.hasOwnProperty.call(state.labelSet, key)) {\n                throwError(Messages.Redeclaration, 'Label', expr.name);\n            }\n\n            state.labelSet[key] = true;\n            labeledBody = parseStatement();\n            delete state.labelSet[key];\n            return node.finishLabeledStatement(expr, labeledBody);\n        }\n\n        consumeSemicolon();\n\n        return node.finishExpressionStatement(expr);\n    }\n\n    // ECMA-262 14.1 Function Definition\n\n    function parseFunctionSourceElements() {\n        var statement, body = [], token, directive, firstRestricted,\n            oldLabelSet, oldInIteration, oldInSwitch, oldInFunctionBody, oldParenthesisCount,\n            node = new Node();\n\n        expect('{');\n\n        while (startIndex < length) {\n            if (lookahead.type !== Token.StringLiteral) {\n                break;\n            }\n            token = lookahead;\n\n            statement = parseStatementListItem();\n            body.push(statement);\n            if (statement.expression.type !== Syntax.Literal) {\n                // this is not directive\n                break;\n            }\n            directive = source.slice(token.start + 1, token.end - 1);\n            if (directive === 'use strict') {\n                strict = true;\n                if (firstRestricted) {\n                    tolerateUnexpectedToken(firstRestricted, Messages.StrictOctalLiteral);\n                }\n            } else {\n                if (!firstRestricted && token.octal) {\n                    firstRestricted = token;\n                }\n            }\n        }\n\n        oldLabelSet = state.labelSet;\n        oldInIteration = state.inIteration;\n        oldInSwitch = state.inSwitch;\n        oldInFunctionBody = state.inFunctionBody;\n        oldParenthesisCount = state.parenthesizedCount;\n\n        state.labelSet = {};\n        state.inIteration = false;\n        state.inSwitch = false;\n        state.inFunctionBody = true;\n        state.parenthesizedCount = 0;\n\n        while (startIndex < length) {\n            if (match('}')) {\n                break;\n            }\n            body.push(parseStatementListItem());\n        }\n\n        expect('}');\n\n        state.labelSet = oldLabelSet;\n        state.inIteration = oldInIteration;\n        state.inSwitch = oldInSwitch;\n        state.inFunctionBody = oldInFunctionBody;\n        state.parenthesizedCount = oldParenthesisCount;\n\n        return node.finishBlockStatement(body);\n    }\n\n    function validateParam(options, param, name) {\n        var key = '$' + name;\n        if (strict) {\n            if (isRestrictedWord(name)) {\n                options.stricted = param;\n                options.message = Messages.StrictParamName;\n            }\n            if (Object.prototype.hasOwnProperty.call(options.paramSet, key)) {\n                options.stricted = param;\n                options.message = Messages.StrictParamDupe;\n            }\n        } else if (!options.firstRestricted) {\n            if (isRestrictedWord(name)) {\n                options.firstRestricted = param;\n                options.message = Messages.StrictParamName;\n            } else if (isStrictModeReservedWord(name)) {\n                options.firstRestricted = param;\n                options.message = Messages.StrictReservedWord;\n            } else if (Object.prototype.hasOwnProperty.call(options.paramSet, key)) {\n                options.stricted = param;\n                options.message = Messages.StrictParamDupe;\n            }\n        }\n        options.paramSet[key] = true;\n    }\n\n    function parseParam(options) {\n        var token, param, params = [], i, def;\n\n        token = lookahead;\n        if (token.value === '...') {\n            param = parseRestElement(params);\n            validateParam(options, param.argument, param.argument.name);\n            options.params.push(param);\n            options.defaults.push(null);\n            return false;\n        }\n\n        param = parsePatternWithDefault(params);\n        for (i = 0; i < params.length; i++) {\n            validateParam(options, params[i], params[i].value);\n        }\n\n        if (param.type === Syntax.AssignmentPattern) {\n            def = param.right;\n            param = param.left;\n            ++options.defaultCount;\n        }\n\n        options.params.push(param);\n        options.defaults.push(def);\n\n        return !match(')');\n    }\n\n    function parseParams(firstRestricted) {\n        var options;\n\n        options = {\n            params: [],\n            defaultCount: 0,\n            defaults: [],\n            firstRestricted: firstRestricted\n        };\n\n        expect('(');\n\n        if (!match(')')) {\n            options.paramSet = {};\n            while (startIndex < length) {\n                if (!parseParam(options)) {\n                    break;\n                }\n                expect(',');\n            }\n        }\n\n        expect(')');\n\n        if (options.defaultCount === 0) {\n            options.defaults = [];\n        }\n\n        return {\n            params: options.params,\n            defaults: options.defaults,\n            stricted: options.stricted,\n            firstRestricted: options.firstRestricted,\n            message: options.message\n        };\n    }\n\n    function parseFunctionDeclaration(node, identifierIsOptional) {\n        var id = null, params = [], defaults = [], body, token, stricted, tmp, firstRestricted, message, previousStrict,\n            isGenerator, previousAllowYield;\n\n        previousAllowYield = state.allowYield;\n\n        expectKeyword('function');\n\n        isGenerator = match('*');\n        if (isGenerator) {\n            lex();\n        }\n\n        if (!identifierIsOptional || !match('(')) {\n            token = lookahead;\n            id = parseVariableIdentifier();\n            if (strict) {\n                if (isRestrictedWord(token.value)) {\n                    tolerateUnexpectedToken(token, Messages.StrictFunctionName);\n                }\n            } else {\n                if (isRestrictedWord(token.value)) {\n                    firstRestricted = token;\n                    message = Messages.StrictFunctionName;\n                } else if (isStrictModeReservedWord(token.value)) {\n                    firstRestricted = token;\n                    message = Messages.StrictReservedWord;\n                }\n            }\n        }\n\n        state.allowYield = !isGenerator;\n        tmp = parseParams(firstRestricted);\n        params = tmp.params;\n        defaults = tmp.defaults;\n        stricted = tmp.stricted;\n        firstRestricted = tmp.firstRestricted;\n        if (tmp.message) {\n            message = tmp.message;\n        }\n\n\n        previousStrict = strict;\n        body = parseFunctionSourceElements();\n        if (strict && firstRestricted) {\n            throwUnexpectedToken(firstRestricted, message);\n        }\n        if (strict && stricted) {\n            tolerateUnexpectedToken(stricted, message);\n        }\n\n        strict = previousStrict;\n        state.allowYield = previousAllowYield;\n\n        return node.finishFunctionDeclaration(id, params, defaults, body, isGenerator);\n    }\n\n    function parseFunctionExpression() {\n        var token, id = null, stricted, firstRestricted, message, tmp,\n            params = [], defaults = [], body, previousStrict, node = new Node(),\n            isGenerator, previousAllowYield;\n\n        previousAllowYield = state.allowYield;\n\n        expectKeyword('function');\n\n        isGenerator = match('*');\n        if (isGenerator) {\n            lex();\n        }\n\n        state.allowYield = !isGenerator;\n        if (!match('(')) {\n            token = lookahead;\n            id = (!strict && !isGenerator && matchKeyword('yield')) ? parseNonComputedProperty() : parseVariableIdentifier();\n            if (strict) {\n                if (isRestrictedWord(token.value)) {\n                    tolerateUnexpectedToken(token, Messages.StrictFunctionName);\n                }\n            } else {\n                if (isRestrictedWord(token.value)) {\n                    firstRestricted = token;\n                    message = Messages.StrictFunctionName;\n                } else if (isStrictModeReservedWord(token.value)) {\n                    firstRestricted = token;\n                    message = Messages.StrictReservedWord;\n                }\n            }\n        }\n\n        tmp = parseParams(firstRestricted);\n        params = tmp.params;\n        defaults = tmp.defaults;\n        stricted = tmp.stricted;\n        firstRestricted = tmp.firstRestricted;\n        if (tmp.message) {\n            message = tmp.message;\n        }\n\n        previousStrict = strict;\n        body = parseFunctionSourceElements();\n        if (strict && firstRestricted) {\n            throwUnexpectedToken(firstRestricted, message);\n        }\n        if (strict && stricted) {\n            tolerateUnexpectedToken(stricted, message);\n        }\n        strict = previousStrict;\n        state.allowYield = previousAllowYield;\n\n        return node.finishFunctionExpression(id, params, defaults, body, isGenerator);\n    }\n\n    // ECMA-262 14.5 Class Definitions\n\n    function parseClassBody() {\n        var classBody, token, isStatic, hasConstructor = false, body, method, computed, key;\n\n        classBody = new Node();\n\n        expect('{');\n        body = [];\n        while (!match('}')) {\n            if (match(';')) {\n                lex();\n            } else {\n                method = new Node();\n                token = lookahead;\n                isStatic = false;\n                computed = match('[');\n                if (match('*')) {\n                    lex();\n                } else {\n                    key = parseObjectPropertyKey();\n                    if (key.name === 'static' && (lookaheadPropertyName() || match('*'))) {\n                        token = lookahead;\n                        isStatic = true;\n                        computed = match('[');\n                        if (match('*')) {\n                            lex();\n                        } else {\n                            key = parseObjectPropertyKey();\n                        }\n                    }\n                }\n                method = tryParseMethodDefinition(token, key, computed, method);\n                if (method) {\n                    method['static'] = isStatic; // jscs:ignore requireDotNotation\n                    if (method.kind === 'init') {\n                        method.kind = 'method';\n                    }\n                    if (!isStatic) {\n                        if (!method.computed && (method.key.name || method.key.value.toString()) === 'constructor') {\n                            if (method.kind !== 'method' || !method.method || method.value.generator) {\n                                throwUnexpectedToken(token, Messages.ConstructorSpecialMethod);\n                            }\n                            if (hasConstructor) {\n                                throwUnexpectedToken(token, Messages.DuplicateConstructor);\n                            } else {\n                                hasConstructor = true;\n                            }\n                            method.kind = 'constructor';\n                        }\n                    } else {\n                        if (!method.computed && (method.key.name || method.key.value.toString()) === 'prototype') {\n                            throwUnexpectedToken(token, Messages.StaticPrototype);\n                        }\n                    }\n                    method.type = Syntax.MethodDefinition;\n                    delete method.method;\n                    delete method.shorthand;\n                    body.push(method);\n                } else {\n                    throwUnexpectedToken(lookahead);\n                }\n            }\n        }\n        lex();\n        return classBody.finishClassBody(body);\n    }\n\n    function parseClassDeclaration(identifierIsOptional) {\n        var id = null, superClass = null, classNode = new Node(), classBody, previousStrict = strict;\n        strict = true;\n\n        expectKeyword('class');\n\n        if (!identifierIsOptional || lookahead.type === Token.Identifier) {\n            id = parseVariableIdentifier();\n        }\n\n        if (matchKeyword('extends')) {\n            lex();\n            superClass = isolateCoverGrammar(parseLeftHandSideExpressionAllowCall);\n        }\n        classBody = parseClassBody();\n        strict = previousStrict;\n\n        return classNode.finishClassDeclaration(id, superClass, classBody);\n    }\n\n    function parseClassExpression() {\n        var id = null, superClass = null, classNode = new Node(), classBody, previousStrict = strict;\n        strict = true;\n\n        expectKeyword('class');\n\n        if (lookahead.type === Token.Identifier) {\n            id = parseVariableIdentifier();\n        }\n\n        if (matchKeyword('extends')) {\n            lex();\n            superClass = isolateCoverGrammar(parseLeftHandSideExpressionAllowCall);\n        }\n        classBody = parseClassBody();\n        strict = previousStrict;\n\n        return classNode.finishClassExpression(id, superClass, classBody);\n    }\n\n    // ECMA-262 15.2 Modules\n\n    function parseModuleSpecifier() {\n        var node = new Node();\n\n        if (lookahead.type !== Token.StringLiteral) {\n            throwError(Messages.InvalidModuleSpecifier);\n        }\n        return node.finishLiteral(lex());\n    }\n\n    // ECMA-262 15.2.3 Exports\n\n    function parseExportSpecifier() {\n        var exported, local, node = new Node(), def;\n        if (matchKeyword('default')) {\n            // export {default} from 'something';\n            def = new Node();\n            lex();\n            local = def.finishIdentifier('default');\n        } else {\n            local = parseVariableIdentifier();\n        }\n        if (matchContextualKeyword('as')) {\n            lex();\n            exported = parseNonComputedProperty();\n        }\n        return node.finishExportSpecifier(local, exported);\n    }\n\n    function parseExportNamedDeclaration(node) {\n        var declaration = null,\n            isExportFromIdentifier,\n            src = null, specifiers = [];\n\n        // non-default export\n        if (lookahead.type === Token.Keyword) {\n            // covers:\n            // export var f = 1;\n            switch (lookahead.value) {\n                case 'let':\n                case 'const':\n                    declaration = parseLexicalDeclaration({inFor: false});\n                    return node.finishExportNamedDeclaration(declaration, specifiers, null);\n                case 'var':\n                case 'class':\n                case 'function':\n                    declaration = parseStatementListItem();\n                    return node.finishExportNamedDeclaration(declaration, specifiers, null);\n            }\n        }\n\n        expect('{');\n        while (!match('}')) {\n            isExportFromIdentifier = isExportFromIdentifier || matchKeyword('default');\n            specifiers.push(parseExportSpecifier());\n            if (!match('}')) {\n                expect(',');\n                if (match('}')) {\n                    break;\n                }\n            }\n        }\n        expect('}');\n\n        if (matchContextualKeyword('from')) {\n            // covering:\n            // export {default} from 'foo';\n            // export {foo} from 'foo';\n            lex();\n            src = parseModuleSpecifier();\n            consumeSemicolon();\n        } else if (isExportFromIdentifier) {\n            // covering:\n            // export {default}; // missing fromClause\n            throwError(lookahead.value ?\n                    Messages.UnexpectedToken : Messages.MissingFromClause, lookahead.value);\n        } else {\n            // cover\n            // export {foo};\n            consumeSemicolon();\n        }\n        return node.finishExportNamedDeclaration(declaration, specifiers, src);\n    }\n\n    function parseExportDefaultDeclaration(node) {\n        var declaration = null,\n            expression = null;\n\n        // covers:\n        // export default ...\n        expectKeyword('default');\n\n        if (matchKeyword('function')) {\n            // covers:\n            // export default function foo () {}\n            // export default function () {}\n            declaration = parseFunctionDeclaration(new Node(), true);\n            return node.finishExportDefaultDeclaration(declaration);\n        }\n        if (matchKeyword('class')) {\n            declaration = parseClassDeclaration(true);\n            return node.finishExportDefaultDeclaration(declaration);\n        }\n\n        if (matchContextualKeyword('from')) {\n            throwError(Messages.UnexpectedToken, lookahead.value);\n        }\n\n        // covers:\n        // export default {};\n        // export default [];\n        // export default (1 + 2);\n        if (match('{')) {\n            expression = parseObjectInitializer();\n        } else if (match('[')) {\n            expression = parseArrayInitializer();\n        } else {\n            expression = parseAssignmentExpression();\n        }\n        consumeSemicolon();\n        return node.finishExportDefaultDeclaration(expression);\n    }\n\n    function parseExportAllDeclaration(node) {\n        var src;\n\n        // covers:\n        // export * from 'foo';\n        expect('*');\n        if (!matchContextualKeyword('from')) {\n            throwError(lookahead.value ?\n                    Messages.UnexpectedToken : Messages.MissingFromClause, lookahead.value);\n        }\n        lex();\n        src = parseModuleSpecifier();\n        consumeSemicolon();\n\n        return node.finishExportAllDeclaration(src);\n    }\n\n    function parseExportDeclaration() {\n        var node = new Node();\n        if (state.inFunctionBody) {\n            throwError(Messages.IllegalExportDeclaration);\n        }\n\n        expectKeyword('export');\n\n        if (matchKeyword('default')) {\n            return parseExportDefaultDeclaration(node);\n        }\n        if (match('*')) {\n            return parseExportAllDeclaration(node);\n        }\n        return parseExportNamedDeclaration(node);\n    }\n\n    // ECMA-262 15.2.2 Imports\n\n    function parseImportSpecifier() {\n        // import {<foo as bar>} ...;\n        var local, imported, node = new Node();\n\n        imported = parseNonComputedProperty();\n        if (matchContextualKeyword('as')) {\n            lex();\n            local = parseVariableIdentifier();\n        }\n\n        return node.finishImportSpecifier(local, imported);\n    }\n\n    function parseNamedImports() {\n        var specifiers = [];\n        // {foo, bar as bas}\n        expect('{');\n        while (!match('}')) {\n            specifiers.push(parseImportSpecifier());\n            if (!match('}')) {\n                expect(',');\n                if (match('}')) {\n                    break;\n                }\n            }\n        }\n        expect('}');\n        return specifiers;\n    }\n\n    function parseImportDefaultSpecifier() {\n        // import <foo> ...;\n        var local, node = new Node();\n\n        local = parseNonComputedProperty();\n\n        return node.finishImportDefaultSpecifier(local);\n    }\n\n    function parseImportNamespaceSpecifier() {\n        // import <* as foo> ...;\n        var local, node = new Node();\n\n        expect('*');\n        if (!matchContextualKeyword('as')) {\n            throwError(Messages.NoAsAfterImportNamespace);\n        }\n        lex();\n        local = parseNonComputedProperty();\n\n        return node.finishImportNamespaceSpecifier(local);\n    }\n\n    function parseImportDeclaration() {\n        var specifiers = [], src, node = new Node();\n\n        if (state.inFunctionBody) {\n            throwError(Messages.IllegalImportDeclaration);\n        }\n\n        expectKeyword('import');\n\n        if (lookahead.type === Token.StringLiteral) {\n            // import 'foo';\n            src = parseModuleSpecifier();\n        } else {\n\n            if (match('{')) {\n                // import {bar}\n                specifiers = specifiers.concat(parseNamedImports());\n            } else if (match('*')) {\n                // import * as foo\n                specifiers.push(parseImportNamespaceSpecifier());\n            } else if (isIdentifierName(lookahead) && !matchKeyword('default')) {\n                // import foo\n                specifiers.push(parseImportDefaultSpecifier());\n                if (match(',')) {\n                    lex();\n                    if (match('*')) {\n                        // import foo, * as foo\n                        specifiers.push(parseImportNamespaceSpecifier());\n                    } else if (match('{')) {\n                        // import foo, {bar}\n                        specifiers = specifiers.concat(parseNamedImports());\n                    } else {\n                        throwUnexpectedToken(lookahead);\n                    }\n                }\n            } else {\n                throwUnexpectedToken(lex());\n            }\n\n            if (!matchContextualKeyword('from')) {\n                throwError(lookahead.value ?\n                        Messages.UnexpectedToken : Messages.MissingFromClause, lookahead.value);\n            }\n            lex();\n            src = parseModuleSpecifier();\n        }\n\n        consumeSemicolon();\n        return node.finishImportDeclaration(specifiers, src);\n    }\n\n    // ECMA-262 15.1 Scripts\n\n    function parseScriptBody() {\n        var statement, body = [], token, directive, firstRestricted;\n\n        while (startIndex < length) {\n            token = lookahead;\n            if (token.type !== Token.StringLiteral) {\n                break;\n            }\n\n            statement = parseStatementListItem();\n            body.push(statement);\n            if (statement.expression.type !== Syntax.Literal) {\n                // this is not directive\n                break;\n            }\n            directive = source.slice(token.start + 1, token.end - 1);\n            if (directive === 'use strict') {\n                strict = true;\n                if (firstRestricted) {\n                    tolerateUnexpectedToken(firstRestricted, Messages.StrictOctalLiteral);\n                }\n            } else {\n                if (!firstRestricted && token.octal) {\n                    firstRestricted = token;\n                }\n            }\n        }\n\n        while (startIndex < length) {\n            statement = parseStatementListItem();\n            /* istanbul ignore if */\n            if (typeof statement === 'undefined') {\n                break;\n            }\n            body.push(statement);\n        }\n        return body;\n    }\n\n    function parseProgram() {\n        var body, node;\n\n        peek();\n        node = new Node();\n\n        body = parseScriptBody();\n        return node.finishProgram(body, state.sourceType);\n    }\n\n    function filterTokenLocation() {\n        var i, entry, token, tokens = [];\n\n        for (i = 0; i < extra.tokens.length; ++i) {\n            entry = extra.tokens[i];\n            token = {\n                type: entry.type,\n                value: entry.value\n            };\n            if (entry.regex) {\n                token.regex = {\n                    pattern: entry.regex.pattern,\n                    flags: entry.regex.flags\n                };\n            }\n            if (extra.range) {\n                token.range = entry.range;\n            }\n            if (extra.loc) {\n                token.loc = entry.loc;\n            }\n            tokens.push(token);\n        }\n\n        extra.tokens = tokens;\n    }\n\n    function tokenize(code, options, delegate) {\n        var toString,\n            tokens;\n\n        toString = String;\n        if (typeof code !== 'string' && !(code instanceof String)) {\n            code = toString(code);\n        }\n\n        source = code;\n        index = 0;\n        lineNumber = (source.length > 0) ? 1 : 0;\n        lineStart = 0;\n        startIndex = index;\n        startLineNumber = lineNumber;\n        startLineStart = lineStart;\n        length = source.length;\n        lookahead = null;\n        state = {\n            allowIn: true,\n            allowYield: true,\n            labelSet: {},\n            inFunctionBody: false,\n            inIteration: false,\n            inSwitch: false,\n            lastCommentStart: -1,\n            curlyStack: []\n        };\n\n        extra = {};\n\n        // Options matching.\n        options = options || {};\n\n        // Of course we collect tokens here.\n        options.tokens = true;\n        extra.tokens = [];\n        extra.tokenValues = [];\n        extra.tokenize = true;\n        extra.delegate = delegate;\n\n        // The following two fields are necessary to compute the Regex tokens.\n        extra.openParenToken = -1;\n        extra.openCurlyToken = -1;\n\n        extra.range = (typeof options.range === 'boolean') && options.range;\n        extra.loc = (typeof options.loc === 'boolean') && options.loc;\n\n        if (typeof options.comment === 'boolean' && options.comment) {\n            extra.comments = [];\n        }\n        if (typeof options.tolerant === 'boolean' && options.tolerant) {\n            extra.errors = [];\n        }\n\n        try {\n            peek();\n            if (lookahead.type === Token.EOF) {\n                return extra.tokens;\n            }\n\n            lex();\n            while (lookahead.type !== Token.EOF) {\n                try {\n                    lex();\n                } catch (lexError) {\n                    if (extra.errors) {\n                        recordError(lexError);\n                        // We have to break on the first error\n                        // to avoid infinite loops.\n                        break;\n                    } else {\n                        throw lexError;\n                    }\n                }\n            }\n\n            tokens = extra.tokens;\n            if (typeof extra.errors !== 'undefined') {\n                tokens.errors = extra.errors;\n            }\n        } catch (e) {\n            throw e;\n        } finally {\n            extra = {};\n        }\n        return tokens;\n    }\n\n    function parse(code, options) {\n        var program, toString;\n\n        toString = String;\n        if (typeof code !== 'string' && !(code instanceof String)) {\n            code = toString(code);\n        }\n\n        source = code;\n        index = 0;\n        lineNumber = (source.length > 0) ? 1 : 0;\n        lineStart = 0;\n        startIndex = index;\n        startLineNumber = lineNumber;\n        startLineStart = lineStart;\n        length = source.length;\n        lookahead = null;\n        state = {\n            allowIn: true,\n            allowYield: true,\n            labelSet: {},\n            inFunctionBody: false,\n            inIteration: false,\n            inSwitch: false,\n            lastCommentStart: -1,\n            curlyStack: [],\n            sourceType: 'script'\n        };\n        strict = false;\n\n        extra = {};\n        if (typeof options !== 'undefined') {\n            extra.range = (typeof options.range === 'boolean') && options.range;\n            extra.loc = (typeof options.loc === 'boolean') && options.loc;\n            extra.attachComment = (typeof options.attachComment === 'boolean') && options.attachComment;\n\n            if (extra.loc && options.source !== null && options.source !== undefined) {\n                extra.source = toString(options.source);\n            }\n\n            if (typeof options.tokens === 'boolean' && options.tokens) {\n                extra.tokens = [];\n            }\n            if (typeof options.comment === 'boolean' && options.comment) {\n                extra.comments = [];\n            }\n            if (typeof options.tolerant === 'boolean' && options.tolerant) {\n                extra.errors = [];\n            }\n            if (extra.attachComment) {\n                extra.range = true;\n                extra.comments = [];\n                extra.bottomRightStack = [];\n                extra.trailingComments = [];\n                extra.leadingComments = [];\n            }\n            if (options.sourceType === 'module') {\n                // very restrictive condition for now\n                state.sourceType = options.sourceType;\n                strict = true;\n            }\n        }\n\n        try {\n            program = parseProgram();\n            if (typeof extra.comments !== 'undefined') {\n                program.comments = extra.comments;\n            }\n            if (typeof extra.tokens !== 'undefined') {\n                filterTokenLocation();\n                program.tokens = extra.tokens;\n            }\n            if (typeof extra.errors !== 'undefined') {\n                program.errors = extra.errors;\n            }\n        } catch (e) {\n            throw e;\n        } finally {\n            extra = {};\n        }\n\n        return program;\n    }\n\n    // Sync with *.json manifests.\n    exports.version = '2.7.1';\n\n    exports.tokenize = tokenize;\n\n    exports.parse = parse;\n\n    // Deep copy.\n    /* istanbul ignore next */\n    exports.Syntax = (function () {\n        var name, types = {};\n\n        if (typeof Object.create === 'function') {\n            types = Object.create(null);\n        }\n\n        for (name in Syntax) {\n            if (Syntax.hasOwnProperty(name)) {\n                types[name] = Syntax[name];\n            }\n        }\n\n        if (typeof Object.freeze === 'function') {\n            Object.freeze(types);\n        }\n\n        return types;\n    }());\n\n}));\n/* vim: set sw=4 ts=4 et tw=80 : */\n","/*!\n * node-inherit\n * Copyright(c) 2011 Dmitry Filatov <dfilatov@yandex-team.ru>\n * MIT Licensed\n */\n\nmodule.exports = require('./lib/inherit');\n","/**\n * @module inherit\n * @version 2.2.2\n * @author Filatov Dmitry <dfilatov@yandex-team.ru>\n * @description This module provides some syntax sugar for \"class\" declarations, constructors, mixins, \"super\" calls and static members.\n */\n\n(function(global) {\n\nvar hasIntrospection = (function(){'_';}).toString().indexOf('_') > -1,\n    emptyBase = function() {},\n    hasOwnProperty = Object.prototype.hasOwnProperty,\n    objCreate = Object.create || function(ptp) {\n        var inheritance = function() {};\n        inheritance.prototype = ptp;\n        return new inheritance();\n    },\n    objKeys = Object.keys || function(obj) {\n        var res = [];\n        for(var i in obj) {\n            hasOwnProperty.call(obj, i) && res.push(i);\n        }\n        return res;\n    },\n    extend = function(o1, o2) {\n        for(var i in o2) {\n            hasOwnProperty.call(o2, i) && (o1[i] = o2[i]);\n        }\n\n        return o1;\n    },\n    toStr = Object.prototype.toString,\n    isArray = Array.isArray || function(obj) {\n        return toStr.call(obj) === '[object Array]';\n    },\n    isFunction = function(obj) {\n        return toStr.call(obj) === '[object Function]';\n    },\n    noOp = function() {},\n    needCheckProps = true,\n    testPropObj = { toString : '' };\n\nfor(var i in testPropObj) { // fucking ie hasn't toString, valueOf in for\n    testPropObj.hasOwnProperty(i) && (needCheckProps = false);\n}\n\nvar specProps = needCheckProps? ['toString', 'valueOf'] : null;\n\nfunction getPropList(obj) {\n    var res = objKeys(obj);\n    if(needCheckProps) {\n        var specProp, i = 0;\n        while(specProp = specProps[i++]) {\n            obj.hasOwnProperty(specProp) && res.push(specProp);\n        }\n    }\n\n    return res;\n}\n\nfunction override(base, res, add) {\n    var addList = getPropList(add),\n        j = 0, len = addList.length,\n        name, prop;\n    while(j < len) {\n        if((name = addList[j++]) === '__self') {\n            continue;\n        }\n        prop = add[name];\n        if(isFunction(prop) &&\n                (!hasIntrospection || prop.toString().indexOf('.__base') > -1)) {\n            res[name] = (function(name, prop) {\n                var baseMethod = base[name]?\n                        base[name] :\n                        name === '__constructor'? // case of inheritance from plane function\n                            res.__self.__parent :\n                            noOp;\n                return function() {\n                    var baseSaved = this.__base;\n                    this.__base = baseMethod;\n                    var res = prop.apply(this, arguments);\n                    this.__base = baseSaved;\n                    return res;\n                };\n            })(name, prop);\n        } else {\n            res[name] = prop;\n        }\n    }\n}\n\nfunction applyMixins(mixins, res) {\n    var i = 1, mixin;\n    while(mixin = mixins[i++]) {\n        res?\n            isFunction(mixin)?\n                inherit.self(res, mixin.prototype, mixin) :\n                inherit.self(res, mixin) :\n            res = isFunction(mixin)?\n                inherit(mixins[0], mixin.prototype, mixin) :\n                inherit(mixins[0], mixin);\n    }\n    return res || mixins[0];\n}\n\n/**\n* Creates class\n* @exports\n* @param {Function|Array} [baseClass|baseClassAndMixins] class (or class and mixins) to inherit from\n* @param {Object} prototypeFields\n* @param {Object} [staticFields]\n* @returns {Function} class\n*/\nfunction inherit() {\n    var args = arguments,\n        withMixins = isArray(args[0]),\n        hasBase = withMixins || isFunction(args[0]),\n        base = hasBase? withMixins? applyMixins(args[0]) : args[0] : emptyBase,\n        props = args[hasBase? 1 : 0] || {},\n        staticProps = args[hasBase? 2 : 1],\n        res = props.__constructor || (hasBase && base.prototype.__constructor)?\n            function() {\n                return this.__constructor.apply(this, arguments);\n            } :\n            hasBase?\n                function() {\n                    return base.apply(this, arguments);\n                } :\n                function() {};\n\n    if(!hasBase) {\n        res.prototype = props;\n        res.prototype.__self = res.prototype.constructor = res;\n        return extend(res, staticProps);\n    }\n\n    extend(res, base);\n\n    res.__parent = base;\n\n    var basePtp = base.prototype,\n        resPtp = res.prototype = objCreate(basePtp);\n\n    resPtp.__self = resPtp.constructor = res;\n\n    props && override(basePtp, resPtp, props);\n    staticProps && override(base, res, staticProps);\n\n    return res;\n}\n\ninherit.self = function() {\n    var args = arguments,\n        withMixins = isArray(args[0]),\n        base = withMixins? applyMixins(args[0], args[0][0]) : args[0],\n        props = args[1],\n        staticProps = args[2],\n        basePtp = base.prototype;\n\n    props && override(basePtp, basePtp, props);\n    staticProps && override(base, base, staticProps);\n\n    return base;\n};\n\nvar defineAsGlobal = true;\nif(typeof exports === 'object') {\n    module.exports = inherit;\n    defineAsGlobal = false;\n}\n\nif(typeof modules === 'object') {\n    modules.define('inherit', function(provide) {\n        provide(inherit);\n    });\n    defineAsGlobal = false;\n}\n\nif(typeof define === 'function') {\n    define(function(require, exports, module) {\n        module.exports = inherit;\n    });\n    defineAsGlobal = false;\n}\n\ndefineAsGlobal && (global.inherit = inherit);\n\n})(this);\n","var baseIndexOf = require('../internal/baseIndexOf'),\n    binaryIndex = require('../internal/binaryIndex');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Gets the index at which the first occurrence of `value` is found in `array`\n * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)\n * for equality comparisons. If `fromIndex` is negative, it's used as the offset\n * from the end of `array`. If `array` is sorted providing `true` for `fromIndex`\n * performs a faster binary search.\n *\n * @static\n * @memberOf _\n * @category Array\n * @param {Array} array The array to search.\n * @param {*} value The value to search for.\n * @param {boolean|number} [fromIndex=0] The index to search from or `true`\n *  to perform a binary search on a sorted array.\n * @returns {number} Returns the index of the matched value, else `-1`.\n * @example\n *\n * _.indexOf([1, 2, 1, 2], 2);\n * // => 1\n *\n * // using `fromIndex`\n * _.indexOf([1, 2, 1, 2], 2, 2);\n * // => 3\n *\n * // performing a binary search\n * _.indexOf([1, 1, 2, 2], 2, true);\n * // => 2\n */\nfunction indexOf(array, value, fromIndex) {\n  var length = array ? array.length : 0;\n  if (!length) {\n    return -1;\n  }\n  if (typeof fromIndex == 'number') {\n    fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : fromIndex;\n  } else if (fromIndex) {\n    var index = binaryIndex(array, value);\n    if (index < length &&\n        (value === value ? (value === array[index]) : (array[index] !== array[index]))) {\n      return index;\n    }\n    return -1;\n  }\n  return baseIndexOf(array, value, fromIndex || 0);\n}\n\nmodule.exports = indexOf;\n","/**\n * Gets the last element of `array`.\n *\n * @static\n * @memberOf _\n * @category Array\n * @param {Array} array The array to query.\n * @returns {*} Returns the last element of `array`.\n * @example\n *\n * _.last([1, 2, 3]);\n * // => 3\n */\nfunction last(array) {\n  var length = array ? array.length : 0;\n  return length ? array[length - 1] : undefined;\n}\n\nmodule.exports = last;\n","var LazyWrapper = require('../internal/LazyWrapper'),\n    LodashWrapper = require('../internal/LodashWrapper'),\n    baseLodash = require('../internal/baseLodash'),\n    isArray = require('../lang/isArray'),\n    isObjectLike = require('../internal/isObjectLike'),\n    wrapperClone = require('../internal/wrapperClone');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Creates a `lodash` object which wraps `value` to enable implicit chaining.\n * Methods that operate on and return arrays, collections, and functions can\n * be chained together. Methods that retrieve a single value or may return a\n * primitive value will automatically end the chain returning the unwrapped\n * value. Explicit chaining may be enabled using `_.chain`. The execution of\n * chained methods is lazy, that is, execution is deferred until `_#value`\n * is implicitly or explicitly called.\n *\n * Lazy evaluation allows several methods to support shortcut fusion. Shortcut\n * fusion is an optimization strategy which merge iteratee calls; this can help\n * to avoid the creation of intermediate data structures and greatly reduce the\n * number of iteratee executions.\n *\n * Chaining is supported in custom builds as long as the `_#value` method is\n * directly or indirectly included in the build.\n *\n * In addition to lodash methods, wrappers have `Array` and `String` methods.\n *\n * The wrapper `Array` methods are:\n * `concat`, `join`, `pop`, `push`, `reverse`, `shift`, `slice`, `sort`,\n * `splice`, and `unshift`\n *\n * The wrapper `String` methods are:\n * `replace` and `split`\n *\n * The wrapper methods that support shortcut fusion are:\n * `compact`, `drop`, `dropRight`, `dropRightWhile`, `dropWhile`, `filter`,\n * `first`, `initial`, `last`, `map`, `pluck`, `reject`, `rest`, `reverse`,\n * `slice`, `take`, `takeRight`, `takeRightWhile`, `takeWhile`, `toArray`,\n * and `where`\n *\n * The chainable wrapper methods are:\n * `after`, `ary`, `assign`, `at`, `before`, `bind`, `bindAll`, `bindKey`,\n * `callback`, `chain`, `chunk`, `commit`, `compact`, `concat`, `constant`,\n * `countBy`, `create`, `curry`, `debounce`, `defaults`, `defaultsDeep`,\n * `defer`, `delay`, `difference`, `drop`, `dropRight`, `dropRightWhile`,\n * `dropWhile`, `fill`, `filter`, `flatten`, `flattenDeep`, `flow`, `flowRight`,\n * `forEach`, `forEachRight`, `forIn`, `forInRight`, `forOwn`, `forOwnRight`,\n * `functions`, `groupBy`, `indexBy`, `initial`, `intersection`, `invert`,\n * `invoke`, `keys`, `keysIn`, `map`, `mapKeys`, `mapValues`, `matches`,\n * `matchesProperty`, `memoize`, `merge`, `method`, `methodOf`, `mixin`,\n * `modArgs`, `negate`, `omit`, `once`, `pairs`, `partial`, `partialRight`,\n * `partition`, `pick`, `plant`, `pluck`, `property`, `propertyOf`, `pull`,\n * `pullAt`, `push`, `range`, `rearg`, `reject`, `remove`, `rest`, `restParam`,\n * `reverse`, `set`, `shuffle`, `slice`, `sort`, `sortBy`, `sortByAll`,\n * `sortByOrder`, `splice`, `spread`, `take`, `takeRight`, `takeRightWhile`,\n * `takeWhile`, `tap`, `throttle`, `thru`, `times`, `toArray`, `toPlainObject`,\n * `transform`, `union`, `uniq`, `unshift`, `unzip`, `unzipWith`, `values`,\n * `valuesIn`, `where`, `without`, `wrap`, `xor`, `zip`, `zipObject`, `zipWith`\n *\n * The wrapper methods that are **not** chainable by default are:\n * `add`, `attempt`, `camelCase`, `capitalize`, `ceil`, `clone`, `cloneDeep`,\n * `deburr`, `endsWith`, `escape`, `escapeRegExp`, `every`, `find`, `findIndex`,\n * `findKey`, `findLast`, `findLastIndex`, `findLastKey`, `findWhere`, `first`,\n * `floor`, `get`, `gt`, `gte`, `has`, `identity`, `includes`, `indexOf`,\n * `inRange`, `isArguments`, `isArray`, `isBoolean`, `isDate`, `isElement`,\n * `isEmpty`, `isEqual`, `isError`, `isFinite` `isFunction`, `isMatch`,\n * `isNative`, `isNaN`, `isNull`, `isNumber`, `isObject`, `isPlainObject`,\n * `isRegExp`, `isString`, `isUndefined`, `isTypedArray`, `join`, `kebabCase`,\n * `last`, `lastIndexOf`, `lt`, `lte`, `max`, `min`, `noConflict`, `noop`,\n * `now`, `pad`, `padLeft`, `padRight`, `parseInt`, `pop`, `random`, `reduce`,\n * `reduceRight`, `repeat`, `result`, `round`, `runInContext`, `shift`, `size`,\n * `snakeCase`, `some`, `sortedIndex`, `sortedLastIndex`, `startCase`,\n * `startsWith`, `sum`, `template`, `trim`, `trimLeft`, `trimRight`, `trunc`,\n * `unescape`, `uniqueId`, `value`, and `words`\n *\n * The wrapper method `sample` will return a wrapped value when `n` is provided,\n * otherwise an unwrapped value is returned.\n *\n * @name _\n * @constructor\n * @category Chain\n * @param {*} value The value to wrap in a `lodash` instance.\n * @returns {Object} Returns the new `lodash` wrapper instance.\n * @example\n *\n * var wrapped = _([1, 2, 3]);\n *\n * // returns an unwrapped value\n * wrapped.reduce(function(total, n) {\n *   return total + n;\n * });\n * // => 6\n *\n * // returns a wrapped value\n * var squares = wrapped.map(function(n) {\n *   return n * n;\n * });\n *\n * _.isArray(squares);\n * // => false\n *\n * _.isArray(squares.value());\n * // => true\n */\nfunction lodash(value) {\n  if (isObjectLike(value) && !isArray(value) && !(value instanceof LazyWrapper)) {\n    if (value instanceof LodashWrapper) {\n      return value;\n    }\n    if (hasOwnProperty.call(value, '__chain__') && hasOwnProperty.call(value, '__wrapped__')) {\n      return wrapperClone(value);\n    }\n  }\n  return new LodashWrapper(value);\n}\n\n// Ensure wrappers are instances of `baseLodash`.\nlodash.prototype = baseLodash.prototype;\n\nmodule.exports = lodash;\n","module.exports = require('./forEach');\n","var baseEach = require('../internal/baseEach'),\n    createFind = require('../internal/createFind');\n\n/**\n * Iterates over elements of `collection`, returning the first element\n * `predicate` returns truthy for. The predicate is bound to `thisArg` and\n * invoked with three arguments: (value, index|key, collection).\n *\n * If a property name is provided for `predicate` the created `_.property`\n * style callback returns the property value of the given element.\n *\n * If a value is also provided for `thisArg` the created `_.matchesProperty`\n * style callback returns `true` for elements that have a matching property\n * value, else `false`.\n *\n * If an object is provided for `predicate` the created `_.matches` style\n * callback returns `true` for elements that have the properties of the given\n * object, else `false`.\n *\n * @static\n * @memberOf _\n * @alias detect\n * @category Collection\n * @param {Array|Object|string} collection The collection to search.\n * @param {Function|Object|string} [predicate=_.identity] The function invoked\n *  per iteration.\n * @param {*} [thisArg] The `this` binding of `predicate`.\n * @returns {*} Returns the matched element, else `undefined`.\n * @example\n *\n * var users = [\n *   { 'user': 'barney',  'age': 36, 'active': true },\n *   { 'user': 'fred',    'age': 40, 'active': false },\n *   { 'user': 'pebbles', 'age': 1,  'active': true }\n * ];\n *\n * _.result(_.find(users, function(chr) {\n *   return chr.age < 40;\n * }), 'user');\n * // => 'barney'\n *\n * // using the `_.matches` callback shorthand\n * _.result(_.find(users, { 'age': 1, 'active': true }), 'user');\n * // => 'pebbles'\n *\n * // using the `_.matchesProperty` callback shorthand\n * _.result(_.find(users, 'active', false), 'user');\n * // => 'fred'\n *\n * // using the `_.property` callback shorthand\n * _.result(_.find(users, 'active'), 'user');\n * // => 'barney'\n */\nvar find = createFind(baseEach);\n\nmodule.exports = find;\n","var arrayEach = require('../internal/arrayEach'),\n    baseEach = require('../internal/baseEach'),\n    createForEach = require('../internal/createForEach');\n\n/**\n * Iterates over elements of `collection` invoking `iteratee` for each element.\n * The `iteratee` is bound to `thisArg` and invoked with three arguments:\n * (value, index|key, collection). Iteratee functions may exit iteration early\n * by explicitly returning `false`.\n *\n * **Note:** As with other \"Collections\" methods, objects with a \"length\" property\n * are iterated like arrays. To avoid this behavior `_.forIn` or `_.forOwn`\n * may be used for object iteration.\n *\n * @static\n * @memberOf _\n * @alias each\n * @category Collection\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function} [iteratee=_.identity] The function invoked per iteration.\n * @param {*} [thisArg] The `this` binding of `iteratee`.\n * @returns {Array|Object|string} Returns `collection`.\n * @example\n *\n * _([1, 2]).forEach(function(n) {\n *   console.log(n);\n * }).value();\n * // => logs each value from left to right and returns the array\n *\n * _.forEach({ 'a': 1, 'b': 2 }, function(n, key) {\n *   console.log(n, key);\n * });\n * // => logs each value-key pair and returns the object (iteration order is not guaranteed)\n */\nvar forEach = createForEach(arrayEach, baseEach);\n\nmodule.exports = forEach;\n","var baseIndexOf = require('../internal/baseIndexOf'),\n    getLength = require('../internal/getLength'),\n    isArray = require('../lang/isArray'),\n    isIterateeCall = require('../internal/isIterateeCall'),\n    isLength = require('../internal/isLength'),\n    isString = require('../lang/isString'),\n    values = require('../object/values');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Checks if `target` is in `collection` using\n * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)\n * for equality comparisons. If `fromIndex` is negative, it's used as the offset\n * from the end of `collection`.\n *\n * @static\n * @memberOf _\n * @alias contains, include\n * @category Collection\n * @param {Array|Object|string} collection The collection to search.\n * @param {*} target The value to search for.\n * @param {number} [fromIndex=0] The index to search from.\n * @param- {Object} [guard] Enables use as a callback for functions like `_.reduce`.\n * @returns {boolean} Returns `true` if a matching element is found, else `false`.\n * @example\n *\n * _.includes([1, 2, 3], 1);\n * // => true\n *\n * _.includes([1, 2, 3], 1, 2);\n * // => false\n *\n * _.includes({ 'user': 'fred', 'age': 40 }, 'fred');\n * // => true\n *\n * _.includes('pebbles', 'eb');\n * // => true\n */\nfunction includes(collection, target, fromIndex, guard) {\n  var length = collection ? getLength(collection) : 0;\n  if (!isLength(length)) {\n    collection = values(collection);\n    length = collection.length;\n  }\n  if (typeof fromIndex != 'number' || (guard && isIterateeCall(target, fromIndex, guard))) {\n    fromIndex = 0;\n  } else {\n    fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0);\n  }\n  return (typeof collection == 'string' || !isArray(collection) && isString(collection))\n    ? (fromIndex <= length && collection.indexOf(target, fromIndex) > -1)\n    : (!!length && baseIndexOf(collection, target, fromIndex) > -1);\n}\n\nmodule.exports = includes;\n","var arrayMap = require('../internal/arrayMap'),\n    baseCallback = require('../internal/baseCallback'),\n    baseMap = require('../internal/baseMap'),\n    isArray = require('../lang/isArray');\n\n/**\n * Creates an array of values by running each element in `collection` through\n * `iteratee`. The `iteratee` is bound to `thisArg` and invoked with three\n * arguments: (value, index|key, collection).\n *\n * If a property name is provided for `iteratee` the created `_.property`\n * style callback returns the property value of the given element.\n *\n * If a value is also provided for `thisArg` the created `_.matchesProperty`\n * style callback returns `true` for elements that have a matching property\n * value, else `false`.\n *\n * If an object is provided for `iteratee` the created `_.matches` style\n * callback returns `true` for elements that have the properties of the given\n * object, else `false`.\n *\n * Many lodash methods are guarded to work as iteratees for methods like\n * `_.every`, `_.filter`, `_.map`, `_.mapValues`, `_.reject`, and `_.some`.\n *\n * The guarded methods are:\n * `ary`, `callback`, `chunk`, `clone`, `create`, `curry`, `curryRight`,\n * `drop`, `dropRight`, `every`, `fill`, `flatten`, `invert`, `max`, `min`,\n * `parseInt`, `slice`, `sortBy`, `take`, `takeRight`, `template`, `trim`,\n * `trimLeft`, `trimRight`, `trunc`, `random`, `range`, `sample`, `some`,\n * `sum`, `uniq`, and `words`\n *\n * @static\n * @memberOf _\n * @alias collect\n * @category Collection\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function|Object|string} [iteratee=_.identity] The function invoked\n *  per iteration.\n * @param {*} [thisArg] The `this` binding of `iteratee`.\n * @returns {Array} Returns the new mapped array.\n * @example\n *\n * function timesThree(n) {\n *   return n * 3;\n * }\n *\n * _.map([1, 2], timesThree);\n * // => [3, 6]\n *\n * _.map({ 'a': 1, 'b': 2 }, timesThree);\n * // => [3, 6] (iteration order is not guaranteed)\n *\n * var users = [\n *   { 'user': 'barney' },\n *   { 'user': 'fred' }\n * ];\n *\n * // using the `_.property` callback shorthand\n * _.map(users, 'user');\n * // => ['barney', 'fred']\n */\nfunction map(collection, iteratee, thisArg) {\n  var func = isArray(collection) ? arrayMap : baseMap;\n  iteratee = baseCallback(iteratee, thisArg, 3);\n  return func(collection, iteratee);\n}\n\nmodule.exports = map;\n","var getNative = require('../internal/getNative');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeNow = getNative(Date, 'now');\n\n/**\n * Gets the number of milliseconds that have elapsed since the Unix epoch\n * (1 January 1970 00:00:00 UTC).\n *\n * @static\n * @memberOf _\n * @category Date\n * @example\n *\n * _.defer(function(stamp) {\n *   console.log(_.now() - stamp);\n * }, _.now());\n * // => logs the number of milliseconds it took for the deferred function to be invoked\n */\nvar now = nativeNow || function() {\n  return new Date().getTime();\n};\n\nmodule.exports = now;\n","var createWrapper = require('../internal/createWrapper'),\n    replaceHolders = require('../internal/replaceHolders'),\n    restParam = require('./restParam');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    PARTIAL_FLAG = 32;\n\n/**\n * Creates a function that invokes `func` with the `this` binding of `thisArg`\n * and prepends any additional `_.bind` arguments to those provided to the\n * bound function.\n *\n * The `_.bind.placeholder` value, which defaults to `_` in monolithic builds,\n * may be used as a placeholder for partially applied arguments.\n *\n * **Note:** Unlike native `Function#bind` this method does not set the \"length\"\n * property of bound functions.\n *\n * @static\n * @memberOf _\n * @category Function\n * @param {Function} func The function to bind.\n * @param {*} thisArg The `this` binding of `func`.\n * @param {...*} [partials] The arguments to be partially applied.\n * @returns {Function} Returns the new bound function.\n * @example\n *\n * var greet = function(greeting, punctuation) {\n *   return greeting + ' ' + this.user + punctuation;\n * };\n *\n * var object = { 'user': 'fred' };\n *\n * var bound = _.bind(greet, object, 'hi');\n * bound('!');\n * // => 'hi fred!'\n *\n * // using placeholders\n * var bound = _.bind(greet, object, _, '!');\n * bound('hi');\n * // => 'hi fred!'\n */\nvar bind = restParam(function(func, thisArg, partials) {\n  var bitmask = BIND_FLAG;\n  if (partials.length) {\n    var holders = replaceHolders(partials, bind.placeholder);\n    bitmask |= PARTIAL_FLAG;\n  }\n  return createWrapper(func, bitmask, thisArg, partials, holders);\n});\n\n// Assign default placeholders.\nbind.placeholder = {};\n\nmodule.exports = bind;\n","/** Used as the `TypeError` message for \"Functions\" methods. */\nvar FUNC_ERROR_TEXT = 'Expected a function';\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates a function that invokes `func` with the `this` binding of the\n * created function and arguments from `start` and beyond provided as an array.\n *\n * **Note:** This method is based on the [rest parameter](https://developer.mozilla.org/Web/JavaScript/Reference/Functions/rest_parameters).\n *\n * @static\n * @memberOf _\n * @category Function\n * @param {Function} func The function to apply a rest parameter to.\n * @param {number} [start=func.length-1] The start position of the rest parameter.\n * @returns {Function} Returns the new function.\n * @example\n *\n * var say = _.restParam(function(what, names) {\n *   return what + ' ' + _.initial(names).join(', ') +\n *     (_.size(names) > 1 ? ', & ' : '') + _.last(names);\n * });\n *\n * say('hello', 'fred', 'barney', 'pebbles');\n * // => 'hello fred, barney, & pebbles'\n */\nfunction restParam(func, start) {\n  if (typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  start = nativeMax(start === undefined ? (func.length - 1) : (+start || 0), 0);\n  return function() {\n    var args = arguments,\n        index = -1,\n        length = nativeMax(args.length - start, 0),\n        rest = Array(length);\n\n    while (++index < length) {\n      rest[index] = args[start + index];\n    }\n    switch (start) {\n      case 0: return func.call(this, rest);\n      case 1: return func.call(this, args[0], rest);\n      case 2: return func.call(this, args[0], args[1], rest);\n    }\n    var otherArgs = Array(start + 1);\n    index = -1;\n    while (++index < start) {\n      otherArgs[index] = args[index];\n    }\n    otherArgs[start] = rest;\n    return func.apply(this, otherArgs);\n  };\n}\n\nmodule.exports = restParam;\n","var baseCreate = require('./baseCreate'),\n    baseLodash = require('./baseLodash');\n\n/** Used as references for `-Infinity` and `Infinity`. */\nvar POSITIVE_INFINITY = Number.POSITIVE_INFINITY;\n\n/**\n * Creates a lazy wrapper object which wraps `value` to enable lazy evaluation.\n *\n * @private\n * @param {*} value The value to wrap.\n */\nfunction LazyWrapper(value) {\n  this.__wrapped__ = value;\n  this.__actions__ = [];\n  this.__dir__ = 1;\n  this.__filtered__ = false;\n  this.__iteratees__ = [];\n  this.__takeCount__ = POSITIVE_INFINITY;\n  this.__views__ = [];\n}\n\nLazyWrapper.prototype = baseCreate(baseLodash.prototype);\nLazyWrapper.prototype.constructor = LazyWrapper;\n\nmodule.exports = LazyWrapper;\n","var baseCreate = require('./baseCreate'),\n    baseLodash = require('./baseLodash');\n\n/**\n * The base constructor for creating `lodash` wrapper objects.\n *\n * @private\n * @param {*} value The value to wrap.\n * @param {boolean} [chainAll] Enable chaining for all wrapper methods.\n * @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.\n */\nfunction LodashWrapper(value, chainAll, actions) {\n  this.__wrapped__ = value;\n  this.__actions__ = actions || [];\n  this.__chain__ = !!chainAll;\n}\n\nLodashWrapper.prototype = baseCreate(baseLodash.prototype);\nLodashWrapper.prototype.constructor = LodashWrapper;\n\nmodule.exports = LodashWrapper;\n","/**\n * Copies the values of `source` to `array`.\n *\n * @private\n * @param {Array} source The array to copy values from.\n * @param {Array} [array=[]] The array to copy values to.\n * @returns {Array} Returns `array`.\n */\nfunction arrayCopy(source, array) {\n  var index = -1,\n      length = source.length;\n\n  array || (array = Array(length));\n  while (++index < length) {\n    array[index] = source[index];\n  }\n  return array;\n}\n\nmodule.exports = arrayCopy;\n","/**\n * A specialized version of `_.forEach` for arrays without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array} Returns `array`.\n */\nfunction arrayEach(array, iteratee) {\n  var index = -1,\n      length = array.length;\n\n  while (++index < length) {\n    if (iteratee(array[index], index, array) === false) {\n      break;\n    }\n  }\n  return array;\n}\n\nmodule.exports = arrayEach;\n","/**\n * A specialized version of `_.map` for arrays without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array} Returns the new mapped array.\n */\nfunction arrayMap(array, iteratee) {\n  var index = -1,\n      length = array.length,\n      result = Array(length);\n\n  while (++index < length) {\n    result[index] = iteratee(array[index], index, array);\n  }\n  return result;\n}\n\nmodule.exports = arrayMap;\n","/**\n * A specialized version of `_.some` for arrays without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to iterate over.\n * @param {Function} predicate The function invoked per iteration.\n * @returns {boolean} Returns `true` if any element passes the predicate check,\n *  else `false`.\n */\nfunction arraySome(array, predicate) {\n  var index = -1,\n      length = array.length;\n\n  while (++index < length) {\n    if (predicate(array[index], index, array)) {\n      return true;\n    }\n  }\n  return false;\n}\n\nmodule.exports = arraySome;\n","var baseCopy = require('./baseCopy'),\n    keys = require('../object/keys');\n\n/**\n * The base implementation of `_.assign` without support for argument juggling,\n * multiple sources, and `customizer` functions.\n *\n * @private\n * @param {Object} object The destination object.\n * @param {Object} source The source object.\n * @returns {Object} Returns `object`.\n */\nfunction baseAssign(object, source) {\n  return source == null\n    ? object\n    : baseCopy(source, keys(source), object);\n}\n\nmodule.exports = baseAssign;\n","var baseMatches = require('./baseMatches'),\n    baseMatchesProperty = require('./baseMatchesProperty'),\n    bindCallback = require('./bindCallback'),\n    identity = require('../utility/identity'),\n    property = require('../utility/property');\n\n/**\n * The base implementation of `_.callback` which supports specifying the\n * number of arguments to provide to `func`.\n *\n * @private\n * @param {*} [func=_.identity] The value to convert to a callback.\n * @param {*} [thisArg] The `this` binding of `func`.\n * @param {number} [argCount] The number of arguments to provide to `func`.\n * @returns {Function} Returns the callback.\n */\nfunction baseCallback(func, thisArg, argCount) {\n  var type = typeof func;\n  if (type == 'function') {\n    return thisArg === undefined\n      ? func\n      : bindCallback(func, thisArg, argCount);\n  }\n  if (func == null) {\n    return identity;\n  }\n  if (type == 'object') {\n    return baseMatches(func);\n  }\n  return thisArg === undefined\n    ? property(func)\n    : baseMatchesProperty(func, thisArg);\n}\n\nmodule.exports = baseCallback;\n","var arrayCopy = require('./arrayCopy'),\n    arrayEach = require('./arrayEach'),\n    baseAssign = require('./baseAssign'),\n    baseForOwn = require('./baseForOwn'),\n    initCloneArray = require('./initCloneArray'),\n    initCloneByTag = require('./initCloneByTag'),\n    initCloneObject = require('./initCloneObject'),\n    isArray = require('../lang/isArray'),\n    isHostObject = require('./isHostObject'),\n    isObject = require('../lang/isObject');\n\n/** `Object#toString` result references. */\nvar argsTag = '[object Arguments]',\n    arrayTag = '[object Array]',\n    boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    funcTag = '[object Function]',\n    mapTag = '[object Map]',\n    numberTag = '[object Number]',\n    objectTag = '[object Object]',\n    regexpTag = '[object RegExp]',\n    setTag = '[object Set]',\n    stringTag = '[object String]',\n    weakMapTag = '[object WeakMap]';\n\nvar arrayBufferTag = '[object ArrayBuffer]',\n    float32Tag = '[object Float32Array]',\n    float64Tag = '[object Float64Array]',\n    int8Tag = '[object Int8Array]',\n    int16Tag = '[object Int16Array]',\n    int32Tag = '[object Int32Array]',\n    uint8Tag = '[object Uint8Array]',\n    uint8ClampedTag = '[object Uint8ClampedArray]',\n    uint16Tag = '[object Uint16Array]',\n    uint32Tag = '[object Uint32Array]';\n\n/** Used to identify `toStringTag` values supported by `_.clone`. */\nvar cloneableTags = {};\ncloneableTags[argsTag] = cloneableTags[arrayTag] =\ncloneableTags[arrayBufferTag] = cloneableTags[boolTag] =\ncloneableTags[dateTag] = cloneableTags[float32Tag] =\ncloneableTags[float64Tag] = cloneableTags[int8Tag] =\ncloneableTags[int16Tag] = cloneableTags[int32Tag] =\ncloneableTags[numberTag] = cloneableTags[objectTag] =\ncloneableTags[regexpTag] = cloneableTags[stringTag] =\ncloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] =\ncloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;\ncloneableTags[errorTag] = cloneableTags[funcTag] =\ncloneableTags[mapTag] = cloneableTags[setTag] =\ncloneableTags[weakMapTag] = false;\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * The base implementation of `_.clone` without support for argument juggling\n * and `this` binding `customizer` functions.\n *\n * @private\n * @param {*} value The value to clone.\n * @param {boolean} [isDeep] Specify a deep clone.\n * @param {Function} [customizer] The function to customize cloning values.\n * @param {string} [key] The key of `value`.\n * @param {Object} [object] The object `value` belongs to.\n * @param {Array} [stackA=[]] Tracks traversed source objects.\n * @param {Array} [stackB=[]] Associates clones with source counterparts.\n * @returns {*} Returns the cloned value.\n */\nfunction baseClone(value, isDeep, customizer, key, object, stackA, stackB) {\n  var result;\n  if (customizer) {\n    result = object ? customizer(value, key, object) : customizer(value);\n  }\n  if (result !== undefined) {\n    return result;\n  }\n  if (!isObject(value)) {\n    return value;\n  }\n  var isArr = isArray(value);\n  if (isArr) {\n    result = initCloneArray(value);\n    if (!isDeep) {\n      return arrayCopy(value, result);\n    }\n  } else {\n    var tag = objToString.call(value),\n        isFunc = tag == funcTag;\n\n    if (tag == objectTag || tag == argsTag || (isFunc && !object)) {\n      if (isHostObject(value)) {\n        return object ? value : {};\n      }\n      result = initCloneObject(isFunc ? {} : value);\n      if (!isDeep) {\n        return baseAssign(result, value);\n      }\n    } else {\n      return cloneableTags[tag]\n        ? initCloneByTag(value, tag, isDeep)\n        : (object ? value : {});\n    }\n  }\n  // Check for circular references and return its corresponding clone.\n  stackA || (stackA = []);\n  stackB || (stackB = []);\n\n  var length = stackA.length;\n  while (length--) {\n    if (stackA[length] == value) {\n      return stackB[length];\n    }\n  }\n  // Add the source value to the stack of traversed objects and associate it with its clone.\n  stackA.push(value);\n  stackB.push(result);\n\n  // Recursively populate clone (susceptible to call stack limits).\n  (isArr ? arrayEach : baseForOwn)(value, function(subValue, key) {\n    result[key] = baseClone(subValue, isDeep, customizer, key, value, stackA, stackB);\n  });\n  return result;\n}\n\nmodule.exports = baseClone;\n","/**\n * Copies properties of `source` to `object`.\n *\n * @private\n * @param {Object} source The object to copy properties from.\n * @param {Array} props The property names to copy.\n * @param {Object} [object={}] The object to copy properties to.\n * @returns {Object} Returns `object`.\n */\nfunction baseCopy(source, props, object) {\n  object || (object = {});\n\n  var index = -1,\n      length = props.length;\n\n  while (++index < length) {\n    var key = props[index];\n    object[key] = source[key];\n  }\n  return object;\n}\n\nmodule.exports = baseCopy;\n","var isObject = require('../lang/isObject');\n\n/**\n * The base implementation of `_.create` without support for assigning\n * properties to the created object.\n *\n * @private\n * @param {Object} prototype The object to inherit from.\n * @returns {Object} Returns the new object.\n */\nvar baseCreate = (function() {\n  function object() {}\n  return function(prototype) {\n    if (isObject(prototype)) {\n      object.prototype = prototype;\n      var result = new object;\n      object.prototype = undefined;\n    }\n    return result || {};\n  };\n}());\n\nmodule.exports = baseCreate;\n","var baseForOwn = require('./baseForOwn'),\n    createBaseEach = require('./createBaseEach');\n\n/**\n * The base implementation of `_.forEach` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array|Object|string} Returns `collection`.\n */\nvar baseEach = createBaseEach(baseForOwn);\n\nmodule.exports = baseEach;\n","/**\n * The base implementation of `_.find`, `_.findLast`, `_.findKey`, and `_.findLastKey`,\n * without support for callback shorthands and `this` binding, which iterates\n * over `collection` using the provided `eachFunc`.\n *\n * @private\n * @param {Array|Object|string} collection The collection to search.\n * @param {Function} predicate The function invoked per iteration.\n * @param {Function} eachFunc The function to iterate over `collection`.\n * @param {boolean} [retKey] Specify returning the key of the found element\n *  instead of the element itself.\n * @returns {*} Returns the found element or its key, else `undefined`.\n */\nfunction baseFind(collection, predicate, eachFunc, retKey) {\n  var result;\n  eachFunc(collection, function(value, key, collection) {\n    if (predicate(value, key, collection)) {\n      result = retKey ? key : value;\n      return false;\n    }\n  });\n  return result;\n}\n\nmodule.exports = baseFind;\n","/**\n * The base implementation of `_.findIndex` and `_.findLastIndex` without\n * support for callback shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to search.\n * @param {Function} predicate The function invoked per iteration.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {number} Returns the index of the matched value, else `-1`.\n */\nfunction baseFindIndex(array, predicate, fromRight) {\n  var length = array.length,\n      index = fromRight ? length : -1;\n\n  while ((fromRight ? index-- : ++index < length)) {\n    if (predicate(array[index], index, array)) {\n      return index;\n    }\n  }\n  return -1;\n}\n\nmodule.exports = baseFindIndex;\n","var createBaseFor = require('./createBaseFor');\n\n/**\n * The base implementation of `baseForIn` and `baseForOwn` which iterates\n * over `object` properties returned by `keysFunc` invoking `iteratee` for\n * each property. Iteratee functions may exit iteration early by explicitly\n * returning `false`.\n *\n * @private\n * @param {Object} object The object to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @param {Function} keysFunc The function to get the keys of `object`.\n * @returns {Object} Returns `object`.\n */\nvar baseFor = createBaseFor();\n\nmodule.exports = baseFor;\n","var baseFor = require('./baseFor'),\n    keysIn = require('../object/keysIn');\n\n/**\n * The base implementation of `_.forIn` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Object} object The object to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Object} Returns `object`.\n */\nfunction baseForIn(object, iteratee) {\n  return baseFor(object, iteratee, keysIn);\n}\n\nmodule.exports = baseForIn;\n","var baseFor = require('./baseFor'),\n    keys = require('../object/keys');\n\n/**\n * The base implementation of `_.forOwn` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Object} object The object to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Object} Returns `object`.\n */\nfunction baseForOwn(object, iteratee) {\n  return baseFor(object, iteratee, keys);\n}\n\nmodule.exports = baseForOwn;\n","var toObject = require('./toObject');\n\n/**\n * The base implementation of `get` without support for string paths\n * and default values.\n *\n * @private\n * @param {Object} object The object to query.\n * @param {Array} path The path of the property to get.\n * @param {string} [pathKey] The key representation of path.\n * @returns {*} Returns the resolved value.\n */\nfunction baseGet(object, path, pathKey) {\n  if (object == null) {\n    return;\n  }\n  object = toObject(object);\n  if (pathKey !== undefined && pathKey in object) {\n    path = [pathKey];\n  }\n  var index = 0,\n      length = path.length;\n\n  while (object != null && index < length) {\n    object = toObject(object)[path[index++]];\n  }\n  return (index && index == length) ? object : undefined;\n}\n\nmodule.exports = baseGet;\n","var indexOfNaN = require('./indexOfNaN');\n\n/**\n * The base implementation of `_.indexOf` without support for binary searches.\n *\n * @private\n * @param {Array} array The array to search.\n * @param {*} value The value to search for.\n * @param {number} fromIndex The index to search from.\n * @returns {number} Returns the index of the matched value, else `-1`.\n */\nfunction baseIndexOf(array, value, fromIndex) {\n  if (value !== value) {\n    return indexOfNaN(array, fromIndex);\n  }\n  var index = fromIndex - 1,\n      length = array.length;\n\n  while (++index < length) {\n    if (array[index] === value) {\n      return index;\n    }\n  }\n  return -1;\n}\n\nmodule.exports = baseIndexOf;\n","var baseIsEqualDeep = require('./baseIsEqualDeep'),\n    isObject = require('../lang/isObject'),\n    isObjectLike = require('./isObjectLike');\n\n/**\n * The base implementation of `_.isEqual` without support for `this` binding\n * `customizer` functions.\n *\n * @private\n * @param {*} value The value to compare.\n * @param {*} other The other value to compare.\n * @param {Function} [customizer] The function to customize comparing values.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA] Tracks traversed `value` objects.\n * @param {Array} [stackB] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the values are equivalent, else `false`.\n */\nfunction baseIsEqual(value, other, customizer, isLoose, stackA, stackB) {\n  if (value === other) {\n    return true;\n  }\n  if (value == null || other == null || (!isObject(value) && !isObjectLike(other))) {\n    return value !== value && other !== other;\n  }\n  return baseIsEqualDeep(value, other, baseIsEqual, customizer, isLoose, stackA, stackB);\n}\n\nmodule.exports = baseIsEqual;\n","var equalArrays = require('./equalArrays'),\n    equalByTag = require('./equalByTag'),\n    equalObjects = require('./equalObjects'),\n    isArray = require('../lang/isArray'),\n    isHostObject = require('./isHostObject'),\n    isTypedArray = require('../lang/isTypedArray');\n\n/** `Object#toString` result references. */\nvar argsTag = '[object Arguments]',\n    arrayTag = '[object Array]',\n    objectTag = '[object Object]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * A specialized version of `baseIsEqual` for arrays and objects which performs\n * deep comparisons and tracks traversed objects enabling objects with circular\n * references to be compared.\n *\n * @private\n * @param {Object} object The object to compare.\n * @param {Object} other The other object to compare.\n * @param {Function} equalFunc The function to determine equivalents of values.\n * @param {Function} [customizer] The function to customize comparing objects.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA=[]] Tracks traversed `value` objects.\n * @param {Array} [stackB=[]] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.\n */\nfunction baseIsEqualDeep(object, other, equalFunc, customizer, isLoose, stackA, stackB) {\n  var objIsArr = isArray(object),\n      othIsArr = isArray(other),\n      objTag = arrayTag,\n      othTag = arrayTag;\n\n  if (!objIsArr) {\n    objTag = objToString.call(object);\n    if (objTag == argsTag) {\n      objTag = objectTag;\n    } else if (objTag != objectTag) {\n      objIsArr = isTypedArray(object);\n    }\n  }\n  if (!othIsArr) {\n    othTag = objToString.call(other);\n    if (othTag == argsTag) {\n      othTag = objectTag;\n    } else if (othTag != objectTag) {\n      othIsArr = isTypedArray(other);\n    }\n  }\n  var objIsObj = objTag == objectTag && !isHostObject(object),\n      othIsObj = othTag == objectTag && !isHostObject(other),\n      isSameTag = objTag == othTag;\n\n  if (isSameTag && !(objIsArr || objIsObj)) {\n    return equalByTag(object, other, objTag);\n  }\n  if (!isLoose) {\n    var objIsWrapped = objIsObj && hasOwnProperty.call(object, '__wrapped__'),\n        othIsWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__');\n\n    if (objIsWrapped || othIsWrapped) {\n      return equalFunc(objIsWrapped ? object.value() : object, othIsWrapped ? other.value() : other, customizer, isLoose, stackA, stackB);\n    }\n  }\n  if (!isSameTag) {\n    return false;\n  }\n  // Assume cyclic values are equal.\n  // For more information on detecting circular references see https://es5.github.io/#JO.\n  stackA || (stackA = []);\n  stackB || (stackB = []);\n\n  var length = stackA.length;\n  while (length--) {\n    if (stackA[length] == object) {\n      return stackB[length] == other;\n    }\n  }\n  // Add `object` and `other` to the stack of traversed objects.\n  stackA.push(object);\n  stackB.push(other);\n\n  var result = (objIsArr ? equalArrays : equalObjects)(object, other, equalFunc, customizer, isLoose, stackA, stackB);\n\n  stackA.pop();\n  stackB.pop();\n\n  return result;\n}\n\nmodule.exports = baseIsEqualDeep;\n","var baseIsEqual = require('./baseIsEqual'),\n    toObject = require('./toObject');\n\n/**\n * The base implementation of `_.isMatch` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Object} object The object to inspect.\n * @param {Array} matchData The propery names, values, and compare flags to match.\n * @param {Function} [customizer] The function to customize comparing objects.\n * @returns {boolean} Returns `true` if `object` is a match, else `false`.\n */\nfunction baseIsMatch(object, matchData, customizer) {\n  var index = matchData.length,\n      length = index,\n      noCustomizer = !customizer;\n\n  if (object == null) {\n    return !length;\n  }\n  object = toObject(object);\n  while (index--) {\n    var data = matchData[index];\n    if ((noCustomizer && data[2])\n          ? data[1] !== object[data[0]]\n          : !(data[0] in object)\n        ) {\n      return false;\n    }\n  }\n  while (++index < length) {\n    data = matchData[index];\n    var key = data[0],\n        objValue = object[key],\n        srcValue = data[1];\n\n    if (noCustomizer && data[2]) {\n      if (objValue === undefined && !(key in object)) {\n        return false;\n      }\n    } else {\n      var result = customizer ? customizer(objValue, srcValue, key) : undefined;\n      if (!(result === undefined ? baseIsEqual(srcValue, objValue, customizer, true) : result)) {\n        return false;\n      }\n    }\n  }\n  return true;\n}\n\nmodule.exports = baseIsMatch;\n","/**\n * The function whose prototype all chaining wrappers inherit from.\n *\n * @private\n */\nfunction baseLodash() {\n  // No operation performed.\n}\n\nmodule.exports = baseLodash;\n","var baseEach = require('./baseEach'),\n    isArrayLike = require('./isArrayLike');\n\n/**\n * The base implementation of `_.map` without support for callback shorthands\n * and `this` binding.\n *\n * @private\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array} Returns the new mapped array.\n */\nfunction baseMap(collection, iteratee) {\n  var index = -1,\n      result = isArrayLike(collection) ? Array(collection.length) : [];\n\n  baseEach(collection, function(value, key, collection) {\n    result[++index] = iteratee(value, key, collection);\n  });\n  return result;\n}\n\nmodule.exports = baseMap;\n","var baseIsMatch = require('./baseIsMatch'),\n    getMatchData = require('./getMatchData'),\n    toObject = require('./toObject');\n\n/**\n * The base implementation of `_.matches` which does not clone `source`.\n *\n * @private\n * @param {Object} source The object of property values to match.\n * @returns {Function} Returns the new function.\n */\nfunction baseMatches(source) {\n  var matchData = getMatchData(source);\n  if (matchData.length == 1 && matchData[0][2]) {\n    var key = matchData[0][0],\n        value = matchData[0][1];\n\n    return function(object) {\n      if (object == null) {\n        return false;\n      }\n      object = toObject(object);\n      return object[key] === value && (value !== undefined || (key in object));\n    };\n  }\n  return function(object) {\n    return baseIsMatch(object, matchData);\n  };\n}\n\nmodule.exports = baseMatches;\n","var baseGet = require('./baseGet'),\n    baseIsEqual = require('./baseIsEqual'),\n    baseSlice = require('./baseSlice'),\n    isArray = require('../lang/isArray'),\n    isKey = require('./isKey'),\n    isStrictComparable = require('./isStrictComparable'),\n    last = require('../array/last'),\n    toObject = require('./toObject'),\n    toPath = require('./toPath');\n\n/**\n * The base implementation of `_.matchesProperty` which does not clone `srcValue`.\n *\n * @private\n * @param {string} path The path of the property to get.\n * @param {*} srcValue The value to compare.\n * @returns {Function} Returns the new function.\n */\nfunction baseMatchesProperty(path, srcValue) {\n  var isArr = isArray(path),\n      isCommon = isKey(path) && isStrictComparable(srcValue),\n      pathKey = (path + '');\n\n  path = toPath(path);\n  return function(object) {\n    if (object == null) {\n      return false;\n    }\n    var key = pathKey;\n    object = toObject(object);\n    if ((isArr || !isCommon) && !(key in object)) {\n      object = path.length == 1 ? object : baseGet(object, baseSlice(path, 0, -1));\n      if (object == null) {\n        return false;\n      }\n      key = last(path);\n      object = toObject(object);\n    }\n    return object[key] === srcValue\n      ? (srcValue !== undefined || (key in object))\n      : baseIsEqual(srcValue, object[key], undefined, true);\n  };\n}\n\nmodule.exports = baseMatchesProperty;\n","var toObject = require('./toObject');\n\n/**\n * The base implementation of `_.property` without support for deep paths.\n *\n * @private\n * @param {string} key The key of the property to get.\n * @returns {Function} Returns the new function.\n */\nfunction baseProperty(key) {\n  return function(object) {\n    return object == null ? undefined : toObject(object)[key];\n  };\n}\n\nmodule.exports = baseProperty;\n","var baseGet = require('./baseGet'),\n    toPath = require('./toPath');\n\n/**\n * A specialized version of `baseProperty` which supports deep paths.\n *\n * @private\n * @param {Array|string} path The path of the property to get.\n * @returns {Function} Returns the new function.\n */\nfunction basePropertyDeep(path) {\n  var pathKey = (path + '');\n  path = toPath(path);\n  return function(object) {\n    return baseGet(object, path, pathKey);\n  };\n}\n\nmodule.exports = basePropertyDeep;\n","var identity = require('../utility/identity'),\n    metaMap = require('./metaMap');\n\n/**\n * The base implementation of `setData` without support for hot loop detection.\n *\n * @private\n * @param {Function} func The function to associate metadata with.\n * @param {*} data The metadata.\n * @returns {Function} Returns `func`.\n */\nvar baseSetData = !metaMap ? identity : function(func, data) {\n  metaMap.set(func, data);\n  return func;\n};\n\nmodule.exports = baseSetData;\n","/**\n * The base implementation of `_.slice` without an iteratee call guard.\n *\n * @private\n * @param {Array} array The array to slice.\n * @param {number} [start=0] The start position.\n * @param {number} [end=array.length] The end position.\n * @returns {Array} Returns the slice of `array`.\n */\nfunction baseSlice(array, start, end) {\n  var index = -1,\n      length = array.length;\n\n  start = start == null ? 0 : (+start || 0);\n  if (start < 0) {\n    start = -start > length ? 0 : (length + start);\n  }\n  end = (end === undefined || end > length) ? length : (+end || 0);\n  if (end < 0) {\n    end += length;\n  }\n  length = start > end ? 0 : ((end - start) >>> 0);\n  start >>>= 0;\n\n  var result = Array(length);\n  while (++index < length) {\n    result[index] = array[index + start];\n  }\n  return result;\n}\n\nmodule.exports = baseSlice;\n","/**\n * Converts `value` to a string if it's not one. An empty string is returned\n * for `null` or `undefined` values.\n *\n * @private\n * @param {*} value The value to process.\n * @returns {string} Returns the string.\n */\nfunction baseToString(value) {\n  return value == null ? '' : (value + '');\n}\n\nmodule.exports = baseToString;\n","/**\n * The base implementation of `_.values` and `_.valuesIn` which creates an\n * array of `object` property values corresponding to the property names\n * of `props`.\n *\n * @private\n * @param {Object} object The object to query.\n * @param {Array} props The property names to get values for.\n * @returns {Object} Returns the array of property values.\n */\nfunction baseValues(object, props) {\n  var index = -1,\n      length = props.length,\n      result = Array(length);\n\n  while (++index < length) {\n    result[index] = object[props[index]];\n  }\n  return result;\n}\n\nmodule.exports = baseValues;\n","var binaryIndexBy = require('./binaryIndexBy'),\n    identity = require('../utility/identity');\n\n/** Used as references for the maximum length and index of an array. */\nvar MAX_ARRAY_LENGTH = 4294967295,\n    HALF_MAX_ARRAY_LENGTH = MAX_ARRAY_LENGTH >>> 1;\n\n/**\n * Performs a binary search of `array` to determine the index at which `value`\n * should be inserted into `array` in order to maintain its sort order.\n *\n * @private\n * @param {Array} array The sorted array to inspect.\n * @param {*} value The value to evaluate.\n * @param {boolean} [retHighest] Specify returning the highest qualified index.\n * @returns {number} Returns the index at which `value` should be inserted\n *  into `array`.\n */\nfunction binaryIndex(array, value, retHighest) {\n  var low = 0,\n      high = array ? array.length : low;\n\n  if (typeof value == 'number' && value === value && high <= HALF_MAX_ARRAY_LENGTH) {\n    while (low < high) {\n      var mid = (low + high) >>> 1,\n          computed = array[mid];\n\n      if ((retHighest ? (computed <= value) : (computed < value)) && computed !== null) {\n        low = mid + 1;\n      } else {\n        high = mid;\n      }\n    }\n    return high;\n  }\n  return binaryIndexBy(array, value, identity, retHighest);\n}\n\nmodule.exports = binaryIndex;\n","/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeFloor = Math.floor,\n    nativeMin = Math.min;\n\n/** Used as references for the maximum length and index of an array. */\nvar MAX_ARRAY_LENGTH = 4294967295,\n    MAX_ARRAY_INDEX = MAX_ARRAY_LENGTH - 1;\n\n/**\n * This function is like `binaryIndex` except that it invokes `iteratee` for\n * `value` and each element of `array` to compute their sort ranking. The\n * iteratee is invoked with one argument; (value).\n *\n * @private\n * @param {Array} array The sorted array to inspect.\n * @param {*} value The value to evaluate.\n * @param {Function} iteratee The function invoked per iteration.\n * @param {boolean} [retHighest] Specify returning the highest qualified index.\n * @returns {number} Returns the index at which `value` should be inserted\n *  into `array`.\n */\nfunction binaryIndexBy(array, value, iteratee, retHighest) {\n  value = iteratee(value);\n\n  var low = 0,\n      high = array ? array.length : 0,\n      valIsNaN = value !== value,\n      valIsNull = value === null,\n      valIsUndef = value === undefined;\n\n  while (low < high) {\n    var mid = nativeFloor((low + high) / 2),\n        computed = iteratee(array[mid]),\n        isDef = computed !== undefined,\n        isReflexive = computed === computed;\n\n    if (valIsNaN) {\n      var setLow = isReflexive || retHighest;\n    } else if (valIsNull) {\n      setLow = isReflexive && isDef && (retHighest || computed != null);\n    } else if (valIsUndef) {\n      setLow = isReflexive && (retHighest || isDef);\n    } else if (computed == null) {\n      setLow = false;\n    } else {\n      setLow = retHighest ? (computed <= value) : (computed < value);\n    }\n    if (setLow) {\n      low = mid + 1;\n    } else {\n      high = mid;\n    }\n  }\n  return nativeMin(high, MAX_ARRAY_INDEX);\n}\n\nmodule.exports = binaryIndexBy;\n","var identity = require('../utility/identity');\n\n/**\n * A specialized version of `baseCallback` which only supports `this` binding\n * and specifying the number of arguments to provide to `func`.\n *\n * @private\n * @param {Function} func The function to bind.\n * @param {*} thisArg The `this` binding of `func`.\n * @param {number} [argCount] The number of arguments to provide to `func`.\n * @returns {Function} Returns the callback.\n */\nfunction bindCallback(func, thisArg, argCount) {\n  if (typeof func != 'function') {\n    return identity;\n  }\n  if (thisArg === undefined) {\n    return func;\n  }\n  switch (argCount) {\n    case 1: return function(value) {\n      return func.call(thisArg, value);\n    };\n    case 3: return function(value, index, collection) {\n      return func.call(thisArg, value, index, collection);\n    };\n    case 4: return function(accumulator, value, index, collection) {\n      return func.call(thisArg, accumulator, value, index, collection);\n    };\n    case 5: return function(value, other, key, object, source) {\n      return func.call(thisArg, value, other, key, object, source);\n    };\n  }\n  return function() {\n    return func.apply(thisArg, arguments);\n  };\n}\n\nmodule.exports = bindCallback;\n","(function (global){\n/** Native method references. */\nvar ArrayBuffer = global.ArrayBuffer,\n    Uint8Array = global.Uint8Array;\n\n/**\n * Creates a clone of the given array buffer.\n *\n * @private\n * @param {ArrayBuffer} buffer The array buffer to clone.\n * @returns {ArrayBuffer} Returns the cloned array buffer.\n */\nfunction bufferClone(buffer) {\n  var result = new ArrayBuffer(buffer.byteLength),\n      view = new Uint8Array(result);\n\n  view.set(new Uint8Array(buffer));\n  return result;\n}\n\nmodule.exports = bufferClone;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2J1ZmZlckNsb25lLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIi8qKiBOYXRpdmUgbWV0aG9kIHJlZmVyZW5jZXMuICovXG52YXIgQXJyYXlCdWZmZXIgPSBnbG9iYWwuQXJyYXlCdWZmZXIsXG4gICAgVWludDhBcnJheSA9IGdsb2JhbC5VaW50OEFycmF5O1xuXG4vKipcbiAqIENyZWF0ZXMgYSBjbG9uZSBvZiB0aGUgZ2l2ZW4gYXJyYXkgYnVmZmVyLlxuICpcbiAqIEBwcml2YXRlXG4gKiBAcGFyYW0ge0FycmF5QnVmZmVyfSBidWZmZXIgVGhlIGFycmF5IGJ1ZmZlciB0byBjbG9uZS5cbiAqIEByZXR1cm5zIHtBcnJheUJ1ZmZlcn0gUmV0dXJucyB0aGUgY2xvbmVkIGFycmF5IGJ1ZmZlci5cbiAqL1xuZnVuY3Rpb24gYnVmZmVyQ2xvbmUoYnVmZmVyKSB7XG4gIHZhciByZXN1bHQgPSBuZXcgQXJyYXlCdWZmZXIoYnVmZmVyLmJ5dGVMZW5ndGgpLFxuICAgICAgdmlldyA9IG5ldyBVaW50OEFycmF5KHJlc3VsdCk7XG5cbiAgdmlldy5zZXQobmV3IFVpbnQ4QXJyYXkoYnVmZmVyKSk7XG4gIHJldHVybiByZXN1bHQ7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gYnVmZmVyQ2xvbmU7XG4iXX0=","/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates an array that is the composition of partially applied arguments,\n * placeholders, and provided arguments into a single array of arguments.\n *\n * @private\n * @param {Array|Object} args The provided arguments.\n * @param {Array} partials The arguments to prepend to those provided.\n * @param {Array} holders The `partials` placeholder indexes.\n * @returns {Array} Returns the new array of composed arguments.\n */\nfunction composeArgs(args, partials, holders) {\n  var holdersLength = holders.length,\n      argsIndex = -1,\n      argsLength = nativeMax(args.length - holdersLength, 0),\n      leftIndex = -1,\n      leftLength = partials.length,\n      result = Array(leftLength + argsLength);\n\n  while (++leftIndex < leftLength) {\n    result[leftIndex] = partials[leftIndex];\n  }\n  while (++argsIndex < holdersLength) {\n    result[holders[argsIndex]] = args[argsIndex];\n  }\n  while (argsLength--) {\n    result[leftIndex++] = args[argsIndex++];\n  }\n  return result;\n}\n\nmodule.exports = composeArgs;\n","/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * This function is like `composeArgs` except that the arguments composition\n * is tailored for `_.partialRight`.\n *\n * @private\n * @param {Array|Object} args The provided arguments.\n * @param {Array} partials The arguments to append to those provided.\n * @param {Array} holders The `partials` placeholder indexes.\n * @returns {Array} Returns the new array of composed arguments.\n */\nfunction composeArgsRight(args, partials, holders) {\n  var holdersIndex = -1,\n      holdersLength = holders.length,\n      argsIndex = -1,\n      argsLength = nativeMax(args.length - holdersLength, 0),\n      rightIndex = -1,\n      rightLength = partials.length,\n      result = Array(argsLength + rightLength);\n\n  while (++argsIndex < argsLength) {\n    result[argsIndex] = args[argsIndex];\n  }\n  var offset = argsIndex;\n  while (++rightIndex < rightLength) {\n    result[offset + rightIndex] = partials[rightIndex];\n  }\n  while (++holdersIndex < holdersLength) {\n    result[offset + holders[holdersIndex]] = args[argsIndex++];\n  }\n  return result;\n}\n\nmodule.exports = composeArgsRight;\n","var getLength = require('./getLength'),\n    isLength = require('./isLength'),\n    toObject = require('./toObject');\n\n/**\n * Creates a `baseEach` or `baseEachRight` function.\n *\n * @private\n * @param {Function} eachFunc The function to iterate over a collection.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {Function} Returns the new base function.\n */\nfunction createBaseEach(eachFunc, fromRight) {\n  return function(collection, iteratee) {\n    var length = collection ? getLength(collection) : 0;\n    if (!isLength(length)) {\n      return eachFunc(collection, iteratee);\n    }\n    var index = fromRight ? length : -1,\n        iterable = toObject(collection);\n\n    while ((fromRight ? index-- : ++index < length)) {\n      if (iteratee(iterable[index], index, iterable) === false) {\n        break;\n      }\n    }\n    return collection;\n  };\n}\n\nmodule.exports = createBaseEach;\n","var toObject = require('./toObject');\n\n/**\n * Creates a base function for `_.forIn` or `_.forInRight`.\n *\n * @private\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {Function} Returns the new base function.\n */\nfunction createBaseFor(fromRight) {\n  return function(object, iteratee, keysFunc) {\n    var iterable = toObject(object),\n        props = keysFunc(object),\n        length = props.length,\n        index = fromRight ? length : -1;\n\n    while ((fromRight ? index-- : ++index < length)) {\n      var key = props[index];\n      if (iteratee(iterable[key], key, iterable) === false) {\n        break;\n      }\n    }\n    return object;\n  };\n}\n\nmodule.exports = createBaseFor;\n","(function (global){\nvar createCtorWrapper = require('./createCtorWrapper');\n\n/**\n * Creates a function that wraps `func` and invokes it with the `this`\n * binding of `thisArg`.\n *\n * @private\n * @param {Function} func The function to bind.\n * @param {*} [thisArg] The `this` binding of `func`.\n * @returns {Function} Returns the new bound function.\n */\nfunction createBindWrapper(func, thisArg) {\n  var Ctor = createCtorWrapper(func);\n\n  function wrapper() {\n    var fn = (this && this !== global && this instanceof wrapper) ? Ctor : func;\n    return fn.apply(thisArg, arguments);\n  }\n  return wrapper;\n}\n\nmodule.exports = createBindWrapper;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZUJpbmRXcmFwcGVyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyk7XG5cbi8qKlxuICogQ3JlYXRlcyBhIGZ1bmN0aW9uIHRoYXQgd3JhcHMgYGZ1bmNgIGFuZCBpbnZva2VzIGl0IHdpdGggdGhlIGB0aGlzYFxuICogYmluZGluZyBvZiBgdGhpc0FyZ2AuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7RnVuY3Rpb259IGZ1bmMgVGhlIGZ1bmN0aW9uIHRvIGJpbmQuXG4gKiBAcGFyYW0geyp9IFt0aGlzQXJnXSBUaGUgYHRoaXNgIGJpbmRpbmcgb2YgYGZ1bmNgLlxuICogQHJldHVybnMge0Z1bmN0aW9ufSBSZXR1cm5zIHRoZSBuZXcgYm91bmQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZUJpbmRXcmFwcGVyKGZ1bmMsIHRoaXNBcmcpIHtcbiAgdmFyIEN0b3IgPSBjcmVhdGVDdG9yV3JhcHBlcihmdW5jKTtcblxuICBmdW5jdGlvbiB3cmFwcGVyKCkge1xuICAgIHZhciBmbiA9ICh0aGlzICYmIHRoaXMgIT09IGdsb2JhbCAmJiB0aGlzIGluc3RhbmNlb2Ygd3JhcHBlcikgPyBDdG9yIDogZnVuYztcbiAgICByZXR1cm4gZm4uYXBwbHkodGhpc0FyZywgYXJndW1lbnRzKTtcbiAgfVxuICByZXR1cm4gd3JhcHBlcjtcbn1cblxubW9kdWxlLmV4cG9ydHMgPSBjcmVhdGVCaW5kV3JhcHBlcjtcbiJdfQ==","var baseCreate = require('./baseCreate'),\n    isObject = require('../lang/isObject');\n\n/**\n * Creates a function that produces an instance of `Ctor` regardless of\n * whether it was invoked as part of a `new` expression or by `call` or `apply`.\n *\n * @private\n * @param {Function} Ctor The constructor to wrap.\n * @returns {Function} Returns the new wrapped function.\n */\nfunction createCtorWrapper(Ctor) {\n  return function() {\n    // Use a `switch` statement to work with class constructors.\n    // See http://ecma-international.org/ecma-262/6.0/#sec-ecmascript-function-objects-call-thisargument-argumentslist\n    // for more details.\n    var args = arguments;\n    switch (args.length) {\n      case 0: return new Ctor;\n      case 1: return new Ctor(args[0]);\n      case 2: return new Ctor(args[0], args[1]);\n      case 3: return new Ctor(args[0], args[1], args[2]);\n      case 4: return new Ctor(args[0], args[1], args[2], args[3]);\n      case 5: return new Ctor(args[0], args[1], args[2], args[3], args[4]);\n      case 6: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5]);\n      case 7: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);\n    }\n    var thisBinding = baseCreate(Ctor.prototype),\n        result = Ctor.apply(thisBinding, args);\n\n    // Mimic the constructor's `return` behavior.\n    // See https://es5.github.io/#x13.2.2 for more details.\n    return isObject(result) ? result : thisBinding;\n  };\n}\n\nmodule.exports = createCtorWrapper;\n","var baseCallback = require('./baseCallback'),\n    baseFind = require('./baseFind'),\n    baseFindIndex = require('./baseFindIndex'),\n    isArray = require('../lang/isArray');\n\n/**\n * Creates a `_.find` or `_.findLast` function.\n *\n * @private\n * @param {Function} eachFunc The function to iterate over a collection.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {Function} Returns the new find function.\n */\nfunction createFind(eachFunc, fromRight) {\n  return function(collection, predicate, thisArg) {\n    predicate = baseCallback(predicate, thisArg, 3);\n    if (isArray(collection)) {\n      var index = baseFindIndex(collection, predicate, fromRight);\n      return index > -1 ? collection[index] : undefined;\n    }\n    return baseFind(collection, predicate, eachFunc);\n  };\n}\n\nmodule.exports = createFind;\n","var bindCallback = require('./bindCallback'),\n    isArray = require('../lang/isArray');\n\n/**\n * Creates a function for `_.forEach` or `_.forEachRight`.\n *\n * @private\n * @param {Function} arrayFunc The function to iterate over an array.\n * @param {Function} eachFunc The function to iterate over a collection.\n * @returns {Function} Returns the new each function.\n */\nfunction createForEach(arrayFunc, eachFunc) {\n  return function(collection, iteratee, thisArg) {\n    return (typeof iteratee == 'function' && thisArg === undefined && isArray(collection))\n      ? arrayFunc(collection, iteratee)\n      : eachFunc(collection, bindCallback(iteratee, thisArg, 3));\n  };\n}\n\nmodule.exports = createForEach;\n","(function (global){\nvar arrayCopy = require('./arrayCopy'),\n    composeArgs = require('./composeArgs'),\n    composeArgsRight = require('./composeArgsRight'),\n    createCtorWrapper = require('./createCtorWrapper'),\n    isLaziable = require('./isLaziable'),\n    reorder = require('./reorder'),\n    replaceHolders = require('./replaceHolders'),\n    setData = require('./setData');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    BIND_KEY_FLAG = 2,\n    CURRY_BOUND_FLAG = 4,\n    CURRY_FLAG = 8,\n    CURRY_RIGHT_FLAG = 16,\n    PARTIAL_FLAG = 32,\n    PARTIAL_RIGHT_FLAG = 64,\n    ARY_FLAG = 128;\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates a function that wraps `func` and invokes it with optional `this`\n * binding of, partial application, and currying.\n *\n * @private\n * @param {Function|string} func The function or method name to reference.\n * @param {number} bitmask The bitmask of flags. See `createWrapper` for more details.\n * @param {*} [thisArg] The `this` binding of `func`.\n * @param {Array} [partials] The arguments to prepend to those provided to the new function.\n * @param {Array} [holders] The `partials` placeholder indexes.\n * @param {Array} [partialsRight] The arguments to append to those provided to the new function.\n * @param {Array} [holdersRight] The `partialsRight` placeholder indexes.\n * @param {Array} [argPos] The argument positions of the new function.\n * @param {number} [ary] The arity cap of `func`.\n * @param {number} [arity] The arity of `func`.\n * @returns {Function} Returns the new wrapped function.\n */\nfunction createHybridWrapper(func, bitmask, thisArg, partials, holders, partialsRight, holdersRight, argPos, ary, arity) {\n  var isAry = bitmask & ARY_FLAG,\n      isBind = bitmask & BIND_FLAG,\n      isBindKey = bitmask & BIND_KEY_FLAG,\n      isCurry = bitmask & CURRY_FLAG,\n      isCurryBound = bitmask & CURRY_BOUND_FLAG,\n      isCurryRight = bitmask & CURRY_RIGHT_FLAG,\n      Ctor = isBindKey ? undefined : createCtorWrapper(func);\n\n  function wrapper() {\n    // Avoid `arguments` object use disqualifying optimizations by\n    // converting it to an array before providing it to other functions.\n    var length = arguments.length,\n        index = length,\n        args = Array(length);\n\n    while (index--) {\n      args[index] = arguments[index];\n    }\n    if (partials) {\n      args = composeArgs(args, partials, holders);\n    }\n    if (partialsRight) {\n      args = composeArgsRight(args, partialsRight, holdersRight);\n    }\n    if (isCurry || isCurryRight) {\n      var placeholder = wrapper.placeholder,\n          argsHolders = replaceHolders(args, placeholder);\n\n      length -= argsHolders.length;\n      if (length < arity) {\n        var newArgPos = argPos ? arrayCopy(argPos) : undefined,\n            newArity = nativeMax(arity - length, 0),\n            newsHolders = isCurry ? argsHolders : undefined,\n            newHoldersRight = isCurry ? undefined : argsHolders,\n            newPartials = isCurry ? args : undefined,\n            newPartialsRight = isCurry ? undefined : args;\n\n        bitmask |= (isCurry ? PARTIAL_FLAG : PARTIAL_RIGHT_FLAG);\n        bitmask &= ~(isCurry ? PARTIAL_RIGHT_FLAG : PARTIAL_FLAG);\n\n        if (!isCurryBound) {\n          bitmask &= ~(BIND_FLAG | BIND_KEY_FLAG);\n        }\n        var newData = [func, bitmask, thisArg, newPartials, newsHolders, newPartialsRight, newHoldersRight, newArgPos, ary, newArity],\n            result = createHybridWrapper.apply(undefined, newData);\n\n        if (isLaziable(func)) {\n          setData(result, newData);\n        }\n        result.placeholder = placeholder;\n        return result;\n      }\n    }\n    var thisBinding = isBind ? thisArg : this,\n        fn = isBindKey ? thisBinding[func] : func;\n\n    if (argPos) {\n      args = reorder(args, argPos);\n    }\n    if (isAry && ary < args.length) {\n      args.length = ary;\n    }\n    if (this && this !== global && this instanceof wrapper) {\n      fn = Ctor || createCtorWrapper(func);\n    }\n    return fn.apply(thisBinding, args);\n  }\n  return wrapper;\n}\n\nmodule.exports = createHybridWrapper;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZUh5YnJpZFdyYXBwZXIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYXJyYXlDb3B5ID0gcmVxdWlyZSgnLi9hcnJheUNvcHknKSxcbiAgICBjb21wb3NlQXJncyA9IHJlcXVpcmUoJy4vY29tcG9zZUFyZ3MnKSxcbiAgICBjb21wb3NlQXJnc1JpZ2h0ID0gcmVxdWlyZSgnLi9jb21wb3NlQXJnc1JpZ2h0JyksXG4gICAgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyksXG4gICAgaXNMYXppYWJsZSA9IHJlcXVpcmUoJy4vaXNMYXppYWJsZScpLFxuICAgIHJlb3JkZXIgPSByZXF1aXJlKCcuL3Jlb3JkZXInKSxcbiAgICByZXBsYWNlSG9sZGVycyA9IHJlcXVpcmUoJy4vcmVwbGFjZUhvbGRlcnMnKSxcbiAgICBzZXREYXRhID0gcmVxdWlyZSgnLi9zZXREYXRhJyk7XG5cbi8qKiBVc2VkIHRvIGNvbXBvc2UgYml0bWFza3MgZm9yIHdyYXBwZXIgbWV0YWRhdGEuICovXG52YXIgQklORF9GTEFHID0gMSxcbiAgICBCSU5EX0tFWV9GTEFHID0gMixcbiAgICBDVVJSWV9CT1VORF9GTEFHID0gNCxcbiAgICBDVVJSWV9GTEFHID0gOCxcbiAgICBDVVJSWV9SSUdIVF9GTEFHID0gMTYsXG4gICAgUEFSVElBTF9GTEFHID0gMzIsXG4gICAgUEFSVElBTF9SSUdIVF9GTEFHID0gNjQsXG4gICAgQVJZX0ZMQUcgPSAxMjg7XG5cbi8qIE5hdGl2ZSBtZXRob2QgcmVmZXJlbmNlcyBmb3IgdGhvc2Ugd2l0aCB0aGUgc2FtZSBuYW1lIGFzIG90aGVyIGBsb2Rhc2hgIG1ldGhvZHMuICovXG52YXIgbmF0aXZlTWF4ID0gTWF0aC5tYXg7XG5cbi8qKlxuICogQ3JlYXRlcyBhIGZ1bmN0aW9uIHRoYXQgd3JhcHMgYGZ1bmNgIGFuZCBpbnZva2VzIGl0IHdpdGggb3B0aW9uYWwgYHRoaXNgXG4gKiBiaW5kaW5nIG9mLCBwYXJ0aWFsIGFwcGxpY2F0aW9uLCBhbmQgY3VycnlpbmcuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7RnVuY3Rpb258c3RyaW5nfSBmdW5jIFRoZSBmdW5jdGlvbiBvciBtZXRob2QgbmFtZSB0byByZWZlcmVuY2UuXG4gKiBAcGFyYW0ge251bWJlcn0gYml0bWFzayBUaGUgYml0bWFzayBvZiBmbGFncy4gU2VlIGBjcmVhdGVXcmFwcGVyYCBmb3IgbW9yZSBkZXRhaWxzLlxuICogQHBhcmFtIHsqfSBbdGhpc0FyZ10gVGhlIGB0aGlzYCBiaW5kaW5nIG9mIGBmdW5jYC5cbiAqIEBwYXJhbSB7QXJyYXl9IFtwYXJ0aWFsc10gVGhlIGFyZ3VtZW50cyB0byBwcmVwZW5kIHRvIHRob3NlIHByb3ZpZGVkIHRvIHRoZSBuZXcgZnVuY3Rpb24uXG4gKiBAcGFyYW0ge0FycmF5fSBbaG9sZGVyc10gVGhlIGBwYXJ0aWFsc2AgcGxhY2Vob2xkZXIgaW5kZXhlcy5cbiAqIEBwYXJhbSB7QXJyYXl9IFtwYXJ0aWFsc1JpZ2h0XSBUaGUgYXJndW1lbnRzIHRvIGFwcGVuZCB0byB0aG9zZSBwcm92aWRlZCB0byB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHBhcmFtIHtBcnJheX0gW2hvbGRlcnNSaWdodF0gVGhlIGBwYXJ0aWFsc1JpZ2h0YCBwbGFjZWhvbGRlciBpbmRleGVzLlxuICogQHBhcmFtIHtBcnJheX0gW2FyZ1Bvc10gVGhlIGFyZ3VtZW50IHBvc2l0aW9ucyBvZiB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHBhcmFtIHtudW1iZXJ9IFthcnldIFRoZSBhcml0eSBjYXAgb2YgYGZ1bmNgLlxuICogQHBhcmFtIHtudW1iZXJ9IFthcml0eV0gVGhlIGFyaXR5IG9mIGBmdW5jYC5cbiAqIEByZXR1cm5zIHtGdW5jdGlvbn0gUmV0dXJucyB0aGUgbmV3IHdyYXBwZWQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZUh5YnJpZFdyYXBwZXIoZnVuYywgYml0bWFzaywgdGhpc0FyZywgcGFydGlhbHMsIGhvbGRlcnMsIHBhcnRpYWxzUmlnaHQsIGhvbGRlcnNSaWdodCwgYXJnUG9zLCBhcnksIGFyaXR5KSB7XG4gIHZhciBpc0FyeSA9IGJpdG1hc2sgJiBBUllfRkxBRyxcbiAgICAgIGlzQmluZCA9IGJpdG1hc2sgJiBCSU5EX0ZMQUcsXG4gICAgICBpc0JpbmRLZXkgPSBiaXRtYXNrICYgQklORF9LRVlfRkxBRyxcbiAgICAgIGlzQ3VycnkgPSBiaXRtYXNrICYgQ1VSUllfRkxBRyxcbiAgICAgIGlzQ3VycnlCb3VuZCA9IGJpdG1hc2sgJiBDVVJSWV9CT1VORF9GTEFHLFxuICAgICAgaXNDdXJyeVJpZ2h0ID0gYml0bWFzayAmIENVUlJZX1JJR0hUX0ZMQUcsXG4gICAgICBDdG9yID0gaXNCaW5kS2V5ID8gdW5kZWZpbmVkIDogY3JlYXRlQ3RvcldyYXBwZXIoZnVuYyk7XG5cbiAgZnVuY3Rpb24gd3JhcHBlcigpIHtcbiAgICAvLyBBdm9pZCBgYXJndW1lbnRzYCBvYmplY3QgdXNlIGRpc3F1YWxpZnlpbmcgb3B0aW1pemF0aW9ucyBieVxuICAgIC8vIGNvbnZlcnRpbmcgaXQgdG8gYW4gYXJyYXkgYmVmb3JlIHByb3ZpZGluZyBpdCB0byBvdGhlciBmdW5jdGlvbnMuXG4gICAgdmFyIGxlbmd0aCA9IGFyZ3VtZW50cy5sZW5ndGgsXG4gICAgICAgIGluZGV4ID0gbGVuZ3RoLFxuICAgICAgICBhcmdzID0gQXJyYXkobGVuZ3RoKTtcblxuICAgIHdoaWxlIChpbmRleC0tKSB7XG4gICAgICBhcmdzW2luZGV4XSA9IGFyZ3VtZW50c1tpbmRleF07XG4gICAgfVxuICAgIGlmIChwYXJ0aWFscykge1xuICAgICAgYXJncyA9IGNvbXBvc2VBcmdzKGFyZ3MsIHBhcnRpYWxzLCBob2xkZXJzKTtcbiAgICB9XG4gICAgaWYgKHBhcnRpYWxzUmlnaHQpIHtcbiAgICAgIGFyZ3MgPSBjb21wb3NlQXJnc1JpZ2h0KGFyZ3MsIHBhcnRpYWxzUmlnaHQsIGhvbGRlcnNSaWdodCk7XG4gICAgfVxuICAgIGlmIChpc0N1cnJ5IHx8IGlzQ3VycnlSaWdodCkge1xuICAgICAgdmFyIHBsYWNlaG9sZGVyID0gd3JhcHBlci5wbGFjZWhvbGRlcixcbiAgICAgICAgICBhcmdzSG9sZGVycyA9IHJlcGxhY2VIb2xkZXJzKGFyZ3MsIHBsYWNlaG9sZGVyKTtcblxuICAgICAgbGVuZ3RoIC09IGFyZ3NIb2xkZXJzLmxlbmd0aDtcbiAgICAgIGlmIChsZW5ndGggPCBhcml0eSkge1xuICAgICAgICB2YXIgbmV3QXJnUG9zID0gYXJnUG9zID8gYXJyYXlDb3B5KGFyZ1BvcykgOiB1bmRlZmluZWQsXG4gICAgICAgICAgICBuZXdBcml0eSA9IG5hdGl2ZU1heChhcml0eSAtIGxlbmd0aCwgMCksXG4gICAgICAgICAgICBuZXdzSG9sZGVycyA9IGlzQ3VycnkgPyBhcmdzSG9sZGVycyA6IHVuZGVmaW5lZCxcbiAgICAgICAgICAgIG5ld0hvbGRlcnNSaWdodCA9IGlzQ3VycnkgPyB1bmRlZmluZWQgOiBhcmdzSG9sZGVycyxcbiAgICAgICAgICAgIG5ld1BhcnRpYWxzID0gaXNDdXJyeSA/IGFyZ3MgOiB1bmRlZmluZWQsXG4gICAgICAgICAgICBuZXdQYXJ0aWFsc1JpZ2h0ID0gaXNDdXJyeSA/IHVuZGVmaW5lZCA6IGFyZ3M7XG5cbiAgICAgICAgYml0bWFzayB8PSAoaXNDdXJyeSA/IFBBUlRJQUxfRkxBRyA6IFBBUlRJQUxfUklHSFRfRkxBRyk7XG4gICAgICAgIGJpdG1hc2sgJj0gfihpc0N1cnJ5ID8gUEFSVElBTF9SSUdIVF9GTEFHIDogUEFSVElBTF9GTEFHKTtcblxuICAgICAgICBpZiAoIWlzQ3VycnlCb3VuZCkge1xuICAgICAgICAgIGJpdG1hc2sgJj0gfihCSU5EX0ZMQUcgfCBCSU5EX0tFWV9GTEFHKTtcbiAgICAgICAgfVxuICAgICAgICB2YXIgbmV3RGF0YSA9IFtmdW5jLCBiaXRtYXNrLCB0aGlzQXJnLCBuZXdQYXJ0aWFscywgbmV3c0hvbGRlcnMsIG5ld1BhcnRpYWxzUmlnaHQsIG5ld0hvbGRlcnNSaWdodCwgbmV3QXJnUG9zLCBhcnksIG5ld0FyaXR5XSxcbiAgICAgICAgICAgIHJlc3VsdCA9IGNyZWF0ZUh5YnJpZFdyYXBwZXIuYXBwbHkodW5kZWZpbmVkLCBuZXdEYXRhKTtcblxuICAgICAgICBpZiAoaXNMYXppYWJsZShmdW5jKSkge1xuICAgICAgICAgIHNldERhdGEocmVzdWx0LCBuZXdEYXRhKTtcbiAgICAgICAgfVxuICAgICAgICByZXN1bHQucGxhY2Vob2xkZXIgPSBwbGFjZWhvbGRlcjtcbiAgICAgICAgcmV0dXJuIHJlc3VsdDtcbiAgICAgIH1cbiAgICB9XG4gICAgdmFyIHRoaXNCaW5kaW5nID0gaXNCaW5kID8gdGhpc0FyZyA6IHRoaXMsXG4gICAgICAgIGZuID0gaXNCaW5kS2V5ID8gdGhpc0JpbmRpbmdbZnVuY10gOiBmdW5jO1xuXG4gICAgaWYgKGFyZ1Bvcykge1xuICAgICAgYXJncyA9IHJlb3JkZXIoYXJncywgYXJnUG9zKTtcbiAgICB9XG4gICAgaWYgKGlzQXJ5ICYmIGFyeSA8IGFyZ3MubGVuZ3RoKSB7XG4gICAgICBhcmdzLmxlbmd0aCA9IGFyeTtcbiAgICB9XG4gICAgaWYgKHRoaXMgJiYgdGhpcyAhPT0gZ2xvYmFsICYmIHRoaXMgaW5zdGFuY2VvZiB3cmFwcGVyKSB7XG4gICAgICBmbiA9IEN0b3IgfHwgY3JlYXRlQ3RvcldyYXBwZXIoZnVuYyk7XG4gICAgfVxuICAgIHJldHVybiBmbi5hcHBseSh0aGlzQmluZGluZywgYXJncyk7XG4gIH1cbiAgcmV0dXJuIHdyYXBwZXI7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gY3JlYXRlSHlicmlkV3JhcHBlcjtcbiJdfQ==","(function (global){\nvar createCtorWrapper = require('./createCtorWrapper');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1;\n\n/**\n * Creates a function that wraps `func` and invokes it with the optional `this`\n * binding of `thisArg` and the `partials` prepended to those provided to\n * the wrapper.\n *\n * @private\n * @param {Function} func The function to partially apply arguments to.\n * @param {number} bitmask The bitmask of flags. See `createWrapper` for more details.\n * @param {*} thisArg The `this` binding of `func`.\n * @param {Array} partials The arguments to prepend to those provided to the new function.\n * @returns {Function} Returns the new bound function.\n */\nfunction createPartialWrapper(func, bitmask, thisArg, partials) {\n  var isBind = bitmask & BIND_FLAG,\n      Ctor = createCtorWrapper(func);\n\n  function wrapper() {\n    // Avoid `arguments` object use disqualifying optimizations by\n    // converting it to an array before providing it `func`.\n    var argsIndex = -1,\n        argsLength = arguments.length,\n        leftIndex = -1,\n        leftLength = partials.length,\n        args = Array(leftLength + argsLength);\n\n    while (++leftIndex < leftLength) {\n      args[leftIndex] = partials[leftIndex];\n    }\n    while (argsLength--) {\n      args[leftIndex++] = arguments[++argsIndex];\n    }\n    var fn = (this && this !== global && this instanceof wrapper) ? Ctor : func;\n    return fn.apply(isBind ? thisArg : this, args);\n  }\n  return wrapper;\n}\n\nmodule.exports = createPartialWrapper;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZVBhcnRpYWxXcmFwcGVyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyk7XG5cbi8qKiBVc2VkIHRvIGNvbXBvc2UgYml0bWFza3MgZm9yIHdyYXBwZXIgbWV0YWRhdGEuICovXG52YXIgQklORF9GTEFHID0gMTtcblxuLyoqXG4gKiBDcmVhdGVzIGEgZnVuY3Rpb24gdGhhdCB3cmFwcyBgZnVuY2AgYW5kIGludm9rZXMgaXQgd2l0aCB0aGUgb3B0aW9uYWwgYHRoaXNgXG4gKiBiaW5kaW5nIG9mIGB0aGlzQXJnYCBhbmQgdGhlIGBwYXJ0aWFsc2AgcHJlcGVuZGVkIHRvIHRob3NlIHByb3ZpZGVkIHRvXG4gKiB0aGUgd3JhcHBlci5cbiAqXG4gKiBAcHJpdmF0ZVxuICogQHBhcmFtIHtGdW5jdGlvbn0gZnVuYyBUaGUgZnVuY3Rpb24gdG8gcGFydGlhbGx5IGFwcGx5IGFyZ3VtZW50cyB0by5cbiAqIEBwYXJhbSB7bnVtYmVyfSBiaXRtYXNrIFRoZSBiaXRtYXNrIG9mIGZsYWdzLiBTZWUgYGNyZWF0ZVdyYXBwZXJgIGZvciBtb3JlIGRldGFpbHMuXG4gKiBAcGFyYW0geyp9IHRoaXNBcmcgVGhlIGB0aGlzYCBiaW5kaW5nIG9mIGBmdW5jYC5cbiAqIEBwYXJhbSB7QXJyYXl9IHBhcnRpYWxzIFRoZSBhcmd1bWVudHMgdG8gcHJlcGVuZCB0byB0aG9zZSBwcm92aWRlZCB0byB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHJldHVybnMge0Z1bmN0aW9ufSBSZXR1cm5zIHRoZSBuZXcgYm91bmQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZVBhcnRpYWxXcmFwcGVyKGZ1bmMsIGJpdG1hc2ssIHRoaXNBcmcsIHBhcnRpYWxzKSB7XG4gIHZhciBpc0JpbmQgPSBiaXRtYXNrICYgQklORF9GTEFHLFxuICAgICAgQ3RvciA9IGNyZWF0ZUN0b3JXcmFwcGVyKGZ1bmMpO1xuXG4gIGZ1bmN0aW9uIHdyYXBwZXIoKSB7XG4gICAgLy8gQXZvaWQgYGFyZ3VtZW50c2Agb2JqZWN0IHVzZSBkaXNxdWFsaWZ5aW5nIG9wdGltaXphdGlvbnMgYnlcbiAgICAvLyBjb252ZXJ0aW5nIGl0IHRvIGFuIGFycmF5IGJlZm9yZSBwcm92aWRpbmcgaXQgYGZ1bmNgLlxuICAgIHZhciBhcmdzSW5kZXggPSAtMSxcbiAgICAgICAgYXJnc0xlbmd0aCA9IGFyZ3VtZW50cy5sZW5ndGgsXG4gICAgICAgIGxlZnRJbmRleCA9IC0xLFxuICAgICAgICBsZWZ0TGVuZ3RoID0gcGFydGlhbHMubGVuZ3RoLFxuICAgICAgICBhcmdzID0gQXJyYXkobGVmdExlbmd0aCArIGFyZ3NMZW5ndGgpO1xuXG4gICAgd2hpbGUgKCsrbGVmdEluZGV4IDwgbGVmdExlbmd0aCkge1xuICAgICAgYXJnc1tsZWZ0SW5kZXhdID0gcGFydGlhbHNbbGVmdEluZGV4XTtcbiAgICB9XG4gICAgd2hpbGUgKGFyZ3NMZW5ndGgtLSkge1xuICAgICAgYXJnc1tsZWZ0SW5kZXgrK10gPSBhcmd1bWVudHNbKythcmdzSW5kZXhdO1xuICAgIH1cbiAgICB2YXIgZm4gPSAodGhpcyAmJiB0aGlzICE9PSBnbG9iYWwgJiYgdGhpcyBpbnN0YW5jZW9mIHdyYXBwZXIpID8gQ3RvciA6IGZ1bmM7XG4gICAgcmV0dXJuIGZuLmFwcGx5KGlzQmluZCA/IHRoaXNBcmcgOiB0aGlzLCBhcmdzKTtcbiAgfVxuICByZXR1cm4gd3JhcHBlcjtcbn1cblxubW9kdWxlLmV4cG9ydHMgPSBjcmVhdGVQYXJ0aWFsV3JhcHBlcjtcbiJdfQ==","var baseSetData = require('./baseSetData'),\n    createBindWrapper = require('./createBindWrapper'),\n    createHybridWrapper = require('./createHybridWrapper'),\n    createPartialWrapper = require('./createPartialWrapper'),\n    getData = require('./getData'),\n    mergeData = require('./mergeData'),\n    setData = require('./setData');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    BIND_KEY_FLAG = 2,\n    PARTIAL_FLAG = 32,\n    PARTIAL_RIGHT_FLAG = 64;\n\n/** Used as the `TypeError` message for \"Functions\" methods. */\nvar FUNC_ERROR_TEXT = 'Expected a function';\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates a function that either curries or invokes `func` with optional\n * `this` binding and partially applied arguments.\n *\n * @private\n * @param {Function|string} func The function or method name to reference.\n * @param {number} bitmask The bitmask of flags.\n *  The bitmask may be composed of the following flags:\n *     1 - `_.bind`\n *     2 - `_.bindKey`\n *     4 - `_.curry` or `_.curryRight` of a bound function\n *     8 - `_.curry`\n *    16 - `_.curryRight`\n *    32 - `_.partial`\n *    64 - `_.partialRight`\n *   128 - `_.rearg`\n *   256 - `_.ary`\n * @param {*} [thisArg] The `this` binding of `func`.\n * @param {Array} [partials] The arguments to be partially applied.\n * @param {Array} [holders] The `partials` placeholder indexes.\n * @param {Array} [argPos] The argument positions of the new function.\n * @param {number} [ary] The arity cap of `func`.\n * @param {number} [arity] The arity of `func`.\n * @returns {Function} Returns the new wrapped function.\n */\nfunction createWrapper(func, bitmask, thisArg, partials, holders, argPos, ary, arity) {\n  var isBindKey = bitmask & BIND_KEY_FLAG;\n  if (!isBindKey && typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  var length = partials ? partials.length : 0;\n  if (!length) {\n    bitmask &= ~(PARTIAL_FLAG | PARTIAL_RIGHT_FLAG);\n    partials = holders = undefined;\n  }\n  length -= (holders ? holders.length : 0);\n  if (bitmask & PARTIAL_RIGHT_FLAG) {\n    var partialsRight = partials,\n        holdersRight = holders;\n\n    partials = holders = undefined;\n  }\n  var data = isBindKey ? undefined : getData(func),\n      newData = [func, bitmask, thisArg, partials, holders, partialsRight, holdersRight, argPos, ary, arity];\n\n  if (data) {\n    mergeData(newData, data);\n    bitmask = newData[1];\n    arity = newData[9];\n  }\n  newData[9] = arity == null\n    ? (isBindKey ? 0 : func.length)\n    : (nativeMax(arity - length, 0) || 0);\n\n  if (bitmask == BIND_FLAG) {\n    var result = createBindWrapper(newData[0], newData[2]);\n  } else if ((bitmask == PARTIAL_FLAG || bitmask == (BIND_FLAG | PARTIAL_FLAG)) && !newData[4].length) {\n    result = createPartialWrapper.apply(undefined, newData);\n  } else {\n    result = createHybridWrapper.apply(undefined, newData);\n  }\n  var setter = data ? baseSetData : setData;\n  return setter(result, newData);\n}\n\nmodule.exports = createWrapper;\n","var arraySome = require('./arraySome');\n\n/**\n * A specialized version of `baseIsEqualDeep` for arrays with support for\n * partial deep comparisons.\n *\n * @private\n * @param {Array} array The array to compare.\n * @param {Array} other The other array to compare.\n * @param {Function} equalFunc The function to determine equivalents of values.\n * @param {Function} [customizer] The function to customize comparing arrays.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA] Tracks traversed `value` objects.\n * @param {Array} [stackB] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the arrays are equivalent, else `false`.\n */\nfunction equalArrays(array, other, equalFunc, customizer, isLoose, stackA, stackB) {\n  var index = -1,\n      arrLength = array.length,\n      othLength = other.length;\n\n  if (arrLength != othLength && !(isLoose && othLength > arrLength)) {\n    return false;\n  }\n  // Ignore non-index properties.\n  while (++index < arrLength) {\n    var arrValue = array[index],\n        othValue = other[index],\n        result = customizer ? customizer(isLoose ? othValue : arrValue, isLoose ? arrValue : othValue, index) : undefined;\n\n    if (result !== undefined) {\n      if (result) {\n        continue;\n      }\n      return false;\n    }\n    // Recursively compare arrays (susceptible to call stack limits).\n    if (isLoose) {\n      if (!arraySome(other, function(othValue) {\n            return arrValue === othValue || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB);\n          })) {\n        return false;\n      }\n    } else if (!(arrValue === othValue || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB))) {\n      return false;\n    }\n  }\n  return true;\n}\n\nmodule.exports = equalArrays;\n","/** `Object#toString` result references. */\nvar boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    numberTag = '[object Number]',\n    regexpTag = '[object RegExp]',\n    stringTag = '[object String]';\n\n/**\n * A specialized version of `baseIsEqualDeep` for comparing objects of\n * the same `toStringTag`.\n *\n * **Note:** This function only supports comparing values with tags of\n * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.\n *\n * @private\n * @param {Object} object The object to compare.\n * @param {Object} other The other object to compare.\n * @param {string} tag The `toStringTag` of the objects to compare.\n * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.\n */\nfunction equalByTag(object, other, tag) {\n  switch (tag) {\n    case boolTag:\n    case dateTag:\n      // Coerce dates and booleans to numbers, dates to milliseconds and booleans\n      // to `1` or `0` treating invalid dates coerced to `NaN` as not equal.\n      return +object == +other;\n\n    case errorTag:\n      return object.name == other.name && object.message == other.message;\n\n    case numberTag:\n      // Treat `NaN` vs. `NaN` as equal.\n      return (object != +object)\n        ? other != +other\n        : object == +other;\n\n    case regexpTag:\n    case stringTag:\n      // Coerce regexes to strings and treat strings primitives and string\n      // objects as equal. See https://es5.github.io/#x15.10.6.4 for more details.\n      return object == (other + '');\n  }\n  return false;\n}\n\nmodule.exports = equalByTag;\n","var keys = require('../object/keys');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * A specialized version of `baseIsEqualDeep` for objects with support for\n * partial deep comparisons.\n *\n * @private\n * @param {Object} object The object to compare.\n * @param {Object} other The other object to compare.\n * @param {Function} equalFunc The function to determine equivalents of values.\n * @param {Function} [customizer] The function to customize comparing values.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA] Tracks traversed `value` objects.\n * @param {Array} [stackB] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.\n */\nfunction equalObjects(object, other, equalFunc, customizer, isLoose, stackA, stackB) {\n  var objProps = keys(object),\n      objLength = objProps.length,\n      othProps = keys(other),\n      othLength = othProps.length;\n\n  if (objLength != othLength && !isLoose) {\n    return false;\n  }\n  var index = objLength;\n  while (index--) {\n    var key = objProps[index];\n    if (!(isLoose ? key in other : hasOwnProperty.call(other, key))) {\n      return false;\n    }\n  }\n  var skipCtor = isLoose;\n  while (++index < objLength) {\n    key = objProps[index];\n    var objValue = object[key],\n        othValue = other[key],\n        result = customizer ? customizer(isLoose ? othValue : objValue, isLoose? objValue : othValue, key) : undefined;\n\n    // Recursively compare objects (susceptible to call stack limits).\n    if (!(result === undefined ? equalFunc(objValue, othValue, customizer, isLoose, stackA, stackB) : result)) {\n      return false;\n    }\n    skipCtor || (skipCtor = key == 'constructor');\n  }\n  if (!skipCtor) {\n    var objCtor = object.constructor,\n        othCtor = other.constructor;\n\n    // Non `Object` object instances with different constructors are not equal.\n    if (objCtor != othCtor &&\n        ('constructor' in object && 'constructor' in other) &&\n        !(typeof objCtor == 'function' && objCtor instanceof objCtor &&\n          typeof othCtor == 'function' && othCtor instanceof othCtor)) {\n      return false;\n    }\n  }\n  return true;\n}\n\nmodule.exports = equalObjects;\n","var metaMap = require('./metaMap'),\n    noop = require('../utility/noop');\n\n/**\n * Gets metadata for `func`.\n *\n * @private\n * @param {Function} func The function to query.\n * @returns {*} Returns the metadata for `func`.\n */\nvar getData = !metaMap ? noop : function(func) {\n  return metaMap.get(func);\n};\n\nmodule.exports = getData;\n","var realNames = require('./realNames');\n\n/**\n * Gets the name of `func`.\n *\n * @private\n * @param {Function} func The function to query.\n * @returns {string} Returns the function name.\n */\nfunction getFuncName(func) {\n  var result = (func.name + ''),\n      array = realNames[result],\n      length = array ? array.length : 0;\n\n  while (length--) {\n    var data = array[length],\n        otherFunc = data.func;\n    if (otherFunc == null || otherFunc == func) {\n      return data.name;\n    }\n  }\n  return result;\n}\n\nmodule.exports = getFuncName;\n","var baseProperty = require('./baseProperty');\n\n/**\n * Gets the \"length\" property value of `object`.\n *\n * **Note:** This function is used to avoid a [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792)\n * that affects Safari on at least iOS 8.1-8.3 ARM64.\n *\n * @private\n * @param {Object} object The object to query.\n * @returns {*} Returns the \"length\" value.\n */\nvar getLength = baseProperty('length');\n\nmodule.exports = getLength;\n","var isStrictComparable = require('./isStrictComparable'),\n    pairs = require('../object/pairs');\n\n/**\n * Gets the propery names, values, and compare flags of `object`.\n *\n * @private\n * @param {Object} object The object to query.\n * @returns {Array} Returns the match data of `object`.\n */\nfunction getMatchData(object) {\n  var result = pairs(object),\n      length = result.length;\n\n  while (length--) {\n    result[length][2] = isStrictComparable(result[length][1]);\n  }\n  return result;\n}\n\nmodule.exports = getMatchData;\n","var isNative = require('../lang/isNative');\n\n/**\n * Gets the native function at `key` of `object`.\n *\n * @private\n * @param {Object} object The object to query.\n * @param {string} key The key of the method to get.\n * @returns {*} Returns the function if it's native, else `undefined`.\n */\nfunction getNative(object, key) {\n  var value = object == null ? undefined : object[key];\n  return isNative(value) ? value : undefined;\n}\n\nmodule.exports = getNative;\n","/**\n * Gets the index at which the first occurrence of `NaN` is found in `array`.\n *\n * @private\n * @param {Array} array The array to search.\n * @param {number} fromIndex The index to search from.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {number} Returns the index of the matched `NaN`, else `-1`.\n */\nfunction indexOfNaN(array, fromIndex, fromRight) {\n  var length = array.length,\n      index = fromIndex + (fromRight ? 0 : -1);\n\n  while ((fromRight ? index-- : ++index < length)) {\n    var other = array[index];\n    if (other !== other) {\n      return index;\n    }\n  }\n  return -1;\n}\n\nmodule.exports = indexOfNaN;\n","/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Initializes an array clone.\n *\n * @private\n * @param {Array} array The array to clone.\n * @returns {Array} Returns the initialized clone.\n */\nfunction initCloneArray(array) {\n  var length = array.length,\n      result = new array.constructor(length);\n\n  // Add array properties assigned by `RegExp#exec`.\n  if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {\n    result.index = array.index;\n    result.input = array.input;\n  }\n  return result;\n}\n\nmodule.exports = initCloneArray;\n","(function (global){\nvar bufferClone = require('./bufferClone');\n\n/** `Object#toString` result references. */\nvar boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    numberTag = '[object Number]',\n    regexpTag = '[object RegExp]',\n    stringTag = '[object String]';\n\nvar arrayBufferTag = '[object ArrayBuffer]',\n    float32Tag = '[object Float32Array]',\n    float64Tag = '[object Float64Array]',\n    int8Tag = '[object Int8Array]',\n    int16Tag = '[object Int16Array]',\n    int32Tag = '[object Int32Array]',\n    uint8Tag = '[object Uint8Array]',\n    uint8ClampedTag = '[object Uint8ClampedArray]',\n    uint16Tag = '[object Uint16Array]',\n    uint32Tag = '[object Uint32Array]';\n\n/** Used to match `RegExp` flags from their coerced string values. */\nvar reFlags = /\\w*$/;\n\n/** Native method references. */\nvar Uint8Array = global.Uint8Array;\n\n/** Used to lookup a type array constructors by `toStringTag`. */\nvar ctorByTag = {};\nctorByTag[float32Tag] = global.Float32Array;\nctorByTag[float64Tag] = global.Float64Array;\nctorByTag[int8Tag] = global.Int8Array;\nctorByTag[int16Tag] = global.Int16Array;\nctorByTag[int32Tag] = global.Int32Array;\nctorByTag[uint8Tag] = Uint8Array;\nctorByTag[uint8ClampedTag] = global.Uint8ClampedArray;\nctorByTag[uint16Tag] = global.Uint16Array;\nctorByTag[uint32Tag] = global.Uint32Array;\n\n/**\n * Initializes an object clone based on its `toStringTag`.\n *\n * **Note:** This function only supports cloning values with tags of\n * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.\n *\n * @private\n * @param {Object} object The object to clone.\n * @param {string} tag The `toStringTag` of the object to clone.\n * @param {boolean} [isDeep] Specify a deep clone.\n * @returns {Object} Returns the initialized clone.\n */\nfunction initCloneByTag(object, tag, isDeep) {\n  var Ctor = object.constructor;\n  switch (tag) {\n    case arrayBufferTag:\n      return bufferClone(object);\n\n    case boolTag:\n    case dateTag:\n      return new Ctor(+object);\n\n    case float32Tag: case float64Tag:\n    case int8Tag: case int16Tag: case int32Tag:\n    case uint8Tag: case uint8ClampedTag: case uint16Tag: case uint32Tag:\n      // Safari 5 mobile incorrectly has `Object` as the constructor of typed arrays.\n      if (Ctor instanceof Ctor) {\n        Ctor = ctorByTag[tag];\n      }\n      var buffer = object.buffer;\n      return new Ctor(isDeep ? bufferClone(buffer) : buffer, object.byteOffset, object.length);\n\n    case numberTag:\n    case stringTag:\n      return new Ctor(object);\n\n    case regexpTag:\n      var result = new Ctor(object.source, reFlags.exec(object));\n      result.lastIndex = object.lastIndex;\n  }\n  return result;\n}\n\nmodule.exports = initCloneByTag;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2luaXRDbG9uZUJ5VGFnLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYnVmZmVyQ2xvbmUgPSByZXF1aXJlKCcuL2J1ZmZlckNsb25lJyk7XG5cbi8qKiBgT2JqZWN0I3RvU3RyaW5nYCByZXN1bHQgcmVmZXJlbmNlcy4gKi9cbnZhciBib29sVGFnID0gJ1tvYmplY3QgQm9vbGVhbl0nLFxuICAgIGRhdGVUYWcgPSAnW29iamVjdCBEYXRlXScsXG4gICAgbnVtYmVyVGFnID0gJ1tvYmplY3QgTnVtYmVyXScsXG4gICAgcmVnZXhwVGFnID0gJ1tvYmplY3QgUmVnRXhwXScsXG4gICAgc3RyaW5nVGFnID0gJ1tvYmplY3QgU3RyaW5nXSc7XG5cbnZhciBhcnJheUJ1ZmZlclRhZyA9ICdbb2JqZWN0IEFycmF5QnVmZmVyXScsXG4gICAgZmxvYXQzMlRhZyA9ICdbb2JqZWN0IEZsb2F0MzJBcnJheV0nLFxuICAgIGZsb2F0NjRUYWcgPSAnW29iamVjdCBGbG9hdDY0QXJyYXldJyxcbiAgICBpbnQ4VGFnID0gJ1tvYmplY3QgSW50OEFycmF5XScsXG4gICAgaW50MTZUYWcgPSAnW29iamVjdCBJbnQxNkFycmF5XScsXG4gICAgaW50MzJUYWcgPSAnW29iamVjdCBJbnQzMkFycmF5XScsXG4gICAgdWludDhUYWcgPSAnW29iamVjdCBVaW50OEFycmF5XScsXG4gICAgdWludDhDbGFtcGVkVGFnID0gJ1tvYmplY3QgVWludDhDbGFtcGVkQXJyYXldJyxcbiAgICB1aW50MTZUYWcgPSAnW29iamVjdCBVaW50MTZBcnJheV0nLFxuICAgIHVpbnQzMlRhZyA9ICdbb2JqZWN0IFVpbnQzMkFycmF5XSc7XG5cbi8qKiBVc2VkIHRvIG1hdGNoIGBSZWdFeHBgIGZsYWdzIGZyb20gdGhlaXIgY29lcmNlZCBzdHJpbmcgdmFsdWVzLiAqL1xudmFyIHJlRmxhZ3MgPSAvXFx3KiQvO1xuXG4vKiogTmF0aXZlIG1ldGhvZCByZWZlcmVuY2VzLiAqL1xudmFyIFVpbnQ4QXJyYXkgPSBnbG9iYWwuVWludDhBcnJheTtcblxuLyoqIFVzZWQgdG8gbG9va3VwIGEgdHlwZSBhcnJheSBjb25zdHJ1Y3RvcnMgYnkgYHRvU3RyaW5nVGFnYC4gKi9cbnZhciBjdG9yQnlUYWcgPSB7fTtcbmN0b3JCeVRhZ1tmbG9hdDMyVGFnXSA9IGdsb2JhbC5GbG9hdDMyQXJyYXk7XG5jdG9yQnlUYWdbZmxvYXQ2NFRhZ10gPSBnbG9iYWwuRmxvYXQ2NEFycmF5O1xuY3RvckJ5VGFnW2ludDhUYWddID0gZ2xvYmFsLkludDhBcnJheTtcbmN0b3JCeVRhZ1tpbnQxNlRhZ10gPSBnbG9iYWwuSW50MTZBcnJheTtcbmN0b3JCeVRhZ1tpbnQzMlRhZ10gPSBnbG9iYWwuSW50MzJBcnJheTtcbmN0b3JCeVRhZ1t1aW50OFRhZ10gPSBVaW50OEFycmF5O1xuY3RvckJ5VGFnW3VpbnQ4Q2xhbXBlZFRhZ10gPSBnbG9iYWwuVWludDhDbGFtcGVkQXJyYXk7XG5jdG9yQnlUYWdbdWludDE2VGFnXSA9IGdsb2JhbC5VaW50MTZBcnJheTtcbmN0b3JCeVRhZ1t1aW50MzJUYWddID0gZ2xvYmFsLlVpbnQzMkFycmF5O1xuXG4vKipcbiAqIEluaXRpYWxpemVzIGFuIG9iamVjdCBjbG9uZSBiYXNlZCBvbiBpdHMgYHRvU3RyaW5nVGFnYC5cbiAqXG4gKiAqKk5vdGU6KiogVGhpcyBmdW5jdGlvbiBvbmx5IHN1cHBvcnRzIGNsb25pbmcgdmFsdWVzIHdpdGggdGFncyBvZlxuICogYEJvb2xlYW5gLCBgRGF0ZWAsIGBFcnJvcmAsIGBOdW1iZXJgLCBgUmVnRXhwYCwgb3IgYFN0cmluZ2AuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7T2JqZWN0fSBvYmplY3QgVGhlIG9iamVjdCB0byBjbG9uZS5cbiAqIEBwYXJhbSB7c3RyaW5nfSB0YWcgVGhlIGB0b1N0cmluZ1RhZ2Agb2YgdGhlIG9iamVjdCB0byBjbG9uZS5cbiAqIEBwYXJhbSB7Ym9vbGVhbn0gW2lzRGVlcF0gU3BlY2lmeSBhIGRlZXAgY2xvbmUuXG4gKiBAcmV0dXJucyB7T2JqZWN0fSBSZXR1cm5zIHRoZSBpbml0aWFsaXplZCBjbG9uZS5cbiAqL1xuZnVuY3Rpb24gaW5pdENsb25lQnlUYWcob2JqZWN0LCB0YWcsIGlzRGVlcCkge1xuICB2YXIgQ3RvciA9IG9iamVjdC5jb25zdHJ1Y3RvcjtcbiAgc3dpdGNoICh0YWcpIHtcbiAgICBjYXNlIGFycmF5QnVmZmVyVGFnOlxuICAgICAgcmV0dXJuIGJ1ZmZlckNsb25lKG9iamVjdCk7XG5cbiAgICBjYXNlIGJvb2xUYWc6XG4gICAgY2FzZSBkYXRlVGFnOlxuICAgICAgcmV0dXJuIG5ldyBDdG9yKCtvYmplY3QpO1xuXG4gICAgY2FzZSBmbG9hdDMyVGFnOiBjYXNlIGZsb2F0NjRUYWc6XG4gICAgY2FzZSBpbnQ4VGFnOiBjYXNlIGludDE2VGFnOiBjYXNlIGludDMyVGFnOlxuICAgIGNhc2UgdWludDhUYWc6IGNhc2UgdWludDhDbGFtcGVkVGFnOiBjYXNlIHVpbnQxNlRhZzogY2FzZSB1aW50MzJUYWc6XG4gICAgICAvLyBTYWZhcmkgNSBtb2JpbGUgaW5jb3JyZWN0bHkgaGFzIGBPYmplY3RgIGFzIHRoZSBjb25zdHJ1Y3RvciBvZiB0eXBlZCBhcnJheXMuXG4gICAgICBpZiAoQ3RvciBpbnN0YW5jZW9mIEN0b3IpIHtcbiAgICAgICAgQ3RvciA9IGN0b3JCeVRhZ1t0YWddO1xuICAgICAgfVxuICAgICAgdmFyIGJ1ZmZlciA9IG9iamVjdC5idWZmZXI7XG4gICAgICByZXR1cm4gbmV3IEN0b3IoaXNEZWVwID8gYnVmZmVyQ2xvbmUoYnVmZmVyKSA6IGJ1ZmZlciwgb2JqZWN0LmJ5dGVPZmZzZXQsIG9iamVjdC5sZW5ndGgpO1xuXG4gICAgY2FzZSBudW1iZXJUYWc6XG4gICAgY2FzZSBzdHJpbmdUYWc6XG4gICAgICByZXR1cm4gbmV3IEN0b3Iob2JqZWN0KTtcblxuICAgIGNhc2UgcmVnZXhwVGFnOlxuICAgICAgdmFyIHJlc3VsdCA9IG5ldyBDdG9yKG9iamVjdC5zb3VyY2UsIHJlRmxhZ3MuZXhlYyhvYmplY3QpKTtcbiAgICAgIHJlc3VsdC5sYXN0SW5kZXggPSBvYmplY3QubGFzdEluZGV4O1xuICB9XG4gIHJldHVybiByZXN1bHQ7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gaW5pdENsb25lQnlUYWc7XG4iXX0=","/**\n * Initializes an object clone.\n *\n * @private\n * @param {Object} object The object to clone.\n * @returns {Object} Returns the initialized clone.\n */\nfunction initCloneObject(object) {\n  var Ctor = object.constructor;\n  if (!(typeof Ctor == 'function' && Ctor instanceof Ctor)) {\n    Ctor = Object;\n  }\n  return new Ctor;\n}\n\nmodule.exports = initCloneObject;\n","var getLength = require('./getLength'),\n    isLength = require('./isLength');\n\n/**\n * Checks if `value` is array-like.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is array-like, else `false`.\n */\nfunction isArrayLike(value) {\n  return value != null && isLength(getLength(value));\n}\n\nmodule.exports = isArrayLike;\n","/**\n * Checks if `value` is a host object in IE < 9.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a host object, else `false`.\n */\nvar isHostObject = (function() {\n  try {\n    Object({ 'toString': 0 } + '');\n  } catch(e) {\n    return function() { return false; };\n  }\n  return function(value) {\n    // IE < 9 presents many host objects as `Object` objects that can coerce\n    // to strings despite having improperly defined `toString` methods.\n    return typeof value.toString != 'function' && typeof (value + '') == 'string';\n  };\n}());\n\nmodule.exports = isHostObject;\n","/** Used to detect unsigned integer values. */\nvar reIsUint = /^\\d+$/;\n\n/**\n * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)\n * of an array-like value.\n */\nvar MAX_SAFE_INTEGER = 9007199254740991;\n\n/**\n * Checks if `value` is a valid array-like index.\n *\n * @private\n * @param {*} value The value to check.\n * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.\n * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.\n */\nfunction isIndex(value, length) {\n  value = (typeof value == 'number' || reIsUint.test(value)) ? +value : -1;\n  length = length == null ? MAX_SAFE_INTEGER : length;\n  return value > -1 && value % 1 == 0 && value < length;\n}\n\nmodule.exports = isIndex;\n","var isArrayLike = require('./isArrayLike'),\n    isIndex = require('./isIndex'),\n    isObject = require('../lang/isObject');\n\n/**\n * Checks if the provided arguments are from an iteratee call.\n *\n * @private\n * @param {*} value The potential iteratee value argument.\n * @param {*} index The potential iteratee index or key argument.\n * @param {*} object The potential iteratee object argument.\n * @returns {boolean} Returns `true` if the arguments are from an iteratee call, else `false`.\n */\nfunction isIterateeCall(value, index, object) {\n  if (!isObject(object)) {\n    return false;\n  }\n  var type = typeof index;\n  if (type == 'number'\n      ? (isArrayLike(object) && isIndex(index, object.length))\n      : (type == 'string' && index in object)) {\n    var other = object[index];\n    return value === value ? (value === other) : (other !== other);\n  }\n  return false;\n}\n\nmodule.exports = isIterateeCall;\n","var isArray = require('../lang/isArray'),\n    toObject = require('./toObject');\n\n/** Used to match property names within property paths. */\nvar reIsDeepProp = /\\.|\\[(?:[^[\\]]*|([\"'])(?:(?!\\1)[^\\n\\\\]|\\\\.)*?\\1)\\]/,\n    reIsPlainProp = /^\\w*$/;\n\n/**\n * Checks if `value` is a property name and not a property path.\n *\n * @private\n * @param {*} value The value to check.\n * @param {Object} [object] The object to query keys on.\n * @returns {boolean} Returns `true` if `value` is a property name, else `false`.\n */\nfunction isKey(value, object) {\n  var type = typeof value;\n  if ((type == 'string' && reIsPlainProp.test(value)) || type == 'number') {\n    return true;\n  }\n  if (isArray(value)) {\n    return false;\n  }\n  var result = !reIsDeepProp.test(value);\n  return result || (object != null && value in toObject(object));\n}\n\nmodule.exports = isKey;\n","var LazyWrapper = require('./LazyWrapper'),\n    getData = require('./getData'),\n    getFuncName = require('./getFuncName'),\n    lodash = require('../chain/lodash');\n\n/**\n * Checks if `func` has a lazy counterpart.\n *\n * @private\n * @param {Function} func The function to check.\n * @returns {boolean} Returns `true` if `func` has a lazy counterpart, else `false`.\n */\nfunction isLaziable(func) {\n  var funcName = getFuncName(func),\n      other = lodash[funcName];\n\n  if (typeof other != 'function' || !(funcName in LazyWrapper.prototype)) {\n    return false;\n  }\n  if (func === other) {\n    return true;\n  }\n  var data = getData(other);\n  return !!data && func === data[0];\n}\n\nmodule.exports = isLaziable;\n","/**\n * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)\n * of an array-like value.\n */\nvar MAX_SAFE_INTEGER = 9007199254740991;\n\n/**\n * Checks if `value` is a valid array-like length.\n *\n * **Note:** This function is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.\n */\nfunction isLength(value) {\n  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;\n}\n\nmodule.exports = isLength;\n","/**\n * Checks if `value` is object-like.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is object-like, else `false`.\n */\nfunction isObjectLike(value) {\n  return !!value && typeof value == 'object';\n}\n\nmodule.exports = isObjectLike;\n","var isObject = require('../lang/isObject');\n\n/**\n * Checks if `value` is suitable for strict equality comparisons, i.e. `===`.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` if suitable for strict\n *  equality comparisons, else `false`.\n */\nfunction isStrictComparable(value) {\n  return value === value && !isObject(value);\n}\n\nmodule.exports = isStrictComparable;\n","var arrayCopy = require('./arrayCopy'),\n    composeArgs = require('./composeArgs'),\n    composeArgsRight = require('./composeArgsRight'),\n    replaceHolders = require('./replaceHolders');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    CURRY_BOUND_FLAG = 4,\n    CURRY_FLAG = 8,\n    ARY_FLAG = 128,\n    REARG_FLAG = 256;\n\n/** Used as the internal argument placeholder. */\nvar PLACEHOLDER = '__lodash_placeholder__';\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMin = Math.min;\n\n/**\n * Merges the function metadata of `source` into `data`.\n *\n * Merging metadata reduces the number of wrappers required to invoke a function.\n * This is possible because methods like `_.bind`, `_.curry`, and `_.partial`\n * may be applied regardless of execution order. Methods like `_.ary` and `_.rearg`\n * augment function arguments, making the order in which they are executed important,\n * preventing the merging of metadata. However, we make an exception for a safe\n * common case where curried functions have `_.ary` and or `_.rearg` applied.\n *\n * @private\n * @param {Array} data The destination metadata.\n * @param {Array} source The source metadata.\n * @returns {Array} Returns `data`.\n */\nfunction mergeData(data, source) {\n  var bitmask = data[1],\n      srcBitmask = source[1],\n      newBitmask = bitmask | srcBitmask,\n      isCommon = newBitmask < ARY_FLAG;\n\n  var isCombo =\n    (srcBitmask == ARY_FLAG && bitmask == CURRY_FLAG) ||\n    (srcBitmask == ARY_FLAG && bitmask == REARG_FLAG && data[7].length <= source[8]) ||\n    (srcBitmask == (ARY_FLAG | REARG_FLAG) && bitmask == CURRY_FLAG);\n\n  // Exit early if metadata can't be merged.\n  if (!(isCommon || isCombo)) {\n    return data;\n  }\n  // Use source `thisArg` if available.\n  if (srcBitmask & BIND_FLAG) {\n    data[2] = source[2];\n    // Set when currying a bound function.\n    newBitmask |= (bitmask & BIND_FLAG) ? 0 : CURRY_BOUND_FLAG;\n  }\n  // Compose partial arguments.\n  var value = source[3];\n  if (value) {\n    var partials = data[3];\n    data[3] = partials ? composeArgs(partials, value, source[4]) : arrayCopy(value);\n    data[4] = partials ? replaceHolders(data[3], PLACEHOLDER) : arrayCopy(source[4]);\n  }\n  // Compose partial right arguments.\n  value = source[5];\n  if (value) {\n    partials = data[5];\n    data[5] = partials ? composeArgsRight(partials, value, source[6]) : arrayCopy(value);\n    data[6] = partials ? replaceHolders(data[5], PLACEHOLDER) : arrayCopy(source[6]);\n  }\n  // Use source `argPos` if available.\n  value = source[7];\n  if (value) {\n    data[7] = arrayCopy(value);\n  }\n  // Use source `ary` if it's smaller.\n  if (srcBitmask & ARY_FLAG) {\n    data[8] = data[8] == null ? source[8] : nativeMin(data[8], source[8]);\n  }\n  // Use source `arity` if one is not provided.\n  if (data[9] == null) {\n    data[9] = source[9];\n  }\n  // Use source `func` and merge bitmasks.\n  data[0] = source[0];\n  data[1] = newBitmask;\n\n  return data;\n}\n\nmodule.exports = mergeData;\n","(function (global){\nvar getNative = require('./getNative');\n\n/** Native method references. */\nvar WeakMap = getNative(global, 'WeakMap');\n\n/** Used to store function metadata. */\nvar metaMap = WeakMap && new WeakMap;\n\nmodule.exports = metaMap;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL21ldGFNYXAuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgZ2V0TmF0aXZlID0gcmVxdWlyZSgnLi9nZXROYXRpdmUnKTtcblxuLyoqIE5hdGl2ZSBtZXRob2QgcmVmZXJlbmNlcy4gKi9cbnZhciBXZWFrTWFwID0gZ2V0TmF0aXZlKGdsb2JhbCwgJ1dlYWtNYXAnKTtcblxuLyoqIFVzZWQgdG8gc3RvcmUgZnVuY3Rpb24gbWV0YWRhdGEuICovXG52YXIgbWV0YU1hcCA9IFdlYWtNYXAgJiYgbmV3IFdlYWtNYXA7XG5cbm1vZHVsZS5leHBvcnRzID0gbWV0YU1hcDtcbiJdfQ==","/** Used to lookup unminified function names. */\nvar realNames = {};\n\nmodule.exports = realNames;\n","var arrayCopy = require('./arrayCopy'),\n    isIndex = require('./isIndex');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMin = Math.min;\n\n/**\n * Reorder `array` according to the specified indexes where the element at\n * the first index is assigned as the first element, the element at\n * the second index is assigned as the second element, and so on.\n *\n * @private\n * @param {Array} array The array to reorder.\n * @param {Array} indexes The arranged array indexes.\n * @returns {Array} Returns `array`.\n */\nfunction reorder(array, indexes) {\n  var arrLength = array.length,\n      length = nativeMin(indexes.length, arrLength),\n      oldArray = arrayCopy(array);\n\n  while (length--) {\n    var index = indexes[length];\n    array[length] = isIndex(index, arrLength) ? oldArray[index] : undefined;\n  }\n  return array;\n}\n\nmodule.exports = reorder;\n","/** Used as the internal argument placeholder. */\nvar PLACEHOLDER = '__lodash_placeholder__';\n\n/**\n * Replaces all `placeholder` elements in `array` with an internal placeholder\n * and returns an array of their indexes.\n *\n * @private\n * @param {Array} array The array to modify.\n * @param {*} placeholder The placeholder to replace.\n * @returns {Array} Returns the new array of placeholder indexes.\n */\nfunction replaceHolders(array, placeholder) {\n  var index = -1,\n      length = array.length,\n      resIndex = -1,\n      result = [];\n\n  while (++index < length) {\n    if (array[index] === placeholder) {\n      array[index] = PLACEHOLDER;\n      result[++resIndex] = index;\n    }\n  }\n  return result;\n}\n\nmodule.exports = replaceHolders;\n","var baseSetData = require('./baseSetData'),\n    now = require('../date/now');\n\n/** Used to detect when a function becomes hot. */\nvar HOT_COUNT = 150,\n    HOT_SPAN = 16;\n\n/**\n * Sets metadata for `func`.\n *\n * **Note:** If this function becomes hot, i.e. is invoked a lot in a short\n * period of time, it will trip its breaker and transition to an identity function\n * to avoid garbage collection pauses in V8. See [V8 issue 2070](https://code.google.com/p/v8/issues/detail?id=2070)\n * for more details.\n *\n * @private\n * @param {Function} func The function to associate metadata with.\n * @param {*} data The metadata.\n * @returns {Function} Returns `func`.\n */\nvar setData = (function() {\n  var count = 0,\n      lastCalled = 0;\n\n  return function(key, value) {\n    var stamp = now(),\n        remaining = HOT_SPAN - (stamp - lastCalled);\n\n    lastCalled = stamp;\n    if (remaining > 0) {\n      if (++count >= HOT_COUNT) {\n        return key;\n      }\n    } else {\n      count = 0;\n    }\n    return baseSetData(key, value);\n  };\n}());\n\nmodule.exports = setData;\n","var isArguments = require('../lang/isArguments'),\n    isArray = require('../lang/isArray'),\n    isIndex = require('./isIndex'),\n    isLength = require('./isLength'),\n    isString = require('../lang/isString'),\n    keysIn = require('../object/keysIn');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * A fallback implementation of `Object.keys` which creates an array of the\n * own enumerable property names of `object`.\n *\n * @private\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property names.\n */\nfunction shimKeys(object) {\n  var props = keysIn(object),\n      propsLength = props.length,\n      length = propsLength && object.length;\n\n  var allowIndexes = !!length && isLength(length) &&\n    (isArray(object) || isArguments(object) || isString(object));\n\n  var index = -1,\n      result = [];\n\n  while (++index < propsLength) {\n    var key = props[index];\n    if ((allowIndexes && isIndex(key, length)) || hasOwnProperty.call(object, key)) {\n      result.push(key);\n    }\n  }\n  return result;\n}\n\nmodule.exports = shimKeys;\n","var isObject = require('../lang/isObject'),\n    isString = require('../lang/isString'),\n    support = require('../support');\n\n/**\n * Converts `value` to an object if it's not one.\n *\n * @private\n * @param {*} value The value to process.\n * @returns {Object} Returns the object.\n */\nfunction toObject(value) {\n  if (support.unindexedChars && isString(value)) {\n    var index = -1,\n        length = value.length,\n        result = Object(value);\n\n    while (++index < length) {\n      result[index] = value.charAt(index);\n    }\n    return result;\n  }\n  return isObject(value) ? value : Object(value);\n}\n\nmodule.exports = toObject;\n","var baseToString = require('./baseToString'),\n    isArray = require('../lang/isArray');\n\n/** Used to match property names within property paths. */\nvar rePropName = /[^.[\\]]+|\\[(?:(-?\\d+(?:\\.\\d+)?)|([\"'])((?:(?!\\2)[^\\n\\\\]|\\\\.)*?)\\2)\\]/g;\n\n/** Used to match backslashes in property paths. */\nvar reEscapeChar = /\\\\(\\\\)?/g;\n\n/**\n * Converts `value` to property path array if it's not one.\n *\n * @private\n * @param {*} value The value to process.\n * @returns {Array} Returns the property path array.\n */\nfunction toPath(value) {\n  if (isArray(value)) {\n    return value;\n  }\n  var result = [];\n  baseToString(value).replace(rePropName, function(match, number, quote, string) {\n    result.push(quote ? string.replace(reEscapeChar, '$1') : (number || match));\n  });\n  return result;\n}\n\nmodule.exports = toPath;\n","var LazyWrapper = require('./LazyWrapper'),\n    LodashWrapper = require('./LodashWrapper'),\n    arrayCopy = require('./arrayCopy');\n\n/**\n * Creates a clone of `wrapper`.\n *\n * @private\n * @param {Object} wrapper The wrapper to clone.\n * @returns {Object} Returns the cloned wrapper.\n */\nfunction wrapperClone(wrapper) {\n  return wrapper instanceof LazyWrapper\n    ? wrapper.clone()\n    : new LodashWrapper(wrapper.__wrapped__, wrapper.__chain__, arrayCopy(wrapper.__actions__));\n}\n\nmodule.exports = wrapperClone;\n","var baseClone = require('../internal/baseClone'),\n    bindCallback = require('../internal/bindCallback');\n\n/**\n * Creates a deep clone of `value`. If `customizer` is provided it's invoked\n * to produce the cloned values. If `customizer` returns `undefined` cloning\n * is handled by the method instead. The `customizer` is bound to `thisArg`\n * and invoked with up to three argument; (value [, index|key, object]).\n *\n * **Note:** This method is loosely based on the\n * [structured clone algorithm](http://www.w3.org/TR/html5/infrastructure.html#internal-structured-cloning-algorithm).\n * The enumerable properties of `arguments` objects and objects created by\n * constructors other than `Object` are cloned to plain `Object` objects. An\n * empty object is returned for uncloneable values such as functions, DOM nodes,\n * Maps, Sets, and WeakMaps.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to deep clone.\n * @param {Function} [customizer] The function to customize cloning values.\n * @param {*} [thisArg] The `this` binding of `customizer`.\n * @returns {*} Returns the deep cloned value.\n * @example\n *\n * var users = [\n *   { 'user': 'barney' },\n *   { 'user': 'fred' }\n * ];\n *\n * var deep = _.cloneDeep(users);\n * deep[0] === users[0];\n * // => false\n *\n * // using a customizer callback\n * var el = _.cloneDeep(document.body, function(value) {\n *   if (_.isElement(value)) {\n *     return value.cloneNode(true);\n *   }\n * });\n *\n * el === document.body\n * // => false\n * el.nodeName\n * // => BODY\n * el.childNodes.length;\n * // => 20\n */\nfunction cloneDeep(value, customizer, thisArg) {\n  return typeof customizer == 'function'\n    ? baseClone(value, true, bindCallback(customizer, thisArg, 3))\n    : baseClone(value, true);\n}\n\nmodule.exports = cloneDeep;\n","var isArrayLike = require('../internal/isArrayLike'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/** Native method references. */\nvar propertyIsEnumerable = objectProto.propertyIsEnumerable;\n\n/**\n * Checks if `value` is classified as an `arguments` object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isArguments(function() { return arguments; }());\n * // => true\n *\n * _.isArguments([1, 2, 3]);\n * // => false\n */\nfunction isArguments(value) {\n  return isObjectLike(value) && isArrayLike(value) &&\n    hasOwnProperty.call(value, 'callee') && !propertyIsEnumerable.call(value, 'callee');\n}\n\nmodule.exports = isArguments;\n","var getNative = require('../internal/getNative'),\n    isLength = require('../internal/isLength'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** `Object#toString` result references. */\nvar arrayTag = '[object Array]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeIsArray = getNative(Array, 'isArray');\n\n/**\n * Checks if `value` is classified as an `Array` object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isArray([1, 2, 3]);\n * // => true\n *\n * _.isArray(function() { return arguments; }());\n * // => false\n */\nvar isArray = nativeIsArray || function(value) {\n  return isObjectLike(value) && isLength(value.length) && objToString.call(value) == arrayTag;\n};\n\nmodule.exports = isArray;\n","var isArguments = require('./isArguments'),\n    isArray = require('./isArray'),\n    isArrayLike = require('../internal/isArrayLike'),\n    isFunction = require('./isFunction'),\n    isObjectLike = require('../internal/isObjectLike'),\n    isString = require('./isString'),\n    keys = require('../object/keys');\n\n/**\n * Checks if `value` is empty. A value is considered empty unless it's an\n * `arguments` object, array, string, or jQuery-like collection with a length\n * greater than `0` or an object with own enumerable properties.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {Array|Object|string} value The value to inspect.\n * @returns {boolean} Returns `true` if `value` is empty, else `false`.\n * @example\n *\n * _.isEmpty(null);\n * // => true\n *\n * _.isEmpty(true);\n * // => true\n *\n * _.isEmpty(1);\n * // => true\n *\n * _.isEmpty([1, 2, 3]);\n * // => false\n *\n * _.isEmpty({ 'a': 1 });\n * // => false\n */\nfunction isEmpty(value) {\n  if (value == null) {\n    return true;\n  }\n  if (isArrayLike(value) && (isArray(value) || isString(value) || isArguments(value) ||\n      (isObjectLike(value) && isFunction(value.splice)))) {\n    return !value.length;\n  }\n  return !keys(value).length;\n}\n\nmodule.exports = isEmpty;\n","var isObject = require('./isObject');\n\n/** `Object#toString` result references. */\nvar funcTag = '[object Function]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is classified as a `Function` object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isFunction(_);\n * // => true\n *\n * _.isFunction(/abc/);\n * // => false\n */\nfunction isFunction(value) {\n  // The use of `Object#toString` avoids issues with the `typeof` operator\n  // in older versions of Chrome and Safari which return 'function' for regexes\n  // and Safari 8 which returns 'object' for typed array constructors.\n  return isObject(value) && objToString.call(value) == funcTag;\n}\n\nmodule.exports = isFunction;\n","var isFunction = require('./isFunction'),\n    isHostObject = require('../internal/isHostObject'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** Used to detect host constructors (Safari > 5). */\nvar reIsHostCtor = /^\\[object .+?Constructor\\]$/;\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to resolve the decompiled source of functions. */\nvar fnToString = Function.prototype.toString;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/** Used to detect if a method is native. */\nvar reIsNative = RegExp('^' +\n  fnToString.call(hasOwnProperty).replace(/[\\\\^$.*+?()[\\]{}|]/g, '\\\\$&')\n  .replace(/hasOwnProperty|(function).*?(?=\\\\\\()| for .+?(?=\\\\\\])/g, '$1.*?') + '$'\n);\n\n/**\n * Checks if `value` is a native function.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a native function, else `false`.\n * @example\n *\n * _.isNative(Array.prototype.push);\n * // => true\n *\n * _.isNative(_);\n * // => false\n */\nfunction isNative(value) {\n  if (value == null) {\n    return false;\n  }\n  if (isFunction(value)) {\n    return reIsNative.test(fnToString.call(value));\n  }\n  return isObjectLike(value) && (isHostObject(value) ? reIsNative : reIsHostCtor).test(value);\n}\n\nmodule.exports = isNative;\n","/**\n * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.\n * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is an object, else `false`.\n * @example\n *\n * _.isObject({});\n * // => true\n *\n * _.isObject([1, 2, 3]);\n * // => true\n *\n * _.isObject(1);\n * // => false\n */\nfunction isObject(value) {\n  // Avoid a V8 JIT bug in Chrome 19-20.\n  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.\n  var type = typeof value;\n  return !!value && (type == 'object' || type == 'function');\n}\n\nmodule.exports = isObject;\n","var baseForIn = require('../internal/baseForIn'),\n    isArguments = require('./isArguments'),\n    isHostObject = require('../internal/isHostObject'),\n    isObjectLike = require('../internal/isObjectLike'),\n    support = require('../support');\n\n/** `Object#toString` result references. */\nvar objectTag = '[object Object]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is a plain object, that is, an object created by the\n * `Object` constructor or one with a `[[Prototype]]` of `null`.\n *\n * **Note:** This method assumes objects created by the `Object` constructor\n * have no inherited enumerable properties.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a plain object, else `false`.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n * }\n *\n * _.isPlainObject(new Foo);\n * // => false\n *\n * _.isPlainObject([1, 2, 3]);\n * // => false\n *\n * _.isPlainObject({ 'x': 0, 'y': 0 });\n * // => true\n *\n * _.isPlainObject(Object.create(null));\n * // => true\n */\nfunction isPlainObject(value) {\n  var Ctor;\n\n  // Exit early for non `Object` objects.\n  if (!(isObjectLike(value) && objToString.call(value) == objectTag && !isHostObject(value) && !isArguments(value)) ||\n      (!hasOwnProperty.call(value, 'constructor') && (Ctor = value.constructor, typeof Ctor == 'function' && !(Ctor instanceof Ctor)))) {\n    return false;\n  }\n  // IE < 9 iterates inherited properties before own properties. If the first\n  // iterated property is an object's own property then there are no inherited\n  // enumerable properties.\n  var result;\n  if (support.ownLast) {\n    baseForIn(value, function(subValue, key, object) {\n      result = hasOwnProperty.call(object, key);\n      return false;\n    });\n    return result !== false;\n  }\n  // In most environments an object's own properties are iterated before\n  // its inherited properties. If the last iterated property is an object's\n  // own property then there are no inherited enumerable properties.\n  baseForIn(value, function(subValue, key) {\n    result = key;\n  });\n  return result === undefined || hasOwnProperty.call(value, result);\n}\n\nmodule.exports = isPlainObject;\n","var isObjectLike = require('../internal/isObjectLike');\n\n/** `Object#toString` result references. */\nvar stringTag = '[object String]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is classified as a `String` primitive or object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isString('abc');\n * // => true\n *\n * _.isString(1);\n * // => false\n */\nfunction isString(value) {\n  return typeof value == 'string' || (isObjectLike(value) && objToString.call(value) == stringTag);\n}\n\nmodule.exports = isString;\n","var isLength = require('../internal/isLength'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** `Object#toString` result references. */\nvar argsTag = '[object Arguments]',\n    arrayTag = '[object Array]',\n    boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    funcTag = '[object Function]',\n    mapTag = '[object Map]',\n    numberTag = '[object Number]',\n    objectTag = '[object Object]',\n    regexpTag = '[object RegExp]',\n    setTag = '[object Set]',\n    stringTag = '[object String]',\n    weakMapTag = '[object WeakMap]';\n\nvar arrayBufferTag = '[object ArrayBuffer]',\n    float32Tag = '[object Float32Array]',\n    float64Tag = '[object Float64Array]',\n    int8Tag = '[object Int8Array]',\n    int16Tag = '[object Int16Array]',\n    int32Tag = '[object Int32Array]',\n    uint8Tag = '[object Uint8Array]',\n    uint8ClampedTag = '[object Uint8ClampedArray]',\n    uint16Tag = '[object Uint16Array]',\n    uint32Tag = '[object Uint32Array]';\n\n/** Used to identify `toStringTag` values of typed arrays. */\nvar typedArrayTags = {};\ntypedArrayTags[float32Tag] = typedArrayTags[float64Tag] =\ntypedArrayTags[int8Tag] = typedArrayTags[int16Tag] =\ntypedArrayTags[int32Tag] = typedArrayTags[uint8Tag] =\ntypedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] =\ntypedArrayTags[uint32Tag] = true;\ntypedArrayTags[argsTag] = typedArrayTags[arrayTag] =\ntypedArrayTags[arrayBufferTag] = typedArrayTags[boolTag] =\ntypedArrayTags[dateTag] = typedArrayTags[errorTag] =\ntypedArrayTags[funcTag] = typedArrayTags[mapTag] =\ntypedArrayTags[numberTag] = typedArrayTags[objectTag] =\ntypedArrayTags[regexpTag] = typedArrayTags[setTag] =\ntypedArrayTags[stringTag] = typedArrayTags[weakMapTag] = false;\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is classified as a typed array.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isTypedArray(new Uint8Array);\n * // => true\n *\n * _.isTypedArray([]);\n * // => false\n */\nfunction isTypedArray(value) {\n  return isObjectLike(value) && isLength(value.length) && !!typedArrayTags[objToString.call(value)];\n}\n\nmodule.exports = isTypedArray;\n","/**\n * Checks if `value` is `undefined`.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is `undefined`, else `false`.\n * @example\n *\n * _.isUndefined(void 0);\n * // => true\n *\n * _.isUndefined(null);\n * // => false\n */\nfunction isUndefined(value) {\n  return value === undefined;\n}\n\nmodule.exports = isUndefined;\n","var getNative = require('../internal/getNative'),\n    isArrayLike = require('../internal/isArrayLike'),\n    isObject = require('../lang/isObject'),\n    shimKeys = require('../internal/shimKeys'),\n    support = require('../support');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeKeys = getNative(Object, 'keys');\n\n/**\n * Creates an array of the own enumerable property names of `object`.\n *\n * **Note:** Non-object values are coerced to objects. See the\n * [ES spec](http://ecma-international.org/ecma-262/6.0/#sec-object.keys)\n * for more details.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property names.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n *   this.b = 2;\n * }\n *\n * Foo.prototype.c = 3;\n *\n * _.keys(new Foo);\n * // => ['a', 'b'] (iteration order is not guaranteed)\n *\n * _.keys('hi');\n * // => ['0', '1']\n */\nvar keys = !nativeKeys ? shimKeys : function(object) {\n  var Ctor = object == null ? undefined : object.constructor;\n  if ((typeof Ctor == 'function' && Ctor.prototype === object) ||\n      (typeof object == 'function' ? support.enumPrototypes : isArrayLike(object))) {\n    return shimKeys(object);\n  }\n  return isObject(object) ? nativeKeys(object) : [];\n};\n\nmodule.exports = keys;\n","var arrayEach = require('../internal/arrayEach'),\n    isArguments = require('../lang/isArguments'),\n    isArray = require('../lang/isArray'),\n    isFunction = require('../lang/isFunction'),\n    isIndex = require('../internal/isIndex'),\n    isLength = require('../internal/isLength'),\n    isObject = require('../lang/isObject'),\n    isString = require('../lang/isString'),\n    support = require('../support');\n\n/** `Object#toString` result references. */\nvar arrayTag = '[object Array]',\n    boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    funcTag = '[object Function]',\n    numberTag = '[object Number]',\n    objectTag = '[object Object]',\n    regexpTag = '[object RegExp]',\n    stringTag = '[object String]';\n\n/** Used to fix the JScript `[[DontEnum]]` bug. */\nvar shadowProps = [\n  'constructor', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable',\n  'toLocaleString', 'toString', 'valueOf'\n];\n\n/** Used for native method references. */\nvar errorProto = Error.prototype,\n    objectProto = Object.prototype,\n    stringProto = String.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/** Used to avoid iterating over non-enumerable properties in IE < 9. */\nvar nonEnumProps = {};\nnonEnumProps[arrayTag] = nonEnumProps[dateTag] = nonEnumProps[numberTag] = { 'constructor': true, 'toLocaleString': true, 'toString': true, 'valueOf': true };\nnonEnumProps[boolTag] = nonEnumProps[stringTag] = { 'constructor': true, 'toString': true, 'valueOf': true };\nnonEnumProps[errorTag] = nonEnumProps[funcTag] = nonEnumProps[regexpTag] = { 'constructor': true, 'toString': true };\nnonEnumProps[objectTag] = { 'constructor': true };\n\narrayEach(shadowProps, function(key) {\n  for (var tag in nonEnumProps) {\n    if (hasOwnProperty.call(nonEnumProps, tag)) {\n      var props = nonEnumProps[tag];\n      props[key] = hasOwnProperty.call(props, key);\n    }\n  }\n});\n\n/**\n * Creates an array of the own and inherited enumerable property names of `object`.\n *\n * **Note:** Non-object values are coerced to objects.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property names.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n *   this.b = 2;\n * }\n *\n * Foo.prototype.c = 3;\n *\n * _.keysIn(new Foo);\n * // => ['a', 'b', 'c'] (iteration order is not guaranteed)\n */\nfunction keysIn(object) {\n  if (object == null) {\n    return [];\n  }\n  if (!isObject(object)) {\n    object = Object(object);\n  }\n  var length = object.length;\n\n  length = (length && isLength(length) &&\n    (isArray(object) || isArguments(object) || isString(object)) && length) || 0;\n\n  var Ctor = object.constructor,\n      index = -1,\n      proto = (isFunction(Ctor) && Ctor.prototype) || objectProto,\n      isProto = proto === object,\n      result = Array(length),\n      skipIndexes = length > 0,\n      skipErrorProps = support.enumErrorProps && (object === errorProto || object instanceof Error),\n      skipProto = support.enumPrototypes && isFunction(object);\n\n  while (++index < length) {\n    result[index] = (index + '');\n  }\n  // lodash skips the `constructor` property when it infers it's iterating\n  // over a `prototype` object because IE < 9 can't set the `[[Enumerable]]`\n  // attribute of an existing property and the `constructor` property of a\n  // prototype defaults to non-enumerable.\n  for (var key in object) {\n    if (!(skipProto && key == 'prototype') &&\n        !(skipErrorProps && (key == 'message' || key == 'name')) &&\n        !(skipIndexes && isIndex(key, length)) &&\n        !(key == 'constructor' && (isProto || !hasOwnProperty.call(object, key)))) {\n      result.push(key);\n    }\n  }\n  if (support.nonEnumShadows && object !== objectProto) {\n    var tag = object === stringProto ? stringTag : (object === errorProto ? errorTag : objToString.call(object)),\n        nonEnums = nonEnumProps[tag] || nonEnumProps[objectTag];\n\n    if (tag == objectTag) {\n      proto = objectProto;\n    }\n    length = shadowProps.length;\n    while (length--) {\n      key = shadowProps[length];\n      var nonEnum = nonEnums[key];\n      if (!(isProto && nonEnum) &&\n          (nonEnum ? hasOwnProperty.call(object, key) : object[key] !== proto[key])) {\n        result.push(key);\n      }\n    }\n  }\n  return result;\n}\n\nmodule.exports = keysIn;\n","var keys = require('./keys'),\n    toObject = require('../internal/toObject');\n\n/**\n * Creates a two dimensional array of the key-value pairs for `object`,\n * e.g. `[[key1, value1], [key2, value2]]`.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the new array of key-value pairs.\n * @example\n *\n * _.pairs({ 'barney': 36, 'fred': 40 });\n * // => [['barney', 36], ['fred', 40]] (iteration order is not guaranteed)\n */\nfunction pairs(object) {\n  object = toObject(object);\n\n  var index = -1,\n      props = keys(object),\n      length = props.length,\n      result = Array(length);\n\n  while (++index < length) {\n    var key = props[index];\n    result[index] = [key, object[key]];\n  }\n  return result;\n}\n\nmodule.exports = pairs;\n","var baseValues = require('../internal/baseValues'),\n    keys = require('./keys');\n\n/**\n * Creates an array of the own enumerable property values of `object`.\n *\n * **Note:** Non-object values are coerced to objects.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property values.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n *   this.b = 2;\n * }\n *\n * Foo.prototype.c = 3;\n *\n * _.values(new Foo);\n * // => [1, 2] (iteration order is not guaranteed)\n *\n * _.values('hi');\n * // => ['h', 'i']\n */\nfunction values(object) {\n  return baseValues(object, keys(object));\n}\n\nmodule.exports = values;\n","/** Used for native method references. */\nvar arrayProto = Array.prototype,\n    errorProto = Error.prototype,\n    objectProto = Object.prototype;\n\n/** Native method references. */\nvar propertyIsEnumerable = objectProto.propertyIsEnumerable,\n    splice = arrayProto.splice;\n\n/**\n * An object environment feature flags.\n *\n * @static\n * @memberOf _\n * @type Object\n */\nvar support = {};\n\n(function(x) {\n  var Ctor = function() { this.x = x; },\n      object = { '0': x, 'length': x },\n      props = [];\n\n  Ctor.prototype = { 'valueOf': x, 'y': x };\n  for (var key in new Ctor) { props.push(key); }\n\n  /**\n   * Detect if `name` or `message` properties of `Error.prototype` are\n   * enumerable by default (IE < 9, Safari < 5.1).\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.enumErrorProps = propertyIsEnumerable.call(errorProto, 'message') ||\n    propertyIsEnumerable.call(errorProto, 'name');\n\n  /**\n   * Detect if `prototype` properties are enumerable by default.\n   *\n   * Firefox < 3.6, Opera > 9.50 - Opera < 11.60, and Safari < 5.1\n   * (if the prototype or a property on the prototype has been set)\n   * incorrectly set the `[[Enumerable]]` value of a function's `prototype`\n   * property to `true`.\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.enumPrototypes = propertyIsEnumerable.call(Ctor, 'prototype');\n\n  /**\n   * Detect if properties shadowing those on `Object.prototype` are non-enumerable.\n   *\n   * In IE < 9 an object's own properties, shadowing non-enumerable ones,\n   * are made non-enumerable as well (a.k.a the JScript `[[DontEnum]]` bug).\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.nonEnumShadows = !/valueOf/.test(props);\n\n  /**\n   * Detect if own properties are iterated after inherited properties (IE < 9).\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.ownLast = props[0] != 'x';\n\n  /**\n   * Detect if `Array#shift` and `Array#splice` augment array-like objects\n   * correctly.\n   *\n   * Firefox < 10, compatibility modes of IE 8, and IE < 9 have buggy Array\n   * `shift()` and `splice()` functions that fail to remove the last element,\n   * `value[0]`, of array-like objects even though the \"length\" property is\n   * set to `0`. The `shift()` method is buggy in compatibility modes of IE 8,\n   * while `splice()` is buggy regardless of mode in IE < 9.\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.spliceObjects = (splice.call(object, 0, 1), !object[0]);\n\n  /**\n   * Detect lack of support for accessing string characters by index.\n   *\n   * IE < 8 can't access characters by index. IE 8 can only access characters\n   * by index on string literals, not string objects.\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.unindexedChars = ('x'[0] + Object('x')[0]) != 'xx';\n}(1, 0));\n\nmodule.exports = support;\n","/**\n * This method returns the first argument provided to it.\n *\n * @static\n * @memberOf _\n * @category Utility\n * @param {*} value Any value.\n * @returns {*} Returns `value`.\n * @example\n *\n * var object = { 'user': 'fred' };\n *\n * _.identity(object) === object;\n * // => true\n */\nfunction identity(value) {\n  return value;\n}\n\nmodule.exports = identity;\n","/**\n * A no-operation function that returns `undefined` regardless of the\n * arguments it receives.\n *\n * @static\n * @memberOf _\n * @category Utility\n * @example\n *\n * var object = { 'user': 'fred' };\n *\n * _.noop(object) === undefined;\n * // => true\n */\nfunction noop() {\n  // No operation performed.\n}\n\nmodule.exports = noop;\n","var baseProperty = require('../internal/baseProperty'),\n    basePropertyDeep = require('../internal/basePropertyDeep'),\n    isKey = require('../internal/isKey');\n\n/**\n * Creates a function that returns the property value at `path` on a\n * given object.\n *\n * @static\n * @memberOf _\n * @category Utility\n * @param {Array|string} path The path of the property to get.\n * @returns {Function} Returns the new function.\n * @example\n *\n * var objects = [\n *   { 'a': { 'b': { 'c': 2 } } },\n *   { 'a': { 'b': { 'c': 1 } } }\n * ];\n *\n * _.map(objects, _.property('a.b.c'));\n * // => [2, 1]\n *\n * _.pluck(_.sortBy(objects, _.property(['a', 'b', 'c'])), 'a.b.c');\n * // => [1, 2]\n */\nfunction property(path) {\n  return isKey(path) ? baseProperty(path) : basePropertyDeep(path);\n}\n\nmodule.exports = property;\n","(function (process){\n// vim:ts=4:sts=4:sw=4:\n/*!\n *\n * Copyright 2009-2012 Kris Kowal under the terms of the MIT\n * license found at http://github.com/kriskowal/q/raw/master/LICENSE\n *\n * With parts by Tyler Close\n * Copyright 2007-2009 Tyler Close under the terms of the MIT X license found\n * at http://www.opensource.org/licenses/mit-license.html\n * Forked at ref_send.js version: 2009-05-11\n *\n * With parts by Mark Miller\n * Copyright (C) 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\n\n(function (definition) {\n    \"use strict\";\n\n    // This file will function properly as a <script> tag, or a module\n    // using CommonJS and NodeJS or RequireJS module formats.  In\n    // Common/Node/RequireJS, the module exports the Q API and when\n    // executed as a simple <script>, it creates a Q global instead.\n\n    // Montage Require\n    if (typeof bootstrap === \"function\") {\n        bootstrap(\"promise\", definition);\n\n    // CommonJS\n    } else if (typeof exports === \"object\" && typeof module === \"object\") {\n        module.exports = definition();\n\n    // RequireJS\n    } else if (typeof define === \"function\" && define.amd) {\n        define(definition);\n\n    // SES (Secure EcmaScript)\n    } else if (typeof ses !== \"undefined\") {\n        if (!ses.ok()) {\n            return;\n        } else {\n            ses.makeQ = definition;\n        }\n\n    // <script>\n    } else if (typeof window !== \"undefined\" || typeof self !== \"undefined\") {\n        // Prefer window over self for add-on scripts. Use self for\n        // non-windowed contexts.\n        var global = typeof window !== \"undefined\" ? window : self;\n\n        // Get the `window` object, save the previous Q global\n        // and initialize Q as a global.\n        var previousQ = global.Q;\n        global.Q = definition();\n\n        // Add a noConflict function so Q can be removed from the\n        // global namespace.\n        global.Q.noConflict = function () {\n            global.Q = previousQ;\n            return this;\n        };\n\n    } else {\n        throw new Error(\"This environment was not anticipated by Q. Please file a bug.\");\n    }\n\n})(function () {\n\"use strict\";\n\nvar hasStacks = false;\ntry {\n    throw new Error();\n} catch (e) {\n    hasStacks = !!e.stack;\n}\n\n// All code after this point will be filtered from stack traces reported\n// by Q.\nvar qStartingLine = captureLine();\nvar qFileName;\n\n// shims\n\n// used for fallback in \"allResolved\"\nvar noop = function () {};\n\n// Use the fastest possible means to execute a task in a future turn\n// of the event loop.\nvar nextTick =(function () {\n    // linked list of tasks (single, with head node)\n    var head = {task: void 0, next: null};\n    var tail = head;\n    var flushing = false;\n    var requestTick = void 0;\n    var isNodeJS = false;\n    // queue for late tasks, used by unhandled rejection tracking\n    var laterQueue = [];\n\n    function flush() {\n        /* jshint loopfunc: true */\n        var task, domain;\n\n        while (head.next) {\n            head = head.next;\n            task = head.task;\n            head.task = void 0;\n            domain = head.domain;\n\n            if (domain) {\n                head.domain = void 0;\n                domain.enter();\n            }\n            runSingle(task, domain);\n\n        }\n        while (laterQueue.length) {\n            task = laterQueue.pop();\n            runSingle(task);\n        }\n        flushing = false;\n    }\n    // runs a single function in the async queue\n    function runSingle(task, domain) {\n        try {\n            task();\n\n        } catch (e) {\n            if (isNodeJS) {\n                // In node, uncaught exceptions are considered fatal errors.\n                // Re-throw them synchronously to interrupt flushing!\n\n                // Ensure continuation if the uncaught exception is suppressed\n                // listening \"uncaughtException\" events (as domains does).\n                // Continue in next event to avoid tick recursion.\n                if (domain) {\n                    domain.exit();\n                }\n                setTimeout(flush, 0);\n                if (domain) {\n                    domain.enter();\n                }\n\n                throw e;\n\n            } else {\n                // In browsers, uncaught exceptions are not fatal.\n                // Re-throw them asynchronously to avoid slow-downs.\n                setTimeout(function () {\n                    throw e;\n                }, 0);\n            }\n        }\n\n        if (domain) {\n            domain.exit();\n        }\n    }\n\n    nextTick = function (task) {\n        tail = tail.next = {\n            task: task,\n            domain: isNodeJS && process.domain,\n            next: null\n        };\n\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n\n    if (typeof process === \"object\" &&\n        process.toString() === \"[object process]\" && process.nextTick) {\n        // Ensure Q is in a real Node environment, with a `process.nextTick`.\n        // To see through fake Node environments:\n        // * Mocha test runner - exposes a `process` global without a `nextTick`\n        // * Browserify - exposes a `process.nexTick` function that uses\n        //   `setTimeout`. In this case `setImmediate` is preferred because\n        //    it is faster. Browserify's `process.toString()` yields\n        //   \"[object Object]\", while in a real Node environment\n        //   `process.nextTick()` yields \"[object process]\".\n        isNodeJS = true;\n\n        requestTick = function () {\n            process.nextTick(flush);\n        };\n\n    } else if (typeof setImmediate === \"function\") {\n        // In IE10, Node.js 0.9+, or https://github.com/NobleJS/setImmediate\n        if (typeof window !== \"undefined\") {\n            requestTick = setImmediate.bind(window, flush);\n        } else {\n            requestTick = function () {\n                setImmediate(flush);\n            };\n        }\n\n    } else if (typeof MessageChannel !== \"undefined\") {\n        // modern browsers\n        // http://www.nonblocking.io/2011/06/windownexttick.html\n        var channel = new MessageChannel();\n        // At least Safari Version 6.0.5 (8536.30.1) intermittently cannot create\n        // working message ports the first time a page loads.\n        channel.port1.onmessage = function () {\n            requestTick = requestPortTick;\n            channel.port1.onmessage = flush;\n            flush();\n        };\n        var requestPortTick = function () {\n            // Opera requires us to provide a message payload, regardless of\n            // whether we use it.\n            channel.port2.postMessage(0);\n        };\n        requestTick = function () {\n            setTimeout(flush, 0);\n            requestPortTick();\n        };\n\n    } else {\n        // old browsers\n        requestTick = function () {\n            setTimeout(flush, 0);\n        };\n    }\n    // runs a task after all other tasks have been run\n    // this is useful for unhandled rejection tracking that needs to happen\n    // after all `then`d tasks have been run.\n    nextTick.runAfter = function (task) {\n        laterQueue.push(task);\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n    return nextTick;\n})();\n\n// Attempt to make generics safe in the face of downstream\n// modifications.\n// There is no situation where this is necessary.\n// If you need a security guarantee, these primordials need to be\n// deeply frozen anyway, and if you don’t need a security guarantee,\n// this is just plain paranoid.\n// However, this **might** have the nice side-effect of reducing the size of\n// the minified code by reducing x.call() to merely x()\n// See Mark Miller’s explanation of what this does.\n// http://wiki.ecmascript.org/doku.php?id=conventions:safe_meta_programming\nvar call = Function.call;\nfunction uncurryThis(f) {\n    return function () {\n        return call.apply(f, arguments);\n    };\n}\n// This is equivalent, but slower:\n// uncurryThis = Function_bind.bind(Function_bind.call);\n// http://jsperf.com/uncurrythis\n\nvar array_slice = uncurryThis(Array.prototype.slice);\n\nvar array_reduce = uncurryThis(\n    Array.prototype.reduce || function (callback, basis) {\n        var index = 0,\n            length = this.length;\n        // concerning the initial value, if one is not provided\n        if (arguments.length === 1) {\n            // seek to the first value in the array, accounting\n            // for the possibility that is is a sparse array\n            do {\n                if (index in this) {\n                    basis = this[index++];\n                    break;\n                }\n                if (++index >= length) {\n                    throw new TypeError();\n                }\n            } while (1);\n        }\n        // reduce\n        for (; index < length; index++) {\n            // account for the possibility that the array is sparse\n            if (index in this) {\n                basis = callback(basis, this[index], index);\n            }\n        }\n        return basis;\n    }\n);\n\nvar array_indexOf = uncurryThis(\n    Array.prototype.indexOf || function (value) {\n        // not a very good shim, but good enough for our one use of it\n        for (var i = 0; i < this.length; i++) {\n            if (this[i] === value) {\n                return i;\n            }\n        }\n        return -1;\n    }\n);\n\nvar array_map = uncurryThis(\n    Array.prototype.map || function (callback, thisp) {\n        var self = this;\n        var collect = [];\n        array_reduce(self, function (undefined, value, index) {\n            collect.push(callback.call(thisp, value, index, self));\n        }, void 0);\n        return collect;\n    }\n);\n\nvar object_create = Object.create || function (prototype) {\n    function Type() { }\n    Type.prototype = prototype;\n    return new Type();\n};\n\nvar object_hasOwnProperty = uncurryThis(Object.prototype.hasOwnProperty);\n\nvar object_keys = Object.keys || function (object) {\n    var keys = [];\n    for (var key in object) {\n        if (object_hasOwnProperty(object, key)) {\n            keys.push(key);\n        }\n    }\n    return keys;\n};\n\nvar object_toString = uncurryThis(Object.prototype.toString);\n\nfunction isObject(value) {\n    return value === Object(value);\n}\n\n// generator related shims\n\n// FIXME: Remove this function once ES6 generators are in SpiderMonkey.\nfunction isStopIteration(exception) {\n    return (\n        object_toString(exception) === \"[object StopIteration]\" ||\n        exception instanceof QReturnValue\n    );\n}\n\n// FIXME: Remove this helper and Q.return once ES6 generators are in\n// SpiderMonkey.\nvar QReturnValue;\nif (typeof ReturnValue !== \"undefined\") {\n    QReturnValue = ReturnValue;\n} else {\n    QReturnValue = function (value) {\n        this.value = value;\n    };\n}\n\n// long stack traces\n\nvar STACK_JUMP_SEPARATOR = \"From previous event:\";\n\nfunction makeStackTraceLong(error, promise) {\n    // If possible, transform the error stack trace by removing Node and Q\n    // cruft, then concatenating with the stack trace of `promise`. See #57.\n    if (hasStacks &&\n        promise.stack &&\n        typeof error === \"object\" &&\n        error !== null &&\n        error.stack &&\n        error.stack.indexOf(STACK_JUMP_SEPARATOR) === -1\n    ) {\n        var stacks = [];\n        for (var p = promise; !!p; p = p.source) {\n            if (p.stack) {\n                stacks.unshift(p.stack);\n            }\n        }\n        stacks.unshift(error.stack);\n\n        var concatedStacks = stacks.join(\"\\n\" + STACK_JUMP_SEPARATOR + \"\\n\");\n        error.stack = filterStackString(concatedStacks);\n    }\n}\n\nfunction filterStackString(stackString) {\n    var lines = stackString.split(\"\\n\");\n    var desiredLines = [];\n    for (var i = 0; i < lines.length; ++i) {\n        var line = lines[i];\n\n        if (!isInternalFrame(line) && !isNodeFrame(line) && line) {\n            desiredLines.push(line);\n        }\n    }\n    return desiredLines.join(\"\\n\");\n}\n\nfunction isNodeFrame(stackLine) {\n    return stackLine.indexOf(\"(module.js:\") !== -1 ||\n           stackLine.indexOf(\"(node.js:\") !== -1;\n}\n\nfunction getFileNameAndLineNumber(stackLine) {\n    // Named functions: \"at functionName (filename:lineNumber:columnNumber)\"\n    // In IE10 function name can have spaces (\"Anonymous function\") O_o\n    var attempt1 = /at .+ \\((.+):(\\d+):(?:\\d+)\\)$/.exec(stackLine);\n    if (attempt1) {\n        return [attempt1[1], Number(attempt1[2])];\n    }\n\n    // Anonymous functions: \"at filename:lineNumber:columnNumber\"\n    var attempt2 = /at ([^ ]+):(\\d+):(?:\\d+)$/.exec(stackLine);\n    if (attempt2) {\n        return [attempt2[1], Number(attempt2[2])];\n    }\n\n    // Firefox style: \"function@filename:lineNumber or @filename:lineNumber\"\n    var attempt3 = /.*@(.+):(\\d+)$/.exec(stackLine);\n    if (attempt3) {\n        return [attempt3[1], Number(attempt3[2])];\n    }\n}\n\nfunction isInternalFrame(stackLine) {\n    var fileNameAndLineNumber = getFileNameAndLineNumber(stackLine);\n\n    if (!fileNameAndLineNumber) {\n        return false;\n    }\n\n    var fileName = fileNameAndLineNumber[0];\n    var lineNumber = fileNameAndLineNumber[1];\n\n    return fileName === qFileName &&\n        lineNumber >= qStartingLine &&\n        lineNumber <= qEndingLine;\n}\n\n// discover own file name and line number range for filtering stack\n// traces\nfunction captureLine() {\n    if (!hasStacks) {\n        return;\n    }\n\n    try {\n        throw new Error();\n    } catch (e) {\n        var lines = e.stack.split(\"\\n\");\n        var firstLine = lines[0].indexOf(\"@\") > 0 ? lines[1] : lines[2];\n        var fileNameAndLineNumber = getFileNameAndLineNumber(firstLine);\n        if (!fileNameAndLineNumber) {\n            return;\n        }\n\n        qFileName = fileNameAndLineNumber[0];\n        return fileNameAndLineNumber[1];\n    }\n}\n\nfunction deprecate(callback, name, alternative) {\n    return function () {\n        if (typeof console !== \"undefined\" &&\n            typeof console.warn === \"function\") {\n            console.warn(name + \" is deprecated, use \" + alternative +\n                         \" instead.\", new Error(\"\").stack);\n        }\n        return callback.apply(callback, arguments);\n    };\n}\n\n// end of shims\n// beginning of real work\n\n/**\n * Constructs a promise for an immediate reference, passes promises through, or\n * coerces promises from different systems.\n * @param value immediate reference or promise\n */\nfunction Q(value) {\n    // If the object is already a Promise, return it directly.  This enables\n    // the resolve function to both be used to created references from objects,\n    // but to tolerably coerce non-promises to promises.\n    if (value instanceof Promise) {\n        return value;\n    }\n\n    // assimilate thenables\n    if (isPromiseAlike(value)) {\n        return coerce(value);\n    } else {\n        return fulfill(value);\n    }\n}\nQ.resolve = Q;\n\n/**\n * Performs a task in a future turn of the event loop.\n * @param {Function} task\n */\nQ.nextTick = nextTick;\n\n/**\n * Controls whether or not long stack traces will be on\n */\nQ.longStackSupport = false;\n\n// enable long stacks if Q_DEBUG is set\nif (typeof process === \"object\" && process && process.env && process.env.Q_DEBUG) {\n    Q.longStackSupport = true;\n}\n\n/**\n * Constructs a {promise, resolve, reject} object.\n *\n * `resolve` is a callback to invoke with a more resolved value for the\n * promise. To fulfill the promise, invoke `resolve` with any value that is\n * not a thenable. To reject the promise, invoke `resolve` with a rejected\n * thenable, or invoke `reject` with the reason directly. To resolve the\n * promise to another thenable, thus putting it in the same state, invoke\n * `resolve` with that other thenable.\n */\nQ.defer = defer;\nfunction defer() {\n    // if \"messages\" is an \"Array\", that indicates that the promise has not yet\n    // been resolved.  If it is \"undefined\", it has been resolved.  Each\n    // element of the messages array is itself an array of complete arguments to\n    // forward to the resolved promise.  We coerce the resolution value to a\n    // promise using the `resolve` function because it handles both fully\n    // non-thenable values and other thenables gracefully.\n    var messages = [], progressListeners = [], resolvedPromise;\n\n    var deferred = object_create(defer.prototype);\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, operands) {\n        var args = array_slice(arguments);\n        if (messages) {\n            messages.push(args);\n            if (op === \"when\" && operands[1]) { // progress operand\n                progressListeners.push(operands[1]);\n            }\n        } else {\n            Q.nextTick(function () {\n                resolvedPromise.promiseDispatch.apply(resolvedPromise, args);\n            });\n        }\n    };\n\n    // XXX deprecated\n    promise.valueOf = function () {\n        if (messages) {\n            return promise;\n        }\n        var nearerValue = nearer(resolvedPromise);\n        if (isPromise(nearerValue)) {\n            resolvedPromise = nearerValue; // shorten chain\n        }\n        return nearerValue;\n    };\n\n    promise.inspect = function () {\n        if (!resolvedPromise) {\n            return { state: \"pending\" };\n        }\n        return resolvedPromise.inspect();\n    };\n\n    if (Q.longStackSupport && hasStacks) {\n        try {\n            throw new Error();\n        } catch (e) {\n            // NOTE: don't try to use `Error.captureStackTrace` or transfer the\n            // accessor around; that causes memory leaks as per GH-111. Just\n            // reify the stack trace as a string ASAP.\n            //\n            // At the same time, cut off the first line; it's always just\n            // \"[object Promise]\\n\", as per the `toString`.\n            promise.stack = e.stack.substring(e.stack.indexOf(\"\\n\") + 1);\n        }\n    }\n\n    // NOTE: we do the checks for `resolvedPromise` in each method, instead of\n    // consolidating them into `become`, since otherwise we'd create new\n    // promises with the lines `become(whatever(value))`. See e.g. GH-252.\n\n    function become(newPromise) {\n        resolvedPromise = newPromise;\n        promise.source = newPromise;\n\n        array_reduce(messages, function (undefined, message) {\n            Q.nextTick(function () {\n                newPromise.promiseDispatch.apply(newPromise, message);\n            });\n        }, void 0);\n\n        messages = void 0;\n        progressListeners = void 0;\n    }\n\n    deferred.promise = promise;\n    deferred.resolve = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(Q(value));\n    };\n\n    deferred.fulfill = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(fulfill(value));\n    };\n    deferred.reject = function (reason) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(reject(reason));\n    };\n    deferred.notify = function (progress) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        array_reduce(progressListeners, function (undefined, progressListener) {\n            Q.nextTick(function () {\n                progressListener(progress);\n            });\n        }, void 0);\n    };\n\n    return deferred;\n}\n\n/**\n * Creates a Node-style callback that will resolve or reject the deferred\n * promise.\n * @returns a nodeback\n */\ndefer.prototype.makeNodeResolver = function () {\n    var self = this;\n    return function (error, value) {\n        if (error) {\n            self.reject(error);\n        } else if (arguments.length > 2) {\n            self.resolve(array_slice(arguments, 1));\n        } else {\n            self.resolve(value);\n        }\n    };\n};\n\n/**\n * @param resolver {Function} a function that returns nothing and accepts\n * the resolve, reject, and notify functions for a deferred.\n * @returns a promise that may be resolved with the given resolve and reject\n * functions, or rejected by a thrown exception in resolver\n */\nQ.Promise = promise; // ES6\nQ.promise = promise;\nfunction promise(resolver) {\n    if (typeof resolver !== \"function\") {\n        throw new TypeError(\"resolver must be a function.\");\n    }\n    var deferred = defer();\n    try {\n        resolver(deferred.resolve, deferred.reject, deferred.notify);\n    } catch (reason) {\n        deferred.reject(reason);\n    }\n    return deferred.promise;\n}\n\npromise.race = race; // ES6\npromise.all = all; // ES6\npromise.reject = reject; // ES6\npromise.resolve = Q; // ES6\n\n// XXX experimental.  This method is a way to denote that a local value is\n// serializable and should be immediately dispatched to a remote upon request,\n// instead of passing a reference.\nQ.passByCopy = function (object) {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return object;\n};\n\nPromise.prototype.passByCopy = function () {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return this;\n};\n\n/**\n * If two promises eventually fulfill to the same value, promises that value,\n * but otherwise rejects.\n * @param x {Any*}\n * @param y {Any*}\n * @returns {Any*} a promise for x and y if they are the same, but a rejection\n * otherwise.\n *\n */\nQ.join = function (x, y) {\n    return Q(x).join(y);\n};\n\nPromise.prototype.join = function (that) {\n    return Q([this, that]).spread(function (x, y) {\n        if (x === y) {\n            // TODO: \"===\" should be Object.is or equiv\n            return x;\n        } else {\n            throw new Error(\"Can't join: not the same: \" + x + \" \" + y);\n        }\n    });\n};\n\n/**\n * Returns a promise for the first of an array of promises to become settled.\n * @param answers {Array[Any*]} promises to race\n * @returns {Any*} the first promise to be settled\n */\nQ.race = race;\nfunction race(answerPs) {\n    return promise(function (resolve, reject) {\n        // Switch to this once we can assume at least ES5\n        // answerPs.forEach(function (answerP) {\n        //     Q(answerP).then(resolve, reject);\n        // });\n        // Use this in the meantime\n        for (var i = 0, len = answerPs.length; i < len; i++) {\n            Q(answerPs[i]).then(resolve, reject);\n        }\n    });\n}\n\nPromise.prototype.race = function () {\n    return this.then(Q.race);\n};\n\n/**\n * Constructs a Promise with a promise descriptor object and optional fallback\n * function.  The descriptor contains methods like when(rejected), get(name),\n * set(name, value), post(name, args), and delete(name), which all\n * return either a value, a promise for a value, or a rejection.  The fallback\n * accepts the operation name, a resolver, and any further arguments that would\n * have been forwarded to the appropriate method above had a method been\n * provided with the proper name.  The API makes no guarantees about the nature\n * of the returned object, apart from that it is usable whereever promises are\n * bought and sold.\n */\nQ.makePromise = Promise;\nfunction Promise(descriptor, fallback, inspect) {\n    if (fallback === void 0) {\n        fallback = function (op) {\n            return reject(new Error(\n                \"Promise does not support operation: \" + op\n            ));\n        };\n    }\n    if (inspect === void 0) {\n        inspect = function () {\n            return {state: \"unknown\"};\n        };\n    }\n\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, args) {\n        var result;\n        try {\n            if (descriptor[op]) {\n                result = descriptor[op].apply(promise, args);\n            } else {\n                result = fallback.call(promise, op, args);\n            }\n        } catch (exception) {\n            result = reject(exception);\n        }\n        if (resolve) {\n            resolve(result);\n        }\n    };\n\n    promise.inspect = inspect;\n\n    // XXX deprecated `valueOf` and `exception` support\n    if (inspect) {\n        var inspected = inspect();\n        if (inspected.state === \"rejected\") {\n            promise.exception = inspected.reason;\n        }\n\n        promise.valueOf = function () {\n            var inspected = inspect();\n            if (inspected.state === \"pending\" ||\n                inspected.state === \"rejected\") {\n                return promise;\n            }\n            return inspected.value;\n        };\n    }\n\n    return promise;\n}\n\nPromise.prototype.toString = function () {\n    return \"[object Promise]\";\n};\n\nPromise.prototype.then = function (fulfilled, rejected, progressed) {\n    var self = this;\n    var deferred = defer();\n    var done = false;   // ensure the untrusted promise makes at most a\n                        // single call to one of the callbacks\n\n    function _fulfilled(value) {\n        try {\n            return typeof fulfilled === \"function\" ? fulfilled(value) : value;\n        } catch (exception) {\n            return reject(exception);\n        }\n    }\n\n    function _rejected(exception) {\n        if (typeof rejected === \"function\") {\n            makeStackTraceLong(exception, self);\n            try {\n                return rejected(exception);\n            } catch (newException) {\n                return reject(newException);\n            }\n        }\n        return reject(exception);\n    }\n\n    function _progressed(value) {\n        return typeof progressed === \"function\" ? progressed(value) : value;\n    }\n\n    Q.nextTick(function () {\n        self.promiseDispatch(function (value) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_fulfilled(value));\n        }, \"when\", [function (exception) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_rejected(exception));\n        }]);\n    });\n\n    // Progress propagator need to be attached in the current tick.\n    self.promiseDispatch(void 0, \"when\", [void 0, function (value) {\n        var newValue;\n        var threw = false;\n        try {\n            newValue = _progressed(value);\n        } catch (e) {\n            threw = true;\n            if (Q.onerror) {\n                Q.onerror(e);\n            } else {\n                throw e;\n            }\n        }\n\n        if (!threw) {\n            deferred.notify(newValue);\n        }\n    }]);\n\n    return deferred.promise;\n};\n\nQ.tap = function (promise, callback) {\n    return Q(promise).tap(callback);\n};\n\n/**\n * Works almost like \"finally\", but not called for rejections.\n * Original resolution value is passed through callback unaffected.\n * Callback may return a promise that will be awaited for.\n * @param {Function} callback\n * @returns {Q.Promise}\n * @example\n * doSomething()\n *   .then(...)\n *   .tap(console.log)\n *   .then(...);\n */\nPromise.prototype.tap = function (callback) {\n    callback = Q(callback);\n\n    return this.then(function (value) {\n        return callback.fcall(value).thenResolve(value);\n    });\n};\n\n/**\n * Registers an observer on a promise.\n *\n * Guarantees:\n *\n * 1. that fulfilled and rejected will be called only once.\n * 2. that either the fulfilled callback or the rejected callback will be\n *    called, but not both.\n * 3. that fulfilled and rejected will not be called in this turn.\n *\n * @param value      promise or immediate reference to observe\n * @param fulfilled  function to be called with the fulfilled value\n * @param rejected   function to be called with the rejection exception\n * @param progressed function to be called on any progress notifications\n * @return promise for the return value from the invoked callback\n */\nQ.when = when;\nfunction when(value, fulfilled, rejected, progressed) {\n    return Q(value).then(fulfilled, rejected, progressed);\n}\n\nPromise.prototype.thenResolve = function (value) {\n    return this.then(function () { return value; });\n};\n\nQ.thenResolve = function (promise, value) {\n    return Q(promise).thenResolve(value);\n};\n\nPromise.prototype.thenReject = function (reason) {\n    return this.then(function () { throw reason; });\n};\n\nQ.thenReject = function (promise, reason) {\n    return Q(promise).thenReject(reason);\n};\n\n/**\n * If an object is not a promise, it is as \"near\" as possible.\n * If a promise is rejected, it is as \"near\" as possible too.\n * If it’s a fulfilled promise, the fulfillment value is nearer.\n * If it’s a deferred promise and the deferred has been resolved, the\n * resolution is \"nearer\".\n * @param object\n * @returns most resolved (nearest) form of the object\n */\n\n// XXX should we re-do this?\nQ.nearer = nearer;\nfunction nearer(value) {\n    if (isPromise(value)) {\n        var inspected = value.inspect();\n        if (inspected.state === \"fulfilled\") {\n            return inspected.value;\n        }\n    }\n    return value;\n}\n\n/**\n * @returns whether the given object is a promise.\n * Otherwise it is a fulfilled value.\n */\nQ.isPromise = isPromise;\nfunction isPromise(object) {\n    return object instanceof Promise;\n}\n\nQ.isPromiseAlike = isPromiseAlike;\nfunction isPromiseAlike(object) {\n    return isObject(object) && typeof object.then === \"function\";\n}\n\n/**\n * @returns whether the given object is a pending promise, meaning not\n * fulfilled or rejected.\n */\nQ.isPending = isPending;\nfunction isPending(object) {\n    return isPromise(object) && object.inspect().state === \"pending\";\n}\n\nPromise.prototype.isPending = function () {\n    return this.inspect().state === \"pending\";\n};\n\n/**\n * @returns whether the given object is a value or fulfilled\n * promise.\n */\nQ.isFulfilled = isFulfilled;\nfunction isFulfilled(object) {\n    return !isPromise(object) || object.inspect().state === \"fulfilled\";\n}\n\nPromise.prototype.isFulfilled = function () {\n    return this.inspect().state === \"fulfilled\";\n};\n\n/**\n * @returns whether the given object is a rejected promise.\n */\nQ.isRejected = isRejected;\nfunction isRejected(object) {\n    return isPromise(object) && object.inspect().state === \"rejected\";\n}\n\nPromise.prototype.isRejected = function () {\n    return this.inspect().state === \"rejected\";\n};\n\n//// BEGIN UNHANDLED REJECTION TRACKING\n\n// This promise library consumes exceptions thrown in handlers so they can be\n// handled by a subsequent promise.  The exceptions get added to this array when\n// they are created, and removed when they are handled.  Note that in ES6 or\n// shimmed environments, this would naturally be a `Set`.\nvar unhandledReasons = [];\nvar unhandledRejections = [];\nvar reportedUnhandledRejections = [];\nvar trackUnhandledRejections = true;\n\nfunction resetUnhandledRejections() {\n    unhandledReasons.length = 0;\n    unhandledRejections.length = 0;\n\n    if (!trackUnhandledRejections) {\n        trackUnhandledRejections = true;\n    }\n}\n\nfunction trackRejection(promise, reason) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n    if (typeof process === \"object\" && typeof process.emit === \"function\") {\n        Q.nextTick.runAfter(function () {\n            if (array_indexOf(unhandledRejections, promise) !== -1) {\n                process.emit(\"unhandledRejection\", reason, promise);\n                reportedUnhandledRejections.push(promise);\n            }\n        });\n    }\n\n    unhandledRejections.push(promise);\n    if (reason && typeof reason.stack !== \"undefined\") {\n        unhandledReasons.push(reason.stack);\n    } else {\n        unhandledReasons.push(\"(no stack) \" + reason);\n    }\n}\n\nfunction untrackRejection(promise) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n\n    var at = array_indexOf(unhandledRejections, promise);\n    if (at !== -1) {\n        if (typeof process === \"object\" && typeof process.emit === \"function\") {\n            Q.nextTick.runAfter(function () {\n                var atReport = array_indexOf(reportedUnhandledRejections, promise);\n                if (atReport !== -1) {\n                    process.emit(\"rejectionHandled\", unhandledReasons[at], promise);\n                    reportedUnhandledRejections.splice(atReport, 1);\n                }\n            });\n        }\n        unhandledRejections.splice(at, 1);\n        unhandledReasons.splice(at, 1);\n    }\n}\n\nQ.resetUnhandledRejections = resetUnhandledRejections;\n\nQ.getUnhandledReasons = function () {\n    // Make a copy so that consumers can't interfere with our internal state.\n    return unhandledReasons.slice();\n};\n\nQ.stopUnhandledRejectionTracking = function () {\n    resetUnhandledRejections();\n    trackUnhandledRejections = false;\n};\n\nresetUnhandledRejections();\n\n//// END UNHANDLED REJECTION TRACKING\n\n/**\n * Constructs a rejected promise.\n * @param reason value describing the failure\n */\nQ.reject = reject;\nfunction reject(reason) {\n    var rejection = Promise({\n        \"when\": function (rejected) {\n            // note that the error has been handled\n            if (rejected) {\n                untrackRejection(this);\n            }\n            return rejected ? rejected(reason) : this;\n        }\n    }, function fallback() {\n        return this;\n    }, function inspect() {\n        return { state: \"rejected\", reason: reason };\n    });\n\n    // Note that the reason has not been handled.\n    trackRejection(rejection, reason);\n\n    return rejection;\n}\n\n/**\n * Constructs a fulfilled promise for an immediate reference.\n * @param value immediate reference\n */\nQ.fulfill = fulfill;\nfunction fulfill(value) {\n    return Promise({\n        \"when\": function () {\n            return value;\n        },\n        \"get\": function (name) {\n            return value[name];\n        },\n        \"set\": function (name, rhs) {\n            value[name] = rhs;\n        },\n        \"delete\": function (name) {\n            delete value[name];\n        },\n        \"post\": function (name, args) {\n            // Mark Miller proposes that post with no name should apply a\n            // promised function.\n            if (name === null || name === void 0) {\n                return value.apply(void 0, args);\n            } else {\n                return value[name].apply(value, args);\n            }\n        },\n        \"apply\": function (thisp, args) {\n            return value.apply(thisp, args);\n        },\n        \"keys\": function () {\n            return object_keys(value);\n        }\n    }, void 0, function inspect() {\n        return { state: \"fulfilled\", value: value };\n    });\n}\n\n/**\n * Converts thenables to Q promises.\n * @param promise thenable promise\n * @returns a Q promise\n */\nfunction coerce(promise) {\n    var deferred = defer();\n    Q.nextTick(function () {\n        try {\n            promise.then(deferred.resolve, deferred.reject, deferred.notify);\n        } catch (exception) {\n            deferred.reject(exception);\n        }\n    });\n    return deferred.promise;\n}\n\n/**\n * Annotates an object such that it will never be\n * transferred away from this process over any promise\n * communication channel.\n * @param object\n * @returns promise a wrapping of that object that\n * additionally responds to the \"isDef\" message\n * without a rejection.\n */\nQ.master = master;\nfunction master(object) {\n    return Promise({\n        \"isDef\": function () {}\n    }, function fallback(op, args) {\n        return dispatch(object, op, args);\n    }, function () {\n        return Q(object).inspect();\n    });\n}\n\n/**\n * Spreads the values of a promised array of arguments into the\n * fulfillment callback.\n * @param fulfilled callback that receives variadic arguments from the\n * promised array\n * @param rejected callback that receives the exception if the promise\n * is rejected.\n * @returns a promise for the return value or thrown exception of\n * either callback.\n */\nQ.spread = spread;\nfunction spread(value, fulfilled, rejected) {\n    return Q(value).spread(fulfilled, rejected);\n}\n\nPromise.prototype.spread = function (fulfilled, rejected) {\n    return this.all().then(function (array) {\n        return fulfilled.apply(void 0, array);\n    }, rejected);\n};\n\n/**\n * The async function is a decorator for generator functions, turning\n * them into asynchronous generators.  Although generators are only part\n * of the newest ECMAScript 6 drafts, this code does not cause syntax\n * errors in older engines.  This code should continue to work and will\n * in fact improve over time as the language improves.\n *\n * ES6 generators are currently part of V8 version 3.19 with the\n * --harmony-generators runtime flag enabled.  SpiderMonkey has had them\n * for longer, but under an older Python-inspired form.  This function\n * works on both kinds of generators.\n *\n * Decorates a generator function such that:\n *  - it may yield promises\n *  - execution will continue when that promise is fulfilled\n *  - the value of the yield expression will be the fulfilled value\n *  - it returns a promise for the return value (when the generator\n *    stops iterating)\n *  - the decorated function returns a promise for the return value\n *    of the generator or the first rejected promise among those\n *    yielded.\n *  - if an error is thrown in the generator, it propagates through\n *    every following yield until it is caught, or until it escapes\n *    the generator function altogether, and is translated into a\n *    rejection for the promise returned by the decorated generator.\n */\nQ.async = async;\nfunction async(makeGenerator) {\n    return function () {\n        // when verb is \"send\", arg is a value\n        // when verb is \"throw\", arg is an exception\n        function continuer(verb, arg) {\n            var result;\n\n            // Until V8 3.19 / Chromium 29 is released, SpiderMonkey is the only\n            // engine that has a deployed base of browsers that support generators.\n            // However, SM's generators use the Python-inspired semantics of\n            // outdated ES6 drafts.  We would like to support ES6, but we'd also\n            // like to make it possible to use generators in deployed browsers, so\n            // we also support Python-style generators.  At some point we can remove\n            // this block.\n\n            if (typeof StopIteration === \"undefined\") {\n                // ES6 Generators\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    return reject(exception);\n                }\n                if (result.done) {\n                    return Q(result.value);\n                } else {\n                    return when(result.value, callback, errback);\n                }\n            } else {\n                // SpiderMonkey Generators\n                // FIXME: Remove this case when SM does ES6 generators.\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    if (isStopIteration(exception)) {\n                        return Q(exception.value);\n                    } else {\n                        return reject(exception);\n                    }\n                }\n                return when(result, callback, errback);\n            }\n        }\n        var generator = makeGenerator.apply(this, arguments);\n        var callback = continuer.bind(continuer, \"next\");\n        var errback = continuer.bind(continuer, \"throw\");\n        return callback();\n    };\n}\n\n/**\n * The spawn function is a small wrapper around async that immediately\n * calls the generator and also ends the promise chain, so that any\n * unhandled errors are thrown instead of forwarded to the error\n * handler. This is useful because it's extremely common to run\n * generators at the top-level to work with libraries.\n */\nQ.spawn = spawn;\nfunction spawn(makeGenerator) {\n    Q.done(Q.async(makeGenerator)());\n}\n\n// FIXME: Remove this interface once ES6 generators are in SpiderMonkey.\n/**\n * Throws a ReturnValue exception to stop an asynchronous generator.\n *\n * This interface is a stop-gap measure to support generator return\n * values in older Firefox/SpiderMonkey.  In browsers that support ES6\n * generators like Chromium 29, just use \"return\" in your generator\n * functions.\n *\n * @param value the return value for the surrounding generator\n * @throws ReturnValue exception with the value.\n * @example\n * // ES6 style\n * Q.async(function* () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      return foo + bar;\n * })\n * // Older SpiderMonkey style\n * Q.async(function () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      Q.return(foo + bar);\n * })\n */\nQ[\"return\"] = _return;\nfunction _return(value) {\n    throw new QReturnValue(value);\n}\n\n/**\n * The promised function decorator ensures that any promise arguments\n * are settled and passed as values (`this` is also settled and passed\n * as a value).  It will also ensure that the result of a function is\n * always a promise.\n *\n * @example\n * var add = Q.promised(function (a, b) {\n *     return a + b;\n * });\n * add(Q(a), Q(B));\n *\n * @param {function} callback The function to decorate\n * @returns {function} a function that has been decorated.\n */\nQ.promised = promised;\nfunction promised(callback) {\n    return function () {\n        return spread([this, all(arguments)], function (self, args) {\n            return callback.apply(self, args);\n        });\n    };\n}\n\n/**\n * sends a message to a value in a future turn\n * @param object* the recipient\n * @param op the name of the message operation, e.g., \"when\",\n * @param args further arguments to be forwarded to the operation\n * @returns result {Promise} a promise for the result of the operation\n */\nQ.dispatch = dispatch;\nfunction dispatch(object, op, args) {\n    return Q(object).dispatch(op, args);\n}\n\nPromise.prototype.dispatch = function (op, args) {\n    var self = this;\n    var deferred = defer();\n    Q.nextTick(function () {\n        self.promiseDispatch(deferred.resolve, op, args);\n    });\n    return deferred.promise;\n};\n\n/**\n * Gets the value of a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to get\n * @return promise for the property value\n */\nQ.get = function (object, key) {\n    return Q(object).dispatch(\"get\", [key]);\n};\n\nPromise.prototype.get = function (key) {\n    return this.dispatch(\"get\", [key]);\n};\n\n/**\n * Sets the value of a property in a future turn.\n * @param object    promise or immediate reference for object object\n * @param name      name of property to set\n * @param value     new value of property\n * @return promise for the return value\n */\nQ.set = function (object, key, value) {\n    return Q(object).dispatch(\"set\", [key, value]);\n};\n\nPromise.prototype.set = function (key, value) {\n    return this.dispatch(\"set\", [key, value]);\n};\n\n/**\n * Deletes a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to delete\n * @return promise for the return value\n */\nQ.del = // XXX legacy\nQ[\"delete\"] = function (object, key) {\n    return Q(object).dispatch(\"delete\", [key]);\n};\n\nPromise.prototype.del = // XXX legacy\nPromise.prototype[\"delete\"] = function (key) {\n    return this.dispatch(\"delete\", [key]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param value     a value to post, typically an array of\n *                  invocation arguments for promises that\n *                  are ultimately backed with `resolve` values,\n *                  as opposed to those backed with URLs\n *                  wherein the posted value can be any\n *                  JSON serializable object.\n * @return promise for the return value\n */\n// bound locally because it is used by other methods\nQ.mapply = // XXX As proposed by \"Redsandro\"\nQ.post = function (object, name, args) {\n    return Q(object).dispatch(\"post\", [name, args]);\n};\n\nPromise.prototype.mapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.post = function (name, args) {\n    return this.dispatch(\"post\", [name, args]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param ...args   array of invocation arguments\n * @return promise for the return value\n */\nQ.send = // XXX Mark Miller's proposed parlance\nQ.mcall = // XXX As proposed by \"Redsandro\"\nQ.invoke = function (object, name /*...args*/) {\n    return Q(object).dispatch(\"post\", [name, array_slice(arguments, 2)]);\n};\n\nPromise.prototype.send = // XXX Mark Miller's proposed parlance\nPromise.prototype.mcall = // XXX As proposed by \"Redsandro\"\nPromise.prototype.invoke = function (name /*...args*/) {\n    return this.dispatch(\"post\", [name, array_slice(arguments, 1)]);\n};\n\n/**\n * Applies the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param args      array of application arguments\n */\nQ.fapply = function (object, args) {\n    return Q(object).dispatch(\"apply\", [void 0, args]);\n};\n\nPromise.prototype.fapply = function (args) {\n    return this.dispatch(\"apply\", [void 0, args]);\n};\n\n/**\n * Calls the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ[\"try\"] =\nQ.fcall = function (object /* ...args*/) {\n    return Q(object).dispatch(\"apply\", [void 0, array_slice(arguments, 1)]);\n};\n\nPromise.prototype.fcall = function (/*...args*/) {\n    return this.dispatch(\"apply\", [void 0, array_slice(arguments)]);\n};\n\n/**\n * Binds the promised function, transforming return values into a fulfilled\n * promise and thrown errors into a rejected one.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ.fbind = function (object /*...args*/) {\n    var promise = Q(object);\n    var args = array_slice(arguments, 1);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\nPromise.prototype.fbind = function (/*...args*/) {\n    var promise = this;\n    var args = array_slice(arguments);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\n\n/**\n * Requests the names of the owned properties of a promised\n * object in a future turn.\n * @param object    promise or immediate reference for target object\n * @return promise for the keys of the eventually settled object\n */\nQ.keys = function (object) {\n    return Q(object).dispatch(\"keys\", []);\n};\n\nPromise.prototype.keys = function () {\n    return this.dispatch(\"keys\", []);\n};\n\n/**\n * Turns an array of promises into a promise for an array.  If any of\n * the promises gets rejected, the whole array is rejected immediately.\n * @param {Array*} an array (or promise for an array) of values (or\n * promises for values)\n * @returns a promise for an array of the corresponding values\n */\n// By Mark Miller\n// http://wiki.ecmascript.org/doku.php?id=strawman:concurrency&rev=1308776521#allfulfilled\nQ.all = all;\nfunction all(promises) {\n    return when(promises, function (promises) {\n        var pendingCount = 0;\n        var deferred = defer();\n        array_reduce(promises, function (undefined, promise, index) {\n            var snapshot;\n            if (\n                isPromise(promise) &&\n                (snapshot = promise.inspect()).state === \"fulfilled\"\n            ) {\n                promises[index] = snapshot.value;\n            } else {\n                ++pendingCount;\n                when(\n                    promise,\n                    function (value) {\n                        promises[index] = value;\n                        if (--pendingCount === 0) {\n                            deferred.resolve(promises);\n                        }\n                    },\n                    deferred.reject,\n                    function (progress) {\n                        deferred.notify({ index: index, value: progress });\n                    }\n                );\n            }\n        }, void 0);\n        if (pendingCount === 0) {\n            deferred.resolve(promises);\n        }\n        return deferred.promise;\n    });\n}\n\nPromise.prototype.all = function () {\n    return all(this);\n};\n\n/**\n * Returns the first resolved promise of an array. Prior rejected promises are\n * ignored.  Rejects only if all promises are rejected.\n * @param {Array*} an array containing values or promises for values\n * @returns a promise fulfilled with the value of the first resolved promise,\n * or a rejected promise if all promises are rejected.\n */\nQ.any = any;\n\nfunction any(promises) {\n    if (promises.length === 0) {\n        return Q.resolve();\n    }\n\n    var deferred = Q.defer();\n    var pendingCount = 0;\n    array_reduce(promises, function (prev, current, index) {\n        var promise = promises[index];\n\n        pendingCount++;\n\n        when(promise, onFulfilled, onRejected, onProgress);\n        function onFulfilled(result) {\n            deferred.resolve(result);\n        }\n        function onRejected() {\n            pendingCount--;\n            if (pendingCount === 0) {\n                deferred.reject(new Error(\n                    \"Can't get fulfillment value from any promise, all \" +\n                    \"promises were rejected.\"\n                ));\n            }\n        }\n        function onProgress(progress) {\n            deferred.notify({\n                index: index,\n                value: progress\n            });\n        }\n    }, undefined);\n\n    return deferred.promise;\n}\n\nPromise.prototype.any = function () {\n    return any(this);\n};\n\n/**\n * Waits for all promises to be settled, either fulfilled or\n * rejected.  This is distinct from `all` since that would stop\n * waiting at the first rejection.  The promise returned by\n * `allResolved` will never be rejected.\n * @param promises a promise for an array (or an array) of promises\n * (or values)\n * @return a promise for an array of promises\n */\nQ.allResolved = deprecate(allResolved, \"allResolved\", \"allSettled\");\nfunction allResolved(promises) {\n    return when(promises, function (promises) {\n        promises = array_map(promises, Q);\n        return when(all(array_map(promises, function (promise) {\n            return when(promise, noop, noop);\n        })), function () {\n            return promises;\n        });\n    });\n}\n\nPromise.prototype.allResolved = function () {\n    return allResolved(this);\n};\n\n/**\n * @see Promise#allSettled\n */\nQ.allSettled = allSettled;\nfunction allSettled(promises) {\n    return Q(promises).allSettled();\n}\n\n/**\n * Turns an array of promises into a promise for an array of their states (as\n * returned by `inspect`) when they have all settled.\n * @param {Array[Any*]} values an array (or promise for an array) of values (or\n * promises for values)\n * @returns {Array[State]} an array of states for the respective values.\n */\nPromise.prototype.allSettled = function () {\n    return this.then(function (promises) {\n        return all(array_map(promises, function (promise) {\n            promise = Q(promise);\n            function regardless() {\n                return promise.inspect();\n            }\n            return promise.then(regardless, regardless);\n        }));\n    });\n};\n\n/**\n * Captures the failure of a promise, giving an oportunity to recover\n * with a callback.  If the given promise is fulfilled, the returned\n * promise is fulfilled.\n * @param {Any*} promise for something\n * @param {Function} callback to fulfill the returned promise if the\n * given promise is rejected\n * @returns a promise for the return value of the callback\n */\nQ.fail = // XXX legacy\nQ[\"catch\"] = function (object, rejected) {\n    return Q(object).then(void 0, rejected);\n};\n\nPromise.prototype.fail = // XXX legacy\nPromise.prototype[\"catch\"] = function (rejected) {\n    return this.then(void 0, rejected);\n};\n\n/**\n * Attaches a listener that can respond to progress notifications from a\n * promise's originating deferred. This listener receives the exact arguments\n * passed to ``deferred.notify``.\n * @param {Any*} promise for something\n * @param {Function} callback to receive any progress notifications\n * @returns the given promise, unchanged\n */\nQ.progress = progress;\nfunction progress(object, progressed) {\n    return Q(object).then(void 0, void 0, progressed);\n}\n\nPromise.prototype.progress = function (progressed) {\n    return this.then(void 0, void 0, progressed);\n};\n\n/**\n * Provides an opportunity to observe the settling of a promise,\n * regardless of whether the promise is fulfilled or rejected.  Forwards\n * the resolution to the returned promise when the callback is done.\n * The callback can return a promise to defer completion.\n * @param {Any*} promise\n * @param {Function} callback to observe the resolution of the given\n * promise, takes no arguments.\n * @returns a promise for the resolution of the given promise when\n * ``fin`` is done.\n */\nQ.fin = // XXX legacy\nQ[\"finally\"] = function (object, callback) {\n    return Q(object)[\"finally\"](callback);\n};\n\nPromise.prototype.fin = // XXX legacy\nPromise.prototype[\"finally\"] = function (callback) {\n    callback = Q(callback);\n    return this.then(function (value) {\n        return callback.fcall().then(function () {\n            return value;\n        });\n    }, function (reason) {\n        // TODO attempt to recycle the rejection with \"this\".\n        return callback.fcall().then(function () {\n            throw reason;\n        });\n    });\n};\n\n/**\n * Terminates a chain of promises, forcing rejections to be\n * thrown as exceptions.\n * @param {Any*} promise at the end of a chain of promises\n * @returns nothing\n */\nQ.done = function (object, fulfilled, rejected, progress) {\n    return Q(object).done(fulfilled, rejected, progress);\n};\n\nPromise.prototype.done = function (fulfilled, rejected, progress) {\n    var onUnhandledError = function (error) {\n        // forward to a future turn so that ``when``\n        // does not catch it and turn it into a rejection.\n        Q.nextTick(function () {\n            makeStackTraceLong(error, promise);\n            if (Q.onerror) {\n                Q.onerror(error);\n            } else {\n                throw error;\n            }\n        });\n    };\n\n    // Avoid unnecessary `nextTick`ing via an unnecessary `when`.\n    var promise = fulfilled || rejected || progress ?\n        this.then(fulfilled, rejected, progress) :\n        this;\n\n    if (typeof process === \"object\" && process && process.domain) {\n        onUnhandledError = process.domain.bind(onUnhandledError);\n    }\n\n    promise.then(void 0, onUnhandledError);\n};\n\n/**\n * Causes a promise to be rejected if it does not get fulfilled before\n * some milliseconds time out.\n * @param {Any*} promise\n * @param {Number} milliseconds timeout\n * @param {Any*} custom error message or Error object (optional)\n * @returns a promise for the resolution of the given promise if it is\n * fulfilled before the timeout, otherwise rejected.\n */\nQ.timeout = function (object, ms, error) {\n    return Q(object).timeout(ms, error);\n};\n\nPromise.prototype.timeout = function (ms, error) {\n    var deferred = defer();\n    var timeoutId = setTimeout(function () {\n        if (!error || \"string\" === typeof error) {\n            error = new Error(error || \"Timed out after \" + ms + \" ms\");\n            error.code = \"ETIMEDOUT\";\n        }\n        deferred.reject(error);\n    }, ms);\n\n    this.then(function (value) {\n        clearTimeout(timeoutId);\n        deferred.resolve(value);\n    }, function (exception) {\n        clearTimeout(timeoutId);\n        deferred.reject(exception);\n    }, deferred.notify);\n\n    return deferred.promise;\n};\n\n/**\n * Returns a promise for the given value (or promised value), some\n * milliseconds after it resolved. Passes rejections immediately.\n * @param {Any*} promise\n * @param {Number} milliseconds\n * @returns a promise for the resolution of the given promise after milliseconds\n * time has elapsed since the resolution of the given promise.\n * If the given promise rejects, that is passed immediately.\n */\nQ.delay = function (object, timeout) {\n    if (timeout === void 0) {\n        timeout = object;\n        object = void 0;\n    }\n    return Q(object).delay(timeout);\n};\n\nPromise.prototype.delay = function (timeout) {\n    return this.then(function (value) {\n        var deferred = defer();\n        setTimeout(function () {\n            deferred.resolve(value);\n        }, timeout);\n        return deferred.promise;\n    });\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided as an array, and returns a promise.\n *\n *      Q.nfapply(FS.readFile, [__filename])\n *      .then(function (content) {\n *      })\n *\n */\nQ.nfapply = function (callback, args) {\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfapply = function (args) {\n    var deferred = defer();\n    var nodeArgs = array_slice(args);\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided individually, and returns a promise.\n * @example\n * Q.nfcall(FS.readFile, __filename)\n * .then(function (content) {\n * })\n *\n */\nQ.nfcall = function (callback /*...args*/) {\n    var args = array_slice(arguments, 1);\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfcall = function (/*...args*/) {\n    var nodeArgs = array_slice(arguments);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Wraps a NodeJS continuation passing function and returns an equivalent\n * version that returns a promise.\n * @example\n * Q.nfbind(FS.readFile, __filename)(\"utf-8\")\n * .then(console.log)\n * .done()\n */\nQ.nfbind =\nQ.denodeify = function (callback /*...args*/) {\n    var baseArgs = array_slice(arguments, 1);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        Q(callback).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nfbind =\nPromise.prototype.denodeify = function (/*...args*/) {\n    var args = array_slice(arguments);\n    args.unshift(this);\n    return Q.denodeify.apply(void 0, args);\n};\n\nQ.nbind = function (callback, thisp /*...args*/) {\n    var baseArgs = array_slice(arguments, 2);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        function bound() {\n            return callback.apply(thisp, arguments);\n        }\n        Q(bound).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nbind = function (/*thisp, ...args*/) {\n    var args = array_slice(arguments, 0);\n    args.unshift(this);\n    return Q.nbind.apply(void 0, args);\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback with a given array of arguments, plus a provided callback.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param {Array} args arguments to pass to the method; the callback\n * will be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nmapply = // XXX As proposed by \"Redsandro\"\nQ.npost = function (object, name, args) {\n    return Q(object).npost(name, args);\n};\n\nPromise.prototype.nmapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.npost = function (name, args) {\n    var nodeArgs = array_slice(args || []);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback, forwarding the given variadic arguments, plus a provided\n * callback argument.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param ...args arguments to pass to the method; the callback will\n * be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nsend = // XXX Based on Mark Miller's proposed \"send\"\nQ.nmcall = // XXX Based on \"Redsandro's\" proposal\nQ.ninvoke = function (object, name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 2);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    Q(object).dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\nPromise.prototype.nsend = // XXX Based on Mark Miller's proposed \"send\"\nPromise.prototype.nmcall = // XXX Based on \"Redsandro's\" proposal\nPromise.prototype.ninvoke = function (name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 1);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * If a function would like to support both Node continuation-passing-style and\n * promise-returning-style, it can end its internal promise chain with\n * `nodeify(nodeback)`, forwarding the optional nodeback argument.  If the user\n * elects to use a nodeback, the result will be sent there.  If they do not\n * pass a nodeback, they will receive the result promise.\n * @param object a result (or a promise for a result)\n * @param {Function} nodeback a Node.js-style callback\n * @returns either the promise or nothing\n */\nQ.nodeify = nodeify;\nfunction nodeify(object, nodeback) {\n    return Q(object).nodeify(nodeback);\n}\n\nPromise.prototype.nodeify = function (nodeback) {\n    if (nodeback) {\n        this.then(function (value) {\n            Q.nextTick(function () {\n                nodeback(null, value);\n            });\n        }, function (error) {\n            Q.nextTick(function () {\n                nodeback(error);\n            });\n        });\n    } else {\n        return this;\n    }\n};\n\nQ.noConflict = function() {\n    throw new Error(\"Q.noConflict only works when Q is used as a global\");\n};\n\n// All code before this point will be filtered from stack traces.\nvar qEndingLine = captureLine();\n\nreturn Q;\n\n});\n\n}).call(this,require('_process'))\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["node_modules/q/q.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["// vim:ts=4:sts=4:sw=4:\n/*!\n *\n * Copyright 2009-2012 Kris Kowal under the terms of the MIT\n * license found at http://github.com/kriskowal/q/raw/master/LICENSE\n *\n * With parts by Tyler Close\n * Copyright 2007-2009 Tyler Close under the terms of the MIT X license found\n * at http://www.opensource.org/licenses/mit-license.html\n * Forked at ref_send.js version: 2009-05-11\n *\n * With parts by Mark Miller\n * Copyright (C) 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\n\n(function (definition) {\n    \"use strict\";\n\n    // This file will function properly as a <script> tag, or a module\n    // using CommonJS and NodeJS or RequireJS module formats.  In\n    // Common/Node/RequireJS, the module exports the Q API and when\n    // executed as a simple <script>, it creates a Q global instead.\n\n    // Montage Require\n    if (typeof bootstrap === \"function\") {\n        bootstrap(\"promise\", definition);\n\n    // CommonJS\n    } else if (typeof exports === \"object\" && typeof module === \"object\") {\n        module.exports = definition();\n\n    // RequireJS\n    } else if (typeof define === \"function\" && define.amd) {\n        define(definition);\n\n    // SES (Secure EcmaScript)\n    } else if (typeof ses !== \"undefined\") {\n        if (!ses.ok()) {\n            return;\n        } else {\n            ses.makeQ = definition;\n        }\n\n    // <script>\n    } else if (typeof window !== \"undefined\" || typeof self !== \"undefined\") {\n        // Prefer window over self for add-on scripts. Use self for\n        // non-windowed contexts.\n        var global = typeof window !== \"undefined\" ? window : self;\n\n        // Get the `window` object, save the previous Q global\n        // and initialize Q as a global.\n        var previousQ = global.Q;\n        global.Q = definition();\n\n        // Add a noConflict function so Q can be removed from the\n        // global namespace.\n        global.Q.noConflict = function () {\n            global.Q = previousQ;\n            return this;\n        };\n\n    } else {\n        throw new Error(\"This environment was not anticipated by Q. Please file a bug.\");\n    }\n\n})(function () {\n\"use strict\";\n\nvar hasStacks = false;\ntry {\n    throw new Error();\n} catch (e) {\n    hasStacks = !!e.stack;\n}\n\n// All code after this point will be filtered from stack traces reported\n// by Q.\nvar qStartingLine = captureLine();\nvar qFileName;\n\n// shims\n\n// used for fallback in \"allResolved\"\nvar noop = function () {};\n\n// Use the fastest possible means to execute a task in a future turn\n// of the event loop.\nvar nextTick =(function () {\n    // linked list of tasks (single, with head node)\n    var head = {task: void 0, next: null};\n    var tail = head;\n    var flushing = false;\n    var requestTick = void 0;\n    var isNodeJS = false;\n    // queue for late tasks, used by unhandled rejection tracking\n    var laterQueue = [];\n\n    function flush() {\n        /* jshint loopfunc: true */\n        var task, domain;\n\n        while (head.next) {\n            head = head.next;\n            task = head.task;\n            head.task = void 0;\n            domain = head.domain;\n\n            if (domain) {\n                head.domain = void 0;\n                domain.enter();\n            }\n            runSingle(task, domain);\n\n        }\n        while (laterQueue.length) {\n            task = laterQueue.pop();\n            runSingle(task);\n        }\n        flushing = false;\n    }\n    // runs a single function in the async queue\n    function runSingle(task, domain) {\n        try {\n            task();\n\n        } catch (e) {\n            if (isNodeJS) {\n                // In node, uncaught exceptions are considered fatal errors.\n                // Re-throw them synchronously to interrupt flushing!\n\n                // Ensure continuation if the uncaught exception is suppressed\n                // listening \"uncaughtException\" events (as domains does).\n                // Continue in next event to avoid tick recursion.\n                if (domain) {\n                    domain.exit();\n                }\n                setTimeout(flush, 0);\n                if (domain) {\n                    domain.enter();\n                }\n\n                throw e;\n\n            } else {\n                // In browsers, uncaught exceptions are not fatal.\n                // Re-throw them asynchronously to avoid slow-downs.\n                setTimeout(function () {\n                    throw e;\n                }, 0);\n            }\n        }\n\n        if (domain) {\n            domain.exit();\n        }\n    }\n\n    nextTick = function (task) {\n        tail = tail.next = {\n            task: task,\n            domain: isNodeJS && process.domain,\n            next: null\n        };\n\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n\n    if (typeof process === \"object\" &&\n        process.toString() === \"[object process]\" && process.nextTick) {\n        // Ensure Q is in a real Node environment, with a `process.nextTick`.\n        // To see through fake Node environments:\n        // * Mocha test runner - exposes a `process` global without a `nextTick`\n        // * Browserify - exposes a `process.nexTick` function that uses\n        //   `setTimeout`. In this case `setImmediate` is preferred because\n        //    it is faster. Browserify's `process.toString()` yields\n        //   \"[object Object]\", while in a real Node environment\n        //   `process.nextTick()` yields \"[object process]\".\n        isNodeJS = true;\n\n        requestTick = function () {\n            process.nextTick(flush);\n        };\n\n    } else if (typeof setImmediate === \"function\") {\n        // In IE10, Node.js 0.9+, or https://github.com/NobleJS/setImmediate\n        if (typeof window !== \"undefined\") {\n            requestTick = setImmediate.bind(window, flush);\n        } else {\n            requestTick = function () {\n                setImmediate(flush);\n            };\n        }\n\n    } else if (typeof MessageChannel !== \"undefined\") {\n        // modern browsers\n        // http://www.nonblocking.io/2011/06/windownexttick.html\n        var channel = new MessageChannel();\n        // At least Safari Version 6.0.5 (8536.30.1) intermittently cannot create\n        // working message ports the first time a page loads.\n        channel.port1.onmessage = function () {\n            requestTick = requestPortTick;\n            channel.port1.onmessage = flush;\n            flush();\n        };\n        var requestPortTick = function () {\n            // Opera requires us to provide a message payload, regardless of\n            // whether we use it.\n            channel.port2.postMessage(0);\n        };\n        requestTick = function () {\n            setTimeout(flush, 0);\n            requestPortTick();\n        };\n\n    } else {\n        // old browsers\n        requestTick = function () {\n            setTimeout(flush, 0);\n        };\n    }\n    // runs a task after all other tasks have been run\n    // this is useful for unhandled rejection tracking that needs to happen\n    // after all `then`d tasks have been run.\n    nextTick.runAfter = function (task) {\n        laterQueue.push(task);\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n    return nextTick;\n})();\n\n// Attempt to make generics safe in the face of downstream\n// modifications.\n// There is no situation where this is necessary.\n// If you need a security guarantee, these primordials need to be\n// deeply frozen anyway, and if you don’t need a security guarantee,\n// this is just plain paranoid.\n// However, this **might** have the nice side-effect of reducing the size of\n// the minified code by reducing x.call() to merely x()\n// See Mark Miller’s explanation of what this does.\n// http://wiki.ecmascript.org/doku.php?id=conventions:safe_meta_programming\nvar call = Function.call;\nfunction uncurryThis(f) {\n    return function () {\n        return call.apply(f, arguments);\n    };\n}\n// This is equivalent, but slower:\n// uncurryThis = Function_bind.bind(Function_bind.call);\n// http://jsperf.com/uncurrythis\n\nvar array_slice = uncurryThis(Array.prototype.slice);\n\nvar array_reduce = uncurryThis(\n    Array.prototype.reduce || function (callback, basis) {\n        var index = 0,\n            length = this.length;\n        // concerning the initial value, if one is not provided\n        if (arguments.length === 1) {\n            // seek to the first value in the array, accounting\n            // for the possibility that is is a sparse array\n            do {\n                if (index in this) {\n                    basis = this[index++];\n                    break;\n                }\n                if (++index >= length) {\n                    throw new TypeError();\n                }\n            } while (1);\n        }\n        // reduce\n        for (; index < length; index++) {\n            // account for the possibility that the array is sparse\n            if (index in this) {\n                basis = callback(basis, this[index], index);\n            }\n        }\n        return basis;\n    }\n);\n\nvar array_indexOf = uncurryThis(\n    Array.prototype.indexOf || function (value) {\n        // not a very good shim, but good enough for our one use of it\n        for (var i = 0; i < this.length; i++) {\n            if (this[i] === value) {\n                return i;\n            }\n        }\n        return -1;\n    }\n);\n\nvar array_map = uncurryThis(\n    Array.prototype.map || function (callback, thisp) {\n        var self = this;\n        var collect = [];\n        array_reduce(self, function (undefined, value, index) {\n            collect.push(callback.call(thisp, value, index, self));\n        }, void 0);\n        return collect;\n    }\n);\n\nvar object_create = Object.create || function (prototype) {\n    function Type() { }\n    Type.prototype = prototype;\n    return new Type();\n};\n\nvar object_hasOwnProperty = uncurryThis(Object.prototype.hasOwnProperty);\n\nvar object_keys = Object.keys || function (object) {\n    var keys = [];\n    for (var key in object) {\n        if (object_hasOwnProperty(object, key)) {\n            keys.push(key);\n        }\n    }\n    return keys;\n};\n\nvar object_toString = uncurryThis(Object.prototype.toString);\n\nfunction isObject(value) {\n    return value === Object(value);\n}\n\n// generator related shims\n\n// FIXME: Remove this function once ES6 generators are in SpiderMonkey.\nfunction isStopIteration(exception) {\n    return (\n        object_toString(exception) === \"[object StopIteration]\" ||\n        exception instanceof QReturnValue\n    );\n}\n\n// FIXME: Remove this helper and Q.return once ES6 generators are in\n// SpiderMonkey.\nvar QReturnValue;\nif (typeof ReturnValue !== \"undefined\") {\n    QReturnValue = ReturnValue;\n} else {\n    QReturnValue = function (value) {\n        this.value = value;\n    };\n}\n\n// long stack traces\n\nvar STACK_JUMP_SEPARATOR = \"From previous event:\";\n\nfunction makeStackTraceLong(error, promise) {\n    // If possible, transform the error stack trace by removing Node and Q\n    // cruft, then concatenating with the stack trace of `promise`. See #57.\n    if (hasStacks &&\n        promise.stack &&\n        typeof error === \"object\" &&\n        error !== null &&\n        error.stack &&\n        error.stack.indexOf(STACK_JUMP_SEPARATOR) === -1\n    ) {\n        var stacks = [];\n        for (var p = promise; !!p; p = p.source) {\n            if (p.stack) {\n                stacks.unshift(p.stack);\n            }\n        }\n        stacks.unshift(error.stack);\n\n        var concatedStacks = stacks.join(\"\\n\" + STACK_JUMP_SEPARATOR + \"\\n\");\n        error.stack = filterStackString(concatedStacks);\n    }\n}\n\nfunction filterStackString(stackString) {\n    var lines = stackString.split(\"\\n\");\n    var desiredLines = [];\n    for (var i = 0; i < lines.length; ++i) {\n        var line = lines[i];\n\n        if (!isInternalFrame(line) && !isNodeFrame(line) && line) {\n            desiredLines.push(line);\n        }\n    }\n    return desiredLines.join(\"\\n\");\n}\n\nfunction isNodeFrame(stackLine) {\n    return stackLine.indexOf(\"(module.js:\") !== -1 ||\n           stackLine.indexOf(\"(node.js:\") !== -1;\n}\n\nfunction getFileNameAndLineNumber(stackLine) {\n    // Named functions: \"at functionName (filename:lineNumber:columnNumber)\"\n    // In IE10 function name can have spaces (\"Anonymous function\") O_o\n    var attempt1 = /at .+ \\((.+):(\\d+):(?:\\d+)\\)$/.exec(stackLine);\n    if (attempt1) {\n        return [attempt1[1], Number(attempt1[2])];\n    }\n\n    // Anonymous functions: \"at filename:lineNumber:columnNumber\"\n    var attempt2 = /at ([^ ]+):(\\d+):(?:\\d+)$/.exec(stackLine);\n    if (attempt2) {\n        return [attempt2[1], Number(attempt2[2])];\n    }\n\n    // Firefox style: \"function@filename:lineNumber or @filename:lineNumber\"\n    var attempt3 = /.*@(.+):(\\d+)$/.exec(stackLine);\n    if (attempt3) {\n        return [attempt3[1], Number(attempt3[2])];\n    }\n}\n\nfunction isInternalFrame(stackLine) {\n    var fileNameAndLineNumber = getFileNameAndLineNumber(stackLine);\n\n    if (!fileNameAndLineNumber) {\n        return false;\n    }\n\n    var fileName = fileNameAndLineNumber[0];\n    var lineNumber = fileNameAndLineNumber[1];\n\n    return fileName === qFileName &&\n        lineNumber >= qStartingLine &&\n        lineNumber <= qEndingLine;\n}\n\n// discover own file name and line number range for filtering stack\n// traces\nfunction captureLine() {\n    if (!hasStacks) {\n        return;\n    }\n\n    try {\n        throw new Error();\n    } catch (e) {\n        var lines = e.stack.split(\"\\n\");\n        var firstLine = lines[0].indexOf(\"@\") > 0 ? lines[1] : lines[2];\n        var fileNameAndLineNumber = getFileNameAndLineNumber(firstLine);\n        if (!fileNameAndLineNumber) {\n            return;\n        }\n\n        qFileName = fileNameAndLineNumber[0];\n        return fileNameAndLineNumber[1];\n    }\n}\n\nfunction deprecate(callback, name, alternative) {\n    return function () {\n        if (typeof console !== \"undefined\" &&\n            typeof console.warn === \"function\") {\n            console.warn(name + \" is deprecated, use \" + alternative +\n                         \" instead.\", new Error(\"\").stack);\n        }\n        return callback.apply(callback, arguments);\n    };\n}\n\n// end of shims\n// beginning of real work\n\n/**\n * Constructs a promise for an immediate reference, passes promises through, or\n * coerces promises from different systems.\n * @param value immediate reference or promise\n */\nfunction Q(value) {\n    // If the object is already a Promise, return it directly.  This enables\n    // the resolve function to both be used to created references from objects,\n    // but to tolerably coerce non-promises to promises.\n    if (value instanceof Promise) {\n        return value;\n    }\n\n    // assimilate thenables\n    if (isPromiseAlike(value)) {\n        return coerce(value);\n    } else {\n        return fulfill(value);\n    }\n}\nQ.resolve = Q;\n\n/**\n * Performs a task in a future turn of the event loop.\n * @param {Function} task\n */\nQ.nextTick = nextTick;\n\n/**\n * Controls whether or not long stack traces will be on\n */\nQ.longStackSupport = false;\n\n// enable long stacks if Q_DEBUG is set\nif (typeof process === \"object\" && process && process.env && process.env.Q_DEBUG) {\n    Q.longStackSupport = true;\n}\n\n/**\n * Constructs a {promise, resolve, reject} object.\n *\n * `resolve` is a callback to invoke with a more resolved value for the\n * promise. To fulfill the promise, invoke `resolve` with any value that is\n * not a thenable. To reject the promise, invoke `resolve` with a rejected\n * thenable, or invoke `reject` with the reason directly. To resolve the\n * promise to another thenable, thus putting it in the same state, invoke\n * `resolve` with that other thenable.\n */\nQ.defer = defer;\nfunction defer() {\n    // if \"messages\" is an \"Array\", that indicates that the promise has not yet\n    // been resolved.  If it is \"undefined\", it has been resolved.  Each\n    // element of the messages array is itself an array of complete arguments to\n    // forward to the resolved promise.  We coerce the resolution value to a\n    // promise using the `resolve` function because it handles both fully\n    // non-thenable values and other thenables gracefully.\n    var messages = [], progressListeners = [], resolvedPromise;\n\n    var deferred = object_create(defer.prototype);\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, operands) {\n        var args = array_slice(arguments);\n        if (messages) {\n            messages.push(args);\n            if (op === \"when\" && operands[1]) { // progress operand\n                progressListeners.push(operands[1]);\n            }\n        } else {\n            Q.nextTick(function () {\n                resolvedPromise.promiseDispatch.apply(resolvedPromise, args);\n            });\n        }\n    };\n\n    // XXX deprecated\n    promise.valueOf = function () {\n        if (messages) {\n            return promise;\n        }\n        var nearerValue = nearer(resolvedPromise);\n        if (isPromise(nearerValue)) {\n            resolvedPromise = nearerValue; // shorten chain\n        }\n        return nearerValue;\n    };\n\n    promise.inspect = function () {\n        if (!resolvedPromise) {\n            return { state: \"pending\" };\n        }\n        return resolvedPromise.inspect();\n    };\n\n    if (Q.longStackSupport && hasStacks) {\n        try {\n            throw new Error();\n        } catch (e) {\n            // NOTE: don't try to use `Error.captureStackTrace` or transfer the\n            // accessor around; that causes memory leaks as per GH-111. Just\n            // reify the stack trace as a string ASAP.\n            //\n            // At the same time, cut off the first line; it's always just\n            // \"[object Promise]\\n\", as per the `toString`.\n            promise.stack = e.stack.substring(e.stack.indexOf(\"\\n\") + 1);\n        }\n    }\n\n    // NOTE: we do the checks for `resolvedPromise` in each method, instead of\n    // consolidating them into `become`, since otherwise we'd create new\n    // promises with the lines `become(whatever(value))`. See e.g. GH-252.\n\n    function become(newPromise) {\n        resolvedPromise = newPromise;\n        promise.source = newPromise;\n\n        array_reduce(messages, function (undefined, message) {\n            Q.nextTick(function () {\n                newPromise.promiseDispatch.apply(newPromise, message);\n            });\n        }, void 0);\n\n        messages = void 0;\n        progressListeners = void 0;\n    }\n\n    deferred.promise = promise;\n    deferred.resolve = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(Q(value));\n    };\n\n    deferred.fulfill = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(fulfill(value));\n    };\n    deferred.reject = function (reason) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(reject(reason));\n    };\n    deferred.notify = function (progress) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        array_reduce(progressListeners, function (undefined, progressListener) {\n            Q.nextTick(function () {\n                progressListener(progress);\n            });\n        }, void 0);\n    };\n\n    return deferred;\n}\n\n/**\n * Creates a Node-style callback that will resolve or reject the deferred\n * promise.\n * @returns a nodeback\n */\ndefer.prototype.makeNodeResolver = function () {\n    var self = this;\n    return function (error, value) {\n        if (error) {\n            self.reject(error);\n        } else if (arguments.length > 2) {\n            self.resolve(array_slice(arguments, 1));\n        } else {\n            self.resolve(value);\n        }\n    };\n};\n\n/**\n * @param resolver {Function} a function that returns nothing and accepts\n * the resolve, reject, and notify functions for a deferred.\n * @returns a promise that may be resolved with the given resolve and reject\n * functions, or rejected by a thrown exception in resolver\n */\nQ.Promise = promise; // ES6\nQ.promise = promise;\nfunction promise(resolver) {\n    if (typeof resolver !== \"function\") {\n        throw new TypeError(\"resolver must be a function.\");\n    }\n    var deferred = defer();\n    try {\n        resolver(deferred.resolve, deferred.reject, deferred.notify);\n    } catch (reason) {\n        deferred.reject(reason);\n    }\n    return deferred.promise;\n}\n\npromise.race = race; // ES6\npromise.all = all; // ES6\npromise.reject = reject; // ES6\npromise.resolve = Q; // ES6\n\n// XXX experimental.  This method is a way to denote that a local value is\n// serializable and should be immediately dispatched to a remote upon request,\n// instead of passing a reference.\nQ.passByCopy = function (object) {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return object;\n};\n\nPromise.prototype.passByCopy = function () {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return this;\n};\n\n/**\n * If two promises eventually fulfill to the same value, promises that value,\n * but otherwise rejects.\n * @param x {Any*}\n * @param y {Any*}\n * @returns {Any*} a promise for x and y if they are the same, but a rejection\n * otherwise.\n *\n */\nQ.join = function (x, y) {\n    return Q(x).join(y);\n};\n\nPromise.prototype.join = function (that) {\n    return Q([this, that]).spread(function (x, y) {\n        if (x === y) {\n            // TODO: \"===\" should be Object.is or equiv\n            return x;\n        } else {\n            throw new Error(\"Can't join: not the same: \" + x + \" \" + y);\n        }\n    });\n};\n\n/**\n * Returns a promise for the first of an array of promises to become settled.\n * @param answers {Array[Any*]} promises to race\n * @returns {Any*} the first promise to be settled\n */\nQ.race = race;\nfunction race(answerPs) {\n    return promise(function (resolve, reject) {\n        // Switch to this once we can assume at least ES5\n        // answerPs.forEach(function (answerP) {\n        //     Q(answerP).then(resolve, reject);\n        // });\n        // Use this in the meantime\n        for (var i = 0, len = answerPs.length; i < len; i++) {\n            Q(answerPs[i]).then(resolve, reject);\n        }\n    });\n}\n\nPromise.prototype.race = function () {\n    return this.then(Q.race);\n};\n\n/**\n * Constructs a Promise with a promise descriptor object and optional fallback\n * function.  The descriptor contains methods like when(rejected), get(name),\n * set(name, value), post(name, args), and delete(name), which all\n * return either a value, a promise for a value, or a rejection.  The fallback\n * accepts the operation name, a resolver, and any further arguments that would\n * have been forwarded to the appropriate method above had a method been\n * provided with the proper name.  The API makes no guarantees about the nature\n * of the returned object, apart from that it is usable whereever promises are\n * bought and sold.\n */\nQ.makePromise = Promise;\nfunction Promise(descriptor, fallback, inspect) {\n    if (fallback === void 0) {\n        fallback = function (op) {\n            return reject(new Error(\n                \"Promise does not support operation: \" + op\n            ));\n        };\n    }\n    if (inspect === void 0) {\n        inspect = function () {\n            return {state: \"unknown\"};\n        };\n    }\n\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, args) {\n        var result;\n        try {\n            if (descriptor[op]) {\n                result = descriptor[op].apply(promise, args);\n            } else {\n                result = fallback.call(promise, op, args);\n            }\n        } catch (exception) {\n            result = reject(exception);\n        }\n        if (resolve) {\n            resolve(result);\n        }\n    };\n\n    promise.inspect = inspect;\n\n    // XXX deprecated `valueOf` and `exception` support\n    if (inspect) {\n        var inspected = inspect();\n        if (inspected.state === \"rejected\") {\n            promise.exception = inspected.reason;\n        }\n\n        promise.valueOf = function () {\n            var inspected = inspect();\n            if (inspected.state === \"pending\" ||\n                inspected.state === \"rejected\") {\n                return promise;\n            }\n            return inspected.value;\n        };\n    }\n\n    return promise;\n}\n\nPromise.prototype.toString = function () {\n    return \"[object Promise]\";\n};\n\nPromise.prototype.then = function (fulfilled, rejected, progressed) {\n    var self = this;\n    var deferred = defer();\n    var done = false;   // ensure the untrusted promise makes at most a\n                        // single call to one of the callbacks\n\n    function _fulfilled(value) {\n        try {\n            return typeof fulfilled === \"function\" ? fulfilled(value) : value;\n        } catch (exception) {\n            return reject(exception);\n        }\n    }\n\n    function _rejected(exception) {\n        if (typeof rejected === \"function\") {\n            makeStackTraceLong(exception, self);\n            try {\n                return rejected(exception);\n            } catch (newException) {\n                return reject(newException);\n            }\n        }\n        return reject(exception);\n    }\n\n    function _progressed(value) {\n        return typeof progressed === \"function\" ? progressed(value) : value;\n    }\n\n    Q.nextTick(function () {\n        self.promiseDispatch(function (value) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_fulfilled(value));\n        }, \"when\", [function (exception) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_rejected(exception));\n        }]);\n    });\n\n    // Progress propagator need to be attached in the current tick.\n    self.promiseDispatch(void 0, \"when\", [void 0, function (value) {\n        var newValue;\n        var threw = false;\n        try {\n            newValue = _progressed(value);\n        } catch (e) {\n            threw = true;\n            if (Q.onerror) {\n                Q.onerror(e);\n            } else {\n                throw e;\n            }\n        }\n\n        if (!threw) {\n            deferred.notify(newValue);\n        }\n    }]);\n\n    return deferred.promise;\n};\n\nQ.tap = function (promise, callback) {\n    return Q(promise).tap(callback);\n};\n\n/**\n * Works almost like \"finally\", but not called for rejections.\n * Original resolution value is passed through callback unaffected.\n * Callback may return a promise that will be awaited for.\n * @param {Function} callback\n * @returns {Q.Promise}\n * @example\n * doSomething()\n *   .then(...)\n *   .tap(console.log)\n *   .then(...);\n */\nPromise.prototype.tap = function (callback) {\n    callback = Q(callback);\n\n    return this.then(function (value) {\n        return callback.fcall(value).thenResolve(value);\n    });\n};\n\n/**\n * Registers an observer on a promise.\n *\n * Guarantees:\n *\n * 1. that fulfilled and rejected will be called only once.\n * 2. that either the fulfilled callback or the rejected callback will be\n *    called, but not both.\n * 3. that fulfilled and rejected will not be called in this turn.\n *\n * @param value      promise or immediate reference to observe\n * @param fulfilled  function to be called with the fulfilled value\n * @param rejected   function to be called with the rejection exception\n * @param progressed function to be called on any progress notifications\n * @return promise for the return value from the invoked callback\n */\nQ.when = when;\nfunction when(value, fulfilled, rejected, progressed) {\n    return Q(value).then(fulfilled, rejected, progressed);\n}\n\nPromise.prototype.thenResolve = function (value) {\n    return this.then(function () { return value; });\n};\n\nQ.thenResolve = function (promise, value) {\n    return Q(promise).thenResolve(value);\n};\n\nPromise.prototype.thenReject = function (reason) {\n    return this.then(function () { throw reason; });\n};\n\nQ.thenReject = function (promise, reason) {\n    return Q(promise).thenReject(reason);\n};\n\n/**\n * If an object is not a promise, it is as \"near\" as possible.\n * If a promise is rejected, it is as \"near\" as possible too.\n * If it’s a fulfilled promise, the fulfillment value is nearer.\n * If it’s a deferred promise and the deferred has been resolved, the\n * resolution is \"nearer\".\n * @param object\n * @returns most resolved (nearest) form of the object\n */\n\n// XXX should we re-do this?\nQ.nearer = nearer;\nfunction nearer(value) {\n    if (isPromise(value)) {\n        var inspected = value.inspect();\n        if (inspected.state === \"fulfilled\") {\n            return inspected.value;\n        }\n    }\n    return value;\n}\n\n/**\n * @returns whether the given object is a promise.\n * Otherwise it is a fulfilled value.\n */\nQ.isPromise = isPromise;\nfunction isPromise(object) {\n    return object instanceof Promise;\n}\n\nQ.isPromiseAlike = isPromiseAlike;\nfunction isPromiseAlike(object) {\n    return isObject(object) && typeof object.then === \"function\";\n}\n\n/**\n * @returns whether the given object is a pending promise, meaning not\n * fulfilled or rejected.\n */\nQ.isPending = isPending;\nfunction isPending(object) {\n    return isPromise(object) && object.inspect().state === \"pending\";\n}\n\nPromise.prototype.isPending = function () {\n    return this.inspect().state === \"pending\";\n};\n\n/**\n * @returns whether the given object is a value or fulfilled\n * promise.\n */\nQ.isFulfilled = isFulfilled;\nfunction isFulfilled(object) {\n    return !isPromise(object) || object.inspect().state === \"fulfilled\";\n}\n\nPromise.prototype.isFulfilled = function () {\n    return this.inspect().state === \"fulfilled\";\n};\n\n/**\n * @returns whether the given object is a rejected promise.\n */\nQ.isRejected = isRejected;\nfunction isRejected(object) {\n    return isPromise(object) && object.inspect().state === \"rejected\";\n}\n\nPromise.prototype.isRejected = function () {\n    return this.inspect().state === \"rejected\";\n};\n\n//// BEGIN UNHANDLED REJECTION TRACKING\n\n// This promise library consumes exceptions thrown in handlers so they can be\n// handled by a subsequent promise.  The exceptions get added to this array when\n// they are created, and removed when they are handled.  Note that in ES6 or\n// shimmed environments, this would naturally be a `Set`.\nvar unhandledReasons = [];\nvar unhandledRejections = [];\nvar reportedUnhandledRejections = [];\nvar trackUnhandledRejections = true;\n\nfunction resetUnhandledRejections() {\n    unhandledReasons.length = 0;\n    unhandledRejections.length = 0;\n\n    if (!trackUnhandledRejections) {\n        trackUnhandledRejections = true;\n    }\n}\n\nfunction trackRejection(promise, reason) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n    if (typeof process === \"object\" && typeof process.emit === \"function\") {\n        Q.nextTick.runAfter(function () {\n            if (array_indexOf(unhandledRejections, promise) !== -1) {\n                process.emit(\"unhandledRejection\", reason, promise);\n                reportedUnhandledRejections.push(promise);\n            }\n        });\n    }\n\n    unhandledRejections.push(promise);\n    if (reason && typeof reason.stack !== \"undefined\") {\n        unhandledReasons.push(reason.stack);\n    } else {\n        unhandledReasons.push(\"(no stack) \" + reason);\n    }\n}\n\nfunction untrackRejection(promise) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n\n    var at = array_indexOf(unhandledRejections, promise);\n    if (at !== -1) {\n        if (typeof process === \"object\" && typeof process.emit === \"function\") {\n            Q.nextTick.runAfter(function () {\n                var atReport = array_indexOf(reportedUnhandledRejections, promise);\n                if (atReport !== -1) {\n                    process.emit(\"rejectionHandled\", unhandledReasons[at], promise);\n                    reportedUnhandledRejections.splice(atReport, 1);\n                }\n            });\n        }\n        unhandledRejections.splice(at, 1);\n        unhandledReasons.splice(at, 1);\n    }\n}\n\nQ.resetUnhandledRejections = resetUnhandledRejections;\n\nQ.getUnhandledReasons = function () {\n    // Make a copy so that consumers can't interfere with our internal state.\n    return unhandledReasons.slice();\n};\n\nQ.stopUnhandledRejectionTracking = function () {\n    resetUnhandledRejections();\n    trackUnhandledRejections = false;\n};\n\nresetUnhandledRejections();\n\n//// END UNHANDLED REJECTION TRACKING\n\n/**\n * Constructs a rejected promise.\n * @param reason value describing the failure\n */\nQ.reject = reject;\nfunction reject(reason) {\n    var rejection = Promise({\n        \"when\": function (rejected) {\n            // note that the error has been handled\n            if (rejected) {\n                untrackRejection(this);\n            }\n            return rejected ? rejected(reason) : this;\n        }\n    }, function fallback() {\n        return this;\n    }, function inspect() {\n        return { state: \"rejected\", reason: reason };\n    });\n\n    // Note that the reason has not been handled.\n    trackRejection(rejection, reason);\n\n    return rejection;\n}\n\n/**\n * Constructs a fulfilled promise for an immediate reference.\n * @param value immediate reference\n */\nQ.fulfill = fulfill;\nfunction fulfill(value) {\n    return Promise({\n        \"when\": function () {\n            return value;\n        },\n        \"get\": function (name) {\n            return value[name];\n        },\n        \"set\": function (name, rhs) {\n            value[name] = rhs;\n        },\n        \"delete\": function (name) {\n            delete value[name];\n        },\n        \"post\": function (name, args) {\n            // Mark Miller proposes that post with no name should apply a\n            // promised function.\n            if (name === null || name === void 0) {\n                return value.apply(void 0, args);\n            } else {\n                return value[name].apply(value, args);\n            }\n        },\n        \"apply\": function (thisp, args) {\n            return value.apply(thisp, args);\n        },\n        \"keys\": function () {\n            return object_keys(value);\n        }\n    }, void 0, function inspect() {\n        return { state: \"fulfilled\", value: value };\n    });\n}\n\n/**\n * Converts thenables to Q promises.\n * @param promise thenable promise\n * @returns a Q promise\n */\nfunction coerce(promise) {\n    var deferred = defer();\n    Q.nextTick(function () {\n        try {\n            promise.then(deferred.resolve, deferred.reject, deferred.notify);\n        } catch (exception) {\n            deferred.reject(exception);\n        }\n    });\n    return deferred.promise;\n}\n\n/**\n * Annotates an object such that it will never be\n * transferred away from this process over any promise\n * communication channel.\n * @param object\n * @returns promise a wrapping of that object that\n * additionally responds to the \"isDef\" message\n * without a rejection.\n */\nQ.master = master;\nfunction master(object) {\n    return Promise({\n        \"isDef\": function () {}\n    }, function fallback(op, args) {\n        return dispatch(object, op, args);\n    }, function () {\n        return Q(object).inspect();\n    });\n}\n\n/**\n * Spreads the values of a promised array of arguments into the\n * fulfillment callback.\n * @param fulfilled callback that receives variadic arguments from the\n * promised array\n * @param rejected callback that receives the exception if the promise\n * is rejected.\n * @returns a promise for the return value or thrown exception of\n * either callback.\n */\nQ.spread = spread;\nfunction spread(value, fulfilled, rejected) {\n    return Q(value).spread(fulfilled, rejected);\n}\n\nPromise.prototype.spread = function (fulfilled, rejected) {\n    return this.all().then(function (array) {\n        return fulfilled.apply(void 0, array);\n    }, rejected);\n};\n\n/**\n * The async function is a decorator for generator functions, turning\n * them into asynchronous generators.  Although generators are only part\n * of the newest ECMAScript 6 drafts, this code does not cause syntax\n * errors in older engines.  This code should continue to work and will\n * in fact improve over time as the language improves.\n *\n * ES6 generators are currently part of V8 version 3.19 with the\n * --harmony-generators runtime flag enabled.  SpiderMonkey has had them\n * for longer, but under an older Python-inspired form.  This function\n * works on both kinds of generators.\n *\n * Decorates a generator function such that:\n *  - it may yield promises\n *  - execution will continue when that promise is fulfilled\n *  - the value of the yield expression will be the fulfilled value\n *  - it returns a promise for the return value (when the generator\n *    stops iterating)\n *  - the decorated function returns a promise for the return value\n *    of the generator or the first rejected promise among those\n *    yielded.\n *  - if an error is thrown in the generator, it propagates through\n *    every following yield until it is caught, or until it escapes\n *    the generator function altogether, and is translated into a\n *    rejection for the promise returned by the decorated generator.\n */\nQ.async = async;\nfunction async(makeGenerator) {\n    return function () {\n        // when verb is \"send\", arg is a value\n        // when verb is \"throw\", arg is an exception\n        function continuer(verb, arg) {\n            var result;\n\n            // Until V8 3.19 / Chromium 29 is released, SpiderMonkey is the only\n            // engine that has a deployed base of browsers that support generators.\n            // However, SM's generators use the Python-inspired semantics of\n            // outdated ES6 drafts.  We would like to support ES6, but we'd also\n            // like to make it possible to use generators in deployed browsers, so\n            // we also support Python-style generators.  At some point we can remove\n            // this block.\n\n            if (typeof StopIteration === \"undefined\") {\n                // ES6 Generators\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    return reject(exception);\n                }\n                if (result.done) {\n                    return Q(result.value);\n                } else {\n                    return when(result.value, callback, errback);\n                }\n            } else {\n                // SpiderMonkey Generators\n                // FIXME: Remove this case when SM does ES6 generators.\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    if (isStopIteration(exception)) {\n                        return Q(exception.value);\n                    } else {\n                        return reject(exception);\n                    }\n                }\n                return when(result, callback, errback);\n            }\n        }\n        var generator = makeGenerator.apply(this, arguments);\n        var callback = continuer.bind(continuer, \"next\");\n        var errback = continuer.bind(continuer, \"throw\");\n        return callback();\n    };\n}\n\n/**\n * The spawn function is a small wrapper around async that immediately\n * calls the generator and also ends the promise chain, so that any\n * unhandled errors are thrown instead of forwarded to the error\n * handler. This is useful because it's extremely common to run\n * generators at the top-level to work with libraries.\n */\nQ.spawn = spawn;\nfunction spawn(makeGenerator) {\n    Q.done(Q.async(makeGenerator)());\n}\n\n// FIXME: Remove this interface once ES6 generators are in SpiderMonkey.\n/**\n * Throws a ReturnValue exception to stop an asynchronous generator.\n *\n * This interface is a stop-gap measure to support generator return\n * values in older Firefox/SpiderMonkey.  In browsers that support ES6\n * generators like Chromium 29, just use \"return\" in your generator\n * functions.\n *\n * @param value the return value for the surrounding generator\n * @throws ReturnValue exception with the value.\n * @example\n * // ES6 style\n * Q.async(function* () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      return foo + bar;\n * })\n * // Older SpiderMonkey style\n * Q.async(function () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      Q.return(foo + bar);\n * })\n */\nQ[\"return\"] = _return;\nfunction _return(value) {\n    throw new QReturnValue(value);\n}\n\n/**\n * The promised function decorator ensures that any promise arguments\n * are settled and passed as values (`this` is also settled and passed\n * as a value).  It will also ensure that the result of a function is\n * always a promise.\n *\n * @example\n * var add = Q.promised(function (a, b) {\n *     return a + b;\n * });\n * add(Q(a), Q(B));\n *\n * @param {function} callback The function to decorate\n * @returns {function} a function that has been decorated.\n */\nQ.promised = promised;\nfunction promised(callback) {\n    return function () {\n        return spread([this, all(arguments)], function (self, args) {\n            return callback.apply(self, args);\n        });\n    };\n}\n\n/**\n * sends a message to a value in a future turn\n * @param object* the recipient\n * @param op the name of the message operation, e.g., \"when\",\n * @param args further arguments to be forwarded to the operation\n * @returns result {Promise} a promise for the result of the operation\n */\nQ.dispatch = dispatch;\nfunction dispatch(object, op, args) {\n    return Q(object).dispatch(op, args);\n}\n\nPromise.prototype.dispatch = function (op, args) {\n    var self = this;\n    var deferred = defer();\n    Q.nextTick(function () {\n        self.promiseDispatch(deferred.resolve, op, args);\n    });\n    return deferred.promise;\n};\n\n/**\n * Gets the value of a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to get\n * @return promise for the property value\n */\nQ.get = function (object, key) {\n    return Q(object).dispatch(\"get\", [key]);\n};\n\nPromise.prototype.get = function (key) {\n    return this.dispatch(\"get\", [key]);\n};\n\n/**\n * Sets the value of a property in a future turn.\n * @param object    promise or immediate reference for object object\n * @param name      name of property to set\n * @param value     new value of property\n * @return promise for the return value\n */\nQ.set = function (object, key, value) {\n    return Q(object).dispatch(\"set\", [key, value]);\n};\n\nPromise.prototype.set = function (key, value) {\n    return this.dispatch(\"set\", [key, value]);\n};\n\n/**\n * Deletes a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to delete\n * @return promise for the return value\n */\nQ.del = // XXX legacy\nQ[\"delete\"] = function (object, key) {\n    return Q(object).dispatch(\"delete\", [key]);\n};\n\nPromise.prototype.del = // XXX legacy\nPromise.prototype[\"delete\"] = function (key) {\n    return this.dispatch(\"delete\", [key]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param value     a value to post, typically an array of\n *                  invocation arguments for promises that\n *                  are ultimately backed with `resolve` values,\n *                  as opposed to those backed with URLs\n *                  wherein the posted value can be any\n *                  JSON serializable object.\n * @return promise for the return value\n */\n// bound locally because it is used by other methods\nQ.mapply = // XXX As proposed by \"Redsandro\"\nQ.post = function (object, name, args) {\n    return Q(object).dispatch(\"post\", [name, args]);\n};\n\nPromise.prototype.mapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.post = function (name, args) {\n    return this.dispatch(\"post\", [name, args]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param ...args   array of invocation arguments\n * @return promise for the return value\n */\nQ.send = // XXX Mark Miller's proposed parlance\nQ.mcall = // XXX As proposed by \"Redsandro\"\nQ.invoke = function (object, name /*...args*/) {\n    return Q(object).dispatch(\"post\", [name, array_slice(arguments, 2)]);\n};\n\nPromise.prototype.send = // XXX Mark Miller's proposed parlance\nPromise.prototype.mcall = // XXX As proposed by \"Redsandro\"\nPromise.prototype.invoke = function (name /*...args*/) {\n    return this.dispatch(\"post\", [name, array_slice(arguments, 1)]);\n};\n\n/**\n * Applies the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param args      array of application arguments\n */\nQ.fapply = function (object, args) {\n    return Q(object).dispatch(\"apply\", [void 0, args]);\n};\n\nPromise.prototype.fapply = function (args) {\n    return this.dispatch(\"apply\", [void 0, args]);\n};\n\n/**\n * Calls the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ[\"try\"] =\nQ.fcall = function (object /* ...args*/) {\n    return Q(object).dispatch(\"apply\", [void 0, array_slice(arguments, 1)]);\n};\n\nPromise.prototype.fcall = function (/*...args*/) {\n    return this.dispatch(\"apply\", [void 0, array_slice(arguments)]);\n};\n\n/**\n * Binds the promised function, transforming return values into a fulfilled\n * promise and thrown errors into a rejected one.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ.fbind = function (object /*...args*/) {\n    var promise = Q(object);\n    var args = array_slice(arguments, 1);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\nPromise.prototype.fbind = function (/*...args*/) {\n    var promise = this;\n    var args = array_slice(arguments);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\n\n/**\n * Requests the names of the owned properties of a promised\n * object in a future turn.\n * @param object    promise or immediate reference for target object\n * @return promise for the keys of the eventually settled object\n */\nQ.keys = function (object) {\n    return Q(object).dispatch(\"keys\", []);\n};\n\nPromise.prototype.keys = function () {\n    return this.dispatch(\"keys\", []);\n};\n\n/**\n * Turns an array of promises into a promise for an array.  If any of\n * the promises gets rejected, the whole array is rejected immediately.\n * @param {Array*} an array (or promise for an array) of values (or\n * promises for values)\n * @returns a promise for an array of the corresponding values\n */\n// By Mark Miller\n// http://wiki.ecmascript.org/doku.php?id=strawman:concurrency&rev=1308776521#allfulfilled\nQ.all = all;\nfunction all(promises) {\n    return when(promises, function (promises) {\n        var pendingCount = 0;\n        var deferred = defer();\n        array_reduce(promises, function (undefined, promise, index) {\n            var snapshot;\n            if (\n                isPromise(promise) &&\n                (snapshot = promise.inspect()).state === \"fulfilled\"\n            ) {\n                promises[index] = snapshot.value;\n            } else {\n                ++pendingCount;\n                when(\n                    promise,\n                    function (value) {\n                        promises[index] = value;\n                        if (--pendingCount === 0) {\n                            deferred.resolve(promises);\n                        }\n                    },\n                    deferred.reject,\n                    function (progress) {\n                        deferred.notify({ index: index, value: progress });\n                    }\n                );\n            }\n        }, void 0);\n        if (pendingCount === 0) {\n            deferred.resolve(promises);\n        }\n        return deferred.promise;\n    });\n}\n\nPromise.prototype.all = function () {\n    return all(this);\n};\n\n/**\n * Returns the first resolved promise of an array. Prior rejected promises are\n * ignored.  Rejects only if all promises are rejected.\n * @param {Array*} an array containing values or promises for values\n * @returns a promise fulfilled with the value of the first resolved promise,\n * or a rejected promise if all promises are rejected.\n */\nQ.any = any;\n\nfunction any(promises) {\n    if (promises.length === 0) {\n        return Q.resolve();\n    }\n\n    var deferred = Q.defer();\n    var pendingCount = 0;\n    array_reduce(promises, function (prev, current, index) {\n        var promise = promises[index];\n\n        pendingCount++;\n\n        when(promise, onFulfilled, onRejected, onProgress);\n        function onFulfilled(result) {\n            deferred.resolve(result);\n        }\n        function onRejected() {\n            pendingCount--;\n            if (pendingCount === 0) {\n                deferred.reject(new Error(\n                    \"Can't get fulfillment value from any promise, all \" +\n                    \"promises were rejected.\"\n                ));\n            }\n        }\n        function onProgress(progress) {\n            deferred.notify({\n                index: index,\n                value: progress\n            });\n        }\n    }, undefined);\n\n    return deferred.promise;\n}\n\nPromise.prototype.any = function () {\n    return any(this);\n};\n\n/**\n * Waits for all promises to be settled, either fulfilled or\n * rejected.  This is distinct from `all` since that would stop\n * waiting at the first rejection.  The promise returned by\n * `allResolved` will never be rejected.\n * @param promises a promise for an array (or an array) of promises\n * (or values)\n * @return a promise for an array of promises\n */\nQ.allResolved = deprecate(allResolved, \"allResolved\", \"allSettled\");\nfunction allResolved(promises) {\n    return when(promises, function (promises) {\n        promises = array_map(promises, Q);\n        return when(all(array_map(promises, function (promise) {\n            return when(promise, noop, noop);\n        })), function () {\n            return promises;\n        });\n    });\n}\n\nPromise.prototype.allResolved = function () {\n    return allResolved(this);\n};\n\n/**\n * @see Promise#allSettled\n */\nQ.allSettled = allSettled;\nfunction allSettled(promises) {\n    return Q(promises).allSettled();\n}\n\n/**\n * Turns an array of promises into a promise for an array of their states (as\n * returned by `inspect`) when they have all settled.\n * @param {Array[Any*]} values an array (or promise for an array) of values (or\n * promises for values)\n * @returns {Array[State]} an array of states for the respective values.\n */\nPromise.prototype.allSettled = function () {\n    return this.then(function (promises) {\n        return all(array_map(promises, function (promise) {\n            promise = Q(promise);\n            function regardless() {\n                return promise.inspect();\n            }\n            return promise.then(regardless, regardless);\n        }));\n    });\n};\n\n/**\n * Captures the failure of a promise, giving an oportunity to recover\n * with a callback.  If the given promise is fulfilled, the returned\n * promise is fulfilled.\n * @param {Any*} promise for something\n * @param {Function} callback to fulfill the returned promise if the\n * given promise is rejected\n * @returns a promise for the return value of the callback\n */\nQ.fail = // XXX legacy\nQ[\"catch\"] = function (object, rejected) {\n    return Q(object).then(void 0, rejected);\n};\n\nPromise.prototype.fail = // XXX legacy\nPromise.prototype[\"catch\"] = function (rejected) {\n    return this.then(void 0, rejected);\n};\n\n/**\n * Attaches a listener that can respond to progress notifications from a\n * promise's originating deferred. This listener receives the exact arguments\n * passed to ``deferred.notify``.\n * @param {Any*} promise for something\n * @param {Function} callback to receive any progress notifications\n * @returns the given promise, unchanged\n */\nQ.progress = progress;\nfunction progress(object, progressed) {\n    return Q(object).then(void 0, void 0, progressed);\n}\n\nPromise.prototype.progress = function (progressed) {\n    return this.then(void 0, void 0, progressed);\n};\n\n/**\n * Provides an opportunity to observe the settling of a promise,\n * regardless of whether the promise is fulfilled or rejected.  Forwards\n * the resolution to the returned promise when the callback is done.\n * The callback can return a promise to defer completion.\n * @param {Any*} promise\n * @param {Function} callback to observe the resolution of the given\n * promise, takes no arguments.\n * @returns a promise for the resolution of the given promise when\n * ``fin`` is done.\n */\nQ.fin = // XXX legacy\nQ[\"finally\"] = function (object, callback) {\n    return Q(object)[\"finally\"](callback);\n};\n\nPromise.prototype.fin = // XXX legacy\nPromise.prototype[\"finally\"] = function (callback) {\n    callback = Q(callback);\n    return this.then(function (value) {\n        return callback.fcall().then(function () {\n            return value;\n        });\n    }, function (reason) {\n        // TODO attempt to recycle the rejection with \"this\".\n        return callback.fcall().then(function () {\n            throw reason;\n        });\n    });\n};\n\n/**\n * Terminates a chain of promises, forcing rejections to be\n * thrown as exceptions.\n * @param {Any*} promise at the end of a chain of promises\n * @returns nothing\n */\nQ.done = function (object, fulfilled, rejected, progress) {\n    return Q(object).done(fulfilled, rejected, progress);\n};\n\nPromise.prototype.done = function (fulfilled, rejected, progress) {\n    var onUnhandledError = function (error) {\n        // forward to a future turn so that ``when``\n        // does not catch it and turn it into a rejection.\n        Q.nextTick(function () {\n            makeStackTraceLong(error, promise);\n            if (Q.onerror) {\n                Q.onerror(error);\n            } else {\n                throw error;\n            }\n        });\n    };\n\n    // Avoid unnecessary `nextTick`ing via an unnecessary `when`.\n    var promise = fulfilled || rejected || progress ?\n        this.then(fulfilled, rejected, progress) :\n        this;\n\n    if (typeof process === \"object\" && process && process.domain) {\n        onUnhandledError = process.domain.bind(onUnhandledError);\n    }\n\n    promise.then(void 0, onUnhandledError);\n};\n\n/**\n * Causes a promise to be rejected if it does not get fulfilled before\n * some milliseconds time out.\n * @param {Any*} promise\n * @param {Number} milliseconds timeout\n * @param {Any*} custom error message or Error object (optional)\n * @returns a promise for the resolution of the given promise if it is\n * fulfilled before the timeout, otherwise rejected.\n */\nQ.timeout = function (object, ms, error) {\n    return Q(object).timeout(ms, error);\n};\n\nPromise.prototype.timeout = function (ms, error) {\n    var deferred = defer();\n    var timeoutId = setTimeout(function () {\n        if (!error || \"string\" === typeof error) {\n            error = new Error(error || \"Timed out after \" + ms + \" ms\");\n            error.code = \"ETIMEDOUT\";\n        }\n        deferred.reject(error);\n    }, ms);\n\n    this.then(function (value) {\n        clearTimeout(timeoutId);\n        deferred.resolve(value);\n    }, function (exception) {\n        clearTimeout(timeoutId);\n        deferred.reject(exception);\n    }, deferred.notify);\n\n    return deferred.promise;\n};\n\n/**\n * Returns a promise for the given value (or promised value), some\n * milliseconds after it resolved. Passes rejections immediately.\n * @param {Any*} promise\n * @param {Number} milliseconds\n * @returns a promise for the resolution of the given promise after milliseconds\n * time has elapsed since the resolution of the given promise.\n * If the given promise rejects, that is passed immediately.\n */\nQ.delay = function (object, timeout) {\n    if (timeout === void 0) {\n        timeout = object;\n        object = void 0;\n    }\n    return Q(object).delay(timeout);\n};\n\nPromise.prototype.delay = function (timeout) {\n    return this.then(function (value) {\n        var deferred = defer();\n        setTimeout(function () {\n            deferred.resolve(value);\n        }, timeout);\n        return deferred.promise;\n    });\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided as an array, and returns a promise.\n *\n *      Q.nfapply(FS.readFile, [__filename])\n *      .then(function (content) {\n *      })\n *\n */\nQ.nfapply = function (callback, args) {\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfapply = function (args) {\n    var deferred = defer();\n    var nodeArgs = array_slice(args);\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided individually, and returns a promise.\n * @example\n * Q.nfcall(FS.readFile, __filename)\n * .then(function (content) {\n * })\n *\n */\nQ.nfcall = function (callback /*...args*/) {\n    var args = array_slice(arguments, 1);\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfcall = function (/*...args*/) {\n    var nodeArgs = array_slice(arguments);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Wraps a NodeJS continuation passing function and returns an equivalent\n * version that returns a promise.\n * @example\n * Q.nfbind(FS.readFile, __filename)(\"utf-8\")\n * .then(console.log)\n * .done()\n */\nQ.nfbind =\nQ.denodeify = function (callback /*...args*/) {\n    var baseArgs = array_slice(arguments, 1);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        Q(callback).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nfbind =\nPromise.prototype.denodeify = function (/*...args*/) {\n    var args = array_slice(arguments);\n    args.unshift(this);\n    return Q.denodeify.apply(void 0, args);\n};\n\nQ.nbind = function (callback, thisp /*...args*/) {\n    var baseArgs = array_slice(arguments, 2);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        function bound() {\n            return callback.apply(thisp, arguments);\n        }\n        Q(bound).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nbind = function (/*thisp, ...args*/) {\n    var args = array_slice(arguments, 0);\n    args.unshift(this);\n    return Q.nbind.apply(void 0, args);\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback with a given array of arguments, plus a provided callback.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param {Array} args arguments to pass to the method; the callback\n * will be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nmapply = // XXX As proposed by \"Redsandro\"\nQ.npost = function (object, name, args) {\n    return Q(object).npost(name, args);\n};\n\nPromise.prototype.nmapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.npost = function (name, args) {\n    var nodeArgs = array_slice(args || []);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback, forwarding the given variadic arguments, plus a provided\n * callback argument.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param ...args arguments to pass to the method; the callback will\n * be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nsend = // XXX Based on Mark Miller's proposed \"send\"\nQ.nmcall = // XXX Based on \"Redsandro's\" proposal\nQ.ninvoke = function (object, name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 2);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    Q(object).dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\nPromise.prototype.nsend = // XXX Based on Mark Miller's proposed \"send\"\nPromise.prototype.nmcall = // XXX Based on \"Redsandro's\" proposal\nPromise.prototype.ninvoke = function (name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 1);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * If a function would like to support both Node continuation-passing-style and\n * promise-returning-style, it can end its internal promise chain with\n * `nodeify(nodeback)`, forwarding the optional nodeback argument.  If the user\n * elects to use a nodeback, the result will be sent there.  If they do not\n * pass a nodeback, they will receive the result promise.\n * @param object a result (or a promise for a result)\n * @param {Function} nodeback a Node.js-style callback\n * @returns either the promise or nothing\n */\nQ.nodeify = nodeify;\nfunction nodeify(object, nodeback) {\n    return Q(object).nodeify(nodeback);\n}\n\nPromise.prototype.nodeify = function (nodeback) {\n    if (nodeback) {\n        this.then(function (value) {\n            Q.nextTick(function () {\n                nodeback(null, value);\n            });\n        }, function (error) {\n            Q.nextTick(function () {\n                nodeback(error);\n            });\n        });\n    } else {\n        return this;\n    }\n};\n\nQ.noConflict = function() {\n    throw new Error(\"Q.noConflict only works when Q is used as a global\");\n};\n\n// All code before this point will be filtered from stack traces.\nvar qEndingLine = captureLine();\n\nreturn Q;\n\n});\n"]}","/**\n * Module dependencies.\n */\n\nvar Emitter = require('emitter');\nvar reduce = require('reduce');\n\n/**\n * Root reference for iframes.\n */\n\nvar root;\nif (typeof window !== 'undefined') { // Browser window\n  root = window;\n} else if (typeof self !== 'undefined') { // Web Worker\n  root = self;\n} else { // Other environments\n  root = this;\n}\n\n/**\n * Noop.\n */\n\nfunction noop(){};\n\n/**\n * Check if `obj` is a host object,\n * we don't want to serialize these :)\n *\n * TODO: future proof, move to compoent land\n *\n * @param {Object} obj\n * @return {Boolean}\n * @api private\n */\n\nfunction isHost(obj) {\n  var str = {}.toString.call(obj);\n\n  switch (str) {\n    case '[object File]':\n    case '[object Blob]':\n    case '[object FormData]':\n      return true;\n    default:\n      return false;\n  }\n}\n\n/**\n * Determine XHR.\n */\n\nrequest.getXHR = function () {\n  if (root.XMLHttpRequest\n      && (!root.location || 'file:' != root.location.protocol\n          || !root.ActiveXObject)) {\n    return new XMLHttpRequest;\n  } else {\n    try { return new ActiveXObject('Microsoft.XMLHTTP'); } catch(e) {}\n    try { return new ActiveXObject('Msxml2.XMLHTTP.6.0'); } catch(e) {}\n    try { return new ActiveXObject('Msxml2.XMLHTTP.3.0'); } catch(e) {}\n    try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch(e) {}\n  }\n  return false;\n};\n\n/**\n * Removes leading and trailing whitespace, added to support IE.\n *\n * @param {String} s\n * @return {String}\n * @api private\n */\n\nvar trim = ''.trim\n  ? function(s) { return s.trim(); }\n  : function(s) { return s.replace(/(^\\s*|\\s*$)/g, ''); };\n\n/**\n * Check if `obj` is an object.\n *\n * @param {Object} obj\n * @return {Boolean}\n * @api private\n */\n\nfunction isObject(obj) {\n  return obj === Object(obj);\n}\n\n/**\n * Serialize the given `obj`.\n *\n * @param {Object} obj\n * @return {String}\n * @api private\n */\n\nfunction serialize(obj) {\n  if (!isObject(obj)) return obj;\n  var pairs = [];\n  for (var key in obj) {\n    if (null != obj[key]) {\n      pushEncodedKeyValuePair(pairs, key, obj[key]);\n        }\n      }\n  return pairs.join('&');\n}\n\n/**\n * Helps 'serialize' with serializing arrays.\n * Mutates the pairs array.\n *\n * @param {Array} pairs\n * @param {String} key\n * @param {Mixed} val\n */\n\nfunction pushEncodedKeyValuePair(pairs, key, val) {\n  if (Array.isArray(val)) {\n    return val.forEach(function(v) {\n      pushEncodedKeyValuePair(pairs, key, v);\n    });\n  }\n  pairs.push(encodeURIComponent(key)\n    + '=' + encodeURIComponent(val));\n}\n\n/**\n * Expose serialization method.\n */\n\n request.serializeObject = serialize;\n\n /**\n  * Parse the given x-www-form-urlencoded `str`.\n  *\n  * @param {String} str\n  * @return {Object}\n  * @api private\n  */\n\nfunction parseString(str) {\n  var obj = {};\n  var pairs = str.split('&');\n  var parts;\n  var pair;\n\n  for (var i = 0, len = pairs.length; i < len; ++i) {\n    pair = pairs[i];\n    parts = pair.split('=');\n    obj[decodeURIComponent(parts[0])] = decodeURIComponent(parts[1]);\n  }\n\n  return obj;\n}\n\n/**\n * Expose parser.\n */\n\nrequest.parseString = parseString;\n\n/**\n * Default MIME type map.\n *\n *     superagent.types.xml = 'application/xml';\n *\n */\n\nrequest.types = {\n  html: 'text/html',\n  json: 'application/json',\n  xml: 'application/xml',\n  urlencoded: 'application/x-www-form-urlencoded',\n  'form': 'application/x-www-form-urlencoded',\n  'form-data': 'application/x-www-form-urlencoded'\n};\n\n/**\n * Default serialization map.\n *\n *     superagent.serialize['application/xml'] = function(obj){\n *       return 'generated xml here';\n *     };\n *\n */\n\n request.serialize = {\n   'application/x-www-form-urlencoded': serialize,\n   'application/json': JSON.stringify\n };\n\n /**\n  * Default parsers.\n  *\n  *     superagent.parse['application/xml'] = function(str){\n  *       return { object parsed from str };\n  *     };\n  *\n  */\n\nrequest.parse = {\n  'application/x-www-form-urlencoded': parseString,\n  'application/json': JSON.parse\n};\n\n/**\n * Parse the given header `str` into\n * an object containing the mapped fields.\n *\n * @param {String} str\n * @return {Object}\n * @api private\n */\n\nfunction parseHeader(str) {\n  var lines = str.split(/\\r?\\n/);\n  var fields = {};\n  var index;\n  var line;\n  var field;\n  var val;\n\n  lines.pop(); // trailing CRLF\n\n  for (var i = 0, len = lines.length; i < len; ++i) {\n    line = lines[i];\n    index = line.indexOf(':');\n    field = line.slice(0, index).toLowerCase();\n    val = trim(line.slice(index + 1));\n    fields[field] = val;\n  }\n\n  return fields;\n}\n\n/**\n * Return the mime type for the given `str`.\n *\n * @param {String} str\n * @return {String}\n * @api private\n */\n\nfunction type(str){\n  return str.split(/ *; */).shift();\n};\n\n/**\n * Return header field parameters.\n *\n * @param {String} str\n * @return {Object}\n * @api private\n */\n\nfunction params(str){\n  return reduce(str.split(/ *; */), function(obj, str){\n    var parts = str.split(/ *= */)\n      , key = parts.shift()\n      , val = parts.shift();\n\n    if (key && val) obj[key] = val;\n    return obj;\n  }, {});\n};\n\n/**\n * Initialize a new `Response` with the given `xhr`.\n *\n *  - set flags (.ok, .error, etc)\n *  - parse header\n *\n * Examples:\n *\n *  Aliasing `superagent` as `request` is nice:\n *\n *      request = superagent;\n *\n *  We can use the promise-like API, or pass callbacks:\n *\n *      request.get('/').end(function(res){});\n *      request.get('/', function(res){});\n *\n *  Sending data can be chained:\n *\n *      request\n *        .post('/user')\n *        .send({ name: 'tj' })\n *        .end(function(res){});\n *\n *  Or passed to `.send()`:\n *\n *      request\n *        .post('/user')\n *        .send({ name: 'tj' }, function(res){});\n *\n *  Or passed to `.post()`:\n *\n *      request\n *        .post('/user', { name: 'tj' })\n *        .end(function(res){});\n *\n * Or further reduced to a single call for simple cases:\n *\n *      request\n *        .post('/user', { name: 'tj' }, function(res){});\n *\n * @param {XMLHTTPRequest} xhr\n * @param {Object} options\n * @api private\n */\n\nfunction Response(req, options) {\n  options = options || {};\n  this.req = req;\n  this.xhr = this.req.xhr;\n  // responseText is accessible only if responseType is '' or 'text' and on older browsers\n  this.text = ((this.req.method !='HEAD' && (this.xhr.responseType === '' || this.xhr.responseType === 'text')) || typeof this.xhr.responseType === 'undefined')\n     ? this.xhr.responseText\n     : null;\n  this.statusText = this.req.xhr.statusText;\n  this.setStatusProperties(this.xhr.status);\n  this.header = this.headers = parseHeader(this.xhr.getAllResponseHeaders());\n  // getAllResponseHeaders sometimes falsely returns \"\" for CORS requests, but\n  // getResponseHeader still works. so we get content-type even if getting\n  // other headers fails.\n  this.header['content-type'] = this.xhr.getResponseHeader('content-type');\n  this.setHeaderProperties(this.header);\n  this.body = this.req.method != 'HEAD'\n    ? this.parseBody(this.text ? this.text : this.xhr.response)\n    : null;\n}\n\n/**\n * Get case-insensitive `field` value.\n *\n * @param {String} field\n * @return {String}\n * @api public\n */\n\nResponse.prototype.get = function(field){\n  return this.header[field.toLowerCase()];\n};\n\n/**\n * Set header related properties:\n *\n *   - `.type` the content type without params\n *\n * A response of \"Content-Type: text/plain; charset=utf-8\"\n * will provide you with a `.type` of \"text/plain\".\n *\n * @param {Object} header\n * @api private\n */\n\nResponse.prototype.setHeaderProperties = function(header){\n  // content-type\n  var ct = this.header['content-type'] || '';\n  this.type = type(ct);\n\n  // params\n  var obj = params(ct);\n  for (var key in obj) this[key] = obj[key];\n};\n\n/**\n * Parse the given body `str`.\n *\n * Used for auto-parsing of bodies. Parsers\n * are defined on the `superagent.parse` object.\n *\n * @param {String} str\n * @return {Mixed}\n * @api private\n */\n\nResponse.prototype.parseBody = function(str){\n  var parse = request.parse[this.type];\n  return parse && str && (str.length || str instanceof Object)\n    ? parse(str)\n    : null;\n};\n\n/**\n * Set flags such as `.ok` based on `status`.\n *\n * For example a 2xx response will give you a `.ok` of __true__\n * whereas 5xx will be __false__ and `.error` will be __true__. The\n * `.clientError` and `.serverError` are also available to be more\n * specific, and `.statusType` is the class of error ranging from 1..5\n * sometimes useful for mapping respond colors etc.\n *\n * \"sugar\" properties are also defined for common cases. Currently providing:\n *\n *   - .noContent\n *   - .badRequest\n *   - .unauthorized\n *   - .notAcceptable\n *   - .notFound\n *\n * @param {Number} status\n * @api private\n */\n\nResponse.prototype.setStatusProperties = function(status){\n  // handle IE9 bug: http://stackoverflow.com/questions/10046972/msie-returns-status-code-of-1223-for-ajax-request\n  if (status === 1223) {\n    status = 204;\n  }\n\n  var type = status / 100 | 0;\n\n  // status / class\n  this.status = this.statusCode = status;\n  this.statusType = type;\n\n  // basics\n  this.info = 1 == type;\n  this.ok = 2 == type;\n  this.clientError = 4 == type;\n  this.serverError = 5 == type;\n  this.error = (4 == type || 5 == type)\n    ? this.toError()\n    : false;\n\n  // sugar\n  this.accepted = 202 == status;\n  this.noContent = 204 == status;\n  this.badRequest = 400 == status;\n  this.unauthorized = 401 == status;\n  this.notAcceptable = 406 == status;\n  this.notFound = 404 == status;\n  this.forbidden = 403 == status;\n};\n\n/**\n * Return an `Error` representative of this response.\n *\n * @return {Error}\n * @api public\n */\n\nResponse.prototype.toError = function(){\n  var req = this.req;\n  var method = req.method;\n  var url = req.url;\n\n  var msg = 'cannot ' + method + ' ' + url + ' (' + this.status + ')';\n  var err = new Error(msg);\n  err.status = this.status;\n  err.method = method;\n  err.url = url;\n\n  return err;\n};\n\n/**\n * Expose `Response`.\n */\n\nrequest.Response = Response;\n\n/**\n * Initialize a new `Request` with the given `method` and `url`.\n *\n * @param {String} method\n * @param {String} url\n * @api public\n */\n\nfunction Request(method, url) {\n  var self = this;\n  Emitter.call(this);\n  this._query = this._query || [];\n  this.method = method;\n  this.url = url;\n  this.header = {};\n  this._header = {};\n  this.on('end', function(){\n    var err = null;\n    var res = null;\n\n    try {\n      res = new Response(self);\n    } catch(e) {\n      err = new Error('Parser is unable to parse the response');\n      err.parse = true;\n      err.original = e;\n      return self.callback(err);\n    }\n\n    self.emit('response', res);\n\n    if (err) {\n      return self.callback(err, res);\n    }\n\n    if (res.status >= 200 && res.status < 300) {\n      return self.callback(err, res);\n    }\n\n    var new_err = new Error(res.statusText || 'Unsuccessful HTTP response');\n    new_err.original = err;\n    new_err.response = res;\n    new_err.status = res.status;\n\n    self.callback(new_err, res);\n  });\n}\n\n/**\n * Mixin `Emitter`.\n */\n\nEmitter(Request.prototype);\n\n/**\n * Allow for extension\n */\n\nRequest.prototype.use = function(fn) {\n  fn(this);\n  return this;\n}\n\n/**\n * Set timeout to `ms`.\n *\n * @param {Number} ms\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.timeout = function(ms){\n  this._timeout = ms;\n  return this;\n};\n\n/**\n * Clear previous timeout.\n *\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.clearTimeout = function(){\n  this._timeout = 0;\n  clearTimeout(this._timer);\n  return this;\n};\n\n/**\n * Abort the request, and clear potential timeout.\n *\n * @return {Request}\n * @api public\n */\n\nRequest.prototype.abort = function(){\n  if (this.aborted) return;\n  this.aborted = true;\n  this.xhr.abort();\n  this.clearTimeout();\n  this.emit('abort');\n  return this;\n};\n\n/**\n * Set header `field` to `val`, or multiple fields with one object.\n *\n * Examples:\n *\n *      req.get('/')\n *        .set('Accept', 'application/json')\n *        .set('X-API-Key', 'foobar')\n *        .end(callback);\n *\n *      req.get('/')\n *        .set({ Accept: 'application/json', 'X-API-Key': 'foobar' })\n *        .end(callback);\n *\n * @param {String|Object} field\n * @param {String} val\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.set = function(field, val){\n  if (isObject(field)) {\n    for (var key in field) {\n      this.set(key, field[key]);\n    }\n    return this;\n  }\n  this._header[field.toLowerCase()] = val;\n  this.header[field] = val;\n  return this;\n};\n\n/**\n * Remove header `field`.\n *\n * Example:\n *\n *      req.get('/')\n *        .unset('User-Agent')\n *        .end(callback);\n *\n * @param {String} field\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.unset = function(field){\n  delete this._header[field.toLowerCase()];\n  delete this.header[field];\n  return this;\n};\n\n/**\n * Get case-insensitive header `field` value.\n *\n * @param {String} field\n * @return {String}\n * @api private\n */\n\nRequest.prototype.getHeader = function(field){\n  return this._header[field.toLowerCase()];\n};\n\n/**\n * Set Content-Type to `type`, mapping values from `request.types`.\n *\n * Examples:\n *\n *      superagent.types.xml = 'application/xml';\n *\n *      request.post('/')\n *        .type('xml')\n *        .send(xmlstring)\n *        .end(callback);\n *\n *      request.post('/')\n *        .type('application/xml')\n *        .send(xmlstring)\n *        .end(callback);\n *\n * @param {String} type\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.type = function(type){\n  this.set('Content-Type', request.types[type] || type);\n  return this;\n};\n\n/**\n * Force given parser\n *\n * Sets the body parser no matter type.\n *\n * @param {Function}\n * @api public\n */\n\nRequest.prototype.parse = function(fn){\n  this._parser = fn;\n  return this;\n};\n\n/**\n * Set Accept to `type`, mapping values from `request.types`.\n *\n * Examples:\n *\n *      superagent.types.json = 'application/json';\n *\n *      request.get('/agent')\n *        .accept('json')\n *        .end(callback);\n *\n *      request.get('/agent')\n *        .accept('application/json')\n *        .end(callback);\n *\n * @param {String} accept\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.accept = function(type){\n  this.set('Accept', request.types[type] || type);\n  return this;\n};\n\n/**\n * Set Authorization field value with `user` and `pass`.\n *\n * @param {String} user\n * @param {String} pass\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.auth = function(user, pass){\n  var str = btoa(user + ':' + pass);\n  this.set('Authorization', 'Basic ' + str);\n  return this;\n};\n\n/**\n* Add query-string `val`.\n*\n* Examples:\n*\n*   request.get('/shoes')\n*     .query('size=10')\n*     .query({ color: 'blue' })\n*\n* @param {Object|String} val\n* @return {Request} for chaining\n* @api public\n*/\n\nRequest.prototype.query = function(val){\n  if ('string' != typeof val) val = serialize(val);\n  if (val) this._query.push(val);\n  return this;\n};\n\n/**\n * Write the field `name` and `val` for \"multipart/form-data\"\n * request bodies.\n *\n * ``` js\n * request.post('/upload')\n *   .field('foo', 'bar')\n *   .end(callback);\n * ```\n *\n * @param {String} name\n * @param {String|Blob|File} val\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.field = function(name, val){\n  if (!this._formData) this._formData = new root.FormData();\n  this._formData.append(name, val);\n  return this;\n};\n\n/**\n * Queue the given `file` as an attachment to the specified `field`,\n * with optional `filename`.\n *\n * ``` js\n * request.post('/upload')\n *   .attach(new Blob(['<a id=\"a\"><b id=\"b\">hey!</b></a>'], { type: \"text/html\"}))\n *   .end(callback);\n * ```\n *\n * @param {String} field\n * @param {Blob|File} file\n * @param {String} filename\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.attach = function(field, file, filename){\n  if (!this._formData) this._formData = new root.FormData();\n  this._formData.append(field, file, filename);\n  return this;\n};\n\n/**\n * Send `data`, defaulting the `.type()` to \"json\" when\n * an object is given.\n *\n * Examples:\n *\n *       // querystring\n *       request.get('/search')\n *         .end(callback)\n *\n *       // multiple data \"writes\"\n *       request.get('/search')\n *         .send({ search: 'query' })\n *         .send({ range: '1..5' })\n *         .send({ order: 'desc' })\n *         .end(callback)\n *\n *       // manual json\n *       request.post('/user')\n *         .type('json')\n *         .send('{\"name\":\"tj\"}')\n *         .end(callback)\n *\n *       // auto json\n *       request.post('/user')\n *         .send({ name: 'tj' })\n *         .end(callback)\n *\n *       // manual x-www-form-urlencoded\n *       request.post('/user')\n *         .type('form')\n *         .send('name=tj')\n *         .end(callback)\n *\n *       // auto x-www-form-urlencoded\n *       request.post('/user')\n *         .type('form')\n *         .send({ name: 'tj' })\n *         .end(callback)\n *\n *       // defaults to x-www-form-urlencoded\n  *      request.post('/user')\n  *        .send('name=tobi')\n  *        .send('species=ferret')\n  *        .end(callback)\n *\n * @param {String|Object} data\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.send = function(data){\n  var obj = isObject(data);\n  var type = this.getHeader('Content-Type');\n\n  // merge\n  if (obj && isObject(this._data)) {\n    for (var key in data) {\n      this._data[key] = data[key];\n    }\n  } else if ('string' == typeof data) {\n    if (!type) this.type('form');\n    type = this.getHeader('Content-Type');\n    if ('application/x-www-form-urlencoded' == type) {\n      this._data = this._data\n        ? this._data + '&' + data\n        : data;\n    } else {\n      this._data = (this._data || '') + data;\n    }\n  } else {\n    this._data = data;\n  }\n\n  if (!obj || isHost(data)) return this;\n  if (!type) this.type('json');\n  return this;\n};\n\n/**\n * Invoke the callback with `err` and `res`\n * and handle arity check.\n *\n * @param {Error} err\n * @param {Response} res\n * @api private\n */\n\nRequest.prototype.callback = function(err, res){\n  var fn = this._callback;\n  this.clearTimeout();\n  fn(err, res);\n};\n\n/**\n * Invoke callback with x-domain error.\n *\n * @api private\n */\n\nRequest.prototype.crossDomainError = function(){\n  var err = new Error('Origin is not allowed by Access-Control-Allow-Origin');\n  err.crossDomain = true;\n  this.callback(err);\n};\n\n/**\n * Invoke callback with timeout error.\n *\n * @api private\n */\n\nRequest.prototype.timeoutError = function(){\n  var timeout = this._timeout;\n  var err = new Error('timeout of ' + timeout + 'ms exceeded');\n  err.timeout = timeout;\n  this.callback(err);\n};\n\n/**\n * Enable transmission of cookies with x-domain requests.\n *\n * Note that for this to work the origin must not be\n * using \"Access-Control-Allow-Origin\" with a wildcard,\n * and also must set \"Access-Control-Allow-Credentials\"\n * to \"true\".\n *\n * @api public\n */\n\nRequest.prototype.withCredentials = function(){\n  this._withCredentials = true;\n  return this;\n};\n\n/**\n * Initiate request, invoking callback `fn(res)`\n * with an instanceof `Response`.\n *\n * @param {Function} fn\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.end = function(fn){\n  var self = this;\n  var xhr = this.xhr = request.getXHR();\n  var query = this._query.join('&');\n  var timeout = this._timeout;\n  var data = this._formData || this._data;\n\n  // store callback\n  this._callback = fn || noop;\n\n  // state change\n  xhr.onreadystatechange = function(){\n    if (4 != xhr.readyState) return;\n\n    // In IE9, reads to any property (e.g. status) off of an aborted XHR will\n    // result in the error \"Could not complete the operation due to error c00c023f\"\n    var status;\n    try { status = xhr.status } catch(e) { status = 0; }\n\n    if (0 == status) {\n      if (self.timedout) return self.timeoutError();\n      if (self.aborted) return;\n      return self.crossDomainError();\n    }\n    self.emit('end');\n  };\n\n  // progress\n  var handleProgress = function(e){\n    if (e.total > 0) {\n      e.percent = e.loaded / e.total * 100;\n    }\n    self.emit('progress', e);\n  };\n  if (this.hasListeners('progress')) {\n    xhr.onprogress = handleProgress;\n  }\n  try {\n    if (xhr.upload && this.hasListeners('progress')) {\n      xhr.upload.onprogress = handleProgress;\n    }\n  } catch(e) {\n    // Accessing xhr.upload fails in IE from a web worker, so just pretend it doesn't exist.\n    // Reported here:\n    // https://connect.microsoft.com/IE/feedback/details/837245/xmlhttprequest-upload-throws-invalid-argument-when-used-from-web-worker-context\n  }\n\n  // timeout\n  if (timeout && !this._timer) {\n    this._timer = setTimeout(function(){\n      self.timedout = true;\n      self.abort();\n    }, timeout);\n  }\n\n  // querystring\n  if (query) {\n    query = request.serializeObject(query);\n    this.url += ~this.url.indexOf('?')\n      ? '&' + query\n      : '?' + query;\n  }\n\n  // initiate request\n  xhr.open(this.method, this.url, true);\n\n  // CORS\n  if (this._withCredentials) xhr.withCredentials = true;\n\n  // body\n  if ('GET' != this.method && 'HEAD' != this.method && 'string' != typeof data && !isHost(data)) {\n    // serialize stuff\n    var contentType = this.getHeader('Content-Type');\n    var serialize = this._parser || request.serialize[contentType ? contentType.split(';')[0] : ''];\n    if (serialize) data = serialize(data);\n  }\n\n  // set header fields\n  for (var field in this.header) {\n    if (null == this.header[field]) continue;\n    xhr.setRequestHeader(field, this.header[field]);\n  }\n\n  // send stuff\n  this.emit('request', this);\n\n  // IE11 xhr.send(undefined) sends 'undefined' string as POST payload (instead of nothing)\n  // We need null here if data is undefined\n  xhr.send(typeof data !== 'undefined' ? data : null);\n  return this;\n};\n\n/**\n * Faux promise support\n *\n * @param {Function} fulfill\n * @param {Function} reject\n * @return {Request}\n */\n\nRequest.prototype.then = function (fulfill, reject) {\n  return this.end(function(err, res) {\n    err ? reject(err) : fulfill(res);\n  });\n}\n\n/**\n * Expose `Request`.\n */\n\nrequest.Request = Request;\n\n/**\n * Issue a request:\n *\n * Examples:\n *\n *    request('GET', '/users').end(callback)\n *    request('/users').end(callback)\n *    request('/users', callback)\n *\n * @param {String} method\n * @param {String|Function} url or callback\n * @return {Request}\n * @api public\n */\n\nfunction request(method, url) {\n  // callback\n  if ('function' == typeof url) {\n    return new Request('GET', method).end(url);\n  }\n\n  // url first\n  if (1 == arguments.length) {\n    return new Request('GET', method);\n  }\n\n  return new Request(method, url);\n}\n\n/**\n * GET `url` with optional callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed|Function} data or fn\n * @param {Function} fn\n * @return {Request}\n * @api public\n */\n\nrequest.get = function(url, data, fn){\n  var req = request('GET', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.query(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * HEAD `url` with optional callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed|Function} data or fn\n * @param {Function} fn\n * @return {Request}\n * @api public\n */\n\nrequest.head = function(url, data, fn){\n  var req = request('HEAD', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * DELETE `url` with optional callback `fn(res)`.\n *\n * @param {String} url\n * @param {Function} fn\n * @return {Request}\n * @api public\n */\n\nfunction del(url, fn){\n  var req = request('DELETE', url);\n  if (fn) req.end(fn);\n  return req;\n};\n\nrequest.del = del;\nrequest.delete = del;\n\n/**\n * PATCH `url` with optional `data` and callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed} data\n * @param {Function} fn\n * @return {Request}\n * @api public\n */\n\nrequest.patch = function(url, data, fn){\n  var req = request('PATCH', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * POST `url` with optional `data` and callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed} data\n * @param {Function} fn\n * @return {Request}\n * @api public\n */\n\nrequest.post = function(url, data, fn){\n  var req = request('POST', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * PUT `url` with optional `data` and callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed|Function} data or fn\n * @param {Function} fn\n * @return {Request}\n * @api public\n */\n\nrequest.put = function(url, data, fn){\n  var req = request('PUT', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * Expose `request`.\n */\n\nmodule.exports = request;\n","\n/**\n * Expose `Emitter`.\n */\n\nmodule.exports = Emitter;\n\n/**\n * Initialize a new `Emitter`.\n *\n * @api public\n */\n\nfunction Emitter(obj) {\n  if (obj) return mixin(obj);\n};\n\n/**\n * Mixin the emitter properties.\n *\n * @param {Object} obj\n * @return {Object}\n * @api private\n */\n\nfunction mixin(obj) {\n  for (var key in Emitter.prototype) {\n    obj[key] = Emitter.prototype[key];\n  }\n  return obj;\n}\n\n/**\n * Listen on the given `event` with `fn`.\n *\n * @param {String} event\n * @param {Function} fn\n * @return {Emitter}\n * @api public\n */\n\nEmitter.prototype.on =\nEmitter.prototype.addEventListener = function(event, fn){\n  this._callbacks = this._callbacks || {};\n  (this._callbacks[event] = this._callbacks[event] || [])\n    .push(fn);\n  return this;\n};\n\n/**\n * Adds an `event` listener that will be invoked a single\n * time then automatically removed.\n *\n * @param {String} event\n * @param {Function} fn\n * @return {Emitter}\n * @api public\n */\n\nEmitter.prototype.once = function(event, fn){\n  var self = this;\n  this._callbacks = this._callbacks || {};\n\n  function on() {\n    self.off(event, on);\n    fn.apply(this, arguments);\n  }\n\n  on.fn = fn;\n  this.on(event, on);\n  return this;\n};\n\n/**\n * Remove the given callback for `event` or all\n * registered callbacks.\n *\n * @param {String} event\n * @param {Function} fn\n * @return {Emitter}\n * @api public\n */\n\nEmitter.prototype.off =\nEmitter.prototype.removeListener =\nEmitter.prototype.removeAllListeners =\nEmitter.prototype.removeEventListener = function(event, fn){\n  this._callbacks = this._callbacks || {};\n\n  // all\n  if (0 == arguments.length) {\n    this._callbacks = {};\n    return this;\n  }\n\n  // specific event\n  var callbacks = this._callbacks[event];\n  if (!callbacks) return this;\n\n  // remove all handlers\n  if (1 == arguments.length) {\n    delete this._callbacks[event];\n    return this;\n  }\n\n  // remove specific handler\n  var cb;\n  for (var i = 0; i < callbacks.length; i++) {\n    cb = callbacks[i];\n    if (cb === fn || cb.fn === fn) {\n      callbacks.splice(i, 1);\n      break;\n    }\n  }\n  return this;\n};\n\n/**\n * Emit `event` with the given args.\n *\n * @param {String} event\n * @param {Mixed} ...\n * @return {Emitter}\n */\n\nEmitter.prototype.emit = function(event){\n  this._callbacks = this._callbacks || {};\n  var args = [].slice.call(arguments, 1)\n    , callbacks = this._callbacks[event];\n\n  if (callbacks) {\n    callbacks = callbacks.slice(0);\n    for (var i = 0, len = callbacks.length; i < len; ++i) {\n      callbacks[i].apply(this, args);\n    }\n  }\n\n  return this;\n};\n\n/**\n * Return array of callbacks for `event`.\n *\n * @param {String} event\n * @return {Array}\n * @api public\n */\n\nEmitter.prototype.listeners = function(event){\n  this._callbacks = this._callbacks || {};\n  return this._callbacks[event] || [];\n};\n\n/**\n * Check if this emitter has `event` handlers.\n *\n * @param {String} event\n * @return {Boolean}\n * @api public\n */\n\nEmitter.prototype.hasListeners = function(event){\n  return !! this.listeners(event).length;\n};\n","\n/**\n * Reduce `arr` with `fn`.\n *\n * @param {Array} arr\n * @param {Function} fn\n * @param {Mixed} initial\n *\n * TODO: combatible error handling?\n */\n\nmodule.exports = function(arr, fn, initial){  \n  var idx = 0;\n  var len = arr.length;\n  var curr = arguments.length == 3\n    ? initial\n    : arr[idx++];\n\n  while (idx < len) {\n    curr = fn.call(null, curr, arr[idx], ++idx, arr);\n  }\n  \n  return curr;\n};"]}
 
- /*global JSONEditor*/ 
+
+ /*global JSONEditor*/
 'use strict';
 
 window.SwaggerUi = Backbone.Router.extend({
@@ -24633,11 +21720,11 @@ window.SwaggerUi = Backbone.Router.extend({
   // SwaggerUi accepts all the same options as SwaggerApi
   initialize: function(options) {
     options = options || {};
-    
+
     if (options.defaultModelRendering !== 'model') {
       options.defaultModelRendering = 'schema';
     }
-    
+
     if (!options.highlightSizeThreshold) {
       options.highlightSizeThreshold = 100000;
     }
@@ -24661,7 +21748,7 @@ window.SwaggerUi = Backbone.Router.extend({
     }
 
     if (typeof options.oauth2RedirectUrl === 'string') {
-      window.oAuthRedirectUrl = options.redirectUrl;
+      window.oAuthRedirectUrl = options.oauth2RedirectUrl;
     }
 
     // Create an empty div which contains the dom_id
@@ -24721,6 +21808,10 @@ window.SwaggerUi = Backbone.Router.extend({
     if (this.mainView) {
       this.mainView.clear();
     }
+
+    if (this.authView) {
+      this.authView.remove();
+    }
     var url = this.options.url;
     if (url && url.indexOf('http') !== 0) {
       url = this.buildUrl(window.location.href.toString(), url);
@@ -24752,6 +21843,7 @@ window.SwaggerUi = Backbone.Router.extend({
   // This is bound to success handler for SwaggerApi
   //  so it gets called when SwaggerApi completes loading
   render: function(){
+    var authsModel;
     this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...');
     this.mainView = new SwaggerUi.Views.MainView({
       model: this.api,
@@ -24759,6 +21851,18 @@ window.SwaggerUi = Backbone.Router.extend({
       swaggerOptions: this.options,
       router: this
     }).render();
+    if (!_.isEmpty(this.api.securityDefinitions)){
+      authsModel = _.map(this.api.securityDefinitions, function (auth, name) {
+        var result = {};
+        result[name] = auth;
+        return result;
+      });
+      this.authView = new SwaggerUi.Views.AuthButtonView({
+        data: SwaggerUi.utils.parseSecurityDefinitions(authsModel),
+        router: this
+      });
+      $('#auth_container').append(this.authView.render().el);
+    }
     this.showMessage();
     switch (this.options.docExpansion) {
       case 'full':
@@ -24848,6 +21952,10 @@ window.SwaggerUi = Backbone.Router.extend({
 });
 
 window.SwaggerUi.Views = {};
+window.SwaggerUi.Models = {};
+window.SwaggerUi.Collections = {};
+window.SwaggerUi.partials = {};
+window.SwaggerUi.utils = {};
 
 // don't break backward compatibility with previous versions and warn users to upgrade their code
 (function(){
@@ -24905,108 +22013,664 @@ window.SwaggerUi.Views = {};
 
 'use strict';
 
-SwaggerUi.Views.ApiKeyButton = Backbone.View.extend({ // TODO: append this to global SwaggerUi
+window.SwaggerUi.utils = {
+    parseSecurityDefinitions: function (security, securityDefinitions) {
+        var auths = Object.assign({}, securityDefinitions);
+        var oauth2Arr = [];
+        var authsArr = [];
+        var scopes = [];
+        var utils = window.SwaggerUi.utils;
 
-  events:{
-    'click #apikey_button' : 'toggleApiKeyContainer',
-    'click #apply_api_key' : 'applyApiKey'
-  },
+        if (!Array.isArray(security)) { return null; }
 
-  initialize: function(opts){
-    this.options = opts || {};
-    this.router = this.options.router;
-  },
+        security.forEach(function (item) {
+            var singleSecurity = {};
+            var singleOauth2Security = {};
 
-  render: function(){
-    var template = this.template();
-    $(this.el).html(template(this.model));
+            for (var key in item) {
+                if (Array.isArray(item[key])) {
+                    if (!auths[key]) { continue; }
+                    auths[key] = auths[key] || {};
+                    if (auths[key].type === 'oauth2') {
+                        singleOauth2Security[key] = Object.assign({}, auths[key]);
+                        singleOauth2Security[key].scopes = Object.assign({}, auths[key].scopes);
+                        for (var i in singleOauth2Security[key].scopes) {
+                            if (item[key].indexOf(i) < 0) {
+                                delete singleOauth2Security[key].scopes[i];
+                            }
+                        }
+                        singleOauth2Security[key].scopes = utils.parseOauth2Scopes(singleOauth2Security[key].scopes);
+                        scopes = _.merge(scopes, singleOauth2Security[key].scopes);
+                    } else {
+                        singleSecurity[key] = Object.assign({}, auths[key]);
+                    }
+                } else {
+                    if (item[key].type === 'oauth2') {
+                        singleOauth2Security[key] = Object.assign({}, item[key]);
+                        singleOauth2Security[key].scopes = utils.parseOauth2Scopes(singleOauth2Security[key].scopes);
+                        scopes = _.merge(scopes, singleOauth2Security[key].scopes);
+                    } else {
+                        singleSecurity[key] = item[key];
+                    }
+                }
+            }
 
-    return this;
-  },
+            if (!_.isEmpty(singleSecurity)) {
+                authsArr.push(singleSecurity);
+            }
 
+            if (!_.isEmpty(singleOauth2Security)){
+                oauth2Arr.push(singleOauth2Security);
+            }
+        });
 
-  applyApiKey: function(){
-    var keyAuth = new SwaggerClient.ApiKeyAuthorization(
-      this.model.name,
-      $('#input_apiKey_entry').val(),
-      this.model.in
-    );
-    this.router.api.clientAuthorizations.add(this.model.name, keyAuth);
-    this.router.load();
-    $('#apikey_container').show();
-  },
+        return {
+            auths : authsArr,
+            oauth2: oauth2Arr,
+            scopes: scopes
+        };
+    },
 
-  toggleApiKeyContainer: function(){
-    if ($('#apikey_container').length) {
+    parseOauth2Scopes: function (data) {
+        var scopes = Object.assign({}, data);
+        var result = [];
+        var key;
 
-      var elem = $('#apikey_container').first();
+        for (key in scopes) {
+            result.push({scope: key, description: scopes[key]});
+        }
 
-      if (elem.is(':visible')){
-        elem.hide();
-      } else {
+        return result;
+    },
 
-        // hide others
-        $('.auth_container').hide();
-        elem.show();
-      }
+    sanitize: function(html) {
+        // Strip the script tags from the html and inline evenhandlers
+        html = html.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
+        html = html.replace(/(on\w+="[^"]*")*(on\w+='[^']*')*(on\w+=\w*\(\w*\))*/gi, '');
+
+        return html;
     }
-  },
+};
+'use strict';
 
-  template: function(){
-    return Handlebars.templates.apikey_button_view;
-  }
+SwaggerUi.Models.ApiKeyAuthModel = Backbone.Model.extend({
+    defaults: {
+        'in': '',
+        name: '',
+        title: '',
+        value: ''
+    },
+
+    initialize: function () {
+        this.on('change', this.validate);
+    },
+
+    validate: function () {
+        var valid = !!this.get('value');
+
+        this.set('valid', valid);
+
+        return valid;
+    }
+});
+'use strict';
+
+SwaggerUi.Views.ApiKeyAuthView = Backbone.View.extend({ // TODO: append this to global SwaggerUi
+
+    events: {
+        'change .input_apiKey_entry': 'apiKeyChange'
+    },
+
+    selectors: {
+        apikeyInput: '.input_apiKey_entry'
+    },
+
+    template: Handlebars.templates.apikey_auth,
+
+    initialize: function(opts) {
+        this.options = opts || {};
+        this.router = this.options.router;
+    },
+
+    render: function (){
+        this.$el.html(this.template(this.model.toJSON()));
+
+        return this;
+    },
+
+    apiKeyChange: function (e) {
+        var val = $(e.target).val();
+        if (val) {
+            this.$(this.selectors.apikeyInput).removeClass('error');
+        }
+
+        this.model.set('value', val);
+    },
+
+    isValid: function () {
+        return this.model.validate();
+    },
+
+    highlightInvalid: function () {
+        if (!this.isValid()) {
+            this.$(this.selectors.apikeyInput).addClass('error');
+        }
+    }
 
 });
 'use strict';
 
-SwaggerUi.Views.BasicAuthButton = Backbone.View.extend({
+SwaggerUi.Views.AuthButtonView = Backbone.View.extend({
+    events: {
+        'click .authorize__btn': 'authorizeBtnClick'
+    },
 
+    tpls: {
+        popup: Handlebars.templates.popup,
+        authBtn: Handlebars.templates.auth_button,
+        authBtnOperation: Handlebars.templates.auth_button_operation
+    },
 
-  initialize: function (opts) {
-    this.options = opts || {};
-    this.router = this.options.router;
-  },
+    initialize: function(opts) {
+        this.options = opts || {};
+        this.options.data = this.options.data || {};
+        this.isOperation = this.options.isOperation;
+        this.model = this.model || {};
+        this.router = this.options.router;
+        this.auths = this.options.data.oauth2.concat(this.options.data.auths);
+    },
 
-  render: function(){
-    var template = this.template();
-    $(this.el).html(template(this.model));
+    render: function () {
+        var tplName = this.isOperation ? 'authBtnOperation' : 'authBtn';
 
-    return this;
-  },
+        this.$authEl = this.renderAuths(this.auths);
+        this.$el.html(this.tpls[tplName](this.model));
 
-  events: {
-    'click #basic_auth_button' : 'togglePasswordContainer',
-    'click #apply_basic_auth' : 'applyPassword'
-  },
+        return this;
+    },
 
-  applyPassword: function(event){
-    event.preventDefault();
-    var username = $('#input_username').val();
-    var password = $('#input_password').val();
-    var basicAuth = new SwaggerClient.PasswordAuthorization('basic', username, password);
-    this.router.api.clientAuthorizations.add(this.model.type, basicAuth);
-    this.router.load();
-    $('#basic_auth_container').hide();
-  },
+    authorizeBtnClick: function (e) {
+        var authsModel;
 
-  togglePasswordContainer: function(){
-    if ($('#basic_auth_container').length) {
-      var elem = $('#basic_auth_container').show();
-      if (elem.is(':visible')){
-        elem.slideUp();
-      } else {
-        // hide others
-        $('.auth_container').hide();
-        elem.show();
-      }
+        e.preventDefault();
+
+        authsModel = {
+            title: 'Available authorizations',
+            content: this.$authEl
+        };
+
+        // The content of the popup is removed and all events unbound after clicking the 'Cancel' button of the popup.
+        // We'll have to re-render the contents before creating a new popup view.
+        this.render();
+
+        this.popup = new SwaggerUi.Views.PopupView({model: authsModel});
+        this.popup.render();
+    },
+
+    renderAuths: function (auths) {
+        var $el = $('<div>');
+        var isLogout = false;
+
+        auths.forEach(function (auth) {
+            var authView = new SwaggerUi.Views.AuthView({data: auth, router: this.router});
+            var authEl = authView.render().el;
+            $el.append(authEl);
+            if (authView.isLogout) {
+                isLogout = true;
+            }
+        }, this);
+
+        this.model.isLogout = isLogout;
+
+        return $el;
     }
-  },
-
-  template: function(){
-    return Handlebars.templates.basic_auth_button_view;
-  }
 
 });
+
+'use strict';
+
+SwaggerUi.Collections.AuthsCollection = Backbone.Collection.extend({
+    constructor: function() {
+        var args = Array.prototype.slice.call(arguments);
+
+        args[0] = this.parse(args[0]);
+
+        Backbone.Collection.apply(this, args);
+    },
+
+    add: function (model) {
+        var args = Array.prototype.slice.call(arguments);
+
+        if (Array.isArray(model)) {
+            args[0] = _.map(model, function(val) {
+                return this.handleOne(val);
+            }, this);
+        } else {
+            args[0] = this.handleOne(model);
+        }
+
+        Backbone.Collection.prototype.add.apply(this, args);
+    },
+
+    handleOne: function (model) {
+        var result = model;
+
+        if (! (model instanceof Backbone.Model) ) {
+            switch (model.type) {
+                case 'oauth2':
+                    result = new SwaggerUi.Models.Oauth2Model(model);
+                    break;
+                case 'basic':
+                    result = new SwaggerUi.Models.BasicAuthModel(model);
+                    break;
+                case 'apiKey':
+                    result = new SwaggerUi.Models.ApiKeyAuthModel(model);
+                    break;
+                default:
+                    result = new Backbone.Model(model);
+            }
+        }
+
+        return result;
+    },
+
+    isValid: function () {
+        var valid = true;
+
+        this.models.forEach(function(model) {
+            if (!model.validate()) {
+                valid = false;
+            }
+        });
+
+        return valid;
+    },
+
+    isAuthorized: function () {
+        return this.length === this.where({ isLogout: true }).length;
+    },
+
+    isPartiallyAuthorized: function () {
+        return this.where({ isLogout: true }).length > 0;
+    },
+
+    parse: function (data) {
+        var authz = {};
+
+        if(typeof window.swaggerUi !== 'undefined') {
+            authz = Object.assign({}, window.swaggerUi.api.clientAuthorizations.authz);
+        }
+
+        return _.map(data, function (auth, name) {
+            var isBasic = authz[name] && auth.type === 'basic' && authz[name].username && authz[name].password;
+
+            _.extend(auth, {
+                title: name
+            });
+
+            if (authz[name] || isBasic) {
+                _.extend(auth, {
+                    isLogout: true,
+                    value: isBasic ? undefined : authz[name].value,
+                    username: isBasic ? authz[name].username : undefined,
+                    password: isBasic ? authz[name].password : undefined,
+                    valid: true
+                });
+            }
+
+            return auth;
+        });
+    }
+});
+'use strict';
+
+SwaggerUi.Views.AuthsCollectionView = Backbone.View.extend({
+
+    initialize: function(opts) {
+        this.options = opts || {};
+        this.options.data = this.options.data || {};
+        this.router = this.options.router;
+
+        this.collection = new SwaggerUi.Collections.AuthsCollection(opts.data);
+
+        this.$innerEl = $('<div>');
+        this.authViews = [];
+    },
+
+    render: function () {
+        this.collection.each(function (auth) {
+            this.renderOneAuth(auth);
+        }, this);
+
+        this.$el.html(this.$innerEl.html() ? this.$innerEl : '');
+
+        return this;
+    },
+
+    renderOneAuth: function (authModel) {
+        var authViewEl, authView, authViewName;
+        var type = authModel.get('type');
+
+        if (type === 'apiKey') {
+            authViewName = 'ApiKeyAuthView';
+        } else if (type === 'basic' && this.$innerEl.find('.basic_auth_container').length === 0) {
+            authViewName = 'BasicAuthView';
+        } else if (type === 'oauth2') {
+            authViewName = 'Oauth2View';
+        }
+
+        if (authViewName) {
+            authView = new SwaggerUi.Views[authViewName]({model: authModel, router: this.router});
+            authViewEl = authView.render().el;
+            this.authViews.push(authView);
+        }
+
+        this.$innerEl.append(authViewEl);
+    },
+
+    highlightInvalid: function () {
+        this.authViews.forEach(function (view) {
+            view.highlightInvalid();
+        }, this);
+    }
+
+});
+
+'use strict';
+
+/* global redirect_uri:true */
+/* global clientId */
+/* global scopeSeparator */
+/* global additionalQueryStringParams */
+/* global clientSecret */
+/* global onOAuthComplete */
+/* global realm */
+/*jshint unused:false*/
+
+SwaggerUi.Views.AuthView = Backbone.View.extend({
+    events: {
+        'click .auth_submit__button': 'authorizeClick',
+        'click .auth_logout__button': 'logoutClick'
+    },
+
+    tpls: {
+        main: Handlebars.templates.auth_view
+    },
+
+    selectors: {
+        innerEl: '.auth_inner',
+        authBtn: '.auth_submit__button'
+    },
+
+    initialize: function(opts) {
+        this.options = opts || {};
+        opts.data = opts.data || {};
+        this.router = this.options.router;
+
+        this.authsCollectionView = new SwaggerUi.Views.AuthsCollectionView({data: opts.data});
+
+        this.$el.html(this.tpls.main({
+            isLogout: this.authsCollectionView.collection.isAuthorized(),
+            isAuthorized: this.authsCollectionView.collection.isPartiallyAuthorized()
+        }));
+        this.$innerEl = this.$(this.selectors.innerEl);
+        this.isLogout = this.authsCollectionView.collection.isPartiallyAuthorized();
+    },
+
+    render: function () {
+        this.$innerEl.html(this.authsCollectionView.render().el);
+
+        return this;
+    },
+
+    authorizeClick: function (e) {
+        e.preventDefault();
+        e.stopPropagation();
+
+        if (this.authsCollectionView.collection.isValid()) {
+            this.authorize();
+        } else {
+            this.authsCollectionView.highlightInvalid();
+        }
+    },
+
+    authorize: function () {
+        this.authsCollectionView.collection.forEach(function (auth) {
+            var keyAuth, basicAuth;
+            var type = auth.get('type');
+
+            if (type === 'apiKey') {
+                keyAuth = new SwaggerClient.ApiKeyAuthorization(
+                    auth.get('name'),
+                    auth.get('value'),
+                    auth.get('in')
+                );
+
+                this.router.api.clientAuthorizations.add(auth.get('title'), keyAuth);
+            } else if (type === 'basic') {
+                basicAuth = new SwaggerClient.PasswordAuthorization(auth.get('username'), auth.get('password'));
+                this.router.api.clientAuthorizations.add(auth.get('title'), basicAuth);
+            } else if (type === 'oauth2') {
+                this.handleOauth2Login(auth);
+            }
+        }, this);
+
+        this.router.load();
+    },
+
+    logoutClick: function (e) {
+        e.preventDefault();
+
+        this.authsCollectionView.collection.forEach(function (auth) {
+            window.swaggerUi.api.clientAuthorizations.remove(auth.get('title'));
+        });
+
+        this.router.load();
+    },
+
+    // taken from lib/swagger-oauth.js
+    handleOauth2Login: function (auth) {
+        var host = window.location;
+        var pathname = location.pathname.substring(0, location.pathname.lastIndexOf('/'));
+        var defaultRedirectUrl = host.protocol + '//' + host.host + pathname + '/o2c.html';
+        var redirectUrl = window.oAuthRedirectUrl || defaultRedirectUrl;
+        var url = null;
+        var scopes = _.map(auth.get('scopes'), function (scope) {
+            if(scope.checked) {
+                return scope.scope;
+            }
+        });
+        var container = window.swaggerUiAuth || (window.swaggerUiAuth = {});
+        var state, dets, ep;
+        container.OAuthSchemeKey = auth.get('title');
+
+        window.enabledScopes = scopes;
+        var flow = auth.get('flow');
+
+        /**
+         * Returns the name of the access token parameter returned by the server.
+         *
+         * @param dets
+         *     The authorisation scheme configuration.
+         * @return the name of the access token parameter
+         */
+        function getTokenName(dets) {
+            return dets.vendorExtensions['x-tokenName'] || dets.tokenName;
+        }
+
+        if(auth.get('type') === 'oauth2' && flow && (flow === 'implicit' || flow === 'accessCode')) {
+            dets = auth.attributes;
+            url = dets.authorizationUrl + '?response_type=' + (flow === 'implicit' ? 'token' : 'code');
+            container.tokenName = getTokenName(dets) || 'access_token';
+            container.tokenUrl = (flow === 'accessCode' ? dets.tokenUrl : null);
+            state = container.OAuthSchemeKey;
+        }
+        else if(auth.get('type') === 'oauth2' && flow && (flow === 'application')) {
+            dets = auth.attributes;
+            container.tokenName = getTokenName(dets) || 'access_token';
+            this.clientCredentialsFlow(scopes, dets, container.OAuthSchemeKey);
+            return;
+        }
+        else if(auth.get('type') === 'oauth2' && flow && (flow === 'password')) {
+            dets = auth.attributes;
+            container.tokenName = getTokenName(dets) || 'access_token';
+            this.passwordFlow(scopes, dets, container.OAuthSchemeKey);
+            return;
+        }
+        else if(auth.get('grantTypes')) {
+            // 1.2 support
+            var o = auth.get('grantTypes');
+            for(var t in o) {
+                if(o.hasOwnProperty(t) && t === 'implicit') {
+                    dets = o[t];
+                    ep = dets.loginEndpoint.url;
+                    url = dets.loginEndpoint.url + '?response_type=token';
+                    container.tokenName = getTokenName(dets);
+                }
+                else if (o.hasOwnProperty(t) && t === 'accessCode') {
+                    dets = o[t];
+                    ep = dets.tokenRequestEndpoint.url;
+                    url = dets.tokenRequestEndpoint.url + '?response_type=code';
+                    container.tokenName = getTokenName(dets);
+                }
+            }
+        }
+
+        redirect_uri = redirectUrl;
+
+        url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
+        url += '&realm=' + encodeURIComponent(realm);
+        url += '&client_id=' + encodeURIComponent(clientId);
+        url += '&scope=' + encodeURIComponent(scopes.join(scopeSeparator));
+        url += '&state=' + encodeURIComponent(state);
+        for (var key in additionalQueryStringParams) {
+            url += '&' + key + '=' + encodeURIComponent(additionalQueryStringParams[key]);
+        }
+
+        window.open(url);
+    },
+
+    // taken from lib/swagger-oauth.js
+    clientCredentialsFlow: function (scopes, oauth, OAuthSchemeKey) {
+        this.accessTokenRequest(scopes, oauth, OAuthSchemeKey, 'client_credentials');
+    },
+
+    passwordFlow: function (scopes, oauth, OAuthSchemeKey) {
+        this.accessTokenRequest(scopes, oauth, OAuthSchemeKey, 'password', {
+            'username': oauth.username,
+            'password': oauth.password
+        });
+    },
+
+    accessTokenRequest: function (scopes, oauth, OAuthSchemeKey, grantType, params) {
+        params = $.extend({}, {
+            'scope': scopes.join(' '),
+            'grant_type': grantType
+        }, params);
+
+        var headers= {};
+
+        switch (oauth.clientAuthenticationType) {
+            case 'basic':
+                headers.Authorization = 'Basic ' + btoa(oauth.clientId + ':' + oauth.clientSecret);
+                break;
+            case 'request-body':
+                params.client_id = oauth.clientId;
+                params.client_secret = oauth.clientSecret;
+                break;
+        }
+
+        $.ajax({
+            url : oauth.tokenUrl,
+            type: 'POST',
+            data: params,
+            headers: headers,
+            success: function (data)
+            {
+                onOAuthComplete(data, OAuthSchemeKey);
+            },
+            error: function ()
+            {
+                onOAuthComplete('');
+            }
+        });
+    }
+});
+
+'use strict';
+
+SwaggerUi.Models.BasicAuthModel = Backbone.Model.extend({
+    defaults: {
+        username: '',
+        password: '',
+        title: 'basic'
+    },
+
+    initialize: function () {
+        this.on('change', this.validate);
+    },
+
+    validate: function () {
+        var valid = !!this.get('password') && !!this.get('username');
+
+        this.set('valid', valid);
+
+        return valid;
+    }
+});
+'use strict';
+
+SwaggerUi.Views.BasicAuthView = Backbone.View.extend({
+
+    initialize: function (opts) {
+        this.options = opts || {};
+        this.router = this.options.router;
+    },
+
+    events: {
+        'change .auth_input': 'inputChange'
+    },
+
+    selectors: {
+        usernameInput: '.basic_auth__username',
+        passwordInput: '.basic_auth__password'
+    },
+
+    cls: {
+        error: 'error'
+    },
+
+    template: Handlebars.templates.basic_auth,
+
+    render: function(){
+        $(this.el).html(this.template(this.model.toJSON()));
+
+        return this;
+    },
+
+    inputChange: function (e) {
+        var $el = $(e.target);
+        var val = $el.val();
+        var attr = $el.prop('name');
+
+        if (val) {
+            $el.removeClass(this.cls.error);
+        }
+
+        this.model.set(attr, val);
+    },
+
+    isValid: function () {
+        return this.model.validate();
+    },
+
+    highlightInvalid: function () {
+        if (!this.model.get('username')) {
+            this.$(this.selectors.usernameInput).addClass(this.cls.error);
+        }
+    }
+});
+
 'use strict';
 
 SwaggerUi.Views.ContentTypeView = Backbone.View.extend({
@@ -25024,6 +22688,7 @@ SwaggerUi.Views.HeaderView = Backbone.View.extend({
   events: {
     'click #show-pet-store-icon'    : 'showPetStore',
     'click #explore'                : 'showCustom',
+    'submit #api_selector'          : 'showCustom',
     'keyup #input_baseUrl'          : 'showCustomOnKeyup',
     'keyup #input_apiKey'           : 'showCustomOnKeyup'
   },
@@ -25048,8 +22713,7 @@ SwaggerUi.Views.HeaderView = Backbone.View.extend({
     }
 
     this.trigger('update-swagger-ui', {
-      url: $('#input_baseUrl').val(),
-      apiKey: $('#input_apiKey').val()
+      url: $('#input_baseUrl').val()
     });
   },
 
@@ -25060,7 +22724,6 @@ SwaggerUi.Views.HeaderView = Backbone.View.extend({
 
     $('#input_baseUrl').val(url);
 
-    //$('#input_apiKey').val(apiKey);
     if (trigger) {
       this.trigger('update-swagger-ui', {url:url});
     }
@@ -25126,17 +22789,11 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
     if ('validatorUrl' in opts.swaggerOptions) {
       // Validator URL specified explicitly
       this.model.validatorUrl = opts.swaggerOptions.validatorUrl;
-    } else if (this.model.url.indexOf('localhost') > 0) {
+    } else if (this.model.url.indexOf('localhost') > 0 || this.model.url.indexOf('127.0.0.1') > 0) {
       // Localhost override
       this.model.validatorUrl = null;
     } else {
-      // Default validator
-      if(window.location.protocol === 'https:') {
-        this.model.validatorUrl = 'https://online.swagger.io/validator';
-      }
-      else {
-        this.model.validatorUrl = 'http://online.swagger.io/validator';
-      }
+      this.model.validatorUrl = '//online.swagger.io/validator';
     }
 
     // JSonEditor requires type='object' to be present on defined types, we add it if it's missing
@@ -25150,26 +22807,15 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
 
   },
 
-  render: function(){
-    if (this.model.securityDefinitions) {
-      for (var name in this.model.securityDefinitions) {
-        var auth = this.model.securityDefinitions[name];
-        var button;
+  render: function () {
+    $(this.el).html(Handlebars.templates.main(this.model));
+    this.info = this.$('.info')[0];
 
-        if (auth.type === 'apiKey' && $('#apikey_button').length === 0) {
-          button = new SwaggerUi.Views.ApiKeyButton({model: auth, router:  this.router}).render().el;
-          $('.auth_main_container').append(button);
-        }
-
-        if (auth.type === 'basicAuth' && $('#basic_auth_button').length === 0) {
-          button = new SwaggerUi.Views.BasicAuthButton({model: auth, router: this.router}).render().el;
-          $('.auth_main_container').append(button);
-        }
-      }
+    if (this.info) {
+      this.info.addEventListener('click', this.onLinkClick, true);
     }
 
-    // Render the outer container for resources
-    $(this.el).html(Handlebars.templates.main(this.model));
+    this.model.securityDefinitions = this.model.securityDefinitions || {};
 
     // Render each resource
 
@@ -25182,7 +22828,7 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
         id = id + '_' + counter;
         counter += 1;
       }
-      resource.id = id;
+      resource.id = sanitizeHtml(id);
       resources[id] = resource;
       this.addResource(resource, this.model.auths);
     }
@@ -25197,7 +22843,7 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
 
   addResource: function(resource, auths){
     // Render a resource and add it to resources li
-    resource.id = resource.id.replace(/\s/g, '_');
+    resource.id = resource.id.replace(/[^a-zA-Z\d]/g, function(str) { return str.charCodeAt(0); });
 
     // Make all definitions available at the root of the resource so that they can
     // be loaded by the JSonEditor
@@ -25217,11 +22863,178 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
 
   clear: function(){
     $(this.el).html('');
+  },
+
+  onLinkClick: function (e) {
+    var el = e.target;
+
+    if (el.tagName === 'A' && el.href && !el.target) {
+        e.preventDefault();
+        window.open(el.href, '_blank');
+    }
   }
 });
 
 'use strict';
 
+SwaggerUi.Models.Oauth2Model = Backbone.Model.extend({
+    defaults: {
+        scopes: {},
+        isPasswordFlow: false,
+        clientAuthenticationType: 'none'
+    },
+
+    initialize: function () {
+        if(this.attributes && this.attributes.scopes) {
+            var attributes = _.cloneDeep(this.attributes);
+            var i, scopes = [];
+            for(i in attributes.scopes) {
+                var scope = attributes.scopes[i];
+                if(typeof scope.description === 'string') {
+                    scopes[scope] = attributes.scopes[i];
+                    scopes.push(attributes.scopes[i]);
+                }
+            }
+            attributes.scopes = scopes;
+            this.attributes = attributes;
+        }
+
+        if (this.attributes && this.attributes.flow) {
+            var flow = this.attributes.flow;
+            this.set('isPasswordFlow', flow === 'password');
+            this.set('requireClientAuthentication', flow === 'application');
+            this.set('clientAuthentication', flow === 'password' || flow === 'application');
+        }
+        this.on('change', this.validate);
+    },
+
+    setScopes: function (name, val) {
+        var auth = _.extend({}, this.attributes);
+        var index = _.findIndex(auth.scopes, function(o) {
+            return o.scope === name;
+        });
+        auth.scopes[index].checked = val;
+
+        this.set(auth);
+        this.validate();
+    },
+
+    validate: function () {
+      var valid = false;
+      if (this.get('isPasswordFlow') &&
+          (!this.get('username'))) {
+          return false;
+      }
+
+      if (this.get('clientAuthenticationType') in ['basic', 'request-body'] &&
+          (!this.get('clientId'))) {
+          return false;
+      }
+
+      var scp = this.get('scopes');
+      var idx =  _.findIndex(scp, function (o) {
+         return o.checked === true;
+      });
+
+      if(scp.length > 0 && idx >= 0) {
+          valid = true;
+      }
+
+      if(scp.length === 0) {
+          valid = true;
+      }
+
+      this.set('valid', valid);
+
+      return valid;
+    }
+});
+
+'use strict';
+
+SwaggerUi.Views.Oauth2View = Backbone.View.extend({
+    events: {
+        'change .oauth-scope': 'scopeChange',
+        'change .oauth-username': 'setUsername',
+        'change .oauth-password': 'setPassword',
+        'change .oauth-client-authentication-type': 'setClientAuthenticationType',
+        'change .oauth-client-id': 'setClientId',
+        'change .oauth-client-secret': 'setClientSecret'
+    },
+
+    template: Handlebars.templates.oauth2,
+
+    cls: {
+        error: 'error'
+    },
+
+    render: function () {
+        this.$el.html(this.template(this.model.toJSON()));
+
+        return this;
+    },
+
+    scopeChange: function (e) {
+        var val = $(e.target).prop('checked');
+        var scope = $(e.target).data('scope');
+
+        this.model.setScopes(scope, val);
+    },
+
+    setUsername: function (e) {
+        var val= $(e.target).val();
+        this.model.set('username', val);
+        if (val) {
+            $(e.target).removeClass(this.cls.error);
+        }
+    },
+
+    setPassword: function (e) {
+        this.model.set('password', $(e.target).val());
+    },
+
+    setClientAuthenticationType: function (e) {
+        var type = $(e.target).val();
+        var $el = this.$el;
+        this.model.set('clientAuthenticationType', type);
+
+        switch(type) {
+            case 'none':
+                $el.find('.oauth-client-authentication').hide();
+                break;
+            case 'basic':
+            case 'request-body':
+                $el.find('.oauth-client-id').removeClass(this.cls.error);
+                $el.find('.oauth-client-authentication').show();
+                break;
+        }
+    },
+
+    setClientId: function (e) {
+        var val = $(e.target).val();
+        this.model.set('clientId', val);
+        if (val) {
+            $(e.target).removeClass(this.cls.error);
+        }
+    },
+
+    setClientSecret: function (e) {
+        this.model.set('clientSecret', $(e.target).val());
+        $(e.target).removeClass('error');
+    },
+
+    highlightInvalid: function () {
+        if (!this.model.get('username')) {
+            this.$el.find('.oauth-username').addClass(this.cls.error);
+        }
+
+        if (!this.model.get('clientId')) {
+            this.$el.find('.oauth-client-id').addClass(this.cls.error);
+        }
+    }
+});
+'use strict';
+
 SwaggerUi.Views.OperationView = Backbone.View.extend({
   invocationUrl: null,
 
@@ -25232,6 +23045,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
     'click .toggleOperation'  : 'toggleOperationContent',
     'mouseenter .api-ic'      : 'mouseEnter',
     'dblclick .curl'          : 'selectText',
+    'change [name=responseContentType]' : 'showSnippet'
   },
 
   initialize: function(opts) {
@@ -25241,33 +23055,37 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
     this.parentId = this.model.parentId;
     this.nickname = this.model.nickname;
     this.model.encodedParentId = encodeURIComponent(this.parentId);
-    
+
     if (opts.swaggerOptions) {
       this.model.defaultRendering = opts.swaggerOptions.defaultModelRendering;
-      
+
       if (opts.swaggerOptions.showRequestHeaders) {
         this.model.showRequestHeaders = true;
       }
+
+      if (opts.swaggerOptions.showOperationIds) {
+        this.model.showOperationIds = true;
+      }
     }
     return this;
   },
 
   selectText: function(event) {
-      var doc = document,
-          text = event.target.firstChild,
-          range,
-          selection;
-      if (doc.body.createTextRange) {
-          range = document.body.createTextRange();
-          range.moveToElementText(text);
-          range.select();
-      } else if (window.getSelection) {
-          selection = window.getSelection();
-          range = document.createRange();
-          range.selectNodeContents(text);
-          selection.removeAllRanges();
-          selection.addRange(range);
-      }
+    var doc = document,
+        text = event.target.firstChild,
+        range,
+        selection;
+    if (doc.body.createTextRange) {
+      range = document.body.createTextRange();
+      range.moveToElementText(text);
+      range.select();
+    } else if (window.getSelection) {
+      selection = window.getSelection();
+      range = document.createRange();
+      range.selectNodeContents(text);
+      selection.removeAllRanges();
+      selection.addRange(range);
+    }
   },
 
   mouseEnter: function(e) {
@@ -25304,9 +23122,9 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
   },
 
   // Note: copied from CoffeeScript compiled file
-  // TODO: redactor
+  // TODO: refactor
   render: function() {
-    var a, auth, auths, code, contentTypeModel, isMethodSubmissionSupported, k, key, l, len, len1, len2, len3, len4, m, modelAuths, n, o, p, param, q, ref, ref1, ref2, ref3, ref4, ref5, responseContentTypeView, responseSignatureView, schema, schemaObj, scopeIndex, signatureModel, statusCode, successResponse, type, v, value;
+    var a, auth, auths, code, contentTypeModel, isMethodSubmissionSupported, k, key, l, len, len1, len2, len3, len4, m, modelAuths, n, o, p, param, q, ref, ref1, ref2, ref3, ref4, ref5, responseContentTypeView, responseSignatureView, schema, schemaObj, scopeIndex, signatureModel, statusCode, successResponse, type, v, value, produces, isXML, isJSON;
     isMethodSubmissionSupported = jQuery.inArray(this.model.method, this.model.supportedSubmitMethods()) >= 0;
     if (!isMethodSubmissionSupported) {
       this.model.isReadOnly = true;
@@ -25377,7 +23195,8 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
           code: code,
           message: value.description,
           responseModel: schema,
-          headers: value.headers
+          headers: value.headers,
+          schema: schemaObj
         });
       }
     }
@@ -25385,6 +23204,10 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
       this.model.responseMessages = [];
     }
     signatureModel = null;
+    produces = this.model.produces;
+    isXML = this.contains(produces, 'xml');
+    isJSON = isXML ? this.contains(produces, 'json') : true;
+
     if (this.model.successResponse) {
       successResponse = this.model.successResponse;
       for (key in successResponse) {
@@ -25394,9 +23217,14 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
           this.model.successDescription = value.description;
           this.model.headers = this.parseResponseHeaders(value.headers);
           signatureModel = {
-            sampleJSON: JSON.stringify(value.createJSONSample(), void 0, 2),
+            sampleJSON: isJSON ? JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2) : false,
             isParam: false,
-            signature: value.getMockSignature()
+            sampleXML: isXML ? SwaggerUi.partials.signature.createXMLSample(value.name, value.definition, value.models) : false,
+            signature: SwaggerUi.partials.signature.getModelSignature(value.name, value.definition, value.models, value.modelPropertyMacro)
+          };
+        } else {
+          signatureModel = {
+            signature: SwaggerUi.partials.signature.getPrimitiveSignature(value)
           };
         }
       }
@@ -25460,11 +23288,61 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
     ref5 = this.model.responseMessages;
     for (q = 0, len4 = ref5.length; q < len4; q++) {
       statusCode = ref5[q];
+      statusCode.isXML = isXML;
+      statusCode.isJSON = isJSON;
+      if (!_.isUndefined(statusCode.headers)) {
+        statusCode.headers = this.parseHeadersType(statusCode.headers);
+      }
       this.addStatusCode(statusCode);
     }
+
+    if (Array.isArray(this.model.security)) {
+      var authsModel = SwaggerUi.utils.parseSecurityDefinitions(this.model.security, this.model.parent.securityDefinitions);
+
+      authsModel.isLogout = !_.isEmpty(this.model.clientAuthorizations.authz);
+      this.authView = new SwaggerUi.Views.AuthButtonView({
+        data: authsModel,
+        router: this.router,
+        isOperation: true,
+        model: {
+          scopes: authsModel.scopes
+        }
+      });
+      this.$('.authorize-wrapper').append(this.authView.render().el);
+    }
+
+    this.showSnippet();
     return this;
   },
 
+  parseHeadersType: function (headers) {
+    var map = {
+      'string': {
+        'date-time': 'dateTime',
+        'date'     : 'date'
+      }
+    };
+
+    _.forEach(headers, function (header) {
+      var value;
+      header = header || {};
+      value = map[header.type] && map[header.type][header.format];
+      if (!_.isUndefined(value)) {
+        header.type = value;
+      }
+    });
+
+    return headers;
+  },
+
+  contains: function (produces, type) {
+    return produces.filter(function (val) {
+      if (val.indexOf(type) > -1) {
+        return true;
+      }
+    }).length;
+  },
+
   parseResponseHeaders: function (data) {
     var HEADERS_SEPARATOR = '; ';
     var headers = _.clone(data);
@@ -25497,7 +23375,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
       // This is required for JsonEditor to display the root properly
       if(!param.schema.type){
         param.schema.type = 'object';
-      } 
+      }
       // This is the title that will be used by JsonEditor for the root
       // Since we already display the parameter's name in the Parameter column
       // We set this to space, we can't set it to null or space otherwise JsonEditor
@@ -25505,7 +23383,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
       if(!param.schema.title){
         param.schema.title = ' ';
       }
-    } 
+    }
 
     var paramView = new SwaggerUi.Views.ParameterView({
       model: param,
@@ -25668,7 +23546,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
 
   // wraps a jquery response as a shred response
   wrap: function(data) {
-   var h, headerArray, headers, i, l, len, o;
+    var h, headerArray, headers, i, l, len, o;
     headers = {};
     headerArray = data.getAllResponseHeaders().split('\r');
     for (l = 0, len = headerArray.length; l < len; l++) {
@@ -25742,7 +23620,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
     reg = /(>)(<)(\/*)/g;
     wsexp = /[ ]*(.*)[ ]+\n/g;
     contexp = /(<.+>)(.+\n)/g;
-    xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
+    xml = xml.replace(/\r\n/g, '\n').replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
     pad = 0;
     formatted = '';
     lines = xml.split('\n');
@@ -25821,7 +23699,9 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
       url = response.request.url;
     }
     var headers = response.headers;
-    content = jQuery.trim(content);
+    if(typeof content === 'string') {
+      content = jQuery.trim(content);
+    }
 
     // if server is nice, and sends content-type back, we can use it
     var contentType = null;
@@ -25831,6 +23711,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
         contentType = contentType.split(';')[0].trim();
       }
     }
+
     $('.response_body', $(this.el)).removeClass('json');
     $('.response_body', $(this.el)).removeClass('xml');
 
@@ -25841,11 +23722,54 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
 
     var pre;
     var code;
+    var skipHighlight = false;
     if (!content) {
       code = $('<code />').text('no content');
       pre = $('<pre class="json" />').append(code);
 
-    // JSON
+      // JSON
+    } else if (
+        contentType === 'application/octet-stream' ||
+        headers['Content-Disposition'] && (/attachment/).test(headers['Content-Disposition']) ||
+        headers['content-disposition'] && (/attachment/).test(headers['content-disposition']) ||
+        headers['Content-Description'] && (/File Transfer/).test(headers['Content-Description']) ||
+        headers['content-description'] && (/File Transfer/).test(headers['content-description'])) {
+
+      if ('Blob' in window) {
+        var type = contentType || 'text/html';
+        var a = document.createElement('a');
+        var href;
+
+        if({}.toString.apply(content) === '[object Blob]') {
+          href = window.URL.createObjectURL(content);
+        }
+        else {
+          var binaryData = [];
+          binaryData.push(content);
+          href = window.URL.createObjectURL(new Blob(binaryData, {type: type}));
+        }
+        var fileName = response.url.substr(response.url.lastIndexOf('/') + 1);
+        var download = [type, fileName, href].join(':');
+
+        // Use filename from response header
+        var disposition = headers['content-disposition'] || headers['Content-Disposition'];
+        if(typeof disposition !== 'undefined') {
+          var responseFilename = /filename=([^;]*);?/.exec(disposition);
+          if(responseFilename !== null && responseFilename.length > 1) {
+            download = responseFilename[1];
+            fileName = download;
+          }
+        }
+
+        a.setAttribute('href', href);
+        a.setAttribute('download', download);
+        a.innerText = 'Download ' + fileName;
+
+        pre = $('<div/>').append(a);
+        skipHighlight = true;
+      } else {
+        pre = $('<pre class="json" />').append('Download headers detected but your browser does not support downloading binary via XHR (Blob).');
+      }
     } else if (contentType === 'application/json' || /\+json$/.test(contentType)) {
       var json = null;
       try {
@@ -25856,58 +23780,35 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
       code = $('<code />').text(json);
       pre = $('<pre class="json" />').append(code);
 
-    // XML
+      // XML
     } else if (contentType === 'application/xml' || /\+xml$/.test(contentType)) {
       code = $('<code />').text(this.formatXml(content));
       pre = $('<pre class="xml" />').append(code);
 
-    // HTML
+      // HTML
     } else if (contentType === 'text/html') {
       code = $('<code />').html(_.escape(content));
       pre = $('<pre class="xml" />').append(code);
 
-    // Plain Text
+      // Plain Text
     } else if (/text\/plain/.test(contentType)) {
       code = $('<code />').text(content);
       pre = $('<pre class="plain" />').append(code);
 
-
-    // Image
+      // Image
     } else if (/^image\//.test(contentType)) {
-      pre = $('<img>').attr('src', url);
+      var urlCreator = window.URL || window.webkitURL;
+      var imageUrl = urlCreator.createObjectURL(content);
 
-    // Audio
+      pre = $('<img>').attr( 'src', imageUrl);
+      // Audio
     } else if (/^audio\//.test(contentType) && supportsAudioPlayback(contentType)) {
       pre = $('<audio controls>').append($('<source>').attr('src', url).attr('type', contentType));
-
-    // Download
-    } else if (headers['Content-Disposition'] && (/attachment/).test(headers['Content-Disposition']) ||
-               headers['content-disposition'] && (/attachment/).test(headers['content-disposition']) ||
-               headers['Content-Description'] && (/File Transfer/).test(headers['Content-Description']) ||
-               headers['content-description'] && (/File Transfer/).test(headers['content-description'])) {
-
-      if ('Blob' in window) {
-        var type = contentType || 'text/html';
-        var blob = new Blob([content], {type: type});
-        var a = document.createElement('a');
-        var href = window.URL.createObjectURL(blob);
-        var fileName = response.url.substr(response.url.lastIndexOf('/') + 1);
-        var download = [type, fileName, href].join(':');
-
-        a.setAttribute('href', href);
-        a.setAttribute('download', download);
-        a.innerText = 'Download ' + fileName;
-
-        pre = $('<div/>').append(a);
-      } else {
-        pre = $('<pre class="json" />').append('Download headers detected but your browser does not support downloading binary via XHR (Blob).');
-      }
-
-    // Location header based redirect download
     } else if(headers.location || headers.Location) {
+      // Location header based redirect download
       window.location = response.url;
 
-    // Anything else (CORS)
+      // Anything else (CORS)
     } else {
       code = $('<code />').text(content);
       pre = $('<pre class="json" />').append(code);
@@ -25926,22 +23827,27 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
     // adds curl output
     var curlCommand = this.model.asCurl(this.map, {responseContentType: contentType});
     curlCommand = curlCommand.replace('!', '&#33;');
-    $( 'div.curl', $(this.el)).html('<pre>' + curlCommand + '</pre>');
+    $( 'div.curl', $(this.el)).html('<pre>' + _.escape(curlCommand) + '</pre>');
 
     // only highlight the response if response is less than threshold, default state is highlight response
     var opts = this.options.swaggerOptions;
 
     if (opts.showRequestHeaders) {
       var form = $('.sandbox', $(this.el)),
-        map = this.getInputMap(form),
-        requestHeaders = this.model.getHeaderParams(map);
+          map = this.getInputMap(form),
+          requestHeaders = this.model.getHeaderParams(map);
       delete requestHeaders['Content-Type'];
       $('.request_headers', $(this.el)).html('<pre>' + _.escape(JSON.stringify(requestHeaders, null, '  ')).replace(/\n/g, '<br>') + '</pre>');
     }
 
+    // Call user-defined hook
+    if (opts.responseHooks && opts.responseHooks[this.nickname]) {
+      opts.responseHooks[this.nickname](response, this);
+    }
+
     var response_body_el = $('.response_body', $(this.el))[0];
     // only highlight the response if response is less than threshold, default state is highlight response
-    if (opts.highlightSizeThreshold && typeof response.data !== 'undefined' && response.data.length > opts.highlightSizeThreshold) {
+    if (opts.highlightSizeThreshold && typeof response.data !== 'undefined' && response.data.length > opts.highlightSizeThreshold || skipHighlight) {
       return response_body_el;
     } else {
       return hljs.highlightBlock(response_body_el);
@@ -25979,6 +23885,24 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
     }
   },
 
+  showSnippet: function () {
+    var contentTypeEl = this.$('[name=responseContentType]');
+    var xmlSnippetEl = this.$('.operation-status .snippet_xml, .response-class .snippet_xml');
+    var jsonSnippetEl = this.$('.operation-status .snippet_json, .response-class .snippet_json');
+    var contentType;
+
+    if (!contentTypeEl.length) { return; }
+    contentType = contentTypeEl.val();
+
+    if (contentType.indexOf('xml') > -1) {
+      xmlSnippetEl.show();
+      jsonSnippetEl.hide();
+    } else {
+      jsonSnippetEl.show();
+      xmlSnippetEl.hide();
+    }
+  },
+
   getParamByName: function(name) {
     var i;
     if (this.model.parameters) {
@@ -26008,9 +23932,14 @@ SwaggerUi.Views.ParameterContentTypeView = Backbone.View.extend({
 'use strict';
 
 SwaggerUi.Views.ParameterView = Backbone.View.extend({
+  events: {
+    'change [name=parameterContentType]' : 'toggleParameterSnippet'
+  },
+
   initialize: function(){
     Handlebars.registerHelper('isArray', function(param, opts) {
-      if (param.type.toLowerCase() === 'array' || param.allowMultiple) {
+      var paramType = param.type && param.type.toLowerCase();
+      if (paramType === 'array' || param.allowMultiple) {
         return opts.fn(this);
       } else {
         return opts.inverse(this);
@@ -26020,10 +23949,14 @@ SwaggerUi.Views.ParameterView = Backbone.View.extend({
 
   render: function() {
     var type = this.model.type || this.model.dataType;
+    var modelType = this.model.modelSignature.type;
+    var modelDefinitions = this.model.modelSignature.definitions;
+    var schema = this.model.schema || {};
+    var consumes = this.model.consumes || [];
+    var sampleJSON, signatureView;
 
     if (typeof type === 'undefined') {
-      var schema = this.model.schema;
-      if (schema && schema.$ref) {
+      if (schema.$ref) {
         var ref = schema.$ref;
         if (ref.indexOf('#/definitions/') === 0) {
           type = ref.substring('#/definitions/'.length);
@@ -26050,18 +23983,23 @@ SwaggerUi.Views.ParameterView = Backbone.View.extend({
       this.model.isList = true;
     }
 
+    var isXML = this.contains(consumes, 'xml');
+    var isJSON = isXML ? this.contains(consumes, 'json') : true;
+    sampleJSON = SwaggerUi.partials.signature.createParameterJSONSample(modelType, modelDefinitions);
+
     var template = this.template();
     $(this.el).html(template(this.model));
 
     var signatureModel = {
-      sampleJSON: this.model.sampleJSON,
+      sampleJSON: isJSON ? sampleJSON : false,
+      sampleXML: sampleJSON && isXML ? SwaggerUi.partials.signature.createXMLSample('', schema, modelDefinitions, true) : false,
       isParam: true,
-      signature: this.model.signature,
+      signature: SwaggerUi.partials.signature.getParameterModelSignature(modelType, modelDefinitions),
       defaultRendering: this.model.defaultRendering
     };
 
-    if (this.model.sampleJSON) {
-      var signatureView = new SwaggerUi.Views.SignatureView({model: signatureModel, tagName: 'div'});
+    if (sampleJSON) {
+      signatureView = new SwaggerUi.Views.SignatureView({model: signatureModel, tagName: 'div'});
       $('.model-signature', $(this.el)).append(signatureView.render().el);
     }
     else {
@@ -26072,12 +24010,12 @@ SwaggerUi.Views.ParameterView = Backbone.View.extend({
 
     if( this.options.swaggerOptions.jsonEditor && this.model.isBody && this.model.schema){
       var $self = $(this.el);
-      this.model.jsonEditor = 
+      this.model.jsonEditor =
         /* global JSONEditor */
         new JSONEditor($('.editor_holder', $self)[0],
-                       {schema: this.model.schema, startval : this.model.default, 
-                        ajax:true, 
-                        disable_properties:true, 
+                       {schema: this.model.schema, startval : this.model.default,
+                        ajax:true,
+                        disable_properties:true,
                         disable_edit_json:true,
                         iconlib: 'swagger' });
       // This is so that the signature can send back the sample to the json editor
@@ -26114,16 +24052,51 @@ SwaggerUi.Views.ParameterView = Backbone.View.extend({
     if (isParam) {
       var parameterContentTypeView = new SwaggerUi.Views.ParameterContentTypeView({model: contentTypeModel});
       $('.parameter-content-type', $(this.el)).append(parameterContentTypeView.render().el);
+      this.toggleParameterSnippet();
     }
 
     else {
       var responseContentTypeView = new SwaggerUi.Views.ResponseContentTypeView({model: contentTypeModel});
       $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
+      this.toggleResponseSnippet();
     }
 
     return this;
   },
 
+  contains: function (consumes, type) {
+    return consumes.filter(function (val) {
+      if (val.indexOf(type) > -1) {
+        return true;
+      }
+    }).length;
+  },
+
+  toggleParameterSnippet: function () {
+    var contentType = this.$('[name=parameterContentType]').val();
+
+    this.toggleSnippet(contentType);
+  },
+
+  toggleResponseSnippet: function () {
+    var contentEl = this.$('[name=responseContentType]');
+
+    if (!contentEl.length) { return; }
+
+    this.toggleSnippet(contentEl.val());
+  },
+
+  toggleSnippet: function (type) {
+    type = type || '';
+    if (type.indexOf('xml') > -1) {
+      this.$('.snippet_xml').show();
+      this.$('.snippet_json').hide();
+    } else {
+      this.$('.snippet_json').show();
+      this.$('.snippet_xml').hide();
+    }
+  },
+
   // Return an appropriate template based on if the parameter is a list, readonly, required
   template: function(){
     if (this.model.isList) {
@@ -26148,6 +24121,1033 @@ SwaggerUi.Views.ParameterView = Backbone.View.extend({
 
 'use strict';
 
+/* jshint -W122 */
+SwaggerUi.partials.signature = (function () {
+  // copy-pasted from swagger-js
+  var resolveSchema = function (schema) {
+    if (_.isPlainObject(schema.schema)) {
+      schema = resolveSchema(schema.schema);
+    }
+
+    return schema;
+  };
+
+  // copy-pasted from swagger-js
+  var simpleRef = function (name) {
+    if (typeof name === 'undefined') {
+      return null;
+    }
+
+    if (name.indexOf('#/definitions/') === 0) {
+      return name.substring('#/definitions/'.length);
+    } else {
+      return name;
+    }
+  };
+
+  // copy-pasted from swagger-js
+  var getInlineModel = function(inlineStr) {
+    if(/^Inline Model \d+$/.test(inlineStr) && this.inlineModels) {
+      var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); //
+      var model = this.inlineModels[id];
+      return model;
+    }
+    // I'm returning null here, should I rather throw an error?
+    return null;
+  };
+
+  // copy-pasted from swagger-js
+  var formatXml = function(xml) {
+    var contexp, fn, formatted, indent, l, lastType, len, lines, ln, pad, reg, transitions, wsexp;
+    reg = /(>)(<)(\/*)/g;
+    wsexp = /[ ]*(.*)[ ]+\n/g;
+    contexp = /(<.+>)(.+\n)/g;
+    xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
+    pad = 0;
+    formatted = '';
+    lines = xml.split('\n');
+    indent = 0;
+    lastType = 'other';
+    transitions = {
+      'single->single': 0,
+      'single->closing': -1,
+      'single->opening': 0,
+      'single->other': 0,
+      'closing->single': 0,
+      'closing->closing': -1,
+      'closing->opening': 0,
+      'closing->other': 0,
+      'opening->single': 1,
+      'opening->closing': 0,
+      'opening->opening': 1,
+      'opening->other': 1,
+      'other->single': 0,
+      'other->closing': -1,
+      'other->opening': 0,
+      'other->other': 0
+    };
+    fn = function(ln) {
+      var fromTo, j, key, padding, type, types, value;
+      types = {
+        single: Boolean(ln.match(/<.+\/>/)),
+        closing: Boolean(ln.match(/<\/.+>/)),
+        opening: Boolean(ln.match(/<[^!?].*>/))
+      };
+      type = ((function() {
+        var results;
+        results = [];
+        for (key in types) {
+          value = types[key];
+          if (value) {
+            results.push(key);
+          }
+        }
+        return results;
+      })())[0];
+      type = type === void 0 ? 'other' : type;
+      fromTo = lastType + '->' + type;
+      lastType = type;
+      padding = '';
+      indent += transitions[fromTo];
+      padding = ((function() {
+        var m, ref1, results;
+        results = [];
+        for (j = m = 0, ref1 = indent; 0 <= ref1 ? m < ref1 : m > ref1; j = 0 <= ref1 ? ++m : --m) {
+          results.push('  ');
+        }
+        return results;
+      })()).join('');
+      if (fromTo === 'opening->closing') {
+        formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
+      } else {
+        formatted += padding + ln + '\n';
+      }
+    };
+    for (l = 0, len = lines.length; l < len; l++) {
+      ln = lines[l];
+      fn(ln);
+    }
+    return formatted;
+  };
+
+  // copy-pasted from swagger-js
+  var getModelSignature = function (name, schema, models, modelPropertyMacro) {
+    var strongOpen = '<span class="strong">';
+    var strongClose = '</span>';
+
+    var optionHtml = function (label, value) {
+      return '<tr><td class="optionName">' + label + ':</td><td>' + value + '</td></tr>';
+    };
+
+
+    // Allow for ignoring the 'name' argument.... shifting the rest
+    if(_.isObject(arguments[0])) {
+      name = void 0;
+      schema = arguments[0];
+      models = arguments[1];
+      modelPropertyMacro = arguments[2];
+    }
+
+    models = models || {};
+
+    // Resolve the schema (Handle nested schemas)
+    schema = resolveSchema(schema);
+
+    // Return for empty object
+    if(_.isEmpty(schema)) {
+      return strongOpen + 'Empty' + strongClose;
+    }
+
+    // Dereference $ref from 'models'
+    if(typeof schema.$ref === 'string') {
+      name = simpleRef(schema.$ref);
+      schema = models[name];
+      if(typeof schema === 'undefined')
+      {
+        return strongOpen + name + ' is not defined!' + strongClose;
+      }
+    }
+
+    if(typeof name !== 'string') {
+      name = schema.title || 'Inline Model';
+    }
+
+    // If we are a Model object... adjust accordingly
+    if(schema.definition) {
+      schema = schema.definition;
+    }
+
+    if(typeof modelPropertyMacro !== 'function') {
+      modelPropertyMacro = function(prop){
+        return (prop || {}).default;
+      };
+    }
+
+    var references = {};
+    var seenModels = [];
+    var inlineModels = 0;
+
+    // Generate current HTML
+    var html = processModel(schema, name);
+
+    // Generate references HTML
+    while (_.keys(references).length > 0) {
+      /* jshint ignore:start */
+      _.forEach(references, function (schema, name) {
+        var seenModel = _.indexOf(seenModels, name) > -1;
+
+        delete references[name];
+
+        if (!seenModel) {
+          seenModels.push(name);
+
+          html += '<br />' + processModel(schema, name);
+        }
+      });
+      /* jshint ignore:end */
+    }
+
+    return html;
+
+
+    function addReference(schema, name, skipRef) {
+      var modelName = name;
+      var model;
+
+      if (schema.$ref) {
+        modelName = schema.title || simpleRef(schema.$ref);
+        model = models[simpleRef(schema.$ref)];
+      } else if (_.isUndefined(name)) {
+        modelName = schema.title || 'Inline Model ' + (++inlineModels);
+        model = {definition: schema};
+      }
+
+      if (skipRef !== true) {
+        references[modelName] = _.isUndefined(model) ? {} : model.definition;
+      }
+
+      return modelName;
+    }
+
+    function primitiveToHTML(schema) {
+      var html = '<span class="propType">';
+      var type = schema.type || 'object';
+
+      if (schema.$ref) {
+        html += addReference(schema, simpleRef(schema.$ref));
+      } else if (type === 'object') {
+        if (!_.isUndefined(schema.properties)) {
+          html += addReference(schema);
+        } else {
+          html += 'object';
+        }
+      } else if (type === 'array') {
+        html += 'Array[';
+
+        if (_.isArray(schema.items)) {
+          html += _.map(schema.items, addReference).join(',');
+        } else if (_.isPlainObject(schema.items)) {
+          if (_.isUndefined(schema.items.$ref)) {
+            if (!_.isUndefined(schema.items.type) && _.indexOf(['array', 'object'], schema.items.type) === -1) {
+              html += schema.items.type;
+            } else {
+              html += addReference(schema.items);
+            }
+          } else {
+            html += addReference(schema.items, simpleRef(schema.items.$ref));
+          }
+        } else {
+          console.log('Array type\'s \'items\' schema is not an array or an object, cannot process');
+          html += 'object';
+        }
+
+        html += ']';
+      } else {
+        html += schema.type;
+      }
+
+      html += '</span>';
+
+      return html;
+    }
+
+    function primitiveToOptionsHTML(schema, html) {
+      var options = '';
+      var type = schema.type || 'object';
+      var isArray = type === 'array';
+
+      if (!_.isUndefined(schema.description)) {
+        html += ': ' + '<span class="propDesc">' + schema.description + '</span>';
+      }
+
+      if (schema.enum) {
+        html += ' = <span class="propVals">[\'' + schema.enum.join('\', \'') + '\']</span>';
+      }
+
+      if (isArray) {
+        if (_.isPlainObject(schema.items) && !_.isUndefined(schema.items.type)) {
+          type = schema.items.type;
+        } else {
+          type = 'object';
+        }
+      }
+
+      if (!_.isUndefined(schema.default)) {
+        options += optionHtml('Default', schema.default);
+      }
+
+      switch (type) {
+      case 'string':
+        if (schema.minLength) {
+          options += optionHtml('Min. Length', schema.minLength);
+        }
+
+        if (schema.maxLength) {
+          options += optionHtml('Max. Length', schema.maxLength);
+        }
+
+        if (schema.pattern) {
+          options += optionHtml('Reg. Exp.', schema.pattern);
+        }
+        break;
+      case 'integer':
+      case 'number':
+        if (schema.minimum) {
+          options += optionHtml('Min. Value', schema.minimum);
+        }
+
+        if (schema.exclusiveMinimum) {
+          options += optionHtml('Exclusive Min.', 'true');
+        }
+
+        if (schema.maximum) {
+          options += optionHtml('Max. Value', schema.maximum);
+        }
+
+        if (schema.exclusiveMaximum) {
+          options += optionHtml('Exclusive Max.', 'true');
+        }
+
+        if (schema.multipleOf) {
+          options += optionHtml('Multiple Of', schema.multipleOf);
+        }
+
+        break;
+      }
+
+      if (isArray) {
+        if (schema.minItems) {
+          options += optionHtml('Min. Items', schema.minItems);
+        }
+
+        if (schema.maxItems) {
+          options += optionHtml('Max. Items', schema.maxItems);
+        }
+
+        if (schema.uniqueItems) {
+          options += optionHtml('Unique Items', 'true');
+        }
+
+        if (schema.collectionFormat) {
+          options += optionHtml('Coll. Format', schema.collectionFormat);
+        }
+      }
+
+      if (_.isUndefined(schema.items)) {
+        if (_.isArray(schema.enum)) {
+          var enumString;
+
+          if (type === 'number' || type === 'integer') {
+            enumString = schema.enum.join(', ');
+          } else {
+            enumString = '"' + schema.enum.join('", "') + '"';
+          }
+
+          options += optionHtml('Enum', enumString);
+        }
+      }
+
+      if (options.length > 0) {
+        html = '<span class="propWrap">' + html + '<table class="optionsWrapper"><tr><th colspan="2">' + type + '</th></tr>' + options + '</table></span>';
+      }
+
+      return html;
+    }
+
+    function processModel(schema, name) {
+      var type = schema.type || 'object';
+      var isArray = schema.type === 'array';
+      var html = strongOpen + name + ' ' + (isArray ? '[' : '{') + strongClose;
+      var contents;
+
+      if (name) {
+        seenModels.push(name);
+      }
+
+      if (isArray) {
+        if (_.isArray(schema.items)) {
+          html += '<div>' + _.map(schema.items, function (item) {
+            var type = item.type || 'object';
+
+            if (_.isUndefined(item.$ref)) {
+              if (_.indexOf(['array', 'object'], type) > -1) {
+                if (type === 'object' && _.isUndefined(item.properties)) {
+                  return 'object';
+                } else {
+                  return addReference(item);
+                }
+              } else {
+                return primitiveToOptionsHTML(item, type);
+              }
+            } else {
+              return addReference(item, simpleRef(item.$ref));
+            }
+          }).join(',</div><div>');
+        } else if (_.isPlainObject(schema.items)) {
+          if (_.isUndefined(schema.items.$ref)) {
+            if (_.indexOf(['array', 'object'], schema.items.type || 'object') > -1) {
+              if ((_.isUndefined(schema.items.type) || schema.items.type === 'object') && _.isUndefined(schema.items.properties)) {
+                html += '<div>object</div>';
+              } else {
+                html += '<div>' + addReference(schema.items) + '</div>';
+              }
+            } else {
+              html += '<div>' + primitiveToOptionsHTML(schema.items, schema.items.type) + '</div>';
+            }
+          } else {
+            html += '<div>' + addReference(schema.items, simpleRef(schema.items.$ref)) + '</div>';
+          }
+        } else {
+          console.log('Array type\'s \'items\' property is not an array or an object, cannot process');
+          html += '<div>object</div>';
+        }
+      } else {
+        if (schema.$ref) {
+          html += '<div>' + addReference(schema, name) + '</div>';
+        } else if (type === 'object') {
+          if (_.isPlainObject(schema.properties)) {
+            contents = _.map(schema.properties, function (property, name) {
+              var propertyIsRequired = (_.indexOf(schema.required, name) >= 0);
+              var cProperty = _.cloneDeep(property);
+
+              var requiredClass = propertyIsRequired ? 'required' : '';
+              var html = '<span class="propName ' + requiredClass + '">' + name + '</span> (';
+              var model;
+
+              // Allow macro to set the default value
+              cProperty.default = modelPropertyMacro(cProperty);
+
+              // Resolve the schema (Handle nested schemas)
+              cProperty = resolveSchema(cProperty);
+
+              // We need to handle property references to primitives (Issue 339)
+              if (!_.isUndefined(cProperty.$ref)) {
+                model = models[simpleRef(cProperty.$ref)];
+
+                if (!_.isUndefined(model) && _.indexOf([undefined, 'array', 'object'], model.definition.type) === -1) {
+                  // Use referenced schema
+                  cProperty = resolveSchema(model.definition);
+                }
+              }
+
+              html += primitiveToHTML(cProperty);
+
+              if(!propertyIsRequired) {
+                html += ', <span class="propOptKey">optional</span>';
+              }
+
+              if(property.readOnly) {
+                  html += ', <span class="propReadOnly">read only</span>';
+              }
+
+              html += ')';
+
+              return '<div' + (property.readOnly ? ' class="readOnly"' : '') + '>' + primitiveToOptionsHTML(cProperty, html);
+            }).join(',</div>');
+          }
+
+          if (contents) {
+            html += contents + '</div>';
+          }
+        } else {
+          html += '<div>' + primitiveToOptionsHTML(schema, type) + '</div>';
+        }
+      }
+
+      return html + strongOpen + (isArray ? ']' : '}') + strongClose;
+    }
+
+  };
+
+  // copy-pasted from swagger-js
+  var schemaToJSON = function (schema, models, modelsToIgnore, modelPropertyMacro) {
+    // Resolve the schema (Handle nested schemas)
+    schema = resolveSchema(schema);
+
+    if(typeof modelPropertyMacro !== 'function') {
+      modelPropertyMacro = function(prop){
+        return (prop || {}).default;
+      };
+    }
+
+    modelsToIgnore= modelsToIgnore || {};
+
+    var type = schema.type || 'object';
+    var format = schema.format;
+    var model;
+    var output;
+
+    if (!_.isUndefined(schema.example)) {
+      output = schema.example;
+    } else if (_.isUndefined(schema.items) && _.isArray(schema.enum)) {
+      output = schema.enum[0];
+    }
+
+    if (_.isUndefined(output)) {
+      if (schema.$ref) {
+        model = models[simpleRef(schema.$ref)];
+
+        if (!_.isUndefined(model)) {
+          if (_.isUndefined(modelsToIgnore[model.name])) {
+            modelsToIgnore[model.name] = model;
+            output = schemaToJSON(model.definition, models, modelsToIgnore, modelPropertyMacro);
+            delete modelsToIgnore[model.name];
+          } else {
+            if (model.type === 'array') {
+              output = [];
+            } else {
+              output = {};
+            }
+          }
+        }
+      } else if (!_.isUndefined(schema.default)) {
+        output = schema.default;
+      } else if (type === 'string') {
+        if (format === 'date-time') {
+          output = new Date().toISOString();
+        } else if (format === 'date') {
+          output = new Date().toISOString().split('T')[0];
+        } else {
+          output = 'string';
+        }
+      } else if (type === 'integer') {
+        output = 0;
+      } else if (type === 'number') {
+        output = 0.0;
+      } else if (type === 'boolean') {
+        output = true;
+      } else if (type === 'object') {
+        output = {};
+
+        _.forEach(schema.properties, function (property, name) {
+          var cProperty = _.cloneDeep(property);
+
+          // Allow macro to set the default value
+          cProperty.default = modelPropertyMacro(property);
+
+          output[name] = schemaToJSON(cProperty, models, modelsToIgnore, modelPropertyMacro);
+        });
+      } else if (type === 'array') {
+        output = [];
+
+        if (_.isArray(schema.items)) {
+          _.forEach(schema.items, function (item) {
+            output.push(schemaToJSON(item, models, modelsToIgnore, modelPropertyMacro));
+          });
+        } else if (_.isPlainObject(schema.items)) {
+          output.push(schemaToJSON(schema.items, models, modelsToIgnore, modelPropertyMacro));
+        } else if (_.isUndefined(schema.items)) {
+          output.push({});
+        } else {
+          console.log('Array type\'s \'items\' property is not an array or an object, cannot process');
+        }
+      }
+    }
+
+    return output;
+  };
+
+  // copy-pasted from swagger-js
+  var createJSONSample = function (value, modelsToIgnore) {
+    modelsToIgnore = modelsToIgnore || {};
+
+    modelsToIgnore[value.name] = value;
+
+    // Response support
+    if (value.examples && _.isPlainObject(value.examples)) {
+      value = _.cloneDeep(value);
+      var keys = Object.keys(value.examples);
+
+      _.forEach(keys, function(key) {
+        if(key.indexOf('application/json') === 0) {
+          var example = value.examples[key];
+          if (_.isString(example)) {
+            example = jsyaml.safeLoad(example);
+          }
+          value.definition.example = example;
+          return schemaToJSON(value.definition, example, modelsToIgnore, value.modelPropertyMacro);
+        }
+      });
+    }
+
+    if (value.examples) {
+      value = _.cloneDeep(value);
+      var example = value.examples;
+      if (_.isString(example)) {
+        example = jsyaml.safeLoad(example);
+      }
+      value.definition.example = example;
+      return schemaToJSON(value.definition, example, modelsToIgnore, value.modelPropertyMacro);
+    }
+
+    return schemaToJSON(value.definition, value.models, modelsToIgnore, value.modelPropertyMacro);
+  };
+
+  // copy-pasted from swagger-js
+  var getParameterModelSignature = function (type, definitions) {
+      var isPrimitive, listType;
+
+      if (type instanceof Array) {
+        listType = true;
+        type = type[0];
+      }
+
+      // Convert undefined to string of 'undefined'
+      if (typeof type === 'undefined') {
+        type = 'undefined';
+        isPrimitive = true;
+
+      } else if (definitions[type]){
+        // a model def exists?
+        type = definitions[type]; /* Model */
+        isPrimitive = false;
+
+      } else if (getInlineModel(type)) {
+        type = getInlineModel(type); /* Model */
+        isPrimitive = false;
+
+      } else {
+        // We default to primitive
+        isPrimitive = true;
+      }
+
+      if (isPrimitive) {
+        if (listType) {
+          return 'Array[' + type + ']';
+        } else {
+          return type.toString();
+        }
+      } else {
+        if (listType) {
+          return 'Array[' + getModelSignature(type.name, type.definition, type.models, type.modelPropertyMacro) + ']';
+        } else {
+          return getModelSignature(type.name, type.definition, type.models, type.modelPropertyMacro);
+        }
+      }
+  };
+
+  // copy-pasted from swagger-js
+  var createParameterJSONSample = function (type, models) {
+    var listType, sampleJson, innerType;
+    models = models || {};
+
+    listType = (type instanceof Array);
+    innerType = listType ? type[0] : type;
+
+    if(models[innerType]) {
+      sampleJson = createJSONSample(models[innerType]);
+    } else if (getInlineModel(innerType)){
+      sampleJson = createJSONSample(getInlineModel(innerType)); // may return null, if type isn't correct
+    }
+
+
+    if (sampleJson) {
+      sampleJson = listType ? [sampleJson] : sampleJson;
+
+      if (typeof sampleJson === 'string') {
+        return sampleJson;
+      } else if (_.isObject(sampleJson)) {
+        var t = sampleJson;
+
+        if (sampleJson instanceof Array && sampleJson.length > 0) {
+          t = sampleJson[0];
+        }
+
+        if (t.nodeName && typeof t === 'Node') {
+          var xmlString = new XMLSerializer().serializeToString(t);
+
+          return formatXml(xmlString);
+        } else {
+          return JSON.stringify(sampleJson, null, 2);
+        }
+      } else {
+        return sampleJson;
+      }
+    }
+  };
+
+  var wrapTag = function (name, value, attrs) {
+    var str, attributes;
+
+    attrs = attrs || [];
+
+    attributes = attrs.map(function (attr) {
+      return ' ' + attr.name + '="' + attr.value + '"';
+    }).join('');
+
+    if (!name) {
+      return getErrorMessage('Node name is not provided');
+    }
+
+    str = [
+      '<', name,
+      attributes,
+      '>',
+      value,
+      '</', name, '>'
+    ];
+
+    return str.join('');
+  };
+
+  // Commenting this funtion as the names are now determined beforehand and the prefix part is exposed as a separate function | https://github.com/swagger-api/swagger-ui/issues/2577
+ /** var getName = function (name, xml) {
+    var result = name || '';
+
+    xml = xml || {};
+
+    if (xml.name) {
+      result = xml.name;
+    }
+
+    if (xml.prefix) {
+      result = xml.prefix + ':' + result;
+    }
+
+    return result;
+  };
+  */
+  
+  var getPrefix = function (name, xml) {
+    var result = name || '';
+
+    xml = xml || {};
+
+    if (xml.prefix) {
+      result = xml.prefix + ':' + result;
+    }
+
+    return result;
+  };
+
+  var getNamespace = function (xml) {
+    var namespace = '';
+    var name = 'xmlns';
+
+    xml = xml || {};
+
+    if (xml.namespace) {
+      namespace = xml.namespace;
+    } else {
+      return namespace;
+    }
+
+    if (xml.prefix) {
+      name += ':' + xml.prefix;
+    }
+
+    return {
+      name: name,
+      value: namespace
+    };
+  };
+
+  var createArrayXML = function (descriptor) {
+    var name = descriptor.name;
+    var config = descriptor.config;
+    var definition = descriptor.definition;
+    var models = descriptor.models;
+    var value;
+    var items = definition.items;
+    var xml = definition.xml || {};
+    var namespace = getNamespace(xml);
+    var attributes = [];
+
+    if (!items) { return getErrorMessage(); }
+    var key = name;
+    // If there is a name specified for the array elements, use that for the array elements name | https://github.com/swagger-api/swagger-ui/issues/2577
+    if(items.xml && items.xml.name) {
+        key = items.xml.name;
+    }
+    value = createSchemaXML(key, items, models, config);
+    if (namespace) {
+      attributes.push(namespace);
+    }
+
+    if (xml.wrapped) {
+      value = wrapTag(name, value, attributes);
+    }
+
+    return value;
+  };
+
+  var getPrimitiveSignature = function (schema) {
+    var type, items;
+
+    schema = schema || {};
+    items = schema.items || {};
+    type = schema.type || '';
+
+    switch (type) {
+      case 'object': return 'Object is not a primitive';
+      case 'array' : return 'Array[' + (items.format || items.type) + ']';
+      default: return schema.format || type;
+    }
+  };
+
+  var createPrimitiveXML = function (descriptor) {
+    var name = descriptor.name;
+    var definition = descriptor.definition;
+    var primitivesMap = {
+      'string': {
+        'date': new Date(1).toISOString().split('T')[0],
+        'date-time' : new Date(1).toISOString(),
+        'default': 'string'
+      },
+      'integer': {
+        'default': 1
+      },
+      'number': {
+        'default': 1.1
+      },
+      'boolean': {
+        'default': true
+      }
+    };
+    var type = definition.type;
+    var format = definition.format;
+    var xml = definition.xml || {};
+    var namespace = getNamespace(xml);
+    var attributes = [];
+    var value;
+
+    if (_.keys(primitivesMap).indexOf(type) < 0) { return getErrorMessage(); }
+
+    if (_.isArray(definition.enum)){
+      value = definition.enum[0];
+    } else {
+      value = definition.example || primitivesMap[type][format] || primitivesMap[type].default;
+    }
+
+    if (xml.attribute) {
+      return {name: name, value: value};
+    }
+
+    if (namespace) {
+      attributes.push(namespace);
+    }
+
+    return wrapTag(name, value, attributes);
+  };
+
+  function createObjectXML (descriptor) {
+    var name = descriptor.name;
+    var definition = descriptor.definition;
+    var config = descriptor.config;
+    var models = descriptor.models;
+    var isParam = descriptor.config.isParam;
+    var serializedProperties;
+    var attrs = [];
+    var properties = definition.properties;
+    var additionalProperties = definition.additionalProperties;
+    var xml = definition.xml;
+    var namespace = getNamespace(xml);
+
+    if (namespace) {
+      attrs.push(namespace);
+    }   
+
+    if (!properties && !additionalProperties) { return getErrorMessage(); }
+
+    properties = properties || {};
+
+    serializedProperties = _.map(properties, function (prop, key) {
+      var xml, result;
+
+      if (isParam && prop.readOnly) {
+        return '';
+      }
+
+      xml = prop.xml || {};
+      result = createSchemaXML(key, prop, models, config);
+
+      if (xml.attribute) {
+        attrs.push(result);
+        return '';
+      }
+
+      return result;
+    }).join('');
+
+    if (additionalProperties) {
+      serializedProperties += '<!-- additional elements allowed -->';
+    }
+
+    return wrapTag(name, serializedProperties, attrs);
+  }
+
+  function getInfiniteLoopMessage (name, loopTo) {
+    return wrapTag(name, '<!-- Infinite loop $ref:' + loopTo + ' -->');
+  }
+
+  function getErrorMessage (details) {
+    details = details ? ': ' + details : '';
+    return '<!-- invalid XML' + details + ' -->';
+  }
+
+  function createSchemaXML (name, definition, models, config) {
+    var $ref = _.isObject(definition) ? definition.$ref : null;
+    var output, index;
+    config = config || {};
+    config.modelsToIgnore = config.modelsToIgnore || [];
+   
+    var descriptor = _.isString($ref) ? getDescriptorByRef($ref, name, models, config)
+        : getDescriptor(name, definition, models, config);
+    
+    if (!descriptor) {
+      return getErrorMessage();
+    }
+
+    switch (descriptor.type) {
+      case 'array':
+        output = createArrayXML(descriptor); break;
+      case 'object':
+        output = createObjectXML(descriptor); break;
+      case 'loop':
+        output = getInfiniteLoopMessage(descriptor.name, descriptor.config.loopTo); break;
+      default:
+        output = createPrimitiveXML(descriptor);
+    }
+
+    if ($ref && descriptor.type !== 'loop') {
+      index = config.modelsToIgnore.indexOf($ref);
+      if (index > -1) {
+        config.modelsToIgnore.splice(index, 1);
+      }
+    }
+
+    return output;
+  }
+
+  function Descriptor (name, type, definition, models, config) {
+    if (arguments.length < 4) {
+      throw new Error();
+    }
+    this.config = config || {};
+    this.config.modelsToIgnore = this.config.modelsToIgnore || [];
+    // name is already set by getDescriptorByRef or getDescriptor function depending on the type. Only prefix, if present is needed to be set here | https://github.com/swagger-api/swagger-ui/issues/2577
+    this.name = getPrefix(name, definition.xml);
+    this.definition = definition;
+    this.models = models;
+    this.type = type;
+  }
+
+  function getDescriptorByRef($ref, name, models, config) {
+    var modelType = simpleRef($ref);
+    var model = models[modelType] || {};
+    var type = model.definition && model.definition.type ? model.definition.type : 'object';
+    // If model definition xml name is present, then that will be preferred over model name. This is the case of preferring XmlElement name over XmlRootElement name if XmlElement name is provided | https://github.com/swagger-api/swagger-ui/issues/2577
+    if(model.definition && model.definition.xml && model.definition.xml.name) {
+        name = name || model.definition.xml.name || model.name;
+    }
+    // else only model name will be considered for determination | https://github.com/swagger-api/swagger-ui/issues/2577
+    else {
+        name = name || model.name;
+    }
+    
+    if (config.modelsToIgnore.indexOf($ref) > -1) {
+      type = 'loop';
+      config.loopTo = modelType;
+    } else {
+      config.modelsToIgnore.push($ref);
+    }
+
+    if (!model.definition) {
+      return null;
+    }
+    return new Descriptor(name, type, model.definition, models, config);    
+  }
+
+  function getDescriptor (name, definition, models, config){
+    var type = definition.type || 'object';
+    // If definition xml name is present, then that will be preferred over name | https://github.com/swagger-api/swagger-ui/issues/2577
+    if(definition.xml && definition.xml.name) {
+        name = definition.xml.name || name;
+    }
+    if (!definition) {
+      return null;
+    }
+
+    return new Descriptor(name, type, definition, models, config);
+  }
+
+  function createXMLSample (name, definition, models, isParam) {
+    var prolog = '<?xml version="1.0"?>';
+
+    return formatXml(prolog + createSchemaXML(name, definition, models, { isParam: isParam } ));
+  }
+
+  return {
+      getModelSignature: getModelSignature,
+      createJSONSample: createJSONSample,
+      getParameterModelSignature: getParameterModelSignature,
+      createParameterJSONSample: createParameterJSONSample,
+      createSchemaXML: createSchemaXML,
+      createXMLSample: createXMLSample,
+      getPrimitiveSignature: getPrimitiveSignature
+  };
+
+})();
+
+'use strict';
+
+SwaggerUi.Views.PopupView = Backbone.View.extend({
+    events: {
+        'click .api-popup-cancel': 'cancelClick'
+    },
+
+    template: Handlebars.templates.popup,
+    className: 'api-popup-dialog',
+
+    selectors: {
+        content: '.api-popup-content',
+        main   : '#swagger-ui-container'
+    },
+
+    initialize: function(){
+        this.$el.html(this.template(this.model));
+    },
+
+    render: function () {
+        this.$(this.selectors.content).append(this.model.content);
+        $(this.selectors.main).first().append(this.el);
+        this.showPopup();
+
+        return this;
+    },
+
+    showPopup: function () {
+        this.$el.show();
+    },
+
+    cancelClick: function () {
+        this.remove();
+    }
+
+});
+
+'use strict';
+
 SwaggerUi.Views.ResourceView = Backbone.View.extend({
   initialize: function(opts) {
     opts = opts || {};
@@ -26159,6 +25159,7 @@ SwaggerUi.Views.ResourceView = Backbone.View.extend({
     if (this.model.description) {
       this.model.summary = this.model.description;
     }
+    this.number = 0;
   },
 
   render: function(){
@@ -26220,6 +25221,7 @@ SwaggerUi.Views.ResourceView = Backbone.View.extend({
     Docs[fnName](e.currentTarget.getAttribute('data-id'));
   }
 });
+
 'use strict';
 
 SwaggerUi.Views.ResponseContentTypeView = Backbone.View.extend({
@@ -26237,11 +25239,11 @@ SwaggerUi.Views.SignatureView = Backbone.View.extend({
   events: {
     'click a.description-link'       : 'switchToDescription',
     'click a.snippet-link'           : 'switchToSnippet',
-    'mousedown .snippet'          : 'snippetToTextArea'
+    'mousedown .snippet_json'          : 'jsonSnippetMouseDown',
+    'mousedown .snippet_xml'          : 'xmlSnippetMouseDown'
   },
 
   initialize: function () {
-
   },
 
   render: function(){
@@ -26253,12 +25255,6 @@ SwaggerUi.Views.SignatureView = Backbone.View.extend({
     } else {
       this.switchToSnippet();
     }
-    
-    this.isParam = this.model.isParam;
-
-    if (this.isParam) {
-      $('.notice', $(this.el)).text('Click to set as parameter value');
-    }
 
     return this;
   },
@@ -26277,27 +25273,39 @@ SwaggerUi.Views.SignatureView = Backbone.View.extend({
   switchToSnippet: function(e){
     if (e) { e.preventDefault(); }
 
-    $('.description', $(this.el)).hide();
     $('.snippet', $(this.el)).show();
+    $('.description', $(this.el)).hide();
     $('.snippet-link', $(this.el)).addClass('selected');
     $('.description-link', $(this.el)).removeClass('selected');
   },
 
   // handler for snippet to text area
-  snippetToTextArea: function(e) {
-    if (this.isParam) {
+  snippetToTextArea: function(val) {
+    var textArea = $('textarea', $(this.el.parentNode.parentNode.parentNode));
+
+    // Fix for bug in IE 10/11 which causes placeholder text to be copied to "value"
+    if ($.trim(textArea.val()) === '' || textArea.prop('placeholder') === textArea.val()) {
+      textArea.val(val);
+      // TODO move this code outside of the view and expose an event instead
+      if( this.model.jsonEditor && this.model.jsonEditor.isEnabled()){
+        this.model.jsonEditor.setValue(JSON.parse(this.model.sampleJSON));
+      }
+    }
+  },
+
+  jsonSnippetMouseDown: function (e) {
+    if (this.model.isParam) {
       if (e) { e.preventDefault(); }
 
-      var textArea = $('textarea', $(this.el.parentNode.parentNode.parentNode));
+      this.snippetToTextArea(this.model.sampleJSON);
+    }
+  },
 
-      // Fix for bug in IE 10/11 which causes placeholder text to be copied to "value"
-      if ($.trim(textArea.val()) === '' || textArea.prop('placeholder') === textArea.val()) {
-        textArea.val(this.model.sampleJSON);
-        // TODO move this code outside of the view and expose an event instead
-        if( this.model.jsonEditor && this.model.jsonEditor.isEnabled()){
-          this.model.jsonEditor.setValue(JSON.parse(this.model.sampleJSON));
-        }
-      }
+  xmlSnippetMouseDown: function (e) {
+    if (this.model.isParam) {
+      if (e) { e.preventDefault(); }
+
+      this.snippetToTextArea(this.model.sampleXML);
     }
   }
 });
@@ -26310,21 +25318,27 @@ SwaggerUi.Views.StatusCodeView = Backbone.View.extend({
   },
 
   render: function(){
+    var responseModel, responseModelView;
+    var value = this.router.api.models[this.model.responseModel];
     $(this.el).html(Handlebars.templates.status_code(this.model));
 
     if (this.router.api.models.hasOwnProperty(this.model.responseModel)) {
-      var responseModel = {
-        sampleJSON: JSON.stringify(this.router.api.models[this.model.responseModel].createJSONSample(), null, 2),
+      responseModel = {
+        sampleJSON: JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2),
+        sampleXML: this.model.isXML ? SwaggerUi.partials.signature.createXMLSample('', this.model.schema, this.router.api.models) : false,
         isParam: false,
-        signature: this.router.api.models[this.model.responseModel].getMockSignature(),
+        signature: SwaggerUi.partials.signature.getModelSignature(this.model.responseModel, value, this.router.api.models),
         defaultRendering: this.model.defaultRendering
       };
-
-      var responseModelView = new SwaggerUi.Views.SignatureView({model: responseModel, tagName: 'div'});
-      $('.model-signature', this.$el).append(responseModelView.render().el);
     } else {
-      $('.model-signature', this.$el).html('');
+      responseModel = {
+        signature: SwaggerUi.partials.signature.getPrimitiveSignature(this.model.schema)
+      };
     }
+
+    responseModelView = new SwaggerUi.Views.SignatureView({model: responseModel, tagName: 'div'});
+    $('.model-signature', this.$el).append(responseModelView.render().el);
     return this;
   }
 });}).call(this);
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["templates.js","doc.js","es5-shim.js","helpers/handlebars.js","sanitize-html.min.js","node_modules/browserify/node_modules/browser-pack/_prelude.js","index.js","lib/auth.js","lib/client.js","lib/helpers.js","lib/http.js","lib/resolver.js","lib/schema-markup.js","lib/spec-converter.js","lib/types/model.js","lib/types/operation.js","lib/types/operationGroup.js","node_modules/browserify/node_modules/process/browser.js","node_modules/btoa/index.js","node_modules/buffer/index.js","node_modules/buffer/node_modules/base64-js/lib/b64.js","node_modules/buffer/node_modules/ieee754/index.js","node_modules/buffer/node_modules/is-array/index.js","node_modules/cookiejar/cookiejar.js","node_modules/js-yaml/index.js","node_modules/js-yaml/lib/js-yaml.js","node_modules/js-yaml/lib/js-yaml/common.js","node_modules/js-yaml/lib/js-yaml/dumper.js","node_modules/js-yaml/lib/js-yaml/exception.js","node_modules/js-yaml/lib/js-yaml/loader.js","node_modules/js-yaml/lib/js-yaml/mark.js","node_modules/js-yaml/lib/js-yaml/schema.js","node_modules/js-yaml/lib/js-yaml/schema/core.js","node_modules/js-yaml/lib/js-yaml/schema/default_full.js","node_modules/js-yaml/lib/js-yaml/schema/default_safe.js","node_modules/js-yaml/lib/js-yaml/schema/failsafe.js","node_modules/js-yaml/lib/js-yaml/schema/json.js","node_modules/js-yaml/lib/js-yaml/type.js","node_modules/js-yaml/lib/js-yaml/type/binary.js","node_modules/js-yaml/lib/js-yaml/type/bool.js","node_modules/js-yaml/lib/js-yaml/type/float.js","node_modules/js-yaml/lib/js-yaml/type/int.js","node_modules/js-yaml/lib/js-yaml/type/js/function.js","node_modules/js-yaml/lib/js-yaml/type/js/regexp.js","node_modules/js-yaml/lib/js-yaml/type/js/undefined.js","node_modules/js-yaml/lib/js-yaml/type/map.js","node_modules/js-yaml/lib/js-yaml/type/merge.js","node_modules/js-yaml/lib/js-yaml/type/null.js","node_modules/js-yaml/lib/js-yaml/type/omap.js","node_modules/js-yaml/lib/js-yaml/type/pairs.js","node_modules/js-yaml/lib/js-yaml/type/seq.js","node_modules/js-yaml/lib/js-yaml/type/set.js","node_modules/js-yaml/lib/js-yaml/type/str.js","node_modules/js-yaml/lib/js-yaml/type/timestamp.js","node_modules/lodash-compat/array/indexOf.js","node_modules/lodash-compat/array/last.js","node_modules/lodash-compat/chain/lodash.js","node_modules/lodash-compat/collection/each.js","node_modules/lodash-compat/collection/find.js","node_modules/lodash-compat/collection/forEach.js","node_modules/lodash-compat/collection/includes.js","node_modules/lodash-compat/collection/map.js","node_modules/lodash-compat/date/now.js","node_modules/lodash-compat/function/bind.js","node_modules/lodash-compat/function/restParam.js","node_modules/lodash-compat/internal/LazyWrapper.js","node_modules/lodash-compat/internal/LodashWrapper.js","node_modules/lodash-compat/internal/arrayCopy.js","node_modules/lodash-compat/internal/arrayEach.js","node_modules/lodash-compat/internal/arrayMap.js","node_modules/lodash-compat/internal/arraySome.js","node_modules/lodash-compat/internal/baseAssign.js","node_modules/lodash-compat/internal/baseCallback.js","node_modules/lodash-compat/internal/baseClone.js","node_modules/lodash-compat/internal/baseCopy.js","node_modules/lodash-compat/internal/baseCreate.js","node_modules/lodash-compat/internal/baseEach.js","node_modules/lodash-compat/internal/baseFind.js","node_modules/lodash-compat/internal/baseFindIndex.js","node_modules/lodash-compat/internal/baseFor.js","node_modules/lodash-compat/internal/baseForIn.js","node_modules/lodash-compat/internal/baseForOwn.js","node_modules/lodash-compat/internal/baseGet.js","node_modules/lodash-compat/internal/baseIndexOf.js","node_modules/lodash-compat/internal/baseIsEqual.js","node_modules/lodash-compat/internal/baseIsEqualDeep.js","node_modules/lodash-compat/internal/baseIsMatch.js","node_modules/lodash-compat/internal/baseLodash.js","node_modules/lodash-compat/internal/baseMap.js","node_modules/lodash-compat/internal/baseMatches.js","node_modules/lodash-compat/internal/baseMatchesProperty.js","node_modules/lodash-compat/internal/baseProperty.js","node_modules/lodash-compat/internal/basePropertyDeep.js","node_modules/lodash-compat/internal/baseSetData.js","node_modules/lodash-compat/internal/baseSlice.js","node_modules/lodash-compat/internal/baseToString.js","node_modules/lodash-compat/internal/baseValues.js","node_modules/lodash-compat/internal/binaryIndex.js","node_modules/lodash-compat/internal/binaryIndexBy.js","node_modules/lodash-compat/internal/bindCallback.js","node_modules/lodash-compat/internal/bufferClone.js","node_modules/lodash-compat/internal/composeArgs.js","node_modules/lodash-compat/internal/composeArgsRight.js","node_modules/lodash-compat/internal/createBaseEach.js","node_modules/lodash-compat/internal/createBaseFor.js","node_modules/lodash-compat/internal/createBindWrapper.js","node_modules/lodash-compat/internal/createCtorWrapper.js","node_modules/lodash-compat/internal/createFind.js","node_modules/lodash-compat/internal/createForEach.js","node_modules/lodash-compat/internal/createHybridWrapper.js","node_modules/lodash-compat/internal/createPartialWrapper.js","node_modules/lodash-compat/internal/createWrapper.js","node_modules/lodash-compat/internal/equalArrays.js","node_modules/lodash-compat/internal/equalByTag.js","node_modules/lodash-compat/internal/equalObjects.js","node_modules/lodash-compat/internal/getData.js","node_modules/lodash-compat/internal/getFuncName.js","node_modules/lodash-compat/internal/getLength.js","node_modules/lodash-compat/internal/getMatchData.js","node_modules/lodash-compat/internal/getNative.js","node_modules/lodash-compat/internal/indexOfNaN.js","node_modules/lodash-compat/internal/initCloneArray.js","node_modules/lodash-compat/internal/initCloneByTag.js","node_modules/lodash-compat/internal/initCloneObject.js","node_modules/lodash-compat/internal/isArrayLike.js","node_modules/lodash-compat/internal/isHostObject.js","node_modules/lodash-compat/internal/isIndex.js","node_modules/lodash-compat/internal/isIterateeCall.js","node_modules/lodash-compat/internal/isKey.js","node_modules/lodash-compat/internal/isLaziable.js","node_modules/lodash-compat/internal/isLength.js","node_modules/lodash-compat/internal/isObjectLike.js","node_modules/lodash-compat/internal/isStrictComparable.js","node_modules/lodash-compat/internal/mergeData.js","node_modules/lodash-compat/internal/metaMap.js","node_modules/lodash-compat/internal/realNames.js","node_modules/lodash-compat/internal/reorder.js","node_modules/lodash-compat/internal/replaceHolders.js","node_modules/lodash-compat/internal/setData.js","node_modules/lodash-compat/internal/shimKeys.js","node_modules/lodash-compat/internal/toObject.js","node_modules/lodash-compat/internal/toPath.js","node_modules/lodash-compat/internal/wrapperClone.js","node_modules/lodash-compat/lang/cloneDeep.js","node_modules/lodash-compat/lang/isArguments.js","node_modules/lodash-compat/lang/isArray.js","node_modules/lodash-compat/lang/isEmpty.js","node_modules/lodash-compat/lang/isFunction.js","node_modules/lodash-compat/lang/isNative.js","node_modules/lodash-compat/lang/isObject.js","node_modules/lodash-compat/lang/isPlainObject.js","node_modules/lodash-compat/lang/isString.js","node_modules/lodash-compat/lang/isTypedArray.js","node_modules/lodash-compat/lang/isUndefined.js","node_modules/lodash-compat/object/keys.js","node_modules/lodash-compat/object/keysIn.js","node_modules/lodash-compat/object/pairs.js","node_modules/lodash-compat/object/values.js","node_modules/lodash-compat/support.js","node_modules/lodash-compat/utility/identity.js","node_modules/lodash-compat/utility/noop.js","node_modules/lodash-compat/utility/property.js","node_modules/q/q.js","node_modules/superagent/lib/client.js","node_modules/superagent/lib/is-object.js","node_modules/superagent/lib/request-base.js","node_modules/superagent/lib/request.js","node_modules/superagent/node_modules/component-emitter/index.js","SwaggerUi.js","utils/utils.js","view/ApiKeyAuthModel.js","view/ApiKeyAuthView.js","view/AuthButtonView.js","view/AuthsCollection.js","view/AuthsCollectionView.js","view/AuthView.js","view/BasicAuthModel.js","view/BasicAuthView.js","view/ContentTypeView.js","view/HeaderView.js","view/MainView.js","view/Oauth2Model.js","view/Oauth2View.js","view/OperationView.js","view/ParameterContentTypeView.js","view/ParameterView.js","view/partials/signature.js","view/PopupView.js","view/ResourceView.js","view/ResponseContentTypeView.js","view/SignatureView.js","view/StatusCodeView.js"],"names":[],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC1xBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACxMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACjhEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACnGA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;ACNA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxXA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC94BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7gBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3oBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACltCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7/CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5HA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClyBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACljDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACRA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACZA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACRA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACRA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7HA;AACA;;ACDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACVA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACbA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClHA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACZA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACZA;AACA;AACA;AACA;AACA;;ACJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACngEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACh9BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACbA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3VA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACnKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AClTA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC/EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC5CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACpEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC9FA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACrDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC5NA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACpDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACVA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC/CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AChJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC1EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AClFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACn3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACXA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC7LA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC79BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACpCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC3EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACVA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC3EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"swagger-ui.js","sourcesContent":["/* jshint ignore:start */ \n {(function() {\n  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};\ntemplates['apikey_auth'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"                <span class=\\\"key_auth__value\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.value : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span>\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \"                <input placeholder=\\\"api_key\\\" class=\\\"auth_input input_apiKey_entry\\\" name=\\\"apiKey\\\" type=\\\"text\\\"/>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<div class=\\\"key_input_container\\\">\\n    <h3 class=\\\"auth__title\\\">Api key authorization</h3>\\n    <div class=\\\"auth__description\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n    <div>\\n        <div class=\\\"key_auth__field\\\">\\n            <span class=\\\"key_auth__label\\\">name:</span>\\n            <span class=\\\"key_auth__value\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span>\\n        </div>\\n        <div class=\\\"key_auth__field\\\">\\n            <span class=\\\"key_auth__label\\\">in:</span>\\n            <span class=\\\"key_auth__value\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0[\"in\"] : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span>\\n        </div>\\n        <div class=\\\"key_auth__field\\\">\\n            <span class=\\\"key_auth__label\\\">value:</span>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(3, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"        </div>\\n    </div>\\n</div>\\n\";\n},\"useData\":true});\ntemplates['auth_button'] = template({\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    return \"<a class='authorize__btn' href=\\\"#\\\">Authorize</a>\\n\";\n},\"useData\":true});\ntemplates['auth_button_operation'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \"        authorize__btn_operation_login\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \"        authorize__btn_operation_logout\\n\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"        <ul class=\\\"authorize-scopes\\\">\\n\"\n    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.scopes : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(6, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"        </ul>\\n\";\n},\"6\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"                <li class=\\\"authorize__scope\\\" title=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</li>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"<div class=\\\"authorize__btn authorize__btn_operation\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(3, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.scopes : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n\";\n},\"useData\":true});\ntemplates['auth_view'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \"            <button type=\\\"button\\\" class=\\\"auth__button auth_submit__button\\\" data-sw-translate>Authorize</button>\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \"            <button type=\\\"button\\\" class=\\\"auth__button auth_logout__button\\\" data-sw-translate>Logout</button>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"<div class=\\\"auth_container\\\">\\n\\n    <div class=\\\"auth_inner\\\"></div>\\n    <div class=\\\"auth_submit\\\">\\n\"\n    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"unless\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isAuthorized : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    </div>\\n\\n</div>\\n\";\n},\"useData\":true});\ntemplates['basic_auth'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \" - authorized\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"                <span class=\\\"basic_auth__value\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.username : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span>\\n\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    return \"                <input required placeholder=\\\"username\\\" class=\\\"basic_auth__username auth_input\\\" name=\\\"username\\\" type=\\\"text\\\"/>\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    return \"            <div class=\\\"auth_label\\\">\\n                <span class=\\\"basic_auth__label\\\" data-sw-translate>password:</span>\\n                <input required placeholder=\\\"password\\\" class=\\\"basic_auth__password auth_input\\\" name=\\\"password\\\" type=\\\"password\\\"/></label>\\n            </div>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"<div class='basic_auth_container'>\\n    <h3 class=\\\"auth__title\\\">Basic authentication\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"</h3>\\n    <form class=\\\"basic_input_container\\\">\\n        <div class=\\\"auth__description\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n        <div class=\\\"auth_label\\\">\\n            <span class=\\\"basic_auth__label\\\" data-sw-translate>username:</span>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.program(5, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"        </div>\\n\"\n    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.isLogout : depth0),{\"name\":\"unless\",\"hash\":{},\"fn\":container.program(7, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    </form>\\n</div>\\n\";\n},\"useData\":true});\ntemplates['content_type'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.produces : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\");\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t<option value=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</option>\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    return \"  <option value=\\\"application/json\\\">application/json</option>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<label data-sw-translate for=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.contentTypeId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">Response Content Type</label>\\n<select name=\\\"contentType\\\" id=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.contentTypeId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.produces : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(4, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</select>\\n\";\n},\"useData\":true});\ntemplates['main'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"  <div class=\\\"info_title\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n  <div class=\\\"info_description markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.description : stack1),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.externalDocs : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"  \"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(4, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  \"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(6, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  \"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(8, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  \"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(10, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  \"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(12, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\";\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"  <p>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.description : stack1),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\\n  <a href=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.url : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" target=\\\"_blank\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.externalDocs : depth0)) != null ? stack1.url : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a>\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"<div class=\\\"info_tos\\\"><a target=\\\"_blank\\\" href=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" data-sw-translate>Terms of service</a></div>\";\n},\"6\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"<div><div class='info_name' style=\\\"display: inline\\\" data-sw-translate>Created by </div> \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\";\n},\"8\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<div class='info_url' data-sw-translate>See more at <a href=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a></div>\";\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<div class='info_email'><a target=\\\"_parent\\\" href=\\\"mailto:\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"?subject=\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" data-sw-translate>Contact the developer</a></div>\";\n},\"12\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<div class='info_license'><a target=\\\"_blank\\\" href='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.url : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.name : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a></div>\";\n},\"14\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"  , <span style=\\\"font-variant: small-caps\\\" data-sw-translate>api version</span>: \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n    \";\n},\"16\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"    <span style=\\\"float:right\\\"><a target=\\\"_blank\\\" href=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"/debug?url=\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.url : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\"><img id=\\\"validator\\\" src=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"?url=\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.url : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\"></a>\\n    </span>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"<div class='info' id='api_info'>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.info : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n<div class='container' id='resources_container'>\\n  <div class='authorize-wrapper'></div>\\n\\n  <ul id='resources'></ul>\\n\\n  <div class=\\\"footer\\\">\\n    <h4 style=\\\"color: #999\\\">[ <span style=\\\"font-variant: small-caps\\\">base url</span>: \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.basePath : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(14, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"]\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.validatorUrl : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(16, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    </h4>\\n    </div>\\n</div>\\n\";\n},\"useData\":true});\ntemplates['oauth2'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"<p>Authorization URL: \"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.authorizationUrl : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"<p>Token URL: \"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tokenUrl : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    return \"        <p>Please input username and password for password flow authorization</p>\\n        <fieldset>\\n            <div><label>Username: <input class=\\\"oauth-username\\\" type=\\\"text\\\" name=\\\"username\\\"></label></div>\\n            <div><label>Password: <input class=\\\"oauth-password\\\" type=\\\"password\\\" name=\\\"password\\\"></label></div>\\n        </fieldset>\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"        <p>Setup client authentication.\"\n    + ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.requireClientAuthenticaiton : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(8, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\\n        <fieldset>\\n            <div><label>Type:\\n                <select class=\\\"oauth-client-authentication-type\\\" name=\\\"client-authentication-type\\\">\\n                    <option value=\\\"none\\\" selected>None or other</option>\\n                    <option value=\\\"basic\\\">Basic auth</option>\\n                    <option value=\\\"request-body\\\">Request body</option>\\n                </select>\\n            </label></div>\\n            <div class=\\\"oauth-client-authentication\\\" hidden>\\n                <div><label>ClientId: <input class=\\\"oauth-client-id\\\" type=\\\"text\\\" name=\\\"client-id\\\"></label></div>\\n                <div><label>Secret: <input class=\\\"oauth-client-secret\\\" type=\\\"text\\\" name=\\\"client-secret\\\"></label></div>\\n            </div>\\n        </fieldset>\\n\";\n},\"8\":function(container,depth0,helpers,partials,data) {\n    return \"(Required)\";\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"            <li>\\n                <input class=\\\"oauth-scope\\\" type=\\\"checkbox\\\" data-scope=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" oauthtype=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.OAuthSchemeKey : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\"/>\\n                <label>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.scope : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label><br/>\\n                <span class=\\\"api-scope-desc\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.OAuthSchemeKey : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(11, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"                </span>\\n            </li>\\n\";\n},\"11\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"                        (\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.OAuthSchemeKey : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \")\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<div>\\n    <h3 class=\\\"auth__title\\\">OAuth2.0</h3>\\n    <p>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\\n    \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.authorizationUrl : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n    \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.tokenUrl : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n    <p>flow: \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.flow : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</p>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isPasswordFlow : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.clientAuthentication : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(7, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    <p><strong> \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.appName : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \" </strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>\\n    <p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.\\n        <a href=\\\"#\\\">Learn how to use</a>\\n    </p>\\n    <ul class=\\\"api-popup-scopes\\\">\\n\"\n    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.scopes : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(10, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    </ul>\\n</div>\";\n},\"useData\":true});\ntemplates['operation'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \"deprecated\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \"            <h4><span data-sw-translate>Warning: Deprecated</span></h4>\\n\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"        <h4><span data-sw-translate>Implementation Notes</span></h4>\\n        <div class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    return \"            <div class='authorize-wrapper authorize-wrapper_operation'></div>\\n\";\n},\"9\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"          <div class=\\\"response-class\\\">\\n            <h4><span data-sw-translate>Response Class</span> (<span data-sw-translate>Status</span> \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.successCode : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \")</h4>\\n              \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.successDescription : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(10, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n            <p><span class=\\\"model-signature\\\" /></p>\\n            <br/>\\n            <div class=\\\"response-content-type\\\" />\\n            </div>\\n\";\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"<div class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.successDescription : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</div>\";\n},\"12\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"          <h4 data-sw-translate>Headers</h4>\\n          <table class=\\\"headers\\\">\\n            <thead>\\n              <tr>\\n                <th style=\\\"width: 100px; max-width: 100px\\\" data-sw-translate>Header</th>\\n                <th style=\\\"width: 310px; max-width: 310px\\\" data-sw-translate>Description</th>\\n                <th style=\\\"width: 200px; max-width: 200px\\\" data-sw-translate>Type</th>\\n                <th style=\\\"width: 320px; max-width: 320px\\\" data-sw-translate>Other</th>\\n              </tr>\\n            </thead>\\n            <tbody>\\n\"\n    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.headers : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(13, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"            </tbody>\\n          </table>\\n\";\n},\"13\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"              <tr>\\n                <td>\"\n    + container.escapeExpression(((helper = (helper = helpers.key || (data && data.key)) != null ? helper : alias2),(typeof helper === \"function\" ? helper.call(alias1,{\"name\":\"key\",\"hash\":{},\"data\":data}) : helper)))\n    + \"</td>\\n                <td>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n                <td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.type : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n                <td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.other : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n              </tr>\\n\";\n},\"15\":function(container,depth0,helpers,partials,data) {\n    return \"          <h4 data-sw-translate>Parameters</h4>\\n          <table class='fullwidth parameters'>\\n          <thead>\\n            <tr>\\n            <th style=\\\"width: 100px; max-width: 100px\\\" data-sw-translate>Parameter</th>\\n            <th style=\\\"width: 310px; max-width: 310px\\\" data-sw-translate>Value</th>\\n            <th style=\\\"width: 200px; max-width: 200px\\\" data-sw-translate>Description</th>\\n            <th style=\\\"width: 100px; max-width: 100px\\\" data-sw-translate>Parameter Type</th>\\n            <th style=\\\"width: 220px; max-width: 230px\\\" data-sw-translate>Data Type</th>\\n            </tr>\\n          </thead>\\n          <tbody class=\\\"operation-params\\\">\\n\\n          </tbody>\\n          </table>\\n\";\n},\"17\":function(container,depth0,helpers,partials,data) {\n    return \"          <div style='margin:0;padding:0;display:inline'></div>\\n          <h4 data-sw-translate>Response Messages</h4>\\n          <table class='fullwidth response-messages'>\\n            <thead>\\n            <tr>\\n              <th data-sw-translate>HTTP Status Code</th>\\n              <th data-sw-translate>Reason</th>\\n              <th data-sw-translate>Response Model</th>\\n              <th data-sw-translate>Headers</th>\\n            </tr>\\n            </thead>\\n            <tbody class=\\\"operation-status\\\">\\n            </tbody>\\n          </table>\\n\";\n},\"19\":function(container,depth0,helpers,partials,data) {\n    return \"\";\n},\"21\":function(container,depth0,helpers,partials,data) {\n    return \"          <div class='sandbox_header'>\\n            <input class='submit' type='submit' value='Try it out!' data-sw-translate/>\\n            <a href='#' class='response_hider' style='display:none' data-sw-translate>Hide Response</a>\\n            <span class='response_throbber' style='display:none'></span>\\n          </div>\\n\";\n},\"23\":function(container,depth0,helpers,partials,data) {\n    return \"          <h4 data-sw-translate>Request Headers</h4>\\n          <div class='block request_headers'></div>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3=container.escapeExpression;\n\n  return \"  <ul class='operations' >\\n    <li class='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.method : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \" operation' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.parentId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"_\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\\n      <div class='heading'>\\n        <h3>\\n          <span class='http_method'>\\n          <a href='#!/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"' class=\\\"toggleOperation\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.method : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a>\\n          </span>\\n          <span class='path'>\\n          <a href='#!/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"' class=\\\"toggleOperation \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.deprecated : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.path : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a>\\n          </span>\\n        </h3>\\n        <ul class='options'>\\n          <li>\\n          <a href='#!/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"/\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"' class=\\\"toggleOperation\\\"><span class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.summary : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span></a>\\n          </li>\\n        </ul>\\n      </div>\\n      <div class='content' id='\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.encodedParentId : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"_\"\n    + alias3((helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.nickname : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"_content' style='display:none'>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.deprecated : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.security : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(7, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.type : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(9, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.headers : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(12, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n        <form accept-charset='UTF-8' class='sandbox'>\\n          <div style='margin:0;padding:0;display:inline'></div>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.parameters : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(15, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.responseMessages : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(17, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isReadOnly : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(19, data, 0),\"inverse\":container.program(21, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"        </form>\\n        <div class='response' style='display:none'>\\n          <h4 class='curl'>Curl</h4>\\n          <div class='block curl'></div>\\n          <h4 data-sw-translate>Request URL</h4>\\n          <div class='block request_url'></div>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.showRequestHeaders : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(23, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"          <h4 data-sw-translate>Response Body</h4>\\n          <div class='block response_body'></div>\\n          <h4 data-sw-translate>Response Code</h4>\\n          <div class='block response_code'></div>\\n          <h4 data-sw-translate>Response Headers</h4>\\n          <div class='block response_headers'></div>\\n        </div>\\n      </div>\\n    </li>\\n  </ul>\\n\";\n},\"useData\":true});\ntemplates['param'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.program(4, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t<input type=\\\"file\\\" name='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'/>\\n\t\t\t<div class=\\\"parameter-content-type\\\" />\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.program(7, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"5\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t\t<div class=\\\"editor_holder\\\"></div>\\n\t\t\t\t<textarea class='body-textarea' name='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</textarea>\\n        <br />\\n        <div class=\\\"parameter-content-type\\\" />\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t\t<textarea class='body-textarea' name='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'></textarea>\\n\t\t\t\t<div class=\\\"editor_holder\\\"></div>\\n\t\t\t\t<br />\\n\t\t\t\t<div class=\\\"parameter-content-type\\\" />\\n\";\n},\"9\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.program(10, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = (helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helpers.helperMissing).call(depth0 != null ? depth0 : {},depth0,{\"name\":\"renderTextParam\",\"hash\":{},\"fn\":container.program(11, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\");\n},\"11\":function(container,depth0,helpers,partials,data) {\n    return \"\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td class='code'><label for='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label></td>\\n<td>\\n\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(9, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n</td>\\n<td class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\\n\t<span class=\\\"model-signature\\\"></span>\\n</td>\\n\";\n},\"useData\":true});\ntemplates['param_list'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \" required\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \" multiple=\\\"multiple\\\"\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    return \" required \";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"      <option \"\n    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.hasDefault : depth0),{\"name\":\"unless\",\"hash\":{},\"fn\":container.program(8, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \" value=''></option>\\n\";\n},\"8\":function(container,depth0,helpers,partials,data) {\n    return \"  selected=\\\"\\\" \";\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\\n      <option \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isDefault : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(11, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"  value='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.value : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'> \"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.value : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \" \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isDefault : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(13, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \" </option>\\n\\n\";\n},\"11\":function(container,depth0,helpers,partials,data) {\n    return \" selected=\\\"\\\"  \";\n},\"13\":function(container,depth0,helpers,partials,data) {\n    return \" (default) \";\n},\"15\":function(container,depth0,helpers,partials,data) {\n    return \"<strong>\";\n},\"17\":function(container,depth0,helpers,partials,data) {\n    return \"</strong>\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td class='code\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.required : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"'><label for='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label></td>\\n<td>\\n  <select \"\n    + ((stack1 = (helpers.isArray || (depth0 && depth0.isArray) || alias2).call(alias1,depth0,{\"name\":\"isArray\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \" class=\\\"parameter \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.required : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" name=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" id=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\\n\\n\"\n    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.required : depth0),{\"name\":\"unless\",\"hash\":{},\"fn\":container.program(7, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\"\n    + ((stack1 = helpers.each.call(alias1,((stack1 = (depth0 != null ? depth0.allowableValues : depth0)) != null ? stack1.descriptiveValues : stack1),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(10, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  </select>\\n</td>\\n<td class=\\\"markdown\\\">\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.required : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(15, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : alias2),(typeof helper === \"function\" ? helper.call(alias1,{\"name\":\"description\",\"hash\":{},\"data\":data}) : helper))) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.required : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(17, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td><span class=\\\"model-signature\\\"></span></td>\\n\";\n},\"useData\":true});\ntemplates['param_readonly'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"        <textarea class='body-textarea' readonly='readonly' name='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</textarea>\\n        <div class=\\\"parameter-content-type\\\" />\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(4, data, 0),\"inverse\":container.program(6, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"4\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"            \"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\";\n},\"6\":function(container,depth0,helpers,partials,data) {\n    return \"            (empty)\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td class='code'><label for='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label></td>\\n<td>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(3, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td><span class=\\\"model-signature\\\"></span></td>\\n\";\n},\"useData\":true});\ntemplates['param_readonly_required'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"        <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</textarea>\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(4, data, 0),\"inverse\":container.program(6, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"4\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"            \"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\";\n},\"6\":function(container,depth0,helpers,partials,data) {\n    return \"            (empty)\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td class='code required'><label for='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label></td>\\n<td>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(3, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td><span class=\\\"model-signature\\\"></span></td>\\n\";\n},\"useData\":true});\ntemplates['param_required'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.program(4, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t<input type=\\\"file\\\" name='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'/>\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.program(7, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"5\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t\t<div class=\\\"editor_holder\\\"></div>\\n\t\t\t\t<textarea class='body-textarea required' placeholder='(required)' name='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id=\\\"\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0[\"default\"] : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</textarea>\\n        <br />\\n        <div class=\\\"parameter-content-type\\\" />\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t\t<textarea class='body-textarea required' placeholder='(required)' name='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'></textarea>\\n\t\t\t\t<div class=\\\"editor_holder\\\"></div>\\n\t\t\t\t<br />\\n\t\t\t\t<div class=\\\"parameter-content-type\\\" />\\n\";\n},\"9\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers[\"if\"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.isFile : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(10, data, 0),\"inverse\":container.program(12, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"10\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"\t\t\t<input class='parameter required' type='file' name='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'/>\\n\";\n},\"12\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = (helpers.renderTextParam || (depth0 && depth0.renderTextParam) || helpers.helperMissing).call(depth0 != null ? depth0 : {},depth0,{\"name\":\"renderTextParam\",\"hash\":{},\"fn\":container.program(13, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\");\n},\"13\":function(container,depth0,helpers,partials,data) {\n    return \"\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td class='code required'><label for='\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.valueId : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"'>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</label></td>\\n<td>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isBody : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(9, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td>\\n\t<strong><span class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</span></strong>\\n</td>\\n<td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.paramType : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td><span class=\\\"model-signature\\\"></span></td>\\n\";\n},\"useData\":true});\ntemplates['parameter_content_type'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.consumes : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\");\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"  <option value=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</option>\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    return \"  <option value=\\\"application/json\\\">application/json</option>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<label for=\\\"\"\n    + container.escapeExpression(((helper = (helper = helpers.parameterContentTypeId || (depth0 != null ? depth0.parameterContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === \"function\" ? helper.call(alias1,{\"name\":\"parameterContentTypeId\",\"hash\":{},\"data\":data}) : helper)))\n    + \"\\\" data-sw-translate>Parameter content type:</label>\\n<select name=\\\"parameterContentType\\\" id=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.parameterContentTypeId : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.consumes : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(4, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</select>\\n\";\n},\"useData\":true});\ntemplates['popup'] = template({\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var helper;\n\n  return \"<div class=\\\"api-popup-dialog-wrapper\\\">\\n    <div class=\\\"api-popup-title\\\">\"\n    + container.escapeExpression(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === \"function\" ? helper.call(depth0 != null ? depth0 : {},{\"name\":\"title\",\"hash\":{},\"data\":data}) : helper)))\n    + \"</div>\\n    <div class=\\\"api-popup-content\\\"></div>\\n    <p class=\\\"error-msg\\\"></p>\\n    <div class=\\\"api-popup-actions\\\">\\n        <button class=\\\"api-popup-cancel api-button gray\\\" type=\\\"button\\\">Cancel</button>\\n    </div>\\n</div>\\n<div class=\\\"api-popup-dialog-shadow\\\"></div>\";\n},\"useData\":true});\ntemplates['resource'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    return \" : \";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"    <li>\\n      <a href='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.url : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' data-sw-translate>Raw</a>\\n    </li>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, buffer = \n  \"<div class='heading'>\\n  <h2>\\n    <a href='#!/\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' class=\\\"toggleEndpointList\\\" data-id=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.name : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</a> \";\n  stack1 = ((helper = (helper = helpers.summary || (depth0 != null ? depth0.summary : depth0)) != null ? helper : alias2),(options={\"name\":\"summary\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data}),(typeof helper === \"function\" ? helper.call(alias1,options) : helper));\n  if (!helpers.summary) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}\n  if (stack1 != null) { buffer += stack1; }\n  return buffer + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.summary : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n  </h2>\\n  <ul class='options'>\\n    <li>\\n      <a href='#!/\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' id='endpointListTogger_\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"' class=\\\"toggleEndpointList\\\" data-id=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" data-sw-translate>Show/Hide</a>\\n    </li>\\n    <li>\\n      <a href='#' class=\\\"collapseResource\\\" data-id=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" data-sw-translate>\\n        List Operations\\n      </a>\\n    </li>\\n    <li>\\n      <a href='#' class=\\\"expandResource\\\" data-id=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\" data-sw-translate>\\n        Expand Operations\\n      </a>\\n    </li>\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.url : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"  </ul>\\n</div>\\n<ul class='endpoints' id='\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.id : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"_endpoint_list' style='display:none'>\\n\\n</ul>\\n\";\n},\"useData\":true});\ntemplates['response_content_type'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.produces : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\");\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"  <option value=\\\"\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\\">\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,depth0,{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</option>\\n\";\n},\"4\":function(container,depth0,helpers,partials,data) {\n    return \"  <option value=\\\"application/json\\\">application/json</option>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3=\"function\", alias4=container.escapeExpression;\n\n  return \"<label data-sw-translate for=\\\"\"\n    + alias4(((helper = (helper = helpers.responseContentTypeId || (depth0 != null ? depth0.responseContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{\"name\":\"responseContentTypeId\",\"hash\":{},\"data\":data}) : helper)))\n    + \"\\\">Response Content Type</label>\\n<select name=\\\"responseContentType\\\" id=\\\"\"\n    + alias4(((helper = (helper = helpers.responseContentTypeId || (depth0 != null ? depth0.responseContentTypeId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{\"name\":\"responseContentTypeId\",\"hash\":{},\"data\":data}) : helper)))\n    + \"\\\">\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.produces : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(4, data, 0),\"data\":data})) != null ? stack1 : \"\")\n    + \"</select>\\n\";\n},\"useData\":true});\ntemplates['signature'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"\\n<div>\\n<ul class=\\\"signature-nav\\\">\\n  <li><a class=\\\"description-link\\\" href=\\\"#\\\" data-sw-translate>Model</a></li>\\n  <li><a class=\\\"snippet-link\\\" href=\\\"#\\\" data-sw-translate>Example Value</a></li>\\n</ul>\\n<div>\\n\\n<div class=\\\"signature-container\\\">\\n  <div class=\\\"description\\\">\\n      \"\n    + container.escapeExpression((helpers.sanitize || (depth0 && depth0.sanitize) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.signature : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data}))\n    + \"\\n  </div>\\n\\n  <div class=\\\"snippet\\\">\\n\"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.sampleJSON : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(2, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.sampleXML : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(5, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"  </div>\\n</div>\\n\";\n},\"2\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"      <div class=\\\"snippet_json\\\">\\n        <pre><code>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.sampleJSON : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</code></pre>\\n        \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isParam : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n      </div>\\n\";\n},\"3\":function(container,depth0,helpers,partials,data) {\n    return \"<small class=\\\"notice\\\" data-sw-translate></small>\";\n},\"5\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {};\n\n  return \"    <div class=\\\"snippet_xml\\\">\\n      <pre><code>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(alias1,(depth0 != null ? depth0.sampleXML : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</code></pre>\\n      \"\n    + ((stack1 = helpers[\"if\"].call(alias1,(depth0 != null ? depth0.isParam : depth0),{\"name\":\"if\",\"hash\":{},\"fn\":container.program(3, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n    </div>\\n\";\n},\"7\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return \"    \"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.signature : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1;\n\n  return ((stack1 = (helpers.ifCond || (depth0 && depth0.ifCond) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.sampleJSON : depth0),\"||\",(depth0 != null ? depth0.sampleXML : depth0),{\"name\":\"ifCond\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.program(7, data, 0),\"data\":data})) != null ? stack1 : \"\");\n},\"useData\":true});\ntemplates['status_code'] = template({\"1\":function(container,depth0,helpers,partials,data) {\n    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"      <tr>\\n        <td>\"\n    + container.escapeExpression(((helper = (helper = helpers.key || (data && data.key)) != null ? helper : alias2),(typeof helper === \"function\" ? helper.call(alias1,{\"name\":\"key\",\"hash\":{},\"data\":data}) : helper)))\n    + \"</td>\\n        <td>\"\n    + ((stack1 = (helpers.sanitize || (depth0 && depth0.sanitize) || alias2).call(alias1,(depth0 != null ? depth0.description : depth0),{\"name\":\"sanitize\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n        <td>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.type : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n      </tr>\\n\";\n},\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n    var stack1, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing;\n\n  return \"<td width='15%' class='code'>\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.code : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td class=\\\"markdown\\\">\"\n    + ((stack1 = (helpers.escape || (depth0 && depth0.escape) || alias2).call(alias1,(depth0 != null ? depth0.message : depth0),{\"name\":\"escape\",\"hash\":{},\"data\":data})) != null ? stack1 : \"\")\n    + \"</td>\\n<td width='50%'><span class=\\\"model-signature\\\" /></td>\\n<td class=\\\"headers\\\">\\n  <table>\\n    <tbody>\\n\"\n    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.headers : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n    + \"    </tbody>\\n  </table>\\n</td>\";\n},\"useData\":true});\n})();} \n /* jshint ignore:end */","'use strict';\n\n\n$(function() {\n\n\t// Helper function for vertically aligning DOM elements\n\t// http://www.seodenver.com/simple-vertical-align-plugin-for-jquery/\n\t$.fn.vAlign = function() {\n\t\treturn this.each(function(){\n\t\t\tvar ah = $(this).height();\n\t\t\tvar ph = $(this).parent().height();\n\t\t\tvar mh = (ph - ah) / 2;\n\t\t\t$(this).css('margin-top', mh);\n\t\t});\n\t};\n\n\t$.fn.stretchFormtasticInputWidthToParent = function() {\n\t\treturn this.each(function(){\n\t\t\tvar p_width = $(this).closest(\"form\").innerWidth();\n\t\t\tvar p_padding = parseInt($(this).closest(\"form\").css('padding-left') ,10) + parseInt($(this).closest('form').css('padding-right'), 10);\n\t\t\tvar this_padding = parseInt($(this).css('padding-left'), 10) + parseInt($(this).css('padding-right'), 10);\n\t\t\t$(this).css('width', p_width - p_padding - this_padding);\n\t\t});\n\t};\n\n\t$('form.formtastic li.string input, form.formtastic textarea').stretchFormtasticInputWidthToParent();\n\n\t// Vertically center these paragraphs\n\t// Parent may need a min-height for this to work..\n\t$('ul.downplayed li div.content p').vAlign();\n\n\t// When a sandbox form is submitted..\n\t$(\"form.sandbox\").submit(function(){\n\n\t\tvar error_free = true;\n\n\t\t// Cycle through the forms required inputs\n \t\t$(this).find(\"input.required\").each(function() {\n\n\t\t\t// Remove any existing error styles from the input\n\t\t\t$(this).removeClass('error');\n\n\t\t\t// Tack the error style on if the input is empty..\n\t\t\tif ($(this).val() === '') {\n\t\t\t\t$(this).addClass('error');\n\t\t\t\t$(this).wiggle();\n\t\t\t\terror_free = false;\n\t\t\t}\n\n\t\t});\n\n\t\treturn error_free;\n\t});\n\n});\n\nfunction clippyCopiedCallback() {\n  $('#api_key_copied').fadeIn().delay(1000).fadeOut();\n\n  // var b = $(\"#clippy_tooltip_\" + a);\n  // b.length != 0 && (b.attr(\"title\", \"copied!\").trigger(\"tipsy.reload\"), setTimeout(function() {\n  //   b.attr(\"title\", \"copy to clipboard\")\n  // },\n  // 500))\n}\n\n// Logging function that accounts for browsers that don't have window.console\nfunction log(){\n  log.history = log.history || [];\n  log.history.push(arguments);\n  if(this.console){\n    console.log( Array.prototype.slice.call(arguments)[0] );\n  }\n}\n\n// Handle browsers that do console incorrectly (IE9 and below, see http://stackoverflow.com/a/5539378/7913)\nif (Function.prototype.bind && console && typeof console.log === \"object\") {\n    [\n      \"log\",\"info\",\"warn\",\"error\",\"assert\",\"dir\",\"clear\",\"profile\",\"profileEnd\"\n    ].forEach(function (method) {\n        console[method] = this.bind(console[method], console);\n    }, Function.prototype.call);\n}\n\nwindow.Docs = {\n\n\tshebang: function() {\n\n\t\t// If shebang has an operation nickname in it..\n\t\t// e.g. /docs/#!/words/get_search\n\t\tvar fragments = $.param.fragment().split('/');\n\t\tfragments.shift(); // get rid of the bang\n\n\t\tswitch (fragments.length) {\n\t\t\tcase 1:\n        if (fragments[0].length > 0) { // prevent matching \"#/\"\n          // Expand all operations for the resource and scroll to it\n          var dom_id = 'resource_' + fragments[0];\n\n          Docs.expandEndpointListForResource(fragments[0]);\n          $(\"#\"+dom_id).slideto({highlight: false});\n        }\n\t\t\t\tbreak;\n\t\t\tcase 2:\n\t\t\t\t// Refer to the endpoint DOM element, e.g. #words_get_search\n\n        // Expand Resource\n        Docs.expandEndpointListForResource(fragments[0]);\n        $(\"#\"+dom_id).slideto({highlight: false});\n\n            // Expand operation\n            var li_dom_id = fragments.join('_');\n            var li_content_dom_id = li_dom_id + \"_content\";\n\n\n            Docs.expandOperation($('#'+li_content_dom_id));\n            $('#'+li_dom_id).slideto({highlight: false});\n            break;\n\t\t}\n\t},\n\n\ttoggleEndpointListForResource: function(resource) {\n\t\tvar elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints');\n\t\tif (elem.is(':visible')) {\n\t\t\t$.bbq.pushState('#/', 2);\n\t\t\tDocs.collapseEndpointListForResource(resource);\n\t\t} else {\n            $.bbq.pushState('#/' + resource, 2);\n\t\t\tDocs.expandEndpointListForResource(resource);\n\t\t}\n\t},\n\n\t// Expand resource\n\texpandEndpointListForResource: function(resource) {\n\t\tvar resource = Docs.escapeResourceName(resource);\n\t\tif (resource == '') {\n\t\t\t$('.resource ul.endpoints').slideDown();\n\t\t\treturn;\n\t\t}\n\n\t\t$('li#resource_' + resource).addClass('active');\n\n\t\tvar elem = $('li#resource_' + resource + ' ul.endpoints');\n\t\telem.slideDown();\n\t},\n\n\t// Collapse resource and mark as explicitly closed\n\tcollapseEndpointListForResource: function(resource) {\n\t\tvar resource = Docs.escapeResourceName(resource);\n\t\tif (resource == '') {\n\t\t\t$('.resource ul.endpoints').slideUp();\n\t\t\treturn;\n\t\t}\n\n\t\t$('li#resource_' + resource).removeClass('active');\n\n\t\tvar elem = $('li#resource_' + resource + ' ul.endpoints');\n\t\telem.slideUp();\n\t},\n\n\texpandOperationsForResource: function(resource) {\n\t\t// Make sure the resource container is open..\n\t\tDocs.expandEndpointListForResource(resource);\n\n\t\tif (resource == '') {\n\t\t\t$('.resource ul.endpoints li.operation div.content').slideDown();\n\t\t\treturn;\n\t\t}\n\n\t\t$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {\n\t\t\tDocs.expandOperation($(this));\n\t\t});\n\t},\n\n\tcollapseOperationsForResource: function(resource) {\n\t\t// Make sure the resource container is open..\n\t\tDocs.expandEndpointListForResource(resource);\n\n\t\tif (resource == '') {\n\t\t\t$('.resource ul.endpoints li.operation div.content').slideUp();\n\t\t\treturn;\n\t\t}\n\n\t\t$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {\n\t\t\tDocs.collapseOperation($(this));\n\t\t});\n\t},\n\n\tescapeResourceName: function(resource) {\n\t\treturn resource.replace(/[!\"#$%&'()*+,.\\/:;<=>?@\\[\\\\\\]\\^`{|}~]/g, \"\\\\$&\");\n\t},\n\n\texpandOperation: function(elem) {\n\t\telem.slideDown();\n\t},\n\n\tcollapseOperation: function(elem) {\n\t\telem.slideUp();\n\t}\n};\n","/*!\n * https://github.com/es-shims/es5-shim\n * @license es5-shim Copyright 2009-2015 by contributors, MIT License\n * see https://github.com/es-shims/es5-shim/blob/master/LICENSE\n */\n\n// vim: ts=4 sts=4 sw=4 expandtab\n\n// Add semicolon to prevent IIFE from being passed as argument to concatenated code.\n;\n\n// UMD (Universal Module Definition)\n// see https://github.com/umdjs/umd/blob/master/templates/returnExports.js\n(function (root, factory) {\n    'use strict';\n\n    /* global define, exports, module */\n    if (typeof define === 'function' && define.amd) {\n        // AMD. Register as an anonymous module.\n        define(factory);\n    } else if (typeof exports === 'object') {\n        // Node. Does not work with strict CommonJS, but\n        // only CommonJS-like enviroments that support module.exports,\n        // like Node.\n        module.exports = factory();\n    } else {\n        // Browser globals (root is window)\n        root.returnExports = factory();\n    }\n}(this, function () {\n    /**\n     * Brings an environment as close to ECMAScript 5 compliance\n     * as is possible with the facilities of erstwhile engines.\n     *\n     * Annotated ES5: http://es5.github.com/ (specific links below)\n     * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf\n     * Required reading: http://javascriptweblog.wordpress.com/2011/12/05/extending-javascript-natives/\n     */\n\n    // Shortcut to an often accessed properties, in order to avoid multiple\n    // dereference that costs universally. This also holds a reference to known-good\n    // functions.\n    var $Array = Array;\n    var ArrayPrototype = $Array.prototype;\n    var $Object = Object;\n    var ObjectPrototype = $Object.prototype;\n    var $Function = Function;\n    var FunctionPrototype = $Function.prototype;\n    var $String = String;\n    var StringPrototype = $String.prototype;\n    var $Number = Number;\n    var NumberPrototype = $Number.prototype;\n    var array_slice = ArrayPrototype.slice;\n    var array_splice = ArrayPrototype.splice;\n    var array_push = ArrayPrototype.push;\n    var array_unshift = ArrayPrototype.unshift;\n    var array_concat = ArrayPrototype.concat;\n    var array_join = ArrayPrototype.join;\n    var call = FunctionPrototype.call;\n    var apply = FunctionPrototype.apply;\n    var max = Math.max;\n    var min = Math.min;\n\n    // Having a toString local variable name breaks in Opera so use to_string.\n    var to_string = ObjectPrototype.toString;\n\n    /* global Symbol */\n    /* eslint-disable one-var-declaration-per-line, no-redeclare, max-statements-per-line */\n    var hasToStringTag = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';\n    var isCallable; /* inlined from https://npmjs.com/is-callable */ var fnToStr = Function.prototype.toString, constructorRegex = /^\\s*class /, isES6ClassFn = function isES6ClassFn(value) { try { var fnStr = fnToStr.call(value); var singleStripped = fnStr.replace(/\\/\\/.*\\n/g, ''); var multiStripped = singleStripped.replace(/\\/\\*[.\\s\\S]*\\*\\//g, ''); var spaceStripped = multiStripped.replace(/\\n/mg, ' ').replace(/ {2}/g, ' '); return constructorRegex.test(spaceStripped); } catch (e) { return false; /* not a function */ } }, tryFunctionObject = function tryFunctionObject(value) { try { if (isES6ClassFn(value)) { return false; } fnToStr.call(value); return true; } catch (e) { return false; } }, fnClass = '[object Function]', genClass = '[object GeneratorFunction]', isCallable = function isCallable(value) { if (!value) { return false; } if (typeof value !== 'function' && typeof value !== 'object') { return false; } if (hasToStringTag) { return tryFunctionObject(value); } if (isES6ClassFn(value)) { return false; } var strClass = to_string.call(value); return strClass === fnClass || strClass === genClass; };\n\n    var isRegex; /* inlined from https://npmjs.com/is-regex */ var regexExec = RegExp.prototype.exec, tryRegexExec = function tryRegexExec(value) { try { regexExec.call(value); return true; } catch (e) { return false; } }, regexClass = '[object RegExp]'; isRegex = function isRegex(value) { if (typeof value !== 'object') { return false; } return hasToStringTag ? tryRegexExec(value) : to_string.call(value) === regexClass; };\n    var isString; /* inlined from https://npmjs.com/is-string */ var strValue = String.prototype.valueOf, tryStringObject = function tryStringObject(value) { try { strValue.call(value); return true; } catch (e) { return false; } }, stringClass = '[object String]'; isString = function isString(value) { if (typeof value === 'string') { return true; } if (typeof value !== 'object') { return false; } return hasToStringTag ? tryStringObject(value) : to_string.call(value) === stringClass; };\n    /* eslint-enable one-var-declaration-per-line, no-redeclare, max-statements-per-line */\n\n    /* inlined from http://npmjs.com/define-properties */\n    var supportsDescriptors = $Object.defineProperty && (function () {\n        try {\n            var obj = {};\n            $Object.defineProperty(obj, 'x', { enumerable: false, value: obj });\n            for (var _ in obj) { // jscs:ignore disallowUnusedVariables\n                return false;\n            }\n            return obj.x === obj;\n        } catch (e) { /* this is ES3 */\n            return false;\n        }\n    }());\n    var defineProperties = (function (has) {\n        // Define configurable, writable, and non-enumerable props\n        // if they don't exist.\n        var defineProperty;\n        if (supportsDescriptors) {\n            defineProperty = function (object, name, method, forceAssign) {\n                if (!forceAssign && (name in object)) {\n                    return;\n                }\n                $Object.defineProperty(object, name, {\n                    configurable: true,\n                    enumerable: false,\n                    writable: true,\n                    value: method\n                });\n            };\n        } else {\n            defineProperty = function (object, name, method, forceAssign) {\n                if (!forceAssign && (name in object)) {\n                    return;\n                }\n                object[name] = method;\n            };\n        }\n        return function defineProperties(object, map, forceAssign) {\n            for (var name in map) {\n                if (has.call(map, name)) {\n                    defineProperty(object, name, map[name], forceAssign);\n                }\n            }\n        };\n    }(ObjectPrototype.hasOwnProperty));\n\n    //\n    // Util\n    // ======\n    //\n\n    /* replaceable with https://npmjs.com/package/es-abstract /helpers/isPrimitive */\n    var isPrimitive = function isPrimitive(input) {\n        var type = typeof input;\n        return input === null || (type !== 'object' && type !== 'function');\n    };\n\n    var isActualNaN = $Number.isNaN || function isActualNaN(x) {\n        return x !== x;\n    };\n\n    var ES = {\n        // ES5 9.4\n        // http://es5.github.com/#x9.4\n        // http://jsperf.com/to-integer\n        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToInteger */\n        ToInteger: function ToInteger(num) {\n            var n = +num;\n            if (isActualNaN(n)) {\n                n = 0;\n            } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {\n                n = (n > 0 || -1) * Math.floor(Math.abs(n));\n            }\n            return n;\n        },\n\n        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToPrimitive */\n        ToPrimitive: function ToPrimitive(input) {\n            var val, valueOf, toStr;\n            if (isPrimitive(input)) {\n                return input;\n            }\n            valueOf = input.valueOf;\n            if (isCallable(valueOf)) {\n                val = valueOf.call(input);\n                if (isPrimitive(val)) {\n                    return val;\n                }\n            }\n            toStr = input.toString;\n            if (isCallable(toStr)) {\n                val = toStr.call(input);\n                if (isPrimitive(val)) {\n                    return val;\n                }\n            }\n            throw new TypeError();\n        },\n\n        // ES5 9.9\n        // http://es5.github.com/#x9.9\n        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToObject */\n        ToObject: function (o) {\n            if (o == null) { // this matches both null and undefined\n                throw new TypeError(\"can't convert \" + o + ' to object');\n            }\n            return $Object(o);\n        },\n\n        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToUint32 */\n        ToUint32: function ToUint32(x) {\n            return x >>> 0;\n        }\n    };\n\n    //\n    // Function\n    // ========\n    //\n\n    // ES-5 15.3.4.5\n    // http://es5.github.com/#x15.3.4.5\n\n    var Empty = function Empty() {};\n\n    defineProperties(FunctionPrototype, {\n        bind: function bind(that) { // .length is 1\n            // 1. Let Target be the this value.\n            var target = this;\n            // 2. If IsCallable(Target) is false, throw a TypeError exception.\n            if (!isCallable(target)) {\n                throw new TypeError('Function.prototype.bind called on incompatible ' + target);\n            }\n            // 3. Let A be a new (possibly empty) internal list of all of the\n            //   argument values provided after thisArg (arg1, arg2 etc), in order.\n            // XXX slicedArgs will stand in for \"A\" if used\n            var args = array_slice.call(arguments, 1); // for normal call\n            // 4. Let F be a new native ECMAScript object.\n            // 11. Set the [[Prototype]] internal property of F to the standard\n            //   built-in Function prototype object as specified in 15.3.3.1.\n            // 12. Set the [[Call]] internal property of F as described in\n            //   15.3.4.5.1.\n            // 13. Set the [[Construct]] internal property of F as described in\n            //   15.3.4.5.2.\n            // 14. Set the [[HasInstance]] internal property of F as described in\n            //   15.3.4.5.3.\n            var bound;\n            var binder = function () {\n\n                if (this instanceof bound) {\n                    // 15.3.4.5.2 [[Construct]]\n                    // When the [[Construct]] internal method of a function object,\n                    // F that was created using the bind function is called with a\n                    // list of arguments ExtraArgs, the following steps are taken:\n                    // 1. Let target be the value of F's [[TargetFunction]]\n                    //   internal property.\n                    // 2. If target has no [[Construct]] internal method, a\n                    //   TypeError exception is thrown.\n                    // 3. Let boundArgs be the value of F's [[BoundArgs]] internal\n                    //   property.\n                    // 4. Let args be a new list containing the same values as the\n                    //   list boundArgs in the same order followed by the same\n                    //   values as the list ExtraArgs in the same order.\n                    // 5. Return the result of calling the [[Construct]] internal\n                    //   method of target providing args as the arguments.\n\n                    var result = apply.call(\n                        target,\n                        this,\n                        array_concat.call(args, array_slice.call(arguments))\n                    );\n                    if ($Object(result) === result) {\n                        return result;\n                    }\n                    return this;\n\n                } else {\n                    // 15.3.4.5.1 [[Call]]\n                    // When the [[Call]] internal method of a function object, F,\n                    // which was created using the bind function is called with a\n                    // this value and a list of arguments ExtraArgs, the following\n                    // steps are taken:\n                    // 1. Let boundArgs be the value of F's [[BoundArgs]] internal\n                    //   property.\n                    // 2. Let boundThis be the value of F's [[BoundThis]] internal\n                    //   property.\n                    // 3. Let target be the value of F's [[TargetFunction]] internal\n                    //   property.\n                    // 4. Let args be a new list containing the same values as the\n                    //   list boundArgs in the same order followed by the same\n                    //   values as the list ExtraArgs in the same order.\n                    // 5. Return the result of calling the [[Call]] internal method\n                    //   of target providing boundThis as the this value and\n                    //   providing args as the arguments.\n\n                    // equiv: target.call(this, ...boundArgs, ...args)\n                    return apply.call(\n                        target,\n                        that,\n                        array_concat.call(args, array_slice.call(arguments))\n                    );\n\n                }\n\n            };\n\n            // 15. If the [[Class]] internal property of Target is \"Function\", then\n            //     a. Let L be the length property of Target minus the length of A.\n            //     b. Set the length own property of F to either 0 or L, whichever is\n            //       larger.\n            // 16. Else set the length own property of F to 0.\n\n            var boundLength = max(0, target.length - args.length);\n\n            // 17. Set the attributes of the length own property of F to the values\n            //   specified in 15.3.5.1.\n            var boundArgs = [];\n            for (var i = 0; i < boundLength; i++) {\n                array_push.call(boundArgs, '$' + i);\n            }\n\n            // XXX Build a dynamic function with desired amount of arguments is the only\n            // way to set the length property of a function.\n            // In environments where Content Security Policies enabled (Chrome extensions,\n            // for ex.) all use of eval or Function costructor throws an exception.\n            // However in all of these environments Function.prototype.bind exists\n            // and so this code will never be executed.\n            bound = $Function('binder', 'return function (' + array_join.call(boundArgs, ',') + '){ return binder.apply(this, arguments); }')(binder);\n\n            if (target.prototype) {\n                Empty.prototype = target.prototype;\n                bound.prototype = new Empty();\n                // Clean up dangling references.\n                Empty.prototype = null;\n            }\n\n            // TODO\n            // 18. Set the [[Extensible]] internal property of F to true.\n\n            // TODO\n            // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).\n            // 20. Call the [[DefineOwnProperty]] internal method of F with\n            //   arguments \"caller\", PropertyDescriptor {[[Get]]: thrower, [[Set]]:\n            //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and\n            //   false.\n            // 21. Call the [[DefineOwnProperty]] internal method of F with\n            //   arguments \"arguments\", PropertyDescriptor {[[Get]]: thrower,\n            //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},\n            //   and false.\n\n            // TODO\n            // NOTE Function objects created using Function.prototype.bind do not\n            // have a prototype property or the [[Code]], [[FormalParameters]], and\n            // [[Scope]] internal properties.\n            // XXX can't delete prototype in pure-js.\n\n            // 22. Return F.\n            return bound;\n        }\n    });\n\n    // _Please note: Shortcuts are defined after `Function.prototype.bind` as we\n    // use it in defining shortcuts.\n    var owns = call.bind(ObjectPrototype.hasOwnProperty);\n    var toStr = call.bind(ObjectPrototype.toString);\n    var arraySlice = call.bind(array_slice);\n    var arraySliceApply = apply.bind(array_slice);\n    var strSlice = call.bind(StringPrototype.slice);\n    var strSplit = call.bind(StringPrototype.split);\n    var strIndexOf = call.bind(StringPrototype.indexOf);\n    var pushCall = call.bind(array_push);\n    var isEnum = call.bind(ObjectPrototype.propertyIsEnumerable);\n    var arraySort = call.bind(ArrayPrototype.sort);\n\n    //\n    // Array\n    // =====\n    //\n\n    var isArray = $Array.isArray || function isArray(obj) {\n        return toStr(obj) === '[object Array]';\n    };\n\n    // ES5 15.4.4.12\n    // http://es5.github.com/#x15.4.4.13\n    // Return len+argCount.\n    // [bugfix, ielt8]\n    // IE < 8 bug: [].unshift(0) === undefined but should be \"1\"\n    var hasUnshiftReturnValueBug = [].unshift(0) !== 1;\n    defineProperties(ArrayPrototype, {\n        unshift: function () {\n            array_unshift.apply(this, arguments);\n            return this.length;\n        }\n    }, hasUnshiftReturnValueBug);\n\n    // ES5 15.4.3.2\n    // http://es5.github.com/#x15.4.3.2\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray\n    defineProperties($Array, { isArray: isArray });\n\n    // The IsCallable() check in the Array functions\n    // has been replaced with a strict check on the\n    // internal class of the object to trap cases where\n    // the provided function was actually a regular\n    // expression literal, which in V8 and\n    // JavaScriptCore is a typeof \"function\".  Only in\n    // V8 are regular expression literals permitted as\n    // reduce parameters, so it is desirable in the\n    // general case for the shim to match the more\n    // strict and common behavior of rejecting regular\n    // expressions.\n\n    // ES5 15.4.4.18\n    // http://es5.github.com/#x15.4.4.18\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach\n\n    // Check failure of by-index access of string characters (IE < 9)\n    // and failure of `0 in boxedString` (Rhino)\n    var boxedString = $Object('a');\n    var splitString = boxedString[0] !== 'a' || !(0 in boxedString);\n\n    var properlyBoxesContext = function properlyBoxed(method) {\n        // Check node 0.6.21 bug where third parameter is not boxed\n        var properlyBoxesNonStrict = true;\n        var properlyBoxesStrict = true;\n        var threwException = false;\n        if (method) {\n            try {\n                method.call('foo', function (_, __, context) {\n                    if (typeof context !== 'object') {\n                        properlyBoxesNonStrict = false;\n                    }\n                });\n\n                method.call([1], function () {\n                    'use strict';\n\n                    properlyBoxesStrict = typeof this === 'string';\n                }, 'x');\n            } catch (e) {\n                threwException = true;\n            }\n        }\n        return !!method && !threwException && properlyBoxesNonStrict && properlyBoxesStrict;\n    };\n\n    defineProperties(ArrayPrototype, {\n        forEach: function forEach(callbackfn/*, thisArg*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var i = -1;\n            var length = ES.ToUint32(self.length);\n            var T;\n            if (arguments.length > 1) {\n                T = arguments[1];\n            }\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.forEach callback must be a function');\n            }\n\n            while (++i < length) {\n                if (i in self) {\n                    // Invoke the callback function with call, passing arguments:\n                    // context, property value, property key, thisArg object\n                    if (typeof T === 'undefined') {\n                        callbackfn(self[i], i, object);\n                    } else {\n                        callbackfn.call(T, self[i], i, object);\n                    }\n                }\n            }\n        }\n    }, !properlyBoxesContext(ArrayPrototype.forEach));\n\n    // ES5 15.4.4.19\n    // http://es5.github.com/#x15.4.4.19\n    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map\n    defineProperties(ArrayPrototype, {\n        map: function map(callbackfn/*, thisArg*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n            var result = $Array(length);\n            var T;\n            if (arguments.length > 1) {\n                T = arguments[1];\n            }\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.map callback must be a function');\n            }\n\n            for (var i = 0; i < length; i++) {\n                if (i in self) {\n                    if (typeof T === 'undefined') {\n                        result[i] = callbackfn(self[i], i, object);\n                    } else {\n                        result[i] = callbackfn.call(T, self[i], i, object);\n                    }\n                }\n            }\n            return result;\n        }\n    }, !properlyBoxesContext(ArrayPrototype.map));\n\n    // ES5 15.4.4.20\n    // http://es5.github.com/#x15.4.4.20\n    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter\n    defineProperties(ArrayPrototype, {\n        filter: function filter(callbackfn/*, thisArg*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n            var result = [];\n            var value;\n            var T;\n            if (arguments.length > 1) {\n                T = arguments[1];\n            }\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.filter callback must be a function');\n            }\n\n            for (var i = 0; i < length; i++) {\n                if (i in self) {\n                    value = self[i];\n                    if (typeof T === 'undefined' ? callbackfn(value, i, object) : callbackfn.call(T, value, i, object)) {\n                        pushCall(result, value);\n                    }\n                }\n            }\n            return result;\n        }\n    }, !properlyBoxesContext(ArrayPrototype.filter));\n\n    // ES5 15.4.4.16\n    // http://es5.github.com/#x15.4.4.16\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every\n    defineProperties(ArrayPrototype, {\n        every: function every(callbackfn/*, thisArg*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n            var T;\n            if (arguments.length > 1) {\n                T = arguments[1];\n            }\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.every callback must be a function');\n            }\n\n            for (var i = 0; i < length; i++) {\n                if (i in self && !(typeof T === 'undefined' ? callbackfn(self[i], i, object) : callbackfn.call(T, self[i], i, object))) {\n                    return false;\n                }\n            }\n            return true;\n        }\n    }, !properlyBoxesContext(ArrayPrototype.every));\n\n    // ES5 15.4.4.17\n    // http://es5.github.com/#x15.4.4.17\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some\n    defineProperties(ArrayPrototype, {\n        some: function some(callbackfn/*, thisArg */) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n            var T;\n            if (arguments.length > 1) {\n                T = arguments[1];\n            }\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.some callback must be a function');\n            }\n\n            for (var i = 0; i < length; i++) {\n                if (i in self && (typeof T === 'undefined' ? callbackfn(self[i], i, object) : callbackfn.call(T, self[i], i, object))) {\n                    return true;\n                }\n            }\n            return false;\n        }\n    }, !properlyBoxesContext(ArrayPrototype.some));\n\n    // ES5 15.4.4.21\n    // http://es5.github.com/#x15.4.4.21\n    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce\n    var reduceCoercesToObject = false;\n    if (ArrayPrototype.reduce) {\n        reduceCoercesToObject = typeof ArrayPrototype.reduce.call('es5', function (_, __, ___, list) {\n            return list;\n        }) === 'object';\n    }\n    defineProperties(ArrayPrototype, {\n        reduce: function reduce(callbackfn/*, initialValue*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.reduce callback must be a function');\n            }\n\n            // no value to return if no initial value and an empty array\n            if (length === 0 && arguments.length === 1) {\n                throw new TypeError('reduce of empty array with no initial value');\n            }\n\n            var i = 0;\n            var result;\n            if (arguments.length >= 2) {\n                result = arguments[1];\n            } else {\n                do {\n                    if (i in self) {\n                        result = self[i++];\n                        break;\n                    }\n\n                    // if array contains no values, no initial value to return\n                    if (++i >= length) {\n                        throw new TypeError('reduce of empty array with no initial value');\n                    }\n                } while (true);\n            }\n\n            for (; i < length; i++) {\n                if (i in self) {\n                    result = callbackfn(result, self[i], i, object);\n                }\n            }\n\n            return result;\n        }\n    }, !reduceCoercesToObject);\n\n    // ES5 15.4.4.22\n    // http://es5.github.com/#x15.4.4.22\n    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight\n    var reduceRightCoercesToObject = false;\n    if (ArrayPrototype.reduceRight) {\n        reduceRightCoercesToObject = typeof ArrayPrototype.reduceRight.call('es5', function (_, __, ___, list) {\n            return list;\n        }) === 'object';\n    }\n    defineProperties(ArrayPrototype, {\n        reduceRight: function reduceRight(callbackfn/*, initial*/) {\n            var object = ES.ToObject(this);\n            var self = splitString && isString(this) ? strSplit(this, '') : object;\n            var length = ES.ToUint32(self.length);\n\n            // If no callback function or if callback is not a callable function\n            if (!isCallable(callbackfn)) {\n                throw new TypeError('Array.prototype.reduceRight callback must be a function');\n            }\n\n            // no value to return if no initial value, empty array\n            if (length === 0 && arguments.length === 1) {\n                throw new TypeError('reduceRight of empty array with no initial value');\n            }\n\n            var result;\n            var i = length - 1;\n            if (arguments.length >= 2) {\n                result = arguments[1];\n            } else {\n                do {\n                    if (i in self) {\n                        result = self[i--];\n                        break;\n                    }\n\n                    // if array contains no values, no initial value to return\n                    if (--i < 0) {\n                        throw new TypeError('reduceRight of empty array with no initial value');\n                    }\n                } while (true);\n            }\n\n            if (i < 0) {\n                return result;\n            }\n\n            do {\n                if (i in self) {\n                    result = callbackfn(result, self[i], i, object);\n                }\n            } while (i--);\n\n            return result;\n        }\n    }, !reduceRightCoercesToObject);\n\n    // ES5 15.4.4.14\n    // http://es5.github.com/#x15.4.4.14\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf\n    var hasFirefox2IndexOfBug = ArrayPrototype.indexOf && [0, 1].indexOf(1, 2) !== -1;\n    defineProperties(ArrayPrototype, {\n        indexOf: function indexOf(searchElement/*, fromIndex */) {\n            var self = splitString && isString(this) ? strSplit(this, '') : ES.ToObject(this);\n            var length = ES.ToUint32(self.length);\n\n            if (length === 0) {\n                return -1;\n            }\n\n            var i = 0;\n            if (arguments.length > 1) {\n                i = ES.ToInteger(arguments[1]);\n            }\n\n            // handle negative indices\n            i = i >= 0 ? i : max(0, length + i);\n            for (; i < length; i++) {\n                if (i in self && self[i] === searchElement) {\n                    return i;\n                }\n            }\n            return -1;\n        }\n    }, hasFirefox2IndexOfBug);\n\n    // ES5 15.4.4.15\n    // http://es5.github.com/#x15.4.4.15\n    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf\n    var hasFirefox2LastIndexOfBug = ArrayPrototype.lastIndexOf && [0, 1].lastIndexOf(0, -3) !== -1;\n    defineProperties(ArrayPrototype, {\n        lastIndexOf: function lastIndexOf(searchElement/*, fromIndex */) {\n            var self = splitString && isString(this) ? strSplit(this, '') : ES.ToObject(this);\n            var length = ES.ToUint32(self.length);\n\n            if (length === 0) {\n                return -1;\n            }\n            var i = length - 1;\n            if (arguments.length > 1) {\n                i = min(i, ES.ToInteger(arguments[1]));\n            }\n            // handle negative indices\n            i = i >= 0 ? i : length - Math.abs(i);\n            for (; i >= 0; i--) {\n                if (i in self && searchElement === self[i]) {\n                    return i;\n                }\n            }\n            return -1;\n        }\n    }, hasFirefox2LastIndexOfBug);\n\n    // ES5 15.4.4.12\n    // http://es5.github.com/#x15.4.4.12\n    var spliceNoopReturnsEmptyArray = (function () {\n        var a = [1, 2];\n        var result = a.splice();\n        return a.length === 2 && isArray(result) && result.length === 0;\n    }());\n    defineProperties(ArrayPrototype, {\n        // Safari 5.0 bug where .splice() returns undefined\n        splice: function splice(start, deleteCount) {\n            if (arguments.length === 0) {\n                return [];\n            } else {\n                return array_splice.apply(this, arguments);\n            }\n        }\n    }, !spliceNoopReturnsEmptyArray);\n\n    var spliceWorksWithEmptyObject = (function () {\n        var obj = {};\n        ArrayPrototype.splice.call(obj, 0, 0, 1);\n        return obj.length === 1;\n    }());\n    defineProperties(ArrayPrototype, {\n        splice: function splice(start, deleteCount) {\n            if (arguments.length === 0) {\n                return [];\n            }\n            var args = arguments;\n            this.length = max(ES.ToInteger(this.length), 0);\n            if (arguments.length > 0 && typeof deleteCount !== 'number') {\n                args = arraySlice(arguments);\n                if (args.length < 2) {\n                    pushCall(args, this.length - start);\n                } else {\n                    args[1] = ES.ToInteger(deleteCount);\n                }\n            }\n            return array_splice.apply(this, args);\n        }\n    }, !spliceWorksWithEmptyObject);\n    var spliceWorksWithLargeSparseArrays = (function () {\n        // Per https://github.com/es-shims/es5-shim/issues/295\n        // Safari 7/8 breaks with sparse arrays of size 1e5 or greater\n        var arr = new $Array(1e5);\n        // note: the index MUST be 8 or larger or the test will false pass\n        arr[8] = 'x';\n        arr.splice(1, 1);\n        // note: this test must be defined *after* the indexOf shim\n        // per https://github.com/es-shims/es5-shim/issues/313\n        return arr.indexOf('x') === 7;\n    }());\n    var spliceWorksWithSmallSparseArrays = (function () {\n        // Per https://github.com/es-shims/es5-shim/issues/295\n        // Opera 12.15 breaks on this, no idea why.\n        var n = 256;\n        var arr = [];\n        arr[n] = 'a';\n        arr.splice(n + 1, 0, 'b');\n        return arr[n] === 'a';\n    }());\n    defineProperties(ArrayPrototype, {\n        splice: function splice(start, deleteCount) {\n            var O = ES.ToObject(this);\n            var A = [];\n            var len = ES.ToUint32(O.length);\n            var relativeStart = ES.ToInteger(start);\n            var actualStart = relativeStart < 0 ? max((len + relativeStart), 0) : min(relativeStart, len);\n            var actualDeleteCount = min(max(ES.ToInteger(deleteCount), 0), len - actualStart);\n\n            var k = 0;\n            var from;\n            while (k < actualDeleteCount) {\n                from = $String(actualStart + k);\n                if (owns(O, from)) {\n                    A[k] = O[from];\n                }\n                k += 1;\n            }\n\n            var items = arraySlice(arguments, 2);\n            var itemCount = items.length;\n            var to;\n            if (itemCount < actualDeleteCount) {\n                k = actualStart;\n                var maxK = len - actualDeleteCount;\n                while (k < maxK) {\n                    from = $String(k + actualDeleteCount);\n                    to = $String(k + itemCount);\n                    if (owns(O, from)) {\n                        O[to] = O[from];\n                    } else {\n                        delete O[to];\n                    }\n                    k += 1;\n                }\n                k = len;\n                var minK = len - actualDeleteCount + itemCount;\n                while (k > minK) {\n                    delete O[k - 1];\n                    k -= 1;\n                }\n            } else if (itemCount > actualDeleteCount) {\n                k = len - actualDeleteCount;\n                while (k > actualStart) {\n                    from = $String(k + actualDeleteCount - 1);\n                    to = $String(k + itemCount - 1);\n                    if (owns(O, from)) {\n                        O[to] = O[from];\n                    } else {\n                        delete O[to];\n                    }\n                    k -= 1;\n                }\n            }\n            k = actualStart;\n            for (var i = 0; i < items.length; ++i) {\n                O[k] = items[i];\n                k += 1;\n            }\n            O.length = len - actualDeleteCount + itemCount;\n\n            return A;\n        }\n    }, !spliceWorksWithLargeSparseArrays || !spliceWorksWithSmallSparseArrays);\n\n    var originalJoin = ArrayPrototype.join;\n    var hasStringJoinBug;\n    try {\n        hasStringJoinBug = Array.prototype.join.call('123', ',') !== '1,2,3';\n    } catch (e) {\n        hasStringJoinBug = true;\n    }\n    if (hasStringJoinBug) {\n        defineProperties(ArrayPrototype, {\n            join: function join(separator) {\n                var sep = typeof separator === 'undefined' ? ',' : separator;\n                return originalJoin.call(isString(this) ? strSplit(this, '') : this, sep);\n            }\n        }, hasStringJoinBug);\n    }\n\n    var hasJoinUndefinedBug = [1, 2].join(undefined) !== '1,2';\n    if (hasJoinUndefinedBug) {\n        defineProperties(ArrayPrototype, {\n            join: function join(separator) {\n                var sep = typeof separator === 'undefined' ? ',' : separator;\n                return originalJoin.call(this, sep);\n            }\n        }, hasJoinUndefinedBug);\n    }\n\n    var pushShim = function push(item) {\n        var O = ES.ToObject(this);\n        var n = ES.ToUint32(O.length);\n        var i = 0;\n        while (i < arguments.length) {\n            O[n + i] = arguments[i];\n            i += 1;\n        }\n        O.length = n + i;\n        return n + i;\n    };\n\n    var pushIsNotGeneric = (function () {\n        var obj = {};\n        var result = Array.prototype.push.call(obj, undefined);\n        return result !== 1 || obj.length !== 1 || typeof obj[0] !== 'undefined' || !owns(obj, 0);\n    }());\n    defineProperties(ArrayPrototype, {\n        push: function push(item) {\n            if (isArray(this)) {\n                return array_push.apply(this, arguments);\n            }\n            return pushShim.apply(this, arguments);\n        }\n    }, pushIsNotGeneric);\n\n    // This fixes a very weird bug in Opera 10.6 when pushing `undefined\n    var pushUndefinedIsWeird = (function () {\n        var arr = [];\n        var result = arr.push(undefined);\n        return result !== 1 || arr.length !== 1 || typeof arr[0] !== 'undefined' || !owns(arr, 0);\n    }());\n    defineProperties(ArrayPrototype, { push: pushShim }, pushUndefinedIsWeird);\n\n    // ES5 15.2.3.14\n    // http://es5.github.io/#x15.4.4.10\n    // Fix boxed string bug\n    defineProperties(ArrayPrototype, {\n        slice: function (start, end) {\n            var arr = isString(this) ? strSplit(this, '') : this;\n            return arraySliceApply(arr, arguments);\n        }\n    }, splitString);\n\n    var sortIgnoresNonFunctions = (function () {\n        try {\n            [1, 2].sort(null);\n            [1, 2].sort({});\n            return true;\n        } catch (e) {}\n        return false;\n    }());\n    var sortThrowsOnRegex = (function () {\n        // this is a problem in Firefox 4, in which `typeof /a/ === 'function'`\n        try {\n            [1, 2].sort(/a/);\n            return false;\n        } catch (e) {}\n        return true;\n    }());\n    var sortIgnoresUndefined = (function () {\n        // applies in IE 8, for one.\n        try {\n            [1, 2].sort(undefined);\n            return true;\n        } catch (e) {}\n        return false;\n    }());\n    defineProperties(ArrayPrototype, {\n        sort: function sort(compareFn) {\n            if (typeof compareFn === 'undefined') {\n                return arraySort(this);\n            }\n            if (!isCallable(compareFn)) {\n                throw new TypeError('Array.prototype.sort callback must be a function');\n            }\n            return arraySort(this, compareFn);\n        }\n    }, sortIgnoresNonFunctions || !sortIgnoresUndefined || !sortThrowsOnRegex);\n\n    //\n    // Object\n    // ======\n    //\n\n    // ES5 15.2.3.14\n    // http://es5.github.com/#x15.2.3.14\n\n    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation\n    var hasDontEnumBug = !isEnum({ 'toString': null }, 'toString');\n    var hasProtoEnumBug = isEnum(function () {}, 'prototype');\n    var hasStringEnumBug = !owns('x', '0');\n    var equalsConstructorPrototype = function (o) {\n        var ctor = o.constructor;\n        return ctor && ctor.prototype === o;\n    };\n    var blacklistedKeys = {\n        $window: true,\n        $console: true,\n        $parent: true,\n        $self: true,\n        $frame: true,\n        $frames: true,\n        $frameElement: true,\n        $webkitIndexedDB: true,\n        $webkitStorageInfo: true,\n        $external: true\n    };\n    var hasAutomationEqualityBug = (function () {\n        /* globals window */\n        if (typeof window === 'undefined') {\n            return false;\n        }\n        for (var k in window) {\n            try {\n                if (!blacklistedKeys['$' + k] && owns(window, k) && window[k] !== null && typeof window[k] === 'object') {\n                    equalsConstructorPrototype(window[k]);\n                }\n            } catch (e) {\n                return true;\n            }\n        }\n        return false;\n    }());\n    var equalsConstructorPrototypeIfNotBuggy = function (object) {\n        if (typeof window === 'undefined' || !hasAutomationEqualityBug) {\n            return equalsConstructorPrototype(object);\n        }\n        try {\n            return equalsConstructorPrototype(object);\n        } catch (e) {\n            return false;\n        }\n    };\n    var dontEnums = [\n        'toString',\n        'toLocaleString',\n        'valueOf',\n        'hasOwnProperty',\n        'isPrototypeOf',\n        'propertyIsEnumerable',\n        'constructor'\n    ];\n    var dontEnumsLength = dontEnums.length;\n\n    // taken directly from https://github.com/ljharb/is-arguments/blob/master/index.js\n    // can be replaced with require('is-arguments') if we ever use a build process instead\n    var isStandardArguments = function isArguments(value) {\n        return toStr(value) === '[object Arguments]';\n    };\n    var isLegacyArguments = function isArguments(value) {\n        return value !== null &&\n            typeof value === 'object' &&\n            typeof value.length === 'number' &&\n            value.length >= 0 &&\n            !isArray(value) &&\n            isCallable(value.callee);\n    };\n    var isArguments = isStandardArguments(arguments) ? isStandardArguments : isLegacyArguments;\n\n    defineProperties($Object, {\n        keys: function keys(object) {\n            var isFn = isCallable(object);\n            var isArgs = isArguments(object);\n            var isObject = object !== null && typeof object === 'object';\n            var isStr = isObject && isString(object);\n\n            if (!isObject && !isFn && !isArgs) {\n                throw new TypeError('Object.keys called on a non-object');\n            }\n\n            var theKeys = [];\n            var skipProto = hasProtoEnumBug && isFn;\n            if ((isStr && hasStringEnumBug) || isArgs) {\n                for (var i = 0; i < object.length; ++i) {\n                    pushCall(theKeys, $String(i));\n                }\n            }\n\n            if (!isArgs) {\n                for (var name in object) {\n                    if (!(skipProto && name === 'prototype') && owns(object, name)) {\n                        pushCall(theKeys, $String(name));\n                    }\n                }\n            }\n\n            if (hasDontEnumBug) {\n                var skipConstructor = equalsConstructorPrototypeIfNotBuggy(object);\n                for (var j = 0; j < dontEnumsLength; j++) {\n                    var dontEnum = dontEnums[j];\n                    if (!(skipConstructor && dontEnum === 'constructor') && owns(object, dontEnum)) {\n                        pushCall(theKeys, dontEnum);\n                    }\n                }\n            }\n            return theKeys;\n        }\n    });\n\n    var keysWorksWithArguments = $Object.keys && (function () {\n        // Safari 5.0 bug\n        return $Object.keys(arguments).length === 2;\n    }(1, 2));\n    var keysHasArgumentsLengthBug = $Object.keys && (function () {\n        var argKeys = $Object.keys(arguments);\n        return arguments.length !== 1 || argKeys.length !== 1 || argKeys[0] !== 1;\n    }(1));\n    var originalKeys = $Object.keys;\n    defineProperties($Object, {\n        keys: function keys(object) {\n            if (isArguments(object)) {\n                return originalKeys(arraySlice(object));\n            } else {\n                return originalKeys(object);\n            }\n        }\n    }, !keysWorksWithArguments || keysHasArgumentsLengthBug);\n\n    //\n    // Date\n    // ====\n    //\n\n    var hasNegativeMonthYearBug = new Date(-3509827329600292).getUTCMonth() !== 0;\n    var aNegativeTestDate = new Date(-1509842289600292);\n    var aPositiveTestDate = new Date(1449662400000);\n    var hasToUTCStringFormatBug = aNegativeTestDate.toUTCString() !== 'Mon, 01 Jan -45875 11:59:59 GMT';\n    var hasToDateStringFormatBug;\n    var hasToStringFormatBug;\n    var timeZoneOffset = aNegativeTestDate.getTimezoneOffset();\n    if (timeZoneOffset < -720) {\n        hasToDateStringFormatBug = aNegativeTestDate.toDateString() !== 'Tue Jan 02 -45875';\n        hasToStringFormatBug = !(/^Thu Dec 10 2015 \\d\\d:\\d\\d:\\d\\d GMT[-\\+]\\d\\d\\d\\d(?: |$)/).test(aPositiveTestDate.toString());\n    } else {\n        hasToDateStringFormatBug = aNegativeTestDate.toDateString() !== 'Mon Jan 01 -45875';\n        hasToStringFormatBug = !(/^Wed Dec 09 2015 \\d\\d:\\d\\d:\\d\\d GMT[-\\+]\\d\\d\\d\\d(?: |$)/).test(aPositiveTestDate.toString());\n    }\n\n    var originalGetFullYear = call.bind(Date.prototype.getFullYear);\n    var originalGetMonth = call.bind(Date.prototype.getMonth);\n    var originalGetDate = call.bind(Date.prototype.getDate);\n    var originalGetUTCFullYear = call.bind(Date.prototype.getUTCFullYear);\n    var originalGetUTCMonth = call.bind(Date.prototype.getUTCMonth);\n    var originalGetUTCDate = call.bind(Date.prototype.getUTCDate);\n    var originalGetUTCDay = call.bind(Date.prototype.getUTCDay);\n    var originalGetUTCHours = call.bind(Date.prototype.getUTCHours);\n    var originalGetUTCMinutes = call.bind(Date.prototype.getUTCMinutes);\n    var originalGetUTCSeconds = call.bind(Date.prototype.getUTCSeconds);\n    var originalGetUTCMilliseconds = call.bind(Date.prototype.getUTCMilliseconds);\n    var dayName = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];\n    var monthName = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];\n    var daysInMonth = function daysInMonth(month, year) {\n        return originalGetDate(new Date(year, month, 0));\n    };\n\n    defineProperties(Date.prototype, {\n        getFullYear: function getFullYear() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetFullYear(this);\n            if (year < 0 && originalGetMonth(this) > 11) {\n                return year + 1;\n            }\n            return year;\n        },\n        getMonth: function getMonth() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetFullYear(this);\n            var month = originalGetMonth(this);\n            if (year < 0 && month > 11) {\n                return 0;\n            }\n            return month;\n        },\n        getDate: function getDate() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetFullYear(this);\n            var month = originalGetMonth(this);\n            var date = originalGetDate(this);\n            if (year < 0 && month > 11) {\n                if (month === 12) {\n                    return date;\n                }\n                var days = daysInMonth(0, year + 1);\n                return (days - date) + 1;\n            }\n            return date;\n        },\n        getUTCFullYear: function getUTCFullYear() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetUTCFullYear(this);\n            if (year < 0 && originalGetUTCMonth(this) > 11) {\n                return year + 1;\n            }\n            return year;\n        },\n        getUTCMonth: function getUTCMonth() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetUTCFullYear(this);\n            var month = originalGetUTCMonth(this);\n            if (year < 0 && month > 11) {\n                return 0;\n            }\n            return month;\n        },\n        getUTCDate: function getUTCDate() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var year = originalGetUTCFullYear(this);\n            var month = originalGetUTCMonth(this);\n            var date = originalGetUTCDate(this);\n            if (year < 0 && month > 11) {\n                if (month === 12) {\n                    return date;\n                }\n                var days = daysInMonth(0, year + 1);\n                return (days - date) + 1;\n            }\n            return date;\n        }\n    }, hasNegativeMonthYearBug);\n\n    defineProperties(Date.prototype, {\n        toUTCString: function toUTCString() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var day = originalGetUTCDay(this);\n            var date = originalGetUTCDate(this);\n            var month = originalGetUTCMonth(this);\n            var year = originalGetUTCFullYear(this);\n            var hour = originalGetUTCHours(this);\n            var minute = originalGetUTCMinutes(this);\n            var second = originalGetUTCSeconds(this);\n            return dayName[day] + ', ' +\n                (date < 10 ? '0' + date : date) + ' ' +\n                monthName[month] + ' ' +\n                year + ' ' +\n                (hour < 10 ? '0' + hour : hour) + ':' +\n                (minute < 10 ? '0' + minute : minute) + ':' +\n                (second < 10 ? '0' + second : second) + ' GMT';\n        }\n    }, hasNegativeMonthYearBug || hasToUTCStringFormatBug);\n\n    // Opera 12 has `,`\n    defineProperties(Date.prototype, {\n        toDateString: function toDateString() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var day = this.getDay();\n            var date = this.getDate();\n            var month = this.getMonth();\n            var year = this.getFullYear();\n            return dayName[day] + ' ' +\n                monthName[month] + ' ' +\n                (date < 10 ? '0' + date : date) + ' ' +\n                year;\n        }\n    }, hasNegativeMonthYearBug || hasToDateStringFormatBug);\n\n    // can't use defineProperties here because of toString enumeration issue in IE <= 8\n    if (hasNegativeMonthYearBug || hasToStringFormatBug) {\n        Date.prototype.toString = function toString() {\n            if (!this || !(this instanceof Date)) {\n                throw new TypeError('this is not a Date object.');\n            }\n            var day = this.getDay();\n            var date = this.getDate();\n            var month = this.getMonth();\n            var year = this.getFullYear();\n            var hour = this.getHours();\n            var minute = this.getMinutes();\n            var second = this.getSeconds();\n            var timezoneOffset = this.getTimezoneOffset();\n            var hoursOffset = Math.floor(Math.abs(timezoneOffset) / 60);\n            var minutesOffset = Math.floor(Math.abs(timezoneOffset) % 60);\n            return dayName[day] + ' ' +\n                monthName[month] + ' ' +\n                (date < 10 ? '0' + date : date) + ' ' +\n                year + ' ' +\n                (hour < 10 ? '0' + hour : hour) + ':' +\n                (minute < 10 ? '0' + minute : minute) + ':' +\n                (second < 10 ? '0' + second : second) + ' GMT' +\n                (timezoneOffset > 0 ? '-' : '+') +\n                (hoursOffset < 10 ? '0' + hoursOffset : hoursOffset) +\n                (minutesOffset < 10 ? '0' + minutesOffset : minutesOffset);\n        };\n        if (supportsDescriptors) {\n            $Object.defineProperty(Date.prototype, 'toString', {\n                configurable: true,\n                enumerable: false,\n                writable: true\n            });\n        }\n    }\n\n    // ES5 15.9.5.43\n    // http://es5.github.com/#x15.9.5.43\n    // This function returns a String value represent the instance in time\n    // represented by this Date object. The format of the String is the Date Time\n    // string format defined in 15.9.1.15. All fields are present in the String.\n    // The time zone is always UTC, denoted by the suffix Z. If the time value of\n    // this object is not a finite Number a RangeError exception is thrown.\n    var negativeDate = -62198755200000;\n    var negativeYearString = '-000001';\n    var hasNegativeDateBug = Date.prototype.toISOString && new Date(negativeDate).toISOString().indexOf(negativeYearString) === -1;\n    var hasSafari51DateBug = Date.prototype.toISOString && new Date(-1).toISOString() !== '1969-12-31T23:59:59.999Z';\n\n    var getTime = call.bind(Date.prototype.getTime);\n\n    defineProperties(Date.prototype, {\n        toISOString: function toISOString() {\n            if (!isFinite(this) || !isFinite(getTime(this))) {\n                // Adope Photoshop requires the second check.\n                throw new RangeError('Date.prototype.toISOString called on non-finite value.');\n            }\n\n            var year = originalGetUTCFullYear(this);\n\n            var month = originalGetUTCMonth(this);\n            // see https://github.com/es-shims/es5-shim/issues/111\n            year += Math.floor(month / 12);\n            month = (month % 12 + 12) % 12;\n\n            // the date time string format is specified in 15.9.1.15.\n            var result = [month + 1, originalGetUTCDate(this), originalGetUTCHours(this), originalGetUTCMinutes(this), originalGetUTCSeconds(this)];\n            year = (\n                (year < 0 ? '-' : (year > 9999 ? '+' : '')) +\n                strSlice('00000' + Math.abs(year), (0 <= year && year <= 9999) ? -4 : -6)\n            );\n\n            for (var i = 0; i < result.length; ++i) {\n                // pad months, days, hours, minutes, and seconds to have two digits.\n                result[i] = strSlice('00' + result[i], -2);\n            }\n            // pad milliseconds to have three digits.\n            return (\n                year + '-' + arraySlice(result, 0, 2).join('-') +\n                'T' + arraySlice(result, 2).join(':') + '.' +\n                strSlice('000' + originalGetUTCMilliseconds(this), -3) + 'Z'\n            );\n        }\n    }, hasNegativeDateBug || hasSafari51DateBug);\n\n    // ES5 15.9.5.44\n    // http://es5.github.com/#x15.9.5.44\n    // This function provides a String representation of a Date object for use by\n    // JSON.stringify (15.12.3).\n    var dateToJSONIsSupported = (function () {\n        try {\n            return Date.prototype.toJSON &&\n                new Date(NaN).toJSON() === null &&\n                new Date(negativeDate).toJSON().indexOf(negativeYearString) !== -1 &&\n                Date.prototype.toJSON.call({ // generic\n                    toISOString: function () { return true; }\n                });\n        } catch (e) {\n            return false;\n        }\n    }());\n    if (!dateToJSONIsSupported) {\n        Date.prototype.toJSON = function toJSON(key) {\n            // When the toJSON method is called with argument key, the following\n            // steps are taken:\n\n            // 1.  Let O be the result of calling ToObject, giving it the this\n            // value as its argument.\n            // 2. Let tv be ES.ToPrimitive(O, hint Number).\n            var O = $Object(this);\n            var tv = ES.ToPrimitive(O);\n            // 3. If tv is a Number and is not finite, return null.\n            if (typeof tv === 'number' && !isFinite(tv)) {\n                return null;\n            }\n            // 4. Let toISO be the result of calling the [[Get]] internal method of\n            // O with argument \"toISOString\".\n            var toISO = O.toISOString;\n            // 5. If IsCallable(toISO) is false, throw a TypeError exception.\n            if (!isCallable(toISO)) {\n                throw new TypeError('toISOString property is not callable');\n            }\n            // 6. Return the result of calling the [[Call]] internal method of\n            //  toISO with O as the this value and an empty argument list.\n            return toISO.call(O);\n\n            // NOTE 1 The argument is ignored.\n\n            // NOTE 2 The toJSON function is intentionally generic; it does not\n            // require that its this value be a Date object. Therefore, it can be\n            // transferred to other kinds of objects for use as a method. However,\n            // it does require that any such object have a toISOString method. An\n            // object is free to use the argument key to filter its\n            // stringification.\n        };\n    }\n\n    // ES5 15.9.4.2\n    // http://es5.github.com/#x15.9.4.2\n    // based on work shared by Daniel Friesen (dantman)\n    // http://gist.github.com/303249\n    var supportsExtendedYears = Date.parse('+033658-09-27T01:46:40.000Z') === 1e15;\n    var acceptsInvalidDates = !isNaN(Date.parse('2012-04-04T24:00:00.500Z')) || !isNaN(Date.parse('2012-11-31T23:59:59.000Z')) || !isNaN(Date.parse('2012-12-31T23:59:60.000Z'));\n    var doesNotParseY2KNewYear = isNaN(Date.parse('2000-01-01T00:00:00.000Z'));\n    if (doesNotParseY2KNewYear || acceptsInvalidDates || !supportsExtendedYears) {\n        // XXX global assignment won't work in embeddings that use\n        // an alternate object for the context.\n        /* global Date: true */\n        /* eslint-disable no-undef */\n        var maxSafeUnsigned32Bit = Math.pow(2, 31) - 1;\n        var hasSafariSignedIntBug = isActualNaN(new Date(1970, 0, 1, 0, 0, 0, maxSafeUnsigned32Bit + 1).getTime());\n        /* eslint-disable no-implicit-globals */\n        Date = (function (NativeDate) {\n        /* eslint-enable no-implicit-globals */\n        /* eslint-enable no-undef */\n            // Date.length === 7\n            var DateShim = function Date(Y, M, D, h, m, s, ms) {\n                var length = arguments.length;\n                var date;\n                if (this instanceof NativeDate) {\n                    var seconds = s;\n                    var millis = ms;\n                    if (hasSafariSignedIntBug && length >= 7 && ms > maxSafeUnsigned32Bit) {\n                        // work around a Safari 8/9 bug where it treats the seconds as signed\n                        var msToShift = Math.floor(ms / maxSafeUnsigned32Bit) * maxSafeUnsigned32Bit;\n                        var sToShift = Math.floor(msToShift / 1e3);\n                        seconds += sToShift;\n                        millis -= sToShift * 1e3;\n                    }\n                    date = length === 1 && $String(Y) === Y ? // isString(Y)\n                        // We explicitly pass it through parse:\n                        new NativeDate(DateShim.parse(Y)) :\n                        // We have to manually make calls depending on argument\n                        // length here\n                        length >= 7 ? new NativeDate(Y, M, D, h, m, seconds, millis) :\n                        length >= 6 ? new NativeDate(Y, M, D, h, m, seconds) :\n                        length >= 5 ? new NativeDate(Y, M, D, h, m) :\n                        length >= 4 ? new NativeDate(Y, M, D, h) :\n                        length >= 3 ? new NativeDate(Y, M, D) :\n                        length >= 2 ? new NativeDate(Y, M) :\n                        length >= 1 ? new NativeDate(Y instanceof NativeDate ? +Y : Y) :\n                                      new NativeDate();\n                } else {\n                    date = NativeDate.apply(this, arguments);\n                }\n                if (!isPrimitive(date)) {\n                    // Prevent mixups with unfixed Date object\n                    defineProperties(date, { constructor: DateShim }, true);\n                }\n                return date;\n            };\n\n            // 15.9.1.15 Date Time String Format.\n            var isoDateExpression = new RegExp('^' +\n                '(\\\\d{4}|[+-]\\\\d{6})' + // four-digit year capture or sign +\n                                          // 6-digit extended year\n                '(?:-(\\\\d{2})' + // optional month capture\n                '(?:-(\\\\d{2})' + // optional day capture\n                '(?:' + // capture hours:minutes:seconds.milliseconds\n                    'T(\\\\d{2})' + // hours capture\n                    ':(\\\\d{2})' + // minutes capture\n                    '(?:' + // optional :seconds.milliseconds\n                        ':(\\\\d{2})' + // seconds capture\n                        '(?:(\\\\.\\\\d{1,}))?' + // milliseconds capture\n                    ')?' +\n                '(' + // capture UTC offset component\n                    'Z|' + // UTC capture\n                    '(?:' + // offset specifier +/-hours:minutes\n                        '([-+])' + // sign capture\n                        '(\\\\d{2})' + // hours offset capture\n                        ':(\\\\d{2})' + // minutes offset capture\n                    ')' +\n                ')?)?)?)?' +\n            '$');\n\n            var months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365];\n\n            var dayFromMonth = function dayFromMonth(year, month) {\n                var t = month > 1 ? 1 : 0;\n                return (\n                    months[month] +\n                    Math.floor((year - 1969 + t) / 4) -\n                    Math.floor((year - 1901 + t) / 100) +\n                    Math.floor((year - 1601 + t) / 400) +\n                    365 * (year - 1970)\n                );\n            };\n\n            var toUTC = function toUTC(t) {\n                var s = 0;\n                var ms = t;\n                if (hasSafariSignedIntBug && ms > maxSafeUnsigned32Bit) {\n                    // work around a Safari 8/9 bug where it treats the seconds as signed\n                    var msToShift = Math.floor(ms / maxSafeUnsigned32Bit) * maxSafeUnsigned32Bit;\n                    var sToShift = Math.floor(msToShift / 1e3);\n                    s += sToShift;\n                    ms -= sToShift * 1e3;\n                }\n                return $Number(new NativeDate(1970, 0, 1, 0, 0, s, ms));\n            };\n\n            // Copy any custom methods a 3rd party library may have added\n            for (var key in NativeDate) {\n                if (owns(NativeDate, key)) {\n                    DateShim[key] = NativeDate[key];\n                }\n            }\n\n            // Copy \"native\" methods explicitly; they may be non-enumerable\n            defineProperties(DateShim, {\n                now: NativeDate.now,\n                UTC: NativeDate.UTC\n            }, true);\n            DateShim.prototype = NativeDate.prototype;\n            defineProperties(DateShim.prototype, {\n                constructor: DateShim\n            }, true);\n\n            // Upgrade Date.parse to handle simplified ISO 8601 strings\n            var parseShim = function parse(string) {\n                var match = isoDateExpression.exec(string);\n                if (match) {\n                    // parse months, days, hours, minutes, seconds, and milliseconds\n                    // provide default values if necessary\n                    // parse the UTC offset component\n                    var year = $Number(match[1]),\n                        month = $Number(match[2] || 1) - 1,\n                        day = $Number(match[3] || 1) - 1,\n                        hour = $Number(match[4] || 0),\n                        minute = $Number(match[5] || 0),\n                        second = $Number(match[6] || 0),\n                        millisecond = Math.floor($Number(match[7] || 0) * 1000),\n                        // When time zone is missed, local offset should be used\n                        // (ES 5.1 bug)\n                        // see https://bugs.ecmascript.org/show_bug.cgi?id=112\n                        isLocalTime = Boolean(match[4] && !match[8]),\n                        signOffset = match[9] === '-' ? 1 : -1,\n                        hourOffset = $Number(match[10] || 0),\n                        minuteOffset = $Number(match[11] || 0),\n                        result;\n                    var hasMinutesOrSecondsOrMilliseconds = minute > 0 || second > 0 || millisecond > 0;\n                    if (\n                        hour < (hasMinutesOrSecondsOrMilliseconds ? 24 : 25) &&\n                        minute < 60 && second < 60 && millisecond < 1000 &&\n                        month > -1 && month < 12 && hourOffset < 24 &&\n                        minuteOffset < 60 && // detect invalid offsets\n                        day > -1 &&\n                        day < (dayFromMonth(year, month + 1) - dayFromMonth(year, month))\n                    ) {\n                        result = (\n                            (dayFromMonth(year, month) + day) * 24 +\n                            hour +\n                            hourOffset * signOffset\n                        ) * 60;\n                        result = (\n                            (result + minute + minuteOffset * signOffset) * 60 +\n                            second\n                        ) * 1000 + millisecond;\n                        if (isLocalTime) {\n                            result = toUTC(result);\n                        }\n                        if (-8.64e15 <= result && result <= 8.64e15) {\n                            return result;\n                        }\n                    }\n                    return NaN;\n                }\n                return NativeDate.parse.apply(this, arguments);\n            };\n            defineProperties(DateShim, { parse: parseShim });\n\n            return DateShim;\n        }(Date));\n        /* global Date: false */\n    }\n\n    // ES5 15.9.4.4\n    // http://es5.github.com/#x15.9.4.4\n    if (!Date.now) {\n        Date.now = function now() {\n            return new Date().getTime();\n        };\n    }\n\n    //\n    // Number\n    // ======\n    //\n\n    // ES5.1 15.7.4.5\n    // http://es5.github.com/#x15.7.4.5\n    var hasToFixedBugs = NumberPrototype.toFixed && (\n      (0.00008).toFixed(3) !== '0.000' ||\n      (0.9).toFixed(0) !== '1' ||\n      (1.255).toFixed(2) !== '1.25' ||\n      (1000000000000000128).toFixed(0) !== '1000000000000000128'\n    );\n\n    var toFixedHelpers = {\n        base: 1e7,\n        size: 6,\n        data: [0, 0, 0, 0, 0, 0],\n        multiply: function multiply(n, c) {\n            var i = -1;\n            var c2 = c;\n            while (++i < toFixedHelpers.size) {\n                c2 += n * toFixedHelpers.data[i];\n                toFixedHelpers.data[i] = c2 % toFixedHelpers.base;\n                c2 = Math.floor(c2 / toFixedHelpers.base);\n            }\n        },\n        divide: function divide(n) {\n            var i = toFixedHelpers.size;\n            var c = 0;\n            while (--i >= 0) {\n                c += toFixedHelpers.data[i];\n                toFixedHelpers.data[i] = Math.floor(c / n);\n                c = (c % n) * toFixedHelpers.base;\n            }\n        },\n        numToString: function numToString() {\n            var i = toFixedHelpers.size;\n            var s = '';\n            while (--i >= 0) {\n                if (s !== '' || i === 0 || toFixedHelpers.data[i] !== 0) {\n                    var t = $String(toFixedHelpers.data[i]);\n                    if (s === '') {\n                        s = t;\n                    } else {\n                        s += strSlice('0000000', 0, 7 - t.length) + t;\n                    }\n                }\n            }\n            return s;\n        },\n        pow: function pow(x, n, acc) {\n            return (n === 0 ? acc : (n % 2 === 1 ? pow(x, n - 1, acc * x) : pow(x * x, n / 2, acc)));\n        },\n        log: function log(x) {\n            var n = 0;\n            var x2 = x;\n            while (x2 >= 4096) {\n                n += 12;\n                x2 /= 4096;\n            }\n            while (x2 >= 2) {\n                n += 1;\n                x2 /= 2;\n            }\n            return n;\n        }\n    };\n\n    var toFixedShim = function toFixed(fractionDigits) {\n        var f, x, s, m, e, z, j, k;\n\n        // Test for NaN and round fractionDigits down\n        f = $Number(fractionDigits);\n        f = isActualNaN(f) ? 0 : Math.floor(f);\n\n        if (f < 0 || f > 20) {\n            throw new RangeError('Number.toFixed called with invalid number of decimals');\n        }\n\n        x = $Number(this);\n\n        if (isActualNaN(x)) {\n            return 'NaN';\n        }\n\n        // If it is too big or small, return the string value of the number\n        if (x <= -1e21 || x >= 1e21) {\n            return $String(x);\n        }\n\n        s = '';\n\n        if (x < 0) {\n            s = '-';\n            x = -x;\n        }\n\n        m = '0';\n\n        if (x > 1e-21) {\n            // 1e-21 < x < 1e21\n            // -70 < log2(x) < 70\n            e = toFixedHelpers.log(x * toFixedHelpers.pow(2, 69, 1)) - 69;\n            z = (e < 0 ? x * toFixedHelpers.pow(2, -e, 1) : x / toFixedHelpers.pow(2, e, 1));\n            z *= 0x10000000000000; // Math.pow(2, 52);\n            e = 52 - e;\n\n            // -18 < e < 122\n            // x = z / 2 ^ e\n            if (e > 0) {\n                toFixedHelpers.multiply(0, z);\n                j = f;\n\n                while (j >= 7) {\n                    toFixedHelpers.multiply(1e7, 0);\n                    j -= 7;\n                }\n\n                toFixedHelpers.multiply(toFixedHelpers.pow(10, j, 1), 0);\n                j = e - 1;\n\n                while (j >= 23) {\n                    toFixedHelpers.divide(1 << 23);\n                    j -= 23;\n                }\n\n                toFixedHelpers.divide(1 << j);\n                toFixedHelpers.multiply(1, 1);\n                toFixedHelpers.divide(2);\n                m = toFixedHelpers.numToString();\n            } else {\n                toFixedHelpers.multiply(0, z);\n                toFixedHelpers.multiply(1 << (-e), 0);\n                m = toFixedHelpers.numToString() + strSlice('0.00000000000000000000', 2, 2 + f);\n            }\n        }\n\n        if (f > 0) {\n            k = m.length;\n\n            if (k <= f) {\n                m = s + strSlice('0.0000000000000000000', 0, f - k + 2) + m;\n            } else {\n                m = s + strSlice(m, 0, k - f) + '.' + strSlice(m, k - f);\n            }\n        } else {\n            m = s + m;\n        }\n\n        return m;\n    };\n    defineProperties(NumberPrototype, { toFixed: toFixedShim }, hasToFixedBugs);\n\n    var hasToPrecisionUndefinedBug = (function () {\n        try {\n            return 1.0.toPrecision(undefined) === '1';\n        } catch (e) {\n            return true;\n        }\n    }());\n    var originalToPrecision = NumberPrototype.toPrecision;\n    defineProperties(NumberPrototype, {\n        toPrecision: function toPrecision(precision) {\n            return typeof precision === 'undefined' ? originalToPrecision.call(this) : originalToPrecision.call(this, precision);\n        }\n    }, hasToPrecisionUndefinedBug);\n\n    //\n    // String\n    // ======\n    //\n\n    // ES5 15.5.4.14\n    // http://es5.github.com/#x15.5.4.14\n\n    // [bugfix, IE lt 9, firefox 4, Konqueror, Opera, obscure browsers]\n    // Many browsers do not split properly with regular expressions or they\n    // do not perform the split correctly under obscure conditions.\n    // See http://blog.stevenlevithan.com/archives/cross-browser-split\n    // I've tested in many browsers and this seems to cover the deviant ones:\n    //    'ab'.split(/(?:ab)*/) should be [\"\", \"\"], not [\"\"]\n    //    '.'.split(/(.?)(.?)/) should be [\"\", \".\", \"\", \"\"], not [\"\", \"\"]\n    //    'tesst'.split(/(s)*/) should be [\"t\", undefined, \"e\", \"s\", \"t\"], not\n    //       [undefined, \"t\", undefined, \"e\", ...]\n    //    ''.split(/.?/) should be [], not [\"\"]\n    //    '.'.split(/()()/) should be [\".\"], not [\"\", \"\", \".\"]\n\n    if (\n        'ab'.split(/(?:ab)*/).length !== 2 ||\n        '.'.split(/(.?)(.?)/).length !== 4 ||\n        'tesst'.split(/(s)*/)[1] === 't' ||\n        'test'.split(/(?:)/, -1).length !== 4 ||\n        ''.split(/.?/).length ||\n        '.'.split(/()()/).length > 1\n    ) {\n        (function () {\n            var compliantExecNpcg = typeof (/()??/).exec('')[1] === 'undefined'; // NPCG: nonparticipating capturing group\n            var maxSafe32BitInt = Math.pow(2, 32) - 1;\n\n            StringPrototype.split = function (separator, limit) {\n                var string = String(this);\n                if (typeof separator === 'undefined' && limit === 0) {\n                    return [];\n                }\n\n                // If `separator` is not a regex, use native split\n                if (!isRegex(separator)) {\n                    return strSplit(this, separator, limit);\n                }\n\n                var output = [];\n                var flags = (separator.ignoreCase ? 'i' : '') +\n                            (separator.multiline ? 'm' : '') +\n                            (separator.unicode ? 'u' : '') + // in ES6\n                            (separator.sticky ? 'y' : ''), // Firefox 3+ and ES6\n                    lastLastIndex = 0,\n                    // Make `global` and avoid `lastIndex` issues by working with a copy\n                    separator2, match, lastIndex, lastLength;\n                var separatorCopy = new RegExp(separator.source, flags + 'g');\n                if (!compliantExecNpcg) {\n                    // Doesn't need flags gy, but they don't hurt\n                    separator2 = new RegExp('^' + separatorCopy.source + '$(?!\\\\s)', flags);\n                }\n                /* Values for `limit`, per the spec:\n                 * If undefined: 4294967295 // maxSafe32BitInt\n                 * If 0, Infinity, or NaN: 0\n                 * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;\n                 * If negative number: 4294967296 - Math.floor(Math.abs(limit))\n                 * If other: Type-convert, then use the above rules\n                 */\n                var splitLimit = typeof limit === 'undefined' ? maxSafe32BitInt : ES.ToUint32(limit);\n                match = separatorCopy.exec(string);\n                while (match) {\n                    // `separatorCopy.lastIndex` is not reliable cross-browser\n                    lastIndex = match.index + match[0].length;\n                    if (lastIndex > lastLastIndex) {\n                        pushCall(output, strSlice(string, lastLastIndex, match.index));\n                        // Fix browsers whose `exec` methods don't consistently return `undefined` for\n                        // nonparticipating capturing groups\n                        if (!compliantExecNpcg && match.length > 1) {\n                            /* eslint-disable no-loop-func */\n                            match[0].replace(separator2, function () {\n                                for (var i = 1; i < arguments.length - 2; i++) {\n                                    if (typeof arguments[i] === 'undefined') {\n                                        match[i] = void 0;\n                                    }\n                                }\n                            });\n                            /* eslint-enable no-loop-func */\n                        }\n                        if (match.length > 1 && match.index < string.length) {\n                            array_push.apply(output, arraySlice(match, 1));\n                        }\n                        lastLength = match[0].length;\n                        lastLastIndex = lastIndex;\n                        if (output.length >= splitLimit) {\n                            break;\n                        }\n                    }\n                    if (separatorCopy.lastIndex === match.index) {\n                        separatorCopy.lastIndex++; // Avoid an infinite loop\n                    }\n                    match = separatorCopy.exec(string);\n                }\n                if (lastLastIndex === string.length) {\n                    if (lastLength || !separatorCopy.test('')) {\n                        pushCall(output, '');\n                    }\n                } else {\n                    pushCall(output, strSlice(string, lastLastIndex));\n                }\n                return output.length > splitLimit ? arraySlice(output, 0, splitLimit) : output;\n            };\n        }());\n\n    // [bugfix, chrome]\n    // If separator is undefined, then the result array contains just one String,\n    // which is the this value (converted to a String). If limit is not undefined,\n    // then the output array is truncated so that it contains no more than limit\n    // elements.\n    // \"0\".split(undefined, 0) -> []\n    } else if ('0'.split(void 0, 0).length) {\n        StringPrototype.split = function split(separator, limit) {\n            if (typeof separator === 'undefined' && limit === 0) {\n                return [];\n            }\n            return strSplit(this, separator, limit);\n        };\n    }\n\n    var str_replace = StringPrototype.replace;\n    var replaceReportsGroupsCorrectly = (function () {\n        var groups = [];\n        'x'.replace(/x(.)?/g, function (match, group) {\n            pushCall(groups, group);\n        });\n        return groups.length === 1 && typeof groups[0] === 'undefined';\n    }());\n\n    if (!replaceReportsGroupsCorrectly) {\n        StringPrototype.replace = function replace(searchValue, replaceValue) {\n            var isFn = isCallable(replaceValue);\n            var hasCapturingGroups = isRegex(searchValue) && (/\\)[*?]/).test(searchValue.source);\n            if (!isFn || !hasCapturingGroups) {\n                return str_replace.call(this, searchValue, replaceValue);\n            } else {\n                var wrappedReplaceValue = function (match) {\n                    var length = arguments.length;\n                    var originalLastIndex = searchValue.lastIndex;\n                    searchValue.lastIndex = 0;\n                    var args = searchValue.exec(match) || [];\n                    searchValue.lastIndex = originalLastIndex;\n                    pushCall(args, arguments[length - 2], arguments[length - 1]);\n                    return replaceValue.apply(this, args);\n                };\n                return str_replace.call(this, searchValue, wrappedReplaceValue);\n            }\n        };\n    }\n\n    // ECMA-262, 3rd B.2.3\n    // Not an ECMAScript standard, although ECMAScript 3rd Edition has a\n    // non-normative section suggesting uniform semantics and it should be\n    // normalized across all browsers\n    // [bugfix, IE lt 9] IE < 9 substr() with negative value not working in IE\n    var string_substr = StringPrototype.substr;\n    var hasNegativeSubstrBug = ''.substr && '0b'.substr(-1) !== 'b';\n    defineProperties(StringPrototype, {\n        substr: function substr(start, length) {\n            var normalizedStart = start;\n            if (start < 0) {\n                normalizedStart = max(this.length + start, 0);\n            }\n            return string_substr.call(this, normalizedStart, length);\n        }\n    }, hasNegativeSubstrBug);\n\n    // ES5 15.5.4.20\n    // whitespace from: http://es5.github.io/#x15.5.4.20\n    var ws = '\\x09\\x0A\\x0B\\x0C\\x0D\\x20\\xA0\\u1680\\u180E\\u2000\\u2001\\u2002\\u2003' +\n        '\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200A\\u202F\\u205F\\u3000\\u2028' +\n        '\\u2029\\uFEFF';\n    var zeroWidth = '\\u200b';\n    var wsRegexChars = '[' + ws + ']';\n    var trimBeginRegexp = new RegExp('^' + wsRegexChars + wsRegexChars + '*');\n    var trimEndRegexp = new RegExp(wsRegexChars + wsRegexChars + '*$');\n    var hasTrimWhitespaceBug = StringPrototype.trim && (ws.trim() || !zeroWidth.trim());\n    defineProperties(StringPrototype, {\n        // http://blog.stevenlevithan.com/archives/faster-trim-javascript\n        // http://perfectionkills.com/whitespace-deviations/\n        trim: function trim() {\n            if (typeof this === 'undefined' || this === null) {\n                throw new TypeError(\"can't convert \" + this + ' to object');\n            }\n            return $String(this).replace(trimBeginRegexp, '').replace(trimEndRegexp, '');\n        }\n    }, hasTrimWhitespaceBug);\n    var trim = call.bind(String.prototype.trim);\n\n    var hasLastIndexBug = StringPrototype.lastIndexOf && 'abcあい'.lastIndexOf('あい', 2) !== -1;\n    defineProperties(StringPrototype, {\n        lastIndexOf: function lastIndexOf(searchString) {\n            if (typeof this === 'undefined' || this === null) {\n                throw new TypeError(\"can't convert \" + this + ' to object');\n            }\n            var S = $String(this);\n            var searchStr = $String(searchString);\n            var numPos = arguments.length > 1 ? $Number(arguments[1]) : NaN;\n            var pos = isActualNaN(numPos) ? Infinity : ES.ToInteger(numPos);\n            var start = min(max(pos, 0), S.length);\n            var searchLen = searchStr.length;\n            var k = start + searchLen;\n            while (k > 0) {\n                k = max(0, k - searchLen);\n                var index = strIndexOf(strSlice(S, k, start + searchLen), searchStr);\n                if (index !== -1) {\n                    return k + index;\n                }\n            }\n            return -1;\n        }\n    }, hasLastIndexBug);\n\n    var originalLastIndexOf = StringPrototype.lastIndexOf;\n    defineProperties(StringPrototype, {\n        lastIndexOf: function lastIndexOf(searchString) {\n            return originalLastIndexOf.apply(this, arguments);\n        }\n    }, StringPrototype.lastIndexOf.length !== 1);\n\n    // ES-5 15.1.2.2\n    /* eslint-disable radix */\n    if (parseInt(ws + '08') !== 8 || parseInt(ws + '0x16') !== 22) {\n    /* eslint-enable radix */\n        /* global parseInt: true */\n        parseInt = (function (origParseInt) {\n            var hexRegex = /^[\\-+]?0[xX]/;\n            return function parseInt(str, radix) {\n                var string = trim(String(str));\n                var defaultedRadix = $Number(radix) || (hexRegex.test(string) ? 16 : 10);\n                return origParseInt(string, defaultedRadix);\n            };\n        }(parseInt));\n    }\n\n    // https://es5.github.io/#x15.1.2.3\n    if (1 / parseFloat('-0') !== -Infinity) {\n        /* global parseFloat: true */\n        parseFloat = (function (origParseFloat) {\n            return function parseFloat(string) {\n                var inputString = trim(String(string));\n                var result = origParseFloat(inputString);\n                return result === 0 && strSlice(inputString, 0, 1) === '-' ? -0 : result;\n            };\n        }(parseFloat));\n    }\n\n    if (String(new RangeError('test')) !== 'RangeError: test') {\n        var errorToStringShim = function toString() {\n            if (typeof this === 'undefined' || this === null) {\n                throw new TypeError(\"can't convert \" + this + ' to object');\n            }\n            var name = this.name;\n            if (typeof name === 'undefined') {\n                name = 'Error';\n            } else if (typeof name !== 'string') {\n                name = $String(name);\n            }\n            var msg = this.message;\n            if (typeof msg === 'undefined') {\n                msg = '';\n            } else if (typeof msg !== 'string') {\n                msg = $String(msg);\n            }\n            if (!name) {\n                return msg;\n            }\n            if (!msg) {\n                return name;\n            }\n            return name + ': ' + msg;\n        };\n        // can't use defineProperties here because of toString enumeration issue in IE <= 8\n        Error.prototype.toString = errorToStringShim;\n    }\n\n    if (supportsDescriptors) {\n        var ensureNonEnumerable = function (obj, prop) {\n            if (isEnum(obj, prop)) {\n                var desc = Object.getOwnPropertyDescriptor(obj, prop);\n                if (desc.configurable) {\n                    desc.enumerable = false;\n                    Object.defineProperty(obj, prop, desc);\n                }\n            }\n        };\n        ensureNonEnumerable(Error.prototype, 'message');\n        if (Error.prototype.message !== '') {\n            Error.prototype.message = '';\n        }\n        ensureNonEnumerable(Error.prototype, 'name');\n    }\n\n    if (String(/a/mig) !== '/a/gim') {\n        var regexToString = function toString() {\n            var str = '/' + this.source + '/';\n            if (this.global) {\n                str += 'g';\n            }\n            if (this.ignoreCase) {\n                str += 'i';\n            }\n            if (this.multiline) {\n                str += 'm';\n            }\n            return str;\n        };\n        // can't use defineProperties here because of toString enumeration issue in IE <= 8\n        RegExp.prototype.toString = regexToString;\n    }\n}));\n","'use strict';\n/*jslint eqeq: true*/\n\nHandlebars.registerHelper('sanitize', function (text) {\n    var result;\n\n    if (text === undefined) { return ''; }\n\n    result = sanitizeHtml(text, {\n        allowedTags: [ 'div', 'span', 'b', 'i', 'em', 'strong', 'a', 'br', 'table', 'tbody', 'tr', 'th', 'td' ],\n        allowedAttributes: {\n            'div': [ 'class' ],\n            'span': [ 'class' ],\n            'table': [ 'class' ],\n            'td': [ 'class' ],\n            'th': [ 'colspan' ],\n            'a': [ 'href' ]\n        }\n    });\n\n    return new Handlebars.SafeString(result);\n});\n\nHandlebars.registerHelper('renderTextParam', function(param) {\n    var result, type = 'text', idAtt = '';\n    var paramType = param.type || param.schema && param.schema.type || '';\n    var isArray = paramType.toLowerCase() === 'array' || param.allowMultiple;\n    var defaultValue = isArray && Array.isArray(param.default) ? param.default.join('\\n') : param.default;\n    var name = Handlebars.Utils.escapeExpression(param.name);\n    var valueId = Handlebars.Utils.escapeExpression(param.valueId);\n    paramType = Handlebars.Utils.escapeExpression(paramType);\n\n    var dataVendorExtensions = Object.keys(param).filter(function(property) {\n        // filter X-data- properties\n        return property.match(/^X-data-/i) !== null;\n    }).reduce(function(result, property) {\n        // remove X- from property name, so it results in html attributes like data-foo='bar'\n        return result += ' ' + property.substring(2, property.length) + '=\\'' + param[property] + '\\'';\n    }, '');\n\n    if(param.format && param.format === 'password') {\n        type = 'password';\n    }\n\n    if(valueId) {\n        idAtt = ' id=\\'' + valueId + '\\'';\n    }\n\n    if (defaultValue) {\n      defaultValue = sanitizeHtml(defaultValue);\n    } else {\n      defaultValue = '';\n    }\n\n    if(isArray) {\n        result = '<textarea class=\\'body-textarea' + (param.required ? ' required' : '') + '\\' name=\\'' + name + '\\'' + idAtt + dataVendorExtensions;\n        result += ' placeholder=\\'Provide multiple values in new lines' + (param.required ? ' (at least one required).' : '.') + '\\'>';\n        result += defaultValue + '</textarea>';\n    } else {\n        var parameterClass = 'parameter';\n        if(param.required) {\n          parameterClass += ' required';\n        }\n        result = '<input class=\\'' + parameterClass + '\\' minlength=\\'' + (param.required ? 1 : 0) + '\\'';\n        result += ' name=\\'' + name +'\\' placeholder=\\'' + (param.required ? '(required)' : '') + '\\'' + idAtt + dataVendorExtensions;\n        result += ' type=\\'' + type + '\\' value=\\'' + defaultValue + '\\'/>';\n    }\n    return new Handlebars.SafeString(result);\n});\n\nHandlebars.registerHelper('ifCond', function (v1, operator, v2, options) {\n\n    switch (operator) {\n        case '==':\n            return (v1 == v2) ? options.fn(this) : options.inverse(this);\n        case '===':\n            return (v1 === v2) ? options.fn(this) : options.inverse(this);\n        case '<':\n            return (v1 < v2) ? options.fn(this) : options.inverse(this);\n        case '<=':\n            return (v1 <= v2) ? options.fn(this) : options.inverse(this);\n        case '>':\n            return (v1 > v2) ? options.fn(this) : options.inverse(this);\n        case '>=':\n            return (v1 >= v2) ? options.fn(this) : options.inverse(this);\n        case '&&':\n            return (v1 && v2) ? options.fn(this) : options.inverse(this);\n        case '||':\n            return (v1 || v2) ? options.fn(this) : options.inverse(this);\n        default:\n            return options.inverse(this);\n    }\n});\n\nHandlebars.registerHelper('escape', function (value) {\n    var text = Handlebars.Utils.escapeExpression(value);\n\n    return new Handlebars.SafeString(text);\n});\n","(function(f){if(typeof exports===\"object\"&&typeof module!==\"undefined\"){module.exports=f()}else if(typeof define===\"function\"&&define.amd){define([],f)}else{var g;if(typeof window!==\"undefined\"){g=window}else if(typeof global!==\"undefined\"){g=global}else if(typeof self!==\"undefined\"){g=self}else{g=this}g.sanitizeHtml=f()}})(function(){var define,module,exports;return function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}({1:[function(require,module,exports){var htmlparser=require(\"htmlparser2\");var extend=require(\"xtend\");var quoteRegexp=require(\"regexp-quote\");function each(obj,cb){if(obj)Object.keys(obj).forEach(function(key){cb(obj[key],key)})}function has(obj,key){return{}.hasOwnProperty.call(obj,key)}module.exports=sanitizeHtml;function sanitizeHtml(html,options,_recursing){var result=\"\";function Frame(tag,attribs){var that=this;this.tag=tag;this.attribs=attribs||{};this.tagPosition=result.length;this.text=\"\";this.updateParentNodeText=function(){if(stack.length){var parentFrame=stack[stack.length-1];parentFrame.text+=that.text}}}if(!options){options=sanitizeHtml.defaults;options.parser=htmlParserDefaults}else{options=extend(sanitizeHtml.defaults,options);if(options.parser){options.parser=extend(htmlParserDefaults,options.parser)}else{options.parser=htmlParserDefaults}}var nonTextTagsArray=options.nonTextTags||[\"script\",\"style\",\"textarea\"];var allowedAttributesMap;var allowedAttributesGlobMap;if(options.allowedAttributes){allowedAttributesMap={};allowedAttributesGlobMap={};each(options.allowedAttributes,function(attributes,tag){allowedAttributesMap[tag]=[];var globRegex=[];attributes.forEach(function(name){if(name.indexOf(\"*\")>=0){globRegex.push(quoteRegexp(name).replace(/\\\\\\*/g,\".*\"))}else{allowedAttributesMap[tag].push(name)}});allowedAttributesGlobMap[tag]=new RegExp(\"^(\"+globRegex.join(\"|\")+\")$\")})}var allowedClassesMap={};each(options.allowedClasses,function(classes,tag){if(allowedAttributesMap){if(!has(allowedAttributesMap,tag)){allowedAttributesMap[tag]=[]}allowedAttributesMap[tag].push(\"class\")}allowedClassesMap[tag]=classes});var transformTagsMap={};var transformTagsAll;each(options.transformTags,function(transform,tag){var transFun;if(typeof transform===\"function\"){transFun=transform}else if(typeof transform===\"string\"){transFun=sanitizeHtml.simpleTransform(transform)}if(tag===\"*\"){transformTagsAll=transFun}else{transformTagsMap[tag]=transFun}});var depth=0;var stack=[];var skipMap={};var transformMap={};var skipText=false;var skipTextDepth=0;var parser=new htmlparser.Parser({onopentag:function(name,attribs){if(skipText){skipTextDepth++;return}var frame=new Frame(name,attribs);stack.push(frame);var skip=false;var hasText=frame.text?true:false;var transformedTag;if(has(transformTagsMap,name)){transformedTag=transformTagsMap[name](name,attribs);frame.attribs=attribs=transformedTag.attribs;if(transformedTag.text!==undefined){frame.innerText=transformedTag.text}if(name!==transformedTag.tagName){frame.name=name=transformedTag.tagName;transformMap[depth]=transformedTag.tagName}}if(transformTagsAll){transformedTag=transformTagsAll(name,attribs);frame.attribs=attribs=transformedTag.attribs;if(name!==transformedTag.tagName){frame.name=name=transformedTag.tagName;transformMap[depth]=transformedTag.tagName}}if(options.allowedTags&&options.allowedTags.indexOf(name)===-1){skip=true;if(nonTextTagsArray.indexOf(name)!==-1){skipText=true;skipTextDepth=1}skipMap[depth]=true}depth++;if(skip){return}result+=\"<\"+name;if(!allowedAttributesMap||has(allowedAttributesMap,name)||allowedAttributesMap[\"*\"]){each(attribs,function(value,a){if(!allowedAttributesMap||has(allowedAttributesMap,name)&&allowedAttributesMap[name].indexOf(a)!==-1||allowedAttributesMap[\"*\"]&&allowedAttributesMap[\"*\"].indexOf(a)!==-1||has(allowedAttributesGlobMap,name)&&allowedAttributesGlobMap[name].test(a)||allowedAttributesGlobMap[\"*\"]&&allowedAttributesGlobMap[\"*\"].test(a)){if(a===\"href\"||a===\"src\"){if(naughtyHref(name,value)){delete frame.attribs[a];return}}if(a===\"class\"){value=filterClasses(value,allowedClassesMap[name]);if(!value.length){delete frame.attribs[a];return}}result+=\" \"+a;if(value.length){result+='=\"'+escapeHtml(value)+'\"'}}else{delete frame.attribs[a]}})}if(options.selfClosing.indexOf(name)!==-1){result+=\" />\"}else{result+=\">\";if(frame.innerText&&!hasText&&!options.textFilter){result+=frame.innerText}}},ontext:function(text){if(skipText){return}var lastFrame=stack[stack.length-1];var tag;if(lastFrame){tag=lastFrame.tag;text=lastFrame.innerText!==undefined?lastFrame.innerText:text}if(tag===\"script\"||tag===\"style\"){result+=text}else{var escaped=escapeHtml(text);if(options.textFilter){result+=options.textFilter(escaped)}else{result+=escaped}}if(stack.length){var frame=stack[stack.length-1];frame.text+=text}},onclosetag:function(name){if(skipText){skipTextDepth--;if(!skipTextDepth){skipText=false}else{return}}var frame=stack.pop();if(!frame){return}skipText=false;depth--;if(skipMap[depth]){delete skipMap[depth];frame.updateParentNodeText();return}if(transformMap[depth]){name=transformMap[depth];delete transformMap[depth]}if(options.exclusiveFilter&&options.exclusiveFilter(frame)){result=result.substr(0,frame.tagPosition);return}frame.updateParentNodeText();if(options.selfClosing.indexOf(name)!==-1){return}result+=\"</\"+name+\">\"}},options.parser);parser.write(html);parser.end();return result;function escapeHtml(s){if(typeof s!==\"string\"){s=s+\"\"}return s.replace(/\\&/g,\"&amp;\").replace(/</g,\"&lt;\").replace(/\\>/g,\"&gt;\").replace(/\\\"/g,\"&quot;\")}function naughtyHref(name,href){href=href.replace(/[\\x00-\\x20]+/g,\"\");href=href.replace(/<\\!\\-\\-.*?\\-\\-\\>/g,\"\");var matches=href.match(/^([a-zA-Z]+)\\:/);if(!matches){return false}var scheme=matches[1].toLowerCase();if(has(options.allowedSchemesByTag,name)){return options.allowedSchemesByTag[name].indexOf(scheme)===-1}return!options.allowedSchemes||options.allowedSchemes.indexOf(scheme)===-1}function filterClasses(classes,allowed){if(!allowed){return classes}classes=classes.split(/\\s+/);return classes.filter(function(clss){return allowed.indexOf(clss)!==-1}).join(\" \")}}var htmlParserDefaults={decodeEntities:true};sanitizeHtml.defaults={allowedTags:[\"h3\",\"h4\",\"h5\",\"h6\",\"blockquote\",\"p\",\"a\",\"ul\",\"ol\",\"nl\",\"li\",\"b\",\"i\",\"strong\",\"em\",\"strike\",\"code\",\"hr\",\"br\",\"div\",\"table\",\"thead\",\"caption\",\"tbody\",\"tr\",\"th\",\"td\",\"pre\"],allowedAttributes:{a:[\"href\",\"name\",\"target\"],img:[\"src\"]},selfClosing:[\"img\",\"br\",\"hr\",\"area\",\"base\",\"basefont\",\"input\",\"link\",\"meta\"],allowedSchemes:[\"http\",\"https\",\"ftp\",\"mailto\"],allowedSchemesByTag:{}};sanitizeHtml.simpleTransform=function(newTagName,newAttribs,merge){merge=merge===undefined?true:merge;newAttribs=newAttribs||{};return function(tagName,attribs){var attrib;if(merge){for(attrib in newAttribs){attribs[attrib]=newAttribs[attrib]}}else{attribs=newAttribs}return{tagName:newTagName,attribs:attribs}}}},{htmlparser2:36,\"regexp-quote\":54,xtend:58}],2:[function(require,module,exports){\"use strict\";exports.toByteArray=toByteArray;exports.fromByteArray=fromByteArray;var lookup=[];var revLookup=[];var Arr=typeof Uint8Array!==\"undefined\"?Uint8Array:Array;function init(){var code=\"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/\";for(var i=0,len=code.length;i<len;++i){lookup[i]=code[i];revLookup[code.charCodeAt(i)]=i}revLookup[\"-\".charCodeAt(0)]=62;revLookup[\"_\".charCodeAt(0)]=63}init();function toByteArray(b64){var i,j,l,tmp,placeHolders,arr;var len=b64.length;if(len%4>0){throw new Error(\"Invalid string. Length must be a multiple of 4\")}placeHolders=b64[len-2]===\"=\"?2:b64[len-1]===\"=\"?1:0;arr=new Arr(len*3/4-placeHolders);l=placeHolders>0?len-4:len;var L=0;for(i=0,j=0;i<l;i+=4,j+=3){tmp=revLookup[b64.charCodeAt(i)]<<18|revLookup[b64.charCodeAt(i+1)]<<12|revLookup[b64.charCodeAt(i+2)]<<6|revLookup[b64.charCodeAt(i+3)];arr[L++]=tmp>>16&255;arr[L++]=tmp>>8&255;arr[L++]=tmp&255}if(placeHolders===2){tmp=revLookup[b64.charCodeAt(i)]<<2|revLookup[b64.charCodeAt(i+1)]>>4;arr[L++]=tmp&255}else if(placeHolders===1){tmp=revLookup[b64.charCodeAt(i)]<<10|revLookup[b64.charCodeAt(i+1)]<<4|revLookup[b64.charCodeAt(i+2)]>>2;arr[L++]=tmp>>8&255;arr[L++]=tmp&255}return arr}function tripletToBase64(num){return lookup[num>>18&63]+lookup[num>>12&63]+lookup[num>>6&63]+lookup[num&63]}function encodeChunk(uint8,start,end){var tmp;var output=[];for(var i=start;i<end;i+=3){tmp=(uint8[i]<<16)+(uint8[i+1]<<8)+uint8[i+2];output.push(tripletToBase64(tmp))}return output.join(\"\")}function fromByteArray(uint8){var tmp;var len=uint8.length;var extraBytes=len%3;var output=\"\";var parts=[];var maxChunkLength=16383;for(var i=0,len2=len-extraBytes;i<len2;i+=maxChunkLength){parts.push(encodeChunk(uint8,i,i+maxChunkLength>len2?len2:i+maxChunkLength))}if(extraBytes===1){tmp=uint8[len-1];output+=lookup[tmp>>2];output+=lookup[tmp<<4&63];output+=\"==\"}else if(extraBytes===2){tmp=(uint8[len-2]<<8)+uint8[len-1];output+=lookup[tmp>>10];output+=lookup[tmp>>4&63];output+=lookup[tmp<<2&63];output+=\"=\"}parts.push(output);return parts.join(\"\")}},{}],3:[function(require,module,exports){},{}],4:[function(require,module,exports){(function(global){\"use strict\";var buffer=require(\"buffer\");var Buffer=buffer.Buffer;var SlowBuffer=buffer.SlowBuffer;var MAX_LEN=buffer.kMaxLength||2147483647;exports.alloc=function alloc(size,fill,encoding){if(typeof Buffer.alloc===\"function\"){return Buffer.alloc(size,fill,encoding)}if(typeof encoding===\"number\"){throw new TypeError(\"encoding must not be number\")}if(typeof size!==\"number\"){throw new TypeError(\"size must be a number\")}if(size>MAX_LEN){throw new RangeError(\"size is too large\")}var enc=encoding;var _fill=fill;if(_fill===undefined){enc=undefined;_fill=0}var buf=new Buffer(size);if(typeof _fill===\"string\"){var fillBuf=new Buffer(_fill,enc);var flen=fillBuf.length;var i=-1;while(++i<size){buf[i]=fillBuf[i%flen]}}else{buf.fill(_fill)}return buf};exports.allocUnsafe=function allocUnsafe(size){if(typeof Buffer.allocUnsafe===\"function\"){return Buffer.allocUnsafe(size)}if(typeof size!==\"number\"){throw new TypeError(\"size must be a number\")}if(size>MAX_LEN){throw new RangeError(\"size is too large\")}return new Buffer(size)};exports.from=function from(value,encodingOrOffset,length){if(typeof Buffer.from===\"function\"&&(!global.Uint8Array||Uint8Array.from!==Buffer.from)){return Buffer.from(value,encodingOrOffset,length)}if(typeof value===\"number\"){throw new TypeError('\"value\" argument must not be a number')}if(typeof value===\"string\"){return new Buffer(value,encodingOrOffset)}if(typeof ArrayBuffer!==\"undefined\"&&value instanceof ArrayBuffer){var offset=encodingOrOffset;if(arguments.length===1){return new Buffer(value)}if(typeof offset===\"undefined\"){offset=0}var len=length;if(typeof len===\"undefined\"){len=value.byteLength-offset}if(offset>=value.byteLength){throw new RangeError(\"'offset' is out of bounds\")}if(len>value.byteLength-offset){throw new RangeError(\"'length' is out of bounds\")}return new Buffer(value.slice(offset,offset+len))}if(Buffer.isBuffer(value)){var out=new Buffer(value.length);value.copy(out,0,0,value.length);return out}if(value){if(Array.isArray(value)||typeof ArrayBuffer!==\"undefined\"&&value.buffer instanceof ArrayBuffer||\"length\"in value){return new Buffer(value)}if(value.type===\"Buffer\"&&Array.isArray(value.data)){return new Buffer(value.data)}}throw new TypeError(\"First argument must be a string, Buffer, \"+\"ArrayBuffer, Array, or array-like object.\")};exports.allocUnsafeSlow=function allocUnsafeSlow(size){if(typeof Buffer.allocUnsafeSlow===\"function\"){return Buffer.allocUnsafeSlow(size)}if(typeof size!==\"number\"){throw new TypeError(\"size must be a number\")}if(size>=MAX_LEN){throw new RangeError(\"size is too large\")}return new SlowBuffer(size)}}).call(this,typeof global!==\"undefined\"?global:typeof self!==\"undefined\"?self:typeof window!==\"undefined\"?window:{})},{buffer:5}],5:[function(require,module,exports){(function(global){\"use strict\";var base64=require(\"base64-js\");var ieee754=require(\"ieee754\");var isArray=require(\"isarray\");exports.Buffer=Buffer;exports.SlowBuffer=SlowBuffer;exports.INSPECT_MAX_BYTES=50;Buffer.TYPED_ARRAY_SUPPORT=global.TYPED_ARRAY_SUPPORT!==undefined?global.TYPED_ARRAY_SUPPORT:typedArraySupport();exports.kMaxLength=kMaxLength();function typedArraySupport(){try{var arr=new Uint8Array(1);arr.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}};return arr.foo()===42&&typeof arr.subarray===\"function\"&&arr.subarray(1,1).byteLength===0}catch(e){return false}}function kMaxLength(){return Buffer.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function createBuffer(that,length){if(kMaxLength()<length){throw new RangeError(\"Invalid typed array length\")}if(Buffer.TYPED_ARRAY_SUPPORT){that=new Uint8Array(length);that.__proto__=Buffer.prototype}else{if(that===null){that=new Buffer(length)}that.length=length}return that}function Buffer(arg,encodingOrOffset,length){if(!Buffer.TYPED_ARRAY_SUPPORT&&!(this instanceof Buffer)){return new Buffer(arg,encodingOrOffset,length)}if(typeof arg===\"number\"){if(typeof encodingOrOffset===\"string\"){throw new Error(\"If encoding is specified then the first argument must be a string\")}return allocUnsafe(this,arg)}return from(this,arg,encodingOrOffset,length)}Buffer.poolSize=8192;Buffer._augment=function(arr){arr.__proto__=Buffer.prototype;return arr};function from(that,value,encodingOrOffset,length){if(typeof value===\"number\"){throw new TypeError('\"value\" argument must not be a number')}if(typeof ArrayBuffer!==\"undefined\"&&value instanceof ArrayBuffer){return fromArrayBuffer(that,value,encodingOrOffset,length)}if(typeof value===\"string\"){return fromString(that,value,encodingOrOffset)}return fromObject(that,value)}Buffer.from=function(value,encodingOrOffset,length){return from(null,value,encodingOrOffset,length)};if(Buffer.TYPED_ARRAY_SUPPORT){Buffer.prototype.__proto__=Uint8Array.prototype;Buffer.__proto__=Uint8Array;if(typeof Symbol!==\"undefined\"&&Symbol.species&&Buffer[Symbol.species]===Buffer){Object.defineProperty(Buffer,Symbol.species,{value:null,configurable:true})}}function assertSize(size){if(typeof size!==\"number\"){throw new TypeError('\"size\" argument must be a number')}else if(size<0){throw new RangeError('\"size\" argument must not be negative')}}function alloc(that,size,fill,encoding){assertSize(size);if(size<=0){return createBuffer(that,size)}if(fill!==undefined){return typeof encoding===\"string\"?createBuffer(that,size).fill(fill,encoding):createBuffer(that,size).fill(fill)}return createBuffer(that,size)}Buffer.alloc=function(size,fill,encoding){return alloc(null,size,fill,encoding)};function allocUnsafe(that,size){assertSize(size);that=createBuffer(that,size<0?0:checked(size)|0);if(!Buffer.TYPED_ARRAY_SUPPORT){for(var i=0;i<size;++i){that[i]=0}}return that}Buffer.allocUnsafe=function(size){return allocUnsafe(null,size)};Buffer.allocUnsafeSlow=function(size){return allocUnsafe(null,size)};function fromString(that,string,encoding){if(typeof encoding!==\"string\"||encoding===\"\"){encoding=\"utf8\"}if(!Buffer.isEncoding(encoding)){throw new TypeError('\"encoding\" must be a valid string encoding')}var length=byteLength(string,encoding)|0;that=createBuffer(that,length);var actual=that.write(string,encoding);if(actual!==length){that=that.slice(0,actual)}return that}function fromArrayLike(that,array){var length=array.length<0?0:checked(array.length)|0;that=createBuffer(that,length);for(var i=0;i<length;i+=1){that[i]=array[i]&255}return that}function fromArrayBuffer(that,array,byteOffset,length){array.byteLength;if(byteOffset<0||array.byteLength<byteOffset){throw new RangeError(\"'offset' is out of bounds\")}if(array.byteLength<byteOffset+(length||0)){throw new RangeError(\"'length' is out of bounds\")}if(byteOffset===undefined&&length===undefined){array=new Uint8Array(array)}else if(length===undefined){array=new Uint8Array(array,byteOffset)}else{array=new Uint8Array(array,byteOffset,length)}if(Buffer.TYPED_ARRAY_SUPPORT){that=array;that.__proto__=Buffer.prototype}else{that=fromArrayLike(that,array)}return that}function fromObject(that,obj){if(Buffer.isBuffer(obj)){var len=checked(obj.length)|0;that=createBuffer(that,len);if(that.length===0){return that}obj.copy(that,0,0,len);return that}if(obj){if(typeof ArrayBuffer!==\"undefined\"&&obj.buffer instanceof ArrayBuffer||\"length\"in obj){if(typeof obj.length!==\"number\"||isnan(obj.length)){return createBuffer(that,0)}return fromArrayLike(that,obj)}if(obj.type===\"Buffer\"&&isArray(obj.data)){return fromArrayLike(that,obj.data)}}throw new TypeError(\"First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.\")}function checked(length){if(length>=kMaxLength()){throw new RangeError(\"Attempt to allocate Buffer larger than maximum \"+\"size: 0x\"+kMaxLength().toString(16)+\" bytes\")}return length|0}function SlowBuffer(length){if(+length!=length){length=0}return Buffer.alloc(+length)}Buffer.isBuffer=function isBuffer(b){return!!(b!=null&&b._isBuffer)};Buffer.compare=function compare(a,b){if(!Buffer.isBuffer(a)||!Buffer.isBuffer(b)){throw new TypeError(\"Arguments must be Buffers\")}if(a===b)return 0;var x=a.length;var y=b.length;for(var i=0,len=Math.min(x,y);i<len;++i){if(a[i]!==b[i]){x=a[i];y=b[i];break}}if(x<y)return-1;if(y<x)return 1;return 0};Buffer.isEncoding=function isEncoding(encoding){switch(String(encoding).toLowerCase()){case\"hex\":case\"utf8\":case\"utf-8\":case\"ascii\":case\"latin1\":case\"binary\":case\"base64\":case\"ucs2\":case\"ucs-2\":case\"utf16le\":case\"utf-16le\":return true;default:return false}};Buffer.concat=function concat(list,length){if(!isArray(list)){throw new TypeError('\"list\" argument must be an Array of Buffers')}if(list.length===0){return Buffer.alloc(0)}var i;if(length===undefined){length=0;for(i=0;i<list.length;++i){length+=list[i].length}}var buffer=Buffer.allocUnsafe(length);var pos=0;for(i=0;i<list.length;++i){var buf=list[i];if(!Buffer.isBuffer(buf)){throw new TypeError('\"list\" argument must be an Array of Buffers')}buf.copy(buffer,pos);pos+=buf.length}return buffer};function byteLength(string,encoding){if(Buffer.isBuffer(string)){return string.length}if(typeof ArrayBuffer!==\"undefined\"&&typeof ArrayBuffer.isView===\"function\"&&(ArrayBuffer.isView(string)||string instanceof ArrayBuffer)){return string.byteLength}if(typeof string!==\"string\"){string=\"\"+string}var len=string.length;if(len===0)return 0;var loweredCase=false;for(;;){switch(encoding){case\"ascii\":case\"latin1\":case\"binary\":return len;case\"utf8\":case\"utf-8\":case undefined:return utf8ToBytes(string).length;case\"ucs2\":case\"ucs-2\":case\"utf16le\":case\"utf-16le\":return len*2;case\"hex\":return len>>>1;case\"base64\":return base64ToBytes(string).length;default:if(loweredCase)return utf8ToBytes(string).length;encoding=(\"\"+encoding).toLowerCase();loweredCase=true}}}Buffer.byteLength=byteLength;function slowToString(encoding,start,end){var loweredCase=false;if(start===undefined||start<0){start=0}if(start>this.length){return\"\"}if(end===undefined||end>this.length){end=this.length}if(end<=0){return\"\"}end>>>=0;start>>>=0;if(end<=start){return\"\"}if(!encoding)encoding=\"utf8\";while(true){switch(encoding){case\"hex\":return hexSlice(this,start,end);case\"utf8\":case\"utf-8\":return utf8Slice(this,start,end);case\"ascii\":return asciiSlice(this,start,end);case\"latin1\":case\"binary\":return latin1Slice(this,start,end);case\"base64\":return base64Slice(this,start,end);case\"ucs2\":case\"ucs-2\":case\"utf16le\":case\"utf-16le\":return utf16leSlice(this,start,end);default:if(loweredCase)throw new TypeError(\"Unknown encoding: \"+encoding);encoding=(encoding+\"\").toLowerCase();loweredCase=true}}}Buffer.prototype._isBuffer=true;function swap(b,n,m){var i=b[n];b[n]=b[m];b[m]=i}Buffer.prototype.swap16=function swap16(){var len=this.length;if(len%2!==0){throw new RangeError(\"Buffer size must be a multiple of 16-bits\")}for(var i=0;i<len;i+=2){swap(this,i,i+1)}return this};Buffer.prototype.swap32=function swap32(){var len=this.length;if(len%4!==0){throw new RangeError(\"Buffer size must be a multiple of 32-bits\")}for(var i=0;i<len;i+=4){swap(this,i,i+3);swap(this,i+1,i+2)}return this};Buffer.prototype.swap64=function swap64(){var len=this.length;if(len%8!==0){throw new RangeError(\"Buffer size must be a multiple of 64-bits\")}for(var i=0;i<len;i+=8){swap(this,i,i+7);swap(this,i+1,i+6);swap(this,i+2,i+5);swap(this,i+3,i+4)}return this};Buffer.prototype.toString=function toString(){var length=this.length|0;if(length===0)return\"\";if(arguments.length===0)return utf8Slice(this,0,length);return slowToString.apply(this,arguments)};Buffer.prototype.equals=function equals(b){if(!Buffer.isBuffer(b))throw new TypeError(\"Argument must be a Buffer\");if(this===b)return true;return Buffer.compare(this,b)===0};Buffer.prototype.inspect=function inspect(){var str=\"\";var max=exports.INSPECT_MAX_BYTES;if(this.length>0){str=this.toString(\"hex\",0,max).match(/.{2}/g).join(\" \");if(this.length>max)str+=\" ... \"}return\"<Buffer \"+str+\">\"};Buffer.prototype.compare=function compare(target,start,end,thisStart,thisEnd){if(!Buffer.isBuffer(target)){throw new TypeError(\"Argument must be a Buffer\")}if(start===undefined){start=0}if(end===undefined){end=target?target.length:0}if(thisStart===undefined){thisStart=0}if(thisEnd===undefined){thisEnd=this.length}if(start<0||end>target.length||thisStart<0||thisEnd>this.length){throw new RangeError(\"out of range index\")}if(thisStart>=thisEnd&&start>=end){return 0}if(thisStart>=thisEnd){return-1}if(start>=end){return 1}start>>>=0;end>>>=0;thisStart>>>=0;thisEnd>>>=0;if(this===target)return 0;var x=thisEnd-thisStart;var y=end-start;var len=Math.min(x,y);var thisCopy=this.slice(thisStart,thisEnd);var targetCopy=target.slice(start,end);for(var i=0;i<len;++i){if(thisCopy[i]!==targetCopy[i]){x=thisCopy[i];y=targetCopy[i];break}}if(x<y)return-1;if(y<x)return 1;return 0};function bidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){if(buffer.length===0)return-1;if(typeof byteOffset===\"string\"){encoding=byteOffset;byteOffset=0}else if(byteOffset>2147483647){byteOffset=2147483647}else if(byteOffset<-2147483648){byteOffset=-2147483648}byteOffset=+byteOffset;if(isNaN(byteOffset)){byteOffset=dir?0:buffer.length-1}if(byteOffset<0)byteOffset=buffer.length+byteOffset;if(byteOffset>=buffer.length){if(dir)return-1;else byteOffset=buffer.length-1}else if(byteOffset<0){if(dir)byteOffset=0;else return-1}if(typeof val===\"string\"){val=Buffer.from(val,encoding)}if(Buffer.isBuffer(val)){if(val.length===0){return-1}return arrayIndexOf(buffer,val,byteOffset,encoding,dir)}else if(typeof val===\"number\"){val=val&255;if(Buffer.TYPED_ARRAY_SUPPORT&&typeof Uint8Array.prototype.indexOf===\"function\"){if(dir){return Uint8Array.prototype.indexOf.call(buffer,val,byteOffset)}else{return Uint8Array.prototype.lastIndexOf.call(buffer,val,byteOffset)}}return arrayIndexOf(buffer,[val],byteOffset,encoding,dir)}throw new TypeError(\"val must be string, number or Buffer\")}function arrayIndexOf(arr,val,byteOffset,encoding,dir){var indexSize=1;var arrLength=arr.length;var valLength=val.length;if(encoding!==undefined){encoding=String(encoding).toLowerCase();if(encoding===\"ucs2\"||encoding===\"ucs-2\"||encoding===\"utf16le\"||encoding===\"utf-16le\"){if(arr.length<2||val.length<2){return-1}indexSize=2;arrLength/=2;valLength/=2;byteOffset/=2}}function read(buf,i){if(indexSize===1){return buf[i]}else{return buf.readUInt16BE(i*indexSize)}}var i;if(dir){var foundIndex=-1;for(i=byteOffset;i<arrLength;i++){if(read(arr,i)===read(val,foundIndex===-1?0:i-foundIndex)){if(foundIndex===-1)foundIndex=i;if(i-foundIndex+1===valLength)return foundIndex*indexSize}else{if(foundIndex!==-1)i-=i-foundIndex;foundIndex=-1}}}else{if(byteOffset+valLength>arrLength)byteOffset=arrLength-valLength;for(i=byteOffset;i>=0;i--){var found=true;for(var j=0;j<valLength;j++){if(read(arr,i+j)!==read(val,j)){found=false;break}}if(found)return i}}return-1}Buffer.prototype.includes=function includes(val,byteOffset,encoding){return this.indexOf(val,byteOffset,encoding)!==-1};Buffer.prototype.indexOf=function indexOf(val,byteOffset,encoding){return bidirectionalIndexOf(this,val,byteOffset,encoding,true)};Buffer.prototype.lastIndexOf=function lastIndexOf(val,byteOffset,encoding){return bidirectionalIndexOf(this,val,byteOffset,encoding,false)};function hexWrite(buf,string,offset,length){offset=Number(offset)||0;var remaining=buf.length-offset;if(!length){length=remaining}else{length=Number(length);if(length>remaining){length=remaining}}var strLen=string.length;if(strLen%2!==0)throw new TypeError(\"Invalid hex string\");if(length>strLen/2){length=strLen/2}for(var i=0;i<length;++i){var parsed=parseInt(string.substr(i*2,2),16);if(isNaN(parsed))return i;buf[offset+i]=parsed}return i}function utf8Write(buf,string,offset,length){return blitBuffer(utf8ToBytes(string,buf.length-offset),buf,offset,length)}function asciiWrite(buf,string,offset,length){return blitBuffer(asciiToBytes(string),buf,offset,length)}function latin1Write(buf,string,offset,length){return asciiWrite(buf,string,offset,length)}function base64Write(buf,string,offset,length){return blitBuffer(base64ToBytes(string),buf,offset,length)}function ucs2Write(buf,string,offset,length){return blitBuffer(utf16leToBytes(string,buf.length-offset),buf,offset,length)}Buffer.prototype.write=function write(string,offset,length,encoding){if(offset===undefined){encoding=\"utf8\";length=this.length;offset=0}else if(length===undefined&&typeof offset===\"string\"){encoding=offset;length=this.length;offset=0}else if(isFinite(offset)){offset=offset|0;if(isFinite(length)){length=length|0;if(encoding===undefined)encoding=\"utf8\"}else{encoding=length;length=undefined}}else{throw new Error(\"Buffer.write(string, encoding, offset[, length]) is no longer supported\")}var remaining=this.length-offset;if(length===undefined||length>remaining)length=remaining;if(string.length>0&&(length<0||offset<0)||offset>this.length){throw new RangeError(\"Attempt to write outside buffer bounds\")}if(!encoding)encoding=\"utf8\";var loweredCase=false;for(;;){switch(encoding){case\"hex\":return hexWrite(this,string,offset,length);case\"utf8\":case\"utf-8\":return utf8Write(this,string,offset,length);case\"ascii\":return asciiWrite(this,string,offset,length);case\"latin1\":case\"binary\":return latin1Write(this,string,offset,length);case\"base64\":return base64Write(this,string,offset,length);case\"ucs2\":case\"ucs-2\":case\"utf16le\":case\"utf-16le\":return ucs2Write(this,string,offset,length);default:if(loweredCase)throw new TypeError(\"Unknown encoding: \"+encoding);encoding=(\"\"+encoding).toLowerCase();loweredCase=true}}};Buffer.prototype.toJSON=function toJSON(){return{type:\"Buffer\",data:Array.prototype.slice.call(this._arr||this,0)}};function base64Slice(buf,start,end){if(start===0&&end===buf.length){return base64.fromByteArray(buf)}else{return base64.fromByteArray(buf.slice(start,end))}}function utf8Slice(buf,start,end){end=Math.min(buf.length,end);var res=[];var i=start;while(i<end){var firstByte=buf[i];var codePoint=null;var bytesPerSequence=firstByte>239?4:firstByte>223?3:firstByte>191?2:1;if(i+bytesPerSequence<=end){var secondByte,thirdByte,fourthByte,tempCodePoint;switch(bytesPerSequence){case 1:if(firstByte<128){codePoint=firstByte}break;case 2:secondByte=buf[i+1];if((secondByte&192)===128){tempCodePoint=(firstByte&31)<<6|secondByte&63;if(tempCodePoint>127){codePoint=tempCodePoint}}break;case 3:secondByte=buf[i+1];thirdByte=buf[i+2];if((secondByte&192)===128&&(thirdByte&192)===128){tempCodePoint=(firstByte&15)<<12|(secondByte&63)<<6|thirdByte&63;if(tempCodePoint>2047&&(tempCodePoint<55296||tempCodePoint>57343)){codePoint=tempCodePoint}}break;case 4:secondByte=buf[i+1];thirdByte=buf[i+2];fourthByte=buf[i+3];if((secondByte&192)===128&&(thirdByte&192)===128&&(fourthByte&192)===128){tempCodePoint=(firstByte&15)<<18|(secondByte&63)<<12|(thirdByte&63)<<6|fourthByte&63;if(tempCodePoint>65535&&tempCodePoint<1114112){codePoint=tempCodePoint}}}}if(codePoint===null){codePoint=65533;bytesPerSequence=1}else if(codePoint>65535){codePoint-=65536;res.push(codePoint>>>10&1023|55296);codePoint=56320|codePoint&1023}res.push(codePoint);i+=bytesPerSequence}return decodeCodePointsArray(res)}var MAX_ARGUMENTS_LENGTH=4096;function decodeCodePointsArray(codePoints){var len=codePoints.length;if(len<=MAX_ARGUMENTS_LENGTH){return String.fromCharCode.apply(String,codePoints)}var res=\"\";var i=0;while(i<len){res+=String.fromCharCode.apply(String,codePoints.slice(i,i+=MAX_ARGUMENTS_LENGTH))}return res}function asciiSlice(buf,start,end){var ret=\"\";end=Math.min(buf.length,end);for(var i=start;i<end;++i){ret+=String.fromCharCode(buf[i]&127)}return ret}function latin1Slice(buf,start,end){var ret=\"\";end=Math.min(buf.length,end);for(var i=start;i<end;++i){ret+=String.fromCharCode(buf[i])}return ret}function hexSlice(buf,start,end){var len=buf.length;if(!start||start<0)start=0;if(!end||end<0||end>len)end=len;var out=\"\";for(var i=start;i<end;++i){out+=toHex(buf[i])}return out}function utf16leSlice(buf,start,end){var bytes=buf.slice(start,end);var res=\"\";for(var i=0;i<bytes.length;i+=2){res+=String.fromCharCode(bytes[i]+bytes[i+1]*256)}return res}Buffer.prototype.slice=function slice(start,end){var len=this.length;start=~~start;end=end===undefined?len:~~end;if(start<0){start+=len;if(start<0)start=0}else if(start>len){start=len}if(end<0){end+=len;if(end<0)end=0}else if(end>len){end=len}if(end<start)end=start;var newBuf;if(Buffer.TYPED_ARRAY_SUPPORT){newBuf=this.subarray(start,end);newBuf.__proto__=Buffer.prototype}else{var sliceLen=end-start;newBuf=new Buffer(sliceLen,undefined);for(var i=0;i<sliceLen;++i){newBuf[i]=this[i+start]}}return newBuf};function checkOffset(offset,ext,length){if(offset%1!==0||offset<0)throw new RangeError(\"offset is not uint\");if(offset+ext>length)throw new RangeError(\"Trying to access beyond buffer length\")}Buffer.prototype.readUIntLE=function readUIntLE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);var val=this[offset];var mul=1;var i=0;while(++i<byteLength&&(mul*=256)){val+=this[offset+i]*mul}return val};Buffer.prototype.readUIntBE=function readUIntBE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert){checkOffset(offset,byteLength,this.length)}var val=this[offset+--byteLength];var mul=1;while(byteLength>0&&(mul*=256)){val+=this[offset+--byteLength]*mul}return val};Buffer.prototype.readUInt8=function readUInt8(offset,noAssert){if(!noAssert)checkOffset(offset,1,this.length);return this[offset]};Buffer.prototype.readUInt16LE=function readUInt16LE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);return this[offset]|this[offset+1]<<8};Buffer.prototype.readUInt16BE=function readUInt16BE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);return this[offset]<<8|this[offset+1]};Buffer.prototype.readUInt32LE=function readUInt32LE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return(this[offset]|this[offset+1]<<8|this[offset+2]<<16)+this[offset+3]*16777216};Buffer.prototype.readUInt32BE=function readUInt32BE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]*16777216+(this[offset+1]<<16|this[offset+2]<<8|this[offset+3])};Buffer.prototype.readIntLE=function readIntLE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);var val=this[offset];var mul=1;var i=0;while(++i<byteLength&&(mul*=256)){val+=this[offset+i]*mul}mul*=128;if(val>=mul)val-=Math.pow(2,8*byteLength);return val};Buffer.prototype.readIntBE=function readIntBE(offset,byteLength,noAssert){offset=offset|0;byteLength=byteLength|0;if(!noAssert)checkOffset(offset,byteLength,this.length);\nvar i=byteLength;var mul=1;var val=this[offset+--i];while(i>0&&(mul*=256)){val+=this[offset+--i]*mul}mul*=128;if(val>=mul)val-=Math.pow(2,8*byteLength);return val};Buffer.prototype.readInt8=function readInt8(offset,noAssert){if(!noAssert)checkOffset(offset,1,this.length);if(!(this[offset]&128))return this[offset];return(255-this[offset]+1)*-1};Buffer.prototype.readInt16LE=function readInt16LE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);var val=this[offset]|this[offset+1]<<8;return val&32768?val|4294901760:val};Buffer.prototype.readInt16BE=function readInt16BE(offset,noAssert){if(!noAssert)checkOffset(offset,2,this.length);var val=this[offset+1]|this[offset]<<8;return val&32768?val|4294901760:val};Buffer.prototype.readInt32LE=function readInt32LE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]|this[offset+1]<<8|this[offset+2]<<16|this[offset+3]<<24};Buffer.prototype.readInt32BE=function readInt32BE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return this[offset]<<24|this[offset+1]<<16|this[offset+2]<<8|this[offset+3]};Buffer.prototype.readFloatLE=function readFloatLE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return ieee754.read(this,offset,true,23,4)};Buffer.prototype.readFloatBE=function readFloatBE(offset,noAssert){if(!noAssert)checkOffset(offset,4,this.length);return ieee754.read(this,offset,false,23,4)};Buffer.prototype.readDoubleLE=function readDoubleLE(offset,noAssert){if(!noAssert)checkOffset(offset,8,this.length);return ieee754.read(this,offset,true,52,8)};Buffer.prototype.readDoubleBE=function readDoubleBE(offset,noAssert){if(!noAssert)checkOffset(offset,8,this.length);return ieee754.read(this,offset,false,52,8)};function checkInt(buf,value,offset,ext,max,min){if(!Buffer.isBuffer(buf))throw new TypeError('\"buffer\" argument must be a Buffer instance');if(value>max||value<min)throw new RangeError('\"value\" argument is out of bounds');if(offset+ext>buf.length)throw new RangeError(\"Index out of range\")}Buffer.prototype.writeUIntLE=function writeUIntLE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;byteLength=byteLength|0;if(!noAssert){var maxBytes=Math.pow(2,8*byteLength)-1;checkInt(this,value,offset,byteLength,maxBytes,0)}var mul=1;var i=0;this[offset]=value&255;while(++i<byteLength&&(mul*=256)){this[offset+i]=value/mul&255}return offset+byteLength};Buffer.prototype.writeUIntBE=function writeUIntBE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;byteLength=byteLength|0;if(!noAssert){var maxBytes=Math.pow(2,8*byteLength)-1;checkInt(this,value,offset,byteLength,maxBytes,0)}var i=byteLength-1;var mul=1;this[offset+i]=value&255;while(--i>=0&&(mul*=256)){this[offset+i]=value/mul&255}return offset+byteLength};Buffer.prototype.writeUInt8=function writeUInt8(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,1,255,0);if(!Buffer.TYPED_ARRAY_SUPPORT)value=Math.floor(value);this[offset]=value&255;return offset+1};function objectWriteUInt16(buf,value,offset,littleEndian){if(value<0)value=65535+value+1;for(var i=0,j=Math.min(buf.length-offset,2);i<j;++i){buf[offset+i]=(value&255<<8*(littleEndian?i:1-i))>>>(littleEndian?i:1-i)*8}}Buffer.prototype.writeUInt16LE=function writeUInt16LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,65535,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8}else{objectWriteUInt16(this,value,offset,true)}return offset+2};Buffer.prototype.writeUInt16BE=function writeUInt16BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,65535,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>8;this[offset+1]=value&255}else{objectWriteUInt16(this,value,offset,false)}return offset+2};function objectWriteUInt32(buf,value,offset,littleEndian){if(value<0)value=4294967295+value+1;for(var i=0,j=Math.min(buf.length-offset,4);i<j;++i){buf[offset+i]=value>>>(littleEndian?i:3-i)*8&255}}Buffer.prototype.writeUInt32LE=function writeUInt32LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,4294967295,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset+3]=value>>>24;this[offset+2]=value>>>16;this[offset+1]=value>>>8;this[offset]=value&255}else{objectWriteUInt32(this,value,offset,true)}return offset+4};Buffer.prototype.writeUInt32BE=function writeUInt32BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,4294967295,0);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>24;this[offset+1]=value>>>16;this[offset+2]=value>>>8;this[offset+3]=value&255}else{objectWriteUInt32(this,value,offset,false)}return offset+4};Buffer.prototype.writeIntLE=function writeIntLE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;if(!noAssert){var limit=Math.pow(2,8*byteLength-1);checkInt(this,value,offset,byteLength,limit-1,-limit)}var i=0;var mul=1;var sub=0;this[offset]=value&255;while(++i<byteLength&&(mul*=256)){if(value<0&&sub===0&&this[offset+i-1]!==0){sub=1}this[offset+i]=(value/mul>>0)-sub&255}return offset+byteLength};Buffer.prototype.writeIntBE=function writeIntBE(value,offset,byteLength,noAssert){value=+value;offset=offset|0;if(!noAssert){var limit=Math.pow(2,8*byteLength-1);checkInt(this,value,offset,byteLength,limit-1,-limit)}var i=byteLength-1;var mul=1;var sub=0;this[offset+i]=value&255;while(--i>=0&&(mul*=256)){if(value<0&&sub===0&&this[offset+i+1]!==0){sub=1}this[offset+i]=(value/mul>>0)-sub&255}return offset+byteLength};Buffer.prototype.writeInt8=function writeInt8(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,1,127,-128);if(!Buffer.TYPED_ARRAY_SUPPORT)value=Math.floor(value);if(value<0)value=255+value+1;this[offset]=value&255;return offset+1};Buffer.prototype.writeInt16LE=function writeInt16LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,32767,-32768);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8}else{objectWriteUInt16(this,value,offset,true)}return offset+2};Buffer.prototype.writeInt16BE=function writeInt16BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,2,32767,-32768);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>8;this[offset+1]=value&255}else{objectWriteUInt16(this,value,offset,false)}return offset+2};Buffer.prototype.writeInt32LE=function writeInt32LE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,2147483647,-2147483648);if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value&255;this[offset+1]=value>>>8;this[offset+2]=value>>>16;this[offset+3]=value>>>24}else{objectWriteUInt32(this,value,offset,true)}return offset+4};Buffer.prototype.writeInt32BE=function writeInt32BE(value,offset,noAssert){value=+value;offset=offset|0;if(!noAssert)checkInt(this,value,offset,4,2147483647,-2147483648);if(value<0)value=4294967295+value+1;if(Buffer.TYPED_ARRAY_SUPPORT){this[offset]=value>>>24;this[offset+1]=value>>>16;this[offset+2]=value>>>8;this[offset+3]=value&255}else{objectWriteUInt32(this,value,offset,false)}return offset+4};function checkIEEE754(buf,value,offset,ext,max,min){if(offset+ext>buf.length)throw new RangeError(\"Index out of range\");if(offset<0)throw new RangeError(\"Index out of range\")}function writeFloat(buf,value,offset,littleEndian,noAssert){if(!noAssert){checkIEEE754(buf,value,offset,4,3.4028234663852886e38,-3.4028234663852886e38)}ieee754.write(buf,value,offset,littleEndian,23,4);return offset+4}Buffer.prototype.writeFloatLE=function writeFloatLE(value,offset,noAssert){return writeFloat(this,value,offset,true,noAssert)};Buffer.prototype.writeFloatBE=function writeFloatBE(value,offset,noAssert){return writeFloat(this,value,offset,false,noAssert)};function writeDouble(buf,value,offset,littleEndian,noAssert){if(!noAssert){checkIEEE754(buf,value,offset,8,1.7976931348623157e308,-1.7976931348623157e308)}ieee754.write(buf,value,offset,littleEndian,52,8);return offset+8}Buffer.prototype.writeDoubleLE=function writeDoubleLE(value,offset,noAssert){return writeDouble(this,value,offset,true,noAssert)};Buffer.prototype.writeDoubleBE=function writeDoubleBE(value,offset,noAssert){return writeDouble(this,value,offset,false,noAssert)};Buffer.prototype.copy=function copy(target,targetStart,start,end){if(!start)start=0;if(!end&&end!==0)end=this.length;if(targetStart>=target.length)targetStart=target.length;if(!targetStart)targetStart=0;if(end>0&&end<start)end=start;if(end===start)return 0;if(target.length===0||this.length===0)return 0;if(targetStart<0){throw new RangeError(\"targetStart out of bounds\")}if(start<0||start>=this.length)throw new RangeError(\"sourceStart out of bounds\");if(end<0)throw new RangeError(\"sourceEnd out of bounds\");if(end>this.length)end=this.length;if(target.length-targetStart<end-start){end=target.length-targetStart+start}var len=end-start;var i;if(this===target&&start<targetStart&&targetStart<end){for(i=len-1;i>=0;--i){target[i+targetStart]=this[i+start]}}else if(len<1e3||!Buffer.TYPED_ARRAY_SUPPORT){for(i=0;i<len;++i){target[i+targetStart]=this[i+start]}}else{Uint8Array.prototype.set.call(target,this.subarray(start,start+len),targetStart)}return len};Buffer.prototype.fill=function fill(val,start,end,encoding){if(typeof val===\"string\"){if(typeof start===\"string\"){encoding=start;start=0;end=this.length}else if(typeof end===\"string\"){encoding=end;end=this.length}if(val.length===1){var code=val.charCodeAt(0);if(code<256){val=code}}if(encoding!==undefined&&typeof encoding!==\"string\"){throw new TypeError(\"encoding must be a string\")}if(typeof encoding===\"string\"&&!Buffer.isEncoding(encoding)){throw new TypeError(\"Unknown encoding: \"+encoding)}}else if(typeof val===\"number\"){val=val&255}if(start<0||this.length<start||this.length<end){throw new RangeError(\"Out of range index\")}if(end<=start){return this}start=start>>>0;end=end===undefined?this.length:end>>>0;if(!val)val=0;var i;if(typeof val===\"number\"){for(i=start;i<end;++i){this[i]=val}}else{var bytes=Buffer.isBuffer(val)?val:utf8ToBytes(new Buffer(val,encoding).toString());var len=bytes.length;for(i=0;i<end-start;++i){this[i+start]=bytes[i%len]}}return this};var INVALID_BASE64_RE=/[^+\\/0-9A-Za-z-_]/g;function base64clean(str){str=stringtrim(str).replace(INVALID_BASE64_RE,\"\");if(str.length<2)return\"\";while(str.length%4!==0){str=str+\"=\"}return str}function stringtrim(str){if(str.trim)return str.trim();return str.replace(/^\\s+|\\s+$/g,\"\")}function toHex(n){if(n<16)return\"0\"+n.toString(16);return n.toString(16)}function utf8ToBytes(string,units){units=units||Infinity;var codePoint;var length=string.length;var leadSurrogate=null;var bytes=[];for(var i=0;i<length;++i){codePoint=string.charCodeAt(i);if(codePoint>55295&&codePoint<57344){if(!leadSurrogate){if(codePoint>56319){if((units-=3)>-1)bytes.push(239,191,189);continue}else if(i+1===length){if((units-=3)>-1)bytes.push(239,191,189);continue}leadSurrogate=codePoint;continue}if(codePoint<56320){if((units-=3)>-1)bytes.push(239,191,189);leadSurrogate=codePoint;continue}codePoint=(leadSurrogate-55296<<10|codePoint-56320)+65536}else if(leadSurrogate){if((units-=3)>-1)bytes.push(239,191,189)}leadSurrogate=null;if(codePoint<128){if((units-=1)<0)break;bytes.push(codePoint)}else if(codePoint<2048){if((units-=2)<0)break;bytes.push(codePoint>>6|192,codePoint&63|128)}else if(codePoint<65536){if((units-=3)<0)break;bytes.push(codePoint>>12|224,codePoint>>6&63|128,codePoint&63|128)}else if(codePoint<1114112){if((units-=4)<0)break;bytes.push(codePoint>>18|240,codePoint>>12&63|128,codePoint>>6&63|128,codePoint&63|128)}else{throw new Error(\"Invalid code point\")}}return bytes}function asciiToBytes(str){var byteArray=[];for(var i=0;i<str.length;++i){byteArray.push(str.charCodeAt(i)&255)}return byteArray}function utf16leToBytes(str,units){var c,hi,lo;var byteArray=[];for(var i=0;i<str.length;++i){if((units-=2)<0)break;c=str.charCodeAt(i);hi=c>>8;lo=c%256;byteArray.push(lo);byteArray.push(hi)}return byteArray}function base64ToBytes(str){return base64.toByteArray(base64clean(str))}function blitBuffer(src,dst,offset,length){for(var i=0;i<length;++i){if(i+offset>=dst.length||i>=src.length)break;dst[i+offset]=src[i]}return i}function isnan(val){return val!==val}}).call(this,typeof global!==\"undefined\"?global:typeof self!==\"undefined\"?self:typeof window!==\"undefined\"?window:{})},{\"base64-js\":2,ieee754:37,isarray:40}],6:[function(require,module,exports){(function(Buffer){function isArray(arg){if(Array.isArray){return Array.isArray(arg)}return objectToString(arg)===\"[object Array]\"}exports.isArray=isArray;function isBoolean(arg){return typeof arg===\"boolean\"}exports.isBoolean=isBoolean;function isNull(arg){return arg===null}exports.isNull=isNull;function isNullOrUndefined(arg){return arg==null}exports.isNullOrUndefined=isNullOrUndefined;function isNumber(arg){return typeof arg===\"number\"}exports.isNumber=isNumber;function isString(arg){return typeof arg===\"string\"}exports.isString=isString;function isSymbol(arg){return typeof arg===\"symbol\"}exports.isSymbol=isSymbol;function isUndefined(arg){return arg===void 0}exports.isUndefined=isUndefined;function isRegExp(re){return objectToString(re)===\"[object RegExp]\"}exports.isRegExp=isRegExp;function isObject(arg){return typeof arg===\"object\"&&arg!==null}exports.isObject=isObject;function isDate(d){return objectToString(d)===\"[object Date]\"}exports.isDate=isDate;function isError(e){return objectToString(e)===\"[object Error]\"||e instanceof Error}exports.isError=isError;function isFunction(arg){return typeof arg===\"function\"}exports.isFunction=isFunction;function isPrimitive(arg){return arg===null||typeof arg===\"boolean\"||typeof arg===\"number\"||typeof arg===\"string\"||typeof arg===\"symbol\"||typeof arg===\"undefined\"}exports.isPrimitive=isPrimitive;exports.isBuffer=Buffer.isBuffer;function objectToString(o){return Object.prototype.toString.call(o)}}).call(this,{isBuffer:require(\"../../is-buffer/index.js\")})},{\"../../is-buffer/index.js\":39}],7:[function(require,module,exports){var ElementType=require(\"domelementtype\");var entities=require(\"entities\");var booleanAttributes={__proto__:null,allowfullscreen:true,async:true,autofocus:true,autoplay:true,checked:true,controls:true,default:true,defer:true,disabled:true,hidden:true,ismap:true,loop:true,multiple:true,muted:true,open:true,readonly:true,required:true,reversed:true,scoped:true,seamless:true,selected:true,typemustmatch:true};var unencodedElements={__proto__:null,style:true,script:true,xmp:true,iframe:true,noembed:true,noframes:true,plaintext:true,noscript:true};function formatAttrs(attributes,opts){if(!attributes)return;var output=\"\",value;for(var key in attributes){value=attributes[key];if(output){output+=\" \"}if(!value&&booleanAttributes[key]){output+=key}else{output+=key+'=\"'+(opts.decodeEntities?entities.encodeXML(value):value)+'\"'}}return output}var singleTag={__proto__:null,area:true,base:true,basefont:true,br:true,col:true,command:true,embed:true,frame:true,hr:true,img:true,input:true,isindex:true,keygen:true,link:true,meta:true,param:true,source:true,track:true,wbr:true};var render=module.exports=function(dom,opts){if(!Array.isArray(dom)&&!dom.cheerio)dom=[dom];opts=opts||{};var output=\"\";for(var i=0;i<dom.length;i++){var elem=dom[i];if(elem.type===\"root\")output+=render(elem.children,opts);else if(ElementType.isTag(elem))output+=renderTag(elem,opts);else if(elem.type===ElementType.Directive)output+=renderDirective(elem);else if(elem.type===ElementType.Comment)output+=renderComment(elem);else if(elem.type===ElementType.CDATA)output+=renderCdata(elem);else output+=renderText(elem,opts)}return output};function renderTag(elem,opts){if(elem.name===\"svg\")opts={decodeEntities:opts.decodeEntities,xmlMode:true};var tag=\"<\"+elem.name,attribs=formatAttrs(elem.attribs,opts);if(attribs){tag+=\" \"+attribs}if(opts.xmlMode&&(!elem.children||elem.children.length===0)){tag+=\"/>\"}else{tag+=\">\";if(elem.children){tag+=render(elem.children,opts)}if(!singleTag[elem.name]||opts.xmlMode){tag+=\"</\"+elem.name+\">\"}}return tag}function renderDirective(elem){return\"<\"+elem.data+\">\"}function renderText(elem,opts){var data=elem.data||\"\";if(opts.decodeEntities&&!(elem.parent&&elem.parent.name in unencodedElements)){data=entities.encodeXML(data)}return data}function renderCdata(elem){return\"<![CDATA[\"+elem.children[0].data+\"]]>\"}function renderComment(elem){return\"<!--\"+elem.data+\"-->\"}},{domelementtype:8,entities:20}],8:[function(require,module,exports){module.exports={Text:\"text\",Directive:\"directive\",Comment:\"comment\",Script:\"script\",Style:\"style\",Tag:\"tag\",CDATA:\"cdata\",isTag:function(elem){return elem.type===\"tag\"||elem.type===\"script\"||elem.type===\"style\"}}},{}],9:[function(require,module,exports){module.exports={Text:\"text\",Directive:\"directive\",Comment:\"comment\",Script:\"script\",Style:\"style\",Tag:\"tag\",CDATA:\"cdata\",Doctype:\"doctype\",isTag:function(elem){return elem.type===\"tag\"||elem.type===\"script\"||elem.type===\"style\"}}},{}],10:[function(require,module,exports){var ElementType=require(\"domelementtype\");var re_whitespace=/\\s+/g;var NodePrototype=require(\"./lib/node\");var ElementPrototype=require(\"./lib/element\");function DomHandler(callback,options,elementCB){if(typeof callback===\"object\"){elementCB=options;options=callback;callback=null}else if(typeof options===\"function\"){elementCB=options;options=defaultOpts}this._callback=callback;this._options=options||defaultOpts;this._elementCB=elementCB;this.dom=[];this._done=false;this._tagStack=[];this._parser=this._parser||null}var defaultOpts={normalizeWhitespace:false,withStartIndices:false};DomHandler.prototype.onparserinit=function(parser){this._parser=parser};DomHandler.prototype.onreset=function(){DomHandler.call(this,this._callback,this._options,this._elementCB)};DomHandler.prototype.onend=function(){if(this._done)return;this._done=true;this._parser=null;this._handleCallback(null)};DomHandler.prototype._handleCallback=DomHandler.prototype.onerror=function(error){if(typeof this._callback===\"function\"){this._callback(error,this.dom)}else{if(error)throw error}};DomHandler.prototype.onclosetag=function(){var elem=this._tagStack.pop();if(this._elementCB)this._elementCB(elem)};DomHandler.prototype._addDomElement=function(element){var parent=this._tagStack[this._tagStack.length-1];var siblings=parent?parent.children:this.dom;var previousSibling=siblings[siblings.length-1];element.next=null;if(this._options.withStartIndices){element.startIndex=this._parser.startIndex}if(this._options.withDomLvl1){element.__proto__=element.type===\"tag\"?ElementPrototype:NodePrototype}if(previousSibling){element.prev=previousSibling;previousSibling.next=element}else{element.prev=null}siblings.push(element);element.parent=parent||null};DomHandler.prototype.onopentag=function(name,attribs){var element={type:name===\"script\"?ElementType.Script:name===\"style\"?ElementType.Style:ElementType.Tag,name:name,attribs:attribs,children:[]};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.ontext=function(data){var normalize=this._options.normalizeWhitespace||this._options.ignoreWhitespace;var lastTag;if(!this._tagStack.length&&this.dom.length&&(lastTag=this.dom[this.dom.length-1]).type===ElementType.Text){if(normalize){lastTag.data=(lastTag.data+data).replace(re_whitespace,\" \")}else{lastTag.data+=data}}else{if(this._tagStack.length&&(lastTag=this._tagStack[this._tagStack.length-1])&&(lastTag=lastTag.children[lastTag.children.length-1])&&lastTag.type===ElementType.Text){if(normalize){lastTag.data=(lastTag.data+data).replace(re_whitespace,\" \")}else{lastTag.data+=data}}else{if(normalize){data=data.replace(re_whitespace,\" \")}this._addDomElement({data:data,type:ElementType.Text})}}};DomHandler.prototype.oncomment=function(data){var lastTag=this._tagStack[this._tagStack.length-1];if(lastTag&&lastTag.type===ElementType.Comment){lastTag.data+=data;return}var element={data:data,type:ElementType.Comment};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.oncdatastart=function(){var element={children:[{data:\"\",type:ElementType.Text}],type:ElementType.CDATA};this._addDomElement(element);this._tagStack.push(element)};DomHandler.prototype.oncommentend=DomHandler.prototype.oncdataend=function(){this._tagStack.pop()};DomHandler.prototype.onprocessinginstruction=function(name,data){this._addDomElement({name:name,data:data,type:ElementType.Directive})};module.exports=DomHandler},{\"./lib/element\":11,\"./lib/node\":12,domelementtype:9}],11:[function(require,module,exports){var NodePrototype=require(\"./node\");var ElementPrototype=module.exports=Object.create(NodePrototype);var domLvl1={tagName:\"name\"};Object.keys(domLvl1).forEach(function(key){var shorthand=domLvl1[key];Object.defineProperty(ElementPrototype,key,{get:function(){return this[shorthand]||null},set:function(val){this[shorthand]=val;return val}})})},{\"./node\":12}],12:[function(require,module,exports){var NodePrototype=module.exports={get firstChild(){var children=this.children;return children&&children[0]||null},get lastChild(){var children=this.children;return children&&children[children.length-1]||null},get nodeType(){return nodeTypes[this.type]||nodeTypes.element}};var domLvl1={tagName:\"name\",childNodes:\"children\",parentNode:\"parent\",previousSibling:\"prev\",nextSibling:\"next\",nodeValue:\"data\"};var nodeTypes={element:1,text:3,cdata:4,comment:8};Object.keys(domLvl1).forEach(function(key){var shorthand=domLvl1[key];Object.defineProperty(NodePrototype,key,{get:function(){return this[shorthand]||null},set:function(val){this[shorthand]=val;return val}})})},{}],13:[function(require,module,exports){var DomUtils=module.exports;[require(\"./lib/stringify\"),require(\"./lib/traversal\"),require(\"./lib/manipulation\"),require(\"./lib/querying\"),require(\"./lib/legacy\"),require(\"./lib/helpers\")].forEach(function(ext){Object.keys(ext).forEach(function(key){DomUtils[key]=ext[key].bind(DomUtils)})})},{\"./lib/helpers\":14,\"./lib/legacy\":15,\"./lib/manipulation\":16,\"./lib/querying\":17,\"./lib/stringify\":18,\"./lib/traversal\":19}],14:[function(require,module,exports){exports.removeSubsets=function(nodes){var idx=nodes.length,node,ancestor,replace;while(--idx>-1){node=ancestor=nodes[idx];nodes[idx]=null;replace=true;while(ancestor){if(nodes.indexOf(ancestor)>-1){replace=false;nodes.splice(idx,1);break}ancestor=ancestor.parent}if(replace){nodes[idx]=node}}return nodes};var POSITION={DISCONNECTED:1,PRECEDING:2,FOLLOWING:4,CONTAINS:8,CONTAINED_BY:16};var comparePos=exports.compareDocumentPosition=function(nodeA,nodeB){var aParents=[];var bParents=[];var current,sharedParent,siblings,aSibling,bSibling,idx;if(nodeA===nodeB){return 0}current=nodeA;while(current){aParents.unshift(current);current=current.parent}current=nodeB;while(current){bParents.unshift(current);current=current.parent}idx=0;while(aParents[idx]===bParents[idx]){idx++}if(idx===0){return POSITION.DISCONNECTED}sharedParent=aParents[idx-1];siblings=sharedParent.children;aSibling=aParents[idx];bSibling=bParents[idx];if(siblings.indexOf(aSibling)>siblings.indexOf(bSibling)){if(sharedParent===nodeB){return POSITION.FOLLOWING|POSITION.CONTAINED_BY}return POSITION.FOLLOWING}else{if(sharedParent===nodeA){return POSITION.PRECEDING|POSITION.CONTAINS}return POSITION.PRECEDING}};exports.uniqueSort=function(nodes){var idx=nodes.length,node,position;nodes=nodes.slice();while(--idx>-1){node=nodes[idx];position=nodes.indexOf(node);if(position>-1&&position<idx){nodes.splice(idx,1)}}nodes.sort(function(a,b){var relative=comparePos(a,b);if(relative&POSITION.PRECEDING){return-1}else if(relative&POSITION.FOLLOWING){return 1}return 0});return nodes}},{}],15:[function(require,module,exports){var ElementType=require(\"domelementtype\");var isTag=exports.isTag=ElementType.isTag;exports.testElement=function(options,element){for(var key in options){if(!options.hasOwnProperty(key));else if(key===\"tag_name\"){if(!isTag(element)||!options.tag_name(element.name)){return false}}else if(key===\"tag_type\"){if(!options.tag_type(element.type))return false}else if(key===\"tag_contains\"){if(isTag(element)||!options.tag_contains(element.data)){return false}}else if(!element.attribs||!options[key](element.attribs[key])){return false}}return true};var Checks={tag_name:function(name){if(typeof name===\"function\"){return function(elem){return isTag(elem)&&name(elem.name)}}else if(name===\"*\"){return isTag}else{return function(elem){return isTag(elem)&&elem.name===name}}},tag_type:function(type){if(typeof type===\"function\"){return function(elem){return type(elem.type)}}else{return function(elem){return elem.type===type}}},tag_contains:function(data){if(typeof data===\"function\"){return function(elem){return!isTag(elem)&&data(elem.data)}}else{return function(elem){return!isTag(elem)&&elem.data===data}}}};function getAttribCheck(attrib,value){if(typeof value===\"function\"){return function(elem){return elem.attribs&&value(elem.attribs[attrib])}}else{return function(elem){return elem.attribs&&elem.attribs[attrib]===value}}}function combineFuncs(a,b){return function(elem){return a(elem)||b(elem)}}exports.getElements=function(options,element,recurse,limit){var funcs=Object.keys(options).map(function(key){var value=options[key];return key in Checks?Checks[key](value):getAttribCheck(key,value)});return funcs.length===0?[]:this.filter(funcs.reduce(combineFuncs),element,recurse,limit)};exports.getElementById=function(id,element,recurse){if(!Array.isArray(element))element=[element];return this.findOne(getAttribCheck(\"id\",id),element,recurse!==false)};exports.getElementsByTagName=function(name,element,recurse,limit){return this.filter(Checks.tag_name(name),element,recurse,limit)};exports.getElementsByTagType=function(type,element,recurse,limit){return this.filter(Checks.tag_type(type),element,recurse,limit)}},{domelementtype:9}],16:[function(require,module,exports){exports.removeElement=function(elem){if(elem.prev)elem.prev.next=elem.next;if(elem.next)elem.next.prev=elem.prev;if(elem.parent){var childs=elem.parent.children;childs.splice(childs.lastIndexOf(elem),1)}};exports.replaceElement=function(elem,replacement){var prev=replacement.prev=elem.prev;if(prev){prev.next=replacement}var next=replacement.next=elem.next;if(next){next.prev=replacement}var parent=replacement.parent=elem.parent;if(parent){var childs=parent.children;childs[childs.lastIndexOf(elem)]=replacement}};exports.appendChild=function(elem,child){child.parent=elem;if(elem.children.push(child)!==1){var sibling=elem.children[elem.children.length-2];sibling.next=child;child.prev=sibling;child.next=null}};exports.append=function(elem,next){var parent=elem.parent,currNext=elem.next;next.next=currNext;next.prev=elem;elem.next=next;next.parent=parent;if(currNext){currNext.prev=next;if(parent){var childs=parent.children;childs.splice(childs.lastIndexOf(currNext),0,next)}}else if(parent){parent.children.push(next)}};exports.prepend=function(elem,prev){var parent=elem.parent;if(parent){var childs=parent.children;childs.splice(childs.lastIndexOf(elem),0,prev)}if(elem.prev){elem.prev.next=prev}prev.parent=parent;prev.prev=elem.prev;prev.next=elem;elem.prev=prev}},{}],17:[function(require,module,exports){var isTag=require(\"domelementtype\").isTag;module.exports={filter:filter,find:find,findOneChild:findOneChild,findOne:findOne,existsOne:existsOne,findAll:findAll};function filter(test,element,recurse,limit){if(!Array.isArray(element))element=[element];if(typeof limit!==\"number\"||!isFinite(limit)){limit=Infinity}return find(test,element,recurse!==false,limit)}function find(test,elems,recurse,limit){var result=[],childs;for(var i=0,j=elems.length;i<j;i++){if(test(elems[i])){result.push(elems[i]);if(--limit<=0)break}childs=elems[i].children;if(recurse&&childs&&childs.length>0){childs=find(test,childs,recurse,limit);result=result.concat(childs);limit-=childs.length;if(limit<=0)break}}return result}function findOneChild(test,elems){for(var i=0,l=elems.length;i<l;i++){if(test(elems[i]))return elems[i]}return null}function findOne(test,elems){var elem=null;for(var i=0,l=elems.length;i<l&&!elem;i++){if(!isTag(elems[i])){continue}else if(test(elems[i])){elem=elems[i]}else if(elems[i].children.length>0){elem=findOne(test,elems[i].children)}}return elem}function existsOne(test,elems){for(var i=0,l=elems.length;i<l;i++){if(isTag(elems[i])&&(test(elems[i])||elems[i].children.length>0&&existsOne(test,elems[i].children))){return true}}return false}function findAll(test,elems){var result=[];for(var i=0,j=elems.length;i<j;i++){if(!isTag(elems[i]))continue;if(test(elems[i]))result.push(elems[i]);if(elems[i].children.length>0){result=result.concat(findAll(test,elems[i].children))}}return result}},{domelementtype:9}],18:[function(require,module,exports){var ElementType=require(\"domelementtype\"),getOuterHTML=require(\"dom-serializer\"),isTag=ElementType.isTag;module.exports={getInnerHTML:getInnerHTML,getOuterHTML:getOuterHTML,getText:getText};function getInnerHTML(elem,opts){return elem.children?elem.children.map(function(elem){return getOuterHTML(elem,opts)}).join(\"\"):\"\"}function getText(elem){if(Array.isArray(elem))return elem.map(getText).join(\"\");if(isTag(elem)||elem.type===ElementType.CDATA)return getText(elem.children);if(elem.type===ElementType.Text)return elem.data;return\"\"}},{\"dom-serializer\":7,domelementtype:9}],19:[function(require,module,exports){var getChildren=exports.getChildren=function(elem){return elem.children};var getParent=exports.getParent=function(elem){return elem.parent};exports.getSiblings=function(elem){var parent=getParent(elem);return parent?getChildren(parent):[elem]};exports.getAttributeValue=function(elem,name){return elem.attribs&&elem.attribs[name]};exports.hasAttrib=function(elem,name){return!!elem.attribs&&hasOwnProperty.call(elem.attribs,name)};exports.getName=function(elem){return elem.name}},{}],20:[function(require,module,exports){var encode=require(\"./lib/encode.js\"),decode=require(\"./lib/decode.js\");exports.decode=function(data,level){return(!level||level<=0?decode.XML:decode.HTML)(data)};exports.decodeStrict=function(data,level){return(!level||level<=0?decode.XML:decode.HTMLStrict)(data)};exports.encode=function(data,level){return(!level||level<=0?encode.XML:encode.HTML)(data)};exports.encodeXML=encode.XML;exports.encodeHTML4=exports.encodeHTML5=exports.encodeHTML=encode.HTML;exports.decodeXML=exports.decodeXMLStrict=decode.XML;exports.decodeHTML4=exports.decodeHTML5=exports.decodeHTML=decode.HTML;exports.decodeHTML4Strict=exports.decodeHTML5Strict=exports.decodeHTMLStrict=decode.HTMLStrict;exports.escape=encode.escape},{\"./lib/decode.js\":21,\"./lib/encode.js\":23}],21:[function(require,module,exports){var entityMap=require(\"../maps/entities.json\"),legacyMap=require(\"../maps/legacy.json\"),xmlMap=require(\"../maps/xml.json\"),decodeCodePoint=require(\"./decode_codepoint.js\");var decodeXMLStrict=getStrictDecoder(xmlMap),decodeHTMLStrict=getStrictDecoder(entityMap);function getStrictDecoder(map){var keys=Object.keys(map).join(\"|\"),replace=getReplacer(map);keys+=\"|#[xX][\\\\da-fA-F]+|#\\\\d+\";var re=new RegExp(\"&(?:\"+keys+\");\",\"g\");return function(str){return String(str).replace(re,replace)}}var decodeHTML=function(){var legacy=Object.keys(legacyMap).sort(sorter);var keys=Object.keys(entityMap).sort(sorter);for(var i=0,j=0;i<keys.length;i++){if(legacy[j]===keys[i]){keys[i]+=\";?\";j++}else{keys[i]+=\";\"}}var re=new RegExp(\"&(?:\"+keys.join(\"|\")+\"|#[xX][\\\\da-fA-F]+;?|#\\\\d+;?)\",\"g\"),replace=getReplacer(entityMap);function replacer(str){if(str.substr(-1)!==\";\")str+=\";\";return replace(str)}return function(str){return String(str).replace(re,replacer)}}();function sorter(a,b){return a<b?1:-1}function getReplacer(map){return function replace(str){if(str.charAt(1)===\"#\"){if(str.charAt(2)===\"X\"||str.charAt(2)===\"x\"){return decodeCodePoint(parseInt(str.substr(3),16))}return decodeCodePoint(parseInt(str.substr(2),10))}return map[str.slice(1,-1)];\n}}module.exports={XML:decodeXMLStrict,HTML:decodeHTML,HTMLStrict:decodeHTMLStrict}},{\"../maps/entities.json\":25,\"../maps/legacy.json\":26,\"../maps/xml.json\":27,\"./decode_codepoint.js\":22}],22:[function(require,module,exports){var decodeMap=require(\"../maps/decode.json\");module.exports=decodeCodePoint;function decodeCodePoint(codePoint){if(codePoint>=55296&&codePoint<=57343||codePoint>1114111){return\"�\"}if(codePoint in decodeMap){codePoint=decodeMap[codePoint]}var output=\"\";if(codePoint>65535){codePoint-=65536;output+=String.fromCharCode(codePoint>>>10&1023|55296);codePoint=56320|codePoint&1023}output+=String.fromCharCode(codePoint);return output}},{\"../maps/decode.json\":24}],23:[function(require,module,exports){var inverseXML=getInverseObj(require(\"../maps/xml.json\")),xmlReplacer=getInverseReplacer(inverseXML);exports.XML=getInverse(inverseXML,xmlReplacer);var inverseHTML=getInverseObj(require(\"../maps/entities.json\")),htmlReplacer=getInverseReplacer(inverseHTML);exports.HTML=getInverse(inverseHTML,htmlReplacer);function getInverseObj(obj){return Object.keys(obj).sort().reduce(function(inverse,name){inverse[obj[name]]=\"&\"+name+\";\";return inverse},{})}function getInverseReplacer(inverse){var single=[],multiple=[];Object.keys(inverse).forEach(function(k){if(k.length===1){single.push(\"\\\\\"+k)}else{multiple.push(k)}});multiple.unshift(\"[\"+single.join(\"\")+\"]\");return new RegExp(multiple.join(\"|\"),\"g\")}var re_nonASCII=/[^\\0-\\x7F]/g,re_astralSymbols=/[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]/g;function singleCharReplacer(c){return\"&#x\"+c.charCodeAt(0).toString(16).toUpperCase()+\";\"}function astralReplacer(c){var high=c.charCodeAt(0);var low=c.charCodeAt(1);var codePoint=(high-55296)*1024+low-56320+65536;return\"&#x\"+codePoint.toString(16).toUpperCase()+\";\"}function getInverse(inverse,re){function func(name){return inverse[name]}return function(data){return data.replace(re,func).replace(re_astralSymbols,astralReplacer).replace(re_nonASCII,singleCharReplacer)}}var re_xmlChars=getInverseReplacer(inverseXML);function escapeXML(data){return data.replace(re_xmlChars,singleCharReplacer).replace(re_astralSymbols,astralReplacer).replace(re_nonASCII,singleCharReplacer)}exports.escape=escapeXML},{\"../maps/entities.json\":25,\"../maps/xml.json\":27}],24:[function(require,module,exports){module.exports={0:65533,128:8364,130:8218,131:402,132:8222,133:8230,134:8224,135:8225,136:710,137:8240,138:352,139:8249,140:338,142:381,145:8216,146:8217,147:8220,148:8221,149:8226,150:8211,151:8212,152:732,153:8482,154:353,155:8250,156:339,158:382,159:376}},{}],25:[function(require,module,exports){module.exports={Aacute:\"Á\",aacute:\"á\",Abreve:\"Ă\",abreve:\"ă\",ac:\"∾\",acd:\"∿\",acE:\"∾̳\",Acirc:\"Â\",acirc:\"â\",acute:\"´\",Acy:\"А\",acy:\"а\",AElig:\"Æ\",aelig:\"æ\",af:\"⁡\",Afr:\"𝔄\",afr:\"𝔞\",Agrave:\"À\",agrave:\"à\",alefsym:\"ℵ\",aleph:\"ℵ\",Alpha:\"Α\",alpha:\"α\",Amacr:\"Ā\",amacr:\"ā\",amalg:\"⨿\",amp:\"&\",AMP:\"&\",andand:\"⩕\",And:\"⩓\",and:\"∧\",andd:\"⩜\",andslope:\"⩘\",andv:\"⩚\",ang:\"∠\",ange:\"⦤\",angle:\"∠\",angmsdaa:\"⦨\",angmsdab:\"⦩\",angmsdac:\"⦪\",angmsdad:\"⦫\",angmsdae:\"⦬\",angmsdaf:\"⦭\",angmsdag:\"⦮\",angmsdah:\"⦯\",angmsd:\"∡\",angrt:\"∟\",angrtvb:\"⊾\",angrtvbd:\"⦝\",angsph:\"∢\",angst:\"Å\",angzarr:\"⍼\",Aogon:\"Ą\",aogon:\"ą\",Aopf:\"𝔸\",aopf:\"𝕒\",apacir:\"⩯\",ap:\"≈\",apE:\"⩰\",ape:\"≊\",apid:\"≋\",apos:\"'\",ApplyFunction:\"⁡\",approx:\"≈\",approxeq:\"≊\",Aring:\"Å\",aring:\"å\",Ascr:\"𝒜\",ascr:\"𝒶\",Assign:\"≔\",ast:\"*\",asymp:\"≈\",asympeq:\"≍\",Atilde:\"Ã\",atilde:\"ã\",Auml:\"Ä\",auml:\"ä\",awconint:\"∳\",awint:\"⨑\",backcong:\"≌\",backepsilon:\"϶\",backprime:\"‵\",backsim:\"∽\",backsimeq:\"⋍\",Backslash:\"∖\",Barv:\"⫧\",barvee:\"⊽\",barwed:\"⌅\",Barwed:\"⌆\",barwedge:\"⌅\",bbrk:\"⎵\",bbrktbrk:\"⎶\",bcong:\"≌\",Bcy:\"Б\",bcy:\"б\",bdquo:\"„\",becaus:\"∵\",because:\"∵\",Because:\"∵\",bemptyv:\"⦰\",bepsi:\"϶\",bernou:\"ℬ\",Bernoullis:\"ℬ\",Beta:\"Β\",beta:\"β\",beth:\"ℶ\",between:\"≬\",Bfr:\"𝔅\",bfr:\"𝔟\",bigcap:\"⋂\",bigcirc:\"◯\",bigcup:\"⋃\",bigodot:\"⨀\",bigoplus:\"⨁\",bigotimes:\"⨂\",bigsqcup:\"⨆\",bigstar:\"★\",bigtriangledown:\"▽\",bigtriangleup:\"△\",biguplus:\"⨄\",bigvee:\"⋁\",bigwedge:\"⋀\",bkarow:\"⤍\",blacklozenge:\"⧫\",blacksquare:\"▪\",blacktriangle:\"▴\",blacktriangledown:\"▾\",blacktriangleleft:\"◂\",blacktriangleright:\"▸\",blank:\"␣\",blk12:\"▒\",blk14:\"░\",blk34:\"▓\",block:\"█\",bne:\"=⃥\",bnequiv:\"≡⃥\",bNot:\"⫭\",bnot:\"⌐\",Bopf:\"𝔹\",bopf:\"𝕓\",bot:\"⊥\",bottom:\"⊥\",bowtie:\"⋈\",boxbox:\"⧉\",boxdl:\"┐\",boxdL:\"╕\",boxDl:\"╖\",boxDL:\"╗\",boxdr:\"┌\",boxdR:\"╒\",boxDr:\"╓\",boxDR:\"╔\",boxh:\"─\",boxH:\"═\",boxhd:\"┬\",boxHd:\"╤\",boxhD:\"╥\",boxHD:\"╦\",boxhu:\"┴\",boxHu:\"╧\",boxhU:\"╨\",boxHU:\"╩\",boxminus:\"⊟\",boxplus:\"⊞\",boxtimes:\"⊠\",boxul:\"┘\",boxuL:\"╛\",boxUl:\"╜\",boxUL:\"╝\",boxur:\"└\",boxuR:\"╘\",boxUr:\"╙\",boxUR:\"╚\",boxv:\"│\",boxV:\"║\",boxvh:\"┼\",boxvH:\"╪\",boxVh:\"╫\",boxVH:\"╬\",boxvl:\"┤\",boxvL:\"╡\",boxVl:\"╢\",boxVL:\"╣\",boxvr:\"├\",boxvR:\"╞\",boxVr:\"╟\",boxVR:\"╠\",bprime:\"‵\",breve:\"˘\",Breve:\"˘\",brvbar:\"¦\",bscr:\"𝒷\",Bscr:\"ℬ\",bsemi:\"⁏\",bsim:\"∽\",bsime:\"⋍\",bsolb:\"⧅\",bsol:\"\\\\\",bsolhsub:\"⟈\",bull:\"•\",bullet:\"•\",bump:\"≎\",bumpE:\"⪮\",bumpe:\"≏\",Bumpeq:\"≎\",bumpeq:\"≏\",Cacute:\"Ć\",cacute:\"ć\",capand:\"⩄\",capbrcup:\"⩉\",capcap:\"⩋\",cap:\"∩\",Cap:\"⋒\",capcup:\"⩇\",capdot:\"⩀\",CapitalDifferentialD:\"ⅅ\",caps:\"∩︀\",caret:\"⁁\",caron:\"ˇ\",Cayleys:\"ℭ\",ccaps:\"⩍\",Ccaron:\"Č\",ccaron:\"č\",Ccedil:\"Ç\",ccedil:\"ç\",Ccirc:\"Ĉ\",ccirc:\"ĉ\",Cconint:\"∰\",ccups:\"⩌\",ccupssm:\"⩐\",Cdot:\"Ċ\",cdot:\"ċ\",cedil:\"¸\",Cedilla:\"¸\",cemptyv:\"⦲\",cent:\"¢\",centerdot:\"·\",CenterDot:\"·\",cfr:\"𝔠\",Cfr:\"ℭ\",CHcy:\"Ч\",chcy:\"ч\",check:\"✓\",checkmark:\"✓\",Chi:\"Χ\",chi:\"χ\",circ:\"ˆ\",circeq:\"≗\",circlearrowleft:\"↺\",circlearrowright:\"↻\",circledast:\"⊛\",circledcirc:\"⊚\",circleddash:\"⊝\",CircleDot:\"⊙\",circledR:\"®\",circledS:\"Ⓢ\",CircleMinus:\"⊖\",CirclePlus:\"⊕\",CircleTimes:\"⊗\",cir:\"○\",cirE:\"⧃\",cire:\"≗\",cirfnint:\"⨐\",cirmid:\"⫯\",cirscir:\"⧂\",ClockwiseContourIntegral:\"∲\",CloseCurlyDoubleQuote:\"”\",CloseCurlyQuote:\"’\",clubs:\"♣\",clubsuit:\"♣\",colon:\":\",Colon:\"∷\",Colone:\"⩴\",colone:\"≔\",coloneq:\"≔\",comma:\",\",commat:\"@\",comp:\"∁\",compfn:\"∘\",complement:\"∁\",complexes:\"ℂ\",cong:\"≅\",congdot:\"⩭\",Congruent:\"≡\",conint:\"∮\",Conint:\"∯\",ContourIntegral:\"∮\",copf:\"𝕔\",Copf:\"ℂ\",coprod:\"∐\",Coproduct:\"∐\",copy:\"©\",COPY:\"©\",copysr:\"℗\",CounterClockwiseContourIntegral:\"∳\",crarr:\"↵\",cross:\"✗\",Cross:\"⨯\",Cscr:\"𝒞\",cscr:\"𝒸\",csub:\"⫏\",csube:\"⫑\",csup:\"⫐\",csupe:\"⫒\",ctdot:\"⋯\",cudarrl:\"⤸\",cudarrr:\"⤵\",cuepr:\"⋞\",cuesc:\"⋟\",cularr:\"↶\",cularrp:\"⤽\",cupbrcap:\"⩈\",cupcap:\"⩆\",CupCap:\"≍\",cup:\"∪\",Cup:\"⋓\",cupcup:\"⩊\",cupdot:\"⊍\",cupor:\"⩅\",cups:\"∪︀\",curarr:\"↷\",curarrm:\"⤼\",curlyeqprec:\"⋞\",curlyeqsucc:\"⋟\",curlyvee:\"⋎\",curlywedge:\"⋏\",curren:\"¤\",curvearrowleft:\"↶\",curvearrowright:\"↷\",cuvee:\"⋎\",cuwed:\"⋏\",cwconint:\"∲\",cwint:\"∱\",cylcty:\"⌭\",dagger:\"†\",Dagger:\"‡\",daleth:\"ℸ\",darr:\"↓\",Darr:\"↡\",dArr:\"⇓\",dash:\"‐\",Dashv:\"⫤\",dashv:\"⊣\",dbkarow:\"⤏\",dblac:\"˝\",Dcaron:\"Ď\",dcaron:\"ď\",Dcy:\"Д\",dcy:\"д\",ddagger:\"‡\",ddarr:\"⇊\",DD:\"ⅅ\",dd:\"ⅆ\",DDotrahd:\"⤑\",ddotseq:\"⩷\",deg:\"°\",Del:\"∇\",Delta:\"Δ\",delta:\"δ\",demptyv:\"⦱\",dfisht:\"⥿\",Dfr:\"𝔇\",dfr:\"𝔡\",dHar:\"⥥\",dharl:\"⇃\",dharr:\"⇂\",DiacriticalAcute:\"´\",DiacriticalDot:\"˙\",DiacriticalDoubleAcute:\"˝\",DiacriticalGrave:\"`\",DiacriticalTilde:\"˜\",diam:\"⋄\",diamond:\"⋄\",Diamond:\"⋄\",diamondsuit:\"♦\",diams:\"♦\",die:\"¨\",DifferentialD:\"ⅆ\",digamma:\"ϝ\",disin:\"⋲\",div:\"÷\",divide:\"÷\",divideontimes:\"⋇\",divonx:\"⋇\",DJcy:\"Ђ\",djcy:\"ђ\",dlcorn:\"⌞\",dlcrop:\"⌍\",dollar:\"$\",Dopf:\"𝔻\",dopf:\"𝕕\",Dot:\"¨\",dot:\"˙\",DotDot:\"⃜\",doteq:\"≐\",doteqdot:\"≑\",DotEqual:\"≐\",dotminus:\"∸\",dotplus:\"∔\",dotsquare:\"⊡\",doublebarwedge:\"⌆\",DoubleContourIntegral:\"∯\",DoubleDot:\"¨\",DoubleDownArrow:\"⇓\",DoubleLeftArrow:\"⇐\",DoubleLeftRightArrow:\"⇔\",DoubleLeftTee:\"⫤\",DoubleLongLeftArrow:\"⟸\",DoubleLongLeftRightArrow:\"⟺\",DoubleLongRightArrow:\"⟹\",DoubleRightArrow:\"⇒\",DoubleRightTee:\"⊨\",DoubleUpArrow:\"⇑\",DoubleUpDownArrow:\"⇕\",DoubleVerticalBar:\"∥\",DownArrowBar:\"⤓\",downarrow:\"↓\",DownArrow:\"↓\",Downarrow:\"⇓\",DownArrowUpArrow:\"⇵\",DownBreve:\"̑\",downdownarrows:\"⇊\",downharpoonleft:\"⇃\",downharpoonright:\"⇂\",DownLeftRightVector:\"⥐\",DownLeftTeeVector:\"⥞\",DownLeftVectorBar:\"⥖\",DownLeftVector:\"↽\",DownRightTeeVector:\"⥟\",DownRightVectorBar:\"⥗\",DownRightVector:\"⇁\",DownTeeArrow:\"↧\",DownTee:\"⊤\",drbkarow:\"⤐\",drcorn:\"⌟\",drcrop:\"⌌\",Dscr:\"𝒟\",dscr:\"𝒹\",DScy:\"Ѕ\",dscy:\"ѕ\",dsol:\"⧶\",Dstrok:\"Đ\",dstrok:\"đ\",dtdot:\"⋱\",dtri:\"▿\",dtrif:\"▾\",duarr:\"⇵\",duhar:\"⥯\",dwangle:\"⦦\",DZcy:\"Џ\",dzcy:\"џ\",dzigrarr:\"⟿\",Eacute:\"É\",eacute:\"é\",easter:\"⩮\",Ecaron:\"Ě\",ecaron:\"ě\",Ecirc:\"Ê\",ecirc:\"ê\",ecir:\"≖\",ecolon:\"≕\",Ecy:\"Э\",ecy:\"э\",eDDot:\"⩷\",Edot:\"Ė\",edot:\"ė\",eDot:\"≑\",ee:\"ⅇ\",efDot:\"≒\",Efr:\"𝔈\",efr:\"𝔢\",eg:\"⪚\",Egrave:\"È\",egrave:\"è\",egs:\"⪖\",egsdot:\"⪘\",el:\"⪙\",Element:\"∈\",elinters:\"⏧\",ell:\"ℓ\",els:\"⪕\",elsdot:\"⪗\",Emacr:\"Ē\",emacr:\"ē\",empty:\"∅\",emptyset:\"∅\",EmptySmallSquare:\"◻\",emptyv:\"∅\",EmptyVerySmallSquare:\"▫\",emsp13:\" \",emsp14:\" \",emsp:\" \",ENG:\"Ŋ\",eng:\"ŋ\",ensp:\" \",Eogon:\"Ę\",eogon:\"ę\",Eopf:\"𝔼\",eopf:\"𝕖\",epar:\"⋕\",eparsl:\"⧣\",eplus:\"⩱\",epsi:\"ε\",Epsilon:\"Ε\",epsilon:\"ε\",epsiv:\"ϵ\",eqcirc:\"≖\",eqcolon:\"≕\",eqsim:\"≂\",eqslantgtr:\"⪖\",eqslantless:\"⪕\",Equal:\"⩵\",equals:\"=\",EqualTilde:\"≂\",equest:\"≟\",Equilibrium:\"⇌\",equiv:\"≡\",equivDD:\"⩸\",eqvparsl:\"⧥\",erarr:\"⥱\",erDot:\"≓\",escr:\"ℯ\",Escr:\"ℰ\",esdot:\"≐\",Esim:\"⩳\",esim:\"≂\",Eta:\"Η\",eta:\"η\",ETH:\"Ð\",eth:\"ð\",Euml:\"Ë\",euml:\"ë\",euro:\"€\",excl:\"!\",exist:\"∃\",Exists:\"∃\",expectation:\"ℰ\",exponentiale:\"ⅇ\",ExponentialE:\"ⅇ\",fallingdotseq:\"≒\",Fcy:\"Ф\",fcy:\"ф\",female:\"♀\",ffilig:\"ﬃ\",fflig:\"ﬀ\",ffllig:\"ﬄ\",Ffr:\"𝔉\",ffr:\"𝔣\",filig:\"ﬁ\",FilledSmallSquare:\"◼\",FilledVerySmallSquare:\"▪\",fjlig:\"fj\",flat:\"♭\",fllig:\"ﬂ\",fltns:\"▱\",fnof:\"ƒ\",Fopf:\"𝔽\",fopf:\"𝕗\",forall:\"∀\",ForAll:\"∀\",fork:\"⋔\",forkv:\"⫙\",Fouriertrf:\"ℱ\",fpartint:\"⨍\",frac12:\"½\",frac13:\"⅓\",frac14:\"¼\",frac15:\"⅕\",frac16:\"⅙\",frac18:\"⅛\",frac23:\"⅔\",frac25:\"⅖\",frac34:\"¾\",frac35:\"⅗\",frac38:\"⅜\",frac45:\"⅘\",frac56:\"⅚\",frac58:\"⅝\",frac78:\"⅞\",frasl:\"⁄\",frown:\"⌢\",fscr:\"𝒻\",Fscr:\"ℱ\",gacute:\"ǵ\",Gamma:\"Γ\",gamma:\"γ\",Gammad:\"Ϝ\",gammad:\"ϝ\",gap:\"⪆\",Gbreve:\"Ğ\",gbreve:\"ğ\",Gcedil:\"Ģ\",Gcirc:\"Ĝ\",gcirc:\"ĝ\",Gcy:\"Г\",gcy:\"г\",Gdot:\"Ġ\",gdot:\"ġ\",ge:\"≥\",gE:\"≧\",gEl:\"⪌\",gel:\"⋛\",geq:\"≥\",geqq:\"≧\",geqslant:\"⩾\",gescc:\"⪩\",ges:\"⩾\",gesdot:\"⪀\",gesdoto:\"⪂\",gesdotol:\"⪄\",gesl:\"⋛︀\",gesles:\"⪔\",Gfr:\"𝔊\",gfr:\"𝔤\",gg:\"≫\",Gg:\"⋙\",ggg:\"⋙\",gimel:\"ℷ\",GJcy:\"Ѓ\",gjcy:\"ѓ\",gla:\"⪥\",gl:\"≷\",glE:\"⪒\",glj:\"⪤\",gnap:\"⪊\",gnapprox:\"⪊\",gne:\"⪈\",gnE:\"≩\",gneq:\"⪈\",gneqq:\"≩\",gnsim:\"⋧\",Gopf:\"𝔾\",gopf:\"𝕘\",grave:\"`\",GreaterEqual:\"≥\",GreaterEqualLess:\"⋛\",GreaterFullEqual:\"≧\",GreaterGreater:\"⪢\",GreaterLess:\"≷\",GreaterSlantEqual:\"⩾\",GreaterTilde:\"≳\",Gscr:\"𝒢\",gscr:\"ℊ\",gsim:\"≳\",gsime:\"⪎\",gsiml:\"⪐\",gtcc:\"⪧\",gtcir:\"⩺\",gt:\">\",GT:\">\",Gt:\"≫\",gtdot:\"⋗\",gtlPar:\"⦕\",gtquest:\"⩼\",gtrapprox:\"⪆\",gtrarr:\"⥸\",gtrdot:\"⋗\",gtreqless:\"⋛\",gtreqqless:\"⪌\",gtrless:\"≷\",gtrsim:\"≳\",gvertneqq:\"≩︀\",gvnE:\"≩︀\",Hacek:\"ˇ\",hairsp:\" \",half:\"½\",hamilt:\"ℋ\",HARDcy:\"Ъ\",hardcy:\"ъ\",harrcir:\"⥈\",harr:\"↔\",hArr:\"⇔\",harrw:\"↭\",Hat:\"^\",hbar:\"ℏ\",Hcirc:\"Ĥ\",hcirc:\"ĥ\",hearts:\"♥\",heartsuit:\"♥\",hellip:\"…\",hercon:\"⊹\",hfr:\"𝔥\",Hfr:\"ℌ\",HilbertSpace:\"ℋ\",hksearow:\"⤥\",hkswarow:\"⤦\",hoarr:\"⇿\",homtht:\"∻\",hookleftarrow:\"↩\",hookrightarrow:\"↪\",hopf:\"𝕙\",Hopf:\"ℍ\",horbar:\"―\",HorizontalLine:\"─\",hscr:\"𝒽\",Hscr:\"ℋ\",hslash:\"ℏ\",Hstrok:\"Ħ\",hstrok:\"ħ\",HumpDownHump:\"≎\",HumpEqual:\"≏\",hybull:\"⁃\",hyphen:\"‐\",Iacute:\"Í\",iacute:\"í\",ic:\"⁣\",Icirc:\"Î\",icirc:\"î\",Icy:\"И\",icy:\"и\",Idot:\"İ\",IEcy:\"Е\",iecy:\"е\",iexcl:\"¡\",iff:\"⇔\",ifr:\"𝔦\",Ifr:\"ℑ\",Igrave:\"Ì\",igrave:\"ì\",ii:\"ⅈ\",iiiint:\"⨌\",iiint:\"∭\",iinfin:\"⧜\",iiota:\"℩\",IJlig:\"Ĳ\",ijlig:\"ĳ\",Imacr:\"Ī\",imacr:\"ī\",image:\"ℑ\",ImaginaryI:\"ⅈ\",imagline:\"ℐ\",imagpart:\"ℑ\",imath:\"ı\",Im:\"ℑ\",imof:\"⊷\",imped:\"Ƶ\",Implies:\"⇒\",incare:\"℅\",in:\"∈\",infin:\"∞\",infintie:\"⧝\",inodot:\"ı\",intcal:\"⊺\",int:\"∫\",Int:\"∬\",integers:\"ℤ\",Integral:\"∫\",intercal:\"⊺\",Intersection:\"⋂\",intlarhk:\"⨗\",intprod:\"⨼\",InvisibleComma:\"⁣\",InvisibleTimes:\"⁢\",IOcy:\"Ё\",iocy:\"ё\",Iogon:\"Į\",iogon:\"į\",Iopf:\"𝕀\",iopf:\"𝕚\",Iota:\"Ι\",iota:\"ι\",iprod:\"⨼\",iquest:\"¿\",iscr:\"𝒾\",Iscr:\"ℐ\",isin:\"∈\",isindot:\"⋵\",isinE:\"⋹\",isins:\"⋴\",isinsv:\"⋳\",isinv:\"∈\",it:\"⁢\",Itilde:\"Ĩ\",itilde:\"ĩ\",Iukcy:\"І\",iukcy:\"і\",Iuml:\"Ï\",iuml:\"ï\",Jcirc:\"Ĵ\",jcirc:\"ĵ\",Jcy:\"Й\",jcy:\"й\",Jfr:\"𝔍\",jfr:\"𝔧\",jmath:\"ȷ\",Jopf:\"𝕁\",jopf:\"𝕛\",Jscr:\"𝒥\",jscr:\"𝒿\",Jsercy:\"Ј\",jsercy:\"ј\",Jukcy:\"Є\",jukcy:\"є\",Kappa:\"Κ\",kappa:\"κ\",kappav:\"ϰ\",Kcedil:\"Ķ\",kcedil:\"ķ\",Kcy:\"К\",kcy:\"к\",Kfr:\"𝔎\",kfr:\"𝔨\",kgreen:\"ĸ\",KHcy:\"Х\",khcy:\"х\",KJcy:\"Ќ\",kjcy:\"ќ\",Kopf:\"𝕂\",kopf:\"𝕜\",Kscr:\"𝒦\",kscr:\"𝓀\",lAarr:\"⇚\",Lacute:\"Ĺ\",lacute:\"ĺ\",laemptyv:\"⦴\",lagran:\"ℒ\",Lambda:\"Λ\",lambda:\"λ\",lang:\"⟨\",Lang:\"⟪\",langd:\"⦑\",langle:\"⟨\",lap:\"⪅\",Laplacetrf:\"ℒ\",laquo:\"«\",larrb:\"⇤\",larrbfs:\"⤟\",larr:\"←\",Larr:\"↞\",lArr:\"⇐\",larrfs:\"⤝\",larrhk:\"↩\",larrlp:\"↫\",larrpl:\"⤹\",larrsim:\"⥳\",larrtl:\"↢\",latail:\"⤙\",lAtail:\"⤛\",lat:\"⪫\",late:\"⪭\",lates:\"⪭︀\",lbarr:\"⤌\",lBarr:\"⤎\",lbbrk:\"❲\",lbrace:\"{\",lbrack:\"[\",lbrke:\"⦋\",lbrksld:\"⦏\",lbrkslu:\"⦍\",Lcaron:\"Ľ\",lcaron:\"ľ\",Lcedil:\"Ļ\",lcedil:\"ļ\",lceil:\"⌈\",lcub:\"{\",Lcy:\"Л\",lcy:\"л\",ldca:\"⤶\",ldquo:\"“\",ldquor:\"„\",ldrdhar:\"⥧\",ldrushar:\"⥋\",ldsh:\"↲\",le:\"≤\",lE:\"≦\",LeftAngleBracket:\"⟨\",LeftArrowBar:\"⇤\",leftarrow:\"←\",LeftArrow:\"←\",Leftarrow:\"⇐\",LeftArrowRightArrow:\"⇆\",leftarrowtail:\"↢\",LeftCeiling:\"⌈\",LeftDoubleBracket:\"⟦\",LeftDownTeeVector:\"⥡\",LeftDownVectorBar:\"⥙\",LeftDownVector:\"⇃\",LeftFloor:\"⌊\",leftharpoondown:\"↽\",leftharpoonup:\"↼\",leftleftarrows:\"⇇\",leftrightarrow:\"↔\",LeftRightArrow:\"↔\",Leftrightarrow:\"⇔\",leftrightarrows:\"⇆\",leftrightharpoons:\"⇋\",leftrightsquigarrow:\"↭\",LeftRightVector:\"⥎\",LeftTeeArrow:\"↤\",LeftTee:\"⊣\",LeftTeeVector:\"⥚\",leftthreetimes:\"⋋\",LeftTriangleBar:\"⧏\",LeftTriangle:\"⊲\",LeftTriangleEqual:\"⊴\",LeftUpDownVector:\"⥑\",LeftUpTeeVector:\"⥠\",LeftUpVectorBar:\"⥘\",LeftUpVector:\"↿\",LeftVectorBar:\"⥒\",LeftVector:\"↼\",lEg:\"⪋\",leg:\"⋚\",leq:\"≤\",leqq:\"≦\",leqslant:\"⩽\",lescc:\"⪨\",les:\"⩽\",lesdot:\"⩿\",lesdoto:\"⪁\",lesdotor:\"⪃\",lesg:\"⋚︀\",lesges:\"⪓\",lessapprox:\"⪅\",lessdot:\"⋖\",lesseqgtr:\"⋚\",lesseqqgtr:\"⪋\",LessEqualGreater:\"⋚\",LessFullEqual:\"≦\",LessGreater:\"≶\",lessgtr:\"≶\",LessLess:\"⪡\",lesssim:\"≲\",LessSlantEqual:\"⩽\",LessTilde:\"≲\",lfisht:\"⥼\",lfloor:\"⌊\",Lfr:\"𝔏\",lfr:\"𝔩\",lg:\"≶\",lgE:\"⪑\",lHar:\"⥢\",lhard:\"↽\",lharu:\"↼\",lharul:\"⥪\",lhblk:\"▄\",LJcy:\"Љ\",ljcy:\"љ\",llarr:\"⇇\",ll:\"≪\",Ll:\"⋘\",llcorner:\"⌞\",Lleftarrow:\"⇚\",llhard:\"⥫\",lltri:\"◺\",Lmidot:\"Ŀ\",lmidot:\"ŀ\",lmoustache:\"⎰\",lmoust:\"⎰\",lnap:\"⪉\",lnapprox:\"⪉\",lne:\"⪇\",lnE:\"≨\",lneq:\"⪇\",lneqq:\"≨\",lnsim:\"⋦\",loang:\"⟬\",loarr:\"⇽\",lobrk:\"⟦\",longleftarrow:\"⟵\",LongLeftArrow:\"⟵\",Longleftarrow:\"⟸\",longleftrightarrow:\"⟷\",LongLeftRightArrow:\"⟷\",Longleftrightarrow:\"⟺\",longmapsto:\"⟼\",longrightarrow:\"⟶\",LongRightArrow:\"⟶\",Longrightarrow:\"⟹\",looparrowleft:\"↫\",looparrowright:\"↬\",lopar:\"⦅\",Lopf:\"𝕃\",lopf:\"𝕝\",loplus:\"⨭\",lotimes:\"⨴\",lowast:\"∗\",lowbar:\"_\",LowerLeftArrow:\"↙\",LowerRightArrow:\"↘\",loz:\"◊\",lozenge:\"◊\",lozf:\"⧫\",lpar:\"(\",lparlt:\"⦓\",lrarr:\"⇆\",lrcorner:\"⌟\",lrhar:\"⇋\",lrhard:\"⥭\",lrm:\"‎\",lrtri:\"⊿\",lsaquo:\"‹\",lscr:\"𝓁\",Lscr:\"ℒ\",lsh:\"↰\",Lsh:\"↰\",lsim:\"≲\",lsime:\"⪍\",lsimg:\"⪏\",lsqb:\"[\",lsquo:\"‘\",lsquor:\"‚\",Lstrok:\"Ł\",lstrok:\"ł\",ltcc:\"⪦\",ltcir:\"⩹\",lt:\"<\",LT:\"<\",Lt:\"≪\",ltdot:\"⋖\",lthree:\"⋋\",ltimes:\"⋉\",ltlarr:\"⥶\",ltquest:\"⩻\",ltri:\"◃\",ltrie:\"⊴\",ltrif:\"◂\",ltrPar:\"⦖\",lurdshar:\"⥊\",luruhar:\"⥦\",lvertneqq:\"≨︀\",lvnE:\"≨︀\",macr:\"¯\",male:\"♂\",malt:\"✠\",maltese:\"✠\",Map:\"⤅\",map:\"↦\",mapsto:\"↦\",mapstodown:\"↧\",mapstoleft:\"↤\",mapstoup:\"↥\",marker:\"▮\",mcomma:\"⨩\",Mcy:\"М\",mcy:\"м\",mdash:\"—\",mDDot:\"∺\",measuredangle:\"∡\",MediumSpace:\" \",Mellintrf:\"ℳ\",Mfr:\"𝔐\",mfr:\"𝔪\",mho:\"℧\",micro:\"µ\",midast:\"*\",midcir:\"⫰\",mid:\"∣\",middot:\"·\",minusb:\"⊟\",minus:\"−\",minusd:\"∸\",minusdu:\"⨪\",MinusPlus:\"∓\",mlcp:\"⫛\",mldr:\"…\",mnplus:\"∓\",models:\"⊧\",Mopf:\"𝕄\",mopf:\"𝕞\",mp:\"∓\",mscr:\"𝓂\",Mscr:\"ℳ\",mstpos:\"∾\",Mu:\"Μ\",mu:\"μ\",multimap:\"⊸\",mumap:\"⊸\",nabla:\"∇\",Nacute:\"Ń\",nacute:\"ń\",nang:\"∠⃒\",nap:\"≉\",napE:\"⩰̸\",napid:\"≋̸\",napos:\"ŉ\",napprox:\"≉\",natural:\"♮\",naturals:\"ℕ\",natur:\"♮\",nbsp:\" \",nbump:\"≎̸\",nbumpe:\"≏̸\",ncap:\"⩃\",Ncaron:\"Ň\",ncaron:\"ň\",Ncedil:\"Ņ\",ncedil:\"ņ\",ncong:\"≇\",ncongdot:\"⩭̸\",ncup:\"⩂\",Ncy:\"Н\",ncy:\"н\",ndash:\"–\",nearhk:\"⤤\",nearr:\"↗\",neArr:\"⇗\",nearrow:\"↗\",ne:\"≠\",nedot:\"≐̸\",NegativeMediumSpace:\"​\",NegativeThickSpace:\"​\",NegativeThinSpace:\"​\",NegativeVeryThinSpace:\"​\",nequiv:\"≢\",nesear:\"⤨\",nesim:\"≂̸\",NestedGreaterGreater:\"≫\",NestedLessLess:\"≪\",NewLine:\"\\n\",nexist:\"∄\",nexists:\"∄\",Nfr:\"𝔑\",nfr:\"𝔫\",ngE:\"≧̸\",nge:\"≱\",ngeq:\"≱\",ngeqq:\"≧̸\",ngeqslant:\"⩾̸\",nges:\"⩾̸\",nGg:\"⋙̸\",ngsim:\"≵\",nGt:\"≫⃒\",ngt:\"≯\",ngtr:\"≯\",nGtv:\"≫̸\",nharr:\"↮\",nhArr:\"⇎\",nhpar:\"⫲\",ni:\"∋\",nis:\"⋼\",nisd:\"⋺\",niv:\"∋\",NJcy:\"Њ\",njcy:\"њ\",nlarr:\"↚\",nlArr:\"⇍\",nldr:\"‥\",nlE:\"≦̸\",nle:\"≰\",nleftarrow:\"↚\",nLeftarrow:\"⇍\",nleftrightarrow:\"↮\",nLeftrightarrow:\"⇎\",nleq:\"≰\",nleqq:\"≦̸\",nleqslant:\"⩽̸\",nles:\"⩽̸\",nless:\"≮\",nLl:\"⋘̸\",nlsim:\"≴\",nLt:\"≪⃒\",nlt:\"≮\",nltri:\"⋪\",nltrie:\"⋬\",nLtv:\"≪̸\",nmid:\"∤\",NoBreak:\"⁠\",NonBreakingSpace:\" \",nopf:\"𝕟\",Nopf:\"ℕ\",Not:\"⫬\",not:\"¬\",NotCongruent:\"≢\",NotCupCap:\"≭\",NotDoubleVerticalBar:\"∦\",NotElement:\"∉\",NotEqual:\"≠\",NotEqualTilde:\"≂̸\",NotExists:\"∄\",NotGreater:\"≯\",NotGreaterEqual:\"≱\",NotGreaterFullEqual:\"≧̸\",NotGreaterGreater:\"≫̸\",NotGreaterLess:\"≹\",NotGreaterSlantEqual:\"⩾̸\",NotGreaterTilde:\"≵\",NotHumpDownHump:\"≎̸\",NotHumpEqual:\"≏̸\",notin:\"∉\",notindot:\"⋵̸\",notinE:\"⋹̸\",notinva:\"∉\",notinvb:\"⋷\",notinvc:\"⋶\",NotLeftTriangleBar:\"⧏̸\",NotLeftTriangle:\"⋪\",NotLeftTriangleEqual:\"⋬\",NotLess:\"≮\",NotLessEqual:\"≰\",NotLessGreater:\"≸\",NotLessLess:\"≪̸\",NotLessSlantEqual:\"⩽̸\",NotLessTilde:\"≴\",NotNestedGreaterGreater:\"⪢̸\",NotNestedLessLess:\"⪡̸\",notni:\"∌\",notniva:\"∌\",notnivb:\"⋾\",notnivc:\"⋽\",NotPrecedes:\"⊀\",NotPrecedesEqual:\"⪯̸\",NotPrecedesSlantEqual:\"⋠\",NotReverseElement:\"∌\",NotRightTriangleBar:\"⧐̸\",NotRightTriangle:\"⋫\",NotRightTriangleEqual:\"⋭\",NotSquareSubset:\"⊏̸\",NotSquareSubsetEqual:\"⋢\",NotSquareSuperset:\"⊐̸\",NotSquareSupersetEqual:\"⋣\",NotSubset:\"⊂⃒\",NotSubsetEqual:\"⊈\",NotSucceeds:\"⊁\",NotSucceedsEqual:\"⪰̸\",NotSucceedsSlantEqual:\"⋡\",NotSucceedsTilde:\"≿̸\",NotSuperset:\"⊃⃒\",NotSupersetEqual:\"⊉\",NotTilde:\"≁\",NotTildeEqual:\"≄\",NotTildeFullEqual:\"≇\",NotTildeTilde:\"≉\",NotVerticalBar:\"∤\",nparallel:\"∦\",npar:\"∦\",nparsl:\"⫽⃥\",npart:\"∂̸\",npolint:\"⨔\",npr:\"⊀\",nprcue:\"⋠\",nprec:\"⊀\",npreceq:\"⪯̸\",npre:\"⪯̸\",nrarrc:\"⤳̸\",nrarr:\"↛\",nrArr:\"⇏\",nrarrw:\"↝̸\",nrightarrow:\"↛\",nRightarrow:\"⇏\",nrtri:\"⋫\",nrtrie:\"⋭\",nsc:\"⊁\",nsccue:\"⋡\",nsce:\"⪰̸\",Nscr:\"𝒩\",nscr:\"𝓃\",nshortmid:\"∤\",nshortparallel:\"∦\",nsim:\"≁\",nsime:\"≄\",nsimeq:\"≄\",nsmid:\"∤\",nspar:\"∦\",nsqsube:\"⋢\",nsqsupe:\"⋣\",nsub:\"⊄\",nsubE:\"⫅̸\",nsube:\"⊈\",nsubset:\"⊂⃒\",nsubseteq:\"⊈\",nsubseteqq:\"⫅̸\",nsucc:\"⊁\",nsucceq:\"⪰̸\",nsup:\"⊅\",nsupE:\"⫆̸\",nsupe:\"⊉\",nsupset:\"⊃⃒\",nsupseteq:\"⊉\",nsupseteqq:\"⫆̸\",ntgl:\"≹\",Ntilde:\"Ñ\",ntilde:\"ñ\",ntlg:\"≸\",ntriangleleft:\"⋪\",ntrianglelefteq:\"⋬\",ntriangleright:\"⋫\",ntrianglerighteq:\"⋭\",Nu:\"Ν\",nu:\"ν\",num:\"#\",numero:\"№\",numsp:\" \",nvap:\"≍⃒\",nvdash:\"⊬\",nvDash:\"⊭\",nVdash:\"⊮\",nVDash:\"⊯\",nvge:\"≥⃒\",nvgt:\">⃒\",nvHarr:\"⤄\",nvinfin:\"⧞\",nvlArr:\"⤂\",nvle:\"≤⃒\",nvlt:\"<⃒\",nvltrie:\"⊴⃒\",nvrArr:\"⤃\",nvrtrie:\"⊵⃒\",nvsim:\"∼⃒\",nwarhk:\"⤣\",nwarr:\"↖\",nwArr:\"⇖\",nwarrow:\"↖\",nwnear:\"⤧\",Oacute:\"Ó\",oacute:\"ó\",oast:\"⊛\",Ocirc:\"Ô\",ocirc:\"ô\",ocir:\"⊚\",Ocy:\"О\",ocy:\"о\",odash:\"⊝\",Odblac:\"Ő\",odblac:\"ő\",odiv:\"⨸\",odot:\"⊙\",odsold:\"⦼\",OElig:\"Œ\",oelig:\"œ\",ofcir:\"⦿\",Ofr:\"𝔒\",ofr:\"𝔬\",ogon:\"˛\",Ograve:\"Ò\",ograve:\"ò\",ogt:\"⧁\",ohbar:\"⦵\",ohm:\"Ω\",oint:\"∮\",olarr:\"↺\",olcir:\"⦾\",olcross:\"⦻\",oline:\"‾\",olt:\"⧀\",Omacr:\"Ō\",omacr:\"ō\",Omega:\"Ω\",omega:\"ω\",Omicron:\"Ο\",omicron:\"ο\",omid:\"⦶\",ominus:\"⊖\",Oopf:\"𝕆\",oopf:\"𝕠\",opar:\"⦷\",OpenCurlyDoubleQuote:\"“\",OpenCurlyQuote:\"‘\",operp:\"⦹\",oplus:\"⊕\",orarr:\"↻\",Or:\"⩔\",or:\"∨\",ord:\"⩝\",order:\"ℴ\",orderof:\"ℴ\",ordf:\"ª\",ordm:\"º\",origof:\"⊶\",oror:\"⩖\",orslope:\"⩗\",orv:\"⩛\",oS:\"Ⓢ\",Oscr:\"𝒪\",oscr:\"ℴ\",Oslash:\"Ø\",oslash:\"ø\",osol:\"⊘\",Otilde:\"Õ\",otilde:\"õ\",otimesas:\"⨶\",Otimes:\"⨷\",otimes:\"⊗\",Ouml:\"Ö\",ouml:\"ö\",ovbar:\"⌽\",OverBar:\"‾\",OverBrace:\"⏞\",OverBracket:\"⎴\",OverParenthesis:\"⏜\",para:\"¶\",parallel:\"∥\",par:\"∥\",parsim:\"⫳\",parsl:\"⫽\",part:\"∂\",PartialD:\"∂\",Pcy:\"П\",pcy:\"п\",percnt:\"%\",period:\".\",permil:\"‰\",perp:\"⊥\",pertenk:\"‱\",Pfr:\"𝔓\",pfr:\"𝔭\",Phi:\"Φ\",phi:\"φ\",phiv:\"ϕ\",phmmat:\"ℳ\",phone:\"☎\",Pi:\"Π\",pi:\"π\",pitchfork:\"⋔\",piv:\"ϖ\",planck:\"ℏ\",planckh:\"ℎ\",plankv:\"ℏ\",plusacir:\"⨣\",plusb:\"⊞\",pluscir:\"⨢\",plus:\"+\",plusdo:\"∔\",plusdu:\"⨥\",pluse:\"⩲\",PlusMinus:\"±\",plusmn:\"±\",plussim:\"⨦\",plustwo:\"⨧\",pm:\"±\",Poincareplane:\"ℌ\",pointint:\"⨕\",popf:\"𝕡\",Popf:\"ℙ\",pound:\"£\",prap:\"⪷\",Pr:\"⪻\",pr:\"≺\",prcue:\"≼\",precapprox:\"⪷\",prec:\"≺\",preccurlyeq:\"≼\",Precedes:\"≺\",PrecedesEqual:\"⪯\",PrecedesSlantEqual:\"≼\",PrecedesTilde:\"≾\",preceq:\"⪯\",precnapprox:\"⪹\",precneqq:\"⪵\",precnsim:\"⋨\",pre:\"⪯\",prE:\"⪳\",precsim:\"≾\",prime:\"′\",Prime:\"″\",primes:\"ℙ\",prnap:\"⪹\",prnE:\"⪵\",prnsim:\"⋨\",prod:\"∏\",Product:\"∏\",profalar:\"⌮\",profline:\"⌒\",profsurf:\"⌓\",prop:\"∝\",Proportional:\"∝\",Proportion:\"∷\",propto:\"∝\",prsim:\"≾\",prurel:\"⊰\",Pscr:\"𝒫\",pscr:\"𝓅\",Psi:\"Ψ\",psi:\"ψ\",puncsp:\" \",Qfr:\"𝔔\",qfr:\"𝔮\",qint:\"⨌\",qopf:\"𝕢\",Qopf:\"ℚ\",qprime:\"⁗\",Qscr:\"𝒬\",qscr:\"𝓆\",quaternions:\"ℍ\",quatint:\"⨖\",quest:\"?\",questeq:\"≟\",quot:'\"',QUOT:'\"',rAarr:\"⇛\",race:\"∽̱\",Racute:\"Ŕ\",racute:\"ŕ\",radic:\"√\",raemptyv:\"⦳\",rang:\"⟩\",Rang:\"⟫\",rangd:\"⦒\",range:\"⦥\",rangle:\"⟩\",raquo:\"»\",rarrap:\"⥵\",rarrb:\"⇥\",rarrbfs:\"⤠\",rarrc:\"⤳\",rarr:\"→\",Rarr:\"↠\",rArr:\"⇒\",rarrfs:\"⤞\",rarrhk:\"↪\",rarrlp:\"↬\",rarrpl:\"⥅\",rarrsim:\"⥴\",Rarrtl:\"⤖\",rarrtl:\"↣\",rarrw:\"↝\",ratail:\"⤚\",rAtail:\"⤜\",ratio:\"∶\",rationals:\"ℚ\",rbarr:\"⤍\",rBarr:\"⤏\",RBarr:\"⤐\",rbbrk:\"❳\",rbrace:\"}\",rbrack:\"]\",rbrke:\"⦌\",rbrksld:\"⦎\",rbrkslu:\"⦐\",Rcaron:\"Ř\",rcaron:\"ř\",Rcedil:\"Ŗ\",rcedil:\"ŗ\",rceil:\"⌉\",rcub:\"}\",Rcy:\"Р\",rcy:\"р\",rdca:\"⤷\",rdldhar:\"⥩\",rdquo:\"”\",rdquor:\"”\",rdsh:\"↳\",real:\"ℜ\",realine:\"ℛ\",realpart:\"ℜ\",reals:\"ℝ\",Re:\"ℜ\",rect:\"▭\",reg:\"®\",REG:\"®\",ReverseElement:\"∋\",ReverseEquilibrium:\"⇋\",ReverseUpEquilibrium:\"⥯\",rfisht:\"⥽\",rfloor:\"⌋\",rfr:\"𝔯\",Rfr:\"ℜ\",rHar:\"⥤\",rhard:\"⇁\",rharu:\"⇀\",rharul:\"⥬\",Rho:\"Ρ\",rho:\"ρ\",rhov:\"ϱ\",RightAngleBracket:\"⟩\",RightArrowBar:\"⇥\",rightarrow:\"→\",RightArrow:\"→\",Rightarrow:\"⇒\",RightArrowLeftArrow:\"⇄\",rightarrowtail:\"↣\",RightCeiling:\"⌉\",RightDoubleBracket:\"⟧\",RightDownTeeVector:\"⥝\",RightDownVectorBar:\"⥕\",RightDownVector:\"⇂\",RightFloor:\"⌋\",rightharpoondown:\"⇁\",rightharpoonup:\"⇀\",rightleftarrows:\"⇄\",rightleftharpoons:\"⇌\",rightrightarrows:\"⇉\",rightsquigarrow:\"↝\",RightTeeArrow:\"↦\",RightTee:\"⊢\",RightTeeVector:\"⥛\",rightthreetimes:\"⋌\",RightTriangleBar:\"⧐\",RightTriangle:\"⊳\",RightTriangleEqual:\"⊵\",RightUpDownVector:\"⥏\",RightUpTeeVector:\"⥜\",RightUpVectorBar:\"⥔\",RightUpVector:\"↾\",RightVectorBar:\"⥓\",RightVector:\"⇀\",ring:\"˚\",risingdotseq:\"≓\",rlarr:\"⇄\",rlhar:\"⇌\",rlm:\"‏\",rmoustache:\"⎱\",rmoust:\"⎱\",rnmid:\"⫮\",roang:\"⟭\",roarr:\"⇾\",robrk:\"⟧\",ropar:\"⦆\",ropf:\"𝕣\",Ropf:\"ℝ\",roplus:\"⨮\",rotimes:\"⨵\",RoundImplies:\"⥰\",rpar:\")\",rpargt:\"⦔\",rppolint:\"⨒\",rrarr:\"⇉\",Rrightarrow:\"⇛\",rsaquo:\"›\",rscr:\"𝓇\",Rscr:\"ℛ\",rsh:\"↱\",Rsh:\"↱\",rsqb:\"]\",rsquo:\"’\",rsquor:\"’\",rthree:\"⋌\",rtimes:\"⋊\",rtri:\"▹\",rtrie:\"⊵\",rtrif:\"▸\",rtriltri:\"⧎\",RuleDelayed:\"⧴\",ruluhar:\"⥨\",rx:\"℞\",Sacute:\"Ś\",sacute:\"ś\",sbquo:\"‚\",scap:\"⪸\",Scaron:\"Š\",scaron:\"š\",Sc:\"⪼\",sc:\"≻\",sccue:\"≽\",sce:\"⪰\",scE:\"⪴\",Scedil:\"Ş\",scedil:\"ş\",Scirc:\"Ŝ\",scirc:\"ŝ\",scnap:\"⪺\",scnE:\"⪶\",scnsim:\"⋩\",scpolint:\"⨓\",scsim:\"≿\",Scy:\"С\",scy:\"с\",sdotb:\"⊡\",sdot:\"⋅\",sdote:\"⩦\",searhk:\"⤥\",searr:\"↘\",seArr:\"⇘\",searrow:\"↘\",sect:\"§\",semi:\";\",seswar:\"⤩\",setminus:\"∖\",setmn:\"∖\",sext:\"✶\",Sfr:\"𝔖\",sfr:\"𝔰\",sfrown:\"⌢\",sharp:\"♯\",SHCHcy:\"Щ\",shchcy:\"щ\",SHcy:\"Ш\",shcy:\"ш\",ShortDownArrow:\"↓\",ShortLeftArrow:\"←\",shortmid:\"∣\",shortparallel:\"∥\",ShortRightArrow:\"→\",ShortUpArrow:\"↑\",shy:\"­\",Sigma:\"Σ\",sigma:\"σ\",sigmaf:\"ς\",sigmav:\"ς\",sim:\"∼\",simdot:\"⩪\",sime:\"≃\",simeq:\"≃\",simg:\"⪞\",simgE:\"⪠\",siml:\"⪝\",simlE:\"⪟\",simne:\"≆\",simplus:\"⨤\",simrarr:\"⥲\",slarr:\"←\",SmallCircle:\"∘\",smallsetminus:\"∖\",smashp:\"⨳\",smeparsl:\"⧤\",smid:\"∣\",smile:\"⌣\",smt:\"⪪\",smte:\"⪬\",smtes:\"⪬︀\",SOFTcy:\"Ь\",softcy:\"ь\",solbar:\"⌿\",solb:\"⧄\",sol:\"/\",Sopf:\"𝕊\",sopf:\"𝕤\",spades:\"♠\",spadesuit:\"♠\",spar:\"∥\",sqcap:\"⊓\",sqcaps:\"⊓︀\",sqcup:\"⊔\",sqcups:\"⊔︀\",Sqrt:\"√\",sqsub:\"⊏\",sqsube:\"⊑\",sqsubset:\"⊏\",sqsubseteq:\"⊑\",sqsup:\"⊐\",sqsupe:\"⊒\",sqsupset:\"⊐\",sqsupseteq:\"⊒\",square:\"□\",Square:\"□\",SquareIntersection:\"⊓\",SquareSubset:\"⊏\",SquareSubsetEqual:\"⊑\",SquareSuperset:\"⊐\",SquareSupersetEqual:\"⊒\",SquareUnion:\"⊔\",squarf:\"▪\",squ:\"□\",squf:\"▪\",srarr:\"→\",Sscr:\"𝒮\",sscr:\"𝓈\",ssetmn:\"∖\",ssmile:\"⌣\",sstarf:\"⋆\",Star:\"⋆\",star:\"☆\",starf:\"★\",straightepsilon:\"ϵ\",straightphi:\"ϕ\",strns:\"¯\",sub:\"⊂\",Sub:\"⋐\",subdot:\"⪽\",subE:\"⫅\",sube:\"⊆\",subedot:\"⫃\",submult:\"⫁\",subnE:\"⫋\",subne:\"⊊\",subplus:\"⪿\",subrarr:\"⥹\",subset:\"⊂\",Subset:\"⋐\",subseteq:\"⊆\",subseteqq:\"⫅\",SubsetEqual:\"⊆\",subsetneq:\"⊊\",subsetneqq:\"⫋\",subsim:\"⫇\",subsub:\"⫕\",subsup:\"⫓\",succapprox:\"⪸\",succ:\"≻\",succcurlyeq:\"≽\",Succeeds:\"≻\",SucceedsEqual:\"⪰\",SucceedsSlantEqual:\"≽\",SucceedsTilde:\"≿\",succeq:\"⪰\",succnapprox:\"⪺\",succneqq:\"⪶\",succnsim:\"⋩\",succsim:\"≿\",SuchThat:\"∋\",sum:\"∑\",Sum:\"∑\",sung:\"♪\",sup1:\"¹\",sup2:\"²\",sup3:\"³\",sup:\"⊃\",Sup:\"⋑\",supdot:\"⪾\",supdsub:\"⫘\",supE:\"⫆\",supe:\"⊇\",supedot:\"⫄\",Superset:\"⊃\",SupersetEqual:\"⊇\",suphsol:\"⟉\",suphsub:\"⫗\",suplarr:\"⥻\",supmult:\"⫂\",supnE:\"⫌\",supne:\"⊋\",supplus:\"⫀\",supset:\"⊃\",Supset:\"⋑\",supseteq:\"⊇\",supseteqq:\"⫆\",supsetneq:\"⊋\",supsetneqq:\"⫌\",supsim:\"⫈\",supsub:\"⫔\",supsup:\"⫖\",swarhk:\"⤦\",swarr:\"↙\",swArr:\"⇙\",swarrow:\"↙\",swnwar:\"⤪\",szlig:\"ß\",Tab:\"\\t\",target:\"⌖\",Tau:\"Τ\",tau:\"τ\",tbrk:\"⎴\",Tcaron:\"Ť\",tcaron:\"ť\",Tcedil:\"Ţ\",tcedil:\"ţ\",Tcy:\"Т\",tcy:\"т\",tdot:\"⃛\",telrec:\"⌕\",Tfr:\"𝔗\",tfr:\"𝔱\",there4:\"∴\",therefore:\"∴\",Therefore:\"∴\",Theta:\"Θ\",theta:\"θ\",thetasym:\"ϑ\",thetav:\"ϑ\",thickapprox:\"≈\",thicksim:\"∼\",ThickSpace:\"  \",ThinSpace:\" \",thinsp:\" \",thkap:\"≈\",thksim:\"∼\",THORN:\"Þ\",thorn:\"þ\",tilde:\"˜\",Tilde:\"∼\",TildeEqual:\"≃\",TildeFullEqual:\"≅\",TildeTilde:\"≈\",timesbar:\"⨱\",timesb:\"⊠\",times:\"×\",timesd:\"⨰\",tint:\"∭\",toea:\"⤨\",topbot:\"⌶\",topcir:\"⫱\",top:\"⊤\",Topf:\"𝕋\",topf:\"𝕥\",topfork:\"⫚\",tosa:\"⤩\",tprime:\"‴\",trade:\"™\",TRADE:\"™\",triangle:\"▵\",triangledown:\"▿\",triangleleft:\"◃\",trianglelefteq:\"⊴\",triangleq:\"≜\",triangleright:\"▹\",trianglerighteq:\"⊵\",tridot:\"◬\",trie:\"≜\",triminus:\"⨺\",TripleDot:\"⃛\",triplus:\"⨹\",trisb:\"⧍\",tritime:\"⨻\",trpezium:\"⏢\",Tscr:\"𝒯\",tscr:\"𝓉\",TScy:\"Ц\",tscy:\"ц\",TSHcy:\"Ћ\",tshcy:\"ћ\",Tstrok:\"Ŧ\",tstrok:\"ŧ\",twixt:\"≬\",twoheadleftarrow:\"↞\",twoheadrightarrow:\"↠\",Uacute:\"Ú\",uacute:\"ú\",uarr:\"↑\",Uarr:\"↟\",uArr:\"⇑\",Uarrocir:\"⥉\",Ubrcy:\"Ў\",ubrcy:\"ў\",Ubreve:\"Ŭ\",ubreve:\"ŭ\",Ucirc:\"Û\",ucirc:\"û\",Ucy:\"У\",ucy:\"у\",udarr:\"⇅\",Udblac:\"Ű\",udblac:\"ű\",udhar:\"⥮\",ufisht:\"⥾\",Ufr:\"𝔘\",ufr:\"𝔲\",Ugrave:\"Ù\",ugrave:\"ù\",uHar:\"⥣\",uharl:\"↿\",uharr:\"↾\",uhblk:\"▀\",ulcorn:\"⌜\",ulcorner:\"⌜\",ulcrop:\"⌏\",ultri:\"◸\",Umacr:\"Ū\",umacr:\"ū\",uml:\"¨\",UnderBar:\"_\",UnderBrace:\"⏟\",UnderBracket:\"⎵\",UnderParenthesis:\"⏝\",Union:\"⋃\",UnionPlus:\"⊎\",Uogon:\"Ų\",uogon:\"ų\",Uopf:\"𝕌\",uopf:\"𝕦\",UpArrowBar:\"⤒\",uparrow:\"↑\",UpArrow:\"↑\",Uparrow:\"⇑\",UpArrowDownArrow:\"⇅\",updownarrow:\"↕\",UpDownArrow:\"↕\",Updownarrow:\"⇕\",UpEquilibrium:\"⥮\",upharpoonleft:\"↿\",upharpoonright:\"↾\",uplus:\"⊎\",UpperLeftArrow:\"↖\",UpperRightArrow:\"↗\",upsi:\"υ\",Upsi:\"ϒ\",upsih:\"ϒ\",Upsilon:\"Υ\",upsilon:\"υ\",UpTeeArrow:\"↥\",UpTee:\"⊥\",upuparrows:\"⇈\",urcorn:\"⌝\",urcorner:\"⌝\",urcrop:\"⌎\",Uring:\"Ů\",uring:\"ů\",urtri:\"◹\",Uscr:\"𝒰\",uscr:\"𝓊\",utdot:\"⋰\",Utilde:\"Ũ\",utilde:\"ũ\",utri:\"▵\",utrif:\"▴\",uuarr:\"⇈\",Uuml:\"Ü\",uuml:\"ü\",uwangle:\"⦧\",vangrt:\"⦜\",varepsilon:\"ϵ\",varkappa:\"ϰ\",varnothing:\"∅\",varphi:\"ϕ\",varpi:\"ϖ\",varpropto:\"∝\",varr:\"↕\",vArr:\"⇕\",varrho:\"ϱ\",varsigma:\"ς\",varsubsetneq:\"⊊︀\",varsubsetneqq:\"⫋︀\",varsupsetneq:\"⊋︀\",varsupsetneqq:\"⫌︀\",vartheta:\"ϑ\",vartriangleleft:\"⊲\",vartriangleright:\"⊳\",vBar:\"⫨\",Vbar:\"⫫\",vBarv:\"⫩\",Vcy:\"В\",vcy:\"в\",vdash:\"⊢\",vDash:\"⊨\",Vdash:\"⊩\",VDash:\"⊫\",Vdashl:\"⫦\",veebar:\"⊻\",vee:\"∨\",Vee:\"⋁\",veeeq:\"≚\",vellip:\"⋮\",verbar:\"|\",Verbar:\"‖\",vert:\"|\",Vert:\"‖\",VerticalBar:\"∣\",VerticalLine:\"|\",VerticalSeparator:\"❘\",VerticalTilde:\"≀\",VeryThinSpace:\" \",Vfr:\"𝔙\",vfr:\"𝔳\",vltri:\"⊲\",vnsub:\"⊂⃒\",vnsup:\"⊃⃒\",Vopf:\"𝕍\",vopf:\"𝕧\",vprop:\"∝\",vrtri:\"⊳\",Vscr:\"𝒱\",vscr:\"𝓋\",vsubnE:\"⫋︀\",vsubne:\"⊊︀\",vsupnE:\"⫌︀\",vsupne:\"⊋︀\",Vvdash:\"⊪\",vzigzag:\"⦚\",Wcirc:\"Ŵ\",wcirc:\"ŵ\",wedbar:\"⩟\",wedge:\"∧\",Wedge:\"⋀\",wedgeq:\"≙\",weierp:\"℘\",Wfr:\"𝔚\",wfr:\"𝔴\",Wopf:\"𝕎\",wopf:\"𝕨\",wp:\"℘\",wr:\"≀\",wreath:\"≀\",Wscr:\"𝒲\",wscr:\"𝓌\",xcap:\"⋂\",xcirc:\"◯\",xcup:\"⋃\",xdtri:\"▽\",Xfr:\"𝔛\",xfr:\"𝔵\",xharr:\"⟷\",xhArr:\"⟺\",Xi:\"Ξ\",xi:\"ξ\",xlarr:\"⟵\",xlArr:\"⟸\",xmap:\"⟼\",xnis:\"⋻\",xodot:\"⨀\",Xopf:\"𝕏\",xopf:\"𝕩\",xoplus:\"⨁\",xotime:\"⨂\",xrarr:\"⟶\",xrArr:\"⟹\",Xscr:\"𝒳\",xscr:\"𝓍\",xsqcup:\"⨆\",xuplus:\"⨄\",xutri:\"△\",xvee:\"⋁\",xwedge:\"⋀\",Yacute:\"Ý\",yacute:\"ý\",YAcy:\"Я\",yacy:\"я\",Ycirc:\"Ŷ\",ycirc:\"ŷ\",Ycy:\"Ы\",ycy:\"ы\",yen:\"¥\",Yfr:\"𝔜\",yfr:\"𝔶\",YIcy:\"Ї\",yicy:\"ї\",Yopf:\"𝕐\",yopf:\"𝕪\",Yscr:\"𝒴\",yscr:\"𝓎\",YUcy:\"Ю\",yucy:\"ю\",yuml:\"ÿ\",Yuml:\"Ÿ\",Zacute:\"Ź\",zacute:\"ź\",Zcaron:\"Ž\",zcaron:\"ž\",Zcy:\"З\",zcy:\"з\",Zdot:\"Ż\",zdot:\"ż\",zeetrf:\"ℨ\",ZeroWidthSpace:\"​\",Zeta:\"Ζ\",zeta:\"ζ\",zfr:\"𝔷\",Zfr:\"ℨ\",ZHcy:\"Ж\",zhcy:\"ж\",zigrarr:\"⇝\",zopf:\"𝕫\",Zopf:\"ℤ\",Zscr:\"𝒵\",zscr:\"𝓏\",zwj:\"‍\",zwnj:\"‌\"}},{}],26:[function(require,module,exports){module.exports={Aacute:\"Á\",aacute:\"á\",Acirc:\"Â\",acirc:\"â\",acute:\"´\",AElig:\"Æ\",aelig:\"æ\",Agrave:\"À\",agrave:\"à\",amp:\"&\",AMP:\"&\",Aring:\"Å\",aring:\"å\",Atilde:\"Ã\",atilde:\"ã\",Auml:\"Ä\",auml:\"ä\",brvbar:\"¦\",Ccedil:\"Ç\",ccedil:\"ç\",cedil:\"¸\",cent:\"¢\",copy:\"©\",COPY:\"©\",curren:\"¤\",deg:\"°\",divide:\"÷\",Eacute:\"É\",eacute:\"é\",Ecirc:\"Ê\",ecirc:\"ê\",Egrave:\"È\",egrave:\"è\",ETH:\"Ð\",eth:\"ð\",Euml:\"Ë\",euml:\"ë\",frac12:\"½\",frac14:\"¼\",frac34:\"¾\",gt:\">\",GT:\">\",Iacute:\"Í\",iacute:\"í\",Icirc:\"Î\",icirc:\"î\",iexcl:\"¡\",Igrave:\"Ì\",igrave:\"ì\",iquest:\"¿\",Iuml:\"Ï\",iuml:\"ï\",laquo:\"«\",lt:\"<\",LT:\"<\",macr:\"¯\",micro:\"µ\",middot:\"·\",nbsp:\" \",not:\"¬\",Ntilde:\"Ñ\",ntilde:\"ñ\",Oacute:\"Ó\",oacute:\"ó\",Ocirc:\"Ô\",ocirc:\"ô\",Ograve:\"Ò\",ograve:\"ò\",ordf:\"ª\",ordm:\"º\",Oslash:\"Ø\",oslash:\"ø\",Otilde:\"Õ\",otilde:\"õ\",Ouml:\"Ö\",ouml:\"ö\",para:\"¶\",plusmn:\"±\",pound:\"£\",quot:'\"',QUOT:'\"',raquo:\"»\",reg:\"®\",REG:\"®\",sect:\"§\",shy:\"­\",sup1:\"¹\",sup2:\"²\",sup3:\"³\",szlig:\"ß\",THORN:\"Þ\",thorn:\"þ\",times:\"×\",Uacute:\"Ú\",uacute:\"ú\",Ucirc:\"Û\",ucirc:\"û\",Ugrave:\"Ù\",ugrave:\"ù\",uml:\"¨\",Uuml:\"Ü\",uuml:\"ü\",Yacute:\"Ý\",yacute:\"ý\",yen:\"¥\",yuml:\"ÿ\"}},{}],27:[function(require,module,exports){module.exports={amp:\"&\",apos:\"'\",gt:\">\",lt:\"<\",quot:'\"'}},{}],28:[function(require,module,exports){function EventEmitter(){this._events=this._events||{};this._maxListeners=this._maxListeners||undefined}module.exports=EventEmitter;EventEmitter.EventEmitter=EventEmitter;EventEmitter.prototype._events=undefined;EventEmitter.prototype._maxListeners=undefined;EventEmitter.defaultMaxListeners=10;EventEmitter.prototype.setMaxListeners=function(n){if(!isNumber(n)||n<0||isNaN(n))throw TypeError(\"n must be a positive number\");this._maxListeners=n;return this};EventEmitter.prototype.emit=function(type){var er,handler,len,args,i,listeners;if(!this._events)this._events={};if(type===\"error\"){if(!this._events.error||isObject(this._events.error)&&!this._events.error.length){er=arguments[1];if(er instanceof Error){throw er}else{var err=new Error('Uncaught, unspecified \"error\" event. ('+er+\")\");err.context=er;throw err}}}handler=this._events[type];if(isUndefined(handler))return false;if(isFunction(handler)){switch(arguments.length){case 1:handler.call(this);break;case 2:handler.call(this,arguments[1]);break;case 3:handler.call(this,arguments[1],arguments[2]);break;default:args=Array.prototype.slice.call(arguments,1);handler.apply(this,args)}}else if(isObject(handler)){args=Array.prototype.slice.call(arguments,1);listeners=handler.slice();len=listeners.length;for(i=0;i<len;i++)listeners[i].apply(this,args)}return true};EventEmitter.prototype.addListener=function(type,listener){var m;if(!isFunction(listener))throw TypeError(\"listener must be a function\");if(!this._events)this._events={};if(this._events.newListener)this.emit(\"newListener\",type,isFunction(listener.listener)?listener.listener:listener);if(!this._events[type])this._events[type]=listener;else if(isObject(this._events[type]))this._events[type].push(listener);else this._events[type]=[this._events[type],listener];if(isObject(this._events[type])&&!this._events[type].warned){if(!isUndefined(this._maxListeners)){m=this._maxListeners}else{m=EventEmitter.defaultMaxListeners}if(m&&m>0&&this._events[type].length>m){this._events[type].warned=true;console.error(\"(node) warning: possible EventEmitter memory \"+\"leak detected. %d listeners added. \"+\"Use emitter.setMaxListeners() to increase limit.\",this._events[type].length);if(typeof console.trace===\"function\"){console.trace()}}}return this};EventEmitter.prototype.on=EventEmitter.prototype.addListener;EventEmitter.prototype.once=function(type,listener){if(!isFunction(listener))throw TypeError(\"listener must be a function\");var fired=false;function g(){this.removeListener(type,g);if(!fired){fired=true;listener.apply(this,arguments)}}g.listener=listener;this.on(type,g);return this};EventEmitter.prototype.removeListener=function(type,listener){var list,position,length,i;if(!isFunction(listener))throw TypeError(\"listener must be a function\");if(!this._events||!this._events[type])return this;list=this._events[type];length=list.length;position=-1;if(list===listener||isFunction(list.listener)&&list.listener===listener){delete this._events[type];if(this._events.removeListener)this.emit(\"removeListener\",type,listener)}else if(isObject(list)){for(i=length;i-- >0;){if(list[i]===listener||list[i].listener&&list[i].listener===listener){position=i;break}}if(position<0)return this;if(list.length===1){list.length=0;delete this._events[type]}else{list.splice(position,1);\n}if(this._events.removeListener)this.emit(\"removeListener\",type,listener)}return this};EventEmitter.prototype.removeAllListeners=function(type){var key,listeners;if(!this._events)return this;if(!this._events.removeListener){if(arguments.length===0)this._events={};else if(this._events[type])delete this._events[type];return this}if(arguments.length===0){for(key in this._events){if(key===\"removeListener\")continue;this.removeAllListeners(key)}this.removeAllListeners(\"removeListener\");this._events={};return this}listeners=this._events[type];if(isFunction(listeners)){this.removeListener(type,listeners)}else if(listeners){while(listeners.length)this.removeListener(type,listeners[listeners.length-1])}delete this._events[type];return this};EventEmitter.prototype.listeners=function(type){var ret;if(!this._events||!this._events[type])ret=[];else if(isFunction(this._events[type]))ret=[this._events[type]];else ret=this._events[type].slice();return ret};EventEmitter.prototype.listenerCount=function(type){if(this._events){var evlistener=this._events[type];if(isFunction(evlistener))return 1;else if(evlistener)return evlistener.length}return 0};EventEmitter.listenerCount=function(emitter,type){return emitter.listenerCount(type)};function isFunction(arg){return typeof arg===\"function\"}function isNumber(arg){return typeof arg===\"number\"}function isObject(arg){return typeof arg===\"object\"&&arg!==null}function isUndefined(arg){return arg===void 0}},{}],29:[function(require,module,exports){module.exports=CollectingHandler;function CollectingHandler(cbs){this._cbs=cbs||{};this.events=[]}var EVENTS=require(\"./\").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){name=\"on\"+name;CollectingHandler.prototype[name]=function(){this.events.push([name]);if(this._cbs[name])this._cbs[name]()}}else if(EVENTS[name]===1){name=\"on\"+name;CollectingHandler.prototype[name]=function(a){this.events.push([name,a]);if(this._cbs[name])this._cbs[name](a)}}else if(EVENTS[name]===2){name=\"on\"+name;CollectingHandler.prototype[name]=function(a,b){this.events.push([name,a,b]);if(this._cbs[name])this._cbs[name](a,b)}}else{throw Error(\"wrong number of arguments\")}});CollectingHandler.prototype.onreset=function(){this.events=[];if(this._cbs.onreset)this._cbs.onreset()};CollectingHandler.prototype.restart=function(){if(this._cbs.onreset)this._cbs.onreset();for(var i=0,len=this.events.length;i<len;i++){if(this._cbs[this.events[i][0]]){var num=this.events[i].length;if(num===1){this._cbs[this.events[i][0]]()}else if(num===2){this._cbs[this.events[i][0]](this.events[i][1])}else{this._cbs[this.events[i][0]](this.events[i][1],this.events[i][2])}}}}},{\"./\":36}],30:[function(require,module,exports){var index=require(\"./index.js\"),DomHandler=index.DomHandler,DomUtils=index.DomUtils;function FeedHandler(callback,options){this.init(callback,options)}require(\"inherits\")(FeedHandler,DomHandler);FeedHandler.prototype.init=DomHandler;function getElements(what,where){return DomUtils.getElementsByTagName(what,where,true)}function getOneElement(what,where){return DomUtils.getElementsByTagName(what,where,true,1)[0]}function fetch(what,where,recurse){return DomUtils.getText(DomUtils.getElementsByTagName(what,where,recurse,1)).trim()}function addConditionally(obj,prop,what,where,recurse){var tmp=fetch(what,where,recurse);if(tmp)obj[prop]=tmp}var isValidFeed=function(value){return value===\"rss\"||value===\"feed\"||value===\"rdf:RDF\"};FeedHandler.prototype.onend=function(){var feed={},feedRoot=getOneElement(isValidFeed,this.dom),tmp,childs;if(feedRoot){if(feedRoot.name===\"feed\"){childs=feedRoot.children;feed.type=\"atom\";addConditionally(feed,\"id\",\"id\",childs);addConditionally(feed,\"title\",\"title\",childs);if((tmp=getOneElement(\"link\",childs))&&(tmp=tmp.attribs)&&(tmp=tmp.href))feed.link=tmp;addConditionally(feed,\"description\",\"subtitle\",childs);if(tmp=fetch(\"updated\",childs))feed.updated=new Date(tmp);addConditionally(feed,\"author\",\"email\",childs,true);feed.items=getElements(\"entry\",childs).map(function(item){var entry={},tmp;item=item.children;addConditionally(entry,\"id\",\"id\",item);addConditionally(entry,\"title\",\"title\",item);if((tmp=getOneElement(\"link\",item))&&(tmp=tmp.attribs)&&(tmp=tmp.href))entry.link=tmp;if(tmp=fetch(\"summary\",item)||fetch(\"content\",item))entry.description=tmp;if(tmp=fetch(\"updated\",item))entry.pubDate=new Date(tmp);return entry})}else{childs=getOneElement(\"channel\",feedRoot.children).children;feed.type=feedRoot.name.substr(0,3);feed.id=\"\";addConditionally(feed,\"title\",\"title\",childs);addConditionally(feed,\"link\",\"link\",childs);addConditionally(feed,\"description\",\"description\",childs);if(tmp=fetch(\"lastBuildDate\",childs))feed.updated=new Date(tmp);addConditionally(feed,\"author\",\"managingEditor\",childs,true);feed.items=getElements(\"item\",feedRoot.children).map(function(item){var entry={},tmp;item=item.children;addConditionally(entry,\"id\",\"guid\",item);addConditionally(entry,\"title\",\"title\",item);addConditionally(entry,\"link\",\"link\",item);addConditionally(entry,\"description\",\"description\",item);if(tmp=fetch(\"pubDate\",item))entry.pubDate=new Date(tmp);return entry})}}this.dom=feed;DomHandler.prototype._handleCallback.call(this,feedRoot?null:Error(\"couldn't find root of feed\"))};module.exports=FeedHandler},{\"./index.js\":36,inherits:38}],31:[function(require,module,exports){var Tokenizer=require(\"./Tokenizer.js\");var formTags={input:true,option:true,optgroup:true,select:true,button:true,datalist:true,textarea:true};var openImpliesClose={tr:{tr:true,th:true,td:true},th:{th:true},td:{thead:true,th:true,td:true},body:{head:true,link:true,script:true},li:{li:true},p:{p:true},h1:{p:true},h2:{p:true},h3:{p:true},h4:{p:true},h5:{p:true},h6:{p:true},select:formTags,input:formTags,output:formTags,button:formTags,datalist:formTags,textarea:formTags,option:{option:true},optgroup:{optgroup:true}};var voidElements={__proto__:null,area:true,base:true,basefont:true,br:true,col:true,command:true,embed:true,frame:true,hr:true,img:true,input:true,isindex:true,keygen:true,link:true,meta:true,param:true,source:true,track:true,wbr:true,path:true,circle:true,ellipse:true,line:true,rect:true,use:true,stop:true,polyline:true,polygon:true};var re_nameEnd=/\\s|\\//;function Parser(cbs,options){this._options=options||{};this._cbs=cbs||{};this._tagname=\"\";this._attribname=\"\";this._attribvalue=\"\";this._attribs=null;this._stack=[];this.startIndex=0;this.endIndex=null;this._lowerCaseTagNames=\"lowerCaseTags\"in this._options?!!this._options.lowerCaseTags:!this._options.xmlMode;this._lowerCaseAttributeNames=\"lowerCaseAttributeNames\"in this._options?!!this._options.lowerCaseAttributeNames:!this._options.xmlMode;if(this._options.Tokenizer){Tokenizer=this._options.Tokenizer}this._tokenizer=new Tokenizer(this._options,this);if(this._cbs.onparserinit)this._cbs.onparserinit(this)}require(\"inherits\")(Parser,require(\"events\").EventEmitter);Parser.prototype._updatePosition=function(initialOffset){if(this.endIndex===null){if(this._tokenizer._sectionStart<=initialOffset){this.startIndex=0}else{this.startIndex=this._tokenizer._sectionStart-initialOffset}}else this.startIndex=this.endIndex+1;this.endIndex=this._tokenizer.getAbsoluteIndex()};Parser.prototype.ontext=function(data){this._updatePosition(1);this.endIndex--;if(this._cbs.ontext)this._cbs.ontext(data)};Parser.prototype.onopentagname=function(name){if(this._lowerCaseTagNames){name=name.toLowerCase()}this._tagname=name;if(!this._options.xmlMode&&name in openImpliesClose){for(var el;(el=this._stack[this._stack.length-1])in openImpliesClose[name];this.onclosetag(el));}if(this._options.xmlMode||!(name in voidElements)){this._stack.push(name)}if(this._cbs.onopentagname)this._cbs.onopentagname(name);if(this._cbs.onopentag)this._attribs={}};Parser.prototype.onopentagend=function(){this._updatePosition(1);if(this._attribs){if(this._cbs.onopentag)this._cbs.onopentag(this._tagname,this._attribs);this._attribs=null}if(!this._options.xmlMode&&this._cbs.onclosetag&&this._tagname in voidElements){this._cbs.onclosetag(this._tagname)}this._tagname=\"\"};Parser.prototype.onclosetag=function(name){this._updatePosition(1);if(this._lowerCaseTagNames){name=name.toLowerCase()}if(this._stack.length&&(!(name in voidElements)||this._options.xmlMode)){var pos=this._stack.lastIndexOf(name);if(pos!==-1){if(this._cbs.onclosetag){pos=this._stack.length-pos;while(pos--)this._cbs.onclosetag(this._stack.pop())}else this._stack.length=pos}else if(name===\"p\"&&!this._options.xmlMode){this.onopentagname(name);this._closeCurrentTag()}}else if(!this._options.xmlMode&&(name===\"br\"||name===\"p\")){this.onopentagname(name);this._closeCurrentTag()}};Parser.prototype.onselfclosingtag=function(){if(this._options.xmlMode||this._options.recognizeSelfClosing){this._closeCurrentTag()}else{this.onopentagend()}};Parser.prototype._closeCurrentTag=function(){var name=this._tagname;this.onopentagend();if(this._stack[this._stack.length-1]===name){if(this._cbs.onclosetag){this._cbs.onclosetag(name)}this._stack.pop()}};Parser.prototype.onattribname=function(name){if(this._lowerCaseAttributeNames){name=name.toLowerCase()}this._attribname=name};Parser.prototype.onattribdata=function(value){this._attribvalue+=value};Parser.prototype.onattribend=function(){if(this._cbs.onattribute)this._cbs.onattribute(this._attribname,this._attribvalue);if(this._attribs&&!Object.prototype.hasOwnProperty.call(this._attribs,this._attribname)){this._attribs[this._attribname]=this._attribvalue}this._attribname=\"\";this._attribvalue=\"\"};Parser.prototype._getInstructionName=function(value){var idx=value.search(re_nameEnd),name=idx<0?value:value.substr(0,idx);if(this._lowerCaseTagNames){name=name.toLowerCase()}return name};Parser.prototype.ondeclaration=function(value){if(this._cbs.onprocessinginstruction){var name=this._getInstructionName(value);this._cbs.onprocessinginstruction(\"!\"+name,\"!\"+value)}};Parser.prototype.onprocessinginstruction=function(value){if(this._cbs.onprocessinginstruction){var name=this._getInstructionName(value);this._cbs.onprocessinginstruction(\"?\"+name,\"?\"+value)}};Parser.prototype.oncomment=function(value){this._updatePosition(4);if(this._cbs.oncomment)this._cbs.oncomment(value);if(this._cbs.oncommentend)this._cbs.oncommentend()};Parser.prototype.oncdata=function(value){this._updatePosition(1);if(this._options.xmlMode||this._options.recognizeCDATA){if(this._cbs.oncdatastart)this._cbs.oncdatastart();if(this._cbs.ontext)this._cbs.ontext(value);if(this._cbs.oncdataend)this._cbs.oncdataend()}else{this.oncomment(\"[CDATA[\"+value+\"]]\")}};Parser.prototype.onerror=function(err){if(this._cbs.onerror)this._cbs.onerror(err)};Parser.prototype.onend=function(){if(this._cbs.onclosetag){for(var i=this._stack.length;i>0;this._cbs.onclosetag(this._stack[--i]));}if(this._cbs.onend)this._cbs.onend()};Parser.prototype.reset=function(){if(this._cbs.onreset)this._cbs.onreset();this._tokenizer.reset();this._tagname=\"\";this._attribname=\"\";this._attribs=null;this._stack=[];if(this._cbs.onparserinit)this._cbs.onparserinit(this)};Parser.prototype.parseComplete=function(data){this.reset();this.end(data)};Parser.prototype.write=function(chunk){this._tokenizer.write(chunk)};Parser.prototype.end=function(chunk){this._tokenizer.end(chunk)};Parser.prototype.pause=function(){this._tokenizer.pause()};Parser.prototype.resume=function(){this._tokenizer.resume()};Parser.prototype.parseChunk=Parser.prototype.write;Parser.prototype.done=Parser.prototype.end;module.exports=Parser},{\"./Tokenizer.js\":34,events:28,inherits:38}],32:[function(require,module,exports){module.exports=ProxyHandler;function ProxyHandler(cbs){this._cbs=cbs||{}}var EVENTS=require(\"./\").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){name=\"on\"+name;ProxyHandler.prototype[name]=function(){if(this._cbs[name])this._cbs[name]()}}else if(EVENTS[name]===1){name=\"on\"+name;ProxyHandler.prototype[name]=function(a){if(this._cbs[name])this._cbs[name](a)}}else if(EVENTS[name]===2){name=\"on\"+name;ProxyHandler.prototype[name]=function(a,b){if(this._cbs[name])this._cbs[name](a,b)}}else{throw Error(\"wrong number of arguments\")}})},{\"./\":36}],33:[function(require,module,exports){module.exports=Stream;var Parser=require(\"./WritableStream.js\");function Stream(options){Parser.call(this,new Cbs(this),options)}require(\"inherits\")(Stream,Parser);Stream.prototype.readable=true;function Cbs(scope){this.scope=scope}var EVENTS=require(\"../\").EVENTS;Object.keys(EVENTS).forEach(function(name){if(EVENTS[name]===0){Cbs.prototype[\"on\"+name]=function(){this.scope.emit(name)}}else if(EVENTS[name]===1){Cbs.prototype[\"on\"+name]=function(a){this.scope.emit(name,a)}}else if(EVENTS[name]===2){Cbs.prototype[\"on\"+name]=function(a,b){this.scope.emit(name,a,b)}}else{throw Error(\"wrong number of arguments!\")}})},{\"../\":36,\"./WritableStream.js\":35,inherits:38}],34:[function(require,module,exports){module.exports=Tokenizer;var decodeCodePoint=require(\"entities/lib/decode_codepoint.js\"),entityMap=require(\"entities/maps/entities.json\"),legacyMap=require(\"entities/maps/legacy.json\"),xmlMap=require(\"entities/maps/xml.json\"),i=0,TEXT=i++,BEFORE_TAG_NAME=i++,IN_TAG_NAME=i++,IN_SELF_CLOSING_TAG=i++,BEFORE_CLOSING_TAG_NAME=i++,IN_CLOSING_TAG_NAME=i++,AFTER_CLOSING_TAG_NAME=i++,BEFORE_ATTRIBUTE_NAME=i++,IN_ATTRIBUTE_NAME=i++,AFTER_ATTRIBUTE_NAME=i++,BEFORE_ATTRIBUTE_VALUE=i++,IN_ATTRIBUTE_VALUE_DQ=i++,IN_ATTRIBUTE_VALUE_SQ=i++,IN_ATTRIBUTE_VALUE_NQ=i++,BEFORE_DECLARATION=i++,IN_DECLARATION=i++,IN_PROCESSING_INSTRUCTION=i++,BEFORE_COMMENT=i++,IN_COMMENT=i++,AFTER_COMMENT_1=i++,AFTER_COMMENT_2=i++,BEFORE_CDATA_1=i++,BEFORE_CDATA_2=i++,BEFORE_CDATA_3=i++,BEFORE_CDATA_4=i++,BEFORE_CDATA_5=i++,BEFORE_CDATA_6=i++,IN_CDATA=i++,AFTER_CDATA_1=i++,AFTER_CDATA_2=i++,BEFORE_SPECIAL=i++,BEFORE_SPECIAL_END=i++,BEFORE_SCRIPT_1=i++,BEFORE_SCRIPT_2=i++,BEFORE_SCRIPT_3=i++,BEFORE_SCRIPT_4=i++,BEFORE_SCRIPT_5=i++,AFTER_SCRIPT_1=i++,AFTER_SCRIPT_2=i++,AFTER_SCRIPT_3=i++,AFTER_SCRIPT_4=i++,AFTER_SCRIPT_5=i++,BEFORE_STYLE_1=i++,BEFORE_STYLE_2=i++,BEFORE_STYLE_3=i++,BEFORE_STYLE_4=i++,AFTER_STYLE_1=i++,AFTER_STYLE_2=i++,AFTER_STYLE_3=i++,AFTER_STYLE_4=i++,BEFORE_ENTITY=i++,BEFORE_NUMERIC_ENTITY=i++,IN_NAMED_ENTITY=i++,IN_NUMERIC_ENTITY=i++,IN_HEX_ENTITY=i++,j=0,SPECIAL_NONE=j++,SPECIAL_SCRIPT=j++,SPECIAL_STYLE=j++;function whitespace(c){return c===\" \"||c===\"\\n\"||c===\"\\t\"||c===\"\\f\"||c===\"\\r\"}function characterState(char,SUCCESS){return function(c){if(c===char)this._state=SUCCESS}}function ifElseState(upper,SUCCESS,FAILURE){var lower=upper.toLowerCase();if(upper===lower){return function(c){if(c===lower){this._state=SUCCESS}else{this._state=FAILURE;this._index--}}}else{return function(c){if(c===lower||c===upper){this._state=SUCCESS}else{this._state=FAILURE;this._index--}}}}function consumeSpecialNameChar(upper,NEXT_STATE){var lower=upper.toLowerCase();return function(c){if(c===lower||c===upper){this._state=NEXT_STATE}else{this._state=IN_TAG_NAME;this._index--}}}function Tokenizer(options,cbs){this._state=TEXT;this._buffer=\"\";this._sectionStart=0;this._index=0;this._bufferOffset=0;this._baseState=TEXT;this._special=SPECIAL_NONE;this._cbs=cbs;this._running=true;this._ended=false;this._xmlMode=!!(options&&options.xmlMode);this._decodeEntities=!!(options&&options.decodeEntities)}Tokenizer.prototype._stateText=function(c){if(c===\"<\"){if(this._index>this._sectionStart){this._cbs.ontext(this._getSection())}this._state=BEFORE_TAG_NAME;this._sectionStart=this._index}else if(this._decodeEntities&&this._special===SPECIAL_NONE&&c===\"&\"){if(this._index>this._sectionStart){this._cbs.ontext(this._getSection())}this._baseState=TEXT;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeTagName=function(c){if(c===\"/\"){this._state=BEFORE_CLOSING_TAG_NAME}else if(c===\"<\"){this._cbs.ontext(this._getSection());this._sectionStart=this._index}else if(c===\">\"||this._special!==SPECIAL_NONE||whitespace(c)){this._state=TEXT}else if(c===\"!\"){this._state=BEFORE_DECLARATION;this._sectionStart=this._index+1}else if(c===\"?\"){this._state=IN_PROCESSING_INSTRUCTION;this._sectionStart=this._index+1}else{this._state=!this._xmlMode&&(c===\"s\"||c===\"S\")?BEFORE_SPECIAL:IN_TAG_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInTagName=function(c){if(c===\"/\"||c===\">\"||whitespace(c)){this._emitToken(\"onopentagname\");this._state=BEFORE_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateBeforeCloseingTagName=function(c){if(whitespace(c));else if(c===\">\"){this._state=TEXT}else if(this._special!==SPECIAL_NONE){if(c===\"s\"||c===\"S\"){this._state=BEFORE_SPECIAL_END}else{this._state=TEXT;this._index--}}else{this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInCloseingTagName=function(c){if(c===\">\"||whitespace(c)){this._emitToken(\"onclosetag\");this._state=AFTER_CLOSING_TAG_NAME;this._index--}};Tokenizer.prototype._stateAfterCloseingTagName=function(c){if(c===\">\"){this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateBeforeAttributeName=function(c){if(c===\">\"){this._cbs.onopentagend();this._state=TEXT;this._sectionStart=this._index+1}else if(c===\"/\"){this._state=IN_SELF_CLOSING_TAG}else if(!whitespace(c)){this._state=IN_ATTRIBUTE_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateInSelfClosingTag=function(c){if(c===\">\"){this._cbs.onselfclosingtag();this._state=TEXT;this._sectionStart=this._index+1}else if(!whitespace(c)){this._state=BEFORE_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateInAttributeName=function(c){if(c===\"=\"||c===\"/\"||c===\">\"||whitespace(c)){this._cbs.onattribname(this._getSection());this._sectionStart=-1;this._state=AFTER_ATTRIBUTE_NAME;this._index--}};Tokenizer.prototype._stateAfterAttributeName=function(c){if(c===\"=\"){this._state=BEFORE_ATTRIBUTE_VALUE}else if(c===\"/\"||c===\">\"){this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME;this._index--}else if(!whitespace(c)){this._cbs.onattribend();this._state=IN_ATTRIBUTE_NAME;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeAttributeValue=function(c){if(c==='\"'){this._state=IN_ATTRIBUTE_VALUE_DQ;this._sectionStart=this._index+1}else if(c===\"'\"){this._state=IN_ATTRIBUTE_VALUE_SQ;this._sectionStart=this._index+1}else if(!whitespace(c)){this._state=IN_ATTRIBUTE_VALUE_NQ;this._sectionStart=this._index;this._index--}};Tokenizer.prototype._stateInAttributeValueDoubleQuotes=function(c){if(c==='\"'){this._emitToken(\"onattribdata\");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME}else if(this._decodeEntities&&c===\"&\"){this._emitToken(\"onattribdata\");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateInAttributeValueSingleQuotes=function(c){if(c===\"'\"){this._emitToken(\"onattribdata\");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME}else if(this._decodeEntities&&c===\"&\"){this._emitToken(\"onattribdata\");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateInAttributeValueNoQuotes=function(c){if(whitespace(c)||c===\">\"){this._emitToken(\"onattribdata\");this._cbs.onattribend();this._state=BEFORE_ATTRIBUTE_NAME;this._index--}else if(this._decodeEntities&&c===\"&\"){this._emitToken(\"onattribdata\");this._baseState=this._state;this._state=BEFORE_ENTITY;this._sectionStart=this._index}};Tokenizer.prototype._stateBeforeDeclaration=function(c){this._state=c===\"[\"?BEFORE_CDATA_1:c===\"-\"?BEFORE_COMMENT:IN_DECLARATION};Tokenizer.prototype._stateInDeclaration=function(c){if(c===\">\"){this._cbs.ondeclaration(this._getSection());this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateInProcessingInstruction=function(c){if(c===\">\"){this._cbs.onprocessinginstruction(this._getSection());this._state=TEXT;this._sectionStart=this._index+1}};Tokenizer.prototype._stateBeforeComment=function(c){if(c===\"-\"){this._state=IN_COMMENT;this._sectionStart=this._index+1}else{this._state=IN_DECLARATION}};Tokenizer.prototype._stateInComment=function(c){if(c===\"-\")this._state=AFTER_COMMENT_1};Tokenizer.prototype._stateAfterComment1=function(c){if(c===\"-\"){this._state=AFTER_COMMENT_2}else{this._state=IN_COMMENT}};Tokenizer.prototype._stateAfterComment2=function(c){if(c===\">\"){this._cbs.oncomment(this._buffer.substring(this._sectionStart,this._index-2));this._state=TEXT;this._sectionStart=this._index+1}else if(c!==\"-\"){this._state=IN_COMMENT}};Tokenizer.prototype._stateBeforeCdata1=ifElseState(\"C\",BEFORE_CDATA_2,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata2=ifElseState(\"D\",BEFORE_CDATA_3,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata3=ifElseState(\"A\",BEFORE_CDATA_4,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata4=ifElseState(\"T\",BEFORE_CDATA_5,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata5=ifElseState(\"A\",BEFORE_CDATA_6,IN_DECLARATION);Tokenizer.prototype._stateBeforeCdata6=function(c){if(c===\"[\"){this._state=IN_CDATA;this._sectionStart=this._index+1}else{this._state=IN_DECLARATION;this._index--}};Tokenizer.prototype._stateInCdata=function(c){if(c===\"]\")this._state=AFTER_CDATA_1};Tokenizer.prototype._stateAfterCdata1=characterState(\"]\",AFTER_CDATA_2);Tokenizer.prototype._stateAfterCdata2=function(c){if(c===\">\"){this._cbs.oncdata(this._buffer.substring(this._sectionStart,this._index-2));this._state=TEXT;this._sectionStart=this._index+1}else if(c!==\"]\"){this._state=IN_CDATA}};Tokenizer.prototype._stateBeforeSpecial=function(c){if(c===\"c\"||c===\"C\"){this._state=BEFORE_SCRIPT_1}else if(c===\"t\"||c===\"T\"){this._state=BEFORE_STYLE_1}else{this._state=IN_TAG_NAME;this._index--}};Tokenizer.prototype._stateBeforeSpecialEnd=function(c){if(this._special===SPECIAL_SCRIPT&&(c===\"c\"||c===\"C\")){this._state=AFTER_SCRIPT_1}else if(this._special===SPECIAL_STYLE&&(c===\"t\"||c===\"T\")){this._state=AFTER_STYLE_1}else this._state=TEXT};Tokenizer.prototype._stateBeforeScript1=consumeSpecialNameChar(\"R\",BEFORE_SCRIPT_2);Tokenizer.prototype._stateBeforeScript2=consumeSpecialNameChar(\"I\",BEFORE_SCRIPT_3);Tokenizer.prototype._stateBeforeScript3=consumeSpecialNameChar(\"P\",BEFORE_SCRIPT_4);Tokenizer.prototype._stateBeforeScript4=consumeSpecialNameChar(\"T\",BEFORE_SCRIPT_5);Tokenizer.prototype._stateBeforeScript5=function(c){if(c===\"/\"||c===\">\"||whitespace(c)){this._special=SPECIAL_SCRIPT}this._state=IN_TAG_NAME;this._index--};Tokenizer.prototype._stateAfterScript1=ifElseState(\"R\",AFTER_SCRIPT_2,TEXT);Tokenizer.prototype._stateAfterScript2=ifElseState(\"I\",AFTER_SCRIPT_3,TEXT);Tokenizer.prototype._stateAfterScript3=ifElseState(\"P\",AFTER_SCRIPT_4,TEXT);Tokenizer.prototype._stateAfterScript4=ifElseState(\"T\",AFTER_SCRIPT_5,TEXT);Tokenizer.prototype._stateAfterScript5=function(c){if(c===\">\"||whitespace(c)){this._special=SPECIAL_NONE;this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index-6;this._index--}else this._state=TEXT};Tokenizer.prototype._stateBeforeStyle1=consumeSpecialNameChar(\"Y\",BEFORE_STYLE_2);Tokenizer.prototype._stateBeforeStyle2=consumeSpecialNameChar(\"L\",BEFORE_STYLE_3);Tokenizer.prototype._stateBeforeStyle3=consumeSpecialNameChar(\"E\",BEFORE_STYLE_4);Tokenizer.prototype._stateBeforeStyle4=function(c){if(c===\"/\"||c===\">\"||whitespace(c)){this._special=SPECIAL_STYLE}this._state=IN_TAG_NAME;this._index--};Tokenizer.prototype._stateAfterStyle1=ifElseState(\"Y\",AFTER_STYLE_2,TEXT);Tokenizer.prototype._stateAfterStyle2=ifElseState(\"L\",AFTER_STYLE_3,TEXT);Tokenizer.prototype._stateAfterStyle3=ifElseState(\"E\",AFTER_STYLE_4,TEXT);Tokenizer.prototype._stateAfterStyle4=function(c){if(c===\">\"||whitespace(c)){this._special=SPECIAL_NONE;this._state=IN_CLOSING_TAG_NAME;this._sectionStart=this._index-5;this._index--}else this._state=TEXT};Tokenizer.prototype._stateBeforeEntity=ifElseState(\"#\",BEFORE_NUMERIC_ENTITY,IN_NAMED_ENTITY);Tokenizer.prototype._stateBeforeNumericEntity=ifElseState(\"X\",IN_HEX_ENTITY,IN_NUMERIC_ENTITY);Tokenizer.prototype._parseNamedEntityStrict=function(){if(this._sectionStart+1<this._index){var entity=this._buffer.substring(this._sectionStart+1,this._index),map=this._xmlMode?xmlMap:entityMap;if(map.hasOwnProperty(entity)){this._emitPartial(map[entity]);this._sectionStart=this._index+1}}};Tokenizer.prototype._parseLegacyEntity=function(){var start=this._sectionStart+1,limit=this._index-start;if(limit>6)limit=6;while(limit>=2){var entity=this._buffer.substr(start,limit);if(legacyMap.hasOwnProperty(entity)){this._emitPartial(legacyMap[entity]);this._sectionStart+=limit+1;return}else{limit--}}};Tokenizer.prototype._stateInNamedEntity=function(c){if(c===\";\"){this._parseNamedEntityStrict();if(this._sectionStart+1<this._index&&!this._xmlMode){this._parseLegacyEntity()}this._state=this._baseState}else if((c<\"a\"||c>\"z\")&&(c<\"A\"||c>\"Z\")&&(c<\"0\"||c>\"9\")){if(this._xmlMode);else if(this._sectionStart+1===this._index);else if(this._baseState!==TEXT){if(c!==\"=\"){this._parseNamedEntityStrict()}}else{this._parseLegacyEntity()}this._state=this._baseState;this._index--}};Tokenizer.prototype._decodeNumericEntity=function(offset,base){var sectionStart=this._sectionStart+offset;if(sectionStart!==this._index){var entity=this._buffer.substring(sectionStart,this._index);var parsed=parseInt(entity,base);this._emitPartial(decodeCodePoint(parsed));this._sectionStart=this._index}else{this._sectionStart--}this._state=this._baseState};Tokenizer.prototype._stateInNumericEntity=function(c){if(c===\";\"){this._decodeNumericEntity(2,10);this._sectionStart++}else if(c<\"0\"||c>\"9\"){if(!this._xmlMode){this._decodeNumericEntity(2,10)}else{this._state=this._baseState}this._index--}};Tokenizer.prototype._stateInHexEntity=function(c){if(c===\";\"){this._decodeNumericEntity(3,16);this._sectionStart++}else if((c<\"a\"||c>\"f\")&&(c<\"A\"||c>\"F\")&&(c<\"0\"||c>\"9\")){if(!this._xmlMode){this._decodeNumericEntity(3,16)}else{this._state=this._baseState}this._index--}};Tokenizer.prototype._cleanup=function(){if(this._sectionStart<0){this._buffer=\"\";this._index=0;this._bufferOffset+=this._index}else if(this._running){if(this._state===TEXT){if(this._sectionStart!==this._index){this._cbs.ontext(this._buffer.substr(this._sectionStart))}this._buffer=\"\";this._bufferOffset+=this._index;this._index=0}else if(this._sectionStart===this._index){this._buffer=\"\";this._bufferOffset+=this._index;this._index=0}else{this._buffer=this._buffer.substr(this._sectionStart);this._index-=this._sectionStart;this._bufferOffset+=this._sectionStart}this._sectionStart=0}};Tokenizer.prototype.write=function(chunk){if(this._ended)this._cbs.onerror(Error(\".write() after done!\"));this._buffer+=chunk;this._parse()};Tokenizer.prototype._parse=function(){while(this._index<this._buffer.length&&this._running){var c=this._buffer.charAt(this._index);if(this._state===TEXT){this._stateText(c)}else if(this._state===BEFORE_TAG_NAME){this._stateBeforeTagName(c)}else if(this._state===IN_TAG_NAME){this._stateInTagName(c)}else if(this._state===BEFORE_CLOSING_TAG_NAME){this._stateBeforeCloseingTagName(c)}else if(this._state===IN_CLOSING_TAG_NAME){this._stateInCloseingTagName(c)}else if(this._state===AFTER_CLOSING_TAG_NAME){this._stateAfterCloseingTagName(c)}else if(this._state===IN_SELF_CLOSING_TAG){this._stateInSelfClosingTag(c)}else if(this._state===BEFORE_ATTRIBUTE_NAME){this._stateBeforeAttributeName(c)}else if(this._state===IN_ATTRIBUTE_NAME){this._stateInAttributeName(c)}else if(this._state===AFTER_ATTRIBUTE_NAME){this._stateAfterAttributeName(c)}else if(this._state===BEFORE_ATTRIBUTE_VALUE){this._stateBeforeAttributeValue(c)}else if(this._state===IN_ATTRIBUTE_VALUE_DQ){this._stateInAttributeValueDoubleQuotes(c)}else if(this._state===IN_ATTRIBUTE_VALUE_SQ){this._stateInAttributeValueSingleQuotes(c)}else if(this._state===IN_ATTRIBUTE_VALUE_NQ){this._stateInAttributeValueNoQuotes(c)}else if(this._state===BEFORE_DECLARATION){this._stateBeforeDeclaration(c)}else if(this._state===IN_DECLARATION){this._stateInDeclaration(c)}else if(this._state===IN_PROCESSING_INSTRUCTION){this._stateInProcessingInstruction(c)}else if(this._state===BEFORE_COMMENT){this._stateBeforeComment(c)}else if(this._state===IN_COMMENT){this._stateInComment(c)}else if(this._state===AFTER_COMMENT_1){this._stateAfterComment1(c)}else if(this._state===AFTER_COMMENT_2){this._stateAfterComment2(c)}else if(this._state===BEFORE_CDATA_1){this._stateBeforeCdata1(c)}else if(this._state===BEFORE_CDATA_2){this._stateBeforeCdata2(c)}else if(this._state===BEFORE_CDATA_3){this._stateBeforeCdata3(c)}else if(this._state===BEFORE_CDATA_4){this._stateBeforeCdata4(c)}else if(this._state===BEFORE_CDATA_5){this._stateBeforeCdata5(c)}else if(this._state===BEFORE_CDATA_6){this._stateBeforeCdata6(c)}else if(this._state===IN_CDATA){this._stateInCdata(c)}else if(this._state===AFTER_CDATA_1){this._stateAfterCdata1(c)}else if(this._state===AFTER_CDATA_2){this._stateAfterCdata2(c)}else if(this._state===BEFORE_SPECIAL){this._stateBeforeSpecial(c)}else if(this._state===BEFORE_SPECIAL_END){this._stateBeforeSpecialEnd(c)}else if(this._state===BEFORE_SCRIPT_1){this._stateBeforeScript1(c)}else if(this._state===BEFORE_SCRIPT_2){this._stateBeforeScript2(c)}else if(this._state===BEFORE_SCRIPT_3){this._stateBeforeScript3(c)}else if(this._state===BEFORE_SCRIPT_4){this._stateBeforeScript4(c)}else if(this._state===BEFORE_SCRIPT_5){this._stateBeforeScript5(c)}else if(this._state===AFTER_SCRIPT_1){this._stateAfterScript1(c)}else if(this._state===AFTER_SCRIPT_2){this._stateAfterScript2(c)}else if(this._state===AFTER_SCRIPT_3){this._stateAfterScript3(c)}else if(this._state===AFTER_SCRIPT_4){this._stateAfterScript4(c)}else if(this._state===AFTER_SCRIPT_5){this._stateAfterScript5(c)}else if(this._state===BEFORE_STYLE_1){this._stateBeforeStyle1(c)}else if(this._state===BEFORE_STYLE_2){this._stateBeforeStyle2(c)}else if(this._state===BEFORE_STYLE_3){this._stateBeforeStyle3(c)}else if(this._state===BEFORE_STYLE_4){this._stateBeforeStyle4(c)}else if(this._state===AFTER_STYLE_1){this._stateAfterStyle1(c)}else if(this._state===AFTER_STYLE_2){this._stateAfterStyle2(c)}else if(this._state===AFTER_STYLE_3){this._stateAfterStyle3(c)}else if(this._state===AFTER_STYLE_4){this._stateAfterStyle4(c)}else if(this._state===BEFORE_ENTITY){this._stateBeforeEntity(c)}else if(this._state===BEFORE_NUMERIC_ENTITY){this._stateBeforeNumericEntity(c)}else if(this._state===IN_NAMED_ENTITY){this._stateInNamedEntity(c)}else if(this._state===IN_NUMERIC_ENTITY){this._stateInNumericEntity(c)}else if(this._state===IN_HEX_ENTITY){this._stateInHexEntity(c)}else{this._cbs.onerror(Error(\"unknown _state\"),this._state)}this._index++}this._cleanup()};Tokenizer.prototype.pause=function(){this._running=false};Tokenizer.prototype.resume=function(){this._running=true;if(this._index<this._buffer.length){this._parse()}if(this._ended){this._finish()}};Tokenizer.prototype.end=function(chunk){if(this._ended)this._cbs.onerror(Error(\".end() after done!\"));if(chunk)this.write(chunk);this._ended=true;if(this._running)this._finish()};Tokenizer.prototype._finish=function(){if(this._sectionStart<this._index){this._handleTrailingData()}this._cbs.onend()};Tokenizer.prototype._handleTrailingData=function(){var data=this._buffer.substr(this._sectionStart);if(this._state===IN_CDATA||this._state===AFTER_CDATA_1||this._state===AFTER_CDATA_2){this._cbs.oncdata(data)}else if(this._state===IN_COMMENT||this._state===AFTER_COMMENT_1||this._state===AFTER_COMMENT_2){this._cbs.oncomment(data)}else if(this._state===IN_NAMED_ENTITY&&!this._xmlMode){this._parseLegacyEntity();if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state===IN_NUMERIC_ENTITY&&!this._xmlMode){this._decodeNumericEntity(2,10);if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state===IN_HEX_ENTITY&&!this._xmlMode){this._decodeNumericEntity(3,16);if(this._sectionStart<this._index){this._state=this._baseState;this._handleTrailingData()}}else if(this._state!==IN_TAG_NAME&&this._state!==BEFORE_ATTRIBUTE_NAME&&this._state!==BEFORE_ATTRIBUTE_VALUE&&this._state!==AFTER_ATTRIBUTE_NAME&&this._state!==IN_ATTRIBUTE_NAME&&this._state!==IN_ATTRIBUTE_VALUE_SQ&&this._state!==IN_ATTRIBUTE_VALUE_DQ&&this._state!==IN_ATTRIBUTE_VALUE_NQ&&this._state!==IN_CLOSING_TAG_NAME){\nthis._cbs.ontext(data)}};Tokenizer.prototype.reset=function(){Tokenizer.call(this,{xmlMode:this._xmlMode,decodeEntities:this._decodeEntities},this._cbs)};Tokenizer.prototype.getAbsoluteIndex=function(){return this._bufferOffset+this._index};Tokenizer.prototype._getSection=function(){return this._buffer.substring(this._sectionStart,this._index)};Tokenizer.prototype._emitToken=function(name){this._cbs[name](this._getSection());this._sectionStart=-1};Tokenizer.prototype._emitPartial=function(value){if(this._baseState!==TEXT){this._cbs.onattribdata(value)}else{this._cbs.ontext(value)}}},{\"entities/lib/decode_codepoint.js\":22,\"entities/maps/entities.json\":25,\"entities/maps/legacy.json\":26,\"entities/maps/xml.json\":27}],35:[function(require,module,exports){module.exports=Stream;var Parser=require(\"./Parser.js\"),WritableStream=require(\"stream\").Writable||require(\"readable-stream\").Writable,StringDecoder=require(\"string_decoder\").StringDecoder,Buffer=require(\"buffer\").Buffer;function Stream(cbs,options){var parser=this._parser=new Parser(cbs,options);var decoder=this._decoder=new StringDecoder;WritableStream.call(this,{decodeStrings:false});this.once(\"finish\",function(){parser.end(decoder.end())})}require(\"inherits\")(Stream,WritableStream);WritableStream.prototype._write=function(chunk,encoding,cb){if(chunk instanceof Buffer)chunk=this._decoder.write(chunk);this._parser.write(chunk);cb()}},{\"./Parser.js\":31,buffer:5,inherits:38,\"readable-stream\":3,stream:55,string_decoder:56}],36:[function(require,module,exports){var Parser=require(\"./Parser.js\"),DomHandler=require(\"domhandler\");function defineProp(name,value){delete module.exports[name];module.exports[name]=value;return value}module.exports={Parser:Parser,Tokenizer:require(\"./Tokenizer.js\"),ElementType:require(\"domelementtype\"),DomHandler:DomHandler,get FeedHandler(){return defineProp(\"FeedHandler\",require(\"./FeedHandler.js\"))},get Stream(){return defineProp(\"Stream\",require(\"./Stream.js\"))},get WritableStream(){return defineProp(\"WritableStream\",require(\"./WritableStream.js\"))},get ProxyHandler(){return defineProp(\"ProxyHandler\",require(\"./ProxyHandler.js\"))},get DomUtils(){return defineProp(\"DomUtils\",require(\"domutils\"))},get CollectingHandler(){return defineProp(\"CollectingHandler\",require(\"./CollectingHandler.js\"))},DefaultHandler:DomHandler,get RssHandler(){return defineProp(\"RssHandler\",this.FeedHandler)},parseDOM:function(data,options){var handler=new DomHandler(options);new Parser(handler,options).end(data);return handler.dom},parseFeed:function(feed,options){var handler=new module.exports.FeedHandler(options);new Parser(handler,options).end(feed);return handler.dom},createDomStream:function(cb,options,elementCb){var handler=new DomHandler(cb,options,elementCb);return new Parser(handler,options)},EVENTS:{attribute:2,cdatastart:0,cdataend:0,text:1,processinginstruction:2,comment:1,commentend:0,closetag:1,opentag:2,opentagname:1,error:1,end:0}}},{\"./CollectingHandler.js\":29,\"./FeedHandler.js\":30,\"./Parser.js\":31,\"./ProxyHandler.js\":32,\"./Stream.js\":33,\"./Tokenizer.js\":34,\"./WritableStream.js\":35,domelementtype:9,domhandler:10,domutils:13}],37:[function(require,module,exports){exports.read=function(buffer,offset,isLE,mLen,nBytes){var e,m;var eLen=nBytes*8-mLen-1;var eMax=(1<<eLen)-1;var eBias=eMax>>1;var nBits=-7;var i=isLE?nBytes-1:0;var d=isLE?-1:1;var s=buffer[offset+i];i+=d;e=s&(1<<-nBits)-1;s>>=-nBits;nBits+=eLen;for(;nBits>0;e=e*256+buffer[offset+i],i+=d,nBits-=8){}m=e&(1<<-nBits)-1;e>>=-nBits;nBits+=mLen;for(;nBits>0;m=m*256+buffer[offset+i],i+=d,nBits-=8){}if(e===0){e=1-eBias}else if(e===eMax){return m?NaN:(s?-1:1)*Infinity}else{m=m+Math.pow(2,mLen);e=e-eBias}return(s?-1:1)*m*Math.pow(2,e-mLen)};exports.write=function(buffer,value,offset,isLE,mLen,nBytes){var e,m,c;var eLen=nBytes*8-mLen-1;var eMax=(1<<eLen)-1;var eBias=eMax>>1;var rt=mLen===23?Math.pow(2,-24)-Math.pow(2,-77):0;var i=isLE?0:nBytes-1;var d=isLE?1:-1;var s=value<0||value===0&&1/value<0?1:0;value=Math.abs(value);if(isNaN(value)||value===Infinity){m=isNaN(value)?1:0;e=eMax}else{e=Math.floor(Math.log(value)/Math.LN2);if(value*(c=Math.pow(2,-e))<1){e--;c*=2}if(e+eBias>=1){value+=rt/c}else{value+=rt*Math.pow(2,1-eBias)}if(value*c>=2){e++;c/=2}if(e+eBias>=eMax){m=0;e=eMax}else if(e+eBias>=1){m=(value*c-1)*Math.pow(2,mLen);e=e+eBias}else{m=value*Math.pow(2,eBias-1)*Math.pow(2,mLen);e=0}}for(;mLen>=8;buffer[offset+i]=m&255,i+=d,m/=256,mLen-=8){}e=e<<mLen|m;eLen+=mLen;for(;eLen>0;buffer[offset+i]=e&255,i+=d,e/=256,eLen-=8){}buffer[offset+i-d]|=s*128}},{}],38:[function(require,module,exports){if(typeof Object.create===\"function\"){module.exports=function inherits(ctor,superCtor){ctor.super_=superCtor;ctor.prototype=Object.create(superCtor.prototype,{constructor:{value:ctor,enumerable:false,writable:true,configurable:true}})}}else{module.exports=function inherits(ctor,superCtor){ctor.super_=superCtor;var TempCtor=function(){};TempCtor.prototype=superCtor.prototype;ctor.prototype=new TempCtor;ctor.prototype.constructor=ctor}}},{}],39:[function(require,module,exports){module.exports=function(obj){return obj!=null&&(isBuffer(obj)||isSlowBuffer(obj)||!!obj._isBuffer)};function isBuffer(obj){return!!obj.constructor&&typeof obj.constructor.isBuffer===\"function\"&&obj.constructor.isBuffer(obj)}function isSlowBuffer(obj){return typeof obj.readFloatLE===\"function\"&&typeof obj.slice===\"function\"&&isBuffer(obj.slice(0,0))}},{}],40:[function(require,module,exports){var toString={}.toString;module.exports=Array.isArray||function(arr){return toString.call(arr)==\"[object Array]\"}},{}],41:[function(require,module,exports){(function(process){\"use strict\";if(!process.version||process.version.indexOf(\"v0.\")===0||process.version.indexOf(\"v1.\")===0&&process.version.indexOf(\"v1.8.\")!==0){module.exports=nextTick}else{module.exports=process.nextTick}function nextTick(fn,arg1,arg2,arg3){if(typeof fn!==\"function\"){throw new TypeError('\"callback\" argument must be a function')}var len=arguments.length;var args,i;switch(len){case 0:case 1:return process.nextTick(fn);case 2:return process.nextTick(function afterTickOne(){fn.call(null,arg1)});case 3:return process.nextTick(function afterTickTwo(){fn.call(null,arg1,arg2)});case 4:return process.nextTick(function afterTickThree(){fn.call(null,arg1,arg2,arg3)});default:args=new Array(len-1);i=0;while(i<args.length){args[i++]=arguments[i]}return process.nextTick(function afterTick(){fn.apply(null,args)})}}}).call(this,require(\"_process\"))},{_process:42}],42:[function(require,module,exports){var process=module.exports={};var cachedSetTimeout;var cachedClearTimeout;function defaultSetTimout(){throw new Error(\"setTimeout has not been defined\")}function defaultClearTimeout(){throw new Error(\"clearTimeout has not been defined\")}(function(){try{if(typeof setTimeout===\"function\"){cachedSetTimeout=setTimeout}else{cachedSetTimeout=defaultSetTimout}}catch(e){cachedSetTimeout=defaultSetTimout}try{if(typeof clearTimeout===\"function\"){cachedClearTimeout=clearTimeout}else{cachedClearTimeout=defaultClearTimeout}}catch(e){cachedClearTimeout=defaultClearTimeout}})();function runTimeout(fun){if(cachedSetTimeout===setTimeout){return setTimeout(fun,0)}if((cachedSetTimeout===defaultSetTimout||!cachedSetTimeout)&&setTimeout){cachedSetTimeout=setTimeout;return setTimeout(fun,0)}try{return cachedSetTimeout(fun,0)}catch(e){try{return cachedSetTimeout.call(null,fun,0)}catch(e){return cachedSetTimeout.call(this,fun,0)}}}function runClearTimeout(marker){if(cachedClearTimeout===clearTimeout){return clearTimeout(marker)}if((cachedClearTimeout===defaultClearTimeout||!cachedClearTimeout)&&clearTimeout){cachedClearTimeout=clearTimeout;return clearTimeout(marker)}try{return cachedClearTimeout(marker)}catch(e){try{return cachedClearTimeout.call(null,marker)}catch(e){return cachedClearTimeout.call(this,marker)}}}var queue=[];var draining=false;var currentQueue;var queueIndex=-1;function cleanUpNextTick(){if(!draining||!currentQueue){return}draining=false;if(currentQueue.length){queue=currentQueue.concat(queue)}else{queueIndex=-1}if(queue.length){drainQueue()}}function drainQueue(){if(draining){return}var timeout=runTimeout(cleanUpNextTick);draining=true;var len=queue.length;while(len){currentQueue=queue;queue=[];while(++queueIndex<len){if(currentQueue){currentQueue[queueIndex].run()}}queueIndex=-1;len=queue.length}currentQueue=null;draining=false;runClearTimeout(timeout)}process.nextTick=function(fun){var args=new Array(arguments.length-1);if(arguments.length>1){for(var i=1;i<arguments.length;i++){args[i-1]=arguments[i]}}queue.push(new Item(fun,args));if(queue.length===1&&!draining){runTimeout(drainQueue)}};function Item(fun,array){this.fun=fun;this.array=array}Item.prototype.run=function(){this.fun.apply(null,this.array)};process.title=\"browser\";process.browser=true;process.env={};process.argv=[];process.version=\"\";process.versions={};function noop(){}process.on=noop;process.addListener=noop;process.once=noop;process.off=noop;process.removeListener=noop;process.removeAllListeners=noop;process.emit=noop;process.binding=function(name){throw new Error(\"process.binding is not supported\")};process.cwd=function(){return\"/\"};process.chdir=function(dir){throw new Error(\"process.chdir is not supported\")};process.umask=function(){return 0}},{}],43:[function(require,module,exports){module.exports=require(\"./lib/_stream_duplex.js\")},{\"./lib/_stream_duplex.js\":44}],44:[function(require,module,exports){\"use strict\";var objectKeys=Object.keys||function(obj){var keys=[];for(var key in obj){keys.push(key)}return keys};module.exports=Duplex;var processNextTick=require(\"process-nextick-args\");var util=require(\"core-util-is\");util.inherits=require(\"inherits\");var Readable=require(\"./_stream_readable\");var Writable=require(\"./_stream_writable\");util.inherits(Duplex,Readable);var keys=objectKeys(Writable.prototype);for(var v=0;v<keys.length;v++){var method=keys[v];if(!Duplex.prototype[method])Duplex.prototype[method]=Writable.prototype[method]}function Duplex(options){if(!(this instanceof Duplex))return new Duplex(options);Readable.call(this,options);Writable.call(this,options);if(options&&options.readable===false)this.readable=false;if(options&&options.writable===false)this.writable=false;this.allowHalfOpen=true;if(options&&options.allowHalfOpen===false)this.allowHalfOpen=false;this.once(\"end\",onend)}function onend(){if(this.allowHalfOpen||this._writableState.ended)return;processNextTick(onEndNT,this)}function onEndNT(self){self.end()}function forEach(xs,f){for(var i=0,l=xs.length;i<l;i++){f(xs[i],i)}}},{\"./_stream_readable\":46,\"./_stream_writable\":48,\"core-util-is\":6,inherits:38,\"process-nextick-args\":41}],45:[function(require,module,exports){\"use strict\";module.exports=PassThrough;var Transform=require(\"./_stream_transform\");var util=require(\"core-util-is\");util.inherits=require(\"inherits\");util.inherits(PassThrough,Transform);function PassThrough(options){if(!(this instanceof PassThrough))return new PassThrough(options);Transform.call(this,options)}PassThrough.prototype._transform=function(chunk,encoding,cb){cb(null,chunk)}},{\"./_stream_transform\":47,\"core-util-is\":6,inherits:38}],46:[function(require,module,exports){(function(process){\"use strict\";module.exports=Readable;var processNextTick=require(\"process-nextick-args\");var isArray=require(\"isarray\");Readable.ReadableState=ReadableState;var EE=require(\"events\").EventEmitter;var EElistenerCount=function(emitter,type){return emitter.listeners(type).length};var Stream;(function(){try{Stream=require(\"st\"+\"ream\")}catch(_){}finally{if(!Stream)Stream=require(\"events\").EventEmitter}})();var Buffer=require(\"buffer\").Buffer;var bufferShim=require(\"buffer-shims\");var util=require(\"core-util-is\");util.inherits=require(\"inherits\");var debugUtil=require(\"util\");var debug=void 0;if(debugUtil&&debugUtil.debuglog){debug=debugUtil.debuglog(\"stream\")}else{debug=function(){}}var BufferList=require(\"./internal/streams/BufferList\");var StringDecoder;util.inherits(Readable,Stream);function prependListener(emitter,event,fn){if(typeof emitter.prependListener===\"function\"){return emitter.prependListener(event,fn)}else{if(!emitter._events||!emitter._events[event])emitter.on(event,fn);else if(isArray(emitter._events[event]))emitter._events[event].unshift(fn);else emitter._events[event]=[fn,emitter._events[event]]}}var Duplex;function ReadableState(options,stream){Duplex=Duplex||require(\"./_stream_duplex\");options=options||{};this.objectMode=!!options.objectMode;if(stream instanceof Duplex)this.objectMode=this.objectMode||!!options.readableObjectMode;var hwm=options.highWaterMark;var defaultHwm=this.objectMode?16:16*1024;this.highWaterMark=hwm||hwm===0?hwm:defaultHwm;this.highWaterMark=~~this.highWaterMark;this.buffer=new BufferList;this.length=0;this.pipes=null;this.pipesCount=0;this.flowing=null;this.ended=false;this.endEmitted=false;this.reading=false;this.sync=true;this.needReadable=false;this.emittedReadable=false;this.readableListening=false;this.resumeScheduled=false;this.defaultEncoding=options.defaultEncoding||\"utf8\";this.ranOut=false;this.awaitDrain=0;this.readingMore=false;this.decoder=null;this.encoding=null;if(options.encoding){if(!StringDecoder)StringDecoder=require(\"string_decoder/\").StringDecoder;this.decoder=new StringDecoder(options.encoding);this.encoding=options.encoding}}var Duplex;function Readable(options){Duplex=Duplex||require(\"./_stream_duplex\");if(!(this instanceof Readable))return new Readable(options);this._readableState=new ReadableState(options,this);this.readable=true;if(options&&typeof options.read===\"function\")this._read=options.read;Stream.call(this)}Readable.prototype.push=function(chunk,encoding){var state=this._readableState;if(!state.objectMode&&typeof chunk===\"string\"){encoding=encoding||state.defaultEncoding;if(encoding!==state.encoding){chunk=bufferShim.from(chunk,encoding);encoding=\"\"}}return readableAddChunk(this,state,chunk,encoding,false)};Readable.prototype.unshift=function(chunk){var state=this._readableState;return readableAddChunk(this,state,chunk,\"\",true)};Readable.prototype.isPaused=function(){return this._readableState.flowing===false};function readableAddChunk(stream,state,chunk,encoding,addToFront){var er=chunkInvalid(state,chunk);if(er){stream.emit(\"error\",er)}else if(chunk===null){state.reading=false;onEofChunk(stream,state)}else if(state.objectMode||chunk&&chunk.length>0){if(state.ended&&!addToFront){var e=new Error(\"stream.push() after EOF\");stream.emit(\"error\",e)}else if(state.endEmitted&&addToFront){var _e=new Error(\"stream.unshift() after end event\");stream.emit(\"error\",_e)}else{var skipAdd;if(state.decoder&&!addToFront&&!encoding){chunk=state.decoder.write(chunk);skipAdd=!state.objectMode&&chunk.length===0}if(!addToFront)state.reading=false;if(!skipAdd){if(state.flowing&&state.length===0&&!state.sync){stream.emit(\"data\",chunk);stream.read(0)}else{state.length+=state.objectMode?1:chunk.length;if(addToFront)state.buffer.unshift(chunk);else state.buffer.push(chunk);if(state.needReadable)emitReadable(stream)}}maybeReadMore(stream,state)}}else if(!addToFront){state.reading=false}return needMoreData(state)}function needMoreData(state){return!state.ended&&(state.needReadable||state.length<state.highWaterMark||state.length===0)}Readable.prototype.setEncoding=function(enc){if(!StringDecoder)StringDecoder=require(\"string_decoder/\").StringDecoder;this._readableState.decoder=new StringDecoder(enc);this._readableState.encoding=enc;return this};var MAX_HWM=8388608;function computeNewHighWaterMark(n){if(n>=MAX_HWM){n=MAX_HWM}else{n--;n|=n>>>1;n|=n>>>2;n|=n>>>4;n|=n>>>8;n|=n>>>16;n++}return n}function howMuchToRead(n,state){if(n<=0||state.length===0&&state.ended)return 0;if(state.objectMode)return 1;if(n!==n){if(state.flowing&&state.length)return state.buffer.head.data.length;else return state.length}if(n>state.highWaterMark)state.highWaterMark=computeNewHighWaterMark(n);if(n<=state.length)return n;if(!state.ended){state.needReadable=true;return 0}return state.length}Readable.prototype.read=function(n){debug(\"read\",n);n=parseInt(n,10);var state=this._readableState;var nOrig=n;if(n!==0)state.emittedReadable=false;if(n===0&&state.needReadable&&(state.length>=state.highWaterMark||state.ended)){debug(\"read: emitReadable\",state.length,state.ended);if(state.length===0&&state.ended)endReadable(this);else emitReadable(this);return null}n=howMuchToRead(n,state);if(n===0&&state.ended){if(state.length===0)endReadable(this);return null}var doRead=state.needReadable;debug(\"need readable\",doRead);if(state.length===0||state.length-n<state.highWaterMark){doRead=true;debug(\"length less than watermark\",doRead)}if(state.ended||state.reading){doRead=false;debug(\"reading or ended\",doRead)}else if(doRead){debug(\"do read\");state.reading=true;state.sync=true;if(state.length===0)state.needReadable=true;this._read(state.highWaterMark);state.sync=false;if(!state.reading)n=howMuchToRead(nOrig,state)}var ret;if(n>0)ret=fromList(n,state);else ret=null;if(ret===null){state.needReadable=true;n=0}else{state.length-=n}if(state.length===0){if(!state.ended)state.needReadable=true;if(nOrig!==n&&state.ended)endReadable(this)}if(ret!==null)this.emit(\"data\",ret);return ret};function chunkInvalid(state,chunk){var er=null;if(!Buffer.isBuffer(chunk)&&typeof chunk!==\"string\"&&chunk!==null&&chunk!==undefined&&!state.objectMode){er=new TypeError(\"Invalid non-string/buffer chunk\")}return er}function onEofChunk(stream,state){if(state.ended)return;if(state.decoder){var chunk=state.decoder.end();if(chunk&&chunk.length){state.buffer.push(chunk);state.length+=state.objectMode?1:chunk.length}}state.ended=true;emitReadable(stream)}function emitReadable(stream){var state=stream._readableState;state.needReadable=false;if(!state.emittedReadable){debug(\"emitReadable\",state.flowing);state.emittedReadable=true;if(state.sync)processNextTick(emitReadable_,stream);else emitReadable_(stream)}}function emitReadable_(stream){debug(\"emit readable\");stream.emit(\"readable\");flow(stream)}function maybeReadMore(stream,state){if(!state.readingMore){state.readingMore=true;processNextTick(maybeReadMore_,stream,state)}}function maybeReadMore_(stream,state){var len=state.length;while(!state.reading&&!state.flowing&&!state.ended&&state.length<state.highWaterMark){debug(\"maybeReadMore read 0\");stream.read(0);if(len===state.length)break;else len=state.length}state.readingMore=false}Readable.prototype._read=function(n){this.emit(\"error\",new Error(\"not implemented\"))};Readable.prototype.pipe=function(dest,pipeOpts){var src=this;var state=this._readableState;switch(state.pipesCount){case 0:state.pipes=dest;break;case 1:state.pipes=[state.pipes,dest];break;default:state.pipes.push(dest);break}state.pipesCount+=1;debug(\"pipe count=%d opts=%j\",state.pipesCount,pipeOpts);var doEnd=(!pipeOpts||pipeOpts.end!==false)&&dest!==process.stdout&&dest!==process.stderr;var endFn=doEnd?onend:cleanup;if(state.endEmitted)processNextTick(endFn);else src.once(\"end\",endFn);dest.on(\"unpipe\",onunpipe);function onunpipe(readable){debug(\"onunpipe\");if(readable===src){cleanup()}}function onend(){debug(\"onend\");dest.end()}var ondrain=pipeOnDrain(src);dest.on(\"drain\",ondrain);var cleanedUp=false;function cleanup(){debug(\"cleanup\");dest.removeListener(\"close\",onclose);dest.removeListener(\"finish\",onfinish);dest.removeListener(\"drain\",ondrain);dest.removeListener(\"error\",onerror);dest.removeListener(\"unpipe\",onunpipe);src.removeListener(\"end\",onend);src.removeListener(\"end\",cleanup);src.removeListener(\"data\",ondata);cleanedUp=true;if(state.awaitDrain&&(!dest._writableState||dest._writableState.needDrain))ondrain()}var increasedAwaitDrain=false;src.on(\"data\",ondata);function ondata(chunk){debug(\"ondata\");increasedAwaitDrain=false;var ret=dest.write(chunk);if(false===ret&&!increasedAwaitDrain){if((state.pipesCount===1&&state.pipes===dest||state.pipesCount>1&&indexOf(state.pipes,dest)!==-1)&&!cleanedUp){debug(\"false write response, pause\",src._readableState.awaitDrain);src._readableState.awaitDrain++;increasedAwaitDrain=true}src.pause()}}function onerror(er){debug(\"onerror\",er);unpipe();dest.removeListener(\"error\",onerror);if(EElistenerCount(dest,\"error\")===0)dest.emit(\"error\",er)}prependListener(dest,\"error\",onerror);function onclose(){dest.removeListener(\"finish\",onfinish);unpipe()}dest.once(\"close\",onclose);function onfinish(){debug(\"onfinish\");dest.removeListener(\"close\",onclose);unpipe()}dest.once(\"finish\",onfinish);function unpipe(){debug(\"unpipe\");src.unpipe(dest)}dest.emit(\"pipe\",src);if(!state.flowing){debug(\"pipe resume\");src.resume()}return dest};function pipeOnDrain(src){return function(){var state=src._readableState;debug(\"pipeOnDrain\",state.awaitDrain);if(state.awaitDrain)state.awaitDrain--;if(state.awaitDrain===0&&EElistenerCount(src,\"data\")){state.flowing=true;flow(src)}}}Readable.prototype.unpipe=function(dest){var state=this._readableState;if(state.pipesCount===0)return this;if(state.pipesCount===1){if(dest&&dest!==state.pipes)return this;if(!dest)dest=state.pipes;state.pipes=null;state.pipesCount=0;state.flowing=false;if(dest)dest.emit(\"unpipe\",this);return this}if(!dest){var dests=state.pipes;var len=state.pipesCount;state.pipes=null;state.pipesCount=0;state.flowing=false;for(var _i=0;_i<len;_i++){dests[_i].emit(\"unpipe\",this)}return this}var i=indexOf(state.pipes,dest);if(i===-1)return this;state.pipes.splice(i,1);state.pipesCount-=1;if(state.pipesCount===1)state.pipes=state.pipes[0];dest.emit(\"unpipe\",this);return this};Readable.prototype.on=function(ev,fn){var res=Stream.prototype.on.call(this,ev,fn);if(ev===\"data\"){if(this._readableState.flowing!==false)this.resume()}else if(ev===\"readable\"){var state=this._readableState;if(!state.endEmitted&&!state.readableListening){state.readableListening=state.needReadable=true;state.emittedReadable=false;if(!state.reading){processNextTick(nReadingNextTick,this)}else if(state.length){emitReadable(this,state)}}}return res};Readable.prototype.addListener=Readable.prototype.on;function nReadingNextTick(self){debug(\"readable nexttick read 0\");self.read(0)}Readable.prototype.resume=function(){var state=this._readableState;if(!state.flowing){debug(\"resume\");state.flowing=true;resume(this,state)}return this};function resume(stream,state){if(!state.resumeScheduled){state.resumeScheduled=true;processNextTick(resume_,stream,state)}}function resume_(stream,state){if(!state.reading){debug(\"resume read 0\");stream.read(0)}state.resumeScheduled=false;state.awaitDrain=0;stream.emit(\"resume\");flow(stream);if(state.flowing&&!state.reading)stream.read(0)}Readable.prototype.pause=function(){debug(\"call pause flowing=%j\",this._readableState.flowing);if(false!==this._readableState.flowing){debug(\"pause\");this._readableState.flowing=false;this.emit(\"pause\")}return this};function flow(stream){var state=stream._readableState;debug(\"flow\",state.flowing);while(state.flowing&&stream.read()!==null){}}Readable.prototype.wrap=function(stream){var state=this._readableState;var paused=false;var self=this;stream.on(\"end\",function(){debug(\"wrapped end\");if(state.decoder&&!state.ended){var chunk=state.decoder.end();if(chunk&&chunk.length)self.push(chunk)}self.push(null)});stream.on(\"data\",function(chunk){debug(\"wrapped data\");if(state.decoder)chunk=state.decoder.write(chunk);if(state.objectMode&&(chunk===null||chunk===undefined))return;else if(!state.objectMode&&(!chunk||!chunk.length))return;var ret=self.push(chunk);if(!ret){paused=true;stream.pause()}});for(var i in stream){if(this[i]===undefined&&typeof stream[i]===\"function\"){this[i]=function(method){return function(){return stream[method].apply(stream,arguments)}}(i)}}var events=[\"error\",\"close\",\"destroy\",\"pause\",\"resume\"];forEach(events,function(ev){stream.on(ev,self.emit.bind(self,ev))});self._read=function(n){debug(\"wrapped _read\",n);if(paused){paused=false;stream.resume()}};return self};Readable._fromList=fromList;function fromList(n,state){if(state.length===0)return null;var ret;if(state.objectMode)ret=state.buffer.shift();else if(!n||n>=state.length){if(state.decoder)ret=state.buffer.join(\"\");else if(state.buffer.length===1)ret=state.buffer.head.data;else ret=state.buffer.concat(state.length);state.buffer.clear()}else{ret=fromListPartial(n,state.buffer,state.decoder)}return ret}function fromListPartial(n,list,hasStrings){var ret;if(n<list.head.data.length){ret=list.head.data.slice(0,n);list.head.data=list.head.data.slice(n)}else if(n===list.head.data.length){ret=list.shift()}else{ret=hasStrings?copyFromBufferString(n,list):copyFromBuffer(n,list)}return ret}function copyFromBufferString(n,list){var p=list.head;var c=1;var ret=p.data;n-=ret.length;while(p=p.next){var str=p.data;var nb=n>str.length?str.length:n;if(nb===str.length)ret+=str;else ret+=str.slice(0,n);n-=nb;if(n===0){if(nb===str.length){++c;if(p.next)list.head=p.next;else list.head=list.tail=null}else{list.head=p;p.data=str.slice(nb)}break}++c}list.length-=c;return ret}function copyFromBuffer(n,list){var ret=bufferShim.allocUnsafe(n);var p=list.head;var c=1;p.data.copy(ret);n-=p.data.length;while(p=p.next){var buf=p.data;var nb=n>buf.length?buf.length:n;buf.copy(ret,ret.length-n,0,nb);n-=nb;if(n===0){if(nb===buf.length){++c;if(p.next)list.head=p.next;else list.head=list.tail=null}else{list.head=p;p.data=buf.slice(nb)}break}++c}list.length-=c;return ret}function endReadable(stream){var state=stream._readableState;if(state.length>0)throw new Error('\"endReadable()\" called on non-empty stream');if(!state.endEmitted){state.ended=true;processNextTick(endReadableNT,state,stream)}}function endReadableNT(state,stream){if(!state.endEmitted&&state.length===0){state.endEmitted=true;stream.readable=false;stream.emit(\"end\")}}function forEach(xs,f){for(var i=0,l=xs.length;i<l;i++){f(xs[i],i)}}function indexOf(xs,x){for(var i=0,l=xs.length;i<l;i++){if(xs[i]===x)return i}return-1}}).call(this,require(\"_process\"))},{\"./_stream_duplex\":44,\"./internal/streams/BufferList\":49,_process:42,buffer:5,\"buffer-shims\":4,\"core-util-is\":6,events:28,inherits:38,isarray:40,\"process-nextick-args\":41,\"string_decoder/\":56,util:3}],47:[function(require,module,exports){\"use strict\";module.exports=Transform;var Duplex=require(\"./_stream_duplex\");var util=require(\"core-util-is\");util.inherits=require(\"inherits\");util.inherits(Transform,Duplex);function TransformState(stream){this.afterTransform=function(er,data){return afterTransform(stream,er,data)};this.needTransform=false;this.transforming=false;this.writecb=null;this.writechunk=null;this.writeencoding=null}function afterTransform(stream,er,data){var ts=stream._transformState;ts.transforming=false;var cb=ts.writecb;if(!cb)return stream.emit(\"error\",new Error(\"no writecb in Transform class\"));ts.writechunk=null;ts.writecb=null;if(data!==null&&data!==undefined)stream.push(data);cb(er);var rs=stream._readableState;rs.reading=false;if(rs.needReadable||rs.length<rs.highWaterMark){stream._read(rs.highWaterMark)}}function Transform(options){if(!(this instanceof Transform))return new Transform(options);Duplex.call(this,options);this._transformState=new TransformState(this);var stream=this;this._readableState.needReadable=true;this._readableState.sync=false;if(options){if(typeof options.transform===\"function\")this._transform=options.transform;if(typeof options.flush===\"function\")this._flush=options.flush}this.once(\"prefinish\",function(){if(typeof this._flush===\"function\")this._flush(function(er){done(stream,er)});else done(stream)})}Transform.prototype.push=function(chunk,encoding){this._transformState.needTransform=false;return Duplex.prototype.push.call(this,chunk,encoding)};Transform.prototype._transform=function(chunk,encoding,cb){throw new Error(\"Not implemented\")};Transform.prototype._write=function(chunk,encoding,cb){var ts=this._transformState;ts.writecb=cb;ts.writechunk=chunk;ts.writeencoding=encoding;if(!ts.transforming){var rs=this._readableState;if(ts.needTransform||rs.needReadable||rs.length<rs.highWaterMark)this._read(rs.highWaterMark)}};Transform.prototype._read=function(n){var ts=this._transformState;if(ts.writechunk!==null&&ts.writecb&&!ts.transforming){ts.transforming=true;this._transform(ts.writechunk,ts.writeencoding,ts.afterTransform)}else{ts.needTransform=true}};function done(stream,er){if(er)return stream.emit(\"error\",er);var ws=stream._writableState;var ts=stream._transformState;if(ws.length)throw new Error(\"Calling transform done when ws.length != 0\");if(ts.transforming)throw new Error(\"Calling transform done when still transforming\");return stream.push(null)}},{\"./_stream_duplex\":44,\"core-util-is\":6,inherits:38}],48:[function(require,module,exports){(function(process){\"use strict\";module.exports=Writable;var processNextTick=require(\"process-nextick-args\");var asyncWrite=!process.browser&&[\"v0.10\",\"v0.9.\"].indexOf(process.version.slice(0,5))>-1?setImmediate:processNextTick;Writable.WritableState=WritableState;var util=require(\"core-util-is\");util.inherits=require(\"inherits\");var internalUtil={deprecate:require(\"util-deprecate\")};var Stream;(function(){try{Stream=require(\"st\"+\"ream\")}catch(_){}finally{if(!Stream)Stream=require(\"events\").EventEmitter}})();var Buffer=require(\"buffer\").Buffer;var bufferShim=require(\"buffer-shims\");util.inherits(Writable,Stream);function nop(){}function WriteReq(chunk,encoding,cb){this.chunk=chunk;this.encoding=encoding;this.callback=cb;this.next=null}var Duplex;function WritableState(options,stream){Duplex=Duplex||require(\"./_stream_duplex\");options=options||{};this.objectMode=!!options.objectMode;if(stream instanceof Duplex)this.objectMode=this.objectMode||!!options.writableObjectMode;var hwm=options.highWaterMark;var defaultHwm=this.objectMode?16:16*1024;this.highWaterMark=hwm||hwm===0?hwm:defaultHwm;this.highWaterMark=~~this.highWaterMark;this.needDrain=false;this.ending=false;this.ended=false;this.finished=false;var noDecode=options.decodeStrings===false;this.decodeStrings=!noDecode;this.defaultEncoding=options.defaultEncoding||\"utf8\";this.length=0;this.writing=false;this.corked=0;this.sync=true;this.bufferProcessing=false;this.onwrite=function(er){onwrite(stream,er)};this.writecb=null;this.writelen=0;this.bufferedRequest=null;this.lastBufferedRequest=null;this.pendingcb=0;this.prefinished=false;this.errorEmitted=false;this.bufferedRequestCount=0;this.corkedRequestsFree=new CorkedRequest(this)}WritableState.prototype.getBuffer=function writableStateGetBuffer(){var current=this.bufferedRequest;var out=[];while(current){out.push(current);current=current.next}return out};(function(){try{Object.defineProperty(WritableState.prototype,\"buffer\",{get:internalUtil.deprecate(function(){return this.getBuffer()},\"_writableState.buffer is deprecated. Use _writableState.getBuffer \"+\"instead.\")})}catch(_){}})();var Duplex;function Writable(options){Duplex=Duplex||require(\"./_stream_duplex\");if(!(this instanceof Writable)&&!(this instanceof Duplex))return new Writable(options);this._writableState=new WritableState(options,this);this.writable=true;if(options){if(typeof options.write===\"function\")this._write=options.write;if(typeof options.writev===\"function\")this._writev=options.writev}Stream.call(this)}Writable.prototype.pipe=function(){this.emit(\"error\",new Error(\"Cannot pipe, not readable\"))};function writeAfterEnd(stream,cb){var er=new Error(\"write after end\");stream.emit(\"error\",er);processNextTick(cb,er)}function validChunk(stream,state,chunk,cb){var valid=true;var er=false;if(chunk===null){er=new TypeError(\"May not write null values to stream\")}else if(!Buffer.isBuffer(chunk)&&typeof chunk!==\"string\"&&chunk!==undefined&&!state.objectMode){er=new TypeError(\"Invalid non-string/buffer chunk\")}if(er){stream.emit(\"error\",er);processNextTick(cb,er);valid=false}return valid}Writable.prototype.write=function(chunk,encoding,cb){var state=this._writableState;var ret=false;if(typeof encoding===\"function\"){cb=encoding;encoding=null}if(Buffer.isBuffer(chunk))encoding=\"buffer\";else if(!encoding)encoding=state.defaultEncoding;if(typeof cb!==\"function\")cb=nop;if(state.ended)writeAfterEnd(this,cb);else if(validChunk(this,state,chunk,cb)){\nstate.pendingcb++;ret=writeOrBuffer(this,state,chunk,encoding,cb)}return ret};Writable.prototype.cork=function(){var state=this._writableState;state.corked++};Writable.prototype.uncork=function(){var state=this._writableState;if(state.corked){state.corked--;if(!state.writing&&!state.corked&&!state.finished&&!state.bufferProcessing&&state.bufferedRequest)clearBuffer(this,state)}};Writable.prototype.setDefaultEncoding=function setDefaultEncoding(encoding){if(typeof encoding===\"string\")encoding=encoding.toLowerCase();if(!([\"hex\",\"utf8\",\"utf-8\",\"ascii\",\"binary\",\"base64\",\"ucs2\",\"ucs-2\",\"utf16le\",\"utf-16le\",\"raw\"].indexOf((encoding+\"\").toLowerCase())>-1))throw new TypeError(\"Unknown encoding: \"+encoding);this._writableState.defaultEncoding=encoding;return this};function decodeChunk(state,chunk,encoding){if(!state.objectMode&&state.decodeStrings!==false&&typeof chunk===\"string\"){chunk=bufferShim.from(chunk,encoding)}return chunk}function writeOrBuffer(stream,state,chunk,encoding,cb){chunk=decodeChunk(state,chunk,encoding);if(Buffer.isBuffer(chunk))encoding=\"buffer\";var len=state.objectMode?1:chunk.length;state.length+=len;var ret=state.length<state.highWaterMark;if(!ret)state.needDrain=true;if(state.writing||state.corked){var last=state.lastBufferedRequest;state.lastBufferedRequest=new WriteReq(chunk,encoding,cb);if(last){last.next=state.lastBufferedRequest}else{state.bufferedRequest=state.lastBufferedRequest}state.bufferedRequestCount+=1}else{doWrite(stream,state,false,len,chunk,encoding,cb)}return ret}function doWrite(stream,state,writev,len,chunk,encoding,cb){state.writelen=len;state.writecb=cb;state.writing=true;state.sync=true;if(writev)stream._writev(chunk,state.onwrite);else stream._write(chunk,encoding,state.onwrite);state.sync=false}function onwriteError(stream,state,sync,er,cb){--state.pendingcb;if(sync)processNextTick(cb,er);else cb(er);stream._writableState.errorEmitted=true;stream.emit(\"error\",er)}function onwriteStateUpdate(state){state.writing=false;state.writecb=null;state.length-=state.writelen;state.writelen=0}function onwrite(stream,er){var state=stream._writableState;var sync=state.sync;var cb=state.writecb;onwriteStateUpdate(state);if(er)onwriteError(stream,state,sync,er,cb);else{var finished=needFinish(state);if(!finished&&!state.corked&&!state.bufferProcessing&&state.bufferedRequest){clearBuffer(stream,state)}if(sync){asyncWrite(afterWrite,stream,state,finished,cb)}else{afterWrite(stream,state,finished,cb)}}}function afterWrite(stream,state,finished,cb){if(!finished)onwriteDrain(stream,state);state.pendingcb--;cb();finishMaybe(stream,state)}function onwriteDrain(stream,state){if(state.length===0&&state.needDrain){state.needDrain=false;stream.emit(\"drain\")}}function clearBuffer(stream,state){state.bufferProcessing=true;var entry=state.bufferedRequest;if(stream._writev&&entry&&entry.next){var l=state.bufferedRequestCount;var buffer=new Array(l);var holder=state.corkedRequestsFree;holder.entry=entry;var count=0;while(entry){buffer[count]=entry;entry=entry.next;count+=1}doWrite(stream,state,true,state.length,buffer,\"\",holder.finish);state.pendingcb++;state.lastBufferedRequest=null;if(holder.next){state.corkedRequestsFree=holder.next;holder.next=null}else{state.corkedRequestsFree=new CorkedRequest(state)}}else{while(entry){var chunk=entry.chunk;var encoding=entry.encoding;var cb=entry.callback;var len=state.objectMode?1:chunk.length;doWrite(stream,state,false,len,chunk,encoding,cb);entry=entry.next;if(state.writing){break}}if(entry===null)state.lastBufferedRequest=null}state.bufferedRequestCount=0;state.bufferedRequest=entry;state.bufferProcessing=false}Writable.prototype._write=function(chunk,encoding,cb){cb(new Error(\"not implemented\"))};Writable.prototype._writev=null;Writable.prototype.end=function(chunk,encoding,cb){var state=this._writableState;if(typeof chunk===\"function\"){cb=chunk;chunk=null;encoding=null}else if(typeof encoding===\"function\"){cb=encoding;encoding=null}if(chunk!==null&&chunk!==undefined)this.write(chunk,encoding);if(state.corked){state.corked=1;this.uncork()}if(!state.ending&&!state.finished)endWritable(this,state,cb)};function needFinish(state){return state.ending&&state.length===0&&state.bufferedRequest===null&&!state.finished&&!state.writing}function prefinish(stream,state){if(!state.prefinished){state.prefinished=true;stream.emit(\"prefinish\")}}function finishMaybe(stream,state){var need=needFinish(state);if(need){if(state.pendingcb===0){prefinish(stream,state);state.finished=true;stream.emit(\"finish\")}else{prefinish(stream,state)}}return need}function endWritable(stream,state,cb){state.ending=true;finishMaybe(stream,state);if(cb){if(state.finished)processNextTick(cb);else stream.once(\"finish\",cb)}state.ended=true;stream.writable=false}function CorkedRequest(state){var _this=this;this.next=null;this.entry=null;this.finish=function(err){var entry=_this.entry;_this.entry=null;while(entry){var cb=entry.callback;state.pendingcb--;cb(err);entry=entry.next}if(state.corkedRequestsFree){state.corkedRequestsFree.next=_this}else{state.corkedRequestsFree=_this}}}}).call(this,require(\"_process\"))},{\"./_stream_duplex\":44,_process:42,buffer:5,\"buffer-shims\":4,\"core-util-is\":6,events:28,inherits:38,\"process-nextick-args\":41,\"util-deprecate\":57}],49:[function(require,module,exports){\"use strict\";var Buffer=require(\"buffer\").Buffer;var bufferShim=require(\"buffer-shims\");module.exports=BufferList;function BufferList(){this.head=null;this.tail=null;this.length=0}BufferList.prototype.push=function(v){var entry={data:v,next:null};if(this.length>0)this.tail.next=entry;else this.head=entry;this.tail=entry;++this.length};BufferList.prototype.unshift=function(v){var entry={data:v,next:this.head};if(this.length===0)this.tail=entry;this.head=entry;++this.length};BufferList.prototype.shift=function(){if(this.length===0)return;var ret=this.head.data;if(this.length===1)this.head=this.tail=null;else this.head=this.head.next;--this.length;return ret};BufferList.prototype.clear=function(){this.head=this.tail=null;this.length=0};BufferList.prototype.join=function(s){if(this.length===0)return\"\";var p=this.head;var ret=\"\"+p.data;while(p=p.next){ret+=s+p.data}return ret};BufferList.prototype.concat=function(n){if(this.length===0)return bufferShim.alloc(0);if(this.length===1)return this.head.data;var ret=bufferShim.allocUnsafe(n>>>0);var p=this.head;var i=0;while(p){p.data.copy(ret,i);i+=p.data.length;p=p.next}return ret}},{buffer:5,\"buffer-shims\":4}],50:[function(require,module,exports){module.exports=require(\"./lib/_stream_passthrough.js\")},{\"./lib/_stream_passthrough.js\":45}],51:[function(require,module,exports){(function(process){var Stream=function(){try{return require(\"st\"+\"ream\")}catch(_){}}();exports=module.exports=require(\"./lib/_stream_readable.js\");exports.Stream=Stream||exports;exports.Readable=exports;exports.Writable=require(\"./lib/_stream_writable.js\");exports.Duplex=require(\"./lib/_stream_duplex.js\");exports.Transform=require(\"./lib/_stream_transform.js\");exports.PassThrough=require(\"./lib/_stream_passthrough.js\");if(!process.browser&&process.env.READABLE_STREAM===\"disable\"&&Stream){module.exports=Stream}}).call(this,require(\"_process\"))},{\"./lib/_stream_duplex.js\":44,\"./lib/_stream_passthrough.js\":45,\"./lib/_stream_readable.js\":46,\"./lib/_stream_transform.js\":47,\"./lib/_stream_writable.js\":48,_process:42}],52:[function(require,module,exports){module.exports=require(\"./lib/_stream_transform.js\")},{\"./lib/_stream_transform.js\":47}],53:[function(require,module,exports){module.exports=require(\"./lib/_stream_writable.js\")},{\"./lib/_stream_writable.js\":48}],54:[function(require,module,exports){module.exports=function(string){return string.replace(/[-\\\\^$*+?.()|[\\]{}]/g,\"\\\\$&\")}},{}],55:[function(require,module,exports){module.exports=Stream;var EE=require(\"events\").EventEmitter;var inherits=require(\"inherits\");inherits(Stream,EE);Stream.Readable=require(\"readable-stream/readable.js\");Stream.Writable=require(\"readable-stream/writable.js\");Stream.Duplex=require(\"readable-stream/duplex.js\");Stream.Transform=require(\"readable-stream/transform.js\");Stream.PassThrough=require(\"readable-stream/passthrough.js\");Stream.Stream=Stream;function Stream(){EE.call(this)}Stream.prototype.pipe=function(dest,options){var source=this;function ondata(chunk){if(dest.writable){if(false===dest.write(chunk)&&source.pause){source.pause()}}}source.on(\"data\",ondata);function ondrain(){if(source.readable&&source.resume){source.resume()}}dest.on(\"drain\",ondrain);if(!dest._isStdio&&(!options||options.end!==false)){source.on(\"end\",onend);source.on(\"close\",onclose)}var didOnEnd=false;function onend(){if(didOnEnd)return;didOnEnd=true;dest.end()}function onclose(){if(didOnEnd)return;didOnEnd=true;if(typeof dest.destroy===\"function\")dest.destroy()}function onerror(er){cleanup();if(EE.listenerCount(this,\"error\")===0){throw er}}source.on(\"error\",onerror);dest.on(\"error\",onerror);function cleanup(){source.removeListener(\"data\",ondata);dest.removeListener(\"drain\",ondrain);source.removeListener(\"end\",onend);source.removeListener(\"close\",onclose);source.removeListener(\"error\",onerror);dest.removeListener(\"error\",onerror);source.removeListener(\"end\",cleanup);source.removeListener(\"close\",cleanup);dest.removeListener(\"close\",cleanup)}source.on(\"end\",cleanup);source.on(\"close\",cleanup);dest.on(\"close\",cleanup);dest.emit(\"pipe\",source);return dest}},{events:28,inherits:38,\"readable-stream/duplex.js\":43,\"readable-stream/passthrough.js\":50,\"readable-stream/readable.js\":51,\"readable-stream/transform.js\":52,\"readable-stream/writable.js\":53}],56:[function(require,module,exports){var Buffer=require(\"buffer\").Buffer;var isBufferEncoding=Buffer.isEncoding||function(encoding){switch(encoding&&encoding.toLowerCase()){case\"hex\":case\"utf8\":case\"utf-8\":case\"ascii\":case\"binary\":case\"base64\":case\"ucs2\":case\"ucs-2\":case\"utf16le\":case\"utf-16le\":case\"raw\":return true;default:return false}};function assertEncoding(encoding){if(encoding&&!isBufferEncoding(encoding)){throw new Error(\"Unknown encoding: \"+encoding)}}var StringDecoder=exports.StringDecoder=function(encoding){this.encoding=(encoding||\"utf8\").toLowerCase().replace(/[-_]/,\"\");assertEncoding(encoding);switch(this.encoding){case\"utf8\":this.surrogateSize=3;break;case\"ucs2\":case\"utf16le\":this.surrogateSize=2;this.detectIncompleteChar=utf16DetectIncompleteChar;break;case\"base64\":this.surrogateSize=3;this.detectIncompleteChar=base64DetectIncompleteChar;break;default:this.write=passThroughWrite;return}this.charBuffer=new Buffer(6);this.charReceived=0;this.charLength=0};StringDecoder.prototype.write=function(buffer){var charStr=\"\";while(this.charLength){var available=buffer.length>=this.charLength-this.charReceived?this.charLength-this.charReceived:buffer.length;buffer.copy(this.charBuffer,this.charReceived,0,available);this.charReceived+=available;if(this.charReceived<this.charLength){return\"\"}buffer=buffer.slice(available,buffer.length);charStr=this.charBuffer.slice(0,this.charLength).toString(this.encoding);var charCode=charStr.charCodeAt(charStr.length-1);if(charCode>=55296&&charCode<=56319){this.charLength+=this.surrogateSize;charStr=\"\";continue}this.charReceived=this.charLength=0;if(buffer.length===0){return charStr}break}this.detectIncompleteChar(buffer);var end=buffer.length;if(this.charLength){buffer.copy(this.charBuffer,0,buffer.length-this.charReceived,end);end-=this.charReceived}charStr+=buffer.toString(this.encoding,0,end);var end=charStr.length-1;var charCode=charStr.charCodeAt(end);if(charCode>=55296&&charCode<=56319){var size=this.surrogateSize;this.charLength+=size;this.charReceived+=size;this.charBuffer.copy(this.charBuffer,size,0,size);buffer.copy(this.charBuffer,0,0,size);return charStr.substring(0,end)}return charStr};StringDecoder.prototype.detectIncompleteChar=function(buffer){var i=buffer.length>=3?3:buffer.length;for(;i>0;i--){var c=buffer[buffer.length-i];if(i==1&&c>>5==6){this.charLength=2;break}if(i<=2&&c>>4==14){this.charLength=3;break}if(i<=3&&c>>3==30){this.charLength=4;break}}this.charReceived=i};StringDecoder.prototype.end=function(buffer){var res=\"\";if(buffer&&buffer.length)res=this.write(buffer);if(this.charReceived){var cr=this.charReceived;var buf=this.charBuffer;var enc=this.encoding;res+=buf.slice(0,cr).toString(enc)}return res};function passThroughWrite(buffer){return buffer.toString(this.encoding)}function utf16DetectIncompleteChar(buffer){this.charReceived=buffer.length%2;this.charLength=this.charReceived?2:0}function base64DetectIncompleteChar(buffer){this.charReceived=buffer.length%3;this.charLength=this.charReceived?3:0}},{buffer:5}],57:[function(require,module,exports){(function(global){module.exports=deprecate;function deprecate(fn,msg){if(config(\"noDeprecation\")){return fn}var warned=false;function deprecated(){if(!warned){if(config(\"throwDeprecation\")){throw new Error(msg)}else if(config(\"traceDeprecation\")){console.trace(msg)}else{console.warn(msg)}warned=true}return fn.apply(this,arguments)}return deprecated}function config(name){try{if(!global.localStorage)return false}catch(_){return false}var val=global.localStorage[name];if(null==val)return false;return String(val).toLowerCase()===\"true\"}}).call(this,typeof global!==\"undefined\"?global:typeof self!==\"undefined\"?self:typeof window!==\"undefined\"?window:{})},{}],58:[function(require,module,exports){module.exports=extend;var hasOwnProperty=Object.prototype.hasOwnProperty;function extend(){var target={};for(var i=0;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(hasOwnProperty.call(source,key)){target[key]=source[key]}}}return target}},{}]},{},[1])(1)});\n","(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","'use strict';\n\nvar auth = require('./lib/auth');\nvar helpers = require('./lib/helpers');\nvar SwaggerClient = require('./lib/client');\nvar deprecationWrapper = function (url, options) {\n  helpers.log('This is deprecated, use \"new SwaggerClient\" instead.');\n\n  return new SwaggerClient(url, options);\n};\n\n/* Here for IE8 Support */\nif (!Array.prototype.indexOf) {\n  Array.prototype.indexOf = function(obj, start) {\n    for (var i = (start || 0), j = this.length; i < j; i++) {\n      if (this[i] === obj) { return i; }\n    }\n    return -1;\n  };\n}\n\n/* Here for IE8 Support */\nif (!String.prototype.trim) {\n  String.prototype.trim = function () {\n    return this.replace(/^\\s+|\\s+$/g, '');\n  };\n}\n\n/* Here for node 10.x support */\nif (!String.prototype.endsWith) {\n  String.prototype.endsWith = function(suffix) {\n    return this.indexOf(suffix, this.length - suffix.length) !== -1;\n  };\n}\n\nmodule.exports = SwaggerClient;\n\nSwaggerClient.ApiKeyAuthorization = auth.ApiKeyAuthorization;\nSwaggerClient.PasswordAuthorization = auth.PasswordAuthorization;\nSwaggerClient.CookieAuthorization = auth.CookieAuthorization;\nSwaggerClient.SwaggerApi = deprecationWrapper;\nSwaggerClient.SwaggerClient = deprecationWrapper;\nSwaggerClient.SchemaMarkup = require('./lib/schema-markup');\n","'use strict';\n\nvar helpers = require('./helpers');\nvar btoa = require('btoa'); // jshint ignore:line\nvar CookieJar = require('cookiejar').CookieJar;\nvar _ = {\n  each: require('lodash-compat/collection/each'),\n  includes: require('lodash-compat/collection/includes'),\n  isObject: require('lodash-compat/lang/isObject'),\n  isArray: require('lodash-compat/lang/isArray')\n};\n\n/**\n * SwaggerAuthorizations applies the correct authorization to an operation being executed\n */\nvar SwaggerAuthorizations = module.exports.SwaggerAuthorizations = function (authz) {\n  this.authz = authz || {};\n};\n\n/**\n * Add auths to the hash\n * Will overwrite any existing\n *\n */\nSwaggerAuthorizations.prototype.add = function (name, auth) {\n  if(_.isObject(name)) {\n    for (var key in name) {\n      this.authz[key] = name[key];\n    }\n  } else if(typeof name === 'string' ){\n    this.authz[name] = auth;\n  }\n\n  return auth;\n};\n\nSwaggerAuthorizations.prototype.remove = function (name) {\n  return delete this.authz[name];\n};\n\nSwaggerAuthorizations.prototype.apply = function (obj, securities) {\n  var status = true;\n  var applyAll = !securities;\n  var flattenedSecurities = [];\n\n  // favor the object-level authorizations over global\n  var authz = obj.clientAuthorizations || this.authz;\n\n  // Securities could be [ {} ]\n  _.each(securities, function (obj, key) {\n\n    // Make sure we account for securities being [ str ]\n    if(typeof key === 'string') {\n      flattenedSecurities.push(key);\n    }\n\n    // Flatten keys in to our array\n    _.each(obj, function (val, key) {\n      flattenedSecurities.push(key);\n    });\n  });\n\n  _.each(authz, function (auth, authName) {\n    if(applyAll || _.includes(flattenedSecurities, authName)) {\n      var newStatus = auth.apply(obj);\n      status = status && !!newStatus; // logical ORs regarding status\n    }\n  });\n\n  return status;\n};\n\n/**\n * ApiKeyAuthorization allows a query param or header to be injected\n */\nvar ApiKeyAuthorization = module.exports.ApiKeyAuthorization = function (name, value, type) {\n  this.name = name;\n  this.value = value;\n  this.type = type;\n};\n\nApiKeyAuthorization.prototype.apply = function (obj) {\n  if (this.type === 'query') {\n    // see if already applied.  If so, don't do it again\n\n    var qp;\n    if (obj.url.indexOf('?') > 0) {\n      qp = obj.url.substring(obj.url.indexOf('?') + 1);\n      var parts = qp.split('&');\n      if(parts && parts.length > 0) {\n        for(var i = 0; i < parts.length; i++) {\n          var kv = parts[i].split('=');\n          if(kv && kv.length > 0) {\n            if (kv[0] === this.name) {\n              // skip it\n              return false;\n            }\n          }\n        }\n      }\n    }\n\n    if (obj.url.indexOf('?') > 0) {\n      obj.url = obj.url + '&' + this.name + '=' + this.value;\n    } else {\n      obj.url = obj.url + '?' + this.name + '=' + this.value;\n    }\n\n    return true;\n  } else if (this.type === 'header') {\n    if(typeof obj.headers[this.name] === 'undefined') {\n      obj.headers[this.name] = this.value;\n    }\n\n    return true;\n  }\n};\n\nvar CookieAuthorization = module.exports.CookieAuthorization = function (cookie) {\n  this.cookie = cookie;\n};\n\nCookieAuthorization.prototype.apply = function (obj) {\n  obj.cookieJar = obj.cookieJar || new CookieJar();\n  obj.cookieJar.setCookie(this.cookie);\n\n  return true;\n};\n\n/**\n * Password Authorization is a basic auth implementation\n */\nvar PasswordAuthorization = module.exports.PasswordAuthorization = function (username, password) {\n  if (arguments.length === 3) {\n    helpers.log('PasswordAuthorization: the \\'name\\' argument has been removed, pass only username and password');\n    username = arguments[1];\n    password = arguments[2];\n  }\n  this.username = username;\n  this.password = password;\n};\n\nPasswordAuthorization.prototype.apply = function (obj) {\n  if(typeof obj.headers.Authorization === 'undefined') {\n    obj.headers.Authorization = 'Basic ' + btoa(this.username + ':' + this.password);\n  }\n\n  return true;\n};\n","'use strict';\n\nvar _ = {\n  bind: require('lodash-compat/function/bind'),\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  find: require('lodash-compat/collection/find'),\n  forEach: require('lodash-compat/collection/forEach'),\n  indexOf: require('lodash-compat/array/indexOf'),\n  isArray: require('lodash-compat/lang/isArray'),\n  isObject: require('lodash-compat/lang/isObject'),\n  isFunction: require('lodash-compat/lang/isFunction'),\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  isUndefined: require('lodash-compat/lang/isUndefined')\n};\nvar auth = require('./auth');\nvar helpers = require('./helpers');\nvar Model = require('./types/model');\nvar Operation = require('./types/operation');\nvar OperationGroup = require('./types/operationGroup');\nvar Resolver = require('./resolver');\nvar SwaggerHttp = require('./http');\nvar SwaggerSpecConverter = require('./spec-converter');\nvar Q = require('q');\n\n// We have to keep track of the function/property names to avoid collisions for tag names which are used to allow the\n// following usage: 'client.{tagName}'\nvar reservedClientTags = [\n  'apis',\n  'authorizationScheme',\n  'authorizations',\n  'basePath',\n  'build',\n  'buildFrom1_1Spec',\n  'buildFrom1_2Spec',\n  'buildFromSpec',\n  'clientAuthorizations',\n  'convertInfo',\n  'debug',\n  'defaultErrorCallback',\n  'defaultSuccessCallback',\n  'enableCookies',\n  'fail',\n  'failure',\n  'finish',\n  'help',\n  'host',\n  'idFromOp',\n  'info',\n  'initialize',\n  'isBuilt',\n  'isValid',\n  'modelPropertyMacro',\n  'models',\n  'modelsArray',\n  'options',\n  'parameterMacro',\n  'parseUri',\n  'progress',\n  'resourceCount',\n  'sampleModels',\n  'selfReflect',\n  'setConsolidatedModels',\n  'spec',\n  'supportedSubmitMethods',\n  'swaggerRequestHeaders',\n  'tagFromLabel',\n  'title',\n  'url',\n  'useJQuery',\n  'jqueryAjaxCache'\n];\n// We have to keep track of the function/property names to avoid collisions for tag names which are used to allow the\n// following usage: 'client.apis.{tagName}'\nvar reservedApiTags = [\n  'apis',\n  'asCurl',\n  'description',\n  'externalDocs',\n  'help',\n  'label',\n  'name',\n  'operation',\n  'operations',\n  'operationsArray',\n  'path',\n  'tag'\n];\nvar supportedOperationMethods = ['delete', 'get', 'head', 'options', 'patch', 'post', 'put'];\nvar SwaggerClient = module.exports = function (url, options) {\n  this.authorizations = null;\n  this.authorizationScheme = null;\n  this.basePath = null;\n  this.debug = false;\n  this.enableCookies = false;\n  this.info = null;\n  this.isBuilt = false;\n  this.isValid = false;\n  this.modelsArray = [];\n  this.resourceCount = 0;\n  this.url = null;\n  this.useJQuery = false;\n  this.jqueryAjaxCache = false;\n  this.swaggerObject = {};\n  this.deferredClient = undefined;\n\n  this.clientAuthorizations = new auth.SwaggerAuthorizations();\n\n  if (typeof url !== 'undefined') {\n    return this.initialize(url, options);\n  } else {\n    return this;\n  }\n};\n\nSwaggerClient.prototype.initialize = function (url, options) {\n  this.models = {};\n  this.sampleModels = {};\n\n  if (typeof url === 'string') {\n    this.url = url;\n  } else if (_.isObject(url)) {\n    options = url;\n    this.url = options.url;\n  }\n\n  if(this.url && this.url.indexOf('http:') === -1 && this.url.indexOf('https:') === -1) {\n    // no protocol, so we can only use window if it exists\n    if(typeof(window) !== 'undefined' && window && window.location) {\n      this.url = window.location.origin + this.url;\n    }\n  }\n\n  options = options || {};\n  this.clientAuthorizations.add(options.authorizations);\n  this.swaggerRequestHeaders = options.swaggerRequestHeaders || 'application/json;charset=utf-8,*/*';\n  this.defaultSuccessCallback = options.defaultSuccessCallback || null;\n  this.defaultErrorCallback = options.defaultErrorCallback || null;\n  this.modelPropertyMacro = options.modelPropertyMacro || null;\n  this.connectionAgent = options.connectionAgent || null;\n  this.parameterMacro = options.parameterMacro || null;\n  this.usePromise = options.usePromise || null;\n\n  // operation request timeout default\n  this.timeout = options.timeout || null;\n  // default to request timeout when not specified\n  this.fetchSpecTimeout = typeof options.fetchSpecTimeout !== 'undefined' ?\n      options.fetchSpecTimeout : options.timeout || null;\n\n  if(this.usePromise) {\n    this.deferredClient = Q.defer();\n  }\n\n  if (typeof options.success === 'function') {\n    this.success = options.success;\n  }\n  if (options.useJQuery) {\n    this.useJQuery = options.useJQuery;\n  }\n\n  if (options.jqueryAjaxCache) {\n    this.jqueryAjaxCache = options.jqueryAjaxCache;\n  }\n\n  if (options.enableCookies) {\n    this.enableCookies = options.enableCookies;\n  }\n\n  this.options = options || {};\n\n  // maybe don't need this?\n  this.options.timeout = this.timeout;\n  this.options.fetchSpecTimeout = this.fetchSpecTimeout;\n\n  this.supportedSubmitMethods = options.supportedSubmitMethods || [];\n  this.failure = options.failure || function (err) { throw err; };\n  this.progress = options.progress || function () {};\n  this.spec = _.cloneDeep(options.spec); // Clone so we do not alter the provided document\n\n  if (options.scheme) {\n    this.scheme = options.scheme;\n  }\n\n  if (this.usePromise || typeof options.success === 'function') {\n    this.ready = true;\n    return this.build();\n  }\n};\n\nSwaggerClient.prototype.build = function (mock) {\n  if (this.isBuilt) {\n    return this;\n  }\n\n  var self = this;\n\n  if (this.spec) {\n    this.progress('fetching resource list; Please wait.');\n  } else {\n    this.progress('fetching resource list: ' + this.url + '; Please wait.');\n  }\n\n  var obj = {\n    useJQuery: this.useJQuery,\n    jqueryAjaxCache: this.jqueryAjaxCache,\n    connectionAgent: this.connectionAgent,\n    enableCookies: this.enableCookies,\n    url: this.url,\n    method: 'get',\n    headers: {\n      accept: this.swaggerRequestHeaders\n    },\n    on: {\n      error: function (response) {\n        if (self.url.substring(0, 4) !== 'http') {\n          return self.fail('Please specify the protocol for ' + self.url);\n        } else if (response.errObj && (response.errObj.code === 'ECONNABORTED' || response.errObj.message.indexOf('timeout') !== -1)) {\n          return self.fail('Request timed out after ' + self.fetchSpecTimeout + 'ms');\n        } else if (response.status === 0) {\n          return self.fail('Can\\'t read from server.  It may not have the appropriate access-control-origin settings.');\n        } else if (response.status === 404) {\n          return self.fail('Can\\'t read swagger JSON from ' + self.url);\n        } else {\n          return self.fail(response.status + ' : ' + response.statusText + ' ' + self.url);\n        }\n      },\n      response: function (resp) {\n\n        var responseObj = resp.obj;\n        if(!responseObj) {\n          return self.fail('failed to parse JSON/YAML response');\n        }\n\n        self.swaggerVersion = responseObj.swaggerVersion;\n        self.swaggerObject = responseObj;\n\n        if (responseObj.swagger && parseInt(responseObj.swagger) === 2) {\n          self.swaggerVersion = responseObj.swagger;\n\n          new Resolver().resolve(responseObj, self.url, self.buildFromSpec, self);\n\n          self.isValid = true;\n        } else {\n          var converter = new SwaggerSpecConverter();\n          self.oldSwaggerObject = self.swaggerObject;\n\n          converter.setDocumentationLocation(self.url);\n          converter.convert(responseObj, self.clientAuthorizations, self.options, function(spec) {\n            self.swaggerObject = spec;\n            new Resolver().resolve(spec, self.url, self.buildFromSpec, self);\n            self.isValid = true;\n          });\n        }\n      }\n    }\n  };\n\n  // only set timeout when specified\n  if (this.fetchSpecTimeout) {\n    obj.timeout = this.fetchSpecTimeout;\n  }\n\n  if (this.spec) {\n    self.swaggerObject = this.spec;\n    setTimeout(function () {\n      new Resolver().resolve(self.spec, self.url, self.buildFromSpec, self);\n    }, 10);\n  } else {\n    this.clientAuthorizations.apply(obj);\n\n    if (mock) {\n      return obj;\n    }\n\n    new SwaggerHttp().execute(obj, this.options);\n  }\n\n  return (this.usePromise) ? this.deferredClient.promise : this;\n};\n\nSwaggerClient.prototype.buildFromSpec = function (response) {\n  if (this.isBuilt) {\n    return this;\n  }\n\n  this.apis = {};\n  this.apisArray = [];\n  this.basePath = response.basePath || '';\n  this.consumes = response.consumes;\n  this.host = response.host || '';\n  this.info = response.info || {};\n  this.produces = response.produces;\n  this.schemes = response.schemes || [];\n  this.securityDefinitions = _.cloneDeep(response.securityDefinitions);\n  this.security = response.security;\n  this.title = response.title || '';\n\n  var key, definedTags = {}, k, location, self = this, i;\n\n  if (response.externalDocs) {\n    this.externalDocs = response.externalDocs;\n  }\n\n  // legacy support\n  this.authSchemes = this.securityDefinitions;\n\n  if(this.securityDefinitions) {\n    for(key in this.securityDefinitions) {\n      var securityDefinition = this.securityDefinitions[key];\n      securityDefinition.vendorExtensions = {};\n      for(var ext in securityDefinition) {\n        helpers.extractExtensions(ext, securityDefinition);\n        if (ext === 'scopes') {\n          var scopes = securityDefinition[ext];\n          if(typeof scopes === 'object') {\n            scopes.vendorExtensions = {};\n            for (var s in scopes) {\n              helpers.extractExtensions(s, scopes);\n              if(s.indexOf('x-') === 0) {\n                delete scopes[s];\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n\n  if (Array.isArray(response.tags)) {\n    definedTags = {};\n\n    for (k = 0; k < response.tags.length; k++) {\n      var t = _.cloneDeep(response.tags[k]);\n      definedTags[t.name] = t;\n      for(i in t) {\n        if(i === 'externalDocs' && typeof t[i] === 'object') {\n          for(var j in t[i]) {\n            helpers.extractExtensions(j, t[i]);\n          }\n        }\n        helpers.extractExtensions(i, t);\n      }\n    }\n  }\n\n\n  if (typeof this.url === 'string') {\n    location = this.parseUri(this.url);\n    if (typeof this.scheme === 'undefined' && typeof this.schemes === 'undefined' || this.schemes.length === 0) {\n      if(typeof window !== 'undefined') {\n        // use the window scheme\n        this.scheme = window.location.protocol.replace(':','');\n      }\n      else {\n        this.scheme = location.scheme || 'http';\n      }\n    } else if (typeof window !== 'undefined' && window.location.protocol.indexOf('chrome-extension') === 0) {\n\t\t// if it is chrome swagger ui extension scheme then let swagger doc url scheme decide the protocol\n\t\tthis.scheme = location.scheme;\n\t} else if (typeof this.scheme === 'undefined') {\n      if(typeof window !== 'undefined') {\n        var scheme = window.location.protocol.replace(':','');\n        if(scheme === 'https' && this.schemes.indexOf(scheme) === -1) {\n          // can't call http from https served page in a browser!\n          helpers.log('Cannot call a http server from https inside a browser!');\n          this.scheme = 'http';\n        }\n        else if(this.schemes.indexOf(scheme) !== -1) {\n          this.scheme = scheme;\n        }\n        else {\n          if(this.schemes.indexOf('https') !== -1) {\n            this.scheme = 'https';\n          }\n          else {\n            this.scheme = 'http';\n          }\n        }\n      }\n      else {\n        this.scheme = this.schemes[0] || location.scheme;\n      }\n    }\n\n    if (typeof this.host === 'undefined' || this.host === '') {\n      this.host = location.host;\n\n      if (location.port) {\n        this.host = this.host + ':' + location.port;\n      }\n    }\n  }\n  else {\n    if (typeof this.schemes === 'undefined' || this.schemes.length === 0) {\n      this.scheme = 'http';\n    }\n    else if (typeof this.scheme === 'undefined') {\n      this.scheme = this.schemes[0];\n    }\n  }\n\n  this.definitions = response.definitions;\n\n  for (key in this.definitions) {\n    var model = new Model(key, this.definitions[key], this.models, this.modelPropertyMacro);\n\n    if (model) {\n      this.models[key] = model;\n    }\n  }\n\n  // get paths, create functions for each operationId\n\n  // Bind help to 'client.apis'\n  self.apis.help = _.bind(self.help, self);\n\n  _.forEach(response.paths, function (pathObj, path) {\n    // Only process a path if it's an object\n    if (!_.isPlainObject(pathObj)) {\n      return;\n    }\n\n    _.forEach(supportedOperationMethods, function (method) {\n      var operation = pathObj[method];\n\n      if (_.isUndefined(operation)) {\n        // Operation does not exist\n        return;\n      } else if (!_.isPlainObject(operation)) {\n        // Operation exists but it is not an Operation Object.  Since this is invalid, log it.\n        helpers.log('The \\'' + method + '\\' operation for \\'' + path + '\\' path is not an Operation Object');\n\n        return;\n      }\n\n      var tags = operation.tags;\n\n      if (_.isUndefined(tags) || !_.isArray(tags) || tags.length === 0) {\n        tags = operation.tags = [ 'default' ];\n      }\n\n      var operationId = self.idFromOp(path, method, operation);\n\n      var operationObject = new Operation(self,\n        operation.scheme,\n        operationId,\n        method,\n        path,\n        operation,\n        self.definitions,\n        self.models,\n        self.clientAuthorizations);\n\n      operationObject.connectionAgent = self.connectionAgent;\n      operationObject.vendorExtensions = {};\n      for(i in operation) {\n        helpers.extractExtensions(i, operationObject, operation[i]);\n      }\n      operationObject.externalDocs = operation.externalDocs;\n      if(operationObject.externalDocs) {\n        operationObject.externalDocs = _.cloneDeep(operationObject.externalDocs);\n        operationObject.externalDocs.vendorExtensions = {};\n        for(i in operationObject.externalDocs) {\n          helpers.extractExtensions(i, operationObject.externalDocs);\n        }\n      }\n\n      // bind self operation's execute command to the api\n      _.forEach(tags, function (tag) {\n        var clientProperty = _.indexOf(reservedClientTags, tag) > -1 ? '_' + tag : tag;\n        var apiProperty = _.indexOf(reservedApiTags, tag) > -1 ? '_' + tag : tag;\n        var operationGroup = self[clientProperty];\n\n        if (clientProperty !== tag) {\n          helpers.log('The \\'' + tag + '\\' tag conflicts with a SwaggerClient function/property name.  Use \\'client.' +\n                      clientProperty + '\\' or \\'client.apis.' + tag + '\\' instead of \\'client.' + tag + '\\'.');\n        }\n\n        if (apiProperty !== tag) {\n          helpers.log('The \\'' + tag + '\\' tag conflicts with a SwaggerClient operation function/property name.  Use ' +\n                      '\\'client.apis.' + apiProperty + '\\' instead of \\'client.apis.' + tag + '\\'.');\n        }\n\n        if (_.indexOf(reservedApiTags, operationId) > -1) {\n          helpers.log('The \\'' + operationId + '\\' operationId conflicts with a SwaggerClient operation ' +\n                      'function/property name.  Use \\'client.apis.' + apiProperty + '._' + operationId +\n                      '\\' instead of \\'client.apis.' + apiProperty + '.' + operationId + '\\'.');\n\n          operationId = '_' + operationId;\n          operationObject.nickname = operationId; // So 'client.apis.[tag].operationId.help() works properly\n        }\n\n        if (_.isUndefined(operationGroup)) {\n          operationGroup = self[clientProperty] = self.apis[apiProperty] = {};\n\n          operationGroup.operations = {};\n          operationGroup.label = apiProperty;\n          operationGroup.apis = {};\n\n          var tagDef = definedTags[tag];\n\n          if (!_.isUndefined(tagDef)) {\n            operationGroup.description = tagDef.description;\n            operationGroup.externalDocs = tagDef.externalDocs;\n            operationGroup.vendorExtensions = tagDef.vendorExtensions;\n          }\n\n          self[clientProperty].help = _.bind(self.help, operationGroup);\n          self.apisArray.push(new OperationGroup(tag, operationGroup.description, operationGroup.externalDocs, operationObject));\n        }\n\n        operationId = self.makeUniqueOperationId(operationId, self.apis[apiProperty]);\n\n        // Bind tag help\n        if (!_.isFunction(operationGroup.help)) {\n          operationGroup.help = _.bind(self.help, operationGroup);\n        }\n\n        // bind to the apis object\n        self.apis[apiProperty][operationId] = operationGroup[operationId] = _.bind(operationObject.execute,\n                                                                                  operationObject);\n        self.apis[apiProperty][operationId].help = operationGroup[operationId].help = _.bind(operationObject.help,\n                                                                                             operationObject);\n        self.apis[apiProperty][operationId].asCurl = operationGroup[operationId].asCurl = _.bind(operationObject.asCurl,\n                                                                                                 operationObject);\n\n        operationGroup.apis[operationId] = operationGroup.operations[operationId] = operationObject;\n\n        // legacy UI feature\n        var api = _.find(self.apisArray, function (api) {\n          return api.tag === tag;\n        });\n\n        if (api) {\n          api.operationsArray.push(operationObject);\n        }\n      });\n    });\n  });\n\n  // sort the apisArray according to the tags\n  var sortedApis = [];\n  _.forEach(Object.keys(definedTags), function (tag) {\n    var pos;\n    for(pos in self.apisArray) {\n      var _api = self.apisArray[pos];\n      if(_api && tag === _api.name) {\n        sortedApis.push(_api);\n        self.apisArray[pos] = null;\n      }\n    }\n  });\n  // add anything left\n  _.forEach(self.apisArray, function (api) {\n    if(api) {\n      sortedApis.push(api);\n    }\n  });\n  self.apisArray = sortedApis;\n\n  _.forEach(response.definitions, function (definitionObj, definition) {\n    definitionObj.id = definition.toLowerCase();\n    definitionObj.name = definition;\n    self.modelsArray.push(definitionObj);\n  });\n\n  this.isBuilt = true;\n\n  if (this.usePromise) {\n    this.isValid = true;\n    this.isBuilt = true;\n    this.deferredClient.resolve(this);\n\n    return this.deferredClient.promise;\n  }\n\n  if (this.success) {\n    this.success();\n  }\n\n  return this;\n};\n\nSwaggerClient.prototype.makeUniqueOperationId = function(operationId, api) {\n  var count = 0;\n  var name = operationId;\n\n  // make unique across this operation group\n  while(true) {\n    var matched = false;\n    _.forEach(api.operations, function (operation) {\n      if(operation.nickname === name) {\n        matched = true;\n      }\n    });\n    if(!matched) {\n      return name;\n    }\n    name = operationId + '_' + count;\n    count ++;\n  }\n\n  return operationId;\n};\n\nSwaggerClient.prototype.parseUri = function (uri) {\n  var urlParseRE = /^(((([^:\\/#\\?]+:)?(?:(\\/\\/)((?:(([^:@\\/#\\?]+)(?:\\:([^:@\\/#\\?]+))?)@)?(([^:\\/#\\?\\]\\[]+|\\[[^\\/\\]@#?]+\\])(?:\\:([0-9]+))?))?)?)?((\\/?(?:[^\\/\\?#]+\\/+)*)([^\\?#]*)))?(\\?[^#]+)?)(#.*)?/;\n  var parts = urlParseRE.exec(uri);\n\n  return {\n    scheme: parts[4] ? parts[4].replace(':','') : undefined,\n    host: parts[11],\n    port: parts[12],\n    path: parts[15]\n  };\n};\n\nSwaggerClient.prototype.help = function (dontPrint) {\n  var output = '';\n\n  if (this instanceof SwaggerClient) {\n    _.forEach(this.apis, function (api, name) {\n      if (_.isPlainObject(api)) {\n        output += 'operations for the \\'' + name + '\\' tag\\n';\n\n        _.forEach(api.operations, function (operation, name) {\n          output += '  * ' + name + ': ' + operation.summary + '\\n';\n        });\n      }\n    });\n  } else if (this instanceof OperationGroup || _.isPlainObject(this)) {\n    output += 'operations for the \\'' + this.label + '\\' tag\\n';\n\n    _.forEach(this.apis, function (operation, name) {\n      output += '  * ' + name + ': ' + operation.summary + '\\n';\n    });\n  }\n\n  if (dontPrint) {\n    return output;\n  } else {\n    helpers.log(output);\n\n    return output;\n  }\n};\n\nSwaggerClient.prototype.tagFromLabel = function (label) {\n  return label;\n};\n\nSwaggerClient.prototype.idFromOp = function (path, httpMethod, op) {\n  if(!op || !op.operationId) {\n    op = op || {};\n    op.operationId = httpMethod + '_' + path;\n  }\n  var opId = op.operationId.replace(/[\\s!@#$%^&*()_+=\\[{\\]};:<>|.\\/?,\\\\'\"\"-]/g, '_') || (path.substring(1) + '_' + httpMethod);\n\n  opId = opId.replace(/((_){2,})/g, '_');\n  opId = opId.replace(/^(_)*/g, '');\n  opId = opId.replace(/([_])*$/g, '');\n\n  return opId;\n};\n\nSwaggerClient.prototype.setHost = function (host) {\n  this.host = host;\n\n  if(this.apis) {\n    _.forEach(this.apis, function(api) {\n      if(api.operations) {\n        _.forEach(api.operations, function(operation) {\n          operation.host = host;\n        });\n      }\n    });\n  }\n};\n\nSwaggerClient.prototype.setBasePath = function (basePath) {\n  this.basePath = basePath;\n\n  if(this.apis) {\n    _.forEach(this.apis, function(api) {\n      if(api.operations) {\n        _.forEach(api.operations, function(operation) {\n          operation.basePath = basePath;\n        });\n      }\n    });\n  }\n};\n\nSwaggerClient.prototype.setSchemes = function (schemes) {\n  this.schemes = schemes;\n\n  if(schemes && schemes.length > 0) {\n    if(this.apis) {\n      _.forEach(this.apis, function (api) {\n        if (api.operations) {\n          _.forEach(api.operations, function (operation) {\n            operation.scheme = schemes[0];\n          });\n        }\n      });\n    }\n  }\n};\n\nSwaggerClient.prototype.fail = function (message) {\n  if (this.usePromise) {\n    this.deferredClient.reject(message);\n    return this.deferredClient.promise;\n  } else {\n    if (this.failure) {\n      this.failure(message);\n    }\n    else {\n      this.failure(message);\n    }\n  }\n};\n","(function (process){\n'use strict';\n\nvar _ = {\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  indexOf: require('lodash-compat/array/indexOf')\n};\n\nmodule.exports.__bind = function (fn, me) {\n  return function(){\n    return fn.apply(me, arguments);\n  };\n};\n\nvar log = module.exports.log = function() {\n  // Only log if available and we're not testing\n  if (console && process.env.NODE_ENV !== 'test') {\n    console.log(Array.prototype.slice.call(arguments)[0]);\n  }\n};\n\nmodule.exports.fail = function (message) {\n  log(message);\n};\n\nmodule.exports.optionHtml = function (label, value) {\n  return '<tr><td class=\"optionName\">' + label + ':</td><td>' + value + '</td></tr>';\n};\n\nvar resolveSchema = module.exports.resolveSchema = function (schema) {\n  if (_.isPlainObject(schema.schema)) {\n    schema = resolveSchema(schema.schema);\n  }\n\n  return schema;\n};\n\nmodule.exports.simpleRef = function (name) {\n  if (typeof name === 'undefined') {\n    return null;\n  }\n\n  if (name.indexOf('#/definitions/') === 0) {\n    return name.substring('#/definitions/'.length);\n  } else {\n    return name;\n  }\n};\n\n/**\n * helper to remove extensions and add them to an object\n *\n * @param keyname\n * @param obj\n */\nmodule.exports.extractExtensions = function (keyname, obj, value) {\n  if(!keyname || !obj) {\n    return;\n  }\n\n  if (typeof keyname === 'string' && keyname.indexOf('x-') === 0) {\n    obj.vendorExtensions = obj.vendorExtensions || {};\n    if(value) {\n      obj.vendorExtensions[keyname] = value;\n    }\n    else {\n      obj.vendorExtensions[keyname] = obj[keyname];\n    }\n  }\n};\n}).call(this,require('_process'))\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9oZWxwZXJzLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIF8gPSB7XG4gIGlzUGxhaW5PYmplY3Q6IHJlcXVpcmUoJ2xvZGFzaC1jb21wYXQvbGFuZy9pc1BsYWluT2JqZWN0JyksXG4gIGluZGV4T2Y6IHJlcXVpcmUoJ2xvZGFzaC1jb21wYXQvYXJyYXkvaW5kZXhPZicpXG59O1xuXG5tb2R1bGUuZXhwb3J0cy5fX2JpbmQgPSBmdW5jdGlvbiAoZm4sIG1lKSB7XG4gIHJldHVybiBmdW5jdGlvbigpe1xuICAgIHJldHVybiBmbi5hcHBseShtZSwgYXJndW1lbnRzKTtcbiAgfTtcbn07XG5cbnZhciBsb2cgPSBtb2R1bGUuZXhwb3J0cy5sb2cgPSBmdW5jdGlvbigpIHtcbiAgLy8gT25seSBsb2cgaWYgYXZhaWxhYmxlIGFuZCB3ZSdyZSBub3QgdGVzdGluZ1xuICBpZiAoY29uc29sZSAmJiBwcm9jZXNzLmVudi5OT0RFX0VOViAhPT0gJ3Rlc3QnKSB7XG4gICAgY29uc29sZS5sb2coQXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwoYXJndW1lbnRzKVswXSk7XG4gIH1cbn07XG5cbm1vZHVsZS5leHBvcnRzLmZhaWwgPSBmdW5jdGlvbiAobWVzc2FnZSkge1xuICBsb2cobWVzc2FnZSk7XG59O1xuXG5tb2R1bGUuZXhwb3J0cy5vcHRpb25IdG1sID0gZnVuY3Rpb24gKGxhYmVsLCB2YWx1ZSkge1xuICByZXR1cm4gJzx0cj48dGQgY2xhc3M9XCJvcHRpb25OYW1lXCI+JyArIGxhYmVsICsgJzo8L3RkPjx0ZD4nICsgdmFsdWUgKyAnPC90ZD48L3RyPic7XG59O1xuXG52YXIgcmVzb2x2ZVNjaGVtYSA9IG1vZHVsZS5leHBvcnRzLnJlc29sdmVTY2hlbWEgPSBmdW5jdGlvbiAoc2NoZW1hKSB7XG4gIGlmIChfLmlzUGxhaW5PYmplY3Qoc2NoZW1hLnNjaGVtYSkpIHtcbiAgICBzY2hlbWEgPSByZXNvbHZlU2NoZW1hKHNjaGVtYS5zY2hlbWEpO1xuICB9XG5cbiAgcmV0dXJuIHNjaGVtYTtcbn07XG5cbm1vZHVsZS5leHBvcnRzLnNpbXBsZVJlZiA9IGZ1bmN0aW9uIChuYW1lKSB7XG4gIGlmICh0eXBlb2YgbmFtZSA9PT0gJ3VuZGVmaW5lZCcpIHtcbiAgICByZXR1cm4gbnVsbDtcbiAgfVxuXG4gIGlmIChuYW1lLmluZGV4T2YoJyMvZGVmaW5pdGlvbnMvJykgPT09IDApIHtcbiAgICByZXR1cm4gbmFtZS5zdWJzdHJpbmcoJyMvZGVmaW5pdGlvbnMvJy5sZW5ndGgpO1xuICB9IGVsc2Uge1xuICAgIHJldHVybiBuYW1lO1xuICB9XG59O1xuXG4vKipcbiAqIGhlbHBlciB0byByZW1vdmUgZXh0ZW5zaW9ucyBhbmQgYWRkIHRoZW0gdG8gYW4gb2JqZWN0XG4gKlxuICogQHBhcmFtIGtleW5hbWVcbiAqIEBwYXJhbSBvYmpcbiAqL1xubW9kdWxlLmV4cG9ydHMuZXh0cmFjdEV4dGVuc2lvbnMgPSBmdW5jdGlvbiAoa2V5bmFtZSwgb2JqLCB2YWx1ZSkge1xuICBpZigha2V5bmFtZSB8fCAhb2JqKSB7XG4gICAgcmV0dXJuO1xuICB9XG5cbiAgaWYgKHR5cGVvZiBrZXluYW1lID09PSAnc3RyaW5nJyAmJiBrZXluYW1lLmluZGV4T2YoJ3gtJykgPT09IDApIHtcbiAgICBvYmoudmVuZG9yRXh0ZW5zaW9ucyA9IG9iai52ZW5kb3JFeHRlbnNpb25zIHx8IHt9O1xuICAgIGlmKHZhbHVlKSB7XG4gICAgICBvYmoudmVuZG9yRXh0ZW5zaW9uc1trZXluYW1lXSA9IHZhbHVlO1xuICAgIH1cbiAgICBlbHNlIHtcbiAgICAgIG9iai52ZW5kb3JFeHRlbnNpb25zW2tleW5hbWVdID0gb2JqW2tleW5hbWVdO1xuICAgIH1cbiAgfVxufTsiXX0=","(function (Buffer){\n'use strict';\n\nvar helpers = require('./helpers');\nvar request = require('superagent');\nvar jsyaml = require('js-yaml');\nvar _ = {\n  isObject: require('lodash-compat/lang/isObject'),\n  keys: require('lodash-compat/object/keys')\n};\n\n/*\n * JQueryHttpClient is a light-weight, node or browser HTTP client\n */\nvar JQueryHttpClient = function () {\n  this.type = 'JQueryHttpClient';\n};\n\n/*\n * SuperagentHttpClient is a light-weight, node or browser HTTP client\n */\nvar SuperagentHttpClient = function () {\n  this.type = 'SuperagentHttpClient';\n};\n\n/**\n * SwaggerHttp is a wrapper for executing requests\n */\nvar SwaggerHttp = module.exports = function () {};\n\nSwaggerHttp.prototype.execute = function (obj, opts) {\n  var client;\n\n  if(opts && opts.client) {\n    client = opts.client;\n  }\n  else {\n    client = new SuperagentHttpClient(opts);\n  }\n  client.opts = opts || {};\n\n  if (opts && opts.requestAgent) {\n    request = opts.requestAgent;\n  }\n\n  // legacy support\n  var hasJQuery = false;\n  if(typeof window !== 'undefined') {\n    if(typeof window.jQuery !== 'undefined') {\n      hasJQuery = true;\n    }\n  }\n  // OPTIONS support\n  if(obj.method.toLowerCase() === 'options' && client.type === 'SuperagentHttpClient') {\n    log('forcing jQuery as OPTIONS are not supported by SuperAgent');\n    obj.useJQuery = true;\n  }\n  if(this.isInternetExplorer() && (obj.useJQuery === false || !hasJQuery )) {\n    throw new Error('Unsupported configuration! JQuery is required but not available');\n  }\n  if ((obj && obj.useJQuery === true) || this.isInternetExplorer() && hasJQuery) {\n    client = new JQueryHttpClient(opts);\n  }\n\n  var success = obj.on.response;\n  var error = obj.on.error;\n\n  var requestInterceptor = function(data) {\n    if(opts && opts.requestInterceptor) {\n      data = opts.requestInterceptor.apply(data);\n    }\n    return data;\n  };\n\n  var responseInterceptor = function(data) {\n    if(opts && opts.responseInterceptor) {\n      data = opts.responseInterceptor.apply(data, [obj]);\n    }\n    return success(data);\n  };\n\n  var errorInterceptor = function(data) {\n    if(opts && opts.responseInterceptor) {\n      data = opts.responseInterceptor.apply(data, [obj]);\n    }\n    error(data);\n  };\n\n  obj.on.error = function(data) {\n    errorInterceptor(data);\n  };\n\n  obj.on.response = function(data) {\n    if(data && data.status >= 400) {\n      errorInterceptor(data);\n    }\n    else {\n      responseInterceptor(data);\n    }\n  };\n\n  if (_.isObject(obj) && _.isObject(obj.body)) {\n    // special processing for file uploads via jquery\n    if (obj.body.type && obj.body.type === 'formData'){\n      if(opts.useJQuery) {\n        obj.contentType = false;\n        obj.processData = false;\n        delete obj.headers['Content-Type'];\n      }\n    }\n  }\n\n  obj = requestInterceptor(obj) || obj;\n  if (obj.beforeSend) {\n    obj.beforeSend(function(_obj) {\n      client.execute(_obj || obj);\n    });\n  } else {\n    client.execute(obj);\n  }\n\n  return (obj.deferred) ? obj.deferred.promise : obj;\n};\n\nSwaggerHttp.prototype.isInternetExplorer = function () {\n  var detectedIE = false;\n\n  if (typeof navigator !== 'undefined' && navigator.userAgent) {\n    var nav = navigator.userAgent.toLowerCase();\n\n    if (nav.indexOf('msie') !== -1) {\n      var version = parseInt(nav.split('msie')[1]);\n\n      if (version <= 8) {\n        detectedIE = true;\n      }\n    }\n  }\n\n  return detectedIE;\n};\n\nJQueryHttpClient.prototype.execute = function (obj) {\n  var jq = this.jQuery || (typeof window !== 'undefined' && window.jQuery);\n  var cb = obj.on;\n  var request = obj;\n\n  if(typeof jq === 'undefined' || jq === false) {\n    throw new Error('Unsupported configuration! JQuery is required but not available');\n  }\n\n  obj.type = obj.method;\n  obj.cache = obj.jqueryAjaxCache;\n  obj.data = obj.body;\n  delete obj.jqueryAjaxCache;\n  delete obj.useJQuery;\n  delete obj.body;\n\n  obj.complete = function (response) {\n    var headers = {};\n    var headerArray = response.getAllResponseHeaders().split('\\n');\n\n    for (var i = 0; i < headerArray.length; i++) {\n      var toSplit = headerArray[i].trim();\n\n      if (toSplit.length === 0) {\n        continue;\n      }\n\n      var separator = toSplit.indexOf(':');\n\n      if (separator === -1) {\n        // Name but no value in the header\n        headers[toSplit] = null;\n\n        continue;\n      }\n\n      var name = toSplit.substring(0, separator).trim();\n      var value = toSplit.substring(separator + 1).trim();\n\n      headers[name] = value;\n    }\n\n    var out = {\n      url: request.url,\n      method: request.method,\n      status: response.status,\n      statusText: response.statusText,\n      data: response.responseText,\n      headers: headers\n    };\n\n    try {\n      var possibleObj =  response.responseJSON || jsyaml.safeLoad(response.responseText);\n      out.obj = (typeof possibleObj === 'string') ? {} : possibleObj;\n    } catch (ex) {\n      // do not set out.obj\n      helpers.log('unable to parse JSON/YAML content');\n    }\n\n    // I can throw, or parse null?\n    out.obj = out.obj || null;\n\n    if (response.status >= 200 && response.status < 300) {\n      cb.response(out);\n    } else if (response.status === 0 || (response.status >= 400 && response.status < 599)) {\n      cb.error(out);\n    } else {\n      return cb.response(out);\n    }\n  };\n\n  jq.support.cors = true;\n\n  return jq.ajax(obj);\n};\n\nSuperagentHttpClient.prototype.execute = function (obj) {\n  var method = obj.method.toLowerCase();\n  var timeout = obj.timeout;\n\n  if (method === 'delete') {\n    method = 'del';\n  }\n  var headers = obj.headers || {};\n\n  var r = request[method](obj.url);\n\n  if (obj.connectionAgent) {\n    r.agent(obj.connectionAgent);\n  }\n\n  if (timeout) {\n    r.timeout(timeout);\n  }\n\n  if (obj.enableCookies) {\n    r.withCredentials();\n  }\n\n  var accept = obj.headers.Accept;\n\n  if(this.binaryRequest(accept)) {\n    r.on('request', function () {\n      if(this.xhr) {\n        this.xhr.responseType = 'blob';\n      }\n    });\n  }\n\n  if(obj.body) {\n    if(_.isObject(obj.body)) {\n      var contentType = obj.headers['Content-Type'] || '';\n      if (contentType.indexOf('multipart/form-data') === 0) {\n        delete headers['Content-Type'];\n        if({}.toString.apply(obj.body) === '[object FormData]') {\n          r.send(obj.body);\n        }\n        else {\n          var keyname, value, v;\n          for (keyname in obj.body) {\n            value = obj.body[keyname];\n            if(Array.isArray(value)) {\n              for(v in value) {\n                r.field(keyname, v);\n              }\n            }\n            else {\n              r.field(keyname, value);\n            }\n          }\n        }\n      }\n      else if (_.isObject(obj.body)) {\n        // non multipart/form-data\n        obj.body = JSON.stringify(obj.body);\n        r.send(obj.body);\n      }\n    }\n    else {\n      r.send(obj.body);\n    }\n  }\n\n  var name;\n  for (name in headers) {\n    r.set(name, headers[name]);\n  }\n\n  if(typeof r.buffer === 'function') {\n    r.buffer(); // force superagent to populate res.text with the raw response data\n  }\n\n  r.end(function (err, res) {\n    res = res || {\n      status: 0,\n      headers: {error: 'no response from server'}\n    };\n    var response = {\n      url: obj.url,\n      method: obj.method,\n      headers: res.headers\n    };\n    var cb;\n\n    if (!err && res.error) {\n      err = res.error;\n    }\n\n    if (err && obj.on && obj.on.error) {\n      response.errObj = err;\n      response.status = res ? res.status : 500;\n      response.statusText = res ? res.text : err.message;\n      if (res.headers && res.headers['content-type']) {\n        if (res.headers['content-type'].indexOf('application/json') >= 0) {\n          try {\n            response.obj = JSON.parse(response.statusText);\n          }\n          catch (e) {\n            response.obj = null;\n          }\n        }\n      }\n      cb = obj.on.error;\n    } else if (res && obj.on && obj.on.response) {\n      var possibleObj;\n\n      // Already parsed by by superagent?\n      if (res.body && _.keys(res.body).length > 0) {\n        possibleObj = res.body;\n      } else {\n        try {\n          possibleObj = jsyaml.safeLoad(res.text);\n          // can parse into a string... which we don't need running around in the system\n          possibleObj = (typeof possibleObj === 'string') ? null : possibleObj;\n        } catch (e) {\n          helpers.log('cannot parse JSON/YAML content');\n        }\n      }\n\n      // null means we can't parse into object\n      if(typeof Buffer === 'function' && Buffer.isBuffer(possibleObj)) {\n        response.data = possibleObj;\n      }\n      else {\n        response.obj = (typeof possibleObj === 'object') ? possibleObj : null;\n      }\n\n      response.status = res.status;\n      response.statusText = res.text;\n      cb = obj.on.response;\n    }\n    if (res.xhr && res.xhr.response) {\n      response.data = res.xhr.response;\n    }\n    else if(!response.data) {\n      response.data = response.statusText;\n    }\n\n    if (cb) {\n      cb(response);\n    }\n  });\n};\n\nSuperagentHttpClient.prototype. binaryRequest = function (accept) {\n  if(!accept) {\n    return false;\n  }\n  return (/^image/i).test(accept)\n    || (/^application\\/pdf/).test(accept)\n    || (/^application\\/octet-stream/).test(accept);\n};\n\n}).call(this,require(\"buffer\").Buffer)\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/http.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nvar helpers = require('./helpers');\nvar request = require('superagent');\nvar jsyaml = require('js-yaml');\nvar _ = {\n  isObject: require('lodash-compat/lang/isObject'),\n  keys: require('lodash-compat/object/keys')\n};\n\n/*\n * JQueryHttpClient is a light-weight, node or browser HTTP client\n */\nvar JQueryHttpClient = function () {\n  this.type = 'JQueryHttpClient';\n};\n\n/*\n * SuperagentHttpClient is a light-weight, node or browser HTTP client\n */\nvar SuperagentHttpClient = function () {\n  this.type = 'SuperagentHttpClient';\n};\n\n/**\n * SwaggerHttp is a wrapper for executing requests\n */\nvar SwaggerHttp = module.exports = function () {};\n\nSwaggerHttp.prototype.execute = function (obj, opts) {\n  var client;\n\n  if(opts && opts.client) {\n    client = opts.client;\n  }\n  else {\n    client = new SuperagentHttpClient(opts);\n  }\n  client.opts = opts || {};\n\n  if (opts && opts.requestAgent) {\n    request = opts.requestAgent;\n  }\n\n  // legacy support\n  var hasJQuery = false;\n  if(typeof window !== 'undefined') {\n    if(typeof window.jQuery !== 'undefined') {\n      hasJQuery = true;\n    }\n  }\n  // OPTIONS support\n  if(obj.method.toLowerCase() === 'options' && client.type === 'SuperagentHttpClient') {\n    log('forcing jQuery as OPTIONS are not supported by SuperAgent');\n    obj.useJQuery = true;\n  }\n  if(this.isInternetExplorer() && (obj.useJQuery === false || !hasJQuery )) {\n    throw new Error('Unsupported configuration! JQuery is required but not available');\n  }\n  if ((obj && obj.useJQuery === true) || this.isInternetExplorer() && hasJQuery) {\n    client = new JQueryHttpClient(opts);\n  }\n\n  var success = obj.on.response;\n  var error = obj.on.error;\n\n  var requestInterceptor = function(data) {\n    if(opts && opts.requestInterceptor) {\n      data = opts.requestInterceptor.apply(data);\n    }\n    return data;\n  };\n\n  var responseInterceptor = function(data) {\n    if(opts && opts.responseInterceptor) {\n      data = opts.responseInterceptor.apply(data, [obj]);\n    }\n    return success(data);\n  };\n\n  var errorInterceptor = function(data) {\n    if(opts && opts.responseInterceptor) {\n      data = opts.responseInterceptor.apply(data, [obj]);\n    }\n    error(data);\n  };\n\n  obj.on.error = function(data) {\n    errorInterceptor(data);\n  };\n\n  obj.on.response = function(data) {\n    if(data && data.status >= 400) {\n      errorInterceptor(data);\n    }\n    else {\n      responseInterceptor(data);\n    }\n  };\n\n  if (_.isObject(obj) && _.isObject(obj.body)) {\n    // special processing for file uploads via jquery\n    if (obj.body.type && obj.body.type === 'formData'){\n      if(opts.useJQuery) {\n        obj.contentType = false;\n        obj.processData = false;\n        delete obj.headers['Content-Type'];\n      }\n    }\n  }\n\n  obj = requestInterceptor(obj) || obj;\n  if (obj.beforeSend) {\n    obj.beforeSend(function(_obj) {\n      client.execute(_obj || obj);\n    });\n  } else {\n    client.execute(obj);\n  }\n\n  return (obj.deferred) ? obj.deferred.promise : obj;\n};\n\nSwaggerHttp.prototype.isInternetExplorer = function () {\n  var detectedIE = false;\n\n  if (typeof navigator !== 'undefined' && navigator.userAgent) {\n    var nav = navigator.userAgent.toLowerCase();\n\n    if (nav.indexOf('msie') !== -1) {\n      var version = parseInt(nav.split('msie')[1]);\n\n      if (version <= 8) {\n        detectedIE = true;\n      }\n    }\n  }\n\n  return detectedIE;\n};\n\nJQueryHttpClient.prototype.execute = function (obj) {\n  var jq = this.jQuery || (typeof window !== 'undefined' && window.jQuery);\n  var cb = obj.on;\n  var request = obj;\n\n  if(typeof jq === 'undefined' || jq === false) {\n    throw new Error('Unsupported configuration! JQuery is required but not available');\n  }\n\n  obj.type = obj.method;\n  obj.cache = obj.jqueryAjaxCache;\n  obj.data = obj.body;\n  delete obj.jqueryAjaxCache;\n  delete obj.useJQuery;\n  delete obj.body;\n\n  obj.complete = function (response) {\n    var headers = {};\n    var headerArray = response.getAllResponseHeaders().split('\\n');\n\n    for (var i = 0; i < headerArray.length; i++) {\n      var toSplit = headerArray[i].trim();\n\n      if (toSplit.length === 0) {\n        continue;\n      }\n\n      var separator = toSplit.indexOf(':');\n\n      if (separator === -1) {\n        // Name but no value in the header\n        headers[toSplit] = null;\n\n        continue;\n      }\n\n      var name = toSplit.substring(0, separator).trim();\n      var value = toSplit.substring(separator + 1).trim();\n\n      headers[name] = value;\n    }\n\n    var out = {\n      url: request.url,\n      method: request.method,\n      status: response.status,\n      statusText: response.statusText,\n      data: response.responseText,\n      headers: headers\n    };\n\n    try {\n      var possibleObj =  response.responseJSON || jsyaml.safeLoad(response.responseText);\n      out.obj = (typeof possibleObj === 'string') ? {} : possibleObj;\n    } catch (ex) {\n      // do not set out.obj\n      helpers.log('unable to parse JSON/YAML content');\n    }\n\n    // I can throw, or parse null?\n    out.obj = out.obj || null;\n\n    if (response.status >= 200 && response.status < 300) {\n      cb.response(out);\n    } else if (response.status === 0 || (response.status >= 400 && response.status < 599)) {\n      cb.error(out);\n    } else {\n      return cb.response(out);\n    }\n  };\n\n  jq.support.cors = true;\n\n  return jq.ajax(obj);\n};\n\nSuperagentHttpClient.prototype.execute = function (obj) {\n  var method = obj.method.toLowerCase();\n  var timeout = obj.timeout;\n\n  if (method === 'delete') {\n    method = 'del';\n  }\n  var headers = obj.headers || {};\n\n  var r = request[method](obj.url);\n\n  if (obj.connectionAgent) {\n    r.agent(obj.connectionAgent);\n  }\n\n  if (timeout) {\n    r.timeout(timeout);\n  }\n\n  if (obj.enableCookies) {\n    r.withCredentials();\n  }\n\n  var accept = obj.headers.Accept;\n\n  if(this.binaryRequest(accept)) {\n    r.on('request', function () {\n      if(this.xhr) {\n        this.xhr.responseType = 'blob';\n      }\n    });\n  }\n\n  if(obj.body) {\n    if(_.isObject(obj.body)) {\n      var contentType = obj.headers['Content-Type'] || '';\n      if (contentType.indexOf('multipart/form-data') === 0) {\n        delete headers['Content-Type'];\n        if({}.toString.apply(obj.body) === '[object FormData]') {\n          r.send(obj.body);\n        }\n        else {\n          var keyname, value, v;\n          for (keyname in obj.body) {\n            value = obj.body[keyname];\n            if(Array.isArray(value)) {\n              for(v in value) {\n                r.field(keyname, v);\n              }\n            }\n            else {\n              r.field(keyname, value);\n            }\n          }\n        }\n      }\n      else if (_.isObject(obj.body)) {\n        // non multipart/form-data\n        obj.body = JSON.stringify(obj.body);\n        r.send(obj.body);\n      }\n    }\n    else {\n      r.send(obj.body);\n    }\n  }\n\n  var name;\n  for (name in headers) {\n    r.set(name, headers[name]);\n  }\n\n  if(typeof r.buffer === 'function') {\n    r.buffer(); // force superagent to populate res.text with the raw response data\n  }\n\n  r.end(function (err, res) {\n    res = res || {\n      status: 0,\n      headers: {error: 'no response from server'}\n    };\n    var response = {\n      url: obj.url,\n      method: obj.method,\n      headers: res.headers\n    };\n    var cb;\n\n    if (!err && res.error) {\n      err = res.error;\n    }\n\n    if (err && obj.on && obj.on.error) {\n      response.errObj = err;\n      response.status = res ? res.status : 500;\n      response.statusText = res ? res.text : err.message;\n      if (res.headers && res.headers['content-type']) {\n        if (res.headers['content-type'].indexOf('application/json') >= 0) {\n          try {\n            response.obj = JSON.parse(response.statusText);\n          }\n          catch (e) {\n            response.obj = null;\n          }\n        }\n      }\n      cb = obj.on.error;\n    } else if (res && obj.on && obj.on.response) {\n      var possibleObj;\n\n      // Already parsed by by superagent?\n      if (res.body && _.keys(res.body).length > 0) {\n        possibleObj = res.body;\n      } else {\n        try {\n          possibleObj = jsyaml.safeLoad(res.text);\n          // can parse into a string... which we don't need running around in the system\n          possibleObj = (typeof possibleObj === 'string') ? null : possibleObj;\n        } catch (e) {\n          helpers.log('cannot parse JSON/YAML content');\n        }\n      }\n\n      // null means we can't parse into object\n      if(typeof Buffer === 'function' && Buffer.isBuffer(possibleObj)) {\n        response.data = possibleObj;\n      }\n      else {\n        response.obj = (typeof possibleObj === 'object') ? possibleObj : null;\n      }\n\n      response.status = res.status;\n      response.statusText = res.text;\n      cb = obj.on.response;\n    }\n    if (res.xhr && res.xhr.response) {\n      response.data = res.xhr.response;\n    }\n    else if(!response.data) {\n      response.data = response.statusText;\n    }\n\n    if (cb) {\n      cb(response);\n    }\n  });\n};\n\nSuperagentHttpClient.prototype. binaryRequest = function (accept) {\n  if(!accept) {\n    return false;\n  }\n  return (/^image/i).test(accept)\n    || (/^application\\/pdf/).test(accept)\n    || (/^application\\/octet-stream/).test(accept);\n};\n"]}","'use strict';\n\nvar SwaggerHttp = require('./http');\nvar _ = {\n  isObject: require('lodash-compat/lang/isObject'),\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  isArray: require('lodash-compat/lang/isArray'),\n  isString: require('lodash-compat/lang/isString')\n};\n\n\n/**\n * Resolves a spec's remote references\n */\nvar Resolver = module.exports = function () {\n  this.failedUrls = [];\n  this.resolverCache = {};\n  this.pendingUrls = {};\n};\n\nResolver.prototype.processAllOf = function(root, name, definition, resolutionTable, unresolvedRefs, spec) {\n  var i, location, property;\n\n  definition['x-resolved-from'] = [ '#/definitions/' + name ];\n  var allOf = definition.allOf;\n  // the refs go first\n  allOf.sort(function(a, b) {\n    if(a.$ref && b.$ref) { return 0; }\n    else if(a.$ref) { return -1; }\n    else { return 1; }\n  });\n  for (i = 0; i < allOf.length; i++) {\n    property = allOf[i];\n    location = '/definitions/' + name + '/allOf';\n    this.resolveInline(root, spec, property, resolutionTable, unresolvedRefs, location);\n  }\n};\n\nResolver.prototype.resolve = function (spec, arg1, arg2, arg3) {\n  this.spec = spec;\n  var root = arg1, callback = arg2, scope = arg3, opts = {}, location, i;\n  if(typeof arg1 === 'function') {\n    root = null;\n    callback = arg1;\n    scope = arg2;\n  }\n  var _root = root, modelName;\n  this.scope = (scope || this);\n  this.iteration = this.iteration || 0;\n\n  if(this.scope.options && this.scope.options.requestInterceptor){\n    opts.requestInterceptor = this.scope.options.requestInterceptor;\n  }\n\n  if(this.scope.options && this.scope.options.responseInterceptor){\n    opts.responseInterceptor = this.scope.options.responseInterceptor;\n  }\n\n  var name, path, property, propertyName, parameter, done, counter;\n  var processedCalls = 0, resolvedRefs = {}, unresolvedRefs = {};\n  var resolutionTable = []; // store objects for dereferencing\n\n  spec.definitions = spec.definitions || {};\n  // definitions\n  for (name in spec.definitions) {\n    var definition = spec.definitions[name];\n    if(definition.$ref) {\n      this.resolveInline(root, spec, definition, resolutionTable, unresolvedRefs, definition);\n    }\n    else {\n      for (propertyName in definition.properties) {\n        property = definition.properties[propertyName];\n        if (_.isArray(property.allOf)) {\n          this.processAllOf(root, name, property, resolutionTable, unresolvedRefs, spec);\n        }\n        else {\n          this.resolveTo(root, property, resolutionTable, '/definitions');\n        }\n      }\n\n      if (definition.allOf) {\n        this.processAllOf(root, name, definition, resolutionTable, unresolvedRefs, spec);\n      }\n    }\n  }\n\n  // shared parameters\n  spec.parameters = spec.parameters || {};\n  for(name in spec.parameters) {\n    parameter = spec.parameters[name];\n    if (parameter.in === 'body' && parameter.schema) {\n      if(_.isArray(parameter.schema.allOf)) {\n        // move to a definition\n        modelName = 'inline_model';\n        var _name = modelName;\n        done = false; counter = 0;\n        while(!done) {\n          if(typeof spec.definitions[_name] === 'undefined') {\n            done = true;\n            break;\n          }\n          _name = modelName + '_' + counter;\n          counter ++;\n        }\n        spec.definitions[_name] = { allOf: parameter.schema.allOf };\n        delete parameter.schema.allOf;\n        parameter.schema.$ref = '#/definitions/' + _name;\n        this.processAllOf(root, _name, spec.definitions[_name], resolutionTable, unresolvedRefs, spec);\n      }\n      else {\n        this.resolveTo(root, parameter.schema, resolutionTable, location);\n      }\n    }\n\n    if (parameter.$ref) {\n      // parameter reference\n      this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);\n    }\n  }\n\n  // operations\n  for (name in spec.paths) {\n    var method, operation, responseCode;\n    path = spec.paths[name];\n\n    if(typeof path === 'object') {\n      for (method in path) {\n        // operation reference\n        if (method === '$ref') {\n          // location = path[method];\n          location = '/paths' + name;\n          this.resolveInline(root, spec, path, resolutionTable, unresolvedRefs, location);\n        }\n        else {\n          operation = path[method];\n          var sharedParameters = path.parameters || [];\n          var parameters = operation.parameters || [];\n\n          sharedParameters.forEach(function(parameter) {\n            parameters.unshift(parameter);\n          });\n\n          if (method !== 'parameters' && _.isObject(operation)) {\n            operation.parameters = operation.parameters || parameters;\n          }\n\n          for (i in parameters) {\n            parameter = parameters[i];\n            location = '/paths' + name + '/' + method + '/parameters';\n\n            if (parameter.in === 'body' && parameter.schema) {\n              if (_.isArray(parameter.schema.allOf)) {\n                // move to a definition\n                modelName = 'inline_model';\n                name = modelName;\n                done = false;\n                counter = 0;\n                while (!done) {\n                  if (typeof spec.definitions[name] === 'undefined') {\n                    done = true;\n                    break;\n                  }\n                  name = modelName + '_' + counter;\n                  counter++;\n                }\n                spec.definitions[name] = {allOf: parameter.schema.allOf};\n                delete parameter.schema.allOf;\n                parameter.schema.$ref = '#/definitions/' + name;\n                this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);\n              }\n              else {\n                this.resolveTo(root, parameter.schema, resolutionTable, location);\n              }\n            }\n\n            if (parameter.$ref) {\n              // parameter reference\n              this.resolveInline(root, spec, parameter, resolutionTable, unresolvedRefs, parameter.$ref);\n            }\n          }\n\n          for (responseCode in operation.responses) {\n            var response = operation.responses[responseCode];\n            location = '/paths' + name + '/' + method + '/responses/' + responseCode;\n\n            if (_.isObject(response)) {\n              if (response.$ref) {\n                // response reference\n                this.resolveInline(root, spec, response, resolutionTable, unresolvedRefs, location);\n              }\n              if (response.schema) {\n                var responseObj = response;\n                if (_.isArray(responseObj.schema.allOf)) {\n                  // move to a definition\n                  modelName = 'inline_model';\n                  name = modelName;\n                  done = false;\n                  counter = 0;\n                  while (!done) {\n                    if (typeof spec.definitions[name] === 'undefined') {\n                      done = true;\n                      break;\n                    }\n                    name = modelName + '_' + counter;\n                    counter++;\n                  }\n                  spec.definitions[name] = {allOf: responseObj.schema.allOf};\n                  delete responseObj.schema.allOf;\n                  delete responseObj.schema.type;\n                  responseObj.schema.$ref = '#/definitions/' + name;\n                  this.processAllOf(root, name, spec.definitions[name], resolutionTable, unresolvedRefs, spec);\n                }\n                else if ('array' === responseObj.schema.type) {\n                  if (responseObj.schema.items && responseObj.schema.items.$ref) {\n                    // response reference\n                    this.resolveInline(root, spec, responseObj.schema.items, resolutionTable, unresolvedRefs, location);\n                  }\n                }\n                else {\n                  this.resolveTo(root, response.schema, resolutionTable, location);\n                }\n              }\n            }\n          }\n        }\n      }\n      // clear them out to avoid multiple resolutions\n      path.parameters = [];\n    }\n  }\n\n  var expectedCalls = 0, toResolve = [];\n  // if the root is same as obj[i].root we can resolve locally\n  var all = resolutionTable;\n\n  var parts;\n  for(i = 0; i < all.length; i++) {\n    var a = all[i];\n    if(root === a.root) {\n      if(a.resolveAs === 'ref') {\n        // resolve any path walking\n        var joined = ((a.root || '') + '/' + a.key).split('/');\n        var normalized = [];\n        var url = '';\n        var k;\n\n        if(a.key.indexOf('../') >= 0) {\n          for(var j = 0; j < joined.length; j++) {\n            if(joined[j] === '..') {\n              normalized = normalized.slice(0, normalized.length-1);\n            }\n            else {\n              normalized.push(joined[j]);\n            }\n          }\n          for(k = 0; k < normalized.length; k ++) {\n            if(k > 0) {\n              url += '/';\n            }\n            url += normalized[k];\n          }\n          // we now have to remote resolve this because the path has changed\n          a.root = url;\n          toResolve.push(a);\n        }\n        else {\n          parts = a.key.split('#');\n          if(parts.length === 2) {\n            if(parts[0].indexOf('http:') === 0 || parts[0].indexOf('https:') === 0) {\n              a.root = parts[0];\n            }\n            location = parts[1].split('/');\n            var r;\n            var s = spec;\n            for(k = 0; k < location.length; k++) {\n              var part = location[k];\n              if(part !== '') {\n                s = s[part];\n                if(typeof s !== 'undefined') {\n                  r = s;\n                }\n                else {\n                  r = null;\n                  break;\n                }\n              }\n            }\n            if(r === null) {\n              // must resolve this too\n              toResolve.push(a);\n            }\n          }\n        }\n      }\n      else {\n        if (a.resolveAs === 'inline') {\n          if(a.key && a.key.indexOf('#') === -1 && a.key.charAt(0) !== '/') {\n            // handle relative schema\n            parts = a.root.split('/');\n            location = '';\n            for(i = 0; i < parts.length - 1; i++) {\n              location += parts[i] + '/';\n            }\n            location += a.key;\n            a.root = location;\n            a.location = '';\n          }\n          toResolve.push(a);\n        }\n      }\n    }\n    else {\n      toResolve.push(a);\n    }\n  }\n  expectedCalls = toResolve.length;\n\n  // resolve anything that is local\n\n  var lock = {};\n  for(var ii = 0; ii < toResolve.length; ii++) {\n    (function(item, spec, self, lock, ii) {\n      if(!item.root || item.root === root) {\n        // local resolve\n        self.resolveItem(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, item);\n        processedCalls += 1;\n\n        if(processedCalls === expectedCalls) {\n          self.finish(spec, root, resolutionTable, resolvedRefs, unresolvedRefs, callback, true);\n        }\n      }\n      else if(self.failedUrls.indexOf(item.root) === -1) {\n        var obj = {\n          useJQuery: false,  // TODO\n          url: item.root,\n          method: 'get',\n          headers: {\n            accept: self.scope.swaggerRequestHeaders || 'application/json'\n          },\n          on: {\n            error: function (error) {\n              processedCalls += 1;\n              console.log('failed url: ' + obj.url);\n              self.failedUrls.push(obj.url);\n              if (lock) {\n                delete lock[item.root];\n              }\n              unresolvedRefs[item.key] = {\n                root: item.root,\n                location: item.location\n              };\n\n              if (processedCalls === expectedCalls) {\n                self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);\n              }\n            },  // jshint ignore:line\n            response: function (response) {\n              var swagger = response.obj;\n              if (lock) {\n                delete lock[item.root];\n              }\n              if (self.resolverCache) {\n                self.resolverCache[item.root] = swagger;\n              }\n              self.resolveItem(swagger, item.root, resolutionTable, resolvedRefs, unresolvedRefs, item);\n              processedCalls += 1;\n\n              if (processedCalls === expectedCalls) {\n                self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);\n              }\n            }\n          } // jshint ignore:line\n        };\n\n        // apply timeout only when specified\n        if (scope && scope.fetchSpecTimeout) {\n          obj.timeout = scope.fetchSpecTimeout;\n        }\n\n        if (scope && scope.clientAuthorizations) {\n          scope.clientAuthorizations.apply(obj);\n        }\n\n        (function waitForUnlock() {\n          setTimeout(function() {\n            if (lock[obj.url]) {\n              waitForUnlock();\n            }\n            else {\n              var cached = self.resolverCache[obj.url];\n              if (_.isObject(cached)) {\n                obj.on.response({obj: cached});\n              }\n              else {\n                lock[obj.url] = true;\n                new SwaggerHttp().execute(obj, opts);\n              }\n            }\n          }, 0);\n        })();\n      }\n\n      else {\n        processedCalls += 1;\n        unresolvedRefs[item.key] = {\n          root: item.root,\n          location: item.location\n        };\n        if (processedCalls === expectedCalls) {\n          self.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);\n        }\n      }\n    }(toResolve[ii], spec, this, lock, ii));\n  }\n\n  if (Object.keys(toResolve).length === 0) {\n    this.finish(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, callback);\n  }\n};\n\nResolver.prototype.resolveItem = function(spec, root, resolutionTable, resolvedRefs, unresolvedRefs, item) {\n  var path = item.location;\n  var location = spec, parts = path.split('/');\n  if(path !== '') {\n    for (var j = 0; j < parts.length; j++) {\n      var segment = parts[j];\n      if (segment.indexOf('~1') !== -1) {\n        segment = parts[j].replace(/~0/g, '~').replace(/~1/g, '/');\n        if (segment.charAt(0) !== '/') {\n          segment = '/' + segment;\n        }\n      }\n      if (typeof location === 'undefined' || location === null) {\n        break;\n      }\n      if (segment === '' && j === (parts.length - 1) && parts.length > 1) {\n        location = null;\n        break;\n      }\n      if (segment.length > 0) {\n        location = location[segment];\n      }\n    }\n  }\n  var resolved = item.key;\n  parts = item.key.split('/');\n  var resolvedName = parts[parts.length-1];\n\n  if(resolvedName.indexOf('#') >= 0) {\n    resolvedName = resolvedName.split('#')[1];\n  }\n\n  if (location !== null && typeof location !== 'undefined') {\n    resolvedRefs[resolved] = {\n      name: resolvedName,\n      obj: location,\n      key: item.key,\n      root: item.root\n    };\n  } else {\n    unresolvedRefs[resolved] = {\n      root: item.root,\n      location: item.location\n    };\n  }\n};\n\nResolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs, unresolvedRefs, callback, localResolve) {\n  // walk resolution table and replace with resolved refs\n  var ref, abs;\n  for (ref in resolutionTable) {\n    var item = resolutionTable[ref];\n\n    var key = item.key;\n    var resolvedTo = resolvedRefs[key];\n    if (resolvedTo) {\n      spec.definitions = spec.definitions || {};\n      if (item.resolveAs === 'ref') {\n        if (localResolve !== true) {\n          // don't retain root for local definitions\n          for (key in resolvedTo.obj) {\n            abs = this.retainRoot(key, resolvedTo.obj[key], item.root);\n            resolvedTo.obj[key] = abs;\n          }\n        }\n        spec.definitions[resolvedTo.name] = resolvedTo.obj;\n        item.obj.$ref = '#/definitions/' + resolvedTo.name;\n      } else if (item.resolveAs === 'inline') {\n        var targetObj = item.obj;\n        targetObj['x-resolved-from'] = [ item.key ];\n        delete targetObj.$ref;\n\n        for (key in resolvedTo.obj) {\n          abs = resolvedTo.obj[key];\n\n          if (localResolve !== true) {\n            // don't retain root for local definitions\n            abs = this.retainRoot(key, resolvedTo.obj[key], item.root);\n          }\n          targetObj[key] = abs;\n        }\n      }\n    }\n  }\n  var existingUnresolved = this.countUnresolvedRefs(spec);\n\n  if(existingUnresolved === 0 || this.iteration > 5) {\n    this.resolveAllOf(spec.definitions);\n    this.resolverCache = null;\n    callback.call(this.scope, spec, unresolvedRefs);\n  }\n  else {\n    this.iteration += 1;\n    this.resolve(spec, root, callback, this.scope);\n  }\n};\n\nResolver.prototype.countUnresolvedRefs = function(spec) {\n  var i;\n  var refs = this.getRefs(spec);\n  var keys = [];\n  var unresolvedKeys = [];\n  for(i in refs) {\n    if(i.indexOf('#') === 0) {\n      keys.push(i.substring(1));\n    }\n    else {\n      unresolvedKeys.push(i);\n    }\n  }\n\n  // verify possible keys\n  for (i = 0; i < keys.length; i++) {\n    var part = keys[i];\n    var parts = part.split('/');\n    var obj = spec;\n\n    for (var k = 0; k < parts.length; k++) {\n      var key = parts[k];\n      if(key !== '') {\n        obj = obj[key];\n        if(typeof obj === 'undefined') {\n          unresolvedKeys.push(part);\n          break;\n        }\n      }\n    }\n  }\n  return unresolvedKeys.length;\n};\n\nResolver.prototype.getRefs = function(spec, obj) {\n  obj = obj || spec;\n  var output = {};\n  for(var key in obj) {\n    if (!obj.hasOwnProperty(key)) {\n      continue;\n    }\n    var item = obj[key];\n    if(key === '$ref' && typeof item === 'string') {\n      output[item] = null;\n    }\n    else if(_.isObject(item)) {\n      var o = this.getRefs(item);\n      for(var k in o) {\n        output[k] = null;\n      }\n    }\n  }\n  return output;\n};\n\nfunction splitUrl(url) {\n  var result = {};\n  var proto = /[a-z]+:\\/\\//i.exec(url);\n  if (proto) {\n    result.proto = proto[0].slice(0, -3);\n    url = url.slice(result.proto.length + 1);\n  }\n  if (url.slice(0, 2) === '//') {\n    result.domain = url.slice(2).split('/')[0];\n    url = url.slice(2 + result.domain.length);\n  }\n  var p = url.split('#');\n  if (p[0].length) {\n    result.path = p[0];\n  }\n  if (p.length > 1) {\n    result.fragment = p.slice(1).join('#');\n  }\n  return result;\n}\n\nfunction unsplitUrl(url) {\n  var result = url.path;\n  if (result === undefined) {\n    result = '';\n  }\n  if (url.fragment !== undefined) {\n    result += '#' + url.fragment;\n  }\n  if (url.domain !== undefined) {\n    if (result.slice(0, 1) === '/') {\n      result = result.slice(1);\n    }\n    result = '//' + url.domain + '/' + result;\n    if (url.proto !== undefined) {\n      result = url.proto + ':' + result;\n    }\n  }\n  return result;\n}\n\nfunction joinUrl(base, rel) {\n  var relsp = splitUrl(rel);\n  if (relsp.domain !== undefined) {\n    return rel;\n  }\n  var result = splitUrl(base);\n  if (relsp.path === undefined) {\n    // change only fragment part\n    result.fragment = relsp.fragment;\n  } else if (relsp.path.slice(0, 1) === '/') {\n    // relative to domain\n    result.path = relsp.path;\n    result.fragment = relsp.fragment;\n  } else {\n    // relative to path\n    var path = result.path === undefined ? [] : result.path.split('/');\n    var relpath = relsp.path.split('/');\n    if (path.length) {\n      path.pop();\n    }\n    while (relpath[0] === '..' || relpath[0] === '.') {\n      if (relpath[0] === '..') {\n        path.pop();\n      }\n      relpath.shift();\n    }\n    result.path = path.concat(relpath).join('/');\n    result.fragment = relsp.fragment;\n  }\n  return unsplitUrl(result);\n}\n\nResolver.prototype.retainRoot = function(origKey, obj, root) {\n  // walk object and look for relative $refs\n  if(_.isObject(obj)) {\n    for(var key in obj) {\n      var item = obj[key];\n      if (key === '$ref' && typeof item === 'string') {\n        obj[key] = joinUrl(root, item);\n      }\n      else if (_.isObject(item)) {\n        this.retainRoot(key, item, root);\n      }\n    }\n  }\n  else if(_.isString(obj) && origKey === '$ref') {\n    obj = joinUrl(root, obj);\n  }\n  return obj;\n};\n\n/**\n * immediately in-lines local refs, queues remote refs\n * for inline resolution\n */\nResolver.prototype.resolveInline = function (root, spec, property, resolutionTable, unresolvedRefs, location) {\n  var key = property.$ref, ref = property.$ref, i, p, p2, rs;\n  var rootTrimmed = false;\n\n  root = root || ''; // Guard against .split. @fehguy, you'll need to check if this logic fits\n  // More imporantly is how do we gracefully handle relative urls, when provided just a 'spec', not a 'url' ?\n\n  if (ref) {\n    if(ref.indexOf('../') === 0) {\n      // reset root\n      p = ref.split('../');\n      p2 = root.split('/');\n      ref = '';\n      for(i = 0; i < p.length; i++) {\n        if(p[i] === '') {\n          p2 = p2.slice(0, p2.length-1);\n        }\n        else {\n          ref += p[i];\n        }\n      }\n      root = '';\n      for(i = 0; i < p2.length - 1; i++) {\n        if(i > 0) { root += '/'; }\n        root += p2[i];\n      }\n      rootTrimmed = true;\n    }\n    if(ref.indexOf('#') >= 0) {\n      if(ref.indexOf('/') === 0) {\n        rs = ref.split('#');\n        p  = root.split('//');\n        p2 = p[1].split('/');\n        root = p[0] + '//' + p2[0] + rs[0];\n        location = rs[1];\n      }\n      else {\n        rs = ref.split('#');\n        if(rs[0] !== '') {\n          p2 = root.split('/');\n          p2 = p2.slice(0, p2.length - 1);\n          if(!rootTrimmed) {\n            root = '';\n            for (var k = 0; k < p2.length; k++) {\n              if(k > 0) { root += '/'; }\n              root += p2[k];\n            }\n          }\n          root += '/' + ref.split('#')[0];\n        }\n        location = rs[1];\n      }\n    }\n    if (ref.indexOf('http:') === 0 || ref.indexOf('https:') === 0) {\n      if(ref.indexOf('#') >= 0) {\n        root = ref.split('#')[0];\n        location = ref.split('#')[1];\n      }\n      else {\n        root = ref;\n        location = '';\n      }\n      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});\n    } else if (ref.indexOf('#') === 0) {\n      location = ref.split('#')[1];\n      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});\n    } else if (ref.indexOf('/') === 0 && ref.indexOf('#') === -1) {\n      location = ref;\n      var matches = root.match(/^https?\\:\\/\\/([^\\/?#]+)(?:[\\/?#]|$)/i);\n      if(matches) {\n        root = matches[0] + ref.substring(1);\n        location = '';\n      }\n      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});\n    }\n    else {\n      resolutionTable.push({obj: property, resolveAs: 'inline', root: root, key: key, location: location});\n    }\n  }\n  else if (property.type === 'array') {\n    this.resolveTo(root, property.items, resolutionTable, location);\n  }\n};\n\nResolver.prototype.resolveTo = function (root, property, resolutionTable, location) {\n  var sp, i;\n  var ref = property.$ref;\n  var lroot = root;\n  if ((typeof ref !== 'undefined') && (ref !== null)) {\n    if(ref.indexOf('#') >= 0) {\n      var parts = ref.split('#');\n\n      // #/definitions/foo\n      // foo.json#/bar\n      if(parts[0] && ref.indexOf('/') === 0) {\n\n      }\n      else if(parts[0] && (parts[0].indexOf('http:') === 0 || parts[0].indexOf('https:') === 0)) {\n        lroot = parts[0];\n        ref = parts[1];\n      }\n      else if(parts[0] && parts[0].length > 0) {\n        // relative file\n        sp = root.split('/');\n        lroot = '';\n        for(i = 0; i < sp.length - 1; i++) {\n          lroot += sp[i] + '/';\n        }\n        lroot += parts[0];\n      }\n      else {\n\n      }\n\n      location = parts[1];\n    }\n    else if (ref.indexOf('http:') === 0 || ref.indexOf('https:') === 0) {\n      lroot = ref;\n      location = '';\n    }\n    else {\n      // relative file\n      sp = root.split('/');\n      lroot = '';\n      for(i = 0; i < sp.length - 1; i++) {\n        lroot += sp[i] + '/';\n      }\n      lroot += ref;\n      location = '';\n    }\n    resolutionTable.push({\n      obj: property, resolveAs: 'ref', root: lroot, key: ref, location: location\n    });\n  } else if (property.type === 'array') {\n    var items = property.items;\n    this.resolveTo(root, items, resolutionTable, location);\n  } else {\n    if(property && (property.properties || property.additionalProperties)) {\n      var name = this.uniqueName('inline_model');\n      if (property.title) {\n        name = this.uniqueName(property.title);\n      }\n      delete property.title;\n      this.spec.definitions[name] = _.cloneDeep(property);\n      property.$ref = '#/definitions/' + name;\n      delete property.type;\n      delete property.properties;\n    }\n  }\n};\n\nResolver.prototype.uniqueName = function(base) {\n  var name = base;\n  var count = 0;\n  while(true) {\n    if(!_.isObject(this.spec.definitions[name])) {\n      return name;\n    }\n    name = base + '_' + count;\n    count++;\n  }\n};\n\nResolver.prototype.resolveAllOf = function(spec, obj, depth) {\n  depth = depth || 0;\n  obj = obj || spec;\n  var name;\n  for(var key in obj) {\n    if (!obj.hasOwnProperty(key)) {\n      continue;\n    }\n    var item = obj[key];\n    if(item === null) {\n      throw new TypeError('Swagger 2.0 does not support null types (' + obj + ').  See https://github.com/swagger-api/swagger-spec/issues/229.');\n    }\n    if(typeof item === 'object') {\n      this.resolveAllOf(spec, item, depth + 1);\n    }\n    if(item && typeof item.allOf !== 'undefined') {\n      var allOf = item.allOf;\n      if(_.isArray(allOf)) {\n        var output = _.cloneDeep(item);\n        delete output.allOf;\n\n        output['x-composed'] = true;\n        if (typeof item['x-resolved-from'] !== 'undefined') {\n          output['x-resolved-from'] = item['x-resolved-from'];\n        }\n\n        for(var i = 0; i < allOf.length; i++) {\n          var component = allOf[i];\n          var source = 'self';\n          if(typeof component['x-resolved-from'] !== 'undefined') {\n            source = component['x-resolved-from'][0];\n          }\n\n          for(var part in component) {\n            if(!output.hasOwnProperty(part)) {\n              output[part] = _.cloneDeep(component[part]);\n              if(part === 'properties') {\n                for(name in output[part]) {\n                  output[part][name]['x-resolved-from'] = source;\n                }\n              }\n            }\n            else {\n              if(part === 'properties') {\n                var properties = component[part];\n                for(name in properties) {\n                  output.properties[name] = _.cloneDeep(properties[name]);\n                  var resolvedFrom = properties[name]['x-resolved-from'];\n                  if (typeof resolvedFrom === 'undefined' || resolvedFrom === 'self') {\n                    resolvedFrom = source;\n                  }\n                  output.properties[name]['x-resolved-from'] = resolvedFrom;\n                }\n              }\n              else if(part === 'required') {\n                // merge & dedup the required array\n                var a = output.required.concat(component[part]);\n                for(var k = 0; k < a.length; ++k) {\n                  for(var j = k + 1; j < a.length; ++j) {\n                    if(a[k] === a[j]) { a.splice(j--, 1); }\n                  }\n                }\n                output.required = a;\n              }\n              else if(part === 'x-resolved-from') {\n                output['x-resolved-from'].push(source);\n              }\n              else {\n                // TODO: need to merge this property\n                // console.log('what to do with ' + part)\n              }\n            }\n          }\n        }\n        obj[key] = output;\n      }\n    }\n  }\n};\n","'use strict';\n\nvar Helpers = require('./helpers');\n\nvar _ = {\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  isUndefined: require('lodash-compat/lang/isUndefined'),\n  isArray: require('lodash-compat/lang/isArray'),\n  isObject: require('lodash-compat/lang/isObject'),\n  isEmpty: require('lodash-compat/lang/isEmpty'),\n  map: require('lodash-compat/collection/map'),\n  indexOf: require('lodash-compat/array/indexOf'),\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  keys: require('lodash-compat/object/keys'),\n  forEach: require('lodash-compat/collection/forEach')\n};\n\nvar optionHtml = module.exports.optionHtml = function  (label, value) {\n  return '<tr><td class=\"optionName\">' + label + ':</td><td>' + value + '</td></tr>';\n};\n\nmodule.exports.typeFromJsonSchema = function (type, format) {\n  var str;\n\n  if (type === 'integer' && format === 'int32') {\n    str = 'integer';\n  } else if (type === 'integer' && format === 'int64') {\n    str = 'long';\n  } else if (type === 'integer' && typeof format === 'undefined') {\n    str = 'long';\n  } else if (type === 'string' && format === 'date-time') {\n    str = 'date-time';\n  } else if (type === 'string' && format === 'date') {\n    str = 'date';\n  } else if (type === 'number' && format === 'float') {\n    str = 'float';\n  } else if (type === 'number' && format === 'double') {\n    str = 'double';\n  } else if (type === 'number' && typeof format === 'undefined') {\n    str = 'double';\n  } else if (type === 'boolean') {\n    str = 'boolean';\n  } else if (type === 'string') {\n    str = 'string';\n  }\n\n  return str;\n};\n\nvar getStringSignature = module.exports.getStringSignature = function (obj, baseComponent) {\n  var str = '';\n\n  if (typeof obj.$ref !== 'undefined') {\n    str += Helpers.simpleRef(obj.$ref);\n  } else if (typeof obj.type === 'undefined') {\n    str += 'object';\n  } else if (obj.type === 'array') {\n    if (baseComponent) {\n      str += getStringSignature((obj.items || obj.$ref || {}));\n    } else {\n      str += 'Array[';\n      str += getStringSignature((obj.items || obj.$ref || {}));\n      str += ']';\n    }\n  } else if (obj.type === 'integer' && obj.format === 'int32') {\n    str += 'integer';\n  } else if (obj.type === 'integer' && obj.format === 'int64') {\n    str += 'long';\n  } else if (obj.type === 'integer' && typeof obj.format === 'undefined') {\n    str += 'long';\n  } else if (obj.type === 'string' && obj.format === 'date-time') {\n    str += 'date-time';\n  } else if (obj.type === 'string' && obj.format === 'date') {\n    str += 'date';\n  } else if (obj.type === 'string' && typeof obj.format === 'undefined') {\n    str += 'string';\n  } else if (obj.type === 'number' && obj.format === 'float') {\n    str += 'float';\n  } else if (obj.type === 'number' && obj.format === 'double') {\n    str += 'double';\n  } else if (obj.type === 'number' && typeof obj.format === 'undefined') {\n    str += 'double';\n  } else if (obj.type === 'boolean') {\n    str += 'boolean';\n  } else if (obj.$ref) {\n    str += Helpers.simpleRef(obj.$ref);\n  } else {\n    str += obj.type;\n  }\n\n  return str;\n};\n\nvar schemaToJSON = module.exports.schemaToJSON = function (schema, models, modelsToIgnore, modelPropertyMacro) {\n  // Resolve the schema (Handle nested schemas)\n  schema = Helpers.resolveSchema(schema);\n\n  if(typeof modelPropertyMacro !== 'function') {\n    modelPropertyMacro = function(prop){\n      return (prop || {}).default;\n    };\n  }\n\n  modelsToIgnore= modelsToIgnore || {};\n\n  var type = schema.type || 'object';\n  var format = schema.format;\n  var model;\n  var output;\n\n  if (!_.isUndefined(schema.example)) {\n    output = schema.example;\n  } else if (_.isUndefined(schema.items) && _.isArray(schema.enum)) {\n    output = schema.enum[0];\n  }\n\n  if (_.isUndefined(output)) {\n    if (schema.$ref) {\n      model = models[Helpers.simpleRef(schema.$ref)];\n\n      if (!_.isUndefined(model)) {\n        if (_.isUndefined(modelsToIgnore[model.name])) {\n          modelsToIgnore[model.name] = model;\n          output = schemaToJSON(model.definition, models, modelsToIgnore, modelPropertyMacro);\n          delete modelsToIgnore[model.name];\n        } else {\n          if (model.type === 'array') {\n            output = [];\n          } else {\n            output = {};\n          }\n        }\n      }\n    } else if (!_.isUndefined(schema.default)) {\n      output = schema.default;\n    } else if (type === 'string') {\n      if (format === 'date-time') {\n        output = new Date().toISOString();\n      } else if (format === 'date') {\n        output = new Date().toISOString().split('T')[0];\n      } else {\n        output = 'string';\n      }\n    } else if (type === 'integer') {\n      output = 0;\n    } else if (type === 'number') {\n      output = 0.0;\n    } else if (type === 'boolean') {\n      output = true;\n    } else if (type === 'object') {\n      output = {};\n\n      _.forEach(schema.properties, function (property, name) {\n        var cProperty = _.cloneDeep(property);\n\n        // Allow macro to set the default value\n        cProperty.default = modelPropertyMacro(property);\n\n        output[name] = schemaToJSON(cProperty, models, modelsToIgnore, modelPropertyMacro);\n      });\n    } else if (type === 'array') {\n      output = [];\n\n      if (_.isArray(schema.items)) {\n        _.forEach(schema.items, function (item) {\n          output.push(schemaToJSON(item, models, modelsToIgnore, modelPropertyMacro));\n        });\n      } else if (_.isPlainObject(schema.items)) {\n        output.push(schemaToJSON(schema.items, models, modelsToIgnore, modelPropertyMacro));\n      } else if (_.isUndefined(schema.items)) {\n        output.push({});\n      } else {\n        Helpers.log('Array type\\'s \\'items\\' property is not an array or an object, cannot process');\n      }\n    }\n  }\n\n  return output;\n};\n\nmodule.exports.schemaToHTML =function (name, schema, models, modelPropertyMacro) {\n  var strongOpen = '<span class=\"strong\">';\n  var strongClose = '</span>';\n\n  // Allow for ignoring the 'name' argument.... shifting the rest\n  if(_.isObject(arguments[0])) {\n    name = void 0;\n    schema = arguments[0];\n    models = arguments[1];\n    modelPropertyMacro = arguments[2];\n  }\n\n  models = models || {};\n\n  // Resolve the schema (Handle nested schemas)\n  schema = Helpers.resolveSchema(schema);\n\n  // Return for empty object\n  if(_.isEmpty(schema)) {\n    return strongOpen + 'Empty' + strongClose;\n  }\n\n  // Dereference $ref from 'models'\n  if(typeof schema.$ref === 'string') {\n    name = Helpers.simpleRef(schema.$ref);\n    schema = models[name];\n    if(typeof schema === 'undefined')\n    {\n      return strongOpen + name + ' is not defined!' + strongClose;\n    }\n  }\n\n  if(typeof name !== 'string') {\n    name = schema.title || 'Inline Model';\n  }\n\n  // If we are a Model object... adjust accordingly\n  if(schema.definition) {\n    schema = schema.definition;\n  }\n\n  if(typeof modelPropertyMacro !== 'function') {\n    modelPropertyMacro = function(prop){\n      return (prop || {}).default;\n    };\n  }\n\n  var references = {};\n  var seenModels = [];\n  var inlineModels = 0;\n\n\n\n  // Generate current HTML\n  var html = processModel(schema, name);\n\n  // Generate references HTML\n  while (_.keys(references).length > 0) {\n    /* jshint ignore:start */\n    _.forEach(references, function (schema, name) {\n      var seenModel = _.indexOf(seenModels, name) > -1;\n\n      delete references[name];\n\n      if (!seenModel) {\n        seenModels.push(name);\n\n        html += '<br />' + processModel(schema, name);\n      }\n    });\n    /* jshint ignore:end */\n  }\n\n  return html;\n\n  /////////////////////////////////\n\n  function addReference(schema, name, skipRef) {\n    var modelName = name;\n    var model;\n\n    if (schema.$ref) {\n      modelName = schema.title || Helpers.simpleRef(schema.$ref);\n      model = models[modelName];\n    } else if (_.isUndefined(name)) {\n      modelName = schema.title || 'Inline Model ' + (++inlineModels);\n      model = {definition: schema};\n    }\n\n    if (skipRef !== true) {\n      references[modelName] = _.isUndefined(model) ? {} : model.definition;\n    }\n\n    return modelName;\n  }\n\n  function primitiveToHTML(schema) {\n    var html = '<span class=\"propType\">';\n    var type = schema.type || 'object';\n\n    if (schema.$ref) {\n      html += addReference(schema, Helpers.simpleRef(schema.$ref));\n    } else if (type === 'object') {\n      if (!_.isUndefined(schema.properties)) {\n        html += addReference(schema);\n      } else {\n        html += 'object';\n      }\n    } else if (type === 'array') {\n      html += 'Array[';\n\n      if (_.isArray(schema.items)) {\n        html += _.map(schema.items, addReference).join(',');\n      } else if (_.isPlainObject(schema.items)) {\n        if (_.isUndefined(schema.items.$ref)) {\n          if (!_.isUndefined(schema.items.type) && _.indexOf(['array', 'object'], schema.items.type) === -1) {\n            html += schema.items.type;\n          } else {\n            html += addReference(schema.items);\n          }\n        } else {\n          html += addReference(schema.items, Helpers.simpleRef(schema.items.$ref));\n        }\n      } else {\n        Helpers.log('Array type\\'s \\'items\\' schema is not an array or an object, cannot process');\n        html += 'object';\n      }\n\n      html += ']';\n    } else {\n      html += schema.type;\n    }\n\n    html += '</span>';\n\n    return html;\n  }\n\n  function primitiveToOptionsHTML(schema, html) {\n    var options = '';\n    var type = schema.type || 'object';\n    var isArray = type === 'array';\n\n    if (isArray) {\n      if (_.isPlainObject(schema.items) && !_.isUndefined(schema.items.type)) {\n        type = schema.items.type;\n      } else {\n        type = 'object';\n      }\n    }\n\n    if (!_.isUndefined(schema.default)) {\n      options += optionHtml('Default', schema.default);\n    }\n\n    switch (type) {\n    case 'string':\n      if (schema.minLength) {\n        options += optionHtml('Min. Length', schema.minLength);\n      }\n\n      if (schema.maxLength) {\n        options += optionHtml('Max. Length', schema.maxLength);\n      }\n\n      if (schema.pattern) {\n        options += optionHtml('Reg. Exp.', schema.pattern);\n      }\n      break;\n    case 'integer':\n    case 'number':\n      if (schema.minimum) {\n        options += optionHtml('Min. Value', schema.minimum);\n      }\n\n      if (schema.exclusiveMinimum) {\n        options += optionHtml('Exclusive Min.', 'true');\n      }\n\n      if (schema.maximum) {\n        options += optionHtml('Max. Value', schema.maximum);\n      }\n\n      if (schema.exclusiveMaximum) {\n        options += optionHtml('Exclusive Max.', 'true');\n      }\n\n      if (schema.multipleOf) {\n        options += optionHtml('Multiple Of', schema.multipleOf);\n      }\n\n      break;\n    }\n\n    if (isArray) {\n      if (schema.minItems) {\n        options += optionHtml('Min. Items', schema.minItems);\n      }\n\n      if (schema.maxItems) {\n        options += optionHtml('Max. Items', schema.maxItems);\n      }\n\n      if (schema.uniqueItems) {\n        options += optionHtml('Unique Items', 'true');\n      }\n\n      if (schema.collectionFormat) {\n        options += optionHtml('Coll. Format', schema.collectionFormat);\n      }\n    }\n\n    if (_.isUndefined(schema.items)) {\n      if (_.isArray(schema.enum)) {\n        var enumString;\n\n        if (type === 'number' || type === 'integer') {\n          enumString = schema.enum.join(', ');\n        } else {\n          enumString = '\"' + schema.enum.join('\", \"') + '\"';\n        }\n\n        options += optionHtml('Enum', enumString);\n      }\n    }\n\n    if (options.length > 0) {\n      html = '<span class=\"propWrap\">' + html + '<table class=\"optionsWrapper\"><tr><th colspan=\"2\">' + type + '</th></tr>' + options + '</table></span>';\n    }\n\n    return html;\n  }\n\n  function processModel(schema, name) {\n    var type = schema.type || 'object';\n    var isArray = schema.type === 'array';\n    var html = strongOpen + name + ' ' + (isArray ? '[' : '{') + strongClose;\n\n    if (name) {\n      seenModels.push(name);\n    }\n\n    if (isArray) {\n      if (_.isArray(schema.items)) {\n        html += '<div>' + _.map(schema.items, function (item) {\n          var type = item.type || 'object';\n\n          if (_.isUndefined(item.$ref)) {\n            if (_.indexOf(['array', 'object'], type) > -1) {\n              if (type === 'object' && _.isUndefined(item.properties)) {\n                return 'object';\n              } else {\n                return addReference(item);\n              }\n            } else {\n              return primitiveToOptionsHTML(item, type);\n            }\n          } else {\n            return addReference(item, Helpers.simpleRef(item.$ref));\n          }\n        }).join(',</div><div>');\n      } else if (_.isPlainObject(schema.items)) {\n        if (_.isUndefined(schema.items.$ref)) {\n          if (_.indexOf(['array', 'object'], schema.items.type || 'object') > -1) {\n            if ((_.isUndefined(schema.items.type) || schema.items.type === 'object') && _.isUndefined(schema.items.properties)) {\n              html += '<div>object</div>';\n            } else {\n              html += '<div>' + addReference(schema.items) + '</div>';\n            }\n          } else {\n            html += '<div>' + primitiveToOptionsHTML(schema.items, schema.items.type) + '</div>';\n          }\n        } else {\n          html += '<div>' + addReference(schema.items, Helpers.simpleRef(schema.items.$ref)) + '</div>';\n        }\n      } else {\n        Helpers.log('Array type\\'s \\'items\\' property is not an array or an object, cannot process');\n        html += '<div>object</div>';\n      }\n    } else {\n      if (schema.$ref) {\n        html += '<div>' + addReference(schema, name) + '</div>';\n      } else if (type === 'object') {\n        if (_.isPlainObject(schema.properties)) {\n          var contents = _.map(schema.properties, function (property, name) {\n            var propertyIsRequired = (_.indexOf(schema.required, name) >= 0);\n            var cProperty = _.cloneDeep(property);\n\n            var requiredClass = propertyIsRequired ? 'required' : '';\n            var html = '<span class=\"propName ' + requiredClass + '\">' + name + '</span> (';\n            var model;\n            var propDescription;\n\n            // Allow macro to set the default value\n            cProperty.default = modelPropertyMacro(cProperty);\n\n            // Resolve the schema (Handle nested schemas)\n            cProperty = Helpers.resolveSchema(cProperty);\n\n            propDescription = property.description || cProperty.description;\n\n            // We need to handle property references to primitives (Issue 339)\n            if (!_.isUndefined(cProperty.$ref)) {\n              model = models[Helpers.simpleRef(cProperty.$ref)];\n\n              if (!_.isUndefined(model) && _.indexOf([undefined, 'array', 'object'], model.definition.type) === -1) {\n                // Use referenced schema\n                cProperty = Helpers.resolveSchema(model.definition);\n              }\n            }\n\n            html += primitiveToHTML(cProperty);\n\n            if(!propertyIsRequired) {\n              html += ', <span class=\"propOptKey\">optional</span>';\n            }\n\n            if(property.readOnly) {\n                html += ', <span class=\"propReadOnly\">read only</span>';\n            }\n\n            html += ')';\n\n            if (!_.isUndefined(propDescription)) {\n              html += ': ' + '<span class=\"propDesc\">' + propDescription + '</span>';\n            }\n\n            if (cProperty.enum) {\n              html += ' = <span class=\"propVals\">[\\'' + cProperty.enum.join('\\', \\'') + '\\']</span>';\n            }\n\n            return '<div' + (property.readOnly ? ' class=\"readOnly\"' : '') + '>' + primitiveToOptionsHTML(cProperty, html);\n          }).join(',</div>');\n\n          if (contents) {\n            html += contents + '</div>';\n          }\n        }\n      } else {\n        html += '<div>' + primitiveToOptionsHTML(schema, type) + '</div>';\n      }\n    }\n\n    return html + strongOpen + (isArray ? ']' : '}') + strongClose;\n  }\n};","'use strict';\n\nvar SwaggerHttp = require('./http');\nvar _ = {\n  isObject: require('lodash-compat/lang/isObject')\n};\n\nvar SwaggerSpecConverter = module.exports = function () {\n  this.errors = [];\n  this.warnings = [];\n  this.modelMap = {};\n};\n\nSwaggerSpecConverter.prototype.setDocumentationLocation = function (location) {\n  this.docLocation = location;\n};\n\n/**\n * converts a resource listing OR api declaration\n **/\nSwaggerSpecConverter.prototype.convert = function (obj, clientAuthorizations, opts, callback) {\n  // not a valid spec\n  if(!obj || !Array.isArray(obj.apis)) {\n    return this.finish(callback, null);\n  }\n  this.clientAuthorizations = clientAuthorizations;\n\n  // create a new swagger object to return\n  var swagger = { swagger: '2.0' };\n\n  swagger.originalVersion = obj.swaggerVersion;\n\n  // add the info\n  this.apiInfo(obj, swagger);\n\n  // add security definitions\n  this.securityDefinitions(obj, swagger);\n\n  // take basePath into account\n  if (obj.basePath) {\n    this.setDocumentationLocation(obj.basePath);\n  }\n\n  // see if this is a single-file swagger definition\n  var isSingleFileSwagger = false;\n  var i;\n  for(i = 0; i < obj.apis.length; i++) {\n    var api = obj.apis[i];\n    if(Array.isArray(api.operations)) {\n      isSingleFileSwagger = true;\n    }\n  }\n  if(isSingleFileSwagger) {\n    this.declaration(obj, swagger);\n    this.finish(callback, swagger);\n  }\n  else {\n    this.resourceListing(obj, swagger, opts, callback);\n  }\n};\n\nSwaggerSpecConverter.prototype.declaration = function(obj, swagger) {\n  var name, i, p, pos;\n  if(!obj.apis) {\n    return;\n  }\n\n  if (obj.basePath.indexOf('http://') === 0) {\n    p = obj.basePath.substring('http://'.length);\n    pos = p.indexOf('/');\n    if (pos > 0) {\n      swagger.host = p.substring(0, pos);\n      swagger.basePath = p.substring(pos);\n    }\n    else {\n      swagger.host = p;\n      swagger.basePath = '/';\n    }\n  } else if (obj.basePath.indexOf('https://') === 0) {\n    p = obj.basePath.substring('https://'.length);\n    pos = p.indexOf('/');\n    if (pos > 0) {\n      swagger.host = p.substring(0, pos);\n      swagger.basePath = p.substring(pos);\n    }\n    else {\n      swagger.host = p;\n      swagger.basePath = '/';\n    }\n  } else {\n    swagger.basePath = obj.basePath;\n  }\n\n  var resourceLevelAuth;\n  if(obj.authorizations) {\n    resourceLevelAuth = obj.authorizations;\n  }\n  if(obj.consumes) {\n    swagger.consumes = obj.consumes;\n  }\n  if(obj.produces) {\n    swagger.produces = obj.produces;\n  }\n\n  // build a mapping of id to name for 1.0 model resolutions\n  if(_.isObject(obj)) {\n    for(name in obj.models) {\n      var existingModel = obj.models[name];\n      var key = (existingModel.id || name);\n      this.modelMap[key] = name;\n    }\n  }\n\n  for(i = 0; i < obj.apis.length; i++) {\n    var api = obj.apis[i];\n    var path = api.path;\n    var operations = api.operations;\n    this.operations(path, obj.resourcePath, operations, resourceLevelAuth, swagger);\n  }\n\n  var models = obj.models || {};\n  this.models(models, swagger);\n};\n\nSwaggerSpecConverter.prototype.models = function(obj, swagger) {\n  if(!_.isObject(obj)) {\n    return;\n  }\n  var name;\n\n  swagger.definitions = swagger.definitions || {};\n  for(name in obj) {\n    var existingModel = obj[name];\n    var _required = [];\n    var schema = { properties: {}};\n    var propertyName;\n    for(propertyName in existingModel.properties) {\n      var existingProperty = existingModel.properties[propertyName];\n      var property = {};\n      this.dataType(existingProperty, property);\n      if(existingProperty.description) {\n        property.description = existingProperty.description;\n      }\n      if(existingProperty['enum']) {\n        property['enum'] = existingProperty['enum'];\n      }\n      if(typeof existingProperty.required === 'boolean' && existingProperty.required === true) {\n        _required.push(propertyName);\n      }\n      if(typeof existingProperty.required === 'string' && existingProperty.required === 'true') {\n        _required.push(propertyName);\n      }\n      schema.properties[propertyName] = property;\n    }\n    if(_required.length > 0) {\n      schema.required = _required;\n    } else {\n      schema.required = existingModel.required;\n    }\n    swagger.definitions[name] = schema;\n  }\n};\n\nSwaggerSpecConverter.prototype.extractTag = function(resourcePath) {\n  var pathString = resourcePath || 'default';\n  if(pathString.indexOf('http:') === 0 || pathString.indexOf('https:') === 0) {\n    pathString = pathString.split(['/']);\n    pathString = pathString[pathString.length -1].substring();\n  }\n  if(pathString.endsWith('.json')) {\n    pathString = pathString.substring(0, pathString.length - '.json'.length);\n  }\n  return pathString.replace('/','');\n};\n\nSwaggerSpecConverter.prototype.operations = function(path, resourcePath, obj, resourceLevelAuth, swagger) {\n  if(!Array.isArray(obj)) {\n    return;\n  }\n  var i;\n\n  if(!swagger.paths) {\n    swagger.paths = {};\n  }\n\n  var pathObj = swagger.paths[path] || {};\n  var tag = this.extractTag(resourcePath);\n  swagger.tags = swagger.tags || [];\n  var matched = false;\n  for(i = 0; i < swagger.tags.length; i++) {\n    var tagObject = swagger.tags[i];\n    if(tagObject.name === tag) {\n      matched = true;\n    }\n  }\n  if(!matched) {\n    swagger.tags.push({name: tag});\n  }\n\n  for(i = 0; i < obj.length; i++) {\n    var existingOperation = obj[i];\n    var method = (existingOperation.method || existingOperation.httpMethod).toLowerCase();\n    var operation = {tags: [tag]};\n    var existingAuthorizations = existingOperation.authorizations;\n\n    if(existingAuthorizations && Object.keys(existingAuthorizations).length === 0) {\n      existingAuthorizations = resourceLevelAuth;\n    }\n\n    if(typeof existingAuthorizations !== 'undefined') {\n      var scopesObject;\n      for(var key in existingAuthorizations) {\n        operation.security = operation.security || [];\n        var scopes = existingAuthorizations[key];\n        if(scopes) {\n          var securityScopes = [];\n          for(var j in scopes) {\n            securityScopes.push(scopes[j].scope);\n          }\n          scopesObject = {};\n          scopesObject[key] = securityScopes;\n          operation.security.push(scopesObject);\n        }\n        else {\n          scopesObject = {};\n          scopesObject[key] = [];\n          operation.security.push(scopesObject);\n        }\n      }\n    }\n\n    if(existingOperation.consumes) {\n      operation.consumes = existingOperation.consumes;\n    }\n    else if(swagger.consumes) {\n      operation.consumes = swagger.consumes;\n    }\n    if(existingOperation.produces) {\n      operation.produces = existingOperation.produces;\n    }\n    else if(swagger.produces) {\n      operation.produces = swagger.produces;\n    }\n    if(existingOperation.summary) {\n      operation.summary = existingOperation.summary;\n    }\n    if(existingOperation.notes) {\n      operation.description = existingOperation.notes;\n    }\n    if(existingOperation.nickname) {\n      operation.operationId = existingOperation.nickname;\n    }\n    if(existingOperation.deprecated) {\n      operation.deprecated = existingOperation.deprecated;\n    }\n\n    this.authorizations(existingAuthorizations, swagger);\n    this.parameters(operation, existingOperation.parameters, swagger);\n    this.responseMessages(operation, existingOperation, swagger);\n\n    pathObj[method] = operation;\n  }\n\n  swagger.paths[path] = pathObj;\n};\n\nSwaggerSpecConverter.prototype.responseMessages = function(operation, existingOperation) {\n  if(!_.isObject(existingOperation)) {\n    return;\n  }\n  // build default response from the operation (1.x)\n  var defaultResponse = {};\n  this.dataType(existingOperation, defaultResponse);\n  // TODO: look into the real problem of rendering responses in swagger-ui\n  // ....should reponseType have an implicit schema?\n  if(!defaultResponse.schema && defaultResponse.type) {\n    defaultResponse = {schema: defaultResponse};\n  }\n\n  operation.responses = operation.responses || {};\n\n  // grab from responseMessages (1.2)\n  var has200 = false;\n  if(Array.isArray(existingOperation.responseMessages)) {\n    var i;\n    var existingResponses = existingOperation.responseMessages;\n    for(i = 0; i < existingResponses.length; i++) {\n      var existingResponse = existingResponses[i];\n      var response = { description: existingResponse.message };\n      if(existingResponse.code === 200) {\n        has200 = true;\n      }\n      // Convert responseModel -> schema{$ref: responseModel}\n      if(existingResponse.responseModel) {\n        response.schema = {'$ref': '#/definitions/' + existingResponse.responseModel};\n      }\n      operation.responses['' + existingResponse.code] = response;\n    }\n  }\n\n  if(has200) {\n    operation.responses['default'] = defaultResponse;\n  }\n  else {\n    operation.responses['200'] = defaultResponse;\n  }\n};\n\nSwaggerSpecConverter.prototype.authorizations = function(obj) {\n  // TODO\n  if(!_.isObject(obj)) {\n    return;\n  }\n};\n\nSwaggerSpecConverter.prototype.parameters = function(operation, obj) {\n  if(!Array.isArray(obj)) {\n    return;\n  }\n  var i;\n  for(i = 0; i < obj.length; i++) {\n    var existingParameter = obj[i];\n    var parameter = {};\n    parameter.name = existingParameter.name;\n    parameter.description = existingParameter.description;\n    parameter.required = existingParameter.required;\n    parameter.in = existingParameter.paramType;\n\n    // per #168\n    if(parameter.in === 'body') {\n      parameter.name = 'body';\n    }\n    if(parameter.in === 'form') {\n      parameter.in = 'formData';\n    }\n\n    if(existingParameter.enum) {\n      parameter.enum = existingParameter.enum;\n    }\n\n    if(existingParameter.allowMultiple === true || existingParameter.allowMultiple === 'true') {\n      var innerType = {};\n      this.dataType(existingParameter, innerType);\n      parameter.type = 'array';\n      parameter.items = innerType;\n\n      if(existingParameter.allowableValues) {\n        var av = existingParameter.allowableValues;\n        if(av.valueType === 'LIST') {\n          parameter['enum'] = av.values;\n        }\n      }\n    }\n    else {\n      this.dataType(existingParameter, parameter);\n    }\n    if(typeof existingParameter.defaultValue !== 'undefined') {\n      parameter.default = existingParameter.defaultValue;\n    }\n\n    operation.parameters = operation.parameters || [];\n    operation.parameters.push(parameter);\n  }\n};\n\nSwaggerSpecConverter.prototype.dataType = function(source, target) {\n  if(!_.isObject(source)) {\n    return;\n  }\n\n  if(source.minimum) {\n    target.minimum = source.minimum;\n  }\n  if(source.maximum) {\n    target.maximum = source.maximum;\n  }\n  if (source.format) {\n    target.format = source.format;\n  }\n\n  // default can be 'false'\n  if(typeof source.defaultValue !== 'undefined') {\n    target.default = source.defaultValue;\n  }\n\n  var jsonSchemaType = this.toJsonSchema(source);\n  if(jsonSchemaType) {\n    target = target || {};\n    if(jsonSchemaType.type) {\n      target.type = jsonSchemaType.type;\n    }\n    if(jsonSchemaType.format) {\n      target.format = jsonSchemaType.format;\n    }\n    if(jsonSchemaType.$ref) {\n      target.schema = {$ref: jsonSchemaType.$ref};\n    }\n    if(jsonSchemaType.items) {\n      target.items = jsonSchemaType.items;\n    }\n  }\n};\n\nSwaggerSpecConverter.prototype.toJsonSchema = function(source) {\n  if(!source) {\n    return 'object';\n  }\n  var detectedType = (source.type || source.dataType || source.responseClass || '');\n  var lcType = detectedType.toLowerCase();\n  var format = (source.format || '').toLowerCase();\n\n  if(lcType.indexOf('list[') === 0) {\n    var innerType = detectedType.substring(5, detectedType.length - 1);\n    var jsonType = this.toJsonSchema({type: innerType});\n    return {type: 'array', items: jsonType};\n  } else if(lcType === 'int' || (lcType === 'integer' && format === 'int32')) {\n    {return {type: 'integer', format: 'int32'};}\n  } else if(lcType === 'long' || (lcType === 'integer' && format === 'int64')) {\n    {return {type: 'integer', format: 'int64'};}\n  } else if(lcType === 'integer') {\n    {return {type: 'integer', format: 'int64'};}\n  } else if(lcType === 'float' || (lcType === 'number' && format === 'float')) {\n    {return {type: 'number', format: 'float'};}\n  } else if(lcType === 'double' || (lcType === 'number' && format === 'double')) {\n    {return {type: 'number', format: 'double'};}\n  } else if((lcType === 'string' && format === 'date-time') || (lcType === 'date')) {\n    {return {type: 'string', format: 'date-time'};}\n  } else if(lcType === 'string') {\n    {return {type: 'string'};}\n  } else if(lcType === 'file') {\n    {return {type: 'file'};}\n  } else if(lcType === 'boolean') {\n    {return {type: 'boolean'};}\n  } else if(lcType === 'boolean') {\n    {return {type: 'boolean'};}\n  } else if(lcType === 'array' || lcType === 'list') {\n    if(source.items) {\n      var it = this.toJsonSchema(source.items);\n      return {type: 'array', items: it};\n    }\n    else {\n      return {type: 'array', items: {type: 'object'}};\n    }\n  } else if(source.$ref) {\n    return {$ref: this.modelMap[source.$ref] ? '#/definitions/' + this.modelMap[source.$ref] : source.$ref};\n  } else if(lcType === 'void' || lcType === '') {\n    {return {};}\n  } else if (this.modelMap[source.type]) {\n    // If this a model using `type` instead of `$ref`, that's fine.\n    return {$ref: '#/definitions/' + this.modelMap[source.type]};\n  } else {\n    // Unknown model type or 'object', pass it along.\n    return {type: source.type};\n  }\n};\n\nSwaggerSpecConverter.prototype.resourceListing = function(obj, swagger, opts, callback) {\n  var i;\n  var processedCount = 0;   // jshint ignore:line\n  var self = this;          // jshint ignore:line\n  var expectedCount = obj.apis.length;\n  var _swagger = swagger;   // jshint ignore:line\n  var _opts = {};\n\n  if(opts && opts.requestInterceptor){\n    _opts.requestInterceptor = opts.requestInterceptor;\n  }\n\n  if(opts && opts.responseInterceptor){\n    _opts.responseInterceptor = opts.responseInterceptor;\n  }\n\n  var swaggerRequestHeaders = 'application/json';\n\n  if(opts && opts.swaggerRequestHeaders) {\n    swaggerRequestHeaders = opts.swaggerRequestHeaders;\n  }\n\n  if(expectedCount === 0) {\n    this.finish(callback, swagger);\n  }\n\n  for(i = 0; i < expectedCount; i++) {\n    var api = obj.apis[i];\n    var path = api.path;\n    var absolutePath = this.getAbsolutePath(obj.swaggerVersion, this.docLocation, path);\n\n    if(api.description) {\n      swagger.tags = swagger.tags || [];\n      swagger.tags.push({\n        name : this.extractTag(api.path),\n        description : api.description || ''\n      });\n    }\n    var http = {\n      url: absolutePath,\n      headers: { accept: swaggerRequestHeaders },\n      on: {},\n      method: 'get',\n      timeout: opts.timeout\n    };\n    /* jshint ignore:start */\n    http.on.response = function(data) {\n      processedCount += 1;\n      var obj = data.obj;\n      if(obj) {\n        self.declaration(obj, _swagger);\n      }\n      if(processedCount === expectedCount) {\n        self.finish(callback, _swagger);\n      }\n    };\n    http.on.error = function(data) {\n      console.error(data);\n      processedCount += 1;\n      if(processedCount === expectedCount) {\n        self.finish(callback, _swagger);\n      }\n    };\n    /* jshint ignore:end */\n\n    if(this.clientAuthorizations && typeof this.clientAuthorizations.apply === 'function') {\n      this.clientAuthorizations.apply(http);\n    }\n\n    new SwaggerHttp().execute(http, _opts);\n  }\n};\n\nSwaggerSpecConverter.prototype.getAbsolutePath = function(version, docLocation, path)  {\n  if(version === '1.0') {\n    if(docLocation.endsWith('.json')) {\n      // get root path\n      var pos = docLocation.lastIndexOf('/');\n      if(pos > 0) {\n        docLocation = docLocation.substring(0, pos);\n      }\n    }\n  }\n\n  var location = docLocation;\n  if(path.indexOf('http:') === 0 || path.indexOf('https:') === 0) {\n    location = path;\n  }\n  else {\n    if(docLocation.endsWith('/')) {\n      location = docLocation.substring(0, docLocation.length - 1);\n    }\n    location += path;\n  }\n  location = location.replace('{format}', 'json');\n  return location;\n};\n\nSwaggerSpecConverter.prototype.securityDefinitions = function(obj, swagger) {\n  if(obj.authorizations) {\n    var name;\n    for(name in obj.authorizations) {\n      var isValid = false;\n      var securityDefinition = {\n        vendorExtensions: {}\n      };\n      var definition = obj.authorizations[name];\n      if(definition.type === 'apiKey') {\n        securityDefinition.type = 'apiKey';\n        securityDefinition.in = definition.passAs;\n        securityDefinition.name = definition.keyname || name;\n        isValid = true;\n      }\n      else if(definition.type === 'basicAuth') {\n        securityDefinition.type = 'basicAuth';\n        isValid = true;\n      }\n      else if(definition.type === 'oauth2') {\n        var existingScopes = definition.scopes || [];\n        var scopes = {};\n        var i;\n        for(i in existingScopes) {\n          var scope = existingScopes[i];\n          scopes[scope.scope] = scope.description;\n        }\n        securityDefinition.type = 'oauth2';\n        if(i > 0) {\n          securityDefinition.scopes = scopes;\n        }\n        if(definition.grantTypes) {\n          if(definition.grantTypes.implicit) {\n            var implicit = definition.grantTypes.implicit;\n            securityDefinition.flow = 'implicit';\n            securityDefinition.authorizationUrl = implicit.loginEndpoint;\n            isValid = true;\n          }\n          /* jshint ignore:start */\n          if(definition.grantTypes['authorization_code']) {\n            if(!securityDefinition.flow) {\n              // cannot set if flow is already defined\n              var authCode = definition.grantTypes['authorization_code'];\n              securityDefinition.flow = 'accessCode';\n              securityDefinition.authorizationUrl = authCode.tokenRequestEndpoint.url;\n              securityDefinition.tokenUrl = authCode.tokenEndpoint.url;\n              isValid = true;\n            }\n          }\n          /* jshint ignore:end */\n        }\n      }\n      if(isValid) {\n        swagger.securityDefinitions = swagger.securityDefinitions || {};\n        swagger.securityDefinitions[name] = securityDefinition;\n      }\n    }\n  }\n};\n\nSwaggerSpecConverter.prototype.apiInfo = function(obj, swagger) {\n  // info section\n  if(obj.info) {\n    var info = obj.info;\n    swagger.info = {};\n\n    if(info.contact) {\n      swagger.info.contact = {};\n      swagger.info.contact.email = info.contact;\n    }\n    if(info.description) {\n      swagger.info.description = info.description;\n    }\n    if(info.title) {\n      swagger.info.title = info.title;\n    }\n    if(info.termsOfServiceUrl) {\n      swagger.info.termsOfService = info.termsOfServiceUrl;\n    }\n    if(info.license || info.licenseUrl) {\n      swagger.license = {};\n      if(info.license) {\n        swagger.license.name = info.license;\n      }\n      if(info.licenseUrl) {\n        swagger.license.url = info.licenseUrl;\n      }\n    }\n  }\n  else {\n    this.warnings.push('missing info section');\n  }\n};\n\nSwaggerSpecConverter.prototype.finish = function (callback, obj) {\n  callback(obj);\n};\n","'use strict';\n\nvar log = require('../helpers').log;\nvar _ = {\n  isPlainObject: require('lodash-compat/lang/isPlainObject'),\n  isString: require('lodash-compat/lang/isString'),\n};\n\nvar SchemaMarkup = require('../schema-markup.js');\nvar jsyaml = require('js-yaml');\n\nvar Model = module.exports = function (name, definition, models, modelPropertyMacro) {\n  this.definition = definition || {};\n  this.isArray = definition.type === 'array';\n  this.models = models || {};\n  this.name = name || definition.title || 'Inline Model';\n  this.modelPropertyMacro = modelPropertyMacro || function (property) {\n    return property.default;\n  };\n\n  return this;\n};\n\n// Note!  This function will be removed in 2.2.x!\nModel.prototype.createJSONSample = Model.prototype.getSampleValue = function (modelsToIgnore) {\n  modelsToIgnore = modelsToIgnore || {};\n\n  modelsToIgnore[this.name] = this;\n\n  // Response support\n  if (this.examples && _.isPlainObject(this.examples) && this.examples['application/json']) {\n    this.definition.example = this.examples['application/json'];\n\n    if (_.isString(this.definition.example)) {\n      this.definition.example = jsyaml.safeLoad(this.definition.example);\n    }\n  } else if (!this.definition.example) {\n    this.definition.example = this.examples;\n  }\n\n  return SchemaMarkup.schemaToJSON(this.definition, this.models, modelsToIgnore, this.modelPropertyMacro);\n};\n\nModel.prototype.getMockSignature = function () {\n  return SchemaMarkup.schemaToHTML(this.name, this.definition, this.models, this.modelPropertyMacro);\n};\n","'use strict';\n\nvar _ = {\n  cloneDeep: require('lodash-compat/lang/cloneDeep'),\n  isUndefined: require('lodash-compat/lang/isUndefined'),\n  isEmpty: require('lodash-compat/lang/isEmpty'),\n  isObject: require('lodash-compat/lang/isObject')\n};\nvar helpers = require('../helpers');\nvar Model = require('./model');\nvar SwaggerHttp = require('../http');\nvar Q = require('q');\n\nvar Operation = module.exports = function (parent, scheme, operationId, httpMethod, path, args, definitions, models, clientAuthorizations) {\n  var errors = [];\n\n  parent = parent || {};\n  args = args || {};\n\n  if(parent && parent.options) {\n    this.client = parent.options.client || null;\n    this.requestInterceptor = parent.options.requestInterceptor || null;\n    this.responseInterceptor = parent.options.responseInterceptor || null;\n    this.requestAgent = parent.options.requestAgent;\n  }\n  this.authorizations = args.security;\n  this.basePath = parent.basePath || '/';\n  this.clientAuthorizations = clientAuthorizations;\n  this.consumes = args.consumes || parent.consumes || ['application/json'];\n  this.produces = args.produces || parent.produces || ['application/json'];\n  this.deprecated = args.deprecated;\n  this.description = args.description;\n  this.host = parent.host;\n  this.method = (httpMethod || errors.push('Operation ' + operationId + ' is missing method.'));\n  this.models = models || {};\n  this.nickname = (operationId || errors.push('Operations must have a nickname.'));\n  this.operation = args;\n  this.operations = {};\n  this.parameters = args !== null ? (args.parameters || []) : {};\n  this.parent = parent;\n  this.path = (path || errors.push('Operation ' + this.nickname + ' is missing path.'));\n  this.responses = (args.responses || {});\n  this.scheme = scheme || parent.scheme || 'http';\n  this.schemes = args.schemes || parent.schemes;\n  this.security = args.security || parent.security;\n  this.summary = args.summary || '';\n  this.timeout = parent.timeout;\n  this.type = null;\n  this.useJQuery = parent.useJQuery;\n  this.jqueryAjaxCache = parent.jqueryAjaxCache;\n  this.enableCookies = parent.enableCookies;\n\n  var key;\n\n  if(!this.host) {\n    if(typeof window !== 'undefined') {\n      this.host = window.location.host;\n    }\n    else {\n      this.host = 'localhost';\n    }\n  }\n  this.parameterMacro = parent.parameterMacro || function (operation, parameter) {\n    return parameter.default;\n  };\n\n  this.inlineModels = [];\n\n  if(this.basePath !== '/' && this.basePath.slice(-1) === '/') {\n    this.basePath = this.basePath.slice(0, -1);\n  }\n\n  if (typeof this.deprecated === 'string') {\n    switch(this.deprecated.toLowerCase()) {\n      case 'true': case 'yes': case '1': {\n        this.deprecated = true;\n        break;\n      }\n\n      case 'false': case 'no': case '0': case null: {\n        this.deprecated = false;\n        break;\n      }\n\n      default: this.deprecated = Boolean(this.deprecated);\n    }\n  }\n\n  var i, model;\n\n  if (definitions) {\n    // add to global models\n    for (key in definitions) {\n      model = new Model(key, definitions[key], this.models, parent.modelPropertyMacro);\n\n      if (model) {\n        this.models[key] = model;\n      }\n    }\n  }\n  else {\n    definitions = {};\n  }\n\n  for (i = 0; i < this.parameters.length; i++) {\n    var d, param = this.parameters[i];\n\n    // Allow macro to set the default value\n    param.default = this.parameterMacro(this, param);\n\n    if (param.type === 'array') {\n      param.isList = true;\n      param.allowMultiple = true;\n    }\n\n    var innerType = this.getType(param);\n\n    if (innerType && innerType.toString().toLowerCase() === 'boolean') {\n      param.allowableValues = {};\n      param.isList = true;\n      param['enum'] = [true, false]; // use actual primitives\n    }\n\n    for(key in param) {\n      helpers.extractExtensions(key, param);\n    }\n    if(typeof param['x-example'] !== 'undefined') {\n      d = param['x-example'];\n      param.default = d;\n    }\n    if(param['x-examples']) {\n      d = param['x-examples'].default;\n      if(typeof d !== 'undefined') {\n        param.default = d;\n      }\n    }\n\n    var enumValues = param['enum'] || (param.items && param.items['enum']);\n\n    if (typeof enumValues !== 'undefined') {\n      var id;\n\n      param.allowableValues = {};\n      param.allowableValues.values = [];\n      param.allowableValues.descriptiveValues = [];\n\n      for (id = 0; id < enumValues.length; id++) {\n        var value = enumValues[id];\n        var isDefault = (value === param.default || value+'' === param.default);\n\n        param.allowableValues.values.push(value);\n        // Always have string for descriptive values....\n        param.allowableValues.descriptiveValues.push({value : value+'', isDefault: isDefault});\n      }\n    }\n\n    if (param.type === 'array') {\n      innerType = [innerType];\n\n      if (typeof param.allowableValues === 'undefined') {\n        // can't show as a list if no values to select from\n        delete param.isList;\n        delete param.allowMultiple;\n      }\n    }\n\n    param.modelSignature = {type: innerType, definitions: this.models};\n    param.signature = this.getModelSignature(innerType, this.models).toString();\n    param.sampleJSON = this.getModelSampleJSON(innerType, this.models);\n    param.responseClassSignature = param.signature;\n  }\n\n  var keyname, defaultResponseCode, response, responses = this.responses;\n\n  if (responses['200']) {\n    response = responses['200'];\n    defaultResponseCode = '200';\n  } else if (responses['201']) {\n    response = responses['201'];\n    defaultResponseCode = '201';\n  } else if (responses['202']) {\n    response = responses['202'];\n    defaultResponseCode = '202';\n  } else if (responses['203']) {\n    response = responses['203'];\n    defaultResponseCode = '203';\n  } else if (responses['204']) {\n    response = responses['204'];\n    defaultResponseCode = '204';\n  } else if (responses['205']) {\n    response = responses['205'];\n    defaultResponseCode = '205';\n  } else if (responses['206']) {\n    response = responses['206'];\n    defaultResponseCode = '206';\n  } else if (responses['default']) {\n    response = responses['default'];\n    defaultResponseCode = 'default';\n  }\n\n  for(keyname in responses) {\n    helpers.extractExtensions(keyname, responses);\n    if(typeof keyname === 'string' && keyname.indexOf('x-') === -1) {\n      var responseObject = responses[keyname];\n      if(typeof responseObject === 'object' && typeof responseObject.headers === 'object') {\n        var headers = responseObject.headers;\n        for(var headerName in headers) {\n          var header = headers[headerName];\n          if(typeof header === 'object') {\n            for(var headerKey in header) {\n              helpers.extractExtensions(headerKey, header);\n            }\n          }\n        }\n      }\n    }\n  }\n\n  if (response) {\n    for(keyname in response) {\n      helpers.extractExtensions(keyname, response);\n    }\n  }\n\n  if (response && response.schema) {\n    var resolvedModel = this.resolveModel(response.schema, definitions);\n    var successResponse;\n\n    delete responses[defaultResponseCode];\n\n    if (resolvedModel) {\n      this.successResponse = {};\n      successResponse = this.successResponse[defaultResponseCode] = resolvedModel;\n    } else if (!response.schema.type || response.schema.type === 'object' || response.schema.type === 'array') {\n      // Inline model\n      this.successResponse = {};\n      successResponse = this.successResponse[defaultResponseCode] = new Model(undefined, response.schema || {}, this.models, parent.modelPropertyMacro);\n    } else {\n      // Primitive\n      this.successResponse = {};\n      successResponse = this.successResponse[defaultResponseCode] = response.schema;\n    }\n\n    if (successResponse) {\n      successResponse.vendorExtensions = response.vendorExtensions;\n      // Attach response properties\n      if (response.description) {\n        successResponse.description = response.description;\n      }\n\n      if (response.examples) {\n        successResponse.examples = response.examples;\n      }\n\n      if (response.headers) {\n        successResponse.headers = response.headers;\n      }\n    }\n\n    this.type = response;\n  }\n\n  if (errors.length > 0) {\n    if (this.resource && this.resource.api && this.resource.api.fail) {\n      this.resource.api.fail(errors);\n    }\n  }\n\n  return this;\n};\n\nOperation.prototype.isDefaultArrayItemValue = function(value, param) {\n  if (param.default && Array.isArray(param.default)) {\n    return param.default.indexOf(value) !== -1;\n  }\n  return value === param.default;\n};\n\nOperation.prototype.getType = function (param) {\n  var type = param.type;\n  var format = param.format;\n  var isArray = false;\n  var str;\n\n  if (type === 'integer' && format === 'int32') {\n    str = 'integer';\n  } else if (type === 'integer' && format === 'int64') {\n    str = 'long';\n  } else if (type === 'integer') {\n    str = 'integer';\n  } else if (type === 'string') {\n    if (format === 'date-time') {\n      str = 'date-time';\n    } else if (format === 'date') {\n      str = 'date';\n    } else {\n      str = 'string';\n    }\n  } else if (type === 'number' && format === 'float') {\n    str = 'float';\n  } else if (type === 'number' && format === 'double') {\n    str = 'double';\n  } else if (type === 'number') {\n    str = 'double';\n  } else if (type === 'boolean') {\n    str = 'boolean';\n  } else if (type === 'array') {\n    isArray = true;\n\n    if (param.items) {\n      str = this.getType(param.items);\n    }\n  } else if (type === 'file') {\n    str = 'file';\n  }\n\n  if (param.$ref) {\n    str = helpers.simpleRef(param.$ref);\n  }\n\n  var schema = param.schema;\n\n  if (schema) {\n    var ref = schema.$ref;\n\n    if (ref) {\n      ref = helpers.simpleRef(ref);\n\n      if (isArray) {\n        return [ ref ];\n      } else {\n        return ref;\n      }\n    } else {\n      // If inline schema, we add it our interal hash -> which gives us it's ID (int)\n      if(schema.type === 'object') {\n        return this.addInlineModel(schema);\n      }\n      return this.getType(schema);\n    }\n  }\n  if (isArray) {\n    return [ str ];\n  } else {\n    return str;\n  }\n};\n\n/**\n * adds an inline schema (model) to a hash, where we can ref it later\n * @param {object} schema a schema\n * @return {number} the ID of the schema being added, or null\n **/\nOperation.prototype.addInlineModel = function (schema) {\n  var len = this.inlineModels.length;\n  var model = this.resolveModel(schema, {});\n  if(model) {\n    this.inlineModels.push(model);\n    return 'Inline Model '+len; // return string ref of the inline model (used with #getInlineModel)\n  }\n  return null; // report errors?\n};\n\n/**\n * gets the internal ref to an inline model\n * @param {string} inline_str a string reference to an inline model\n * @return {Model} the model being referenced. Or null\n **/\nOperation.prototype.getInlineModel = function(inlineStr) {\n  if(/^Inline Model \\d+$/.test(inlineStr)) {\n    var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); //\n    var model = this.inlineModels[id];\n    return model;\n  }\n  // I'm returning null here, should I rather throw an error?\n  return null;\n};\n\nOperation.prototype.resolveModel = function (schema, definitions) {\n  if (typeof schema.$ref !== 'undefined') {\n    var ref = schema.$ref;\n\n    if (ref.indexOf('#/definitions/') === 0) {\n      ref = ref.substring('#/definitions/'.length);\n    }\n\n    if (definitions[ref]) {\n      return new Model(ref, definitions[ref], this.models, this.parent.modelPropertyMacro);\n    }\n  // schema must at least be an object to get resolved to an inline Model\n  } else if (schema && typeof schema === 'object' &&\n            (schema.type === 'object' || _.isUndefined(schema.type))) {\n    return new Model(undefined, schema, this.models, this.parent.modelPropertyMacro);\n  }\n\n  return null;\n};\n\nOperation.prototype.help = function (dontPrint) {\n  var out = this.nickname + ': ' + this.summary + '\\n';\n\n  for (var i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n    var typeInfo = param.signature;\n\n    out += '\\n  * ' + param.name + ' (' + typeInfo + '): ' + param.description;\n  }\n\n  if (typeof dontPrint === 'undefined') {\n    helpers.log(out);\n  }\n\n  return out;\n};\n\nOperation.prototype.getModelSignature = function (type, definitions) {\n  var isPrimitive, listType;\n\n  if (type instanceof Array) {\n    listType = true;\n    type = type[0];\n  }\n\n  // Convert undefined to string of 'undefined'\n  if (typeof type === 'undefined') {\n    type = 'undefined';\n    isPrimitive = true;\n\n  } else if (definitions[type]){\n    // a model def exists?\n    type = definitions[type]; /* Model */\n    isPrimitive = false;\n\n  } else if (this.getInlineModel(type)) {\n    type = this.getInlineModel(type); /* Model */\n    isPrimitive = false;\n\n  } else {\n    // We default to primitive\n    isPrimitive = true;\n  }\n\n  if (isPrimitive) {\n    if (listType) {\n      return 'Array[' + type + ']';\n    } else {\n      return type.toString();\n    }\n  } else {\n    if (listType) {\n      return 'Array[' + type.getMockSignature() + ']';\n    } else {\n      return type.getMockSignature();\n    }\n  }\n};\n\nOperation.prototype.supportHeaderParams = function () {\n  return true;\n};\n\nOperation.prototype.supportedSubmitMethods = function () {\n  return this.parent.supportedSubmitMethods;\n};\n\nOperation.prototype.getHeaderParams = function (args) {\n  var headers = this.setContentTypes(args, {});\n  var headerParamsByLowerCase = {};\n\n  for (var i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n\n    if (param.in === 'header') {\n      headerParamsByLowerCase[param.name.toLowerCase()] = param;\n    }\n  }\n\n  for (var arg in args) {\n    var headerParam = headerParamsByLowerCase[arg.toLowerCase()];\n    if (typeof headerParam !== 'undefined') {\n      var value = args[arg];\n\n      if (Array.isArray(value)) {\n        value = value.toString();\n      }\n\n      headers[headerParam.name] = value;\n    }\n  }\n\n  return headers;\n};\n\nOperation.prototype.urlify = function (args, maskPasswords) {\n  var formParams = {};\n  var requestUrl = this.path.replace(/#.*/, ''); // remove URL fragment\n  var querystring = ''; // grab params from the args, build the querystring along the way\n\n  for (var i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n\n    if (typeof args[param.name] !== 'undefined') {\n      var isPassword;\n      if(param.type === 'string' && param.format === 'password' && maskPasswords) {\n        isPassword = true;\n      }\n\n      if (param.in === 'path') {\n        var reg = new RegExp('\\{' + param.name + '\\}', 'gi');\n        var value = args[param.name];\n\n        if (Array.isArray(value)) {\n          value = this.encodePathCollection(param.collectionFormat, param.name, value, isPassword);\n        } else {\n          value = this.encodePathParam(value, isPassword);\n        }\n\n        requestUrl = requestUrl.replace(reg, value);\n      } else if (param.in === 'query' && typeof args[param.name] !== 'undefined') {\n        if (querystring === '' && requestUrl.indexOf('?') < 0) {\n          querystring += '?';\n        } else {\n          querystring += '&';\n        }\n\n        if (typeof param.collectionFormat !== 'undefined') {\n          var qp = args[param.name];\n\n          if (Array.isArray(qp)) {\n            querystring += this.encodeQueryCollection(param.collectionFormat, param.name, qp, isPassword);\n          } else {\n            querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name], isPassword);\n          }\n        } else {\n          querystring += this.encodeQueryKey(param.name) + '=' + this.encodeQueryParam(args[param.name], isPassword);\n        }\n      } else if (param.in === 'formData') {\n        formParams[param.name] = args[param.name];\n      }\n    }\n  }\n  var url = this.scheme + '://' + this.host;\n\n  if (this.basePath !== '/') {\n    url += this.basePath;\n  }\n  return url + requestUrl + querystring;\n};\n\nOperation.prototype.getMissingParams = function (args) {\n  var missingParams = []; // check required params, track the ones that are missing\n  var i;\n\n  for (i = 0; i < this.parameters.length; i++) {\n    var param = this.parameters[i];\n\n    if (param.required === true) {\n      if (typeof args[param.name] === 'undefined') {\n        missingParams = param.name;\n      }\n    }\n  }\n\n  return missingParams;\n};\n\nOperation.prototype.getBody = function (headers, args, opts) {\n  var formParams = {}, hasFormParams, param, body, key, value, hasBody = false;\n\n  // look at each param and put form params in an object\n  for (var i = 0; i < this.parameters.length; i++) {\n    param = this.parameters[i];\n    if (typeof args[param.name] !== 'undefined') {\n      var isPassword;\n      if(param.type === 'string' && param.format === 'password') {\n        isPassword = 'password';\n      }\n      if (param.in === 'body') {\n        body = args[param.name];\n      } else if (param.in === 'formData') {\n        formParams[param.name] = {\n          param: param,\n          value: args[param.name],\n          password: isPassword\n        };\n        hasFormParams = true;\n      }\n    }\n    else {\n      if(param.in === 'body') {\n        hasBody = true;\n      }\n    }\n  }\n\n  // if body is null and hasBody is true, AND a JSON body is requested, send empty {}\n  if(hasBody && typeof body === 'undefined') {\n    var contentType = headers['Content-Type'];\n    if(contentType && contentType.indexOf('application/json') === 0) {\n      body = '{}';\n    }\n  }\n\n  var isMultiPart = false;\n  if(headers['Content-Type'] && headers['Content-Type'].indexOf('multipart/form-data') >= 0) {\n    isMultiPart = true;\n  }\n\n  // handle form params\n  if (hasFormParams && !isMultiPart) {\n    var encoded = '';\n\n    for (key in formParams) {\n      param = formParams[key].param;\n      value = formParams[key].value;\n      var password;\n\n      if(opts && opts.maskPasswords) {\n        password = formParams[key].password;\n      }\n\n      if (typeof value !== 'undefined') {\n        if (Array.isArray(value)) {\n          if (encoded !== '') {\n            encoded += '&';\n          }\n          encoded += this.encodeQueryCollection(param.collectionFormat, key, value, password);\n        }\n        else {\n          if (encoded !== '') {\n            encoded += '&';\n          }\n\n          encoded += encodeURIComponent(key) + '=' + mask(encodeURIComponent(value), password);\n        }\n      }\n    }\n\n    body = encoded;\n  } else if (isMultiPart) {\n    var bodyParam;\n    if (typeof FormData === 'function') {\n      bodyParam = new FormData();\n\n      bodyParam.type = 'formData';\n\n      for (key in formParams) {\n        param = formParams[key].param;\n        value = args[key];\n\n        if (typeof value !== 'undefined') {\n          if({}.toString.apply(value) === '[object File]') {\n            bodyParam.append(key, value);\n          }\n          else if (value.type === 'file' && value.value) {\n            bodyParam.append(key, value.value);\n          } else {\n            if (Array.isArray(value)) {\n              if(param.collectionFormat === 'multi') {\n                bodyParam.delete(key);\n                for(var v in value) {\n                  bodyParam.append(key, value[v]);\n                }\n              }\n              else {\n                bodyParam.append(key, this.encodeQueryCollection(param.collectionFormat, key, value).split('=').slice(1).join('='));\n              }\n            }\n            else {\n              bodyParam.append(key, value);\n            }\n          }\n        }\n      }\n      body = bodyParam;\n    }\n    else {\n      bodyParam = {};\n      for (key in formParams) {\n        value = args[key];\n        if (Array.isArray(value)) {\n          var delimeter;\n          var format = param.collectionFormat || 'multi';\n          if(format === 'ssv') {\n            delimeter = ' ';\n          }\n          else if(format === 'pipes') {\n            delimeter = '|';\n          }\n          else if(format === 'tsv') {\n            delimeter = '\\t';\n          }\n          else if(format === 'multi') {\n            bodyParam[key] = value;\n            break;\n          }\n          else {\n            delimeter = ',';\n          }\n          var data;\n          value.forEach(function(v) {\n            if(data) {\n              data += delimeter;\n            }\n            else {\n              data = '';\n            }\n            data += v;\n          });\n          bodyParam[key] = data;\n        }\n        else {\n          bodyParam[key] = value;\n        }\n      }\n      body = bodyParam;\n    }\n    headers['Content-Type'] = 'multipart/form-data';\n  }\n\n  return body;\n};\n\n/**\n * gets sample response for a single operation\n **/\nOperation.prototype.getModelSampleJSON = function (type, models) {\n  var listType, sampleJson, innerType;\n  models = models || {};\n\n  listType = (type instanceof Array);\n  innerType = listType ? type[0] : type;\n\n  if(models[innerType]) {\n    sampleJson = models[innerType].createJSONSample();\n  } else if (this.getInlineModel(innerType)){\n    sampleJson = this.getInlineModel(innerType).createJSONSample(); // may return null, if type isn't correct\n  }\n\n\n  if (sampleJson) {\n    sampleJson = listType ? [sampleJson] : sampleJson;\n\n    if (typeof sampleJson === 'string') {\n      return sampleJson;\n    } else if (_.isObject(sampleJson)) {\n      var t = sampleJson;\n\n      if (sampleJson instanceof Array && sampleJson.length > 0) {\n        t = sampleJson[0];\n      }\n\n      if (t.nodeName && typeof t === 'Node') {\n        var xmlString = new XMLSerializer().serializeToString(t);\n\n        return this.formatXml(xmlString);\n      } else {\n        return JSON.stringify(sampleJson, null, 2);\n      }\n    } else {\n      return sampleJson;\n    }\n  }\n};\n\n/**\n * legacy binding\n **/\nOperation.prototype.do = function (args, opts, callback, error, parent) {\n  return this.execute(args, opts, callback, error, parent);\n};\n\n/**\n * executes an operation\n **/\nOperation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {\n  var args = arg1 || {};\n  var opts = {}, success, error, deferred, timeout;\n\n  if (_.isObject(arg2)) {\n    opts = arg2;\n    success = arg3;\n    error = arg4;\n  }\n\n  timeout = typeof opts.timeout !== 'undefined' ? opts.timeout : this.timeout;\n\n  if(this.client) {\n    opts.client = this.client;\n  }\n\n  if(this.requestAgent) {\n    opts.requestAgent = this.requestAgent;\n  }\n\n  // add the request interceptor from parent, if none sent from client\n  if(!opts.requestInterceptor && this.requestInterceptor ) {\n    opts.requestInterceptor = this.requestInterceptor ;\n  }\n\n  if(!opts.responseInterceptor && this.responseInterceptor) {\n    opts.responseInterceptor = this.responseInterceptor;\n  }\n\n  if (typeof arg2 === 'function') {\n    success = arg2;\n    error = arg3;\n  }\n\n  if (this.parent.usePromise) {\n    deferred = Q.defer();\n  } else {\n    success = (success || this.parent.defaultSuccessCallback || helpers.log);\n    error = (error || this.parent.defaultErrorCallback || helpers.log);\n  }\n\n  if (typeof opts.useJQuery === 'undefined') {\n    opts.useJQuery = this.useJQuery;\n  }\n\n  if (typeof opts.jqueryAjaxCache === 'undefined') {\n    opts.jqueryAjaxCache = this.jqueryAjaxCache;\n  }\n\n  if (typeof opts.enableCookies === 'undefined') {\n    opts.enableCookies = this.enableCookies;\n  }\n\n  var missingParams = this.getMissingParams(args);\n\n  if (missingParams.length > 0) {\n    var message = 'missing required params: ' + missingParams;\n\n    helpers.fail(message);\n\n    if (this.parent.usePromise) {\n      deferred.reject(message);\n      return deferred.promise;\n    } else {\n      error(message, parent);\n      return {};\n    }\n  }\n\n  var allHeaders = this.getHeaderParams(args);\n  var contentTypeHeaders = this.setContentTypes(args, opts);\n  var headers = {}, attrname;\n\n  for (attrname in allHeaders) { headers[attrname] = allHeaders[attrname]; }\n  for (attrname in contentTypeHeaders) { headers[attrname] = contentTypeHeaders[attrname]; }\n\n  var body = this.getBody(contentTypeHeaders, args, opts);\n  var url = this.urlify(args, opts.maskPasswords);\n\n  if(url.indexOf('.{format}') > 0) {\n    if(headers) {\n      var format = headers.Accept || headers.accept;\n      if(format && format.indexOf('json') > 0) {\n        url = url.replace('.{format}', '.json');\n      }\n      else if(format && format.indexOf('xml') > 0) {\n        url = url.replace('.{format}', '.xml');\n      }\n    }\n  }\n\n  var obj = {\n    url: url,\n    method: this.method.toUpperCase(),\n    body: body,\n    enableCookies: opts.enableCookies,\n    useJQuery: opts.useJQuery,\n    jqueryAjaxCache: opts.jqueryAjaxCache,\n    deferred: deferred,\n    headers: headers,\n    clientAuthorizations: opts.clientAuthorizations,\n    operation: this,\n    connectionAgent: this.connectionAgent,\n    on: {\n      response: function (response) {\n        if (deferred) {\n          deferred.resolve(response);\n          return deferred.promise;\n        } else {\n          return success(response, parent);\n        }\n      },\n      error: function (response) {\n        if (deferred) {\n          deferred.reject(response);\n          return deferred.promise;\n        } else {\n          return error(response, parent);\n        }\n      }\n    }\n  };\n\n  if (timeout) {\n    obj.timeout = timeout;\n  }\n\n  this.clientAuthorizations.apply(obj, this.operation.security);\n  if (opts.mock === true) {\n    return obj;\n  } else {\n    return new SwaggerHttp().execute(obj, opts);\n  }\n};\n\nfunction itemByPriority(col, itemPriority) {\n\n  // No priorities? return first...\n  if(_.isEmpty(itemPriority)) {\n    return col[0];\n  }\n\n  for (var i = 0, len = itemPriority.length; i < len; i++) {\n    if(col.indexOf(itemPriority[i]) > -1) {\n      return itemPriority[i];\n    }\n  }\n\n  // Otherwise return first\n  return col[0];\n}\n\nOperation.prototype.setContentTypes = function (args, opts) {\n  // default type\n  var allDefinedParams = this.parameters;\n  var body;\n  var consumes = args.parameterContentType || itemByPriority(this.consumes, ['application/json', 'application/yaml']);\n  var accepts = opts.responseContentType || itemByPriority(this.produces, ['application/json', 'application/yaml']);\n  var definedFileParams = [];\n  var definedFormParams = [];\n  var headers = {};\n  var i;\n\n  // get params from the operation and set them in definedFileParams, definedFormParams, headers\n  for (i = 0; i < allDefinedParams.length; i++) {\n    var param = allDefinedParams[i];\n\n    if (param.in === 'formData') {\n      if (param.type === 'file') {\n        definedFileParams.push(param);\n      } else {\n        definedFormParams.push(param);\n      }\n    } else if (param.in === 'header' && opts) {\n      var key = param.name;\n      var headerValue = opts[param.name];\n\n      if (typeof opts[param.name] !== 'undefined') {\n        headers[key] = headerValue;\n      }\n    } else if (param.in === 'body' && typeof args[param.name] !== 'undefined') {\n      body = args[param.name];\n    }\n  }\n\n  // if there's a body, need to set the consumes header via requestContentType\n  var hasBody = body || definedFileParams.length || definedFormParams.length;\n  if (this.method === 'post' || this.method === 'put' || this.method === 'patch' ||\n      ((this.method === 'delete' || this.method === 'get') && hasBody)) {\n    if (opts.requestContentType) {\n      consumes = opts.requestContentType;\n    }\n    // if any form params, content type must be set\n    if (definedFormParams.length > 0) {\n      consumes = undefined;\n      if (opts.requestContentType) {             // override if set\n        consumes = opts.requestContentType;\n      } else if (definedFileParams.length > 0) { // if a file, must be multipart/form-data\n        consumes = 'multipart/form-data';\n      } else {\n        if (this.consumes && this.consumes.length > 0) {\n          // use the consumes setting\n          for(var c in this.consumes) {\n            var chk = this.consumes[c];\n            if(chk.indexOf('application/x-www-form-urlencoded') === 0 || chk.indexOf('multipart/form-data') === 0) {\n              consumes = chk;\n            }\n          }\n        }\n      }\n      if(typeof consumes === 'undefined') {\n        // default to x-www-from-urlencoded\n        consumes = 'application/x-www-form-urlencoded';\n      }\n    }\n  }\n  else {\n    consumes = null;\n  }\n\n  if (consumes && this.consumes) {\n    if (this.consumes.indexOf(consumes) === -1) {\n      helpers.log('server doesn\\'t consume ' + consumes + ', try ' + JSON.stringify(this.consumes));\n    }\n  }\n\n  if (!this.matchesAccept(accepts)) {\n    helpers.log('server can\\'t produce ' + accepts);\n  }\n\n  if ((consumes && body !== '') || (consumes === 'application/x-www-form-urlencoded')) {\n    headers['Content-Type'] = consumes;\n  }\n  else if(this.consumes && this.consumes.length > 0 && this.consumes[0] === 'application/x-www-form-urlencoded') {\n    headers['Content-Type'] = this.consumes[0];\n  }\n\n  if (accepts) {\n    headers.Accept = accepts;\n  }\n\n  return headers;\n};\n\n/**\n * Returns true if the request accepts header matches anything in this.produces.\n *  If this.produces contains * / *, ignore the accept header.\n * @param {string=} accepts The client request accept header.\n * @return {boolean}\n */\nOperation.prototype.matchesAccept = function(accepts) {\n  // no accepts or produces, no problem!\n  if (!accepts || !this.produces) {\n    return true;\n  }\n  return this.produces.indexOf(accepts) !== -1 || this.produces.indexOf('*/*') !== -1;\n};\n\nOperation.prototype.asCurl = function (args1, args2) {\n  var opts = {mock: true, maskPasswords: true};\n  if (typeof args2 === 'object') {\n    for (var argKey in args2) {\n      opts[argKey] = args2[argKey];\n    }\n  }\n  var obj = this.execute(args1, opts);\n\n  this.clientAuthorizations.apply(obj, this.operation.security);\n\n  var results = [];\n\n  results.push('-X ' + this.method.toUpperCase());\n\n  if (typeof obj.headers !== 'undefined') {\n    var key;\n\n    for (key in obj.headers) {\n      var value = obj.headers[key];\n      if(typeof value === 'string'){\n        value = value.replace(/\\'/g, '\\\\u0027');\n      }\n      results.push('--header \\'' + key + ': ' + value + '\\'');\n    }\n  }\n  var isFormData = false;\n  var isMultipart = false;\n\n  var type = obj.headers['Content-Type'];\n  if(type && type.indexOf('application/x-www-form-urlencoded') === 0) {\n    isFormData = true;\n  }\n  else if (type && type.indexOf('multipart/form-data') === 0) {\n    isFormData = true;\n    isMultipart = true;\n  }\n\n  if (obj.body) {\n    var body;\n    if (_.isObject(obj.body)) {\n      if(isMultipart) {\n        isMultipart = true;\n        // add the form data\n        for(var i = 0; i < this.parameters.length; i++) {\n          var parameter = this.parameters[i];\n          if(parameter.in === 'formData') {\n            if (!body) {\n              body = '';\n            }\n\n            var paramValue;\n            if(typeof FormData === 'function' && obj.body instanceof FormData) {\n              paramValue = obj.body.getAll(parameter.name);\n            }\n            else {\n              paramValue = obj.body[parameter.name];\n            }\n            if (paramValue) {\n              if (parameter.type === 'file') {\n                if(paramValue.name) {\n                  body += '-F ' + parameter.name + '=@\"' + paramValue.name + '\" ';\n                }\n              }\n              else {\n                if (Array.isArray(paramValue)) {\n                  if(parameter.collectionFormat === 'multi') {\n                    for(var v in paramValue) {\n                      body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + mask(paramValue[v], parameter.format) + ' ';\n                    }\n                  }\n                  else {\n                    body += '-F ' + this.encodeQueryCollection(parameter.collectionFormat, parameter.name, mask(paramValue, parameter.format)) + ' ';\n                  }\n                } else {\n                  body += '-F ' + this.encodeQueryKey(parameter.name) + '=' + mask(paramValue, parameter.format) + ' ';\n                }\n              }\n            }\n          }\n        }\n      }\n      if(!body) {\n        body = JSON.stringify(obj.body);\n      }\n    } else {\n      body = obj.body;\n    }\n    // escape @ => %40, ' => %27\n    body = body.replace(/\\'/g, '%27').replace(/\\n/g, ' \\\\ \\n ');\n\n    if(!isFormData) {\n      // escape & => %26\n      body = body.replace(/&/g, '%26');\n    }\n    if(isMultipart) {\n      results.push(body);\n    }\n    else {\n      results.push('-d \\'' + body.replace(/@/g, '%40') + '\\'');\n    }\n  }\n\n  return 'curl ' + (results.join(' ')) + ' \\'' + obj.url + '\\'';\n};\n\nOperation.prototype.encodePathCollection = function (type, name, value, maskPasswords) {\n  var encoded = '';\n  var i;\n  var separator = '';\n\n  if (type === 'ssv') {\n    separator = '%20';\n  } else if (type === 'tsv') {\n    separator = '%09';\n  } else if (type === 'pipes') {\n    separator = '|';\n  } else {\n    separator = ',';\n  }\n\n  for (i = 0; i < value.length; i++) {\n    if (i === 0) {\n      encoded = this.encodeQueryParam(value[i], maskPasswords);\n    } else {\n      encoded += separator + this.encodeQueryParam(value[i], maskPasswords);\n    }\n  }\n\n  return encoded;\n};\n\nOperation.prototype.encodeQueryCollection = function (type, name, value, maskPasswords) {\n  var encoded = '';\n  var i;\n\n  type = type || 'default';\n  if (type === 'default' || type === 'multi') {\n    for (i = 0; i < value.length; i++) {\n      if (i > 0) {encoded += '&';}\n\n      encoded += this.encodeQueryKey(name) + '=' + mask(this.encodeQueryParam(value[i]), maskPasswords);\n    }\n  } else {\n    var separator = '';\n\n    if (type === 'csv') {\n      separator = ',';\n    } else if (type === 'ssv') {\n      separator = '%20';\n    } else if (type === 'tsv') {\n      separator = '%09';\n    } else if (type === 'pipes') {\n      separator = '|';\n    } else if (type === 'brackets') {\n      for (i = 0; i < value.length; i++) {\n        if (i !== 0) {\n          encoded += '&';\n        }\n        encoded += this.encodeQueryKey(name) + '[]=' + mask(this.encodeQueryParam(value[i]), maskPasswords);\n      }\n    }\n\n    if (separator !== '') {\n      for (i = 0; i < value.length; i++) {\n        if (i === 0) {\n          encoded = this.encodeQueryKey(name) + '=' + this.encodeQueryParam(value[i]);\n        } else {\n          encoded += separator + this.encodeQueryParam(value[i]);\n        }\n      }\n    }\n  }\n\n  return encoded;\n};\n\nOperation.prototype.encodeQueryKey = function (arg) {\n  return encodeURIComponent(arg)\n      .replace('%5B','[').replace('%5D', ']').replace('%24', '$');\n};\n\nOperation.prototype.encodeQueryParam = function (arg, maskPasswords) {\n  if(maskPasswords) {\n    return \"******\";\n  }\n  return encodeURIComponent(arg);\n};\n\n/**\n * TODO revisit, might not want to leave '/'\n **/\nOperation.prototype.encodePathParam = function (pathParam, maskPasswords) {\n  return encodeURIComponent(pathParam, maskPasswords);\n};\n\nvar mask = function(value, format) {\n  if(typeof format === 'string' && format === 'password') {\n    return '******';\n  }\n  return value;\n}","'use strict';\n\nvar OperationGroup = module.exports = function (tag, description, externalDocs, operation) {\n  this.description = description;\n  this.externalDocs = externalDocs;\n  this.name = tag;\n  this.operation = operation;\n  this.operationsArray = [];\n  this.path = tag;\n  this.tag = tag;\n};\n\nOperationGroup.prototype.sort = function () {\n\n};\n\n","// shim for using process in browser\n\nvar process = module.exports = {};\nvar queue = [];\nvar draining = false;\n\nfunction drainQueue() {\n    if (draining) {\n        return;\n    }\n    draining = true;\n    var currentQueue;\n    var len = queue.length;\n    while(len) {\n        currentQueue = queue;\n        queue = [];\n        var i = -1;\n        while (++i < len) {\n            currentQueue[i]();\n        }\n        len = queue.length;\n    }\n    draining = false;\n}\nprocess.nextTick = function (fun) {\n    queue.push(fun);\n    if (!draining) {\n        setTimeout(drainQueue, 0);\n    }\n};\n\nprocess.title = 'browser';\nprocess.browser = true;\nprocess.env = {};\nprocess.argv = [];\nprocess.version = ''; // empty string to avoid regexp issues\nprocess.versions = {};\n\nfunction noop() {}\n\nprocess.on = noop;\nprocess.addListener = noop;\nprocess.once = noop;\nprocess.off = noop;\nprocess.removeListener = noop;\nprocess.removeAllListeners = noop;\nprocess.emit = noop;\n\nprocess.binding = function (name) {\n    throw new Error('process.binding is not supported');\n};\n\n// TODO(shtylman)\nprocess.cwd = function () { return '/' };\nprocess.chdir = function (dir) {\n    throw new Error('process.chdir is not supported');\n};\nprocess.umask = function() { return 0; };\n","(function (Buffer){\n(function () {\n  \"use strict\";\n\n  function btoa(str) {\n    var buffer\n      ;\n\n    if (str instanceof Buffer) {\n      buffer = str;\n    } else {\n      buffer = new Buffer(str.toString(), 'binary');\n    }\n\n    return buffer.toString('base64');\n  }\n\n  module.exports = btoa;\n}());\n\n}).call(this,require(\"buffer\").Buffer)\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9idG9hL2luZGV4LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiKGZ1bmN0aW9uICgpIHtcbiAgXCJ1c2Ugc3RyaWN0XCI7XG5cbiAgZnVuY3Rpb24gYnRvYShzdHIpIHtcbiAgICB2YXIgYnVmZmVyXG4gICAgICA7XG5cbiAgICBpZiAoc3RyIGluc3RhbmNlb2YgQnVmZmVyKSB7XG4gICAgICBidWZmZXIgPSBzdHI7XG4gICAgfSBlbHNlIHtcbiAgICAgIGJ1ZmZlciA9IG5ldyBCdWZmZXIoc3RyLnRvU3RyaW5nKCksICdiaW5hcnknKTtcbiAgICB9XG5cbiAgICByZXR1cm4gYnVmZmVyLnRvU3RyaW5nKCdiYXNlNjQnKTtcbiAgfVxuXG4gIG1vZHVsZS5leHBvcnRzID0gYnRvYTtcbn0oKSk7XG4iXX0=","/*!\n * The buffer module from node.js, for the browser.\n *\n * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>\n * @license  MIT\n */\n\nvar base64 = require('base64-js')\nvar ieee754 = require('ieee754')\nvar isArray = require('is-array')\n\nexports.Buffer = Buffer\nexports.SlowBuffer = SlowBuffer\nexports.INSPECT_MAX_BYTES = 50\nBuffer.poolSize = 8192 // not used by this implementation\n\nvar rootParent = {}\n\n/**\n * If `Buffer.TYPED_ARRAY_SUPPORT`:\n *   === true    Use Uint8Array implementation (fastest)\n *   === false   Use Object implementation (most compatible, even IE6)\n *\n * Browsers that support typed arrays are IE 10+, Firefox 4+, Chrome 7+, Safari 5.1+,\n * Opera 11.6+, iOS 4.2+.\n *\n * Due to various browser bugs, sometimes the Object implementation will be used even\n * when the browser supports typed arrays.\n *\n * Note:\n *\n *   - Firefox 4-29 lacks support for adding new properties to `Uint8Array` instances,\n *     See: https://bugzilla.mozilla.org/show_bug.cgi?id=695438.\n *\n *   - Safari 5-7 lacks support for changing the `Object.prototype.constructor` property\n *     on objects.\n *\n *   - Chrome 9-10 is missing the `TypedArray.prototype.subarray` function.\n *\n *   - IE10 has a broken `TypedArray.prototype.subarray` function which returns arrays of\n *     incorrect length in some situations.\n\n * We detect these buggy browsers and set `Buffer.TYPED_ARRAY_SUPPORT` to `false` so they\n * get the Object implementation, which is slower but behaves correctly.\n */\nBuffer.TYPED_ARRAY_SUPPORT = (function () {\n  function Bar () {}\n  try {\n    var arr = new Uint8Array(1)\n    arr.foo = function () { return 42 }\n    arr.constructor = Bar\n    return arr.foo() === 42 && // typed array instances can be augmented\n        arr.constructor === Bar && // constructor can be set\n        typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray`\n        arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray`\n  } catch (e) {\n    return false\n  }\n})()\n\nfunction kMaxLength () {\n  return Buffer.TYPED_ARRAY_SUPPORT\n    ? 0x7fffffff\n    : 0x3fffffff\n}\n\n/**\n * Class: Buffer\n * =============\n *\n * The Buffer constructor returns instances of `Uint8Array` that are augmented\n * with function properties for all the node `Buffer` API functions. We use\n * `Uint8Array` so that square bracket notation works as expected -- it returns\n * a single octet.\n *\n * By augmenting the instances, we can avoid modifying the `Uint8Array`\n * prototype.\n */\nfunction Buffer (arg) {\n  if (!(this instanceof Buffer)) {\n    // Avoid going through an ArgumentsAdaptorTrampoline in the common case.\n    if (arguments.length > 1) return new Buffer(arg, arguments[1])\n    return new Buffer(arg)\n  }\n\n  this.length = 0\n  this.parent = undefined\n\n  // Common case.\n  if (typeof arg === 'number') {\n    return fromNumber(this, arg)\n  }\n\n  // Slightly less common case.\n  if (typeof arg === 'string') {\n    return fromString(this, arg, arguments.length > 1 ? arguments[1] : 'utf8')\n  }\n\n  // Unusual.\n  return fromObject(this, arg)\n}\n\nfunction fromNumber (that, length) {\n  that = allocate(that, length < 0 ? 0 : checked(length) | 0)\n  if (!Buffer.TYPED_ARRAY_SUPPORT) {\n    for (var i = 0; i < length; i++) {\n      that[i] = 0\n    }\n  }\n  return that\n}\n\nfunction fromString (that, string, encoding) {\n  if (typeof encoding !== 'string' || encoding === '') encoding = 'utf8'\n\n  // Assumption: byteLength() return value is always < kMaxLength.\n  var length = byteLength(string, encoding) | 0\n  that = allocate(that, length)\n\n  that.write(string, encoding)\n  return that\n}\n\nfunction fromObject (that, object) {\n  if (Buffer.isBuffer(object)) return fromBuffer(that, object)\n\n  if (isArray(object)) return fromArray(that, object)\n\n  if (object == null) {\n    throw new TypeError('must start with number, buffer, array or string')\n  }\n\n  if (typeof ArrayBuffer !== 'undefined') {\n    if (object.buffer instanceof ArrayBuffer) {\n      return fromTypedArray(that, object)\n    }\n    if (object instanceof ArrayBuffer) {\n      return fromArrayBuffer(that, object)\n    }\n  }\n\n  if (object.length) return fromArrayLike(that, object)\n\n  return fromJsonObject(that, object)\n}\n\nfunction fromBuffer (that, buffer) {\n  var length = checked(buffer.length) | 0\n  that = allocate(that, length)\n  buffer.copy(that, 0, 0, length)\n  return that\n}\n\nfunction fromArray (that, array) {\n  var length = checked(array.length) | 0\n  that = allocate(that, length)\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\n// Duplicate of fromArray() to keep fromArray() monomorphic.\nfunction fromTypedArray (that, array) {\n  var length = checked(array.length) | 0\n  that = allocate(that, length)\n  // Truncating the elements is probably not what people expect from typed\n  // arrays with BYTES_PER_ELEMENT > 1 but it's compatible with the behavior\n  // of the old Buffer constructor.\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\nfunction fromArrayBuffer (that, array) {\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    // Return an augmented `Uint8Array` instance, for best performance\n    array.byteLength\n    that = Buffer._augment(new Uint8Array(array))\n  } else {\n    // Fallback: Return an object instance of the Buffer class\n    that = fromTypedArray(that, new Uint8Array(array))\n  }\n  return that\n}\n\nfunction fromArrayLike (that, array) {\n  var length = checked(array.length) | 0\n  that = allocate(that, length)\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\n// Deserialize { type: 'Buffer', data: [1,2,3,...] } into a Buffer object.\n// Returns a zero-length buffer for inputs that don't conform to the spec.\nfunction fromJsonObject (that, object) {\n  var array\n  var length = 0\n\n  if (object.type === 'Buffer' && isArray(object.data)) {\n    array = object.data\n    length = checked(array.length) | 0\n  }\n  that = allocate(that, length)\n\n  for (var i = 0; i < length; i += 1) {\n    that[i] = array[i] & 255\n  }\n  return that\n}\n\nfunction allocate (that, length) {\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    // Return an augmented `Uint8Array` instance, for best performance\n    that = Buffer._augment(new Uint8Array(length))\n  } else {\n    // Fallback: Return an object instance of the Buffer class\n    that.length = length\n    that._isBuffer = true\n  }\n\n  var fromPool = length !== 0 && length <= Buffer.poolSize >>> 1\n  if (fromPool) that.parent = rootParent\n\n  return that\n}\n\nfunction checked (length) {\n  // Note: cannot use `length < kMaxLength` here because that fails when\n  // length is NaN (which is otherwise coerced to zero.)\n  if (length >= kMaxLength()) {\n    throw new RangeError('Attempt to allocate Buffer larger than maximum ' +\n                         'size: 0x' + kMaxLength().toString(16) + ' bytes')\n  }\n  return length | 0\n}\n\nfunction SlowBuffer (subject, encoding) {\n  if (!(this instanceof SlowBuffer)) return new SlowBuffer(subject, encoding)\n\n  var buf = new Buffer(subject, encoding)\n  delete buf.parent\n  return buf\n}\n\nBuffer.isBuffer = function isBuffer (b) {\n  return !!(b != null && b._isBuffer)\n}\n\nBuffer.compare = function compare (a, b) {\n  if (!Buffer.isBuffer(a) || !Buffer.isBuffer(b)) {\n    throw new TypeError('Arguments must be Buffers')\n  }\n\n  if (a === b) return 0\n\n  var x = a.length\n  var y = b.length\n\n  var i = 0\n  var len = Math.min(x, y)\n  while (i < len) {\n    if (a[i] !== b[i]) break\n\n    ++i\n  }\n\n  if (i !== len) {\n    x = a[i]\n    y = b[i]\n  }\n\n  if (x < y) return -1\n  if (y < x) return 1\n  return 0\n}\n\nBuffer.isEncoding = function isEncoding (encoding) {\n  switch (String(encoding).toLowerCase()) {\n    case 'hex':\n    case 'utf8':\n    case 'utf-8':\n    case 'ascii':\n    case 'binary':\n    case 'base64':\n    case 'raw':\n    case 'ucs2':\n    case 'ucs-2':\n    case 'utf16le':\n    case 'utf-16le':\n      return true\n    default:\n      return false\n  }\n}\n\nBuffer.concat = function concat (list, length) {\n  if (!isArray(list)) throw new TypeError('list argument must be an Array of Buffers.')\n\n  if (list.length === 0) {\n    return new Buffer(0)\n  }\n\n  var i\n  if (length === undefined) {\n    length = 0\n    for (i = 0; i < list.length; i++) {\n      length += list[i].length\n    }\n  }\n\n  var buf = new Buffer(length)\n  var pos = 0\n  for (i = 0; i < list.length; i++) {\n    var item = list[i]\n    item.copy(buf, pos)\n    pos += item.length\n  }\n  return buf\n}\n\nfunction byteLength (string, encoding) {\n  if (typeof string !== 'string') string = '' + string\n\n  var len = string.length\n  if (len === 0) return 0\n\n  // Use a for loop to avoid recursion\n  var loweredCase = false\n  for (;;) {\n    switch (encoding) {\n      case 'ascii':\n      case 'binary':\n      // Deprecated\n      case 'raw':\n      case 'raws':\n        return len\n      case 'utf8':\n      case 'utf-8':\n        return utf8ToBytes(string).length\n      case 'ucs2':\n      case 'ucs-2':\n      case 'utf16le':\n      case 'utf-16le':\n        return len * 2\n      case 'hex':\n        return len >>> 1\n      case 'base64':\n        return base64ToBytes(string).length\n      default:\n        if (loweredCase) return utf8ToBytes(string).length // assume utf8\n        encoding = ('' + encoding).toLowerCase()\n        loweredCase = true\n    }\n  }\n}\nBuffer.byteLength = byteLength\n\n// pre-set for values that may exist in the future\nBuffer.prototype.length = undefined\nBuffer.prototype.parent = undefined\n\nfunction slowToString (encoding, start, end) {\n  var loweredCase = false\n\n  start = start | 0\n  end = end === undefined || end === Infinity ? this.length : end | 0\n\n  if (!encoding) encoding = 'utf8'\n  if (start < 0) start = 0\n  if (end > this.length) end = this.length\n  if (end <= start) return ''\n\n  while (true) {\n    switch (encoding) {\n      case 'hex':\n        return hexSlice(this, start, end)\n\n      case 'utf8':\n      case 'utf-8':\n        return utf8Slice(this, start, end)\n\n      case 'ascii':\n        return asciiSlice(this, start, end)\n\n      case 'binary':\n        return binarySlice(this, start, end)\n\n      case 'base64':\n        return base64Slice(this, start, end)\n\n      case 'ucs2':\n      case 'ucs-2':\n      case 'utf16le':\n      case 'utf-16le':\n        return utf16leSlice(this, start, end)\n\n      default:\n        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding)\n        encoding = (encoding + '').toLowerCase()\n        loweredCase = true\n    }\n  }\n}\n\nBuffer.prototype.toString = function toString () {\n  var length = this.length | 0\n  if (length === 0) return ''\n  if (arguments.length === 0) return utf8Slice(this, 0, length)\n  return slowToString.apply(this, arguments)\n}\n\nBuffer.prototype.equals = function equals (b) {\n  if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer')\n  if (this === b) return true\n  return Buffer.compare(this, b) === 0\n}\n\nBuffer.prototype.inspect = function inspect () {\n  var str = ''\n  var max = exports.INSPECT_MAX_BYTES\n  if (this.length > 0) {\n    str = this.toString('hex', 0, max).match(/.{2}/g).join(' ')\n    if (this.length > max) str += ' ... '\n  }\n  return '<Buffer ' + str + '>'\n}\n\nBuffer.prototype.compare = function compare (b) {\n  if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer')\n  if (this === b) return 0\n  return Buffer.compare(this, b)\n}\n\nBuffer.prototype.indexOf = function indexOf (val, byteOffset) {\n  if (byteOffset > 0x7fffffff) byteOffset = 0x7fffffff\n  else if (byteOffset < -0x80000000) byteOffset = -0x80000000\n  byteOffset >>= 0\n\n  if (this.length === 0) return -1\n  if (byteOffset >= this.length) return -1\n\n  // Negative offsets start from the end of the buffer\n  if (byteOffset < 0) byteOffset = Math.max(this.length + byteOffset, 0)\n\n  if (typeof val === 'string') {\n    if (val.length === 0) return -1 // special case: looking for empty string always fails\n    return String.prototype.indexOf.call(this, val, byteOffset)\n  }\n  if (Buffer.isBuffer(val)) {\n    return arrayIndexOf(this, val, byteOffset)\n  }\n  if (typeof val === 'number') {\n    if (Buffer.TYPED_ARRAY_SUPPORT && Uint8Array.prototype.indexOf === 'function') {\n      return Uint8Array.prototype.indexOf.call(this, val, byteOffset)\n    }\n    return arrayIndexOf(this, [ val ], byteOffset)\n  }\n\n  function arrayIndexOf (arr, val, byteOffset) {\n    var foundIndex = -1\n    for (var i = 0; byteOffset + i < arr.length; i++) {\n      if (arr[byteOffset + i] === val[foundIndex === -1 ? 0 : i - foundIndex]) {\n        if (foundIndex === -1) foundIndex = i\n        if (i - foundIndex + 1 === val.length) return byteOffset + foundIndex\n      } else {\n        foundIndex = -1\n      }\n    }\n    return -1\n  }\n\n  throw new TypeError('val must be string, number or Buffer')\n}\n\n// `get` is deprecated\nBuffer.prototype.get = function get (offset) {\n  console.log('.get() is deprecated. Access using array indexes instead.')\n  return this.readUInt8(offset)\n}\n\n// `set` is deprecated\nBuffer.prototype.set = function set (v, offset) {\n  console.log('.set() is deprecated. Access using array indexes instead.')\n  return this.writeUInt8(v, offset)\n}\n\nfunction hexWrite (buf, string, offset, length) {\n  offset = Number(offset) || 0\n  var remaining = buf.length - offset\n  if (!length) {\n    length = remaining\n  } else {\n    length = Number(length)\n    if (length > remaining) {\n      length = remaining\n    }\n  }\n\n  // must be an even number of digits\n  var strLen = string.length\n  if (strLen % 2 !== 0) throw new Error('Invalid hex string')\n\n  if (length > strLen / 2) {\n    length = strLen / 2\n  }\n  for (var i = 0; i < length; i++) {\n    var parsed = parseInt(string.substr(i * 2, 2), 16)\n    if (isNaN(parsed)) throw new Error('Invalid hex string')\n    buf[offset + i] = parsed\n  }\n  return i\n}\n\nfunction utf8Write (buf, string, offset, length) {\n  return blitBuffer(utf8ToBytes(string, buf.length - offset), buf, offset, length)\n}\n\nfunction asciiWrite (buf, string, offset, length) {\n  return blitBuffer(asciiToBytes(string), buf, offset, length)\n}\n\nfunction binaryWrite (buf, string, offset, length) {\n  return asciiWrite(buf, string, offset, length)\n}\n\nfunction base64Write (buf, string, offset, length) {\n  return blitBuffer(base64ToBytes(string), buf, offset, length)\n}\n\nfunction ucs2Write (buf, string, offset, length) {\n  return blitBuffer(utf16leToBytes(string, buf.length - offset), buf, offset, length)\n}\n\nBuffer.prototype.write = function write (string, offset, length, encoding) {\n  // Buffer#write(string)\n  if (offset === undefined) {\n    encoding = 'utf8'\n    length = this.length\n    offset = 0\n  // Buffer#write(string, encoding)\n  } else if (length === undefined && typeof offset === 'string') {\n    encoding = offset\n    length = this.length\n    offset = 0\n  // Buffer#write(string, offset[, length][, encoding])\n  } else if (isFinite(offset)) {\n    offset = offset | 0\n    if (isFinite(length)) {\n      length = length | 0\n      if (encoding === undefined) encoding = 'utf8'\n    } else {\n      encoding = length\n      length = undefined\n    }\n  // legacy write(string, encoding, offset, length) - remove in v0.13\n  } else {\n    var swap = encoding\n    encoding = offset\n    offset = length | 0\n    length = swap\n  }\n\n  var remaining = this.length - offset\n  if (length === undefined || length > remaining) length = remaining\n\n  if ((string.length > 0 && (length < 0 || offset < 0)) || offset > this.length) {\n    throw new RangeError('attempt to write outside buffer bounds')\n  }\n\n  if (!encoding) encoding = 'utf8'\n\n  var loweredCase = false\n  for (;;) {\n    switch (encoding) {\n      case 'hex':\n        return hexWrite(this, string, offset, length)\n\n      case 'utf8':\n      case 'utf-8':\n        return utf8Write(this, string, offset, length)\n\n      case 'ascii':\n        return asciiWrite(this, string, offset, length)\n\n      case 'binary':\n        return binaryWrite(this, string, offset, length)\n\n      case 'base64':\n        // Warning: maxLength not taken into account in base64Write\n        return base64Write(this, string, offset, length)\n\n      case 'ucs2':\n      case 'ucs-2':\n      case 'utf16le':\n      case 'utf-16le':\n        return ucs2Write(this, string, offset, length)\n\n      default:\n        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding)\n        encoding = ('' + encoding).toLowerCase()\n        loweredCase = true\n    }\n  }\n}\n\nBuffer.prototype.toJSON = function toJSON () {\n  return {\n    type: 'Buffer',\n    data: Array.prototype.slice.call(this._arr || this, 0)\n  }\n}\n\nfunction base64Slice (buf, start, end) {\n  if (start === 0 && end === buf.length) {\n    return base64.fromByteArray(buf)\n  } else {\n    return base64.fromByteArray(buf.slice(start, end))\n  }\n}\n\nfunction utf8Slice (buf, start, end) {\n  end = Math.min(buf.length, end)\n  var res = []\n\n  var i = start\n  while (i < end) {\n    var firstByte = buf[i]\n    var codePoint = null\n    var bytesPerSequence = (firstByte > 0xEF) ? 4\n      : (firstByte > 0xDF) ? 3\n      : (firstByte > 0xBF) ? 2\n      : 1\n\n    if (i + bytesPerSequence <= end) {\n      var secondByte, thirdByte, fourthByte, tempCodePoint\n\n      switch (bytesPerSequence) {\n        case 1:\n          if (firstByte < 0x80) {\n            codePoint = firstByte\n          }\n          break\n        case 2:\n          secondByte = buf[i + 1]\n          if ((secondByte & 0xC0) === 0x80) {\n            tempCodePoint = (firstByte & 0x1F) << 0x6 | (secondByte & 0x3F)\n            if (tempCodePoint > 0x7F) {\n              codePoint = tempCodePoint\n            }\n          }\n          break\n        case 3:\n          secondByte = buf[i + 1]\n          thirdByte = buf[i + 2]\n          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80) {\n            tempCodePoint = (firstByte & 0xF) << 0xC | (secondByte & 0x3F) << 0x6 | (thirdByte & 0x3F)\n            if (tempCodePoint > 0x7FF && (tempCodePoint < 0xD800 || tempCodePoint > 0xDFFF)) {\n              codePoint = tempCodePoint\n            }\n          }\n          break\n        case 4:\n          secondByte = buf[i + 1]\n          thirdByte = buf[i + 2]\n          fourthByte = buf[i + 3]\n          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80 && (fourthByte & 0xC0) === 0x80) {\n            tempCodePoint = (firstByte & 0xF) << 0x12 | (secondByte & 0x3F) << 0xC | (thirdByte & 0x3F) << 0x6 | (fourthByte & 0x3F)\n            if (tempCodePoint > 0xFFFF && tempCodePoint < 0x110000) {\n              codePoint = tempCodePoint\n            }\n          }\n      }\n    }\n\n    if (codePoint === null) {\n      // we did not generate a valid codePoint so insert a\n      // replacement char (U+FFFD) and advance only 1 byte\n      codePoint = 0xFFFD\n      bytesPerSequence = 1\n    } else if (codePoint > 0xFFFF) {\n      // encode to utf16 (surrogate pair dance)\n      codePoint -= 0x10000\n      res.push(codePoint >>> 10 & 0x3FF | 0xD800)\n      codePoint = 0xDC00 | codePoint & 0x3FF\n    }\n\n    res.push(codePoint)\n    i += bytesPerSequence\n  }\n\n  return decodeCodePointsArray(res)\n}\n\n// Based on http://stackoverflow.com/a/22747272/680742, the browser with\n// the lowest limit is Chrome, with 0x10000 args.\n// We go 1 magnitude less, for safety\nvar MAX_ARGUMENTS_LENGTH = 0x1000\n\nfunction decodeCodePointsArray (codePoints) {\n  var len = codePoints.length\n  if (len <= MAX_ARGUMENTS_LENGTH) {\n    return String.fromCharCode.apply(String, codePoints) // avoid extra slice()\n  }\n\n  // Decode in chunks to avoid \"call stack size exceeded\".\n  var res = ''\n  var i = 0\n  while (i < len) {\n    res += String.fromCharCode.apply(\n      String,\n      codePoints.slice(i, i += MAX_ARGUMENTS_LENGTH)\n    )\n  }\n  return res\n}\n\nfunction asciiSlice (buf, start, end) {\n  var ret = ''\n  end = Math.min(buf.length, end)\n\n  for (var i = start; i < end; i++) {\n    ret += String.fromCharCode(buf[i] & 0x7F)\n  }\n  return ret\n}\n\nfunction binarySlice (buf, start, end) {\n  var ret = ''\n  end = Math.min(buf.length, end)\n\n  for (var i = start; i < end; i++) {\n    ret += String.fromCharCode(buf[i])\n  }\n  return ret\n}\n\nfunction hexSlice (buf, start, end) {\n  var len = buf.length\n\n  if (!start || start < 0) start = 0\n  if (!end || end < 0 || end > len) end = len\n\n  var out = ''\n  for (var i = start; i < end; i++) {\n    out += toHex(buf[i])\n  }\n  return out\n}\n\nfunction utf16leSlice (buf, start, end) {\n  var bytes = buf.slice(start, end)\n  var res = ''\n  for (var i = 0; i < bytes.length; i += 2) {\n    res += String.fromCharCode(bytes[i] + bytes[i + 1] * 256)\n  }\n  return res\n}\n\nBuffer.prototype.slice = function slice (start, end) {\n  var len = this.length\n  start = ~~start\n  end = end === undefined ? len : ~~end\n\n  if (start < 0) {\n    start += len\n    if (start < 0) start = 0\n  } else if (start > len) {\n    start = len\n  }\n\n  if (end < 0) {\n    end += len\n    if (end < 0) end = 0\n  } else if (end > len) {\n    end = len\n  }\n\n  if (end < start) end = start\n\n  var newBuf\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    newBuf = Buffer._augment(this.subarray(start, end))\n  } else {\n    var sliceLen = end - start\n    newBuf = new Buffer(sliceLen, undefined)\n    for (var i = 0; i < sliceLen; i++) {\n      newBuf[i] = this[i + start]\n    }\n  }\n\n  if (newBuf.length) newBuf.parent = this.parent || this\n\n  return newBuf\n}\n\n/*\n * Need to make sure that buffer isn't trying to write out of bounds.\n */\nfunction checkOffset (offset, ext, length) {\n  if ((offset % 1) !== 0 || offset < 0) throw new RangeError('offset is not uint')\n  if (offset + ext > length) throw new RangeError('Trying to access beyond buffer length')\n}\n\nBuffer.prototype.readUIntLE = function readUIntLE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkOffset(offset, byteLength, this.length)\n\n  var val = this[offset]\n  var mul = 1\n  var i = 0\n  while (++i < byteLength && (mul *= 0x100)) {\n    val += this[offset + i] * mul\n  }\n\n  return val\n}\n\nBuffer.prototype.readUIntBE = function readUIntBE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) {\n    checkOffset(offset, byteLength, this.length)\n  }\n\n  var val = this[offset + --byteLength]\n  var mul = 1\n  while (byteLength > 0 && (mul *= 0x100)) {\n    val += this[offset + --byteLength] * mul\n  }\n\n  return val\n}\n\nBuffer.prototype.readUInt8 = function readUInt8 (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 1, this.length)\n  return this[offset]\n}\n\nBuffer.prototype.readUInt16LE = function readUInt16LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  return this[offset] | (this[offset + 1] << 8)\n}\n\nBuffer.prototype.readUInt16BE = function readUInt16BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  return (this[offset] << 8) | this[offset + 1]\n}\n\nBuffer.prototype.readUInt32LE = function readUInt32LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return ((this[offset]) |\n      (this[offset + 1] << 8) |\n      (this[offset + 2] << 16)) +\n      (this[offset + 3] * 0x1000000)\n}\n\nBuffer.prototype.readUInt32BE = function readUInt32BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return (this[offset] * 0x1000000) +\n    ((this[offset + 1] << 16) |\n    (this[offset + 2] << 8) |\n    this[offset + 3])\n}\n\nBuffer.prototype.readIntLE = function readIntLE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkOffset(offset, byteLength, this.length)\n\n  var val = this[offset]\n  var mul = 1\n  var i = 0\n  while (++i < byteLength && (mul *= 0x100)) {\n    val += this[offset + i] * mul\n  }\n  mul *= 0x80\n\n  if (val >= mul) val -= Math.pow(2, 8 * byteLength)\n\n  return val\n}\n\nBuffer.prototype.readIntBE = function readIntBE (offset, byteLength, noAssert) {\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkOffset(offset, byteLength, this.length)\n\n  var i = byteLength\n  var mul = 1\n  var val = this[offset + --i]\n  while (i > 0 && (mul *= 0x100)) {\n    val += this[offset + --i] * mul\n  }\n  mul *= 0x80\n\n  if (val >= mul) val -= Math.pow(2, 8 * byteLength)\n\n  return val\n}\n\nBuffer.prototype.readInt8 = function readInt8 (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 1, this.length)\n  if (!(this[offset] & 0x80)) return (this[offset])\n  return ((0xff - this[offset] + 1) * -1)\n}\n\nBuffer.prototype.readInt16LE = function readInt16LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  var val = this[offset] | (this[offset + 1] << 8)\n  return (val & 0x8000) ? val | 0xFFFF0000 : val\n}\n\nBuffer.prototype.readInt16BE = function readInt16BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 2, this.length)\n  var val = this[offset + 1] | (this[offset] << 8)\n  return (val & 0x8000) ? val | 0xFFFF0000 : val\n}\n\nBuffer.prototype.readInt32LE = function readInt32LE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return (this[offset]) |\n    (this[offset + 1] << 8) |\n    (this[offset + 2] << 16) |\n    (this[offset + 3] << 24)\n}\n\nBuffer.prototype.readInt32BE = function readInt32BE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n\n  return (this[offset] << 24) |\n    (this[offset + 1] << 16) |\n    (this[offset + 2] << 8) |\n    (this[offset + 3])\n}\n\nBuffer.prototype.readFloatLE = function readFloatLE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n  return ieee754.read(this, offset, true, 23, 4)\n}\n\nBuffer.prototype.readFloatBE = function readFloatBE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 4, this.length)\n  return ieee754.read(this, offset, false, 23, 4)\n}\n\nBuffer.prototype.readDoubleLE = function readDoubleLE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 8, this.length)\n  return ieee754.read(this, offset, true, 52, 8)\n}\n\nBuffer.prototype.readDoubleBE = function readDoubleBE (offset, noAssert) {\n  if (!noAssert) checkOffset(offset, 8, this.length)\n  return ieee754.read(this, offset, false, 52, 8)\n}\n\nfunction checkInt (buf, value, offset, ext, max, min) {\n  if (!Buffer.isBuffer(buf)) throw new TypeError('buffer must be a Buffer instance')\n  if (value > max || value < min) throw new RangeError('value is out of bounds')\n  if (offset + ext > buf.length) throw new RangeError('index out of range')\n}\n\nBuffer.prototype.writeUIntLE = function writeUIntLE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkInt(this, value, offset, byteLength, Math.pow(2, 8 * byteLength), 0)\n\n  var mul = 1\n  var i = 0\n  this[offset] = value & 0xFF\n  while (++i < byteLength && (mul *= 0x100)) {\n    this[offset + i] = (value / mul) & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeUIntBE = function writeUIntBE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  byteLength = byteLength | 0\n  if (!noAssert) checkInt(this, value, offset, byteLength, Math.pow(2, 8 * byteLength), 0)\n\n  var i = byteLength - 1\n  var mul = 1\n  this[offset + i] = value & 0xFF\n  while (--i >= 0 && (mul *= 0x100)) {\n    this[offset + i] = (value / mul) & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 1, 0xff, 0)\n  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value)\n  this[offset] = value\n  return offset + 1\n}\n\nfunction objectWriteUInt16 (buf, value, offset, littleEndian) {\n  if (value < 0) value = 0xffff + value + 1\n  for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; i++) {\n    buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>>\n      (littleEndian ? i : 1 - i) * 8\n  }\n}\n\nBuffer.prototype.writeUInt16LE = function writeUInt16LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = value\n    this[offset + 1] = (value >>> 8)\n  } else {\n    objectWriteUInt16(this, value, offset, true)\n  }\n  return offset + 2\n}\n\nBuffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 8)\n    this[offset + 1] = value\n  } else {\n    objectWriteUInt16(this, value, offset, false)\n  }\n  return offset + 2\n}\n\nfunction objectWriteUInt32 (buf, value, offset, littleEndian) {\n  if (value < 0) value = 0xffffffff + value + 1\n  for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; i++) {\n    buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff\n  }\n}\n\nBuffer.prototype.writeUInt32LE = function writeUInt32LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset + 3] = (value >>> 24)\n    this[offset + 2] = (value >>> 16)\n    this[offset + 1] = (value >>> 8)\n    this[offset] = value\n  } else {\n    objectWriteUInt32(this, value, offset, true)\n  }\n  return offset + 4\n}\n\nBuffer.prototype.writeUInt32BE = function writeUInt32BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 24)\n    this[offset + 1] = (value >>> 16)\n    this[offset + 2] = (value >>> 8)\n    this[offset + 3] = value\n  } else {\n    objectWriteUInt32(this, value, offset, false)\n  }\n  return offset + 4\n}\n\nBuffer.prototype.writeIntLE = function writeIntLE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) {\n    var limit = Math.pow(2, 8 * byteLength - 1)\n\n    checkInt(this, value, offset, byteLength, limit - 1, -limit)\n  }\n\n  var i = 0\n  var mul = 1\n  var sub = value < 0 ? 1 : 0\n  this[offset] = value & 0xFF\n  while (++i < byteLength && (mul *= 0x100)) {\n    this[offset + i] = ((value / mul) >> 0) - sub & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeIntBE = function writeIntBE (value, offset, byteLength, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) {\n    var limit = Math.pow(2, 8 * byteLength - 1)\n\n    checkInt(this, value, offset, byteLength, limit - 1, -limit)\n  }\n\n  var i = byteLength - 1\n  var mul = 1\n  var sub = value < 0 ? 1 : 0\n  this[offset + i] = value & 0xFF\n  while (--i >= 0 && (mul *= 0x100)) {\n    this[offset + i] = ((value / mul) >> 0) - sub & 0xFF\n  }\n\n  return offset + byteLength\n}\n\nBuffer.prototype.writeInt8 = function writeInt8 (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 1, 0x7f, -0x80)\n  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value)\n  if (value < 0) value = 0xff + value + 1\n  this[offset] = value\n  return offset + 1\n}\n\nBuffer.prototype.writeInt16LE = function writeInt16LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = value\n    this[offset + 1] = (value >>> 8)\n  } else {\n    objectWriteUInt16(this, value, offset, true)\n  }\n  return offset + 2\n}\n\nBuffer.prototype.writeInt16BE = function writeInt16BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 8)\n    this[offset + 1] = value\n  } else {\n    objectWriteUInt16(this, value, offset, false)\n  }\n  return offset + 2\n}\n\nBuffer.prototype.writeInt32LE = function writeInt32LE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000)\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = value\n    this[offset + 1] = (value >>> 8)\n    this[offset + 2] = (value >>> 16)\n    this[offset + 3] = (value >>> 24)\n  } else {\n    objectWriteUInt32(this, value, offset, true)\n  }\n  return offset + 4\n}\n\nBuffer.prototype.writeInt32BE = function writeInt32BE (value, offset, noAssert) {\n  value = +value\n  offset = offset | 0\n  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000)\n  if (value < 0) value = 0xffffffff + value + 1\n  if (Buffer.TYPED_ARRAY_SUPPORT) {\n    this[offset] = (value >>> 24)\n    this[offset + 1] = (value >>> 16)\n    this[offset + 2] = (value >>> 8)\n    this[offset + 3] = value\n  } else {\n    objectWriteUInt32(this, value, offset, false)\n  }\n  return offset + 4\n}\n\nfunction checkIEEE754 (buf, value, offset, ext, max, min) {\n  if (value > max || value < min) throw new RangeError('value is out of bounds')\n  if (offset + ext > buf.length) throw new RangeError('index out of range')\n  if (offset < 0) throw new RangeError('index out of range')\n}\n\nfunction writeFloat (buf, value, offset, littleEndian, noAssert) {\n  if (!noAssert) {\n    checkIEEE754(buf, value, offset, 4, 3.4028234663852886e+38, -3.4028234663852886e+38)\n  }\n  ieee754.write(buf, value, offset, littleEndian, 23, 4)\n  return offset + 4\n}\n\nBuffer.prototype.writeFloatLE = function writeFloatLE (value, offset, noAssert) {\n  return writeFloat(this, value, offset, true, noAssert)\n}\n\nBuffer.prototype.writeFloatBE = function writeFloatBE (value, offset, noAssert) {\n  return writeFloat(this, value, offset, false, noAssert)\n}\n\nfunction writeDouble (buf, value, offset, littleEndian, noAssert) {\n  if (!noAssert) {\n    checkIEEE754(buf, value, offset, 8, 1.7976931348623157E+308, -1.7976931348623157E+308)\n  }\n  ieee754.write(buf, value, offset, littleEndian, 52, 8)\n  return offset + 8\n}\n\nBuffer.prototype.writeDoubleLE = function writeDoubleLE (value, offset, noAssert) {\n  return writeDouble(this, value, offset, true, noAssert)\n}\n\nBuffer.prototype.writeDoubleBE = function writeDoubleBE (value, offset, noAssert) {\n  return writeDouble(this, value, offset, false, noAssert)\n}\n\n// copy(targetBuffer, targetStart=0, sourceStart=0, sourceEnd=buffer.length)\nBuffer.prototype.copy = function copy (target, targetStart, start, end) {\n  if (!start) start = 0\n  if (!end && end !== 0) end = this.length\n  if (targetStart >= target.length) targetStart = target.length\n  if (!targetStart) targetStart = 0\n  if (end > 0 && end < start) end = start\n\n  // Copy 0 bytes; we're done\n  if (end === start) return 0\n  if (target.length === 0 || this.length === 0) return 0\n\n  // Fatal error conditions\n  if (targetStart < 0) {\n    throw new RangeError('targetStart out of bounds')\n  }\n  if (start < 0 || start >= this.length) throw new RangeError('sourceStart out of bounds')\n  if (end < 0) throw new RangeError('sourceEnd out of bounds')\n\n  // Are we oob?\n  if (end > this.length) end = this.length\n  if (target.length - targetStart < end - start) {\n    end = target.length - targetStart + start\n  }\n\n  var len = end - start\n  var i\n\n  if (this === target && start < targetStart && targetStart < end) {\n    // descending copy from end\n    for (i = len - 1; i >= 0; i--) {\n      target[i + targetStart] = this[i + start]\n    }\n  } else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) {\n    // ascending copy from start\n    for (i = 0; i < len; i++) {\n      target[i + targetStart] = this[i + start]\n    }\n  } else {\n    target._set(this.subarray(start, start + len), targetStart)\n  }\n\n  return len\n}\n\n// fill(value, start=0, end=buffer.length)\nBuffer.prototype.fill = function fill (value, start, end) {\n  if (!value) value = 0\n  if (!start) start = 0\n  if (!end) end = this.length\n\n  if (end < start) throw new RangeError('end < start')\n\n  // Fill 0 bytes; we're done\n  if (end === start) return\n  if (this.length === 0) return\n\n  if (start < 0 || start >= this.length) throw new RangeError('start out of bounds')\n  if (end < 0 || end > this.length) throw new RangeError('end out of bounds')\n\n  var i\n  if (typeof value === 'number') {\n    for (i = start; i < end; i++) {\n      this[i] = value\n    }\n  } else {\n    var bytes = utf8ToBytes(value.toString())\n    var len = bytes.length\n    for (i = start; i < end; i++) {\n      this[i] = bytes[i % len]\n    }\n  }\n\n  return this\n}\n\n/**\n * Creates a new `ArrayBuffer` with the *copied* memory of the buffer instance.\n * Added in Node 0.12. Only available in browsers that support ArrayBuffer.\n */\nBuffer.prototype.toArrayBuffer = function toArrayBuffer () {\n  if (typeof Uint8Array !== 'undefined') {\n    if (Buffer.TYPED_ARRAY_SUPPORT) {\n      return (new Buffer(this)).buffer\n    } else {\n      var buf = new Uint8Array(this.length)\n      for (var i = 0, len = buf.length; i < len; i += 1) {\n        buf[i] = this[i]\n      }\n      return buf.buffer\n    }\n  } else {\n    throw new TypeError('Buffer.toArrayBuffer not supported in this browser')\n  }\n}\n\n// HELPER FUNCTIONS\n// ================\n\nvar BP = Buffer.prototype\n\n/**\n * Augment a Uint8Array *instance* (not the Uint8Array class!) with Buffer methods\n */\nBuffer._augment = function _augment (arr) {\n  arr.constructor = Buffer\n  arr._isBuffer = true\n\n  // save reference to original Uint8Array set method before overwriting\n  arr._set = arr.set\n\n  // deprecated\n  arr.get = BP.get\n  arr.set = BP.set\n\n  arr.write = BP.write\n  arr.toString = BP.toString\n  arr.toLocaleString = BP.toString\n  arr.toJSON = BP.toJSON\n  arr.equals = BP.equals\n  arr.compare = BP.compare\n  arr.indexOf = BP.indexOf\n  arr.copy = BP.copy\n  arr.slice = BP.slice\n  arr.readUIntLE = BP.readUIntLE\n  arr.readUIntBE = BP.readUIntBE\n  arr.readUInt8 = BP.readUInt8\n  arr.readUInt16LE = BP.readUInt16LE\n  arr.readUInt16BE = BP.readUInt16BE\n  arr.readUInt32LE = BP.readUInt32LE\n  arr.readUInt32BE = BP.readUInt32BE\n  arr.readIntLE = BP.readIntLE\n  arr.readIntBE = BP.readIntBE\n  arr.readInt8 = BP.readInt8\n  arr.readInt16LE = BP.readInt16LE\n  arr.readInt16BE = BP.readInt16BE\n  arr.readInt32LE = BP.readInt32LE\n  arr.readInt32BE = BP.readInt32BE\n  arr.readFloatLE = BP.readFloatLE\n  arr.readFloatBE = BP.readFloatBE\n  arr.readDoubleLE = BP.readDoubleLE\n  arr.readDoubleBE = BP.readDoubleBE\n  arr.writeUInt8 = BP.writeUInt8\n  arr.writeUIntLE = BP.writeUIntLE\n  arr.writeUIntBE = BP.writeUIntBE\n  arr.writeUInt16LE = BP.writeUInt16LE\n  arr.writeUInt16BE = BP.writeUInt16BE\n  arr.writeUInt32LE = BP.writeUInt32LE\n  arr.writeUInt32BE = BP.writeUInt32BE\n  arr.writeIntLE = BP.writeIntLE\n  arr.writeIntBE = BP.writeIntBE\n  arr.writeInt8 = BP.writeInt8\n  arr.writeInt16LE = BP.writeInt16LE\n  arr.writeInt16BE = BP.writeInt16BE\n  arr.writeInt32LE = BP.writeInt32LE\n  arr.writeInt32BE = BP.writeInt32BE\n  arr.writeFloatLE = BP.writeFloatLE\n  arr.writeFloatBE = BP.writeFloatBE\n  arr.writeDoubleLE = BP.writeDoubleLE\n  arr.writeDoubleBE = BP.writeDoubleBE\n  arr.fill = BP.fill\n  arr.inspect = BP.inspect\n  arr.toArrayBuffer = BP.toArrayBuffer\n\n  return arr\n}\n\nvar INVALID_BASE64_RE = /[^+\\/0-9A-Za-z-_]/g\n\nfunction base64clean (str) {\n  // Node strips out invalid characters like \\n and \\t from the string, base64-js does not\n  str = stringtrim(str).replace(INVALID_BASE64_RE, '')\n  // Node converts strings with length < 2 to ''\n  if (str.length < 2) return ''\n  // Node allows for non-padded base64 strings (missing trailing ===), base64-js does not\n  while (str.length % 4 !== 0) {\n    str = str + '='\n  }\n  return str\n}\n\nfunction stringtrim (str) {\n  if (str.trim) return str.trim()\n  return str.replace(/^\\s+|\\s+$/g, '')\n}\n\nfunction toHex (n) {\n  if (n < 16) return '0' + n.toString(16)\n  return n.toString(16)\n}\n\nfunction utf8ToBytes (string, units) {\n  units = units || Infinity\n  var codePoint\n  var length = string.length\n  var leadSurrogate = null\n  var bytes = []\n\n  for (var i = 0; i < length; i++) {\n    codePoint = string.charCodeAt(i)\n\n    // is surrogate component\n    if (codePoint > 0xD7FF && codePoint < 0xE000) {\n      // last char was a lead\n      if (!leadSurrogate) {\n        // no lead yet\n        if (codePoint > 0xDBFF) {\n          // unexpected trail\n          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n          continue\n        } else if (i + 1 === length) {\n          // unpaired lead\n          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n          continue\n        }\n\n        // valid lead\n        leadSurrogate = codePoint\n\n        continue\n      }\n\n      // 2 leads in a row\n      if (codePoint < 0xDC00) {\n        if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n        leadSurrogate = codePoint\n        continue\n      }\n\n      // valid surrogate pair\n      codePoint = leadSurrogate - 0xD800 << 10 | codePoint - 0xDC00 | 0x10000\n    } else if (leadSurrogate) {\n      // valid bmp char, but last char was a lead\n      if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD)\n    }\n\n    leadSurrogate = null\n\n    // encode utf8\n    if (codePoint < 0x80) {\n      if ((units -= 1) < 0) break\n      bytes.push(codePoint)\n    } else if (codePoint < 0x800) {\n      if ((units -= 2) < 0) break\n      bytes.push(\n        codePoint >> 0x6 | 0xC0,\n        codePoint & 0x3F | 0x80\n      )\n    } else if (codePoint < 0x10000) {\n      if ((units -= 3) < 0) break\n      bytes.push(\n        codePoint >> 0xC | 0xE0,\n        codePoint >> 0x6 & 0x3F | 0x80,\n        codePoint & 0x3F | 0x80\n      )\n    } else if (codePoint < 0x110000) {\n      if ((units -= 4) < 0) break\n      bytes.push(\n        codePoint >> 0x12 | 0xF0,\n        codePoint >> 0xC & 0x3F | 0x80,\n        codePoint >> 0x6 & 0x3F | 0x80,\n        codePoint & 0x3F | 0x80\n      )\n    } else {\n      throw new Error('Invalid code point')\n    }\n  }\n\n  return bytes\n}\n\nfunction asciiToBytes (str) {\n  var byteArray = []\n  for (var i = 0; i < str.length; i++) {\n    // Node's code seems to be doing this and not & 0x7F..\n    byteArray.push(str.charCodeAt(i) & 0xFF)\n  }\n  return byteArray\n}\n\nfunction utf16leToBytes (str, units) {\n  var c, hi, lo\n  var byteArray = []\n  for (var i = 0; i < str.length; i++) {\n    if ((units -= 2) < 0) break\n\n    c = str.charCodeAt(i)\n    hi = c >> 8\n    lo = c % 256\n    byteArray.push(lo)\n    byteArray.push(hi)\n  }\n\n  return byteArray\n}\n\nfunction base64ToBytes (str) {\n  return base64.toByteArray(base64clean(str))\n}\n\nfunction blitBuffer (src, dst, offset, length) {\n  for (var i = 0; i < length; i++) {\n    if ((i + offset >= dst.length) || (i >= src.length)) break\n    dst[i + offset] = src[i]\n  }\n  return i\n}\n","var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';\n\n;(function (exports) {\n\t'use strict';\n\n  var Arr = (typeof Uint8Array !== 'undefined')\n    ? Uint8Array\n    : Array\n\n\tvar PLUS   = '+'.charCodeAt(0)\n\tvar SLASH  = '/'.charCodeAt(0)\n\tvar NUMBER = '0'.charCodeAt(0)\n\tvar LOWER  = 'a'.charCodeAt(0)\n\tvar UPPER  = 'A'.charCodeAt(0)\n\tvar PLUS_URL_SAFE = '-'.charCodeAt(0)\n\tvar SLASH_URL_SAFE = '_'.charCodeAt(0)\n\n\tfunction decode (elt) {\n\t\tvar code = elt.charCodeAt(0)\n\t\tif (code === PLUS ||\n\t\t    code === PLUS_URL_SAFE)\n\t\t\treturn 62 // '+'\n\t\tif (code === SLASH ||\n\t\t    code === SLASH_URL_SAFE)\n\t\t\treturn 63 // '/'\n\t\tif (code < NUMBER)\n\t\t\treturn -1 //no match\n\t\tif (code < NUMBER + 10)\n\t\t\treturn code - NUMBER + 26 + 26\n\t\tif (code < UPPER + 26)\n\t\t\treturn code - UPPER\n\t\tif (code < LOWER + 26)\n\t\t\treturn code - LOWER + 26\n\t}\n\n\tfunction b64ToByteArray (b64) {\n\t\tvar i, j, l, tmp, placeHolders, arr\n\n\t\tif (b64.length % 4 > 0) {\n\t\t\tthrow new Error('Invalid string. Length must be a multiple of 4')\n\t\t}\n\n\t\t// the number of equal signs (place holders)\n\t\t// if there are two placeholders, than the two characters before it\n\t\t// represent one byte\n\t\t// if there is only one, then the three characters before it represent 2 bytes\n\t\t// this is just a cheap hack to not do indexOf twice\n\t\tvar len = b64.length\n\t\tplaceHolders = '=' === b64.charAt(len - 2) ? 2 : '=' === b64.charAt(len - 1) ? 1 : 0\n\n\t\t// base64 is 4/3 + up to two characters of the original data\n\t\tarr = new Arr(b64.length * 3 / 4 - placeHolders)\n\n\t\t// if there are placeholders, only get up to the last complete 4 chars\n\t\tl = placeHolders > 0 ? b64.length - 4 : b64.length\n\n\t\tvar L = 0\n\n\t\tfunction push (v) {\n\t\t\tarr[L++] = v\n\t\t}\n\n\t\tfor (i = 0, j = 0; i < l; i += 4, j += 3) {\n\t\t\ttmp = (decode(b64.charAt(i)) << 18) | (decode(b64.charAt(i + 1)) << 12) | (decode(b64.charAt(i + 2)) << 6) | decode(b64.charAt(i + 3))\n\t\t\tpush((tmp & 0xFF0000) >> 16)\n\t\t\tpush((tmp & 0xFF00) >> 8)\n\t\t\tpush(tmp & 0xFF)\n\t\t}\n\n\t\tif (placeHolders === 2) {\n\t\t\ttmp = (decode(b64.charAt(i)) << 2) | (decode(b64.charAt(i + 1)) >> 4)\n\t\t\tpush(tmp & 0xFF)\n\t\t} else if (placeHolders === 1) {\n\t\t\ttmp = (decode(b64.charAt(i)) << 10) | (decode(b64.charAt(i + 1)) << 4) | (decode(b64.charAt(i + 2)) >> 2)\n\t\t\tpush((tmp >> 8) & 0xFF)\n\t\t\tpush(tmp & 0xFF)\n\t\t}\n\n\t\treturn arr\n\t}\n\n\tfunction uint8ToBase64 (uint8) {\n\t\tvar i,\n\t\t\textraBytes = uint8.length % 3, // if we have 1 byte left, pad 2 bytes\n\t\t\toutput = \"\",\n\t\t\ttemp, length\n\n\t\tfunction encode (num) {\n\t\t\treturn lookup.charAt(num)\n\t\t}\n\n\t\tfunction tripletToBase64 (num) {\n\t\t\treturn encode(num >> 18 & 0x3F) + encode(num >> 12 & 0x3F) + encode(num >> 6 & 0x3F) + encode(num & 0x3F)\n\t\t}\n\n\t\t// go through the array every three bytes, we'll deal with trailing stuff later\n\t\tfor (i = 0, length = uint8.length - extraBytes; i < length; i += 3) {\n\t\t\ttemp = (uint8[i] << 16) + (uint8[i + 1] << 8) + (uint8[i + 2])\n\t\t\toutput += tripletToBase64(temp)\n\t\t}\n\n\t\t// pad the end with zeros, but make sure to not forget the extra bytes\n\t\tswitch (extraBytes) {\n\t\t\tcase 1:\n\t\t\t\ttemp = uint8[uint8.length - 1]\n\t\t\t\toutput += encode(temp >> 2)\n\t\t\t\toutput += encode((temp << 4) & 0x3F)\n\t\t\t\toutput += '=='\n\t\t\t\tbreak\n\t\t\tcase 2:\n\t\t\t\ttemp = (uint8[uint8.length - 2] << 8) + (uint8[uint8.length - 1])\n\t\t\t\toutput += encode(temp >> 10)\n\t\t\t\toutput += encode((temp >> 4) & 0x3F)\n\t\t\t\toutput += encode((temp << 2) & 0x3F)\n\t\t\t\toutput += '='\n\t\t\t\tbreak\n\t\t}\n\n\t\treturn output\n\t}\n\n\texports.toByteArray = b64ToByteArray\n\texports.fromByteArray = uint8ToBase64\n}(typeof exports === 'undefined' ? (this.base64js = {}) : exports))\n","exports.read = function (buffer, offset, isLE, mLen, nBytes) {\n  var e, m\n  var eLen = nBytes * 8 - mLen - 1\n  var eMax = (1 << eLen) - 1\n  var eBias = eMax >> 1\n  var nBits = -7\n  var i = isLE ? (nBytes - 1) : 0\n  var d = isLE ? -1 : 1\n  var s = buffer[offset + i]\n\n  i += d\n\n  e = s & ((1 << (-nBits)) - 1)\n  s >>= (-nBits)\n  nBits += eLen\n  for (; nBits > 0; e = e * 256 + buffer[offset + i], i += d, nBits -= 8) {}\n\n  m = e & ((1 << (-nBits)) - 1)\n  e >>= (-nBits)\n  nBits += mLen\n  for (; nBits > 0; m = m * 256 + buffer[offset + i], i += d, nBits -= 8) {}\n\n  if (e === 0) {\n    e = 1 - eBias\n  } else if (e === eMax) {\n    return m ? NaN : ((s ? -1 : 1) * Infinity)\n  } else {\n    m = m + Math.pow(2, mLen)\n    e = e - eBias\n  }\n  return (s ? -1 : 1) * m * Math.pow(2, e - mLen)\n}\n\nexports.write = function (buffer, value, offset, isLE, mLen, nBytes) {\n  var e, m, c\n  var eLen = nBytes * 8 - mLen - 1\n  var eMax = (1 << eLen) - 1\n  var eBias = eMax >> 1\n  var rt = (mLen === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0)\n  var i = isLE ? 0 : (nBytes - 1)\n  var d = isLE ? 1 : -1\n  var s = value < 0 || (value === 0 && 1 / value < 0) ? 1 : 0\n\n  value = Math.abs(value)\n\n  if (isNaN(value) || value === Infinity) {\n    m = isNaN(value) ? 1 : 0\n    e = eMax\n  } else {\n    e = Math.floor(Math.log(value) / Math.LN2)\n    if (value * (c = Math.pow(2, -e)) < 1) {\n      e--\n      c *= 2\n    }\n    if (e + eBias >= 1) {\n      value += rt / c\n    } else {\n      value += rt * Math.pow(2, 1 - eBias)\n    }\n    if (value * c >= 2) {\n      e++\n      c /= 2\n    }\n\n    if (e + eBias >= eMax) {\n      m = 0\n      e = eMax\n    } else if (e + eBias >= 1) {\n      m = (value * c - 1) * Math.pow(2, mLen)\n      e = e + eBias\n    } else {\n      m = value * Math.pow(2, eBias - 1) * Math.pow(2, mLen)\n      e = 0\n    }\n  }\n\n  for (; mLen >= 8; buffer[offset + i] = m & 0xff, i += d, m /= 256, mLen -= 8) {}\n\n  e = (e << mLen) | m\n  eLen += mLen\n  for (; eLen > 0; buffer[offset + i] = e & 0xff, i += d, e /= 256, eLen -= 8) {}\n\n  buffer[offset + i - d] |= s * 128\n}\n","\n/**\n * isArray\n */\n\nvar isArray = Array.isArray;\n\n/**\n * toString\n */\n\nvar str = Object.prototype.toString;\n\n/**\n * Whether or not the given `val`\n * is an array.\n *\n * example:\n *\n *        isArray([]);\n *        // > true\n *        isArray(arguments);\n *        // > false\n *        isArray('');\n *        // > false\n *\n * @param {mixed} val\n * @return {bool}\n */\n\nmodule.exports = isArray || function (val) {\n  return !! val && '[object Array]' == str.call(val);\n};\n","/* jshint node: true */\n(function () {\n    \"use strict\";\n\n    function CookieAccessInfo(domain, path, secure, script) {\n        if (this instanceof CookieAccessInfo) {\n            this.domain = domain || undefined;\n            this.path = path || \"/\";\n            this.secure = !!secure;\n            this.script = !!script;\n            return this;\n        }\n        return new CookieAccessInfo(domain, path, secure, script);\n    }\n    exports.CookieAccessInfo = CookieAccessInfo;\n\n    function Cookie(cookiestr, request_domain, request_path) {\n        if (cookiestr instanceof Cookie) {\n            return cookiestr;\n        }\n        if (this instanceof Cookie) {\n            this.name = null;\n            this.value = null;\n            this.expiration_date = Infinity;\n            this.path = String(request_path || \"/\");\n            this.explicit_path = false;\n            this.domain = request_domain || null;\n            this.explicit_domain = false;\n            this.secure = false; //how to define default?\n            this.noscript = false; //httponly\n            if (cookiestr) {\n                this.parse(cookiestr, request_domain, request_path);\n            }\n            return this;\n        }\n        return new Cookie(cookiestr, request_domain, request_path);\n    }\n    exports.Cookie = Cookie;\n\n    Cookie.prototype.toString = function toString() {\n        var str = [this.name + \"=\" + this.value];\n        if (this.expiration_date !== Infinity) {\n            str.push(\"expires=\" + (new Date(this.expiration_date)).toGMTString());\n        }\n        if (this.domain) {\n            str.push(\"domain=\" + this.domain);\n        }\n        if (this.path) {\n            str.push(\"path=\" + this.path);\n        }\n        if (this.secure) {\n            str.push(\"secure\");\n        }\n        if (this.noscript) {\n            str.push(\"httponly\");\n        }\n        return str.join(\"; \");\n    };\n\n    Cookie.prototype.toValueString = function toValueString() {\n        return this.name + \"=\" + this.value;\n    };\n\n    var cookie_str_splitter = /[:](?=\\s*[a-zA-Z0-9_\\-]+\\s*[=])/g;\n    Cookie.prototype.parse = function parse(str, request_domain, request_path) {\n        if (this instanceof Cookie) {\n            var parts = str.split(\";\").filter(function (value) {\n                    return !!value;\n                }),\n                pair = parts[0].match(/([^=]+)=([\\s\\S]*)/),\n                key = pair[1],\n                value = pair[2],\n                i;\n            this.name = key;\n            this.value = value;\n\n            for (i = 1; i < parts.length; i += 1) {\n                pair = parts[i].match(/([^=]+)(?:=([\\s\\S]*))?/);\n                key = pair[1].trim().toLowerCase();\n                value = pair[2];\n                switch (key) {\n                case \"httponly\":\n                    this.noscript = true;\n                    break;\n                case \"expires\":\n                    this.expiration_date = value ?\n                            Number(Date.parse(value)) :\n                            Infinity;\n                    break;\n                case \"path\":\n                    this.path = value ?\n                            value.trim() :\n                            \"\";\n                    this.explicit_path = true;\n                    break;\n                case \"domain\":\n                    this.domain = value ?\n                            value.trim() :\n                            \"\";\n                    this.explicit_domain = !!this.domain;\n                    break;\n                case \"secure\":\n                    this.secure = true;\n                    break;\n                }\n            }\n\n            if (!this.explicit_path) {\n               this.path = request_path || \"/\";\n            }\n            if (!this.explicit_domain) {\n               this.domain = request_domain;\n            }\n\n            return this;\n        }\n        return new Cookie().parse(str, request_domain, request_path);\n    };\n\n    Cookie.prototype.matches = function matches(access_info) {\n        if (this.noscript && access_info.script ||\n                this.secure && !access_info.secure ||\n                !this.collidesWith(access_info)) {\n            return false;\n        }\n        return true;\n    };\n\n    Cookie.prototype.collidesWith = function collidesWith(access_info) {\n        if ((this.path && !access_info.path) || (this.domain && !access_info.domain)) {\n            return false;\n        }\n        if (this.path && access_info.path.indexOf(this.path) !== 0) {\n            return false;\n        }\n        if (this.explicit_path && access_info.path.indexOf( this.path ) !== 0) {\n           return false;\n        }\n        var access_domain = access_info.domain && access_info.domain.replace(/^[\\.]/,'');\n        var cookie_domain = this.domain && this.domain.replace(/^[\\.]/,'');\n        if (cookie_domain === access_domain) {\n            return true;\n        }\n        if (cookie_domain) {\n            if (!this.explicit_domain) {\n                return false; // we already checked if the domains were exactly the same\n            }\n            var wildcard = access_domain.indexOf(cookie_domain);\n            if (wildcard === -1 || wildcard !== access_domain.length - cookie_domain.length) {\n                return false;\n            }\n            return true;\n        }\n        return true;\n    };\n\n    function CookieJar() {\n        var cookies, cookies_list, collidable_cookie;\n        if (this instanceof CookieJar) {\n            cookies = Object.create(null); //name: [Cookie]\n\n            this.setCookie = function setCookie(cookie, request_domain, request_path) {\n                var remove, i;\n                cookie = new Cookie(cookie, request_domain, request_path);\n                //Delete the cookie if the set is past the current time\n                remove = cookie.expiration_date <= Date.now();\n                if (cookies[cookie.name] !== undefined) {\n                    cookies_list = cookies[cookie.name];\n                    for (i = 0; i < cookies_list.length; i += 1) {\n                        collidable_cookie = cookies_list[i];\n                        if (collidable_cookie.collidesWith(cookie)) {\n                            if (remove) {\n                                cookies_list.splice(i, 1);\n                                if (cookies_list.length === 0) {\n                                    delete cookies[cookie.name];\n                                }\n                                return false;\n                            }\n                            cookies_list[i] = cookie;\n                            return cookie;\n                        }\n                    }\n                    if (remove) {\n                        return false;\n                    }\n                    cookies_list.push(cookie);\n                    return cookie;\n                }\n                if (remove) {\n                    return false;\n                }\n                cookies[cookie.name] = [cookie];\n                return cookies[cookie.name];\n            };\n            //returns a cookie\n            this.getCookie = function getCookie(cookie_name, access_info) {\n                var cookie, i;\n                cookies_list = cookies[cookie_name];\n                if (!cookies_list) {\n                    return;\n                }\n                for (i = 0; i < cookies_list.length; i += 1) {\n                    cookie = cookies_list[i];\n                    if (cookie.expiration_date <= Date.now()) {\n                        if (cookies_list.length === 0) {\n                            delete cookies[cookie.name];\n                        }\n                        continue;\n                    }\n\n                    if (cookie.matches(access_info)) {\n                        return cookie;\n                    }\n                }\n            };\n            //returns a list of cookies\n            this.getCookies = function getCookies(access_info) {\n                var matches = [], cookie_name, cookie;\n                for (cookie_name in cookies) {\n                    cookie = this.getCookie(cookie_name, access_info);\n                    if (cookie) {\n                        matches.push(cookie);\n                    }\n                }\n                matches.toString = function toString() {\n                    return matches.join(\":\");\n                };\n                matches.toValueString = function toValueString() {\n                    return matches.map(function (c) {\n                        return c.toValueString();\n                    }).join(';');\n                };\n                return matches;\n            };\n\n            return this;\n        }\n        return new CookieJar();\n    }\n    exports.CookieJar = CookieJar;\n\n    //returns list of cookies that were set correctly. Cookies that are expired and removed are not returned.\n    CookieJar.prototype.setCookies = function setCookies(cookies, request_domain, request_path) {\n        cookies = Array.isArray(cookies) ?\n                cookies :\n                cookies.split(cookie_str_splitter);\n        var successful = [],\n            i,\n            cookie;\n        cookies = cookies.map(function(item){\n            return new Cookie(item, request_domain, request_path);\n        });\n        for (i = 0; i < cookies.length; i += 1) {\n            cookie = cookies[i];\n            if (this.setCookie(cookie, request_domain, request_path)) {\n                successful.push(cookie);\n            }\n        }\n        return successful;\n    };\n}());\n","'use strict';\n\n\nvar yaml = require('./lib/js-yaml.js');\n\n\nmodule.exports = yaml;\n","'use strict';\n\n\nvar loader = require('./js-yaml/loader');\nvar dumper = require('./js-yaml/dumper');\n\n\nfunction deprecated(name) {\n  return function () {\n    throw new Error('Function ' + name + ' is deprecated and cannot be used.');\n  };\n}\n\n\nmodule.exports.Type                = require('./js-yaml/type');\nmodule.exports.Schema              = require('./js-yaml/schema');\nmodule.exports.FAILSAFE_SCHEMA     = require('./js-yaml/schema/failsafe');\nmodule.exports.JSON_SCHEMA         = require('./js-yaml/schema/json');\nmodule.exports.CORE_SCHEMA         = require('./js-yaml/schema/core');\nmodule.exports.DEFAULT_SAFE_SCHEMA = require('./js-yaml/schema/default_safe');\nmodule.exports.DEFAULT_FULL_SCHEMA = require('./js-yaml/schema/default_full');\nmodule.exports.load                = loader.load;\nmodule.exports.loadAll             = loader.loadAll;\nmodule.exports.safeLoad            = loader.safeLoad;\nmodule.exports.safeLoadAll         = loader.safeLoadAll;\nmodule.exports.dump                = dumper.dump;\nmodule.exports.safeDump            = dumper.safeDump;\nmodule.exports.YAMLException       = require('./js-yaml/exception');\n\n// Deprecated schema names from JS-YAML 2.0.x\nmodule.exports.MINIMAL_SCHEMA = require('./js-yaml/schema/failsafe');\nmodule.exports.SAFE_SCHEMA    = require('./js-yaml/schema/default_safe');\nmodule.exports.DEFAULT_SCHEMA = require('./js-yaml/schema/default_full');\n\n// Deprecated functions from JS-YAML 1.x.x\nmodule.exports.scan           = deprecated('scan');\nmodule.exports.parse          = deprecated('parse');\nmodule.exports.compose        = deprecated('compose');\nmodule.exports.addConstructor = deprecated('addConstructor');\n","'use strict';\n\n\nfunction isNothing(subject) {\n  return (typeof subject === 'undefined') || (subject === null);\n}\n\n\nfunction isObject(subject) {\n  return (typeof subject === 'object') && (subject !== null);\n}\n\n\nfunction toArray(sequence) {\n  if (Array.isArray(sequence)) return sequence;\n  else if (isNothing(sequence)) return [];\n\n  return [ sequence ];\n}\n\n\nfunction extend(target, source) {\n  var index, length, key, sourceKeys;\n\n  if (source) {\n    sourceKeys = Object.keys(source);\n\n    for (index = 0, length = sourceKeys.length; index < length; index += 1) {\n      key = sourceKeys[index];\n      target[key] = source[key];\n    }\n  }\n\n  return target;\n}\n\n\nfunction repeat(string, count) {\n  var result = '', cycle;\n\n  for (cycle = 0; cycle < count; cycle += 1) {\n    result += string;\n  }\n\n  return result;\n}\n\n\nfunction isNegativeZero(number) {\n  return (number === 0) && (Number.NEGATIVE_INFINITY === 1 / number);\n}\n\n\nmodule.exports.isNothing      = isNothing;\nmodule.exports.isObject       = isObject;\nmodule.exports.toArray        = toArray;\nmodule.exports.repeat         = repeat;\nmodule.exports.isNegativeZero = isNegativeZero;\nmodule.exports.extend         = extend;\n","'use strict';\n\n/*eslint-disable no-use-before-define*/\n\nvar common              = require('./common');\nvar YAMLException       = require('./exception');\nvar DEFAULT_FULL_SCHEMA = require('./schema/default_full');\nvar DEFAULT_SAFE_SCHEMA = require('./schema/default_safe');\n\nvar _toString       = Object.prototype.toString;\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\n\nvar CHAR_TAB                  = 0x09; /* Tab */\nvar CHAR_LINE_FEED            = 0x0A; /* LF */\nvar CHAR_SPACE                = 0x20; /* Space */\nvar CHAR_EXCLAMATION          = 0x21; /* ! */\nvar CHAR_DOUBLE_QUOTE         = 0x22; /* \" */\nvar CHAR_SHARP                = 0x23; /* # */\nvar CHAR_PERCENT              = 0x25; /* % */\nvar CHAR_AMPERSAND            = 0x26; /* & */\nvar CHAR_SINGLE_QUOTE         = 0x27; /* ' */\nvar CHAR_ASTERISK             = 0x2A; /* * */\nvar CHAR_COMMA                = 0x2C; /* , */\nvar CHAR_MINUS                = 0x2D; /* - */\nvar CHAR_COLON                = 0x3A; /* : */\nvar CHAR_GREATER_THAN         = 0x3E; /* > */\nvar CHAR_QUESTION             = 0x3F; /* ? */\nvar CHAR_COMMERCIAL_AT        = 0x40; /* @ */\nvar CHAR_LEFT_SQUARE_BRACKET  = 0x5B; /* [ */\nvar CHAR_RIGHT_SQUARE_BRACKET = 0x5D; /* ] */\nvar CHAR_GRAVE_ACCENT         = 0x60; /* ` */\nvar CHAR_LEFT_CURLY_BRACKET   = 0x7B; /* { */\nvar CHAR_VERTICAL_LINE        = 0x7C; /* | */\nvar CHAR_RIGHT_CURLY_BRACKET  = 0x7D; /* } */\n\nvar ESCAPE_SEQUENCES = {};\n\nESCAPE_SEQUENCES[0x00]   = '\\\\0';\nESCAPE_SEQUENCES[0x07]   = '\\\\a';\nESCAPE_SEQUENCES[0x08]   = '\\\\b';\nESCAPE_SEQUENCES[0x09]   = '\\\\t';\nESCAPE_SEQUENCES[0x0A]   = '\\\\n';\nESCAPE_SEQUENCES[0x0B]   = '\\\\v';\nESCAPE_SEQUENCES[0x0C]   = '\\\\f';\nESCAPE_SEQUENCES[0x0D]   = '\\\\r';\nESCAPE_SEQUENCES[0x1B]   = '\\\\e';\nESCAPE_SEQUENCES[0x22]   = '\\\\\"';\nESCAPE_SEQUENCES[0x5C]   = '\\\\\\\\';\nESCAPE_SEQUENCES[0x85]   = '\\\\N';\nESCAPE_SEQUENCES[0xA0]   = '\\\\_';\nESCAPE_SEQUENCES[0x2028] = '\\\\L';\nESCAPE_SEQUENCES[0x2029] = '\\\\P';\n\nvar DEPRECATED_BOOLEANS_SYNTAX = [\n  'y', 'Y', 'yes', 'Yes', 'YES', 'on', 'On', 'ON',\n  'n', 'N', 'no', 'No', 'NO', 'off', 'Off', 'OFF'\n];\n\nfunction compileStyleMap(schema, map) {\n  var result, keys, index, length, tag, style, type;\n\n  if (map === null) return {};\n\n  result = {};\n  keys = Object.keys(map);\n\n  for (index = 0, length = keys.length; index < length; index += 1) {\n    tag = keys[index];\n    style = String(map[tag]);\n\n    if (tag.slice(0, 2) === '!!') {\n      tag = 'tag:yaml.org,2002:' + tag.slice(2);\n    }\n\n    type = schema.compiledTypeMap[tag];\n\n    if (type && _hasOwnProperty.call(type.styleAliases, style)) {\n      style = type.styleAliases[style];\n    }\n\n    result[tag] = style;\n  }\n\n  return result;\n}\n\nfunction encodeHex(character) {\n  var string, handle, length;\n\n  string = character.toString(16).toUpperCase();\n\n  if (character <= 0xFF) {\n    handle = 'x';\n    length = 2;\n  } else if (character <= 0xFFFF) {\n    handle = 'u';\n    length = 4;\n  } else if (character <= 0xFFFFFFFF) {\n    handle = 'U';\n    length = 8;\n  } else {\n    throw new YAMLException('code point within a string may not be greater than 0xFFFFFFFF');\n  }\n\n  return '\\\\' + handle + common.repeat('0', length - string.length) + string;\n}\n\nfunction State(options) {\n  this.schema       = options['schema'] || DEFAULT_FULL_SCHEMA;\n  this.indent       = Math.max(1, (options['indent'] || 2));\n  this.skipInvalid  = options['skipInvalid'] || false;\n  this.flowLevel    = (common.isNothing(options['flowLevel']) ? -1 : options['flowLevel']);\n  this.styleMap     = compileStyleMap(this.schema, options['styles'] || null);\n  this.sortKeys     = options['sortKeys'] || false;\n  this.lineWidth    = options['lineWidth'] || 80;\n  this.noRefs       = options['noRefs'] || false;\n  this.noCompatMode = options['noCompatMode'] || false;\n\n  this.implicitTypes = this.schema.compiledImplicit;\n  this.explicitTypes = this.schema.compiledExplicit;\n\n  this.tag = null;\n  this.result = '';\n\n  this.duplicates = [];\n  this.usedDuplicates = null;\n}\n\n// Indents every line in a string. Empty lines (\\n only) are not indented.\nfunction indentString(string, spaces) {\n  var ind = common.repeat(' ', spaces),\n      position = 0,\n      next = -1,\n      result = '',\n      line,\n      length = string.length;\n\n  while (position < length) {\n    next = string.indexOf('\\n', position);\n    if (next === -1) {\n      line = string.slice(position);\n      position = length;\n    } else {\n      line = string.slice(position, next + 1);\n      position = next + 1;\n    }\n\n    if (line.length && line !== '\\n') result += ind;\n\n    result += line;\n  }\n\n  return result;\n}\n\nfunction generateNextLine(state, level) {\n  return '\\n' + common.repeat(' ', state.indent * level);\n}\n\nfunction testImplicitResolving(state, str) {\n  var index, length, type;\n\n  for (index = 0, length = state.implicitTypes.length; index < length; index += 1) {\n    type = state.implicitTypes[index];\n\n    if (type.resolve(str)) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\n// [33] s-white ::= s-space | s-tab\nfunction isWhitespace(c) {\n  return c === CHAR_SPACE || c === CHAR_TAB;\n}\n\n// Returns true if the character can be printed without escaping.\n// From YAML 1.2: \"any allowed characters known to be non-printable\n// should also be escaped. [However,] This isn’t mandatory\"\n// Derived from nb-char - \\t - #x85 - #xA0 - #x2028 - #x2029.\nfunction isPrintable(c) {\n  return  (0x00020 <= c && c <= 0x00007E)\n      || ((0x000A1 <= c && c <= 0x00D7FF) && c !== 0x2028 && c !== 0x2029)\n      || ((0x0E000 <= c && c <= 0x00FFFD) && c !== 0xFEFF /* BOM */)\n      ||  (0x10000 <= c && c <= 0x10FFFF);\n}\n\n// Simplified test for values allowed after the first character in plain style.\nfunction isPlainSafe(c) {\n  // Uses a subset of nb-char - c-flow-indicator - \":\" - \"#\"\n  // where nb-char ::= c-printable - b-char - c-byte-order-mark.\n  return isPrintable(c) && c !== 0xFEFF\n    // - c-flow-indicator\n    && c !== CHAR_COMMA\n    && c !== CHAR_LEFT_SQUARE_BRACKET\n    && c !== CHAR_RIGHT_SQUARE_BRACKET\n    && c !== CHAR_LEFT_CURLY_BRACKET\n    && c !== CHAR_RIGHT_CURLY_BRACKET\n    // - \":\" - \"#\"\n    && c !== CHAR_COLON\n    && c !== CHAR_SHARP;\n}\n\n// Simplified test for values allowed as the first character in plain style.\nfunction isPlainSafeFirst(c) {\n  // Uses a subset of ns-char - c-indicator\n  // where ns-char = nb-char - s-white.\n  return isPrintable(c) && c !== 0xFEFF\n    && !isWhitespace(c) // - s-white\n    // - (c-indicator ::=\n    // “-” | “?” | “:” | “,” | “[” | “]” | “{” | “}”\n    && c !== CHAR_MINUS\n    && c !== CHAR_QUESTION\n    && c !== CHAR_COLON\n    && c !== CHAR_COMMA\n    && c !== CHAR_LEFT_SQUARE_BRACKET\n    && c !== CHAR_RIGHT_SQUARE_BRACKET\n    && c !== CHAR_LEFT_CURLY_BRACKET\n    && c !== CHAR_RIGHT_CURLY_BRACKET\n    // | “#” | “&” | “*” | “!” | “|” | “>” | “'” | “\"”\n    && c !== CHAR_SHARP\n    && c !== CHAR_AMPERSAND\n    && c !== CHAR_ASTERISK\n    && c !== CHAR_EXCLAMATION\n    && c !== CHAR_VERTICAL_LINE\n    && c !== CHAR_GREATER_THAN\n    && c !== CHAR_SINGLE_QUOTE\n    && c !== CHAR_DOUBLE_QUOTE\n    // | “%” | “@” | “`”)\n    && c !== CHAR_PERCENT\n    && c !== CHAR_COMMERCIAL_AT\n    && c !== CHAR_GRAVE_ACCENT;\n}\n\nvar STYLE_PLAIN   = 1,\n    STYLE_SINGLE  = 2,\n    STYLE_LITERAL = 3,\n    STYLE_FOLDED  = 4,\n    STYLE_DOUBLE  = 5;\n\n// Determines which scalar styles are possible and returns the preferred style.\n// lineWidth = -1 => no limit.\n// Pre-conditions: str.length > 0.\n// Post-conditions:\n//    STYLE_PLAIN or STYLE_SINGLE => no \\n are in the string.\n//    STYLE_LITERAL => no lines are suitable for folding (or lineWidth is -1).\n//    STYLE_FOLDED => a line > lineWidth and can be folded (and lineWidth != -1).\nfunction chooseScalarStyle(string, singleLineOnly, indentPerLevel, lineWidth, testAmbiguousType) {\n  var i;\n  var char;\n  var hasLineBreak = false;\n  var hasFoldableLine = false; // only checked if shouldTrackWidth\n  var shouldTrackWidth = lineWidth !== -1;\n  var previousLineBreak = -1; // count the first line correctly\n  var plain = isPlainSafeFirst(string.charCodeAt(0))\n          && !isWhitespace(string.charCodeAt(string.length - 1));\n\n  if (singleLineOnly) {\n    // Case: no block styles.\n    // Check for disallowed characters to rule out plain and single.\n    for (i = 0; i < string.length; i++) {\n      char = string.charCodeAt(i);\n      if (!isPrintable(char)) {\n        return STYLE_DOUBLE;\n      }\n      plain = plain && isPlainSafe(char);\n    }\n  } else {\n    // Case: block styles permitted.\n    for (i = 0; i < string.length; i++) {\n      char = string.charCodeAt(i);\n      if (char === CHAR_LINE_FEED) {\n        hasLineBreak = true;\n        // Check if any line can be folded.\n        if (shouldTrackWidth) {\n          hasFoldableLine = hasFoldableLine ||\n            // Foldable line = too long, and not more-indented.\n            (i - previousLineBreak - 1 > lineWidth &&\n             string[previousLineBreak + 1] !== ' ');\n          previousLineBreak = i;\n        }\n      } else if (!isPrintable(char)) {\n        return STYLE_DOUBLE;\n      }\n      plain = plain && isPlainSafe(char);\n    }\n    // in case the end is missing a \\n\n    hasFoldableLine = hasFoldableLine || (shouldTrackWidth &&\n      (i - previousLineBreak - 1 > lineWidth &&\n       string[previousLineBreak + 1] !== ' '));\n  }\n  // Although every style can represent \\n without escaping, prefer block styles\n  // for multiline, since they're more readable and they don't add empty lines.\n  // Also prefer folding a super-long line.\n  if (!hasLineBreak && !hasFoldableLine) {\n    // Strings interpretable as another type have to be quoted;\n    // e.g. the string 'true' vs. the boolean true.\n    return plain && !testAmbiguousType(string)\n      ? STYLE_PLAIN : STYLE_SINGLE;\n  }\n  // Edge case: block indentation indicator can only have one digit.\n  if (string[0] === ' ' && indentPerLevel > 9) {\n    return STYLE_DOUBLE;\n  }\n  // At this point we know block styles are valid.\n  // Prefer literal style unless we want to fold.\n  return hasFoldableLine ? STYLE_FOLDED : STYLE_LITERAL;\n}\n\n// Note: line breaking/folding is implemented for only the folded style.\n// NB. We drop the last trailing newline (if any) of a returned block scalar\n//  since the dumper adds its own newline. This always works:\n//    • No ending newline => unaffected; already using strip \"-\" chomping.\n//    • Ending newline    => removed then restored.\n//  Importantly, this keeps the \"+\" chomp indicator from gaining an extra line.\nfunction writeScalar(state, string, level, iskey) {\n  state.dump = (function () {\n    if (string.length === 0) {\n      return \"''\";\n    }\n    if (!state.noCompatMode &&\n        DEPRECATED_BOOLEANS_SYNTAX.indexOf(string) !== -1) {\n      return \"'\" + string + \"'\";\n    }\n\n    var indent = state.indent * Math.max(1, level); // no 0-indent scalars\n    // As indentation gets deeper, let the width decrease monotonically\n    // to the lower bound min(state.lineWidth, 40).\n    // Note that this implies\n    //  state.lineWidth ≤ 40 + state.indent: width is fixed at the lower bound.\n    //  state.lineWidth > 40 + state.indent: width decreases until the lower bound.\n    // This behaves better than a constant minimum width which disallows narrower options,\n    // or an indent threshold which causes the width to suddenly increase.\n    var lineWidth = state.lineWidth === -1\n      ? -1 : Math.max(Math.min(state.lineWidth, 40), state.lineWidth - indent);\n\n    // Without knowing if keys are implicit/explicit, assume implicit for safety.\n    var singleLineOnly = iskey\n      // No block styles in flow mode.\n      || (state.flowLevel > -1 && level >= state.flowLevel);\n    function testAmbiguity(string) {\n      return testImplicitResolving(state, string);\n    }\n\n    switch (chooseScalarStyle(string, singleLineOnly, state.indent, lineWidth, testAmbiguity)) {\n      case STYLE_PLAIN:\n        return string;\n      case STYLE_SINGLE:\n        return \"'\" + string.replace(/'/g, \"''\") + \"'\";\n      case STYLE_LITERAL:\n        return '|' + blockHeader(string, state.indent)\n          + dropEndingNewline(indentString(string, indent));\n      case STYLE_FOLDED:\n        return '>' + blockHeader(string, state.indent)\n          + dropEndingNewline(indentString(foldString(string, lineWidth), indent));\n      case STYLE_DOUBLE:\n        return '\"' + escapeString(string, lineWidth) + '\"';\n      default:\n        throw new YAMLException('impossible error: invalid scalar style');\n    }\n  }());\n}\n\n// Pre-conditions: string is valid for a block scalar, 1 <= indentPerLevel <= 9.\nfunction blockHeader(string, indentPerLevel) {\n  var indentIndicator = (string[0] === ' ') ? String(indentPerLevel) : '';\n\n  // note the special case: the string '\\n' counts as a \"trailing\" empty line.\n  var clip =          string[string.length - 1] === '\\n';\n  var keep = clip && (string[string.length - 2] === '\\n' || string === '\\n');\n  var chomp = keep ? '+' : (clip ? '' : '-');\n\n  return indentIndicator + chomp + '\\n';\n}\n\n// (See the note for writeScalar.)\nfunction dropEndingNewline(string) {\n  return string[string.length - 1] === '\\n' ? string.slice(0, -1) : string;\n}\n\n// Note: a long line without a suitable break point will exceed the width limit.\n// Pre-conditions: every char in str isPrintable, str.length > 0, width > 0.\nfunction foldString(string, width) {\n  // In folded style, $k$ consecutive newlines output as $k+1$ newlines—\n  // unless they're before or after a more-indented line, or at the very\n  // beginning or end, in which case $k$ maps to $k$.\n  // Therefore, parse each chunk as newline(s) followed by a content line.\n  var lineRe = /(\\n+)([^\\n]*)/g;\n\n  // first line (possibly an empty line)\n  var result = (function () {\n    var nextLF = string.indexOf('\\n');\n    nextLF = nextLF !== -1 ? nextLF : string.length;\n    lineRe.lastIndex = nextLF;\n    return foldLine(string.slice(0, nextLF), width);\n  }());\n  // If we haven't reached the first content line yet, don't add an extra \\n.\n  var prevMoreIndented = string[0] === '\\n' || string[0] === ' ';\n  var moreIndented;\n\n  // rest of the lines\n  var match;\n  while ((match = lineRe.exec(string))) {\n    var prefix = match[1], line = match[2];\n    moreIndented = (line[0] === ' ');\n    result += prefix\n      + (!prevMoreIndented && !moreIndented && line !== ''\n        ? '\\n' : '')\n      + foldLine(line, width);\n    prevMoreIndented = moreIndented;\n  }\n\n  return result;\n}\n\n// Greedy line breaking.\n// Picks the longest line under the limit each time,\n// otherwise settles for the shortest line over the limit.\n// NB. More-indented lines *cannot* be folded, as that would add an extra \\n.\nfunction foldLine(line, width) {\n  if (line === '' || line[0] === ' ') return line;\n\n  // Since a more-indented line adds a \\n, breaks can't be followed by a space.\n  var breakRe = / [^ ]/g; // note: the match index will always be <= length-2.\n  var match;\n  // start is an inclusive index. end, curr, and next are exclusive.\n  var start = 0, end, curr = 0, next = 0;\n  var result = '';\n\n  // Invariants: 0 <= start <= length-1.\n  //   0 <= curr <= next <= max(0, length-2). curr - start <= width.\n  // Inside the loop:\n  //   A match implies length >= 2, so curr and next are <= length-2.\n  while ((match = breakRe.exec(line))) {\n    next = match.index;\n    // maintain invariant: curr - start <= width\n    if (next - start > width) {\n      end = (curr > start) ? curr : next; // derive end <= length-2\n      result += '\\n' + line.slice(start, end);\n      // skip the space that was output as \\n\n      start = end + 1;                    // derive start <= length-1\n    }\n    curr = next;\n  }\n\n  // By the invariants, start <= length-1, so there is something left over.\n  // It is either the whole string or a part starting from non-whitespace.\n  result += '\\n';\n  // Insert a break if the remainder is too long and there is a break available.\n  if (line.length - start > width && curr > start) {\n    result += line.slice(start, curr) + '\\n' + line.slice(curr + 1);\n  } else {\n    result += line.slice(start);\n  }\n\n  return result.slice(1); // drop extra \\n joiner\n}\n\n// Escapes a double-quoted string.\nfunction escapeString(string) {\n  var result = '';\n  var char;\n  var escapeSeq;\n\n  for (var i = 0; i < string.length; i++) {\n    char = string.charCodeAt(i);\n    escapeSeq = ESCAPE_SEQUENCES[char];\n    result += !escapeSeq && isPrintable(char)\n      ? string[i]\n      : escapeSeq || encodeHex(char);\n  }\n\n  return result;\n}\n\nfunction writeFlowSequence(state, level, object) {\n  var _result = '',\n      _tag    = state.tag,\n      index,\n      length;\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    // Write only valid elements.\n    if (writeNode(state, level, object[index], false, false)) {\n      if (index !== 0) _result += ', ';\n      _result += state.dump;\n    }\n  }\n\n  state.tag = _tag;\n  state.dump = '[' + _result + ']';\n}\n\nfunction writeBlockSequence(state, level, object, compact) {\n  var _result = '',\n      _tag    = state.tag,\n      index,\n      length;\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    // Write only valid elements.\n    if (writeNode(state, level + 1, object[index], true, true)) {\n      if (!compact || index !== 0) {\n        _result += generateNextLine(state, level);\n      }\n      _result += '- ' + state.dump;\n    }\n  }\n\n  state.tag = _tag;\n  state.dump = _result || '[]'; // Empty sequence if no valid values.\n}\n\nfunction writeFlowMapping(state, level, object) {\n  var _result       = '',\n      _tag          = state.tag,\n      objectKeyList = Object.keys(object),\n      index,\n      length,\n      objectKey,\n      objectValue,\n      pairBuffer;\n\n  for (index = 0, length = objectKeyList.length; index < length; index += 1) {\n    pairBuffer = '';\n\n    if (index !== 0) pairBuffer += ', ';\n\n    objectKey = objectKeyList[index];\n    objectValue = object[objectKey];\n\n    if (!writeNode(state, level, objectKey, false, false)) {\n      continue; // Skip this pair because of invalid key;\n    }\n\n    if (state.dump.length > 1024) pairBuffer += '? ';\n\n    pairBuffer += state.dump + ': ';\n\n    if (!writeNode(state, level, objectValue, false, false)) {\n      continue; // Skip this pair because of invalid value.\n    }\n\n    pairBuffer += state.dump;\n\n    // Both key and value are valid.\n    _result += pairBuffer;\n  }\n\n  state.tag = _tag;\n  state.dump = '{' + _result + '}';\n}\n\nfunction writeBlockMapping(state, level, object, compact) {\n  var _result       = '',\n      _tag          = state.tag,\n      objectKeyList = Object.keys(object),\n      index,\n      length,\n      objectKey,\n      objectValue,\n      explicitPair,\n      pairBuffer;\n\n  // Allow sorting keys so that the output file is deterministic\n  if (state.sortKeys === true) {\n    // Default sorting\n    objectKeyList.sort();\n  } else if (typeof state.sortKeys === 'function') {\n    // Custom sort function\n    objectKeyList.sort(state.sortKeys);\n  } else if (state.sortKeys) {\n    // Something is wrong\n    throw new YAMLException('sortKeys must be a boolean or a function');\n  }\n\n  for (index = 0, length = objectKeyList.length; index < length; index += 1) {\n    pairBuffer = '';\n\n    if (!compact || index !== 0) {\n      pairBuffer += generateNextLine(state, level);\n    }\n\n    objectKey = objectKeyList[index];\n    objectValue = object[objectKey];\n\n    if (!writeNode(state, level + 1, objectKey, true, true, true)) {\n      continue; // Skip this pair because of invalid key.\n    }\n\n    explicitPair = (state.tag !== null && state.tag !== '?') ||\n                   (state.dump && state.dump.length > 1024);\n\n    if (explicitPair) {\n      if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {\n        pairBuffer += '?';\n      } else {\n        pairBuffer += '? ';\n      }\n    }\n\n    pairBuffer += state.dump;\n\n    if (explicitPair) {\n      pairBuffer += generateNextLine(state, level);\n    }\n\n    if (!writeNode(state, level + 1, objectValue, true, explicitPair)) {\n      continue; // Skip this pair because of invalid value.\n    }\n\n    if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {\n      pairBuffer += ':';\n    } else {\n      pairBuffer += ': ';\n    }\n\n    pairBuffer += state.dump;\n\n    // Both key and value are valid.\n    _result += pairBuffer;\n  }\n\n  state.tag = _tag;\n  state.dump = _result || '{}'; // Empty mapping if no valid pairs.\n}\n\nfunction detectType(state, object, explicit) {\n  var _result, typeList, index, length, type, style;\n\n  typeList = explicit ? state.explicitTypes : state.implicitTypes;\n\n  for (index = 0, length = typeList.length; index < length; index += 1) {\n    type = typeList[index];\n\n    if ((type.instanceOf  || type.predicate) &&\n        (!type.instanceOf || ((typeof object === 'object') && (object instanceof type.instanceOf))) &&\n        (!type.predicate  || type.predicate(object))) {\n\n      state.tag = explicit ? type.tag : '?';\n\n      if (type.represent) {\n        style = state.styleMap[type.tag] || type.defaultStyle;\n\n        if (_toString.call(type.represent) === '[object Function]') {\n          _result = type.represent(object, style);\n        } else if (_hasOwnProperty.call(type.represent, style)) {\n          _result = type.represent[style](object, style);\n        } else {\n          throw new YAMLException('!<' + type.tag + '> tag resolver accepts not \"' + style + '\" style');\n        }\n\n        state.dump = _result;\n      }\n\n      return true;\n    }\n  }\n\n  return false;\n}\n\n// Serializes `object` and writes it to global `result`.\n// Returns true on success, or false on invalid object.\n//\nfunction writeNode(state, level, object, block, compact, iskey) {\n  state.tag = null;\n  state.dump = object;\n\n  if (!detectType(state, object, false)) {\n    detectType(state, object, true);\n  }\n\n  var type = _toString.call(state.dump);\n\n  if (block) {\n    block = (state.flowLevel < 0 || state.flowLevel > level);\n  }\n\n  var objectOrArray = type === '[object Object]' || type === '[object Array]',\n      duplicateIndex,\n      duplicate;\n\n  if (objectOrArray) {\n    duplicateIndex = state.duplicates.indexOf(object);\n    duplicate = duplicateIndex !== -1;\n  }\n\n  if ((state.tag !== null && state.tag !== '?') || duplicate || (state.indent !== 2 && level > 0)) {\n    compact = false;\n  }\n\n  if (duplicate && state.usedDuplicates[duplicateIndex]) {\n    state.dump = '*ref_' + duplicateIndex;\n  } else {\n    if (objectOrArray && duplicate && !state.usedDuplicates[duplicateIndex]) {\n      state.usedDuplicates[duplicateIndex] = true;\n    }\n    if (type === '[object Object]') {\n      if (block && (Object.keys(state.dump).length !== 0)) {\n        writeBlockMapping(state, level, state.dump, compact);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + state.dump;\n        }\n      } else {\n        writeFlowMapping(state, level, state.dump);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;\n        }\n      }\n    } else if (type === '[object Array]') {\n      if (block && (state.dump.length !== 0)) {\n        writeBlockSequence(state, level, state.dump, compact);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + state.dump;\n        }\n      } else {\n        writeFlowSequence(state, level, state.dump);\n        if (duplicate) {\n          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;\n        }\n      }\n    } else if (type === '[object String]') {\n      if (state.tag !== '?') {\n        writeScalar(state, state.dump, level, iskey);\n      }\n    } else {\n      if (state.skipInvalid) return false;\n      throw new YAMLException('unacceptable kind of an object to dump ' + type);\n    }\n\n    if (state.tag !== null && state.tag !== '?') {\n      state.dump = '!<' + state.tag + '> ' + state.dump;\n    }\n  }\n\n  return true;\n}\n\nfunction getDuplicateReferences(object, state) {\n  var objects = [],\n      duplicatesIndexes = [],\n      index,\n      length;\n\n  inspectNode(object, objects, duplicatesIndexes);\n\n  for (index = 0, length = duplicatesIndexes.length; index < length; index += 1) {\n    state.duplicates.push(objects[duplicatesIndexes[index]]);\n  }\n  state.usedDuplicates = new Array(length);\n}\n\nfunction inspectNode(object, objects, duplicatesIndexes) {\n  var objectKeyList,\n      index,\n      length;\n\n  if (object !== null && typeof object === 'object') {\n    index = objects.indexOf(object);\n    if (index !== -1) {\n      if (duplicatesIndexes.indexOf(index) === -1) {\n        duplicatesIndexes.push(index);\n      }\n    } else {\n      objects.push(object);\n\n      if (Array.isArray(object)) {\n        for (index = 0, length = object.length; index < length; index += 1) {\n          inspectNode(object[index], objects, duplicatesIndexes);\n        }\n      } else {\n        objectKeyList = Object.keys(object);\n\n        for (index = 0, length = objectKeyList.length; index < length; index += 1) {\n          inspectNode(object[objectKeyList[index]], objects, duplicatesIndexes);\n        }\n      }\n    }\n  }\n}\n\nfunction dump(input, options) {\n  options = options || {};\n\n  var state = new State(options);\n\n  if (!state.noRefs) getDuplicateReferences(input, state);\n\n  if (writeNode(state, 0, input, true, true)) return state.dump + '\\n';\n\n  return '';\n}\n\nfunction safeDump(input, options) {\n  return dump(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));\n}\n\nmodule.exports.dump     = dump;\nmodule.exports.safeDump = safeDump;\n","// YAML error class. http://stackoverflow.com/questions/8458984\n//\n'use strict';\n\nfunction YAMLException(reason, mark) {\n  // Super constructor\n  Error.call(this);\n\n  // Include stack trace in error object\n  if (Error.captureStackTrace) {\n    // Chrome and NodeJS\n    Error.captureStackTrace(this, this.constructor);\n  } else {\n    // FF, IE 10+ and Safari 6+. Fallback for others\n    this.stack = (new Error()).stack || '';\n  }\n\n  this.name = 'YAMLException';\n  this.reason = reason;\n  this.mark = mark;\n  this.message = (this.reason || '(unknown reason)') + (this.mark ? ' ' + this.mark.toString() : '');\n}\n\n\n// Inherit from Error\nYAMLException.prototype = Object.create(Error.prototype);\nYAMLException.prototype.constructor = YAMLException;\n\n\nYAMLException.prototype.toString = function toString(compact) {\n  var result = this.name + ': ';\n\n  result += this.reason || '(unknown reason)';\n\n  if (!compact && this.mark) {\n    result += ' ' + this.mark.toString();\n  }\n\n  return result;\n};\n\n\nmodule.exports = YAMLException;\n","'use strict';\n\n/*eslint-disable max-len,no-use-before-define*/\n\nvar common              = require('./common');\nvar YAMLException       = require('./exception');\nvar Mark                = require('./mark');\nvar DEFAULT_SAFE_SCHEMA = require('./schema/default_safe');\nvar DEFAULT_FULL_SCHEMA = require('./schema/default_full');\n\n\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\n\n\nvar CONTEXT_FLOW_IN   = 1;\nvar CONTEXT_FLOW_OUT  = 2;\nvar CONTEXT_BLOCK_IN  = 3;\nvar CONTEXT_BLOCK_OUT = 4;\n\n\nvar CHOMPING_CLIP  = 1;\nvar CHOMPING_STRIP = 2;\nvar CHOMPING_KEEP  = 3;\n\n\nvar PATTERN_NON_PRINTABLE         = /[\\x00-\\x08\\x0B\\x0C\\x0E-\\x1F\\x7F-\\x84\\x86-\\x9F\\uFFFE\\uFFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])|(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF]/;\nvar PATTERN_NON_ASCII_LINE_BREAKS = /[\\x85\\u2028\\u2029]/;\nvar PATTERN_FLOW_INDICATORS       = /[,\\[\\]\\{\\}]/;\nvar PATTERN_TAG_HANDLE            = /^(?:!|!!|![a-z\\-]+!)$/i;\nvar PATTERN_TAG_URI               = /^(?:!|[^,\\[\\]\\{\\}])(?:%[0-9a-f]{2}|[0-9a-z\\-#;\\/\\?:@&=\\+\\$,_\\.!~\\*'\\(\\)\\[\\]])*$/i;\n\n\nfunction is_EOL(c) {\n  return (c === 0x0A/* LF */) || (c === 0x0D/* CR */);\n}\n\nfunction is_WHITE_SPACE(c) {\n  return (c === 0x09/* Tab */) || (c === 0x20/* Space */);\n}\n\nfunction is_WS_OR_EOL(c) {\n  return (c === 0x09/* Tab */) ||\n         (c === 0x20/* Space */) ||\n         (c === 0x0A/* LF */) ||\n         (c === 0x0D/* CR */);\n}\n\nfunction is_FLOW_INDICATOR(c) {\n  return c === 0x2C/* , */ ||\n         c === 0x5B/* [ */ ||\n         c === 0x5D/* ] */ ||\n         c === 0x7B/* { */ ||\n         c === 0x7D/* } */;\n}\n\nfunction fromHexCode(c) {\n  var lc;\n\n  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {\n    return c - 0x30;\n  }\n\n  /*eslint-disable no-bitwise*/\n  lc = c | 0x20;\n\n  if ((0x61/* a */ <= lc) && (lc <= 0x66/* f */)) {\n    return lc - 0x61 + 10;\n  }\n\n  return -1;\n}\n\nfunction escapedHexLen(c) {\n  if (c === 0x78/* x */) { return 2; }\n  if (c === 0x75/* u */) { return 4; }\n  if (c === 0x55/* U */) { return 8; }\n  return 0;\n}\n\nfunction fromDecimalCode(c) {\n  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {\n    return c - 0x30;\n  }\n\n  return -1;\n}\n\nfunction simpleEscapeSequence(c) {\n  return (c === 0x30/* 0 */) ? '\\x00' :\n        (c === 0x61/* a */) ? '\\x07' :\n        (c === 0x62/* b */) ? '\\x08' :\n        (c === 0x74/* t */) ? '\\x09' :\n        (c === 0x09/* Tab */) ? '\\x09' :\n        (c === 0x6E/* n */) ? '\\x0A' :\n        (c === 0x76/* v */) ? '\\x0B' :\n        (c === 0x66/* f */) ? '\\x0C' :\n        (c === 0x72/* r */) ? '\\x0D' :\n        (c === 0x65/* e */) ? '\\x1B' :\n        (c === 0x20/* Space */) ? ' ' :\n        (c === 0x22/* \" */) ? '\\x22' :\n        (c === 0x2F/* / */) ? '/' :\n        (c === 0x5C/* \\ */) ? '\\x5C' :\n        (c === 0x4E/* N */) ? '\\x85' :\n        (c === 0x5F/* _ */) ? '\\xA0' :\n        (c === 0x4C/* L */) ? '\\u2028' :\n        (c === 0x50/* P */) ? '\\u2029' : '';\n}\n\nfunction charFromCodepoint(c) {\n  if (c <= 0xFFFF) {\n    return String.fromCharCode(c);\n  }\n  // Encode UTF-16 surrogate pair\n  // https://en.wikipedia.org/wiki/UTF-16#Code_points_U.2B010000_to_U.2B10FFFF\n  return String.fromCharCode(((c - 0x010000) >> 10) + 0xD800,\n                             ((c - 0x010000) & 0x03FF) + 0xDC00);\n}\n\nvar simpleEscapeCheck = new Array(256); // integer, for fast access\nvar simpleEscapeMap = new Array(256);\nfor (var i = 0; i < 256; i++) {\n  simpleEscapeCheck[i] = simpleEscapeSequence(i) ? 1 : 0;\n  simpleEscapeMap[i] = simpleEscapeSequence(i);\n}\n\n\nfunction State(input, options) {\n  this.input = input;\n\n  this.filename  = options['filename']  || null;\n  this.schema    = options['schema']    || DEFAULT_FULL_SCHEMA;\n  this.onWarning = options['onWarning'] || null;\n  this.legacy    = options['legacy']    || false;\n  this.json      = options['json']      || false;\n  this.listener  = options['listener']  || null;\n\n  this.implicitTypes = this.schema.compiledImplicit;\n  this.typeMap       = this.schema.compiledTypeMap;\n\n  this.length     = input.length;\n  this.position   = 0;\n  this.line       = 0;\n  this.lineStart  = 0;\n  this.lineIndent = 0;\n\n  this.documents = [];\n\n  /*\n  this.version;\n  this.checkLineBreaks;\n  this.tagMap;\n  this.anchorMap;\n  this.tag;\n  this.anchor;\n  this.kind;\n  this.result;*/\n\n}\n\n\nfunction generateError(state, message) {\n  return new YAMLException(\n    message,\n    new Mark(state.filename, state.input, state.position, state.line, (state.position - state.lineStart)));\n}\n\nfunction throwError(state, message) {\n  throw generateError(state, message);\n}\n\nfunction throwWarning(state, message) {\n  if (state.onWarning) {\n    state.onWarning.call(null, generateError(state, message));\n  }\n}\n\n\nvar directiveHandlers = {\n\n  YAML: function handleYamlDirective(state, name, args) {\n\n    var match, major, minor;\n\n    if (state.version !== null) {\n      throwError(state, 'duplication of %YAML directive');\n    }\n\n    if (args.length !== 1) {\n      throwError(state, 'YAML directive accepts exactly one argument');\n    }\n\n    match = /^([0-9]+)\\.([0-9]+)$/.exec(args[0]);\n\n    if (match === null) {\n      throwError(state, 'ill-formed argument of the YAML directive');\n    }\n\n    major = parseInt(match[1], 10);\n    minor = parseInt(match[2], 10);\n\n    if (major !== 1) {\n      throwError(state, 'unacceptable YAML version of the document');\n    }\n\n    state.version = args[0];\n    state.checkLineBreaks = (minor < 2);\n\n    if (minor !== 1 && minor !== 2) {\n      throwWarning(state, 'unsupported YAML version of the document');\n    }\n  },\n\n  TAG: function handleTagDirective(state, name, args) {\n\n    var handle, prefix;\n\n    if (args.length !== 2) {\n      throwError(state, 'TAG directive accepts exactly two arguments');\n    }\n\n    handle = args[0];\n    prefix = args[1];\n\n    if (!PATTERN_TAG_HANDLE.test(handle)) {\n      throwError(state, 'ill-formed tag handle (first argument) of the TAG directive');\n    }\n\n    if (_hasOwnProperty.call(state.tagMap, handle)) {\n      throwError(state, 'there is a previously declared suffix for \"' + handle + '\" tag handle');\n    }\n\n    if (!PATTERN_TAG_URI.test(prefix)) {\n      throwError(state, 'ill-formed tag prefix (second argument) of the TAG directive');\n    }\n\n    state.tagMap[handle] = prefix;\n  }\n};\n\n\nfunction captureSegment(state, start, end, checkJson) {\n  var _position, _length, _character, _result;\n\n  if (start < end) {\n    _result = state.input.slice(start, end);\n\n    if (checkJson) {\n      for (_position = 0, _length = _result.length;\n           _position < _length;\n           _position += 1) {\n        _character = _result.charCodeAt(_position);\n        if (!(_character === 0x09 ||\n              (0x20 <= _character && _character <= 0x10FFFF))) {\n          throwError(state, 'expected valid JSON character');\n        }\n      }\n    } else if (PATTERN_NON_PRINTABLE.test(_result)) {\n      throwError(state, 'the stream contains non-printable characters');\n    }\n\n    state.result += _result;\n  }\n}\n\nfunction mergeMappings(state, destination, source, overridableKeys) {\n  var sourceKeys, key, index, quantity;\n\n  if (!common.isObject(source)) {\n    throwError(state, 'cannot merge mappings; the provided source object is unacceptable');\n  }\n\n  sourceKeys = Object.keys(source);\n\n  for (index = 0, quantity = sourceKeys.length; index < quantity; index += 1) {\n    key = sourceKeys[index];\n\n    if (!_hasOwnProperty.call(destination, key)) {\n      destination[key] = source[key];\n      overridableKeys[key] = true;\n    }\n  }\n}\n\nfunction storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode) {\n  var index, quantity;\n\n  keyNode = String(keyNode);\n\n  if (_result === null) {\n    _result = {};\n  }\n\n  if (keyTag === 'tag:yaml.org,2002:merge') {\n    if (Array.isArray(valueNode)) {\n      for (index = 0, quantity = valueNode.length; index < quantity; index += 1) {\n        mergeMappings(state, _result, valueNode[index], overridableKeys);\n      }\n    } else {\n      mergeMappings(state, _result, valueNode, overridableKeys);\n    }\n  } else {\n    if (!state.json &&\n        !_hasOwnProperty.call(overridableKeys, keyNode) &&\n        _hasOwnProperty.call(_result, keyNode)) {\n      throwError(state, 'duplicated mapping key');\n    }\n    _result[keyNode] = valueNode;\n    delete overridableKeys[keyNode];\n  }\n\n  return _result;\n}\n\nfunction readLineBreak(state) {\n  var ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch === 0x0A/* LF */) {\n    state.position++;\n  } else if (ch === 0x0D/* CR */) {\n    state.position++;\n    if (state.input.charCodeAt(state.position) === 0x0A/* LF */) {\n      state.position++;\n    }\n  } else {\n    throwError(state, 'a line break is expected');\n  }\n\n  state.line += 1;\n  state.lineStart = state.position;\n}\n\nfunction skipSeparationSpace(state, allowComments, checkIndent) {\n  var lineBreaks = 0,\n      ch = state.input.charCodeAt(state.position);\n\n  while (ch !== 0) {\n    while (is_WHITE_SPACE(ch)) {\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    if (allowComments && ch === 0x23/* # */) {\n      do {\n        ch = state.input.charCodeAt(++state.position);\n      } while (ch !== 0x0A/* LF */ && ch !== 0x0D/* CR */ && ch !== 0);\n    }\n\n    if (is_EOL(ch)) {\n      readLineBreak(state);\n\n      ch = state.input.charCodeAt(state.position);\n      lineBreaks++;\n      state.lineIndent = 0;\n\n      while (ch === 0x20/* Space */) {\n        state.lineIndent++;\n        ch = state.input.charCodeAt(++state.position);\n      }\n    } else {\n      break;\n    }\n  }\n\n  if (checkIndent !== -1 && lineBreaks !== 0 && state.lineIndent < checkIndent) {\n    throwWarning(state, 'deficient indentation');\n  }\n\n  return lineBreaks;\n}\n\nfunction testDocumentSeparator(state) {\n  var _position = state.position,\n      ch;\n\n  ch = state.input.charCodeAt(_position);\n\n  // Condition state.position === state.lineStart is tested\n  // in parent on each call, for efficiency. No needs to test here again.\n  if ((ch === 0x2D/* - */ || ch === 0x2E/* . */) &&\n      ch === state.input.charCodeAt(_position + 1) &&\n      ch === state.input.charCodeAt(_position + 2)) {\n\n    _position += 3;\n\n    ch = state.input.charCodeAt(_position);\n\n    if (ch === 0 || is_WS_OR_EOL(ch)) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nfunction writeFoldedLines(state, count) {\n  if (count === 1) {\n    state.result += ' ';\n  } else if (count > 1) {\n    state.result += common.repeat('\\n', count - 1);\n  }\n}\n\n\nfunction readPlainScalar(state, nodeIndent, withinFlowCollection) {\n  var preceding,\n      following,\n      captureStart,\n      captureEnd,\n      hasPendingContent,\n      _line,\n      _lineStart,\n      _lineIndent,\n      _kind = state.kind,\n      _result = state.result,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (is_WS_OR_EOL(ch)      ||\n      is_FLOW_INDICATOR(ch) ||\n      ch === 0x23/* # */    ||\n      ch === 0x26/* & */    ||\n      ch === 0x2A/* * */    ||\n      ch === 0x21/* ! */    ||\n      ch === 0x7C/* | */    ||\n      ch === 0x3E/* > */    ||\n      ch === 0x27/* ' */    ||\n      ch === 0x22/* \" */    ||\n      ch === 0x25/* % */    ||\n      ch === 0x40/* @ */    ||\n      ch === 0x60/* ` */) {\n    return false;\n  }\n\n  if (ch === 0x3F/* ? */ || ch === 0x2D/* - */) {\n    following = state.input.charCodeAt(state.position + 1);\n\n    if (is_WS_OR_EOL(following) ||\n        withinFlowCollection && is_FLOW_INDICATOR(following)) {\n      return false;\n    }\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n  captureStart = captureEnd = state.position;\n  hasPendingContent = false;\n\n  while (ch !== 0) {\n    if (ch === 0x3A/* : */) {\n      following = state.input.charCodeAt(state.position + 1);\n\n      if (is_WS_OR_EOL(following) ||\n          withinFlowCollection && is_FLOW_INDICATOR(following)) {\n        break;\n      }\n\n    } else if (ch === 0x23/* # */) {\n      preceding = state.input.charCodeAt(state.position - 1);\n\n      if (is_WS_OR_EOL(preceding)) {\n        break;\n      }\n\n    } else if ((state.position === state.lineStart && testDocumentSeparator(state)) ||\n               withinFlowCollection && is_FLOW_INDICATOR(ch)) {\n      break;\n\n    } else if (is_EOL(ch)) {\n      _line = state.line;\n      _lineStart = state.lineStart;\n      _lineIndent = state.lineIndent;\n      skipSeparationSpace(state, false, -1);\n\n      if (state.lineIndent >= nodeIndent) {\n        hasPendingContent = true;\n        ch = state.input.charCodeAt(state.position);\n        continue;\n      } else {\n        state.position = captureEnd;\n        state.line = _line;\n        state.lineStart = _lineStart;\n        state.lineIndent = _lineIndent;\n        break;\n      }\n    }\n\n    if (hasPendingContent) {\n      captureSegment(state, captureStart, captureEnd, false);\n      writeFoldedLines(state, state.line - _line);\n      captureStart = captureEnd = state.position;\n      hasPendingContent = false;\n    }\n\n    if (!is_WHITE_SPACE(ch)) {\n      captureEnd = state.position + 1;\n    }\n\n    ch = state.input.charCodeAt(++state.position);\n  }\n\n  captureSegment(state, captureStart, captureEnd, false);\n\n  if (state.result) {\n    return true;\n  }\n\n  state.kind = _kind;\n  state.result = _result;\n  return false;\n}\n\nfunction readSingleQuotedScalar(state, nodeIndent) {\n  var ch,\n      captureStart, captureEnd;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch !== 0x27/* ' */) {\n    return false;\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n  state.position++;\n  captureStart = captureEnd = state.position;\n\n  while ((ch = state.input.charCodeAt(state.position)) !== 0) {\n    if (ch === 0x27/* ' */) {\n      captureSegment(state, captureStart, state.position, true);\n      ch = state.input.charCodeAt(++state.position);\n\n      if (ch === 0x27/* ' */) {\n        captureStart = captureEnd = state.position;\n        state.position++;\n      } else {\n        return true;\n      }\n\n    } else if (is_EOL(ch)) {\n      captureSegment(state, captureStart, captureEnd, true);\n      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));\n      captureStart = captureEnd = state.position;\n\n    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {\n      throwError(state, 'unexpected end of the document within a single quoted scalar');\n\n    } else {\n      state.position++;\n      captureEnd = state.position;\n    }\n  }\n\n  throwError(state, 'unexpected end of the stream within a single quoted scalar');\n}\n\nfunction readDoubleQuotedScalar(state, nodeIndent) {\n  var captureStart,\n      captureEnd,\n      hexLength,\n      hexResult,\n      tmp,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch !== 0x22/* \" */) {\n    return false;\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n  state.position++;\n  captureStart = captureEnd = state.position;\n\n  while ((ch = state.input.charCodeAt(state.position)) !== 0) {\n    if (ch === 0x22/* \" */) {\n      captureSegment(state, captureStart, state.position, true);\n      state.position++;\n      return true;\n\n    } else if (ch === 0x5C/* \\ */) {\n      captureSegment(state, captureStart, state.position, true);\n      ch = state.input.charCodeAt(++state.position);\n\n      if (is_EOL(ch)) {\n        skipSeparationSpace(state, false, nodeIndent);\n\n        // TODO: rework to inline fn with no type cast?\n      } else if (ch < 256 && simpleEscapeCheck[ch]) {\n        state.result += simpleEscapeMap[ch];\n        state.position++;\n\n      } else if ((tmp = escapedHexLen(ch)) > 0) {\n        hexLength = tmp;\n        hexResult = 0;\n\n        for (; hexLength > 0; hexLength--) {\n          ch = state.input.charCodeAt(++state.position);\n\n          if ((tmp = fromHexCode(ch)) >= 0) {\n            hexResult = (hexResult << 4) + tmp;\n\n          } else {\n            throwError(state, 'expected hexadecimal character');\n          }\n        }\n\n        state.result += charFromCodepoint(hexResult);\n\n        state.position++;\n\n      } else {\n        throwError(state, 'unknown escape sequence');\n      }\n\n      captureStart = captureEnd = state.position;\n\n    } else if (is_EOL(ch)) {\n      captureSegment(state, captureStart, captureEnd, true);\n      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));\n      captureStart = captureEnd = state.position;\n\n    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {\n      throwError(state, 'unexpected end of the document within a double quoted scalar');\n\n    } else {\n      state.position++;\n      captureEnd = state.position;\n    }\n  }\n\n  throwError(state, 'unexpected end of the stream within a double quoted scalar');\n}\n\nfunction readFlowCollection(state, nodeIndent) {\n  var readNext = true,\n      _line,\n      _tag     = state.tag,\n      _result,\n      _anchor  = state.anchor,\n      following,\n      terminator,\n      isPair,\n      isExplicitPair,\n      isMapping,\n      overridableKeys = {},\n      keyNode,\n      keyTag,\n      valueNode,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch === 0x5B/* [ */) {\n    terminator = 0x5D;/* ] */\n    isMapping = false;\n    _result = [];\n  } else if (ch === 0x7B/* { */) {\n    terminator = 0x7D;/* } */\n    isMapping = true;\n    _result = {};\n  } else {\n    return false;\n  }\n\n  if (state.anchor !== null) {\n    state.anchorMap[state.anchor] = _result;\n  }\n\n  ch = state.input.charCodeAt(++state.position);\n\n  while (ch !== 0) {\n    skipSeparationSpace(state, true, nodeIndent);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if (ch === terminator) {\n      state.position++;\n      state.tag = _tag;\n      state.anchor = _anchor;\n      state.kind = isMapping ? 'mapping' : 'sequence';\n      state.result = _result;\n      return true;\n    } else if (!readNext) {\n      throwError(state, 'missed comma between flow collection entries');\n    }\n\n    keyTag = keyNode = valueNode = null;\n    isPair = isExplicitPair = false;\n\n    if (ch === 0x3F/* ? */) {\n      following = state.input.charCodeAt(state.position + 1);\n\n      if (is_WS_OR_EOL(following)) {\n        isPair = isExplicitPair = true;\n        state.position++;\n        skipSeparationSpace(state, true, nodeIndent);\n      }\n    }\n\n    _line = state.line;\n    composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);\n    keyTag = state.tag;\n    keyNode = state.result;\n    skipSeparationSpace(state, true, nodeIndent);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if ((isExplicitPair || state.line === _line) && ch === 0x3A/* : */) {\n      isPair = true;\n      ch = state.input.charCodeAt(++state.position);\n      skipSeparationSpace(state, true, nodeIndent);\n      composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);\n      valueNode = state.result;\n    }\n\n    if (isMapping) {\n      storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode);\n    } else if (isPair) {\n      _result.push(storeMappingPair(state, null, overridableKeys, keyTag, keyNode, valueNode));\n    } else {\n      _result.push(keyNode);\n    }\n\n    skipSeparationSpace(state, true, nodeIndent);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if (ch === 0x2C/* , */) {\n      readNext = true;\n      ch = state.input.charCodeAt(++state.position);\n    } else {\n      readNext = false;\n    }\n  }\n\n  throwError(state, 'unexpected end of the stream within a flow collection');\n}\n\nfunction readBlockScalar(state, nodeIndent) {\n  var captureStart,\n      folding,\n      chomping       = CHOMPING_CLIP,\n      didReadContent = false,\n      detectedIndent = false,\n      textIndent     = nodeIndent,\n      emptyLines     = 0,\n      atMoreIndented = false,\n      tmp,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch === 0x7C/* | */) {\n    folding = false;\n  } else if (ch === 0x3E/* > */) {\n    folding = true;\n  } else {\n    return false;\n  }\n\n  state.kind = 'scalar';\n  state.result = '';\n\n  while (ch !== 0) {\n    ch = state.input.charCodeAt(++state.position);\n\n    if (ch === 0x2B/* + */ || ch === 0x2D/* - */) {\n      if (CHOMPING_CLIP === chomping) {\n        chomping = (ch === 0x2B/* + */) ? CHOMPING_KEEP : CHOMPING_STRIP;\n      } else {\n        throwError(state, 'repeat of a chomping mode identifier');\n      }\n\n    } else if ((tmp = fromDecimalCode(ch)) >= 0) {\n      if (tmp === 0) {\n        throwError(state, 'bad explicit indentation width of a block scalar; it cannot be less than one');\n      } else if (!detectedIndent) {\n        textIndent = nodeIndent + tmp - 1;\n        detectedIndent = true;\n      } else {\n        throwError(state, 'repeat of an indentation width identifier');\n      }\n\n    } else {\n      break;\n    }\n  }\n\n  if (is_WHITE_SPACE(ch)) {\n    do { ch = state.input.charCodeAt(++state.position); }\n    while (is_WHITE_SPACE(ch));\n\n    if (ch === 0x23/* # */) {\n      do { ch = state.input.charCodeAt(++state.position); }\n      while (!is_EOL(ch) && (ch !== 0));\n    }\n  }\n\n  while (ch !== 0) {\n    readLineBreak(state);\n    state.lineIndent = 0;\n\n    ch = state.input.charCodeAt(state.position);\n\n    while ((!detectedIndent || state.lineIndent < textIndent) &&\n           (ch === 0x20/* Space */)) {\n      state.lineIndent++;\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    if (!detectedIndent && state.lineIndent > textIndent) {\n      textIndent = state.lineIndent;\n    }\n\n    if (is_EOL(ch)) {\n      emptyLines++;\n      continue;\n    }\n\n    // End of the scalar.\n    if (state.lineIndent < textIndent) {\n\n      // Perform the chomping.\n      if (chomping === CHOMPING_KEEP) {\n        state.result += common.repeat('\\n', didReadContent ? 1 + emptyLines : emptyLines);\n      } else if (chomping === CHOMPING_CLIP) {\n        if (didReadContent) { // i.e. only if the scalar is not empty.\n          state.result += '\\n';\n        }\n      }\n\n      // Break this `while` cycle and go to the funciton's epilogue.\n      break;\n    }\n\n    // Folded style: use fancy rules to handle line breaks.\n    if (folding) {\n\n      // Lines starting with white space characters (more-indented lines) are not folded.\n      if (is_WHITE_SPACE(ch)) {\n        atMoreIndented = true;\n        // except for the first content line (cf. Example 8.1)\n        state.result += common.repeat('\\n', didReadContent ? 1 + emptyLines : emptyLines);\n\n      // End of more-indented block.\n      } else if (atMoreIndented) {\n        atMoreIndented = false;\n        state.result += common.repeat('\\n', emptyLines + 1);\n\n      // Just one line break - perceive as the same line.\n      } else if (emptyLines === 0) {\n        if (didReadContent) { // i.e. only if we have already read some scalar content.\n          state.result += ' ';\n        }\n\n      // Several line breaks - perceive as different lines.\n      } else {\n        state.result += common.repeat('\\n', emptyLines);\n      }\n\n    // Literal style: just add exact number of line breaks between content lines.\n    } else {\n      // Keep all line breaks except the header line break.\n      state.result += common.repeat('\\n', didReadContent ? 1 + emptyLines : emptyLines);\n    }\n\n    didReadContent = true;\n    detectedIndent = true;\n    emptyLines = 0;\n    captureStart = state.position;\n\n    while (!is_EOL(ch) && (ch !== 0)) {\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    captureSegment(state, captureStart, state.position, false);\n  }\n\n  return true;\n}\n\nfunction readBlockSequence(state, nodeIndent) {\n  var _line,\n      _tag      = state.tag,\n      _anchor   = state.anchor,\n      _result   = [],\n      following,\n      detected  = false,\n      ch;\n\n  if (state.anchor !== null) {\n    state.anchorMap[state.anchor] = _result;\n  }\n\n  ch = state.input.charCodeAt(state.position);\n\n  while (ch !== 0) {\n\n    if (ch !== 0x2D/* - */) {\n      break;\n    }\n\n    following = state.input.charCodeAt(state.position + 1);\n\n    if (!is_WS_OR_EOL(following)) {\n      break;\n    }\n\n    detected = true;\n    state.position++;\n\n    if (skipSeparationSpace(state, true, -1)) {\n      if (state.lineIndent <= nodeIndent) {\n        _result.push(null);\n        ch = state.input.charCodeAt(state.position);\n        continue;\n      }\n    }\n\n    _line = state.line;\n    composeNode(state, nodeIndent, CONTEXT_BLOCK_IN, false, true);\n    _result.push(state.result);\n    skipSeparationSpace(state, true, -1);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if ((state.line === _line || state.lineIndent > nodeIndent) && (ch !== 0)) {\n      throwError(state, 'bad indentation of a sequence entry');\n    } else if (state.lineIndent < nodeIndent) {\n      break;\n    }\n  }\n\n  if (detected) {\n    state.tag = _tag;\n    state.anchor = _anchor;\n    state.kind = 'sequence';\n    state.result = _result;\n    return true;\n  }\n  return false;\n}\n\nfunction readBlockMapping(state, nodeIndent, flowIndent) {\n  var following,\n      allowCompact,\n      _line,\n      _tag          = state.tag,\n      _anchor       = state.anchor,\n      _result       = {},\n      overridableKeys = {},\n      keyTag        = null,\n      keyNode       = null,\n      valueNode     = null,\n      atExplicitKey = false,\n      detected      = false,\n      ch;\n\n  if (state.anchor !== null) {\n    state.anchorMap[state.anchor] = _result;\n  }\n\n  ch = state.input.charCodeAt(state.position);\n\n  while (ch !== 0) {\n    following = state.input.charCodeAt(state.position + 1);\n    _line = state.line; // Save the current line.\n\n    //\n    // Explicit notation case. There are two separate blocks:\n    // first for the key (denoted by \"?\") and second for the value (denoted by \":\")\n    //\n    if ((ch === 0x3F/* ? */ || ch === 0x3A/* : */) && is_WS_OR_EOL(following)) {\n\n      if (ch === 0x3F/* ? */) {\n        if (atExplicitKey) {\n          storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);\n          keyTag = keyNode = valueNode = null;\n        }\n\n        detected = true;\n        atExplicitKey = true;\n        allowCompact = true;\n\n      } else if (atExplicitKey) {\n        // i.e. 0x3A/* : */ === character after the explicit key.\n        atExplicitKey = false;\n        allowCompact = true;\n\n      } else {\n        throwError(state, 'incomplete explicit mapping pair; a key node is missed');\n      }\n\n      state.position += 1;\n      ch = following;\n\n    //\n    // Implicit notation case. Flow-style node as the key first, then \":\", and the value.\n    //\n    } else if (composeNode(state, flowIndent, CONTEXT_FLOW_OUT, false, true)) {\n\n      if (state.line === _line) {\n        ch = state.input.charCodeAt(state.position);\n\n        while (is_WHITE_SPACE(ch)) {\n          ch = state.input.charCodeAt(++state.position);\n        }\n\n        if (ch === 0x3A/* : */) {\n          ch = state.input.charCodeAt(++state.position);\n\n          if (!is_WS_OR_EOL(ch)) {\n            throwError(state, 'a whitespace character is expected after the key-value separator within a block mapping');\n          }\n\n          if (atExplicitKey) {\n            storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);\n            keyTag = keyNode = valueNode = null;\n          }\n\n          detected = true;\n          atExplicitKey = false;\n          allowCompact = false;\n          keyTag = state.tag;\n          keyNode = state.result;\n\n        } else if (detected) {\n          throwError(state, 'can not read an implicit mapping pair; a colon is missed');\n\n        } else {\n          state.tag = _tag;\n          state.anchor = _anchor;\n          return true; // Keep the result of `composeNode`.\n        }\n\n      } else if (detected) {\n        throwError(state, 'can not read a block mapping entry; a multiline key may not be an implicit key');\n\n      } else {\n        state.tag = _tag;\n        state.anchor = _anchor;\n        return true; // Keep the result of `composeNode`.\n      }\n\n    } else {\n      break; // Reading is done. Go to the epilogue.\n    }\n\n    //\n    // Common reading code for both explicit and implicit notations.\n    //\n    if (state.line === _line || state.lineIndent > nodeIndent) {\n      if (composeNode(state, nodeIndent, CONTEXT_BLOCK_OUT, true, allowCompact)) {\n        if (atExplicitKey) {\n          keyNode = state.result;\n        } else {\n          valueNode = state.result;\n        }\n      }\n\n      if (!atExplicitKey) {\n        storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode);\n        keyTag = keyNode = valueNode = null;\n      }\n\n      skipSeparationSpace(state, true, -1);\n      ch = state.input.charCodeAt(state.position);\n    }\n\n    if (state.lineIndent > nodeIndent && (ch !== 0)) {\n      throwError(state, 'bad indentation of a mapping entry');\n    } else if (state.lineIndent < nodeIndent) {\n      break;\n    }\n  }\n\n  //\n  // Epilogue.\n  //\n\n  // Special case: last mapping's node contains only the key in explicit notation.\n  if (atExplicitKey) {\n    storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);\n  }\n\n  // Expose the resulting mapping.\n  if (detected) {\n    state.tag = _tag;\n    state.anchor = _anchor;\n    state.kind = 'mapping';\n    state.result = _result;\n  }\n\n  return detected;\n}\n\nfunction readTagProperty(state) {\n  var _position,\n      isVerbatim = false,\n      isNamed    = false,\n      tagHandle,\n      tagName,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch !== 0x21/* ! */) return false;\n\n  if (state.tag !== null) {\n    throwError(state, 'duplication of a tag property');\n  }\n\n  ch = state.input.charCodeAt(++state.position);\n\n  if (ch === 0x3C/* < */) {\n    isVerbatim = true;\n    ch = state.input.charCodeAt(++state.position);\n\n  } else if (ch === 0x21/* ! */) {\n    isNamed = true;\n    tagHandle = '!!';\n    ch = state.input.charCodeAt(++state.position);\n\n  } else {\n    tagHandle = '!';\n  }\n\n  _position = state.position;\n\n  if (isVerbatim) {\n    do { ch = state.input.charCodeAt(++state.position); }\n    while (ch !== 0 && ch !== 0x3E/* > */);\n\n    if (state.position < state.length) {\n      tagName = state.input.slice(_position, state.position);\n      ch = state.input.charCodeAt(++state.position);\n    } else {\n      throwError(state, 'unexpected end of the stream within a verbatim tag');\n    }\n  } else {\n    while (ch !== 0 && !is_WS_OR_EOL(ch)) {\n\n      if (ch === 0x21/* ! */) {\n        if (!isNamed) {\n          tagHandle = state.input.slice(_position - 1, state.position + 1);\n\n          if (!PATTERN_TAG_HANDLE.test(tagHandle)) {\n            throwError(state, 'named tag handle cannot contain such characters');\n          }\n\n          isNamed = true;\n          _position = state.position + 1;\n        } else {\n          throwError(state, 'tag suffix cannot contain exclamation marks');\n        }\n      }\n\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    tagName = state.input.slice(_position, state.position);\n\n    if (PATTERN_FLOW_INDICATORS.test(tagName)) {\n      throwError(state, 'tag suffix cannot contain flow indicator characters');\n    }\n  }\n\n  if (tagName && !PATTERN_TAG_URI.test(tagName)) {\n    throwError(state, 'tag name cannot contain such characters: ' + tagName);\n  }\n\n  if (isVerbatim) {\n    state.tag = tagName;\n\n  } else if (_hasOwnProperty.call(state.tagMap, tagHandle)) {\n    state.tag = state.tagMap[tagHandle] + tagName;\n\n  } else if (tagHandle === '!') {\n    state.tag = '!' + tagName;\n\n  } else if (tagHandle === '!!') {\n    state.tag = 'tag:yaml.org,2002:' + tagName;\n\n  } else {\n    throwError(state, 'undeclared tag handle \"' + tagHandle + '\"');\n  }\n\n  return true;\n}\n\nfunction readAnchorProperty(state) {\n  var _position,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch !== 0x26/* & */) return false;\n\n  if (state.anchor !== null) {\n    throwError(state, 'duplication of an anchor property');\n  }\n\n  ch = state.input.charCodeAt(++state.position);\n  _position = state.position;\n\n  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {\n    ch = state.input.charCodeAt(++state.position);\n  }\n\n  if (state.position === _position) {\n    throwError(state, 'name of an anchor node must contain at least one character');\n  }\n\n  state.anchor = state.input.slice(_position, state.position);\n  return true;\n}\n\nfunction readAlias(state) {\n  var _position, alias,\n      ch;\n\n  ch = state.input.charCodeAt(state.position);\n\n  if (ch !== 0x2A/* * */) return false;\n\n  ch = state.input.charCodeAt(++state.position);\n  _position = state.position;\n\n  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {\n    ch = state.input.charCodeAt(++state.position);\n  }\n\n  if (state.position === _position) {\n    throwError(state, 'name of an alias node must contain at least one character');\n  }\n\n  alias = state.input.slice(_position, state.position);\n\n  if (!state.anchorMap.hasOwnProperty(alias)) {\n    throwError(state, 'unidentified alias \"' + alias + '\"');\n  }\n\n  state.result = state.anchorMap[alias];\n  skipSeparationSpace(state, true, -1);\n  return true;\n}\n\nfunction composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact) {\n  var allowBlockStyles,\n      allowBlockScalars,\n      allowBlockCollections,\n      indentStatus = 1, // 1: this>parent, 0: this=parent, -1: this<parent\n      atNewLine  = false,\n      hasContent = false,\n      typeIndex,\n      typeQuantity,\n      type,\n      flowIndent,\n      blockIndent;\n\n  if (state.listener !== null) {\n    state.listener('open', state);\n  }\n\n  state.tag    = null;\n  state.anchor = null;\n  state.kind   = null;\n  state.result = null;\n\n  allowBlockStyles = allowBlockScalars = allowBlockCollections =\n    CONTEXT_BLOCK_OUT === nodeContext ||\n    CONTEXT_BLOCK_IN  === nodeContext;\n\n  if (allowToSeek) {\n    if (skipSeparationSpace(state, true, -1)) {\n      atNewLine = true;\n\n      if (state.lineIndent > parentIndent) {\n        indentStatus = 1;\n      } else if (state.lineIndent === parentIndent) {\n        indentStatus = 0;\n      } else if (state.lineIndent < parentIndent) {\n        indentStatus = -1;\n      }\n    }\n  }\n\n  if (indentStatus === 1) {\n    while (readTagProperty(state) || readAnchorProperty(state)) {\n      if (skipSeparationSpace(state, true, -1)) {\n        atNewLine = true;\n        allowBlockCollections = allowBlockStyles;\n\n        if (state.lineIndent > parentIndent) {\n          indentStatus = 1;\n        } else if (state.lineIndent === parentIndent) {\n          indentStatus = 0;\n        } else if (state.lineIndent < parentIndent) {\n          indentStatus = -1;\n        }\n      } else {\n        allowBlockCollections = false;\n      }\n    }\n  }\n\n  if (allowBlockCollections) {\n    allowBlockCollections = atNewLine || allowCompact;\n  }\n\n  if (indentStatus === 1 || CONTEXT_BLOCK_OUT === nodeContext) {\n    if (CONTEXT_FLOW_IN === nodeContext || CONTEXT_FLOW_OUT === nodeContext) {\n      flowIndent = parentIndent;\n    } else {\n      flowIndent = parentIndent + 1;\n    }\n\n    blockIndent = state.position - state.lineStart;\n\n    if (indentStatus === 1) {\n      if (allowBlockCollections &&\n          (readBlockSequence(state, blockIndent) ||\n           readBlockMapping(state, blockIndent, flowIndent)) ||\n          readFlowCollection(state, flowIndent)) {\n        hasContent = true;\n      } else {\n        if ((allowBlockScalars && readBlockScalar(state, flowIndent)) ||\n            readSingleQuotedScalar(state, flowIndent) ||\n            readDoubleQuotedScalar(state, flowIndent)) {\n          hasContent = true;\n\n        } else if (readAlias(state)) {\n          hasContent = true;\n\n          if (state.tag !== null || state.anchor !== null) {\n            throwError(state, 'alias node should not have any properties');\n          }\n\n        } else if (readPlainScalar(state, flowIndent, CONTEXT_FLOW_IN === nodeContext)) {\n          hasContent = true;\n\n          if (state.tag === null) {\n            state.tag = '?';\n          }\n        }\n\n        if (state.anchor !== null) {\n          state.anchorMap[state.anchor] = state.result;\n        }\n      }\n    } else if (indentStatus === 0) {\n      // Special case: block sequences are allowed to have same indentation level as the parent.\n      // http://www.yaml.org/spec/1.2/spec.html#id2799784\n      hasContent = allowBlockCollections && readBlockSequence(state, blockIndent);\n    }\n  }\n\n  if (state.tag !== null && state.tag !== '!') {\n    if (state.tag === '?') {\n      for (typeIndex = 0, typeQuantity = state.implicitTypes.length;\n           typeIndex < typeQuantity;\n           typeIndex += 1) {\n        type = state.implicitTypes[typeIndex];\n\n        // Implicit resolving is not allowed for non-scalar types, and '?'\n        // non-specific tag is only assigned to plain scalars. So, it isn't\n        // needed to check for 'kind' conformity.\n\n        if (type.resolve(state.result)) { // `state.result` updated in resolver if matched\n          state.result = type.construct(state.result);\n          state.tag = type.tag;\n          if (state.anchor !== null) {\n            state.anchorMap[state.anchor] = state.result;\n          }\n          break;\n        }\n      }\n    } else if (_hasOwnProperty.call(state.typeMap, state.tag)) {\n      type = state.typeMap[state.tag];\n\n      if (state.result !== null && type.kind !== state.kind) {\n        throwError(state, 'unacceptable node kind for !<' + state.tag + '> tag; it should be \"' + type.kind + '\", not \"' + state.kind + '\"');\n      }\n\n      if (!type.resolve(state.result)) { // `state.result` updated in resolver if matched\n        throwError(state, 'cannot resolve a node with !<' + state.tag + '> explicit tag');\n      } else {\n        state.result = type.construct(state.result);\n        if (state.anchor !== null) {\n          state.anchorMap[state.anchor] = state.result;\n        }\n      }\n    } else {\n      throwError(state, 'unknown tag !<' + state.tag + '>');\n    }\n  }\n\n  if (state.listener !== null) {\n    state.listener('close', state);\n  }\n  return state.tag !== null ||  state.anchor !== null || hasContent;\n}\n\nfunction readDocument(state) {\n  var documentStart = state.position,\n      _position,\n      directiveName,\n      directiveArgs,\n      hasDirectives = false,\n      ch;\n\n  state.version = null;\n  state.checkLineBreaks = state.legacy;\n  state.tagMap = {};\n  state.anchorMap = {};\n\n  while ((ch = state.input.charCodeAt(state.position)) !== 0) {\n    skipSeparationSpace(state, true, -1);\n\n    ch = state.input.charCodeAt(state.position);\n\n    if (state.lineIndent > 0 || ch !== 0x25/* % */) {\n      break;\n    }\n\n    hasDirectives = true;\n    ch = state.input.charCodeAt(++state.position);\n    _position = state.position;\n\n    while (ch !== 0 && !is_WS_OR_EOL(ch)) {\n      ch = state.input.charCodeAt(++state.position);\n    }\n\n    directiveName = state.input.slice(_position, state.position);\n    directiveArgs = [];\n\n    if (directiveName.length < 1) {\n      throwError(state, 'directive name must not be less than one character in length');\n    }\n\n    while (ch !== 0) {\n      while (is_WHITE_SPACE(ch)) {\n        ch = state.input.charCodeAt(++state.position);\n      }\n\n      if (ch === 0x23/* # */) {\n        do { ch = state.input.charCodeAt(++state.position); }\n        while (ch !== 0 && !is_EOL(ch));\n        break;\n      }\n\n      if (is_EOL(ch)) break;\n\n      _position = state.position;\n\n      while (ch !== 0 && !is_WS_OR_EOL(ch)) {\n        ch = state.input.charCodeAt(++state.position);\n      }\n\n      directiveArgs.push(state.input.slice(_position, state.position));\n    }\n\n    if (ch !== 0) readLineBreak(state);\n\n    if (_hasOwnProperty.call(directiveHandlers, directiveName)) {\n      directiveHandlers[directiveName](state, directiveName, directiveArgs);\n    } else {\n      throwWarning(state, 'unknown document directive \"' + directiveName + '\"');\n    }\n  }\n\n  skipSeparationSpace(state, true, -1);\n\n  if (state.lineIndent === 0 &&\n      state.input.charCodeAt(state.position)     === 0x2D/* - */ &&\n      state.input.charCodeAt(state.position + 1) === 0x2D/* - */ &&\n      state.input.charCodeAt(state.position + 2) === 0x2D/* - */) {\n    state.position += 3;\n    skipSeparationSpace(state, true, -1);\n\n  } else if (hasDirectives) {\n    throwError(state, 'directives end mark is expected');\n  }\n\n  composeNode(state, state.lineIndent - 1, CONTEXT_BLOCK_OUT, false, true);\n  skipSeparationSpace(state, true, -1);\n\n  if (state.checkLineBreaks &&\n      PATTERN_NON_ASCII_LINE_BREAKS.test(state.input.slice(documentStart, state.position))) {\n    throwWarning(state, 'non-ASCII line breaks are interpreted as content');\n  }\n\n  state.documents.push(state.result);\n\n  if (state.position === state.lineStart && testDocumentSeparator(state)) {\n\n    if (state.input.charCodeAt(state.position) === 0x2E/* . */) {\n      state.position += 3;\n      skipSeparationSpace(state, true, -1);\n    }\n    return;\n  }\n\n  if (state.position < (state.length - 1)) {\n    throwError(state, 'end of the stream or a document separator is expected');\n  } else {\n    return;\n  }\n}\n\n\nfunction loadDocuments(input, options) {\n  input = String(input);\n  options = options || {};\n\n  if (input.length !== 0) {\n\n    // Add tailing `\\n` if not exists\n    if (input.charCodeAt(input.length - 1) !== 0x0A/* LF */ &&\n        input.charCodeAt(input.length - 1) !== 0x0D/* CR */) {\n      input += '\\n';\n    }\n\n    // Strip BOM\n    if (input.charCodeAt(0) === 0xFEFF) {\n      input = input.slice(1);\n    }\n  }\n\n  var state = new State(input, options);\n\n  // Use 0 as string terminator. That significantly simplifies bounds check.\n  state.input += '\\0';\n\n  while (state.input.charCodeAt(state.position) === 0x20/* Space */) {\n    state.lineIndent += 1;\n    state.position += 1;\n  }\n\n  while (state.position < (state.length - 1)) {\n    readDocument(state);\n  }\n\n  return state.documents;\n}\n\n\nfunction loadAll(input, iterator, options) {\n  var documents = loadDocuments(input, options), index, length;\n\n  for (index = 0, length = documents.length; index < length; index += 1) {\n    iterator(documents[index]);\n  }\n}\n\n\nfunction load(input, options) {\n  var documents = loadDocuments(input, options);\n\n  if (documents.length === 0) {\n    /*eslint-disable no-undefined*/\n    return undefined;\n  } else if (documents.length === 1) {\n    return documents[0];\n  }\n  throw new YAMLException('expected a single document in the stream, but found more');\n}\n\n\nfunction safeLoadAll(input, output, options) {\n  loadAll(input, output, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));\n}\n\n\nfunction safeLoad(input, options) {\n  return load(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));\n}\n\n\nmodule.exports.loadAll     = loadAll;\nmodule.exports.load        = load;\nmodule.exports.safeLoadAll = safeLoadAll;\nmodule.exports.safeLoad    = safeLoad;\n","'use strict';\n\n\nvar common = require('./common');\n\n\nfunction Mark(name, buffer, position, line, column) {\n  this.name     = name;\n  this.buffer   = buffer;\n  this.position = position;\n  this.line     = line;\n  this.column   = column;\n}\n\n\nMark.prototype.getSnippet = function getSnippet(indent, maxLength) {\n  var head, start, tail, end, snippet;\n\n  if (!this.buffer) return null;\n\n  indent = indent || 4;\n  maxLength = maxLength || 75;\n\n  head = '';\n  start = this.position;\n\n  while (start > 0 && '\\x00\\r\\n\\x85\\u2028\\u2029'.indexOf(this.buffer.charAt(start - 1)) === -1) {\n    start -= 1;\n    if (this.position - start > (maxLength / 2 - 1)) {\n      head = ' ... ';\n      start += 5;\n      break;\n    }\n  }\n\n  tail = '';\n  end = this.position;\n\n  while (end < this.buffer.length && '\\x00\\r\\n\\x85\\u2028\\u2029'.indexOf(this.buffer.charAt(end)) === -1) {\n    end += 1;\n    if (end - this.position > (maxLength / 2 - 1)) {\n      tail = ' ... ';\n      end -= 5;\n      break;\n    }\n  }\n\n  snippet = this.buffer.slice(start, end);\n\n  return common.repeat(' ', indent) + head + snippet + tail + '\\n' +\n         common.repeat(' ', indent + this.position - start + head.length) + '^';\n};\n\n\nMark.prototype.toString = function toString(compact) {\n  var snippet, where = '';\n\n  if (this.name) {\n    where += 'in \"' + this.name + '\" ';\n  }\n\n  where += 'at line ' + (this.line + 1) + ', column ' + (this.column + 1);\n\n  if (!compact) {\n    snippet = this.getSnippet();\n\n    if (snippet) {\n      where += ':\\n' + snippet;\n    }\n  }\n\n  return where;\n};\n\n\nmodule.exports = Mark;\n","'use strict';\n\n/*eslint-disable max-len*/\n\nvar common        = require('./common');\nvar YAMLException = require('./exception');\nvar Type          = require('./type');\n\n\nfunction compileList(schema, name, result) {\n  var exclude = [];\n\n  schema.include.forEach(function (includedSchema) {\n    result = compileList(includedSchema, name, result);\n  });\n\n  schema[name].forEach(function (currentType) {\n    result.forEach(function (previousType, previousIndex) {\n      if (previousType.tag === currentType.tag) {\n        exclude.push(previousIndex);\n      }\n    });\n\n    result.push(currentType);\n  });\n\n  return result.filter(function (type, index) {\n    return exclude.indexOf(index) === -1;\n  });\n}\n\n\nfunction compileMap(/* lists... */) {\n  var result = {}, index, length;\n\n  function collectType(type) {\n    result[type.tag] = type;\n  }\n\n  for (index = 0, length = arguments.length; index < length; index += 1) {\n    arguments[index].forEach(collectType);\n  }\n\n  return result;\n}\n\n\nfunction Schema(definition) {\n  this.include  = definition.include  || [];\n  this.implicit = definition.implicit || [];\n  this.explicit = definition.explicit || [];\n\n  this.implicit.forEach(function (type) {\n    if (type.loadKind && type.loadKind !== 'scalar') {\n      throw new YAMLException('There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.');\n    }\n  });\n\n  this.compiledImplicit = compileList(this, 'implicit', []);\n  this.compiledExplicit = compileList(this, 'explicit', []);\n  this.compiledTypeMap  = compileMap(this.compiledImplicit, this.compiledExplicit);\n}\n\n\nSchema.DEFAULT = null;\n\n\nSchema.create = function createSchema() {\n  var schemas, types;\n\n  switch (arguments.length) {\n    case 1:\n      schemas = Schema.DEFAULT;\n      types = arguments[0];\n      break;\n\n    case 2:\n      schemas = arguments[0];\n      types = arguments[1];\n      break;\n\n    default:\n      throw new YAMLException('Wrong number of arguments for Schema.create function');\n  }\n\n  schemas = common.toArray(schemas);\n  types = common.toArray(types);\n\n  if (!schemas.every(function (schema) { return schema instanceof Schema; })) {\n    throw new YAMLException('Specified list of super schemas (or a single Schema object) contains a non-Schema object.');\n  }\n\n  if (!types.every(function (type) { return type instanceof Type; })) {\n    throw new YAMLException('Specified list of YAML types (or a single Type object) contains a non-Type object.');\n  }\n\n  return new Schema({\n    include: schemas,\n    explicit: types\n  });\n};\n\n\nmodule.exports = Schema;\n","// Standard YAML's Core schema.\n// http://www.yaml.org/spec/1.2/spec.html#id2804923\n//\n// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.\n// So, Core schema has no distinctions from JSON schema is JS-YAML.\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  include: [\n    require('./json')\n  ]\n});\n","// JS-YAML's default schema for `load` function.\n// It is not described in the YAML specification.\n//\n// This schema is based on JS-YAML's default safe schema and includes\n// JavaScript-specific types: !!js/undefined, !!js/regexp and !!js/function.\n//\n// Also this schema is used as default base schema at `Schema.create` function.\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = Schema.DEFAULT = new Schema({\n  include: [\n    require('./default_safe')\n  ],\n  explicit: [\n    require('../type/js/undefined'),\n    require('../type/js/regexp'),\n    require('../type/js/function')\n  ]\n});\n","// JS-YAML's default schema for `safeLoad` function.\n// It is not described in the YAML specification.\n//\n// This schema is based on standard YAML's Core schema and includes most of\n// extra types described at YAML tag repository. (http://yaml.org/type/)\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  include: [\n    require('./core')\n  ],\n  implicit: [\n    require('../type/timestamp'),\n    require('../type/merge')\n  ],\n  explicit: [\n    require('../type/binary'),\n    require('../type/omap'),\n    require('../type/pairs'),\n    require('../type/set')\n  ]\n});\n","// Standard YAML's Failsafe schema.\n// http://www.yaml.org/spec/1.2/spec.html#id2802346\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  explicit: [\n    require('../type/str'),\n    require('../type/seq'),\n    require('../type/map')\n  ]\n});\n","// Standard YAML's JSON schema.\n// http://www.yaml.org/spec/1.2/spec.html#id2803231\n//\n// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.\n// So, this schema is not such strict as defined in the YAML specification.\n// It allows numbers in binary notaion, use `Null` and `NULL` as `null`, etc.\n\n\n'use strict';\n\n\nvar Schema = require('../schema');\n\n\nmodule.exports = new Schema({\n  include: [\n    require('./failsafe')\n  ],\n  implicit: [\n    require('../type/null'),\n    require('../type/bool'),\n    require('../type/int'),\n    require('../type/float')\n  ]\n});\n","'use strict';\n\nvar YAMLException = require('./exception');\n\nvar TYPE_CONSTRUCTOR_OPTIONS = [\n  'kind',\n  'resolve',\n  'construct',\n  'instanceOf',\n  'predicate',\n  'represent',\n  'defaultStyle',\n  'styleAliases'\n];\n\nvar YAML_NODE_KINDS = [\n  'scalar',\n  'sequence',\n  'mapping'\n];\n\nfunction compileStyleAliases(map) {\n  var result = {};\n\n  if (map !== null) {\n    Object.keys(map).forEach(function (style) {\n      map[style].forEach(function (alias) {\n        result[String(alias)] = style;\n      });\n    });\n  }\n\n  return result;\n}\n\nfunction Type(tag, options) {\n  options = options || {};\n\n  Object.keys(options).forEach(function (name) {\n    if (TYPE_CONSTRUCTOR_OPTIONS.indexOf(name) === -1) {\n      throw new YAMLException('Unknown option \"' + name + '\" is met in definition of \"' + tag + '\" YAML type.');\n    }\n  });\n\n  // TODO: Add tag format check.\n  this.tag          = tag;\n  this.kind         = options['kind']         || null;\n  this.resolve      = options['resolve']      || function () { return true; };\n  this.construct    = options['construct']    || function (data) { return data; };\n  this.instanceOf   = options['instanceOf']   || null;\n  this.predicate    = options['predicate']    || null;\n  this.represent    = options['represent']    || null;\n  this.defaultStyle = options['defaultStyle'] || null;\n  this.styleAliases = compileStyleAliases(options['styleAliases'] || null);\n\n  if (YAML_NODE_KINDS.indexOf(this.kind) === -1) {\n    throw new YAMLException('Unknown kind \"' + this.kind + '\" is specified for \"' + tag + '\" YAML type.');\n  }\n}\n\nmodule.exports = Type;\n","'use strict';\n\n/*eslint-disable no-bitwise*/\n\nvar NodeBuffer;\n\ntry {\n  // A trick for browserified version, to not include `Buffer` shim\n  var _require = require;\n  NodeBuffer = _require('buffer').Buffer;\n} catch (__) {}\n\nvar Type       = require('../type');\n\n\n// [ 64, 65, 66 ] -> [ padding, CR, LF ]\nvar BASE64_MAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\\n\\r';\n\n\nfunction resolveYamlBinary(data) {\n  if (data === null) return false;\n\n  var code, idx, bitlen = 0, max = data.length, map = BASE64_MAP;\n\n  // Convert one by one.\n  for (idx = 0; idx < max; idx++) {\n    code = map.indexOf(data.charAt(idx));\n\n    // Skip CR/LF\n    if (code > 64) continue;\n\n    // Fail on illegal characters\n    if (code < 0) return false;\n\n    bitlen += 6;\n  }\n\n  // If there are any bits left, source was corrupted\n  return (bitlen % 8) === 0;\n}\n\nfunction constructYamlBinary(data) {\n  var idx, tailbits,\n      input = data.replace(/[\\r\\n=]/g, ''), // remove CR/LF & padding to simplify scan\n      max = input.length,\n      map = BASE64_MAP,\n      bits = 0,\n      result = [];\n\n  // Collect by 6*4 bits (3 bytes)\n\n  for (idx = 0; idx < max; idx++) {\n    if ((idx % 4 === 0) && idx) {\n      result.push((bits >> 16) & 0xFF);\n      result.push((bits >> 8) & 0xFF);\n      result.push(bits & 0xFF);\n    }\n\n    bits = (bits << 6) | map.indexOf(input.charAt(idx));\n  }\n\n  // Dump tail\n\n  tailbits = (max % 4) * 6;\n\n  if (tailbits === 0) {\n    result.push((bits >> 16) & 0xFF);\n    result.push((bits >> 8) & 0xFF);\n    result.push(bits & 0xFF);\n  } else if (tailbits === 18) {\n    result.push((bits >> 10) & 0xFF);\n    result.push((bits >> 2) & 0xFF);\n  } else if (tailbits === 12) {\n    result.push((bits >> 4) & 0xFF);\n  }\n\n  // Wrap into Buffer for NodeJS and leave Array for browser\n  if (NodeBuffer) return new NodeBuffer(result);\n\n  return result;\n}\n\nfunction representYamlBinary(object /*, style*/) {\n  var result = '', bits = 0, idx, tail,\n      max = object.length,\n      map = BASE64_MAP;\n\n  // Convert every three bytes to 4 ASCII characters.\n\n  for (idx = 0; idx < max; idx++) {\n    if ((idx % 3 === 0) && idx) {\n      result += map[(bits >> 18) & 0x3F];\n      result += map[(bits >> 12) & 0x3F];\n      result += map[(bits >> 6) & 0x3F];\n      result += map[bits & 0x3F];\n    }\n\n    bits = (bits << 8) + object[idx];\n  }\n\n  // Dump tail\n\n  tail = max % 3;\n\n  if (tail === 0) {\n    result += map[(bits >> 18) & 0x3F];\n    result += map[(bits >> 12) & 0x3F];\n    result += map[(bits >> 6) & 0x3F];\n    result += map[bits & 0x3F];\n  } else if (tail === 2) {\n    result += map[(bits >> 10) & 0x3F];\n    result += map[(bits >> 4) & 0x3F];\n    result += map[(bits << 2) & 0x3F];\n    result += map[64];\n  } else if (tail === 1) {\n    result += map[(bits >> 2) & 0x3F];\n    result += map[(bits << 4) & 0x3F];\n    result += map[64];\n    result += map[64];\n  }\n\n  return result;\n}\n\nfunction isBinary(object) {\n  return NodeBuffer && NodeBuffer.isBuffer(object);\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:binary', {\n  kind: 'scalar',\n  resolve: resolveYamlBinary,\n  construct: constructYamlBinary,\n  predicate: isBinary,\n  represent: representYamlBinary\n});\n","'use strict';\n\nvar Type = require('../type');\n\nfunction resolveYamlBoolean(data) {\n  if (data === null) return false;\n\n  var max = data.length;\n\n  return (max === 4 && (data === 'true' || data === 'True' || data === 'TRUE')) ||\n         (max === 5 && (data === 'false' || data === 'False' || data === 'FALSE'));\n}\n\nfunction constructYamlBoolean(data) {\n  return data === 'true' ||\n         data === 'True' ||\n         data === 'TRUE';\n}\n\nfunction isBoolean(object) {\n  return Object.prototype.toString.call(object) === '[object Boolean]';\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:bool', {\n  kind: 'scalar',\n  resolve: resolveYamlBoolean,\n  construct: constructYamlBoolean,\n  predicate: isBoolean,\n  represent: {\n    lowercase: function (object) { return object ? 'true' : 'false'; },\n    uppercase: function (object) { return object ? 'TRUE' : 'FALSE'; },\n    camelcase: function (object) { return object ? 'True' : 'False'; }\n  },\n  defaultStyle: 'lowercase'\n});\n","'use strict';\n\nvar common = require('../common');\nvar Type   = require('../type');\n\nvar YAML_FLOAT_PATTERN = new RegExp(\n  '^(?:[-+]?(?:[0-9][0-9_]*)\\\\.[0-9_]*(?:[eE][-+][0-9]+)?' +\n  '|\\\\.[0-9_]+(?:[eE][-+][0-9]+)?' +\n  '|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\\\.[0-9_]*' +\n  '|[-+]?\\\\.(?:inf|Inf|INF)' +\n  '|\\\\.(?:nan|NaN|NAN))$');\n\nfunction resolveYamlFloat(data) {\n  if (data === null) return false;\n\n  if (!YAML_FLOAT_PATTERN.test(data)) return false;\n\n  return true;\n}\n\nfunction constructYamlFloat(data) {\n  var value, sign, base, digits;\n\n  value  = data.replace(/_/g, '').toLowerCase();\n  sign   = value[0] === '-' ? -1 : 1;\n  digits = [];\n\n  if ('+-'.indexOf(value[0]) >= 0) {\n    value = value.slice(1);\n  }\n\n  if (value === '.inf') {\n    return (sign === 1) ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY;\n\n  } else if (value === '.nan') {\n    return NaN;\n\n  } else if (value.indexOf(':') >= 0) {\n    value.split(':').forEach(function (v) {\n      digits.unshift(parseFloat(v, 10));\n    });\n\n    value = 0.0;\n    base = 1;\n\n    digits.forEach(function (d) {\n      value += d * base;\n      base *= 60;\n    });\n\n    return sign * value;\n\n  }\n  return sign * parseFloat(value, 10);\n}\n\n\nvar SCIENTIFIC_WITHOUT_DOT = /^[-+]?[0-9]+e/;\n\nfunction representYamlFloat(object, style) {\n  var res;\n\n  if (isNaN(object)) {\n    switch (style) {\n      case 'lowercase': return '.nan';\n      case 'uppercase': return '.NAN';\n      case 'camelcase': return '.NaN';\n    }\n  } else if (Number.POSITIVE_INFINITY === object) {\n    switch (style) {\n      case 'lowercase': return '.inf';\n      case 'uppercase': return '.INF';\n      case 'camelcase': return '.Inf';\n    }\n  } else if (Number.NEGATIVE_INFINITY === object) {\n    switch (style) {\n      case 'lowercase': return '-.inf';\n      case 'uppercase': return '-.INF';\n      case 'camelcase': return '-.Inf';\n    }\n  } else if (common.isNegativeZero(object)) {\n    return '-0.0';\n  }\n\n  res = object.toString(10);\n\n  // JS stringifier can build scientific format without dots: 5e-100,\n  // while YAML requres dot: 5.e-100. Fix it with simple hack\n\n  return SCIENTIFIC_WITHOUT_DOT.test(res) ? res.replace('e', '.e') : res;\n}\n\nfunction isFloat(object) {\n  return (Object.prototype.toString.call(object) === '[object Number]') &&\n         (object % 1 !== 0 || common.isNegativeZero(object));\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:float', {\n  kind: 'scalar',\n  resolve: resolveYamlFloat,\n  construct: constructYamlFloat,\n  predicate: isFloat,\n  represent: representYamlFloat,\n  defaultStyle: 'lowercase'\n});\n","'use strict';\n\nvar common = require('../common');\nvar Type   = require('../type');\n\nfunction isHexCode(c) {\n  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) ||\n         ((0x41/* A */ <= c) && (c <= 0x46/* F */)) ||\n         ((0x61/* a */ <= c) && (c <= 0x66/* f */));\n}\n\nfunction isOctCode(c) {\n  return ((0x30/* 0 */ <= c) && (c <= 0x37/* 7 */));\n}\n\nfunction isDecCode(c) {\n  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */));\n}\n\nfunction resolveYamlInteger(data) {\n  if (data === null) return false;\n\n  var max = data.length,\n      index = 0,\n      hasDigits = false,\n      ch;\n\n  if (!max) return false;\n\n  ch = data[index];\n\n  // sign\n  if (ch === '-' || ch === '+') {\n    ch = data[++index];\n  }\n\n  if (ch === '0') {\n    // 0\n    if (index + 1 === max) return true;\n    ch = data[++index];\n\n    // base 2, base 8, base 16\n\n    if (ch === 'b') {\n      // base 2\n      index++;\n\n      for (; index < max; index++) {\n        ch = data[index];\n        if (ch === '_') continue;\n        if (ch !== '0' && ch !== '1') return false;\n        hasDigits = true;\n      }\n      return hasDigits;\n    }\n\n\n    if (ch === 'x') {\n      // base 16\n      index++;\n\n      for (; index < max; index++) {\n        ch = data[index];\n        if (ch === '_') continue;\n        if (!isHexCode(data.charCodeAt(index))) return false;\n        hasDigits = true;\n      }\n      return hasDigits;\n    }\n\n    // base 8\n    for (; index < max; index++) {\n      ch = data[index];\n      if (ch === '_') continue;\n      if (!isOctCode(data.charCodeAt(index))) return false;\n      hasDigits = true;\n    }\n    return hasDigits;\n  }\n\n  // base 10 (except 0) or base 60\n\n  for (; index < max; index++) {\n    ch = data[index];\n    if (ch === '_') continue;\n    if (ch === ':') break;\n    if (!isDecCode(data.charCodeAt(index))) {\n      return false;\n    }\n    hasDigits = true;\n  }\n\n  if (!hasDigits) return false;\n\n  // if !base60 - done;\n  if (ch !== ':') return true;\n\n  // base60 almost not used, no needs to optimize\n  return /^(:[0-5]?[0-9])+$/.test(data.slice(index));\n}\n\nfunction constructYamlInteger(data) {\n  var value = data, sign = 1, ch, base, digits = [];\n\n  if (value.indexOf('_') !== -1) {\n    value = value.replace(/_/g, '');\n  }\n\n  ch = value[0];\n\n  if (ch === '-' || ch === '+') {\n    if (ch === '-') sign = -1;\n    value = value.slice(1);\n    ch = value[0];\n  }\n\n  if (value === '0') return 0;\n\n  if (ch === '0') {\n    if (value[1] === 'b') return sign * parseInt(value.slice(2), 2);\n    if (value[1] === 'x') return sign * parseInt(value, 16);\n    return sign * parseInt(value, 8);\n  }\n\n  if (value.indexOf(':') !== -1) {\n    value.split(':').forEach(function (v) {\n      digits.unshift(parseInt(v, 10));\n    });\n\n    value = 0;\n    base = 1;\n\n    digits.forEach(function (d) {\n      value += (d * base);\n      base *= 60;\n    });\n\n    return sign * value;\n\n  }\n\n  return sign * parseInt(value, 10);\n}\n\nfunction isInteger(object) {\n  return (Object.prototype.toString.call(object)) === '[object Number]' &&\n         (object % 1 === 0 && !common.isNegativeZero(object));\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:int', {\n  kind: 'scalar',\n  resolve: resolveYamlInteger,\n  construct: constructYamlInteger,\n  predicate: isInteger,\n  represent: {\n    binary:      function (object) { return '0b' + object.toString(2); },\n    octal:       function (object) { return '0'  + object.toString(8); },\n    decimal:     function (object) { return        object.toString(10); },\n    hexadecimal: function (object) { return '0x' + object.toString(16).toUpperCase(); }\n  },\n  defaultStyle: 'decimal',\n  styleAliases: {\n    binary:      [ 2,  'bin' ],\n    octal:       [ 8,  'oct' ],\n    decimal:     [ 10, 'dec' ],\n    hexadecimal: [ 16, 'hex' ]\n  }\n});\n","'use strict';\n\nvar esprima;\n\n// Browserified version does not have esprima\n//\n// 1. For node.js just require module as deps\n// 2. For browser try to require mudule via external AMD system.\n//    If not found - try to fallback to window.esprima. If not\n//    found too - then fail to parse.\n//\ntry {\n  // workaround to exclude package from browserify list.\n  var _require = require;\n  esprima = _require('esprima');\n} catch (_) {\n  /*global window */\n  if (typeof window !== 'undefined') esprima = window.esprima;\n}\n\nvar Type = require('../../type');\n\nfunction resolveJavascriptFunction(data) {\n  if (data === null) return false;\n\n  try {\n    var source = '(' + data + ')',\n        ast    = esprima.parse(source, { range: true });\n\n    if (ast.type                    !== 'Program'             ||\n        ast.body.length             !== 1                     ||\n        ast.body[0].type            !== 'ExpressionStatement' ||\n        ast.body[0].expression.type !== 'FunctionExpression') {\n      return false;\n    }\n\n    return true;\n  } catch (err) {\n    return false;\n  }\n}\n\nfunction constructJavascriptFunction(data) {\n  /*jslint evil:true*/\n\n  var source = '(' + data + ')',\n      ast    = esprima.parse(source, { range: true }),\n      params = [],\n      body;\n\n  if (ast.type                    !== 'Program'             ||\n      ast.body.length             !== 1                     ||\n      ast.body[0].type            !== 'ExpressionStatement' ||\n      ast.body[0].expression.type !== 'FunctionExpression') {\n    throw new Error('Failed to resolve function');\n  }\n\n  ast.body[0].expression.params.forEach(function (param) {\n    params.push(param.name);\n  });\n\n  body = ast.body[0].expression.body.range;\n\n  // Esprima's ranges include the first '{' and the last '}' characters on\n  // function expressions. So cut them out.\n  /*eslint-disable no-new-func*/\n  return new Function(params, source.slice(body[0] + 1, body[1] - 1));\n}\n\nfunction representJavascriptFunction(object /*, style*/) {\n  return object.toString();\n}\n\nfunction isFunction(object) {\n  return Object.prototype.toString.call(object) === '[object Function]';\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:js/function', {\n  kind: 'scalar',\n  resolve: resolveJavascriptFunction,\n  construct: constructJavascriptFunction,\n  predicate: isFunction,\n  represent: representJavascriptFunction\n});\n","'use strict';\n\nvar Type = require('../../type');\n\nfunction resolveJavascriptRegExp(data) {\n  if (data === null) return false;\n  if (data.length === 0) return false;\n\n  var regexp = data,\n      tail   = /\\/([gim]*)$/.exec(data),\n      modifiers = '';\n\n  // if regexp starts with '/' it can have modifiers and must be properly closed\n  // `/foo/gim` - modifiers tail can be maximum 3 chars\n  if (regexp[0] === '/') {\n    if (tail) modifiers = tail[1];\n\n    if (modifiers.length > 3) return false;\n    // if expression starts with /, is should be properly terminated\n    if (regexp[regexp.length - modifiers.length - 1] !== '/') return false;\n  }\n\n  return true;\n}\n\nfunction constructJavascriptRegExp(data) {\n  var regexp = data,\n      tail   = /\\/([gim]*)$/.exec(data),\n      modifiers = '';\n\n  // `/foo/gim` - tail can be maximum 4 chars\n  if (regexp[0] === '/') {\n    if (tail) modifiers = tail[1];\n    regexp = regexp.slice(1, regexp.length - modifiers.length - 1);\n  }\n\n  return new RegExp(regexp, modifiers);\n}\n\nfunction representJavascriptRegExp(object /*, style*/) {\n  var result = '/' + object.source + '/';\n\n  if (object.global) result += 'g';\n  if (object.multiline) result += 'm';\n  if (object.ignoreCase) result += 'i';\n\n  return result;\n}\n\nfunction isRegExp(object) {\n  return Object.prototype.toString.call(object) === '[object RegExp]';\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:js/regexp', {\n  kind: 'scalar',\n  resolve: resolveJavascriptRegExp,\n  construct: constructJavascriptRegExp,\n  predicate: isRegExp,\n  represent: representJavascriptRegExp\n});\n","'use strict';\n\nvar Type = require('../../type');\n\nfunction resolveJavascriptUndefined() {\n  return true;\n}\n\nfunction constructJavascriptUndefined() {\n  /*eslint-disable no-undefined*/\n  return undefined;\n}\n\nfunction representJavascriptUndefined() {\n  return '';\n}\n\nfunction isUndefined(object) {\n  return typeof object === 'undefined';\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:js/undefined', {\n  kind: 'scalar',\n  resolve: resolveJavascriptUndefined,\n  construct: constructJavascriptUndefined,\n  predicate: isUndefined,\n  represent: representJavascriptUndefined\n});\n","'use strict';\n\nvar Type = require('../type');\n\nmodule.exports = new Type('tag:yaml.org,2002:map', {\n  kind: 'mapping',\n  construct: function (data) { return data !== null ? data : {}; }\n});\n","'use strict';\n\nvar Type = require('../type');\n\nfunction resolveYamlMerge(data) {\n  return data === '<<' || data === null;\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:merge', {\n  kind: 'scalar',\n  resolve: resolveYamlMerge\n});\n","'use strict';\n\nvar Type = require('../type');\n\nfunction resolveYamlNull(data) {\n  if (data === null) return true;\n\n  var max = data.length;\n\n  return (max === 1 && data === '~') ||\n         (max === 4 && (data === 'null' || data === 'Null' || data === 'NULL'));\n}\n\nfunction constructYamlNull() {\n  return null;\n}\n\nfunction isNull(object) {\n  return object === null;\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:null', {\n  kind: 'scalar',\n  resolve: resolveYamlNull,\n  construct: constructYamlNull,\n  predicate: isNull,\n  represent: {\n    canonical: function () { return '~';    },\n    lowercase: function () { return 'null'; },\n    uppercase: function () { return 'NULL'; },\n    camelcase: function () { return 'Null'; }\n  },\n  defaultStyle: 'lowercase'\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\nvar _toString       = Object.prototype.toString;\n\nfunction resolveYamlOmap(data) {\n  if (data === null) return true;\n\n  var objectKeys = [], index, length, pair, pairKey, pairHasKey,\n      object = data;\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    pair = object[index];\n    pairHasKey = false;\n\n    if (_toString.call(pair) !== '[object Object]') return false;\n\n    for (pairKey in pair) {\n      if (_hasOwnProperty.call(pair, pairKey)) {\n        if (!pairHasKey) pairHasKey = true;\n        else return false;\n      }\n    }\n\n    if (!pairHasKey) return false;\n\n    if (objectKeys.indexOf(pairKey) === -1) objectKeys.push(pairKey);\n    else return false;\n  }\n\n  return true;\n}\n\nfunction constructYamlOmap(data) {\n  return data !== null ? data : [];\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:omap', {\n  kind: 'sequence',\n  resolve: resolveYamlOmap,\n  construct: constructYamlOmap\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar _toString = Object.prototype.toString;\n\nfunction resolveYamlPairs(data) {\n  if (data === null) return true;\n\n  var index, length, pair, keys, result,\n      object = data;\n\n  result = new Array(object.length);\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    pair = object[index];\n\n    if (_toString.call(pair) !== '[object Object]') return false;\n\n    keys = Object.keys(pair);\n\n    if (keys.length !== 1) return false;\n\n    result[index] = [ keys[0], pair[keys[0]] ];\n  }\n\n  return true;\n}\n\nfunction constructYamlPairs(data) {\n  if (data === null) return [];\n\n  var index, length, pair, keys, result,\n      object = data;\n\n  result = new Array(object.length);\n\n  for (index = 0, length = object.length; index < length; index += 1) {\n    pair = object[index];\n\n    keys = Object.keys(pair);\n\n    result[index] = [ keys[0], pair[keys[0]] ];\n  }\n\n  return result;\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:pairs', {\n  kind: 'sequence',\n  resolve: resolveYamlPairs,\n  construct: constructYamlPairs\n});\n","'use strict';\n\nvar Type = require('../type');\n\nmodule.exports = new Type('tag:yaml.org,2002:seq', {\n  kind: 'sequence',\n  construct: function (data) { return data !== null ? data : []; }\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\n\nfunction resolveYamlSet(data) {\n  if (data === null) return true;\n\n  var key, object = data;\n\n  for (key in object) {\n    if (_hasOwnProperty.call(object, key)) {\n      if (object[key] !== null) return false;\n    }\n  }\n\n  return true;\n}\n\nfunction constructYamlSet(data) {\n  return data !== null ? data : {};\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:set', {\n  kind: 'mapping',\n  resolve: resolveYamlSet,\n  construct: constructYamlSet\n});\n","'use strict';\n\nvar Type = require('../type');\n\nmodule.exports = new Type('tag:yaml.org,2002:str', {\n  kind: 'scalar',\n  construct: function (data) { return data !== null ? data : ''; }\n});\n","'use strict';\n\nvar Type = require('../type');\n\nvar YAML_DATE_REGEXP = new RegExp(\n  '^([0-9][0-9][0-9][0-9])'          + // [1] year\n  '-([0-9][0-9])'                    + // [2] month\n  '-([0-9][0-9])$');                   // [3] day\n\nvar YAML_TIMESTAMP_REGEXP = new RegExp(\n  '^([0-9][0-9][0-9][0-9])'          + // [1] year\n  '-([0-9][0-9]?)'                   + // [2] month\n  '-([0-9][0-9]?)'                   + // [3] day\n  '(?:[Tt]|[ \\\\t]+)'                 + // ...\n  '([0-9][0-9]?)'                    + // [4] hour\n  ':([0-9][0-9])'                    + // [5] minute\n  ':([0-9][0-9])'                    + // [6] second\n  '(?:\\\\.([0-9]*))?'                 + // [7] fraction\n  '(?:[ \\\\t]*(Z|([-+])([0-9][0-9]?)' + // [8] tz [9] tz_sign [10] tz_hour\n  '(?::([0-9][0-9]))?))?$');           // [11] tz_minute\n\nfunction resolveYamlTimestamp(data) {\n  if (data === null) return false;\n  if (YAML_DATE_REGEXP.exec(data) !== null) return true;\n  if (YAML_TIMESTAMP_REGEXP.exec(data) !== null) return true;\n  return false;\n}\n\nfunction constructYamlTimestamp(data) {\n  var match, year, month, day, hour, minute, second, fraction = 0,\n      delta = null, tz_hour, tz_minute, date;\n\n  match = YAML_DATE_REGEXP.exec(data);\n  if (match === null) match = YAML_TIMESTAMP_REGEXP.exec(data);\n\n  if (match === null) throw new Error('Date resolve error');\n\n  // match: [1] year [2] month [3] day\n\n  year = +(match[1]);\n  month = +(match[2]) - 1; // JS month starts with 0\n  day = +(match[3]);\n\n  if (!match[4]) { // no hour\n    return new Date(Date.UTC(year, month, day));\n  }\n\n  // match: [4] hour [5] minute [6] second [7] fraction\n\n  hour = +(match[4]);\n  minute = +(match[5]);\n  second = +(match[6]);\n\n  if (match[7]) {\n    fraction = match[7].slice(0, 3);\n    while (fraction.length < 3) { // milli-seconds\n      fraction += '0';\n    }\n    fraction = +fraction;\n  }\n\n  // match: [8] tz [9] tz_sign [10] tz_hour [11] tz_minute\n\n  if (match[9]) {\n    tz_hour = +(match[10]);\n    tz_minute = +(match[11] || 0);\n    delta = (tz_hour * 60 + tz_minute) * 60000; // delta in mili-seconds\n    if (match[9] === '-') delta = -delta;\n  }\n\n  date = new Date(Date.UTC(year, month, day, hour, minute, second, fraction));\n\n  if (delta) date.setTime(date.getTime() - delta);\n\n  return date;\n}\n\nfunction representYamlTimestamp(object /*, style*/) {\n  return object.toISOString();\n}\n\nmodule.exports = new Type('tag:yaml.org,2002:timestamp', {\n  kind: 'scalar',\n  resolve: resolveYamlTimestamp,\n  construct: constructYamlTimestamp,\n  instanceOf: Date,\n  represent: representYamlTimestamp\n});\n","var baseIndexOf = require('../internal/baseIndexOf'),\n    binaryIndex = require('../internal/binaryIndex');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Gets the index at which the first occurrence of `value` is found in `array`\n * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)\n * for equality comparisons. If `fromIndex` is negative, it's used as the offset\n * from the end of `array`. If `array` is sorted providing `true` for `fromIndex`\n * performs a faster binary search.\n *\n * @static\n * @memberOf _\n * @category Array\n * @param {Array} array The array to search.\n * @param {*} value The value to search for.\n * @param {boolean|number} [fromIndex=0] The index to search from or `true`\n *  to perform a binary search on a sorted array.\n * @returns {number} Returns the index of the matched value, else `-1`.\n * @example\n *\n * _.indexOf([1, 2, 1, 2], 2);\n * // => 1\n *\n * // using `fromIndex`\n * _.indexOf([1, 2, 1, 2], 2, 2);\n * // => 3\n *\n * // performing a binary search\n * _.indexOf([1, 1, 2, 2], 2, true);\n * // => 2\n */\nfunction indexOf(array, value, fromIndex) {\n  var length = array ? array.length : 0;\n  if (!length) {\n    return -1;\n  }\n  if (typeof fromIndex == 'number') {\n    fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : fromIndex;\n  } else if (fromIndex) {\n    var index = binaryIndex(array, value);\n    if (index < length &&\n        (value === value ? (value === array[index]) : (array[index] !== array[index]))) {\n      return index;\n    }\n    return -1;\n  }\n  return baseIndexOf(array, value, fromIndex || 0);\n}\n\nmodule.exports = indexOf;\n","/**\n * Gets the last element of `array`.\n *\n * @static\n * @memberOf _\n * @category Array\n * @param {Array} array The array to query.\n * @returns {*} Returns the last element of `array`.\n * @example\n *\n * _.last([1, 2, 3]);\n * // => 3\n */\nfunction last(array) {\n  var length = array ? array.length : 0;\n  return length ? array[length - 1] : undefined;\n}\n\nmodule.exports = last;\n","var LazyWrapper = require('../internal/LazyWrapper'),\n    LodashWrapper = require('../internal/LodashWrapper'),\n    baseLodash = require('../internal/baseLodash'),\n    isArray = require('../lang/isArray'),\n    isObjectLike = require('../internal/isObjectLike'),\n    wrapperClone = require('../internal/wrapperClone');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Creates a `lodash` object which wraps `value` to enable implicit chaining.\n * Methods that operate on and return arrays, collections, and functions can\n * be chained together. Methods that retrieve a single value or may return a\n * primitive value will automatically end the chain returning the unwrapped\n * value. Explicit chaining may be enabled using `_.chain`. The execution of\n * chained methods is lazy, that is, execution is deferred until `_#value`\n * is implicitly or explicitly called.\n *\n * Lazy evaluation allows several methods to support shortcut fusion. Shortcut\n * fusion is an optimization strategy which merge iteratee calls; this can help\n * to avoid the creation of intermediate data structures and greatly reduce the\n * number of iteratee executions.\n *\n * Chaining is supported in custom builds as long as the `_#value` method is\n * directly or indirectly included in the build.\n *\n * In addition to lodash methods, wrappers have `Array` and `String` methods.\n *\n * The wrapper `Array` methods are:\n * `concat`, `join`, `pop`, `push`, `reverse`, `shift`, `slice`, `sort`,\n * `splice`, and `unshift`\n *\n * The wrapper `String` methods are:\n * `replace` and `split`\n *\n * The wrapper methods that support shortcut fusion are:\n * `compact`, `drop`, `dropRight`, `dropRightWhile`, `dropWhile`, `filter`,\n * `first`, `initial`, `last`, `map`, `pluck`, `reject`, `rest`, `reverse`,\n * `slice`, `take`, `takeRight`, `takeRightWhile`, `takeWhile`, `toArray`,\n * and `where`\n *\n * The chainable wrapper methods are:\n * `after`, `ary`, `assign`, `at`, `before`, `bind`, `bindAll`, `bindKey`,\n * `callback`, `chain`, `chunk`, `commit`, `compact`, `concat`, `constant`,\n * `countBy`, `create`, `curry`, `debounce`, `defaults`, `defaultsDeep`,\n * `defer`, `delay`, `difference`, `drop`, `dropRight`, `dropRightWhile`,\n * `dropWhile`, `fill`, `filter`, `flatten`, `flattenDeep`, `flow`, `flowRight`,\n * `forEach`, `forEachRight`, `forIn`, `forInRight`, `forOwn`, `forOwnRight`,\n * `functions`, `groupBy`, `indexBy`, `initial`, `intersection`, `invert`,\n * `invoke`, `keys`, `keysIn`, `map`, `mapKeys`, `mapValues`, `matches`,\n * `matchesProperty`, `memoize`, `merge`, `method`, `methodOf`, `mixin`,\n * `modArgs`, `negate`, `omit`, `once`, `pairs`, `partial`, `partialRight`,\n * `partition`, `pick`, `plant`, `pluck`, `property`, `propertyOf`, `pull`,\n * `pullAt`, `push`, `range`, `rearg`, `reject`, `remove`, `rest`, `restParam`,\n * `reverse`, `set`, `shuffle`, `slice`, `sort`, `sortBy`, `sortByAll`,\n * `sortByOrder`, `splice`, `spread`, `take`, `takeRight`, `takeRightWhile`,\n * `takeWhile`, `tap`, `throttle`, `thru`, `times`, `toArray`, `toPlainObject`,\n * `transform`, `union`, `uniq`, `unshift`, `unzip`, `unzipWith`, `values`,\n * `valuesIn`, `where`, `without`, `wrap`, `xor`, `zip`, `zipObject`, `zipWith`\n *\n * The wrapper methods that are **not** chainable by default are:\n * `add`, `attempt`, `camelCase`, `capitalize`, `ceil`, `clone`, `cloneDeep`,\n * `deburr`, `endsWith`, `escape`, `escapeRegExp`, `every`, `find`, `findIndex`,\n * `findKey`, `findLast`, `findLastIndex`, `findLastKey`, `findWhere`, `first`,\n * `floor`, `get`, `gt`, `gte`, `has`, `identity`, `includes`, `indexOf`,\n * `inRange`, `isArguments`, `isArray`, `isBoolean`, `isDate`, `isElement`,\n * `isEmpty`, `isEqual`, `isError`, `isFinite` `isFunction`, `isMatch`,\n * `isNative`, `isNaN`, `isNull`, `isNumber`, `isObject`, `isPlainObject`,\n * `isRegExp`, `isString`, `isUndefined`, `isTypedArray`, `join`, `kebabCase`,\n * `last`, `lastIndexOf`, `lt`, `lte`, `max`, `min`, `noConflict`, `noop`,\n * `now`, `pad`, `padLeft`, `padRight`, `parseInt`, `pop`, `random`, `reduce`,\n * `reduceRight`, `repeat`, `result`, `round`, `runInContext`, `shift`, `size`,\n * `snakeCase`, `some`, `sortedIndex`, `sortedLastIndex`, `startCase`,\n * `startsWith`, `sum`, `template`, `trim`, `trimLeft`, `trimRight`, `trunc`,\n * `unescape`, `uniqueId`, `value`, and `words`\n *\n * The wrapper method `sample` will return a wrapped value when `n` is provided,\n * otherwise an unwrapped value is returned.\n *\n * @name _\n * @constructor\n * @category Chain\n * @param {*} value The value to wrap in a `lodash` instance.\n * @returns {Object} Returns the new `lodash` wrapper instance.\n * @example\n *\n * var wrapped = _([1, 2, 3]);\n *\n * // returns an unwrapped value\n * wrapped.reduce(function(total, n) {\n *   return total + n;\n * });\n * // => 6\n *\n * // returns a wrapped value\n * var squares = wrapped.map(function(n) {\n *   return n * n;\n * });\n *\n * _.isArray(squares);\n * // => false\n *\n * _.isArray(squares.value());\n * // => true\n */\nfunction lodash(value) {\n  if (isObjectLike(value) && !isArray(value) && !(value instanceof LazyWrapper)) {\n    if (value instanceof LodashWrapper) {\n      return value;\n    }\n    if (hasOwnProperty.call(value, '__chain__') && hasOwnProperty.call(value, '__wrapped__')) {\n      return wrapperClone(value);\n    }\n  }\n  return new LodashWrapper(value);\n}\n\n// Ensure wrappers are instances of `baseLodash`.\nlodash.prototype = baseLodash.prototype;\n\nmodule.exports = lodash;\n","module.exports = require('./forEach');\n","var baseEach = require('../internal/baseEach'),\n    createFind = require('../internal/createFind');\n\n/**\n * Iterates over elements of `collection`, returning the first element\n * `predicate` returns truthy for. The predicate is bound to `thisArg` and\n * invoked with three arguments: (value, index|key, collection).\n *\n * If a property name is provided for `predicate` the created `_.property`\n * style callback returns the property value of the given element.\n *\n * If a value is also provided for `thisArg` the created `_.matchesProperty`\n * style callback returns `true` for elements that have a matching property\n * value, else `false`.\n *\n * If an object is provided for `predicate` the created `_.matches` style\n * callback returns `true` for elements that have the properties of the given\n * object, else `false`.\n *\n * @static\n * @memberOf _\n * @alias detect\n * @category Collection\n * @param {Array|Object|string} collection The collection to search.\n * @param {Function|Object|string} [predicate=_.identity] The function invoked\n *  per iteration.\n * @param {*} [thisArg] The `this` binding of `predicate`.\n * @returns {*} Returns the matched element, else `undefined`.\n * @example\n *\n * var users = [\n *   { 'user': 'barney',  'age': 36, 'active': true },\n *   { 'user': 'fred',    'age': 40, 'active': false },\n *   { 'user': 'pebbles', 'age': 1,  'active': true }\n * ];\n *\n * _.result(_.find(users, function(chr) {\n *   return chr.age < 40;\n * }), 'user');\n * // => 'barney'\n *\n * // using the `_.matches` callback shorthand\n * _.result(_.find(users, { 'age': 1, 'active': true }), 'user');\n * // => 'pebbles'\n *\n * // using the `_.matchesProperty` callback shorthand\n * _.result(_.find(users, 'active', false), 'user');\n * // => 'fred'\n *\n * // using the `_.property` callback shorthand\n * _.result(_.find(users, 'active'), 'user');\n * // => 'barney'\n */\nvar find = createFind(baseEach);\n\nmodule.exports = find;\n","var arrayEach = require('../internal/arrayEach'),\n    baseEach = require('../internal/baseEach'),\n    createForEach = require('../internal/createForEach');\n\n/**\n * Iterates over elements of `collection` invoking `iteratee` for each element.\n * The `iteratee` is bound to `thisArg` and invoked with three arguments:\n * (value, index|key, collection). Iteratee functions may exit iteration early\n * by explicitly returning `false`.\n *\n * **Note:** As with other \"Collections\" methods, objects with a \"length\" property\n * are iterated like arrays. To avoid this behavior `_.forIn` or `_.forOwn`\n * may be used for object iteration.\n *\n * @static\n * @memberOf _\n * @alias each\n * @category Collection\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function} [iteratee=_.identity] The function invoked per iteration.\n * @param {*} [thisArg] The `this` binding of `iteratee`.\n * @returns {Array|Object|string} Returns `collection`.\n * @example\n *\n * _([1, 2]).forEach(function(n) {\n *   console.log(n);\n * }).value();\n * // => logs each value from left to right and returns the array\n *\n * _.forEach({ 'a': 1, 'b': 2 }, function(n, key) {\n *   console.log(n, key);\n * });\n * // => logs each value-key pair and returns the object (iteration order is not guaranteed)\n */\nvar forEach = createForEach(arrayEach, baseEach);\n\nmodule.exports = forEach;\n","var baseIndexOf = require('../internal/baseIndexOf'),\n    getLength = require('../internal/getLength'),\n    isArray = require('../lang/isArray'),\n    isIterateeCall = require('../internal/isIterateeCall'),\n    isLength = require('../internal/isLength'),\n    isString = require('../lang/isString'),\n    values = require('../object/values');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Checks if `target` is in `collection` using\n * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)\n * for equality comparisons. If `fromIndex` is negative, it's used as the offset\n * from the end of `collection`.\n *\n * @static\n * @memberOf _\n * @alias contains, include\n * @category Collection\n * @param {Array|Object|string} collection The collection to search.\n * @param {*} target The value to search for.\n * @param {number} [fromIndex=0] The index to search from.\n * @param- {Object} [guard] Enables use as a callback for functions like `_.reduce`.\n * @returns {boolean} Returns `true` if a matching element is found, else `false`.\n * @example\n *\n * _.includes([1, 2, 3], 1);\n * // => true\n *\n * _.includes([1, 2, 3], 1, 2);\n * // => false\n *\n * _.includes({ 'user': 'fred', 'age': 40 }, 'fred');\n * // => true\n *\n * _.includes('pebbles', 'eb');\n * // => true\n */\nfunction includes(collection, target, fromIndex, guard) {\n  var length = collection ? getLength(collection) : 0;\n  if (!isLength(length)) {\n    collection = values(collection);\n    length = collection.length;\n  }\n  if (typeof fromIndex != 'number' || (guard && isIterateeCall(target, fromIndex, guard))) {\n    fromIndex = 0;\n  } else {\n    fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0);\n  }\n  return (typeof collection == 'string' || !isArray(collection) && isString(collection))\n    ? (fromIndex <= length && collection.indexOf(target, fromIndex) > -1)\n    : (!!length && baseIndexOf(collection, target, fromIndex) > -1);\n}\n\nmodule.exports = includes;\n","var arrayMap = require('../internal/arrayMap'),\n    baseCallback = require('../internal/baseCallback'),\n    baseMap = require('../internal/baseMap'),\n    isArray = require('../lang/isArray');\n\n/**\n * Creates an array of values by running each element in `collection` through\n * `iteratee`. The `iteratee` is bound to `thisArg` and invoked with three\n * arguments: (value, index|key, collection).\n *\n * If a property name is provided for `iteratee` the created `_.property`\n * style callback returns the property value of the given element.\n *\n * If a value is also provided for `thisArg` the created `_.matchesProperty`\n * style callback returns `true` for elements that have a matching property\n * value, else `false`.\n *\n * If an object is provided for `iteratee` the created `_.matches` style\n * callback returns `true` for elements that have the properties of the given\n * object, else `false`.\n *\n * Many lodash methods are guarded to work as iteratees for methods like\n * `_.every`, `_.filter`, `_.map`, `_.mapValues`, `_.reject`, and `_.some`.\n *\n * The guarded methods are:\n * `ary`, `callback`, `chunk`, `clone`, `create`, `curry`, `curryRight`,\n * `drop`, `dropRight`, `every`, `fill`, `flatten`, `invert`, `max`, `min`,\n * `parseInt`, `slice`, `sortBy`, `take`, `takeRight`, `template`, `trim`,\n * `trimLeft`, `trimRight`, `trunc`, `random`, `range`, `sample`, `some`,\n * `sum`, `uniq`, and `words`\n *\n * @static\n * @memberOf _\n * @alias collect\n * @category Collection\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function|Object|string} [iteratee=_.identity] The function invoked\n *  per iteration.\n * @param {*} [thisArg] The `this` binding of `iteratee`.\n * @returns {Array} Returns the new mapped array.\n * @example\n *\n * function timesThree(n) {\n *   return n * 3;\n * }\n *\n * _.map([1, 2], timesThree);\n * // => [3, 6]\n *\n * _.map({ 'a': 1, 'b': 2 }, timesThree);\n * // => [3, 6] (iteration order is not guaranteed)\n *\n * var users = [\n *   { 'user': 'barney' },\n *   { 'user': 'fred' }\n * ];\n *\n * // using the `_.property` callback shorthand\n * _.map(users, 'user');\n * // => ['barney', 'fred']\n */\nfunction map(collection, iteratee, thisArg) {\n  var func = isArray(collection) ? arrayMap : baseMap;\n  iteratee = baseCallback(iteratee, thisArg, 3);\n  return func(collection, iteratee);\n}\n\nmodule.exports = map;\n","var getNative = require('../internal/getNative');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeNow = getNative(Date, 'now');\n\n/**\n * Gets the number of milliseconds that have elapsed since the Unix epoch\n * (1 January 1970 00:00:00 UTC).\n *\n * @static\n * @memberOf _\n * @category Date\n * @example\n *\n * _.defer(function(stamp) {\n *   console.log(_.now() - stamp);\n * }, _.now());\n * // => logs the number of milliseconds it took for the deferred function to be invoked\n */\nvar now = nativeNow || function() {\n  return new Date().getTime();\n};\n\nmodule.exports = now;\n","var createWrapper = require('../internal/createWrapper'),\n    replaceHolders = require('../internal/replaceHolders'),\n    restParam = require('./restParam');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    PARTIAL_FLAG = 32;\n\n/**\n * Creates a function that invokes `func` with the `this` binding of `thisArg`\n * and prepends any additional `_.bind` arguments to those provided to the\n * bound function.\n *\n * The `_.bind.placeholder` value, which defaults to `_` in monolithic builds,\n * may be used as a placeholder for partially applied arguments.\n *\n * **Note:** Unlike native `Function#bind` this method does not set the \"length\"\n * property of bound functions.\n *\n * @static\n * @memberOf _\n * @category Function\n * @param {Function} func The function to bind.\n * @param {*} thisArg The `this` binding of `func`.\n * @param {...*} [partials] The arguments to be partially applied.\n * @returns {Function} Returns the new bound function.\n * @example\n *\n * var greet = function(greeting, punctuation) {\n *   return greeting + ' ' + this.user + punctuation;\n * };\n *\n * var object = { 'user': 'fred' };\n *\n * var bound = _.bind(greet, object, 'hi');\n * bound('!');\n * // => 'hi fred!'\n *\n * // using placeholders\n * var bound = _.bind(greet, object, _, '!');\n * bound('hi');\n * // => 'hi fred!'\n */\nvar bind = restParam(function(func, thisArg, partials) {\n  var bitmask = BIND_FLAG;\n  if (partials.length) {\n    var holders = replaceHolders(partials, bind.placeholder);\n    bitmask |= PARTIAL_FLAG;\n  }\n  return createWrapper(func, bitmask, thisArg, partials, holders);\n});\n\n// Assign default placeholders.\nbind.placeholder = {};\n\nmodule.exports = bind;\n","/** Used as the `TypeError` message for \"Functions\" methods. */\nvar FUNC_ERROR_TEXT = 'Expected a function';\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates a function that invokes `func` with the `this` binding of the\n * created function and arguments from `start` and beyond provided as an array.\n *\n * **Note:** This method is based on the [rest parameter](https://developer.mozilla.org/Web/JavaScript/Reference/Functions/rest_parameters).\n *\n * @static\n * @memberOf _\n * @category Function\n * @param {Function} func The function to apply a rest parameter to.\n * @param {number} [start=func.length-1] The start position of the rest parameter.\n * @returns {Function} Returns the new function.\n * @example\n *\n * var say = _.restParam(function(what, names) {\n *   return what + ' ' + _.initial(names).join(', ') +\n *     (_.size(names) > 1 ? ', & ' : '') + _.last(names);\n * });\n *\n * say('hello', 'fred', 'barney', 'pebbles');\n * // => 'hello fred, barney, & pebbles'\n */\nfunction restParam(func, start) {\n  if (typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  start = nativeMax(start === undefined ? (func.length - 1) : (+start || 0), 0);\n  return function() {\n    var args = arguments,\n        index = -1,\n        length = nativeMax(args.length - start, 0),\n        rest = Array(length);\n\n    while (++index < length) {\n      rest[index] = args[start + index];\n    }\n    switch (start) {\n      case 0: return func.call(this, rest);\n      case 1: return func.call(this, args[0], rest);\n      case 2: return func.call(this, args[0], args[1], rest);\n    }\n    var otherArgs = Array(start + 1);\n    index = -1;\n    while (++index < start) {\n      otherArgs[index] = args[index];\n    }\n    otherArgs[start] = rest;\n    return func.apply(this, otherArgs);\n  };\n}\n\nmodule.exports = restParam;\n","var baseCreate = require('./baseCreate'),\n    baseLodash = require('./baseLodash');\n\n/** Used as references for `-Infinity` and `Infinity`. */\nvar POSITIVE_INFINITY = Number.POSITIVE_INFINITY;\n\n/**\n * Creates a lazy wrapper object which wraps `value` to enable lazy evaluation.\n *\n * @private\n * @param {*} value The value to wrap.\n */\nfunction LazyWrapper(value) {\n  this.__wrapped__ = value;\n  this.__actions__ = [];\n  this.__dir__ = 1;\n  this.__filtered__ = false;\n  this.__iteratees__ = [];\n  this.__takeCount__ = POSITIVE_INFINITY;\n  this.__views__ = [];\n}\n\nLazyWrapper.prototype = baseCreate(baseLodash.prototype);\nLazyWrapper.prototype.constructor = LazyWrapper;\n\nmodule.exports = LazyWrapper;\n","var baseCreate = require('./baseCreate'),\n    baseLodash = require('./baseLodash');\n\n/**\n * The base constructor for creating `lodash` wrapper objects.\n *\n * @private\n * @param {*} value The value to wrap.\n * @param {boolean} [chainAll] Enable chaining for all wrapper methods.\n * @param {Array} [actions=[]] Actions to peform to resolve the unwrapped value.\n */\nfunction LodashWrapper(value, chainAll, actions) {\n  this.__wrapped__ = value;\n  this.__actions__ = actions || [];\n  this.__chain__ = !!chainAll;\n}\n\nLodashWrapper.prototype = baseCreate(baseLodash.prototype);\nLodashWrapper.prototype.constructor = LodashWrapper;\n\nmodule.exports = LodashWrapper;\n","/**\n * Copies the values of `source` to `array`.\n *\n * @private\n * @param {Array} source The array to copy values from.\n * @param {Array} [array=[]] The array to copy values to.\n * @returns {Array} Returns `array`.\n */\nfunction arrayCopy(source, array) {\n  var index = -1,\n      length = source.length;\n\n  array || (array = Array(length));\n  while (++index < length) {\n    array[index] = source[index];\n  }\n  return array;\n}\n\nmodule.exports = arrayCopy;\n","/**\n * A specialized version of `_.forEach` for arrays without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array} Returns `array`.\n */\nfunction arrayEach(array, iteratee) {\n  var index = -1,\n      length = array.length;\n\n  while (++index < length) {\n    if (iteratee(array[index], index, array) === false) {\n      break;\n    }\n  }\n  return array;\n}\n\nmodule.exports = arrayEach;\n","/**\n * A specialized version of `_.map` for arrays without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array} Returns the new mapped array.\n */\nfunction arrayMap(array, iteratee) {\n  var index = -1,\n      length = array.length,\n      result = Array(length);\n\n  while (++index < length) {\n    result[index] = iteratee(array[index], index, array);\n  }\n  return result;\n}\n\nmodule.exports = arrayMap;\n","/**\n * A specialized version of `_.some` for arrays without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to iterate over.\n * @param {Function} predicate The function invoked per iteration.\n * @returns {boolean} Returns `true` if any element passes the predicate check,\n *  else `false`.\n */\nfunction arraySome(array, predicate) {\n  var index = -1,\n      length = array.length;\n\n  while (++index < length) {\n    if (predicate(array[index], index, array)) {\n      return true;\n    }\n  }\n  return false;\n}\n\nmodule.exports = arraySome;\n","var baseCopy = require('./baseCopy'),\n    keys = require('../object/keys');\n\n/**\n * The base implementation of `_.assign` without support for argument juggling,\n * multiple sources, and `customizer` functions.\n *\n * @private\n * @param {Object} object The destination object.\n * @param {Object} source The source object.\n * @returns {Object} Returns `object`.\n */\nfunction baseAssign(object, source) {\n  return source == null\n    ? object\n    : baseCopy(source, keys(source), object);\n}\n\nmodule.exports = baseAssign;\n","var baseMatches = require('./baseMatches'),\n    baseMatchesProperty = require('./baseMatchesProperty'),\n    bindCallback = require('./bindCallback'),\n    identity = require('../utility/identity'),\n    property = require('../utility/property');\n\n/**\n * The base implementation of `_.callback` which supports specifying the\n * number of arguments to provide to `func`.\n *\n * @private\n * @param {*} [func=_.identity] The value to convert to a callback.\n * @param {*} [thisArg] The `this` binding of `func`.\n * @param {number} [argCount] The number of arguments to provide to `func`.\n * @returns {Function} Returns the callback.\n */\nfunction baseCallback(func, thisArg, argCount) {\n  var type = typeof func;\n  if (type == 'function') {\n    return thisArg === undefined\n      ? func\n      : bindCallback(func, thisArg, argCount);\n  }\n  if (func == null) {\n    return identity;\n  }\n  if (type == 'object') {\n    return baseMatches(func);\n  }\n  return thisArg === undefined\n    ? property(func)\n    : baseMatchesProperty(func, thisArg);\n}\n\nmodule.exports = baseCallback;\n","var arrayCopy = require('./arrayCopy'),\n    arrayEach = require('./arrayEach'),\n    baseAssign = require('./baseAssign'),\n    baseForOwn = require('./baseForOwn'),\n    initCloneArray = require('./initCloneArray'),\n    initCloneByTag = require('./initCloneByTag'),\n    initCloneObject = require('./initCloneObject'),\n    isArray = require('../lang/isArray'),\n    isHostObject = require('./isHostObject'),\n    isObject = require('../lang/isObject');\n\n/** `Object#toString` result references. */\nvar argsTag = '[object Arguments]',\n    arrayTag = '[object Array]',\n    boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    funcTag = '[object Function]',\n    mapTag = '[object Map]',\n    numberTag = '[object Number]',\n    objectTag = '[object Object]',\n    regexpTag = '[object RegExp]',\n    setTag = '[object Set]',\n    stringTag = '[object String]',\n    weakMapTag = '[object WeakMap]';\n\nvar arrayBufferTag = '[object ArrayBuffer]',\n    float32Tag = '[object Float32Array]',\n    float64Tag = '[object Float64Array]',\n    int8Tag = '[object Int8Array]',\n    int16Tag = '[object Int16Array]',\n    int32Tag = '[object Int32Array]',\n    uint8Tag = '[object Uint8Array]',\n    uint8ClampedTag = '[object Uint8ClampedArray]',\n    uint16Tag = '[object Uint16Array]',\n    uint32Tag = '[object Uint32Array]';\n\n/** Used to identify `toStringTag` values supported by `_.clone`. */\nvar cloneableTags = {};\ncloneableTags[argsTag] = cloneableTags[arrayTag] =\ncloneableTags[arrayBufferTag] = cloneableTags[boolTag] =\ncloneableTags[dateTag] = cloneableTags[float32Tag] =\ncloneableTags[float64Tag] = cloneableTags[int8Tag] =\ncloneableTags[int16Tag] = cloneableTags[int32Tag] =\ncloneableTags[numberTag] = cloneableTags[objectTag] =\ncloneableTags[regexpTag] = cloneableTags[stringTag] =\ncloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] =\ncloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;\ncloneableTags[errorTag] = cloneableTags[funcTag] =\ncloneableTags[mapTag] = cloneableTags[setTag] =\ncloneableTags[weakMapTag] = false;\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * The base implementation of `_.clone` without support for argument juggling\n * and `this` binding `customizer` functions.\n *\n * @private\n * @param {*} value The value to clone.\n * @param {boolean} [isDeep] Specify a deep clone.\n * @param {Function} [customizer] The function to customize cloning values.\n * @param {string} [key] The key of `value`.\n * @param {Object} [object] The object `value` belongs to.\n * @param {Array} [stackA=[]] Tracks traversed source objects.\n * @param {Array} [stackB=[]] Associates clones with source counterparts.\n * @returns {*} Returns the cloned value.\n */\nfunction baseClone(value, isDeep, customizer, key, object, stackA, stackB) {\n  var result;\n  if (customizer) {\n    result = object ? customizer(value, key, object) : customizer(value);\n  }\n  if (result !== undefined) {\n    return result;\n  }\n  if (!isObject(value)) {\n    return value;\n  }\n  var isArr = isArray(value);\n  if (isArr) {\n    result = initCloneArray(value);\n    if (!isDeep) {\n      return arrayCopy(value, result);\n    }\n  } else {\n    var tag = objToString.call(value),\n        isFunc = tag == funcTag;\n\n    if (tag == objectTag || tag == argsTag || (isFunc && !object)) {\n      if (isHostObject(value)) {\n        return object ? value : {};\n      }\n      result = initCloneObject(isFunc ? {} : value);\n      if (!isDeep) {\n        return baseAssign(result, value);\n      }\n    } else {\n      return cloneableTags[tag]\n        ? initCloneByTag(value, tag, isDeep)\n        : (object ? value : {});\n    }\n  }\n  // Check for circular references and return its corresponding clone.\n  stackA || (stackA = []);\n  stackB || (stackB = []);\n\n  var length = stackA.length;\n  while (length--) {\n    if (stackA[length] == value) {\n      return stackB[length];\n    }\n  }\n  // Add the source value to the stack of traversed objects and associate it with its clone.\n  stackA.push(value);\n  stackB.push(result);\n\n  // Recursively populate clone (susceptible to call stack limits).\n  (isArr ? arrayEach : baseForOwn)(value, function(subValue, key) {\n    result[key] = baseClone(subValue, isDeep, customizer, key, value, stackA, stackB);\n  });\n  return result;\n}\n\nmodule.exports = baseClone;\n","/**\n * Copies properties of `source` to `object`.\n *\n * @private\n * @param {Object} source The object to copy properties from.\n * @param {Array} props The property names to copy.\n * @param {Object} [object={}] The object to copy properties to.\n * @returns {Object} Returns `object`.\n */\nfunction baseCopy(source, props, object) {\n  object || (object = {});\n\n  var index = -1,\n      length = props.length;\n\n  while (++index < length) {\n    var key = props[index];\n    object[key] = source[key];\n  }\n  return object;\n}\n\nmodule.exports = baseCopy;\n","var isObject = require('../lang/isObject');\n\n/**\n * The base implementation of `_.create` without support for assigning\n * properties to the created object.\n *\n * @private\n * @param {Object} prototype The object to inherit from.\n * @returns {Object} Returns the new object.\n */\nvar baseCreate = (function() {\n  function object() {}\n  return function(prototype) {\n    if (isObject(prototype)) {\n      object.prototype = prototype;\n      var result = new object;\n      object.prototype = undefined;\n    }\n    return result || {};\n  };\n}());\n\nmodule.exports = baseCreate;\n","var baseForOwn = require('./baseForOwn'),\n    createBaseEach = require('./createBaseEach');\n\n/**\n * The base implementation of `_.forEach` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array|Object|string} Returns `collection`.\n */\nvar baseEach = createBaseEach(baseForOwn);\n\nmodule.exports = baseEach;\n","/**\n * The base implementation of `_.find`, `_.findLast`, `_.findKey`, and `_.findLastKey`,\n * without support for callback shorthands and `this` binding, which iterates\n * over `collection` using the provided `eachFunc`.\n *\n * @private\n * @param {Array|Object|string} collection The collection to search.\n * @param {Function} predicate The function invoked per iteration.\n * @param {Function} eachFunc The function to iterate over `collection`.\n * @param {boolean} [retKey] Specify returning the key of the found element\n *  instead of the element itself.\n * @returns {*} Returns the found element or its key, else `undefined`.\n */\nfunction baseFind(collection, predicate, eachFunc, retKey) {\n  var result;\n  eachFunc(collection, function(value, key, collection) {\n    if (predicate(value, key, collection)) {\n      result = retKey ? key : value;\n      return false;\n    }\n  });\n  return result;\n}\n\nmodule.exports = baseFind;\n","/**\n * The base implementation of `_.findIndex` and `_.findLastIndex` without\n * support for callback shorthands and `this` binding.\n *\n * @private\n * @param {Array} array The array to search.\n * @param {Function} predicate The function invoked per iteration.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {number} Returns the index of the matched value, else `-1`.\n */\nfunction baseFindIndex(array, predicate, fromRight) {\n  var length = array.length,\n      index = fromRight ? length : -1;\n\n  while ((fromRight ? index-- : ++index < length)) {\n    if (predicate(array[index], index, array)) {\n      return index;\n    }\n  }\n  return -1;\n}\n\nmodule.exports = baseFindIndex;\n","var createBaseFor = require('./createBaseFor');\n\n/**\n * The base implementation of `baseForIn` and `baseForOwn` which iterates\n * over `object` properties returned by `keysFunc` invoking `iteratee` for\n * each property. Iteratee functions may exit iteration early by explicitly\n * returning `false`.\n *\n * @private\n * @param {Object} object The object to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @param {Function} keysFunc The function to get the keys of `object`.\n * @returns {Object} Returns `object`.\n */\nvar baseFor = createBaseFor();\n\nmodule.exports = baseFor;\n","var baseFor = require('./baseFor'),\n    keysIn = require('../object/keysIn');\n\n/**\n * The base implementation of `_.forIn` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Object} object The object to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Object} Returns `object`.\n */\nfunction baseForIn(object, iteratee) {\n  return baseFor(object, iteratee, keysIn);\n}\n\nmodule.exports = baseForIn;\n","var baseFor = require('./baseFor'),\n    keys = require('../object/keys');\n\n/**\n * The base implementation of `_.forOwn` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Object} object The object to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Object} Returns `object`.\n */\nfunction baseForOwn(object, iteratee) {\n  return baseFor(object, iteratee, keys);\n}\n\nmodule.exports = baseForOwn;\n","var toObject = require('./toObject');\n\n/**\n * The base implementation of `get` without support for string paths\n * and default values.\n *\n * @private\n * @param {Object} object The object to query.\n * @param {Array} path The path of the property to get.\n * @param {string} [pathKey] The key representation of path.\n * @returns {*} Returns the resolved value.\n */\nfunction baseGet(object, path, pathKey) {\n  if (object == null) {\n    return;\n  }\n  object = toObject(object);\n  if (pathKey !== undefined && pathKey in object) {\n    path = [pathKey];\n  }\n  var index = 0,\n      length = path.length;\n\n  while (object != null && index < length) {\n    object = toObject(object)[path[index++]];\n  }\n  return (index && index == length) ? object : undefined;\n}\n\nmodule.exports = baseGet;\n","var indexOfNaN = require('./indexOfNaN');\n\n/**\n * The base implementation of `_.indexOf` without support for binary searches.\n *\n * @private\n * @param {Array} array The array to search.\n * @param {*} value The value to search for.\n * @param {number} fromIndex The index to search from.\n * @returns {number} Returns the index of the matched value, else `-1`.\n */\nfunction baseIndexOf(array, value, fromIndex) {\n  if (value !== value) {\n    return indexOfNaN(array, fromIndex);\n  }\n  var index = fromIndex - 1,\n      length = array.length;\n\n  while (++index < length) {\n    if (array[index] === value) {\n      return index;\n    }\n  }\n  return -1;\n}\n\nmodule.exports = baseIndexOf;\n","var baseIsEqualDeep = require('./baseIsEqualDeep'),\n    isObject = require('../lang/isObject'),\n    isObjectLike = require('./isObjectLike');\n\n/**\n * The base implementation of `_.isEqual` without support for `this` binding\n * `customizer` functions.\n *\n * @private\n * @param {*} value The value to compare.\n * @param {*} other The other value to compare.\n * @param {Function} [customizer] The function to customize comparing values.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA] Tracks traversed `value` objects.\n * @param {Array} [stackB] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the values are equivalent, else `false`.\n */\nfunction baseIsEqual(value, other, customizer, isLoose, stackA, stackB) {\n  if (value === other) {\n    return true;\n  }\n  if (value == null || other == null || (!isObject(value) && !isObjectLike(other))) {\n    return value !== value && other !== other;\n  }\n  return baseIsEqualDeep(value, other, baseIsEqual, customizer, isLoose, stackA, stackB);\n}\n\nmodule.exports = baseIsEqual;\n","var equalArrays = require('./equalArrays'),\n    equalByTag = require('./equalByTag'),\n    equalObjects = require('./equalObjects'),\n    isArray = require('../lang/isArray'),\n    isHostObject = require('./isHostObject'),\n    isTypedArray = require('../lang/isTypedArray');\n\n/** `Object#toString` result references. */\nvar argsTag = '[object Arguments]',\n    arrayTag = '[object Array]',\n    objectTag = '[object Object]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * A specialized version of `baseIsEqual` for arrays and objects which performs\n * deep comparisons and tracks traversed objects enabling objects with circular\n * references to be compared.\n *\n * @private\n * @param {Object} object The object to compare.\n * @param {Object} other The other object to compare.\n * @param {Function} equalFunc The function to determine equivalents of values.\n * @param {Function} [customizer] The function to customize comparing objects.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA=[]] Tracks traversed `value` objects.\n * @param {Array} [stackB=[]] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.\n */\nfunction baseIsEqualDeep(object, other, equalFunc, customizer, isLoose, stackA, stackB) {\n  var objIsArr = isArray(object),\n      othIsArr = isArray(other),\n      objTag = arrayTag,\n      othTag = arrayTag;\n\n  if (!objIsArr) {\n    objTag = objToString.call(object);\n    if (objTag == argsTag) {\n      objTag = objectTag;\n    } else if (objTag != objectTag) {\n      objIsArr = isTypedArray(object);\n    }\n  }\n  if (!othIsArr) {\n    othTag = objToString.call(other);\n    if (othTag == argsTag) {\n      othTag = objectTag;\n    } else if (othTag != objectTag) {\n      othIsArr = isTypedArray(other);\n    }\n  }\n  var objIsObj = objTag == objectTag && !isHostObject(object),\n      othIsObj = othTag == objectTag && !isHostObject(other),\n      isSameTag = objTag == othTag;\n\n  if (isSameTag && !(objIsArr || objIsObj)) {\n    return equalByTag(object, other, objTag);\n  }\n  if (!isLoose) {\n    var objIsWrapped = objIsObj && hasOwnProperty.call(object, '__wrapped__'),\n        othIsWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__');\n\n    if (objIsWrapped || othIsWrapped) {\n      return equalFunc(objIsWrapped ? object.value() : object, othIsWrapped ? other.value() : other, customizer, isLoose, stackA, stackB);\n    }\n  }\n  if (!isSameTag) {\n    return false;\n  }\n  // Assume cyclic values are equal.\n  // For more information on detecting circular references see https://es5.github.io/#JO.\n  stackA || (stackA = []);\n  stackB || (stackB = []);\n\n  var length = stackA.length;\n  while (length--) {\n    if (stackA[length] == object) {\n      return stackB[length] == other;\n    }\n  }\n  // Add `object` and `other` to the stack of traversed objects.\n  stackA.push(object);\n  stackB.push(other);\n\n  var result = (objIsArr ? equalArrays : equalObjects)(object, other, equalFunc, customizer, isLoose, stackA, stackB);\n\n  stackA.pop();\n  stackB.pop();\n\n  return result;\n}\n\nmodule.exports = baseIsEqualDeep;\n","var baseIsEqual = require('./baseIsEqual'),\n    toObject = require('./toObject');\n\n/**\n * The base implementation of `_.isMatch` without support for callback\n * shorthands and `this` binding.\n *\n * @private\n * @param {Object} object The object to inspect.\n * @param {Array} matchData The propery names, values, and compare flags to match.\n * @param {Function} [customizer] The function to customize comparing objects.\n * @returns {boolean} Returns `true` if `object` is a match, else `false`.\n */\nfunction baseIsMatch(object, matchData, customizer) {\n  var index = matchData.length,\n      length = index,\n      noCustomizer = !customizer;\n\n  if (object == null) {\n    return !length;\n  }\n  object = toObject(object);\n  while (index--) {\n    var data = matchData[index];\n    if ((noCustomizer && data[2])\n          ? data[1] !== object[data[0]]\n          : !(data[0] in object)\n        ) {\n      return false;\n    }\n  }\n  while (++index < length) {\n    data = matchData[index];\n    var key = data[0],\n        objValue = object[key],\n        srcValue = data[1];\n\n    if (noCustomizer && data[2]) {\n      if (objValue === undefined && !(key in object)) {\n        return false;\n      }\n    } else {\n      var result = customizer ? customizer(objValue, srcValue, key) : undefined;\n      if (!(result === undefined ? baseIsEqual(srcValue, objValue, customizer, true) : result)) {\n        return false;\n      }\n    }\n  }\n  return true;\n}\n\nmodule.exports = baseIsMatch;\n","/**\n * The function whose prototype all chaining wrappers inherit from.\n *\n * @private\n */\nfunction baseLodash() {\n  // No operation performed.\n}\n\nmodule.exports = baseLodash;\n","var baseEach = require('./baseEach'),\n    isArrayLike = require('./isArrayLike');\n\n/**\n * The base implementation of `_.map` without support for callback shorthands\n * and `this` binding.\n *\n * @private\n * @param {Array|Object|string} collection The collection to iterate over.\n * @param {Function} iteratee The function invoked per iteration.\n * @returns {Array} Returns the new mapped array.\n */\nfunction baseMap(collection, iteratee) {\n  var index = -1,\n      result = isArrayLike(collection) ? Array(collection.length) : [];\n\n  baseEach(collection, function(value, key, collection) {\n    result[++index] = iteratee(value, key, collection);\n  });\n  return result;\n}\n\nmodule.exports = baseMap;\n","var baseIsMatch = require('./baseIsMatch'),\n    getMatchData = require('./getMatchData'),\n    toObject = require('./toObject');\n\n/**\n * The base implementation of `_.matches` which does not clone `source`.\n *\n * @private\n * @param {Object} source The object of property values to match.\n * @returns {Function} Returns the new function.\n */\nfunction baseMatches(source) {\n  var matchData = getMatchData(source);\n  if (matchData.length == 1 && matchData[0][2]) {\n    var key = matchData[0][0],\n        value = matchData[0][1];\n\n    return function(object) {\n      if (object == null) {\n        return false;\n      }\n      object = toObject(object);\n      return object[key] === value && (value !== undefined || (key in object));\n    };\n  }\n  return function(object) {\n    return baseIsMatch(object, matchData);\n  };\n}\n\nmodule.exports = baseMatches;\n","var baseGet = require('./baseGet'),\n    baseIsEqual = require('./baseIsEqual'),\n    baseSlice = require('./baseSlice'),\n    isArray = require('../lang/isArray'),\n    isKey = require('./isKey'),\n    isStrictComparable = require('./isStrictComparable'),\n    last = require('../array/last'),\n    toObject = require('./toObject'),\n    toPath = require('./toPath');\n\n/**\n * The base implementation of `_.matchesProperty` which does not clone `srcValue`.\n *\n * @private\n * @param {string} path The path of the property to get.\n * @param {*} srcValue The value to compare.\n * @returns {Function} Returns the new function.\n */\nfunction baseMatchesProperty(path, srcValue) {\n  var isArr = isArray(path),\n      isCommon = isKey(path) && isStrictComparable(srcValue),\n      pathKey = (path + '');\n\n  path = toPath(path);\n  return function(object) {\n    if (object == null) {\n      return false;\n    }\n    var key = pathKey;\n    object = toObject(object);\n    if ((isArr || !isCommon) && !(key in object)) {\n      object = path.length == 1 ? object : baseGet(object, baseSlice(path, 0, -1));\n      if (object == null) {\n        return false;\n      }\n      key = last(path);\n      object = toObject(object);\n    }\n    return object[key] === srcValue\n      ? (srcValue !== undefined || (key in object))\n      : baseIsEqual(srcValue, object[key], undefined, true);\n  };\n}\n\nmodule.exports = baseMatchesProperty;\n","var toObject = require('./toObject');\n\n/**\n * The base implementation of `_.property` without support for deep paths.\n *\n * @private\n * @param {string} key The key of the property to get.\n * @returns {Function} Returns the new function.\n */\nfunction baseProperty(key) {\n  return function(object) {\n    return object == null ? undefined : toObject(object)[key];\n  };\n}\n\nmodule.exports = baseProperty;\n","var baseGet = require('./baseGet'),\n    toPath = require('./toPath');\n\n/**\n * A specialized version of `baseProperty` which supports deep paths.\n *\n * @private\n * @param {Array|string} path The path of the property to get.\n * @returns {Function} Returns the new function.\n */\nfunction basePropertyDeep(path) {\n  var pathKey = (path + '');\n  path = toPath(path);\n  return function(object) {\n    return baseGet(object, path, pathKey);\n  };\n}\n\nmodule.exports = basePropertyDeep;\n","var identity = require('../utility/identity'),\n    metaMap = require('./metaMap');\n\n/**\n * The base implementation of `setData` without support for hot loop detection.\n *\n * @private\n * @param {Function} func The function to associate metadata with.\n * @param {*} data The metadata.\n * @returns {Function} Returns `func`.\n */\nvar baseSetData = !metaMap ? identity : function(func, data) {\n  metaMap.set(func, data);\n  return func;\n};\n\nmodule.exports = baseSetData;\n","/**\n * The base implementation of `_.slice` without an iteratee call guard.\n *\n * @private\n * @param {Array} array The array to slice.\n * @param {number} [start=0] The start position.\n * @param {number} [end=array.length] The end position.\n * @returns {Array} Returns the slice of `array`.\n */\nfunction baseSlice(array, start, end) {\n  var index = -1,\n      length = array.length;\n\n  start = start == null ? 0 : (+start || 0);\n  if (start < 0) {\n    start = -start > length ? 0 : (length + start);\n  }\n  end = (end === undefined || end > length) ? length : (+end || 0);\n  if (end < 0) {\n    end += length;\n  }\n  length = start > end ? 0 : ((end - start) >>> 0);\n  start >>>= 0;\n\n  var result = Array(length);\n  while (++index < length) {\n    result[index] = array[index + start];\n  }\n  return result;\n}\n\nmodule.exports = baseSlice;\n","/**\n * Converts `value` to a string if it's not one. An empty string is returned\n * for `null` or `undefined` values.\n *\n * @private\n * @param {*} value The value to process.\n * @returns {string} Returns the string.\n */\nfunction baseToString(value) {\n  return value == null ? '' : (value + '');\n}\n\nmodule.exports = baseToString;\n","/**\n * The base implementation of `_.values` and `_.valuesIn` which creates an\n * array of `object` property values corresponding to the property names\n * of `props`.\n *\n * @private\n * @param {Object} object The object to query.\n * @param {Array} props The property names to get values for.\n * @returns {Object} Returns the array of property values.\n */\nfunction baseValues(object, props) {\n  var index = -1,\n      length = props.length,\n      result = Array(length);\n\n  while (++index < length) {\n    result[index] = object[props[index]];\n  }\n  return result;\n}\n\nmodule.exports = baseValues;\n","var binaryIndexBy = require('./binaryIndexBy'),\n    identity = require('../utility/identity');\n\n/** Used as references for the maximum length and index of an array. */\nvar MAX_ARRAY_LENGTH = 4294967295,\n    HALF_MAX_ARRAY_LENGTH = MAX_ARRAY_LENGTH >>> 1;\n\n/**\n * Performs a binary search of `array` to determine the index at which `value`\n * should be inserted into `array` in order to maintain its sort order.\n *\n * @private\n * @param {Array} array The sorted array to inspect.\n * @param {*} value The value to evaluate.\n * @param {boolean} [retHighest] Specify returning the highest qualified index.\n * @returns {number} Returns the index at which `value` should be inserted\n *  into `array`.\n */\nfunction binaryIndex(array, value, retHighest) {\n  var low = 0,\n      high = array ? array.length : low;\n\n  if (typeof value == 'number' && value === value && high <= HALF_MAX_ARRAY_LENGTH) {\n    while (low < high) {\n      var mid = (low + high) >>> 1,\n          computed = array[mid];\n\n      if ((retHighest ? (computed <= value) : (computed < value)) && computed !== null) {\n        low = mid + 1;\n      } else {\n        high = mid;\n      }\n    }\n    return high;\n  }\n  return binaryIndexBy(array, value, identity, retHighest);\n}\n\nmodule.exports = binaryIndex;\n","/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeFloor = Math.floor,\n    nativeMin = Math.min;\n\n/** Used as references for the maximum length and index of an array. */\nvar MAX_ARRAY_LENGTH = 4294967295,\n    MAX_ARRAY_INDEX = MAX_ARRAY_LENGTH - 1;\n\n/**\n * This function is like `binaryIndex` except that it invokes `iteratee` for\n * `value` and each element of `array` to compute their sort ranking. The\n * iteratee is invoked with one argument; (value).\n *\n * @private\n * @param {Array} array The sorted array to inspect.\n * @param {*} value The value to evaluate.\n * @param {Function} iteratee The function invoked per iteration.\n * @param {boolean} [retHighest] Specify returning the highest qualified index.\n * @returns {number} Returns the index at which `value` should be inserted\n *  into `array`.\n */\nfunction binaryIndexBy(array, value, iteratee, retHighest) {\n  value = iteratee(value);\n\n  var low = 0,\n      high = array ? array.length : 0,\n      valIsNaN = value !== value,\n      valIsNull = value === null,\n      valIsUndef = value === undefined;\n\n  while (low < high) {\n    var mid = nativeFloor((low + high) / 2),\n        computed = iteratee(array[mid]),\n        isDef = computed !== undefined,\n        isReflexive = computed === computed;\n\n    if (valIsNaN) {\n      var setLow = isReflexive || retHighest;\n    } else if (valIsNull) {\n      setLow = isReflexive && isDef && (retHighest || computed != null);\n    } else if (valIsUndef) {\n      setLow = isReflexive && (retHighest || isDef);\n    } else if (computed == null) {\n      setLow = false;\n    } else {\n      setLow = retHighest ? (computed <= value) : (computed < value);\n    }\n    if (setLow) {\n      low = mid + 1;\n    } else {\n      high = mid;\n    }\n  }\n  return nativeMin(high, MAX_ARRAY_INDEX);\n}\n\nmodule.exports = binaryIndexBy;\n","var identity = require('../utility/identity');\n\n/**\n * A specialized version of `baseCallback` which only supports `this` binding\n * and specifying the number of arguments to provide to `func`.\n *\n * @private\n * @param {Function} func The function to bind.\n * @param {*} thisArg The `this` binding of `func`.\n * @param {number} [argCount] The number of arguments to provide to `func`.\n * @returns {Function} Returns the callback.\n */\nfunction bindCallback(func, thisArg, argCount) {\n  if (typeof func != 'function') {\n    return identity;\n  }\n  if (thisArg === undefined) {\n    return func;\n  }\n  switch (argCount) {\n    case 1: return function(value) {\n      return func.call(thisArg, value);\n    };\n    case 3: return function(value, index, collection) {\n      return func.call(thisArg, value, index, collection);\n    };\n    case 4: return function(accumulator, value, index, collection) {\n      return func.call(thisArg, accumulator, value, index, collection);\n    };\n    case 5: return function(value, other, key, object, source) {\n      return func.call(thisArg, value, other, key, object, source);\n    };\n  }\n  return function() {\n    return func.apply(thisArg, arguments);\n  };\n}\n\nmodule.exports = bindCallback;\n","(function (global){\n/** Native method references. */\nvar ArrayBuffer = global.ArrayBuffer,\n    Uint8Array = global.Uint8Array;\n\n/**\n * Creates a clone of the given array buffer.\n *\n * @private\n * @param {ArrayBuffer} buffer The array buffer to clone.\n * @returns {ArrayBuffer} Returns the cloned array buffer.\n */\nfunction bufferClone(buffer) {\n  var result = new ArrayBuffer(buffer.byteLength),\n      view = new Uint8Array(result);\n\n  view.set(new Uint8Array(buffer));\n  return result;\n}\n\nmodule.exports = bufferClone;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2J1ZmZlckNsb25lLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIi8qKiBOYXRpdmUgbWV0aG9kIHJlZmVyZW5jZXMuICovXG52YXIgQXJyYXlCdWZmZXIgPSBnbG9iYWwuQXJyYXlCdWZmZXIsXG4gICAgVWludDhBcnJheSA9IGdsb2JhbC5VaW50OEFycmF5O1xuXG4vKipcbiAqIENyZWF0ZXMgYSBjbG9uZSBvZiB0aGUgZ2l2ZW4gYXJyYXkgYnVmZmVyLlxuICpcbiAqIEBwcml2YXRlXG4gKiBAcGFyYW0ge0FycmF5QnVmZmVyfSBidWZmZXIgVGhlIGFycmF5IGJ1ZmZlciB0byBjbG9uZS5cbiAqIEByZXR1cm5zIHtBcnJheUJ1ZmZlcn0gUmV0dXJucyB0aGUgY2xvbmVkIGFycmF5IGJ1ZmZlci5cbiAqL1xuZnVuY3Rpb24gYnVmZmVyQ2xvbmUoYnVmZmVyKSB7XG4gIHZhciByZXN1bHQgPSBuZXcgQXJyYXlCdWZmZXIoYnVmZmVyLmJ5dGVMZW5ndGgpLFxuICAgICAgdmlldyA9IG5ldyBVaW50OEFycmF5KHJlc3VsdCk7XG5cbiAgdmlldy5zZXQobmV3IFVpbnQ4QXJyYXkoYnVmZmVyKSk7XG4gIHJldHVybiByZXN1bHQ7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gYnVmZmVyQ2xvbmU7XG4iXX0=","/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates an array that is the composition of partially applied arguments,\n * placeholders, and provided arguments into a single array of arguments.\n *\n * @private\n * @param {Array|Object} args The provided arguments.\n * @param {Array} partials The arguments to prepend to those provided.\n * @param {Array} holders The `partials` placeholder indexes.\n * @returns {Array} Returns the new array of composed arguments.\n */\nfunction composeArgs(args, partials, holders) {\n  var holdersLength = holders.length,\n      argsIndex = -1,\n      argsLength = nativeMax(args.length - holdersLength, 0),\n      leftIndex = -1,\n      leftLength = partials.length,\n      result = Array(leftLength + argsLength);\n\n  while (++leftIndex < leftLength) {\n    result[leftIndex] = partials[leftIndex];\n  }\n  while (++argsIndex < holdersLength) {\n    result[holders[argsIndex]] = args[argsIndex];\n  }\n  while (argsLength--) {\n    result[leftIndex++] = args[argsIndex++];\n  }\n  return result;\n}\n\nmodule.exports = composeArgs;\n","/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * This function is like `composeArgs` except that the arguments composition\n * is tailored for `_.partialRight`.\n *\n * @private\n * @param {Array|Object} args The provided arguments.\n * @param {Array} partials The arguments to append to those provided.\n * @param {Array} holders The `partials` placeholder indexes.\n * @returns {Array} Returns the new array of composed arguments.\n */\nfunction composeArgsRight(args, partials, holders) {\n  var holdersIndex = -1,\n      holdersLength = holders.length,\n      argsIndex = -1,\n      argsLength = nativeMax(args.length - holdersLength, 0),\n      rightIndex = -1,\n      rightLength = partials.length,\n      result = Array(argsLength + rightLength);\n\n  while (++argsIndex < argsLength) {\n    result[argsIndex] = args[argsIndex];\n  }\n  var offset = argsIndex;\n  while (++rightIndex < rightLength) {\n    result[offset + rightIndex] = partials[rightIndex];\n  }\n  while (++holdersIndex < holdersLength) {\n    result[offset + holders[holdersIndex]] = args[argsIndex++];\n  }\n  return result;\n}\n\nmodule.exports = composeArgsRight;\n","var getLength = require('./getLength'),\n    isLength = require('./isLength'),\n    toObject = require('./toObject');\n\n/**\n * Creates a `baseEach` or `baseEachRight` function.\n *\n * @private\n * @param {Function} eachFunc The function to iterate over a collection.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {Function} Returns the new base function.\n */\nfunction createBaseEach(eachFunc, fromRight) {\n  return function(collection, iteratee) {\n    var length = collection ? getLength(collection) : 0;\n    if (!isLength(length)) {\n      return eachFunc(collection, iteratee);\n    }\n    var index = fromRight ? length : -1,\n        iterable = toObject(collection);\n\n    while ((fromRight ? index-- : ++index < length)) {\n      if (iteratee(iterable[index], index, iterable) === false) {\n        break;\n      }\n    }\n    return collection;\n  };\n}\n\nmodule.exports = createBaseEach;\n","var toObject = require('./toObject');\n\n/**\n * Creates a base function for `_.forIn` or `_.forInRight`.\n *\n * @private\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {Function} Returns the new base function.\n */\nfunction createBaseFor(fromRight) {\n  return function(object, iteratee, keysFunc) {\n    var iterable = toObject(object),\n        props = keysFunc(object),\n        length = props.length,\n        index = fromRight ? length : -1;\n\n    while ((fromRight ? index-- : ++index < length)) {\n      var key = props[index];\n      if (iteratee(iterable[key], key, iterable) === false) {\n        break;\n      }\n    }\n    return object;\n  };\n}\n\nmodule.exports = createBaseFor;\n","(function (global){\nvar createCtorWrapper = require('./createCtorWrapper');\n\n/**\n * Creates a function that wraps `func` and invokes it with the `this`\n * binding of `thisArg`.\n *\n * @private\n * @param {Function} func The function to bind.\n * @param {*} [thisArg] The `this` binding of `func`.\n * @returns {Function} Returns the new bound function.\n */\nfunction createBindWrapper(func, thisArg) {\n  var Ctor = createCtorWrapper(func);\n\n  function wrapper() {\n    var fn = (this && this !== global && this instanceof wrapper) ? Ctor : func;\n    return fn.apply(thisArg, arguments);\n  }\n  return wrapper;\n}\n\nmodule.exports = createBindWrapper;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZUJpbmRXcmFwcGVyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyk7XG5cbi8qKlxuICogQ3JlYXRlcyBhIGZ1bmN0aW9uIHRoYXQgd3JhcHMgYGZ1bmNgIGFuZCBpbnZva2VzIGl0IHdpdGggdGhlIGB0aGlzYFxuICogYmluZGluZyBvZiBgdGhpc0FyZ2AuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7RnVuY3Rpb259IGZ1bmMgVGhlIGZ1bmN0aW9uIHRvIGJpbmQuXG4gKiBAcGFyYW0geyp9IFt0aGlzQXJnXSBUaGUgYHRoaXNgIGJpbmRpbmcgb2YgYGZ1bmNgLlxuICogQHJldHVybnMge0Z1bmN0aW9ufSBSZXR1cm5zIHRoZSBuZXcgYm91bmQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZUJpbmRXcmFwcGVyKGZ1bmMsIHRoaXNBcmcpIHtcbiAgdmFyIEN0b3IgPSBjcmVhdGVDdG9yV3JhcHBlcihmdW5jKTtcblxuICBmdW5jdGlvbiB3cmFwcGVyKCkge1xuICAgIHZhciBmbiA9ICh0aGlzICYmIHRoaXMgIT09IGdsb2JhbCAmJiB0aGlzIGluc3RhbmNlb2Ygd3JhcHBlcikgPyBDdG9yIDogZnVuYztcbiAgICByZXR1cm4gZm4uYXBwbHkodGhpc0FyZywgYXJndW1lbnRzKTtcbiAgfVxuICByZXR1cm4gd3JhcHBlcjtcbn1cblxubW9kdWxlLmV4cG9ydHMgPSBjcmVhdGVCaW5kV3JhcHBlcjtcbiJdfQ==","var baseCreate = require('./baseCreate'),\n    isObject = require('../lang/isObject');\n\n/**\n * Creates a function that produces an instance of `Ctor` regardless of\n * whether it was invoked as part of a `new` expression or by `call` or `apply`.\n *\n * @private\n * @param {Function} Ctor The constructor to wrap.\n * @returns {Function} Returns the new wrapped function.\n */\nfunction createCtorWrapper(Ctor) {\n  return function() {\n    // Use a `switch` statement to work with class constructors.\n    // See http://ecma-international.org/ecma-262/6.0/#sec-ecmascript-function-objects-call-thisargument-argumentslist\n    // for more details.\n    var args = arguments;\n    switch (args.length) {\n      case 0: return new Ctor;\n      case 1: return new Ctor(args[0]);\n      case 2: return new Ctor(args[0], args[1]);\n      case 3: return new Ctor(args[0], args[1], args[2]);\n      case 4: return new Ctor(args[0], args[1], args[2], args[3]);\n      case 5: return new Ctor(args[0], args[1], args[2], args[3], args[4]);\n      case 6: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5]);\n      case 7: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);\n    }\n    var thisBinding = baseCreate(Ctor.prototype),\n        result = Ctor.apply(thisBinding, args);\n\n    // Mimic the constructor's `return` behavior.\n    // See https://es5.github.io/#x13.2.2 for more details.\n    return isObject(result) ? result : thisBinding;\n  };\n}\n\nmodule.exports = createCtorWrapper;\n","var baseCallback = require('./baseCallback'),\n    baseFind = require('./baseFind'),\n    baseFindIndex = require('./baseFindIndex'),\n    isArray = require('../lang/isArray');\n\n/**\n * Creates a `_.find` or `_.findLast` function.\n *\n * @private\n * @param {Function} eachFunc The function to iterate over a collection.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {Function} Returns the new find function.\n */\nfunction createFind(eachFunc, fromRight) {\n  return function(collection, predicate, thisArg) {\n    predicate = baseCallback(predicate, thisArg, 3);\n    if (isArray(collection)) {\n      var index = baseFindIndex(collection, predicate, fromRight);\n      return index > -1 ? collection[index] : undefined;\n    }\n    return baseFind(collection, predicate, eachFunc);\n  };\n}\n\nmodule.exports = createFind;\n","var bindCallback = require('./bindCallback'),\n    isArray = require('../lang/isArray');\n\n/**\n * Creates a function for `_.forEach` or `_.forEachRight`.\n *\n * @private\n * @param {Function} arrayFunc The function to iterate over an array.\n * @param {Function} eachFunc The function to iterate over a collection.\n * @returns {Function} Returns the new each function.\n */\nfunction createForEach(arrayFunc, eachFunc) {\n  return function(collection, iteratee, thisArg) {\n    return (typeof iteratee == 'function' && thisArg === undefined && isArray(collection))\n      ? arrayFunc(collection, iteratee)\n      : eachFunc(collection, bindCallback(iteratee, thisArg, 3));\n  };\n}\n\nmodule.exports = createForEach;\n","(function (global){\nvar arrayCopy = require('./arrayCopy'),\n    composeArgs = require('./composeArgs'),\n    composeArgsRight = require('./composeArgsRight'),\n    createCtorWrapper = require('./createCtorWrapper'),\n    isLaziable = require('./isLaziable'),\n    reorder = require('./reorder'),\n    replaceHolders = require('./replaceHolders'),\n    setData = require('./setData');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    BIND_KEY_FLAG = 2,\n    CURRY_BOUND_FLAG = 4,\n    CURRY_FLAG = 8,\n    CURRY_RIGHT_FLAG = 16,\n    PARTIAL_FLAG = 32,\n    PARTIAL_RIGHT_FLAG = 64,\n    ARY_FLAG = 128;\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates a function that wraps `func` and invokes it with optional `this`\n * binding of, partial application, and currying.\n *\n * @private\n * @param {Function|string} func The function or method name to reference.\n * @param {number} bitmask The bitmask of flags. See `createWrapper` for more details.\n * @param {*} [thisArg] The `this` binding of `func`.\n * @param {Array} [partials] The arguments to prepend to those provided to the new function.\n * @param {Array} [holders] The `partials` placeholder indexes.\n * @param {Array} [partialsRight] The arguments to append to those provided to the new function.\n * @param {Array} [holdersRight] The `partialsRight` placeholder indexes.\n * @param {Array} [argPos] The argument positions of the new function.\n * @param {number} [ary] The arity cap of `func`.\n * @param {number} [arity] The arity of `func`.\n * @returns {Function} Returns the new wrapped function.\n */\nfunction createHybridWrapper(func, bitmask, thisArg, partials, holders, partialsRight, holdersRight, argPos, ary, arity) {\n  var isAry = bitmask & ARY_FLAG,\n      isBind = bitmask & BIND_FLAG,\n      isBindKey = bitmask & BIND_KEY_FLAG,\n      isCurry = bitmask & CURRY_FLAG,\n      isCurryBound = bitmask & CURRY_BOUND_FLAG,\n      isCurryRight = bitmask & CURRY_RIGHT_FLAG,\n      Ctor = isBindKey ? undefined : createCtorWrapper(func);\n\n  function wrapper() {\n    // Avoid `arguments` object use disqualifying optimizations by\n    // converting it to an array before providing it to other functions.\n    var length = arguments.length,\n        index = length,\n        args = Array(length);\n\n    while (index--) {\n      args[index] = arguments[index];\n    }\n    if (partials) {\n      args = composeArgs(args, partials, holders);\n    }\n    if (partialsRight) {\n      args = composeArgsRight(args, partialsRight, holdersRight);\n    }\n    if (isCurry || isCurryRight) {\n      var placeholder = wrapper.placeholder,\n          argsHolders = replaceHolders(args, placeholder);\n\n      length -= argsHolders.length;\n      if (length < arity) {\n        var newArgPos = argPos ? arrayCopy(argPos) : undefined,\n            newArity = nativeMax(arity - length, 0),\n            newsHolders = isCurry ? argsHolders : undefined,\n            newHoldersRight = isCurry ? undefined : argsHolders,\n            newPartials = isCurry ? args : undefined,\n            newPartialsRight = isCurry ? undefined : args;\n\n        bitmask |= (isCurry ? PARTIAL_FLAG : PARTIAL_RIGHT_FLAG);\n        bitmask &= ~(isCurry ? PARTIAL_RIGHT_FLAG : PARTIAL_FLAG);\n\n        if (!isCurryBound) {\n          bitmask &= ~(BIND_FLAG | BIND_KEY_FLAG);\n        }\n        var newData = [func, bitmask, thisArg, newPartials, newsHolders, newPartialsRight, newHoldersRight, newArgPos, ary, newArity],\n            result = createHybridWrapper.apply(undefined, newData);\n\n        if (isLaziable(func)) {\n          setData(result, newData);\n        }\n        result.placeholder = placeholder;\n        return result;\n      }\n    }\n    var thisBinding = isBind ? thisArg : this,\n        fn = isBindKey ? thisBinding[func] : func;\n\n    if (argPos) {\n      args = reorder(args, argPos);\n    }\n    if (isAry && ary < args.length) {\n      args.length = ary;\n    }\n    if (this && this !== global && this instanceof wrapper) {\n      fn = Ctor || createCtorWrapper(func);\n    }\n    return fn.apply(thisBinding, args);\n  }\n  return wrapper;\n}\n\nmodule.exports = createHybridWrapper;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZUh5YnJpZFdyYXBwZXIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYXJyYXlDb3B5ID0gcmVxdWlyZSgnLi9hcnJheUNvcHknKSxcbiAgICBjb21wb3NlQXJncyA9IHJlcXVpcmUoJy4vY29tcG9zZUFyZ3MnKSxcbiAgICBjb21wb3NlQXJnc1JpZ2h0ID0gcmVxdWlyZSgnLi9jb21wb3NlQXJnc1JpZ2h0JyksXG4gICAgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyksXG4gICAgaXNMYXppYWJsZSA9IHJlcXVpcmUoJy4vaXNMYXppYWJsZScpLFxuICAgIHJlb3JkZXIgPSByZXF1aXJlKCcuL3Jlb3JkZXInKSxcbiAgICByZXBsYWNlSG9sZGVycyA9IHJlcXVpcmUoJy4vcmVwbGFjZUhvbGRlcnMnKSxcbiAgICBzZXREYXRhID0gcmVxdWlyZSgnLi9zZXREYXRhJyk7XG5cbi8qKiBVc2VkIHRvIGNvbXBvc2UgYml0bWFza3MgZm9yIHdyYXBwZXIgbWV0YWRhdGEuICovXG52YXIgQklORF9GTEFHID0gMSxcbiAgICBCSU5EX0tFWV9GTEFHID0gMixcbiAgICBDVVJSWV9CT1VORF9GTEFHID0gNCxcbiAgICBDVVJSWV9GTEFHID0gOCxcbiAgICBDVVJSWV9SSUdIVF9GTEFHID0gMTYsXG4gICAgUEFSVElBTF9GTEFHID0gMzIsXG4gICAgUEFSVElBTF9SSUdIVF9GTEFHID0gNjQsXG4gICAgQVJZX0ZMQUcgPSAxMjg7XG5cbi8qIE5hdGl2ZSBtZXRob2QgcmVmZXJlbmNlcyBmb3IgdGhvc2Ugd2l0aCB0aGUgc2FtZSBuYW1lIGFzIG90aGVyIGBsb2Rhc2hgIG1ldGhvZHMuICovXG52YXIgbmF0aXZlTWF4ID0gTWF0aC5tYXg7XG5cbi8qKlxuICogQ3JlYXRlcyBhIGZ1bmN0aW9uIHRoYXQgd3JhcHMgYGZ1bmNgIGFuZCBpbnZva2VzIGl0IHdpdGggb3B0aW9uYWwgYHRoaXNgXG4gKiBiaW5kaW5nIG9mLCBwYXJ0aWFsIGFwcGxpY2F0aW9uLCBhbmQgY3VycnlpbmcuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7RnVuY3Rpb258c3RyaW5nfSBmdW5jIFRoZSBmdW5jdGlvbiBvciBtZXRob2QgbmFtZSB0byByZWZlcmVuY2UuXG4gKiBAcGFyYW0ge251bWJlcn0gYml0bWFzayBUaGUgYml0bWFzayBvZiBmbGFncy4gU2VlIGBjcmVhdGVXcmFwcGVyYCBmb3IgbW9yZSBkZXRhaWxzLlxuICogQHBhcmFtIHsqfSBbdGhpc0FyZ10gVGhlIGB0aGlzYCBiaW5kaW5nIG9mIGBmdW5jYC5cbiAqIEBwYXJhbSB7QXJyYXl9IFtwYXJ0aWFsc10gVGhlIGFyZ3VtZW50cyB0byBwcmVwZW5kIHRvIHRob3NlIHByb3ZpZGVkIHRvIHRoZSBuZXcgZnVuY3Rpb24uXG4gKiBAcGFyYW0ge0FycmF5fSBbaG9sZGVyc10gVGhlIGBwYXJ0aWFsc2AgcGxhY2Vob2xkZXIgaW5kZXhlcy5cbiAqIEBwYXJhbSB7QXJyYXl9IFtwYXJ0aWFsc1JpZ2h0XSBUaGUgYXJndW1lbnRzIHRvIGFwcGVuZCB0byB0aG9zZSBwcm92aWRlZCB0byB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHBhcmFtIHtBcnJheX0gW2hvbGRlcnNSaWdodF0gVGhlIGBwYXJ0aWFsc1JpZ2h0YCBwbGFjZWhvbGRlciBpbmRleGVzLlxuICogQHBhcmFtIHtBcnJheX0gW2FyZ1Bvc10gVGhlIGFyZ3VtZW50IHBvc2l0aW9ucyBvZiB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHBhcmFtIHtudW1iZXJ9IFthcnldIFRoZSBhcml0eSBjYXAgb2YgYGZ1bmNgLlxuICogQHBhcmFtIHtudW1iZXJ9IFthcml0eV0gVGhlIGFyaXR5IG9mIGBmdW5jYC5cbiAqIEByZXR1cm5zIHtGdW5jdGlvbn0gUmV0dXJucyB0aGUgbmV3IHdyYXBwZWQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZUh5YnJpZFdyYXBwZXIoZnVuYywgYml0bWFzaywgdGhpc0FyZywgcGFydGlhbHMsIGhvbGRlcnMsIHBhcnRpYWxzUmlnaHQsIGhvbGRlcnNSaWdodCwgYXJnUG9zLCBhcnksIGFyaXR5KSB7XG4gIHZhciBpc0FyeSA9IGJpdG1hc2sgJiBBUllfRkxBRyxcbiAgICAgIGlzQmluZCA9IGJpdG1hc2sgJiBCSU5EX0ZMQUcsXG4gICAgICBpc0JpbmRLZXkgPSBiaXRtYXNrICYgQklORF9LRVlfRkxBRyxcbiAgICAgIGlzQ3VycnkgPSBiaXRtYXNrICYgQ1VSUllfRkxBRyxcbiAgICAgIGlzQ3VycnlCb3VuZCA9IGJpdG1hc2sgJiBDVVJSWV9CT1VORF9GTEFHLFxuICAgICAgaXNDdXJyeVJpZ2h0ID0gYml0bWFzayAmIENVUlJZX1JJR0hUX0ZMQUcsXG4gICAgICBDdG9yID0gaXNCaW5kS2V5ID8gdW5kZWZpbmVkIDogY3JlYXRlQ3RvcldyYXBwZXIoZnVuYyk7XG5cbiAgZnVuY3Rpb24gd3JhcHBlcigpIHtcbiAgICAvLyBBdm9pZCBgYXJndW1lbnRzYCBvYmplY3QgdXNlIGRpc3F1YWxpZnlpbmcgb3B0aW1pemF0aW9ucyBieVxuICAgIC8vIGNvbnZlcnRpbmcgaXQgdG8gYW4gYXJyYXkgYmVmb3JlIHByb3ZpZGluZyBpdCB0byBvdGhlciBmdW5jdGlvbnMuXG4gICAgdmFyIGxlbmd0aCA9IGFyZ3VtZW50cy5sZW5ndGgsXG4gICAgICAgIGluZGV4ID0gbGVuZ3RoLFxuICAgICAgICBhcmdzID0gQXJyYXkobGVuZ3RoKTtcblxuICAgIHdoaWxlIChpbmRleC0tKSB7XG4gICAgICBhcmdzW2luZGV4XSA9IGFyZ3VtZW50c1tpbmRleF07XG4gICAgfVxuICAgIGlmIChwYXJ0aWFscykge1xuICAgICAgYXJncyA9IGNvbXBvc2VBcmdzKGFyZ3MsIHBhcnRpYWxzLCBob2xkZXJzKTtcbiAgICB9XG4gICAgaWYgKHBhcnRpYWxzUmlnaHQpIHtcbiAgICAgIGFyZ3MgPSBjb21wb3NlQXJnc1JpZ2h0KGFyZ3MsIHBhcnRpYWxzUmlnaHQsIGhvbGRlcnNSaWdodCk7XG4gICAgfVxuICAgIGlmIChpc0N1cnJ5IHx8IGlzQ3VycnlSaWdodCkge1xuICAgICAgdmFyIHBsYWNlaG9sZGVyID0gd3JhcHBlci5wbGFjZWhvbGRlcixcbiAgICAgICAgICBhcmdzSG9sZGVycyA9IHJlcGxhY2VIb2xkZXJzKGFyZ3MsIHBsYWNlaG9sZGVyKTtcblxuICAgICAgbGVuZ3RoIC09IGFyZ3NIb2xkZXJzLmxlbmd0aDtcbiAgICAgIGlmIChsZW5ndGggPCBhcml0eSkge1xuICAgICAgICB2YXIgbmV3QXJnUG9zID0gYXJnUG9zID8gYXJyYXlDb3B5KGFyZ1BvcykgOiB1bmRlZmluZWQsXG4gICAgICAgICAgICBuZXdBcml0eSA9IG5hdGl2ZU1heChhcml0eSAtIGxlbmd0aCwgMCksXG4gICAgICAgICAgICBuZXdzSG9sZGVycyA9IGlzQ3VycnkgPyBhcmdzSG9sZGVycyA6IHVuZGVmaW5lZCxcbiAgICAgICAgICAgIG5ld0hvbGRlcnNSaWdodCA9IGlzQ3VycnkgPyB1bmRlZmluZWQgOiBhcmdzSG9sZGVycyxcbiAgICAgICAgICAgIG5ld1BhcnRpYWxzID0gaXNDdXJyeSA/IGFyZ3MgOiB1bmRlZmluZWQsXG4gICAgICAgICAgICBuZXdQYXJ0aWFsc1JpZ2h0ID0gaXNDdXJyeSA/IHVuZGVmaW5lZCA6IGFyZ3M7XG5cbiAgICAgICAgYml0bWFzayB8PSAoaXNDdXJyeSA/IFBBUlRJQUxfRkxBRyA6IFBBUlRJQUxfUklHSFRfRkxBRyk7XG4gICAgICAgIGJpdG1hc2sgJj0gfihpc0N1cnJ5ID8gUEFSVElBTF9SSUdIVF9GTEFHIDogUEFSVElBTF9GTEFHKTtcblxuICAgICAgICBpZiAoIWlzQ3VycnlCb3VuZCkge1xuICAgICAgICAgIGJpdG1hc2sgJj0gfihCSU5EX0ZMQUcgfCBCSU5EX0tFWV9GTEFHKTtcbiAgICAgICAgfVxuICAgICAgICB2YXIgbmV3RGF0YSA9IFtmdW5jLCBiaXRtYXNrLCB0aGlzQXJnLCBuZXdQYXJ0aWFscywgbmV3c0hvbGRlcnMsIG5ld1BhcnRpYWxzUmlnaHQsIG5ld0hvbGRlcnNSaWdodCwgbmV3QXJnUG9zLCBhcnksIG5ld0FyaXR5XSxcbiAgICAgICAgICAgIHJlc3VsdCA9IGNyZWF0ZUh5YnJpZFdyYXBwZXIuYXBwbHkodW5kZWZpbmVkLCBuZXdEYXRhKTtcblxuICAgICAgICBpZiAoaXNMYXppYWJsZShmdW5jKSkge1xuICAgICAgICAgIHNldERhdGEocmVzdWx0LCBuZXdEYXRhKTtcbiAgICAgICAgfVxuICAgICAgICByZXN1bHQucGxhY2Vob2xkZXIgPSBwbGFjZWhvbGRlcjtcbiAgICAgICAgcmV0dXJuIHJlc3VsdDtcbiAgICAgIH1cbiAgICB9XG4gICAgdmFyIHRoaXNCaW5kaW5nID0gaXNCaW5kID8gdGhpc0FyZyA6IHRoaXMsXG4gICAgICAgIGZuID0gaXNCaW5kS2V5ID8gdGhpc0JpbmRpbmdbZnVuY10gOiBmdW5jO1xuXG4gICAgaWYgKGFyZ1Bvcykge1xuICAgICAgYXJncyA9IHJlb3JkZXIoYXJncywgYXJnUG9zKTtcbiAgICB9XG4gICAgaWYgKGlzQXJ5ICYmIGFyeSA8IGFyZ3MubGVuZ3RoKSB7XG4gICAgICBhcmdzLmxlbmd0aCA9IGFyeTtcbiAgICB9XG4gICAgaWYgKHRoaXMgJiYgdGhpcyAhPT0gZ2xvYmFsICYmIHRoaXMgaW5zdGFuY2VvZiB3cmFwcGVyKSB7XG4gICAgICBmbiA9IEN0b3IgfHwgY3JlYXRlQ3RvcldyYXBwZXIoZnVuYyk7XG4gICAgfVxuICAgIHJldHVybiBmbi5hcHBseSh0aGlzQmluZGluZywgYXJncyk7XG4gIH1cbiAgcmV0dXJuIHdyYXBwZXI7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gY3JlYXRlSHlicmlkV3JhcHBlcjtcbiJdfQ==","(function (global){\nvar createCtorWrapper = require('./createCtorWrapper');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1;\n\n/**\n * Creates a function that wraps `func` and invokes it with the optional `this`\n * binding of `thisArg` and the `partials` prepended to those provided to\n * the wrapper.\n *\n * @private\n * @param {Function} func The function to partially apply arguments to.\n * @param {number} bitmask The bitmask of flags. See `createWrapper` for more details.\n * @param {*} thisArg The `this` binding of `func`.\n * @param {Array} partials The arguments to prepend to those provided to the new function.\n * @returns {Function} Returns the new bound function.\n */\nfunction createPartialWrapper(func, bitmask, thisArg, partials) {\n  var isBind = bitmask & BIND_FLAG,\n      Ctor = createCtorWrapper(func);\n\n  function wrapper() {\n    // Avoid `arguments` object use disqualifying optimizations by\n    // converting it to an array before providing it `func`.\n    var argsIndex = -1,\n        argsLength = arguments.length,\n        leftIndex = -1,\n        leftLength = partials.length,\n        args = Array(leftLength + argsLength);\n\n    while (++leftIndex < leftLength) {\n      args[leftIndex] = partials[leftIndex];\n    }\n    while (argsLength--) {\n      args[leftIndex++] = arguments[++argsIndex];\n    }\n    var fn = (this && this !== global && this instanceof wrapper) ? Ctor : func;\n    return fn.apply(isBind ? thisArg : this, args);\n  }\n  return wrapper;\n}\n\nmodule.exports = createPartialWrapper;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2NyZWF0ZVBhcnRpYWxXcmFwcGVyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgY3JlYXRlQ3RvcldyYXBwZXIgPSByZXF1aXJlKCcuL2NyZWF0ZUN0b3JXcmFwcGVyJyk7XG5cbi8qKiBVc2VkIHRvIGNvbXBvc2UgYml0bWFza3MgZm9yIHdyYXBwZXIgbWV0YWRhdGEuICovXG52YXIgQklORF9GTEFHID0gMTtcblxuLyoqXG4gKiBDcmVhdGVzIGEgZnVuY3Rpb24gdGhhdCB3cmFwcyBgZnVuY2AgYW5kIGludm9rZXMgaXQgd2l0aCB0aGUgb3B0aW9uYWwgYHRoaXNgXG4gKiBiaW5kaW5nIG9mIGB0aGlzQXJnYCBhbmQgdGhlIGBwYXJ0aWFsc2AgcHJlcGVuZGVkIHRvIHRob3NlIHByb3ZpZGVkIHRvXG4gKiB0aGUgd3JhcHBlci5cbiAqXG4gKiBAcHJpdmF0ZVxuICogQHBhcmFtIHtGdW5jdGlvbn0gZnVuYyBUaGUgZnVuY3Rpb24gdG8gcGFydGlhbGx5IGFwcGx5IGFyZ3VtZW50cyB0by5cbiAqIEBwYXJhbSB7bnVtYmVyfSBiaXRtYXNrIFRoZSBiaXRtYXNrIG9mIGZsYWdzLiBTZWUgYGNyZWF0ZVdyYXBwZXJgIGZvciBtb3JlIGRldGFpbHMuXG4gKiBAcGFyYW0geyp9IHRoaXNBcmcgVGhlIGB0aGlzYCBiaW5kaW5nIG9mIGBmdW5jYC5cbiAqIEBwYXJhbSB7QXJyYXl9IHBhcnRpYWxzIFRoZSBhcmd1bWVudHMgdG8gcHJlcGVuZCB0byB0aG9zZSBwcm92aWRlZCB0byB0aGUgbmV3IGZ1bmN0aW9uLlxuICogQHJldHVybnMge0Z1bmN0aW9ufSBSZXR1cm5zIHRoZSBuZXcgYm91bmQgZnVuY3Rpb24uXG4gKi9cbmZ1bmN0aW9uIGNyZWF0ZVBhcnRpYWxXcmFwcGVyKGZ1bmMsIGJpdG1hc2ssIHRoaXNBcmcsIHBhcnRpYWxzKSB7XG4gIHZhciBpc0JpbmQgPSBiaXRtYXNrICYgQklORF9GTEFHLFxuICAgICAgQ3RvciA9IGNyZWF0ZUN0b3JXcmFwcGVyKGZ1bmMpO1xuXG4gIGZ1bmN0aW9uIHdyYXBwZXIoKSB7XG4gICAgLy8gQXZvaWQgYGFyZ3VtZW50c2Agb2JqZWN0IHVzZSBkaXNxdWFsaWZ5aW5nIG9wdGltaXphdGlvbnMgYnlcbiAgICAvLyBjb252ZXJ0aW5nIGl0IHRvIGFuIGFycmF5IGJlZm9yZSBwcm92aWRpbmcgaXQgYGZ1bmNgLlxuICAgIHZhciBhcmdzSW5kZXggPSAtMSxcbiAgICAgICAgYXJnc0xlbmd0aCA9IGFyZ3VtZW50cy5sZW5ndGgsXG4gICAgICAgIGxlZnRJbmRleCA9IC0xLFxuICAgICAgICBsZWZ0TGVuZ3RoID0gcGFydGlhbHMubGVuZ3RoLFxuICAgICAgICBhcmdzID0gQXJyYXkobGVmdExlbmd0aCArIGFyZ3NMZW5ndGgpO1xuXG4gICAgd2hpbGUgKCsrbGVmdEluZGV4IDwgbGVmdExlbmd0aCkge1xuICAgICAgYXJnc1tsZWZ0SW5kZXhdID0gcGFydGlhbHNbbGVmdEluZGV4XTtcbiAgICB9XG4gICAgd2hpbGUgKGFyZ3NMZW5ndGgtLSkge1xuICAgICAgYXJnc1tsZWZ0SW5kZXgrK10gPSBhcmd1bWVudHNbKythcmdzSW5kZXhdO1xuICAgIH1cbiAgICB2YXIgZm4gPSAodGhpcyAmJiB0aGlzICE9PSBnbG9iYWwgJiYgdGhpcyBpbnN0YW5jZW9mIHdyYXBwZXIpID8gQ3RvciA6IGZ1bmM7XG4gICAgcmV0dXJuIGZuLmFwcGx5KGlzQmluZCA/IHRoaXNBcmcgOiB0aGlzLCBhcmdzKTtcbiAgfVxuICByZXR1cm4gd3JhcHBlcjtcbn1cblxubW9kdWxlLmV4cG9ydHMgPSBjcmVhdGVQYXJ0aWFsV3JhcHBlcjtcbiJdfQ==","var baseSetData = require('./baseSetData'),\n    createBindWrapper = require('./createBindWrapper'),\n    createHybridWrapper = require('./createHybridWrapper'),\n    createPartialWrapper = require('./createPartialWrapper'),\n    getData = require('./getData'),\n    mergeData = require('./mergeData'),\n    setData = require('./setData');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    BIND_KEY_FLAG = 2,\n    PARTIAL_FLAG = 32,\n    PARTIAL_RIGHT_FLAG = 64;\n\n/** Used as the `TypeError` message for \"Functions\" methods. */\nvar FUNC_ERROR_TEXT = 'Expected a function';\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max;\n\n/**\n * Creates a function that either curries or invokes `func` with optional\n * `this` binding and partially applied arguments.\n *\n * @private\n * @param {Function|string} func The function or method name to reference.\n * @param {number} bitmask The bitmask of flags.\n *  The bitmask may be composed of the following flags:\n *     1 - `_.bind`\n *     2 - `_.bindKey`\n *     4 - `_.curry` or `_.curryRight` of a bound function\n *     8 - `_.curry`\n *    16 - `_.curryRight`\n *    32 - `_.partial`\n *    64 - `_.partialRight`\n *   128 - `_.rearg`\n *   256 - `_.ary`\n * @param {*} [thisArg] The `this` binding of `func`.\n * @param {Array} [partials] The arguments to be partially applied.\n * @param {Array} [holders] The `partials` placeholder indexes.\n * @param {Array} [argPos] The argument positions of the new function.\n * @param {number} [ary] The arity cap of `func`.\n * @param {number} [arity] The arity of `func`.\n * @returns {Function} Returns the new wrapped function.\n */\nfunction createWrapper(func, bitmask, thisArg, partials, holders, argPos, ary, arity) {\n  var isBindKey = bitmask & BIND_KEY_FLAG;\n  if (!isBindKey && typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  var length = partials ? partials.length : 0;\n  if (!length) {\n    bitmask &= ~(PARTIAL_FLAG | PARTIAL_RIGHT_FLAG);\n    partials = holders = undefined;\n  }\n  length -= (holders ? holders.length : 0);\n  if (bitmask & PARTIAL_RIGHT_FLAG) {\n    var partialsRight = partials,\n        holdersRight = holders;\n\n    partials = holders = undefined;\n  }\n  var data = isBindKey ? undefined : getData(func),\n      newData = [func, bitmask, thisArg, partials, holders, partialsRight, holdersRight, argPos, ary, arity];\n\n  if (data) {\n    mergeData(newData, data);\n    bitmask = newData[1];\n    arity = newData[9];\n  }\n  newData[9] = arity == null\n    ? (isBindKey ? 0 : func.length)\n    : (nativeMax(arity - length, 0) || 0);\n\n  if (bitmask == BIND_FLAG) {\n    var result = createBindWrapper(newData[0], newData[2]);\n  } else if ((bitmask == PARTIAL_FLAG || bitmask == (BIND_FLAG | PARTIAL_FLAG)) && !newData[4].length) {\n    result = createPartialWrapper.apply(undefined, newData);\n  } else {\n    result = createHybridWrapper.apply(undefined, newData);\n  }\n  var setter = data ? baseSetData : setData;\n  return setter(result, newData);\n}\n\nmodule.exports = createWrapper;\n","var arraySome = require('./arraySome');\n\n/**\n * A specialized version of `baseIsEqualDeep` for arrays with support for\n * partial deep comparisons.\n *\n * @private\n * @param {Array} array The array to compare.\n * @param {Array} other The other array to compare.\n * @param {Function} equalFunc The function to determine equivalents of values.\n * @param {Function} [customizer] The function to customize comparing arrays.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA] Tracks traversed `value` objects.\n * @param {Array} [stackB] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the arrays are equivalent, else `false`.\n */\nfunction equalArrays(array, other, equalFunc, customizer, isLoose, stackA, stackB) {\n  var index = -1,\n      arrLength = array.length,\n      othLength = other.length;\n\n  if (arrLength != othLength && !(isLoose && othLength > arrLength)) {\n    return false;\n  }\n  // Ignore non-index properties.\n  while (++index < arrLength) {\n    var arrValue = array[index],\n        othValue = other[index],\n        result = customizer ? customizer(isLoose ? othValue : arrValue, isLoose ? arrValue : othValue, index) : undefined;\n\n    if (result !== undefined) {\n      if (result) {\n        continue;\n      }\n      return false;\n    }\n    // Recursively compare arrays (susceptible to call stack limits).\n    if (isLoose) {\n      if (!arraySome(other, function(othValue) {\n            return arrValue === othValue || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB);\n          })) {\n        return false;\n      }\n    } else if (!(arrValue === othValue || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB))) {\n      return false;\n    }\n  }\n  return true;\n}\n\nmodule.exports = equalArrays;\n","/** `Object#toString` result references. */\nvar boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    numberTag = '[object Number]',\n    regexpTag = '[object RegExp]',\n    stringTag = '[object String]';\n\n/**\n * A specialized version of `baseIsEqualDeep` for comparing objects of\n * the same `toStringTag`.\n *\n * **Note:** This function only supports comparing values with tags of\n * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.\n *\n * @private\n * @param {Object} object The object to compare.\n * @param {Object} other The other object to compare.\n * @param {string} tag The `toStringTag` of the objects to compare.\n * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.\n */\nfunction equalByTag(object, other, tag) {\n  switch (tag) {\n    case boolTag:\n    case dateTag:\n      // Coerce dates and booleans to numbers, dates to milliseconds and booleans\n      // to `1` or `0` treating invalid dates coerced to `NaN` as not equal.\n      return +object == +other;\n\n    case errorTag:\n      return object.name == other.name && object.message == other.message;\n\n    case numberTag:\n      // Treat `NaN` vs. `NaN` as equal.\n      return (object != +object)\n        ? other != +other\n        : object == +other;\n\n    case regexpTag:\n    case stringTag:\n      // Coerce regexes to strings and treat strings primitives and string\n      // objects as equal. See https://es5.github.io/#x15.10.6.4 for more details.\n      return object == (other + '');\n  }\n  return false;\n}\n\nmodule.exports = equalByTag;\n","var keys = require('../object/keys');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * A specialized version of `baseIsEqualDeep` for objects with support for\n * partial deep comparisons.\n *\n * @private\n * @param {Object} object The object to compare.\n * @param {Object} other The other object to compare.\n * @param {Function} equalFunc The function to determine equivalents of values.\n * @param {Function} [customizer] The function to customize comparing values.\n * @param {boolean} [isLoose] Specify performing partial comparisons.\n * @param {Array} [stackA] Tracks traversed `value` objects.\n * @param {Array} [stackB] Tracks traversed `other` objects.\n * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.\n */\nfunction equalObjects(object, other, equalFunc, customizer, isLoose, stackA, stackB) {\n  var objProps = keys(object),\n      objLength = objProps.length,\n      othProps = keys(other),\n      othLength = othProps.length;\n\n  if (objLength != othLength && !isLoose) {\n    return false;\n  }\n  var index = objLength;\n  while (index--) {\n    var key = objProps[index];\n    if (!(isLoose ? key in other : hasOwnProperty.call(other, key))) {\n      return false;\n    }\n  }\n  var skipCtor = isLoose;\n  while (++index < objLength) {\n    key = objProps[index];\n    var objValue = object[key],\n        othValue = other[key],\n        result = customizer ? customizer(isLoose ? othValue : objValue, isLoose? objValue : othValue, key) : undefined;\n\n    // Recursively compare objects (susceptible to call stack limits).\n    if (!(result === undefined ? equalFunc(objValue, othValue, customizer, isLoose, stackA, stackB) : result)) {\n      return false;\n    }\n    skipCtor || (skipCtor = key == 'constructor');\n  }\n  if (!skipCtor) {\n    var objCtor = object.constructor,\n        othCtor = other.constructor;\n\n    // Non `Object` object instances with different constructors are not equal.\n    if (objCtor != othCtor &&\n        ('constructor' in object && 'constructor' in other) &&\n        !(typeof objCtor == 'function' && objCtor instanceof objCtor &&\n          typeof othCtor == 'function' && othCtor instanceof othCtor)) {\n      return false;\n    }\n  }\n  return true;\n}\n\nmodule.exports = equalObjects;\n","var metaMap = require('./metaMap'),\n    noop = require('../utility/noop');\n\n/**\n * Gets metadata for `func`.\n *\n * @private\n * @param {Function} func The function to query.\n * @returns {*} Returns the metadata for `func`.\n */\nvar getData = !metaMap ? noop : function(func) {\n  return metaMap.get(func);\n};\n\nmodule.exports = getData;\n","var realNames = require('./realNames');\n\n/**\n * Gets the name of `func`.\n *\n * @private\n * @param {Function} func The function to query.\n * @returns {string} Returns the function name.\n */\nfunction getFuncName(func) {\n  var result = (func.name + ''),\n      array = realNames[result],\n      length = array ? array.length : 0;\n\n  while (length--) {\n    var data = array[length],\n        otherFunc = data.func;\n    if (otherFunc == null || otherFunc == func) {\n      return data.name;\n    }\n  }\n  return result;\n}\n\nmodule.exports = getFuncName;\n","var baseProperty = require('./baseProperty');\n\n/**\n * Gets the \"length\" property value of `object`.\n *\n * **Note:** This function is used to avoid a [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792)\n * that affects Safari on at least iOS 8.1-8.3 ARM64.\n *\n * @private\n * @param {Object} object The object to query.\n * @returns {*} Returns the \"length\" value.\n */\nvar getLength = baseProperty('length');\n\nmodule.exports = getLength;\n","var isStrictComparable = require('./isStrictComparable'),\n    pairs = require('../object/pairs');\n\n/**\n * Gets the propery names, values, and compare flags of `object`.\n *\n * @private\n * @param {Object} object The object to query.\n * @returns {Array} Returns the match data of `object`.\n */\nfunction getMatchData(object) {\n  var result = pairs(object),\n      length = result.length;\n\n  while (length--) {\n    result[length][2] = isStrictComparable(result[length][1]);\n  }\n  return result;\n}\n\nmodule.exports = getMatchData;\n","var isNative = require('../lang/isNative');\n\n/**\n * Gets the native function at `key` of `object`.\n *\n * @private\n * @param {Object} object The object to query.\n * @param {string} key The key of the method to get.\n * @returns {*} Returns the function if it's native, else `undefined`.\n */\nfunction getNative(object, key) {\n  var value = object == null ? undefined : object[key];\n  return isNative(value) ? value : undefined;\n}\n\nmodule.exports = getNative;\n","/**\n * Gets the index at which the first occurrence of `NaN` is found in `array`.\n *\n * @private\n * @param {Array} array The array to search.\n * @param {number} fromIndex The index to search from.\n * @param {boolean} [fromRight] Specify iterating from right to left.\n * @returns {number} Returns the index of the matched `NaN`, else `-1`.\n */\nfunction indexOfNaN(array, fromIndex, fromRight) {\n  var length = array.length,\n      index = fromIndex + (fromRight ? 0 : -1);\n\n  while ((fromRight ? index-- : ++index < length)) {\n    var other = array[index];\n    if (other !== other) {\n      return index;\n    }\n  }\n  return -1;\n}\n\nmodule.exports = indexOfNaN;\n","/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Initializes an array clone.\n *\n * @private\n * @param {Array} array The array to clone.\n * @returns {Array} Returns the initialized clone.\n */\nfunction initCloneArray(array) {\n  var length = array.length,\n      result = new array.constructor(length);\n\n  // Add array properties assigned by `RegExp#exec`.\n  if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {\n    result.index = array.index;\n    result.input = array.input;\n  }\n  return result;\n}\n\nmodule.exports = initCloneArray;\n","(function (global){\nvar bufferClone = require('./bufferClone');\n\n/** `Object#toString` result references. */\nvar boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    numberTag = '[object Number]',\n    regexpTag = '[object RegExp]',\n    stringTag = '[object String]';\n\nvar arrayBufferTag = '[object ArrayBuffer]',\n    float32Tag = '[object Float32Array]',\n    float64Tag = '[object Float64Array]',\n    int8Tag = '[object Int8Array]',\n    int16Tag = '[object Int16Array]',\n    int32Tag = '[object Int32Array]',\n    uint8Tag = '[object Uint8Array]',\n    uint8ClampedTag = '[object Uint8ClampedArray]',\n    uint16Tag = '[object Uint16Array]',\n    uint32Tag = '[object Uint32Array]';\n\n/** Used to match `RegExp` flags from their coerced string values. */\nvar reFlags = /\\w*$/;\n\n/** Native method references. */\nvar Uint8Array = global.Uint8Array;\n\n/** Used to lookup a type array constructors by `toStringTag`. */\nvar ctorByTag = {};\nctorByTag[float32Tag] = global.Float32Array;\nctorByTag[float64Tag] = global.Float64Array;\nctorByTag[int8Tag] = global.Int8Array;\nctorByTag[int16Tag] = global.Int16Array;\nctorByTag[int32Tag] = global.Int32Array;\nctorByTag[uint8Tag] = Uint8Array;\nctorByTag[uint8ClampedTag] = global.Uint8ClampedArray;\nctorByTag[uint16Tag] = global.Uint16Array;\nctorByTag[uint32Tag] = global.Uint32Array;\n\n/**\n * Initializes an object clone based on its `toStringTag`.\n *\n * **Note:** This function only supports cloning values with tags of\n * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.\n *\n * @private\n * @param {Object} object The object to clone.\n * @param {string} tag The `toStringTag` of the object to clone.\n * @param {boolean} [isDeep] Specify a deep clone.\n * @returns {Object} Returns the initialized clone.\n */\nfunction initCloneByTag(object, tag, isDeep) {\n  var Ctor = object.constructor;\n  switch (tag) {\n    case arrayBufferTag:\n      return bufferClone(object);\n\n    case boolTag:\n    case dateTag:\n      return new Ctor(+object);\n\n    case float32Tag: case float64Tag:\n    case int8Tag: case int16Tag: case int32Tag:\n    case uint8Tag: case uint8ClampedTag: case uint16Tag: case uint32Tag:\n      // Safari 5 mobile incorrectly has `Object` as the constructor of typed arrays.\n      if (Ctor instanceof Ctor) {\n        Ctor = ctorByTag[tag];\n      }\n      var buffer = object.buffer;\n      return new Ctor(isDeep ? bufferClone(buffer) : buffer, object.byteOffset, object.length);\n\n    case numberTag:\n    case stringTag:\n      return new Ctor(object);\n\n    case regexpTag:\n      var result = new Ctor(object.source, reFlags.exec(object));\n      result.lastIndex = object.lastIndex;\n  }\n  return result;\n}\n\nmodule.exports = initCloneByTag;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL2luaXRDbG9uZUJ5VGFnLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYnVmZmVyQ2xvbmUgPSByZXF1aXJlKCcuL2J1ZmZlckNsb25lJyk7XG5cbi8qKiBgT2JqZWN0I3RvU3RyaW5nYCByZXN1bHQgcmVmZXJlbmNlcy4gKi9cbnZhciBib29sVGFnID0gJ1tvYmplY3QgQm9vbGVhbl0nLFxuICAgIGRhdGVUYWcgPSAnW29iamVjdCBEYXRlXScsXG4gICAgbnVtYmVyVGFnID0gJ1tvYmplY3QgTnVtYmVyXScsXG4gICAgcmVnZXhwVGFnID0gJ1tvYmplY3QgUmVnRXhwXScsXG4gICAgc3RyaW5nVGFnID0gJ1tvYmplY3QgU3RyaW5nXSc7XG5cbnZhciBhcnJheUJ1ZmZlclRhZyA9ICdbb2JqZWN0IEFycmF5QnVmZmVyXScsXG4gICAgZmxvYXQzMlRhZyA9ICdbb2JqZWN0IEZsb2F0MzJBcnJheV0nLFxuICAgIGZsb2F0NjRUYWcgPSAnW29iamVjdCBGbG9hdDY0QXJyYXldJyxcbiAgICBpbnQ4VGFnID0gJ1tvYmplY3QgSW50OEFycmF5XScsXG4gICAgaW50MTZUYWcgPSAnW29iamVjdCBJbnQxNkFycmF5XScsXG4gICAgaW50MzJUYWcgPSAnW29iamVjdCBJbnQzMkFycmF5XScsXG4gICAgdWludDhUYWcgPSAnW29iamVjdCBVaW50OEFycmF5XScsXG4gICAgdWludDhDbGFtcGVkVGFnID0gJ1tvYmplY3QgVWludDhDbGFtcGVkQXJyYXldJyxcbiAgICB1aW50MTZUYWcgPSAnW29iamVjdCBVaW50MTZBcnJheV0nLFxuICAgIHVpbnQzMlRhZyA9ICdbb2JqZWN0IFVpbnQzMkFycmF5XSc7XG5cbi8qKiBVc2VkIHRvIG1hdGNoIGBSZWdFeHBgIGZsYWdzIGZyb20gdGhlaXIgY29lcmNlZCBzdHJpbmcgdmFsdWVzLiAqL1xudmFyIHJlRmxhZ3MgPSAvXFx3KiQvO1xuXG4vKiogTmF0aXZlIG1ldGhvZCByZWZlcmVuY2VzLiAqL1xudmFyIFVpbnQ4QXJyYXkgPSBnbG9iYWwuVWludDhBcnJheTtcblxuLyoqIFVzZWQgdG8gbG9va3VwIGEgdHlwZSBhcnJheSBjb25zdHJ1Y3RvcnMgYnkgYHRvU3RyaW5nVGFnYC4gKi9cbnZhciBjdG9yQnlUYWcgPSB7fTtcbmN0b3JCeVRhZ1tmbG9hdDMyVGFnXSA9IGdsb2JhbC5GbG9hdDMyQXJyYXk7XG5jdG9yQnlUYWdbZmxvYXQ2NFRhZ10gPSBnbG9iYWwuRmxvYXQ2NEFycmF5O1xuY3RvckJ5VGFnW2ludDhUYWddID0gZ2xvYmFsLkludDhBcnJheTtcbmN0b3JCeVRhZ1tpbnQxNlRhZ10gPSBnbG9iYWwuSW50MTZBcnJheTtcbmN0b3JCeVRhZ1tpbnQzMlRhZ10gPSBnbG9iYWwuSW50MzJBcnJheTtcbmN0b3JCeVRhZ1t1aW50OFRhZ10gPSBVaW50OEFycmF5O1xuY3RvckJ5VGFnW3VpbnQ4Q2xhbXBlZFRhZ10gPSBnbG9iYWwuVWludDhDbGFtcGVkQXJyYXk7XG5jdG9yQnlUYWdbdWludDE2VGFnXSA9IGdsb2JhbC5VaW50MTZBcnJheTtcbmN0b3JCeVRhZ1t1aW50MzJUYWddID0gZ2xvYmFsLlVpbnQzMkFycmF5O1xuXG4vKipcbiAqIEluaXRpYWxpemVzIGFuIG9iamVjdCBjbG9uZSBiYXNlZCBvbiBpdHMgYHRvU3RyaW5nVGFnYC5cbiAqXG4gKiAqKk5vdGU6KiogVGhpcyBmdW5jdGlvbiBvbmx5IHN1cHBvcnRzIGNsb25pbmcgdmFsdWVzIHdpdGggdGFncyBvZlxuICogYEJvb2xlYW5gLCBgRGF0ZWAsIGBFcnJvcmAsIGBOdW1iZXJgLCBgUmVnRXhwYCwgb3IgYFN0cmluZ2AuXG4gKlxuICogQHByaXZhdGVcbiAqIEBwYXJhbSB7T2JqZWN0fSBvYmplY3QgVGhlIG9iamVjdCB0byBjbG9uZS5cbiAqIEBwYXJhbSB7c3RyaW5nfSB0YWcgVGhlIGB0b1N0cmluZ1RhZ2Agb2YgdGhlIG9iamVjdCB0byBjbG9uZS5cbiAqIEBwYXJhbSB7Ym9vbGVhbn0gW2lzRGVlcF0gU3BlY2lmeSBhIGRlZXAgY2xvbmUuXG4gKiBAcmV0dXJucyB7T2JqZWN0fSBSZXR1cm5zIHRoZSBpbml0aWFsaXplZCBjbG9uZS5cbiAqL1xuZnVuY3Rpb24gaW5pdENsb25lQnlUYWcob2JqZWN0LCB0YWcsIGlzRGVlcCkge1xuICB2YXIgQ3RvciA9IG9iamVjdC5jb25zdHJ1Y3RvcjtcbiAgc3dpdGNoICh0YWcpIHtcbiAgICBjYXNlIGFycmF5QnVmZmVyVGFnOlxuICAgICAgcmV0dXJuIGJ1ZmZlckNsb25lKG9iamVjdCk7XG5cbiAgICBjYXNlIGJvb2xUYWc6XG4gICAgY2FzZSBkYXRlVGFnOlxuICAgICAgcmV0dXJuIG5ldyBDdG9yKCtvYmplY3QpO1xuXG4gICAgY2FzZSBmbG9hdDMyVGFnOiBjYXNlIGZsb2F0NjRUYWc6XG4gICAgY2FzZSBpbnQ4VGFnOiBjYXNlIGludDE2VGFnOiBjYXNlIGludDMyVGFnOlxuICAgIGNhc2UgdWludDhUYWc6IGNhc2UgdWludDhDbGFtcGVkVGFnOiBjYXNlIHVpbnQxNlRhZzogY2FzZSB1aW50MzJUYWc6XG4gICAgICAvLyBTYWZhcmkgNSBtb2JpbGUgaW5jb3JyZWN0bHkgaGFzIGBPYmplY3RgIGFzIHRoZSBjb25zdHJ1Y3RvciBvZiB0eXBlZCBhcnJheXMuXG4gICAgICBpZiAoQ3RvciBpbnN0YW5jZW9mIEN0b3IpIHtcbiAgICAgICAgQ3RvciA9IGN0b3JCeVRhZ1t0YWddO1xuICAgICAgfVxuICAgICAgdmFyIGJ1ZmZlciA9IG9iamVjdC5idWZmZXI7XG4gICAgICByZXR1cm4gbmV3IEN0b3IoaXNEZWVwID8gYnVmZmVyQ2xvbmUoYnVmZmVyKSA6IGJ1ZmZlciwgb2JqZWN0LmJ5dGVPZmZzZXQsIG9iamVjdC5sZW5ndGgpO1xuXG4gICAgY2FzZSBudW1iZXJUYWc6XG4gICAgY2FzZSBzdHJpbmdUYWc6XG4gICAgICByZXR1cm4gbmV3IEN0b3Iob2JqZWN0KTtcblxuICAgIGNhc2UgcmVnZXhwVGFnOlxuICAgICAgdmFyIHJlc3VsdCA9IG5ldyBDdG9yKG9iamVjdC5zb3VyY2UsIHJlRmxhZ3MuZXhlYyhvYmplY3QpKTtcbiAgICAgIHJlc3VsdC5sYXN0SW5kZXggPSBvYmplY3QubGFzdEluZGV4O1xuICB9XG4gIHJldHVybiByZXN1bHQ7XG59XG5cbm1vZHVsZS5leHBvcnRzID0gaW5pdENsb25lQnlUYWc7XG4iXX0=","/**\n * Initializes an object clone.\n *\n * @private\n * @param {Object} object The object to clone.\n * @returns {Object} Returns the initialized clone.\n */\nfunction initCloneObject(object) {\n  var Ctor = object.constructor;\n  if (!(typeof Ctor == 'function' && Ctor instanceof Ctor)) {\n    Ctor = Object;\n  }\n  return new Ctor;\n}\n\nmodule.exports = initCloneObject;\n","var getLength = require('./getLength'),\n    isLength = require('./isLength');\n\n/**\n * Checks if `value` is array-like.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is array-like, else `false`.\n */\nfunction isArrayLike(value) {\n  return value != null && isLength(getLength(value));\n}\n\nmodule.exports = isArrayLike;\n","/**\n * Checks if `value` is a host object in IE < 9.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a host object, else `false`.\n */\nvar isHostObject = (function() {\n  try {\n    Object({ 'toString': 0 } + '');\n  } catch(e) {\n    return function() { return false; };\n  }\n  return function(value) {\n    // IE < 9 presents many host objects as `Object` objects that can coerce\n    // to strings despite having improperly defined `toString` methods.\n    return typeof value.toString != 'function' && typeof (value + '') == 'string';\n  };\n}());\n\nmodule.exports = isHostObject;\n","/** Used to detect unsigned integer values. */\nvar reIsUint = /^\\d+$/;\n\n/**\n * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)\n * of an array-like value.\n */\nvar MAX_SAFE_INTEGER = 9007199254740991;\n\n/**\n * Checks if `value` is a valid array-like index.\n *\n * @private\n * @param {*} value The value to check.\n * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.\n * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.\n */\nfunction isIndex(value, length) {\n  value = (typeof value == 'number' || reIsUint.test(value)) ? +value : -1;\n  length = length == null ? MAX_SAFE_INTEGER : length;\n  return value > -1 && value % 1 == 0 && value < length;\n}\n\nmodule.exports = isIndex;\n","var isArrayLike = require('./isArrayLike'),\n    isIndex = require('./isIndex'),\n    isObject = require('../lang/isObject');\n\n/**\n * Checks if the provided arguments are from an iteratee call.\n *\n * @private\n * @param {*} value The potential iteratee value argument.\n * @param {*} index The potential iteratee index or key argument.\n * @param {*} object The potential iteratee object argument.\n * @returns {boolean} Returns `true` if the arguments are from an iteratee call, else `false`.\n */\nfunction isIterateeCall(value, index, object) {\n  if (!isObject(object)) {\n    return false;\n  }\n  var type = typeof index;\n  if (type == 'number'\n      ? (isArrayLike(object) && isIndex(index, object.length))\n      : (type == 'string' && index in object)) {\n    var other = object[index];\n    return value === value ? (value === other) : (other !== other);\n  }\n  return false;\n}\n\nmodule.exports = isIterateeCall;\n","var isArray = require('../lang/isArray'),\n    toObject = require('./toObject');\n\n/** Used to match property names within property paths. */\nvar reIsDeepProp = /\\.|\\[(?:[^[\\]]*|([\"'])(?:(?!\\1)[^\\n\\\\]|\\\\.)*?\\1)\\]/,\n    reIsPlainProp = /^\\w*$/;\n\n/**\n * Checks if `value` is a property name and not a property path.\n *\n * @private\n * @param {*} value The value to check.\n * @param {Object} [object] The object to query keys on.\n * @returns {boolean} Returns `true` if `value` is a property name, else `false`.\n */\nfunction isKey(value, object) {\n  var type = typeof value;\n  if ((type == 'string' && reIsPlainProp.test(value)) || type == 'number') {\n    return true;\n  }\n  if (isArray(value)) {\n    return false;\n  }\n  var result = !reIsDeepProp.test(value);\n  return result || (object != null && value in toObject(object));\n}\n\nmodule.exports = isKey;\n","var LazyWrapper = require('./LazyWrapper'),\n    getData = require('./getData'),\n    getFuncName = require('./getFuncName'),\n    lodash = require('../chain/lodash');\n\n/**\n * Checks if `func` has a lazy counterpart.\n *\n * @private\n * @param {Function} func The function to check.\n * @returns {boolean} Returns `true` if `func` has a lazy counterpart, else `false`.\n */\nfunction isLaziable(func) {\n  var funcName = getFuncName(func),\n      other = lodash[funcName];\n\n  if (typeof other != 'function' || !(funcName in LazyWrapper.prototype)) {\n    return false;\n  }\n  if (func === other) {\n    return true;\n  }\n  var data = getData(other);\n  return !!data && func === data[0];\n}\n\nmodule.exports = isLaziable;\n","/**\n * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)\n * of an array-like value.\n */\nvar MAX_SAFE_INTEGER = 9007199254740991;\n\n/**\n * Checks if `value` is a valid array-like length.\n *\n * **Note:** This function is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.\n */\nfunction isLength(value) {\n  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;\n}\n\nmodule.exports = isLength;\n","/**\n * Checks if `value` is object-like.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is object-like, else `false`.\n */\nfunction isObjectLike(value) {\n  return !!value && typeof value == 'object';\n}\n\nmodule.exports = isObjectLike;\n","var isObject = require('../lang/isObject');\n\n/**\n * Checks if `value` is suitable for strict equality comparisons, i.e. `===`.\n *\n * @private\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` if suitable for strict\n *  equality comparisons, else `false`.\n */\nfunction isStrictComparable(value) {\n  return value === value && !isObject(value);\n}\n\nmodule.exports = isStrictComparable;\n","var arrayCopy = require('./arrayCopy'),\n    composeArgs = require('./composeArgs'),\n    composeArgsRight = require('./composeArgsRight'),\n    replaceHolders = require('./replaceHolders');\n\n/** Used to compose bitmasks for wrapper metadata. */\nvar BIND_FLAG = 1,\n    CURRY_BOUND_FLAG = 4,\n    CURRY_FLAG = 8,\n    ARY_FLAG = 128,\n    REARG_FLAG = 256;\n\n/** Used as the internal argument placeholder. */\nvar PLACEHOLDER = '__lodash_placeholder__';\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMin = Math.min;\n\n/**\n * Merges the function metadata of `source` into `data`.\n *\n * Merging metadata reduces the number of wrappers required to invoke a function.\n * This is possible because methods like `_.bind`, `_.curry`, and `_.partial`\n * may be applied regardless of execution order. Methods like `_.ary` and `_.rearg`\n * augment function arguments, making the order in which they are executed important,\n * preventing the merging of metadata. However, we make an exception for a safe\n * common case where curried functions have `_.ary` and or `_.rearg` applied.\n *\n * @private\n * @param {Array} data The destination metadata.\n * @param {Array} source The source metadata.\n * @returns {Array} Returns `data`.\n */\nfunction mergeData(data, source) {\n  var bitmask = data[1],\n      srcBitmask = source[1],\n      newBitmask = bitmask | srcBitmask,\n      isCommon = newBitmask < ARY_FLAG;\n\n  var isCombo =\n    (srcBitmask == ARY_FLAG && bitmask == CURRY_FLAG) ||\n    (srcBitmask == ARY_FLAG && bitmask == REARG_FLAG && data[7].length <= source[8]) ||\n    (srcBitmask == (ARY_FLAG | REARG_FLAG) && bitmask == CURRY_FLAG);\n\n  // Exit early if metadata can't be merged.\n  if (!(isCommon || isCombo)) {\n    return data;\n  }\n  // Use source `thisArg` if available.\n  if (srcBitmask & BIND_FLAG) {\n    data[2] = source[2];\n    // Set when currying a bound function.\n    newBitmask |= (bitmask & BIND_FLAG) ? 0 : CURRY_BOUND_FLAG;\n  }\n  // Compose partial arguments.\n  var value = source[3];\n  if (value) {\n    var partials = data[3];\n    data[3] = partials ? composeArgs(partials, value, source[4]) : arrayCopy(value);\n    data[4] = partials ? replaceHolders(data[3], PLACEHOLDER) : arrayCopy(source[4]);\n  }\n  // Compose partial right arguments.\n  value = source[5];\n  if (value) {\n    partials = data[5];\n    data[5] = partials ? composeArgsRight(partials, value, source[6]) : arrayCopy(value);\n    data[6] = partials ? replaceHolders(data[5], PLACEHOLDER) : arrayCopy(source[6]);\n  }\n  // Use source `argPos` if available.\n  value = source[7];\n  if (value) {\n    data[7] = arrayCopy(value);\n  }\n  // Use source `ary` if it's smaller.\n  if (srcBitmask & ARY_FLAG) {\n    data[8] = data[8] == null ? source[8] : nativeMin(data[8], source[8]);\n  }\n  // Use source `arity` if one is not provided.\n  if (data[9] == null) {\n    data[9] = source[9];\n  }\n  // Use source `func` and merge bitmasks.\n  data[0] = source[0];\n  data[1] = newBitmask;\n\n  return data;\n}\n\nmodule.exports = mergeData;\n","(function (global){\nvar getNative = require('./getNative');\n\n/** Native method references. */\nvar WeakMap = getNative(global, 'WeakMap');\n\n/** Used to store function metadata. */\nvar metaMap = WeakMap && new WeakMap;\n\nmodule.exports = metaMap;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy9sb2Rhc2gtY29tcGF0L2ludGVybmFsL21ldGFNYXAuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgZ2V0TmF0aXZlID0gcmVxdWlyZSgnLi9nZXROYXRpdmUnKTtcblxuLyoqIE5hdGl2ZSBtZXRob2QgcmVmZXJlbmNlcy4gKi9cbnZhciBXZWFrTWFwID0gZ2V0TmF0aXZlKGdsb2JhbCwgJ1dlYWtNYXAnKTtcblxuLyoqIFVzZWQgdG8gc3RvcmUgZnVuY3Rpb24gbWV0YWRhdGEuICovXG52YXIgbWV0YU1hcCA9IFdlYWtNYXAgJiYgbmV3IFdlYWtNYXA7XG5cbm1vZHVsZS5leHBvcnRzID0gbWV0YU1hcDtcbiJdfQ==","/** Used to lookup unminified function names. */\nvar realNames = {};\n\nmodule.exports = realNames;\n","var arrayCopy = require('./arrayCopy'),\n    isIndex = require('./isIndex');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeMin = Math.min;\n\n/**\n * Reorder `array` according to the specified indexes where the element at\n * the first index is assigned as the first element, the element at\n * the second index is assigned as the second element, and so on.\n *\n * @private\n * @param {Array} array The array to reorder.\n * @param {Array} indexes The arranged array indexes.\n * @returns {Array} Returns `array`.\n */\nfunction reorder(array, indexes) {\n  var arrLength = array.length,\n      length = nativeMin(indexes.length, arrLength),\n      oldArray = arrayCopy(array);\n\n  while (length--) {\n    var index = indexes[length];\n    array[length] = isIndex(index, arrLength) ? oldArray[index] : undefined;\n  }\n  return array;\n}\n\nmodule.exports = reorder;\n","/** Used as the internal argument placeholder. */\nvar PLACEHOLDER = '__lodash_placeholder__';\n\n/**\n * Replaces all `placeholder` elements in `array` with an internal placeholder\n * and returns an array of their indexes.\n *\n * @private\n * @param {Array} array The array to modify.\n * @param {*} placeholder The placeholder to replace.\n * @returns {Array} Returns the new array of placeholder indexes.\n */\nfunction replaceHolders(array, placeholder) {\n  var index = -1,\n      length = array.length,\n      resIndex = -1,\n      result = [];\n\n  while (++index < length) {\n    if (array[index] === placeholder) {\n      array[index] = PLACEHOLDER;\n      result[++resIndex] = index;\n    }\n  }\n  return result;\n}\n\nmodule.exports = replaceHolders;\n","var baseSetData = require('./baseSetData'),\n    now = require('../date/now');\n\n/** Used to detect when a function becomes hot. */\nvar HOT_COUNT = 150,\n    HOT_SPAN = 16;\n\n/**\n * Sets metadata for `func`.\n *\n * **Note:** If this function becomes hot, i.e. is invoked a lot in a short\n * period of time, it will trip its breaker and transition to an identity function\n * to avoid garbage collection pauses in V8. See [V8 issue 2070](https://code.google.com/p/v8/issues/detail?id=2070)\n * for more details.\n *\n * @private\n * @param {Function} func The function to associate metadata with.\n * @param {*} data The metadata.\n * @returns {Function} Returns `func`.\n */\nvar setData = (function() {\n  var count = 0,\n      lastCalled = 0;\n\n  return function(key, value) {\n    var stamp = now(),\n        remaining = HOT_SPAN - (stamp - lastCalled);\n\n    lastCalled = stamp;\n    if (remaining > 0) {\n      if (++count >= HOT_COUNT) {\n        return key;\n      }\n    } else {\n      count = 0;\n    }\n    return baseSetData(key, value);\n  };\n}());\n\nmodule.exports = setData;\n","var isArguments = require('../lang/isArguments'),\n    isArray = require('../lang/isArray'),\n    isIndex = require('./isIndex'),\n    isLength = require('./isLength'),\n    isString = require('../lang/isString'),\n    keysIn = require('../object/keysIn');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * A fallback implementation of `Object.keys` which creates an array of the\n * own enumerable property names of `object`.\n *\n * @private\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property names.\n */\nfunction shimKeys(object) {\n  var props = keysIn(object),\n      propsLength = props.length,\n      length = propsLength && object.length;\n\n  var allowIndexes = !!length && isLength(length) &&\n    (isArray(object) || isArguments(object) || isString(object));\n\n  var index = -1,\n      result = [];\n\n  while (++index < propsLength) {\n    var key = props[index];\n    if ((allowIndexes && isIndex(key, length)) || hasOwnProperty.call(object, key)) {\n      result.push(key);\n    }\n  }\n  return result;\n}\n\nmodule.exports = shimKeys;\n","var isObject = require('../lang/isObject'),\n    isString = require('../lang/isString'),\n    support = require('../support');\n\n/**\n * Converts `value` to an object if it's not one.\n *\n * @private\n * @param {*} value The value to process.\n * @returns {Object} Returns the object.\n */\nfunction toObject(value) {\n  if (support.unindexedChars && isString(value)) {\n    var index = -1,\n        length = value.length,\n        result = Object(value);\n\n    while (++index < length) {\n      result[index] = value.charAt(index);\n    }\n    return result;\n  }\n  return isObject(value) ? value : Object(value);\n}\n\nmodule.exports = toObject;\n","var baseToString = require('./baseToString'),\n    isArray = require('../lang/isArray');\n\n/** Used to match property names within property paths. */\nvar rePropName = /[^.[\\]]+|\\[(?:(-?\\d+(?:\\.\\d+)?)|([\"'])((?:(?!\\2)[^\\n\\\\]|\\\\.)*?)\\2)\\]/g;\n\n/** Used to match backslashes in property paths. */\nvar reEscapeChar = /\\\\(\\\\)?/g;\n\n/**\n * Converts `value` to property path array if it's not one.\n *\n * @private\n * @param {*} value The value to process.\n * @returns {Array} Returns the property path array.\n */\nfunction toPath(value) {\n  if (isArray(value)) {\n    return value;\n  }\n  var result = [];\n  baseToString(value).replace(rePropName, function(match, number, quote, string) {\n    result.push(quote ? string.replace(reEscapeChar, '$1') : (number || match));\n  });\n  return result;\n}\n\nmodule.exports = toPath;\n","var LazyWrapper = require('./LazyWrapper'),\n    LodashWrapper = require('./LodashWrapper'),\n    arrayCopy = require('./arrayCopy');\n\n/**\n * Creates a clone of `wrapper`.\n *\n * @private\n * @param {Object} wrapper The wrapper to clone.\n * @returns {Object} Returns the cloned wrapper.\n */\nfunction wrapperClone(wrapper) {\n  return wrapper instanceof LazyWrapper\n    ? wrapper.clone()\n    : new LodashWrapper(wrapper.__wrapped__, wrapper.__chain__, arrayCopy(wrapper.__actions__));\n}\n\nmodule.exports = wrapperClone;\n","var baseClone = require('../internal/baseClone'),\n    bindCallback = require('../internal/bindCallback');\n\n/**\n * Creates a deep clone of `value`. If `customizer` is provided it's invoked\n * to produce the cloned values. If `customizer` returns `undefined` cloning\n * is handled by the method instead. The `customizer` is bound to `thisArg`\n * and invoked with up to three argument; (value [, index|key, object]).\n *\n * **Note:** This method is loosely based on the\n * [structured clone algorithm](http://www.w3.org/TR/html5/infrastructure.html#internal-structured-cloning-algorithm).\n * The enumerable properties of `arguments` objects and objects created by\n * constructors other than `Object` are cloned to plain `Object` objects. An\n * empty object is returned for uncloneable values such as functions, DOM nodes,\n * Maps, Sets, and WeakMaps.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to deep clone.\n * @param {Function} [customizer] The function to customize cloning values.\n * @param {*} [thisArg] The `this` binding of `customizer`.\n * @returns {*} Returns the deep cloned value.\n * @example\n *\n * var users = [\n *   { 'user': 'barney' },\n *   { 'user': 'fred' }\n * ];\n *\n * var deep = _.cloneDeep(users);\n * deep[0] === users[0];\n * // => false\n *\n * // using a customizer callback\n * var el = _.cloneDeep(document.body, function(value) {\n *   if (_.isElement(value)) {\n *     return value.cloneNode(true);\n *   }\n * });\n *\n * el === document.body\n * // => false\n * el.nodeName\n * // => BODY\n * el.childNodes.length;\n * // => 20\n */\nfunction cloneDeep(value, customizer, thisArg) {\n  return typeof customizer == 'function'\n    ? baseClone(value, true, bindCallback(customizer, thisArg, 3))\n    : baseClone(value, true);\n}\n\nmodule.exports = cloneDeep;\n","var isArrayLike = require('../internal/isArrayLike'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/** Native method references. */\nvar propertyIsEnumerable = objectProto.propertyIsEnumerable;\n\n/**\n * Checks if `value` is classified as an `arguments` object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isArguments(function() { return arguments; }());\n * // => true\n *\n * _.isArguments([1, 2, 3]);\n * // => false\n */\nfunction isArguments(value) {\n  return isObjectLike(value) && isArrayLike(value) &&\n    hasOwnProperty.call(value, 'callee') && !propertyIsEnumerable.call(value, 'callee');\n}\n\nmodule.exports = isArguments;\n","var getNative = require('../internal/getNative'),\n    isLength = require('../internal/isLength'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** `Object#toString` result references. */\nvar arrayTag = '[object Array]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeIsArray = getNative(Array, 'isArray');\n\n/**\n * Checks if `value` is classified as an `Array` object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isArray([1, 2, 3]);\n * // => true\n *\n * _.isArray(function() { return arguments; }());\n * // => false\n */\nvar isArray = nativeIsArray || function(value) {\n  return isObjectLike(value) && isLength(value.length) && objToString.call(value) == arrayTag;\n};\n\nmodule.exports = isArray;\n","var isArguments = require('./isArguments'),\n    isArray = require('./isArray'),\n    isArrayLike = require('../internal/isArrayLike'),\n    isFunction = require('./isFunction'),\n    isObjectLike = require('../internal/isObjectLike'),\n    isString = require('./isString'),\n    keys = require('../object/keys');\n\n/**\n * Checks if `value` is empty. A value is considered empty unless it's an\n * `arguments` object, array, string, or jQuery-like collection with a length\n * greater than `0` or an object with own enumerable properties.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {Array|Object|string} value The value to inspect.\n * @returns {boolean} Returns `true` if `value` is empty, else `false`.\n * @example\n *\n * _.isEmpty(null);\n * // => true\n *\n * _.isEmpty(true);\n * // => true\n *\n * _.isEmpty(1);\n * // => true\n *\n * _.isEmpty([1, 2, 3]);\n * // => false\n *\n * _.isEmpty({ 'a': 1 });\n * // => false\n */\nfunction isEmpty(value) {\n  if (value == null) {\n    return true;\n  }\n  if (isArrayLike(value) && (isArray(value) || isString(value) || isArguments(value) ||\n      (isObjectLike(value) && isFunction(value.splice)))) {\n    return !value.length;\n  }\n  return !keys(value).length;\n}\n\nmodule.exports = isEmpty;\n","var isObject = require('./isObject');\n\n/** `Object#toString` result references. */\nvar funcTag = '[object Function]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is classified as a `Function` object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isFunction(_);\n * // => true\n *\n * _.isFunction(/abc/);\n * // => false\n */\nfunction isFunction(value) {\n  // The use of `Object#toString` avoids issues with the `typeof` operator\n  // in older versions of Chrome and Safari which return 'function' for regexes\n  // and Safari 8 which returns 'object' for typed array constructors.\n  return isObject(value) && objToString.call(value) == funcTag;\n}\n\nmodule.exports = isFunction;\n","var isFunction = require('./isFunction'),\n    isHostObject = require('../internal/isHostObject'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** Used to detect host constructors (Safari > 5). */\nvar reIsHostCtor = /^\\[object .+?Constructor\\]$/;\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to resolve the decompiled source of functions. */\nvar fnToString = Function.prototype.toString;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/** Used to detect if a method is native. */\nvar reIsNative = RegExp('^' +\n  fnToString.call(hasOwnProperty).replace(/[\\\\^$.*+?()[\\]{}|]/g, '\\\\$&')\n  .replace(/hasOwnProperty|(function).*?(?=\\\\\\()| for .+?(?=\\\\\\])/g, '$1.*?') + '$'\n);\n\n/**\n * Checks if `value` is a native function.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a native function, else `false`.\n * @example\n *\n * _.isNative(Array.prototype.push);\n * // => true\n *\n * _.isNative(_);\n * // => false\n */\nfunction isNative(value) {\n  if (value == null) {\n    return false;\n  }\n  if (isFunction(value)) {\n    return reIsNative.test(fnToString.call(value));\n  }\n  return isObjectLike(value) && (isHostObject(value) ? reIsNative : reIsHostCtor).test(value);\n}\n\nmodule.exports = isNative;\n","/**\n * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.\n * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is an object, else `false`.\n * @example\n *\n * _.isObject({});\n * // => true\n *\n * _.isObject([1, 2, 3]);\n * // => true\n *\n * _.isObject(1);\n * // => false\n */\nfunction isObject(value) {\n  // Avoid a V8 JIT bug in Chrome 19-20.\n  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.\n  var type = typeof value;\n  return !!value && (type == 'object' || type == 'function');\n}\n\nmodule.exports = isObject;\n","var baseForIn = require('../internal/baseForIn'),\n    isArguments = require('./isArguments'),\n    isHostObject = require('../internal/isHostObject'),\n    isObjectLike = require('../internal/isObjectLike'),\n    support = require('../support');\n\n/** `Object#toString` result references. */\nvar objectTag = '[object Object]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is a plain object, that is, an object created by the\n * `Object` constructor or one with a `[[Prototype]]` of `null`.\n *\n * **Note:** This method assumes objects created by the `Object` constructor\n * have no inherited enumerable properties.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a plain object, else `false`.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n * }\n *\n * _.isPlainObject(new Foo);\n * // => false\n *\n * _.isPlainObject([1, 2, 3]);\n * // => false\n *\n * _.isPlainObject({ 'x': 0, 'y': 0 });\n * // => true\n *\n * _.isPlainObject(Object.create(null));\n * // => true\n */\nfunction isPlainObject(value) {\n  var Ctor;\n\n  // Exit early for non `Object` objects.\n  if (!(isObjectLike(value) && objToString.call(value) == objectTag && !isHostObject(value) && !isArguments(value)) ||\n      (!hasOwnProperty.call(value, 'constructor') && (Ctor = value.constructor, typeof Ctor == 'function' && !(Ctor instanceof Ctor)))) {\n    return false;\n  }\n  // IE < 9 iterates inherited properties before own properties. If the first\n  // iterated property is an object's own property then there are no inherited\n  // enumerable properties.\n  var result;\n  if (support.ownLast) {\n    baseForIn(value, function(subValue, key, object) {\n      result = hasOwnProperty.call(object, key);\n      return false;\n    });\n    return result !== false;\n  }\n  // In most environments an object's own properties are iterated before\n  // its inherited properties. If the last iterated property is an object's\n  // own property then there are no inherited enumerable properties.\n  baseForIn(value, function(subValue, key) {\n    result = key;\n  });\n  return result === undefined || hasOwnProperty.call(value, result);\n}\n\nmodule.exports = isPlainObject;\n","var isObjectLike = require('../internal/isObjectLike');\n\n/** `Object#toString` result references. */\nvar stringTag = '[object String]';\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is classified as a `String` primitive or object.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isString('abc');\n * // => true\n *\n * _.isString(1);\n * // => false\n */\nfunction isString(value) {\n  return typeof value == 'string' || (isObjectLike(value) && objToString.call(value) == stringTag);\n}\n\nmodule.exports = isString;\n","var isLength = require('../internal/isLength'),\n    isObjectLike = require('../internal/isObjectLike');\n\n/** `Object#toString` result references. */\nvar argsTag = '[object Arguments]',\n    arrayTag = '[object Array]',\n    boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    funcTag = '[object Function]',\n    mapTag = '[object Map]',\n    numberTag = '[object Number]',\n    objectTag = '[object Object]',\n    regexpTag = '[object RegExp]',\n    setTag = '[object Set]',\n    stringTag = '[object String]',\n    weakMapTag = '[object WeakMap]';\n\nvar arrayBufferTag = '[object ArrayBuffer]',\n    float32Tag = '[object Float32Array]',\n    float64Tag = '[object Float64Array]',\n    int8Tag = '[object Int8Array]',\n    int16Tag = '[object Int16Array]',\n    int32Tag = '[object Int32Array]',\n    uint8Tag = '[object Uint8Array]',\n    uint8ClampedTag = '[object Uint8ClampedArray]',\n    uint16Tag = '[object Uint16Array]',\n    uint32Tag = '[object Uint32Array]';\n\n/** Used to identify `toStringTag` values of typed arrays. */\nvar typedArrayTags = {};\ntypedArrayTags[float32Tag] = typedArrayTags[float64Tag] =\ntypedArrayTags[int8Tag] = typedArrayTags[int16Tag] =\ntypedArrayTags[int32Tag] = typedArrayTags[uint8Tag] =\ntypedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] =\ntypedArrayTags[uint32Tag] = true;\ntypedArrayTags[argsTag] = typedArrayTags[arrayTag] =\ntypedArrayTags[arrayBufferTag] = typedArrayTags[boolTag] =\ntypedArrayTags[dateTag] = typedArrayTags[errorTag] =\ntypedArrayTags[funcTag] = typedArrayTags[mapTag] =\ntypedArrayTags[numberTag] = typedArrayTags[objectTag] =\ntypedArrayTags[regexpTag] = typedArrayTags[setTag] =\ntypedArrayTags[stringTag] = typedArrayTags[weakMapTag] = false;\n\n/** Used for native method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/**\n * Checks if `value` is classified as a typed array.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.\n * @example\n *\n * _.isTypedArray(new Uint8Array);\n * // => true\n *\n * _.isTypedArray([]);\n * // => false\n */\nfunction isTypedArray(value) {\n  return isObjectLike(value) && isLength(value.length) && !!typedArrayTags[objToString.call(value)];\n}\n\nmodule.exports = isTypedArray;\n","/**\n * Checks if `value` is `undefined`.\n *\n * @static\n * @memberOf _\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is `undefined`, else `false`.\n * @example\n *\n * _.isUndefined(void 0);\n * // => true\n *\n * _.isUndefined(null);\n * // => false\n */\nfunction isUndefined(value) {\n  return value === undefined;\n}\n\nmodule.exports = isUndefined;\n","var getNative = require('../internal/getNative'),\n    isArrayLike = require('../internal/isArrayLike'),\n    isObject = require('../lang/isObject'),\n    shimKeys = require('../internal/shimKeys'),\n    support = require('../support');\n\n/* Native method references for those with the same name as other `lodash` methods. */\nvar nativeKeys = getNative(Object, 'keys');\n\n/**\n * Creates an array of the own enumerable property names of `object`.\n *\n * **Note:** Non-object values are coerced to objects. See the\n * [ES spec](http://ecma-international.org/ecma-262/6.0/#sec-object.keys)\n * for more details.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property names.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n *   this.b = 2;\n * }\n *\n * Foo.prototype.c = 3;\n *\n * _.keys(new Foo);\n * // => ['a', 'b'] (iteration order is not guaranteed)\n *\n * _.keys('hi');\n * // => ['0', '1']\n */\nvar keys = !nativeKeys ? shimKeys : function(object) {\n  var Ctor = object == null ? undefined : object.constructor;\n  if ((typeof Ctor == 'function' && Ctor.prototype === object) ||\n      (typeof object == 'function' ? support.enumPrototypes : isArrayLike(object))) {\n    return shimKeys(object);\n  }\n  return isObject(object) ? nativeKeys(object) : [];\n};\n\nmodule.exports = keys;\n","var arrayEach = require('../internal/arrayEach'),\n    isArguments = require('../lang/isArguments'),\n    isArray = require('../lang/isArray'),\n    isFunction = require('../lang/isFunction'),\n    isIndex = require('../internal/isIndex'),\n    isLength = require('../internal/isLength'),\n    isObject = require('../lang/isObject'),\n    isString = require('../lang/isString'),\n    support = require('../support');\n\n/** `Object#toString` result references. */\nvar arrayTag = '[object Array]',\n    boolTag = '[object Boolean]',\n    dateTag = '[object Date]',\n    errorTag = '[object Error]',\n    funcTag = '[object Function]',\n    numberTag = '[object Number]',\n    objectTag = '[object Object]',\n    regexpTag = '[object RegExp]',\n    stringTag = '[object String]';\n\n/** Used to fix the JScript `[[DontEnum]]` bug. */\nvar shadowProps = [\n  'constructor', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable',\n  'toLocaleString', 'toString', 'valueOf'\n];\n\n/** Used for native method references. */\nvar errorProto = Error.prototype,\n    objectProto = Object.prototype,\n    stringProto = String.prototype;\n\n/** Used to check objects for own properties. */\nvar hasOwnProperty = objectProto.hasOwnProperty;\n\n/**\n * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objToString = objectProto.toString;\n\n/** Used to avoid iterating over non-enumerable properties in IE < 9. */\nvar nonEnumProps = {};\nnonEnumProps[arrayTag] = nonEnumProps[dateTag] = nonEnumProps[numberTag] = { 'constructor': true, 'toLocaleString': true, 'toString': true, 'valueOf': true };\nnonEnumProps[boolTag] = nonEnumProps[stringTag] = { 'constructor': true, 'toString': true, 'valueOf': true };\nnonEnumProps[errorTag] = nonEnumProps[funcTag] = nonEnumProps[regexpTag] = { 'constructor': true, 'toString': true };\nnonEnumProps[objectTag] = { 'constructor': true };\n\narrayEach(shadowProps, function(key) {\n  for (var tag in nonEnumProps) {\n    if (hasOwnProperty.call(nonEnumProps, tag)) {\n      var props = nonEnumProps[tag];\n      props[key] = hasOwnProperty.call(props, key);\n    }\n  }\n});\n\n/**\n * Creates an array of the own and inherited enumerable property names of `object`.\n *\n * **Note:** Non-object values are coerced to objects.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property names.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n *   this.b = 2;\n * }\n *\n * Foo.prototype.c = 3;\n *\n * _.keysIn(new Foo);\n * // => ['a', 'b', 'c'] (iteration order is not guaranteed)\n */\nfunction keysIn(object) {\n  if (object == null) {\n    return [];\n  }\n  if (!isObject(object)) {\n    object = Object(object);\n  }\n  var length = object.length;\n\n  length = (length && isLength(length) &&\n    (isArray(object) || isArguments(object) || isString(object)) && length) || 0;\n\n  var Ctor = object.constructor,\n      index = -1,\n      proto = (isFunction(Ctor) && Ctor.prototype) || objectProto,\n      isProto = proto === object,\n      result = Array(length),\n      skipIndexes = length > 0,\n      skipErrorProps = support.enumErrorProps && (object === errorProto || object instanceof Error),\n      skipProto = support.enumPrototypes && isFunction(object);\n\n  while (++index < length) {\n    result[index] = (index + '');\n  }\n  // lodash skips the `constructor` property when it infers it's iterating\n  // over a `prototype` object because IE < 9 can't set the `[[Enumerable]]`\n  // attribute of an existing property and the `constructor` property of a\n  // prototype defaults to non-enumerable.\n  for (var key in object) {\n    if (!(skipProto && key == 'prototype') &&\n        !(skipErrorProps && (key == 'message' || key == 'name')) &&\n        !(skipIndexes && isIndex(key, length)) &&\n        !(key == 'constructor' && (isProto || !hasOwnProperty.call(object, key)))) {\n      result.push(key);\n    }\n  }\n  if (support.nonEnumShadows && object !== objectProto) {\n    var tag = object === stringProto ? stringTag : (object === errorProto ? errorTag : objToString.call(object)),\n        nonEnums = nonEnumProps[tag] || nonEnumProps[objectTag];\n\n    if (tag == objectTag) {\n      proto = objectProto;\n    }\n    length = shadowProps.length;\n    while (length--) {\n      key = shadowProps[length];\n      var nonEnum = nonEnums[key];\n      if (!(isProto && nonEnum) &&\n          (nonEnum ? hasOwnProperty.call(object, key) : object[key] !== proto[key])) {\n        result.push(key);\n      }\n    }\n  }\n  return result;\n}\n\nmodule.exports = keysIn;\n","var keys = require('./keys'),\n    toObject = require('../internal/toObject');\n\n/**\n * Creates a two dimensional array of the key-value pairs for `object`,\n * e.g. `[[key1, value1], [key2, value2]]`.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the new array of key-value pairs.\n * @example\n *\n * _.pairs({ 'barney': 36, 'fred': 40 });\n * // => [['barney', 36], ['fred', 40]] (iteration order is not guaranteed)\n */\nfunction pairs(object) {\n  object = toObject(object);\n\n  var index = -1,\n      props = keys(object),\n      length = props.length,\n      result = Array(length);\n\n  while (++index < length) {\n    var key = props[index];\n    result[index] = [key, object[key]];\n  }\n  return result;\n}\n\nmodule.exports = pairs;\n","var baseValues = require('../internal/baseValues'),\n    keys = require('./keys');\n\n/**\n * Creates an array of the own enumerable property values of `object`.\n *\n * **Note:** Non-object values are coerced to objects.\n *\n * @static\n * @memberOf _\n * @category Object\n * @param {Object} object The object to query.\n * @returns {Array} Returns the array of property values.\n * @example\n *\n * function Foo() {\n *   this.a = 1;\n *   this.b = 2;\n * }\n *\n * Foo.prototype.c = 3;\n *\n * _.values(new Foo);\n * // => [1, 2] (iteration order is not guaranteed)\n *\n * _.values('hi');\n * // => ['h', 'i']\n */\nfunction values(object) {\n  return baseValues(object, keys(object));\n}\n\nmodule.exports = values;\n","/** Used for native method references. */\nvar arrayProto = Array.prototype,\n    errorProto = Error.prototype,\n    objectProto = Object.prototype;\n\n/** Native method references. */\nvar propertyIsEnumerable = objectProto.propertyIsEnumerable,\n    splice = arrayProto.splice;\n\n/**\n * An object environment feature flags.\n *\n * @static\n * @memberOf _\n * @type Object\n */\nvar support = {};\n\n(function(x) {\n  var Ctor = function() { this.x = x; },\n      object = { '0': x, 'length': x },\n      props = [];\n\n  Ctor.prototype = { 'valueOf': x, 'y': x };\n  for (var key in new Ctor) { props.push(key); }\n\n  /**\n   * Detect if `name` or `message` properties of `Error.prototype` are\n   * enumerable by default (IE < 9, Safari < 5.1).\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.enumErrorProps = propertyIsEnumerable.call(errorProto, 'message') ||\n    propertyIsEnumerable.call(errorProto, 'name');\n\n  /**\n   * Detect if `prototype` properties are enumerable by default.\n   *\n   * Firefox < 3.6, Opera > 9.50 - Opera < 11.60, and Safari < 5.1\n   * (if the prototype or a property on the prototype has been set)\n   * incorrectly set the `[[Enumerable]]` value of a function's `prototype`\n   * property to `true`.\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.enumPrototypes = propertyIsEnumerable.call(Ctor, 'prototype');\n\n  /**\n   * Detect if properties shadowing those on `Object.prototype` are non-enumerable.\n   *\n   * In IE < 9 an object's own properties, shadowing non-enumerable ones,\n   * are made non-enumerable as well (a.k.a the JScript `[[DontEnum]]` bug).\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.nonEnumShadows = !/valueOf/.test(props);\n\n  /**\n   * Detect if own properties are iterated after inherited properties (IE < 9).\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.ownLast = props[0] != 'x';\n\n  /**\n   * Detect if `Array#shift` and `Array#splice` augment array-like objects\n   * correctly.\n   *\n   * Firefox < 10, compatibility modes of IE 8, and IE < 9 have buggy Array\n   * `shift()` and `splice()` functions that fail to remove the last element,\n   * `value[0]`, of array-like objects even though the \"length\" property is\n   * set to `0`. The `shift()` method is buggy in compatibility modes of IE 8,\n   * while `splice()` is buggy regardless of mode in IE < 9.\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.spliceObjects = (splice.call(object, 0, 1), !object[0]);\n\n  /**\n   * Detect lack of support for accessing string characters by index.\n   *\n   * IE < 8 can't access characters by index. IE 8 can only access characters\n   * by index on string literals, not string objects.\n   *\n   * @memberOf _.support\n   * @type boolean\n   */\n  support.unindexedChars = ('x'[0] + Object('x')[0]) != 'xx';\n}(1, 0));\n\nmodule.exports = support;\n","/**\n * This method returns the first argument provided to it.\n *\n * @static\n * @memberOf _\n * @category Utility\n * @param {*} value Any value.\n * @returns {*} Returns `value`.\n * @example\n *\n * var object = { 'user': 'fred' };\n *\n * _.identity(object) === object;\n * // => true\n */\nfunction identity(value) {\n  return value;\n}\n\nmodule.exports = identity;\n","/**\n * A no-operation function that returns `undefined` regardless of the\n * arguments it receives.\n *\n * @static\n * @memberOf _\n * @category Utility\n * @example\n *\n * var object = { 'user': 'fred' };\n *\n * _.noop(object) === undefined;\n * // => true\n */\nfunction noop() {\n  // No operation performed.\n}\n\nmodule.exports = noop;\n","var baseProperty = require('../internal/baseProperty'),\n    basePropertyDeep = require('../internal/basePropertyDeep'),\n    isKey = require('../internal/isKey');\n\n/**\n * Creates a function that returns the property value at `path` on a\n * given object.\n *\n * @static\n * @memberOf _\n * @category Utility\n * @param {Array|string} path The path of the property to get.\n * @returns {Function} Returns the new function.\n * @example\n *\n * var objects = [\n *   { 'a': { 'b': { 'c': 2 } } },\n *   { 'a': { 'b': { 'c': 1 } } }\n * ];\n *\n * _.map(objects, _.property('a.b.c'));\n * // => [2, 1]\n *\n * _.pluck(_.sortBy(objects, _.property(['a', 'b', 'c'])), 'a.b.c');\n * // => [1, 2]\n */\nfunction property(path) {\n  return isKey(path) ? baseProperty(path) : basePropertyDeep(path);\n}\n\nmodule.exports = property;\n","(function (process){\n// vim:ts=4:sts=4:sw=4:\n/*!\n *\n * Copyright 2009-2012 Kris Kowal under the terms of the MIT\n * license found at http://github.com/kriskowal/q/raw/master/LICENSE\n *\n * With parts by Tyler Close\n * Copyright 2007-2009 Tyler Close under the terms of the MIT X license found\n * at http://www.opensource.org/licenses/mit-license.html\n * Forked at ref_send.js version: 2009-05-11\n *\n * With parts by Mark Miller\n * Copyright (C) 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\n\n(function (definition) {\n    \"use strict\";\n\n    // This file will function properly as a <script> tag, or a module\n    // using CommonJS and NodeJS or RequireJS module formats.  In\n    // Common/Node/RequireJS, the module exports the Q API and when\n    // executed as a simple <script>, it creates a Q global instead.\n\n    // Montage Require\n    if (typeof bootstrap === \"function\") {\n        bootstrap(\"promise\", definition);\n\n    // CommonJS\n    } else if (typeof exports === \"object\" && typeof module === \"object\") {\n        module.exports = definition();\n\n    // RequireJS\n    } else if (typeof define === \"function\" && define.amd) {\n        define(definition);\n\n    // SES (Secure EcmaScript)\n    } else if (typeof ses !== \"undefined\") {\n        if (!ses.ok()) {\n            return;\n        } else {\n            ses.makeQ = definition;\n        }\n\n    // <script>\n    } else if (typeof window !== \"undefined\" || typeof self !== \"undefined\") {\n        // Prefer window over self for add-on scripts. Use self for\n        // non-windowed contexts.\n        var global = typeof window !== \"undefined\" ? window : self;\n\n        // Get the `window` object, save the previous Q global\n        // and initialize Q as a global.\n        var previousQ = global.Q;\n        global.Q = definition();\n\n        // Add a noConflict function so Q can be removed from the\n        // global namespace.\n        global.Q.noConflict = function () {\n            global.Q = previousQ;\n            return this;\n        };\n\n    } else {\n        throw new Error(\"This environment was not anticipated by Q. Please file a bug.\");\n    }\n\n})(function () {\n\"use strict\";\n\nvar hasStacks = false;\ntry {\n    throw new Error();\n} catch (e) {\n    hasStacks = !!e.stack;\n}\n\n// All code after this point will be filtered from stack traces reported\n// by Q.\nvar qStartingLine = captureLine();\nvar qFileName;\n\n// shims\n\n// used for fallback in \"allResolved\"\nvar noop = function () {};\n\n// Use the fastest possible means to execute a task in a future turn\n// of the event loop.\nvar nextTick =(function () {\n    // linked list of tasks (single, with head node)\n    var head = {task: void 0, next: null};\n    var tail = head;\n    var flushing = false;\n    var requestTick = void 0;\n    var isNodeJS = false;\n    // queue for late tasks, used by unhandled rejection tracking\n    var laterQueue = [];\n\n    function flush() {\n        /* jshint loopfunc: true */\n        var task, domain;\n\n        while (head.next) {\n            head = head.next;\n            task = head.task;\n            head.task = void 0;\n            domain = head.domain;\n\n            if (domain) {\n                head.domain = void 0;\n                domain.enter();\n            }\n            runSingle(task, domain);\n\n        }\n        while (laterQueue.length) {\n            task = laterQueue.pop();\n            runSingle(task);\n        }\n        flushing = false;\n    }\n    // runs a single function in the async queue\n    function runSingle(task, domain) {\n        try {\n            task();\n\n        } catch (e) {\n            if (isNodeJS) {\n                // In node, uncaught exceptions are considered fatal errors.\n                // Re-throw them synchronously to interrupt flushing!\n\n                // Ensure continuation if the uncaught exception is suppressed\n                // listening \"uncaughtException\" events (as domains does).\n                // Continue in next event to avoid tick recursion.\n                if (domain) {\n                    domain.exit();\n                }\n                setTimeout(flush, 0);\n                if (domain) {\n                    domain.enter();\n                }\n\n                throw e;\n\n            } else {\n                // In browsers, uncaught exceptions are not fatal.\n                // Re-throw them asynchronously to avoid slow-downs.\n                setTimeout(function () {\n                    throw e;\n                }, 0);\n            }\n        }\n\n        if (domain) {\n            domain.exit();\n        }\n    }\n\n    nextTick = function (task) {\n        tail = tail.next = {\n            task: task,\n            domain: isNodeJS && process.domain,\n            next: null\n        };\n\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n\n    if (typeof process === \"object\" &&\n        process.toString() === \"[object process]\" && process.nextTick) {\n        // Ensure Q is in a real Node environment, with a `process.nextTick`.\n        // To see through fake Node environments:\n        // * Mocha test runner - exposes a `process` global without a `nextTick`\n        // * Browserify - exposes a `process.nexTick` function that uses\n        //   `setTimeout`. In this case `setImmediate` is preferred because\n        //    it is faster. Browserify's `process.toString()` yields\n        //   \"[object Object]\", while in a real Node environment\n        //   `process.nextTick()` yields \"[object process]\".\n        isNodeJS = true;\n\n        requestTick = function () {\n            process.nextTick(flush);\n        };\n\n    } else if (typeof setImmediate === \"function\") {\n        // In IE10, Node.js 0.9+, or https://github.com/NobleJS/setImmediate\n        if (typeof window !== \"undefined\") {\n            requestTick = setImmediate.bind(window, flush);\n        } else {\n            requestTick = function () {\n                setImmediate(flush);\n            };\n        }\n\n    } else if (typeof MessageChannel !== \"undefined\") {\n        // modern browsers\n        // http://www.nonblocking.io/2011/06/windownexttick.html\n        var channel = new MessageChannel();\n        // At least Safari Version 6.0.5 (8536.30.1) intermittently cannot create\n        // working message ports the first time a page loads.\n        channel.port1.onmessage = function () {\n            requestTick = requestPortTick;\n            channel.port1.onmessage = flush;\n            flush();\n        };\n        var requestPortTick = function () {\n            // Opera requires us to provide a message payload, regardless of\n            // whether we use it.\n            channel.port2.postMessage(0);\n        };\n        requestTick = function () {\n            setTimeout(flush, 0);\n            requestPortTick();\n        };\n\n    } else {\n        // old browsers\n        requestTick = function () {\n            setTimeout(flush, 0);\n        };\n    }\n    // runs a task after all other tasks have been run\n    // this is useful for unhandled rejection tracking that needs to happen\n    // after all `then`d tasks have been run.\n    nextTick.runAfter = function (task) {\n        laterQueue.push(task);\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n    return nextTick;\n})();\n\n// Attempt to make generics safe in the face of downstream\n// modifications.\n// There is no situation where this is necessary.\n// If you need a security guarantee, these primordials need to be\n// deeply frozen anyway, and if you don’t need a security guarantee,\n// this is just plain paranoid.\n// However, this **might** have the nice side-effect of reducing the size of\n// the minified code by reducing x.call() to merely x()\n// See Mark Miller’s explanation of what this does.\n// http://wiki.ecmascript.org/doku.php?id=conventions:safe_meta_programming\nvar call = Function.call;\nfunction uncurryThis(f) {\n    return function () {\n        return call.apply(f, arguments);\n    };\n}\n// This is equivalent, but slower:\n// uncurryThis = Function_bind.bind(Function_bind.call);\n// http://jsperf.com/uncurrythis\n\nvar array_slice = uncurryThis(Array.prototype.slice);\n\nvar array_reduce = uncurryThis(\n    Array.prototype.reduce || function (callback, basis) {\n        var index = 0,\n            length = this.length;\n        // concerning the initial value, if one is not provided\n        if (arguments.length === 1) {\n            // seek to the first value in the array, accounting\n            // for the possibility that is is a sparse array\n            do {\n                if (index in this) {\n                    basis = this[index++];\n                    break;\n                }\n                if (++index >= length) {\n                    throw new TypeError();\n                }\n            } while (1);\n        }\n        // reduce\n        for (; index < length; index++) {\n            // account for the possibility that the array is sparse\n            if (index in this) {\n                basis = callback(basis, this[index], index);\n            }\n        }\n        return basis;\n    }\n);\n\nvar array_indexOf = uncurryThis(\n    Array.prototype.indexOf || function (value) {\n        // not a very good shim, but good enough for our one use of it\n        for (var i = 0; i < this.length; i++) {\n            if (this[i] === value) {\n                return i;\n            }\n        }\n        return -1;\n    }\n);\n\nvar array_map = uncurryThis(\n    Array.prototype.map || function (callback, thisp) {\n        var self = this;\n        var collect = [];\n        array_reduce(self, function (undefined, value, index) {\n            collect.push(callback.call(thisp, value, index, self));\n        }, void 0);\n        return collect;\n    }\n);\n\nvar object_create = Object.create || function (prototype) {\n    function Type() { }\n    Type.prototype = prototype;\n    return new Type();\n};\n\nvar object_hasOwnProperty = uncurryThis(Object.prototype.hasOwnProperty);\n\nvar object_keys = Object.keys || function (object) {\n    var keys = [];\n    for (var key in object) {\n        if (object_hasOwnProperty(object, key)) {\n            keys.push(key);\n        }\n    }\n    return keys;\n};\n\nvar object_toString = uncurryThis(Object.prototype.toString);\n\nfunction isObject(value) {\n    return value === Object(value);\n}\n\n// generator related shims\n\n// FIXME: Remove this function once ES6 generators are in SpiderMonkey.\nfunction isStopIteration(exception) {\n    return (\n        object_toString(exception) === \"[object StopIteration]\" ||\n        exception instanceof QReturnValue\n    );\n}\n\n// FIXME: Remove this helper and Q.return once ES6 generators are in\n// SpiderMonkey.\nvar QReturnValue;\nif (typeof ReturnValue !== \"undefined\") {\n    QReturnValue = ReturnValue;\n} else {\n    QReturnValue = function (value) {\n        this.value = value;\n    };\n}\n\n// long stack traces\n\nvar STACK_JUMP_SEPARATOR = \"From previous event:\";\n\nfunction makeStackTraceLong(error, promise) {\n    // If possible, transform the error stack trace by removing Node and Q\n    // cruft, then concatenating with the stack trace of `promise`. See #57.\n    if (hasStacks &&\n        promise.stack &&\n        typeof error === \"object\" &&\n        error !== null &&\n        error.stack &&\n        error.stack.indexOf(STACK_JUMP_SEPARATOR) === -1\n    ) {\n        var stacks = [];\n        for (var p = promise; !!p; p = p.source) {\n            if (p.stack) {\n                stacks.unshift(p.stack);\n            }\n        }\n        stacks.unshift(error.stack);\n\n        var concatedStacks = stacks.join(\"\\n\" + STACK_JUMP_SEPARATOR + \"\\n\");\n        error.stack = filterStackString(concatedStacks);\n    }\n}\n\nfunction filterStackString(stackString) {\n    var lines = stackString.split(\"\\n\");\n    var desiredLines = [];\n    for (var i = 0; i < lines.length; ++i) {\n        var line = lines[i];\n\n        if (!isInternalFrame(line) && !isNodeFrame(line) && line) {\n            desiredLines.push(line);\n        }\n    }\n    return desiredLines.join(\"\\n\");\n}\n\nfunction isNodeFrame(stackLine) {\n    return stackLine.indexOf(\"(module.js:\") !== -1 ||\n           stackLine.indexOf(\"(node.js:\") !== -1;\n}\n\nfunction getFileNameAndLineNumber(stackLine) {\n    // Named functions: \"at functionName (filename:lineNumber:columnNumber)\"\n    // In IE10 function name can have spaces (\"Anonymous function\") O_o\n    var attempt1 = /at .+ \\((.+):(\\d+):(?:\\d+)\\)$/.exec(stackLine);\n    if (attempt1) {\n        return [attempt1[1], Number(attempt1[2])];\n    }\n\n    // Anonymous functions: \"at filename:lineNumber:columnNumber\"\n    var attempt2 = /at ([^ ]+):(\\d+):(?:\\d+)$/.exec(stackLine);\n    if (attempt2) {\n        return [attempt2[1], Number(attempt2[2])];\n    }\n\n    // Firefox style: \"function@filename:lineNumber or @filename:lineNumber\"\n    var attempt3 = /.*@(.+):(\\d+)$/.exec(stackLine);\n    if (attempt3) {\n        return [attempt3[1], Number(attempt3[2])];\n    }\n}\n\nfunction isInternalFrame(stackLine) {\n    var fileNameAndLineNumber = getFileNameAndLineNumber(stackLine);\n\n    if (!fileNameAndLineNumber) {\n        return false;\n    }\n\n    var fileName = fileNameAndLineNumber[0];\n    var lineNumber = fileNameAndLineNumber[1];\n\n    return fileName === qFileName &&\n        lineNumber >= qStartingLine &&\n        lineNumber <= qEndingLine;\n}\n\n// discover own file name and line number range for filtering stack\n// traces\nfunction captureLine() {\n    if (!hasStacks) {\n        return;\n    }\n\n    try {\n        throw new Error();\n    } catch (e) {\n        var lines = e.stack.split(\"\\n\");\n        var firstLine = lines[0].indexOf(\"@\") > 0 ? lines[1] : lines[2];\n        var fileNameAndLineNumber = getFileNameAndLineNumber(firstLine);\n        if (!fileNameAndLineNumber) {\n            return;\n        }\n\n        qFileName = fileNameAndLineNumber[0];\n        return fileNameAndLineNumber[1];\n    }\n}\n\nfunction deprecate(callback, name, alternative) {\n    return function () {\n        if (typeof console !== \"undefined\" &&\n            typeof console.warn === \"function\") {\n            console.warn(name + \" is deprecated, use \" + alternative +\n                         \" instead.\", new Error(\"\").stack);\n        }\n        return callback.apply(callback, arguments);\n    };\n}\n\n// end of shims\n// beginning of real work\n\n/**\n * Constructs a promise for an immediate reference, passes promises through, or\n * coerces promises from different systems.\n * @param value immediate reference or promise\n */\nfunction Q(value) {\n    // If the object is already a Promise, return it directly.  This enables\n    // the resolve function to both be used to created references from objects,\n    // but to tolerably coerce non-promises to promises.\n    if (value instanceof Promise) {\n        return value;\n    }\n\n    // assimilate thenables\n    if (isPromiseAlike(value)) {\n        return coerce(value);\n    } else {\n        return fulfill(value);\n    }\n}\nQ.resolve = Q;\n\n/**\n * Performs a task in a future turn of the event loop.\n * @param {Function} task\n */\nQ.nextTick = nextTick;\n\n/**\n * Controls whether or not long stack traces will be on\n */\nQ.longStackSupport = false;\n\n// enable long stacks if Q_DEBUG is set\nif (typeof process === \"object\" && process && process.env && process.env.Q_DEBUG) {\n    Q.longStackSupport = true;\n}\n\n/**\n * Constructs a {promise, resolve, reject} object.\n *\n * `resolve` is a callback to invoke with a more resolved value for the\n * promise. To fulfill the promise, invoke `resolve` with any value that is\n * not a thenable. To reject the promise, invoke `resolve` with a rejected\n * thenable, or invoke `reject` with the reason directly. To resolve the\n * promise to another thenable, thus putting it in the same state, invoke\n * `resolve` with that other thenable.\n */\nQ.defer = defer;\nfunction defer() {\n    // if \"messages\" is an \"Array\", that indicates that the promise has not yet\n    // been resolved.  If it is \"undefined\", it has been resolved.  Each\n    // element of the messages array is itself an array of complete arguments to\n    // forward to the resolved promise.  We coerce the resolution value to a\n    // promise using the `resolve` function because it handles both fully\n    // non-thenable values and other thenables gracefully.\n    var messages = [], progressListeners = [], resolvedPromise;\n\n    var deferred = object_create(defer.prototype);\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, operands) {\n        var args = array_slice(arguments);\n        if (messages) {\n            messages.push(args);\n            if (op === \"when\" && operands[1]) { // progress operand\n                progressListeners.push(operands[1]);\n            }\n        } else {\n            Q.nextTick(function () {\n                resolvedPromise.promiseDispatch.apply(resolvedPromise, args);\n            });\n        }\n    };\n\n    // XXX deprecated\n    promise.valueOf = function () {\n        if (messages) {\n            return promise;\n        }\n        var nearerValue = nearer(resolvedPromise);\n        if (isPromise(nearerValue)) {\n            resolvedPromise = nearerValue; // shorten chain\n        }\n        return nearerValue;\n    };\n\n    promise.inspect = function () {\n        if (!resolvedPromise) {\n            return { state: \"pending\" };\n        }\n        return resolvedPromise.inspect();\n    };\n\n    if (Q.longStackSupport && hasStacks) {\n        try {\n            throw new Error();\n        } catch (e) {\n            // NOTE: don't try to use `Error.captureStackTrace` or transfer the\n            // accessor around; that causes memory leaks as per GH-111. Just\n            // reify the stack trace as a string ASAP.\n            //\n            // At the same time, cut off the first line; it's always just\n            // \"[object Promise]\\n\", as per the `toString`.\n            promise.stack = e.stack.substring(e.stack.indexOf(\"\\n\") + 1);\n        }\n    }\n\n    // NOTE: we do the checks for `resolvedPromise` in each method, instead of\n    // consolidating them into `become`, since otherwise we'd create new\n    // promises with the lines `become(whatever(value))`. See e.g. GH-252.\n\n    function become(newPromise) {\n        resolvedPromise = newPromise;\n        promise.source = newPromise;\n\n        array_reduce(messages, function (undefined, message) {\n            Q.nextTick(function () {\n                newPromise.promiseDispatch.apply(newPromise, message);\n            });\n        }, void 0);\n\n        messages = void 0;\n        progressListeners = void 0;\n    }\n\n    deferred.promise = promise;\n    deferred.resolve = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(Q(value));\n    };\n\n    deferred.fulfill = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(fulfill(value));\n    };\n    deferred.reject = function (reason) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(reject(reason));\n    };\n    deferred.notify = function (progress) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        array_reduce(progressListeners, function (undefined, progressListener) {\n            Q.nextTick(function () {\n                progressListener(progress);\n            });\n        }, void 0);\n    };\n\n    return deferred;\n}\n\n/**\n * Creates a Node-style callback that will resolve or reject the deferred\n * promise.\n * @returns a nodeback\n */\ndefer.prototype.makeNodeResolver = function () {\n    var self = this;\n    return function (error, value) {\n        if (error) {\n            self.reject(error);\n        } else if (arguments.length > 2) {\n            self.resolve(array_slice(arguments, 1));\n        } else {\n            self.resolve(value);\n        }\n    };\n};\n\n/**\n * @param resolver {Function} a function that returns nothing and accepts\n * the resolve, reject, and notify functions for a deferred.\n * @returns a promise that may be resolved with the given resolve and reject\n * functions, or rejected by a thrown exception in resolver\n */\nQ.Promise = promise; // ES6\nQ.promise = promise;\nfunction promise(resolver) {\n    if (typeof resolver !== \"function\") {\n        throw new TypeError(\"resolver must be a function.\");\n    }\n    var deferred = defer();\n    try {\n        resolver(deferred.resolve, deferred.reject, deferred.notify);\n    } catch (reason) {\n        deferred.reject(reason);\n    }\n    return deferred.promise;\n}\n\npromise.race = race; // ES6\npromise.all = all; // ES6\npromise.reject = reject; // ES6\npromise.resolve = Q; // ES6\n\n// XXX experimental.  This method is a way to denote that a local value is\n// serializable and should be immediately dispatched to a remote upon request,\n// instead of passing a reference.\nQ.passByCopy = function (object) {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return object;\n};\n\nPromise.prototype.passByCopy = function () {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return this;\n};\n\n/**\n * If two promises eventually fulfill to the same value, promises that value,\n * but otherwise rejects.\n * @param x {Any*}\n * @param y {Any*}\n * @returns {Any*} a promise for x and y if they are the same, but a rejection\n * otherwise.\n *\n */\nQ.join = function (x, y) {\n    return Q(x).join(y);\n};\n\nPromise.prototype.join = function (that) {\n    return Q([this, that]).spread(function (x, y) {\n        if (x === y) {\n            // TODO: \"===\" should be Object.is or equiv\n            return x;\n        } else {\n            throw new Error(\"Can't join: not the same: \" + x + \" \" + y);\n        }\n    });\n};\n\n/**\n * Returns a promise for the first of an array of promises to become settled.\n * @param answers {Array[Any*]} promises to race\n * @returns {Any*} the first promise to be settled\n */\nQ.race = race;\nfunction race(answerPs) {\n    return promise(function (resolve, reject) {\n        // Switch to this once we can assume at least ES5\n        // answerPs.forEach(function (answerP) {\n        //     Q(answerP).then(resolve, reject);\n        // });\n        // Use this in the meantime\n        for (var i = 0, len = answerPs.length; i < len; i++) {\n            Q(answerPs[i]).then(resolve, reject);\n        }\n    });\n}\n\nPromise.prototype.race = function () {\n    return this.then(Q.race);\n};\n\n/**\n * Constructs a Promise with a promise descriptor object and optional fallback\n * function.  The descriptor contains methods like when(rejected), get(name),\n * set(name, value), post(name, args), and delete(name), which all\n * return either a value, a promise for a value, or a rejection.  The fallback\n * accepts the operation name, a resolver, and any further arguments that would\n * have been forwarded to the appropriate method above had a method been\n * provided with the proper name.  The API makes no guarantees about the nature\n * of the returned object, apart from that it is usable whereever promises are\n * bought and sold.\n */\nQ.makePromise = Promise;\nfunction Promise(descriptor, fallback, inspect) {\n    if (fallback === void 0) {\n        fallback = function (op) {\n            return reject(new Error(\n                \"Promise does not support operation: \" + op\n            ));\n        };\n    }\n    if (inspect === void 0) {\n        inspect = function () {\n            return {state: \"unknown\"};\n        };\n    }\n\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, args) {\n        var result;\n        try {\n            if (descriptor[op]) {\n                result = descriptor[op].apply(promise, args);\n            } else {\n                result = fallback.call(promise, op, args);\n            }\n        } catch (exception) {\n            result = reject(exception);\n        }\n        if (resolve) {\n            resolve(result);\n        }\n    };\n\n    promise.inspect = inspect;\n\n    // XXX deprecated `valueOf` and `exception` support\n    if (inspect) {\n        var inspected = inspect();\n        if (inspected.state === \"rejected\") {\n            promise.exception = inspected.reason;\n        }\n\n        promise.valueOf = function () {\n            var inspected = inspect();\n            if (inspected.state === \"pending\" ||\n                inspected.state === \"rejected\") {\n                return promise;\n            }\n            return inspected.value;\n        };\n    }\n\n    return promise;\n}\n\nPromise.prototype.toString = function () {\n    return \"[object Promise]\";\n};\n\nPromise.prototype.then = function (fulfilled, rejected, progressed) {\n    var self = this;\n    var deferred = defer();\n    var done = false;   // ensure the untrusted promise makes at most a\n                        // single call to one of the callbacks\n\n    function _fulfilled(value) {\n        try {\n            return typeof fulfilled === \"function\" ? fulfilled(value) : value;\n        } catch (exception) {\n            return reject(exception);\n        }\n    }\n\n    function _rejected(exception) {\n        if (typeof rejected === \"function\") {\n            makeStackTraceLong(exception, self);\n            try {\n                return rejected(exception);\n            } catch (newException) {\n                return reject(newException);\n            }\n        }\n        return reject(exception);\n    }\n\n    function _progressed(value) {\n        return typeof progressed === \"function\" ? progressed(value) : value;\n    }\n\n    Q.nextTick(function () {\n        self.promiseDispatch(function (value) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_fulfilled(value));\n        }, \"when\", [function (exception) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_rejected(exception));\n        }]);\n    });\n\n    // Progress propagator need to be attached in the current tick.\n    self.promiseDispatch(void 0, \"when\", [void 0, function (value) {\n        var newValue;\n        var threw = false;\n        try {\n            newValue = _progressed(value);\n        } catch (e) {\n            threw = true;\n            if (Q.onerror) {\n                Q.onerror(e);\n            } else {\n                throw e;\n            }\n        }\n\n        if (!threw) {\n            deferred.notify(newValue);\n        }\n    }]);\n\n    return deferred.promise;\n};\n\nQ.tap = function (promise, callback) {\n    return Q(promise).tap(callback);\n};\n\n/**\n * Works almost like \"finally\", but not called for rejections.\n * Original resolution value is passed through callback unaffected.\n * Callback may return a promise that will be awaited for.\n * @param {Function} callback\n * @returns {Q.Promise}\n * @example\n * doSomething()\n *   .then(...)\n *   .tap(console.log)\n *   .then(...);\n */\nPromise.prototype.tap = function (callback) {\n    callback = Q(callback);\n\n    return this.then(function (value) {\n        return callback.fcall(value).thenResolve(value);\n    });\n};\n\n/**\n * Registers an observer on a promise.\n *\n * Guarantees:\n *\n * 1. that fulfilled and rejected will be called only once.\n * 2. that either the fulfilled callback or the rejected callback will be\n *    called, but not both.\n * 3. that fulfilled and rejected will not be called in this turn.\n *\n * @param value      promise or immediate reference to observe\n * @param fulfilled  function to be called with the fulfilled value\n * @param rejected   function to be called with the rejection exception\n * @param progressed function to be called on any progress notifications\n * @return promise for the return value from the invoked callback\n */\nQ.when = when;\nfunction when(value, fulfilled, rejected, progressed) {\n    return Q(value).then(fulfilled, rejected, progressed);\n}\n\nPromise.prototype.thenResolve = function (value) {\n    return this.then(function () { return value; });\n};\n\nQ.thenResolve = function (promise, value) {\n    return Q(promise).thenResolve(value);\n};\n\nPromise.prototype.thenReject = function (reason) {\n    return this.then(function () { throw reason; });\n};\n\nQ.thenReject = function (promise, reason) {\n    return Q(promise).thenReject(reason);\n};\n\n/**\n * If an object is not a promise, it is as \"near\" as possible.\n * If a promise is rejected, it is as \"near\" as possible too.\n * If it’s a fulfilled promise, the fulfillment value is nearer.\n * If it’s a deferred promise and the deferred has been resolved, the\n * resolution is \"nearer\".\n * @param object\n * @returns most resolved (nearest) form of the object\n */\n\n// XXX should we re-do this?\nQ.nearer = nearer;\nfunction nearer(value) {\n    if (isPromise(value)) {\n        var inspected = value.inspect();\n        if (inspected.state === \"fulfilled\") {\n            return inspected.value;\n        }\n    }\n    return value;\n}\n\n/**\n * @returns whether the given object is a promise.\n * Otherwise it is a fulfilled value.\n */\nQ.isPromise = isPromise;\nfunction isPromise(object) {\n    return object instanceof Promise;\n}\n\nQ.isPromiseAlike = isPromiseAlike;\nfunction isPromiseAlike(object) {\n    return isObject(object) && typeof object.then === \"function\";\n}\n\n/**\n * @returns whether the given object is a pending promise, meaning not\n * fulfilled or rejected.\n */\nQ.isPending = isPending;\nfunction isPending(object) {\n    return isPromise(object) && object.inspect().state === \"pending\";\n}\n\nPromise.prototype.isPending = function () {\n    return this.inspect().state === \"pending\";\n};\n\n/**\n * @returns whether the given object is a value or fulfilled\n * promise.\n */\nQ.isFulfilled = isFulfilled;\nfunction isFulfilled(object) {\n    return !isPromise(object) || object.inspect().state === \"fulfilled\";\n}\n\nPromise.prototype.isFulfilled = function () {\n    return this.inspect().state === \"fulfilled\";\n};\n\n/**\n * @returns whether the given object is a rejected promise.\n */\nQ.isRejected = isRejected;\nfunction isRejected(object) {\n    return isPromise(object) && object.inspect().state === \"rejected\";\n}\n\nPromise.prototype.isRejected = function () {\n    return this.inspect().state === \"rejected\";\n};\n\n//// BEGIN UNHANDLED REJECTION TRACKING\n\n// This promise library consumes exceptions thrown in handlers so they can be\n// handled by a subsequent promise.  The exceptions get added to this array when\n// they are created, and removed when they are handled.  Note that in ES6 or\n// shimmed environments, this would naturally be a `Set`.\nvar unhandledReasons = [];\nvar unhandledRejections = [];\nvar reportedUnhandledRejections = [];\nvar trackUnhandledRejections = true;\n\nfunction resetUnhandledRejections() {\n    unhandledReasons.length = 0;\n    unhandledRejections.length = 0;\n\n    if (!trackUnhandledRejections) {\n        trackUnhandledRejections = true;\n    }\n}\n\nfunction trackRejection(promise, reason) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n    if (typeof process === \"object\" && typeof process.emit === \"function\") {\n        Q.nextTick.runAfter(function () {\n            if (array_indexOf(unhandledRejections, promise) !== -1) {\n                process.emit(\"unhandledRejection\", reason, promise);\n                reportedUnhandledRejections.push(promise);\n            }\n        });\n    }\n\n    unhandledRejections.push(promise);\n    if (reason && typeof reason.stack !== \"undefined\") {\n        unhandledReasons.push(reason.stack);\n    } else {\n        unhandledReasons.push(\"(no stack) \" + reason);\n    }\n}\n\nfunction untrackRejection(promise) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n\n    var at = array_indexOf(unhandledRejections, promise);\n    if (at !== -1) {\n        if (typeof process === \"object\" && typeof process.emit === \"function\") {\n            Q.nextTick.runAfter(function () {\n                var atReport = array_indexOf(reportedUnhandledRejections, promise);\n                if (atReport !== -1) {\n                    process.emit(\"rejectionHandled\", unhandledReasons[at], promise);\n                    reportedUnhandledRejections.splice(atReport, 1);\n                }\n            });\n        }\n        unhandledRejections.splice(at, 1);\n        unhandledReasons.splice(at, 1);\n    }\n}\n\nQ.resetUnhandledRejections = resetUnhandledRejections;\n\nQ.getUnhandledReasons = function () {\n    // Make a copy so that consumers can't interfere with our internal state.\n    return unhandledReasons.slice();\n};\n\nQ.stopUnhandledRejectionTracking = function () {\n    resetUnhandledRejections();\n    trackUnhandledRejections = false;\n};\n\nresetUnhandledRejections();\n\n//// END UNHANDLED REJECTION TRACKING\n\n/**\n * Constructs a rejected promise.\n * @param reason value describing the failure\n */\nQ.reject = reject;\nfunction reject(reason) {\n    var rejection = Promise({\n        \"when\": function (rejected) {\n            // note that the error has been handled\n            if (rejected) {\n                untrackRejection(this);\n            }\n            return rejected ? rejected(reason) : this;\n        }\n    }, function fallback() {\n        return this;\n    }, function inspect() {\n        return { state: \"rejected\", reason: reason };\n    });\n\n    // Note that the reason has not been handled.\n    trackRejection(rejection, reason);\n\n    return rejection;\n}\n\n/**\n * Constructs a fulfilled promise for an immediate reference.\n * @param value immediate reference\n */\nQ.fulfill = fulfill;\nfunction fulfill(value) {\n    return Promise({\n        \"when\": function () {\n            return value;\n        },\n        \"get\": function (name) {\n            return value[name];\n        },\n        \"set\": function (name, rhs) {\n            value[name] = rhs;\n        },\n        \"delete\": function (name) {\n            delete value[name];\n        },\n        \"post\": function (name, args) {\n            // Mark Miller proposes that post with no name should apply a\n            // promised function.\n            if (name === null || name === void 0) {\n                return value.apply(void 0, args);\n            } else {\n                return value[name].apply(value, args);\n            }\n        },\n        \"apply\": function (thisp, args) {\n            return value.apply(thisp, args);\n        },\n        \"keys\": function () {\n            return object_keys(value);\n        }\n    }, void 0, function inspect() {\n        return { state: \"fulfilled\", value: value };\n    });\n}\n\n/**\n * Converts thenables to Q promises.\n * @param promise thenable promise\n * @returns a Q promise\n */\nfunction coerce(promise) {\n    var deferred = defer();\n    Q.nextTick(function () {\n        try {\n            promise.then(deferred.resolve, deferred.reject, deferred.notify);\n        } catch (exception) {\n            deferred.reject(exception);\n        }\n    });\n    return deferred.promise;\n}\n\n/**\n * Annotates an object such that it will never be\n * transferred away from this process over any promise\n * communication channel.\n * @param object\n * @returns promise a wrapping of that object that\n * additionally responds to the \"isDef\" message\n * without a rejection.\n */\nQ.master = master;\nfunction master(object) {\n    return Promise({\n        \"isDef\": function () {}\n    }, function fallback(op, args) {\n        return dispatch(object, op, args);\n    }, function () {\n        return Q(object).inspect();\n    });\n}\n\n/**\n * Spreads the values of a promised array of arguments into the\n * fulfillment callback.\n * @param fulfilled callback that receives variadic arguments from the\n * promised array\n * @param rejected callback that receives the exception if the promise\n * is rejected.\n * @returns a promise for the return value or thrown exception of\n * either callback.\n */\nQ.spread = spread;\nfunction spread(value, fulfilled, rejected) {\n    return Q(value).spread(fulfilled, rejected);\n}\n\nPromise.prototype.spread = function (fulfilled, rejected) {\n    return this.all().then(function (array) {\n        return fulfilled.apply(void 0, array);\n    }, rejected);\n};\n\n/**\n * The async function is a decorator for generator functions, turning\n * them into asynchronous generators.  Although generators are only part\n * of the newest ECMAScript 6 drafts, this code does not cause syntax\n * errors in older engines.  This code should continue to work and will\n * in fact improve over time as the language improves.\n *\n * ES6 generators are currently part of V8 version 3.19 with the\n * --harmony-generators runtime flag enabled.  SpiderMonkey has had them\n * for longer, but under an older Python-inspired form.  This function\n * works on both kinds of generators.\n *\n * Decorates a generator function such that:\n *  - it may yield promises\n *  - execution will continue when that promise is fulfilled\n *  - the value of the yield expression will be the fulfilled value\n *  - it returns a promise for the return value (when the generator\n *    stops iterating)\n *  - the decorated function returns a promise for the return value\n *    of the generator or the first rejected promise among those\n *    yielded.\n *  - if an error is thrown in the generator, it propagates through\n *    every following yield until it is caught, or until it escapes\n *    the generator function altogether, and is translated into a\n *    rejection for the promise returned by the decorated generator.\n */\nQ.async = async;\nfunction async(makeGenerator) {\n    return function () {\n        // when verb is \"send\", arg is a value\n        // when verb is \"throw\", arg is an exception\n        function continuer(verb, arg) {\n            var result;\n\n            // Until V8 3.19 / Chromium 29 is released, SpiderMonkey is the only\n            // engine that has a deployed base of browsers that support generators.\n            // However, SM's generators use the Python-inspired semantics of\n            // outdated ES6 drafts.  We would like to support ES6, but we'd also\n            // like to make it possible to use generators in deployed browsers, so\n            // we also support Python-style generators.  At some point we can remove\n            // this block.\n\n            if (typeof StopIteration === \"undefined\") {\n                // ES6 Generators\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    return reject(exception);\n                }\n                if (result.done) {\n                    return Q(result.value);\n                } else {\n                    return when(result.value, callback, errback);\n                }\n            } else {\n                // SpiderMonkey Generators\n                // FIXME: Remove this case when SM does ES6 generators.\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    if (isStopIteration(exception)) {\n                        return Q(exception.value);\n                    } else {\n                        return reject(exception);\n                    }\n                }\n                return when(result, callback, errback);\n            }\n        }\n        var generator = makeGenerator.apply(this, arguments);\n        var callback = continuer.bind(continuer, \"next\");\n        var errback = continuer.bind(continuer, \"throw\");\n        return callback();\n    };\n}\n\n/**\n * The spawn function is a small wrapper around async that immediately\n * calls the generator and also ends the promise chain, so that any\n * unhandled errors are thrown instead of forwarded to the error\n * handler. This is useful because it's extremely common to run\n * generators at the top-level to work with libraries.\n */\nQ.spawn = spawn;\nfunction spawn(makeGenerator) {\n    Q.done(Q.async(makeGenerator)());\n}\n\n// FIXME: Remove this interface once ES6 generators are in SpiderMonkey.\n/**\n * Throws a ReturnValue exception to stop an asynchronous generator.\n *\n * This interface is a stop-gap measure to support generator return\n * values in older Firefox/SpiderMonkey.  In browsers that support ES6\n * generators like Chromium 29, just use \"return\" in your generator\n * functions.\n *\n * @param value the return value for the surrounding generator\n * @throws ReturnValue exception with the value.\n * @example\n * // ES6 style\n * Q.async(function* () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      return foo + bar;\n * })\n * // Older SpiderMonkey style\n * Q.async(function () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      Q.return(foo + bar);\n * })\n */\nQ[\"return\"] = _return;\nfunction _return(value) {\n    throw new QReturnValue(value);\n}\n\n/**\n * The promised function decorator ensures that any promise arguments\n * are settled and passed as values (`this` is also settled and passed\n * as a value).  It will also ensure that the result of a function is\n * always a promise.\n *\n * @example\n * var add = Q.promised(function (a, b) {\n *     return a + b;\n * });\n * add(Q(a), Q(B));\n *\n * @param {function} callback The function to decorate\n * @returns {function} a function that has been decorated.\n */\nQ.promised = promised;\nfunction promised(callback) {\n    return function () {\n        return spread([this, all(arguments)], function (self, args) {\n            return callback.apply(self, args);\n        });\n    };\n}\n\n/**\n * sends a message to a value in a future turn\n * @param object* the recipient\n * @param op the name of the message operation, e.g., \"when\",\n * @param args further arguments to be forwarded to the operation\n * @returns result {Promise} a promise for the result of the operation\n */\nQ.dispatch = dispatch;\nfunction dispatch(object, op, args) {\n    return Q(object).dispatch(op, args);\n}\n\nPromise.prototype.dispatch = function (op, args) {\n    var self = this;\n    var deferred = defer();\n    Q.nextTick(function () {\n        self.promiseDispatch(deferred.resolve, op, args);\n    });\n    return deferred.promise;\n};\n\n/**\n * Gets the value of a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to get\n * @return promise for the property value\n */\nQ.get = function (object, key) {\n    return Q(object).dispatch(\"get\", [key]);\n};\n\nPromise.prototype.get = function (key) {\n    return this.dispatch(\"get\", [key]);\n};\n\n/**\n * Sets the value of a property in a future turn.\n * @param object    promise or immediate reference for object object\n * @param name      name of property to set\n * @param value     new value of property\n * @return promise for the return value\n */\nQ.set = function (object, key, value) {\n    return Q(object).dispatch(\"set\", [key, value]);\n};\n\nPromise.prototype.set = function (key, value) {\n    return this.dispatch(\"set\", [key, value]);\n};\n\n/**\n * Deletes a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to delete\n * @return promise for the return value\n */\nQ.del = // XXX legacy\nQ[\"delete\"] = function (object, key) {\n    return Q(object).dispatch(\"delete\", [key]);\n};\n\nPromise.prototype.del = // XXX legacy\nPromise.prototype[\"delete\"] = function (key) {\n    return this.dispatch(\"delete\", [key]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param value     a value to post, typically an array of\n *                  invocation arguments for promises that\n *                  are ultimately backed with `resolve` values,\n *                  as opposed to those backed with URLs\n *                  wherein the posted value can be any\n *                  JSON serializable object.\n * @return promise for the return value\n */\n// bound locally because it is used by other methods\nQ.mapply = // XXX As proposed by \"Redsandro\"\nQ.post = function (object, name, args) {\n    return Q(object).dispatch(\"post\", [name, args]);\n};\n\nPromise.prototype.mapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.post = function (name, args) {\n    return this.dispatch(\"post\", [name, args]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param ...args   array of invocation arguments\n * @return promise for the return value\n */\nQ.send = // XXX Mark Miller's proposed parlance\nQ.mcall = // XXX As proposed by \"Redsandro\"\nQ.invoke = function (object, name /*...args*/) {\n    return Q(object).dispatch(\"post\", [name, array_slice(arguments, 2)]);\n};\n\nPromise.prototype.send = // XXX Mark Miller's proposed parlance\nPromise.prototype.mcall = // XXX As proposed by \"Redsandro\"\nPromise.prototype.invoke = function (name /*...args*/) {\n    return this.dispatch(\"post\", [name, array_slice(arguments, 1)]);\n};\n\n/**\n * Applies the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param args      array of application arguments\n */\nQ.fapply = function (object, args) {\n    return Q(object).dispatch(\"apply\", [void 0, args]);\n};\n\nPromise.prototype.fapply = function (args) {\n    return this.dispatch(\"apply\", [void 0, args]);\n};\n\n/**\n * Calls the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ[\"try\"] =\nQ.fcall = function (object /* ...args*/) {\n    return Q(object).dispatch(\"apply\", [void 0, array_slice(arguments, 1)]);\n};\n\nPromise.prototype.fcall = function (/*...args*/) {\n    return this.dispatch(\"apply\", [void 0, array_slice(arguments)]);\n};\n\n/**\n * Binds the promised function, transforming return values into a fulfilled\n * promise and thrown errors into a rejected one.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ.fbind = function (object /*...args*/) {\n    var promise = Q(object);\n    var args = array_slice(arguments, 1);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\nPromise.prototype.fbind = function (/*...args*/) {\n    var promise = this;\n    var args = array_slice(arguments);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\n\n/**\n * Requests the names of the owned properties of a promised\n * object in a future turn.\n * @param object    promise or immediate reference for target object\n * @return promise for the keys of the eventually settled object\n */\nQ.keys = function (object) {\n    return Q(object).dispatch(\"keys\", []);\n};\n\nPromise.prototype.keys = function () {\n    return this.dispatch(\"keys\", []);\n};\n\n/**\n * Turns an array of promises into a promise for an array.  If any of\n * the promises gets rejected, the whole array is rejected immediately.\n * @param {Array*} an array (or promise for an array) of values (or\n * promises for values)\n * @returns a promise for an array of the corresponding values\n */\n// By Mark Miller\n// http://wiki.ecmascript.org/doku.php?id=strawman:concurrency&rev=1308776521#allfulfilled\nQ.all = all;\nfunction all(promises) {\n    return when(promises, function (promises) {\n        var pendingCount = 0;\n        var deferred = defer();\n        array_reduce(promises, function (undefined, promise, index) {\n            var snapshot;\n            if (\n                isPromise(promise) &&\n                (snapshot = promise.inspect()).state === \"fulfilled\"\n            ) {\n                promises[index] = snapshot.value;\n            } else {\n                ++pendingCount;\n                when(\n                    promise,\n                    function (value) {\n                        promises[index] = value;\n                        if (--pendingCount === 0) {\n                            deferred.resolve(promises);\n                        }\n                    },\n                    deferred.reject,\n                    function (progress) {\n                        deferred.notify({ index: index, value: progress });\n                    }\n                );\n            }\n        }, void 0);\n        if (pendingCount === 0) {\n            deferred.resolve(promises);\n        }\n        return deferred.promise;\n    });\n}\n\nPromise.prototype.all = function () {\n    return all(this);\n};\n\n/**\n * Returns the first resolved promise of an array. Prior rejected promises are\n * ignored.  Rejects only if all promises are rejected.\n * @param {Array*} an array containing values or promises for values\n * @returns a promise fulfilled with the value of the first resolved promise,\n * or a rejected promise if all promises are rejected.\n */\nQ.any = any;\n\nfunction any(promises) {\n    if (promises.length === 0) {\n        return Q.resolve();\n    }\n\n    var deferred = Q.defer();\n    var pendingCount = 0;\n    array_reduce(promises, function (prev, current, index) {\n        var promise = promises[index];\n\n        pendingCount++;\n\n        when(promise, onFulfilled, onRejected, onProgress);\n        function onFulfilled(result) {\n            deferred.resolve(result);\n        }\n        function onRejected() {\n            pendingCount--;\n            if (pendingCount === 0) {\n                deferred.reject(new Error(\n                    \"Can't get fulfillment value from any promise, all \" +\n                    \"promises were rejected.\"\n                ));\n            }\n        }\n        function onProgress(progress) {\n            deferred.notify({\n                index: index,\n                value: progress\n            });\n        }\n    }, undefined);\n\n    return deferred.promise;\n}\n\nPromise.prototype.any = function () {\n    return any(this);\n};\n\n/**\n * Waits for all promises to be settled, either fulfilled or\n * rejected.  This is distinct from `all` since that would stop\n * waiting at the first rejection.  The promise returned by\n * `allResolved` will never be rejected.\n * @param promises a promise for an array (or an array) of promises\n * (or values)\n * @return a promise for an array of promises\n */\nQ.allResolved = deprecate(allResolved, \"allResolved\", \"allSettled\");\nfunction allResolved(promises) {\n    return when(promises, function (promises) {\n        promises = array_map(promises, Q);\n        return when(all(array_map(promises, function (promise) {\n            return when(promise, noop, noop);\n        })), function () {\n            return promises;\n        });\n    });\n}\n\nPromise.prototype.allResolved = function () {\n    return allResolved(this);\n};\n\n/**\n * @see Promise#allSettled\n */\nQ.allSettled = allSettled;\nfunction allSettled(promises) {\n    return Q(promises).allSettled();\n}\n\n/**\n * Turns an array of promises into a promise for an array of their states (as\n * returned by `inspect`) when they have all settled.\n * @param {Array[Any*]} values an array (or promise for an array) of values (or\n * promises for values)\n * @returns {Array[State]} an array of states for the respective values.\n */\nPromise.prototype.allSettled = function () {\n    return this.then(function (promises) {\n        return all(array_map(promises, function (promise) {\n            promise = Q(promise);\n            function regardless() {\n                return promise.inspect();\n            }\n            return promise.then(regardless, regardless);\n        }));\n    });\n};\n\n/**\n * Captures the failure of a promise, giving an oportunity to recover\n * with a callback.  If the given promise is fulfilled, the returned\n * promise is fulfilled.\n * @param {Any*} promise for something\n * @param {Function} callback to fulfill the returned promise if the\n * given promise is rejected\n * @returns a promise for the return value of the callback\n */\nQ.fail = // XXX legacy\nQ[\"catch\"] = function (object, rejected) {\n    return Q(object).then(void 0, rejected);\n};\n\nPromise.prototype.fail = // XXX legacy\nPromise.prototype[\"catch\"] = function (rejected) {\n    return this.then(void 0, rejected);\n};\n\n/**\n * Attaches a listener that can respond to progress notifications from a\n * promise's originating deferred. This listener receives the exact arguments\n * passed to ``deferred.notify``.\n * @param {Any*} promise for something\n * @param {Function} callback to receive any progress notifications\n * @returns the given promise, unchanged\n */\nQ.progress = progress;\nfunction progress(object, progressed) {\n    return Q(object).then(void 0, void 0, progressed);\n}\n\nPromise.prototype.progress = function (progressed) {\n    return this.then(void 0, void 0, progressed);\n};\n\n/**\n * Provides an opportunity to observe the settling of a promise,\n * regardless of whether the promise is fulfilled or rejected.  Forwards\n * the resolution to the returned promise when the callback is done.\n * The callback can return a promise to defer completion.\n * @param {Any*} promise\n * @param {Function} callback to observe the resolution of the given\n * promise, takes no arguments.\n * @returns a promise for the resolution of the given promise when\n * ``fin`` is done.\n */\nQ.fin = // XXX legacy\nQ[\"finally\"] = function (object, callback) {\n    return Q(object)[\"finally\"](callback);\n};\n\nPromise.prototype.fin = // XXX legacy\nPromise.prototype[\"finally\"] = function (callback) {\n    callback = Q(callback);\n    return this.then(function (value) {\n        return callback.fcall().then(function () {\n            return value;\n        });\n    }, function (reason) {\n        // TODO attempt to recycle the rejection with \"this\".\n        return callback.fcall().then(function () {\n            throw reason;\n        });\n    });\n};\n\n/**\n * Terminates a chain of promises, forcing rejections to be\n * thrown as exceptions.\n * @param {Any*} promise at the end of a chain of promises\n * @returns nothing\n */\nQ.done = function (object, fulfilled, rejected, progress) {\n    return Q(object).done(fulfilled, rejected, progress);\n};\n\nPromise.prototype.done = function (fulfilled, rejected, progress) {\n    var onUnhandledError = function (error) {\n        // forward to a future turn so that ``when``\n        // does not catch it and turn it into a rejection.\n        Q.nextTick(function () {\n            makeStackTraceLong(error, promise);\n            if (Q.onerror) {\n                Q.onerror(error);\n            } else {\n                throw error;\n            }\n        });\n    };\n\n    // Avoid unnecessary `nextTick`ing via an unnecessary `when`.\n    var promise = fulfilled || rejected || progress ?\n        this.then(fulfilled, rejected, progress) :\n        this;\n\n    if (typeof process === \"object\" && process && process.domain) {\n        onUnhandledError = process.domain.bind(onUnhandledError);\n    }\n\n    promise.then(void 0, onUnhandledError);\n};\n\n/**\n * Causes a promise to be rejected if it does not get fulfilled before\n * some milliseconds time out.\n * @param {Any*} promise\n * @param {Number} milliseconds timeout\n * @param {Any*} custom error message or Error object (optional)\n * @returns a promise for the resolution of the given promise if it is\n * fulfilled before the timeout, otherwise rejected.\n */\nQ.timeout = function (object, ms, error) {\n    return Q(object).timeout(ms, error);\n};\n\nPromise.prototype.timeout = function (ms, error) {\n    var deferred = defer();\n    var timeoutId = setTimeout(function () {\n        if (!error || \"string\" === typeof error) {\n            error = new Error(error || \"Timed out after \" + ms + \" ms\");\n            error.code = \"ETIMEDOUT\";\n        }\n        deferred.reject(error);\n    }, ms);\n\n    this.then(function (value) {\n        clearTimeout(timeoutId);\n        deferred.resolve(value);\n    }, function (exception) {\n        clearTimeout(timeoutId);\n        deferred.reject(exception);\n    }, deferred.notify);\n\n    return deferred.promise;\n};\n\n/**\n * Returns a promise for the given value (or promised value), some\n * milliseconds after it resolved. Passes rejections immediately.\n * @param {Any*} promise\n * @param {Number} milliseconds\n * @returns a promise for the resolution of the given promise after milliseconds\n * time has elapsed since the resolution of the given promise.\n * If the given promise rejects, that is passed immediately.\n */\nQ.delay = function (object, timeout) {\n    if (timeout === void 0) {\n        timeout = object;\n        object = void 0;\n    }\n    return Q(object).delay(timeout);\n};\n\nPromise.prototype.delay = function (timeout) {\n    return this.then(function (value) {\n        var deferred = defer();\n        setTimeout(function () {\n            deferred.resolve(value);\n        }, timeout);\n        return deferred.promise;\n    });\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided as an array, and returns a promise.\n *\n *      Q.nfapply(FS.readFile, [__filename])\n *      .then(function (content) {\n *      })\n *\n */\nQ.nfapply = function (callback, args) {\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfapply = function (args) {\n    var deferred = defer();\n    var nodeArgs = array_slice(args);\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided individually, and returns a promise.\n * @example\n * Q.nfcall(FS.readFile, __filename)\n * .then(function (content) {\n * })\n *\n */\nQ.nfcall = function (callback /*...args*/) {\n    var args = array_slice(arguments, 1);\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfcall = function (/*...args*/) {\n    var nodeArgs = array_slice(arguments);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Wraps a NodeJS continuation passing function and returns an equivalent\n * version that returns a promise.\n * @example\n * Q.nfbind(FS.readFile, __filename)(\"utf-8\")\n * .then(console.log)\n * .done()\n */\nQ.nfbind =\nQ.denodeify = function (callback /*...args*/) {\n    var baseArgs = array_slice(arguments, 1);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        Q(callback).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nfbind =\nPromise.prototype.denodeify = function (/*...args*/) {\n    var args = array_slice(arguments);\n    args.unshift(this);\n    return Q.denodeify.apply(void 0, args);\n};\n\nQ.nbind = function (callback, thisp /*...args*/) {\n    var baseArgs = array_slice(arguments, 2);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        function bound() {\n            return callback.apply(thisp, arguments);\n        }\n        Q(bound).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nbind = function (/*thisp, ...args*/) {\n    var args = array_slice(arguments, 0);\n    args.unshift(this);\n    return Q.nbind.apply(void 0, args);\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback with a given array of arguments, plus a provided callback.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param {Array} args arguments to pass to the method; the callback\n * will be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nmapply = // XXX As proposed by \"Redsandro\"\nQ.npost = function (object, name, args) {\n    return Q(object).npost(name, args);\n};\n\nPromise.prototype.nmapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.npost = function (name, args) {\n    var nodeArgs = array_slice(args || []);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback, forwarding the given variadic arguments, plus a provided\n * callback argument.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param ...args arguments to pass to the method; the callback will\n * be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nsend = // XXX Based on Mark Miller's proposed \"send\"\nQ.nmcall = // XXX Based on \"Redsandro's\" proposal\nQ.ninvoke = function (object, name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 2);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    Q(object).dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\nPromise.prototype.nsend = // XXX Based on Mark Miller's proposed \"send\"\nPromise.prototype.nmcall = // XXX Based on \"Redsandro's\" proposal\nPromise.prototype.ninvoke = function (name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 1);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * If a function would like to support both Node continuation-passing-style and\n * promise-returning-style, it can end its internal promise chain with\n * `nodeify(nodeback)`, forwarding the optional nodeback argument.  If the user\n * elects to use a nodeback, the result will be sent there.  If they do not\n * pass a nodeback, they will receive the result promise.\n * @param object a result (or a promise for a result)\n * @param {Function} nodeback a Node.js-style callback\n * @returns either the promise or nothing\n */\nQ.nodeify = nodeify;\nfunction nodeify(object, nodeback) {\n    return Q(object).nodeify(nodeback);\n}\n\nPromise.prototype.nodeify = function (nodeback) {\n    if (nodeback) {\n        this.then(function (value) {\n            Q.nextTick(function () {\n                nodeback(null, value);\n            });\n        }, function (error) {\n            Q.nextTick(function () {\n                nodeback(error);\n            });\n        });\n    } else {\n        return this;\n    }\n};\n\nQ.noConflict = function() {\n    throw new Error(\"Q.noConflict only works when Q is used as a global\");\n};\n\n// All code before this point will be filtered from stack traces.\nvar qEndingLine = captureLine();\n\nreturn Q;\n\n});\n\n}).call(this,require('_process'))\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["node_modules/q/q.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["// vim:ts=4:sts=4:sw=4:\n/*!\n *\n * Copyright 2009-2012 Kris Kowal under the terms of the MIT\n * license found at http://github.com/kriskowal/q/raw/master/LICENSE\n *\n * With parts by Tyler Close\n * Copyright 2007-2009 Tyler Close under the terms of the MIT X license found\n * at http://www.opensource.org/licenses/mit-license.html\n * Forked at ref_send.js version: 2009-05-11\n *\n * With parts by Mark Miller\n * Copyright (C) 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\n\n(function (definition) {\n    \"use strict\";\n\n    // This file will function properly as a <script> tag, or a module\n    // using CommonJS and NodeJS or RequireJS module formats.  In\n    // Common/Node/RequireJS, the module exports the Q API and when\n    // executed as a simple <script>, it creates a Q global instead.\n\n    // Montage Require\n    if (typeof bootstrap === \"function\") {\n        bootstrap(\"promise\", definition);\n\n    // CommonJS\n    } else if (typeof exports === \"object\" && typeof module === \"object\") {\n        module.exports = definition();\n\n    // RequireJS\n    } else if (typeof define === \"function\" && define.amd) {\n        define(definition);\n\n    // SES (Secure EcmaScript)\n    } else if (typeof ses !== \"undefined\") {\n        if (!ses.ok()) {\n            return;\n        } else {\n            ses.makeQ = definition;\n        }\n\n    // <script>\n    } else if (typeof window !== \"undefined\" || typeof self !== \"undefined\") {\n        // Prefer window over self for add-on scripts. Use self for\n        // non-windowed contexts.\n        var global = typeof window !== \"undefined\" ? window : self;\n\n        // Get the `window` object, save the previous Q global\n        // and initialize Q as a global.\n        var previousQ = global.Q;\n        global.Q = definition();\n\n        // Add a noConflict function so Q can be removed from the\n        // global namespace.\n        global.Q.noConflict = function () {\n            global.Q = previousQ;\n            return this;\n        };\n\n    } else {\n        throw new Error(\"This environment was not anticipated by Q. Please file a bug.\");\n    }\n\n})(function () {\n\"use strict\";\n\nvar hasStacks = false;\ntry {\n    throw new Error();\n} catch (e) {\n    hasStacks = !!e.stack;\n}\n\n// All code after this point will be filtered from stack traces reported\n// by Q.\nvar qStartingLine = captureLine();\nvar qFileName;\n\n// shims\n\n// used for fallback in \"allResolved\"\nvar noop = function () {};\n\n// Use the fastest possible means to execute a task in a future turn\n// of the event loop.\nvar nextTick =(function () {\n    // linked list of tasks (single, with head node)\n    var head = {task: void 0, next: null};\n    var tail = head;\n    var flushing = false;\n    var requestTick = void 0;\n    var isNodeJS = false;\n    // queue for late tasks, used by unhandled rejection tracking\n    var laterQueue = [];\n\n    function flush() {\n        /* jshint loopfunc: true */\n        var task, domain;\n\n        while (head.next) {\n            head = head.next;\n            task = head.task;\n            head.task = void 0;\n            domain = head.domain;\n\n            if (domain) {\n                head.domain = void 0;\n                domain.enter();\n            }\n            runSingle(task, domain);\n\n        }\n        while (laterQueue.length) {\n            task = laterQueue.pop();\n            runSingle(task);\n        }\n        flushing = false;\n    }\n    // runs a single function in the async queue\n    function runSingle(task, domain) {\n        try {\n            task();\n\n        } catch (e) {\n            if (isNodeJS) {\n                // In node, uncaught exceptions are considered fatal errors.\n                // Re-throw them synchronously to interrupt flushing!\n\n                // Ensure continuation if the uncaught exception is suppressed\n                // listening \"uncaughtException\" events (as domains does).\n                // Continue in next event to avoid tick recursion.\n                if (domain) {\n                    domain.exit();\n                }\n                setTimeout(flush, 0);\n                if (domain) {\n                    domain.enter();\n                }\n\n                throw e;\n\n            } else {\n                // In browsers, uncaught exceptions are not fatal.\n                // Re-throw them asynchronously to avoid slow-downs.\n                setTimeout(function () {\n                    throw e;\n                }, 0);\n            }\n        }\n\n        if (domain) {\n            domain.exit();\n        }\n    }\n\n    nextTick = function (task) {\n        tail = tail.next = {\n            task: task,\n            domain: isNodeJS && process.domain,\n            next: null\n        };\n\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n\n    if (typeof process === \"object\" &&\n        process.toString() === \"[object process]\" && process.nextTick) {\n        // Ensure Q is in a real Node environment, with a `process.nextTick`.\n        // To see through fake Node environments:\n        // * Mocha test runner - exposes a `process` global without a `nextTick`\n        // * Browserify - exposes a `process.nexTick` function that uses\n        //   `setTimeout`. In this case `setImmediate` is preferred because\n        //    it is faster. Browserify's `process.toString()` yields\n        //   \"[object Object]\", while in a real Node environment\n        //   `process.nextTick()` yields \"[object process]\".\n        isNodeJS = true;\n\n        requestTick = function () {\n            process.nextTick(flush);\n        };\n\n    } else if (typeof setImmediate === \"function\") {\n        // In IE10, Node.js 0.9+, or https://github.com/NobleJS/setImmediate\n        if (typeof window !== \"undefined\") {\n            requestTick = setImmediate.bind(window, flush);\n        } else {\n            requestTick = function () {\n                setImmediate(flush);\n            };\n        }\n\n    } else if (typeof MessageChannel !== \"undefined\") {\n        // modern browsers\n        // http://www.nonblocking.io/2011/06/windownexttick.html\n        var channel = new MessageChannel();\n        // At least Safari Version 6.0.5 (8536.30.1) intermittently cannot create\n        // working message ports the first time a page loads.\n        channel.port1.onmessage = function () {\n            requestTick = requestPortTick;\n            channel.port1.onmessage = flush;\n            flush();\n        };\n        var requestPortTick = function () {\n            // Opera requires us to provide a message payload, regardless of\n            // whether we use it.\n            channel.port2.postMessage(0);\n        };\n        requestTick = function () {\n            setTimeout(flush, 0);\n            requestPortTick();\n        };\n\n    } else {\n        // old browsers\n        requestTick = function () {\n            setTimeout(flush, 0);\n        };\n    }\n    // runs a task after all other tasks have been run\n    // this is useful for unhandled rejection tracking that needs to happen\n    // after all `then`d tasks have been run.\n    nextTick.runAfter = function (task) {\n        laterQueue.push(task);\n        if (!flushing) {\n            flushing = true;\n            requestTick();\n        }\n    };\n    return nextTick;\n})();\n\n// Attempt to make generics safe in the face of downstream\n// modifications.\n// There is no situation where this is necessary.\n// If you need a security guarantee, these primordials need to be\n// deeply frozen anyway, and if you don’t need a security guarantee,\n// this is just plain paranoid.\n// However, this **might** have the nice side-effect of reducing the size of\n// the minified code by reducing x.call() to merely x()\n// See Mark Miller’s explanation of what this does.\n// http://wiki.ecmascript.org/doku.php?id=conventions:safe_meta_programming\nvar call = Function.call;\nfunction uncurryThis(f) {\n    return function () {\n        return call.apply(f, arguments);\n    };\n}\n// This is equivalent, but slower:\n// uncurryThis = Function_bind.bind(Function_bind.call);\n// http://jsperf.com/uncurrythis\n\nvar array_slice = uncurryThis(Array.prototype.slice);\n\nvar array_reduce = uncurryThis(\n    Array.prototype.reduce || function (callback, basis) {\n        var index = 0,\n            length = this.length;\n        // concerning the initial value, if one is not provided\n        if (arguments.length === 1) {\n            // seek to the first value in the array, accounting\n            // for the possibility that is is a sparse array\n            do {\n                if (index in this) {\n                    basis = this[index++];\n                    break;\n                }\n                if (++index >= length) {\n                    throw new TypeError();\n                }\n            } while (1);\n        }\n        // reduce\n        for (; index < length; index++) {\n            // account for the possibility that the array is sparse\n            if (index in this) {\n                basis = callback(basis, this[index], index);\n            }\n        }\n        return basis;\n    }\n);\n\nvar array_indexOf = uncurryThis(\n    Array.prototype.indexOf || function (value) {\n        // not a very good shim, but good enough for our one use of it\n        for (var i = 0; i < this.length; i++) {\n            if (this[i] === value) {\n                return i;\n            }\n        }\n        return -1;\n    }\n);\n\nvar array_map = uncurryThis(\n    Array.prototype.map || function (callback, thisp) {\n        var self = this;\n        var collect = [];\n        array_reduce(self, function (undefined, value, index) {\n            collect.push(callback.call(thisp, value, index, self));\n        }, void 0);\n        return collect;\n    }\n);\n\nvar object_create = Object.create || function (prototype) {\n    function Type() { }\n    Type.prototype = prototype;\n    return new Type();\n};\n\nvar object_hasOwnProperty = uncurryThis(Object.prototype.hasOwnProperty);\n\nvar object_keys = Object.keys || function (object) {\n    var keys = [];\n    for (var key in object) {\n        if (object_hasOwnProperty(object, key)) {\n            keys.push(key);\n        }\n    }\n    return keys;\n};\n\nvar object_toString = uncurryThis(Object.prototype.toString);\n\nfunction isObject(value) {\n    return value === Object(value);\n}\n\n// generator related shims\n\n// FIXME: Remove this function once ES6 generators are in SpiderMonkey.\nfunction isStopIteration(exception) {\n    return (\n        object_toString(exception) === \"[object StopIteration]\" ||\n        exception instanceof QReturnValue\n    );\n}\n\n// FIXME: Remove this helper and Q.return once ES6 generators are in\n// SpiderMonkey.\nvar QReturnValue;\nif (typeof ReturnValue !== \"undefined\") {\n    QReturnValue = ReturnValue;\n} else {\n    QReturnValue = function (value) {\n        this.value = value;\n    };\n}\n\n// long stack traces\n\nvar STACK_JUMP_SEPARATOR = \"From previous event:\";\n\nfunction makeStackTraceLong(error, promise) {\n    // If possible, transform the error stack trace by removing Node and Q\n    // cruft, then concatenating with the stack trace of `promise`. See #57.\n    if (hasStacks &&\n        promise.stack &&\n        typeof error === \"object\" &&\n        error !== null &&\n        error.stack &&\n        error.stack.indexOf(STACK_JUMP_SEPARATOR) === -1\n    ) {\n        var stacks = [];\n        for (var p = promise; !!p; p = p.source) {\n            if (p.stack) {\n                stacks.unshift(p.stack);\n            }\n        }\n        stacks.unshift(error.stack);\n\n        var concatedStacks = stacks.join(\"\\n\" + STACK_JUMP_SEPARATOR + \"\\n\");\n        error.stack = filterStackString(concatedStacks);\n    }\n}\n\nfunction filterStackString(stackString) {\n    var lines = stackString.split(\"\\n\");\n    var desiredLines = [];\n    for (var i = 0; i < lines.length; ++i) {\n        var line = lines[i];\n\n        if (!isInternalFrame(line) && !isNodeFrame(line) && line) {\n            desiredLines.push(line);\n        }\n    }\n    return desiredLines.join(\"\\n\");\n}\n\nfunction isNodeFrame(stackLine) {\n    return stackLine.indexOf(\"(module.js:\") !== -1 ||\n           stackLine.indexOf(\"(node.js:\") !== -1;\n}\n\nfunction getFileNameAndLineNumber(stackLine) {\n    // Named functions: \"at functionName (filename:lineNumber:columnNumber)\"\n    // In IE10 function name can have spaces (\"Anonymous function\") O_o\n    var attempt1 = /at .+ \\((.+):(\\d+):(?:\\d+)\\)$/.exec(stackLine);\n    if (attempt1) {\n        return [attempt1[1], Number(attempt1[2])];\n    }\n\n    // Anonymous functions: \"at filename:lineNumber:columnNumber\"\n    var attempt2 = /at ([^ ]+):(\\d+):(?:\\d+)$/.exec(stackLine);\n    if (attempt2) {\n        return [attempt2[1], Number(attempt2[2])];\n    }\n\n    // Firefox style: \"function@filename:lineNumber or @filename:lineNumber\"\n    var attempt3 = /.*@(.+):(\\d+)$/.exec(stackLine);\n    if (attempt3) {\n        return [attempt3[1], Number(attempt3[2])];\n    }\n}\n\nfunction isInternalFrame(stackLine) {\n    var fileNameAndLineNumber = getFileNameAndLineNumber(stackLine);\n\n    if (!fileNameAndLineNumber) {\n        return false;\n    }\n\n    var fileName = fileNameAndLineNumber[0];\n    var lineNumber = fileNameAndLineNumber[1];\n\n    return fileName === qFileName &&\n        lineNumber >= qStartingLine &&\n        lineNumber <= qEndingLine;\n}\n\n// discover own file name and line number range for filtering stack\n// traces\nfunction captureLine() {\n    if (!hasStacks) {\n        return;\n    }\n\n    try {\n        throw new Error();\n    } catch (e) {\n        var lines = e.stack.split(\"\\n\");\n        var firstLine = lines[0].indexOf(\"@\") > 0 ? lines[1] : lines[2];\n        var fileNameAndLineNumber = getFileNameAndLineNumber(firstLine);\n        if (!fileNameAndLineNumber) {\n            return;\n        }\n\n        qFileName = fileNameAndLineNumber[0];\n        return fileNameAndLineNumber[1];\n    }\n}\n\nfunction deprecate(callback, name, alternative) {\n    return function () {\n        if (typeof console !== \"undefined\" &&\n            typeof console.warn === \"function\") {\n            console.warn(name + \" is deprecated, use \" + alternative +\n                         \" instead.\", new Error(\"\").stack);\n        }\n        return callback.apply(callback, arguments);\n    };\n}\n\n// end of shims\n// beginning of real work\n\n/**\n * Constructs a promise for an immediate reference, passes promises through, or\n * coerces promises from different systems.\n * @param value immediate reference or promise\n */\nfunction Q(value) {\n    // If the object is already a Promise, return it directly.  This enables\n    // the resolve function to both be used to created references from objects,\n    // but to tolerably coerce non-promises to promises.\n    if (value instanceof Promise) {\n        return value;\n    }\n\n    // assimilate thenables\n    if (isPromiseAlike(value)) {\n        return coerce(value);\n    } else {\n        return fulfill(value);\n    }\n}\nQ.resolve = Q;\n\n/**\n * Performs a task in a future turn of the event loop.\n * @param {Function} task\n */\nQ.nextTick = nextTick;\n\n/**\n * Controls whether or not long stack traces will be on\n */\nQ.longStackSupport = false;\n\n// enable long stacks if Q_DEBUG is set\nif (typeof process === \"object\" && process && process.env && process.env.Q_DEBUG) {\n    Q.longStackSupport = true;\n}\n\n/**\n * Constructs a {promise, resolve, reject} object.\n *\n * `resolve` is a callback to invoke with a more resolved value for the\n * promise. To fulfill the promise, invoke `resolve` with any value that is\n * not a thenable. To reject the promise, invoke `resolve` with a rejected\n * thenable, or invoke `reject` with the reason directly. To resolve the\n * promise to another thenable, thus putting it in the same state, invoke\n * `resolve` with that other thenable.\n */\nQ.defer = defer;\nfunction defer() {\n    // if \"messages\" is an \"Array\", that indicates that the promise has not yet\n    // been resolved.  If it is \"undefined\", it has been resolved.  Each\n    // element of the messages array is itself an array of complete arguments to\n    // forward to the resolved promise.  We coerce the resolution value to a\n    // promise using the `resolve` function because it handles both fully\n    // non-thenable values and other thenables gracefully.\n    var messages = [], progressListeners = [], resolvedPromise;\n\n    var deferred = object_create(defer.prototype);\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, operands) {\n        var args = array_slice(arguments);\n        if (messages) {\n            messages.push(args);\n            if (op === \"when\" && operands[1]) { // progress operand\n                progressListeners.push(operands[1]);\n            }\n        } else {\n            Q.nextTick(function () {\n                resolvedPromise.promiseDispatch.apply(resolvedPromise, args);\n            });\n        }\n    };\n\n    // XXX deprecated\n    promise.valueOf = function () {\n        if (messages) {\n            return promise;\n        }\n        var nearerValue = nearer(resolvedPromise);\n        if (isPromise(nearerValue)) {\n            resolvedPromise = nearerValue; // shorten chain\n        }\n        return nearerValue;\n    };\n\n    promise.inspect = function () {\n        if (!resolvedPromise) {\n            return { state: \"pending\" };\n        }\n        return resolvedPromise.inspect();\n    };\n\n    if (Q.longStackSupport && hasStacks) {\n        try {\n            throw new Error();\n        } catch (e) {\n            // NOTE: don't try to use `Error.captureStackTrace` or transfer the\n            // accessor around; that causes memory leaks as per GH-111. Just\n            // reify the stack trace as a string ASAP.\n            //\n            // At the same time, cut off the first line; it's always just\n            // \"[object Promise]\\n\", as per the `toString`.\n            promise.stack = e.stack.substring(e.stack.indexOf(\"\\n\") + 1);\n        }\n    }\n\n    // NOTE: we do the checks for `resolvedPromise` in each method, instead of\n    // consolidating them into `become`, since otherwise we'd create new\n    // promises with the lines `become(whatever(value))`. See e.g. GH-252.\n\n    function become(newPromise) {\n        resolvedPromise = newPromise;\n        promise.source = newPromise;\n\n        array_reduce(messages, function (undefined, message) {\n            Q.nextTick(function () {\n                newPromise.promiseDispatch.apply(newPromise, message);\n            });\n        }, void 0);\n\n        messages = void 0;\n        progressListeners = void 0;\n    }\n\n    deferred.promise = promise;\n    deferred.resolve = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(Q(value));\n    };\n\n    deferred.fulfill = function (value) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(fulfill(value));\n    };\n    deferred.reject = function (reason) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        become(reject(reason));\n    };\n    deferred.notify = function (progress) {\n        if (resolvedPromise) {\n            return;\n        }\n\n        array_reduce(progressListeners, function (undefined, progressListener) {\n            Q.nextTick(function () {\n                progressListener(progress);\n            });\n        }, void 0);\n    };\n\n    return deferred;\n}\n\n/**\n * Creates a Node-style callback that will resolve or reject the deferred\n * promise.\n * @returns a nodeback\n */\ndefer.prototype.makeNodeResolver = function () {\n    var self = this;\n    return function (error, value) {\n        if (error) {\n            self.reject(error);\n        } else if (arguments.length > 2) {\n            self.resolve(array_slice(arguments, 1));\n        } else {\n            self.resolve(value);\n        }\n    };\n};\n\n/**\n * @param resolver {Function} a function that returns nothing and accepts\n * the resolve, reject, and notify functions for a deferred.\n * @returns a promise that may be resolved with the given resolve and reject\n * functions, or rejected by a thrown exception in resolver\n */\nQ.Promise = promise; // ES6\nQ.promise = promise;\nfunction promise(resolver) {\n    if (typeof resolver !== \"function\") {\n        throw new TypeError(\"resolver must be a function.\");\n    }\n    var deferred = defer();\n    try {\n        resolver(deferred.resolve, deferred.reject, deferred.notify);\n    } catch (reason) {\n        deferred.reject(reason);\n    }\n    return deferred.promise;\n}\n\npromise.race = race; // ES6\npromise.all = all; // ES6\npromise.reject = reject; // ES6\npromise.resolve = Q; // ES6\n\n// XXX experimental.  This method is a way to denote that a local value is\n// serializable and should be immediately dispatched to a remote upon request,\n// instead of passing a reference.\nQ.passByCopy = function (object) {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return object;\n};\n\nPromise.prototype.passByCopy = function () {\n    //freeze(object);\n    //passByCopies.set(object, true);\n    return this;\n};\n\n/**\n * If two promises eventually fulfill to the same value, promises that value,\n * but otherwise rejects.\n * @param x {Any*}\n * @param y {Any*}\n * @returns {Any*} a promise for x and y if they are the same, but a rejection\n * otherwise.\n *\n */\nQ.join = function (x, y) {\n    return Q(x).join(y);\n};\n\nPromise.prototype.join = function (that) {\n    return Q([this, that]).spread(function (x, y) {\n        if (x === y) {\n            // TODO: \"===\" should be Object.is or equiv\n            return x;\n        } else {\n            throw new Error(\"Can't join: not the same: \" + x + \" \" + y);\n        }\n    });\n};\n\n/**\n * Returns a promise for the first of an array of promises to become settled.\n * @param answers {Array[Any*]} promises to race\n * @returns {Any*} the first promise to be settled\n */\nQ.race = race;\nfunction race(answerPs) {\n    return promise(function (resolve, reject) {\n        // Switch to this once we can assume at least ES5\n        // answerPs.forEach(function (answerP) {\n        //     Q(answerP).then(resolve, reject);\n        // });\n        // Use this in the meantime\n        for (var i = 0, len = answerPs.length; i < len; i++) {\n            Q(answerPs[i]).then(resolve, reject);\n        }\n    });\n}\n\nPromise.prototype.race = function () {\n    return this.then(Q.race);\n};\n\n/**\n * Constructs a Promise with a promise descriptor object and optional fallback\n * function.  The descriptor contains methods like when(rejected), get(name),\n * set(name, value), post(name, args), and delete(name), which all\n * return either a value, a promise for a value, or a rejection.  The fallback\n * accepts the operation name, a resolver, and any further arguments that would\n * have been forwarded to the appropriate method above had a method been\n * provided with the proper name.  The API makes no guarantees about the nature\n * of the returned object, apart from that it is usable whereever promises are\n * bought and sold.\n */\nQ.makePromise = Promise;\nfunction Promise(descriptor, fallback, inspect) {\n    if (fallback === void 0) {\n        fallback = function (op) {\n            return reject(new Error(\n                \"Promise does not support operation: \" + op\n            ));\n        };\n    }\n    if (inspect === void 0) {\n        inspect = function () {\n            return {state: \"unknown\"};\n        };\n    }\n\n    var promise = object_create(Promise.prototype);\n\n    promise.promiseDispatch = function (resolve, op, args) {\n        var result;\n        try {\n            if (descriptor[op]) {\n                result = descriptor[op].apply(promise, args);\n            } else {\n                result = fallback.call(promise, op, args);\n            }\n        } catch (exception) {\n            result = reject(exception);\n        }\n        if (resolve) {\n            resolve(result);\n        }\n    };\n\n    promise.inspect = inspect;\n\n    // XXX deprecated `valueOf` and `exception` support\n    if (inspect) {\n        var inspected = inspect();\n        if (inspected.state === \"rejected\") {\n            promise.exception = inspected.reason;\n        }\n\n        promise.valueOf = function () {\n            var inspected = inspect();\n            if (inspected.state === \"pending\" ||\n                inspected.state === \"rejected\") {\n                return promise;\n            }\n            return inspected.value;\n        };\n    }\n\n    return promise;\n}\n\nPromise.prototype.toString = function () {\n    return \"[object Promise]\";\n};\n\nPromise.prototype.then = function (fulfilled, rejected, progressed) {\n    var self = this;\n    var deferred = defer();\n    var done = false;   // ensure the untrusted promise makes at most a\n                        // single call to one of the callbacks\n\n    function _fulfilled(value) {\n        try {\n            return typeof fulfilled === \"function\" ? fulfilled(value) : value;\n        } catch (exception) {\n            return reject(exception);\n        }\n    }\n\n    function _rejected(exception) {\n        if (typeof rejected === \"function\") {\n            makeStackTraceLong(exception, self);\n            try {\n                return rejected(exception);\n            } catch (newException) {\n                return reject(newException);\n            }\n        }\n        return reject(exception);\n    }\n\n    function _progressed(value) {\n        return typeof progressed === \"function\" ? progressed(value) : value;\n    }\n\n    Q.nextTick(function () {\n        self.promiseDispatch(function (value) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_fulfilled(value));\n        }, \"when\", [function (exception) {\n            if (done) {\n                return;\n            }\n            done = true;\n\n            deferred.resolve(_rejected(exception));\n        }]);\n    });\n\n    // Progress propagator need to be attached in the current tick.\n    self.promiseDispatch(void 0, \"when\", [void 0, function (value) {\n        var newValue;\n        var threw = false;\n        try {\n            newValue = _progressed(value);\n        } catch (e) {\n            threw = true;\n            if (Q.onerror) {\n                Q.onerror(e);\n            } else {\n                throw e;\n            }\n        }\n\n        if (!threw) {\n            deferred.notify(newValue);\n        }\n    }]);\n\n    return deferred.promise;\n};\n\nQ.tap = function (promise, callback) {\n    return Q(promise).tap(callback);\n};\n\n/**\n * Works almost like \"finally\", but not called for rejections.\n * Original resolution value is passed through callback unaffected.\n * Callback may return a promise that will be awaited for.\n * @param {Function} callback\n * @returns {Q.Promise}\n * @example\n * doSomething()\n *   .then(...)\n *   .tap(console.log)\n *   .then(...);\n */\nPromise.prototype.tap = function (callback) {\n    callback = Q(callback);\n\n    return this.then(function (value) {\n        return callback.fcall(value).thenResolve(value);\n    });\n};\n\n/**\n * Registers an observer on a promise.\n *\n * Guarantees:\n *\n * 1. that fulfilled and rejected will be called only once.\n * 2. that either the fulfilled callback or the rejected callback will be\n *    called, but not both.\n * 3. that fulfilled and rejected will not be called in this turn.\n *\n * @param value      promise or immediate reference to observe\n * @param fulfilled  function to be called with the fulfilled value\n * @param rejected   function to be called with the rejection exception\n * @param progressed function to be called on any progress notifications\n * @return promise for the return value from the invoked callback\n */\nQ.when = when;\nfunction when(value, fulfilled, rejected, progressed) {\n    return Q(value).then(fulfilled, rejected, progressed);\n}\n\nPromise.prototype.thenResolve = function (value) {\n    return this.then(function () { return value; });\n};\n\nQ.thenResolve = function (promise, value) {\n    return Q(promise).thenResolve(value);\n};\n\nPromise.prototype.thenReject = function (reason) {\n    return this.then(function () { throw reason; });\n};\n\nQ.thenReject = function (promise, reason) {\n    return Q(promise).thenReject(reason);\n};\n\n/**\n * If an object is not a promise, it is as \"near\" as possible.\n * If a promise is rejected, it is as \"near\" as possible too.\n * If it’s a fulfilled promise, the fulfillment value is nearer.\n * If it’s a deferred promise and the deferred has been resolved, the\n * resolution is \"nearer\".\n * @param object\n * @returns most resolved (nearest) form of the object\n */\n\n// XXX should we re-do this?\nQ.nearer = nearer;\nfunction nearer(value) {\n    if (isPromise(value)) {\n        var inspected = value.inspect();\n        if (inspected.state === \"fulfilled\") {\n            return inspected.value;\n        }\n    }\n    return value;\n}\n\n/**\n * @returns whether the given object is a promise.\n * Otherwise it is a fulfilled value.\n */\nQ.isPromise = isPromise;\nfunction isPromise(object) {\n    return object instanceof Promise;\n}\n\nQ.isPromiseAlike = isPromiseAlike;\nfunction isPromiseAlike(object) {\n    return isObject(object) && typeof object.then === \"function\";\n}\n\n/**\n * @returns whether the given object is a pending promise, meaning not\n * fulfilled or rejected.\n */\nQ.isPending = isPending;\nfunction isPending(object) {\n    return isPromise(object) && object.inspect().state === \"pending\";\n}\n\nPromise.prototype.isPending = function () {\n    return this.inspect().state === \"pending\";\n};\n\n/**\n * @returns whether the given object is a value or fulfilled\n * promise.\n */\nQ.isFulfilled = isFulfilled;\nfunction isFulfilled(object) {\n    return !isPromise(object) || object.inspect().state === \"fulfilled\";\n}\n\nPromise.prototype.isFulfilled = function () {\n    return this.inspect().state === \"fulfilled\";\n};\n\n/**\n * @returns whether the given object is a rejected promise.\n */\nQ.isRejected = isRejected;\nfunction isRejected(object) {\n    return isPromise(object) && object.inspect().state === \"rejected\";\n}\n\nPromise.prototype.isRejected = function () {\n    return this.inspect().state === \"rejected\";\n};\n\n//// BEGIN UNHANDLED REJECTION TRACKING\n\n// This promise library consumes exceptions thrown in handlers so they can be\n// handled by a subsequent promise.  The exceptions get added to this array when\n// they are created, and removed when they are handled.  Note that in ES6 or\n// shimmed environments, this would naturally be a `Set`.\nvar unhandledReasons = [];\nvar unhandledRejections = [];\nvar reportedUnhandledRejections = [];\nvar trackUnhandledRejections = true;\n\nfunction resetUnhandledRejections() {\n    unhandledReasons.length = 0;\n    unhandledRejections.length = 0;\n\n    if (!trackUnhandledRejections) {\n        trackUnhandledRejections = true;\n    }\n}\n\nfunction trackRejection(promise, reason) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n    if (typeof process === \"object\" && typeof process.emit === \"function\") {\n        Q.nextTick.runAfter(function () {\n            if (array_indexOf(unhandledRejections, promise) !== -1) {\n                process.emit(\"unhandledRejection\", reason, promise);\n                reportedUnhandledRejections.push(promise);\n            }\n        });\n    }\n\n    unhandledRejections.push(promise);\n    if (reason && typeof reason.stack !== \"undefined\") {\n        unhandledReasons.push(reason.stack);\n    } else {\n        unhandledReasons.push(\"(no stack) \" + reason);\n    }\n}\n\nfunction untrackRejection(promise) {\n    if (!trackUnhandledRejections) {\n        return;\n    }\n\n    var at = array_indexOf(unhandledRejections, promise);\n    if (at !== -1) {\n        if (typeof process === \"object\" && typeof process.emit === \"function\") {\n            Q.nextTick.runAfter(function () {\n                var atReport = array_indexOf(reportedUnhandledRejections, promise);\n                if (atReport !== -1) {\n                    process.emit(\"rejectionHandled\", unhandledReasons[at], promise);\n                    reportedUnhandledRejections.splice(atReport, 1);\n                }\n            });\n        }\n        unhandledRejections.splice(at, 1);\n        unhandledReasons.splice(at, 1);\n    }\n}\n\nQ.resetUnhandledRejections = resetUnhandledRejections;\n\nQ.getUnhandledReasons = function () {\n    // Make a copy so that consumers can't interfere with our internal state.\n    return unhandledReasons.slice();\n};\n\nQ.stopUnhandledRejectionTracking = function () {\n    resetUnhandledRejections();\n    trackUnhandledRejections = false;\n};\n\nresetUnhandledRejections();\n\n//// END UNHANDLED REJECTION TRACKING\n\n/**\n * Constructs a rejected promise.\n * @param reason value describing the failure\n */\nQ.reject = reject;\nfunction reject(reason) {\n    var rejection = Promise({\n        \"when\": function (rejected) {\n            // note that the error has been handled\n            if (rejected) {\n                untrackRejection(this);\n            }\n            return rejected ? rejected(reason) : this;\n        }\n    }, function fallback() {\n        return this;\n    }, function inspect() {\n        return { state: \"rejected\", reason: reason };\n    });\n\n    // Note that the reason has not been handled.\n    trackRejection(rejection, reason);\n\n    return rejection;\n}\n\n/**\n * Constructs a fulfilled promise for an immediate reference.\n * @param value immediate reference\n */\nQ.fulfill = fulfill;\nfunction fulfill(value) {\n    return Promise({\n        \"when\": function () {\n            return value;\n        },\n        \"get\": function (name) {\n            return value[name];\n        },\n        \"set\": function (name, rhs) {\n            value[name] = rhs;\n        },\n        \"delete\": function (name) {\n            delete value[name];\n        },\n        \"post\": function (name, args) {\n            // Mark Miller proposes that post with no name should apply a\n            // promised function.\n            if (name === null || name === void 0) {\n                return value.apply(void 0, args);\n            } else {\n                return value[name].apply(value, args);\n            }\n        },\n        \"apply\": function (thisp, args) {\n            return value.apply(thisp, args);\n        },\n        \"keys\": function () {\n            return object_keys(value);\n        }\n    }, void 0, function inspect() {\n        return { state: \"fulfilled\", value: value };\n    });\n}\n\n/**\n * Converts thenables to Q promises.\n * @param promise thenable promise\n * @returns a Q promise\n */\nfunction coerce(promise) {\n    var deferred = defer();\n    Q.nextTick(function () {\n        try {\n            promise.then(deferred.resolve, deferred.reject, deferred.notify);\n        } catch (exception) {\n            deferred.reject(exception);\n        }\n    });\n    return deferred.promise;\n}\n\n/**\n * Annotates an object such that it will never be\n * transferred away from this process over any promise\n * communication channel.\n * @param object\n * @returns promise a wrapping of that object that\n * additionally responds to the \"isDef\" message\n * without a rejection.\n */\nQ.master = master;\nfunction master(object) {\n    return Promise({\n        \"isDef\": function () {}\n    }, function fallback(op, args) {\n        return dispatch(object, op, args);\n    }, function () {\n        return Q(object).inspect();\n    });\n}\n\n/**\n * Spreads the values of a promised array of arguments into the\n * fulfillment callback.\n * @param fulfilled callback that receives variadic arguments from the\n * promised array\n * @param rejected callback that receives the exception if the promise\n * is rejected.\n * @returns a promise for the return value or thrown exception of\n * either callback.\n */\nQ.spread = spread;\nfunction spread(value, fulfilled, rejected) {\n    return Q(value).spread(fulfilled, rejected);\n}\n\nPromise.prototype.spread = function (fulfilled, rejected) {\n    return this.all().then(function (array) {\n        return fulfilled.apply(void 0, array);\n    }, rejected);\n};\n\n/**\n * The async function is a decorator for generator functions, turning\n * them into asynchronous generators.  Although generators are only part\n * of the newest ECMAScript 6 drafts, this code does not cause syntax\n * errors in older engines.  This code should continue to work and will\n * in fact improve over time as the language improves.\n *\n * ES6 generators are currently part of V8 version 3.19 with the\n * --harmony-generators runtime flag enabled.  SpiderMonkey has had them\n * for longer, but under an older Python-inspired form.  This function\n * works on both kinds of generators.\n *\n * Decorates a generator function such that:\n *  - it may yield promises\n *  - execution will continue when that promise is fulfilled\n *  - the value of the yield expression will be the fulfilled value\n *  - it returns a promise for the return value (when the generator\n *    stops iterating)\n *  - the decorated function returns a promise for the return value\n *    of the generator or the first rejected promise among those\n *    yielded.\n *  - if an error is thrown in the generator, it propagates through\n *    every following yield until it is caught, or until it escapes\n *    the generator function altogether, and is translated into a\n *    rejection for the promise returned by the decorated generator.\n */\nQ.async = async;\nfunction async(makeGenerator) {\n    return function () {\n        // when verb is \"send\", arg is a value\n        // when verb is \"throw\", arg is an exception\n        function continuer(verb, arg) {\n            var result;\n\n            // Until V8 3.19 / Chromium 29 is released, SpiderMonkey is the only\n            // engine that has a deployed base of browsers that support generators.\n            // However, SM's generators use the Python-inspired semantics of\n            // outdated ES6 drafts.  We would like to support ES6, but we'd also\n            // like to make it possible to use generators in deployed browsers, so\n            // we also support Python-style generators.  At some point we can remove\n            // this block.\n\n            if (typeof StopIteration === \"undefined\") {\n                // ES6 Generators\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    return reject(exception);\n                }\n                if (result.done) {\n                    return Q(result.value);\n                } else {\n                    return when(result.value, callback, errback);\n                }\n            } else {\n                // SpiderMonkey Generators\n                // FIXME: Remove this case when SM does ES6 generators.\n                try {\n                    result = generator[verb](arg);\n                } catch (exception) {\n                    if (isStopIteration(exception)) {\n                        return Q(exception.value);\n                    } else {\n                        return reject(exception);\n                    }\n                }\n                return when(result, callback, errback);\n            }\n        }\n        var generator = makeGenerator.apply(this, arguments);\n        var callback = continuer.bind(continuer, \"next\");\n        var errback = continuer.bind(continuer, \"throw\");\n        return callback();\n    };\n}\n\n/**\n * The spawn function is a small wrapper around async that immediately\n * calls the generator and also ends the promise chain, so that any\n * unhandled errors are thrown instead of forwarded to the error\n * handler. This is useful because it's extremely common to run\n * generators at the top-level to work with libraries.\n */\nQ.spawn = spawn;\nfunction spawn(makeGenerator) {\n    Q.done(Q.async(makeGenerator)());\n}\n\n// FIXME: Remove this interface once ES6 generators are in SpiderMonkey.\n/**\n * Throws a ReturnValue exception to stop an asynchronous generator.\n *\n * This interface is a stop-gap measure to support generator return\n * values in older Firefox/SpiderMonkey.  In browsers that support ES6\n * generators like Chromium 29, just use \"return\" in your generator\n * functions.\n *\n * @param value the return value for the surrounding generator\n * @throws ReturnValue exception with the value.\n * @example\n * // ES6 style\n * Q.async(function* () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      return foo + bar;\n * })\n * // Older SpiderMonkey style\n * Q.async(function () {\n *      var foo = yield getFooPromise();\n *      var bar = yield getBarPromise();\n *      Q.return(foo + bar);\n * })\n */\nQ[\"return\"] = _return;\nfunction _return(value) {\n    throw new QReturnValue(value);\n}\n\n/**\n * The promised function decorator ensures that any promise arguments\n * are settled and passed as values (`this` is also settled and passed\n * as a value).  It will also ensure that the result of a function is\n * always a promise.\n *\n * @example\n * var add = Q.promised(function (a, b) {\n *     return a + b;\n * });\n * add(Q(a), Q(B));\n *\n * @param {function} callback The function to decorate\n * @returns {function} a function that has been decorated.\n */\nQ.promised = promised;\nfunction promised(callback) {\n    return function () {\n        return spread([this, all(arguments)], function (self, args) {\n            return callback.apply(self, args);\n        });\n    };\n}\n\n/**\n * sends a message to a value in a future turn\n * @param object* the recipient\n * @param op the name of the message operation, e.g., \"when\",\n * @param args further arguments to be forwarded to the operation\n * @returns result {Promise} a promise for the result of the operation\n */\nQ.dispatch = dispatch;\nfunction dispatch(object, op, args) {\n    return Q(object).dispatch(op, args);\n}\n\nPromise.prototype.dispatch = function (op, args) {\n    var self = this;\n    var deferred = defer();\n    Q.nextTick(function () {\n        self.promiseDispatch(deferred.resolve, op, args);\n    });\n    return deferred.promise;\n};\n\n/**\n * Gets the value of a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to get\n * @return promise for the property value\n */\nQ.get = function (object, key) {\n    return Q(object).dispatch(\"get\", [key]);\n};\n\nPromise.prototype.get = function (key) {\n    return this.dispatch(\"get\", [key]);\n};\n\n/**\n * Sets the value of a property in a future turn.\n * @param object    promise or immediate reference for object object\n * @param name      name of property to set\n * @param value     new value of property\n * @return promise for the return value\n */\nQ.set = function (object, key, value) {\n    return Q(object).dispatch(\"set\", [key, value]);\n};\n\nPromise.prototype.set = function (key, value) {\n    return this.dispatch(\"set\", [key, value]);\n};\n\n/**\n * Deletes a property in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of property to delete\n * @return promise for the return value\n */\nQ.del = // XXX legacy\nQ[\"delete\"] = function (object, key) {\n    return Q(object).dispatch(\"delete\", [key]);\n};\n\nPromise.prototype.del = // XXX legacy\nPromise.prototype[\"delete\"] = function (key) {\n    return this.dispatch(\"delete\", [key]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param value     a value to post, typically an array of\n *                  invocation arguments for promises that\n *                  are ultimately backed with `resolve` values,\n *                  as opposed to those backed with URLs\n *                  wherein the posted value can be any\n *                  JSON serializable object.\n * @return promise for the return value\n */\n// bound locally because it is used by other methods\nQ.mapply = // XXX As proposed by \"Redsandro\"\nQ.post = function (object, name, args) {\n    return Q(object).dispatch(\"post\", [name, args]);\n};\n\nPromise.prototype.mapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.post = function (name, args) {\n    return this.dispatch(\"post\", [name, args]);\n};\n\n/**\n * Invokes a method in a future turn.\n * @param object    promise or immediate reference for target object\n * @param name      name of method to invoke\n * @param ...args   array of invocation arguments\n * @return promise for the return value\n */\nQ.send = // XXX Mark Miller's proposed parlance\nQ.mcall = // XXX As proposed by \"Redsandro\"\nQ.invoke = function (object, name /*...args*/) {\n    return Q(object).dispatch(\"post\", [name, array_slice(arguments, 2)]);\n};\n\nPromise.prototype.send = // XXX Mark Miller's proposed parlance\nPromise.prototype.mcall = // XXX As proposed by \"Redsandro\"\nPromise.prototype.invoke = function (name /*...args*/) {\n    return this.dispatch(\"post\", [name, array_slice(arguments, 1)]);\n};\n\n/**\n * Applies the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param args      array of application arguments\n */\nQ.fapply = function (object, args) {\n    return Q(object).dispatch(\"apply\", [void 0, args]);\n};\n\nPromise.prototype.fapply = function (args) {\n    return this.dispatch(\"apply\", [void 0, args]);\n};\n\n/**\n * Calls the promised function in a future turn.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ[\"try\"] =\nQ.fcall = function (object /* ...args*/) {\n    return Q(object).dispatch(\"apply\", [void 0, array_slice(arguments, 1)]);\n};\n\nPromise.prototype.fcall = function (/*...args*/) {\n    return this.dispatch(\"apply\", [void 0, array_slice(arguments)]);\n};\n\n/**\n * Binds the promised function, transforming return values into a fulfilled\n * promise and thrown errors into a rejected one.\n * @param object    promise or immediate reference for target function\n * @param ...args   array of application arguments\n */\nQ.fbind = function (object /*...args*/) {\n    var promise = Q(object);\n    var args = array_slice(arguments, 1);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\nPromise.prototype.fbind = function (/*...args*/) {\n    var promise = this;\n    var args = array_slice(arguments);\n    return function fbound() {\n        return promise.dispatch(\"apply\", [\n            this,\n            args.concat(array_slice(arguments))\n        ]);\n    };\n};\n\n/**\n * Requests the names of the owned properties of a promised\n * object in a future turn.\n * @param object    promise or immediate reference for target object\n * @return promise for the keys of the eventually settled object\n */\nQ.keys = function (object) {\n    return Q(object).dispatch(\"keys\", []);\n};\n\nPromise.prototype.keys = function () {\n    return this.dispatch(\"keys\", []);\n};\n\n/**\n * Turns an array of promises into a promise for an array.  If any of\n * the promises gets rejected, the whole array is rejected immediately.\n * @param {Array*} an array (or promise for an array) of values (or\n * promises for values)\n * @returns a promise for an array of the corresponding values\n */\n// By Mark Miller\n// http://wiki.ecmascript.org/doku.php?id=strawman:concurrency&rev=1308776521#allfulfilled\nQ.all = all;\nfunction all(promises) {\n    return when(promises, function (promises) {\n        var pendingCount = 0;\n        var deferred = defer();\n        array_reduce(promises, function (undefined, promise, index) {\n            var snapshot;\n            if (\n                isPromise(promise) &&\n                (snapshot = promise.inspect()).state === \"fulfilled\"\n            ) {\n                promises[index] = snapshot.value;\n            } else {\n                ++pendingCount;\n                when(\n                    promise,\n                    function (value) {\n                        promises[index] = value;\n                        if (--pendingCount === 0) {\n                            deferred.resolve(promises);\n                        }\n                    },\n                    deferred.reject,\n                    function (progress) {\n                        deferred.notify({ index: index, value: progress });\n                    }\n                );\n            }\n        }, void 0);\n        if (pendingCount === 0) {\n            deferred.resolve(promises);\n        }\n        return deferred.promise;\n    });\n}\n\nPromise.prototype.all = function () {\n    return all(this);\n};\n\n/**\n * Returns the first resolved promise of an array. Prior rejected promises are\n * ignored.  Rejects only if all promises are rejected.\n * @param {Array*} an array containing values or promises for values\n * @returns a promise fulfilled with the value of the first resolved promise,\n * or a rejected promise if all promises are rejected.\n */\nQ.any = any;\n\nfunction any(promises) {\n    if (promises.length === 0) {\n        return Q.resolve();\n    }\n\n    var deferred = Q.defer();\n    var pendingCount = 0;\n    array_reduce(promises, function (prev, current, index) {\n        var promise = promises[index];\n\n        pendingCount++;\n\n        when(promise, onFulfilled, onRejected, onProgress);\n        function onFulfilled(result) {\n            deferred.resolve(result);\n        }\n        function onRejected() {\n            pendingCount--;\n            if (pendingCount === 0) {\n                deferred.reject(new Error(\n                    \"Can't get fulfillment value from any promise, all \" +\n                    \"promises were rejected.\"\n                ));\n            }\n        }\n        function onProgress(progress) {\n            deferred.notify({\n                index: index,\n                value: progress\n            });\n        }\n    }, undefined);\n\n    return deferred.promise;\n}\n\nPromise.prototype.any = function () {\n    return any(this);\n};\n\n/**\n * Waits for all promises to be settled, either fulfilled or\n * rejected.  This is distinct from `all` since that would stop\n * waiting at the first rejection.  The promise returned by\n * `allResolved` will never be rejected.\n * @param promises a promise for an array (or an array) of promises\n * (or values)\n * @return a promise for an array of promises\n */\nQ.allResolved = deprecate(allResolved, \"allResolved\", \"allSettled\");\nfunction allResolved(promises) {\n    return when(promises, function (promises) {\n        promises = array_map(promises, Q);\n        return when(all(array_map(promises, function (promise) {\n            return when(promise, noop, noop);\n        })), function () {\n            return promises;\n        });\n    });\n}\n\nPromise.prototype.allResolved = function () {\n    return allResolved(this);\n};\n\n/**\n * @see Promise#allSettled\n */\nQ.allSettled = allSettled;\nfunction allSettled(promises) {\n    return Q(promises).allSettled();\n}\n\n/**\n * Turns an array of promises into a promise for an array of their states (as\n * returned by `inspect`) when they have all settled.\n * @param {Array[Any*]} values an array (or promise for an array) of values (or\n * promises for values)\n * @returns {Array[State]} an array of states for the respective values.\n */\nPromise.prototype.allSettled = function () {\n    return this.then(function (promises) {\n        return all(array_map(promises, function (promise) {\n            promise = Q(promise);\n            function regardless() {\n                return promise.inspect();\n            }\n            return promise.then(regardless, regardless);\n        }));\n    });\n};\n\n/**\n * Captures the failure of a promise, giving an oportunity to recover\n * with a callback.  If the given promise is fulfilled, the returned\n * promise is fulfilled.\n * @param {Any*} promise for something\n * @param {Function} callback to fulfill the returned promise if the\n * given promise is rejected\n * @returns a promise for the return value of the callback\n */\nQ.fail = // XXX legacy\nQ[\"catch\"] = function (object, rejected) {\n    return Q(object).then(void 0, rejected);\n};\n\nPromise.prototype.fail = // XXX legacy\nPromise.prototype[\"catch\"] = function (rejected) {\n    return this.then(void 0, rejected);\n};\n\n/**\n * Attaches a listener that can respond to progress notifications from a\n * promise's originating deferred. This listener receives the exact arguments\n * passed to ``deferred.notify``.\n * @param {Any*} promise for something\n * @param {Function} callback to receive any progress notifications\n * @returns the given promise, unchanged\n */\nQ.progress = progress;\nfunction progress(object, progressed) {\n    return Q(object).then(void 0, void 0, progressed);\n}\n\nPromise.prototype.progress = function (progressed) {\n    return this.then(void 0, void 0, progressed);\n};\n\n/**\n * Provides an opportunity to observe the settling of a promise,\n * regardless of whether the promise is fulfilled or rejected.  Forwards\n * the resolution to the returned promise when the callback is done.\n * The callback can return a promise to defer completion.\n * @param {Any*} promise\n * @param {Function} callback to observe the resolution of the given\n * promise, takes no arguments.\n * @returns a promise for the resolution of the given promise when\n * ``fin`` is done.\n */\nQ.fin = // XXX legacy\nQ[\"finally\"] = function (object, callback) {\n    return Q(object)[\"finally\"](callback);\n};\n\nPromise.prototype.fin = // XXX legacy\nPromise.prototype[\"finally\"] = function (callback) {\n    callback = Q(callback);\n    return this.then(function (value) {\n        return callback.fcall().then(function () {\n            return value;\n        });\n    }, function (reason) {\n        // TODO attempt to recycle the rejection with \"this\".\n        return callback.fcall().then(function () {\n            throw reason;\n        });\n    });\n};\n\n/**\n * Terminates a chain of promises, forcing rejections to be\n * thrown as exceptions.\n * @param {Any*} promise at the end of a chain of promises\n * @returns nothing\n */\nQ.done = function (object, fulfilled, rejected, progress) {\n    return Q(object).done(fulfilled, rejected, progress);\n};\n\nPromise.prototype.done = function (fulfilled, rejected, progress) {\n    var onUnhandledError = function (error) {\n        // forward to a future turn so that ``when``\n        // does not catch it and turn it into a rejection.\n        Q.nextTick(function () {\n            makeStackTraceLong(error, promise);\n            if (Q.onerror) {\n                Q.onerror(error);\n            } else {\n                throw error;\n            }\n        });\n    };\n\n    // Avoid unnecessary `nextTick`ing via an unnecessary `when`.\n    var promise = fulfilled || rejected || progress ?\n        this.then(fulfilled, rejected, progress) :\n        this;\n\n    if (typeof process === \"object\" && process && process.domain) {\n        onUnhandledError = process.domain.bind(onUnhandledError);\n    }\n\n    promise.then(void 0, onUnhandledError);\n};\n\n/**\n * Causes a promise to be rejected if it does not get fulfilled before\n * some milliseconds time out.\n * @param {Any*} promise\n * @param {Number} milliseconds timeout\n * @param {Any*} custom error message or Error object (optional)\n * @returns a promise for the resolution of the given promise if it is\n * fulfilled before the timeout, otherwise rejected.\n */\nQ.timeout = function (object, ms, error) {\n    return Q(object).timeout(ms, error);\n};\n\nPromise.prototype.timeout = function (ms, error) {\n    var deferred = defer();\n    var timeoutId = setTimeout(function () {\n        if (!error || \"string\" === typeof error) {\n            error = new Error(error || \"Timed out after \" + ms + \" ms\");\n            error.code = \"ETIMEDOUT\";\n        }\n        deferred.reject(error);\n    }, ms);\n\n    this.then(function (value) {\n        clearTimeout(timeoutId);\n        deferred.resolve(value);\n    }, function (exception) {\n        clearTimeout(timeoutId);\n        deferred.reject(exception);\n    }, deferred.notify);\n\n    return deferred.promise;\n};\n\n/**\n * Returns a promise for the given value (or promised value), some\n * milliseconds after it resolved. Passes rejections immediately.\n * @param {Any*} promise\n * @param {Number} milliseconds\n * @returns a promise for the resolution of the given promise after milliseconds\n * time has elapsed since the resolution of the given promise.\n * If the given promise rejects, that is passed immediately.\n */\nQ.delay = function (object, timeout) {\n    if (timeout === void 0) {\n        timeout = object;\n        object = void 0;\n    }\n    return Q(object).delay(timeout);\n};\n\nPromise.prototype.delay = function (timeout) {\n    return this.then(function (value) {\n        var deferred = defer();\n        setTimeout(function () {\n            deferred.resolve(value);\n        }, timeout);\n        return deferred.promise;\n    });\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided as an array, and returns a promise.\n *\n *      Q.nfapply(FS.readFile, [__filename])\n *      .then(function (content) {\n *      })\n *\n */\nQ.nfapply = function (callback, args) {\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfapply = function (args) {\n    var deferred = defer();\n    var nodeArgs = array_slice(args);\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Passes a continuation to a Node function, which is called with the given\n * arguments provided individually, and returns a promise.\n * @example\n * Q.nfcall(FS.readFile, __filename)\n * .then(function (content) {\n * })\n *\n */\nQ.nfcall = function (callback /*...args*/) {\n    var args = array_slice(arguments, 1);\n    return Q(callback).nfapply(args);\n};\n\nPromise.prototype.nfcall = function (/*...args*/) {\n    var nodeArgs = array_slice(arguments);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.fapply(nodeArgs).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Wraps a NodeJS continuation passing function and returns an equivalent\n * version that returns a promise.\n * @example\n * Q.nfbind(FS.readFile, __filename)(\"utf-8\")\n * .then(console.log)\n * .done()\n */\nQ.nfbind =\nQ.denodeify = function (callback /*...args*/) {\n    var baseArgs = array_slice(arguments, 1);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        Q(callback).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nfbind =\nPromise.prototype.denodeify = function (/*...args*/) {\n    var args = array_slice(arguments);\n    args.unshift(this);\n    return Q.denodeify.apply(void 0, args);\n};\n\nQ.nbind = function (callback, thisp /*...args*/) {\n    var baseArgs = array_slice(arguments, 2);\n    return function () {\n        var nodeArgs = baseArgs.concat(array_slice(arguments));\n        var deferred = defer();\n        nodeArgs.push(deferred.makeNodeResolver());\n        function bound() {\n            return callback.apply(thisp, arguments);\n        }\n        Q(bound).fapply(nodeArgs).fail(deferred.reject);\n        return deferred.promise;\n    };\n};\n\nPromise.prototype.nbind = function (/*thisp, ...args*/) {\n    var args = array_slice(arguments, 0);\n    args.unshift(this);\n    return Q.nbind.apply(void 0, args);\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback with a given array of arguments, plus a provided callback.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param {Array} args arguments to pass to the method; the callback\n * will be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nmapply = // XXX As proposed by \"Redsandro\"\nQ.npost = function (object, name, args) {\n    return Q(object).npost(name, args);\n};\n\nPromise.prototype.nmapply = // XXX As proposed by \"Redsandro\"\nPromise.prototype.npost = function (name, args) {\n    var nodeArgs = array_slice(args || []);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * Calls a method of a Node-style object that accepts a Node-style\n * callback, forwarding the given variadic arguments, plus a provided\n * callback argument.\n * @param object an object that has the named method\n * @param {String} name name of the method of object\n * @param ...args arguments to pass to the method; the callback will\n * be provided by Q and appended to these arguments.\n * @returns a promise for the value or error\n */\nQ.nsend = // XXX Based on Mark Miller's proposed \"send\"\nQ.nmcall = // XXX Based on \"Redsandro's\" proposal\nQ.ninvoke = function (object, name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 2);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    Q(object).dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\nPromise.prototype.nsend = // XXX Based on Mark Miller's proposed \"send\"\nPromise.prototype.nmcall = // XXX Based on \"Redsandro's\" proposal\nPromise.prototype.ninvoke = function (name /*...args*/) {\n    var nodeArgs = array_slice(arguments, 1);\n    var deferred = defer();\n    nodeArgs.push(deferred.makeNodeResolver());\n    this.dispatch(\"post\", [name, nodeArgs]).fail(deferred.reject);\n    return deferred.promise;\n};\n\n/**\n * If a function would like to support both Node continuation-passing-style and\n * promise-returning-style, it can end its internal promise chain with\n * `nodeify(nodeback)`, forwarding the optional nodeback argument.  If the user\n * elects to use a nodeback, the result will be sent there.  If they do not\n * pass a nodeback, they will receive the result promise.\n * @param object a result (or a promise for a result)\n * @param {Function} nodeback a Node.js-style callback\n * @returns either the promise or nothing\n */\nQ.nodeify = nodeify;\nfunction nodeify(object, nodeback) {\n    return Q(object).nodeify(nodeback);\n}\n\nPromise.prototype.nodeify = function (nodeback) {\n    if (nodeback) {\n        this.then(function (value) {\n            Q.nextTick(function () {\n                nodeback(null, value);\n            });\n        }, function (error) {\n            Q.nextTick(function () {\n                nodeback(error);\n            });\n        });\n    } else {\n        return this;\n    }\n};\n\nQ.noConflict = function() {\n    throw new Error(\"Q.noConflict only works when Q is used as a global\");\n};\n\n// All code before this point will be filtered from stack traces.\nvar qEndingLine = captureLine();\n\nreturn Q;\n\n});\n"]}","/**\n * Root reference for iframes.\n */\n\nvar root;\nif (typeof window !== 'undefined') { // Browser window\n  root = window;\n} else if (typeof self !== 'undefined') { // Web Worker\n  root = self;\n} else { // Other environments\n  console.warn(\"Using browser-only version of superagent in non-browser environment\");\n  root = this;\n}\n\nvar Emitter = require('emitter');\nvar requestBase = require('./request-base');\nvar isObject = require('./is-object');\n\n/**\n * Noop.\n */\n\nfunction noop(){};\n\n/**\n * Expose `request`.\n */\n\nvar request = module.exports = require('./request').bind(null, Request);\n\n/**\n * Determine XHR.\n */\n\nrequest.getXHR = function () {\n  if (root.XMLHttpRequest\n      && (!root.location || 'file:' != root.location.protocol\n          || !root.ActiveXObject)) {\n    return new XMLHttpRequest;\n  } else {\n    try { return new ActiveXObject('Microsoft.XMLHTTP'); } catch(e) {}\n    try { return new ActiveXObject('Msxml2.XMLHTTP.6.0'); } catch(e) {}\n    try { return new ActiveXObject('Msxml2.XMLHTTP.3.0'); } catch(e) {}\n    try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch(e) {}\n  }\n  throw Error(\"Browser-only verison of superagent could not find XHR\");\n};\n\n/**\n * Removes leading and trailing whitespace, added to support IE.\n *\n * @param {String} s\n * @return {String}\n * @api private\n */\n\nvar trim = ''.trim\n  ? function(s) { return s.trim(); }\n  : function(s) { return s.replace(/(^\\s*|\\s*$)/g, ''); };\n\n/**\n * Serialize the given `obj`.\n *\n * @param {Object} obj\n * @return {String}\n * @api private\n */\n\nfunction serialize(obj) {\n  if (!isObject(obj)) return obj;\n  var pairs = [];\n  for (var key in obj) {\n    pushEncodedKeyValuePair(pairs, key, obj[key]);\n  }\n  return pairs.join('&');\n}\n\n/**\n * Helps 'serialize' with serializing arrays.\n * Mutates the pairs array.\n *\n * @param {Array} pairs\n * @param {String} key\n * @param {Mixed} val\n */\n\nfunction pushEncodedKeyValuePair(pairs, key, val) {\n  if (val != null) {\n    if (Array.isArray(val)) {\n      val.forEach(function(v) {\n        pushEncodedKeyValuePair(pairs, key, v);\n      });\n    } else if (isObject(val)) {\n      for(var subkey in val) {\n        pushEncodedKeyValuePair(pairs, key + '[' + subkey + ']', val[subkey]);\n      }\n    } else {\n      pairs.push(encodeURIComponent(key)\n        + '=' + encodeURIComponent(val));\n    }\n  } else if (val === null) {\n    pairs.push(encodeURIComponent(key));\n  }\n}\n\n/**\n * Expose serialization method.\n */\n\n request.serializeObject = serialize;\n\n /**\n  * Parse the given x-www-form-urlencoded `str`.\n  *\n  * @param {String} str\n  * @return {Object}\n  * @api private\n  */\n\nfunction parseString(str) {\n  var obj = {};\n  var pairs = str.split('&');\n  var pair;\n  var pos;\n\n  for (var i = 0, len = pairs.length; i < len; ++i) {\n    pair = pairs[i];\n    pos = pair.indexOf('=');\n    if (pos == -1) {\n      obj[decodeURIComponent(pair)] = '';\n    } else {\n      obj[decodeURIComponent(pair.slice(0, pos))] =\n        decodeURIComponent(pair.slice(pos + 1));\n    }\n  }\n\n  return obj;\n}\n\n/**\n * Expose parser.\n */\n\nrequest.parseString = parseString;\n\n/**\n * Default MIME type map.\n *\n *     superagent.types.xml = 'application/xml';\n *\n */\n\nrequest.types = {\n  html: 'text/html',\n  json: 'application/json',\n  xml: 'application/xml',\n  urlencoded: 'application/x-www-form-urlencoded',\n  'form': 'application/x-www-form-urlencoded',\n  'form-data': 'application/x-www-form-urlencoded'\n};\n\n/**\n * Default serialization map.\n *\n *     superagent.serialize['application/xml'] = function(obj){\n *       return 'generated xml here';\n *     };\n *\n */\n\n request.serialize = {\n   'application/x-www-form-urlencoded': serialize,\n   'application/json': JSON.stringify\n };\n\n /**\n  * Default parsers.\n  *\n  *     superagent.parse['application/xml'] = function(str){\n  *       return { object parsed from str };\n  *     };\n  *\n  */\n\nrequest.parse = {\n  'application/x-www-form-urlencoded': parseString,\n  'application/json': JSON.parse\n};\n\n/**\n * Parse the given header `str` into\n * an object containing the mapped fields.\n *\n * @param {String} str\n * @return {Object}\n * @api private\n */\n\nfunction parseHeader(str) {\n  var lines = str.split(/\\r?\\n/);\n  var fields = {};\n  var index;\n  var line;\n  var field;\n  var val;\n\n  lines.pop(); // trailing CRLF\n\n  for (var i = 0, len = lines.length; i < len; ++i) {\n    line = lines[i];\n    index = line.indexOf(':');\n    field = line.slice(0, index).toLowerCase();\n    val = trim(line.slice(index + 1));\n    fields[field] = val;\n  }\n\n  return fields;\n}\n\n/**\n * Check if `mime` is json or has +json structured syntax suffix.\n *\n * @param {String} mime\n * @return {Boolean}\n * @api private\n */\n\nfunction isJSON(mime) {\n  return /[\\/+]json\\b/.test(mime);\n}\n\n/**\n * Return the mime type for the given `str`.\n *\n * @param {String} str\n * @return {String}\n * @api private\n */\n\nfunction type(str){\n  return str.split(/ *; */).shift();\n};\n\n/**\n * Return header field parameters.\n *\n * @param {String} str\n * @return {Object}\n * @api private\n */\n\nfunction params(str){\n  return str.split(/ *; */).reduce(function(obj, str){\n    var parts = str.split(/ *= */),\n        key = parts.shift(),\n        val = parts.shift();\n\n    if (key && val) obj[key] = val;\n    return obj;\n  }, {});\n};\n\n/**\n * Initialize a new `Response` with the given `xhr`.\n *\n *  - set flags (.ok, .error, etc)\n *  - parse header\n *\n * Examples:\n *\n *  Aliasing `superagent` as `request` is nice:\n *\n *      request = superagent;\n *\n *  We can use the promise-like API, or pass callbacks:\n *\n *      request.get('/').end(function(res){});\n *      request.get('/', function(res){});\n *\n *  Sending data can be chained:\n *\n *      request\n *        .post('/user')\n *        .send({ name: 'tj' })\n *        .end(function(res){});\n *\n *  Or passed to `.send()`:\n *\n *      request\n *        .post('/user')\n *        .send({ name: 'tj' }, function(res){});\n *\n *  Or passed to `.post()`:\n *\n *      request\n *        .post('/user', { name: 'tj' })\n *        .end(function(res){});\n *\n * Or further reduced to a single call for simple cases:\n *\n *      request\n *        .post('/user', { name: 'tj' }, function(res){});\n *\n * @param {XMLHTTPRequest} xhr\n * @param {Object} options\n * @api private\n */\n\nfunction Response(req, options) {\n  options = options || {};\n  this.req = req;\n  this.xhr = this.req.xhr;\n  // responseText is accessible only if responseType is '' or 'text' and on older browsers\n  this.text = ((this.req.method !='HEAD' && (this.xhr.responseType === '' || this.xhr.responseType === 'text')) || typeof this.xhr.responseType === 'undefined')\n     ? this.xhr.responseText\n     : null;\n  this.statusText = this.req.xhr.statusText;\n  this._setStatusProperties(this.xhr.status);\n  this.header = this.headers = parseHeader(this.xhr.getAllResponseHeaders());\n  // getAllResponseHeaders sometimes falsely returns \"\" for CORS requests, but\n  // getResponseHeader still works. so we get content-type even if getting\n  // other headers fails.\n  this.header['content-type'] = this.xhr.getResponseHeader('content-type');\n  this._setHeaderProperties(this.header);\n  this.body = this.req.method != 'HEAD'\n    ? this._parseBody(this.text ? this.text : this.xhr.response)\n    : null;\n}\n\n/**\n * Get case-insensitive `field` value.\n *\n * @param {String} field\n * @return {String}\n * @api public\n */\n\nResponse.prototype.get = function(field){\n  return this.header[field.toLowerCase()];\n};\n\n/**\n * Set header related properties:\n *\n *   - `.type` the content type without params\n *\n * A response of \"Content-Type: text/plain; charset=utf-8\"\n * will provide you with a `.type` of \"text/plain\".\n *\n * @param {Object} header\n * @api private\n */\n\nResponse.prototype._setHeaderProperties = function(header){\n  // content-type\n  var ct = this.header['content-type'] || '';\n  this.type = type(ct);\n\n  // params\n  var obj = params(ct);\n  for (var key in obj) this[key] = obj[key];\n};\n\n/**\n * Parse the given body `str`.\n *\n * Used for auto-parsing of bodies. Parsers\n * are defined on the `superagent.parse` object.\n *\n * @param {String} str\n * @return {Mixed}\n * @api private\n */\n\nResponse.prototype._parseBody = function(str){\n  var parse = request.parse[this.type];\n  if (!parse && isJSON(this.type)) {\n    parse = request.parse['application/json'];\n  }\n  return parse && str && (str.length || str instanceof Object)\n    ? parse(str)\n    : null;\n};\n\n/**\n * Set flags such as `.ok` based on `status`.\n *\n * For example a 2xx response will give you a `.ok` of __true__\n * whereas 5xx will be __false__ and `.error` will be __true__. The\n * `.clientError` and `.serverError` are also available to be more\n * specific, and `.statusType` is the class of error ranging from 1..5\n * sometimes useful for mapping respond colors etc.\n *\n * \"sugar\" properties are also defined for common cases. Currently providing:\n *\n *   - .noContent\n *   - .badRequest\n *   - .unauthorized\n *   - .notAcceptable\n *   - .notFound\n *\n * @param {Number} status\n * @api private\n */\n\nResponse.prototype._setStatusProperties = function(status){\n  // handle IE9 bug: http://stackoverflow.com/questions/10046972/msie-returns-status-code-of-1223-for-ajax-request\n  if (status === 1223) {\n    status = 204;\n  }\n\n  var type = status / 100 | 0;\n\n  // status / class\n  this.status = this.statusCode = status;\n  this.statusType = type;\n\n  // basics\n  this.info = 1 == type;\n  this.ok = 2 == type;\n  this.clientError = 4 == type;\n  this.serverError = 5 == type;\n  this.error = (4 == type || 5 == type)\n    ? this.toError()\n    : false;\n\n  // sugar\n  this.accepted = 202 == status;\n  this.noContent = 204 == status;\n  this.badRequest = 400 == status;\n  this.unauthorized = 401 == status;\n  this.notAcceptable = 406 == status;\n  this.notFound = 404 == status;\n  this.forbidden = 403 == status;\n};\n\n/**\n * Return an `Error` representative of this response.\n *\n * @return {Error}\n * @api public\n */\n\nResponse.prototype.toError = function(){\n  var req = this.req;\n  var method = req.method;\n  var url = req.url;\n\n  var msg = 'cannot ' + method + ' ' + url + ' (' + this.status + ')';\n  var err = new Error(msg);\n  err.status = this.status;\n  err.method = method;\n  err.url = url;\n\n  return err;\n};\n\n/**\n * Expose `Response`.\n */\n\nrequest.Response = Response;\n\n/**\n * Initialize a new `Request` with the given `method` and `url`.\n *\n * @param {String} method\n * @param {String} url\n * @api public\n */\n\nfunction Request(method, url) {\n  var self = this;\n  this._query = this._query || [];\n  this.method = method;\n  this.url = url;\n  this.header = {}; // preserves header name case\n  this._header = {}; // coerces header names to lowercase\n  this.on('end', function(){\n    var err = null;\n    var res = null;\n\n    try {\n      res = new Response(self);\n    } catch(e) {\n      err = new Error('Parser is unable to parse the response');\n      err.parse = true;\n      err.original = e;\n      // issue #675: return the raw response if the response parsing fails\n      err.rawResponse = self.xhr && self.xhr.responseText ? self.xhr.responseText : null;\n      // issue #876: return the http status code if the response parsing fails\n      err.statusCode = self.xhr && self.xhr.status ? self.xhr.status : null;\n      return self.callback(err);\n    }\n\n    self.emit('response', res);\n\n    var new_err;\n    try {\n      if (res.status < 200 || res.status >= 300) {\n        new_err = new Error(res.statusText || 'Unsuccessful HTTP response');\n        new_err.original = err;\n        new_err.response = res;\n        new_err.status = res.status;\n      }\n    } catch(e) {\n      new_err = e; // #985 touching res may cause INVALID_STATE_ERR on old Android\n    }\n\n    // #1000 don't catch errors from the callback to avoid double calling it\n    if (new_err) {\n      self.callback(new_err, res);\n    } else {\n      self.callback(null, res);\n    }\n  });\n}\n\n/**\n * Mixin `Emitter` and `requestBase`.\n */\n\nEmitter(Request.prototype);\nfor (var key in requestBase) {\n  Request.prototype[key] = requestBase[key];\n}\n\n/**\n * Set Content-Type to `type`, mapping values from `request.types`.\n *\n * Examples:\n *\n *      superagent.types.xml = 'application/xml';\n *\n *      request.post('/')\n *        .type('xml')\n *        .send(xmlstring)\n *        .end(callback);\n *\n *      request.post('/')\n *        .type('application/xml')\n *        .send(xmlstring)\n *        .end(callback);\n *\n * @param {String} type\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.type = function(type){\n  this.set('Content-Type', request.types[type] || type);\n  return this;\n};\n\n/**\n * Set responseType to `val`. Presently valid responseTypes are 'blob' and\n * 'arraybuffer'.\n *\n * Examples:\n *\n *      req.get('/')\n *        .responseType('blob')\n *        .end(callback);\n *\n * @param {String} val\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.responseType = function(val){\n  this._responseType = val;\n  return this;\n};\n\n/**\n * Set Accept to `type`, mapping values from `request.types`.\n *\n * Examples:\n *\n *      superagent.types.json = 'application/json';\n *\n *      request.get('/agent')\n *        .accept('json')\n *        .end(callback);\n *\n *      request.get('/agent')\n *        .accept('application/json')\n *        .end(callback);\n *\n * @param {String} accept\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.accept = function(type){\n  this.set('Accept', request.types[type] || type);\n  return this;\n};\n\n/**\n * Set Authorization field value with `user` and `pass`.\n *\n * @param {String} user\n * @param {String} pass\n * @param {Object} options with 'type' property 'auto' or 'basic' (default 'basic')\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.auth = function(user, pass, options){\n  if (!options) {\n    options = {\n      type: 'basic'\n    }\n  }\n\n  switch (options.type) {\n    case 'basic':\n      var str = btoa(user + ':' + pass);\n      this.set('Authorization', 'Basic ' + str);\n    break;\n\n    case 'auto':\n      this.username = user;\n      this.password = pass;\n    break;\n  }\n  return this;\n};\n\n/**\n* Add query-string `val`.\n*\n* Examples:\n*\n*   request.get('/shoes')\n*     .query('size=10')\n*     .query({ color: 'blue' })\n*\n* @param {Object|String} val\n* @return {Request} for chaining\n* @api public\n*/\n\nRequest.prototype.query = function(val){\n  if ('string' != typeof val) val = serialize(val);\n  if (val) this._query.push(val);\n  return this;\n};\n\n/**\n * Queue the given `file` as an attachment to the specified `field`,\n * with optional `filename`.\n *\n * ``` js\n * request.post('/upload')\n *   .attach('content', new Blob(['<a id=\"a\"><b id=\"b\">hey!</b></a>'], { type: \"text/html\"}))\n *   .end(callback);\n * ```\n *\n * @param {String} field\n * @param {Blob|File} file\n * @param {String} filename\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.attach = function(field, file, filename){\n  this._getFormData().append(field, file, filename || file.name);\n  return this;\n};\n\nRequest.prototype._getFormData = function(){\n  if (!this._formData) {\n    this._formData = new root.FormData();\n  }\n  return this._formData;\n};\n\n/**\n * Invoke the callback with `err` and `res`\n * and handle arity check.\n *\n * @param {Error} err\n * @param {Response} res\n * @api private\n */\n\nRequest.prototype.callback = function(err, res){\n  var fn = this._callback;\n  this.clearTimeout();\n  fn(err, res);\n};\n\n/**\n * Invoke callback with x-domain error.\n *\n * @api private\n */\n\nRequest.prototype.crossDomainError = function(){\n  var err = new Error('Request has been terminated\\nPossible causes: the network is offline, Origin is not allowed by Access-Control-Allow-Origin, the page is being unloaded, etc.');\n  err.crossDomain = true;\n\n  err.status = this.status;\n  err.method = this.method;\n  err.url = this.url;\n\n  this.callback(err);\n};\n\n/**\n * Invoke callback with timeout error.\n *\n * @api private\n */\n\nRequest.prototype._timeoutError = function(){\n  var timeout = this._timeout;\n  var err = new Error('timeout of ' + timeout + 'ms exceeded');\n  err.timeout = timeout;\n  this.callback(err);\n};\n\n/**\n * Compose querystring to append to req.url\n *\n * @api private\n */\n\nRequest.prototype._appendQueryString = function(){\n  var query = this._query.join('&');\n  if (query) {\n    this.url += ~this.url.indexOf('?')\n      ? '&' + query\n      : '?' + query;\n  }\n};\n\n/**\n * Initiate request, invoking callback `fn(res)`\n * with an instanceof `Response`.\n *\n * @param {Function} fn\n * @return {Request} for chaining\n * @api public\n */\n\nRequest.prototype.end = function(fn){\n  var self = this;\n  var xhr = this.xhr = request.getXHR();\n  var timeout = this._timeout;\n  var data = this._formData || this._data;\n\n  // store callback\n  this._callback = fn || noop;\n\n  // state change\n  xhr.onreadystatechange = function(){\n    if (4 != xhr.readyState) return;\n\n    // In IE9, reads to any property (e.g. status) off of an aborted XHR will\n    // result in the error \"Could not complete the operation due to error c00c023f\"\n    var status;\n    try { status = xhr.status } catch(e) { status = 0; }\n\n    if (0 == status) {\n      if (self.timedout) return self._timeoutError();\n      if (self._aborted) return;\n      return self.crossDomainError();\n    }\n    self.emit('end');\n  };\n\n  // progress\n  var handleProgress = function(e){\n    if (e.total > 0) {\n      e.percent = e.loaded / e.total * 100;\n    }\n    e.direction = 'download';\n    self.emit('progress', e);\n  };\n  if (this.hasListeners('progress')) {\n    xhr.onprogress = handleProgress;\n  }\n  try {\n    if (xhr.upload && this.hasListeners('progress')) {\n      xhr.upload.onprogress = handleProgress;\n    }\n  } catch(e) {\n    // Accessing xhr.upload fails in IE from a web worker, so just pretend it doesn't exist.\n    // Reported here:\n    // https://connect.microsoft.com/IE/feedback/details/837245/xmlhttprequest-upload-throws-invalid-argument-when-used-from-web-worker-context\n  }\n\n  // timeout\n  if (timeout && !this._timer) {\n    this._timer = setTimeout(function(){\n      self.timedout = true;\n      self.abort();\n    }, timeout);\n  }\n\n  // querystring\n  this._appendQueryString();\n\n  // initiate request\n  if (this.username && this.password) {\n    xhr.open(this.method, this.url, true, this.username, this.password);\n  } else {\n    xhr.open(this.method, this.url, true);\n  }\n\n  // CORS\n  if (this._withCredentials) xhr.withCredentials = true;\n\n  // body\n  if ('GET' != this.method && 'HEAD' != this.method && 'string' != typeof data && !this._isHost(data)) {\n    // serialize stuff\n    var contentType = this._header['content-type'];\n    var serialize = this._serializer || request.serialize[contentType ? contentType.split(';')[0] : ''];\n    if (!serialize && isJSON(contentType)) serialize = request.serialize['application/json'];\n    if (serialize) data = serialize(data);\n  }\n\n  // set header fields\n  for (var field in this.header) {\n    if (null == this.header[field]) continue;\n    xhr.setRequestHeader(field, this.header[field]);\n  }\n\n  if (this._responseType) {\n    xhr.responseType = this._responseType;\n  }\n\n  // send stuff\n  this.emit('request', this);\n\n  // IE11 xhr.send(undefined) sends 'undefined' string as POST payload (instead of nothing)\n  // We need null here if data is undefined\n  xhr.send(typeof data !== 'undefined' ? data : null);\n  return this;\n};\n\n\n/**\n * Expose `Request`.\n */\n\nrequest.Request = Request;\n\n/**\n * GET `url` with optional callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed|Function} [data] or fn\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.get = function(url, data, fn){\n  var req = request('GET', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.query(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * HEAD `url` with optional callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed|Function} [data] or fn\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.head = function(url, data, fn){\n  var req = request('HEAD', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * OPTIONS query to `url` with optional callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed|Function} [data] or fn\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.options = function(url, data, fn){\n  var req = request('OPTIONS', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * DELETE `url` with optional callback `fn(res)`.\n *\n * @param {String} url\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nfunction del(url, fn){\n  var req = request('DELETE', url);\n  if (fn) req.end(fn);\n  return req;\n};\n\nrequest['del'] = del;\nrequest['delete'] = del;\n\n/**\n * PATCH `url` with optional `data` and callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed} [data]\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.patch = function(url, data, fn){\n  var req = request('PATCH', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * POST `url` with optional `data` and callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed} [data]\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.post = function(url, data, fn){\n  var req = request('POST', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n\n/**\n * PUT `url` with optional `data` and callback `fn(res)`.\n *\n * @param {String} url\n * @param {Mixed|Function} [data] or fn\n * @param {Function} [fn]\n * @return {Request}\n * @api public\n */\n\nrequest.put = function(url, data, fn){\n  var req = request('PUT', url);\n  if ('function' == typeof data) fn = data, data = null;\n  if (data) req.send(data);\n  if (fn) req.end(fn);\n  return req;\n};\n","/**\n * Check if `obj` is an object.\n *\n * @param {Object} obj\n * @return {Boolean}\n * @api private\n */\n\nfunction isObject(obj) {\n  return null !== obj && 'object' === typeof obj;\n}\n\nmodule.exports = isObject;\n","/**\n * Module of mixed-in functions shared between node and client code\n */\nvar isObject = require('./is-object');\n\n/**\n * Clear previous timeout.\n *\n * @return {Request} for chaining\n * @api public\n */\n\nexports.clearTimeout = function _clearTimeout(){\n  this._timeout = 0;\n  clearTimeout(this._timer);\n  return this;\n};\n\n/**\n * Override default response body parser\n *\n * This function will be called to convert incoming data into request.body\n *\n * @param {Function}\n * @api public\n */\n\nexports.parse = function parse(fn){\n  this._parser = fn;\n  return this;\n};\n\n/**\n * Override default request body serializer\n *\n * This function will be called to convert data set via .send or .attach into payload to send\n *\n * @param {Function}\n * @api public\n */\n\nexports.serialize = function serialize(fn){\n  this._serializer = fn;\n  return this;\n};\n\n/**\n * Set timeout to `ms`.\n *\n * @param {Number} ms\n * @return {Request} for chaining\n * @api public\n */\n\nexports.timeout = function timeout(ms){\n  this._timeout = ms;\n  return this;\n};\n\n/**\n * Promise support\n *\n * @param {Function} resolve\n * @param {Function} reject\n * @return {Request}\n */\n\nexports.then = function then(resolve, reject) {\n  if (!this._fullfilledPromise) {\n    var self = this;\n    this._fullfilledPromise = new Promise(function(innerResolve, innerReject){\n      self.end(function(err, res){\n        if (err) innerReject(err); else innerResolve(res);\n      });\n    });\n  }\n  return this._fullfilledPromise.then(resolve, reject);\n}\n\n/**\n * Allow for extension\n */\n\nexports.use = function use(fn) {\n  fn(this);\n  return this;\n}\n\n\n/**\n * Get request header `field`.\n * Case-insensitive.\n *\n * @param {String} field\n * @return {String}\n * @api public\n */\n\nexports.get = function(field){\n  return this._header[field.toLowerCase()];\n};\n\n/**\n * Get case-insensitive header `field` value.\n * This is a deprecated internal API. Use `.get(field)` instead.\n *\n * (getHeader is no longer used internally by the superagent code base)\n *\n * @param {String} field\n * @return {String}\n * @api private\n * @deprecated\n */\n\nexports.getHeader = exports.get;\n\n/**\n * Set header `field` to `val`, or multiple fields with one object.\n * Case-insensitive.\n *\n * Examples:\n *\n *      req.get('/')\n *        .set('Accept', 'application/json')\n *        .set('X-API-Key', 'foobar')\n *        .end(callback);\n *\n *      req.get('/')\n *        .set({ Accept: 'application/json', 'X-API-Key': 'foobar' })\n *        .end(callback);\n *\n * @param {String|Object} field\n * @param {String} val\n * @return {Request} for chaining\n * @api public\n */\n\nexports.set = function(field, val){\n  if (isObject(field)) {\n    for (var key in field) {\n      this.set(key, field[key]);\n    }\n    return this;\n  }\n  this._header[field.toLowerCase()] = val;\n  this.header[field] = val;\n  return this;\n};\n\n/**\n * Remove header `field`.\n * Case-insensitive.\n *\n * Example:\n *\n *      req.get('/')\n *        .unset('User-Agent')\n *        .end(callback);\n *\n * @param {String} field\n */\nexports.unset = function(field){\n  delete this._header[field.toLowerCase()];\n  delete this.header[field];\n  return this;\n};\n\n/**\n * Write the field `name` and `val` for \"multipart/form-data\"\n * request bodies.\n *\n * ``` js\n * request.post('/upload')\n *   .field('foo', 'bar')\n *   .end(callback);\n * ```\n *\n * @param {String} name\n * @param {String|Blob|File|Buffer|fs.ReadStream} val\n * @return {Request} for chaining\n * @api public\n */\nexports.field = function(name, val) {\n  this._getFormData().append(name, val);\n  return this;\n};\n\n/**\n * Abort the request, and clear potential timeout.\n *\n * @return {Request}\n * @api public\n */\nexports.abort = function(){\n  if (this._aborted) {\n    return this;\n  }\n  this._aborted = true;\n  this.xhr && this.xhr.abort(); // browser\n  this.req && this.req.abort(); // node\n  this.clearTimeout();\n  this.emit('abort');\n  return this;\n};\n\n/**\n * Enable transmission of cookies with x-domain requests.\n *\n * Note that for this to work the origin must not be\n * using \"Access-Control-Allow-Origin\" with a wildcard,\n * and also must set \"Access-Control-Allow-Credentials\"\n * to \"true\".\n *\n * @api public\n */\n\nexports.withCredentials = function(){\n  // This is browser-only functionality. Node side is no-op.\n  this._withCredentials = true;\n  return this;\n};\n\n/**\n * Set the max redirects to `n`. Does noting in browser XHR implementation.\n *\n * @param {Number} n\n * @return {Request} for chaining\n * @api public\n */\n\nexports.redirects = function(n){\n  this._maxRedirects = n;\n  return this;\n};\n\n/**\n * Convert to a plain javascript object (not JSON string) of scalar properties.\n * Note as this method is designed to return a useful non-this value,\n * it cannot be chained.\n *\n * @return {Object} describing method, url, and data of this request\n * @api public\n */\n\nexports.toJSON = function(){\n  return {\n    method: this.method,\n    url: this.url,\n    data: this._data,\n    headers: this._header\n  };\n};\n\n/**\n * Check if `obj` is a host object,\n * we don't want to serialize these :)\n *\n * TODO: future proof, move to compoent land\n *\n * @param {Object} obj\n * @return {Boolean}\n * @api private\n */\n\nexports._isHost = function _isHost(obj) {\n  var str = {}.toString.call(obj);\n\n  switch (str) {\n    case '[object File]':\n    case '[object Blob]':\n    case '[object FormData]':\n      return true;\n    default:\n      return false;\n  }\n}\n\n/**\n * Send `data` as the request body, defaulting the `.type()` to \"json\" when\n * an object is given.\n *\n * Examples:\n *\n *       // manual json\n *       request.post('/user')\n *         .type('json')\n *         .send('{\"name\":\"tj\"}')\n *         .end(callback)\n *\n *       // auto json\n *       request.post('/user')\n *         .send({ name: 'tj' })\n *         .end(callback)\n *\n *       // manual x-www-form-urlencoded\n *       request.post('/user')\n *         .type('form')\n *         .send('name=tj')\n *         .end(callback)\n *\n *       // auto x-www-form-urlencoded\n *       request.post('/user')\n *         .type('form')\n *         .send({ name: 'tj' })\n *         .end(callback)\n *\n *       // defaults to x-www-form-urlencoded\n *      request.post('/user')\n *        .send('name=tobi')\n *        .send('species=ferret')\n *        .end(callback)\n *\n * @param {String|Object} data\n * @return {Request} for chaining\n * @api public\n */\n\nexports.send = function(data){\n  var obj = isObject(data);\n  var type = this._header['content-type'];\n\n  // merge\n  if (obj && isObject(this._data)) {\n    for (var key in data) {\n      this._data[key] = data[key];\n    }\n  } else if ('string' == typeof data) {\n    // default to x-www-form-urlencoded\n    if (!type) this.type('form');\n    type = this._header['content-type'];\n    if ('application/x-www-form-urlencoded' == type) {\n      this._data = this._data\n        ? this._data + '&' + data\n        : data;\n    } else {\n      this._data = (this._data || '') + data;\n    }\n  } else {\n    this._data = data;\n  }\n\n  if (!obj || this._isHost(data)) return this;\n\n  // default to json\n  if (!type) this.type('json');\n  return this;\n};\n","// The node and browser modules expose versions of this with the\n// appropriate constructor function bound as first argument\n/**\n * Issue a request:\n *\n * Examples:\n *\n *    request('GET', '/users').end(callback)\n *    request('/users').end(callback)\n *    request('/users', callback)\n *\n * @param {String} method\n * @param {String|Function} url or callback\n * @return {Request}\n * @api public\n */\n\nfunction request(RequestConstructor, method, url) {\n  // callback\n  if ('function' == typeof url) {\n    return new RequestConstructor('GET', method).end(url);\n  }\n\n  // url first\n  if (2 == arguments.length) {\n    return new RequestConstructor('GET', method);\n  }\n\n  return new RequestConstructor(method, url);\n}\n\nmodule.exports = request;\n","\r\n/**\r\n * Expose `Emitter`.\r\n */\r\n\r\nif (typeof module !== 'undefined') {\r\n  module.exports = Emitter;\r\n}\r\n\r\n/**\r\n * Initialize a new `Emitter`.\r\n *\r\n * @api public\r\n */\r\n\r\nfunction Emitter(obj) {\r\n  if (obj) return mixin(obj);\r\n};\r\n\r\n/**\r\n * Mixin the emitter properties.\r\n *\r\n * @param {Object} obj\r\n * @return {Object}\r\n * @api private\r\n */\r\n\r\nfunction mixin(obj) {\r\n  for (var key in Emitter.prototype) {\r\n    obj[key] = Emitter.prototype[key];\r\n  }\r\n  return obj;\r\n}\r\n\r\n/**\r\n * Listen on the given `event` with `fn`.\r\n *\r\n * @param {String} event\r\n * @param {Function} fn\r\n * @return {Emitter}\r\n * @api public\r\n */\r\n\r\nEmitter.prototype.on =\r\nEmitter.prototype.addEventListener = function(event, fn){\r\n  this._callbacks = this._callbacks || {};\r\n  (this._callbacks['$' + event] = this._callbacks['$' + event] || [])\r\n    .push(fn);\r\n  return this;\r\n};\r\n\r\n/**\r\n * Adds an `event` listener that will be invoked a single\r\n * time then automatically removed.\r\n *\r\n * @param {String} event\r\n * @param {Function} fn\r\n * @return {Emitter}\r\n * @api public\r\n */\r\n\r\nEmitter.prototype.once = function(event, fn){\r\n  function on() {\r\n    this.off(event, on);\r\n    fn.apply(this, arguments);\r\n  }\r\n\r\n  on.fn = fn;\r\n  this.on(event, on);\r\n  return this;\r\n};\r\n\r\n/**\r\n * Remove the given callback for `event` or all\r\n * registered callbacks.\r\n *\r\n * @param {String} event\r\n * @param {Function} fn\r\n * @return {Emitter}\r\n * @api public\r\n */\r\n\r\nEmitter.prototype.off =\r\nEmitter.prototype.removeListener =\r\nEmitter.prototype.removeAllListeners =\r\nEmitter.prototype.removeEventListener = function(event, fn){\r\n  this._callbacks = this._callbacks || {};\r\n\r\n  // all\r\n  if (0 == arguments.length) {\r\n    this._callbacks = {};\r\n    return this;\r\n  }\r\n\r\n  // specific event\r\n  var callbacks = this._callbacks['$' + event];\r\n  if (!callbacks) return this;\r\n\r\n  // remove all handlers\r\n  if (1 == arguments.length) {\r\n    delete this._callbacks['$' + event];\r\n    return this;\r\n  }\r\n\r\n  // remove specific handler\r\n  var cb;\r\n  for (var i = 0; i < callbacks.length; i++) {\r\n    cb = callbacks[i];\r\n    if (cb === fn || cb.fn === fn) {\r\n      callbacks.splice(i, 1);\r\n      break;\r\n    }\r\n  }\r\n  return this;\r\n};\r\n\r\n/**\r\n * Emit `event` with the given args.\r\n *\r\n * @param {String} event\r\n * @param {Mixed} ...\r\n * @return {Emitter}\r\n */\r\n\r\nEmitter.prototype.emit = function(event){\r\n  this._callbacks = this._callbacks || {};\r\n  var args = [].slice.call(arguments, 1)\r\n    , callbacks = this._callbacks['$' + event];\r\n\r\n  if (callbacks) {\r\n    callbacks = callbacks.slice(0);\r\n    for (var i = 0, len = callbacks.length; i < len; ++i) {\r\n      callbacks[i].apply(this, args);\r\n    }\r\n  }\r\n\r\n  return this;\r\n};\r\n\r\n/**\r\n * Return array of callbacks for `event`.\r\n *\r\n * @param {String} event\r\n * @return {Array}\r\n * @api public\r\n */\r\n\r\nEmitter.prototype.listeners = function(event){\r\n  this._callbacks = this._callbacks || {};\r\n  return this._callbacks['$' + event] || [];\r\n};\r\n\r\n/**\r\n * Check if this emitter has `event` handlers.\r\n *\r\n * @param {String} event\r\n * @return {Boolean}\r\n * @api public\r\n */\r\n\r\nEmitter.prototype.hasListeners = function(event){\r\n  return !! this.listeners(event).length;\r\n};\r\n"," /*global JSONEditor*/\n'use strict';\n\nwindow.SwaggerUi = Backbone.Router.extend({\n\n  dom_id: 'swagger_ui',\n\n  // Attributes\n  options: null,\n  api: null,\n  headerView: null,\n  mainView: null,\n\n  // SwaggerUi accepts all the same options as SwaggerApi\n  initialize: function(options) {\n    options = options || {};\n\n    if (options.defaultModelRendering !== 'model') {\n      options.defaultModelRendering = 'schema';\n    }\n\n    if (!options.highlightSizeThreshold) {\n      options.highlightSizeThreshold = 100000;\n    }\n\n    // Allow dom_id to be overridden\n    if (options.dom_id) {\n      this.dom_id = options.dom_id;\n      delete options.dom_id;\n    }\n\n    if (!options.supportedSubmitMethods){\n      options.supportedSubmitMethods = [\n        'get',\n        'put',\n        'post',\n        'delete',\n        'head',\n        'options',\n        'patch'\n      ];\n    }\n\n    if (typeof options.oauth2RedirectUrl === 'string') {\n      window.oAuthRedirectUrl = options.oauth2RedirectUrl;\n    }\n\n    // Create an empty div which contains the dom_id\n    if (! $('#' + this.dom_id).length){\n      $('body').append('<div id=\"' + this.dom_id + '\"></div>') ;\n    }\n\n    this.options = options;\n\n    // set marked options\n    marked.setOptions({gfm: true});\n\n    // Set the callbacks\n    var that = this;\n    this.options.success = function() { return that.render(); };\n    this.options.progress = function(d) { return that.showMessage(d); };\n    this.options.failure = function(d) { return that.onLoadFailure(d); };\n\n    // Create view to handle the header inputs\n    this.headerView = new SwaggerUi.Views.HeaderView({el: $('#header')});\n\n    // Event handler for when the baseUrl/apiKey is entered by user\n    this.headerView.on('update-swagger-ui', function(data) {\n      return that.updateSwaggerUi(data);\n    });\n\n    // JSon Editor custom theming\n     JSONEditor.defaults.iconlibs.swagger = JSONEditor.AbstractIconLib.extend({\n      mapping: {\n        collapse: 'collapse',\n        expand: 'expand'\n        },\n      icon_prefix: 'swagger-'\n      });\n\n  },\n\n  // Set an option after initializing\n  setOption: function(option, value) {\n    this.options[option] = value;\n  },\n\n  // Get the value of a previously set option\n  getOption: function(option) {\n    return this.options[option];\n  },\n\n  // Event handler for when url/key is received from user\n  updateSwaggerUi: function(data){\n    this.options.url = data.url;\n    this.load();\n  },\n\n  // Create an api and render\n  load: function(){\n    // Initialize the API object\n    if (this.mainView) {\n      this.mainView.clear();\n    }\n\n    if (this.authView) {\n      this.authView.remove();\n    }\n    var url = this.options.url;\n    if (url && url.indexOf('http') !== 0) {\n      url = this.buildUrl(window.location.href.toString(), url);\n    }\n    if(this.api) {\n      this.options.authorizations = this.api.clientAuthorizations.authz;\n    }\n    this.options.url = url;\n    this.headerView.update(url);\n\n    this.api = new SwaggerClient(this.options);\n  },\n\n  // collapse all sections\n  collapseAll: function(){\n    Docs.collapseEndpointListForResource('');\n  },\n\n  // list operations for all sections\n  listAll: function(){\n    Docs.collapseOperationsForResource('');\n  },\n\n  // expand operations for all sections\n  expandAll: function(){\n    Docs.expandOperationsForResource('');\n  },\n\n  // This is bound to success handler for SwaggerApi\n  //  so it gets called when SwaggerApi completes loading\n  render: function(){\n    var authsModel;\n    this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...');\n    this.mainView = new SwaggerUi.Views.MainView({\n      model: this.api,\n      el: $('#' + this.dom_id),\n      swaggerOptions: this.options,\n      router: this\n    }).render();\n    if (!_.isEmpty(this.api.securityDefinitions)){\n      authsModel = _.map(this.api.securityDefinitions, function (auth, name) {\n        var result = {};\n        result[name] = auth;\n        return result;\n      });\n      this.authView = new SwaggerUi.Views.AuthButtonView({\n        data: SwaggerUi.utils.parseSecurityDefinitions(authsModel),\n        router: this\n      });\n      $('#auth_container').append(this.authView.render().el);\n    }\n    this.showMessage();\n    switch (this.options.docExpansion) {\n      case 'full':\n        this.expandAll(); break;\n      case 'list':\n        this.listAll(); break;\n      default:\n        break;\n    }\n    this.renderGFM();\n\n    if (this.options.onComplete){\n      this.options.onComplete(this.api, this);\n    }\n\n    setTimeout(Docs.shebang.bind(this), 100);\n  },\n\n  buildUrl: function(base, url){\n    if (url.indexOf('/') === 0) {\n      var parts = base.split('/');\n      base = parts[0] + '//' + parts[2];\n      return base + url;\n    } else {\n      var endOfPath = base.length;\n\n      if (base.indexOf('?') > -1){\n        endOfPath = Math.min(endOfPath, base.indexOf('?'));\n      }\n\n      if (base.indexOf('#') > -1){\n        endOfPath = Math.min(endOfPath, base.indexOf('#'));\n      }\n\n      base = base.substring(0, endOfPath);\n\n      if (base.indexOf('/', base.length - 1 ) !== -1){\n        return base + url;\n      }\n\n      return base + '/' + url;\n    }\n  },\n\n  // Shows message on topbar of the ui\n  showMessage: function(data){\n    if (data === undefined) {\n      data = '';\n    }\n    var $msgbar = $('#message-bar');\n    $msgbar.removeClass('message-fail');\n    $msgbar.addClass('message-success');\n    $msgbar.text(data);\n    if(window.SwaggerTranslator) {\n      window.SwaggerTranslator.translate($msgbar);\n    }\n  },\n\n  // shows message in red\n  onLoadFailure: function(data){\n    if (data === undefined) {\n      data = '';\n    }\n    $('#message-bar').removeClass('message-success');\n    $('#message-bar').addClass('message-fail');\n\n    var val = $('#message-bar').text(data);\n\n    if (this.options.onFailure) {\n      this.options.onFailure(data);\n    }\n\n    return val;\n  },\n\n  // Renders GFM for elements with 'markdown' class\n  renderGFM: function(){\n    $('.markdown').each(function(){\n      $(this).html(marked($(this).html()));\n    });\n\n    $('.propDesc', '.model-signature .description').each(function () {\n      $(this).html(marked($(this).html())).addClass('markdown');\n    });\n  }\n\n});\n\nwindow.SwaggerUi.Views = {};\nwindow.SwaggerUi.Models = {};\nwindow.SwaggerUi.Collections = {};\nwindow.SwaggerUi.partials = {};\nwindow.SwaggerUi.utils = {};\n\n// don't break backward compatibility with previous versions and warn users to upgrade their code\n(function(){\n  window.authorizations = {\n    add: function() {\n      warn('Using window.authorizations is deprecated. Please use SwaggerUi.api.clientAuthorizations.add().');\n\n      if (typeof window.swaggerUi === 'undefined') {\n        throw new TypeError('window.swaggerUi is not defined');\n      }\n\n      if (window.swaggerUi instanceof SwaggerUi) {\n        window.swaggerUi.api.clientAuthorizations.add.apply(window.swaggerUi.api.clientAuthorizations, arguments);\n      }\n    }\n  };\n\n  window.ApiKeyAuthorization = function() {\n    warn('window.ApiKeyAuthorization is deprecated. Please use SwaggerClient.ApiKeyAuthorization.');\n    SwaggerClient.ApiKeyAuthorization.apply(window, arguments);\n  };\n\n  window.PasswordAuthorization = function() {\n    warn('window.PasswordAuthorization is deprecated. Please use SwaggerClient.PasswordAuthorization.');\n    SwaggerClient.PasswordAuthorization.apply(window, arguments);\n  };\n\n  function warn(message) {\n    if ('console' in window && typeof window.console.warn === 'function') {\n      console.warn(message);\n    }\n  }\n})();\n\n\n// UMD\n(function (root, factory) {\n    if (typeof define === 'function' && define.amd) {\n        // AMD. Register as an anonymous module.\n        define(['b'], function (b) {\n            return (root.SwaggerUi = factory(b));\n        });\n    } else if (typeof exports === 'object') {\n        // Node. Does not work with strict CommonJS, but\n        // only CommonJS-like environments that support module.exports,\n        // like Node.\n        module.exports = factory(require('b'));\n    } else {\n        // Browser globals\n        root.SwaggerUi = factory(root.b);\n    }\n}(this, function () {\n    return SwaggerUi;\n}));\n","'use strict';\n\nwindow.SwaggerUi.utils = {\n    parseSecurityDefinitions: function (security, securityDefinitions) {\n        var auths = Object.assign({}, securityDefinitions);\n        var oauth2Arr = [];\n        var authsArr = [];\n        var scopes = [];\n        var utils = window.SwaggerUi.utils;\n\n        if (!Array.isArray(security)) { return null; }\n\n        security.forEach(function (item) {\n            var singleSecurity = {};\n            var singleOauth2Security = {};\n\n            for (var key in item) {\n                if (Array.isArray(item[key])) {\n                    if (!auths[key]) { continue; }\n                    auths[key] = auths[key] || {};\n                    if (auths[key].type === 'oauth2') {\n                        singleOauth2Security[key] = Object.assign({}, auths[key]);\n                        singleOauth2Security[key].scopes = Object.assign({}, auths[key].scopes);\n                        for (var i in singleOauth2Security[key].scopes) {\n                            if (item[key].indexOf(i) < 0) {\n                                delete singleOauth2Security[key].scopes[i];\n                            }\n                        }\n                        singleOauth2Security[key].scopes = utils.parseOauth2Scopes(singleOauth2Security[key].scopes);\n                        scopes = _.merge(scopes, singleOauth2Security[key].scopes);\n                    } else {\n                        singleSecurity[key] = Object.assign({}, auths[key]);\n                    }\n                } else {\n                    if (item[key].type === 'oauth2') {\n                        singleOauth2Security[key] = Object.assign({}, item[key]);\n                        singleOauth2Security[key].scopes = utils.parseOauth2Scopes(singleOauth2Security[key].scopes);\n                        scopes = _.merge(scopes, singleOauth2Security[key].scopes);\n                    } else {\n                        singleSecurity[key] = item[key];\n                    }\n                }\n            }\n\n            if (!_.isEmpty(singleSecurity)) {\n                authsArr.push(singleSecurity);\n            }\n\n            if (!_.isEmpty(singleOauth2Security)){\n                oauth2Arr.push(singleOauth2Security);\n            }\n        });\n\n        return {\n            auths : authsArr,\n            oauth2: oauth2Arr,\n            scopes: scopes\n        };\n    },\n\n    parseOauth2Scopes: function (data) {\n        var scopes = Object.assign({}, data);\n        var result = [];\n        var key;\n\n        for (key in scopes) {\n            result.push({scope: key, description: scopes[key]});\n        }\n\n        return result;\n    },\n\n    sanitize: function(html) {\n        // Strip the script tags from the html and inline evenhandlers\n        html = html.replace(/<script\\b[^<]*(?:(?!<\\/script>)<[^<]*)*<\\/script>/gi, '');\n        html = html.replace(/(on\\w+=\"[^\"]*\")*(on\\w+='[^']*')*(on\\w+=\\w*\\(\\w*\\))*/gi, '');\n\n        return html;\n    }\n};","'use strict';\n\nSwaggerUi.Models.ApiKeyAuthModel = Backbone.Model.extend({\n    defaults: {\n        'in': '',\n        name: '',\n        title: '',\n        value: ''\n    },\n\n    initialize: function () {\n        this.on('change', this.validate);\n    },\n\n    validate: function () {\n        var valid = !!this.get('value');\n\n        this.set('valid', valid);\n\n        return valid;\n    }\n});","'use strict';\n\nSwaggerUi.Views.ApiKeyAuthView = Backbone.View.extend({ // TODO: append this to global SwaggerUi\n\n    events: {\n        'change .input_apiKey_entry': 'apiKeyChange'\n    },\n\n    selectors: {\n        apikeyInput: '.input_apiKey_entry'\n    },\n\n    template: Handlebars.templates.apikey_auth,\n\n    initialize: function(opts) {\n        this.options = opts || {};\n        this.router = this.options.router;\n    },\n\n    render: function (){\n        this.$el.html(this.template(this.model.toJSON()));\n\n        return this;\n    },\n\n    apiKeyChange: function (e) {\n        var val = $(e.target).val();\n        if (val) {\n            this.$(this.selectors.apikeyInput).removeClass('error');\n        }\n\n        this.model.set('value', val);\n    },\n\n    isValid: function () {\n        return this.model.validate();\n    },\n\n    highlightInvalid: function () {\n        if (!this.isValid()) {\n            this.$(this.selectors.apikeyInput).addClass('error');\n        }\n    }\n\n});","'use strict';\n\nSwaggerUi.Views.AuthButtonView = Backbone.View.extend({\n    events: {\n        'click .authorize__btn': 'authorizeBtnClick'\n    },\n\n    tpls: {\n        popup: Handlebars.templates.popup,\n        authBtn: Handlebars.templates.auth_button,\n        authBtnOperation: Handlebars.templates.auth_button_operation\n    },\n\n    initialize: function(opts) {\n        this.options = opts || {};\n        this.options.data = this.options.data || {};\n        this.isOperation = this.options.isOperation;\n        this.model = this.model || {};\n        this.router = this.options.router;\n        this.auths = this.options.data.oauth2.concat(this.options.data.auths);\n    },\n\n    render: function () {\n        var tplName = this.isOperation ? 'authBtnOperation' : 'authBtn';\n\n        this.$authEl = this.renderAuths(this.auths);\n        this.$el.html(this.tpls[tplName](this.model));\n\n        return this;\n    },\n\n    authorizeBtnClick: function (e) {\n        var authsModel;\n\n        e.preventDefault();\n\n        authsModel = {\n            title: 'Available authorizations',\n            content: this.$authEl\n        };\n\n        // The content of the popup is removed and all events unbound after clicking the 'Cancel' button of the popup.\n        // We'll have to re-render the contents before creating a new popup view.\n        this.render();\n\n        this.popup = new SwaggerUi.Views.PopupView({model: authsModel});\n        this.popup.render();\n    },\n\n    renderAuths: function (auths) {\n        var $el = $('<div>');\n        var isLogout = false;\n\n        auths.forEach(function (auth) {\n            var authView = new SwaggerUi.Views.AuthView({data: auth, router: this.router});\n            var authEl = authView.render().el;\n            $el.append(authEl);\n            if (authView.isLogout) {\n                isLogout = true;\n            }\n        }, this);\n\n        this.model.isLogout = isLogout;\n\n        return $el;\n    }\n\n});\n","'use strict';\n\nSwaggerUi.Collections.AuthsCollection = Backbone.Collection.extend({\n    constructor: function() {\n        var args = Array.prototype.slice.call(arguments);\n\n        args[0] = this.parse(args[0]);\n\n        Backbone.Collection.apply(this, args);\n    },\n\n    add: function (model) {\n        var args = Array.prototype.slice.call(arguments);\n\n        if (Array.isArray(model)) {\n            args[0] = _.map(model, function(val) {\n                return this.handleOne(val);\n            }, this);\n        } else {\n            args[0] = this.handleOne(model);\n        }\n\n        Backbone.Collection.prototype.add.apply(this, args);\n    },\n\n    handleOne: function (model) {\n        var result = model;\n\n        if (! (model instanceof Backbone.Model) ) {\n            switch (model.type) {\n                case 'oauth2':\n                    result = new SwaggerUi.Models.Oauth2Model(model);\n                    break;\n                case 'basic':\n                    result = new SwaggerUi.Models.BasicAuthModel(model);\n                    break;\n                case 'apiKey':\n                    result = new SwaggerUi.Models.ApiKeyAuthModel(model);\n                    break;\n                default:\n                    result = new Backbone.Model(model);\n            }\n        }\n\n        return result;\n    },\n\n    isValid: function () {\n        var valid = true;\n\n        this.models.forEach(function(model) {\n            if (!model.validate()) {\n                valid = false;\n            }\n        });\n\n        return valid;\n    },\n\n    isAuthorized: function () {\n        return this.length === this.where({ isLogout: true }).length;\n    },\n\n    isPartiallyAuthorized: function () {\n        return this.where({ isLogout: true }).length > 0;\n    },\n\n    parse: function (data) {\n        var authz = {};\n\n        if(typeof window.swaggerUi !== 'undefined') {\n            authz = Object.assign({}, window.swaggerUi.api.clientAuthorizations.authz);\n        }\n\n        return _.map(data, function (auth, name) {\n            var isBasic = authz[name] && auth.type === 'basic' && authz[name].username && authz[name].password;\n\n            _.extend(auth, {\n                title: name\n            });\n\n            if (authz[name] || isBasic) {\n                _.extend(auth, {\n                    isLogout: true,\n                    value: isBasic ? undefined : authz[name].value,\n                    username: isBasic ? authz[name].username : undefined,\n                    password: isBasic ? authz[name].password : undefined,\n                    valid: true\n                });\n            }\n\n            return auth;\n        });\n    }\n});","'use strict';\n\nSwaggerUi.Views.AuthsCollectionView = Backbone.View.extend({\n\n    initialize: function(opts) {\n        this.options = opts || {};\n        this.options.data = this.options.data || {};\n        this.router = this.options.router;\n\n        this.collection = new SwaggerUi.Collections.AuthsCollection(opts.data);\n\n        this.$innerEl = $('<div>');\n        this.authViews = [];\n    },\n\n    render: function () {\n        this.collection.each(function (auth) {\n            this.renderOneAuth(auth);\n        }, this);\n\n        this.$el.html(this.$innerEl.html() ? this.$innerEl : '');\n\n        return this;\n    },\n\n    renderOneAuth: function (authModel) {\n        var authViewEl, authView, authViewName;\n        var type = authModel.get('type');\n\n        if (type === 'apiKey') {\n            authViewName = 'ApiKeyAuthView';\n        } else if (type === 'basic' && this.$innerEl.find('.basic_auth_container').length === 0) {\n            authViewName = 'BasicAuthView';\n        } else if (type === 'oauth2') {\n            authViewName = 'Oauth2View';\n        }\n\n        if (authViewName) {\n            authView = new SwaggerUi.Views[authViewName]({model: authModel, router: this.router});\n            authViewEl = authView.render().el;\n            this.authViews.push(authView);\n        }\n\n        this.$innerEl.append(authViewEl);\n    },\n\n    highlightInvalid: function () {\n        this.authViews.forEach(function (view) {\n            view.highlightInvalid();\n        }, this);\n    }\n\n});\n","'use strict';\n\n/* global redirect_uri:true */\n/* global clientId */\n/* global scopeSeparator */\n/* global additionalQueryStringParams */\n/* global clientSecret */\n/* global onOAuthComplete */\n/* global realm */\n/*jshint unused:false*/\n\nSwaggerUi.Views.AuthView = Backbone.View.extend({\n    events: {\n        'click .auth_submit__button': 'authorizeClick',\n        'click .auth_logout__button': 'logoutClick'\n    },\n\n    tpls: {\n        main: Handlebars.templates.auth_view\n    },\n\n    selectors: {\n        innerEl: '.auth_inner',\n        authBtn: '.auth_submit__button'\n    },\n\n    initialize: function(opts) {\n        this.options = opts || {};\n        opts.data = opts.data || {};\n        this.router = this.options.router;\n\n        this.authsCollectionView = new SwaggerUi.Views.AuthsCollectionView({data: opts.data});\n\n        this.$el.html(this.tpls.main({\n            isLogout: this.authsCollectionView.collection.isAuthorized(),\n            isAuthorized: this.authsCollectionView.collection.isPartiallyAuthorized()\n        }));\n        this.$innerEl = this.$(this.selectors.innerEl);\n        this.isLogout = this.authsCollectionView.collection.isPartiallyAuthorized();\n    },\n\n    render: function () {\n        this.$innerEl.html(this.authsCollectionView.render().el);\n\n        return this;\n    },\n\n    authorizeClick: function (e) {\n        e.preventDefault();\n        e.stopPropagation();\n\n        if (this.authsCollectionView.collection.isValid()) {\n            this.authorize();\n        } else {\n            this.authsCollectionView.highlightInvalid();\n        }\n    },\n\n    authorize: function () {\n        this.authsCollectionView.collection.forEach(function (auth) {\n            var keyAuth, basicAuth;\n            var type = auth.get('type');\n\n            if (type === 'apiKey') {\n                keyAuth = new SwaggerClient.ApiKeyAuthorization(\n                    auth.get('name'),\n                    auth.get('value'),\n                    auth.get('in')\n                );\n\n                this.router.api.clientAuthorizations.add(auth.get('title'), keyAuth);\n            } else if (type === 'basic') {\n                basicAuth = new SwaggerClient.PasswordAuthorization(auth.get('username'), auth.get('password'));\n                this.router.api.clientAuthorizations.add(auth.get('title'), basicAuth);\n            } else if (type === 'oauth2') {\n                this.handleOauth2Login(auth);\n            }\n        }, this);\n\n        this.router.load();\n    },\n\n    logoutClick: function (e) {\n        e.preventDefault();\n\n        this.authsCollectionView.collection.forEach(function (auth) {\n            window.swaggerUi.api.clientAuthorizations.remove(auth.get('title'));\n        });\n\n        this.router.load();\n    },\n\n    // taken from lib/swagger-oauth.js\n    handleOauth2Login: function (auth) {\n        var host = window.location;\n        var pathname = location.pathname.substring(0, location.pathname.lastIndexOf('/'));\n        var defaultRedirectUrl = host.protocol + '//' + host.host + pathname + '/o2c.html';\n        var redirectUrl = window.oAuthRedirectUrl || defaultRedirectUrl;\n        var url = null;\n        var scopes = _.map(auth.get('scopes'), function (scope) {\n            if(scope.checked) {\n                return scope.scope;\n            }\n        });\n        var container = window.swaggerUiAuth || (window.swaggerUiAuth = {});\n        var state, dets, ep;\n        container.OAuthSchemeKey = auth.get('title');\n\n        window.enabledScopes = scopes;\n        var flow = auth.get('flow');\n\n        /**\n         * Returns the name of the access token parameter returned by the server.\n         *\n         * @param dets\n         *     The authorisation scheme configuration.\n         * @return the name of the access token parameter\n         */\n        function getTokenName(dets) {\n            return dets.vendorExtensions['x-tokenName'] || dets.tokenName;\n        }\n\n        if(auth.get('type') === 'oauth2' && flow && (flow === 'implicit' || flow === 'accessCode')) {\n            dets = auth.attributes;\n            url = dets.authorizationUrl + '?response_type=' + (flow === 'implicit' ? 'token' : 'code');\n            container.tokenName = getTokenName(dets) || 'access_token';\n            container.tokenUrl = (flow === 'accessCode' ? dets.tokenUrl : null);\n            state = container.OAuthSchemeKey;\n        }\n        else if(auth.get('type') === 'oauth2' && flow && (flow === 'application')) {\n            dets = auth.attributes;\n            container.tokenName = getTokenName(dets) || 'access_token';\n            this.clientCredentialsFlow(scopes, dets, container.OAuthSchemeKey);\n            return;\n        }\n        else if(auth.get('type') === 'oauth2' && flow && (flow === 'password')) {\n            dets = auth.attributes;\n            container.tokenName = getTokenName(dets) || 'access_token';\n            this.passwordFlow(scopes, dets, container.OAuthSchemeKey);\n            return;\n        }\n        else if(auth.get('grantTypes')) {\n            // 1.2 support\n            var o = auth.get('grantTypes');\n            for(var t in o) {\n                if(o.hasOwnProperty(t) && t === 'implicit') {\n                    dets = o[t];\n                    ep = dets.loginEndpoint.url;\n                    url = dets.loginEndpoint.url + '?response_type=token';\n                    container.tokenName = getTokenName(dets);\n                }\n                else if (o.hasOwnProperty(t) && t === 'accessCode') {\n                    dets = o[t];\n                    ep = dets.tokenRequestEndpoint.url;\n                    url = dets.tokenRequestEndpoint.url + '?response_type=code';\n                    container.tokenName = getTokenName(dets);\n                }\n            }\n        }\n\n        redirect_uri = redirectUrl;\n\n        url += '&redirect_uri=' + encodeURIComponent(redirectUrl);\n        url += '&realm=' + encodeURIComponent(realm);\n        url += '&client_id=' + encodeURIComponent(clientId);\n        url += '&scope=' + encodeURIComponent(scopes.join(scopeSeparator));\n        url += '&state=' + encodeURIComponent(state);\n        for (var key in additionalQueryStringParams) {\n            url += '&' + key + '=' + encodeURIComponent(additionalQueryStringParams[key]);\n        }\n\n        window.open(url);\n    },\n\n    // taken from lib/swagger-oauth.js\n    clientCredentialsFlow: function (scopes, oauth, OAuthSchemeKey) {\n        this.accessTokenRequest(scopes, oauth, OAuthSchemeKey, 'client_credentials');\n    },\n\n    passwordFlow: function (scopes, oauth, OAuthSchemeKey) {\n        this.accessTokenRequest(scopes, oauth, OAuthSchemeKey, 'password', {\n            'username': oauth.username,\n            'password': oauth.password\n        });\n    },\n\n    accessTokenRequest: function (scopes, oauth, OAuthSchemeKey, grantType, params) {\n        params = $.extend({}, {\n            'scope': scopes.join(' '),\n            'grant_type': grantType\n        }, params);\n\n        var headers= {};\n\n        switch (oauth.clientAuthenticationType) {\n            case 'basic':\n                headers.Authorization = 'Basic ' + btoa(oauth.clientId + ':' + oauth.clientSecret);\n                break;\n            case 'request-body':\n                params.client_id = oauth.clientId;\n                params.client_secret = oauth.clientSecret;\n                break;\n        }\n\n        $.ajax({\n            url : oauth.tokenUrl,\n            type: 'POST',\n            data: params,\n            headers: headers,\n            success: function (data)\n            {\n                onOAuthComplete(data, OAuthSchemeKey);\n            },\n            error: function ()\n            {\n                onOAuthComplete('');\n            }\n        });\n    }\n});\n","'use strict';\n\nSwaggerUi.Models.BasicAuthModel = Backbone.Model.extend({\n    defaults: {\n        username: '',\n        password: '',\n        title: 'basic'\n    },\n\n    initialize: function () {\n        this.on('change', this.validate);\n    },\n\n    validate: function () {\n        var valid = !!this.get('password') && !!this.get('username');\n\n        this.set('valid', valid);\n\n        return valid;\n    }\n});","'use strict';\n\nSwaggerUi.Views.BasicAuthView = Backbone.View.extend({\n\n    initialize: function (opts) {\n        this.options = opts || {};\n        this.router = this.options.router;\n    },\n\n    events: {\n        'change .auth_input': 'inputChange'\n    },\n\n    selectors: {\n        usernameInput: '.basic_auth__username',\n        passwordInput: '.basic_auth__password'\n    },\n\n    cls: {\n        error: 'error'\n    },\n\n    template: Handlebars.templates.basic_auth,\n\n    render: function(){\n        $(this.el).html(this.template(this.model.toJSON()));\n\n        return this;\n    },\n\n    inputChange: function (e) {\n        var $el = $(e.target);\n        var val = $el.val();\n        var attr = $el.prop('name');\n\n        if (val) {\n            $el.removeClass(this.cls.error);\n        }\n\n        this.model.set(attr, val);\n    },\n\n    isValid: function () {\n        return this.model.validate();\n    },\n\n    highlightInvalid: function () {\n        if (!this.model.get('username')) {\n            this.$(this.selectors.usernameInput).addClass(this.cls.error);\n        }\n    }\n});\n","'use strict';\n\nSwaggerUi.Views.ContentTypeView = Backbone.View.extend({\n  initialize: function() {},\n\n  render: function(){\n  \tthis.model.contentTypeId = 'ct' + Math.random();\n    $(this.el).html(Handlebars.templates.content_type(this.model));\n    return this;\n  }\n});","'use strict';\n\nSwaggerUi.Views.HeaderView = Backbone.View.extend({\n  events: {\n    'click #show-pet-store-icon'    : 'showPetStore',\n    'click #explore'                : 'showCustom',\n    'submit #api_selector'          : 'showCustom',\n    'keyup #input_baseUrl'          : 'showCustomOnKeyup',\n    'keyup #input_apiKey'           : 'showCustomOnKeyup'\n  },\n\n  initialize: function(){},\n\n  showPetStore: function(){\n    this.trigger('update-swagger-ui', {\n      url:'http://petstore.swagger.io/v2/swagger.json'\n    });\n  },\n\n  showCustomOnKeyup: function(e){\n    if (e.keyCode === 13) {\n      this.showCustom();\n    }\n  },\n\n  showCustom: function(e){\n    if (e) {\n      e.preventDefault();\n    }\n\n    this.trigger('update-swagger-ui', {\n      url: $('#input_baseUrl').val()\n    });\n  },\n\n  update: function(url, apiKey, trigger){\n    if (trigger === undefined) {\n      trigger = false;\n    }\n\n    $('#input_baseUrl').val(url);\n\n    if (trigger) {\n      this.trigger('update-swagger-ui', {url:url});\n    }\n  }\n});\n","'use strict';\n\nSwaggerUi.Views.MainView = Backbone.View.extend({\n  apisSorter : {\n    alpha   : function(a,b){ return a.name.localeCompare(b.name); }\n  },\n  operationsSorters : {\n    alpha   : function(a,b){ return a.path.localeCompare(b.path); },\n    method  : function(a,b){ return a.method.localeCompare(b.method); }\n  },\n  initialize: function(opts){\n    var sorterOption, sorterFn, key, value;\n    opts = opts || {};\n\n    this.router = opts.router;\n\n    // Sort APIs\n    if (opts.swaggerOptions.apisSorter) {\n      sorterOption = opts.swaggerOptions.apisSorter;\n      if (_.isFunction(sorterOption)) {\n        sorterFn = sorterOption;\n      } else {\n        sorterFn = this.apisSorter[sorterOption];\n      }\n      if (_.isFunction(sorterFn)) {\n        this.model.apisArray.sort(sorterFn);\n      }\n    }\n    // Sort operations of each API\n    if (opts.swaggerOptions.operationsSorter) {\n      sorterOption = opts.swaggerOptions.operationsSorter;\n      if (_.isFunction(sorterOption)) {\n        sorterFn = sorterOption;\n      } else {\n        sorterFn = this.operationsSorters[sorterOption];\n      }\n      if (_.isFunction(sorterFn)) {\n        for (key in this.model.apisArray) {\n          this.model.apisArray[key].operationsArray.sort(sorterFn);\n        }\n      }\n    }\n\n    // set up the UI for input\n    this.model.auths = [];\n\n    for (key in this.model.securityDefinitions) {\n      value = this.model.securityDefinitions[key];\n\n      this.model.auths.push({\n        name: key,\n        type: value.type,\n        value: value\n      });\n    }\n\n    if ('validatorUrl' in opts.swaggerOptions) {\n      // Validator URL specified explicitly\n      this.model.validatorUrl = opts.swaggerOptions.validatorUrl;\n    } else if (this.model.url.indexOf('localhost') > 0 || this.model.url.indexOf('127.0.0.1') > 0) {\n      // Localhost override\n      this.model.validatorUrl = null;\n    } else {\n      this.model.validatorUrl = '//online.swagger.io/validator';\n    }\n\n    // JSonEditor requires type='object' to be present on defined types, we add it if it's missing\n    // is there any valid case were it should not be added ?\n    var def;\n    for(def in this.model.definitions){\n      if (!this.model.definitions[def].type){\n        this.model.definitions[def].type = 'object';\n      }\n    }\n\n  },\n\n  render: function () {\n    $(this.el).html(Handlebars.templates.main(this.model));\n    this.info = this.$('.info')[0];\n\n    if (this.info) {\n      this.info.addEventListener('click', this.onLinkClick, true);\n    }\n\n    this.model.securityDefinitions = this.model.securityDefinitions || {};\n\n    // Render each resource\n\n    var resources = {};\n    var counter = 0;\n    for (var i = 0; i < this.model.apisArray.length; i++) {\n      var resource = this.model.apisArray[i];\n      var id = resource.name;\n      while (typeof resources[id] !== 'undefined') {\n        id = id + '_' + counter;\n        counter += 1;\n      }\n      resource.id = sanitizeHtml(id);\n      resources[id] = resource;\n      this.addResource(resource, this.model.auths);\n    }\n\n    $('.propWrap').hover(function onHover(){\n      $('.optionsWrapper', $(this)).show();\n    }, function offhover(){\n      $('.optionsWrapper', $(this)).hide();\n    });\n    return this;\n  },\n\n  addResource: function(resource, auths){\n    // Render a resource and add it to resources li\n    resource.id = resource.id.replace(/[^a-zA-Z\\d]/g, function(str) { return str.charCodeAt(0); });\n\n    // Make all definitions available at the root of the resource so that they can\n    // be loaded by the JSonEditor\n    resource.definitions = this.model.definitions;\n\n    var resourceView = new SwaggerUi.Views.ResourceView({\n      model: resource,\n      router: this.router,\n      tagName: 'li',\n      id: 'resource_' + resource.id,\n      className: 'resource',\n      auths: auths,\n      swaggerOptions: this.options.swaggerOptions\n    });\n    $('#resources', this.el).append(resourceView.render().el);\n  },\n\n  clear: function(){\n    $(this.el).html('');\n  },\n\n  onLinkClick: function (e) {\n    var el = e.target;\n\n    if (el.tagName === 'A' && el.href && !el.target) {\n        e.preventDefault();\n        window.open(el.href, '_blank');\n    }\n  }\n});\n","'use strict';\n\nSwaggerUi.Models.Oauth2Model = Backbone.Model.extend({\n    defaults: {\n        scopes: {},\n        isPasswordFlow: false,\n        clientAuthenticationType: 'none'\n    },\n\n    initialize: function () {\n        if(this.attributes && this.attributes.scopes) {\n            var attributes = _.cloneDeep(this.attributes);\n            var i, scopes = [];\n            for(i in attributes.scopes) {\n                var scope = attributes.scopes[i];\n                if(typeof scope.description === 'string') {\n                    scopes[scope] = attributes.scopes[i];\n                    scopes.push(attributes.scopes[i]);\n                }\n            }\n            attributes.scopes = scopes;\n            this.attributes = attributes;\n        }\n\n        if (this.attributes && this.attributes.flow) {\n            var flow = this.attributes.flow;\n            this.set('isPasswordFlow', flow === 'password');\n            this.set('requireClientAuthentication', flow === 'application');\n            this.set('clientAuthentication', flow === 'password' || flow === 'application');\n        }\n        this.on('change', this.validate);\n    },\n\n    setScopes: function (name, val) {\n        var auth = _.extend({}, this.attributes);\n        var index = _.findIndex(auth.scopes, function(o) {\n            return o.scope === name;\n        });\n        auth.scopes[index].checked = val;\n\n        this.set(auth);\n        this.validate();\n    },\n\n    validate: function () {\n      var valid = false;\n      if (this.get('isPasswordFlow') &&\n          (!this.get('username'))) {\n          return false;\n      }\n\n      if (this.get('clientAuthenticationType') in ['basic', 'request-body'] &&\n          (!this.get('clientId'))) {\n          return false;\n      }\n\n      var scp = this.get('scopes');\n      var idx =  _.findIndex(scp, function (o) {\n         return o.checked === true;\n      });\n\n      if(scp.length > 0 && idx >= 0) {\n          valid = true;\n      }\n\n      if(scp.length === 0) {\n          valid = true;\n      }\n\n      this.set('valid', valid);\n\n      return valid;\n    }\n});\n","'use strict';\n\nSwaggerUi.Views.Oauth2View = Backbone.View.extend({\n    events: {\n        'change .oauth-scope': 'scopeChange',\n        'change .oauth-username': 'setUsername',\n        'change .oauth-password': 'setPassword',\n        'change .oauth-client-authentication-type': 'setClientAuthenticationType',\n        'change .oauth-client-id': 'setClientId',\n        'change .oauth-client-secret': 'setClientSecret'\n    },\n\n    template: Handlebars.templates.oauth2,\n\n    cls: {\n        error: 'error'\n    },\n\n    render: function () {\n        this.$el.html(this.template(this.model.toJSON()));\n\n        return this;\n    },\n\n    scopeChange: function (e) {\n        var val = $(e.target).prop('checked');\n        var scope = $(e.target).data('scope');\n\n        this.model.setScopes(scope, val);\n    },\n\n    setUsername: function (e) {\n        var val= $(e.target).val();\n        this.model.set('username', val);\n        if (val) {\n            $(e.target).removeClass(this.cls.error);\n        }\n    },\n\n    setPassword: function (e) {\n        this.model.set('password', $(e.target).val());\n    },\n\n    setClientAuthenticationType: function (e) {\n        var type = $(e.target).val();\n        var $el = this.$el;\n        this.model.set('clientAuthenticationType', type);\n\n        switch(type) {\n            case 'none':\n                $el.find('.oauth-client-authentication').hide();\n                break;\n            case 'basic':\n            case 'request-body':\n                $el.find('.oauth-client-id').removeClass(this.cls.error);\n                $el.find('.oauth-client-authentication').show();\n                break;\n        }\n    },\n\n    setClientId: function (e) {\n        var val = $(e.target).val();\n        this.model.set('clientId', val);\n        if (val) {\n            $(e.target).removeClass(this.cls.error);\n        }\n    },\n\n    setClientSecret: function (e) {\n        this.model.set('clientSecret', $(e.target).val());\n        $(e.target).removeClass('error');\n    },\n\n    highlightInvalid: function () {\n        if (!this.model.get('username')) {\n            this.$el.find('.oauth-username').addClass(this.cls.error);\n        }\n\n        if (!this.model.get('clientId')) {\n            this.$el.find('.oauth-client-id').addClass(this.cls.error);\n        }\n    }\n});","'use strict';\n\nSwaggerUi.Views.OperationView = Backbone.View.extend({\n  invocationUrl: null,\n\n  events: {\n    'submit .sandbox'         : 'submitOperation',\n    'click .submit'           : 'submitOperation',\n    'click .response_hider'   : 'hideResponse',\n    'click .toggleOperation'  : 'toggleOperationContent',\n    'mouseenter .api-ic'      : 'mouseEnter',\n    'dblclick .curl'          : 'selectText',\n    'change [name=responseContentType]' : 'showSnippet'\n  },\n\n  initialize: function(opts) {\n    opts = opts || {};\n    this.router = opts.router;\n    this.auths = opts.auths;\n    this.parentId = this.model.parentId;\n    this.nickname = this.model.nickname;\n    this.model.encodedParentId = encodeURIComponent(this.parentId);\n\n    if (opts.swaggerOptions) {\n      this.model.defaultRendering = opts.swaggerOptions.defaultModelRendering;\n\n      if (opts.swaggerOptions.showRequestHeaders) {\n        this.model.showRequestHeaders = true;\n      }\n\n      if (opts.swaggerOptions.showOperationIds) {\n        this.model.showOperationIds = true;\n      }\n    }\n    return this;\n  },\n\n  selectText: function(event) {\n    var doc = document,\n        text = event.target.firstChild,\n        range,\n        selection;\n    if (doc.body.createTextRange) {\n      range = document.body.createTextRange();\n      range.moveToElementText(text);\n      range.select();\n    } else if (window.getSelection) {\n      selection = window.getSelection();\n      range = document.createRange();\n      range.selectNodeContents(text);\n      selection.removeAllRanges();\n      selection.addRange(range);\n    }\n  },\n\n  mouseEnter: function(e) {\n    var elem = $(this.el).find('.content');\n    var x = e.pageX;\n    var y = e.pageY;\n    var scX = $(window).scrollLeft();\n    var scY = $(window).scrollTop();\n    var scMaxX = scX + $(window).width();\n    var scMaxY = scY + $(window).height();\n    var wd = elem.width();\n    var hgh = elem.height();\n\n    if (x + wd > scMaxX) {\n      x = scMaxX - wd;\n    }\n\n    if (x < scX) {\n      x = scX;\n    }\n\n    if (y + hgh > scMaxY) {\n      y = scMaxY - hgh;\n    }\n\n    if (y < scY) {\n      y = scY;\n    }\n\n    var pos = {};\n    pos.top = y;\n    pos.left = x;\n    elem.css(pos);\n  },\n\n  // Note: copied from CoffeeScript compiled file\n  // TODO: refactor\n  render: function() {\n    var a, auth, auths, code, contentTypeModel, isMethodSubmissionSupported, k, key, l, len, len1, len2, len3, len4, m, modelAuths, n, o, p, param, q, ref, ref1, ref2, ref3, ref4, ref5, responseContentTypeView, responseSignatureView, schema, schemaObj, scopeIndex, signatureModel, statusCode, successResponse, type, v, value, produces, isXML, isJSON;\n    isMethodSubmissionSupported = jQuery.inArray(this.model.method, this.model.supportedSubmitMethods()) >= 0;\n    if (!isMethodSubmissionSupported) {\n      this.model.isReadOnly = true;\n    }\n    this.model.description = this.model.description || this.model.notes;\n    this.model.oauth = null;\n    modelAuths = this.model.authorizations || this.model.security;\n    if (modelAuths) {\n      if (Array.isArray(modelAuths)) {\n        for (l = 0, len = modelAuths.length; l < len; l++) {\n          auths = modelAuths[l];\n          for (key in auths) {\n            for (a in this.auths) {\n              auth = this.auths[a];\n              if (key === auth.name) {\n                if (auth.type === 'oauth2') {\n                  this.model.oauth = {};\n                  this.model.oauth.scopes = [];\n                  ref1 = auth.value.scopes;\n                  for (k in ref1) {\n                    v = ref1[k];\n                    scopeIndex = auths[key].indexOf(k);\n                    if (scopeIndex >= 0) {\n                      o = {\n                        scope: k,\n                        description: v\n                      };\n                      this.model.oauth.scopes.push(o);\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      } else {\n        for (k in modelAuths) {\n          v = modelAuths[k];\n          if (k === 'oauth2') {\n            if (this.model.oauth === null) {\n              this.model.oauth = {};\n            }\n            if (this.model.oauth.scopes === void 0) {\n              this.model.oauth.scopes = [];\n            }\n            for (m = 0, len1 = v.length; m < len1; m++) {\n              o = v[m];\n              this.model.oauth.scopes.push(o);\n            }\n          }\n        }\n      }\n    }\n    if (typeof this.model.responses !== 'undefined') {\n      this.model.responseMessages = [];\n      ref2 = this.model.responses;\n      for (code in ref2) {\n        value = ref2[code];\n        schema = null;\n        schemaObj = this.model.responses[code].schema;\n        if (schemaObj && schemaObj.$ref) {\n          schema = schemaObj.$ref;\n          if (schema.indexOf('#/definitions/') !== -1) {\n            schema = schema.replace(/^.*#\\/definitions\\//, '');\n          }\n        }\n        this.model.responseMessages.push({\n          code: code,\n          message: value.description,\n          responseModel: schema,\n          headers: value.headers,\n          schema: schemaObj\n        });\n      }\n    }\n    if (typeof this.model.responseMessages === 'undefined') {\n      this.model.responseMessages = [];\n    }\n    signatureModel = null;\n    produces = this.model.produces;\n    isXML = this.contains(produces, 'xml');\n    isJSON = isXML ? this.contains(produces, 'json') : true;\n\n    if (this.model.successResponse) {\n      successResponse = this.model.successResponse;\n      for (key in successResponse) {\n        value = successResponse[key];\n        this.model.successCode = key;\n        if (typeof value === 'object' && typeof value.createJSONSample === 'function') {\n          this.model.successDescription = value.description;\n          this.model.headers = this.parseResponseHeaders(value.headers);\n          signatureModel = {\n            sampleJSON: isJSON ? JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2) : false,\n            isParam: false,\n            sampleXML: isXML ? SwaggerUi.partials.signature.createXMLSample(value.name, value.definition, value.models) : false,\n            signature: SwaggerUi.partials.signature.getModelSignature(value.name, value.definition, value.models, value.modelPropertyMacro)\n          };\n        } else {\n          signatureModel = {\n            signature: SwaggerUi.partials.signature.getPrimitiveSignature(value)\n          };\n        }\n      }\n    } else if (this.model.responseClassSignature && this.model.responseClassSignature !== 'string') {\n      signatureModel = {\n        sampleJSON: this.model.responseSampleJSON,\n        isParam: false,\n        signature: this.model.responseClassSignature\n      };\n    }\n    $(this.el).html(Handlebars.templates.operation(this.model));\n    if (signatureModel) {\n      signatureModel.defaultRendering = this.model.defaultRendering;\n      responseSignatureView = new SwaggerUi.Views.SignatureView({\n        model: signatureModel,\n        router: this.router,\n        tagName: 'div'\n      });\n      $('.model-signature', $(this.el)).append(responseSignatureView.render().el);\n    } else {\n      this.model.responseClassSignature = 'string';\n      $('.model-signature', $(this.el)).html(this.model.type);\n    }\n    contentTypeModel = {\n      isParam: false\n    };\n    contentTypeModel.consumes = this.model.consumes;\n    contentTypeModel.produces = this.model.produces;\n    ref3 = this.model.parameters;\n    for (n = 0, len2 = ref3.length; n < len2; n++) {\n      param = ref3[n];\n      type = param.type || param.dataType || '';\n      if (typeof type === 'undefined') {\n        schema = param.schema;\n        if (schema && schema.$ref) {\n          ref = schema.$ref;\n          if (ref.indexOf('#/definitions/') === 0) {\n            type = ref.substring('#/definitions/'.length);\n          } else {\n            type = ref;\n          }\n        }\n      }\n      if (type && type.toLowerCase() === 'file') {\n        if (!contentTypeModel.consumes) {\n          contentTypeModel.consumes = 'multipart/form-data';\n        }\n      }\n      param.type = type;\n    }\n    responseContentTypeView = new SwaggerUi.Views.ResponseContentTypeView({\n      model: contentTypeModel,\n      router: this.router\n    });\n    $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);\n    ref4 = this.model.parameters;\n    for (p = 0, len3 = ref4.length; p < len3; p++) {\n      param = ref4[p];\n      this.addParameter(param, contentTypeModel.consumes);\n    }\n    ref5 = this.model.responseMessages;\n    for (q = 0, len4 = ref5.length; q < len4; q++) {\n      statusCode = ref5[q];\n      statusCode.isXML = isXML;\n      statusCode.isJSON = isJSON;\n      if (!_.isUndefined(statusCode.headers)) {\n        statusCode.headers = this.parseHeadersType(statusCode.headers);\n      }\n      this.addStatusCode(statusCode);\n    }\n\n    if (Array.isArray(this.model.security)) {\n      var authsModel = SwaggerUi.utils.parseSecurityDefinitions(this.model.security, this.model.parent.securityDefinitions);\n\n      authsModel.isLogout = !_.isEmpty(this.model.clientAuthorizations.authz);\n      this.authView = new SwaggerUi.Views.AuthButtonView({\n        data: authsModel,\n        router: this.router,\n        isOperation: true,\n        model: {\n          scopes: authsModel.scopes\n        }\n      });\n      this.$('.authorize-wrapper').append(this.authView.render().el);\n    }\n\n    this.showSnippet();\n    return this;\n  },\n\n  parseHeadersType: function (headers) {\n    var map = {\n      'string': {\n        'date-time': 'dateTime',\n        'date'     : 'date'\n      }\n    };\n\n    _.forEach(headers, function (header) {\n      var value;\n      header = header || {};\n      value = map[header.type] && map[header.type][header.format];\n      if (!_.isUndefined(value)) {\n        header.type = value;\n      }\n    });\n\n    return headers;\n  },\n\n  contains: function (produces, type) {\n    return produces.filter(function (val) {\n      if (val.indexOf(type) > -1) {\n        return true;\n      }\n    }).length;\n  },\n\n  parseResponseHeaders: function (data) {\n    var HEADERS_SEPARATOR = '; ';\n    var headers = _.clone(data);\n\n    _.forEach(headers, function (header) {\n      var other = [];\n      _.forEach(header, function (value, key) {\n        var properties = ['type', 'description'];\n        if (properties.indexOf(key.toLowerCase()) === -1) {\n          other.push(key + ': ' + value);\n        }\n      });\n\n      other.join(HEADERS_SEPARATOR);\n      header.other = other;\n    });\n\n    return headers;\n  },\n\n  addParameter: function(param, consumes) {\n    // Render a parameter\n    param.consumes = consumes;\n    param.defaultRendering = this.model.defaultRendering;\n\n    // Copy this param JSON spec so that it will be available for JsonEditor\n    if(param.schema){\n      $.extend(true, param.schema, this.model.definitions[param.type]);\n      param.schema.definitions = this.model.definitions;\n      // This is required for JsonEditor to display the root properly\n      if(!param.schema.type){\n        param.schema.type = 'object';\n      }\n      // This is the title that will be used by JsonEditor for the root\n      // Since we already display the parameter's name in the Parameter column\n      // We set this to space, we can't set it to null or space otherwise JsonEditor\n      // will replace it with the text \"root\" which won't look good on screen\n      if(!param.schema.title){\n        param.schema.title = ' ';\n      }\n    }\n\n    var paramView = new SwaggerUi.Views.ParameterView({\n      model: param,\n      tagName: 'tr',\n      readOnly: this.model.isReadOnly,\n      swaggerOptions: this.options.swaggerOptions\n    });\n    $('.operation-params', $(this.el)).append(paramView.render().el);\n  },\n\n  addStatusCode: function(statusCode) {\n    // Render status codes\n    statusCode.defaultRendering = this.model.defaultRendering;\n    var statusCodeView = new SwaggerUi.Views.StatusCodeView({\n      model: statusCode,\n      tagName: 'tr',\n      router: this.router\n    });\n    $('.operation-status', $(this.el)).append(statusCodeView.render().el);\n  },\n\n  // Note: copied from CoffeeScript compiled file\n  // TODO: redactor\n  submitOperation: function(e) {\n    var error_free, form, isFileUpload, map, opts;\n    if (e !== null) {\n      e.preventDefault();\n    }\n    form = $('.sandbox', $(this.el));\n    error_free = true;\n    form.find('input.required').each(function() {\n      $(this).removeClass('error');\n      if (jQuery.trim($(this).val()) === '') {\n        $(this).addClass('error');\n        $(this).wiggle({\n          callback: (function(_this) {\n            return function() {\n              $(_this).focus();\n            };\n          })(this)\n        });\n        error_free = false;\n      }\n    });\n    form.find('textarea.required:visible').each(function() {\n      $(this).removeClass('error');\n      if (jQuery.trim($(this).val()) === '') {\n        $(this).addClass('error');\n        $(this).wiggle({\n          callback: (function(_this) {\n            return function() {\n              return $(_this).focus();\n            };\n          })(this)\n        });\n        error_free = false;\n      }\n    });\n    form.find('select.required').each(function() {\n      $(this).removeClass('error');\n      if (this.selectedIndex === -1) {\n        $(this).addClass('error');\n        $(this).wiggle({\n          callback: (function(_this) {\n            return function() {\n              $(_this).focus();\n            };\n          })(this)\n        });\n        error_free = false;\n      }\n    });\n    if (error_free) {\n      map = this.getInputMap(form);\n      isFileUpload = this.isFileUpload(form);\n      opts = {\n        parent: this\n      };\n      if (this.options.swaggerOptions) {\n        for(var key in this.options.swaggerOptions) {\n          opts[key] = this.options.swaggerOptions[key];\n        }\n      }\n\n      var pi;\n      for(pi = 0; pi < this.model.parameters.length; pi++){\n        var p = this.model.parameters[pi];\n        if( p.jsonEditor && p.jsonEditor.isEnabled()){\n          var json = p.jsonEditor.getValue();\n          map[p.name] = JSON.stringify(json);\n        }\n      }\n\n      opts.responseContentType = $('div select[name=responseContentType]', $(this.el)).val();\n      opts.requestContentType = $('div select[name=parameterContentType]', $(this.el)).val();\n      $('.response_throbber', $(this.el)).show();\n      if (isFileUpload) {\n        $('.request_url', $(this.el)).html('<pre></pre>');\n        $('.request_url pre', $(this.el)).text(this.invocationUrl);\n\n        opts.useJQuery = true;\n        map.parameterContentType = 'multipart/form-data';\n        this.map = map;\n        return this.model.execute(map, opts, this.showCompleteStatus, this.showErrorStatus, this);\n      } else {\n        this.map = map;\n        return this.model.execute(map, opts, this.showCompleteStatus, this.showErrorStatus, this);\n      }\n    }\n  },\n\n  getInputMap: function (form) {\n    var map, ref1, l, len, o, ref2, m, len1, val, ref3, n, len2;\n    map = {};\n    ref1 = form.find('input');\n    for (l = 0, len = ref1.length; l < len; l++) {\n      o = ref1[l];\n      if ((o.value !== null) && jQuery.trim(o.value).length > 0) {\n        map[o.name] = o.value;\n      }\n      if (o.type === 'file') {\n        map[o.name] = o.files[0];\n      }\n    }\n    ref2 = form.find('textarea');\n    for (m = 0, len1 = ref2.length; m < len1; m++) {\n      o = ref2[m];\n      val = this.getTextAreaValue(o);\n      if ((val !== null) && jQuery.trim(val).length > 0) {\n        map[o.name] = val;\n      }\n    }\n    ref3 = form.find('select');\n    for (n = 0, len2 = ref3.length; n < len2; n++) {\n      o = ref3[n];\n      val = this.getSelectedValue(o);\n      if ((val !== null) && jQuery.trim(val).length > 0) {\n        map[o.name] = val;\n      }\n    }\n    return map;\n  },\n\n  isFileUpload: function (form) {\n    var ref1, l, len, o;\n    var isFileUpload = false;\n    ref1 = form.find('input');\n    for (l = 0, len = ref1.length; l < len; l++) {\n      o = ref1[l];\n      if (o.type === 'file') {\n        isFileUpload = true;\n      }\n    }\n    return isFileUpload;\n  },\n\n  success: function(response, parent) {\n    parent.showCompleteStatus(response);\n  },\n\n  // wraps a jquery response as a shred response\n  wrap: function(data) {\n    var h, headerArray, headers, i, l, len, o;\n    headers = {};\n    headerArray = data.getAllResponseHeaders().split('\\r');\n    for (l = 0, len = headerArray.length; l < len; l++) {\n      i = headerArray[l];\n      h = i.match(/^([^:]*?):(.*)$/);\n      if (!h) {\n        h = [];\n      }\n      h.shift();\n      if (h[0] !== void 0 && h[1] !== void 0) {\n        headers[h[0].trim()] = h[1].trim();\n      }\n    }\n    o = {};\n    o.content = {};\n    o.content.data = data.responseText;\n    o.headers = headers;\n    o.request = {};\n    o.request.url = this.invocationUrl;\n    o.status = data.status;\n    return o;\n  },\n\n  getSelectedValue: function(select) {\n    if (!select.multiple) {\n      return select.value;\n    } else {\n      var options = [];\n      for (var l = 0, len = select.options.length; l < len; l++) {\n        var opt = select.options[l];\n        if (opt.selected) {\n          options.push(opt.value);\n        }\n      }\n      if (options.length > 0) {\n        return options;\n      } else {\n        return null;\n      }\n    }\n  },\n\n  // handler for hide response link\n  hideResponse: function(e) {\n    if (e) { e.preventDefault(); }\n    $('.response', $(this.el)).slideUp();\n    $('.response_hider', $(this.el)).fadeOut();\n  },\n\n  // Show response from server\n  showResponse: function(response) {\n    var prettyJson = JSON.stringify(response, null, '\\t').replace(/\\n/g, '<br>');\n    $('.response_body', $(this.el)).html(_.escape(prettyJson));\n  },\n\n  // Show error from server\n  showErrorStatus: function(data, parent) {\n    parent.showStatus(data);\n  },\n\n  // show the status codes\n  showCompleteStatus: function(data, parent){\n    parent.showStatus(data);\n  },\n\n  // Adapted from http://stackoverflow.com/a/2893259/454004\n  // Note: directly ported from CoffeeScript\n  // TODO: Cleanup CoffeeScript artifacts\n  formatXml: function(xml) {\n    var contexp, fn, formatted, indent, l, lastType, len, lines, ln, pad, reg, transitions, wsexp;\n    reg = /(>)(<)(\\/*)/g;\n    wsexp = /[ ]*(.*)[ ]+\\n/g;\n    contexp = /(<.+>)(.+\\n)/g;\n    xml = xml.replace(/\\r\\n/g, '\\n').replace(reg, '$1\\n$2$3').replace(wsexp, '$1\\n').replace(contexp, '$1\\n$2');\n    pad = 0;\n    formatted = '';\n    lines = xml.split('\\n');\n    indent = 0;\n    lastType = 'other';\n    transitions = {\n      'single->single': 0,\n      'single->closing': -1,\n      'single->opening': 0,\n      'single->other': 0,\n      'closing->single': 0,\n      'closing->closing': -1,\n      'closing->opening': 0,\n      'closing->other': 0,\n      'opening->single': 1,\n      'opening->closing': 0,\n      'opening->opening': 1,\n      'opening->other': 1,\n      'other->single': 0,\n      'other->closing': -1,\n      'other->opening': 0,\n      'other->other': 0\n    };\n    fn = function(ln) {\n      var fromTo, j, key, padding, type, types, value;\n      types = {\n        single: Boolean(ln.match(/<.+\\/>/)),\n        closing: Boolean(ln.match(/<\\/.+>/)),\n        opening: Boolean(ln.match(/<[^!?].*>/))\n      };\n      type = ((function() {\n        var results;\n        results = [];\n        for (key in types) {\n          value = types[key];\n          if (value) {\n            results.push(key);\n          }\n        }\n        return results;\n      })())[0];\n      type = type === void 0 ? 'other' : type;\n      fromTo = lastType + '->' + type;\n      lastType = type;\n      padding = '';\n      indent += transitions[fromTo];\n      padding = ((function() {\n        var m, ref1, results;\n        results = [];\n        for (j = m = 0, ref1 = indent; 0 <= ref1 ? m < ref1 : m > ref1; j = 0 <= ref1 ? ++m : --m) {\n          results.push('  ');\n        }\n        return results;\n      })()).join('');\n      if (fromTo === 'opening->closing') {\n        formatted = formatted.substr(0, formatted.length - 1) + ln + '\\n';\n      } else {\n        formatted += padding + ln + '\\n';\n      }\n    };\n    for (l = 0, len = lines.length; l < len; l++) {\n      ln = lines[l];\n      fn(ln);\n    }\n    return formatted;\n  },\n\n  // puts the response data in UI\n  showStatus: function(response) {\n    var url, content;\n    if (response.content === undefined) {\n      content = response.data;\n      url = response.url;\n    } else {\n      content = response.content.data;\n      url = response.request.url;\n    }\n    var headers = response.headers;\n    if(typeof content === 'string') {\n      content = jQuery.trim(content);\n    }\n\n    // if server is nice, and sends content-type back, we can use it\n    var contentType = null;\n    if (headers) {\n      contentType = headers['Content-Type'] || headers['content-type'];\n      if (contentType) {\n        contentType = contentType.split(';')[0].trim();\n      }\n    }\n\n    $('.response_body', $(this.el)).removeClass('json');\n    $('.response_body', $(this.el)).removeClass('xml');\n\n    var supportsAudioPlayback = function(contentType){\n      var audioElement = document.createElement('audio');\n      return !!(audioElement.canPlayType && audioElement.canPlayType(contentType).replace(/no/, ''));\n    };\n\n    var pre;\n    var code;\n    var skipHighlight = false;\n    if (!content) {\n      code = $('<code />').text('no content');\n      pre = $('<pre class=\"json\" />').append(code);\n\n      // JSON\n    } else if (\n        contentType === 'application/octet-stream' ||\n        headers['Content-Disposition'] && (/attachment/).test(headers['Content-Disposition']) ||\n        headers['content-disposition'] && (/attachment/).test(headers['content-disposition']) ||\n        headers['Content-Description'] && (/File Transfer/).test(headers['Content-Description']) ||\n        headers['content-description'] && (/File Transfer/).test(headers['content-description'])) {\n\n      if ('Blob' in window) {\n        var type = contentType || 'text/html';\n        var a = document.createElement('a');\n        var href;\n\n        if({}.toString.apply(content) === '[object Blob]') {\n          href = window.URL.createObjectURL(content);\n        }\n        else {\n          var binaryData = [];\n          binaryData.push(content);\n          href = window.URL.createObjectURL(new Blob(binaryData, {type: type}));\n        }\n        var fileName = response.url.substr(response.url.lastIndexOf('/') + 1);\n        var download = [type, fileName, href].join(':');\n\n        // Use filename from response header\n        var disposition = headers['content-disposition'] || headers['Content-Disposition'];\n        if(typeof disposition !== 'undefined') {\n          var responseFilename = /filename=([^;]*);?/.exec(disposition);\n          if(responseFilename !== null && responseFilename.length > 1) {\n            download = responseFilename[1];\n            fileName = download;\n          }\n        }\n\n        a.setAttribute('href', href);\n        a.setAttribute('download', download);\n        a.innerText = 'Download ' + fileName;\n\n        pre = $('<div/>').append(a);\n        skipHighlight = true;\n      } else {\n        pre = $('<pre class=\"json\" />').append('Download headers detected but your browser does not support downloading binary via XHR (Blob).');\n      }\n    } else if (contentType === 'application/json' || /\\+json$/.test(contentType)) {\n      var json = null;\n      try {\n        json = JSON.stringify(JSON.parse(content), null, '  ');\n      } catch (_error) {\n        json = 'can\\'t parse JSON.  Raw result:\\n\\n' + content;\n      }\n      code = $('<code />').text(json);\n      pre = $('<pre class=\"json\" />').append(code);\n\n      // XML\n    } else if (contentType === 'application/xml' || /\\+xml$/.test(contentType)) {\n      code = $('<code />').text(this.formatXml(content));\n      pre = $('<pre class=\"xml\" />').append(code);\n\n      // HTML\n    } else if (contentType === 'text/html') {\n      code = $('<code />').html(_.escape(content));\n      pre = $('<pre class=\"xml\" />').append(code);\n\n      // Plain Text\n    } else if (/text\\/plain/.test(contentType)) {\n      code = $('<code />').text(content);\n      pre = $('<pre class=\"plain\" />').append(code);\n\n      // Image\n    } else if (/^image\\//.test(contentType)) {\n      var urlCreator = window.URL || window.webkitURL;\n      var imageUrl = urlCreator.createObjectURL(content);\n\n      pre = $('<img>').attr( 'src', imageUrl);\n      // Audio\n    } else if (/^audio\\//.test(contentType) && supportsAudioPlayback(contentType)) {\n      pre = $('<audio controls>').append($('<source>').attr('src', url).attr('type', contentType));\n    } else if(headers.location || headers.Location) {\n      // Location header based redirect download\n      window.location = response.url;\n\n      // Anything else (CORS)\n    } else {\n      code = $('<code />').text(content);\n      pre = $('<pre class=\"json\" />').append(code);\n    }\n    var response_body = pre;\n    $('.request_url', $(this.el)).html('<pre></pre>');\n    $('.request_url pre', $(this.el)).text(url);\n    $('.response_code', $(this.el)).html('<pre>' + response.status + '</pre>');\n    $('.response_body', $(this.el)).html(response_body);\n    $('.response_headers', $(this.el)).html('<pre>' + _.escape(JSON.stringify(response.headers, null, '  ')).replace(/\\n/g, '<br>') + '</pre>');\n    $('.response', $(this.el)).slideDown();\n    $('.response_hider', $(this.el)).show();\n    $('.response_throbber', $(this.el)).hide();\n\n\n    // adds curl output\n    var curlCommand = this.model.asCurl(this.map, {responseContentType: contentType});\n    curlCommand = curlCommand.replace('!', '&#33;');\n    $( 'div.curl', $(this.el)).html('<pre>' + _.escape(curlCommand) + '</pre>');\n\n    // only highlight the response if response is less than threshold, default state is highlight response\n    var opts = this.options.swaggerOptions;\n\n    if (opts.showRequestHeaders) {\n      var form = $('.sandbox', $(this.el)),\n          map = this.getInputMap(form),\n          requestHeaders = this.model.getHeaderParams(map);\n      delete requestHeaders['Content-Type'];\n      $('.request_headers', $(this.el)).html('<pre>' + _.escape(JSON.stringify(requestHeaders, null, '  ')).replace(/\\n/g, '<br>') + '</pre>');\n    }\n\n    // Call user-defined hook\n    if (opts.responseHooks && opts.responseHooks[this.nickname]) {\n      opts.responseHooks[this.nickname](response, this);\n    }\n\n    var response_body_el = $('.response_body', $(this.el))[0];\n    // only highlight the response if response is less than threshold, default state is highlight response\n    if (opts.highlightSizeThreshold && typeof response.data !== 'undefined' && response.data.length > opts.highlightSizeThreshold || skipHighlight) {\n      return response_body_el;\n    } else {\n      return hljs.highlightBlock(response_body_el);\n    }\n  },\n\n  toggleOperationContent: function (event) {\n    var elem = $('#' + Docs.escapeResourceName(this.parentId + '_' + this.nickname + '_content'));\n    if (elem.is(':visible')){\n      $.bbq.pushState('#/', 2);\n      event.preventDefault();\n      Docs.collapseOperation(elem);\n    } else {\n      Docs.expandOperation(elem);\n    }\n  },\n\n  getTextAreaValue: function(textArea) {\n    var param, parsed, result, i;\n    if (textArea.value === null || jQuery.trim(textArea.value).length === 0) {\n      return null;\n    }\n    param = this.getParamByName(textArea.name);\n    if (param && param.type && param.type.toLowerCase() === 'array') {\n      parsed = textArea.value.split('\\n');\n      result = [];\n      for (i = 0; i < parsed.length; i++) {\n        if (parsed[i] !== null && jQuery.trim(parsed[i]).length > 0) {\n          result.push(parsed[i]);\n        }\n      }\n      return result.length > 0 ? result : null;\n    } else {\n      return textArea.value;\n    }\n  },\n\n  showSnippet: function () {\n    var contentTypeEl = this.$('[name=responseContentType]');\n    var xmlSnippetEl = this.$('.operation-status .snippet_xml, .response-class .snippet_xml');\n    var jsonSnippetEl = this.$('.operation-status .snippet_json, .response-class .snippet_json');\n    var contentType;\n\n    if (!contentTypeEl.length) { return; }\n    contentType = contentTypeEl.val();\n\n    if (contentType.indexOf('xml') > -1) {\n      xmlSnippetEl.show();\n      jsonSnippetEl.hide();\n    } else {\n      jsonSnippetEl.show();\n      xmlSnippetEl.hide();\n    }\n  },\n\n  getParamByName: function(name) {\n    var i;\n    if (this.model.parameters) {\n      for(i = 0; i < this.model.parameters.length; i++) {\n        if (this.model.parameters[i].name === name) {\n          return this.model.parameters[i];\n        }\n      }\n    }\n    return null;\n  }\n\n});\n","'use strict';\n\nSwaggerUi.Views.ParameterContentTypeView = Backbone.View.extend({\n  initialize: function  () {},\n\n  render: function(){\n    this.model.parameterContentTypeId = 'pct' + Math.random();\n    $(this.el).html(Handlebars.templates.parameter_content_type(this.model));\n    return this;\n  }\n\n});","'use strict';\n\nSwaggerUi.Views.ParameterView = Backbone.View.extend({\n  events: {\n    'change [name=parameterContentType]' : 'toggleParameterSnippet'\n  },\n\n  initialize: function(){\n    Handlebars.registerHelper('isArray', function(param, opts) {\n      var paramType = param.type && param.type.toLowerCase();\n      if (paramType === 'array' || param.allowMultiple) {\n        return opts.fn(this);\n      } else {\n        return opts.inverse(this);\n      }\n    });\n  },\n\n  render: function() {\n    var type = this.model.type || this.model.dataType;\n    var modelType = this.model.modelSignature.type;\n    var modelDefinitions = this.model.modelSignature.definitions;\n    var schema = this.model.schema || {};\n    var consumes = this.model.consumes || [];\n    var sampleJSON, signatureView;\n\n    if (typeof type === 'undefined') {\n      if (schema.$ref) {\n        var ref = schema.$ref;\n        if (ref.indexOf('#/definitions/') === 0) {\n          type = ref.substring('#/definitions/'.length);\n        } else {\n          type = ref;\n        }\n      }\n    }\n\n    this.model.type = type;\n    this.model.paramType = this.model.in || this.model.paramType;\n    this.model.isBody = this.model.paramType === 'body' || this.model.in === 'body';\n    this.model.isFile = type && type.toLowerCase() === 'file';\n\n    // Allow for default === false\n    if(typeof this.model.default === 'undefined') {\n      this.model.default = this.model.defaultValue;\n    }\n\n    this.model.hasDefault = (typeof this.model.default !== 'undefined');\n    this.model.valueId = 'm' + this.model.name + Math.random();\n\n    if (this.model.allowableValues) {\n      this.model.isList = true;\n    }\n\n    var isXML = this.contains(consumes, 'xml');\n    var isJSON = isXML ? this.contains(consumes, 'json') : true;\n    sampleJSON = SwaggerUi.partials.signature.createParameterJSONSample(modelType, modelDefinitions);\n\n    var template = this.template();\n    $(this.el).html(template(this.model));\n\n    var signatureModel = {\n      sampleJSON: isJSON ? sampleJSON : false,\n      sampleXML: sampleJSON && isXML ? SwaggerUi.partials.signature.createXMLSample('', schema, modelDefinitions, true) : false,\n      isParam: true,\n      signature: SwaggerUi.partials.signature.getParameterModelSignature(modelType, modelDefinitions),\n      defaultRendering: this.model.defaultRendering\n    };\n\n    if (sampleJSON) {\n      signatureView = new SwaggerUi.Views.SignatureView({model: signatureModel, tagName: 'div'});\n      $('.model-signature', $(this.el)).append(signatureView.render().el);\n    }\n    else {\n      $('.model-signature', $(this.el)).html(this.model.signature);\n    }\n\n    var isParam = false;\n\n    if( this.options.swaggerOptions.jsonEditor && this.model.isBody && this.model.schema){\n      var $self = $(this.el);\n      this.model.jsonEditor =\n        /* global JSONEditor */\n        new JSONEditor($('.editor_holder', $self)[0],\n                       {schema: this.model.schema, startval : this.model.default,\n                        ajax:true,\n                        disable_properties:true,\n                        disable_edit_json:true,\n                        iconlib: 'swagger' });\n      // This is so that the signature can send back the sample to the json editor\n      // TODO: SignatureView should expose an event \"onSampleClicked\" instead\n      signatureModel.jsonEditor = this.model.jsonEditor;\n      $('.body-textarea', $self).hide();\n      $('.editor_holder', $self).show();\n      $('.parameter-content-type', $self)\n        .change(function(e){\n            if(e.target.value === 'application/xml'){\n              $('.body-textarea', $self).show();\n              $('.editor_holder', $self).hide();\n              this.model.jsonEditor.disable();\n            }\n            else {\n              $('.body-textarea', $self).hide();\n              $('.editor_holder', $self).show();\n              this.model.jsonEditor.enable();\n            }\n        });\n      }\n\n\n    if (this.model.isBody) {\n      isParam = true;\n    }\n\n    var contentTypeModel = {\n      isParam: isParam\n    };\n\n    contentTypeModel.consumes = this.model.consumes;\n\n    if (isParam) {\n      var parameterContentTypeView = new SwaggerUi.Views.ParameterContentTypeView({model: contentTypeModel});\n      $('.parameter-content-type', $(this.el)).append(parameterContentTypeView.render().el);\n      this.toggleParameterSnippet();\n    }\n\n    else {\n      var responseContentTypeView = new SwaggerUi.Views.ResponseContentTypeView({model: contentTypeModel});\n      $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);\n      this.toggleResponseSnippet();\n    }\n\n    return this;\n  },\n\n  contains: function (consumes, type) {\n    return consumes.filter(function (val) {\n      if (val.indexOf(type) > -1) {\n        return true;\n      }\n    }).length;\n  },\n\n  toggleParameterSnippet: function () {\n    var contentType = this.$('[name=parameterContentType]').val();\n\n    this.toggleSnippet(contentType);\n  },\n\n  toggleResponseSnippet: function () {\n    var contentEl = this.$('[name=responseContentType]');\n\n    if (!contentEl.length) { return; }\n\n    this.toggleSnippet(contentEl.val());\n  },\n\n  toggleSnippet: function (type) {\n    type = type || '';\n    if (type.indexOf('xml') > -1) {\n      this.$('.snippet_xml').show();\n      this.$('.snippet_json').hide();\n    } else {\n      this.$('.snippet_json').show();\n      this.$('.snippet_xml').hide();\n    }\n  },\n\n  // Return an appropriate template based on if the parameter is a list, readonly, required\n  template: function(){\n    if (this.model.isList) {\n      return Handlebars.templates.param_list;\n    } else {\n      if (this.options.readOnly) {\n        if (this.model.required) {\n          return Handlebars.templates.param_readonly_required;\n        } else {\n          return Handlebars.templates.param_readonly;\n        }\n      } else {\n        if (this.model.required) {\n          return Handlebars.templates.param_required;\n        } else {\n          return Handlebars.templates.param;\n        }\n      }\n    }\n  }\n});\n","'use strict';\n\n/* jshint -W122 */\nSwaggerUi.partials.signature = (function () {\n  // copy-pasted from swagger-js\n  var resolveSchema = function (schema) {\n    if (_.isPlainObject(schema.schema)) {\n      schema = resolveSchema(schema.schema);\n    }\n\n    return schema;\n  };\n\n  // copy-pasted from swagger-js\n  var simpleRef = function (name) {\n    if (typeof name === 'undefined') {\n      return null;\n    }\n\n    if (name.indexOf('#/definitions/') === 0) {\n      return name.substring('#/definitions/'.length);\n    } else {\n      return name;\n    }\n  };\n\n  // copy-pasted from swagger-js\n  var getInlineModel = function(inlineStr) {\n    if(/^Inline Model \\d+$/.test(inlineStr) && this.inlineModels) {\n      var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); //\n      var model = this.inlineModels[id];\n      return model;\n    }\n    // I'm returning null here, should I rather throw an error?\n    return null;\n  };\n\n  // copy-pasted from swagger-js\n  var formatXml = function(xml) {\n    var contexp, fn, formatted, indent, l, lastType, len, lines, ln, pad, reg, transitions, wsexp;\n    reg = /(>)(<)(\\/*)/g;\n    wsexp = /[ ]*(.*)[ ]+\\n/g;\n    contexp = /(<.+>)(.+\\n)/g;\n    xml = xml.replace(reg, '$1\\n$2$3').replace(wsexp, '$1\\n').replace(contexp, '$1\\n$2');\n    pad = 0;\n    formatted = '';\n    lines = xml.split('\\n');\n    indent = 0;\n    lastType = 'other';\n    transitions = {\n      'single->single': 0,\n      'single->closing': -1,\n      'single->opening': 0,\n      'single->other': 0,\n      'closing->single': 0,\n      'closing->closing': -1,\n      'closing->opening': 0,\n      'closing->other': 0,\n      'opening->single': 1,\n      'opening->closing': 0,\n      'opening->opening': 1,\n      'opening->other': 1,\n      'other->single': 0,\n      'other->closing': -1,\n      'other->opening': 0,\n      'other->other': 0\n    };\n    fn = function(ln) {\n      var fromTo, j, key, padding, type, types, value;\n      types = {\n        single: Boolean(ln.match(/<.+\\/>/)),\n        closing: Boolean(ln.match(/<\\/.+>/)),\n        opening: Boolean(ln.match(/<[^!?].*>/))\n      };\n      type = ((function() {\n        var results;\n        results = [];\n        for (key in types) {\n          value = types[key];\n          if (value) {\n            results.push(key);\n          }\n        }\n        return results;\n      })())[0];\n      type = type === void 0 ? 'other' : type;\n      fromTo = lastType + '->' + type;\n      lastType = type;\n      padding = '';\n      indent += transitions[fromTo];\n      padding = ((function() {\n        var m, ref1, results;\n        results = [];\n        for (j = m = 0, ref1 = indent; 0 <= ref1 ? m < ref1 : m > ref1; j = 0 <= ref1 ? ++m : --m) {\n          results.push('  ');\n        }\n        return results;\n      })()).join('');\n      if (fromTo === 'opening->closing') {\n        formatted = formatted.substr(0, formatted.length - 1) + ln + '\\n';\n      } else {\n        formatted += padding + ln + '\\n';\n      }\n    };\n    for (l = 0, len = lines.length; l < len; l++) {\n      ln = lines[l];\n      fn(ln);\n    }\n    return formatted;\n  };\n\n  // copy-pasted from swagger-js\n  var getModelSignature = function (name, schema, models, modelPropertyMacro) {\n    var strongOpen = '<span class=\"strong\">';\n    var strongClose = '</span>';\n\n    var optionHtml = function (label, value) {\n      return '<tr><td class=\"optionName\">' + label + ':</td><td>' + value + '</td></tr>';\n    };\n\n\n    // Allow for ignoring the 'name' argument.... shifting the rest\n    if(_.isObject(arguments[0])) {\n      name = void 0;\n      schema = arguments[0];\n      models = arguments[1];\n      modelPropertyMacro = arguments[2];\n    }\n\n    models = models || {};\n\n    // Resolve the schema (Handle nested schemas)\n    schema = resolveSchema(schema);\n\n    // Return for empty object\n    if(_.isEmpty(schema)) {\n      return strongOpen + 'Empty' + strongClose;\n    }\n\n    // Dereference $ref from 'models'\n    if(typeof schema.$ref === 'string') {\n      name = simpleRef(schema.$ref);\n      schema = models[name];\n      if(typeof schema === 'undefined')\n      {\n        return strongOpen + name + ' is not defined!' + strongClose;\n      }\n    }\n\n    if(typeof name !== 'string') {\n      name = schema.title || 'Inline Model';\n    }\n\n    // If we are a Model object... adjust accordingly\n    if(schema.definition) {\n      schema = schema.definition;\n    }\n\n    if(typeof modelPropertyMacro !== 'function') {\n      modelPropertyMacro = function(prop){\n        return (prop || {}).default;\n      };\n    }\n\n    var references = {};\n    var seenModels = [];\n    var inlineModels = 0;\n\n    // Generate current HTML\n    var html = processModel(schema, name);\n\n    // Generate references HTML\n    while (_.keys(references).length > 0) {\n      /* jshint ignore:start */\n      _.forEach(references, function (schema, name) {\n        var seenModel = _.indexOf(seenModels, name) > -1;\n\n        delete references[name];\n\n        if (!seenModel) {\n          seenModels.push(name);\n\n          html += '<br />' + processModel(schema, name);\n        }\n      });\n      /* jshint ignore:end */\n    }\n\n    return html;\n\n\n    function addReference(schema, name, skipRef) {\n      var modelName = name;\n      var model;\n\n      if (schema.$ref) {\n        modelName = schema.title || simpleRef(schema.$ref);\n        model = models[simpleRef(schema.$ref)];\n      } else if (_.isUndefined(name)) {\n        modelName = schema.title || 'Inline Model ' + (++inlineModels);\n        model = {definition: schema};\n      }\n\n      if (skipRef !== true) {\n        references[modelName] = _.isUndefined(model) ? {} : model.definition;\n      }\n\n      return modelName;\n    }\n\n    function primitiveToHTML(schema) {\n      var html = '<span class=\"propType\">';\n      var type = schema.type || 'object';\n\n      if (schema.$ref) {\n        html += addReference(schema, simpleRef(schema.$ref));\n      } else if (type === 'object') {\n        if (!_.isUndefined(schema.properties)) {\n          html += addReference(schema);\n        } else {\n          html += 'object';\n        }\n      } else if (type === 'array') {\n        html += 'Array[';\n\n        if (_.isArray(schema.items)) {\n          html += _.map(schema.items, addReference).join(',');\n        } else if (_.isPlainObject(schema.items)) {\n          if (_.isUndefined(schema.items.$ref)) {\n            if (!_.isUndefined(schema.items.type) && _.indexOf(['array', 'object'], schema.items.type) === -1) {\n              html += schema.items.type;\n            } else {\n              html += addReference(schema.items);\n            }\n          } else {\n            html += addReference(schema.items, simpleRef(schema.items.$ref));\n          }\n        } else {\n          console.log('Array type\\'s \\'items\\' schema is not an array or an object, cannot process');\n          html += 'object';\n        }\n\n        html += ']';\n      } else {\n        html += schema.type;\n      }\n\n      html += '</span>';\n\n      return html;\n    }\n\n    function primitiveToOptionsHTML(schema, html) {\n      var options = '';\n      var type = schema.type || 'object';\n      var isArray = type === 'array';\n\n      if (!_.isUndefined(schema.description)) {\n        html += ': ' + '<span class=\"propDesc\">' + schema.description + '</span>';\n      }\n\n      if (schema.enum) {\n        html += ' = <span class=\"propVals\">[\\'' + schema.enum.join('\\', \\'') + '\\']</span>';\n      }\n\n      if (isArray) {\n        if (_.isPlainObject(schema.items) && !_.isUndefined(schema.items.type)) {\n          type = schema.items.type;\n        } else {\n          type = 'object';\n        }\n      }\n\n      if (!_.isUndefined(schema.default)) {\n        options += optionHtml('Default', schema.default);\n      }\n\n      switch (type) {\n      case 'string':\n        if (schema.minLength) {\n          options += optionHtml('Min. Length', schema.minLength);\n        }\n\n        if (schema.maxLength) {\n          options += optionHtml('Max. Length', schema.maxLength);\n        }\n\n        if (schema.pattern) {\n          options += optionHtml('Reg. Exp.', schema.pattern);\n        }\n        break;\n      case 'integer':\n      case 'number':\n        if (schema.minimum) {\n          options += optionHtml('Min. Value', schema.minimum);\n        }\n\n        if (schema.exclusiveMinimum) {\n          options += optionHtml('Exclusive Min.', 'true');\n        }\n\n        if (schema.maximum) {\n          options += optionHtml('Max. Value', schema.maximum);\n        }\n\n        if (schema.exclusiveMaximum) {\n          options += optionHtml('Exclusive Max.', 'true');\n        }\n\n        if (schema.multipleOf) {\n          options += optionHtml('Multiple Of', schema.multipleOf);\n        }\n\n        break;\n      }\n\n      if (isArray) {\n        if (schema.minItems) {\n          options += optionHtml('Min. Items', schema.minItems);\n        }\n\n        if (schema.maxItems) {\n          options += optionHtml('Max. Items', schema.maxItems);\n        }\n\n        if (schema.uniqueItems) {\n          options += optionHtml('Unique Items', 'true');\n        }\n\n        if (schema.collectionFormat) {\n          options += optionHtml('Coll. Format', schema.collectionFormat);\n        }\n      }\n\n      if (_.isUndefined(schema.items)) {\n        if (_.isArray(schema.enum)) {\n          var enumString;\n\n          if (type === 'number' || type === 'integer') {\n            enumString = schema.enum.join(', ');\n          } else {\n            enumString = '\"' + schema.enum.join('\", \"') + '\"';\n          }\n\n          options += optionHtml('Enum', enumString);\n        }\n      }\n\n      if (options.length > 0) {\n        html = '<span class=\"propWrap\">' + html + '<table class=\"optionsWrapper\"><tr><th colspan=\"2\">' + type + '</th></tr>' + options + '</table></span>';\n      }\n\n      return html;\n    }\n\n    function processModel(schema, name) {\n      var type = schema.type || 'object';\n      var isArray = schema.type === 'array';\n      var html = strongOpen + name + ' ' + (isArray ? '[' : '{') + strongClose;\n      var contents;\n\n      if (name) {\n        seenModels.push(name);\n      }\n\n      if (isArray) {\n        if (_.isArray(schema.items)) {\n          html += '<div>' + _.map(schema.items, function (item) {\n            var type = item.type || 'object';\n\n            if (_.isUndefined(item.$ref)) {\n              if (_.indexOf(['array', 'object'], type) > -1) {\n                if (type === 'object' && _.isUndefined(item.properties)) {\n                  return 'object';\n                } else {\n                  return addReference(item);\n                }\n              } else {\n                return primitiveToOptionsHTML(item, type);\n              }\n            } else {\n              return addReference(item, simpleRef(item.$ref));\n            }\n          }).join(',</div><div>');\n        } else if (_.isPlainObject(schema.items)) {\n          if (_.isUndefined(schema.items.$ref)) {\n            if (_.indexOf(['array', 'object'], schema.items.type || 'object') > -1) {\n              if ((_.isUndefined(schema.items.type) || schema.items.type === 'object') && _.isUndefined(schema.items.properties)) {\n                html += '<div>object</div>';\n              } else {\n                html += '<div>' + addReference(schema.items) + '</div>';\n              }\n            } else {\n              html += '<div>' + primitiveToOptionsHTML(schema.items, schema.items.type) + '</div>';\n            }\n          } else {\n            html += '<div>' + addReference(schema.items, simpleRef(schema.items.$ref)) + '</div>';\n          }\n        } else {\n          console.log('Array type\\'s \\'items\\' property is not an array or an object, cannot process');\n          html += '<div>object</div>';\n        }\n      } else {\n        if (schema.$ref) {\n          html += '<div>' + addReference(schema, name) + '</div>';\n        } else if (type === 'object') {\n          if (_.isPlainObject(schema.properties)) {\n            contents = _.map(schema.properties, function (property, name) {\n              var propertyIsRequired = (_.indexOf(schema.required, name) >= 0);\n              var cProperty = _.cloneDeep(property);\n\n              var requiredClass = propertyIsRequired ? 'required' : '';\n              var html = '<span class=\"propName ' + requiredClass + '\">' + name + '</span> (';\n              var model;\n\n              // Allow macro to set the default value\n              cProperty.default = modelPropertyMacro(cProperty);\n\n              // Resolve the schema (Handle nested schemas)\n              cProperty = resolveSchema(cProperty);\n\n              // We need to handle property references to primitives (Issue 339)\n              if (!_.isUndefined(cProperty.$ref)) {\n                model = models[simpleRef(cProperty.$ref)];\n\n                if (!_.isUndefined(model) && _.indexOf([undefined, 'array', 'object'], model.definition.type) === -1) {\n                  // Use referenced schema\n                  cProperty = resolveSchema(model.definition);\n                }\n              }\n\n              html += primitiveToHTML(cProperty);\n\n              if(!propertyIsRequired) {\n                html += ', <span class=\"propOptKey\">optional</span>';\n              }\n\n              if(property.readOnly) {\n                  html += ', <span class=\"propReadOnly\">read only</span>';\n              }\n\n              html += ')';\n\n              return '<div' + (property.readOnly ? ' class=\"readOnly\"' : '') + '>' + primitiveToOptionsHTML(cProperty, html);\n            }).join(',</div>');\n          }\n\n          if (contents) {\n            html += contents + '</div>';\n          }\n        } else {\n          html += '<div>' + primitiveToOptionsHTML(schema, type) + '</div>';\n        }\n      }\n\n      return html + strongOpen + (isArray ? ']' : '}') + strongClose;\n    }\n\n  };\n\n  // copy-pasted from swagger-js\n  var schemaToJSON = function (schema, models, modelsToIgnore, modelPropertyMacro) {\n    // Resolve the schema (Handle nested schemas)\n    schema = resolveSchema(schema);\n\n    if(typeof modelPropertyMacro !== 'function') {\n      modelPropertyMacro = function(prop){\n        return (prop || {}).default;\n      };\n    }\n\n    modelsToIgnore= modelsToIgnore || {};\n\n    var type = schema.type || 'object';\n    var format = schema.format;\n    var model;\n    var output;\n\n    if (!_.isUndefined(schema.example)) {\n      output = schema.example;\n    } else if (_.isUndefined(schema.items) && _.isArray(schema.enum)) {\n      output = schema.enum[0];\n    }\n\n    if (_.isUndefined(output)) {\n      if (schema.$ref) {\n        model = models[simpleRef(schema.$ref)];\n\n        if (!_.isUndefined(model)) {\n          if (_.isUndefined(modelsToIgnore[model.name])) {\n            modelsToIgnore[model.name] = model;\n            output = schemaToJSON(model.definition, models, modelsToIgnore, modelPropertyMacro);\n            delete modelsToIgnore[model.name];\n          } else {\n            if (model.type === 'array') {\n              output = [];\n            } else {\n              output = {};\n            }\n          }\n        }\n      } else if (!_.isUndefined(schema.default)) {\n        output = schema.default;\n      } else if (type === 'string') {\n        if (format === 'date-time') {\n          output = new Date().toISOString();\n        } else if (format === 'date') {\n          output = new Date().toISOString().split('T')[0];\n        } else {\n          output = 'string';\n        }\n      } else if (type === 'integer') {\n        output = 0;\n      } else if (type === 'number') {\n        output = 0.0;\n      } else if (type === 'boolean') {\n        output = true;\n      } else if (type === 'object') {\n        output = {};\n\n        _.forEach(schema.properties, function (property, name) {\n          var cProperty = _.cloneDeep(property);\n\n          // Allow macro to set the default value\n          cProperty.default = modelPropertyMacro(property);\n\n          output[name] = schemaToJSON(cProperty, models, modelsToIgnore, modelPropertyMacro);\n        });\n      } else if (type === 'array') {\n        output = [];\n\n        if (_.isArray(schema.items)) {\n          _.forEach(schema.items, function (item) {\n            output.push(schemaToJSON(item, models, modelsToIgnore, modelPropertyMacro));\n          });\n        } else if (_.isPlainObject(schema.items)) {\n          output.push(schemaToJSON(schema.items, models, modelsToIgnore, modelPropertyMacro));\n        } else if (_.isUndefined(schema.items)) {\n          output.push({});\n        } else {\n          console.log('Array type\\'s \\'items\\' property is not an array or an object, cannot process');\n        }\n      }\n    }\n\n    return output;\n  };\n\n  // copy-pasted from swagger-js\n  var createJSONSample = function (value, modelsToIgnore) {\n    modelsToIgnore = modelsToIgnore || {};\n\n    modelsToIgnore[value.name] = value;\n\n    // Response support\n    if (value.examples && _.isPlainObject(value.examples)) {\n      value = _.cloneDeep(value);\n      var keys = Object.keys(value.examples);\n\n      _.forEach(keys, function(key) {\n        if(key.indexOf('application/json') === 0) {\n          var example = value.examples[key];\n          if (_.isString(example)) {\n            example = jsyaml.safeLoad(example);\n          }\n          value.definition.example = example;\n          return schemaToJSON(value.definition, example, modelsToIgnore, value.modelPropertyMacro);\n        }\n      });\n    }\n\n    if (value.examples) {\n      value = _.cloneDeep(value);\n      var example = value.examples;\n      if (_.isString(example)) {\n        example = jsyaml.safeLoad(example);\n      }\n      value.definition.example = example;\n      return schemaToJSON(value.definition, example, modelsToIgnore, value.modelPropertyMacro);\n    }\n\n    return schemaToJSON(value.definition, value.models, modelsToIgnore, value.modelPropertyMacro);\n  };\n\n  // copy-pasted from swagger-js\n  var getParameterModelSignature = function (type, definitions) {\n      var isPrimitive, listType;\n\n      if (type instanceof Array) {\n        listType = true;\n        type = type[0];\n      }\n\n      // Convert undefined to string of 'undefined'\n      if (typeof type === 'undefined') {\n        type = 'undefined';\n        isPrimitive = true;\n\n      } else if (definitions[type]){\n        // a model def exists?\n        type = definitions[type]; /* Model */\n        isPrimitive = false;\n\n      } else if (getInlineModel(type)) {\n        type = getInlineModel(type); /* Model */\n        isPrimitive = false;\n\n      } else {\n        // We default to primitive\n        isPrimitive = true;\n      }\n\n      if (isPrimitive) {\n        if (listType) {\n          return 'Array[' + type + ']';\n        } else {\n          return type.toString();\n        }\n      } else {\n        if (listType) {\n          return 'Array[' + getModelSignature(type.name, type.definition, type.models, type.modelPropertyMacro) + ']';\n        } else {\n          return getModelSignature(type.name, type.definition, type.models, type.modelPropertyMacro);\n        }\n      }\n  };\n\n  // copy-pasted from swagger-js\n  var createParameterJSONSample = function (type, models) {\n    var listType, sampleJson, innerType;\n    models = models || {};\n\n    listType = (type instanceof Array);\n    innerType = listType ? type[0] : type;\n\n    if(models[innerType]) {\n      sampleJson = createJSONSample(models[innerType]);\n    } else if (getInlineModel(innerType)){\n      sampleJson = createJSONSample(getInlineModel(innerType)); // may return null, if type isn't correct\n    }\n\n\n    if (sampleJson) {\n      sampleJson = listType ? [sampleJson] : sampleJson;\n\n      if (typeof sampleJson === 'string') {\n        return sampleJson;\n      } else if (_.isObject(sampleJson)) {\n        var t = sampleJson;\n\n        if (sampleJson instanceof Array && sampleJson.length > 0) {\n          t = sampleJson[0];\n        }\n\n        if (t.nodeName && typeof t === 'Node') {\n          var xmlString = new XMLSerializer().serializeToString(t);\n\n          return formatXml(xmlString);\n        } else {\n          return JSON.stringify(sampleJson, null, 2);\n        }\n      } else {\n        return sampleJson;\n      }\n    }\n  };\n\n  var wrapTag = function (name, value, attrs) {\n    var str, attributes;\n\n    attrs = attrs || [];\n\n    attributes = attrs.map(function (attr) {\n      return ' ' + attr.name + '=\"' + attr.value + '\"';\n    }).join('');\n\n    if (!name) {\n      return getErrorMessage('Node name is not provided');\n    }\n\n    str = [\n      '<', name,\n      attributes,\n      '>',\n      value,\n      '</', name, '>'\n    ];\n\n    return str.join('');\n  };\n\n  // Commenting this funtion as the names are now determined beforehand and the prefix part is exposed as a separate function | https://github.com/swagger-api/swagger-ui/issues/2577\n /** var getName = function (name, xml) {\n    var result = name || '';\n\n    xml = xml || {};\n\n    if (xml.name) {\n      result = xml.name;\n    }\n\n    if (xml.prefix) {\n      result = xml.prefix + ':' + result;\n    }\n\n    return result;\n  };\n  */\n  \n  var getPrefix = function (name, xml) {\n    var result = name || '';\n\n    xml = xml || {};\n\n    if (xml.prefix) {\n      result = xml.prefix + ':' + result;\n    }\n\n    return result;\n  };\n\n  var getNamespace = function (xml) {\n    var namespace = '';\n    var name = 'xmlns';\n\n    xml = xml || {};\n\n    if (xml.namespace) {\n      namespace = xml.namespace;\n    } else {\n      return namespace;\n    }\n\n    if (xml.prefix) {\n      name += ':' + xml.prefix;\n    }\n\n    return {\n      name: name,\n      value: namespace\n    };\n  };\n\n  var createArrayXML = function (descriptor) {\n    var name = descriptor.name;\n    var config = descriptor.config;\n    var definition = descriptor.definition;\n    var models = descriptor.models;\n    var value;\n    var items = definition.items;\n    var xml = definition.xml || {};\n    var namespace = getNamespace(xml);\n    var attributes = [];\n\n    if (!items) { return getErrorMessage(); }\n    var key = name;\n    // If there is a name specified for the array elements, use that for the array elements name | https://github.com/swagger-api/swagger-ui/issues/2577\n    if(items.xml && items.xml.name) {\n        key = items.xml.name;\n    }\n    value = createSchemaXML(key, items, models, config);\n    if (namespace) {\n      attributes.push(namespace);\n    }\n\n    if (xml.wrapped) {\n      value = wrapTag(name, value, attributes);\n    }\n\n    return value;\n  };\n\n  var getPrimitiveSignature = function (schema) {\n    var type, items;\n\n    schema = schema || {};\n    items = schema.items || {};\n    type = schema.type || '';\n\n    switch (type) {\n      case 'object': return 'Object is not a primitive';\n      case 'array' : return 'Array[' + (items.format || items.type) + ']';\n      default: return schema.format || type;\n    }\n  };\n\n  var createPrimitiveXML = function (descriptor) {\n    var name = descriptor.name;\n    var definition = descriptor.definition;\n    var primitivesMap = {\n      'string': {\n        'date': new Date(1).toISOString().split('T')[0],\n        'date-time' : new Date(1).toISOString(),\n        'default': 'string'\n      },\n      'integer': {\n        'default': 1\n      },\n      'number': {\n        'default': 1.1\n      },\n      'boolean': {\n        'default': true\n      }\n    };\n    var type = definition.type;\n    var format = definition.format;\n    var xml = definition.xml || {};\n    var namespace = getNamespace(xml);\n    var attributes = [];\n    var value;\n\n    if (_.keys(primitivesMap).indexOf(type) < 0) { return getErrorMessage(); }\n\n    if (_.isArray(definition.enum)){\n      value = definition.enum[0];\n    } else {\n      value = definition.example || primitivesMap[type][format] || primitivesMap[type].default;\n    }\n\n    if (xml.attribute) {\n      return {name: name, value: value};\n    }\n\n    if (namespace) {\n      attributes.push(namespace);\n    }\n\n    return wrapTag(name, value, attributes);\n  };\n\n  function createObjectXML (descriptor) {\n    var name = descriptor.name;\n    var definition = descriptor.definition;\n    var config = descriptor.config;\n    var models = descriptor.models;\n    var isParam = descriptor.config.isParam;\n    var serializedProperties;\n    var attrs = [];\n    var properties = definition.properties;\n    var additionalProperties = definition.additionalProperties;\n    var xml = definition.xml;\n    var namespace = getNamespace(xml);\n\n    if (namespace) {\n      attrs.push(namespace);\n    }   \n\n    if (!properties && !additionalProperties) { return getErrorMessage(); }\n\n    properties = properties || {};\n\n    serializedProperties = _.map(properties, function (prop, key) {\n      var xml, result;\n\n      if (isParam && prop.readOnly) {\n        return '';\n      }\n\n      xml = prop.xml || {};\n      result = createSchemaXML(key, prop, models, config);\n\n      if (xml.attribute) {\n        attrs.push(result);\n        return '';\n      }\n\n      return result;\n    }).join('');\n\n    if (additionalProperties) {\n      serializedProperties += '<!-- additional elements allowed -->';\n    }\n\n    return wrapTag(name, serializedProperties, attrs);\n  }\n\n  function getInfiniteLoopMessage (name, loopTo) {\n    return wrapTag(name, '<!-- Infinite loop $ref:' + loopTo + ' -->');\n  }\n\n  function getErrorMessage (details) {\n    details = details ? ': ' + details : '';\n    return '<!-- invalid XML' + details + ' -->';\n  }\n\n  function createSchemaXML (name, definition, models, config) {\n    var $ref = _.isObject(definition) ? definition.$ref : null;\n    var output, index;\n    config = config || {};\n    config.modelsToIgnore = config.modelsToIgnore || [];\n   \n    var descriptor = _.isString($ref) ? getDescriptorByRef($ref, name, models, config)\n        : getDescriptor(name, definition, models, config);\n    \n    if (!descriptor) {\n      return getErrorMessage();\n    }\n\n    switch (descriptor.type) {\n      case 'array':\n        output = createArrayXML(descriptor); break;\n      case 'object':\n        output = createObjectXML(descriptor); break;\n      case 'loop':\n        output = getInfiniteLoopMessage(descriptor.name, descriptor.config.loopTo); break;\n      default:\n        output = createPrimitiveXML(descriptor);\n    }\n\n    if ($ref && descriptor.type !== 'loop') {\n      index = config.modelsToIgnore.indexOf($ref);\n      if (index > -1) {\n        config.modelsToIgnore.splice(index, 1);\n      }\n    }\n\n    return output;\n  }\n\n  function Descriptor (name, type, definition, models, config) {\n    if (arguments.length < 4) {\n      throw new Error();\n    }\n    this.config = config || {};\n    this.config.modelsToIgnore = this.config.modelsToIgnore || [];\n    // name is already set by getDescriptorByRef or getDescriptor function depending on the type. Only prefix, if present is needed to be set here | https://github.com/swagger-api/swagger-ui/issues/2577\n    this.name = getPrefix(name, definition.xml);\n    this.definition = definition;\n    this.models = models;\n    this.type = type;\n  }\n\n  function getDescriptorByRef($ref, name, models, config) {\n    var modelType = simpleRef($ref);\n    var model = models[modelType] || {};\n    var type = model.definition && model.definition.type ? model.definition.type : 'object';\n    // If model definition xml name is present, then that will be preferred over model name. This is the case of preferring XmlElement name over XmlRootElement name if XmlElement name is provided | https://github.com/swagger-api/swagger-ui/issues/2577\n    if(model.definition && model.definition.xml && model.definition.xml.name) {\n        name = name || model.definition.xml.name || model.name;\n    }\n    // else only model name will be considered for determination | https://github.com/swagger-api/swagger-ui/issues/2577\n    else {\n        name = name || model.name;\n    }\n    \n    if (config.modelsToIgnore.indexOf($ref) > -1) {\n      type = 'loop';\n      config.loopTo = modelType;\n    } else {\n      config.modelsToIgnore.push($ref);\n    }\n\n    if (!model.definition) {\n      return null;\n    }\n    return new Descriptor(name, type, model.definition, models, config);    \n  }\n\n  function getDescriptor (name, definition, models, config){\n    var type = definition.type || 'object';\n    // If definition xml name is present, then that will be preferred over name | https://github.com/swagger-api/swagger-ui/issues/2577\n    if(definition.xml && definition.xml.name) {\n        name = definition.xml.name || name;\n    }\n    if (!definition) {\n      return null;\n    }\n\n    return new Descriptor(name, type, definition, models, config);\n  }\n\n  function createXMLSample (name, definition, models, isParam) {\n    var prolog = '<?xml version=\"1.0\"?>';\n\n    return formatXml(prolog + createSchemaXML(name, definition, models, { isParam: isParam } ));\n  }\n\n  return {\n      getModelSignature: getModelSignature,\n      createJSONSample: createJSONSample,\n      getParameterModelSignature: getParameterModelSignature,\n      createParameterJSONSample: createParameterJSONSample,\n      createSchemaXML: createSchemaXML,\n      createXMLSample: createXMLSample,\n      getPrimitiveSignature: getPrimitiveSignature\n  };\n\n})();\n","'use strict';\n\nSwaggerUi.Views.PopupView = Backbone.View.extend({\n    events: {\n        'click .api-popup-cancel': 'cancelClick'\n    },\n\n    template: Handlebars.templates.popup,\n    className: 'api-popup-dialog',\n\n    selectors: {\n        content: '.api-popup-content',\n        main   : '#swagger-ui-container'\n    },\n\n    initialize: function(){\n        this.$el.html(this.template(this.model));\n    },\n\n    render: function () {\n        this.$(this.selectors.content).append(this.model.content);\n        $(this.selectors.main).first().append(this.el);\n        this.showPopup();\n\n        return this;\n    },\n\n    showPopup: function () {\n        this.$el.show();\n    },\n\n    cancelClick: function () {\n        this.remove();\n    }\n\n});\n","'use strict';\n\nSwaggerUi.Views.ResourceView = Backbone.View.extend({\n  initialize: function(opts) {\n    opts = opts || {};\n    this.router = opts.router;\n    this.auths = opts.auths;\n    if ('' === this.model.description) {\n      this.model.description = null;\n    }\n    if (this.model.description) {\n      this.model.summary = this.model.description;\n    }\n    this.number = 0;\n  },\n\n  render: function(){\n    var methods = {};\n\n\n    $(this.el).html(Handlebars.templates.resource(this.model));\n\n    // Render each operation\n    for (var i = 0; i < this.model.operationsArray.length; i++) {\n      var operation = this.model.operationsArray[i];\n      var counter = 0;\n      var id = operation.nickname;\n\n      while (typeof methods[id] !== 'undefined') {\n        id = id + '_' + counter;\n        counter += 1;\n      }\n\n      methods[id] = operation;\n\n      operation.nickname = id;\n      operation.parentId = this.model.id;\n      operation.definitions = this.model.definitions; // make Json Schema available for JSonEditor in this operation\n      this.addOperation(operation);\n    }\n\n    $('.toggleEndpointList', this.el).click(this.callDocs.bind(this, 'toggleEndpointListForResource'));\n    $('.collapseResource', this.el).click(this.callDocs.bind(this, 'collapseOperationsForResource'));\n    $('.expandResource', this.el).click(this.callDocs.bind(this, 'expandOperationsForResource'));\n\n    return this;\n  },\n\n  addOperation: function(operation) {\n\n    operation.number = this.number;\n\n    // Render an operation and add it to operations li\n    var operationView = new SwaggerUi.Views.OperationView({\n      model: operation,\n      router: this.router,\n      tagName: 'li',\n      className: 'endpoint',\n      swaggerOptions: this.options.swaggerOptions,\n      auths: this.auths\n    });\n\n    $('.endpoints', $(this.el)).append(operationView.render().el);\n\n    this.number++;\n\n  },\n  // Generic Event handler (`Docs` is global)\n\n\n  callDocs: function(fnName, e) {\n    e.preventDefault();\n    Docs[fnName](e.currentTarget.getAttribute('data-id'));\n  }\n});\n","'use strict';\n\nSwaggerUi.Views.ResponseContentTypeView = Backbone.View.extend({\n  initialize: function(){},\n\n  render: function(){\n    this.model.responseContentTypeId = 'rct' + Math.random();\n    $(this.el).html(Handlebars.templates.response_content_type(this.model));\n    return this;\n  }\n});","'use strict';\n\nSwaggerUi.Views.SignatureView = Backbone.View.extend({\n  events: {\n    'click a.description-link'       : 'switchToDescription',\n    'click a.snippet-link'           : 'switchToSnippet',\n    'mousedown .snippet_json'          : 'jsonSnippetMouseDown',\n    'mousedown .snippet_xml'          : 'xmlSnippetMouseDown'\n  },\n\n  initialize: function () {\n  },\n\n  render: function(){\n\n    $(this.el).html(Handlebars.templates.signature(this.model));\n\n    if (this.model.defaultRendering === 'model') {\n      this.switchToDescription();\n    } else {\n      this.switchToSnippet();\n    }\n\n    return this;\n  },\n\n  // handler for show signature\n  switchToDescription: function(e){\n    if (e) { e.preventDefault(); }\n\n    $('.snippet', $(this.el)).hide();\n    $('.description', $(this.el)).show();\n    $('.description-link', $(this.el)).addClass('selected');\n    $('.snippet-link', $(this.el)).removeClass('selected');\n  },\n\n  // handler for show sample\n  switchToSnippet: function(e){\n    if (e) { e.preventDefault(); }\n\n    $('.snippet', $(this.el)).show();\n    $('.description', $(this.el)).hide();\n    $('.snippet-link', $(this.el)).addClass('selected');\n    $('.description-link', $(this.el)).removeClass('selected');\n  },\n\n  // handler for snippet to text area\n  snippetToTextArea: function(val) {\n    var textArea = $('textarea', $(this.el.parentNode.parentNode.parentNode));\n\n    // Fix for bug in IE 10/11 which causes placeholder text to be copied to \"value\"\n    if ($.trim(textArea.val()) === '' || textArea.prop('placeholder') === textArea.val()) {\n      textArea.val(val);\n      // TODO move this code outside of the view and expose an event instead\n      if( this.model.jsonEditor && this.model.jsonEditor.isEnabled()){\n        this.model.jsonEditor.setValue(JSON.parse(this.model.sampleJSON));\n      }\n    }\n  },\n\n  jsonSnippetMouseDown: function (e) {\n    if (this.model.isParam) {\n      if (e) { e.preventDefault(); }\n\n      this.snippetToTextArea(this.model.sampleJSON);\n    }\n  },\n\n  xmlSnippetMouseDown: function (e) {\n    if (this.model.isParam) {\n      if (e) { e.preventDefault(); }\n\n      this.snippetToTextArea(this.model.sampleXML);\n    }\n  }\n});","'use strict';\n\nSwaggerUi.Views.StatusCodeView = Backbone.View.extend({\n  initialize: function (opts) {\n    this.options = opts || {};\n    this.router = this.options.router;\n  },\n\n  render: function(){\n    var responseModel, responseModelView;\n    var value = this.router.api.models[this.model.responseModel];\n    $(this.el).html(Handlebars.templates.status_code(this.model));\n\n    if (this.router.api.models.hasOwnProperty(this.model.responseModel)) {\n      responseModel = {\n        sampleJSON: JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2),\n        sampleXML: this.model.isXML ? SwaggerUi.partials.signature.createXMLSample('', this.model.schema, this.router.api.models) : false,\n        isParam: false,\n        signature: SwaggerUi.partials.signature.getModelSignature(this.model.responseModel, value, this.router.api.models),\n        defaultRendering: this.model.defaultRendering\n      };\n    } else {\n      responseModel = {\n        signature: SwaggerUi.partials.signature.getPrimitiveSignature(this.model.schema)\n      };\n    }\n\n    responseModelView = new SwaggerUi.Views.SignatureView({model: responseModel, tagName: 'div'});\n    $('.model-signature', this.$el).append(responseModelView.render().el);\n    return this;\n  }\n});"]}
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
new file mode 100644
index 00000000000..678d9d8c238
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
@@ -0,0 +1,15 @@
+(function(){function e(){e.history=e.history||[],e.history.push(arguments),this.console&&console.log(Array.prototype.slice.call(arguments)[0])}!function(){var e=Handlebars.template,t=Handlebars.templates=Handlebars.templates||{};t.apikey_auth=e({1:function(e,t,n,r,i){var a;return'                <span class="key_auth__value">'+(null!=(a=(n.sanitize||t&&t.sanitize||n.helperMissing).call(null!=t?t:{},null!=t?t.value:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</span>\n"},3:function(e,t,n,r,i){return'                <input placeholder="api_key" class="auth_input input_apiKey_entry" name="apiKey" type="text"/>\n'},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'<div class="key_input_container">\n    <h3 class="auth__title">Api key authorization</h3>\n    <div class="auth__description">'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.description:t,{name:"sanitize",hash:{},data:i}))?a:"")+'</div>\n    <div>\n        <div class="key_auth__field">\n            <span class="key_auth__label">name:</span>\n            <span class="key_auth__value">'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.name:t,{name:"escape",hash:{},data:i}))?a:"")+'</span>\n        </div>\n        <div class="key_auth__field">\n            <span class="key_auth__label">in:</span>\n            <span class="key_auth__value">'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t["in"]:t,{name:"escape",hash:{},data:i}))?a:"")+'</span>\n        </div>\n        <div class="key_auth__field">\n            <span class="key_auth__label">value:</span>\n'+(null!=(a=n["if"].call(o,null!=t?t.isLogout:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.program(3,i,0),data:i}))?a:"")+"        </div>\n    </div>\n</div>\n"},useData:!0}),t.auth_button=e({compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){return"<a class='authorize__btn' href=\"#\">Authorize</a>\n"},useData:!0}),t.auth_button_operation=e({1:function(e,t,n,r,i){return"        authorize__btn_operation_login\n"},3:function(e,t,n,r,i){return"        authorize__btn_operation_logout\n"},5:function(e,t,n,r,i){var a;return'        <ul class="authorize-scopes">\n'+(null!=(a=n.each.call(null!=t?t:{},null!=t?t.scopes:t,{name:"each",hash:{},fn:e.program(6,i,0),inverse:e.noop,data:i}))?a:"")+"        </ul>\n"},6:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'                <li class="authorize__scope" title="'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.description:t,{name:"escape",hash:{},data:i}))?a:"")+'">'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.scope:t,{name:"escape",hash:{},data:i}))?a:"")+"</li>\n"},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{};return'<div class="authorize__btn authorize__btn_operation\n'+(null!=(a=n["if"].call(o,null!=t?t.isLogout:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.program(3,i,0),data:i}))?a:"")+'">\n'+(null!=(a=n["if"].call(o,null!=t?t.scopes:t,{name:"if",hash:{},fn:e.program(5,i,0),inverse:e.noop,data:i}))?a:"")+"</div>\n"},useData:!0}),t.auth_view=e({1:function(e,t,n,r,i){return'            <button type="button" class="auth__button auth_submit__button" data-sw-translate>Authorize</button>\n'},3:function(e,t,n,r,i){return'            <button type="button" class="auth__button auth_logout__button" data-sw-translate>Logout</button>\n'},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{};return'<div class="auth_container">\n\n    <div class="auth_inner"></div>\n    <div class="auth_submit">\n'+(null!=(a=n.unless.call(o,null!=t?t.isLogout:t,{name:"unless",hash:{},fn:e.program(1,i,0),inverse:e.noop,data:i}))?a:"")+(null!=(a=n["if"].call(o,null!=t?t.isAuthorized:t,{name:"if",hash:{},fn:e.program(3,i,0),inverse:e.noop,data:i}))?a:"")+"    </div>\n\n</div>\n"},useData:!0}),t.basic_auth=e({1:function(e,t,n,r,i){return" - authorized"},3:function(e,t,n,r,i){var a;return'                <span class="basic_auth__value">'+(null!=(a=(n.escape||t&&t.escape||n.helperMissing).call(null!=t?t:{},null!=t?t.username:t,{name:"escape",hash:{},data:i}))?a:"")+"</span>\n"},5:function(e,t,n,r,i){return'                <input required placeholder="username" class="basic_auth__username auth_input" name="username" type="text"/>\n'},7:function(e,t,n,r,i){return'            <div class="auth_label">\n                <span class="basic_auth__label" data-sw-translate>password:</span>\n                <input required placeholder="password" class="basic_auth__password auth_input" name="password" type="password"/></label>\n            </div>\n'},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{};return"<div class='basic_auth_container'>\n    <h3 class=\"auth__title\">Basic authentication"+(null!=(a=n["if"].call(o,null!=t?t.isLogout:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.noop,data:i}))?a:"")+'</h3>\n    <form class="basic_input_container">\n        <div class="auth__description">'+(null!=(a=(n.sanitize||t&&t.sanitize||n.helperMissing).call(o,null!=t?t.description:t,{name:"sanitize",hash:{},data:i}))?a:"")+'</div>\n        <div class="auth_label">\n            <span class="basic_auth__label" data-sw-translate>username:</span>\n'+(null!=(a=n["if"].call(o,null!=t?t.isLogout:t,{name:"if",hash:{},fn:e.program(3,i,0),inverse:e.program(5,i,0),data:i}))?a:"")+"        </div>\n"+(null!=(a=n.unless.call(o,null!=t?t.isLogout:t,{name:"unless",hash:{},fn:e.program(7,i,0),inverse:e.noop,data:i}))?a:"")+"    </form>\n</div>\n"},useData:!0}),t.content_type=e({1:function(e,t,n,r,i){var a;return null!=(a=n.each.call(null!=t?t:{},null!=t?t.produces:t,{name:"each",hash:{},fn:e.program(2,i,0),inverse:e.noop,data:i}))?a:""},2:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'\t<option value="'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,t,{name:"sanitize",hash:{},data:i}))?a:"")+'">'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,t,{name:"sanitize",hash:{},data:i}))?a:"")+"</option>\n"},4:function(e,t,n,r,i){return'  <option value="application/json">application/json</option>\n'},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'<label data-sw-translate for="'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.contentTypeId:t,{name:"escape",hash:{},data:i}))?a:"")+'">Response Content Type</label>\n<select name="contentType" id="'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.contentTypeId:t,{name:"escape",hash:{},data:i}))?a:"")+'">\n'+(null!=(a=n["if"].call(o,null!=t?t.produces:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.program(4,i,0),data:i}))?a:"")+"</select>\n"},useData:!0}),t.main=e({1:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'  <div class="info_title">'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=(a=null!=t?t.info:t)?a.title:a,{name:"sanitize",hash:{},data:i}))?a:"")+'</div>\n  <div class="info_description markdown">'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=(a=null!=t?t.info:t)?a.description:a,{name:"sanitize",hash:{},data:i}))?a:"")+"</div>\n"+(null!=(a=n["if"].call(o,null!=t?t.externalDocs:t,{name:"if",hash:{},fn:e.program(2,i,0),inverse:e.noop,data:i}))?a:"")+"  "+(null!=(a=n["if"].call(o,null!=(a=null!=t?t.info:t)?a.termsOfServiceUrl:a,{name:"if",hash:{},fn:e.program(4,i,0),inverse:e.noop,data:i}))?a:"")+"\n  "+(null!=(a=n["if"].call(o,null!=(a=null!=(a=null!=t?t.info:t)?a.contact:a)?a.name:a,{name:"if",hash:{},fn:e.program(6,i,0),inverse:e.noop,data:i}))?a:"")+"\n  "+(null!=(a=n["if"].call(o,null!=(a=null!=(a=null!=t?t.info:t)?a.contact:a)?a.url:a,{name:"if",hash:{},fn:e.program(8,i,0),inverse:e.noop,data:i}))?a:"")+"\n  "+(null!=(a=n["if"].call(o,null!=(a=null!=(a=null!=t?t.info:t)?a.contact:a)?a.email:a,{name:"if",hash:{},fn:e.program(10,i,0),inverse:e.noop,data:i}))?a:"")+"\n  "+(null!=(a=n["if"].call(o,null!=(a=null!=t?t.info:t)?a.license:a,{name:"if",hash:{},fn:e.program(12,i,0),inverse:e.noop,data:i}))?a:"")+"\n"},2:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"  <p>"+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=(a=null!=t?t.externalDocs:t)?a.description:a,{name:"sanitize",hash:{},data:i}))?a:"")+'</p>\n  <a href="'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=(a=null!=t?t.externalDocs:t)?a.url:a,{name:"escape",hash:{},data:i}))?a:"")+'" target="_blank">'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=(a=null!=t?t.externalDocs:t)?a.url:a,{name:"escape",hash:{},data:i}))?a:"")+"</a>\n"},4:function(e,t,n,r,i){var a;return'<div class="info_tos"><a target="_blank" href="'+(null!=(a=(n.escape||t&&t.escape||n.helperMissing).call(null!=t?t:{},null!=(a=null!=t?t.info:t)?a.termsOfServiceUrl:a,{name:"escape",hash:{},data:i}))?a:"")+'" data-sw-translate>Terms of service</a></div>'},6:function(e,t,n,r,i){var a;return"<div><div class='info_name' style=\"display: inline\" data-sw-translate>Created by </div> "+(null!=(a=(n.escape||t&&t.escape||n.helperMissing).call(null!=t?t:{},null!=(a=null!=(a=null!=t?t.info:t)?a.contact:a)?a.name:a,{name:"escape",hash:{},data:i}))?a:"")+"</div>"},8:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"<div class='info_url' data-sw-translate>See more at <a href=\""+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=(a=null!=(a=null!=t?t.info:t)?a.contact:a)?a.url:a,{name:"escape",hash:{},data:i}))?a:"")+'">'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=(a=null!=(a=null!=t?t.info:t)?a.contact:a)?a.url:a,{name:"escape",hash:{},data:i}))?a:"")+"</a></div>"},10:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'<div class=\'info_email\'><a target="_parent" href="mailto:'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=(a=null!=(a=null!=t?t.info:t)?a.contact:a)?a.email:a,{name:"escape",hash:{},data:i}))?a:"")+"?subject="+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=(a=null!=t?t.info:t)?a.title:a,{name:"escape",hash:{},data:i}))?a:"")+'" data-sw-translate>Contact the developer</a></div>'},12:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"<div class='info_license'><a target=\"_blank\" href='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=(a=null!=(a=null!=t?t.info:t)?a.license:a)?a.url:a,{name:"escape",hash:{},data:i}))?a:"")+"'>"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=(a=null!=(a=null!=t?t.info:t)?a.license:a)?a.name:a,{name:"escape",hash:{},data:i}))?a:"")+"</a></div>"},14:function(e,t,n,r,i){var a;return'  , <span style="font-variant: small-caps" data-sw-translate>api version</span>: '+(null!=(a=(n.escape||t&&t.escape||n.helperMissing).call(null!=t?t:{},null!=(a=null!=t?t.info:t)?a.version:a,{name:"escape",hash:{},data:i}))?a:"")+"\n    "},16:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'    <span style="float:right"><a target="_blank" href="'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.validatorUrl:t,{name:"escape",hash:{},data:i}))?a:"")+"/debug?url="+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.url:t,{name:"escape",hash:{},data:i}))?a:"")+'"><img id="validator" src="'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.validatorUrl:t,{name:"escape",hash:{},data:i}))?a:"")+"?url="+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.url:t,{name:"escape",hash:{},data:i}))?a:"")+'"></a>\n    </span>\n'},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{};return"<div class='info' id='api_info'>\n"+(null!=(a=n["if"].call(o,null!=t?t.info:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.noop,data:i}))?a:"")+"</div>\n<div class='container' id='resources_container'>\n  <div class='authorize-wrapper'></div>\n\n  <ul id='resources'></ul>\n\n  <div class=\"footer\">\n    <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: "+(null!=(a=(n.escape||t&&t.escape||n.helperMissing).call(o,null!=t?t.basePath:t,{name:"escape",hash:{},data:i}))?a:"")+"\n"+(null!=(a=n["if"].call(o,null!=(a=null!=t?t.info:t)?a.version:a,{name:"if",hash:{},fn:e.program(14,i,0),inverse:e.noop,data:i}))?a:"")+"]\n"+(null!=(a=n["if"].call(o,null!=t?t.validatorUrl:t,{name:"if",hash:{},fn:e.program(16,i,0),inverse:e.noop,data:i}))?a:"")+"    </h4>\n    </div>\n</div>\n"},useData:!0}),t.oauth2=e({1:function(e,t,n,r,i){var a;return"<p>Authorization URL: "+(null!=(a=(n.sanitize||t&&t.sanitize||n.helperMissing).call(null!=t?t:{},null!=t?t.authorizationUrl:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</p>"},3:function(e,t,n,r,i){var a;return"<p>Token URL: "+(null!=(a=(n.sanitize||t&&t.sanitize||n.helperMissing).call(null!=t?t:{},null!=t?t.tokenUrl:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</p>"},5:function(e,t,n,r,i){return'        <p>Please input username and password for password flow authorization</p>\n        <fieldset>\n            <div><label>Username: <input class="oauth-username" type="text" name="username"></label></div>\n            <div><label>Password: <input class="oauth-password" type="password" name="password"></label></div>\n        </fieldset>\n'},7:function(e,t,n,r,i){var a;return"        <p>Setup client authentication."+(null!=(a=n["if"].call(null!=t?t:{},null!=t?t.requireClientAuthenticaiton:t,{name:"if",hash:{},fn:e.program(8,i,0),inverse:e.noop,data:i}))?a:"")+'</p>\n        <fieldset>\n            <div><label>Type:\n                <select class="oauth-client-authentication-type" name="client-authentication-type">\n                    <option value="none" selected>None or other</option>\n                    <option value="basic">Basic auth</option>\n                    <option value="request-body">Request body</option>\n                </select>\n            </label></div>\n            <div class="oauth-client-authentication" hidden>\n                <div><label>ClientId: <input class="oauth-client-id" type="text" name="client-id"></label></div>\n                <div><label>Secret: <input class="oauth-client-secret" type="text" name="client-secret"></label></div>\n            </div>\n        </fieldset>\n'},8:function(e,t,n,r,i){return"(Required)"},10:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'            <li>\n                <input class="oauth-scope" type="checkbox" data-scope="'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.scope:t,{name:"escape",hash:{},data:i}))?a:"")+'" oauthtype="'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.OAuthSchemeKey:t,{name:"escape",hash:{},data:i}))?a:"")+'"/>\n                <label>'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.scope:t,{name:"escape",hash:{},data:i}))?a:"")+'</label><br/>\n                <span class="api-scope-desc">'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.description:t,{name:"escape",hash:{},data:i}))?a:"")+"\n"+(null!=(a=n["if"].call(o,null!=t?t.OAuthSchemeKey:t,{name:"if",hash:{},fn:e.program(11,i,0),inverse:e.noop,data:i}))?a:"")+"                </span>\n            </li>\n"},11:function(e,t,n,r,i){var a;return"                        ("+(null!=(a=(n.escape||t&&t.escape||n.helperMissing).call(null!=t?t:{},null!=t?t.OAuthSchemeKey:t,{name:"escape",hash:{},data:i}))?a:"")+")\n"},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'<div>\n    <h3 class="auth__title">OAuth2.0</h3>\n    <p>'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.description:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</p>\n    "+(null!=(a=n["if"].call(o,null!=t?t.authorizationUrl:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.noop,data:i}))?a:"")+"\n    "+(null!=(a=n["if"].call(o,null!=t?t.tokenUrl:t,{name:"if",hash:{},fn:e.program(3,i,0),inverse:e.noop,data:i}))?a:"")+"\n    <p>flow: "+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.flow:t,{name:"escape",hash:{},data:i}))?a:"")+"</p>\n"+(null!=(a=n["if"].call(o,null!=t?t.isPasswordFlow:t,{name:"if",hash:{},fn:e.program(5,i,0),inverse:e.noop,data:i}))?a:"")+(null!=(a=n["if"].call(o,null!=t?t.clientAuthentication:t,{name:"if",hash:{},fn:e.program(7,i,0),inverse:e.noop,data:i}))?a:"")+"    <p><strong> "+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.appName:t,{name:"escape",hash:{},data:i}))?a:"")+' </strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>\n    <p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.\n        <a href="#">Learn how to use</a>\n    </p>\n    <ul class="api-popup-scopes">\n'+(null!=(a=n.each.call(o,null!=t?t.scopes:t,{name:"each",hash:{},fn:e.program(10,i,0),inverse:e.noop,data:i}))?a:"")+"    </ul>\n</div>"},useData:!0}),t.operation=e({1:function(e,t,n,r,i){return"deprecated"},3:function(e,t,n,r,i){return"            <h4><span data-sw-translate>Warning: Deprecated</span></h4>\n"},5:function(e,t,n,r,i){var a;return'        <h4><span data-sw-translate>Implementation Notes</span></h4>\n        <div class="markdown">'+(null!=(a=(n.sanitize||t&&t.sanitize||n.helperMissing).call(null!=t?t:{},null!=t?t.description:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</div>\n"},7:function(e,t,n,r,i){return"            <div class='authorize-wrapper authorize-wrapper_operation'></div>\n"},9:function(e,t,n,r,i){var a,o=null!=t?t:{};return'          <div class="response-class">\n            <h4><span data-sw-translate>Response Class</span> (<span data-sw-translate>Status</span> '+(null!=(a=(n.escape||t&&t.escape||n.helperMissing).call(o,null!=t?t.successCode:t,{name:"escape",hash:{},data:i}))?a:"")+")</h4>\n              "+(null!=(a=n["if"].call(o,null!=t?t.successDescription:t,{name:"if",hash:{},fn:e.program(10,i,0),inverse:e.noop,data:i}))?a:"")+'\n            <p><span class="model-signature" /></p>\n            <br/>\n            <div class="response-content-type" />\n            </div>\n'},10:function(e,t,n,r,i){var a;return'<div class="markdown">'+(null!=(a=(n.sanitize||t&&t.sanitize||n.helperMissing).call(null!=t?t:{},null!=t?t.successDescription:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</div>"},12:function(e,t,n,r,i){var a;return'          <h4 data-sw-translate>Headers</h4>\n          <table class="headers">\n            <thead>\n              <tr>\n                <th style="width: 100px; max-width: 100px" data-sw-translate>Header</th>\n                <th style="width: 310px; max-width: 310px" data-sw-translate>Description</th>\n                <th style="width: 200px; max-width: 200px" data-sw-translate>Type</th>\n                <th style="width: 320px; max-width: 320px" data-sw-translate>Other</th>\n              </tr>\n            </thead>\n            <tbody>\n'+(null!=(a=n.each.call(null!=t?t:{},null!=t?t.headers:t,{name:"each",hash:{},fn:e.program(13,i,0),inverse:e.noop,data:i}))?a:"")+"            </tbody>\n          </table>\n"},13:function(e,t,n,r,i){var a,o,s=null!=t?t:{},l=n.helperMissing;return"              <tr>\n                <td>"+e.escapeExpression((o=null!=(o=n.key||i&&i.key)?o:l,"function"==typeof o?o.call(s,{name:"key",hash:{},data:i}):o))+"</td>\n                <td>"+(null!=(a=(n.sanitize||t&&t.sanitize||l).call(s,null!=t?t.description:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</td>\n                <td>"+(null!=(a=(n.escape||t&&t.escape||l).call(s,null!=t?t.type:t,{name:"escape",hash:{},data:i}))?a:"")+"</td>\n                <td>"+(null!=(a=(n.escape||t&&t.escape||l).call(s,null!=t?t.other:t,{name:"escape",hash:{},data:i}))?a:"")+"</td>\n              </tr>\n"},15:function(e,t,n,r,i){return'          <h4 data-sw-translate>Parameters</h4>\n          <table class=\'fullwidth parameters\'>\n          <thead>\n            <tr>\n            <th style="width: 100px; max-width: 100px" data-sw-translate>Parameter</th>\n            <th style="width: 310px; max-width: 310px" data-sw-translate>Value</th>\n            <th style="width: 200px; max-width: 200px" data-sw-translate>Description</th>\n            <th style="width: 100px; max-width: 100px" data-sw-translate>Parameter Type</th>\n            <th style="width: 220px; max-width: 230px" data-sw-translate>Data Type</th>\n            </tr>\n          </thead>\n          <tbody class="operation-params">\n\n          </tbody>\n          </table>\n'},17:function(e,t,n,r,i){return"          <div style='margin:0;padding:0;display:inline'></div>\n          <h4 data-sw-translate>Response Messages</h4>\n          <table class='fullwidth response-messages'>\n            <thead>\n            <tr>\n              <th data-sw-translate>HTTP Status Code</th>\n              <th data-sw-translate>Reason</th>\n              <th data-sw-translate>Response Model</th>\n              <th data-sw-translate>Headers</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            </tbody>\n          </table>\n"},19:function(e,t,n,r,i){return""},21:function(e,t,n,r,i){return"          <div class='sandbox_header'>\n            <input class='submit' type='submit' value='Try it out!' data-sw-translate/>\n            <a href='#' class='response_hider' style='display:none' data-sw-translate>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n"},23:function(e,t,n,r,i){return"          <h4 data-sw-translate>Request Headers</h4>\n          <div class='block request_headers'></div>\n"},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing,l=e.escapeExpression;return"  <ul class='operations' >\n    <li class='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.method:t,{name:"escape",hash:{},data:i}))?a:"")+" operation' id='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.parentId:t,{name:"escape",hash:{},data:i}))?a:"")+"_"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.nickname:t,{name:"escape",hash:{},data:i}))?a:"")+"'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/"+l((n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.encodedParentId:t,{name:"sanitize",hash:{},data:i}))+"/"+l((n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.nickname:t,{name:"sanitize",hash:{},data:i}))+'\' class="toggleOperation">'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.method:t,{name:"escape",hash:{},data:i}))?a:"")+"</a>\n          </span>\n          <span class='path'>\n          <a href='#!/"+l((n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.encodedParentId:t,{name:"sanitize",hash:{},data:i}))+"/"+l((n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.nickname:t,{name:"sanitize",hash:{},data:i}))+"' class=\"toggleOperation "+(null!=(a=n["if"].call(o,null!=t?t.deprecated:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.noop,data:i}))?a:"")+'">'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.path:t,{name:"escape",hash:{},data:i}))?a:"")+"</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/"+l((n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.encodedParentId:t,{name:"sanitize",hash:{},data:i}))+"/"+l((n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.nickname:t,{name:"sanitize",hash:{},data:i}))+'\' class="toggleOperation"><span class="markdown">'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.summary:t,{name:"escape",hash:{},data:i}))?a:"")+"</span></a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='"+l((n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.encodedParentId:t,{name:"sanitize",hash:{},data:i}))+"_"+l((n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.nickname:t,{name:"sanitize",hash:{},data:i}))+"_content' style='display:none'>\n"+(null!=(a=n["if"].call(o,null!=t?t.deprecated:t,{name:"if",hash:{},fn:e.program(3,i,0),inverse:e.noop,data:i}))?a:"")+(null!=(a=n["if"].call(o,null!=t?t.description:t,{name:"if",hash:{},fn:e.program(5,i,0),inverse:e.noop,data:i}))?a:"")+(null!=(a=n["if"].call(o,null!=t?t.security:t,{name:"if",hash:{},fn:e.program(7,i,0),inverse:e.noop,data:i}))?a:"")+(null!=(a=n["if"].call(o,null!=t?t.type:t,{name:"if",hash:{},fn:e.program(9,i,0),inverse:e.noop,data:i}))?a:"")+"\n"+(null!=(a=n["if"].call(o,null!=t?t.headers:t,{name:"if",hash:{},fn:e.program(12,i,0),inverse:e.noop,data:i}))?a:"")+"\n        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n"+(null!=(a=n["if"].call(o,null!=t?t.parameters:t,{name:"if",hash:{},fn:e.program(15,i,0),inverse:e.noop,data:i}))?a:"")+(null!=(a=n["if"].call(o,null!=t?t.responseMessages:t,{name:"if",hash:{},fn:e.program(17,i,0),inverse:e.noop,data:i}))?a:"")+(null!=(a=n["if"].call(o,null!=t?t.isReadOnly:t,{name:"if",hash:{},fn:e.program(19,i,0),inverse:e.program(21,i,0),data:i}))?a:"")+"        </form>\n        <div class='response' style='display:none'>\n          <h4 class='curl'>Curl</h4>\n          <div class='block curl'></div>\n          <h4 data-sw-translate>Request URL</h4>\n          <div class='block request_url'></div>\n"+(null!=(a=n["if"].call(o,null!=t?t.showRequestHeaders:t,{name:"if",hash:{},fn:e.program(23,i,0),inverse:e.noop,data:i}))?a:"")+"          <h4 data-sw-translate>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4 data-sw-translate>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4 data-sw-translate>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n"},useData:!0}),t.param=e({1:function(e,t,n,r,i){var a;return null!=(a=n["if"].call(null!=t?t:{},null!=t?t.isFile:t,{name:"if",hash:{},fn:e.program(2,i,0),inverse:e.program(4,i,0),data:i}))?a:""},2:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'\t\t\t<input type="file" name=\''+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.name:t,{name:"escape",hash:{},data:i}))?a:"")+"' id='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+'\'/>\n\t\t\t<div class="parameter-content-type" />\n'},4:function(e,t,n,r,i){var a;return null!=(a=n["if"].call(null!=t?t:{},null!=t?t["default"]:t,{name:"if",hash:{},fn:e.program(5,i,0),inverse:e.program(7,i,0),data:i}))?a:""},5:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"\t\t\t\t<div class=\"editor_holder\"></div>\n\t\t\t\t<textarea class='body-textarea' name='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.name:t,{name:"escape",hash:{},data:i}))?a:"")+"' id='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+"'>"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t["default"]:t,{name:"escape",hash:{},data:i}))?a:"")+'</textarea>\n        <br />\n        <div class="parameter-content-type" />\n'},7:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"\t\t\t\t<textarea class='body-textarea' name='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.name:t,{name:"escape",hash:{},data:i}))?a:"")+"' id='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+'\'></textarea>\n\t\t\t\t<div class="editor_holder"></div>\n\t\t\t\t<br />\n\t\t\t\t<div class="parameter-content-type" />\n'},9:function(e,t,n,r,i){var a;return null!=(a=n["if"].call(null!=t?t:{},null!=t?t.isFile:t,{name:"if",hash:{},fn:e.program(2,i,0),inverse:e.program(10,i,0),data:i}))?a:""},10:function(e,t,n,r,i){var a;return null!=(a=(n.renderTextParam||t&&t.renderTextParam||n.helperMissing).call(null!=t?t:{},t,{name:"renderTextParam",hash:{},fn:e.program(11,i,0),inverse:e.noop,data:i}))?a:""},11:function(e,t,n,r,i){return""},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"<td class='code'><label for='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+"'>"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.name:t,{name:"escape",hash:{},data:i}))?a:"")+"</label></td>\n<td>\n\n"+(null!=(a=n["if"].call(o,null!=t?t.isBody:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.program(9,i,0),data:i}))?a:"")+'\n</td>\n<td class="markdown">'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.description:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</td>\n<td>"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.paramType:t,{name:"escape",hash:{},data:i}))?a:"")+'</td>\n<td>\n\t<span class="model-signature"></span>\n</td>\n'},useData:!0}),t.param_list=e({1:function(e,t,n,r,i){return" required"},3:function(e,t,n,r,i){return' multiple="multiple"'},5:function(e,t,n,r,i){return" required "},7:function(e,t,n,r,i){var a;return"      <option "+(null!=(a=n.unless.call(null!=t?t:{},null!=t?t.hasDefault:t,{name:"unless",hash:{},fn:e.program(8,i,0),inverse:e.noop,data:i}))?a:"")+" value=''></option>\n"},8:function(e,t,n,r,i){return'  selected="" '},10:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"\n      <option "+(null!=(a=n["if"].call(o,null!=t?t.isDefault:t,{name:"if",hash:{},fn:e.program(11,i,0),inverse:e.noop,data:i}))?a:"")+"  value='"+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.value:t,{name:"sanitize",hash:{},data:i}))?a:"")+"'> "+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.value:t,{name:"sanitize",hash:{},data:i}))?a:"")+" "+(null!=(a=n["if"].call(o,null!=t?t.isDefault:t,{name:"if",hash:{},fn:e.program(13,i,0),inverse:e.noop,data:i}))?a:"")+" </option>\n\n"},11:function(e,t,n,r,i){return' selected=""  '},13:function(e,t,n,r,i){return" (default) "},15:function(e,t,n,r,i){return"<strong>"},17:function(e,t,n,r,i){return"</strong>"},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o,s=null!=t?t:{},l=n.helperMissing;return"<td class='code"+(null!=(a=n["if"].call(s,null!=t?t.required:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.noop,data:i}))?a:"")+"'><label for='"+(null!=(a=(n.escape||t&&t.escape||l).call(s,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+"'>"+(null!=(a=(n.sanitize||t&&t.sanitize||l).call(s,null!=t?t.name:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</label></td>\n<td>\n  <select "+(null!=(a=(n.isArray||t&&t.isArray||l).call(s,t,{name:"isArray",hash:{},fn:e.program(3,i,0),inverse:e.noop,data:i}))?a:"")+' class="parameter '+(null!=(a=n["if"].call(s,null!=t?t.required:t,{name:"if",hash:{},fn:e.program(5,i,0),inverse:e.noop,data:i}))?a:"")+'" name="'+(null!=(a=(n.sanitize||t&&t.sanitize||l).call(s,null!=t?t.name:t,{name:"sanitize",hash:{},data:i}))?a:"")+'" id="'+(null!=(a=(n.escape||t&&t.escape||l).call(s,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+'">\n\n'+(null!=(a=n.unless.call(s,null!=t?t.required:t,{name:"unless",hash:{},fn:e.program(7,i,0),inverse:e.noop,data:i}))?a:"")+"\n"+(null!=(a=n.each.call(s,null!=(a=null!=t?t.allowableValues:t)?a.descriptiveValues:a,{name:"each",hash:{},fn:e.program(10,i,0),inverse:e.noop,data:i}))?a:"")+'\n  </select>\n</td>\n<td class="markdown">'+(null!=(a=n["if"].call(s,null!=t?t.required:t,{name:"if",hash:{},fn:e.program(15,i,0),inverse:e.noop,data:i}))?a:"")+(null!=(o=null!=(o=n.description||(null!=t?t.description:t))?o:l,a="function"==typeof o?o.call(s,{name:"description",hash:{},data:i}):o)?a:"")+(null!=(a=n["if"].call(s,null!=t?t.required:t,{name:"if",hash:{},fn:e.program(17,i,0),inverse:e.noop,data:i}))?a:"")+"</td>\n<td>"+(null!=(a=(n.escape||t&&t.escape||l).call(s,null!=t?t.paramType:t,{name:"escape",hash:{},data:i}))?a:"")+'</td>\n<td><span class="model-signature"></span></td>\n'},useData:!0}),t.param_readonly=e({1:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"        <textarea class='body-textarea' readonly='readonly' name='"+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.name:t,{name:"sanitize",hash:{},data:i}))?a:"")+"' id='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+"'>"+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t["default"]:t,{name:"sanitize",hash:{},data:i}))?a:"")+'</textarea>\n        <div class="parameter-content-type" />\n'},3:function(e,t,n,r,i){
+var a;return null!=(a=n["if"].call(null!=t?t:{},null!=t?t["default"]:t,{name:"if",hash:{},fn:e.program(4,i,0),inverse:e.program(6,i,0),data:i}))?a:""},4:function(e,t,n,r,i){var a;return"            "+(null!=(a=(n.sanitize||t&&t.sanitize||n.helperMissing).call(null!=t?t:{},null!=t?t["default"]:t,{name:"sanitize",hash:{},data:i}))?a:"")+"\n"},6:function(e,t,n,r,i){return"            (empty)\n"},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"<td class='code'><label for='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+"'>"+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.name:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</label></td>\n<td>\n"+(null!=(a=n["if"].call(o,null!=t?t.isBody:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.program(3,i,0),data:i}))?a:"")+'</td>\n<td class="markdown">'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.description:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</td>\n<td>"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.paramType:t,{name:"escape",hash:{},data:i}))?a:"")+'</td>\n<td><span class="model-signature"></span></td>\n'},useData:!0}),t.param_readonly_required=e({1:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"        <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='"+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.name:t,{name:"sanitize",hash:{},data:i}))?a:"")+"' id='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+"'>"+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t["default"]:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</textarea>\n"},3:function(e,t,n,r,i){var a;return null!=(a=n["if"].call(null!=t?t:{},null!=t?t["default"]:t,{name:"if",hash:{},fn:e.program(4,i,0),inverse:e.program(6,i,0),data:i}))?a:""},4:function(e,t,n,r,i){var a;return"            "+(null!=(a=(n.sanitize||t&&t.sanitize||n.helperMissing).call(null!=t?t:{},null!=t?t["default"]:t,{name:"sanitize",hash:{},data:i}))?a:"")+"\n"},6:function(e,t,n,r,i){return"            (empty)\n"},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"<td class='code required'><label for='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+"'>"+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.name:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</label></td>\n<td>\n"+(null!=(a=n["if"].call(o,null!=t?t.isBody:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.program(3,i,0),data:i}))?a:"")+'</td>\n<td class="markdown">'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.description:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</td>\n<td>"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.paramType:t,{name:"escape",hash:{},data:i}))?a:"")+'</td>\n<td><span class="model-signature"></span></td>\n'},useData:!0}),t.param_required=e({1:function(e,t,n,r,i){var a;return null!=(a=n["if"].call(null!=t?t:{},null!=t?t.isFile:t,{name:"if",hash:{},fn:e.program(2,i,0),inverse:e.program(4,i,0),data:i}))?a:""},2:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'\t\t\t<input type="file" name=\''+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.name:t,{name:"escape",hash:{},data:i}))?a:"")+"' id='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+"'/>\n"},4:function(e,t,n,r,i){var a;return null!=(a=n["if"].call(null!=t?t:{},null!=t?t["default"]:t,{name:"if",hash:{},fn:e.program(5,i,0),inverse:e.program(7,i,0),data:i}))?a:""},5:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"\t\t\t\t<div class=\"editor_holder\"></div>\n\t\t\t\t<textarea class='body-textarea required' placeholder='(required)' name='"+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.name:t,{name:"sanitize",hash:{},data:i}))?a:"")+"' id=\""+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+'">'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t["default"]:t,{name:"sanitize",hash:{},data:i}))?a:"")+'</textarea>\n        <br />\n        <div class="parameter-content-type" />\n'},7:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"\t\t\t\t<textarea class='body-textarea required' placeholder='(required)' name='"+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.name:t,{name:"sanitize",hash:{},data:i}))?a:"")+"' id='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+'\'></textarea>\n\t\t\t\t<div class="editor_holder"></div>\n\t\t\t\t<br />\n\t\t\t\t<div class="parameter-content-type" />\n'},9:function(e,t,n,r,i){var a;return null!=(a=n["if"].call(null!=t?t:{},null!=t?t.isFile:t,{name:"if",hash:{},fn:e.program(10,i,0),inverse:e.program(12,i,0),data:i}))?a:""},10:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"\t\t\t<input class='parameter required' type='file' name='"+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.name:t,{name:"sanitize",hash:{},data:i}))?a:"")+"' id='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+"'/>\n"},12:function(e,t,n,r,i){var a;return null!=(a=(n.renderTextParam||t&&t.renderTextParam||n.helperMissing).call(null!=t?t:{},t,{name:"renderTextParam",hash:{},fn:e.program(13,i,0),inverse:e.noop,data:i}))?a:""},13:function(e,t,n,r,i){return""},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"<td class='code required'><label for='"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.valueId:t,{name:"escape",hash:{},data:i}))?a:"")+"'>"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.name:t,{name:"escape",hash:{},data:i}))?a:"")+"</label></td>\n<td>\n"+(null!=(a=n["if"].call(o,null!=t?t.isBody:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.program(9,i,0),data:i}))?a:"")+'</td>\n<td>\n\t<strong><span class="markdown">'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,null!=t?t.description:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</span></strong>\n</td>\n<td>"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.paramType:t,{name:"escape",hash:{},data:i}))?a:"")+'</td>\n<td><span class="model-signature"></span></td>\n'},useData:!0}),t.parameter_content_type=e({1:function(e,t,n,r,i){var a;return null!=(a=n.each.call(null!=t?t:{},null!=t?t.consumes:t,{name:"each",hash:{},fn:e.program(2,i,0),inverse:e.noop,data:i}))?a:""},2:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'  <option value="'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,t,{name:"sanitize",hash:{},data:i}))?a:"")+'">'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,t,{name:"sanitize",hash:{},data:i}))?a:"")+"</option>\n"},4:function(e,t,n,r,i){return'  <option value="application/json">application/json</option>\n'},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o,s=null!=t?t:{},l=n.helperMissing;return'<label for="'+e.escapeExpression((o=null!=(o=n.parameterContentTypeId||(null!=t?t.parameterContentTypeId:t))?o:l,"function"==typeof o?o.call(s,{name:"parameterContentTypeId",hash:{},data:i}):o))+'" data-sw-translate>Parameter content type:</label>\n<select name="parameterContentType" id="'+(null!=(a=(n.sanitize||t&&t.sanitize||l).call(s,null!=t?t.parameterContentTypeId:t,{name:"sanitize",hash:{},data:i}))?a:"")+'">\n'+(null!=(a=n["if"].call(s,null!=t?t.consumes:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.program(4,i,0),data:i}))?a:"")+"</select>\n"},useData:!0}),t.popup=e({compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a;return'<div class="api-popup-dialog-wrapper">\n    <div class="api-popup-title">'+e.escapeExpression((a=null!=(a=n.title||(null!=t?t.title:t))?a:n.helperMissing,"function"==typeof a?a.call(null!=t?t:{},{name:"title",hash:{},data:i}):a))+'</div>\n    <div class="api-popup-content"></div>\n    <p class="error-msg"></p>\n    <div class="api-popup-actions">\n        <button class="api-popup-cancel api-button gray" type="button">Cancel</button>\n    </div>\n</div>\n<div class="api-popup-dialog-shadow"></div>'},useData:!0}),t.resource=e({1:function(e,t,n,r,i){return" : "},3:function(e,t,n,r,i){var a;return"    <li>\n      <a href='"+(null!=(a=(n.sanitize||t&&t.sanitize||n.helperMissing).call(null!=t?t:{},null!=t?t.url:t,{name:"sanitize",hash:{},data:i}))?a:"")+"' data-sw-translate>Raw</a>\n    </li>\n"},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o,s,l=null!=t?t:{},u=n.helperMissing,c="<div class='heading'>\n  <h2>\n    <a href='#!/"+(null!=(a=(n.sanitize||t&&t.sanitize||u).call(l,null!=t?t.id:t,{name:"sanitize",hash:{},data:i}))?a:"")+'\' class="toggleEndpointList" data-id="'+(null!=(a=(n.sanitize||t&&t.sanitize||u).call(l,null!=t?t.id:t,{name:"sanitize",hash:{},data:i}))?a:"")+'">'+(null!=(a=(n.sanitize||t&&t.sanitize||u).call(l,null!=t?t.name:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</a> ";return o=null!=(o=n.summary||(null!=t?t.summary:t))?o:u,s={name:"summary",hash:{},fn:e.program(1,i,0),inverse:e.noop,data:i},a="function"==typeof o?o.call(l,s):o,n.summary||(a=n.blockHelperMissing.call(t,a,s)),null!=a&&(c+=a),c+(null!=(a=(n.sanitize||t&&t.sanitize||u).call(l,null!=t?t.summary:t,{name:"sanitize",hash:{},data:i}))?a:"")+"\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/"+(null!=(a=(n.sanitize||t&&t.sanitize||u).call(l,null!=t?t.id:t,{name:"sanitize",hash:{},data:i}))?a:"")+"' id='endpointListTogger_"+(null!=(a=(n.sanitize||t&&t.sanitize||u).call(l,null!=t?t.id:t,{name:"sanitize",hash:{},data:i}))?a:"")+'\' class="toggleEndpointList" data-id="'+(null!=(a=(n.sanitize||t&&t.sanitize||u).call(l,null!=t?t.id:t,{name:"sanitize",hash:{},data:i}))?a:"")+'" data-sw-translate>Show/Hide</a>\n    </li>\n    <li>\n      <a href=\'#\' class="collapseResource" data-id="'+(null!=(a=(n.sanitize||t&&t.sanitize||u).call(l,null!=t?t.id:t,{name:"sanitize",hash:{},data:i}))?a:"")+'" data-sw-translate>\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href=\'#\' class="expandResource" data-id="'+(null!=(a=(n.sanitize||t&&t.sanitize||u).call(l,null!=t?t.id:t,{name:"sanitize",hash:{},data:i}))?a:"")+'" data-sw-translate>\n        Expand Operations\n      </a>\n    </li>\n'+(null!=(a=n["if"].call(l,null!=t?t.url:t,{name:"if",hash:{},fn:e.program(3,i,0),inverse:e.noop,data:i}))?a:"")+"  </ul>\n</div>\n<ul class='endpoints' id='"+(null!=(a=(n.sanitize||t&&t.sanitize||u).call(l,null!=t?t.id:t,{name:"sanitize",hash:{},data:i}))?a:"")+"_endpoint_list' style='display:none'>\n\n</ul>\n"},useData:!0}),t.response_content_type=e({1:function(e,t,n,r,i){var a;return null!=(a=n.each.call(null!=t?t:{},null!=t?t.produces:t,{name:"each",hash:{},fn:e.program(2,i,0),inverse:e.noop,data:i}))?a:""},2:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return'  <option value="'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,t,{name:"sanitize",hash:{},data:i}))?a:"")+'">'+(null!=(a=(n.sanitize||t&&t.sanitize||s).call(o,t,{name:"sanitize",hash:{},data:i}))?a:"")+"</option>\n"},4:function(e,t,n,r,i){return'  <option value="application/json">application/json</option>\n'},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o,s=null!=t?t:{},l=n.helperMissing,u="function",c=e.escapeExpression;return'<label data-sw-translate for="'+c((o=null!=(o=n.responseContentTypeId||(null!=t?t.responseContentTypeId:t))?o:l,typeof o===u?o.call(s,{name:"responseContentTypeId",hash:{},data:i}):o))+'">Response Content Type</label>\n<select name="responseContentType" id="'+c((o=null!=(o=n.responseContentTypeId||(null!=t?t.responseContentTypeId:t))?o:l,typeof o===u?o.call(s,{name:"responseContentTypeId",hash:{},data:i}):o))+'">\n'+(null!=(a=n["if"].call(s,null!=t?t.produces:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.program(4,i,0),data:i}))?a:"")+"</select>\n"},useData:!0}),t.signature=e({1:function(e,t,n,r,i){var a,o=null!=t?t:{};return'\n<div>\n<ul class="signature-nav">\n  <li><a class="description-link" href="#" data-sw-translate>Model</a></li>\n  <li><a class="snippet-link" href="#" data-sw-translate>Example Value</a></li>\n</ul>\n<div>\n\n<div class="signature-container">\n  <div class="description">\n      '+e.escapeExpression((n.sanitize||t&&t.sanitize||n.helperMissing).call(o,null!=t?t.signature:t,{name:"sanitize",hash:{},data:i}))+'\n  </div>\n\n  <div class="snippet">\n'+(null!=(a=n["if"].call(o,null!=t?t.sampleJSON:t,{name:"if",hash:{},fn:e.program(2,i,0),inverse:e.noop,data:i}))?a:"")+(null!=(a=n["if"].call(o,null!=t?t.sampleXML:t,{name:"if",hash:{},fn:e.program(5,i,0),inverse:e.noop,data:i}))?a:"")+"  </div>\n</div>\n"},2:function(e,t,n,r,i){var a,o=null!=t?t:{};return'      <div class="snippet_json">\n        <pre><code>'+(null!=(a=(n.escape||t&&t.escape||n.helperMissing).call(o,null!=t?t.sampleJSON:t,{name:"escape",hash:{},data:i}))?a:"")+"</code></pre>\n        "+(null!=(a=n["if"].call(o,null!=t?t.isParam:t,{name:"if",hash:{},fn:e.program(3,i,0),inverse:e.noop,data:i}))?a:"")+"\n      </div>\n"},3:function(e,t,n,r,i){return'<small class="notice" data-sw-translate></small>'},5:function(e,t,n,r,i){var a,o=null!=t?t:{};return'    <div class="snippet_xml">\n      <pre><code>'+(null!=(a=(n.escape||t&&t.escape||n.helperMissing).call(o,null!=t?t.sampleXML:t,{name:"escape",hash:{},data:i}))?a:"")+"</code></pre>\n      "+(null!=(a=n["if"].call(o,null!=t?t.isParam:t,{name:"if",hash:{},fn:e.program(3,i,0),inverse:e.noop,data:i}))?a:"")+"\n    </div>\n"},7:function(e,t,n,r,i){var a;return"    "+(null!=(a=(n.escape||t&&t.escape||n.helperMissing).call(null!=t?t:{},null!=t?t.signature:t,{name:"escape",hash:{},data:i}))?a:"")+"\n"},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a;return null!=(a=(n.ifCond||t&&t.ifCond||n.helperMissing).call(null!=t?t:{},null!=t?t.sampleJSON:t,"||",null!=t?t.sampleXML:t,{name:"ifCond",hash:{},fn:e.program(1,i,0),inverse:e.program(7,i,0),data:i}))?a:""},useData:!0}),t.status_code=e({1:function(e,t,n,r,i){var a,o,s=null!=t?t:{},l=n.helperMissing;return"      <tr>\n        <td>"+e.escapeExpression((o=null!=(o=n.key||i&&i.key)?o:l,"function"==typeof o?o.call(s,{name:"key",hash:{},data:i}):o))+"</td>\n        <td>"+(null!=(a=(n.sanitize||t&&t.sanitize||l).call(s,null!=t?t.description:t,{name:"sanitize",hash:{},data:i}))?a:"")+"</td>\n        <td>"+(null!=(a=(n.escape||t&&t.escape||l).call(s,null!=t?t.type:t,{name:"escape",hash:{},data:i}))?a:"")+"</td>\n      </tr>\n"},compiler:[7,">= 4.0.0"],main:function(e,t,n,r,i){var a,o=null!=t?t:{},s=n.helperMissing;return"<td width='15%' class='code'>"+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.code:t,{name:"escape",hash:{},data:i}))?a:"")+'</td>\n<td class="markdown">'+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.message:t,{name:"escape",hash:{},data:i}))?a:"")+'</td>\n<td width=\'50%\'><span class="model-signature" /></td>\n<td class="headers">\n  <table>\n    <tbody>\n'+(null!=(a=n.each.call(o,null!=t?t.headers:t,{name:"each",hash:{},fn:e.program(1,i,0),inverse:e.noop,data:i}))?a:"")+"    </tbody>\n  </table>\n</td>"},useData:!0})}(),$(function(){$.fn.vAlign=function(){return this.each(function(){var e=$(this).height(),t=$(this).parent().height(),n=(t-e)/2;$(this).css("margin-top",n)})},$.fn.stretchFormtasticInputWidthToParent=function(){return this.each(function(){var e=$(this).closest("form").innerWidth(),t=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10),n=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",e-t-n)})},$("form.formtastic li.string input, form.formtastic textarea").stretchFormtasticInputWidthToParent(),$("ul.downplayed li div.content p").vAlign(),$("form.sandbox").submit(function(){var e=!0;return $(this).find("input.required").each(function(){$(this).removeClass("error"),""===$(this).val()&&($(this).addClass("error"),$(this).wiggle(),e=!1)}),e})}),Function.prototype.bind&&console&&"object"==typeof console.log&&["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(e){console[e]=this.bind(console[e],console)},Function.prototype.call),window.Docs={shebang:function(){var e=$.param.fragment().split("/");switch(e.shift(),e.length){case 1:if(e[0].length>0){var t="resource_"+e[0];Docs.expandEndpointListForResource(e[0]),$("#"+t).slideto({highlight:!1})}break;case 2:Docs.expandEndpointListForResource(e[0]),$("#"+t).slideto({highlight:!1});var n=e.join("_"),r=n+"_content";Docs.expandOperation($("#"+r)),$("#"+n).slideto({highlight:!1})}},toggleEndpointListForResource:function(e){var t=$("li#resource_"+Docs.escapeResourceName(e)+" ul.endpoints");t.is(":visible")?($.bbq.pushState("#/",2),Docs.collapseEndpointListForResource(e)):($.bbq.pushState("#/"+e,2),Docs.expandEndpointListForResource(e))},expandEndpointListForResource:function(e){var e=Docs.escapeResourceName(e);if(""==e)return void $(".resource ul.endpoints").slideDown();$("li#resource_"+e).addClass("active");var t=$("li#resource_"+e+" ul.endpoints");t.slideDown()},collapseEndpointListForResource:function(e){var e=Docs.escapeResourceName(e);if(""==e)return void $(".resource ul.endpoints").slideUp();$("li#resource_"+e).removeClass("active");var t=$("li#resource_"+e+" ul.endpoints");t.slideUp()},expandOperationsForResource:function(e){return Docs.expandEndpointListForResource(e),""==e?void $(".resource ul.endpoints li.operation div.content").slideDown():void $("li#resource_"+Docs.escapeResourceName(e)+" li.operation div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(e){return Docs.expandEndpointListForResource(e),""==e?void $(".resource ul.endpoints li.operation div.content").slideUp():void $("li#resource_"+Docs.escapeResourceName(e)+" li.operation div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(e){return e.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(e){e.slideDown()},collapseOperation:function(e){e.slideUp()}},function(e,t){"use strict";"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():e.returnExports=t()}(this,function(){var e,t,n=Array,r=n.prototype,i=Object,a=i.prototype,o=Function,s=o.prototype,l=String,u=l.prototype,c=Number,p=c.prototype,h=r.slice,f=r.splice,d=r.push,m=r.unshift,g=r.concat,y=r.join,v=s.call,b=s.apply,w=Math.max,_=Math.min,x=a.toString,A="function"==typeof Symbol&&"symbol"==typeof Symbol.toStringTag,S=Function.prototype.toString,j=/^\s*class /,E=function(e){try{var t=S.call(e),n=t.replace(/\/\/.*\n/g,""),r=n.replace(/\/\*[.\s\S]*\*\//g,""),i=r.replace(/\n/gm," ").replace(/ {2}/g," ");return j.test(i)}catch(a){return!1}},O=function(e){try{return!E(e)&&(S.call(e),!0)}catch(t){return!1}},k="[object Function]",T="[object GeneratorFunction]",e=function(e){if(!e)return!1;if("function"!=typeof e&&"object"!=typeof e)return!1;if(A)return O(e);if(E(e))return!1;var t=x.call(e);return t===k||t===T},C=RegExp.prototype.exec,I=function(e){try{return C.call(e),!0}catch(t){return!1}},D="[object RegExp]";t=function(e){return"object"==typeof e&&(A?I(e):x.call(e)===D)};var L,M=String.prototype.valueOf,R=function(e){try{return M.call(e),!0}catch(t){return!1}},U="[object String]";L=function(e){return"string"==typeof e||"object"==typeof e&&(A?R(e):x.call(e)===U)};var P=i.defineProperty&&function(){try{var e={};i.defineProperty(e,"x",{enumerable:!1,value:e});for(var t in e)return!1;return e.x===e}catch(n){return!1}}(),q=function(e){var t;return t=P?function(e,t,n,r){!r&&t in e||i.defineProperty(e,t,{configurable:!0,enumerable:!1,writable:!0,value:n})}:function(e,t,n,r){!r&&t in e||(e[t]=n)},function(n,r,i){for(var a in r)e.call(r,a)&&t(n,a,r[a],i)}}(a.hasOwnProperty),B=function(e){var t=typeof e;return null===e||"object"!==t&&"function"!==t},z=c.isNaN||function(e){return e!==e},N={ToInteger:function(e){var t=+e;return z(t)?t=0:0!==t&&t!==1/0&&t!==-(1/0)&&(t=(t>0||-1)*Math.floor(Math.abs(t))),t},ToPrimitive:function(t){var n,r,i;if(B(t))return t;if(r=t.valueOf,e(r)&&(n=r.call(t),B(n)))return n;if(i=t.toString,e(i)&&(n=i.call(t),B(n)))return n;throw new TypeError},ToObject:function(e){if(null==e)throw new TypeError("can't convert "+e+" to object");return i(e)},ToUint32:function(e){return e>>>0}},$=function(){};q(s,{bind:function(t){var n=this;if(!e(n))throw new TypeError("Function.prototype.bind called on incompatible "+n);for(var r,a=h.call(arguments,1),s=function(){if(this instanceof r){var e=b.call(n,this,g.call(a,h.call(arguments)));return i(e)===e?e:this}return b.call(n,t,g.call(a,h.call(arguments)))},l=w(0,n.length-a.length),u=[],c=0;c<l;c++)d.call(u,"$"+c);return r=o("binder","return function ("+y.call(u,",")+"){ return binder.apply(this, arguments); }")(s),n.prototype&&($.prototype=n.prototype,r.prototype=new $,$.prototype=null),r}});var F=v.bind(a.hasOwnProperty),V=v.bind(a.toString),H=v.bind(h),Y=b.bind(h),J=v.bind(u.slice),W=v.bind(u.split),Q=v.bind(u.indexOf),G=v.bind(d),K=v.bind(a.propertyIsEnumerable),X=v.bind(r.sort),Z=n.isArray||function(e){return"[object Array]"===V(e)},ee=1!==[].unshift(0);q(r,{unshift:function(){return m.apply(this,arguments),this.length}},ee),q(n,{isArray:Z});var te=i("a"),ne="a"!==te[0]||!(0 in te),re=function(e){var t=!0,n=!0,r=!1;if(e)try{e.call("foo",function(e,n,r){"object"!=typeof r&&(t=!1)}),e.call([1],function(){"use strict";n="string"==typeof this},"x")}catch(i){r=!0}return!!e&&!r&&t&&n};q(r,{forEach:function(t){var n,r=N.ToObject(this),i=ne&&L(this)?W(this,""):r,a=-1,o=N.ToUint32(i.length);if(arguments.length>1&&(n=arguments[1]),!e(t))throw new TypeError("Array.prototype.forEach callback must be a function");for(;++a<o;)a in i&&("undefined"==typeof n?t(i[a],a,r):t.call(n,i[a],a,r))}},!re(r.forEach)),q(r,{map:function(t){var r,i=N.ToObject(this),a=ne&&L(this)?W(this,""):i,o=N.ToUint32(a.length),s=n(o);if(arguments.length>1&&(r=arguments[1]),!e(t))throw new TypeError("Array.prototype.map callback must be a function");for(var l=0;l<o;l++)l in a&&("undefined"==typeof r?s[l]=t(a[l],l,i):s[l]=t.call(r,a[l],l,i));return s}},!re(r.map)),q(r,{filter:function(t){var n,r,i=N.ToObject(this),a=ne&&L(this)?W(this,""):i,o=N.ToUint32(a.length),s=[];if(arguments.length>1&&(r=arguments[1]),!e(t))throw new TypeError("Array.prototype.filter callback must be a function");for(var l=0;l<o;l++)l in a&&(n=a[l],("undefined"==typeof r?t(n,l,i):t.call(r,n,l,i))&&G(s,n));return s}},!re(r.filter)),q(r,{every:function(t){var n,r=N.ToObject(this),i=ne&&L(this)?W(this,""):r,a=N.ToUint32(i.length);if(arguments.length>1&&(n=arguments[1]),!e(t))throw new TypeError("Array.prototype.every callback must be a function");for(var o=0;o<a;o++)if(o in i&&!("undefined"==typeof n?t(i[o],o,r):t.call(n,i[o],o,r)))return!1;return!0}},!re(r.every)),q(r,{some:function(t){var n,r=N.ToObject(this),i=ne&&L(this)?W(this,""):r,a=N.ToUint32(i.length);if(arguments.length>1&&(n=arguments[1]),!e(t))throw new TypeError("Array.prototype.some callback must be a function");for(var o=0;o<a;o++)if(o in i&&("undefined"==typeof n?t(i[o],o,r):t.call(n,i[o],o,r)))return!0;return!1}},!re(r.some));var ie=!1;r.reduce&&(ie="object"==typeof r.reduce.call("es5",function(e,t,n,r){return r})),q(r,{reduce:function(t){var n=N.ToObject(this),r=ne&&L(this)?W(this,""):n,i=N.ToUint32(r.length);if(!e(t))throw new TypeError("Array.prototype.reduce callback must be a function");if(0===i&&1===arguments.length)throw new TypeError("reduce of empty array with no initial value");var a,o=0;if(arguments.length>=2)a=arguments[1];else for(;;){if(o in r){a=r[o++];break}if(++o>=i)throw new TypeError("reduce of empty array with no initial value")}for(;o<i;o++)o in r&&(a=t(a,r[o],o,n));return a}},!ie);var ae=!1;r.reduceRight&&(ae="object"==typeof r.reduceRight.call("es5",function(e,t,n,r){return r})),q(r,{reduceRight:function(t){var n=N.ToObject(this),r=ne&&L(this)?W(this,""):n,i=N.ToUint32(r.length);if(!e(t))throw new TypeError("Array.prototype.reduceRight callback must be a function");if(0===i&&1===arguments.length)throw new TypeError("reduceRight of empty array with no initial value");var a,o=i-1;if(arguments.length>=2)a=arguments[1];else for(;;){if(o in r){a=r[o--];break}if(--o<0)throw new TypeError("reduceRight of empty array with no initial value")}if(o<0)return a;do o in r&&(a=t(a,r[o],o,n));while(o--);return a}},!ae);var oe=r.indexOf&&[0,1].indexOf(1,2)!==-1;q(r,{indexOf:function(e){var t=ne&&L(this)?W(this,""):N.ToObject(this),n=N.ToUint32(t.length);if(0===n)return-1;var r=0;for(arguments.length>1&&(r=N.ToInteger(arguments[1])),r=r>=0?r:w(0,n+r);r<n;r++)if(r in t&&t[r]===e)return r;return-1}},oe);var se=r.lastIndexOf&&[0,1].lastIndexOf(0,-3)!==-1;q(r,{lastIndexOf:function(e){var t=ne&&L(this)?W(this,""):N.ToObject(this),n=N.ToUint32(t.length);if(0===n)return-1;var r=n-1;for(arguments.length>1&&(r=_(r,N.ToInteger(arguments[1]))),r=r>=0?r:n-Math.abs(r);r>=0;r--)if(r in t&&e===t[r])return r;return-1}},se);var le=function(){var e=[1,2],t=e.splice();return 2===e.length&&Z(t)&&0===t.length}();q(r,{splice:function(e,t){return 0===arguments.length?[]:f.apply(this,arguments)}},!le);var ue=function(){var e={};return r.splice.call(e,0,0,1),1===e.length}();q(r,{splice:function(e,t){if(0===arguments.length)return[];var n=arguments;return this.length=w(N.ToInteger(this.length),0),arguments.length>0&&"number"!=typeof t&&(n=H(arguments),n.length<2?G(n,this.length-e):n[1]=N.ToInteger(t)),f.apply(this,n)}},!ue);var ce=function(){var e=new n(1e5);return e[8]="x",e.splice(1,1),7===e.indexOf("x")}(),pe=function(){var e=256,t=[];return t[e]="a",t.splice(e+1,0,"b"),"a"===t[e]}();q(r,{splice:function(e,t){for(var n,r=N.ToObject(this),i=[],a=N.ToUint32(r.length),o=N.ToInteger(e),s=o<0?w(a+o,0):_(o,a),u=_(w(N.ToInteger(t),0),a-s),c=0;c<u;)n=l(s+c),F(r,n)&&(i[c]=r[n]),c+=1;var p,h=H(arguments,2),f=h.length;if(f<u){c=s;for(var d=a-u;c<d;)n=l(c+u),p=l(c+f),F(r,n)?r[p]=r[n]:delete r[p],c+=1;c=a;for(var m=a-u+f;c>m;)delete r[c-1],c-=1}else if(f>u)for(c=a-u;c>s;)n=l(c+u-1),p=l(c+f-1),F(r,n)?r[p]=r[n]:delete r[p],c-=1;c=s;for(var g=0;g<h.length;++g)r[c]=h[g],c+=1;return r.length=a-u+f,i}},!ce||!pe);var he,fe=r.join;try{he="1,2,3"!==Array.prototype.join.call("123",",")}catch(de){he=!0}he&&q(r,{join:function(e){var t="undefined"==typeof e?",":e;return fe.call(L(this)?W(this,""):this,t)}},he);var me="1,2"!==[1,2].join(void 0);me&&q(r,{join:function(e){var t="undefined"==typeof e?",":e;return fe.call(this,t)}},me);var ge=function(e){for(var t=N.ToObject(this),n=N.ToUint32(t.length),r=0;r<arguments.length;)t[n+r]=arguments[r],r+=1;return t.length=n+r,n+r},ye=function(){var e={},t=Array.prototype.push.call(e,void 0);return 1!==t||1!==e.length||"undefined"!=typeof e[0]||!F(e,0)}();q(r,{push:function(e){return Z(this)?d.apply(this,arguments):ge.apply(this,arguments)}},ye);var ve=function(){var e=[],t=e.push(void 0);return 1!==t||1!==e.length||"undefined"!=typeof e[0]||!F(e,0)}();q(r,{push:ge},ve),q(r,{slice:function(e,t){var n=L(this)?W(this,""):this;return Y(n,arguments)}},ne);var be=function(){try{return[1,2].sort(null),[1,2].sort({}),!0}catch(e){}return!1}(),we=function(){try{return[1,2].sort(/a/),!1}catch(e){}return!0}(),_e=function(){try{return[1,2].sort(void 0),!0}catch(e){}return!1}();q(r,{sort:function(t){if("undefined"==typeof t)return X(this);if(!e(t))throw new TypeError("Array.prototype.sort callback must be a function");return X(this,t)}},be||!_e||!we);var xe=!K({toString:null},"toString"),Ae=K(function(){},"prototype"),Se=!F("x","0"),je=function(e){var t=e.constructor;return t&&t.prototype===e},Ee={$window:!0,$console:!0,$parent:!0,$self:!0,$frame:!0,$frames:!0,$frameElement:!0,$webkitIndexedDB:!0,$webkitStorageInfo:!0,$external:!0},Oe=function(){if("undefined"==typeof window)return!1;for(var e in window)try{!Ee["$"+e]&&F(window,e)&&null!==window[e]&&"object"==typeof window[e]&&je(window[e])}catch(t){return!0}return!1}(),ke=function(e){if("undefined"==typeof window||!Oe)return je(e);try{return je(e)}catch(t){return!1}},Te=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],Ce=Te.length,Ie=function(e){return"[object Arguments]"===V(e)},De=function(t){return null!==t&&"object"==typeof t&&"number"==typeof t.length&&t.length>=0&&!Z(t)&&e(t.callee)},Le=Ie(arguments)?Ie:De;q(i,{keys:function(t){var n=e(t),r=Le(t),i=null!==t&&"object"==typeof t,a=i&&L(t);if(!i&&!n&&!r)throw new TypeError("Object.keys called on a non-object");var o=[],s=Ae&&n;if(a&&Se||r)for(var u=0;u<t.length;++u)G(o,l(u));if(!r)for(var c in t)s&&"prototype"===c||!F(t,c)||G(o,l(c));if(xe)for(var p=ke(t),h=0;h<Ce;h++){var f=Te[h];p&&"constructor"===f||!F(t,f)||G(o,f)}return o}});var Me=i.keys&&function(){return 2===i.keys(arguments).length}(1,2),Re=i.keys&&function(){var e=i.keys(arguments);return 1!==arguments.length||1!==e.length||1!==e[0]}(1),Ue=i.keys;q(i,{keys:function(e){return Ue(Le(e)?H(e):e)}},!Me||Re);var Pe,qe,Be=0!==new Date((-0xc782b5b342b24)).getUTCMonth(),ze=new Date((-0x55d318d56a724)),Ne=new Date(14496624e5),$e="Mon, 01 Jan -45875 11:59:59 GMT"!==ze.toUTCString(),Fe=ze.getTimezoneOffset();Fe<-720?(Pe="Tue Jan 02 -45875"!==ze.toDateString(),qe=!/^Thu Dec 10 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/.test(Ne.toString())):(Pe="Mon Jan 01 -45875"!==ze.toDateString(),qe=!/^Wed Dec 09 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/.test(Ne.toString()));var Ve=v.bind(Date.prototype.getFullYear),He=v.bind(Date.prototype.getMonth),Ye=v.bind(Date.prototype.getDate),Je=v.bind(Date.prototype.getUTCFullYear),We=v.bind(Date.prototype.getUTCMonth),Qe=v.bind(Date.prototype.getUTCDate),Ge=v.bind(Date.prototype.getUTCDay),Ke=v.bind(Date.prototype.getUTCHours),Xe=v.bind(Date.prototype.getUTCMinutes),Ze=v.bind(Date.prototype.getUTCSeconds),et=v.bind(Date.prototype.getUTCMilliseconds),tt=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],nt=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],rt=function(e,t){return Ye(new Date(t,e,0))};q(Date.prototype,{getFullYear:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Ve(this);return e<0&&He(this)>11?e+1:e},getMonth:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Ve(this),t=He(this);return e<0&&t>11?0:t},getDate:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Ve(this),t=He(this),n=Ye(this);if(e<0&&t>11){if(12===t)return n;var r=rt(0,e+1);return r-n+1}return n},getUTCFullYear:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Je(this);return e<0&&We(this)>11?e+1:e},getUTCMonth:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Je(this),t=We(this);return e<0&&t>11?0:t},getUTCDate:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Je(this),t=We(this),n=Qe(this);if(e<0&&t>11){if(12===t)return n;var r=rt(0,e+1);return r-n+1}return n}},Be),q(Date.prototype,{toUTCString:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Ge(this),t=Qe(this),n=We(this),r=Je(this),i=Ke(this),a=Xe(this),o=Ze(this);return tt[e]+", "+(t<10?"0"+t:t)+" "+nt[n]+" "+r+" "+(i<10?"0"+i:i)+":"+(a<10?"0"+a:a)+":"+(o<10?"0"+o:o)+" GMT"}},Be||$e),q(Date.prototype,{toDateString:function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=this.getDay(),t=this.getDate(),n=this.getMonth(),r=this.getFullYear();return tt[e]+" "+nt[n]+" "+(t<10?"0"+t:t)+" "+r}},Be||Pe),(Be||qe)&&(Date.prototype.toString=function(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=this.getDay(),t=this.getDate(),n=this.getMonth(),r=this.getFullYear(),i=this.getHours(),a=this.getMinutes(),o=this.getSeconds(),s=this.getTimezoneOffset(),l=Math.floor(Math.abs(s)/60),u=Math.floor(Math.abs(s)%60);
+return tt[e]+" "+nt[n]+" "+(t<10?"0"+t:t)+" "+r+" "+(i<10?"0"+i:i)+":"+(a<10?"0"+a:a)+":"+(o<10?"0"+o:o)+" GMT"+(s>0?"-":"+")+(l<10?"0"+l:l)+(u<10?"0"+u:u)},P&&i.defineProperty(Date.prototype,"toString",{configurable:!0,enumerable:!1,writable:!0}));var it=-621987552e5,at="-000001",ot=Date.prototype.toISOString&&new Date(it).toISOString().indexOf(at)===-1,st=Date.prototype.toISOString&&"1969-12-31T23:59:59.999Z"!==new Date((-1)).toISOString(),lt=v.bind(Date.prototype.getTime);q(Date.prototype,{toISOString:function(){if(!isFinite(this)||!isFinite(lt(this)))throw new RangeError("Date.prototype.toISOString called on non-finite value.");var e=Je(this),t=We(this);e+=Math.floor(t/12),t=(t%12+12)%12;var n=[t+1,Qe(this),Ke(this),Xe(this),Ze(this)];e=(e<0?"-":e>9999?"+":"")+J("00000"+Math.abs(e),0<=e&&e<=9999?-4:-6);for(var r=0;r<n.length;++r)n[r]=J("00"+n[r],-2);return e+"-"+H(n,0,2).join("-")+"T"+H(n,2).join(":")+"."+J("000"+et(this),-3)+"Z"}},ot||st);var ut=function(){try{return Date.prototype.toJSON&&null===new Date(NaN).toJSON()&&new Date(it).toJSON().indexOf(at)!==-1&&Date.prototype.toJSON.call({toISOString:function(){return!0}})}catch(e){return!1}}();ut||(Date.prototype.toJSON=function(t){var n=i(this),r=N.ToPrimitive(n);if("number"==typeof r&&!isFinite(r))return null;var a=n.toISOString;if(!e(a))throw new TypeError("toISOString property is not callable");return a.call(n)});var ct=1e15===Date.parse("+033658-09-27T01:46:40.000Z"),pt=!isNaN(Date.parse("2012-04-04T24:00:00.500Z"))||!isNaN(Date.parse("2012-11-31T23:59:59.000Z"))||!isNaN(Date.parse("2012-12-31T23:59:60.000Z")),ht=isNaN(Date.parse("2000-01-01T00:00:00.000Z"));if(ht||pt||!ct){var ft=Math.pow(2,31)-1,dt=z(new Date(1970,0,1,0,0,0,ft+1).getTime());Date=function(e){var t=function(n,r,i,a,o,s,u){var c,p=arguments.length;if(this instanceof e){var h=s,f=u;if(dt&&p>=7&&u>ft){var d=Math.floor(u/ft)*ft,m=Math.floor(d/1e3);h+=m,f-=1e3*m}c=1===p&&l(n)===n?new e(t.parse(n)):p>=7?new e(n,r,i,a,o,h,f):p>=6?new e(n,r,i,a,o,h):p>=5?new e(n,r,i,a,o):p>=4?new e(n,r,i,a):p>=3?new e(n,r,i):p>=2?new e(n,r):p>=1?new e(n instanceof e?+n:n):new e}else c=e.apply(this,arguments);return B(c)||q(c,{constructor:t},!0),c},n=new RegExp("^(\\d{4}|[+-]\\d{6})(?:-(\\d{2})(?:-(\\d{2})(?:T(\\d{2}):(\\d{2})(?::(\\d{2})(?:(\\.\\d{1,}))?)?(Z|(?:([-+])(\\d{2}):(\\d{2})))?)?)?)?$"),r=[0,31,59,90,120,151,181,212,243,273,304,334,365],i=function(e,t){var n=t>1?1:0;return r[t]+Math.floor((e-1969+n)/4)-Math.floor((e-1901+n)/100)+Math.floor((e-1601+n)/400)+365*(e-1970)},a=function(t){var n=0,r=t;if(dt&&r>ft){var i=Math.floor(r/ft)*ft,a=Math.floor(i/1e3);n+=a,r-=1e3*a}return c(new e(1970,0,1,0,0,n,r))};for(var o in e)F(e,o)&&(t[o]=e[o]);q(t,{now:e.now,UTC:e.UTC},!0),t.prototype=e.prototype,q(t.prototype,{constructor:t},!0);var s=function(t){var r=n.exec(t);if(r){var o,s=c(r[1]),l=c(r[2]||1)-1,u=c(r[3]||1)-1,p=c(r[4]||0),h=c(r[5]||0),f=c(r[6]||0),d=Math.floor(1e3*c(r[7]||0)),m=Boolean(r[4]&&!r[8]),g="-"===r[9]?1:-1,y=c(r[10]||0),v=c(r[11]||0),b=h>0||f>0||d>0;return p<(b?24:25)&&h<60&&f<60&&d<1e3&&l>-1&&l<12&&y<24&&v<60&&u>-1&&u<i(s,l+1)-i(s,l)&&(o=60*(24*(i(s,l)+u)+p+y*g),o=1e3*(60*(o+h+v*g)+f)+d,m&&(o=a(o)),-864e13<=o&&o<=864e13)?o:NaN}return e.parse.apply(this,arguments)};return q(t,{parse:s}),t}(Date)}Date.now||(Date.now=function(){return(new Date).getTime()});var mt=p.toFixed&&("0.000"!==8e-5.toFixed(3)||"1"!==.9.toFixed(0)||"1.25"!==1.255.toFixed(2)||"1000000000000000128"!==(0xde0b6b3a7640080).toFixed(0)),gt={base:1e7,size:6,data:[0,0,0,0,0,0],multiply:function(e,t){for(var n=-1,r=t;++n<gt.size;)r+=e*gt.data[n],gt.data[n]=r%gt.base,r=Math.floor(r/gt.base)},divide:function(e){for(var t=gt.size,n=0;--t>=0;)n+=gt.data[t],gt.data[t]=Math.floor(n/e),n=n%e*gt.base},numToString:function(){for(var e=gt.size,t="";--e>=0;)if(""!==t||0===e||0!==gt.data[e]){var n=l(gt.data[e]);""===t?t=n:t+=J("0000000",0,7-n.length)+n}return t},pow:function Ut(e,t,n){return 0===t?n:t%2===1?Ut(e,t-1,n*e):Ut(e*e,t/2,n)},log:function(e){for(var t=0,n=e;n>=4096;)t+=12,n/=4096;for(;n>=2;)t+=1,n/=2;return t}},yt=function(e){var t,n,r,i,a,o,s,u;if(t=c(e),t=z(t)?0:Math.floor(t),t<0||t>20)throw new RangeError("Number.toFixed called with invalid number of decimals");if(n=c(this),z(n))return"NaN";if(n<=-1e21||n>=1e21)return l(n);if(r="",n<0&&(r="-",n=-n),i="0",n>1e-21)if(a=gt.log(n*gt.pow(2,69,1))-69,o=a<0?n*gt.pow(2,-a,1):n/gt.pow(2,a,1),o*=4503599627370496,a=52-a,a>0){for(gt.multiply(0,o),s=t;s>=7;)gt.multiply(1e7,0),s-=7;for(gt.multiply(gt.pow(10,s,1),0),s=a-1;s>=23;)gt.divide(1<<23),s-=23;gt.divide(1<<s),gt.multiply(1,1),gt.divide(2),i=gt.numToString()}else gt.multiply(0,o),gt.multiply(1<<-a,0),i=gt.numToString()+J("0.00000000000000000000",2,2+t);return t>0?(u=i.length,i=u<=t?r+J("0.0000000000000000000",0,t-u+2)+i:r+J(i,0,u-t)+"."+J(i,u-t)):i=r+i,i};q(p,{toFixed:yt},mt);var vt=function(){try{return"1"===1..toPrecision(void 0)}catch(e){return!0}}(),bt=p.toPrecision;q(p,{toPrecision:function(e){return"undefined"==typeof e?bt.call(this):bt.call(this,e)}},vt),2!=="ab".split(/(?:ab)*/).length||4!==".".split(/(.?)(.?)/).length||"t"==="tesst".split(/(s)*/)[1]||4!=="test".split(/(?:)/,-1).length||"".split(/.?/).length||".".split(/()()/).length>1?!function(){var e="undefined"==typeof/()??/.exec("")[1],n=Math.pow(2,32)-1;u.split=function(r,i){var a=String(this);if("undefined"==typeof r&&0===i)return[];if(!t(r))return W(this,r,i);var o,s,l,u,c=[],p=(r.ignoreCase?"i":"")+(r.multiline?"m":"")+(r.unicode?"u":"")+(r.sticky?"y":""),h=0,f=new RegExp(r.source,p+"g");e||(o=new RegExp("^"+f.source+"$(?!\\s)",p));var m="undefined"==typeof i?n:N.ToUint32(i);for(s=f.exec(a);s&&(l=s.index+s[0].length,!(l>h&&(G(c,J(a,h,s.index)),!e&&s.length>1&&s[0].replace(o,function(){for(var e=1;e<arguments.length-2;e++)"undefined"==typeof arguments[e]&&(s[e]=void 0)}),s.length>1&&s.index<a.length&&d.apply(c,H(s,1)),u=s[0].length,h=l,c.length>=m)));)f.lastIndex===s.index&&f.lastIndex++,s=f.exec(a);return h===a.length?!u&&f.test("")||G(c,""):G(c,J(a,h)),c.length>m?H(c,0,m):c}}():"0".split(void 0,0).length&&(u.split=function(e,t){return"undefined"==typeof e&&0===t?[]:W(this,e,t)});var wt=u.replace,_t=function(){var e=[];return"x".replace(/x(.)?/g,function(t,n){G(e,n)}),1===e.length&&"undefined"==typeof e[0]}();_t||(u.replace=function(n,r){var i=e(r),a=t(n)&&/\)[*?]/.test(n.source);if(i&&a){var o=function(e){var t=arguments.length,i=n.lastIndex;n.lastIndex=0;var a=n.exec(e)||[];return n.lastIndex=i,G(a,arguments[t-2],arguments[t-1]),r.apply(this,a)};return wt.call(this,n,o)}return wt.call(this,n,r)});var xt=u.substr,At="".substr&&"b"!=="0b".substr(-1);q(u,{substr:function(e,t){var n=e;return e<0&&(n=w(this.length+e,0)),xt.call(this,n,t)}},At);var St="\t\n\x0B\f\r   ᠎             　\u2028\u2029\ufeff",jt="​",Et="["+St+"]",Ot=new RegExp("^"+Et+Et+"*"),kt=new RegExp(Et+Et+"*$"),Tt=u.trim&&(St.trim()||!jt.trim());q(u,{trim:function(){if("undefined"==typeof this||null===this)throw new TypeError("can't convert "+this+" to object");return l(this).replace(Ot,"").replace(kt,"")}},Tt);var Ct=v.bind(String.prototype.trim),It=u.lastIndexOf&&"abcあい".lastIndexOf("あい",2)!==-1;q(u,{lastIndexOf:function(e){if("undefined"==typeof this||null===this)throw new TypeError("can't convert "+this+" to object");for(var t=l(this),n=l(e),r=arguments.length>1?c(arguments[1]):NaN,i=z(r)?1/0:N.ToInteger(r),a=_(w(i,0),t.length),o=n.length,s=a+o;s>0;){s=w(0,s-o);var u=Q(J(t,s,a+o),n);if(u!==-1)return s+u}return-1}},It);var Dt=u.lastIndexOf;if(q(u,{lastIndexOf:function(e){return Dt.apply(this,arguments)}},1!==u.lastIndexOf.length),8===parseInt(St+"08")&&22===parseInt(St+"0x16")||(parseInt=function(e){var t=/^[\-+]?0[xX]/;return function(n,r){var i=Ct(String(n)),a=c(r)||(t.test(i)?16:10);return e(i,a)}}(parseInt)),1/parseFloat("-0")!==-(1/0)&&(parseFloat=function(e){return function(t){var n=Ct(String(t)),r=e(n);return 0===r&&"-"===J(n,0,1)?-0:r}}(parseFloat)),"RangeError: test"!==String(new RangeError("test"))){var Lt=function(){if("undefined"==typeof this||null===this)throw new TypeError("can't convert "+this+" to object");var e=this.name;"undefined"==typeof e?e="Error":"string"!=typeof e&&(e=l(e));var t=this.message;return"undefined"==typeof t?t="":"string"!=typeof t&&(t=l(t)),e?t?e+": "+t:e:t};Error.prototype.toString=Lt}if(P){var Mt=function(e,t){if(K(e,t)){var n=Object.getOwnPropertyDescriptor(e,t);n.configurable&&(n.enumerable=!1,Object.defineProperty(e,t,n))}};Mt(Error.prototype,"message"),""!==Error.prototype.message&&(Error.prototype.message=""),Mt(Error.prototype,"name")}if("/a/gim"!==String(/a/gim)){var Rt=function(){var e="/"+this.source+"/";return this.global&&(e+="g"),this.ignoreCase&&(e+="i"),this.multiline&&(e+="m"),e};RegExp.prototype.toString=Rt}}),Handlebars.registerHelper("sanitize",function(e){var t;return void 0===e?"":(t=sanitizeHtml(e,{allowedTags:["div","span","b","i","em","strong","a","br","table","tbody","tr","th","td"],allowedAttributes:{div:["class"],span:["class"],table:["class"],td:["class"],th:["colspan"],a:["href"]}}),new Handlebars.SafeString(t))}),Handlebars.registerHelper("renderTextParam",function(e){var t,n="text",r="",i=e.type||e.schema&&e.schema.type||"",a="array"===i.toLowerCase()||e.allowMultiple,o=a&&Array.isArray(e["default"])?e["default"].join("\n"):e["default"],s=Handlebars.Utils.escapeExpression(e.name),l=Handlebars.Utils.escapeExpression(e.valueId);i=Handlebars.Utils.escapeExpression(i);var u=Object.keys(e).filter(function(e){return null!==e.match(/^X-data-/i)}).reduce(function(t,n){return t+=" "+n.substring(2,n.length)+"='"+e[n]+"'"},"");if(e.format&&"password"===e.format&&(n="password"),l&&(r=" id='"+l+"'"),o=o?sanitizeHtml(o):"",a)t="<textarea class='body-textarea"+(e.required?" required":"")+"' name='"+s+"'"+r+u,t+=" placeholder='Provide multiple values in new lines"+(e.required?" (at least one required).":".")+"'>",t+=o+"</textarea>";else{var c="parameter";e.required&&(c+=" required"),t="<input class='"+c+"' minlength='"+(e.required?1:0)+"'",t+=" name='"+s+"' placeholder='"+(e.required?"(required)":"")+"'"+r+u,t+=" type='"+n+"' value='"+o+"'/>"}return new Handlebars.SafeString(t)}),Handlebars.registerHelper("ifCond",function(e,t,n,r){switch(t){case"==":return e==n?r.fn(this):r.inverse(this);case"===":return e===n?r.fn(this):r.inverse(this);case"<":return e<n?r.fn(this):r.inverse(this);case"<=":return e<=n?r.fn(this):r.inverse(this);case">":return e>n?r.fn(this):r.inverse(this);case">=":return e>=n?r.fn(this):r.inverse(this);case"&&":return e&&n?r.fn(this):r.inverse(this);case"||":return e||n?r.fn(this):r.inverse(this);default:return r.inverse(this)}}),Handlebars.registerHelper("escape",function(e){var t=Handlebars.Utils.escapeExpression(e);return new Handlebars.SafeString(t)}),function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.sanitizeHtml=e()}}(function(){return function e(t,n,r){function i(o,s){if(!n[o]){if(!t[o]){var l="function"==typeof require&&require;if(!s&&l)return l(o,!0);if(a)return a(o,!0);var u=new Error("Cannot find module '"+o+"'");throw u.code="MODULE_NOT_FOUND",u}var c=n[o]={exports:{}};t[o][0].call(c.exports,function(e){var n=t[o][1][e];return i(n?n:e)},c,c.exports,e,t,n,r)}return n[o].exports}for(var a="function"==typeof require&&require,o=0;o<r.length;o++)i(r[o]);return i}({1:[function(e,t,n){function r(e,t){e&&Object.keys(e).forEach(function(n){t(e[n],n)})}function i(e,t){return{}.hasOwnProperty.call(e,t)}function a(e,t,n){function c(e,t){var n=this;this.tag=e,this.attribs=t||{},this.tagPosition=d.length,this.text="",this.updateParentNodeText=function(){if(x.length){var e=x[x.length-1];e.text+=n.text}}}function p(e){return"string"!=typeof e&&(e+=""),e.replace(/\&/g,"&amp;").replace(/</g,"&lt;").replace(/\>/g,"&gt;").replace(/\"/g,"&quot;")}function h(e,n){n=n.replace(/[\x00-\x20]+/g,""),n=n.replace(/<\!\-\-.*?\-\-\>/g,"");var r=n.match(/^([a-zA-Z]+)\:/);if(!r)return!1;var a=r[1].toLowerCase();return i(t.allowedSchemesByTag,e)?t.allowedSchemesByTag[e].indexOf(a)===-1:!t.allowedSchemes||t.allowedSchemes.indexOf(a)===-1}function f(e,t){return t?(e=e.split(/\s+/),e.filter(function(e){return t.indexOf(e)!==-1}).join(" ")):e}var d="";t?(t=s(a.defaults,t),t.parser?t.parser=s(u,t.parser):t.parser=u):(t=a.defaults,t.parser=u);var m,g,y=t.nonTextTags||["script","style","textarea"];t.allowedAttributes&&(m={},g={},r(t.allowedAttributes,function(e,t){m[t]=[];var n=[];e.forEach(function(e){e.indexOf("*")>=0?n.push(l(e).replace(/\\\*/g,".*")):m[t].push(e)}),g[t]=new RegExp("^("+n.join("|")+")$")}));var v={};r(t.allowedClasses,function(e,t){m&&(i(m,t)||(m[t]=[]),m[t].push("class")),v[t]=e});var b,w={};r(t.transformTags,function(e,t){var n;"function"==typeof e?n=e:"string"==typeof e&&(n=a.simpleTransform(e)),"*"===t?b=n:w[t]=n});var _=0,x=[],A={},S={},j=!1,E=0,O=new o.Parser({onopentag:function(e,n){if(j)return void E++;var a=new c(e,n);x.push(a);var o,s=!1,l=!!a.text;i(w,e)&&(o=w[e](e,n),a.attribs=n=o.attribs,void 0!==o.text&&(a.innerText=o.text),e!==o.tagName&&(a.name=e=o.tagName,S[_]=o.tagName)),b&&(o=b(e,n),a.attribs=n=o.attribs,e!==o.tagName&&(a.name=e=o.tagName,S[_]=o.tagName)),t.allowedTags&&t.allowedTags.indexOf(e)===-1&&(s=!0,y.indexOf(e)!==-1&&(j=!0,E=1),A[_]=!0),_++,s||(d+="<"+e,(!m||i(m,e)||m["*"])&&r(n,function(t,n){if(!m||i(m,e)&&m[e].indexOf(n)!==-1||m["*"]&&m["*"].indexOf(n)!==-1||i(g,e)&&g[e].test(n)||g["*"]&&g["*"].test(n)){if(("href"===n||"src"===n)&&h(e,t))return void delete a.attribs[n];if("class"===n&&(t=f(t,v[e]),!t.length))return void delete a.attribs[n];d+=" "+n,t.length&&(d+='="'+p(t)+'"')}else delete a.attribs[n]}),t.selfClosing.indexOf(e)!==-1?d+=" />":(d+=">",!a.innerText||l||t.textFilter||(d+=a.innerText)))},ontext:function(e){if(!j){var n,r=x[x.length-1];if(r&&(n=r.tag,e=void 0!==r.innerText?r.innerText:e),"script"===n||"style"===n)d+=e;else{var i=p(e);d+=t.textFilter?t.textFilter(i):i}if(x.length){var a=x[x.length-1];a.text+=e}}},onclosetag:function(e){if(j){if(E--,E)return;j=!1}var n=x.pop();if(n){if(j=!1,_--,A[_])return delete A[_],void n.updateParentNodeText();if(S[_]&&(e=S[_],delete S[_]),t.exclusiveFilter&&t.exclusiveFilter(n))return void(d=d.substr(0,n.tagPosition));n.updateParentNodeText(),t.selfClosing.indexOf(e)===-1&&(d+="</"+e+">")}}},t.parser);return O.write(e),O.end(),d}var o=e("htmlparser2"),s=e("xtend"),l=e("regexp-quote");t.exports=a;var u={decodeEntities:!0};a.defaults={allowedTags:["h3","h4","h5","h6","blockquote","p","a","ul","ol","nl","li","b","i","strong","em","strike","code","hr","br","div","table","thead","caption","tbody","tr","th","td","pre"],allowedAttributes:{a:["href","name","target"],img:["src"]},selfClosing:["img","br","hr","area","base","basefont","input","link","meta"],allowedSchemes:["http","https","ftp","mailto"],allowedSchemesByTag:{}},a.simpleTransform=function(e,t,n){return n=void 0===n||n,t=t||{},function(r,i){var a;if(n)for(a in t)i[a]=t[a];else i=t;return{tagName:e,attribs:i}}}},{htmlparser2:36,"regexp-quote":54,xtend:58}],2:[function(e,t,n){"use strict";function r(){for(var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",t=0,n=e.length;t<n;++t)l[t]=e[t],u[e.charCodeAt(t)]=t;u["-".charCodeAt(0)]=62,u["_".charCodeAt(0)]=63}function i(e){var t,n,r,i,a,o,s=e.length;if(s%4>0)throw new Error("Invalid string. Length must be a multiple of 4");a="="===e[s-2]?2:"="===e[s-1]?1:0,o=new c(3*s/4-a),r=a>0?s-4:s;var l=0;for(t=0,n=0;t<r;t+=4,n+=3)i=u[e.charCodeAt(t)]<<18|u[e.charCodeAt(t+1)]<<12|u[e.charCodeAt(t+2)]<<6|u[e.charCodeAt(t+3)],o[l++]=i>>16&255,o[l++]=i>>8&255,o[l++]=255&i;return 2===a?(i=u[e.charCodeAt(t)]<<2|u[e.charCodeAt(t+1)]>>4,o[l++]=255&i):1===a&&(i=u[e.charCodeAt(t)]<<10|u[e.charCodeAt(t+1)]<<4|u[e.charCodeAt(t+2)]>>2,o[l++]=i>>8&255,o[l++]=255&i),o}function a(e){return l[e>>18&63]+l[e>>12&63]+l[e>>6&63]+l[63&e]}function o(e,t,n){for(var r,i=[],o=t;o<n;o+=3)r=(e[o]<<16)+(e[o+1]<<8)+e[o+2],i.push(a(r));return i.join("")}function s(e){for(var t,n=e.length,r=n%3,i="",a=[],s=16383,u=0,c=n-r;u<c;u+=s)a.push(o(e,u,u+s>c?c:u+s));return 1===r?(t=e[n-1],i+=l[t>>2],i+=l[t<<4&63],i+="=="):2===r&&(t=(e[n-2]<<8)+e[n-1],i+=l[t>>10],i+=l[t>>4&63],i+=l[t<<2&63],i+="="),a.push(i),a.join("")}n.toByteArray=i,n.fromByteArray=s;var l=[],u=[],c="undefined"!=typeof Uint8Array?Uint8Array:Array;r()},{}],3:[function(e,t,n){},{}],4:[function(e,t,n){(function(t){"use strict";var r=e("buffer"),i=r.Buffer,a=r.SlowBuffer,o=r.kMaxLength||2147483647;n.alloc=function(e,t,n){if("function"==typeof i.alloc)return i.alloc(e,t,n);if("number"==typeof n)throw new TypeError("encoding must not be number");if("number"!=typeof e)throw new TypeError("size must be a number");if(e>o)throw new RangeError("size is too large");var r=n,a=t;void 0===a&&(r=void 0,a=0);var s=new i(e);if("string"==typeof a)for(var l=new i(a,r),u=l.length,c=-1;++c<e;)s[c]=l[c%u];else s.fill(a);return s},n.allocUnsafe=function(e){if("function"==typeof i.allocUnsafe)return i.allocUnsafe(e);if("number"!=typeof e)throw new TypeError("size must be a number");if(e>o)throw new RangeError("size is too large");return new i(e)},n.from=function(e,n,r){if("function"==typeof i.from&&(!t.Uint8Array||Uint8Array.from!==i.from))return i.from(e,n,r);if("number"==typeof e)throw new TypeError('"value" argument must not be a number');if("string"==typeof e)return new i(e,n);if("undefined"!=typeof ArrayBuffer&&e instanceof ArrayBuffer){var a=n;if(1===arguments.length)return new i(e);"undefined"==typeof a&&(a=0);var o=r;if("undefined"==typeof o&&(o=e.byteLength-a),a>=e.byteLength)throw new RangeError("'offset' is out of bounds");if(o>e.byteLength-a)throw new RangeError("'length' is out of bounds");return new i(e.slice(a,a+o))}if(i.isBuffer(e)){var s=new i(e.length);return e.copy(s,0,0,e.length),s}if(e){if(Array.isArray(e)||"undefined"!=typeof ArrayBuffer&&e.buffer instanceof ArrayBuffer||"length"in e)return new i(e);if("Buffer"===e.type&&Array.isArray(e.data))return new i(e.data)}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")},n.allocUnsafeSlow=function(e){if("function"==typeof i.allocUnsafeSlow)return i.allocUnsafeSlow(e);if("number"!=typeof e)throw new TypeError("size must be a number");if(e>=o)throw new RangeError("size is too large");return new a(e)}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{buffer:5}],5:[function(e,t,n){(function(t){"use strict";function r(){try{var e=new Uint8Array(1);return e.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}},42===e.foo()&&"function"==typeof e.subarray&&0===e.subarray(1,1).byteLength}catch(t){return!1}}function i(){return o.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function a(e,t){if(i()<t)throw new RangeError("Invalid typed array length");return o.TYPED_ARRAY_SUPPORT?(e=new Uint8Array(t),e.__proto__=o.prototype):(null===e&&(e=new o(t)),e.length=t),e}function o(e,t,n){if(!(o.TYPED_ARRAY_SUPPORT||this instanceof o))return new o(e,t,n);if("number"==typeof e){if("string"==typeof t)throw new Error("If encoding is specified then the first argument must be a string");return c(this,e)}return s(this,e,t,n)}function s(e,t,n,r){if("number"==typeof t)throw new TypeError('"value" argument must not be a number');return"undefined"!=typeof ArrayBuffer&&t instanceof ArrayBuffer?f(e,t,n,r):"string"==typeof t?p(e,t,n):d(e,t)}function l(e){if("number"!=typeof e)throw new TypeError('"size" argument must be a number');if(e<0)throw new RangeError('"size" argument must not be negative')}function u(e,t,n,r){return l(t),t<=0?a(e,t):void 0!==n?"string"==typeof r?a(e,t).fill(n,r):a(e,t).fill(n):a(e,t)}function c(e,t){if(l(t),e=a(e,t<0?0:0|m(t)),!o.TYPED_ARRAY_SUPPORT)for(var n=0;n<t;++n)e[n]=0;return e}function p(e,t,n){if("string"==typeof n&&""!==n||(n="utf8"),!o.isEncoding(n))throw new TypeError('"encoding" must be a valid string encoding');var r=0|y(t,n);e=a(e,r);var i=e.write(t,n);return i!==r&&(e=e.slice(0,i)),e}function h(e,t){var n=t.length<0?0:0|m(t.length);e=a(e,n);for(var r=0;r<n;r+=1)e[r]=255&t[r];return e}function f(e,t,n,r){if(t.byteLength,n<0||t.byteLength<n)throw new RangeError("'offset' is out of bounds");if(t.byteLength<n+(r||0))throw new RangeError("'length' is out of bounds");return t=void 0===n&&void 0===r?new Uint8Array(t):void 0===r?new Uint8Array(t,n):new Uint8Array(t,n,r),o.TYPED_ARRAY_SUPPORT?(e=t,e.__proto__=o.prototype):e=h(e,t),e}function d(e,t){if(o.isBuffer(t)){var n=0|m(t.length);return e=a(e,n),0===e.length?e:(t.copy(e,0,0,n),e)}if(t){if("undefined"!=typeof ArrayBuffer&&t.buffer instanceof ArrayBuffer||"length"in t)return"number"!=typeof t.length||G(t.length)?a(e,0):h(e,t);if("Buffer"===t.type&&Z(t.data))return h(e,t.data)}throw new TypeError("First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.")}function m(e){if(e>=i())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+i().toString(16)+" bytes");return 0|e}function g(e){return+e!=e&&(e=0),o.alloc(+e)}function y(e,t){if(o.isBuffer(e))return e.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(e)||e instanceof ArrayBuffer))return e.byteLength;"string"!=typeof e&&(e=""+e);var n=e.length;if(0===n)return 0;for(var r=!1;;)switch(t){case"ascii":case"latin1":case"binary":return n;case"utf8":case"utf-8":case void 0:return H(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return W(e).length;default:if(r)return H(e).length;t=(""+t).toLowerCase(),r=!0}}function v(e,t,n){var r=!1;if((void 0===t||t<0)&&(t=0),t>this.length)return"";if((void 0===n||n>this.length)&&(n=this.length),n<=0)return"";if(n>>>=0,t>>>=0,n<=t)return"";for(e||(e="utf8");;)switch(e){case"hex":return L(this,t,n);case"utf8":case"utf-8":return T(this,t,n);case"ascii":return I(this,t,n);case"latin1":case"binary":return D(this,t,n);case"base64":return k(this,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return M(this,t,n);default:if(r)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),r=!0}}function b(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function w(e,t,n,r,i){if(0===e.length)return-1;if("string"==typeof n?(r=n,n=0):n>2147483647?n=2147483647:n<-2147483648&&(n=-2147483648),n=+n,isNaN(n)&&(n=i?0:e.length-1),n<0&&(n=e.length+n),n>=e.length){if(i)return-1;n=e.length-1}else if(n<0){if(!i)return-1;n=0}if("string"==typeof t&&(t=o.from(t,r)),o.isBuffer(t))return 0===t.length?-1:_(e,t,n,r,i);if("number"==typeof t)return t=255&t,o.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?i?Uint8Array.prototype.indexOf.call(e,t,n):Uint8Array.prototype.lastIndexOf.call(e,t,n):_(e,[t],n,r,i);throw new TypeError("val must be string, number or Buffer")}function _(e,t,n,r,i){function a(e,t){return 1===o?e[t]:e.readUInt16BE(t*o)}var o=1,s=e.length,l=t.length;if(void 0!==r&&(r=String(r).toLowerCase(),"ucs2"===r||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(e.length<2||t.length<2)return-1;o=2,s/=2,l/=2,n/=2}var u;if(i){var c=-1;for(u=n;u<s;u++)if(a(e,u)===a(t,c===-1?0:u-c)){if(c===-1&&(c=u),u-c+1===l)return c*o}else c!==-1&&(u-=u-c),c=-1}else for(n+l>s&&(n=s-l),u=n;u>=0;u--){for(var p=!0,h=0;h<l;h++)if(a(e,u+h)!==a(t,h)){p=!1;break}if(p)return u}return-1}function x(e,t,n,r){n=Number(n)||0;var i=e.length-n;r?(r=Number(r),r>i&&(r=i)):r=i;var a=t.length;if(a%2!==0)throw new TypeError("Invalid hex string");r>a/2&&(r=a/2);for(var o=0;o<r;++o){var s=parseInt(t.substr(2*o,2),16);if(isNaN(s))return o;e[n+o]=s}return o}function A(e,t,n,r){return Q(H(t,e.length-n),e,n,r)}function S(e,t,n,r){return Q(Y(t),e,n,r)}function j(e,t,n,r){return S(e,t,n,r)}function E(e,t,n,r){return Q(W(t),e,n,r)}function O(e,t,n,r){return Q(J(t,e.length-n),e,n,r)}function k(e,t,n){return 0===t&&n===e.length?K.fromByteArray(e):K.fromByteArray(e.slice(t,n))}function T(e,t,n){n=Math.min(e.length,n);for(var r=[],i=t;i<n;){var a=e[i],o=null,s=a>239?4:a>223?3:a>191?2:1;if(i+s<=n){var l,u,c,p;switch(s){case 1:a<128&&(o=a);break;case 2:l=e[i+1],128===(192&l)&&(p=(31&a)<<6|63&l,p>127&&(o=p));break;case 3:l=e[i+1],u=e[i+2],128===(192&l)&&128===(192&u)&&(p=(15&a)<<12|(63&l)<<6|63&u,p>2047&&(p<55296||p>57343)&&(o=p));break;case 4:l=e[i+1],u=e[i+2],c=e[i+3],128===(192&l)&&128===(192&u)&&128===(192&c)&&(p=(15&a)<<18|(63&l)<<12|(63&u)<<6|63&c,p>65535&&p<1114112&&(o=p))}}null===o?(o=65533,s=1):o>65535&&(o-=65536,r.push(o>>>10&1023|55296),o=56320|1023&o),r.push(o),i+=s}return C(r)}function C(e){var t=e.length;if(t<=ee)return String.fromCharCode.apply(String,e);for(var n="",r=0;r<t;)n+=String.fromCharCode.apply(String,e.slice(r,r+=ee));return n}function I(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;i<n;++i)r+=String.fromCharCode(127&e[i]);return r}function D(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;i<n;++i)r+=String.fromCharCode(e[i]);return r}function L(e,t,n){var r=e.length;(!t||t<0)&&(t=0),(!n||n<0||n>r)&&(n=r);for(var i="",a=t;a<n;++a)i+=V(e[a]);return i}function M(e,t,n){for(var r=e.slice(t,n),i="",a=0;a<r.length;a+=2)i+=String.fromCharCode(r[a]+256*r[a+1]);return i}function R(e,t,n){if(e%1!==0||e<0)throw new RangeError("offset is not uint");if(e+t>n)throw new RangeError("Trying to access beyond buffer length")}function U(e,t,n,r,i,a){if(!o.isBuffer(e))throw new TypeError('"buffer" argument must be a Buffer instance');if(t>i||t<a)throw new RangeError('"value" argument is out of bounds');if(n+r>e.length)throw new RangeError("Index out of range")}function P(e,t,n,r){t<0&&(t=65535+t+1);for(var i=0,a=Math.min(e.length-n,2);i<a;++i)e[n+i]=(t&255<<8*(r?i:1-i))>>>8*(r?i:1-i)}function q(e,t,n,r){t<0&&(t=4294967295+t+1);for(var i=0,a=Math.min(e.length-n,4);i<a;++i)e[n+i]=t>>>8*(r?i:3-i)&255}function B(e,t,n,r,i,a){if(n+r>e.length)throw new RangeError("Index out of range");if(n<0)throw new RangeError("Index out of range")}function z(e,t,n,r,i){return i||B(e,t,n,4,3.4028234663852886e38,-3.4028234663852886e38),X.write(e,t,n,r,23,4),n+4}function N(e,t,n,r,i){return i||B(e,t,n,8,1.7976931348623157e308,-1.7976931348623157e308),X.write(e,t,n,r,52,8),n+8}function $(e){if(e=F(e).replace(te,""),e.length<2)return"";for(;e.length%4!==0;)e+="=";return e}function F(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}function V(e){return e<16?"0"+e.toString(16):e.toString(16)}function H(e,t){t=t||1/0;for(var n,r=e.length,i=null,a=[],o=0;o<r;++o){if(n=e.charCodeAt(o),n>55295&&n<57344){if(!i){if(n>56319){(t-=3)>-1&&a.push(239,191,189);continue}if(o+1===r){(t-=3)>-1&&a.push(239,191,189);continue}i=n;continue}if(n<56320){(t-=3)>-1&&a.push(239,191,189),i=n;continue}n=(i-55296<<10|n-56320)+65536}else i&&(t-=3)>-1&&a.push(239,191,189);if(i=null,n<128){if((t-=1)<0)break;a.push(n)}else if(n<2048){if((t-=2)<0)break;a.push(n>>6|192,63&n|128)}else if(n<65536){if((t-=3)<0)break;a.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;a.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return a}function Y(e){for(var t=[],n=0;n<e.length;++n)t.push(255&e.charCodeAt(n));return t}function J(e,t){for(var n,r,i,a=[],o=0;o<e.length&&!((t-=2)<0);++o)n=e.charCodeAt(o),r=n>>8,i=n%256,a.push(i),a.push(r);return a}function W(e){return K.toByteArray($(e))}function Q(e,t,n,r){for(var i=0;i<r&&!(i+n>=t.length||i>=e.length);++i)t[i+n]=e[i];return i}function G(e){return e!==e}var K=e("base64-js"),X=e("ieee754"),Z=e("isarray");n.Buffer=o,n.SlowBuffer=g,n.INSPECT_MAX_BYTES=50,o.TYPED_ARRAY_SUPPORT=void 0!==t.TYPED_ARRAY_SUPPORT?t.TYPED_ARRAY_SUPPORT:r(),n.kMaxLength=i(),o.poolSize=8192,o._augment=function(e){return e.__proto__=o.prototype,e},o.from=function(e,t,n){return s(null,e,t,n)},o.TYPED_ARRAY_SUPPORT&&(o.prototype.__proto__=Uint8Array.prototype,o.__proto__=Uint8Array,"undefined"!=typeof Symbol&&Symbol.species&&o[Symbol.species]===o&&Object.defineProperty(o,Symbol.species,{value:null,configurable:!0})),o.alloc=function(e,t,n){return u(null,e,t,n)},o.allocUnsafe=function(e){return c(null,e)},o.allocUnsafeSlow=function(e){return c(null,e)},o.isBuffer=function(e){return!(null==e||!e._isBuffer)},o.compare=function(e,t){if(!o.isBuffer(e)||!o.isBuffer(t))throw new TypeError("Arguments must be Buffers");if(e===t)return 0;for(var n=e.length,r=t.length,i=0,a=Math.min(n,r);i<a;++i)if(e[i]!==t[i]){n=e[i],r=t[i];break}return n<r?-1:r<n?1:0},o.isEncoding=function(e){switch(String(e).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"latin1":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return!0;default:return!1}},o.concat=function(e,t){if(!Z(e))throw new TypeError('"list" argument must be an Array of Buffers');if(0===e.length)return o.alloc(0);var n;if(void 0===t)for(t=0,n=0;n<e.length;++n)t+=e[n].length;var r=o.allocUnsafe(t),i=0;for(n=0;n<e.length;++n){var a=e[n];if(!o.isBuffer(a))throw new TypeError('"list" argument must be an Array of Buffers');a.copy(r,i),i+=a.length}return r},o.byteLength=y,o.prototype._isBuffer=!0,o.prototype.swap16=function(){var e=this.length;if(e%2!==0)throw new RangeError("Buffer size must be a multiple of 16-bits");for(var t=0;t<e;t+=2)b(this,t,t+1);return this},o.prototype.swap32=function(){var e=this.length;if(e%4!==0)throw new RangeError("Buffer size must be a multiple of 32-bits");for(var t=0;t<e;t+=4)b(this,t,t+3),b(this,t+1,t+2);return this},o.prototype.swap64=function(){var e=this.length;if(e%8!==0)throw new RangeError("Buffer size must be a multiple of 64-bits");for(var t=0;t<e;t+=8)b(this,t,t+7),b(this,t+1,t+6),b(this,t+2,t+5),b(this,t+3,t+4);return this},o.prototype.toString=function(){var e=0|this.length;return 0===e?"":0===arguments.length?T(this,0,e):v.apply(this,arguments)},o.prototype.equals=function(e){if(!o.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e||0===o.compare(this,e)},o.prototype.inspect=function(){var e="",t=n.INSPECT_MAX_BYTES;return this.length>0&&(e=this.toString("hex",0,t).match(/.{2}/g).join(" "),this.length>t&&(e+=" ... ")),"<Buffer "+e+">"},o.prototype.compare=function(e,t,n,r,i){if(!o.isBuffer(e))throw new TypeError("Argument must be a Buffer");if(void 0===t&&(t=0),void 0===n&&(n=e?e.length:0),void 0===r&&(r=0),void 0===i&&(i=this.length),t<0||n>e.length||r<0||i>this.length)throw new RangeError("out of range index");if(r>=i&&t>=n)return 0;if(r>=i)return-1;if(t>=n)return 1;if(t>>>=0,n>>>=0,r>>>=0,i>>>=0,this===e)return 0;for(var a=i-r,s=n-t,l=Math.min(a,s),u=this.slice(r,i),c=e.slice(t,n),p=0;p<l;++p)if(u[p]!==c[p]){a=u[p],s=c[p];break}return a<s?-1:s<a?1:0},o.prototype.includes=function(e,t,n){return this.indexOf(e,t,n)!==-1},o.prototype.indexOf=function(e,t,n){return w(this,e,t,n,!0)},o.prototype.lastIndexOf=function(e,t,n){return w(this,e,t,n,!1)},o.prototype.write=function(e,t,n,r){if(void 0===t)r="utf8",n=this.length,t=0;else if(void 0===n&&"string"==typeof t)r=t,n=this.length,t=0;else{if(!isFinite(t))throw new Error("Buffer.write(string, encoding, offset[, length]) is no longer supported");t=0|t,isFinite(n)?(n=0|n,void 0===r&&(r="utf8")):(r=n,n=void 0)}var i=this.length-t;if((void 0===n||n>i)&&(n=i),e.length>0&&(n<0||t<0)||t>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var a=!1;;)switch(r){case"hex":return x(this,e,t,n);case"utf8":case"utf-8":return A(this,e,t,n);case"ascii":return S(this,e,t,n);case"latin1":case"binary":return j(this,e,t,n);case"base64":return E(this,e,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return O(this,e,t,n);default:if(a)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),a=!0}},o.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var ee=4096;o.prototype.slice=function(e,t){var n=this.length;e=~~e,t=void 0===t?n:~~t,e<0?(e+=n,e<0&&(e=0)):e>n&&(e=n),t<0?(t+=n,t<0&&(t=0)):t>n&&(t=n),
+t<e&&(t=e);var r;if(o.TYPED_ARRAY_SUPPORT)r=this.subarray(e,t),r.__proto__=o.prototype;else{var i=t-e;r=new o(i,(void 0));for(var a=0;a<i;++a)r[a]=this[a+e]}return r},o.prototype.readUIntLE=function(e,t,n){e=0|e,t=0|t,n||R(e,t,this.length);for(var r=this[e],i=1,a=0;++a<t&&(i*=256);)r+=this[e+a]*i;return r},o.prototype.readUIntBE=function(e,t,n){e=0|e,t=0|t,n||R(e,t,this.length);for(var r=this[e+--t],i=1;t>0&&(i*=256);)r+=this[e+--t]*i;return r},o.prototype.readUInt8=function(e,t){return t||R(e,1,this.length),this[e]},o.prototype.readUInt16LE=function(e,t){return t||R(e,2,this.length),this[e]|this[e+1]<<8},o.prototype.readUInt16BE=function(e,t){return t||R(e,2,this.length),this[e]<<8|this[e+1]},o.prototype.readUInt32LE=function(e,t){return t||R(e,4,this.length),(this[e]|this[e+1]<<8|this[e+2]<<16)+16777216*this[e+3]},o.prototype.readUInt32BE=function(e,t){return t||R(e,4,this.length),16777216*this[e]+(this[e+1]<<16|this[e+2]<<8|this[e+3])},o.prototype.readIntLE=function(e,t,n){e=0|e,t=0|t,n||R(e,t,this.length);for(var r=this[e],i=1,a=0;++a<t&&(i*=256);)r+=this[e+a]*i;return i*=128,r>=i&&(r-=Math.pow(2,8*t)),r},o.prototype.readIntBE=function(e,t,n){e=0|e,t=0|t,n||R(e,t,this.length);for(var r=t,i=1,a=this[e+--r];r>0&&(i*=256);)a+=this[e+--r]*i;return i*=128,a>=i&&(a-=Math.pow(2,8*t)),a},o.prototype.readInt8=function(e,t){return t||R(e,1,this.length),128&this[e]?(255-this[e]+1)*-1:this[e]},o.prototype.readInt16LE=function(e,t){t||R(e,2,this.length);var n=this[e]|this[e+1]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt16BE=function(e,t){t||R(e,2,this.length);var n=this[e+1]|this[e]<<8;return 32768&n?4294901760|n:n},o.prototype.readInt32LE=function(e,t){return t||R(e,4,this.length),this[e]|this[e+1]<<8|this[e+2]<<16|this[e+3]<<24},o.prototype.readInt32BE=function(e,t){return t||R(e,4,this.length),this[e]<<24|this[e+1]<<16|this[e+2]<<8|this[e+3]},o.prototype.readFloatLE=function(e,t){return t||R(e,4,this.length),X.read(this,e,!0,23,4)},o.prototype.readFloatBE=function(e,t){return t||R(e,4,this.length),X.read(this,e,!1,23,4)},o.prototype.readDoubleLE=function(e,t){return t||R(e,8,this.length),X.read(this,e,!0,52,8)},o.prototype.readDoubleBE=function(e,t){return t||R(e,8,this.length),X.read(this,e,!1,52,8)},o.prototype.writeUIntLE=function(e,t,n,r){if(e=+e,t=0|t,n=0|n,!r){var i=Math.pow(2,8*n)-1;U(this,e,t,n,i,0)}var a=1,o=0;for(this[t]=255&e;++o<n&&(a*=256);)this[t+o]=e/a&255;return t+n},o.prototype.writeUIntBE=function(e,t,n,r){if(e=+e,t=0|t,n=0|n,!r){var i=Math.pow(2,8*n)-1;U(this,e,t,n,i,0)}var a=n-1,o=1;for(this[t+a]=255&e;--a>=0&&(o*=256);)this[t+a]=e/o&255;return t+n},o.prototype.writeUInt8=function(e,t,n){return e=+e,t=0|t,n||U(this,e,t,1,255,0),o.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),this[t]=255&e,t+1},o.prototype.writeUInt16LE=function(e,t,n){return e=+e,t=0|t,n||U(this,e,t,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):P(this,e,t,!0),t+2},o.prototype.writeUInt16BE=function(e,t,n){return e=+e,t=0|t,n||U(this,e,t,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):P(this,e,t,!1),t+2},o.prototype.writeUInt32LE=function(e,t,n){return e=+e,t=0|t,n||U(this,e,t,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[t+3]=e>>>24,this[t+2]=e>>>16,this[t+1]=e>>>8,this[t]=255&e):q(this,e,t,!0),t+4},o.prototype.writeUInt32BE=function(e,t,n){return e=+e,t=0|t,n||U(this,e,t,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):q(this,e,t,!1),t+4},o.prototype.writeIntLE=function(e,t,n,r){if(e=+e,t=0|t,!r){var i=Math.pow(2,8*n-1);U(this,e,t,n,i-1,-i)}var a=0,o=1,s=0;for(this[t]=255&e;++a<n&&(o*=256);)e<0&&0===s&&0!==this[t+a-1]&&(s=1),this[t+a]=(e/o>>0)-s&255;return t+n},o.prototype.writeIntBE=function(e,t,n,r){if(e=+e,t=0|t,!r){var i=Math.pow(2,8*n-1);U(this,e,t,n,i-1,-i)}var a=n-1,o=1,s=0;for(this[t+a]=255&e;--a>=0&&(o*=256);)e<0&&0===s&&0!==this[t+a+1]&&(s=1),this[t+a]=(e/o>>0)-s&255;return t+n},o.prototype.writeInt8=function(e,t,n){return e=+e,t=0|t,n||U(this,e,t,1,127,-128),o.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),e<0&&(e=255+e+1),this[t]=255&e,t+1},o.prototype.writeInt16LE=function(e,t,n){return e=+e,t=0|t,n||U(this,e,t,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):P(this,e,t,!0),t+2},o.prototype.writeInt16BE=function(e,t,n){return e=+e,t=0|t,n||U(this,e,t,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):P(this,e,t,!1),t+2},o.prototype.writeInt32LE=function(e,t,n){return e=+e,t=0|t,n||U(this,e,t,4,2147483647,-2147483648),o.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8,this[t+2]=e>>>16,this[t+3]=e>>>24):q(this,e,t,!0),t+4},o.prototype.writeInt32BE=function(e,t,n){return e=+e,t=0|t,n||U(this,e,t,4,2147483647,-2147483648),e<0&&(e=4294967295+e+1),o.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):q(this,e,t,!1),t+4},o.prototype.writeFloatLE=function(e,t,n){return z(this,e,t,!0,n)},o.prototype.writeFloatBE=function(e,t,n){return z(this,e,t,!1,n)},o.prototype.writeDoubleLE=function(e,t,n){return N(this,e,t,!0,n)},o.prototype.writeDoubleBE=function(e,t,n){return N(this,e,t,!1,n)},o.prototype.copy=function(e,t,n,r){if(n||(n=0),r||0===r||(r=this.length),t>=e.length&&(t=e.length),t||(t=0),r>0&&r<n&&(r=n),r===n)return 0;if(0===e.length||0===this.length)return 0;if(t<0)throw new RangeError("targetStart out of bounds");if(n<0||n>=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),e.length-t<r-n&&(r=e.length-t+n);var i,a=r-n;if(this===e&&n<t&&t<r)for(i=a-1;i>=0;--i)e[i+t]=this[i+n];else if(a<1e3||!o.TYPED_ARRAY_SUPPORT)for(i=0;i<a;++i)e[i+t]=this[i+n];else Uint8Array.prototype.set.call(e,this.subarray(n,n+a),t);return a},o.prototype.fill=function(e,t,n,r){if("string"==typeof e){if("string"==typeof t?(r=t,t=0,n=this.length):"string"==typeof n&&(r=n,n=this.length),1===e.length){var i=e.charCodeAt(0);i<256&&(e=i)}if(void 0!==r&&"string"!=typeof r)throw new TypeError("encoding must be a string");if("string"==typeof r&&!o.isEncoding(r))throw new TypeError("Unknown encoding: "+r)}else"number"==typeof e&&(e=255&e);if(t<0||this.length<t||this.length<n)throw new RangeError("Out of range index");if(n<=t)return this;t>>>=0,n=void 0===n?this.length:n>>>0,e||(e=0);var a;if("number"==typeof e)for(a=t;a<n;++a)this[a]=e;else{var s=o.isBuffer(e)?e:H(new o(e,r).toString()),l=s.length;for(a=0;a<n-t;++a)this[a+t]=s[a%l]}return this};var te=/[^+\/0-9A-Za-z-_]/g}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"base64-js":2,ieee754:37,isarray:40}],6:[function(e,t,n){(function(e){function t(e){return Array.isArray?Array.isArray(e):"[object Array]"===g(e)}function r(e){return"boolean"==typeof e}function i(e){return null===e}function a(e){return null==e}function o(e){return"number"==typeof e}function s(e){return"string"==typeof e}function l(e){return"symbol"==typeof e}function u(e){return void 0===e}function c(e){return"[object RegExp]"===g(e)}function p(e){return"object"==typeof e&&null!==e}function h(e){return"[object Date]"===g(e)}function f(e){return"[object Error]"===g(e)||e instanceof Error}function d(e){return"function"==typeof e}function m(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||"undefined"==typeof e}function g(e){return Object.prototype.toString.call(e)}n.isArray=t,n.isBoolean=r,n.isNull=i,n.isNullOrUndefined=a,n.isNumber=o,n.isString=s,n.isSymbol=l,n.isUndefined=u,n.isRegExp=c,n.isObject=p,n.isDate=h,n.isError=f,n.isFunction=d,n.isPrimitive=m,n.isBuffer=e.isBuffer}).call(this,{isBuffer:e("../../is-buffer/index.js")})},{"../../is-buffer/index.js":39}],7:[function(e,t,n){function r(e,t){if(e){var n,r="";for(var i in e)n=e[i],r&&(r+=" "),r+=!n&&p[i]?i:i+'="'+(t.decodeEntities?c.encodeXML(n):n)+'"';return r}}function i(e,t){"svg"===e.name&&(t={decodeEntities:t.decodeEntities,xmlMode:!0});var n="<"+e.name,i=r(e.attribs,t);return i&&(n+=" "+i),!t.xmlMode||e.children&&0!==e.children.length?(n+=">",e.children&&(n+=d(e.children,t)),f[e.name]&&!t.xmlMode||(n+="</"+e.name+">")):n+="/>",n}function a(e){return"<"+e.data+">"}function o(e,t){var n=e.data||"";return!t.decodeEntities||e.parent&&e.parent.name in h||(n=c.encodeXML(n)),n}function s(e){return"<![CDATA["+e.children[0].data+"]]>"}function l(e){return"<!--"+e.data+"-->"}var u=e("domelementtype"),c=e("entities"),p={__proto__:null,allowfullscreen:!0,async:!0,autofocus:!0,autoplay:!0,checked:!0,controls:!0,"default":!0,defer:!0,disabled:!0,hidden:!0,ismap:!0,loop:!0,multiple:!0,muted:!0,open:!0,readonly:!0,required:!0,reversed:!0,scoped:!0,seamless:!0,selected:!0,typemustmatch:!0},h={__proto__:null,style:!0,script:!0,xmp:!0,iframe:!0,noembed:!0,noframes:!0,plaintext:!0,noscript:!0},f={__proto__:null,area:!0,base:!0,basefont:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,isindex:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},d=t.exports=function(e,t){Array.isArray(e)||e.cheerio||(e=[e]),t=t||{};for(var n="",r=0;r<e.length;r++){var c=e[r];n+="root"===c.type?d(c.children,t):u.isTag(c)?i(c,t):c.type===u.Directive?a(c):c.type===u.Comment?l(c):c.type===u.CDATA?s(c):o(c,t)}return n}},{domelementtype:8,entities:20}],8:[function(e,t,n){t.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",isTag:function(e){return"tag"===e.type||"script"===e.type||"style"===e.type}}},{}],9:[function(e,t,n){t.exports={Text:"text",Directive:"directive",Comment:"comment",Script:"script",Style:"style",Tag:"tag",CDATA:"cdata",Doctype:"doctype",isTag:function(e){return"tag"===e.type||"script"===e.type||"style"===e.type}}},{}],10:[function(e,t,n){function r(e,t,n){"object"==typeof e?(n=t,t=e,e=null):"function"==typeof t&&(n=t,t=l),this._callback=e,this._options=t||l,this._elementCB=n,this.dom=[],this._done=!1,this._tagStack=[],this._parser=this._parser||null}var i=e("domelementtype"),a=/\s+/g,o=e("./lib/node"),s=e("./lib/element"),l={normalizeWhitespace:!1,withStartIndices:!1};r.prototype.onparserinit=function(e){this._parser=e},r.prototype.onreset=function(){r.call(this,this._callback,this._options,this._elementCB)},r.prototype.onend=function(){this._done||(this._done=!0,this._parser=null,this._handleCallback(null))},r.prototype._handleCallback=r.prototype.onerror=function(e){if("function"==typeof this._callback)this._callback(e,this.dom);else if(e)throw e},r.prototype.onclosetag=function(){var e=this._tagStack.pop();this._elementCB&&this._elementCB(e)},r.prototype._addDomElement=function(e){var t=this._tagStack[this._tagStack.length-1],n=t?t.children:this.dom,r=n[n.length-1];e.next=null,this._options.withStartIndices&&(e.startIndex=this._parser.startIndex),this._options.withDomLvl1&&(e.__proto__="tag"===e.type?s:o),r?(e.prev=r,r.next=e):e.prev=null,n.push(e),e.parent=t||null},r.prototype.onopentag=function(e,t){var n={type:"script"===e?i.Script:"style"===e?i.Style:i.Tag,name:e,attribs:t,children:[]};this._addDomElement(n),this._tagStack.push(n)},r.prototype.ontext=function(e){var t,n=this._options.normalizeWhitespace||this._options.ignoreWhitespace;!this._tagStack.length&&this.dom.length&&(t=this.dom[this.dom.length-1]).type===i.Text?n?t.data=(t.data+e).replace(a," "):t.data+=e:this._tagStack.length&&(t=this._tagStack[this._tagStack.length-1])&&(t=t.children[t.children.length-1])&&t.type===i.Text?n?t.data=(t.data+e).replace(a," "):t.data+=e:(n&&(e=e.replace(a," ")),this._addDomElement({data:e,type:i.Text}))},r.prototype.oncomment=function(e){var t=this._tagStack[this._tagStack.length-1];if(t&&t.type===i.Comment)return void(t.data+=e);var n={data:e,type:i.Comment};this._addDomElement(n),this._tagStack.push(n)},r.prototype.oncdatastart=function(){var e={children:[{data:"",type:i.Text}],type:i.CDATA};this._addDomElement(e),this._tagStack.push(e)},r.prototype.oncommentend=r.prototype.oncdataend=function(){this._tagStack.pop()},r.prototype.onprocessinginstruction=function(e,t){this._addDomElement({name:e,data:t,type:i.Directive})},t.exports=r},{"./lib/element":11,"./lib/node":12,domelementtype:9}],11:[function(e,t,n){var r=e("./node"),i=t.exports=Object.create(r),a={tagName:"name"};Object.keys(a).forEach(function(e){var t=a[e];Object.defineProperty(i,e,{get:function(){return this[t]||null},set:function(e){return this[t]=e,e}})})},{"./node":12}],12:[function(e,t,n){var r=t.exports={get firstChild(){var e=this.children;return e&&e[0]||null},get lastChild(){var e=this.children;return e&&e[e.length-1]||null},get nodeType(){return a[this.type]||a.element}},i={tagName:"name",childNodes:"children",parentNode:"parent",previousSibling:"prev",nextSibling:"next",nodeValue:"data"},a={element:1,text:3,cdata:4,comment:8};Object.keys(i).forEach(function(e){var t=i[e];Object.defineProperty(r,e,{get:function(){return this[t]||null},set:function(e){return this[t]=e,e}})})},{}],13:[function(e,t,n){var r=t.exports;[e("./lib/stringify"),e("./lib/traversal"),e("./lib/manipulation"),e("./lib/querying"),e("./lib/legacy"),e("./lib/helpers")].forEach(function(e){Object.keys(e).forEach(function(t){r[t]=e[t].bind(r)})})},{"./lib/helpers":14,"./lib/legacy":15,"./lib/manipulation":16,"./lib/querying":17,"./lib/stringify":18,"./lib/traversal":19}],14:[function(e,t,n){n.removeSubsets=function(e){for(var t,n,r,i=e.length;--i>-1;){for(t=n=e[i],e[i]=null,r=!0;n;){if(e.indexOf(n)>-1){r=!1,e.splice(i,1);break}n=n.parent}r&&(e[i]=t)}return e};var r={DISCONNECTED:1,PRECEDING:2,FOLLOWING:4,CONTAINS:8,CONTAINED_BY:16},i=n.compareDocumentPosition=function(e,t){var n,i,a,o,s,l,u=[],c=[];if(e===t)return 0;for(n=e;n;)u.unshift(n),n=n.parent;for(n=t;n;)c.unshift(n),n=n.parent;for(l=0;u[l]===c[l];)l++;return 0===l?r.DISCONNECTED:(i=u[l-1],a=i.children,o=u[l],s=c[l],a.indexOf(o)>a.indexOf(s)?i===t?r.FOLLOWING|r.CONTAINED_BY:r.FOLLOWING:i===e?r.PRECEDING|r.CONTAINS:r.PRECEDING)};n.uniqueSort=function(e){var t,n,a=e.length;for(e=e.slice();--a>-1;)t=e[a],n=e.indexOf(t),n>-1&&n<a&&e.splice(a,1);return e.sort(function(e,t){var n=i(e,t);return n&r.PRECEDING?-1:n&r.FOLLOWING?1:0}),e}},{}],15:[function(e,t,n){function r(e,t){return"function"==typeof t?function(n){return n.attribs&&t(n.attribs[e])}:function(n){return n.attribs&&n.attribs[e]===t}}function i(e,t){return function(n){return e(n)||t(n)}}var a=e("domelementtype"),o=n.isTag=a.isTag;n.testElement=function(e,t){for(var n in e)if(e.hasOwnProperty(n)){if("tag_name"===n){if(!o(t)||!e.tag_name(t.name))return!1}else if("tag_type"===n){if(!e.tag_type(t.type))return!1}else if("tag_contains"===n){if(o(t)||!e.tag_contains(t.data))return!1}else if(!t.attribs||!e[n](t.attribs[n]))return!1}else;return!0};var s={tag_name:function(e){return"function"==typeof e?function(t){return o(t)&&e(t.name)}:"*"===e?o:function(t){return o(t)&&t.name===e}},tag_type:function(e){return"function"==typeof e?function(t){return e(t.type)}:function(t){return t.type===e}},tag_contains:function(e){return"function"==typeof e?function(t){return!o(t)&&e(t.data)}:function(t){return!o(t)&&t.data===e}}};n.getElements=function(e,t,n,a){var o=Object.keys(e).map(function(t){var n=e[t];return t in s?s[t](n):r(t,n)});return 0===o.length?[]:this.filter(o.reduce(i),t,n,a)},n.getElementById=function(e,t,n){return Array.isArray(t)||(t=[t]),this.findOne(r("id",e),t,n!==!1)},n.getElementsByTagName=function(e,t,n,r){return this.filter(s.tag_name(e),t,n,r)},n.getElementsByTagType=function(e,t,n,r){return this.filter(s.tag_type(e),t,n,r)}},{domelementtype:9}],16:[function(e,t,n){n.removeElement=function(e){if(e.prev&&(e.prev.next=e.next),e.next&&(e.next.prev=e.prev),e.parent){var t=e.parent.children;t.splice(t.lastIndexOf(e),1)}},n.replaceElement=function(e,t){var n=t.prev=e.prev;n&&(n.next=t);var r=t.next=e.next;r&&(r.prev=t);var i=t.parent=e.parent;if(i){var a=i.children;a[a.lastIndexOf(e)]=t}},n.appendChild=function(e,t){if(t.parent=e,1!==e.children.push(t)){var n=e.children[e.children.length-2];n.next=t,t.prev=n,t.next=null}},n.append=function(e,t){var n=e.parent,r=e.next;if(t.next=r,t.prev=e,e.next=t,t.parent=n,r){if(r.prev=t,n){var i=n.children;i.splice(i.lastIndexOf(r),0,t)}}else n&&n.children.push(t)},n.prepend=function(e,t){var n=e.parent;if(n){var r=n.children;r.splice(r.lastIndexOf(e),0,t)}e.prev&&(e.prev.next=t),t.parent=n,t.prev=e.prev,t.next=e,e.prev=t}},{}],17:[function(e,t,n){function r(e,t,n,r){return Array.isArray(t)||(t=[t]),"number"==typeof r&&isFinite(r)||(r=1/0),i(e,t,n!==!1,r)}function i(e,t,n,r){for(var a,o=[],s=0,l=t.length;s<l&&!(e(t[s])&&(o.push(t[s]),--r<=0))&&(a=t[s].children,!(n&&a&&a.length>0&&(a=i(e,a,n,r),o=o.concat(a),r-=a.length,r<=0)));s++);return o}function a(e,t){for(var n=0,r=t.length;n<r;n++)if(e(t[n]))return t[n];return null}function o(e,t){for(var n=null,r=0,i=t.length;r<i&&!n;r++)u(t[r])&&(e(t[r])?n=t[r]:t[r].children.length>0&&(n=o(e,t[r].children)));return n}function s(e,t){for(var n=0,r=t.length;n<r;n++)if(u(t[n])&&(e(t[n])||t[n].children.length>0&&s(e,t[n].children)))return!0;return!1}function l(e,t){for(var n=[],r=0,i=t.length;r<i;r++)u(t[r])&&(e(t[r])&&n.push(t[r]),t[r].children.length>0&&(n=n.concat(l(e,t[r].children))));return n}var u=e("domelementtype").isTag;t.exports={filter:r,find:i,findOneChild:a,findOne:o,existsOne:s,findAll:l}},{domelementtype:9}],18:[function(e,t,n){function r(e,t){return e.children?e.children.map(function(e){return o(e,t)}).join(""):""}function i(e){return Array.isArray(e)?e.map(i).join(""):s(e)||e.type===a.CDATA?i(e.children):e.type===a.Text?e.data:""}var a=e("domelementtype"),o=e("dom-serializer"),s=a.isTag;t.exports={getInnerHTML:r,getOuterHTML:o,getText:i}},{"dom-serializer":7,domelementtype:9}],19:[function(e,t,n){var r=n.getChildren=function(e){return e.children},i=n.getParent=function(e){return e.parent};n.getSiblings=function(e){var t=i(e);return t?r(t):[e]},n.getAttributeValue=function(e,t){return e.attribs&&e.attribs[t]},n.hasAttrib=function(e,t){return!!e.attribs&&hasOwnProperty.call(e.attribs,t)},n.getName=function(e){return e.name}},{}],20:[function(e,t,n){var r=e("./lib/encode.js"),i=e("./lib/decode.js");n.decode=function(e,t){return(!t||t<=0?i.XML:i.HTML)(e)},n.decodeStrict=function(e,t){return(!t||t<=0?i.XML:i.HTMLStrict)(e)},n.encode=function(e,t){return(!t||t<=0?r.XML:r.HTML)(e)},n.encodeXML=r.XML,n.encodeHTML4=n.encodeHTML5=n.encodeHTML=r.HTML,n.decodeXML=n.decodeXMLStrict=i.XML,n.decodeHTML4=n.decodeHTML5=n.decodeHTML=i.HTML,n.decodeHTML4Strict=n.decodeHTML5Strict=n.decodeHTMLStrict=i.HTMLStrict,n.escape=r.escape},{"./lib/decode.js":21,"./lib/encode.js":23}],21:[function(e,t,n){function r(e){var t=Object.keys(e).join("|"),n=a(e);t+="|#[xX][\\da-fA-F]+|#\\d+";var r=new RegExp("&(?:"+t+");","g");return function(e){return String(e).replace(r,n)}}function i(e,t){return e<t?1:-1}function a(e){return function(t){return"#"===t.charAt(1)?u("X"===t.charAt(2)||"x"===t.charAt(2)?parseInt(t.substr(3),16):parseInt(t.substr(2),10)):e[t.slice(1,-1)]}}var o=e("../maps/entities.json"),s=e("../maps/legacy.json"),l=e("../maps/xml.json"),u=e("./decode_codepoint.js"),c=r(l),p=r(o),h=function(){function e(e){return";"!==e.substr(-1)&&(e+=";"),c(e)}for(var t=Object.keys(s).sort(i),n=Object.keys(o).sort(i),r=0,l=0;r<n.length;r++)t[l]===n[r]?(n[r]+=";?",l++):n[r]+=";";var u=new RegExp("&(?:"+n.join("|")+"|#[xX][\\da-fA-F]+;?|#\\d+;?)","g"),c=a(o);return function(t){return String(t).replace(u,e)}}();t.exports={XML:c,HTML:h,HTMLStrict:p}},{"../maps/entities.json":25,"../maps/legacy.json":26,"../maps/xml.json":27,"./decode_codepoint.js":22}],22:[function(e,t,n){function r(e){if(e>=55296&&e<=57343||e>1114111)return"�";e in i&&(e=i[e]);var t="";return e>65535&&(e-=65536,t+=String.fromCharCode(e>>>10&1023|55296),e=56320|1023&e),t+=String.fromCharCode(e)}var i=e("../maps/decode.json");t.exports=r},{"../maps/decode.json":24}],23:[function(e,t,n){function r(e){return Object.keys(e).sort().reduce(function(t,n){return t[e[n]]="&"+n+";",t},{})}function i(e){var t=[],n=[];return Object.keys(e).forEach(function(e){1===e.length?t.push("\\"+e):n.push(e)}),n.unshift("["+t.join("")+"]"),new RegExp(n.join("|"),"g")}function a(e){return"&#x"+e.charCodeAt(0).toString(16).toUpperCase()+";"}function o(e){var t=e.charCodeAt(0),n=e.charCodeAt(1),r=1024*(t-55296)+n-56320+65536;return"&#x"+r.toString(16).toUpperCase()+";"}function s(e,t){function n(t){return e[t]}return function(e){return e.replace(t,n).replace(d,o).replace(f,a)}}function l(e){return e.replace(m,a).replace(d,o).replace(f,a)}var u=r(e("../maps/xml.json")),c=i(u);n.XML=s(u,c);var p=r(e("../maps/entities.json")),h=i(p);n.HTML=s(p,h);var f=/[^\0-\x7F]/g,d=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,m=i(u);n.escape=l},{"../maps/entities.json":25,"../maps/xml.json":27}],24:[function(e,t,n){t.exports={0:65533,128:8364,130:8218,131:402,132:8222,133:8230,134:8224,135:8225,136:710,137:8240,138:352,139:8249,140:338,142:381,145:8216,146:8217,147:8220,148:8221,149:8226,150:8211,151:8212,152:732,153:8482,154:353,155:8250,156:339,158:382,159:376}},{}],25:[function(e,t,n){t.exports={Aacute:"Á",aacute:"á",Abreve:"Ă",abreve:"ă",ac:"∾",acd:"∿",acE:"∾̳",Acirc:"Â",acirc:"â",acute:"´",Acy:"А",acy:"а",AElig:"Æ",aelig:"æ",af:"⁡",Afr:"𝔄",afr:"𝔞",Agrave:"À",agrave:"à",alefsym:"ℵ",aleph:"ℵ",Alpha:"Α",alpha:"α",Amacr:"Ā",amacr:"ā",amalg:"⨿",amp:"&",AMP:"&",andand:"⩕",And:"⩓",and:"∧",andd:"⩜",andslope:"⩘",andv:"⩚",ang:"∠",ange:"⦤",angle:"∠",angmsdaa:"⦨",angmsdab:"⦩",angmsdac:"⦪",angmsdad:"⦫",angmsdae:"⦬",angmsdaf:"⦭",angmsdag:"⦮",angmsdah:"⦯",angmsd:"∡",angrt:"∟",angrtvb:"⊾",angrtvbd:"⦝",angsph:"∢",angst:"Å",angzarr:"⍼",Aogon:"Ą",aogon:"ą",Aopf:"𝔸",aopf:"𝕒",apacir:"⩯",ap:"≈",apE:"⩰",ape:"≊",apid:"≋",apos:"'",ApplyFunction:"⁡",approx:"≈",approxeq:"≊",Aring:"Å",aring:"å",Ascr:"𝒜",ascr:"𝒶",Assign:"≔",ast:"*",asymp:"≈",asympeq:"≍",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",awconint:"∳",awint:"⨑",backcong:"≌",backepsilon:"϶",backprime:"‵",backsim:"∽",backsimeq:"⋍",Backslash:"∖",Barv:"⫧",barvee:"⊽",barwed:"⌅",Barwed:"⌆",barwedge:"⌅",bbrk:"⎵",bbrktbrk:"⎶",bcong:"≌",Bcy:"Б",bcy:"б",bdquo:"„",becaus:"∵",because:"∵",Because:"∵",bemptyv:"⦰",bepsi:"϶",bernou:"ℬ",Bernoullis:"ℬ",Beta:"Β",beta:"β",beth:"ℶ",between:"≬",Bfr:"𝔅",bfr:"𝔟",bigcap:"⋂",bigcirc:"◯",bigcup:"⋃",bigodot:"⨀",bigoplus:"⨁",bigotimes:"⨂",bigsqcup:"⨆",bigstar:"★",bigtriangledown:"▽",bigtriangleup:"△",biguplus:"⨄",bigvee:"⋁",bigwedge:"⋀",bkarow:"⤍",blacklozenge:"⧫",blacksquare:"▪",blacktriangle:"▴",blacktriangledown:"▾",blacktriangleleft:"◂",blacktriangleright:"▸",blank:"␣",blk12:"▒",blk14:"░",blk34:"▓",block:"█",bne:"=⃥",bnequiv:"≡⃥",bNot:"⫭",bnot:"⌐",Bopf:"𝔹",bopf:"𝕓",bot:"⊥",bottom:"⊥",bowtie:"⋈",boxbox:"⧉",boxdl:"┐",boxdL:"╕",boxDl:"╖",boxDL:"╗",boxdr:"┌",boxdR:"╒",boxDr:"╓",boxDR:"╔",boxh:"─",boxH:"═",boxhd:"┬",boxHd:"╤",boxhD:"╥",boxHD:"╦",boxhu:"┴",boxHu:"╧",boxhU:"╨",boxHU:"╩",boxminus:"⊟",boxplus:"⊞",boxtimes:"⊠",boxul:"┘",boxuL:"╛",boxUl:"╜",boxUL:"╝",boxur:"└",boxuR:"╘",boxUr:"╙",boxUR:"╚",boxv:"│",boxV:"║",boxvh:"┼",boxvH:"╪",boxVh:"╫",boxVH:"╬",boxvl:"┤",boxvL:"╡",boxVl:"╢",boxVL:"╣",boxvr:"├",boxvR:"╞",boxVr:"╟",boxVR:"╠",bprime:"‵",breve:"˘",Breve:"˘",brvbar:"¦",bscr:"𝒷",Bscr:"ℬ",bsemi:"⁏",bsim:"∽",bsime:"⋍",bsolb:"⧅",bsol:"\\",bsolhsub:"⟈",bull:"•",bullet:"•",bump:"≎",bumpE:"⪮",bumpe:"≏",Bumpeq:"≎",bumpeq:"≏",Cacute:"Ć",cacute:"ć",capand:"⩄",capbrcup:"⩉",capcap:"⩋",cap:"∩",Cap:"⋒",capcup:"⩇",capdot:"⩀",CapitalDifferentialD:"ⅅ",caps:"∩︀",caret:"⁁",caron:"ˇ",Cayleys:"ℭ",ccaps:"⩍",Ccaron:"Č",ccaron:"č",Ccedil:"Ç",ccedil:"ç",Ccirc:"Ĉ",ccirc:"ĉ",Cconint:"∰",ccups:"⩌",ccupssm:"⩐",Cdot:"Ċ",cdot:"ċ",cedil:"¸",Cedilla:"¸",cemptyv:"⦲",cent:"¢",centerdot:"·",CenterDot:"·",cfr:"𝔠",Cfr:"ℭ",CHcy:"Ч",chcy:"ч",check:"✓",checkmark:"✓",Chi:"Χ",chi:"χ",circ:"ˆ",circeq:"≗",circlearrowleft:"↺",circlearrowright:"↻",circledast:"⊛",circledcirc:"⊚",circleddash:"⊝",CircleDot:"⊙",circledR:"®",circledS:"Ⓢ",CircleMinus:"⊖",CirclePlus:"⊕",CircleTimes:"⊗",cir:"○",cirE:"⧃",cire:"≗",cirfnint:"⨐",cirmid:"⫯",cirscir:"⧂",ClockwiseContourIntegral:"∲",CloseCurlyDoubleQuote:"”",CloseCurlyQuote:"’",clubs:"♣",clubsuit:"♣",colon:":",Colon:"∷",Colone:"⩴",colone:"≔",coloneq:"≔",comma:",",commat:"@",comp:"∁",compfn:"∘",complement:"∁",complexes:"ℂ",cong:"≅",congdot:"⩭",Congruent:"≡",conint:"∮",Conint:"∯",ContourIntegral:"∮",copf:"𝕔",Copf:"ℂ",coprod:"∐",Coproduct:"∐",copy:"©",COPY:"©",copysr:"℗",CounterClockwiseContourIntegral:"∳",crarr:"↵",cross:"✗",Cross:"⨯",Cscr:"𝒞",cscr:"𝒸",csub:"⫏",csube:"⫑",csup:"⫐",csupe:"⫒",ctdot:"⋯",cudarrl:"⤸",cudarrr:"⤵",cuepr:"⋞",cuesc:"⋟",cularr:"↶",cularrp:"⤽",cupbrcap:"⩈",cupcap:"⩆",CupCap:"≍",cup:"∪",Cup:"⋓",cupcup:"⩊",cupdot:"⊍",cupor:"⩅",cups:"∪︀",curarr:"↷",curarrm:"⤼",curlyeqprec:"⋞",curlyeqsucc:"⋟",curlyvee:"⋎",curlywedge:"⋏",curren:"¤",curvearrowleft:"↶",curvearrowright:"↷",cuvee:"⋎",cuwed:"⋏",cwconint:"∲",cwint:"∱",cylcty:"⌭",dagger:"†",Dagger:"‡",daleth:"ℸ",darr:"↓",Darr:"↡",dArr:"⇓",dash:"‐",Dashv:"⫤",dashv:"⊣",dbkarow:"⤏",dblac:"˝",Dcaron:"Ď",dcaron:"ď",Dcy:"Д",dcy:"д",ddagger:"‡",ddarr:"⇊",DD:"ⅅ",dd:"ⅆ",DDotrahd:"⤑",ddotseq:"⩷",deg:"°",Del:"∇",Delta:"Δ",delta:"δ",demptyv:"⦱",dfisht:"⥿",Dfr:"𝔇",dfr:"𝔡",dHar:"⥥",dharl:"⇃",dharr:"⇂",DiacriticalAcute:"´",DiacriticalDot:"˙",DiacriticalDoubleAcute:"˝",DiacriticalGrave:"`",DiacriticalTilde:"˜",diam:"⋄",diamond:"⋄",Diamond:"⋄",diamondsuit:"♦",diams:"♦",die:"¨",DifferentialD:"ⅆ",digamma:"ϝ",disin:"⋲",div:"÷",divide:"÷",divideontimes:"⋇",divonx:"⋇",DJcy:"Ђ",djcy:"ђ",dlcorn:"⌞",dlcrop:"⌍",dollar:"$",Dopf:"𝔻",dopf:"𝕕",Dot:"¨",dot:"˙",DotDot:"⃜",doteq:"≐",doteqdot:"≑",DotEqual:"≐",dotminus:"∸",dotplus:"∔",dotsquare:"⊡",doublebarwedge:"⌆",DoubleContourIntegral:"∯",DoubleDot:"¨",DoubleDownArrow:"⇓",DoubleLeftArrow:"⇐",DoubleLeftRightArrow:"⇔",DoubleLeftTee:"⫤",DoubleLongLeftArrow:"⟸",DoubleLongLeftRightArrow:"⟺",DoubleLongRightArrow:"⟹",DoubleRightArrow:"⇒",DoubleRightTee:"⊨",DoubleUpArrow:"⇑",DoubleUpDownArrow:"⇕",DoubleVerticalBar:"∥",DownArrowBar:"⤓",downarrow:"↓",DownArrow:"↓",Downarrow:"⇓",DownArrowUpArrow:"⇵",DownBreve:"̑",downdownarrows:"⇊",downharpoonleft:"⇃",downharpoonright:"⇂",DownLeftRightVector:"⥐",DownLeftTeeVector:"⥞",DownLeftVectorBar:"⥖",DownLeftVector:"↽",DownRightTeeVector:"⥟",DownRightVectorBar:"⥗",DownRightVector:"⇁",DownTeeArrow:"↧",DownTee:"⊤",drbkarow:"⤐",drcorn:"⌟",drcrop:"⌌",Dscr:"𝒟",dscr:"𝒹",DScy:"Ѕ",dscy:"ѕ",dsol:"⧶",Dstrok:"Đ",dstrok:"đ",dtdot:"⋱",dtri:"▿",dtrif:"▾",duarr:"⇵",duhar:"⥯",dwangle:"⦦",DZcy:"Џ",dzcy:"џ",dzigrarr:"⟿",Eacute:"É",eacute:"é",easter:"⩮",Ecaron:"Ě",ecaron:"ě",Ecirc:"Ê",ecirc:"ê",ecir:"≖",ecolon:"≕",Ecy:"Э",ecy:"э",eDDot:"⩷",Edot:"Ė",edot:"ė",eDot:"≑",ee:"ⅇ",efDot:"≒",Efr:"𝔈",efr:"𝔢",eg:"⪚",Egrave:"È",egrave:"è",egs:"⪖",egsdot:"⪘",el:"⪙",Element:"∈",elinters:"⏧",ell:"ℓ",els:"⪕",elsdot:"⪗",Emacr:"Ē",emacr:"ē",empty:"∅",emptyset:"∅",EmptySmallSquare:"◻",emptyv:"∅",EmptyVerySmallSquare:"▫",emsp13:" ",emsp14:" ",emsp:" ",ENG:"Ŋ",eng:"ŋ",ensp:" ",Eogon:"Ę",eogon:"ę",Eopf:"𝔼",eopf:"𝕖",epar:"⋕",eparsl:"⧣",eplus:"⩱",epsi:"ε",Epsilon:"Ε",epsilon:"ε",epsiv:"ϵ",eqcirc:"≖",eqcolon:"≕",eqsim:"≂",eqslantgtr:"⪖",eqslantless:"⪕",Equal:"⩵",equals:"=",EqualTilde:"≂",equest:"≟",Equilibrium:"⇌",equiv:"≡",equivDD:"⩸",eqvparsl:"⧥",erarr:"⥱",erDot:"≓",escr:"ℯ",Escr:"ℰ",esdot:"≐",Esim:"⩳",esim:"≂",Eta:"Η",eta:"η",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",euro:"€",excl:"!",exist:"∃",Exists:"∃",expectation:"ℰ",exponentiale:"ⅇ",ExponentialE:"ⅇ",fallingdotseq:"≒",Fcy:"Ф",fcy:"ф",female:"♀",ffilig:"ffi",fflig:"ff",ffllig:"ffl",Ffr:"𝔉",ffr:"𝔣",filig:"fi",FilledSmallSquare:"◼",FilledVerySmallSquare:"▪",fjlig:"fj",flat:"♭",fllig:"fl",fltns:"▱",fnof:"ƒ",Fopf:"𝔽",fopf:"𝕗",forall:"∀",ForAll:"∀",fork:"⋔",forkv:"⫙",Fouriertrf:"ℱ",fpartint:"⨍",frac12:"½",frac13:"⅓",frac14:"¼",frac15:"⅕",frac16:"⅙",frac18:"⅛",frac23:"⅔",frac25:"⅖",frac34:"¾",frac35:"⅗",frac38:"⅜",frac45:"⅘",frac56:"⅚",frac58:"⅝",frac78:"⅞",frasl:"⁄",frown:"⌢",fscr:"𝒻",Fscr:"ℱ",gacute:"ǵ",Gamma:"Γ",gamma:"γ",Gammad:"Ϝ",gammad:"ϝ",gap:"⪆",Gbreve:"Ğ",gbreve:"ğ",Gcedil:"Ģ",Gcirc:"Ĝ",gcirc:"ĝ",Gcy:"Г",gcy:"г",Gdot:"Ġ",gdot:"ġ",ge:"≥",gE:"≧",gEl:"⪌",gel:"⋛",geq:"≥",geqq:"≧",geqslant:"⩾",gescc:"⪩",ges:"⩾",gesdot:"⪀",gesdoto:"⪂",gesdotol:"⪄",gesl:"⋛︀",gesles:"⪔",Gfr:"𝔊",gfr:"𝔤",gg:"≫",Gg:"⋙",ggg:"⋙",gimel:"ℷ",GJcy:"Ѓ",gjcy:"ѓ",gla:"⪥",gl:"≷",glE:"⪒",glj:"⪤",gnap:"⪊",gnapprox:"⪊",gne:"⪈",gnE:"≩",gneq:"⪈",gneqq:"≩",gnsim:"⋧",Gopf:"𝔾",gopf:"𝕘",grave:"`",GreaterEqual:"≥",GreaterEqualLess:"⋛",GreaterFullEqual:"≧",GreaterGreater:"⪢",GreaterLess:"≷",GreaterSlantEqual:"⩾",GreaterTilde:"≳",Gscr:"𝒢",gscr:"ℊ",gsim:"≳",gsime:"⪎",gsiml:"⪐",gtcc:"⪧",gtcir:"⩺",gt:">",GT:">",Gt:"≫",gtdot:"⋗",gtlPar:"⦕",gtquest:"⩼",gtrapprox:"⪆",gtrarr:"⥸",gtrdot:"⋗",gtreqless:"⋛",gtreqqless:"⪌",gtrless:"≷",gtrsim:"≳",gvertneqq:"≩︀",gvnE:"≩︀",Hacek:"ˇ",hairsp:" ",half:"½",hamilt:"ℋ",HARDcy:"Ъ",hardcy:"ъ",harrcir:"⥈",harr:"↔",hArr:"⇔",harrw:"↭",Hat:"^",hbar:"ℏ",Hcirc:"Ĥ",hcirc:"ĥ",hearts:"♥",heartsuit:"♥",hellip:"…",hercon:"⊹",hfr:"𝔥",Hfr:"ℌ",HilbertSpace:"ℋ",hksearow:"⤥",hkswarow:"⤦",hoarr:"⇿",homtht:"∻",hookleftarrow:"↩",hookrightarrow:"↪",hopf:"𝕙",Hopf:"ℍ",horbar:"―",HorizontalLine:"─",hscr:"𝒽",Hscr:"ℋ",hslash:"ℏ",Hstrok:"Ħ",hstrok:"ħ",HumpDownHump:"≎",HumpEqual:"≏",hybull:"⁃",hyphen:"‐",Iacute:"Í",iacute:"í",ic:"⁣",Icirc:"Î",icirc:"î",Icy:"И",icy:"и",Idot:"İ",IEcy:"Е",iecy:"е",iexcl:"¡",iff:"⇔",ifr:"𝔦",Ifr:"ℑ",Igrave:"Ì",igrave:"ì",ii:"ⅈ",iiiint:"⨌",iiint:"∭",iinfin:"⧜",iiota:"℩",IJlig:"IJ",ijlig:"ij",Imacr:"Ī",imacr:"ī",image:"ℑ",ImaginaryI:"ⅈ",imagline:"ℐ",imagpart:"ℑ",imath:"ı",Im:"ℑ",imof:"⊷",imped:"Ƶ",Implies:"⇒",incare:"℅","in":"∈",infin:"∞",infintie:"⧝",inodot:"ı",intcal:"⊺","int":"∫",Int:"∬",integers:"ℤ",Integral:"∫",intercal:"⊺",Intersection:"⋂",intlarhk:"⨗",intprod:"⨼",InvisibleComma:"⁣",InvisibleTimes:"⁢",IOcy:"Ё",iocy:"ё",Iogon:"Į",iogon:"į",Iopf:"𝕀",iopf:"𝕚",Iota:"Ι",iota:"ι",iprod:"⨼",iquest:"¿",iscr:"𝒾",Iscr:"ℐ",isin:"∈",isindot:"⋵",isinE:"⋹",isins:"⋴",isinsv:"⋳",isinv:"∈",it:"⁢",Itilde:"Ĩ",itilde:"ĩ",Iukcy:"І",iukcy:"і",Iuml:"Ï",iuml:"ï",Jcirc:"Ĵ",jcirc:"ĵ",Jcy:"Й",jcy:"й",Jfr:"𝔍",jfr:"𝔧",jmath:"ȷ",Jopf:"𝕁",jopf:"𝕛",Jscr:"𝒥",jscr:"𝒿",Jsercy:"Ј",jsercy:"ј",Jukcy:"Є",jukcy:"є",Kappa:"Κ",kappa:"κ",kappav:"ϰ",Kcedil:"Ķ",kcedil:"ķ",Kcy:"К",kcy:"к",Kfr:"𝔎",kfr:"𝔨",kgreen:"ĸ",KHcy:"Х",khcy:"х",KJcy:"Ќ",kjcy:"ќ",Kopf:"𝕂",kopf:"𝕜",Kscr:"𝒦",kscr:"𝓀",lAarr:"⇚",Lacute:"Ĺ",lacute:"ĺ",laemptyv:"⦴",lagran:"ℒ",Lambda:"Λ",lambda:"λ",lang:"⟨",Lang:"⟪",langd:"⦑",langle:"⟨",lap:"⪅",Laplacetrf:"ℒ",laquo:"«",larrb:"⇤",larrbfs:"⤟",larr:"←",Larr:"↞",lArr:"⇐",larrfs:"⤝",larrhk:"↩",larrlp:"↫",larrpl:"⤹",larrsim:"⥳",larrtl:"↢",latail:"⤙",lAtail:"⤛",lat:"⪫",late:"⪭",lates:"⪭︀",lbarr:"⤌",lBarr:"⤎",lbbrk:"❲",lbrace:"{",lbrack:"[",lbrke:"⦋",lbrksld:"⦏",lbrkslu:"⦍",Lcaron:"Ľ",lcaron:"ľ",Lcedil:"Ļ",lcedil:"ļ",lceil:"⌈",lcub:"{",Lcy:"Л",lcy:"л",ldca:"⤶",ldquo:"“",ldquor:"„",ldrdhar:"⥧",ldrushar:"⥋",ldsh:"↲",le:"≤",lE:"≦",LeftAngleBracket:"⟨",LeftArrowBar:"⇤",leftarrow:"←",LeftArrow:"←",Leftarrow:"⇐",LeftArrowRightArrow:"⇆",leftarrowtail:"↢",LeftCeiling:"⌈",LeftDoubleBracket:"⟦",LeftDownTeeVector:"⥡",LeftDownVectorBar:"⥙",LeftDownVector:"⇃",LeftFloor:"⌊",leftharpoondown:"↽",leftharpoonup:"↼",leftleftarrows:"⇇",leftrightarrow:"↔",LeftRightArrow:"↔",Leftrightarrow:"⇔",leftrightarrows:"⇆",leftrightharpoons:"⇋",leftrightsquigarrow:"↭",LeftRightVector:"⥎",LeftTeeArrow:"↤",LeftTee:"⊣",LeftTeeVector:"⥚",leftthreetimes:"⋋",LeftTriangleBar:"⧏",LeftTriangle:"⊲",LeftTriangleEqual:"⊴",LeftUpDownVector:"⥑",LeftUpTeeVector:"⥠",LeftUpVectorBar:"⥘",LeftUpVector:"↿",LeftVectorBar:"⥒",LeftVector:"↼",lEg:"⪋",leg:"⋚",leq:"≤",leqq:"≦",leqslant:"⩽",lescc:"⪨",les:"⩽",lesdot:"⩿",lesdoto:"⪁",lesdotor:"⪃",lesg:"⋚︀",lesges:"⪓",lessapprox:"⪅",lessdot:"⋖",lesseqgtr:"⋚",lesseqqgtr:"⪋",LessEqualGreater:"⋚",LessFullEqual:"≦",LessGreater:"≶",lessgtr:"≶",LessLess:"⪡",lesssim:"≲",LessSlantEqual:"⩽",LessTilde:"≲",lfisht:"⥼",lfloor:"⌊",Lfr:"𝔏",lfr:"𝔩",lg:"≶",lgE:"⪑",lHar:"⥢",lhard:"↽",lharu:"↼",lharul:"⥪",lhblk:"▄",LJcy:"Љ",ljcy:"љ",llarr:"⇇",ll:"≪",Ll:"⋘",llcorner:"⌞",Lleftarrow:"⇚",llhard:"⥫",
+lltri:"◺",Lmidot:"Ŀ",lmidot:"ŀ",lmoustache:"⎰",lmoust:"⎰",lnap:"⪉",lnapprox:"⪉",lne:"⪇",lnE:"≨",lneq:"⪇",lneqq:"≨",lnsim:"⋦",loang:"⟬",loarr:"⇽",lobrk:"⟦",longleftarrow:"⟵",LongLeftArrow:"⟵",Longleftarrow:"⟸",longleftrightarrow:"⟷",LongLeftRightArrow:"⟷",Longleftrightarrow:"⟺",longmapsto:"⟼",longrightarrow:"⟶",LongRightArrow:"⟶",Longrightarrow:"⟹",looparrowleft:"↫",looparrowright:"↬",lopar:"⦅",Lopf:"𝕃",lopf:"𝕝",loplus:"⨭",lotimes:"⨴",lowast:"∗",lowbar:"_",LowerLeftArrow:"↙",LowerRightArrow:"↘",loz:"◊",lozenge:"◊",lozf:"⧫",lpar:"(",lparlt:"⦓",lrarr:"⇆",lrcorner:"⌟",lrhar:"⇋",lrhard:"⥭",lrm:"‎",lrtri:"⊿",lsaquo:"‹",lscr:"𝓁",Lscr:"ℒ",lsh:"↰",Lsh:"↰",lsim:"≲",lsime:"⪍",lsimg:"⪏",lsqb:"[",lsquo:"‘",lsquor:"‚",Lstrok:"Ł",lstrok:"ł",ltcc:"⪦",ltcir:"⩹",lt:"<",LT:"<",Lt:"≪",ltdot:"⋖",lthree:"⋋",ltimes:"⋉",ltlarr:"⥶",ltquest:"⩻",ltri:"◃",ltrie:"⊴",ltrif:"◂",ltrPar:"⦖",lurdshar:"⥊",luruhar:"⥦",lvertneqq:"≨︀",lvnE:"≨︀",macr:"¯",male:"♂",malt:"✠",maltese:"✠",Map:"⤅",map:"↦",mapsto:"↦",mapstodown:"↧",mapstoleft:"↤",mapstoup:"↥",marker:"▮",mcomma:"⨩",Mcy:"М",mcy:"м",mdash:"—",mDDot:"∺",measuredangle:"∡",MediumSpace:" ",Mellintrf:"ℳ",Mfr:"𝔐",mfr:"𝔪",mho:"℧",micro:"µ",midast:"*",midcir:"⫰",mid:"∣",middot:"·",minusb:"⊟",minus:"−",minusd:"∸",minusdu:"⨪",MinusPlus:"∓",mlcp:"⫛",mldr:"…",mnplus:"∓",models:"⊧",Mopf:"𝕄",mopf:"𝕞",mp:"∓",mscr:"𝓂",Mscr:"ℳ",mstpos:"∾",Mu:"Μ",mu:"μ",multimap:"⊸",mumap:"⊸",nabla:"∇",Nacute:"Ń",nacute:"ń",nang:"∠⃒",nap:"≉",napE:"⩰̸",napid:"≋̸",napos:"ʼn",napprox:"≉",natural:"♮",naturals:"ℕ",natur:"♮",nbsp:" ",nbump:"≎̸",nbumpe:"≏̸",ncap:"⩃",Ncaron:"Ň",ncaron:"ň",Ncedil:"Ņ",ncedil:"ņ",ncong:"≇",ncongdot:"⩭̸",ncup:"⩂",Ncy:"Н",ncy:"н",ndash:"–",nearhk:"⤤",nearr:"↗",neArr:"⇗",nearrow:"↗",ne:"≠",nedot:"≐̸",NegativeMediumSpace:"​",NegativeThickSpace:"​",NegativeThinSpace:"​",NegativeVeryThinSpace:"​",nequiv:"≢",nesear:"⤨",nesim:"≂̸",NestedGreaterGreater:"≫",NestedLessLess:"≪",NewLine:"\n",nexist:"∄",nexists:"∄",Nfr:"𝔑",nfr:"𝔫",ngE:"≧̸",nge:"≱",ngeq:"≱",ngeqq:"≧̸",ngeqslant:"⩾̸",nges:"⩾̸",nGg:"⋙̸",ngsim:"≵",nGt:"≫⃒",ngt:"≯",ngtr:"≯",nGtv:"≫̸",nharr:"↮",nhArr:"⇎",nhpar:"⫲",ni:"∋",nis:"⋼",nisd:"⋺",niv:"∋",NJcy:"Њ",njcy:"њ",nlarr:"↚",nlArr:"⇍",nldr:"‥",nlE:"≦̸",nle:"≰",nleftarrow:"↚",nLeftarrow:"⇍",nleftrightarrow:"↮",nLeftrightarrow:"⇎",nleq:"≰",nleqq:"≦̸",nleqslant:"⩽̸",nles:"⩽̸",nless:"≮",nLl:"⋘̸",nlsim:"≴",nLt:"≪⃒",nlt:"≮",nltri:"⋪",nltrie:"⋬",nLtv:"≪̸",nmid:"∤",NoBreak:"⁠",NonBreakingSpace:" ",nopf:"𝕟",Nopf:"ℕ",Not:"⫬",not:"¬",NotCongruent:"≢",NotCupCap:"≭",NotDoubleVerticalBar:"∦",NotElement:"∉",NotEqual:"≠",NotEqualTilde:"≂̸",NotExists:"∄",NotGreater:"≯",NotGreaterEqual:"≱",NotGreaterFullEqual:"≧̸",NotGreaterGreater:"≫̸",NotGreaterLess:"≹",NotGreaterSlantEqual:"⩾̸",NotGreaterTilde:"≵",NotHumpDownHump:"≎̸",NotHumpEqual:"≏̸",notin:"∉",notindot:"⋵̸",notinE:"⋹̸",notinva:"∉",notinvb:"⋷",notinvc:"⋶",NotLeftTriangleBar:"⧏̸",NotLeftTriangle:"⋪",NotLeftTriangleEqual:"⋬",NotLess:"≮",NotLessEqual:"≰",NotLessGreater:"≸",NotLessLess:"≪̸",NotLessSlantEqual:"⩽̸",NotLessTilde:"≴",NotNestedGreaterGreater:"⪢̸",NotNestedLessLess:"⪡̸",notni:"∌",notniva:"∌",notnivb:"⋾",notnivc:"⋽",NotPrecedes:"⊀",NotPrecedesEqual:"⪯̸",NotPrecedesSlantEqual:"⋠",NotReverseElement:"∌",NotRightTriangleBar:"⧐̸",NotRightTriangle:"⋫",NotRightTriangleEqual:"⋭",NotSquareSubset:"⊏̸",NotSquareSubsetEqual:"⋢",NotSquareSuperset:"⊐̸",NotSquareSupersetEqual:"⋣",NotSubset:"⊂⃒",NotSubsetEqual:"⊈",NotSucceeds:"⊁",NotSucceedsEqual:"⪰̸",NotSucceedsSlantEqual:"⋡",NotSucceedsTilde:"≿̸",NotSuperset:"⊃⃒",NotSupersetEqual:"⊉",NotTilde:"≁",NotTildeEqual:"≄",NotTildeFullEqual:"≇",NotTildeTilde:"≉",NotVerticalBar:"∤",nparallel:"∦",npar:"∦",nparsl:"⫽⃥",npart:"∂̸",npolint:"⨔",npr:"⊀",nprcue:"⋠",nprec:"⊀",npreceq:"⪯̸",npre:"⪯̸",nrarrc:"⤳̸",nrarr:"↛",nrArr:"⇏",nrarrw:"↝̸",nrightarrow:"↛",nRightarrow:"⇏",nrtri:"⋫",nrtrie:"⋭",nsc:"⊁",nsccue:"⋡",nsce:"⪰̸",Nscr:"𝒩",nscr:"𝓃",nshortmid:"∤",nshortparallel:"∦",nsim:"≁",nsime:"≄",nsimeq:"≄",nsmid:"∤",nspar:"∦",nsqsube:"⋢",nsqsupe:"⋣",nsub:"⊄",nsubE:"⫅̸",nsube:"⊈",nsubset:"⊂⃒",nsubseteq:"⊈",nsubseteqq:"⫅̸",nsucc:"⊁",nsucceq:"⪰̸",nsup:"⊅",nsupE:"⫆̸",nsupe:"⊉",nsupset:"⊃⃒",nsupseteq:"⊉",nsupseteqq:"⫆̸",ntgl:"≹",Ntilde:"Ñ",ntilde:"ñ",ntlg:"≸",ntriangleleft:"⋪",ntrianglelefteq:"⋬",ntriangleright:"⋫",ntrianglerighteq:"⋭",Nu:"Ν",nu:"ν",num:"#",numero:"№",numsp:" ",nvap:"≍⃒",nvdash:"⊬",nvDash:"⊭",nVdash:"⊮",nVDash:"⊯",nvge:"≥⃒",nvgt:">⃒",nvHarr:"⤄",nvinfin:"⧞",nvlArr:"⤂",nvle:"≤⃒",nvlt:"<⃒",nvltrie:"⊴⃒",nvrArr:"⤃",nvrtrie:"⊵⃒",nvsim:"∼⃒",nwarhk:"⤣",nwarr:"↖",nwArr:"⇖",nwarrow:"↖",nwnear:"⤧",Oacute:"Ó",oacute:"ó",oast:"⊛",Ocirc:"Ô",ocirc:"ô",ocir:"⊚",Ocy:"О",ocy:"о",odash:"⊝",Odblac:"Ő",odblac:"ő",odiv:"⨸",odot:"⊙",odsold:"⦼",OElig:"Œ",oelig:"œ",ofcir:"⦿",Ofr:"𝔒",ofr:"𝔬",ogon:"˛",Ograve:"Ò",ograve:"ò",ogt:"⧁",ohbar:"⦵",ohm:"Ω",oint:"∮",olarr:"↺",olcir:"⦾",olcross:"⦻",oline:"‾",olt:"⧀",Omacr:"Ō",omacr:"ō",Omega:"Ω",omega:"ω",Omicron:"Ο",omicron:"ο",omid:"⦶",ominus:"⊖",Oopf:"𝕆",oopf:"𝕠",opar:"⦷",OpenCurlyDoubleQuote:"“",OpenCurlyQuote:"‘",operp:"⦹",oplus:"⊕",orarr:"↻",Or:"⩔",or:"∨",ord:"⩝",order:"ℴ",orderof:"ℴ",ordf:"ª",ordm:"º",origof:"⊶",oror:"⩖",orslope:"⩗",orv:"⩛",oS:"Ⓢ",Oscr:"𝒪",oscr:"ℴ",Oslash:"Ø",oslash:"ø",osol:"⊘",Otilde:"Õ",otilde:"õ",otimesas:"⨶",Otimes:"⨷",otimes:"⊗",Ouml:"Ö",ouml:"ö",ovbar:"⌽",OverBar:"‾",OverBrace:"⏞",OverBracket:"⎴",OverParenthesis:"⏜",para:"¶",parallel:"∥",par:"∥",parsim:"⫳",parsl:"⫽",part:"∂",PartialD:"∂",Pcy:"П",pcy:"п",percnt:"%",period:".",permil:"‰",perp:"⊥",pertenk:"‱",Pfr:"𝔓",pfr:"𝔭",Phi:"Φ",phi:"φ",phiv:"ϕ",phmmat:"ℳ",phone:"☎",Pi:"Π",pi:"π",pitchfork:"⋔",piv:"ϖ",planck:"ℏ",planckh:"ℎ",plankv:"ℏ",plusacir:"⨣",plusb:"⊞",pluscir:"⨢",plus:"+",plusdo:"∔",plusdu:"⨥",pluse:"⩲",PlusMinus:"±",plusmn:"±",plussim:"⨦",plustwo:"⨧",pm:"±",Poincareplane:"ℌ",pointint:"⨕",popf:"𝕡",Popf:"ℙ",pound:"£",prap:"⪷",Pr:"⪻",pr:"≺",prcue:"≼",precapprox:"⪷",prec:"≺",preccurlyeq:"≼",Precedes:"≺",PrecedesEqual:"⪯",PrecedesSlantEqual:"≼",PrecedesTilde:"≾",preceq:"⪯",precnapprox:"⪹",precneqq:"⪵",precnsim:"⋨",pre:"⪯",prE:"⪳",precsim:"≾",prime:"′",Prime:"″",primes:"ℙ",prnap:"⪹",prnE:"⪵",prnsim:"⋨",prod:"∏",Product:"∏",profalar:"⌮",profline:"⌒",profsurf:"⌓",prop:"∝",Proportional:"∝",Proportion:"∷",propto:"∝",prsim:"≾",prurel:"⊰",Pscr:"𝒫",pscr:"𝓅",Psi:"Ψ",psi:"ψ",puncsp:" ",Qfr:"𝔔",qfr:"𝔮",qint:"⨌",qopf:"𝕢",Qopf:"ℚ",qprime:"⁗",Qscr:"𝒬",qscr:"𝓆",quaternions:"ℍ",quatint:"⨖",quest:"?",questeq:"≟",quot:'"',QUOT:'"',rAarr:"⇛",race:"∽̱",Racute:"Ŕ",racute:"ŕ",radic:"√",raemptyv:"⦳",rang:"⟩",Rang:"⟫",rangd:"⦒",range:"⦥",rangle:"⟩",raquo:"»",rarrap:"⥵",rarrb:"⇥",rarrbfs:"⤠",rarrc:"⤳",rarr:"→",Rarr:"↠",rArr:"⇒",rarrfs:"⤞",rarrhk:"↪",rarrlp:"↬",rarrpl:"⥅",rarrsim:"⥴",Rarrtl:"⤖",rarrtl:"↣",rarrw:"↝",ratail:"⤚",rAtail:"⤜",ratio:"∶",rationals:"ℚ",rbarr:"⤍",rBarr:"⤏",RBarr:"⤐",rbbrk:"❳",rbrace:"}",rbrack:"]",rbrke:"⦌",rbrksld:"⦎",rbrkslu:"⦐",Rcaron:"Ř",rcaron:"ř",Rcedil:"Ŗ",rcedil:"ŗ",rceil:"⌉",rcub:"}",Rcy:"Р",rcy:"р",rdca:"⤷",rdldhar:"⥩",rdquo:"”",rdquor:"”",rdsh:"↳",real:"ℜ",realine:"ℛ",realpart:"ℜ",reals:"ℝ",Re:"ℜ",rect:"▭",reg:"®",REG:"®",ReverseElement:"∋",ReverseEquilibrium:"⇋",ReverseUpEquilibrium:"⥯",rfisht:"⥽",rfloor:"⌋",rfr:"𝔯",Rfr:"ℜ",rHar:"⥤",rhard:"⇁",rharu:"⇀",rharul:"⥬",Rho:"Ρ",rho:"ρ",rhov:"ϱ",RightAngleBracket:"⟩",RightArrowBar:"⇥",rightarrow:"→",RightArrow:"→",Rightarrow:"⇒",RightArrowLeftArrow:"⇄",rightarrowtail:"↣",RightCeiling:"⌉",RightDoubleBracket:"⟧",RightDownTeeVector:"⥝",RightDownVectorBar:"⥕",RightDownVector:"⇂",RightFloor:"⌋",rightharpoondown:"⇁",rightharpoonup:"⇀",rightleftarrows:"⇄",rightleftharpoons:"⇌",rightrightarrows:"⇉",rightsquigarrow:"↝",RightTeeArrow:"↦",RightTee:"⊢",RightTeeVector:"⥛",rightthreetimes:"⋌",RightTriangleBar:"⧐",RightTriangle:"⊳",RightTriangleEqual:"⊵",RightUpDownVector:"⥏",RightUpTeeVector:"⥜",RightUpVectorBar:"⥔",RightUpVector:"↾",RightVectorBar:"⥓",RightVector:"⇀",ring:"˚",risingdotseq:"≓",rlarr:"⇄",rlhar:"⇌",rlm:"‏",rmoustache:"⎱",rmoust:"⎱",rnmid:"⫮",roang:"⟭",roarr:"⇾",robrk:"⟧",ropar:"⦆",ropf:"𝕣",Ropf:"ℝ",roplus:"⨮",rotimes:"⨵",RoundImplies:"⥰",rpar:")",rpargt:"⦔",rppolint:"⨒",rrarr:"⇉",Rrightarrow:"⇛",rsaquo:"›",rscr:"𝓇",Rscr:"ℛ",rsh:"↱",Rsh:"↱",rsqb:"]",rsquo:"’",rsquor:"’",rthree:"⋌",rtimes:"⋊",rtri:"▹",rtrie:"⊵",rtrif:"▸",rtriltri:"⧎",RuleDelayed:"⧴",ruluhar:"⥨",rx:"℞",Sacute:"Ś",sacute:"ś",sbquo:"‚",scap:"⪸",Scaron:"Š",scaron:"š",Sc:"⪼",sc:"≻",sccue:"≽",sce:"⪰",scE:"⪴",Scedil:"Ş",scedil:"ş",Scirc:"Ŝ",scirc:"ŝ",scnap:"⪺",scnE:"⪶",scnsim:"⋩",scpolint:"⨓",scsim:"≿",Scy:"С",scy:"с",sdotb:"⊡",sdot:"⋅",sdote:"⩦",searhk:"⤥",searr:"↘",seArr:"⇘",searrow:"↘",sect:"§",semi:";",seswar:"⤩",setminus:"∖",setmn:"∖",sext:"✶",Sfr:"𝔖",sfr:"𝔰",sfrown:"⌢",sharp:"♯",SHCHcy:"Щ",shchcy:"щ",SHcy:"Ш",shcy:"ш",ShortDownArrow:"↓",ShortLeftArrow:"←",shortmid:"∣",shortparallel:"∥",ShortRightArrow:"→",ShortUpArrow:"↑",shy:"­",Sigma:"Σ",sigma:"σ",sigmaf:"ς",sigmav:"ς",sim:"∼",simdot:"⩪",sime:"≃",simeq:"≃",simg:"⪞",simgE:"⪠",siml:"⪝",simlE:"⪟",simne:"≆",simplus:"⨤",simrarr:"⥲",slarr:"←",SmallCircle:"∘",smallsetminus:"∖",smashp:"⨳",smeparsl:"⧤",smid:"∣",smile:"⌣",smt:"⪪",smte:"⪬",smtes:"⪬︀",SOFTcy:"Ь",softcy:"ь",solbar:"⌿",solb:"⧄",sol:"/",Sopf:"𝕊",sopf:"𝕤",spades:"♠",spadesuit:"♠",spar:"∥",sqcap:"⊓",sqcaps:"⊓︀",sqcup:"⊔",sqcups:"⊔︀",Sqrt:"√",sqsub:"⊏",sqsube:"⊑",sqsubset:"⊏",sqsubseteq:"⊑",sqsup:"⊐",sqsupe:"⊒",sqsupset:"⊐",sqsupseteq:"⊒",square:"□",Square:"□",SquareIntersection:"⊓",SquareSubset:"⊏",SquareSubsetEqual:"⊑",SquareSuperset:"⊐",SquareSupersetEqual:"⊒",SquareUnion:"⊔",squarf:"▪",squ:"□",squf:"▪",srarr:"→",Sscr:"𝒮",sscr:"𝓈",ssetmn:"∖",ssmile:"⌣",sstarf:"⋆",Star:"⋆",star:"☆",starf:"★",straightepsilon:"ϵ",straightphi:"ϕ",strns:"¯",sub:"⊂",Sub:"⋐",subdot:"⪽",subE:"⫅",sube:"⊆",subedot:"⫃",submult:"⫁",subnE:"⫋",subne:"⊊",subplus:"⪿",subrarr:"⥹",subset:"⊂",Subset:"⋐",subseteq:"⊆",subseteqq:"⫅",SubsetEqual:"⊆",subsetneq:"⊊",subsetneqq:"⫋",subsim:"⫇",subsub:"⫕",subsup:"⫓",succapprox:"⪸",succ:"≻",succcurlyeq:"≽",Succeeds:"≻",SucceedsEqual:"⪰",SucceedsSlantEqual:"≽",SucceedsTilde:"≿",succeq:"⪰",succnapprox:"⪺",succneqq:"⪶",succnsim:"⋩",succsim:"≿",SuchThat:"∋",sum:"∑",Sum:"∑",sung:"♪",sup1:"¹",sup2:"²",sup3:"³",sup:"⊃",Sup:"⋑",supdot:"⪾",supdsub:"⫘",supE:"⫆",supe:"⊇",supedot:"⫄",Superset:"⊃",SupersetEqual:"⊇",suphsol:"⟉",suphsub:"⫗",suplarr:"⥻",supmult:"⫂",supnE:"⫌",supne:"⊋",supplus:"⫀",supset:"⊃",Supset:"⋑",supseteq:"⊇",supseteqq:"⫆",supsetneq:"⊋",supsetneqq:"⫌",supsim:"⫈",supsub:"⫔",supsup:"⫖",swarhk:"⤦",swarr:"↙",swArr:"⇙",swarrow:"↙",swnwar:"⤪",szlig:"ß",Tab:"\t",target:"⌖",Tau:"Τ",tau:"τ",tbrk:"⎴",Tcaron:"Ť",tcaron:"ť",Tcedil:"Ţ",tcedil:"ţ",Tcy:"Т",tcy:"т",tdot:"⃛",telrec:"⌕",Tfr:"𝔗",tfr:"𝔱",there4:"∴",therefore:"∴",Therefore:"∴",Theta:"Θ",theta:"θ",thetasym:"ϑ",thetav:"ϑ",thickapprox:"≈",thicksim:"∼",ThickSpace:"  ",ThinSpace:" ",thinsp:" ",thkap:"≈",thksim:"∼",THORN:"Þ",thorn:"þ",tilde:"˜",Tilde:"∼",TildeEqual:"≃",TildeFullEqual:"≅",TildeTilde:"≈",timesbar:"⨱",timesb:"⊠",times:"×",timesd:"⨰",tint:"∭",toea:"⤨",topbot:"⌶",topcir:"⫱",top:"⊤",Topf:"𝕋",topf:"𝕥",topfork:"⫚",tosa:"⤩",tprime:"‴",trade:"™",TRADE:"™",triangle:"▵",triangledown:"▿",triangleleft:"◃",trianglelefteq:"⊴",triangleq:"≜",triangleright:"▹",trianglerighteq:"⊵",tridot:"◬",trie:"≜",triminus:"⨺",TripleDot:"⃛",triplus:"⨹",trisb:"⧍",tritime:"⨻",trpezium:"⏢",Tscr:"𝒯",tscr:"𝓉",TScy:"Ц",tscy:"ц",TSHcy:"Ћ",tshcy:"ћ",Tstrok:"Ŧ",tstrok:"ŧ",twixt:"≬",twoheadleftarrow:"↞",twoheadrightarrow:"↠",Uacute:"Ú",uacute:"ú",uarr:"↑",Uarr:"↟",uArr:"⇑",Uarrocir:"⥉",Ubrcy:"Ў",ubrcy:"ў",Ubreve:"Ŭ",ubreve:"ŭ",Ucirc:"Û",ucirc:"û",Ucy:"У",ucy:"у",udarr:"⇅",Udblac:"Ű",udblac:"ű",udhar:"⥮",ufisht:"⥾",Ufr:"𝔘",ufr:"𝔲",Ugrave:"Ù",ugrave:"ù",uHar:"⥣",uharl:"↿",uharr:"↾",uhblk:"▀",ulcorn:"⌜",ulcorner:"⌜",ulcrop:"⌏",ultri:"◸",Umacr:"Ū",umacr:"ū",uml:"¨",UnderBar:"_",UnderBrace:"⏟",UnderBracket:"⎵",UnderParenthesis:"⏝",Union:"⋃",UnionPlus:"⊎",Uogon:"Ų",uogon:"ų",Uopf:"𝕌",uopf:"𝕦",UpArrowBar:"⤒",uparrow:"↑",UpArrow:"↑",Uparrow:"⇑",UpArrowDownArrow:"⇅",updownarrow:"↕",UpDownArrow:"↕",Updownarrow:"⇕",UpEquilibrium:"⥮",upharpoonleft:"↿",upharpoonright:"↾",uplus:"⊎",UpperLeftArrow:"↖",UpperRightArrow:"↗",upsi:"υ",Upsi:"ϒ",upsih:"ϒ",Upsilon:"Υ",upsilon:"υ",UpTeeArrow:"↥",UpTee:"⊥",upuparrows:"⇈",urcorn:"⌝",urcorner:"⌝",urcrop:"⌎",Uring:"Ů",uring:"ů",urtri:"◹",Uscr:"𝒰",uscr:"𝓊",utdot:"⋰",Utilde:"Ũ",utilde:"ũ",utri:"▵",utrif:"▴",uuarr:"⇈",Uuml:"Ü",uuml:"ü",uwangle:"⦧",vangrt:"⦜",varepsilon:"ϵ",varkappa:"ϰ",varnothing:"∅",varphi:"ϕ",varpi:"ϖ",varpropto:"∝",varr:"↕",vArr:"⇕",varrho:"ϱ",varsigma:"ς",varsubsetneq:"⊊︀",varsubsetneqq:"⫋︀",varsupsetneq:"⊋︀",varsupsetneqq:"⫌︀",vartheta:"ϑ",vartriangleleft:"⊲",vartriangleright:"⊳",vBar:"⫨",Vbar:"⫫",vBarv:"⫩",Vcy:"В",vcy:"в",vdash:"⊢",vDash:"⊨",Vdash:"⊩",VDash:"⊫",Vdashl:"⫦",veebar:"⊻",vee:"∨",Vee:"⋁",veeeq:"≚",vellip:"⋮",verbar:"|",Verbar:"‖",vert:"|",Vert:"‖",VerticalBar:"∣",VerticalLine:"|",VerticalSeparator:"❘",VerticalTilde:"≀",VeryThinSpace:" ",Vfr:"𝔙",vfr:"𝔳",vltri:"⊲",vnsub:"⊂⃒",vnsup:"⊃⃒",Vopf:"𝕍",vopf:"𝕧",vprop:"∝",vrtri:"⊳",Vscr:"𝒱",vscr:"𝓋",vsubnE:"⫋︀",vsubne:"⊊︀",vsupnE:"⫌︀",vsupne:"⊋︀",Vvdash:"⊪",vzigzag:"⦚",Wcirc:"Ŵ",wcirc:"ŵ",wedbar:"⩟",wedge:"∧",Wedge:"⋀",wedgeq:"≙",weierp:"℘",Wfr:"𝔚",wfr:"𝔴",Wopf:"𝕎",wopf:"𝕨",wp:"℘",wr:"≀",wreath:"≀",Wscr:"𝒲",wscr:"𝓌",xcap:"⋂",xcirc:"◯",xcup:"⋃",xdtri:"▽",Xfr:"𝔛",xfr:"𝔵",xharr:"⟷",xhArr:"⟺",Xi:"Ξ",xi:"ξ",xlarr:"⟵",xlArr:"⟸",xmap:"⟼",xnis:"⋻",xodot:"⨀",Xopf:"𝕏",xopf:"𝕩",xoplus:"⨁",xotime:"⨂",xrarr:"⟶",xrArr:"⟹",Xscr:"𝒳",xscr:"𝓍",xsqcup:"⨆",xuplus:"⨄",xutri:"△",xvee:"⋁",xwedge:"⋀",Yacute:"Ý",yacute:"ý",YAcy:"Я",yacy:"я",Ycirc:"Ŷ",ycirc:"ŷ",Ycy:"Ы",ycy:"ы",yen:"¥",Yfr:"𝔜",yfr:"𝔶",YIcy:"Ї",yicy:"ї",Yopf:"𝕐",yopf:"𝕪",Yscr:"𝒴",yscr:"𝓎",YUcy:"Ю",yucy:"ю",yuml:"ÿ",Yuml:"Ÿ",Zacute:"Ź",zacute:"ź",Zcaron:"Ž",zcaron:"ž",Zcy:"З",zcy:"з",Zdot:"Ż",zdot:"ż",zeetrf:"ℨ",ZeroWidthSpace:"​",Zeta:"Ζ",zeta:"ζ",zfr:"𝔷",Zfr:"ℨ",ZHcy:"Ж",zhcy:"ж",zigrarr:"⇝",zopf:"𝕫",Zopf:"ℤ",Zscr:"𝒵",zscr:"𝓏",zwj:"‍",zwnj:"‌"}},{}],26:[function(e,t,n){t.exports={Aacute:"Á",aacute:"á",Acirc:"Â",acirc:"â",acute:"´",AElig:"Æ",aelig:"æ",Agrave:"À",agrave:"à",amp:"&",AMP:"&",Aring:"Å",aring:"å",Atilde:"Ã",atilde:"ã",Auml:"Ä",auml:"ä",brvbar:"¦",Ccedil:"Ç",ccedil:"ç",cedil:"¸",cent:"¢",copy:"©",COPY:"©",curren:"¤",deg:"°",divide:"÷",Eacute:"É",eacute:"é",Ecirc:"Ê",ecirc:"ê",Egrave:"È",egrave:"è",ETH:"Ð",eth:"ð",Euml:"Ë",euml:"ë",frac12:"½",frac14:"¼",frac34:"¾",gt:">",GT:">",Iacute:"Í",iacute:"í",Icirc:"Î",icirc:"î",iexcl:"¡",Igrave:"Ì",igrave:"ì",iquest:"¿",Iuml:"Ï",iuml:"ï",laquo:"«",lt:"<",LT:"<",macr:"¯",micro:"µ",middot:"·",nbsp:" ",not:"¬",Ntilde:"Ñ",ntilde:"ñ",Oacute:"Ó",oacute:"ó",Ocirc:"Ô",ocirc:"ô",Ograve:"Ò",ograve:"ò",ordf:"ª",ordm:"º",Oslash:"Ø",oslash:"ø",Otilde:"Õ",otilde:"õ",Ouml:"Ö",ouml:"ö",para:"¶",plusmn:"±",pound:"£",quot:'"',QUOT:'"',raquo:"»",reg:"®",REG:"®",sect:"§",shy:"­",sup1:"¹",sup2:"²",sup3:"³",szlig:"ß",THORN:"Þ",thorn:"þ",times:"×",Uacute:"Ú",uacute:"ú",Ucirc:"Û",ucirc:"û",Ugrave:"Ù",ugrave:"ù",uml:"¨",Uuml:"Ü",uuml:"ü",Yacute:"Ý",yacute:"ý",yen:"¥",yuml:"ÿ"}},{}],27:[function(e,t,n){t.exports={amp:"&",apos:"'",gt:">",lt:"<",quot:'"'}},{}],28:[function(e,t,n){function r(){this._events=this._events||{},this._maxListeners=this._maxListeners||void 0}function i(e){return"function"==typeof e}function a(e){return"number"==typeof e}function o(e){return"object"==typeof e&&null!==e}function s(e){return void 0===e}t.exports=r,r.EventEmitter=r,r.prototype._events=void 0,r.prototype._maxListeners=void 0,r.defaultMaxListeners=10,r.prototype.setMaxListeners=function(e){if(!a(e)||e<0||isNaN(e))throw TypeError("n must be a positive number");return this._maxListeners=e,this},r.prototype.emit=function(e){var t,n,r,a,l,u;if(this._events||(this._events={}),"error"===e&&(!this._events.error||o(this._events.error)&&!this._events.error.length)){if(t=arguments[1],t instanceof Error)throw t;var c=new Error('Uncaught, unspecified "error" event. ('+t+")");throw c.context=t,c}if(n=this._events[e],s(n))return!1;if(i(n))switch(arguments.length){case 1:n.call(this);break;case 2:n.call(this,arguments[1]);break;case 3:n.call(this,arguments[1],arguments[2]);break;default:a=Array.prototype.slice.call(arguments,1),n.apply(this,a)}else if(o(n))for(a=Array.prototype.slice.call(arguments,1),u=n.slice(),r=u.length,l=0;l<r;l++)u[l].apply(this,a);return!0},r.prototype.addListener=function(e,t){var n;if(!i(t))throw TypeError("listener must be a function");return this._events||(this._events={}),this._events.newListener&&this.emit("newListener",e,i(t.listener)?t.listener:t),this._events[e]?o(this._events[e])?this._events[e].push(t):this._events[e]=[this._events[e],t]:this._events[e]=t,o(this._events[e])&&!this._events[e].warned&&(n=s(this._maxListeners)?r.defaultMaxListeners:this._maxListeners,n&&n>0&&this._events[e].length>n&&(this._events[e].warned=!0,console.error("(node) warning: possible EventEmitter memory leak detected. %d listeners added. Use emitter.setMaxListeners() to increase limit.",this._events[e].length),"function"==typeof console.trace&&console.trace())),this},r.prototype.on=r.prototype.addListener,r.prototype.once=function(e,t){function n(){this.removeListener(e,n),r||(r=!0,t.apply(this,arguments))}if(!i(t))throw TypeError("listener must be a function");var r=!1;return n.listener=t,this.on(e,n),this},r.prototype.removeListener=function(e,t){var n,r,a,s;if(!i(t))throw TypeError("listener must be a function");if(!this._events||!this._events[e])return this;if(n=this._events[e],a=n.length,r=-1,n===t||i(n.listener)&&n.listener===t)delete this._events[e],this._events.removeListener&&this.emit("removeListener",e,t);else if(o(n)){for(s=a;s-- >0;)if(n[s]===t||n[s].listener&&n[s].listener===t){r=s;break}if(r<0)return this;1===n.length?(n.length=0,delete this._events[e]):n.splice(r,1),this._events.removeListener&&this.emit("removeListener",e,t)}return this},r.prototype.removeAllListeners=function(e){var t,n;if(!this._events)return this;if(!this._events.removeListener)return 0===arguments.length?this._events={}:this._events[e]&&delete this._events[e],this;if(0===arguments.length){for(t in this._events)"removeListener"!==t&&this.removeAllListeners(t);return this.removeAllListeners("removeListener"),this._events={},this}if(n=this._events[e],i(n))this.removeListener(e,n);else if(n)for(;n.length;)this.removeListener(e,n[n.length-1]);return delete this._events[e],this},r.prototype.listeners=function(e){var t;return t=this._events&&this._events[e]?i(this._events[e])?[this._events[e]]:this._events[e].slice():[]},r.prototype.listenerCount=function(e){if(this._events){var t=this._events[e];if(i(t))return 1;if(t)return t.length}return 0},r.listenerCount=function(e,t){return e.listenerCount(t)}},{}],29:[function(e,t,n){function r(e){this._cbs=e||{},this.events=[]}t.exports=r;var i=e("./").EVENTS;Object.keys(i).forEach(function(e){if(0===i[e])e="on"+e,r.prototype[e]=function(){this.events.push([e]),this._cbs[e]&&this._cbs[e]()};else if(1===i[e])e="on"+e,r.prototype[e]=function(t){this.events.push([e,t]),this._cbs[e]&&this._cbs[e](t)};else{if(2!==i[e])throw Error("wrong number of arguments");e="on"+e,r.prototype[e]=function(t,n){this.events.push([e,t,n]),this._cbs[e]&&this._cbs[e](t,n)}}}),r.prototype.onreset=function(){this.events=[],this._cbs.onreset&&this._cbs.onreset()},r.prototype.restart=function(){this._cbs.onreset&&this._cbs.onreset();for(var e=0,t=this.events.length;e<t;e++)if(this._cbs[this.events[e][0]]){var n=this.events[e].length;1===n?this._cbs[this.events[e][0]]():2===n?this._cbs[this.events[e][0]](this.events[e][1]):this._cbs[this.events[e][0]](this.events[e][1],this.events[e][2])}}},{"./":36}],30:[function(e,t,n){function r(e,t){this.init(e,t)}function i(e,t){return c.getElementsByTagName(e,t,!0)}function a(e,t){return c.getElementsByTagName(e,t,!0,1)[0]}function o(e,t,n){return c.getText(c.getElementsByTagName(e,t,n,1)).trim()}function s(e,t,n,r,i){var a=o(n,r,i);a&&(e[t]=a)}var l=e("./index.js"),u=l.DomHandler,c=l.DomUtils;e("inherits")(r,u),r.prototype.init=u;var p=function(e){return"rss"===e||"feed"===e||"rdf:RDF"===e};r.prototype.onend=function(){var e,t,n={},r=a(p,this.dom);r&&("feed"===r.name?(t=r.children,n.type="atom",s(n,"id","id",t),s(n,"title","title",t),(e=a("link",t))&&(e=e.attribs)&&(e=e.href)&&(n.link=e),s(n,"description","subtitle",t),(e=o("updated",t))&&(n.updated=new Date(e)),s(n,"author","email",t,!0),n.items=i("entry",t).map(function(e){var t,n={};return e=e.children,s(n,"id","id",e),s(n,"title","title",e),(t=a("link",e))&&(t=t.attribs)&&(t=t.href)&&(n.link=t),(t=o("summary",e)||o("content",e))&&(n.description=t),(t=o("updated",e))&&(n.pubDate=new Date(t)),n})):(t=a("channel",r.children).children,n.type=r.name.substr(0,3),n.id="",s(n,"title","title",t),s(n,"link","link",t),s(n,"description","description",t),(e=o("lastBuildDate",t))&&(n.updated=new Date(e)),s(n,"author","managingEditor",t,!0),n.items=i("item",r.children).map(function(e){var t,n={};return e=e.children,s(n,"id","guid",e),s(n,"title","title",e),s(n,"link","link",e),s(n,"description","description",e),(t=o("pubDate",e))&&(n.pubDate=new Date(t)),n}))),this.dom=n,u.prototype._handleCallback.call(this,r?null:Error("couldn't find root of feed"))},t.exports=r},{"./index.js":36,inherits:38}],31:[function(e,t,n){function r(e,t){this._options=t||{},this._cbs=e||{},this._tagname="",this._attribname="",this._attribvalue="",this._attribs=null,this._stack=[],this.startIndex=0,this.endIndex=null,this._lowerCaseTagNames="lowerCaseTags"in this._options?!!this._options.lowerCaseTags:!this._options.xmlMode,this._lowerCaseAttributeNames="lowerCaseAttributeNames"in this._options?!!this._options.lowerCaseAttributeNames:!this._options.xmlMode,this._options.Tokenizer&&(i=this._options.Tokenizer),this._tokenizer=new i(this._options,this),this._cbs.onparserinit&&this._cbs.onparserinit(this)}var i=e("./Tokenizer.js"),a={input:!0,option:!0,optgroup:!0,select:!0,button:!0,datalist:!0,textarea:!0},o={tr:{tr:!0,th:!0,td:!0},th:{th:!0},td:{thead:!0,th:!0,td:!0},body:{head:!0,link:!0,script:!0},li:{li:!0},p:{p:!0},h1:{p:!0},h2:{p:!0},h3:{p:!0},h4:{p:!0},h5:{p:!0},h6:{p:!0},select:a,input:a,output:a,button:a,datalist:a,textarea:a,option:{option:!0},optgroup:{optgroup:!0}},s={__proto__:null,area:!0,base:!0,basefont:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,isindex:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,path:!0,circle:!0,ellipse:!0,line:!0,rect:!0,use:!0,stop:!0,polyline:!0,polygon:!0},l=/\s|\//;e("inherits")(r,e("events").EventEmitter),r.prototype._updatePosition=function(e){null===this.endIndex?this._tokenizer._sectionStart<=e?this.startIndex=0:this.startIndex=this._tokenizer._sectionStart-e:this.startIndex=this.endIndex+1,this.endIndex=this._tokenizer.getAbsoluteIndex()},r.prototype.ontext=function(e){this._updatePosition(1),this.endIndex--,this._cbs.ontext&&this._cbs.ontext(e)},r.prototype.onopentagname=function(e){if(this._lowerCaseTagNames&&(e=e.toLowerCase()),this._tagname=e,!this._options.xmlMode&&e in o)for(var t;(t=this._stack[this._stack.length-1])in o[e];this.onclosetag(t));!this._options.xmlMode&&e in s||this._stack.push(e),this._cbs.onopentagname&&this._cbs.onopentagname(e),this._cbs.onopentag&&(this._attribs={})},r.prototype.onopentagend=function(){this._updatePosition(1),this._attribs&&(this._cbs.onopentag&&this._cbs.onopentag(this._tagname,this._attribs),this._attribs=null),!this._options.xmlMode&&this._cbs.onclosetag&&this._tagname in s&&this._cbs.onclosetag(this._tagname),this._tagname=""},r.prototype.onclosetag=function(e){if(this._updatePosition(1),this._lowerCaseTagNames&&(e=e.toLowerCase()),!this._stack.length||e in s&&!this._options.xmlMode)this._options.xmlMode||"br"!==e&&"p"!==e||(this.onopentagname(e),this._closeCurrentTag());else{var t=this._stack.lastIndexOf(e);if(t!==-1)if(this._cbs.onclosetag)for(t=this._stack.length-t;t--;)this._cbs.onclosetag(this._stack.pop());else this._stack.length=t;else"p"!==e||this._options.xmlMode||(this.onopentagname(e),this._closeCurrentTag())}},r.prototype.onselfclosingtag=function(){this._options.xmlMode||this._options.recognizeSelfClosing?this._closeCurrentTag():this.onopentagend()},r.prototype._closeCurrentTag=function(){var e=this._tagname;this.onopentagend(),this._stack[this._stack.length-1]===e&&(this._cbs.onclosetag&&this._cbs.onclosetag(e),this._stack.pop())},r.prototype.onattribname=function(e){this._lowerCaseAttributeNames&&(e=e.toLowerCase()),this._attribname=e},r.prototype.onattribdata=function(e){this._attribvalue+=e},r.prototype.onattribend=function(){this._cbs.onattribute&&this._cbs.onattribute(this._attribname,this._attribvalue),this._attribs&&!Object.prototype.hasOwnProperty.call(this._attribs,this._attribname)&&(this._attribs[this._attribname]=this._attribvalue),this._attribname="",this._attribvalue=""},r.prototype._getInstructionName=function(e){var t=e.search(l),n=t<0?e:e.substr(0,t);return this._lowerCaseTagNames&&(n=n.toLowerCase()),n},r.prototype.ondeclaration=function(e){if(this._cbs.onprocessinginstruction){var t=this._getInstructionName(e);this._cbs.onprocessinginstruction("!"+t,"!"+e)}},r.prototype.onprocessinginstruction=function(e){if(this._cbs.onprocessinginstruction){var t=this._getInstructionName(e);this._cbs.onprocessinginstruction("?"+t,"?"+e)}},r.prototype.oncomment=function(e){this._updatePosition(4),this._cbs.oncomment&&this._cbs.oncomment(e),this._cbs.oncommentend&&this._cbs.oncommentend()},r.prototype.oncdata=function(e){this._updatePosition(1),this._options.xmlMode||this._options.recognizeCDATA?(this._cbs.oncdatastart&&this._cbs.oncdatastart(),this._cbs.ontext&&this._cbs.ontext(e),this._cbs.oncdataend&&this._cbs.oncdataend()):this.oncomment("[CDATA["+e+"]]")},r.prototype.onerror=function(e){this._cbs.onerror&&this._cbs.onerror(e)},r.prototype.onend=function(){if(this._cbs.onclosetag)for(var e=this._stack.length;e>0;this._cbs.onclosetag(this._stack[--e]));this._cbs.onend&&this._cbs.onend()},r.prototype.reset=function(){this._cbs.onreset&&this._cbs.onreset(),this._tokenizer.reset(),this._tagname="",this._attribname="",this._attribs=null,this._stack=[],this._cbs.onparserinit&&this._cbs.onparserinit(this)},r.prototype.parseComplete=function(e){this.reset(),this.end(e)},r.prototype.write=function(e){this._tokenizer.write(e)},r.prototype.end=function(e){this._tokenizer.end(e)},r.prototype.pause=function(){this._tokenizer.pause()},r.prototype.resume=function(){this._tokenizer.resume()},r.prototype.parseChunk=r.prototype.write,r.prototype.done=r.prototype.end,t.exports=r},{"./Tokenizer.js":34,events:28,inherits:38}],32:[function(e,t,n){function r(e){this._cbs=e||{}}t.exports=r;var i=e("./").EVENTS;Object.keys(i).forEach(function(e){if(0===i[e])e="on"+e,r.prototype[e]=function(){this._cbs[e]&&this._cbs[e]()};else if(1===i[e])e="on"+e,r.prototype[e]=function(t){this._cbs[e]&&this._cbs[e](t)};else{if(2!==i[e])throw Error("wrong number of arguments");e="on"+e,r.prototype[e]=function(t,n){this._cbs[e]&&this._cbs[e](t,n)}}})},{"./":36}],33:[function(e,t,n){function r(e){a.call(this,new i(this),e)}function i(e){this.scope=e}t.exports=r;var a=e("./WritableStream.js");e("inherits")(r,a),r.prototype.readable=!0;var o=e("../").EVENTS;Object.keys(o).forEach(function(e){if(0===o[e])i.prototype["on"+e]=function(){this.scope.emit(e)};else if(1===o[e])i.prototype["on"+e]=function(t){this.scope.emit(e,t)};else{if(2!==o[e])throw Error("wrong number of arguments!");i.prototype["on"+e]=function(t,n){this.scope.emit(e,t,n)}}})},{"../":36,"./WritableStream.js":35,inherits:38}],34:[function(e,t,n){function r(e){return" "===e||"\n"===e||"\t"===e||"\f"===e||"\r"===e}function i(e,t){return function(n){n===e&&(this._state=t)}}function a(e,t,n){var r=e.toLowerCase();return e===r?function(e){e===r?this._state=t:(this._state=n,this._index--)}:function(i){i===r||i===e?this._state=t:(this._state=n,this._index--)}}function o(e,t){var n=e.toLowerCase();return function(r){r===n||r===e?this._state=t:(this._state=m,this._index--)}}function s(e,t){this._state=f,this._buffer="",this._sectionStart=0,this._index=0,this._bufferOffset=0,this._baseState=f,this._special=me,this._cbs=t,this._running=!0,this._ended=!1,this._xmlMode=!(!e||!e.xmlMode),this._decodeEntities=!(!e||!e.decodeEntities)}t.exports=s;var l=e("entities/lib/decode_codepoint.js"),u=e("entities/maps/entities.json"),c=e("entities/maps/legacy.json"),p=e("entities/maps/xml.json"),h=0,f=h++,d=h++,m=h++,g=h++,y=h++,v=h++,b=h++,w=h++,_=h++,x=h++,A=h++,S=h++,j=h++,E=h++,O=h++,k=h++,T=h++,C=h++,I=h++,D=h++,L=h++,M=h++,R=h++,U=h++,P=h++,q=h++,B=h++,z=h++,N=h++,$=h++,F=h++,V=h++,H=h++,Y=h++,J=h++,W=h++,Q=h++,G=h++,K=h++,X=h++,Z=h++,ee=h++,te=h++,ne=h++,re=h++,ie=h++,ae=h++,oe=h++,se=h++,le=h++,ue=h++,ce=h++,pe=h++,he=h++,fe=h++,de=0,me=de++,ge=de++,ye=de++;s.prototype._stateText=function(e){"<"===e?(this._index>this._sectionStart&&this._cbs.ontext(this._getSection()),this._state=d,this._sectionStart=this._index):this._decodeEntities&&this._special===me&&"&"===e&&(this._index>this._sectionStart&&this._cbs.ontext(this._getSection()),this._baseState=f,this._state=ue,this._sectionStart=this._index)},s.prototype._stateBeforeTagName=function(e){"/"===e?this._state=y:"<"===e?(this._cbs.ontext(this._getSection()),this._sectionStart=this._index):">"===e||this._special!==me||r(e)?this._state=f:"!"===e?(this._state=O,this._sectionStart=this._index+1):"?"===e?(this._state=T,this._sectionStart=this._index+1):(this._state=this._xmlMode||"s"!==e&&"S"!==e?m:F,this._sectionStart=this._index)},s.prototype._stateInTagName=function(e){("/"===e||">"===e||r(e))&&(this._emitToken("onopentagname"),this._state=w,this._index--)},s.prototype._stateBeforeCloseingTagName=function(e){r(e)||(">"===e?this._state=f:this._special!==me?"s"===e||"S"===e?this._state=V:(this._state=f,this._index--):(this._state=v,this._sectionStart=this._index))},s.prototype._stateInCloseingTagName=function(e){(">"===e||r(e))&&(this._emitToken("onclosetag"),this._state=b,this._index--)},s.prototype._stateAfterCloseingTagName=function(e){">"===e&&(this._state=f,this._sectionStart=this._index+1)},s.prototype._stateBeforeAttributeName=function(e){">"===e?(this._cbs.onopentagend(),this._state=f,this._sectionStart=this._index+1):"/"===e?this._state=g:r(e)||(this._state=_,this._sectionStart=this._index)},s.prototype._stateInSelfClosingTag=function(e){">"===e?(this._cbs.onselfclosingtag(),this._state=f,this._sectionStart=this._index+1):r(e)||(this._state=w,this._index--)},s.prototype._stateInAttributeName=function(e){("="===e||"/"===e||">"===e||r(e))&&(this._cbs.onattribname(this._getSection()),this._sectionStart=-1,this._state=x,this._index--)},s.prototype._stateAfterAttributeName=function(e){"="===e?this._state=A:"/"===e||">"===e?(this._cbs.onattribend(),this._state=w,this._index--):r(e)||(this._cbs.onattribend(),this._state=_,this._sectionStart=this._index)},s.prototype._stateBeforeAttributeValue=function(e){'"'===e?(this._state=S,this._sectionStart=this._index+1):"'"===e?(this._state=j,this._sectionStart=this._index+1):r(e)||(this._state=E,this._sectionStart=this._index,this._index--)},s.prototype._stateInAttributeValueDoubleQuotes=function(e){'"'===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=w):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},s.prototype._stateInAttributeValueSingleQuotes=function(e){"'"===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=w):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},s.prototype._stateInAttributeValueNoQuotes=function(e){r(e)||">"===e?(this._emitToken("onattribdata"),this._cbs.onattribend(),this._state=w,this._index--):this._decodeEntities&&"&"===e&&(this._emitToken("onattribdata"),this._baseState=this._state,this._state=ue,this._sectionStart=this._index)},s.prototype._stateBeforeDeclaration=function(e){this._state="["===e?M:"-"===e?C:k},s.prototype._stateInDeclaration=function(e){
+">"===e&&(this._cbs.ondeclaration(this._getSection()),this._state=f,this._sectionStart=this._index+1)},s.prototype._stateInProcessingInstruction=function(e){">"===e&&(this._cbs.onprocessinginstruction(this._getSection()),this._state=f,this._sectionStart=this._index+1)},s.prototype._stateBeforeComment=function(e){"-"===e?(this._state=I,this._sectionStart=this._index+1):this._state=k},s.prototype._stateInComment=function(e){"-"===e&&(this._state=D)},s.prototype._stateAfterComment1=function(e){"-"===e?this._state=L:this._state=I},s.prototype._stateAfterComment2=function(e){">"===e?(this._cbs.oncomment(this._buffer.substring(this._sectionStart,this._index-2)),this._state=f,this._sectionStart=this._index+1):"-"!==e&&(this._state=I)},s.prototype._stateBeforeCdata1=a("C",R,k),s.prototype._stateBeforeCdata2=a("D",U,k),s.prototype._stateBeforeCdata3=a("A",P,k),s.prototype._stateBeforeCdata4=a("T",q,k),s.prototype._stateBeforeCdata5=a("A",B,k),s.prototype._stateBeforeCdata6=function(e){"["===e?(this._state=z,this._sectionStart=this._index+1):(this._state=k,this._index--)},s.prototype._stateInCdata=function(e){"]"===e&&(this._state=N)},s.prototype._stateAfterCdata1=i("]",$),s.prototype._stateAfterCdata2=function(e){">"===e?(this._cbs.oncdata(this._buffer.substring(this._sectionStart,this._index-2)),this._state=f,this._sectionStart=this._index+1):"]"!==e&&(this._state=z)},s.prototype._stateBeforeSpecial=function(e){"c"===e||"C"===e?this._state=H:"t"===e||"T"===e?this._state=te:(this._state=m,this._index--)},s.prototype._stateBeforeSpecialEnd=function(e){this._special!==ge||"c"!==e&&"C"!==e?this._special!==ye||"t"!==e&&"T"!==e?this._state=f:this._state=ae:this._state=G},s.prototype._stateBeforeScript1=o("R",Y),s.prototype._stateBeforeScript2=o("I",J),s.prototype._stateBeforeScript3=o("P",W),s.prototype._stateBeforeScript4=o("T",Q),s.prototype._stateBeforeScript5=function(e){("/"===e||">"===e||r(e))&&(this._special=ge),this._state=m,this._index--},s.prototype._stateAfterScript1=a("R",K,f),s.prototype._stateAfterScript2=a("I",X,f),s.prototype._stateAfterScript3=a("P",Z,f),s.prototype._stateAfterScript4=a("T",ee,f),s.prototype._stateAfterScript5=function(e){">"===e||r(e)?(this._special=me,this._state=v,this._sectionStart=this._index-6,this._index--):this._state=f},s.prototype._stateBeforeStyle1=o("Y",ne),s.prototype._stateBeforeStyle2=o("L",re),s.prototype._stateBeforeStyle3=o("E",ie),s.prototype._stateBeforeStyle4=function(e){("/"===e||">"===e||r(e))&&(this._special=ye),this._state=m,this._index--},s.prototype._stateAfterStyle1=a("Y",oe,f),s.prototype._stateAfterStyle2=a("L",se,f),s.prototype._stateAfterStyle3=a("E",le,f),s.prototype._stateAfterStyle4=function(e){">"===e||r(e)?(this._special=me,this._state=v,this._sectionStart=this._index-5,this._index--):this._state=f},s.prototype._stateBeforeEntity=a("#",ce,pe),s.prototype._stateBeforeNumericEntity=a("X",fe,he),s.prototype._parseNamedEntityStrict=function(){if(this._sectionStart+1<this._index){var e=this._buffer.substring(this._sectionStart+1,this._index),t=this._xmlMode?p:u;t.hasOwnProperty(e)&&(this._emitPartial(t[e]),this._sectionStart=this._index+1)}},s.prototype._parseLegacyEntity=function(){var e=this._sectionStart+1,t=this._index-e;for(t>6&&(t=6);t>=2;){var n=this._buffer.substr(e,t);if(c.hasOwnProperty(n))return this._emitPartial(c[n]),void(this._sectionStart+=t+1);t--}},s.prototype._stateInNamedEntity=function(e){";"===e?(this._parseNamedEntityStrict(),this._sectionStart+1<this._index&&!this._xmlMode&&this._parseLegacyEntity(),this._state=this._baseState):(e<"a"||e>"z")&&(e<"A"||e>"Z")&&(e<"0"||e>"9")&&(this._xmlMode||this._sectionStart+1===this._index||(this._baseState!==f?"="!==e&&this._parseNamedEntityStrict():this._parseLegacyEntity()),this._state=this._baseState,this._index--)},s.prototype._decodeNumericEntity=function(e,t){var n=this._sectionStart+e;if(n!==this._index){var r=this._buffer.substring(n,this._index),i=parseInt(r,t);this._emitPartial(l(i)),this._sectionStart=this._index}else this._sectionStart--;this._state=this._baseState},s.prototype._stateInNumericEntity=function(e){";"===e?(this._decodeNumericEntity(2,10),this._sectionStart++):(e<"0"||e>"9")&&(this._xmlMode?this._state=this._baseState:this._decodeNumericEntity(2,10),this._index--)},s.prototype._stateInHexEntity=function(e){";"===e?(this._decodeNumericEntity(3,16),this._sectionStart++):(e<"a"||e>"f")&&(e<"A"||e>"F")&&(e<"0"||e>"9")&&(this._xmlMode?this._state=this._baseState:this._decodeNumericEntity(3,16),this._index--)},s.prototype._cleanup=function(){this._sectionStart<0?(this._buffer="",this._index=0,this._bufferOffset+=this._index):this._running&&(this._state===f?(this._sectionStart!==this._index&&this._cbs.ontext(this._buffer.substr(this._sectionStart)),this._buffer="",this._bufferOffset+=this._index,this._index=0):this._sectionStart===this._index?(this._buffer="",this._bufferOffset+=this._index,this._index=0):(this._buffer=this._buffer.substr(this._sectionStart),this._index-=this._sectionStart,this._bufferOffset+=this._sectionStart),this._sectionStart=0)},s.prototype.write=function(e){this._ended&&this._cbs.onerror(Error(".write() after done!")),this._buffer+=e,this._parse()},s.prototype._parse=function(){for(;this._index<this._buffer.length&&this._running;){var e=this._buffer.charAt(this._index);this._state===f?this._stateText(e):this._state===d?this._stateBeforeTagName(e):this._state===m?this._stateInTagName(e):this._state===y?this._stateBeforeCloseingTagName(e):this._state===v?this._stateInCloseingTagName(e):this._state===b?this._stateAfterCloseingTagName(e):this._state===g?this._stateInSelfClosingTag(e):this._state===w?this._stateBeforeAttributeName(e):this._state===_?this._stateInAttributeName(e):this._state===x?this._stateAfterAttributeName(e):this._state===A?this._stateBeforeAttributeValue(e):this._state===S?this._stateInAttributeValueDoubleQuotes(e):this._state===j?this._stateInAttributeValueSingleQuotes(e):this._state===E?this._stateInAttributeValueNoQuotes(e):this._state===O?this._stateBeforeDeclaration(e):this._state===k?this._stateInDeclaration(e):this._state===T?this._stateInProcessingInstruction(e):this._state===C?this._stateBeforeComment(e):this._state===I?this._stateInComment(e):this._state===D?this._stateAfterComment1(e):this._state===L?this._stateAfterComment2(e):this._state===M?this._stateBeforeCdata1(e):this._state===R?this._stateBeforeCdata2(e):this._state===U?this._stateBeforeCdata3(e):this._state===P?this._stateBeforeCdata4(e):this._state===q?this._stateBeforeCdata5(e):this._state===B?this._stateBeforeCdata6(e):this._state===z?this._stateInCdata(e):this._state===N?this._stateAfterCdata1(e):this._state===$?this._stateAfterCdata2(e):this._state===F?this._stateBeforeSpecial(e):this._state===V?this._stateBeforeSpecialEnd(e):this._state===H?this._stateBeforeScript1(e):this._state===Y?this._stateBeforeScript2(e):this._state===J?this._stateBeforeScript3(e):this._state===W?this._stateBeforeScript4(e):this._state===Q?this._stateBeforeScript5(e):this._state===G?this._stateAfterScript1(e):this._state===K?this._stateAfterScript2(e):this._state===X?this._stateAfterScript3(e):this._state===Z?this._stateAfterScript4(e):this._state===ee?this._stateAfterScript5(e):this._state===te?this._stateBeforeStyle1(e):this._state===ne?this._stateBeforeStyle2(e):this._state===re?this._stateBeforeStyle3(e):this._state===ie?this._stateBeforeStyle4(e):this._state===ae?this._stateAfterStyle1(e):this._state===oe?this._stateAfterStyle2(e):this._state===se?this._stateAfterStyle3(e):this._state===le?this._stateAfterStyle4(e):this._state===ue?this._stateBeforeEntity(e):this._state===ce?this._stateBeforeNumericEntity(e):this._state===pe?this._stateInNamedEntity(e):this._state===he?this._stateInNumericEntity(e):this._state===fe?this._stateInHexEntity(e):this._cbs.onerror(Error("unknown _state"),this._state),this._index++}this._cleanup()},s.prototype.pause=function(){this._running=!1},s.prototype.resume=function(){this._running=!0,this._index<this._buffer.length&&this._parse(),this._ended&&this._finish()},s.prototype.end=function(e){this._ended&&this._cbs.onerror(Error(".end() after done!")),e&&this.write(e),this._ended=!0,this._running&&this._finish()},s.prototype._finish=function(){this._sectionStart<this._index&&this._handleTrailingData(),this._cbs.onend()},s.prototype._handleTrailingData=function(){var e=this._buffer.substr(this._sectionStart);this._state===z||this._state===N||this._state===$?this._cbs.oncdata(e):this._state===I||this._state===D||this._state===L?this._cbs.oncomment(e):this._state!==pe||this._xmlMode?this._state!==he||this._xmlMode?this._state!==fe||this._xmlMode?this._state!==m&&this._state!==w&&this._state!==A&&this._state!==x&&this._state!==_&&this._state!==j&&this._state!==S&&this._state!==E&&this._state!==v&&this._cbs.ontext(e):(this._decodeNumericEntity(3,16),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData())):(this._decodeNumericEntity(2,10),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData())):(this._parseLegacyEntity(),this._sectionStart<this._index&&(this._state=this._baseState,this._handleTrailingData()))},s.prototype.reset=function(){s.call(this,{xmlMode:this._xmlMode,decodeEntities:this._decodeEntities},this._cbs)},s.prototype.getAbsoluteIndex=function(){return this._bufferOffset+this._index},s.prototype._getSection=function(){return this._buffer.substring(this._sectionStart,this._index)},s.prototype._emitToken=function(e){this._cbs[e](this._getSection()),this._sectionStart=-1},s.prototype._emitPartial=function(e){this._baseState!==f?this._cbs.onattribdata(e):this._cbs.ontext(e)}},{"entities/lib/decode_codepoint.js":22,"entities/maps/entities.json":25,"entities/maps/legacy.json":26,"entities/maps/xml.json":27}],35:[function(e,t,n){function r(e,t){var n=this._parser=new i(e,t),r=this._decoder=new o;a.call(this,{decodeStrings:!1}),this.once("finish",function(){n.end(r.end())})}t.exports=r;var i=e("./Parser.js"),a=e("stream").Writable||e("readable-stream").Writable,o=e("string_decoder").StringDecoder,s=e("buffer").Buffer;e("inherits")(r,a),a.prototype._write=function(e,t,n){e instanceof s&&(e=this._decoder.write(e)),this._parser.write(e),n()}},{"./Parser.js":31,buffer:5,inherits:38,"readable-stream":3,stream:55,string_decoder:56}],36:[function(e,t,n){function r(e,n){return delete t.exports[e],t.exports[e]=n,n}var i=e("./Parser.js"),a=e("domhandler");t.exports={Parser:i,Tokenizer:e("./Tokenizer.js"),ElementType:e("domelementtype"),DomHandler:a,get FeedHandler(){return r("FeedHandler",e("./FeedHandler.js"))},get Stream(){return r("Stream",e("./Stream.js"))},get WritableStream(){return r("WritableStream",e("./WritableStream.js"))},get ProxyHandler(){return r("ProxyHandler",e("./ProxyHandler.js"))},get DomUtils(){return r("DomUtils",e("domutils"))},get CollectingHandler(){return r("CollectingHandler",e("./CollectingHandler.js"))},DefaultHandler:a,get RssHandler(){return r("RssHandler",this.FeedHandler)},parseDOM:function(e,t){var n=new a(t);return new i(n,t).end(e),n.dom},parseFeed:function(e,n){var r=new t.exports.FeedHandler(n);return new i(r,n).end(e),r.dom},createDomStream:function(e,t,n){var r=new a(e,t,n);return new i(r,t)},EVENTS:{attribute:2,cdatastart:0,cdataend:0,text:1,processinginstruction:2,comment:1,commentend:0,closetag:1,opentag:2,opentagname:1,error:1,end:0}}},{"./CollectingHandler.js":29,"./FeedHandler.js":30,"./Parser.js":31,"./ProxyHandler.js":32,"./Stream.js":33,"./Tokenizer.js":34,"./WritableStream.js":35,domelementtype:9,domhandler:10,domutils:13}],37:[function(e,t,n){n.read=function(e,t,n,r,i){var a,o,s=8*i-r-1,l=(1<<s)-1,u=l>>1,c=-7,p=n?i-1:0,h=n?-1:1,f=e[t+p];for(p+=h,a=f&(1<<-c)-1,f>>=-c,c+=s;c>0;a=256*a+e[t+p],p+=h,c-=8);for(o=a&(1<<-c)-1,a>>=-c,c+=r;c>0;o=256*o+e[t+p],p+=h,c-=8);if(0===a)a=1-u;else{if(a===l)return o?NaN:(f?-1:1)*(1/0);o+=Math.pow(2,r),a-=u}return(f?-1:1)*o*Math.pow(2,a-r)},n.write=function(e,t,n,r,i,a){var o,s,l,u=8*a-i-1,c=(1<<u)-1,p=c>>1,h=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,f=r?0:a-1,d=r?1:-1,m=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(s=isNaN(t)?1:0,o=c):(o=Math.floor(Math.log(t)/Math.LN2),t*(l=Math.pow(2,-o))<1&&(o--,l*=2),t+=o+p>=1?h/l:h*Math.pow(2,1-p),t*l>=2&&(o++,l/=2),o+p>=c?(s=0,o=c):o+p>=1?(s=(t*l-1)*Math.pow(2,i),o+=p):(s=t*Math.pow(2,p-1)*Math.pow(2,i),o=0));i>=8;e[n+f]=255&s,f+=d,s/=256,i-=8);for(o=o<<i|s,u+=i;u>0;e[n+f]=255&o,f+=d,o/=256,u-=8);e[n+f-d]|=128*m}},{}],38:[function(e,t,n){"function"==typeof Object.create?t.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:t.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},{}],39:[function(e,t,n){function r(e){return!!e.constructor&&"function"==typeof e.constructor.isBuffer&&e.constructor.isBuffer(e)}function i(e){return"function"==typeof e.readFloatLE&&"function"==typeof e.slice&&r(e.slice(0,0))}t.exports=function(e){return null!=e&&(r(e)||i(e)||!!e._isBuffer)}},{}],40:[function(e,t,n){var r={}.toString;t.exports=Array.isArray||function(e){return"[object Array]"==r.call(e)}},{}],41:[function(e,t,n){(function(e){"use strict";function n(t,n,r,i){if("function"!=typeof t)throw new TypeError('"callback" argument must be a function');var a,o,s=arguments.length;switch(s){case 0:case 1:return e.nextTick(t);case 2:return e.nextTick(function(){t.call(null,n)});case 3:return e.nextTick(function(){t.call(null,n,r)});case 4:return e.nextTick(function(){t.call(null,n,r,i)});default:for(a=new Array(s-1),o=0;o<a.length;)a[o++]=arguments[o];return e.nextTick(function(){t.apply(null,a)})}}!e.version||0===e.version.indexOf("v0.")||0===e.version.indexOf("v1.")&&0!==e.version.indexOf("v1.8.")?t.exports=n:t.exports=e.nextTick}).call(this,e("_process"))},{_process:42}],42:[function(e,t,n){function r(){throw new Error("setTimeout has not been defined")}function i(){throw new Error("clearTimeout has not been defined")}function a(e){if(p===setTimeout)return setTimeout(e,0);if((p===r||!p)&&setTimeout)return p=setTimeout,setTimeout(e,0);try{return p(e,0)}catch(t){try{return p.call(null,e,0)}catch(t){return p.call(this,e,0)}}}function o(e){if(h===clearTimeout)return clearTimeout(e);if((h===i||!h)&&clearTimeout)return h=clearTimeout,clearTimeout(e);try{return h(e)}catch(t){try{return h.call(null,e)}catch(t){return h.call(this,e)}}}function s(){g&&d&&(g=!1,d.length?m=d.concat(m):y=-1,m.length&&l())}function l(){if(!g){var e=a(s);g=!0;for(var t=m.length;t;){for(d=m,m=[];++y<t;)d&&d[y].run();y=-1,t=m.length}d=null,g=!1,o(e)}}function u(e,t){this.fun=e,this.array=t}function c(){}var p,h,f=t.exports={};!function(){try{p="function"==typeof setTimeout?setTimeout:r}catch(e){p=r}try{h="function"==typeof clearTimeout?clearTimeout:i}catch(e){h=i}}();var d,m=[],g=!1,y=-1;f.nextTick=function(e){var t=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];m.push(new u(e,t)),1!==m.length||g||a(l)},u.prototype.run=function(){this.fun.apply(null,this.array)},f.title="browser",f.browser=!0,f.env={},f.argv=[],f.version="",f.versions={},f.on=c,f.addListener=c,f.once=c,f.off=c,f.removeListener=c,f.removeAllListeners=c,f.emit=c,f.binding=function(e){throw new Error("process.binding is not supported")},f.cwd=function(){return"/"},f.chdir=function(e){throw new Error("process.chdir is not supported")},f.umask=function(){return 0}},{}],43:[function(e,t,n){t.exports=e("./lib/_stream_duplex.js")},{"./lib/_stream_duplex.js":44}],44:[function(e,t,n){"use strict";function r(e){return this instanceof r?(u.call(this,e),c.call(this,e),e&&e.readable===!1&&(this.readable=!1),e&&e.writable===!1&&(this.writable=!1),this.allowHalfOpen=!0,e&&e.allowHalfOpen===!1&&(this.allowHalfOpen=!1),void this.once("end",i)):new r(e)}function i(){this.allowHalfOpen||this._writableState.ended||s(a,this)}function a(e){e.end()}var o=Object.keys||function(e){var t=[];for(var n in e)t.push(n);return t};t.exports=r;var s=e("process-nextick-args"),l=e("core-util-is");l.inherits=e("inherits");var u=e("./_stream_readable"),c=e("./_stream_writable");l.inherits(r,u);for(var p=o(c.prototype),h=0;h<p.length;h++){var f=p[h];r.prototype[f]||(r.prototype[f]=c.prototype[f])}},{"./_stream_readable":46,"./_stream_writable":48,"core-util-is":6,inherits:38,"process-nextick-args":41}],45:[function(e,t,n){"use strict";function r(e){return this instanceof r?void i.call(this,e):new r(e)}t.exports=r;var i=e("./_stream_transform"),a=e("core-util-is");a.inherits=e("inherits"),a.inherits(r,i),r.prototype._transform=function(e,t,n){n(null,e)}},{"./_stream_transform":47,"core-util-is":6,inherits:38}],46:[function(e,t,n){(function(n){"use strict";function r(e,t,n){return"function"==typeof e.prependListener?e.prependListener(t,n):void(e._events&&e._events[t]?C(e._events[t])?e._events[t].unshift(n):e._events[t]=[n,e._events[t]]:e.on(t,n))}function i(t,n){z=z||e("./_stream_duplex"),t=t||{},this.objectMode=!!t.objectMode,n instanceof z&&(this.objectMode=this.objectMode||!!t.readableObjectMode);var r=t.highWaterMark,i=this.objectMode?16:16384;this.highWaterMark=r||0===r?r:i,this.highWaterMark=~~this.highWaterMark,this.buffer=new B,this.length=0,this.pipes=null,this.pipesCount=0,this.flowing=null,this.ended=!1,this.endEmitted=!1,this.reading=!1,this.sync=!0,this.needReadable=!1,this.emittedReadable=!1,this.readableListening=!1,this.resumeScheduled=!1,this.defaultEncoding=t.defaultEncoding||"utf8",this.ranOut=!1,this.awaitDrain=0,this.readingMore=!1,this.decoder=null,this.encoding=null,t.encoding&&(q||(q=e("string_decoder/").StringDecoder),this.decoder=new q(t.encoding),this.encoding=t.encoding)}function a(t){return z=z||e("./_stream_duplex"),this instanceof a?(this._readableState=new i(t,this),this.readable=!0,t&&"function"==typeof t.read&&(this._read=t.read),void I.call(this)):new a(t)}function o(e,t,n,r,i){var a=c(t,n);if(a)e.emit("error",a);else if(null===n)t.reading=!1,p(e,t);else if(t.objectMode||n&&n.length>0)if(t.ended&&!i){var o=new Error("stream.push() after EOF");e.emit("error",o)}else if(t.endEmitted&&i){var l=new Error("stream.unshift() after end event");e.emit("error",l)}else{var u;!t.decoder||i||r||(n=t.decoder.write(n),u=!t.objectMode&&0===n.length),i||(t.reading=!1),u||(t.flowing&&0===t.length&&!t.sync?(e.emit("data",n),e.read(0)):(t.length+=t.objectMode?1:n.length,i?t.buffer.unshift(n):t.buffer.push(n),t.needReadable&&h(e))),d(e,t)}else i||(t.reading=!1);return s(t)}function s(e){return!e.ended&&(e.needReadable||e.length<e.highWaterMark||0===e.length)}function l(e){return e>=N?e=N:(e--,e|=e>>>1,e|=e>>>2,e|=e>>>4,e|=e>>>8,e|=e>>>16,e++),e}function u(e,t){return e<=0||0===t.length&&t.ended?0:t.objectMode?1:e!==e?t.flowing&&t.length?t.buffer.head.data.length:t.length:(e>t.highWaterMark&&(t.highWaterMark=l(e)),e<=t.length?e:t.ended?t.length:(t.needReadable=!0,0))}function c(e,t){var n=null;return L.isBuffer(t)||"string"==typeof t||null===t||void 0===t||e.objectMode||(n=new TypeError("Invalid non-string/buffer chunk")),n}function p(e,t){if(!t.ended){if(t.decoder){var n=t.decoder.end();n&&n.length&&(t.buffer.push(n),t.length+=t.objectMode?1:n.length)}t.ended=!0,h(e)}}function h(e){var t=e._readableState;t.needReadable=!1,t.emittedReadable||(P("emitReadable",t.flowing),t.emittedReadable=!0,t.sync?T(f,e):f(e))}function f(e){P("emit readable"),e.emit("readable"),w(e)}function d(e,t){t.readingMore||(t.readingMore=!0,T(m,e,t))}function m(e,t){for(var n=t.length;!t.reading&&!t.flowing&&!t.ended&&t.length<t.highWaterMark&&(P("maybeReadMore read 0"),e.read(0),n!==t.length);)n=t.length;t.readingMore=!1}function g(e){return function(){var t=e._readableState;P("pipeOnDrain",t.awaitDrain),t.awaitDrain&&t.awaitDrain--,0===t.awaitDrain&&D(e,"data")&&(t.flowing=!0,w(e))}}function y(e){P("readable nexttick read 0"),e.read(0)}function v(e,t){t.resumeScheduled||(t.resumeScheduled=!0,T(b,e,t))}function b(e,t){t.reading||(P("resume read 0"),e.read(0)),t.resumeScheduled=!1,t.awaitDrain=0,e.emit("resume"),w(e),t.flowing&&!t.reading&&e.read(0)}function w(e){var t=e._readableState;for(P("flow",t.flowing);t.flowing&&null!==e.read(););}function _(e,t){if(0===t.length)return null;var n;return t.objectMode?n=t.buffer.shift():!e||e>=t.length?(n=t.decoder?t.buffer.join(""):1===t.buffer.length?t.buffer.head.data:t.buffer.concat(t.length),t.buffer.clear()):n=x(e,t.buffer,t.decoder),n}function x(e,t,n){var r;return e<t.head.data.length?(r=t.head.data.slice(0,e),t.head.data=t.head.data.slice(e)):r=e===t.head.data.length?t.shift():n?A(e,t):S(e,t),r}function A(e,t){var n=t.head,r=1,i=n.data;for(e-=i.length;n=n.next;){var a=n.data,o=e>a.length?a.length:e;if(i+=o===a.length?a:a.slice(0,e),e-=o,0===e){o===a.length?(++r,n.next?t.head=n.next:t.head=t.tail=null):(t.head=n,n.data=a.slice(o));break}++r}return t.length-=r,i}function S(e,t){var n=M.allocUnsafe(e),r=t.head,i=1;for(r.data.copy(n),e-=r.data.length;r=r.next;){var a=r.data,o=e>a.length?a.length:e;if(a.copy(n,n.length-e,0,o),e-=o,0===e){o===a.length?(++i,r.next?t.head=r.next:t.head=t.tail=null):(t.head=r,r.data=a.slice(o));break}++i}return t.length-=i,n}function j(e){var t=e._readableState;if(t.length>0)throw new Error('"endReadable()" called on non-empty stream');t.endEmitted||(t.ended=!0,T(E,t,e))}function E(e,t){e.endEmitted||0!==e.length||(e.endEmitted=!0,t.readable=!1,t.emit("end"))}function O(e,t){for(var n=0,r=e.length;n<r;n++)t(e[n],n)}function k(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1}t.exports=a;var T=e("process-nextick-args"),C=e("isarray");a.ReadableState=i;var I,D=(e("events").EventEmitter,function(e,t){return e.listeners(t).length});!function(){try{I=e("stream")}catch(t){}finally{I||(I=e("events").EventEmitter)}}();var L=e("buffer").Buffer,M=e("buffer-shims"),R=e("core-util-is");R.inherits=e("inherits");var U=e("util"),P=void 0;P=U&&U.debuglog?U.debuglog("stream"):function(){};var q,B=e("./internal/streams/BufferList");R.inherits(a,I);var z,z;a.prototype.push=function(e,t){var n=this._readableState;return n.objectMode||"string"!=typeof e||(t=t||n.defaultEncoding,t!==n.encoding&&(e=M.from(e,t),t="")),o(this,n,e,t,!1)},a.prototype.unshift=function(e){var t=this._readableState;return o(this,t,e,"",!0)},a.prototype.isPaused=function(){return this._readableState.flowing===!1},a.prototype.setEncoding=function(t){return q||(q=e("string_decoder/").StringDecoder),this._readableState.decoder=new q(t),this._readableState.encoding=t,this};var N=8388608;a.prototype.read=function(e){P("read",e),e=parseInt(e,10);var t=this._readableState,n=e;if(0!==e&&(t.emittedReadable=!1),0===e&&t.needReadable&&(t.length>=t.highWaterMark||t.ended))return P("read: emitReadable",t.length,t.ended),0===t.length&&t.ended?j(this):h(this),null;if(e=u(e,t),0===e&&t.ended)return 0===t.length&&j(this),null;var r=t.needReadable;P("need readable",r),(0===t.length||t.length-e<t.highWaterMark)&&(r=!0,P("length less than watermark",r)),t.ended||t.reading?(r=!1,P("reading or ended",r)):r&&(P("do read"),t.reading=!0,t.sync=!0,0===t.length&&(t.needReadable=!0),this._read(t.highWaterMark),t.sync=!1,t.reading||(e=u(n,t)));var i;return i=e>0?_(e,t):null,null===i?(t.needReadable=!0,e=0):t.length-=e,0===t.length&&(t.ended||(t.needReadable=!0),n!==e&&t.ended&&j(this)),null!==i&&this.emit("data",i),i},a.prototype._read=function(e){this.emit("error",new Error("not implemented"))},a.prototype.pipe=function(e,t){function i(e){P("onunpipe"),e===h&&o()}function a(){P("onend"),e.end()}function o(){P("cleanup"),e.removeListener("close",u),e.removeListener("finish",c),e.removeListener("drain",y),e.removeListener("error",l),e.removeListener("unpipe",i),h.removeListener("end",a),h.removeListener("end",o),h.removeListener("data",s),v=!0,!f.awaitDrain||e._writableState&&!e._writableState.needDrain||y()}function s(t){P("ondata"),b=!1;var n=e.write(t);!1!==n||b||((1===f.pipesCount&&f.pipes===e||f.pipesCount>1&&k(f.pipes,e)!==-1)&&!v&&(P("false write response, pause",h._readableState.awaitDrain),h._readableState.awaitDrain++,b=!0),h.pause())}function l(t){P("onerror",t),p(),e.removeListener("error",l),0===D(e,"error")&&e.emit("error",t)}function u(){e.removeListener("finish",c),p()}function c(){P("onfinish"),e.removeListener("close",u),p()}function p(){P("unpipe"),h.unpipe(e)}var h=this,f=this._readableState;switch(f.pipesCount){case 0:f.pipes=e;break;case 1:f.pipes=[f.pipes,e];break;default:f.pipes.push(e)}f.pipesCount+=1,P("pipe count=%d opts=%j",f.pipesCount,t);var d=(!t||t.end!==!1)&&e!==n.stdout&&e!==n.stderr,m=d?a:o;f.endEmitted?T(m):h.once("end",m),e.on("unpipe",i);var y=g(h);e.on("drain",y);var v=!1,b=!1;return h.on("data",s),r(e,"error",l),e.once("close",u),e.once("finish",c),e.emit("pipe",h),f.flowing||(P("pipe resume"),h.resume()),e},a.prototype.unpipe=function(e){var t=this._readableState;if(0===t.pipesCount)return this;if(1===t.pipesCount)return e&&e!==t.pipes?this:(e||(e=t.pipes),t.pipes=null,t.pipesCount=0,t.flowing=!1,e&&e.emit("unpipe",this),this);if(!e){var n=t.pipes,r=t.pipesCount;t.pipes=null,t.pipesCount=0,t.flowing=!1;for(var i=0;i<r;i++)n[i].emit("unpipe",this);return this}var a=k(t.pipes,e);return a===-1?this:(t.pipes.splice(a,1),t.pipesCount-=1,1===t.pipesCount&&(t.pipes=t.pipes[0]),e.emit("unpipe",this),this)},a.prototype.on=function(e,t){var n=I.prototype.on.call(this,e,t);if("data"===e)this._readableState.flowing!==!1&&this.resume();else if("readable"===e){var r=this._readableState;r.endEmitted||r.readableListening||(r.readableListening=r.needReadable=!0,r.emittedReadable=!1,r.reading?r.length&&h(this,r):T(y,this))}return n},a.prototype.addListener=a.prototype.on,a.prototype.resume=function(){var e=this._readableState;return e.flowing||(P("resume"),e.flowing=!0,v(this,e)),this},a.prototype.pause=function(){return P("call pause flowing=%j",this._readableState.flowing),!1!==this._readableState.flowing&&(P("pause"),this._readableState.flowing=!1,this.emit("pause")),this},a.prototype.wrap=function(e){var t=this._readableState,n=!1,r=this;e.on("end",function(){if(P("wrapped end"),t.decoder&&!t.ended){var e=t.decoder.end();e&&e.length&&r.push(e)}r.push(null)}),e.on("data",function(i){if(P("wrapped data"),t.decoder&&(i=t.decoder.write(i)),(!t.objectMode||null!==i&&void 0!==i)&&(t.objectMode||i&&i.length)){var a=r.push(i);a||(n=!0,e.pause())}});for(var i in e)void 0===this[i]&&"function"==typeof e[i]&&(this[i]=function(t){return function(){return e[t].apply(e,arguments)}}(i));var a=["error","close","destroy","pause","resume"];return O(a,function(t){e.on(t,r.emit.bind(r,t))}),r._read=function(t){P("wrapped _read",t),n&&(n=!1,e.resume())},r},a._fromList=_}).call(this,e("_process"))},{"./_stream_duplex":44,"./internal/streams/BufferList":49,_process:42,buffer:5,"buffer-shims":4,"core-util-is":6,events:28,inherits:38,isarray:40,"process-nextick-args":41,"string_decoder/":56,util:3}],47:[function(e,t,n){"use strict";function r(e){this.afterTransform=function(t,n){return i(e,t,n)},this.needTransform=!1,this.transforming=!1,this.writecb=null,this.writechunk=null,this.writeencoding=null}function i(e,t,n){var r=e._transformState;r.transforming=!1;var i=r.writecb;if(!i)return e.emit("error",new Error("no writecb in Transform class"));r.writechunk=null,r.writecb=null,null!==n&&void 0!==n&&e.push(n),i(t);var a=e._readableState;a.reading=!1,(a.needReadable||a.length<a.highWaterMark)&&e._read(a.highWaterMark)}function a(e){if(!(this instanceof a))return new a(e);s.call(this,e),this._transformState=new r(this);var t=this;this._readableState.needReadable=!0,this._readableState.sync=!1,e&&("function"==typeof e.transform&&(this._transform=e.transform),"function"==typeof e.flush&&(this._flush=e.flush)),this.once("prefinish",function(){"function"==typeof this._flush?this._flush(function(e){o(t,e)}):o(t)})}function o(e,t){if(t)return e.emit("error",t);var n=e._writableState,r=e._transformState;if(n.length)throw new Error("Calling transform done when ws.length != 0");if(r.transforming)throw new Error("Calling transform done when still transforming");return e.push(null)}t.exports=a;var s=e("./_stream_duplex"),l=e("core-util-is");l.inherits=e("inherits"),l.inherits(a,s),a.prototype.push=function(e,t){return this._transformState.needTransform=!1,s.prototype.push.call(this,e,t)},a.prototype._transform=function(e,t,n){throw new Error("Not implemented")},a.prototype._write=function(e,t,n){var r=this._transformState;if(r.writecb=n,r.writechunk=e,r.writeencoding=t,!r.transforming){var i=this._readableState;(r.needTransform||i.needReadable||i.length<i.highWaterMark)&&this._read(i.highWaterMark)}},a.prototype._read=function(e){var t=this._transformState;null!==t.writechunk&&t.writecb&&!t.transforming?(t.transforming=!0,this._transform(t.writechunk,t.writeencoding,t.afterTransform)):t.needTransform=!0}},{"./_stream_duplex":44,"core-util-is":6,inherits:38}],48:[function(e,t,n){(function(n){"use strict";function r(){}function i(e,t,n){this.chunk=e,this.encoding=t,this.callback=n,this.next=null}function a(t,n){C=C||e("./_stream_duplex"),t=t||{},this.objectMode=!!t.objectMode,n instanceof C&&(this.objectMode=this.objectMode||!!t.writableObjectMode);var r=t.highWaterMark,i=this.objectMode?16:16384;this.highWaterMark=r||0===r?r:i,this.highWaterMark=~~this.highWaterMark,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1;var a=t.decodeStrings===!1;this.decodeStrings=!a,this.defaultEncoding=t.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(e){d(n,e)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.bufferedRequestCount=0,this.corkedRequestsFree=new x(this)}function o(t){return C=C||e("./_stream_duplex"),this instanceof o||this instanceof C?(this._writableState=new a(t,this),this.writable=!0,t&&("function"==typeof t.write&&(this._write=t.write),"function"==typeof t.writev&&(this._writev=t.writev)),void E.call(this)):new o(t)}function s(e,t){var n=new Error("write after end");e.emit("error",n),A(t,n)}function l(e,t,n,r){var i=!0,a=!1;return null===n?a=new TypeError("May not write null values to stream"):k.isBuffer(n)||"string"==typeof n||void 0===n||t.objectMode||(a=new TypeError("Invalid non-string/buffer chunk")),a&&(e.emit("error",a),A(r,a),i=!1),i}function u(e,t,n){return e.objectMode||e.decodeStrings===!1||"string"!=typeof t||(t=T.from(t,n)),t}function c(e,t,n,r,a){n=u(t,n,r),k.isBuffer(n)&&(r="buffer");var o=t.objectMode?1:n.length;t.length+=o;var s=t.length<t.highWaterMark;if(s||(t.needDrain=!0),t.writing||t.corked){var l=t.lastBufferedRequest;t.lastBufferedRequest=new i(n,r,a),l?l.next=t.lastBufferedRequest:t.bufferedRequest=t.lastBufferedRequest,t.bufferedRequestCount+=1}else p(e,t,!1,o,n,r,a);return s}function p(e,t,n,r,i,a,o){t.writelen=r,t.writecb=o,t.writing=!0,t.sync=!0,n?e._writev(i,t.onwrite):e._write(i,a,t.onwrite),t.sync=!1}function h(e,t,n,r,i){--t.pendingcb,n?A(i,r):i(r),e._writableState.errorEmitted=!0,e.emit("error",r)}function f(e){e.writing=!1,e.writecb=null,e.length-=e.writelen,e.writelen=0}function d(e,t){var n=e._writableState,r=n.sync,i=n.writecb;if(f(n),t)h(e,n,r,t,i);else{var a=v(n);a||n.corked||n.bufferProcessing||!n.bufferedRequest||y(e,n),r?S(m,e,n,a,i):m(e,n,a,i)}}function m(e,t,n,r){n||g(e,t),t.pendingcb--,r(),w(e,t)}function g(e,t){0===t.length&&t.needDrain&&(t.needDrain=!1,e.emit("drain"))}function y(e,t){t.bufferProcessing=!0;var n=t.bufferedRequest;if(e._writev&&n&&n.next){var r=t.bufferedRequestCount,i=new Array(r),a=t.corkedRequestsFree;a.entry=n;for(var o=0;n;)i[o]=n,n=n.next,o+=1;p(e,t,!0,t.length,i,"",a.finish),t.pendingcb++,t.lastBufferedRequest=null,a.next?(t.corkedRequestsFree=a.next,a.next=null):t.corkedRequestsFree=new x(t)}else{for(;n;){var s=n.chunk,l=n.encoding,u=n.callback,c=t.objectMode?1:s.length;if(p(e,t,!1,c,s,l,u),n=n.next,t.writing)break;
+}null===n&&(t.lastBufferedRequest=null)}t.bufferedRequestCount=0,t.bufferedRequest=n,t.bufferProcessing=!1}function v(e){return e.ending&&0===e.length&&null===e.bufferedRequest&&!e.finished&&!e.writing}function b(e,t){t.prefinished||(t.prefinished=!0,e.emit("prefinish"))}function w(e,t){var n=v(t);return n&&(0===t.pendingcb?(b(e,t),t.finished=!0,e.emit("finish")):b(e,t)),n}function _(e,t,n){t.ending=!0,w(e,t),n&&(t.finished?A(n):e.once("finish",n)),t.ended=!0,e.writable=!1}function x(e){var t=this;this.next=null,this.entry=null,this.finish=function(n){var r=t.entry;for(t.entry=null;r;){var i=r.callback;e.pendingcb--,i(n),r=r.next}e.corkedRequestsFree?e.corkedRequestsFree.next=t:e.corkedRequestsFree=t}}t.exports=o;var A=e("process-nextick-args"),S=!n.browser&&["v0.10","v0.9."].indexOf(n.version.slice(0,5))>-1?setImmediate:A;o.WritableState=a;var j=e("core-util-is");j.inherits=e("inherits");var E,O={deprecate:e("util-deprecate")};!function(){try{E=e("stream")}catch(t){}finally{E||(E=e("events").EventEmitter)}}();var k=e("buffer").Buffer,T=e("buffer-shims");j.inherits(o,E);var C;a.prototype.getBuffer=function(){for(var e=this.bufferedRequest,t=[];e;)t.push(e),e=e.next;return t},function(){try{Object.defineProperty(a.prototype,"buffer",{get:O.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.")})}catch(e){}}();var C;o.prototype.pipe=function(){this.emit("error",new Error("Cannot pipe, not readable"))},o.prototype.write=function(e,t,n){var i=this._writableState,a=!1;return"function"==typeof t&&(n=t,t=null),k.isBuffer(e)?t="buffer":t||(t=i.defaultEncoding),"function"!=typeof n&&(n=r),i.ended?s(this,n):l(this,i,e,n)&&(i.pendingcb++,a=c(this,i,e,t,n)),a},o.prototype.cork=function(){var e=this._writableState;e.corked++},o.prototype.uncork=function(){var e=this._writableState;e.corked&&(e.corked--,e.writing||e.corked||e.finished||e.bufferProcessing||!e.bufferedRequest||y(this,e))},o.prototype.setDefaultEncoding=function(e){if("string"==typeof e&&(e=e.toLowerCase()),!(["hex","utf8","utf-8","ascii","binary","base64","ucs2","ucs-2","utf16le","utf-16le","raw"].indexOf((e+"").toLowerCase())>-1))throw new TypeError("Unknown encoding: "+e);return this._writableState.defaultEncoding=e,this},o.prototype._write=function(e,t,n){n(new Error("not implemented"))},o.prototype._writev=null,o.prototype.end=function(e,t,n){var r=this._writableState;"function"==typeof e?(n=e,e=null,t=null):"function"==typeof t&&(n=t,t=null),null!==e&&void 0!==e&&this.write(e,t),r.corked&&(r.corked=1,this.uncork()),r.ending||r.finished||_(this,r,n)}}).call(this,e("_process"))},{"./_stream_duplex":44,_process:42,buffer:5,"buffer-shims":4,"core-util-is":6,events:28,inherits:38,"process-nextick-args":41,"util-deprecate":57}],49:[function(e,t,n){"use strict";function r(){this.head=null,this.tail=null,this.length=0}var i=(e("buffer").Buffer,e("buffer-shims"));t.exports=r,r.prototype.push=function(e){var t={data:e,next:null};this.length>0?this.tail.next=t:this.head=t,this.tail=t,++this.length},r.prototype.unshift=function(e){var t={data:e,next:this.head};0===this.length&&(this.tail=t),this.head=t,++this.length},r.prototype.shift=function(){if(0!==this.length){var e=this.head.data;return 1===this.length?this.head=this.tail=null:this.head=this.head.next,--this.length,e}},r.prototype.clear=function(){this.head=this.tail=null,this.length=0},r.prototype.join=function(e){if(0===this.length)return"";for(var t=this.head,n=""+t.data;t=t.next;)n+=e+t.data;return n},r.prototype.concat=function(e){if(0===this.length)return i.alloc(0);if(1===this.length)return this.head.data;for(var t=i.allocUnsafe(e>>>0),n=this.head,r=0;n;)n.data.copy(t,r),r+=n.data.length,n=n.next;return t}},{buffer:5,"buffer-shims":4}],50:[function(e,t,n){t.exports=e("./lib/_stream_passthrough.js")},{"./lib/_stream_passthrough.js":45}],51:[function(e,t,n){(function(r){var i=function(){try{return e("stream")}catch(t){}}();n=t.exports=e("./lib/_stream_readable.js"),n.Stream=i||n,n.Readable=n,n.Writable=e("./lib/_stream_writable.js"),n.Duplex=e("./lib/_stream_duplex.js"),n.Transform=e("./lib/_stream_transform.js"),n.PassThrough=e("./lib/_stream_passthrough.js"),!r.browser&&"disable"===r.env.READABLE_STREAM&&i&&(t.exports=i)}).call(this,e("_process"))},{"./lib/_stream_duplex.js":44,"./lib/_stream_passthrough.js":45,"./lib/_stream_readable.js":46,"./lib/_stream_transform.js":47,"./lib/_stream_writable.js":48,_process:42}],52:[function(e,t,n){t.exports=e("./lib/_stream_transform.js")},{"./lib/_stream_transform.js":47}],53:[function(e,t,n){t.exports=e("./lib/_stream_writable.js")},{"./lib/_stream_writable.js":48}],54:[function(e,t,n){t.exports=function(e){return e.replace(/[-\\^$*+?.()|[\]{}]/g,"\\$&")}},{}],55:[function(e,t,n){function r(){i.call(this)}t.exports=r;var i=e("events").EventEmitter,a=e("inherits");a(r,i),r.Readable=e("readable-stream/readable.js"),r.Writable=e("readable-stream/writable.js"),r.Duplex=e("readable-stream/duplex.js"),r.Transform=e("readable-stream/transform.js"),r.PassThrough=e("readable-stream/passthrough.js"),r.Stream=r,r.prototype.pipe=function(e,t){function n(t){e.writable&&!1===e.write(t)&&u.pause&&u.pause()}function r(){u.readable&&u.resume&&u.resume()}function a(){c||(c=!0,e.end())}function o(){c||(c=!0,"function"==typeof e.destroy&&e.destroy())}function s(e){if(l(),0===i.listenerCount(this,"error"))throw e}function l(){u.removeListener("data",n),e.removeListener("drain",r),u.removeListener("end",a),u.removeListener("close",o),u.removeListener("error",s),e.removeListener("error",s),u.removeListener("end",l),u.removeListener("close",l),e.removeListener("close",l)}var u=this;u.on("data",n),e.on("drain",r),e._isStdio||t&&t.end===!1||(u.on("end",a),u.on("close",o));var c=!1;return u.on("error",s),e.on("error",s),u.on("end",l),u.on("close",l),e.on("close",l),e.emit("pipe",u),e}},{events:28,inherits:38,"readable-stream/duplex.js":43,"readable-stream/passthrough.js":50,"readable-stream/readable.js":51,"readable-stream/transform.js":52,"readable-stream/writable.js":53}],56:[function(e,t,n){function r(e){if(e&&!l(e))throw new Error("Unknown encoding: "+e)}function i(e){return e.toString(this.encoding)}function a(e){this.charReceived=e.length%2,this.charLength=this.charReceived?2:0}function o(e){this.charReceived=e.length%3,this.charLength=this.charReceived?3:0}var s=e("buffer").Buffer,l=s.isEncoding||function(e){switch(e&&e.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}},u=n.StringDecoder=function(e){switch(this.encoding=(e||"utf8").toLowerCase().replace(/[-_]/,""),r(e),this.encoding){case"utf8":this.surrogateSize=3;break;case"ucs2":case"utf16le":this.surrogateSize=2,this.detectIncompleteChar=a;break;case"base64":this.surrogateSize=3,this.detectIncompleteChar=o;break;default:return void(this.write=i)}this.charBuffer=new s(6),this.charReceived=0,this.charLength=0};u.prototype.write=function(e){for(var t="";this.charLength;){var n=e.length>=this.charLength-this.charReceived?this.charLength-this.charReceived:e.length;if(e.copy(this.charBuffer,this.charReceived,0,n),this.charReceived+=n,this.charReceived<this.charLength)return"";e=e.slice(n,e.length),t=this.charBuffer.slice(0,this.charLength).toString(this.encoding);var r=t.charCodeAt(t.length-1);if(!(r>=55296&&r<=56319)){if(this.charReceived=this.charLength=0,0===e.length)return t;break}this.charLength+=this.surrogateSize,t=""}this.detectIncompleteChar(e);var i=e.length;this.charLength&&(e.copy(this.charBuffer,0,e.length-this.charReceived,i),i-=this.charReceived),t+=e.toString(this.encoding,0,i);var i=t.length-1,r=t.charCodeAt(i);if(r>=55296&&r<=56319){var a=this.surrogateSize;return this.charLength+=a,this.charReceived+=a,this.charBuffer.copy(this.charBuffer,a,0,a),e.copy(this.charBuffer,0,0,a),t.substring(0,i)}return t},u.prototype.detectIncompleteChar=function(e){for(var t=e.length>=3?3:e.length;t>0;t--){var n=e[e.length-t];if(1==t&&n>>5==6){this.charLength=2;break}if(t<=2&&n>>4==14){this.charLength=3;break}if(t<=3&&n>>3==30){this.charLength=4;break}}this.charReceived=t},u.prototype.end=function(e){var t="";if(e&&e.length&&(t=this.write(e)),this.charReceived){var n=this.charReceived,r=this.charBuffer,i=this.encoding;t+=r.slice(0,n).toString(i)}return t}},{buffer:5}],57:[function(e,t,n){(function(e){function n(e,t){function n(){if(!i){if(r("throwDeprecation"))throw new Error(t);r("traceDeprecation")?console.trace(t):console.warn(t),i=!0}return e.apply(this,arguments)}if(r("noDeprecation"))return e;var i=!1;return n}function r(t){try{if(!e.localStorage)return!1}catch(n){return!1}var r=e.localStorage[t];return null!=r&&"true"===String(r).toLowerCase()}t.exports=n}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],58:[function(e,t,n){function r(){for(var e={},t=0;t<arguments.length;t++){var n=arguments[t];for(var r in n)i.call(n,r)&&(e[r]=n[r])}return e}t.exports=r;var i=Object.prototype.hasOwnProperty},{}]},{},[1])(1)}),function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.SwaggerClient=e()}}(function(){var t;return function n(e,t,r){function i(o,s){if(!t[o]){if(!e[o]){var l="function"==typeof require&&require;if(!s&&l)return l(o,!0);if(a)return a(o,!0);var u=new Error("Cannot find module '"+o+"'");throw u.code="MODULE_NOT_FOUND",u}var c=t[o]={exports:{}};e[o][0].call(c.exports,function(t){var n=e[o][1][t];return i(n?n:t)},c,c.exports,n,e,t,r)}return t[o].exports}for(var a="function"==typeof require&&require,o=0;o<r.length;o++)i(r[o]);return i}({1:[function(e,t,n){"use strict";var r=e("./lib/auth"),i=e("./lib/helpers"),a=e("./lib/client"),o=function(e,t){return i.log('This is deprecated, use "new SwaggerClient" instead.'),new a(e,t)};Array.prototype.indexOf||(Array.prototype.indexOf=function(e,t){for(var n=t||0,r=this.length;n<r;n++)if(this[n]===e)return n;return-1}),String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g,"")}),String.prototype.endsWith||(String.prototype.endsWith=function(e){return this.indexOf(e,this.length-e.length)!==-1}),t.exports=a,a.ApiKeyAuthorization=r.ApiKeyAuthorization,a.PasswordAuthorization=r.PasswordAuthorization,a.CookieAuthorization=r.CookieAuthorization,a.SwaggerApi=o,a.SwaggerClient=o,a.SchemaMarkup=e("./lib/schema-markup")},{"./lib/auth":2,"./lib/client":3,"./lib/helpers":4,"./lib/schema-markup":7}],2:[function(e,t,n){"use strict";var r=e("./helpers"),i=e("btoa"),a=e("cookiejar").CookieJar,o={each:e("lodash-compat/collection/each"),includes:e("lodash-compat/collection/includes"),isObject:e("lodash-compat/lang/isObject"),isArray:e("lodash-compat/lang/isArray")},s=t.exports.SwaggerAuthorizations=function(e){this.authz=e||{}};s.prototype.add=function(e,t){if(o.isObject(e))for(var n in e)this.authz[n]=e[n];else"string"==typeof e&&(this.authz[e]=t);return t},s.prototype.remove=function(e){return delete this.authz[e]},s.prototype.apply=function(e,t){var n=!0,r=!t,i=[],a=e.clientAuthorizations||this.authz;return o.each(t,function(e,t){"string"==typeof t&&i.push(t),o.each(e,function(e,t){i.push(t)})}),o.each(a,function(t,a){if(r||o.includes(i,a)){var s=t.apply(e);n=n&&!!s}}),n};var l=t.exports.ApiKeyAuthorization=function(e,t,n){this.name=e,this.value=t,this.type=n};l.prototype.apply=function(e){if("query"===this.type){var t;if(e.url.indexOf("?")>0){t=e.url.substring(e.url.indexOf("?")+1);var n=t.split("&");if(n&&n.length>0)for(var r=0;r<n.length;r++){var i=n[r].split("=");if(i&&i.length>0&&i[0]===this.name)return!1}}return e.url.indexOf("?")>0?e.url=e.url+"&"+this.name+"="+this.value:e.url=e.url+"?"+this.name+"="+this.value,!0}if("header"===this.type)return"undefined"==typeof e.headers[this.name]&&(e.headers[this.name]=this.value),!0};var u=t.exports.CookieAuthorization=function(e){this.cookie=e};u.prototype.apply=function(e){return e.cookieJar=e.cookieJar||new a,e.cookieJar.setCookie(this.cookie),!0};var c=t.exports.PasswordAuthorization=function(e,t){3===arguments.length&&(r.log("PasswordAuthorization: the 'name' argument has been removed, pass only username and password"),e=arguments[1],t=arguments[2]),this.username=e,this.password=t};c.prototype.apply=function(e){return"undefined"==typeof e.headers.Authorization&&(e.headers.Authorization="Basic "+i(this.username+":"+this.password)),!0}},{"./helpers":4,btoa:13,cookiejar:18,"lodash-compat/collection/each":52,"lodash-compat/collection/includes":55,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isObject":144}],3:[function(e,t,n){"use strict";var r={bind:e("lodash-compat/function/bind"),cloneDeep:e("lodash-compat/lang/cloneDeep"),find:e("lodash-compat/collection/find"),forEach:e("lodash-compat/collection/forEach"),indexOf:e("lodash-compat/array/indexOf"),isArray:e("lodash-compat/lang/isArray"),isObject:e("lodash-compat/lang/isObject"),isFunction:e("lodash-compat/lang/isFunction"),isPlainObject:e("lodash-compat/lang/isPlainObject"),isUndefined:e("lodash-compat/lang/isUndefined")},i=e("./auth"),a=e("./helpers"),o=e("./types/model"),s=e("./types/operation"),l=e("./types/operationGroup"),u=e("./resolver"),c=e("./http"),p=e("./spec-converter"),h=e("q"),f=["apis","authorizationScheme","authorizations","basePath","build","buildFrom1_1Spec","buildFrom1_2Spec","buildFromSpec","clientAuthorizations","convertInfo","debug","defaultErrorCallback","defaultSuccessCallback","enableCookies","fail","failure","finish","help","host","idFromOp","info","initialize","isBuilt","isValid","modelPropertyMacro","models","modelsArray","options","parameterMacro","parseUri","progress","resourceCount","sampleModels","selfReflect","setConsolidatedModels","spec","supportedSubmitMethods","swaggerRequestHeaders","tagFromLabel","title","url","useJQuery","jqueryAjaxCache"],d=["apis","asCurl","description","externalDocs","help","label","name","operation","operations","operationsArray","path","tag"],m=["delete","get","head","options","patch","post","put"],g=t.exports=function(e,t){return this.authorizations=null,this.authorizationScheme=null,this.basePath=null,this.debug=!1,this.enableCookies=!1,this.info=null,this.isBuilt=!1,this.isValid=!1,this.modelsArray=[],this.resourceCount=0,this.url=null,this.useJQuery=!1,this.jqueryAjaxCache=!1,this.swaggerObject={},this.deferredClient=void 0,this.clientAuthorizations=new i.SwaggerAuthorizations,"undefined"!=typeof e?this.initialize(e,t):this};g.prototype.initialize=function(e,t){if(this.models={},this.sampleModels={},"string"==typeof e?this.url=e:r.isObject(e)&&(t=e,this.url=t.url),this.url&&this.url.indexOf("http:")===-1&&this.url.indexOf("https:")===-1&&"undefined"!=typeof window&&window&&window.location&&(this.url=window.location.origin+this.url),t=t||{},this.clientAuthorizations.add(t.authorizations),this.swaggerRequestHeaders=t.swaggerRequestHeaders||"application/json;charset=utf-8,*/*",this.defaultSuccessCallback=t.defaultSuccessCallback||null,this.defaultErrorCallback=t.defaultErrorCallback||null,this.modelPropertyMacro=t.modelPropertyMacro||null,this.connectionAgent=t.connectionAgent||null,this.parameterMacro=t.parameterMacro||null,this.usePromise=t.usePromise||null,this.timeout=t.timeout||null,this.fetchSpecTimeout="undefined"!=typeof t.fetchSpecTimeout?t.fetchSpecTimeout:t.timeout||null,this.usePromise&&(this.deferredClient=h.defer()),"function"==typeof t.success&&(this.success=t.success),t.useJQuery&&(this.useJQuery=t.useJQuery),t.jqueryAjaxCache&&(this.jqueryAjaxCache=t.jqueryAjaxCache),t.enableCookies&&(this.enableCookies=t.enableCookies),this.options=t||{},this.options.timeout=this.timeout,this.options.fetchSpecTimeout=this.fetchSpecTimeout,this.supportedSubmitMethods=t.supportedSubmitMethods||[],this.failure=t.failure||function(e){throw e},this.progress=t.progress||function(){},this.spec=r.cloneDeep(t.spec),t.scheme&&(this.scheme=t.scheme),this.usePromise||"function"==typeof t.success)return this.ready=!0,this.build()},g.prototype.build=function(e){if(this.isBuilt)return this;var t=this;this.spec?this.progress("fetching resource list; Please wait."):this.progress("fetching resource list: "+this.url+"; Please wait.");var n={useJQuery:this.useJQuery,jqueryAjaxCache:this.jqueryAjaxCache,connectionAgent:this.connectionAgent,enableCookies:this.enableCookies,url:this.url,method:"get",headers:{accept:this.swaggerRequestHeaders},on:{error:function(e){return"http"!==t.url.substring(0,4)?t.fail("Please specify the protocol for "+t.url):!e.errObj||"ECONNABORTED"!==e.errObj.code&&e.errObj.message.indexOf("timeout")===-1?0===e.status?t.fail("Can't read from server.  It may not have the appropriate access-control-origin settings."):404===e.status?t.fail("Can't read swagger JSON from "+t.url):t.fail(e.status+" : "+e.statusText+" "+t.url):t.fail("Request timed out after "+t.fetchSpecTimeout+"ms")},response:function(e){var n=e.obj;if(!n)return t.fail("failed to parse JSON/YAML response");if(t.swaggerVersion=n.swaggerVersion,t.swaggerObject=n,n.swagger&&2===parseInt(n.swagger))t.swaggerVersion=n.swagger,(new u).resolve(n,t.url,t.buildFromSpec,t),t.isValid=!0;else{var r=new p;t.oldSwaggerObject=t.swaggerObject,r.setDocumentationLocation(t.url),r.convert(n,t.clientAuthorizations,t.options,function(e){t.swaggerObject=e,(new u).resolve(e,t.url,t.buildFromSpec,t),t.isValid=!0})}}}};if(this.fetchSpecTimeout&&(n.timeout=this.fetchSpecTimeout),this.spec)t.swaggerObject=this.spec,setTimeout(function(){(new u).resolve(t.spec,t.url,t.buildFromSpec,t)},10);else{if(this.clientAuthorizations.apply(n),e)return n;(new c).execute(n,this.options)}return this.usePromise?this.deferredClient.promise:this},g.prototype.buildFromSpec=function(e){if(this.isBuilt)return this;this.apis={},this.apisArray=[],this.basePath=e.basePath||"",this.consumes=e.consumes,this.host=e.host||"",this.info=e.info||{},this.produces=e.produces,this.schemes=e.schemes||[],this.securityDefinitions=r.cloneDeep(e.securityDefinitions),this.security=e.security,this.title=e.title||"";var t,n,i,u,c={},p=this;if(e.externalDocs&&(this.externalDocs=e.externalDocs),this.authSchemes=this.securityDefinitions,this.securityDefinitions)for(t in this.securityDefinitions){var h=this.securityDefinitions[t];h.vendorExtensions={};for(var g in h)if(a.extractExtensions(g,h),"scopes"===g){var y=h[g];if("object"==typeof y){y.vendorExtensions={};for(var v in y)a.extractExtensions(v,y),0===v.indexOf("x-")&&delete y[v]}}}if(Array.isArray(e.tags))for(c={},n=0;n<e.tags.length;n++){var b=r.cloneDeep(e.tags[n]);c[b.name]=b;for(u in b){if("externalDocs"===u&&"object"==typeof b[u])for(var w in b[u])a.extractExtensions(w,b[u]);a.extractExtensions(u,b)}}if("string"==typeof this.url){if(i=this.parseUri(this.url),"undefined"==typeof this.scheme&&"undefined"==typeof this.schemes||0===this.schemes.length)"undefined"!=typeof window?this.scheme=window.location.protocol.replace(":",""):this.scheme=i.scheme||"http";else if("undefined"!=typeof window&&0===window.location.protocol.indexOf("chrome-extension"))this.scheme=i.scheme;else if("undefined"==typeof this.scheme)if("undefined"!=typeof window){var _=window.location.protocol.replace(":","");"https"===_&&this.schemes.indexOf(_)===-1?(a.log("Cannot call a http server from https inside a browser!"),this.scheme="http"):this.schemes.indexOf(_)!==-1?this.scheme=_:this.schemes.indexOf("https")!==-1?this.scheme="https":this.scheme="http"}else this.scheme=this.schemes[0]||i.scheme;"undefined"!=typeof this.host&&""!==this.host||(this.host=i.host,i.port&&(this.host=this.host+":"+i.port))}else"undefined"==typeof this.schemes||0===this.schemes.length?this.scheme="http":"undefined"==typeof this.scheme&&(this.scheme=this.schemes[0]);this.definitions=e.definitions;for(t in this.definitions){var x=new o(t,this.definitions[t],this.models,this.modelPropertyMacro);x&&(this.models[t]=x)}p.apis.help=r.bind(p.help,p),r.forEach(e.paths,function(e,t){r.isPlainObject(e)&&r.forEach(m,function(n){var i=e[n];if(!r.isUndefined(i)){if(!r.isPlainObject(i))return void a.log("The '"+n+"' operation for '"+t+"' path is not an Operation Object");var o=i.tags;!r.isUndefined(o)&&r.isArray(o)&&0!==o.length||(o=i.tags=["default"]);var h=p.idFromOp(t,n,i),m=new s(p,i.scheme,h,n,t,i,p.definitions,p.models,p.clientAuthorizations);m.connectionAgent=p.connectionAgent,m.vendorExtensions={};for(u in i)a.extractExtensions(u,m,i[u]);if(m.externalDocs=i.externalDocs,m.externalDocs){m.externalDocs=r.cloneDeep(m.externalDocs),m.externalDocs.vendorExtensions={};for(u in m.externalDocs)a.extractExtensions(u,m.externalDocs)}r.forEach(o,function(e){var t=r.indexOf(f,e)>-1?"_"+e:e,n=r.indexOf(d,e)>-1?"_"+e:e,i=p[t];if(t!==e&&a.log("The '"+e+"' tag conflicts with a SwaggerClient function/property name.  Use 'client."+t+"' or 'client.apis."+e+"' instead of 'client."+e+"'."),n!==e&&a.log("The '"+e+"' tag conflicts with a SwaggerClient operation function/property name.  Use 'client.apis."+n+"' instead of 'client.apis."+e+"'."),r.indexOf(d,h)>-1&&(a.log("The '"+h+"' operationId conflicts with a SwaggerClient operation function/property name.  Use 'client.apis."+n+"._"+h+"' instead of 'client.apis."+n+"."+h+"'."),h="_"+h,m.nickname=h),r.isUndefined(i)){i=p[t]=p.apis[n]={},i.operations={},i.label=n,i.apis={};var o=c[e];r.isUndefined(o)||(i.description=o.description,i.externalDocs=o.externalDocs,i.vendorExtensions=o.vendorExtensions),p[t].help=r.bind(p.help,i),p.apisArray.push(new l(e,i.description,i.externalDocs,m))}h=p.makeUniqueOperationId(h,p.apis[n]),r.isFunction(i.help)||(i.help=r.bind(p.help,i)),p.apis[n][h]=i[h]=r.bind(m.execute,m),p.apis[n][h].help=i[h].help=r.bind(m.help,m),p.apis[n][h].asCurl=i[h].asCurl=r.bind(m.asCurl,m),i.apis[h]=i.operations[h]=m;var s=r.find(p.apisArray,function(t){return t.tag===e});s&&s.operationsArray.push(m)})}})});var A=[];return r.forEach(Object.keys(c),function(e){var t;for(t in p.apisArray){var n=p.apisArray[t];n&&e===n.name&&(A.push(n),p.apisArray[t]=null)}}),r.forEach(p.apisArray,function(e){e&&A.push(e)}),p.apisArray=A,r.forEach(e.definitions,function(e,t){e.id=t.toLowerCase(),e.name=t,p.modelsArray.push(e)}),this.isBuilt=!0,this.usePromise?(this.isValid=!0,this.isBuilt=!0,this.deferredClient.resolve(this),this.deferredClient.promise):(this.success&&this.success(),this)},g.prototype.makeUniqueOperationId=function(e,t){for(var n=0,i=e;;){var a=!1;if(r.forEach(t.operations,function(e){e.nickname===i&&(a=!0)}),!a)return i;i=e+"_"+n,n++}return e},g.prototype.parseUri=function(e){var t=/^(((([^:\/#\?]+:)?(?:(\/\/)((?:(([^:@\/#\?]+)(?:\:([^:@\/#\?]+))?)@)?(([^:\/#\?\]\[]+|\[[^\/\]@#?]+\])(?:\:([0-9]+))?))?)?)?((\/?(?:[^\/\?#]+\/+)*)([^\?#]*)))?(\?[^#]+)?)(#.*)?/,n=t.exec(e);return{scheme:n[4]?n[4].replace(":",""):void 0,host:n[11],port:n[12],path:n[15]}},g.prototype.help=function(e){var t="";return this instanceof g?r.forEach(this.apis,function(e,n){r.isPlainObject(e)&&(t+="operations for the '"+n+"' tag\n",r.forEach(e.operations,function(e,n){t+="  * "+n+": "+e.summary+"\n"}))}):(this instanceof l||r.isPlainObject(this))&&(t+="operations for the '"+this.label+"' tag\n",r.forEach(this.apis,function(e,n){t+="  * "+n+": "+e.summary+"\n"})),e?t:(a.log(t),t)},g.prototype.tagFromLabel=function(e){return e},g.prototype.idFromOp=function(e,t,n){n&&n.operationId||(n=n||{},n.operationId=t+"_"+e);var r=n.operationId.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|.\/?,\\'""-]/g,"_")||e.substring(1)+"_"+t;return r=r.replace(/((_){2,})/g,"_"),r=r.replace(/^(_)*/g,""),r=r.replace(/([_])*$/g,"")},g.prototype.setHost=function(e){this.host=e,this.apis&&r.forEach(this.apis,function(t){t.operations&&r.forEach(t.operations,function(t){t.host=e})})},g.prototype.setBasePath=function(e){this.basePath=e,this.apis&&r.forEach(this.apis,function(t){t.operations&&r.forEach(t.operations,function(t){t.basePath=e})})},g.prototype.setSchemes=function(e){this.schemes=e,e&&e.length>0&&this.apis&&r.forEach(this.apis,function(t){t.operations&&r.forEach(t.operations,function(t){t.scheme=e[0]})})},g.prototype.fail=function(e){return this.usePromise?(this.deferredClient.reject(e),this.deferredClient.promise):void(this.failure?this.failure(e):this.failure(e))}},{"./auth":2,"./helpers":4,"./http":5,"./resolver":6,"./spec-converter":8,"./types/model":9,"./types/operation":10,"./types/operationGroup":11,"lodash-compat/array/indexOf":49,"lodash-compat/collection/find":53,"lodash-compat/collection/forEach":54,"lodash-compat/function/bind":58,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isFunction":142,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isPlainObject":145,"lodash-compat/lang/isUndefined":148,q:157}],4:[function(e,t,n){(function(n){"use strict";var r={isPlainObject:e("lodash-compat/lang/isPlainObject"),indexOf:e("lodash-compat/array/indexOf")};t.exports.__bind=function(e,t){return function(){return e.apply(t,arguments)}};var i=t.exports.log=function(){console&&"test"!==n.env.NODE_ENV&&console.log(Array.prototype.slice.call(arguments)[0])};t.exports.fail=function(e){i(e)},t.exports.optionHtml=function(e,t){return'<tr><td class="optionName">'+e+":</td><td>"+t+"</td></tr>"};var a=t.exports.resolveSchema=function(e){return r.isPlainObject(e.schema)&&(e=a(e.schema)),e};t.exports.simpleRef=function(e){return"undefined"==typeof e?null:0===e.indexOf("#/definitions/")?e.substring("#/definitions/".length):e},t.exports.extractExtensions=function(e,t,n){e&&t&&"string"==typeof e&&0===e.indexOf("x-")&&(t.vendorExtensions=t.vendorExtensions||{},n?t.vendorExtensions[e]=n:t.vendorExtensions[e]=t[e])}}).call(this,e("_process"))},{_process:12,"lodash-compat/array/indexOf":49,"lodash-compat/lang/isPlainObject":145}],5:[function(t,n,r){(function(r){"use strict";var i=t("./helpers"),a=t("superagent"),o=t("js-yaml"),s={isObject:t("lodash-compat/lang/isObject"),keys:t("lodash-compat/object/keys")},l=function(){this.type="JQueryHttpClient"},u=function(){this.type="SuperagentHttpClient"},c=n.exports=function(){};c.prototype.execute=function(t,n){var r;r=n&&n.client?n.client:new u(n),r.opts=n||{},n&&n.requestAgent&&(a=n.requestAgent);var i=!1;if("undefined"!=typeof window&&"undefined"!=typeof window.jQuery&&(i=!0),"options"===t.method.toLowerCase()&&"SuperagentHttpClient"===r.type&&(e("forcing jQuery as OPTIONS are not supported by SuperAgent"),t.useJQuery=!0),this.isInternetExplorer()&&(t.useJQuery===!1||!i))throw new Error("Unsupported configuration! JQuery is required but not available");(t&&t.useJQuery===!0||this.isInternetExplorer()&&i)&&(r=new l(n));var o=t.on.response,c=t.on.error,p=function(e){return n&&n.requestInterceptor&&(e=n.requestInterceptor.apply(e)),e},h=function(e){return n&&n.responseInterceptor&&(e=n.responseInterceptor.apply(e,[t])),o(e)},f=function(e){n&&n.responseInterceptor&&(e=n.responseInterceptor.apply(e,[t])),c(e)};return t.on.error=function(e){f(e)},t.on.response=function(e){e&&e.status>=400?f(e):h(e)},s.isObject(t)&&s.isObject(t.body)&&t.body.type&&"formData"===t.body.type&&n.useJQuery&&(t.contentType=!1,t.processData=!1,delete t.headers["Content-Type"]),t=p(t)||t,t.beforeSend?t.beforeSend(function(e){r.execute(e||t)}):r.execute(t),t.deferred?t.deferred.promise:t},c.prototype.isInternetExplorer=function(){var e=!1;if("undefined"!=typeof navigator&&navigator.userAgent){var t=navigator.userAgent.toLowerCase();if(t.indexOf("msie")!==-1){var n=parseInt(t.split("msie")[1]);n<=8&&(e=!0)}}return e},l.prototype.execute=function(e){var t=this.jQuery||"undefined"!=typeof window&&window.jQuery,n=e.on,r=e;if("undefined"==typeof t||t===!1)throw new Error("Unsupported configuration! JQuery is required but not available");return e.type=e.method,e.cache=e.jqueryAjaxCache,e.data=e.body,delete e.jqueryAjaxCache,delete e.useJQuery,delete e.body,e.complete=function(e){for(var t={},a=e.getAllResponseHeaders().split("\n"),s=0;s<a.length;s++){var l=a[s].trim();if(0!==l.length){var u=l.indexOf(":");if(u!==-1){var c=l.substring(0,u).trim(),p=l.substring(u+1).trim();t[c]=p}else t[l]=null}}var h={url:r.url,method:r.method,status:e.status,statusText:e.statusText,data:e.responseText,headers:t};try{var f=e.responseJSON||o.safeLoad(e.responseText);h.obj="string"==typeof f?{}:f}catch(d){i.log("unable to parse JSON/YAML content")}if(h.obj=h.obj||null,e.status>=200&&e.status<300)n.response(h);else{if(!(0===e.status||e.status>=400&&e.status<599))return n.response(h);n.error(h)}},t.support.cors=!0,t.ajax(e)},u.prototype.execute=function(e){var t=e.method.toLowerCase(),n=e.timeout;"delete"===t&&(t="del");var l=e.headers||{},u=a[t](e.url);e.connectionAgent&&u.agent(e.connectionAgent),n&&u.timeout(n),e.enableCookies&&u.withCredentials();var c=e.headers.Accept;if(this.binaryRequest(c)&&u.on("request",function(){this.xhr&&(this.xhr.responseType="blob")}),e.body)if(s.isObject(e.body)){var p=e.headers["Content-Type"]||"";if(0===p.indexOf("multipart/form-data"))if(delete l["Content-Type"],"[object FormData]"==={}.toString.apply(e.body))u.send(e.body);else{var h,f,d;for(h in e.body)if(f=e.body[h],Array.isArray(f))for(d in f)u.field(h,d);else u.field(h,f)}else s.isObject(e.body)&&(e.body=JSON.stringify(e.body),u.send(e.body))}else u.send(e.body);var m;for(m in l)u.set(m,l[m]);"function"==typeof u.buffer&&u.buffer(),u.end(function(t,n){n=n||{status:0,headers:{error:"no response from server"}};var a,l={url:e.url,method:e.method,headers:n.headers};if(!t&&n.error&&(t=n.error),t&&e.on&&e.on.error){if(l.errObj=t,l.status=n?n.status:500,l.statusText=n?n.text:t.message,n.headers&&n.headers["content-type"]&&n.headers["content-type"].indexOf("application/json")>=0)try{l.obj=JSON.parse(l.statusText)}catch(u){l.obj=null}a=e.on.error}else if(n&&e.on&&e.on.response){var c;if(n.body&&s.keys(n.body).length>0)c=n.body;else try{c=o.safeLoad(n.text),c="string"==typeof c?null:c}catch(u){i.log("cannot parse JSON/YAML content")}"function"==typeof r&&r.isBuffer(c)?l.data=c:l.obj="object"==typeof c?c:null,l.status=n.status,l.statusText=n.text,a=e.on.response}n.xhr&&n.xhr.response?l.data=n.xhr.response:l.data||(l.data=l.statusText),a&&a(l)})},u.prototype.binaryRequest=function(e){return!!e&&(/^image/i.test(e)||/^application\/pdf/.test(e)||/^application\/octet-stream/.test(e))}}).call(this,t("buffer").Buffer)},{"./helpers":4,buffer:14,"js-yaml":19,"lodash-compat/lang/isObject":144,"lodash-compat/object/keys":149,superagent:158}],6:[function(e,t,n){"use strict";function r(e){var t={},n=/[a-z]+:\/\//i.exec(e);n&&(t.proto=n[0].slice(0,-3),e=e.slice(t.proto.length+1)),"//"===e.slice(0,2)&&(t.domain=e.slice(2).split("/")[0],e=e.slice(2+t.domain.length));var r=e.split("#");return r[0].length&&(t.path=r[0]),r.length>1&&(t.fragment=r.slice(1).join("#")),t}function i(e){var t=e.path;return void 0===t&&(t=""),void 0!==e.fragment&&(t+="#"+e.fragment),void 0!==e.domain&&("/"===t.slice(0,1)&&(t=t.slice(1)),t="//"+e.domain+"/"+t,void 0!==e.proto&&(t=e.proto+":"+t)),t}function a(e,t){var n=r(t);if(void 0!==n.domain)return t;var a=r(e);if(void 0===n.path)a.fragment=n.fragment;else if("/"===n.path.slice(0,1))a.path=n.path,a.fragment=n.fragment;else{var o=void 0===a.path?[]:a.path.split("/"),s=n.path.split("/");for(o.length&&o.pop();".."===s[0]||"."===s[0];)".."===s[0]&&o.pop(),s.shift();a.path=o.concat(s).join("/"),a.fragment=n.fragment}return i(a)}var o=e("./http"),s={isObject:e("lodash-compat/lang/isObject"),cloneDeep:e("lodash-compat/lang/cloneDeep"),isArray:e("lodash-compat/lang/isArray"),isString:e("lodash-compat/lang/isString")},l=t.exports=function(){this.failedUrls=[],this.resolverCache={},this.pendingUrls={}};l.prototype.processAllOf=function(e,t,n,r,i,a){var o,s,l;n["x-resolved-from"]=["#/definitions/"+t];var u=n.allOf;for(u.sort(function(e,t){return e.$ref&&t.$ref?0:e.$ref?-1:1}),o=0;o<u.length;o++)l=u[o],s="/definitions/"+t+"/allOf",this.resolveInline(e,a,l,r,i,s);
+},l.prototype.resolve=function(e,t,n,r){this.spec=e;var i,a,l=t,u=n,c=r,p={};"function"==typeof t&&(l=null,u=t,c=n);var h,f=l;this.scope=c||this,this.iteration=this.iteration||0,this.scope.options&&this.scope.options.requestInterceptor&&(p.requestInterceptor=this.scope.options.requestInterceptor),this.scope.options&&this.scope.options.responseInterceptor&&(p.responseInterceptor=this.scope.options.responseInterceptor);var d,m,g,y,v,b,w,_=0,x={},A={},S=[];e.definitions=e.definitions||{};for(d in e.definitions){var j=e.definitions[d];if(j.$ref)this.resolveInline(l,e,j,S,A,j);else{for(y in j.properties)g=j.properties[y],s.isArray(g.allOf)?this.processAllOf(l,d,g,S,A,e):this.resolveTo(l,g,S,"/definitions");j.allOf&&this.processAllOf(l,d,j,S,A,e)}}e.parameters=e.parameters||{};for(d in e.parameters){if(v=e.parameters[d],"body"===v["in"]&&v.schema)if(s.isArray(v.schema.allOf)){h="inline_model";var E=h;for(b=!1,w=0;!b;){if("undefined"==typeof e.definitions[E]){b=!0;break}E=h+"_"+w,w++}e.definitions[E]={allOf:v.schema.allOf},delete v.schema.allOf,v.schema.$ref="#/definitions/"+E,this.processAllOf(l,E,e.definitions[E],S,A,e)}else this.resolveTo(l,v.schema,S,i);v.$ref&&this.resolveInline(l,e,v,S,A,v.$ref)}for(d in e.paths){var O,k,T;if(m=e.paths[d],"object"==typeof m){for(O in m)if("$ref"===O)i="/paths"+d,this.resolveInline(l,e,m,S,A,i);else{k=m[O];var C=m.parameters||[],I=k.parameters||[];C.forEach(function(e){I.unshift(e)}),"parameters"!==O&&s.isObject(k)&&(k.parameters=k.parameters||I);for(a in I){if(v=I[a],i="/paths"+d+"/"+O+"/parameters","body"===v["in"]&&v.schema)if(s.isArray(v.schema.allOf)){for(h="inline_model",d=h,b=!1,w=0;!b;){if("undefined"==typeof e.definitions[d]){b=!0;break}d=h+"_"+w,w++}e.definitions[d]={allOf:v.schema.allOf},delete v.schema.allOf,v.schema.$ref="#/definitions/"+d,this.processAllOf(l,d,e.definitions[d],S,A,e)}else this.resolveTo(l,v.schema,S,i);v.$ref&&this.resolveInline(l,e,v,S,A,v.$ref)}for(T in k.responses){var D=k.responses[T];if(i="/paths"+d+"/"+O+"/responses/"+T,s.isObject(D)&&(D.$ref&&this.resolveInline(l,e,D,S,A,i),D.schema)){var L=D;if(s.isArray(L.schema.allOf)){for(h="inline_model",d=h,b=!1,w=0;!b;){if("undefined"==typeof e.definitions[d]){b=!0;break}d=h+"_"+w,w++}e.definitions[d]={allOf:L.schema.allOf},delete L.schema.allOf,delete L.schema.type,L.schema.$ref="#/definitions/"+d,this.processAllOf(l,d,e.definitions[d],S,A,e)}else"array"===L.schema.type?L.schema.items&&L.schema.items.$ref&&this.resolveInline(l,e,L.schema.items,S,A,i):this.resolveTo(l,D.schema,S,i)}}}m.parameters=[]}}var M,R=0,U=[],P=S;for(a=0;a<P.length;a++){var q=P[a];if(l===q.root){if("ref"===q.resolveAs){var B,z=((q.root||"")+"/"+q.key).split("/"),N=[],$="";if(q.key.indexOf("../")>=0){for(var F=0;F<z.length;F++)".."===z[F]?N=N.slice(0,N.length-1):N.push(z[F]);for(B=0;B<N.length;B++)B>0&&($+="/"),$+=N[B];q.root=$,U.push(q)}else if(M=q.key.split("#"),2===M.length){0!==M[0].indexOf("http:")&&0!==M[0].indexOf("https:")||(q.root=M[0]),i=M[1].split("/");var V,H=e;for(B=0;B<i.length;B++){var Y=i[B];if(""!==Y){if(H=H[Y],"undefined"==typeof H){V=null;break}V=H}}null===V&&U.push(q)}}else if("inline"===q.resolveAs){if(q.key&&q.key.indexOf("#")===-1&&"/"!==q.key.charAt(0)){for(M=q.root.split("/"),i="",a=0;a<M.length-1;a++)i+=M[a]+"/";i+=q.key,q.root=i,q.location=""}U.push(q)}}else U.push(q)}R=U.length;for(var J={},W=0;W<U.length;W++)!function(e,t,n,r,i){if(e.root&&e.root!==l)if(n.failedUrls.indexOf(e.root)===-1){var a={useJQuery:!1,url:e.root,method:"get",headers:{accept:n.scope.swaggerRequestHeaders||"application/json"},on:{error:function(i){_+=1,console.log("failed url: "+a.url),n.failedUrls.push(a.url),r&&delete r[e.root],A[e.key]={root:e.root,location:e.location},_===R&&n.finish(t,f,S,x,A,u)},response:function(i){var a=i.obj;r&&delete r[e.root],n.resolverCache&&(n.resolverCache[e.root]=a),n.resolveItem(a,e.root,S,x,A,e),_+=1,_===R&&n.finish(t,f,S,x,A,u)}}};c&&c.fetchSpecTimeout&&(a.timeout=c.fetchSpecTimeout),c&&c.clientAuthorizations&&c.clientAuthorizations.apply(a),function h(){setTimeout(function(){if(r[a.url])h();else{var e=n.resolverCache[a.url];s.isObject(e)?a.on.response({obj:e}):(r[a.url]=!0,(new o).execute(a,p))}},0)}()}else _+=1,A[e.key]={root:e.root,location:e.location},_===R&&n.finish(t,f,S,x,A,u);else n.resolveItem(t,f,S,x,A,e),_+=1,_===R&&n.finish(t,l,S,x,A,u,!0)}(U[W],e,this,J,W);0===Object.keys(U).length&&this.finish(e,f,S,x,A,u)},l.prototype.resolveItem=function(e,t,n,r,i,a){var o=a.location,s=e,l=o.split("/");if(""!==o)for(var u=0;u<l.length;u++){var c=l[u];if(c.indexOf("~1")!==-1&&(c=l[u].replace(/~0/g,"~").replace(/~1/g,"/"),"/"!==c.charAt(0)&&(c="/"+c)),"undefined"==typeof s||null===s)break;if(""===c&&u===l.length-1&&l.length>1){s=null;break}c.length>0&&(s=s[c])}var p=a.key;l=a.key.split("/");var h=l[l.length-1];h.indexOf("#")>=0&&(h=h.split("#")[1]),null!==s&&"undefined"!=typeof s?r[p]={name:h,obj:s,key:a.key,root:a.root}:i[p]={root:a.root,location:a.location}},l.prototype.finish=function(e,t,n,r,i,a,o){var s,l;for(s in n){var u=n[s],c=u.key,p=r[c];if(p)if(e.definitions=e.definitions||{},"ref"===u.resolveAs){if(o!==!0)for(c in p.obj)l=this.retainRoot(c,p.obj[c],u.root),p.obj[c]=l;e.definitions[p.name]=p.obj,u.obj.$ref="#/definitions/"+p.name}else if("inline"===u.resolveAs){var h=u.obj;h["x-resolved-from"]=[u.key],delete h.$ref;for(c in p.obj)l=p.obj[c],o!==!0&&(l=this.retainRoot(c,p.obj[c],u.root)),h[c]=l}}var f=this.countUnresolvedRefs(e);0===f||this.iteration>5?(this.resolveAllOf(e.definitions),this.resolverCache=null,a.call(this.scope,e,i)):(this.iteration+=1,this.resolve(e,t,a,this.scope))},l.prototype.countUnresolvedRefs=function(e){var t,n=this.getRefs(e),r=[],i=[];for(t in n)0===t.indexOf("#")?r.push(t.substring(1)):i.push(t);for(t=0;t<r.length;t++)for(var a=r[t],o=a.split("/"),s=e,l=0;l<o.length;l++){var u=o[l];if(""!==u&&(s=s[u],"undefined"==typeof s)){i.push(a);break}}return i.length},l.prototype.getRefs=function(e,t){t=t||e;var n={};for(var r in t)if(t.hasOwnProperty(r)){var i=t[r];if("$ref"===r&&"string"==typeof i)n[i]=null;else if(s.isObject(i)){var a=this.getRefs(i);for(var o in a)n[o]=null}}return n},l.prototype.retainRoot=function(e,t,n){if(s.isObject(t))for(var r in t){var i=t[r];"$ref"===r&&"string"==typeof i?t[r]=a(n,i):s.isObject(i)&&this.retainRoot(r,i,n)}else s.isString(t)&&"$ref"===e&&(t=a(n,t));return t},l.prototype.resolveInline=function(e,t,n,r,i,a){var o,s,l,u,c=n.$ref,p=n.$ref,h=!1;if(e=e||"",p){if(0===p.indexOf("../")){for(s=p.split("../"),l=e.split("/"),p="",o=0;o<s.length;o++)""===s[o]?l=l.slice(0,l.length-1):p+=s[o];for(e="",o=0;o<l.length-1;o++)o>0&&(e+="/"),e+=l[o];h=!0}if(p.indexOf("#")>=0)if(0===p.indexOf("/"))u=p.split("#"),s=e.split("//"),l=s[1].split("/"),e=s[0]+"//"+l[0]+u[0],a=u[1];else{if(u=p.split("#"),""!==u[0]){if(l=e.split("/"),l=l.slice(0,l.length-1),!h){e="";for(var f=0;f<l.length;f++)f>0&&(e+="/"),e+=l[f]}e+="/"+p.split("#")[0]}a=u[1]}if(0===p.indexOf("http:")||0===p.indexOf("https:"))p.indexOf("#")>=0?(e=p.split("#")[0],a=p.split("#")[1]):(e=p,a=""),r.push({obj:n,resolveAs:"inline",root:e,key:c,location:a});else if(0===p.indexOf("#"))a=p.split("#")[1],r.push({obj:n,resolveAs:"inline",root:e,key:c,location:a});else if(0===p.indexOf("/")&&p.indexOf("#")===-1){a=p;var d=e.match(/^https?\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);d&&(e=d[0]+p.substring(1),a=""),r.push({obj:n,resolveAs:"inline",root:e,key:c,location:a})}else r.push({obj:n,resolveAs:"inline",root:e,key:c,location:a})}else"array"===n.type&&this.resolveTo(e,n.items,r,a)},l.prototype.resolveTo=function(e,t,n,r){var i,a,o=t.$ref,l=e;if("undefined"!=typeof o&&null!==o){if(o.indexOf("#")>=0){var u=o.split("#");if(u[0]&&0===o.indexOf("/"));else if(!u[0]||0!==u[0].indexOf("http:")&&0!==u[0].indexOf("https:")){if(u[0]&&u[0].length>0){for(i=e.split("/"),l="",a=0;a<i.length-1;a++)l+=i[a]+"/";l+=u[0]}}else l=u[0],o=u[1];r=u[1]}else if(0===o.indexOf("http:")||0===o.indexOf("https:"))l=o,r="";else{for(i=e.split("/"),l="",a=0;a<i.length-1;a++)l+=i[a]+"/";l+=o,r=""}n.push({obj:t,resolveAs:"ref",root:l,key:o,location:r})}else if("array"===t.type){var c=t.items;this.resolveTo(e,c,n,r)}else if(t&&(t.properties||t.additionalProperties)){var p=this.uniqueName("inline_model");t.title&&(p=this.uniqueName(t.title)),delete t.title,this.spec.definitions[p]=s.cloneDeep(t),t.$ref="#/definitions/"+p,delete t.type,delete t.properties}},l.prototype.uniqueName=function(e){for(var t=e,n=0;;){if(!s.isObject(this.spec.definitions[t]))return t;t=e+"_"+n,n++}},l.prototype.resolveAllOf=function(e,t,n){n=n||0,t=t||e;var r;for(var i in t)if(t.hasOwnProperty(i)){var a=t[i];if(null===a)throw new TypeError("Swagger 2.0 does not support null types ("+t+").  See https://github.com/swagger-api/swagger-spec/issues/229.");if("object"==typeof a&&this.resolveAllOf(e,a,n+1),a&&"undefined"!=typeof a.allOf){var o=a.allOf;if(s.isArray(o)){var l=s.cloneDeep(a);delete l.allOf,l["x-composed"]=!0,"undefined"!=typeof a["x-resolved-from"]&&(l["x-resolved-from"]=a["x-resolved-from"]);for(var u=0;u<o.length;u++){var c=o[u],p="self";"undefined"!=typeof c["x-resolved-from"]&&(p=c["x-resolved-from"][0]);for(var h in c)if(l.hasOwnProperty(h))if("properties"===h){var f=c[h];for(r in f){l.properties[r]=s.cloneDeep(f[r]);var d=f[r]["x-resolved-from"];"undefined"!=typeof d&&"self"!==d||(d=p),l.properties[r]["x-resolved-from"]=d}}else if("required"===h){for(var m=l.required.concat(c[h]),g=0;g<m.length;++g)for(var y=g+1;y<m.length;++y)m[g]===m[y]&&m.splice(y--,1);l.required=m}else"x-resolved-from"===h&&l["x-resolved-from"].push(p);else if(l[h]=s.cloneDeep(c[h]),"properties"===h)for(r in l[h])l[h][r]["x-resolved-from"]=p}t[i]=l}}}}},{"./http":5,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isString":146}],7:[function(e,t,n){"use strict";var r=e("./helpers"),i={isPlainObject:e("lodash-compat/lang/isPlainObject"),isUndefined:e("lodash-compat/lang/isUndefined"),isArray:e("lodash-compat/lang/isArray"),isObject:e("lodash-compat/lang/isObject"),isEmpty:e("lodash-compat/lang/isEmpty"),map:e("lodash-compat/collection/map"),indexOf:e("lodash-compat/array/indexOf"),cloneDeep:e("lodash-compat/lang/cloneDeep"),keys:e("lodash-compat/object/keys"),forEach:e("lodash-compat/collection/forEach")},a=t.exports.optionHtml=function(e,t){return'<tr><td class="optionName">'+e+":</td><td>"+t+"</td></tr>"};t.exports.typeFromJsonSchema=function(e,t){var n;return"integer"===e&&"int32"===t?n="integer":"integer"===e&&"int64"===t?n="long":"integer"===e&&"undefined"==typeof t?n="long":"string"===e&&"date-time"===t?n="date-time":"string"===e&&"date"===t?n="date":"number"===e&&"float"===t?n="float":"number"===e&&"double"===t?n="double":"number"===e&&"undefined"==typeof t?n="double":"boolean"===e?n="boolean":"string"===e&&(n="string"),n};var o=t.exports.getStringSignature=function(e,t){var n="";return"undefined"!=typeof e.$ref?n+=r.simpleRef(e.$ref):"undefined"==typeof e.type?n+="object":"array"===e.type?t?n+=o(e.items||e.$ref||{}):(n+="Array[",n+=o(e.items||e.$ref||{}),n+="]"):n+="integer"===e.type&&"int32"===e.format?"integer":"integer"===e.type&&"int64"===e.format?"long":"integer"===e.type&&"undefined"==typeof e.format?"long":"string"===e.type&&"date-time"===e.format?"date-time":"string"===e.type&&"date"===e.format?"date":"string"===e.type&&"undefined"==typeof e.format?"string":"number"===e.type&&"float"===e.format?"float":"number"===e.type&&"double"===e.format?"double":"number"===e.type&&"undefined"==typeof e.format?"double":"boolean"===e.type?"boolean":e.$ref?r.simpleRef(e.$ref):e.type,n},s=t.exports.schemaToJSON=function(e,t,n,a){e=r.resolveSchema(e),"function"!=typeof a&&(a=function(e){return(e||{})["default"]}),n=n||{};var o,l,u=e.type||"object",c=e.format;return i.isUndefined(e.example)?i.isUndefined(e.items)&&i.isArray(e["enum"])&&(l=e["enum"][0]):l=e.example,i.isUndefined(l)&&(e.$ref?(o=t[r.simpleRef(e.$ref)],i.isUndefined(o)||(i.isUndefined(n[o.name])?(n[o.name]=o,l=s(o.definition,t,n,a),delete n[o.name]):l="array"===o.type?[]:{})):i.isUndefined(e["default"])?"string"===u?l="date-time"===c?(new Date).toISOString():"date"===c?(new Date).toISOString().split("T")[0]:"string":"integer"===u?l=0:"number"===u?l=0:"boolean"===u?l=!0:"object"===u?(l={},i.forEach(e.properties,function(e,r){var o=i.cloneDeep(e);o["default"]=a(e),l[r]=s(o,t,n,a)})):"array"===u&&(l=[],i.isArray(e.items)?i.forEach(e.items,function(e){l.push(s(e,t,n,a))}):i.isPlainObject(e.items)?l.push(s(e.items,t,n,a)):i.isUndefined(e.items)?l.push({}):r.log("Array type's 'items' property is not an array or an object, cannot process")):l=e["default"]),l};t.exports.schemaToHTML=function(e,t,n,o){function s(e,t,a){var o,s=t;return e.$ref?(s=e.title||r.simpleRef(e.$ref),o=n[s]):i.isUndefined(t)&&(s=e.title||"Inline Model "+ ++m,o={definition:e}),a!==!0&&(f[s]=i.isUndefined(o)?{}:o.definition),s}function l(e){var t='<span class="propType">',n=e.type||"object";return e.$ref?t+=s(e,r.simpleRef(e.$ref)):"object"===n?t+=i.isUndefined(e.properties)?"object":s(e):"array"===n?(t+="Array[",i.isArray(e.items)?t+=i.map(e.items,s).join(","):i.isPlainObject(e.items)?t+=i.isUndefined(e.items.$ref)?i.isUndefined(e.items.type)||i.indexOf(["array","object"],e.items.type)!==-1?s(e.items):e.items.type:s(e.items,r.simpleRef(e.items.$ref)):(r.log("Array type's 'items' schema is not an array or an object, cannot process"),t+="object"),t+="]"):t+=e.type,t+="</span>"}function u(e,t){var n="",r=e.type||"object",o="array"===r;switch(o&&(r=i.isPlainObject(e.items)&&!i.isUndefined(e.items.type)?e.items.type:"object"),i.isUndefined(e["default"])||(n+=a("Default",e["default"])),r){case"string":e.minLength&&(n+=a("Min. Length",e.minLength)),e.maxLength&&(n+=a("Max. Length",e.maxLength)),e.pattern&&(n+=a("Reg. Exp.",e.pattern));break;case"integer":case"number":e.minimum&&(n+=a("Min. Value",e.minimum)),e.exclusiveMinimum&&(n+=a("Exclusive Min.","true")),e.maximum&&(n+=a("Max. Value",e.maximum)),e.exclusiveMaximum&&(n+=a("Exclusive Max.","true")),e.multipleOf&&(n+=a("Multiple Of",e.multipleOf))}if(o&&(e.minItems&&(n+=a("Min. Items",e.minItems)),e.maxItems&&(n+=a("Max. Items",e.maxItems)),e.uniqueItems&&(n+=a("Unique Items","true")),e.collectionFormat&&(n+=a("Coll. Format",e.collectionFormat))),i.isUndefined(e.items)&&i.isArray(e["enum"])){var s;s="number"===r||"integer"===r?e["enum"].join(", "):'"'+e["enum"].join('", "')+'"',n+=a("Enum",s)}return n.length>0&&(t='<span class="propWrap">'+t+'<table class="optionsWrapper"><tr><th colspan="2">'+r+"</th></tr>"+n+"</table></span>"),t}function c(e,t){var a=e.type||"object",c="array"===e.type,f=p+t+" "+(c?"[":"{")+h;if(t&&d.push(t),c)i.isArray(e.items)?f+="<div>"+i.map(e.items,function(e){var t=e.type||"object";return i.isUndefined(e.$ref)?i.indexOf(["array","object"],t)>-1?"object"===t&&i.isUndefined(e.properties)?"object":s(e):u(e,t):s(e,r.simpleRef(e.$ref))}).join(",</div><div>"):i.isPlainObject(e.items)?f+=i.isUndefined(e.items.$ref)?i.indexOf(["array","object"],e.items.type||"object")>-1?(i.isUndefined(e.items.type)||"object"===e.items.type)&&i.isUndefined(e.items.properties)?"<div>object</div>":"<div>"+s(e.items)+"</div>":"<div>"+u(e.items,e.items.type)+"</div>":"<div>"+s(e.items,r.simpleRef(e.items.$ref))+"</div>":(r.log("Array type's 'items' property is not an array or an object, cannot process"),f+="<div>object</div>");else if(e.$ref)f+="<div>"+s(e,t)+"</div>";else if("object"===a){if(i.isPlainObject(e.properties)){var m=i.map(e.properties,function(t,a){var s,c,p=i.indexOf(e.required,a)>=0,h=i.cloneDeep(t),f=p?"required":"",d='<span class="propName '+f+'">'+a+"</span> (";return h["default"]=o(h),h=r.resolveSchema(h),c=t.description||h.description,i.isUndefined(h.$ref)||(s=n[r.simpleRef(h.$ref)],i.isUndefined(s)||i.indexOf([void 0,"array","object"],s.definition.type)!==-1||(h=r.resolveSchema(s.definition))),d+=l(h),p||(d+=', <span class="propOptKey">optional</span>'),t.readOnly&&(d+=', <span class="propReadOnly">read only</span>'),d+=")",i.isUndefined(c)||(d+=': <span class="propDesc">'+c+"</span>"),h["enum"]&&(d+=' = <span class="propVals">[\''+h["enum"].join("', '")+"']</span>"),"<div"+(t.readOnly?' class="readOnly"':"")+">"+u(h,d)}).join(",</div>");m&&(f+=m+"</div>")}}else f+="<div>"+u(e,a)+"</div>";return f+p+(c?"]":"}")+h}var p='<span class="strong">',h="</span>";if(i.isObject(arguments[0])&&(e=void 0,t=arguments[0],n=arguments[1],o=arguments[2]),n=n||{},t=r.resolveSchema(t),i.isEmpty(t))return p+"Empty"+h;if("string"==typeof t.$ref&&(e=r.simpleRef(t.$ref),t=n[e],"undefined"==typeof t))return p+e+" is not defined!"+h;"string"!=typeof e&&(e=t.title||"Inline Model"),t.definition&&(t=t.definition),"function"!=typeof o&&(o=function(e){return(e||{})["default"]});for(var f={},d=[],m=0,g=c(t,e);i.keys(f).length>0;)i.forEach(f,function(e,t){var n=i.indexOf(d,t)>-1;delete f[t],n||(d.push(t),g+="<br />"+c(e,t))});return g}},{"./helpers":4,"lodash-compat/array/indexOf":49,"lodash-compat/collection/forEach":54,"lodash-compat/collection/map":56,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isArray":140,"lodash-compat/lang/isEmpty":141,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isPlainObject":145,"lodash-compat/lang/isUndefined":148,"lodash-compat/object/keys":149}],8:[function(e,t,n){"use strict";var r=e("./http"),i={isObject:e("lodash-compat/lang/isObject")},a=t.exports=function(){this.errors=[],this.warnings=[],this.modelMap={}};a.prototype.setDocumentationLocation=function(e){this.docLocation=e},a.prototype.convert=function(e,t,n,r){if(!e||!Array.isArray(e.apis))return this.finish(r,null);this.clientAuthorizations=t;var i={swagger:"2.0"};i.originalVersion=e.swaggerVersion,this.apiInfo(e,i),this.securityDefinitions(e,i),e.basePath&&this.setDocumentationLocation(e.basePath);var a,o=!1;for(a=0;a<e.apis.length;a++){var s=e.apis[a];Array.isArray(s.operations)&&(o=!0)}o?(this.declaration(e,i),this.finish(r,i)):this.resourceListing(e,i,n,r)},a.prototype.declaration=function(e,t){var n,r,a,o;if(e.apis){0===e.basePath.indexOf("http://")?(a=e.basePath.substring("http://".length),o=a.indexOf("/"),o>0?(t.host=a.substring(0,o),t.basePath=a.substring(o)):(t.host=a,t.basePath="/")):0===e.basePath.indexOf("https://")?(a=e.basePath.substring("https://".length),o=a.indexOf("/"),o>0?(t.host=a.substring(0,o),t.basePath=a.substring(o)):(t.host=a,t.basePath="/")):t.basePath=e.basePath;var s;if(e.authorizations&&(s=e.authorizations),e.consumes&&(t.consumes=e.consumes),e.produces&&(t.produces=e.produces),i.isObject(e))for(n in e.models){var l=e.models[n],u=l.id||n;this.modelMap[u]=n}for(r=0;r<e.apis.length;r++){var c=e.apis[r],p=c.path,h=c.operations;this.operations(p,e.resourcePath,h,s,t)}var f=e.models||{};this.models(f,t)}},a.prototype.models=function(e,t){if(i.isObject(e)){var n;t.definitions=t.definitions||{};for(n in e){var r,a=e[n],o=[],s={properties:{}};for(r in a.properties){var l=a.properties[r],u={};this.dataType(l,u),l.description&&(u.description=l.description),l["enum"]&&(u["enum"]=l["enum"]),"boolean"==typeof l.required&&l.required===!0&&o.push(r),"string"==typeof l.required&&"true"===l.required&&o.push(r),s.properties[r]=u}o.length>0?s.required=o:s.required=a.required,t.definitions[n]=s}}},a.prototype.extractTag=function(e){var t=e||"default";return 0!==t.indexOf("http:")&&0!==t.indexOf("https:")||(t=t.split(["/"]),t=t[t.length-1].substring()),t.endsWith(".json")&&(t=t.substring(0,t.length-".json".length)),t.replace("/","")},a.prototype.operations=function(e,t,n,r,i){if(Array.isArray(n)){var a;i.paths||(i.paths={});var o=i.paths[e]||{},s=this.extractTag(t);i.tags=i.tags||[];var l=!1;for(a=0;a<i.tags.length;a++){var u=i.tags[a];u.name===s&&(l=!0)}for(l||i.tags.push({name:s}),a=0;a<n.length;a++){var c=n[a],p=(c.method||c.httpMethod).toLowerCase(),h={tags:[s]},f=c.authorizations;if(f&&0===Object.keys(f).length&&(f=r),"undefined"!=typeof f){var d;for(var m in f){h.security=h.security||[];var g=f[m];if(g){var y=[];for(var v in g)y.push(g[v].scope);d={},d[m]=y,h.security.push(d)}else d={},d[m]=[],h.security.push(d)}}c.consumes?h.consumes=c.consumes:i.consumes&&(h.consumes=i.consumes),c.produces?h.produces=c.produces:i.produces&&(h.produces=i.produces),c.summary&&(h.summary=c.summary),c.notes&&(h.description=c.notes),c.nickname&&(h.operationId=c.nickname),c.deprecated&&(h.deprecated=c.deprecated),this.authorizations(f,i),this.parameters(h,c.parameters,i),this.responseMessages(h,c,i),o[p]=h}i.paths[e]=o}},a.prototype.responseMessages=function(e,t){if(i.isObject(t)){var n={};this.dataType(t,n),!n.schema&&n.type&&(n={schema:n}),e.responses=e.responses||{};var r=!1;if(Array.isArray(t.responseMessages)){var a,o=t.responseMessages;for(a=0;a<o.length;a++){var s=o[a],l={description:s.message};200===s.code&&(r=!0),s.responseModel&&(l.schema={$ref:"#/definitions/"+s.responseModel}),e.responses[""+s.code]=l}}r?e.responses["default"]=n:e.responses[200]=n}},a.prototype.authorizations=function(e){!i.isObject(e)},a.prototype.parameters=function(e,t){if(Array.isArray(t)){var n;for(n=0;n<t.length;n++){var r=t[n],i={};if(i.name=r.name,i.description=r.description,i.required=r.required,i["in"]=r.paramType,"body"===i["in"]&&(i.name="body"),"form"===i["in"]&&(i["in"]="formData"),r["enum"]&&(i["enum"]=r["enum"]),r.allowMultiple===!0||"true"===r.allowMultiple){var a={};if(this.dataType(r,a),i.type="array",i.items=a,r.allowableValues){var o=r.allowableValues;"LIST"===o.valueType&&(i["enum"]=o.values)}}else this.dataType(r,i);"undefined"!=typeof r.defaultValue&&(i["default"]=r.defaultValue),e.parameters=e.parameters||[],e.parameters.push(i)}}},a.prototype.dataType=function(e,t){if(i.isObject(e)){e.minimum&&(t.minimum=e.minimum),e.maximum&&(t.maximum=e.maximum),e.format&&(t.format=e.format),"undefined"!=typeof e.defaultValue&&(t["default"]=e.defaultValue);var n=this.toJsonSchema(e);n&&(t=t||{},n.type&&(t.type=n.type),n.format&&(t.format=n.format),n.$ref&&(t.schema={$ref:n.$ref}),n.items&&(t.items=n.items))}},a.prototype.toJsonSchema=function(e){if(!e)return"object";var t=e.type||e.dataType||e.responseClass||"",n=t.toLowerCase(),r=(e.format||"").toLowerCase();if(0===n.indexOf("list[")){var i=t.substring(5,t.length-1),a=this.toJsonSchema({type:i});return{type:"array",items:a}}if("int"===n||"integer"===n&&"int32"===r)return{type:"integer",format:"int32"};if("long"===n||"integer"===n&&"int64"===r)return{type:"integer",format:"int64"};if("integer"===n)return{type:"integer",format:"int64"};if("float"===n||"number"===n&&"float"===r)return{type:"number",format:"float"};if("double"===n||"number"===n&&"double"===r)return{type:"number",format:"double"};if("string"===n&&"date-time"===r||"date"===n)return{type:"string",format:"date-time"};if("string"===n)return{type:"string"};if("file"===n)return{type:"file"};if("boolean"===n)return{type:"boolean"};if("boolean"===n)return{type:"boolean"};if("array"===n||"list"===n){if(e.items){var o=this.toJsonSchema(e.items);return{type:"array",items:o}}return{type:"array",items:{type:"object"}}}return e.$ref?{$ref:this.modelMap[e.$ref]?"#/definitions/"+this.modelMap[e.$ref]:e.$ref}:"void"===n||""===n?{}:this.modelMap[e.type]?{$ref:"#/definitions/"+this.modelMap[e.type]}:{type:e.type}},a.prototype.resourceListing=function(e,t,n,i){var a,o=0,s=this,l=e.apis.length,u=t,c={};n&&n.requestInterceptor&&(c.requestInterceptor=n.requestInterceptor),n&&n.responseInterceptor&&(c.responseInterceptor=n.responseInterceptor);var p="application/json";for(n&&n.swaggerRequestHeaders&&(p=n.swaggerRequestHeaders),0===l&&this.finish(i,t),a=0;a<l;a++){var h=e.apis[a],f=h.path,d=this.getAbsolutePath(e.swaggerVersion,this.docLocation,f);h.description&&(t.tags=t.tags||[],t.tags.push({name:this.extractTag(h.path),description:h.description||""}));var m={url:d,headers:{accept:p},on:{},method:"get",timeout:n.timeout};m.on.response=function(e){o+=1;var t=e.obj;t&&s.declaration(t,u),o===l&&s.finish(i,u)},m.on.error=function(e){console.error(e),o+=1,o===l&&s.finish(i,u)},this.clientAuthorizations&&"function"==typeof this.clientAuthorizations.apply&&this.clientAuthorizations.apply(m),(new r).execute(m,c)}},a.prototype.getAbsolutePath=function(e,t,n){if("1.0"===e&&t.endsWith(".json")){var r=t.lastIndexOf("/");r>0&&(t=t.substring(0,r))}var i=t;return 0===n.indexOf("http:")||0===n.indexOf("https:")?i=n:(t.endsWith("/")&&(i=t.substring(0,t.length-1)),i+=n),i=i.replace("{format}","json")},a.prototype.securityDefinitions=function(e,t){if(e.authorizations){var n;for(n in e.authorizations){var r=!1,i={vendorExtensions:{}},a=e.authorizations[n];if("apiKey"===a.type)i.type="apiKey",i["in"]=a.passAs,i.name=a.keyname||n,r=!0;else if("basicAuth"===a.type)i.type="basicAuth",r=!0;else if("oauth2"===a.type){var o,s=a.scopes||[],l={};for(o in s){var u=s[o];l[u.scope]=u.description}if(i.type="oauth2",o>0&&(i.scopes=l),a.grantTypes){if(a.grantTypes.implicit){var c=a.grantTypes.implicit;i.flow="implicit",i.authorizationUrl=c.loginEndpoint,r=!0}if(a.grantTypes.authorization_code&&!i.flow){var p=a.grantTypes.authorization_code;i.flow="accessCode",i.authorizationUrl=p.tokenRequestEndpoint.url,i.tokenUrl=p.tokenEndpoint.url,r=!0}}}r&&(t.securityDefinitions=t.securityDefinitions||{},t.securityDefinitions[n]=i)}}},a.prototype.apiInfo=function(e,t){if(e.info){var n=e.info;t.info={},n.contact&&(t.info.contact={},t.info.contact.email=n.contact),n.description&&(t.info.description=n.description),n.title&&(t.info.title=n.title),n.termsOfServiceUrl&&(t.info.termsOfService=n.termsOfServiceUrl),(n.license||n.licenseUrl)&&(t.license={},n.license&&(t.license.name=n.license),n.licenseUrl&&(t.license.url=n.licenseUrl))}else this.warnings.push("missing info section")},a.prototype.finish=function(e,t){e(t)}},{"./http":5,"lodash-compat/lang/isObject":144}],9:[function(e,t,n){"use strict";var r=(e("../helpers").log,{isPlainObject:e("lodash-compat/lang/isPlainObject"),isString:e("lodash-compat/lang/isString")}),i=e("../schema-markup.js"),a=e("js-yaml"),o=t.exports=function(e,t,n,r){return this.definition=t||{},this.isArray="array"===t.type,this.models=n||{},this.name=e||t.title||"Inline Model",this.modelPropertyMacro=r||function(e){return e["default"]},this};o.prototype.createJSONSample=o.prototype.getSampleValue=function(e){return e=e||{},e[this.name]=this,this.examples&&r.isPlainObject(this.examples)&&this.examples["application/json"]?(this.definition.example=this.examples["application/json"],r.isString(this.definition.example)&&(this.definition.example=a.safeLoad(this.definition.example))):this.definition.example||(this.definition.example=this.examples),i.schemaToJSON(this.definition,this.models,e,this.modelPropertyMacro)},o.prototype.getMockSignature=function(){return i.schemaToHTML(this.name,this.definition,this.models,this.modelPropertyMacro)}},{"../helpers":4,"../schema-markup.js":7,"js-yaml":19,"lodash-compat/lang/isPlainObject":145,"lodash-compat/lang/isString":146}],10:[function(e,t,n){"use strict";function r(e,t){if(i.isEmpty(t))return e[0];for(var n=0,r=t.length;n<r;n++)if(e.indexOf(t[n])>-1)return t[n];return e[0]}var i={cloneDeep:e("lodash-compat/lang/cloneDeep"),isUndefined:e("lodash-compat/lang/isUndefined"),isEmpty:e("lodash-compat/lang/isEmpty"),isObject:e("lodash-compat/lang/isObject")},a=e("../helpers"),o=e("./model"),s=e("../http"),l=e("q"),u=t.exports=function(e,t,n,r,i,s,l,u,c){var p=[];e=e||{},s=s||{},e&&e.options&&(this.client=e.options.client||null,this.requestInterceptor=e.options.requestInterceptor||null,this.responseInterceptor=e.options.responseInterceptor||null,this.requestAgent=e.options.requestAgent),this.authorizations=s.security,this.basePath=e.basePath||"/",this.clientAuthorizations=c,this.consumes=s.consumes||e.consumes||["application/json"],this.produces=s.produces||e.produces||["application/json"],this.deprecated=s.deprecated,this.description=s.description,this.host=e.host,this.method=r||p.push("Operation "+n+" is missing method."),this.models=u||{},this.nickname=n||p.push("Operations must have a nickname."),this.operation=s,this.operations={},this.parameters=null!==s?s.parameters||[]:{},this.parent=e,this.path=i||p.push("Operation "+this.nickname+" is missing path."),this.responses=s.responses||{},this.scheme=t||e.scheme||"http",this.schemes=s.schemes||e.schemes,this.security=s.security||e.security,this.summary=s.summary||"",this.timeout=e.timeout,this.type=null,this.useJQuery=e.useJQuery,this.jqueryAjaxCache=e.jqueryAjaxCache,this.enableCookies=e.enableCookies;var h;if(this.host||("undefined"!=typeof window?this.host=window.location.host:this.host="localhost"),this.parameterMacro=e.parameterMacro||function(e,t){return t["default"]},this.inlineModels=[],"/"!==this.basePath&&"/"===this.basePath.slice(-1)&&(this.basePath=this.basePath.slice(0,-1)),"string"==typeof this.deprecated)switch(this.deprecated.toLowerCase()){case"true":case"yes":case"1":this.deprecated=!0;break;case"false":case"no":case"0":case null:this.deprecated=!1;break;default:this.deprecated=Boolean(this.deprecated)}var f,d;if(l)for(h in l)d=new o(h,l[h],this.models,e.modelPropertyMacro),d&&(this.models[h]=d);else l={};for(f=0;f<this.parameters.length;f++){var m,g=this.parameters[f];g["default"]=this.parameterMacro(this,g),"array"===g.type&&(g.isList=!0,g.allowMultiple=!0);var y=this.getType(g);y&&"boolean"===y.toString().toLowerCase()&&(g.allowableValues={},g.isList=!0,g["enum"]=[!0,!1]);for(h in g)a.extractExtensions(h,g);"undefined"!=typeof g["x-example"]&&(m=g["x-example"],g["default"]=m),g["x-examples"]&&(m=g["x-examples"]["default"],"undefined"!=typeof m&&(g["default"]=m));var v=g["enum"]||g.items&&g.items["enum"];if("undefined"!=typeof v){var b;for(g.allowableValues={},g.allowableValues.values=[],g.allowableValues.descriptiveValues=[],b=0;b<v.length;b++){var w=v[b],_=w===g["default"]||w+""===g["default"];g.allowableValues.values.push(w),g.allowableValues.descriptiveValues.push({value:w+"",isDefault:_})}}"array"===g.type&&(y=[y],"undefined"==typeof g.allowableValues&&(delete g.isList,delete g.allowMultiple)),g.modelSignature={type:y,definitions:this.models},g.signature=this.getModelSignature(y,this.models).toString(),g.sampleJSON=this.getModelSampleJSON(y,this.models),g.responseClassSignature=g.signature}var x,A,S,j=this.responses;j[200]?(S=j[200],A="200"):j[201]?(S=j[201],A="201"):j[202]?(S=j[202],A="202"):j[203]?(S=j[203],A="203"):j[204]?(S=j[204],A="204"):j[205]?(S=j[205],A="205"):j[206]?(S=j[206],A="206"):j["default"]&&(S=j["default"],A="default");for(x in j)if(a.extractExtensions(x,j),"string"==typeof x&&x.indexOf("x-")===-1){var E=j[x];if("object"==typeof E&&"object"==typeof E.headers){var O=E.headers;for(var k in O){var T=O[k];if("object"==typeof T)for(var C in T)a.extractExtensions(C,T)}}}if(S)for(x in S)a.extractExtensions(x,S);if(S&&S.schema){var I,D=this.resolveModel(S.schema,l);delete j[A],D?(this.successResponse={},I=this.successResponse[A]=D):S.schema.type&&"object"!==S.schema.type&&"array"!==S.schema.type?(this.successResponse={},I=this.successResponse[A]=S.schema):(this.successResponse={},I=this.successResponse[A]=new o((void 0),S.schema||{},this.models,e.modelPropertyMacro)),I&&(I.vendorExtensions=S.vendorExtensions,S.description&&(I.description=S.description),S.examples&&(I.examples=S.examples),S.headers&&(I.headers=S.headers)),this.type=S}return p.length>0&&this.resource&&this.resource.api&&this.resource.api.fail&&this.resource.api.fail(p),this};u.prototype.isDefaultArrayItemValue=function(e,t){return t["default"]&&Array.isArray(t["default"])?t["default"].indexOf(e)!==-1:e===t["default"]},u.prototype.getType=function(e){var t,n=e.type,r=e.format,i=!1;"integer"===n&&"int32"===r?t="integer":"integer"===n&&"int64"===r?t="long":"integer"===n?t="integer":"string"===n?t="date-time"===r?"date-time":"date"===r?"date":"string":"number"===n&&"float"===r?t="float":"number"===n&&"double"===r?t="double":"number"===n?t="double":"boolean"===n?t="boolean":"array"===n?(i=!0,e.items&&(t=this.getType(e.items))):"file"===n&&(t="file"),e.$ref&&(t=a.simpleRef(e.$ref));var o=e.schema;if(o){var s=o.$ref;
+return s?(s=a.simpleRef(s),i?[s]:s):"object"===o.type?this.addInlineModel(o):this.getType(o)}return i?[t]:t},u.prototype.addInlineModel=function(e){var t=this.inlineModels.length,n=this.resolveModel(e,{});return n?(this.inlineModels.push(n),"Inline Model "+t):null},u.prototype.getInlineModel=function(e){if(/^Inline Model \d+$/.test(e)){var t=parseInt(e.substr("Inline Model".length).trim(),10),n=this.inlineModels[t];return n}return null},u.prototype.resolveModel=function(e,t){if("undefined"!=typeof e.$ref){var n=e.$ref;if(0===n.indexOf("#/definitions/")&&(n=n.substring("#/definitions/".length)),t[n])return new o(n,t[n],this.models,this.parent.modelPropertyMacro)}else if(e&&"object"==typeof e&&("object"===e.type||i.isUndefined(e.type)))return new o((void 0),e,this.models,this.parent.modelPropertyMacro);return null},u.prototype.help=function(e){for(var t=this.nickname+": "+this.summary+"\n",n=0;n<this.parameters.length;n++){var r=this.parameters[n],i=r.signature;t+="\n  * "+r.name+" ("+i+"): "+r.description}return"undefined"==typeof e&&a.log(t),t},u.prototype.getModelSignature=function(e,t){var n,r;return e instanceof Array&&(r=!0,e=e[0]),"undefined"==typeof e?(e="undefined",n=!0):t[e]?(e=t[e],n=!1):this.getInlineModel(e)?(e=this.getInlineModel(e),n=!1):n=!0,n?r?"Array["+e+"]":e.toString():r?"Array["+e.getMockSignature()+"]":e.getMockSignature()},u.prototype.supportHeaderParams=function(){return!0},u.prototype.supportedSubmitMethods=function(){return this.parent.supportedSubmitMethods},u.prototype.getHeaderParams=function(e){for(var t=this.setContentTypes(e,{}),n={},r=0;r<this.parameters.length;r++){var i=this.parameters[r];"header"===i["in"]&&(n[i.name.toLowerCase()]=i)}for(var a in e){var o=n[a.toLowerCase()];if("undefined"!=typeof o){var s=e[a];Array.isArray(s)&&(s=s.toString()),t[o.name]=s}}return t},u.prototype.urlify=function(e,t){for(var n={},r=this.path.replace(/#.*/,""),i="",a=0;a<this.parameters.length;a++){var o=this.parameters[a];if("undefined"!=typeof e[o.name]){var s;if("string"===o.type&&"password"===o.format&&t&&(s=!0),"path"===o["in"]){var l=new RegExp("{"+o.name+"}","gi"),u=e[o.name];u=Array.isArray(u)?this.encodePathCollection(o.collectionFormat,o.name,u,s):this.encodePathParam(u,s),r=r.replace(l,u)}else if("query"===o["in"]&&"undefined"!=typeof e[o.name])if(i+=""===i&&r.indexOf("?")<0?"?":"&","undefined"!=typeof o.collectionFormat){var c=e[o.name];i+=Array.isArray(c)?this.encodeQueryCollection(o.collectionFormat,o.name,c,s):this.encodeQueryKey(o.name)+"="+this.encodeQueryParam(e[o.name],s)}else i+=this.encodeQueryKey(o.name)+"="+this.encodeQueryParam(e[o.name],s);else"formData"===o["in"]&&(n[o.name]=e[o.name])}}var p=this.scheme+"://"+this.host;return"/"!==this.basePath&&(p+=this.basePath),p+r+i},u.prototype.getMissingParams=function(e){var t,n=[];for(t=0;t<this.parameters.length;t++){var r=this.parameters[t];r.required===!0&&"undefined"==typeof e[r.name]&&(n=r.name)}return n},u.prototype.getBody=function(e,t,n){for(var r,i,a,o,s,l={},u=!1,p=0;p<this.parameters.length;p++)if(i=this.parameters[p],"undefined"!=typeof t[i.name]){var h;"string"===i.type&&"password"===i.format&&(h="password"),"body"===i["in"]?a=t[i.name]:"formData"===i["in"]&&(l[i.name]={param:i,value:t[i.name],password:h},r=!0)}else"body"===i["in"]&&(u=!0);if(u&&"undefined"==typeof a){var f=e["Content-Type"];f&&0===f.indexOf("application/json")&&(a="{}")}var d=!1;if(e["Content-Type"]&&e["Content-Type"].indexOf("multipart/form-data")>=0&&(d=!0),r&&!d){var m="";for(o in l){i=l[o].param,s=l[o].value;var g;n&&n.maskPasswords&&(g=l[o].password),"undefined"!=typeof s&&(Array.isArray(s)?(""!==m&&(m+="&"),m+=this.encodeQueryCollection(i.collectionFormat,o,s,g)):(""!==m&&(m+="&"),m+=encodeURIComponent(o)+"="+c(encodeURIComponent(s),g)))}a=m}else if(d){var y;if("function"==typeof FormData){y=new FormData,y.type="formData";for(o in l)if(i=l[o].param,s=t[o],"undefined"!=typeof s)if("[object File]"==={}.toString.apply(s))y.append(o,s);else if("file"===s.type&&s.value)y.append(o,s.value);else if(Array.isArray(s))if("multi"===i.collectionFormat){y["delete"](o);for(var v in s)y.append(o,s[v])}else y.append(o,this.encodeQueryCollection(i.collectionFormat,o,s).split("=").slice(1).join("="));else y.append(o,s);a=y}else{y={};for(o in l)if(s=t[o],Array.isArray(s)){var b,w=i.collectionFormat||"multi";if("ssv"===w)b=" ";else if("pipes"===w)b="|";else if("tsv"===w)b="\t";else{if("multi"===w){y[o]=s;break}b=","}var _;s.forEach(function(e){_?_+=b:_="",_+=e}),y[o]=_}else y[o]=s;a=y}e["Content-Type"]="multipart/form-data"}return a},u.prototype.getModelSampleJSON=function(e,t){var n,r,a;if(t=t||{},n=e instanceof Array,a=n?e[0]:e,t[a]?r=t[a].createJSONSample():this.getInlineModel(a)&&(r=this.getInlineModel(a).createJSONSample()),r){if(r=n?[r]:r,"string"==typeof r)return r;if(i.isObject(r)){var o=r;if(r instanceof Array&&r.length>0&&(o=r[0]),o.nodeName&&"Node"==typeof o){var s=(new XMLSerializer).serializeToString(o);return this.formatXml(s)}return JSON.stringify(r,null,2)}return r}},u.prototype["do"]=function(e,t,n,r,i){return this.execute(e,t,n,r,i)},u.prototype.execute=function(e,t,n,r,o){var u,c,p,h,f=e||{},d={};i.isObject(t)&&(d=t,u=n,c=r),h="undefined"!=typeof d.timeout?d.timeout:this.timeout,this.client&&(d.client=this.client),this.requestAgent&&(d.requestAgent=this.requestAgent),!d.requestInterceptor&&this.requestInterceptor&&(d.requestInterceptor=this.requestInterceptor),!d.responseInterceptor&&this.responseInterceptor&&(d.responseInterceptor=this.responseInterceptor),"function"==typeof t&&(u=t,c=n),this.parent.usePromise?p=l.defer():(u=u||this.parent.defaultSuccessCallback||a.log,c=c||this.parent.defaultErrorCallback||a.log),"undefined"==typeof d.useJQuery&&(d.useJQuery=this.useJQuery),"undefined"==typeof d.jqueryAjaxCache&&(d.jqueryAjaxCache=this.jqueryAjaxCache),"undefined"==typeof d.enableCookies&&(d.enableCookies=this.enableCookies);var m=this.getMissingParams(f);if(m.length>0){var g="missing required params: "+m;return a.fail(g),this.parent.usePromise?(p.reject(g),p.promise):(c(g,o),{})}var y,v=this.getHeaderParams(f),b=this.setContentTypes(f,d),w={};for(y in v)w[y]=v[y];for(y in b)w[y]=b[y];var _=this.getBody(b,f,d),x=this.urlify(f,d.maskPasswords);if(x.indexOf(".{format}")>0&&w){var A=w.Accept||w.accept;A&&A.indexOf("json")>0?x=x.replace(".{format}",".json"):A&&A.indexOf("xml")>0&&(x=x.replace(".{format}",".xml"))}var S={url:x,method:this.method.toUpperCase(),body:_,enableCookies:d.enableCookies,useJQuery:d.useJQuery,jqueryAjaxCache:d.jqueryAjaxCache,deferred:p,headers:w,clientAuthorizations:d.clientAuthorizations,operation:this,connectionAgent:this.connectionAgent,on:{response:function(e){return p?(p.resolve(e),p.promise):u(e,o)},error:function(e){return p?(p.reject(e),p.promise):c(e,o)}}};return h&&(S.timeout=h),this.clientAuthorizations.apply(S,this.operation.security),d.mock===!0?S:(new s).execute(S,d)},u.prototype.setContentTypes=function(e,t){var n,i,o=this.parameters,s=e.parameterContentType||r(this.consumes,["application/json","application/yaml"]),l=t.responseContentType||r(this.produces,["application/json","application/yaml"]),u=[],c=[],p={};for(i=0;i<o.length;i++){var h=o[i];if("formData"===h["in"])"file"===h.type?u.push(h):c.push(h);else if("header"===h["in"]&&t){var f=h.name,d=t[h.name];"undefined"!=typeof t[h.name]&&(p[f]=d)}else"body"===h["in"]&&"undefined"!=typeof e[h.name]&&(n=e[h.name])}var m=n||u.length||c.length;if("post"===this.method||"put"===this.method||"patch"===this.method||("delete"===this.method||"get"===this.method)&&m){if(t.requestContentType&&(s=t.requestContentType),c.length>0){if(s=void 0,t.requestContentType)s=t.requestContentType;else if(u.length>0)s="multipart/form-data";else if(this.consumes&&this.consumes.length>0)for(var g in this.consumes){var y=this.consumes[g];0!==y.indexOf("application/x-www-form-urlencoded")&&0!==y.indexOf("multipart/form-data")||(s=y)}"undefined"==typeof s&&(s="application/x-www-form-urlencoded")}}else s=null;return s&&this.consumes&&this.consumes.indexOf(s)===-1&&a.log("server doesn't consume "+s+", try "+JSON.stringify(this.consumes)),this.matchesAccept(l)||a.log("server can't produce "+l),s&&""!==n||"application/x-www-form-urlencoded"===s?p["Content-Type"]=s:this.consumes&&this.consumes.length>0&&"application/x-www-form-urlencoded"===this.consumes[0]&&(p["Content-Type"]=this.consumes[0]),l&&(p.Accept=l),p},u.prototype.matchesAccept=function(e){return!e||!this.produces||(this.produces.indexOf(e)!==-1||this.produces.indexOf("*/*")!==-1)},u.prototype.asCurl=function(e,t){var n={mock:!0,maskPasswords:!0};if("object"==typeof t)for(var r in t)n[r]=t[r];var a=this.execute(e,n);this.clientAuthorizations.apply(a,this.operation.security);var o=[];if(o.push("-X "+this.method.toUpperCase()),"undefined"!=typeof a.headers){var s;for(s in a.headers){var l=a.headers[s];"string"==typeof l&&(l=l.replace(/\'/g,"\\u0027")),o.push("--header '"+s+": "+l+"'")}}var u=!1,p=!1,h=a.headers["Content-Type"];if(h&&0===h.indexOf("application/x-www-form-urlencoded")?u=!0:h&&0===h.indexOf("multipart/form-data")&&(u=!0,p=!0),a.body){var f;if(i.isObject(a.body)){if(p){p=!0;for(var d=0;d<this.parameters.length;d++){var m=this.parameters[d];if("formData"===m["in"]){f||(f="");var g;if(g="function"==typeof FormData&&a.body instanceof FormData?a.body.getAll(m.name):a.body[m.name])if("file"===m.type)g.name&&(f+="-F "+m.name+'=@"'+g.name+'" ');else if(Array.isArray(g))if("multi"===m.collectionFormat)for(var y in g)f+="-F "+this.encodeQueryKey(m.name)+"="+c(g[y],m.format)+" ";else f+="-F "+this.encodeQueryCollection(m.collectionFormat,m.name,c(g,m.format))+" ";else f+="-F "+this.encodeQueryKey(m.name)+"="+c(g,m.format)+" "}}}f||(f=JSON.stringify(a.body))}else f=a.body;f=f.replace(/\'/g,"%27").replace(/\n/g," \\ \n "),u||(f=f.replace(/&/g,"%26")),p?o.push(f):o.push("-d '"+f.replace(/@/g,"%40")+"'")}return"curl "+o.join(" ")+" '"+a.url+"'"},u.prototype.encodePathCollection=function(e,t,n,r){var i,a="",o="";for(o="ssv"===e?"%20":"tsv"===e?"%09":"pipes"===e?"|":",",i=0;i<n.length;i++)0===i?a=this.encodeQueryParam(n[i],r):a+=o+this.encodeQueryParam(n[i],r);return a},u.prototype.encodeQueryCollection=function(e,t,n,r){var i,a="";if(e=e||"default","default"===e||"multi"===e)for(i=0;i<n.length;i++)i>0&&(a+="&"),a+=this.encodeQueryKey(t)+"="+c(this.encodeQueryParam(n[i]),r);else{var o="";if("csv"===e)o=",";else if("ssv"===e)o="%20";else if("tsv"===e)o="%09";else if("pipes"===e)o="|";else if("brackets"===e)for(i=0;i<n.length;i++)0!==i&&(a+="&"),a+=this.encodeQueryKey(t)+"[]="+c(this.encodeQueryParam(n[i]),r);if(""!==o)for(i=0;i<n.length;i++)0===i?a=this.encodeQueryKey(t)+"="+this.encodeQueryParam(n[i]):a+=o+this.encodeQueryParam(n[i])}return a},u.prototype.encodeQueryKey=function(e){return encodeURIComponent(e).replace("%5B","[").replace("%5D","]").replace("%24","$")},u.prototype.encodeQueryParam=function(e,t){return t?"******":encodeURIComponent(e)},u.prototype.encodePathParam=function(e,t){return encodeURIComponent(e,t)};var c=function(e,t){return"string"==typeof t&&"password"===t?"******":e}},{"../helpers":4,"../http":5,"./model":9,"lodash-compat/lang/cloneDeep":138,"lodash-compat/lang/isEmpty":141,"lodash-compat/lang/isObject":144,"lodash-compat/lang/isUndefined":148,q:157}],11:[function(e,t,n){"use strict";var r=t.exports=function(e,t,n,r){this.description=t,this.externalDocs=n,this.name=e,this.operation=r,this.operationsArray=[],this.path=e,this.tag=e};r.prototype.sort=function(){}},{}],12:[function(e,t,n){function r(){if(!s){s=!0;for(var e,t=o.length;t;){e=o,o=[];for(var n=-1;++n<t;)e[n]();t=o.length}s=!1}}function i(){}var a=t.exports={},o=[],s=!1;a.nextTick=function(e){o.push(e),s||setTimeout(r,0)},a.title="browser",a.browser=!0,a.env={},a.argv=[],a.version="",a.versions={},a.on=i,a.addListener=i,a.once=i,a.off=i,a.removeListener=i,a.removeAllListeners=i,a.emit=i,a.binding=function(e){throw new Error("process.binding is not supported")},a.cwd=function(){return"/"},a.chdir=function(e){throw new Error("process.chdir is not supported")},a.umask=function(){return 0}},{}],13:[function(e,t,n){(function(e){!function(){"use strict";function n(t){var n;return n=t instanceof e?t:new e(t.toString(),"binary"),n.toString("base64")}t.exports=n}()}).call(this,e("buffer").Buffer)},{buffer:14}],14:[function(e,t,n){function r(){return i.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function i(e){return this instanceof i?(this.length=0,this.parent=void 0,"number"==typeof e?a(this,e):"string"==typeof e?o(this,e,arguments.length>1?arguments[1]:"utf8"):s(this,e)):arguments.length>1?new i(e,arguments[1]):new i(e)}function a(e,t){if(e=d(e,t<0?0:0|m(t)),!i.TYPED_ARRAY_SUPPORT)for(var n=0;n<t;n++)e[n]=0;return e}function o(e,t,n){"string"==typeof n&&""!==n||(n="utf8");var r=0|y(t,n);return e=d(e,r),e.write(t,n),e}function s(e,t){if(i.isBuffer(t))return l(e,t);if(Q(t))return u(e,t);if(null==t)throw new TypeError("must start with number, buffer, array or string");if("undefined"!=typeof ArrayBuffer){if(t.buffer instanceof ArrayBuffer)return c(e,t);if(t instanceof ArrayBuffer)return p(e,t)}return t.length?h(e,t):f(e,t)}function l(e,t){var n=0|m(t.length);return e=d(e,n),t.copy(e,0,0,n),e}function u(e,t){var n=0|m(t.length);e=d(e,n);for(var r=0;r<n;r+=1)e[r]=255&t[r];return e}function c(e,t){var n=0|m(t.length);e=d(e,n);for(var r=0;r<n;r+=1)e[r]=255&t[r];return e}function p(e,t){return i.TYPED_ARRAY_SUPPORT?(t.byteLength,e=i._augment(new Uint8Array(t))):e=c(e,new Uint8Array(t)),e}function h(e,t){var n=0|m(t.length);e=d(e,n);for(var r=0;r<n;r+=1)e[r]=255&t[r];return e}function f(e,t){var n,r=0;"Buffer"===t.type&&Q(t.data)&&(n=t.data,r=0|m(n.length)),e=d(e,r);for(var i=0;i<r;i+=1)e[i]=255&n[i];return e}function d(e,t){i.TYPED_ARRAY_SUPPORT?e=i._augment(new Uint8Array(t)):(e.length=t,e._isBuffer=!0);var n=0!==t&&t<=i.poolSize>>>1;return n&&(e.parent=G),e}function m(e){if(e>=r())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+r().toString(16)+" bytes");return 0|e}function g(e,t){if(!(this instanceof g))return new g(e,t);var n=new i(e,t);return delete n.parent,n}function y(e,t){"string"!=typeof e&&(e=""+e);var n=e.length;if(0===n)return 0;for(var r=!1;;)switch(t){case"ascii":case"binary":case"raw":case"raws":return n;case"utf8":case"utf-8":return $(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return H(e).length;default:if(r)return $(e).length;t=(""+t).toLowerCase(),r=!0}}function v(e,t,n){var r=!1;if(t=0|t,n=void 0===n||n===1/0?this.length:0|n,e||(e="utf8"),t<0&&(t=0),n>this.length&&(n=this.length),n<=t)return"";for(;;)switch(e){case"hex":return C(this,t,n);case"utf8":case"utf-8":return E(this,t,n);case"ascii":return k(this,t,n);case"binary":return T(this,t,n);case"base64":return j(this,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return I(this,t,n);default:if(r)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),r=!0}}function b(e,t,n,r){n=Number(n)||0;var i=e.length-n;r?(r=Number(r),r>i&&(r=i)):r=i;var a=t.length;if(a%2!==0)throw new Error("Invalid hex string");r>a/2&&(r=a/2);for(var o=0;o<r;o++){var s=parseInt(t.substr(2*o,2),16);if(isNaN(s))throw new Error("Invalid hex string");e[n+o]=s}return o}function w(e,t,n,r){return Y($(t,e.length-n),e,n,r)}function _(e,t,n,r){return Y(F(t),e,n,r)}function x(e,t,n,r){return _(e,t,n,r)}function A(e,t,n,r){return Y(H(t),e,n,r)}function S(e,t,n,r){return Y(V(t,e.length-n),e,n,r)}function j(e,t,n){return 0===t&&n===e.length?J.fromByteArray(e):J.fromByteArray(e.slice(t,n))}function E(e,t,n){n=Math.min(e.length,n);for(var r=[],i=t;i<n;){var a=e[i],o=null,s=a>239?4:a>223?3:a>191?2:1;if(i+s<=n){var l,u,c,p;switch(s){case 1:a<128&&(o=a);break;case 2:l=e[i+1],128===(192&l)&&(p=(31&a)<<6|63&l,p>127&&(o=p));break;case 3:l=e[i+1],u=e[i+2],128===(192&l)&&128===(192&u)&&(p=(15&a)<<12|(63&l)<<6|63&u,p>2047&&(p<55296||p>57343)&&(o=p));break;case 4:l=e[i+1],u=e[i+2],c=e[i+3],128===(192&l)&&128===(192&u)&&128===(192&c)&&(p=(15&a)<<18|(63&l)<<12|(63&u)<<6|63&c,p>65535&&p<1114112&&(o=p))}}null===o?(o=65533,s=1):o>65535&&(o-=65536,r.push(o>>>10&1023|55296),o=56320|1023&o),r.push(o),i+=s}return O(r)}function O(e){var t=e.length;if(t<=K)return String.fromCharCode.apply(String,e);for(var n="",r=0;r<t;)n+=String.fromCharCode.apply(String,e.slice(r,r+=K));return n}function k(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;i<n;i++)r+=String.fromCharCode(127&e[i]);return r}function T(e,t,n){var r="";n=Math.min(e.length,n);for(var i=t;i<n;i++)r+=String.fromCharCode(e[i]);return r}function C(e,t,n){var r=e.length;(!t||t<0)&&(t=0),(!n||n<0||n>r)&&(n=r);for(var i="",a=t;a<n;a++)i+=N(e[a]);return i}function I(e,t,n){for(var r=e.slice(t,n),i="",a=0;a<r.length;a+=2)i+=String.fromCharCode(r[a]+256*r[a+1]);return i}function D(e,t,n){if(e%1!==0||e<0)throw new RangeError("offset is not uint");if(e+t>n)throw new RangeError("Trying to access beyond buffer length")}function L(e,t,n,r,a,o){if(!i.isBuffer(e))throw new TypeError("buffer must be a Buffer instance");if(t>a||t<o)throw new RangeError("value is out of bounds");if(n+r>e.length)throw new RangeError("index out of range")}function M(e,t,n,r){t<0&&(t=65535+t+1);for(var i=0,a=Math.min(e.length-n,2);i<a;i++)e[n+i]=(t&255<<8*(r?i:1-i))>>>8*(r?i:1-i)}function R(e,t,n,r){t<0&&(t=4294967295+t+1);for(var i=0,a=Math.min(e.length-n,4);i<a;i++)e[n+i]=t>>>8*(r?i:3-i)&255}function U(e,t,n,r,i,a){if(t>i||t<a)throw new RangeError("value is out of bounds");if(n+r>e.length)throw new RangeError("index out of range");if(n<0)throw new RangeError("index out of range")}function P(e,t,n,r,i){return i||U(e,t,n,4,3.4028234663852886e38,-3.4028234663852886e38),W.write(e,t,n,r,23,4),n+4}function q(e,t,n,r,i){return i||U(e,t,n,8,1.7976931348623157e308,-1.7976931348623157e308),W.write(e,t,n,r,52,8),n+8}function B(e){if(e=z(e).replace(Z,""),e.length<2)return"";for(;e.length%4!==0;)e+="=";return e}function z(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}function N(e){return e<16?"0"+e.toString(16):e.toString(16)}function $(e,t){t=t||1/0;for(var n,r=e.length,i=null,a=[],o=0;o<r;o++){if(n=e.charCodeAt(o),n>55295&&n<57344){if(!i){if(n>56319){(t-=3)>-1&&a.push(239,191,189);continue}if(o+1===r){(t-=3)>-1&&a.push(239,191,189);continue}i=n;continue}if(n<56320){(t-=3)>-1&&a.push(239,191,189),i=n;continue}n=i-55296<<10|n-56320|65536}else i&&(t-=3)>-1&&a.push(239,191,189);if(i=null,n<128){if((t-=1)<0)break;a.push(n)}else if(n<2048){if((t-=2)<0)break;a.push(n>>6|192,63&n|128)}else if(n<65536){if((t-=3)<0)break;a.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;a.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return a}function F(e){for(var t=[],n=0;n<e.length;n++)t.push(255&e.charCodeAt(n));return t}function V(e,t){for(var n,r,i,a=[],o=0;o<e.length&&!((t-=2)<0);o++)n=e.charCodeAt(o),r=n>>8,i=n%256,a.push(i),a.push(r);return a}function H(e){return J.toByteArray(B(e))}function Y(e,t,n,r){for(var i=0;i<r&&!(i+n>=t.length||i>=e.length);i++)t[i+n]=e[i];return i}var J=e("base64-js"),W=e("ieee754"),Q=e("is-array");n.Buffer=i,n.SlowBuffer=g,n.INSPECT_MAX_BYTES=50,i.poolSize=8192;var G={};i.TYPED_ARRAY_SUPPORT=function(){function e(){}try{var t=new Uint8Array(1);return t.foo=function(){return 42},t.constructor=e,42===t.foo()&&t.constructor===e&&"function"==typeof t.subarray&&0===t.subarray(1,1).byteLength}catch(n){return!1}}(),i.isBuffer=function(e){return!(null==e||!e._isBuffer)},i.compare=function(e,t){if(!i.isBuffer(e)||!i.isBuffer(t))throw new TypeError("Arguments must be Buffers");if(e===t)return 0;for(var n=e.length,r=t.length,a=0,o=Math.min(n,r);a<o&&e[a]===t[a];)++a;return a!==o&&(n=e[a],r=t[a]),n<r?-1:r<n?1:0},i.isEncoding=function(e){switch(String(e).toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"raw":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return!0;default:return!1}},i.concat=function(e,t){if(!Q(e))throw new TypeError("list argument must be an Array of Buffers.");if(0===e.length)return new i(0);var n;if(void 0===t)for(t=0,n=0;n<e.length;n++)t+=e[n].length;var r=new i(t),a=0;for(n=0;n<e.length;n++){var o=e[n];o.copy(r,a),a+=o.length}return r},i.byteLength=y,i.prototype.length=void 0,i.prototype.parent=void 0,i.prototype.toString=function(){var e=0|this.length;return 0===e?"":0===arguments.length?E(this,0,e):v.apply(this,arguments)},i.prototype.equals=function(e){if(!i.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e||0===i.compare(this,e)},i.prototype.inspect=function(){var e="",t=n.INSPECT_MAX_BYTES;return this.length>0&&(e=this.toString("hex",0,t).match(/.{2}/g).join(" "),this.length>t&&(e+=" ... ")),"<Buffer "+e+">"},i.prototype.compare=function(e){if(!i.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e?0:i.compare(this,e)},i.prototype.indexOf=function(e,t){function n(e,t,n){for(var r=-1,i=0;n+i<e.length;i++)if(e[n+i]===t[r===-1?0:i-r]){if(r===-1&&(r=i),i-r+1===t.length)return n+r}else r=-1;return-1}if(t>2147483647?t=2147483647:t<-2147483648&&(t=-2147483648),t>>=0,0===this.length)return-1;if(t>=this.length)return-1;if(t<0&&(t=Math.max(this.length+t,0)),"string"==typeof e)return 0===e.length?-1:String.prototype.indexOf.call(this,e,t);if(i.isBuffer(e))return n(this,e,t);if("number"==typeof e)return i.TYPED_ARRAY_SUPPORT&&"function"===Uint8Array.prototype.indexOf?Uint8Array.prototype.indexOf.call(this,e,t):n(this,[e],t);throw new TypeError("val must be string, number or Buffer")},i.prototype.get=function(e){return console.log(".get() is deprecated. Access using array indexes instead."),this.readUInt8(e)},i.prototype.set=function(e,t){return console.log(".set() is deprecated. Access using array indexes instead."),this.writeUInt8(e,t)},i.prototype.write=function(e,t,n,r){if(void 0===t)r="utf8",n=this.length,t=0;else if(void 0===n&&"string"==typeof t)r=t,n=this.length,t=0;else if(isFinite(t))t=0|t,isFinite(n)?(n=0|n,void 0===r&&(r="utf8")):(r=n,n=void 0);else{var i=r;r=t,t=0|n,n=i}var a=this.length-t;if((void 0===n||n>a)&&(n=a),e.length>0&&(n<0||t<0)||t>this.length)throw new RangeError("attempt to write outside buffer bounds");r||(r="utf8");for(var o=!1;;)switch(r){case"hex":return b(this,e,t,n);case"utf8":case"utf-8":return w(this,e,t,n);case"ascii":return _(this,e,t,n);case"binary":return x(this,e,t,n);case"base64":return A(this,e,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return S(this,e,t,n);default:if(o)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),o=!0}},i.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var K=4096;i.prototype.slice=function(e,t){var n=this.length;e=~~e,t=void 0===t?n:~~t,e<0?(e+=n,e<0&&(e=0)):e>n&&(e=n),t<0?(t+=n,t<0&&(t=0)):t>n&&(t=n),t<e&&(t=e);var r;if(i.TYPED_ARRAY_SUPPORT)r=i._augment(this.subarray(e,t));else{var a=t-e;r=new i(a,(void 0));for(var o=0;o<a;o++)r[o]=this[o+e]}return r.length&&(r.parent=this.parent||this),r},i.prototype.readUIntLE=function(e,t,n){e=0|e,t=0|t,n||D(e,t,this.length);for(var r=this[e],i=1,a=0;++a<t&&(i*=256);)r+=this[e+a]*i;return r},i.prototype.readUIntBE=function(e,t,n){e=0|e,t=0|t,n||D(e,t,this.length);for(var r=this[e+--t],i=1;t>0&&(i*=256);)r+=this[e+--t]*i;return r},i.prototype.readUInt8=function(e,t){return t||D(e,1,this.length),this[e]},i.prototype.readUInt16LE=function(e,t){return t||D(e,2,this.length),this[e]|this[e+1]<<8},i.prototype.readUInt16BE=function(e,t){return t||D(e,2,this.length),this[e]<<8|this[e+1]},i.prototype.readUInt32LE=function(e,t){return t||D(e,4,this.length),(this[e]|this[e+1]<<8|this[e+2]<<16)+16777216*this[e+3]},i.prototype.readUInt32BE=function(e,t){return t||D(e,4,this.length),16777216*this[e]+(this[e+1]<<16|this[e+2]<<8|this[e+3])},i.prototype.readIntLE=function(e,t,n){e=0|e,t=0|t,n||D(e,t,this.length);for(var r=this[e],i=1,a=0;++a<t&&(i*=256);)r+=this[e+a]*i;return i*=128,r>=i&&(r-=Math.pow(2,8*t)),r},i.prototype.readIntBE=function(e,t,n){e=0|e,t=0|t,n||D(e,t,this.length);for(var r=t,i=1,a=this[e+--r];r>0&&(i*=256);)a+=this[e+--r]*i;return i*=128,a>=i&&(a-=Math.pow(2,8*t)),a},i.prototype.readInt8=function(e,t){return t||D(e,1,this.length),128&this[e]?(255-this[e]+1)*-1:this[e]},i.prototype.readInt16LE=function(e,t){t||D(e,2,this.length);var n=this[e]|this[e+1]<<8;return 32768&n?4294901760|n:n},i.prototype.readInt16BE=function(e,t){t||D(e,2,this.length);var n=this[e+1]|this[e]<<8;return 32768&n?4294901760|n:n},i.prototype.readInt32LE=function(e,t){return t||D(e,4,this.length),this[e]|this[e+1]<<8|this[e+2]<<16|this[e+3]<<24},i.prototype.readInt32BE=function(e,t){return t||D(e,4,this.length),this[e]<<24|this[e+1]<<16|this[e+2]<<8|this[e+3]},i.prototype.readFloatLE=function(e,t){return t||D(e,4,this.length),W.read(this,e,!0,23,4)},i.prototype.readFloatBE=function(e,t){return t||D(e,4,this.length),W.read(this,e,!1,23,4)},i.prototype.readDoubleLE=function(e,t){return t||D(e,8,this.length),W.read(this,e,!0,52,8)},i.prototype.readDoubleBE=function(e,t){return t||D(e,8,this.length),W.read(this,e,!1,52,8)},i.prototype.writeUIntLE=function(e,t,n,r){e=+e,t=0|t,n=0|n,r||L(this,e,t,n,Math.pow(2,8*n),0);var i=1,a=0;for(this[t]=255&e;++a<n&&(i*=256);)this[t+a]=e/i&255;return t+n},i.prototype.writeUIntBE=function(e,t,n,r){e=+e,t=0|t,n=0|n,r||L(this,e,t,n,Math.pow(2,8*n),0);var i=n-1,a=1;for(this[t+i]=255&e;--i>=0&&(a*=256);)this[t+i]=e/a&255;return t+n},i.prototype.writeUInt8=function(e,t,n){return e=+e,t=0|t,n||L(this,e,t,1,255,0),i.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),this[t]=e,t+1},i.prototype.writeUInt16LE=function(e,t,n){return e=+e,t=0|t,n||L(this,e,t,2,65535,0),i.TYPED_ARRAY_SUPPORT?(this[t]=e,this[t+1]=e>>>8):M(this,e,t,!0),t+2},i.prototype.writeUInt16BE=function(e,t,n){return e=+e,t=0|t,n||L(this,e,t,2,65535,0),i.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=e):M(this,e,t,!1),t+2},i.prototype.writeUInt32LE=function(e,t,n){return e=+e,t=0|t,n||L(this,e,t,4,4294967295,0),i.TYPED_ARRAY_SUPPORT?(this[t+3]=e>>>24,this[t+2]=e>>>16,this[t+1]=e>>>8,this[t]=e):R(this,e,t,!0),t+4},i.prototype.writeUInt32BE=function(e,t,n){return e=+e,t=0|t,n||L(this,e,t,4,4294967295,0),i.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=e):R(this,e,t,!1),t+4},i.prototype.writeIntLE=function(e,t,n,r){if(e=+e,t=0|t,!r){var i=Math.pow(2,8*n-1);L(this,e,t,n,i-1,-i)}var a=0,o=1,s=e<0?1:0;for(this[t]=255&e;++a<n&&(o*=256);)this[t+a]=(e/o>>0)-s&255;return t+n},i.prototype.writeIntBE=function(e,t,n,r){if(e=+e,t=0|t,!r){var i=Math.pow(2,8*n-1);L(this,e,t,n,i-1,-i)}var a=n-1,o=1,s=e<0?1:0;for(this[t+a]=255&e;--a>=0&&(o*=256);)this[t+a]=(e/o>>0)-s&255;return t+n},i.prototype.writeInt8=function(e,t,n){return e=+e,t=0|t,n||L(this,e,t,1,127,-128),i.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),e<0&&(e=255+e+1),this[t]=e,t+1},i.prototype.writeInt16LE=function(e,t,n){return e=+e,t=0|t,n||L(this,e,t,2,32767,-32768),i.TYPED_ARRAY_SUPPORT?(this[t]=e,this[t+1]=e>>>8):M(this,e,t,!0),t+2},i.prototype.writeInt16BE=function(e,t,n){return e=+e,t=0|t,n||L(this,e,t,2,32767,-32768),i.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=e):M(this,e,t,!1),t+2},i.prototype.writeInt32LE=function(e,t,n){return e=+e,t=0|t,n||L(this,e,t,4,2147483647,-2147483648),i.TYPED_ARRAY_SUPPORT?(this[t]=e,this[t+1]=e>>>8,this[t+2]=e>>>16,this[t+3]=e>>>24):R(this,e,t,!0),t+4},i.prototype.writeInt32BE=function(e,t,n){return e=+e,t=0|t,n||L(this,e,t,4,2147483647,-2147483648),e<0&&(e=4294967295+e+1),i.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=e):R(this,e,t,!1),t+4},i.prototype.writeFloatLE=function(e,t,n){return P(this,e,t,!0,n)},i.prototype.writeFloatBE=function(e,t,n){return P(this,e,t,!1,n)},i.prototype.writeDoubleLE=function(e,t,n){return q(this,e,t,!0,n)},i.prototype.writeDoubleBE=function(e,t,n){return q(this,e,t,!1,n)},i.prototype.copy=function(e,t,n,r){if(n||(n=0),r||0===r||(r=this.length),t>=e.length&&(t=e.length),t||(t=0),r>0&&r<n&&(r=n),r===n)return 0;if(0===e.length||0===this.length)return 0;if(t<0)throw new RangeError("targetStart out of bounds");if(n<0||n>=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),e.length-t<r-n&&(r=e.length-t+n);var a,o=r-n;if(this===e&&n<t&&t<r)for(a=o-1;a>=0;a--)e[a+t]=this[a+n];else if(o<1e3||!i.TYPED_ARRAY_SUPPORT)for(a=0;a<o;a++)e[a+t]=this[a+n];else e._set(this.subarray(n,n+o),t);return o},i.prototype.fill=function(e,t,n){if(e||(e=0),t||(t=0),n||(n=this.length),n<t)throw new RangeError("end < start");if(n!==t&&0!==this.length){if(t<0||t>=this.length)throw new RangeError("start out of bounds");if(n<0||n>this.length)throw new RangeError("end out of bounds");var r;if("number"==typeof e)for(r=t;r<n;r++)this[r]=e;else{var i=$(e.toString()),a=i.length;for(r=t;r<n;r++)this[r]=i[r%a]}return this}},i.prototype.toArrayBuffer=function(){if("undefined"!=typeof Uint8Array){if(i.TYPED_ARRAY_SUPPORT)return new i(this).buffer;for(var e=new Uint8Array(this.length),t=0,n=e.length;t<n;t+=1)e[t]=this[t];return e.buffer}throw new TypeError("Buffer.toArrayBuffer not supported in this browser")};var X=i.prototype;i._augment=function(e){return e.constructor=i,e._isBuffer=!0,e._set=e.set,e.get=X.get,e.set=X.set,e.write=X.write,e.toString=X.toString,e.toLocaleString=X.toString,e.toJSON=X.toJSON,e.equals=X.equals,e.compare=X.compare,e.indexOf=X.indexOf,e.copy=X.copy,e.slice=X.slice,e.readUIntLE=X.readUIntLE,e.readUIntBE=X.readUIntBE,e.readUInt8=X.readUInt8,e.readUInt16LE=X.readUInt16LE,e.readUInt16BE=X.readUInt16BE,e.readUInt32LE=X.readUInt32LE,e.readUInt32BE=X.readUInt32BE,e.readIntLE=X.readIntLE,e.readIntBE=X.readIntBE,e.readInt8=X.readInt8,e.readInt16LE=X.readInt16LE,e.readInt16BE=X.readInt16BE,e.readInt32LE=X.readInt32LE,e.readInt32BE=X.readInt32BE,e.readFloatLE=X.readFloatLE,e.readFloatBE=X.readFloatBE,e.readDoubleLE=X.readDoubleLE,e.readDoubleBE=X.readDoubleBE,e.writeUInt8=X.writeUInt8,e.writeUIntLE=X.writeUIntLE,e.writeUIntBE=X.writeUIntBE,e.writeUInt16LE=X.writeUInt16LE,e.writeUInt16BE=X.writeUInt16BE,e.writeUInt32LE=X.writeUInt32LE,e.writeUInt32BE=X.writeUInt32BE,e.writeIntLE=X.writeIntLE,e.writeIntBE=X.writeIntBE,e.writeInt8=X.writeInt8,e.writeInt16LE=X.writeInt16LE,e.writeInt16BE=X.writeInt16BE,e.writeInt32LE=X.writeInt32LE,e.writeInt32BE=X.writeInt32BE,e.writeFloatLE=X.writeFloatLE,e.writeFloatBE=X.writeFloatBE,e.writeDoubleLE=X.writeDoubleLE,e.writeDoubleBE=X.writeDoubleBE,e.fill=X.fill,e.inspect=X.inspect,e.toArrayBuffer=X.toArrayBuffer,e};var Z=/[^+\/0-9A-Za-z-_]/g},{"base64-js":15,ieee754:16,"is-array":17}],15:[function(e,t,n){var r="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";!function(e){"use strict";function t(e){var t=e.charCodeAt(0);return t===o||t===p?62:t===s||t===h?63:t<l?-1:t<l+10?t-l+26+26:t<c+26?t-c:t<u+26?t-u+26:void 0}function n(e){function n(e){u[p++]=e}var r,i,o,s,l,u;if(e.length%4>0)throw new Error("Invalid string. Length must be a multiple of 4");var c=e.length;l="="===e.charAt(c-2)?2:"="===e.charAt(c-1)?1:0,u=new a(3*e.length/4-l),o=l>0?e.length-4:e.length;var p=0;for(r=0,i=0;r<o;r+=4,i+=3)s=t(e.charAt(r))<<18|t(e.charAt(r+1))<<12|t(e.charAt(r+2))<<6|t(e.charAt(r+3)),n((16711680&s)>>16),n((65280&s)>>8),n(255&s);return 2===l?(s=t(e.charAt(r))<<2|t(e.charAt(r+1))>>4,n(255&s)):1===l&&(s=t(e.charAt(r))<<10|t(e.charAt(r+1))<<4|t(e.charAt(r+2))>>2,n(s>>8&255),n(255&s)),u}function i(e){function t(e){return r.charAt(e)}function n(e){return t(e>>18&63)+t(e>>12&63)+t(e>>6&63)+t(63&e)}var i,a,o,s=e.length%3,l="";for(i=0,o=e.length-s;i<o;i+=3)a=(e[i]<<16)+(e[i+1]<<8)+e[i+2],l+=n(a);switch(s){case 1:a=e[e.length-1],l+=t(a>>2),l+=t(a<<4&63),l+="==";break;case 2:a=(e[e.length-2]<<8)+e[e.length-1],l+=t(a>>10),l+=t(a>>4&63),l+=t(a<<2&63),l+="="}return l}var a="undefined"!=typeof Uint8Array?Uint8Array:Array,o="+".charCodeAt(0),s="/".charCodeAt(0),l="0".charCodeAt(0),u="a".charCodeAt(0),c="A".charCodeAt(0),p="-".charCodeAt(0),h="_".charCodeAt(0);
+e.toByteArray=n,e.fromByteArray=i}("undefined"==typeof n?this.base64js={}:n)},{}],16:[function(e,t,n){n.read=function(e,t,n,r,i){var a,o,s=8*i-r-1,l=(1<<s)-1,u=l>>1,c=-7,p=n?i-1:0,h=n?-1:1,f=e[t+p];for(p+=h,a=f&(1<<-c)-1,f>>=-c,c+=s;c>0;a=256*a+e[t+p],p+=h,c-=8);for(o=a&(1<<-c)-1,a>>=-c,c+=r;c>0;o=256*o+e[t+p],p+=h,c-=8);if(0===a)a=1-u;else{if(a===l)return o?NaN:(f?-1:1)*(1/0);o+=Math.pow(2,r),a-=u}return(f?-1:1)*o*Math.pow(2,a-r)},n.write=function(e,t,n,r,i,a){var o,s,l,u=8*a-i-1,c=(1<<u)-1,p=c>>1,h=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,f=r?0:a-1,d=r?1:-1,m=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(s=isNaN(t)?1:0,o=c):(o=Math.floor(Math.log(t)/Math.LN2),t*(l=Math.pow(2,-o))<1&&(o--,l*=2),t+=o+p>=1?h/l:h*Math.pow(2,1-p),t*l>=2&&(o++,l/=2),o+p>=c?(s=0,o=c):o+p>=1?(s=(t*l-1)*Math.pow(2,i),o+=p):(s=t*Math.pow(2,p-1)*Math.pow(2,i),o=0));i>=8;e[n+f]=255&s,f+=d,s/=256,i-=8);for(o=o<<i|s,u+=i;u>0;e[n+f]=255&o,f+=d,o/=256,u-=8);e[n+f-d]|=128*m}},{}],17:[function(e,t,n){var r=Array.isArray,i=Object.prototype.toString;t.exports=r||function(e){return!!e&&"[object Array]"==i.call(e)}},{}],18:[function(e,t,n){!function(){"use strict";function e(t,n,r,i){return this instanceof e?(this.domain=t||void 0,this.path=n||"/",this.secure=!!r,this.script=!!i,this):new e(t,n,r,i)}function t(e,n,r){return e instanceof t?e:this instanceof t?(this.name=null,this.value=null,this.expiration_date=1/0,this.path=String(r||"/"),this.explicit_path=!1,this.domain=n||null,this.explicit_domain=!1,this.secure=!1,this.noscript=!1,e&&this.parse(e,n,r),this):new t(e,n,r)}function r(){var e,n,i;return this instanceof r?(e=Object.create(null),this.setCookie=function(r,a,o){var s,l;if(r=new t(r,a,o),s=r.expiration_date<=Date.now(),void 0!==e[r.name]){for(n=e[r.name],l=0;l<n.length;l+=1)if(i=n[l],i.collidesWith(r))return s?(n.splice(l,1),0===n.length&&delete e[r.name],!1):(n[l]=r,r);return!s&&(n.push(r),r)}return!s&&(e[r.name]=[r],e[r.name])},this.getCookie=function(t,r){var i,a;if(n=e[t])for(a=0;a<n.length;a+=1)if(i=n[a],i.expiration_date<=Date.now())0===n.length&&delete e[i.name];else if(i.matches(r))return i},this.getCookies=function(t){var n,r,i=[];for(n in e)r=this.getCookie(n,t),r&&i.push(r);return i.toString=function(){return i.join(":")},i.toValueString=function(){return i.map(function(e){return e.toValueString()}).join(";")},i},this):new r}n.CookieAccessInfo=e,n.Cookie=t,t.prototype.toString=function(){var e=[this.name+"="+this.value];return this.expiration_date!==1/0&&e.push("expires="+new Date(this.expiration_date).toGMTString()),this.domain&&e.push("domain="+this.domain),this.path&&e.push("path="+this.path),this.secure&&e.push("secure"),this.noscript&&e.push("httponly"),e.join("; ")},t.prototype.toValueString=function(){return this.name+"="+this.value};var i=/[:](?=\s*[a-zA-Z0-9_\-]+\s*[=])/g;t.prototype.parse=function(e,n,r){if(this instanceof t){var i,a=e.split(";").filter(function(e){return!!e}),o=a[0].match(/([^=]+)=([\s\S]*)/),s=o[1],l=o[2];for(this.name=s,this.value=l,i=1;i<a.length;i+=1)switch(o=a[i].match(/([^=]+)(?:=([\s\S]*))?/),s=o[1].trim().toLowerCase(),l=o[2],s){case"httponly":this.noscript=!0;break;case"expires":this.expiration_date=l?Number(Date.parse(l)):1/0;break;case"path":this.path=l?l.trim():"",this.explicit_path=!0;break;case"domain":this.domain=l?l.trim():"",this.explicit_domain=!!this.domain;break;case"secure":this.secure=!0}return this.explicit_path||(this.path=r||"/"),this.explicit_domain||(this.domain=n),this}return(new t).parse(e,n,r)},t.prototype.matches=function(e){return!(this.noscript&&e.script||this.secure&&!e.secure||!this.collidesWith(e))},t.prototype.collidesWith=function(e){if(this.path&&!e.path||this.domain&&!e.domain)return!1;if(this.path&&0!==e.path.indexOf(this.path))return!1;if(this.explicit_path&&0!==e.path.indexOf(this.path))return!1;var t=e.domain&&e.domain.replace(/^[\.]/,""),n=this.domain&&this.domain.replace(/^[\.]/,"");if(n===t)return!0;if(n){if(!this.explicit_domain)return!1;var r=t.indexOf(n);return r!==-1&&r===t.length-n.length}return!0},n.CookieJar=r,r.prototype.setCookies=function(e,n,r){e=Array.isArray(e)?e:e.split(i);var a,o,s=[];for(e=e.map(function(e){return new t(e,n,r)}),a=0;a<e.length;a+=1)o=e[a],this.setCookie(o,n,r)&&s.push(o);return s}}()},{}],19:[function(e,t,n){"use strict";var r=e("./lib/js-yaml.js");t.exports=r},{"./lib/js-yaml.js":20}],20:[function(e,t,n){"use strict";function r(e){return function(){throw new Error("Function "+e+" is deprecated and cannot be used.")}}var i=e("./js-yaml/loader"),a=e("./js-yaml/dumper");t.exports.Type=e("./js-yaml/type"),t.exports.Schema=e("./js-yaml/schema"),t.exports.FAILSAFE_SCHEMA=e("./js-yaml/schema/failsafe"),t.exports.JSON_SCHEMA=e("./js-yaml/schema/json"),t.exports.CORE_SCHEMA=e("./js-yaml/schema/core"),t.exports.DEFAULT_SAFE_SCHEMA=e("./js-yaml/schema/default_safe"),t.exports.DEFAULT_FULL_SCHEMA=e("./js-yaml/schema/default_full"),t.exports.load=i.load,t.exports.loadAll=i.loadAll,t.exports.safeLoad=i.safeLoad,t.exports.safeLoadAll=i.safeLoadAll,t.exports.dump=a.dump,t.exports.safeDump=a.safeDump,t.exports.YAMLException=e("./js-yaml/exception"),t.exports.MINIMAL_SCHEMA=e("./js-yaml/schema/failsafe"),t.exports.SAFE_SCHEMA=e("./js-yaml/schema/default_safe"),t.exports.DEFAULT_SCHEMA=e("./js-yaml/schema/default_full"),t.exports.scan=r("scan"),t.exports.parse=r("parse"),t.exports.compose=r("compose"),t.exports.addConstructor=r("addConstructor")},{"./js-yaml/dumper":22,"./js-yaml/exception":23,"./js-yaml/loader":24,"./js-yaml/schema":26,"./js-yaml/schema/core":27,"./js-yaml/schema/default_full":28,"./js-yaml/schema/default_safe":29,"./js-yaml/schema/failsafe":30,"./js-yaml/schema/json":31,"./js-yaml/type":32}],21:[function(e,t,n){"use strict";function r(e){return"undefined"==typeof e||null===e}function i(e){return"object"==typeof e&&null!==e}function a(e){return Array.isArray(e)?e:r(e)?[]:[e]}function o(e,t){var n,r,i,a;if(t)for(a=Object.keys(t),n=0,r=a.length;n<r;n+=1)i=a[n],e[i]=t[i];return e}function s(e,t){var n,r="";for(n=0;n<t;n+=1)r+=e;return r}function l(e){return 0===e&&Number.NEGATIVE_INFINITY===1/e}t.exports.isNothing=r,t.exports.isObject=i,t.exports.toArray=a,t.exports.repeat=s,t.exports.isNegativeZero=l,t.exports.extend=o},{}],22:[function(e,t,n){"use strict";function r(e,t){var n,r,i,a,o,s,l;if(null===t)return{};for(n={},r=Object.keys(t),i=0,a=r.length;i<a;i+=1)o=r[i],s=String(t[o]),"!!"===o.slice(0,2)&&(o="tag:yaml.org,2002:"+o.slice(2)),l=e.compiledTypeMap[o],l&&R.call(l.styleAliases,s)&&(s=l.styleAliases[s]),n[o]=s;return n}function i(e){var t,n,r;if(t=e.toString(16).toUpperCase(),e<=255)n="x",r=2;else if(e<=65535)n="u",r=4;else{if(!(e<=4294967295))throw new I("code point within a string may not be greater than 0xFFFFFFFF");n="U",r=8}return"\\"+n+C.repeat("0",r-t.length)+t}function a(e){this.schema=e.schema||D,this.indent=Math.max(1,e.indent||2),this.skipInvalid=e.skipInvalid||!1,this.flowLevel=C.isNothing(e.flowLevel)?-1:e.flowLevel,this.styleMap=r(this.schema,e.styles||null),this.sortKeys=e.sortKeys||!1,this.lineWidth=e.lineWidth||80,this.noRefs=e.noRefs||!1,this.noCompatMode=e.noCompatMode||!1,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function o(e,t){for(var n,r=C.repeat(" ",t),i=0,a=-1,o="",s=e.length;i<s;)a=e.indexOf("\n",i),a===-1?(n=e.slice(i),i=s):(n=e.slice(i,a+1),i=a+1),n.length&&"\n"!==n&&(o+=r),o+=n;return o}function s(e,t){return"\n"+C.repeat(" ",e.indent*t)}function l(e,t){var n,r,i;for(n=0,r=e.implicitTypes.length;n<r;n+=1)if(i=e.implicitTypes[n],i.resolve(t))return!0;return!1}function u(e){return e===q||e===U}function c(e){return 32<=e&&e<=126||161<=e&&e<=55295&&8232!==e&&8233!==e||57344<=e&&e<=65533&&65279!==e||65536<=e&&e<=1114111}function p(e){return c(e)&&65279!==e&&e!==Y&&e!==X&&e!==Z&&e!==te&&e!==re&&e!==W&&e!==N}function h(e){return c(e)&&65279!==e&&!u(e)&&e!==J&&e!==G&&e!==W&&e!==Y&&e!==X&&e!==Z&&e!==te&&e!==re&&e!==N&&e!==F&&e!==H&&e!==B&&e!==ne&&e!==Q&&e!==V&&e!==z&&e!==$&&e!==K&&e!==ee}function f(e,t,n,r,i){var a,o,s=!1,l=!1,f=r!==-1,d=-1,m=h(e.charCodeAt(0))&&!u(e.charCodeAt(e.length-1));if(t)for(a=0;a<e.length;a++){if(o=e.charCodeAt(a),!c(o))return ce;m=m&&p(o)}else{for(a=0;a<e.length;a++){if(o=e.charCodeAt(a),o===P)s=!0,f&&(l=l||a-d-1>r&&" "!==e[d+1],d=a);else if(!c(o))return ce;m=m&&p(o)}l=l||f&&a-d-1>r&&" "!==e[d+1]}return s||l?" "===e[0]&&n>9?ce:l?ue:le:m&&!i(e)?oe:se}function d(e,t,n,r){e.dump=function(){function i(t){return l(e,t)}if(0===t.length)return"''";if(!e.noCompatMode&&ae.indexOf(t)!==-1)return"'"+t+"'";var a=e.indent*Math.max(1,n),s=e.lineWidth===-1?-1:Math.max(Math.min(e.lineWidth,40),e.lineWidth-a),u=r||e.flowLevel>-1&&n>=e.flowLevel;switch(f(t,u,e.indent,s,i)){case oe:return t;case se:return"'"+t.replace(/'/g,"''")+"'";case le:return"|"+m(t,e.indent)+g(o(t,a));case ue:return">"+m(t,e.indent)+g(o(y(t,s),a));case ce:return'"'+b(t,s)+'"';default:throw new I("impossible error: invalid scalar style")}}()}function m(e,t){var n=" "===e[0]?String(t):"",r="\n"===e[e.length-1],i=r&&("\n"===e[e.length-2]||"\n"===e),a=i?"+":r?"":"-";return n+a+"\n"}function g(e){return"\n"===e[e.length-1]?e.slice(0,-1):e}function y(e,t){for(var n,r,i=/(\n+)([^\n]*)/g,a=function(){var n=e.indexOf("\n");return n=n!==-1?n:e.length,i.lastIndex=n,v(e.slice(0,n),t)}(),o="\n"===e[0]||" "===e[0];r=i.exec(e);){var s=r[1],l=r[2];n=" "===l[0],a+=s+(o||n||""===l?"":"\n")+v(l,t),o=n}return a}function v(e,t){if(""===e||" "===e[0])return e;for(var n,r,i=/ [^ ]/g,a=0,o=0,s=0,l="";n=i.exec(e);)s=n.index,s-a>t&&(r=o>a?o:s,l+="\n"+e.slice(a,r),a=r+1),o=s;return l+="\n",l+=e.length-a>t&&o>a?e.slice(a,o)+"\n"+e.slice(o+1):e.slice(a),l.slice(1)}function b(e){for(var t,n,r="",a=0;a<e.length;a++)t=e.charCodeAt(a),n=ie[t],r+=!n&&c(t)?e[a]:n||i(t);return r}function w(e,t,n){var r,i,a="",o=e.tag;for(r=0,i=n.length;r<i;r+=1)j(e,t,n[r],!1,!1)&&(0!==r&&(a+=", "),a+=e.dump);e.tag=o,e.dump="["+a+"]"}function _(e,t,n,r){var i,a,o="",l=e.tag;for(i=0,a=n.length;i<a;i+=1)j(e,t+1,n[i],!0,!0)&&(r&&0===i||(o+=s(e,t)),o+="- "+e.dump);e.tag=l,e.dump=o||"[]"}function x(e,t,n){var r,i,a,o,s,l="",u=e.tag,c=Object.keys(n);for(r=0,i=c.length;r<i;r+=1)s="",0!==r&&(s+=", "),a=c[r],o=n[a],j(e,t,a,!1,!1)&&(e.dump.length>1024&&(s+="? "),s+=e.dump+": ",j(e,t,o,!1,!1)&&(s+=e.dump,l+=s));e.tag=u,e.dump="{"+l+"}"}function A(e,t,n,r){var i,a,o,l,u,c,p="",h=e.tag,f=Object.keys(n);if(e.sortKeys===!0)f.sort();else if("function"==typeof e.sortKeys)f.sort(e.sortKeys);else if(e.sortKeys)throw new I("sortKeys must be a boolean or a function");for(i=0,a=f.length;i<a;i+=1)c="",r&&0===i||(c+=s(e,t)),o=f[i],l=n[o],j(e,t+1,o,!0,!0,!0)&&(u=null!==e.tag&&"?"!==e.tag||e.dump&&e.dump.length>1024,u&&(c+=e.dump&&P===e.dump.charCodeAt(0)?"?":"? "),c+=e.dump,u&&(c+=s(e,t)),j(e,t+1,l,!0,u)&&(c+=e.dump&&P===e.dump.charCodeAt(0)?":":": ",c+=e.dump,p+=c));e.tag=h,e.dump=p||"{}"}function S(e,t,n){var r,i,a,o,s,l;for(i=n?e.explicitTypes:e.implicitTypes,a=0,o=i.length;a<o;a+=1)if(s=i[a],(s.instanceOf||s.predicate)&&(!s.instanceOf||"object"==typeof t&&t instanceof s.instanceOf)&&(!s.predicate||s.predicate(t))){if(e.tag=n?s.tag:"?",s.represent){if(l=e.styleMap[s.tag]||s.defaultStyle,"[object Function]"===M.call(s.represent))r=s.represent(t,l);else{if(!R.call(s.represent,l))throw new I("!<"+s.tag+'> tag resolver accepts not "'+l+'" style');r=s.represent[l](t,l)}e.dump=r}return!0}return!1}function j(e,t,n,r,i,a){e.tag=null,e.dump=n,S(e,n,!1)||S(e,n,!0);var o=M.call(e.dump);r&&(r=e.flowLevel<0||e.flowLevel>t);var s,l,u="[object Object]"===o||"[object Array]"===o;if(u&&(s=e.duplicates.indexOf(n),l=s!==-1),(null!==e.tag&&"?"!==e.tag||l||2!==e.indent&&t>0)&&(i=!1),l&&e.usedDuplicates[s])e.dump="*ref_"+s;else{if(u&&l&&!e.usedDuplicates[s]&&(e.usedDuplicates[s]=!0),"[object Object]"===o)r&&0!==Object.keys(e.dump).length?(A(e,t,e.dump,i),l&&(e.dump="&ref_"+s+e.dump)):(x(e,t,e.dump),l&&(e.dump="&ref_"+s+" "+e.dump));else if("[object Array]"===o)r&&0!==e.dump.length?(_(e,t,e.dump,i),l&&(e.dump="&ref_"+s+e.dump)):(w(e,t,e.dump),l&&(e.dump="&ref_"+s+" "+e.dump));else{if("[object String]"!==o){if(e.skipInvalid)return!1;throw new I("unacceptable kind of an object to dump "+o)}"?"!==e.tag&&d(e,e.dump,t,a)}null!==e.tag&&"?"!==e.tag&&(e.dump="!<"+e.tag+"> "+e.dump)}return!0}function E(e,t){var n,r,i=[],a=[];for(O(e,i,a),n=0,r=a.length;n<r;n+=1)t.duplicates.push(i[a[n]]);t.usedDuplicates=new Array(r)}function O(e,t,n){var r,i,a;if(null!==e&&"object"==typeof e)if(i=t.indexOf(e),i!==-1)n.indexOf(i)===-1&&n.push(i);else if(t.push(e),Array.isArray(e))for(i=0,a=e.length;i<a;i+=1)O(e[i],t,n);else for(r=Object.keys(e),i=0,a=r.length;i<a;i+=1)O(e[r[i]],t,n)}function k(e,t){t=t||{};var n=new a(t);return n.noRefs||E(e,n),j(n,0,e,!0,!0)?n.dump+"\n":""}function T(e,t){return k(e,C.extend({schema:L},t))}var C=e("./common"),I=e("./exception"),D=e("./schema/default_full"),L=e("./schema/default_safe"),M=Object.prototype.toString,R=Object.prototype.hasOwnProperty,U=9,P=10,q=32,B=33,z=34,N=35,$=37,F=38,V=39,H=42,Y=44,J=45,W=58,Q=62,G=63,K=64,X=91,Z=93,ee=96,te=123,ne=124,re=125,ie={};ie[0]="\\0",ie[7]="\\a",ie[8]="\\b",ie[9]="\\t",ie[10]="\\n",ie[11]="\\v",ie[12]="\\f",ie[13]="\\r",ie[27]="\\e",ie[34]='\\"',ie[92]="\\\\",ie[133]="\\N",ie[160]="\\_",ie[8232]="\\L",ie[8233]="\\P";var ae=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"],oe=1,se=2,le=3,ue=4,ce=5;t.exports.dump=k,t.exports.safeDump=T},{"./common":21,"./exception":23,"./schema/default_full":28,"./schema/default_safe":29}],23:[function(e,t,n){"use strict";function r(e,t){Error.call(this),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack||"",this.name="YAMLException",this.reason=e,this.mark=t,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():"")}r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,r.prototype.toString=function(e){var t=this.name+": ";return t+=this.reason||"(unknown reason)",!e&&this.mark&&(t+=" "+this.mark.toString()),t},t.exports=r},{}],24:[function(e,t,n){"use strict";function r(e){return 10===e||13===e}function i(e){return 9===e||32===e}function a(e){return 9===e||32===e||10===e||13===e}function o(e){return 44===e||91===e||93===e||123===e||125===e}function s(e){var t;return 48<=e&&e<=57?e-48:(t=32|e,97<=t&&t<=102?t-97+10:-1)}function l(e){return 120===e?2:117===e?4:85===e?8:0}function u(e){return 48<=e&&e<=57?e-48:-1}function c(e){return 48===e?"\0":97===e?"":98===e?"\b":116===e?"\t":9===e?"\t":110===e?"\n":118===e?"\x0B":102===e?"\f":114===e?"\r":101===e?"":32===e?" ":34===e?'"':47===e?"/":92===e?"\\":78===e?"…":95===e?" ":76===e?"\u2028":80===e?"\u2029":""}function p(e){return e<=65535?String.fromCharCode(e):String.fromCharCode((e-65536>>10)+55296,(e-65536&1023)+56320)}function h(e,t){this.input=e,this.filename=t.filename||null,this.schema=t.schema||V,this.onWarning=t.onWarning||null,this.legacy=t.legacy||!1,this.json=t.json||!1,this.listener=t.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=e.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function f(e,t){return new N(t,new $(e.filename,e.input,e.position,e.line,e.position-e.lineStart))}function d(e,t){throw f(e,t)}function m(e,t){e.onWarning&&e.onWarning.call(null,f(e,t))}function g(e,t,n,r){var i,a,o,s;if(t<n){if(s=e.input.slice(t,n),r)for(i=0,a=s.length;i<a;i+=1)o=s.charCodeAt(i),9===o||32<=o&&o<=1114111||d(e,"expected valid JSON character");else Z.test(s)&&d(e,"the stream contains non-printable characters");e.result+=s}}function y(e,t,n,r){var i,a,o,s;for(z.isObject(n)||d(e,"cannot merge mappings; the provided source object is unacceptable"),i=Object.keys(n),o=0,s=i.length;o<s;o+=1)a=i[o],H.call(t,a)||(t[a]=n[a],r[a]=!0)}function v(e,t,n,r,i,a){var o,s;if(i=String(i),null===t&&(t={}),"tag:yaml.org,2002:merge"===r)if(Array.isArray(a))for(o=0,s=a.length;o<s;o+=1)y(e,t,a[o],n);else y(e,t,a,n);else e.json||H.call(n,i)||!H.call(t,i)||d(e,"duplicated mapping key"),t[i]=a,delete n[i];return t}function b(e){var t;t=e.input.charCodeAt(e.position),10===t?e.position++:13===t?(e.position++,10===e.input.charCodeAt(e.position)&&e.position++):d(e,"a line break is expected"),e.line+=1,e.lineStart=e.position}function w(e,t,n){for(var a=0,o=e.input.charCodeAt(e.position);0!==o;){for(;i(o);)o=e.input.charCodeAt(++e.position);if(t&&35===o)do o=e.input.charCodeAt(++e.position);while(10!==o&&13!==o&&0!==o);if(!r(o))break;for(b(e),o=e.input.charCodeAt(e.position),a++,e.lineIndent=0;32===o;)e.lineIndent++,o=e.input.charCodeAt(++e.position)}return n!==-1&&0!==a&&e.lineIndent<n&&m(e,"deficient indentation"),a}function _(e){var t,n=e.position;return t=e.input.charCodeAt(n),!(45!==t&&46!==t||t!==e.input.charCodeAt(n+1)||t!==e.input.charCodeAt(n+2)||(n+=3,t=e.input.charCodeAt(n),0!==t&&!a(t)))}function x(e,t){1===t?e.result+=" ":t>1&&(e.result+=z.repeat("\n",t-1))}function A(e,t,n){var s,l,u,c,p,h,f,d,m,y=e.kind,v=e.result;if(m=e.input.charCodeAt(e.position),a(m)||o(m)||35===m||38===m||42===m||33===m||124===m||62===m||39===m||34===m||37===m||64===m||96===m)return!1;if((63===m||45===m)&&(l=e.input.charCodeAt(e.position+1),a(l)||n&&o(l)))return!1;for(e.kind="scalar",e.result="",u=c=e.position,p=!1;0!==m;){if(58===m){if(l=e.input.charCodeAt(e.position+1),a(l)||n&&o(l))break}else if(35===m){if(s=e.input.charCodeAt(e.position-1),a(s))break}else{if(e.position===e.lineStart&&_(e)||n&&o(m))break;if(r(m)){if(h=e.line,f=e.lineStart,d=e.lineIndent,w(e,!1,-1),e.lineIndent>=t){p=!0,m=e.input.charCodeAt(e.position);continue}e.position=c,e.line=h,e.lineStart=f,e.lineIndent=d;break}}p&&(g(e,u,c,!1),x(e,e.line-h),u=c=e.position,p=!1),i(m)||(c=e.position+1),m=e.input.charCodeAt(++e.position)}return g(e,u,c,!1),!!e.result||(e.kind=y,e.result=v,!1)}function S(e,t){var n,i,a;if(n=e.input.charCodeAt(e.position),39!==n)return!1;for(e.kind="scalar",e.result="",e.position++,i=a=e.position;0!==(n=e.input.charCodeAt(e.position));)if(39===n){if(g(e,i,e.position,!0),n=e.input.charCodeAt(++e.position),39!==n)return!0;i=a=e.position,e.position++}else r(n)?(g(e,i,a,!0),x(e,w(e,!1,t)),i=a=e.position):e.position===e.lineStart&&_(e)?d(e,"unexpected end of the document within a single quoted scalar"):(e.position++,a=e.position);d(e,"unexpected end of the stream within a single quoted scalar")}function j(e,t){var n,i,a,o,u,c;if(c=e.input.charCodeAt(e.position),34!==c)return!1;for(e.kind="scalar",e.result="",e.position++,n=i=e.position;0!==(c=e.input.charCodeAt(e.position));){if(34===c)return g(e,n,e.position,!0),e.position++,!0;if(92===c){if(g(e,n,e.position,!0),c=e.input.charCodeAt(++e.position),r(c))w(e,!1,t);else if(c<256&&ie[c])e.result+=ae[c],e.position++;else if((u=l(c))>0){for(a=u,o=0;a>0;a--)c=e.input.charCodeAt(++e.position),(u=s(c))>=0?o=(o<<4)+u:d(e,"expected hexadecimal character");e.result+=p(o),e.position++}else d(e,"unknown escape sequence");n=i=e.position}else r(c)?(g(e,n,i,!0),x(e,w(e,!1,t)),n=i=e.position):e.position===e.lineStart&&_(e)?d(e,"unexpected end of the document within a double quoted scalar"):(e.position++,i=e.position)}d(e,"unexpected end of the stream within a double quoted scalar")}function E(e,t){var n,r,i,o,s,l,u,c,p,h,f,m=!0,g=e.tag,y=e.anchor,b={};if(f=e.input.charCodeAt(e.position),91===f)o=93,u=!1,r=[];else{if(123!==f)return!1;o=125,u=!0,r={}}for(null!==e.anchor&&(e.anchorMap[e.anchor]=r),f=e.input.charCodeAt(++e.position);0!==f;){if(w(e,!0,t),f=e.input.charCodeAt(e.position),f===o)return e.position++,e.tag=g,e.anchor=y,e.kind=u?"mapping":"sequence",e.result=r,!0;m||d(e,"missed comma between flow collection entries"),p=c=h=null,s=l=!1,63===f&&(i=e.input.charCodeAt(e.position+1),a(i)&&(s=l=!0,e.position++,w(e,!0,t))),n=e.line,L(e,t,Y,!1,!0),p=e.tag,c=e.result,w(e,!0,t),f=e.input.charCodeAt(e.position),!l&&e.line!==n||58!==f||(s=!0,f=e.input.charCodeAt(++e.position),w(e,!0,t),L(e,t,Y,!1,!0),h=e.result),u?v(e,r,b,p,c,h):s?r.push(v(e,null,b,p,c,h)):r.push(c),w(e,!0,t),f=e.input.charCodeAt(e.position),44===f?(m=!0,f=e.input.charCodeAt(++e.position)):m=!1}d(e,"unexpected end of the stream within a flow collection")}function O(e,t){var n,a,o,s,l=G,c=!1,p=!1,h=t,f=0,m=!1;if(s=e.input.charCodeAt(e.position),124===s)a=!1;else{if(62!==s)return!1;a=!0}for(e.kind="scalar",e.result="";0!==s;)if(s=e.input.charCodeAt(++e.position),43===s||45===s)G===l?l=43===s?X:K:d(e,"repeat of a chomping mode identifier");else{if(!((o=u(s))>=0))break;0===o?d(e,"bad explicit indentation width of a block scalar; it cannot be less than one"):p?d(e,"repeat of an indentation width identifier"):(h=t+o-1,p=!0)}if(i(s)){do s=e.input.charCodeAt(++e.position);while(i(s));if(35===s)do s=e.input.charCodeAt(++e.position);while(!r(s)&&0!==s)}for(;0!==s;){for(b(e),e.lineIndent=0,s=e.input.charCodeAt(e.position);(!p||e.lineIndent<h)&&32===s;)e.lineIndent++,s=e.input.charCodeAt(++e.position);if(!p&&e.lineIndent>h&&(h=e.lineIndent),r(s))f++;else{if(e.lineIndent<h){l===X?e.result+=z.repeat("\n",c?1+f:f):l===G&&c&&(e.result+="\n");break}for(a?i(s)?(m=!0,e.result+=z.repeat("\n",c?1+f:f)):m?(m=!1,e.result+=z.repeat("\n",f+1)):0===f?c&&(e.result+=" "):e.result+=z.repeat("\n",f):e.result+=z.repeat("\n",c?1+f:f),c=!0,p=!0,f=0,n=e.position;!r(s)&&0!==s;)s=e.input.charCodeAt(++e.position);g(e,n,e.position,!1)}}return!0}function k(e,t){var n,r,i,o=e.tag,s=e.anchor,l=[],u=!1;for(null!==e.anchor&&(e.anchorMap[e.anchor]=l),i=e.input.charCodeAt(e.position);0!==i&&45===i&&(r=e.input.charCodeAt(e.position+1),a(r));)if(u=!0,e.position++,w(e,!0,-1)&&e.lineIndent<=t)l.push(null),i=e.input.charCodeAt(e.position);else if(n=e.line,L(e,t,W,!1,!0),l.push(e.result),w(e,!0,-1),i=e.input.charCodeAt(e.position),(e.line===n||e.lineIndent>t)&&0!==i)d(e,"bad indentation of a sequence entry");else if(e.lineIndent<t)break;return!!u&&(e.tag=o,e.anchor=s,e.kind="sequence",e.result=l,!0)}function T(e,t,n){var r,o,s,l,u=e.tag,c=e.anchor,p={},h={},f=null,m=null,g=null,y=!1,b=!1;for(null!==e.anchor&&(e.anchorMap[e.anchor]=p),l=e.input.charCodeAt(e.position);0!==l;){if(r=e.input.charCodeAt(e.position+1),s=e.line,63!==l&&58!==l||!a(r)){if(!L(e,n,J,!1,!0))break;if(e.line===s){for(l=e.input.charCodeAt(e.position);i(l);)l=e.input.charCodeAt(++e.position);if(58===l)l=e.input.charCodeAt(++e.position),a(l)||d(e,"a whitespace character is expected after the key-value separator within a block mapping"),y&&(v(e,p,h,f,m,null),f=m=g=null),b=!0,y=!1,o=!1,f=e.tag,m=e.result;else{if(!b)return e.tag=u,e.anchor=c,!0;d(e,"can not read an implicit mapping pair; a colon is missed")}}else{if(!b)return e.tag=u,e.anchor=c,!0;d(e,"can not read a block mapping entry; a multiline key may not be an implicit key")}}else 63===l?(y&&(v(e,p,h,f,m,null),f=m=g=null),b=!0,y=!0,o=!0):y?(y=!1,o=!0):d(e,"incomplete explicit mapping pair; a key node is missed"),e.position+=1,l=r;if((e.line===s||e.lineIndent>t)&&(L(e,t,Q,!0,o)&&(y?m=e.result:g=e.result),y||(v(e,p,h,f,m,g),f=m=g=null),w(e,!0,-1),l=e.input.charCodeAt(e.position)),e.lineIndent>t&&0!==l)d(e,"bad indentation of a mapping entry");else if(e.lineIndent<t)break}return y&&v(e,p,h,f,m,null),b&&(e.tag=u,e.anchor=c,e.kind="mapping",e.result=p),b}function C(e){var t,n,r,i,o=!1,s=!1;if(i=e.input.charCodeAt(e.position),33!==i)return!1;if(null!==e.tag&&d(e,"duplication of a tag property"),i=e.input.charCodeAt(++e.position),60===i?(o=!0,i=e.input.charCodeAt(++e.position)):33===i?(s=!0,n="!!",i=e.input.charCodeAt(++e.position)):n="!",t=e.position,o){do i=e.input.charCodeAt(++e.position);while(0!==i&&62!==i);e.position<e.length?(r=e.input.slice(t,e.position),i=e.input.charCodeAt(++e.position)):d(e,"unexpected end of the stream within a verbatim tag")}else{for(;0!==i&&!a(i);)33===i&&(s?d(e,"tag suffix cannot contain exclamation marks"):(n=e.input.slice(t-1,e.position+1),ne.test(n)||d(e,"named tag handle cannot contain such characters"),s=!0,t=e.position+1)),i=e.input.charCodeAt(++e.position);r=e.input.slice(t,e.position),te.test(r)&&d(e,"tag suffix cannot contain flow indicator characters")}return r&&!re.test(r)&&d(e,"tag name cannot contain such characters: "+r),o?e.tag=r:H.call(e.tagMap,n)?e.tag=e.tagMap[n]+r:"!"===n?e.tag="!"+r:"!!"===n?e.tag="tag:yaml.org,2002:"+r:d(e,'undeclared tag handle "'+n+'"'),!0}function I(e){var t,n;if(n=e.input.charCodeAt(e.position),38!==n)return!1;for(null!==e.anchor&&d(e,"duplication of an anchor property"),n=e.input.charCodeAt(++e.position),t=e.position;0!==n&&!a(n)&&!o(n);)n=e.input.charCodeAt(++e.position);return e.position===t&&d(e,"name of an anchor node must contain at least one character"),e.anchor=e.input.slice(t,e.position),!0}function D(e){var t,n,r;if(r=e.input.charCodeAt(e.position),42!==r)return!1;for(r=e.input.charCodeAt(++e.position),t=e.position;0!==r&&!a(r)&&!o(r);)r=e.input.charCodeAt(++e.position);return e.position===t&&d(e,"name of an alias node must contain at least one character"),n=e.input.slice(t,e.position),e.anchorMap.hasOwnProperty(n)||d(e,'unidentified alias "'+n+'"'),e.result=e.anchorMap[n],w(e,!0,-1),!0}function L(e,t,n,r,i){var a,o,s,l,u,c,p,h,f=1,m=!1,g=!1;if(null!==e.listener&&e.listener("open",e),e.tag=null,e.anchor=null,e.kind=null,e.result=null,a=o=s=Q===n||W===n,r&&w(e,!0,-1)&&(m=!0,e.lineIndent>t?f=1:e.lineIndent===t?f=0:e.lineIndent<t&&(f=-1)),1===f)for(;C(e)||I(e);)w(e,!0,-1)?(m=!0,s=a,e.lineIndent>t?f=1:e.lineIndent===t?f=0:e.lineIndent<t&&(f=-1)):s=!1;if(s&&(s=m||i),1!==f&&Q!==n||(p=Y===n||J===n?t:t+1,h=e.position-e.lineStart,1===f?s&&(k(e,h)||T(e,h,p))||E(e,p)?g=!0:(o&&O(e,p)||S(e,p)||j(e,p)?g=!0:D(e)?(g=!0,null===e.tag&&null===e.anchor||d(e,"alias node should not have any properties")):A(e,p,Y===n)&&(g=!0,null===e.tag&&(e.tag="?")),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):0===f&&(g=s&&k(e,h))),null!==e.tag&&"!"!==e.tag)if("?"===e.tag){for(l=0,u=e.implicitTypes.length;l<u;l+=1)if(c=e.implicitTypes[l],c.resolve(e.result)){e.result=c.construct(e.result),e.tag=c.tag,null!==e.anchor&&(e.anchorMap[e.anchor]=e.result);break}}else H.call(e.typeMap,e.tag)?(c=e.typeMap[e.tag],null!==e.result&&c.kind!==e.kind&&d(e,"unacceptable node kind for !<"+e.tag+'> tag; it should be "'+c.kind+'", not "'+e.kind+'"'),c.resolve(e.result)?(e.result=c.construct(e.result),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):d(e,"cannot resolve a node with !<"+e.tag+"> explicit tag")):d(e,"unknown tag !<"+e.tag+">");return null!==e.listener&&e.listener("close",e),null!==e.tag||null!==e.anchor||g}function M(e){var t,n,o,s,l=e.position,u=!1;for(e.version=null,e.checkLineBreaks=e.legacy,e.tagMap={},e.anchorMap={};0!==(s=e.input.charCodeAt(e.position))&&(w(e,!0,-1),s=e.input.charCodeAt(e.position),!(e.lineIndent>0||37!==s));){for(u=!0,s=e.input.charCodeAt(++e.position),t=e.position;0!==s&&!a(s);)s=e.input.charCodeAt(++e.position);for(n=e.input.slice(t,e.position),o=[],n.length<1&&d(e,"directive name must not be less than one character in length");0!==s;){for(;i(s);)s=e.input.charCodeAt(++e.position);if(35===s){do s=e.input.charCodeAt(++e.position);while(0!==s&&!r(s));break}if(r(s))break;for(t=e.position;0!==s&&!a(s);)s=e.input.charCodeAt(++e.position);o.push(e.input.slice(t,e.position))}0!==s&&b(e),H.call(se,n)?se[n](e,n,o):m(e,'unknown document directive "'+n+'"')}return w(e,!0,-1),0===e.lineIndent&&45===e.input.charCodeAt(e.position)&&45===e.input.charCodeAt(e.position+1)&&45===e.input.charCodeAt(e.position+2)?(e.position+=3,w(e,!0,-1)):u&&d(e,"directives end mark is expected"),L(e,e.lineIndent-1,Q,!1,!0),w(e,!0,-1),e.checkLineBreaks&&ee.test(e.input.slice(l,e.position))&&m(e,"non-ASCII line breaks are interpreted as content"),e.documents.push(e.result),e.position===e.lineStart&&_(e)?void(46===e.input.charCodeAt(e.position)&&(e.position+=3,w(e,!0,-1))):void(e.position<e.length-1&&d(e,"end of the stream or a document separator is expected"))}function R(e,t){e=String(e),t=t||{},0!==e.length&&(10!==e.charCodeAt(e.length-1)&&13!==e.charCodeAt(e.length-1)&&(e+="\n"),65279===e.charCodeAt(0)&&(e=e.slice(1)));var n=new h(e,t);for(n.input+="\0";32===n.input.charCodeAt(n.position);)n.lineIndent+=1,n.position+=1;for(;n.position<n.length-1;)M(n);return n.documents}function U(e,t,n){var r,i,a=R(e,n);for(r=0,i=a.length;r<i;r+=1)t(a[r])}function P(e,t){var n=R(e,t);if(0!==n.length){if(1===n.length)return n[0];throw new N("expected a single document in the stream, but found more")}}function q(e,t,n){U(e,t,z.extend({schema:F},n))}function B(e,t){return P(e,z.extend({schema:F},t))}for(var z=e("./common"),N=e("./exception"),$=e("./mark"),F=e("./schema/default_safe"),V=e("./schema/default_full"),H=Object.prototype.hasOwnProperty,Y=1,J=2,W=3,Q=4,G=1,K=2,X=3,Z=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,ee=/[\x85\u2028\u2029]/,te=/[,\[\]\{\}]/,ne=/^(?:!|!!|![a-z\-]+!)$/i,re=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i,ie=new Array(256),ae=new Array(256),oe=0;oe<256;oe++)ie[oe]=c(oe)?1:0,ae[oe]=c(oe);var se={YAML:function(e,t,n){var r,i,a;null!==e.version&&d(e,"duplication of %YAML directive"),1!==n.length&&d(e,"YAML directive accepts exactly one argument"),r=/^([0-9]+)\.([0-9]+)$/.exec(n[0]),null===r&&d(e,"ill-formed argument of the YAML directive"),i=parseInt(r[1],10),a=parseInt(r[2],10),1!==i&&d(e,"unacceptable YAML version of the document"),e.version=n[0],e.checkLineBreaks=a<2,1!==a&&2!==a&&m(e,"unsupported YAML version of the document")},TAG:function(e,t,n){var r,i;2!==n.length&&d(e,"TAG directive accepts exactly two arguments"),r=n[0],i=n[1],ne.test(r)||d(e,"ill-formed tag handle (first argument) of the TAG directive"),H.call(e.tagMap,r)&&d(e,'there is a previously declared suffix for "'+r+'" tag handle'),re.test(i)||d(e,"ill-formed tag prefix (second argument) of the TAG directive"),e.tagMap[r]=i}};t.exports.loadAll=U,t.exports.load=P,t.exports.safeLoadAll=q,t.exports.safeLoad=B},{"./common":21,"./exception":23,"./mark":25,"./schema/default_full":28,"./schema/default_safe":29}],25:[function(e,t,n){"use strict";function r(e,t,n,r,i){this.name=e,this.buffer=t,this.position=n,this.line=r,this.column=i}var i=e("./common");r.prototype.getSnippet=function(e,t){var n,r,a,o,s;if(!this.buffer)return null;for(e=e||4,t=t||75,n="",r=this.position;r>0&&"\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(r-1))===-1;)if(r-=1,this.position-r>t/2-1){n=" ... ",r+=5;break}for(a="",o=this.position;o<this.buffer.length&&"\0\r\n…\u2028\u2029".indexOf(this.buffer.charAt(o))===-1;)if(o+=1,o-this.position>t/2-1){a=" ... ",o-=5;break}return s=this.buffer.slice(r,o),i.repeat(" ",e)+n+s+a+"\n"+i.repeat(" ",e+this.position-r+n.length)+"^"},r.prototype.toString=function(e){var t,n="";return this.name&&(n+='in "'+this.name+'" '),n+="at line "+(this.line+1)+", column "+(this.column+1),e||(t=this.getSnippet(),t&&(n+=":\n"+t)),n},t.exports=r},{"./common":21}],26:[function(e,t,n){"use strict";function r(e,t,n){var i=[];return e.include.forEach(function(e){n=r(e,t,n)}),e[t].forEach(function(e){n.forEach(function(t,n){t.tag===e.tag&&i.push(n)}),n.push(e)}),n.filter(function(e,t){return i.indexOf(t)===-1})}function i(){function e(e){r[e.tag]=e}var t,n,r={};for(t=0,n=arguments.length;t<n;t+=1)arguments[t].forEach(e);return r}function a(e){this.include=e.include||[],this.implicit=e.implicit||[],this.explicit=e.explicit||[],this.implicit.forEach(function(e){if(e.loadKind&&"scalar"!==e.loadKind)throw new s("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")}),this.compiledImplicit=r(this,"implicit",[]),this.compiledExplicit=r(this,"explicit",[]),this.compiledTypeMap=i(this.compiledImplicit,this.compiledExplicit)}var o=e("./common"),s=e("./exception"),l=e("./type");a.DEFAULT=null,a.create=function(){var e,t;switch(arguments.length){case 1:e=a.DEFAULT,t=arguments[0];break;case 2:e=arguments[0],t=arguments[1];
+break;default:throw new s("Wrong number of arguments for Schema.create function")}if(e=o.toArray(e),t=o.toArray(t),!e.every(function(e){return e instanceof a}))throw new s("Specified list of super schemas (or a single Schema object) contains a non-Schema object.");if(!t.every(function(e){return e instanceof l}))throw new s("Specified list of YAML types (or a single Type object) contains a non-Type object.");return new a({include:e,explicit:t})},t.exports=a},{"./common":21,"./exception":23,"./type":32}],27:[function(e,t,n){"use strict";var r=e("../schema");t.exports=new r({include:[e("./json")]})},{"../schema":26,"./json":31}],28:[function(e,t,n){"use strict";var r=e("../schema");t.exports=r.DEFAULT=new r({include:[e("./default_safe")],explicit:[e("../type/js/undefined"),e("../type/js/regexp"),e("../type/js/function")]})},{"../schema":26,"../type/js/function":37,"../type/js/regexp":38,"../type/js/undefined":39,"./default_safe":29}],29:[function(e,t,n){"use strict";var r=e("../schema");t.exports=new r({include:[e("./core")],implicit:[e("../type/timestamp"),e("../type/merge")],explicit:[e("../type/binary"),e("../type/omap"),e("../type/pairs"),e("../type/set")]})},{"../schema":26,"../type/binary":33,"../type/merge":41,"../type/omap":43,"../type/pairs":44,"../type/set":46,"../type/timestamp":48,"./core":27}],30:[function(e,t,n){"use strict";var r=e("../schema");t.exports=new r({explicit:[e("../type/str"),e("../type/seq"),e("../type/map")]})},{"../schema":26,"../type/map":40,"../type/seq":45,"../type/str":47}],31:[function(e,t,n){"use strict";var r=e("../schema");t.exports=new r({include:[e("./failsafe")],implicit:[e("../type/null"),e("../type/bool"),e("../type/int"),e("../type/float")]})},{"../schema":26,"../type/bool":34,"../type/float":35,"../type/int":36,"../type/null":42,"./failsafe":30}],32:[function(e,t,n){"use strict";function r(e){var t={};return null!==e&&Object.keys(e).forEach(function(n){e[n].forEach(function(e){t[String(e)]=n})}),t}function i(e,t){if(t=t||{},Object.keys(t).forEach(function(t){if(o.indexOf(t)===-1)throw new a('Unknown option "'+t+'" is met in definition of "'+e+'" YAML type.')}),this.tag=e,this.kind=t.kind||null,this.resolve=t.resolve||function(){return!0},this.construct=t.construct||function(e){return e},this.instanceOf=t.instanceOf||null,this.predicate=t.predicate||null,this.represent=t.represent||null,this.defaultStyle=t.defaultStyle||null,this.styleAliases=r(t.styleAliases||null),s.indexOf(this.kind)===-1)throw new a('Unknown kind "'+this.kind+'" is specified for "'+e+'" YAML type.')}var a=e("./exception"),o=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],s=["scalar","sequence","mapping"];t.exports=i},{"./exception":23}],33:[function(e,t,n){"use strict";function r(e){if(null===e)return!1;var t,n,r=0,i=e.length,a=p;for(n=0;n<i;n++)if(t=a.indexOf(e.charAt(n)),!(t>64)){if(t<0)return!1;r+=6}return r%8===0}function i(e){var t,n,r=e.replace(/[\r\n=]/g,""),i=r.length,a=p,o=0,l=[];for(t=0;t<i;t++)t%4===0&&t&&(l.push(o>>16&255),l.push(o>>8&255),l.push(255&o)),o=o<<6|a.indexOf(r.charAt(t));return n=i%4*6,0===n?(l.push(o>>16&255),l.push(o>>8&255),l.push(255&o)):18===n?(l.push(o>>10&255),l.push(o>>2&255)):12===n&&l.push(o>>4&255),s?new s(l):l}function a(e){var t,n,r="",i=0,a=e.length,o=p;for(t=0;t<a;t++)t%3===0&&t&&(r+=o[i>>18&63],r+=o[i>>12&63],r+=o[i>>6&63],r+=o[63&i]),i=(i<<8)+e[t];return n=a%3,0===n?(r+=o[i>>18&63],r+=o[i>>12&63],r+=o[i>>6&63],r+=o[63&i]):2===n?(r+=o[i>>10&63],r+=o[i>>4&63],r+=o[i<<2&63],r+=o[64]):1===n&&(r+=o[i>>2&63],r+=o[i<<4&63],r+=o[64],r+=o[64]),r}function o(e){return s&&s.isBuffer(e)}var s;try{var l=e;s=l("buffer").Buffer}catch(u){}var c=e("../type"),p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r";t.exports=new c("tag:yaml.org,2002:binary",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:a})},{"../type":32}],34:[function(e,t,n){"use strict";function r(e){if(null===e)return!1;var t=e.length;return 4===t&&("true"===e||"True"===e||"TRUE"===e)||5===t&&("false"===e||"False"===e||"FALSE"===e)}function i(e){return"true"===e||"True"===e||"TRUE"===e}function a(e){return"[object Boolean]"===Object.prototype.toString.call(e)}var o=e("../type");t.exports=new o("tag:yaml.org,2002:bool",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:{lowercase:function(e){return e?"true":"false"},uppercase:function(e){return e?"TRUE":"FALSE"},camelcase:function(e){return e?"True":"False"}},defaultStyle:"lowercase"})},{"../type":32}],35:[function(e,t,n){"use strict";function r(e){return null!==e&&!!u.test(e)}function i(e){var t,n,r,i;return t=e.replace(/_/g,"").toLowerCase(),n="-"===t[0]?-1:1,i=[],"+-".indexOf(t[0])>=0&&(t=t.slice(1)),".inf"===t?1===n?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:".nan"===t?NaN:t.indexOf(":")>=0?(t.split(":").forEach(function(e){i.unshift(parseFloat(e,10))}),t=0,r=1,i.forEach(function(e){t+=e*r,r*=60}),n*t):n*parseFloat(t,10)}function a(e,t){var n;if(isNaN(e))switch(t){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===e)switch(t){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===e)switch(t){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(s.isNegativeZero(e))return"-0.0";return n=e.toString(10),c.test(n)?n.replace("e",".e"):n}function o(e){return"[object Number]"===Object.prototype.toString.call(e)&&(e%1!==0||s.isNegativeZero(e))}var s=e("../common"),l=e("../type"),u=new RegExp("^(?:[-+]?(?:[0-9][0-9_]*)\\.[0-9_]*(?:[eE][-+][0-9]+)?|\\.[0-9_]+(?:[eE][-+][0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$"),c=/^[-+]?[0-9]+e/;t.exports=new l("tag:yaml.org,2002:float",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:a,defaultStyle:"lowercase"})},{"../common":21,"../type":32}],36:[function(e,t,n){"use strict";function r(e){return 48<=e&&e<=57||65<=e&&e<=70||97<=e&&e<=102}function i(e){return 48<=e&&e<=55}function a(e){return 48<=e&&e<=57}function o(e){if(null===e)return!1;var t,n=e.length,o=0,s=!1;if(!n)return!1;if(t=e[o],"-"!==t&&"+"!==t||(t=e[++o]),"0"===t){if(o+1===n)return!0;if(t=e[++o],"b"===t){for(o++;o<n;o++)if(t=e[o],"_"!==t){if("0"!==t&&"1"!==t)return!1;s=!0}return s}if("x"===t){for(o++;o<n;o++)if(t=e[o],"_"!==t){if(!r(e.charCodeAt(o)))return!1;s=!0}return s}for(;o<n;o++)if(t=e[o],"_"!==t){if(!i(e.charCodeAt(o)))return!1;s=!0}return s}for(;o<n;o++)if(t=e[o],"_"!==t){if(":"===t)break;if(!a(e.charCodeAt(o)))return!1;s=!0}return!!s&&(":"!==t||/^(:[0-5]?[0-9])+$/.test(e.slice(o)))}function s(e){var t,n,r=e,i=1,a=[];return r.indexOf("_")!==-1&&(r=r.replace(/_/g,"")),t=r[0],"-"!==t&&"+"!==t||("-"===t&&(i=-1),r=r.slice(1),t=r[0]),"0"===r?0:"0"===t?"b"===r[1]?i*parseInt(r.slice(2),2):"x"===r[1]?i*parseInt(r,16):i*parseInt(r,8):r.indexOf(":")!==-1?(r.split(":").forEach(function(e){a.unshift(parseInt(e,10))}),r=0,n=1,a.forEach(function(e){r+=e*n,n*=60}),i*r):i*parseInt(r,10)}function l(e){return"[object Number]"===Object.prototype.toString.call(e)&&e%1===0&&!u.isNegativeZero(e)}var u=e("../common"),c=e("../type");t.exports=new c("tag:yaml.org,2002:int",{kind:"scalar",resolve:o,construct:s,predicate:l,represent:{binary:function(e){return"0b"+e.toString(2)},octal:function(e){return"0"+e.toString(8)},decimal:function(e){return e.toString(10)},hexadecimal:function(e){return"0x"+e.toString(16).toUpperCase()}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})},{"../common":21,"../type":32}],37:[function(e,t,n){"use strict";function r(e){if(null===e)return!1;try{var t="("+e+")",n=s.parse(t,{range:!0});return"Program"===n.type&&1===n.body.length&&"ExpressionStatement"===n.body[0].type&&"FunctionExpression"===n.body[0].expression.type}catch(r){return!1}}function i(e){var t,n="("+e+")",r=s.parse(n,{range:!0}),i=[];if("Program"!==r.type||1!==r.body.length||"ExpressionStatement"!==r.body[0].type||"FunctionExpression"!==r.body[0].expression.type)throw new Error("Failed to resolve function");return r.body[0].expression.params.forEach(function(e){i.push(e.name)}),t=r.body[0].expression.body.range,new Function(i,n.slice(t[0]+1,t[1]-1))}function a(e){return e.toString()}function o(e){return"[object Function]"===Object.prototype.toString.call(e)}var s;try{var l=e;s=l("esprima")}catch(u){"undefined"!=typeof window&&(s=window.esprima)}var c=e("../../type");t.exports=new c("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:a})},{"../../type":32}],38:[function(e,t,n){"use strict";function r(e){if(null===e)return!1;if(0===e.length)return!1;var t=e,n=/\/([gim]*)$/.exec(e),r="";if("/"===t[0]){if(n&&(r=n[1]),r.length>3)return!1;if("/"!==t[t.length-r.length-1])return!1}return!0}function i(e){var t=e,n=/\/([gim]*)$/.exec(e),r="";return"/"===t[0]&&(n&&(r=n[1]),t=t.slice(1,t.length-r.length-1)),new RegExp(t,r)}function a(e){var t="/"+e.source+"/";return e.global&&(t+="g"),e.multiline&&(t+="m"),e.ignoreCase&&(t+="i"),t}function o(e){return"[object RegExp]"===Object.prototype.toString.call(e)}var s=e("../../type");t.exports=new s("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:a})},{"../../type":32}],39:[function(e,t,n){"use strict";function r(){return!0}function i(){}function a(){return""}function o(e){return"undefined"==typeof e}var s=e("../../type");t.exports=new s("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:r,construct:i,predicate:o,represent:a})},{"../../type":32}],40:[function(e,t,n){"use strict";var r=e("../type");t.exports=new r("tag:yaml.org,2002:map",{kind:"mapping",construct:function(e){return null!==e?e:{}}})},{"../type":32}],41:[function(e,t,n){"use strict";function r(e){return"<<"===e||null===e}var i=e("../type");t.exports=new i("tag:yaml.org,2002:merge",{kind:"scalar",resolve:r})},{"../type":32}],42:[function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t=e.length;return 1===t&&"~"===e||4===t&&("null"===e||"Null"===e||"NULL"===e)}function i(){return null}function a(e){return null===e}var o=e("../type");t.exports=new o("tag:yaml.org,2002:null",{kind:"scalar",resolve:r,construct:i,predicate:a,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})},{"../type":32}],43:[function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n,r,i,a,l=[],u=e;for(t=0,n=u.length;t<n;t+=1){if(r=u[t],a=!1,"[object Object]"!==s.call(r))return!1;for(i in r)if(o.call(r,i)){if(a)return!1;a=!0}if(!a)return!1;if(l.indexOf(i)!==-1)return!1;l.push(i)}return!0}function i(e){return null!==e?e:[]}var a=e("../type"),o=Object.prototype.hasOwnProperty,s=Object.prototype.toString;t.exports=new a("tag:yaml.org,2002:omap",{kind:"sequence",resolve:r,construct:i})},{"../type":32}],44:[function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n,r,i,a,s=e;for(a=new Array(s.length),t=0,n=s.length;t<n;t+=1){if(r=s[t],"[object Object]"!==o.call(r))return!1;if(i=Object.keys(r),1!==i.length)return!1;a[t]=[i[0],r[i[0]]]}return!0}function i(e){if(null===e)return[];var t,n,r,i,a,o=e;for(a=new Array(o.length),t=0,n=o.length;t<n;t+=1)r=o[t],i=Object.keys(r),a[t]=[i[0],r[i[0]]];return a}var a=e("../type"),o=Object.prototype.toString;t.exports=new a("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:r,construct:i})},{"../type":32}],45:[function(e,t,n){"use strict";var r=e("../type");t.exports=new r("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(e){return null!==e?e:[]}})},{"../type":32}],46:[function(e,t,n){"use strict";function r(e){if(null===e)return!0;var t,n=e;for(t in n)if(o.call(n,t)&&null!==n[t])return!1;return!0}function i(e){return null!==e?e:{}}var a=e("../type"),o=Object.prototype.hasOwnProperty;t.exports=new a("tag:yaml.org,2002:set",{kind:"mapping",resolve:r,construct:i})},{"../type":32}],47:[function(e,t,n){"use strict";var r=e("../type");t.exports=new r("tag:yaml.org,2002:str",{kind:"scalar",construct:function(e){return null!==e?e:""}})},{"../type":32}],48:[function(e,t,n){"use strict";function r(e){return null!==e&&(null!==s.exec(e)||null!==l.exec(e))}function i(e){var t,n,r,i,a,o,u,c,p,h,f=0,d=null;if(t=s.exec(e),null===t&&(t=l.exec(e)),null===t)throw new Error("Date resolve error");if(n=+t[1],r=+t[2]-1,i=+t[3],!t[4])return new Date(Date.UTC(n,r,i));if(a=+t[4],o=+t[5],u=+t[6],t[7]){for(f=t[7].slice(0,3);f.length<3;)f+="0";f=+f}return t[9]&&(c=+t[10],p=+(t[11]||0),d=6e4*(60*c+p),"-"===t[9]&&(d=-d)),h=new Date(Date.UTC(n,r,i,a,o,u,f)),d&&h.setTime(h.getTime()-d),h}function a(e){return e.toISOString()}var o=e("../type"),s=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),l=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");t.exports=new o("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:r,construct:i,instanceOf:Date,represent:a})},{"../type":32}],49:[function(e,t,n){function r(e,t,n){var r=e?e.length:0;if(!r)return-1;if("number"==typeof n)n=n<0?o(r+n,0):n;else if(n){var s=a(e,t);return s<r&&(t===t?t===e[s]:e[s]!==e[s])?s:-1}return i(e,t,n||0)}var i=e("../internal/baseIndexOf"),a=e("../internal/binaryIndex"),o=Math.max;t.exports=r},{"../internal/baseIndexOf":78,"../internal/binaryIndex":92}],50:[function(e,t,n){function r(e){var t=e?e.length:0;return t?e[t-1]:void 0}t.exports=r},{}],51:[function(e,t,n){function r(e){if(l(e)&&!s(e)&&!(e instanceof i)){if(e instanceof a)return e;if(p.call(e,"__chain__")&&p.call(e,"__wrapped__"))return u(e)}return new a(e)}var i=e("../internal/LazyWrapper"),a=e("../internal/LodashWrapper"),o=e("../internal/baseLodash"),s=e("../lang/isArray"),l=e("../internal/isObjectLike"),u=e("../internal/wrapperClone"),c=Object.prototype,p=c.hasOwnProperty;r.prototype=o.prototype,t.exports=r},{"../internal/LazyWrapper":60,"../internal/LodashWrapper":61,"../internal/baseLodash":82,"../internal/isObjectLike":126,"../internal/wrapperClone":137,"../lang/isArray":140}],52:[function(e,t,n){t.exports=e("./forEach")},{"./forEach":54}],53:[function(e,t,n){var r=e("../internal/baseEach"),i=e("../internal/createFind"),a=i(r);t.exports=a},{"../internal/baseEach":71,"../internal/createFind":102}],54:[function(e,t,n){var r=e("../internal/arrayEach"),i=e("../internal/baseEach"),a=e("../internal/createForEach"),o=a(r,i);t.exports=o},{"../internal/arrayEach":63,"../internal/baseEach":71,"../internal/createForEach":103}],55:[function(e,t,n){function r(e,t,n,r){var h=e?a(e):0;return l(h)||(e=c(e),h=e.length),n="number"!=typeof n||r&&s(t,n,r)?0:n<0?p(h+n,0):n||0,"string"==typeof e||!o(e)&&u(e)?n<=h&&e.indexOf(t,n)>-1:!!h&&i(e,t,n)>-1}var i=e("../internal/baseIndexOf"),a=e("../internal/getLength"),o=e("../lang/isArray"),s=e("../internal/isIterateeCall"),l=e("../internal/isLength"),u=e("../lang/isString"),c=e("../object/values"),p=Math.max;t.exports=r},{"../internal/baseIndexOf":78,"../internal/getLength":112,"../internal/isIterateeCall":122,"../internal/isLength":125,"../lang/isArray":140,"../lang/isString":146,"../object/values":152}],56:[function(e,t,n){function r(e,t,n){var r=s(e)?i:o;return t=a(t,n,3),r(e,t)}var i=e("../internal/arrayMap"),a=e("../internal/baseCallback"),o=e("../internal/baseMap"),s=e("../lang/isArray");t.exports=r},{"../internal/arrayMap":64,"../internal/baseCallback":67,"../internal/baseMap":83,"../lang/isArray":140}],57:[function(e,t,n){var r=e("../internal/getNative"),i=r(Date,"now"),a=i||function(){return(new Date).getTime()};t.exports=a},{"../internal/getNative":114}],58:[function(e,t,n){var r=e("../internal/createWrapper"),i=e("../internal/replaceHolders"),a=e("./restParam"),o=1,s=32,l=a(function(e,t,n){var a=o;if(n.length){var u=i(n,l.placeholder);a|=s}return r(e,a,t,n,u)});l.placeholder={},t.exports=l},{"../internal/createWrapper":106,"../internal/replaceHolders":132,"./restParam":59}],59:[function(e,t,n){function r(e,t){if("function"!=typeof e)throw new TypeError(i);return t=a(void 0===t?e.length-1:+t||0,0),function(){for(var n=arguments,r=-1,i=a(n.length-t,0),o=Array(i);++r<i;)o[r]=n[t+r];switch(t){case 0:return e.call(this,o);case 1:return e.call(this,n[0],o);case 2:return e.call(this,n[0],n[1],o)}var s=Array(t+1);for(r=-1;++r<t;)s[r]=n[r];return s[t]=o,e.apply(this,s)}}var i="Expected a function",a=Math.max;t.exports=r},{}],60:[function(e,t,n){function r(e){this.__wrapped__=e,this.__actions__=[],this.__dir__=1,this.__filtered__=!1,this.__iteratees__=[],this.__takeCount__=o,this.__views__=[]}var i=e("./baseCreate"),a=e("./baseLodash"),o=Number.POSITIVE_INFINITY;r.prototype=i(a.prototype),r.prototype.constructor=r,t.exports=r},{"./baseCreate":70,"./baseLodash":82}],61:[function(e,t,n){function r(e,t,n){this.__wrapped__=e,this.__actions__=n||[],this.__chain__=!!t}var i=e("./baseCreate"),a=e("./baseLodash");r.prototype=i(a.prototype),r.prototype.constructor=r,t.exports=r},{"./baseCreate":70,"./baseLodash":82}],62:[function(e,t,n){function r(e,t){var n=-1,r=e.length;for(t||(t=Array(r));++n<r;)t[n]=e[n];return t}t.exports=r},{}],63:[function(e,t,n){function r(e,t){for(var n=-1,r=e.length;++n<r&&t(e[n],n,e)!==!1;);return e}t.exports=r},{}],64:[function(e,t,n){function r(e,t){for(var n=-1,r=e.length,i=Array(r);++n<r;)i[n]=t(e[n],n,e);return i}t.exports=r},{}],65:[function(e,t,n){function r(e,t){for(var n=-1,r=e.length;++n<r;)if(t(e[n],n,e))return!0;return!1}t.exports=r},{}],66:[function(e,t,n){function r(e,t){return null==t?e:i(t,a(t),e)}var i=e("./baseCopy"),a=e("../object/keys");t.exports=r},{"../object/keys":149,"./baseCopy":69}],67:[function(e,t,n){function r(e,t,n){var r=typeof e;return"function"==r?void 0===t?e:o(e,t,n):null==e?s:"object"==r?i(e):void 0===t?l(e):a(e,t)}var i=e("./baseMatches"),a=e("./baseMatchesProperty"),o=e("./bindCallback"),s=e("../utility/identity"),l=e("../utility/property");t.exports=r},{"../utility/identity":154,"../utility/property":156,"./baseMatches":84,"./baseMatchesProperty":85,"./bindCallback":94}],68:[function(e,t,n){function r(e,t,n,m,g,y,v){var w;if(n&&(w=g?n(e,m,g):n(e)),void 0!==w)return w;if(!f(e))return e;var _=p(e);if(_){if(w=l(e),!t)return i(e,w)}else{var A=B.call(e),S=A==b;if(A!=x&&A!=d&&(!S||g))return P[A]?u(e,A,t):g?e:{};if(h(e))return g?e:{};if(w=c(S?{}:e),!t)return o(w,e)}y||(y=[]),v||(v=[]);for(var j=y.length;j--;)if(y[j]==e)return v[j];return y.push(e),v.push(w),(_?a:s)(e,function(i,a){w[a]=r(i,t,n,a,e,y,v)}),w}var i=e("./arrayCopy"),a=e("./arrayEach"),o=e("./baseAssign"),s=e("./baseForOwn"),l=e("./initCloneArray"),u=e("./initCloneByTag"),c=e("./initCloneObject"),p=e("../lang/isArray"),h=e("./isHostObject"),f=e("../lang/isObject"),d="[object Arguments]",m="[object Array]",g="[object Boolean]",y="[object Date]",v="[object Error]",b="[object Function]",w="[object Map]",_="[object Number]",x="[object Object]",A="[object RegExp]",S="[object Set]",j="[object String]",E="[object WeakMap]",O="[object ArrayBuffer]",k="[object Float32Array]",T="[object Float64Array]",C="[object Int8Array]",I="[object Int16Array]",D="[object Int32Array]",L="[object Uint8Array]",M="[object Uint8ClampedArray]",R="[object Uint16Array]",U="[object Uint32Array]",P={};P[d]=P[m]=P[O]=P[g]=P[y]=P[k]=P[T]=P[C]=P[I]=P[D]=P[_]=P[x]=P[A]=P[j]=P[L]=P[M]=P[R]=P[U]=!0,P[v]=P[b]=P[w]=P[S]=P[E]=!1;var q=Object.prototype,B=q.toString;t.exports=r},{"../lang/isArray":140,"../lang/isObject":144,"./arrayCopy":62,"./arrayEach":63,"./baseAssign":66,"./baseForOwn":76,"./initCloneArray":116,"./initCloneByTag":117,"./initCloneObject":118,"./isHostObject":120}],69:[function(e,t,n){function r(e,t,n){n||(n={});for(var r=-1,i=t.length;++r<i;){var a=t[r];n[a]=e[a]}return n}t.exports=r},{}],70:[function(e,t,n){var r=e("../lang/isObject"),i=function(){function e(){}return function(t){if(r(t)){e.prototype=t;var n=new e;e.prototype=void 0}return n||{}}}();t.exports=i},{"../lang/isObject":144}],71:[function(e,t,n){var r=e("./baseForOwn"),i=e("./createBaseEach"),a=i(r);t.exports=a},{"./baseForOwn":76,"./createBaseEach":98}],72:[function(e,t,n){function r(e,t,n,r){var i;return n(e,function(e,n,a){if(t(e,n,a))return i=r?n:e,!1}),i}t.exports=r},{}],73:[function(e,t,n){function r(e,t,n){for(var r=e.length,i=n?r:-1;n?i--:++i<r;)if(t(e[i],i,e))return i;return-1}t.exports=r},{}],74:[function(e,t,n){var r=e("./createBaseFor"),i=r();t.exports=i},{"./createBaseFor":99}],75:[function(e,t,n){function r(e,t){return i(e,t,a)}var i=e("./baseFor"),a=e("../object/keysIn");t.exports=r},{"../object/keysIn":150,"./baseFor":74}],76:[function(e,t,n){function r(e,t){return i(e,t,a)}var i=e("./baseFor"),a=e("../object/keys");t.exports=r},{"../object/keys":149,"./baseFor":74}],77:[function(e,t,n){function r(e,t,n){if(null!=e){e=i(e),void 0!==n&&n in e&&(t=[n]);for(var r=0,a=t.length;null!=e&&r<a;)e=i(e)[t[r++]];return r&&r==a?e:void 0}}var i=e("./toObject");t.exports=r},{"./toObject":135}],78:[function(e,t,n){function r(e,t,n){if(t!==t)return i(e,n);for(var r=n-1,a=e.length;++r<a;)if(e[r]===t)return r;return-1}var i=e("./indexOfNaN");t.exports=r},{"./indexOfNaN":115}],79:[function(e,t,n){function r(e,t,n,s,l,u){return e===t||(null==e||null==t||!a(e)&&!o(t)?e!==e&&t!==t:i(e,t,r,n,s,l,u))}var i=e("./baseIsEqualDeep"),a=e("../lang/isObject"),o=e("./isObjectLike");t.exports=r},{"../lang/isObject":144,"./baseIsEqualDeep":80,"./isObjectLike":126}],80:[function(e,t,n){function r(e,t,n,r,f,g,y){var v=s(e),b=s(t),w=p,_=p;v||(w=m.call(e),w==c?w=h:w!=h&&(v=u(e))),b||(_=m.call(t),_==c?_=h:_!=h&&(b=u(t)));var x=w==h&&!l(e),A=_==h&&!l(t),S=w==_;if(S&&!v&&!x)return a(e,t,w);if(!f){var j=x&&d.call(e,"__wrapped__"),E=A&&d.call(t,"__wrapped__");if(j||E)return n(j?e.value():e,E?t.value():t,r,f,g,y)}if(!S)return!1;g||(g=[]),y||(y=[]);for(var O=g.length;O--;)if(g[O]==e)return y[O]==t;g.push(e),y.push(t);var k=(v?i:o)(e,t,n,r,f,g,y);return g.pop(),y.pop(),k}var i=e("./equalArrays"),a=e("./equalByTag"),o=e("./equalObjects"),s=e("../lang/isArray"),l=e("./isHostObject"),u=e("../lang/isTypedArray"),c="[object Arguments]",p="[object Array]",h="[object Object]",f=Object.prototype,d=f.hasOwnProperty,m=f.toString;t.exports=r},{"../lang/isArray":140,"../lang/isTypedArray":147,"./equalArrays":107,"./equalByTag":108,"./equalObjects":109,"./isHostObject":120}],81:[function(e,t,n){function r(e,t,n){var r=t.length,o=r,s=!n;if(null==e)return!o;for(e=a(e);r--;){var l=t[r];if(s&&l[2]?l[1]!==e[l[0]]:!(l[0]in e))return!1}for(;++r<o;){l=t[r];var u=l[0],c=e[u],p=l[1];if(s&&l[2]){if(void 0===c&&!(u in e))return!1}else{var h=n?n(c,p,u):void 0;if(!(void 0===h?i(p,c,n,!0):h))return!1}}return!0}var i=e("./baseIsEqual"),a=e("./toObject");t.exports=r},{"./baseIsEqual":79,"./toObject":135}],82:[function(e,t,n){function r(){}t.exports=r},{}],83:[function(e,t,n){function r(e,t){var n=-1,r=a(e)?Array(e.length):[];return i(e,function(e,i,a){r[++n]=t(e,i,a)}),r}var i=e("./baseEach"),a=e("./isArrayLike");t.exports=r},{"./baseEach":71,"./isArrayLike":119}],84:[function(e,t,n){function r(e){var t=a(e);if(1==t.length&&t[0][2]){var n=t[0][0],r=t[0][1];return function(e){return null!=e&&(e=o(e),e[n]===r&&(void 0!==r||n in e))}}return function(e){return i(e,t)}}var i=e("./baseIsMatch"),a=e("./getMatchData"),o=e("./toObject");t.exports=r},{"./baseIsMatch":81,"./getMatchData":113,"./toObject":135}],85:[function(e,t,n){function r(e,t){var n=s(e),r=l(e)&&u(t),f=e+"";return e=h(e),function(s){if(null==s)return!1;var l=f;if(s=p(s),(n||!r)&&!(l in s)){if(s=1==e.length?s:i(s,o(e,0,-1)),null==s)return!1;l=c(e),s=p(s)}return s[l]===t?void 0!==t||l in s:a(t,s[l],void 0,!0)}}var i=e("./baseGet"),a=e("./baseIsEqual"),o=e("./baseSlice"),s=e("../lang/isArray"),l=e("./isKey"),u=e("./isStrictComparable"),c=e("../array/last"),p=e("./toObject"),h=e("./toPath");t.exports=r},{"../array/last":50,"../lang/isArray":140,"./baseGet":77,"./baseIsEqual":79,"./baseSlice":89,"./isKey":123,"./isStrictComparable":127,"./toObject":135,"./toPath":136}],86:[function(e,t,n){function r(e){return function(t){return null==t?void 0:i(t)[e]}}var i=e("./toObject");t.exports=r},{"./toObject":135}],87:[function(e,t,n){function r(e){var t=e+"";return e=a(e),function(n){return i(n,e,t)}}var i=e("./baseGet"),a=e("./toPath");t.exports=r},{"./baseGet":77,"./toPath":136}],88:[function(e,t,n){var r=e("../utility/identity"),i=e("./metaMap"),a=i?function(e,t){return i.set(e,t),e}:r;t.exports=a},{"../utility/identity":154,"./metaMap":129}],89:[function(e,t,n){function r(e,t,n){var r=-1,i=e.length;t=null==t?0:+t||0,t<0&&(t=-t>i?0:i+t),n=void 0===n||n>i?i:+n||0,n<0&&(n+=i),i=t>n?0:n-t>>>0,t>>>=0;for(var a=Array(i);++r<i;)a[r]=e[r+t];return a}t.exports=r},{}],90:[function(e,t,n){function r(e){return null==e?"":e+""}t.exports=r},{}],91:[function(e,t,n){function r(e,t){for(var n=-1,r=t.length,i=Array(r);++n<r;)i[n]=e[t[n]];return i}t.exports=r},{}],92:[function(e,t,n){function r(e,t,n){var r=0,o=e?e.length:r;if("number"==typeof t&&t===t&&o<=s){for(;r<o;){var l=r+o>>>1,u=e[l];(n?u<=t:u<t)&&null!==u?r=l+1:o=l}return o}return i(e,t,a,n)}var i=e("./binaryIndexBy"),a=e("../utility/identity"),o=4294967295,s=o>>>1;t.exports=r},{"../utility/identity":154,"./binaryIndexBy":93}],93:[function(e,t,n){function r(e,t,n,r){t=n(t);for(var o=0,l=e?e.length:0,u=t!==t,c=null===t,p=void 0===t;o<l;){var h=i((o+l)/2),f=n(e[h]),d=void 0!==f,m=f===f;if(u)var g=m||r;else g=c?m&&d&&(r||null!=f):p?m&&(r||d):null!=f&&(r?f<=t:f<t);g?o=h+1:l=h}return a(l,s)}var i=Math.floor,a=Math.min,o=4294967295,s=o-1;t.exports=r},{}],94:[function(e,t,n){function r(e,t,n){if("function"!=typeof e)return i;if(void 0===t)return e;switch(n){case 1:return function(n){return e.call(t,n)};case 3:return function(n,r,i){return e.call(t,n,r,i)};case 4:return function(n,r,i,a){return e.call(t,n,r,i,a)};case 5:return function(n,r,i,a,o){return e.call(t,n,r,i,a,o)}}return function(){return e.apply(t,arguments)}}var i=e("../utility/identity");t.exports=r},{"../utility/identity":154}],95:[function(e,t,n){(function(e){function n(e){var t=new r(e.byteLength),n=new i(t);return n.set(new i(e)),t}var r=e.ArrayBuffer,i=e.Uint8Array;t.exports=n}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],96:[function(e,t,n){function r(e,t,n){for(var r=n.length,a=-1,o=i(e.length-r,0),s=-1,l=t.length,u=Array(l+o);++s<l;)u[s]=t[s];for(;++a<r;)u[n[a]]=e[a];for(;o--;)u[s++]=e[a++];return u}var i=Math.max;t.exports=r},{}],97:[function(e,t,n){function r(e,t,n){for(var r=-1,a=n.length,o=-1,s=i(e.length-a,0),l=-1,u=t.length,c=Array(s+u);++o<s;)c[o]=e[o];for(var p=o;++l<u;)c[p+l]=t[l];for(;++r<a;)c[p+n[r]]=e[o++];return c}var i=Math.max;t.exports=r},{}],98:[function(e,t,n){function r(e,t){return function(n,r){var s=n?i(n):0;if(!a(s))return e(n,r);for(var l=t?s:-1,u=o(n);(t?l--:++l<s)&&r(u[l],l,u)!==!1;);return n}}var i=e("./getLength"),a=e("./isLength"),o=e("./toObject");t.exports=r},{"./getLength":112,"./isLength":125,"./toObject":135}],99:[function(e,t,n){function r(e){return function(t,n,r){for(var a=i(t),o=r(t),s=o.length,l=e?s:-1;e?l--:++l<s;){var u=o[l];if(n(a[u],u,a)===!1)break}return t}}var i=e("./toObject");t.exports=r},{"./toObject":135}],100:[function(e,t,n){(function(n){function r(e,t){function r(){var i=this&&this!==n&&this instanceof r?a:e;return i.apply(t,arguments)}var a=i(e);return r}var i=e("./createCtorWrapper");t.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./createCtorWrapper":101}],101:[function(e,t,n){function r(e){return function(){var t=arguments;switch(t.length){case 0:return new e;case 1:return new e(t[0]);case 2:return new e(t[0],t[1]);case 3:return new e(t[0],t[1],t[2]);case 4:return new e(t[0],t[1],t[2],t[3]);case 5:return new e(t[0],t[1],t[2],t[3],t[4]);case 6:return new e(t[0],t[1],t[2],t[3],t[4],t[5]);case 7:return new e(t[0],t[1],t[2],t[3],t[4],t[5],t[6])}var n=i(e.prototype),r=e.apply(n,t);return a(r)?r:n}}var i=e("./baseCreate"),a=e("../lang/isObject");t.exports=r},{"../lang/isObject":144,"./baseCreate":70}],102:[function(e,t,n){function r(e,t){return function(n,r,l){if(r=i(r,l,3),s(n)){var u=o(n,r,t);return u>-1?n[u]:void 0}return a(n,r,e)}}var i=e("./baseCallback"),a=e("./baseFind"),o=e("./baseFindIndex"),s=e("../lang/isArray");t.exports=r},{"../lang/isArray":140,"./baseCallback":67,"./baseFind":72,"./baseFindIndex":73}],103:[function(e,t,n){function r(e,t){return function(n,r,o){return"function"==typeof r&&void 0===o&&a(n)?e(n,r):t(n,i(r,o,3))}}var i=e("./bindCallback"),a=e("../lang/isArray");t.exports=r},{"../lang/isArray":140,"./bindCallback":94}],104:[function(e,t,n){(function(n){function r(e,t,_,x,A,S,j,E,O,k){function T(){for(var d=arguments.length,m=d,g=Array(d);m--;)g[m]=arguments[m];if(x&&(g=a(g,x,A)),S&&(g=o(g,S,j)),L||R){var b=T.placeholder,P=c(g,b);if(d-=P.length,d<k){var q=E?i(E):void 0,B=w(k-d,0),z=L?P:void 0,N=L?void 0:P,$=L?g:void 0,F=L?void 0:g;t|=L?y:v,t&=~(L?v:y),M||(t&=~(h|f));var V=[e,t,_,$,z,F,N,q,O,B],H=r.apply(void 0,V);return l(e)&&p(H,V),H.placeholder=b,H}}var Y=I?_:this,J=D?Y[e]:e;return E&&(g=u(g,E)),C&&O<g.length&&(g.length=O),this&&this!==n&&this instanceof T&&(J=U||s(e)),J.apply(Y,g)}var C=t&b,I=t&h,D=t&f,L=t&m,M=t&d,R=t&g,U=D?void 0:s(e);return T}var i=e("./arrayCopy"),a=e("./composeArgs"),o=e("./composeArgsRight"),s=e("./createCtorWrapper"),l=e("./isLaziable"),u=e("./reorder"),c=e("./replaceHolders"),p=e("./setData"),h=1,f=2,d=4,m=8,g=16,y=32,v=64,b=128,w=Math.max;t.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./arrayCopy":62,"./composeArgs":96,"./composeArgsRight":97,"./createCtorWrapper":101,"./isLaziable":124,"./reorder":131,"./replaceHolders":132,"./setData":133}],105:[function(e,t,n){(function(n){function r(e,t,r,o){function s(){for(var t=-1,i=arguments.length,a=-1,c=o.length,p=Array(c+i);++a<c;)p[a]=o[a];for(;i--;)p[a++]=arguments[++t];var h=this&&this!==n&&this instanceof s?u:e;return h.apply(l?r:this,p)}var l=t&a,u=i(e);return s}var i=e("./createCtorWrapper"),a=1;t.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./createCtorWrapper":101}],106:[function(e,t,n){function r(e,t,n,r,y,v,b,w){var _=t&h;if(!_&&"function"!=typeof e)throw new TypeError(m);var x=r?r.length:0;if(x||(t&=~(f|d),r=y=void 0),x-=y?y.length:0,t&d){var A=r,S=y;r=y=void 0}var j=_?void 0:l(e),E=[e,t,n,r,y,A,S,v,b,w];if(j&&(u(E,j),t=E[1],w=E[9]),E[9]=null==w?_?0:e.length:g(w-x,0)||0,t==p)var O=a(E[0],E[2]);else O=t!=f&&t!=(p|f)||E[4].length?o.apply(void 0,E):s.apply(void 0,E);var k=j?i:c;return k(O,E)}var i=e("./baseSetData"),a=e("./createBindWrapper"),o=e("./createHybridWrapper"),s=e("./createPartialWrapper"),l=e("./getData"),u=e("./mergeData"),c=e("./setData"),p=1,h=2,f=32,d=64,m="Expected a function",g=Math.max;t.exports=r},{"./baseSetData":88,"./createBindWrapper":100,"./createHybridWrapper":104,"./createPartialWrapper":105,"./getData":110,"./mergeData":128,"./setData":133}],107:[function(e,t,n){function r(e,t,n,r,a,o,s){var l=-1,u=e.length,c=t.length;if(u!=c&&!(a&&c>u))return!1;for(;++l<u;){var p=e[l],h=t[l],f=r?r(a?h:p,a?p:h,l):void 0;if(void 0!==f){if(f)continue;return!1}if(a){if(!i(t,function(e){return p===e||n(p,e,r,a,o,s)}))return!1}else if(p!==h&&!n(p,h,r,a,o,s))return!1}return!0}var i=e("./arraySome");t.exports=r},{"./arraySome":65}],108:[function(e,t,n){function r(e,t,n){switch(n){case i:case a:return+e==+t;case o:return e.name==t.name&&e.message==t.message;case s:return e!=+e?t!=+t:e==+t;case l:case u:return e==t+""}return!1}var i="[object Boolean]",a="[object Date]",o="[object Error]",s="[object Number]",l="[object RegExp]",u="[object String]";t.exports=r},{}],109:[function(e,t,n){function r(e,t,n,r,a,s,l){var u=i(e),c=u.length,p=i(t),h=p.length;
+if(c!=h&&!a)return!1;for(var f=c;f--;){var d=u[f];if(!(a?d in t:o.call(t,d)))return!1}for(var m=a;++f<c;){d=u[f];var g=e[d],y=t[d],v=r?r(a?y:g,a?g:y,d):void 0;if(!(void 0===v?n(g,y,r,a,s,l):v))return!1;m||(m="constructor"==d)}if(!m){var b=e.constructor,w=t.constructor;if(b!=w&&"constructor"in e&&"constructor"in t&&!("function"==typeof b&&b instanceof b&&"function"==typeof w&&w instanceof w))return!1}return!0}var i=e("../object/keys"),a=Object.prototype,o=a.hasOwnProperty;t.exports=r},{"../object/keys":149}],110:[function(e,t,n){var r=e("./metaMap"),i=e("../utility/noop"),a=r?function(e){return r.get(e)}:i;t.exports=a},{"../utility/noop":155,"./metaMap":129}],111:[function(e,t,n){function r(e){for(var t=e.name+"",n=i[t],r=n?n.length:0;r--;){var a=n[r],o=a.func;if(null==o||o==e)return a.name}return t}var i=e("./realNames");t.exports=r},{"./realNames":130}],112:[function(e,t,n){var r=e("./baseProperty"),i=r("length");t.exports=i},{"./baseProperty":86}],113:[function(e,t,n){function r(e){for(var t=a(e),n=t.length;n--;)t[n][2]=i(t[n][1]);return t}var i=e("./isStrictComparable"),a=e("../object/pairs");t.exports=r},{"../object/pairs":151,"./isStrictComparable":127}],114:[function(e,t,n){function r(e,t){var n=null==e?void 0:e[t];return i(n)?n:void 0}var i=e("../lang/isNative");t.exports=r},{"../lang/isNative":143}],115:[function(e,t,n){function r(e,t,n){for(var r=e.length,i=t+(n?0:-1);n?i--:++i<r;){var a=e[i];if(a!==a)return i}return-1}t.exports=r},{}],116:[function(e,t,n){function r(e){var t=e.length,n=new e.constructor(t);return t&&"string"==typeof e[0]&&a.call(e,"index")&&(n.index=e.index,n.input=e.input),n}var i=Object.prototype,a=i.hasOwnProperty;t.exports=r},{}],117:[function(e,t,n){(function(n){function r(e,t,n){var r=e.constructor;switch(t){case c:return i(e);case a:case o:return new r((+e));case p:case h:case f:case d:case m:case g:case y:case v:case b:r instanceof r&&(r=x[t]);var _=e.buffer;return new r(n?i(_):_,e.byteOffset,e.length);case s:case u:return new r(e);case l:var A=new r(e.source,w.exec(e));A.lastIndex=e.lastIndex}return A}var i=e("./bufferClone"),a="[object Boolean]",o="[object Date]",s="[object Number]",l="[object RegExp]",u="[object String]",c="[object ArrayBuffer]",p="[object Float32Array]",h="[object Float64Array]",f="[object Int8Array]",d="[object Int16Array]",m="[object Int32Array]",g="[object Uint8Array]",y="[object Uint8ClampedArray]",v="[object Uint16Array]",b="[object Uint32Array]",w=/\w*$/,_=n.Uint8Array,x={};x[p]=n.Float32Array,x[h]=n.Float64Array,x[f]=n.Int8Array,x[d]=n.Int16Array,x[m]=n.Int32Array,x[g]=_,x[y]=n.Uint8ClampedArray,x[v]=n.Uint16Array,x[b]=n.Uint32Array,t.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./bufferClone":95}],118:[function(e,t,n){function r(e){var t=e.constructor;return"function"==typeof t&&t instanceof t||(t=Object),new t}t.exports=r},{}],119:[function(e,t,n){function r(e){return null!=e&&a(i(e))}var i=e("./getLength"),a=e("./isLength");t.exports=r},{"./getLength":112,"./isLength":125}],120:[function(e,t,n){var r=function(){try{Object({toString:0}+"")}catch(e){return function(){return!1}}return function(e){return"function"!=typeof e.toString&&"string"==typeof(e+"")}}();t.exports=r},{}],121:[function(e,t,n){function r(e,t){return e="number"==typeof e||i.test(e)?+e:-1,t=null==t?a:t,e>-1&&e%1==0&&e<t}var i=/^\d+$/,a=9007199254740991;t.exports=r},{}],122:[function(e,t,n){function r(e,t,n){if(!o(n))return!1;var r=typeof t;if("number"==r?i(n)&&a(t,n.length):"string"==r&&t in n){var s=n[t];return e===e?e===s:s!==s}return!1}var i=e("./isArrayLike"),a=e("./isIndex"),o=e("../lang/isObject");t.exports=r},{"../lang/isObject":144,"./isArrayLike":119,"./isIndex":121}],123:[function(e,t,n){function r(e,t){var n=typeof e;if("string"==n&&s.test(e)||"number"==n)return!0;if(i(e))return!1;var r=!o.test(e);return r||null!=t&&e in a(t)}var i=e("../lang/isArray"),a=e("./toObject"),o=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\n\\]|\\.)*?\1)\]/,s=/^\w*$/;t.exports=r},{"../lang/isArray":140,"./toObject":135}],124:[function(e,t,n){function r(e){var t=o(e),n=s[t];if("function"!=typeof n||!(t in i.prototype))return!1;if(e===n)return!0;var r=a(n);return!!r&&e===r[0]}var i=e("./LazyWrapper"),a=e("./getData"),o=e("./getFuncName"),s=e("../chain/lodash");t.exports=r},{"../chain/lodash":51,"./LazyWrapper":60,"./getData":110,"./getFuncName":111}],125:[function(e,t,n){function r(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=i}var i=9007199254740991;t.exports=r},{}],126:[function(e,t,n){function r(e){return!!e&&"object"==typeof e}t.exports=r},{}],127:[function(e,t,n){function r(e){return e===e&&!i(e)}var i=e("../lang/isObject");t.exports=r},{"../lang/isObject":144}],128:[function(e,t,n){function r(e,t){var n=e[1],r=t[1],m=n|r,g=m<p,y=r==p&&n==c||r==p&&n==h&&e[7].length<=t[8]||r==(p|h)&&n==c;if(!g&&!y)return e;r&l&&(e[2]=t[2],m|=n&l?0:u);var v=t[3];if(v){var b=e[3];e[3]=b?a(b,v,t[4]):i(v),e[4]=b?s(e[3],f):i(t[4])}return v=t[5],v&&(b=e[5],e[5]=b?o(b,v,t[6]):i(v),e[6]=b?s(e[5],f):i(t[6])),v=t[7],v&&(e[7]=i(v)),r&p&&(e[8]=null==e[8]?t[8]:d(e[8],t[8])),null==e[9]&&(e[9]=t[9]),e[0]=t[0],e[1]=m,e}var i=e("./arrayCopy"),a=e("./composeArgs"),o=e("./composeArgsRight"),s=e("./replaceHolders"),l=1,u=4,c=8,p=128,h=256,f="__lodash_placeholder__",d=Math.min;t.exports=r},{"./arrayCopy":62,"./composeArgs":96,"./composeArgsRight":97,"./replaceHolders":132}],129:[function(e,t,n){(function(n){var r=e("./getNative"),i=r(n,"WeakMap"),a=i&&new i;t.exports=a}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./getNative":114}],130:[function(e,t,n){var r={};t.exports=r},{}],131:[function(e,t,n){function r(e,t){for(var n=e.length,r=o(t.length,n),s=i(e);r--;){var l=t[r];e[r]=a(l,n)?s[l]:void 0}return e}var i=e("./arrayCopy"),a=e("./isIndex"),o=Math.min;t.exports=r},{"./arrayCopy":62,"./isIndex":121}],132:[function(e,t,n){function r(e,t){for(var n=-1,r=e.length,a=-1,o=[];++n<r;)e[n]===t&&(e[n]=i,o[++a]=n);return o}var i="__lodash_placeholder__";t.exports=r},{}],133:[function(e,t,n){var r=e("./baseSetData"),i=e("../date/now"),a=150,o=16,s=function(){var e=0,t=0;return function(n,s){var l=i(),u=o-(l-t);if(t=l,u>0){if(++e>=a)return n}else e=0;return r(n,s)}}();t.exports=s},{"../date/now":57,"./baseSetData":88}],134:[function(e,t,n){function r(e){for(var t=u(e),n=t.length,r=n&&e.length,c=!!r&&s(r)&&(a(e)||i(e)||l(e)),h=-1,f=[];++h<n;){var d=t[h];(c&&o(d,r)||p.call(e,d))&&f.push(d)}return f}var i=e("../lang/isArguments"),a=e("../lang/isArray"),o=e("./isIndex"),s=e("./isLength"),l=e("../lang/isString"),u=e("../object/keysIn"),c=Object.prototype,p=c.hasOwnProperty;t.exports=r},{"../lang/isArguments":139,"../lang/isArray":140,"../lang/isString":146,"../object/keysIn":150,"./isIndex":121,"./isLength":125}],135:[function(e,t,n){function r(e){if(o.unindexedChars&&a(e)){for(var t=-1,n=e.length,r=Object(e);++t<n;)r[t]=e.charAt(t);return r}return i(e)?e:Object(e)}var i=e("../lang/isObject"),a=e("../lang/isString"),o=e("../support");t.exports=r},{"../lang/isObject":144,"../lang/isString":146,"../support":153}],136:[function(e,t,n){function r(e){if(a(e))return e;var t=[];return i(e).replace(o,function(e,n,r,i){t.push(r?i.replace(s,"$1"):n||e)}),t}var i=e("./baseToString"),a=e("../lang/isArray"),o=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g,s=/\\(\\)?/g;t.exports=r},{"../lang/isArray":140,"./baseToString":90}],137:[function(e,t,n){function r(e){return e instanceof i?e.clone():new a(e.__wrapped__,e.__chain__,o(e.__actions__))}var i=e("./LazyWrapper"),a=e("./LodashWrapper"),o=e("./arrayCopy");t.exports=r},{"./LazyWrapper":60,"./LodashWrapper":61,"./arrayCopy":62}],138:[function(e,t,n){function r(e,t,n){return"function"==typeof t?i(e,!0,a(t,n,3)):i(e,!0)}var i=e("../internal/baseClone"),a=e("../internal/bindCallback");t.exports=r},{"../internal/baseClone":68,"../internal/bindCallback":94}],139:[function(e,t,n){function r(e){return a(e)&&i(e)&&s.call(e,"callee")&&!l.call(e,"callee")}var i=e("../internal/isArrayLike"),a=e("../internal/isObjectLike"),o=Object.prototype,s=o.hasOwnProperty,l=o.propertyIsEnumerable;t.exports=r},{"../internal/isArrayLike":119,"../internal/isObjectLike":126}],140:[function(e,t,n){var r=e("../internal/getNative"),i=e("../internal/isLength"),a=e("../internal/isObjectLike"),o="[object Array]",s=Object.prototype,l=s.toString,u=r(Array,"isArray"),c=u||function(e){return a(e)&&i(e.length)&&l.call(e)==o};t.exports=c},{"../internal/getNative":114,"../internal/isLength":125,"../internal/isObjectLike":126}],141:[function(e,t,n){function r(e){return null==e||(o(e)&&(a(e)||u(e)||i(e)||l(e)&&s(e.splice))?!e.length:!c(e).length)}var i=e("./isArguments"),a=e("./isArray"),o=e("../internal/isArrayLike"),s=e("./isFunction"),l=e("../internal/isObjectLike"),u=e("./isString"),c=e("../object/keys");t.exports=r},{"../internal/isArrayLike":119,"../internal/isObjectLike":126,"../object/keys":149,"./isArguments":139,"./isArray":140,"./isFunction":142,"./isString":146}],142:[function(e,t,n){function r(e){return i(e)&&s.call(e)==a}var i=e("./isObject"),a="[object Function]",o=Object.prototype,s=o.toString;t.exports=r},{"./isObject":144}],143:[function(e,t,n){function r(e){return null!=e&&(i(e)?p.test(u.call(e)):o(e)&&(a(e)?p:s).test(e))}var i=e("./isFunction"),a=e("../internal/isHostObject"),o=e("../internal/isObjectLike"),s=/^\[object .+?Constructor\]$/,l=Object.prototype,u=Function.prototype.toString,c=l.hasOwnProperty,p=RegExp("^"+u.call(c).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");t.exports=r},{"../internal/isHostObject":120,"../internal/isObjectLike":126,"./isFunction":142}],144:[function(e,t,n){function r(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}t.exports=r},{}],145:[function(e,t,n){function r(e){var t;if(!s(e)||h.call(e)!=u||o(e)||a(e)||!p.call(e,"constructor")&&(t=e.constructor,"function"==typeof t&&!(t instanceof t)))return!1;var n;return l.ownLast?(i(e,function(e,t,r){return n=p.call(r,t),!1}),n!==!1):(i(e,function(e,t){n=t}),void 0===n||p.call(e,n))}var i=e("../internal/baseForIn"),a=e("./isArguments"),o=e("../internal/isHostObject"),s=e("../internal/isObjectLike"),l=e("../support"),u="[object Object]",c=Object.prototype,p=c.hasOwnProperty,h=c.toString;t.exports=r},{"../internal/baseForIn":75,"../internal/isHostObject":120,"../internal/isObjectLike":126,"../support":153,"./isArguments":139}],146:[function(e,t,n){function r(e){return"string"==typeof e||i(e)&&s.call(e)==a}var i=e("../internal/isObjectLike"),a="[object String]",o=Object.prototype,s=o.toString;t.exports=r},{"../internal/isObjectLike":126}],147:[function(e,t,n){function r(e){return a(e)&&i(e.length)&&!!T[I.call(e)]}var i=e("../internal/isLength"),a=e("../internal/isObjectLike"),o="[object Arguments]",s="[object Array]",l="[object Boolean]",u="[object Date]",c="[object Error]",p="[object Function]",h="[object Map]",f="[object Number]",d="[object Object]",m="[object RegExp]",g="[object Set]",y="[object String]",v="[object WeakMap]",b="[object ArrayBuffer]",w="[object Float32Array]",_="[object Float64Array]",x="[object Int8Array]",A="[object Int16Array]",S="[object Int32Array]",j="[object Uint8Array]",E="[object Uint8ClampedArray]",O="[object Uint16Array]",k="[object Uint32Array]",T={};T[w]=T[_]=T[x]=T[A]=T[S]=T[j]=T[E]=T[O]=T[k]=!0,T[o]=T[s]=T[b]=T[l]=T[u]=T[c]=T[p]=T[h]=T[f]=T[d]=T[m]=T[g]=T[y]=T[v]=!1;var C=Object.prototype,I=C.toString;t.exports=r},{"../internal/isLength":125,"../internal/isObjectLike":126}],148:[function(e,t,n){function r(e){return void 0===e}t.exports=r},{}],149:[function(e,t,n){var r=e("../internal/getNative"),i=e("../internal/isArrayLike"),a=e("../lang/isObject"),o=e("../internal/shimKeys"),s=e("../support"),l=r(Object,"keys"),u=l?function(e){var t=null==e?void 0:e.constructor;return"function"==typeof t&&t.prototype===e||("function"==typeof e?s.enumPrototypes:i(e))?o(e):a(e)?l(e):[]}:o;t.exports=u},{"../internal/getNative":114,"../internal/isArrayLike":119,"../internal/shimKeys":134,"../lang/isObject":144,"../support":153}],150:[function(e,t,n){function r(e){if(null==e)return[];c(e)||(e=Object(e));var t=e.length;t=t&&u(t)&&(o(e)||a(e)||p(e))&&t||0;for(var n=e.constructor,r=-1,i=s(n)&&n.prototype||S,f=i===e,d=Array(t),m=t>0,y=h.enumErrorProps&&(e===A||e instanceof Error),v=h.enumPrototypes&&s(e);++r<t;)d[r]=r+"";for(var w in e)v&&"prototype"==w||y&&("message"==w||"name"==w)||m&&l(w,t)||"constructor"==w&&(f||!E.call(e,w))||d.push(w);if(h.nonEnumShadows&&e!==S){var T=e===j?_:e===A?g:O.call(e),C=k[T]||k[b];for(T==b&&(i=S),t=x.length;t--;){w=x[t];var I=C[w];f&&I||(I?!E.call(e,w):e[w]===i[w])||d.push(w)}}return d}var i=e("../internal/arrayEach"),a=e("../lang/isArguments"),o=e("../lang/isArray"),s=e("../lang/isFunction"),l=e("../internal/isIndex"),u=e("../internal/isLength"),c=e("../lang/isObject"),p=e("../lang/isString"),h=e("../support"),f="[object Array]",d="[object Boolean]",m="[object Date]",g="[object Error]",y="[object Function]",v="[object Number]",b="[object Object]",w="[object RegExp]",_="[object String]",x=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],A=Error.prototype,S=Object.prototype,j=String.prototype,E=S.hasOwnProperty,O=S.toString,k={};k[f]=k[m]=k[v]={constructor:!0,toLocaleString:!0,toString:!0,valueOf:!0},k[d]=k[_]={constructor:!0,toString:!0,valueOf:!0},k[g]=k[y]=k[w]={constructor:!0,toString:!0},k[b]={constructor:!0},i(x,function(e){for(var t in k)if(E.call(k,t)){var n=k[t];n[e]=E.call(n,e)}}),t.exports=r},{"../internal/arrayEach":63,"../internal/isIndex":121,"../internal/isLength":125,"../lang/isArguments":139,"../lang/isArray":140,"../lang/isFunction":142,"../lang/isObject":144,"../lang/isString":146,"../support":153}],151:[function(e,t,n){function r(e){e=a(e);for(var t=-1,n=i(e),r=n.length,o=Array(r);++t<r;){var s=n[t];o[t]=[s,e[s]]}return o}var i=e("./keys"),a=e("../internal/toObject");t.exports=r},{"../internal/toObject":135,"./keys":149}],152:[function(e,t,n){function r(e){return i(e,a(e))}var i=e("../internal/baseValues"),a=e("./keys");t.exports=r},{"../internal/baseValues":91,"./keys":149}],153:[function(e,t,n){var r=Array.prototype,i=Error.prototype,a=Object.prototype,o=a.propertyIsEnumerable,s=r.splice,l={};!function(e){var t=function(){this.x=e},n={0:e,length:e},r=[];t.prototype={valueOf:e,y:e};for(var a in new t)r.push(a);l.enumErrorProps=o.call(i,"message")||o.call(i,"name"),l.enumPrototypes=o.call(t,"prototype"),l.nonEnumShadows=!/valueOf/.test(r),l.ownLast="x"!=r[0],l.spliceObjects=(s.call(n,0,1),!n[0]),l.unindexedChars="x"[0]+Object("x")[0]!="xx"}(1,0),t.exports=l},{}],154:[function(e,t,n){function r(e){return e}t.exports=r},{}],155:[function(e,t,n){function r(){}t.exports=r},{}],156:[function(e,t,n){function r(e){return o(e)?i(e):a(e)}var i=e("../internal/baseProperty"),a=e("../internal/basePropertyDeep"),o=e("../internal/isKey");t.exports=r},{"../internal/baseProperty":86,"../internal/basePropertyDeep":87,"../internal/isKey":123}],157:[function(e,n,r){(function(e){!function(e){"use strict";if("function"==typeof bootstrap)bootstrap("promise",e);else if("object"==typeof r&&"object"==typeof n)n.exports=e();else if("function"==typeof t&&t.amd)t(e);else if("undefined"!=typeof ses){if(!ses.ok())return;ses.makeQ=e}else{if("undefined"==typeof window&&"undefined"==typeof self)throw new Error("This environment was not anticipated by Q. Please file a bug.");var i="undefined"!=typeof window?window:self,a=i.Q;i.Q=e(),i.Q.noConflict=function(){return i.Q=a,this}}}(function(){"use strict";function t(e){return function(){return Q.apply(e,arguments)}}function n(e){return e===Object(e)}function r(e){return"[object StopIteration]"===re(e)||e instanceof H}function i(e,t){if($&&t.stack&&"object"==typeof e&&null!==e&&e.stack&&e.stack.indexOf(ie)===-1){for(var n=[],r=t;r;r=r.source)r.stack&&n.unshift(r.stack);n.unshift(e.stack);var i=n.join("\n"+ie+"\n");e.stack=a(i)}}function a(e){for(var t=e.split("\n"),n=[],r=0;r<t.length;++r){var i=t[r];l(i)||o(i)||!i||n.push(i)}return n.join("\n")}function o(e){return e.indexOf("(module.js:")!==-1||e.indexOf("(node.js:")!==-1}function s(e){var t=/at .+ \((.+):(\d+):(?:\d+)\)$/.exec(e);if(t)return[t[1],Number(t[2])];var n=/at ([^ ]+):(\d+):(?:\d+)$/.exec(e);if(n)return[n[1],Number(n[2])];var r=/.*@(.+):(\d+)$/.exec(e);return r?[r[1],Number(r[2])]:void 0}function l(e){var t=s(e);if(!t)return!1;var n=t[0],r=t[1];return n===V&&r>=Y&&r<=ue}function u(){if($)try{throw new Error}catch(e){var t=e.stack.split("\n"),n=t[0].indexOf("@")>0?t[1]:t[2],r=s(n);if(!r)return;return V=r[0],r[1]}}function c(e,t,n){return function(){return"undefined"!=typeof console&&"function"==typeof console.warn&&console.warn(t+" is deprecated, use "+n+" instead.",new Error("").stack),e.apply(e,arguments)}}function p(e){return e instanceof m?e:b(e)?k(e):O(e)}function h(){function e(e){t=e,a.source=e,K(n,function(t,n){p.nextTick(function(){e.promiseDispatch.apply(e,n)})},void 0),n=void 0,r=void 0}var t,n=[],r=[],i=ee(h.prototype),a=ee(m.prototype);if(a.promiseDispatch=function(e,i,a){var o=G(arguments);n?(n.push(o),"when"===i&&a[1]&&r.push(a[1])):p.nextTick(function(){t.promiseDispatch.apply(t,o)})},a.valueOf=function(){if(n)return a;var e=y(t);return v(e)&&(t=e),e},a.inspect=function(){return t?t.inspect():{state:"pending"}},p.longStackSupport&&$)try{throw new Error}catch(o){a.stack=o.stack.substring(o.stack.indexOf("\n")+1)}return i.promise=a,i.resolve=function(n){t||e(p(n))},i.fulfill=function(n){t||e(O(n))},i.reject=function(n){t||e(E(n))},i.notify=function(e){t||K(r,function(t,n){p.nextTick(function(){n(e)})},void 0)},i}function f(e){if("function"!=typeof e)throw new TypeError("resolver must be a function.");var t=h();try{e(t.resolve,t.reject,t.notify)}catch(n){t.reject(n)}return t.promise}function d(e){return f(function(t,n){for(var r=0,i=e.length;r<i;r++)p(e[r]).then(t,n)})}function m(e,t,n){void 0===t&&(t=function(e){return E(new Error("Promise does not support operation: "+e))}),void 0===n&&(n=function(){return{state:"unknown"}});var r=ee(m.prototype);if(r.promiseDispatch=function(n,i,a){var o;try{o=e[i]?e[i].apply(r,a):t.call(r,i,a)}catch(s){o=E(s)}n&&n(o)},r.inspect=n,n){var i=n();"rejected"===i.state&&(r.exception=i.reason),r.valueOf=function(){var e=n();return"pending"===e.state||"rejected"===e.state?r:e.value}}return r}function g(e,t,n,r){return p(e).then(t,n,r)}function y(e){if(v(e)){var t=e.inspect();if("fulfilled"===t.state)return t.value}return e}function v(e){return e instanceof m}function b(e){return n(e)&&"function"==typeof e.then}function w(e){return v(e)&&"pending"===e.inspect().state}function _(e){return!v(e)||"fulfilled"===e.inspect().state}function x(e){return v(e)&&"rejected"===e.inspect().state}function A(){ae.length=0,oe.length=0,le||(le=!0)}function S(t,n){le&&("object"==typeof e&&"function"==typeof e.emit&&p.nextTick.runAfter(function(){X(oe,t)!==-1&&(e.emit("unhandledRejection",n,t),se.push(t))}),oe.push(t),n&&"undefined"!=typeof n.stack?ae.push(n.stack):ae.push("(no stack) "+n))}function j(t){if(le){var n=X(oe,t);n!==-1&&("object"==typeof e&&"function"==typeof e.emit&&p.nextTick.runAfter(function(){var r=X(se,t);r!==-1&&(e.emit("rejectionHandled",ae[n],t),se.splice(r,1))}),oe.splice(n,1),ae.splice(n,1))}}function E(e){var t=m({when:function(t){return t&&j(this),t?t(e):this}},function(){return this},function(){return{state:"rejected",reason:e}});return S(t,e),t}function O(e){return m({when:function(){return e},get:function(t){return e[t]},set:function(t,n){e[t]=n},"delete":function(t){delete e[t]},post:function(t,n){return null===t||void 0===t?e.apply(void 0,n):e[t].apply(e,n)},apply:function(t,n){return e.apply(t,n)},keys:function(){return ne(e)}},void 0,function(){return{state:"fulfilled",value:e}})}function k(e){var t=h();return p.nextTick(function(){try{e.then(t.resolve,t.reject,t.notify)}catch(n){t.reject(n)}}),t.promise}function T(e){return m({isDef:function(){}},function(t,n){return R(e,t,n)},function(){return p(e).inspect()})}function C(e,t,n){return p(e).spread(t,n)}function I(e){return function(){function t(e,t){var o;if("undefined"==typeof StopIteration){try{o=n[e](t)}catch(s){return E(s)}return o.done?p(o.value):g(o.value,i,a)}try{o=n[e](t)}catch(s){return r(s)?p(s.value):E(s)}return g(o,i,a)}var n=e.apply(this,arguments),i=t.bind(t,"next"),a=t.bind(t,"throw");return i()}}function D(e){p.done(p.async(e)())}function L(e){throw new H(e)}function M(e){return function(){return C([this,U(arguments)],function(t,n){return e.apply(t,n)})}}function R(e,t,n){return p(e).dispatch(t,n)}function U(e){return g(e,function(e){var t=0,n=h();return K(e,function(r,i,a){var o;v(i)&&"fulfilled"===(o=i.inspect()).state?e[a]=o.value:(++t,g(i,function(r){e[a]=r,0===--t&&n.resolve(e)},n.reject,function(e){n.notify({index:a,value:e})}))},void 0),0===t&&n.resolve(e),n.promise})}function P(e){if(0===e.length)return p.resolve();var t=p.defer(),n=0;return K(e,function(r,i,a){function o(e){t.resolve(e)}function s(){n--,0===n&&t.reject(new Error("Can't get fulfillment value from any promise, all promises were rejected."))}function l(e){t.notify({index:a,value:e})}var u=e[a];n++,g(u,o,s,l)},void 0),t.promise}function q(e){return g(e,function(e){return e=Z(e,p),g(U(Z(e,function(e){return g(e,J,J)})),function(){return e})})}function B(e){return p(e).allSettled()}function z(e,t){return p(e).then(void 0,void 0,t)}function N(e,t){return p(e).nodeify(t)}var $=!1;try{throw new Error}catch(F){$=!!F.stack}var V,H,Y=u(),J=function(){},W=function(){function t(){for(var e,t;r.next;)r=r.next,e=r.task,r.task=void 0,t=r.domain,t&&(r.domain=void 0,t.enter()),n(e,t);for(;l.length;)e=l.pop(),n(e);a=!1}function n(e,n){try{e()}catch(r){if(s)throw n&&n.exit(),setTimeout(t,0),n&&n.enter(),r;setTimeout(function(){throw r},0)}n&&n.exit()}var r={task:void 0,next:null},i=r,a=!1,o=void 0,s=!1,l=[];if(W=function(t){i=i.next={task:t,domain:s&&e.domain,next:null},a||(a=!0,o())},"object"==typeof e&&"[object process]"===e.toString()&&e.nextTick)s=!0,o=function(){e.nextTick(t)};else if("function"==typeof setImmediate)o="undefined"!=typeof window?setImmediate.bind(window,t):function(){setImmediate(t)};else if("undefined"!=typeof MessageChannel){var u=new MessageChannel;u.port1.onmessage=function(){o=c,u.port1.onmessage=t,t()};var c=function(){u.port2.postMessage(0)};o=function(){setTimeout(t,0),c()}}else o=function(){setTimeout(t,0)};return W.runAfter=function(e){l.push(e),a||(a=!0,o())},W}(),Q=Function.call,G=t(Array.prototype.slice),K=t(Array.prototype.reduce||function(e,t){var n=0,r=this.length;if(1===arguments.length)for(;;){if(n in this){t=this[n++];break}if(++n>=r)throw new TypeError}for(;n<r;n++)n in this&&(t=e(t,this[n],n));return t}),X=t(Array.prototype.indexOf||function(e){for(var t=0;t<this.length;t++)if(this[t]===e)return t;return-1}),Z=t(Array.prototype.map||function(e,t){var n=this,r=[];return K(n,function(i,a,o){r.push(e.call(t,a,o,n))},void 0),r}),ee=Object.create||function(e){function t(){}return t.prototype=e,new t},te=t(Object.prototype.hasOwnProperty),ne=Object.keys||function(e){var t=[];for(var n in e)te(e,n)&&t.push(n);return t},re=t(Object.prototype.toString);H="undefined"!=typeof ReturnValue?ReturnValue:function(e){this.value=e};var ie="From previous event:";p.resolve=p,p.nextTick=W,p.longStackSupport=!1,"object"==typeof e&&e&&e.env&&e.env.Q_DEBUG&&(p.longStackSupport=!0),p.defer=h,h.prototype.makeNodeResolver=function(){var e=this;return function(t,n){t?e.reject(t):arguments.length>2?e.resolve(G(arguments,1)):e.resolve(n)}},p.Promise=f,p.promise=f,f.race=d,f.all=U,f.reject=E,f.resolve=p,p.passByCopy=function(e){return e},m.prototype.passByCopy=function(){return this},p.join=function(e,t){return p(e).join(t)},m.prototype.join=function(e){return p([this,e]).spread(function(e,t){if(e===t)return e;throw new Error("Can't join: not the same: "+e+" "+t)})},p.race=d,m.prototype.race=function(){return this.then(p.race)},p.makePromise=m,m.prototype.toString=function(){return"[object Promise]"},m.prototype.then=function(e,t,n){function r(t){try{return"function"==typeof e?e(t):t}catch(n){return E(n)}}function a(e){if("function"==typeof t){i(e,s);try{return t(e)}catch(n){return E(n)}}return E(e)}function o(e){return"function"==typeof n?n(e):e}var s=this,l=h(),u=!1;return p.nextTick(function(){s.promiseDispatch(function(e){u||(u=!0,l.resolve(r(e)))},"when",[function(e){u||(u=!0,l.resolve(a(e)))}])}),s.promiseDispatch(void 0,"when",[void 0,function(e){var t,n=!1;try{t=o(e)}catch(r){if(n=!0,!p.onerror)throw r;p.onerror(r)}n||l.notify(t)}]),l.promise},p.tap=function(e,t){return p(e).tap(t)},m.prototype.tap=function(e){return e=p(e),this.then(function(t){return e.fcall(t).thenResolve(t)})},p.when=g,m.prototype.thenResolve=function(e){return this.then(function(){return e})},p.thenResolve=function(e,t){return p(e).thenResolve(t)},m.prototype.thenReject=function(e){return this.then(function(){throw e})},p.thenReject=function(e,t){return p(e).thenReject(t)},p.nearer=y,p.isPromise=v,p.isPromiseAlike=b,p.isPending=w,m.prototype.isPending=function(){return"pending"===this.inspect().state},p.isFulfilled=_,m.prototype.isFulfilled=function(){return"fulfilled"===this.inspect().state},p.isRejected=x,m.prototype.isRejected=function(){return"rejected"===this.inspect().state};var ae=[],oe=[],se=[],le=!0;p.resetUnhandledRejections=A,p.getUnhandledReasons=function(){return ae.slice()},p.stopUnhandledRejectionTracking=function(){A(),le=!1},A(),p.reject=E,p.fulfill=O,p.master=T,p.spread=C,m.prototype.spread=function(e,t){return this.all().then(function(t){return e.apply(void 0,t)},t)},p.async=I,p.spawn=D,p["return"]=L,p.promised=M,p.dispatch=R,m.prototype.dispatch=function(e,t){var n=this,r=h();return p.nextTick(function(){n.promiseDispatch(r.resolve,e,t)}),r.promise},p.get=function(e,t){return p(e).dispatch("get",[t])},m.prototype.get=function(e){return this.dispatch("get",[e])},p.set=function(e,t,n){return p(e).dispatch("set",[t,n])},m.prototype.set=function(e,t){return this.dispatch("set",[e,t])},p.del=p["delete"]=function(e,t){return p(e).dispatch("delete",[t])},m.prototype.del=m.prototype["delete"]=function(e){return this.dispatch("delete",[e])},p.mapply=p.post=function(e,t,n){return p(e).dispatch("post",[t,n])},m.prototype.mapply=m.prototype.post=function(e,t){return this.dispatch("post",[e,t])},p.send=p.mcall=p.invoke=function(e,t){return p(e).dispatch("post",[t,G(arguments,2)])},m.prototype.send=m.prototype.mcall=m.prototype.invoke=function(e){return this.dispatch("post",[e,G(arguments,1)])},p.fapply=function(e,t){return p(e).dispatch("apply",[void 0,t])},m.prototype.fapply=function(e){return this.dispatch("apply",[void 0,e])},p["try"]=p.fcall=function(e){return p(e).dispatch("apply",[void 0,G(arguments,1)])},m.prototype.fcall=function(){return this.dispatch("apply",[void 0,G(arguments)])},p.fbind=function(e){var t=p(e),n=G(arguments,1);return function(){return t.dispatch("apply",[this,n.concat(G(arguments))])}},m.prototype.fbind=function(){var e=this,t=G(arguments);return function(){return e.dispatch("apply",[this,t.concat(G(arguments))])}},p.keys=function(e){return p(e).dispatch("keys",[])},m.prototype.keys=function(){return this.dispatch("keys",[])},p.all=U,m.prototype.all=function(){return U(this)},p.any=P,m.prototype.any=function(){return P(this)},p.allResolved=c(q,"allResolved","allSettled"),m.prototype.allResolved=function(){return q(this)},p.allSettled=B,m.prototype.allSettled=function(){return this.then(function(e){return U(Z(e,function(e){function t(){return e.inspect()}return e=p(e),e.then(t,t)}))})},p.fail=p["catch"]=function(e,t){return p(e).then(void 0,t)},m.prototype.fail=m.prototype["catch"]=function(e){return this.then(void 0,e)},p.progress=z,m.prototype.progress=function(e){return this.then(void 0,void 0,e)},p.fin=p["finally"]=function(e,t){return p(e)["finally"](t)},m.prototype.fin=m.prototype["finally"]=function(e){return e=p(e),this.then(function(t){return e.fcall().then(function(){return t})},function(t){return e.fcall().then(function(){throw t})})},p.done=function(e,t,n,r){return p(e).done(t,n,r)},m.prototype.done=function(t,n,r){var a=function(e){p.nextTick(function(){if(i(e,o),!p.onerror)throw e;p.onerror(e)})},o=t||n||r?this.then(t,n,r):this;"object"==typeof e&&e&&e.domain&&(a=e.domain.bind(a)),o.then(void 0,a)},p.timeout=function(e,t,n){return p(e).timeout(t,n)},m.prototype.timeout=function(e,t){var n=h(),r=setTimeout(function(){t&&"string"!=typeof t||(t=new Error(t||"Timed out after "+e+" ms"),t.code="ETIMEDOUT"),n.reject(t)},e);return this.then(function(e){clearTimeout(r),n.resolve(e)},function(e){clearTimeout(r),n.reject(e)},n.notify),n.promise},p.delay=function(e,t){return void 0===t&&(t=e,e=void 0),p(e).delay(t)},m.prototype.delay=function(e){return this.then(function(t){var n=h();return setTimeout(function(){n.resolve(t)},e),n.promise})},p.nfapply=function(e,t){return p(e).nfapply(t)},m.prototype.nfapply=function(e){var t=h(),n=G(e);return n.push(t.makeNodeResolver()),this.fapply(n).fail(t.reject),t.promise},p.nfcall=function(e){var t=G(arguments,1);return p(e).nfapply(t)},m.prototype.nfcall=function(){var e=G(arguments),t=h();return e.push(t.makeNodeResolver()),this.fapply(e).fail(t.reject),t.promise},p.nfbind=p.denodeify=function(e){var t=G(arguments,1);return function(){var n=t.concat(G(arguments)),r=h();return n.push(r.makeNodeResolver()),p(e).fapply(n).fail(r.reject),r.promise}},m.prototype.nfbind=m.prototype.denodeify=function(){var e=G(arguments);return e.unshift(this),p.denodeify.apply(void 0,e)},p.nbind=function(e,t){var n=G(arguments,2);return function(){function r(){return e.apply(t,arguments)}var i=n.concat(G(arguments)),a=h();return i.push(a.makeNodeResolver()),p(r).fapply(i).fail(a.reject),a.promise}},m.prototype.nbind=function(){var e=G(arguments,0);return e.unshift(this),p.nbind.apply(void 0,e)},p.nmapply=p.npost=function(e,t,n){return p(e).npost(t,n)},m.prototype.nmapply=m.prototype.npost=function(e,t){var n=G(t||[]),r=h();return n.push(r.makeNodeResolver()),this.dispatch("post",[e,n]).fail(r.reject),r.promise},p.nsend=p.nmcall=p.ninvoke=function(e,t){var n=G(arguments,2),r=h();return n.push(r.makeNodeResolver()),p(e).dispatch("post",[t,n]).fail(r.reject),r.promise},m.prototype.nsend=m.prototype.nmcall=m.prototype.ninvoke=function(e){var t=G(arguments,1),n=h();return t.push(n.makeNodeResolver()),this.dispatch("post",[e,t]).fail(n.reject),n.promise},p.nodeify=N,m.prototype.nodeify=function(e){return e?void this.then(function(t){p.nextTick(function(){e(null,t)})},function(t){p.nextTick(function(){e(t)})}):this},p.noConflict=function(){throw new Error("Q.noConflict only works when Q is used as a global")};var ue=u();return p})}).call(this,e("_process"))},{_process:12}],158:[function(e,t,n){function r(){}function i(e){if(!y(e))return e;var t=[];for(var n in e)a(t,n,e[n]);return t.join("&")}function a(e,t,n){if(null!=n)if(Array.isArray(n))n.forEach(function(n){a(e,t,n)});else if(y(n))for(var r in n)a(e,t+"["+r+"]",n[r]);else e.push(encodeURIComponent(t)+"="+encodeURIComponent(n));else null===n&&e.push(encodeURIComponent(t))}function o(e){for(var t,n,r={},i=e.split("&"),a=0,o=i.length;a<o;++a)t=i[a],n=t.indexOf("="),n==-1?r[decodeURIComponent(t)]="":r[decodeURIComponent(t.slice(0,n))]=decodeURIComponent(t.slice(n+1));return r}function s(e){var t,n,r,i,a=e.split(/\r?\n/),o={};a.pop();for(var s=0,l=a.length;s<l;++s)n=a[s],t=n.indexOf(":"),r=n.slice(0,t).toLowerCase(),i=b(n.slice(t+1)),o[r]=i;return o}function l(e){return/[\/+]json\b/.test(e)}function u(e){return e.split(/ *; */).shift()}function c(e){return e.split(/ *; */).reduce(function(e,t){var n=t.split(/ *= */),r=n.shift(),i=n.shift();return r&&i&&(e[r]=i),e},{})}function p(e,t){t=t||{},this.req=e,this.xhr=this.req.xhr,this.text="HEAD"!=this.req.method&&(""===this.xhr.responseType||"text"===this.xhr.responseType)||"undefined"==typeof this.xhr.responseType?this.xhr.responseText:null,
+this.statusText=this.req.xhr.statusText,this._setStatusProperties(this.xhr.status),this.header=this.headers=s(this.xhr.getAllResponseHeaders()),this.header["content-type"]=this.xhr.getResponseHeader("content-type"),this._setHeaderProperties(this.header),this.body="HEAD"!=this.req.method?this._parseBody(this.text?this.text:this.xhr.response):null}function h(e,t){var n=this;this._query=this._query||[],this.method=e,this.url=t,this.header={},this._header={},this.on("end",function(){var e=null,t=null;try{t=new p(n)}catch(r){return e=new Error("Parser is unable to parse the response"),e.parse=!0,e.original=r,e.rawResponse=n.xhr&&n.xhr.responseText?n.xhr.responseText:null,e.statusCode=n.xhr&&n.xhr.status?n.xhr.status:null,n.callback(e)}n.emit("response",t);var i;try{(t.status<200||t.status>=300)&&(i=new Error(t.statusText||"Unsuccessful HTTP response"),i.original=e,i.response=t,i.status=t.status)}catch(r){i=r}i?n.callback(i,t):n.callback(null,t)})}function f(e,t){var n=v("DELETE",e);return t&&n.end(t),n}var d;"undefined"!=typeof window?d=window:"undefined"!=typeof self?d=self:(console.warn("Using browser-only version of superagent in non-browser environment"),d=this);var m=e("emitter"),g=e("./request-base"),y=e("./is-object"),v=t.exports=e("./request").bind(null,h);v.getXHR=function(){if(!(!d.XMLHttpRequest||d.location&&"file:"==d.location.protocol&&d.ActiveXObject))return new XMLHttpRequest;try{return new ActiveXObject("Microsoft.XMLHTTP")}catch(e){}try{return new ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(e){}try{return new ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(e){}try{return new ActiveXObject("Msxml2.XMLHTTP")}catch(e){}throw Error("Browser-only verison of superagent could not find XHR")};var b="".trim?function(e){return e.trim()}:function(e){return e.replace(/(^\s*|\s*$)/g,"")};v.serializeObject=i,v.parseString=o,v.types={html:"text/html",json:"application/json",xml:"application/xml",urlencoded:"application/x-www-form-urlencoded",form:"application/x-www-form-urlencoded","form-data":"application/x-www-form-urlencoded"},v.serialize={"application/x-www-form-urlencoded":i,"application/json":JSON.stringify},v.parse={"application/x-www-form-urlencoded":o,"application/json":JSON.parse},p.prototype.get=function(e){return this.header[e.toLowerCase()]},p.prototype._setHeaderProperties=function(e){var t=this.header["content-type"]||"";this.type=u(t);var n=c(t);for(var r in n)this[r]=n[r]},p.prototype._parseBody=function(e){var t=v.parse[this.type];return!t&&l(this.type)&&(t=v.parse["application/json"]),t&&e&&(e.length||e instanceof Object)?t(e):null},p.prototype._setStatusProperties=function(e){1223===e&&(e=204);var t=e/100|0;this.status=this.statusCode=e,this.statusType=t,this.info=1==t,this.ok=2==t,this.clientError=4==t,this.serverError=5==t,this.error=(4==t||5==t)&&this.toError(),this.accepted=202==e,this.noContent=204==e,this.badRequest=400==e,this.unauthorized=401==e,this.notAcceptable=406==e,this.notFound=404==e,this.forbidden=403==e},p.prototype.toError=function(){var e=this.req,t=e.method,n=e.url,r="cannot "+t+" "+n+" ("+this.status+")",i=new Error(r);return i.status=this.status,i.method=t,i.url=n,i},v.Response=p,m(h.prototype);for(var w in g)h.prototype[w]=g[w];h.prototype.type=function(e){return this.set("Content-Type",v.types[e]||e),this},h.prototype.responseType=function(e){return this._responseType=e,this},h.prototype.accept=function(e){return this.set("Accept",v.types[e]||e),this},h.prototype.auth=function(e,t,n){switch(n||(n={type:"basic"}),n.type){case"basic":var r=btoa(e+":"+t);this.set("Authorization","Basic "+r);break;case"auto":this.username=e,this.password=t}return this},h.prototype.query=function(e){return"string"!=typeof e&&(e=i(e)),e&&this._query.push(e),this},h.prototype.attach=function(e,t,n){return this._getFormData().append(e,t,n||t.name),this},h.prototype._getFormData=function(){return this._formData||(this._formData=new d.FormData),this._formData},h.prototype.callback=function(e,t){var n=this._callback;this.clearTimeout(),n(e,t)},h.prototype.crossDomainError=function(){var e=new Error("Request has been terminated\nPossible causes: the network is offline, Origin is not allowed by Access-Control-Allow-Origin, the page is being unloaded, etc.");e.crossDomain=!0,e.status=this.status,e.method=this.method,e.url=this.url,this.callback(e)},h.prototype._timeoutError=function(){var e=this._timeout,t=new Error("timeout of "+e+"ms exceeded");t.timeout=e,this.callback(t)},h.prototype._appendQueryString=function(){var e=this._query.join("&");e&&(this.url+=~this.url.indexOf("?")?"&"+e:"?"+e)},h.prototype.end=function(e){var t=this,n=this.xhr=v.getXHR(),i=this._timeout,a=this._formData||this._data;this._callback=e||r,n.onreadystatechange=function(){if(4==n.readyState){var e;try{e=n.status}catch(r){e=0}if(0==e){if(t.timedout)return t._timeoutError();if(t._aborted)return;return t.crossDomainError()}t.emit("end")}};var o=function(e){e.total>0&&(e.percent=e.loaded/e.total*100),e.direction="download",t.emit("progress",e)};this.hasListeners("progress")&&(n.onprogress=o);try{n.upload&&this.hasListeners("progress")&&(n.upload.onprogress=o)}catch(s){}if(i&&!this._timer&&(this._timer=setTimeout(function(){t.timedout=!0,t.abort()},i)),this._appendQueryString(),this.username&&this.password?n.open(this.method,this.url,!0,this.username,this.password):n.open(this.method,this.url,!0),this._withCredentials&&(n.withCredentials=!0),"GET"!=this.method&&"HEAD"!=this.method&&"string"!=typeof a&&!this._isHost(a)){var u=this._header["content-type"],c=this._serializer||v.serialize[u?u.split(";")[0]:""];!c&&l(u)&&(c=v.serialize["application/json"]),c&&(a=c(a))}for(var p in this.header)null!=this.header[p]&&n.setRequestHeader(p,this.header[p]);return this._responseType&&(n.responseType=this._responseType),this.emit("request",this),n.send("undefined"!=typeof a?a:null),this},v.Request=h,v.get=function(e,t,n){var r=v("GET",e);return"function"==typeof t&&(n=t,t=null),t&&r.query(t),n&&r.end(n),r},v.head=function(e,t,n){var r=v("HEAD",e);return"function"==typeof t&&(n=t,t=null),t&&r.send(t),n&&r.end(n),r},v.options=function(e,t,n){var r=v("OPTIONS",e);return"function"==typeof t&&(n=t,t=null),t&&r.send(t),n&&r.end(n),r},v.del=f,v["delete"]=f,v.patch=function(e,t,n){var r=v("PATCH",e);return"function"==typeof t&&(n=t,t=null),t&&r.send(t),n&&r.end(n),r},v.post=function(e,t,n){var r=v("POST",e);return"function"==typeof t&&(n=t,t=null),t&&r.send(t),n&&r.end(n),r},v.put=function(e,t,n){var r=v("PUT",e);return"function"==typeof t&&(n=t,t=null),t&&r.send(t),n&&r.end(n),r}},{"./is-object":159,"./request":161,"./request-base":160,emitter:162}],159:[function(e,t,n){function r(e){return null!==e&&"object"==typeof e}t.exports=r},{}],160:[function(e,t,n){var r=e("./is-object");n.clearTimeout=function(){return this._timeout=0,clearTimeout(this._timer),this},n.parse=function(e){return this._parser=e,this},n.serialize=function(e){return this._serializer=e,this},n.timeout=function(e){return this._timeout=e,this},n.then=function(e,t){if(!this._fullfilledPromise){var n=this;this._fullfilledPromise=new Promise(function(e,t){n.end(function(n,r){n?t(n):e(r)})})}return this._fullfilledPromise.then(e,t)},n.use=function(e){return e(this),this},n.get=function(e){return this._header[e.toLowerCase()]},n.getHeader=n.get,n.set=function(e,t){if(r(e)){for(var n in e)this.set(n,e[n]);return this}return this._header[e.toLowerCase()]=t,this.header[e]=t,this},n.unset=function(e){return delete this._header[e.toLowerCase()],delete this.header[e],this},n.field=function(e,t){return this._getFormData().append(e,t),this},n.abort=function(){return this._aborted?this:(this._aborted=!0,this.xhr&&this.xhr.abort(),this.req&&this.req.abort(),this.clearTimeout(),this.emit("abort"),this)},n.withCredentials=function(){return this._withCredentials=!0,this},n.redirects=function(e){return this._maxRedirects=e,this},n.toJSON=function(){return{method:this.method,url:this.url,data:this._data,headers:this._header}},n._isHost=function(e){var t={}.toString.call(e);switch(t){case"[object File]":case"[object Blob]":case"[object FormData]":return!0;default:return!1}},n.send=function(e){var t=r(e),n=this._header["content-type"];if(t&&r(this._data))for(var i in e)this._data[i]=e[i];else"string"==typeof e?(n||this.type("form"),n=this._header["content-type"],"application/x-www-form-urlencoded"==n?this._data=this._data?this._data+"&"+e:e:this._data=(this._data||"")+e):this._data=e;return!t||this._isHost(e)?this:(n||this.type("json"),this)}},{"./is-object":159}],161:[function(e,t,n){function r(e,t,n){return"function"==typeof n?new e("GET",t).end(n):2==arguments.length?new e("GET",t):new e(t,n)}t.exports=r},{}],162:[function(e,t,n){function r(e){if(e)return i(e)}function i(e){for(var t in r.prototype)e[t]=r.prototype[t];return e}"undefined"!=typeof t&&(t.exports=r),r.prototype.on=r.prototype.addEventListener=function(e,t){return this._callbacks=this._callbacks||{},(this._callbacks["$"+e]=this._callbacks["$"+e]||[]).push(t),this},r.prototype.once=function(e,t){function n(){this.off(e,n),t.apply(this,arguments)}return n.fn=t,this.on(e,n),this},r.prototype.off=r.prototype.removeListener=r.prototype.removeAllListeners=r.prototype.removeEventListener=function(e,t){if(this._callbacks=this._callbacks||{},0==arguments.length)return this._callbacks={},this;var n=this._callbacks["$"+e];if(!n)return this;if(1==arguments.length)return delete this._callbacks["$"+e],this;for(var r,i=0;i<n.length;i++)if(r=n[i],r===t||r.fn===t){n.splice(i,1);break}return this},r.prototype.emit=function(e){this._callbacks=this._callbacks||{};var t=[].slice.call(arguments,1),n=this._callbacks["$"+e];if(n){n=n.slice(0);for(var r=0,i=n.length;r<i;++r)n[r].apply(this,t)}return this},r.prototype.listeners=function(e){return this._callbacks=this._callbacks||{},this._callbacks["$"+e]||[]},r.prototype.hasListeners=function(e){return!!this.listeners(e).length}},{}]},{},[1])(1)}),window.SwaggerUi=Backbone.Router.extend({dom_id:"swagger_ui",options:null,api:null,headerView:null,mainView:null,initialize:function(e){e=e||{},"model"!==e.defaultModelRendering&&(e.defaultModelRendering="schema"),e.highlightSizeThreshold||(e.highlightSizeThreshold=1e5),e.dom_id&&(this.dom_id=e.dom_id,delete e.dom_id),e.supportedSubmitMethods||(e.supportedSubmitMethods=["get","put","post","delete","head","options","patch"]),"string"==typeof e.oauth2RedirectUrl&&(window.oAuthRedirectUrl=e.oauth2RedirectUrl),$("#"+this.dom_id).length||$("body").append('<div id="'+this.dom_id+'"></div>'),this.options=e,marked.setOptions({gfm:!0});var t=this;this.options.success=function(){return t.render()},this.options.progress=function(e){return t.showMessage(e)},this.options.failure=function(e){return t.onLoadFailure(e)},this.headerView=new SwaggerUi.Views.HeaderView({el:$("#header")}),this.headerView.on("update-swagger-ui",function(e){return t.updateSwaggerUi(e)}),JSONEditor.defaults.iconlibs.swagger=JSONEditor.AbstractIconLib.extend({mapping:{collapse:"collapse",expand:"expand"},icon_prefix:"swagger-"})},setOption:function(e,t){this.options[e]=t},getOption:function(e){return this.options[e]},updateSwaggerUi:function(e){this.options.url=e.url,this.load()},load:function(){this.mainView&&this.mainView.clear(),this.authView&&this.authView.remove();var e=this.options.url;e&&0!==e.indexOf("http")&&(e=this.buildUrl(window.location.href.toString(),e)),this.api&&(this.options.authorizations=this.api.clientAuthorizations.authz),this.options.url=e,this.headerView.update(e),this.api=new SwaggerClient(this.options)},collapseAll:function(){Docs.collapseEndpointListForResource("")},listAll:function(){Docs.collapseOperationsForResource("")},expandAll:function(){Docs.expandOperationsForResource("")},render:function(){var e;switch(this.showMessage("Finished Loading Resource Information. Rendering Swagger UI..."),this.mainView=new SwaggerUi.Views.MainView({model:this.api,el:$("#"+this.dom_id),swaggerOptions:this.options,router:this}).render(),_.isEmpty(this.api.securityDefinitions)||(e=_.map(this.api.securityDefinitions,function(e,t){var n={};return n[t]=e,n}),this.authView=new SwaggerUi.Views.AuthButtonView({data:SwaggerUi.utils.parseSecurityDefinitions(e),router:this}),$("#auth_container").append(this.authView.render().el)),this.showMessage(),this.options.docExpansion){case"full":this.expandAll();break;case"list":this.listAll()}this.renderGFM(),this.options.onComplete&&this.options.onComplete(this.api,this),setTimeout(Docs.shebang.bind(this),100)},buildUrl:function(e,t){if(0===t.indexOf("/")){var n=e.split("/");return e=n[0]+"//"+n[2],e+t}var r=e.length;return e.indexOf("?")>-1&&(r=Math.min(r,e.indexOf("?"))),e.indexOf("#")>-1&&(r=Math.min(r,e.indexOf("#"))),e=e.substring(0,r),e.indexOf("/",e.length-1)!==-1?e+t:e+"/"+t},showMessage:function(e){void 0===e&&(e="");var t=$("#message-bar");t.removeClass("message-fail"),t.addClass("message-success"),t.text(e),window.SwaggerTranslator&&window.SwaggerTranslator.translate(t)},onLoadFailure:function(e){void 0===e&&(e=""),$("#message-bar").removeClass("message-success"),$("#message-bar").addClass("message-fail");var t=$("#message-bar").text(e);return this.options.onFailure&&this.options.onFailure(e),t},renderGFM:function(){$(".markdown").each(function(){$(this).html(marked($(this).html()))}),$(".propDesc",".model-signature .description").each(function(){$(this).html(marked($(this).html())).addClass("markdown")})}}),window.SwaggerUi.Views={},window.SwaggerUi.Models={},window.SwaggerUi.Collections={},window.SwaggerUi.partials={},window.SwaggerUi.utils={},function(){function e(e){"console"in window&&"function"==typeof window.console.warn&&console.warn(e)}window.authorizations={add:function(){if(e("Using window.authorizations is deprecated. Please use SwaggerUi.api.clientAuthorizations.add()."),"undefined"==typeof window.swaggerUi)throw new TypeError("window.swaggerUi is not defined");window.swaggerUi instanceof SwaggerUi&&window.swaggerUi.api.clientAuthorizations.add.apply(window.swaggerUi.api.clientAuthorizations,arguments)}},window.ApiKeyAuthorization=function(){e("window.ApiKeyAuthorization is deprecated. Please use SwaggerClient.ApiKeyAuthorization."),SwaggerClient.ApiKeyAuthorization.apply(window,arguments)},window.PasswordAuthorization=function(){e("window.PasswordAuthorization is deprecated. Please use SwaggerClient.PasswordAuthorization."),SwaggerClient.PasswordAuthorization.apply(window,arguments)}}(),function(e,t){"function"==typeof define&&define.amd?define(["b"],function(n){return e.SwaggerUi=t(n)}):"object"==typeof exports?module.exports=t(require("b")):e.SwaggerUi=t(e.b)}(this,function(){return SwaggerUi}),window.SwaggerUi.utils={parseSecurityDefinitions:function(e,t){var n=Object.assign({},t),r=[],i=[],a=[],o=window.SwaggerUi.utils;return Array.isArray(e)?(e.forEach(function(e){var t={},s={};for(var l in e)if(Array.isArray(e[l])){if(!n[l])continue;if(n[l]=n[l]||{},"oauth2"===n[l].type){s[l]=Object.assign({},n[l]),s[l].scopes=Object.assign({},n[l].scopes);for(var u in s[l].scopes)e[l].indexOf(u)<0&&delete s[l].scopes[u];s[l].scopes=o.parseOauth2Scopes(s[l].scopes),a=_.merge(a,s[l].scopes)}else t[l]=Object.assign({},n[l])}else"oauth2"===e[l].type?(s[l]=Object.assign({},e[l]),s[l].scopes=o.parseOauth2Scopes(s[l].scopes),a=_.merge(a,s[l].scopes)):t[l]=e[l];_.isEmpty(t)||i.push(t),_.isEmpty(s)||r.push(s)}),{auths:i,oauth2:r,scopes:a}):null},parseOauth2Scopes:function(e){var t,n=Object.assign({},e),r=[];for(t in n)r.push({scope:t,description:n[t]});return r},sanitize:function(e){return e=e.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,""),e=e.replace(/(on\w+="[^"]*")*(on\w+='[^']*')*(on\w+=\w*\(\w*\))*/gi,"")}},SwaggerUi.Models.ApiKeyAuthModel=Backbone.Model.extend({defaults:{"in":"",name:"",title:"",value:""},initialize:function(){this.on("change",this.validate)},validate:function(){var e=!!this.get("value");return this.set("valid",e),e}}),SwaggerUi.Views.ApiKeyAuthView=Backbone.View.extend({events:{"change .input_apiKey_entry":"apiKeyChange"},selectors:{apikeyInput:".input_apiKey_entry"},template:Handlebars.templates.apikey_auth,initialize:function(e){this.options=e||{},this.router=this.options.router},render:function(){return this.$el.html(this.template(this.model.toJSON())),this},apiKeyChange:function(e){var t=$(e.target).val();t&&this.$(this.selectors.apikeyInput).removeClass("error"),this.model.set("value",t)},isValid:function(){return this.model.validate()},highlightInvalid:function(){this.isValid()||this.$(this.selectors.apikeyInput).addClass("error")}}),SwaggerUi.Views.AuthButtonView=Backbone.View.extend({events:{"click .authorize__btn":"authorizeBtnClick"},tpls:{popup:Handlebars.templates.popup,authBtn:Handlebars.templates.auth_button,authBtnOperation:Handlebars.templates.auth_button_operation},initialize:function(e){this.options=e||{},this.options.data=this.options.data||{},this.isOperation=this.options.isOperation,this.model=this.model||{},this.router=this.options.router,this.auths=this.options.data.oauth2.concat(this.options.data.auths)},render:function(){var e=this.isOperation?"authBtnOperation":"authBtn";return this.$authEl=this.renderAuths(this.auths),this.$el.html(this.tpls[e](this.model)),this},authorizeBtnClick:function(e){var t;e.preventDefault(),t={title:"Available authorizations",content:this.$authEl},this.render(),this.popup=new SwaggerUi.Views.PopupView({model:t}),this.popup.render()},renderAuths:function(e){var t=$("<div>"),n=!1;return e.forEach(function(e){var r=new SwaggerUi.Views.AuthView({data:e,router:this.router}),i=r.render().el;t.append(i),r.isLogout&&(n=!0)},this),this.model.isLogout=n,t}}),SwaggerUi.Collections.AuthsCollection=Backbone.Collection.extend({constructor:function(){var e=Array.prototype.slice.call(arguments);e[0]=this.parse(e[0]),Backbone.Collection.apply(this,e)},add:function(e){var t=Array.prototype.slice.call(arguments);Array.isArray(e)?t[0]=_.map(e,function(e){return this.handleOne(e)},this):t[0]=this.handleOne(e),Backbone.Collection.prototype.add.apply(this,t)},handleOne:function(e){var t=e;if(!(e instanceof Backbone.Model))switch(e.type){case"oauth2":t=new SwaggerUi.Models.Oauth2Model(e);break;case"basic":t=new SwaggerUi.Models.BasicAuthModel(e);break;case"apiKey":t=new SwaggerUi.Models.ApiKeyAuthModel(e);break;default:t=new Backbone.Model(e)}return t},isValid:function(){var e=!0;return this.models.forEach(function(t){t.validate()||(e=!1)}),e},isAuthorized:function(){return this.length===this.where({isLogout:!0}).length},isPartiallyAuthorized:function(){return this.where({isLogout:!0}).length>0},parse:function(e){var t={};return"undefined"!=typeof window.swaggerUi&&(t=Object.assign({},window.swaggerUi.api.clientAuthorizations.authz)),_.map(e,function(e,n){var r=t[n]&&"basic"===e.type&&t[n].username&&t[n].password;return _.extend(e,{title:n}),(t[n]||r)&&_.extend(e,{isLogout:!0,value:r?void 0:t[n].value,username:r?t[n].username:void 0,password:r?t[n].password:void 0,valid:!0}),e})}}),SwaggerUi.Views.AuthsCollectionView=Backbone.View.extend({initialize:function(e){this.options=e||{},this.options.data=this.options.data||{},this.router=this.options.router,this.collection=new SwaggerUi.Collections.AuthsCollection(e.data),this.$innerEl=$("<div>"),this.authViews=[]},render:function(){return this.collection.each(function(e){this.renderOneAuth(e)},this),this.$el.html(this.$innerEl.html()?this.$innerEl:""),this},renderOneAuth:function(e){var t,n,r,i=e.get("type");"apiKey"===i?r="ApiKeyAuthView":"basic"===i&&0===this.$innerEl.find(".basic_auth_container").length?r="BasicAuthView":"oauth2"===i&&(r="Oauth2View"),r&&(n=new SwaggerUi.Views[r]({model:e,router:this.router}),t=n.render().el,this.authViews.push(n)),this.$innerEl.append(t)},highlightInvalid:function(){this.authViews.forEach(function(e){e.highlightInvalid()},this)}}),SwaggerUi.Views.AuthView=Backbone.View.extend({events:{"click .auth_submit__button":"authorizeClick","click .auth_logout__button":"logoutClick"},tpls:{main:Handlebars.templates.auth_view},selectors:{innerEl:".auth_inner",authBtn:".auth_submit__button"},initialize:function(e){this.options=e||{},e.data=e.data||{},this.router=this.options.router,this.authsCollectionView=new SwaggerUi.Views.AuthsCollectionView({data:e.data}),this.$el.html(this.tpls.main({isLogout:this.authsCollectionView.collection.isAuthorized(),isAuthorized:this.authsCollectionView.collection.isPartiallyAuthorized()})),this.$innerEl=this.$(this.selectors.innerEl),this.isLogout=this.authsCollectionView.collection.isPartiallyAuthorized()},render:function(){return this.$innerEl.html(this.authsCollectionView.render().el),this},authorizeClick:function(e){e.preventDefault(),e.stopPropagation(),this.authsCollectionView.collection.isValid()?this.authorize():this.authsCollectionView.highlightInvalid()},authorize:function(){this.authsCollectionView.collection.forEach(function(e){var t,n,r=e.get("type");"apiKey"===r?(t=new SwaggerClient.ApiKeyAuthorization(e.get("name"),e.get("value"),e.get("in")),this.router.api.clientAuthorizations.add(e.get("title"),t)):"basic"===r?(n=new SwaggerClient.PasswordAuthorization(e.get("username"),e.get("password")),this.router.api.clientAuthorizations.add(e.get("title"),n)):"oauth2"===r&&this.handleOauth2Login(e)},this),this.router.load()},logoutClick:function(e){e.preventDefault(),this.authsCollectionView.collection.forEach(function(e){window.swaggerUi.api.clientAuthorizations.remove(e.get("title"))}),this.router.load()},handleOauth2Login:function(e){function t(e){return e.vendorExtensions["x-tokenName"]||e.tokenName}var n,r,i,a=window.location,o=location.pathname.substring(0,location.pathname.lastIndexOf("/")),s=a.protocol+"//"+a.host+o+"/o2c.html",l=window.oAuthRedirectUrl||s,u=null,c=_.map(e.get("scopes"),function(e){if(e.checked)return e.scope}),p=window.swaggerUiAuth||(window.swaggerUiAuth={});p.OAuthSchemeKey=e.get("title"),window.enabledScopes=c;var h=e.get("flow");if("oauth2"!==e.get("type")||!h||"implicit"!==h&&"accessCode"!==h){if("oauth2"===e.get("type")&&h&&"application"===h)return r=e.attributes,p.tokenName=t(r)||"access_token",void this.clientCredentialsFlow(c,r,p.OAuthSchemeKey);if("oauth2"===e.get("type")&&h&&"password"===h)return r=e.attributes,p.tokenName=t(r)||"access_token",void this.passwordFlow(c,r,p.OAuthSchemeKey);if(e.get("grantTypes")){var f=e.get("grantTypes");for(var d in f)f.hasOwnProperty(d)&&"implicit"===d?(r=f[d],i=r.loginEndpoint.url,u=r.loginEndpoint.url+"?response_type=token",p.tokenName=t(r)):f.hasOwnProperty(d)&&"accessCode"===d&&(r=f[d],i=r.tokenRequestEndpoint.url,u=r.tokenRequestEndpoint.url+"?response_type=code",p.tokenName=t(r))}}else r=e.attributes,u=r.authorizationUrl+"?response_type="+("implicit"===h?"token":"code"),p.tokenName=t(r)||"access_token",p.tokenUrl="accessCode"===h?r.tokenUrl:null,n=p.OAuthSchemeKey;redirect_uri=l,u+="&redirect_uri="+encodeURIComponent(l),u+="&realm="+encodeURIComponent(realm),u+="&client_id="+encodeURIComponent(clientId),u+="&scope="+encodeURIComponent(c.join(scopeSeparator)),u+="&state="+encodeURIComponent(n);for(var m in additionalQueryStringParams)u+="&"+m+"="+encodeURIComponent(additionalQueryStringParams[m]);window.open(u)},clientCredentialsFlow:function(e,t,n){this.accessTokenRequest(e,t,n,"client_credentials")},passwordFlow:function(e,t,n){this.accessTokenRequest(e,t,n,"password",{username:t.username,password:t.password})},accessTokenRequest:function(e,t,n,r,i){i=$.extend({},{scope:e.join(" "),grant_type:r},i);var a={};switch(t.clientAuthenticationType){case"basic":a.Authorization="Basic "+btoa(t.clientId+":"+t.clientSecret);break;case"request-body":i.client_id=t.clientId,i.client_secret=t.clientSecret}$.ajax({url:t.tokenUrl,type:"POST",data:i,headers:a,success:function(e){onOAuthComplete(e,n)},error:function(){onOAuthComplete("")}})}}),SwaggerUi.Models.BasicAuthModel=Backbone.Model.extend({defaults:{username:"",password:"",title:"basic"},initialize:function(){this.on("change",this.validate)},validate:function(){var e=!!this.get("password")&&!!this.get("username");return this.set("valid",e),e}}),SwaggerUi.Views.BasicAuthView=Backbone.View.extend({initialize:function(e){this.options=e||{},this.router=this.options.router},events:{"change .auth_input":"inputChange"},selectors:{usernameInput:".basic_auth__username",passwordInput:".basic_auth__password"},cls:{error:"error"},template:Handlebars.templates.basic_auth,render:function(){return $(this.el).html(this.template(this.model.toJSON())),this},inputChange:function(e){var t=$(e.target),n=t.val(),r=t.prop("name");n&&t.removeClass(this.cls.error),this.model.set(r,n)},isValid:function(){return this.model.validate()},highlightInvalid:function(){this.model.get("username")||this.$(this.selectors.usernameInput).addClass(this.cls.error)}}),SwaggerUi.Views.ContentTypeView=Backbone.View.extend({initialize:function(){},render:function(){return this.model.contentTypeId="ct"+Math.random(),$(this.el).html(Handlebars.templates.content_type(this.model)),this}}),SwaggerUi.Views.HeaderView=Backbone.View.extend({events:{"click #show-pet-store-icon":"showPetStore","click #explore":"showCustom","submit #api_selector":"showCustom","keyup #input_baseUrl":"showCustomOnKeyup","keyup #input_apiKey":"showCustomOnKeyup"},initialize:function(){},showPetStore:function(){this.trigger("update-swagger-ui",{url:"http://petstore.swagger.io/v2/swagger.json"})},showCustomOnKeyup:function(e){13===e.keyCode&&this.showCustom()},showCustom:function(e){e&&e.preventDefault(),this.trigger("update-swagger-ui",{url:$("#input_baseUrl").val()})},update:function(e,t,n){void 0===n&&(n=!1),$("#input_baseUrl").val(e),n&&this.trigger("update-swagger-ui",{url:e})}}),SwaggerUi.Views.MainView=Backbone.View.extend({apisSorter:{alpha:function(e,t){return e.name.localeCompare(t.name)}},operationsSorters:{alpha:function(e,t){return e.path.localeCompare(t.path)},method:function(e,t){return e.method.localeCompare(t.method)}},initialize:function(e){var t,n,r,i;if(e=e||{},this.router=e.router,e.swaggerOptions.apisSorter&&(t=e.swaggerOptions.apisSorter,n=_.isFunction(t)?t:this.apisSorter[t],_.isFunction(n)&&this.model.apisArray.sort(n)),e.swaggerOptions.operationsSorter&&(t=e.swaggerOptions.operationsSorter,n=_.isFunction(t)?t:this.operationsSorters[t],_.isFunction(n)))for(r in this.model.apisArray)this.model.apisArray[r].operationsArray.sort(n);this.model.auths=[];for(r in this.model.securityDefinitions)i=this.model.securityDefinitions[r],this.model.auths.push({name:r,type:i.type,value:i});"validatorUrl"in e.swaggerOptions?this.model.validatorUrl=e.swaggerOptions.validatorUrl:this.model.url.indexOf("localhost")>0||this.model.url.indexOf("127.0.0.1")>0?this.model.validatorUrl=null:this.model.validatorUrl="//online.swagger.io/validator";var a;for(a in this.model.definitions)this.model.definitions[a].type||(this.model.definitions[a].type="object")},render:function(){$(this.el).html(Handlebars.templates.main(this.model)),this.info=this.$(".info")[0],this.info&&this.info.addEventListener("click",this.onLinkClick,!0),this.model.securityDefinitions=this.model.securityDefinitions||{};for(var e={},t=0,n=0;n<this.model.apisArray.length;n++){for(var r=this.model.apisArray[n],i=r.name;"undefined"!=typeof e[i];)i=i+"_"+t,t+=1;r.id=sanitizeHtml(i),e[i]=r,this.addResource(r,this.model.auths)}return $(".propWrap").hover(function(){$(".optionsWrapper",$(this)).show()},function(){$(".optionsWrapper",$(this)).hide()}),this},addResource:function(e,t){e.id=e.id.replace(/[^a-zA-Z\d]/g,function(e){return e.charCodeAt(0)}),e.definitions=this.model.definitions;var n=new SwaggerUi.Views.ResourceView({model:e,router:this.router,tagName:"li",id:"resource_"+e.id,className:"resource",auths:t,swaggerOptions:this.options.swaggerOptions});$("#resources",this.el).append(n.render().el)},clear:function(){$(this.el).html("")},onLinkClick:function(e){var t=e.target;"A"===t.tagName&&t.href&&!t.target&&(e.preventDefault(),window.open(t.href,"_blank"))}}),SwaggerUi.Models.Oauth2Model=Backbone.Model.extend({defaults:{scopes:{},isPasswordFlow:!1,clientAuthenticationType:"none"},initialize:function(){if(this.attributes&&this.attributes.scopes){var e,t=_.cloneDeep(this.attributes),n=[];for(e in t.scopes){var r=t.scopes[e];"string"==typeof r.description&&(n[r]=t.scopes[e],n.push(t.scopes[e]))}t.scopes=n,this.attributes=t}if(this.attributes&&this.attributes.flow){var i=this.attributes.flow;this.set("isPasswordFlow","password"===i),this.set("requireClientAuthentication","application"===i),this.set("clientAuthentication","password"===i||"application"===i)}this.on("change",this.validate)},setScopes:function(e,t){var n=_.extend({},this.attributes),r=_.findIndex(n.scopes,function(t){return t.scope===e});n.scopes[r].checked=t,this.set(n),this.validate()},validate:function(){var e=!1;if(this.get("isPasswordFlow")&&!this.get("username"))return!1;if(this.get("clientAuthenticationType")in["basic","request-body"]&&!this.get("clientId"))return!1;var t=this.get("scopes"),n=_.findIndex(t,function(e){return e.checked===!0});return t.length>0&&n>=0&&(e=!0),0===t.length&&(e=!0),this.set("valid",e),e}}),SwaggerUi.Views.Oauth2View=Backbone.View.extend({events:{"change .oauth-scope":"scopeChange","change .oauth-username":"setUsername","change .oauth-password":"setPassword","change .oauth-client-authentication-type":"setClientAuthenticationType","change .oauth-client-id":"setClientId","change .oauth-client-secret":"setClientSecret"},template:Handlebars.templates.oauth2,cls:{error:"error"},render:function(){return this.$el.html(this.template(this.model.toJSON())),this},scopeChange:function(e){var t=$(e.target).prop("checked"),n=$(e.target).data("scope");this.model.setScopes(n,t)},setUsername:function(e){var t=$(e.target).val();this.model.set("username",t),t&&$(e.target).removeClass(this.cls.error)},setPassword:function(e){this.model.set("password",$(e.target).val())},setClientAuthenticationType:function(e){var t=$(e.target).val(),n=this.$el;switch(this.model.set("clientAuthenticationType",t),t){case"none":n.find(".oauth-client-authentication").hide();break;case"basic":case"request-body":n.find(".oauth-client-id").removeClass(this.cls.error),n.find(".oauth-client-authentication").show()}},setClientId:function(e){var t=$(e.target).val();this.model.set("clientId",t),t&&$(e.target).removeClass(this.cls.error)},setClientSecret:function(e){this.model.set("clientSecret",$(e.target).val()),$(e.target).removeClass("error")},highlightInvalid:function(){this.model.get("username")||this.$el.find(".oauth-username").addClass(this.cls.error),this.model.get("clientId")||this.$el.find(".oauth-client-id").addClass(this.cls.error)}}),SwaggerUi.Views.OperationView=Backbone.View.extend({invocationUrl:null,events:{"submit .sandbox":"submitOperation","click .submit":"submitOperation","click .response_hider":"hideResponse","click .toggleOperation":"toggleOperationContent","mouseenter .api-ic":"mouseEnter","dblclick .curl":"selectText","change [name=responseContentType]":"showSnippet"},initialize:function(e){return e=e||{},this.router=e.router,this.auths=e.auths,this.parentId=this.model.parentId,this.nickname=this.model.nickname,this.model.encodedParentId=encodeURIComponent(this.parentId),e.swaggerOptions&&(this.model.defaultRendering=e.swaggerOptions.defaultModelRendering,e.swaggerOptions.showRequestHeaders&&(this.model.showRequestHeaders=!0),e.swaggerOptions.showOperationIds&&(this.model.showOperationIds=!0)),this},selectText:function(e){var t,n,r=document,i=e.target.firstChild;r.body.createTextRange?(t=document.body.createTextRange(),t.moveToElementText(i),t.select()):window.getSelection&&(n=window.getSelection(),t=document.createRange(),t.selectNodeContents(i),n.removeAllRanges(),n.addRange(t))},mouseEnter:function(e){var t=$(this.el).find(".content"),n=e.pageX,r=e.pageY,i=$(window).scrollLeft(),a=$(window).scrollTop(),o=i+$(window).width(),s=a+$(window).height(),l=t.width(),u=t.height();n+l>o&&(n=o-l),n<i&&(n=i),r+u>s&&(r=s-u),r<a&&(r=a);var c={};c.top=r,c.left=n,t.css(c)},render:function(){var e,t,n,r,i,a,o,s,l,u,c,p,h,f,d,m,g,y,v,b,w,x,A,S,j,E,O,k,T,C,I,D,L,M,R,U,P,q,B,z,N;
+if(a=jQuery.inArray(this.model.method,this.model.supportedSubmitMethods())>=0,a||(this.model.isReadOnly=!0),this.model.description=this.model.description||this.model.notes,this.model.oauth=null,m=this.model.authorizations||this.model.security)if(Array.isArray(m))for(l=0,u=m.length;l<u;l++){n=m[l];for(s in n)for(e in this.auths)if(t=this.auths[e],s===t.name&&"oauth2"===t.type){this.model.oauth={},this.model.oauth.scopes=[],A=t.value.scopes;for(o in A)P=A[o],D=n[s].indexOf(o),D>=0&&(y={scope:o,description:P},this.model.oauth.scopes.push(y))}}else for(o in m)if(P=m[o],"oauth2"===o)for(null===this.model.oauth&&(this.model.oauth={}),void 0===this.model.oauth.scopes&&(this.model.oauth.scopes=[]),d=0,c=P.length;d<c;d++)y=P[d],this.model.oauth.scopes.push(y);if("undefined"!=typeof this.model.responses){this.model.responseMessages=[],S=this.model.responses;for(r in S)q=S[r],C=null,I=this.model.responses[r].schema,I&&I.$ref&&(C=I.$ref,C.indexOf("#/definitions/")!==-1&&(C=C.replace(/^.*#\/definitions\//,""))),this.model.responseMessages.push({code:r,message:q.description,responseModel:C,headers:q.headers,schema:I})}if("undefined"==typeof this.model.responseMessages&&(this.model.responseMessages=[]),L=null,B=this.model.produces,z=this.contains(B,"xml"),N=!z||this.contains(B,"json"),this.model.successResponse){R=this.model.successResponse;for(s in R)q=R[s],this.model.successCode=s,"object"==typeof q&&"function"==typeof q.createJSONSample?(this.model.successDescription=q.description,this.model.headers=this.parseResponseHeaders(q.headers),L={sampleJSON:!!N&&JSON.stringify(SwaggerUi.partials.signature.createJSONSample(q),void 0,2),isParam:!1,sampleXML:!!z&&SwaggerUi.partials.signature.createXMLSample(q.name,q.definition,q.models),signature:SwaggerUi.partials.signature.getModelSignature(q.name,q.definition,q.models,q.modelPropertyMacro)}):L={signature:SwaggerUi.partials.signature.getPrimitiveSignature(q)}}else this.model.responseClassSignature&&"string"!==this.model.responseClassSignature&&(L={sampleJSON:this.model.responseSampleJSON,isParam:!1,signature:this.model.responseClassSignature});for($(this.el).html(Handlebars.templates.operation(this.model)),L?(L.defaultRendering=this.model.defaultRendering,T=new SwaggerUi.Views.SignatureView({model:L,router:this.router,tagName:"div"}),$(".model-signature",$(this.el)).append(T.render().el)):(this.model.responseClassSignature="string",$(".model-signature",$(this.el)).html(this.model.type)),i={isParam:!1},i.consumes=this.model.consumes,i.produces=this.model.produces,j=this.model.parameters,g=0,p=j.length;g<p;g++)b=j[g],U=b.type||b.dataType||"","undefined"==typeof U&&(C=b.schema,C&&C.$ref&&(x=C.$ref,U=0===x.indexOf("#/definitions/")?x.substring("#/definitions/".length):x)),U&&"file"===U.toLowerCase()&&(i.consumes||(i.consumes="multipart/form-data")),b.type=U;for(k=new SwaggerUi.Views.ResponseContentTypeView({model:i,router:this.router}),$(".response-content-type",$(this.el)).append(k.render().el),E=this.model.parameters,v=0,h=E.length;v<h;v++)b=E[v],this.addParameter(b,i.consumes);for(O=this.model.responseMessages,w=0,f=O.length;w<f;w++)M=O[w],M.isXML=z,M.isJSON=N,_.isUndefined(M.headers)||(M.headers=this.parseHeadersType(M.headers)),this.addStatusCode(M);if(Array.isArray(this.model.security)){var F=SwaggerUi.utils.parseSecurityDefinitions(this.model.security,this.model.parent.securityDefinitions);F.isLogout=!_.isEmpty(this.model.clientAuthorizations.authz),this.authView=new SwaggerUi.Views.AuthButtonView({data:F,router:this.router,isOperation:!0,model:{scopes:F.scopes}}),this.$(".authorize-wrapper").append(this.authView.render().el)}return this.showSnippet(),this},parseHeadersType:function(e){var t={string:{"date-time":"dateTime",date:"date"}};return _.forEach(e,function(e){var n;e=e||{},n=t[e.type]&&t[e.type][e.format],_.isUndefined(n)||(e.type=n)}),e},contains:function(e,t){return e.filter(function(e){if(e.indexOf(t)>-1)return!0}).length},parseResponseHeaders:function(e){var t="; ",n=_.clone(e);return _.forEach(n,function(e){var n=[];_.forEach(e,function(e,t){var r=["type","description"];r.indexOf(t.toLowerCase())===-1&&n.push(t+": "+e)}),n.join(t),e.other=n}),n},addParameter:function(e,t){e.consumes=t,e.defaultRendering=this.model.defaultRendering,e.schema&&($.extend(!0,e.schema,this.model.definitions[e.type]),e.schema.definitions=this.model.definitions,e.schema.type||(e.schema.type="object"),e.schema.title||(e.schema.title=" "));var n=new SwaggerUi.Views.ParameterView({model:e,tagName:"tr",readOnly:this.model.isReadOnly,swaggerOptions:this.options.swaggerOptions});$(".operation-params",$(this.el)).append(n.render().el)},addStatusCode:function(e){e.defaultRendering=this.model.defaultRendering;var t=new SwaggerUi.Views.StatusCodeView({model:e,tagName:"tr",router:this.router});$(".operation-status",$(this.el)).append(t.render().el)},submitOperation:function(e){var t,n,r,i,a;if(null!==e&&e.preventDefault(),n=$(".sandbox",$(this.el)),t=!0,n.find("input.required").each(function(){$(this).removeClass("error"),""===jQuery.trim($(this).val())&&($(this).addClass("error"),$(this).wiggle({callback:function(e){return function(){$(e).focus()}}(this)}),t=!1)}),n.find("textarea.required:visible").each(function(){$(this).removeClass("error"),""===jQuery.trim($(this).val())&&($(this).addClass("error"),$(this).wiggle({callback:function(e){return function(){return $(e).focus()}}(this)}),t=!1)}),n.find("select.required").each(function(){$(this).removeClass("error"),this.selectedIndex===-1&&($(this).addClass("error"),$(this).wiggle({callback:function(e){return function(){$(e).focus()}}(this)}),t=!1)}),t){if(i=this.getInputMap(n),r=this.isFileUpload(n),a={parent:this},this.options.swaggerOptions)for(var o in this.options.swaggerOptions)a[o]=this.options.swaggerOptions[o];var s;for(s=0;s<this.model.parameters.length;s++){var l=this.model.parameters[s];if(l.jsonEditor&&l.jsonEditor.isEnabled()){var u=l.jsonEditor.getValue();i[l.name]=JSON.stringify(u)}}return a.responseContentType=$("div select[name=responseContentType]",$(this.el)).val(),a.requestContentType=$("div select[name=parameterContentType]",$(this.el)).val(),$(".response_throbber",$(this.el)).show(),r?($(".request_url",$(this.el)).html("<pre></pre>"),$(".request_url pre",$(this.el)).text(this.invocationUrl),a.useJQuery=!0,i.parameterContentType="multipart/form-data",this.map=i,this.model.execute(i,a,this.showCompleteStatus,this.showErrorStatus,this)):(this.map=i,this.model.execute(i,a,this.showCompleteStatus,this.showErrorStatus,this))}},getInputMap:function(e){var t,n,r,i,a,o,s,l,u,c,p,h;for(t={},n=e.find("input"),r=0,i=n.length;r<i;r++)a=n[r],null!==a.value&&jQuery.trim(a.value).length>0&&(t[a.name]=a.value),"file"===a.type&&(t[a.name]=a.files[0]);for(o=e.find("textarea"),s=0,l=o.length;s<l;s++)a=o[s],u=this.getTextAreaValue(a),null!==u&&jQuery.trim(u).length>0&&(t[a.name]=u);for(c=e.find("select"),p=0,h=c.length;p<h;p++)a=c[p],u=this.getSelectedValue(a),null!==u&&jQuery.trim(u).length>0&&(t[a.name]=u);return t},isFileUpload:function(e){var t,n,r,i,a=!1;for(t=e.find("input"),n=0,r=t.length;n<r;n++)i=t[n],"file"===i.type&&(a=!0);return a},success:function(e,t){t.showCompleteStatus(e)},wrap:function(e){var t,n,r,i,a,o,s;for(r={},n=e.getAllResponseHeaders().split("\r"),a=0,o=n.length;a<o;a++)i=n[a],t=i.match(/^([^:]*?):(.*)$/),t||(t=[]),t.shift(),void 0!==t[0]&&void 0!==t[1]&&(r[t[0].trim()]=t[1].trim());return s={},s.content={},s.content.data=e.responseText,s.headers=r,s.request={},s.request.url=this.invocationUrl,s.status=e.status,s},getSelectedValue:function(e){if(e.multiple){for(var t=[],n=0,r=e.options.length;n<r;n++){var i=e.options[n];i.selected&&t.push(i.value)}return t.length>0?t:null}return e.value},hideResponse:function(e){e&&e.preventDefault(),$(".response",$(this.el)).slideUp(),$(".response_hider",$(this.el)).fadeOut()},showResponse:function(e){var t=JSON.stringify(e,null,"\t").replace(/\n/g,"<br>");$(".response_body",$(this.el)).html(_.escape(t))},showErrorStatus:function(e,t){t.showStatus(e)},showCompleteStatus:function(e,t){t.showStatus(e)},formatXml:function(e){var t,n,r,i,a,o,s,l,u,c,p,h,f;for(p=/(>)(<)(\/*)/g,f=/[ ]*(.*)[ ]+\n/g,t=/(<.+>)(.+\n)/g,e=e.replace(/\r\n/g,"\n").replace(p,"$1\n$2$3").replace(f,"$1\n").replace(t,"$1\n$2"),c=0,r="",l=e.split("\n"),i=0,o="other",h={"single->single":0,"single->closing":-1,"single->opening":0,"single->other":0,"closing->single":0,"closing->closing":-1,"closing->opening":0,"closing->other":0,"opening->single":1,"opening->closing":0,"opening->opening":1,"opening->other":1,"other->single":0,"other->closing":-1,"other->opening":0,"other->other":0},n=function(e){var t,n,a,s,l,u,c;u={single:Boolean(e.match(/<.+\/>/)),closing:Boolean(e.match(/<\/.+>/)),opening:Boolean(e.match(/<[^!?].*>/))},l=function(){var e;e=[];for(a in u)c=u[a],c&&e.push(a);return e}()[0],l=void 0===l?"other":l,t=o+"->"+l,o=l,s="",i+=h[t],s=function(){var e,t,r;for(r=[],n=e=0,t=i;0<=t?e<t:e>t;n=0<=t?++e:--e)r.push("  ");return r}().join(""),"opening->closing"===t?r=r.substr(0,r.length-1)+e+"\n":r+=s+e+"\n"},a=0,s=l.length;a<s;a++)u=l[a],n(u);return r},showStatus:function(e){var t,n;void 0===e.content?(n=e.data,t=e.url):(n=e.content.data,t=e.request.url);var r=e.headers;"string"==typeof n&&(n=jQuery.trim(n));var i=null;r&&(i=r["Content-Type"]||r["content-type"],i&&(i=i.split(";")[0].trim())),$(".response_body",$(this.el)).removeClass("json"),$(".response_body",$(this.el)).removeClass("xml");var a,o,s=function(e){var t=document.createElement("audio");return!(!t.canPlayType||!t.canPlayType(e).replace(/no/,""))},l=!1;if(n)if("application/octet-stream"===i||r["Content-Disposition"]&&/attachment/.test(r["Content-Disposition"])||r["content-disposition"]&&/attachment/.test(r["content-disposition"])||r["Content-Description"]&&/File Transfer/.test(r["Content-Description"])||r["content-description"]&&/File Transfer/.test(r["content-description"]))if("Blob"in window){var u,c=i||"text/html",p=document.createElement("a");if("[object Blob]"==={}.toString.apply(n))u=window.URL.createObjectURL(n);else{var h=[];h.push(n),u=window.URL.createObjectURL(new Blob(h,{type:c}))}var f=e.url.substr(e.url.lastIndexOf("/")+1),d=[c,f,u].join(":"),m=r["content-disposition"]||r["Content-Disposition"];if("undefined"!=typeof m){var g=/filename=([^;]*);?/.exec(m);null!==g&&g.length>1&&(d=g[1],f=d)}p.setAttribute("href",u),p.setAttribute("download",d),p.innerText="Download "+f,a=$("<div/>").append(p),l=!0}else a=$('<pre class="json" />').append("Download headers detected but your browser does not support downloading binary via XHR (Blob).");else if("application/json"===i||/\+json$/.test(i)){var y=null;try{y=JSON.stringify(JSON.parse(n),null,"  ")}catch(v){y="can't parse JSON.  Raw result:\n\n"+n}o=$("<code />").text(y),a=$('<pre class="json" />').append(o)}else if("application/xml"===i||/\+xml$/.test(i))o=$("<code />").text(this.formatXml(n)),a=$('<pre class="xml" />').append(o);else if("text/html"===i)o=$("<code />").html(_.escape(n)),a=$('<pre class="xml" />').append(o);else if(/text\/plain/.test(i))o=$("<code />").text(n),a=$('<pre class="plain" />').append(o);else if(/^image\//.test(i)){var b=window.URL||window.webkitURL,w=b.createObjectURL(n);a=$("<img>").attr("src",w)}else/^audio\//.test(i)&&s(i)?a=$("<audio controls>").append($("<source>").attr("src",t).attr("type",i)):r.location||r.Location?window.location=e.url:(o=$("<code />").text(n),a=$('<pre class="json" />').append(o));else o=$("<code />").text("no content"),a=$('<pre class="json" />').append(o);var x=a;$(".request_url",$(this.el)).html("<pre></pre>"),$(".request_url pre",$(this.el)).text(t),$(".response_code",$(this.el)).html("<pre>"+e.status+"</pre>"),$(".response_body",$(this.el)).html(x),$(".response_headers",$(this.el)).html("<pre>"+_.escape(JSON.stringify(e.headers,null,"  ")).replace(/\n/g,"<br>")+"</pre>"),$(".response",$(this.el)).slideDown(),$(".response_hider",$(this.el)).show(),$(".response_throbber",$(this.el)).hide();var A=this.model.asCurl(this.map,{responseContentType:i});A=A.replace("!","&#33;"),$("div.curl",$(this.el)).html("<pre>"+_.escape(A)+"</pre>");var S=this.options.swaggerOptions;if(S.showRequestHeaders){var j=$(".sandbox",$(this.el)),E=this.getInputMap(j),O=this.model.getHeaderParams(E);delete O["Content-Type"],$(".request_headers",$(this.el)).html("<pre>"+_.escape(JSON.stringify(O,null,"  ")).replace(/\n/g,"<br>")+"</pre>")}S.responseHooks&&S.responseHooks[this.nickname]&&S.responseHooks[this.nickname](e,this);var k=$(".response_body",$(this.el))[0];return S.highlightSizeThreshold&&"undefined"!=typeof e.data&&e.data.length>S.highlightSizeThreshold||l?k:hljs.highlightBlock(k)},toggleOperationContent:function(e){var t=$("#"+Docs.escapeResourceName(this.parentId+"_"+this.nickname+"_content"));t.is(":visible")?($.bbq.pushState("#/",2),e.preventDefault(),Docs.collapseOperation(t)):Docs.expandOperation(t)},getTextAreaValue:function(e){var t,n,r,i;if(null===e.value||0===jQuery.trim(e.value).length)return null;if(t=this.getParamByName(e.name),t&&t.type&&"array"===t.type.toLowerCase()){for(n=e.value.split("\n"),r=[],i=0;i<n.length;i++)null!==n[i]&&jQuery.trim(n[i]).length>0&&r.push(n[i]);return r.length>0?r:null}return e.value},showSnippet:function(){var e,t=this.$("[name=responseContentType]"),n=this.$(".operation-status .snippet_xml, .response-class .snippet_xml"),r=this.$(".operation-status .snippet_json, .response-class .snippet_json");t.length&&(e=t.val(),e.indexOf("xml")>-1?(n.show(),r.hide()):(r.show(),n.hide()))},getParamByName:function(e){var t;if(this.model.parameters)for(t=0;t<this.model.parameters.length;t++)if(this.model.parameters[t].name===e)return this.model.parameters[t];return null}}),SwaggerUi.Views.ParameterContentTypeView=Backbone.View.extend({initialize:function(){},render:function(){return this.model.parameterContentTypeId="pct"+Math.random(),$(this.el).html(Handlebars.templates.parameter_content_type(this.model)),this}}),SwaggerUi.Views.ParameterView=Backbone.View.extend({events:{"change [name=parameterContentType]":"toggleParameterSnippet"},initialize:function(){Handlebars.registerHelper("isArray",function(e,t){var n=e.type&&e.type.toLowerCase();return"array"===n||e.allowMultiple?t.fn(this):t.inverse(this)})},render:function(){var e,t,n=this.model.type||this.model.dataType,r=this.model.modelSignature.type,i=this.model.modelSignature.definitions,a=this.model.schema||{},o=this.model.consumes||[];if("undefined"==typeof n&&a.$ref){var s=a.$ref;n=0===s.indexOf("#/definitions/")?s.substring("#/definitions/".length):s}this.model.type=n,this.model.paramType=this.model["in"]||this.model.paramType,this.model.isBody="body"===this.model.paramType||"body"===this.model["in"],this.model.isFile=n&&"file"===n.toLowerCase(),"undefined"==typeof this.model["default"]&&(this.model["default"]=this.model.defaultValue),this.model.hasDefault="undefined"!=typeof this.model["default"],this.model.valueId="m"+this.model.name+Math.random(),this.model.allowableValues&&(this.model.isList=!0);var l=this.contains(o,"xml"),u=!l||this.contains(o,"json");e=SwaggerUi.partials.signature.createParameterJSONSample(r,i);var c=this.template();$(this.el).html(c(this.model));var p={sampleJSON:!!u&&e,sampleXML:!(!e||!l)&&SwaggerUi.partials.signature.createXMLSample("",a,i,!0),isParam:!0,signature:SwaggerUi.partials.signature.getParameterModelSignature(r,i),defaultRendering:this.model.defaultRendering};e?(t=new SwaggerUi.Views.SignatureView({model:p,tagName:"div"}),$(".model-signature",$(this.el)).append(t.render().el)):$(".model-signature",$(this.el)).html(this.model.signature);var h=!1;if(this.options.swaggerOptions.jsonEditor&&this.model.isBody&&this.model.schema){var f=$(this.el);this.model.jsonEditor=new JSONEditor($(".editor_holder",f)[0],{schema:this.model.schema,startval:this.model["default"],ajax:!0,disable_properties:!0,disable_edit_json:!0,iconlib:"swagger"}),p.jsonEditor=this.model.jsonEditor,$(".body-textarea",f).hide(),$(".editor_holder",f).show(),$(".parameter-content-type",f).change(function(e){"application/xml"===e.target.value?($(".body-textarea",f).show(),$(".editor_holder",f).hide(),this.model.jsonEditor.disable()):($(".body-textarea",f).hide(),$(".editor_holder",f).show(),this.model.jsonEditor.enable())})}this.model.isBody&&(h=!0);var d={isParam:h};if(d.consumes=this.model.consumes,h){var m=new SwaggerUi.Views.ParameterContentTypeView({model:d});$(".parameter-content-type",$(this.el)).append(m.render().el),this.toggleParameterSnippet()}else{var g=new SwaggerUi.Views.ResponseContentTypeView({model:d});$(".response-content-type",$(this.el)).append(g.render().el),this.toggleResponseSnippet()}return this},contains:function(e,t){return e.filter(function(e){if(e.indexOf(t)>-1)return!0}).length},toggleParameterSnippet:function(){var e=this.$("[name=parameterContentType]").val();this.toggleSnippet(e)},toggleResponseSnippet:function(){var e=this.$("[name=responseContentType]");e.length&&this.toggleSnippet(e.val())},toggleSnippet:function(e){e=e||"",e.indexOf("xml")>-1?(this.$(".snippet_xml").show(),this.$(".snippet_json").hide()):(this.$(".snippet_json").show(),this.$(".snippet_xml").hide())},template:function(){return this.model.isList?Handlebars.templates.param_list:this.options.readOnly?this.model.required?Handlebars.templates.param_readonly_required:Handlebars.templates.param_readonly:this.model.required?Handlebars.templates.param_required:Handlebars.templates.param}}),SwaggerUi.partials.signature=function(){function e(e){var t,i=e.name,a=e.definition,o=e.config,s=e.models,l=e.config.isParam,u=[],c=a.properties,p=a.additionalProperties,h=a.xml,f=b(h);return f&&u.push(f),c||p?(c=c||{},t=_.map(c,function(e,t){var n,i;return l&&e.readOnly?"":(n=e.xml||{},i=r(t,e,s,o),n.attribute?(u.push(i),""):i)}).join(""),p&&(t+="<!-- additional elements allowed -->"),y(i,t,u)):n()}function t(e,t){return y(e,"<!-- Infinite loop $ref:"+t+" -->")}function n(e){return e=e?": "+e:"","<!-- invalid XML"+e+" -->"}function r(r,i,s,l){var u,c,p=_.isObject(i)?i.$ref:null;l=l||{},l.modelsToIgnore=l.modelsToIgnore||[];var h=_.isString(p)?a(p,r,s,l):o(r,i,s,l);if(!h)return n();switch(h.type){case"array":u=w(h);break;case"object":u=e(h);break;case"loop":u=t(h.name,h.config.loopTo);break;default:u=A(h)}return p&&"loop"!==h.type&&(c=l.modelsToIgnore.indexOf(p),c>-1&&l.modelsToIgnore.splice(c,1)),u}function i(e,t,n,r,i){if(arguments.length<4)throw new Error;this.config=i||{},this.config.modelsToIgnore=this.config.modelsToIgnore||[],this.name=v(e,n.xml),this.definition=n,this.models=r,this.type=t}function a(e,t,n,r){var a=u(e),o=n[a]||{},s=o.definition&&o.definition.type?o.definition.type:"object";return t=o.definition&&o.definition.xml&&o.definition.xml.name?t||o.definition.xml.name||o.name:t||o.name,r.modelsToIgnore.indexOf(e)>-1?(s="loop",r.loopTo=a):r.modelsToIgnore.push(e),o.definition?new i(t,s,o.definition,n,r):null}function o(e,t,n,r){var a=t.type||"object";return t.xml&&t.xml.name&&(e=t.xml.name||e),t?new i(e,a,t,n,r):null}function s(e,t,n,i){var a='<?xml version="1.0"?>';return p(a+r(e,t,n,{isParam:i}))}var l=function(e){return _.isPlainObject(e.schema)&&(e=l(e.schema)),e},u=function(e){return"undefined"==typeof e?null:0===e.indexOf("#/definitions/")?e.substring("#/definitions/".length):e},c=function(e){if(/^Inline Model \d+$/.test(e)&&this.inlineModels){var t=parseInt(e.substr("Inline Model".length).trim(),10),n=this.inlineModels[t];return n}return null},p=function(e){var t,n,r,i,a,o,s,l,u,c,p,h,f;for(p=/(>)(<)(\/*)/g,f=/[ ]*(.*)[ ]+\n/g,t=/(<.+>)(.+\n)/g,e=e.replace(p,"$1\n$2$3").replace(f,"$1\n").replace(t,"$1\n$2"),c=0,r="",l=e.split("\n"),i=0,o="other",h={"single->single":0,"single->closing":-1,"single->opening":0,"single->other":0,"closing->single":0,"closing->closing":-1,"closing->opening":0,"closing->other":0,"opening->single":1,"opening->closing":0,"opening->opening":1,"opening->other":1,"other->single":0,"other->closing":-1,"other->opening":0,"other->other":0},n=function(e){var t,n,a,s,l,u,c;u={single:Boolean(e.match(/<.+\/>/)),closing:Boolean(e.match(/<\/.+>/)),opening:Boolean(e.match(/<[^!?].*>/))},l=function(){var e;e=[];for(a in u)c=u[a],c&&e.push(a);return e}()[0],l=void 0===l?"other":l,t=o+"->"+l,o=l,s="",i+=h[t],s=function(){var e,t,r;for(r=[],n=e=0,t=i;0<=t?e<t:e>t;n=0<=t?++e:--e)r.push("  ");return r}().join(""),"opening->closing"===t?r=r.substr(0,r.length-1)+e+"\n":r+=s+e+"\n"},a=0,s=l.length;a<s;a++)u=l[a],n(u);return r},h=function(e,t,n,r){function i(e,t,r){var i,a=t;return e.$ref?(a=e.title||u(e.$ref),i=n[u(e.$ref)]):_.isUndefined(t)&&(a=e.title||"Inline Model "+ ++m,i={definition:e}),r!==!0&&(f[a]=_.isUndefined(i)?{}:i.definition),a}function a(e){var t='<span class="propType">',n=e.type||"object";return e.$ref?t+=i(e,u(e.$ref)):"object"===n?t+=_.isUndefined(e.properties)?"object":i(e):"array"===n?(t+="Array[",_.isArray(e.items)?t+=_.map(e.items,i).join(","):_.isPlainObject(e.items)?t+=_.isUndefined(e.items.$ref)?_.isUndefined(e.items.type)||_.indexOf(["array","object"],e.items.type)!==-1?i(e.items):e.items.type:i(e.items,u(e.items.$ref)):(console.log("Array type's 'items' schema is not an array or an object, cannot process"),t+="object"),t+="]"):t+=e.type,t+="</span>"}function o(e,t){var n="",r=e.type||"object",i="array"===r;switch(_.isUndefined(e.description)||(t+=': <span class="propDesc">'+e.description+"</span>"),e["enum"]&&(t+=' = <span class="propVals">[\''+e["enum"].join("', '")+"']</span>"),i&&(r=_.isPlainObject(e.items)&&!_.isUndefined(e.items.type)?e.items.type:"object"),_.isUndefined(e["default"])||(n+=h("Default",e["default"])),r){case"string":e.minLength&&(n+=h("Min. Length",e.minLength)),e.maxLength&&(n+=h("Max. Length",e.maxLength)),e.pattern&&(n+=h("Reg. Exp.",e.pattern));break;case"integer":case"number":e.minimum&&(n+=h("Min. Value",e.minimum)),e.exclusiveMinimum&&(n+=h("Exclusive Min.","true")),e.maximum&&(n+=h("Max. Value",e.maximum)),e.exclusiveMaximum&&(n+=h("Exclusive Max.","true")),e.multipleOf&&(n+=h("Multiple Of",e.multipleOf))}if(i&&(e.minItems&&(n+=h("Min. Items",e.minItems)),e.maxItems&&(n+=h("Max. Items",e.maxItems)),e.uniqueItems&&(n+=h("Unique Items","true")),e.collectionFormat&&(n+=h("Coll. Format",e.collectionFormat))),_.isUndefined(e.items)&&_.isArray(e["enum"])){var a;a="number"===r||"integer"===r?e["enum"].join(", "):'"'+e["enum"].join('", "')+'"',n+=h("Enum",a)}return n.length>0&&(t='<span class="propWrap">'+t+'<table class="optionsWrapper"><tr><th colspan="2">'+r+"</th></tr>"+n+"</table></span>"),t}function s(e,t){var s,h=e.type||"object",f="array"===e.type,m=c+t+" "+(f?"[":"{")+p;return t&&d.push(t),f?_.isArray(e.items)?m+="<div>"+_.map(e.items,function(e){var t=e.type||"object";return _.isUndefined(e.$ref)?_.indexOf(["array","object"],t)>-1?"object"===t&&_.isUndefined(e.properties)?"object":i(e):o(e,t):i(e,u(e.$ref))}).join(",</div><div>"):_.isPlainObject(e.items)?m+=_.isUndefined(e.items.$ref)?_.indexOf(["array","object"],e.items.type||"object")>-1?(_.isUndefined(e.items.type)||"object"===e.items.type)&&_.isUndefined(e.items.properties)?"<div>object</div>":"<div>"+i(e.items)+"</div>":"<div>"+o(e.items,e.items.type)+"</div>":"<div>"+i(e.items,u(e.items.$ref))+"</div>":(console.log("Array type's 'items' property is not an array or an object, cannot process"),m+="<div>object</div>"):e.$ref?m+="<div>"+i(e,t)+"</div>":"object"===h?(_.isPlainObject(e.properties)&&(s=_.map(e.properties,function(t,i){var s,c=_.indexOf(e.required,i)>=0,p=_.cloneDeep(t),h=c?"required":"",f='<span class="propName '+h+'">'+i+"</span> (";return p["default"]=r(p),p=l(p),_.isUndefined(p.$ref)||(s=n[u(p.$ref)],_.isUndefined(s)||_.indexOf([void 0,"array","object"],s.definition.type)!==-1||(p=l(s.definition))),f+=a(p),c||(f+=', <span class="propOptKey">optional</span>'),t.readOnly&&(f+=', <span class="propReadOnly">read only</span>'),f+=")","<div"+(t.readOnly?' class="readOnly"':"")+">"+o(p,f)}).join(",</div>")),s&&(m+=s+"</div>")):m+="<div>"+o(e,h)+"</div>",m+c+(f?"]":"}")+p}var c='<span class="strong">',p="</span>",h=function(e,t){return'<tr><td class="optionName">'+e+":</td><td>"+t+"</td></tr>"};if(_.isObject(arguments[0])&&(e=void 0,t=arguments[0],n=arguments[1],r=arguments[2]),n=n||{},t=l(t),_.isEmpty(t))return c+"Empty"+p;if("string"==typeof t.$ref&&(e=u(t.$ref),t=n[e],"undefined"==typeof t))return c+e+" is not defined!"+p;"string"!=typeof e&&(e=t.title||"Inline Model"),t.definition&&(t=t.definition),"function"!=typeof r&&(r=function(e){return(e||{})["default"]});for(var f={},d=[],m=0,g=s(t,e);_.keys(f).length>0;)_.forEach(f,function(e,t){var n=_.indexOf(d,t)>-1;delete f[t],n||(d.push(t),g+="<br />"+s(e,t))});return g},f=function(e,t,n,r){e=l(e),"function"!=typeof r&&(r=function(e){return(e||{})["default"]}),n=n||{};var i,a,o=e.type||"object",s=e.format;return _.isUndefined(e.example)?_.isUndefined(e.items)&&_.isArray(e["enum"])&&(a=e["enum"][0]):a=e.example,_.isUndefined(a)&&(e.$ref?(i=t[u(e.$ref)],_.isUndefined(i)||(_.isUndefined(n[i.name])?(n[i.name]=i,a=f(i.definition,t,n,r),delete n[i.name]):a="array"===i.type?[]:{})):_.isUndefined(e["default"])?"string"===o?a="date-time"===s?(new Date).toISOString():"date"===s?(new Date).toISOString().split("T")[0]:"string":"integer"===o?a=0:"number"===o?a=0:"boolean"===o?a=!0:"object"===o?(a={},_.forEach(e.properties,function(e,i){var o=_.cloneDeep(e);o["default"]=r(e),a[i]=f(o,t,n,r)})):"array"===o&&(a=[],_.isArray(e.items)?_.forEach(e.items,function(e){a.push(f(e,t,n,r))}):_.isPlainObject(e.items)?a.push(f(e.items,t,n,r)):_.isUndefined(e.items)?a.push({}):console.log("Array type's 'items' property is not an array or an object, cannot process")):a=e["default"]),a},d=function(e,t){if(t=t||{},t[e.name]=e,e.examples&&_.isPlainObject(e.examples)){e=_.cloneDeep(e);var n=Object.keys(e.examples);_.forEach(n,function(n){if(0===n.indexOf("application/json")){var r=e.examples[n];return _.isString(r)&&(r=jsyaml.safeLoad(r)),e.definition.example=r,f(e.definition,r,t,e.modelPropertyMacro)}})}if(e.examples){e=_.cloneDeep(e);var r=e.examples;return _.isString(r)&&(r=jsyaml.safeLoad(r)),e.definition.example=r,f(e.definition,r,t,e.modelPropertyMacro)}return f(e.definition,e.models,t,e.modelPropertyMacro)},m=function(e,t){var n,r;return e instanceof Array&&(r=!0,e=e[0]),"undefined"==typeof e?(e="undefined",n=!0):t[e]?(e=t[e],n=!1):c(e)?(e=c(e),n=!1):n=!0,n?r?"Array["+e+"]":e.toString():r?"Array["+h(e.name,e.definition,e.models,e.modelPropertyMacro)+"]":h(e.name,e.definition,e.models,e.modelPropertyMacro)},g=function(e,t){var n,r,i;if(t=t||{},n=e instanceof Array,i=n?e[0]:e,t[i]?r=d(t[i]):c(i)&&(r=d(c(i))),r){if(r=n?[r]:r,"string"==typeof r)return r;if(_.isObject(r)){var a=r;if(r instanceof Array&&r.length>0&&(a=r[0]),a.nodeName&&"Node"==typeof a){var o=(new XMLSerializer).serializeToString(a);return p(o)}return JSON.stringify(r,null,2)}return r}},y=function(e,t,r){var i,a;return r=r||[],a=r.map(function(e){return" "+e.name+'="'+e.value+'"'}).join(""),e?(i=["<",e,a,">",t,"</",e,">"],i.join("")):n("Node name is not provided")},v=function(e,t){var n=e||"";return t=t||{},t.prefix&&(n=t.prefix+":"+n),n},b=function(e){var t="",n="xmlns";return e=e||{},e.namespace?(t=e.namespace,e.prefix&&(n+=":"+e.prefix),{name:n,value:t}):t},w=function(e){var t,i=e.name,a=e.config,o=e.definition,s=e.models,l=o.items,u=o.xml||{},c=b(u),p=[];if(!l)return n();var h=i;return l.xml&&l.xml.name&&(h=l.xml.name),t=r(h,l,s,a),c&&p.push(c),u.wrapped&&(t=y(i,t,p)),t},x=function(e){var t,n;switch(e=e||{},n=e.items||{},t=e.type||""){case"object":return"Object is not a primitive";case"array":return"Array["+(n.format||n.type)+"]";default:return e.format||t}},A=function(e){var t,r=e.name,i=e.definition,a={string:{date:new Date(1).toISOString().split("T")[0],"date-time":new Date(1).toISOString(),"default":"string"},integer:{"default":1},number:{"default":1.1},"boolean":{"default":!0}},o=i.type,s=i.format,l=i.xml||{},u=b(l),c=[];return _.keys(a).indexOf(o)<0?n():(t=_.isArray(i["enum"])?i["enum"][0]:i.example||a[o][s]||a[o]["default"],l.attribute?{name:r,value:t}:(u&&c.push(u),y(r,t,c)))};return{getModelSignature:h,createJSONSample:d,getParameterModelSignature:m,createParameterJSONSample:g,createSchemaXML:r,createXMLSample:s,getPrimitiveSignature:x}}(),SwaggerUi.Views.PopupView=Backbone.View.extend({events:{"click .api-popup-cancel":"cancelClick"},template:Handlebars.templates.popup,className:"api-popup-dialog",selectors:{content:".api-popup-content",main:"#swagger-ui-container"},initialize:function(){this.$el.html(this.template(this.model))},render:function(){return this.$(this.selectors.content).append(this.model.content),$(this.selectors.main).first().append(this.el),this.showPopup(),this},showPopup:function(){this.$el.show()},cancelClick:function(){this.remove()}}),SwaggerUi.Views.ResourceView=Backbone.View.extend({initialize:function(e){e=e||{},this.router=e.router,this.auths=e.auths,""===this.model.description&&(this.model.description=null),this.model.description&&(this.model.summary=this.model.description),this.number=0},render:function(){var e={};$(this.el).html(Handlebars.templates.resource(this.model));for(var t=0;t<this.model.operationsArray.length;t++){for(var n=this.model.operationsArray[t],r=0,i=n.nickname;"undefined"!=typeof e[i];)i=i+"_"+r,r+=1;e[i]=n,n.nickname=i,n.parentId=this.model.id,n.definitions=this.model.definitions,this.addOperation(n)}return $(".toggleEndpointList",this.el).click(this.callDocs.bind(this,"toggleEndpointListForResource")),$(".collapseResource",this.el).click(this.callDocs.bind(this,"collapseOperationsForResource")),$(".expandResource",this.el).click(this.callDocs.bind(this,"expandOperationsForResource")),this},addOperation:function(e){e.number=this.number;var t=new SwaggerUi.Views.OperationView({model:e,router:this.router,tagName:"li",className:"endpoint",swaggerOptions:this.options.swaggerOptions,auths:this.auths});$(".endpoints",$(this.el)).append(t.render().el),this.number++},callDocs:function(e,t){t.preventDefault(),Docs[e](t.currentTarget.getAttribute("data-id"))}}),SwaggerUi.Views.ResponseContentTypeView=Backbone.View.extend({initialize:function(){},render:function(){return this.model.responseContentTypeId="rct"+Math.random(),$(this.el).html(Handlebars.templates.response_content_type(this.model)),this}}),SwaggerUi.Views.SignatureView=Backbone.View.extend({events:{"click a.description-link":"switchToDescription","click a.snippet-link":"switchToSnippet","mousedown .snippet_json":"jsonSnippetMouseDown","mousedown .snippet_xml":"xmlSnippetMouseDown"},initialize:function(){},render:function(){return $(this.el).html(Handlebars.templates.signature(this.model)),"model"===this.model.defaultRendering?this.switchToDescription():this.switchToSnippet(),this},switchToDescription:function(e){e&&e.preventDefault(),$(".snippet",$(this.el)).hide(),$(".description",$(this.el)).show(),$(".description-link",$(this.el)).addClass("selected"),$(".snippet-link",$(this.el)).removeClass("selected")},switchToSnippet:function(e){e&&e.preventDefault(),$(".snippet",$(this.el)).show(),$(".description",$(this.el)).hide(),$(".snippet-link",$(this.el)).addClass("selected"),$(".description-link",$(this.el)).removeClass("selected")},snippetToTextArea:function(e){var t=$("textarea",$(this.el.parentNode.parentNode.parentNode));""!==$.trim(t.val())&&t.prop("placeholder")!==t.val()||(t.val(e),this.model.jsonEditor&&this.model.jsonEditor.isEnabled()&&this.model.jsonEditor.setValue(JSON.parse(this.model.sampleJSON)))},jsonSnippetMouseDown:function(e){this.model.isParam&&(e&&e.preventDefault(),this.snippetToTextArea(this.model.sampleJSON))},xmlSnippetMouseDown:function(e){this.model.isParam&&(e&&e.preventDefault(),this.snippetToTextArea(this.model.sampleXML))}}),SwaggerUi.Views.StatusCodeView=Backbone.View.extend({initialize:function(e){this.options=e||{},this.router=this.options.router},render:function(){var e,t,n=this.router.api.models[this.model.responseModel];return $(this.el).html(Handlebars.templates.status_code(this.model)),e=this.router.api.models.hasOwnProperty(this.model.responseModel)?{
+sampleJSON:JSON.stringify(SwaggerUi.partials.signature.createJSONSample(n),void 0,2),sampleXML:!!this.model.isXML&&SwaggerUi.partials.signature.createXMLSample("",this.model.schema,this.router.api.models),isParam:!1,signature:SwaggerUi.partials.signature.getModelSignature(this.model.responseModel,n,this.router.api.models),defaultRendering:this.model.defaultRendering}:{signature:SwaggerUi.partials.signature.getPrimitiveSignature(this.model.schema)},t=new SwaggerUi.Views.SignatureView({model:e,tagName:"div"}),$(".model-signature",this.$el).append(t.render().el),this}})}).call(this);
\ No newline at end of file

From 389b71bc7efd6e2442a22412165462b446b35ef0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 19:21:48 +0200
Subject: [PATCH 283/928] Clean API

---
 htdocs/comm/propal/class/api_proposals.class.php | 12 +++++++++---
 htdocs/commande/class/api_orders.class.php       | 16 +++++++++++++---
 htdocs/commande/class/commande.class.php         |  8 +++++---
 .../compta/bank/class/api_bankaccounts.class.php | 14 +++++++++++++-
 .../compta/facture/class/api_invoices.class.php  | 14 +++++++++++---
 htdocs/contrat/class/api_contracts.class.php     | 14 ++++++++++----
 htdocs/expedition/class/api_shipments.class.php  | 11 ++++++++++-
 .../class/api_expensereports.class.php           | 12 +++++++++++-
 .../fourn/class/api_supplier_invoices.class.php  | 13 +++++++++++--
 htdocs/projet/class/api_projects.class.php       |  8 ++++++++
 htdocs/projet/class/api_tasks.class.php          |  8 ++++++++
 11 files changed, 109 insertions(+), 21 deletions(-)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index c697b1b9eb9..3c3447f3697 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -328,6 +328,9 @@ class Proposals extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->label = checkVal($request_data->label);
+
 		$updateRes = $this->propal->addline(
 			$request_data->desc,
 			$request_data->subprice,
@@ -337,8 +340,8 @@ class Proposals extends DolibarrApi
 			$request_data->localtax2_tx,
 			$request_data->fk_product,
 			$request_data->remise_percent,
-			'HT',
-			0,
+			$request_data->price_base_type ? $request_data->price_base_type : 'HT',
+			$request_data->subprice,
 			$request_data->info_bits,
 			$request_data->product_type,
 			$request_data->rang,
@@ -392,6 +395,9 @@ class Proposals extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->label = checkVal($request_data->label);
+
 		$propalline = new PropaleLigne($this->db);
 		$result = $propalline->fetch($lineid);
 		if ($result <= 0) {
@@ -407,7 +413,7 @@ class Proposals extends DolibarrApi
 			isset($request_data->localtax1_tx) ? $request_data->localtax1_tx : $propalline->localtax1_tx,
 			isset($request_data->localtax2_tx) ? $request_data->localtax2_tx : $propalline->localtax2_tx,
 			isset($request_data->desc) ? $request_data->desc : $propalline->desc,
-			'HT',
+			isset($request_data->price_base_type) ? $request_data->price_base_type : 'HT',
 			isset($request_data->info_bits) ? $request_data->info_bits : $propalline->info_bits,
 			isset($request_data->special_code) ? $request_data->special_code : $propalline->special_code,
 			isset($request_data->fk_parent_line) ? $request_data->fk_parent_line : $propalline->fk_parent_line,
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 1bf3b97a040..763fb061446 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -331,7 +331,12 @@ class Orders extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->label = checkVal($request_data->label);
+
 		$updateRes = $this->commande->addline(
 			$request_data->desc,
 			$request_data->subprice,
@@ -343,8 +348,8 @@ class Orders extends DolibarrApi
 			$request_data->remise_percent,
 			$request_data->info_bits,
 			$request_data->fk_remise_except,
-			'HT',
-			0,
+			$request_data->price_base_type ? $request_data->price_base_type : 'HT',
+			$request_data->subprice,
 			$request_data->date_start,
 			$request_data->date_end,
 			$request_data->product_type,
@@ -394,7 +399,12 @@ class Orders extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->label = checkVal($request_data->label);
+
 		$updateRes = $this->commande->updateline(
 			$lineid,
 			$request_data->desc,
@@ -404,7 +414,7 @@ class Orders extends DolibarrApi
 			$request_data->tva_tx,
 			$request_data->localtax1_tx,
 			$request_data->localtax2_tx,
-			'HT',
+			$request_data->price_base_type ? $request_data->price_base_type : 'HT',
 			$request_data->info_bits,
 			$request_data->date_start,
 			$request_data->date_end,
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 40fd3892c4c..074e3a6d67b 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2397,9 +2397,9 @@ class Commande extends CommonOrder
 	}
 
 	/**
-	 * 	Applique une remise relative
+	 * 	Set a percentage discount
 	 *
-	 * 	@param     	User		$user		User qui positionne la remise
+	 * 	@param     	User		$user		User setting the discount
 	 * 	@param     	float		$remise		Discount (percent)
 	 * 	@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 					<0 if KO, >0 if OK
@@ -2458,7 +2458,7 @@ class Commande extends CommonOrder
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * 		Applique une remise absolue
+	 * 		Set a fixed amount discount
 	 *
 	 * 		@param     	User		$user 		User qui positionne la remise
 	 * 		@param     	float		$remise		Discount
@@ -3156,7 +3156,9 @@ class Commande extends CommonOrder
 					$langs->load("errors");
 					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
 					$this->errors[] = $this->error;
+
 					dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
+
 					$this->db->rollback();
 					return self::STOCK_NOT_ENOUGH_FOR_ORDER;
 				}
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 0f13ed1e523..8cdd33425d6 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -481,7 +481,7 @@ class BankAccounts extends DolibarrApi
 	 * @param string $accountancycode  Accountancy code {@from body}
 	 * @param int    $datev            Payment date value (timestamp) {@from body} {@type timestamp}
 	 * @param string $num_releve       Bank statement numero {@from body}
-	 * @return int  ID of line
+	 * @return int  				   ID of line
 	 *
 	 * @url POST {id}/lines
 	 */
@@ -497,6 +497,14 @@ class BankAccounts extends DolibarrApi
 			throw new RestException(404, 'account not found');
 		}
 
+		$type = checkVal($type);
+		$label = checkVal($label);
+		$cheque_number = checkVal($cheque_number);
+		$cheque_writer = checkVal($cheque_writer);
+		$cheque_bank = checkVal($cheque_bank);
+		$accountancycode = checkVal($accountancycode);
+		$num_releve = checkVal($num_releve);
+
 		$result = $account->addline(
 			$date,
 			$type,
@@ -548,6 +556,10 @@ class BankAccounts extends DolibarrApi
 			throw new RestException(404, 'account line not found');
 		}
 
+		$url = checkVal($url);
+		$label = checkVal($label);
+		$type = checkVal($type);
+
 		$result = $account->add_url_line($line_id, $url_id, $url, $label, $type);
 		if ($result < 0) {
 			throw new RestException(503, 'Error when adding link to account line: '.$account->error);
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 0633affef49..a8f640a61ec 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -407,7 +407,12 @@ class Invoices extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->label = checkVal($request_data->label);
+
 		$updateRes = $this->invoice->updateline(
 			$lineid,
 			$request_data->desc,
@@ -419,7 +424,7 @@ class Invoices extends DolibarrApi
 			$request_data->tva_tx,
 			$request_data->localtax1_tx,
 			$request_data->localtax2_tx,
-			'HT',
+			$request_data->price_base_type ? $request_data->price_base_type : 'HT',
 			$request_data->info_bits,
 			$request_data->product_type,
 			$request_data->fk_parent_line,
@@ -694,6 +699,9 @@ class Invoices extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->label = checkVal($request_data->label);
+
 		// Reset fk_parent_line for no child products and special product
 		if (($request_data->product_type != 9 && empty($request_data->fk_parent_line)) || $request_data->product_type == 9) {
 			$request_data->fk_parent_line = 0;
@@ -717,8 +725,8 @@ class Invoices extends DolibarrApi
 			$request_data->fk_code_ventilation,
 			$request_data->info_bits,
 			$request_data->fk_remise_except,
-			'HT',
-			0,
+			$request_data->price_base_type ? $request_data->price_base_type : 'HT',
+			$request_data->subprice,
 			$request_data->product_type,
 			$request_data->rang,
 			$request_data->special_code,
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index 1de8f0c480d..c52aeeb30e8 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -274,7 +274,12 @@ class Contracts extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->price_base_type = checkVal($request_data->price_base_type);
+
 		$updateRes = $this->contract->addline(
 			$request_data->desc,
 			$request_data->subprice,
@@ -286,7 +291,7 @@ class Contracts extends DolibarrApi
 			$request_data->remise_percent,
 			$request_data->date_start, // date_start = date planned start, date ouverture = date_start_real
 			$request_data->date_end, // date_end = date planned end, date_cloture = date_end_real
-			$request_data->HT,
+			$request_data->price_base_type ? $request_data->price_base_type : 'HT',
 			$request_data->subprice_excl_tax,
 			$request_data->info_bits,
 			$request_data->fk_fournprice,
@@ -330,6 +335,9 @@ class Contracts extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->price_base_type = checkVal($request_data->price_base_type);
+
 		$updateRes = $this->contract->updateline(
 			$lineid,
 			$request_data->desc,
@@ -343,7 +351,7 @@ class Contracts extends DolibarrApi
 			$request_data->localtax2_tx,
 			$request_data->date_ouverture,
 			$request_data->date_cloture,
-			'HT',
+			$request_data->price_base_type ? $request_data->price_base_type : 'HT',
 			$request_data->info_bits,
 			$request_data->fk_fourn_price,
 			$request_data->pa_ht,
@@ -426,8 +434,6 @@ class Contracts extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		// $request_data = (object) $request_data;
-
 		$updateRes = $this->contract->close_line(DolibarrApiAccess::$user, $lineid, $datestart, $comment);
 
 		if ($updateRes > 0) {
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 961790cc3bd..1d47921e423 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -275,7 +275,12 @@ class Shipments extends DolibarrApi
 		if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->label = checkVal($request_data->label);
+
 		$updateRes = $this->shipment->addline(
 						$request_data->desc,
 						$request_data->subprice,
@@ -338,7 +343,12 @@ class Shipments extends DolibarrApi
 		if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->label = checkVal($request_data->label);
+
 		$updateRes = $this->shipment->updateline(
 						$lineid,
 						$request_data->desc,
@@ -403,7 +413,6 @@ class Shipments extends DolibarrApi
 
 		// TODO Check the lineid $lineid is a line of ojbect
 
-		$request_data = (object) $request_data;
 		$updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
 		if ($updateRes > 0) {
 			return $this->get($id);
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 7321cb40625..a87ccf5bb1a 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -247,7 +247,12 @@ class ExpenseReports extends DolibarrApi
 		  if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
 			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 	  }
-			$request_data = (object) $request_data;
+
+	  $request_data = (object) $request_data;
+
+      $request_data->desc = checkVal($request_data->desc, 'restricthtml');
+	  $request_data->label = checkVal($request_data->label);
+
 	  $updateRes = $this->expensereport->addline(
 						$request_data->desc,
 						$request_data->subprice,
@@ -310,7 +315,12 @@ class ExpenseReports extends DolibarrApi
 		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->label = checkVal($request_data->label);
+
 		$updateRes = $this->expensereport->updateline(
 						$lineid,
 						$request_data->desc,
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index b9b541f0229..55518997d5e 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -546,8 +546,12 @@ class SupplierInvoices extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
 
+		$request_data->description = checkVal($request_data->description, 'restricthtml');
+		$request_data->ref_supplier = checkVal($request_data->ref_supplier);
+
 		$updateRes = $this->invoice->addline(
 			$request_data->description,
 			$request_data->pu_ht,
@@ -561,7 +565,7 @@ class SupplierInvoices extends DolibarrApi
 			$request_data->date_end,
 			$request_data->ventil,
 			$request_data->info_bits,
-			'HT',
+			$request_data->price_base_type ? $request_data->price_base_type : 'HT',
 			$request_data->product_type,
 			$request_data->rang,
 			false,
@@ -609,7 +613,12 @@ class SupplierInvoices extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->description = checkVal($request_data->description, 'restricthtml');
+		$request_data->ref_supplier = checkVal($request_data->ref_supplier);
+
 		$updateRes = $this->invoice->updateline(
 			$lineid,
 			$request_data->description,
@@ -619,7 +628,7 @@ class SupplierInvoices extends DolibarrApi
 			$request_data->localtax2_tx,
 			$request_data->qty,
 			$request_data->fk_product,
-			'HT',
+			$request_data->price_base_type ? $request_data->price_base_type : 'HT',
 			$request_data->info_bits,
 			$request_data->product_type,
 			$request_data->remise_percent,
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 6a08aa7a4bd..c5430b655b1 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -330,7 +330,11 @@ class Projects extends DolibarrApi
 		if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+
 		$updateRes = $this->project->addline(
 						$request_data->desc,
 						$request_data->subprice,
@@ -393,7 +397,11 @@ class Projects extends DolibarrApi
 		if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+
 		$updateRes = $this->project->updateline(
 						$lineid,
 						$request_data->desc,
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index cd6df68d590..2c3fd107d53 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -330,7 +330,11 @@ class Tasks extends DolibarrApi
 		if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+
 		$updateRes = $this->project->addline(
 						$request_data->desc,
 						$request_data->subprice,
@@ -393,7 +397,11 @@ class Tasks extends DolibarrApi
 		if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
+
 		$request_data = (object) $request_data;
+
+		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+
 		$updateRes = $this->project->updateline(
 						$lineid,
 						$request_data->desc,

From a8939377de03cf9b6a2aef22e2957a94b6fe5a01 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 19:31:19 +0200
Subject: [PATCH 284/928] Escape string

---
 htdocs/compta/bank/line.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 76f7f821f8a..c84f52ffee1 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -452,7 +452,7 @@ if ($result) {
 			}
 			print '</td>';
 		} else {
-			print '<td>'.$objp->fk_type.' '.$objp->num_chq.'</td>';
+			print '<td>'.$objp->fk_type.' '.dol_escape_htmltag($objp->num_chq).'</td>';
 		}
 		print "</tr>";
 
@@ -462,7 +462,7 @@ if ($result) {
 		print "</td>";
 		if ($user->rights->banque->modifier || $user->rights->banque->consolidate) {
 			print '<td>';
-			print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
+			print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : dol_escape_htmltag($objp->emetteur)).'">';
 			print '</td>';
 		} else {
 			print '<td>'.$objp->emetteur.'</td>';
@@ -475,10 +475,10 @@ if ($result) {
 		print "</td>";
 		if ($user->rights->banque->modifier || $user->rights->banque->consolidate) {
 			print '<td>';
-			print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
+			print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : dol_escape_htmltag($objp->banque)).'">';
 			print '</td>';
 		} else {
-			print '<td>'.$objp->banque.'</td>';
+			print '<td>'.dol_escape_htmltag($objp->banque).'</td>';
 		}
 		print "</tr>";
 
@@ -523,6 +523,7 @@ if ($result) {
 		print "</tr>";
 
 		// Description
+		$reg = array();
 		print "<tr><td>".$langs->trans("Label")."</td>";
 		if ($user->rights->banque->modifier || $user->rights->banque->consolidate) {
 			print '<td>';
@@ -531,7 +532,7 @@ if ($result) {
 				// Label generique car entre parentheses. On l'affiche en le traduisant
 				print $langs->trans($reg[1]);
 			} else {
-				print $objp->label;
+				print dol_escape_htmltag($objp->label);
 			}
 			print '">';
 			print '</td>';
@@ -541,7 +542,7 @@ if ($result) {
 				// Label generique car entre parentheses. On l'affiche en le traduisant
 				print $langs->trans($reg[1]);
 			} else {
-				print $objp->label;
+				print dol_escape_htmltag($objp->label);
 			}
 			print '</td>';
 		}

From 73c482ca646e4bbe6654ede71d8d77b6549dc419 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 19:36:48 +0200
Subject: [PATCH 285/928] Fix escape

---
 htdocs/compta/bank/bankentries_list.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 39967304e4c..0a9784fce75 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1606,7 +1606,8 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		// Balance
+
+		// Balance after
 		if (!empty($arrayfields['balance']['checked'])) {
 			if ($mode_balance_ok) {
 				if ($balance >= 0) {
@@ -1627,7 +1628,7 @@ if ($resql) {
 			// Transaction reconciliated or edit link
 			if ($bankaccount->canBeConciliated() > 0) {
 				if ($objp->num_releve) {
-					print '<a href="releve.php?num='.$objp->num_releve.'&account='.$objp->bankid.'&save_lastsearch_values=1">'.$objp->num_releve.'</a>';
+					print '<a href="releve.php?num='.urlencode($objp->num_releve).'&account='.urlencode($objp->bankid).'&save_lastsearch_values=1">'.dol_escape_htmltag($objp->num_releve).'</a>';
 				}
 				if (!$objp->conciliated && $action == 'reconcile') {
 					if ($objp->num_releve) {
@@ -1645,7 +1646,7 @@ if ($resql) {
 
 		if (!empty($arrayfields['b.conciliated']['checked'])) {
 			print '<td class="nowraponall" align="center">';
-			print $objp->conciliated ? $langs->trans("Yes") : $langs->trans("No");
+			print yn($objp->conciliated);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;

From d6ce4e1086f37f6b4e9f74e827b359d78f63a164 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 20:23:41 +0200
Subject: [PATCH 286/928] Allow option to restrict API endpoints

---
 htdocs/api/class/api_setup.class.php |  8 ++++----
 htdocs/api/index.php                 | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index ca716712189..ceaf5f8f7d8 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1631,8 +1631,8 @@ class Setup extends DolibarrApi
 		global $langs, $conf;
 
 		if (!DolibarrApiAccess::$user->admin
-			&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK)) {
-			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
+			&& (empty($conf->global->API_LOGINS_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGINS_ALLOWED_FOR_INTEGRITY_CHECK)) {
+			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_INTEGRITY_CHECK');
 		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -1937,8 +1937,8 @@ class Setup extends DolibarrApi
 		global $conf;
 
 		if (!DolibarrApiAccess::$user->admin
-			&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_GET_MODULES) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_GET_MODULES)) {
-			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGIN_ALLOWED_FOR_GET_MODULES');
+			&& (empty($conf->global->API_LOGINS_ALLOWED_FOR_GET_MODULES) || DolibarrApiAccess::$user->login != $conf->global->API_LOGINS_ALLOWED_FOR_GET_MODULES)) {
+			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_GET_MODULES');
 		}
 
 		sort($conf->modules);
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 241f33fd98a..7f5b3debbad 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -296,6 +296,29 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
 
 	$classname = ucwords($moduleobject);
 
+	// Test rules on endpoints. For example:
+	// $conf->global->API_ENDPOINT_RULES = 'endpoint1:1,endpoint2:1,...'
+	if (!empty($conf->global->API_ENDPOINT_RULES)) {
+		$listofendpoints = explode(',', $conf->global->API_ENDPOINT_RULES);
+		$endpointisallowed = false;
+
+		foreach($listofendpoints as $endpointrule) {
+			$tmparray = explode(':', $endpointrule);
+			if ($classfile == $tmparray[0] && $tmparray[1] == 1) {
+				$endpointisallowed = true;
+				break;
+			}
+		}
+
+		if (! $endpointisallowed) {
+			dol_syslog('The API with endpoint /'.$classfile.' is forbidden by config API_ENDPOINT_RULES', LOG_WARNING);
+			print 'The API with endpoint /'.$classfile.' is forbidden by config API_ENDPOINT_RULES';
+			header('HTTP/1.1 501 API is forbidden by API_ENDPOINT_RULES');
+			//session_destroy();
+			exit(0);
+		}
+	}
+
 	dol_syslog('Search api file /'.$moduledirforclass.'/class/api_'.$classfile.'.class.php => dir_part_file='.$dir_part_file.' classname='.$classname);
 
 	$res = false;

From 296d19ac8bf2fc21ff8c356cf5c107db71ff7c04 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 25 Apr 2021 18:25:32 +0000
Subject: [PATCH 287/928] Fixing style errors.

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

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 7f5b3debbad..c494730f795 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -302,7 +302,7 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
 		$listofendpoints = explode(',', $conf->global->API_ENDPOINT_RULES);
 		$endpointisallowed = false;
 
-		foreach($listofendpoints as $endpointrule) {
+		foreach ($listofendpoints as $endpointrule) {
 			$tmparray = explode(':', $endpointrule);
 			if ($classfile == $tmparray[0] && $tmparray[1] == 1) {
 				$endpointisallowed = true;

From d65554f5abf6cff6726757f7d70d895bfc6a71f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 20:27:53 +0200
Subject: [PATCH 288/928] Fix phpcs

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

diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index a87ccf5bb1a..027bb148b3c 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -250,7 +250,7 @@ class ExpenseReports extends DolibarrApi
 
 	  $request_data = (object) $request_data;
 
-      $request_data->desc = checkVal($request_data->desc, 'restricthtml');
+	  $request_data->desc = checkVal($request_data->desc, 'restricthtml');
 	  $request_data->label = checkVal($request_data->label);
 
 	  $updateRes = $this->expensereport->addline(

From bc0f220ee3f9787203cc7693465dc359fc390150 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 22:02:28 +0200
Subject: [PATCH 289/928] Fix web site

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

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 7e0f057e253..e70d88a3aa1 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -140,7 +140,7 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
 ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64

From c3d3b79315601ae80133086077e3138b1f68bae6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Apr 2021 22:11:57 +0200
Subject: [PATCH 290/928] Fix test on Local url

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

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index ff63ca251c3..9feddb6f7f5 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -155,7 +155,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 		// Deny some reserved host names
 		if (in_array($hosttocheck, array('metadata.google.internal'))) {
 			$info['http_code'] = 400;
-			$info['content'] = 'Error bad hostname (Used by Google metadata). This value for hostname is not allowed.';
+			$info['content'] = 'Error bad hostname '.$hosttocheck.' (Used by Google metadata). This value for hostname is not allowed.';
 			break;
 		}
 
@@ -197,10 +197,11 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 					$info['content'] = 'Error bad hostname IP (IP is a local IP defined into MAIN_SECURITY_SERVER_IP). Must be an external URL.';
 					break;
 				}
-			} else {				// Only local url allowed (dangerous, may allow to get metadata on server or make internal port scanning)
+			}
+			if ($localurl == 1) {	// Only local url allowed (dangerous, may allow to get metadata on server or make internal port scanning)
 				if (filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
 					$info['http_code'] = 400;
-					$info['content'] = 'Error bad hostname. Must be a local URL.';
+					$info['content'] = 'Error bad hostname '.$iptocheck.'. Must be a local URL.';
 					break;
 				}
 				if (!empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) && !in_array($iptocheck, explode(',', '127.0.0.1,::1,'.$conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP))) {
@@ -209,6 +210,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 					break;
 				}
 			}
+
 			// Common check (local and external)
 			if (in_array($iptocheck, array('100.100.100.200'))) {
 				$info['http_code'] = 400;

From 6b4ee56f101af761deb1360c58d0e10e6030a4e3 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Mon, 26 Apr 2021 08:40:24 +0200
Subject: [PATCH 291/928] fix missing backets

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

diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 2190bd7fc8d..03310c3f593 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -269,10 +269,10 @@ while ($i < min($num, $limit)) {
 
 	// Actions
 	print '<td class="nowrap right">';
-	if ($canedit)
+	if ($canedit) {
 		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
 	}
-	if ($candelete)
+	if ($candelete) {
 		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$obj->rowid.'">'.img_delete().'</a>';
 	} else {
 		print "&nbsp;";

From 04c97d26959e69e859f91b430cce7bf562ed6b32 Mon Sep 17 00:00:00 2001
From: Robin <yann.robin@batiactugroupe.com>
Date: Mon, 26 Apr 2021 09:05:47 +0200
Subject: [PATCH 292/928] FIX combo Prospect / Customers / Supplier in society
 list

---
 htdocs/core/class/html.formcompany.class.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 1569ee8af83..a23c5460b2d 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -971,6 +971,10 @@ class FormCompany extends Form
 	{
 
 		global $conf, $langs;
+		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && !empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->fournisseur->enabled))
+		{
+			return '' ;
+		}
 
 		$out = '<select class="flat '.$morecss.'" name="'.$htmlname.'" id="'.$htmlidname.'">';
 		if ($typeinput == 'form') {
@@ -993,7 +997,10 @@ class FormCompany extends Form
 			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
 				$out .= '<option value="1,3"'.($selected == '1,3' ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
 			}
-			$out .= '<option value="4"'.($selected == '4' ? ' selected' : '').'>'.$langs->trans('Supplier').'</option>';
+			if (!empty($conf->fournisseur->enabled))
+			{
+				$out .= '<option value="4"'.($selected == '4' ? ' selected' : '').'>'.$langs->trans('Supplier').'</option>';
+			}
 			$out .= '<option value="0"'.($selected == '0' ? ' selected' : '').'>'.$langs->trans('Other').'</option>';
 		} elseif ($typeinput == 'admin') {
 			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {

From ebd3b00016e3f299b23c93c119e6a01e2d60935b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 26 Apr 2021 07:24:00 +0000
Subject: [PATCH 293/928] Fixing style errors.

---
 htdocs/compta/facture/card.php               | 12 ++++++------
 htdocs/core/class/html.formcompany.class.php |  6 ++----
 htdocs/fichinter/list.php                    |  9 +++------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 05250ca3ab4..31cc5c3b6f3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -189,12 +189,12 @@ if (empty($reshook)) {
 		$objectutil->socid = $socid;
 		$result = $objectutil->createFromClone($user, $id);
 		if ($result > 0) {
-	   		header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
-	   		exit();
-	   	} else {
-	   		$langs->load("errors");
-	   		setEventMessages($object->error, $object->errors, 'errors');
-	   		$action = '';
+			header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
+			exit();
+		} else {
+			$langs->load("errors");
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = '';
 		}
 	} // Change status of invoice
 	elseif ($action == 'reopen' && $usercanreopen) {
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 3e898a83e7d..4fa2f87f636 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -1007,8 +1007,7 @@ class FormCompany extends Form
 	{
 
 		global $conf, $langs;
-		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && !empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->fournisseur->enabled))
-		{
+		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && !empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->fournisseur->enabled)) {
 			return '' ;
 		}
 
@@ -1035,8 +1034,7 @@ class FormCompany extends Form
 			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
 				$out .= '<option value="1,3"'.($selected == '1,3' ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
 			}
-			if (!empty($conf->fournisseur->enabled))
-			{
+			if (!empty($conf->fournisseur->enabled)) {
 				$out .= '<option value="4"'.($selected == '4' ? ' selected' : '').'>'.$langs->trans('Supplier').'</option>';
 			}
 			$out .= '<option value="0"'.($selected == '0' ? ' selected' : '').'>'.$langs->trans('Other').'</option>';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 165ccd11458..07dc55627d0 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -244,20 +244,17 @@ if (!empty($conf->projet->enabled)) {
 if (!empty($conf->contrat->enabled)) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contrat as c on f.fk_contrat = c.rowid";
 }
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
-{
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (f.rowid = ef.fk_object)";
 }
-if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines)
-{
+if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
 }
 // Add table from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-if (!$user->rights->societe->client->voir && empty($socid))
-{
+if (!$user->rights->societe->client->voir && empty($socid)) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";

From 676067eafcb8b4b41a65b82ac7e8f75d74848e7c Mon Sep 17 00:00:00 2001
From: Robin-Yann <80888891+Robin-Yann@users.noreply.github.com>
Date: Mon, 26 Apr 2021 10:21:25 +0200
Subject: [PATCH 294/928] Update card.php

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 31cc5c3b6f3..6995f1aaa22 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -196,7 +196,8 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
-	} // Change status of invoice
+	}
+	// Change status of invoice
 	elseif ($action == 'reopen' && $usercanreopen) {
 		$result = $object->fetch($id);
 

From c9d6bc70e82216ab59fdbf84397a4d772353bce1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Apr 2021 10:22:28 +0200
Subject: [PATCH 295/928] Clean code

---
 htdocs/comm/index.php           | 28 +++++++++++++++-------------
 htdocs/compta/index.php         |  3 +++
 htdocs/core/lib/invoice.lib.php | 16 +++++++++++-----
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 5c2360624a4..0100c98bc91 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -66,6 +66,8 @@ if ($user->socid > 0) {
 }
 restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
 
+$maxofloop = (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
+
 
 /*
  * Actions
@@ -129,14 +131,14 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 	if ($resql) {
 		$total = 0;
 		$num = $db->num_rows($resql);
-		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		$nbofloop = min($num, $maxofloop);
 		startSimpleTable("ProposalsDraft", "comm/propal/list.php", "search_status=".Propal::STATUS_DRAFT, 2, $num);
 
 		if ($num > 0) {
 			$i = 0;
 			$othernb = 0;
 
-			while ($i < $num && $i < $conf->liste_limit) {
+			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $max) {
@@ -181,7 +183,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 			if ($othernb) {
 				print '<tr class="oddeven">';
 				print '<td class="nowrap" colspan="5">';
-				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '<span class="opacitymedium">'.$langs->trans("More").'...'.($othernb < $maxofloop ? ' ('.$othernb.')' : '').'</span>';
 				print '</td>';
 				print "</tr>\n";
 			}
@@ -226,14 +228,14 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 	if ($resql) {
 		$total = 0;
 		$num = $db->num_rows($resql);
-		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		$nbofloop = min($num, $maxofloop);
 		startSimpleTable("SupplierProposalsDraft", "supplier_proposal/list.php", "search_status=".SupplierProposal::STATUS_DRAFT, 2, $num);
 
 		if ($num > 0) {
 			$i = 0;
 			$othernb = 0;
 
-			while ($i < $num && $i < $conf->liste_limit) {
+			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $max) {
@@ -277,7 +279,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 			if ($othernb) {
 				print '<tr class="oddeven">';
 				print '<td class="nowrap" colspan="5">';
-				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '<span class="opacitymedium">'.$langs->trans("More").'...'.($othernb < $maxofloop ? ' ('.$othernb.')' : '').'</span>';
 				print '</td>';
 				print "</tr>\n";
 			}
@@ -315,21 +317,21 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND c.fk_soc = ".$socid;
+		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
 
 	$resql = $db->query($sql);
 	if ($resql) {
 		$total = 0;
 		$num = $db->num_rows($resql);
-		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		$nbofloop = min($num, $maxofloop);
 		startSimpleTable("DraftOrders", "commande/list.php", "search_status=".Commande::STATUS_DRAFT, 2, $num);
 
 		if ($num > 0) {
 			$i = 0;
 			$othernb = 0;
 
-			while ($i < $num && $i < $conf->liste_limit) {
+			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $max) {
@@ -374,7 +376,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 			if ($othernb) {
 				print '<tr class="oddeven">';
 				print '<td class="nowrap" colspan="5">';
-				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '<span class="opacitymedium">'.$langs->trans("More").'...'.($othernb < $maxofloop ? ' ('.$othernb.')' : '').'</span>';
 				print '</td>';
 				print "</tr>\n";
 			}
@@ -419,14 +421,14 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	if ($resql) {
 		$total = 0;
 		$num = $db->num_rows($resql);
-		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		$nbofloop = min($num, $maxofloop);
 		startSimpleTable("DraftSuppliersOrders", "fourn/commande/list.php", "search_status=".CommandeFournisseur::STATUS_DRAFT, 2, $num);
 
 		if ($num > 0) {
 			$i = 0;
 			$othernb = 0;
 
-			while ($i < $num && $i < $conf->liste_limit) {
+			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $max) {
@@ -471,7 +473,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			if ($othernb) {
 				print '<tr class="oddeven">';
 				print '<td class="nowrap" colspan="5">';
-				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '<span class="opacitymedium">'.$langs->trans("More").'...'.($othernb < $maxofloop ? ' ('.$othernb.')' : '').'</span>';
 				print '</td>';
 				print "</tr>\n";
 			}
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index aeaf1598e99..cbe9f7e0a42 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -75,6 +75,9 @@ $maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->globa
 $hookmanager->initHooks(array('invoiceindex'));
 
 
+$maxofloop = (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
+
+
 /*
  * Actions
  */
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index b3a9ed7b453..4d2286c21ac 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -465,6 +465,8 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 {
 	global $conf, $db, $langs, $user, $hookmanager;
 
+	$maxofloop = (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
+
 	$result = '';
 	$tmpinvoice = new Facture($db);
 
@@ -488,7 +490,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 	}
 
 	if ($socid) {
-		$sql .= " AND f.fk_soc = $socid";
+		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 	// Add where from hooks
 	$parameters = array();
@@ -511,6 +513,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 
 	if ($resql) {
 		$num = $db->num_rows($resql);
+		$nbofloop = min($num, $maxofloop);
 
 		$result .= '<div class="div-table-responsive-no-min">';
 		$result .= '<table class="noborder centpercent">';
@@ -530,7 +533,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 			$i = 0;
 			$othernb = 0;
 			$tot_ttc = 0;
-			while ($i < $num) {
+			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $maxCount) {
@@ -577,7 +580,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 			if ($othernb) {
 				$result .= '<tr class="oddeven">';
 				$result .= '<td class="nowrap" colspan="3">';
-				$result .= '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				$result .= '<span class="opacitymedium">'.$langs->trans("More").'...'.($othernb < $maxofloop ? ' ('.$othernb.')' : '').'</span>';
 				$result .= '</td>';
 				$result .= "</tr>\n";
 			}
@@ -608,6 +611,8 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 {
 	global $conf, $db, $langs, $user, $hookmanager;
 
+	$maxofloop = (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
+
 	$result = '';
 	$facturesupplierstatic = new FactureFournisseur($db);
 
@@ -637,6 +642,7 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 
 	if ($resql) {
 		$num = $db->num_rows($resql);
+		$nbofloop = min($num, $maxofloop);
 
 		$result .= '<div class="div-table-responsive-no-min">';
 		$result .= '<table class="noborder centpercent">';
@@ -656,7 +662,7 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 			$i = 0;
 			$othernb = 0;
 			$tot_ttc = 0;
-			while ($i < $num) {
+			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $maxCount) {
@@ -702,7 +708,7 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 			if ($othernb) {
 				$result .= '<tr class="oddeven">';
 				$result .= '<td class="nowrap" colspan="3">';
-				$result .= '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				$result .= '<span class="opacitymedium">'.$langs->trans("More").'...'.($othernb < $maxofloop ? ' ('.$othernb.')' : '').'</span>';
 				$result .= '</td>';
 				$result .= "</tr>\n";
 			}

From ae1586fcc6c9601b7d54a4740d45bc2649cb1f86 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 26 Apr 2021 10:48:50 +0200
Subject: [PATCH 296/928] FIX : We must not be able to delete sociale charge,
 vat or salary if there are payments

---
 htdocs/compta/sociales/card.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 0f38181e284..7454f61f6de 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -134,12 +134,17 @@ if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
 // Delete social contribution
 if ($action == 'confirm_delete' && $confirm == 'yes') {
 	$object->fetch($id);
-	$result = $object->delete($user);
-	if ($result > 0) {
-		header("Location: list.php");
-		exit;
+	$totalpaye = $object->getSommePaiement();
+	if (empty($totalpaye)) {
+		$result = $object->delete($user);
+		if ($result > 0) {
+			header("Location: list.php");
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
+		setEventMessages($langs->trans('DisabledBecausePayments'), null, 'errors');
 	}
 }
 
@@ -771,8 +776,10 @@ if ($id > 0) {
 			}
 
 			// Delete
-			if ($user->rights->tax->charges->supprimer) {
+			if ($user->rights->tax->charges->supprimer && empty($totalpaye)) {
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
+			} else {
+				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("DisabledBecausePayments"))).'">'.$langs->trans("Delete").'</a></div>';
 			}
 
 			print "</div>";

From 39200501861e33edc02ad56296375fd49ee41398 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 26 Apr 2021 11:35:33 +0200
Subject: [PATCH 297/928] FIX : useless column

---
 htdocs/salaries/payment_salary/card.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index ae711719585..5f05c1d98b7 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -195,7 +195,6 @@ if ($resql) {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Salary').'</td>';
-	print '<td>'.$langs->trans('Type').'</td>';
 	print '<td>'.$langs->trans('Label').'</td>';
 	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
 	print '<td class="center">'.$langs->trans('Status').'</td>';
@@ -212,11 +211,6 @@ if ($resql) {
 			$salary->fetch($objp->scid);
 			print $salary->getNomUrl(1);
 			print "</td>\n";
-			// Type
-			print '<td>';
-			print $salary->type_label;
-			/*print $salary->type;*/
-			print "</td>\n";
 			// Label
 			print '<td>'.$objp->label.'</td>';
 			// Expected to pay

From 87393cee9848e153ae5da67f28bcb5f6193ed609 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Apr 2021 11:59:47 +0200
Subject: [PATCH 298/928] Clean code

---
 htdocs/comm/index.php                         |   7 +
 htdocs/comm/propal/index.php                  | 122 +---------------
 htdocs/commande/index.php                     | 110 +-------------
 .../boxes/box_graph_product_distribution.php  |  13 +-
 htdocs/core/class/dolgraph.class.php          |  25 +++-
 htdocs/core/lib/invoice.lib.php               |   6 +-
 htdocs/core/lib/order.lib.php                 | 132 +++++++++++++++++
 htdocs/core/lib/propal.lib.php                | 138 ++++++++++++++++++
 8 files changed, 320 insertions(+), 233 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 0100c98bc91..0a39e596ba3 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -37,6 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager = new HookManager($db);
@@ -102,6 +104,11 @@ print load_fiche_titre($langs->trans("CommercialArea"), '', 'commercial');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
+print getCustomerProposalPieChart($socid);
+print '<br>';
+print getCustomerOrderPieChart($socid);
+print '<br>';
+
 /*
  * Draft customer proposals
  */
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 445fd9b5773..359084ddabe 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -28,6 +28,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager = new HookManager($db);
@@ -45,6 +46,7 @@ if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
+
 restrictedArea($user, 'propal');
 
 
@@ -65,124 +67,8 @@ print load_fiche_titre($langs->trans("ProspectionArea"), '', 'propal');
 print '<div class="fichecenter">';
 print '<div class="fichethirdleft">';
 
-/*
- * Statistics
- */
-
-$listofstatus = array(Propal::STATUS_DRAFT, Propal::STATUS_VALIDATED, Propal::STATUS_SIGNED, Propal::STATUS_NOTSIGNED, Propal::STATUS_BILLED);
-
-$sql = "SELECT count(p.rowid) as nb, p.fk_statut as status";
-$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql .= ", ".MAIN_DB_PREFIX."propal as p";
-if (!$user->rights->societe->client->voir && !$socid) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
-$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
-$sql .= " AND p.fk_soc = s.rowid";
-if ($user->socid) {
-	$sql .= ' AND p.fk_soc = '.$user->socid;
-}
-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 (".$db->sanitize(implode(" ,", $listofstatus)).")";
-$sql .= " GROUP BY p.fk_statut";
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-	$i = 0;
-	$total = 0;
-	$totalinprocess = 0;
-	$dataseries = array();
-	$colorseries = array();
-	$vals = array();
-
-	while ($i < $num) {
-		$obj = $db->fetch_object($resql);
-		if ($obj) {
-			$vals[$obj->status] = $obj->nb;
-			$totalinprocess += $obj->nb;
-
-			$total += $obj->nb;
-		}
-		$i++;
-	}
-	$db->free($resql);
-
-	include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder nohover centpercent">';
-
-	print '<tr class="liste_titre">';
-	print '<td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Proposals").'</td>';
-	print '</tr>';
-
-	foreach ($listofstatus as $status) {
-		$dataseries[] = array($propalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-		if ($status == Propal::STATUS_DRAFT) {
-			$colorseries[$status] = '-'.$badgeStatus0;
-		}
-		if ($status == Propal::STATUS_VALIDATED) {
-			$colorseries[$status] = $badgeStatus1;
-		}
-		if ($status == Propal::STATUS_SIGNED) {
-			$colorseries[$status] = $badgeStatus4;
-		}
-		if ($status == Propal::STATUS_NOTSIGNED) {
-			$colorseries[$status] = $badgeStatus9;
-		}
-		if ($status == Propal::STATUS_BILLED) {
-			$colorseries[$status] = $badgeStatus6;
-		}
-
-		if (empty($conf->use_javascript_ajax)) {
-			print '<tr class="oddeven">';
-			print '<td>'.$propalstatic->LibStatut($status, 0).'</td>';
-			print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
-			print "</tr>\n";
-		}
-	}
-
-	if ($conf->use_javascript_ajax) {
-		print '<tr>';
-		print '<td align="center" colspan="2">';
-
-		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-		$dolgraph = new DolGraph();
-		$dolgraph->SetData($dataseries);
-		$dolgraph->SetDataColor(array_values($colorseries));
-		$dolgraph->setShowLegend(2);
-		$dolgraph->setShowPercent(1);
-		$dolgraph->SetType(array('pie'));
-		$dolgraph->setHeight('200');
-		$dolgraph->draw('idgraphthirdparties');
-		print $dolgraph->show($total ? 0 : 1);
-
-		print '</td>';
-		print '</tr>';
-	}
-
-	//if ($totalinprocess != $total)
-	//{
-	//	print '<tr class="liste_total">';
-	//	print '<td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td>';
-	//	print '<td class="right">'.$totalinprocess.'</td>';
-	//	print '</tr>';
-	//}
-
-	print '<tr class="liste_total">';
-	print '<td>'.$langs->trans("Total").'</td>';
-	print '<td class="right">'.$total.'</td>';
-	print '</tr>';
-
-	print '</table>';
-	print '</div>';
-	print '<br>';
-} else {
-	dol_print_error($db);
-}
-
+print getCustomerProposalPieChart($socid);
+print '<br>';
 
 /*
  * Draft proposals
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index dc15b85525c..48f1f600126 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 
 if (!$user->rights->commande->lire) {
 	accessforbidden();
@@ -76,113 +77,8 @@ print load_fiche_titre($langs->trans("OrdersArea"), '', 'order');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-/*
- * Statistics
- */
-
-$sql = "SELECT count(c.rowid) as nb, c.fk_statut as status";
-$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql .= ", ".MAIN_DB_PREFIX."commande as c";
-if (!$user->rights->societe->client->voir && !$socid) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
-$sql .= " WHERE c.fk_soc = s.rowid";
-$sql .= " AND c.entity IN (".getEntity('societe').")";
-if ($user->socid) {
-	$sql .= ' AND c.fk_soc = '.$user->socid;
-}
-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";
-
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$total = 0;
-	$totalinprocess = 0;
-	$dataseries = array();
-	$colorseries = array();
-	$vals = array();
-	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
-	while ($i < $num) {
-		$row = $db->fetch_row($resql);
-		if ($row) {
-			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
-			{
-			if (!isset($vals[$row[1]])) {
-				$vals[$row[1]] = 0;
-			}
-				$vals[$row[1]] += $row[0];
-				$totalinprocess += $row[0];
-			}
-			$total += $row[0];
-		}
-		$i++;
-	}
-	$db->free($resql);
-
-	include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder nohover centpercent">';
-	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</th></tr>'."\n";
-	$listofstatus = array(0, 1, 2, 3, -1);
-	foreach ($listofstatus as $status) {
-		$dataseries[] = array($commandestatic->LibStatut($status, 0, 1, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-		if ($status == Commande::STATUS_DRAFT) {
-			$colorseries[$status] = '-'.$badgeStatus0;
-		}
-		if ($status == Commande::STATUS_VALIDATED) {
-			$colorseries[$status] = $badgeStatus1;
-		}
-		if ($status == Commande::STATUS_SHIPMENTONPROCESS) {
-			$colorseries[$status] = $badgeStatus4;
-		}
-		if ($status == Commande::STATUS_CLOSED && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
-			$colorseries[$status] = $badgeStatus6;
-		}
-		if ($status == Commande::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
-			$colorseries[$status] = $badgeStatus6;
-		}
-		if ($status == Commande::STATUS_CANCELED) {
-			$colorseries[$status] = $badgeStatus9;
-		}
-
-		if (empty($conf->use_javascript_ajax)) {
-			print '<tr class="oddeven">';
-			print '<td>'.$commandestatic->LibStatut($status, 0, 0, 1).'</td>';
-			print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).' ';
-			print $commandestatic->LibStatut($status, 0, 3, 1);
-			print '</a></td>';
-			print "</tr>\n";
-		}
-	}
-	if ($conf->use_javascript_ajax) {
-		print '<tr class="impair"><td align="center" colspan="2">';
-
-		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-		$dolgraph = new DolGraph();
-		$dolgraph->SetData($dataseries);
-		$dolgraph->SetDataColor(array_values($colorseries));
-		$dolgraph->setShowLegend(2);
-		$dolgraph->setShowPercent(1);
-		$dolgraph->SetType(array('pie'));
-		$dolgraph->setHeight('200');
-		$dolgraph->draw('idgraphstatus');
-		print $dolgraph->show($total ? 0 : 1);
-
-		print '</td></tr>';
-	}
-
-	//if ($totalinprocess != $total)
-	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
-	print "</table></div><br>";
-} else {
-	dol_print_error($db);
-}
+print getCustomerOrderPieChart($socid);
+print '<br>';
 
 
 /*
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 4a88617de4e..c9ab7372c4c 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -149,8 +149,8 @@ class box_graph_product_distribution extends ModeleBoxes
 		$socid = empty($user->socid) ? 0 : $user->socid;
 		$userid = 0; // No filter on user creation
 
-		$WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '160' : '320';
-		$HEIGHT = '192';
+		$WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '300' : '320';
+		$HEIGHT = '120';
 
 		if (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire)) {
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
@@ -177,6 +177,7 @@ class box_graph_product_distribution extends ModeleBoxes
 					$i = 0;
 					$legend = array();
 
+					// Truncate length of legend
 					foreach ($data2 as $key => $val) {
 						$data2[$key][0] = dol_trunc($data2[$key][0], 32);
 						$legend[] = $data2[$key][0];
@@ -194,7 +195,7 @@ class box_graph_product_distribution extends ModeleBoxes
 					$px2->setShowPointValue($showpointvalue);
 					$px2->setShowPercent(0);
 					$px2->SetMaxValue($px2->GetCeilMaxValue());
-					//$px2->SetWidth($WIDTH);
+					$px2->SetWidth($WIDTH);
 					$px2->SetHeight($HEIGHT);
 					//$px2->SetYLabel($langs->trans("AmountOfBillsHT"));
 					$px2->SetShading(3);
@@ -236,6 +237,7 @@ class box_graph_product_distribution extends ModeleBoxes
 					$i = 0;
 					$legend = array();
 
+					// Truncate length of legend
 					foreach ($data3 as $key => $val) {
 						$data3[$key][0] = dol_trunc($data3[$key][0], 32);
 						$legend[] = $data3[$key][0];
@@ -253,7 +255,7 @@ class box_graph_product_distribution extends ModeleBoxes
 					$px3->setShowPointValue($showpointvalue);
 					$px3->setShowPercent(0);
 					$px3->SetMaxValue($px3->GetCeilMaxValue());
-					//$px3->SetWidth($WIDTH);
+					$px3->SetWidth($WIDTH);
 					$px3->SetHeight($HEIGHT);
 					//$px3->SetYLabel($langs->trans("AmountOfBillsHT"));
 					$px3->SetShading(3);
@@ -296,6 +298,7 @@ class box_graph_product_distribution extends ModeleBoxes
 					$i = 0;
 					$legend = array();
 
+					// Truncate length of legend
 					foreach ($data1 as $key => $val) {
 						$data1[$key][0] = dol_trunc($data1[$key][0], 32);
 						$legend[] = $data1[$key][0];
@@ -313,7 +316,7 @@ class box_graph_product_distribution extends ModeleBoxes
 					$px1->setShowPointValue($showpointvalue);
 					$px1->setShowPercent(0);
 					$px1->SetMaxValue($px1->GetCeilMaxValue());
-					//$px1->SetWidth($WIDTH);
+					$px1->SetWidth($WIDTH);
 					$px1->SetHeight($HEIGHT);
 					//$px1->SetYLabel($langs->trans("NumberOfBills"));
 					$px1->SetShading(3);
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 31c230f8d78..7eecea00ff6 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1165,9 +1165,32 @@ class DolGraph
 				if (!empty($legendMaxLines)) {
 					$this->stringtoshow .= ', maxLines: ' . $legendMaxLines . '';
 				}
+				/* This has no effect on chartjs version with dol v14
+				$this->stringtoshow .= ', labels: {
+					color: \'rgb(255, 0, 0)\',
+					// This more specific font property overrides the global property
+					font: {
+						size: 24
+					}
+				}';
+				*/
 				$this->stringtoshow .= ' }, ' . "\n";
 			}
 
+			/* This has no effect on chartjs version with dol v14
+			$this->stringtoshow .= 'plugins: {
+				legend: {
+					display: true,
+					labels: {
+						color: \'rgb(255, 0, 0)\',
+						// This more specific font property overrides the global property
+						font: {
+							size: 24
+						}
+					}
+				}
+			},'."\n"; */
+
 			if ($this->type[$firstlot] == 'piesemicircle') {
 				$this->stringtoshow .= 'circumference: Math.PI,' . "\n";
 				$this->stringtoshow .= 'rotation: -Math.PI,' . "\n";
@@ -1236,7 +1259,7 @@ class DolGraph
 				if ($i > 0) {
 					$this->stringtoshow .= ', ';
 				}
-				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 32)) . "'";
+				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 22)) . "'";
 				$i++;
 			}
 
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 4d2286c21ac..ece491d2c69 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -315,7 +315,8 @@ function getCustomerInvoicePieChart($socid = 0)
 		$dolgraph->setShowLegend(2);
 		$dolgraph->setShowPercent(1);
 		$dolgraph->SetType(['pie']);
-		$dolgraph->setHeight('200');
+		$dolgraph->setHeight('150');
+		$dolgraph->setWidth('300');
 		$dolgraph->draw('idgraphcustomerinvoices');
 
 		$result .= '<tr>';
@@ -435,7 +436,8 @@ function getPurchaseInvoicePieChart($socid = 0)
 		$dolgraph->setShowLegend(2);
 		$dolgraph->setShowPercent(1);
 		$dolgraph->SetType(['pie']);
-		$dolgraph->setHeight('200');
+		$dolgraph->setHeight('150');
+		$dolgraph->setWidth('300');
 		$dolgraph->draw('idgraphpurchaseinvoices');
 
 		$result .= '<tr>';
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 2bd8707f86b..5936c63d2c3 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -171,3 +171,135 @@ function order_admin_prepare_head()
 
 	return $head;
 }
+
+
+
+/**
+ * Return a HTML table that contains a pie chart of customer orders
+ *
+ * @param	int		$socid		(Optional) Show only results from the customer with this id
+ * @return	string				A HTML table that contains a pie chart of customer invoices
+ */
+function getCustomerOrderPieChart($socid = 0)
+{
+	global $conf, $db, $langs, $user;
+
+	$result = '';
+
+	if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) {
+		return '';
+	}
+
+	$commandestatic = new Commande($db);
+
+	/*
+	 * Statistics
+	 */
+
+	$sql = "SELECT count(c.rowid) as nb, c.fk_statut as status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".MAIN_DB_PREFIX."commande as c";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
+	$sql .= " WHERE c.fk_soc = s.rowid";
+	$sql .= " AND c.entity IN (".getEntity('societe').")";
+	if ($user->socid) {
+		$sql .= ' AND c.fk_soc = '.$user->socid;
+	}
+	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";
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		$total = 0;
+		$totalinprocess = 0;
+		$dataseries = array();
+		$colorseries = array();
+		$vals = array();
+		// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
+		while ($i < $num) {
+			$row = $db->fetch_row($resql);
+			if ($row) {
+				//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
+				{
+					if (!isset($vals[$row[1]])) {
+						$vals[$row[1]] = 0;
+					}
+					$vals[$row[1]] += $row[0];
+					$totalinprocess += $row[0];
+				}
+				$total += $row[0];
+			}
+			$i++;
+		}
+		$db->free($resql);
+
+		include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+
+		$result = '<div class="div-table-responsive-no-min">';
+		$result .= '<table class="noborder nohover centpercent">';
+		$result .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</th></tr>'."\n";
+		$listofstatus = array(0, 1, 2, 3, -1);
+		foreach ($listofstatus as $status) {
+			$dataseries[] = array($commandestatic->LibStatut($status, 0, 1, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			if ($status == Commande::STATUS_DRAFT) {
+				$colorseries[$status] = '-'.$badgeStatus0;
+			}
+			if ($status == Commande::STATUS_VALIDATED) {
+				$colorseries[$status] = $badgeStatus1;
+			}
+			if ($status == Commande::STATUS_SHIPMENTONPROCESS) {
+				$colorseries[$status] = $badgeStatus4;
+			}
+			if ($status == Commande::STATUS_CLOSED && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
+				$colorseries[$status] = $badgeStatus6;
+			}
+			if ($status == Commande::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+				$colorseries[$status] = $badgeStatus6;
+			}
+			if ($status == Commande::STATUS_CANCELED) {
+				$colorseries[$status] = $badgeStatus9;
+			}
+
+			if (empty($conf->use_javascript_ajax)) {
+				$result .= '<tr class="oddeven">';
+				$result .= '<td>'.$commandestatic->LibStatut($status, 0, 0, 1).'</td>';
+				$result .= '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).' ';
+				$result .= $commandestatic->LibStatut($status, 0, 3, 1);
+				$result .= '</a></td>';
+				$result .= "</tr>\n";
+			}
+		}
+		if ($conf->use_javascript_ajax) {
+			$result .= '<tr class="impair"><td align="center" colspan="2">';
+
+			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+			$dolgraph = new DolGraph();
+			$dolgraph->SetData($dataseries);
+			$dolgraph->SetDataColor(array_values($colorseries));
+			$dolgraph->setShowLegend(2);
+			$dolgraph->setShowPercent(1);
+			$dolgraph->SetType(array('pie'));
+			$dolgraph->setHeight('150');
+			$dolgraph->setWidth('300');
+			$dolgraph->draw('idgraphstatus');
+			$result .= $dolgraph->show($total ? 0 : 1);
+
+			$result .= '</td></tr>';
+		}
+
+		//if ($totalinprocess != $total)
+		$result .= '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
+		$result .= "</table></div><br>";
+	} else {
+		dol_print_error($db);
+	}
+
+	return $result;
+}
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 3ddd3ab1b2b..38589c9e610 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -152,3 +152,141 @@ function propal_admin_prepare_head()
 
 	return $head;
 }
+
+
+
+/**
+ * Return a HTML table that contains a pie chart of customer proposals
+ *
+ * @param	int		$socid		(Optional) Show only results from the customer with this id
+ * @return	string				A HTML table that contains a pie chart of customer invoices
+ */
+function getCustomerProposalPieChart($socid = 0)
+{
+	global $conf, $db, $langs, $user;
+
+	$result= '';
+
+	if (empty($conf->propal->enabled) || empty($user->rights->propal->lire)) {
+		return '';
+	}
+
+	$listofstatus = array(Propal::STATUS_DRAFT, Propal::STATUS_VALIDATED, Propal::STATUS_SIGNED, Propal::STATUS_NOTSIGNED, Propal::STATUS_BILLED);
+
+	$propalstatic = new Propal($db);
+
+	$sql = "SELECT count(p.rowid) as nb, p.fk_statut as status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
+	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
+	$sql .= " AND p.fk_soc = s.rowid";
+	if ($user->socid) {
+		$sql .= ' AND p.fk_soc = '.$user->socid;
+	}
+	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 (".$db->sanitize(implode(" ,", $listofstatus)).")";
+	$sql .= " GROUP BY p.fk_statut";
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		$total = 0;
+		$totalinprocess = 0;
+		$dataseries = array();
+		$colorseries = array();
+		$vals = array();
+
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+			if ($obj) {
+				$vals[$obj->status] = $obj->nb;
+				$totalinprocess += $obj->nb;
+
+				$total += $obj->nb;
+			}
+			$i++;
+		}
+		$db->free($resql);
+
+		include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+
+		$result = '<div class="div-table-responsive-no-min">';
+		$result .= '<table class="noborder nohover centpercent">';
+
+		$result .=  '<tr class="liste_titre">';
+		$result .=  '<td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Proposals").'</td>';
+		$result .=  '</tr>';
+
+		foreach ($listofstatus as $status) {
+			$dataseries[] = array($propalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			if ($status == Propal::STATUS_DRAFT) {
+				$colorseries[$status] = '-'.$badgeStatus0;
+			}
+			if ($status == Propal::STATUS_VALIDATED) {
+				$colorseries[$status] = $badgeStatus1;
+			}
+			if ($status == Propal::STATUS_SIGNED) {
+				$colorseries[$status] = $badgeStatus4;
+			}
+			if ($status == Propal::STATUS_NOTSIGNED) {
+				$colorseries[$status] = $badgeStatus9;
+			}
+			if ($status == Propal::STATUS_BILLED) {
+				$colorseries[$status] = $badgeStatus6;
+			}
+
+			if (empty($conf->use_javascript_ajax)) {
+				$result .=  '<tr class="oddeven">';
+				$result .=  '<td>'.$propalstatic->LibStatut($status, 0).'</td>';
+				$result .=  '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
+				$result .=  "</tr>\n";
+			}
+		}
+
+		if ($conf->use_javascript_ajax) {
+			$result .=  '<tr>';
+			$result .=  '<td align="center" colspan="2">';
+
+			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+			$dolgraph = new DolGraph();
+			$dolgraph->SetData($dataseries);
+			$dolgraph->SetDataColor(array_values($colorseries));
+			$dolgraph->setShowLegend(2);
+			$dolgraph->setShowPercent(1);
+			$dolgraph->SetType(array('pie'));
+			$dolgraph->setHeight('150');
+			$dolgraph->setWidth('300');
+			$dolgraph->draw('idgraphthirdparties');
+			$result .=  $dolgraph->show($total ? 0 : 1);
+
+			$result .=  '</td>';
+			$result .=  '</tr>';
+		}
+
+		//if ($totalinprocess != $total)
+		//{
+		//	print '<tr class="liste_total">';
+			//	print '<td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td>';
+			//	print '<td class="right">'.$totalinprocess.'</td>';
+		//	print '</tr>';
+		//}
+
+		$result .=  '<tr class="liste_total">';
+		$result .=  '<td>'.$langs->trans("Total").'</td>';
+		$result .=  '<td class="right">'.$total.'</td>';
+		$result .=  '</tr>';
+
+		$result .=  '</table>';
+		$result .=  '</div>';
+		$result .=  '<br>';
+	} else {
+		dol_print_error($db);
+	}
+
+	return $result;
+}

From 5ef22327a2b31ca4d838ddaf0d2ac9edf9ba5b82 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 26 Apr 2021 12:29:17 +0200
Subject: [PATCH 299/928] FIX : last modif date for salary

---
 htdocs/salaries/class/salary.class.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 94ede5d7a4d..e3dbb9b735d 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -589,7 +589,7 @@ class Salary extends CommonObject
 	 */
 	public function info($id)
 	{
-		$sql = 'SELECT ps.rowid, ps.datec, ps.fk_user_author';
+		$sql = 'SELECT ps.rowid, ps.datec, ps.tms, ps.fk_user_author, ps.fk_user_modif';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'salary as ps';
 		$sql .= ' WHERE ps.rowid = '.((int) $id);
 
@@ -605,7 +605,14 @@ class Salary extends CommonObject
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
+
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
 				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
 		} else {

From c1f3626cd707bf6b840d74686c4604fdf632a02c Mon Sep 17 00:00:00 2001
From: Robin-Yann <80888891+Robin-Yann@users.noreply.github.com>
Date: Mon, 26 Apr 2021 14:11:24 +0200
Subject: [PATCH 300/928] Update card.php

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6995f1aaa22..31cc5c3b6f3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -196,8 +196,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
-	}
-	// Change status of invoice
+	} // Change status of invoice
 	elseif ($action == 'reopen' && $usercanreopen) {
 		$result = $object->fetch($id);
 

From 9fc0416664f9ee0b9853e03d80af538405d93808 Mon Sep 17 00:00:00 2001
From: Robin-Yann <80888891+Robin-Yann@users.noreply.github.com>
Date: Mon, 26 Apr 2021 14:28:43 +0200
Subject: [PATCH 301/928] Update card.php

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 31cc5c3b6f3..2a9eb338b82 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -182,7 +182,8 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd)
+	{
 		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
 
 		$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));

From 6387b929cc1ca9e329b1abe67c2a8e5c74a75a03 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 26 Apr 2021 12:30:44 +0000
Subject: [PATCH 302/928] Fixing style errors.

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 2a9eb338b82..31cc5c3b6f3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -182,8 +182,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd)
-	{
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
 		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
 
 		$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));

From 14baec95dcf99a09756a02fe3ed96a89058b6388 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Apr 2021 15:44:24 +0200
Subject: [PATCH 303/928] Clean code

---
 htdocs/core/lib/invoice2.lib.php                          | 2 +-
 scripts/accountancy/export-thirdpartyaccount.php          | 8 ++++----
 scripts/bank/export-bank-receipts.php                     | 4 ++--
 .../email_expire_services_to_representatives.php          | 1 +
 scripts/emailings/mailing-send.php                        | 7 +++----
 scripts/emailings/reset-invalid-emails.php                | 8 ++++----
 scripts/product/regenerate_thumbs.php                     | 3 +--
 scripts/withdrawals/build_withdrawal_file.php             | 3 +--
 8 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index c5e2aeb0a16..64365f32547 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  * @param	int			$regenerate				''=Use existing PDF files, 'nameofpdf'=Regenerate all PDF files using the template
  * @param	string		$filesuffix				Suffix to add into file name of generated PDF
  * @param	string		$paymentbankid			Only if payment on this bank account id
- * @param	array		$thirdpartiesid			List of thirdparties id when using filter excludethirdpartiesid	or onlythirdpartiesid
+ * @param	array		$thirdpartiesid			List of thirdparties id when using filter=excludethirdpartiesid	or filter=onlythirdpartiesid
  * @param	string		$fileprefix				Prefix to add into filename of generated PDF
  * @return	int									Error code
  */
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index 519ab534cc6..6df1f5ca4b8 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -138,8 +138,8 @@ if (!empty($date_start) && !empty($date_end)) {
 	$sql .= " AND f.datec >= '".$db->idate($date_start)."' AND f.datec <= '".$db->idate($date_end)."'";
 }
 $sql .= " AND f.entity IN (".getEntity('invoice', 0).")";
-if ($socid) {
-	$sql .= " AND f.fk_soc = ".$socid;
+if ($socid > 0) {
+	$sql .= " AND f.fk_soc = ".((int) $socid);
 }
 $sql .= " GROUP BY name";
 $sql .= ")";
@@ -154,8 +154,8 @@ if (!empty($date_start) && !empty($date_end)) {
 	$sql .= " AND ff.datec >= '".$db->idate($date_start)."' AND ff.datec <= '".$db->idate($date_end)."'";
 }
 $sql .= " AND ff.entity = ".$conf->entity;
-if ($socid) {
-	$sql .= " AND f.fk_soc = ".$socid;
+if ($socid > 0) {
+	$sql .= " AND f.fk_soc = ".((int) $socid);
 }
 $sql .= " GROUP BY name";
 $sql .= ")";
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index a3876cb146f..d9876ca008c 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -168,9 +168,9 @@ $sql .= " b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
 $sql .= " ba.rowid as bankid, ba.ref as bankref, ba.label as banklabel";
 $sql .= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 $sql .= ", ".MAIN_DB_PREFIX."bank as b";
-$sql .= " WHERE b.fk_account = ".$acct->id;
+$sql .= " WHERE b.fk_account = ".((int) $acct->id);
 if ($listofnum) {
-	$sql .= " AND b.num_releve IN (".$listofnum.")";
+	$sql .= " AND b.num_releve IN (".$db->sanitize($listofnum, 1).")";
 }
 if (!isset($num)) {
 	$sql .= " OR b.num_releve is null";
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index 316994752e5..8b94151b90f 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -93,6 +93,7 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 	$oldemail = 'none';
+	$oldsalerepresentative = '';
 	$olduid = 0;
 	$oldlang = '';
 	$total = 0;
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 00ae2d64479..44b8ade0c62 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -25,7 +25,6 @@
  * \ingroup mailing
  * \brief 	Script to send a prepared and validated emaling from command line
  */
-
 if (!defined('NOSESSION')) {
 	define('NOSESSION', '1');
 }
@@ -98,7 +97,7 @@ $sql = "SELECT m.rowid";
 $sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
 $sql .= " WHERE m.statut IN (1,2)";
 if ($id != 'all') {
-	$sql .= " AND m.rowid= ".$id;
+	$sql .= " AND m.rowid= ".((int) $id);
 	$sql .= " LIMIT 1";
 }
 
@@ -144,7 +143,7 @@ if ($resql) {
 			} elseif ($conf->global->MAILING_LIMIT_SENDBYCLI > 0 && $max > 0) {
 				$sql2 .= " LIMIT ".min($conf->global->MAILING_LIMIT_SENDBYCLI, $max);
 			} elseif ($max > 0) {
-				$sql2 .= " LIMIT ".$max;
+				$sql2 .= " LIMIT ".((int) $max);
 			}
 
 			$resql2 = $db->query($sql2);
@@ -386,7 +385,7 @@ if ($resql) {
 					$statut = 3;
 				}
 
-				$sqlenddate = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
+				$sqlenddate = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".((int) $statut)." WHERE rowid=".((int) $id);
 
 				dol_syslog("update global status", LOG_DEBUG);
 				print "Update status of emailing id ".$id." to ".$statut."\n";
diff --git a/scripts/emailings/reset-invalid-emails.php b/scripts/emailings/reset-invalid-emails.php
index a15cad86072..6eb31abe995 100755
--- a/scripts/emailings/reset-invalid-emails.php
+++ b/scripts/emailings/reset-invalid-emails.php
@@ -111,7 +111,7 @@ while ($tmp != null) {
 
 	if ($type == 'all' || $type == 'users') {
 		// Loop on each record and update the email to null if email into $groupofemails
-		$sql = $sql_base."user as u SET u.email = NULL WHERE u.email IN (".$emailsin.");";
+		$sql = $sql_base."user as u SET u.email = NULL WHERE u.email IN (".$db->sanitize($emailsin, 1).");";
 		print "Try to update users, ";
 		$resql = $db->query($sql);
 		if (!$resql) {
@@ -122,7 +122,7 @@ while ($tmp != null) {
 
 	if ($type == 'all' || $type == 'thirdparties') {
 		// Loop on each record and update the email to null if email into $groupofemails
-		$sql = $sql_base."societe as s SET s.email = NULL WHERE s.email IN (".$emailsin.");";
+		$sql = $sql_base."societe as s SET s.email = NULL WHERE s.email IN (".$db->sanitize($emailsin, 1).");";
 		print "Try to update thirdparties, ";
 		$resql = $db->query($sql);
 		if (!$resql) {
@@ -134,7 +134,7 @@ while ($tmp != null) {
 	if ($type == 'all' || $type == 'contacts') {
 		// Loop on each record and update the email to null if email into $groupofemails
 
-		$sql = $sql_base."socpeople as s SET s.email = NULL WHERE s.email IN (".$emailsin.");";
+		$sql = $sql_base."socpeople as s SET s.email = NULL WHERE s.email IN (".$db->sanitize($emailsin, 1).");";
 		print "Try to update contacts, ";
 		$resql = $db->query($sql);
 		if (!$resql) {
@@ -146,7 +146,7 @@ while ($tmp != null) {
 	if ($type == 'all' || $type == 'members') {
 		// Loop on each record and update the email to null if email into $groupofemails
 
-		$sql = $sql_base."adherent as a SET a.email = NULL WHERE a.email IN (".$emailsin.");";
+		$sql = $sql_base."adherent as a SET a.email = NULL WHERE a.email IN (".$db->sanitize($emailsin, 1).");";
 		print "Try to update members, ";
 		$resql = $db->query($sql);
 		if (!$resql) {
diff --git a/scripts/product/regenerate_thumbs.php b/scripts/product/regenerate_thumbs.php
index 5230484a156..f4e50c0555a 100755
--- a/scripts/product/regenerate_thumbs.php
+++ b/scripts/product/regenerate_thumbs.php
@@ -1,7 +1,6 @@
 #!/usr/bin/env php
 <?php
-/*
- * Copyright (C) 2007-2016 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2016 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2015 Jean Heimburger <http://tiaris.eu>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php
index 42bf5f6bb3f..77364d1a623 100755
--- a/scripts/withdrawals/build_withdrawal_file.php
+++ b/scripts/withdrawals/build_withdrawal_file.php
@@ -1,7 +1,6 @@
 #!/usr/bin/env php
 <?php
-/*
- * Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify

From 1a4e1b1ae98960d1dc9e87058c55a6b3ed35e07e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 26 Apr 2021 13:46:37 +0000
Subject: [PATCH 304/928] Fixing style errors.

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

diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 5936c63d2c3..7e02450160a 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -228,9 +228,9 @@ function getCustomerOrderPieChart($socid = 0)
 			if ($row) {
 				//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
 				{
-					if (!isset($vals[$row[1]])) {
-						$vals[$row[1]] = 0;
-					}
+				if (!isset($vals[$row[1]])) {
+					$vals[$row[1]] = 0;
+				}
 					$vals[$row[1]] += $row[0];
 					$totalinprocess += $row[0];
 				}

From 080bd90c930fe9280918c4b17836190cbbf0a7cb Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 26 Apr 2021 16:15:09 +0200
Subject: [PATCH 305/928] Fix #17219 : complement of PR 17161

---
 htdocs/core/tpl/filemanager.tpl.php | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index adb38aa9279..cf00f60d31d 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -87,10 +87,25 @@ if ($module == 'ecm') {
 	print '</a>';
 }
 if ($permtoadd && GETPOSTISSET('website')) {	// If on file manager to manage medias of a web site
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&website='.$website->ref.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
+	print '<a id="generateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&website='.$website->ref.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
 	print img_picto('', 'images', '', false, 0, 0, '', 'size15x flip marginrightonly');
 	print '</a>';
 }
+if ($permtoadd && $module == 'ecm') {	// If on file manager medias in ecm
+	print '<a id="generateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
+	print img_picto('', 'images', '', false, 0, 0, '', 'size15x flip marginrightonly');
+	print '</a>';
+}
+print "<script>
+$(\"#generateimgwebp\").on(\"click\",function(){
+	try{
+		param = $(\".directory.expanded\")[$(\".directory.expanded\").length-1].children[0].rel
+	}catch{
+		param = '/'
+	}
+	$(\"#generateimgwebp\").attr(\"href\",$(\"#generateimgwebp\").attr(\"href\")+'&dir='+param)
+  })
+</script>";
 
 // Start "Add new file" area
 $nameforformuserfile = 'formuserfileecm';
@@ -139,22 +154,26 @@ if ($action == 'delete_section') {
 // End confirm
 
 if ($action == 'confirmconvertimgwebp') {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$website->ref, $langs->trans('ConfirmImgWebpCreation'), $langs->trans('ConfirmGenerateImgWebp', $object->ref), 'convertimgwebp', '', "yes", 1);
+	if ($module == 'medias') {
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$website->ref.'&dir='.$_GET['dir'], $langs->trans('ConfirmImgWebpCreation'), $langs->trans('ConfirmGenerateImgWebp', $object->ref), 'convertimgwebp', '', "yes", 1);
+	} else {
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?dir='.$_GET['dir'], $langs->trans('ConfirmImgWebpCreation'), $langs->trans('ConfirmGenerateImgWebp', $object->ref), 'convertimgwebp', '', "yes", 1);
+	}
 	$action = 'file_manager';
 }
 
 if ($action == 'convertimgwebp' && $permtoadd) {
 	if ($module == 'medias') {
-		$imagefolder = $conf->website->dir_output.'/'.$websitekey.'/medias/image/'.$websitekey.'/';
+		$imagefolder = $conf->website->dir_output.'/'.$websitekey.'/medias/'.$_GET['dir'];
 	} else {
-		$imagefolder = $conf->ecm->dir_output;
+		$imagefolder = $conf->ecm->dir_output.'/'.$_GET['dir'];
 	}
 
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 	$regeximgext = getListOfPossibleImageExt();
 
-	$filelist = dol_dir_list($imagefolder, "all", 1, $regeximgext);
+	$filelist = dol_dir_list($imagefolder, "all", 0, $regeximgext);
 
 	foreach ($filelist as $filename) {
 		$filepath = $filename['fullname'];

From 09d68dd7a649a4d8e84461ac24c852393d0feb15 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Mon, 26 Apr 2021 17:00:53 +0200
Subject: [PATCH 306/928] fix the productCombination class on updatePrice

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

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 9152336bbe4..d01fd5c37c7 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -534,7 +534,7 @@ class ProductCombination
 							$new_price += $variation_price;
 						}
 
-						$child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq);
+						$child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq,0, array(),$parent->default_vat_code);
 					}
 				}
 			} else {

From 8d07b43ccd9f19b3ea47d0fe7212e0b8049e274f Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Mon, 26 Apr 2021 17:05:21 +0200
Subject: [PATCH 307/928] space stickler

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

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index d01fd5c37c7..51499ead88d 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -534,7 +534,7 @@ class ProductCombination
 							$new_price += $variation_price;
 						}
 
-						$child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq,0, array(),$parent->default_vat_code);
+						$child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq,0, array(), $parent->default_vat_code);
 					}
 				}
 			} else {

From a8136a00b1933b8891e3e28b416767aedabccde3 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 26 Apr 2021 15:07:41 +0000
Subject: [PATCH 308/928] Fixing style errors.

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

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 51499ead88d..bc479b68653 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -534,7 +534,7 @@ class ProductCombination
 							$new_price += $variation_price;
 						}
 
-						$child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq,0, array(), $parent->default_vat_code);
+						$child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq, 0, array(), $parent->default_vat_code);
 					}
 				}
 			} else {

From 9c46b234cf20fde86279708db5002a9a62040065 Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Mon, 26 Apr 2021 17:43:27 +0200
Subject: [PATCH 309/928] FIX Supplier invoices (deposit, multicurency in
 lines)

---
 htdocs/core/class/discount.class.php          |   2 +-
 .../fourn/class/fournisseur.facture.class.php | 105 +++++++++++++++---
 htdocs/fourn/class/paiementfourn.class.php    |  61 +++++++++-
 htdocs/fourn/facture/card.php                 |   6 +-
 .../install/mysql/migration/13.0.0-14.0.0.sql |   2 +
 .../tables/llx_facture_fourn_det.key.sql      |   1 +
 .../mysql/tables/llx_facture_fourn_det.sql    |   1 +
 7 files changed, 160 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 63ef3dc1153..32d7faa1557 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -141,7 +141,7 @@ class DiscountAbsolute
 		$sql .= " fsup.ref as ref_invoice_supplier_source, fsup.type as type_invoice_supplier_source";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
 		$sql .= " WHERE sr.entity IN (".getEntity('invoice').")";
 		if ($rowid) {
 			$sql .= " AND sr.rowid=".((int) $rowid);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 8245e8ec1cc..b8d46d9bf9d 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -36,7 +36,6 @@
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -501,8 +500,8 @@ class FactureFournisseur extends CommonInvoice
 			if (count($this->lines) && is_object($this->lines[0])) {	// If this->lines is array of InvoiceLines (preferred mode)
 				dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
 				foreach ($this->lines as $i => $val) {
-					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code)';
-					$sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).')';
+					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code, fk_remise_except)';
+					$sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).','.($this->lines[$i]->fk_remise_except > 0 ? $this->lines[$i]->fk_remise_except : 'NULL').')';
 
 					$resql_insert = $this->db->query($sql);
 					if ($resql_insert) {
@@ -546,8 +545,8 @@ class FactureFournisseur extends CommonInvoice
 						$line = (object) $line;
 					}
 
-					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code)';
-					$sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).')';
+					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code, fk_remise_except)';
+					$sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).','.($this->lines[$i]->fk_remise_except > 0 ? $this->lines[$i]->fk_remise_except : 'NULL').')';
 
 					$resql_insert = $this->db->query($sql);
 					if ($resql_insert) {
@@ -797,7 +796,7 @@ class FactureFournisseur extends CommonInvoice
 		$this->lines = array();
 
 		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
-		$sql .= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
+		$sql .= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn, f.fk_remise_except';
 		$sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
 		$sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
 		$sql .= ', f.fk_code_ventilation, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
@@ -841,6 +840,7 @@ class FactureFournisseur extends CommonInvoice
 					$line->localtax2_type	= $obj->localtax2_type;
 					$line->qty				= $obj->qty;
 					$line->remise_percent = $obj->remise_percent;
+					$line->fk_remise_except = $obj->fk_remise_except;
 					$line->tva				= $obj->total_tva; // deprecated
 					$line->total_ht			= $obj->total_ht;
 					$line->total_ttc		= $obj->total_ttc;
@@ -1772,13 +1772,14 @@ class FactureFournisseur extends CommonInvoice
 	 *  @param		string	$ref_supplier		Supplier ref
 	 *  @param      string  $special_code       Special code
 	 *  @param		int		$fk_parent_line		Parent line id
+	 *  @param    	int		$fk_remise_except	Id discount used
 	 *	@return    	int             			>0 if OK, <0 if KO
 	 */
-	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = false, $array_options = 0, $fk_unit = null, $origin_id = 0, $pu_ht_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0)
+	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = false, $array_options = 0, $fk_unit = null, $origin_id = 0, $pu_ht_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0, $fk_remise_except = 0)
 	{
 		global $langs, $mysoc, $conf;
 
-		dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG);
+		dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit,fk_remise_except=$fk_remise_except", LOG_DEBUG);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		if ($this->statut == self::STATUS_DRAFT) {
@@ -1957,6 +1958,7 @@ class FactureFournisseur extends CommonInvoice
 			$this->line->ventil = $ventil;
 			$this->line->rang = $rang;
 			$this->line->info_bits = $info_bits;
+			$this->line->fk_remise_except = $fk_remise_except;
 
 			$this->line->special_code = ((string) $special_code != '' ? $special_code : $this->special_code);
 			$this->line->fk_parent_line = $fk_parent_line;
@@ -2677,10 +2679,10 @@ class FactureFournisseur extends CommonInvoice
 		$this->multicurrency_tx = 1;
 		$this->multicurrency_code = $conf->currency;
 
+		$xnbp = 0;
 		if (empty($option) || $option != 'nolines') {
 			// Lines
 			$nbp = 5;
-			$xnbp = 0;
 			while ($xnbp < $nbp) {
 				$line = new SupplierInvoiceLine($this->db);
 				$line->desc = $langs->trans("Description")." ".$xnbp;
@@ -2774,7 +2776,7 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public function createFromClone(User $user, $fromid, $invertdetail = 0)
 	{
-		global $langs;
+		global $conf, $langs;
 
 		$error = 0;
 
@@ -3133,6 +3135,12 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 */
 	public $info_bits;
 
+	/**
+	 * Link to line into llx_remise_except
+	 * @var int
+	 */
+	public $fk_remise_except;
+
 	/**
 	 * @var int ID
 	 */
@@ -3189,7 +3197,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	public function fetch($rowid)
 	{
 		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx';
-		$sql .= ', f.localtax1_type, f.localtax2_type, f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
+		$sql .= ', f.localtax1_type, f.localtax2_type, f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2, f.fk_remise_except';
 		$sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_facture_fourn, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
 		$sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc';
 		$sql .= ', f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, multicurrency_total_ttc';
@@ -3232,6 +3240,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 		$this->qty				= $obj->qty;
 		$this->remise_percent = $obj->remise_percent;
+		$this->fk_remise_except	= $obj->fk_remise_except;
 		$this->tva				= $obj->total_tva; // deprecated
 		$this->total_ht = $obj->total_ht;
 		$this->total_tva			= $obj->total_tva;
@@ -3348,6 +3357,22 @@ class SupplierInvoiceLine extends CommonObjectLine
 			$this->localtax2_tx = 0;
 		}
 
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
+		if (empty($this->multicurrency_subprice)) {
+			$this->multicurrency_subprice = 0;
+		}
+		if (empty($this->multicurrency_total_ht)) {
+			$this->multicurrency_total_ht = 0;
+		}
+		if (empty($this->multicurrency_total_tva)) {
+			$this->multicurrency_total_tva = 0;
+		}
+		if (empty($this->multicurrency_total_ttc)) {
+			$this->multicurrency_total_ttc = 0;
+		}
+
 		$this->db->begin();
 
 		if (empty($this->fk_product)) {
@@ -3371,6 +3396,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= ", pu_ttc = ".price2num($this->pu_ttc);
 		$sql .= ", qty = ".price2num($this->qty);
 		$sql .= ", remise_percent = ".price2num($this->remise_percent);
+		if ($this->fk_remise_except) $sql.= ", fk_remise_except=".$this->fk_remise_except;
+		else $sql.= ", fk_remise_except=null";
 		$sql .= ", vat_src_code = '".$this->db->escape(empty($this->vat_src_code) ? '' : $this->vat_src_code)."'";
 		$sql .= ", tva_tx = ".price2num($this->tva_tx);
 		$sql .= ", localtax1_tx = ".price2num($this->localtax1_tx);
@@ -3442,7 +3469,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 */
 	public function insert($notrigger = 0)
 	{
-		global $user, $conf;
+		global $user, $conf, $langs;
 
 		$error = 0;
 
@@ -3533,7 +3560,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= ' (fk_facture_fourn, fk_parent_line, label, description, ref, qty,';
 		$sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-		$sql .= ' fk_product, product_type, remise_percent, pu_ht, pu_ttc,';
+		$sql .= ' fk_product, product_type, remise_percent, fk_remise_except, pu_ht, pu_ttc,';
 		$sql .= ' date_start, date_end, fk_code_ventilation, rang, special_code,';
 		$sql .= ' info_bits, total_ht, tva, total_ttc, total_localtax1, total_localtax2, fk_unit';
 		$sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
@@ -3554,6 +3581,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= ' '.(!empty($this->fk_product) ? $this->fk_product : "null").',';
 		$sql .= " ".$this->product_type.",";
 		$sql .= " ".price2num($this->remise_percent).",";
+		$sql .= ' '.(! empty($this->fk_remise_except)?$this->fk_remise_except:"null").',';
 		$sql .= " ".price2num($this->subprice).",";
 		$sql .= " ".(!empty($this->qty) ?price2num($this->total_ttc / $this->qty) : price2num($this->total_ttc)).",";
 		$sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").",";
@@ -3588,6 +3616,57 @@ class SupplierInvoiceLine extends CommonObjectLine
 				}
 			}
 
+			// Si fk_remise_except defini, on lie la remise a la facture
+			// ce qui la flague comme "consommee".
+			if ($this->fk_remise_except)
+			{
+				$discount=new DiscountAbsolute($this->db);
+				$result=$discount->fetch($this->fk_remise_except);
+				if ($result >= 0)
+				{
+					// Check if discount was found
+					if ($result > 0)
+					{
+						// Check if discount not already affected to another invoice
+						if ($discount->fk_facture_line > 0)
+						{
+							if (empty($noerrorifdiscountalreadylinked))
+							{
+								$this->error=$langs->trans("ErrorDiscountAlreadyUsed", $discount->id);
+								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
+								$this->db->rollback();
+								return -3;
+							}
+						}
+						else
+						{
+							$result=$discount->link_to_invoice($this->rowid, 0);
+							if ($result < 0)
+							{
+								$this->error=$discount->error;
+								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
+								$this->db->rollback();
+								return -3;
+							}
+						}
+					}
+					else
+					{
+						$this->error=$langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
+						dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
+						$this->db->rollback();
+						return -3;
+					}
+				}
+				else
+				{
+					$this->error=$discount->error;
+					dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
+					$this->db->rollback();
+					return -3;
+				}
+			}
+
 			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEBILL_SUPPLIER_CREATE', $user);
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 9f17f522bdd..9c67f34fecf 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -230,7 +230,66 @@ class PaiementFourn extends Paiement
 								$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
 								$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 								if ($remaintopay == 0) {
-									$result = $invoice->setPaid($user, '', '');
+									// If invoice is a down payment, we also convert down payment to discount
+									if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT) {
+										$amount_ht = $amount_tva = $amount_ttc = array();
+										$multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
+
+										// Insert one discount by VAT rate category
+										require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
+										$discount = new DiscountAbsolute($this->db);
+										$discount->fetch('', $invoice->id);
+										if (empty($discount->id)) {    // If the invoice was not yet converted into a discount (this may have been done manually before we come here)
+											$discount->discount_type = 1; // Supplier discount
+											$discount->description = '(DEPOSIT)';
+											$discount->fk_soc = $invoice->socid;
+											$discount->fk_invoice_supplier_source = $invoice->id;
+
+											// Loop on each vat rate
+											$i = 0;
+											foreach ($invoice->lines as $line) {
+												if ($line->total_ht != 0) {    // no need to create discount if amount is null
+													$amount_ht[$line->tva_tx] += $line->total_ht;
+													$amount_tva[$line->tva_tx] += $line->total_tva;
+													$amount_ttc[$line->tva_tx] += $line->total_ttc;
+													$multicurrency_amount_ht[$line->tva_tx] += $line->multicurrency_total_ht;
+													$multicurrency_amount_tva[$line->tva_tx] += $line->multicurrency_total_tva;
+													$multicurrency_amount_ttc[$line->tva_tx] += $line->multicurrency_total_ttc;
+													$i++;
+												}
+											}
+
+											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->multicurrency_amount_ht = abs($multicurrency_amount_ht[$tva_tx]);
+												$discount->multicurrency_amount_tva = abs($multicurrency_amount_tva[$tva_tx]);
+												$discount->multicurrency_amount_ttc = abs($multicurrency_amount_ttc[$tva_tx]);
+												$discount->tva_tx = abs($tva_tx);
+
+												$result = $discount->create($user);
+												if ($result < 0) {
+													$error++;
+													break;
+												}
+											}
+										}
+
+										if ($error) {
+											setEventMessages($discount->error, $discount->errors, 'errors');
+											$error++;
+										}
+									}
+
+									// Set invoice to paid
+									if (!$error) {
+										$result = $invoice->set_paid($user, '', '');
+										if ($result < 0) {
+											$this->error = $invoice->error;
+											$error++;
+										}
+									}
 								} else {
 									dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing.");
 								}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index e59e4583e72..5601151fa22 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1222,7 +1222,7 @@ if (empty($reshook)) {
 		// Edit line
 		$db->begin();
 
-		$object->fetch($id);
+		if (! $object->fetch($id) > 0)	dol_print_error($db);
 		$object->fetch_thirdparty();
 
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
@@ -1271,7 +1271,7 @@ if (empty($reshook)) {
 		$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
 		$remise_percent = price2num(GETPOST('remise_percent'), 2);
-		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), 'CU');
+		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), 'MU');
 
 		// Extrafields Lines
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -1337,7 +1337,7 @@ if (empty($reshook)) {
 
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
 		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'MU', 2);
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index e762ddd94e4..09d3fd11c50 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -436,3 +436,5 @@ ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity
 
 UPDATE llx_const SET value = 'github' WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
 
+ALTER TABLE llx_facture_fourn_det ADD COLUMN fk_remise_except integer DEFAULT NULL after remise_percent;
+ALTER TABLE llx_facture_fourn_det ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except, fk_facture_fourn);
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql
index ac261a4c3f4..c454ea1d62a 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql
@@ -23,6 +23,7 @@
 ALTER TABLE llx_facture_fourn_det ADD INDEX idx_facture_fourn_det_fk_facture (fk_facture_fourn);
 ALTER TABLE llx_facture_fourn_det ADD INDEX idx_facture_fourn_det_fk_product (fk_product);
 ALTER TABLE llx_facture_fourn_det ADD INDEX idx_facture_fourn_det_fk_code_ventilation (fk_code_ventilation);
+ALTER TABLE llx_facture_fourn_det ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except, fk_facture_fourn);
 
 ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_facture FOREIGN KEY (fk_facture_fourn) REFERENCES llx_facture_fourn (rowid);
 ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql
index 08d9d944002..40b613d4ac5 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql
@@ -31,6 +31,7 @@ create table llx_facture_fourn_det
   pu_ttc            double(24,8), -- unit price with tax
   qty               real,         -- quantity of product/service
   remise_percent	real       DEFAULT 0,				-- % de la remise ligne (exemple 20%)
+  fk_remise_except	integer    NULL,					-- Lien vers table des remises fixes
   vat_src_code		varchar(10)  DEFAULT '',			-- Vat code used as source of vat fields. Not strict foreign key here.
   tva_tx            double(6,3),  -- TVA taux product/service
   localtax1_tx      double(6,3)  DEFAULT 0,    -- localtax1 rate

From 9f3bcbc39d4498676ab3213c7d3c190da496258c Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Mon, 26 Apr 2021 17:48:42 +0200
Subject: [PATCH 310/928] Fix Stickler CI

---
 .../fourn/class/fournisseur.facture.class.php | 58 ++++++++-----------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index b8d46d9bf9d..dd1ea179553 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3618,50 +3618,38 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 			// Si fk_remise_except defini, on lie la remise a la facture
 			// ce qui la flague comme "consommee".
-			if ($this->fk_remise_except)
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$result=$discount->fetch($this->fk_remise_except);
-				if ($result >= 0)
-				{
+			if ($this->fk_remise_except) {
+				$discount = new DiscountAbsolute($this->db);
+				$result = $discount->fetch($this->fk_remise_except);
+				if ($result >= 0) {
 					// Check if discount was found
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						// Check if discount not already affected to another invoice
-						if ($discount->fk_facture_line > 0)
-						{
-							if (empty($noerrorifdiscountalreadylinked))
-							{
-								$this->error=$langs->trans("ErrorDiscountAlreadyUsed", $discount->id);
-								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
+						if ($discount->fk_facture_line > 0) {
+							if (empty($noerrorifdiscountalreadylinked)) {
+								$this->error = $langs->trans("ErrorDiscountAlreadyUsed", $discount->id);
+								dol_syslog(get_class($this) . "::insert Error " . $this->error, LOG_ERR);
+								$this->db->rollback();
+								return -3;
+							}
+						} else {
+							$result = $discount->link_to_invoice($this->rowid, 0);
+							if ($result < 0) {
+								$this->error = $discount->error;
+								dol_syslog(get_class($this) . "::insert Error " . $this->error, LOG_ERR);
 								$this->db->rollback();
 								return -3;
 							}
 						}
-						else
-						{
-							$result=$discount->link_to_invoice($this->rowid, 0);
-							if ($result < 0)
-							{
-								$this->error=$discount->error;
-								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
-								$this->db->rollback();
-								return -3;
-							}
-						}
-					}
-					else
-					{
-						$this->error=$langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
-						dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
+					} else {
+						$this->error = $langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
+						dol_syslog(get_class($this) . "::insert Error " . $this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
-				{
-					$this->error=$discount->error;
-					dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
+				} else {
+					$this->error = $discount->error;
+					dol_syslog(get_class($this) . "::insert Error " . $this->error, LOG_ERR);
 					$this->db->rollback();
 					return -3;
 				}

From d138e7410b96ad2a6ed6d838c5b98fbb3e43cf2c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Apr 2021 19:12:23 +0200
Subject: [PATCH 311/928] Clean code

---
 htdocs/admin/mails.php                        |   2 +-
 htdocs/admin/system/filecheck.php             |   2 +-
 htdocs/categories/class/categorie.class.php   |   6 +-
 htdocs/comm/action/index.php                  |   6 +-
 htdocs/commande/list.php                      |   4 +-
 .../facture/class/facture-rec.class.php       |  16 +-
 htdocs/compta/facture/class/facture.class.php |   4 +-
 htdocs/compta/facture/list.php                |   2 +-
 htdocs/compta/paiement.php                    |   2 +-
 .../stats/supplier_turnover_by_thirdparty.php |   2 +-
 htdocs/core/class/commonobject.class.php      |   4 +-
 .../doc/pdf_standard.modules.php              |   2 +-
 htdocs/cron/class/cronjob.class.php           |   4 +-
 htdocs/ecm/class/ecmfiles.class.php           |   2 +-
 htdocs/expedition/list.php                    |   4 +-
 .../class/expensereport.class.php             |   4 +-
 .../class/expensereport_ik.class.php          |   2 +-
 .../class/expensereport_rule.class.php        |   7 +-
 htdocs/fourn/facture/paiement.php             |   2 +-
 htdocs/fourn/paiement/list.php                |   2 +-
 .../Luracast/Restler/explorer/explorer.html   | 144 ++++++++++++++++++
 htdocs/margin/customerMargins.php             |   2 +-
 htdocs/mrp/class/mo.class.php                 |   2 +-
 .../product/stock/lib/replenishment.lib.php   |   2 +-
 htdocs/product/stock/replenishorders.php      |   2 +-
 htdocs/product/stock/stockatdate.php          |   2 +-
 htdocs/projet/activity/perday.php             |   2 +-
 htdocs/projet/activity/permonth.php           |   2 +-
 htdocs/projet/activity/perweek.php            |   2 +-
 htdocs/public/payment/newpayment.php          |   2 +-
 htdocs/public/recruitment/index.php           |   6 +-
 htdocs/public/ticket/list.php                 |   6 +-
 htdocs/reception/list.php                     |   2 +-
 htdocs/supplier_proposal/list.php             |   4 +-
 htdocs/ticket/class/ticket.class.php          |   4 +-
 htdocs/website/class/websitepage.class.php    |   6 +-
 htdocs/website/websiteaccount_card.php        |   2 +-
 37 files changed, 208 insertions(+), 63 deletions(-)
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/explorer.html

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 0252f149d10..8fcbc898844 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -719,7 +719,7 @@ if ($action == 'edit') {
 		$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).')';
 		$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile';
-		$sql .= ' WHERE active = 1 AND (private = 0 OR private = '.$user->id.')';
+		$sql .= ' WHERE active = 1 AND (private = 0 OR private = '.((int) $user->id).')';
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num = $db->num_rows($resql);
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 0f77b9d9d41..b506231a59b 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -124,7 +124,7 @@ if ($enableremotecheck) {
 	print '<input type="radio" name="target" id="checkboxremote" value="remote"'.(GETPOST('target') == 'remote' ? 'checked="checked"' : '').'> <label for="checkboxremote">'.$langs->trans("RemoteSignature").'</label> = ';
 	print '<input name="xmlremote" class="flat minwidth400" value="'.dol_escape_htmltag($xmlremote).'"><br>';
 } else {
-	print '<input type="radio" name="target" value="remote" disabled="disabled"> '.$langs->trans("RemoteSignature").' = '.$xmlremote;
+	print '<input type="radio" name="target" value="remote" disabled="disabled"> '.$langs->trans("RemoteSignature").' = '.dol_escape_htmltag($xmlremote);
 	if (!GETPOST('xmlremote')) {
 		print ' <span class="warning">('.$langs->trans("FeatureAvailableOnlyOnStable").')</span>';
 	}
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 51079636d4f..5f30a96c9c1 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -897,6 +897,8 @@ class Categorie extends CommonObject
 
 		$categories = array();
 
+		$type = checkVal($type, 'aZ09');
+
 		$sub_type = $type;
 		$subcol_name = "fk_".$type;
 		if ($type == "customer") {
@@ -917,9 +919,9 @@ class Categorie extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as s";
 		$sql .= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";
 		$sql .= ' WHERE s.entity IN ('.getEntity('category').')';
-		$sql .= ' AND s.type='.$idoftype;
+		$sql .= ' AND s.type='.((int) $idoftype);
 		$sql .= ' AND s.rowid = sub.fk_categorie';
-		$sql .= ' AND sub.'.$subcol_name.' = '.$id;
+		$sql .= ' AND sub.'.$subcol_name.' = '.((int) $id);
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index be0884a5556..d5457447100 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -874,10 +874,10 @@ if ($showbirthday) {
 	$sql .= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.$user->id.'))';
 	$sql .= " AND sp.entity IN (".getEntity('socpeople').")";
 	if ($action == 'show_day') {
-		$sql .= ' AND MONTH(birthday) = '.$month;
-		$sql .= ' AND DAY(birthday) = '.$day;
+		$sql .= ' AND MONTH(birthday) = '.((int) $month);
+		$sql .= ' AND DAY(birthday) = '.((int) $day);
 	} else {
-		$sql .= ' AND MONTH(birthday) = '.$month;
+		$sql .= ' AND MONTH(birthday) = '.((int) $month);
 	}
 	$sql .= ' ORDER BY birthday';
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index db6bba130b1..d59983925ce 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -359,7 +359,7 @@ if ($search_product_category > 0) {
 	$sql .= " AND cp.fk_categorie = ".$search_product_category;
 }
 if ($socid > 0) {
-	$sql .= ' AND s.rowid = '.$socid;
+	$sql .= ' AND s.rowid = '.((int) $socid);
 }
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -374,7 +374,7 @@ if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 if ($search_billed != '' && $search_billed >= 0) {
-	$sql .= ' AND c.facture = '.$search_billed;
+	$sql .= ' AND c.facture = '.((int) $search_billed);
 }
 if ($search_status <> '') {
 	if ($search_status < 4 && $search_status > -3) {
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index ee4d1a48397..367523084e2 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -1153,14 +1153,14 @@ class FactureRec extends CommonInvoice
 			$sql .= ", date_end_fill=".((int) $date_end_fill);
 			$sql .= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : 'null');
 			$sql .= ", buy_price_ht=".($pa_ht ? price2num($pa_ht) : 0);
-			$sql .= ", info_bits=".$info_bits;
-			$sql .= ", rang=".$rang;
-			$sql .= ", special_code=".$special_code;
+			$sql .= ", info_bits=".((int) $info_bits);
+			$sql .= ", rang=".((int) $rang);
+			$sql .= ", special_code=".((int) $special_code);
 			$sql .= ", fk_unit=".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
-			$sql .= ', multicurrency_subprice = '.$pu_ht_devise;
-			$sql .= ', multicurrency_total_ht = '.$multicurrency_total_ht;
-			$sql .= ', multicurrency_total_tva = '.$multicurrency_total_tva;
-			$sql .= ', multicurrency_total_ttc = '.$multicurrency_total_ttc;
+			$sql .= ', multicurrency_subprice = '.price2num($pu_ht_devise);
+			$sql .= ', multicurrency_total_ht = '.price2num($multicurrency_total_ht);
+			$sql .= ', multicurrency_total_tva = '.price2num($multicurrency_total_tva);
+			$sql .= ', multicurrency_total_ttc = '.price2num($multicurrency_total_ttc);
 			$sql .= " WHERE rowid = ".((int) $rowid);
 
 			dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
@@ -1248,7 +1248,7 @@ class FactureRec extends CommonInvoice
 		$sql .= ' AND suspended = 0';
 		$sql .= ' AND entity = '.$conf->entity; // MUST STAY = $conf->entity here
 		if ($restrictioninvoiceid > 0) {
-			$sql .= ' AND rowid = '.$restrictioninvoiceid;
+			$sql .= ' AND rowid = '.((int) $restrictioninvoiceid);
 		}
 		$sql .= $this->db->order('entity', 'ASC');
 		//print $sql;exit;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 26a5d862457..dfb2d5a3b52 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -5739,8 +5739,8 @@ class FactureLigne extends CommonInvoiceLine
 				if ($include_credit_note) {
 					$sql = 'SELECT fd.situation_percent FROM '.MAIN_DB_PREFIX.'facturedet fd';
 					$sql .= ' JOIN '.MAIN_DB_PREFIX.'facture f ON (f.rowid = fd.fk_facture) ';
-					$sql .= ' WHERE fd.fk_prev_id ='.$this->fk_prev_id;
-					$sql .= ' AND f.situation_cycle_ref = '.$invoicecache[$invoiceid]->situation_cycle_ref; // Prevent cycle outed
+					$sql .= ' WHERE fd.fk_prev_id = '.((int) $this->fk_prev_id);
+					$sql .= ' AND f.situation_cycle_ref = '.((int) $invoicecache[$invoiceid]->situation_cycle_ref); // Prevent cycle outed
 					$sql .= ' AND f.type = '.Facture::TYPE_CREDIT_NOTE;
 
 					$res = $this->db->query($sql);
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index db666d1b1ae..14b0383fa8d 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -550,7 +550,7 @@ if ($search_product_category > 0) {
 	$sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
 }
 if ($socid > 0) {
-	$sql .= ' AND s.rowid = '.$socid;
+	$sql .= ' AND s.rowid = '.((int) $socid);
 }
 if ($userid) {
 	if ($userid == -1) {
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 94b114c03d8..12a6eb97d13 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -873,7 +873,7 @@ if (!GETPOST('action', 'aZ09')) {
 	$sql .= ' WHERE p.fk_facture = f.rowid';
 	$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
 	if ($socid) {
-		$sql .= ' AND f.fk_soc = '.$socid;
+		$sql .= ' AND f.fk_soc = '.((int) $socid);
 	}
 
 	$sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 32b85b9aea9..b1b1f219f53 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -296,7 +296,7 @@ if (!empty($search_town)) {
 	$sql .= natural_search('s.town', $search_town);
 }
 if ($search_country > 0) {
-	$sql .= ' AND s.fk_pays = '.$search_country.'';
+	$sql .= ' AND s.fk_pays = '.((int) $search_country);
 }
 $sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 if ($socid) {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4aa20d8f41a..3f189a43943 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3117,7 +3117,7 @@ abstract class CommonObject
 	public function getRangOfLine($rowid)
 	{
 		$sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql .= ' WHERE rowid ='.$rowid;
+		$sql .= ' WHERE rowid ='.((int) $rowid);
 
 		dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -3137,7 +3137,7 @@ abstract class CommonObject
 	{
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
-		$sql .= ' AND rang = '.$rang;
+		$sql .= ' AND rang = '.((int) $rang);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$row = $this->db->fetch_row($resql);
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 138a6210904..a0191a3dd08 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -220,7 +220,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			$sql .= ', f.fk_statut, s.nom as name, s.rowid as socid';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
 			$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
-			$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
+			$sql .= ' AND pf.fk_paiementfourn = '.((int) $object->id);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				if ($this->db->num_rows($resql) > 0) {
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 2af3b39789e..f54f7c40c4c 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -553,11 +553,11 @@ class Cronjob extends CommonObject
 		} elseif ($status == 2) {
 			$sql .= " AND t.status = 2";
 		}
-		//Manage filter
+		// Manage filter
 		if (is_array($filter) && count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sql .= ' AND '.$key.' = '.$this->db->escape($value);
+					$sql .= ' AND '.$key.' = '.((int) $value);
 				} else {
 					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index e5e7ce8549b..485551cbe13 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -428,7 +428,7 @@ class EcmFiles extends CommonObject
 			$sql .= " AND t.src_object_type ='".$this->db->escape($src_object_type)."' AND t.src_object_id = ".$this->db->escape($src_object_id);
 			$sql .= " AND t.entity = ".$conf->entity;
 		} else {
-			$sql .= ' AND t.rowid = '.$this->db->escape($id); // rowid already unique
+			$sql .= ' AND t.rowid = '.((int) $id); // rowid already unique
 		}
 
 		$this->db->plimit(1); // When we search on src or on hash of content (hashforfile) to solve hash conflict when several files has same content, we take first one only
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 427efb02475..49675c263f9 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -295,13 +295,13 @@ if ($socid) {
 	$sql .= " AND e.fk_soc = ".$socid;
 }
 if ($search_status <> '' && $search_status >= 0) {
-	$sql .= " AND e.fk_statut = ".$search_status;
+	$sql .= " AND e.fk_statut = ".((int) $search_status);
 }
 if ($search_ref_customer != '') {
 	$sql .= natural_search('e.ref_customer', $search_ref_customer);
 }
 if ($search_billed != '' && $search_billed >= 0) {
-	$sql .= ' AND e.billed = '.$search_billed;
+	$sql .= ' AND e.billed = '.((int) $search_billed);
 }
 if ($search_town) {
 	$sql .= natural_search('s.town', $search_town);
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 8ec99aa1007..be09b670d84 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2761,9 +2761,9 @@ class ExpenseReportLine
 		if (!empty($this->id)) {
 			$sql .= ' AND d.rowid <> '.$this->id;
 		}
-		$sql .= ' AND d.fk_c_type_fees = '.$rule->fk_c_type_fees;
+		$sql .= ' AND d.fk_c_type_fees = '.((int) $rule->fk_c_type_fees);
 		if ($mode == 'day' || $mode == 'EX_DAY') {
-			$sql .= ' AND d.date = \''.dol_print_date($this->date, '%Y-%m-%d').'\'';
+			$sql .= " AND d.date = '".dol_print_date($this->date, '%Y-%m-%d')."'";
 		} elseif ($mode == 'mon' || $mode == 'EX_MON') {
 			$sql .= ' AND DATE_FORMAT(d.date, \'%Y-%m\') = \''.dol_print_date($this->date, '%Y-%m').'\''; // @todo DATE_FORMAT is forbidden
 		} elseif ($mode == 'year' || $mode == 'EX_YEA') {
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 6c6623c30c7..358a2fe06ca 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -248,7 +248,7 @@ class ExpenseReportIk extends CoreObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'c_exp_tax_range r';
 		$sql .= ' WHERE r.entity IN (0, '.$conf->entity.')';
 		if ($default_c_exp_tax_cat > 0) {
-			$sql .= ' AND r.fk_c_exp_tax_cat = '.$default_c_exp_tax_cat;
+			$sql .= ' AND r.fk_c_exp_tax_cat = '.((int) $default_c_exp_tax_cat);
 		}
 		$sql .= ' GROUP BY r.fk_c_exp_tax_cat';
 		$sql .= ') as counts';
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index 653f030b6d2..03ecab10f6a 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -160,13 +160,12 @@ class ExpenseReportRule extends CoreObject
 			$sql .= ' AND er.fk_c_type_fees IN (-1, '.$fk_c_type_fees.')';
 		}
 		if (!empty($date)) {
-			$date = dol_print_date($date, '%Y-%m-%d');
-			$sql .= ' AND er.dates <= \''.$date.'\'';
-			$sql .= ' AND er.datee >= \''.$date.'\'';
+			$sql .= " AND er.dates <= '".dol_print_date($date, '%Y-%m-%d')."'";
+			$sql .= " AND er.datee >= '".dol_print_date($date, '%Y-%m-%d')."'";
 		}
 		if ($fk_user > 0) {
 			$sql .= ' AND (er.is_for_all = 1';
-			$sql .= ' OR er.fk_user = '.$fk_user;
+			$sql .= ' OR er.fk_user = '.((int) $fk_user);
 			$sql .= ' OR er.fk_usergroup IN (SELECT ugu.fk_usergroup FROM '.MAIN_DB_PREFIX.'usergroup_user ugu WHERE ugu.fk_user = '.((int) $fk_user).') )';
 		}
 		$sql .= ' ORDER BY er.is_for_all, er.fk_usergroup, er.fk_user';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 1efb8fce26b..c7a2149c441 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -369,7 +369,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= ' WHERE f.fk_soc = s.rowid';
-	$sql .= ' AND f.rowid = '.$facid;
+	$sql .= ' AND f.rowid = '.((int) $facid);
 	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/paiement/list.php b/htdocs/fourn/paiement/list.php
index ecd572e1046..6a38ae2033d 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -182,7 +182,7 @@ if (!$user->rights->societe->client->voir) {
 	$sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
 }
 if ($socid > 0) {
-	$sql .= ' AND f.fk_soc = '.$socid;
+	$sql .= ' AND f.fk_soc = '.((int) $socid);
 }
 if ($search_ref) {
 	$sql .= natural_search('p.ref', $search_ref);
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/explorer.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/explorer.html
new file mode 100644
index 00000000000..7fedb694c17
--- /dev/null
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/explorer.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="x-ua-compatible" content="IE=edge">
+  <title>Swagger UI</title>
+  <link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16" />
+  <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
+  <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
+  <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
+  <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
+  <link href='css/print.css' media='print' rel='stylesheet' type='text/css'/>
+
+  <script src='lib/object-assign-pollyfill.js' type='text/javascript'></script>
+  <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
+  <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
+  <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
+  <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
+  <script src='lib/handlebars-4.0.5.js' type='text/javascript'></script>
+  <script src='lib/lodash.min.js' type='text/javascript'></script>
+  <script src='lib/backbone-min.js' type='text/javascript'></script>
+  <script src='swagger-ui.js' type='text/javascript'></script>
+  <script src='lib/highlight.9.1.0.pack.js' type='text/javascript'></script>
+  <script src='lib/highlight.9.1.0.pack_extended.js' type='text/javascript'></script>
+  <script src='lib/jsoneditor.min.js' type='text/javascript'></script>
+  <script src='lib/marked.js' type='text/javascript'></script>
+  <script src='lib/swagger-oauth.js' type='text/javascript'></script>
+
+  <!-- Some basic translations -->
+  <!-- <script src='lang/translator.js' type='text/javascript'></script> -->
+  <!-- <script src='lang/ru.js' type='text/javascript'></script> -->
+  <!-- <script src='lang/en.js' type='text/javascript'></script> -->
+
+  <script type="text/javascript">
+    $(function () {
+      var url = window.location.search.match(/url=([^&]+)/);
+      if (url && url.length > 1) {
+        url = decodeURIComponent(url[1]);
+      } else {
+        url = "swagger.json";
+      }
+
+      hljs.configure({
+        highlightSizeThreshold: 5000
+      });
+
+      // Pre load translate...
+      if(window.SwaggerTranslator) {
+        window.SwaggerTranslator.translate();
+      }
+      window.swaggerUi = new SwaggerUi({
+        url: url,
+        dom_id: "swagger-ui-container",
+        supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
+        onComplete: function(swaggerApi, swaggerUi){
+          if(typeof initOAuth == "function") {
+            initOAuth({
+              clientId: "your-client-id",
+              clientSecret: "your-client-secret-if-required",
+              realm: "your-realms",
+              appName: "your-app-name",
+              scopeSeparator: " ",
+              additionalQueryStringParams: {}
+            });
+          }
+
+          if(window.SwaggerTranslator) {
+            window.SwaggerTranslator.translate();
+          }
+          
+          addApiKeyAuthorization();
+        },
+        onFailure: function(data) {
+          log("Unable to Load SwaggerUI");
+        },
+        docExpansion: "none",
+        jsonEditor: false,
+        apisSorter: "alpha",
+        operationsSorter: "alpha",
+        defaultModelRendering: 'model',		/* example or model or schema */
+        defaultModelsExpandDepth: -1,
+        showRequestHeaders: false,
+        showOperationIds: false,
+        displayOperationIds: false,
+        displayRequestDuration: true
+      });
+
+      function addApiKeyAuthorization(){
+        var key = encodeURIComponent($('#input_apiKey')[0].value);
+        if(key && key.trim() != "") {
+	        /* @CHANGE LDR We set DOLAPIKEY into header */
+    	    /* log("added key " + key); */
+    	    log("added key");
+        
+            
+        	/* Disabled for security reason. We keep only param in header
+	        var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("api_key", key, "query");
+            window.swaggerUi.api.clientAuthorizations.add("api_key", apiKeyAuth);
+            log("added key " + key);
+            */
+	
+	        var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("DOLAPIKEY", key, "header");
+            window.swaggerUi.api.clientAuthorizations.add("api_key", apiKeyAuth);
+    	    /* log("header DOLAPIKEY added with value "+key); */
+    	    log("header DOLAPIKEY added");
+        }
+      }
+
+      $('#input_apiKey').change(addApiKeyAuthorization);
+      
+      window.swaggerUi.load();
+
+      function log() {
+        if ('console' in window) {
+          console.log.apply(console, arguments);
+        }
+      }
+  });
+  </script>
+  
+  <style>
+	.info_title, .info_description, .info_contact, .info_name, .info_url, .info_email, .info_license, #api_info, #input_baseUrl {
+		display: none !important;
+	}
+  </style>  
+</head>
+
+<body class="swagger-section">
+<div id="header" style="background-color: rgb(38,60,92); height: 17px;">
+  <div class="swagger-ui-wrap">
+    <a id="logo" href="#">Dolibarr REST API Explorer</a>
+    <form id='api_selector'>
+      <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
+      <div class='input'><input placeholder="DOLAPIKEY" id="input_apiKey" name="apiKey" type="text"/></div>
+      <div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div>
+    </form>
+  </div>
+</div>
+
+<div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
+<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
+</body>
+</html>
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 67639acb745..7fed219ffcd 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -234,7 +234,7 @@ if (!$user->rights->societe->client->voir && !$socid) {
 }
 $sql .= " WHERE f.fk_soc = s.rowid";
 if ($socid > 0) {
-	$sql .= ' AND s.rowid = '.$socid;
+	$sql .= ' AND s.rowid = '.((int) $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/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index d7635b9a78e..b357fd8a5b5 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -500,7 +500,7 @@ class Mo extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$mostatic->table_element.' as t';
 		$sql .= " WHERE t.role = '".$this->db->escape($role)."'";
 		if ($lineid > 0) {
-			$sql .= ' AND t.fk_mrp_production = '.$lineid;
+			$sql .= ' AND t.fk_mrp_production = '.((int) $lineid);
 		} else {
 			$sql .= 'AND t.fk_mo = '.$this->id;
 		}
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index 1faa67ad860..a7354c1d001 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -126,7 +126,7 @@ function ordered($product_id)
 	} else {
 		$sql .= ' cf.fk_statut < 5';
 	}
-	$sql .= ' AND cfd.fk_product = '.$product_id;
+	$sql .= ' AND cfd.fk_product = '.((int) $product_id);
 	$sql .= ' GROUP BY cfd.fk_product';
 
 	$resql = $db->query($sql);
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index f5978313a1e..17490e330bb 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -154,7 +154,7 @@ if ($sall) {
 	$sql .= natural_search(array('cf.ref', 'cf.note'), $sall);
 }
 if (!empty($socid)) {
-	$sql .= ' AND s.rowid = '.$socid;
+	$sql .= ' AND s.rowid = '.((int) $socid);
 }
 if (GETPOST('statut', 'int')) {
 	$sql .= ' AND fk_statut = '.GETPOST('statut', 'int');
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index e5eb2751109..788c75f1141 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -258,7 +258,7 @@ $sql .= $hookmanager->resPrint;
 
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 if ($fk_warehouse > 0) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '.$fk_warehouse;
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '.((int) $fk_warehouse);
 }
 // Add fields from hooks
 $parameters = array();
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 5b238d96b92..3c67673ad49 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -201,7 +201,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		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';
-			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
+			$sql .= ' AND ec.fk_socpeople = '.((int) $idfortaskuser)." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 43cdfa863f5..087fe5b8f0b 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -156,7 +156,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		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';
-			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
+			$sql .= ' AND ec.fk_socpeople = '.((int) $idfortaskuser)." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 62f26a881b7..3d380ab7f4e 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -214,7 +214,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		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';
-			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
+			$sql .= ' AND ec.fk_socpeople = '.((int) $idfortaskuser)." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 40c742d562a..7f9835069bf 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -802,7 +802,7 @@ if ($urllogo) {
 
 
 print '<!-- Form to send a payment -->'."\n";
-print '<!-- creditor = '.$creditor.' -->'."\n";
+print '<!-- creditor = '.dol_escape_htmltag($creditor).' -->'."\n";
 // Additionnal information for each payment system
 if (!empty($conf->paypal->enabled)) {
 	print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 5118f7ebfc0..7d4ec0223f1 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -258,15 +258,15 @@ if ($display_ticket_list) {
 	if (!empty($filter)) {
 		foreach ($filter as $key => $value) {
 			if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
-				$sql .= ' AND '.$key.' = \''.$value.'\'';
+				$sql .= ' AND '.$key.' = \''.$db->escape($value).'\'';
 			} elseif ($key == 't.fk_statut') {
 				if (is_array($value) && count($value) > 0) {
 					$sql .= 'AND '.$key.' IN ('.$db->sanitize(implode(',', $value)).')';
 				} else {
-					$sql .= ' AND '.$key.' = '.$db->escape($value);
+					$sql .= ' AND '.$key.' = '.((int) $value);
 				}
 			} else {
-				$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
+				$sql .= ' AND '.$key.' LIKE \'%'.$db->escape($value).'%\'';
 			}
 		}
 	}
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 92962732a68..1e1eb08dd5e 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -359,17 +359,17 @@ if ($action == "view_ticketlist") {
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
-					$sql .= ' AND '.$key.' = \''.$value.'\'';
+					$sql .= ' AND '.$key.' = \''.$db->escape($value).'\'';
 				} elseif (($key == 't.fk_user_assign') || ($key == 't.type_code') || ($key == 't.category_code') || ($key == 't.severity_code')) {
 					$sql .= " AND ".$key." = '".$db->escape($value)."'";
 				} elseif ($key == 't.fk_statut') {
 					if (is_array($value) && count($value) > 0) {
 						$sql .= 'AND '.$key.' IN ('.$db->sanitize(implode(',', $value)).')';
 					} else {
-						$sql .= ' AND '.$key.' = '.$db->escape($value);
+						$sql .= ' AND '.$key.' = '.((int) $value);
 					}
 				} else {
-					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
+					$sql .= ' AND '.$key.' LIKE \'%'.$db->escape($value).'%\'';
 				}
 			}
 		}
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 44d4cf32a5c..7295b3df75a 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -460,7 +460,7 @@ if ($search_status <> '' && $search_status >= 0) {
 	$sql .= " AND e.fk_statut = ".$search_status;
 }
 if ($search_billed != '' && $search_billed >= 0) {
-	$sql .= ' AND e.billed = '.$search_billed;
+	$sql .= ' AND e.billed = '.((int) $search_billed);
 }
 if ($search_town) {
 	$sql .= natural_search('s.town', $search_town);
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 2c7ba7694dd..3b9a7892310 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -371,7 +371,7 @@ if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 if ($socid) {
-	$sql .= ' AND s.rowid = '.$socid;
+	$sql .= ' AND s.rowid = '.((int) $socid);
 }
 if ($search_status >= 0 && $search_status != '') {
 	$sql .= ' AND sp.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';
@@ -379,7 +379,7 @@ if ($search_status >= 0 && $search_status != '') {
 $sql .= dolSqlDateFilter("sp.date_livraison", $day, $month, $year);
 $sql .= dolSqlDateFilter("sp.date_valid", $dayvalid, $monthvalid, $yearvalid);
 if ($search_sale > 0) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 }
 if ($search_user > 0) {
 	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='supplier_proposal' AND tc.source='internal' AND c.element_id = sp.rowid AND c.fk_socpeople = ".$search_user;
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index c16817ad7a5..6d5f7022a41 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -719,10 +719,10 @@ class Ticket extends CommonObject
 					if (is_array($value) && count($value) > 0) {
 						$sql .= 'AND '.$key.' IN ('.$this->db->sanitize(implode(',', $value)).')';
 					} else {
-						$sql .= ' AND '.$key.' = '.$this->db->escape($value);
+						$sql .= ' AND '.$key.' = '.((int) $value);
 					}
 				} else {
-					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
+					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
 		}
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index f22a5200148..2fd363c7965 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -413,7 +413,7 @@ class WebsitePage extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || $key == 't.fk_website' || $key == 'status') {
-					$sqlwhere[] = $key.' = '.$value;
+					$sqlwhere[] = $key.' = '.((int) $value);
 				} elseif ($key == 'type_container') {
 					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'lang' || $key == 't.lang') {
@@ -515,7 +515,7 @@ class WebsitePage extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || $key == 't.fk_website' || $key == 'status') {
-					$sqlwhere[] = $key.' = '.$value;
+					$sqlwhere[] = $key.' = '.((int) $value);
 				} elseif ($key == 'type_container') {
 					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'lang' || $key == 't.lang') {
@@ -528,7 +528,7 @@ class WebsitePage extends CommonObject
 						}
 						$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
 					}
-					$stringtouse = $key." IN (".$this->db->sanitize(join(',', $listoflang)).")";
+					$stringtouse = $key." IN (".$this->db->sanitize(join(',', $listoflang), 1).")";
 					if ($foundnull) {
 						$stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
 					}
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 957173335c0..2074873a031 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -281,7 +281,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$morehtmlref .= '</div>';
 
 	if ($socid > 0) {
-		$object->next_prev_filter = 'te.fk_soc = '.$socid;
+		$object->next_prev_filter = 'te.fk_soc = '.((int) $socid);
 	}
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);

From b0fe08e411945e548acf7b7a3b37af2c99fd4669 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Apr 2021 19:21:23 +0200
Subject: [PATCH 312/928] Clean code

---
 htdocs/api/index.php                          |   2 +-
 .../Luracast/Restler/explorer/explorer.html   | 144 ------------------
 2 files changed, 1 insertion(+), 145 deletions(-)
 delete mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/explorer.html

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index c494730f795..d19754f9c35 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -119,7 +119,7 @@ if (preg_match('/api\/index\.php\/explorer/', $url) && !empty($conf->global->API
 
 // 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/                          called by swagger to build explorer page index.php/explorer/index.html
 // 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
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/explorer.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/explorer.html
deleted file mode 100644
index 7fedb694c17..00000000000
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/explorer.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="x-ua-compatible" content="IE=edge">
-  <title>Swagger UI</title>
-  <link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32" />
-  <link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16" />
-  <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
-  <link href='css/print.css' media='print' rel='stylesheet' type='text/css'/>
-
-  <script src='lib/object-assign-pollyfill.js' type='text/javascript'></script>
-  <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
-  <script src='lib/handlebars-4.0.5.js' type='text/javascript'></script>
-  <script src='lib/lodash.min.js' type='text/javascript'></script>
-  <script src='lib/backbone-min.js' type='text/javascript'></script>
-  <script src='swagger-ui.js' type='text/javascript'></script>
-  <script src='lib/highlight.9.1.0.pack.js' type='text/javascript'></script>
-  <script src='lib/highlight.9.1.0.pack_extended.js' type='text/javascript'></script>
-  <script src='lib/jsoneditor.min.js' type='text/javascript'></script>
-  <script src='lib/marked.js' type='text/javascript'></script>
-  <script src='lib/swagger-oauth.js' type='text/javascript'></script>
-
-  <!-- Some basic translations -->
-  <!-- <script src='lang/translator.js' type='text/javascript'></script> -->
-  <!-- <script src='lang/ru.js' type='text/javascript'></script> -->
-  <!-- <script src='lang/en.js' type='text/javascript'></script> -->
-
-  <script type="text/javascript">
-    $(function () {
-      var url = window.location.search.match(/url=([^&]+)/);
-      if (url && url.length > 1) {
-        url = decodeURIComponent(url[1]);
-      } else {
-        url = "swagger.json";
-      }
-
-      hljs.configure({
-        highlightSizeThreshold: 5000
-      });
-
-      // Pre load translate...
-      if(window.SwaggerTranslator) {
-        window.SwaggerTranslator.translate();
-      }
-      window.swaggerUi = new SwaggerUi({
-        url: url,
-        dom_id: "swagger-ui-container",
-        supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
-        onComplete: function(swaggerApi, swaggerUi){
-          if(typeof initOAuth == "function") {
-            initOAuth({
-              clientId: "your-client-id",
-              clientSecret: "your-client-secret-if-required",
-              realm: "your-realms",
-              appName: "your-app-name",
-              scopeSeparator: " ",
-              additionalQueryStringParams: {}
-            });
-          }
-
-          if(window.SwaggerTranslator) {
-            window.SwaggerTranslator.translate();
-          }
-          
-          addApiKeyAuthorization();
-        },
-        onFailure: function(data) {
-          log("Unable to Load SwaggerUI");
-        },
-        docExpansion: "none",
-        jsonEditor: false,
-        apisSorter: "alpha",
-        operationsSorter: "alpha",
-        defaultModelRendering: 'model',		/* example or model or schema */
-        defaultModelsExpandDepth: -1,
-        showRequestHeaders: false,
-        showOperationIds: false,
-        displayOperationIds: false,
-        displayRequestDuration: true
-      });
-
-      function addApiKeyAuthorization(){
-        var key = encodeURIComponent($('#input_apiKey')[0].value);
-        if(key && key.trim() != "") {
-	        /* @CHANGE LDR We set DOLAPIKEY into header */
-    	    /* log("added key " + key); */
-    	    log("added key");
-        
-            
-        	/* Disabled for security reason. We keep only param in header
-	        var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("api_key", key, "query");
-            window.swaggerUi.api.clientAuthorizations.add("api_key", apiKeyAuth);
-            log("added key " + key);
-            */
-	
-	        var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("DOLAPIKEY", key, "header");
-            window.swaggerUi.api.clientAuthorizations.add("api_key", apiKeyAuth);
-    	    /* log("header DOLAPIKEY added with value "+key); */
-    	    log("header DOLAPIKEY added");
-        }
-      }
-
-      $('#input_apiKey').change(addApiKeyAuthorization);
-      
-      window.swaggerUi.load();
-
-      function log() {
-        if ('console' in window) {
-          console.log.apply(console, arguments);
-        }
-      }
-  });
-  </script>
-  
-  <style>
-	.info_title, .info_description, .info_contact, .info_name, .info_url, .info_email, .info_license, #api_info, #input_baseUrl {
-		display: none !important;
-	}
-  </style>  
-</head>
-
-<body class="swagger-section">
-<div id="header" style="background-color: rgb(38,60,92); height: 17px;">
-  <div class="swagger-ui-wrap">
-    <a id="logo" href="#">Dolibarr REST API Explorer</a>
-    <form id='api_selector'>
-      <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
-      <div class='input'><input placeholder="DOLAPIKEY" id="input_apiKey" name="apiKey" type="text"/></div>
-      <div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div>
-    </form>
-  </div>
-</div>
-
-<div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
-<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
-</body>
-</html>

From 9e2ee5bf57d4b187ceea53ff874db63631a269d2 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Mon, 26 Apr 2021 19:29:56 +0200
Subject: [PATCH 313/928] add(pmp) PMP per entity

---
 htdocs/product/class/product.class.php        | 53 ++++++++++++++++++-
 htdocs/product/stock/card.php                 | 25 ++++++++-
 htdocs/product/stock/class/entrepot.class.php | 25 ++++++++-
 3 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 6ed0b4266a8..65a73814c8e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2181,12 +2181,52 @@ class Product extends CommonObject
 		} else {
 			$sql .= " pa.accountancy_code_buy, pa.accountancy_code_buy_intra, pa.accountancy_code_buy_export, pa.accountancy_code_sell, pa.accountancy_code_sell_intra, pa.accountancy_code_sell_export,";
 		}
-		$sql .= " p.stock,p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
+		//For MultiCompany PMP per entity
+		$separatedEntityPMP = false;
+		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
+			$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . MAIN_DB_PREFIX . "entity_product_pmp WHERE fk_product  = ".((int) $id)." AND entity = ".(int) $conf->entity);
+			if($this->db->num_rows($checkPMPPerEntity)>0){
+				$separatedEntityPMP = true;
+			}
+		}
+		
+		//For MultiCompany Stocks Sharings stock_reel includes only stocks shared with this entity
+		$separatedStock = false;
+		if (!empty($conf->global->MULTICOMPANY_STOCK_SHARING_ENABLED)){
+			global $mc;
+			$separatedStock = true;
+			$visibleWarehousesEntities = $conf->entity;
+			if(isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])){
+				$visibleWarehousesEntities .= "," . implode(",",$mc->sharings['stock']);
+			}
+		}
+		if($separatedStock){
+			$sql .= " SUM(sp.reel) as stock,";
+		}
+		else{
+			$sql .= " p.stock,";
+		}
+
+		if ($separatedEntityPMP){
+			$sql .= " ppe.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
+		}
+		else{
+			$sql .= " p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
+		}
 		$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
 		}
+		
+		if ($separatedEntityPMP) {
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "entity_product_pmp as ppe ON ppe.fk_product = p.rowid";
+		}
+
+		if($separatedStock){
+			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as sp ON sp.fk_product = p.rowid";
+		}
+
 		if ($id) {
 			$sql .= " WHERE p.rowid = ".((int) $id);
 		} else {
@@ -2200,6 +2240,17 @@ class Product extends CommonObject
 			}
 		}
 
+		if ($separatedEntityPMP) {
+		$sql .= " AND ppe.entity = " . (int) $conf->entity;
+		}
+
+		if($separatedStock){
+			$sql .= " AND sp.fk_entrepot IN (
+				SELECT rowid
+				FROM ".MAIN_DB_PREFIX."entrepot	WHERE entity IN (" . $visibleWarehousesEntities	."))";
+		}
+
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			unset($this->oldcopy);
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 0a77a39a0df..25cea1621c7 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -596,15 +596,38 @@ if ($action == 'create') {
 			$totalunit = 0;
 			$totalvalue = $totalvaluesell = 0;
 
-			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.pmp as ppmp, p.price, p.price_ttc, p.entity,";
+			//For MultiCompany PMP per entity
+			$separatedPMP = false;
+			if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
+				$separatedPMP = true;
+			}
+
+			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.price, p.price_ttc, p.entity,";
+			if ($separatedPMP) {
+				$sql .= " ppe.pmp as ppmp,";
+			}
+			else{
+				$sql .= " p.pmp as ppmp,";
+			}
+
 			$sql .= " ps.reel as value";
 			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 				$sql .= ",fk_unit";
 			}
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
+
+			if ($separatedPMP) {
+				$sql .= ", ".MAIN_DB_PREFIX."entity_product_pmp as ppe";
+			}
+
 			$sql .= " WHERE ps.fk_product = p.rowid";
 			$sql .= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse)
 			$sql .= " AND ps.fk_entrepot = ".$object->id;
+
+			if ($separatedPMP) {
+				$sql .= " AND ppe.fk_product = p.rowid AND ppe.entity = ". (int) $conf->entity;
+			}
+
 			$sql .= $db->order($sortfield, $sortorder);
 
 			dol_syslog('List products', LOG_DEBUG);
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 8bd250bc76e..53799617420 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -610,13 +610,36 @@ class Entrepot extends CommonObject
 	 */
 	public function nb_products()
 	{
+		global $conf;
 		// phpcs:enable
 		$ret = array();
 
-		$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
+		//For MultiCompany PMP per entity
+		$separatedPMP = false;
+		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
+			$separatedPMP = true;
+		}
+
+		if ($separatedPMP) {
+			$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * ppe.pmp) as value";
+		}
+		else{
+			$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
+		
 		$sql .= ", ".MAIN_DB_PREFIX."product as p";
+		
+		if ($separatedPMP) {
+			$sql .= ", ".MAIN_DB_PREFIX."entity_product_pmp as ppe";
+		}
+
 		$sql .= " WHERE ps.fk_entrepot = ".$this->id;
+
+		if ($separatedPMP) {
+			$sql .= " AND ppe.fk_product = p.rowid AND ppe.entity = ". (int) $conf->entity;
+		}
+		
 		$sql .= " AND ps.fk_product = p.rowid";
 
 		//print $sql;

From 8f7dd6211e9dee7b6f97d951749e40ed35704d72 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Apr 2021 19:55:46 +0200
Subject: [PATCH 314/928] fix css

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

diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index bd96eac7b0d..eab56b97a16 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -180,7 +180,7 @@ if ($id > 0 || !empty($ref)) {
 
 	//print '<br>';
 
-	$cssclass='fieldtitle';
+	$cssclass='titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	print dol_get_fiche_end();

From 1d162cc62ca8ff486afb558ccf80c8cfa83ad9b4 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Mon, 26 Apr 2021 20:06:45 +0200
Subject: [PATCH 315/928] lint(stickler)

---
 htdocs/product/class/product.class.php        | 27 +++++++------------
 htdocs/product/stock/card.php                 |  4 +--
 htdocs/product/stock/class/entrepot.class.php | 10 +++----
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index be18056c223..cefc4a27b23 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2185,32 +2185,30 @@ class Product extends CommonObject
 		$separatedEntityPMP = false;
 		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
 			$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . MAIN_DB_PREFIX . "entity_product_pmp WHERE fk_product  = ".((int) $id)." AND entity = ".(int) $conf->entity);
-			if($this->db->num_rows($checkPMPPerEntity)>0){
+			if( $this->db->num_rows($checkPMPPerEntity)>0 ){
 				$separatedEntityPMP = true;
 			}
 		}
-		
 		//For MultiCompany Stocks Sharings stock_reel includes only stocks shared with this entity
 		$separatedStock = false;
-		if (!empty($conf->global->MULTICOMPANY_STOCK_SHARING_ENABLED)){
+		if (!empty($conf->global->MULTICOMPANY_STOCK_SHARING_ENABLED)) {
 			global $mc;
 			$separatedStock = true;
 			$visibleWarehousesEntities = $conf->entity;
-			if(isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])){
-				$visibleWarehousesEntities .= "," . implode(",",$mc->sharings['stock']);
+			if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) {
+				$visibleWarehousesEntities .= "," . implode( ",", $mc->sharings['stock'] );
 			}
 		}
-		if($separatedStock){
+		if ($separatedStock) {
 			$sql .= " SUM(sp.reel) as stock,";
 		}
-		else{
+		else {
 			$sql .= " p.stock,";
 		}
-
-		if ($separatedEntityPMP){
+		if ($separatedEntityPMP) {
 			$sql .= " ppe.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		}
-		else{
+		else {
 			$sql .= " p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		}
 		$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";
@@ -2218,15 +2216,12 @@ class Product extends CommonObject
 		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
 		}
-		
 		if ($separatedEntityPMP) {
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "entity_product_pmp as ppe ON ppe.fk_product = p.rowid";
 		}
-
-		if($separatedStock){
+		if ($separatedStock) {
 			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as sp ON sp.fk_product = p.rowid";
 		}
-
 		if ($id) {
 			$sql .= " WHERE p.rowid = ".((int) $id);
 		} else {
@@ -2239,12 +2234,10 @@ class Product extends CommonObject
 				$sql .= " AND p.barcode = '".$this->db->escape($barcode)."'";
 			}
 		}
-
 		if ($separatedEntityPMP) {
 		$sql .= " AND ppe.entity = " . (int) $conf->entity;
 		}
-
-		if($separatedStock){
+		if ($separatedStock) {
 			$sql .= " AND sp.fk_entrepot IN (
 				SELECT rowid
 				FROM ".MAIN_DB_PREFIX."entrepot	WHERE entity IN (" . $visibleWarehousesEntities	."))";
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 865245aef72..86b97204cf0 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -605,8 +605,8 @@ if ($action == 'create') {
 			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.price, p.price_ttc, p.entity,";
 			if ($separatedPMP) {
 				$sql .= " ppe.pmp as ppmp,";
-			}
-			else{
+			} 
+			else {
 				$sql .= " p.pmp as ppmp,";
 			}
 
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 53799617420..f58f12f3240 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -622,8 +622,8 @@ class Entrepot extends CommonObject
 
 		if ($separatedPMP) {
 			$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * ppe.pmp) as value";
-		}
-		else{
+		} 
+		else {
 			$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
@@ -632,16 +632,12 @@ class Entrepot extends CommonObject
 		
 		if ($separatedPMP) {
 			$sql .= ", ".MAIN_DB_PREFIX."entity_product_pmp as ppe";
-		}
-
+		} 
 		$sql .= " WHERE ps.fk_entrepot = ".$this->id;
-
 		if ($separatedPMP) {
 			$sql .= " AND ppe.fk_product = p.rowid AND ppe.entity = ". (int) $conf->entity;
 		}
-		
 		$sql .= " AND ps.fk_product = p.rowid";
-
 		//print $sql;
 		$result = $this->db->query($sql);
 		if ($result) {

From 285fa4a506c47f0a4e97ec420904e492b963c229 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Mon, 26 Apr 2021 20:10:57 +0200
Subject: [PATCH 316/928] lint(stickler) again

---
 htdocs/product/class/product.class.php        | 10 +++++-----
 htdocs/product/stock/card.php                 |  1 -
 htdocs/product/stock/class/entrepot.class.php |  2 --
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index cefc4a27b23..1c803fefd7e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2185,7 +2185,7 @@ class Product extends CommonObject
 		$separatedEntityPMP = false;
 		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
 			$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . MAIN_DB_PREFIX . "entity_product_pmp WHERE fk_product  = ".((int) $id)." AND entity = ".(int) $conf->entity);
-			if( $this->db->num_rows($checkPMPPerEntity)>0 ){
+			if ($this->db->num_rows($checkPMPPerEntity)>0) {
 				$separatedEntityPMP = true;
 			}
 		}
@@ -2196,18 +2196,18 @@ class Product extends CommonObject
 			$separatedStock = true;
 			$visibleWarehousesEntities = $conf->entity;
 			if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) {
-				$visibleWarehousesEntities .= "," . implode( ",", $mc->sharings['stock'] );
+				$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
 			}
 		}
 		if ($separatedStock) {
 			$sql .= " SUM(sp.reel) as stock,";
-		}
+		} 
 		else {
 			$sql .= " p.stock,";
 		}
 		if ($separatedEntityPMP) {
 			$sql .= " ppe.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
-		}
+		} 
 		else {
 			$sql .= " p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		}
@@ -2235,7 +2235,7 @@ class Product extends CommonObject
 			}
 		}
 		if ($separatedEntityPMP) {
-		$sql .= " AND ppe.entity = " . (int) $conf->entity;
+			$sql .= " AND ppe.entity = " . (int) $conf->entity;
 		}
 		if ($separatedStock) {
 			$sql .= " AND sp.fk_entrepot IN (
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 86b97204cf0..b0b5cdfe2c9 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -609,7 +609,6 @@ if ($action == 'create') {
 			else {
 				$sql .= " p.pmp as ppmp,";
 			}
-
 			$sql .= " ps.reel as value";
 			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 				$sql .= ",fk_unit";
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index f58f12f3240..8777450fbb9 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -627,9 +627,7 @@ class Entrepot extends CommonObject
 			$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-		
 		$sql .= ", ".MAIN_DB_PREFIX."product as p";
-		
 		if ($separatedPMP) {
 			$sql .= ", ".MAIN_DB_PREFIX."entity_product_pmp as ppe";
 		} 

From 57118da2068acb06f8c11db0a82d2d81430f3f69 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Mon, 26 Apr 2021 20:13:55 +0200
Subject: [PATCH 317/928] lint(stickler)3rd

---
 htdocs/product/class/product.class.php        | 6 ++----
 htdocs/product/stock/card.php                 | 3 +--
 htdocs/product/stock/class/entrepot.class.php | 5 ++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1c803fefd7e..d79ae061ae9 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2201,14 +2201,12 @@ class Product extends CommonObject
 		}
 		if ($separatedStock) {
 			$sql .= " SUM(sp.reel) as stock,";
-		} 
-		else {
+		} else {
 			$sql .= " p.stock,";
 		}
 		if ($separatedEntityPMP) {
 			$sql .= " ppe.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
-		} 
-		else {
+		} else {
 			$sql .= " p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		}
 		$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index b0b5cdfe2c9..1faa19be499 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -605,8 +605,7 @@ if ($action == 'create') {
 			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.price, p.price_ttc, p.entity,";
 			if ($separatedPMP) {
 				$sql .= " ppe.pmp as ppmp,";
-			} 
-			else {
+			} else {
 				$sql .= " p.pmp as ppmp,";
 			}
 			$sql .= " ps.reel as value";
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 8777450fbb9..b51c0d4ea75 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -622,8 +622,7 @@ class Entrepot extends CommonObject
 
 		if ($separatedPMP) {
 			$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * ppe.pmp) as value";
-		} 
-		else {
+		} else {
 			$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
@@ -634,7 +633,7 @@ class Entrepot extends CommonObject
 		$sql .= " WHERE ps.fk_entrepot = ".$this->id;
 		if ($separatedPMP) {
 			$sql .= " AND ppe.fk_product = p.rowid AND ppe.entity = ". (int) $conf->entity;
-		}
+		} 
 		$sql .= " AND ps.fk_product = p.rowid";
 		//print $sql;
 		$result = $this->db->query($sql);

From c0b6dd92d7ffb39e76f4e077a495c4be233a2442 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Mon, 26 Apr 2021 20:15:32 +0200
Subject: [PATCH 318/928] lint(stickler)4th

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

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index b51c0d4ea75..b1c41d24ef3 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -629,11 +629,11 @@ class Entrepot extends CommonObject
 		$sql .= ", ".MAIN_DB_PREFIX."product as p";
 		if ($separatedPMP) {
 			$sql .= ", ".MAIN_DB_PREFIX."entity_product_pmp as ppe";
-		} 
+		}
 		$sql .= " WHERE ps.fk_entrepot = ".$this->id;
 		if ($separatedPMP) {
 			$sql .= " AND ppe.fk_product = p.rowid AND ppe.entity = ". (int) $conf->entity;
-		} 
+		}
 		$sql .= " AND ps.fk_product = p.rowid";
 		//print $sql;
 		$result = $this->db->query($sql);

From a296f81bc6424858207b6d55fc0db649de4c6579 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Mon, 26 Apr 2021 20:30:21 +0200
Subject: [PATCH 319/928] lint(travis)

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d79ae061ae9..83354384e8b 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2238,7 +2238,7 @@ class Product extends CommonObject
 		if ($separatedStock) {
 			$sql .= " AND sp.fk_entrepot IN (
 				SELECT rowid
-				FROM ".MAIN_DB_PREFIX."entrepot	WHERE entity IN (" . $visibleWarehousesEntities	."))";
+				FROM ".MAIN_DB_PREFIX."entrepot	WHERE entity IN (" . $this->db->sanitize($visibleWarehousesEntities)	."))";
 		}
 
 

From a29c26f299f349d00980e6f380bd0acc0ec2c598 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Apr 2021 21:07:46 +0200
Subject: [PATCH 320/928] Fix amount chosen lost

---
 htdocs/salaries/paiement_salary.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 5ab67c71c0e..a266a2ed88b 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -286,9 +286,10 @@ if ($action == 'create') {
 			if (!empty($conf->use_javascript_ajax)) {
 				print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmount' data-rowid='".$namef."' data-value='".($objp->amount - $sumpaid)."'");
 			} */
-			$remaintopay = $objp->amount - $sumpaid;
-			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'" value="'.$remaintopay.'">';
+			$valuetoshow = GETPOSTISSET($namef) ? GETPOST($namef) : ($objp->amount - $sumpaid);
+
+			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$valuetoshow.'">';
+			print '<input type="text" class="right width75" name="'.$namef.'" id="'.$namef.'" value="'.$valuetoshow.'">';
 		} else {
 			print '-';
 		}

From 8e67af8d58a2fe869f3a444692655a9976e98af6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Apr 2021 21:09:56 +0200
Subject: [PATCH 321/928] Update api_products.class.php

---
 htdocs/product/class/api_products.class.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 0ceb082bd93..24bb22f41c4 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -158,16 +158,16 @@ class Products extends DolibarrApi
 	 *
 	 * Get a list of products
 	 *
-	 * @param  string $sortfield  Sort field
-	 * @param  string $sortorder  Sort order
-	 * @param  int    $limit      Limit for list
-	 * @param  int    $page       Page number
-	 * @param  int    $mode       Use this param to filter list (0 for all, 1 for only product, 2 for only service)
-	 * @param  int    $category   Use this param to filter list by category
-	 * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
-	 * @param  bool   $ids_only   Return only IDs of product instead of all properties (faster, above all if list is long)
-	 * @param  bool   $without_variants   Return only products, not variants
-	 * @return array                Array of product objects
+	 * @param  string $sortfield  			Sort field
+	 * @param  string $sortorder  			Sort order
+	 * @param  int    $limit      			Limit for list
+	 * @param  int    $page       			Page number
+	 * @param  int    $mode       			Use this param to filter list (0 for all, 1 for only product, 2 for only service)
+	 * @param  int    $category   			Use this param to filter list by category
+	 * @param  string $sqlfilters 			Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
+	 * @param  bool   $ids_only   			Return only IDs of product instead of all properties (faster, above all if list is long)
+	 * @param  bool   $without_variants   	Return only parent products, not variants
+	 * @return array                		Array of product objects
 	 */
 	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false, $without_variants = false)
 	{

From 3d5002b8f63bdf3e518ace6ffcc31ef526331017 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Apr 2021 22:42:40 +0200
Subject: [PATCH 322/928] Update list.php

---
 htdocs/fichinter/list.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 3a09dab777f..77842037763 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -245,13 +245,19 @@ if (!empty($conf->contrat->enabled)) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contrat as c on f.fk_contrat = c.rowid";
 }
 
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (f.rowid = ef.fk_object)";
-if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (f.rowid = ef.fk_object)";
+}
+if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
+}
 // Add table from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-if (!$user->rights->societe->client->voir && empty($socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && empty($socid)) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
 $sql .= " WHERE f.entity IN (".getEntity('intervention').")";

From fa1ad826631b58f85c1272e6df0ba079367f8fd5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Apr 2021 23:42:49 +0200
Subject: [PATCH 323/928] Fix id in comment

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

diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index 79d77e6d6af..97fca0f230b 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -100,7 +100,7 @@ insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 0
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 13, 1301, '', 0, 'Algerie');
 
 
--- Andorra Regions (id country=18)
+-- Andorra Regions (id country=34)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 34, 34000, 'AD', NULL, 'Andorra');
 
 

From 8ba08552ca23ff232cbeeeaebf3cb688147a656c Mon Sep 17 00:00:00 2001
From: kastoras <kastoras_1@hotmail.com>
Date: Tue, 27 Apr 2021 01:01:27 +0300
Subject: [PATCH 324/928] New/NEW Product Variants API, add variant stock to
 response

When acessing product variants via GET API /products/{id}/variants, Include stock_warehouse data to the response
---
 htdocs/product/class/api_products.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 9b06b30765d..78afe88c310 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -25,6 +25,7 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.class.php';
 
 /**
  * API class for products
@@ -1574,6 +1575,11 @@ class Products extends DolibarrApi
 			$prodc2vp = new ProductCombination2ValuePair($this->db);
 			$combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
 			$combinations[$key] = $this->_cleanObjectDatas($combinations[$key]);
+
+			$productModel = new Product($this->db);
+			$productModel->fetch((int)$combination->fk_product_child);
+			$productModel->load_stock();
+			$combinations[$key]->stock_warehouse = $this->_cleanObjectDatas($productModel)->stock_warehouse;
 		}
 
 		return $combinations;

From 1c1e111b0c57608ee07c7f9ae352ddc53e82cdcb Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 26 Apr 2021 22:06:11 +0000
Subject: [PATCH 325/928] Fixing style errors.

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

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 78afe88c310..4d06cbce5bc 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -1577,7 +1577,7 @@ class Products extends DolibarrApi
 			$combinations[$key] = $this->_cleanObjectDatas($combinations[$key]);
 
 			$productModel = new Product($this->db);
-			$productModel->fetch((int)$combination->fk_product_child);
+			$productModel->fetch((int) $combination->fk_product_child);
 			$productModel->load_stock();
 			$combinations[$key]->stock_warehouse = $this->_cleanObjectDatas($productModel)->stock_warehouse;
 		}

From 5bfedbc248ca10e126dd330a35b35716f4d1a72e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 00:20:51 +0200
Subject: [PATCH 326/928] Fix regression

---
 htdocs/bookmarks/card.php | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index f71a750027f..198247bb355 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -153,7 +153,7 @@ if ($action == 'create') {
 
 	print load_fiche_titre($langs->trans("NewBookmark"));
 
-	print dol_get_fiche_head($head, $hselected, $langs->trans("Bookmark"), 0, 'bookmark');
+	print dol_get_fiche_head($head, $hselected, $langs->trans("Bookmark"), -1, 'bookmark');
 
 	print '<table class="border centpercent tableforfieldcreate">';
 
@@ -171,7 +171,7 @@ if ($action == 'create') {
 
 	// Owner
 	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
-	print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 0, '', 0, GETPOSTISSET('userid') ? GETPOST('userid', 'int') : array($user->id), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300');
+	print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 0, '', 0, ($user->admin ? '' : array($user->id)), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300');
 	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
 
 	// Position
@@ -193,20 +193,8 @@ if ($action == 'create') {
 
 
 if ($id > 0 && !preg_match('/^add/i', $action)) {
-	/*
-	 * Fact bookmark mode or visually edition
-	 */
 	$object->fetch($id);
 
-	$hselected = 'card';
-	$head = array(
-		array(
-			'',
-			$langs->trans('Card'),
-			'card'
-		)
-	);
-
 	if ($action == 'edit') {
 		print '<form name="edit" method="POST" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -216,7 +204,6 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
 
-
 	print dol_get_fiche_head($head, $hselected, $langs->trans("Bookmark"), -1, 'bookmark');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/bookmarks/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';

From 6353084777b62ed3adf0344146b9f052ef6c6f52 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 27 Apr 2021 00:22:39 +0200
Subject: [PATCH 327/928] init

---
 htdocs/admin/pdf.php                 |   4 +
 htdocs/admin/pdf_intervention.php    | 110 ++++++++++++++++++++++++
 htdocs/admin/pdf_invoice.php         | 110 ++++++++++++++++++++++++
 htdocs/admin/pdf_order.php           | 110 ++++++++++++++++++++++++
 htdocs/admin/pdf_project.php         | 110 ++++++++++++++++++++++++
 htdocs/admin/pdf_proposal.php        | 123 +++++++++++++++++++++++++++
 htdocs/admin/pdf_recruitment.php     | 110 ++++++++++++++++++++++++
 htdocs/admin/pdf_supplierinvoice.php | 110 ++++++++++++++++++++++++
 htdocs/admin/pdf_supplierorder.php   | 110 ++++++++++++++++++++++++
 htdocs/core/lib/pdf.lib.php          |  80 +++++++++++++++++
 htdocs/langs/en_US/admin.lang        |  12 +++
 11 files changed, 989 insertions(+)
 create mode 100644 htdocs/admin/pdf_intervention.php
 create mode 100644 htdocs/admin/pdf_invoice.php
 create mode 100644 htdocs/admin/pdf_order.php
 create mode 100644 htdocs/admin/pdf_project.php
 create mode 100644 htdocs/admin/pdf_proposal.php
 create mode 100644 htdocs/admin/pdf_recruitment.php
 create mode 100644 htdocs/admin/pdf_supplierinvoice.php
 create mode 100644 htdocs/admin/pdf_supplierorder.php

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index a5c2770a9c4..0ee42d6cddf 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -161,6 +161,10 @@ if (class_exists('TCPDI')) {
 
 print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
 
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'general', $langs->trans("PDF"), -1, 'pdf');
+
 print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFDesc"), $s)."</span><br>\n";
 print "<br>\n";
 
diff --git a/htdocs/admin/pdf_intervention.php b/htdocs/admin/pdf_intervention.php
new file mode 100644
index 00000000000..f7a0244f9ab
--- /dev/null
+++ b/htdocs/admin/pdf_intervention.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'intervention', $langs->trans("Intervention"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFInterventionDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_invoice.php b/htdocs/admin/pdf_invoice.php
new file mode 100644
index 00000000000..69859b9ea30
--- /dev/null
+++ b/htdocs/admin/pdf_invoice.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'invoice', $langs->trans("Invoice"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFInvoiceDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_order.php b/htdocs/admin/pdf_order.php
new file mode 100644
index 00000000000..e3a725eb33a
--- /dev/null
+++ b/htdocs/admin/pdf_order.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'order', $langs->trans("Order"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFOrderDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_project.php b/htdocs/admin/pdf_project.php
new file mode 100644
index 00000000000..7e05c24ed56
--- /dev/null
+++ b/htdocs/admin/pdf_project.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'project', $langs->trans("Project"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFProjectDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_proposal.php b/htdocs/admin/pdf_proposal.php
new file mode 100644
index 00000000000..dc35a1cd538
--- /dev/null
+++ b/htdocs/admin/pdf_proposal.php
@@ -0,0 +1,123 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'proposal', $langs->trans("Proposals"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFProposalDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_GENERATE_PROPOSALS_WITH_PICTURE").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_GENERATE_PROPOSALS_WITH_PICTURE');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("MAIN_GENERATE_PROPOSALS_WITH_PICTURE", $arrval, $conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE);
+}
+print '</td></tr>';
+
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING", $arrval, $conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING);
+}
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_recruitment.php b/htdocs/admin/pdf_recruitment.php
new file mode 100644
index 00000000000..4e81e70802c
--- /dev/null
+++ b/htdocs/admin/pdf_recruitment.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'recruitment', $langs->trans("recruitment"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFRecruitmentDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_supplierinvoice.php b/htdocs/admin/pdf_supplierinvoice.php
new file mode 100644
index 00000000000..c244e70457b
--- /dev/null
+++ b/htdocs/admin/pdf_supplierinvoice.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'supplierinvoice', $langs->trans("supplierinvoice"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFSupplierinvoiceDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_supplierorder.php b/htdocs/admin/pdf_supplierorder.php
new file mode 100644
index 00000000000..98340aced97
--- /dev/null
+++ b/htdocs/admin/pdf_supplierorder.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'supplierorder', $langs->trans("supplierorder"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFSupplierorderDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 529355b94b2..1d55b45c221 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2015-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2019       Lenin Rivas           	<lenin.rivas@servcom-it.com>
  * Copyright (C) 2020       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +36,85 @@
  */
 
 
+/**
+ *  Return array head with list of tabs to view object informations.
+ *
+ *  @return	array   	        head array with tabs
+ */
+function pdf_admin_prepare_head()
+{
+	global $langs, $conf, $user;
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf.php';
+	$head[$h][1] = $langs->trans("Général");
+	$head[$h][2] = 'general';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'pdf_admin');
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_project.php';
+	$head[$h][1] = $langs->trans("Project");
+	$head[$h][2] = 'project';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_proposal.php';
+	$head[$h][1] = $langs->trans("Proposal");
+	$head[$h][2] = 'proposal';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_order.php';
+	$head[$h][1] = $langs->trans("Order");
+	$head[$h][2] = 'order';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_invoice.php';
+	$head[$h][1] = $langs->trans("Invoice");
+	$head[$h][2] = 'invoice';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_Ticket.php';
+	$head[$h][1] = $langs->trans("Ticket");
+	$head[$h][2] = 'ticket';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_intervention.php';
+	$head[$h][1] = $langs->trans("Intervention");
+	$head[$h][2] = 'intervention';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierproposal.php';
+	$head[$h][1] = $langs->trans("SupplierProposal");
+	$head[$h][2] = 'supplierproposal';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierorder.php';
+	$head[$h][1] = $langs->trans("SupplierOrder");
+	$head[$h][2] = 'supplierorder';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierinvoice.php';
+	$head[$h][1] = $langs->trans("SuppliersInvoice");
+	$head[$h][2] = 'supplierinvoice';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_recruitment.php';
+	$head[$h][1] = $langs->trans("Recruitment");
+	$head[$h][2] = 'recruitment';
+	$h++;
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'pdf_admin', 'remove');
+
+	return $head;
+}
+
+
 /**
  *	Return array with format properties of default PDF format
  *
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6a11c26c50c..4fb5952bf5b 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -398,6 +398,16 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
+PDFProjectDesc=PDF Option for project
+PDFProposalDesc=PDF Option for proposal
+PDFOrderDesc=PDF Option for order
+PDFInvoiceDesc=PDF Option for invoice
+PDFTicketDesc=PDF Option for ticket
+PDFInterventionDesc=PDF option for intervention
+PDFSupplierproposalDesc=PDF Option for supplier proposal
+PDFSupplierorderDesc=PDF Option for supplier order
+PDFSupplierinvoiceDesc=PDF Option for supplier invoice
+PDFRecruitmentDesc=PDF Option for recrutment
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -1977,6 +1987,8 @@ MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal ligne
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2

From e7242cb87fcb7faef52e368b22caf7ecf630a431 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 27 Apr 2021 00:23:59 +0200
Subject: [PATCH 328/928] next

---
 htdocs/admin/pdf_supplierproposal.php | 110 ++++++++++++++++++++++++++
 htdocs/admin/pdf_ticket.php           | 110 ++++++++++++++++++++++++++
 2 files changed, 220 insertions(+)
 create mode 100644 htdocs/admin/pdf_supplierproposal.php
 create mode 100644 htdocs/admin/pdf_ticket.php

diff --git a/htdocs/admin/pdf_supplierproposal.php b/htdocs/admin/pdf_supplierproposal.php
new file mode 100644
index 00000000000..45fd337354a
--- /dev/null
+++ b/htdocs/admin/pdf_supplierproposal.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'supplierproposal', $langs->trans("supplierproposal"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFSupplierproposalDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_ticket.php b/htdocs/admin/pdf_ticket.php
new file mode 100644
index 00000000000..b8fbaed3b5c
--- /dev/null
+++ b/htdocs/admin/pdf_ticket.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'ticket', $langs->trans("Ticket"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFTicketDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();

From 29b1f2b58af9febaba2d7624549494871ed25fe7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 00:48:39 +0200
Subject: [PATCH 329/928] Look and feel v14

---
 htdocs/bookmarks/card.php        | 23 ++++++++++++++---------
 htdocs/bookmarks/list.php        |  4 ++--
 htdocs/theme/eldy/global.inc.php |  1 +
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 198247bb355..207395c267b 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -46,6 +46,9 @@ $position = GETPOST("position", "int");
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $object = new Bookmark($db);
+if ($id > 0) {
+	$object->fetch($id);
+}
 
 
 /*
@@ -133,7 +136,7 @@ $form = new Form($db);
 $head = array();
 $h = 1;
 
-$head[$h][0] = $_SERVER["PHP_SELF"].($object->id ? 'id='.$object->id : '');
+$head[$h][0] = $_SERVER["PHP_SELF"].($object->id ? '?id='.$object->id : '');
 $head[$h][1] = $langs->trans("Bookmark");
 $head[$h][2] = 'card';
 $h++;
@@ -157,20 +160,20 @@ if ($action == 'create') {
 
 	print '<table class="border centpercent tableforfieldcreate">';
 
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input id="titlebookmark" class="flat minwidth300" name="title" value="'.dol_escape_htmltag($title).'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input id="titlebookmark" class="flat minwidth300" name="title" value="'.dol_escape_htmltag($title).'"></td><td class="hideonsmartphone"><span class="opacitymedium">'.$langs->trans("SetHereATitleForLink").'</span></td></tr>';
 	dol_set_focus('#titlebookmark');
 
 	// Url
-	print '<tr><td class="fieldrequired">'.$langs->trans("UrlOrLink").'</td><td><input class="flat quatrevingtpercent" name="url" value="'.dol_escape_htmltag($url).'"></td><td class="hideonsmartphone">'.$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"><span class="opacitymedium">'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</span></td></tr>';
 
 	// Target
 	print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
 	$liste = array(0=>$langs->trans("ReplaceWindow"), 1=>$langs->trans("OpenANewWindow"));
 	print $form->selectarray('target', $liste, 1);
-	print '</td><td class="hideonsmartphone">'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</td></tr>';
+	print '</td><td class="hideonsmartphone"><span class="opacitymedium">'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</span></td></tr>';
 
 	// Owner
-	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
+	print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
 	print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 0, '', 0, ($user->admin ? '' : array($user->id)), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300');
 	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
 
@@ -193,7 +196,6 @@ if ($action == 'create') {
 
 
 if ($id > 0 && !preg_match('/^add/i', $action)) {
-	$object->fetch($id);
 
 	if ($action == 'edit') {
 		print '<form name="edit" method="POST" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data">';
@@ -246,7 +248,10 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 	if ($action == 'edit') {
 		print '<input class="flat minwidth500 quatrevingtpercent" name="url" value="'.(GETPOSTISSET("url") ? GETPOST("url") : $object->url).'">';
 	} else {
-		print '<a href="'.(preg_match('/^http/i', $object->url) ? $object->url : DOL_URL_ROOT.$object->url).'"'.($object->target ? ' target="_blank"' : '').'>'.$object->url.'</a>';
+		print '<a href="'.(preg_match('/^http/i', $object->url) ? $object->url : DOL_URL_ROOT.$object->url).'"'.($object->target ? ' target="_blank"' : '').'>';
+		print img_picto('', 'globe', 'class="paddingright"');
+		print $object->url;
+		print '</a>';
 	}
 	print '</td></tr>';
 
@@ -264,7 +269,7 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 	}
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
+	print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
 	if ($action == 'edit' && $user->admin) {
 		print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	} else {
@@ -273,7 +278,7 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 			$fuser->fetch($object->fk_user);
 			print $fuser->getNomUrl(1);
 		} else {
-			print $langs->trans("Public");
+			print '<span class="opacitymedium">'.$langs->trans("Everybody").'</span>';
 		}
 	}
 	print '</td></tr>';
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 03310c3f593..7d644d3a103 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -181,7 +181,7 @@ print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "b.rowid", "", $param, 'ali
 print_liste_field_titre("Title", $_SERVER["PHP_SELF"], "b.title", "", $param, 'align="left"', $sortfield, $sortorder);
 print_liste_field_titre("Link", $_SERVER["PHP_SELF"], "b.url", "", $param, 'align="left"', $sortfield, $sortorder);
 print_liste_field_titre("Target", '', '', '', '', 'align="center"');
-print_liste_field_titre("Owner", $_SERVER["PHP_SELF"], "u.lastname", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Visibility", $_SERVER["PHP_SELF"], "u.lastname", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "b.dateb", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre("Position", $_SERVER["PHP_SELF"], "b.position", "", $param, 'class="right"', $sortfield, $sortorder);
 print_liste_field_titre('');
@@ -253,7 +253,7 @@ while ($i < min($num, $limit)) {
 		$tmpuser = $cacheOfUsers[$obj->fk_user];
 		print $tmpuser->getNomUrl(1);
 	} else {
-		print $langs->trans("Public");
+		print '<span class="opacitymedium">'.$langs->trans("Everybody").'</span>';
 		if (!$user->admin) {
 			$candelete = false;
 			$canedit = false;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3622d77de2f..1c6f711b154 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -143,6 +143,7 @@ input {
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
 	background-color: var(--inputbackgroundcolor);
 	color: var(--colortext);
+	border-radius: 2px;
 }
 select.vmenusearchselectcombo {
 	background-color: unset;

From f54d14bfd6f97d213eea8cfea2195d5757232577 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 01:05:14 +0200
Subject: [PATCH 330/928] Add method checkValForAPI to clean data from API
 input

---
 htdocs/api/class/api.class.php                | 24 ++++++++++---------
 .../action/class/api_agendaevents.class.php   |  8 ++++---
 .../bank/class/api_bankaccounts.class.php     |  5 ++--
 .../template/class/api_mymodule.class.php     |  4 ++--
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 356caa24ec2..6cb40825ee7 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -73,22 +73,24 @@ class DolibarrApi
 	}
 
 	/**
-	 * Executed method when API is called without parameter
+	 * Check and convert a string depending on its type/name.
 	 *
 	 * Display a short message an return a http code 200
 	 *
-	 * @return array
+	 * @param	string		$field		Field name
+	 * @param	string		$value		Value to check/clean
+	 * @param	stdClass	$object		Object
+	 * @return 	string					Value cleaned
 	 */
-	/* Disabled, most APIs does not share same signature for method index
-	function index()
+	protected function checkValForAPI($field, $value, $object)
 	{
-		return array(
-			'success' => array(
-				'code' => 200,
-				'message' => __class__.' is up and running!'
-			)
-		);
-	}*/
+		// TODO Use type detected in $object->fields
+		if (in_array($field, array('note', 'note_private', 'note_public', 'desc', 'description'))) {
+			return checkVal($value, 'restricthtml');
+		} else {
+			return checkVal($value, 'alphanohtml');
+		}
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 5d57b9624e3..75b9ae355e8 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -217,7 +217,7 @@ class AgendaEvents extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
-			$this->actioncomm->$field = $value;
+			$this->actioncomm->$field = $this->checkValForAPI($field, $value, $this->actioncomm);
 		}
 		/*if (isset($request_data["lines"])) {
 		  $lines = array();
@@ -226,6 +226,7 @@ class AgendaEvents extends DolibarrApi
 		  }
 		  $this->expensereport->lines = $lines;
 		}*/
+
 		if ($this->actioncomm->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating event", array_merge(array($this->actioncomm->error), $this->actioncomm->errors));
 		}
@@ -268,7 +269,8 @@ class AgendaEvents extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
-			$this->actioncomm->$field = $value;
+
+			$this->actioncomm->$field = $this->checkValForAPI($field, $value, $this->actioncomm);
 		}
 
 		if ($this->actioncomm->update(DolibarrApiAccess::$user, 1) > 0) {
@@ -299,7 +301,7 @@ class AgendaEvents extends DolibarrApi
 		}
 
 		if (!DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
-			throw new RestException(401, "Insufficient rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+			throw new RestException(401, "Insufficient rights to delete an Agenda Event of owner id ".$this->actioncomm->userownerid.' Your id is '.DolibarrApiAccess::$user->id);
 		}
 
 		if (!$result) {
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 8cdd33425d6..4afeac70124 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -29,7 +29,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
  */
 class BankAccounts extends DolibarrApi
 {
-
 	/**
 	 * array $FIELDS Mandatory fields, checked when creating an object
 	 */
@@ -158,7 +157,7 @@ class BankAccounts extends DolibarrApi
 
 		$account = new Account($this->db);
 		foreach ($request_data as $field => $value) {
-			$account->$field = $value;
+			$account->$field = $this->checkValForAPI($field, $value, $account);
 		}
 		// Date of the initial balance (required to create an account).
 		$account->date_solde = time();
@@ -333,7 +332,7 @@ class BankAccounts extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
-			$account->$field = $value;
+			$account->$field = $this->checkValForAPI($field, $value, $account);
 		}
 
 		if ($account->update(DolibarrApiAccess::$user) > 0) {
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 47a3ac984f9..e4b5fcca219 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -213,7 +213,7 @@ class MyModuleApi extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
-			$this->myobject->$field = $value;
+			$this->myobject->$field = $this->checkValForAPI($field, $value, $this->myobject);
 		}
 
 		// Clean data
@@ -255,7 +255,7 @@ class MyModuleApi extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
-			$this->myobject->$field = $value;
+			$this->myobject->$field = $this->checkValForAPI($field, $value, $this->myobject);
 		}
 
 		// Clean data

From d2b91e934af0dd2a745d6329f7332b5a09d15366 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 01:09:46 +0200
Subject: [PATCH 331/928] Clean code

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

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 75b9ae355e8..f8b9a2a353f 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -400,7 +400,9 @@ class AgendaEvents extends DolibarrApi
 		unset($object->civility_id);
 		unset($object->contact);
 		unset($object->societe);
-
+		unset($object->demand_reason_id);
+		unset($object->transport_mode_id);
+		unset($object->region_id);
 		unset($object->actions);
 		unset($object->lines);
 

From 539954f7604e191ecab4513187aa8773e6207554 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 01:12:40 +0200
Subject: [PATCH 332/928] Clean code

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

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index f8b9a2a353f..68da91d6ce2 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -405,6 +405,7 @@ class AgendaEvents extends DolibarrApi
 		unset($object->region_id);
 		unset($object->actions);
 		unset($object->lines);
+		unset($object->modelpdf);
 
 		return $object;
 	}

From efbed70286656a5758bfd9be2b0c6f7b9d64e640 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 01:17:26 +0200
Subject: [PATCH 333/928] Update card.php

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 31cc5c3b6f3..8164ece1327 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -196,8 +196,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
-	} // Change status of invoice
-	elseif ($action == 'reopen' && $usercanreopen) {
+	} elseif ($action == 'reopen' && $usercanreopen) {
 		$result = $object->fetch($id);
 
 		if ($object->statut == Facture::STATUS_CLOSED || ($object->statut == Facture::STATUS_ABANDONED && ($object->close_code != 'replaced' || $object->getIdReplacingInvoice() == 0)) || ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 1)) {    // ($object->statut == 1 && $object->paye == 1) should not happened but can be found when data are corrupted

From e9b8e817738499d9470c34bbdb54fd2955270d21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 01:45:10 +0200
Subject: [PATCH 334/928] Update advtargetemailing.class.php

---
 htdocs/comm/mailing/class/advtargetemailing.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index cb539768cf9..b43daf4bf0c 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -641,8 +641,8 @@ class AdvanceTargetingMailing extends CommonObject
 							$sqlwhere[]= " (te.".$key." = ".$arrayquery['options_'.$key].")";
 						}
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
-						if ($arrayquery['options_'.$key] > 0){
-                                                        $sqlwhere[]= " (te.".$key." = ".((int) $arrayquery['options_'.$key]).")";
+						if ($arrayquery['options_'.$key] > 0) {
+							$sqlwhere[]= " (te.".$key." = ".((int) $arrayquery['options_'.$key]).")";
 						}
 					} else {
 						if (is_array($arrayquery['options_'.$key])) {

From 25e3beb3eeb5e10bd15a243986e27359e99301ef Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 27 Apr 2021 01:55:51 +0200
Subject: [PATCH 335/928]  $object::STATUS_RESILIATE

---
 htdocs/public/payment/paymentok.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 6bbfd1e3b31..ecd74445311 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -394,7 +394,7 @@ if ($ispaymentok) {
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-				$result = $object->status == -2 ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
+				$result = $object->status == $object::STATUS_RESILIATE ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
 				if ($result < 0 || empty($object->datevalid)) {
 					$error++;
 					$errmsg = $object->error;

From 12a4bc64adb983e6a76325c8bd6183d7cde962d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 02:01:46 +0200
Subject: [PATCH 336/928] Remove $_REQUEST

---
 htdocs/compta/paiement/card.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index ff9f93bc297..680a8c501a2 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -109,14 +109,13 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
 	if ($object->validate($user) > 0)
 	{
 		$db->commit();
-		
+
 		// Loop on each invoice linked to this payment to rebuild PDF
         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
             $outputlangs = $langs;
-            if (!empty($_REQUEST['lang_id']))
-            {
+            if (GETPOST('lang_id', 'aZ09')) {
                 $outputlangs = new Translate("", $conf);
-                $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+                $outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
             }
 
             $hidedetails = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0;

From 27aa7cdb48cb08ee3625f4e5a4042d173b6a35a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 02:08:36 +0200
Subject: [PATCH 337/928] Fix bad merge

---
 htdocs/compta/paiement/card.php | 2 +-
 htdocs/public/members/new.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 680a8c501a2..1bc1270e2d6 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -148,7 +148,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
                             break;
                         }
 
-                        if ($invoice->generateDocument($fac->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref) < 0) {
+                        if ($invoice->generateDocument($invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref) < 0) {
                             $errors++;
                             setEventMessages($invoice->error, $invoice->errors, 'errors');
                             break;
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 3d0ecc6fd16..cddfd0524b1 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -212,7 +212,7 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Email'))."<br>\n";
 	} elseif (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
-		+		$langs->load('errors');
+		$langs->load('errors');
 		$error++;
 		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
 	}

From 098582d7a738241d59555107e375cad5f6145e46 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 02:09:43 +0200
Subject: [PATCH 338/928] Fix bad merge

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

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 17cfeaca8dc..d9a1d73ec27 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -148,7 +148,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->
                             break;
                         }
 
-                        if ($invoice->generateDocument($fac->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref) < 0) {
+                        if ($invoice->generateDocument($invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref) < 0) {
                             $errors++;
                             setEventMessage($invoice->error, $invoice->errors, 'errors');
                             break;

From c7f38c4cf03dffac3291854ee5f0008725167648 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 02:10:52 +0200
Subject: [PATCH 339/928] Fix bad var

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

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index f54417b8a6f..3f9e3551edd 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -148,7 +148,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->
                             break;
                         }
 
-                        if ($invoice->generateDocument($fac->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref) < 0) {
+                        if ($invoice->generateDocument($invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref) < 0) {
                             $errors++;
                             setEventMessage($invoice->error, $invoice->errors, 'errors');
                             break;

From 2e9cf8d00b0c347cbc6c2bcfe94643f1be30baae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 02:15:58 +0200
Subject: [PATCH 340/928] Fix phpcs

---
 htdocs/compta/paiement/card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 3f9e3551edd..dc892029829 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -165,7 +165,6 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->
                 $errors++;
                 setEventMessage($db->error, $db->errors, 'errors');
             }
-
 		}
 
         if (! $errors) {

From ea08dfff5a697fc1d415bb3561ff5277767336ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 02:21:02 +0200
Subject: [PATCH 341/928] Package for v14

---
 build/rpm/dolibarr_fedora.spec   | 2 ++
 build/rpm/dolibarr_generic.spec  | 5 ++++-
 build/rpm/dolibarr_mandriva.spec | 2 ++
 build/rpm/dolibarr_opensuse.spec | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index d50c91d1f05..662c80adf6c 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -185,6 +185,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
+%_datadir/dolibarr/htdocs/eventorganization
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -206,6 +207,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/mrp
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
+%_datadir/dolibarr/htdocs/partnership
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
 %_datadir/dolibarr/htdocs/printing
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 4541868a04f..72cb7599b45 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -67,7 +67,8 @@ Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mbstring
 Requires: mysql-server, mysql 
 Requires: php-mysqli >= 4.1.0 
 %endif
-%endif
+%endif%_datadir/dolibarr/htdocs/eventorganization
+
 %endif
 
 # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
@@ -265,6 +266,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
+%_datadir/dolibarr/htdocs/eventorganization
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -286,6 +288,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/mrp
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
+%_datadir/dolibarr/htdocs/partnership
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
 %_datadir/dolibarr/htdocs/printing
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index d618b5729d5..a71a53e690f 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -182,6 +182,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
+%_datadir/dolibarr/htdocs/eventorganization
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -203,6 +204,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/mrp
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
+%_datadir/dolibarr/htdocs/partnership
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
 %_datadir/dolibarr/htdocs/printing
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 230a8946e99..0d86e4297cc 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -193,6 +193,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
+%_datadir/dolibarr/htdocs/eventorganization
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -214,6 +215,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/mrp
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
+%_datadir/dolibarr/htdocs/partnership
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
 %_datadir/dolibarr/htdocs/printing

From db92de2a22874047cd444410ab3fd4d373ed6700 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 27 Apr 2021 02:36:47 +0200
Subject: [PATCH 342/928] Draft and resiliated member could (re)validate

---
 htdocs/public/payment/paymentok.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index ecd74445311..37efcbadbd0 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -394,7 +394,7 @@ if ($ispaymentok) {
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-				$result = $object->status == $object::STATUS_RESILIATE ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
+				$result = $object->status < $object::STATUS_DRAFT ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
 				if ($result < 0 || empty($object->datevalid)) {
 					$error++;
 					$errmsg = $object->error;

From 5bb2531364f968ad77ac9de2cba9e6461e6d0c41 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 02:52:24 +0200
Subject: [PATCH 343/928] Enhance ticket module

---
 htdocs/core/class/html.formticket.class.php | 14 ++++++++++----
 htdocs/public/ticket/create_ticket.php      |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index c5c3b38b29b..7d012077700 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -169,13 +169,15 @@ class FormTicket
 		if ($this->withref) {
 			// Ref
 			$defaultref = $ticketstat->getDefaultRef();
-			print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="18" type="text" name="ref" value="'.(GETPOST("ref", 'alpha') ? GETPOST("ref", 'alpha') : $defaultref).'"></td></tr>';
+			print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td>';
+			print '<input type="text" name="ref" value="'.dol_escape_htmltag(GETPOST("ref", 'alpha') ? GETPOST("ref", 'alpha') : $defaultref).'">';
+			print '</td></tr>';
 		}
 
 		// TITLE
 		if ($this->withemail) {
 			print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">'.$langs->trans("Email").'</span></label></td><td>';
-			print '<input  class="text minwidth200" id="email" name="email" value="'.(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $subject).'" />';
+			print '<input  class="text minwidth200" id="email" name="email" value="'.(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $subject).'" autofocus>';
 			print '</td></tr>';
 		}
 
@@ -313,7 +315,7 @@ class FormTicket
 			if ($this->withfile == 2) { // Can add other files
 				$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
 				$out .= ' ';
-				$out .= '<input type="submit" class="button smallpaddingimp" id="addfile" name="addfile" value="'.$langs->trans("MailingAddFile").'" />';
+				$out .= '<input type="submit" class="button smallpaddingimp reposition" id="addfile" name="addfile" value="'.$langs->trans("MailingAddFile").'" />';
 			}
 			$out .= "</td></tr>\n";
 
@@ -453,6 +455,8 @@ class FormTicket
 		}
 		print '</div>';
 
+		print '<input type="hidden" name="page_y">'."\n";
+
 		print "</form>\n";
 		print "<!-- End form TICKET -->\n";
 	}
@@ -1083,7 +1087,7 @@ class FormTicket
 			if ($this->withfile == 2) { // Can add other files
 				$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
 				$out .= ' ';
-				$out .= '<input type="submit" class="button smallpaddingimp" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+				$out .= '<input type="submit" class="button smallpaddingimp reposition" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 			}
 			$out .= "</td></tr>\n";
 
@@ -1100,6 +1104,8 @@ class FormTicket
 		}
 		print "</center>\n";
 
+		print '<input type="hidden" name="page_y">'."\n";
+
 		print "</form>\n";
 		print "<!-- End form TICKET -->\n";
 	}
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 85b40430d4c..1d0339f83f8 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -79,6 +79,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 /*
  * Actions
  */
+
 $parameters = array(
 	'id' => $id,
 );

From 0a0b3f414ad691fea848cd7b96dacdbbe1e0c441 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 02:54:33 +0200
Subject: [PATCH 344/928] Fix phpcs

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

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 1bc1270e2d6..30d2b994959 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -159,9 +159,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
                 }
 
                 $db->free($resql);
-            }
-            else
-            {
+            } else {
                 $errors++;
                 setEventMessages($db->error, $db->errors, 'errors');
             }

From 3e013ebad0ace178de5f32fd9c31ba54163de8ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 03:16:11 +0200
Subject: [PATCH 345/928] Fix mass action delete of cron jobs

---
 htdocs/core/lib/functions.lib.php        |  7 ++++---
 htdocs/core/modules/modFacture.class.php |  2 +-
 htdocs/cron/list.php                     | 13 ++++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3de1b0d8948..7559b94a740 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3542,7 +3542,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'recruitmentcandidature', 'recruitmentjobposition', 'resource',
 				'shapes', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
 				'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
-				'user-cog', 'website', 'workstation',
+				'uncheck', 'user-cog', 'website', 'workstation',
 				'conferenceorbooth', 'eventorganization'
 			))) {
 			$pictowithouttext = str_replace('object_', '', $pictowithouttext);
@@ -3588,7 +3588,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 				'timespent'=>'clock', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 				'title_agenda'=>'calendar-alt',
-				'uparrow'=>'share', 'vcard'=>'address-card',
+				'uncheck'=>'times', 'uparrow'=>'share', 'vcard'=>'address-card',
 				'jabber'=>'comment-o',
 				'website'=>'globe-americas', 'workstation'=>'pallet',
 				'conferenceorbooth'=>'chalkboard-teacher', 'eventorganization'=>'project-diagram'
@@ -3680,7 +3680,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'inventory'=>'#a69944', 'stock'=>'#a69944', 'movement'=>'#a69944',
 				'other'=>'#ddd',
 				'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'reception'=>'#a69944', 'resize'=>'#444', 'rss'=>'#cba',
-				'shipment'=>'#a69944', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa',
+				'shipment'=>'#a69944', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
+				'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa',
 				'website'=>'#304', 'workstation'=>'#a69944'
 			);
 			if (isset($arrayconvpictotocolor[$pictowithouttext])) {
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 8e9d242a6e3..01a691ed6fb 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -121,7 +121,7 @@ class modFacture extends DolibarrModules
 		$datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 		$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, 'priority'=>50, 'status'=>1, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
-			1=>array('label'=>'SendEmailsRemindersOnDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsReminderOnDueDate', 'parameters'=>"10,all,EmailTemplateCode", 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority)', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
+			1=>array('label'=>'SendEmailsRemindersOnInvoiceDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsReminderOnDueDate', 'parameters'=>"10,all,EmailTemplateCode", 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority)', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
 		);
 
 		// Permissions
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index a88bcda9a66..e5d779d8e10 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -350,9 +350,6 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 $stringcurrentdate = $langs->trans("CurrentHour").': '.dol_print_date(dol_now(), 'dayhour');
 
-if ($action == 'delete') {
-	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.$param, $langs->trans("CronDelete"), $langs->trans("CronConfirmDelete"), "confirm_delete", '', '', 1);
-}
 if ($action == 'execute') {
 	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&securitykey='.$securitykey.$param, $langs->trans("CronExecute"), $langs->trans("CronConfirmExecute"), "confirm_execute", '', '', 1);
 }
@@ -362,12 +359,12 @@ $arrayofmassactions = array(
 //'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 //'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	'enable'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("CronStatusActiveBtn"),
-	'disable'=>img_picto('', 'title_close', 'class="pictofixedwidth"').$langs->trans("CronStatusInactiveBtn"),
+	'disable'=>img_picto('', 'uncheck', 'class="pictofixedwidth"').$langs->trans("CronStatusInactiveBtn"),
 );
 if ($user->rights->cron->delete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -406,6 +403,12 @@ if ($mode == 'modulesetup') {
 
 print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, ($mode == 'modulesetup' ? '' : 'title_setup'), 0, $newcardbutton, '', $limit);
 
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendCronRef";
+$modelmail = "cron";
+$objecttmp = new Cronjob($db);
+$trackid = 'cron'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 $text = $langs->trans("HoursOnThisPageAreOnServerTZ").' '.$stringcurrentdate.'<br>';
 if (!empty($conf->global->CRON_WARNING_DELAY_HOURS)) {

From 4b204301a9ab0e67a14e90bf2d94377466215f39 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 03:25:49 +0200
Subject: [PATCH 346/928] Enhance logs

---
 htdocs/compta/facture/class/facture.class.php | 14 ++++++++------
 htdocs/core/modules/modFacture.class.php      |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index dfb2d5a3b52..1b0a4a768b1 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4902,7 +4902,7 @@ class Facture extends CommonInvoice
 	 *  @param	int|string	$template		Name (or id) of email template (Must be a template of type 'facture_send')
 	 *  @return int         				0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
 	 */
-	public function sendEmailsReminderOnDueDate($nbdays = 0, $paymentmode = 'all', $template = '')
+	public function sendEmailsRemindersOnInvoiceDueDate($nbdays = 0, $paymentmode = 'all', $template = '')
 	{
 		global $conf, $langs, $user;
 
@@ -4914,12 +4914,12 @@ class Facture extends CommonInvoice
 
 		if (empty($conf->facture->enabled)) {	// Should not happen. If module disabled, cron job should not be visible.
 			$langs->load("bills");
-			$this->output = $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Facture"));
+			$this->output .= $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Facture"));
 			return 0;
 		}
 		/*if (empty($conf->global->FACTURE_REMINDER_EMAIL)) {
 			$langs->load("bills");
-			$this->output = $langs->trans('EventRemindersByEmailNotEnabled', $langs->transnoentitiesnoconv("Facture"));
+			$this->output .= $langs->trans('EventRemindersByEmailNotEnabled', $langs->transnoentitiesnoconv("Facture"));
 			return 0;
 		}
 		*/
@@ -4941,7 +4941,7 @@ class Facture extends CommonInvoice
 			$sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
 		}
 		$sql .= " WHERE f.paye = 0";
-		$sql .= " AND f.date_lim_reglement = '".$this->db->idate(dol_get_first_hour(dol_time_plus_duree(dol_now(), -1 * $nbdays, 'd'), 'gmt'), 'gmt')."'";
+		$sql .= " AND f.date_lim_reglement = '".$this->db->idate(dol_get_first_hour(dol_time_plus_duree($now, -1 * $nbdays, 'd'), 'gmt'), 'gmt')."'";
 		$sql .= " AND f.entity IN (".getEntity('facture').")";
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '".$this->db->escape($paymentmode)."'";
@@ -4950,6 +4950,8 @@ class Facture extends CommonInvoice
 		$sql .= $this->db->order("date_lim_reglement", "ASC");
 		$resql = $this->db->query($sql);
 
+		$this->output .= 'Search unpaid invoices with due date = '.$this->db->idate(dol_get_first_hour(dol_time_plus_duree($now, -1 * $nbdays, 'd'), 'gmt'), 'gmt').'<br>';
+
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
 				if (!$error) {
@@ -4969,7 +4971,7 @@ class Facture extends CommonInvoice
 						$arraymessage = $formmail->getEMailTemplate($this->db, 'facture_send', $user, $outputlangs, (is_numeric($template) ? $template : 0), 1, (is_numeric($template) ? '' : $template));
 						if (is_numeric($arraymessage) && $arraymessage <= 0) {
 							$langs->load("bills");
-							$this->output = $langs->trans('FailedToFindEmailTemplate', $template);
+							$this->output .= $langs->trans('FailedToFindEmailTemplate', $template);
 							return 0;
 						}
 
@@ -5040,7 +5042,7 @@ class Facture extends CommonInvoice
 		}
 
 		if (!$error) {
-			$this->output = 'Nb of emails sent : '.$nbMailSend;
+			$this->output .= 'Nb of emails sent : '.$nbMailSend;
 			$this->db->commit();
 			return 0;
 		} else {
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 01a691ed6fb..333ef747cf2 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -121,7 +121,7 @@ class modFacture extends DolibarrModules
 		$datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 		$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, 'priority'=>50, 'status'=>1, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
-			1=>array('label'=>'SendEmailsRemindersOnInvoiceDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsReminderOnDueDate', 'parameters'=>"10,all,EmailTemplateCode", 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority)', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
+			1=>array('label'=>'SendEmailsRemindersOnInvoiceDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsRemindersOnInvoiceDueDate', 'parameters'=>"10,all,EmailTemplateCode", 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority)', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
 		);
 
 		// Permissions

From e8c2085abd328a76e9d1f0841df4a0eb666927fa Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Tue, 27 Apr 2021 09:24:22 +0200
Subject: [PATCH 347/928] FIX : Change parameters MF to MS for price2num()
 function

---
 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 7982181f7ca..74b0703ccfa 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -203,7 +203,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 					    'td' => 'class="center"',
-                        'text' => price2num($objp->total_stock, 'MF').' / '.$objp->seuil_stock_alerte,
+                        'text' => price2num($objp->total_stock, 'MS').' / '.$objp->seuil_stock_alerte,
                         'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
                     );
 

From b573d81e4596dc98577b13e4a45304626b5528bc Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Tue, 27 Apr 2021 09:54:38 +0200
Subject: [PATCH 348/928] fix(lint) eldy's remarks + other table used

---
 htdocs/product/class/product.class.php | 32 ++++++++++++--------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 83354384e8b..bf1cfa1c244 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2181,17 +2181,20 @@ class Product extends CommonObject
 		} else {
 			$sql .= " pa.accountancy_code_buy, pa.accountancy_code_buy_intra, pa.accountancy_code_buy_export, pa.accountancy_code_sell, pa.accountancy_code_sell_intra, pa.accountancy_code_sell_export,";
 		}
-		//For MultiCompany PMP per entity
+		
+		//For MultiCompany 
+		//PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
+		//TODO : Add to Dolibarr update : SQL ;
+
 		$separatedEntityPMP = false;
-		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
-			$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . MAIN_DB_PREFIX . "entity_product_pmp WHERE fk_product  = ".((int) $id)." AND entity = ".(int) $conf->entity);
-			if ($this->db->num_rows($checkPMPPerEntity)>0) {
-				$separatedEntityPMP = true;
-			}
-		}
-		//For MultiCompany Stocks Sharings stock_reel includes only stocks shared with this entity
 		$separatedStock = false;
-		if (!empty($conf->global->MULTICOMPANY_STOCK_SHARING_ENABLED)) {
+		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED)) {
+			if (!empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
+				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . MAIN_DB_PREFIX . "product_perentity WHERE fk_product  = ".((int) $id)." AND entity = ".(int) $conf->entity);
+				if ($this->db->num_rows($checkPMPPerEntity)>0) {
+					$separatedEntityPMP = true;
+				}
+			}
 			global $mc;
 			$separatedStock = true;
 			$visibleWarehousesEntities = $conf->entity;
@@ -2199,24 +2202,22 @@ class Product extends CommonObject
 				$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
 			}
 		}
+		
 		if ($separatedStock) {
 			$sql .= " SUM(sp.reel) as stock,";
 		} else {
 			$sql .= " p.stock,";
 		}
 		if ($separatedEntityPMP) {
-			$sql .= " ppe.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
+			$sql .= " pa.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		} else {
 			$sql .= " p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		}
 		$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) || $separatedEntityPMP) {
 			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pa ON pa.fk_product = p.rowid AND pa.entity = " . ((int) $conf->entity);
 		}
-		if ($separatedEntityPMP) {
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "entity_product_pmp as ppe ON ppe.fk_product = p.rowid";
-		}
 		if ($separatedStock) {
 			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as sp ON sp.fk_product = p.rowid";
 		}
@@ -2232,9 +2233,6 @@ class Product extends CommonObject
 				$sql .= " AND p.barcode = '".$this->db->escape($barcode)."'";
 			}
 		}
-		if ($separatedEntityPMP) {
-			$sql .= " AND ppe.entity = " . (int) $conf->entity;
-		}
 		if ($separatedStock) {
 			$sql .= " AND sp.fk_entrepot IN (
 				SELECT rowid

From 5fd0c1b81002de20cc13e162d0313ccd208a3a8e Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Tue, 27 Apr 2021 09:55:35 +0200
Subject: [PATCH 349/928] fix(code)eldy's remarks

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 3 +++
 htdocs/product/stock/card.php                    | 6 +++---
 htdocs/product/stock/class/entrepot.class.php    | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index e762ddd94e4..652be6ec035 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -436,3 +436,6 @@ ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity
 
 UPDATE llx_const SET value = 'github' WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
 
+-- For MultiCompany PMP per entity
+ALTER TABLE llx_product_perentity ADD pmp FLOAT NULL DEFAULT NULL AFTER accountancy_code_buy_export
+
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 1faa19be499..2a88e8191e8 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -604,7 +604,7 @@ if ($action == 'create') {
 
 			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.price, p.price_ttc, p.entity,";
 			if ($separatedPMP) {
-				$sql .= " ppe.pmp as ppmp,";
+				$sql .= " pa.pmp as ppmp,";
 			} else {
 				$sql .= " p.pmp as ppmp,";
 			}
@@ -615,7 +615,7 @@ if ($action == 'create') {
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
 
 			if ($separatedPMP) {
-				$sql .= ", ".MAIN_DB_PREFIX."entity_product_pmp as ppe";
+				$sql .= ", ".MAIN_DB_PREFIX."product_perentity as pa";
 			}
 
 			$sql .= " WHERE ps.fk_product = p.rowid";
@@ -623,7 +623,7 @@ if ($action == 'create') {
 			$sql .= " AND ps.fk_entrepot = ".$object->id;
 
 			if ($separatedPMP) {
-				$sql .= " AND ppe.fk_product = p.rowid AND ppe.entity = ". (int) $conf->entity;
+				$sql .= " AND pa.fk_product = p.rowid AND pa.entity = ". (int) $conf->entity;
 			}
 
 			$sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index b1c41d24ef3..dc15e092155 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -621,18 +621,18 @@ class Entrepot extends CommonObject
 		}
 
 		if ($separatedPMP) {
-			$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * ppe.pmp) as value";
+			$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * pa.pmp) as value";
 		} else {
 			$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
 		$sql .= ", ".MAIN_DB_PREFIX."product as p";
 		if ($separatedPMP) {
-			$sql .= ", ".MAIN_DB_PREFIX."entity_product_pmp as ppe";
+			$sql .= ", ".MAIN_DB_PREFIX."product_perentity as pa";
 		}
 		$sql .= " WHERE ps.fk_entrepot = ".$this->id;
 		if ($separatedPMP) {
-			$sql .= " AND ppe.fk_product = p.rowid AND ppe.entity = ". (int) $conf->entity;
+			$sql .= " AND pa.fk_product = p.rowid AND pa.entity = ". (int) $conf->entity;
 		}
 		$sql .= " AND ps.fk_product = p.rowid";
 		//print $sql;

From 99589fd69318f3777ad1913af1ac4e55f12dd797 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 09:57:27 +0200
Subject: [PATCH 350/928] added fk_project in $facture

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 40f238c90d6..5f0025b23aa 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -342,7 +342,7 @@ if (empty($reshook) && $action == 'add') {
 				$facture->paye = 0;
 				$facture->date = dol_now();
 				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
-
+				$facture->fk_project = $project->id;
 				if (empty($facture->cond_reglement_id)) {
 					$paymenttermstatic = new PaymentTerm($confattendee->db);
 					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();

From c865199a783326e5a36cd5b64cc248c6d2926db8 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Tue, 27 Apr 2021 09:58:36 +0200
Subject: [PATCH 351/928] lint(stickler)

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bf1cfa1c244..5b6ba2762c9 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2181,11 +2181,9 @@ class Product extends CommonObject
 		} else {
 			$sql .= " pa.accountancy_code_buy, pa.accountancy_code_buy_intra, pa.accountancy_code_buy_export, pa.accountancy_code_sell, pa.accountancy_code_sell_intra, pa.accountancy_code_sell_export,";
 		}
-		
-		//For MultiCompany 
-		//PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
-		//TODO : Add to Dolibarr update : SQL ;
 
+		//For MultiCompany
+		//PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
 		$separatedEntityPMP = false;
 		$separatedStock = false;
 		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED)) {

From 00ef5b94bf3fc9032fcac36119638369fa9bea1b Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Tue, 27 Apr 2021 09:59:33 +0200
Subject: [PATCH 352/928] lint(stickler)

---
 htdocs/product/class/product.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5b6ba2762c9..9c773d6382d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2200,7 +2200,6 @@ class Product extends CommonObject
 				$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
 			}
 		}
-		
 		if ($separatedStock) {
 			$sql .= " SUM(sp.reel) as stock,";
 		} else {

From d034446205e41d31d7c103500b99c483386852ad Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 10:08:32 +0200
Subject: [PATCH 353/928] not giving the invoiceref anymore in the url from
 newpayment to paymentok, since it was already in ref= anyway

---
 htdocs/public/payment/newpayment.php | 10 ----------
 htdocs/public/payment/paymentok.php  |  1 -
 2 files changed, 11 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index b351367f6ea..0e24d94c177 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -376,9 +376,6 @@ if ($action == 'dopayment') {
 			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
 
 			// A redirect is added if API call successfull
-			if ($source == 'conferencesubscription') {
-				$PAYPAL_API_OK .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
-			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
 			// If we are here, it means the Paypal redirect was not done, so we show error message
@@ -397,10 +394,6 @@ if ($action == 'dopayment') {
 		$urlok = preg_replace('/securekey=[^&]+/', '', $urlok);
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
-		if ($source == 'conferencesubscription') {
-			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
-		}
-
 		$mesg = '';
 		if (empty($PRICE) || !is_numeric($PRICE)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
@@ -755,9 +748,6 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		header("Location: ".$urlko);
 		exit;
 	} else {
-		if ($source == 'conferencesubscription') {
-			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
-		}
 		header("Location: ".$urlok);
 		exit;
 	}
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 3d3946927c8..1cfeb99ec80 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -104,7 +104,6 @@ if (empty($FULLTAG)) {
 }
 $source = GETPOST('s', 'alpha') ? GETPOST('s', 'alpha') : GETPOST('source', 'alpha');
 $ref = GETPOST('ref');
-$invoiceref = GETPOST('invoice');
 
 $suffix = GETPOST("suffix", 'aZ09');
 $membertypeid = GETPOST("membertypeid", 'int');

From 758ba67adc08e0e6d93aca9ef0a28644458cc5ae Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 27 Apr 2021 10:50:45 +0200
Subject: [PATCH 354/928] Fix #17219 : new complement of PR 17161

---
 htdocs/core/tpl/filemanager.tpl.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index cf00f60d31d..7c620aa404c 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -99,11 +99,13 @@ if ($permtoadd && $module == 'ecm') {	// If on file manager medias in ecm
 print "<script>
 $(\"#generateimgwebp\").on(\"click\",function(){
 	try{
-		param = $(\".directory.expanded\")[$(\".directory.expanded\").length-1].children[0].rel
+		section_dir = $(\".directory.expanded\")[$(\".directory.expanded\").length-1].children[0].rel
+		section=$(\".directory.expanded\")[$(\".directory.expanded\").length-1].children[0].id.split('_')[2]
 	}catch{
-		param = '/'
+		section_dir = '/'
+		section=0
 	}
-	$(\"#generateimgwebp\").attr(\"href\",$(\"#generateimgwebp\").attr(\"href\")+'&dir='+param)
+	$(\"#generateimgwebp\").attr(\"href\",$(\"#generateimgwebp\").attr(\"href\")+'&section_dir='+section_dir+'&section='+section)
   })
 </script>";
 
@@ -154,19 +156,23 @@ if ($action == 'delete_section') {
 // End confirm
 
 if ($action == 'confirmconvertimgwebp') {
+	$section_dir=GETPOST('section_dir', 'alpha');
+	$section=GETPOST('section', 'alpha');
+	$form = new Form($db);
+	$formquestion['section_dir']=array('type'=>'hidden', 'value'=>$section_dir, 'name'=>'section_dir');
+	$formquestion['section']=array('type'=>'hidden', 'value'=>$section, 'name'=>'section');
 	if ($module == 'medias') {
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$website->ref.'&dir='.$_GET['dir'], $langs->trans('ConfirmImgWebpCreation'), $langs->trans('ConfirmGenerateImgWebp', $object->ref), 'convertimgwebp', '', "yes", 1);
-	} else {
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?dir='.$_GET['dir'], $langs->trans('ConfirmImgWebpCreation'), $langs->trans('ConfirmGenerateImgWebp', $object->ref), 'convertimgwebp', '', "yes", 1);
+		$formquestion['website']=array('type'=>'hidden', 'value'=>$website->ref, 'name'=>'website');
 	}
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans('ConfirmImgWebpCreation'), $langs->trans('ConfirmGenerateImgWebp', $object->ref), 'convertimgwebp', $formquestion, "yes", 1);
 	$action = 'file_manager';
 }
 
 if ($action == 'convertimgwebp' && $permtoadd) {
 	if ($module == 'medias') {
-		$imagefolder = $conf->website->dir_output.'/'.$websitekey.'/medias/'.$_GET['dir'];
+		$imagefolder = $conf->website->dir_output.'/'.$websitekey.'/medias/'.GETPOST('section_dir', 'alpha');
 	} else {
-		$imagefolder = $conf->ecm->dir_output.'/'.$_GET['dir'];
+		$imagefolder = $conf->ecm->dir_output.'/'.GETPOST('section_dir', 'alpha');
 	}
 
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';

From 5d1d6eee95d4bbebd713dbd8a5281fb28647716d Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Tue, 27 Apr 2021 10:51:15 +0200
Subject: [PATCH 355/928] add(pmp) on Warehouse List

---
 htdocs/product/stock/list.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index d49db2f7b02..ae8b13c776f 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -208,7 +208,16 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
 	}
 }
-$sql .= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue, SUM(ps.reel) as stockqty";
+
+//For Multicompany PMP per entity
+$separatedPMP = false;
+if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
+	$separatedPMP = true;
+	$sql .= " SUM(pa.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue, SUM(ps.reel) as stockqty";
+} else {
+	$sql .= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue, SUM(ps.reel) as stockqty";
+}
+
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -225,7 +234,12 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON t.rowid = ps.fk_ent
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c_dep ON c_dep.rowid = t.fk_departement";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as ccount ON ccount.rowid = t.fk_pays";
+if ($separatedPMP) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as pa ON pa.fk_product = p.rowid AND pa.fk_product = ps.fk_product AND pa.entity = ". (int) $conf->entity;
+}
+
 $sql .= " WHERE t.entity IN (".getEntity('stock').")";
+
 if (!empty($conf->categorie->enabled)) {
 	$sql .= Categorie::getFilterSelectQuery(Categorie::TYPE_WAREHOUSE, "t.rowid", $search_category_list);
 }
@@ -273,6 +287,7 @@ $reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters); //
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
 $totalnboflines = 0;
+
 $result = $db->query($sql);
 if ($result) {
 	$totalnboflines = $db->num_rows($result);

From 0d391ec185d24b99bc9773a54a30951bb2db4bc2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 11:20:04 +0200
Subject: [PATCH 356/928] Show name of sitemap file

---
 htdocs/langs/en_US/website.lang | 2 +-
 htdocs/website/index.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index e70d88a3aa1..bd23bd39a5c 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -140,7 +140,7 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
 ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 547f6ac217a..68df5208d84 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2260,7 +2260,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 
 	$domtree->formatOutput = true;
 
-	$xmlname = 'sitemap.'.$websitekey.'.xml';
+	$xmlname = 'sitemap.xml';
 
 	$sql = "SELECT wp.rowid, wp.type_container , wp.pageurl, wp.lang, wp.fk_page, wp.tms as tms,";
 	$sql .= " w.virtualhost, w.fk_default_home";
@@ -2396,7 +2396,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($tempdir.$xmlname, octdec($conf->global->MAIN_UMASK));
 				}
-				setEventMessages($langs->trans("SitemapGenerated"), null, 'mesgs');
+				setEventMessages($langs->trans("SitemapGenerated", $xmlname), null, 'mesgs');
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}

From 071fe087fd2a953aa2109bb8f223402bba1f585b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 11:29:47 +0200
Subject: [PATCH 357/928] Fix replacement of sitemap entry in robot.txt

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 68df5208d84..e9af12a7dd6 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2414,7 +2414,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 	$robotsitemap = "Sitemap: ".$domainname."/".$xmlname;
 	$result = strpos($robotcontent, 'Sitemap: ');
 	if ($result) {
-		$result = preg_replace("/Sitemap.*\n/", $robotsitemap, $robotcontent);
+		$result = preg_replace('/Sitemap:.*/', $robotsitemap, $robotcontent);
 		$robotcontent = $result ? $result : $robotcontent;
 	} else {
 		$robotcontent .= $robotsitemap."\n";

From 9941236d76acbbab2ff96fa667f2df1038a77c5f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 11:47:33 +0200
Subject: [PATCH 358/928] Fix alternate into sitemap

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index e9af12a7dd6..61a62fbf8df 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2285,7 +2285,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 					$shortlangcode = substr($objp->lang, 0, 2); // en_US or en-US -> en
 				}
 				if (empty($shortlangcode)) {
-					$shortlangcode = substr($object->lang, 0, 2); // en_US or en-US -> en
+					$shortlangcode = substr($object->lang, 0, 2); // Use short lang code of website
 				}
 
 				// Forge $pageurl, adding language prefix if it is an alternative language
@@ -2344,7 +2344,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 								$xhtmllink = $domtree->createElement('xhtml:link', '');
 								$xhtmllink->setAttribute("rel", "alternante");
 								$xhtmllink->setAttribute("hreflang", $tmpshortlangcode);
-								$xhtmllink->setAttribute("href", $domainname.($objp->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($objp->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php'));
+								$xhtmllink->setAttribute("href", $domainname.($objp->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php'));
 								$url->appendChild($xhtmllink);
 
 								$alternatefound++;
@@ -2367,7 +2367,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 									$xhtmllink = $domtree->createElement('xhtml:link', '');
 									$xhtmllink->setAttribute("rel", "alternate");
 									$xhtmllink->setAttribute("hreflang", $tmpshortlangcode);
-									$xhtmllink->setAttribute("href", $domainname.($objp->fk_default_home == $objhastrans->id ? '/' : (($tmpshortlangcode != substr($objp->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$objhastrans->pageurl.'.php'));
+									$xhtmllink->setAttribute("href", $domainname.($objp->fk_default_home == $objhastrans->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$objhastrans->pageurl.'.php'));
 									$url->appendChild($xhtmllink);
 
 									$alternatefound++;

From c645241327c72c813c3d651b61d7025ae88e1e87 Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Tue, 27 Apr 2021 12:11:28 +0200
Subject: [PATCH 359/928] Corrections

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

diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 9c67f34fecf..9a664489e4f 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -284,7 +284,7 @@ class PaiementFourn extends Paiement
 
 									// Set invoice to paid
 									if (!$error) {
-										$result = $invoice->set_paid($user, '', '');
+										$result = $invoice->setPaid($user, '', '');
 										if ($result < 0) {
 											$this->error = $invoice->error;
 											$error++;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 5601151fa22..4ebd6b7d6f1 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1964,7 +1964,7 @@ if ($action == 'create') {
 	print $desc;
 	print '</div></div>';
 
-	if ((empty($origin)) || ((($origin == 'propal') || ($origin == 'commande')) && (! empty($originid)))) {
+	if (empty($origin) || ($origin == 'order_supplier' && !empty($originid))) {
 		// Deposit - Down payment
 		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
@@ -2004,7 +2004,7 @@ if ($action == 'create') {
 			print '<td>';
 			print $desc;
 			print '</td>';
-			if (($origin == 'propal') || ($origin == 'commande')) {
+			if ($origin == 'order_supplier') {
 				print '<td class="nowrap" style="padding-left: 15px">';
 				$arraylist = array(
 					'amount' => $langs->transnoentitiesnoconv('FixAmount', $langs->transnoentitiesnoconv('Deposit')),

From ae773ff9385c3439829264b37f3c655880426616 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 12:12:45 +0200
Subject: [PATCH 360/928] FIX Disabled pages must not appears into sitemap

---
 htdocs/website/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 61a62fbf8df..fe37cb68418 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2353,7 +2353,8 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 					}
 
 					// Add "has translation pages"
-					$sql = 'SELECT rowid as id, lang, pageurl from '.MAIN_DB_PREFIX.'website_page where fk_page IN ('.$db->sanitize($objp->rowid.($translationof ? ', '.$translationof : '')).")";
+					$sql = 'SELECT rowid as id, lang, pageurl from '.MAIN_DB_PREFIX.'website_page';
+					$sql .= ' WHERE status = '.WebsitePage::STATUS_VALIDATED.' AND fk_page IN ('.$db->sanitize($objp->rowid.($translationof ? ', '.$translationof : '')).")";
 					$resqlhastrans = $db->query($sql);
 					if ($resqlhastrans) {
 						$num_rows_hastrans = $db->num_rows($resqlhastrans);

From 6fd172609302c44ba0171949938b0553c7a2d9ee Mon Sep 17 00:00:00 2001
From: antonin_tdj <50403308+ibuiv@users.noreply.github.com>
Date: Tue, 27 Apr 2021 12:14:36 +0200
Subject: [PATCH 361/928] Fix Bug replenish + Auto Filter

# Fix Replenish Calculation Bug + Auto Filter

## Environment
* Version: 13
* URL(s): product/stock/replenish.php

## Configuration
MultiCompany needed with Stock Sharing ON, 2 entities and 1 warehouse per entity

**Entity A**
* Options: don't share stocks with other entities
* Warehouse : only 1 (WAR_A)
* Stock : 1 product (PROD) Qty : 4

**Entity B :**
* Options: don't share stocks with other entities
* Warehouse : only 1 (WAR_B)
* Stock : 1 product --the same-- (PROD) Qty : 17

**Product :**
* Desired Stock : 20
* Alert : 10

**WAR_A :**
* For the product
* Desired Stock : 16
* Alert : 6

## Fixed behavior :
* Entity A -> Replenish
* If WAR_A selected should show the product and fill with 12 the qty to order. Physical Stock (All) and Physical Stock (this
warehouse) should be 4.

* If no Warehouse selected show the product and fill with 12 (because only one warehouse seen by this entity) the qty to order. Physical Stock (All) should be 4.

## Actual behavior :
* Entity A -> Replenish

* The product isn't showed.

* If I intentionally incrementes the Desired Stock value. The product will be shown with the good filter (Warehouse if desired stock has been incremented on the combination ProductDesired <-> Warehouse). The qty for the order are correct and the physical stock shown is correct.

## Conclusion :
* 1 bug and 1 improvment

**BUG** : The value of the stock taken to whether or not show the product line is wrong. It is considering the stock in warehouses not shared with the entity.

**IMPROVMENT** : If only one Warehouse, take automatically the desired and alert values for this warehouse and not the general ones.
---
 htdocs/product/stock/replenish.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index c9109b348d6..ab95c29eadd 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2016		ATM Consulting		<support@atm-consulting.fr>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021		Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2021		Antonin MARCHAL		<antonin@letempledujeu.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -64,6 +65,20 @@ $draftorder = GETPOST('draftorder', 'alpha');
 $fourn_id = GETPOST('fourn_id', 'int');
 $fk_supplier = GETPOST('fk_supplier', 'int');
 $fk_entrepot = GETPOST('fk_entrepot', 'int');
+
+//MultiCompany : If only 1 Warehouse is visible, filter will automatically be set to it.
+if ($fk_entrepot == "-1" && !empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED)) {
+	global $mc;
+	$visibleWarehousesEntities = $conf->entity;
+	if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) {
+		$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
+	}
+	$resWar = $db->query ("SELECT rowid FROM " . MAIN_DB_PREFIX . "entrepot WHERE entity IN (" . $db->sanitize($visibleWarehousesEntities) .")");
+	if($db->num_rows($resWar) == 1){
+		$fk_entrepot = $db->fetch_object($resWar)->rowid;
+	}
+};
+
 $texte = '';
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -324,8 +339,8 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot AS ent ON s.fk_entrepot = ent.rowid AND ent.entity IN('.getEntity('stock').')';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot AS ent ON ent.entity IN('.getEntity('stock').')';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product AND s.fk_entrepot = ent.rowid';
 if ($fk_supplier > 0) {
 	$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid AND pfp.fk_soc = '.$fk_supplier.')';
 }

From 109124fdac2d1a2ab9fc7a6e7ab7e09b0e72f1b4 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 27 Apr 2021 10:16:59 +0000
Subject: [PATCH 362/928] Fixing style errors.

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

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index ab95c29eadd..9a35816735d 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -73,8 +73,8 @@ if ($fk_entrepot == "-1" && !empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_E
 	if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) {
 		$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
 	}
-	$resWar = $db->query ("SELECT rowid FROM " . MAIN_DB_PREFIX . "entrepot WHERE entity IN (" . $db->sanitize($visibleWarehousesEntities) .")");
-	if($db->num_rows($resWar) == 1){
+	$resWar = $db->query("SELECT rowid FROM " . MAIN_DB_PREFIX . "entrepot WHERE entity IN (" . $db->sanitize($visibleWarehousesEntities) .")");
+	if ($db->num_rows($resWar) == 1) {
 		$fk_entrepot = $db->fetch_object($resWar)->rowid;
 	}
 };

From a508cdbf5957dbc4d87035ee6119e374fb055147 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 14:01:44 +0200
Subject: [PATCH 363/928] every dol_encode for securekey replaced with dol_hash
 (dol_encode kept for encoding ids

---
 .../class/conferenceorbooth.class.php         |  2 +-
 .../conferenceorbooth_list.php                |  2 +-
 htdocs/langs/en_US/eventorganization.lang     |  4 ++--
 .../attendee_subscription.php                 | 21 ++++++++++---------
 .../eventorganization/subscriptionok.php      |  8 +++++--
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 02714496b35..16e61959f0c 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -244,7 +244,7 @@ class ConferenceOrBooth extends ActionComm
 		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
 		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$encodedid;
 
-		$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
+		$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
 
 		$this->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index cbf0e91f7fa..e3ba815121c 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -366,7 +366,7 @@ if ($projectid > 0) {
 	print '<tr><td>'.$langs->trans("RegisterPage").'</td><td>';
 	$encodedid = dol_encode($project->id, $dolibarr_main_instance_unique_id);
 	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$encodedid;
-	$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
+	$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$project->id, 2);
 	$linkregister .= '&securekey='.urlencode($encodedsecurekey);
 	print '<a target="_blank" href="'.$linkregister.'">'.$linkregister.'</a>';
 	print '</td></tr>';
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 6ef39e81ff6..55117ebb5e4 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -105,8 +105,8 @@ ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
-EvntOrgDuration = This conference starts on %s and ends on %s
-ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 #
 # SubscriptionOk page
 #
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 5f0025b23aa..0f583f7cfc0 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -101,16 +101,13 @@ if ($resultproject < 0) {
 	$errmsg .= $project->error;
 }
 
-// Getting 'securekey'.'id' from Post and decoding it
-$encodedsecurekeyandid = GETPOST('securekey', 'alpha');
-$securekeyandid = dol_decode($encodedsecurekeyandid, $dolibarr_main_instance_unique_id);
 
-// Securekey decomposition into pure securekey and id added at the end
-$securekey = substr($securekeyandid, 0, strlen($securekeyandid)-strlen($encodedid));
-$idgotfromsecurekey = dol_decode(substr($securekeyandid, -strlen($encodedid), strlen($encodedid)), $dolibarr_main_instance_unique_id);
+// Getting 'securekey'.'id' from Post and decoding it
+$securekeyreceived = GETPOST('securekey', 'alpha');
+$securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 
 // We check if the securekey collected is OK and if the id collected is the same than the id in the securekey
-if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY || $idgotfromsecurekey != $id) {
+if ($securekeytocompare != $securekeyreceived) {
 	print $langs->trans('MissingOrBadSecureKey');
 	exit;
 }
@@ -251,7 +248,9 @@ if (empty($reshook) && $action == 'add') {
 
 		// If the attendee has already paid
 		if ($confattendee->status == 1) {
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+			$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
+			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
 			Header("Location: ".$redirection);
 			exit;
 		}
@@ -435,7 +434,9 @@ if (empty($reshook) && $action == 'add') {
 				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			}
 
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+			$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
+			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
 			Header("Location: ".$redirection);
 			exit;
 		}
@@ -478,7 +479,7 @@ print '<input type="hidden" name="token" value="'.newToken().'" / >';
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print '<input type="hidden" name="action" value="add" />';
 print '<input type="hidden" name="id" value="'.$encodedid.'" />';
-print '<input type="hidden" name="securekey" value="'.$encodedsecurekeyandid.'" />';
+print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
 
 print '<br>';
 
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 81db5ac1c02..31c3281a526 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -65,8 +65,12 @@ $object = new stdClass(); // For triggers
 $error = 0;
 
 // Security check
-$securekey = dol_decode(GETPOST('securekey'), $dolibarr_main_instance_unique_id);
-if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY) {
+$encodedid = GETPOST("id");
+$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$securekeyreceived = GETPOST("securekey");
+$securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+
+if ($securekeyreceived != $securekeytocompare) {
 	print $langs->trans('MissingOrBadSecureKey');
 	exit;
 }

From fab12bc5e582e61b41e42487acdfea7c27d9e45e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 14:04:08 +0200
Subject: [PATCH 364/928] removed the indicated id of conf when on the
 subscription page for security (now showing label instead)

---
 htdocs/langs/en_US/eventorganization.lang                 | 2 +-
 htdocs/public/eventorganization/attendee_subscription.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 55117ebb5e4..9f75374f2a0 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -104,7 +104,7 @@ SuggestBooth = Suggest a booth
 ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
 EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 #
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 0f583f7cfc0..f6b167d91f3 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -466,8 +466,8 @@ print '<div id="divsubscribe">';
 print '<div class="center subscriptionformhelptext justify">';
 
 // Welcome message
-print $langs->trans("EvntOrgWelcomeMessage");
-print $id.".".'<br>';
+print $langs->trans("EvntOrgWelcomeMessage", $conference->label);
+print '<br>';
 print $langs->trans("EvntOrgDuration", dol_print_date($conference->datep), dol_print_date($conference->datef));
 print '</div>';
 

From 79dce3ad0567ffed65841402e8a9e515c989802e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 14:06:40 +0200
Subject: [PATCH 365/928] typo in comment

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index f6b167d91f3..5c31c88c38a 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -102,7 +102,7 @@ if ($resultproject < 0) {
 }
 
 
-// Getting 'securekey'.'id' from Post and decoding it
+// Security check
 $securekeyreceived = GETPOST('securekey', 'alpha');
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 

From 74057251980a089632f4bb1d28009dddaddf0792 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 14:11:46 +0200
Subject: [PATCH 366/928] added security check at beginning of /project/index
 page (according to the security I added in the previous commits)

---
 .../public/eventorganization/attendee_subscription.php |  2 +-
 htdocs/public/project/index.php                        | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 5c31c88c38a..4940f5965fe 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -106,7 +106,7 @@ if ($resultproject < 0) {
 $securekeyreceived = GETPOST('securekey', 'alpha');
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 
-// We check if the securekey collected is OK and if the id collected is the same than the id in the securekey
+// We check if the securekey collected is OK
 if ($securekeytocompare != $securekeyreceived) {
 	print $langs->trans('MissingOrBadSecureKey');
 	exit;
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 03f26ed2f37..d1744db0b4e 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -78,7 +78,15 @@ $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors",
 // No check on module enabled. Done later according to $validpaymentmethod
 
 $action = GETPOST('action', 'aZ09');
-$id = dol_decode(GETPOST('id'), $dolibarr_main_instance_unique_id);
+$encodedid = GETPOST('id');
+$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$securekeyreceived = GETPOST("securekey");
+$securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+
+if ($securekeytocompare != $securekeyreceived) {
+	print $langs->trans('MissingOrBadSecureKey');
+	exit;
+}
 
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));

From 80be0c32e49fad1f17f1871f5d7f7d2e1bc01aa5 Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Tue, 27 Apr 2021 14:13:59 +0200
Subject: [PATCH 367/928] Corrections

---
 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 4ebd6b7d6f1..3f0fd1cc74e 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -986,7 +986,7 @@ if (empty($reshook)) {
 						$result = $srcobject->fetch(GETPOST('originid', 'int'));
 
 						// If deposit invoice - down payment with 1 line (fixed amount or percent)
-						if (GETPOST('type') == Facture::TYPE_DEPOSIT && in_array($typeamount, array('amount', 'variable'))) {
+						if (GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT && in_array($typeamount, array('amount', 'variable'))) {
 							// Define the array $amountdeposit
 							$amountdeposit = array();
 							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)) {

From 99df144e04994ff59fc869db9481dac40df55351 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 27 Apr 2021 15:28:39 +0200
Subject: [PATCH 368/928] edit traceability fields in productlot card

---
 htdocs/core/class/html.form.class.php         |  41 -----
 .../product/class/html.formproduct.class.php  | 125 +++++++++++++++
 .../product/stock/class/productlot.class.php  |  45 ++++++
 htdocs/product/stock/productlot_card.php      | 149 ++++++++++++++----
 4 files changed, 284 insertions(+), 76 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e7bff68ccee..835810ff065 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5742,47 +5742,6 @@ class Form
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Load into the cache productbatch status
-	 *
-	 *  @return	int							Nb of loaded lines, 0 if already loaded, <0 if KO
-	 */
-	public function load_cache_productbatch_status()
-	{
-		// phpcs:enable
-		global $langs;
-
-		$num = count($this->cache_vatrates);
-		if ($num > 0) {
-			return $num; // Cache already loaded
-		}
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = "SELECT s.rowid, s.code, s.label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_status as c";
-		$sql .= " WHERE t.active > 0";
-		$sql .= " ORDER BY c.code ASC";
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			if ($num) {
-				for ($i = 0; $i < $num; $i++) {
-					$obj = $this->db->fetch_object($resql);
-					$this->cache_status[$i]['rowid']	= $obj->rowid;
-					$this->cache_status[$i]['code'] = $obj->code;
-					$this->cache_status[$i]['label'] = $obj->taux.'%'.($obj->code ? ' ('.$obj->code.')' : ''); // Label must contains only 0-9 , . % or *
-				}
-				return $num;
-			}
-		} else {
-			$this->error = '<font class="error">'.$this->db->error().'</font>';
-			return -2;
-		}
-	}
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output an HTML select vat rate.
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 718acef6970..bfddbc024db 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -672,4 +672,129 @@ class FormProduct
 			}
 		}
 	}
+        // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    /**
+     *  Return select list of productbatch status
+     *
+     *  @param	string	$selected       		Id or Code of preselected incoterm
+     *  @param	string	$page       			Defined the form action
+     *  @param  string	$htmlname       		Name of html select object
+     *  @param  string	$htmloption     		Options html on select object
+     * 	@param	int		$forcecombo				Force to load all values and output a standard combobox (with no beautification)
+     *  @param	array	$events					Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+     *  @return string           				HTML string with select and input
+     */
+    public function select_productbatch_status($selected = '', $page = '', $htmlname = 'fk_status', $htmloption = '', $forcecombo = 1, $events = array())
+    {
+        // phpcs:enable
+        global $conf, $langs;
+
+        $langs->load("dict");
+
+        $out = '';
+        $statusArray = array();
+
+        $sql = "SELECT code, label";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_status";
+        $sql .= " WHERE active > 0";
+        $sql .= " ORDER BY code ASC";
+
+        dol_syslog(get_class($this)."::select_productbatch_status", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            if ($conf->use_javascript_ajax && !$forcecombo) {
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($htmlname, $events);
+            }
+
+            if (!empty($page)) {
+                $out .= '<form method="post" action="'.$page.'">';
+                $out .= '<input type="hidden" name="action" value="setfk_status">';
+                $out .= '<input type="hidden" name="token" value="'.newToken().'">';
+            }
+
+            $out .= '<select id="'.$htmlname.'" class="flat selectfkstatus minwidth100imp noenlargeonsmartphone" name="'.$htmlname.'" '.$htmloption.'>';
+            $out .= '<option value="0">&nbsp;</option>';
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num) {
+                // $foundselected = false;
+
+                while ($i < $num) {
+                    $obj = $this->db->fetch_object($resql);
+                    $statusArray[$i]['code'] = $obj->code;
+                    $statusArray[$i]['label'] = $obj->label;
+                    $i++;
+                }
+
+                foreach ($statusArray as $row) {
+                    if ($selected && ($selected == $row['code'] || $selected == $row['label'])) {
+                        $out .= '<option value="'.$row['code'].'" selected>';
+                    } else {
+                        $out .= '<option value="'.$row['code'].'">';
+                    }
+
+                    if ($row['label']) {
+                        $out .= $row['label'];
+                    }
+
+                    $out .= '</option>';
+                }
+            }
+            $out .= '</select>';
+
+			// if ($user->admin) {
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			// }
+
+            if (!empty($page)) {
+                $out .= '<input type="submit" class="button valignmiddle smallpaddingimp nomargintop nomarginbottom" value="'.$langs->trans("Modify").'"></form>';
+            }
+        } else {
+            dol_print_error($this->db);
+        }
+
+        return $out;
+    }
+		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load into the cache productbatch status
+	 *
+	 *  @return	int							Nb of loaded lines, 0 if already loaded, <0 if KO
+	 */
+	public function load_cache_productbatch_status()
+	{
+		// phpcs:enable
+		global $langs;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = "SELECT s.rowid, s.code, s.label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_status as s";
+		$sql .= " WHERE s.active > 0";
+		$sql .= " ORDER BY s.code ASC";
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
+
+				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+				$label = ($obj->code != $langs->trans($obj->code) ? $langs->trans($obj->code) : $langs->trans($obj->label));
+				$this->cache_productbatch_status[$obj->code] = $label;
+				$i++;
+			}
+
+			asort($this->cache_productbatch_status);
+
+			return $num;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
 }
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index f05d6ebc168..fb9a6b5815c 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -91,6 +91,12 @@ class Productlot extends CommonObject
 		'batch'         => array('type'=>'varchar(30)', 'label'=>'Batch', 'enabled'=>1, 'visible'=>1, 'notnull'=>0, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'comment'=>'Batch', 'searchall'=>1),
 		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
 		'sellby'        => array('type'=>'date', 'label'=>'SellByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_SELLBY)?1:0', 'visible'=>5, 'position'=>60),
+		'eol_date'        => array('type'=>'date', 'label'=>'EndOfLife', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>70),
+		'manufacturing_date'        => array('type'=>'date', 'label'=>'ManufacturingDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>80),
+		'scrapping_date'        => array('type'=>'date', 'label'=>'DestructionDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>90),
+		'commissionning_date'        => array('type'=>'date', 'label'=>'FirstUseDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>100),
+		'qc_frequency'        => array('type'=>'varchar(6)', 'label'=>'QCFrequency', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>110),
+		'fk_status'        => array('type'=>'varchar(6)', 'label'=>'Status', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>120),
 		'eatby'         => array('type'=>'date', 'label'=>'EatByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_EATBY)?1:0', 'visible'=>5, 'position'=>62),
 		'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
 		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
@@ -112,6 +118,12 @@ class Productlot extends CommonObject
 	public $batch;
 	public $eatby = '';
 	public $sellby = '';
+	public $eol_date = '';
+	public $manufacturing_date = '';
+	public $scrapping_date = '';
+	public $commissionning_date = '';
+	public $qc_frequency = '';
+	public $fk_status = '';
 	public $datec = '';
 	public $tms = '';
 
@@ -186,6 +198,12 @@ class Productlot extends CommonObject
 		$sql .= 'batch,';
 		$sql .= 'eatby,';
 		$sql .= 'sellby,';
+		$sql .= 'eol_date,';
+		$sql .= 'manufacturing_date,';
+		$sql .= 'scrapping_date,';
+		$sql .= 'commissionning_date,';
+		$sql .= 'qc_frequency,';
+		$sql .= 'fk_status,';
 		$sql .= 'datec,';
 		$sql .= 'fk_user_creat,';
 		$sql .= 'fk_user_modif,';
@@ -196,6 +214,13 @@ class Productlot extends CommonObject
 		$sql .= ' '.(!isset($this->batch) ? 'NULL' : "'".$this->db->escape($this->batch)."'").',';
 		$sql .= ' '.(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'".$this->db->idate($this->eatby)."'").',';
 		$sql .= ' '.(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'".$this->db->idate($this->sellby)."'").',';
+		$sql .= ' '.(!isset($this->eol_date) || dol_strlen($this->eol_date) == 0 ? 'NULL' : "'".$this->db->idate($this->eol_date)."'").',';
+		$sql .= ' '.(!isset($this->manufacturing_date) || dol_strlen($this->manufacturing_date) == 0 ? 'NULL' : "'".$this->db->idate($this->manufacturing_date)."'").',';
+		$sql .= ' '.(!isset($this->scrapping_date) || dol_strlen($this->scrapping_date) == 0 ? 'NULL' : "'".$this->db->idate($this->scrapping_date)."'").',';
+		$sql .= ' '.(!isset($this->commissionning_date) || dol_strlen($this->commissionning_date) == 0 ? 'NULL' : "'".$this->db->idate($this->commissionning_date)."'").',';
+		$sql .= ' '.(!isset($this->qc_frequency) ? 'NULL' : $this->qc_frequency).',';
+		$sql .= ' '.(!isset($this->fk_status) || dol_strlen($this->fk_status) == 0 ? 'NULL' : $this->fk_status).',';
+
 		$sql .= ' '."'".$this->db->idate(dol_now())."'".',';
 		$sql .= ' '.(!isset($this->fk_user_creat) ? 'NULL' : $this->fk_user_creat).',';
 		$sql .= ' '.(!isset($this->fk_user_modif) ? 'NULL' : $this->fk_user_modif).',';
@@ -268,6 +293,12 @@ class Productlot extends CommonObject
 		$sql .= " t.batch,";
 		$sql .= " t.eatby,";
 		$sql .= " t.sellby,";
+		$sql .= " t.eol_date,";
+		$sql .= " t.manufacturing_date,";
+		$sql .= " t.scrapping_date,";
+		$sql .= " t.commissionning_date,";
+		$sql .= " t.qc_frequency,";
+		$sql .= " t.fk_status,";
 		$sql .= " t.datec,";
 		$sql .= " t.tms,";
 		$sql .= " t.fk_user_creat,";
@@ -295,6 +326,14 @@ class Productlot extends CommonObject
 				$this->fk_product = $obj->fk_product;
 				$this->eatby = $this->db->jdate($obj->eatby);
 				$this->sellby = $this->db->jdate($obj->sellby);
+				$this->eol_date = $this->db->jdate($obj->eol_date);
+
+				$this->manufacturing_date = $this->db->jdate($obj->manufacturing_date);
+				$this->scrapping_date = $this->db->jdate($obj->scrapping_date);
+				$this->commissionning_date = $this->db->jdate($obj->commissionning_date);
+				$this->qc_frequency = $obj->qc_frequency;
+				$this->fk_status = $obj->fk_status;
+
 				$this->datec = $this->db->jdate($obj->datec);
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->fk_user_creat = $obj->fk_user_creat;
@@ -371,6 +410,12 @@ class Productlot extends CommonObject
 		$sql .= ' batch = '.(isset($this->batch) ? "'".$this->db->escape($this->batch)."'" : "null").',';
 		$sql .= ' eatby = '.(!isset($this->eatby) || dol_strlen($this->eatby) != 0 ? "'".$this->db->idate($this->eatby)."'" : 'null').',';
 		$sql .= ' sellby = '.(!isset($this->sellby) || dol_strlen($this->sellby) != 0 ? "'".$this->db->idate($this->sellby)."'" : 'null').',';
+		$sql .= ' eol_date = '.(!isset($this->eol_date) || dol_strlen($this->eol_date) != 0 ? "'".$this->db->idate($this->eol_date)."'" : 'null').',';
+		$sql .= ' manufacturing_date = '.(!isset($this->manufacturing_date) || dol_strlen($this->manufacturing_date) != 0 ? "'".$this->db->idate($this->manufacturing_date)."'" : 'null').',';
+		$sql .= ' scrapping_date = '.(!isset($this->destruction_date) || dol_strlen($this->destruction_date) != 0 ? "'".$this->db->idate($this->destruction_date)."'" : 'null').',';
+		$sql .= ' commissionning_date = '.(!isset($this->first_use_date) || dol_strlen($this->first_use_date) != 0 ? "'".$this->db->idate($this->first_use_date)."'" : 'null').',';
+		$sql .= ' qc_frequency = '.(!isset($this->qc_frequency) || dol_strlen($this->qc_frequency) != 0 ? "'".$this->db->escape($this->qc_frequency)."'" : 'null').',';
+		$sql .= ' fk_status = '.(!isset($this->fk_status) || dol_strlen($this->fk_status) != 0 ? "'".$this->db->escape($this->fk_status)."'" : 'null').',';
 		$sql .= ' datec = '.(!isset($this->datec) || dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').',';
 		$sql .= ' tms = '.(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'").',';
 		$sql .= ' fk_user_creat = '.(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").',';
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index b797d7bccc7..9fd971a70d8 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2018      All-3kcis       		 <contact@all-3kcis.fr>
+ * Copyright (C) 2021      Noé Cendrier         <noe.cendrier@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('stocks', 'other', 'productbatch'));
@@ -138,7 +140,7 @@ if (empty($reshook)) {
 
 	$backurlforlist = dol_buildpath('/product/stock/productlot_list.php', 1);
 
-	if ($action == 'seteatby' && $user->rights->stock->creer) {
+	if ($action == 'seteatby' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
 		$result = $object->setValueFrom('eatby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -149,7 +151,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setsellby' && $user->rights->stock->creer) {
+	if ($action == 'setsellby' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
 		$result = $object->setValueFrom('sellby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -160,6 +162,70 @@ if (empty($reshook)) {
 		}
 	}
 
+	if ($action == 'seteol_date' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+		$newvalue = dol_mktime(12, 0, 0, GETPOST('eol_datemonth', 'int'), GETPOST('eol_dateday', 'int'), GETPOST('eol_dateyear', 'int'));
+		$result = $object->setValueFrom('eol_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
+		if ($result < 0) {
+			setEventMessages($object->error, null, 'errors');
+			$action == 'editeol_date';
+		} else {
+			$action = 'view';
+		}
+	}
+
+	if ($action == 'setmanufacturing_date' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+		$newvalue = dol_mktime(12, 0, 0, GETPOST('manufacturing_datemonth', 'int'), GETPOST('manufacturing_dateday', 'int'), GETPOST('manufacturing_dateyear', 'int'));
+		$result = $object->setValueFrom('manufacturing_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
+		if ($result < 0) {
+			setEventMessages($object->error, null, 'errors');
+			$action == 'editmanufacturing_date';
+		} else {
+			$action = 'view';
+		}
+	}
+
+	if ($action == 'setscrapping_date' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+		$newvalue = dol_mktime(12, 0, 0, GETPOST('scrapping_datemonth', 'int'), GETPOST('scrapping_dateday', 'int'), GETPOST('scrapping_dateyear', 'int'));
+		$result = $object->setValueFrom('scrapping_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
+		if ($result < 0) {
+			setEventMessages($object->error, null, 'errors');
+			$action == 'editscrapping_date';
+		} else {
+			$action = 'view';
+		}
+	}
+
+	if ($action == 'setcommissionning_date' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+		$newvalue = dol_mktime(12, 0, 0, GETPOST('commissionning_datemonth', 'int'), GETPOST('commissionning_dateday', 'int'), GETPOST('commissionning_dateyear', 'int'));
+		$result = $object->setValueFrom('commissionning_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
+		if ($result < 0) {
+			setEventMessages($object->error, null, 'errors');
+			$action == 'editcommissionning_date';
+		} else {
+			$action = 'view';
+		}
+	}
+
+	if ($action == 'setqc_frequency' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+		$result = $object->setValueFrom('qc_frequency', GETPOST('qc_frequency'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
+		if ($result < 0) { // Prévoir un test de format de durée
+			setEventMessages($object->error, null, 'errors');
+			$action == 'editqc_frequency';
+		} else {
+			$action = 'view';
+		}
+	}
+
+	if ($action == 'setfk_status' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+		$result = $object->setValueFrom('fk_status', GETPOST('fk_status') ? GETPOST('fk_status') : null, '', null, 'text', '', $user, 'PRODUCT_MODIFY');
+		if ($result < 0) {
+			setEventMessages($object->error, null, 'errors');
+			$action == 'editfk_status';
+		} else {
+			$action = 'view';
+		}
+	}
+
 	$triggermodname = 'PRODUCT_LOT_MODIFY'; // Name of trigger action code to execute when we modify record
 
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
@@ -308,6 +374,7 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
+$formproduct = new FormProduct($db);
 
 $title = $langs->trans("ProductLot");
 $help_url = '';
@@ -430,45 +497,57 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Traceability info
 	if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
-		print '<tr><td>';
-		print $form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker');
-		print '</td><td>';
-		print $form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker');
-		print '</td>';
+		print '<tr><td>'.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer).'</td>';
+		print '<td>'.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
-		print '<tr><td>';
-		print $form->editfieldkey($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer, 'datepicker');
-		print '</td><td>';
-		print $form->editfieldval($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer, 'datepicker');
-		print '</td>';
+		print '<tr><td>'.$form->editfieldkey($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer).'</td>';
+		print '<td>'.$form->editfieldval($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
-		print '<tr><td>';
-		print $form->editfieldkey($langs->trans('DestructionDate'), 'destruction_date', $object->destruction_date, $object, $user->rights->stock->creer, 'datepicker');
-		print '</td><td>';
-		print $form->editfieldval($langs->trans('DestructionDate'), 'destruction_date', $object->destruction_date, $object, $user->rights->stock->creer, 'datepicker');
-		print '</td>';
+		print '<tr><td>'.$form->editfieldkey($langs->trans('DestructionDate'), 'scrapping_date', $object->scrapping_date, $object, $user->rights->stock->creer).'</td>';
+		print '<td>'.$form->editfieldval($langs->trans('DestructionDate'), 'scrapping_date', $object->scrapping_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
-		print '<tr><td>';
-		print $form->editfieldkey($langs->trans('FirstUseDate'), 'first_use_date', $object->first_use_date, $object, $user->rights->stock->creer, 'datepicker');
-		print '</td><td>';
-		print $form->editfieldval($langs->trans('FirstUseDate'), 'first_use_date', $object->first_use_date, $object, $user->rights->stock->creer, 'datepicker');
-		print '</td>';
+		print '<tr><td>'.$form->editfieldkey($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer).'</td>';
+		print '<td>'.$form->editfieldval($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
-		print '<tr><td>';
-		print $form->editfieldkey($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'string');
-		print '</td><td>';
-		print $form->editfieldval($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'string');
-		print '</td>';
+		print '<tr><td>'.$form->editfieldkey($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer).'</td>';
+		print '<td>'.$form->editfieldval($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'string').'</td>';
 		print '</tr>';
-		$form->load_cache_productbatch_status();
-		print '<tr><td>';
-		print $form->editfieldkey($langs->trans('Status'), 'fk_status', $form->cache_productbatch_status[$object->status], $object, $user->rights->stock->creer, 'select:productbatch_status');
-		print '</td><td>';
-		print $form->editfieldval($langs->trans('Status'), 'fk_status', $form->cache_productbatch_status[$object->status], $object, $user->rights->stock->creer, 'select:productbatch_status');
+		print '<tr>';
+		print '<td class="maxwidthonsmartphone">';
+		print $form->editfieldkey("Status", 'fk_status', $object->fk_status, $object, $user->rights->stock->creer);
 		print '</td>';
-		print '</tr>';
-		/*print '<tr><td>'.$langs->trans("Status").'</td><td>select à voir</td></tr>';*/
-	}
+		print '<td class="valuefield">';
+		if ($action != 'editfk_status') {
+			$formproduct->load_cache_productbatch_status();
+			print $formproduct->cache_productbatch_status[$object->fk_status];
+		} else {
+	// $fk_status = GETPOST('fk_status');
+		if (empty($fk_status)) {
+			$fk_status = $object->fk_status;
+		}
+		print $formproduct->select_productbatch_status($fk_status,'?id='.$object->id);
+		}
+		print '</td></tr>';
+
+
+		/* print '<tr><td>'.$form->editfieldkey('Status', 'fk_status', '', $object, 0);
+		// print_r($formproductlot->productbatch_status_array(0));
+		print '</td>';
+		print '<td>'.$form->selectarray('fk_status', $formproductlot->productbatch_status_array(0), $object->fk_status, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
+		if ($user->admin) {
+			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
+		print '</td></tr>'; */
+		/* $form->load_cache_productbatch_status();
+		print '<tr><td>';
+		print implode(',',$form->cache_productbatch_status);
+		print $form->editfieldkey($langs->trans('Status'), 'fk_status', $langs->trans($object->laberl), $object, $user->rights->stock->creer, 'select;'.implode(',', $form->cache_productbatch_status));
+		print '</td><td>';
+		print $form->editfieldval($langs->trans('Status'), 'fk_status', $form->cache_productbatch_status[$object->label], $object, $user->rights->stock->creer, 'select;'.implode(',', $form->cache_productbatch_status));
+		// print $form->editfieldval("Type", 'type', $form->cache_types_fees[$object->type], $object, $user->rights->deplacement->creer, 'select:types_fees');
+		print '</td>';
+		print '</tr>'; */
+}
 
 	// Other attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';

From 9fc67275fd7ce174a9ca2c50dfcef41de1e72137 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 27 Apr 2021 15:55:51 +0200
Subject: [PATCH 369/928] llx_c_productbatch_status to migration and
 translatable strings

---
 .../install/mysql/data/llx_c_productbatch_status.sql  |  4 ++--
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql      | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_productbatch_status.sql b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
index c925c0cd937..cd57bbb504b 100644
--- a/htdocs/install/mysql/data/llx_c_productbatch_status.sql
+++ b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
@@ -23,6 +23,6 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'En état de marche', 1);
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'Hors d’usage', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
 
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 3f17d23b51f..818381588c4 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -141,6 +141,17 @@ CREATE TABLE llx_workstation_workstation_usergroup(
 	fk_workstation integer
 ) ENGINE=innodb;
 
+CREATE TABLE llx_c_producbatch_status(
+  rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+  code     varchar(16)        NOT NULL,
+  label    varchar(50)        NOT NULL,
+  active   integer  DEFAULT 1 NOT NULL
+) ENGINE=innodb;
+
+ALTER TABLE llx_c_productbatch_status ADD UNIQUE INDEX uk_c_productbatch_status(code);
+
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
 
 ALTER TABLE llx_product_customer_price ADD COLUMN ref_customer varchar(30);
 ALTER TABLE llx_product_customer_price_log ADD COLUMN ref_customer varchar(30);

From 52f3c95429496172b6bf7abbec35eddee31fff82 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Tue, 27 Apr 2021 15:59:13 +0200
Subject: [PATCH 370/928] Update supplier_proposal.class.php

---
 .../class/supplier_proposal.class.php           | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 0320a663ea8..768302af188 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -290,7 +290,9 @@ class SupplierProposal extends CommonObject
 			$line->tva_tx = $tva_tx;
 
 			$this->lines[] = $line;
+			return 1;
 		}
+		return -1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1402,9 +1404,11 @@ class SupplierProposal extends CommonObject
 			// Numbering module definition
 			$soc = new Societe($this->db);
 			$soc->fetch($this->socid);
+			
+			if ($soc < 0) return -1;
 
 			// Define new ref
-			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
+			if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) { // empty should not happened, but when it occurs, the test save life
 				$num = $this->getNextNumRef($soc);
 			} else {
 				$num = $this->ref;
@@ -1525,6 +1529,7 @@ class SupplierProposal extends CommonObject
 				return -1;
 			}
 		}
+		return 0;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1555,6 +1560,7 @@ class SupplierProposal extends CommonObject
 				return -1;
 			}
 		}
+		return 0;
 	}
 
 
@@ -1589,6 +1595,7 @@ class SupplierProposal extends CommonObject
 				return -1;
 			}
 		}
+		return 0;
 	}
 
 
@@ -1663,7 +1670,9 @@ class SupplierProposal extends CommonObject
 	public function cloture($user, $status, $note)
 	{
 		global $langs, $conf;
-
+		$hidedetails = 0;
+		$hidedesc = 0;
+		$hideref = 0;
 		$this->statut = $status;
 		$error = 0;
 		$now = dol_now();
@@ -1785,6 +1794,7 @@ class SupplierProposal extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
+		return 1;
 	}
 
 	 /**
@@ -1847,6 +1857,7 @@ class SupplierProposal extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
+		return 1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2908,8 +2919,10 @@ class SupplierProposalLine extends CommonObjectLine
 			$this->fk_unit = $objp->fk_unit;
 
 			$this->db->free($result);
+			return 1;
 		} else {
 			dol_print_error($this->db);
+			return -1;
 		}
 	}
 

From 52bf0f0359f9100264e7d66eb30474bfcb5b1915 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 27 Apr 2021 16:02:46 +0200
Subject: [PATCH 371/928] Close #17271 : Replament of 2 graph in
 compta/index.php

---
 htdocs/compta/index.php         |   6 +-
 htdocs/core/lib/invoice.lib.php | 115 ++++++++++++++++++++++++++++++++
 htdocs/langs/en_US/compta.lang  |   6 ++
 3 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index cbe9f7e0a42..6994211213e 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -102,9 +102,11 @@ print load_fiche_titre($langs->trans("AccountancyTreasuryArea"), '', 'bill');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-print getCustomerInvoicePieChart($socid);
+//print getCustomerInvoicePieChart($socid);
+getNumberInvoicesPieChart('customers');
 print '<br>';
-print getPurchaseInvoicePieChart($socid);
+getNumberInvoicesPieChart('fourn');
+//print getPurchaseInvoicePieChart($socid);
 print '<br>';
 print getCustomerInvoiceDraftTable($max, $socid);
 print '<br>';
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index ece491d2c69..f294cbd7916 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -456,6 +456,121 @@ function getPurchaseInvoicePieChart($socid = 0)
 	return $result;
 }
 
+/**
+ * Return an HTML table that contains a pie chart of the number of customers or supplier invoices
+ * @param string $mode Can be customer or fourn
+ * @return string A HTML table that contains a pie chart of customers or supplier invoices
+ */
+function getNumberInvoicesPieChart($mode)
+{
+	global $conf, $db, $langs, $user;
+	if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
+		include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+		$langs->load("boxes");
+		$tmpinvoice = new Facture($db);
+		$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.type, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.datef";
+		if ($mode == 'customers') {
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+		} elseif ($mode == 'fourn') {
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		} else {
+			return '';
+		}
+		$sql .= " WHERE f.type <> 2";
+		$sql .= " AND f.fk_statut = 1";
+		$resql = $db->query($sql);
+		if ($resql) {
+			$num = $db->num_rows($resql);
+			$i = 0;
+			$now = date_create(date('Y-m-d', dol_now()));
+			$datenowsub30 = date_create(date('Y-m-d', dol_now()));
+			$datenowsub15 = date_create(date('Y-m-d', dol_now()));
+			$datenowadd30 = date_create(date('Y-m-d', dol_now()));
+			$datenowadd15 = date_create(date('Y-m-d', dol_now()));
+			$interval30days = date_interval_create_from_date_string('30 days');
+			$interval15days = date_interval_create_from_date_string('15 days');
+			date_sub($datenowsub30, $interval30days);
+			date_sub($datenowsub15, $interval15days);
+			date_add($datenowadd30, $interval30days);
+			date_add($datenowadd15, $interval15days);
+			$numberinvoices = array('late30'=>0,'late15'=>0,'late'=>0,'notlate'=>0,'notlate15'=>0,'notlate30'=>0);
+			$labelnumberinvoices = array('late30'=>'InvoiceLate30Days',
+			'late15'=>'InvoiceLate15Days',
+			'late'=>'InvoiceLateMinus15Days',
+			'notlate'=>'InvoiceNotLate',
+			'notlate15'=>'InvoiceNotLate15Days',
+			'notlate30'=>'InvoiceNotLate30Days');
+			$total = 0;
+			while ($i < $num) {
+				$obj = $db->fetch_object($resql);
+				$datef = date_create($obj->datef);
+				if ($datef < $datenowsub30) {
+					$numberinvoices['late30']++;
+				} elseif ($datef < $datenowsub15) {
+					$numberinvoices['late15']++;
+				} elseif ($datef < $now) {
+					$numberinvoices['late']++;
+				} elseif ($datef > $datenowadd30) {
+					$numberinvoices['notlate30']++;
+				} elseif ($datef > $datenowadd15) {
+					$numberinvoices['notlate15']++;
+				} else {
+					$numberinvoices['notlate']++;
+				}
+				$total++;
+				$i++;
+			}
+			$dataseries = array();
+			$colorseries = array();
+			foreach ($numberinvoices as $key => $nbinvoice) {
+				$dataseries[] = array($langs->trans($labelnumberinvoices[$key]),$nbinvoice);
+			}
+			$colorseries[] = $badgeStatus8;
+			$colorseries[] = $badgeStatus1;
+			$colorseries[] = $badgeStatus3;
+			$colorseries[] = $badgeStatus2;
+			$colorseries[] = $badgeStatus4;
+			$colorseries[] = $badgeStatus0;
+			if ($conf->use_javascript_ajax) {
+				$result = '<div class="div-table-responsive-no-min">';
+				$result .= '<table class="noborder nohover centpercent">';
+				$result .= '<tr class="liste_titre">';
+				$result .= '<td colspan="2">'.$langs->trans("Statistics").' - ';
+				if ($mode == 'customers') {
+					$result .= $langs->trans("CustomerInvoice").'</td>';
+				} elseif ($mode == 'fourn') {
+					$result .= $langs->trans("SupplierInvoice").'</td>';
+				} else {
+					return '';
+				}
+				$result .= '</tr>';
+
+				$dolgraph = new DolGraph();
+				$dolgraph->SetData($dataseries);
+				$dolgraph->SetDataColor(array_values($colorseries));
+				$dolgraph->setShowLegend(2);
+				$dolgraph->setShowPercent(1);
+				$dolgraph->SetType(['pie']);
+				$dolgraph->setHeight('150');
+				$dolgraph->setWidth('300');
+				if ($mode == 'customers') {
+					$dolgraph->draw('idgraphcustomerinvoices');
+				} elseif ($mode == 'fourn') {
+					$dolgraph->draw('idgraphfourninvoices');
+				} else {
+					return '';
+				}
+
+				$result .= '<tr maxwidth="255">';
+				$result .= '<td align="center" colspan="2">'.$dolgraph->show($total ? 0 : 1).'</td>';
+				$result .= '</tr>';
+				$result .= '</table>';
+				$result .= '</div>';
+			}
+			print $result;
+		}
+	}
+}
 /**
  * Return a HTML table that contains a list with customer invoice drafts
  *
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 926cda53c9f..b326eeced00 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -286,3 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
+InvoiceLate30Days = Invoices late 30 days
+InvoiceLate15Days = Invoices late 15 days
+InvoiceLateMinus15Days = Invoices late
+InvoiceNotLate = To pay < 15 days
+InvoiceNotLate15Days = To pay > 15 days
+InvoiceNotLate30Days = To pay in > 30 days

From 3d38301be96b977d902ad99b995c922adabf8042 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 27 Apr 2021 14:06:10 +0000
Subject: [PATCH 372/928] Fixing style errors.

---
 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 768302af188..1bf27c92b86 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1404,7 +1404,7 @@ class SupplierProposal extends CommonObject
 			// Numbering module definition
 			$soc = new Societe($this->db);
 			$soc->fetch($this->socid);
-			
+
 			if ($soc < 0) return -1;
 
 			// Define new ref

From 97633e34f23c1af04f47e517b3ed470f466a947e Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 27 Apr 2021 16:47:27 +0200
Subject: [PATCH 373/928] Fix : Bug facture.class.php

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 1b0a4a768b1..ac9a6c505d7 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4949,8 +4949,8 @@ class Facture extends CommonInvoice
 		// TODO Add filter to check there is no payment started
 		$sql .= $this->db->order("date_lim_reglement", "ASC");
 		$resql = $this->db->query($sql);
-
-		$this->output .= 'Search unpaid invoices with due date = '.$this->db->idate(dol_get_first_hour(dol_time_plus_duree($now, -1 * $nbdays, 'd'), 'gmt'), 'gmt').'<br>';
+		$tmpidate=$this->db->idate(dol_get_first_hour(dol_time_plus_duree($now, -1 * $nbdays, 'd'), 'gmt'), 'gmt');
+		$this->output .= 'Search unpaid invoices with due date = '.$tmpidate.'<br>';
 
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {

From 11437a8077068fbc678b7ad154bcdec897f4ebfc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 17:28:28 +0200
Subject: [PATCH 374/928] css

---
 htdocs/reception/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 5ed59cf922b..4fed66d8960 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -784,6 +784,7 @@ if ($action == 'create') {
 				$langs->load("projects");
 				print '<tr>';
 				print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
+				print img_picto('', 'project', 'class="paddingright"');
 				$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).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 				print '</td>';

From 1a52ff6990bcdb2163a0cbe720ebac746c2aa523 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 27 Apr 2021 17:38:32 +0200
Subject: [PATCH 375/928] language strings

---
 htdocs/langs/en_US/productbatch.lang | 10 +++++++++-
 htdocs/langs/fr_FR/productbatch.lang |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 644da334851..6d9b9844382 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -32,4 +32,12 @@ ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
-QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
\ No newline at end of file
+QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+LifeTime=Life span
+EndOfLife=End of life
+ManufacturingDate=Manufacturing date
+DestructionDate=Destruction date
+FirstUseDate=First use date
+QCFrequency=Quality control frequency
+InWorkingOrder=In working order
+OutOfOrder=Out of order
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 5a1ddd19ae8..86fbd5ed4f0 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -32,3 +32,11 @@ ManageLotMask=Masque personnalisé
 CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
 LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
 SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
+LifeTime=Durée de vie
+EndOfLife=Date de fin de vie
+ManufacturingDate=Date de fabrication
+DestructionDate=Date de mise au rebut
+FirstUseDate=Date de mise en service
+QCFrequency=Periodicité de contrôle
+InWorkingOrder=En état de marche
+OutOfOrder=Hors d’usage

From b1d8ca0701c5f0f9411ed794d430df7e640ed530 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 17:43:12 +0200
Subject: [PATCH 376/928] Fix phpcs

---
 htdocs/bookmarks/card.php                     |  1 -
 htdocs/compta/paiement/card.php               | 87 +++++++++----------
 .../compta/paiement/class/paiement.class.php  |  6 +-
 3 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 207395c267b..1094eabf0c6 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -196,7 +196,6 @@ if ($action == 'create') {
 
 
 if ($id > 0 && !preg_match('/^add/i', $action)) {
-
 	if ($action == 'edit') {
 		print '<form name="edit" method="POST" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 8419756a127..c971ccbf4fd 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -110,61 +110,58 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
 		$db->commit();
 
 		// Loop on each invoice linked to this payment to rebuild PDF
-        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-            $outputlangs = $langs;
-            if (GETPOST('lang_id', 'aZ09')) {
-                $outputlangs = new Translate("", $conf);
-                $outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
-            }
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			$outputlangs = $langs;
+			if (GETPOST('lang_id', 'aZ09')) {
+				$outputlangs = new Translate("", $conf);
+				$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
+			}
 
-            $hidedetails = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0;
-            $hidedesc = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0;
-            $hideref = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0;
+			$hidedetails = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0;
+			$hidedesc = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0;
+			$hideref = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0;
 
-            $sql = 'SELECT f.rowid as facid';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s';
-            $sql .= ' WHERE pf.fk_facture = f.rowid';
-            $sql .= ' AND f.fk_soc = s.rowid';
-            $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
-            $sql .= ' AND pf.fk_paiement = '.$object->id;
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                $i = 0;
-                $num = $db->num_rows($resql);
+			$sql = 'SELECT f.rowid as facid';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s';
+			$sql .= ' WHERE pf.fk_facture = f.rowid';
+			$sql .= ' AND f.fk_soc = s.rowid';
+			$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
+			$sql .= ' AND pf.fk_paiement = '.$object->id;
+			$resql = $db->query($sql);
+			if ($resql) {
+				$i = 0;
+				$num = $db->num_rows($resql);
 
-                if ($num > 0)
-                {
-                    while ($i < $num)
-                    {
-                        $objp = $db->fetch_object($resql);
+				if ($num > 0) {
+					while ($i < $num) {
+						$objp = $db->fetch_object($resql);
 
-                        $invoice = new Facture($db);
+						$invoice = new Facture($db);
 
-                        if ($invoice->fetch($objp->facid) <= 0) {
-                            $errors++;
-                            setEventMessages($invoice->error, $invoice->errors, 'errors');
-                            break;
-                        }
+						if ($invoice->fetch($objp->facid) <= 0) {
+							$errors++;
+							setEventMessages($invoice->error, $invoice->errors, 'errors');
+							break;
+						}
 
-                        if ($invoice->generateDocument($invoice->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref) < 0) {
-                            $errors++;
-                            setEventMessages($invoice->error, $invoice->errors, 'errors');
-                            break;
-                        }
+						if ($invoice->generateDocument($invoice->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref) < 0) {
+							$errors++;
+							setEventMessages($invoice->error, $invoice->errors, 'errors');
+							break;
+						}
 
-                        $i++;
-                    }
-                }
+						$i++;
+					}
+				}
 
-                $db->free($resql);
-            } else {
-                $errors++;
-                setEventMessages($db->error, $db->errors, 'errors');
-            }
+				$db->free($resql);
+			} else {
+				$errors++;
+				setEventMessages($db->error, $db->errors, 'errors');
+			}
 		}
 
-        if (! $errors) {
+		if (! $errors) {
 			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 			exit;
 		}
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index dff546fa827..138891ea31d 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -414,9 +414,9 @@ class Paiement extends CommonObject
 								$outputlangs->setDefaultLang($newlang);
 							}
 
-                            $hidedetails = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0;
-                            $hidedesc = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0;
-                            $hideref = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0;
+							$hidedetails = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0;
+							$hidedesc = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0;
+							$hideref = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0;
 
 							$ret = $invoice->fetch($facid); // Reload to get new records
 

From 328e70c3098aaaef71fa063a372753cc180ac63a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 17:52:57 +0200
Subject: [PATCH 377/928] Update replenish.php

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

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 9a35816735d..813e9556e8a 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -75,7 +75,8 @@ if ($fk_entrepot == "-1" && !empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_E
 	}
 	$resWar = $db->query("SELECT rowid FROM " . MAIN_DB_PREFIX . "entrepot WHERE entity IN (" . $db->sanitize($visibleWarehousesEntities) .")");
 	if ($db->num_rows($resWar) == 1) {
-		$fk_entrepot = $db->fetch_object($resWar)->rowid;
+		$tmpobj = $db->fetch_object($resWar);
+		$fk_entrepot = $tmpobj->rowid;
 	}
 };
 

From f5d18a00230a5f0efc7ce655045e5f91a81cd664 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 18:00:45 +0200
Subject: [PATCH 378/928] Update replenish.php

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

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 813e9556e8a..7421e71f05c 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -340,8 +340,8 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot AS ent ON ent.entity IN('.getEntity('stock').')';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product AND s.fk_entrepot = ent.rowid';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot AS ent ON s.fk_entrepot = ent.rowid AND ent.entity IN('.getEntity('stock').')';
 if ($fk_supplier > 0) {
 	$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid AND pfp.fk_soc = '.$fk_supplier.')';
 }

From 4b490d434c745ba9ef87a6a9ac3f98302e286daf Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Tue, 27 Apr 2021 18:08:05 +0200
Subject: [PATCH 379/928] Corrections

---
 htdocs/fourn/facture/card.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 3f0fd1cc74e..801abaa7407 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -986,7 +986,10 @@ if (empty($reshook)) {
 						$result = $srcobject->fetch(GETPOST('originid', 'int'));
 
 						// If deposit invoice - down payment with 1 line (fixed amount or percent)
+						$typeamount = GETPOST('typedeposit', 'alpha');
 						if (GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT && in_array($typeamount, array('amount', 'variable'))) {
+							$valuedeposit = price2num(GETPOST('valuedeposit', 'alpha'), 'MU');
+
 							// Define the array $amountdeposit
 							$amountdeposit = array();
 							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)) {
@@ -1099,9 +1102,7 @@ if (empty($reshook)) {
 								$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);
 							}
-						}
-
-						if ($result > 0) {
+						} elseif ($result > 0) {
 							$lines = $srcobject->lines;
 							if (empty($lines) && method_exists($srcobject, 'fetch_lines')) {
 								$srcobject->fetch_lines();

From c7c1756703f83775a5f7679863eba7375035cb94 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Tue, 27 Apr 2021 18:22:31 +0200
Subject: [PATCH 380/928] Update supplier_proposal.class.php

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

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 1bf27c92b86..6e3230f871b 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1403,9 +1403,9 @@ class SupplierProposal extends CommonObject
 
 			// Numbering module definition
 			$soc = new Societe($this->db);
-			$soc->fetch($this->socid);
+			$result = $soc->fetch($this->socid);
 
-			if ($soc < 0) return -1;
+			if ($result < 0) return -1;
 
 			// Define new ref
 			if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) { // empty should not happened, but when it occurs, the test save life

From 3f7f166fb664a8eb8425ebd16cbd39fdcdfc624d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 19:33:11 +0200
Subject: [PATCH 381/928] Make option label easier to understand.

---
 htdocs/langs/en_US/cashdesk.lang |  2 +-
 htdocs/takepos/admin/bar.php     | 24 ++++++++++++------------
 htdocs/takepos/invoice.php       |  6 +++---
 htdocs/takepos/receipt.php       |  3 ++-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index a24109fa3d0..4bcf8439271 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -58,7 +58,7 @@ BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
 TakeposNeedsCategories=TakePOS needs at least one product categorie to work
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Order Notes
+OrderNotes=Printing the receipt will set all items to 'Order confirmed' 
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 09f3b13d4d1..863b6eda42c 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -118,14 +118,14 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<td class="titlefieldcreate">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+	print '<td>'.$langs->trans("Parameters").'</td><td class="center">'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
-	if ($conf->global->TAKEPOS_PRINT_METHOD != "browser") {
+	if ($conf->global->TAKEPOS_PRINT_METHOD != "browser") {		// Why this ?
 		print '<tr class="oddeven value"><td>';
 		print $langs->trans("OrderPrinters").' (<a href="'.DOL_URL_ROOT.'/takepos/admin/orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
 		print '</td>';
-		print '<td>';
+		print '<td class="center">';
 		print ajax_constantonoff("TAKEPOS_ORDER_PRINTERS", array(), $conf->entity, 0, 0, 1, 0);
 		//print $form->selectyesno("TAKEPOS_ORDER_PRINTERS", $conf->global->TAKEPOS_ORDER_PRINTERS, 1);
 		print '</td></tr>';
@@ -133,7 +133,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 		print '<tr class="oddeven value"><td>';
 		print $langs->trans("OrderNotes");
 		print '</td>';
-		print '<td>';
+		print '<td class="center">';
 		print ajax_constantonoff("TAKEPOS_ORDER_NOTES", array(), $conf->entity, 0, 0, 1, 0);
 		//print $form->selectyesno("TAKEPOS_ORDER_NOTES", $conf->global->TAKEPOS_ORDER_NOTES, 1);
 		print '</td></tr>';
@@ -142,7 +142,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print '<tr class="oddeven value"><td>';
 	print $langs->trans("BasicPhoneLayout");
 	print '</td>';
-	print '<td>';
+	print '<td class="center">';
 	//print $form->selectyesno("TAKEPOS_PHONE_BASIC_LAYOUT", $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT, 1);
 	print ajax_constantonoff("TAKEPOS_PHONE_BASIC_LAYOUT", array(), $conf->entity, 0, 0, 1, 0);
 	print '</td></tr>';
@@ -150,7 +150,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print '<tr class="oddeven value"><td>';
 	print $langs->trans("ProductSupplements");
 	print '</td>';
-	print '<td>';
+	print '<td class="center">';
 	//print $form->selectyesno("TAKEPOS_SUPPLEMENTS", $conf->global->TAKEPOS_SUPPLEMENTS, 1);
 	print ajax_constantonoff("TAKEPOS_SUPPLEMENTS", array(), $conf->entity, 0, 0, 1, 0);
 	print '</td></tr>';
@@ -159,7 +159,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 		print '<tr class="oddeven"><td>';
 		print $langs->trans("SupplementCategory");
 		print '</td>';
-		print '<td>';
+		print '<td class="center">';
 		print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, 'TAKEPOS_SUPPLEMENTS_CATEGORY', 64, 0, 0);
 		print ajax_combobox('TAKEPOS_SUPPLEMENTS_CATEGORY');
 		print "</td></tr>\n";
@@ -168,14 +168,14 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print '<tr class="oddeven value"><td>';
 	print 'QR - '.$langs->trans("CustomerMenu");
 	print '</td>';
-	print '<td>';
+	print '<td class="center">';
 	print ajax_constantonoff("TAKEPOS_QR_MENU", array(), $conf->entity, 0, 0, 1, 0);
 	print '</td></tr>';
 
 	print '<tr class="oddeven value"><td>';
 	print 'QR - '.$langs->trans("AutoOrder");
 	print '</td>';
-	print '<td>';
+	print '<td class="center">';
 	print ajax_constantonoff("TAKEPOS_AUTO_ORDER", array(), $conf->entity, 0, 0, 1, 0);
 	print '</td></tr>';
 
@@ -187,7 +187,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 }
 
-if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
+if (!empty($conf->global->TAKEPOS_BAR_RESTAURANT)) {
 	if ($conf->global->TAKEPOS_QR_MENU) {
 		$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
@@ -197,10 +197,10 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 		print '<td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
 		print "</tr>\n";
 		print '<tr class="oddeven value"><td>';
-		print "<a target='_blank' href='".$urlwithroot."/takepos/public/menu.php'>".$urlwithroot."/takepos/public/menu.php</a>";
+		print '<a target="_blank" href="'.$urlwithroot.'/takepos/public/menu.php">'.$urlwithroot.'/takepos/public/menu.php</a>';
 		print '</td>';
 		print '<td class="right">';
-		print "<a target='_blank' href='printqr.php'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php' height='42' width='42'></a>";
+		print '<a target="_blank" href="printqr.php"><img src="'.DOL_URL_ROOT.'/takepos/genimg/qr.php" height="42" width="42"></a>';
 		print '</td></tr>';
 		print '</table>';
 	}
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index c7a01e5d8bc..a4fc10c788a 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -974,12 +974,12 @@ if ($action == "search") {
 function SendTicket(id)
 {
 	console.log("Open box to select the Print/Send form");
-	$.colorbox({href:"send.php?facid="+id, width:"70%", height:"30%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("SendTicket"); ?>"});
+	$.colorbox({href:"send.php?facid="+id, width:"70%", height:"30%", transition:"none", iframe:"true", title:'<?php echo dol_escape_js($langs->trans("SendTicket")); ?>'});
 }
 
 function Print(id, gift){
-	$.colorbox({href:"receipt.php?facid="+id+"&gift="+gift, width:"40%", height:"90%", transition:"none", iframe:"true", title:"<?php
-	echo $langs->trans("PrintTicket"); ?>"});
+	console.log("Call Print() to generate the receipt.");
+	$.colorbox({href:"receipt.php?facid="+id+"&gift="+gift, width:"40%", height:"90%", transition:"none", iframe:"true", title:'<?php echo dol_escape_js($langs->trans("PrintTicket")); ?>'});
 }
 
 function TakeposPrinting(id){
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index e9d721a44e3..d978d2ac792 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -50,7 +50,7 @@ include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $langs->loadLangs(array("main", "cashdesk", "companies"));
 
-$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
+$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant
 
 $facid = GETPOST('facid', 'int');
 
@@ -318,5 +318,6 @@ if (!empty($conf->global->TAKEPOS_FOOTER) || !empty($conf->global->{$constFreeTe
 <script type="text/javascript">
 	window.print();
 </script>
+
 </body>
 </html>

From 035828ba511d3a77fd43a29c29d083f0a80b7179 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 19:45:56 +0200
Subject: [PATCH 382/928] Add missing constants

---
 htdocs/adherents/class/adherent.class.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 829c6ab8faa..1d4f2029039 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -44,7 +44,6 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
  */
 class Adherent extends CommonObject
 {
-
 	/**
 	 * @var string ID to identify managed object
 	 */
@@ -332,6 +331,23 @@ class Adherent extends CommonObject
 		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 805)
 	);
 
+	/**
+	 * Draft status
+	 */
+	const STATUS_DRAFT = 0;
+	/**
+	 * Validated status
+	 */
+	const STATUS_VALIDATED = 1;
+	/**
+	 * Resiliated
+	 */
+	const STATUS_RESILIATED = -1;
+	/**
+	 * Excluded
+	 */
+	const STATUS_EXCLUDED = -2;
+
 
 	/**
 	 *	Constructor

From e6d2bad6e051d59b0ef6c4eb6b49fe4d958d77b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 19:46:26 +0200
Subject: [PATCH 383/928] Update paymentok.php

---
 htdocs/public/payment/paymentok.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 37efcbadbd0..7918a5b6f55 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -394,7 +394,7 @@ if ($ispaymentok) {
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-				$result = $object->status < $object::STATUS_DRAFT ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
+				$result = ($object->status == $object::STATUS_EXCLUDED) ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
 				if ($result < 0 || empty($object->datevalid)) {
 					$error++;
 					$errmsg = $object->error;

From 5b74676e549f45d05a0e57e1f57d1e5240a0feb4 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 27 Apr 2021 20:14:03 +0200
Subject: [PATCH 384/928] fix infinite loop

---
 htdocs/public/payment/paymentok.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 7918a5b6f55..10c27baf044 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -414,7 +414,7 @@ if ($ispaymentok) {
 				if ($datesubscription && $defaultdelay && $defaultdelayunit) {
 					$datesubend = dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit);
 					// the new end date of subscription must be in futur
-					while (dol_time_plus_duree($datesubend, -1, 'd') < $now) {
+					while ($datesubend < $now) {
 						$datesubend = dol_time_plus_duree($datesubend, $defaultdelay, $defaultdelayunit);
 						$datesubscription = dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit);
 					}

From d3c7ab402d95a3ad9047cf424a412820ec9f4e55 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 27 Apr 2021 20:45:04 +0200
Subject: [PATCH 385/928] Fix wrong set of constant

---
 htdocs/adherents/class/adherent.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 1d4f2029039..aaf194adf38 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -206,7 +206,7 @@ class Adherent extends CommonObject
 
 	public $public;
 
-	// -2:exclu, -1:brouillon, 0:resilie, >=1:valide,paye
+	// -2:excluded, -1:draft, 0:resiliated, >=1:valided,payed
 	// def in common object
 	//public $status;
 
@@ -334,7 +334,7 @@ class Adherent extends CommonObject
 	/**
 	 * Draft status
 	 */
-	const STATUS_DRAFT = 0;
+	const STATUS_DRAFT = -1;
 	/**
 	 * Validated status
 	 */
@@ -342,7 +342,7 @@ class Adherent extends CommonObject
 	/**
 	 * Resiliated
 	 */
-	const STATUS_RESILIATED = -1;
+	const STATUS_RESILIATED = 0;
 	/**
 	 * Excluded
 	 */

From 7f3810e703604b4fee348789e627fe1094cc252d Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 27 Apr 2021 20:53:14 +0200
Subject: [PATCH 386/928] update $field also

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

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index aaf194adf38..c0645cb14d4 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -326,7 +326,7 @@ class Adherent extends CommonObject
 		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 190),
 		'canvas' => array('type' => 'varchar(32)', 'label' => 'Canvas', 'enabled' => 1, 'visible' => -1, 'position' => 195),
 		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 500,
-		'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', -1 => 'MemberStatusResiliatedShort', -2 => 'MemberStatusExcludedShort')),
+		'arrayofkeyval' => array(-1 => 'Draft', 1 => 'Validated', 0 => 'MemberStatusResiliatedShort', -2 => 'MemberStatusExcludedShort')),
 		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 800),
 		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 805)
 	);

From 082423efa03007dce72b299156ed643b8c250480 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 27 Apr 2021 21:09:37 +0200
Subject: [PATCH 387/928] libstatut

---
 htdocs/adherents/class/adherent.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index c0645cb14d4..75787276543 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1862,7 +1862,7 @@ class Adherent extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-		$sql .= " statut = 1";
+		$sql .= " statut = ".STATUS_VALIDATED;
 		$sql .= ", datevalid = '".$this->db->idate($now)."'";
 		$sql .= ", fk_user_valid=".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -1914,7 +1914,7 @@ class Adherent extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-		$sql .= " statut = 0";
+		$sql .= " statut = ".STATUS_RESILIATED;
 		$sql .= ", fk_user_valid=".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -1964,7 +1964,7 @@ class Adherent extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-		$sql .= " statut = -2";
+		$sql .= " statut = ".STATUS_EXCLUDED;
 		$sql .= ", fk_user_valid=".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -2275,11 +2275,11 @@ class Adherent extends CommonObject
 		$labelStatus = '';
 		$labelStatusShort = '';
 
-		if ($status == -1) {
+		if ($status == STATUS_DRAFT) {
 			$statusType = 'status0';
 			$labelStatus = $langs->trans("MemberStatusDraft");
 			$labelStatusShort = $langs->trans("MemberStatusDraftShort");
-		} elseif ($status >= 1) {
+		} elseif ($status >= STATUS_VALIDATED) {
 			if ($need_subscription == 0) {
 				$statusType = 'status4';
 				$labelStatus = $langs->trans("MemberStatusNoSubscription");
@@ -2297,11 +2297,11 @@ class Adherent extends CommonObject
 				$labelStatus = $langs->trans("MemberStatusPaid");
 				$labelStatusShort = $langs->trans("MemberStatusPaidShort");
 			}
-		} elseif ($status == 0) {
+		} elseif ($status == STATUS_RESILIATED) {
 			$statusType = 'status6';
 			$labelStatus = $langs->trans("MemberStatusResiliated");
 			$labelStatusShort = $langs->trans("MemberStatusResiliatedShort");
-		} elseif ($status == -2) {
+		} elseif ($status == STATUS_EXCLUDED)  {
 			$statusType = 'status10';
 			$labelStatus = $langs->trans("MemberStatusExcluded");
 			$labelStatusShort = $langs->trans("MemberStatusExcludedShort");

From d0d034672d839c41f876b48faedef1796e4226e8 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 27 Apr 2021 19:10:01 +0000
Subject: [PATCH 388/928] Fixing style errors.

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

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 75787276543..b3b78939e06 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2301,7 +2301,7 @@ class Adherent extends CommonObject
 			$statusType = 'status6';
 			$labelStatus = $langs->trans("MemberStatusResiliated");
 			$labelStatusShort = $langs->trans("MemberStatusResiliatedShort");
-		} elseif ($status == STATUS_EXCLUDED)  {
+		} elseif ($status == STATUS_EXCLUDED) {
 			$statusType = 'status10';
 			$labelStatus = $langs->trans("MemberStatusExcluded");
 			$labelStatusShort = $langs->trans("MemberStatusExcludedShort");

From 3d3e8786afc622df02ae883a3c4749613d2761a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 21:24:59 +0200
Subject: [PATCH 389/928] Update adherent.class.php

---
 htdocs/adherents/class/adherent.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index b3b78939e06..28f7c6e933e 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1862,7 +1862,7 @@ class Adherent extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-		$sql .= " statut = ".STATUS_VALIDATED;
+		$sql .= " statut = ".self::STATUS_VALIDATED;
 		$sql .= ", datevalid = '".$this->db->idate($now)."'";
 		$sql .= ", fk_user_valid=".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -1914,7 +1914,7 @@ class Adherent extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-		$sql .= " statut = ".STATUS_RESILIATED;
+		$sql .= " statut = ".self::STATUS_RESILIATED;
 		$sql .= ", fk_user_valid=".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -1964,7 +1964,7 @@ class Adherent extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-		$sql .= " statut = ".STATUS_EXCLUDED;
+		$sql .= " statut = ".self::STATUS_EXCLUDED;
 		$sql .= ", fk_user_valid=".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -2275,11 +2275,11 @@ class Adherent extends CommonObject
 		$labelStatus = '';
 		$labelStatusShort = '';
 
-		if ($status == STATUS_DRAFT) {
+		if ($status == self::STATUS_DRAFT) {
 			$statusType = 'status0';
 			$labelStatus = $langs->trans("MemberStatusDraft");
 			$labelStatusShort = $langs->trans("MemberStatusDraftShort");
-		} elseif ($status >= STATUS_VALIDATED) {
+		} elseif ($status >= self::STATUS_VALIDATED) {
 			if ($need_subscription == 0) {
 				$statusType = 'status4';
 				$labelStatus = $langs->trans("MemberStatusNoSubscription");
@@ -2297,11 +2297,11 @@ class Adherent extends CommonObject
 				$labelStatus = $langs->trans("MemberStatusPaid");
 				$labelStatusShort = $langs->trans("MemberStatusPaidShort");
 			}
-		} elseif ($status == STATUS_RESILIATED) {
+		} elseif ($status == self::STATUS_RESILIATED) {
 			$statusType = 'status6';
 			$labelStatus = $langs->trans("MemberStatusResiliated");
 			$labelStatusShort = $langs->trans("MemberStatusResiliatedShort");
-		} elseif ($status == STATUS_EXCLUDED) {
+		} elseif ($status == self::STATUS_EXCLUDED) {
 			$statusType = 'status10';
 			$labelStatus = $langs->trans("MemberStatusExcluded");
 			$labelStatusShort = $langs->trans("MemberStatusExcludedShort");

From e3653374406d7661aa8e889108811774004b6f57 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 27 Apr 2021 21:43:13 +0200
Subject: [PATCH 390/928] Use status constant instead of integer

---
 htdocs/adherents/class/adherent.class.php | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 28f7c6e933e..59ea7dbb2dc 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -357,7 +357,7 @@ class Adherent extends CommonObject
 	public function __construct($db)
 	{
 		$this->db = $db;
-		$this->statut = -1;
+		$this->statut = self::STATUS_DRAFT; // shouldn't this be $status ?
 		// l'adherent n'est pas public par defaut
 		$this->public = 0;
 		// les champs optionnels sont vides
@@ -1854,7 +1854,7 @@ class Adherent extends CommonObject
 		$now = dol_now();
 
 		// Check parameters
-		if ($this->statut == 1) {
+		if ($this->statut == self::STATUS_VALIDATED) {
 			dol_syslog(get_class($this)."::validate statut of member does not allow this", LOG_WARNING);
 			return 0;
 		}
@@ -1870,7 +1870,7 @@ class Adherent extends CommonObject
 		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
-			$this->statut = 1;
+			$this->statut = self::STATUS_VALIDATED;
 
 			// Call trigger
 			$result = $this->call_trigger('MEMBER_VALIDATE', $user);
@@ -1906,7 +1906,7 @@ class Adherent extends CommonObject
 		$error = 0;
 
 		// Check parameters
-		if ($this->statut == 0) {
+		if ($this->statut == self::STATUS_RESILIATED) {
 			dol_syslog(get_class($this)."::resiliate statut of member does not allow this", LOG_WARNING);
 			return 0;
 		}
@@ -1920,7 +1920,7 @@ class Adherent extends CommonObject
 
 		$result = $this->db->query($sql);
 		if ($result) {
-			$this->statut = 0;
+			$this->statut = self::STATUS_RESILIATED;
 
 			// Call trigger
 			$result = $this->call_trigger('MEMBER_RESILIATE', $user);
@@ -1956,7 +1956,7 @@ class Adherent extends CommonObject
 		$error = 0;
 
 		// Check parameters
-		if ($this->statut == 0) {
+		if ($this->statut == self::STATUS_EXCLUDED) {
 			dol_syslog(get_class($this)."::resiliate statut of member does not allow this", LOG_WARNING);
 			return 0;
 		}
@@ -1970,7 +1970,7 @@ class Adherent extends CommonObject
 
 		$result = $this->db->query($sql);
 		if ($result) {
-			$this->statut = 0;
+			$this->statut = self::STATUS_EXCLUDED;
 
 			// Call trigger
 			$result = $this->call_trigger('MEMBER_EXCLUDE', $user);
@@ -2367,11 +2367,11 @@ class Adherent extends CommonObject
 		$sql .= ", ".MAIN_DB_PREFIX."adherent_type as t";
 		$sql .= " WHERE a.fk_adherent_type = t.rowid";
 		if ($mode == 'expired') {
-			$sql .= " AND a.statut = 1";
+			$sql .= " AND a.statut = ".self::STATUS_VALIDATED;
 			$sql .= " AND a.entity IN (".getEntity('adherent').")";
 			$sql .= " AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND t.subscription = '1')";
 		} elseif ($mode == 'shift') {
-			$sql .= " AND a.statut = -1";
+			$sql .= " AND a.statut = ".self::STATUS_DRAFT;
 			$sql .= " AND a.entity IN (".getEntity('adherent').")";
 		}
 
@@ -2388,10 +2388,10 @@ class Adherent extends CommonObject
 				$warning_delay = $conf->adherent->subscription->warning_delay / 60 / 60 / 24;
 				$label = $langs->trans("MembersWithSubscriptionToReceive");
 				$labelShort = $langs->trans("MembersWithSubscriptionToReceiveShort");
-				$url = DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=1&amp;filter=outofdate';
+				$url = DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut='.self::STATUS_VALIDATED.'&amp;filter=outofdate';
 			} elseif ($mode == 'shift') {
 				$warning_delay = $conf->adherent->subscription->warning_delay / 60 / 60 / 24;
-				$url = DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=-1';
+				$url = DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut='.self::STATUS_DRAFT;
 				$label = $langs->trans("MembersListToValid");
 				$labelShort = $langs->trans("ToValidate");
 			}
@@ -2504,7 +2504,7 @@ class Adherent extends CommonObject
 		$this->birth = $now;
 		$this->photo = '';
 		$this->public = 1;
-		$this->statut = 0;
+		$this->statut = self::STATUS_DARFT;
 
 		$this->datefin = $now;
 		$this->datevalid = $now;
@@ -2823,7 +2823,7 @@ class Adherent extends CommonObject
 		global $conf;
 
 		//Only valid members
-		if ($this->statut <= 0) {
+		if ($this->statut != self::STATUS_VALIDATED) {
 			return false;
 		}
 		if (!$this->datefin) {

From c1d07a457b429ed05306d248d21bc2be882b0d6f Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 27 Apr 2021 22:00:21 +0200
Subject: [PATCH 391/928] Mispelling

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

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 59ea7dbb2dc..54589a049ff 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2504,7 +2504,7 @@ class Adherent extends CommonObject
 		$this->birth = $now;
 		$this->photo = '';
 		$this->public = 1;
-		$this->statut = self::STATUS_DARFT;
+		$this->statut = self::STATUS_DRAFT;
 
 		$this->datefin = $now;
 		$this->datevalid = $now;

From cb72a010cdcdb6f4f4cf4e2d6239d0017bf936b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 22:14:19 +0200
Subject: [PATCH 392/928] FIX notifications for expense report has disappeared.

---
 htdocs/admin/notification.php                 | 38 ++++++++++++-------
 htdocs/core/lib/functions.lib.php             |  6 +--
 ..._50_modNotification_Notification.class.php |  6 ++-
 htdocs/theme/eldy/main_menu_fa_icons.inc.php  |  7 ++--
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index e1cf115626f..c0c6b45464f 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -243,7 +243,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 			$elementLabel = $langs->trans('Intervention');
 		} elseif ($notifiedevent['elementtype'] == 'shipping') {
 			$elementLabel = $langs->trans('Shipping');
-		} elseif ($notifiedevent['elementtype'] == 'expensereport') {
+		} elseif ($notifiedevent['elementtype'] == 'expensereport' || $notifiedevent['elementtype'] == 'expense_report') {
 			$elementLabel = $langs->trans('ExpenseReport');
 		}
 
@@ -271,6 +271,8 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 
 	$helptext = '';
 	form_constantes($constantes, 3, $helptext);
+
+	print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 } else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -300,7 +302,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 			$elementLabel = $langs->trans('Intervention');
 		} elseif ($notifiedevent['elementtype'] == 'shipping') {
 			$elementLabel = $langs->trans('Shipping');
-		} elseif ($notifiedevent['elementtype'] == 'expensereport') {
+		} elseif ($notifiedevent['elementtype'] == 'expensereport' || $notifiedevent['elementtype'] == 'expense_report') {
 			$elementLabel = $langs->trans('ExpenseReport');
 		}
 
@@ -316,7 +318,13 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 	print '</table>';
 }
 
-print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+
+print '<div class="opacitymedium">';
+print '* '.$langs->trans("GoOntoUserCardToAddMore").'<br>';
+if (!empty($conf->societe->enabled)) {
+	print '** '.$langs->trans("GoOntoContactCardToAddMore").'<br>';
+}
+print '</div>';
 
 print '</form>';
 
@@ -343,28 +351,38 @@ print "</tr>\n";
 foreach ($listofnotifiedevents as $notifiedevent) {
 	$label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
 
+	$elementPicto = $notifiedevent['elementtype'];
 	$elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype']));
 	// Special cases
 	if ($notifiedevent['elementtype'] == 'order_supplier') {
+		$elementPicto = 'supplier_order';
 		$elementLabel = $langs->trans('SupplierOrder');
 	} elseif ($notifiedevent['elementtype'] == 'propal') {
 		$elementLabel = $langs->trans('Proposal');
 	} elseif ($notifiedevent['elementtype'] == 'facture') {
+		$elementPicto = 'bill';
 		$elementLabel = $langs->trans('Bill');
 	} elseif ($notifiedevent['elementtype'] == 'commande') {
+		$elementPicto = 'order';
 		$elementLabel = $langs->trans('Order');
 	} elseif ($notifiedevent['elementtype'] == 'ficheinter') {
+		$elementPicto = 'intervention';
 		$elementLabel = $langs->trans('Intervention');
 	} elseif ($notifiedevent['elementtype'] == 'shipping') {
+		$elementPicto = 'shipment';
 		$elementLabel = $langs->trans('Shipping');
-	} elseif ($notifiedevent['elementtype'] == 'expensereport') {
+	} elseif ($notifiedevent['elementtype'] == 'expensereport' || $notifiedevent['elementtype'] == 'expense_report') {
+		$elementPicto = 'expensereport';
 		$elementLabel = $langs->trans('ExpenseReport');
 	}
 
 	print '<tr class="oddeven">';
-	print '<td>'.$elementLabel.'</td>';
+	print '<td>';
+	print img_picto('', $elementPicto, 'class="pictofixedwidth"');
+	print $elementLabel;
+	print '</td>';
 	print '<td>'.$notifiedevent['code'].'</td>';
-	print '<td>'.$label.'</td>';
+	print '<td><span class="opacitymedium">'.$label.'</span></td>';
 	print '<td>';
 	// Notification with threshold
 	foreach ($conf->global as $key => $val) {
@@ -417,14 +435,6 @@ foreach ($listofnotifiedevents as $notifiedevent) {
 }
 print '</table>';
 
-print '<div class="opacitymedium">';
-print '* '.$langs->trans("GoOntoUserCardToAddMore").'<br>';
-if (!empty($conf->societe->enabled)) {
-	print '** '.$langs->trans("GoOntoContactCardToAddMore").'<br>';
-}
-
-print '</div>';
-
 print '<br>';
 
 print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7559b94a740..d4b94deba51 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3510,7 +3510,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
 				'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'building',
 				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'cron', 'cubes',
-				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'external-link-alt', 'external-link-square-alt',
+				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
 				'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
@@ -3572,7 +3572,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'generic'=>'file', 'holiday'=>'umbrella-beach',
 				'info'=>'info-circle', 'inventory'=>'boxes', 'intracommreport'=>'globe-europe', 'label'=>'layer-group', 'loan'=>'money-bill-alt',
 				'member'=>'user-alt', 'meeting'=>'chalkboard-teacher', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right',
-				'trip'=>'wallet', 'group'=>'users', 'movement'=>'people-carry',
+				'trip'=>'wallet', 'expensereport'=>'wallet', 'group'=>'users', 'movement'=>'people-carry',
 				'sign-out'=>'sign-out-alt',
 				'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
 				'bank'=>'university', 'close_title'=>'times', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
@@ -3662,7 +3662,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'resource'=>'infobox-action',
 				'salary'=>'infobox-bank_account', 'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier',
 				'supplier_order'=>'infobox-order_supplier', 'supplier_proposal'=>'infobox-supplier_proposal',
-				'ticket'=>'infobox-contrat', 'title_accountancy'=>'infobox-bank_account', 'title_hrm'=>'infobox-holiday', 'trip'=>'infobox-expensereport', 'title_agenda'=>'infobox-action',
+				'ticket'=>'infobox-contrat', 'title_accountancy'=>'infobox-bank_account', 'title_hrm'=>'infobox-holiday', 'expensereport'=>'infobox-expensereport', 'trip'=>'infobox-expensereport', 'title_agenda'=>'infobox-action',
 				//'title_setup'=>'infobox-action', 'tools'=>'infobox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
 			);
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 69903ce45f3..18c27a8e36e 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -128,7 +128,7 @@ class InterfaceNotification extends DolibarrTriggers
 				}
 				// Check if module for this event is active
 				if ($qualified) {
-					//print 'xx'.$obj->code;
+					//print 'xx'.$obj->code.' '.$obj->elementtype.'<br>';
 					$element = $obj->elementtype;
 
 					// Exclude events if related module is disabled
@@ -142,7 +142,9 @@ class InterfaceNotification extends DolibarrTriggers
 						$qualified = 0;
 					} elseif ($element == 'member' && empty($conf->adherent->enabled)) {
 						$qualified = 0;
-					} elseif (!in_array($element, array('order_supplier', 'invoice_supplier', 'withdraw', 'shipping', 'member', 'expensereport')) && empty($conf->$element->enabled)) {
+					} elseif (($element == 'expense_report' || $element == 'expensereport') && empty($conf->expensereport->enabled)) {
+						$qualified = 0;
+					} elseif (!in_array($element, array('order_supplier', 'invoice_supplier', 'withdraw', 'shipping', 'member', 'expense_report', 'expensereport')) && empty($conf->$element->enabled)) {
 						$qualified = 0;
 					}
 				}
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index 9b119fa593c..a9e5e80c009 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -203,14 +203,15 @@ div.mainmenu.generic4::before {
 	margin-left: 30px;
 }
 
-.menu_titre .em092 {
+
+.em092 {
 	font-size: 0.92em;
 }
 
-.menu_titre .em088 {
+.em088 {
 	font-size: 0.88em;
 }
 
-.menu_titre .em080 {
+.em080 {
 	font-size: 0.80em;
 }

From 1e7a778eccd7191f0cc51864a150b05bb689f5a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 22:28:28 +0200
Subject: [PATCH 393/928] Debug v14

---
 htdocs/commande/card.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 12117a5f1cb..1b82bc0c20f 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2468,7 +2468,7 @@ if ($action == 'create' && $usercancreate) {
 			if (empty($reshook)) {
 				// Reopen a closed order
 				if (($object->statut == Commande::STATUS_CLOSED || $object->statut == Commande::STATUS_CANCELED) && $usercancreate) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a></div>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a>';
 				}
 
 				// Send
@@ -2551,39 +2551,39 @@ if ($action == 'create' && $usercancreate) {
 
 				// Set to shipped
 				if (($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS) && $usercanclose) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=shipped">'.$langs->trans('ClassifyShipped').'</a></div>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=shipped">'.$langs->trans('ClassifyShipped').'</a>';
 				}
 				// Create bill and Classify billed
 				// Note: Even if module invoice is not enabled, we should be able to use button "Classified billed"
 				if ($object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0) {
 					if (!empty($conf->facture->enabled) && $user->rights->facture->creer && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
-						print '<div class="inline-block divButAction"><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></div>';
+						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>';
 					}
 					if ($usercancreate && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a></div>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
 					}
 				}
 				if ($object->statut > Commande::STATUS_DRAFT && $object->billed) {
 					if ($usercancreate && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyunbilled">'.$langs->trans("ClassifyUnBilled").'</a></div>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyunbilled">'.$langs->trans("ClassifyUnBilled").'</a>';
 					}
 				}
 				// Clone
 				if ($usercancreate) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a>';
 				}
 
 				// Cancel order
 				if ($object->statut == Commande::STATUS_VALIDATED && (!empty($usercanclose) || !empty($usercancancel))) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("Cancel").'</a></div>';
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("Cancel").'</a>';
 				}
 
 				// Delete order
 				if ($usercandelete) {
 					if ($numshipping == 0) {
-						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
+						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
 					} else {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ShippingExist").'">'.$langs->trans("Delete").'</a></div>';
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ShippingExist").'">'.$langs->trans("Delete").'</a>';
 					}
 				}
 			}

From e01c5313a7593605ce6318f4e45cba523dc12d58 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 22:36:25 +0200
Subject: [PATCH 394/928] Debug v14

---
 htdocs/product/stock/card.php          |  4 +++-
 htdocs/product/stock/info.php          | 32 ++++++++++++++++++++++++++
 htdocs/product/stock/movement_list.php | 32 ++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 64204e327b7..983e0089fe5 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -460,8 +460,10 @@ if ($action == 'create') {
 				print '</td></tr>';
 			}
 
+			print '<tr>';
+
 			// Description
-			print '<tr><td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.nl2br($object->description).'</td></tr>';
+			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.dol_htmlentitiesbr($object->description).'</td></tr>';
 
 			$calcproductsunique = $object->nb_different_products();
 			$calcproducts = $object->nb_products();
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index 84c0111f290..9fc4e81075a 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -57,6 +57,38 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch
 
 $morehtmlref = '<div class="refidno">';
 $morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
+
+// Project
+if (!empty($conf->projet->enabled)) {
+	$langs->load("projects");
+	$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
+	if ($usercancreate) {
+		if ($action != 'classify') {
+			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+		}
+		if ($action == 'classify') {
+			$projectid = $object->fk_project;
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} 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>';
 
 $shownav = 1;
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 4a9a0bb9613..0f2cec28ec9 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -623,6 +623,38 @@ if ($resql) {
 
 		$morehtmlref = '<div class="refidno">';
 		$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
+
+		// Project
+		if (!empty($conf->projet->enabled)) {
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
+			if ($usercancreate && 1 == 2) {
+				if ($action != 'classify') {
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				}
+				if ($action == 'classify') {
+					$projectid = $object->fk_project;
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} 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>';
 
 		$shownav = 1;

From f3504e8c543bacbd615e98807d0a2da23f0fc4e0 Mon Sep 17 00:00:00 2001
From: kastoras <kastoras_1@hotmail.com>
Date: Tue, 27 Apr 2021 23:47:00 +0300
Subject: [PATCH 395/928] Close/CLOSE #17390 Products API, GET /products
 variants filter

Added new parameter for variants filter. Using this filter you can get products without variants only, parrent products only, child products only.
---
 htdocs/product/class/api_products.class.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 24bb22f41c4..9a04cbc2fea 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -166,10 +166,10 @@ class Products extends DolibarrApi
 	 * @param  int    $category   			Use this param to filter list by category
 	 * @param  string $sqlfilters 			Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
 	 * @param  bool   $ids_only   			Return only IDs of product instead of all properties (faster, above all if list is long)
-	 * @param  bool   $without_variants   	Return only parent products, not variants
+	 * @param  int    $variant_filter   	Use this param to filter list (0 = all, 1=products without variants, 2=parent of variants, 3=variants only)
 	 * @return array                		Array of product objects
 	 */
-	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false, $without_variants = false)
+	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false, $variant_filter = 0)
 	{
 		global $db, $conf;
 
@@ -188,9 +188,16 @@ class Products extends DolibarrApi
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
 
-		if ($without_variants) {
+		if ($variant_filter == 1) {
+			$sql .= ' AND t.rowid not in (select distinct fk_product_parent from '.MAIN_DB_PREFIX.'product_attribute_combination)';
+			$sql .= ' AND t.rowid not in (select distinct fk_product_child from '.MAIN_DB_PREFIX.'product_attribute_combination)';
+		}
+		if ($variant_filter == 2) {
 			$sql .= ' AND t.rowid in (select distinct fk_product_parent from '.MAIN_DB_PREFIX.'product_attribute_combination)';
 		}
+		if ($variant_filter == 3) {
+			$sql .= ' AND t.rowid in (select distinct fk_product_child from '.MAIN_DB_PREFIX.'product_attribute_combination)';
+		}
 
 		// Select products of given category
 		if ($category > 0) {

From e7f117073676df7762f43365c156ebee72339f37 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 27 Apr 2021 23:22:29 +0200
Subject: [PATCH 396/928] Use adherent status const

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

diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index c961ffe3f4a..5b95b58d29d 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -129,16 +129,16 @@ class box_members_by_type extends ModeleBoxes
 					$adhtype->label = $objp->label;
 					$AdherentType[$objp->rowid] = $adhtype;
 
-					if ($objp->statut == -1) {
+					if ($objp->statut == Adherent::STATUS_DRAFT) {
 						$MembersToValidate[$objp->rowid] = $objp->somme;
 					}
-					if ($objp->statut == 1) {
+					if ($objp->statut == Adherent::STATUS_VALIDATED) {
 						$MembersValidated[$objp->rowid] = $objp->somme;
 					}
-					if ($objp->statut == -2) {
+					if ($objp->statut == Adherent::STATUS_EXCLUDED) {
 						$MembersExcluded[$objp->rowid] = $objp->somme;
 					}
-					if ($objp->statut == 0) {
+					if ($objp->statut == Adherent::STATUS_RESILIATED) {
 						$MembersResiliated[$objp->rowid] = $objp->somme;
 					}
 
@@ -210,27 +210,27 @@ class box_members_by_type extends ModeleBoxes
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($MembersToValidate[$key]) && $MembersToValidate[$key] > 0 ? $MembersToValidate[$key] : '') . ' ' . $staticmember->LibStatut(-1, 1, 0, 3),
+						'text' => (isset($MembersToValidate[$key]) && $MembersToValidate[$key] > 0 ? $MembersToValidate[$key] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_DRAFT, 1, 0, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($MembersValidated[$key]) && ($MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) > 0) ? $MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) : '') . ' ' . $staticmember->LibStatut(1, 1, 0, 3),
+						'text' => (isset($MembersValidated[$key]) && ($MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) > 0) ? $MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 0, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($MembersUpToDate[$key]) && $MembersUpToDate[$key] > 0 ? $MembersUpToDate[$key] : '') . ' ' . $staticmember->LibStatut(1, 1, $now, 3),
+						'text' => (isset($MembersUpToDate[$key]) && $MembersUpToDate[$key] > 0 ? $MembersUpToDate[$key] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($MembersExcluded[$key]) && $MembersExcluded[$key] > 0 ? $MembersExcluded[$key] : '') . ' ' . $staticmember->LibStatut(-2, 1, $now, 3),
+						'text' => (isset($MembersExcluded[$key]) && $MembersExcluded[$key] > 0 ? $MembersExcluded[$key] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_EXCLUDED, 1, $now, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($MembersResiliated[$key]) && $MembersResiliated[$key] > 0 ? $MembersResiliated[$key] : '') . ' ' . $staticmember->LibStatut(0, 1, 0, 3),
+						'text' => (isset($MembersResiliated[$key]) && $MembersResiliated[$key] > 0 ? $MembersResiliated[$key] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_RESILIATED, 1, 0, 3),
 						'asis' => 1,
 					);
 
@@ -249,27 +249,27 @@ class box_members_by_type extends ModeleBoxes
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="liste_total right"',
-						'text' => $SumToValidate.' '.$staticmember->LibStatut(-1, 1, 0, 3),
+						'text' => $SumToValidate.' '.$staticmember->LibStatut(Adherent::STATUS_DRAFT, 1, 0, 3),
 						'asis' => 1
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="liste_total right"',
-						'text' => $SumValidated.' '.$staticmember->LibStatut(1, 1, 0, 3),
+						'text' => $SumValidated.' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 0, 3),
 						'asis' => 1
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="liste_total right"',
-						'text' => $SumUpToDate.' '.$staticmember->LibStatut(1, 1, $now, 3),
+						'text' => $SumUpToDate.' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now, 3),
 						'asis' => 1
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="liste_total right"',
-						'text' => $SumExcluded.' '.$staticmember->LibStatut(-2, 1, 0, 3),
+						'text' => $SumExcluded.' '.$staticmember->LibStatut(Adherent::STATUS_EXCLUDED, 1, 0, 3),
 						'asis' => 1
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="liste_total right"',
-						'text' => $SumResiliated.' '.$staticmember->LibStatut(0, 1, 0, 3),
+						'text' => $SumResiliated.' '.$staticmember->LibStatut(Adherent::STATUS_RESILIATED, 1, 0, 3),
 						'asis' => 1
 					);
 				}

From 50a5dd7ff3484648e3da66c64340e1fcc2119219 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 27 Apr 2021 23:28:49 +0200
Subject: [PATCH 397/928] Use adh const

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

diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index 5445ad312fa..4d367a223e2 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -88,7 +88,7 @@ class box_birthdays_members extends ModeleBoxes
 			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth";
 			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as u";
 			$sql .= " WHERE u.entity IN (".getEntity('adherent').")";
-			$sql .= " AND u.statut = 1";
+			$sql .= " AND u.statut = ".Adherent::STATUS_VALIDATED;
 			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
 			$sql .= " ORDER BY DAY(u.birth) ASC";
 			$sql .= $this->db->plimit($max, 0);

From 0037da1a5657a1bdb1a1c76fa0e0f1de82ec0df8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Apr 2021 23:29:53 +0200
Subject: [PATCH 398/928] FIX selection of project for reception must use
 PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS

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

diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 66aa1b300b8..18aa08b0d85 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -770,8 +770,8 @@ if ($action == 'create')
 				$langs->load("projects");
 				print '<tr>';
 				print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
-				$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).'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddProject").'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
+				print $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
+				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 				print '</td>';
 				print '</tr>';
 			}

From 2e108e1e2f64d24f41e5611c54bc4f12e129e3da Mon Sep 17 00:00:00 2001
From: kastoras <kastoras_1@hotmail.com>
Date: Wed, 28 Apr 2021 00:32:37 +0300
Subject: [PATCH 399/928] Close/CLOSE #13739 Product API route added to get
 product stock

Using GET /products/{id}/stock user can get product stock from all warehouses. Using warehouse id will get stock of warehouse given.
---
 htdocs/product/class/api_products.class.php | 44 +++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 9b06b30765d..7805d7c7f52 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -1793,6 +1793,50 @@ class Products extends DolibarrApi
 		return $result;
 	}
 
+	/**
+	 * Get stock data for the product id given. 
+	 * Optionaly with $selected_warehouse_id parameter user can get stock of specific warehouse
+	 *
+	 * @param  int $id ID of Product
+	 * @param  int $selected_warehouse_id ID of warehouse
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url GET {id}/stock
+	 */
+	public function getStock($id,$selected_warehouse_id=null){
+
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}		
+
+		$product_model = new Product($this->db);
+		$product_model->fetch($id);
+		$product_model->load_stock();
+
+		$stockData = $this->_cleanObjectDatas($product_model)->stock_warehouse;
+		if($selected_warehouse_id){
+			foreach($stockData as $warehouse_id => $warehouse){
+				if($warehouse_id != $selected_warehouse_id){
+					unset($stockData[$warehouse_id]);
+				}
+			}
+		}
+
+		if(empty($stockData)){
+			throw new RestException(404, 'No stock found');
+		}
+
+		return ['stock_warehouses'=>$stockData];
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Clean sensible object datas

From 925c32487267387d47de20882bf969466b80c7c0 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 27 Apr 2021 21:38:03 +0000
Subject: [PATCH 400/928] Fixing style errors.

---
 htdocs/product/class/api_products.class.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 7805d7c7f52..8d4b2f29522 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -1794,7 +1794,7 @@ class Products extends DolibarrApi
 	}
 
 	/**
-	 * Get stock data for the product id given. 
+	 * Get stock data for the product id given.
 	 * Optionaly with $selected_warehouse_id parameter user can get stock of specific warehouse
 	 *
 	 * @param  int $id ID of Product
@@ -1807,7 +1807,8 @@ class Products extends DolibarrApi
 	 *
 	 * @url GET {id}/stock
 	 */
-	public function getStock($id,$selected_warehouse_id=null){
+	public function getStock($id, $selected_warehouse_id = null)
+	{
 
 		if (!DolibarrApiAccess::$user->rights->produit->lire) {
 			throw new RestException(401);
@@ -1815,22 +1816,22 @@ class Products extends DolibarrApi
 
 		if (!DolibarrApi::_checkAccessToResource('product', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}		
+		}
 
 		$product_model = new Product($this->db);
 		$product_model->fetch($id);
 		$product_model->load_stock();
 
 		$stockData = $this->_cleanObjectDatas($product_model)->stock_warehouse;
-		if($selected_warehouse_id){
-			foreach($stockData as $warehouse_id => $warehouse){
-				if($warehouse_id != $selected_warehouse_id){
+		if ($selected_warehouse_id) {
+			foreach ($stockData as $warehouse_id => $warehouse) {
+				if ($warehouse_id != $selected_warehouse_id) {
 					unset($stockData[$warehouse_id]);
 				}
 			}
 		}
 
-		if(empty($stockData)){
+		if (empty($stockData)) {
 			throw new RestException(404, 'No stock found');
 		}
 

From 65a83036edddec5e9114c86347f1741707b3654f Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Wed, 28 Apr 2021 07:45:36 +0200
Subject: [PATCH 401/928] Clean code use const adh statut instead of integer

---
 htdocs/adherents/card.php | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 9b28cc6473e..3f92efe0e72 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1747,12 +1747,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print $langs->trans("SubscriptionNotNeeded");
 			} elseif (!$adht->subscription) {
 				print $langs->trans("SubscriptionNotRecorded");
-				if ($object->statut > 0) {
+				if (Adherent::STATUS_VALIDATED == $object->statut) {
 					print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft, not excluded and not resiliated
 				}
 			} else {
 				print $langs->trans("SubscriptionNotReceived");
-				if ($object->statut > 0) {
+				if (Adherent::STATUS_VALIDATED == $object->statut) {
 					print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft, not excluded and not resiliated
 				}
 			}
@@ -1862,7 +1862,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if ($action != 'editlogin' && $action != 'editthirdparty') {
 				// Send
 				if (empty($user->socid)) {
-					if ($object->statut == 1) {
+					if (Adherent::STATUS_VALIDATED == $object->statut) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>'."\n";
 					}
 				}
@@ -1870,20 +1870,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				// Send card by email
 				// TODO Remove this to replace with a template
 				/*
-				if ($user->rights->adherent->creer)
-				{
-					if ($object->statut >= 1)
-					{
+				if ($user->rights->adherent->creer) {
+					if (Adherent::STATUS_VALIDATED == $object->statut) {
 						if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a></div>\n";
 						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a></div>\n";
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("SendCardByMail")."</font></div>";
 					}
-				}
-				else
-				{
+				} else {
 					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
 				}*/
 
@@ -1895,7 +1889,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				// Validate
-				if ($object->statut == -1) {
+				if (Adherent::STATUS_DRAFT == object->statut) {
 					if ($user->rights->adherent->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate").'</a></div>'."\n";
 					} else {
@@ -1904,7 +1898,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				// Reactivate
-				if ($object->statut == 0 || $object->statut == -2) {
+				if (Adherent::STATUS_RESILIATED == $object->statut || Adherent::STATUS_EXCLUDED == $Object->statut) {
 					if ($user->rights->adherent->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
 					} else {
@@ -1913,7 +1907,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				// Resiliate
-				if ($object->statut >= 1) {
+				if (Adherent::STATUS_VALIDATED == $object->statut) {
 					if ($user->rights->adherent->supprimer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=resiliate">'.$langs->trans("Resiliate")."</a></div>\n";
 					} else {
@@ -1922,7 +1916,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				// Exclude
-				if ($object->statut >= 1) {
+				if (Adherent::STATUS_VALIDATED == $object->statut) {
 					if ($user->rights->adherent->supprimer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=exclude">'.$langs->trans("Exclude")."</a></div>\n";
 					} else {
@@ -1933,7 +1927,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				// Create third party
 				if (!empty($conf->societe->enabled) && !$object->socid) {
 					if ($user->rights->societe->creer) {
-						if ($object->statut != -1) {
+						if (Adherent::STATUS_DRAFT != $object->statut) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>'."\n";;
 						} else {
 							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>'."\n";
@@ -1946,7 +1940,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				// Create user
 				if (!$user->socid && !$object->user_id) {
 					if ($user->rights->user->user->creer) {
-						if ($object->statut != -1) {
+						if (Adherent::STATUS_DRAFT != $object->statut) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>'."\n";
 						} else {
 							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>'."\n";

From 972b325a51649b5f0e6bfa2b13806e225ba05a94 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Wed, 28 Apr 2021 08:14:18 +0200
Subject: [PATCH 402/928] Clean code

---
 htdocs/adherents/card.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 3f92efe0e72..222d34d38d9 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -937,17 +937,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 							document.formsoc.action.value="create";
 							document.formsoc.submit();
 						});
-						function initfieldrequired()
-						{
+						function initfieldrequired() {
 							jQuery("#tdcompany").removeClass("fieldrequired");
 							jQuery("#tdlastname").removeClass("fieldrequired");
 							jQuery("#tdfirstname").removeClass("fieldrequired");
-							if (jQuery("#morphy").val() == \'mor\')
-							{
+							if (jQuery("#morphy").val() == \'mor\') {
 								jQuery("#tdcompany").addClass("fieldrequired");
 							}
-							if (jQuery("#morphy").val() == \'phy\')
-							{
+							if (jQuery("#morphy").val() == \'phy\') {
 								jQuery("#tdlastname").addClass("fieldrequired");
 								jQuery("#tdfirstname").addClass("fieldrequired");
 							}
@@ -1167,17 +1164,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					document.formsoc.action.value="edit";
 					document.formsoc.submit();
 				});
-				function initfieldrequired()
-				{
+				function initfieldrequired() {
 					jQuery("#tdcompany").removeClass("fieldrequired");
 					jQuery("#tdlastname").removeClass("fieldrequired");
 					jQuery("#tdfirstname").removeClass("fieldrequired");
-					if (jQuery("#morphy").val() == \'mor\')
-					{
+					if (jQuery("#morphy").val() == \'mor\') {
 						jQuery("#tdcompany").addClass("fieldrequired");
 					}
-					if (jQuery("#morphy").val() == \'phy\')
-					{
+					if (jQuery("#morphy").val() == \'phy\') {
 						jQuery("#tdlastname").addClass("fieldrequired");
 						jQuery("#tdfirstname").addClass("fieldrequired");
 					}
@@ -2004,7 +1998,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Show links to link elements
 			/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
-			 if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
+			 if ($linktoelem) {
+				print ($somethingshown?'':'<br>').$linktoelem;
+			}
 			 */
 
 			// Show online payment link

From 7782e849e2ecc26e22c9a79366f35fd5c485946e Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 28 Apr 2021 09:22:10 +0200
Subject: [PATCH 403/928] changes to implement eldy's advices

---
 htdocs/core/tpl/filemanager.tpl.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 7c620aa404c..592c3283a1b 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -99,12 +99,14 @@ if ($permtoadd && $module == 'ecm') {	// If on file manager medias in ecm
 print "<script>
 $(\"#generateimgwebp\").on(\"click\",function(){
 	try{
+		console.log(\"We click to generate webp image, we set current dir into hidden vars\");
 		section_dir = $(\".directory.expanded\")[$(\".directory.expanded\").length-1].children[0].rel
 		section=$(\".directory.expanded\")[$(\".directory.expanded\").length-1].children[0].id.split('_')[2]
 	}catch{
 		section_dir = '/'
 		section=0
 	}
+	console.log(\"We add hiden vars in href of button to create webp \");
 	$(\"#generateimgwebp\").attr(\"href\",$(\"#generateimgwebp\").attr(\"href\")+'&section_dir='+section_dir+'&section='+section)
   })
 </script>";
@@ -170,9 +172,9 @@ if ($action == 'confirmconvertimgwebp') {
 
 if ($action == 'convertimgwebp' && $permtoadd) {
 	if ($module == 'medias') {
-		$imagefolder = $conf->website->dir_output.'/'.$websitekey.'/medias/'.GETPOST('section_dir', 'alpha');
+		$imagefolder = $conf->website->dir_output.'/'.$websitekey.'/medias/'.dol_sanitizeFileName(GETPOST('section_dir', 'alpha'));
 	} else {
-		$imagefolder = $conf->ecm->dir_output.'/'.GETPOST('section_dir', 'alpha');
+		$imagefolder = $conf->ecm->dir_output.'/'.dol_sanitizePathName(GETPOST('section_dir', 'alpha'));
 	}
 
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';

From 29cb154028e2870a9119b42edb215d83ac5e7251 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 28 Apr 2021 09:38:19 +0200
Subject: [PATCH 404/928] Update llx_10_c_regions.sql

China
Taiwan

sorting completed
---
 .../install/mysql/data/llx_10_c_regions.sql   | 136 +++++++++---------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index 97fca0f230b..65b3af4950e 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -61,6 +61,7 @@
 -- Brazil -> for Departmements
 -- Canada -> for Departmements
 -- Chile
+-- China
 -- Colombie -> for Departmements
 -- Denmark
 -- France
@@ -84,6 +85,7 @@
 -- Slovenia
 -- Spain
 -- Switzerland/Suisse -> for Departmements/Cantons
+-- Taiwan -> for Departmements
 -- Tunesia
 -- United Arab Emirates -> for Departmements
 -- United Kingdom
@@ -93,7 +95,7 @@
 
 
 -- TEMPLATE ------------------------------------------------------------------------------------------
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 0,   0,  '0', 0, '-');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 0,  0, '0', 0, '-');
 
 
 -- Algeria Regions (id country=13)
@@ -172,6 +174,43 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 6
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 67, 6715, NULL, NULL, 'Arica y Parinacota');
 
 
+-- China Regions (rowid country=9)
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 901, '京',0,'北京市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 902, '津',0,'天津市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 903, '沪',0,'上海市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 904, '渝',0,'重庆市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 905, '冀',0,'河北省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 906, '晋',0,'山西省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 907, '辽',0,'辽宁省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 908, '吉',0,'吉林省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 909, '黑',0,'黑龙江省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 910, '苏',0,'江苏省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 911, '浙',0,'浙江省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 912, '皖',0,'安徽省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 913, '闽',0,'福建省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 914, '赣',0,'江西省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 915, '鲁',0,'山东省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 916, '豫',0,'河南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 917, '鄂',0,'湖北省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 918, '湘',0,'湖南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 919, '粤',0,'广东省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 920, '琼',0,'海南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 921, '川',0,'四川省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 922, '贵',0,'贵州省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 923, '云',0,'云南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 924, '陕',0,'陕西省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 925, '甘',0,'甘肃省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 926, '青',0,'青海省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 927, '台',0,'台湾省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 928, '蒙',0,'内蒙古自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 929, '桂',0,'广西壮族自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 930, '藏',0,'西藏自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 931, '宁',0,'宁夏回族自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 932, '新',0,'新疆维吾尔自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 933, '港',0,'香港特别行政区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 934, '澳',0,'澳门特别行政区');
+
+
 -- Colombie Regions (id country=70)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 70, 7001, '', 0, 'Colombie');
 
@@ -399,31 +438,35 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 4
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 6, 601, '', 1, 'Cantons'); 
 
 
+-- Taiwan Regions (rowid country=213)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 213, 21301, 'TW', NULL, 'Taiwan');
+
+
 -- Tunisia Regions (id country=10)
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1001, '', 0, 'Ariana');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1002, '', 0, 'Béja');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1003, '', 0, 'Ben Arous');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1004, '', 0, 'Bizerte');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1005, '', 0, 'Gabès');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1006, '', 0, 'Gafsa');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1007, '', 0, 'Jendouba');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1008, '', 0, 'Kairouan');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1009, '', 0, 'Kasserine');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1010, '', 0, 'Kébili');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1011, '', 0, 'La Manouba');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1012, '', 0, 'Le Kef');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1013, '', 0, 'Mahdia');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1014, '', 0, 'Médenine');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1015, '', 0, 'Monastir');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1016, '', 0, 'Nabeul');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1017, '', 0, 'Sfax');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1018, '', 0, 'Sidi Bouzid');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1019, '', 0, 'Siliana');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1020, '', 0, 'Sousse');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1021, '', 0, 'Tataouine');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1022, '', 0, 'Tozeur');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1023, '', 0, 'Tunis');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (10, 1024, '', 0, 'Zaghouan');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1001, '', 0, 'Ariana');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1002, '', 0, 'Béja');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1003, '', 0, 'Ben Arous');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1004, '', 0, 'Bizerte');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1005, '', 0, 'Gabès');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1006, '', 0, 'Gafsa');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1007, '', 0, 'Jendouba');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1008, '', 0, 'Kairouan');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1009, '', 0, 'Kasserine');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1010, '', 0, 'Kébili');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1011, '', 0, 'La Manouba');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1012, '', 0, 'Le Kef');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1013, '', 0, 'Mahdia');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1014, '', 0, 'Médenine');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1015, '', 0, 'Monastir');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1016, '', 0, 'Nabeul');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1017, '', 0, 'Sfax');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1018, '', 0, 'Sidi Bouzid');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1019, '', 0, 'Siliana');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1020, '', 0, 'Sousse');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1021, '', 0, 'Tataouine');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1022, '', 0, 'Tozeur');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1023, '', 0, 'Tunis');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1024, '', 0, 'Zaghouan');
 
 
 -- United Arab Emirates (UAE) Regions (rowid country=227)
@@ -452,46 +495,3 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 2
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23208, '', 0, 'Nor-Oriental');
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23209, '', 0, 'Zuliana');
 
-
-
-
--- Regions China (rowid country=9)
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 901, '京',0,'北京市');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 902, '津',0,'天津市');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 903, '沪',0,'上海市');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 904, '渝',0,'重庆市');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 905, '冀',0,'河北省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 906, '晋',0,'山西省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 907, '辽',0,'辽宁省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 908, '吉',0,'吉林省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 909, '黑',0,'黑龙江省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 910, '苏',0,'江苏省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 911, '浙',0,'浙江省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 912, '皖',0,'安徽省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 913, '闽',0,'福建省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 914, '赣',0,'江西省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 915, '鲁',0,'山东省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 916, '豫',0,'河南省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 917, '鄂',0,'湖北省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 918, '湘',0,'湖南省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 919, '粤',0,'广东省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 920, '琼',0,'海南省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 921, '川',0,'四川省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 922, '贵',0,'贵州省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 923, '云',0,'云南省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 924, '陕',0,'陕西省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 925, '甘',0,'甘肃省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 926, '青',0,'青海省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 927, '台',0,'台湾省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 928, '蒙',0,'内蒙古自治区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 929, '桂',0,'广西壮族自治区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 930, '藏',0,'西藏自治区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 931, '宁',0,'宁夏回族自治区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 932, '新',0,'新疆维吾尔自治区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 933, '港',0,'香港特别行政区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (9, 934, '澳',0,'澳门特别行政区');
-
-
--- Regions Taiwan (rowid country=213)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (213, 21301, 'TW', NULL, 'Taiwan');
-

From 26a7c2613ac73c41c733d18e2180eb67684c5659 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 28 Apr 2021 10:03:02 +0200
Subject: [PATCH 405/928] Update llx_20_c_departements.sql

Taiwan
Slovenia (need to check SI-Id)
Panama
---
 .../mysql/data/llx_20_c_departements.sql      | 125 +++++++++---------
 1 file changed, 65 insertions(+), 60 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index e1e363e9c62..96431caf5b1 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -55,7 +55,10 @@
 -- Luxembourg
 -- Netherlands
 -- (Moroco)
+-- Panama
 -- Romania
+-- Slovenia (need to check code SI-Id)
+-- Taiwan
 -- Tunisia
 
 
@@ -759,6 +762,19 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19B', 1214, '', 0, '', 'Province de Tan-Tan', 1);
 
 
+-- Panama - 10 Provinces (id country=178)
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-1', '', 0, '', 'Bocas del Toro');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-2', '', 0, '', 'Coclé');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-3', '', 0, '', 'Colón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-4', '', 0, '', 'Chiriquí');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-5', '', 0, '', 'Darién');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-6', '', 0, '', 'Herrera');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-7', '', 0, '', 'Los Santos');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-8', '', 0, '', 'Panamá');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-9', '', 0, '', 'Veraguas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-13', '', 0, '', 'Panamá Oeste');
+
+
 -- Romania Provinces (id country=188)
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (18801, 'AB', '', 0, '', 'Alba');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (18801, 'AR', '', 0, '', 'Arad');
@@ -804,6 +820,55 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (18801, 'VN', '', 0, '', 'Vrancea');
 
 
+-- Slovenia Provinces (rowid country=202)
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20203, 'SI031', NULL, NULL, 'MURA', 'Mura');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20203, 'SI032', NULL, NULL, 'DRAVA', 'Drava');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20203, 'SI033', NULL, NULL, 'CARINTHIA', 'Carinthia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20203, 'SI034', NULL, NULL, 'SAVINJA', 'Savinja');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20203, 'SI035', NULL, NULL, 'CENTRAL SAVA', 'Central Sava');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20203, 'SI036', NULL, NULL, 'LOWER SAVA', 'Lower Sava');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20203, 'SI037', NULL, NULL, 'SOUTHEAST SLOVENIA', 'Southeast Slovenia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20203, 'SI038', NULL, NULL, 'LITTORAL–INNER CARNIOLA', 'Littoral–Inner Carniola');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20204, 'SI041', NULL, NULL, 'CENTRAL SLOVENIA', 'Central Slovenia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20204, 'SI038', NULL, NULL, 'UPPER CARNIOLA', 'Upper Carniola');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20204, 'SI043', NULL, NULL, 'GORIZIA', 'Gorizia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20204, 'SI044', NULL, NULL, 'COASTAL–KARST', 'Coastal–Karst');
+
+
+-- Taiwan Divisions / Provinces / Counties (rowid country=886)
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-KLU', 'KLU', NULL, '基隆市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TPE', 'TPE', NULL, '臺北市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TPH', 'TPH', NULL, '新北市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TYC', 'TYC', NULL, '桃園市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-HSH', 'HSH', NULL, '新竹縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-HSC', 'HSC', NULL, '新竹市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-MAL', 'MAL', NULL, '苗栗縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-MAC', 'MAC', NULL, '苗栗市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TXG', 'TXG', NULL, '臺中市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-CWH', 'CWH', NULL, '彰化縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-CWS', 'CWS', NULL, '彰化市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-NTC', 'NTC', NULL, '南投市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-NTO', 'NTO', NULL, '南投縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-YLH', 'YLH', NULL, '雲林縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-CHY', 'CHY', NULL, '嘉義縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-CYI', 'CYI', NULL, '嘉義市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TNN', 'TNN', NULL, '臺南市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-KHH', 'KHH', NULL, '高雄市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-IUH', 'IUH', NULL, '屏東縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-PTS', 'PTS', NULL, '屏東市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-ILN', 'ILN', NULL, '宜蘭縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-ILC', 'ILC', NULL, '宜蘭市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-HWA', 'HWA', NULL, '花蓮縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-HWC', 'HWC', NULL, '花蓮市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TTC', 'TTC', NULL, '臺東市');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TTT', 'TTT', NULL, '臺東縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-PEH', 'PEH', NULL, '澎湖縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-GNI', 'GNI', NULL, '綠島');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-KYD', 'KYD', NULL, '蘭嶼');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-KMN', 'KMN', NULL, '金門縣');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-LNN', 'LNN', NULL, '連江縣');
+
+
 -- Tunisia Governorates / Provinces / Wilaya (id country=10)
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN01', '', 0, '', 'Ariana');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1001, 'TN02', '', 0, '', 'Béja');
@@ -1628,17 +1693,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2503', 18126, '', 0, '', 'Padre Abad', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2504', 18126, '', 0, '', 'Purús', 1);
 
--- Provinces Panama (id country=178)
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PA-1', 17801, '', 0, '', 'Bocas del Toro', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PA-2', 17801, '', 0, '', 'Coclé', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PA-3', 17801, '', 0, '', 'Colón', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PA-4', 17801, '', 0, '', 'Chiriquí', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PA-5', 17801, '', 0, '', 'Darién', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PA-6', 17801, '', 0, '', 'Herrera', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PA-7', 17801, '', 0, '', 'Los Santos', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PA-8', 17801, '', 0, '', 'Panamá', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PA-9', 17801, '', 0, '', 'Veraguas', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PA-13', 17801, '', 0, '', 'Panamá Oeste', 1);
 
 -- Provinces United Arab Emirates (id country=227)
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AE-1', 22701, '', 0, '', 'Abu Dhabi', 1);
@@ -1673,52 +1727,3 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-VR', NULL, NULL, 'VILA REAL', 'Vila Real');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-VI', NULL, NULL, 'VISEU', 'Viseu');
 
--- Provinces Slovenia (rowid country=202)
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20203', 'SI031', NULL, NULL, 'MURA', 'Mura');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20203', 'SI032', NULL, NULL, 'DRAVA', 'Drava');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20203', 'SI033', NULL, NULL, 'CARINTHIA', 'Carinthia');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20203', 'SI034', NULL, NULL, 'SAVINJA', 'Savinja');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20203', 'SI035', NULL, NULL, 'CENTRAL SAVA', 'Central Sava');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20203', 'SI036', NULL, NULL, 'LOWER SAVA', 'Lower Sava');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20203', 'SI037', NULL, NULL, 'SOUTHEAST SLOVENIA', 'Southeast Slovenia');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20203', 'SI038', NULL, NULL, 'LITTORAL–INNER CARNIOLA', 'Littoral–Inner Carniola');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI041', NULL, NULL, 'CENTRAL SLOVENIA', 'Central Slovenia');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI038', NULL, NULL, 'UPPER CARNIOLA', 'Upper Carniola');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI043', NULL, NULL, 'GORIZIA', 'Gorizia');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI044', NULL, NULL, 'COASTAL–KARST', 'Coastal–Karst');
-
-
--- Provinces  Taiwan (rowid country=886)
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-KLU', 'KLU', NULL, '基隆市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TPE', 'TPE', NULL, '臺北市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TPH', 'TPH', NULL, '新北市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TYC', 'TYC', NULL, '桃園市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-HSH', 'HSH', NULL, '新竹縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-HSC', 'HSC', NULL, '新竹市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-MAL', 'MAL', NULL, '苗栗縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-MAC', 'MAC', NULL, '苗栗市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TXG', 'TXG', NULL, '臺中市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-CWH', 'CWH', NULL, '彰化縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-CWS', 'CWS', NULL, '彰化市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-NTC', 'NTC', NULL, '南投市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-NTO', 'NTO', NULL, '南投縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-YLH', 'YLH', NULL, '雲林縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-CHY', 'CHY', NULL, '嘉義縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-CYI', 'CYI', NULL, '嘉義市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TNN', 'TNN', NULL, '臺南市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-KHH', 'KHH', NULL, '高雄市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-IUH', 'IUH', NULL, '屏東縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-PTS', 'PTS', NULL, '屏東市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-ILN', 'ILN', NULL, '宜蘭縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-ILC', 'ILC', NULL, '宜蘭市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-HWA', 'HWA', NULL, '花蓮縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-HWC', 'HWC', NULL, '花蓮市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TTC', 'TTC', NULL, '臺東市');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TTT', 'TTT', NULL, '臺東縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-PEH', 'PEH', NULL, '澎湖縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-GNI', 'GNI', NULL, '綠島');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-KYD', 'KYD', NULL, '蘭嶼');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-KMN', 'KMN', NULL, '金門縣');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-LNN', 'LNN', NULL, '連江縣');
-
-

From 7a49629136937b7dab2cb82e0fcb0d4ffaaf7966 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 28 Apr 2021 10:11:49 +0200
Subject: [PATCH 406/928] first commit KnowledgeManagement

---
 htdocs/knowledgemanagement/.editorconfig      |   24 +
 htdocs/knowledgemanagement/.gitattributes     |   23 +
 htdocs/knowledgemanagement/.gitignore         |   18 +
 htdocs/knowledgemanagement/.tx/config         |    9 +
 htdocs/knowledgemanagement/COPYING            |  621 ++++++++++
 htdocs/knowledgemanagement/ChangeLog.md       |    5 +
 htdocs/knowledgemanagement/README.md          |   27 +
 htdocs/knowledgemanagement/admin/about.php    |  103 ++
 .../admin/knowledgerecord_extrafields.php     |  141 +++
 htdocs/knowledgemanagement/admin/setup.php    |  633 ++++++++++
 .../build/makepack-knowledgemanagement.conf   |   11 +
 .../class/knowledgerecord.class.php           | 1060 +++++++++++++++++
 .../mod_knowledgerecord_advanced.php          |  148 +++
 .../mod_knowledgerecord_standard.php          |  161 +++
 .../modules_knowledgerecord.php               |  158 +++
 .../modules/modKnowledgeManagement.class.php  |  547 +++++++++
 .../img/object_knowledgemanagement.png        |  Bin 0 -> 219 bytes
 .../img/object_knowledgemanagement_over.png   |  Bin 0 -> 208 bytes
 .../img/object_knowledgerecord.png            |  Bin 0 -> 219 bytes
 .../knowledgemanagementindex.php              |  241 ++++
 .../knowledgerecord_agenda.php                |  303 +++++
 .../knowledgerecord_card.php                  |  564 +++++++++
 .../knowledgerecord_contact.php               |  213 ++++
 .../knowledgerecord_document.php              |  250 ++++
 .../knowledgerecord_list.php                  |  713 +++++++++++
 .../knowledgerecord_note.php                  |  200 ++++
 .../langs/en_US/knowledgemanagement.lang      |   61 +
 .../langs/fr_FR/knowledgemanagement.lang      |   58 +
 .../lib/knowledgemanagement.lib.php           |   66 +
 ...nowledgemanagement_knowledgerecord.lib.php |   92 ++
 htdocs/knowledgemanagement/modulebuilder.txt  |    3 +
 .../knowledgemanagement/myobject_contact.php  |  213 ++++
 ...nowledgemanagement_knowledgerecord.key.sql |   27 +
 ...lx_knowledgemanagement_knowledgerecord.sql |   33 +
 ...gement_knowledgerecord_extrafields.key.sql |   19 +
 ...management_knowledgerecord_extrafields.sql |   23 +
 .../KnowledgeManagementFunctionalTest.php     |  304 +++++
 37 files changed, 7072 insertions(+)
 create mode 100644 htdocs/knowledgemanagement/.editorconfig
 create mode 100644 htdocs/knowledgemanagement/.gitattributes
 create mode 100644 htdocs/knowledgemanagement/.gitignore
 create mode 100644 htdocs/knowledgemanagement/.tx/config
 create mode 100644 htdocs/knowledgemanagement/COPYING
 create mode 100644 htdocs/knowledgemanagement/ChangeLog.md
 create mode 100644 htdocs/knowledgemanagement/README.md
 create mode 100644 htdocs/knowledgemanagement/admin/about.php
 create mode 100644 htdocs/knowledgemanagement/admin/knowledgerecord_extrafields.php
 create mode 100644 htdocs/knowledgemanagement/admin/setup.php
 create mode 100644 htdocs/knowledgemanagement/build/makepack-knowledgemanagement.conf
 create mode 100644 htdocs/knowledgemanagement/class/knowledgerecord.class.php
 create mode 100644 htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
 create mode 100644 htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
 create mode 100644 htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
 create mode 100644 htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php
 create mode 100644 htdocs/knowledgemanagement/img/object_knowledgemanagement.png
 create mode 100644 htdocs/knowledgemanagement/img/object_knowledgemanagement_over.png
 create mode 100644 htdocs/knowledgemanagement/img/object_knowledgerecord.png
 create mode 100644 htdocs/knowledgemanagement/knowledgemanagementindex.php
 create mode 100644 htdocs/knowledgemanagement/knowledgerecord_agenda.php
 create mode 100644 htdocs/knowledgemanagement/knowledgerecord_card.php
 create mode 100644 htdocs/knowledgemanagement/knowledgerecord_contact.php
 create mode 100644 htdocs/knowledgemanagement/knowledgerecord_document.php
 create mode 100644 htdocs/knowledgemanagement/knowledgerecord_list.php
 create mode 100644 htdocs/knowledgemanagement/knowledgerecord_note.php
 create mode 100644 htdocs/knowledgemanagement/langs/en_US/knowledgemanagement.lang
 create mode 100644 htdocs/knowledgemanagement/langs/fr_FR/knowledgemanagement.lang
 create mode 100644 htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
 create mode 100644 htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
 create mode 100644 htdocs/knowledgemanagement/modulebuilder.txt
 create mode 100644 htdocs/knowledgemanagement/myobject_contact.php
 create mode 100644 htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.key.sql
 create mode 100644 htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.sql
 create mode 100644 htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.key.sql
 create mode 100644 htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.sql
 create mode 100644 htdocs/knowledgemanagement/test/phpunit/KnowledgeManagementFunctionalTest.php

diff --git a/htdocs/knowledgemanagement/.editorconfig b/htdocs/knowledgemanagement/.editorconfig
new file mode 100644
index 00000000000..57184034691
--- /dev/null
+++ b/htdocs/knowledgemanagement/.editorconfig
@@ -0,0 +1,24 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+
+[*.php]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+[*.js]
+indent_style = tab
+[*.css]
+indent_style = tab
+[*.xml]
+indent_style = tab
+[*.md]
+trim_trailing_whitespace = false
diff --git a/htdocs/knowledgemanagement/.gitattributes b/htdocs/knowledgemanagement/.gitattributes
new file mode 100644
index 00000000000..0d2c67e38e6
--- /dev/null
+++ b/htdocs/knowledgemanagement/.gitattributes
@@ -0,0 +1,23 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.php text eol=lf
+*.sql text eol=lf
+*.htm text eol=lf
+*.html text eol=lf
+*.js text eol=lf
+*.css text eol=lf
+*.lang text eol=lf
+*.txt text eol=lf
+*.md text eol=lf
+*.bat text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.ico binary
+*.png binary
+*.jpg binary
+*.odt binary
+*.odf binary
diff --git a/htdocs/knowledgemanagement/.gitignore b/htdocs/knowledgemanagement/.gitignore
new file mode 100644
index 00000000000..942cb8b03ba
--- /dev/null
+++ b/htdocs/knowledgemanagement/.gitignore
@@ -0,0 +1,18 @@
+# Generated binaries
+/build/*.zip
+# Doxygen generated documentation
+/build/doxygen/doxygen_warnings.log
+/doc/code/doxygen
+# Composer managed dependencies
+/vendor
+/dev/bin
+# PHPdocumentor generated files
+/build/phpdoc
+/doc/code/phpdoc
+# Sphinx generated files
+/doc/user/build
+/.settings/
+/.buildpath
+/.project
+# Other
+*.back
\ No newline at end of file
diff --git a/htdocs/knowledgemanagement/.tx/config b/htdocs/knowledgemanagement/.tx/config
new file mode 100644
index 00000000000..1743c5d00dd
--- /dev/null
+++ b/htdocs/knowledgemanagement/.tx/config
@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+lang_map = uz: uz_UZ
+
+[mymodule.mymodule]
+file_filter = langs/<lang>/mymodule.lang
+source_file = langs/en_US/mymodule.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
diff --git a/htdocs/knowledgemanagement/COPYING b/htdocs/knowledgemanagement/COPYING
new file mode 100644
index 00000000000..94a04532226
--- /dev/null
+++ b/htdocs/knowledgemanagement/COPYING
@@ -0,0 +1,621 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
diff --git a/htdocs/knowledgemanagement/ChangeLog.md b/htdocs/knowledgemanagement/ChangeLog.md
new file mode 100644
index 00000000000..91675fce526
--- /dev/null
+++ b/htdocs/knowledgemanagement/ChangeLog.md
@@ -0,0 +1,5 @@
+# CHANGELOG KNOWLEDGEMANAGEMENT FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
+
+## 1.0
+
+Initial version
diff --git a/htdocs/knowledgemanagement/README.md b/htdocs/knowledgemanagement/README.md
new file mode 100644
index 00000000000..30e0f5c877f
--- /dev/null
+++ b/htdocs/knowledgemanagement/README.md
@@ -0,0 +1,27 @@
+# KNOWLEDGEMANAGEMENT FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
+
+## Features
+
+This module provides a feature to help managing a knowledge database.
+
+
+
+Other external modules are available on [Dolistore.com](https://www.dolistore.com).
+
+## Translations
+
+Translations can be completed manually by editing files into directories *langs*.
+
+
+
+
+
+## Licenses
+
+### Main code
+
+GPLv3 or (at your option) any later version. See file COPYING for more information.
+
+### Documentation
+
+All texts and readmes are licensed under GFDL.
diff --git a/htdocs/knowledgemanagement/admin/about.php b/htdocs/knowledgemanagement/admin/about.php
new file mode 100644
index 00000000000..7b6867e8feb
--- /dev/null
+++ b/htdocs/knowledgemanagement/admin/about.php
@@ -0,0 +1,103 @@
+<?php
+/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 SuperAdmin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    knowledgemanagement/admin/about.php
+ * \ingroup knowledgemanagement
+ * \brief   About page of module KnowledgeManagement.
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once '../lib/knowledgemanagement.lib.php';
+
+// Translations
+$langs->loadLangs(array("errors", "admin", "knowledgemanagement@knowledgemanagement"));
+
+// Access control
+if (!$user->admin) {
+	accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$page_name = "KnowledgeManagementAbout";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
+
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
+
+// Configuration header
+$head = knowledgemanagementAdminPrepareHead();
+print dol_get_fiche_head($head, 'about', '', 0, 'knowledgemanagement@knowledgemanagement');
+
+dol_include_once('/knowledgemanagement/core/modules/modKnowledgeManagement.class.php');
+$tmpmodule = new modKnowledgeManagement($db);
+print $tmpmodule->getDescLong();
+
+// Page end
+print dol_get_fiche_end();
+llxFooter();
+$db->close();
diff --git a/htdocs/knowledgemanagement/admin/knowledgerecord_extrafields.php b/htdocs/knowledgemanagement/admin/knowledgerecord_extrafields.php
new file mode 100644
index 00000000000..1d6bac98e5b
--- /dev/null
+++ b/htdocs/knowledgemanagement/admin/knowledgerecord_extrafields.php
@@ -0,0 +1,141 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2014		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       admin/knowledgerecord_extrafields.php
+ *		\ingroup    knowledgemanagement
+ *		\brief      Page to setup extra fields of knowledgerecord
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once '../lib/knowledgemanagement.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('knowledgemanagement@knowledgemanagement', 'admin'));
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
+
+$action = GETPOST('action', 'aZ09');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'knowledgemanagement_knowledgerecord'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+
+llxHeader('', $langs->trans("KnowledgeManagementSetup"), $help_url);
+
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("KnowledgeManagementSetup"), $linkback, 'title_setup');
+
+
+$head = knowledgemanagementAdminPrepareHead();
+
+print dol_get_fiche_head($head, 'knowledgerecord_extrafields', $langs->trans("KnowledgeRecordExtraFields"), -1, 'account');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+print dol_get_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit') {
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
+}
+
+
+/*
+ * Creation of an optional field
+ */
+if ($action == 'create') {
+	print '<br><div id="newattrib"></div>';
+	print load_fiche_titre($langs->trans('NewAttribute'));
+
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/*
+ * Edition of an optional field
+ */
+if ($action == 'edit' && !empty($attrname)) {
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/knowledgemanagement/admin/setup.php b/htdocs/knowledgemanagement/admin/setup.php
new file mode 100644
index 00000000000..7aca837cb15
--- /dev/null
+++ b/htdocs/knowledgemanagement/admin/setup.php
@@ -0,0 +1,633 @@
+<?php
+/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 SuperAdmin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    knowledgemanagement/admin/setup.php
+ * \ingroup knowledgemanagement
+ * \brief   KnowledgeManagement setup page.
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+global $langs, $user;
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once '../lib/knowledgemanagement.lib.php';
+//require_once "../class/myclass.class.php";
+
+// Translations
+$langs->loadLangs(array("admin", "knowledgemanagement@knowledgemanagement"));
+
+// Access control
+if (!$user->admin) {
+	accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+$value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'myobject';
+
+$arrayofparameters = array(
+	'KNOWLEDGEMANAGEMENT_MYPARAM1'=>array('type'=>'string', 'css'=>'minwidth500' ,'enabled'=>0),
+	//'KNOWLEDGEMANAGEMENT_MYPARAM2'=>array('type'=>'textarea','enabled'=>1),
+	//'KNOWLEDGEMANAGEMENT_MYPARAM3'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
+	//'KNOWLEDGEMANAGEMENT_MYPARAM4'=>array('type'=>'emailtemplate:thirdparty', 'enabled'=>1),
+	//'KNOWLEDGEMANAGEMENT_MYPARAM5'=>array('type'=>'yesno', 'enabled'=>1),
+	//'KNOWLEDGEMANAGEMENT_MYPARAM5'=>array('type'=>'thirdparty_type', 'enabled'=>1),
+);
+
+$error = 0;
+$setupnotempty = 0;
+
+
+/*
+ * Actions
+ */
+
+if ((float) DOL_VERSION >= 6) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+}
+
+if ($action == 'updateMask') {
+	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskorder = GETPOST('maskorder', 'alpha');
+
+	if ($maskconstorder) {
+		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+		if (!($res > 0)) {
+			$error++;
+		}
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen') {
+	$modele = GETPOST('module', 'alpha');
+	$tmpobjectkey = GETPOST('object');
+
+	$tmpobject = new $tmpobjectkey($db);
+	$tmpobject->initAsSpecimen();
+
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir."core/modules/knowledgemanagement/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file)) {
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound) {
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+} elseif ($action == 'setmod') {
+	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey)."_ADDON";
+		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+	}
+} elseif ($action == 'set') {
+	// Activate a model
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+} elseif ($action == 'del') {
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0) {
+		$tmpobjectkey = GETPOST('object');
+		if (!empty($tmpobjectkey)) {
+			$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+			if ($conf->global->$constforval == "$value") {
+				dolibarr_del_const($db, $constforval, $conf->entity);
+			}
+		}
+	}
+} elseif ($action == 'setdoc') {
+	// Set or unset default model
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
+			// The constant that was read before the new set
+			// We therefore requires a variable to have a coherent view
+			$conf->global->$constforval = $value;
+		}
+
+		// We disable/enable the document template (into llx_document_model table)
+		$ret = delDocumentModel($value, $type);
+		if ($ret > 0) {
+			$ret = addDocumentModel($value, $type, $label, $scandir);
+		}
+	}
+} elseif ($action == 'unsetdoc') {
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		dolibarr_del_const($db, $constforval, $conf->entity);
+	}
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+$page_name = "KnowledgeManagementSetup";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
+
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
+
+// Configuration header
+$head = knowledgemanagementAdminPrepareHead();
+print dol_get_fiche_head($head, 'settings', '', -1, "knowledgemanagement@knowledgemanagement");
+
+// Setup page goes here
+echo '<span class="opacitymedium">'.$langs->trans("KnowledgeManagementSetupPage").'</span><br><br>';
+
+
+if ($action == 'edit') {
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+	foreach ($arrayofparameters as $constname => $val) {
+		if ($val['enabled']==1) {
+			$setupnotempty++;
+			print '<tr class="oddeven"><td>';
+			$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
+			print '<span id="helplink'.$constname.'" class="spanforparamtooltip">'.$form->textwithpicto($langs->trans($constname), $tooltiphelp, 1, 'info', '', 0, 3, 'tootips'.$constname).'</span>';
+			print '</td><td>';
+
+			if ($val['type'] == 'textarea') {
+				print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
+				print $conf->global->{$constname};
+				print "</textarea>\n";
+			} elseif ($val['type']== 'html') {
+				require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+				$doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+				$doleditor->Create();
+			} elseif ($val['type'] == 'yesno') {
+				print $form->selectyesno($constname, $conf->global->{$constname}, 1);
+			} elseif (preg_match('/emailtemplate:/', $val['type'])) {
+				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+				$formmail = new FormMail($db);
+
+				$tmp = explode(':', $val['type']);
+				$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, 1); // We set lang=null to get in priority record with no lang
+				//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
+				$arrayofmessagename = array();
+				if (is_array($formmail->lines_model)) {
+					foreach ($formmail->lines_model as $modelmail) {
+						//var_dump($modelmail);
+						$moreonlabel = '';
+						if (!empty($arrayofmessagename[$modelmail->label])) {
+							$moreonlabel = ' <span class="opacitymedium">(' . $langs->trans("SeveralLangugeVariatFound") . ')</span>';
+						}
+						// The 'label' is the key that is unique if we exclude the language
+						$arrayofmessagename[$modelmail->id] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)) . $moreonlabel;
+					}
+				}
+				print $form->selectarray($constname, $arrayofmessagename, $conf->global->{$constname}, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
+			} elseif (preg_match('/category:/', $val['type'])) {
+				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+				$formother = new FormOther($db);
+
+				$tmp = explode(':', $val['type']);
+				print img_picto('', 'category', 'class="pictofixedwidth"');
+				print $formother->select_categories($tmp[1],  $conf->global->{$constname}, $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
+			} elseif (preg_match('/thirdparty_type/', $val['type'])) {
+				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+				$formcompany = new FormCompany($db);
+				print $formcompany->selectProspectCustomerType($conf->global->{$constname}, $constname);
+			} else {
+				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
+			}
+			print '</td></tr>';
+		}
+	}
+	print '</table>';
+
+	print '<br><div class="center">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
+	print '</div>';
+
+	print '</form>';
+	print '<br>';
+} else {
+	if (!empty($arrayofparameters)) {
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+		foreach ($arrayofparameters as $constname => $val) {
+			if ($val['enabled']==1) {
+				$setupnotempty++;
+				print '<tr class="oddeven"><td>';
+				$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
+				print $form->textwithpicto($langs->trans($constname), $tooltiphelp);
+				print '</td><td>';
+
+				if ($val['type'] == 'textarea') {
+					print dol_nl2br($conf->global->{$constname});
+				} elseif ($val['type']== 'html') {
+					print  $conf->global->{$constname};
+				} elseif ($val['type'] == 'yesno') {
+					print ajax_constantonoff($constname);
+				} elseif (preg_match('/emailtemplate:/', $val['type'])) {
+					include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+					$formmail = new FormMail($db);
+
+					$tmp = explode(':', $val['type']);
+
+					$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+					if ($template<0) {
+						setEventMessages(null, $formmail->errors, 'errors');
+					}
+					print $langs->trans($template->label);
+				} elseif (preg_match('/category:/', $val['type'])) {
+					$c = new Categorie($db);
+					$result = $c->fetch($conf->global->{$constname});
+					if ($result < 0) {
+						setEventMessages(null, $c->errors, 'errors');
+					}
+					$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
+					$toprint = array();
+					foreach ($ways as $way) {
+						$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
+					}
+					print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+				} elseif (preg_match('/thirdparty_type/', $val['type'])) {
+					if ($conf->global->{$constname}==2) {
+						print $langs->trans("Prospect");
+					} elseif ($conf->global->{$constname}==3) {
+						print $langs->trans("ProspectCustomer");
+					} elseif ($conf->global->{$constname}==1) {
+						print $langs->trans("Customer");
+					} elseif ($conf->global->{$constname}==0) {
+						print $langs->trans("NorProspectNorCustomer");
+					}
+				} else {
+					print  $conf->global->{$constname};
+				}
+				print '</td></tr>';
+			}
+		}
+
+		print '</table>';
+
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '</div>';
+	} else {
+		//print '<br>'.$langs->trans("NothingToSetup");
+	}
+}
+
+
+$moduledir = 'knowledgemanagement';
+$myTmpObjects = array();
+$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+
+
+foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
+	if ($myTmpObjectKey == 'MyObject') {
+		continue;
+	}
+	if ($myTmpObjectArray['includerefgeneration']) {
+		/*
+		 * Orders Numbering model
+		 */
+		$setupnotempty++;
+
+		print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectKey), '', '');
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+		print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+		print '</tr>'."\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir) {
+			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
+
+			if (is_dir($dir)) {
+				$handle = opendir($dir);
+				if (is_resource($handle)) {
+					while (($file = readdir($handle)) !== false) {
+						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
+							$file = substr($file, 0, dol_strlen($file) - 4);
+
+							require_once $dir.'/'.$file.'.php';
+
+							$module = new $file($db);
+
+							// Show modules according to features level
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								continue;
+							}
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								continue;
+							}
+
+							if ($module->isEnabled()) {
+								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
+
+								print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
+								print $module->info();
+								print '</td>';
+
+								// Show example of numbering model
+								print '<td class="nowrap">';
+								$tmp = $module->getExample();
+								if (preg_match('/^Error/', $tmp)) {
+									$langs->load("errors");
+									print '<div class="error">'.$langs->trans($tmp).'</div>';
+								} elseif ($tmp == 'NotConfigured') {
+									print $langs->trans($tmp);
+								} else {
+									print $tmp;
+								}
+								print '</td>'."\n";
+
+								print '<td class="center">';
+								$constforvar = 'KNOWLEDGEMANAGEMENT_'.strtoupper($myTmpObjectKey).'_ADDON';
+								if ($conf->global->$constforvar == $file) {
+									print img_picto($langs->trans("Activated"), 'switch_on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
+									print img_picto($langs->trans("Disabled"), 'switch_off');
+									print '</a>';
+								}
+								print '</td>';
+
+								$mytmpinstance = new $myTmpObjectKey($db);
+								$mytmpinstance->initAsSpecimen();
+
+								// Info
+								$htmltooltip = '';
+								$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+
+								$nextval = $module->getNextValue($mytmpinstance);
+								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+									$htmltooltip .= ''.$langs->trans("NextValue").': ';
+									if ($nextval) {
+										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
+											$nextval = $langs->trans($nextval);
+										}
+										$htmltooltip .= $nextval.'<br>';
+									} else {
+										$htmltooltip .= $langs->trans($module->error).'<br>';
+									}
+								}
+
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
+
+								print "</tr>\n";
+							}
+						}
+					}
+					closedir($handle);
+				}
+			}
+		}
+		print "</table><br>\n";
+	}
+
+	if ($myTmpObjectArray['includedocgeneration']) {
+		/*
+		 * Document templates generators
+		 */
+		$setupnotempty++;
+		$type = strtolower($myTmpObjectKey);
+
+		print load_fiche_titre($langs->trans("DocumentModules", $myTmpObjectKey), '', '');
+
+		// Load array def with activated templates
+		$def = array();
+		$sql = "SELECT nom";
+		$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+		$sql .= " WHERE type = '".$db->escape($type)."'";
+		$sql .= " AND entity = ".$conf->entity;
+		$resql = $db->query($sql);
+		if ($resql) {
+			$i = 0;
+			$num_rows = $db->num_rows($resql);
+			while ($i < $num_rows) {
+				$array = $db->fetch_array($resql);
+				array_push($def, $array[0]);
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
+
+		print "<table class=\"noborder\" width=\"100%\">\n";
+		print "<tr class=\"liste_titre\">\n";
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
+		print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
+		print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+		print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
+		print "</tr>\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir) {
+			foreach (array('', '/doc') as $valdir) {
+				$realpath = $reldir."core/modules/".$moduledir.$valdir;
+				$dir = dol_buildpath($realpath);
+
+				if (is_dir($dir)) {
+					$handle = opendir($dir);
+					if (is_resource($handle)) {
+						while (($file = readdir($handle)) !== false) {
+							$filelist[] = $file;
+						}
+						closedir($handle);
+						arsort($filelist);
+
+						foreach ($filelist as $file) {
+							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+								if (file_exists($dir.'/'.$file)) {
+									$name = substr($file, 4, dol_strlen($file) - 16);
+									$classname = substr($file, 0, dol_strlen($file) - 12);
+
+									require_once $dir.'/'.$file;
+									$module = new $classname($db);
+
+									$modulequalified = 1;
+									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+										$modulequalified = 0;
+									}
+									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+										$modulequalified = 0;
+									}
+
+									if ($modulequalified) {
+										print '<tr class="oddeven"><td width="100">';
+										print (empty($module->name) ? $name : $module->name);
+										print "</td><td>\n";
+										if (method_exists($module, 'info')) {
+											print $module->info($langs);
+										} else {
+											print $module->description;
+										}
+										print '</td>';
+
+										// Active
+										if (in_array($name, $def)) {
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+											print img_picto($langs->trans("Enabled"), 'switch_on');
+											print '</a>';
+											print '</td>';
+										} else {
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print "</td>";
+										}
+
+										// Default
+										print '<td class="center">';
+										$constforvar = 'KNOWLEDGEMANAGEMENT_'.strtoupper($myTmpObjectKey).'_ADDON';
+										if ($conf->global->$constforvar == $name) {
+											//print img_picto($langs->trans("Default"), 'on');
+											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+										} else {
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+										}
+										print '</td>';
+
+										// Info
+										$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+										$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+										if ($module->type == 'pdf') {
+											$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+										}
+										$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+
+										$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+										$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+
+										print '<td class="center">';
+										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print '</td>';
+
+										// Preview
+										print '<td class="center">';
+										if ($module->type == 'pdf') {
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+										} else {
+											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+										}
+										print '</td>';
+
+										print "</tr>\n";
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		print '</table>';
+	}
+}
+
+if (empty($setupnotempty)) {
+	print '<br>'.$langs->trans("NothingToSetup");
+}
+
+// Page end
+print dol_get_fiche_end();
+
+llxFooter();
+$db->close();
diff --git a/htdocs/knowledgemanagement/build/makepack-knowledgemanagement.conf b/htdocs/knowledgemanagement/build/makepack-knowledgemanagement.conf
new file mode 100644
index 00000000000..16dc1e7b82b
--- /dev/null
+++ b/htdocs/knowledgemanagement/build/makepack-knowledgemanagement.conf
@@ -0,0 +1,11 @@
+# Your module name here
+#
+# Goal:    Goal of module
+# Version: <version>
+# Author:  Copyright <year> - <name of author>
+# License: GPLv3
+# Install: Just unpack content of module package in Dolibarr directory.
+# Setup:   Go on Dolibarr setup - modules to enable module.
+#
+# Files in module
+mymodule/
\ No newline at end of file
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
new file mode 100644
index 00000000000..728fa2a4fb0
--- /dev/null
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -0,0 +1,1060 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        class/knowledgerecord.class.php
+ * \ingroup     knowledgemanagement
+ * \brief       This file is a CRUD class file for KnowledgeRecord (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for KnowledgeRecord
+ */
+class KnowledgeRecord extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'knowledgemanagement';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'knowledgerecord';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'knowledgemanagement_knowledgerecord';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 0;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
+	/**
+	 * @var string String with name of icon for knowledgerecord. Must be the part after the 'object_' into object_knowledgerecord.png
+	 */
+	public $picto = 'book';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'picto' is code of a picto to show before value in forms
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>5, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object"),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
+		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserCreation', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>'1', 'position'=>512, 'notnull'=>0, 'visible'=>-2,),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
+		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1,),
+		'answer' => array('type'=>'text', 'label'=>'Answer', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>4,),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Actif'),),
+	);
+	public $rowid;
+	public $ref;
+	public $date_creation;
+	public $tms;
+	public $last_main_doc;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $fk_user_valid;
+	public $import_key;
+	public $model_pdf;
+	public $question;
+	public $answer;
+	public $status;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'knowledgemanagement_knowledgerecordline';
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_knowledgerecord';
+
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'KnowledgeRecordline';
+
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables = array();
+
+	// /**
+	//  * @var array    List of child tables. To know object to delete on cascade.
+	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	//  */
+	// protected $childtablesoncascade = array('knowledgemanagement_knowledgerecorddet');
+
+	// /**
+	//  * @var KnowledgeRecordLine[]     Array of subtable lines
+	//  */
+	// public $lines = array();
+
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
+
+		$this->db = $db;
+
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
+
+		// Example to show how to set values of fields definition dynamically
+		/*if ($user->rights->knowledgemanagement->knowledgerecord->read) {
+			$this->fields['myfield']['visible'] = 1;
+			$this->fields['myfield']['noteditable'] = 0;
+		}*/
+
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
+				unset($this->fields[$key]);
+			}
+		}
+
+		// Translate some data of arrayofkeyval
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		return $this->createCommon($user, $notrigger);
+	}
+
+	/**
+	 * Clone an object into another one
+	 *
+	 * @param  	User 	$user      	User that creates
+	 * @param  	int 	$fromid     Id of object to clone
+	 * @return 	mixed 				New object created, <0 if KO
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		global $langs, $extrafields;
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$object = new self($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) {
+			$object->fetchLines();
+		}
+
+		// get lines so they will be clone
+		//foreach($this->lines as $line)
+		//	$line->fetch_optionals();
+
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
+
+		// Clear fields
+		if (property_exists($object, 'ref')) {
+			$object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
+		}
+		if (property_exists($object, 'label')) {
+			$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		}
+		if (property_exists($object, 'status')) {
+			$object->status = self::STATUS_DRAFT;
+		}
+		if (property_exists($object, 'date_creation')) {
+			$object->date_creation = dol_now();
+		}
+		if (property_exists($object, 'date_modification')) {
+			$object->date_modification = null;
+		}
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option) {
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
+
+		if (!$error) {
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			// copy external contacts if same company
+			if (property_exists($this, 'fk_soc') && $this->fk_soc == $object->socid) {
+				if ($this->copy_linked_contact($object, 'external') < 0) {
+					$error++;
+				}
+			}
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
+		return $result;
+	}
+
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchLines()
+	{
+		$this->lines = array();
+
+		$result = $this->fetchLinesCommon();
+		return $result;
+	}
+
+
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$records = array();
+
+		$sql = 'SELECT ';
+		$sql .= $this->getFieldList('t');
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		} else {
+			$sql .= ' WHERE 1 = 1';
+		}
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num)) {
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
+	}
+
+	/**
+	 *  Delete a line of object in database
+	 *
+	 *	@param  User	$user       User that delete
+	 *  @param	int		$idline		Id of line to delete
+	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
+	 */
+	public function deleteLine(User $user, $idline, $notrigger = false)
+	{
+		if ($this->status < 0) {
+			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
+			return -2;
+		}
+
+		return $this->deleteLineCommon($user, $idline, $notrigger);
+	}
+
+
+	/**
+	 *	Validate object
+	 *
+	 *	@param		User	$user     		User making status change
+	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
+	 */
+	public function validate($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 0;
+
+		// Protection
+		if ($this->status == self::STATUS_VALIDATED) {
+			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgerecord->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgerecord->knowledgerecord_advance->validate))))
+		 {
+		 $this->error='NotEnoughPermissions';
+		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+		 return -1;
+		 }*/
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// Define new ref
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
+			$num = $this->getNextNumRef();
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = $num;
+
+		if (!empty($num)) {
+			// Validate
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " status = ".self::STATUS_VALIDATED;
+			if (!empty($this->fields['date_validation'])) {
+				$sql .= ", date_validation = '".$this->db->idate($now)."'";
+			}
+			if (!empty($this->fields['fk_user_valid'])) {
+				$sql .= ", fk_user_valid = ".((int) $user->id);
+			}
+			$sql .= " WHERE rowid = ".((int) $this->id);
+
+			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				dol_print_error($this->db);
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+
+			if (!$error && !$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('KNOWLEDGERECORD_VALIDATE', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+		}
+
+		if (!$error) {
+			$this->oldref = $this->ref;
+
+			// Rename directory if dir was a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
+				// Now we rename also files into index
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'knowledgerecord/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'knowledgerecord/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
+
+				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
+				$oldref = dol_sanitizeFileName($this->ref);
+				$newref = dol_sanitizeFileName($num);
+				$dirsource = $conf->knowledgemanagement->dir_output.'/knowledgerecord/'.$oldref;
+				$dirdest = $conf->knowledgemanagement->dir_output.'/knowledgerecord/'.$newref;
+				if (!$error && file_exists($dirsource)) {
+					dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
+
+					if (@rename($dirsource, $dirdest)) {
+						dol_syslog("Rename ok");
+						// Rename docs starting with $oldref with $newref
+						$listoffiles = dol_dir_list($conf->knowledgemanagement->dir_output.'/knowledgerecord/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry) {
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
+					}
+				}
+			}
+		}
+
+		// Set new ref and current status
+		if (!$error) {
+			$this->ref = $num;
+			$this->status = self::STATUS_VALIDATED;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Set draft status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function setDraft($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status <= self::STATUS_DRAFT) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'KNOWLEDGERECORD_UNVALIDATE');
+	}
+
+	/**
+	 *	Set cancel status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function cancel($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_VALIDATED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'KNOWLEDGERECORD_CANCEL');
+	}
+
+	/**
+	 *	Set back to validated status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function reopen($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_CANCELED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'KNOWLEDGERECORD_REOPEN');
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string                              String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $hookmanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
+
+		$result = '';
+
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("KnowledgeRecord").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+
+		$url = dol_buildpath('/knowledgemanagement/knowledgerecord_card.php', 1).'?id='.$this->id;
+
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		$linkclose = '';
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$label = $langs->trans("ShowKnowledgeRecord");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
+
+		if ($option == 'nolink') {
+			$linkstart = '<span';
+		} else {
+			$linkstart = '<a href="'.$url.'"';
+		}
+		$linkstart .= $linkclose.'>';
+		if ($option == 'nolink') {
+			$linkend = '</span>';
+		} else {
+			$linkend = '</a>';
+		}
+
+		$result .= $linkstart;
+
+		if (empty($this->showphoto_on_popup)) {
+			if ($withpicto) {
+				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			}
+		} else {
+			if ($withpicto) {
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+				list($class, $module) = explode('@', $this->picto);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
+					} else {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
+					}
+
+					$result .= '</div>';
+				} else {
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+				}
+			}
+		}
+
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
+
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('knowledgerecorddao'));
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
+
+		return $result;
+	}
+
+	/**
+	 *  Return the label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        Id status
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			//$langs->load("knowledgemanagement@knowledgemanagement");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled');
+		}
+
+		$statusType = 'status'.$status;
+		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_CANCELED) {
+			$statusType = 'status6';
+		}
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 *	Load the info information in the object
+	 *
+	 *	@param  int		$id       Id of object
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.((int) $id);
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture) {
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->initAsSpecimenCommon();
+	}
+
+	/**
+	 * 	Create an array of lines
+	 *
+	 * 	@return array|int		array of lines if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		$this->lines = array();
+
+		$objectline = new KnowledgeRecordLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_knowledgerecord = '.$this->id));
+
+		if (is_numeric($result)) {
+			$this->error = $this->error;
+			$this->errors = $this->errors;
+			return $result;
+		} else {
+			$this->lines = $result;
+			return $this->lines;
+		}
+	}
+
+	/**
+	 *  Returns the reference to the following non used object depending on the active numbering module.
+	 *
+	 *  @return string      		Object free reference
+	 */
+	public function getNextNumRef()
+	{
+		global $langs, $conf;
+		$langs->load("knowledgemanagement@knowledgemanagement");
+
+		if (empty($conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON)) {
+			$conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON = 'mod_knowledgerecord_standard';
+		}
+
+		if (!empty($conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON.".php";
+			$classname = $conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/knowledgemanagement/");
+
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
+
+			if ($mybool === false) {
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
+
+			if (class_exists($classname)) {
+				$obj = new $classname();
+				$numref = $obj->getNextValue($this);
+
+				if ($numref != '' && $numref != '-1') {
+					return $numref;
+				} else {
+					$this->error = $obj->error;
+					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+					return "";
+				}
+			} else {
+				print $langs->trans("Error")." ".$langs->trans("ClassNotFound").' '.$classname;
+				return "";
+			}
+		} else {
+			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
+			return "";
+		}
+	}
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 *  @param	    string		$modele			Force template to use ('' to not force)
+	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 *  @param      null|array  $moreparams     Array to provide more information
+	 *  @return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	{
+		global $conf, $langs;
+
+		$result = 0;
+		$includedocgeneration = 0;
+
+		$langs->load("knowledgemanagement@knowledgemanagement");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_knowledgerecord';
+
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->KNOWLEDGERECORD_ADDON_PDF)) {
+				$modele = $conf->global->KNOWLEDGERECORD_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/knowledgemanagement/doc/";
+
+		if ($includedocgeneration && !empty($modele)) {
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
+	 *
+	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doScheduledJob()
+	{
+		global $conf, $langs;
+
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// ...
+
+		$this->db->commit();
+
+		return $error;
+	}
+}
+
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
+
+/**
+ * Class KnowledgeRecordLine. You can also remove this and generate a CRUD class for lines objects.
+ */
+class KnowledgeRecordLine extends CommonObjectLine
+{
+	// To complete with content of an object KnowledgeRecordLine
+	// We should have a field rowid, fk_knowledgerecord and position
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+}
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
new file mode 100644
index 00000000000..14c3b334ee1
--- /dev/null
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
@@ -0,0 +1,148 @@
+<?php
+/* Copyright (C) 2003-2007  Rodolphe Quiedeville        <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
+ * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ * \file       htdocs/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
+ * \ingroup    knowledgemanagement
+ * \brief      File containing class for advanced numbering model of KnowledgeRecord
+ */
+
+dol_include_once('/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php');
+
+
+/**
+ *	Class to manage customer Bom numbering rules advanced
+ */
+class mod_knowledgerecord_advanced extends ModeleNumRefKnowledgeRecord
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	/**
+	 * @var string Error message
+	 */
+	public $error = '';
+
+	/**
+	 * @var string name
+	 */
+	public $name = 'advanced';
+
+
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
+
+		$langs->load("bills");
+
+		$form = new Form($db);
+
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstBom" value="KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("KnowledgeRecord"), $langs->transnoentities("KnowledgeRecord"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("KnowledgeRecord"), $langs->transnoentities("KnowledgeRecord"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
+
+		// Parametrage du prefix
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskKnowledgeRecord" value="'.$conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+
+		$texte .= '</tr>';
+
+		$texte .= '</table>';
+		$texte .= '</form>';
+
+		return $texte;
+	}
+
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $db, $langs, $mysoc;
+
+		$object = new KnowledgeRecord($db);
+		$object->initAsSpecimen();
+
+		/*$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';*/
+
+		$numExample = $this->getNextValue($object);
+
+		/*$mysoc->code_client = $old_code_client;
+		$mysoc->typent_code = $old_code_type;*/
+
+		if (!$numExample) {
+			$numExample = $langs->trans('NotConfigured');
+		}
+		return $numExample;
+	}
+
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
+	 */
+	public function getNextValue($object)
+	{
+		global $db, $conf;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+		// We get cursor rule
+		$mask = $conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK;
+
+		if (!$mask) {
+			$this->error = 'NotConfigured';
+			return 0;
+		}
+
+		$date = $object->date;
+
+		$numFinal = get_next_value($db, $mask, 'knowledgemanagement_knowledgerecord', 'ref', '', null, $date);
+
+		return  $numFinal;
+	}
+}
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
new file mode 100644
index 00000000000..b26219113d9
--- /dev/null
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
@@ -0,0 +1,161 @@
+<?php
+/* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file       htdocs/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
+ *  \ingroup    knowledgemanagement
+ *  \brief      File of class to manage KnowledgeRecord numbering rules standard
+ */
+dol_include_once('/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php');
+
+
+/**
+ *	Class to manage customer order numbering rules standard
+ */
+class mod_knowledgerecord_standard extends ModeleNumRefKnowledgeRecord
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	public $prefix = 'KNOWLEDGERECORD';
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string name
+	 */
+	public $name = 'standard';
+
+
+	/**
+	 *  Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	public function info()
+	{
+		global $langs;
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
+
+
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		return $this->prefix."0501-0001";
+	}
+
+
+	/**
+	 *  Checks if the numbers already in the database do not
+	 *  cause conflicts that would prevent this numbering working.
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return boolean     			false if conflict, true if ok
+	 */
+	public function canBeActivated($object)
+	{
+		global $conf, $langs, $db;
+
+		$coyymm = ''; $max = '';
+
+		$posindice = strlen($this->prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_knowledgerecord";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		if ($object->ismultientitymanaged == 1) {
+			$sql .= " AND entity = ".$conf->entity;
+		} elseif ($object->ismultientitymanaged == 2) {
+			// TODO
+		}
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			$row = $db->fetch_row($resql);
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
+		}
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
+			$langs->load("errors");
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
+	 */
+	public function getNextValue($object)
+	{
+		global $db, $conf;
+
+		// first we get the max value
+		$posindice = strlen($this->prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_knowledgerecord";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		if ($object->ismultientitymanaged == 1) {
+			$sql .= " AND entity = ".$conf->entity;
+		} elseif ($object->ismultientitymanaged == 2) {
+			// TODO
+		}
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			$obj = $db->fetch_object($resql);
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
+		} else {
+			dol_syslog("mod_knowledgerecord_standard::getNextValue", LOG_DEBUG);
+			return -1;
+		}
+
+		//$date=time();
+		$date = $object->date_creation;
+		$yymm = strftime("%y%m", $date);
+
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
+
+		dol_syslog("mod_knowledgerecord_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
+		return $this->prefix.$yymm."-".$num;
+	}
+}
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
new file mode 100644
index 00000000000..01119bec994
--- /dev/null
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
@@ -0,0 +1,158 @@
+<?php
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
+ * Copyright (C) 2012      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file			htdocs/core/modules/knowledgemanagement/modules_knowledgerecord.php
+ *  \ingroup		knowledgemanagement
+ *  \brief			File that contains parent class for knowledgerecords document models and parent class for knowledgerecords numbering models
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // required for use by classes that inherit
+
+
+/**
+ *	Parent class for documents models
+ */
+abstract class ModelePDFKnowledgeRecord extends CommonDocGenerator
+{
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
+
+		$type = 'knowledgerecord';
+		$list = array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+
+		return $list;
+	}
+}
+
+
+
+/**
+ *  Parent class to manage numbering of KnowledgeRecord
+ */
+abstract class ModeleNumRefKnowledgeRecord
+{
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 *	Return if a module can be used or not
+	 *
+	 *	@return		boolean     true if module can be used
+	 */
+	public function isEnabled()
+	{
+		return true;
+	}
+
+	/**
+	 *	Returns the default description of the numbering template
+	 *
+	 *	@return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $langs;
+		$langs->load("knowledgemanagement@knowledgemanagement");
+		return $langs->trans("NoDescription");
+	}
+
+	/**
+	 *	Returns an example of numbering
+	 *
+	 *	@return     string      Example
+	 */
+	public function getExample()
+	{
+		global $langs;
+		$langs->load("knowledgemanagement@knowledgemanagement");
+		return $langs->trans("NoExample");
+	}
+
+	/**
+	 *  Checks if the numbers already in the database do not
+	 *  cause conflicts that would prevent this numbering working.
+	 *
+	 *	@param	Object		$object		Object we need next value for
+	 *	@return boolean     			false if conflict, true if ok
+	 */
+	public function canBeActivated($object)
+	{
+		return true;
+	}
+
+	/**
+	 *	Returns next assigned value
+	 *
+	 *	@param	Object		$object		Object we need next value for
+	 *	@return	string      Valeur
+	 */
+	public function getNextValue($object)
+	{
+		global $langs;
+		return $langs->trans("NotAvailable");
+	}
+
+	/**
+	 *	Returns version of numbering module
+	 *
+	 *	@return     string      Valeur
+	 */
+	public function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
+		return $langs->trans("NotAvailable");
+	}
+}
diff --git a/htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php b/htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php
new file mode 100644
index 00000000000..1ae65764b6a
--- /dev/null
+++ b/htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php
@@ -0,0 +1,547 @@
+<?php
+/* Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2021 SuperAdmin
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\defgroup   knowledgemanagement     Module KnowledgeManagement
+ *  \brief      KnowledgeManagement module descriptor.
+ *
+ *  \file       htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php
+ *  \ingroup    knowledgemanagement
+ *  \brief      Description and activation file for module KnowledgeManagement
+ */
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+
+/**
+ *  Description and activation class for module KnowledgeManagement
+ */
+class modKnowledgeManagement extends DolibarrModules
+{
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
+		$this->db = $db;
+
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 500000; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
+
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'knowledgemanagement';
+
+		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+		// It is used to group modules by family in module setup page
+		$this->family = "crm";
+
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '90';
+
+		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+		// Module label (no space allowed), used if translation string 'ModuleKnowledgeManagementName' not found (KnowledgeManagement is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+
+		// Module description, used if translation string 'ModuleKnowledgeManagementDesc' not found (KnowledgeManagement is name of module).
+		$this->description = "Knowledge Management Description";
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "Knowledge Management Description";
+
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'development';
+		// Url to the file with your last numberversion of this module
+		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
+
+		// Key used in llx_const table to save module status enabled/disabled (where KNOWLEDGEMANAGEMENT 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'
+		// To use a supported fa-xxx css style of font awesome, use this->picto='xxx'
+		$this->picto = 'knowledgemanagement@knowledgemanagement';
+
+		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 0,
+			// Set this to 1 if module has its own login method file (core/login)
+			'login' => 0,
+			// Set this to 1 if module has its own substitution function file (core/substitutions)
+			'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory (core/menus)
+			'menus' => 0,
+			// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,
+			// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'barcode' => 0,
+			// Set this to 1 if module has its own models directory (core/modules/xxx)
+			'models' => 1,
+			// Set this to 1 if module has its own printing directory (core/modules/printing)
+			'printing' => 0,
+			// Set this to 1 if module has its own theme directory (theme)
+			'theme' => 0,
+			// Set this to relative path of css file if module has its own css file
+			'css' => array(
+				//    '/knowledgemanagement/css/knowledgemanagement.css.php',
+			),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(
+				//   '/knowledgemanagement/js/knowledgemanagement.js.php',
+			),
+			// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context to 'all'
+			'hooks' => array(
+				//   'data' => array(
+				//       'hookcontext1',
+				//       'hookcontext2',
+				//   ),
+				//   'entity' => '0',
+			),
+			// Set this to 1 if features of module are opened to external users
+			'moduleforexternal' => 0,
+		);
+
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/knowledgemanagement/temp","/knowledgemanagement/subdir");
+		$this->dirs = array("/knowledgemanagement/temp");
+
+		// Config pages. Put here list of php page, stored into knowledgemanagement/admin directory, to use to setup module.
+		$this->config_page_url = array("setup.php@knowledgemanagement");
+
+		// Dependencies
+		// A condition to hide module
+		$this->hidden = false;
+		// List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
+		$this->depends = array();
+		$this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+
+		// The language file dedicated to your module
+		$this->langfiles = array("knowledgemanagement@knowledgemanagement");
+
+		// Prerequisites
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(11, -3); // Minimum version of Dolibarr required by module
+
+		// Messages at activation
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		//$this->automatic_activation = array('FR'=>'KnowledgeManagementWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+		//$this->always_enabled = true;								// If true, can't be disabled
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(1 => array('KNOWLEDGEMANAGEMENT_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//                             2 => array('KNOWLEDGEMANAGEMENT_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array();
+
+		// Some keys to add into the overwriting translation tables
+		/*$this->overwrite_translation = array(
+			'en_US:ParentCompany'=>'Parent company or reseller',
+			'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
+		)*/
+
+		if (!isset($conf->knowledgemanagement) || !isset($conf->knowledgemanagement->enabled)) {
+			$conf->knowledgemanagement = new stdClass();
+			$conf->knowledgemanagement->enabled = 0;
+		}
+
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@knowledgemanagement:$user->rights->knowledgemanagement->read:/knowledgemanagement/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@knowledgemanagement:$user->rights->othermodule->read:/knowledgemanagement/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+
+		// Dictionaries
+		$this->dictionaries = array();
+		/* Example:
+		$this->dictionaries=array(
+			'langs'=>'knowledgemanagement@knowledgemanagement',
+			// List of tables we want to see into dictonnary editor
+			'tabname'=>array(MAIN_DB_PREFIX."table1", MAIN_DB_PREFIX."table2", MAIN_DB_PREFIX."table3"),
+			// Label of tables
+			'tablib'=>array("Table1", "Table2", "Table3"),
+			// Request to select fields
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
+			// Sort order
+			'tabsqlsort'=>array("label ASC", "label ASC", "label ASC"),
+			// List of fields (result of select to show dictionary)
+			'tabfield'=>array("code,label", "code,label", "code,label"),
+			// List of fields (list of fields to edit a record)
+			'tabfieldvalue'=>array("code,label", "code,label", "code,label"),
+			// List of fields (list of fields for insert)
+			'tabfieldinsert'=>array("code,label", "code,label", "code,label"),
+			// Name of columns with primary key (try to always name it 'rowid')
+			'tabrowid'=>array("rowid", "rowid", "rowid"),
+			// Condition to show each dictionary
+			'tabcond'=>array($conf->knowledgemanagement->enabled, $conf->knowledgemanagement->enabled, $conf->knowledgemanagement->enabled)
+		);
+		*/
+
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in knowledgemanagement/core/boxes that contains a class to show a widget.
+		$this->boxes = array(
+			//  0 => array(
+			//      'file' => 'knowledgemanagementwidget1.php@knowledgemanagement',
+			//      'note' => 'Widget provided by KnowledgeManagement',
+			//      'enabledbydefaulton' => 'Home',
+			//  ),
+			//  ...
+		);
+
+		// Cronjobs (List of cron jobs entries to add when module is enabled)
+		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+		$this->cronjobs = array(
+			//  0 => array(
+			//      'label' => 'MyJob label',
+			//      'jobtype' => 'method',
+			//      'class' => '/knowledgemanagement/class/knowledgerecord.class.php',
+			//      'objectname' => 'KnowledgeRecord',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->knowledgemanagement->enabled',
+			//      'priority' => 50,
+			//  ),
+		);
+		// Example: $this->cronjobs=array(
+		//    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->knowledgemanagement->enabled', 'priority'=>50),
+		//    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->knowledgemanagement->enabled', 'priority'=>50)
+		// );
+
+		// Permissions provided by this module
+		$this->rights = array();
+		$r = 0;
+		// Add here entries to declare new permissions
+		/* BEGIN MODULEBUILDER PERMISSIONS */
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read objects of Knowledge Management'; // Permission label
+		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
+		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->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 Knowledge Management'; // Permission label
+		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
+		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete objects of Knowledge Management'; // Permission label
+		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
+		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Reply to objects of Knowledge Management'; // Permission label
+		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
+		$this->rights[$r][5] = 'reply'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
+		$r++;
+		/* END MODULEBUILDER PERMISSIONS */
+
+		// Main menu entries to add
+		$this->menu = array();
+		$r = 0;
+		// Add here entries to declare new menus
+		/* BEGIN MODULEBUILDER TOPMENU */
+		$this->menu[$r++] = array(
+			'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'top', // This is a Top menu entry
+			'titre'=>'ModuleKnowledgeManagementName',
+			'prefix' => img_picto('', 'knowledgemanagement@knowledgemanagement', 'class="paddingright pictofixedwidth"'),
+			'mainmenu'=>'knowledgemanagement',
+			'leftmenu'=>'',
+			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
+			'langs'=>'knowledgemanagement@knowledgemanagement', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000 + $r,
+			'enabled'=>'$conf->knowledgemanagement->enabled', // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled.
+			'perms'=>'1', // Use 'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->read' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);
+		/* END MODULEBUILDER TOPMENU */
+		/* BEGIN MODULEBUILDER LEFTMENU KNOWLEDGERECORD
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=knowledgemanagement',      // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',                          // This is a Top menu entry
+			'titre'=>'KnowledgeRecord',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
+			'mainmenu'=>'knowledgemanagement',
+			'leftmenu'=>'knowledgerecord',
+			'url'=>'/knowledgemanagement/knowledgemanagementindex.php',
+			'langs'=>'knowledgemanagement@knowledgemanagement',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->knowledgemanagement->enabled',  // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->read',			                // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgerecord',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'List_KnowledgeRecord',
+			'mainmenu'=>'knowledgemanagement',
+			'leftmenu'=>'knowledgemanagement_knowledgerecord_list',
+			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
+			'langs'=>'knowledgemanagement@knowledgemanagement',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->knowledgemanagement->enabled',  // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->read',			                // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgerecord',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'New_KnowledgeRecord',
+			'mainmenu'=>'knowledgemanagement',
+			'leftmenu'=>'knowledgemanagement_knowledgerecord_new',
+			'url'=>'/knowledgemanagement/knowledgerecord_card.php?action=create',
+			'langs'=>'knowledgemanagement@knowledgemanagement',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->knowledgemanagement->enabled',  // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->write',			                // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		*/
+
+		$this->menu[$r++]=array(
+            // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'fk_menu'=>'fk_mainmenu=knowledgemanagement',
+            // This is a Left menu entry
+            'type'=>'left',
+            'titre'=>'MenuKnowledgeRecord',
+            'mainmenu'=>'knowledgemanagement',
+            'leftmenu'=>'knowledgemanagement_knowledgerecord',
+            'url'=>'/knowledgemanagement/knowledgerecord_list.php',
+            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs'=>'knowledgemanagement@knowledgemanagement',
+            'position'=>101,
+            // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'enabled'=>'$conf->knowledgemanagement->enabled',
+            // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
+            'perms'=>'1',
+            'target'=>'',
+            // 0=Menu for internal users, 1=external users, 2=both
+            'user'=>2,
+        );
+        $this->menu[$r++]=array(
+            // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgemanagement_knowledgerecord',
+            // This is a Left menu entry
+            'type'=>'left',
+            'titre'=>'ListKnowledgeRecord',
+            'mainmenu'=>'knowledgemanagement',
+            'leftmenu'=>'knowledgemanagement_list',
+            'url'=>'/knowledgemanagement/knowledgerecord_list.php',
+            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs'=>'knowledgemanagement@knowledgemanagement',
+            'position'=>111,
+            // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'enabled'=>'$conf->knowledgemanagement->enabled',
+            // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
+            'perms'=>'1',
+            'target'=>'',
+            // 0=Menu for internal users, 1=external users, 2=both
+            'user'=>2,
+        );
+        $this->menu[$r++]=array(
+            // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgemanagement_knowledgerecord',
+            // This is a Left menu entry
+            'type'=>'left',
+            'titre'=>'NewKnowledgeRecord',
+            'mainmenu'=>'knowledgemanagement',
+            'leftmenu'=>'knowledgemanagement_new',
+            'url'=>'/knowledgemanagement/knowledgerecord_card.php?action=create',
+            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs'=>'knowledgemanagement@knowledgemanagement',
+            'position'=>110,
+            // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'enabled'=>'$conf->knowledgemanagement->enabled',
+            // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
+            'perms'=>'1',
+            'target'=>'',
+            // 0=Menu for internal users, 1=external users, 2=both
+            'user'=>2
+        );
+
+		/* END MODULEBUILDER LEFTMENU KNOWLEDGERECORD */
+		// Exports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER EXPORT KNOWLEDGERECORD */
+		/*
+		$langs->load("knowledgemanagement@knowledgemanagement");
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='KnowledgeRecordLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r]='knowledgerecord@knowledgemanagement';
+		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
+		$keyforclass = 'KnowledgeRecord'; $keyforclassfile='/knowledgemanagement/class/knowledgerecord.class.php'; $keyforelement='knowledgerecord@knowledgemanagement';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
+		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
+		//$keyforclass = 'KnowledgeRecordLine'; $keyforclassfile='/knowledgemanagement/class/knowledgerecord.class.php'; $keyforelement='knowledgerecordline@knowledgemanagement'; $keyforalias='tl';
+		//include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		$keyforselect='knowledgerecord'; $keyforaliasextra='extra'; $keyforelement='knowledgerecord@knowledgemanagement';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		//$keyforselect='knowledgerecordline'; $keyforaliasextra='extraline'; $keyforelement='knowledgerecordline@knowledgemanagement';
+		//include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		//$this->export_dependencies_array[$r] = array('knowledgerecordline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+		//$this->export_special_array[$r] = array('t.field'=>'...');
+		//$this->export_examplevalues_array[$r] = array('t.field'=>'Example');
+		//$this->export_help_array[$r] = array('t.field'=>'FieldDescHelp');
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'knowledgerecord as t';
+		//$this->export_sql_end[$r]  =' LEFT JOIN '.MAIN_DB_PREFIX.'knowledgerecord_line as tl ON tl.fk_knowledgerecord = t.rowid';
+		$this->export_sql_end[$r] .=' WHERE 1 = 1';
+		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('knowledgerecord').')';
+		$r++; */
+		/* END MODULEBUILDER EXPORT KNOWLEDGERECORD */
+
+		// Imports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER IMPORT KNOWLEDGERECORD */
+		/*
+		 $langs->load("knowledgemanagement@knowledgemanagement");
+		 $this->export_code[$r]=$this->rights_class.'_'.$r;
+		 $this->export_label[$r]='KnowledgeRecordLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		 $this->export_icon[$r]='knowledgerecord@knowledgemanagement';
+		 $keyforclass = 'KnowledgeRecord'; $keyforclassfile='/knowledgemanagement/class/knowledgerecord.class.php'; $keyforelement='knowledgerecord@knowledgemanagement';
+		 include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		 $keyforselect='knowledgerecord'; $keyforaliasextra='extra'; $keyforelement='knowledgerecord@knowledgemanagement';
+		 include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		 //$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+		 $this->export_sql_start[$r]='SELECT DISTINCT ';
+		 $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'knowledgerecord as t';
+		 $this->export_sql_end[$r] .=' WHERE 1 = 1';
+		 $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('knowledgerecord').')';
+		 $r++; */
+		/* END MODULEBUILDER IMPORT KNOWLEDGERECORD */
+	}
+
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
+
+		$result = $this->_load_tables('/knowledgemanagement/sql/');
+		if ($result < 0) {
+			return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		}
+
+		// Create extrafields during init
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
+		//$result1=$extrafields->addExtraField('knowledgemanagement_myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'knowledgemanagement@knowledgemanagement', '$conf->knowledgemanagement->enabled');
+		//$result2=$extrafields->addExtraField('knowledgemanagement_myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'knowledgemanagement@knowledgemanagement', '$conf->knowledgemanagement->enabled');
+		//$result3=$extrafields->addExtraField('knowledgemanagement_myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'knowledgemanagement@knowledgemanagement', '$conf->knowledgemanagement->enabled');
+		//$result4=$extrafields->addExtraField('knowledgemanagement_myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'knowledgemanagement@knowledgemanagement', '$conf->knowledgemanagement->enabled');
+		//$result5=$extrafields->addExtraField('knowledgemanagement_myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'knowledgemanagement@knowledgemanagement', '$conf->knowledgemanagement->enabled');
+
+		// Permissions
+		$this->remove($options);
+
+		$sql = array();
+
+		// Document templates
+		$moduledir = 'knowledgemanagement';
+		$myTmpObjects = array();
+		$myTmpObjects['KnowledgeRecord'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+
+		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
+			if ($myTmpObjectKey == 'KnowledgeRecord') {
+				continue;
+			}
+			if ($myTmpObjectArray['includerefgeneration']) {
+				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/knowledgemanagement/template_knowledgerecords.odt';
+				$dirodt = DOL_DATA_ROOT.'/doctemplates/knowledgemanagement';
+				$dest = $dirodt.'/template_knowledgerecords.odt';
+
+				if (file_exists($src) && !file_exists($dest)) {
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+					dol_mkdir($dirodt);
+					$result = dol_copy($src, $dest, 0, 0);
+					if ($result < 0) {
+						$langs->load("errors");
+						$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+						return 0;
+					}
+				}
+
+				$sql = array_merge($sql, array(
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".strtolower($myTmpObjectKey)."',".$conf->entity.")",
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".strtolower($myTmpObjectKey)."', ".$conf->entity.")"
+				));
+			}
+		}
+
+		return $this->_init($sql, $options);
+	}
+
+	/**
+	 *  Function called when module is disabled.
+	 *  Remove from database constants, boxes and permissions from Dolibarr database.
+	 *  Data directories are not deleted
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+		return $this->_remove($sql, $options);
+	}
+}
diff --git a/htdocs/knowledgemanagement/img/object_knowledgemanagement.png b/htdocs/knowledgemanagement/img/object_knowledgemanagement.png
new file mode 100644
index 0000000000000000000000000000000000000000..b421fe3c9e046e26f6f64e996d0ac6f914fb40ed
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0y_MV>B>Ar*{EFEO$)If}G@TqVsS
z;K?HKQqEDJWWfRk&j}*Ij$9LWIdjZaEt_fgC(v|WZuyVE{Cnveqq!8H1nE3^Q+P=1
z>J6pzHFFOi7dG`V>~V=z*^%*0c-;qwr`mTC(p&lbdG0-v^)cLdNGff|;x#+nmA!Ac
zG}*~K+qK>KZ`=d6{%iJ$(wftDofmsm&tGc%WKH2wLA_6M?iSg{#s5F~RKfV2apH@l
TuYZ$(u4V9a^>bP0l+XkK_svvh

literal 0
HcmV?d00001

diff --git a/htdocs/knowledgemanagement/img/object_knowledgemanagement_over.png b/htdocs/knowledgemanagement/img/object_knowledgemanagement_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..7831c3025d7cf644f7299b25ad0c4605c1f0227e
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0y_>7Fi*Ar*{!FEO$)IWn|948N<;
z;GuND<2y&w0%lfLkESIvxPl}u-BWBiC$!tgo+;TkSkUgk`-79e|I@Z_XSaA0(Cp>&
zpnykQmaAuh1HYwSK;({NvR4)EB*}C0%1Jos$DT3hZ7n@h=*-&WYOI>0c$|TaTSHZ3
z+Kxku{(9bUY!sa$$5d-_uT?t5;-EvL;kgqD3;)-D<urO&BsRI*{wdIj44$rjF6*2U
FngFB9M(zLr

literal 0
HcmV?d00001

diff --git a/htdocs/knowledgemanagement/img/object_knowledgerecord.png b/htdocs/knowledgemanagement/img/object_knowledgerecord.png
new file mode 100644
index 0000000000000000000000000000000000000000..b421fe3c9e046e26f6f64e996d0ac6f914fb40ed
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0y_MV>B>Ar*{EFEO$)If}G@TqVsS
z;K?HKQqEDJWWfRk&j}*Ij$9LWIdjZaEt_fgC(v|WZuyVE{Cnveqq!8H1nE3^Q+P=1
z>J6pzHFFOi7dG`V>~V=z*^%*0c-;qwr`mTC(p&lbdG0-v^)cLdNGff|;x#+nmA!Ac
zG}*~K+qK>KZ`=d6{%iJ$(wftDofmsm&tGc%WKH2wLA_6M?iSg{#s5F~RKfV2apH@l
TuYZ$(u4V9a^>bP0l+XkK_svvh

literal 0
HcmV?d00001

diff --git a/htdocs/knowledgemanagement/knowledgemanagementindex.php b/htdocs/knowledgemanagement/knowledgemanagementindex.php
new file mode 100644
index 00000000000..19075875ce1
--- /dev/null
+++ b/htdocs/knowledgemanagement/knowledgemanagementindex.php
@@ -0,0 +1,241 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       knowledgemanagement/knowledgemanagementindex.php
+ *	\ingroup    knowledgemanagement
+ *	\brief      Home page of knowledgemanagement top menu
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("knowledgemanagement@knowledgemanagement"));
+
+$action = GETPOST('action', 'aZ09');
+
+
+// Security check
+// if (! $user->rights->knowledgemanagement->myobject->read) {
+// 	accessforbidden();
+// }
+$socid = GETPOST('socid', 'int');
+if (isset($user->socid) && $user->socid > 0) {
+	$action = '';
+	$socid = $user->socid;
+}
+
+$max = 5;
+$now = dol_now();
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+llxHeader("", $langs->trans("KnowledgeManagementArea"));
+
+print load_fiche_titre($langs->trans("KnowledgeManagementArea"), '', 'knowledgemanagement.png@knowledgemanagement');
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+
+/* BEGIN MODULEBUILDER DRAFT MYOBJECT
+// Draft MyObject
+if (! empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemanagement->read)
+{
+	$langs->load("orders");
+
+	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
+	$sql.= ", s.code_client";
+	$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.fk_statut = 0";
+	$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;
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$total = 0;
+		$num = $db->num_rows($resql);
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="3">'.$langs->trans("DraftMyObjects").($num?'<span class="badge marginleftonlyshort">'.$num.'</span>':'').'</th></tr>';
+
+		$var = true;
+		if ($num > 0)
+		{
+			$i = 0;
+			while ($i < $num)
+			{
+
+				$obj = $db->fetch_object($resql);
+				print '<tr class="oddeven"><td class="nowrap">';
+
+				$myobjectstatic->id=$obj->rowid;
+				$myobjectstatic->ref=$obj->ref;
+				$myobjectstatic->ref_client=$obj->ref_client;
+				$myobjectstatic->total_ht = $obj->total_ht;
+				$myobjectstatic->total_tva = $obj->total_tva;
+				$myobjectstatic->total_ttc = $obj->total_ttc;
+
+				print $myobjectstatic->getNomUrl(1);
+				print '</td>';
+				print '<td class="nowrap">';
+				print '</td>';
+				print '<td class="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
+				$i++;
+				$total += $obj->total_ttc;
+			}
+			if ($total>0)
+			{
+
+				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
+			}
+		}
+		else
+		{
+
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
+		}
+		print "</table><br>";
+
+		$db->free($resql);
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+END MODULEBUILDER DRAFT MYOBJECT */
+
+
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+
+$NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+
+/* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
+// Last modified myobject
+if (! empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemanagement->read)
+{
+	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
+	$sql.= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_myobject as s";
+	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE s.entity IN (".getEntity($myobjectstatic->element).")";
+	//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";
+	$sql .= $db->plimit($max, 0);
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="2">';
+		print $langs->trans("BoxTitleLatestModifiedMyObjects", $max);
+		print '</th>';
+		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
+		print '</tr>';
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($resql);
+
+				$myobjectstatic->id=$objp->rowid;
+				$myobjectstatic->ref=$objp->ref;
+				$myobjectstatic->label=$objp->label;
+				$myobjectstatic->status = $objp->status;
+
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$myobjectstatic->getNomUrl(1).'</td>';
+				print '<td class="right nowrap">';
+				print "</td>";
+				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
+				print '</tr>';
+				$i++;
+			}
+
+			$db->free($resql);
+		} else {
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		print "</table><br>";
+	}
+}
+*/
+
+print '</div></div></div>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
new file mode 100644
index 00000000000..df11a30c026
--- /dev/null
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -0,0 +1,303 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       knowledgerecord_agenda.php
+ *  \ingroup    knowledgemanagement
+ *  \brief      Tab of events on KnowledgeRecord
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
+dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+} else {
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
+
+// Initialize technical objects
+$object = new KnowledgeRecord($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('knowledgerecordagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->knowledgemanagement->multidir_output[$object->entity]."/".$object->id;
+}
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'knowledgemanagement', $object->id);
+
+$permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+/*
+ *  Actions
+ */
+
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
+}
+
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0) {
+	$title = $langs->trans("Agenda");
+	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	$help_url = '';
+	llxHeader('', $title, $help_url);
+
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
+	$head = knowledgerecordPrepareHead($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("KnowledgeRecord"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/knowledgemanagement/knowledgerecord_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	// Ref customer
+	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	// Project
+	if (! empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		if ($permissiontoadd) {
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			}
+			$morehtmlref.=' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref.='<input type="hidden" name="action" value="classin">';
+				$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref.='</form>';
+			} else {
+				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (! empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+	$object->info($object->id);
+	dol_print_object_info($object, 1);
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+
+
+	// Actions buttons
+
+	$objthirdparty = $object;
+	$objcon = new stdClass();
+
+	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
+	$out .= '&backtopage='.urlencode($urlbacktopage);
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') {
+			$out .= '&socid='.urlencode($objthirdparty->id);
+		}
+		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '').'&percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
+	}
+
+
+	print '<div class="tabsAction">';
+
+	if (!empty($conf->agenda->enabled)) {
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+		}
+	}
+
+	print '</div>';
+
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		$param = '&id='.$object->id.'&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+			$param .= '&contextpage='.urlencode($contextpage);
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit='.urlencode($limit);
+		}
+
+
+		//print load_fiche_titre($langs->trans("ActionsOnKnowledgeRecord"), '', '');
+
+		// List of all actions
+		$filters = array();
+		$filters['search_agenda_label'] = $search_agenda_label;
+
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
new file mode 100644
index 00000000000..3ffcfa04020
--- /dev/null
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -0,0 +1,564 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       knowledgerecord_card.php
+ *		\ingroup    knowledgemanagement
+ *		\brief      Page to create/edit/view knowledgerecord
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
+dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'knowledgerecordcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+//$lineid   = GETPOST('lineid', 'int');
+
+// Initialize technical objects
+$object = new KnowledgeRecord($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('knowledgerecordcard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+}
+
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+
+$permissiontoread = $user->rights->knowledgemanagement->knowledgerecord->read;
+$permissiontoreply = $user->rights->knowledgemanagement->knowledgerecord->reply;
+$permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->knowledgemanagement->knowledgerecord->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->knowledgemanagement->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+//restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+//if (empty($conf->knowledgemanagement->enabled)) accessforbidden();
+//if (empty($permissiontoread)) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	$error = 0;
+
+	$backurlforlist = dol_buildpath('/knowledgemanagement/knowledgerecord_list.php', 1);
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = dol_buildpath('/knowledgemanagement/knowledgerecord_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+			}
+		}
+	}
+
+	$triggermodname = 'KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
+
+	// Action to build doc
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	if ($action == 'set_thirdparty' && $permissiontoadd) {
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+	}
+	if ($action == 'classin' && $permissiontoadd) {
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
+
+	// Actions to send emails
+	$triggersendname = 'KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_KNOWLEDGERECORD_TO';
+	$trackid = 'knowledgerecord'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+}
+if ($action == 'confirm_validate') {
+	$action = 'edit';
+}
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
+
+$title = $langs->trans("KnowledgeRecord");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+// Part to create
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("KnowledgeRecord")), '', 'object_'.$object->picto);
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
+
+	print dol_get_fiche_head(array(), '');
+
+	// Set some default values
+	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
+
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>'."\n";
+
+	print dol_get_fiche_end();
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
+	print '&nbsp; ';
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '</div>';
+
+	print '</form>';
+
+	//dol_set_focus('input[name="ref"]');
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit') {
+	print load_fiche_titre($langs->trans("KnowledgeRecord"), '', 'object_'.$object->picto);
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
+
+	print dol_get_fiche_head();
+
+	print '<table class="border centpercent tableforfieldedit">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
+
+	print '</table>';
+
+	print dol_get_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$res = $object->fetch_optionals();
+
+	$head = knowledgerecordPrepareHead($object);
+	print dol_get_fiche_head($head, 'card', $langs->trans("KnowledgeRecord"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteKnowledgeRecord'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	}
+	// Confirmation to delete line
+	if ($action == 'deleteline') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+	}
+	// Clone confirmation
+	if ($action == 'clone') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+	}
+
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
+
+	// Print form confirm
+	print $formconfirm;
+
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/knowledgemanagement/knowledgerecord_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled)) {
+	 $langs->load("projects");
+	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd) {
+	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+	 $morehtmlref .= ' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+	 $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref .= '</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">'."\n";
+
+	// Common attributes
+	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
+	//unset($object->fields['fk_project']);				// Hide field already shown in banner
+	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+
+	/*
+	 * Lines
+	 */
+
+	if (!empty($object->table_element_line)) {
+		// Show object lines
+		$result = $object->getLinesArray();
+
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		<input type="hidden" name="token" value="' . newToken().'">
+		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="' . $object->id.'">
+		';
+
+		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+		}
+
+		print '<div class="div-table-responsive-no-min">';
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		}
+
+		if (!empty($object->lines)) {
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+		}
+
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+			if ($action != 'editline') {
+				// Add products/services form
+				$object->formAddObjectLine(1, $mysoc, $soc);
+
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			}
+		}
+
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+			print '</table>';
+		}
+		print '</div>';
+
+		print "</form>\n";
+	}
+
+
+	// Buttons for actions
+
+	if ($action != 'presend' && $action != 'editline') {
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
+		if (empty($reshook)) {
+			// Send
+			if (empty($user->socid)) {
+				//print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle');
+			}
+
+			// Back to draft
+			if ($object->status == $object::STATUS_VALIDATED) {
+				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes', '', $permissiontoadd);
+			}
+			if ($object->status == $object::STATUS_VALIDATED && $permissiontoreply) {
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit', '', $permissiontoadd);
+			}
+			// Validate
+			if ($object->status == $object::STATUS_DRAFT) {
+				if ((empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) && $permissiontoreply) {
+					print dolGetButtonAction($langs->trans('Reply'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
+				} else {
+					$langs->load("errors");
+					//print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', 0);
+					print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Reply").'</a>';
+				}
+			}
+
+			// Clone
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
+
+			/*
+			if ($permissiontoadd) {
+				if ($object->status == $object::STATUS_ENABLED) {
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
+				} else {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
+				}
+			}
+			if ($permissiontoadd) {
+				if ($object->status == $object::STATUS_VALIDATED) {
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
+				} else {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Re-Open").'</a>'."\n";
+				}
+			}
+			*/
+
+			// Delete (need delete permission, or if draft, just need create/modify permission)
+			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+		}
+		print '</div>'."\n";
+	}
+
+
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	if ($action != 'presend') {
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
+
+		$includedocgeneration = 0;
+
+		// Documents
+		if ($includedocgeneration) {
+			$objref = dol_sanitizeFileName($object->ref);
+			$relativepath = $objref.'/'.$objref.'.pdf';
+			$filedir = $conf->knowledgemanagement->dir_output.'/'.$object->element.'/'.$objref;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$genallowed = $user->rights->knowledgemanagement->knowledgerecord->read; // If you can read, you can build the PDF to read content
+			$delallowed = $user->rights->knowledgemanagement->knowledgerecord->write; // If you can create/edit, you can remove a file on card
+			print $formfile->showdocuments('knowledgemanagement:KnowledgeRecord', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		}
+
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('knowledgerecord'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+		$MAXEVENT = 10;
+
+		$morehtmlright = '<a href="'.dol_buildpath('/knowledgemanagement/knowledgerecord_agenda.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
+
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+
+		print '</div></div></div>';
+	}
+
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	// Presend form
+	$modelmail = 'knowledgerecord';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->knowledgemanagement->dir_output;
+	$trackid = 'knowledgerecord'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/knowledgemanagement/knowledgerecord_contact.php b/htdocs/knowledgemanagement/knowledgerecord_contact.php
new file mode 100644
index 00000000000..1a52c79c995
--- /dev/null
+++ b/htdocs/knowledgemanagement/knowledgerecord_contact.php
@@ -0,0 +1,213 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       knowledgerecord_contact.php
+ *  \ingroup    knowledgemanagement
+ *  \brief      Tab for contacts linked to KnowledgeRecord
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
+dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "companies", "other", "mails"));
+
+$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref    = GETPOST('ref', 'alpha');
+$lineid = GETPOST('lineid', 'int');
+$socid  = GETPOST('socid', 'int');
+$action = GETPOST('action', 'aZ09');
+
+// Initialize technical objects
+$object = new KnowledgeRecord($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('knowledgerecordcontact', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'knowledgemanagement', $object->id);
+
+$permission = $user->rights->knowledgemanagement->knowledgerecord->write;
+
+/*
+ * Add a new contact
+ */
+
+if ($action == 'addcontact' && $permission) {
+	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+
+	if ($result >= 0) {
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	} else {
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+} elseif ($action == 'swapstatut' && $permission) {
+	// Toggle the status of a contact
+	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+} elseif ($action == 'deletecontact' && $permission) {
+	// Deletes a contact
+	$result = $object->delete_contact($lineid);
+
+	if ($result >= 0) {
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
+}
+
+
+/*
+ * View
+ */
+
+$title = $langs->trans('KnowledgeRecord')." - ".$langs->trans('ContactsAddresses');
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
+
+
+/* *************************************************************************** */
+/*                                                                             */
+/* View and edit mode                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+
+if ($object->id) {
+	/*
+	 * Show tabs
+	 */
+	$head = knowledgerecordPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'contact', $langs->trans("KnowledgeRecord"), -1, $object->picto);
+
+	$linkback = '<a href="'.dol_buildpath('/knowledgemanagement/knowledgerecord_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+
+	print dol_get_fiche_end();
+
+	print '<br>';
+
+	// Contacts lines (modules that overwrite templates must declare this into descriptor)
+	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+	foreach ($dirtpls as $reldir) {
+		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+		if ($res) {
+			break;
+		}
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
new file mode 100644
index 00000000000..e54e8ecb3b9
--- /dev/null
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -0,0 +1,250 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       knowledgerecord_document.php
+ *  \ingroup    knowledgemanagement
+ *  \brief      Tab for documents linked to KnowledgeRecord
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
+dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "companies", "other", "mails"));
+
+
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$ref = GETPOST('ref', 'alpha');
+
+// Get parameters
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
+//if (! $sortfield) $sortfield="position_name";
+
+// Initialize technical objects
+$object = new KnowledgeRecord($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('knowledgerecorddocument', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->knowledgemanagement->multidir_output[$object->entity ? $object->entity : $conf->entity]."/knowledgerecord/".get_exdir(0, 0, 0, 1, $object);
+}
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'knowledgemanagement', $object->id);
+
+$permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("KnowledgeRecord").' - '.$langs->trans("Files");
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
+if ($object->id) {
+	/*
+	 * Show tabs
+	 */
+	$head = knowledgerecordPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'document', $langs->trans("KnowledgeRecord"), -1, $object->picto);
+
+
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file) {
+		$totalsize += $file['size'];
+	}
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/knowledgemanagement/knowledgerecord_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
+
+	// Number of files
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+
+	// Total size
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
+	print '</table>';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+	$modulepart = 'knowledgemanagement';
+	//$permission = $user->rights->knowledgemanagement->knowledgerecord->write;
+	$permission = 1;
+	//$permtoedit = $user->rights->knowledgemanagement->knowledgerecord->write;
+	$permtoedit = 1;
+	$param = '&id='.$object->id;
+
+	//$relativepathwithnofile='knowledgerecord/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile = 'knowledgerecord/'.dol_sanitizeFileName($object->ref).'/';
+
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+} else {
+	accessforbidden('', 0, 1);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
new file mode 100644
index 00000000000..372a1ae1be3
--- /dev/null
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -0,0 +1,713 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       knowledgerecord_list.php
+ *		\ingroup    knowledgemanagement
+ *		\brief      List page for knowledgerecord
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+// load knowledgemanagement libraries
+require_once __DIR__.'/class/knowledgerecord.class.php';
+
+// for other modules
+//dol_include_once('/othermodule/class/otherobject.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "other"));
+
+$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'knowledgerecordlist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+$id = GETPOST('id', 'int');
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+// Initialize technical objects
+$object = new KnowledgeRecord($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('knowledgerecordlist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) {
+	reset($object->fields);					// Reset is required to avoid key() to return null.
+	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+
+// Initialize array of search criterias
+$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+	}
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+	if ($val['searchall']) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
+}
+
+// Definition of array of fields for columns
+$arrayfields = array();
+foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=>$val['help']
+		);
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+$permissiontoread = $user->rights->knowledgemanagement->knowledgerecord->read;
+$permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write;
+$permissiontodelete = $user->rights->knowledgemanagement->knowledgerecord->delete;
+
+// Security check
+if (empty($conf->knowledgemanagement->enabled)) {
+	accessforbidden('Module not enabled');
+}
+$socid = 0;
+if ($user->socid > 0) { // Protection if external user
+	//$socid = $user->socid;
+	accessforbidden();
+}
+//$result = restrictedArea($user, 'knowledgemanagement');
+//if (!$permissiontoread) accessforbidden();
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
+			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
+		}
+		$toselect = '';
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	$objectclass = 'KnowledgeRecord';
+	$objectlabel = 'KnowledgeRecord';
+	$uploaddir = $conf->knowledgemanagement->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$now = dol_now();
+
+//$help_url="EN:Module_KnowledgeRecord|FR:Module_KnowledgeRecord_FR|ES:Módulo_KnowledgeRecord";
+$help_url = '';
+$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("KnowledgeRecords"));
+$morejs = array();
+$morecss = array();
+
+
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = 'SELECT ';
+$sql .= $object->getFieldList('t');
+// Add fields from extrafields
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+	}
+}
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+if ($object->ismultientitymanaged == 1) {
+	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+} else {
+	$sql .= " WHERE 1 = 1";
+}
+foreach ($search as $key => $val) {
+	if (array_key_exists($key, $object->fields)) {
+		if ($key == 'status' && $search[$key] == -1) {
+			continue;
+		}
+		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0)) {
+			if ($search[$key] == '-1' || $search[$key] === '0') {
+				$search[$key] = '';
+			}
+			$mode_search = 2;
+		}
+		if ($search[$key] != '') {
+			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		}
+	} else {
+		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+				if (preg_match('/_dtstart$/', $key)) {
+					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				}
+			}
+		}
+	}
+}
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
+//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+/* If a group by is required
+$sql.= " GROUP BY ";
+foreach($object->fields as $key => $val) {
+	$sql.='t.'.$key.', ';
+}
+// Add fields from extrafields
+if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+}
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql=preg_replace('/,\s*$/','', $sql);
+*/
+
+$sql .= $db->order($sortfield, $sortorder);
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
+	$num = $nbtotalofrecords;
+} else {
+	if ($limit) {
+		$sql .= $db->plimit($limit + 1, $offset);
+	}
+
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+		exit;
+	}
+
+	$num = $db->num_rows($resql);
+}
+
+// Direct jump if only one record found
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".dol_buildpath('/knowledgemanagement/knowledgerecord_card.php', 1).'?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+foreach ($search as $key => $val) {
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			$param .= '&search_'.$key.'[]='.urlencode($skey);
+		}
+	} else {
+		$param .= '&search_'.$key.'='.urlencode($search[$key]);
+	}
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
+
+// List of mass actions available
+$arrayofmassactions = array(
+	//'validate'=>$langs->trans("Validate"),
+	//'generate_doc'=>$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
+);
+if ($permissiontodelete) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/knowledgemanagement/knowledgerecord_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendKnowledgeRecordRef";
+$modelmail = "knowledgerecord";
+$objecttmp = new KnowledgeRecord($db);
+$trackid = 'xxxx'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+/*$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';*/
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
+
+if (!empty($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
+			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
+		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+			print '</div>';
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+			print '</div>';
+		}
+		print '</td>';
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print '</tr>'."\n";
+
+
+// Detect if we need a fetch on each output line
+$needToFetchEachLine = 0;
+if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
+		if (preg_match('/\$object/', $val)) {
+			$needToFetchEachLine++; // There is at least one compute field that use $object
+		}
+	}
+}
+
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$totalarray = array();
+while ($i < ($limit ? min($num, $limit) : $num)) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
+
+	// Store properties in $object
+	$object->setVarsFromFetchObj($obj);
+
+	// Show here line of result
+	print '<tr class="oddeven">';
+	foreach ($object->fields as $key => $val) {
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		}
+
+		if (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		}
+
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
+		}
+		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
+			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+			if ($key == 'status') {
+				print $object->getLibStatut(5);
+			} else {
+				print $object->showOutputField($val, $key, $object->$key, '');
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!empty($val['isameasure'])) {
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				}
+				$totalarray['val']['t.'.$key] += $object->$key;
+			}
+		}
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($object->id, $arrayofselected)) {
+			$selected = 1;
+		}
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+
+	print '</tr>'."\n";
+
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+}
+
+
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
+
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
+
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	print $formfile->showdocuments('massfilesarea_knowledgemanagement', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
new file mode 100644
index 00000000000..7d9fe76222d
--- /dev/null
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -0,0 +1,200 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       knowledgerecord_note.php
+ *  \ingroup    knowledgemanagement
+ *  \brief      Tab for notes on KnowledgeRecord
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
+dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new KnowledgeRecord($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('knowledgerecordnote', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'knowledgemanagement', $id);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->knowledgemanagement->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissionnote = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_setnotes.inc.php
+$permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url = '';
+llxHeader('', $langs->trans('KnowledgeRecord'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch_thirdparty();
+
+	$head = knowledgerecordPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'note', $langs->trans("KnowledgeRecord"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/knowledgemanagement/knowledgerecord_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	 $morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+
+	$cssclass = "titlefield";
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/knowledgemanagement/langs/en_US/knowledgemanagement.lang b/htdocs/knowledgemanagement/langs/en_US/knowledgemanagement.lang
new file mode 100644
index 00000000000..91cc43857c6
--- /dev/null
+++ b/htdocs/knowledgemanagement/langs/en_US/knowledgemanagement.lang
@@ -0,0 +1,61 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc = Knowledge Management description
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management setup page
+KNOWLEDGEMANAGEMENT_MYPARAM1 = My param 1
+KNOWLEDGEMANAGEMENT_MYPARAM1Tooltip = My param 1 tooltip
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+#
+# Sample widget
+#
+MyWidget = My widget
+MyWidgetDescription = My widget description
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge records
+ListKnowledgeRecord = List
+NewKnowledgeRecord = New knowledge record
+Reply = Reply
+KnowledgeRecords = knowledge record
+KnowledgeRecord = knowledge record
\ No newline at end of file
diff --git a/htdocs/knowledgemanagement/langs/fr_FR/knowledgemanagement.lang b/htdocs/knowledgemanagement/langs/fr_FR/knowledgemanagement.lang
new file mode 100644
index 00000000000..15705d3db54
--- /dev/null
+++ b/htdocs/knowledgemanagement/langs/fr_FR/knowledgemanagement.lang
@@ -0,0 +1,58 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Générique
+#
+
+# Module label 'Module Base de connaissance'
+ModuleKnowledgeManagementName = Base de connaissance
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc = Base de connaissance
+
+#
+# Page d'administration
+#
+KnowledgeManagementSetup = Configuration du module Base de connaissance
+Settings = Réglages
+KnowledgeManagementSetupPage = Page de configuration du module Base de connaissance
+
+#
+# Page À propos
+#
+About = À propos
+KnowledgeManagementAbout = À propos de la Base de connaissance
+KnowledgeManagementAboutPage = Page à propos de la Base de connaissance
+
+#
+# Page d'exemple
+#
+MyPageName = Nom de ma page
+
+#
+# Box d'exemple
+#
+MyWidget = Mon widget
+MyWidgetDescription = Description de mon widget
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Registres de connaissances
+ListKnowledgeRecord = Liste
+NewKnowledgeRecord = Nouveau registre de connaissance
+Reply = Répondre
+KnowledgeRecords = registres de connaissances
+KnowledgeRecord = registre de connaissances
\ No newline at end of file
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
new file mode 100644
index 00000000000..e29c8df66df
--- /dev/null
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
@@ -0,0 +1,66 @@
+<?php
+/* Copyright (C) 2021 SuperAdmin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    knowledgemanagement/lib/knowledgemanagement.lib.php
+ * \ingroup knowledgemanagement
+ * \brief   Library files with common functions for KnowledgeManagement
+ */
+
+/**
+ * Prepare admin pages header
+ *
+ * @return array
+ */
+function knowledgemanagementAdminPrepareHead()
+{
+	global $langs, $conf;
+
+	$langs->load("knowledgemanagement@knowledgemanagement");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/knowledgemanagement/admin/setup.php", 1);
+	$head[$h][1] = $langs->trans("Settings");
+	$head[$h][2] = 'settings';
+	$h++;
+
+	/*
+	$head[$h][0] = dol_buildpath("/knowledgemanagement/admin/myobject_extrafields.php", 1);
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'myobject_extrafields';
+	$h++;
+	*/
+
+	$head[$h][0] = dol_buildpath("/knowledgemanagement/admin/about.php", 1);
+	$head[$h][1] = $langs->trans("About");
+	$head[$h][2] = 'about';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@knowledgemanagement:/knowledgemanagement/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@knowledgemanagement:/knowledgemanagement/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'knowledgemanagement');
+
+	return $head;
+}
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
new file mode 100644
index 00000000000..bb331a24344
--- /dev/null
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
@@ -0,0 +1,92 @@
+<?php
+/* Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    lib/knowledgemanagement_knowledgerecord.lib.php
+ * \ingroup knowledgemanagement
+ * \brief   Library files with common functions for KnowledgeRecord
+ */
+
+/**
+ * Prepare array of tabs for KnowledgeRecord
+ *
+ * @param	KnowledgeRecord	$object		KnowledgeRecord
+ * @return 	array					Array of tabs
+ */
+function knowledgerecordPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("knowledgemanagement@knowledgemanagement");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/knowledgemanagement/knowledgerecord_card.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h++;
+
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
+		$nbNote = 0;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
+		$head[$h][0] = dol_buildpath('/knowledgemanagement/knowledgerecord_note.php', 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) {
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		}
+		$head[$h][2] = 'note';
+		$h++;
+	}
+
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->knowledgemanagement->dir_output."/knowledgerecord/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = dol_buildpath("/knowledgemanagement/knowledgerecord_document.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
+	$head[$h][2] = 'document';
+	$h++;
+
+	$head[$h][0] = dol_buildpath("/knowledgemanagement/knowledgerecord_agenda.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("Events");
+	$head[$h][2] = 'agenda';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@knowledgemanagement:/knowledgemanagement/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@knowledgemanagement:/knowledgemanagement/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'knowledgerecord@knowledgemanagement');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'knowledgerecord@knowledgemanagement', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/knowledgemanagement/modulebuilder.txt b/htdocs/knowledgemanagement/modulebuilder.txt
new file mode 100644
index 00000000000..670a1774929
--- /dev/null
+++ b/htdocs/knowledgemanagement/modulebuilder.txt
@@ -0,0 +1,3 @@
+# DO NOT DELETE THIS FILE MANUALLY
+# File to flag module built using official module template.
+# When this file is present into a module directory, you can edit it with the module builder tool. 
\ No newline at end of file
diff --git a/htdocs/knowledgemanagement/myobject_contact.php b/htdocs/knowledgemanagement/myobject_contact.php
new file mode 100644
index 00000000000..1b7c37935ef
--- /dev/null
+++ b/htdocs/knowledgemanagement/myobject_contact.php
@@ -0,0 +1,213 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 SuperAdmin
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       knowledgemanagement/myobject_contact.php
+ *  \ingroup    knowledgemanagement
+ *  \brief      Tab for contacts linked to MyObject
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+dol_include_once('/knowledgemanagement/class/myobject.class.php');
+dol_include_once('/knowledgemanagement/lib/knowledgemanagement_myobject.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "companies", "other", "mails"));
+
+$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref    = GETPOST('ref', 'alpha');
+$lineid = GETPOST('lineid', 'int');
+$socid  = GETPOST('socid', 'int');
+$action = GETPOST('action', 'aZ09');
+
+// Initialize technical objects
+$object = new MyObject($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('myobjectcontact', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'knowledgemanagement', $object->id);
+
+$permission = $user->rights->knowledgemanagement->myobject->write;
+
+/*
+ * Add a new contact
+ */
+
+if ($action == 'addcontact' && $permission) {
+	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+
+	if ($result >= 0) {
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	} else {
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+} elseif ($action == 'swapstatut' && $permission) {
+	// Toggle the status of a contact
+	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+} elseif ($action == 'deletecontact' && $permission) {
+	// Deletes a contact
+	$result = $object->delete_contact($lineid);
+
+	if ($result >= 0) {
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
+}
+
+
+/*
+ * View
+ */
+
+$title = $langs->trans('MyObject')." - ".$langs->trans('ContactsAddresses');
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
+
+
+/* *************************************************************************** */
+/*                                                                             */
+/* View and edit mode                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+
+if ($object->id) {
+	/*
+	 * Show tabs
+	 */
+	$head = myobjectPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'contact', $langs->trans("MyObject"), -1, $object->picto);
+
+	$linkback = '<a href="'.dol_buildpath('/knowledgemanagement/myobject_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+
+	print dol_get_fiche_end();
+
+	print '<br>';
+
+	// Contacts lines (modules that overwrite templates must declare this into descriptor)
+	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+	foreach ($dirtpls as $reldir) {
+		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+		if ($res) {
+			break;
+		}
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.key.sql b/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.key.sql
new file mode 100644
index 00000000000..85ab06d678e
--- /dev/null
+++ b/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.key.sql
@@ -0,0 +1,27 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD INDEX idx_knowledgemanagement_knowledgerecord_rowid (rowid);
+ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD INDEX idx_knowledgemanagement_knowledgerecord_ref (ref);
+ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD CONSTRAINT llx_knowledgemanagement_knowledgerecord_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD INDEX idx_knowledgemanagement_knowledgerecord_status (status);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD UNIQUE INDEX uk_knowledgemanagement_knowledgerecord_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD CONSTRAINT llx_knowledgemanagement_knowledgerecord_fk_field FOREIGN KEY (fk_field) REFERENCES llx_knowledgemanagement_myotherobject(rowid);
+
diff --git a/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.sql b/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.sql
new file mode 100644
index 00000000000..9c2866980ec
--- /dev/null
+++ b/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.sql
@@ -0,0 +1,33 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+
+CREATE TABLE llx_knowledgemanagement_knowledgerecord(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	ref varchar(128) NOT NULL, 
+	date_creation datetime NOT NULL, 
+	tms timestamp, 
+	last_main_doc varchar(255), 
+	fk_user_creat integer NOT NULL, 
+	fk_user_modif integer, 
+	fk_user_valid integer, 
+	import_key varchar(14), 
+	model_pdf varchar(255), 
+	question text NOT NULL, 
+	answer text, 
+	status integer NOT NULL
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
diff --git a/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.key.sql b/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.key.sql
new file mode 100644
index 00000000000..1174eb67df5
--- /dev/null
+++ b/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.key.sql
@@ -0,0 +1,19 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see https://www.gnu.org/licenses/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_knowledgemanagement_knowledgerecord_extrafields ADD INDEX idx_knowledgerecord_fk_object(fk_object);
+-- END MODULEBUILDER INDEXES
diff --git a/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.sql b/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.sql
new file mode 100644
index 00000000000..6498324ed8c
--- /dev/null
+++ b/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.sql
@@ -0,0 +1,23 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see https://www.gnu.org/licenses/.
+
+create table llx_knowledgemanagement_knowledgerecord_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/knowledgemanagement/test/phpunit/KnowledgeManagementFunctionalTest.php b/htdocs/knowledgemanagement/test/phpunit/KnowledgeManagementFunctionalTest.php
new file mode 100644
index 00000000000..fcffae73578
--- /dev/null
+++ b/htdocs/knowledgemanagement/test/phpunit/KnowledgeManagementFunctionalTest.php
@@ -0,0 +1,304 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 SuperAdmin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    test/phpunit/KnowledgeManagementFunctionalTest.php
+ * \ingroup knowledgemanagement
+ * \brief   Example Selenium test.
+ *
+ * Put detailed description here.
+ */
+
+namespace test\functional;
+
+use PHPUnit_Extensions_Selenium2TestCase_WebDriverException;
+
+/**
+ * Class KnowledgeManagementFunctionalTest
+ *
+ * Requires chromedriver for Google Chrome
+ * Requires geckodriver for Mozilla Firefox
+ *
+ * @fixme Firefox (Geckodriver/Marionette) support
+ * @todo Opera linux support
+ * @todo Windows support (IE, Google Chrome, Mozilla Firefox, Safari)
+ * @todo OSX support (Safari, Google Chrome, Mozilla Firefox)
+ *
+ * @package Testknowledgemanagement
+ */
+class KnowledgeManagementFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
+{
+	// TODO: move to a global configuration file?
+	/** @var string Base URL of the webserver under test */
+	protected static $base_url = 'http://dev.zenfusion.fr';
+	/**
+	 * @var string Dolibarr admin username
+	 * @see authenticate
+	 */
+	protected static $dol_admin_user = 'admin';
+	/**
+	 * @var string Dolibarr admin password
+	 * @see authenticate
+	 */
+	protected static $dol_admin_pass = 'admin';
+	/** @var int Dolibarr module ID */
+	private static $module_id = 500000; // TODO: autodetect?
+
+	/** @var array Browsers to test with */
+	public static $browsers = array(
+		array(
+			'browser' => 'Google Chrome on Linux',
+			'browserName' => 'chrome',
+			'sessionStrategy' => 'shared',
+			'desiredCapabilities' => array()
+		),
+		// Geckodriver does not keep the session at the moment?!
+		// XPath selectors also don't seem to work
+		//array(
+		//    'browser' => 'Mozilla Firefox on Linux',
+		//    'browserName' => 'firefox',
+		//    'sessionStrategy' => 'shared',
+		//    'desiredCapabilities' => array(
+		//        'marionette' => true,
+		//    ),
+		//)
+	);
+
+	/**
+	 * Helper function to select links by href
+	 *
+	 * @param  string  $value      Href
+	 * @return mixed               Helper string
+	 */
+	protected function byHref($value)
+	{
+		$anchor = null;
+		$anchors = $this->elements($this->using('tag name')->value('a'));
+		foreach ($anchors as $anchor) {
+			if (strstr($anchor->attribute('href'), $value)) {
+				break;
+			}
+		}
+		return $anchor;
+	}
+
+	/**
+	 * Global test setup
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+	}
+
+	/**
+	 * Unit test setup
+	 * @return void
+	 */
+	public function setUp()
+	{
+		$this->setSeleniumServerRequestsTimeout(3600);
+		$this->setBrowserUrl(self::$base_url);
+	}
+
+	/**
+	 * Verify pre conditions
+	 * @return void
+	 */
+	protected function assertPreConditions()
+	{
+	}
+
+	/**
+	 * Handle Dolibarr authentication
+	 * @return void
+	 */
+	private function authenticate()
+	{
+		try {
+			if ($this->byId('login')) {
+				$login = $this->byId('username');
+				$login->clear();
+				$login->value('admin');
+				$password = $this->byId('password');
+				$password->clear();
+				$password->value('admin');
+				$this->byId('login')->submit();
+			}
+		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+			// Login does not exist. Assume we are already authenticated
+		}
+	}
+
+	/**
+	 * Test enabling developer mode
+	 * @return bool
+	 */
+	public function testEnableDeveloperMode()
+	{
+		$this->url('/admin/const.php');
+		$this->authenticate();
+		$main_features_level_path = '//input[@value="MAIN_FEATURES_LEVEL"]/following::input[@type="text"]';
+		$main_features_level = $this->byXPath($main_features_level_path);
+		$main_features_level->clear();
+		$main_features_level->value('2');
+		$this->byName('update')->click();
+		// Page reloaded, we need a new XPath
+		$main_features_level = $this->byXPath($main_features_level_path);
+		return $this->assertEquals('2', $main_features_level->value(), "MAIN_FEATURES_LEVEL value is 2");
+	}
+
+	/**
+	 * Test enabling the module
+	 *
+	 * @depends testEnableDeveloperMode
+	 * @return bool
+	 */
+	public function testModuleEnabled()
+	{
+		$this->url('/admin/modules.php');
+		$this->authenticate();
+		$module_status_image_path = '//a[contains(@href, "'.self::$module_id.'")]/img';
+		$module_status_image = $this->byXPath($module_status_image_path);
+		if (strstr($module_status_image->attribute('src'), 'switch_off.png')) {
+			// Enable the module
+			$this->byHref('modKnowledgeManagement')->click();
+		} else {
+			// Disable the module
+			$this->byHref('modKnowledgeManagement')->click();
+			// Reenable the module
+			$this->byHref('modKnowledgeManagement')->click();
+		}
+		// Page reloaded, we need a new Xpath
+		$module_status_image = $this->byXPath($module_status_image_path);
+		return $this->assertContains('switch_on.png', $module_status_image->attribute('src'), "Module enabled");
+	}
+
+	/**
+	 * Test access to the configuration page
+	 *
+	 * @depends testModuleEnabled
+	 * @return bool
+	 */
+	public function testConfigurationPage()
+	{
+		$this->url('/custom/knowledgemanagement/admin/setup.php');
+		$this->authenticate();
+		return $this->assertContains('knowledgemanagement/admin/setup.php', $this->url(), 'Configuration page');
+	}
+
+	/**
+	 * Test access to the about page
+	 *
+	 * @depends testConfigurationPage
+	 * @return bool
+	 */
+	public function testAboutPage()
+	{
+		$this->url('/custom/knowledgemanagement/admin/about.php');
+		$this->authenticate();
+		return $this->assertContains('knowledgemanagement/admin/about.php', $this->url(), 'About page');
+	}
+
+	/**
+	 * Test about page is rendering Markdown
+	 *
+	 * @depends testAboutPage
+	 * @return bool
+	 */
+	public function testAboutPageRendersMarkdownReadme()
+	{
+		$this->url('/custom/knowledgemanagement/admin/about.php');
+		$this->authenticate();
+		return $this->assertEquals(
+			'Dolibarr Module Template (aka My Module)',
+			$this->byTag('h1')->text(),
+			"Readme title"
+		);
+	}
+
+	/**
+	 * Test box is properly declared
+	 *
+	 * @depends testModuleEnabled
+	 * @return bool
+	 */
+	public function testBoxDeclared()
+	{
+		$this->url('/admin/boxes.php');
+		$this->authenticate();
+		return $this->assertContains('knowledgemanagementwidget1', $this->source(), "Box enabled");
+	}
+
+	/**
+	 * Test trigger is properly enabled
+	 *
+	 * @depends testModuleEnabled
+	 * @return bool
+	 */
+	public function testTriggerDeclared()
+	{
+		$this->url('/admin/triggers.php');
+		$this->authenticate();
+		return $this->assertContains(
+			'interface_99_modKnowledgeManagement_KnowledgeManagementTriggers.class.php',
+			$this->byTag('body')->text(),
+			"Trigger declared"
+		);
+	}
+
+	/**
+	 * Test trigger is properly declared
+	 *
+	 * @depends testTriggerDeclared
+	 * @return bool
+	 */
+	public function testTriggerEnabled()
+	{
+		$this->url('/admin/triggers.php');
+		$this->authenticate();
+		return $this->assertContains(
+			'tick.png',
+			$this->byXPath('//td[text()="interface_99_modKnowledgeManagement_MyTrigger.class.php"]/following::img')->attribute('src'),
+			"Trigger enabled"
+		);
+	}
+
+	/**
+	 * Verify post conditions
+	 * @return void
+	 */
+	protected function assertPostConditions()
+	{
+	}
+
+	/**
+	 * Unit test teardown
+	 * @return void
+	 */
+	public function tearDown()
+	{
+	}
+
+	/**
+	 * Global test teardown
+	 * @return void
+	 */
+	public static function tearDownAfterClass()
+	{
+	}
+}

From df33f6870b7c3b593125c6bbb76953a0d573210f Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 28 Apr 2021 10:12:17 +0200
Subject: [PATCH 407/928] fix errors in file

---
 .../modules/modKnowledgeManagement.class.php  | 118 +++++++++---------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php b/htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php
index 1ae65764b6a..36be09e5e13 100644
--- a/htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php
@@ -350,65 +350,65 @@ class modKnowledgeManagement extends DolibarrModules
 		*/
 
 		$this->menu[$r++]=array(
-            // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'fk_menu'=>'fk_mainmenu=knowledgemanagement',
-            // This is a Left menu entry
-            'type'=>'left',
-            'titre'=>'MenuKnowledgeRecord',
-            'mainmenu'=>'knowledgemanagement',
-            'leftmenu'=>'knowledgemanagement_knowledgerecord',
-            'url'=>'/knowledgemanagement/knowledgerecord_list.php',
-            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'langs'=>'knowledgemanagement@knowledgemanagement',
-            'position'=>101,
-            // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'enabled'=>'$conf->knowledgemanagement->enabled',
-            // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-            'perms'=>'1',
-            'target'=>'',
-            // 0=Menu for internal users, 1=external users, 2=both
-            'user'=>2,
-        );
-        $this->menu[$r++]=array(
-            // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgemanagement_knowledgerecord',
-            // This is a Left menu entry
-            'type'=>'left',
-            'titre'=>'ListKnowledgeRecord',
-            'mainmenu'=>'knowledgemanagement',
-            'leftmenu'=>'knowledgemanagement_list',
-            'url'=>'/knowledgemanagement/knowledgerecord_list.php',
-            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'langs'=>'knowledgemanagement@knowledgemanagement',
-            'position'=>111,
-            // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'enabled'=>'$conf->knowledgemanagement->enabled',
-            // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-            'perms'=>'1',
-            'target'=>'',
-            // 0=Menu for internal users, 1=external users, 2=both
-            'user'=>2,
-        );
-        $this->menu[$r++]=array(
-            // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgemanagement_knowledgerecord',
-            // This is a Left menu entry
-            'type'=>'left',
-            'titre'=>'NewKnowledgeRecord',
-            'mainmenu'=>'knowledgemanagement',
-            'leftmenu'=>'knowledgemanagement_new',
-            'url'=>'/knowledgemanagement/knowledgerecord_card.php?action=create',
-            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'langs'=>'knowledgemanagement@knowledgemanagement',
-            'position'=>110,
-            // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'enabled'=>'$conf->knowledgemanagement->enabled',
-            // Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-            'perms'=>'1',
-            'target'=>'',
-            // 0=Menu for internal users, 1=external users, 2=both
-            'user'=>2
-        );
+			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'fk_menu'=>'fk_mainmenu=knowledgemanagement',
+			// This is a Left menu entry
+			'type'=>'left',
+			'titre'=>'MenuKnowledgeRecord',
+			'mainmenu'=>'knowledgemanagement',
+			'leftmenu'=>'knowledgemanagement_knowledgerecord',
+			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
+			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'=>'knowledgemanagement@knowledgemanagement',
+			'position'=>101,
+			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'enabled'=>'$conf->knowledgemanagement->enabled',
+			// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
+			'perms'=>'1',
+			'target'=>'',
+			// 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2,
+		);
+		$this->menu[$r++]=array(
+			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgemanagement_knowledgerecord',
+			// This is a Left menu entry
+			'type'=>'left',
+			'titre'=>'ListKnowledgeRecord',
+			'mainmenu'=>'knowledgemanagement',
+			'leftmenu'=>'knowledgemanagement_list',
+			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
+			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'=>'knowledgemanagement@knowledgemanagement',
+			'position'=>111,
+			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'enabled'=>'$conf->knowledgemanagement->enabled',
+			// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
+			'perms'=>'1',
+			'target'=>'',
+			// 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2,
+		);
+		$this->menu[$r++]=array(
+			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'fk_menu'=>'fk_mainmenu=knowledgemanagement,fk_leftmenu=knowledgemanagement_knowledgerecord',
+			// This is a Left menu entry
+			'type'=>'left',
+			'titre'=>'NewKnowledgeRecord',
+			'mainmenu'=>'knowledgemanagement',
+			'leftmenu'=>'knowledgemanagement_new',
+			'url'=>'/knowledgemanagement/knowledgerecord_card.php?action=create',
+			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'=>'knowledgemanagement@knowledgemanagement',
+			'position'=>110,
+			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'enabled'=>'$conf->knowledgemanagement->enabled',
+			// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
+			'perms'=>'1',
+			'target'=>'',
+			// 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2
+		);
 
 		/* END MODULEBUILDER LEFTMENU KNOWLEDGERECORD */
 		// Exports profiles provided by this module

From e50494152d3f305cb8551cfa1f221336b5ddbdde Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 11:22:45 +0200
Subject: [PATCH 408/928] Fix label

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

diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 333ef747cf2..e51a77ba085 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -121,7 +121,7 @@ class modFacture extends DolibarrModules
 		$datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 		$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, 'priority'=>50, 'status'=>1, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
-			1=>array('label'=>'SendEmailsRemindersOnInvoiceDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsRemindersOnInvoiceDueDate', 'parameters'=>"10,all,EmailTemplateCode", 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority)', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
+			1=>array('label'=>'SendEmailsRemindersOnInvoiceDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsRemindersOnInvoiceDueDate', 'parameters'=>"10,all,EmailTemplateCode", 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days. First param is the offset n of days, second parameter is "all" or a payment mode code, last paramater is the code of email template to use (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority).', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
 		);
 
 		// Permissions

From c25b044da586f67d89420dc23497a78f03576868 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 28 Apr 2021 11:56:07 +0200
Subject: [PATCH 409/928] FIX : several fixes on salary and vat

---
 htdocs/compta/tva/class/tva.class.php  | 2 +-
 htdocs/salaries/class/salary.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index ff35ece947b..465e6f27fd6 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -144,7 +144,7 @@ class Tva extends CommonObject
 		$sql .= " '".$this->db->escape($this->note)."',";
 		$sql .= " '".$this->db->escape($this->fk_account)."',";
 		$sql .= " '".$this->db->escape($this->type_payment)."',";
-		$sql .= " '".$this->db->escape($this->fk_user_creat)."',";
+		$sql .= " '".($this->fk_user_creat > 0 ? (int)$this->fk_user_creat : (int)$user->id)."',";
 		$sql .= " '".$this->db->escape($this->fk_user_modif)."'";
 		$sql .= ")";
 
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index e3dbb9b735d..9e009543fe0 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -146,7 +146,7 @@ class Salary extends CommonObject
 		$sql .= " note='".$this->db->escape($this->note)."',";
 		$sql .= " fk_bank=".($this->fk_bank > 0 ? (int) $this->fk_bank : "null").",";
 		$sql .= " fk_user_author=".((int) $this->fk_user_author).",";
-		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? (int) $this->fk_user_modif : 'null');
+		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? (int)$this->fk_user_modif : (int)$user->id);
 
 		$sql .= " WHERE rowid=".((int) $this->id);
 

From 18d2bef8f38c94d24731eab199237506588d4974 Mon Sep 17 00:00:00 2001
From: Sylvain Legrand <sylvain.legrand@infras.fr>
Date: Wed, 28 Apr 2021 11:58:34 +0200
Subject: [PATCH 410/928] Error 500 on propal card when we change the deadline

if we don't use the automatic generation for PDF documents (MAIN_DISABLE_PDF_AUTOUPDATE is set to 1) when we change the deadline on a proposal we get an error 500.
---
 htdocs/comm/propal/card.php | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 73ea01bc3f8..99a6f759206 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -285,8 +285,28 @@ if (empty($reshook))
 	} elseif ($action == 'setecheance' && $usercancreate)
 	{
 		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
-		$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		if ($result < 0)
+		if ($result >= 0)
+		{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (!empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model = $object->model_pdf;
+				$ret = $object->fetch($id); // Reload to get new records
+				if ($ret > 0) {
+					$object->fetch_thirdparty();
+				}
+
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
+		elseif ($result < 0)
 			dol_print_error($db, $object->error);
 	} elseif ($action == 'setdate_livraison' && $usercancreate)
 	{

From 4af2f8871a26448fddc2d038cb355aa0ace34d54 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 28 Apr 2021 12:27:07 +0200
Subject: [PATCH 411/928] FIX : on update current_timestamp

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 +-
 htdocs/install/mysql/tables/llx_salary.sql       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 10822a8ec2a..48095160c69 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -259,7 +259,7 @@ create table llx_salary
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(30) NULL,           -- payment reference number (currently NULL because there is no numbering manager yet)
   label           varchar(255),
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,                   -- Create date
   fk_user         integer NOT NULL,
   datep           date,                       -- payment date
diff --git a/htdocs/install/mysql/tables/llx_salary.sql b/htdocs/install/mysql/tables/llx_salary.sql
index af4b869d9bf..b68ac1e7a1e 100644
--- a/htdocs/install/mysql/tables/llx_salary.sql
+++ b/htdocs/install/mysql/tables/llx_salary.sql
@@ -21,7 +21,7 @@ create table llx_salary
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(30) NULL,           -- payment reference number (currently NULL because there is no numbering manager yet)
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,                   -- Create date
   fk_user         integer NOT NULL,
   datep           date,                       -- payment date

From 01ddc13b2ef8fb9665ea0b8805cb3e50df4612ed Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 28 Apr 2021 13:06:19 +0200
Subject: [PATCH 412/928] FIX : on update current_timestamp for postgres

---
 htdocs/install/pgsql/functions/functions.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index 17339c1f605..d73678bcbab 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -169,6 +169,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitm
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentjobposition_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentcandidature FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentcandidature_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_salary FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_societe FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_societe_address FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_societe_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();

From 762378c04468f37613f2844680d824c0bde197da Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 28 Apr 2021 11:12:01 +0000
Subject: [PATCH 413/928] Fixing style errors.

---
 htdocs/compta/tva/class/tva.class.php  | 2 +-
 htdocs/salaries/class/salary.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 465e6f27fd6..daed5b19f5e 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -144,7 +144,7 @@ class Tva extends CommonObject
 		$sql .= " '".$this->db->escape($this->note)."',";
 		$sql .= " '".$this->db->escape($this->fk_account)."',";
 		$sql .= " '".$this->db->escape($this->type_payment)."',";
-		$sql .= " '".($this->fk_user_creat > 0 ? (int)$this->fk_user_creat : (int)$user->id)."',";
+		$sql .= " '".($this->fk_user_creat > 0 ? (int) $this->fk_user_creat : (int) $user->id)."',";
 		$sql .= " '".$this->db->escape($this->fk_user_modif)."'";
 		$sql .= ")";
 
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 9e009543fe0..e7f1af66e0c 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -146,7 +146,7 @@ class Salary extends CommonObject
 		$sql .= " note='".$this->db->escape($this->note)."',";
 		$sql .= " fk_bank=".($this->fk_bank > 0 ? (int) $this->fk_bank : "null").",";
 		$sql .= " fk_user_author=".((int) $this->fk_user_author).",";
-		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? (int)$this->fk_user_modif : (int)$user->id);
+		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? (int) $this->fk_user_modif : (int) $user->id);
 
 		$sql .= " WHERE rowid=".((int) $this->id);
 

From dfb4a1c30a9bb9c53a9c80e08bcf686d0f38ce05 Mon Sep 17 00:00:00 2001
From: antonin_tdj <50403308+ibuiv@users.noreply.github.com>
Date: Wed, 28 Apr 2021 13:37:05 +0200
Subject: [PATCH 414/928] lint (code) Apply remarks and upgrade codee

- Sets List of all Visible Warehouses at the beginning with getEntity method (removed the call to global $mc)
- Better check for warehouse auto select (`$count == 1 && (empty($fk_entrepot) || $fk_entrepot <= 0) && ...`)
- Better SQL applying eldy's remarks
---
 htdocs/product/stock/replenish.php | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 7421e71f05c..73124fd7bad 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -66,18 +66,22 @@ $fourn_id = GETPOST('fourn_id', 'int');
 $fk_supplier = GETPOST('fk_supplier', 'int');
 $fk_entrepot = GETPOST('fk_entrepot', 'int');
 
+//List all visible warehouses
+$resWar = $db->query("SELECT rowid FROM " . MAIN_DB_PREFIX . "entrepot WHERE entity IN (" . $db->sanitize(getEntity('stock')) .")");
+$listofqualifiedwarehousesid = "";
+$count = 0;
+while ($tmpobj = $db->fetch_object($resWar)) {
+	if (!empty($listofqualifiedwarehousesid)) {
+		$listofqualifiedwarehousesid .= ",";
+	}
+	$listofqualifiedwarehousesid .= $tmpobj->rowid;
+	$lastWarehouseID = $tmpobj->rowid;
+	$count++;
+};
+
 //MultiCompany : If only 1 Warehouse is visible, filter will automatically be set to it.
-if ($fk_entrepot == "-1" && !empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED)) {
-	global $mc;
-	$visibleWarehousesEntities = $conf->entity;
-	if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) {
-		$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
-	}
-	$resWar = $db->query("SELECT rowid FROM " . MAIN_DB_PREFIX . "entrepot WHERE entity IN (" . $db->sanitize($visibleWarehousesEntities) .")");
-	if ($db->num_rows($resWar) == 1) {
-		$tmpobj = $db->fetch_object($resWar);
-		$fk_entrepot = $tmpobj->rowid;
-	}
+if ($count == 1 && (empty($fk_entrepot) || $fk_entrepot <= 0) && !empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED)) {
+	$fk_entrepot = $lastWarehouseID;
 };
 
 $texte = '';
@@ -340,8 +344,8 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot AS ent ON s.fk_entrepot = ent.rowid AND ent.entity IN('.getEntity('stock').')';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product AND s.fk_entrepot IN ('.$db->sanitize($listofqualifiedwarehousesid).')';
+//$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot AS ent ON s.fk_entrepot = ent.rowid AND ent.entity IN('.getEntity('stock').')';
 if ($fk_supplier > 0) {
 	$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid AND pfp.fk_soc = '.$fk_supplier.')';
 }

From 143417d7270b43f8ed9ce7877dcbfa2354e05a31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 14:17:00 +0200
Subject: [PATCH 415/928] Fix duplicate line

---
 dev/setup/codesniffer/ruleset.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index e99b8673981..f4f64f40141 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -16,7 +16,6 @@
 	<exclude-pattern type="relative">htdocs/conf.php</exclude-pattern>
 	<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
-	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
 	<exclude-pattern type="relative">.git</exclude-pattern>
 
 	<!-- List of all tests -->

From 8bb8d846adbae3031da5f08bae8edaeb31f8af7d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 14:18:15 +0200
Subject: [PATCH 416/928] More complete setup file

---
 dev/setup/codesniffer/ruleset.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index f4f64f40141..e78438d8791 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -16,6 +16,7 @@
 	<exclude-pattern type="relative">htdocs/conf.php</exclude-pattern>
 	<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
+	<exclude-pattern type="relative">source</exclude-pattern>
 	<exclude-pattern type="relative">.git</exclude-pattern>
 
 	<!-- List of all tests -->

From 97043ca6659cef69b0f198403595724cf2aaab8d Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 28 Apr 2021 14:57:49 +0200
Subject: [PATCH 417/928] New  module KnowledgeManagement

---
 .../knowledgemanagement.php}                  |   14 +-
 .../admin/knowledgerecord_extrafields.php     |   10 +-
 .../modules/modKnowledgeManagement.class.php  |   22 +-
 ...nowledgemanagement_knowledgerecord.key.sql |    0
 ...lx_knowledgemanagement_knowledgerecord.sql |    0
 ...gement_knowledgerecord_extrafields.key.sql |    0
 ...management_knowledgerecord_extrafields.sql |    0
 htdocs/knowledgemanagement/.editorconfig      |   24 -
 htdocs/knowledgemanagement/.gitattributes     |   23 -
 htdocs/knowledgemanagement/.gitignore         |   18 -
 htdocs/knowledgemanagement/.tx/config         |    9 -
 htdocs/knowledgemanagement/COPYING            |  621 ----------
 htdocs/knowledgemanagement/ChangeLog.md       |    5 -
 htdocs/knowledgemanagement/README.md          |   27 -
 htdocs/knowledgemanagement/admin/about.php    |  103 --
 .../build/makepack-knowledgemanagement.conf   |   11 -
 .../class/knowledgerecord.class.php           |    7 +-
 .../class/knowledgerecord.class.php.back      | 1060 +++++++++++++++++
 .../modules_knowledgerecord.php               |    4 +-
 .../img/object_knowledgemanagement.png        |  Bin 219 -> 0 bytes
 .../img/object_knowledgemanagement_over.png   |  Bin 208 -> 0 bytes
 .../img/object_knowledgerecord.png            |  Bin 219 -> 0 bytes
 .../knowledgemanagementindex.php              |    2 +-
 .../knowledgerecord_agenda.php                |    2 +-
 .../knowledgerecord_card.php                  |    2 +-
 .../knowledgerecord_contact.php               |    2 +-
 .../knowledgerecord_document.php              |    2 +-
 .../knowledgerecord_list.php                  |    2 +-
 .../knowledgerecord_note.php                  |    2 +-
 .../lib/knowledgemanagement.lib.php           |   19 +-
 ...nowledgemanagement_knowledgerecord.lib.php |    2 +-
 .../knowledgemanagement/myobject_contact.php  |  213 ----
 .../KnowledgeManagementFunctionalTest.php     |  304 -----
 .../langs/en_US/knowledgemanagement.lang      |   10 +-
 .../langs/fr_FR/knowledgemanagement.lang      |    3 +-
 test/phpunit/knowledgerecordTest.php          |  192 +++
 36 files changed, 1301 insertions(+), 1414 deletions(-)
 rename htdocs/{knowledgemanagement/admin/setup.php => admin/knowledgemanagement.php} (98%)
 rename htdocs/{knowledgemanagement => }/admin/knowledgerecord_extrafields.php (95%)
 rename htdocs/{knowledgemanagement => }/core/modules/modKnowledgeManagement.class.php (97%)
 rename htdocs/{knowledgemanagement/sql => install/mysql/tables}/llx_knowledgemanagement_knowledgerecord.key.sql (100%)
 rename htdocs/{knowledgemanagement/sql => install/mysql/tables}/llx_knowledgemanagement_knowledgerecord.sql (100%)
 rename htdocs/{knowledgemanagement/sql => install/mysql/tables}/llx_knowledgemanagement_knowledgerecord_extrafields.key.sql (100%)
 rename htdocs/{knowledgemanagement/sql => install/mysql/tables}/llx_knowledgemanagement_knowledgerecord_extrafields.sql (100%)
 delete mode 100644 htdocs/knowledgemanagement/.editorconfig
 delete mode 100644 htdocs/knowledgemanagement/.gitattributes
 delete mode 100644 htdocs/knowledgemanagement/.gitignore
 delete mode 100644 htdocs/knowledgemanagement/.tx/config
 delete mode 100644 htdocs/knowledgemanagement/COPYING
 delete mode 100644 htdocs/knowledgemanagement/ChangeLog.md
 delete mode 100644 htdocs/knowledgemanagement/README.md
 delete mode 100644 htdocs/knowledgemanagement/admin/about.php
 delete mode 100644 htdocs/knowledgemanagement/build/makepack-knowledgemanagement.conf
 create mode 100644 htdocs/knowledgemanagement/class/knowledgerecord.class.php.back
 delete mode 100644 htdocs/knowledgemanagement/img/object_knowledgemanagement.png
 delete mode 100644 htdocs/knowledgemanagement/img/object_knowledgemanagement_over.png
 delete mode 100644 htdocs/knowledgemanagement/img/object_knowledgerecord.png
 delete mode 100644 htdocs/knowledgemanagement/myobject_contact.php
 delete mode 100644 htdocs/knowledgemanagement/test/phpunit/KnowledgeManagementFunctionalTest.php
 rename htdocs/{knowledgemanagement => }/langs/en_US/knowledgemanagement.lang (86%)
 rename htdocs/{knowledgemanagement => }/langs/fr_FR/knowledgemanagement.lang (92%)
 create mode 100644 test/phpunit/knowledgerecordTest.php

diff --git a/htdocs/knowledgemanagement/admin/setup.php b/htdocs/admin/knowledgemanagement.php
similarity index 98%
rename from htdocs/knowledgemanagement/admin/setup.php
rename to htdocs/admin/knowledgemanagement.php
index 7aca837cb15..4769d84f118 100644
--- a/htdocs/knowledgemanagement/admin/setup.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -40,25 +40,23 @@ if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc
 	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
 }
 // Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
 if (!$res && file_exists("../../main.inc.php")) {
 	$res = @include "../../main.inc.php";
 }
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
 if (!$res) {
 	die("Include of main fails");
 }
-
 global $langs, $user;
 
 // Libraries
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
-require_once '../lib/knowledgemanagement.lib.php';
-//require_once "../class/myclass.class.php";
+require_once DOL_DOCUMENT_ROOT."/knowledgemanagement/lib/knowledgemanagement.lib.php";
 
 // Translations
-$langs->loadLangs(array("admin", "knowledgemanagement@knowledgemanagement"));
+$langs->loadLangs(array("admin", "knowledgemanagement"));
 
 // Access control
 if (!$user->admin) {
@@ -212,7 +210,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 // Configuration header
 $head = knowledgemanagementAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', '', -1, "knowledgemanagement@knowledgemanagement");
+print dol_get_fiche_head($head, 'knowledgemanagement', $langs->trans('ModuleKnowledgeManagementName'), -1, "knowledgemanagement");
 
 // Setup page goes here
 echo '<span class="opacitymedium">'.$langs->trans("KnowledgeManagementSetupPage").'</span><br><br>';
diff --git a/htdocs/knowledgemanagement/admin/knowledgerecord_extrafields.php b/htdocs/admin/knowledgerecord_extrafields.php
similarity index 95%
rename from htdocs/knowledgemanagement/admin/knowledgerecord_extrafields.php
rename to htdocs/admin/knowledgerecord_extrafields.php
index 1d6bac98e5b..b5113521c2c 100644
--- a/htdocs/knowledgemanagement/admin/knowledgerecord_extrafields.php
+++ b/htdocs/admin/knowledgerecord_extrafields.php
@@ -44,21 +44,21 @@ if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc
 	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
 }
 // Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
 if (!$res && file_exists("../../main.inc.php")) {
 	$res = @include "../../main.inc.php";
 }
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
 if (!$res) {
 	die("Include of main fails");
 }
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-require_once '../lib/knowledgemanagement.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('knowledgemanagement@knowledgemanagement', 'admin'));
+$langs->loadLangs(array('knowledgemanagement', 'admin'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
diff --git a/htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
similarity index 97%
rename from htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php
rename to htdocs/core/modules/modKnowledgeManagement.class.php
index 36be09e5e13..cce60d613e8 100644
--- a/htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -45,7 +45,7 @@ class modKnowledgeManagement 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 https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
+		$this->numero = 80000; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
 
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'knowledgemanagement';
@@ -79,7 +79,7 @@ class modKnowledgeManagement extends DolibarrModules
 		// 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'
 		// To use a supported fa-xxx css style of font awesome, use this->picto='xxx'
-		$this->picto = 'knowledgemanagement@knowledgemanagement';
+		$this->picto = 'generic';
 
 		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
 		$this->module_parts = array(
@@ -126,7 +126,7 @@ class modKnowledgeManagement extends DolibarrModules
 		$this->dirs = array("/knowledgemanagement/temp");
 
 		// Config pages. Put here list of php page, stored into knowledgemanagement/admin directory, to use to setup module.
-		$this->config_page_url = array("setup.php@knowledgemanagement");
+		$this->config_page_url = array("knowledgemanagement.php");
 
 		// Dependencies
 		// A condition to hide module
@@ -137,7 +137,7 @@ class modKnowledgeManagement extends DolibarrModules
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
 
 		// The language file dedicated to your module
-		$this->langfiles = array("knowledgemanagement@knowledgemanagement");
+		$this->langfiles = array("knowledgemanagement");
 
 		// Prerequisites
 		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
@@ -291,11 +291,11 @@ class modKnowledgeManagement extends DolibarrModules
 			'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'=>'ModuleKnowledgeManagementName',
-			'prefix' => img_picto('', 'knowledgemanagement@knowledgemanagement', 'class="paddingright pictofixedwidth"'),
+			'prefix' => img_picto('', 'mrp', 'class="paddingright pictofixedwidth"'),
 			'mainmenu'=>'knowledgemanagement',
 			'leftmenu'=>'',
 			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
-			'langs'=>'knowledgemanagement@knowledgemanagement', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'=>'knowledgemanagement', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>1000 + $r,
 			'enabled'=>'$conf->knowledgemanagement->enabled', // Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled.
 			'perms'=>'1', // Use 'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->read' if you want your menu with a permission rules
@@ -359,7 +359,7 @@ class modKnowledgeManagement extends DolibarrModules
 			'leftmenu'=>'knowledgemanagement_knowledgerecord',
 			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'knowledgemanagement@knowledgemanagement',
+			'langs'=>'knowledgemanagement',
 			'position'=>101,
 			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 			'enabled'=>'$conf->knowledgemanagement->enabled',
@@ -379,7 +379,7 @@ class modKnowledgeManagement extends DolibarrModules
 			'leftmenu'=>'knowledgemanagement_list',
 			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'knowledgemanagement@knowledgemanagement',
+			'langs'=>'knowledgemanagement',
 			'position'=>111,
 			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 			'enabled'=>'$conf->knowledgemanagement->enabled',
@@ -399,7 +399,7 @@ class modKnowledgeManagement extends DolibarrModules
 			'leftmenu'=>'knowledgemanagement_new',
 			'url'=>'/knowledgemanagement/knowledgerecord_card.php?action=create',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'knowledgemanagement@knowledgemanagement',
+			'langs'=>'knowledgemanagement',
 			'position'=>110,
 			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 			'enabled'=>'$conf->knowledgemanagement->enabled',
@@ -415,7 +415,7 @@ class modKnowledgeManagement extends DolibarrModules
 		$r = 1;
 		/* BEGIN MODULEBUILDER EXPORT KNOWLEDGERECORD */
 		/*
-		$langs->load("knowledgemanagement@knowledgemanagement");
+		$langs->load("knowledgemanagement");
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='KnowledgeRecordLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r]='knowledgerecord@knowledgemanagement';
@@ -446,7 +446,7 @@ class modKnowledgeManagement extends DolibarrModules
 		$r = 1;
 		/* BEGIN MODULEBUILDER IMPORT KNOWLEDGERECORD */
 		/*
-		 $langs->load("knowledgemanagement@knowledgemanagement");
+		 $langs->load("knowledgemanagement");
 		 $this->export_code[$r]=$this->rights_class.'_'.$r;
 		 $this->export_label[$r]='KnowledgeRecordLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		 $this->export_icon[$r]='knowledgerecord@knowledgemanagement';
diff --git a/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.key.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.key.sql
similarity index 100%
rename from htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.key.sql
rename to htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.key.sql
diff --git a/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
similarity index 100%
rename from htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord.sql
rename to htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
diff --git a/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.key.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.key.sql
similarity index 100%
rename from htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.key.sql
diff --git a/htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.sql
similarity index 100%
rename from htdocs/knowledgemanagement/sql/llx_knowledgemanagement_knowledgerecord_extrafields.sql
rename to htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.sql
diff --git a/htdocs/knowledgemanagement/.editorconfig b/htdocs/knowledgemanagement/.editorconfig
deleted file mode 100644
index 57184034691..00000000000
--- a/htdocs/knowledgemanagement/.editorconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-
-[*.php]
-indent_style = tab
-indent_size = 4
-trim_trailing_whitespace = true
-insert_final_newline = true
-[*.js]
-indent_style = tab
-[*.css]
-indent_style = tab
-[*.xml]
-indent_style = tab
-[*.md]
-trim_trailing_whitespace = false
diff --git a/htdocs/knowledgemanagement/.gitattributes b/htdocs/knowledgemanagement/.gitattributes
deleted file mode 100644
index 0d2c67e38e6..00000000000
--- a/htdocs/knowledgemanagement/.gitattributes
+++ /dev/null
@@ -1,23 +0,0 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-* text=auto
-
-
-# Explicitly declare text files we want to always be normalized and converted 
-# to native line endings on checkout.
-*.php text eol=lf
-*.sql text eol=lf
-*.htm text eol=lf
-*.html text eol=lf
-*.js text eol=lf
-*.css text eol=lf
-*.lang text eol=lf
-*.txt text eol=lf
-*.md text eol=lf
-*.bat text eol=lf
-
-# Denote all files that are truly binary and should not be modified.
-*.ico binary
-*.png binary
-*.jpg binary
-*.odt binary
-*.odf binary
diff --git a/htdocs/knowledgemanagement/.gitignore b/htdocs/knowledgemanagement/.gitignore
deleted file mode 100644
index 942cb8b03ba..00000000000
--- a/htdocs/knowledgemanagement/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated binaries
-/build/*.zip
-# Doxygen generated documentation
-/build/doxygen/doxygen_warnings.log
-/doc/code/doxygen
-# Composer managed dependencies
-/vendor
-/dev/bin
-# PHPdocumentor generated files
-/build/phpdoc
-/doc/code/phpdoc
-# Sphinx generated files
-/doc/user/build
-/.settings/
-/.buildpath
-/.project
-# Other
-*.back
\ No newline at end of file
diff --git a/htdocs/knowledgemanagement/.tx/config b/htdocs/knowledgemanagement/.tx/config
deleted file mode 100644
index 1743c5d00dd..00000000000
--- a/htdocs/knowledgemanagement/.tx/config
+++ /dev/null
@@ -1,9 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = uz: uz_UZ
-
-[mymodule.mymodule]
-file_filter = langs/<lang>/mymodule.lang
-source_file = langs/en_US/mymodule.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
diff --git a/htdocs/knowledgemanagement/COPYING b/htdocs/knowledgemanagement/COPYING
deleted file mode 100644
index 94a04532226..00000000000
--- a/htdocs/knowledgemanagement/COPYING
+++ /dev/null
@@ -1,621 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
diff --git a/htdocs/knowledgemanagement/ChangeLog.md b/htdocs/knowledgemanagement/ChangeLog.md
deleted file mode 100644
index 91675fce526..00000000000
--- a/htdocs/knowledgemanagement/ChangeLog.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# CHANGELOG KNOWLEDGEMANAGEMENT FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
-
-## 1.0
-
-Initial version
diff --git a/htdocs/knowledgemanagement/README.md b/htdocs/knowledgemanagement/README.md
deleted file mode 100644
index 30e0f5c877f..00000000000
--- a/htdocs/knowledgemanagement/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# KNOWLEDGEMANAGEMENT FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
-
-## Features
-
-This module provides a feature to help managing a knowledge database.
-
-
-
-Other external modules are available on [Dolistore.com](https://www.dolistore.com).
-
-## Translations
-
-Translations can be completed manually by editing files into directories *langs*.
-
-
-
-
-
-## Licenses
-
-### Main code
-
-GPLv3 or (at your option) any later version. See file COPYING for more information.
-
-### Documentation
-
-All texts and readmes are licensed under GFDL.
diff --git a/htdocs/knowledgemanagement/admin/about.php b/htdocs/knowledgemanagement/admin/about.php
deleted file mode 100644
index 7b6867e8feb..00000000000
--- a/htdocs/knowledgemanagement/admin/about.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2021 SuperAdmin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    knowledgemanagement/admin/about.php
- * \ingroup knowledgemanagement
- * \brief   About page of module KnowledgeManagement.
- */
-
-// Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
-// Libraries
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once '../lib/knowledgemanagement.lib.php';
-
-// Translations
-$langs->loadLangs(array("errors", "admin", "knowledgemanagement@knowledgemanagement"));
-
-// Access control
-if (!$user->admin) {
-	accessforbidden();
-}
-
-// Parameters
-$action = GETPOST('action', 'aZ09');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-
-/*
- * Actions
- */
-
-// None
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-$page_name = "KnowledgeManagementAbout";
-llxHeader('', $langs->trans($page_name));
-
-// Subheader
-$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
-
-print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
-
-// Configuration header
-$head = knowledgemanagementAdminPrepareHead();
-print dol_get_fiche_head($head, 'about', '', 0, 'knowledgemanagement@knowledgemanagement');
-
-dol_include_once('/knowledgemanagement/core/modules/modKnowledgeManagement.class.php');
-$tmpmodule = new modKnowledgeManagement($db);
-print $tmpmodule->getDescLong();
-
-// Page end
-print dol_get_fiche_end();
-llxFooter();
-$db->close();
diff --git a/htdocs/knowledgemanagement/build/makepack-knowledgemanagement.conf b/htdocs/knowledgemanagement/build/makepack-knowledgemanagement.conf
deleted file mode 100644
index 16dc1e7b82b..00000000000
--- a/htdocs/knowledgemanagement/build/makepack-knowledgemanagement.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Your module name here
-#
-# Goal:    Goal of module
-# Version: <version>
-# Author:  Copyright <year> - <name of author>
-# License: GPLv3
-# Install: Just unpack content of module package in Dolibarr directory.
-# Setup:   Go on Dolibarr setup - modules to enable module.
-#
-# Files in module
-mymodule/
\ No newline at end of file
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 728fa2a4fb0..7efda3f9938 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -218,6 +218,7 @@ class KnowledgeRecord extends CommonObject
 	 */
 	public function create(User $user, $notrigger = false)
 	{
+		$this->question = "ABCD";
 		return $this->createCommon($user, $notrigger);
 	}
 
@@ -810,7 +811,7 @@ class KnowledgeRecord extends CommonObject
 		// phpcs:enable
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
-			//$langs->load("knowledgemanagement@knowledgemanagement");
+			//$langs->load("knowledgemanagement");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
 			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
 			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
@@ -915,7 +916,7 @@ class KnowledgeRecord extends CommonObject
 	public function getNextNumRef()
 	{
 		global $langs, $conf;
-		$langs->load("knowledgemanagement@knowledgemanagement");
+		$langs->load("knowledgemanagement");
 
 		if (empty($conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON)) {
 			$conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON = 'mod_knowledgerecord_standard';
@@ -980,7 +981,7 @@ class KnowledgeRecord extends CommonObject
 		$result = 0;
 		$includedocgeneration = 0;
 
-		$langs->load("knowledgemanagement@knowledgemanagement");
+		$langs->load("knowledgemanagement");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'standard_knowledgerecord';
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php.back b/htdocs/knowledgemanagement/class/knowledgerecord.class.php.back
new file mode 100644
index 00000000000..e4d7be22c1d
--- /dev/null
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php.back
@@ -0,0 +1,1060 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        class/knowledgerecord.class.php
+ * \ingroup     knowledgemanagement
+ * \brief       This file is a CRUD class file for KnowledgeRecord (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for KnowledgeRecord
+ */
+class KnowledgeRecord extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'knowledgemanagement';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'knowledgerecord';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'knowledgemanagement_knowledgerecord';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 0;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
+	/**
+	 * @var string String with name of icon for knowledgerecord. Must be the part after the 'object_' into object_knowledgerecord.png
+	 */
+	public $picto = 'book';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'picto' is code of a picto to show before value in forms
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>5, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object"),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
+		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserCreation', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>'1', 'position'=>512, 'notnull'=>0, 'visible'=>-2,),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
+		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
+		'answer' => array('type'=>'text', 'label'=>'Answer', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>4,),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Actif'),),
+	);
+	public $rowid;
+	public $ref;
+	public $date_creation;
+	public $tms;
+	public $last_main_doc;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $fk_user_valid;
+	public $import_key;
+	public $model_pdf;
+	public $question;
+	public $answer;
+	public $status;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'knowledgemanagement_knowledgerecordline';
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_knowledgerecord';
+
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'KnowledgeRecordline';
+
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables = array();
+
+	// /**
+	//  * @var array    List of child tables. To know object to delete on cascade.
+	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	//  */
+	// protected $childtablesoncascade = array('knowledgemanagement_knowledgerecorddet');
+
+	// /**
+	//  * @var KnowledgeRecordLine[]     Array of subtable lines
+	//  */
+	// public $lines = array();
+
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
+
+		$this->db = $db;
+
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
+
+		// Example to show how to set values of fields definition dynamically
+		/*if ($user->rights->knowledgemanagement->knowledgerecord->read) {
+			$this->fields['myfield']['visible'] = 1;
+			$this->fields['myfield']['noteditable'] = 0;
+		}*/
+
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
+				unset($this->fields[$key]);
+			}
+		}
+
+		// Translate some data of arrayofkeyval
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		return $this->createCommon($user, $notrigger);
+	}
+
+	/**
+	 * Clone an object into another one
+	 *
+	 * @param  	User 	$user      	User that creates
+	 * @param  	int 	$fromid     Id of object to clone
+	 * @return 	mixed 				New object created, <0 if KO
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		global $langs, $extrafields;
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$object = new self($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) {
+			$object->fetchLines();
+		}
+
+		// get lines so they will be clone
+		//foreach($this->lines as $line)
+		//	$line->fetch_optionals();
+
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
+
+		// Clear fields
+		if (property_exists($object, 'ref')) {
+			$object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
+		}
+		if (property_exists($object, 'label')) {
+			$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		}
+		if (property_exists($object, 'status')) {
+			$object->status = self::STATUS_DRAFT;
+		}
+		if (property_exists($object, 'date_creation')) {
+			$object->date_creation = dol_now();
+		}
+		if (property_exists($object, 'date_modification')) {
+			$object->date_modification = null;
+		}
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option) {
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
+
+		if (!$error) {
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			// copy external contacts if same company
+			if (property_exists($this, 'fk_soc') && $this->fk_soc == $object->socid) {
+				if ($this->copy_linked_contact($object, 'external') < 0) {
+					$error++;
+				}
+			}
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
+		return $result;
+	}
+
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchLines()
+	{
+		$this->lines = array();
+
+		$result = $this->fetchLinesCommon();
+		return $result;
+	}
+
+
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$records = array();
+
+		$sql = 'SELECT ';
+		$sql .= $this->getFieldList('t');
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		} else {
+			$sql .= ' WHERE 1 = 1';
+		}
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num)) {
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
+	}
+
+	/**
+	 *  Delete a line of object in database
+	 *
+	 *	@param  User	$user       User that delete
+	 *  @param	int		$idline		Id of line to delete
+	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
+	 */
+	public function deleteLine(User $user, $idline, $notrigger = false)
+	{
+		if ($this->status < 0) {
+			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
+			return -2;
+		}
+
+		return $this->deleteLineCommon($user, $idline, $notrigger);
+	}
+
+
+	/**
+	 *	Validate object
+	 *
+	 *	@param		User	$user     		User making status change
+	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
+	 */
+	public function validate($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 0;
+
+		// Protection
+		if ($this->status == self::STATUS_VALIDATED) {
+			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgerecord->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgerecord->knowledgerecord_advance->validate))))
+		 {
+		 $this->error='NotEnoughPermissions';
+		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+		 return -1;
+		 }*/
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// Define new ref
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
+			$num = $this->getNextNumRef();
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = $num;
+
+		if (!empty($num)) {
+			// Validate
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " status = ".self::STATUS_VALIDATED;
+			if (!empty($this->fields['date_validation'])) {
+				$sql .= ", date_validation = '".$this->db->idate($now)."'";
+			}
+			if (!empty($this->fields['fk_user_valid'])) {
+				$sql .= ", fk_user_valid = ".((int) $user->id);
+			}
+			$sql .= " WHERE rowid = ".((int) $this->id);
+
+			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				dol_print_error($this->db);
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+
+			if (!$error && !$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('KNOWLEDGERECORD_VALIDATE', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+		}
+
+		if (!$error) {
+			$this->oldref = $this->ref;
+
+			// Rename directory if dir was a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
+				// Now we rename also files into index
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'knowledgerecord/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'knowledgerecord/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
+
+				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
+				$oldref = dol_sanitizeFileName($this->ref);
+				$newref = dol_sanitizeFileName($num);
+				$dirsource = $conf->knowledgemanagement->dir_output.'/knowledgerecord/'.$oldref;
+				$dirdest = $conf->knowledgemanagement->dir_output.'/knowledgerecord/'.$newref;
+				if (!$error && file_exists($dirsource)) {
+					dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
+
+					if (@rename($dirsource, $dirdest)) {
+						dol_syslog("Rename ok");
+						// Rename docs starting with $oldref with $newref
+						$listoffiles = dol_dir_list($conf->knowledgemanagement->dir_output.'/knowledgerecord/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry) {
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
+					}
+				}
+			}
+		}
+
+		// Set new ref and current status
+		if (!$error) {
+			$this->ref = $num;
+			$this->status = self::STATUS_VALIDATED;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Set draft status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function setDraft($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status <= self::STATUS_DRAFT) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'KNOWLEDGERECORD_UNVALIDATE');
+	}
+
+	/**
+	 *	Set cancel status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function cancel($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_VALIDATED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'KNOWLEDGERECORD_CANCEL');
+	}
+
+	/**
+	 *	Set back to validated status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function reopen($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_CANCELED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'KNOWLEDGERECORD_REOPEN');
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string                              String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $hookmanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
+
+		$result = '';
+
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("KnowledgeRecord").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+
+		$url = dol_buildpath('/knowledgemanagement/knowledgerecord_card.php', 1).'?id='.$this->id;
+
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		$linkclose = '';
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$label = $langs->trans("ShowKnowledgeRecord");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
+
+		if ($option == 'nolink') {
+			$linkstart = '<span';
+		} else {
+			$linkstart = '<a href="'.$url.'"';
+		}
+		$linkstart .= $linkclose.'>';
+		if ($option == 'nolink') {
+			$linkend = '</span>';
+		} else {
+			$linkend = '</a>';
+		}
+
+		$result .= $linkstart;
+
+		if (empty($this->showphoto_on_popup)) {
+			if ($withpicto) {
+				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			}
+		} else {
+			if ($withpicto) {
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+				list($class, $module) = explode('@', $this->picto);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
+					} else {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
+					}
+
+					$result .= '</div>';
+				} else {
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+				}
+			}
+		}
+
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
+
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('knowledgerecorddao'));
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
+
+		return $result;
+	}
+
+	/**
+	 *  Return the label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        Id status
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			//$langs->load("knowledgemanagement@knowledgemanagement");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled');
+		}
+
+		$statusType = 'status'.$status;
+		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_CANCELED) {
+			$statusType = 'status6';
+		}
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 *	Load the info information in the object
+	 *
+	 *	@param  int		$id       Id of object
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.((int) $id);
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture) {
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->initAsSpecimenCommon();
+	}
+
+	/**
+	 * 	Create an array of lines
+	 *
+	 * 	@return array|int		array of lines if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		$this->lines = array();
+
+		$objectline = new KnowledgeRecordLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_knowledgerecord = '.$this->id));
+
+		if (is_numeric($result)) {
+			$this->error = $this->error;
+			$this->errors = $this->errors;
+			return $result;
+		} else {
+			$this->lines = $result;
+			return $this->lines;
+		}
+	}
+
+	/**
+	 *  Returns the reference to the following non used object depending on the active numbering module.
+	 *
+	 *  @return string      		Object free reference
+	 */
+	public function getNextNumRef()
+	{
+		global $langs, $conf;
+		$langs->load("knowledgemanagement@knowledgemanagement");
+
+		if (empty($conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON)) {
+			$conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON = 'mod_knowledgerecord_standard';
+		}
+
+		if (!empty($conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON.".php";
+			$classname = $conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/knowledgemanagement/");
+
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
+
+			if ($mybool === false) {
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
+
+			if (class_exists($classname)) {
+				$obj = new $classname();
+				$numref = $obj->getNextValue($this);
+
+				if ($numref != '' && $numref != '-1') {
+					return $numref;
+				} else {
+					$this->error = $obj->error;
+					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+					return "";
+				}
+			} else {
+				print $langs->trans("Error")." ".$langs->trans("ClassNotFound").' '.$classname;
+				return "";
+			}
+		} else {
+			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
+			return "";
+		}
+	}
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 *  @param	    string		$modele			Force template to use ('' to not force)
+	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 *  @param      null|array  $moreparams     Array to provide more information
+	 *  @return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	{
+		global $conf, $langs;
+
+		$result = 0;
+		$includedocgeneration = 0;
+
+		$langs->load("knowledgemanagement@knowledgemanagement");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_knowledgerecord';
+
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->KNOWLEDGERECORD_ADDON_PDF)) {
+				$modele = $conf->global->KNOWLEDGERECORD_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/knowledgemanagement/doc/";
+
+		if ($includedocgeneration && !empty($modele)) {
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
+	 *
+	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doScheduledJob()
+	{
+		global $conf, $langs;
+
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// ...
+
+		$this->db->commit();
+
+		return $error;
+	}
+}
+
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
+
+/**
+ * Class KnowledgeRecordLine. You can also remove this and generate a CRUD class for lines objects.
+ */
+class KnowledgeRecordLine extends CommonObjectLine
+{
+	// To complete with content of an object KnowledgeRecordLine
+	// We should have a field rowid, fk_knowledgerecord and position
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+}
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
index 01119bec994..58def153c4b 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
@@ -91,7 +91,7 @@ abstract class ModeleNumRefKnowledgeRecord
 	public function info()
 	{
 		global $langs;
-		$langs->load("knowledgemanagement@knowledgemanagement");
+		$langs->load("knowledgemanagement");
 		return $langs->trans("NoDescription");
 	}
 
@@ -103,7 +103,7 @@ abstract class ModeleNumRefKnowledgeRecord
 	public function getExample()
 	{
 		global $langs;
-		$langs->load("knowledgemanagement@knowledgemanagement");
+		$langs->load("knowledgemanagement");
 		return $langs->trans("NoExample");
 	}
 
diff --git a/htdocs/knowledgemanagement/img/object_knowledgemanagement.png b/htdocs/knowledgemanagement/img/object_knowledgemanagement.png
deleted file mode 100644
index b421fe3c9e046e26f6f64e996d0ac6f914fb40ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0y_MV>B>Ar*{EFEO$)If}G@TqVsS
z;K?HKQqEDJWWfRk&j}*Ij$9LWIdjZaEt_fgC(v|WZuyVE{Cnveqq!8H1nE3^Q+P=1
z>J6pzHFFOi7dG`V>~V=z*^%*0c-;qwr`mTC(p&lbdG0-v^)cLdNGff|;x#+nmA!Ac
zG}*~K+qK>KZ`=d6{%iJ$(wftDofmsm&tGc%WKH2wLA_6M?iSg{#s5F~RKfV2apH@l
TuYZ$(u4V9a^>bP0l+XkK_svvh

diff --git a/htdocs/knowledgemanagement/img/object_knowledgemanagement_over.png b/htdocs/knowledgemanagement/img/object_knowledgemanagement_over.png
deleted file mode 100644
index 7831c3025d7cf644f7299b25ad0c4605c1f0227e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0y_>7Fi*Ar*{!FEO$)IWn|948N<;
z;GuND<2y&w0%lfLkESIvxPl}u-BWBiC$!tgo+;TkSkUgk`-79e|I@Z_XSaA0(Cp>&
zpnykQmaAuh1HYwSK;({NvR4)EB*}C0%1Jos$DT3hZ7n@h=*-&WYOI>0c$|TaTSHZ3
z+Kxku{(9bUY!sa$$5d-_uT?t5;-EvL;kgqD3;)-D<urO&BsRI*{wdIj44$rjF6*2U
FngFB9M(zLr

diff --git a/htdocs/knowledgemanagement/img/object_knowledgerecord.png b/htdocs/knowledgemanagement/img/object_knowledgerecord.png
deleted file mode 100644
index b421fe3c9e046e26f6f64e996d0ac6f914fb40ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0y_MV>B>Ar*{EFEO$)If}G@TqVsS
z;K?HKQqEDJWWfRk&j}*Ij$9LWIdjZaEt_fgC(v|WZuyVE{Cnveqq!8H1nE3^Q+P=1
z>J6pzHFFOi7dG`V>~V=z*^%*0c-;qwr`mTC(p&lbdG0-v^)cLdNGff|;x#+nmA!Ac
zG}*~K+qK>KZ`=d6{%iJ$(wftDofmsm&tGc%WKH2wLA_6M?iSg{#s5F~RKfV2apH@l
TuYZ$(u4V9a^>bP0l+XkK_svvh

diff --git a/htdocs/knowledgemanagement/knowledgemanagementindex.php b/htdocs/knowledgemanagement/knowledgemanagementindex.php
index 19075875ce1..86ea3f10e08 100644
--- a/htdocs/knowledgemanagement/knowledgemanagementindex.php
+++ b/htdocs/knowledgemanagement/knowledgemanagementindex.php
@@ -58,7 +58,7 @@ if (!$res) {
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("knowledgemanagement@knowledgemanagement"));
+$langs->loadLangs(array("knowledgemanagement"));
 
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index df11a30c026..5144b736b98 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -82,7 +82,7 @@ dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.l
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "other"));
+$langs->loadLangs(array("knowledgemanagement", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 3ffcfa04020..071a6417b0b 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -81,7 +81,7 @@ dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
 dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "other"));
+$langs->loadLangs(array("knowledgemanagement", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/knowledgemanagement/knowledgerecord_contact.php b/htdocs/knowledgemanagement/knowledgerecord_contact.php
index 1a52c79c995..e5af4a54611 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_contact.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_contact.php
@@ -59,7 +59,7 @@ dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
 dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "companies", "other", "mails"));
+$langs->loadLangs(array("knowledgemanagement", "companies", "other", "mails"));
 
 $id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index e54e8ecb3b9..5261fde7118 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -82,7 +82,7 @@ dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
 dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "companies", "other", "mails"));
+$langs->loadLangs(array("knowledgemanagement", "companies", "other", "mails"));
 
 
 $action = GETPOST('action', 'aZ09');
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 372a1ae1be3..fdc05ac5137 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -85,7 +85,7 @@ require_once __DIR__.'/class/knowledgerecord.class.php';
 //dol_include_once('/othermodule/class/otherobject.class.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "other"));
+$langs->loadLangs(array("knowledgemanagement", "other"));
 
 $action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index 7d9fe76222d..31c15ff2064 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -78,7 +78,7 @@ dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
 dol_include_once('/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "companies"));
+$langs->loadLangs(array("knowledgemanagement", "companies"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
index e29c8df66df..270fb20c8ef 100644
--- a/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
@@ -30,27 +30,26 @@ function knowledgemanagementAdminPrepareHead()
 {
 	global $langs, $conf;
 
-	$langs->load("knowledgemanagement@knowledgemanagement");
+	$langs->load("knowledgemanagement");
 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/knowledgemanagement/admin/setup.php", 1);
+	$head[$h][0] = dol_buildpath("/admin/knowledgemanagement.php", 1);
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
 
-	/*
-	$head[$h][0] = dol_buildpath("/knowledgemanagement/admin/myobject_extrafields.php", 1);
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'myobject_extrafields';
-	$h++;
-	*/
 
-	$head[$h][0] = dol_buildpath("/knowledgemanagement/admin/about.php", 1);
+	$head[$h][0] = dol_buildpath("admin/knowledgerecord_extrafields.php", 1);
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'settings';
+	$h++;
+
+	/*$head[$h][0] = dol_buildpath("/knowledgemanagement/admin/about.php", 1);
 	$head[$h][1] = $langs->trans("About");
 	$head[$h][2] = 'about';
-	$h++;
+	$h++;*/
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
index bb331a24344..ce1a831fff7 100644
--- a/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
@@ -31,7 +31,7 @@ function knowledgerecordPrepareHead($object)
 {
 	global $db, $langs, $conf;
 
-	$langs->load("knowledgemanagement@knowledgemanagement");
+	$langs->load("knowledgemanagement");
 
 	$h = 0;
 	$head = array();
diff --git a/htdocs/knowledgemanagement/myobject_contact.php b/htdocs/knowledgemanagement/myobject_contact.php
deleted file mode 100644
index 1b7c37935ef..00000000000
--- a/htdocs/knowledgemanagement/myobject_contact.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2021 SuperAdmin
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *  \file       knowledgemanagement/myobject_contact.php
- *  \ingroup    knowledgemanagement
- *  \brief      Tab for contacts linked to MyObject
- */
-
-// Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-dol_include_once('/knowledgemanagement/class/myobject.class.php');
-dol_include_once('/knowledgemanagement/lib/knowledgemanagement_myobject.lib.php');
-
-// Load translation files required by the page
-$langs->loadLangs(array("knowledgemanagement@knowledgemanagement", "companies", "other", "mails"));
-
-$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
-$ref    = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$socid  = GETPOST('socid', 'int');
-$action = GETPOST('action', 'aZ09');
-
-// Initialize technical objects
-$object = new MyObject($db);
-$extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('myobjectcontact', 'globalcard')); // Note that conf->hooks_modules contains array
-// Fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label($object->table_element);
-
-// Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'knowledgemanagement', $object->id);
-
-$permission = $user->rights->knowledgemanagement->myobject->write;
-
-/*
- * Add a new contact
- */
-
-if ($action == 'addcontact' && $permission) {
-	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-} elseif ($action == 'swapstatut' && $permission) {
-	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-} elseif ($action == 'deletecontact' && $permission) {
-	// Deletes a contact
-	$result = $object->delete_contact($lineid);
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		dol_print_error($db);
-	}
-}
-
-
-/*
- * View
- */
-
-$title = $langs->trans('MyObject')." - ".$langs->trans('ContactsAddresses');
-$help_url = '';
-//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('', $title, $help_url);
-
-$form = new Form($db);
-$formcompany = new FormCompany($db);
-$contactstatic = new Contact($db);
-$userstatic = new User($db);
-
-
-/* *************************************************************************** */
-/*                                                                             */
-/* View and edit mode                                                         */
-/*                                                                             */
-/* *************************************************************************** */
-
-if ($object->id) {
-	/*
-	 * Show tabs
-	 */
-	$head = myobjectPrepareHead($object);
-
-	print dol_get_fiche_head($head, 'contact', $langs->trans("MyObject"), -1, $object->picto);
-
-	$linkback = '<a href="'.dol_buildpath('/knowledgemanagement/myobject_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-	$morehtmlref = '<div class="refidno">';
-	/*
-	 // Ref customer
-	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-	 // Thirdparty
-	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
-	 // Project
-	 if (! empty($conf->projet->enabled))
-	 {
-	 $langs->load("projects");
-	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	 if ($permissiontoadd)
-	 {
-	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	 $morehtmlref.=' : ';
-	 if ($action == 'classify') {
-	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	 $morehtmlref.='</form>';
-	 } else {
-	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	 }
-	 } else {
-	 if (! empty($object->fk_project)) {
-	 $proj = new Project($db);
-	 $proj->fetch($object->fk_project);
-	 $morehtmlref .= ': '.$proj->getNomUrl();
-	 } else {
-	 $morehtmlref .= '';
-	 }
-	 }
-	 }*/
-	$morehtmlref .= '</div>';
-
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-
-	print dol_get_fiche_end();
-
-	print '<br>';
-
-	// Contacts lines (modules that overwrite templates must declare this into descriptor)
-	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-	foreach ($dirtpls as $reldir) {
-		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) {
-			break;
-		}
-	}
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/knowledgemanagement/test/phpunit/KnowledgeManagementFunctionalTest.php b/htdocs/knowledgemanagement/test/phpunit/KnowledgeManagementFunctionalTest.php
deleted file mode 100644
index fcffae73578..00000000000
--- a/htdocs/knowledgemanagement/test/phpunit/KnowledgeManagementFunctionalTest.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2021 SuperAdmin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    test/phpunit/KnowledgeManagementFunctionalTest.php
- * \ingroup knowledgemanagement
- * \brief   Example Selenium test.
- *
- * Put detailed description here.
- */
-
-namespace test\functional;
-
-use PHPUnit_Extensions_Selenium2TestCase_WebDriverException;
-
-/**
- * Class KnowledgeManagementFunctionalTest
- *
- * Requires chromedriver for Google Chrome
- * Requires geckodriver for Mozilla Firefox
- *
- * @fixme Firefox (Geckodriver/Marionette) support
- * @todo Opera linux support
- * @todo Windows support (IE, Google Chrome, Mozilla Firefox, Safari)
- * @todo OSX support (Safari, Google Chrome, Mozilla Firefox)
- *
- * @package Testknowledgemanagement
- */
-class KnowledgeManagementFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
-{
-	// TODO: move to a global configuration file?
-	/** @var string Base URL of the webserver under test */
-	protected static $base_url = 'http://dev.zenfusion.fr';
-	/**
-	 * @var string Dolibarr admin username
-	 * @see authenticate
-	 */
-	protected static $dol_admin_user = 'admin';
-	/**
-	 * @var string Dolibarr admin password
-	 * @see authenticate
-	 */
-	protected static $dol_admin_pass = 'admin';
-	/** @var int Dolibarr module ID */
-	private static $module_id = 500000; // TODO: autodetect?
-
-	/** @var array Browsers to test with */
-	public static $browsers = array(
-		array(
-			'browser' => 'Google Chrome on Linux',
-			'browserName' => 'chrome',
-			'sessionStrategy' => 'shared',
-			'desiredCapabilities' => array()
-		),
-		// Geckodriver does not keep the session at the moment?!
-		// XPath selectors also don't seem to work
-		//array(
-		//    'browser' => 'Mozilla Firefox on Linux',
-		//    'browserName' => 'firefox',
-		//    'sessionStrategy' => 'shared',
-		//    'desiredCapabilities' => array(
-		//        'marionette' => true,
-		//    ),
-		//)
-	);
-
-	/**
-	 * Helper function to select links by href
-	 *
-	 * @param  string  $value      Href
-	 * @return mixed               Helper string
-	 */
-	protected function byHref($value)
-	{
-		$anchor = null;
-		$anchors = $this->elements($this->using('tag name')->value('a'));
-		foreach ($anchors as $anchor) {
-			if (strstr($anchor->attribute('href'), $value)) {
-				break;
-			}
-		}
-		return $anchor;
-	}
-
-	/**
-	 * Global test setup
-	 * @return void
-	 */
-	public static function setUpBeforeClass()
-	{
-	}
-
-	/**
-	 * Unit test setup
-	 * @return void
-	 */
-	public function setUp()
-	{
-		$this->setSeleniumServerRequestsTimeout(3600);
-		$this->setBrowserUrl(self::$base_url);
-	}
-
-	/**
-	 * Verify pre conditions
-	 * @return void
-	 */
-	protected function assertPreConditions()
-	{
-	}
-
-	/**
-	 * Handle Dolibarr authentication
-	 * @return void
-	 */
-	private function authenticate()
-	{
-		try {
-			if ($this->byId('login')) {
-				$login = $this->byId('username');
-				$login->clear();
-				$login->value('admin');
-				$password = $this->byId('password');
-				$password->clear();
-				$password->value('admin');
-				$this->byId('login')->submit();
-			}
-		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-			// Login does not exist. Assume we are already authenticated
-		}
-	}
-
-	/**
-	 * Test enabling developer mode
-	 * @return bool
-	 */
-	public function testEnableDeveloperMode()
-	{
-		$this->url('/admin/const.php');
-		$this->authenticate();
-		$main_features_level_path = '//input[@value="MAIN_FEATURES_LEVEL"]/following::input[@type="text"]';
-		$main_features_level = $this->byXPath($main_features_level_path);
-		$main_features_level->clear();
-		$main_features_level->value('2');
-		$this->byName('update')->click();
-		// Page reloaded, we need a new XPath
-		$main_features_level = $this->byXPath($main_features_level_path);
-		return $this->assertEquals('2', $main_features_level->value(), "MAIN_FEATURES_LEVEL value is 2");
-	}
-
-	/**
-	 * Test enabling the module
-	 *
-	 * @depends testEnableDeveloperMode
-	 * @return bool
-	 */
-	public function testModuleEnabled()
-	{
-		$this->url('/admin/modules.php');
-		$this->authenticate();
-		$module_status_image_path = '//a[contains(@href, "'.self::$module_id.'")]/img';
-		$module_status_image = $this->byXPath($module_status_image_path);
-		if (strstr($module_status_image->attribute('src'), 'switch_off.png')) {
-			// Enable the module
-			$this->byHref('modKnowledgeManagement')->click();
-		} else {
-			// Disable the module
-			$this->byHref('modKnowledgeManagement')->click();
-			// Reenable the module
-			$this->byHref('modKnowledgeManagement')->click();
-		}
-		// Page reloaded, we need a new Xpath
-		$module_status_image = $this->byXPath($module_status_image_path);
-		return $this->assertContains('switch_on.png', $module_status_image->attribute('src'), "Module enabled");
-	}
-
-	/**
-	 * Test access to the configuration page
-	 *
-	 * @depends testModuleEnabled
-	 * @return bool
-	 */
-	public function testConfigurationPage()
-	{
-		$this->url('/custom/knowledgemanagement/admin/setup.php');
-		$this->authenticate();
-		return $this->assertContains('knowledgemanagement/admin/setup.php', $this->url(), 'Configuration page');
-	}
-
-	/**
-	 * Test access to the about page
-	 *
-	 * @depends testConfigurationPage
-	 * @return bool
-	 */
-	public function testAboutPage()
-	{
-		$this->url('/custom/knowledgemanagement/admin/about.php');
-		$this->authenticate();
-		return $this->assertContains('knowledgemanagement/admin/about.php', $this->url(), 'About page');
-	}
-
-	/**
-	 * Test about page is rendering Markdown
-	 *
-	 * @depends testAboutPage
-	 * @return bool
-	 */
-	public function testAboutPageRendersMarkdownReadme()
-	{
-		$this->url('/custom/knowledgemanagement/admin/about.php');
-		$this->authenticate();
-		return $this->assertEquals(
-			'Dolibarr Module Template (aka My Module)',
-			$this->byTag('h1')->text(),
-			"Readme title"
-		);
-	}
-
-	/**
-	 * Test box is properly declared
-	 *
-	 * @depends testModuleEnabled
-	 * @return bool
-	 */
-	public function testBoxDeclared()
-	{
-		$this->url('/admin/boxes.php');
-		$this->authenticate();
-		return $this->assertContains('knowledgemanagementwidget1', $this->source(), "Box enabled");
-	}
-
-	/**
-	 * Test trigger is properly enabled
-	 *
-	 * @depends testModuleEnabled
-	 * @return bool
-	 */
-	public function testTriggerDeclared()
-	{
-		$this->url('/admin/triggers.php');
-		$this->authenticate();
-		return $this->assertContains(
-			'interface_99_modKnowledgeManagement_KnowledgeManagementTriggers.class.php',
-			$this->byTag('body')->text(),
-			"Trigger declared"
-		);
-	}
-
-	/**
-	 * Test trigger is properly declared
-	 *
-	 * @depends testTriggerDeclared
-	 * @return bool
-	 */
-	public function testTriggerEnabled()
-	{
-		$this->url('/admin/triggers.php');
-		$this->authenticate();
-		return $this->assertContains(
-			'tick.png',
-			$this->byXPath('//td[text()="interface_99_modKnowledgeManagement_MyTrigger.class.php"]/following::img')->attribute('src'),
-			"Trigger enabled"
-		);
-	}
-
-	/**
-	 * Verify post conditions
-	 * @return void
-	 */
-	protected function assertPostConditions()
-	{
-	}
-
-	/**
-	 * Unit test teardown
-	 * @return void
-	 */
-	public function tearDown()
-	{
-	}
-
-	/**
-	 * Global test teardown
-	 * @return void
-	 */
-	public static function tearDownAfterClass()
-	{
-	}
-}
diff --git a/htdocs/knowledgemanagement/langs/en_US/knowledgemanagement.lang b/htdocs/langs/en_US/knowledgemanagement.lang
similarity index 86%
rename from htdocs/knowledgemanagement/langs/en_US/knowledgemanagement.lang
rename to htdocs/langs/en_US/knowledgemanagement.lang
index 91cc43857c6..91df84c01a4 100644
--- a/htdocs/knowledgemanagement/langs/en_US/knowledgemanagement.lang
+++ b/htdocs/langs/en_US/knowledgemanagement.lang
@@ -28,8 +28,6 @@ ModuleKnowledgeManagementDesc = Knowledge Management description
 KnowledgeManagementSetup = Knowledge Management setup
 Settings = Settings
 KnowledgeManagementSetupPage = Knowledge Management setup page
-KNOWLEDGEMANAGEMENT_MYPARAM1 = My param 1
-KNOWLEDGEMANAGEMENT_MYPARAM1Tooltip = My param 1 tooltip
 
 
 #
@@ -44,11 +42,6 @@ KnowledgeManagementAboutPage = Knowledge Management about page
 #
 KnowledgeManagementArea = Knowledge Management
 
-#
-# Sample widget
-#
-MyWidget = My widget
-MyWidgetDescription = My widget description
 
 #
 # Menu
@@ -58,4 +51,5 @@ ListKnowledgeRecord = List
 NewKnowledgeRecord = New knowledge record
 Reply = Reply
 KnowledgeRecords = knowledge record
-KnowledgeRecord = knowledge record
\ No newline at end of file
+KnowledgeRecord = knowledge record
+KnowledgeRecordExtraFields = Extrafields for Knowledge Records
\ No newline at end of file
diff --git a/htdocs/knowledgemanagement/langs/fr_FR/knowledgemanagement.lang b/htdocs/langs/fr_FR/knowledgemanagement.lang
similarity index 92%
rename from htdocs/knowledgemanagement/langs/fr_FR/knowledgemanagement.lang
rename to htdocs/langs/fr_FR/knowledgemanagement.lang
index 15705d3db54..5159492c013 100644
--- a/htdocs/knowledgemanagement/langs/fr_FR/knowledgemanagement.lang
+++ b/htdocs/langs/fr_FR/knowledgemanagement.lang
@@ -55,4 +55,5 @@ ListKnowledgeRecord = Liste
 NewKnowledgeRecord = Nouveau registre de connaissance
 Reply = Répondre
 KnowledgeRecords = registres de connaissances
-KnowledgeRecord = registre de connaissances
\ No newline at end of file
+KnowledgeRecord = registre de connaissances
+KnowledgeRecordExtraFields = Attributs supplémentaires pour les registres de connaissance
\ No newline at end of file
diff --git a/test/phpunit/knowledgerecordTest.php b/test/phpunit/knowledgerecordTest.php
new file mode 100644
index 00000000000..b88c2f1f3fe
--- /dev/null
+++ b/test/phpunit/knowledgerecordTest.php
@@ -0,0 +1,192 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 SuperAdmin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    test/phpunit/KnowledgeRecordTest.php
+ * \ingroup knowledgemanagement
+ * \brief   PHPUnit test for KnowledgeRecord class.
+ */
+
+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/knowledgemanagement/class/knowledgerecord.class.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;
+
+$langs->load("main");
+
+
+/**
+ * Class KnowledgeRecordTest
+ * @package Testknowledgemanagement
+ */
+class KnowledgeRecordTest extends \PHPUnit\Framework\TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return KnowledgeRecord
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		//$this->sharedFixture
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+	/**
+	 * Global test setup
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf, $user, $langs, $db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * Unit test setup
+	 * @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";
+	}
+
+	/**
+	 * Unit test teardown
+	 * @return void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * Global test teardown
+	 * @return void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf, $user, $langs, $db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+	}
+
+
+	/**
+	 * A sample test
+	 *
+	 * @return bool
+	 */
+	public function testSomething()
+	{
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$result = true;
+
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result);
+
+		return $result;
+	}
+
+	/**
+	 * testKnowledgeRecordCreate
+	 *
+	 * @return int
+	 */
+	public function testKnowledgeRecordCreate()
+	{
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new KnowledgeRecord($this->savdb);
+		$localobject->initAsSpecimen();
+		$result = $localobject->create($user);
+
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+
+		return $result;
+	}
+
+	/**
+	 * testKnowledgeRecordDelete
+	 *
+	 * @param	int		$id		Id of object
+	 * @return	int
+	 *
+	 * @depends	testKnowledgeRecordCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testKnowledgeRecordDelete($id)
+	{
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new KnowledgeRecord($this->savdb);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
+
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
+}

From bc61fdd4878522488ff13c5357c32dbab1a80cde Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Wed, 28 Apr 2021 14:58:13 +0200
Subject: [PATCH 418/928] Missing $

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

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 222d34d38d9..6235ea1fa5b 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1883,7 +1883,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				// Validate
-				if (Adherent::STATUS_DRAFT == object->statut) {
+				if (Adherent::STATUS_DRAFT == $object->statut) {
 					if ($user->rights->adherent->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate").'</a></div>'."\n";
 					} else {

From 6dcee425a1850c8802eede4a4835129643bbd430 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 15:07:31 +0200
Subject: [PATCH 419/928] Update card.php

---
 htdocs/comm/propal/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 99a6f759206..af88178fe27 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -305,9 +305,9 @@ if (empty($reshook))
 
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		elseif ($result < 0)
-			dol_print_error($db, $object->error);
 	} elseif ($action == 'setdate_livraison' && $usercancreate)
 	{
 		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));

From 4926ac1e24f8f04e5ed7d7a7bf10284390c500dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 15:25:06 +0200
Subject: [PATCH 420/928] Fix make protected method not visible

---
 htdocs/api/class/api.class.php                             | 4 +++-
 htdocs/comm/action/class/api_agendaevents.class.php        | 4 ++--
 htdocs/compta/bank/class/api_bankaccounts.class.php        | 4 ++--
 htdocs/modulebuilder/template/class/api_mymodule.class.php | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 6cb40825ee7..c760903aca4 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -72,6 +72,7 @@ class DolibarrApi
 		//$this->r->setSupportedFormats('jsonFormat');
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Check and convert a string depending on its type/name.
 	 *
@@ -82,8 +83,9 @@ class DolibarrApi
 	 * @param	stdClass	$object		Object
 	 * @return 	string					Value cleaned
 	 */
-	protected function checkValForAPI($field, $value, $object)
+	protected function _checkValForAPI($field, $value, $object)
 	{
+		// phpcs:enable
 		// TODO Use type detected in $object->fields
 		if (in_array($field, array('note', 'note_private', 'note_public', 'desc', 'description'))) {
 			return checkVal($value, 'restricthtml');
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 68da91d6ce2..c2961db7bbb 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -217,7 +217,7 @@ class AgendaEvents extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
-			$this->actioncomm->$field = $this->checkValForAPI($field, $value, $this->actioncomm);
+			$this->actioncomm->$field = $this->_checkValForAPI($field, $value, $this->actioncomm);
 		}
 		/*if (isset($request_data["lines"])) {
 		  $lines = array();
@@ -270,7 +270,7 @@ class AgendaEvents extends DolibarrApi
 				continue;
 			}
 
-			$this->actioncomm->$field = $this->checkValForAPI($field, $value, $this->actioncomm);
+			$this->actioncomm->$field = $this->_checkValForAPI($field, $value, $this->actioncomm);
 		}
 
 		if ($this->actioncomm->update(DolibarrApiAccess::$user, 1) > 0) {
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 4afeac70124..762bcc506da 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -157,7 +157,7 @@ class BankAccounts extends DolibarrApi
 
 		$account = new Account($this->db);
 		foreach ($request_data as $field => $value) {
-			$account->$field = $this->checkValForAPI($field, $value, $account);
+			$account->$field = $this->_checkValForAPI($field, $value, $account);
 		}
 		// Date of the initial balance (required to create an account).
 		$account->date_solde = time();
@@ -332,7 +332,7 @@ class BankAccounts extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
-			$account->$field = $this->checkValForAPI($field, $value, $account);
+			$account->$field = $this->_checkValForAPI($field, $value, $account);
 		}
 
 		if ($account->update(DolibarrApiAccess::$user) > 0) {
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index e4b5fcca219..769c1529aff 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -213,7 +213,7 @@ class MyModuleApi extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
-			$this->myobject->$field = $this->checkValForAPI($field, $value, $this->myobject);
+			$this->myobject->$field = $this->_checkValForAPI($field, $value, $this->myobject);
 		}
 
 		// Clean data
@@ -255,7 +255,7 @@ class MyModuleApi extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
-			$this->myobject->$field = $this->checkValForAPI($field, $value, $this->myobject);
+			$this->myobject->$field = $this->_checkValForAPI($field, $value, $this->myobject);
 		}
 
 		// Clean data

From d753ef6393cf58c035f5b4df55695420f208e838 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 28 Apr 2021 15:28:00 +0200
Subject: [PATCH 421/928] edit of modKnowledgeManagement.class

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

diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index cce60d613e8..4441350aaea 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -291,7 +291,7 @@ class modKnowledgeManagement extends DolibarrModules
 			'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'=>'ModuleKnowledgeManagementName',
-			'prefix' => img_picto('', 'mrp', 'class="paddingright pictofixedwidth"'),
+			'prefix' => img_picto('knowledgemanagement', 'knowledgemanagement', 'class="paddingright pictofixedwidth"'),
 			'mainmenu'=>'knowledgemanagement',
 			'leftmenu'=>'',
 			'url'=>'/knowledgemanagement/knowledgerecord_list.php',

From b4d0549017a696c4bf4d58450af2ceec26eb9b39 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 16:00:59 +0200
Subject: [PATCH 422/928] Clean deprecated var

---
 htdocs/conf/conf.php.example | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 2d14e0e56fb..fba3e1004f4 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -341,7 +341,6 @@ $dolibarr_cron_allow_cli='0';
 //$dolibarr_js_CKEDITOR='/javascript/ckeditor';
 //$dolibarr_js_JQUERY='/javascript/jquery';
 //$dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
-//$dolibarr_js_JQUERY_FLOT='/javascript/flot';
 // Value to overwrite some path to use font instead of embedded one
 //$dolibarr_font_DOL_DEFAULT_TTF="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf";
 //$dolibarr_font_DOL_DEFAULT_TTF_BOLD="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf";

From 0108826ee58cc3207c839acdf3aee9b0f5a5f8a5 Mon Sep 17 00:00:00 2001
From: antonin_tdj <50403308+ibuiv@users.noreply.github.com>
Date: Wed, 28 Apr 2021 16:03:40 +0200
Subject: [PATCH 423/928] add column instead of just add

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 652be6ec035..3c21284363a 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -437,5 +437,5 @@ ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity
 UPDATE llx_const SET value = 'github' WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
 
 -- For MultiCompany PMP per entity
-ALTER TABLE llx_product_perentity ADD pmp FLOAT NULL DEFAULT NULL AFTER accountancy_code_buy_export
+ALTER TABLE llx_product_perentity ADD COLUMN pmp FLOAT NULL DEFAULT NULL AFTER accountancy_code_buy_export
 

From d6b936dd6ecb9d08abeaa5fe7682e8966fdd78b0 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Wed, 28 Apr 2021 16:36:15 +0200
Subject: [PATCH 424/928] add lifetime and qc_frequency in product card

---
 htdocs/product/card.php | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index f3dc87f41ba..b715bab29c2 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -473,6 +473,8 @@ if (empty($reshook)) {
 				$object->customcode             = GETPOST('customcode', 'alpha');
 				$object->country_id = GETPOST('country_id', 'int');
 				$object->state_id = GETPOST('state_id', 'int');
+				$object->lifetime = GETPOST('lifetime', 'int');
+				$object->qc_frequency = GETPOST('qc_frequency', 'int');
 				$object->status                 = GETPOST('statut', 'int');
 				$object->status_buy             = GETPOST('statut_buy', 'int');
 				$object->status_batch = GETPOST('status_batch', 'aZ09');
@@ -1535,7 +1537,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$object->country = $tmparray['label'];
 			}
 
-
 			$type = $langs->trans('Product');
 			if ($object->isService()) {
 				$type = $langs->trans('Service');
@@ -1604,10 +1605,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$tooltip .= $langs->trans("GenericMaskCodes5");
 						print '<td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
 						if ($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
-							$mask = !is_empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
+							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
 						}
 						if ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
-							$mask = !is_empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
+							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
 						}
 						$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
 						$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
@@ -1798,6 +1799,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</tr>';
 			}
 
+			// Traceability
+			if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+				print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth100onsmartphone" value="'.$object->lifetime.'"></td></tr>';
+				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth100onsmartphone" value="'.$object->qc_frequency.'"></td></tr>';
+			}
+
 			// 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
@@ -2275,6 +2282,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td>';
 			}
 
+			// Traceability
+			if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+				print '<tr><td>'.$langs->trans("LifeTime").'</td><td colspan="2">'.$object->lifetime.' ';
+				!empty($object->lifetime) ? print $langs->trans('Days') : print '';
+				print '</td></tr>';
+				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td colspan="2">'.$object->qc_frequency.' ';
+				!empty($object->qc_frequency) ? print $langs->trans('Days') : print '';
+				print '</td></tr>';
+			}
+
 			// Other attributes
 			$parameters = array('colspan' => ' colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'"', 'cols' => (2 + (($showphoto || $showbarcode) ? 1 : 0)));
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';

From a12b6394be2fb0b7e4d8a4d8cf6549154efe41fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 16:41:37 +0200
Subject: [PATCH 425/928] Better error message

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9e234559aad..ce1cd69496e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3897,7 +3897,7 @@ class Societe extends CommonObject
 				$state_code = $tmp[1];
 				$state_label = $tmp[2];
 			} else { // For backward compatibility
-				dol_syslog("Your state setup use an old syntax (entity=".$conf->entity."). Reedit it using setup area.", LOG_ERR);
+				dol_syslog("Your setup of State an old syntax (entity=".$conf->entity."). Go in Home - Setup - Organization then Save should remove this error.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 				$state_code = getState($state_id, 2, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
 				$state_label = getState($state_id, 0, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore

From 82ae633617273ab004ae8823f23e104dd90fcb27 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Wed, 28 Apr 2021 17:08:17 +0200
Subject: [PATCH 426/928] lifetime and qc_frequency now treated in add and
 update

---
 htdocs/product/card.php                | 6 ++++--
 htdocs/product/class/product.class.php | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index b715bab29c2..f0bfd090eaa 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -332,6 +332,8 @@ if (empty($reshook)) {
 			$object->customcode              = GETPOST('customcode', 'alphanohtml');
 			$object->country_id = GETPOST('country_id', 'int');
 			$object->state_id = GETPOST('state_id', 'int');
+			$object->lifetime               = GETPOST('lifetime', 'int');
+			$object->qc_frequency           = GETPOST('qc_frequency', 'int');
 			$object->duration_value     	 = $duration_value;
 			$object->duration_unit      	 = $duration_unit;
 			$object->fk_default_warehouse	 = GETPOST('fk_default_warehouse');
@@ -473,8 +475,8 @@ if (empty($reshook)) {
 				$object->customcode             = GETPOST('customcode', 'alpha');
 				$object->country_id = GETPOST('country_id', 'int');
 				$object->state_id = GETPOST('state_id', 'int');
-				$object->lifetime = GETPOST('lifetime', 'int');
-				$object->qc_frequency = GETPOST('qc_frequency', 'int');
+				$object->lifetime               = GETPOST('lifetime', 'int');
+				$object->qc_frequency           = GETPOST('qc_frequency', 'int');
 				$object->status                 = GETPOST('statut', 'int');
 				$object->status_buy             = GETPOST('statut_buy', 'int');
 				$object->status_batch = GETPOST('status_batch', 'aZ09');
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 6ed0b4266a8..9eea64a6b03 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1092,6 +1092,8 @@ class Product extends CommonObject
 			$sql .= ", customcode = '".$this->db->escape($this->customcode)."'";
 			$sql .= ", fk_country = ".($this->country_id > 0 ? (int) $this->country_id : 'null');
 			$sql .= ", fk_state = ".($this->state_id > 0 ? (int) $this->state_id : 'null');
+			$sql .= ", lifetime = ".($this->lifetime > 0 ? (int) $this->lifetime : 'null');
+			$sql .= ", qc_frequency = ".($this->qc_frequency > 0 ? (int) $this->qc_frequency : 'null');
 			$sql .= ", note = ".(isset($this->note) ? "'".$this->db->escape($this->note)."'" : 'null');
 			$sql .= ", duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."'";
 			if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
@@ -2171,7 +2173,7 @@ class Product extends CommonObject
 			return -1;
 		}
 
-		$sql = "SELECT p.rowid, p.ref, p.ref_ext, p.label, p.description, p.url, p.note_public, p.note as note_private, p.customcode, p.fk_country, p.fk_state, p.price, p.price_ttc,";
+		$sql = "SELECT p.rowid, p.ref, p.ref_ext, p.label, p.description, p.url, p.note_public, p.note as note_private, p.customcode, p.fk_country, p.fk_state, p.lifetime, p.qc_frequency, p.price, p.price_ttc,";
 		$sql .= " p.price_min, p.price_min_ttc, p.price_base_type, p.cost_price, p.default_vat_code, p.tva_tx, p.recuperableonly as tva_npr, p.localtax1_tx, p.localtax2_tx, p.localtax1_type, p.localtax2_type, p.tosell,";
 		$sql .= " p.tobuy, p.fk_product_type, p.duration, p.fk_default_warehouse, p.seuil_stock_alerte, p.canvas, p.net_measure, p.net_measure_units, p.weight, p.weight_units,";
 		$sql .= " p.length, p.length_units, p.width, p.width_units, p.height, p.height_units,";
@@ -2227,6 +2229,8 @@ class Product extends CommonObject
 				$this->country_id                    = $obj->fk_country;
 				$this->country_code = getCountry($this->country_id, 2, $this->db);
 				$this->state_id = $obj->fk_state;
+				$this->lifetime                     = $obj->lifetime;
+				$this->qc_frequency                 = $obj->qc_frequency;
 				$this->price                        = $obj->price;
 				$this->price_ttc                    = $obj->price_ttc;
 				$this->price_min                    = $obj->price_min;

From d9d7019de465c267c690d8ab2d35b774b1c7b3df Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 17:12:34 +0200
Subject: [PATCH 427/928] Clean page

---
 htdocs/takepos/admin/other.php | 39 +---------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index f933472a443..e5114a446bd 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -61,44 +61,7 @@ if ($resql) {
  * Actions
  */
 
-if (GETPOST('action', 'alpha') == 'set') {
-	$db->begin();
-
-	$res = dolibarr_set_const($db, "CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_ROOT_CATEGORY_ID", GETPOST('TAKEPOS_ROOT_CATEGORY_ID', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_BAR_RESTAURANT", GETPOST('TAKEPOS_BAR_RESTAURANT', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_TICKET_VAT_GROUPPED", GETPOST('TAKEPOS_TICKET_VAT_GROUPPED', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTERS", GETPOST('TAKEPOS_ORDER_PRINTERS', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_NOTES", GETPOST('TAKEPOS_ORDER_NOTES', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_PHONE_BASIC_LAYOUT", GETPOST('TAKEPOS_PHONE_BASIC_LAYOUT', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS", GETPOST('TAKEPOS_SUPPLEMENTS', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS_CATEGORY", GETPOST('TAKEPOS_SUPPLEMENTS_CATEGORY', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_NUMPAD", GETPOST('TAKEPOS_NUMPAD', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_SORTPRODUCTFIELD", GETPOST('TAKEPOS_SORTPRODUCTFIELD', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_COLOR_THEME", GETPOST('TAKEPOS_COLOR_THEME', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_NUM_TERMINALS", GETPOST('TAKEPOS_NUM_TERMINALS', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_DIRECT_PAYMENT", GETPOST('TAKEPOS_DIRECT_PAYMENT', 'int'), 'int', 0, '', $conf->entity);
-	//$res = dolibarr_set_const($db, "TAKEPOS_HEAD_BAR", GETPOST('TAKEPOS_HEAD_BAR', 'int'), 'int', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_EMAIL_TEMPLATE_INVOICE", GETPOST('TAKEPOS_EMAIL_TEMPLATE_INVOICE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!empty($conf->global->TAKEPOS_ENABLE_SUMUP)) {
-		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity);
-		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity);
-	}
-
-	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
-
-	if (!($res > 0)) {
-		$error++;
-	}
-
-	if (!$error) {
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	} else {
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
+// Nothing
 
 
 /*

From 6ff9a3c922b074ff7423ab1fd4f26b81b0a87954 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 17:13:43 +0200
Subject: [PATCH 428/928] Fix trans

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

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 4bcf8439271..e96592622a3 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -58,7 +58,7 @@ BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
 TakeposNeedsCategories=TakePOS needs at least one product categorie to work
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Printing the receipt will set all items to 'Order confirmed' 
+OrderNotes=Can add some notes to each ordered items 
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts

From 6b3024b153ce88ea8f5c5e2ff27405a46b71b3d9 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Wed, 28 Apr 2021 17:29:52 +0200
Subject: [PATCH 429/928] statut is not status in adherent class

---
 htdocs/adherents/class/adherent.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 54589a049ff..d43a139c6c7 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -208,7 +208,7 @@ class Adherent extends CommonObject
 
 	// -2:excluded, -1:draft, 0:resiliated, >=1:valided,payed
 	// def in common object
-	//public $status;
+	public $statut = $this->status; // TODO modify to set statut as deprecated
 
 	/**
 	 * @var string photo of member
@@ -357,7 +357,8 @@ class Adherent extends CommonObject
 	public function __construct($db)
 	{
 		$this->db = $db;
-		$this->statut = self::STATUS_DRAFT; // shouldn't this be $status ?
+		$this->statut = self::STATUS_DRAFT; 
+		$this->status = $this->statut;
 		// l'adherent n'est pas public par defaut
 		$this->public = 0;
 		// les champs optionnels sont vides

From 95389b4f57a067aa999f34db3cdbbbff38c7c5de Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 28 Apr 2021 15:33:37 +0000
Subject: [PATCH 430/928] Fixing style errors.

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

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index d43a139c6c7..4f0d2caa430 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -357,7 +357,7 @@ class Adherent extends CommonObject
 	public function __construct($db)
 	{
 		$this->db = $db;
-		$this->statut = self::STATUS_DRAFT; 
+		$this->statut = self::STATUS_DRAFT;
 		$this->status = $this->statut;
 		// l'adherent n'est pas public par defaut
 		$this->public = 0;

From 27389856891fb29e0dc8bbf3f41b24e6517a8d35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 17:53:05 +0200
Subject: [PATCH 431/928] Fix translation

---
 htdocs/langs/en_US/cashdesk.lang |  5 +++--
 htdocs/takepos/admin/bar.php     | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index e96592622a3..2aa9a1ba0b2 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -83,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 863b6eda42c..2fe8f984f2e 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -137,6 +137,20 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 		print ajax_constantonoff("TAKEPOS_ORDER_NOTES", array(), $conf->entity, 0, 0, 1, 0);
 		//print $form->selectyesno("TAKEPOS_ORDER_NOTES", $conf->global->TAKEPOS_ORDER_NOTES, 1);
 		print '</td></tr>';
+	} else {
+		print '<tr class="oddeven value"><td>';
+		print $langs->trans("OrderPrinters");
+		print '</td>';
+		print '<td class="center">';
+		print '<span class="opacitymedium">'.$langs->trans("NotAvailableWithBrowserPrinter").'</span>';
+		print '</td></tr>';
+
+		print '<tr class="oddeven value"><td>';
+		print $langs->trans("OrderNotes");
+		print '</td>';
+		print '<td class="center">';
+		print '<span class="opacitymedium">'.$langs->trans("NotAvailableWithBrowserPrinter").'</span>';
+		print '</td></tr>';
 	}
 
 	print '<tr class="oddeven value"><td>';

From ea5493be87aec733722b07d3481826d05d382c33 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Wed, 28 Apr 2021 17:54:47 +0200
Subject: [PATCH 432/928] Update adherent.class.php

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

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 4f0d2caa430..7fdc548efa7 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -208,7 +208,7 @@ class Adherent extends CommonObject
 
 	// -2:excluded, -1:draft, 0:resiliated, >=1:valided,payed
 	// def in common object
-	public $statut = $this->status; // TODO modify to set statut as deprecated
+	public $statut; // TODO modify to set statut as deprecated
 
 	/**
 	 * @var string photo of member

From 8dd331d461b59de6828f4087b47f194b06b14a25 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 28 Apr 2021 17:55:03 +0200
Subject: [PATCH 433/928] Add ORDER CREATE trigger for notificiation

---
 .../triggers/interface_50_modNotification_Notification.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 18c27a8e36e..7d315f142a7 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -34,6 +34,7 @@ class InterfaceNotification extends DolibarrTriggers
 	public $listofmanagedevents = array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',
+		'ORDER_CREATE',
 		'ORDER_VALIDATE',
 		'PROPAL_VALIDATE',
 		'PROPAL_CLOSE_SIGNED',

From 2dc597f5d06d10986ed3a34cee4c49c53836e0b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 18:04:00 +0200
Subject: [PATCH 434/928] Make setup easier to understand

---
 htdocs/admin/receiptprinter.php  | 15 +++++++--------
 htdocs/core/lib/takepos.lib.php  |  4 ++--
 htdocs/langs/en_US/cashdesk.lang |  2 +-
 htdocs/takepos/admin/receipt.php |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 704473ac597..f1b74146c5e 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -431,7 +431,9 @@ if ($mode == 'template' && $user->admin) {
 				print '<td>';
 				print '<textarea name="template" wrap="soft" cols="120" rows="12">'.$printer->listprinterstemplates[$line]['template'].'</textarea>';
 				print '</td>';
-				print '<td></td>';
+				print '<td>';
+				print '<div class="center"><input type="submit" class="button button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+				print '</td>';
 			} else {
 				print '<td>'.$printer->listprinterstemplates[$line]['name'].'</td>';
 				print '<td>'.dol_htmlentitiesbr($printer->listprinterstemplates[$line]['template']).'</td>';
@@ -459,18 +461,15 @@ if ($mode == 'template' && $user->admin) {
 		print '<textarea name="template" wrap="soft" cols="120" rows="12">';
 		print '</textarea>';
 		print '</td>';
-		print '<td></td>';
+		print '<td>';
+		print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
+		print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
+		print '</td>';
 		print '</tr>';
 	}
 
 	print '</table>';
 
-	if ($action != 'edittemplate') {
-		print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
-		print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
-	} else {
-		print '<div class="center"><input type="submit" class="button button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
-	}
 	print '</form>';
 
 	print dol_get_fiche_end();
diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index db1623387c1..d983f0298ce 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -44,7 +44,7 @@ function takepos_admin_prepare_head()
 	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/receipt.php';
-	$head[$h][1] = $langs->trans("Receipt");
+	$head[$h][1] = $langs->trans("Printers").' / '.$langs->trans("Receipt");
 	$head[$h][2] = 'receipt';
 	$h++;
 
@@ -62,7 +62,7 @@ function takepos_admin_prepare_head()
 	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/other.php';
-	$head[$h][1] = $langs->trans("Other");
+	$head[$h][1] = $langs->trans("About");
 	$head[$h][2] = 'other';
 	$h++;
 
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 2aa9a1ba0b2..836baf01135 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -94,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print if the server of application is hosted in the Cloud.
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 8c201949034..ced9787899c 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -150,7 +150,7 @@ print '</table>';
 print '</div>';
 
 
-print load_fiche_titre($langs->trans("Setup"), '', '');
+print load_fiche_titre($langs->trans("Receipt"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';

From d4651c4721daccb65701da59d9a7bf85f865bd7f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 18:32:49 +0200
Subject: [PATCH 435/928] Fix trad

---
 htdocs/langs/en_US/cashdesk.lang  |  2 +-
 htdocs/takepos/admin/bar.php      |  2 ++
 htdocs/takepos/admin/receipt.php  | 23 +++++++++++++----------
 htdocs/takepos/admin/terminal.php |  6 ++++++
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 836baf01135..47bf937a90e 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -94,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print if the server of application is hosted in the Cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 2fe8f984f2e..d330e792f53 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -105,8 +105,10 @@ function Floors() {
 
 <?php
 
+print '<center>';
 print $langs->trans("EnableBarOrRestaurantFeatures");
 print ajax_constantonoff("TAKEPOS_BAR_RESTAURANT", array(), $conf->entity, 0, 0, 1, 0);
+print '</center>';
 
 print '<br>';
 
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index ced9787899c..9b236fc837a 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -118,8 +118,12 @@ print '<tr class="oddeven"><td>';
 print $langs->trans('DolibarrReceiptPrinter');
 print '<td>';
 print $langs->trans('ReceiptPrinterMethodDescription');
-print '<br>';
-print '<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php">'.$langs->trans("Setup").'</a>';
+if ($conf->receiptprinter->enabled) {
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+		print '<br>';
+		print img_picto('', 'printer', 'class="paddingright"').'<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php">'.$langs->trans("Setup").'</a>';
+	}
+}
 print '</td><td class="right">';
 if ($conf->receiptprinter->enabled) {
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
@@ -139,6 +143,13 @@ print '<tr class="oddeven"><td>';
 print "TakePOS Connector";
 print '<td>';
 print $langs->trans('TakeposConnectorMethodDescription');
+
+if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
+	print '<br>';
+	print $langs->trans("URL")." / ".$langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector" target="_blank">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
+	print ' <input type="text" class="minwidth200" id="TAKEPOS_PRINT_SERVER" name="TAKEPOS_PRINT_SERVER" value="'.$conf->global->TAKEPOS_PRINT_SERVER.'">';
+}
+
 print '</td><td class="right">';
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 	print img_picto($langs->trans("Activated"), 'switch_on');
@@ -166,14 +177,6 @@ print ajax_constantonoff("TAKEPOS_TICKET_VAT_GROUPPED", array(), $conf->entity,
 //print $form->selectyesno("TAKEPOS_TICKET_VAT_GROUPPED", $conf->global->TAKEPOS_TICKET_VAT_GROUPPED, 1);
 print "</td></tr>\n";
 
-if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
-	print '<tr class="oddeven value"><td>';
-	print $langs->trans("URL")." / ".$langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector" target="_blank">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
-	print '<td colspan="2">';
-	print '<input type="text" size="20" id="TAKEPOS_PRINT_SERVER" name="TAKEPOS_PRINT_SERVER" value="'.$conf->global->TAKEPOS_PRINT_SERVER.'">';
-	print '</td></tr>';
-}
-
 if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 	$substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
 	$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 52f451ae163..922a5c5032c 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -152,6 +152,7 @@ $atleastonefound = 0;
 if (!empty($conf->banque->enabled)) {
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 	print '<td>';
+	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 0, "courant=2", 1);
 	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse})) {
 		$atleastonefound++;
@@ -159,6 +160,7 @@ if (!empty($conf->banque->enabled)) {
 	print '</td></tr>';
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
 	print '<td>';
+	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 0, "courant=1", 1);
 	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse})) {
 		$atleastonefound++;
@@ -166,6 +168,7 @@ if (!empty($conf->banque->enabled)) {
 	print '</td></tr>';
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
 	print '<td>';
+	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 0, "courant=1", 1);
 	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse})) {
 		$atleastonefound++;
@@ -174,6 +177,7 @@ if (!empty($conf->banque->enabled)) {
 	if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
 		print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSumup").'</td>';
 		print '<td>';
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 		$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 0, "courant=1", 1);
 		if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse})) {
 			$atleastonefound++;
@@ -192,6 +196,7 @@ if (!empty($conf->banque->enabled)) {
 			$atleastonefound++;
 		}
 		$cour = preg_match('/^LIQ.*/', $modep->code) ? 2 : 1;
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 		$form->select_comptes($conf->global->$name, $name, 0, "courant=".$cour, 1);
 		print '</td></tr>';
 	}
@@ -217,6 +222,7 @@ if (!empty($conf->stock->enabled)) {
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>'; // Force warehouse (this is not a default value)
 	print '<td class="minwidth300">';
 	if (!$disabled) {
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 		print $formproduct->selectWarehouses($conf->global->{'CASHDESK_ID_WAREHOUSE'.$terminal}, 'CASHDESK_ID_WAREHOUSE'.$terminal, '', 1, $disabled, 0, '', 0, 0, array(), 'maxwidth250');
 		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?&terminal='.$terminal).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 	} else {

From 18e911a6364db16c1cd0a7f8c32e38a9a5f9fed2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 20:44:22 +0200
Subject: [PATCH 436/928] FIX dol_print_date for %a and %b with some Timezone

---
 htdocs/core/lib/functions.lib.php  | 11 ++++++-----
 htdocs/projet/activity/perday.php  | 21 ++++++++++++---------
 htdocs/projet/activity/perweek.php | 11 +++++++++--
 htdocs/takepos/index.php           |  2 +-
 test/phpunit/DateLibTest.php       | 11 +++++++++++
 5 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d4b94deba51..79f36b1dbcd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2197,8 +2197,8 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 			if ($tzoutput == 'tzserver') {
 				$to_gmt = false;
 				$offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'
-				$offsettz = 0;
-				$offsetdst = 0;
+				$offsettz = 0;	// Timezone offset with server timezone, so 0
+				$offsetdst = 0;	// Dst offset with server timezone, so 0
 			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {
 				$to_gmt = true;
 				$offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'
@@ -2308,7 +2308,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		if ($time < 100000000000) {	// Protection against bad date values
 			$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
-			$ret = adodb_strftime($format, $timetouse, $to_gmt);
+			$ret = adodb_strftime($format, $timetouse, $to_gmt);	// If to_gmt = false then adodb_strftime use TZ of server
 		} else {
 			$ret = 'Bad value '.$time.' for date';
 		}
@@ -2318,7 +2318,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 		// Here ret is string in PHP setup language (strftime was used). Now we convert to $outputlangs.
-		$month = adodb_strftime('%m', $timetouse, true);
+		$month = adodb_strftime('%m', $timetouse, $to_gmt);		// If to_gmt = false then adodb_strftime use TZ of server
 		$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);
@@ -2334,9 +2334,10 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		//return $ret;
 	}
 	if (preg_match('/__a__/i', $format)) {
+		//print "time=$time offsettz=$offsettz offsetdst=$offsetdst offsettzstring=$offsettzstring";
 		$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
-		$w = adodb_strftime('%w', $timetouse, true); // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+		$w = adodb_strftime('%w', $timetouse, $to_gmt);		// If to_gmt = false then adodb_strftime use TZ of server
 		$dayweek = $outputlangs->transnoentitiesnoconv('Day'.$w);
 		$ret = str_replace('__A__', $dayweek, $ret);
 		$ret = str_replace('__a__', dol_substr($dayweek, 0, 3), $ret);
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 3c67673ad49..b0195200dd5 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -81,13 +81,16 @@ $monthofday = GETPOST('addtimemonth');
 $dayofday = GETPOST('addtimeday');
 $yearofday = GETPOST('addtimeyear');
 
-$daytoparse = $now;
-if ($yearofday && $monthofday && $dayofday) {
-	$daytoparse = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday); // xxxofday is value of day after submit action 'addtime'
-} elseif ($year && $month && $day) {
-	$daytoparse = dol_mktime(0, 0, 0, $month, $day, $year); // this are value submited after submit of action 'submitdateselect'
-}
+/*var_dump(GETPOST('remonth'));
+var_dump(GETPOST('button_search_x'));
+var_dump(GETPOST('button_addtime'));*/
 
+$daytoparse = $now;
+if ($year && $month && $day) {
+	$daytoparse = dol_mktime(0, 0, 0, $month, $day, $year); // this are value submited after submit of action 'submitdateselect'
+} elseif ($yearofday && $monthofday && $dayofday) {
+	$daytoparse = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday); // xxxofday is value of day after submit action 'addtime'
+}
 
 if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
 	$usertoprocess = $user;
@@ -416,10 +419,10 @@ $search_options_pattern = 'search_task_options_';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // 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 .= dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "%A").' ';
 $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "day")." </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 .= '<a class="inline-block valignmiddle" href="?year='.$next_year."&month=".$next_month."&day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
 $nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' ';
 $nav .= ' <button type="submit" name="button_search_x" value="x" class="bordertransp"><span class="fa fa-search"></span></button>';
 
@@ -773,7 +776,7 @@ print '</div>';
 print '<input type="hidden" id="numberOfLines" name="numberOfLines" value="'.count($tasksarray).'"/>'."\n";
 
 print '<div class="center">';
-print '<input type="submit" class="button button-save"'.($disabledtask ? ' disabled' : '').' value="'.$langs->trans("Save").'">';
+print '<input type="submit" name="button_addtime" class="button button-save"'.($disabledtask ? ' disabled' : '').' value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 3d380ab7f4e..0a275cb46e3 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -665,7 +665,12 @@ if (!empty($arrayfields['timeconsumed']['checked'])) {
 for ($idw = 0; $idw < 7; $idw++) {
 	$dayinloopfromfirstdaytoshow = dol_time_plus_duree($firstdaytoshow, $idw, 'd'); // $firstdaytoshow is a date with hours = 0
 	$dayinloop = dol_time_plus_duree($startday, $idw, 'd');
-
+	/*print $dayinloopfromfirstdaytoshow;
+	print dol_print_date($dayinloopfromfirstdaytoshow, 'dayhour', 'gmt');
+	print dol_print_date($dayinloopfromfirstdaytoshow, 'dayhour');
+	print dol_print_date($dayinloopfromfirstdaytoshow, '%a', 'gmt');
+	print dol_print_date($dayinloopfromfirstdaytoshow, '%a');
+	print '<br>';*/
 	$cssweekend = '';
 	if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.
 		$cssweekend = 'weekend';
@@ -682,7 +687,9 @@ for ($idw = 0; $idw < 7; $idw++) {
 		$cssonholiday .= 'onholidayafternoon ';
 	}
 
-	print '<th width="6%" align="center" class="bold hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">'.dol_print_date($dayinloopfromfirstdaytoshow, '%a').'<br>'.dol_print_date($dayinloopfromfirstdaytoshow, 'dayreduceformat').'</th>';
+	print '<th width="6%" align="center" class="bold hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
+	print dol_print_date($dayinloopfromfirstdaytoshow, '%a');
+	print '<br>'.dol_print_date($dayinloopfromfirstdaytoshow, 'dayreduceformat').'</th>';
 }
 //print '<td></td>';
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 4c3ef11294f..1f9e6c32b2b 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1029,7 +1029,7 @@ if ($conf->global->TAKEPOS_DIRECT_PAYMENT) {
 // BAR RESTAURANT specific menu
 if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	if ($conf->global->TAKEPOS_ORDER_PRINTERS) {
-		$menus[$r++] = array('title'=>$langs->trans("Order"), 'action'=>'TakeposPrintingOrder();');
+		$menus[$r++] = array('title'=>'<span class="fa fa-blender-phone paddingrightonly"></span><div class="trunc">'.$langs->trans("Order").'</span>', 'action'=>'TakeposPrintingOrder();');
 	}
 	//Button to print receipt before payment
 	if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 78f5b36da49..7ff09de495e 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -390,6 +390,17 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('Jeu Jan. Janvier', $result);
 
+
+		$result=dol_print_date(1619388000, '%Y-%m-%d %a', 'gmt', $outputlangs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('2021-04-25 Dim', $result);
+
+		/* This test is disabled because result depends on TZ of server
+		$result=dol_print_date(1619388000, '%Y-%m-%d %a', 'tzserver', $outputlangs);	// If TZ is +2, then result will be Lun for 1619388000
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('2021-04-26 Lun', $result);
+		*/
+
 		// Check day format for en_US
 		$outputlangs=new Translate('', $conf);
 		$outputlangs->setDefaultLang('en_US');

From 95ecb95ff142710a34bb2ee76cca7650431f5cf6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 20:47:28 +0200
Subject: [PATCH 437/928] FIX dol_print_date for %a and %b with some timezone

---
 htdocs/core/lib/functions.lib.php | 124 +++++++++++++++++-------------
 1 file changed, 70 insertions(+), 54 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2a57a983496..37e55b42fde 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1991,19 +1991,15 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 	// Clean parameters
 	$to_gmt = false;
 	$offsettz = $offsetdst = 0;
-	if ($tzoutput)
-	{
+	if ($tzoutput) {
 		$to_gmt = true; // For backward compatibility
-		if (is_string($tzoutput))
-		{
-			if ($tzoutput == 'tzserver')
-			{
+		if (is_string($tzoutput)) {
+			if ($tzoutput == 'tzserver') {
 				$to_gmt = false;
 				$offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'
-				$offsettz = 0;
-				$offsetdst = 0;
-			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
-			{
+				$offsettz = 0;	// Timezone offset with server timezone, so 0
+				$offsetdst = 0;	// Dst offset with server timezone, so 0
+			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {
 				$to_gmt = true;
 				$offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'
 				$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore
@@ -2011,54 +2007,77 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 			}
 		}
 	}
-	if (!is_object($outputlangs)) $outputlangs = $langs;
-	if (!$format) $format = 'daytextshort';
+	if (!is_object($outputlangs)) {
+		$outputlangs = $langs;
+	}
+	if (!$format) {
+		$format = 'daytextshort';
+	}
 
 	// Do we have to reduce the length of date (year on 2 chars) to save space.
 	// Note: dayinputnoreduce is same than day but no reduction of year length will be done
 	$reduceformat = (!empty($conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;	// Test on original $format param.
 	$format = preg_replace('/inputnoreduce/', '', $format);	// so format 'dayinputnoreduce' is processed like day
 	$formatwithoutreduce = preg_replace('/reduceformat/', '', $format);
-	if ($formatwithoutreduce != $format) { $format = $formatwithoutreduce; $reduceformat = 1; }  // so format 'dayreduceformat' is processed like day
+	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
-	if ($format == 'day') $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
-	elseif ($format == 'hour')			$format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
-	elseif ($format == 'hourduration')	$format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
-	elseif ($format == 'daytext')			 $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);
-	elseif ($format == 'daytextshort')	$format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);
-	elseif ($format == 'dayhour')			 $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
-	elseif ($format == 'dayhoursec')		 $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
-	elseif ($format == 'dayhourtext')		 $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
-	elseif ($format == 'dayhourtextshort') $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);
-	// Format not sensitive to language
-	elseif ($format == 'dayhourlog')		 $format = '%Y%m%d%H%M%S';
-	elseif ($format == 'dayhourldap')		 $format = '%Y%m%d%H%M%SZ';
-	elseif ($format == 'dayhourxcard')	$format = '%Y%m%dT%H%M%SZ';
-	elseif ($format == 'dayxcard')	 	$format = '%Y%m%d';
-	elseif ($format == 'dayrfc')			 $format = '%Y-%m-%d'; // DATE_RFC3339
-	elseif ($format == 'dayhourrfc')		 $format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339
-	elseif ($format == 'standard')		$format = '%Y-%m-%d %H:%M:%S';
+	if ($format == 'day') {
+		$format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
+	} elseif ($format == 'hour') {
+		$format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
+	} elseif ($format == 'hourduration') {
+		$format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
+	} elseif ($format == 'daytext') {
+		$format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);
+	} elseif ($format == 'daytextshort') {
+		$format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);
+	} elseif ($format == 'dayhour') {
+		$format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
+	} elseif ($format == 'dayhoursec') {
+		$format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
+	} elseif ($format == 'dayhourtext') {
+		$format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
+	} elseif ($format == 'dayhourtextshort') {
+		$format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);
+	} elseif ($format == 'dayhourlog') {
+		// Format not sensitive to language
+		$format = '%Y%m%d%H%M%S';
+	} elseif ($format == 'dayhourldap') {
+		$format = '%Y%m%d%H%M%SZ';
+	} elseif ($format == 'dayhourxcard') {
+		$format = '%Y%m%dT%H%M%SZ';
+	} elseif ($format == 'dayxcard') {
+		$format = '%Y%m%d';
+	} elseif ($format == 'dayrfc') {
+		$format = '%Y-%m-%d'; // DATE_RFC3339
+	} elseif ($format == 'dayhourrfc') {
+		$format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339
+	} elseif ($format == 'standard') {
+		$format = '%Y-%m-%d %H:%M:%S';
+	}
 
-	if ($reduceformat)
-	{
+	if ($reduceformat) {
 		$format = str_replace('%Y', '%y', $format);
 		$format = str_replace('yyyy', 'yy', $format);
 	}
 
 	// If date undefined or "", we return ""
-	if (dol_strlen($time) == 0) return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)
+	if (dol_strlen($time) == 0) {
+		return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)
+	}
 
 	// Clean format
-	if (preg_match('/%b/i', $format))		// There is some text to translate
-	{
+	if (preg_match('/%b/i', $format)) {		// There is some text to translate
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
 		$format = str_replace('%b', '__b__', $format);
 		$format = str_replace('%B', '__B__', $format);
 	}
-	if (preg_match('/%a/i', $format))		// There is some text to translate
-	{
+	if (preg_match('/%a/i', $format)) {		// There is some text to translate
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
 		$format = str_replace('%a', '__a__', $format);
 		$format = str_replace('%A', '__A__', $format);
@@ -2067,13 +2086,11 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 
 	// Analyze date
 	$reg = array();
-	if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg))	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
-	{
+	if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) {	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
 		dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
 		return '';
-	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg))    // Still available to solve problems in extrafields of type date
-	{
-		// This part of code should not be used.
+	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg)) {    // Still available to solve problems in extrafields of type date
+		// This part of code should not be used anymore.
 		dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);
 		//if (function_exists('debug_print_backtrace')) debug_print_backtrace();
 		// Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
@@ -2088,23 +2105,22 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		$ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
 	} else {
 		// Date is a timestamps
-		if ($time < 100000000000)	// Protection against bad date values
-		{
+		if ($time < 100000000000) {	// Protection against bad date values
 			$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
-			$ret = adodb_strftime($format, $timetouse, $to_gmt);
-		} else $ret = 'Bad value '.$time.' for date';
+			$ret = adodb_strftime($format, $timetouse, $to_gmt);	// If to_gmt = false then adodb_strftime use TZ of server
+		} else {
+			$ret = 'Bad value '.$time.' for date';
+		}
 	}
 
-	if (preg_match('/__b__/i', $format))
-	{
+	if (preg_match('/__b__/i', $format)) {
 		$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 		// Here ret is string in PHP setup language (strftime was used). Now we convert to $outputlangs.
-		$month = adodb_strftime('%m', $timetouse);
+		$month = adodb_strftime('%m', $timetouse, $to_gmt);		// If to_gmt = false then adodb_strftime use TZ of server
 		$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)
-		{
+		if ($encodetooutput) {
 			$monthtext = $outputlangs->transnoentities('Month'.$month);
 			$monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);
 		} else {
@@ -2117,11 +2133,11 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		//print 'x'.$outputlangs->charset_output.'-'.$ret.'x';
 		//return $ret;
 	}
-	if (preg_match('/__a__/i', $format))
-	{
+	if (preg_match('/__a__/i', $format)) {
+		//print "time=$time offsettz=$offsettz offsetdst=$offsetdst offsettzstring=$offsettzstring";
 		$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
-		$w = adodb_strftime('%w', $timetouse); // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+		$w = adodb_strftime('%w', $timetouse, $to_gmt);		// If to_gmt = false then adodb_strftime use TZ of server
 		$dayweek = $outputlangs->transnoentitiesnoconv('Day'.$w);
 		$ret = str_replace('__A__', $dayweek, $ret);
 		$ret = str_replace('__a__', dol_substr($dayweek, 0, 3), $ret);

From 887bce8235e4736d92fd60f81b8be1925248aca6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 20:59:21 +0200
Subject: [PATCH 438/928] Avoid duplicate declaration

---
 htdocs/adherents/class/adherent.class.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 7fdc548efa7..80d14ee9ceb 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -204,12 +204,11 @@ class Adherent extends CommonObject
 	 */
 	public $morphy;
 
+	/**
+	 * @var int Info can be public
+	 */
 	public $public;
 
-	// -2:excluded, -1:draft, 0:resiliated, >=1:valided,payed
-	// def in common object
-	public $statut; // TODO modify to set statut as deprecated
-
 	/**
 	 * @var string photo of member
 	 */

From e5cd6f97f93818fa5f6a62c6f9ab2bdc44459a85 Mon Sep 17 00:00:00 2001
From: kastoras <kastoras_1@hotmail.com>
Date: Tue, 27 Apr 2021 01:01:27 +0300
Subject: [PATCH 439/928] New/NEW Product Variants API, add variant stock to
 response

When acessing product variants via GET API /products/{id}/variants, Include stock_warehouse data to the response
---
 htdocs/product/class/api_products.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 0c70af86c9c..95ad085ddc0 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -25,6 +25,7 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.class.php';
 
 /**
  * API class for products
@@ -1587,6 +1588,11 @@ class Products extends DolibarrApi
 			$prodc2vp = new ProductCombination2ValuePair($this->db);
 			$combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
 			$combinations[$key] = $this->_cleanObjectDatas($combinations[$key]);
+
+			$productModel = new Product($this->db);
+			$productModel->fetch((int)$combination->fk_product_child);
+			$productModel->load_stock();
+			$combinations[$key]->stock_warehouse = $this->_cleanObjectDatas($productModel)->stock_warehouse;
 		}
 
 		return $combinations;

From b1d858eb26bab28849ac0cd09294702eb13c0bab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 22:44:57 +0200
Subject: [PATCH 440/928] Fix translation of new modules

---
 .tx/config                                   | 12 ++++++++++++
 htdocs/core/modules/modPartnership.class.php |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.tx/config b/.tx/config
index b98bf7828f2..6d3518fabd4 100644
--- a/.tx/config
+++ b/.tx/config
@@ -128,6 +128,12 @@ source_file = htdocs/langs/en_US/errors.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.eventorganization]
+file_filter = htdocs/langs/<lang>/eventorganization.lang
+source_file = htdocs/langs/en_US/eventorganization.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.exports]
 file_filter = htdocs/langs/<lang>/exports.lang
 source_file = htdocs/langs/en_US/exports.lang
@@ -278,6 +284,12 @@ source_file = htdocs/langs/en_US/other.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.partnership]
+file_filter = htdocs/langs/<lang>/partnership.lang
+source_file = htdocs/langs/en_US/partnership.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.paybox]
 file_filter = htdocs/langs/<lang>/paybox.lang
 source_file = htdocs/langs/en_US/paybox.lang
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index 17c137a7e3c..be31ad3278a 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -144,7 +144,7 @@ class modPartnership extends DolibarrModules
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
 
 		// The language file dedicated to your module
-		$this->langfiles = array("partnership@partnership");
+		$this->langfiles = array("partnership");
 
 		// Prerequisites
 		$this->phpmin = array(5, 6); // Minimum version of PHP required by module

From 64374f46daf52934997f885fe68768a5c09a7c8b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 23:01:20 +0200
Subject: [PATCH 441/928] Debug v14

---
 htdocs/core/lib/functions.lib.php             |   6 +-
 htdocs/core/modules/modPartnership.class.php  |   2 +-
 htdocs/langs/en_US/partnership.lang           |   4 +-
 htdocs/partnership/README.md                  |  86 ---------------
 htdocs/partnership/admin/about.php            | 103 ------------------
 .../admin/partnership_extrafields.php         |   7 +-
 htdocs/partnership/admin/setup.php            |  11 +-
 .../partnership/class/partnership.class.php   |   8 +-
 .../partnership/modules_partnership.php       |   4 +-
 htdocs/partnership/lib/partnership.lib.php    |  11 +-
 htdocs/partnership/partnership_agenda.php     |   2 +-
 htdocs/partnership/partnership_card.php       |   2 +-
 htdocs/partnership/partnership_contact.php    |   2 +-
 htdocs/partnership/partnership_document.php   |   2 +-
 htdocs/partnership/partnership_list.php       |   2 +-
 htdocs/partnership/partnership_note.php       |   2 +-
 htdocs/partnership/partnershipindex.php       |   2 +-
 17 files changed, 36 insertions(+), 220 deletions(-)
 delete mode 100644 htdocs/partnership/README.md
 delete mode 100644 htdocs/partnership/admin/about.php

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 79f36b1dbcd..9308ea07d53 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3526,7 +3526,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_inventory', 'object_intracommreport', 'object_label',
 				'object_margin', 'object_members', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
 				'object_lot', 'object_mrp', 'object_other',
-				'object_payment', 'object_pdf', 'object_product', 'object_propal',
+				'object_partnership', 'object_payment', 'object_pdf', 'object_product', 'object_propal',
 				'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
 				'object_reception', 'object_recruitmentjobposition', 'object_recruitmentcandidature',
 				'object_salary', 'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
@@ -3538,7 +3538,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
-				'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'refresh', 'salary', 'shipment', 'supplier_invoice', 'technic', 'ticket',
+				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'refresh', 'salary', 'shipment', 'supplier_invoice', 'technic', 'ticket',
 				'error', 'warning',
 				'recruitmentcandidature', 'recruitmentjobposition', 'resource',
 				'shapes', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
@@ -3582,7 +3582,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
 				'other'=>'square',
 				'playdisabled'=>'play', 'pdf'=>'file-pdf',  'poll'=>'check-double', 'pos'=>'cash-register', 'preview'=>'binoculars', 'project'=>'project-diagram', 'projectpub'=>'project-diagram', 'projecttask'=>'tasks', 'propal'=>'file-signature',
-				'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
+				'partnership'=>'handshake', 'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 				'reception'=>'dolly', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
 				'refresh'=>'redo', 'resource'=>'laptop-house',
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index be31ad3278a..1165461368b 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -86,7 +86,7 @@ class modPartnership extends DolibarrModules
 		// 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'
 		// To use a supported fa-xxx css style of font awesome, use this->picto='xxx'
-		$this->picto = 'generic';
+		$this->picto = 'partnership';
 
 		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
 		$this->module_parts = array(
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 63b3bec0bb6..7681449755e 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -51,4 +51,6 @@ DatePartnershipEnd=End date
 PartnershipDraft = Draft
 PartnershipAccepted = Accepted
 PartnershipRefused = Refused
-PartnershipCanceled = Canceled
\ No newline at end of file
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
\ No newline at end of file
diff --git a/htdocs/partnership/README.md b/htdocs/partnership/README.md
deleted file mode 100644
index ca8d9f7b551..00000000000
--- a/htdocs/partnership/README.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# PARTNERSHIP FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
-
-## Features
-
-Description of the module...
-
-<!--
-![Screenshot partnership](img/screenshot_partnership.png?raw=true "Partnership"){imgmd}
--->
-
-Other external modules are available on [Dolistore.com](https://www.dolistore.com).
-
-## Translations
-
-Translations can be completed manually by editing files into directories *langs*.
-
-<!--
-This module contains also a sample configuration for Transifex, under the hidden directory [.tx](.tx), so it is possible to manage translation using this service.
-
-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.
--->
-
-<!--
-
-## Installation
-
-### From the ZIP file and GUI interface
-
-- If you get the module in a zip file (like when downloading it from the market place [Dolistore](https://www.dolistore.com)), go into
-menu ```Home - Setup - Modules - Deploy external module``` and upload the zip file.
-
-Note: If this screen tell you there is no custom directory, check your setup is correct:
-
-- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file and check that following lines are not commented:
-
-    ```php
-    //$dolibarr_main_url_root_alt ...
-    //$dolibarr_main_document_root_alt ...
-    ```
-
-- Uncomment them if necessary (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
-
-    For example :
-
-    - UNIX:
-        ```php
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
-        ```
-
-    - Windows:
-        ```php
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
-        ```
-
-### From a GIT repository
-
-- Clone the repository in ```$dolibarr_main_document_root_alt/partnership```
-
-```sh
-cd ....../custom
-git clone git@github.com:gitlogin/partnership.git partnership
-```
-
-### <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
-
--->
-
-## Licenses
-
-### Main code
-
-GPLv3 or (at your option) any later version. See file COPYING for more information.
-
-### Documentation
-
-All texts and readmes are licensed under GFDL.
diff --git a/htdocs/partnership/admin/about.php b/htdocs/partnership/admin/about.php
deleted file mode 100644
index 2d5f17b1877..00000000000
--- a/htdocs/partnership/admin/about.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2021 Dorian Laurent <i.merraha@sofimedmaroc.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    partnership/admin/about.php
- * \ingroup partnership
- * \brief   About page of module Partnership.
- */
-
-// Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
-// Libraries
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once '../lib/partnership.lib.php';
-
-// Translations
-$langs->loadLangs(array("errors", "admin", "partnership@partnership"));
-
-// Access control
-if (!$user->admin) {
-	accessforbidden();
-}
-
-// Parameters
-$action = GETPOST('action', 'aZ09');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-
-/*
- * Actions
- */
-
-// None
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-$page_name = "PartnershipAbout";
-llxHeader('', $langs->trans($page_name));
-
-// Subheader
-$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
-
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_partnership@partnership');
-
-// Configuration header
-$head = partnershipAdminPrepareHead();
-print dol_get_fiche_head($head, 'about', '', 0, 'partnership@partnership');
-
-dol_include_once('/partnership/core/modules/modPartnership.class.php');
-$tmpmodule = new modPartnership($db);
-print $tmpmodule->getDescLong();
-
-// Page end
-print dol_get_fiche_end();
-llxFooter();
-$db->close();
diff --git a/htdocs/partnership/admin/partnership_extrafields.php b/htdocs/partnership/admin/partnership_extrafields.php
index a69ec9d1372..3ecf00f2689 100644
--- a/htdocs/partnership/admin/partnership_extrafields.php
+++ b/htdocs/partnership/admin/partnership_extrafields.php
@@ -58,7 +58,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once '../lib/partnership.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('partnership@partnership', 'admin'));
+$langs->loadLangs(array('partnership', 'admin'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
@@ -91,17 +91,18 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$help_url = '';
 
 llxHeader('', $langs->trans("PartnershipSetup"), $help_url);
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("PartnershipSetup"), $linkback, 'title_setup');
+print load_fiche_titre($langs->trans("PartnershipSetup"), $linkback, 'object_partnership');
 
 
 $head = partnershipAdminPrepareHead();
 
-print dol_get_fiche_head($head, 'partnership_extrafields', $langs->trans("PartnershipExtraFields"), -1, 'account');
+print dol_get_fiche_head($head, 'partnership_extrafields', $langs->trans("PartnershipExtraFields"), -1, 'partnership');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index d55daab2347..46c6e8291db 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -58,7 +58,7 @@ require_once '../lib/partnership.lib.php';
 //require_once "../class/myclass.class.php";
 
 // Translations
-$langs->loadLangs(array("admin", "partnership@partnership"));
+$langs->loadLangs(array("admin", "partnership"));
 
 // Security check
 if (!$user->admin) {
@@ -71,6 +71,7 @@ $value 	= GETPOST('value', 'alpha');
 
 $error = 0;
 
+
 /*
  * Actions
  */
@@ -91,10 +92,10 @@ if ($action == 'setting') {
 
 	$partnership->tabs = array();
 	if ($modulemenu == 'member') {
-		$partnership->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
+		$partnership->tabs[] = array('data'=>'member:+partnership:Partnership:partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
 		$fk_mainmenu = "members";
 	} else {
-		$partnership->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
+		$partnership->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
 		$fk_mainmenu = "companies";
 	}
 
@@ -131,10 +132,10 @@ $tab = $langs->trans("PartnershipSetup");
 llxHeader('', $title);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($title, $linkback, 'title_setup');
+print load_fiche_titre($title, $linkback, 'object_partnership');
 
 $head = partnershipAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', $tab, -1, 'partnership');
+print dol_get_fiche_head($head, 'settings', $tab, -1, 'object_partnership');
 
 $form = new Form($db);
 
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 019d72a6012..d842644800a 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -61,7 +61,7 @@ class Partnership extends CommonObject
 	/**
 	 * @var string String with name of icon for partnership. Must be the part after the 'object_' into object_partnership.png
 	 */
-	public $picto = 'partnership@partnership';
+	public $picto = 'partnership';
 
 
 	const STATUS_DRAFT = 0;
@@ -969,7 +969,7 @@ class Partnership extends CommonObject
 		// phpcs:enable
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
-			//$langs->load("partnership@partnership");
+			//$langs->load("partnership");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
 			$this->labelStatus[self::STATUS_ACCEPTED] = $langs->trans('Accepted');
 			$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('Refused');
@@ -1076,7 +1076,7 @@ class Partnership extends CommonObject
 	public function getNextNumRef()
 	{
 		global $langs, $conf;
-		$langs->load("partnership@partnership");
+		$langs->load("partnership");
 
 		if (empty($conf->global->PARTNERSHIP_ADDON)) {
 			$conf->global->PARTNERSHIP_ADDON = 'mod_partnership_standard';
@@ -1141,7 +1141,7 @@ class Partnership extends CommonObject
 		$result = 0;
 		$includedocgeneration = 0;
 
-		$langs->load("partnership@partnership");
+		$langs->load("partnership");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'standard_partnership';
diff --git a/htdocs/partnership/core/modules/partnership/modules_partnership.php b/htdocs/partnership/core/modules/partnership/modules_partnership.php
index aea00b41415..005d77835b6 100644
--- a/htdocs/partnership/core/modules/partnership/modules_partnership.php
+++ b/htdocs/partnership/core/modules/partnership/modules_partnership.php
@@ -91,7 +91,7 @@ abstract class ModeleNumRefPartnership
 	public function info()
 	{
 		global $langs;
-		$langs->load("partnership@partnership");
+		$langs->load("partnership");
 		return $langs->trans("NoDescription");
 	}
 
@@ -103,7 +103,7 @@ abstract class ModeleNumRefPartnership
 	public function getExample()
 	{
 		global $langs;
-		$langs->load("partnership@partnership");
+		$langs->load("partnership");
 		return $langs->trans("NoExample");
 	}
 
diff --git a/htdocs/partnership/lib/partnership.lib.php b/htdocs/partnership/lib/partnership.lib.php
index 0cb4f1d0ea1..5305f86132e 100644
--- a/htdocs/partnership/lib/partnership.lib.php
+++ b/htdocs/partnership/lib/partnership.lib.php
@@ -30,7 +30,7 @@ function partnershipAdminPrepareHead()
 {
 	global $langs, $conf;
 
-	$langs->load("partnership@partnership");
+	$langs->load("partnership");
 
 	$h = 0;
 	$head = array();
@@ -46,11 +46,12 @@ function partnershipAdminPrepareHead()
 	$head[$h][2] = 'partnership_extrafields';
 	$h++;
 
-
+	/*
 	$head[$h][0] = dol_buildpath("/partnership/admin/about.php", 1);
 	$head[$h][1] = $langs->trans("About");
 	$head[$h][2] = 'about';
 	$h++;
+	*/
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
@@ -75,7 +76,7 @@ function partnershipPrepareHead($object)
 {
 	global $db, $langs, $conf;
 
-	$langs->load("partnership@partnership");
+	$langs->load("partnership");
 
 	$h = 0;
 	$head = array();
@@ -128,9 +129,9 @@ function partnershipPrepareHead($object)
 	//$this->tabs = array(
 	//	'entity:-tabname:Title:@partnership:/partnership/mypage.php?id=__ID__'
 	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'partnership@partnership');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'partnership');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'partnership@partnership', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'partnership', 'remove');
 
 	return $head;
 }
diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index 712455840b8..51f417399df 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -82,7 +82,7 @@ dol_include_once('/partnership/lib/partnership.lib.php');
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("partnership@partnership", "other"));
+$langs->loadLangs(array("partnership", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index dbf889137d8..d2647a43a8b 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -81,7 +81,7 @@ dol_include_once('/partnership/class/partnership.class.php');
 dol_include_once('/partnership/lib/partnership.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("partnership@partnership", "other"));
+$langs->loadLangs(array("partnership", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/partnership/partnership_contact.php b/htdocs/partnership/partnership_contact.php
index 02aa67f7365..632047acf25 100644
--- a/htdocs/partnership/partnership_contact.php
+++ b/htdocs/partnership/partnership_contact.php
@@ -59,7 +59,7 @@ dol_include_once('/partnership/class/partnership.class.php');
 dol_include_once('/partnership/lib/partnership.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("partnership@partnership", "companies", "other", "mails"));
+$langs->loadLangs(array("partnership", "companies", "other", "mails"));
 
 $id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index d455f342516..d6f89c07d00 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -82,7 +82,7 @@ dol_include_once('/partnership/class/partnership.class.php');
 dol_include_once('/partnership/lib/partnership.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("partnership@partnership", "companies", "other", "mails"));
+$langs->loadLangs(array("partnership", "companies", "other", "mails"));
 
 
 $action = GETPOST('action', 'aZ09');
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 0e0ee3da9c3..441ef1a2de8 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -85,7 +85,7 @@ require_once __DIR__.'/class/partnership.class.php';
 //dol_include_once('/othermodule/class/otherobject.class.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("partnership@partnership", "other"));
+$langs->loadLangs(array("partnership", "other"));
 
 $action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index 5e752666b39..29a59f67ef4 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -78,7 +78,7 @@ dol_include_once('/partnership/class/partnership.class.php');
 dol_include_once('/partnership/lib/partnership.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("partnership@partnership", "companies"));
+$langs->loadLangs(array("partnership", "companies"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/partnership/partnershipindex.php b/htdocs/partnership/partnershipindex.php
index 8db6be052bb..8076f105dbb 100644
--- a/htdocs/partnership/partnershipindex.php
+++ b/htdocs/partnership/partnershipindex.php
@@ -58,7 +58,7 @@ if (!$res) {
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("partnership@partnership"));
+$langs->loadLangs(array("partnership"));
 
 $action = GETPOST('action', 'aZ09');
 

From 24dec80c7eb0449793b0e9c81023c12bdd5dfca3 Mon Sep 17 00:00:00 2001
From: kastoras <kastoras_1@hotmail.com>
Date: Thu, 29 Apr 2021 00:06:47 +0300
Subject: [PATCH 442/928] New/NEW Product Variants API, add variant stock to
 response by parameter

If $includestock parameter is set to 1, the response will contain variant stock data
---
 htdocs/product/class/api_products.class.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 95ad085ddc0..83b19fb35c0 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -1567,7 +1567,8 @@ class Products extends DolibarrApi
 	/**
 	 * Get product variants.
 	 *
-	 * @param  int $id ID of Product
+	 * @param  int 	$id 			ID of Product
+	 * @param  int $includestock  	Default value 0. If parameter is set to 1 the response will contain stock data of each variant 
 	 * @return array
 	 *
 	 * @throws RestException 500
@@ -1575,7 +1576,7 @@ class Products extends DolibarrApi
 	 *
 	 * @url GET {id}/variants
 	 */
-	public function getVariants($id)
+	public function getVariants($id,$includestock=0)
 	{
 		if (!DolibarrApiAccess::$user->rights->produit->lire) {
 			throw new RestException(401);
@@ -1589,10 +1590,12 @@ class Products extends DolibarrApi
 			$combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
 			$combinations[$key] = $this->_cleanObjectDatas($combinations[$key]);
 
-			$productModel = new Product($this->db);
-			$productModel->fetch((int)$combination->fk_product_child);
-			$productModel->load_stock();
-			$combinations[$key]->stock_warehouse = $this->_cleanObjectDatas($productModel)->stock_warehouse;
+			if($includestock==1){
+				$productModel = new Product($this->db);
+				$productModel->fetch((int)$combination->fk_product_child);
+				$productModel->load_stock();
+				$combinations[$key]->stock_warehouse = $this->_cleanObjectDatas($productModel)->stock_warehouse;
+			}
 		}
 
 		return $combinations;

From 58b4074e57c91fbf75590243b86cad864c651fcd Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 28 Apr 2021 21:10:06 +0000
Subject: [PATCH 443/928] Fixing style errors.

---
 htdocs/product/class/api_products.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index d94fc1f42d3..62137730e5f 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -1568,7 +1568,7 @@ class Products extends DolibarrApi
 	 * Get product variants.
 	 *
 	 * @param  int 	$id 			ID of Product
-	 * @param  int  $includestock  	Default value 0. If parameter is set to 1 the response will contain stock data of each variant 
+	 * @param  int  $includestock   Default value 0. If parameter is set to 1 the response will contain stock data of each variant
 	 * @return array
 	 *
 	 * @throws RestException 500
@@ -1576,7 +1576,7 @@ class Products extends DolibarrApi
 	 *
 	 * @url GET {id}/variants
 	 */
-	public function getVariants($id,$includestock=0)
+	public function getVariants($id, $includestock = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->produit->lire) {
 			throw new RestException(401);
@@ -1590,9 +1590,9 @@ class Products extends DolibarrApi
 			$combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
 			$combinations[$key] = $this->_cleanObjectDatas($combinations[$key]);
 
-			if($includestock==1){
+			if ($includestock==1) {
 				$productModel = new Product($this->db);
-				$productModel->fetch((int)$combination->fk_product_child);
+				$productModel->fetch((int) $combination->fk_product_child);
 				$productModel->load_stock();
 				$combinations[$key]->stock_warehouse = $this->_cleanObjectDatas($productModel)->stock_warehouse;
 			}

From 5d17e267385760d89541529c359c80db01058c8b Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Wed, 28 Apr 2021 23:25:03 +0200
Subject: [PATCH 444/928] add_pdf_template_and_read_if_module_activate

---
 htdocs/admin/pdf.php                  |   2 +-
 htdocs/admin/pdf_adherent.php         | 110 +++++++++++++++++++
 htdocs/admin/pdf_contrat.php          | 110 +++++++++++++++++++
 htdocs/admin/pdf_expensereport.php    | 110 +++++++++++++++++++
 htdocs/admin/pdf_holiday.php          | 110 +++++++++++++++++++
 htdocs/admin/pdf_intervention.php     |   2 +-
 htdocs/admin/pdf_invoice.php          |   2 +-
 htdocs/admin/pdf_order.php            |   2 +-
 htdocs/admin/pdf_project.php          |   2 +-
 htdocs/admin/pdf_proposal.php         |   2 +-
 htdocs/admin/pdf_reception.php        | 110 +++++++++++++++++++
 htdocs/admin/pdf_recruitment.php      |   2 +-
 htdocs/admin/pdf_shipment.php         | 110 +++++++++++++++++++
 htdocs/admin/pdf_stock.php            | 110 +++++++++++++++++++
 htdocs/admin/pdf_supplierinvoice.php  |   2 +-
 htdocs/admin/pdf_supplierorder.php    |   2 +-
 htdocs/admin/pdf_supplierproposal.php |   2 +-
 htdocs/admin/pdf_ticket.php           |   2 +-
 htdocs/core/lib/pdf.lib.php           | 148 +++++++++++++++++---------
 htdocs/langs/en_US/admin.lang         |   7 ++
 20 files changed, 888 insertions(+), 59 deletions(-)
 create mode 100644 htdocs/admin/pdf_adherent.php
 create mode 100644 htdocs/admin/pdf_contrat.php
 create mode 100644 htdocs/admin/pdf_expensereport.php
 create mode 100644 htdocs/admin/pdf_holiday.php
 create mode 100644 htdocs/admin/pdf_reception.php
 create mode 100644 htdocs/admin/pdf_shipment.php
 create mode 100644 htdocs/admin/pdf_stock.php

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 0ee42d6cddf..348f1e30cb5 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/admin/pdf_adherent.php b/htdocs/admin/pdf_adherent.php
new file mode 100644
index 00000000000..af570117492
--- /dev/null
+++ b/htdocs/admin/pdf_adherent.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'adherent', $langs->trans("Adherent"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFAdherentDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_contrat.php b/htdocs/admin/pdf_contrat.php
new file mode 100644
index 00000000000..b6624ba59d6
--- /dev/null
+++ b/htdocs/admin/pdf_contrat.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'contrat', $langs->trans("Contrat"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFContratDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_expensereport.php b/htdocs/admin/pdf_expensereport.php
new file mode 100644
index 00000000000..3620679f525
--- /dev/null
+++ b/htdocs/admin/pdf_expensereport.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'expensereport', $langs->trans("Expensereport"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFExpensereportDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_holiday.php b/htdocs/admin/pdf_holiday.php
new file mode 100644
index 00000000000..7b6074b31aa
--- /dev/null
+++ b/htdocs/admin/pdf_holiday.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'holiday', $langs->trans("Holiday"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFHolidaytDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_intervention.php b/htdocs/admin/pdf_intervention.php
index f7a0244f9ab..993e1f1f5b1 100644
--- a/htdocs/admin/pdf_intervention.php
+++ b/htdocs/admin/pdf_intervention.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/admin/pdf_invoice.php b/htdocs/admin/pdf_invoice.php
index 69859b9ea30..9064d2fd499 100644
--- a/htdocs/admin/pdf_invoice.php
+++ b/htdocs/admin/pdf_invoice.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/admin/pdf_order.php b/htdocs/admin/pdf_order.php
index e3a725eb33a..b81cc649d61 100644
--- a/htdocs/admin/pdf_order.php
+++ b/htdocs/admin/pdf_order.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/admin/pdf_project.php b/htdocs/admin/pdf_project.php
index 7e05c24ed56..3a85f0ea258 100644
--- a/htdocs/admin/pdf_project.php
+++ b/htdocs/admin/pdf_project.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/admin/pdf_proposal.php b/htdocs/admin/pdf_proposal.php
index dc35a1cd538..06d7bc6f15c 100644
--- a/htdocs/admin/pdf_proposal.php
+++ b/htdocs/admin/pdf_proposal.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/admin/pdf_reception.php b/htdocs/admin/pdf_reception.php
new file mode 100644
index 00000000000..32003e51f30
--- /dev/null
+++ b/htdocs/admin/pdf_reception.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'reception', $langs->trans("reception"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFReceptionDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_recruitment.php b/htdocs/admin/pdf_recruitment.php
index 4e81e70802c..575d3bc23cc 100644
--- a/htdocs/admin/pdf_recruitment.php
+++ b/htdocs/admin/pdf_recruitment.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/admin/pdf_shipment.php b/htdocs/admin/pdf_shipment.php
new file mode 100644
index 00000000000..d456a6fb2ea
--- /dev/null
+++ b/htdocs/admin/pdf_shipment.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'shipment', $langs->trans("shipment"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFShipmentDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_stock.php b/htdocs/admin/pdf_stock.php
new file mode 100644
index 00000000000..e6b0af587b0
--- /dev/null
+++ b/htdocs/admin/pdf_stock.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/pdf.php
+ *       \brief      Page to setup PDF options
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+if ($cancel) {
+	$action = '';
+}
+
+if ($action == 'update') {
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formadmin = new FormAdmin($db);
+
+print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
+
+$head = pdf_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'stock', $langs->trans("Stock"), -1, 'pdf');
+
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFStockDesc"), $s)."</span><br>\n";
+print "<br>\n";
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
+
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/pdf_supplierinvoice.php b/htdocs/admin/pdf_supplierinvoice.php
index c244e70457b..57dd647139d 100644
--- a/htdocs/admin/pdf_supplierinvoice.php
+++ b/htdocs/admin/pdf_supplierinvoice.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/admin/pdf_supplierorder.php b/htdocs/admin/pdf_supplierorder.php
index 98340aced97..ecf0ad4cae8 100644
--- a/htdocs/admin/pdf_supplierorder.php
+++ b/htdocs/admin/pdf_supplierorder.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/admin/pdf_supplierproposal.php b/htdocs/admin/pdf_supplierproposal.php
index 45fd337354a..3fb929ed797 100644
--- a/htdocs/admin/pdf_supplierproposal.php
+++ b/htdocs/admin/pdf_supplierproposal.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/admin/pdf_ticket.php b/htdocs/admin/pdf_ticket.php
index b8fbaed3b5c..5ca775e2447 100644
--- a/htdocs/admin/pdf_ticket.php
+++ b/htdocs/admin/pdf_ticket.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks'));
+$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 1d55b45c221..05f53b72df7 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -59,55 +59,107 @@ function pdf_admin_prepare_head()
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'pdf_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_project.php';
-	$head[$h][1] = $langs->trans("Project");
-	$head[$h][2] = 'project';
-	$h++;
+	if (!empty($conf->adherent->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_adherent.php';
+		$head[$h][1] = $langs->trans("Adherent");
+		$head[$h][2] = 'adherent';
+		$h++;
+	}
+	if (!empty($conf->projet->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_project.php';
+		$head[$h][1] = $langs->trans("Project");
+		$head[$h][2] = 'project';
+		$h++;
+	}
+	if (!empty($conf->propal->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_proposal.php';
+		$head[$h][1] = $langs->trans("Proposal");
+		$head[$h][2] = 'proposal';
+		$h++;
+	}
+	if (!empty($conf->commande->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_order.php';
+		$head[$h][1] = $langs->trans("Order");
+		$head[$h][2] = 'order';
+		$h++;
+	}
+	if (!empty($conf->facture->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_invoice.php';
+		$head[$h][1] = $langs->trans("Invoice");
+		$head[$h][2] = 'invoice';
+		$h++;
+	}
+	if (!empty($conf->expedition->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_shipment.php';
+		$head[$h][1] = $langs->trans("Sendings");
+		$head[$h][2] = 'shipment';
+		$h++;
+	}
+	if (!empty($conf->reception->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_reception.php';
+		$head[$h][1] = $langs->trans("Reception");
+		$head[$h][2] = 'reception';
+		$h++;
+	}
+	if (!empty($conf->ticket->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_Ticket.php';
+		$head[$h][1] = $langs->trans("Ticket");
+		$head[$h][2] = 'ticket';
+		$h++;
+	}
+	if (!empty($conf->ficheinter->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_intervention.php';
+		$head[$h][1] = $langs->trans("Intervention");
+		$head[$h][2] = 'intervention';
+		$h++;
+	}
+	if (!empty($conf->supplier_proposal->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierproposal.php';
+		$head[$h][1] = $langs->trans("SupplierProposal");
+		$head[$h][2] = 'supplierproposal';
+		$h++;
+	}
+	if (!empty($conf->fournisseur->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierorder.php';
+		$head[$h][1] = $langs->trans("SupplierOrder");
+		$head[$h][2] = 'supplierorder';
+		$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_proposal.php';
-	$head[$h][1] = $langs->trans("Proposal");
-	$head[$h][2] = 'proposal';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_order.php';
-	$head[$h][1] = $langs->trans("Order");
-	$head[$h][2] = 'order';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_invoice.php';
-	$head[$h][1] = $langs->trans("Invoice");
-	$head[$h][2] = 'invoice';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_Ticket.php';
-	$head[$h][1] = $langs->trans("Ticket");
-	$head[$h][2] = 'ticket';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_intervention.php';
-	$head[$h][1] = $langs->trans("Intervention");
-	$head[$h][2] = 'intervention';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierproposal.php';
-	$head[$h][1] = $langs->trans("SupplierProposal");
-	$head[$h][2] = 'supplierproposal';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierorder.php';
-	$head[$h][1] = $langs->trans("SupplierOrder");
-	$head[$h][2] = 'supplierorder';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierinvoice.php';
-	$head[$h][1] = $langs->trans("SuppliersInvoice");
-	$head[$h][2] = 'supplierinvoice';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_recruitment.php';
-	$head[$h][1] = $langs->trans("Recruitment");
-	$head[$h][2] = 'recruitment';
-	$h++;
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierinvoice.php';
+		$head[$h][1] = $langs->trans("SuppliersInvoice");
+		$head[$h][2] = 'supplierinvoice';
+		$h++;
+	}
+	if (!empty($conf->recruitment->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_recruitment.php';
+		$head[$h][1] = $langs->trans("Recruitment");
+		$head[$h][2] = 'recruitment';
+		$h++;
+	}
+	if (!empty($conf->contrat->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_contrat.php';
+		$head[$h][1] = $langs->trans("Contrat");
+		$head[$h][2] = 'contrat';
+		$h++;
+	}
+	if (!empty($conf->stock->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_stock.php';
+		$head[$h][1] = $langs->trans("Stock");
+		$head[$h][2] = 'stock';
+		$h++;
+	}
+	if (!empty($conf->holiday->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_holiday.php';
+		$head[$h][1] = $langs->trans("Holidays");
+		$head[$h][2] = 'holiday';
+		$h++;
+	}
+	if (!empty($conf->expensereport->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_expensereport.php';
+		$head[$h][1] = $langs->trans("Trips");
+		$head[$h][2] = 'expensereport';
+		$h++;
+	}
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'pdf_admin', 'remove');
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 4fb5952bf5b..1cddacbaeb1 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -402,12 +402,19 @@ PDFProjectDesc=PDF Option for project
 PDFProposalDesc=PDF Option for proposal
 PDFOrderDesc=PDF Option for order
 PDFInvoiceDesc=PDF Option for invoice
+PDFShipmentDesc=PDF Option for shipment
+PDFReceptionDesc=PDF Option for reception
 PDFTicketDesc=PDF Option for ticket
 PDFInterventionDesc=PDF option for intervention
 PDFSupplierproposalDesc=PDF Option for supplier proposal
 PDFSupplierorderDesc=PDF Option for supplier order
 PDFSupplierinvoiceDesc=PDF Option for supplier invoice
 PDFRecruitmentDesc=PDF Option for recrutment
+PDFContratDesc=PDF Option for contrat
+PDFStockDesc=PDF Option for stock
+PDFHolidaytDesc=PDF Option for holiday
+PDFExpensereportDesc=PDF Option for Expensereport
+PDFAdherentDescPDF Option for Adhrent
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT

From 6f1f26096ee2c99973e17c774a20f033c7659d11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Apr 2021 23:25:26 +0200
Subject: [PATCH 445/928] Debug partnership module

---
 htdocs/core/lib/functions.lib.php                    | 6 +++---
 htdocs/modulebuilder/template/myobject_card.php      | 8 ++++----
 htdocs/partnership/admin/partnership_extrafields.php | 2 +-
 htdocs/partnership/admin/setup.php                   | 2 +-
 htdocs/partnership/class/partnership.class.php       | 2 +-
 htdocs/partnership/partnership_card.php              | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9308ea07d53..c996640bc2c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3628,7 +3628,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			if (in_array($pictowithouttext, array('conferenceorbooth', 'collab', 'eventorganization', 'holiday', 'project', 'workstation'))) {
 				$morecss = 'em088';
 			}
-			if (in_array($pictowithouttext, array('intervention', 'info', 'payment', 'loan', 'stock', 'technic'))) {
+			if (in_array($pictowithouttext, array('intervention', 'info', 'payment', 'loan', 'partnership', 'stock', 'technic'))) {
 				$morecss = 'em080';
 			}
 
@@ -3680,7 +3680,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944',
 				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'inventory'=>'#a69944', 'stock'=>'#a69944', 'movement'=>'#a69944',
 				'other'=>'#ddd',
-				'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'reception'=>'#a69944', 'resize'=>'#444', 'rss'=>'#cba',
+				'partnership'=>'#6c6aa8', 'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'reception'=>'#a69944', 'resize'=>'#444', 'rss'=>'#cba',
 				'shipment'=>'#a69944', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
 				'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa',
 				'website'=>'#304', 'workstation'=>'#a69944'
@@ -9717,7 +9717,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 
 	$tag = !empty($attr['href']) ? 'a' : 'span';
 
-	return '<div class="inline-block divButAction"><'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'></div>';
+	return '<'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'>';
 }
 
 /**
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index fe4cd496df0..7de7d8d9c5c 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -492,10 +492,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Back to draft
 			if ($object->status == $object::STATUS_VALIDATED) {
-				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes', '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken(), '', $permissiontoadd);
 			}
 
-			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit', '', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
@@ -509,7 +509,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			// Clone
-			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken(), '', $permissiontoadd);
 
 			/*
 			if ($permissiontoadd) {
@@ -529,7 +529,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			*/
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
-			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
 		}
 		print '</div>'."\n";
 	}
diff --git a/htdocs/partnership/admin/partnership_extrafields.php b/htdocs/partnership/admin/partnership_extrafields.php
index 3ecf00f2689..a7f8bd9409e 100644
--- a/htdocs/partnership/admin/partnership_extrafields.php
+++ b/htdocs/partnership/admin/partnership_extrafields.php
@@ -102,7 +102,7 @@ print load_fiche_titre($langs->trans("PartnershipSetup"), $linkback, 'object_par
 
 $head = partnershipAdminPrepareHead();
 
-print dol_get_fiche_head($head, 'partnership_extrafields', $langs->trans("PartnershipExtraFields"), -1, 'partnership');
+print dol_get_fiche_head($head, 'partnership_extrafields', $langs->trans("PartnershipExtraFields"), -1, '');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 46c6e8291db..7894b24b5bb 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -135,7 +135,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($title, $linkback, 'object_partnership');
 
 $head = partnershipAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', $tab, -1, 'object_partnership');
+print dol_get_fiche_head($head, 'settings', $tab, -1, '');
 
 $form = new Form($db);
 
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index d842644800a..4be5256062b 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -113,7 +113,7 @@ class Partnership extends CommonObject
 		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Accept&eacute;', '2'=>'Refus&eacute;', '9'=>'Annul&eacute;'),),
+		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>4, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '2'=>'Refused', '9'=>'Canceled'),),
 		'fk_member' => array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>51, 'notnull'=>-1, 'visible'=>1, 'index'=>1,),
 		'date_partnership_start' => array('type'=>'datetime', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
 		'date_partnership_end' => array('type'=>'datetime', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>1, 'visible'=>1,),
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index d2647a43a8b..aa6c136146e 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -590,11 +590,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Accept
 			if ($object->status == $object::STATUS_DRAFT) {
 				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
-					print dolGetButtonAction($langs->trans('Accept'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_accept&confirm=yes', '', $permissiontoadd);
+					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_accept&confirm=yes', '', $permissiontoadd);
 				} else {
 					$langs->load("errors");
 					//print dolGetButtonAction($langs->trans('Accept'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_accept&confirm=yes', '', 0);
-					print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Accept").'</a>';
+					print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
 
@@ -628,7 +628,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
-			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
 		}
 		print '</div>'."\n";
 	}

From c89830b25b3db9ab457c7941455bda4db1027a44 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Thu, 29 Apr 2021 01:17:21 +0200
Subject: [PATCH 446/928] fix(sql) pmp added to create table both migration and
 install

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql      | 9 +++------
 htdocs/install/mysql/tables/llx_product_perentity.sql | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 652be6ec035..acc0659bbcb 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -307,7 +307,8 @@ create table llx_product_perentity
     accountancy_code_sell_export  varchar(32),                        -- Selling accountancy code for vat export
     accountancy_code_buy          varchar(32),                        -- Buying accountancy code
     accountancy_code_buy_intra    varchar(32),                        -- Buying accountancy code for vat intracommunity
-    accountancy_code_buy_export   varchar(32)                  		-- Buying accountancy code for vat import
+    accountancy_code_buy_export   varchar(32),                  		-- Buying accountancy code for vat import
+    pmp double(24,8)
 )ENGINE=innodb;
 
 ALTER TABLE llx_product_perentity ADD INDEX idx_product_perentity_fk_product (fk_product);
@@ -434,8 +435,4 @@ ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity
 -- Rebuild sequence for postgres only after query INSERT INTO llx_salary(rowid, ...
 -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
 
-UPDATE llx_const SET value = 'github' WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
-
--- For MultiCompany PMP per entity
-ALTER TABLE llx_product_perentity ADD pmp FLOAT NULL DEFAULT NULL AFTER accountancy_code_buy_export
-
+UPDATE llx_const SET value = 'github' WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_perentity.sql b/htdocs/install/mysql/tables/llx_product_perentity.sql
index 6e32e506ddf..495324f9f5b 100644
--- a/htdocs/install/mysql/tables/llx_product_perentity.sql
+++ b/htdocs/install/mysql/tables/llx_product_perentity.sql
@@ -26,5 +26,6 @@ create table llx_product_perentity
   accountancy_code_sell_export  varchar(32),                        -- Selling accountancy code for vat export
   accountancy_code_buy          varchar(32),                        -- Buying accountancy code
   accountancy_code_buy_intra    varchar(32),                        -- Buying accountancy code for vat intracommunity
-  accountancy_code_buy_export   varchar(32)                  		-- Buying accountancy code for vat import
+  accountancy_code_buy_export   varchar(32),                  		-- Buying accountancy code for vat import
+  pmp double(24,8)
 )ENGINE=innodb;

From 799d1de8303aad047dca2a366ad337bbd2439a09 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 29 Apr 2021 09:31:49 +0200
Subject: [PATCH 447/928] Update incoice.lib.php and index.php match eldy's
 requests

---
 htdocs/compta/index.php         |  4 +-
 htdocs/core/lib/invoice.lib.php | 80 +++++++++++++--------------------
 2 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 6994211213e..e33ddc35610 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -103,9 +103,9 @@ print load_fiche_titre($langs->trans("AccountancyTreasuryArea"), '', 'bill');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 //print getCustomerInvoicePieChart($socid);
-getNumberInvoicesPieChart('customers');
+print getNumberInvoicesPieChart('customers');
 print '<br>';
-getNumberInvoicesPieChart('fourn');
+print getNumberInvoicesPieChart('fourn');
 //print getPurchaseInvoicePieChart($socid);
 print '<br>';
 print getCustomerInvoiceDraftTable($max, $socid);
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index f294cbd7916..4a1d71de540 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -466,9 +466,25 @@ function getNumberInvoicesPieChart($mode)
 	global $conf, $db, $langs, $user;
 	if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 		include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
-		$langs->load("boxes");
-		$tmpinvoice = new Facture($db);
-		$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.type, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.datef";
+
+		$now = date_create(date('Y-m-d', dol_now()));
+		$datenowsub30 = date_create(date('Y-m-d', dol_now()));
+		$datenowsub15 = date_create(date('Y-m-d', dol_now()));
+		$datenowadd30 = date_create(date('Y-m-d', dol_now()));
+		$datenowadd15 = date_create(date('Y-m-d', dol_now()));
+		$interval30days = date_interval_create_from_date_string('30 days');
+		$interval15days = date_interval_create_from_date_string('15 days');
+		date_sub($datenowsub30, $interval30days);
+		date_sub($datenowsub15, $interval15days);
+		date_add($datenowadd30, $interval30days);
+		date_add($datenowadd15, $interval15days);
+
+		$sql = "SELECT sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub30, 'Y-m-d')."'", 1, 0).") as nblate30";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub15, 'Y-m-d')."'", 1, 0).") as nblate15";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($now, 'Y-m-d')."'", 1, 0).") as nblatenow";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd30, 'Y-m-d')."'", 1, 0).") as nbnotlate30";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd15, 'Y-m-d')."'", 1, 0).") as nbnotlate15";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement >= '".date_format($now, 'Y-m-d')."'", 1, 0).") as nbnotlatenow";
 		if ($mode == 'customers') {
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 		} elseif ($mode == 'fourn') {
@@ -482,55 +498,22 @@ function getNumberInvoicesPieChart($mode)
 		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			$now = date_create(date('Y-m-d', dol_now()));
-			$datenowsub30 = date_create(date('Y-m-d', dol_now()));
-			$datenowsub15 = date_create(date('Y-m-d', dol_now()));
-			$datenowadd30 = date_create(date('Y-m-d', dol_now()));
-			$datenowadd15 = date_create(date('Y-m-d', dol_now()));
-			$interval30days = date_interval_create_from_date_string('30 days');
-			$interval15days = date_interval_create_from_date_string('15 days');
-			date_sub($datenowsub30, $interval30days);
-			date_sub($datenowsub15, $interval15days);
-			date_add($datenowadd30, $interval30days);
-			date_add($datenowadd15, $interval15days);
-			$numberinvoices = array('late30'=>0,'late15'=>0,'late'=>0,'notlate'=>0,'notlate15'=>0,'notlate30'=>0);
-			$labelnumberinvoices = array('late30'=>'InvoiceLate30Days',
-			'late15'=>'InvoiceLate15Days',
-			'late'=>'InvoiceLateMinus15Days',
-			'notlate'=>'InvoiceNotLate',
-			'notlate15'=>'InvoiceNotLate15Days',
-			'notlate30'=>'InvoiceNotLate30Days');
 			$total = 0;
+			$dataseries = array();
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
-				$datef = date_create($obj->datef);
-				if ($datef < $datenowsub30) {
-					$numberinvoices['late30']++;
-				} elseif ($datef < $datenowsub15) {
-					$numberinvoices['late15']++;
-				} elseif ($datef < $now) {
-					$numberinvoices['late']++;
-				} elseif ($datef > $datenowadd30) {
-					$numberinvoices['notlate30']++;
-				} elseif ($datef > $datenowadd15) {
-					$numberinvoices['notlate15']++;
-				} else {
-					$numberinvoices['notlate']++;
-				}
-				$total++;
+				$dataseries = array(array($langs->trans('InvoiceLate30Days'),$obj->nblate30)
+									,array($langs->trans('InvoiceLate15Days'),$obj->nblate15-$obj->nblate30)
+									,array($langs->trans('InvoiceLateMinus15Days'),$obj->nblatenow-$obj->nblate15)
+									,array($langs->trans('InvoiceNotLate'),$obj->nbnotlatenow-$obj->nbnotlate15)
+									,array($langs->trans('InvoiceNotLate15Days'),$obj->nbnotlate15-$obj->nbnotlate30)
+									,array($langs->trans('InvoiceNotLate30Days'),$obj->nbnotlate30));
 				$i++;
 			}
-			$dataseries = array();
-			$colorseries = array();
-			foreach ($numberinvoices as $key => $nbinvoice) {
-				$dataseries[] = array($langs->trans($labelnumberinvoices[$key]),$nbinvoice);
+			foreach ($dataseries as $key=>$value) {
+				$total+=$value[1];
 			}
-			$colorseries[] = $badgeStatus8;
-			$colorseries[] = $badgeStatus1;
-			$colorseries[] = $badgeStatus3;
-			$colorseries[] = $badgeStatus2;
-			$colorseries[] = $badgeStatus4;
-			$colorseries[] = $badgeStatus0;
+			$colorseries = array($badgeStatus8,$badgeStatus1,$badgeStatus3,$badgeStatus2,$badgeStatus4,$badgeStatus0);
 			if ($conf->use_javascript_ajax) {
 				$result = '<div class="div-table-responsive-no-min">';
 				$result .= '<table class="noborder nohover centpercent">';
@@ -560,14 +543,15 @@ function getNumberInvoicesPieChart($mode)
 				} else {
 					return '';
 				}
-
 				$result .= '<tr maxwidth="255">';
 				$result .= '<td align="center" colspan="2">'.$dolgraph->show($total ? 0 : 1).'</td>';
 				$result .= '</tr>';
 				$result .= '</table>';
 				$result .= '</div>';
 			}
-			print $result;
+			return $result;
+		} else {
+			dol_print_error($db);
 		}
 	}
 }

From df2849152454406114472dacbb7495af211159cb Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 29 Apr 2021 09:40:47 +0200
Subject: [PATCH 448/928] every id is now clear in url + in the hash of the
 securekey

---
 .../eventorganization/class/conferenceorbooth.class.php  | 3 +--
 htdocs/eventorganization/conferenceorbooth_list.php      | 3 +--
 .../public/eventorganization/attendee_subscription.php   | 9 +++------
 htdocs/public/eventorganization/subscriptionok.php       | 3 +--
 htdocs/public/project/index.php                          | 3 +--
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 16e61959f0c..0df30ac61db 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -241,8 +241,7 @@ class ConferenceOrBooth extends ActionComm
 
 		$result = parent::fetch($id, $ref, $ref_ext, $email_msgid);
 
-		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
-		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$encodedid;
+		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$id;
 
 		$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index e3ba815121c..be8770b6390 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -364,8 +364,7 @@ if ($projectid > 0) {
 
 	// Link to the vote/register page
 	print '<tr><td>'.$langs->trans("RegisterPage").'</td><td>';
-	$encodedid = dol_encode($project->id, $dolibarr_main_instance_unique_id);
-	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$encodedid;
+	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$project->id;
 	$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$project->id, 2);
 	$linkregister .= '&securekey='.urlencode($encodedsecurekey);
 	print '<a target="_blank" href="'.$linkregister.'">'.$linkregister.'</a>';
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 4940f5965fe..c833cdaec8e 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -85,8 +85,7 @@ $email = GETPOST("email");
 $societe = GETPOST("societe");
 
 // Getting id from Post and decoding it
-$encodedid = GETPOST('id');
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$id = GETPOST('id');
 
 $conference = new ConferenceOrBooth($db);
 $resultconf = $conference->fetch($id);
@@ -248,9 +247,8 @@ if (empty($reshook) && $action == 'add') {
 
 		// If the attendee has already paid
 		if ($confattendee->status == 1) {
-			$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
 			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
 			Header("Location: ".$redirection);
 			exit;
 		}
@@ -434,9 +432,8 @@ if (empty($reshook) && $action == 'add') {
 				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			}
 
-			$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
 			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
 			Header("Location: ".$redirection);
 			exit;
 		}
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 31c3281a526..02fb456f7d2 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -65,8 +65,7 @@ $object = new stdClass(); // For triggers
 $error = 0;
 
 // Security check
-$encodedid = GETPOST("id");
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$id = GETPOST("id");
 $securekeyreceived = GETPOST("securekey");
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index d1744db0b4e..ce48db9e729 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -78,8 +78,7 @@ $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors",
 // No check on module enabled. Done later according to $validpaymentmethod
 
 $action = GETPOST('action', 'aZ09');
-$encodedid = GETPOST('id');
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$id = GETPOST('id');
 $securekeyreceived = GETPOST("securekey");
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 

From d1fe595c09af59eac57d24f19bc512840d974bd1 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 29 Apr 2021 10:00:49 +0200
Subject: [PATCH 449/928] fix on the clear ids

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index c833cdaec8e..70e994d57cd 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -475,7 +475,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'.
 print '<input type="hidden" name="token" value="'.newToken().'" / >';
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print '<input type="hidden" name="action" value="add" />';
-print '<input type="hidden" name="id" value="'.$encodedid.'" />';
+print '<input type="hidden" name="id" value="'.$id.'" />';
 print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
 
 print '<br>';

From 68415322ecfaef55e885bea7ee2f9b7b044c5e28 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Thu, 29 Apr 2021 10:00:54 +0200
Subject: [PATCH 450/928] Fix v11 wrong alias in natural_search

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

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 4590254ebf6..65996fc7283 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -511,7 +511,7 @@ if ($rowid > 0)
 		$sql .= " AND t.rowid = ".$object->id;
 		if ($sall)
 		{
-			$sql .= natural_search(array("f.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);
+			$sql .= natural_search(array("d.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);
 		}
 		if ($status != '')
 		{

From de8e291c7e53cd8b6a2f86c7b6395ada74f80c86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Apr 2021 10:01:10 +0200
Subject: [PATCH 451/928] Debug v14

---
 htdocs/adherents/card.php                     | 52 +++++++++----------
 htdocs/admin/eventorganization.php            |  7 +--
 ...ventorganization_confbooth_extrafields.php |  6 ++-
 ...nization_confboothattendee_extrafields.php |  8 +--
 htdocs/core/lib/admin.lib.php                 |  6 ++-
 htdocs/core/lib/functions.lib.php             | 16 +-----
 htdocs/core/tpl/onlinepaymentlinks.tpl.php    | 23 ++++----
 htdocs/langs/en_US/recruitment.lang           |  2 +-
 htdocs/modulebuilder/template/admin/about.php |  8 +--
 .../template/admin/myobject_extrafields.php   |  6 ++-
 htdocs/modulebuilder/template/admin/setup.php | 12 +++--
 .../template/myobject_agenda.php              |  2 +-
 .../modulebuilder/template/myobject_card.php  |  2 +-
 .../template/myobject_contact.php             |  2 +-
 .../template/myobject_document.php            |  2 +-
 .../modulebuilder/template/myobject_list.php  |  2 +-
 .../modulebuilder/template/myobject_note.php  |  2 +-
 .../admin/partnership_extrafields.php         |  5 +-
 htdocs/partnership/admin/setup.php            |  5 +-
 htdocs/partnership/partnership_list.php       |  2 +-
 .../product/actions_card_product.class.php    |  4 +-
 .../service/actions_card_service.class.php    |  4 +-
 htdocs/recruitment/lib/recruitment.lib.php    |  2 +-
 htdocs/stripe/admin/stripe.php                |  1 +
 htdocs/theme/eldy/btn.inc.php                 |  5 +-
 htdocs/theme/eldy/global.inc.php              |  4 ++
 26 files changed, 99 insertions(+), 91 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 6235ea1fa5b..496bf1580a9 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1857,7 +1857,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				// Send
 				if (empty($user->socid)) {
 					if (Adherent::STATUS_VALIDATED == $object->statut) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>'."\n";
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
 					}
 				}
 
@@ -1866,55 +1866,55 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				/*
 				if ($user->rights->adherent->creer) {
 					if (Adherent::STATUS_VALIDATED == $object->statut) {
-						if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a></div>\n";
-						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a></div>\n";
+						if ($object->email) print '<a class="butAction" href="card.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a>\n";
+						else print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a>\n";
 					} else {
-						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("SendCardByMail")."</font></div>";
+						print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("SendCardByMail")."</span>";
 					}
 				} else {
-					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
+					print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</span>";
 				}*/
 
 				// Modify
-				if ($user->rights->adherent->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+				if (!$user->rights->adherent->creer) {
+					print '<a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
 				} else {
-					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>'."\n";
+					print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</span>'."\n";
 				}
 
 				// Validate
 				if (Adherent::STATUS_DRAFT == $object->statut) {
 					if ($user->rights->adherent->creer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate").'</a></div>'."\n";
+						print '<a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate").'</a>'."\n";
 					} else {
-						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>'."\n";
+						print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</span>'."\n";
 					}
 				}
 
 				// Reactivate
 				if (Adherent::STATUS_RESILIATED == $object->statut || Adherent::STATUS_EXCLUDED == $Object->statut) {
 					if ($user->rights->adherent->creer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
+						print '<a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a>\n";
 					} else {
-						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable").'</font></div>'."\n";
+						print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable").'</span>'."\n";
 					}
 				}
 
 				// Resiliate
 				if (Adherent::STATUS_VALIDATED == $object->statut) {
 					if ($user->rights->adherent->supprimer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=resiliate">'.$langs->trans("Resiliate")."</a></div>\n";
+						print '<a class="butAction" href="card.php?rowid='.$id.'&action=resiliate">'.$langs->trans("Resiliate")."</a></span>\n";
 					} else {
-						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate").'</font></div>'."\n";
+						print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate").'</span>'."\n";
 					}
 				}
 
 				// Exclude
 				if (Adherent::STATUS_VALIDATED == $object->statut) {
 					if ($user->rights->adherent->supprimer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=exclude">'.$langs->trans("Exclude")."</a></div>\n";
+						print '<a class="butAction" href="card.php?rowid='.$id.'&action=exclude">'.$langs->trans("Exclude")."</a></span>\n";
 					} else {
-						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Exclude").'</font></div>'."\n";
+						print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Exclude").'</span>'."\n";
 					}
 				}
 
@@ -1922,12 +1922,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if (!empty($conf->societe->enabled) && !$object->socid) {
 					if ($user->rights->societe->creer) {
 						if (Adherent::STATUS_DRAFT != $object->statut) {
-							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>'."\n";;
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a>'."\n";;
 						} else {
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>'."\n";
+							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a>'."\n";
 						}
 					} else {
-						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty").'</font></div>'."\n";
+						print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty").'</span>'."\n";
 					}
 				}
 
@@ -1935,12 +1935,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if (!$user->socid && !$object->user_id) {
 					if ($user->rights->user->user->creer) {
 						if (Adherent::STATUS_DRAFT != $object->statut) {
-							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>'."\n";
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a>'."\n";
 						} else {
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>'."\n";
+							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a>'."\n";
 						}
 					} else {
-						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin").'</font></div>'."\n";
+						print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin").'</span>'."\n";
 					}
 				}
 
@@ -1949,18 +1949,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$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";
+						print '<a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip").'</a>'."\n";
 					}
 					if ($isinspip == 0) {
-						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 '<a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip").'</a>'."\n";
 					}
 				}
 
 				// Delete
 				if ($user->rights->adherent->supprimer) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>'."\n";
+					print '<a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>'."\n";
 				} else {
-					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete").'</font></div>'."\n";
+					print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete").'</span>'."\n";
 				}
 			}
 		}
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index b8b43914824..386b3bcd9e1 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -66,6 +66,8 @@ $arrayofparameters = array(
 $error = 0;
 $setupnotempty = 0;
 
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
 
 /*
  * Actions
@@ -180,15 +182,14 @@ if ($action == 'updateMask') {
 
 $form = new Form($db);
 
-//$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-
 $page_name = "EventOrganizationSetup";
+
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
 $linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($langs->trans($page_name), $linkback, 'eventorganization');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 // Configuration header
 $head = eventorganizationAdminPrepareHead();
diff --git a/htdocs/admin/eventorganization_confbooth_extrafields.php b/htdocs/admin/eventorganization_confbooth_extrafields.php
index 4b6f9bdc46a..6e19bde8268 100644
--- a/htdocs/admin/eventorganization_confbooth_extrafields.php
+++ b/htdocs/admin/eventorganization_confbooth_extrafields.php
@@ -59,12 +59,14 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$help_url = '';
+$page_name = "EventOrganizationSetup";
 
-llxHeader('', $langs->trans("EventOrganizationSetup"));
+llxHeader('', $langs->trans($page_name), $help_url);
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("EventOrganizationSetup"), $linkback, 'eventorganization');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 
 $head = eventorganizationAdminPrepareHead();
diff --git a/htdocs/admin/eventorganization_confboothattendee_extrafields.php b/htdocs/admin/eventorganization_confboothattendee_extrafields.php
index d9dd448bb42..6b201e6b923 100644
--- a/htdocs/admin/eventorganization_confboothattendee_extrafields.php
+++ b/htdocs/admin/eventorganization_confboothattendee_extrafields.php
@@ -63,17 +63,19 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$help_url = '';
+$page_name = 'EventOrganizationSetup';
 
-llxHeader('', $langs->trans("EventOrganizationSetup"), $help_url);
+llxHeader('', $langs->trans($page_name), $help_url);
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("EventOrganizationSetup"), $linkback, 'title_setup');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 
 $head = eventorganizationAdminPrepareHead();
 
-print dol_get_fiche_head($head, 'conferenceorboothattendee_extrafields', $langs->trans("ConferenceOrBoothAttendeeExtraFields"), -1, 'account');
+print dol_get_fiche_head($head, 'conferenceorboothattendee_extrafields', $langs->trans("ConferenceOrBoothAttendeeExtraFields"), -1, 'eventorganization');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 05ec254c7d7..b9ba7b96efc 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1524,7 +1524,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<td class="titlefieldcreate">'.$langs->trans("Description").'</td>';
+	print '<td class="">'.$langs->trans("Description").'</td>';
 	print '<td>';
 	$text = $langs->trans("Value");
 	print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
@@ -1669,17 +1669,21 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 					//var_dump($arraydefaultmessage);
 					//var_dump($arrayofmessagename);
 					print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);
+				} elseif (preg_match('/MAIL_FROM$/i', $const)) {
+					print img_picto('', 'email', 'class="pictofixedwidth"').'<input type="text" class="flat minwidth300" name="constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" value="'.dol_escape_htmltag($obj->value).'">';
 				} else { // type = 'string' ou 'chaine'
 					print '<input type="text" class="flat minwidth300" name="constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" value="'.dol_escape_htmltag($obj->value).'">';
 				}
 				print '</td>';
 			}
+
 			// Submit
 			if (empty($strictw3c)) {
 				print '<td class="center">';
 				print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
 				print "</td>";
 			}
+
 			print "</tr>\n";
 
 			if (empty($strictw3c)) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c996640bc2c..945f85376b4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3506,6 +3506,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		}
 	} else {
 		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
+		$pictowithouttext = str_replace('object_', '', $pictowithouttext);
 		if (empty($srconly) && in_array($pictowithouttext, array(
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
@@ -3518,20 +3519,6 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'images', 'info', 'intervention', 'inventory', 'intracommreport',
 				'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
 				'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
-				'object_accounting', 'object_account', 'object_accountline', 'object_action', 'object_asset', 'object_bank_account', 'object_barcode', 'object_bill', 'object_billr', 'object_billa', 'object_billd', 'object_bom',
-				'object_category', 'object_conferenceorbooth', 'object_conversation', 'object_bookmark', 'object_bug', 'object_building', 'object_clock', 'object_collab', 'object_dolly', 'object_dollyrevert',
-				'object_folder', 'object_folder-open','object_generic',
-				'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
-				'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_cron', 'object_donation', 'object_dynamicprice', 'object_establishment',
-				'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_inventory', 'object_intracommreport', 'object_label',
-				'object_margin', 'object_members', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
-				'object_lot', 'object_mrp', 'object_other',
-				'object_partnership', 'object_payment', 'object_pdf', 'object_product', 'object_propal',
-				'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
-				'object_reception', 'object_recruitmentjobposition', 'object_recruitmentcandidature',
-				'object_salary', 'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
-				'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
-				'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website', 'object_movement', 'object_workstation',
 				'off', 'on', 'order',
 				'paiment', 'play', 'pdf', 'phone', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip',
 				'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
@@ -3546,7 +3533,6 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'uncheck', 'user-cog', 'website', 'workstation',
 				'conferenceorbooth', 'eventorganization'
 			))) {
-			$pictowithouttext = str_replace('object_', '', $pictowithouttext);
 
 			$fakey = $pictowithouttext;
 			$facolor = '';
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index c4b2ad5e3e4..06d93e5ea5f 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -27,11 +27,12 @@ print '<!-- BEGIN PHP TEMPLATE ONLINEPAYMENTLINKS -->';
 
 // Url list
 print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><br>';
-print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount", $servicename).':<br>';
+print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount", $servicename).':</span><br>';
 print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'free')."</strong><br><br>\n";
+
 if (!empty($conf->commande->enabled)) {
 	print '<div id="order"></div>';
-	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';
+	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'order')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		$langs->load("orders");
@@ -40,7 +41,7 @@ if (!empty($conf->commande->enabled)) {
 
 		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Order")).': ';
 		print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';
-		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
+		print '<input type="submit" class="none reposition button smallpaddingimp" value="'.$langs->trans("GetSecuredUrl").'">';
 		if (GETPOST('generate_order_ref', 'alpha')) {
 			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));
@@ -53,7 +54,7 @@ if (!empty($conf->commande->enabled)) {
 }
 if (!empty($conf->facture->enabled)) {
 	print '<div id="invoice"></div>';
-	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';
+	print img_picto('', 'globe').'  <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'invoice')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		$langs->load("bills");
@@ -62,7 +63,7 @@ if (!empty($conf->facture->enabled)) {
 
 		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Invoice")).': ';
 		print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';
-		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
+		print '<input type="submit" class="none reposition button smallpaddingimp" value="'.$langs->trans("GetSecuredUrl").'">';
 		if (GETPOST('generate_invoice_ref', 'alpha')) {
 			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));
@@ -75,7 +76,7 @@ if (!empty($conf->facture->enabled)) {
 }
 if (!empty($conf->contrat->enabled)) {
 	print '<div id="contractline"></div>';
-	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';
+	print img_picto('', 'globe').'  <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'contractline')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		$langs->load("contracts");
@@ -84,7 +85,7 @@ if (!empty($conf->contrat->enabled)) {
 
 		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("ContractLine")).': ';
 		print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';
-		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
+		print '<input type="submit" class="none reposition button smallpaddingimp" value="'.$langs->trans("GetSecuredUrl").'">';
 		if (GETPOST('generate_contract_ref')) {
 			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));
@@ -97,7 +98,7 @@ if (!empty($conf->contrat->enabled)) {
 }
 if (!empty($conf->adherent->enabled)) {
 	print '<div id="membersubscription"></div>';
-	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';
+	print img_picto('', 'globe').'  <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'membersubscription')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		$langs->load("members");
@@ -106,7 +107,7 @@ if (!empty($conf->adherent->enabled)) {
 
 		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Member")).': ';
 		print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';
-		print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
+		print '<input type="submit" class="none reposition button smallpaddingimp" value="'.$langs->trans("GetSecuredUrl").'">';
 		if (GETPOST('generate_member_ref')) {
 			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));
@@ -119,7 +120,7 @@ if (!empty($conf->adherent->enabled)) {
 }
 if (!empty($conf->don->enabled)) {
 	print '<div id="donation"></div>';
-	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':<br>';
+	print img_picto('', 'globe').'  <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'donation')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		$langs->load("members");
@@ -128,7 +129,7 @@ if (!empty($conf->don->enabled)) {
 
 		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Don")).': ';
 		print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';
-		print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
+		print '<input type="submit" class="none reposition button smallpaddingimp" value="'.$langs->trans("GetSecuredUrl").'">';
 		if (GETPOST('generate_donation_ref')) {
 			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));
diff --git a/htdocs/langs/en_US/recruitment.lang b/htdocs/langs/en_US/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/en_US/recruitment.lang
+++ b/htdocs/langs/en_US/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 30cc93a6d51..6e169cad3ec 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -81,17 +81,19 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $form = new Form($db);
 
+$help_url = '';
 $page_name = "MyModuleAbout";
-llxHeader('', $langs->trans($page_name));
+
+llxHeader('', $langs->trans($page_name), $help_url);
 
 // Subheader
 $linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@mymodule');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 // Configuration header
 $head = mymoduleAdminPrepareHead();
-print dol_get_fiche_head($head, 'about', '', 0, 'mymodule@mymodule');
+print dol_get_fiche_head($head, 'about', $langs->trans($page_name), 0, 'mymodule@mymodule');
 
 dol_include_once('/mymodule/core/modules/modMyModule.class.php');
 $tmpmodule = new modMyModule($db);
diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
index cd2125547e8..5ce224c8528 100644
--- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php
+++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
@@ -91,17 +91,19 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$help_url = '';
+$page_name = "MyModuleSetup";
 
 llxHeader('', $langs->trans("MyModuleSetup"), $help_url);
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("MyModuleSetup"), $linkback, 'title_setup');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 
 $head = mymoduleAdminPrepareHead();
 
-print dol_get_fiche_head($head, 'myobject_extrafields', $langs->trans("MyObjectExtraFields"), -1, 'account');
+print dol_get_fiche_head($head, 'myobject_extrafields', $langs->trans($page_name), -1, 'mymodule@mymodule');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index d3cfb3fbef3..d687faebfb8 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -87,6 +87,8 @@ $arrayofparameters = array(
 $error = 0;
 $setupnotempty = 0;
 
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
 
 /*
  * Actions
@@ -201,19 +203,19 @@ if ($action == 'updateMask') {
 
 $form = new Form($db);
 
-$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-
+$help_url = '';
 $page_name = "MyModuleSetup";
-llxHeader('', $langs->trans($page_name));
+
+llxHeader('', $langs->trans($page_name), $help_url);
 
 // Subheader
 $linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@mymodule');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 // Configuration header
 $head = mymoduleAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', '', -1, "mymodule@mymodule");
+print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "mymodule@mymodule");
 
 // Setup page goes here
 echo '<span class="opacitymedium">'.$langs->trans("MyModuleSetupPage").'</span><br><br>';
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 8aef8558c8b..51ce708b755 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -184,7 +184,7 @@ if ($object->id > 0) {
 	$head = myobjectPrepareHead($object);
 
 
-	print dol_get_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'agenda', '', -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 7de7d8d9c5c..bc43961ec08 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -310,7 +310,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
-	print dol_get_fiche_head($head, 'card', $langs->trans("MyObject"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'card', '', -1, $object->picto);
 
 	$formconfirm = '';
 
diff --git a/htdocs/modulebuilder/template/myobject_contact.php b/htdocs/modulebuilder/template/myobject_contact.php
index 4817efe5e9b..dfc3d26f447 100644
--- a/htdocs/modulebuilder/template/myobject_contact.php
+++ b/htdocs/modulebuilder/template/myobject_contact.php
@@ -148,7 +148,7 @@ if ($object->id) {
 	 */
 	$head = myobjectPrepareHead($object);
 
-	print dol_get_fiche_head($head, 'contact', $langs->trans("MyObject"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'contact', '', -1, $object->picto);
 
 	$linkback = '<a href="'.dol_buildpath('/mymodule/myobject_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 47c88270e8b..d5340cd8eb7 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -157,7 +157,7 @@ if ($object->id) {
 	 */
 	$head = myobjectPrepareHead($object);
 
-	print dol_get_fiche_head($head, 'document', $langs->trans("MyObject"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'document', '', -1, $object->picto);
 
 
 	// Build file list
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 597a7d088df..29d940288b7 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -262,7 +262,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
 	}
 }
 // Add fields from hooks
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index 0868cd3918d..02a72fbb76c 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -133,7 +133,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$head = myobjectPrepareHead($object);
 
-	print dol_get_fiche_head($head, 'note', $langs->trans("MyObject"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'note', '', -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
diff --git a/htdocs/partnership/admin/partnership_extrafields.php b/htdocs/partnership/admin/partnership_extrafields.php
index a7f8bd9409e..7d819b3bbcb 100644
--- a/htdocs/partnership/admin/partnership_extrafields.php
+++ b/htdocs/partnership/admin/partnership_extrafields.php
@@ -92,8 +92,9 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  */
 
 $help_url = '';
+$title = $langs->trans("PartnershipSetup");
 
-llxHeader('', $langs->trans("PartnershipSetup"), $help_url);
+llxHeader('', $title, $help_url);
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -102,7 +103,7 @@ print load_fiche_titre($langs->trans("PartnershipSetup"), $linkback, 'object_par
 
 $head = partnershipAdminPrepareHead();
 
-print dol_get_fiche_head($head, 'partnership_extrafields', $langs->trans("PartnershipExtraFields"), -1, '');
+print dol_get_fiche_head($head, 'partnership_extrafields', $title, -1, 'partnership');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 7894b24b5bb..aac962ede72 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -127,15 +127,14 @@ if ($action) {
  */
 
 $title = $langs->trans('PartnershipSetup');
-$tab = $langs->trans("PartnershipSetup");
 
 llxHeader('', $title);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($title, $linkback, 'object_partnership');
+print load_fiche_titre($title, $linkback, 'title_setup');
 
 $head = partnershipAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', $tab, -1, '');
+print dol_get_fiche_head($head, 'settings', $title, -1, 'partnership');
 
 $form = new Form($db);
 
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 441ef1a2de8..d0a4738576d 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -266,7 +266,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
 	}
 }
 // Add fields from hooks
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 55a8977a4bd..3bda877af62 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -237,7 +237,7 @@ class ActionsCardProduct
 	 *
 	 *  @return	void
 	 */
-	private function getFieldList()
+	private function getFieldListCanvas()
 	{
 		global $conf, $langs;
 
@@ -296,7 +296,7 @@ class ActionsCardProduct
 		// phpcs:enable
 		global $conf, $langs;
 
-		$this->getFieldList();
+		$this->getFieldListCanvas();
 
 		$this->list_datas = array();
 
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index b27bbf5771c..53e0df73212 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -217,7 +217,7 @@ class ActionsCardService
 	 *
 	 *  @return	void
 	 */
-	private function getFieldList()
+	private function getFieldListCanvas()
 	{
 		global $conf, $langs;
 
@@ -276,7 +276,7 @@ class ActionsCardService
 		global $conf;
 		global $search_categ, $sall, $sref, $search_barcode, $snom, $catid;
 
-		$this->getFieldList();
+		$this->getFieldListCanvas();
 
 		$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
 		$sql .= ' p.fk_product_type, p.tms as datem,';
diff --git a/htdocs/recruitment/lib/recruitment.lib.php b/htdocs/recruitment/lib/recruitment.lib.php
index 97e8895344e..cb1f0b7e2bc 100644
--- a/htdocs/recruitment/lib/recruitment.lib.php
+++ b/htdocs/recruitment/lib/recruitment.lib.php
@@ -56,7 +56,7 @@ function recruitmentAdminPrepareHead()
 	$h++;
 
 	$head[$h][0] = dol_buildpath("/recruitment/admin/candidature_extrafields.php", 1);
-	$head[$h][1] = $langs->trans("ExtrafieldsCandidature");
+	$head[$h][1] = $langs->trans("ExtrafieldsApplication");
 	$head[$h][2] = 'candidature_extrafields';
 	$h++;
 
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index e6cfb8a1533..8c0f5f1f42b 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -359,6 +359,7 @@ print '</td></tr>';
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// What is this for ?
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BankAccountForBankTransfer").'</td><td>';
+	print img_picto('', 'bank_account').' ';
 	$form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
 	print '</td></tr>';
 }
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 92715b774ce..9d59357279e 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -46,12 +46,13 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 /* Buttons for actions                                                            */
 /* ============================================================================== */
 
-div.divButAction {
+/*div.divButAction {
 	margin-bottom: 1.4em;
-}
+}*/
 div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused, div.tabsAction > a.butActionDelete,
 div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete {
 	margin-bottom: 1.4em !important;
+	margin-right: 0px !important;
 }
 div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefused {
 	margin-bottom: 0 !important;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 1c6f711b154..32392b8491c 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3215,6 +3215,10 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 .smallpaddingimp {
 	padding: 4px !important;
 }
+input.button[name="upload"] {
+	padding: 4px !important;
+	font-size: 0.9em;
+}
 input.button.smallpaddingimp {
 	font-size: 0.8em;
 }

From a40083ae1c46d5768dfca04ad61cd5c4eb878385 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Apr 2021 10:03:16 +0200
Subject: [PATCH 452/928] Fix packaging

---
 build/rpm/dolibarr_fedora.spec   | 1 +
 build/rpm/dolibarr_generic.spec  | 1 +
 build/rpm/dolibarr_mandriva.spec | 1 +
 build/rpm/dolibarr_opensuse.spec | 1 +
 4 files changed, 4 insertions(+)

diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 662c80adf6c..5c380bb1f28 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -229,6 +229,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/workstation
 %_datadir/dolibarr/htdocs/zapier
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 72cb7599b45..6301de2993d 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -310,6 +310,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/workstation
 %_datadir/dolibarr/htdocs/zapier
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index a71a53e690f..5633ce8ed0d 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -226,6 +226,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/workstation
 %_datadir/dolibarr/htdocs/zapier
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 0d86e4297cc..5ece19a761a 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -237,6 +237,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/workstation
 %_datadir/dolibarr/htdocs/zapier
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch

From a2245bd7db5e21ad9c4ae7a227cba62ce1cb5433 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Apr 2021 10:13:43 +0200
Subject: [PATCH 453/928] Fix add of box

---
 htdocs/core/class/html.formother.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 18f3fd0f3ce..4fb0a44b06b 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -1174,14 +1174,15 @@ class FormOther
 	        	jQuery("#boxcombo").change(function() {
 	        	var boxid=jQuery("#boxcombo").val();
 	        		if (boxid > 0) {
+						console.log("A box widget has been selected for addition, we call ajax page to add it.")
 	            		var left_list = cleanSerialize(jQuery("#boxhalfleft").sortable("serialize"));
 	            		var right_list = cleanSerialize(jQuery("#boxhalfright").sortable("serialize"));
 	            		var boxorder = \'A:\' + left_list + \'-B:\' + right_list;
 	    				jQuery.ajax({
-	    					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", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=addbox&boxid=\'+boxid;
+	    					url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\'
+	    		        }).done(function() {
+	        				window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'\';
+						});
 	                }
 	        	});';
 			if (!count($arrayboxtoactivatelabel)) {

From d4fb9c7c4774f6d7d5e43c737831c99936d55ca0 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 29 Apr 2021 10:49:56 +0200
Subject: [PATCH 454/928] knowledgemanager finished

---
 .../modules/modKnowledgeManagement.class.php  |  2 +-
 .../install/mysql/migration/13.0.0-14.0.0.sql | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index 4441350aaea..9deeceb7f09 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -291,7 +291,7 @@ class modKnowledgeManagement extends DolibarrModules
 			'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'=>'ModuleKnowledgeManagementName',
-			'prefix' => img_picto('knowledgemanagement', 'knowledgemanagement', 'class="paddingright pictofixedwidth"'),
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth em092"'),
 			'mainmenu'=>'knowledgemanagement',
 			'leftmenu'=>'',
 			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 48095160c69..8eebe1db211 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -442,3 +442,29 @@ UPDATE llx_const SET value = 'github' WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK
 
 ALTER TABLE llx_facture_fourn_det ADD COLUMN fk_remise_except integer DEFAULT NULL after remise_percent;
 ALTER TABLE llx_facture_fourn_det ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except, fk_facture_fourn);
+
+CREATE TABLE llx_knowledgemanagement_knowledgerecord(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	ref varchar(128) NOT NULL, 
+	date_creation datetime NOT NULL, 
+	tms timestamp, 
+	last_main_doc varchar(255), 
+	fk_user_creat integer NOT NULL, 
+	fk_user_modif integer, 
+	fk_user_valid integer, 
+	import_key varchar(14), 
+	model_pdf varchar(255), 
+	question text NOT NULL, 
+	answer text, 
+	status integer NOT NULL
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
+
+create table llx_knowledgemanagement_knowledgerecord_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
\ No newline at end of file

From 4b4bf9321d8242314bf058c2158bc0d9faf528e6 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 29 Apr 2021 10:54:24 +0200
Subject: [PATCH 455/928] littlefix on creation

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

diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 7efda3f9938..3efbb844e35 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -218,7 +218,6 @@ class KnowledgeRecord extends CommonObject
 	 */
 	public function create(User $user, $notrigger = false)
 	{
-		$this->question = "ABCD";
 		return $this->createCommon($user, $notrigger);
 	}
 
@@ -883,6 +882,7 @@ class KnowledgeRecord extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
+		$this->question = "ABCD";
 		$this->initAsSpecimenCommon();
 	}
 

From a7b093ed81d81768e1a528e2370e8951222ea198 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 29 Apr 2021 11:34:09 +0200
Subject: [PATCH 456/928] FIX: Espadon PDF shippment model with long public
 note now wroking

---
 .../expedition/doc/pdf_espadon.modules.php    | 180 ++++++++++++++----
 1 file changed, 141 insertions(+), 39 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 165e83a8e87..e0d9695f79f 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -274,6 +274,15 @@ class pdf_espadon extends ModelePdfExpedition
 				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
 				$pdf->SetAutoPageBreak(1, 0);
 
+				// Create pdf instance
+				/*$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
+
+				$heightforinfotot = 40; // Height reserved to output the info and total part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+				*/
 				if (class_exists('TCPDF'))
 				{
 					$pdf->setPrintHeader(false);
@@ -306,13 +315,13 @@ class pdf_espadon extends ModelePdfExpedition
 				$pdf->AddPage();
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
 
 				$tab_top = 90;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift: 10);
 				$tab_height = 130;
 				$tab_height_newpage = 150;
 
@@ -351,62 +360,153 @@ class pdf_espadon extends ModelePdfExpedition
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
 
-				if (!empty($notetoshow) || !empty($object->tracking_number))
-				{
-					$tab_top = 88 + $height_incoterms;
-					$tab_top_alt = $tab_top;
-
-					$pdf->SetFont('', 'B', $default_font_size - 2);
-					$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
-
-					$tab_top_alt = $pdf->GetY();
-					//$tab_top_alt += 1;
+				if (!empty($notetoshow) || !empty($object->tracking_number)) {
+					$tab_top -= 2;
 
 					// Tracking number
-					if (!empty($object->tracking_number))
-					{
+					if (!empty($object->tracking_number)) {
+						$pdf->SetFont('', 'B', $default_font_size - 2);
+						$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber") . " : " . $object->tracking_number, 0, 1, false, true, 'L');
+
+						$tab_top_alt = $pdf->GetY();
 						$object->getUrlTrackingStatus($object->tracking_number);
-						if (!empty($object->tracking_url))
-						{
-							if ($object->shipping_method_id > 0)
-							{
+						if (!empty($object->tracking_url)) {
+							if ($object->shipping_method_id > 0) {
 								// Get code using getLabelFromKey
 								$code = $outputlangs->getLabelFromKey($this->db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 								$label = '';
-								if ($object->tracking_url != $object->tracking_number) $label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
-								$label .= $outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
+								if ($object->tracking_url != $object->tracking_number) $label .= $outputlangs->trans("LinkToTrackYourPackage") . "<br>";
+								$label .= $outputlangs->trans("SendingMethod") . ": " . $outputlangs->trans("SendingMethod" . strtoupper($code));
 								//var_dump($object->tracking_url != $object->tracking_number);exit;
-								if ($object->tracking_url != $object->tracking_number)
-								{
+								if ($object->tracking_url != $object->tracking_number) {
 									$label .= " : ";
 									$label .= $object->tracking_url;
 								}
 								$pdf->SetFont('', 'B', $default_font_size - 2);
 								$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top_alt, $label, 0, 1, false, true, 'L');
 
-								$tab_top_alt = $pdf->GetY();
+								$tab_top = $pdf->GetY();
 							}
 						}
 					}
 
+
 					// Notes
+					$pagenb = $pdf->getPage();
 					if (!empty($notetoshow))
 					{
-						$pdf->SetFont('', '', $default_font_size - 1); // In loop to manage multi-page
-						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top_alt, dol_htmlentitiesbr($notetoshow), 0, 1);
+						$tab_top -= 2;
+
+						$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+						$pageposbeforenote = $pagenb;
+
+						$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+						complete_substitutions_array($substitutionarray, $outputlangs, $object);
+						$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+						$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
+
+						$pdf->startTransaction();
+
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+						// Description
+						$pageposafternote = $pdf->getPage();
+						$posyafter = $pdf->GetY();
+
+						if ($pageposafternote > $pageposbeforenote)
+						{
+							$pdf->rollbackTransaction(true);
+
+							// prepare pages to receive notes
+							while ($pagenb < $pageposafternote) {
+								$pdf->AddPage();
+								$pagenb++;
+								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								// $this->_pagefoot($pdf,$object,$outputlangs,1);
+								$pdf->setTopMargin($tab_top_newpage);
+								// The only function to edit the bottom margin of current page to set it.
+								$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							}
+
+							// back to start
+							$pdf->setPage($pageposbeforenote);
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->SetFont('', '', $default_font_size - 1);
+							$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+							$pageposafternote = $pdf->getPage();
+
+							$posyafter = $pdf->GetY();
+
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
+							{
+								$pdf->AddPage('', '', true);
+								$pagenb++;
+								$pageposafternote++;
+								$pdf->setPage($pageposafternote);
+								$pdf->setTopMargin($tab_top_newpage);
+								// The only function to edit the bottom margin of current page to set it.
+								$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+								//$posyafter = $tab_top_newpage;
+							}
+
+
+							// apply note frame to previous pages
+							$i = $pageposbeforenote;
+							while ($i < $pageposafternote) {
+								$pdf->setPage($i);
+
+
+								$pdf->SetDrawColor(128, 128, 128);
+								// Draw note frame
+								if ($i > $pageposbeforenote) {
+									$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+									$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+								} else {
+									$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+									$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+								}
+
+								// Add footer
+								$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+								$this->_pagefoot($pdf, $object, $outputlangs, 1);
+
+								$i++;
+							}
+
+							// apply note frame to last page
+							$pdf->setPage($pageposafternote);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							$height_note = $posyafter - $tab_top_newpage;
+							$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+							$posyafter = $pdf->GetY();
+							$height_note = $posyafter - $tab_top;
+							$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+
+
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
+							{
+								// not enough space, need to add page
+								$pdf->AddPage('', '', true);
+								$pagenb++;
+								$pageposafternote++;
+								$pdf->setPage($pageposafternote);
+								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+
+								$posyafter = $tab_top_newpage;
+							}
+						}
+
+						$tab_height = $tab_height - $height_note;
+						$tab_top = $posyafter + 6;
+					} else {
+						$height_note = 0;
 					}
-
-					$nexY = $pdf->GetY();
-					$height_note = $nexY - $tab_top;
-
-					// Rect takes a length in 3rd parameter
-					$pdf->SetDrawColor(192, 192, 192);
-					$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
-
-					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY + 6;
-				} else {
-					$height_note = 0;
 				}
 
 
@@ -415,13 +515,15 @@ class pdf_espadon extends ModelePdfExpedition
 
 				// Table simulation to know the height of the title line
 				$pdf->startTransaction();
-				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
+				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs);
 				$pdf->rollbackTransaction(true);
 
 
 				$nexY = $tab_top + $this->tabTitleHeight;
 
 				// Loop on each lines
+				$pageposbeforeprintlines = $pdf->getPage();
+				$pagenb = $pageposbeforeprintlines;
 				for ($i = 0; $i < $nblines; $i++)
 				{
 					$curY = $nexY;
@@ -590,7 +692,7 @@ class pdf_espadon extends ModelePdfExpedition
 					while ($pagenb < $pageposafter)
 					{
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
+						if ($pagenb == $pageposbeforeprintlines)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {

From 655056ed31eb4270fceceffea8b1366a5cc033f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Apr 2021 12:10:55 +0200
Subject: [PATCH 457/928] Debug v14

---
 htdocs/admin/workstation.php                  | 26 ++++++-------
 htdocs/bom/class/bom.class.php                |  4 +-
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/commande/class/commande.class.php      |  2 +-
 htdocs/compta/bank/class/account.class.php    |  2 +-
 .../bank/class/paymentvarious.class.php       |  2 +-
 .../cashcontrol/class/cashcontrol.class.php   |  2 +-
 .../facture/class/facture-rec.class.php       |  2 +-
 htdocs/compta/facture/class/facture.class.php |  2 +-
 htdocs/contact/class/contact.class.php        |  2 +-
 htdocs/contrat/class/contrat.class.php        |  2 +-
 htdocs/core/class/commonobject.class.php      |  8 ++--
 htdocs/core/class/defaultvalues.class.php     |  2 +-
 .../core/class/emailsenderprofile.class.php   |  2 +-
 htdocs/core/lib/security.lib.php              |  1 +
 .../workstation/mod_workstation_standard.php  | 28 ++++++-------
 .../class/emailcollector.class.php            |  2 +-
 .../class/emailcollectoraction.class.php      |  2 +-
 .../class/emailcollectorfilter.class.php      |  2 +-
 .../class/conferenceorbooth.class.php         |  2 +-
 .../class/conferenceorboothattendee.class.php |  2 +-
 htdocs/langs/en_US/admin.lang                 |  1 +
 htdocs/modulebuilder/index.php                |  2 +-
 .../template/class/myobject.class.php         |  2 +-
 .../template/myobject_agenda.php              | 13 ++++---
 .../modulebuilder/template/myobject_card.php  |  8 ++--
 .../template/myobject_contact.php             | 10 +++--
 .../template/myobject_document.php            | 12 +++---
 .../modulebuilder/template/myobject_list.php  | 16 ++++----
 .../modulebuilder/template/myobject_note.php  | 12 +++---
 htdocs/mrp/class/mo.class.php                 |  2 +-
 .../partnership/class/partnership.class.php   |  2 +-
 .../class/productfournisseurprice.class.php   |  2 +-
 .../inventory/class/inventory.class.php       |  2 +-
 .../product/stock/class/productlot.class.php  |  2 +-
 htdocs/projet/class/project.class.php         |  2 +-
 .../class/recruitmentcandidature.class.php    |  2 +-
 .../class/recruitmentjobposition.class.php    |  2 +-
 htdocs/societe/class/societe.class.php        |  2 +-
 htdocs/ticket/class/ticket.class.php          |  2 +-
 htdocs/website/class/websitepage.class.php    |  2 +-
 .../workstation/class/workstation.class.php   | 18 ++++-----
 htdocs/workstation/lib/workstation.lib.php    |  2 +-
 .../lib/workstation_workstation.lib.php       |  6 +--
 htdocs/workstation/workstation_agenda.php     |  5 ++-
 htdocs/workstation/workstation_card.php       | 34 ++++++++--------
 htdocs/workstation/workstation_document.php   |  5 ++-
 htdocs/workstation/workstation_list.php       | 39 +++++++------------
 htdocs/workstation/workstation_note.php       |  3 +-
 htdocs/zapier/class/hook.class.php            |  2 +-
 50 files changed, 156 insertions(+), 155 deletions(-)

diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index c0b4055ba5b..1157000fd6b 100755
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -33,11 +33,6 @@ require_once DOL_DOCUMENT_ROOT . '/workstation/lib/workstation.lib.php';
 // Translations
 $langs->loadLangs(array("admin", "workstation"));
 
-// Access control
-if (!$user->admin) {
-	accessforbidden();
-}
-
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -52,14 +47,19 @@ $value = GETPOST('value', 'alpha');
 $error = 0;
 $setupnotempty = 0;
 
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+// Access control
+if (!$user->admin) {
+	accessforbidden();
+}
+
 
 /*
  * Actions
  */
 
-if ((float) DOL_VERSION >= 6) {
-	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
-}
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
 	$maskconstorder = GETPOST('maskconstWorkstation', 'alpha');
@@ -157,19 +157,19 @@ if ($action == 'updateMask') {
 
 $form = new Form($db);
 
-$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-
+$help_url = '';
 $page_name = "WorkstationSetup";
-llxHeader('', $langs->trans($page_name));
+
+llxHeader('', $langs->trans($page_name), $help_url);
 
 // Subheader
 $linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_workstation@workstation');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 // Configuration header
 $head = workstationAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', '', -1, "workstation@workstation");
+print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "workstation");
 
 // Setup page goes here
 //echo '<span class="opacitymedium">'.$langs->trans("WorkstationSetupPage").'</span><br><br>';
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 47246b8423d..b6ca36b6b42 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -81,7 +81,7 @@ class BOM extends CommonObject
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
@@ -1117,7 +1117,7 @@ class BOMLine extends CommonObjectLine
 	 *  'help' is a string visible as a tooltip on field
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 441020c9b5d..c544f5f7fe9 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -269,7 +269,7 @@ class Propal extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 074e3a6d67b..faf10596d8c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -280,7 +280,7 @@ class Commande extends CommonOrder
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 5a00e93e83f..4e0faea04cb 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -247,7 +247,7 @@ class Account extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index d9d50d74421..cdb2c0596f5 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -144,7 +144,7 @@ class PaymentVarious extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index cfd201e3ec4..a59816eebd7 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -73,7 +73,7 @@ class CashControl extends CommonObject
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 367523084e2..286b5a1ccea 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -154,7 +154,7 @@ class FactureRec extends CommonInvoice
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ac9a6c505d7..172788c8517 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -279,7 +279,7 @@ class Facture extends CommonInvoice
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 5befcba4537..78e4ffae99b 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -78,7 +78,7 @@ class Contact extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 3bfe1a2315e..186e4ee5761 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -206,7 +206,7 @@ class Contrat extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f24b864dfa8..c46da48b858 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6419,14 +6419,16 @@ abstract class CommonObject
 		} elseif (preg_match('/varchar/', $val['type'])) {
 			$param['options'] = array();
 			$type = 'varchar';
-		} elseif (is_array($this->fields[$key]['arrayofkeyval'])) {
-			$param['options'] = $this->fields[$key]['arrayofkeyval'];
-			$type = 'select';
 		} else {
 			$param['options'] = array();
 			$type = $this->fields[$key]['type'];
 		}
 
+		// Special case that force options and type ($type can be integer, varchar, ...)
+		if (is_array($this->fields[$key]['arrayofkeyval'])) {
+			$param['options'] = $this->fields[$key]['arrayofkeyval'];
+			$type = 'select';
+		}
 
 		$label = $this->fields[$key]['label'];
 		//$elementtype=$this->fields[$key]['elementtype'];	// Seems not used
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index c6be235b89a..5b49254b275 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -77,7 +77,7 @@ class DefaultValues extends CommonObject
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 7b9ee37225e..bea56d0701b 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -80,7 +80,7 @@ class EmailSenderProfile extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index e1df5da4dfb..ca689732e8b 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -526,6 +526,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 	if (!empty($objectid) && $objectid > 0) {
 		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select, $parentfortableentity);
 		$params = array('objectid' => $objectid, 'features' => join(',', $featuresarray), 'features2' => $feature2);
+		//print 'checkUserAccessToObject ok='.$ok;
 		return $ok ? 1 : accessforbidden('', 1, 1, 0, $params);
 	}
 
diff --git a/htdocs/core/modules/workstation/mod_workstation_standard.php b/htdocs/core/modules/workstation/mod_workstation_standard.php
index 34e727dd272..7bef21a8599 100755
--- a/htdocs/core/modules/workstation/mod_workstation_standard.php
+++ b/htdocs/core/modules/workstation/mod_workstation_standard.php
@@ -36,7 +36,7 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefix = 'WORKSTATION';
+	public $prefix = 'WKSTATION';
 
 	/**
 	 * @var string Error code (or message)
@@ -57,7 +57,7 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 	public function info()
 	{
 		global $langs;
-		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefNoDateModelDesc", $this->prefix);
 	}
 
 
@@ -68,7 +68,7 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 	 */
 	public function getExample()
 	{
-		return $this->prefix."0501-0001";
+		return $this->prefix."-0001";
 	}
 
 
@@ -83,13 +83,12 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 	{
 		global $conf, $langs, $db;
 
-		$coyymm = '';
 		$max = '';
 
-		$posindice = strlen($this->prefix) + 6;
+		$posindice = strlen($this->prefix) + 2;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."workstation_workstation";
-		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."-%'";
 		if ($object->ismultientitymanaged == 1) {
 			$sql .= " AND entity = ".$conf->entity;
 		} elseif ($object->ismultientitymanaged == 2) {
@@ -100,15 +99,14 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 		if ($resql) {
 			$row = $db->fetch_row($resql);
 			if ($row) {
-				$coyymm = substr($row[0], 0, 6);
 				$max = $row[0];
 			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
+		/*if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
-		}
+		}*/
 
 		return true;
 	}
@@ -124,10 +122,10 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 		global $db, $conf;
 
 		// First we get the max value
-		$posindice = strlen($this->prefix) + 6;
+		$posindice = strlen($this->prefix) + 2;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."workstation_workstation";
-		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."-%'";
 		//$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
@@ -143,17 +141,13 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 			return -1;
 		}
 
-		//$date=time();
-		$date = dol_now();
-		$yymm = strftime("%y%m", $date);
-
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
 			$num = sprintf("%04s", $max + 1);
 		}
 
-		dol_syslog("mod_workstation_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
-		return $this->prefix.$yymm."-".$num;
+		dol_syslog("mod_workstation_standard::getNextValue return ".$this->prefix."-".$num);
+		return $this->prefix."-".$num;
 	}
 }
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 9bff240c3ac..6643d95a4ab 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -89,7 +89,7 @@ class EmailCollector extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 10fe00a816d..bd044f37d0f 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -74,7 +74,7 @@ class EmailCollectorAction extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 736aeda47f4..d926a8bf14f 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -74,7 +74,7 @@ class EmailCollectorFilter extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 41fe4ebd94d..6c68cd827e7 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -91,7 +91,7 @@ class ConferenceOrBooth extends ActionComm
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 6418d73580b..d84a3785a75 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -88,7 +88,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6a11c26c50c..e5803332b9b 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1254,6 +1254,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index c4c0aceed3a..dc5a84071d7 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -783,7 +783,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 		 *  'help' is a string visible as a tooltip on field
 		 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 		 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-		 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+		 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 		 */
 
 		/*public $fields=array(
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 2c96190e232..e69c5bc333d 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -88,7 +88,7 @@ class MyObject extends CommonObject
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 51ce708b755..cc49275e5f8 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -132,13 +132,16 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
 }
 
-// Security check - Protection if external user
-// if ($user->socid > 0) accessforbidden();
-// if ($user->socid > 0) $socid = $user->socid;
-// $result = restrictedArea($user, 'mymodule', $object->id);
-
 $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php
 
+// Security check (enable the most restrictive one)
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//if (empty($conf->mymodule->enabled)) accessforbidden();
+//if (!$permissiontoread) accessforbidden();
+
 
 /*
  *  Actions
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index bc43961ec08..89c787e5a01 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -129,13 +129,13 @@ $permissionnote = $user->rights->mymodule->myobject->write; // Used by the inclu
 $permissiondellink = $user->rights->mymodule->myobject->write; // Used by the include of actions_dellink.inc.php
 $upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object->entity : 1];
 
-// Security check - Protection if external user
+// Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
 //if (empty($conf->mymodule->enabled)) accessforbidden();
-//if (empty($permissiontoread)) accessforbidden();
+//if (!$permissiontoread) accessforbidden();
 
 
 /*
@@ -310,7 +310,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
-	print dol_get_fiche_head($head, 'card', '', -1, $object->picto);
+	print dol_get_fiche_head($head, 'card', $langs->trans("Workstation"), -1, $object->picto);
 
 	$formconfirm = '';
 
diff --git a/htdocs/modulebuilder/template/myobject_contact.php b/htdocs/modulebuilder/template/myobject_contact.php
index dfc3d26f447..171ef3aab1d 100644
--- a/htdocs/modulebuilder/template/myobject_contact.php
+++ b/htdocs/modulebuilder/template/myobject_contact.php
@@ -78,12 +78,16 @@ $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
 
-// Security check - Protection if external user
+$permission = $user->rights->mymodule->myobject->write;
+
+// Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'mymodule', $object->id);
+//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//if (empty($conf->mymodule->enabled)) accessforbidden();
+//if (!$permissiontoread) accessforbidden();
 
-$permission = $user->rights->mymodule->myobject->write;
 
 /*
  * Add a new contact
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index d5340cd8eb7..8598cc3dd18 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -124,13 +124,15 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->mymodule->multidir_output[$object->entity ? $object->entity : $conf->entity]."/myobject/".get_exdir(0, 0, 0, 1, $object);
 }
 
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'mymodule', $object->id);
-
 $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php
 
+// Security check (enable the most restrictive one)
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//if (empty($conf->mymodule->enabled)) accessforbidden();
+//if (!$permissiontoread) accessforbidden();
 
 
 /*
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 29d940288b7..07a5cf4fa03 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -182,12 +182,14 @@ $permissiontodelete = $user->rights->mymodule->myobject->delete;
 if (empty($conf->mymodule->enabled)) {
 	accessforbidden('Module not enabled');
 }
-$socid = 0;
-if ($user->socid > 0) { // Protection if external user
-	//$socid = $user->socid;
-	accessforbidden();
-}
-//$result = restrictedArea($user, 'mymodule');
+
+// Security check (enable the most restrictive one)
+if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) accessforbidden();
+//$socid = 0; if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//if (empty($conf->mymodule->enabled)) accessforbidden();
 //if (!$permissiontoread) accessforbidden();
 
 
@@ -289,7 +291,7 @@ foreach ($search as $key => $val) {
 			continue;
 		}
 		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0)) {
+		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
 			if ($search[$key] == '-1' || $search[$key] === '0') {
 				$search[$key] = '';
 			}
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index 02a72fbb76c..f5fc29a2591 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -95,11 +95,6 @@ $hookmanager->initHooks(array('myobjectnote', 'globalcard')); // Note that conf-
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'mymodule', $id);
-
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id > 0 || !empty($ref)) {
@@ -109,6 +104,13 @@ if ($id > 0 || !empty($ref)) {
 $permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
 $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php
 
+// Security check (enable the most restrictive one)
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//if (empty($conf->mymodule->enabled)) accessforbidden();
+//if (!$permissiontoread) accessforbidden();
 
 
 /*
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index b357fd8a5b5..ea37715b4e5 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -85,7 +85,7 @@ class Mo extends CommonObject
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 4be5256062b..1dab8890050 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -89,7 +89,7 @@ class Partnership extends CommonObject
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index 709afcb6d20..41e1d2d0f6b 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -81,7 +81,7 @@ class ProductFournisseurPrice extends CommonObject
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index e872d7e353a..064be57091a 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -82,7 +82,7 @@ class Inventory extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index f05d6ebc168..5b516ec03d7 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -75,7 +75,7 @@ class Productlot extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 5032cc27a89..ca42e8a3fd1 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -211,7 +211,7 @@ class Project extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index db9c4eaaa4a..0069ce2d30f 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -91,7 +91,7 @@ class RecruitmentCandidature extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 68fb7a1fea6..86cd99e7180 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -87,7 +87,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 14ebede6b07..46b80e7f77e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -146,7 +146,7 @@ class Societe extends CommonObject
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 6d5f7022a41..6c883be6b1a 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -241,7 +241,7 @@ class Ticket extends CommonObject
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 2fd363c7965..ddfdea57ef2 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -138,7 +138,7 @@ class WebsitePage extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index b4364a2cc82..d81bab42eab 100755
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -87,7 +87,7 @@ class Workstation extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
 	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *
@@ -102,7 +102,7 @@ class Workstation extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'default'=>'', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'showoncombobox'=>'1',),
-		'type' => array('type'=>'select', 'label'=>'Type', 'enabled'=>'1', 'position'=>32, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('HUMAN'=>'Human', 'MACHINE'=>'Machine', 'BOTH'=>'HumanMachine'),),
+		'type' => array('type'=>'varchar(8)', 'label'=>'Type', 'enabled'=>'1', 'position'=>32, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('HUMAN'=>'Human', 'MACHINE'=>'Machine', 'BOTH'=>'HumanMachine'),),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
@@ -230,7 +230,7 @@ class Workstation extends CommonObject
 		$id = $this->createCommon($user, $notrigger);
 
 		// Usergroups
-		$groups = GETPOST('groups');
+		$groups = GETPOST('groups', 'array:int');
 		if (empty($groups)) {
 			$groups = $this->usergroups; // createFromClone
 		}
@@ -245,7 +245,7 @@ class Workstation extends CommonObject
 		}
 
 		// Resources
-		$resources = GETPOST('resources');
+		$resources = GETPOST('resources', 'array:int');
 		if (empty($resources)) {
 			$resources = $this->resources; // createFromClone
 		}
@@ -486,7 +486,7 @@ class Workstation extends CommonObject
 	{
 
 		// Usergroups
-		$groups = GETPOST('groups');
+		$groups = GETPOST('groups', 'array:int');
 		WorkstationUserGroup::deleteAllGroupsOfWorkstation($this->id);
 		$this->usergroups=array();
 
@@ -499,7 +499,7 @@ class Workstation extends CommonObject
 		}
 
 		// Resources
-		$resources = GETPOST('resources');
+		$resources = GETPOST('resources', 'array:int');
 		WorkstationResource::deleteAllResourcesOfWorkstation($this->id);
 		$this->resources=array();
 		if (!empty($resources)) {
@@ -849,7 +849,7 @@ class Workstation extends CommonObject
 		// phpcs:enable
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
-			//$langs->load("workstation@workstation");
+			//$langs->load("workstation");
 			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
 			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
 		}
@@ -948,7 +948,7 @@ class Workstation extends CommonObject
 	public function getNextNumRef()
 	{
 		global $langs, $conf;
-		$langs->load("workstation@workstation");
+		$langs->load("workstation");
 
 		if (empty($conf->global->WORKSTATION_WORKSTATION_ADDON)) {
 			$conf->global->WORKSTATION_WORKSTATION_ADDON = 'mod_workstation_standard';
@@ -1013,7 +1013,7 @@ class Workstation extends CommonObject
 		$result = 0;
 		$includedocgeneration = 0;
 
-		$langs->load("workstation@workstation");
+		$langs->load("workstation");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'standard_workstation';
diff --git a/htdocs/workstation/lib/workstation.lib.php b/htdocs/workstation/lib/workstation.lib.php
index 18307d0cd3a..fc57575bcf9 100755
--- a/htdocs/workstation/lib/workstation.lib.php
+++ b/htdocs/workstation/lib/workstation.lib.php
@@ -30,7 +30,7 @@ function workstationAdminPrepareHead()
 {
 	global $langs, $conf;
 
-	$langs->load("workstation@workstation");
+	$langs->load("workstation");
 
 	$h = 0;
 	$head = array();
diff --git a/htdocs/workstation/lib/workstation_workstation.lib.php b/htdocs/workstation/lib/workstation_workstation.lib.php
index a0cd7736d88..3869d3f9f9c 100755
--- a/htdocs/workstation/lib/workstation_workstation.lib.php
+++ b/htdocs/workstation/lib/workstation_workstation.lib.php
@@ -31,7 +31,7 @@ function workstationPrepareHead($object)
 {
 	global $db, $langs, $conf;
 
-	$langs->load("workstation@workstation");
+	$langs->load("workstation");
 
 	$h = 0;
 	$head = array();
@@ -84,9 +84,9 @@ function workstationPrepareHead($object)
 	//$this->tabs = array(
 	//	'entity:-tabname:Title:@workstation:/workstation/mypage.php?id=__ID__'
 	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'workstation@workstation');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'workstation');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'workstation@workstation', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'workstation', 'remove');
 
 	return $head;
 }
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
index f33961d5768..682431d7c8a 100755
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation_workstation.lib.php
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("workstation@workstation", "other"));
+$langs->loadLangs(array("workstation", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -85,7 +85,8 @@ if ($id > 0 || !empty($ref)) {
 $permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check
-restrictedArea($user, $object->element, $object->id, '', 'workstation');
+$isdraft = 0;
+restrictedArea($user, $object->element, $object->id, $object->table_element, 'workstation', 'fk_soc', 'rowid', $isdraft);
 
 
 /*
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
index 8f351523ecb..673b1db935d 100755
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation_workstation.lib.php
 require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstationusergroup.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("workstation@workstation", "other"));
+$langs->loadLangs(array("workstation", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -44,8 +44,9 @@ $cancel     = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'workstationcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$groups	= GETPOST('groups');
-$resources	= GETPOST('resources');
+
+$groups	= GETPOST('groups', 'array:int');
+$resources	= GETPOST('resources', 'array:int');
 //$lineid   = GETPOST('lineid', 'int');
 
 // Initialize technical objects
@@ -55,9 +56,9 @@ $diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$u
 $hookmanager->initHooks(array('workstationcard', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
-//$extrafields->fetch_name_optionals_label($object->table_element);
+$extrafields->fetch_name_optionals_label($object->table_element);
 
-//$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
@@ -77,13 +78,14 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 $permissiontoread = $user->rights->workstation->workstation->read;
 $permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->workstation->workstation->delete;
+$permissiontodelete = $user->rights->workstation->workstation->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
 $permissionnote = $user->rights->workstation->workstation->write; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->rights->workstation->workstation->write; // Used by the include of actions_dellink.inc.php
 $upload_dir = $conf->workstation->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 // Security check
-restrictedArea($user, $object->element, $object->id, '', 'workstation');
+$isdraft = 0;
+restrictedArea($user, $object->element, $object->id, $object->table_element, 'workstation', 'fk_soc', 'rowid', $isdraft);
 
 
 /*
@@ -153,7 +155,6 @@ $formfile = new FormFile($db);
 $formresource = new FormResource($db);
 
 $title = $langs->trans("Workstation");
-
 $help_url = 'EN:Module_Workstation';
 
 llxHeader('', $title, $help_url);
@@ -212,7 +213,7 @@ if ($action == 'create') {
 	print '</td>';
 	print '<td>';
 	print img_picto('', 'group');
-	print $form->select_dolgroups($groups, 'groups', 1, '', 0, '', '', $object->entity, true, 'minwidth200');
+	print $form->select_dolgroups($groups, 'groups', 1, '', 0, '', '', $object->entity, true, 'quatrevingtpercent widthcentpercentminusx');
 	print '</td></tr>';
 
 	print '<tr id="wsresources"><td>';
@@ -220,7 +221,7 @@ if ($action == 'create') {
 	print '</td>';
 	print '<td>';
 	print img_picto('', 'resource');
-	print $formresource->select_resource_list($resources, 'resources', '', '', 0, '', '', $object->entity, true, 0, 'minwidth200', true);
+	print $formresource->select_resource_list($resources, 'resources', '', '', 0, '', '', $object->entity, true, 0, 'quatrevingtpercent widthcentpercentminusx', true);
 	print '</td></tr>';
 
 	// Other attributes
@@ -269,7 +270,7 @@ if (($id || $ref) && $action == 'edit') {
 	print '</td>';
 	print '<td>';
 	print img_picto('', 'group');
-	print $form->select_dolgroups(empty($groups) ? $object->usergroups : $groups, 'groups', 1, '', 0, '', '', $object->entity, true);
+	print $form->select_dolgroups(empty($groups) ? $object->usergroups : $groups, 'groups', 1, '', 0, '', '', $object->entity, true, 'quatrevingtpercent widthcentpercentminusx');
 	print '</td></tr>';
 
 	print '<tr id="wsresources"><td>';
@@ -277,7 +278,7 @@ if (($id || $ref) && $action == 'edit') {
 	print '</td>';
 	print '<td>';
 	print img_picto('', 'resource');
-	print $formresource->select_resource_list(empty($resources) ? $object->resources : $resources, 'resources', '', '', 0, '', '', $object->entity, true, 0, '', true);
+	print $formresource->select_resource_list(empty($resources) ? $object->resources : $resources, 'resources', '', '', 0, '', '', $object->entity, true, 0, 'quatrevingtpercent widthcentpercentminusx', true);
 	print '</td></tr>';
 
 	// Other attributes
@@ -346,12 +347,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
-	 {
+	 if (! empty($conf->projet->enabled)) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
-	 if ($permissiontoadd)
-	 {
+	 if ($permissiontoadd) {
 	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
 	 $morehtmlref .= ' : ';
 	 if ($action == 'classify') {
@@ -393,6 +392,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($object->type === 'MACHINE') {
 		$object->fields['nb_operators_required']['visible'] = 0;
 	}
+
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
 	// Groups
@@ -422,7 +422,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
-	//include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 	print '</div>';
diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php
index 2deb06579b8..b33be2818dc 100755
--- a/htdocs/workstation/workstation_document.php
+++ b/htdocs/workstation/workstation_document.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
 require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation_workstation.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("workstation@workstation", "companies", "other", "mails"));
+$langs->loadLangs(array("workstation", "companies", "other", "mails"));
 
 
 $action = GETPOST('action', 'aZ09');
@@ -77,7 +77,8 @@ if ($id > 0 || !empty($ref)) {
 $permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check
-restrictedArea($user, $object->element, $object->id, '', 'workstation');
+$isdraft = 0;
+restrictedArea($user, $object->element, $object->id, $object->table_element, 'workstation', 'fk_soc', 'rowid', $isdraft);
 
 
 /*
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index c4141a7ac61..4ca96ec00ff 100755
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -71,6 +71,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
+	reset($object->fields);					// Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -91,8 +92,8 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 
-$groups = GETPOST('groups');
-$resources = GETPOST('resources');
+$groups = GETPOST('groups', 'array:int');
+$resources = GETPOST('resources', 'array:int');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
@@ -145,7 +146,7 @@ $permissiontoadd = $user->rights->workstation->workstation->write;
 $permissiontodelete = $user->rights->workstation->workstation->delete;
 
 // Security check
-restrictedArea($user, $object->element, 0, '', 'workstation');
+restrictedArea($user, $object->element, 0, $object->table_element, 'workstation');
 
 
 /*
@@ -219,7 +220,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -252,7 +253,7 @@ foreach ($search as $key => $val) {
 			continue;
 		}
 		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0)) {
+		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
 			if ($search[$key] == '-1' || $search[$key] === '0') {
 				$search[$key] = '';
 			}
@@ -283,12 +284,12 @@ if ($search_all) {
 
 // usergroups
 if (!empty($groups)) {
-	$sql.= ' AND wug.fk_usergroup IN('.implode(',', $groups).')';
+	$sql.= ' AND wug.fk_usergroup IN('.$db->sanitize(implode(',', $groups)).')';
 }
 
 // resources
 if (!empty($resources)) {
-	$sql.= ' AND wr.fk_resource IN('.implode(',', $resources).')';
+	$sql.= ' AND wr.fk_resource IN('.$db->sanitize(implode(',', $resources)).')';
 }
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -306,11 +307,12 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 }
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/,\s*$/', '', $sql);
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= $db->order($sortfield, $sortorder);
+//print $sql;
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -353,21 +355,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php
index b49be96dafa..18fa87b5ea6 100755
--- a/htdocs/workstation/workstation_note.php
+++ b/htdocs/workstation/workstation_note.php
@@ -61,7 +61,8 @@ $permissionnote = $user->rights->workstation->workstation->write; // Used by the
 $permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check
-restrictedArea($user, $object->element, $object->id, '', 'workstation');
+$isdraft = 0;
+restrictedArea($user, $object->element, $object->id, $object->table_element, 'workstation', 'fk_soc', 'rowid', $isdraft);
 
 
 /*
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 5197296f659..9197942b5c0 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -76,7 +76,7 @@ class Hook extends CommonObject
 	 *  'help' is a string visible as a tooltip on field
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 */
 
 	/**

From e3767557d81be8be222fcf5c0360f616bea5f875 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Apr 2021 12:33:49 +0200
Subject: [PATCH 458/928] Fix phpcs

---
 htdocs/core/lib/functions.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 945f85376b4..a75f220ab6e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3533,7 +3533,6 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'uncheck', 'user-cog', 'website', 'workstation',
 				'conferenceorbooth', 'eventorganization'
 			))) {
-
 			$fakey = $pictowithouttext;
 			$facolor = '';
 			$fasize = '';

From 762f41ea861018239eaa16cc88ca952960f107ef Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 29 Apr 2021 12:49:15 +0200
Subject: [PATCH 459/928] llx_c_productbatch_qcstatus as dictionnary name

---
 htdocs/admin/dict.php                                     | 7 +++++--
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql          | 8 ++++----
 ...status.key.sql => llx_c_productbatch_qcstatus.key.sql} | 2 +-
 ...ctbatch_status.sql => llx_c_productbatch_qcstatus.sql} | 2 +-
 htdocs/langs/en_US/productbatch.lang                      | 3 +++
 htdocs/langs/fr_FR/productbatch.lang                      | 6 +++++-
 6 files changed, 19 insertions(+), 9 deletions(-)
 rename htdocs/install/mysql/tables/{llx_c_productbatch_status.key.sql => llx_c_productbatch_qcstatus.key.sql} (90%)
 rename htdocs/install/mysql/tables/{llx_c_productbatch_status.sql => llx_c_productbatch_qcstatus.sql} (96%)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 8efbbf4cbfa..2b331c0c175 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -146,7 +146,7 @@ $tabname[39] = MAIN_DB_PREFIX."c_prospectcontactlevel";
 $tabname[40] = MAIN_DB_PREFIX."c_stcommcontact";
 $tabname[41] = MAIN_DB_PREFIX."c_transport_mode";
 $tabname[42] = MAIN_DB_PREFIX."c_product_nature";
-$tabname[43] = MAIN_DB_PREFIX."c_productbatch_status";
+$tabname[43] = MAIN_DB_PREFIX."c_productbatch_qcstatus";
 
 // Dictionary labels
 $tablib = array();
@@ -238,7 +238,7 @@ $tabsql[39] = "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_P
 $tabsql[40] = "SELECT id      as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcommcontact";
 $tabsql[41] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_transport_mode";
 $tabsql[42] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_product_nature";
-$tabsql[43] = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_productbatch_status";
+$tabsql[43] = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_productbatch_qcstatus";
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -1979,6 +1979,9 @@ if ($id) {
 							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') {
 								$langs->load("products");
 								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_productbatch_qcstatus') {
+								$langs->load("productbatch");
+								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
 							}
 							$class .= ($class ? ' ' : '').'tddict';
 							if ($fieldlist[$field] == 'note' && $id == 10) {
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 818381588c4..9eedc2872c6 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -141,17 +141,17 @@ CREATE TABLE llx_workstation_workstation_usergroup(
 	fk_workstation integer
 ) ENGINE=innodb;
 
-CREATE TABLE llx_c_producbatch_status(
+CREATE TABLE llx_c_producbatch_qcstatus(
   rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
   code     varchar(16)        NOT NULL,
   label    varchar(50)        NOT NULL,
   active   integer  DEFAULT 1 NOT NULL
 ) ENGINE=innodb;
 
-ALTER TABLE llx_c_productbatch_status ADD UNIQUE INDEX uk_c_productbatch_status(code);
+ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code);
 
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
 
 ALTER TABLE llx_product_customer_price ADD COLUMN ref_customer varchar(30);
 ALTER TABLE llx_product_customer_price_log ADD COLUMN ref_customer varchar(30);
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
similarity index 90%
rename from htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql
rename to htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
index fc72f556a97..1c00ac13deb 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
@@ -16,4 +16,4 @@
 --
 -- ========================================================================
 
-ALTER TABLE llx_c_productbatch_status ADD UNIQUE INDEX uk_c_productbatch_status(code);
+ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code);
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_status.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
similarity index 96%
rename from htdocs/install/mysql/tables/llx_c_productbatch_status.sql
rename to htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
index 2ffad7f5939..35a9581bf8e 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_status.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
@@ -16,7 +16,7 @@
 --
 -- ========================================================================
 
-create table llx_c_productbatch_status
+create table llx_c_productbatch_qcstatus
 (
   rowid    integer            AUTO_INCREMENT PRIMARY KEY,
   code     varchar(16)        NOT NULL,
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index aedf85a4fb8..2a19be96cf6 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -33,3 +33,6 @@ LotProductTooltip=Adds an option in the product card to define a dedicated batch
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index c3e48ddbeb1..49a249ce0e5 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -30,4 +30,8 @@ BatchLotNumberingModules=Modèle de génération et contrôle des numéros de lo
 BatchSerialNumberingModules=Modèle de génération et contrôle des numéros de série
 CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
 LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
-SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
\ No newline at end of file
+SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
+
+#Traceability - qc status
+OutOfOrder=Hors d'usage
+InWorkingOrder=En état de marche
\ No newline at end of file

From f7182d43fdd0c72cc9f49d97bf35926b36795763 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 29 Apr 2021 13:00:47 +0200
Subject: [PATCH 460/928] add entity in c_productbatch_qcstatus key

---
 ...roductbatch_status.sql => llx_c_productbatch_qcstatus.sql} | 4 ++--
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql              | 3 ++-
 .../install/mysql/tables/llx_c_productbatch_qcstatus.key.sql  | 2 +-
 htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql   | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename htdocs/install/mysql/data/{llx_c_productbatch_status.sql => llx_c_productbatch_qcstatus.sql} (83%)

diff --git a/htdocs/install/mysql/data/llx_c_productbatch_status.sql b/htdocs/install/mysql/data/llx_c_productbatch_qcstatus.sql
similarity index 83%
rename from htdocs/install/mysql/data/llx_c_productbatch_status.sql
rename to htdocs/install/mysql/data/llx_c_productbatch_qcstatus.sql
index cd57bbb504b..7e0bb6661f6 100644
--- a/htdocs/install/mysql/data/llx_c_productbatch_status.sql
+++ b/htdocs/install/mysql/data/llx_c_productbatch_qcstatus.sql
@@ -23,6 +23,6 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
 
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 9eedc2872c6..81b5f8b96f7 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -143,12 +143,13 @@ CREATE TABLE llx_workstation_workstation_usergroup(
 
 CREATE TABLE llx_c_producbatch_qcstatus(
   rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+  entity   integer NOT NULL DEFAULT 1,
   code     varchar(16)        NOT NULL,
   label    varchar(50)        NOT NULL,
   active   integer  DEFAULT 1 NOT NULL
 ) ENGINE=innodb;
 
-ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code);
+ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code, entity);
 
 INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
 INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
index 1c00ac13deb..9ffa27bc3a5 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
@@ -16,4 +16,4 @@
 --
 -- ========================================================================
 
-ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code);
+ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code, entity);
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
index 35a9581bf8e..73daa56067a 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
@@ -16,9 +16,10 @@
 --
 -- ========================================================================
 
-create table llx_c_productbatch_qcstatus
+CREATE TABLE llx_c_productbatch_qcstatus
 (
   rowid    integer            AUTO_INCREMENT PRIMARY KEY,
+  entity 	 integer NOT NULL DEFAULT 1,
   code     varchar(16)        NOT NULL,
   label    varchar(50)        NOT NULL,
   active   integer  DEFAULT 1 NOT NULL  

From b04afc17538981a8b259b5cf0d1e397fd645eb4d Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 29 Apr 2021 13:08:24 +0200
Subject: [PATCH 461/928] merge conflict resolution

---
 htdocs/admin/dict.php                | 4 ++--
 htdocs/langs/en_US/productbatch.lang | 2 +-
 htdocs/langs/fr_FR/productbatch.lang | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2b331c0c175..06aad44d123 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1978,10 +1978,10 @@ if ($id) {
 								$valuetoshow = $obj->state_code;
 							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') {
 								$langs->load("products");
-								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+								$valuetoshow = $langs->trans($obj->{$value});
 							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_productbatch_qcstatus') {
 								$langs->load("productbatch");
-								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+								$valuetoshow = $langs->trans($obj->{$value});
 							}
 							$class .= ($class ? ' ' : '').'tddict';
 							if ($fieldlist[$field] == 'note' && $id == 10) {
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 2a19be96cf6..756eb0a5947 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -35,4 +35,4 @@ QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 
 #Traceability - qc status
 OutOfOrder=Out of order
-InWorkingOrder=In working order
\ No newline at end of file
+InWorkingOrder=In working order
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 49a249ce0e5..37ebb65135b 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -34,4 +34,4 @@ SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle s
 
 #Traceability - qc status
 OutOfOrder=Hors d'usage
-InWorkingOrder=En état de marche
\ No newline at end of file
+InWorkingOrder=En état de marche

From f3ede35b4fa66d79132f7c672ac7106533447878 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 29 Apr 2021 13:18:14 +0200
Subject: [PATCH 462/928] lang correction

---
 htdocs/langs/en_US/admin.lang | 2 +-
 htdocs/langs/fr_FR/admin.lang | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9f93b416668..85bc7871a74 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1043,7 +1043,7 @@ DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
-DictionaryBatchStatus=Product batch status
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index ff8531e1809..9d33eb2b74a 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1043,7 +1043,7 @@ DictionaryOpportunityStatus=Statut d'opportunités pour les affaires/projets
 DictionaryExpenseTaxCat=Note de frais - catégories de déplacement
 DictionaryExpenseTaxRange=Note de frais - Tri par catégorie de déplacement
 DictionaryTransportMode=Déclaration d'échanges intracommunautaires - Mode de transport
-DictionaryBatchStatus=État du lot (produits)
+DictionaryBatchStatus=État de qualité du lot/série (produits)
 TypeOfUnit=Type d'unité
 SetupSaved=Configuration sauvegardée
 SetupNotSaved=Configuration non enregistrée

From d9e25c61bbbfc80ade62c277bdf1866441f76bec Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Thu, 29 Apr 2021 15:32:15 +0200
Subject: [PATCH 463/928] formAddObjectLine cant be overloaded by hook

---
 htdocs/bom/bom_card.php                                     | 5 ++++-
 htdocs/comm/propal/card.php                                 | 4 +++-
 htdocs/commande/card.php                                    | 4 +++-
 htdocs/compta/facture/card-rec.php                          | 4 +++-
 htdocs/compta/facture/card.php                              | 4 +++-
 htdocs/contrat/card.php                                     | 4 +++-
 htdocs/eventorganization/conferenceorboothattendee_card.php | 4 +++-
 htdocs/fourn/commande/card.php                              | 4 +++-
 htdocs/fourn/facture/card.php                               | 6 ++++--
 htdocs/modulebuilder/template/myobject_card.php             | 6 ++++--
 htdocs/partnership/partnership_card.php                     | 6 ++++--
 htdocs/supplier_proposal/card.php                           | 6 ++++--
 12 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 37ec67e1ba3..5969d402345 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -572,10 +572,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
 			if ($action != 'editline') {
 				// Add products/services form
-				$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+				
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
 			}
 		}
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index ebca0177868..3d305ee9b59 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2457,10 +2457,12 @@ if ($action == 'create') {
 	if ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines') {
 		if ($action != 'editline') {
 			// Add products/services form
-			$object->formAddObjectLine(1, $mysoc, $soc);
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			if (empty($reshook))
+				$object->formAddObjectLine(1, $societe, $mysoc);
 		} else {
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formEditObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 0665a567738..34d32b26c2e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2442,11 +2442,13 @@ if ($action == 'create' && $usercancreate) {
 		if ($object->statut == Commande::STATUS_DRAFT && $usercancreate && $action != 'selectlines') {
 			if ($action != 'editline') {
 				// Add free products/services
-				$object->formAddObjectLine(1, $mysoc, $soc);
 
 				$parameters = array();
 				// Note that $action and $object may be modified by hook
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action);
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(1, $societe, $mysoc);
 			}
 		}
 		print '</table>';
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 4f0148a05a1..496ca43386e 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1620,10 +1620,12 @@ if ($action == 'create') {
 		if ($object->statut == $object::STATUS_DRAFT && $user->rights->facture->creer && $action != 'valid' && $action != 'editline') {
 			if ($action != 'editline') {
 				// Add free products/services
-				$object->formAddObjectLine(0, $mysoc, $object->thirdparty); // No date selector for template invoice
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(0, $mysoc, $object->thirdparty); // No date selector for template invoice
 			}
 		}
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index bde5a6e6c38..4d206bd4790 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -5191,10 +5191,12 @@ if ($action == 'create') {
 	if ($object->statut == 0 && $usercancreate && $action != 'valid' && $action != 'editline') {
 		if ($action != 'editline' && $action != 'selectlines') {
 			// Add free products/services
-			$object->formAddObjectLine(1, $mysoc, $soc);
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			if (empty($reshook))
+				$object->formAddObjectLine(1, $societe, $mysoc);
 		}
 	}
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 1ab26b73c75..1393ecf4929 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1981,10 +1981,12 @@ if ($action == 'create') {
 				}
 
 				// Add free products/services
-				$object->formAddObjectLine(1, $mysoc, $soc);
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(1, $societe, $mysoc);
 			}
 
 			print '</table>';
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index 68f6c4eef13..1462a7ee8a7 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -595,10 +595,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
 			if ($action != 'editline') {
 				// Add products/services form
-				$object->formAddObjectLine(1, $mysoc, $soc);
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(1, $societe, $mysoc);
 			}
 		}
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 8358b71f2c7..c34e7d68fdb 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2309,10 +2309,12 @@ if ($action == 'create') {
 	if ($object->statut == CommandeFournisseur::STATUS_DRAFT && $usercancreate) {
 		if ($action != 'editline') {
 			// Add free products/services
-			$object->formAddObjectLine(1, $societe, $mysoc);
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			if (empty($reshook))
+				$object->formAddObjectLine(1, $societe, $mysoc);
 		}
 	}
 	print '</table>';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 578c9c7e062..8bb672d16cd 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3326,10 +3326,12 @@ if ($action == 'create') {
 		if ($object->statut == FactureFournisseur::STATUS_DRAFT && $usercancreate) {
 			if ($action != 'editline') {
 				// Add free products/services
-				$object->formAddObjectLine(1, $societe, $mysoc);
-
+				
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(1, $societe, $mysoc);
 			}
 		}
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index fe4cd496df0..b686bdf6cdf 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -458,10 +458,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
 			if ($action != 'editline') {
 				// Add products/services form
-				$object->formAddObjectLine(1, $mysoc, $soc);
-
+				
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(1, $mysoc, $soc);
 			}
 		}
 
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index dbf889137d8..acf1711724e 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -548,10 +548,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
 			if ($action != 'editline') {
 				// Add products/services form
-				$object->formAddObjectLine(1, $mysoc, $soc);
-
+				
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(1, $mysoc, $soc);
 			}
 		}
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 122b881495f..e382d274387 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1773,10 +1773,12 @@ if ($action == 'create') {
 	if ($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) {
 		if ($action != 'editline') {
 			// Add products/services form
-			$object->formAddObjectLine($dateSelector, $soc, $mysoc);
-
+		
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			if (empty($reshook))
+				$object->formAddObjectLine($dateSelector, $soc, $mysoc);
 		}
 	}
 

From 8fda2ba2b4d16bb1a483ffb99bee63ba6162c198 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 29 Apr 2021 13:34:43 +0000
Subject: [PATCH 464/928] Fixing style errors.

---
 htdocs/bom/bom_card.php                         | 2 +-
 htdocs/fourn/facture/card.php                   | 2 +-
 htdocs/modulebuilder/template/myobject_card.php | 2 +-
 htdocs/partnership/partnership_card.php         | 2 +-
 htdocs/supplier_proposal/card.php               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 5969d402345..2accdfd8d62 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -572,7 +572,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
 			if ($action != 'editline') {
 				// Add products/services form
-				
+
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 8bb672d16cd..36ad97a19de 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3326,7 +3326,7 @@ if ($action == 'create') {
 		if ($object->statut == FactureFournisseur::STATUS_DRAFT && $usercancreate) {
 			if ($action != 'editline') {
 				// Add free products/services
-				
+
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index b686bdf6cdf..a89fb588d14 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -458,7 +458,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
 			if ($action != 'editline') {
 				// Add products/services form
-				
+
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index acf1711724e..8de5fb5138a 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -548,7 +548,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
 			if ($action != 'editline') {
 				// Add products/services form
-				
+
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index e382d274387..2c62db6a2ce 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1773,7 +1773,7 @@ if ($action == 'create') {
 	if ($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) {
 		if ($action != 'editline') {
 			// Add products/services form
-		
+
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

From 54ab2e523d9176c0e064203611f2f3a4606e6e69 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 29 Apr 2021 15:40:45 +0200
Subject: [PATCH 465/928] Update llx_10_c_regions.sql

Hungary - sorting & regions in hungarian
---
 .../install/mysql/data/llx_10_c_regions.sql   | 104 ++++++++----------
 1 file changed, 48 insertions(+), 56 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index 65b3af4950e..d55455a215a 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -36,16 +36,8 @@
 
 
 -- NOTES ---------------------------------------------------------------------
--- Regions 
--- ID Country 
--- 1 France
--- 2 Belgium
--- 3 Italy
--- 4 Spain
--- 5 Germany -> use departments
--- 6 Switzerland
--- 7 United Kingdom (NOT England)
---
+-- fk_pays = id country = rowid of llx_00_c_country.sql
+
 
 -- CONTENT -------------------------------------------------------------------
 -- 
@@ -175,40 +167,40 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 6
 
 
 -- China Regions (rowid country=9)
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 901, '京',0,'北京市');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 902, '津',0,'天津市');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 903, '沪',0,'上海市');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 904, '渝',0,'重庆市');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 905, '冀',0,'河北省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 906, '晋',0,'山西省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 907, '辽',0,'辽宁省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 908, '吉',0,'吉林省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 909, '黑',0,'黑龙江省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 910, '苏',0,'江苏省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 911, '浙',0,'浙江省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 912, '皖',0,'安徽省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 913, '闽',0,'福建省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 914, '赣',0,'江西省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 915, '鲁',0,'山东省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 916, '豫',0,'河南省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 917, '鄂',0,'湖北省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 918, '湘',0,'湖南省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 919, '粤',0,'广东省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 920, '琼',0,'海南省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 921, '川',0,'四川省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 922, '贵',0,'贵州省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 923, '云',0,'云南省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 924, '陕',0,'陕西省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 925, '甘',0,'甘肃省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 926, '青',0,'青海省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 927, '台',0,'台湾省');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 928, '蒙',0,'内蒙古自治区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 929, '桂',0,'广西壮族自治区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 930, '藏',0,'西藏自治区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 931, '宁',0,'宁夏回族自治区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 932, '新',0,'新疆维吾尔自治区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 933, '港',0,'香港特别行政区');
-insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 934, '澳',0,'澳门特别行政区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 901, '京',0, '北京市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 902, '津',0, '天津市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 903, '沪',0, '上海市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 904, '渝',0, '重庆市');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 905, '冀',0, '河北省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 906, '晋',0, '山西省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 907, '辽',0, '辽宁省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 908, '吉',0, '吉林省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 909, '黑',0, '黑龙江省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 910, '苏',0, '江苏省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 911, '浙',0, '浙江省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 912, '皖',0, '安徽省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 913, '闽',0, '福建省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 914, '赣',0, '江西省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 915, '鲁',0, '山东省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 916, '豫',0, '河南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 917, '鄂',0, '湖北省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 918, '湘',0, '湖南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 919, '粤',0, '广东省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 920, '琼',0, '海南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 921, '川',0, '四川省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 922, '贵',0, '贵州省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 923, '云',0, '云南省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 924, '陕',0, '陕西省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 925, '甘',0, '甘肃省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 926, '青',0, '青海省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 927, '台',0, '台湾省');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 928, '蒙',0, '内蒙古自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 929, '桂',0, '广西壮族自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 930, '藏',0, '西藏自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 931, '宁',0, '宁夏回族自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 932, '新',0, '新疆维吾尔自治区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 933, '港',0, '香港特别行政区');
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9, 934, '澳',0, '澳门特别行政区');
 
 
 -- Colombie Regions (id country=70)
@@ -270,13 +262,13 @@ insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 1
 
 
 -- Hungary Regions (rowid country=18)
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 183100, 'HU31', NULL, 'Northern Hungary');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 183200, 'HU32', NULL, 'Northern Great Plain');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 183300, 'HU33', NULL, 'Southern Great Plain');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 180100, 'HU1',  NULL, 'Central Hungary');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 182100, 'HU21', NULL, 'Central Transdanubia');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 182200, 'HU22', NULL, 'Western Transdanubia');
-INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 182300, 'HU23', NULL, 'Southern Transdanubia');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 180100, 'HU1',  NULL, 'Közép-Magyarország');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 182100, 'HU21', NULL, 'Közép-Dunántúl');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 182200, 'HU22', NULL, 'Nyugat-Dunántúl');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 182300, 'HU23', NULL, 'Dél-Dunántúl');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 183100, 'HU31', NULL, 'Észak-Magyarország');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 183200, 'HU32', NULL, 'Észak-Alföld');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 18, 183300, 'HU33', NULL, 'Dél-Alföld');
 
 
 -- India Regions (id country=117)
@@ -311,9 +303,9 @@ insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 3
 
 
 -- Luxembourg Regions (districts) (id country=140)
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 140, 14001, '', 0, 'Diekirch');
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 140, 14002, '', 0, 'Grevenmacher');
-INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 140, 14003, '', 0, 'Luxembourg');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 140, 14001, '', 0, 'Diekirch');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 140, 14002, '', 0, 'Grevenmacher');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 140, 14003, '', 0, 'Luxembourg');
 
 
 -- Mauritius Regions (id country=152)
@@ -438,7 +430,7 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 4
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 6, 601, '', 1, 'Cantons'); 
 
 
--- Taiwan Regions (rowid country=213)
+-- Taiwan Region (rowid country=213)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 213, 21301, 'TW', NULL, 'Taiwan');
 
 
@@ -469,7 +461,7 @@ insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 1
 insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 10, 1024, '', 0, 'Zaghouan');
 
 
--- United Arab Emirates (UAE) Regions (rowid country=227)
+-- United Arab Emirates (UAE) Region (rowid country=227)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 227, 22701, '', 0, 'United Arab Emirates');
 
 

From e7e2953a9ec47ee6ac702ce506e844a5c3d6afcd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Apr 2021 15:49:44 +0200
Subject: [PATCH 466/928] Look and feel

---
 htdocs/admin/ihm.php               | 10 ++++++----
 htdocs/admin/index.php             |  2 +-
 htdocs/core/lib/functions.lib.php  |  4 ++--
 htdocs/core/lib/usergroups.lib.php |  6 +++---
 htdocs/theme/md/style.css.php      |  3 +++
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 8c504426195..fca55ac7c44 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -312,8 +312,9 @@ print '<br>';
 
 // Other
 print '<div class="div-table-responsive-no-min">';
-print '<table summary="otherparameters" class="noborder centpercent editmode">';
-print '<tr class="liste_titre"><th>'.$langs->trans("Miscellaneous").'</th><th></th>';
+print '<table summary="otherparameters" class="noborder centpercent editmode tableforfield">';
+print '<tr class="liste_titre"><th class="titlefieldmiddle">'.$langs->trans("Miscellaneous").'</th>';
+print '<th></th>';
 print '<th width="20">&nbsp;</tg>';
 print '</tr>';
 
@@ -441,8 +442,9 @@ print '<br>';
 
 // Other
 print '<div class="div-table-responsive-no-min">';
-print '<table summary="edit" class="noborder centpercent editmode">';
-print '<tr class="liste_titre"><th>'.$langs->trans("LoginPage").'</th><th></th>';
+print '<table summary="edit" class="noborder centpercent editmode tableforfield">';
+print '<tr class="liste_titre"><th class="titlefieldmiddle">'.$langs->trans("LoginPage").'</th>';
+print '<th></th>';
 print '<th width="20">&nbsp;</th>';
 print '</tr>';
 
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index a97717412a9..396570b2155 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -75,7 +75,7 @@ print $langs->trans("SetupDescription2", $langs->transnoentities("MenuCompanySet
 print "<br><br>";
 print '</span>';
 
-print '<br>';
+print '<br><br>';
 
 // Show info setup company
 if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a75f220ab6e..6c4d73c4e49 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3610,10 +3610,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			if (in_array($pictowithouttext, array('dollyrevert', 'member', 'members', 'contract', 'group', 'resource', 'shipment'))) {
 				$morecss = 'em092';
 			}
-			if (in_array($pictowithouttext, array('conferenceorbooth', 'collab', 'eventorganization', 'holiday', 'project', 'workstation'))) {
+			if (in_array($pictowithouttext, array('conferenceorbooth', 'collab', 'eventorganization', 'holiday', 'info', 'project', 'workstation'))) {
 				$morecss = 'em088';
 			}
-			if (in_array($pictowithouttext, array('intervention', 'info', 'payment', 'loan', 'partnership', 'stock', 'technic'))) {
+			if (in_array($pictowithouttext, array('intervention', 'payment', 'loan', 'partnership', 'stock', 'technic'))) {
 				$morecss = 'em080';
 			}
 
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 93469e9e3c7..700c9c5ed86 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -343,7 +343,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 	// Title
 	if ($foruserprofile) {
-		print '<tr class="liste_titre"><th class="titlefieldcreate">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';
+		print '<tr class="liste_titre"><th class="titlefieldmiddle">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';
 		print '<th colspan="2">&nbsp;</th>';
 		print '</tr>';
 
@@ -359,7 +359,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			$dirthemestring .= '"'.$dirtheme.'" ';
 		}
 
-		print '<tr class="liste_titre"><th class="titlefieldcreate">';
+		print '<tr class="liste_titre"><th class="titlefieldmiddle">';
 		print $form->textwithpicto($langs->trans("DefaultSkin"), $langs->trans("ThemeDir").' : '.$dirthemestring);
 		print '</th>';
 		print '<th class="right">';
@@ -448,7 +448,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		// Nothing
 	} else {
 		// Show logo
-		print '<tr class="oddeven"><td class="titlefieldcreate">'.$langs->trans("EnableShowLogo").'</td><td>';
+		print '<tr class="oddeven"><td class="titlefieldmiddle">'.$langs->trans("EnableShowLogo").'</td><td>';
 		if ($edit) {
 			print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
 			//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7b49acc63b5..17b166d373c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2000,6 +2000,9 @@ div.nopadding {
 	margin : 0px auto;
 }
 
+td.nobordernopadding.widthpictotitle.col-picto {
+	opacity: 0.9;
+}
 .pictotitle {
 	margin-<?php echo $right; ?>: 8px;
 	margin-bottom: 4px;

From 2c8ab51dac450a5ab5419b92faca4ba9074847b5 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 29 Apr 2021 15:55:38 +0200
Subject: [PATCH 467/928] Update llx_20_c_departements.sql

Portugal (remove '' at fk_region)
---
 .../mysql/data/llx_20_c_departements.sql      | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 96431caf5b1..fd60de31aa3 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -56,6 +56,7 @@
 -- Netherlands
 -- (Moroco)
 -- Panama
+-- Portugal
 -- Romania
 -- Slovenia (need to check code SI-Id)
 -- Taiwan
@@ -775,6 +776,30 @@ INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-13', '', 0, '', 'Panamá Oeste');
 
 
+-- Portugal Provinces / Postal Districts (rowid country=25)
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-AV', NULL, NULL, 'AVEIRO', 'Aveiro');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15002, 'PT-AC', NULL, NULL, 'AZORES', 'Azores');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-BE', NULL, NULL, 'BEJA', 'Beja');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-BR', NULL, NULL, 'BRAGA', 'Braga');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-BA', NULL, NULL, 'BRAGANCA', 'Bragança');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-CB', NULL, NULL, 'CASTELO BRANCO', 'Castelo Branco');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-CO', NULL, NULL, 'COIMBRA', 'Coimbra');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-EV', NULL, NULL, 'EVORA', 'Évora');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-FA', NULL, NULL, 'FARO', 'Faro');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-GU', NULL, NULL, 'GUARDA', 'Guarda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-LE', NULL, NULL, 'LEIRIA', 'Leiria');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-LI', NULL, NULL, 'LISBON', 'Lisboa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-AML',NULL, NULL, 'AREA METROPOLITANA LISBOA', 'Área Metropolitana de Lisboa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15002, 'PT-MA', NULL, NULL, 'MADEIRA', 'Madeira');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-PA', NULL, NULL, 'PORTALEGRE', 'Portalegre');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-PO', NULL, NULL, 'PORTO', 'Porto');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-SA', NULL, NULL, 'SANTAREM', 'Santarém');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-SE', NULL, NULL, 'SETUBAL', 'Setúbal');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-VC', NULL, NULL, 'VIANA DO CASTELO', 'Viana Do Castelo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-VR', NULL, NULL, 'VILA REAL', 'Vila Real');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-VI', NULL, NULL, 'VISEU', 'Viseu');
+
+
 -- Romania Provinces (id country=188)
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (18801, 'AB', '', 0, '', 'Alba');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (18801, 'AR', '', 0, '', 'Arad');
@@ -1695,35 +1720,11 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 
 
 -- Provinces United Arab Emirates (id country=227)
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AE-1', 22701, '', 0, '', 'Abu Dhabi', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AE-2', 22701, '', 0, '', 'Dubai', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AE-3', 22701, '', 0, '', 'Ajman', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AE-4', 22701, '', 0, '', 'Fujairah', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AE-5', 22701, '', 0, '', 'Ras al-Khaimah', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AE-6', 22701, '', 0, '', 'Sharjah', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AE-7', 22701, '', 0, '', 'Umm al-Quwain', 1);
-
-
--- Provinces (postal districts) Portugal (rowid country=25)
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-AV', NULL, NULL, 'AVEIRO', 'Aveiro');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15002', 'PT-AC', NULL, NULL, 'AZORES', 'Azores');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-BE', NULL, NULL, 'BEJA', 'Beja');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-BR', NULL, NULL, 'BRAGA', 'Braga');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-BA', NULL, NULL, 'BRAGANCA', 'Bragança');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-CB', NULL, NULL, 'CASTELO BRANCO', 'Castelo Branco');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-CO', NULL, NULL, 'COIMBRA', 'Coimbra');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-EV', NULL, NULL, 'EVORA', 'Évora');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-FA', NULL, NULL, 'FARO', 'Faro');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-GU', NULL, NULL, 'GUARDA', 'Guarda');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-LE', NULL, NULL, 'LEIRIA', 'Leiria');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-LI', NULL, NULL, 'LISBON', 'Lisboa');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-AML',NULL, NULL, 'AREA METROPOLITANA LISBOA', 'Área Metropolitana de Lisboa');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15002', 'PT-MA', NULL, NULL, 'MADEIRA', 'Madeira');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-PA', NULL, NULL, 'PORTALEGRE', 'Portalegre');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-PO', NULL, NULL, 'PORTO', 'Porto');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-SA', NULL, NULL, 'SANTAREM', 'Santarém');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-SE', NULL, NULL, 'SETUBAL', 'Setúbal');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-VC', NULL, NULL, 'VIANA DO CASTELO', 'Viana Do Castelo');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-VR', NULL, NULL, 'VILA REAL', 'Vila Real');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('15001', 'PT-VI', NULL, NULL, 'VISEU', 'Viseu');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-1', 22701, '', 0, '', 'Abu Dhabi');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-2', 22701, '', 0, '', 'Dubai');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-3', 22701, '', 0, '', 'Ajman');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-4', 22701, '', 0, '', 'Fujairah');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-5', 22701, '', 0, '', 'Ras al-Khaimah');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-6', 22701, '', 0, '', 'Sharjah');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-7', 22701, '', 0, '', 'Umm al-Quwain');
 

From 330c08ac139ebe8ed74e64461242a97172dec1f7 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Thu, 29 Apr 2021 15:59:55 +0200
Subject: [PATCH 468/928] remove number to text type input

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 09749ae612e..e25570e4b42 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -257,7 +257,7 @@ if (!in_array($action, array("updateRate", "deleteRate"))) {
 	print '<td>'.$form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ? GETPOST('multicurrency_code', 'alpha') : $multicurrency_code), 'multicurrency_code', 1, " code != '".$conf->currency."'", true).'</td>';
 
 	print ' <td>'.$langs->trans('Rate').'</td>';
-	print ' <td><input type="number" min="0" step="any" class="maxwidth75" name="rateinput" value="'.dol_escape_htmltag($rateinput).'"></td>';
+	print ' <td><input type="text" min="0" step="any" class="maxwidth75" name="rateinput" value="'.dol_escape_htmltag($rateinput).'"></td>';
 
 	print '<td>';
 	print '<input type="hidden" name="action" value="create">';

From 5f7a3571cd70059189863f019d677cfb5849ddd6 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 29 Apr 2021 16:08:27 +0200
Subject: [PATCH 469/928] Update llx_00_c_country.sql

countries in english
---
 htdocs/install/mysql/data/llx_00_c_country.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index b0d578829b9..88df2349391 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -35,17 +35,17 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (4,
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (5,'DE','DEU','Germany',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (6,'CH','CHE','Switzerland',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (7,'GB','GBR','United Kingdom',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (8,'IE','IRL','Irland',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (8,'IE','IRL','Ireland',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (9,'CN','CHN','China',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (10,'TN','TUN','Tunisia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (11,'US','USA','United States',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (12,'MA','MAR','Maroc',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (12,'MA','MAR','Morocco',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (13,'DZ','DZA','Algeria',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (14,'CA','CAN','Canada',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (15,'TG','TGO','Togo',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (16,'GA','GAB','Gabon',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (17,'NL','NLD','Nederland',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (18,'HU','HUN','Hongrie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (17,'NL','NLD','Netherlands',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (18,'HU','HUN','Hungary',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (19,'RU','RUS','Russia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (20,'SE','SWE','Sweden',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (21,'CI','CIV','Côte d''Ivoire',1,0);

From fd6eacf022e0f6439469f44da836dbd1f276e918 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 29 Apr 2021 16:15:46 +0200
Subject: [PATCH 470/928] NEW: add Channel column into order list

---
 htdocs/commande/list.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index d971073a1d7..bd5cf409606 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -104,6 +104,7 @@ $search_shippable = GETPOST('search_shippable', 'aZ09');
 $search_fk_cond_reglement = GETPOST("search_fk_cond_reglement", 'int');
 $search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'int');
 $search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
+$search_fk_input_reason = GETPOST("search_fk_input_reason", 'int');
 
 // Security check
 $id = (GETPOST('orderid') ?GETPOST('orderid', 'int') : GETPOST('id', 'int'));
@@ -176,6 +177,7 @@ $arrayfields = array(
 	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'position'=>66 , 'enabled'=>!empty($conf->expedition->enabled)),
 	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0, 'position'=>67),
 	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0, 'position'=>68),
+	'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>0, 'position'=>69),
 	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75),
 	'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>80),
 	'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85),
@@ -265,6 +267,7 @@ if (empty($reshook)) {
 		$search_fk_cond_reglement = '';
 		$search_fk_shipping_method = '';
 		$search_fk_mode_reglement = '';
+		$search_fk_input_reason = '';
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
 	 || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
@@ -424,6 +427,7 @@ $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture
 $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
 $sql .= " u.login,";
 $sql .= ' c.fk_cond_reglement,c.fk_mode_reglement,c.fk_shipping_method';
+$sql .= ' ,c.fk_input_reason';
 if ($search_categ_cus) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
 }
@@ -606,6 +610,9 @@ if ($search_fk_shipping_method > 0) {
 if ($search_fk_mode_reglement > 0) {
 	$sql .= " AND c.fk_mode_reglement = ".$db->escape($search_fk_mode_reglement);
 }
+if ($search_fk_input_reason > 0) {
+	$sql .= " AND c.fk_input_reason = ".$db->escape($search_fk_input_reason);
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -806,6 +813,9 @@ if ($resql) {
 	if ($search_fk_mode_reglement > 0) {
 		$param .= '&search_fk_mode_reglement='.$search_fk_mode_reglement;
 	}
+	if ($search_fk_input_reason > 0) {
+		$param .= '&search_fk_input_reason='.$search_fk_input_reason;
+	}
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -1102,6 +1112,12 @@ if ($resql) {
 		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1);
 		print '</td>';
 	}
+	// Channel
+	if (!empty($arrayfields['c.fk_input_reason']['checked'])) {
+		print '<td class="liste_titre">';
+		$form->selectInputReason($search_fk_input_reason, 'search_fk_input_reason', '', 1);
+		print '</td>';
+	}
 	if (!empty($arrayfields['c.total_ht']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
@@ -1283,6 +1299,9 @@ if ($resql) {
 	if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) {
 		print_liste_field_titre($arrayfields['c.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
 	}
+	if (!empty($arrayfields['c.fk_input_reason']['checked'])) {
+		print_liste_field_titre($arrayfields['c.fk_input_reason']['label'], $_SERVER["PHP_SELF"], "c.fk_input_reason", "", $param, '', $sortfield, $sortorder);
+	}
 	if (!empty($arrayfields['c.total_ht']['checked'])) {
 		print_liste_field_titre($arrayfields['c.total_ht']['label'], $_SERVER["PHP_SELF"], 'c.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
 	}
@@ -1567,6 +1586,15 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		// Channel
+		if (!empty($arrayfields['c.fk_input_reason']['checked'])) {
+			print '<td>';
+			$form->formInputReason($_SERVER['PHP_SELF'], $obj->fk_input_reason, 'none', '');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		// Amount HT
 		if (!empty($arrayfields['c.total_ht']['checked'])) {
 			  print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";

From 96baa1ef49f513b51599d9b95b4287531f3c24e9 Mon Sep 17 00:00:00 2001
From: fr69400 <82267780+fr69400@users.noreply.github.com>
Date: Thu, 29 Apr 2021 17:36:45 +0200
Subject: [PATCH 471/928] wrong variable name

---
 htdocs/comm/propal/card.php                                 | 2 +-
 htdocs/commande/card.php                                    | 2 +-
 htdocs/compta/facture/card.php                              | 2 +-
 htdocs/contrat/card.php                                     | 2 +-
 htdocs/eventorganization/conferenceorboothattendee_card.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 3d305ee9b59..e46d3ac243b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2462,7 +2462,7 @@ if ($action == 'create') {
 			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 			if (empty($reshook))
-				$object->formAddObjectLine(1, $societe, $mysoc);
+				$object->formAddObjectLine(1, $mysoc, $soc);
 		} else {
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formEditObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 34d32b26c2e..c11599fb6be 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2448,7 +2448,7 @@ if ($action == 'create' && $usercancreate) {
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action);
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				if (empty($reshook))
-					$object->formAddObjectLine(1, $societe, $mysoc);
+					$object->formAddObjectLine(1, $mysoc, $soc);
 			}
 		}
 		print '</table>';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 4d206bd4790..405739bd36b 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -5196,7 +5196,7 @@ if ($action == 'create') {
 			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 			if (empty($reshook))
-				$object->formAddObjectLine(1, $societe, $mysoc);
+				$object->formAddObjectLine(1, $mysoc, $soc);
 		}
 	}
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 1393ecf4929..ffc8dc37df6 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1986,7 +1986,7 @@ if ($action == 'create') {
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				if (empty($reshook))
-					$object->formAddObjectLine(1, $societe, $mysoc);
+					$object->formAddObjectLine(1, $mysoc, $soc);
 			}
 
 			print '</table>';
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index 1462a7ee8a7..8a3767f0606 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -600,7 +600,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				if (empty($reshook))
-					$object->formAddObjectLine(1, $societe, $mysoc);
+					$object->formAddObjectLine(1, $mysoc, $soc);
 			}
 		}
 

From d5af15a1020ba94b8e6f61bf9aab60d8e8efa751 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 29 Apr 2021 15:37:19 +0000
Subject: [PATCH 472/928] Fixing style errors.

---
 htdocs/multicurrency/multicurrency_rate.php | 189 ++++++++++----------
 1 file changed, 92 insertions(+), 97 deletions(-)

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 94a36dcba3c..3e99a19cc57 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -202,8 +202,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 $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 (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
@@ -292,7 +291,7 @@ $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."multicurrency AS m ON cr.fk_multicurrency = m.rowid";
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($search_date_sync && $search_date_sync_end ){
+if ($search_date_sync && $search_date_sync_end ) {
 	$sql .= " AND (cr.date_sync BETWEEN '".$db->idate($search_date_sync)."' AND '".$db->idate($search_date_sync_end)."')";
 } elseif ($search_date_sync && !$search_date_sync_end) {
 	$sql .= natural_search('cr.date_sync', $db->idate($search_date_sync));
@@ -418,24 +417,24 @@ if ($resql) {
 	print '<tr class="liste_titre_filter">';
 
 	// date
-	if (!empty($arrayfields['cr.date_sync']['checked'])) {
-		print '<td class="liste_titre" align="left">';
-		print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d"), 'search_date_sync', 0, 0, 1);
-		print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
-		print '</td>';
-	}
+if (!empty($arrayfields['cr.date_sync']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d"), 'search_date_sync', 0, 0, 1);
+	print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
+	print '</td>';
+}
 	// code
-	if (!empty($arrayfields['m.code']['checked'])) {
-		print '<td class="liste_titre" align="left">';
-		print  $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
-		print '</td>';
-	}
+if (!empty($arrayfields['m.code']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	print  $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
+	print '</td>';
+}
 	// rate
-	if (!empty($arrayfields['cr.rate']['checked'])) {
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" name="search_rate" size="8" value="'.dol_escape_htmltag($search_rate).'">';
-		print '</td>';
-	}
+if (!empty($arrayfields['cr.rate']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" name="search_rate" size="8" value="'.dol_escape_htmltag($search_rate).'">';
+	print '</td>';
+}
 
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields);
@@ -470,90 +469,86 @@ if ($resql) {
 
 	$i = 0;
 	$totalarray = array();
-	while ($i < min($num, $limit)) {
-		$obj = $db->fetch_object($resql);
+while ($i < min($num, $limit)) {
+	$obj = $db->fetch_object($resql);
 
-		print '<tr class="oddeven">';
+	print '<tr class="oddeven">';
 
-		// USER REQUEST UPDATE FOR THIS LINE
-		if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
-			//  var_dump($obj);
-			print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
-			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
-			print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
+	// USER REQUEST UPDATE FOR THIS LINE
+	if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
+		//  var_dump($obj);
+		print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
+		print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
+		print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
 
-			print '<td class="center nowrap ">';
-			print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
-			print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
-			print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
-			print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
-			print '</td>';
-		}
-		else {
-			// date_sync
-			if (!empty($arrayfields['cr.date_sync']['checked']))
-			{
-				print '<td class="tdoverflowmax200">';
-				print $obj->date_sync;
-				print "</td>\n";
-				if (!$i) $totalarray['nbfield']++;
-			}
-
-			// code
-			if (! empty($arrayfields['m.code']['checked']))
-			{
-				print '<td class="tdoverflowmax200">';
-				print $obj->code." ".$obj->name;
-				print "</td>\n";
-
-				if (! $i) $totalarray['nbfield']++;
-			}
-
-			// rate
-			if (! empty($arrayfields['cr.rate']['checked']))
-			{
-				print '<td class="tdoverflowmax200">';
-				print $obj->rate;
-				print "</td>\n";
-				if (! $i) $totalarray['nbfield']++;
-			}
-
-
-			// Fields from hook
-			$parameters = ['arrayfields' => $arrayfields, 'obj' => $obj];
-			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-
-			// Action
-			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 '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
-				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" 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>";
-		print "</div>";
-
-		print '</form>';
+		print '<td class="center nowrap ">';
+		print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
+		print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
+		print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
+		print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
+		print '</td>';
 	} else {
-		dol_print_error($db);
+		// date_sync
+		if (!empty($arrayfields['cr.date_sync']['checked'])) {
+			print '<td class="tdoverflowmax200">';
+			print $obj->date_sync;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// code
+		if (! empty($arrayfields['m.code']['checked'])) {
+			print '<td class="tdoverflowmax200">';
+			print $obj->code." ".$obj->name;
+			print "</td>\n";
+
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// rate
+		if (! empty($arrayfields['cr.rate']['checked'])) {
+			print '<td class="tdoverflowmax200">';
+			print $obj->rate;
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+
+		// Fields from hook
+		$parameters = ['arrayfields' => $arrayfields, 'obj' => $obj];
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
+		// Action
+		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 '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
+			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" 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>";
+	print "</div>";
+
+	print '</form>';
+} else {
+	dol_print_error($db);
+}
+
 
 	llxFooter();
 	$db->close();

From 1224327f913bc7ed72e32fab33b38ba8539dcd96 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 29 Apr 2021 17:50:11 +0200
Subject: [PATCH 473/928] qcstatus everywhere

---
 .../product/class/html.formproduct.class.php  | 18 ++++----
 .../product/stock/class/productlot.class.php  | 14 +++----
 htdocs/product/stock/productlot_card.php      | 42 +++++--------------
 3 files changed, 27 insertions(+), 47 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index bfddbc024db..9b2ad20dd28 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -684,7 +684,7 @@ class FormProduct
      *  @param	array	$events					Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
      *  @return string           				HTML string with select and input
      */
-    public function select_productbatch_status($selected = '', $page = '', $htmlname = 'fk_status', $htmloption = '', $forcecombo = 1, $events = array())
+    public function select_productbatch_qcstatus($selected = '', $page = '', $htmlname = 'fk_qcstatus', $htmloption = '', $forcecombo = 1, $events = array())
     {
         // phpcs:enable
         global $conf, $langs;
@@ -695,11 +695,11 @@ class FormProduct
         $statusArray = array();
 
         $sql = "SELECT code, label";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_status";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_qcstatus";
         $sql .= " WHERE active > 0";
         $sql .= " ORDER BY code ASC";
 
-        dol_syslog(get_class($this)."::select_productbatch_status", LOG_DEBUG);
+        dol_syslog(get_class($this)."::select_productbatch_qcstatus", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             if ($conf->use_javascript_ajax && !$forcecombo) {
@@ -709,7 +709,7 @@ class FormProduct
 
             if (!empty($page)) {
                 $out .= '<form method="post" action="'.$page.'">';
-                $out .= '<input type="hidden" name="action" value="setfk_status">';
+                $out .= '<input type="hidden" name="action" value="setfk_qcstatus">';
                 $out .= '<input type="hidden" name="token" value="'.newToken().'">';
             }
 
@@ -735,7 +735,7 @@ class FormProduct
                     }
 
                     if ($row['label']) {
-                        $out .= $row['label'];
+                        $out .= $langs->trans($row['label']);
                     }
 
                     $out .= '</option>';
@@ -762,7 +762,7 @@ class FormProduct
 	 *
 	 *  @return	int							Nb of loaded lines, 0 if already loaded, <0 if KO
 	 */
-	public function load_cache_productbatch_status()
+	public function load_cache_productbatch_qcstatus()
 	{
 		// phpcs:enable
 		global $langs;
@@ -770,7 +770,7 @@ class FormProduct
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = "SELECT s.rowid, s.code, s.label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_status as s";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_qcstatus as s";
 		$sql .= " WHERE s.active > 0";
 		$sql .= " ORDER BY s.code ASC";
 
@@ -784,11 +784,11 @@ class FormProduct
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
 				$label = ($obj->code != $langs->trans($obj->code) ? $langs->trans($obj->code) : $langs->trans($obj->label));
-				$this->cache_productbatch_status[$obj->code] = $label;
+				$this->cache_productbatch_qcstatus[$obj->code] = $label;
 				$i++;
 			}
 
-			asort($this->cache_productbatch_status);
+			asort($this->cache_productbatch_qcstatus);
 
 			return $num;
 		} else {
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index fb9a6b5815c..0fbef103d83 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -96,7 +96,7 @@ class Productlot extends CommonObject
 		'scrapping_date'        => array('type'=>'date', 'label'=>'DestructionDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>90),
 		'commissionning_date'        => array('type'=>'date', 'label'=>'FirstUseDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>100),
 		'qc_frequency'        => array('type'=>'varchar(6)', 'label'=>'QCFrequency', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>110),
-		'fk_status'        => array('type'=>'varchar(6)', 'label'=>'Status', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>120),
+		'fk_qcstatus'        => array('type'=>'varchar(6)', 'label'=>'Status', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>120),
 		'eatby'         => array('type'=>'date', 'label'=>'EatByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_EATBY)?1:0', 'visible'=>5, 'position'=>62),
 		'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
 		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
@@ -123,7 +123,7 @@ class Productlot extends CommonObject
 	public $scrapping_date = '';
 	public $commissionning_date = '';
 	public $qc_frequency = '';
-	public $fk_status = '';
+	public $fk_qcstatus = '';
 	public $datec = '';
 	public $tms = '';
 
@@ -203,7 +203,7 @@ class Productlot extends CommonObject
 		$sql .= 'scrapping_date,';
 		$sql .= 'commissionning_date,';
 		$sql .= 'qc_frequency,';
-		$sql .= 'fk_status,';
+		$sql .= 'fk_qcstatus,';
 		$sql .= 'datec,';
 		$sql .= 'fk_user_creat,';
 		$sql .= 'fk_user_modif,';
@@ -219,7 +219,7 @@ class Productlot extends CommonObject
 		$sql .= ' '.(!isset($this->scrapping_date) || dol_strlen($this->scrapping_date) == 0 ? 'NULL' : "'".$this->db->idate($this->scrapping_date)."'").',';
 		$sql .= ' '.(!isset($this->commissionning_date) || dol_strlen($this->commissionning_date) == 0 ? 'NULL' : "'".$this->db->idate($this->commissionning_date)."'").',';
 		$sql .= ' '.(!isset($this->qc_frequency) ? 'NULL' : $this->qc_frequency).',';
-		$sql .= ' '.(!isset($this->fk_status) || dol_strlen($this->fk_status) == 0 ? 'NULL' : $this->fk_status).',';
+		$sql .= ' '.(!isset($this->fk_qcstatus) || dol_strlen($this->fk_qcstatus) == 0 ? 'NULL' : $this->fk_qcstatus).',';
 
 		$sql .= ' '."'".$this->db->idate(dol_now())."'".',';
 		$sql .= ' '.(!isset($this->fk_user_creat) ? 'NULL' : $this->fk_user_creat).',';
@@ -298,7 +298,7 @@ class Productlot extends CommonObject
 		$sql .= " t.scrapping_date,";
 		$sql .= " t.commissionning_date,";
 		$sql .= " t.qc_frequency,";
-		$sql .= " t.fk_status,";
+		$sql .= " t.fk_qcstatus,";
 		$sql .= " t.datec,";
 		$sql .= " t.tms,";
 		$sql .= " t.fk_user_creat,";
@@ -332,7 +332,7 @@ class Productlot extends CommonObject
 				$this->scrapping_date = $this->db->jdate($obj->scrapping_date);
 				$this->commissionning_date = $this->db->jdate($obj->commissionning_date);
 				$this->qc_frequency = $obj->qc_frequency;
-				$this->fk_status = $obj->fk_status;
+				$this->fk_qcstatus = $obj->fk_qcstatus;
 
 				$this->datec = $this->db->jdate($obj->datec);
 				$this->tms = $this->db->jdate($obj->tms);
@@ -415,7 +415,7 @@ class Productlot extends CommonObject
 		$sql .= ' scrapping_date = '.(!isset($this->destruction_date) || dol_strlen($this->destruction_date) != 0 ? "'".$this->db->idate($this->destruction_date)."'" : 'null').',';
 		$sql .= ' commissionning_date = '.(!isset($this->first_use_date) || dol_strlen($this->first_use_date) != 0 ? "'".$this->db->idate($this->first_use_date)."'" : 'null').',';
 		$sql .= ' qc_frequency = '.(!isset($this->qc_frequency) || dol_strlen($this->qc_frequency) != 0 ? "'".$this->db->escape($this->qc_frequency)."'" : 'null').',';
-		$sql .= ' fk_status = '.(!isset($this->fk_status) || dol_strlen($this->fk_status) != 0 ? "'".$this->db->escape($this->fk_status)."'" : 'null').',';
+		$sql .= ' fk_qcstatus = '.(!isset($this->fk_qcstatus) || dol_strlen($this->fk_qcstatus) != 0 ? "'".$this->db->escape($this->fk_qcstatus)."'" : 'null').',';
 		$sql .= ' datec = '.(!isset($this->datec) || dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').',';
 		$sql .= ' tms = '.(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'").',';
 		$sql .= ' fk_user_creat = '.(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").',';
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 9fd971a70d8..e19d2f7b9e6 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -216,11 +216,11 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setfk_status' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
-		$result = $object->setValueFrom('fk_status', GETPOST('fk_status') ? GETPOST('fk_status') : null, '', null, 'text', '', $user, 'PRODUCT_MODIFY');
+	if ($action == 'setfk_qcstatus' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+		$result = $object->setValueFrom('fk_qcstatus', GETPOST('fk_qcstatus') ? GETPOST('fk_qcstatus') : null, '', null, 'text', '', $user, 'PRODUCT_MODIFY');
 		if ($result < 0) {
 			setEventMessages($object->error, null, 'errors');
-			$action == 'editfk_status';
+			$action == 'editfk_qcstatus';
 		} else {
 			$action = 'view';
 		}
@@ -514,40 +514,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</tr>';
 		print '<tr>';
 		print '<td class="maxwidthonsmartphone">';
-		print $form->editfieldkey("Status", 'fk_status', $object->fk_status, $object, $user->rights->stock->creer);
+		print $form->editfieldkey("Status", 'fk_qcstatus', $object->fk_qcstatus, $object, $user->rights->stock->creer);
 		print '</td>';
 		print '<td class="valuefield">';
-		if ($action != 'editfk_status') {
-			$formproduct->load_cache_productbatch_status();
-			print $formproduct->cache_productbatch_status[$object->fk_status];
+		if ($action != 'editfk_qcstatus') {
+			$formproduct->load_cache_productbatch_qcstatus();
+			print $formproduct->cache_productbatch_qcstatus[$object->fk_qcstatus];
 		} else {
-	// $fk_status = GETPOST('fk_status');
-		if (empty($fk_status)) {
-			$fk_status = $object->fk_status;
+		if (empty($fk_qcstatus)) {
+			$fk_qcstatus = $object->fk_qcstatus;
 		}
-		print $formproduct->select_productbatch_status($fk_status,'?id='.$object->id);
+		print $formproduct->select_productbatch_qcstatus($fk_qcstatus,'?id='.$object->id);
 		}
 		print '</td></tr>';
-
-
-		/* print '<tr><td>'.$form->editfieldkey('Status', 'fk_status', '', $object, 0);
-		// print_r($formproductlot->productbatch_status_array(0));
-		print '</td>';
-		print '<td>'.$form->selectarray('fk_status', $formproductlot->productbatch_status_array(0), $object->fk_status, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
-		if ($user->admin) {
-			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		}
-		print '</td></tr>'; */
-		/* $form->load_cache_productbatch_status();
-		print '<tr><td>';
-		print implode(',',$form->cache_productbatch_status);
-		print $form->editfieldkey($langs->trans('Status'), 'fk_status', $langs->trans($object->laberl), $object, $user->rights->stock->creer, 'select;'.implode(',', $form->cache_productbatch_status));
-		print '</td><td>';
-		print $form->editfieldval($langs->trans('Status'), 'fk_status', $form->cache_productbatch_status[$object->label], $object, $user->rights->stock->creer, 'select;'.implode(',', $form->cache_productbatch_status));
-		// print $form->editfieldval("Type", 'type', $form->cache_types_fees[$object->type], $object, $user->rights->deplacement->creer, 'select:types_fees');
-		print '</td>';
-		print '</tr>'; */
-}
+	}
 
 	// Other attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';

From 66103303eb536296a7cc8b5a60786cba3c274537 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Apr 2021 18:02:24 +0200
Subject: [PATCH 474/928] Fix html tag

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

diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 467169230d0..e311bab36dc 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -538,7 +538,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 							foreach ($months as $k => $v) {
 								if (($k + 1) >= $date_startmonth) {
 									$resultM = $totPerAccount[$cpt['account_number']]['M'][$k];
-									print '<td class="right"><span class="amount">'.price($resultM).'</span>/td>';
+									print '<td class="right"><span class="amount">'.price($resultM).'</span></td>';
 								}
 							}
 							foreach ($months as $k => $v) {

From 8e1ba67928a3aef84bdb0574768ae381d7124081 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Apr 2021 18:04:10 +0200
Subject: [PATCH 475/928] css

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

diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index e311bab36dc..635531ab86b 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -506,12 +506,12 @@ if ($modecompta == 'CREANCES-DETTES') {
 				// Each month
 				foreach ($totCat['M'] as $k => $v) {
 					if (($k + 1) >= $date_startmonth) {
-						print '<td class="right"><span class="amount">'.price($v).'</span></td>';
+						print '<td class="right nowraponall"><span class="amount">'.price($v).'</span></td>';
 					}
 				}
 				foreach ($totCat['M'] as $k => $v) {
 					if (($k + 1) < $date_startmonth) {
-						print '<td class="right"><span class="amount">'.price($v).'</span></td>';
+						print '<td class="right nowraponall"><span class="amount">'.price($v).'</span></td>';
 					}
 				}
 

From beca2388bae068f0680338169a9f69d17dc64c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 29 Apr 2021 22:08:49 +0200
Subject: [PATCH 476/928] fix activate cron

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

diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index f58f1740f4d..abdf72cb70f 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2012       Nicolas Villa aka Boyquotes http://informetic.fr
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concpt.pro>
  * Copyright (C) 2013-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@ if (!empty($cancel)) {
 			exit;
 		}
 	}
-}
+}Luracast/Restler/pull/515/files
 
 // Delete jobs
 if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete) {
@@ -728,7 +728,7 @@ if (($action == "create") || ($action == "edit")) {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").'</a>';
 	} else {
 		if (empty($object->status)) {
-			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=activate&id='.$object->id.'">'.$langs->trans("CronStatusActiveBtn").'</a>';
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=activate&token='.newToken().'&id='.$object->id.'">'.$langs->trans("CronStatusActiveBtn").'</a>';
 		} else {
 			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=inactive&id='.$object->id.'">'.$langs->trans("CronStatusInactiveBtn").'</a>';
 		}

From 196f8bbfb804cb85b1ab8a8bcb5b6ed208568350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 29 Apr 2021 22:19:05 +0200
Subject: [PATCH 477/928] Update card.php

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

diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index abdf72cb70f..0a042e56e03 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -74,7 +74,7 @@ if (!empty($cancel)) {
 			exit;
 		}
 	}
-}Luracast/Restler/pull/515/files
+}
 
 // Delete jobs
 if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete) {

From 965eb2d6397025e8ddf72501d4f46185a1aed744 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Thu, 29 Apr 2021 22:57:39 +0200
Subject: [PATCH 478/928] Fix logical test always false

subscription is an integer and is set to 0 or 1. So subscription is never equal to "yes"
---
 htdocs/adherents/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 838e7cd9a5c..dad19ffafcd 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -857,7 +857,7 @@ while ($i < min($num, $limit))
 		else
 		{
 			print '<td class="nowrap left">';
-			if ($obj->subscription == 'yes')
+			if (!empty($obj->subscription))
 			{
 				print $langs->trans("SubscriptionNotReceived");
 				if ($obj->statut > 0) print " ".img_warning();

From 4174ebd9c0023bdda8ad1d9899a8a1a003aeb19b Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Thu, 29 Apr 2021 23:11:51 +0200
Subject: [PATCH 479/928] Fix subscription =="yes"

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

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 4590254ebf6..81e387b8dbb 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -710,7 +710,7 @@ if ($rowid > 0)
 		        else
 		        {
 			        print '<td class="nowrap left">';
-			        if ($objp->subscription == 'yes')
+			        if (!empty($objp->subscription))
 			        {
 		                print $langs->trans("SubscriptionNotReceived");
 		                if ($objp->statut > 0) print " ".img_warning();

From 749aeeb233f26cdf1af9f3de6edcae140296af45 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Thu, 29 Apr 2021 23:16:21 +0200
Subject: [PATCH 480/928] Fix $objp->subscription =="yes"

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

diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 8874a62bc3b..4a8879c60bd 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -331,7 +331,7 @@ if ($id > 0 || ! empty($ref))
 						else
 						{
 							print '<td class="left nowrap">';
-							if ($objp->subscription == 'yes')
+							if (!empty($objp->subscription))
 							{
 								print $langs->trans("SubscriptionNotReceived");
 								if ($objp->statut > 0) print " ".img_warning();

From 5e98d9932156019c948c1d3e3b29011a8451a12a Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 30 Apr 2021 10:04:21 +0200
Subject: [PATCH 481/928] FIX SQL Error show_contacts : socialnetworks

---
 htdocs/core/lib/company.lib.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 48ab350d60f..d71be0b723e 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -902,11 +902,11 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
         't.email',
     );
     //Social media
-    foreach ($socialnetworks as $key => $value) {
-        if ($value['active']) {
-            $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'";
-        }
-    }
+//    foreach ($socialnetworks as $key => $value) {
+//        if ($value['active']) {
+//            $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'";
+//        }
+//    }
 
     if (!$sortorder) $sortorder = "ASC";
     if (!$sortfield) $sortfield = "t.lastname";

From 81b964db45b353abf21f54a8bb6e369e32f1b600 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 30 Apr 2021 08:12:24 +0000
Subject: [PATCH 482/928] Fixing style errors.

---
 htdocs/core/lib/company.lib.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d71be0b723e..16f52ad80e3 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -902,11 +902,11 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
         't.email',
     );
     //Social media
-//    foreach ($socialnetworks as $key => $value) {
-//        if ($value['active']) {
-//            $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'";
-//        }
-//    }
+	//    foreach ($socialnetworks as $key => $value) {
+	//        if ($value['active']) {
+	//            $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'";
+	//        }
+	//    }
 
     if (!$sortorder) $sortorder = "ASC";
     if (!$sortfield) $sortfield = "t.lastname";

From 05a96b3ee2bf7c08e67363a6baeb0e8267c1dede Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 30 Apr 2021 10:46:05 +0200
Subject: [PATCH 483/928] FIX missing token on dolGetButtonAction for action
 delete

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 37e55b42fde..73f75cc98cf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8731,6 +8731,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 	$class = 'butAction';
 	if ($actionType == 'danger' || $actionType == 'delete') {
 		$class = 'butActionDelete';
+		$url .= '&token='.newToken();
 	}
 
 	$attr = array(

From 484f6f275fbfc9f70d8d8fbee3fb73dac6f9d1a5 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 30 Apr 2021 10:56:47 +0200
Subject: [PATCH 484/928] Fix #17424 : preg_match error on List of purchase
 orders

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

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 1515429199a..3193fd3a8ad 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -91,8 +91,8 @@ $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 
-if (is_array(GETPOST('search_status', 'intcomma'))) {
-	$search_status = join(',', GETPOST('search_status', 'intcomma'));
+if (is_array(GETPOST('search_status', 'array:intcomma'))) {
+	$search_status = join(',', GETPOST('search_status', 'array:intcomma'));
 } else {
 	$search_status = (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
 }

From 5a1f2db024e534b5e0b2795cb64b4db25f44a10f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 10:57:21 +0200
Subject: [PATCH 485/928] Clean sql

---
 .../class/html.formadvtargetemailing.class.php       |  2 +-
 htdocs/compta/localtax/class/localtax.class.php      |  9 +++++----
 .../modules/movement/doc/pdf_standard.modules.php    |  4 ++--
 htdocs/societe/class/api_thirdparties.class.php      | 12 ++++++------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index 2c47edd4289..12684e5f873 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -355,7 +355,7 @@ class FormAdvTargetEmailing extends Form
 
 		$sql = "SELECT c.rowid, c.name, c.fk_element";
 		$sql .= " FROM ".MAIN_DB_PREFIX."advtargetemailing as c";
-		$sql .= " WHERE type_element='$type_element'";
+		$sql .= " WHERE type_element = '".$this->db->escape($type_element)."'";
 		$sql .= " ORDER BY c.name";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 2adfe41330b..dc133977202 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -352,9 +352,10 @@ class Localtax extends CommonObject
 	{
 		// phpcs:enable
 		$sql = "SELECT sum(f.localtax) as amount";
-		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql .= " WHERE f.paye = 1";
 		if ($year) {
-			$sql .= " AND f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
+			$sql .= " AND f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, 'gmt'))."' AND '".$this->db->idate(dol_get_last_day($year, 1, 'gmt'))."'";
 		}
 
 		$result = $this->db->query($sql);
@@ -388,7 +389,7 @@ class Localtax extends CommonObject
 		$sql = "SELECT sum(f.total_localtax) as total_localtax";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		if ($year) {
-			$sql .= " WHERE f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
+			$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, 'gmt'))."' AND '".$this->db->idate(dol_get_last_day($year, 1, 'gmt'))."'";
 		}
 
 		$result = $this->db->query($sql);
@@ -423,7 +424,7 @@ class Localtax extends CommonObject
 		$sql = "SELECT sum(f.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
 		if ($year) {
-			$sql .= " WHERE f.datev >= '$year-01-01' AND f.datev <= '$year-12-31' ";
+			$sql .= " WHERE f.datev BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, 'gmt'))."' AND '".$this->db->idate(dol_get_last_day($year, 1, 'gmt'))."'";
 		}
 
 		$result = $this->db->query($sql);
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index c2817fb50f6..d818ab24f9e 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -303,13 +303,13 @@ class pdf_stdandard extends ModelePDFMovement
 			$sql .= " AND p.fk_product_type = 0";
 		}
 		if ($id > 0) {
-			$sql .= " AND e.rowid ='".$id."'";
+			$sql .= " AND e.rowid = ".((int) $id);
 		}
 		if ($month > 0) {
 			if ($year > 0) {
 				$sql .= " AND m.datem BETWEEN '".$this->db->idate(dol_get_first_day($year, $month, false))."' AND '".$this->db->idate(dol_get_last_day($year, $month, false))."'";
 			} else {
-				$sql .= " AND date_format(m.datem, '%m') = '$month'";
+				$sql .= " AND date_format(m.datem, '%m') = '".((int) $month)."'";
 			}
 		} elseif ($year > 0) {
 			$sql .= " AND m.datem BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index b0b486459b1..1de2f436ca7 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1624,11 +1624,11 @@ class Thirdparties extends DolibarrApi
 	}
 
 	/**
-	 * Update specified values of a specific site gateway attached to a thirdparty
+	 * Update specified values of a specific gateway attached to a thirdparty
 	 *
-	 * @param int $id Id of thirdparty
-	 * @param string  $site Site key
-	 * @param array $request_data Request data
+	 * @param int 		$id 			Id of thirdparty
+	 * @param string  	$site 			Site key
+	 * @param array 	$request_data 	Request data
 	 *
 	 * @return array|mixed
 	 *
@@ -1645,7 +1645,7 @@ class Thirdparties extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = ".((int) $id)." AND site = '".$this->db->escape($site)."'";
 		$result = $this->db->query($sql);
 
 		if ($result && $this->db->num_rows($result) == 0) {
@@ -1657,7 +1657,7 @@ class Thirdparties extends DolibarrApi
 				$result = $this->db->query($sql);
 
 				if ($result && $this->db->num_rows($result) !== 0) {
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key.");
+					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from ".$site." to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key.");
 				}
 			}
 

From fd42979defb5499033cf85155aa913affec992d3 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Fri, 30 Apr 2021 11:12:33 +0200
Subject: [PATCH 486/928] qc_status change in stock transfer -> display select

---
 .../product/class/html.formproduct.class.php   | 18 ++++++++----------
 htdocs/product/stock/productlot_card.php       |  4 ++--
 htdocs/product/stock/tpl/stocktransfer.tpl.php | 17 +++++++++++++++--
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 9b2ad20dd28..6f626e40244 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -677,17 +677,15 @@ class FormProduct
      *  Return select list of productbatch status
      *
      *  @param	string	$selected       		Id or Code of preselected incoterm
-     *  @param	string	$page       			Defined the form action
      *  @param  string	$htmlname       		Name of html select object
      *  @param  string	$htmloption     		Options html on select object
-     * 	@param	int		$forcecombo				Force to load all values and output a standard combobox (with no beautification)
      *  @param	array	$events					Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
      *  @return string           				HTML string with select and input
      */
-    public function select_productbatch_qcstatus($selected = '', $page = '', $htmlname = 'fk_qcstatus', $htmloption = '', $forcecombo = 1, $events = array())
+    public function selectProductbatchQcstatus($selected = '', $htmlname = 'fk_qcstatus', $htmloption = '', $forcecombo = 0, $events = array())
     {
         // phpcs:enable
-        global $conf, $langs;
+        global $conf, $langs, $user;
 
         $langs->load("dict");
 
@@ -707,11 +705,11 @@ class FormProduct
                 $out .= ajax_combobox($htmlname, $events);
             }
 
-            if (!empty($page)) {
+            /* if (!empty($page)) {
                 $out .= '<form method="post" action="'.$page.'">';
                 $out .= '<input type="hidden" name="action" value="setfk_qcstatus">';
                 $out .= '<input type="hidden" name="token" value="'.newToken().'">';
-            }
+            } */
 
             $out .= '<select id="'.$htmlname.'" class="flat selectfkstatus minwidth100imp noenlargeonsmartphone" name="'.$htmlname.'" '.$htmloption.'>';
             $out .= '<option value="0">&nbsp;</option>';
@@ -743,13 +741,13 @@ class FormProduct
             }
             $out .= '</select>';
 
-			// if ($user->admin) {
+			if ($user->admin) {
 				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-			// }
+			}
 
-            if (!empty($page)) {
+            /* if (!empty($page)) {
                 $out .= '<input type="submit" class="button valignmiddle smallpaddingimp nomargintop nomarginbottom" value="'.$langs->trans("Modify").'"></form>';
-            }
+            } */
         } else {
             dol_print_error($this->db);
         }
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index e19d2f7b9e6..5dacea42801 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -512,7 +512,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<tr><td>'.$form->editfieldkey($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'string').'</td>';
 		print '</tr>';
-		print '<tr>';
+		/* print '<tr>';
 		print '<td class="maxwidthonsmartphone">';
 		print $form->editfieldkey("Status", 'fk_qcstatus', $object->fk_qcstatus, $object, $user->rights->stock->creer);
 		print '</td>';
@@ -526,7 +526,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 		print $formproduct->select_productbatch_qcstatus($fk_qcstatus,'?id='.$object->id);
 		}
-		print '</td></tr>';
+		print '</td></tr>'; */
 	}
 
 	// Other attributes
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index dcd19be4ad6..42a6f992fb8 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -89,8 +89,21 @@ if ($object->element == 'stock') {
 print '<td class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td>';
 print img_picto('', 'stock').$formproduct->selectWarehouses(GETPOST('id_entrepot_destination'), 'id_entrepot_destination', 'warehouseopen,warehouseinternal', 1);
 print '</td></tr>';
-print '<tr><td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td colspan="3"><input type="text" name="nbpiece" size="10" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
-print '</tr>';
+print '<tr><td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td><input type="text" name="nbpiece" size="10" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
+// print '</tr>';
+// print '<tr>';
+print '<td>'.$langs->trans("StatusChangeIfNeeded").'</td>';
+print '<td class="valuefield">';
+// if ($action != 'editfk_qcstatus') {
+	$formproduct->load_cache_productbatch_qcstatus();
+	// print $formproduct->cache_productbatch_qcstatus[$object->fk_qcstatus];
+/* } else {
+if (empty($fk_qcstatus)) {
+	$fk_qcstatus = $object->fk_qcstatus;
+} */
+print $formproduct->selectProductbatchQcstatus('-1','fk_qcstatus');
+// }
+print '</td></tr>';
 
 // Serial / Eat-by date
 if (!empty($conf->productbatch->enabled) &&

From 1e1ea053bdb57de58d28a5ca6f49d97c966da336 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 11:13:24 +0200
Subject: [PATCH 487/928] Can add sql action after an initdemo

---
 dev/initdemo/.gitignore          | 1 +
 dev/initdemo/initdemopassword.sh | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 dev/initdemo/.gitignore

diff --git a/dev/initdemo/.gitignore b/dev/initdemo/.gitignore
new file mode 100644
index 00000000000..1204e1426c6
--- /dev/null
+++ b/dev/initdemo/.gitignore
@@ -0,0 +1 @@
+/initdemopostsql.sql
diff --git a/dev/initdemo/initdemopassword.sh b/dev/initdemo/initdemopassword.sh
index a42e5d23b56..933c3b1afa2 100755
--- a/dev/initdemo/initdemopassword.sh
+++ b/dev/initdemo/initdemopassword.sh
@@ -170,6 +170,10 @@ if [ $res -ne 0 ]; then
 	exit
 fi 
 
+if [ -s "$mydir/initdemopostsql.sql" ]; then
+	mysql -P$port $base < "$mydir/initdemopostsql.sql"
+fi 
+
 
 if [ "x$res" = "x0" ]
 then

From 565ab80836c2d06325303fe8f9b845e34f3b74b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 11:14:00 +0200
Subject: [PATCH 488/928] Can add sql action after an initdemo

---
 dev/initdemo/initdemo.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/initdemo/initdemo.sh b/dev/initdemo/initdemo.sh
index ccd8c8d8b9a..258eeaf646a 100755
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -232,6 +232,10 @@ else
 fi
 
 
+if [ -s "$mydir/initdemopostsql.sql" ]; then
+	mysql -P$port $base < "$mydir/initdemopostsql.sql"
+fi
+
 
 if [ "x$res" = "x0" ]
 then

From 773b16928d5d2fed4e0635eb44a2d62fdd035fcc Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 30 Apr 2021 11:15:01 +0200
Subject: [PATCH 489/928] only if no token

---
 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 73f75cc98cf..766ee1b71a8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8731,7 +8731,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 	$class = 'butAction';
 	if ($actionType == 'danger' || $actionType == 'delete') {
 		$class = 'butActionDelete';
-		$url .= '&token='.newToken();
+		if (strpos($url, 'token=') === false) $url .= '&token='.newToken();
 	}
 
 	$attr = array(

From 195163b81af9428a1780d09bcaa632a3b2f121d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 11:45:45 +0200
Subject: [PATCH 490/928] Enhance security center

---
 htdocs/admin/system/security.php | 123 ++++++++++++++++++++-----------
 htdocs/langs/en_US/admin.lang    |   3 +-
 2 files changed, 81 insertions(+), 45 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index de59957f5c9..d8dd21719fd 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -128,32 +128,13 @@ if ($test) {
 }
 print '<br>';
 
-print '<br>';
-print '<br>';
-print load_fiche_titre($langs->trans("ConfigurationFile").' ('.$conffile.')', '', 'folder');
 
-print '<strong>'.$langs->trans("dolibarr_main_prod").'</strong>: '.$dolibarr_main_prod;
-if (empty($dolibarr_main_prod)) {
-	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1);
-}
-print '<br>';
-
-print '<strong>'.$langs->trans("dolibarr_nocsrfcheck").'</strong>: '.$dolibarr_nocsrfcheck;
-if (!empty($dolibarr_nocsrfcheck)) {
-	print img_picto('', 'warning').' &nbsp;  '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
-}
-print '<br>';
-
-print '<strong>'.$langs->trans("dolibarr_main_restrict_ip").'</strong>: '.$dolibarr_main_restrict_ip;
-/*if (empty($dolibarr_main_restrict_ip)) {
-	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1);
-}*/
-print '<br>';
+// OS Permissions
 
 print '<br>';
 print '<br>';
 print '<br>';
-print load_fiche_titre($langs->trans("PermissionsOnFiles"), '', 'folder');
+print load_fiche_titre($langs->trans("OSSetup").' - '.$langs->trans("PermissionsOnFiles"), '', 'folder');
 
 print '<strong>'.$langs->trans("PermissionsOnFilesInWebRoot").'</strong>: ';
 $arrayoffilesinroot = dol_dir_list(DOL_DOCUMENT_ROOT, 'all', 1, '', array('\/custom'), 'name', SORT_ASC, 4, 1, '', 1);
@@ -205,38 +186,36 @@ if ($perms) {
 }
 print '<br>';
 
-print '<br>';
+
+// File conf.php
 
 print '<br>';
 print '<br>';
-print load_fiche_titre($langs->trans("Modules"), '', 'folder');
+print '<br>';
+print load_fiche_titre($langs->trans("ConfigurationFile").' ('.$conffile.')', '', 'folder');
 
-// Module log
-print '<strong>'.$langs->trans("Syslog").'</strong>: ';
-$test = empty($conf->syslog->enabled);
-if ($test) {
-	print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
-} else {
-	if ($conf->global->SYSLOG_LEVEL > LOG_NOTICE) {
-		print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("Syslog"));
-	} else {
-		print img_picto('', 'tick.png').' '.$langs->trans("ModuleSyslogActivatedButLevelNotTooVerbose", $langs->transnoentities("Syslog"), $conf->global->SYSLOG_LEVEL);
-	}
-	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+print '<strong>$dolibarr_main_prod</strong>: '.$dolibarr_main_prod;
+if (empty($dolibarr_main_prod)) {
+	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1);
 }
 print '<br>';
 
-// Module debugbar
-print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
-$test = empty($conf->debugbar->enabled);
-if ($test) {
-	print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
-} else {
-	print img_picto('', 'error').' '.$langs->trans("ModuleActivatedDoNotUseInProduction", $langs->transnoentities("DebugBar"));
-	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+print '<strong>$dolibarr_nocsrfcheck</strong>: '.$dolibarr_nocsrfcheck;
+if (!empty($dolibarr_nocsrfcheck)) {
+	print img_picto('', 'warning').' &nbsp;  '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
 }
 print '<br>';
 
+print '<strong>$dolibarr_main_restrict_ip</strong>: ';
+if (empty($dolibarr_main_restrict_ip)) {
+	print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
+	//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
+}
+print '<br>';
+
+
+// Menu security
+
 print '<br>';
 print '<br>';
 print '<br>';
@@ -276,7 +255,6 @@ if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
 	}
 }
 print '<br>';
-
 print '<br>';
 
 $securityevent = new Events($db);
@@ -299,10 +277,67 @@ if (!empty($eventstolog) && is_array($eventstolog)) {
 			}
 		}
 	}
+	print '<br>';
 } else {
 	print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Audit")).'<br>';
 }
 
+
+// Modules/Applications
+
+print '<br>';
+print '<br>';
+print '<br>';
+print load_fiche_titre($langs->trans("Modules"), '', 'folder');
+
+// Module log
+print '<strong>'.$langs->trans("Syslog").'</strong>: ';
+$test = empty($conf->syslog->enabled);
+if ($test) {
+	print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
+} else {
+	if ($conf->global->SYSLOG_LEVEL > LOG_NOTICE) {
+		print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedWithTooHighLogLevel", $langs->transnoentities("Syslog"));
+	} else {
+		print img_picto('', 'tick.png').' '.$langs->trans("ModuleSyslogActivatedButLevelNotTooVerbose", $langs->transnoentities("Syslog"), $conf->global->SYSLOG_LEVEL);
+	}
+	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+}
+print '<br>';
+
+// Module debugbar
+print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
+$test = empty($conf->debugbar->enabled);
+if ($test) {
+	print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
+} else {
+	print img_picto('', 'error').' '.$langs->trans("ModuleActivatedDoNotUseInProduction", $langs->transnoentities("DebugBar"));
+	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+}
+print '<br>';
+
+
+// APIs
+
+print '<br>';
+print '<br>';
+print '<br>';
+print load_fiche_titre($langs->trans("API"), '', 'folder');
+
+if (empty($conf->api->enabled) && empty($conf->webservices->enabled)) {
+	print $langs->trans("APIsAreNotEnabled");
+} else {
+	if (!empty($conf->webservices->enabled)) {
+		print $langs->trans('YouEnableDeprecatedWSAPIsUseRESTAPIsInstead')."<br>\n";
+		print '<br>';
+	}
+	if (!empty($conf->api->enabled)) {
+		print '<strong>API_ENDPOINT_RULES</strong> = '.(empty($conf->global->API_ENDPOINT_RULES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->API_ENDPOINT_RULES)."<br>\n";
+		print '<br>';
+	}
+}
+
+
 print '<br><br>';
 
 // End of page
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e5803332b9b..720532a066e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -2063,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files

From 485390dea9d40779ac805dd91ac184587c749df7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 11:48:02 +0200
Subject: [PATCH 491/928] Doc

---
 ChangeLog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4734605b7d2..7ad29795ffd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,12 +8,15 @@ English Dolibarr ChangeLog
 For users:
 ----------
 NEW: Several security issues after a second private bug bounty campaign. 
-
+NEW: Add a security center page with all information and advices related to the security of your instance 
+NEW: Add a performance center page with all information and advices related to the performance of your instance 
 
 
 For developers:
 ---------------
 * start new module EventOrganization
+* start new module Partnership
+* start new module KnowledgeInformation
 
 
 

From b45ac523115d071b3c7f4527801f6876f4489711 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 12:07:26 +0200
Subject: [PATCH 492/928] Clean sql

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index bd5cf409606..df1c3e096e2 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -554,7 +554,7 @@ if ($search_company_alias) {
 	$sql .= natural_search('s.name_alias', $search_company_alias);
 }
 if ($search_sale > 0) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 }
 if ($search_user > 0) {
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
@@ -596,22 +596,22 @@ if ($search_project != '') {
 	$sql .= natural_search("p.title", $search_project);
 }
 if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
 }
 if ($search_categ_cus == -2) {
 	$sql .= " AND cc.fk_categorie IS NULL";
 }
 if ($search_fk_cond_reglement > 0) {
-	$sql .= " AND c.fk_cond_reglement = ".$db->escape($search_fk_cond_reglement);
+	$sql .= " AND c.fk_cond_reglement = ".((int) $search_fk_cond_reglement);
 }
 if ($search_fk_shipping_method > 0) {
-	$sql .= " AND c.fk_shipping_method = ".$db->escape($search_fk_shipping_method);
+	$sql .= " AND c.fk_shipping_method = ".((int) $search_fk_shipping_method);
 }
 if ($search_fk_mode_reglement > 0) {
-	$sql .= " AND c.fk_mode_reglement = ".$db->escape($search_fk_mode_reglement);
+	$sql .= " AND c.fk_mode_reglement = ".((int) $search_fk_mode_reglement);
 }
 if ($search_fk_input_reason > 0) {
-	$sql .= " AND c.fk_input_reason = ".$db->escape($search_fk_input_reason);
+	$sql .= " AND c.fk_input_reason = ".((int) $search_fk_input_reason);
 }
 
 // Add where from extra fields

From edd178c373efeb0bf58b7501b9e0dc8b7c767b9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 12:09:42 +0200
Subject: [PATCH 493/928] Update list.php

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

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 3193fd3a8ad..d32e466444c 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -91,7 +91,7 @@ $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 
-if (is_array(GETPOST('search_status', 'array:intcomma'))) {
+if (is_array(GETPOST('search_status', 'none'))) {	// 'none' because we want to know type before sanitizing
 	$search_status = join(',', GETPOST('search_status', 'array:intcomma'));
 } else {
 	$search_status = (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));

From 6c1e0919c8c42789ab2993d61ae116b9c952a832 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Fri, 30 Apr 2021 12:20:43 +0200
Subject: [PATCH 494/928] Fix checkbox multiselect pre-selected value from
 get/post

---
 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 ed85a328edc..07d80acd9aa 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1339,7 +1339,11 @@ class ExtraFields
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr = explode(',', $value);
+			$value_arr = $value;
+			if (!is_array($value))
+			{
+				$value_arr = explode(',', $value);
+			}
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
 		}
 		elseif ($type == 'radio')

From 06e550cb19be9f358151425716463a7b4f00dd3f Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 30 Apr 2021 12:32:53 +0200
Subject: [PATCH 495/928] Fix : Error on knowledgemanagement_list error $sql
 extrafields

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

diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index fdc05ac5137..931d94d18bf 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -262,7 +262,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ",ef.".$key.' as options_'.$key.', ' : '');
 	}
 }
 // Add fields from hooks

From c693668d38f6b02d3ebf6928388429ba05bf89bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 14:26:39 +0200
Subject: [PATCH 496/928] Clean code

---
 .tx/config                                    |    6 +
 build/rpm/dolibarr_fedora.spec                |    1 +
 build/rpm/dolibarr_generic.spec               |    1 +
 build/rpm/dolibarr_mandriva.spec              |    1 +
 build/rpm/dolibarr_opensuse.spec              |    1 +
 .../class/knowledgerecord.class.php.back      | 1060 -----------------
 .../mod_knowledgerecord_standard.php          |    2 +-
 7 files changed, 11 insertions(+), 1061 deletions(-)
 delete mode 100644 htdocs/knowledgemanagement/class/knowledgerecord.class.php.back

diff --git a/.tx/config b/.tx/config
index 6d3518fabd4..dae10d60866 100644
--- a/.tx/config
+++ b/.tx/config
@@ -188,6 +188,12 @@ source_file = htdocs/langs/en_US/interventions.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.knowledgemanagement]
+file_filter = htdocs/langs/<lang>/knowledgemanagement.lang
+source_file = htdocs/langs/en_US/knowledgemanagement.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.languages-not-res]
 file_filter = htdocs/langs/<lang>/languages.lang
 source_file = htdocs/langs/en_US/languages.lang
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 5c380bb1f28..dc23cff5486 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -199,6 +199,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/intracommreport
+%_datadir/dolibarr/htdocs/knowledgemanagement
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 6301de2993d..a446a7bd5d6 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -280,6 +280,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/intracommreport
+%_datadir/dolibarr/htdocs/knowledgemanagement
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 5633ce8ed0d..78d90080258 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -196,6 +196,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/intracommreport
+%_datadir/dolibarr/htdocs/knowledgemanagement
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 5ece19a761a..edae0126653 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -207,6 +207,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/intracommreport
+%_datadir/dolibarr/htdocs/knowledgemanagement
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php.back b/htdocs/knowledgemanagement/class/knowledgerecord.class.php.back
deleted file mode 100644
index e4d7be22c1d..00000000000
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php.back
+++ /dev/null
@@ -1,1060 +0,0 @@
-<?php
-/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * \file        class/knowledgerecord.class.php
- * \ingroup     knowledgemanagement
- * \brief       This file is a CRUD class file for KnowledgeRecord (Create/Read/Update/Delete)
- */
-
-// Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-
-/**
- * Class for KnowledgeRecord
- */
-class KnowledgeRecord extends CommonObject
-{
-	/**
-	 * @var string ID of module.
-	 */
-	public $module = 'knowledgemanagement';
-
-	/**
-	 * @var string ID to identify managed object.
-	 */
-	public $element = 'knowledgerecord';
-
-	/**
-	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
-	 */
-	public $table_element = 'knowledgemanagement_knowledgerecord';
-
-	/**
-	 * @var int  Does this object support multicompany module ?
-	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
-	 */
-	public $ismultientitymanaged = 0;
-
-	/**
-	 * @var int  Does object support extrafields ? 0=No, 1=Yes
-	 */
-	public $isextrafieldmanaged = 1;
-
-	/**
-	 * @var string String with name of icon for knowledgerecord. Must be the part after the 'object_' into object_knowledgerecord.png
-	 */
-	public $picto = 'book';
-
-
-	const STATUS_DRAFT = 0;
-	const STATUS_VALIDATED = 1;
-	const STATUS_CANCELED = 9;
-
-
-	/**
-	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
-	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
-	 *  'label' the translation key.
-	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
-	 *  'position' is the sort order of field.
-	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
-	 *  'noteditable' says if field is not editable (1 or 0)
-	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
-	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
-	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
-	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
-	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
-	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
-	 *
-	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
-	 */
-
-	// BEGIN MODULEBUILDER PROPERTIES
-	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>5, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object"),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserCreation', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>'1', 'position'=>512, 'notnull'=>0, 'visible'=>-2,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
-		'answer' => array('type'=>'text', 'label'=>'Answer', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>4,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Actif'),),
-	);
-	public $rowid;
-	public $ref;
-	public $date_creation;
-	public $tms;
-	public $last_main_doc;
-	public $fk_user_creat;
-	public $fk_user_modif;
-	public $fk_user_valid;
-	public $import_key;
-	public $model_pdf;
-	public $question;
-	public $answer;
-	public $status;
-	// END MODULEBUILDER PROPERTIES
-
-
-	// If this object has a subtable with lines
-
-	// /**
-	//  * @var string    Name of subtable line
-	//  */
-	// public $table_element_line = 'knowledgemanagement_knowledgerecordline';
-
-	// /**
-	//  * @var string    Field with ID of parent key if this object has a parent
-	//  */
-	// public $fk_element = 'fk_knowledgerecord';
-
-	// /**
-	//  * @var string    Name of subtable class that manage subtable lines
-	//  */
-	// public $class_element_line = 'KnowledgeRecordline';
-
-	// /**
-	//  * @var array	List of child tables. To test if we can delete object.
-	//  */
-	// protected $childtables = array();
-
-	// /**
-	//  * @var array    List of child tables. To know object to delete on cascade.
-	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
-	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	//  */
-	// protected $childtablesoncascade = array('knowledgemanagement_knowledgerecorddet');
-
-	// /**
-	//  * @var KnowledgeRecordLine[]     Array of subtable lines
-	//  */
-	// public $lines = array();
-
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		global $conf, $langs;
-
-		$this->db = $db;
-
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
-			$this->fields['rowid']['visible'] = 0;
-		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
-			$this->fields['entity']['enabled'] = 0;
-		}
-
-		// Example to show how to set values of fields definition dynamically
-		/*if ($user->rights->knowledgemanagement->knowledgerecord->read) {
-			$this->fields['myfield']['visible'] = 1;
-			$this->fields['myfield']['noteditable'] = 0;
-		}*/
-
-		// Unset fields that are disabled
-		foreach ($this->fields as $key => $val) {
-			if (isset($val['enabled']) && empty($val['enabled'])) {
-				unset($this->fields[$key]);
-			}
-		}
-
-		// Translate some data of arrayofkeyval
-		if (is_object($langs)) {
-			foreach ($this->fields as $key => $val) {
-				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
-						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		return $this->createCommon($user, $notrigger);
-	}
-
-	/**
-	 * Clone an object into another one
-	 *
-	 * @param  	User 	$user      	User that creates
-	 * @param  	int 	$fromid     Id of object to clone
-	 * @return 	mixed 				New object created, <0 if KO
-	 */
-	public function createFromClone(User $user, $fromid)
-	{
-		global $langs, $extrafields;
-		$error = 0;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$object = new self($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$result = $object->fetchCommon($fromid);
-		if ($result > 0 && !empty($object->table_element_line)) {
-			$object->fetchLines();
-		}
-
-		// get lines so they will be clone
-		//foreach($this->lines as $line)
-		//	$line->fetch_optionals();
-
-		// Reset some properties
-		unset($object->id);
-		unset($object->fk_user_creat);
-		unset($object->import_key);
-
-		// Clear fields
-		if (property_exists($object, 'ref')) {
-			$object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
-		}
-		if (property_exists($object, 'label')) {
-			$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
-		}
-		if (property_exists($object, 'status')) {
-			$object->status = self::STATUS_DRAFT;
-		}
-		if (property_exists($object, 'date_creation')) {
-			$object->date_creation = dol_now();
-		}
-		if (property_exists($object, 'date_modification')) {
-			$object->date_modification = null;
-		}
-		// ...
-		// Clear extrafields that are unique
-		if (is_array($object->array_options) && count($object->array_options) > 0) {
-			$extrafields->fetch_name_optionals_label($this->table_element);
-			foreach ($object->array_options as $key => $option) {
-				$shortkey = preg_replace('/options_/', '', $key);
-				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
-					unset($object->array_options[$key]);
-				}
-			}
-		}
-
-		// Create clone
-		$object->context['createfromclone'] = 'createfromclone';
-		$result = $object->createCommon($user);
-		if ($result < 0) {
-			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
-		}
-
-		if (!$error) {
-			// copy internal contacts
-			if ($this->copy_linked_contact($object, 'internal') < 0) {
-				$error++;
-			}
-		}
-
-		if (!$error) {
-			// copy external contacts if same company
-			if (property_exists($this, 'fk_soc') && $this->fk_soc == $object->socid) {
-				if ($this->copy_linked_contact($object, 'external') < 0) {
-					$error++;
-				}
-			}
-		}
-
-		unset($object->context['createfromclone']);
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-			return $object;
-		} else {
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id   Id object
-	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) {
-			$this->fetchLines();
-		}
-		return $result;
-	}
-
-	/**
-	 * Load object lines in memory from the database
-	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetchLines()
-	{
-		$this->lines = array();
-
-		$result = $this->fetchLinesCommon();
-		return $result;
-	}
-
-
-	/**
-	 * Load list of objects in memory from the database.
-	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
-	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
-	{
-		global $conf;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$records = array();
-
-		$sql = 'SELECT ';
-		$sql .= $this->getFieldList('t');
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
-		} else {
-			$sql .= ' WHERE 1 = 1';
-		}
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
-				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
-		}
-
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield, $sortorder);
-		}
-		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < ($limit ? min($limit, $num) : $num)) {
-				$obj = $this->db->fetch_object($resql);
-
-				$record = new self($this->db);
-				$record->setVarsFromFetchObj($obj);
-
-				$records[$record->id] = $record;
-
-				$i++;
-			}
-			$this->db->free($resql);
-
-			return $records;
-		} else {
-			$this->errors[] = 'Error '.$this->db->lasterror();
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
-
-			return -1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		return $this->updateCommon($user, $notrigger);
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		return $this->deleteCommon($user, $notrigger);
-		//return $this->deleteCommon($user, $notrigger, 1);
-	}
-
-	/**
-	 *  Delete a line of object in database
-	 *
-	 *	@param  User	$user       User that delete
-	 *  @param	int		$idline		Id of line to delete
-	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-	 *  @return int         		>0 if OK, <0 if KO
-	 */
-	public function deleteLine(User $user, $idline, $notrigger = false)
-	{
-		if ($this->status < 0) {
-			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
-			return -2;
-		}
-
-		return $this->deleteLineCommon($user, $idline, $notrigger);
-	}
-
-
-	/**
-	 *	Validate object
-	 *
-	 *	@param		User	$user     		User making status change
-	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
-	 */
-	public function validate($user, $notrigger = 0)
-	{
-		global $conf, $langs;
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$error = 0;
-
-		// Protection
-		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
-			return 0;
-		}
-
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgerecord->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgerecord->knowledgerecord_advance->validate))))
-		 {
-		 $this->error='NotEnoughPermissions';
-		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-		 return -1;
-		 }*/
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// Define new ref
-		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
-			$num = $this->getNextNumRef();
-		} else {
-			$num = $this->ref;
-		}
-		$this->newref = $num;
-
-		if (!empty($num)) {
-			// Validate
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-			$sql .= " SET ref = '".$this->db->escape($num)."',";
-			$sql .= " status = ".self::STATUS_VALIDATED;
-			if (!empty($this->fields['date_validation'])) {
-				$sql .= ", date_validation = '".$this->db->idate($now)."'";
-			}
-			if (!empty($this->fields['fk_user_valid'])) {
-				$sql .= ", fk_user_valid = ".((int) $user->id);
-			}
-			$sql .= " WHERE rowid = ".((int) $this->id);
-
-			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				dol_print_error($this->db);
-				$this->error = $this->db->lasterror();
-				$error++;
-			}
-
-			if (!$error && !$notrigger) {
-				// Call trigger
-				$result = $this->call_trigger('KNOWLEDGERECORD_VALIDATE', $user);
-				if ($result < 0) {
-					$error++;
-				}
-				// End call triggers
-			}
-		}
-
-		if (!$error) {
-			$this->oldref = $this->ref;
-
-			// Rename directory if dir was a temporary ref
-			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
-				// Now we rename also files into index
-				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'knowledgerecord/".$this->db->escape($this->newref)."'";
-				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'knowledgerecord/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
-				$resql = $this->db->query($sql);
-				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
-				}
-
-				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
-				$oldref = dol_sanitizeFileName($this->ref);
-				$newref = dol_sanitizeFileName($num);
-				$dirsource = $conf->knowledgemanagement->dir_output.'/knowledgerecord/'.$oldref;
-				$dirdest = $conf->knowledgemanagement->dir_output.'/knowledgerecord/'.$newref;
-				if (!$error && file_exists($dirsource)) {
-					dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
-
-					if (@rename($dirsource, $dirdest)) {
-						dol_syslog("Rename ok");
-						// Rename docs starting with $oldref with $newref
-						$listoffiles = dol_dir_list($conf->knowledgemanagement->dir_output.'/knowledgerecord/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-						foreach ($listoffiles as $fileentry) {
-							$dirsource = $fileentry['name'];
-							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-							$dirsource = $fileentry['path'].'/'.$dirsource;
-							$dirdest = $fileentry['path'].'/'.$dirdest;
-							@rename($dirsource, $dirdest);
-						}
-					}
-				}
-			}
-		}
-
-		// Set new ref and current status
-		if (!$error) {
-			$this->ref = $num;
-			$this->status = self::STATUS_VALIDATED;
-		}
-
-		if (!$error) {
-			$this->db->commit();
-			return 1;
-		} else {
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *	Set draft status
-	 *
-	 *	@param	User	$user			Object user that modify
-	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
-	 *	@return	int						<0 if KO, >0 if OK
-	 */
-	public function setDraft($user, $notrigger = 0)
-	{
-		// Protection
-		if ($this->status <= self::STATUS_DRAFT) {
-			return 0;
-		}
-
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
-		 {
-		 $this->error='Permission denied';
-		 return -1;
-		 }*/
-
-		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'KNOWLEDGERECORD_UNVALIDATE');
-	}
-
-	/**
-	 *	Set cancel status
-	 *
-	 *	@param	User	$user			Object user that modify
-	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
-	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
-	 */
-	public function cancel($user, $notrigger = 0)
-	{
-		// Protection
-		if ($this->status != self::STATUS_VALIDATED) {
-			return 0;
-		}
-
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
-		 {
-		 $this->error='Permission denied';
-		 return -1;
-		 }*/
-
-		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'KNOWLEDGERECORD_CANCEL');
-	}
-
-	/**
-	 *	Set back to validated status
-	 *
-	 *	@param	User	$user			Object user that modify
-	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
-	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
-	 */
-	public function reopen($user, $notrigger = 0)
-	{
-		// Protection
-		if ($this->status != self::STATUS_CANCELED) {
-			return 0;
-		}
-
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
-		 {
-		 $this->error='Permission denied';
-		 return -1;
-		 }*/
-
-		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'KNOWLEDGERECORD_REOPEN');
-	}
-
-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *  @param  string  $option                     On what the link point to ('nolink', ...)
-	 *  @param  int     $notooltip                  1=Disable tooltip
-	 *  @param  string  $morecss                    Add more css on link
-	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 *  @return	string                              String with URL
-	 */
-	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-	{
-		global $conf, $langs, $hookmanager;
-
-		if (!empty($conf->dol_no_mouse_hover)) {
-			$notooltip = 1; // Force disable tooltips
-		}
-
-		$result = '';
-
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("KnowledgeRecord").'</u>';
-		if (isset($this->status)) {
-			$label .= ' '.$this->getLibStatut(5);
-		}
-		$label .= '<br>';
-		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-
-		$url = dol_buildpath('/knowledgemanagement/knowledgerecord_card.php', 1).'?id='.$this->id;
-
-		if ($option != 'nolink') {
-			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
-				$add_save_lastsearch_values = 1;
-			}
-			if ($add_save_lastsearch_values) {
-				$url .= '&save_lastsearch_values=1';
-			}
-		}
-
-		$linkclose = '';
-		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-				$label = $langs->trans("ShowKnowledgeRecord");
-				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-			}
-			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else {
-			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
-		}
-
-		if ($option == 'nolink') {
-			$linkstart = '<span';
-		} else {
-			$linkstart = '<a href="'.$url.'"';
-		}
-		$linkstart .= $linkclose.'>';
-		if ($option == 'nolink') {
-			$linkend = '</span>';
-		} else {
-			$linkend = '</a>';
-		}
-
-		$result .= $linkstart;
-
-		if (empty($this->showphoto_on_popup)) {
-			if ($withpicto) {
-				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-			}
-		} else {
-			if ($withpicto) {
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-				list($class, $module) = explode('@', $this->picto);
-				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
-				$filearray = dol_dir_list($upload_dir, "files");
-				$filename = $filearray[0]['name'];
-				if (!empty($filename)) {
-					$pospoint = strpos($filearray[0]['name'], '.');
-
-					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
-					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
-						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
-					} else {
-						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
-					}
-
-					$result .= '</div>';
-				} else {
-					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-				}
-			}
-		}
-
-		if ($withpicto != 2) {
-			$result .= $this->ref;
-		}
-
-		$result .= $linkend;
-		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
-
-		global $action, $hookmanager;
-		$hookmanager->initHooks(array('knowledgerecorddao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
-		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) {
-			$result = $hookmanager->resPrint;
-		} else {
-			$result .= $hookmanager->resPrint;
-		}
-
-		return $result;
-	}
-
-	/**
-	 *  Return the label of the status
-	 *
-	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-	 *  @return	string 			       Label of status
-	 */
-	public function getLibStatut($mode = 0)
-	{
-		return $this->LibStatut($this->status, $mode);
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return the status
-	 *
-	 *  @param	int		$status        Id status
-	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-	 *  @return string 			       Label of status
-	 */
-	public function LibStatut($status, $mode = 0)
-	{
-		// phpcs:enable
-		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
-			global $langs;
-			//$langs->load("knowledgemanagement@knowledgemanagement");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled');
-		}
-
-		$statusType = 'status'.$status;
-		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
-		if ($status == self::STATUS_CANCELED) {
-			$statusType = 'status6';
-		}
-
-		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-	}
-
-	/**
-	 *	Load the info information in the object
-	 *
-	 *	@param  int		$id       Id of object
-	 *	@return	void
-	 */
-	public function info($id)
-	{
-		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql .= ' fk_user_creat, fk_user_modif';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql .= ' WHERE t.rowid = '.((int) $id);
-		$result = $this->db->query($sql);
-		if ($result) {
-			if ($this->db->num_rows($result)) {
-				$obj = $this->db->fetch_object($result);
-				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
-
-				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
-			}
-
-			$this->db->free($result);
-		} else {
-			dol_print_error($this->db);
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->initAsSpecimenCommon();
-	}
-
-	/**
-	 * 	Create an array of lines
-	 *
-	 * 	@return array|int		array of lines if OK, <0 if KO
-	 */
-	public function getLinesArray()
-	{
-		$this->lines = array();
-
-		$objectline = new KnowledgeRecordLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_knowledgerecord = '.$this->id));
-
-		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
-			return $result;
-		} else {
-			$this->lines = $result;
-			return $this->lines;
-		}
-	}
-
-	/**
-	 *  Returns the reference to the following non used object depending on the active numbering module.
-	 *
-	 *  @return string      		Object free reference
-	 */
-	public function getNextNumRef()
-	{
-		global $langs, $conf;
-		$langs->load("knowledgemanagement@knowledgemanagement");
-
-		if (empty($conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON)) {
-			$conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON = 'mod_knowledgerecord_standard';
-		}
-
-		if (!empty($conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON)) {
-			$mybool = false;
-
-			$file = $conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON.".php";
-			$classname = $conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON;
-
-			// Include file with class
-			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-			foreach ($dirmodels as $reldir) {
-				$dir = dol_buildpath($reldir."core/modules/knowledgemanagement/");
-
-				// Load file with numbering class (if found)
-				$mybool |= @include_once $dir.$file;
-			}
-
-			if ($mybool === false) {
-				dol_print_error('', "Failed to include file ".$file);
-				return '';
-			}
-
-			if (class_exists($classname)) {
-				$obj = new $classname();
-				$numref = $obj->getNextValue($this);
-
-				if ($numref != '' && $numref != '-1') {
-					return $numref;
-				} else {
-					$this->error = $obj->error;
-					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
-					return "";
-				}
-			} else {
-				print $langs->trans("Error")." ".$langs->trans("ClassNotFound").' '.$classname;
-				return "";
-			}
-		} else {
-			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
-			return "";
-		}
-	}
-
-	/**
-	 *  Create a document onto disk according to template module.
-	 *
-	 *  @param	    string		$modele			Force template to use ('' to not force)
-	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
-	 *  @param      int			$hidedetails    Hide details of lines
-	 *  @param      int			$hidedesc       Hide description
-	 *  @param      int			$hideref        Hide ref
-	 *  @param      null|array  $moreparams     Array to provide more information
-	 *  @return     int         				0 if KO, 1 if OK
-	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
-	{
-		global $conf, $langs;
-
-		$result = 0;
-		$includedocgeneration = 0;
-
-		$langs->load("knowledgemanagement@knowledgemanagement");
-
-		if (!dol_strlen($modele)) {
-			$modele = 'standard_knowledgerecord';
-
-			if (!empty($this->model_pdf)) {
-				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->KNOWLEDGERECORD_ADDON_PDF)) {
-				$modele = $conf->global->KNOWLEDGERECORD_ADDON_PDF;
-			}
-		}
-
-		$modelpath = "core/modules/knowledgemanagement/doc/";
-
-		if ($includedocgeneration && !empty($modele)) {
-			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Action executed by scheduler
-	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
-	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
-	 *
-	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	public function doScheduledJob()
-	{
-		global $conf, $langs;
-
-		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
-
-		$error = 0;
-		$this->output = '';
-		$this->error = '';
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// ...
-
-		$this->db->commit();
-
-		return $error;
-	}
-}
-
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
-
-/**
- * Class KnowledgeRecordLine. You can also remove this and generate a CRUD class for lines objects.
- */
-class KnowledgeRecordLine extends CommonObjectLine
-{
-	// To complete with content of an object KnowledgeRecordLine
-	// We should have a field rowid, fk_knowledgerecord and position
-
-	/**
-	 * @var int  Does object support extrafields ? 0=No, 1=Yes
-	 */
-	public $isextrafieldmanaged = 0;
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
-}
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
index b26219113d9..9833fa9bfb7 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
@@ -36,7 +36,7 @@ class mod_knowledgerecord_standard extends ModeleNumRefKnowledgeRecord
 	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefix = 'KNOWLEDGERECORD';
+	public $prefix = 'KM';
 
 	/**
 	 * @var string Error code (or message)

From c10b165d337a0a0e9521f161e9f82001e8d94656 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Fri, 30 Apr 2021 14:36:25 +0200
Subject: [PATCH 497/928] qc_status change in stock correct -> display select

---
 htdocs/product/class/html.formproduct.class.php  | 15 +--------------
 htdocs/product/stock/class/productlot.class.php  | 14 +++++++-------
 htdocs/product/stock/productlot_card.php         |  2 +-
 htdocs/product/stock/tpl/stockcorrection.tpl.php |  5 ++++-
 htdocs/product/stock/tpl/stocktransfer.tpl.php   | 15 ++-------------
 5 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 6f626e40244..ace2cfa0008 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -672,7 +672,7 @@ class FormProduct
 			}
 		}
 	}
-        // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return select list of productbatch status
      *
@@ -705,26 +705,17 @@ class FormProduct
                 $out .= ajax_combobox($htmlname, $events);
             }
 
-            /* if (!empty($page)) {
-                $out .= '<form method="post" action="'.$page.'">';
-                $out .= '<input type="hidden" name="action" value="setfk_qcstatus">';
-                $out .= '<input type="hidden" name="token" value="'.newToken().'">';
-            } */
-
             $out .= '<select id="'.$htmlname.'" class="flat selectfkstatus minwidth100imp noenlargeonsmartphone" name="'.$htmlname.'" '.$htmloption.'>';
             $out .= '<option value="0">&nbsp;</option>';
             $num = $this->db->num_rows($resql);
             $i = 0;
             if ($num) {
-                // $foundselected = false;
-
                 while ($i < $num) {
                     $obj = $this->db->fetch_object($resql);
                     $statusArray[$i]['code'] = $obj->code;
                     $statusArray[$i]['label'] = $obj->label;
                     $i++;
                 }
-
                 foreach ($statusArray as $row) {
                     if ($selected && ($selected == $row['code'] || $selected == $row['label'])) {
                         $out .= '<option value="'.$row['code'].'" selected>';
@@ -744,10 +735,6 @@ class FormProduct
 			if ($user->admin) {
 				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
-
-            /* if (!empty($page)) {
-                $out .= '<input type="submit" class="button valignmiddle smallpaddingimp nomargintop nomarginbottom" value="'.$langs->trans("Modify").'"></form>';
-            } */
         } else {
             dol_print_error($this->db);
         }
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 0fbef103d83..0d891e8eb76 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -96,7 +96,7 @@ class Productlot extends CommonObject
 		'scrapping_date'        => array('type'=>'date', 'label'=>'DestructionDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>90),
 		'commissionning_date'        => array('type'=>'date', 'label'=>'FirstUseDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>100),
 		'qc_frequency'        => array('type'=>'varchar(6)', 'label'=>'QCFrequency', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>110),
-		'fk_qcstatus'        => array('type'=>'varchar(6)', 'label'=>'Status', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>120),
+		// 'fk_qcstatus'        => array('type'=>'varchar(6)', 'label'=>'Status', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>120),
 		'eatby'         => array('type'=>'date', 'label'=>'EatByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_EATBY)?1:0', 'visible'=>5, 'position'=>62),
 		'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
 		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
@@ -123,7 +123,7 @@ class Productlot extends CommonObject
 	public $scrapping_date = '';
 	public $commissionning_date = '';
 	public $qc_frequency = '';
-	public $fk_qcstatus = '';
+	// public $fk_qcstatus = '';
 	public $datec = '';
 	public $tms = '';
 
@@ -203,7 +203,7 @@ class Productlot extends CommonObject
 		$sql .= 'scrapping_date,';
 		$sql .= 'commissionning_date,';
 		$sql .= 'qc_frequency,';
-		$sql .= 'fk_qcstatus,';
+		// $sql .= 'fk_qcstatus,';
 		$sql .= 'datec,';
 		$sql .= 'fk_user_creat,';
 		$sql .= 'fk_user_modif,';
@@ -219,7 +219,7 @@ class Productlot extends CommonObject
 		$sql .= ' '.(!isset($this->scrapping_date) || dol_strlen($this->scrapping_date) == 0 ? 'NULL' : "'".$this->db->idate($this->scrapping_date)."'").',';
 		$sql .= ' '.(!isset($this->commissionning_date) || dol_strlen($this->commissionning_date) == 0 ? 'NULL' : "'".$this->db->idate($this->commissionning_date)."'").',';
 		$sql .= ' '.(!isset($this->qc_frequency) ? 'NULL' : $this->qc_frequency).',';
-		$sql .= ' '.(!isset($this->fk_qcstatus) || dol_strlen($this->fk_qcstatus) == 0 ? 'NULL' : $this->fk_qcstatus).',';
+		// $sql .= ' '.(!isset($this->fk_qcstatus) || dol_strlen($this->fk_qcstatus) == 0 ? 'NULL' : $this->fk_qcstatus).',';
 
 		$sql .= ' '."'".$this->db->idate(dol_now())."'".',';
 		$sql .= ' '.(!isset($this->fk_user_creat) ? 'NULL' : $this->fk_user_creat).',';
@@ -298,7 +298,7 @@ class Productlot extends CommonObject
 		$sql .= " t.scrapping_date,";
 		$sql .= " t.commissionning_date,";
 		$sql .= " t.qc_frequency,";
-		$sql .= " t.fk_qcstatus,";
+		// $sql .= " t.fk_qcstatus,";
 		$sql .= " t.datec,";
 		$sql .= " t.tms,";
 		$sql .= " t.fk_user_creat,";
@@ -332,7 +332,7 @@ class Productlot extends CommonObject
 				$this->scrapping_date = $this->db->jdate($obj->scrapping_date);
 				$this->commissionning_date = $this->db->jdate($obj->commissionning_date);
 				$this->qc_frequency = $obj->qc_frequency;
-				$this->fk_qcstatus = $obj->fk_qcstatus;
+				// $this->fk_qcstatus = $obj->fk_qcstatus;
 
 				$this->datec = $this->db->jdate($obj->datec);
 				$this->tms = $this->db->jdate($obj->tms);
@@ -415,7 +415,7 @@ class Productlot extends CommonObject
 		$sql .= ' scrapping_date = '.(!isset($this->destruction_date) || dol_strlen($this->destruction_date) != 0 ? "'".$this->db->idate($this->destruction_date)."'" : 'null').',';
 		$sql .= ' commissionning_date = '.(!isset($this->first_use_date) || dol_strlen($this->first_use_date) != 0 ? "'".$this->db->idate($this->first_use_date)."'" : 'null').',';
 		$sql .= ' qc_frequency = '.(!isset($this->qc_frequency) || dol_strlen($this->qc_frequency) != 0 ? "'".$this->db->escape($this->qc_frequency)."'" : 'null').',';
-		$sql .= ' fk_qcstatus = '.(!isset($this->fk_qcstatus) || dol_strlen($this->fk_qcstatus) != 0 ? "'".$this->db->escape($this->fk_qcstatus)."'" : 'null').',';
+		// $sql .= ' fk_qcstatus = '.(!isset($this->fk_qcstatus) || dol_strlen($this->fk_qcstatus) != 0 ? "'".$this->db->escape($this->fk_qcstatus)."'" : 'null').',';
 		$sql .= ' datec = '.(!isset($this->datec) || dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').',';
 		$sql .= ' tms = '.(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'").',';
 		$sql .= ' fk_user_creat = '.(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").',';
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 5dacea42801..06bce2a4f9d 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -207,7 +207,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'setqc_frequency' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
-		$result = $object->setValueFrom('qc_frequency', GETPOST('qc_frequency'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
+		$result = $object->setValueFrom('qc_frequency', GETPOST('qc_frequency'), '', null, 'int', '', $user, 'PRODUCT_MODIFY');
 		if ($result < 0) { // Prévoir un test de format de durée
 			setEventMessages($object->error, null, 'errors');
 			$action == 'editqc_frequency';
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 6e2ab53dd0e..f0175942511 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -115,9 +115,12 @@ if (!empty($conf->productbatch->enabled) &&
 || ($object->element == 'stock'))
 ) {
 	print '<tr>';
-	print '<td'.($object->element == 'stock' ? '' : ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td colspan="3">';
+	print '<td'.($object->element == 'stock' ? '' : ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td>';
 	print '<input type="text" name="batch_number" size="40" value="'.GETPOST("batch_number").'">';
 	print '</td>';
+	print '<td>'.$langs->trans("StatusChangeIfNeeded").'</td>';
+	$formproduct->load_cache_productbatch_qcstatus();
+	print '<td class="valuefield">'.$formproduct->selectProductbatchQcstatus($object->fk_qcstatus, 'fk_qcstatus').'</td></tr>';
 	print '</tr>';
 	print '<tr>';
 	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 42a6f992fb8..32a197b7857 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -90,20 +90,9 @@ print '<td class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td>';
 print img_picto('', 'stock').$formproduct->selectWarehouses(GETPOST('id_entrepot_destination'), 'id_entrepot_destination', 'warehouseopen,warehouseinternal', 1);
 print '</td></tr>';
 print '<tr><td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td><input type="text" name="nbpiece" size="10" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
-// print '</tr>';
-// print '<tr>';
 print '<td>'.$langs->trans("StatusChangeIfNeeded").'</td>';
-print '<td class="valuefield">';
-// if ($action != 'editfk_qcstatus') {
-	$formproduct->load_cache_productbatch_qcstatus();
-	// print $formproduct->cache_productbatch_qcstatus[$object->fk_qcstatus];
-/* } else {
-if (empty($fk_qcstatus)) {
-	$fk_qcstatus = $object->fk_qcstatus;
-} */
-print $formproduct->selectProductbatchQcstatus('-1','fk_qcstatus');
-// }
-print '</td></tr>';
+$formproduct->load_cache_productbatch_qcstatus();
+print '<td class="valuefield">'.$formproduct->selectProductbatchQcstatus('0','fk_qcstatus').'</td></tr>';
 
 // Serial / Eat-by date
 if (!empty($conf->productbatch->enabled) &&

From ce677c4f272fbc4fcac7754592ba5566ee9f8cf4 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 30 Apr 2021 14:50:18 +0200
Subject: [PATCH 498/928] Fix #17361 : change of llx_export_model type to
 varchar(64)

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index bfa8bf01b39..81471e18e4c 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -583,4 +583,5 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, active, position)
 -- VMYSQL4.3 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN montant double(24,8) NULL;
 -- VPGSQL8.2 ALTER TABLE llx_accounting_bookkeeping ALTER COLUMN montant DROP NOT NULL;
 
+ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
 

From e99355a0c2a0d84c6b110f2895c88feef26a5cb8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 15:22:17 +0200
Subject: [PATCH 499/928] Clean html

---
 htdocs/adherents/card.php                      |  2 +-
 htdocs/adherents/subscription.php              |  2 +-
 htdocs/admin/knowledgemanagement.php           | 12 ++++++------
 htdocs/admin/knowledgerecord_extrafields.php   |  8 +++++---
 htdocs/admin/system/modules.php                |  2 +-
 htdocs/compta/bank/bilan.php                   |  2 +-
 htdocs/compta/facture/card-rec.php             |  2 +-
 htdocs/compta/prelevement/card.php             |  2 +-
 htdocs/compta/prelevement/fiche-rejet.php      |  2 +-
 htdocs/compta/prelevement/fiche-stat.php       |  2 +-
 htdocs/compta/prelevement/line.php             |  2 +-
 htdocs/compta/prelevement/rejets.php           |  2 +-
 htdocs/core/class/html.form.class.php          |  6 +++---
 htdocs/core/class/html.formbarcode.class.php   |  2 +-
 htdocs/core/lib/functions.lib.php              | 18 ++++++++++--------
 htdocs/core/modules/modAccounting.class.php    |  2 +-
 htdocs/core/modules/modComptabilite.class.php  |  2 +-
 .../modules/modKnowledgeManagement.class.php   |  8 ++++----
 htdocs/delivery/card.php                       |  8 ++++----
 htdocs/fichinter/card-rec.php                  |  2 +-
 htdocs/imports/import.php                      |  4 ++--
 .../lib/knowledgemanagement.lib.php            |  2 +-
 .../product/class/html.formproduct.class.php   |  2 +-
 htdocs/public/members/public_card.php          |  2 +-
 htdocs/theme/eldy/global.inc.php               |  3 +++
 25 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 496bf1580a9..93a0761183b 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1791,7 +1791,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 				print '<input type="hidden" name="action" value="set'.$htmlname.'">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+				print '<table class="nobordernopadding">';
 				print '<tr><td>';
 				print $form->select_company($object->socid, 'socid', '', 1);
 				print '</td>';
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index ec9b2c3a65e..7f8da3a33b3 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -590,7 +590,7 @@ if ($rowid > 0) {
 			print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 			print '<input type="hidden" name="action" value="set'.$htmlname.'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			print '<table class="nobordernopadding">';
 			print '<tr><td>';
 			print $form->select_company($object->fk_soc, 'socid', '', 1);
 			print '</td>';
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 4769d84f118..e9e7f971575 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -58,11 +58,6 @@ require_once DOL_DOCUMENT_ROOT."/knowledgemanagement/lib/knowledgemanagement.lib
 // Translations
 $langs->loadLangs(array("admin", "knowledgemanagement"));
 
-// Access control
-if (!$user->admin) {
-	accessforbidden();
-}
-
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -70,7 +65,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
-$type = 'myobject';
+$type = 'knowledgemanagement';
 
 $arrayofparameters = array(
 	'KNOWLEDGEMANAGEMENT_MYPARAM1'=>array('type'=>'string', 'css'=>'minwidth500' ,'enabled'=>0),
@@ -84,6 +79,11 @@ $arrayofparameters = array(
 $error = 0;
 $setupnotempty = 0;
 
+// Access control
+if (!$user->admin) {
+	accessforbidden();
+}
+
 
 /*
  * Actions
diff --git a/htdocs/admin/knowledgerecord_extrafields.php b/htdocs/admin/knowledgerecord_extrafields.php
index b5113521c2c..34d3b4858e9 100644
--- a/htdocs/admin/knowledgerecord_extrafields.php
+++ b/htdocs/admin/knowledgerecord_extrafields.php
@@ -91,17 +91,19 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$help_url = '';
+$page_name = 'KnowledgeManagementSetup';
 
-llxHeader('', $langs->trans("KnowledgeManagementSetup"), $help_url);
+llxHeader('', $langs->trans($page_name), $help_url);
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("KnowledgeManagementSetup"), $linkback, 'title_setup');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 
 $head = knowledgemanagementAdminPrepareHead();
 
-print dol_get_fiche_head($head, 'knowledgerecord_extrafields', $langs->trans("KnowledgeRecordExtraFields"), -1, 'account');
+print dol_get_fiche_head($head, 'knowledgerecord_extrafields', $langs->trans("KnowledgeRecordExtraFields"), -1, 'knowledgemanagement');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index c11436a66d9..2796f09fbfd 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -324,7 +324,7 @@ foreach ($moduleList as $module) {
 	}
 
 	if ($arrayfields['version']['checked']) {
-		print '<td>'.$module->version.'</td>';
+		print '<td class="nowraponall">'.$module->version.'</td>';
 	}
 
 	if ($arrayfields['id']['checked']) {
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 309d848a3c2..94ae0134a9d 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -64,7 +64,7 @@ llxHeader();
 print load_fiche_titre("Bilan");
 print '<br>';
 
-print '<table class="noborder" width="100%" cellspacing="0" cellpadding="2">';
+print '<table class="noborder" width="100%" cellpadding="2">';
 print "<tr class=\"liste_titre\">";
 echo '<td colspan="2">'.$langs->trans("Summary").'</td>';
 print "</tr>\n";
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 1ee26e6daf3..203ed7002be 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1469,7 +1469,7 @@ if ($action == 'create') {
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'">';
 			print '<input type="hidden" name="action" value="setfrequency">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			print '<table class="nobordernopadding">';
 			print '<tr><td>';
 			print "<input type='text' name='frequency' value='".$object->frequency."' size='5' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency ? $object->unit_frequency : 'm'));
 			print '</td>';
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index cd3e155ae06..a94d068603a 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -394,7 +394,7 @@ if ($id > 0 || $ref) {
 		print_barre_liste($langs->trans("Lines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
 		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-		print '<table class="noborder liste" width="100%" cellspacing="0" cellpadding="4">';
+		print '<table class="noborder liste" width="100%" cellpadding="4">';
 		print '<tr class="liste_titre">';
 		print_liste_field_titre("Lines", $_SERVER["PHP_SELF"], "pl.rowid", '', $urladd);
 		print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $urladd);
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index b202d8ce0b7..928be9c4245 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -202,7 +202,7 @@ if ($resql) {
 
 	print"\n<!-- debut table -->\n";
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+	print '<table class="noborder" width="100%" cellpadding="4">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td class="right">'.$langs->trans("Amount").'</td>';
 	print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td class="center">'.$langs->trans("Invoice").'</td></tr>';
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 3f51b5b554d..4a9bfbf6345 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -173,7 +173,7 @@ if ($prev_id > 0 || $ref) {
 		print load_fiche_titre($langs->trans("StatisticsByLineStatus"), '', '');
 
 		print"\n<!-- debut table -->\n";
-		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+		print '<table class="noborder" width="100%" cellpadding="4">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Status").'</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
 
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index a912ecdba3a..bc3a06c2e6d 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -280,7 +280,7 @@ if ($id) {
 		print_barre_liste($langs->trans("Bills"), $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num, 0, '');
 
 		print"\n<!-- debut table -->\n";
-		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+		print '<table class="noborder" width="100%" cellpadding="4">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Invoice").'</td><td>'.$langs->trans("ThirdParty").'</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">'.$langs->trans("Status").'</td>';
 		print '</tr>';
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 5aec35cf504..ed8c704bcfa 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -113,7 +113,7 @@ if ($result) {
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	print"\n<!-- debut table -->\n";
-	print '<table class="noborder tagtable liste" width="100%" cellspacing="0" cellpadding="4">';
+	print '<table class="noborder tagtable liste" width="100%" cellpadding="4">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Line", $_SERVER["PHP_SELF"], "p.ref", '', $param);
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $param);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 835810ff065..044ba439922 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -225,7 +225,7 @@ class Form
 				$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$ret .= '<input type="hidden" name="'.$paramid.'" value="'.$object->id.'">';
 				if (empty($notabletag)) {
-					$ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';
+					$ret .= '<table class="nobordernopadding centpercent">';
 				}
 				if (empty($notabletag)) {
 					$ret .= '<tr><td>';
@@ -5171,7 +5171,7 @@ class Form
 			$ret .= '<form method="post" action="'.$page.'" name="form'.$htmlname.'">';
 			$ret .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
 			$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
-			$ret .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			$ret .= '<table class="nobordernopadding">';
 			$ret .= '<tr><td>';
 			$ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form'.$htmlname, 1, 0);
 			$ret .= '</td>';
@@ -5475,7 +5475,7 @@ class Form
 			print '<form method="post" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="set_contact">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			print '<table class="nobordernopadding">';
 			print '<tr><td>';
 			print $this->selectcontacts($societe->id, $selected, $htmlname);
 			$num = $this->num;
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 8f3dc86c760..34bcbd86cfa 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -209,7 +209,7 @@ class FormBarCode
 			$out .= '<form method="post" action="'.$page.'">';
 			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$out .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
-			$out .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			$out .= '<table class="nobordernopadding">';
 			$out .= '<tr><td>';
 			$out .= $this->selectBarcodeType($selected, $htmlname, 1);
 			$out .= '</td>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6c4d73c4e49..4239ff4bafe 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3510,17 +3510,18 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		if (empty($srconly) && in_array($pictowithouttext, array(
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
-				'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'building',
+				'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'bug', 'building',
 				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'cron', 'cubes',
-				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
+				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
+				'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
 				'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
-				'images', 'info', 'intervention', 'inventory', 'intracommreport',
+				'images', 'info', 'intervention', 'inventory', 'intracommreport', 'knowledgemanagement',
 				'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
 				'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
 				'off', 'on', 'order',
-				'paiment', 'play', 'pdf', 'phone', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip',
+				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip',
 				'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
@@ -3556,7 +3557,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'email'=>'at', 'establishment'=>'building',
 				'edit'=>'pencil-alt', 'graph'=>'chart-line', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
 				'generic'=>'file', 'holiday'=>'umbrella-beach',
-				'info'=>'info-circle', 'inventory'=>'boxes', 'intracommreport'=>'globe-europe', 'label'=>'layer-group', 'loan'=>'money-bill-alt',
+				'info'=>'info-circle', 'inventory'=>'boxes', 'intracommreport'=>'globe-europe', 'knowledgemanagement'=>'ticket-alt', 'label'=>'layer-group', 'loan'=>'money-bill-alt',
 				'member'=>'user-alt', 'meeting'=>'chalkboard-teacher', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right',
 				'trip'=>'wallet', 'expensereport'=>'wallet', 'group'=>'users', 'movement'=>'people-carry',
 				'sign-out'=>'sign-out-alt',
@@ -3634,15 +3635,16 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'bill'=>'infobox-commande', 'billa'=>'infobox-commande', 'billr'=>'infobox-commande', 'billd'=>'infobox-commande',
 				'conferenceorbooth'=>'infobox-project',
 				'cash-register'=>'infobox-bank_account', 'contract'=>'infobox-contrat', 'check'=>'font-status4', 'collab'=>'infobox-action', 'conversation'=>'infobox-contrat',
-				'donation'=>'infobox-commande', 'dollyrevert'=>'flip', 'ecm'=>'infobox-action',
+				'donation'=>'infobox-commande', 'dollyrevert'=>'flip',
+				'ecm'=>'infobox-action', 'eventorganization'=>'infobox-project',
 				'hrm'=>'infobox-adherent', 'group'=>'infobox-adherent', 'intervention'=>'infobox-contrat',
 				'multicurrency'=>'infobox-bank_account',
 				'members'=>'infobox-adherent', 'member'=>'infobox-adherent', 'money-bill-alt'=>'infobox-bank_account',
 				'order'=>'infobox-commande',
 				'user'=>'infobox-adherent', 'users'=>'infobox-adherent',
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
-				'holiday'=>'infobox-holiday', 'info'=>'opacityhigh', 'invoice'=>'infobox-commande', 'loan'=>'infobox-bank_account',
-				'eventorganization'=>'infobox-project',
+				'holiday'=>'infobox-holiday', 'info'=>'opacityhigh', 'invoice'=>'infobox-commande',
+				'knowledgemanagement'=>'infobox-contrat rotate90', 'loan'=>'infobox-bank_account',
 				'payment'=>'infobox-bank_account', 'poll'=>'infobox-adherent', 'pos'=>'infobox-bank_account', 'project'=>'infobox-project', 'projecttask'=>'infobox-project', 'propal'=>'infobox-propal',
 				'reception'=>'flip', 'recruitmentjobposition'=>'infobox-adherent', 'recruitmentcandidature'=>'infobox-adherent',
 				'resource'=>'infobox-action',
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 7b289c74253..21618c56bc9 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -54,7 +54,7 @@ class modAccounting extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = 'accounting';
+		$this->picto = 'accountancy';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array('/accounting/temp');
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index 09f6cd85496..be8f1954959 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -57,7 +57,7 @@ class modComptabilite extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = 'accounting';
+		$this->picto = 'accountancy';
 
 		// Config pages
 		$this->config_page_url = array("compta.php");
diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index 9deeceb7f09..8d6eebcee6a 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -45,7 +45,7 @@ class modKnowledgeManagement 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 = 80000; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
+		$this->numero = 57000; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
 
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'knowledgemanagement';
@@ -63,9 +63,9 @@ class modKnowledgeManagement extends DolibarrModules
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 
 		// Module description, used if translation string 'ModuleKnowledgeManagementDesc' not found (KnowledgeManagement is name of module).
-		$this->description = "Knowledge Management Description";
+		$this->description = "Knowledge Management (KM)";
 		// Used only if file README.md and README-LL.md not found.
-		$this->descriptionlong = "Knowledge Management Description";
+		$this->descriptionlong = "Manage a Knowledge Management (KM) database";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
 		$this->version = 'development';
@@ -79,7 +79,7 @@ class modKnowledgeManagement extends DolibarrModules
 		// 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'
 		// To use a supported fa-xxx css style of font awesome, use this->picto='xxx'
-		$this->picto = 'generic';
+		$this->picto = 'knowledgemanagement';
 
 		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
 		$this->module_parts = array(
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 69fd5a9bec0..2c6415f17b7 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -659,7 +659,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 			}
 			print "\n";
 
-			print '<table width="100%" cellspacing="2"><tr><td width="50%" valign="top">';
+			print '<div class="fichecenter"><div class="fichehalfleft">';
 
 			/*
 			  * Documents generated
@@ -687,11 +687,11 @@ if ($action == 'create') {    // Create. Seems to no be used
 			}
 
 
-			print '</td><td valign="top" width="50%">';
+			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-			// Rien a droite
+			// Nothing on right
 
-			print '</td></tr></table>';
+			print '</div></div></div>';
 		} else {
 			/* Expedition non trouvee */
 			print "Expedition inexistante ou acces refuse";
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 26ea2cfaaa8..fb031d81583 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -600,7 +600,7 @@ if ($action == 'create') {
 				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 				print '<input type="hidden" name="action" value="setfrequency">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+				print '<table class="nobordernopadding">';
 				print '<tr><td>';
 				print '<input type="text" name="frequency" value="'.$object->frequency.'" size="5">&nbsp;';
 				print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency ? $object->unit_frequency : 'm'));
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 0783e6352a4..20a846123f1 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -503,7 +503,7 @@ if ($step == 2 && $datatoimport) {
 	print '<br>';
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+	print '<table class="noborder centpercent" cellpadding="4">';
 
 	$filetoimport = '';
 
@@ -641,7 +641,7 @@ if ($step == 3 && $datatoimport) {
 	print '</span><br><br>';
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+	print '<table class="noborder centpercent" width="100%" cellpadding="4">';
 
 	$filetoimport = '';
 
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
index 270fb20c8ef..15279f01983 100644
--- a/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
@@ -36,7 +36,7 @@ function knowledgemanagementAdminPrepareHead()
 	$head = array();
 
 	$head[$h][0] = dol_buildpath("/admin/knowledgemanagement.php", 1);
-	$head[$h][1] = $langs->trans("Settings");
+	$head[$h][1] = $langs->trans("Setup");
 	$head[$h][2] = 'settings';
 	$h++;
 
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 718acef6970..a5f28c50ee8 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -340,7 +340,7 @@ class FormProduct
 			print '<form method="POST" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setwarehouse">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			print '<table class="nobordernopadding">';
 			print '<tr><td>';
 			print $this->selectWarehouses($selected, $htmlname, '', $addempty);
 			print '</td>';
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index 4950db468f1..a6512b83a60 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -101,7 +101,7 @@ if ($id > 0) {
 	if (empty($object->public)) {
 		 print $langs->trans("ErrorThisMemberIsNotPublic");
 	} else {
-		print '<table class="public_border" cellspacing="0" width="100%" cellpadding="3">';
+		print '<table class="public_border" width="100%" cellpadding="3">';
 
 		print '<tr><td width="15%">'.$langs->trans("Type").'</td><td class="valeur">'.$object->type."</td></tr>\n";
 		print '<tr><td>'.$langs->trans("Person").'</td><td class="valeur">'.$object->morphy.'</td></tr>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 32392b8491c..f96844e1655 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -650,6 +650,9 @@ textarea.centpercent {
 .flip {
 	transform: scaleX(-1) translate(2px, 0);
 }
+.rotate90 {
+	transform: rotate(90deg) translate(0, 2px);
+}
 .center {
 	text-align: center;
 	margin: 0px auto;

From 278d8c1317b440ecf2585a7e1cc89d716132b07e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 15:34:02 +0200
Subject: [PATCH 500/928] Debug

---
 htdocs/install/check.php    | 2 +-
 htdocs/install/default.css  | 4 ++++
 htdocs/install/fileconf.php | 6 +++---
 htdocs/install/step1.php    | 2 +-
 htdocs/install/step2.php    | 2 +-
 htdocs/install/step4.php    | 2 +-
 htdocs/install/step5.php    | 2 +-
 htdocs/install/upgrade.php  | 2 +-
 htdocs/install/upgrade2.php | 4 ++--
 9 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 79c8e590ab9..35efe1f36b2 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -64,7 +64,7 @@ pHeader('', ''); // No next step for navigation buttons. Next step is defined by
 //print "<br>\n";
 //print $langs->trans("InstallEasy")."<br><br>\n";
 
-print '<h3><img class="valigntextbottom inline-block" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Database"> ';
+print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Database"> ';
 print '<span class="inline-block">'.$langs->trans("MiscellaneousChecks")."</span></h3>\n";
 
 // Check browser
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 5363d9530e1..fe85649844d 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -16,6 +16,10 @@
  */
 
 
+.paddingright {
+	padding-right: 4px;
+}
+
 .opacitymedium {
 	opacity: 0.5;
 }
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 0ca5805ba24..3f2e714640a 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -134,7 +134,7 @@ if (!empty($force_install_message)) {
 
 	<tr>
 		<td colspan="3" class="label">
-		<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/globe.svg" width="20" alt="webserver"> <?php echo $langs->trans("WebServer"); ?></h3>
+		<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/globe.svg" width="20" alt="webserver"> <?php echo $langs->trans("WebServer"); ?></h3>
 		</td>
 	</tr>
 
@@ -261,7 +261,7 @@ if (!empty($force_install_noedit)) {
 
 	<tr>
 		<td colspan="3" class="label"><br>
-		<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="webserver"> <?php echo $langs->trans("DolibarrDatabase"); ?></h3>
+		<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="webserver"> <?php echo $langs->trans("DolibarrDatabase"); ?></h3>
 		</td>
 	</tr>
 
@@ -521,7 +521,7 @@ if (!empty($force_install_noedit)) {
 	?>
 	<tr class="hidesqlite hideroot">
 		<td colspan="3" class="label"><br>
-		<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/shield.svg" width="20" alt="webserver"> <?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
+		<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/shield.svg" width="20" alt="webserver"> <?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
 		</td>
 	</tr>
 
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 86e970f8194..a8bd9a4d3b6 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -347,7 +347,7 @@ if (!$error && $db->connected && $action == "set") {
 	}
 
 	// Show title of step
-	print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
+	print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/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
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 2841ae8bdfe..f95cb218561 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -99,7 +99,7 @@ if (!is_writable($conffile)) {
 }
 
 if ($action == "set") {
-	print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
+	print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
 
 	print '<table cellspacing="0" style="padding: 4px 4px 4px 0" border="0" width="100%">';
 	$error = 0;
diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php
index 7d03c7b6fd0..82a01f39f6a 100644
--- a/htdocs/install/step4.php
+++ b/htdocs/install/step4.php
@@ -69,7 +69,7 @@ if (!is_writable($conffile)) {
 }
 
 
-print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/key.svg" width="20" alt="Database"> '.$langs->trans("DolibarrAdminLogin").'</h3>';
+print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/key.svg" width="20" alt="Database"> '.$langs->trans("DolibarrAdminLogin").'</h3>';
 
 print $langs->trans("LastStepDesc").'<br><br>';
 
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 8c6f1147e94..b841edb12ac 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -404,7 +404,7 @@ if ($action == "set" && $success) {
 	// If upgrade
 	if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
 		// Upgrade is finished
-		print $langs->trans("SystemIsUpgraded")."<br>";
+		print '<img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/checklist.svg" width="20" alt="Configuration"> '.$langs->trans("SystemIsUpgraded")."<br>";
 
 		$createlock = 0;
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index c985a50806d..bc615c1da94 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -110,7 +110,7 @@ $actiondone = 0;
 if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09'))) {
 	$actiondone = 1;
 
-	print '<h3><img class="valigntextbottom inline-block" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> ';
+	print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> ';
 	print '<span class="inline-block">'.$langs->trans("DatabaseMigration").'</span></h3>';
 
 	print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 23fa3d95a3c..f94e461398b 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -117,10 +117,10 @@ pHeader('', 'step5', GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'upg
 
 
 if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09'))) {
-	print '<h3><img class="valigntextbottom inline-block" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> ';
+	print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> ';
 	print '<span class="inline-block">'.$langs->trans('DataMigration').'</span></h3>';
 
-	print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
+	print '<table border="0" width="100%">';
 
 	// If password is encoded, we decode it
 	if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass)) {

From 79133d120549d7fbbb014ea7bf913f32707740c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 15:37:26 +0200
Subject: [PATCH 501/928] Debug

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

diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 3efbb844e35..1f52d9396fd 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -61,7 +61,7 @@ class KnowledgeRecord extends CommonObject
 	/**
 	 * @var string String with name of icon for knowledgerecord. Must be the part after the 'object_' into object_knowledgerecord.png
 	 */
-	public $picto = 'book';
+	public $picto = 'knowledgemanagement';
 
 
 	const STATUS_DRAFT = 0;
@@ -111,7 +111,7 @@ class KnowledgeRecord extends CommonObject
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
 		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1,),
-		'answer' => array('type'=>'text', 'label'=>'Answer', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>4,),
+		'answer' => array('type'=>'html', 'label'=>'Answer', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Actif'),),
 	);
 	public $rowid;

From 46f41681ff6619c35e60e118804307dca4cdaba9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 15:55:28 +0200
Subject: [PATCH 502/928] Debug

---
 .../class/knowledgerecord.class.php           | 10 +++++-----
 .../knowledgerecord_card.php                  |  2 +-
 ...nowledgemanagement_knowledgerecord.lib.php |  2 +-
 htdocs/langs/en_US/knowledgemanagement.lang   | 20 +++++++++----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 1f52d9396fd..2dba1581d9e 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -111,8 +111,8 @@ class KnowledgeRecord extends CommonObject
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
 		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1,),
-		'answer' => array('type'=>'html', 'label'=>'Answer', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Actif'),),
+		'answer' => array('type'=>'html', 'label'=>'Solution', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Valid'),),
 	);
 	public $rowid;
 	public $ref;
@@ -812,15 +812,15 @@ class KnowledgeRecord extends CommonObject
 			global $langs;
 			//$langs->load("knowledgemanagement");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
 			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
 			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
 			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled');
 		}
 
 		$statusType = 'status'.$status;
-		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 		if ($status == self::STATUS_CANCELED) {
 			$statusType = 'status6';
 		}
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 071a6417b0b..5cd42d3fb93 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -467,7 +467,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
 				if ((empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) && $permissiontoreply) {
-					print dolGetButtonAction($langs->trans('Reply'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
+					print dolGetButtonAction($langs->trans('ValidateReply'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
 				} else {
 					$langs->load("errors");
 					//print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', 0);
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
index ce1a831fff7..1da21a3e413 100644
--- a/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
@@ -37,7 +37,7 @@ function knowledgerecordPrepareHead($object)
 	$head = array();
 
 	$head[$h][0] = dol_buildpath("/knowledgemanagement/knowledgerecord_card.php", 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
+	$head[$h][1] = $langs->trans("KnowledgeRecord");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/langs/en_US/knowledgemanagement.lang b/htdocs/langs/en_US/knowledgemanagement.lang
index 91df84c01a4..633014722a7 100644
--- a/htdocs/langs/en_US/knowledgemanagement.lang
+++ b/htdocs/langs/en_US/knowledgemanagement.lang
@@ -18,16 +18,16 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management
+ModuleKnowledgeManagementName = Knowledge Management System
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc = Knowledge Management description
+ModuleKnowledgeManagementDesc = Manage a Knowledge Management database
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management setup
+KnowledgeManagementSetup = Knowledge Management System setup
 Settings = Settings
-KnowledgeManagementSetupPage = Knowledge Management setup page
+KnowledgeManagementSetupPage = Knowledge Management System setup page
 
 
 #
@@ -46,10 +46,10 @@ KnowledgeManagementArea = Knowledge Management
 #
 # Menu
 #
-MenuKnowledgeRecord = Knowledge records
+MenuKnowledgeRecord = Knowledge
 ListKnowledgeRecord = List
-NewKnowledgeRecord = New knowledge record
-Reply = Reply
-KnowledgeRecords = knowledge record
-KnowledgeRecord = knowledge record
-KnowledgeRecordExtraFields = Extrafields for Knowledge Records
\ No newline at end of file
+NewKnowledgeRecord = New knowledge
+ValidateReply = Validate solution
+KnowledgeRecords = Knowledges
+KnowledgeRecord = Knowledge
+KnowledgeRecordExtraFields = Extrafields for Knowledge record

From ab89fe73c25f9c2e785660ef12c350dc43972794 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Fri, 30 Apr 2021 16:08:46 +0200
Subject: [PATCH 503/928] NEW rise code tries in digeteria customer and
 supplier accountant code

---
 htdocs/core/modules/societe/mod_codecompta_digitaria.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index 363d3984516..56c5b8e8885 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -207,7 +207,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 			if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) {
 				$disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
 
-				while ($disponibility <> 0 && $i < 100) {
+				while ($disponibility <> 0 && $i < 1000) {
 					$widthsupplier = $this->supplieraccountancycodecharacternumber;
 					$widthcustomer = $this->customeraccountancycodecharacternumber;
 
@@ -217,6 +217,9 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 					if ($i >= 10 && $i <= 99) {
 						$a = 2;
 					}
+					if ($i >= 100 && $i <= 999) {
+						$a = 3;
+					}
 
 					if ($type == 'supplier') {
 						$this->code = $prefix.strtoupper(substr($codetouse, 0, $widthsupplier - $a)).$i;

From 69511e2706c32d21ab7db918f135084436e28aa3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 16:15:35 +0200
Subject: [PATCH 504/928] Debug

---
 .../modules/modKnowledgeManagement.class.php     |  2 +-
 .../knowledgemanagement/knowledgerecord_card.php |  2 +-
 .../knowledgemanagement/knowledgerecord_list.php | 16 +---------------
 htdocs/langs/en_US/knowledgemanagement.lang      | 14 +++++++-------
 4 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index 8d6eebcee6a..47c25232d67 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -65,7 +65,7 @@ class modKnowledgeManagement extends DolibarrModules
 		// Module description, used if translation string 'ModuleKnowledgeManagementDesc' not found (KnowledgeManagement is name of module).
 		$this->description = "Knowledge Management (KM)";
 		// Used only if file README.md and README-LL.md not found.
-		$this->descriptionlong = "Manage a Knowledge Management (KM) database";
+		$this->descriptionlong = "Manage a Knowledge Management (KM) or Help-Desk base";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
 		$this->version = 'development';
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 5cd42d3fb93..771c8ff241a 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -212,7 +212,7 @@ llxHeader('', $title, $help_url);
 
 // Part to create
 if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("KnowledgeRecord")), '', 'object_'.$object->picto);
+	print load_fiche_titre($langs->trans("NewKnowledgeRecord"), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index fdc05ac5137..9f4117d5f7b 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -250,7 +250,7 @@ $now = dol_now();
 
 //$help_url="EN:Module_KnowledgeRecord|FR:Module_KnowledgeRecord_FR|ES:Módulo_KnowledgeRecord";
 $help_url = '';
-$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("KnowledgeRecords"));
+$title = $langs->trans('ListOfArticles');
 $morejs = array();
 $morecss = array();
 
@@ -382,20 +382,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
 
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
diff --git a/htdocs/langs/en_US/knowledgemanagement.lang b/htdocs/langs/en_US/knowledgemanagement.lang
index 633014722a7..269007e60f8 100644
--- a/htdocs/langs/en_US/knowledgemanagement.lang
+++ b/htdocs/langs/en_US/knowledgemanagement.lang
@@ -20,7 +20,7 @@
 # Module label 'ModuleKnowledgeManagementName'
 ModuleKnowledgeManagementName = Knowledge Management System
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc = Manage a Knowledge Management database
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
 
 #
 # Admin page
@@ -46,10 +46,10 @@ KnowledgeManagementArea = Knowledge Management
 #
 # Menu
 #
-MenuKnowledgeRecord = Knowledge
-ListKnowledgeRecord = List
-NewKnowledgeRecord = New knowledge
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
 ValidateReply = Validate solution
-KnowledgeRecords = Knowledges
-KnowledgeRecord = Knowledge
-KnowledgeRecordExtraFields = Extrafields for Knowledge record
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article

From 223a06b77dfcca350db9e0025168e7e1a098d754 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 16:41:41 +0200
Subject: [PATCH 505/928] Clean code

---
 htdocs/adherents/type_translation.php | 28 +++++++++++++++-----
 htdocs/langs/en_US/banks.lang         |  2 +-
 htdocs/langs/en_US/companies.lang     |  2 +-
 htdocs/langs/en_US/errors.lang        |  6 ++---
 htdocs/langs/en_US/main.lang          |  4 +--
 htdocs/langs/en_US/members.lang       | 38 +++++++++++++--------------
 6 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 84fe883e41f..7435fc440ed 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -87,7 +87,7 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
 	} else {
-		$action = 'add';
+		$action = 'create';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -185,7 +185,7 @@ print "\n<div class=\"tabsAction\">\n";
 
 if ($action == '') {
 	if ($user->rights->produit->creer || $user->rights->service->creer) {
-		print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=add&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=create&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
 		if ($cnt_trans > 0) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&rowid='.$object->id.'">'.$langs->trans("Update").'</a>';
 		}
@@ -208,7 +208,13 @@ if ($action == 'edit') {
 	if (!empty($object->multilangs)) {
 		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
-			print '<br>'.($s ? $s.' ' : '').' <b>'.$langs->trans('Language_'.$key).':</b> <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
+			print '<br>';
+			print '<div class="inline-block marginbottomonly">';
+			print ($s ? $s.' ' : '').'<b>'.$langs->trans('Language_'.$key).':</b>';
+			print '</div>';
+			print '<div class="inline-block marginbottomonly floatright">';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
+			print '</div>';
 
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border centpercent">';
@@ -231,11 +237,17 @@ if ($action == 'edit') {
 	print '</div>';
 
 	print '</form>';
-} elseif ($action != 'add') {
+} elseif ($action != 'create') {
 	if (!empty($object->multilangs)) {
 		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
-			print ($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
+			print '<div class="inline-block marginbottomonly">';
+			print ($s ? $s.' ' : '').'<b>'.$langs->trans('Language_'.$key).':</b>';
+			print '</div>';
+			print '<div class="inline-block marginbottomonly floatright">';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
+			print '</div>';
+
 
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
@@ -244,9 +256,11 @@ if ($action == 'edit') {
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
 			print '</table>';
 			print '</div>';
+
+			print '<br>';
 		}
 	}
-	if (!$cnt_trans && $action != 'add') {
+	if (!$cnt_trans && $action != 'create') {
 		print '<div class="opacitymedium">'.$langs->trans('NoTranslation').'</div>';
 	}
 }
@@ -257,7 +271,7 @@ if ($action == 'edit') {
  * Form to add a new translation
  */
 
-if ($action == 'add' && $user->rights->adherent->configurer) {
+if ($action == 'create' && $user->rights->adherent->configurer) {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 8e2d828c12a..5041ceb9c77 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index b41bb49db13..70db0184ceb 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 6df5438de8f..4ef471d51a4 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 8fea1ffd839..fd2a3fd0697 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -856,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 2ab2fb87270..5bd1a545bfa 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ? 
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s

From 3ae303758b91a17d0969c223f2962b07c5cce5df Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 16:49:52 +0200
Subject: [PATCH 506/928] Fix trans

---
 htdocs/langs/en_US/accountancy.lang | 4 ++--
 htdocs/langs/en_US/banks.lang       | 8 ++++----
 htdocs/langs/en_US/bills.lang       | 2 +-
 htdocs/langs/en_US/categories.lang  | 2 +-
 htdocs/langs/en_US/compta.lang      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index a34b0840885..692c447d610 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 5041ceb9c77..df7192bee25 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index c0eb886a987..903b269077e 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 9520ef65a83..72706a9596b 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -3,7 +3,7 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration

From fdef17ef0c2a372ed7e6fd340457afb80ec14a0a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 16:59:58 +0200
Subject: [PATCH 507/928] Fix translation

---
 ChangeLog                        |  7 ++++---
 htdocs/langs/en_US/boxes.lang    | 10 +++++-----
 htdocs/langs/en_US/main.lang     |  2 +-
 htdocs/langs/en_US/projects.lang |  8 ++++----
 htdocs/langs/en_US/sendings.lang |  2 +-
 htdocs/langs/en_US/users.lang    |  2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ad29795ffd..c5f75ecbe89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,13 +10,14 @@ For users:
 NEW: Several security issues after a second private bug bounty campaign. 
 NEW: Add a security center page with all information and advices related to the security of your instance 
 NEW: Add a performance center page with all information and advices related to the performance of your instance 
+NEW: A lot of fix into english text after a small proofreading campaign (still not perfect, but really better)
 
 
 For developers:
 ---------------
-* start new module EventOrganization
-* start new module Partnership
-* start new module KnowledgeInformation
+* start new module Event Organization Management
+* start new module Partnership Management
+* start new module Knowledge Management
 
 
 
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index fd2a3fd0697..cdd0746dd31 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index d84257b69ad..a14db3882b0 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -106,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code

From 6c649089b8652a661df595f6de1af0569b06733c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 17:24:07 +0200
Subject: [PATCH 508/928] Fix trans

---
 htdocs/langs/en_US/bills.lang      |  2 +-
 htdocs/langs/en_US/categories.lang | 18 +++++++++---------
 htdocs/langs/en_US/companies.lang  | 16 ++++++++--------
 htdocs/langs/en_US/errors.lang     |  4 ++--
 htdocs/langs/en_US/mails.lang      |  6 +++---
 htdocs/langs/en_US/main.lang       |  8 ++++----
 htdocs/langs/en_US/other.lang      |  4 ++--
 htdocs/langs/en_US/products.lang   | 24 ++++++++++++------------
 htdocs/langs/en_US/stocks.lang     |  2 +-
 9 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 903b269077e..c55f483873b 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 72706a9596b..29e08f66541 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -9,14 +9,14 @@ AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 70db0184ceb..b52ab6131be 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 4ef471d51a4..304853a4123 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index cdd0746dd31..de0ab6a15d9 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -845,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 5f60715ae2a..8654e9c5b11 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.

From e6729355b84627806a26c33a9de8ada1d671b170 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Apr 2021 17:56:42 +0200
Subject: [PATCH 509/928] Look and feel v14

---
 htdocs/projet/tasks/time.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 1c3cacb4cee..8cac9adfd05 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1371,7 +1371,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {   // Not a dedicated task
 					print '<td class="nowrap">';
 					if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
-						$formproject->selectTasks(-1, GETPOST('taskid', 'int') ?GETPOST('taskid', 'int') : $task_time->fk_task, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
+						$formproject->selectTasks(-1, GETPOST('taskid', 'int') ? GETPOST('taskid', 'int') : $task_time->fk_task, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
 					} else {
 						$tasktmp->id = $task_time->fk_task;
 						$tasktmp->ref = $task_time->ref;
@@ -1390,8 +1390,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			// 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 '<td class="nowrap tdoverflowmax300" title="'.dol_escape_htmltag($task_time->label).'">';
+					print dol_escape_htmltag($task_time->label);
 					print '</td>';
 					if (!$i) {
 						$totalarray['nbfield']++;
@@ -1600,8 +1600,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				// Task label
 				if (!empty($arrayfields['t.task_label']['checked'])) {
 					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
-						print '<td>';
-						print $task_time->label;
+						print '<td class="tdoverflowmax300" title="'.dol_escape_htmltag($task_time->label).'">';
+						print dol_escape_htmltag($task_time->label);
 						print '</td>';
 					}
 				}
@@ -1636,7 +1636,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 
 				// Note
 				if (!empty($arrayfields['t.note']['checked'])) {
-					print '<td class="left">';
+					print '<td class="tdoverflowmax300">';
 					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
 						print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
 					} else {

From 6fb256822bd93b50a917a0fcd98da39828aac38d Mon Sep 17 00:00:00 2001
From: Luis Fernando <lufergonn@gmail.com>
Date: Fri, 30 Apr 2021 21:07:24 -0500
Subject: [PATCH 510/928] Update card.php: Change position(ExtraFields)

---
 htdocs/fourn/facture/card.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 801abaa7407..63eef7854e4 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2257,6 +2257,10 @@ if ($action == 'create') {
 		print '</td></tr>';
 	}
 
+	if (empty($reshook)) {
+		print $object->showOptionals($extrafields, 'edit');
+	}
+
 	// Public note
 	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
@@ -2275,9 +2279,6 @@ if ($action == 'create') {
 	// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
 	print '</tr>';
 
-	if (empty($reshook)) {
-		print $object->showOptionals($extrafields, 'edit');
-	}
 
 	if (is_object($objectsrc)) {
 		print "\n<!-- ".$classname." info -->";

From 76f42c9b51dcc89aad10233652dc06d539dd6e2b Mon Sep 17 00:00:00 2001
From: mafzalzadeh <mafzalzadeh@yahoo.com>
Date: Sat, 1 May 2021 11:09:34 +0430
Subject: [PATCH 511/928] fixed Persian themes direction to rtl

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

diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index e06cabfcf01..9cd002fb039 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
-DIRECTION=چپ‌به‌راست
+DIRECTION=rtl
 # Note for Chinese:
 # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
 # stsongstdlight or cid0cs are for simplified Chinese

From 54cb158af6b444e797334bdf6b819c54f4560c10 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 1 May 2021 12:31:30 +0200
Subject: [PATCH 512/928] Update COPYRIGHT

GeoIP2  v0.2.0  -->   Apache License 2.0
---
 COPYRIGHT | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 9704c857ed3..aedcb1be614 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -12,41 +12,41 @@ Dolibarr uses some external libraries released under different licenses. This is
 Component              Version       License                     GPL Compatible  Usage
 -------------------------------------------------------------------------------------
 PHP libraries:
-AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
+ADOdb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
 CKEditor               4.12.1        LGPL-2.1+                   Yes             Editor WYSIWYG
 EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
 Escpos-php             2.2           MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
-GeoIP2                 0.2.0         LGPL-2.1+                   Yes             Lib to make geoip convert
+GeoIP2                 0.2.0         Apache License 2.0          Yes             Lib to make geoip convert
 Mobiledetect           2.8.34        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 ParseDown              1.6           MIT License                 Yes             Markdown parser
 PCLZip                 2.8.4         LGPL-3+                     Yes             Library to zip/unzip files             
-PHPDebugBar            1.15.1        MIT License	             Yes             Used only by the module "debugbar" for developers
+PHPDebugBar            1.15.1        MIT License                 Yes             Used only by the module "debugbar" for developers
 PHPSpreadSheet         1.8.2         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-PSR/Logs			   1.0										                 Library for logs (used by DebugBar)
-PSR/simple-cache	   ?										                 Library for cache (used by PHPSpreadSheet)
+PSR/Logs               1.0                                                       Library for logs (used by DebugBar)
+PSR/simple-cache        ?            MIT License                 Yes             Library for cache (used by PHPSpreadSheet)
 Restler                3.1.1         LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
 Sabre                  3.2.2         BSD                         Yes             DAV support
-Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
-Stripe                 7.67.0        MIT licence                 Yes             Library for Stripe module
+Swift Mailer           5.4.2-DEV     MIT License                 Yes             Comprehensive mailing tools for PHP
+Stripe                 7.67.0        MIT Licence                 Yes             Library for Stripe module
 TCPDF                  6.3.2         LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 
 JS libraries:
 Ace                    1.4.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
-ChartJS				   2.9.4         MIT License                 Yes             JS library for graph
+ChartJS                2.9.4         MIT License                 Yes             JS library for graph
 jQuery                 3.5.1         MIT License                 Yes             JS library
 jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
-jQuery select2         4.0.13         GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
+jQuery select2         4.0.13        GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
 jQuery blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery Colorpicker     1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
 jQuery JCrop           0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
 jQuery Jeditable       1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
-jQuery jNotify         1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
+jQuery jNotify         1.1.00        Apache License 2.0          Yes             JS library plugin jNotify (to use ajax popups)
 jQuery jPicker         1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
 jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for filetree
 jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for filetree
@@ -54,13 +54,13 @@ jQuery TableDnD        0.6           GPL and MIT License         Yes
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
 jsGanttImproved        2.7.3         BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
-SwaggerUI			   2.2.10		 GPL-2+                      Yes             JS library to offer the REST API explorer
+SwaggerUI              2.2.10        GPL-2+                      Yes             JS library to offer the REST API explorer
 
 Image libraries:
 Octicons               8.1           MIT                         Yes
 
 Font libraries:
-Fontawesome            5.13          Font Awesome Free licence   Yes
+Fontawesome            5.13          Font Awesome Free Licence   Yes
 
 
 For licenses compatibility informations:

From 0ee1d4b3220a00f6ed2ba3f6835da1a2768556f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 May 2021 13:22:01 +0200
Subject: [PATCH 513/928] Reduce log verbosity

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 755cd8674df..ce5e7129bcf 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -62,8 +62,10 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 	global $db, $hookmanager;
 	global $object;
 
-	dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter));
-	//print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);
+	if ($recursive <= 1) {	// Avoid too verbose log
+		dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter));
+		//print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);
+	}
 
 	$loaddate = ($mode == 1 || $mode == 2) ?true:false;
 	$loadsize = ($mode == 1 || $mode == 3) ?true:false;
@@ -133,7 +135,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 				if ($qualified) {
 					$isdir = is_dir(dol_osencode($path."/".$file));
 					// Check whether this is a file or directory and whether we're interested in that type
-					if ($isdir && (($types == "directories") || ($types == "all") || $recursive)) {
+					if ($isdir && (($types == "directories") || ($types == "all") || $recursive > 0)) {
 						// Add entry into file_list array
 						if (($types == "directories") || ($types == "all")) {
 							if ($loaddate || $sortcriteria == 'date') {
@@ -165,10 +167,10 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 						}
 
 						// if we're in a directory and we want recursive behavior, call this function again
-						if ($recursive) {
+						if ($recursive > 0) {
 							if (empty($donotfollowsymlinks) || !is_link($path."/".$file)) {
 								//var_dump('eee '. $path."/".$file. ' '.is_dir($path."/".$file).' '.is_link($path."/".$file));
-								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file, $donotfollowsymlinks));
+								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive + 1, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file, $donotfollowsymlinks));
 							}
 						}
 					} elseif (!$isdir && (($types == "files") || ($types == "all"))) {

From 575d335374a178df6ec91a76359bed879ef72c32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 May 2021 15:12:30 +0200
Subject: [PATCH 514/928] Debug generation of webp

---
 htdocs/core/tpl/filemanager.tpl.php       | 54 ++++++++++++++---------
 htdocs/ecm/dir_add_card.php               |  8 ++--
 htdocs/ecm/tpl/enablefiletreeajax.tpl.php |  2 +-
 htdocs/langs/en_US/ecm.lang               |  2 +-
 htdocs/main.inc.php                       |  2 +-
 htdocs/website/index.php                  |  1 +
 6 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 592c3283a1b..95ab58e4132 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -72,43 +72,55 @@ print '<div class="inline-block toolbarbutton centpercent">';
 // Toolbar
 if ($permtoadd) {
 	$websitekeyandpageid = (!empty($websitekey) ? '&website='.$websitekey : '').(!empty($pageid) ? '&pageid='.$pageid : '');
-	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).$websitekeyandpageid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1'.$websitekeyandpageid).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
+	print '<a id="acreatedir" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).$websitekeyandpageid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1'.$websitekeyandpageid).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
 	print img_picto('', 'folder-plus', '', false, 0, 0, '', 'size15x marginrightonly');
 	print '</a>';
 } else {
-	print '<a href="#" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.$langs->trans("NotAllowed").'">';
+	print '<a id="acreatedir" href="#" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.$langs->trans("NotAllowed").'">';
 	print img_picto('', 'folder-plus', 'disabled', false, 0, 0, '', 'size15x marginrightonly');
 	print '</a>';
 }
 if ($module == 'ecm') {
 	$tmpurl = ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
-	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
+	print '<a id="arefreshbutton" href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
 	print img_picto('', 'refresh', 'id="refreshbutton"', false, 0, 0, '', 'size15x marginrightonly');
 	print '</a>';
 }
 if ($permtoadd && GETPOSTISSET('website')) {	// If on file manager to manage medias of a web site
-	print '<a id="generateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&website='.$website->ref.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
-	print img_picto('', 'images', '', false, 0, 0, '', 'size15x flip marginrightonly');
-	print '</a>';
-}
-if ($permtoadd && $module == 'ecm') {	// If on file manager medias in ecm
-	print '<a id="generateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
+	print '<a id="agenerateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&website='.$website->ref.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
+	print img_picto('', 'images', '', false, 0, 0, '', 'size15x flip marginrightonly');
+	print '</a>';
+} elseif ($permtoadd && $module == 'ecm') {	// If on file manager medias in ecm
+	print '<a id="agenerateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
 	print img_picto('', 'images', '', false, 0, 0, '', 'size15x flip marginrightonly');
 	print '</a>';
 }
+
 print "<script>
-$(\"#generateimgwebp\").on(\"click\",function(){
+$('#acreatedir').on('click', function() {
 	try{
-		console.log(\"We click to generate webp image, we set current dir into hidden vars\");
-		section_dir = $(\".directory.expanded\")[$(\".directory.expanded\").length-1].children[0].rel
-		section=$(\".directory.expanded\")[$(\".directory.expanded\").length-1].children[0].id.split('_')[2]
-	}catch{
-		section_dir = '/'
-		section=0
+		section_dir = $('.directory.expanded')[$('.directory.expanded').length-1].children[0].rel;
+		section = $('.directory.expanded')[$('.directory.expanded').length-1].children[0].id.split('_')[2];
+	} catch{
+		section_dir = '/';
+		section = 0;
 	}
-	console.log(\"We add hiden vars in href of button to create webp \");
-	$(\"#generateimgwebp\").attr(\"href\",$(\"#generateimgwebp\").attr(\"href\")+'&section_dir='+section_dir+'&section='+section)
-  })
+	console.log('We click to create a new directory, we set current section_dir='+section_dir+' into href url of button acreatedir');
+	$('#acreatedir').attr('href', $('#acreatedir').attr('href')+'&section_dir='+encodeURI(section_dir)+'&section='+encodeURI(section));
+	console.log($('#acreatedir').attr('href'));
+});
+$('#agenerateimgwebp').on('click', function() {
+	try{
+		section_dir = $('.directory.expanded')[$('.directory.expanded').length-1].children[0].rel;
+		section = $('.directory.expanded')[$('.directory.expanded').length-1].children[0].id.split('_')[2];
+	} catch{
+		section_dir = '/';
+		section = 0;
+	}
+	console.log('We click to generate webp image, we set current section_dir='+section_dir+' into href url of button agenerateimgwebp');
+	$('#agenerateimgwebp').attr('href', $('#agenerateimgwebp').attr('href')+'&section_dir='+encodeURI(section_dir)+'&section='+encodeURI(section));
+	console.log($('#agenerateimgwebp').attr('href'));
+});
 </script>";
 
 // Start "Add new file" area
@@ -157,6 +169,7 @@ if ($action == 'delete_section') {
 }
 // End confirm
 
+// Ask confirmation to build webp images
 if ($action == 'confirmconvertimgwebp') {
 	$section_dir=GETPOST('section_dir', 'alpha');
 	$section=GETPOST('section', 'alpha');
@@ -170,9 +183,10 @@ if ($action == 'confirmconvertimgwebp') {
 	$action = 'file_manager';
 }
 
+// Duplicate images into .webp
 if ($action == 'convertimgwebp' && $permtoadd) {
 	if ($module == 'medias') {
-		$imagefolder = $conf->website->dir_output.'/'.$websitekey.'/medias/'.dol_sanitizeFileName(GETPOST('section_dir', 'alpha'));
+		$imagefolder = $conf->website->dir_output.'/'.$websitekey.'/medias/'.dol_sanitizePathName(GETPOST('section_dir', 'alpha'));
 	} else {
 		$imagefolder = $conf->ecm->dir_output.'/'.dol_sanitizePathName(GETPOST('section_dir', 'alpha'));
 	}
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index f5140cf296a..4cf557acde6 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -23,6 +23,8 @@
  *	\brief		Main page for ECM section area
  */
 
+if (! defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1);
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/htmlecm.form.class.php';
@@ -124,7 +126,7 @@ if ($action == 'add' && $permtoadd) {
 	}
 
 	$ref = (string) GETPOST("ref", 'alpha');
-	$label = (string) GETPOST("label", 'alpha');
+	$label = dol_sanitizeFileName(GETPOST("label", 'alpha'));
 	$desc = (string) GETPOST("desc", 'alpha');
 	$catParent = GETPOST("catParent", 'alpha'); // Can be an int (with ECM) or a string (with generic filemanager)
 	if ($catParent == '-1') {
@@ -153,8 +155,7 @@ if ($action == 'add' && $permtoadd) {
 				setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
 				$action = 'create';
 			}
-		} else // For example $module == 'medias'
-		{
+		} else { // For example $module == 'medias'
 			$dirfornewdir = '';
 			if ($module == 'medias') {
 				$dirfornewdir = $conf->medias->multidir_output[$conf->entity];
@@ -168,6 +169,7 @@ if ($action == 'add' && $permtoadd) {
 				$fullpathofdir = $dirfornewdir.'/'.($catParent ? $catParent.'/' : '').$label;
 				$result = dol_mkdir($fullpathofdir, DOL_DATA_ROOT);
 				if ($result < 0) {
+					$langs->load("errors");
 					setEventMessages($langs->trans('ErrorFailToCreateDir', $label), null, 'errors');
 					$error++;
 				} else {
diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
index b1be94524cf..17c185426c0 100644
--- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
+++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
@@ -62,7 +62,7 @@ $(document).ready(function() {
 			id=elem.attr('id').substr(12);	// We get id that is 'fmdirlia_id_xxx' (id we want is xxx)
 			rel=elem.attr('rel')
 			console.log("We click on a dir, we call the ajaxdirtree.php with modulepart=<?php echo $module; ?>, param=<?php echo $paramwithoutsection; ?>");
-			console.log("We also save dir name or id into <?php echo $nameforformuserfile ?>_section_... with name section_... id="+id+" rel="+rel);
+			console.log("We also save id and dir name into <?php echo $nameforformuserfile ?>_section_id|dir (vars into form to attach new file in filemanager.tpl.php) with id="+id+" and rel="+rel);
 			jQuery("#<?php echo $nameforformuserfile ?>_section_dir").val(rel);
 			jQuery("#<?php echo $nameforformuserfile ?>_section_id").val(id);
 			jQuery("#section_dir").val(rel);
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 0e13a072a39..4231160b64f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1579,7 +1579,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 			// Chart
-			if (empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'chart') {
+			if ((empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'chart') && !defined('DISABLE_JS_GRAPH')) {
 				print '<script src="'.DOL_URL_ROOT.'/includes/nnnick/chartjs/dist/Chart.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index fe37cb68418..1a71a162cb6 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -26,6 +26,7 @@ define('NOSCANPOSTFORINJECTION', 1);
 define('NOSTYLECHECK', 1);
 define('USEDOLIBARREDITOR', 1);
 define('FORCE_CKEDITOR', 1); // We need CKEditor, even if module is off.
+if (!defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1);
 
 //header('X-XSS-Protection:0');	// Disable XSS filtering protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
 

From 99d655b9833dd7ef54e45c18bb60d0e87890c15c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 May 2021 15:38:58 +0200
Subject: [PATCH 515/928] Debug generation of webp

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

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 36e8cef6bfe..25833df624f 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -148,10 +148,11 @@ function dol_getImageSize($file, $url = false)
  * 	@param	int		$src_x			Position of croping image in source image (not use if mode=0)
  * 	@param	int		$src_y			Position of croping image in source image (not use if mode=0)
  * 	@param	string	$filetowrite	Path of file to write (overwrite source file if not provided)
+ *  @param	int		$newquality		Value for the new quality of image, for supported format (use 0 for maximum/unchanged).
  *	@return	string                  File name if OK, error message if KO
  *	@see dol_convert_file()
  */
-function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0, $src_y = 0, $filetowrite = '')
+function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0, $src_y = 0, $filetowrite = '', $newquality = 0)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
@@ -234,7 +235,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 		case 2:	// Jpg
 			$img = imagecreatefromjpeg($filetoread);
 			$extImg = '.jpg';
-			$newquality = 100; // % quality maximum
+			$newquality = ($newquality ? $newquality : '100'); // % quality maximum
 			break;
 		case 3:	// Png
 			$img = imagecreatefrompng($filetoread);
@@ -249,7 +250,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 		case 18: // Webp
 			$img = imagecreatefromwebp($filetoread);
 			$extImg = '.webp';
-			$newquality = '100'; // % quality maximum
+			$newquality = ($newquality ? $newquality : '100'); // % quality maximum
 			break;
 	}
 
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 95ab58e4132..f06d1806fe2 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -71,7 +71,7 @@ print '<div class="inline-block toolbarbutton centpercent">';
 
 // Toolbar
 if ($permtoadd) {
-	$websitekeyandpageid = (!empty($websitekey) ? '&website='.$websitekey : '').(!empty($pageid) ? '&pageid='.$pageid : '');
+	$websitekeyandpageid = (!empty($websitekey) ? '&website='.urlencode($websitekey) : '').(!empty($pageid) ? '&pageid='.urlencode($pageid) : '');
 	print '<a id="acreatedir" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).$websitekeyandpageid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1'.$websitekeyandpageid).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
 	print img_picto('', 'folder-plus', '', false, 0, 0, '', 'size15x marginrightonly');
 	print '</a>';
@@ -202,7 +202,7 @@ if ($action == 'convertimgwebp' && $permtoadd) {
 		if (!(substr_compare($filepath, 'webp', -strlen('webp')) === 0)) {
 			if (image_format_supported($filepath) == 1) {
 				$filepathnoext = preg_replace("/\..*/", "", $filepath);
-				$result = dol_imageResizeOrCrop($filepath, 0, 0, 0, 0, 0, $filepathnoext.'.webp');
+				$result = dol_imageResizeOrCrop($filepath, 0, 0, 0, 0, 0, $filepathnoext.'.webp', 90);
 				if (!dol_is_file($result)) {
 					$error++;
 					setEventMessages($result, null, 'errors');
@@ -227,7 +227,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 	print '<!-- Title for manual directories -->'."\n";
 	print '<tr class="liste_titre">'."\n";
 	print '<th class="liste_titre left">';
-	print '&nbsp;'.$langs->trans("ECMSections");
+	print '<span style="padding-left: 5px; padding-right: 5px;">'.$langs->trans("ECMSections").'</span>';
 	print '</th></tr>';
 
 	$showonrightsize = '';
@@ -238,7 +238,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 	if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 		// Show the link to "Root"
 		if ($showroot) {
-			print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">';
+			print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1'.(!empty($websitekey) ? '&website='.urlencode($websitekey) : '').'&pageid='.urlencode($pageid).'">';
 			if ($module == 'medias') {
 				print $langs->trans("RootOfMedias");
 			} else {

From 4e7e6048deb67a6e35cf94f356396ac05b869e5a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 May 2021 15:42:49 +0200
Subject: [PATCH 516/928] Debug generation of webp

---
 htdocs/core/tpl/filemanager.tpl.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index f06d1806fe2..c98dcec2a43 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -202,10 +202,13 @@ if ($action == 'convertimgwebp' && $permtoadd) {
 		if (!(substr_compare($filepath, 'webp', -strlen('webp')) === 0)) {
 			if (image_format_supported($filepath) == 1) {
 				$filepathnoext = preg_replace("/\..*/", "", $filepath);
-				$result = dol_imageResizeOrCrop($filepath, 0, 0, 0, 0, 0, $filepathnoext.'.webp', 90);
-				if (!dol_is_file($result)) {
-					$error++;
-					setEventMessages($result, null, 'errors');
+
+				if (! dol_is_file($filepathnoext.'.webp')) {	// If file does not exists yet
+					$result = dol_imageResizeOrCrop($filepath, 0, 0, 0, 0, 0, $filepathnoext.'.webp', 90);
+					if (!dol_is_file($result)) {
+						$error++;
+						setEventMessages($result, null, 'errors');
+					}
 				}
 			}
 		}

From ef734aeb58297d004245e8d88aceffa501c270d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 May 2021 16:33:05 +0200
Subject: [PATCH 517/928] Debug module inventory

---
 ChangeLog                              |  1 +
 htdocs/langs/en_US/main.lang           |  1 +
 htdocs/product/inventory/card.php      | 14 ++--
 htdocs/product/inventory/inventory.php | 93 ++++++++++++++++++++------
 4 files changed, 81 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5f75ecbe89..2f37db92cc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ English Dolibarr ChangeLog
 
 For users:
 ----------
+NEW: Feature to make inventories
 NEW: Several security issues after a second private bug bounty campaign. 
 NEW: Add a security center page with all information and advices related to the security of your instance 
 NEW: Add a performance center page with all information and advices related to the performance of your instance 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index de0ab6a15d9..b6d2e4c4ef8 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1131,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
\ No newline at end of file
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index dda16746398..6a29a414ed7 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -398,35 +398,35 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
 			}
 
 			// Back to draft
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken().'">'.$langs->trans("SetToDraft").'</a>';
 				}
 			}
 			// Back to validate
 			if ($object->status == $object::STATUS_RECORDED) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes">'.$langs->trans("ReOpen").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
 
 			// Modify
 			if ($object->status == $object::STATUS_DRAFT) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>'."\n";
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 				}
 			}
 
 			// Validate
-			if ($object->status == $object::STATUS_DRAFT) {
+			if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_CANCELED) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes">'.$langs->trans("Validate").' ('.$langs->trans("Start").')</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes&token='.newToken().'">'.$langs->trans("Validate").' ('.$langs->trans("Start").')</a>';
 				}
 			}
 
@@ -438,7 +438,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
 			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd)) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
 			}
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index bc927a06c50..baf0cd45591 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -160,27 +160,55 @@ if ($action == 'update' && $user->rights->stock->mouvement->creer) {
 	}
 }
 
-if ($action =='updateinventorylines' && $permissiontoadd) {
+if (($action == 'record' || $action =='updateinventorylines') && $permissiontoadd) {
 	$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
 	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
 	$sql .= ' WHERE id.fk_inventory = '.$object->id;
 
+	$db->begin();
+
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 		$totalarray = array();
+		$inventoryline = new InventoryLine($db);
+
 		while ($i < $num) {
 			$line = $db->fetch_object($resql);
 			$lineid = $line->rowid;
-			$inventoryline = new InventoryLine($db);
-			$inventoryline->fetch($lineid);
-			$inventoryline->qty_view = GETPOST("id_".$inventoryline->id);
-			$inventoryline->update($user);
+
+			if (GETPOST("id_".$lineid, 'alpha') != '') {		// If a value was set ('0' or something else)
+				$qtytoupdate = price2num(GETPOST("id_".$lineid, 'alpha'), 'MS');
+
+				$result = $inventoryline->fetch($lineid);
+				if ($result > 0) {
+					$inventoryline->qty_view = $qtytoupdate;
+					$resultupdate = $inventoryline->update($user);
+				}
+			} else {
+				// Delete record
+				$result = $inventoryline->fetch($lineid);
+				if ($result > 0) {
+					$inventoryline->qty_view = null;
+					$resultupdate = $inventoryline->update($user);
+				}
+			}
+
+			if ($result < 0 || $resultupdate < 0) {
+				$error++;
+			}
+
 			$i++;
 		}
 	}
+
+	if (!$error) {
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
 }
 
 $parameters = array();
@@ -270,6 +298,23 @@ $help_url = '';
 llxHeader('', $langs->trans('Inventory'), $help_url);
 
 
+// Disable button Generate movement if data were not saved
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	jQuery(".realqty").keyup(function() {
+		console.log("Disable button idbuttonmakemovementandclose until we save");
+		jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
+		jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
+	});
+	jQuery(".realqty").change(function() {
+		console.log("Disable button idbuttonmakemovementandclose until we save");
+		jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
+		jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
+	});
+});
+</script>';
+
+
 // Part to show record
 if ($object->id > 0) {
 	$res = $object->fetch_optionals();
@@ -411,7 +456,7 @@ if ($object->id > 0) {
 		if (empty($reshook)) {
 			if ($object->status == Inventory::STATUS_DRAFT) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_validate&confirm=yes">'.$langs->trans("Validate").' ('.$langs->trans("Start").')</a>'."\n";
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_validate&confirm=yes&token='.newToken().'">'.$langs->trans("Validate").' ('.$langs->trans("Start").')</a>'."\n";
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').' ('.$langs->trans("Start").')</a>'."\n";
 				}
@@ -419,16 +464,14 @@ if ($object->id > 0) {
 
 			// Save
 			if ($object->status == $object::STATUS_VALIDATED) {
-				if ($object->status == Inventory::STATUS_VALIDATED) {
-					if ($permissiontoadd) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=record">'.$langs->trans("MakeMovementsAndClose").'</a>'."\n";
-					} else {
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('MakeMovementsAndClose').'</a>'."\n";
-					}
+				if ($permissiontoadd) {
+					print '<a class="butAction" id="idbuttonmakemovementandclose" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=record&token='.newToken().'">'.$langs->trans("MakeMovementsAndClose").'</a>'."\n";
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('MakeMovementsAndClose').'</a>'."\n";
 				}
 
 				if ($permissiontoadd) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=confirm_cancel">'.$langs->trans("Cancel").'</a>'."\n";
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_cancel&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
 				}
 			}
 		}
@@ -458,14 +501,17 @@ if ($object->id > 0) {
 
 			print '<script>';
 			print '$( document ).ready(function() {';
-			print ' $("#fillwithexpected").on("click",function fillWithExpected(){
-					  $(".expectedqty").each(function(){
-						var object = $(this)[0];
-						var objecttofill = $("#"+object.id+"_input")[0];
-						objecttofill.value = object.innerText;
+			print '	$("#fillwithexpected").on("click",function fillWithExpected(){
+						$(".expectedqty").each(function(){
+							var object = $(this)[0];
+							var objecttofill = $("#"+object.id+"_input")[0];
+							objecttofill.value = object.innerText;
 						})
 						console.log("Values filled");
-			         });';
+						console.log("Disable button idbuttonmakemovementandclose until we save");
+						jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
+						jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
+			        });';
 			print '});';
 			print '</script>';
 		}
@@ -617,13 +663,16 @@ if ($object->id > 0) {
 				print '</td>';
 			}
 
+			// Expected quantity
 			print '<td class="right expectedqty" id="id_'.$obj->rowid.'">';
 			print $obj->qty_stock;
 			print '</td>';
+
+			// Real quantity
 			print '<td class="center">';
 			if ($object->status == $object::STATUS_VALIDATED) {
 				$qty_view = GETPOST("id_".$obj->rowid) ? GETPOST("id_".$obj->rowid) : $obj->qty_view;
-				print '<input type="text" class="maxwidth75 right" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
+				print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
 				print '</td>';
 				print '<td class="right">';
 				print '<a class="reposition" href="'.DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id.'&lineid='.$obj->rowid.'&action=deleteline&token='.newToken().'">'.img_delete().'</a>';
@@ -644,7 +693,9 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	print '<center><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"></center>';
+	if ($object->status == $object::STATUS_VALIDATED) {
+		print '<center><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"></center>';
+	}
 
 	print '</div>';
 

From c848a1ce03699a05a17efc5aa03a0c8b84b1f63b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 May 2021 16:55:49 +0200
Subject: [PATCH 518/928] css

---
 htdocs/product/inventory/inventory.php |  5 +++--
 htdocs/theme/eldy/btn.inc.php          | 11 +++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index baf0cd45591..ecad54a4a73 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -270,6 +270,7 @@ if (empty($reshook)) {
 			$tmp->fk_product = $fk_product;
 			$tmp->batch = $batch;
 			$tmp->datec = $now;
+			$tmp->qty_view = (GETPOST('qtytoadd') != '' ? price2num(GETPOST('qtytoadd', 'MS')) : null);
 
 			$result = $tmp->create($user);
 			if ($result < 0) {
@@ -599,11 +600,11 @@ if ($object->id > 0) {
 		}
 		print '<td class="right"></td>';
 		print '<td class="center">';
-		print '<input type="submit" class="button paddingright" name="addline" value="'.$langs->trans("Add").'">';
-		//print '<input type="submit" class="button paddingrightonly button-cancel" name="canceladdline" value="'.$langs->trans("Cancel").'">';
+		print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
 		print '</td>';
 		// Actions
 		print '<td class="center">';
+		print '<input type="submit" class="button paddingright" name="addline" value="'.$langs->trans("Add").'">';
 		print '</td>';
 		print '</tr>';
 	}
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 9d59357279e..9f057fe46c1 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -85,9 +85,9 @@ span.butAction, span.butActionDelete {
 	display: inline-block;
 	text-align: center;
 	cursor: pointer;
-	/* color: #fff; */
-	/* background: rgb(<?php echo $colorbackhmenu1 ?>); */
 	color: #444;
+    border: 1px solid transparent;	/* So for buttonRefused with a border, it will not have any flash effect */
+
 	/* border: 1px solid #aaa; */
 	/* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */
 
@@ -161,17 +161,16 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
 
 	white-space: nowrap !important;
 	cursor: not-allowed !important;
-	margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.9'); ?>em;
-	padding: 0.6em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.7'); ?>em;
 	font-family: <?php print $fontlist ?> !important;
 	display: inline-block;
 	text-align: center;
 	cursor: pointer;
-	color: #999 !important;
-	border: 1px solid #ccc;
 	box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	-webkit-box-sizing: border-box;
+	color: #999 !important;
+
+	border: 1px solid #ccc;
 }
 .butActionNewRefused, .butActionNewRefused:link, .butActionNewRefused:visited, .butActionNewRefused:hover, .butActionNewRefused:active {
 	text-decoration: none !important;

From 7a986b3e5027b9215a1536d0a0af3a504565b7d5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 May 2021 17:44:28 +0200
Subject: [PATCH 519/928] Fix colors

---
 htdocs/product/inventory/class/inventory.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 064be57091a..126fff5b96b 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -619,7 +619,12 @@ class Inventory extends CommonObject
 		$labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
 		$labelStatusShort[self::STATUS_RECORDED] = $langs->trans('Closed');
 
-		return dolGetStatus($labelStatus[$status], $labelStatusShort[$status], '', 'status'.$status, $mode);
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_RECORDED) {
+			$statusType = 'status5';
+		}
+
+		return dolGetStatus($labelStatus[$status], $labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 	/**

From 5f23c68f8572411ec19fefc0320328cbe3760d8f Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 1 May 2021 20:01:18 +0200
Subject: [PATCH 520/928] Update type.php

---
 htdocs/adherents/type.php | 53 ++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index c9b98784142..707dd7acb7c 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2015		Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2019		Thibault Foucart		<support@ptibogxiv.net>
  * Copyright (C) 2020		Josep Lluís Amador		<joseplluis@lliuretic.cat>
+ * Copyright (C) 2021		Waël Almoman			<info@almoman.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -70,6 +71,7 @@ $label = GETPOST("label", "alpha");
 $morphy = GETPOST("morphy", "alpha");
 $status = GETPOST("status", "int");
 $subscription = GETPOST("subscription", "int");
+$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 $duration_value = GETPOST('duration_value', 'int');
 $duration_unit = GETPOST('duration_unit', 'alpha');
 $vote = GETPOST("vote", "int");
@@ -114,14 +116,15 @@ if ($cancel) {
 
 if ($action == 'add' && $user->rights->adherent->configurer) {
 	$object->label = trim($label);
-	$object->morphy         = trim($morphy);
-	$object->status         = (int) $status;
-	$object->subscription   = (int) $subscription;
-	$object->duration_value     	 = $duration_value;
-	$object->duration_unit      	 = $duration_unit;
-	$object->note			= trim($comment);
+	$object->morphy = trim($morphy);
+	$object->status = (int) $status;
+	$object->subscription = (int) $subscription;
+	$object->amount = $amount;
+	$object->duration_value = $duration_value;
+	$object->duration_unit = $duration_unit;
+	$object->note = trim($comment);
 	$object->mail_valid = trim($mail_valid);
-	$object->vote			= (int) $vote;
+	$object->vote = (int) $vote;
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -164,15 +167,16 @@ if ($action == 'update' && $user->rights->adherent->configurer) {
 
 	$object->oldcopy = clone $object;
 
-	$object->label			= trim($label);
-	$object->morphy = trim($morphy);
-	$object->status = (int) $status;
+	$object->label= trim($label);
+	$object->morphy	= trim($morphy);
+	$object->status	= (int) $status;
 	$object->subscription = (int) $subscription;
-	$object->duration_value     	 = $duration_value;
-	$object->duration_unit      	 = $duration_unit;
-	$object->note			= trim($comment);
+	$object->amount = $amount;
+	$object->duration_value = $duration_value;
+	$object->duration_unit = $duration_unit;
+	$object->note = trim($comment);
 	$object->mail_valid = trim($mail_valid);
-	$object->vote			= (boolean) trim($vote);
+	$object->vote = (boolean) trim($vote);
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -222,7 +226,7 @@ llxHeader('', $langs->trans("MembersTypeSetup"), $help_url);
 if (!$rowid && $action != 'create' && $action != 'edit') {
 	//print dol_get_fiche_head('');
 
-	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote, d.statut as status, d.morphy";
+	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.amount, d.vote, d.statut as status, d.morphy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
 	$sql .= " WHERE d.entity IN (".getEntity('member_type').")";
 
@@ -268,6 +272,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 		print '<th>'.$langs->trans("Label").'</th>';
 		print '<th class="center">'.$langs->trans("MembersNature").'</th>';
 		print '<th class="center">'.$langs->trans("SubscriptionRequired").'</th>';
+		print '<th class="center">'.$langs->trans("Amount").'</th>';
 		print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
 		print '<th class="center">'.$langs->trans("Status").'</th>';
 		print '<th>&nbsp;</th>';
@@ -283,6 +288,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			$membertype->label = $objp->rowid;
 			$membertype->status = $objp->status;
 			$membertype->subscription = $objp->subscription;
+			$membertype->amount = $objp->amount;
 
 			print '<tr class="oddeven">';
 			print '<td>';
@@ -300,6 +306,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			}
 			print '</td>';
 			print '<td class="center">'.yn($objp->subscription).'</td>';
+			print '<td class="center">'.price($objp->amount).'</td>';
 			print '<td class="center">'.yn($objp->vote).'</td>';
 			print '<td class="center">'.$membertype->getLibStatut(5).'</td>';
 			if ($user->rights->adherent->configurer) {
@@ -358,6 +365,10 @@ if ($action == 'create') {
 	print $form->selectyesno("subscription", 1, 1);
 	print '</td></tr>';
 
+	print '<tr><td>'.$langs->trans("Amount").'</td><td>';
+	print '<input name="amount" size="5" value="'.price($amount).'">';
+	print '</td></tr>';
+
 	print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
 	print $form->selectyesno("vote", GETPOSTISSET("vote") ? GETPOST('vote', 'aZ09') : 1, 1);
 	print '</td></tr>';
@@ -434,6 +445,10 @@ if ($rowid > 0) {
 		print yn($object->subscription);
 		print '</tr>';
 
+		print '<tr><td class="titlefield">'.$langs->trans("Amount").'</td><td>';
+		print price($object->amount);
+		print '</tr>';
+
 		print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
 		print yn($object->vote);
 		print '</tr>';
@@ -496,13 +511,13 @@ if ($rowid > 0) {
 		$sql = "SELECT d.rowid, d.login, d.firstname, d.lastname, d.societe as company,";
 		$sql .= " d.datefin,";
 		$sql .= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut as status,";
-		$sql .= " t.libelle as type, t.subscription";
+		$sql .= " t.libelle as type, t.subscription, t.amount";
 		$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('adherent').")";
 		$sql .= " AND t.rowid = ".((int) $object->id);
 		if ($sall) {
-			$sql .= natural_search(array("f.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);
+			$sql .= natural_search(array("d.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);
 		}
 		if ($status != '') {
 			$sql .= natural_search('d.statut', $status, 2);
@@ -780,6 +795,10 @@ if ($rowid > 0) {
 		print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
 		print $form->selectyesno("subscription", $object->subscription, 1);
 		print '</td></tr>';
+		
+		print '<tr><td>'.$langs->trans("DefineAmountMemberType").'</td><td>';
+		print '<input name="amount" size="5" value="'.price($object->amount).'">';
+		print '</td></tr>';
 
 		print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
 		print $form->selectyesno("vote", $object->vote, 1);

From 4c3e37681cd5bf2fe443f545db2c880daada24b3 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 1 May 2021 20:06:15 +0200
Subject: [PATCH 521/928] Update adherent_type.class.php

---
 .../adherents/class/adherent_type.class.php   | 49 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index d051c40810b..4924acf5ab6 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2016		Charlie Benke			<charlie@patas-monkey.com>
  * Copyright (C) 2018-2019  Thibault Foucart		<support@ptibogxiv.net>
- * Copyright (C) 2021           Waël Almoman            <info@almoman.com>
+ * Copyright (C) 2021     	Waël Almoman            <info@almoman.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -88,6 +88,11 @@ class AdherentType extends CommonObject
 	 * @var int Subsription required (0 or 1)
 	 */
 	public $subscription;
+	
+	/**
+	 * @var float amount for subscription if required
+	 */
+	public $amount;
 
 	/** @var string 	Public note */
 	public $note;
@@ -361,6 +366,7 @@ class AdherentType extends CommonObject
 		$sql .= "libelle = '".$this->db->escape($this->label)."',";
 		$sql .= "morphy = '".$this->db->escape($this->morphy)."',";
 		$sql .= "subscription = '".$this->db->escape($this->subscription)."',";
+		$sql .= "amount = '".$this->db->escape($this->amount)."',";
 		$sql .= "duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."',";
 		$sql .= "note = '".$this->db->escape($this->note)."',";
 		$sql .= "vote = ".(integer) $this->db->escape($this->vote).",";
@@ -455,7 +461,7 @@ class AdherentType extends CommonObject
 	{
 		global $langs, $conf;
 
-		$sql = "SELECT d.rowid, d.libelle as label, d.morphy, d.statut as status, d.duration, d.subscription, d.mail_valid, d.note, d.vote";
+		$sql = "SELECT d.rowid, d.libelle as label, d.morphy, d.statut as status, d.duration, d.subscription, d.amount, d.mail_valid, d.note, d.vote";
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
 		$sql .= " WHERE d.rowid = ".(int) $rowid;
 
@@ -475,6 +481,7 @@ class AdherentType extends CommonObject
 				$this->duration_value = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
 				$this->duration_unit  = substr($obj->duration, -1);
 				$this->subscription   = $obj->subscription;
+				$this->amount         = $obj->amount;
 				$this->mail_valid     = $obj->mail_valid;
 				$this->note           = $obj->note;
 				$this->vote           = $obj->vote;
@@ -535,6 +542,44 @@ class AdherentType extends CommonObject
 		return $adherenttypes;
 	}
 
+	/**
+	 *  Return list of amount by type id
+	 *
+	 *  @param	int		$status			Filter on status of type
+	 *  @return array					List of types of members
+	 */
+	public function amount_by_type($status = null) {
+
+		global $conf, $langs;
+
+		$amountbytype = array();
+
+		$sql = "SELECT rowid, amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
+		$sql .= " WHERE entity IN (".getEntity('member_type').")";
+		if ($status !== null) {
+			$sql .= " AND statut = ".((int) $status);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$nump = $this->db->num_rows($resql);
+
+			if ($nump) {
+				$i = 0;
+				while ($i < $nump) {
+					$obj = $this->db->fetch_object($resql);
+
+					$amountbytype[$obj->rowid] = $obj->amount;
+					$i++;
+				}
+			}
+		} else {
+			print $this->db->error();
+		}
+		return $amountbytype;
+	}
+
 	/**
 	 * 	Return array of Member objects for member type this->id (or all if this->id not defined)
 	 *

From 5ff60c31e6fa48adfbc859dea846de8b87bc915d Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 1 May 2021 20:08:32 +0200
Subject: [PATCH 522/928] Update 13.0.0-14.0.0.sql

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

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 8eebe1db211..cda3f4310bb 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -467,4 +467,7 @@ create table llx_knowledgemanagement_knowledgerecord_extrafields
   tms                       timestamp,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
-) ENGINE=innodb;
\ No newline at end of file
+) ENGINE=innodb;
+
+-- add default amount by member type
+ALTER TABLE llx_adherent_type ADD COLUMN amount DOUBLE(24,8) NULL DEFAULT NULL AFTER subscription;

From 8457fef1a2684946094043b43f049a14d8bf5ec4 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 1 May 2021 20:10:17 +0200
Subject: [PATCH 523/928] Update llx_adherent_type.sql

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

diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql
index bdce18ef0bc..243372c0452 100644
--- a/htdocs/install/mysql/tables/llx_adherent_type.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_type.sql
@@ -32,6 +32,7 @@ create table llx_adherent_type
   morphy           varchar(3) NOT NULL,
   duration         varchar(6) DEFAULT NULL,
   subscription     varchar(3) NOT NULL DEFAULT '1',
+  amount           double(24,8) DEFAULT NULL,
   vote             varchar(3) NOT NULL DEFAULT '1',
   note             text,
   mail_valid       text

From 031d258b328824eb7551af2afbfa9002af06cfa3 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 1 May 2021 20:17:29 +0200
Subject: [PATCH 524/928] Update newpayment.php

---
 htdocs/public/payment/newpayment.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 8659b3ca8bd..10c929b78e2 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1444,20 +1444,18 @@ if ($source == 'member' || $source == 'membersubscription') {
 		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("LastMemberType");
 		print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_escape_htmltag($member->type);
 		print "</td></tr>\n";
-	}
 
-	if (!empty($conf->global->MEMBER_SUBSCRIPTION_AMOUNT_BY_TYPE)) {
+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+		$adht = new AdherentType($db);
 		// Amount by member type
-		$amountbytype = array();		// TODO Read the amount of subscription into table of types
+		$amountbytype = $adht->amount_by_type(1);
 		// Set the member type
 		$member->typeid = (int) (GETPOSTISSET("typeid") ? GETPOST("typeid", 'int') : $member->typeid);
 		// If we change the type of membership, we set also label of new type
 		$member->type = dol_getIdFromCode($db, $member->typeid, 'adherent_type', 'rowid', 'libelle');
 		// Set amount for the subscription
-		$amount = (!empty($member->last_subscription_amount)) ? $member->last_subscription_amount : $amountbytype[$member->typeid];
+		$amount = (!empty($amountbytype[$member->typeid])) ? $amountbytype[$member->typeid]  : $member->last_subscription_amount;
 		// list member type
-		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-		$adht = new AdherentType($db);
 		if ( !$action) {
 			$form = new Form($db); // so we can call method selectarray
 			print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("NewSubscription");

From b643af9c03252a333d2a561c8bce03093b837c80 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 1 May 2021 20:28:47 +0200
Subject: [PATCH 525/928] Remove unused code from reverted pr

---
 htdocs/adherents/admin/member.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index 62291791fc5..d494b0ab438 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -9,8 +9,7 @@
  * Copyright (C) 2012      J. Fernando Lagrange <fernando@demo-tic.org>
  * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
  * Copyright (C) 2020-2021 Frédéric France      <frederic.france@netlogic.fr>
- * Copyright (C) 2021      Waël Almoman         <info@almoman.com>
- *
+ * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -34,7 +33,6 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "members"));

From 832ceb2be376fd7da9ce06624c122d6119e28278 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 1 May 2021 18:36:59 +0000
Subject: [PATCH 526/928] Fixing style errors.

---
 htdocs/adherents/admin/member.php              | 2 +-
 htdocs/adherents/class/adherent_type.class.php | 5 +++--
 htdocs/adherents/type.php                      | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index d494b0ab438..32476f137a8 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2012      J. Fernando Lagrange <fernando@demo-tic.org>
  * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
  * Copyright (C) 2020-2021 Frédéric France      <frederic.france@netlogic.fr>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 4924acf5ab6..505350a9c54 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -88,7 +88,7 @@ class AdherentType extends CommonObject
 	 * @var int Subsription required (0 or 1)
 	 */
 	public $subscription;
-	
+
 	/**
 	 * @var float amount for subscription if required
 	 */
@@ -548,7 +548,8 @@ class AdherentType extends CommonObject
 	 *  @param	int		$status			Filter on status of type
 	 *  @return array					List of types of members
 	 */
-	public function amount_by_type($status = null) {
+	public function amount_by_type($status = null)
+	{
 
 		global $conf, $langs;
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 707dd7acb7c..05d50bed52d 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -795,7 +795,7 @@ if ($rowid > 0) {
 		print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
 		print $form->selectyesno("subscription", $object->subscription, 1);
 		print '</td></tr>';
-		
+
 		print '<tr><td>'.$langs->trans("DefineAmountMemberType").'</td><td>';
 		print '<input name="amount" size="5" value="'.price($object->amount).'">';
 		print '</td></tr>';

From 28ba84770997466037b93b4b976484c6042bb96b Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 1 May 2021 20:43:58 +0200
Subject: [PATCH 527/928] camelCase format for method amountByType

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

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 505350a9c54..9e15934cdb5 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -548,7 +548,7 @@ class AdherentType extends CommonObject
 	 *  @param	int		$status			Filter on status of type
 	 *  @return array					List of types of members
 	 */
-	public function amount_by_type($status = null)
+	public function amountByType($status = null)
 	{
 
 		global $conf, $langs;

From 0610ca89c1ff8e5abf15d7335d85be6972834217 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 1 May 2021 20:45:57 +0200
Subject: [PATCH 528/928] camelCase for amountByType

---
 htdocs/public/payment/newpayment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 10c929b78e2..7007455791a 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1448,7 +1448,7 @@ if ($source == 'member' || $source == 'membersubscription') {
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 		$adht = new AdherentType($db);
 		// Amount by member type
-		$amountbytype = $adht->amount_by_type(1);
+		$amountbytype = $adht->amountByType(1);
 		// Set the member type
 		$member->typeid = (int) (GETPOSTISSET("typeid") ? GETPOST("typeid", 'int') : $member->typeid);
 		// If we change the type of membership, we set also label of new type

From 127654e792dc77d23333f7d7faf1641bb4cb22ad Mon Sep 17 00:00:00 2001
From: kastoras <kastoras_1@hotmail.com>
Date: Sat, 1 May 2021 22:32:08 +0300
Subject: [PATCH 529/928] New/NEW Product Variants API, add variant stock to
 response

Remove dependency inserded by mistake
---
 htdocs/product/class/api_products.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 62137730e5f..39d8b8aa83a 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -25,7 +25,6 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.class.php';
 
 /**
  * API class for products

From 1d05ce4a152a9cccb35b331a92399086af4e33ea Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 1 May 2021 21:40:43 +0200
Subject: [PATCH 530/928] Update comment

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

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 9e15934cdb5..2ffc1e2c9fd 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -90,7 +90,7 @@ class AdherentType extends CommonObject
 	public $subscription;
 
 	/**
-	 * @var float amount for subscription if required
+	 * @var float amount for subscription
 	 */
 	public $amount;
 

From f25997b292b09f81285a273235f50bd1f7900be7 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 1 May 2021 21:42:13 +0200
Subject: [PATCH 531/928] phpunit

---
 test/phpunit/AdherentTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index d9ba2e267e9..63b55dd37aa 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -154,6 +154,7 @@ class AdherentTest extends PHPUnit\Framework\TestCase
 		$localobject->statut=1;
 		$localobject->label='Adherent type test';
 		$localobject->subscription=1;
+		$localobject->amount=0;
 		$localobject->vote=1;
 		$localobject->company='Old company label';
 		$result=$localobject->create($user);

From 125162f52012e1c9e2e6f7748d1f6eb5b1c6b2cb Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 1 May 2021 22:01:04 +0200
Subject: [PATCH 532/928] Fix #17352 card number overlaps expiration date on
 public payment page with Stripe

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index f96844e1655..4227019fc09 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4420,7 +4420,7 @@ div.backgreypublicpayment { background-color: #f0f0f0; padding: 20px; border-bot
 	color: #222;
 	opacity: 0.3;
 }
-#dolpaymenttable { min-width: 290px; font-size: 16px; }	/* Width must have min to make stripe input area visible. Lower than 320 makes input area crazy for credit card that need zip code */
+#dolpaymenttable { min-width: 320px; font-size: 16px; }	/* Width must have min to make stripe input area visible. Lower than 320 makes input area crazy for credit card that need zip code */
 #tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }

From 0acbd87a53690c8b5e5e46fd726aabf1b2a28694 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 2 May 2021 01:47:29 +0200
Subject: [PATCH 533/928] NEW Accountancy - Add select date from/to in binding
 customer list

---
 htdocs/accountancy/customer/list.php | 65 +++++++++++++++++++---------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 678e5081937..b7f1efbcbc0 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-2020	Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2021	Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2014-2015	Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2013-2014	Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014	  	Juanjo Menent		<jmenent@2byte.es>
@@ -59,9 +59,14 @@ $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_day = GETPOST("search_day", "int");
-$search_month = GETPOST("search_month", "int");
-$search_year = GETPOST("search_year", "int");
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
@@ -135,9 +140,14 @@ if (empty($reshook)) {
 		$search_amount = '';
 		$search_account = '';
 		$search_vat = '';
-		$search_day = '';
-		$search_month = '';
-		$search_year = '';
+		$search_date_startday = '';
+		$search_date_startmonth = '';
+		$search_date_startyear = '';
+		$search_date_endday = '';
+		$search_date_endmonth = '';
+		$search_date_endyear = '';
+		$search_date_start = '';
+		$search_date_end = '';
 		$search_country = '';
 		$search_tvaintra = '';
 	}
@@ -289,7 +299,12 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
 }
-$sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
+if ($search_date_start) {
+	$sql .= " AND f.datef >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND f.datef <= '".$db->idate($search_date_end)."'";
+}
 if (strlen(trim($search_country))) {
 	$arrayofcode = getCountriesInEEC();
 	$country_code_in_EEC = $country_code_in_EEC_without_me = '';
@@ -368,14 +383,23 @@ if ($result) {
 	if ($search_lineid) {
 		$param .= '&search_lineid='.urlencode($search_lineid);
 	}
-	if ($search_day) {
-		$param .= '&search_day='.urlencode($search_day);
+	if ($search_date_startday) {
+		$param .= '&search_date_startday='.urlencode($search_date_startday);
 	}
-	if ($search_month) {
-		$param .= '&search_month='.urlencode($search_month);
+	if ($search_date_startmonth) {
+		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
 	}
-	if ($search_year) {
-		$param .= '&search_year='.urlencode($search_year);
+	if ($search_date_startyear) {
+		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	}
+	if ($search_date_endday) {
+		$param .= '&search_date_endday='.urlencode($search_date_endday);
+	}
+	if ($search_date_endmonth) {
+		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	}
+	if ($search_date_endyear) {
+		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
 	}
 	if ($search_invoice) {
 		$param .= '&search_invoice='.urlencode($search_invoice);
@@ -436,12 +460,13 @@ if ($result) {
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" 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 center nowraponall minwidth100imp">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
-	}
-	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
-	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
 	print '</td>';
 	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>';

From 3c01eba11a2d1d6c8301a043c499dc772ec4dce6 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 2 May 2021 01:53:49 +0200
Subject: [PATCH 534/928] NEW Accountancy - Add select date from/to in already
 bind customer list

---
 htdocs/accountancy/customer/lines.php | 63 +++++++++++++++++++--------
 1 file changed, 44 insertions(+), 19 deletions(-)

diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index b8cc34c3cae..68d49793553 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -53,9 +53,14 @@ $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_day = GETPOST("search_day", "int");
-$search_month = GETPOST("search_month", "int");
-$search_year = GETPOST("search_year", "int");
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
@@ -109,9 +114,14 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_amount = '';
 	$search_account = '';
 	$search_vat = '';
-	$search_day = '';
-	$search_month = '';
-	$search_year = '';
+	$search_date_startday = '';
+	$search_date_startmonth = '';
+	$search_date_startyear = '';
+	$search_date_endday = '';
+	$search_date_endmonth = '';
+	$search_date_endyear = '';
+	$search_date_start = '';
+	$search_date_end = '';
 	$search_country = '';
 	$search_tvaintra = '';
 }
@@ -240,7 +250,12 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("fd.tva_tx", price2num($search_vat), 1);
 }
-$sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
+if ($search_date_start) {
+	$sql .= " AND f.datef >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND f.datef <= '".$db->idate($search_date_end)."'";
+}
 if (strlen(trim($search_country))) {
 	$arrayofcode = getCountriesInEEC();
 	$country_code_in_EEC = $country_code_in_EEC_without_me = '';
@@ -315,14 +330,23 @@ if ($result) {
 	if ($search_vat) {
 		$param .= "&search_vat=".urlencode($search_vat);
 	}
-	if ($search_day) {
-		$param .= '&search_day='.urlencode($search_day);
+	if ($search_date_startday) {
+		$param .= '&search_date_startday='.urlencode($search_date_startday);
 	}
-	if ($search_month) {
-		$param .= '&search_month='.urlencode($search_month);
+	if ($search_date_startmonth) {
+		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
 	}
-	if ($search_year) {
-		$param .= '&search_year='.urlencode($search_year);
+	if ($search_date_startyear) {
+		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	}
+	if ($search_date_endday) {
+		$param .= '&search_date_endday='.urlencode($search_date_endday);
+	}
+	if ($search_date_endmonth) {
+		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	}
+	if ($search_date_endyear) {
+		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
 	}
 	if ($search_country) {
 		$param .= "&search_country=".urlencode($search_country);
@@ -357,12 +381,13 @@ if ($result) {
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" 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 center nowraponall">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
-	}
-	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
-	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
 	print '</td>';
 	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>';

From 87b9f7a77d116c2ee00c70c07d3c782a468790e8 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 2 May 2021 01:59:11 +0200
Subject: [PATCH 535/928] NEW Accountancy - Add select date from/to in already
 bind supplier list

---
 htdocs/accountancy/supplier/lines.php | 63 +++++++++++++++++++--------
 1 file changed, 44 insertions(+), 19 deletions(-)

diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index deed1299fd5..90e7213c8f9 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -54,9 +54,14 @@ $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_day = GETPOST("search_day", "int");
-$search_month = GETPOST("search_month", "int");
-$search_year = GETPOST("search_year", "int");
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
@@ -112,9 +117,14 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_amount = '';
 	$search_account = '';
 	$search_vat = '';
-	$search_day = '';
-	$search_month = '';
-	$search_year = '';
+	$search_date_startday = '';
+	$search_date_startmonth = '';
+	$search_date_startyear = '';
+	$search_date_endday = '';
+	$search_date_endmonth = '';
+	$search_date_endyear = '';
+	$search_date_start = '';
+	$search_date_end = '';
 	$search_country = '';
 	$search_tvaintra = '';
 }
@@ -234,7 +244,12 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
 }
-$sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
+if ($search_date_start) {
+	$sql .= " AND f.datef >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND f.datef <= '".$db->idate($search_date_end)."'";
+}
 if (strlen(trim($search_country))) {
 	$arrayofcode = getCountriesInEEC();
 	$country_code_in_EEC = $country_code_in_EEC_without_me = '';
@@ -315,14 +330,23 @@ if ($result) {
 	if ($search_vat) {
 		$param .= "&search_vat=".urlencode($search_vat);
 	}
-	if ($search_day) {
-		$param .= '&search_day='.urlencode($search_day);
+	if ($search_date_startday) {
+		$param .= '&search_date_startday='.urlencode($search_date_startday);
 	}
-	if ($search_month) {
-		$param .= '&search_month='.urlencode($search_month);
+	if ($search_date_startmonth) {
+		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
 	}
-	if ($search_year) {
-		$param .= '&search_year='.urlencode($search_year);
+	if ($search_date_startyear) {
+		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	}
+	if ($search_date_endday) {
+		$param .= '&search_date_endday='.urlencode($search_date_endday);
+	}
+	if ($search_date_endmonth) {
+		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	}
+	if ($search_date_endyear) {
+		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
 	}
 	if ($search_country) {
 		$param .= "&search_country=".urlencode($search_country);
@@ -359,12 +383,13 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" 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"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
-	print '<td class="liste_titre center nowraponall">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
-	}
-	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
-	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
 	print '</td>';
 	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_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';

From 6b75edf2f3e9ad786803fc0e99bc15bdd4640363 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 2 May 2021 02:03:19 +0200
Subject: [PATCH 536/928] NEW Accountancy - Add select date from/to in binding
 supplier list

---
 htdocs/accountancy/supplier/list.php | 65 +++++++++++++++++++---------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index dda111856d3..cc3430af872 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-2020	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2014-2015	Ari Elbaz (elarifr)		<github@accedinfo.com>
  * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>s
@@ -60,9 +60,14 @@ $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_day = GETPOST("search_day", "int");
-$search_month = GETPOST("search_month", "int");
-$search_year = GETPOST("search_year", "int");
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
@@ -140,9 +145,14 @@ if (empty($reshook)) {
 		$search_amount = '';
 		$search_account = '';
 		$search_vat = '';
-		$search_day = '';
-		$search_month = '';
-		$search_year = '';
+		$search_date_startday = '';
+		$search_date_startmonth = '';
+		$search_date_startyear = '';
+		$search_date_endday = '';
+		$search_date_endmonth = '';
+		$search_date_endyear = '';
+		$search_date_start = '';
+		$search_date_end = '';
 		$search_country = '';
 		$search_tvaintra = '';
 	}
@@ -293,7 +303,12 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
 }
-$sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
+if ($search_date_start) {
+	$sql .= " AND f.datef >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND f.datef <= '".$db->idate($search_date_end)."'";
+}
 if (strlen(trim($search_country))) {
 	$arrayofcode = getCountriesInEEC();
 	$country_code_in_EEC = $country_code_in_EEC_without_me = '';
@@ -372,14 +387,23 @@ if ($result) {
 	if ($search_lineid) {
 		$param .= '&search_lineid='.urlencode($search_lineid);
 	}
-	if ($search_day) {
-		$param .= '&search_day='.urlencode($search_day);
+	if ($search_date_startday) {
+		$param .= '&search_date_startday='.urlencode($search_date_startday);
 	}
-	if ($search_month) {
-		$param .= '&search_month='.urlencode($search_month);
+	if ($search_date_startmonth) {
+		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
 	}
-	if ($search_year) {
-		$param .= '&search_year='.urlencode($search_year);
+	if ($search_date_startyear) {
+		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	}
+	if ($search_date_endday) {
+		$param .= '&search_date_endday='.urlencode($search_date_endday);
+	}
+	if ($search_date_endmonth) {
+		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	}
+	if ($search_date_endyear) {
+		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
 	}
 	if ($search_invoice) {
 		$param .= '&search_invoice='.urlencode($search_invoice);
@@ -444,12 +468,13 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" 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"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
-	print '<td class="liste_titre center nowraponall minwidth100imp">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
-	}
-	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
-	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
 	print '</td>';
 	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 maxwidth100" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';

From cd6bcd14f3abbca6041dfa530da43b38f940127c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 2 May 2021 02:35:16 +0200
Subject: [PATCH 537/928] NEW Accountancy - Possibility to select journals in
 balance

---
 htdocs/accountancy/bookkeeping/balance.php    | 19 +++++++++++++++++--
 .../accountancy/class/bookkeeping.class.php   |  9 ++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index e03790a8995..9a044ed42c2 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-2020  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,6 +30,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.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.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
@@ -60,7 +61,7 @@ $pagenext = $page + 1;
 $show_subgroup = GETPOST('show_subgroup', 'alpha');
 $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(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
-
+$search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
 if ($search_accountancy_code_start == - 1) {
 	$search_accountancy_code_start = '';
@@ -134,6 +135,12 @@ if (!empty($search_accountancy_code_end)) {
 	$filter['t.numero_compte<='] = $search_accountancy_code_end;
 	$param .= '&amp;search_accountancy_code_end='.$search_accountancy_code_end;
 }
+if (!empty($search_ledger_code)) {
+	$filter['t.code_journal'] = $search_ledger_code;
+	foreach ($search_ledger_code as $code) {
+		$param .= '&search_ledger_code[]='.urlencode($code);
+	}
+}
 
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
@@ -157,6 +164,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_date_end = '';
 	$search_accountancy_code_start = '';
 	$search_accountancy_code_end = '';
+	$search_ledger_code = array();
 	$filter = array();
 }
 
@@ -265,6 +273,13 @@ if ($action != 'export_csv') {
 
 	print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
+	print '<tr class="liste_titre_filter">';
+	print '<td class="liste_titre">';
+	print $langs->trans('Journals');
+	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
+	print '</td>';
+	print '</tr>';
+
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre" colspan="'.$colspan.'">';
 	print $langs->trans('From');
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index a93b36cf2b4..06ff8d9cb8c 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1103,7 +1103,8 @@ class BookKeeping extends CommonObject
 		$sql = 'SELECT';
 		$sql .= " t.numero_compte,";
 		$sql .= " SUM(t.debit) as debit,";
-		$sql .= " SUM(t.credit) as credit";
+		$sql .= " SUM(t.credit) as credit,";
+		$sql .= " t.code_journal";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
 		$sqlwhere = array();
@@ -1121,6 +1122,12 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
 				} elseif ($key == 't.subledger_label') {
 					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
+				} elseif ($key == 't.code_journal' && !empty($value)) {
+					if (is_array($value)) {
+						$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
+					} else {
+						$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
+					}
 				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}

From 8eddc75a227e9724b726d816b9aee61e1ba1318b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 2 May 2021 02:49:53 +0200
Subject: [PATCH 538/928] Remove duplicate variable

---
 htdocs/accountancy/bookkeeping/balance.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 9a044ed42c2..bc0cca4cc1b 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -39,9 +39,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("accountancy", "compta"));
 
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$sortorder = GETPOST("sortorder", 'alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Load variable for pagination

From 24a58b1956a1be782e0e7dfb584ac58cceb18350 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 11:21:01 +0200
Subject: [PATCH 539/928] Removed not used permission

---
 htdocs/core/modules/modKnowledgeManagement.class.php | 5 -----
 htdocs/knowledgemanagement/knowledgerecord_card.php  | 6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index 47c25232d67..a08070d8d0c 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -275,11 +275,6 @@ class modKnowledgeManagement extends DolibarrModules
 		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-		$this->rights[$r][1] = 'Reply to objects of Knowledge Management'; // Permission label
-		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
-		$this->rights[$r][5] = 'reply'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
-		$r++;
 		/* END MODULEBUILDER PERMISSIONS */
 
 		// Main menu entries to add
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 771c8ff241a..f4e949a8603 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -123,7 +123,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 
 $permissiontoread = $user->rights->knowledgemanagement->knowledgerecord->read;
-$permissiontoreply = $user->rights->knowledgemanagement->knowledgerecord->reply;
+$permissiontovalidate = $user->rights->knowledgemanagement->knowledgerecord->write;
 $permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->knowledgemanagement->knowledgerecord->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
 $permissionnote = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_setnotes.inc.php
@@ -461,12 +461,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($object->status == $object::STATUS_VALIDATED) {
 				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes', '', $permissiontoadd);
 			}
-			if ($object->status == $object::STATUS_VALIDATED && $permissiontoreply) {
+			if ($object->status == $object::STATUS_VALIDATED && $permissiontovalidate) {
 				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit', '', $permissiontoadd);
 			}
 			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
-				if ((empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) && $permissiontoreply) {
+				if ((empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) && $permissiontovalidate) {
 					print dolGetButtonAction($langs->trans('ValidateReply'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
 				} else {
 					$langs->load("errors");

From 173ef31ad4b22c70e87028c782572605f4ee9a04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 12:15:31 +0200
Subject: [PATCH 540/928] Enhance modulebuilder

---
 htdocs/admin/knowledgemanagement.php          |  2 +-
 htdocs/admin/knowledgerecord_extrafields.php  |  2 +-
 .../lib/knowledgemanagement.lib.php           |  4 +-
 htdocs/langs/en_US/modulebuilder.lang         |  1 +
 htdocs/modulebuilder/index.php                | 78 +++++++++++++------
 5 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index e9e7f971575..5bc994bb086 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -210,7 +210,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 // Configuration header
 $head = knowledgemanagementAdminPrepareHead();
-print dol_get_fiche_head($head, 'knowledgemanagement', $langs->trans('ModuleKnowledgeManagementName'), -1, "knowledgemanagement");
+print dol_get_fiche_head($head, 'setup', $langs->trans('ModuleKnowledgeManagementName'), -1, "knowledgemanagement");
 
 // Setup page goes here
 echo '<span class="opacitymedium">'.$langs->trans("KnowledgeManagementSetupPage").'</span><br><br>';
diff --git a/htdocs/admin/knowledgerecord_extrafields.php b/htdocs/admin/knowledgerecord_extrafields.php
index 34d3b4858e9..823366e1fbe 100644
--- a/htdocs/admin/knowledgerecord_extrafields.php
+++ b/htdocs/admin/knowledgerecord_extrafields.php
@@ -103,7 +103,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 $head = knowledgemanagementAdminPrepareHead();
 
-print dol_get_fiche_head($head, 'knowledgerecord_extrafields', $langs->trans("KnowledgeRecordExtraFields"), -1, 'knowledgemanagement');
+print dol_get_fiche_head($head, 'extra', $langs->trans("KnowledgeRecordExtraFields"), -1, 'knowledgemanagement');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
index 15279f01983..ba81dd49057 100644
--- a/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement.lib.php
@@ -37,13 +37,13 @@ function knowledgemanagementAdminPrepareHead()
 
 	$head[$h][0] = dol_buildpath("/admin/knowledgemanagement.php", 1);
 	$head[$h][1] = $langs->trans("Setup");
-	$head[$h][2] = 'settings';
+	$head[$h][2] = 'setup';
 	$h++;
 
 
 	$head[$h][0] = dol_buildpath("admin/knowledgerecord_extrafields.php", 1);
 	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'settings';
+	$head[$h][2] = 'extra';
 	$h++;
 
 	/*$head[$h][0] = dol_buildpath("/knowledgemanagement/admin/about.php", 1);
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 9fdaa1a533a..7ba539d3bd4 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -143,3 +143,4 @@ AsciiToHtmlConverter=Ascii to HTML converter
 AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
+ImportExportProfiles=Import and export profiles
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index dc5a84071d7..c56c37d00c3 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -726,9 +726,33 @@ if ($dirins && $action == 'initdoc' && !empty($module)) {
 // add Language
 if ($dirins && $action == 'addlanguage' && !empty($module)) {
 	$newlangcode = GETPOST('newlangcode', 'aZ09');
-	$srcfile = $dirins.'/'.strtolower($module).'/langs/en_US';
-	$destfile = $dirins.'/'.strtolower($module).'/langs/'.$newlangcode;
-	$result = dolCopyDir($srcfile, $destfile, 0, 0);
+
+	if ($newlangcode) {
+		$modulelowercase = strtolower($module);
+
+		// Dir for module
+		$diroflang = dol_buildpath($modulelowercase, 0);
+
+		if ($diroflang == $dirread.'/'.$modulelowercase) {
+			// This is not a custom module, we force diroflang to htdocs root
+			$diroflang = $dirread;
+
+			$srcfile = $diroflang.'/langs/en_US/'.$modulelowercase.'.lang';
+			$destfile = $diroflang.'/langs/'.$newlangcode.'/'.$modulelowercase.'.lang';
+
+			$result = dol_copy($srcfile, $destfile, 0, 0);
+			if ($result < 0) {
+				setEventMessages($langs->trans("ErrorFailToCopyFile", $srcfile, $destfile), null, 'errors');
+			}
+		} else {
+			$srcfile = $diroflang.'/langs/en_US';
+			$destfile = $diroflang.'/langs/'.$newlangcode;
+
+			$result = dolCopyDir($srcfile, $destfile, 0, 0);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Language")), null, 'errors');
+	}
 }
 
 
@@ -1448,17 +1472,37 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname) {
 	$tabobj = 'deleteobject';
 }
 
+if ($dirins && $action == 'generatedoc') {
+	$modulelowercase = strtolower($module);
+
+	// Dir for module
+	$dirofmodule = dol_buildpath($modulelowercase, 0).'/doc';
+
+	$FILENAMEDOC = strtolower($module).'.html';
+
+	$util = new Utils($db);
+	$result = $util->generateDoc($module);
+
+	if ($result > 0) {
+		setEventMessages($langs->trans("DocFileGeneratedInto", $dirofmodule), null);
+	} else {
+		setEventMessages($util->error, $util->errors, 'errors');
+	}
+}
 
 if ($dirins && $action == 'generatepackage') {
 	$modulelowercase = strtolower($module);
 
+	$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
+
 	// Dir for module
-	$dir = $dirins.'/'.$modulelowercase;
+	$dir = dol_buildpath($modulelowercase, 0);
+
 	// Zip file to build
 	$FILENAMEZIP = '';
 
 	// Load module
-	dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
+	dol_include_once($pathtofile);
 	$class = 'mod'.$module;
 
 	if (class_exists($class)) {
@@ -1466,18 +1510,18 @@ if ($dirins && $action == 'generatepackage') {
 			$moduleobj = new $class($db);
 		} catch (Exception $e) {
 			$error++;
-			dol_print_error($e->getMessage());
+			dol_print_error($db, $e->getMessage());
 		}
 	} else {
 		$error++;
 		$langs->load("errors");
-		dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
+		dol_print_error($db, $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";
+		$FILENAMEZIP = "module_".$modulelowercase.'-'.$arrayversion[0].($arrayversion[1] ? '.'.$arrayversion[1] : '').($arrayversion[2] ? '.'.$arrayversion[2] : '').'.zip';
 
 		$dirofmodule = dol_buildpath($modulelowercase, 0).'/bin';
 		$outputfilezip = $dirofmodule.'/'.$FILENAMEZIP;
@@ -1504,20 +1548,6 @@ if ($dirins && $action == 'generatepackage') {
 	}
 }
 
-if ($dirins && $action == 'generatedoc') {
-	$FILENAMEDOC = strtolower($module).'.html';
-	$dirofmodule = dol_buildpath(strtolower($module), 0).'/doc';
-
-	$util = new Utils($db);
-	$result = $util->generateDoc($module);
-
-	if ($result > 0) {
-		setEventMessages($langs->trans("DocFileGeneratedInto", $dirofmodule), null);
-	} else {
-		setEventMessages($util->error, $util->errors, 'errors');
-	}
-}
-
 
 // Save file
 if ($action == 'savefile' && empty($cancel)) {
@@ -3812,12 +3842,12 @@ if ($module == 'initmodule') {
 					$moduleobj = new $class($db);
 				} catch (Exception $e) {
 					$error++;
-					dol_print_error($e->getMessage());
+					dol_print_error($db, $e->getMessage());
 				}
 			} else {
 				$error++;
 				$langs->load("errors");
-				dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
+				dol_print_error($db, $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
 				exit;
 			}
 

From e8f48667ddcce2f91d31df1477c7a7a7598acb29 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 12:35:47 +0200
Subject: [PATCH 541/928] Enhance modulebuilder

---
 htdocs/modulebuilder/index.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index c56c37d00c3..c35aa1c3f87 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2155,7 +2155,21 @@ if ($module == 'initmodule') {
 				print '<br>';
 				print '<br>';
 
-				$langfiles = dol_dir_list(dol_buildpath($modulelowercase.'/langs', 0), 'files', 1, '\.lang$');
+				$modulelowercase = strtolower($module);
+
+				// Dir for module
+				$diroflang = dol_buildpath($modulelowercase, 0);
+
+				if (!preg_match('/custom/', $dirread)) {
+					$diroflang = $dirread;
+					$diroflang .= '/langs';
+
+					$langfiles = dol_dir_list($diroflang, 'files', 1, $modulelowercase.'\.lang$');
+				} else {
+					$diroflang .= '/langs';
+
+					$langfiles = dol_dir_list($diroflang, 'files', 1, '\.lang$');
+				}
 
 				print '<table class="none">';
 				foreach ($langfiles as $langfile) {

From 88fa042c3bcc3e7ea86da256e5802380d854f6f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 12:39:33 +0200
Subject: [PATCH 542/928] Can edit language file for core modules

---
 htdocs/modulebuilder/index.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index c35aa1c3f87..35e5e5b81b0 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2159,21 +2159,22 @@ if ($module == 'initmodule') {
 
 				// Dir for module
 				$diroflang = dol_buildpath($modulelowercase, 0);
+				$diroflang .= '/langs';
+				$langfiles = dol_dir_list($diroflang, 'files', 1, '\.lang$');
 
 				if (!preg_match('/custom/', $dirread)) {
+					// If this is not a module into custom
 					$diroflang = $dirread;
 					$diroflang .= '/langs';
-
 					$langfiles = dol_dir_list($diroflang, 'files', 1, $modulelowercase.'\.lang$');
-				} else {
-					$diroflang .= '/langs';
-
-					$langfiles = dol_dir_list($diroflang, 'files', 1, '\.lang$');
 				}
 
 				print '<table class="none">';
 				foreach ($langfiles as $langfile) {
 					$pathtofile = $modulelowercase.'/langs/'.$langfile['relativename'];
+					if (!preg_match('/custom/', $dirread)) {	// If this is not a module into custom
+						$pathtofile = 'langs/'.$langfile['relativename'];
+					}
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("LanguageFile").' '.basename(dirname($pathtofile)).' : <strong>'.$pathtofile.'</strong>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=txt&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';

From 3edb929f9e7735e7adc4f6746833021dcd8a2118 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 12:43:28 +0200
Subject: [PATCH 543/928] Debug v14

---
 htdocs/core/modules/modKnowledgeManagement.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index a08070d8d0c..504c363b648 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -45,7 +45,7 @@ class modKnowledgeManagement 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 = 57000; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
+		$this->numero = 57000;
 
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'knowledgemanagement';
@@ -260,17 +260,17 @@ class modKnowledgeManagement extends DolibarrModules
 		$r = 0;
 		// Add here entries to declare new permissions
 		/* BEGIN MODULEBUILDER PERMISSIONS */
-		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][0] = $this->numero + $r + 1; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read objects of Knowledge Management'; // Permission label
 		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][0] = $this->numero + $r + 1; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Create/Update objects of Knowledge Management'; // Permission label
 		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][0] = $this->numero + $r + 1; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Delete objects of Knowledge Management'; // Permission label
 		$this->rights[$r][4] = 'knowledgerecord'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)
 		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->knowledgemanagement->level1->level2)

From a54e60d3456d4fcd15161d61586ba1d99aeb20f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 13:13:55 +0200
Subject: [PATCH 544/928] Look and feel v14

---
 htdocs/admin/system/modules.php               |  2 +-
 htdocs/core/lib/functions.lib.php             | 16 ++++++++++------
 htdocs/core/modules/DolibarrModules.class.php | 17 +++++++++++++++++
 htdocs/core/modules/modIncoterm.class.php     |  2 +-
 htdocs/core/modules/modPartnership.class.php  |  2 +-
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 2796f09fbfd..f3892e105bb 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -134,7 +134,7 @@ foreach ($modules as $key => $module) {
 	$newModule->name = $module->getName();
 	$newModule->version = $module->getVersion();
 	$newModule->id = $key;
-	$newModule->module_position = $module->module_position;
+	$newModule->module_position = $module->getModulePosition();
 
 	$alt = $module->name.' - '.$modules_files[$key];
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4239ff4bafe..e5d7acbd250 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3517,7 +3517,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
 				'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
-				'images', 'info', 'intervention', 'inventory', 'intracommreport', 'knowledgemanagement',
+				'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'knowledgemanagement',
 				'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
 				'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
 				'off', 'on', 'order',
@@ -3553,7 +3553,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
 				'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
 				'accounting'=>'search-dollar', 'category'=>'tag', 'dollyrevert'=>'dolly',
-				'hrm'=>'user-tie', 'margin'=>'calculator', 'members'=>'user-friends', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
+				'hrm'=>'user-tie', 'incoterm'=>'truck-loading',
+				'margin'=>'calculator', 'members'=>'user-friends', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
 				'email'=>'at', 'establishment'=>'building',
 				'edit'=>'pencil-alt', 'graph'=>'chart-line', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
 				'generic'=>'file', 'holiday'=>'umbrella-beach',
@@ -3635,9 +3636,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'bill'=>'infobox-commande', 'billa'=>'infobox-commande', 'billr'=>'infobox-commande', 'billd'=>'infobox-commande',
 				'conferenceorbooth'=>'infobox-project',
 				'cash-register'=>'infobox-bank_account', 'contract'=>'infobox-contrat', 'check'=>'font-status4', 'collab'=>'infobox-action', 'conversation'=>'infobox-contrat',
-				'donation'=>'infobox-commande', 'dollyrevert'=>'flip',
+				'donation'=>'infobox-commande', 'dolly'=>'infobox-commande',  'dollyrevert'=>'flip infobox-order_supplier',
 				'ecm'=>'infobox-action', 'eventorganization'=>'infobox-project',
 				'hrm'=>'infobox-adherent', 'group'=>'infobox-adherent', 'intervention'=>'infobox-contrat',
+				'incoterm'=>'infobox-supplier_proposal',
 				'multicurrency'=>'infobox-bank_account',
 				'members'=>'infobox-adherent', 'member'=>'infobox-adherent', 'money-bill-alt'=>'infobox-bank_account',
 				'order'=>'infobox-commande',
@@ -3648,7 +3650,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'payment'=>'infobox-bank_account', 'poll'=>'infobox-adherent', 'pos'=>'infobox-bank_account', 'project'=>'infobox-project', 'projecttask'=>'infobox-project', 'propal'=>'infobox-propal',
 				'reception'=>'flip', 'recruitmentjobposition'=>'infobox-adherent', 'recruitmentcandidature'=>'infobox-adherent',
 				'resource'=>'infobox-action',
-				'salary'=>'infobox-bank_account', 'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier',
+				'salary'=>'infobox-bank_account', 'shipment'=>'infobox-commande', 'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier',
 				'supplier_order'=>'infobox-order_supplier', 'supplier_proposal'=>'infobox-supplier_proposal',
 				'ticket'=>'infobox-contrat', 'title_accountancy'=>'infobox-bank_account', 'title_hrm'=>'infobox-holiday', 'expensereport'=>'infobox-expensereport', 'trip'=>'infobox-expensereport', 'title_agenda'=>'infobox-action',
 				//'title_setup'=>'infobox-action', 'tools'=>'infobox-action',
@@ -3664,11 +3666,13 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'cog'=>'#999', 'companies'=>'#6c6aa8', 'company'=>'#6c6aa8', 'contact'=>'#6c6aa8', 'cron'=>'#555',
 				'dynamicprice'=>'#a69944',
 				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'help'=>'#bbb', 'listlight'=>'#999', 'language'=>'#555',
-				'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944',
+				//'dolly'=>'#a69944', 'dollyrevert'=>'#a69944',
+				'lot'=>'#a69944',
 				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'inventory'=>'#a69944', 'stock'=>'#a69944', 'movement'=>'#a69944',
 				'other'=>'#ddd',
 				'partnership'=>'#6c6aa8', 'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'reception'=>'#a69944', 'resize'=>'#444', 'rss'=>'#cba',
-				'shipment'=>'#a69944', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
+				//'shipment'=>'#a69944',
+				'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
 				'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa',
 				'website'=>'#304', 'workstation'=>'#a69944'
 			);
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 30ee2bb72be..5fbfc05a9fb 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -800,6 +800,23 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		return $ret;
 	}
 
+	/**
+	 * Gives the module position
+	 *
+	 * @return int  	Module position (an external module should never return a value lower than 100000. 1-100000 are reserved for core)
+	 */
+	public function getModulePosition()
+	{
+		if (in_array($this->version, array('dolibarr', 'experimental', 'development'))) {	// core module
+			return $this->module_position;
+		} else {																			// external module
+			if ($this->module_position >= 100000) {
+				return $this->module_position;
+			} else {
+				return $this->module_position + 100000;
+			}
+		}
+	}
 
 	/**
 	 * Tells if module is core or external
diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index a7a260dba6e..9ef50fe3aac 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -56,7 +56,7 @@ class modIncoterm extends DolibarrModules
 		$this->version = 'dolibarr';
 		// 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);
-		$this->picto = 'generic';
+		$this->picto = 'incoterm';
 
 		$this->module_parts = array();
 		$this->dirs = array();
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index 1165461368b..8b3b0cdb2c4 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -48,7 +48,7 @@ class modPartnership 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 https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
+		$this->numero = 58000;
 
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'partnership';

From 71ed90a153d21f89302d18b66f19d8d53a827d64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 13:16:41 +0200
Subject: [PATCH 545/928] Fix phpcs

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

diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 9f057fe46c1..6f05daba22f 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -86,7 +86,7 @@ span.butAction, span.butActionDelete {
 	text-align: center;
 	cursor: pointer;
 	color: #444;
-    border: 1px solid transparent;	/* So for buttonRefused with a border, it will not have any flash effect */
+	border: 1px solid transparent;	/* So for buttonRefused with a border, it will not have any flash effect */
 
 	/* border: 1px solid #aaa; */
 	/* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */

From 9e2a987ee31e6057e711a07c6ab24d59e24e0540 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 2 May 2021 13:17:05 +0200
Subject: [PATCH 546/928] Update llx_20_c_departements.sql

Morocco / Maroc Provinces (have to check before/after year 2015)
---
 .../mysql/data/llx_20_c_departements.sql      | 172 +++++++++---------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index fd60de31aa3..1dfb11db9c5 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -54,7 +54,7 @@
 -- Italy
 -- Luxembourg
 -- Netherlands
--- (Moroco)
+-- Morocco
 -- Panama
 -- Portugal
 -- Romania
@@ -663,6 +663,91 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (14003, 'LU0012', '', 0, '', 'Mersch');
 
 
+-- Morocco/Maroc Provinces (62) & Prefectures (13)  (id country=12)
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1209, 'MA',   '', 0, '', 'Province de Benslimane');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1209, 'MA1',  '', 0, '', 'Province de Berrechid');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1209, 'MA2',  '', 0, '', 'Province de Khouribga');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1209, 'MA3',  '', 0, '', 'Province de Settat');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1210, 'MA4',  '', 0, '', 'Province d''El Jadida');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1210, 'MA5',  '', 0, '', 'Province de Safi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1210, 'MA6',  '', 0, '', 'Province de Sidi Bennour');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1210, 'MA7',  '', 0, '', 'Province de Youssoufia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1205, 'MA6B', '', 0, '', 'Préfecture de Fès');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1205, 'MA7B', '', 0, '', 'Province de Boulemane');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1205, 'MA8',  '', 0, '', 'Province de Moulay Yacoub');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1205, 'MA9',  '', 0, '', 'Province de Sefrou');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1202, 'MA8A', '', 0, '', 'Province de Kénitra');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1202, 'MA9A', '', 0, '', 'Province de Sidi Kacem');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1202, 'MA10', '', 0, '', 'Province de Sidi Slimane');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1208, 'MA11', '', 0, '', 'Préfecture de Casablanca');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1208, 'MA12', '', 0, '', 'Préfecture de Mohammédia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1208, 'MA13', '', 0, '', 'Province de Médiouna');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1208, 'MA14', '', 0, '', 'Province de Nouaceur');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1214, 'MA15', '', 0, '', 'Province d''Assa-Zag');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1214, 'MA16', '', 0, '', 'Province d''Es-Semara');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1214, 'MA17A','', 0, '', 'Province de Guelmim');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1214, 'MA18', '', 0, '', 'Province de Tata');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1214, 'MA19', '', 0, '', 'Province de Tan-Tan');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1215, 'MA15', '', 0, '', 'Province de Boujdour');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1215, 'MA16', '', 0, '', 'Province de Lâayoune');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1215, 'MA17', '', 0, '', 'Province de Tarfaya');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1211, 'MA18', '', 0, '', 'Préfecture de Marrakech');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1211, 'MA19', '', 0, '', 'Province d''Al Haouz');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1211, 'MA20', '', 0, '', 'Province de Chichaoua');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1211, 'MA21', '', 0, '', 'Province d''El Kelâa des Sraghna');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1211, 'MA22', '', 0, '', 'Province d''Essaouira');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1211, 'MA23', '', 0, '', 'Province de Rehamna');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1206, 'MA24', '', 0, '', 'Préfecture de Meknès');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1206, 'MA25', '', 0, '', 'Province d’El Hajeb');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1206, 'MA26', '', 0, '', 'Province d''Errachidia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1206, 'MA27', '', 0, '', 'Province d’Ifrane');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1206, 'MA28', '', 0, '', 'Province de Khénifra');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1206, 'MA29', '', 0, '', 'Province de Midelt');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1204, 'MA30', '', 0, '', 'Préfecture d''Oujda-Angad');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1204, 'MA31', '', 0, '', 'Province de Berkane');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1204, 'MA32', '', 0, '', 'Province de Driouch');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1204, 'MA33', '', 0, '', 'Province de Figuig');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1204, 'MA34', '', 0, '', 'Province de Jerada');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1204, 'MA35', '', 0, '', 'Province de Nador');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1204, 'MA36', '', 0, '', 'Province de Taourirt');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1216, 'MA37', '', 0, '', 'Province d''Aousserd');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1216, 'MA38', '', 0, '', 'Province d''Oued Ed-Dahab');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1207, 'MA39', '', 0, '', 'Préfecture de Rabat');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1207, 'MA40', '', 0, '', 'Préfecture de Skhirat-Témara');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1207, 'MA41', '', 0, '', 'Préfecture de Salé');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1207, 'MA42', '', 0, '', 'Province de Khémisset');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1213, 'MA43', '', 0, '', 'Préfecture d''Agadir Ida-Outanane');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1213, 'MA44', '', 0, '', 'Préfecture d''Inezgane-Aït Melloul');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1213, 'MA45', '', 0, '', 'Province de Chtouka-Aït Baha');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1213, 'MA46', '', 0, '', 'Province d''Ouarzazate');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1213, 'MA47', '', 0, '', 'Province de Sidi Ifni');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1213, 'MA48', '', 0, '', 'Province de Taroudant');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1213, 'MA49', '', 0, '', 'Province de Tinghir');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1213, 'MA50', '', 0, '', 'Province de Tiznit');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1213, 'MA51', '', 0, '', 'Province de Zagora');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1212, 'MA52', '', 0, '', 'Province d''Azilal');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1212, 'MA53', '', 0, '', 'Province de Beni Mellal');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1212, 'MA54', '', 0, '', 'Province de Fquih Ben Salah');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1201, 'MA55', '', 0, '', 'Préfecture de M''diq-Fnideq');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1201, 'MA56', '', 0, '', 'Préfecture de Tanger-Asilah');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1201, 'MA57', '', 0, '', 'Province de Chefchaouen');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1201, 'MA58', '', 0, '', 'Province de Fahs-Anjra');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1201, 'MA59', '', 0, '', 'Province de Larache');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1201, 'MA60', '', 0, '', 'Province d''Ouezzane');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1201, 'MA61', '', 0, '', 'Province de Tétouan');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1203, 'MA62', '', 0, '', 'Province de Guercif');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1203, 'MA63', '', 0, '', 'Province d''Al Hoceïma');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1203, 'MA64', '', 0, '', 'Province de Taounate');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1203, 'MA65', '', 0, '', 'Province de Taza');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1205, 'MA6A', '', 0, '', 'Préfecture de Fès');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1205, 'MA7A', '', 0, '', 'Province de Boulemane');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1214, 'MA15A','', 0, '', 'Province d''Assa-Zag');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1214, 'MA16A','', 0, '', 'Province d''Es-Semara');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1211, 'MA18A','', 0, '', 'Préfecture de Marrakech');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1214, 'MA19A','', 0, '', 'Province de Tan-Tan');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1214, 'MA19B','', 0, '', 'Province de Tan-Tan');
+
+
 -- Netherlands/Nederland Provinces (id country=17)
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1701, 'GR', NULL, NULL, NULL, 'Groningen');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1701, 'FR', NULL, NULL, NULL, 'Friesland');
@@ -678,91 +763,6 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1701, 'LB', NULL, NULL, NULL, 'Limburg');
 
 
--- Provinces Maroc - Moroco (id country=12)
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA', 1209, '', 0, '', 'Province de Benslimane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA1', 1209, '', 0, '', 'Province de Berrechid', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA2', 1209, '', 0, '', 'Province de Khouribga', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA3', 1209, '', 0, '', 'Province de Settat', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA4', 1210, '', 0, '', 'Province d''El Jadida', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA5', 1210, '', 0, '', 'Province de Safi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA6', 1210, '', 0, '', 'Province de Sidi Bennour', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA7', 1210, '', 0, '', 'Province de Youssoufia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA6B', 1205, '', 0, '', 'Préfecture de Fès', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA7B', 1205, '', 0, '', 'Province de Boulemane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA8', 1205, '', 0, '', 'Province de Moulay Yacoub', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA9', 1205, '', 0, '', 'Province de Sefrou', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA8A', 1202, '', 0, '', 'Province de Kénitra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA9A', 1202, '', 0, '', 'Province de Sidi Kacem', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA10', 1202, '', 0, '', 'Province de Sidi Slimane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA11', 1208, '', 0, '', 'Préfecture de Casablanca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA12', 1208, '', 0, '', 'Préfecture de Mohammédia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA13', 1208, '', 0, '', 'Province de Médiouna', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA14', 1208, '', 0, '', 'Province de Nouaceur', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA15', 1214, '', 0, '', 'Province d''Assa-Zag', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA16', 1214, '', 0, '', 'Province d''Es-Semara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA17A', 1214, '', 0, '', 'Province de Guelmim', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA18', 1214, '', 0, '', 'Province de Tata', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19', 1214, '', 0, '', 'Province de Tan-Tan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA15', 1215, '', 0, '', 'Province de Boujdour', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA16', 1215, '', 0, '', 'Province de Lâayoune', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA17', 1215, '', 0, '', 'Province de Tarfaya', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA18', 1211, '', 0, '', 'Préfecture de Marrakech', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19', 1211, '', 0, '', 'Province d''Al Haouz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA20', 1211, '', 0, '', 'Province de Chichaoua', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA21', 1211, '', 0, '', 'Province d''El Kelâa des Sraghna', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA22', 1211, '', 0, '', 'Province d''Essaouira', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA23', 1211, '', 0, '', 'Province de Rehamna', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA24', 1206, '', 0, '', 'Préfecture de Meknès', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA25', 1206, '', 0, '', 'Province d’El Hajeb', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA26', 1206, '', 0, '', 'Province d''Errachidia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA27', 1206, '', 0, '', 'Province d’Ifrane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA28', 1206, '', 0, '', 'Province de Khénifra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA29', 1206, '', 0, '', 'Province de Midelt', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA30', 1204, '', 0, '', 'Préfecture d''Oujda-Angad', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA31', 1204, '', 0, '', 'Province de Berkane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA32', 1204, '', 0, '', 'Province de Driouch', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA33', 1204, '', 0, '', 'Province de Figuig', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA34', 1204, '', 0, '', 'Province de Jerada', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA35', 1204, '', 0, '', 'Province de Nador', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA36', 1204, '', 0, '', 'Province de Taourirt', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA37', 1216, '', 0, '', 'Province d''Aousserd', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA38', 1216, '', 0, '', 'Province d''Oued Ed-Dahab', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA39', 1207, '', 0, '', 'Préfecture de Rabat', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA40', 1207, '', 0, '', 'Préfecture de Skhirat-Témara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA41', 1207, '', 0, '', 'Préfecture de Salé', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA42', 1207, '', 0, '', 'Province de Khémisset', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA43', 1213, '', 0, '', 'Préfecture d''Agadir Ida-Outanane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA44', 1213, '', 0, '', 'Préfecture d''Inezgane-Aït Melloul', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA45', 1213, '', 0, '', 'Province de Chtouka-Aït Baha', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA46', 1213, '', 0, '', 'Province d''Ouarzazate', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA47', 1213, '', 0, '', 'Province de Sidi Ifni', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA48', 1213, '', 0, '', 'Province de Taroudant', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA49', 1213, '', 0, '', 'Province de Tinghir', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA50', 1213, '', 0, '', 'Province de Tiznit', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA51', 1213, '', 0, '', 'Province de Zagora', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA52', 1212, '', 0, '', 'Province d''Azilal', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA53', 1212, '', 0, '', 'Province de Beni Mellal', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA54', 1212, '', 0, '', 'Province de Fquih Ben Salah', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA55', 1201, '', 0, '', 'Préfecture de M''diq-Fnideq', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA56', 1201, '', 0, '', 'Préfecture de Tanger-Asilah', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA57', 1201, '', 0, '', 'Province de Chefchaouen', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA58', 1201, '', 0, '', 'Province de Fahs-Anjra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA59', 1201, '', 0, '', 'Province de Larache', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA60', 1201, '', 0, '', 'Province d''Ouezzane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA61', 1201, '', 0, '', 'Province de Tétouan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA62', 1203, '', 0, '', 'Province de Guercif', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA63', 1203, '', 0, '', 'Province d''Al Hoceïma', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA64', 1203, '', 0, '', 'Province de Taounate', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA65', 1203, '', 0, '', 'Province de Taza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA6A', 1205, '', 0, '', 'Préfecture de Fès', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA7A', 1205, '', 0, '', 'Province de Boulemane', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA15A', 1214, '', 0, '', 'Province d''Assa-Zag', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA16A', 1214, '', 0, '', 'Province d''Es-Semara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA18A', 1211, '', 0, '', 'Préfecture de Marrakech', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19A', 1214, '', 0, '', 'Province de Tan-Tan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES('MA19B', 1214, '', 0, '', 'Province de Tan-Tan', 1);
-
-
 -- Panama - 10 Provinces (id country=178)
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-1', '', 0, '', 'Bocas del Toro');
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-2', '', 0, '', 'Coclé');

From 5408671f8e71c7fa6dae3e3e5f3dc1934dba5451 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 2 May 2021 13:44:06 +0200
Subject: [PATCH 547/928] Update llx_10_c_regions.sql

Morocco - changed its regions in 2015
insert at first only a comment

check how to change for migration of old user datasets
---
 htdocs/install/mysql/data/llx_10_c_regions.sql | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index d55455a215a..daf6e16ea9e 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -327,7 +327,22 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 1
 insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 154, 15401, '', 0, 'Mexique');
 
 
--- Morocco / Maroc - Regions (id country=12)
+-- Morocco / Maroc - Regions since 2015 (id country=12)
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1201, '', 0, 'Tanger-Tétouan-Al Hoceima');
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1202, '', 0, 'Oriental');
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1203, '', 0, 'Fès-Meknès');                                                                
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1204, '', 0, 'Rabat-Salé-Kénitra');
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1205, '', 0, 'Béni Mellal-Khénifra');
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1206, '', 0, 'Casablanca-Settat');
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1207, '', 0, 'Marrakech-Safi');
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1208, '', 0, 'Drâa-Tafilalet');
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1209, '', 0, 'Souss-Massa');
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1210, '', 0, 'Guelmim-Oued Noun');
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1211, '', 0, 'Laâyoune-Sakia El Hamra');
+-- INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1212, '', 0, 'Dakhla-Oued Ed Dahab');
+
+
+-- Morocco / Maroc - History 1997-2015 - Regions 13 +3 of Moroccan Sahara (id country=12)
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1201, '', 0, 'Tanger-Tétouan');
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1202, '', 0, 'Gharb-Chrarda-Beni Hssen');
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1203, '', 0, 'Taza-Al Hoceima-Taounate');
@@ -346,6 +361,7 @@ INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values (
 INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 12, 1216, '', 0, 'Oued Ed-Dahab Lagouira');
 
 
+
 -- Netherlands Regions (id country=17)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 17, 1701, '', 0,'Provincies van Nederland ');
 

From 81768984303fb8d69efd85f5d180c4de5f3d9010 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 14:31:03 +0200
Subject: [PATCH 548/928] Fix lang

---
 htdocs/core/tpl/filemanager.tpl.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index c98dcec2a43..bf5a33c22fc 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -171,6 +171,8 @@ if ($action == 'delete_section') {
 
 // Ask confirmation to build webp images
 if ($action == 'confirmconvertimgwebp') {
+	$langs->load("ecm");
+
 	$section_dir=GETPOST('section_dir', 'alpha');
 	$section=GETPOST('section', 'alpha');
 	$form = new Form($db);

From 92c1022b8edce3508dc38ef7b18483df3a265d6e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 14:49:07 +0200
Subject: [PATCH 549/928] Fix duplicate in webp

---
 htdocs/core/tpl/filemanager.tpl.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index bf5a33c22fc..d8bbe0c7cc0 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -197,19 +197,23 @@ if ($action == 'convertimgwebp' && $permtoadd) {
 
 	$regeximgext = getListOfPossibleImageExt();
 
-	$filelist = dol_dir_list($imagefolder, "all", 0, $regeximgext);
+	$filelist = dol_dir_list($imagefolder, "files", 0, $regeximgext);
+
+	$nbconverted = 0;
 
 	foreach ($filelist as $filename) {
 		$filepath = $filename['fullname'];
 		if (!(substr_compare($filepath, 'webp', -strlen('webp')) === 0)) {
 			if (image_format_supported($filepath) == 1) {
-				$filepathnoext = preg_replace("/\..*/", "", $filepath);
+				$filepathnoext = preg_replace("/\.[a-z0-9]+$/i", "", $filepath);
 
 				if (! dol_is_file($filepathnoext.'.webp')) {	// If file does not exists yet
 					$result = dol_imageResizeOrCrop($filepath, 0, 0, 0, 0, 0, $filepathnoext.'.webp', 90);
 					if (!dol_is_file($result)) {
 						$error++;
 						setEventMessages($result, null, 'errors');
+					} else {
+						$nbconverted++;
 					}
 				}
 			}

From 39f7d0bed83e897a3c92cf8487e309fbd176caf4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 15:15:27 +0200
Subject: [PATCH 550/928] Fix conversion of images

---
 htdocs/core/lib/images.lib.php | 69 +++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 25833df624f..311fa0049b2 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -182,10 +182,13 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 
 	$filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
 
-	$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
+	$infoImg = getimagesize($filetoread); 			// Get data about src image
 	$imgWidth = $infoImg[0]; // Largeur de l'image
 	$imgHeight = $infoImg[1]; // Hauteur de l'image
 
+	$imgTargetName = ($filetowrite ? $filetowrite : $file);
+	$infoImgTarget = getimagesize($imgTargetName); 	// Get data about target image
+
 	if ($mode == 0) {	// If resize, we check parameters
 		if (!empty($filetowrite) && $filetowrite != $file && $newWidth <= 0 && $newHeight <= 0) {
 			$newWidth = $imgWidth;
@@ -214,93 +217,86 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 		case 4:	// IMG_WBMP
 			$imgfonction = 'imagecreatefromwbmp';
 			break;
-		case 17:	// IMG_WBMP
+		case 17: // IMG_WBMP
 			$imgfonction = 'imagecreatefromwebp';
 			break;
 	}
 	if ($imgfonction) {
 		if (!function_exists($imgfonction)) {
 			// Fonctions de conversion non presente dans ce PHP
-			return 'Resize not possible. This PHP does not support GD functions '.$imgfonction;
+			return 'Read of image not possible. This PHP does not support GD functions '.$imgfonction;
 		}
 	}
 
-	// Initialisation des variables selon l'extension de l'image
+	// Read source image file
 	switch ($infoImg[2]) {
 		case 1:	// Gif
 			$img = imagecreatefromgif($filetoread);
 			$extImg = '.gif'; // File name extension of image
-			$newquality = 'NU'; // Quality is not used for this format
 			break;
 		case 2:	// Jpg
 			$img = imagecreatefromjpeg($filetoread);
 			$extImg = '.jpg';
-			$newquality = ($newquality ? $newquality : '100'); // % quality maximum
 			break;
 		case 3:	// Png
 			$img = imagecreatefrompng($filetoread);
 			$extImg = '.png';
-			$newquality = 0; // No compression (0-9)
 			break;
 		case 4:	// Bmp
 			$img = imagecreatefromwbmp($filetoread);
 			$extImg = '.bmp';
-			$newquality = 'NU'; // Quality is not used for this format
 			break;
 		case 18: // Webp
 			$img = imagecreatefromwebp($filetoread);
 			$extImg = '.webp';
-			$newquality = ($newquality ? $newquality : '100'); // % quality maximum
 			break;
 	}
 
-	// Create empty image
+	// Create empty image for target
 	if ($infoImg[2] == 1) {
-		// Compatibilite image GIF
-		$imgThumb = imagecreate($newWidth, $newHeight);
+		// Compatibility image GIF
+		$imgTarget = imagecreate($newWidth, $newHeight);
 	} else {
-		$imgThumb = imagecreatetruecolor($newWidth, $newHeight);
+		$imgTarget = imagecreatetruecolor($newWidth, $newHeight);
 	}
 
 	// Activate antialiasing for better quality
 	if (function_exists('imageantialias')) {
-		imageantialias($imgThumb, true);
+		imageantialias($imgTarget, true);
 	}
 
 	// This is to keep transparent alpha channel if exists (PHP >= 4.2)
 	if (function_exists('imagesavealpha')) {
-		imagesavealpha($imgThumb, true);
+		imagesavealpha($imgTarget, true);
 	}
 
 	// Initialisation des variables selon l'extension de l'image
 	switch ($infoImg[2]) {
 		case 1:	// Gif
-			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
-			imagecolortransparent($imgThumb, $trans_colour);
+			$trans_colour = imagecolorallocate($imgTarget, 255, 255, 255); // On procede autrement pour le format GIF
+			imagecolortransparent($imgTarget, $trans_colour);
 			break;
 		case 2:	// Jpg
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
+			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 0);
 			break;
 		case 3:	// Png
-			imagealphablending($imgThumb, false); // Pour compatibilite sur certain systeme
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127); // Keep transparent channel
+			imagealphablending($imgTarget, false); // Pour compatibilite sur certain systeme
+			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 127); // Keep transparent channel
 			break;
 		case 4:	// Bmp
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
+			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 0);
 			break;
 		case 18: // Webp
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127);
+			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 127);
 			break;
 	}
 	if (function_exists("imagefill")) {
-		imagefill($imgThumb, 0, 0, $trans_colour);
+		imagefill($imgTarget, 0, 0, $trans_colour);
 	}
 
-	dol_syslog("dol_imageResizeOrCrop: convert image from ($imgWidth x $imgHeight) at position ($src_x x $src_y) to ($newWidth x $newHeight) as $extImg, newquality=$newquality");
-	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
-	imagecopyresampled($imgThumb, $img, 0, 0, $src_x, $src_y, $newWidth, $newHeight, ($mode == 0 ? $imgWidth : $newWidth), ($mode == 0 ? $imgHeight : $newHeight)); // Insere l'image de base redimensionnee
-
-	$imgTargetName = ($filetowrite ? $filetowrite : $file);
+	dol_syslog("dol_imageResizeOrCrop: convert image from ($imgWidth x $imgHeight) at position ($src_x x $src_y) to ($newWidth x $newHeight) as $extImg");
+	//imagecopyresized($imgTarget, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
+	imagecopyresampled($imgTarget, $img, 0, 0, $src_x, $src_y, $newWidth, $newHeight, ($mode == 0 ? $imgWidth : $newWidth), ($mode == 0 ? $imgHeight : $newHeight)); // Insere l'image de base redimensionnee
 
 	// Check if permission are ok
 	//$fp = fopen($imgTargetName, "w");
@@ -311,19 +307,24 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	// Create image on disk (overwrite file if exists)
 	switch ($newExt) {
 		case 'gif':	// Gif
-			imagegif($imgThumb, $imgTargetName);
+			$newquality = 'NU'; // Quality is not used for this format
+			imagegif($imgTarget, $imgTargetName);
 			break;
 		case 'jpg':	// Jpg
-			imagejpeg($imgThumb, $imgTargetName, $newquality);
+			$newquality = ($newquality ? $newquality : '100'); // % quality maximum
+			imagejpeg($imgTarget, $imgTargetName, $newquality);
 			break;
 		case 'png':	// Png
-			imagepng($imgThumb, $imgTargetName, $newquality);
+			$newquality = 0; // No compression (0-9)
+			imagepng($imgTarget, $imgTargetName, $newquality);
 			break;
 		case 'bmp':	// Bmp
-			imagewbmp($imgThumb, $imgTargetName);
+			$newquality = 'NU'; // Quality is not used for this format
+			imagewbmp($imgTarget, $imgTargetName);
 			break;
 		case 'webp': // Webp
-			imagewebp($imgThumb, $imgTargetName, $newquality);
+			$newquality = ($newquality ? $newquality : '100'); // % quality maximum
+			imagewebp($imgTarget, $imgTargetName, $newquality);
 			break;
 	}
 
@@ -334,7 +335,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 
 	// Free memory. This does not delete image.
 	imagedestroy($img);
-	imagedestroy($imgThumb);
+	imagedestroy($imgTarget);
 
 	clearstatcache(); // File was replaced by a modified one, so we clear file caches.
 

From efda17657d43cdd6b6cabf197f60adf2be909771 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 15:29:52 +0200
Subject: [PATCH 551/928] Fix conversion in webp

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

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 311fa0049b2..3a0aef1239f 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -217,7 +217,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 		case 4:	// IMG_WBMP
 			$imgfonction = 'imagecreatefromwbmp';
 			break;
-		case 17: // IMG_WBMP
+		case 18: // IMG_WEBP
 			$imgfonction = 'imagecreatefromwebp';
 			break;
 	}
@@ -253,7 +253,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	}
 
 	// Create empty image for target
-	if ($infoImg[2] == 1) {
+	if ($infoImgTarget[2] == 1) {
 		// Compatibility image GIF
 		$imgTarget = imagecreate($newWidth, $newHeight);
 	} else {
@@ -270,8 +270,8 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 		imagesavealpha($imgTarget, true);
 	}
 
-	// Initialisation des variables selon l'extension de l'image
-	switch ($infoImg[2]) {
+	// Set transparent color according to image extension
+	switch ($infoImgTarget[2]) {
 		case 1:	// Gif
 			$trans_colour = imagecolorallocate($imgTarget, 255, 255, 255); // On procede autrement pour le format GIF
 			imagecolortransparent($imgTarget, $trans_colour);

From 6c4d0f439762c395758726793693580ac28cb261 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 15:44:15 +0200
Subject: [PATCH 552/928] css for croping with alpha channel

---
 htdocs/theme/eldy/global.inc.php | 7 +++++++
 htdocs/theme/md/style.css.php    | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index f96844e1655..8002946fa23 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6735,6 +6735,13 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 	font-family: "Font Awesome 5 Free" !important;
 }
 
+/* ============================================================================== */
+/* CSS style used for jCrop                                                       */
+/* ============================================================================== */
+
+.jcrop-holder { background: unset !important; }
+
+
 /* ============================================================================== */
 /* CSS style used for jFlot                                                       */
 /* ============================================================================== */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 17b166d373c..0b09b141258 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6586,6 +6586,14 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 	font-family: "Font Awesome 5 Free" !important;
 }
 
+
+/* ============================================================================== */
+/* CSS style used for jCrop                                                       */
+/* ============================================================================== */
+
+.jcrop-holder { background: unset !important; }
+
+
 /* ============================================================================== */
 /* CSS style used for jFlot                                                       */
 /* ============================================================================== */

From 2bef4472294646bd0505a5b9d68483d67a02a4b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 16:24:52 +0200
Subject: [PATCH 553/928] Clean code

---
 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 b9ba7b96efc..66ceae8a198 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -519,7 +519,7 @@ function dolibarr_del_const($db, $name, $entity = 1)
 	}
 	$sql .= ")";
 	if ($entity >= 0) {
-		$sql .= " AND entity = ".$entity;
+		$sql .= " AND entity = ".((int) $entity);
 	}
 
 	dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);

From 2400da497c9b911677df9f7f74e04aadfdf59cbb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 16:42:22 +0200
Subject: [PATCH 554/928] Exclude binary zip files

---
 htdocs/modulebuilder/template/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/modulebuilder/template/.gitignore b/htdocs/modulebuilder/template/.gitignore
index 150a55149b6..70479d0eb63 100644
--- a/htdocs/modulebuilder/template/.gitignore
+++ b/htdocs/modulebuilder/template/.gitignore
@@ -1,5 +1,6 @@
 # Generated binaries
 /build/*.zip
+/bin/*.zip
 # Doxygen generated documentation
 /build/doxygen/doxygen_warnings.log
 /doc/code/doxygen

From b7954b12e209c3b25b57a4f013249d22e072de8b Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 2 May 2021 18:55:23 +0200
Subject: [PATCH 555/928] Update README.howto

alioth.debian.org is outdated --> https://alioth-archive.debian.org/  -->  https://salsa.debian.org/public
---
 build/debian/README.howto | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index c38a53718ae..45df1e9df70 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -51,16 +51,17 @@ export DEBEMAIL="eldy@destailleur.fr"
 
 export QUILT_PATCHES=debian/patches
 
-# To use Alioth.debian.org
-* Create an account login
-* Update your ~/.ssh/config file to add:
-Host svn.debian.org git.debian.org bzr.debian.org hg.debian.org darcs.debian.org arch.debian.org
+
+# Note: alioth.debian.org is outdated --> https://alioth-archive.debian.org/  -->  https://salsa.debian.org/public 
+ * Create an account login
+ * Update your ~/.ssh/config file to add:
+ Host svn.debian.org git.debian.org bzr.debian.org hg.debian.org darcs.debian.org arch.debian.org
 	User eldy-guest
 	IdentityFile ~/.ssh/id_rsa
-* Check login on page https://alioth.debian.org/users/login
-Ex: https://alioth.debian.org/users/eldy-guest
-* Setup your ssh as described into page: http://wiki.debian.org/Alioth/SSH
-* Ask to be included into project collab-maint: http://alioth.debian.org/projects/collab-maint/
+ * Check login on page https://alioth.debian.org/users/login
+ Ex: https://alioth.debian.org/users/eldy-guest
+ * Setup your ssh as described into page: http://wiki.debian.org/Alioth/SSH
+ * Ask to be included into project collab-maint: http://alioth.debian.org/projects/collab-maint/
 
 
 
@@ -82,7 +83,7 @@ Ex: https://alioth.debian.org/users/eldy-guest
 # dpkg -c package.deb                    List content of package
 # dpkg -I package.deb                    Give informations on package
 # dpkg -i package.deb                    Install a package
-# dpkg-reconfigure -plow package		 Reconfigure package
+# dpkg-reconfigure -plow package         Reconfigure package
 # dpkg -L packagename                    List content of installed package 
 # dpkg -r packagename                    Remove config files and interactive saved answers
 # dpkg -s packagename                    Give status of installed package
@@ -90,7 +91,7 @@ Ex: https://alioth.debian.org/users/eldy-guest
 #
 # dpkg-buildpackage -us -uc              Build a source and binary package
 #
-# gdebi package.deb						 Install a package + dependencies
+# gdebi package.deb                      Install a package + dependencies
 
 
 
@@ -98,21 +99,21 @@ Ex: https://alioth.debian.org/users/eldy-guest
 
 - Post an ITP with reportbugs :
 > reportbug -B debian --email username@domain.tld wnpp
-See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.
+See page https://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.
 
 - Wait until you received bug number.
   For first ITP submission of Dolibarr, bug id was 634783.
 
 - Check bug is into database by searching with id on 
-  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
+  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
   
 - Add a line for upstream into file changelog with bug number
 
 - Call for a mentor on ML debian-mentors to upload packages
 
 - Once package is uploaded, following URL are available:
-http://packages.qa.debian.org/package.html
-http://bugs.debian.org/package
+https://packages.qa.debian.org/package.html
+https://bugs.debian.org/package
 
 
 ##### Modify severity of a bug ticket

From 0aef431c2a3f2a407ed642b24d4fc2cf37eab838 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 May 2021 18:56:40 +0200
Subject: [PATCH 556/928] Move language keys

---
 htdocs/langs/en_US/products.lang | 2 ++
 htdocs/langs/en_US/stocks.lang   | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 0875be0dc07..9638dfe5a25 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -396,3 +396,5 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+PMPValue=Weighted average price
+PMPValueShort=WAP
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 8654e9c5b11..5960f900cca 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -56,8 +56,6 @@ UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
 StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product

From 8bc23088b1517f241fef8187ba11edc4034da1b2 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 2 May 2021 19:22:52 +0200
Subject: [PATCH 557/928] Update README

http://www.trustonme.net/didactels/273.html  is empty
fedoraproject.org  has been moved
---
 build/rpm/README | 64 ++++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/build/rpm/README b/build/rpm/README
index 99f871e882a..ab7be252ccb 100644
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -3,48 +3,54 @@ README (English)
 RPM Package tools
 ##################################################
 
-This directory contains files used by makepack-dolibarr.pl
-script to build a package, ready to be distributed,
-with format RPM (for Redhat, OpenSuse, Mandriva, ...).
+This directory contains files used by makepack-dolibarr.pl script to build a package, 
+ready to be distributed with format RPM (https://rpm.org)
+for Linux Distributions like Redhat, Fedora, CentOS, OpenSuse, OpenMandriva, Mageia ...
 
 
 # This is standard command to work on RPM packaging:
-#
+
 # To install all packagers tools:
-# Fedora: yum -y install rpmlint fedora-packager mock koji hunspell-en hunspell-es hunspell-fr hunspell-it
-# OpenSuse: yast --install update-desktop-files
-#
+ - Fedora: yum -y install rpmlint fedora-packager mock koji hunspell-en hunspell-es hunspell-fr hunspell-it
+ - OpenSuse: yast --install update-desktop-files
+
 # rpmlint file.rpm				    Test a package
 # mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm
-#
+
+
 # On Fedora
-# rpm -i --test dolibarr-...rpm     To list dependencies of RPM   
-# yum -v install dolibarr-...rpm       To install package and dependencies   
-# yum -v erase dolibarr                To remove package
-# chcon -R -h -t httpd_sys_script_rw_t /file					To add temporary context rw for httpd on /file    
-# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" 	To add persistent context rw for httpd on /dir (this add file_contexts.local)
-# restorecon -R -v /file			Restore values into files (cancel chcon, validate semanage)    
-#
+# =========
+# rpm -i --test dolibarr-...rpm                   to list dependencies of RPM 
+# yum -v install dolibarr-...rpm                  to install package and dependencies 
+# yum -v erase dolibarr                           to remove package 
+# chcon -R -h -t httpd_sys_script_rw_t /file			to add temporary context rw for httpd on /file 
+# restorecon -R -v /file			                    to restore values into files (cancel chcon, validate semanage) 
+# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" 	to add persistent context rw for httpd on /dir (this add file_contexts.local)
+
+
 # On OpenSuse
-# zypper install dolibarr-...rpm    To install package and dependencies
-# zypper remove  dolibarr           To remove package
-# zypper search  xxx                To search a package
-#
+# ===========
+# zypper install dolibarr-...rpm     to install package and dependencies
+# zypper remove  dolibarr            to remove package
+# zypper search  xxx                 to search a package
+
+
 # On Mageia (after su - root)
-# urpmi dolibarr-...rpm             To install package and dependencies
-# urpme dolibarr                    To remove package
+# ===========================
+# urpmi dolibarr-...rpm              to install package and dependencies
+# urpme dolibarr                     to remove package
 #
-# More on rpm on page http://www.trustonme.net/didactels/273.html
 
 
 To submit a package to Fedora:
-- Create account on bugzilla.redhat.com
-- Create account on fedoraproject.org
-- Create SRPMS package.
-- Upload package onf http://fedorapeople.org
-- Create a bug with form https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review
+- Create account on       https://bugzilla.redhat.com
+- Create account on       https://developer.fedoraproject.org/
+- Create SRPMS package
+- Upload package on       https://fedorapeople.org
+- Create a bug with form  https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review
+
 This is example of content of review field (used for Bug 723326 - https://bugzilla.redhat.com/show_bug.cgi?id=723326):
-SRPMS URL: http://www.dolibarr.org/files/fedora/dolibarr-x.y.z-xxx.src.rpm
+SRPMS URL: https://www.dolibarr.org/files/fedora/dolibarr-x.y.z-xxx.src.rpm
 Description:  Dolibarr ERP & CRM is an easy to use open source/free software
 for small and medium companies, foundations or freelances. It includes
 different features for Enterprise Resource Planning (ERP) and Customer
@@ -56,4 +62,4 @@ is my first package to maintain myself. So i'm seeking a sponsor.
 - Install fedora packager tools: yum install fedora-packager
 - Setup fedora packagers tools: fedora-packager-setup
 - Send your package: koji build --scratch f16 path_to_source_RPM
-- Check if package is available: http://koji.fedoraproject.org/koji/  
\ No newline at end of file
+- Check if package is available:  https://koji.fedoraproject.org/koji/

From d74359a4e46a9cb7a5fe3ae61047c6f00fd3b729 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 2 May 2021 19:28:58 +0200
Subject: [PATCH 558/928] Create REAME

---
 build/phpstan/REAME | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 build/phpstan/REAME

diff --git a/build/phpstan/REAME b/build/phpstan/REAME
new file mode 100644
index 00000000000..4ecde9baca5
--- /dev/null
+++ b/build/phpstan/REAME
@@ -0,0 +1,9 @@
+PHPStan 
+
+https://phpstan.org 
+
+PHPStan requires PHP >= 7.1
+
+Install:  composer require --dev phpstan/phpstan
+
+Config File:  phpstan.neon

From 972776819290ef76ec38eb5ea967fa2835faa484 Mon Sep 17 00:00:00 2001
From: Indelog <maxime@indelog.fr>
Date: Mon, 3 May 2021 09:46:51 +0200
Subject: [PATCH 559/928] Fix show table of pdf payments repports in file order

Use scandir() rather opendir() and readdir() to get a sorted list of
files.
---
 htdocs/compta/paiement/rapport.php | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 0af202016df..7670e03d094 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -136,7 +136,6 @@ if ($year)
 {
 	if (is_dir($dir.'/'.$year))
 	{
-		$handle = opendir($dir.'/'.$year);
 
 		if ($found) print '<br>';
 		print '<br>';
@@ -147,22 +146,17 @@ if ($year)
 		print '<td class="right">'.$langs->trans("Date").'</td>';
 		print '</tr>';
 
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (preg_match('/^payment/i', $file))
-				{
-					$tfile = $dir.'/'.$year.'/'.$file;
-					$relativepath = $year.'/'.$file;
-					print '<tr class="oddeven">';
-					print '<td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_paiement', $relativepath, 0).'</td>';
-					print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
-					print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td>';
-					print '</tr>';
-				}
+		$files = (scandir($dir.'/'.$year));
+		foreach ($files as $f) {
+			$tfile = $dir.'/'.$year.'/'.$f;
+			$relativepath = $year.'/'.$f;
+			if (is_file($tfile)) {
+				print '<tr class="oddeven">';
+				print '<td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$f.'</a>'.$formfile->showPreview($f, 'facture_paiement', $relativepath, 0).'</td>';
+				print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
+				print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td>';
+				print '</tr>';
 			}
-			closedir($handle);
 		}
 		print '</table>';
 	}

From 2a47128e2d056aa762d19179fb7b535b55147378 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 11:00:41 +0200
Subject: [PATCH 560/928] Code comment

---
 htdocs/accountancy/customer/index.php | 2 +-
 htdocs/core/lib/company.lib.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 6874aacb58a..d33f5e12312 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -170,7 +170,7 @@ if ($action == 'validatehistory') {
 		while ($i < min($num_lines, 10000)) {	// No more than 10000 at once
 			$objp = $db->fetch_object($result);
 
-			$isBuyerInEEC = isInEEC($objp);
+			$isBuyerInEEC = isInEEC($objp);	// This make a database request but there is a cache into $conf->cache['country_code_in_EEC']
 
 			// Level 2: Search suggested account for product/service (similar code exists in page list.php to make manual binding)
 			$suggestedaccountingaccountfor = '';
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d197b687876..3a61ea21efb 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -754,7 +754,7 @@ function isInEEC($object)
 		return false;
 	}
 
-	$country_code_in_EEC = getCountriesInEEC();
+	$country_code_in_EEC = getCountriesInEEC();		// This make a database call but there is a cache done into $conf->cache['country_code_in_EEC']
 
 	//print "dd".$object->country_code;
 	return in_array($object->country_code, $country_code_in_EEC);

From 3209be7d3d9ce94a5b670498466b07b63cfb965e Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 3 May 2021 11:19:17 +0200
Subject: [PATCH 561/928] Create EORI.info

---
 dev/resources/prof-id/EORI.info | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 dev/resources/prof-id/EORI.info

diff --git a/dev/resources/prof-id/EORI.info b/dev/resources/prof-id/EORI.info
new file mode 100644
index 00000000000..13ff095c693
--- /dev/null
+++ b/dev/resources/prof-id/EORI.info
@@ -0,0 +1,6 @@
+EORI
+
+https://en.wikipedia.org/wiki/EORI_number
+
+in Dolibarr avaiable since v13 
+- it is set to field 'profid5'

From 9c0d4dd86bbb57f9cef14a69e238a2c8a6f1a299 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 11:31:16 +0200
Subject: [PATCH 562/928] Small performance enhancement for transfer in
 accountancy.

---
 htdocs/accountancy/journal/bankjournal.php           |  2 +-
 htdocs/accountancy/journal/expensereportsjournal.php |  8 +++++---
 htdocs/accountancy/journal/purchasesjournal.php      | 10 ++++++----
 htdocs/accountancy/journal/sellsjournal.php          | 12 +++++++-----
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index e3e2a308cf9..55067905395 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -547,7 +547,7 @@ if (!$error && $action == 'writebookkeeping') {
 					$bookkeeping->fk_docdet = $val["fk_bank"];
 					$bookkeeping->numero_compte = $k;
 
-					$accountingaccount->fetch(null, $k, true);
+					$accountingaccount->fetch(null, $k, true);	// $k is accounting bank account. TODO We should use a cache here to avoid this fetch
 					$bookkeeping->label_compte = $accountingaccount->label;
 
 					$bookkeeping->label_operation = $reflabel;
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 2916d4d1fca..9681ed7eaa0 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -206,6 +206,9 @@ if ($action == 'writebookkeeping') {
 	$now = dol_now();
 	$error = 0;
 
+	$accountingaccountexpense = new AccountingAccount($db);
+	$accountingaccountexpense->fetch(null, $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT, true);
+
 	foreach ($taber as $key => $val) {		// Loop on each expense report
 		$errorforline = 0;
 
@@ -227,10 +230,9 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
 					$bookkeeping->subledger_account = $tabuser[$key]['user_accountancy_code'];
 					$bookkeeping->subledger_label = $tabuser[$key]['name'];
-					$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
 
-					$accountingaccount->fetch(null, $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT, true);
-					$bookkeeping->label_compte = $accountingaccount->label;
+					$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+					$bookkeeping->label_compte = $accountingaccountexpense->label;
 
 					$bookkeeping->label_operation = $tabuser[$key]['name'];
 					$bookkeeping->montant = $mt;
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 018cba4ca89..a09b9c305f3 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -248,7 +248,7 @@ foreach ($tabfac as $key => $val) {		// Loop on each invoice
 	$sql = "SELECT COUNT(fd.rowid) as nb";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
 	$sql .= " WHERE fd.product_type <= 2 AND fd.fk_code_ventilation <= 0";
-	$sql .= " AND fd.total_ttc <> 0 AND fk_facture_fourn = ".$key;
+	$sql .= " AND fd.total_ttc <> 0 AND fk_facture_fourn = ".((int) $key);
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
@@ -270,6 +270,9 @@ if ($action == 'writebookkeeping') {
 
 	$companystatic = new Societe($db);
 	$invoicestatic = new FactureFournisseur($db);
+	$accountingaccountsupplier = new AccountingAccount($db);
+
+	$accountingaccountsupplier->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER, true);
 
 	foreach ($tabfac as $key => $val) {		// Loop on each invoice
 		$errorforline = 0;
@@ -333,10 +336,9 @@ if ($action == 'writebookkeeping') {
 				$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 				$bookkeeping->subledger_account = $tabcompany[$key]['code_compta_fournisseur'];
 				$bookkeeping->subledger_label = $tabcompany[$key]['name'];
-				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 
-				$accountingaccount->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER, true);
-				$bookkeeping->label_compte = $accountingaccount->label;
+				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
+				$bookkeeping->label_compte = $accountingaccountsupplier->label;
 
 				$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref_supplier.' - '.$langs->trans("SubledgerAccount");
 				$bookkeeping->montant = $mt;
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index a9b6f17a9bd..c596df5ec7a 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -148,7 +148,7 @@ if ($in_bookkeeping == 'notyet') {
 	// $sql .= " AND fd.rowid NOT IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";		// Useless, we save one line for all products with same account
 }
 $sql .= " ORDER BY f.datef";
-//print $sql;
+//print $sql; exit;
 
 dol_syslog('accountancy/journal/sellsjournal.php', LOG_DEBUG);
 $result = $db->query($sql);
@@ -264,7 +264,7 @@ foreach ($tabfac as $key => $val) {		// Loop on each invoice
 	$sql = "SELECT COUNT(fd.rowid) as nb";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 	$sql .= " WHERE fd.product_type <= 2 AND fd.fk_code_ventilation <= 0";
-	$sql .= " AND fd.total_ttc <> 0 AND fk_facture = ".$key;
+	$sql .= " AND fd.total_ttc <> 0 AND fk_facture = ".((int) $key);
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
@@ -285,6 +285,9 @@ if ($action == 'writebookkeeping') {
 
 	$companystatic = new Societe($db);
 	$invoicestatic = new Facture($db);
+	$accountingaccountcustomer = new AccountingAccount($db);
+
+	$accountingaccountcustomer->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER, true);
 
 	foreach ($tabfac as $key => $val) {		// Loop on each invoice
 		$errorforline = 0;
@@ -346,10 +349,9 @@ if ($action == 'writebookkeeping') {
 				$bookkeeping->thirdparty_code = $companystatic->code_client;
 				$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 				$bookkeeping->subledger_label = $tabcompany[$key]['name'];
-				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 
-				$accountingaccount->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER, true);
-				$bookkeeping->label_compte = $accountingaccount->label;
+				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+				$bookkeeping->label_compte = $accountingaccountcustomer->label;
 
 				$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$langs->trans("SubledgerAccount");
 				$bookkeeping->montant = $mt;

From d7e445efbd8e459860169b4fed4f1ac5e20df7a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 12:01:26 +0200
Subject: [PATCH 563/928] Better doc

---
 htdocs/accountancy/admin/index.php         |  4 +++-
 htdocs/accountancy/journal/bankjournal.php | 10 +++++++---
 htdocs/langs/en_US/accountancy.lang        |  2 +-
 htdocs/langs/en_US/admin.lang              |  1 +
 htdocs/user/class/user.class.php           |  5 ++++-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index a0764a97af2..24d31acddd6 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -302,7 +302,9 @@ if (!empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
 print '</tr>';
 
 print '<tr class="oddeven">';
-print '<td>'.$langs->trans("ACCOUNTANCY_COMBO_FOR_AUX").'</td>';
+print '<td>'.$langs->trans("ACCOUNTANCY_COMBO_FOR_AUX");
+print ' - <span class="opacitymedium">'.$langs->trans("NotRecommended").'</span>';
+print '</td>';
 
 if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
 	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTANCY_COMBO_FOR_AUX&value=0">';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 55067905395..edb5e209df7 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -120,7 +120,8 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 $sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type, b.fk_account,";
 $sql .= " ba.courant, ba.ref as baref, ba.account_number, ba.fk_accountancy_journal,";
 $sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, soc.email as email, bu1.type as typeop_company,";
-$sql .= " u.accountancy_code, u.rowid as userid, u.lastname as lastname, u.firstname as firstname, u.email as useremail, bu2.type as typeop_user,";
+$sql .= " u.accountancy_code, u.rowid as userid, u.lastname as lastname, u.firstname as firstname, u.email as useremail, u.statut as userstatus,";
+$sql .= " bu2.type as typeop_user,";
 $sql .= " bu3.type as typeop_payment, bu4.type as typeop_payment_supplier";
 $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 $sql .= " JOIN ".MAIN_DB_PREFIX."bank_account as ba on b.fk_account=ba.rowid";
@@ -259,7 +260,8 @@ if ($result) {
 			'lastname' => $obj->lastname,
 			'firstname' => $obj->firstname,
 			'email' => $obj->useremail,
-			'accountancy_code' => $compta_user
+			'accountancy_code' => $compta_user,
+			'status' => $obj->userstatus
 		);
 
 		// Variable bookkeeping ($obj->rowid is Bank Id)
@@ -328,8 +330,10 @@ if ($result) {
 					$userstatic->email = $tabuser[$obj->rowid]['email'];
 					$userstatic->firstname = $tabuser[$obj->rowid]['firstname'];
 					$userstatic->lastname = $tabuser[$obj->rowid]['lastname'];
+					$userstatic->statut = $tabuser[$obj->rowid]['status'];
+					$userstatic->accountancy_code = $tabuser[$obj->rowid]['accountancy_code'];
 					if ($userstatic->id > 0) {
-						$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, '', 30);
+						$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
 					} else {
 						$tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
 					}
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 692c447d610..237c85fe0f9 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -158,7 +158,7 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 720532a066e..fcd9e1be0cd 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2123,6 +2123,7 @@ YouShouldDisablePHPFunctions=You should disable PHP functions
 IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
+NotRecommended=Not recommanded
 ARestrictedPath=A restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 7de7eb5f0bb..de7fad9f133 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2366,7 +2366,7 @@ class User extends CommonObject
 	 * 	Use this->id,this->lastname, this->firstname
 	 *
 	 *	@param	int		$withpictoimg				Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
-	 *	@param	string	$option						On what the link point to ('leave', 'nolink', )
+	 *	@param	string	$option						On what the link point to ('leave', 'accountancy', 'nolink', )
 	 *  @param  integer $infologin      			0=Add default info tooltip, 1=Add complete info tooltip, -1=No info tooltip
 	 *  @param	integer	$notooltip					1=Disable tooltip on picto and name
 	 *  @param	int		$maxlen						Max length of visible user name
@@ -2417,6 +2417,9 @@ class User extends CommonObject
 		if (!empty($this->admin)) {
 			$label .= '<br><b>'.$langs->trans("Administrator").'</b>: '.yn($this->admin);
 		}
+		if (!empty($this->accountancy_code) || $option == 'accountancy') {
+			$label .= '<br><b>'.$langs->trans("AccountancyCode").'</b>: '.$this->accountancy_code;
+		}
 		$company = '';
 		if (!empty($this->socid)) {	// Add thirdparty for external users
 			$thirdpartystatic = new Societe($db);

From 18cbe4c93b5ba206fad21c4eb2a465ac14db41e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 12:28:29 +0200
Subject: [PATCH 564/928] Doc

---
 dev/translation/README | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/translation/README b/dev/translation/README
index 8d6954878b5..3ceedcd4b82 100644
--- a/dev/translation/README
+++ b/dev/translation/README
@@ -17,3 +17,7 @@ for Linux OS
 to install or to update transifex client: 
 sudo pip install --upgrade transifex-client
 
+
+Comparison of Terms between ERPs
+---------------------------------
+https://wiki.dolibarr.org/index.php?title=Comparison_of_Terms_between_ERPs

From 39e27b6f384c9a18a6b88480064992ccefc6ccca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 12:32:31 +0200
Subject: [PATCH 565/928] Minor perf enhancement

---
 htdocs/accountancy/bookkeeping/list.php       |  12 +-
 .../core/class/html.formaccounting.class.php  | 109 ++++++++++--------
 2 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 498c513b761..e5edeaa0852 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -750,10 +750,10 @@ if (!empty($arrayfields['t.doc_ref']['checked'])) {
 if (!empty($arrayfields['t.numero_compte']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<div class="nowrap">';
-	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), array(), 1, 1, 'maxwidth200', 1);
+	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), array(), 1, 1, 'maxwidth200', 'account');
 	print '</div>';
 	print '<div class="nowrap">';
-	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), array(), 1, 1, 'maxwidth200', 1);
+	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), array(), 1, 1, 'maxwidth200', 'account');
 	print '</div>';
 	print '</td>';
 }
@@ -764,8 +764,8 @@ if (!empty($arrayfields['t.subledger_account']['checked'])) {
 	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 	// use setup of keypress to select thirdparty and this hang browser on large database.
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-		print $langs->trans('From').' ';
-		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+		//print $langs->trans('From').' ';
+		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', $langs->trans('From'), 'maxwidth250', 'subledgeraccount');
 	} else {
 		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'" placeholder="'.$langs->trans("From").'">';
 	}
@@ -774,8 +774,8 @@ if (!empty($arrayfields['t.subledger_account']['checked'])) {
 	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 	// use setup of keypress to select thirdparty and this hang browser on large database.
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-		print $langs->trans('to').' ';
-		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+		//print $langs->trans('to').' ';
+		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', $langs->trans('to'), 'maxwidth250', 'subledgeraccount');
 	} else {
 		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'" placeholder="'.$langs->trans("to").'">';
 	}
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index afbda03be8e..a57e39f1779 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -32,7 +32,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
  */
 class FormAccounting extends Form
 {
-
 	private $options_cache = array();
 
 	/**
@@ -87,7 +86,7 @@ class FormAccounting extends Form
 			$sql .= " WHERE active = 1";
 			$sql .= " AND entity = ".$conf->entity;
 			if ($nature && is_numeric($nature)) {
-				$sql .= " AND nature = ".$nature;
+				$sql .= " AND nature = ".((int) $nature);
 			}
 			$sql .= " ORDER BY code";
 
@@ -167,7 +166,7 @@ class FormAccounting extends Form
 			$sql .= " WHERE active = 1";
 			$sql .= " AND entity = ".$conf->entity;
 			if ($nature && is_numeric($nature)) {
-				$sql .= " AND nature = ".$nature;
+				$sql .= " AND nature = ".((int) $nature);
 			}
 			$sql .= " ORDER BY code";
 
@@ -435,67 +434,77 @@ class FormAccounting extends Form
 	/**
 	 * Return list of auxilary accounts. Cumulate list from customers, suppliers and users.
 	 *
-	 * @param string   $selectid       Preselected pcg_type
-	 * @param string   $htmlname       Name of field in html form
-	 * @param int      $showempty      Add an empty field
-	 * @param string   $morecss        More css
-	 * @return string                  String with HTML select
+	 * @param string   		$selectid       Preselected pcg_type
+	 * @param string   		$htmlname       Name of field in html form
+	 * @param int|string    $showempty      Add an empty field
+	 * @param string   		$morecss        More css
+	 * @param string   		$usecache       Key to use to store result into a cache. Next call with same key will reuse the cache.
+	 * @return string       	   			String with HTML select
 	 */
-	public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth250')
+	public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth250', $usecache = '')
 	{
 		// phpcs:enable
 
 		$aux_account = array();
 
-		// Auxiliary thirdparties account
-		$sql = "SELECT code_compta, code_compta_fournisseur, nom as name";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql .= " WHERE entity IN (".getEntity('societe').")";
-		$sql .= " AND client IN (1,3) OR fournisseur = 1";
-
-		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if (!empty($obj->code_compta)) {
-					$aux_account[$obj->code_compta] = $obj->code_compta.' <span class="opacitymedium">('.$obj->name.')</span>';
-				}
-				if (!empty($obj->code_compta_fournisseur)) {
-					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' <span class="opacitymedium">('.$obj->name.')</span>';
-				}
-			}
+		if ($usecache && !empty($this->options_cache[$usecache])) {
+			$aux_account = $aux_account + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0
 		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);
-			return -1;
-		}
+			dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
 
-		ksort($aux_account);
+			// Auxiliary thirdparties account
+			$sql = "SELECT code_compta, code_compta_fournisseur, nom as name";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+			$sql .= " WHERE entity IN (".getEntity('societe').")";
+			$sql .= " AND client IN (1,3) OR fournisseur = 1";
 
-		$this->db->free($resql);
-
-		// Auxiliary user account
-		$sql = "SELECT DISTINCT accountancy_code, lastname, firstname ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user";
-		$sql .= " WHERE entity IN (".getEntity('user').")";
-		$sql .= " ORDER BY accountancy_code";
-		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if (!empty($obj->accountancy_code)) {
-					$aux_account[$obj->accountancy_code] = $obj->accountancy_code.' <span class="opacitymedium">('.dolGetFirstLastname($obj->firstname, $obj->lastname).')</span>';
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				while ($obj = $this->db->fetch_object($resql)) {
+					if (!empty($obj->code_compta)) {
+						$aux_account[$obj->code_compta] = $obj->code_compta.' <span class="opacitymedium">('.$obj->name.')</span>';
+					}
+					if (!empty($obj->code_compta_fournisseur)) {
+						$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' <span class="opacitymedium">('.$obj->name.')</span>';
+					}
 				}
+			} else {
+				$this->error = "Error ".$this->db->lasterror();
+				dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);
+				return -1;
+			}
+
+			ksort($aux_account);
+
+			$this->db->free($resql);
+
+			// Auxiliary user account
+			$sql = "SELECT DISTINCT accountancy_code, lastname, firstname ";
+			$sql .= " FROM ".MAIN_DB_PREFIX."user";
+			$sql .= " WHERE entity IN (".getEntity('user').")";
+			$sql .= " ORDER BY accountancy_code";
+
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				while ($obj = $this->db->fetch_object($resql)) {
+					if (!empty($obj->accountancy_code)) {
+						$aux_account[$obj->accountancy_code] = $obj->accountancy_code.' <span class="opacitymedium">('.dolGetFirstLastname($obj->firstname, $obj->lastname).')</span>';
+					}
+				}
+			} else {
+				$this->error = "Error ".$this->db->lasterror();
+				dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);
+				return -1;
+			}
+			$this->db->free($resql);
+
+			if ($usecache) {
+				$this->options_cache[$usecache] = $aux_account;
 			}
-		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);
-			return -1;
 		}
-		$this->db->free($resql);
 
 		// Build select
-		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+		$out .= Form::selectarray($htmlname, $aux_account, $selectid, ($showempty ? (is_numeric($showempty) ? 1 : $showempty): 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $out;
 	}

From e9ed985e183472f2480fad9e3115e1370eb2df82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 12:47:40 +0200
Subject: [PATCH 566/928] Fix filter

---
 htdocs/accountancy/bookkeeping/list.php | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index e5edeaa0852..a8a24e67d9d 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -72,7 +72,7 @@ if ($search_accountancy_code_end == - 1) {
 	$search_accountancy_code_end = '';
 }
 
-$search_accountancy_aux_code = GETPOST("search_accountancy_aux_code");
+$search_accountancy_aux_code = GETPOST("search_accountancy_aux_code", 'alpha');
 $search_accountancy_aux_code_start = GETPOST('search_accountancy_aux_code_start', 'alpha');
 if ($search_accountancy_aux_code_start == - 1) {
 	$search_accountancy_aux_code_start = '';
@@ -457,12 +457,14 @@ if (count($filter) > 0) {
 			$sqlwhere[] = $key.'=\''.$db->idate($value).'\'';
 		} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 			$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
-		} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
+		} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=') {
 			$sqlwhere[] = $key.'\''.$db->escape($value).'\'';
 		} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 			$sqlwhere[] = $key.'='.$value;
-		} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
+		} elseif ($key == 't.numero_compte') {
 			$sqlwhere[] = $key.' LIKE \''.$db->escape($value).'%\'';
+		} elseif ($key == 't.subledger_account') {
+			$sqlwhere[] = natural_search($key, $value, 0, 1);
 		} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
 			$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
 		} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
@@ -760,26 +762,19 @@ if (!empty($arrayfields['t.numero_compte']['checked'])) {
 // Subledger account
 if (!empty($arrayfields['t.subledger_account']['checked'])) {
 	print '<td class="liste_titre">';
-	print '<div class="nowrap">';
 	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 	// use setup of keypress to select thirdparty and this hang browser on large database.
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
+		print '<div class="nowrap">';
 		//print $langs->trans('From').' ';
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', $langs->trans('From'), 'maxwidth250', 'subledgeraccount');
-	} else {
-		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'" placeholder="'.$langs->trans("From").'">';
-	}
-	print '</div>';
-	print '<div class="nowrap">';
-	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
-	// use setup of keypress to select thirdparty and this hang browser on large database.
-	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-		//print $langs->trans('to').' ';
+		print '</div>';
+		print '<div class="nowrap">';
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', $langs->trans('to'), 'maxwidth250', 'subledgeraccount');
+		print '</div>';
 	} else {
-		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'" placeholder="'.$langs->trans("to").'">';
+		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code" value="'.$search_accountancy_aux_code.'">';
 	}
-	print '</div>';
 	print '</td>';
 }
 // Label operation

From 76a669a13f6430268c2b431622a60634cfe7d915 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 13:12:09 +0200
Subject: [PATCH 567/928] Only en_US must exists into template

---
 .../template/langs/fr_FR/mymodule.lang        | 48 -------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang

diff --git a/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang b/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
deleted file mode 100644
index 20d9cb64259..00000000000
--- a/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) ---Put here your own copyright and developer email---
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-#
-# Générique
-#
-
-# Module label 'ModuleMyModuleName'
-ModuleMyModuleName = Mon module
-# Module description 'ModuleMyModuleDesc'
-ModuleMyModuleDesc = Description de MyModule
-
-#
-# Page d'administration
-#
-MyModuleSetup = Configuration du module MyModule
-Settings = Réglages
-MyModuleSetupPage = Page de configuration du module MyModule
-
-#
-# Page À propos
-#
-About = À propos
-MyModuleAbout = À propos de MyModule
-MyModuleAboutPage = Page à propos de MyModule
-
-#
-# Page d'exemple
-#
-MyPageName = Nom de ma page
-
-#
-# Box d'exemple
-#
-MyWidget = Mon widget
-MyWidgetDescription = Description de mon widget

From a806a1845584ef786bfe28f1daccc769c70bff59 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 13:35:10 +0200
Subject: [PATCH 568/928] Reduce sql

---
 htdocs/accountancy/admin/defaultaccounts.php |  4 ++--
 htdocs/accountancy/customer/list.php         | 12 ++++++------
 htdocs/accountancy/supplier/list.php         | 10 +++++-----
 htdocs/core/class/html.form.class.php        |  9 ++++++---
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 59aeaae06f0..79a5c0975b7 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -169,7 +169,7 @@ foreach ($list_account_main as $key) {
 	print '</td>';
 	// Value
 	print '<td>'; // Do not force class=right, or it align also the content of the select box
-	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accountsmain');
 	print '</td>';
 	print '</tr>';
 }
@@ -186,7 +186,7 @@ foreach ($list_account as $key) {
 		print '<td width="50%">'.$label.'</td>';
 		// Value
 		print '<td>'; // Do not force class=right, or it align also the content of the select box
-		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
 		print '</td>';
 		print '</tr>';
 	}
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index b7f1efbcbc0..4df8d6b9b15 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -475,7 +475,7 @@ if ($result) {
 	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" name="search_vat" placeholder="%" size="1" value="'.dol_escape_htmltag($search_vat).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth75imp" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 	print '<td class="liste_titre">';
-	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth125', 'code2', 1, 0, 1);
+	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth125', 'code2', 1, 0, 1, null, 1);
 	//print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="'.dol_escape_htmltag($search_tvaintra).'"></td>';
@@ -712,8 +712,8 @@ if ($result) {
 		print '<td>'.$objp->tva_intra.'</td>';
 
 		// Found accounts
-		print '<td>';
-		$s = '<span class="small">1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': </span>';
+		print '<td class="small">';
+		$s = '1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
 		$shelp = '';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
 			$shelp .= $langs->trans("SaleEEC");
@@ -724,7 +724,7 @@ if ($result) {
 		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		if ($objp->product_id > 0) {
 			print '<br>';
-			$s = '<span class="small">2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
+			$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
 			$shelp = ''; $ttype = 'help';
 			if ($suggestedaccountingaccountfor == 'eec') {
 				$shelp = $langs->trans("SaleEEC");
@@ -741,7 +741,7 @@ if ($result) {
 		} else {
 			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
 				print '<br>';
-				$s = '<span class="small">2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
+				$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
 				$shelp = '';
 				$s .= $langs->trans("NotDefined");
 				print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
@@ -749,7 +749,7 @@ if ($result) {
 		}
 		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
 			print '<br>';
-			$s = '<span class="small">3. '.(($objp->type_l == 1) ? $langs->trans("ServiceForThisThirdparty") : $langs->trans("ProductForThisThirdparty")).': </span>';
+			$s = '3. '.(($objp->type_l == 1) ? $langs->trans("ServiceForThisThirdparty") : $langs->trans("ProductForThisThirdparty")).': ';
 			$shelp = '';
 			$s .= ($objp->code_sell_t > 0 ? length_accountg($objp->code_sell_t) : '<span style="'.$code_sell_t_notset.'">'.$langs->trans("NotDefined").'</span>');
 			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index cc3430af872..63dd996a546 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -696,8 +696,8 @@ if ($result) {
 		print '<td>'.$objp->tva_intra.'</td>';
 
 		// Found accounts
-		print '<td>';
-		$s = '<span class="small">1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': </span>';
+		print '<td class="small">';
+		$s = '1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
 		$shelp = '';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
 			$shelp .= $langs->trans("SaleEEC");
@@ -708,7 +708,7 @@ if ($result) {
 		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		if ($objp->product_id > 0) {
 			print '<br>';
-			$s = '<span class="small">2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
+			$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
 			$shelp = '';
 			if ($suggestedaccountingaccountfor == 'eec') {
 				$shelp = $langs->trans("SaleEEC");
@@ -719,13 +719,13 @@ if ($result) {
 			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		} else {
 			print '<br>';
-			$s = '<span class="small">2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
+			$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
 			$shelp = '';
 			$s .= $langs->trans("NotDefined");
 			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		}
 		print '<br>';
-		$s = '<span class="small">3. '.(($objp->type_l == 1) ? $langs->trans("ServiceForThisThirdparty") : $langs->trans("ProductForThisThirdparty")).': </span>';
+		$s = '3. '.(($objp->type_l == 1) ? $langs->trans("ServiceForThisThirdparty") : $langs->trans("ProductForThisThirdparty")).': ';
 		$shelp = '';
 		$s .= ($objp->code_buy_t > 0 ? length_accountg($objp->code_buy_t) : '<span style="'.$code_buy_t_notset.'">'.$langs->trans("NotDefined").'</span>');
 		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 044ba439922..d286d9c7188 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -868,9 +868,10 @@ class Form
 	 *  @param	int		$disablefavorites		1=Disable favorites,
 	 *  @param	int		$addspecialentries		1=Add dedicated entries for group of countries (like 'European Economic Community', ...)
 	 *  @param	array	$exclude_country_code	Array of country code (iso2) to exclude
+	 *  @param	int		$hideflags				Hide flags
 	 *  @return string           				HTML string with select
 	 */
-	public function select_country($selected = '', $htmlname = 'country_id', $htmloption = '', $maxlength = 0, $morecss = 'minwidth300', $usecodeaskey = '', $showempty = 1, $disablefavorites = 0, $addspecialentries = 0, $exclude_country_code = array())
+	public function select_country($selected = '', $htmlname = 'country_id', $htmloption = '', $maxlength = 0, $morecss = 'minwidth300', $usecodeaskey = '', $showempty = 1, $disablefavorites = 0, $addspecialentries = 0, $exclude_country_code = array(), $hideflags = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs, $mysoc;
@@ -955,8 +956,10 @@ class Form
 					}
 					if ($row['code_iso']) {
 						$labeltoshow .= ' <span class="opacitymedium">('.$row['code_iso'].')</span>';
-						$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium marginrightonly"');
-						$labeltoshow = $tmpflag.' '.$labeltoshow;
+						if (empty($hideflags)) {
+							$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium marginrightonly"');
+							$labeltoshow = $tmpflag.' '.$labeltoshow;
+						}
 					}
 
 					if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label'])) {

From 42c2fb5736d3ccfb9fcc942c96deefdbdda73986 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 13:47:26 +0200
Subject: [PATCH 569/928] Fix sql error on new filter

---
 htdocs/accountancy/bookkeeping/balance.php    | 20 +++++++++----------
 .../accountancy/class/bookkeeping.class.php   |  3 +--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index bc0cca4cc1b..bc9de743a07 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -254,6 +254,12 @@ if ($action != 'export_csv') {
 	$moreforfilter .= '<label for="show_subgroup">'.$langs->trans('ShowSubtotalByGroup').'</label>: ';
 	$moreforfilter .= '<input type="checkbox" name="show_subgroup" id="show_subgroup" value="show_subgroup"'.($show_subgroup == 'show_subgroup' ? ' checked' : '').'>';
 
+	$moreforfilter .= '</div>';
+
+	$moreforfilter .= '<div class="divsearchfield">';
+
+	$moreforfilter .= $langs->trans("Journal");
+	$moreforfilter .= $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
 
 	$moreforfilter .= '</div>';
 
@@ -266,24 +272,16 @@ if ($action != 'export_csv') {
 		print '</div>';
 	}
 
+
 	$colspan = (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE) ? 5 : 4);
 
 	print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
-	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre">';
-	print $langs->trans('Journals');
-	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
-	print '</td>';
-	print '</tr>';
-
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre" colspan="'.$colspan.'">';
-	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', $langs->trans('From'), array(), 1, 1, '', 'accounts');
 	print ' ';
-	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', $langs->trans('to'), array(), 1, 1, '', 'accounts');
 	print '</td>';
 	print '<td class="liste_titre center">';
 	$searchpicto = $form->showFilterButtons();
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 06ff8d9cb8c..499ace29b8b 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1103,8 +1103,7 @@ class BookKeeping extends CommonObject
 		$sql = 'SELECT';
 		$sql .= " t.numero_compte,";
 		$sql .= " SUM(t.debit) as debit,";
-		$sql .= " SUM(t.credit) as credit,";
-		$sql .= " t.code_journal";
+		$sql .= " SUM(t.credit) as credit";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
 		$sqlwhere = array();

From 6ef463f6887b4cf8475173e7a2cd9a77de692f2a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 13:54:26 +0200
Subject: [PATCH 570/928] Code comment

---
 htdocs/accountancy/bookkeeping/balance.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index bc9de743a07..75283667fcb 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -425,7 +425,8 @@ if ($action != 'export_csv') {
 		} else {
 			print '<td class="nowraponall right">'.price(price2num($line->debit - $line->credit, 'MT')).'</td>';
 		}
-		print '<td class="center">'.$link;
+		print '<td class="center">';
+		print $link;
 		print '</td>';
 		print "</tr>\n";
 

From a27b78300209f128e250da6b9932c10ea136d3af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 13:55:08 +0200
Subject: [PATCH 571/928] Rename REAME to README

---
 build/phpstan/{REAME => README} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename build/phpstan/{REAME => README} (100%)

diff --git a/build/phpstan/REAME b/build/phpstan/README
similarity index 100%
rename from build/phpstan/REAME
rename to build/phpstan/README

From c6a9117a00fa5b7f7669af9aa083dfb4bbc18dbd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 14:03:50 +0200
Subject: [PATCH 572/928] Graph color

---
 htdocs/core/lib/invoice.lib.php      | 2 +-
 htdocs/theme/eldy/theme_vars.inc.php | 1 +
 htdocs/theme/md/theme_vars.inc.php   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 4a1d71de540..6862b6d59e9 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -513,7 +513,7 @@ function getNumberInvoicesPieChart($mode)
 			foreach ($dataseries as $key=>$value) {
 				$total+=$value[1];
 			}
-			$colorseries = array($badgeStatus8,$badgeStatus1,$badgeStatus3,$badgeStatus2,$badgeStatus4,$badgeStatus0);
+			$colorseries = array($badgeStatus8, $badgeStatus1, $badgeStatus3, $badgeStatus2, $badgeStatus4, $badgeStatus11);
 			if ($conf->use_javascript_ajax) {
 				$result = '<div class="div-table-responsive-no-min">';
 				$result .= '<table class="noborder nohover centpercent">';
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 82cbf9cf2a9..16d4b58663b 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -115,6 +115,7 @@ $badgeStatus7 = '#25a580';
 $badgeStatus8 = '#993013';
 $badgeStatus9 = '#e7f0f0';
 $badgeStatus10 = '#993013';
+$badgeStatus11 = '#15a540';
 
 // status color ajustement for color blind
 $colorblind_deuteranopes_badgeStatus4 = $colorblind_deuteranopes_badgeStatus7 = $colorblind_deuteranopes_badgeSuccess; //! text color black
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 617f9d1301e..9e98a863737 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -98,3 +98,4 @@ $badgeStatus7 = '#277d1e';
 $badgeStatus8 = '#993013';
 $badgeStatus9 = '#e7f0f0';
 $badgeStatus10 = '#993013';
+$badgeStatus11 = '#15a540';

From 1c95e2b7c70b72a9e74260b163d9952dd275fcfe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 14:58:29 +0200
Subject: [PATCH 573/928] FIX #17453

---
 htdocs/adherents/class/api_members.class.php  |  2 +-
 .../class/api_memberstypes.class.php          |  2 +-
 .../class/api_subscriptions.class.php         |  2 +-
 htdocs/api/class/api.class.php                | 23 +++++++----
 htdocs/api/class/api_setup.class.php          | 40 +++++++++----------
 htdocs/bom/class/api_boms.class.php           |  2 +-
 .../categories/class/api_categories.class.php |  2 +-
 .../action/class/api_agendaevents.class.php   |  2 +-
 .../comm/propal/class/api_proposals.class.php |  2 +-
 htdocs/commande/class/api_orders.class.php    |  2 +-
 .../bank/class/api_bankaccounts.class.php     |  4 +-
 .../facture/class/api_invoices.class.php      |  2 +-
 htdocs/contrat/class/api_contracts.class.php  |  2 +-
 htdocs/core/class/html.form.class.php         |  2 +-
 htdocs/don/class/api_donations.class.php      |  2 +-
 .../expedition/class/api_shipments.class.php  |  2 +-
 .../class/api_expensereports.class.php        |  2 +-
 .../class/api_interventions.class.php         |  2 +-
 .../class/api_supplier_invoices.class.php     |  2 +-
 .../fourn/class/api_supplier_orders.class.php |  2 +-
 .../template/class/api_mymodule.class.php     |  2 +-
 htdocs/mrp/class/api_mos.class.php            |  2 +-
 htdocs/product/class/api_products.class.php   |  8 ++--
 .../stock/class/api_stockmovements.class.php  |  2 +-
 .../stock/class/api_warehouses.class.php      |  2 +-
 htdocs/projet/class/api_projects.class.php    |  2 +-
 htdocs/projet/class/api_tasks.class.php       |  2 +-
 htdocs/societe/class/api_contacts.class.php   |  2 +-
 .../societe/class/api_thirdparties.class.php  |  2 +-
 .../class/api_supplier_proposals.class.php    |  2 +-
 htdocs/ticket/class/api_tickets.class.php     |  2 +-
 htdocs/user/class/api_users.class.php         |  4 +-
 htdocs/zapier/class/api_zapier.class.php      |  2 +-
 33 files changed, 73 insertions(+), 62 deletions(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 68d161d0cf1..5573961456f 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -240,7 +240,7 @@ class Members extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 5ab9ad8eead..b02a81dc5c9 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -105,7 +105,7 @@ class MembersTypes extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 3758885c4a3..831be2882f1 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -103,7 +103,7 @@ class Subscriptions extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index c760903aca4..7a9dd908a59 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -309,8 +309,9 @@ class DolibarrApi
 	/**
 	 * Function to forge a SQL criteria
 	 *
-	 * @param  array    $matches       Array of found string by regex search. Example: "t.ref:like:'SO-%'" or "t.date_creation:<:'20160101'" or "t.nature:is:NULL"
-	 * @return string                  Forged criteria. Example: "t.field like 'abc%'"
+	 * @param  array    $matches    Array of found string by regex search.
+	 * 								Example: "t.ref:like:'SO-%'" or "t.date_creation:<:'20160101'" or "t.date_creation:<:'2016-01-01 12:30:00'" or "t.nature:is:NULL"
+	 * @return string               Forged criteria. Example: "t.field like 'abc%'"
 	 */
 	protected static function _forge_criteria_callback($matches)
 	{
@@ -321,18 +322,26 @@ class DolibarrApi
 		if (empty($matches[1])) {
 			return '';
 		}
-		$tmp = explode(':', $matches[1]);
+		$tmp = explode(':', $matches[1], 3);
+
 		if (count($tmp) < 3) {
 			return '';
 		}
 
-		$tmpescaped = $tmp[2];
+		$operand = preg_replace('/[^a-z0-9\._]/i', '', trim($tmp[0]));
+
+		$operator = strtoupper(preg_replace('/[^a-z<>=]/i', '', trim($tmp[1])));
+
+		$tmpescaped = trim($tmp[2]);
 		$regbis = array();
-		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {
+		if ($operator == 'IN') {
+			$tmpescaped = "(".$db->sanitize($tmpescaped, 1).")";
+		} elseif (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {
 			$tmpescaped = "'".$db->escape($regbis[1])."'";
 		} else {
-			$tmpescaped = $db->escape($tmpescaped);
+			$tmpescaped = $db->sanitize($db->escape($tmpescaped));
 		}
-		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
+
+		return $db->escape($operand).' '.$db->escape($operator)." ".$tmpescaped;
 	}
 }
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index ceaf5f8f7d8..acd39361842 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -79,7 +79,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -142,7 +142,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -206,7 +206,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -270,7 +270,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -370,7 +370,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -545,7 +545,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
 			}
-				  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+				  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -660,7 +660,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -723,7 +723,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -790,7 +790,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -852,7 +852,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -924,7 +924,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -994,7 +994,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -1067,7 +1067,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -1131,7 +1131,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -1189,7 +1189,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -1248,7 +1248,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -1313,7 +1313,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -1371,7 +1371,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -1429,7 +1429,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -1489,7 +1489,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 1fe104987a3..0eeefda9b3d 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -151,7 +151,7 @@ class Boms extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 65483a561af..158627e274c 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -148,7 +148,7 @@ class Categories extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index c2961db7bbb..fd57dd3c81b 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -161,7 +161,7 @@ class AgendaEvents extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 3c3447f3697..e4b9a266198 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -199,7 +199,7 @@ class Proposals extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 763fb061446..745fea5ab76 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -202,7 +202,7 @@ class Orders extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 762bcc506da..10357155295 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -84,7 +84,7 @@ class BankAccounts extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -441,7 +441,7 @@ class BankAccounts extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index a8f640a61ec..84b4df207a5 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -224,7 +224,7 @@ class Invoices extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index c52aeeb30e8..ea7886f022c 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -150,7 +150,7 @@ class Contracts extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d286d9c7188..625e8e23d57 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6794,7 +6794,7 @@ class Form
 				{
 					throw new RestException(503, 'Error when validating parameter sqlfilters '.$objecttmp->filter);
 				}*/
-				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 				$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'Form::forgeCriteriaCallback', $objecttmp->filter).")";
 			}
 		}
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 2773ab62c14..b960a2fdb8f 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -131,7 +131,7 @@ class Donations extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 1d47921e423..dcd619da76e 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -147,7 +147,7 @@ class Shipments extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 027bb148b3c..907e1001439 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -120,7 +120,7 @@ class ExpenseReports extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 423bb31f348..0c03da526a8 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -154,7 +154,7 @@ class Interventions extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 55518997d5e..34939bb599a 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -162,7 +162,7 @@ class SupplierInvoices extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index c20efa2e651..09c9209629f 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -178,7 +178,7 @@ class SupplierOrders extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 769c1529aff..bc52cf7378f 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -158,7 +158,7 @@ class MyModuleApi extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 48f93976d29..a2558fe6252 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -150,7 +150,7 @@ class Mos extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 0c70af86c9c..3749dae28c5 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -216,7 +216,8 @@ class Products extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			//var_dump($sqlfilters);exit;
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';	// We must accept datc:<:2020-01-01 10:10:10
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -849,9 +850,10 @@ class Products extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
+
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
 			if ($page < 0) {
@@ -975,7 +977,7 @@ class Products extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 90b3895c0f2..9b022a840fc 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -112,7 +112,7 @@ class StockMovements extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 34338232169..806114b73ec 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -119,7 +119,7 @@ class Warehouses extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index c5430b655b1..b0b94264fb0 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -153,7 +153,7 @@ class Projects extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 2c3fd107d53..e3d6af2de53 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -153,7 +153,7 @@ class Tasks extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 5a6513ef6e5..f62fb894bd0 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -219,7 +219,7 @@ class Contacts extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 1de2f436ca7..af9122cba9d 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -205,7 +205,7 @@ class Thirdparties extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index 3e38ac10b41..61ba9c48de3 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -142,7 +142,7 @@ class Supplierproposals extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index f814beb3398..7f2d2cf1be0 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -277,7 +277,7 @@ class Tickets extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index f06cf2c09ba..784a61d5fa8 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -100,7 +100,7 @@ class Users extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -537,7 +537,7 @@ class Users extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index c141588a7f9..db1073c6299 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -199,7 +199,7 @@ class ZapierApi extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 

From be8b866b39df0f2d9e65bab975dd5883dfc8a132 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 15:24:19 +0200
Subject: [PATCH 574/928] Add test to detect bad value for DIRECTION in lang
 file

---
 test/phpunit/LangTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index ad76667d560..99f74dbd4fa 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -184,6 +184,10 @@ class LangTest extends PHPUnit\Framework\TestCase
 			$tmplangs->setDefaultLang($langcode);
 			$tmplangs->load("main");
 
+			$result=$tmplangs->transnoentitiesnoconv("DIRECTION");
+			print __METHOD__." DIRECTION=".$result."\n";
+			$this->assertTrue(in_array($result, array('rtl', 'ltr')), 'Error for vale of DIRECTION in main.lang file '.$code);
+
 			$result=$tmplangs->transnoentitiesnoconv("SeparatorDecimal");
 			print __METHOD__." SeparatorDecimal=".$result."\n";
 			$this->assertContains($result, array('.',',','/',' ','','None'), 'Error for decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported

From 52035287f31bcf27113ed1ad9efd2c84504f177c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 15:29:06 +0200
Subject: [PATCH 575/928] Rename file

---
 dev/resources/{prof-id/EORI.info => iso-normes/EORI.txt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename dev/resources/{prof-id/EORI.info => iso-normes/EORI.txt} (100%)

diff --git a/dev/resources/prof-id/EORI.info b/dev/resources/iso-normes/EORI.txt
similarity index 100%
rename from dev/resources/prof-id/EORI.info
rename to dev/resources/iso-normes/EORI.txt

From 9bf10c50a2f748cc49f66977d85d3aed221095f3 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 3 May 2021 15:29:49 +0200
Subject: [PATCH 576/928] Update llx_20_c_departements.sql

Peru
---
 .../mysql/data/llx_20_c_departements.sql      | 589 ++++++++++++------
 1 file changed, 394 insertions(+), 195 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 1dfb11db9c5..31c2dc3e8b5 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -56,6 +56,7 @@
 -- Netherlands
 -- Morocco
 -- Panama
+-- Peru
 -- Portugal
 -- Romania
 -- Slovenia (need to check code SI-Id)
@@ -776,6 +777,204 @@ INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-13', '', 0, '', 'Panamá Oeste');
 
 
+-- Provinces Peru (id country=181)
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0101', 18101, '', 0, '', 'Chachapoyas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0102', 18101, '', 0, '', 'Bagua');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0103', 18101, '', 0, '', 'Bongará');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0104', 18101, '', 0, '', 'Condorcanqui');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0105', 18101, '', 0, '', 'Luya');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0106', 18101, '', 0, '', 'Rodríguez de Mendoza');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0107', 18101, '', 0, '', 'Utcubamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0201', 18102, '', 0, '', 'Huaraz');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0202', 18102, '', 0, '', 'Aija');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0203', 18102, '', 0, '', 'Antonio Raymondi');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0204', 18102, '', 0, '', 'Asunción');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0205', 18102, '', 0, '', 'Bolognesi');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0206', 18102, '', 0, '', 'Carhuaz');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0207', 18102, '', 0, '', 'Carlos Fermín Fitzcarrald');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0208', 18102, '', 0, '', 'Casma');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0209', 18102, '', 0, '', 'Corongo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0210', 18102, '', 0, '', 'Huari');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0211', 18102, '', 0, '', 'Huarmey');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0212', 18102, '', 0, '', 'Huaylas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0213', 18102, '', 0, '', 'Mariscal Luzuriaga');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0214', 18102, '', 0, '', 'Ocros');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0215', 18102, '', 0, '', 'Pallasca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0216', 18102, '', 0, '', 'Pomabamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0217', 18102, '', 0, '', 'Recuay');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0218', 18102, '', 0, '', 'Papá');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0219', 18102, '', 0, '', 'Sihuas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0220', 18102, '', 0, '', 'Yungay');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0301', 18103, '', 0, '', 'Abancay');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0302', 18103, '', 0, '', 'Andahuaylas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0303', 18103, '', 0, '', 'Antabamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0304', 18103, '', 0, '', 'Aymaraes');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0305', 18103, '', 0, '', 'Cotabambas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0306', 18103, '', 0, '', 'Chincheros');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0307', 18103, '', 0, '', 'Grau');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0401', 18104, '', 0, '', 'Arequipa');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0402', 18104, '', 0, '', 'Camaná');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0403', 18104, '', 0, '', 'Caravelí');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0404', 18104, '', 0, '', 'Castilla');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0405', 18104, '', 0, '', 'Caylloma');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0406', 18104, '', 0, '', 'Condesuyos');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0407', 18104, '', 0, '', 'Islay');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0408', 18104, '', 0, '', 'La Unión');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0501', 18105, '', 0, '', 'Huamanga');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0502', 18105, '', 0, '', 'Cangallo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0503', 18105, '', 0, '', 'Huanca Sancos');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0504', 18105, '', 0, '', 'Huanta');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0505', 18105, '', 0, '', 'La Mar');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0506', 18105, '', 0, '', 'Lucanas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0507', 18105, '', 0, '', 'Parinacochas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0508', 18105, '', 0, '', 'Páucar del Sara Sara');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0509', 18105, '', 0, '', 'Sucre');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0510', 18105, '', 0, '', 'Víctor Fajardo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0511', 18105, '', 0, '', 'Vilcas Huamán');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0601', 18106, '', 0, '', 'Cajamarca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0602', 18106, '', 0, '', 'Cajabamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0603', 18106, '', 0, '', 'Celendín');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0604', 18106, '', 0, '', 'Chota');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0605', 18106, '', 0, '', 'Contumazá');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0606', 18106, '', 0, '', 'Cutervo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0607', 18106, '', 0, '', 'Hualgayoc');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0608', 18106, '', 0, '', 'Jaén');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0609', 18106, '', 0, '', 'San Ignacio');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0610', 18106, '', 0, '', 'San Marcos');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0611', 18106, '', 0, '', 'San Miguel');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0612', 18106, '', 0, '', 'San Pablo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0613', 18106, '', 0, '', 'Santa Cruz');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0701', 18107, '', 0, '', 'Callao');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0801', 18108, '', 0, '', 'Cusco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0802', 18108, '', 0, '', 'Acomayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0803', 18108, '', 0, '', 'Anta');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0804', 18108, '', 0, '', 'Calca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0805', 18108, '', 0, '', 'Canas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0806', 18108, '', 0, '', 'Canchis');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0807', 18108, '', 0, '', 'Chumbivilcas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0808', 18108, '', 0, '', 'Espinar');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0809', 18108, '', 0, '', 'La Convención');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0810', 18108, '', 0, '', 'Paruro');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0811', 18108, '', 0, '', 'Paucartambo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0812', 18108, '', 0, '', 'Quispicanchi');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0813', 18108, '', 0, '', 'Urubamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0901', 18109, '', 0, '', 'Huancavelica');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0902', 18109, '', 0, '', 'Acobamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0903', 18109, '', 0, '', 'Angaraes');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0904', 18109, '', 0, '', 'Castrovirreyna');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0905', 18109, '', 0, '', 'Churcampa');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0906', 18109, '', 0, '', 'Huaytará');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0907', 18109, '', 0, '', 'Tayacaja');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1001', 18110, '', 0, '', 'Huánuco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1002', 18110, '', 0, '', 'Ambón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1003', 18110, '', 0, '', 'Dos de Mayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1004', 18110, '', 0, '', 'Huacaybamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1005', 18110, '', 0, '', 'Huamalíes');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1006', 18110, '', 0, '', 'Leoncio Prado');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1007', 18110, '', 0, '', 'Marañón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1008', 18110, '', 0, '', 'Pachitea');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1009', 18110, '', 0, '', 'Puerto Inca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1010', 18110, '', 0, '', 'Lauricocha');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1011', 18110, '', 0, '', 'Yarowilca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1101', 18111, '', 0, '', 'Ica');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1102', 18111, '', 0, '', 'Chincha');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1103', 18111, '', 0, '', 'Nazca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1104', 18111, '', 0, '', 'Palpa');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1105', 18111, '', 0, '', 'Pisco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1201', 18112, '', 0, '', 'Huancayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1202', 18112, '', 0, '', 'Concepción');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1203', 18112, '', 0, '', 'Chanchamayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1204', 18112, '', 0, '', 'Jauja');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1205', 18112, '', 0, '', 'Junín');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1206', 18112, '', 0, '', 'Satipo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1207', 18112, '', 0, '', 'Tarma');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1208', 18112, '', 0, '', 'Yauli');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1209', 18112, '', 0, '', 'Chupaca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1301', 18113, '', 0, '', 'Trujillo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1302', 18113, '', 0, '', 'Ascope');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1303', 18113, '', 0, '', 'Bolívar');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1304', 18113, '', 0, '', 'Chepén');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1305', 18113, '', 0, '', 'Julcán');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1306', 18113, '', 0, '', 'Otuzco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1307', 18113, '', 0, '', 'Pacasmayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1308', 18113, '', 0, '', 'Pataz');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1309', 18113, '', 0, '', 'Sánchez Carrión');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1310', 18113, '', 0, '', 'Santiago de Chuco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1311', 18113, '', 0, '', 'Gran Chimú');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1312', 18113, '', 0, '', 'Virú');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1401', 18114, '', 0, '', 'Chiclayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1402', 18114, '', 0, '', 'Ferreñafe');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1403', 18114, '', 0, '', 'Lambayeque');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1501', 18115, '', 0, '', 'Lima');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1502', 18116, '', 0, '', 'Huaura');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1503', 18116, '', 0, '', 'Barranca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1504', 18116, '', 0, '', 'Cajatambo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1505', 18116, '', 0, '', 'Canta');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1506', 18116, '', 0, '', 'Cañete');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1507', 18116, '', 0, '', 'Huaral');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1508', 18116, '', 0, '', 'Huarochirí');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1509', 18116, '', 0, '', 'Oyón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1510', 18116, '', 0, '', 'Yauyos');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1601', 18117, '', 0, '', 'Maynas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1602', 18117, '', 0, '', 'Alto Amazonas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1603', 18117, '', 0, '', 'Loreto');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1604', 18117, '', 0, '', 'Mariscal Ramón Castilla');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1605', 18117, '', 0, '', 'Requena');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1606', 18117, '', 0, '', 'Ucayali');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1607', 18117, '', 0, '', 'Datem del Marañón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1701', 18118, '', 0, '', 'Tambopata');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1702', 18118, '', 0, '', 'Manú');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1703', 18118, '', 0, '', 'Tahuamanu');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1801', 18119, '', 0, '', 'Mariscal Nieto');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1802', 18119, '', 0, '', 'General Sánchez Cerro');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1803', 18119, '', 0, '', 'Ilo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1901', 18120, '', 0, '', 'Pasco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1902', 18120, '', 0, '', 'Daniel Alcides Carrión');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1903', 18120, '', 0, '', 'Oxapampa');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2001', 18121, '', 0, '', 'Piura');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2002', 18121, '', 0, '', 'Ayabaca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2003', 18121, '', 0, '', 'Huancabamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2004', 18121, '', 0, '', 'Morropón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2005', 18121, '', 0, '', 'Paita');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2006', 18121, '', 0, '', 'Sullana');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2007', 18121, '', 0, '', 'Talara');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2008', 18121, '', 0, '', 'Sechura');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2101', 18122, '', 0, '', 'Puno');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2102', 18122, '', 0, '', 'Azángaro');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2103', 18122, '', 0, '', 'Carabaya');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2104', 18122, '', 0, '', 'Chucuito');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2105', 18122, '', 0, '', 'El Collao');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2106', 18122, '', 0, '', 'Huancané');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2107', 18122, '', 0, '', 'Lampa');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2108', 18122, '', 0, '', 'Melgar');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2109', 18122, '', 0, '', 'Moho');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2110', 18122, '', 0, '', 'San Antonio de Putina');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2111', 18122, '', 0, '', 'San Román');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2112', 18122, '', 0, '', 'Sandia');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2113', 18122, '', 0, '', 'Yunguyo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2201', 18123, '', 0, '', 'Moyobamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2202', 18123, '', 0, '', 'Bellavista');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2203', 18123, '', 0, '', 'El Dorado');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2204', 18123, '', 0, '', 'Huallaga');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2205', 18123, '', 0, '', 'Lamas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2206', 18123, '', 0, '', 'Mariscal Cáceres');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2207', 18123, '', 0, '', 'Picota');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2208', 18123, '', 0, '', 'La Rioja');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2209', 18123, '', 0, '', 'San Martín');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2210', 18123, '', 0, '', 'Tocache');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2301', 18124, '', 0, '', 'Tacna');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2302', 18124, '', 0, '', 'Candarave');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2303', 18124, '', 0, '', 'Jorge Basadre');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2304', 18124, '', 0, '', 'Tarata');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2401', 18125, '', 0, '', 'Tumbes');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2402', 18125, '', 0, '', 'Contralmirante Villar');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2403', 18125, '', 0, '', 'Zarumilla');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2501', 18126, '', 0, '', 'Coronel Portillo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2502', 18126, '', 0, '', 'Atalaya');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2503', 18126, '', 0, '', 'Padre Abad');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2504', 18126, '', 0, '', 'Purús');
+
+
 -- Portugal Provinces / Postal Districts (rowid country=25)
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15001, 'PT-AV', NULL, NULL, 'AVEIRO', 'Aveiro');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (15002, 'PT-AC', NULL, NULL, 'AZORES', 'Azores');
@@ -1522,201 +1721,201 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 
 
 -- Provinces Peru (id country=181)
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0101', 18101, '', 0, '', 'Chachapoyas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0102', 18101, '', 0, '', 'Bagua', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0103', 18101, '', 0, '', 'Bongará', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0104', 18101, '', 0, '', 'Condorcanqui', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0105', 18101, '', 0, '', 'Luya', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0106', 18101, '', 0, '', 'Rodríguez de Mendoza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0107', 18101, '', 0, '', 'Utcubamba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0201', 18102, '', 0, '', 'Huaraz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0202', 18102, '', 0, '', 'Aija', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0203', 18102, '', 0, '', 'Antonio Raymondi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0204', 18102, '', 0, '', 'Asunción', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0205', 18102, '', 0, '', 'Bolognesi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0206', 18102, '', 0, '', 'Carhuaz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0207', 18102, '', 0, '', 'Carlos Fermín Fitzcarrald', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0208', 18102, '', 0, '', 'Casma', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0209', 18102, '', 0, '', 'Corongo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0210', 18102, '', 0, '', 'Huari', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0211', 18102, '', 0, '', 'Huarmey', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0212', 18102, '', 0, '', 'Huaylas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0213', 18102, '', 0, '', 'Mariscal Luzuriaga', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0214', 18102, '', 0, '', 'Ocros', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0215', 18102, '', 0, '', 'Pallasca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0216', 18102, '', 0, '', 'Pomabamba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0217', 18102, '', 0, '', 'Recuay', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0218', 18102, '', 0, '', 'Papá', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0219', 18102, '', 0, '', 'Sihuas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0220', 18102, '', 0, '', 'Yungay', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0301', 18103, '', 0, '', 'Abancay', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0302', 18103, '', 0, '', 'Andahuaylas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0303', 18103, '', 0, '', 'Antabamba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0304', 18103, '', 0, '', 'Aymaraes', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0305', 18103, '', 0, '', 'Cotabambas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0306', 18103, '', 0, '', 'Chincheros', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0307', 18103, '', 0, '', 'Grau', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0401', 18104, '', 0, '', 'Arequipa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0402', 18104, '', 0, '', 'Camaná', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0403', 18104, '', 0, '', 'Caravelí', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0404', 18104, '', 0, '', 'Castilla', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0405', 18104, '', 0, '', 'Caylloma', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0406', 18104, '', 0, '', 'Condesuyos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0407', 18104, '', 0, '', 'Islay', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0408', 18104, '', 0, '', 'La Unión', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0501', 18105, '', 0, '', 'Huamanga', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0502', 18105, '', 0, '', 'Cangallo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0503', 18105, '', 0, '', 'Huanca Sancos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0504', 18105, '', 0, '', 'Huanta', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0505', 18105, '', 0, '', 'La Mar', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0506', 18105, '', 0, '', 'Lucanas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0507', 18105, '', 0, '', 'Parinacochas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0508', 18105, '', 0, '', 'Páucar del Sara Sara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0509', 18105, '', 0, '', 'Sucre', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0510', 18105, '', 0, '', 'Víctor Fajardo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0511', 18105, '', 0, '', 'Vilcas Huamán', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0601', 18106, '', 0, '', 'Cajamarca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0602', 18106, '', 0, '', 'Cajabamba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0603', 18106, '', 0, '', 'Celendín', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0604', 18106, '', 0, '', 'Chota', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0605', 18106, '', 0, '', 'Contumazá', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0606', 18106, '', 0, '', 'Cutervo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0607', 18106, '', 0, '', 'Hualgayoc', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0608', 18106, '', 0, '', 'Jaén', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0609', 18106, '', 0, '', 'San Ignacio', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0610', 18106, '', 0, '', 'San Marcos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0611', 18106, '', 0, '', 'San Miguel', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0612', 18106, '', 0, '', 'San Pablo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0613', 18106, '', 0, '', 'Santa Cruz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0701', 18107, '', 0, '', 'Callao', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0801', 18108, '', 0, '', 'Cusco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0802', 18108, '', 0, '', 'Acomayo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0803', 18108, '', 0, '', 'Anta', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0804', 18108, '', 0, '', 'Calca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0805', 18108, '', 0, '', 'Canas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0806', 18108, '', 0, '', 'Canchis', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0807', 18108, '', 0, '', 'Chumbivilcas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0808', 18108, '', 0, '', 'Espinar', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0809', 18108, '', 0, '', 'La Convención', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0810', 18108, '', 0, '', 'Paruro', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0811', 18108, '', 0, '', 'Paucartambo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0812', 18108, '', 0, '', 'Quispicanchi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0813', 18108, '', 0, '', 'Urubamba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0901', 18109, '', 0, '', 'Huancavelica', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0902', 18109, '', 0, '', 'Acobamba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0903', 18109, '', 0, '', 'Angaraes', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0904', 18109, '', 0, '', 'Castrovirreyna', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0905', 18109, '', 0, '', 'Churcampa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0906', 18109, '', 0, '', 'Huaytará', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('0907', 18109, '', 0, '', 'Tayacaja', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1001', 18110, '', 0, '', 'Huánuco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1002', 18110, '', 0, '', 'Ambón', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1003', 18110, '', 0, '', 'Dos de Mayo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1004', 18110, '', 0, '', 'Huacaybamba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1005', 18110, '', 0, '', 'Huamalíes', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1006', 18110, '', 0, '', 'Leoncio Prado', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1007', 18110, '', 0, '', 'Marañón', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1008', 18110, '', 0, '', 'Pachitea', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1009', 18110, '', 0, '', 'Puerto Inca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1010', 18110, '', 0, '', 'Lauricocha', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1011', 18110, '', 0, '', 'Yarowilca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1101', 18111, '', 0, '', 'Ica', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1102', 18111, '', 0, '', 'Chincha', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1103', 18111, '', 0, '', 'Nazca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1104', 18111, '', 0, '', 'Palpa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1105', 18111, '', 0, '', 'Pisco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1201', 18112, '', 0, '', 'Huancayo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1202', 18112, '', 0, '', 'Concepción', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1203', 18112, '', 0, '', 'Chanchamayo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1204', 18112, '', 0, '', 'Jauja', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1205', 18112, '', 0, '', 'Junín', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1206', 18112, '', 0, '', 'Satipo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1207', 18112, '', 0, '', 'Tarma', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1208', 18112, '', 0, '', 'Yauli', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1209', 18112, '', 0, '', 'Chupaca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1301', 18113, '', 0, '', 'Trujillo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1302', 18113, '', 0, '', 'Ascope', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1303', 18113, '', 0, '', 'Bolívar', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1304', 18113, '', 0, '', 'Chepén', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1305', 18113, '', 0, '', 'Julcán', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1306', 18113, '', 0, '', 'Otuzco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1307', 18113, '', 0, '', 'Pacasmayo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1308', 18113, '', 0, '', 'Pataz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1309', 18113, '', 0, '', 'Sánchez Carrión', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1310', 18113, '', 0, '', 'Santiago de Chuco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1311', 18113, '', 0, '', 'Gran Chimú', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1312', 18113, '', 0, '', 'Virú', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1401', 18114, '', 0, '', 'Chiclayo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1402', 18114, '', 0, '', 'Ferreñafe', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1403', 18114, '', 0, '', 'Lambayeque', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1501', 18115, '', 0, '', 'Lima', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1502', 18116, '', 0, '', 'Huaura', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1503', 18116, '', 0, '', 'Barranca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1504', 18116, '', 0, '', 'Cajatambo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1505', 18116, '', 0, '', 'Canta', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1506', 18116, '', 0, '', 'Cañete', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1507', 18116, '', 0, '', 'Huaral', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1508', 18116, '', 0, '', 'Huarochirí', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1509', 18116, '', 0, '', 'Oyón', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1510', 18116, '', 0, '', 'Yauyos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1601', 18117, '', 0, '', 'Maynas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1602', 18117, '', 0, '', 'Alto Amazonas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1603', 18117, '', 0, '', 'Loreto', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1604', 18117, '', 0, '', 'Mariscal Ramón Castilla', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1605', 18117, '', 0, '', 'Requena', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1606', 18117, '', 0, '', 'Ucayali', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1607', 18117, '', 0, '', 'Datem del Marañón', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1701', 18118, '', 0, '', 'Tambopata', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1702', 18118, '', 0, '', 'Manú', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1703', 18118, '', 0, '', 'Tahuamanu', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1801', 18119, '', 0, '', 'Mariscal Nieto', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1802', 18119, '', 0, '', 'General Sánchez Cerro', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1803', 18119, '', 0, '', 'Ilo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1901', 18120, '', 0, '', 'Pasco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1902', 18120, '', 0, '', 'Daniel Alcides Carrión', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('1903', 18120, '', 0, '', 'Oxapampa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2001', 18121, '', 0, '', 'Piura', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2002', 18121, '', 0, '', 'Ayabaca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2003', 18121, '', 0, '', 'Huancabamba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2004', 18121, '', 0, '', 'Morropón', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2005', 18121, '', 0, '', 'Paita', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2006', 18121, '', 0, '', 'Sullana', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2007', 18121, '', 0, '', 'Talara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2008', 18121, '', 0, '', 'Sechura', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2101', 18122, '', 0, '', 'Puno', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2102', 18122, '', 0, '', 'Azángaro', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2103', 18122, '', 0, '', 'Carabaya', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2104', 18122, '', 0, '', 'Chucuito', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2105', 18122, '', 0, '', 'El Collao', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2106', 18122, '', 0, '', 'Huancané', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2107', 18122, '', 0, '', 'Lampa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2108', 18122, '', 0, '', 'Melgar', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2109', 18122, '', 0, '', 'Moho', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2110', 18122, '', 0, '', 'San Antonio de Putina', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2111', 18122, '', 0, '', 'San Román', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2112', 18122, '', 0, '', 'Sandia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2113', 18122, '', 0, '', 'Yunguyo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2201', 18123, '', 0, '', 'Moyobamba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2202', 18123, '', 0, '', 'Bellavista', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2203', 18123, '', 0, '', 'El Dorado', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2204', 18123, '', 0, '', 'Huallaga', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2205', 18123, '', 0, '', 'Lamas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2206', 18123, '', 0, '', 'Mariscal Cáceres', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2207', 18123, '', 0, '', 'Picota', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2208', 18123, '', 0, '', 'La Rioja', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2209', 18123, '', 0, '', 'San Martín', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2210', 18123, '', 0, '', 'Tocache', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2301', 18124, '', 0, '', 'Tacna', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2302', 18124, '', 0, '', 'Candarave', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2303', 18124, '', 0, '', 'Jorge Basadre', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2304', 18124, '', 0, '', 'Tarata', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2401', 18125, '', 0, '', 'Tumbes', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2402', 18125, '', 0, '', 'Contralmirante Villar', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2403', 18125, '', 0, '', 'Zarumilla', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2501', 18126, '', 0, '', 'Coronel Portillo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2502', 18126, '', 0, '', 'Atalaya', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2503', 18126, '', 0, '', 'Padre Abad', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2504', 18126, '', 0, '', 'Purús', 1);
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0101', 18101, '', 0, '', 'Chachapoyas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0102', 18101, '', 0, '', 'Bagua');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0103', 18101, '', 0, '', 'Bongará');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0104', 18101, '', 0, '', 'Condorcanqui');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0105', 18101, '', 0, '', 'Luya');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0106', 18101, '', 0, '', 'Rodríguez de Mendoza');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0107', 18101, '', 0, '', 'Utcubamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0201', 18102, '', 0, '', 'Huaraz');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0202', 18102, '', 0, '', 'Aija');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0203', 18102, '', 0, '', 'Antonio Raymondi');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0204', 18102, '', 0, '', 'Asunción');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0205', 18102, '', 0, '', 'Bolognesi');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0206', 18102, '', 0, '', 'Carhuaz');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0207', 18102, '', 0, '', 'Carlos Fermín Fitzcarrald');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0208', 18102, '', 0, '', 'Casma');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0209', 18102, '', 0, '', 'Corongo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0210', 18102, '', 0, '', 'Huari');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0211', 18102, '', 0, '', 'Huarmey');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0212', 18102, '', 0, '', 'Huaylas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0213', 18102, '', 0, '', 'Mariscal Luzuriaga');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0214', 18102, '', 0, '', 'Ocros');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0215', 18102, '', 0, '', 'Pallasca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0216', 18102, '', 0, '', 'Pomabamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0217', 18102, '', 0, '', 'Recuay');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0218', 18102, '', 0, '', 'Papá');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0219', 18102, '', 0, '', 'Sihuas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0220', 18102, '', 0, '', 'Yungay');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0301', 18103, '', 0, '', 'Abancay');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0302', 18103, '', 0, '', 'Andahuaylas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0303', 18103, '', 0, '', 'Antabamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0304', 18103, '', 0, '', 'Aymaraes');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0305', 18103, '', 0, '', 'Cotabambas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0306', 18103, '', 0, '', 'Chincheros');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0307', 18103, '', 0, '', 'Grau');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0401', 18104, '', 0, '', 'Arequipa');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0402', 18104, '', 0, '', 'Camaná');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0403', 18104, '', 0, '', 'Caravelí');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0404', 18104, '', 0, '', 'Castilla');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0405', 18104, '', 0, '', 'Caylloma');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0406', 18104, '', 0, '', 'Condesuyos');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0407', 18104, '', 0, '', 'Islay');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0408', 18104, '', 0, '', 'La Unión');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0501', 18105, '', 0, '', 'Huamanga');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0502', 18105, '', 0, '', 'Cangallo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0503', 18105, '', 0, '', 'Huanca Sancos');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0504', 18105, '', 0, '', 'Huanta');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0505', 18105, '', 0, '', 'La Mar');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0506', 18105, '', 0, '', 'Lucanas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0507', 18105, '', 0, '', 'Parinacochas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0508', 18105, '', 0, '', 'Páucar del Sara Sara');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0509', 18105, '', 0, '', 'Sucre');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0510', 18105, '', 0, '', 'Víctor Fajardo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0511', 18105, '', 0, '', 'Vilcas Huamán');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0601', 18106, '', 0, '', 'Cajamarca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0602', 18106, '', 0, '', 'Cajabamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0603', 18106, '', 0, '', 'Celendín');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0604', 18106, '', 0, '', 'Chota');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0605', 18106, '', 0, '', 'Contumazá');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0606', 18106, '', 0, '', 'Cutervo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0607', 18106, '', 0, '', 'Hualgayoc');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0608', 18106, '', 0, '', 'Jaén');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0609', 18106, '', 0, '', 'San Ignacio');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0610', 18106, '', 0, '', 'San Marcos');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0611', 18106, '', 0, '', 'San Miguel');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0612', 18106, '', 0, '', 'San Pablo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0613', 18106, '', 0, '', 'Santa Cruz');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0701', 18107, '', 0, '', 'Callao');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0801', 18108, '', 0, '', 'Cusco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0802', 18108, '', 0, '', 'Acomayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0803', 18108, '', 0, '', 'Anta');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0804', 18108, '', 0, '', 'Calca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0805', 18108, '', 0, '', 'Canas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0806', 18108, '', 0, '', 'Canchis');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0807', 18108, '', 0, '', 'Chumbivilcas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0808', 18108, '', 0, '', 'Espinar');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0809', 18108, '', 0, '', 'La Convención');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0810', 18108, '', 0, '', 'Paruro');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0811', 18108, '', 0, '', 'Paucartambo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0812', 18108, '', 0, '', 'Quispicanchi');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0813', 18108, '', 0, '', 'Urubamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0901', 18109, '', 0, '', 'Huancavelica');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0902', 18109, '', 0, '', 'Acobamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0903', 18109, '', 0, '', 'Angaraes');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0904', 18109, '', 0, '', 'Castrovirreyna');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0905', 18109, '', 0, '', 'Churcampa');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0906', 18109, '', 0, '', 'Huaytará');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0907', 18109, '', 0, '', 'Tayacaja');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1001', 18110, '', 0, '', 'Huánuco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1002', 18110, '', 0, '', 'Ambón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1003', 18110, '', 0, '', 'Dos de Mayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1004', 18110, '', 0, '', 'Huacaybamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1005', 18110, '', 0, '', 'Huamalíes');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1006', 18110, '', 0, '', 'Leoncio Prado');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1007', 18110, '', 0, '', 'Marañón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1008', 18110, '', 0, '', 'Pachitea');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1009', 18110, '', 0, '', 'Puerto Inca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1010', 18110, '', 0, '', 'Lauricocha');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1011', 18110, '', 0, '', 'Yarowilca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1101', 18111, '', 0, '', 'Ica');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1102', 18111, '', 0, '', 'Chincha');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1103', 18111, '', 0, '', 'Nazca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1104', 18111, '', 0, '', 'Palpa');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1105', 18111, '', 0, '', 'Pisco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1201', 18112, '', 0, '', 'Huancayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1202', 18112, '', 0, '', 'Concepción');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1203', 18112, '', 0, '', 'Chanchamayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1204', 18112, '', 0, '', 'Jauja');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1205', 18112, '', 0, '', 'Junín');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1206', 18112, '', 0, '', 'Satipo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1207', 18112, '', 0, '', 'Tarma');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1208', 18112, '', 0, '', 'Yauli');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1209', 18112, '', 0, '', 'Chupaca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1301', 18113, '', 0, '', 'Trujillo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1302', 18113, '', 0, '', 'Ascope');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1303', 18113, '', 0, '', 'Bolívar');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1304', 18113, '', 0, '', 'Chepén');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1305', 18113, '', 0, '', 'Julcán');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1306', 18113, '', 0, '', 'Otuzco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1307', 18113, '', 0, '', 'Pacasmayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1308', 18113, '', 0, '', 'Pataz');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1309', 18113, '', 0, '', 'Sánchez Carrión');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1310', 18113, '', 0, '', 'Santiago de Chuco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1311', 18113, '', 0, '', 'Gran Chimú');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1312', 18113, '', 0, '', 'Virú');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1401', 18114, '', 0, '', 'Chiclayo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1402', 18114, '', 0, '', 'Ferreñafe');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1403', 18114, '', 0, '', 'Lambayeque');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1501', 18115, '', 0, '', 'Lima');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1502', 18116, '', 0, '', 'Huaura');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1503', 18116, '', 0, '', 'Barranca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1504', 18116, '', 0, '', 'Cajatambo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1505', 18116, '', 0, '', 'Canta');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1506', 18116, '', 0, '', 'Cañete');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1507', 18116, '', 0, '', 'Huaral');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1508', 18116, '', 0, '', 'Huarochirí');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1509', 18116, '', 0, '', 'Oyón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1510', 18116, '', 0, '', 'Yauyos');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1601', 18117, '', 0, '', 'Maynas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1602', 18117, '', 0, '', 'Alto Amazonas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1603', 18117, '', 0, '', 'Loreto');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1604', 18117, '', 0, '', 'Mariscal Ramón Castilla');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1605', 18117, '', 0, '', 'Requena');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1606', 18117, '', 0, '', 'Ucayali');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1607', 18117, '', 0, '', 'Datem del Marañón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1701', 18118, '', 0, '', 'Tambopata');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1702', 18118, '', 0, '', 'Manú');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1703', 18118, '', 0, '', 'Tahuamanu');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1801', 18119, '', 0, '', 'Mariscal Nieto');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1802', 18119, '', 0, '', 'General Sánchez Cerro');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1803', 18119, '', 0, '', 'Ilo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1901', 18120, '', 0, '', 'Pasco');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1902', 18120, '', 0, '', 'Daniel Alcides Carrión');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1903', 18120, '', 0, '', 'Oxapampa');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2001', 18121, '', 0, '', 'Piura');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2002', 18121, '', 0, '', 'Ayabaca');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2003', 18121, '', 0, '', 'Huancabamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2004', 18121, '', 0, '', 'Morropón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2005', 18121, '', 0, '', 'Paita');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2006', 18121, '', 0, '', 'Sullana');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2007', 18121, '', 0, '', 'Talara');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2008', 18121, '', 0, '', 'Sechura');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2101', 18122, '', 0, '', 'Puno');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2102', 18122, '', 0, '', 'Azángaro');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2103', 18122, '', 0, '', 'Carabaya');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2104', 18122, '', 0, '', 'Chucuito');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2105', 18122, '', 0, '', 'El Collao');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2106', 18122, '', 0, '', 'Huancané');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2107', 18122, '', 0, '', 'Lampa');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2108', 18122, '', 0, '', 'Melgar');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2109', 18122, '', 0, '', 'Moho');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2110', 18122, '', 0, '', 'San Antonio de Putina');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2111', 18122, '', 0, '', 'San Román');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2112', 18122, '', 0, '', 'Sandia');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2113', 18122, '', 0, '', 'Yunguyo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2201', 18123, '', 0, '', 'Moyobamba');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2202', 18123, '', 0, '', 'Bellavista');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2203', 18123, '', 0, '', 'El Dorado');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2204', 18123, '', 0, '', 'Huallaga');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2205', 18123, '', 0, '', 'Lamas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2206', 18123, '', 0, '', 'Mariscal Cáceres');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2207', 18123, '', 0, '', 'Picota');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2208', 18123, '', 0, '', 'La Rioja');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2209', 18123, '', 0, '', 'San Martín');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2210', 18123, '', 0, '', 'Tocache');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2301', 18124, '', 0, '', 'Tacna');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2302', 18124, '', 0, '', 'Candarave');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2303', 18124, '', 0, '', 'Jorge Basadre');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2304', 18124, '', 0, '', 'Tarata');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2401', 18125, '', 0, '', 'Tumbes');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2402', 18125, '', 0, '', 'Contralmirante Villar');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2403', 18125, '', 0, '', 'Zarumilla');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2501', 18126, '', 0, '', 'Coronel Portillo');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2502', 18126, '', 0, '', 'Atalaya');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2503', 18126, '', 0, '', 'Padre Abad');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2504', 18126, '', 0, '', 'Purús');
 
 
 -- Provinces United Arab Emirates (id country=227)

From 5d870d5802129119557b7a769dc29e6e0f51b027 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 15:36:34 +0200
Subject: [PATCH 577/928] FIx #17447

---
 htdocs/core/modules/modPropale.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index ea9f9548cb7..048f8fcb508 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -157,7 +157,8 @@ class modPropale extends DolibarrModules
 		$this->rights[$r][1] = 'Close commercial proposals'; // Set proposal to signed or refused
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'cloturer';
+		$this->rights[$r][4] = 'propal_advance';
+		$this->rights[$r][5] = 'close';
 
 		$r++;
 		$this->rights[$r][0] = 27; // id de la permission

From 7b706d6fe5efc649c995bf00e309b0ef2ba8b3de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 15:56:56 +0200
Subject: [PATCH 578/928] Fix phpunit for crop of image

---
 htdocs/core/lib/images.lib.php | 18 ++++++++----------
 test/phpunit/ImagesLibTest.php | 11 ++++++++++-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 3a0aef1239f..a1a6e97c8d2 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -187,7 +187,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	$imgHeight = $infoImg[1]; // Hauteur de l'image
 
 	$imgTargetName = ($filetowrite ? $filetowrite : $file);
-	$infoImgTarget = getimagesize($imgTargetName); 	// Get data about target image
+	$newExt = strtolower(pathinfo($imgTargetName, PATHINFO_EXTENSION));
 
 	if ($mode == 0) {	// If resize, we check parameters
 		if (!empty($filetowrite) && $filetowrite != $file && $newWidth <= 0 && $newHeight <= 0) {
@@ -253,7 +253,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	}
 
 	// Create empty image for target
-	if ($infoImgTarget[2] == 1) {
+	if ($newExt == 'gif') {
 		// Compatibility image GIF
 		$imgTarget = imagecreate($newWidth, $newHeight);
 	} else {
@@ -271,22 +271,22 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	}
 
 	// Set transparent color according to image extension
-	switch ($infoImgTarget[2]) {
-		case 1:	// Gif
+	switch ($newExt) {
+		case 'gif':	// Gif
 			$trans_colour = imagecolorallocate($imgTarget, 255, 255, 255); // On procede autrement pour le format GIF
 			imagecolortransparent($imgTarget, $trans_colour);
 			break;
-		case 2:	// Jpg
+		case 'jpg':	// Jpg
 			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 0);
 			break;
-		case 3:	// Png
+		case 'png':	// Png
 			imagealphablending($imgTarget, false); // Pour compatibilite sur certain systeme
 			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 127); // Keep transparent channel
 			break;
-		case 4:	// Bmp
+		case 'bmp':	// Bmp
 			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 0);
 			break;
-		case 18: // Webp
+		case 'webp': // Webp
 			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 127);
 			break;
 	}
@@ -302,8 +302,6 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	//$fp = fopen($imgTargetName, "w");
 	//fclose($fp);
 
-	$newExt = strtolower(pathinfo($imgTargetName, PATHINFO_EXTENSION));
-
 	// Create image on disk (overwrite file if exists)
 	switch ($newExt) {
 		case 'gif':	// Gif
diff --git a/test/phpunit/ImagesLibTest.php b/test/phpunit/ImagesLibTest.php
index 4835a8afd76..95704b2a51b 100644
--- a/test/phpunit/ImagesLibTest.php
+++ b/test/phpunit/ImagesLibTest.php
@@ -29,6 +29,7 @@ global $conf,$user,$langs,$db;
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/images.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
 
 if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
@@ -164,8 +165,16 @@ class ImagesLibTest extends PHPUnit\Framework\TestCase
 
 		$file=dirname(__FILE__).'/img250x20.png';
 		$filetarget=$conf->admin->dir_temp.'/img250x20.jpg';
+		dol_delete_file($filetarget);
 		$result = dol_imageResizeOrCrop($file, 0, 0, 0, 0, 0, $filetarget);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals($filetarget, $result, 'Failed to convert into '.$filetarget);
+		$this->assertEquals($filetarget, $result, 'Failed to convert PNG '.$file.' into '.$filetarget);
+
+		$file=dirname(__FILE__).'/img250x20.png';
+		$filetarget=$conf->admin->dir_temp.'/img250x20.webp';
+		dol_delete_file($filetarget);
+		$result = dol_imageResizeOrCrop($file, 0, 0, 0, 0, 0, $filetarget);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($filetarget, $result, 'Failed to convert PNG '.$file.' into WEBP '.$filetarget);
 	}
 }

From dba9b17275a2e53da6e4102b5381c7800b1be390 Mon Sep 17 00:00:00 2001
From: Indelog <maxime@indelog.fr>
Date: Mon, 3 May 2021 16:00:14 +0200
Subject: [PATCH 579/928] Fix forgot payment filter on file name

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

diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 7670e03d094..a640ef1f8fe 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -150,7 +150,7 @@ if ($year)
 		foreach ($files as $f) {
 			$tfile = $dir.'/'.$year.'/'.$f;
 			$relativepath = $year.'/'.$f;
-			if (is_file($tfile)) {
+			if (is_file($tfile) && preg_match('/^payment/i', $f)) {
 				print '<tr class="oddeven">';
 				print '<td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$f.'</a>'.$formfile->showPreview($f, 'facture_paiement', $relativepath, 0).'</td>';
 				print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';

From 33a20ae9a1f43dc7adcecdd32bf140ccf3973c8d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 16:16:44 +0200
Subject: [PATCH 580/928] Update extrafields.class.php

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 07d80acd9aa..3d55b12c35c 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1340,8 +1340,7 @@ class ExtraFields
 		elseif ($type == 'checkbox')
 		{
 			$value_arr = $value;
-			if (!is_array($value))
-			{
+			if (!is_array($value)) {
 				$value_arr = explode(',', $value);
 			}
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');

From 49a0304071d99becffa35a9aab891a6d3c4c39fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 16:48:40 +0200
Subject: [PATCH 581/928] Add TODO

---
 htdocs/accountancy/journal/sellsjournal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index c596df5ec7a..88398901fa4 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -460,7 +460,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->numero_compte = $k;
 
 						$accountingaccount->fetch($k, null, true);
-						$bookkeeping->label_compte = $accountingaccount->label;
+						$bookkeeping->label_compte = $accountingaccount->label;		// TODO Use a cache for each label from $k.
 
 						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 						$bookkeeping->montant = $mt;

From c18848c9444c0a607838ec347cb22057d26b6e55 Mon Sep 17 00:00:00 2001
From: Indelog <maxime@indelog.fr>
Date: Mon, 3 May 2021 17:17:44 +0200
Subject: [PATCH 582/928] Fix: simplify code with dol_dir_list()

---
 htdocs/compta/paiement/rapport.php | 44 ++++++++----------------------
 1 file changed, 12 insertions(+), 32 deletions(-)

diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index a640ef1f8fe..c76697c8401 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -109,35 +109,18 @@ print '<br>';
 clearstatcache();
 
 // Show link on other years
-$linkforyear = array();
-$found = 0;
-if (is_dir($dir))
+$year_dirs = dol_dir_list($dir, 'directories', 0, '^[0-9]{4}$', '', 'DESC');
+foreach ($year_dirs as $d)
 {
-	$handle = opendir($dir);
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle)) !== false)
-		{
-			if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file))
-			{
-				$found = 1;
-				$linkforyear[] = $file;
-			}
-		}
-	}
-}
-asort($linkforyear);
-foreach ($linkforyear as $cursoryear)
-{
-	print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
+	print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$d['name'].'">'.$d['name'].'</a> &nbsp;';
 }
 
+$found = true;
 if ($year)
 {
 	if (is_dir($dir.'/'.$year))
 	{
-
-		if ($found) print '<br>';
+		if (!empty($year_dirs)) print '<br>';
 		print '<br>';
 		print '<table width="100%" class="noborder">';
 		print '<tr class="liste_titre">';
@@ -146,17 +129,14 @@ if ($year)
 		print '<td class="right">'.$langs->trans("Date").'</td>';
 		print '</tr>';
 
-		$files = (scandir($dir.'/'.$year));
+		$files = (dol_dir_list($dir.'/'.$year, 'files', 0, '^payments-[0-9]{4}-[0-9]{2}\.pdf$', '', 'name', 'DESC', 1));
 		foreach ($files as $f) {
-			$tfile = $dir.'/'.$year.'/'.$f;
-			$relativepath = $year.'/'.$f;
-			if (is_file($tfile) && preg_match('/^payment/i', $f)) {
-				print '<tr class="oddeven">';
-				print '<td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$f.'</a>'.$formfile->showPreview($f, 'facture_paiement', $relativepath, 0).'</td>';
-				print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
-				print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td>';
-				print '</tr>';
-			}
+			$relativepath = $f['level1name'].'/'.$f['name'];
+			print '<tr class="oddeven">';
+			print '<td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$f['name'].'</a>'.$formfile->showPreview($f['name'], 'facture_paiement', $relativepath, 0).'</td>';
+			print '<td class="right">'.dol_print_size($f['size']).'</td>';
+			print '<td class="right">'.dol_print_date($f['date'], "dayhour").'</td>';
+			print '</tr>';
 		}
 		print '</table>';
 	}

From 9278228e2027671a4612534409d9b63be04e3d50 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 3 May 2021 18:08:49 +0200
Subject: [PATCH 583/928] FIX: create event from contact card preselect contact
 correctly

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

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index b3cb6d60a23..2a0371d4615 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1143,6 +1143,7 @@ if ($action == 'create')
 		print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
 		$preselectedids = GETPOST('socpeopleassigned', 'array');
 		if (GETPOST('contactid', 'int')) $preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int');
+		if ($origin=='contact') $preselectedids[GETPOST('originid', 'int')] = GETPOST('originid', 'int');
 		print img_picto('', 'contact', 'class="paddingrightonly"');
 		print $form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
 		print '</td></tr>';

From 28b1d83ae97f1f0231f3d5c37aaf4709debcd84f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 18:29:21 +0200
Subject: [PATCH 584/928] Make some performance enhancements

---
 .../accountancy/class/bookkeeping.class.php   | 25 ++++----
 htdocs/accountancy/journal/bankjournal.php    | 62 +++++++++----------
 .../journal/expensereportsjournal.php         | 13 +++-
 .../accountancy/journal/purchasesjournal.php  | 25 ++++++--
 htdocs/accountancy/journal/sellsjournal.php   | 22 +++++--
 .../install/mysql/migration/13.0.0-14.0.0.sql |  6 ++
 .../tables/llx_accounting_bookkeeping.key.sql |  3 +-
 test/phpunit/ImagesLibTest.php                |  4 +-
 8 files changed, 99 insertions(+), 61 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 499ace29b8b..eb2c3476275 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -129,13 +129,13 @@ class BookKeeping extends CommonObject
 
 	/**
 	 * @var float FEC:Amount (Not necessary)
-	 * @deprecated Use $amount
+	 * @deprecated No more used (we have info into debit/credit and sens)
 	 */
 	public $montant;
 
 	/**
 	 * @var float FEC:Amount (Not necessary)
-	 * @deprecated No more used
+	 * @deprecated No more used (we have info into debit/credit and sens)
 	 */
 	public $amount;
 
@@ -287,17 +287,17 @@ class BookKeeping extends CommonObject
 		$this->piece_num = 0;
 
 		// First check if line not yet already in bookkeeping.
-		// Note that we must include doc_type - fk_doc - numero_compte - label to be sure to have unicity of line (we may have several lines
+		// Note that we must include 'doc_type - fk_doc - numero_compte - label' to be sure to have unicity of line (because we may have several lines
 		// with same doc_type, fk_doc, numero_compte for 1 invoice line when using localtaxes with same account)
 		// WARNING: This is not reliable, label may have been modified. This is just a small protection.
-		// The page to make journalization make the test on couple doc_type - fk_doc only.
+		// The page that make transfer make the test on couple (doc_type - fk_doc) only.
 		$sql = "SELECT count(*) as nb";
 		$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;
 		if (!empty($conf->global->ACCOUNTANCY_ENABLE_FKDOCDET)) {
-			// DO NOT USE THIS IN PRPDUCTION. This will generate a lot of trouble into reports and will corrupt database (by generating duplicate entries.
-			$sql .= " AND fk_docdet = " . $this->fk_docdet;					// This field can be 0 if record is for several lines
+			// DO NOT USE THIS IN PRODUCTION. This will generate a lot of trouble into reports and will corrupt database (by generating duplicate entries.
+			$sql .= " AND fk_docdet = " . $this->fk_docdet;			// This field can be 0 if record is for several lines
 		}
 		$sql .= " AND numero_compte = '".$this->db->escape($this->numero_compte)."'";
 		$sql .= " AND label_operation = '".$this->db->escape($this->label_operation)."'";
@@ -307,12 +307,16 @@ class BookKeeping extends CommonObject
 
 		if ($resql) {
 			$row = $this->db->fetch_object($resql);
-			if ($row->nb == 0) {
-				// Determine piece_num
+			if ($row->nb == 0) {	// Not already into bookkeeping
+				// Check to know if piece_num already exists for data we try to insert to reuse the same value
 				$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_doc = ".$this->fk_doc;
+				if (!empty($conf->global->ACCOUNTANCY_ENABLE_FKDOCDET)) {
+					// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
+					$sqlnum .= " AND fk_docdet = ".((int) $this->fk_docdet);
+				}
 				$sqlnum .= " AND doc_ref = '".$this->db->escape($this->doc_ref)."'"; // ref of source object
 				$sqlnum .= " AND entity IN (".getEntity('accountancy').")";
 
@@ -329,13 +333,12 @@ class BookKeeping extends CommonObject
 					$sqlnum .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 					$sqlnum .= " WHERE entity IN (".getEntity('accountancy').")";
 
-					dol_syslog(get_class($this).":: create sqlnum=".$sqlnum, LOG_DEBUG);
 					$resqlnum = $this->db->query($sqlnum);
 					if ($resqlnum) {
 						$objnum = $this->db->fetch_object($resqlnum);
 						$this->piece_num = $objnum->maxpiecenum;
 					}
-					dol_syslog(get_class($this).":: create this->piece_num=".$this->piece_num, LOG_DEBUG);
+					dol_syslog(get_class($this).":: create now this->piece_num=".$this->piece_num, LOG_DEBUG);
 				}
 				if (empty($this->piece_num)) {
 					$this->piece_num = 1;
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index edb5e209df7..76984d55fba 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -511,6 +511,18 @@ var_dump($tabtype);*/
 if (!$error && $action == 'writebookkeeping') {
 	$now = dol_now();
 
+	$accountingaccountcustomer = new AccountingAccount($db);
+	$accountingaccountcustomer->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER, true);
+
+	$accountingaccountsupplier = new AccountingAccount($db);
+	$accountingaccountsupplier->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER, true);
+
+	$accountingaccountpayment = new AccountingAccount($db);
+	$accountingaccountpayment->fetch(null, $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT, true);
+
+	$accountingaccountsuspense = new AccountingAccount($db);
+	$accountingaccountsuspense->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE, true);
+
 	$error = 0;
 	foreach ($tabpay as $key => $val) {		// $key is rowid into llx_bank
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
@@ -534,6 +546,9 @@ if (!$error && $action == 'writebookkeeping') {
 			// Line into bank account
 			foreach ($tabbq[$key] as $k => $mt) {
 				if ($mt) {
+					$accountingaccount->fetch(null, $k, true);	// $k is accounting bank account. TODO We should use a cache here to avoid this fetch
+					$account_label = $accountingaccount->label;
+
 					$reflabel = '';
 					if (!empty($val['lib'])) {
 						$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
@@ -549,10 +564,9 @@ if (!$error && $action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'bank';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = $val["fk_bank"];
-					$bookkeeping->numero_compte = $k;
 
-					$accountingaccount->fetch(null, $k, true);	// $k is accounting bank account. TODO We should use a cache here to avoid this fetch
-					$bookkeeping->label_compte = $accountingaccount->label;
+					$bookkeeping->numero_compte = $k;
+					$bookkeeping->label_compte = $account_label;
 
 					$bookkeeping->label_operation = $reflabel;
 					$bookkeeping->montant = $mt;
@@ -610,6 +624,7 @@ if (!$error && $action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'bank';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = $val["fk_bank"];
+
 						$bookkeeping->label_operation = $reflabel;
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
@@ -624,78 +639,63 @@ if (!$error && $action == 'writebookkeeping') {
 							$bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp
 							$bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction
 							$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-
-							$accountingaccount->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER, true);
-							$bookkeeping->label_compte = $accountingaccount->label;
+							$bookkeeping->label_compte = $accountingaccountcustomer->label;
 						} elseif ($tabtype[$key] == 'payment_supplier') {	// If payment is payment of supplier invoice, we get ref of invoice
 							$bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp
 							$bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction
 							$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
-
-							$accountingaccount->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER, true);
-							$bookkeeping->label_compte = $accountingaccount->label;
+							$bookkeeping->label_compte = $accountingaccountsupplier->label;
 						} elseif ($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;
-
-							$accountingaccount->fetch(null, $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT, true);
-							$bookkeeping->label_compte = $accountingaccount->label;
+							$bookkeeping->label_compte = $accountingaccountpayment->label;
 						} elseif ($tabtype[$key] == 'payment_salary') {
 							$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 							$bookkeeping->subledger_label = $tabuser[$key]['name'];
 							$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-
-							$accountingaccount->fetch(null, $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT, true);
-							$bookkeeping->label_compte = $accountingaccount->label;
+							$bookkeeping->label_compte = $accountingaccountpayment->label;
 						} elseif (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
+							$accountingaccount->fetch(null, $k, true);	// TODO Use a cache
 							$bookkeeping->numero_compte = $k;
-
-							$accountingaccount->fetch(null, $k, true);
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'payment_vat') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
+							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
 							$bookkeeping->numero_compte = $k;
-
-							$accountingaccount->fetch(null, $k, true);
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'payment_donation') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
+							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
 							$bookkeeping->numero_compte = $k;
-
-							$accountingaccount->fetch(null, $k, true);
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'member') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
+							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
 							$bookkeeping->numero_compte = $k;
-
-							$accountingaccount->fetch(null, $k, true);
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'payment_loan') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
+							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
 							$bookkeeping->numero_compte = $k;
-
-							$accountingaccount->fetch(null, $k, true);
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'payment_various') {
 							$bookkeeping->subledger_account = $k;
 							$bookkeeping->subledger_label = $tabcompany[$key]['name'];
+							$accountingaccount->fetch(null, $tabpay[$key]["account_various"], true);	// TODO Use a cache
 							$bookkeeping->numero_compte = $tabpay[$key]["account_various"];
-
-							$accountingaccount->fetch(null, $bookkeeping->numero_compte, true);
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'banktransfert') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
+							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
 							$bookkeeping->numero_compte = $k;
-
-							$accountingaccount->fetch(null, $k, true);
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} else {
 							if ($tabtype[$key] == 'unknown') {	// Unknown transaction, we will use a waiting account for thirdparty.
@@ -703,9 +703,7 @@ if (!$error && $action == 'writebookkeeping') {
 								$bookkeeping->subledger_account = '';
 								$bookkeeping->subledger_label = '';
 								$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE;
-
-								$accountingaccount->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE, true);
-								$bookkeeping->label_compte = $accountingaccount->label;
+								$bookkeeping->label_compte = $accountingaccountsuspense->label;
 							}
 						}
 						$bookkeeping->label_operation = $reflabel;
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 9681ed7eaa0..0273690ae81 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -228,6 +228,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'expense_report';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+
 					$bookkeeping->subledger_account = $tabuser[$key]['user_accountancy_code'];
 					$bookkeeping->subledger_label = $tabuser[$key]['name'];
 
@@ -276,10 +277,13 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'expense_report';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
+
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->label_compte = $accountingaccount->label;
+
 						$bookkeeping->label_operation = $accountingaccount->label;
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
@@ -324,6 +328,9 @@ if ($action == 'writebookkeeping') {
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
+						$accountingaccount->fetch($k, null, true);	// TODO Use a cache for label
+						$account_label = $accountingaccount->label;
+
 						// get compte id and label
 						$bookkeeping = new BookKeeping($db);
 						$bookkeeping->doc_date = $val["date"];
@@ -332,12 +339,12 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'expense_report';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
-						$bookkeeping->numero_compte = $k;
 
-						$accountingaccount->fetch($k, null, true);
-						$bookkeeping->label_compte = $accountingaccount->label;
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->label_compte = $account_label;
 
 						$bookkeeping->label_operation = $langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %';
 						$bookkeeping->montant = $mt;
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index a09b9c305f3..2677f8569f2 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -334,6 +334,7 @@ if ($action == 'writebookkeeping') {
 				$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 = $tabcompany[$key]['code_compta_fournisseur'];
 				$bookkeeping->subledger_label = $tabcompany[$key]['name'];
 
@@ -373,8 +374,11 @@ if ($action == 'writebookkeeping') {
 		// Product / Service
 		if (!$errorforline) {
 			foreach ($tabht[$key] as $k => $mt) {
+				$resultfetch = $accountingaccount->fetch(null, $k, true);	// TODO Use a cache
+				$label_account = $accountingaccount->label;
+
 				// get compte id and label
-				if ($accountingaccount->fetch(null, $k, true)) {
+				if ($resultfetch > 0) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
 					$bookkeeping->date_lim_reglement = $val["datereg"];
@@ -384,11 +388,14 @@ if ($action == 'writebookkeeping') {
 					$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->numero_compte = $k;
-					$bookkeeping->label_compte = $accountingaccount->label;
-					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref_supplier.' - '.$accountingaccount->label;
+					$bookkeeping->label_compte = $label_account;
+
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref_supplier.' - '.$label_account;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
@@ -434,6 +441,9 @@ if ($action == 'writebookkeeping') {
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
+						$accountingaccount->fetch($k, null, true);		// TODO Use a cache for label
+						$label_account = $accountingaccount->label;
+
 						$bookkeeping = new BookKeeping($db);
 						$bookkeeping->doc_date = $val["date"];
 						$bookkeeping->date_lim_reglement = $val["datereg"];
@@ -443,12 +453,12 @@ if ($action == 'writebookkeeping') {
 						$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->numero_compte = $k;
 
-						$accountingaccount->fetch($k, null, true);
-						$bookkeeping->label_compte = $accountingaccount->label;
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->label_compte = $label_account;
 
 						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref_supplier.' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 						$bookkeeping->montant = $mt;
@@ -496,9 +506,12 @@ if ($action == 'writebookkeeping') {
 					$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->numero_compte = $k;
+
 					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref_supplier.' - '.$langs->trans("VAT").' NPR';
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 88398901fa4..d147186a8d8 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -347,6 +347,7 @@ if ($action == 'writebookkeeping') {
 				$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 = $tabcompany[$key]['code_compta'];
 				$bookkeeping->subledger_label = $tabcompany[$key]['name'];
 
@@ -386,8 +387,11 @@ if ($action == 'writebookkeeping') {
 		// Product / Service
 		if (!$errorforline) {
 			foreach ($tabht[$key] as $k => $mt) {
+				$resultfetch = $accountingaccount->fetch(null, $k, true);	// TODO Use a cache
+				$label_account = $accountingaccount->label;
+
 				// get compte id and label
-				if ($accountingaccount->fetch(null, $k, true)) {
+				if ($resultfetch > 0) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
 					$bookkeeping->date_lim_reglement = $val["datereg"];
@@ -397,11 +401,14 @@ if ($action == 'writebookkeeping') {
 					$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 = $accountingaccount->label;
-					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$accountingaccount->label;
+					$bookkeeping->label_compte = $label_account;
+
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$label_account;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
@@ -446,6 +453,9 @@ if ($action == 'writebookkeeping') {
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
+						$accountingaccount->fetch($k, null, true);	// TODO Use a cache for label
+						$label_account = $accountingaccount->label;
+
 						$bookkeeping = new BookKeeping($db);
 						$bookkeeping->doc_date = $val["date"];
 						$bookkeeping->date_lim_reglement = $val["datereg"];
@@ -455,12 +465,12 @@ if ($action == 'writebookkeeping') {
 						$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;
 
-						$accountingaccount->fetch($k, null, true);
-						$bookkeeping->label_compte = $accountingaccount->label;		// TODO Use a cache for each label from $k.
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->label_compte = $label_account;
 
 						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 						$bookkeeping->montant = $mt;
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index cda3f4310bb..59d1fa2b9c2 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -32,6 +32,12 @@
 
 -- Missing in v13 or lower
 
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_fk_docdet (fk_docdet);
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_doc_date (doc_date);
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_numero_compte (numero_compte);
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_code_journal (code_journal);
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_piece_num (piece_num);
+
 ALTER TABLE llx_recruitment_recruitmentcandidature MODIFY COLUMN email_msgid VARCHAR(175);
 
 ALTER TABLE llx_asset CHANGE COLUMN amount amount_ht double(24,8) DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
index ca71d90aa0b..3d9337c0789 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
@@ -16,11 +16,12 @@
 --
 -- ============================================================================
 
-ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_doc_date (doc_date);
 ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_fk_doc (fk_doc);
 ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_fk_docdet (fk_docdet);
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_doc_date (doc_date);
 ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_numero_compte (numero_compte);
 ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_code_journal (code_journal);
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_piece_num (piece_num);
 
 -- Current unicity is tested by the journalize page on couple (fk_doc, doc_type) 
 -- TODO Add a key for unicity (not so easy as fk_doc, doc_type may have several lines for one piece)
diff --git a/test/phpunit/ImagesLibTest.php b/test/phpunit/ImagesLibTest.php
index 95704b2a51b..960dd56c4b5 100644
--- a/test/phpunit/ImagesLibTest.php
+++ b/test/phpunit/ImagesLibTest.php
@@ -170,11 +170,11 @@ class ImagesLibTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($filetarget, $result, 'Failed to convert PNG '.$file.' into '.$filetarget);
 
-		$file=dirname(__FILE__).'/img250x20.png';
+		/*$file=dirname(__FILE__).'/img250x20.png';
 		$filetarget=$conf->admin->dir_temp.'/img250x20.webp';
 		dol_delete_file($filetarget);
 		$result = dol_imageResizeOrCrop($file, 0, 0, 0, 0, 0, $filetarget);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals($filetarget, $result, 'Failed to convert PNG '.$file.' into WEBP '.$filetarget);
+		$this->assertEquals($filetarget, $result, 'Failed to convert PNG '.$file.' into WEBP '.$filetarget);*/
 	}
 }

From 706545081cac9ff42cc4dce138d4abfe03b78112 Mon Sep 17 00:00:00 2001
From: WimpyMan <12594973+WimpyMan@users.noreply.github.com>
Date: Mon, 3 May 2021 18:23:31 +0200
Subject: [PATCH 585/928] FIX #17476 releve.php: Fix SQL statement

Single quotes `'` should be uses instead of double quotes `"` for
string values.
---
 htdocs/compta/bank/releve.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 9a534b76320..a58c85469b8 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -177,7 +177,7 @@ $sqlrequestforbankline = $sql;
 if ($action == 'confirm_editbankreceipt' && !empty($oldbankreceipt) && !empty($newbankreceipt))
 {
 	// TODO Add a test to check newbankreceipt does not exists yet
-	$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX.'bank SET num_releve = "'.$db->escape($newbankreceipt).'" WHERE num_releve = "'.$db->escape($oldbankreceipt).'" AND fk_account = '.$id;
+	$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX.'bank SET num_releve = \''.$db->escape($newbankreceipt).'\' WHERE num_releve = \''.$db->escape($oldbankreceipt).'\' AND fk_account = '.$id;
 	$result = $db->query($sqlupdate);
 	if ($result < 0) dol_print_error($db);
 

From 03e8f2aee1952bb3a37f020c93636fb2f3d4e072 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 18:49:37 +0200
Subject: [PATCH 586/928] Fix for performance troubles

---
 htdocs/accountancy/class/bookkeeping.class.php         |  6 +++---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql       | 10 +++++++---
 .../mysql/tables/llx_accounting_bookkeeping.key.sql    |  6 +++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index eb2c3476275..3594bb26fc8 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -301,7 +301,7 @@ class BookKeeping extends CommonObject
 		}
 		$sql .= " AND numero_compte = '".$this->db->escape($this->numero_compte)."'";
 		$sql .= " AND label_operation = '".$this->db->escape($this->label_operation)."'";
-		$sql .= " AND entity IN (".getEntity('accountancy').")";
+		$sql .= " AND entity = ".$conf->entity;	// Do not use getEntity for accounting features
 
 		$resql = $this->db->query($sql);
 
@@ -318,7 +318,7 @@ class BookKeeping extends CommonObject
 					$sqlnum .= " AND fk_docdet = ".((int) $this->fk_docdet);
 				}
 				$sqlnum .= " AND doc_ref = '".$this->db->escape($this->doc_ref)."'"; // ref of source object
-				$sqlnum .= " AND entity IN (".getEntity('accountancy').")";
+				$sqlnum .= " AND entity = ".$conf->entity;	// Do not use getEntity for accounting features
 
 				dol_syslog(get_class($this).":: create sqlnum=".$sqlnum, LOG_DEBUG);
 				$resqlnum = $this->db->query($sqlnum);
@@ -331,7 +331,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').")";
+					$sqlnum .= " WHERE entity = ".$conf->entity;	// Do not use getEntity for accounting features
 
 					$resqlnum = $this->db->query($sqlnum);
 					if ($resqlnum) {
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 59d1fa2b9c2..65f4fb9adcd 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -32,11 +32,15 @@
 
 -- Missing in v13 or lower
 
+ALTER TABLE llx_accounting_bookkeeping DROP INDEX idx_accounting_bookkeeping_numero_compte;
+ALTER TABLE llx_accounting_bookkeeping DROP INDEX idx_accounting_bookkeeping_code_journal;
+
 ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_fk_docdet (fk_docdet);
 ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_doc_date (doc_date);
-ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_numero_compte (numero_compte);
-ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_code_journal (code_journal);
-ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_piece_num (piece_num);
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_numero_compte (numero_compte, entity);
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_code_journal (code_journal, entity);
+
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_piece_num (piece_num, entity);
 
 ALTER TABLE llx_recruitment_recruitmentcandidature MODIFY COLUMN email_msgid VARCHAR(175);
 
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
index 3d9337c0789..766de8d6230 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
@@ -19,9 +19,9 @@
 ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_fk_doc (fk_doc);
 ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_fk_docdet (fk_docdet);
 ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_doc_date (doc_date);
-ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_numero_compte (numero_compte);
-ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_code_journal (code_journal);
-ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_piece_num (piece_num);
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_numero_compte (numero_compte, entity);
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_code_journal (code_journal, entity);
+ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_piece_num (piece_num, entity);
 
 -- Current unicity is tested by the journalize page on couple (fk_doc, doc_type) 
 -- TODO Add a key for unicity (not so easy as fk_doc, doc_type may have several lines for one piece)

From 1d2f8b09d96c398faf7c1c15bab6c53859b21e48 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 18:55:25 +0200
Subject: [PATCH 587/928] Update releve.php

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

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index a58c85469b8..d0812ae4ea9 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -177,7 +177,7 @@ $sqlrequestforbankline = $sql;
 if ($action == 'confirm_editbankreceipt' && !empty($oldbankreceipt) && !empty($newbankreceipt))
 {
 	// TODO Add a test to check newbankreceipt does not exists yet
-	$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX.'bank SET num_releve = \''.$db->escape($newbankreceipt).'\' WHERE num_releve = \''.$db->escape($oldbankreceipt).'\' AND fk_account = '.$id;
+	$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."bank SET num_releve = '".$db->escape($newbankreceipt)."' WHERE num_releve = '".$db->escape($oldbankreceipt)."' AND fk_account = ".((int) $id);
 	$result = $db->query($sqlupdate);
 	if ($result < 0) dol_print_error($db);
 

From a36df785b08800707417c54b0d2787ac84b912b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 19:20:49 +0200
Subject: [PATCH 588/928] Fix lang

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

diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 917bbfefb1c..458863d28bc 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - main
-DIRECTION=升
+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

From 9dc36d13c3bdb0496e65e6d20dec9028430398cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 19:25:16 +0200
Subject: [PATCH 589/928] Enhance error management

---
 htdocs/core/lib/images.lib.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index a1a6e97c8d2..0a0ebe3ce02 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -203,6 +203,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 		}
 	}
 
+	// Test function to read source image exists
 	$imgfonction = '';
 	switch ($infoImg[2]) {
 		case 1:	// IMG_GIF
@@ -228,6 +229,34 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 		}
 	}
 
+	// Test function to write target image exists
+	if ($filetowrite) {
+		$imgfonction = '';
+		switch ($newExt) {
+			case 'gif':	// IMG_GIF
+				$imgfonction = 'imagecreatefromgif';
+				break;
+			case 'jpg':	// IMG_JPG
+				$imgfonction = 'imagecreatefromjpeg';
+				break;
+			case 'png':	// IMG_PNG
+				$imgfonction = 'imagecreatefrompng';
+				break;
+			case 'bmp':	// IMG_WBMP
+				$imgfonction = 'imagecreatefromwbmp';
+				break;
+			case 'webp': // IMG_WEBP
+				$imgfonction = 'imagecreatefromwebp';
+				break;
+		}
+		if ($imgfonction) {
+			if (!function_exists($imgfonction)) {
+				// Fonctions de conversion non presente dans ce PHP
+				return 'Write of image not possible. This PHP does not support GD functions '.$imgfonction;
+			}
+		}
+	}
+
 	// Read source image file
 	switch ($infoImg[2]) {
 		case 1:	// Gif

From e4499976e9936eba795321e6baf1e6aa9014a080 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 19:56:31 +0200
Subject: [PATCH 590/928] Disable empty tabs

---
 htdocs/core/lib/pdf.lib.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 05f53b72df7..755f292132e 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -59,13 +59,13 @@ function pdf_admin_prepare_head()
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'pdf_admin');
 
-	if (!empty($conf->adherent->enabled)) {
+	if (1 == 2 && !empty($conf->adherent->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_adherent.php';
 		$head[$h][1] = $langs->trans("Adherent");
 		$head[$h][2] = 'adherent';
 		$h++;
 	}
-	if (!empty($conf->projet->enabled)) {
+	if (1 == 2 && !empty($conf->projet->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_project.php';
 		$head[$h][1] = $langs->trans("Project");
 		$head[$h][2] = 'project';
@@ -77,49 +77,49 @@ function pdf_admin_prepare_head()
 		$head[$h][2] = 'proposal';
 		$h++;
 	}
-	if (!empty($conf->commande->enabled)) {
+	if (1 == 2 && !empty($conf->commande->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_order.php';
 		$head[$h][1] = $langs->trans("Order");
 		$head[$h][2] = 'order';
 		$h++;
 	}
-	if (!empty($conf->facture->enabled)) {
+	if (1 == 2 && !empty($conf->facture->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_invoice.php';
 		$head[$h][1] = $langs->trans("Invoice");
 		$head[$h][2] = 'invoice';
 		$h++;
 	}
-	if (!empty($conf->expedition->enabled)) {
+	if (1 == 2 && !empty($conf->expedition->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_shipment.php';
 		$head[$h][1] = $langs->trans("Sendings");
 		$head[$h][2] = 'shipment';
 		$h++;
 	}
-	if (!empty($conf->reception->enabled)) {
+	if (1 == 2 && !empty($conf->reception->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_reception.php';
 		$head[$h][1] = $langs->trans("Reception");
 		$head[$h][2] = 'reception';
 		$h++;
 	}
-	if (!empty($conf->ticket->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_Ticket.php';
+	if (1 == 2 && !empty($conf->ticket->enabled)) {
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_ticket.php';
 		$head[$h][1] = $langs->trans("Ticket");
 		$head[$h][2] = 'ticket';
 		$h++;
 	}
-	if (!empty($conf->ficheinter->enabled)) {
+	if (1 == 2 && !empty($conf->ficheinter->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_intervention.php';
 		$head[$h][1] = $langs->trans("Intervention");
 		$head[$h][2] = 'intervention';
 		$h++;
 	}
-	if (!empty($conf->supplier_proposal->enabled)) {
+	if (1 == 2 && !empty($conf->supplier_proposal->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierproposal.php';
 		$head[$h][1] = $langs->trans("SupplierProposal");
 		$head[$h][2] = 'supplierproposal';
 		$h++;
 	}
-	if (!empty($conf->fournisseur->enabled)) {
+	if (1 == 2 && !empty($conf->fournisseur->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierorder.php';
 		$head[$h][1] = $langs->trans("SupplierOrder");
 		$head[$h][2] = 'supplierorder';
@@ -130,31 +130,31 @@ function pdf_admin_prepare_head()
 		$head[$h][2] = 'supplierinvoice';
 		$h++;
 	}
-	if (!empty($conf->recruitment->enabled)) {
+	if (1 == 2 && !empty($conf->recruitment->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_recruitment.php';
 		$head[$h][1] = $langs->trans("Recruitment");
 		$head[$h][2] = 'recruitment';
 		$h++;
 	}
-	if (!empty($conf->contrat->enabled)) {
+	if (1 == 2 && !empty($conf->contrat->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_contrat.php';
 		$head[$h][1] = $langs->trans("Contrat");
 		$head[$h][2] = 'contrat';
 		$h++;
 	}
-	if (!empty($conf->stock->enabled)) {
+	if (1 == 2 && !empty($conf->stock->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_stock.php';
 		$head[$h][1] = $langs->trans("Stock");
 		$head[$h][2] = 'stock';
 		$h++;
 	}
-	if (!empty($conf->holiday->enabled)) {
+	if (1 == 2 && !empty($conf->holiday->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_holiday.php';
 		$head[$h][1] = $langs->trans("Holidays");
 		$head[$h][2] = 'holiday';
 		$h++;
 	}
-	if (!empty($conf->expensereport->enabled)) {
+	if (1 == 2 && !empty($conf->expensereport->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_expensereport.php';
 		$head[$h][1] = $langs->trans("Trips");
 		$head[$h][2] = 'expensereport';

From 6e32efdb400e594752e0bfdb23997964a5457358 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 20:22:36 +0200
Subject: [PATCH 591/928] Fix phpcs

---
 htdocs/compta/paiement/rapport.php                |  9 +++------
 htdocs/core/lib/company.lib.php                   |  2 +-
 .../expedition/doc/pdf_espadon.modules.php        | 15 +++++----------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index bde222ff8e0..492404a9380 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -112,15 +112,12 @@ clearstatcache();
 
 // Show link on other years
 $year_dirs = dol_dir_list($dir, 'directories', 0, '^[0-9]{4}$', '', 'DESC');
-foreach ($year_dirs as $d)
-{
+foreach ($year_dirs as $d) {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$d['name'].'">'.$d['name'].'</a> &nbsp;';
 }
 
-if ($year)
-{
-	if (is_dir($dir.'/'.$year))
-	{
+if ($year) {
+	if (is_dir($dir.'/'.$year)) {
 		if (!empty($year_dirs)) print '<br>';
 		print '<br>';
 		print '<table width="100%" class="noborder">';
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index c9bd35f7326..99bcd2c3921 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -938,7 +938,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 		//E-mail
 		't.email',
 	);
-    //Social media
+	//Social media
 	//    foreach ($socialnetworks as $key => $value) {
 	//        if ($value['active']) {
 	//            $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'";
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 64fbdeaafd8..97777adc4cd 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -395,8 +395,7 @@ class pdf_espadon extends ModelePdfExpedition
 
 					// Notes
 					$pagenb = $pdf->getPage();
-					if (!empty($notetoshow))
-					{
+					if (!empty($notetoshow)) {
 						$tab_top -= 2;
 
 						$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
@@ -415,8 +414,7 @@ class pdf_espadon extends ModelePdfExpedition
 						$pageposafternote = $pdf->getPage();
 						$posyafter = $pdf->GetY();
 
-						if ($pageposafternote > $pageposbeforenote)
-						{
+						if ($pageposafternote > $pageposbeforenote) {
 							$pdf->rollbackTransaction(true);
 
 							// prepare pages to receive notes
@@ -440,8 +438,7 @@ class pdf_espadon extends ModelePdfExpedition
 
 							$posyafter = $pdf->GetY();
 
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
-							{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {	// There is no space left for total+free text
 								$pdf->AddPage('', '', true);
 								$pagenb++;
 								$pageposafternote++;
@@ -490,8 +487,7 @@ class pdf_espadon extends ModelePdfExpedition
 							$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-							{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {
 								// not enough space, need to add page
 								$pdf->AddPage('', '', true);
 								$pagenb++;
@@ -526,8 +522,7 @@ class pdf_espadon extends ModelePdfExpedition
 				// Loop on each lines
 				$pageposbeforeprintlines = $pdf->getPage();
 				$pagenb = $pageposbeforeprintlines;
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);

From 6644fd3a739e1b222731cf8f351031bfa11c1e7d Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Mon, 3 May 2021 22:15:40 +0200
Subject: [PATCH 592/928] Fix undefined translation key

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

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 4bde256c8f8..6c4f63725e1 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -796,7 +796,7 @@ if ($rowid > 0) {
 		print $form->selectyesno("subscription", $object->subscription, 1);
 		print '</td></tr>';
 
-		print '<tr><td>'.$langs->trans("DefineAmountMemberType").'</td><td>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
 		print '<input name="amount" size="5" value="'.price($object->amount).'">';
 		print '</td></tr>';
 

From 9ef49a15e40dd539a6e2b7f2fc07e42bf951a0e4 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Mon, 3 May 2021 22:28:40 +0200
Subject: [PATCH 593/928] Update pdf.php

---
 htdocs/admin/pdf.php | 66 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 55 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 348f1e30cb5..01645c6cccc 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -224,7 +224,11 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width=
 // Hide VAT Intra on address
 
 print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td>';
-print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS', (!empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS)) ? $conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS : 0, 1);
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_TVAINTRA_NOT_IN_ADDRESS');
+} else {
+	print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS', (!empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS)) ? $conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS : 0, 1);
+}
 print '</td></tr>';
 
 // Show prof id in address into pdf
@@ -240,7 +244,11 @@ for ($i = 1; $i <= 6; $i++) {
 	if ($pid) {
 		print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid.'</td><td>';
 		$keyforconstant = 'MAIN_PROFID'.$i.'_IN_ADDRESS';
-		print $form->selectyesno($keyforconstant, isset($conf->global->$keyforconstant) ? $conf->global->$keyforconstant : 0, 1, $noCountryCode);
+		if ($conf->use_javascript_ajax) {
+			print ajax_constantonoff($keyforconstant);
+		} else {
+			print $form->selectyesno($keyforconstant, isset($conf->global->$keyforconstant) ? $conf->global->$keyforconstant : 0, 1, $noCountryCode);
+		}
 		print '</td></tr>';
 	}
 }
@@ -259,7 +267,11 @@ if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2)) {
 	if ($mysoc->useLocalTax(1)) {
 		$locales = $langs->transcountry("LT1", $mysoc->country_code);
 		$text = '<tr class="oddeven"><td>'.$langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT1", $mysoc->country_code)).'</td><td>';
-		$text .= $form->selectyesno('MAIN_PDF_MAIN_HIDE_SECOND_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX : 0, 1);
+		if ($conf->use_javascript_ajax) {
+			$text .= ajax_constantonoff('MAIN_PDF_MAIN_HIDE_SECOND_TAX');
+		} else {
+			$text .= $form->selectyesno('MAIN_PDF_MAIN_HIDE_SECOND_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX : 0, 1);
+		}
 		$text .= '</td></tr>';
 	}
 
@@ -267,7 +279,11 @@ if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2)) {
 		$locales .= ($locales ? ' & ' : '').$langs->transcountry("LT2", $mysoc->country_code);
 
 		$text .= '<tr class="oddeven"><td>'.$langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT2", $mysoc->country_code)).'</td><td>';
-		$text .= $form->selectyesno('MAIN_PDF_MAIN_HIDE_THIRD_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX : 0, 1);
+		if ($conf->use_javascript_ajax) {
+			$text .= ajax_constantonoff('MAIN_PDF_MAIN_HIDE_THIRD_TAX');
+		} else {
+			$text .= $form->selectyesno('MAIN_PDF_MAIN_HIDE_THIRD_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX : 0, 1);
+		}
 		$text .= '</td></tr>';
 	}
 }
@@ -285,7 +301,11 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width=
 // Hide any information on Sale tax / VAT
 
 print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
-print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT', (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) ? $conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT : 0, 1);
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT');
+} else {
+	print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT', (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) ? $conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT : 0, 1);
+}
 print '</td></tr>';
 
 // Locataxes
@@ -321,13 +341,21 @@ if (!empty($conf->projet->enabled)) {
 //Invert sender and recipient
 
 print '<tr class="oddeven"><td>'.$langs->trans("SwapSenderAndRecipientOnPDF").'</td><td>';
-print $form->selectyesno('MAIN_INVERT_SENDER_RECIPIENT', (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) ? $conf->global->MAIN_INVERT_SENDER_RECIPIENT : 0, 1);
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_INVERT_SENDER_RECIPIENT');
+} else {
+	print $form->selectyesno('MAIN_INVERT_SENDER_RECIPIENT', (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) ? $conf->global->MAIN_INVERT_SENDER_RECIPIENT : 0, 1);
+}
 print '</td></tr>';
 
 // Place customer adress to the ISO location
 
 print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td>';
-print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION', (!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION)) ? $conf->global->MAIN_PDF_USE_ISO_LOCATION : 0, 1);
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_PDF_USE_ISO_LOCATION');
+} else {
+	print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION', (!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION)) ? $conf->global->MAIN_PDF_USE_ISO_LOCATION : 0, 1);
+}
 print '</td></tr>';
 
 // Use 2 languages into PDF
@@ -345,25 +373,41 @@ print '</td></tr>';
 //Desc
 
 print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
-print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC', (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)) ? $conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC : 0, 1);
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_GENERATE_DOCUMENTS_HIDE_DESC');
+} else {
+	print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC', (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC)) ? $conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC : 0, 1);
+}
 print '</td></tr>';
 
 //Ref
 
 print '<tr class="oddeven"><td>'.$langs->trans("HideRefOnPDF").'</td><td>';
-print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF', (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)) ? $conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF : 0, 1);
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_GENERATE_DOCUMENTS_HIDE_REF');
+} else {
+	print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF', (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)) ? $conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF : 0, 1);
+}
 print '</td></tr>';
 
 //Details
 
 print '<tr class="oddeven"><td>'.$langs->trans("HideDetailsOnPDF").'</td><td>';
-print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS', (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)) ? $conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS : 0, 1);
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS');
+} else {
+	print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS', (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS)) ? $conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS : 0, 1);
+}
 print '</td></tr>';
 
 // SHOW_SUBPRODUCT_REF_IN_PDF - Option to show the detail of product ref for kits.
 
 print '<tr class="oddeven"><td>'.$langs->trans("SHOW_SUBPRODUCT_REF_IN_PDF", $langs->transnoentitiesnoconv("AssociatedProductsAbility"), $langs->transnoentitiesnoconv("Products")).'</td><td>';
-print $form->selectyesno('SHOW_SUBPRODUCT_REF_IN_PDF', (!empty($conf->global->SHOW_SUBPRODUCT_REF_IN_PDF)) ? $conf->global->SHOW_SUBPRODUCT_REF_IN_PDF : 0, 1);
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('SHOW_SUBPRODUCT_REF_IN_PDF');
+} else {
+	print $form->selectyesno('SHOW_SUBPRODUCT_REF_IN_PDF', (!empty($conf->global->SHOW_SUBPRODUCT_REF_IN_PDF)) ? $conf->global->SHOW_SUBPRODUCT_REF_IN_PDF : 0, 1);
+}
 print '</td></tr>';
 
 // Show more details in footer

From 9e5fdfdec36f97a3bf76e16b223e71f9e3a8405d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 23:01:05 +0200
Subject: [PATCH 594/928] Update multicurrency_rate.php

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 3e99a19cc57..d0ad3419090 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -515,7 +515,7 @@ while ($i < min($num, $limit)) {
 
 
 		// Fields from hook
-		$parameters = ['arrayfields' => $arrayfields, 'obj' => $obj];
+		$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;
 

From b3af6666975d520bc397eaf86ebcdbc8b657325c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 23:09:11 +0200
Subject: [PATCH 595/928] Clean code

---
 htdocs/admin/multicurrency.php              |   9 +-
 htdocs/multicurrency/multicurrency_rate.php | 165 ++++++++++----------
 2 files changed, 88 insertions(+), 86 deletions(-)

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 3a479480812..373ab0e0f48 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -156,8 +156,9 @@ if ($resql) {
 $form = new Form($db);
 
 $page_name = "MultiCurrencySetup";
+$help_url = '';
 
-llxHeader('', $langs->trans($page_name));
+llxHeader('', $langs->trans($page_name), $help_url);
 
 // Subheader
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -165,7 +166,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback);
 
 // Configuration header
 $head = multicurrencyAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', $langs->trans("ModuleSetup"), -1, "multicurrency");
+print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "multicurrency");
 
 
 print '<table class="noborder centpercent">';
@@ -303,7 +304,7 @@ print '<input type="hidden" name="action" value="add_currency">';
 print '<tr class="oddeven">';
 print '<td>'.$form->selectCurrency('', 'code', 1).'</td>';
 print '<td class="right">';
-print '<input type="text" name="rate" value="" size="13" placeholder="'.$langs->trans('Rate').'" />&nbsp;';
+print '<input type="text" name="rate" value="" class="width75 right" placeholder="'.$langs->trans('Rate').'" />&nbsp;';
 print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
 print '</td>';
 print '</tr>';
@@ -328,7 +329,7 @@ foreach ($TCurrency as &$currency) {
 	print '<input type="hidden" name="action" value="update_currency">';
 	print '<input type="hidden" name="fk_multicurrency" value="'.$currency->id.'">';
 	print '1 '.$conf->currency.' = ';
-	print '<input type="text" name="rate" value="'.($currency->rate->rate ? $currency->rate->rate : '').'" size="13" />&nbsp;'.$currency->code.'&nbsp;';
+	print '<input type="text" name="rate" class="width75 right" value="'.($currency->rate->rate ? $currency->rate->rate : '').'" size="13">&nbsp;'.$currency->code.'&nbsp;';
 	print '<input type="submit" name="updatecurrency" class="button" value="'.$langs->trans("Modify").'">&nbsp;';
 	print '<input type="submit" name="deletecurrency" class="button" value="'.$langs->trans("Delete").'">';
 	print '</form>';
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index d0ad3419090..3a8c1be819e 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -232,7 +232,7 @@ if (empty($reshook)) {
 $htmlother = new FormOther($db);
 
 $title = $langs->trans("CurrencyRate");
-$page_name = "ListCurrencyRate";
+$page_name = "MultiCurrencySetup";
 $help_url = '';
 
 llxHeader('', $title, $help_url, '');
@@ -417,24 +417,24 @@ if ($resql) {
 	print '<tr class="liste_titre_filter">';
 
 	// date
-if (!empty($arrayfields['cr.date_sync']['checked'])) {
-	print '<td class="liste_titre" align="left">';
-	print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d"), 'search_date_sync', 0, 0, 1);
-	print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
-	print '</td>';
-}
-	// code
-if (!empty($arrayfields['m.code']['checked'])) {
-	print '<td class="liste_titre" align="left">';
-	print  $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
-	print '</td>';
-}
-	// rate
-if (!empty($arrayfields['cr.rate']['checked'])) {
-	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" name="search_rate" size="8" value="'.dol_escape_htmltag($search_rate).'">';
-	print '</td>';
-}
+	if (!empty($arrayfields['cr.date_sync']['checked'])) {
+		print '<td class="liste_titre" align="left">';
+		print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d"), 'search_date_sync', 0, 0, 1);
+		print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
+		print '</td>';
+	}
+		// code
+	if (!empty($arrayfields['m.code']['checked'])) {
+		print '<td class="liste_titre" align="left">';
+		print  $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
+		print '</td>';
+	}
+		// rate
+	if (!empty($arrayfields['cr.rate']['checked'])) {
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" name="search_rate" size="8" value="'.dol_escape_htmltag($search_rate).'">';
+		print '</td>';
+	}
 
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields);
@@ -469,74 +469,75 @@ if (!empty($arrayfields['cr.rate']['checked'])) {
 
 	$i = 0;
 	$totalarray = array();
-while ($i < min($num, $limit)) {
-	$obj = $db->fetch_object($resql);
+	while ($i < min($num, $limit)) {
+		$obj = $db->fetch_object($resql);
 
-	print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-	// USER REQUEST UPDATE FOR THIS LINE
-	if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
-		//  var_dump($obj);
-		print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
-		print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
-		print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
+		// USER REQUEST UPDATE FOR THIS LINE
+		if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
+			//  var_dump($obj);
+			print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
+			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
+			print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
 
-		print '<td class="center nowrap ">';
-		print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
-		print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
-		print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
-		print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
-		print '</td>';
-	} else {
-		// date_sync
-		if (!empty($arrayfields['cr.date_sync']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print $obj->date_sync;
-			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-		}
-
-		// code
-		if (! empty($arrayfields['m.code']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print $obj->code." ".$obj->name;
-			print "</td>\n";
-
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// rate
-		if (! empty($arrayfields['cr.rate']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print $obj->rate;
-			print "</td>\n";
-			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;
-
-		// Action
-		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 '<td class="center nowrap ">';
+			print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
+			print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
+			print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
+			print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
+			print '</td>';
+		} else {
+			// date_sync
+			if (!empty($arrayfields['cr.date_sync']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->date_sync;
+				print "</td>\n";
+				if (!$i) $totalarray['nbfield']++;
 			}
-			print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
-			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
 
-		print "</tr>\n";
-		$i++;
+			// code
+			if (! empty($arrayfields['m.code']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->code." ".$obj->name;
+				print "</td>\n";
+
+				if (! $i) $totalarray['nbfield']++;
+			}
+
+			// rate
+			if (! empty($arrayfields['cr.rate']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->rate;
+				print "</td>\n";
+				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;
+
+			// Action
+			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 '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
+				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+
+			print "</tr>\n";
+			$i++;
+		}
 	}
 
 	$db->free($resql);

From 04930c2a9831c735f79118e8e2703571fc42765e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 23:21:39 +0200
Subject: [PATCH 596/928] Fix filter

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

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index e5d779d8e10..2132cbc141b 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -68,7 +68,7 @@ $mode = GETPOST('mode', 'aZ09');
 $search_status = (GETPOSTISSET('search_status') ?GETPOST('search_status', 'int') : GETPOST('status', 'int'));
 $search_label = GETPOST("search_label", 'alpha');
 $search_module_name = GETPOST("search_module_name", 'alpha');
-$search_lastresult = GETPOST("search_lastresult", "alpha");
+$search_lastresult = GETPOST("search_lastresult", "alphawithlgt");
 $securitykey = GETPOST('securitykey', 'alpha');
 
 $outputdir = $conf->cron->dir_output;

From 16f1651d4e8c977b5fb08387735278b15449e43b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 00:04:44 +0200
Subject: [PATCH 597/928] Add missing action events in trigger

---
 ...terface_50_modAgenda_ActionsAuto.class.php | 22 +++++++++++++++++++
 htdocs/langs/en_US/agenda.lang                |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 7f7cd5a77be..cdb490e330c 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -110,6 +110,17 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid = 0;
 			$object->socid = $object->id;
+		} elseif ($action == 'COMPANY_MODIFY') {
+				// Load translation files required by the page
+				$langs->loadLangs(array("agenda", "other", "companies"));
+
+				if (empty($object->actionmsg2)) {
+					$object->actionmsg2 = $langs->transnoentities("COMPANY_MODIFYInDolibarr", $object->name);
+				}
+				$object->actionmsg = $langs->transnoentities("COMPANY_MODIFYInDolibarr", $object->name);
+
+				$object->sendtoid = 0;
+				$object->socid = $object->id;
 		} elseif ($action == 'COMPANY_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
@@ -129,6 +140,17 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			}
 			$object->actionmsg = $langs->transnoentities("CONTACT_CREATEInDolibarr", $object->getFullName($langs));
 
+			$object->sendtoid = array($object->id => $object->id);
+			$object->socid = $object->socid;
+		} elseif ($action == 'CONTACT_MODIFY') {
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "companies"));
+
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("CONTACT_MODIFYInDolibarr", $object->name);
+			}
+			$object->actionmsg = $langs->transnoentities("CONTACT_MODIFYInDolibarr", $object->name);
+
 			$object->sendtoid = array($object->id => $object->id);
 			$object->socid = $object->socid;
 		} elseif ($action == 'CONTRACT_VALIDATE') {
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index d16188d40d4..bab409dd036 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -38,6 +38,7 @@ ActionsEvents=Events for which Dolibarr will create an action in agenda automati
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
+COMPANY_MODIFYInDolibarr=Third party %s modified
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contract %s validated
 CONTRACT_DELETEInDolibarr=Contract %s deleted
@@ -87,6 +88,7 @@ OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
 CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_MODIFYInDolibarr=Contact %s modified
 CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified

From b2901bfae03f124187e8c72c23acb240e7774fc9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 00:15:06 +0200
Subject: [PATCH 598/928] Make code simpler

---
 htdocs/admin/pdf_adherent.php                 | 110 ------------------
 htdocs/admin/pdf_contrat.php                  | 110 ------------------
 htdocs/admin/pdf_expensereport.php            | 110 ------------------
 htdocs/admin/pdf_holiday.php                  | 110 ------------------
 htdocs/admin/pdf_intervention.php             | 110 ------------------
 htdocs/admin/pdf_invoice.php                  | 110 ------------------
 htdocs/admin/pdf_order.php                    | 110 ------------------
 .../admin/{pdf_proposal.php => pdf_other.php} |   6 +-
 htdocs/admin/pdf_project.php                  | 110 ------------------
 htdocs/admin/pdf_reception.php                | 110 ------------------
 htdocs/admin/pdf_recruitment.php              | 110 ------------------
 htdocs/admin/pdf_shipment.php                 | 110 ------------------
 htdocs/admin/pdf_stock.php                    | 110 ------------------
 htdocs/admin/pdf_supplierinvoice.php          | 110 ------------------
 htdocs/admin/pdf_supplierorder.php            | 110 ------------------
 htdocs/admin/pdf_supplierproposal.php         | 110 ------------------
 htdocs/admin/pdf_ticket.php                   | 110 ------------------
 htdocs/core/lib/pdf.lib.php                   | 103 +---------------
 htdocs/langs/en_US/admin.lang                 |  18 +--
 19 files changed, 9 insertions(+), 1878 deletions(-)
 delete mode 100644 htdocs/admin/pdf_adherent.php
 delete mode 100644 htdocs/admin/pdf_contrat.php
 delete mode 100644 htdocs/admin/pdf_expensereport.php
 delete mode 100644 htdocs/admin/pdf_holiday.php
 delete mode 100644 htdocs/admin/pdf_intervention.php
 delete mode 100644 htdocs/admin/pdf_invoice.php
 delete mode 100644 htdocs/admin/pdf_order.php
 rename htdocs/admin/{pdf_proposal.php => pdf_other.php} (95%)
 delete mode 100644 htdocs/admin/pdf_project.php
 delete mode 100644 htdocs/admin/pdf_reception.php
 delete mode 100644 htdocs/admin/pdf_recruitment.php
 delete mode 100644 htdocs/admin/pdf_shipment.php
 delete mode 100644 htdocs/admin/pdf_stock.php
 delete mode 100644 htdocs/admin/pdf_supplierinvoice.php
 delete mode 100644 htdocs/admin/pdf_supplierorder.php
 delete mode 100644 htdocs/admin/pdf_supplierproposal.php
 delete mode 100644 htdocs/admin/pdf_ticket.php

diff --git a/htdocs/admin/pdf_adherent.php b/htdocs/admin/pdf_adherent.php
deleted file mode 100644
index af570117492..00000000000
--- a/htdocs/admin/pdf_adherent.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'adherent', $langs->trans("Adherent"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFAdherentDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_contrat.php b/htdocs/admin/pdf_contrat.php
deleted file mode 100644
index b6624ba59d6..00000000000
--- a/htdocs/admin/pdf_contrat.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'contrat', $langs->trans("Contrat"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFContratDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_expensereport.php b/htdocs/admin/pdf_expensereport.php
deleted file mode 100644
index 3620679f525..00000000000
--- a/htdocs/admin/pdf_expensereport.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'expensereport', $langs->trans("Expensereport"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFExpensereportDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_holiday.php b/htdocs/admin/pdf_holiday.php
deleted file mode 100644
index 7b6074b31aa..00000000000
--- a/htdocs/admin/pdf_holiday.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'holiday', $langs->trans("Holiday"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFHolidaytDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_intervention.php b/htdocs/admin/pdf_intervention.php
deleted file mode 100644
index 993e1f1f5b1..00000000000
--- a/htdocs/admin/pdf_intervention.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'intervention', $langs->trans("Intervention"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFInterventionDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_invoice.php b/htdocs/admin/pdf_invoice.php
deleted file mode 100644
index 9064d2fd499..00000000000
--- a/htdocs/admin/pdf_invoice.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'invoice', $langs->trans("Invoice"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFInvoiceDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_order.php b/htdocs/admin/pdf_order.php
deleted file mode 100644
index b81cc649d61..00000000000
--- a/htdocs/admin/pdf_order.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'order', $langs->trans("Order"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFOrderDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_proposal.php b/htdocs/admin/pdf_other.php
similarity index 95%
rename from htdocs/admin/pdf_proposal.php
rename to htdocs/admin/pdf_other.php
index 06d7bc6f15c..9120e101232 100644
--- a/htdocs/admin/pdf_proposal.php
+++ b/htdocs/admin/pdf_other.php
@@ -76,11 +76,13 @@ print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
 
 $head = pdf_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'proposal', $langs->trans("Proposals"), -1, 'pdf');
+print dol_get_fiche_head($head, 'other', $langs->trans("other"), -1, 'pdf');
 
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFProposalDesc"), $s)."</span><br>\n";
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFOtherDesc"), $s)."</span><br>\n";
 print "<br>\n";
 
+print load_fiche_titre($langs->trans("Proposal"), '', '');
+
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
diff --git a/htdocs/admin/pdf_project.php b/htdocs/admin/pdf_project.php
deleted file mode 100644
index 3a85f0ea258..00000000000
--- a/htdocs/admin/pdf_project.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'project', $langs->trans("Project"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFProjectDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_reception.php b/htdocs/admin/pdf_reception.php
deleted file mode 100644
index 32003e51f30..00000000000
--- a/htdocs/admin/pdf_reception.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'reception', $langs->trans("reception"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFReceptionDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_recruitment.php b/htdocs/admin/pdf_recruitment.php
deleted file mode 100644
index 575d3bc23cc..00000000000
--- a/htdocs/admin/pdf_recruitment.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'recruitment', $langs->trans("recruitment"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFRecruitmentDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_shipment.php b/htdocs/admin/pdf_shipment.php
deleted file mode 100644
index d456a6fb2ea..00000000000
--- a/htdocs/admin/pdf_shipment.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'shipment', $langs->trans("shipment"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFShipmentDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_stock.php b/htdocs/admin/pdf_stock.php
deleted file mode 100644
index e6b0af587b0..00000000000
--- a/htdocs/admin/pdf_stock.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'stock', $langs->trans("Stock"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFStockDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_supplierinvoice.php b/htdocs/admin/pdf_supplierinvoice.php
deleted file mode 100644
index 57dd647139d..00000000000
--- a/htdocs/admin/pdf_supplierinvoice.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'supplierinvoice', $langs->trans("supplierinvoice"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFSupplierinvoiceDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_supplierorder.php b/htdocs/admin/pdf_supplierorder.php
deleted file mode 100644
index ecf0ad4cae8..00000000000
--- a/htdocs/admin/pdf_supplierorder.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'supplierorder', $langs->trans("supplierorder"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFSupplierorderDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_supplierproposal.php b/htdocs/admin/pdf_supplierproposal.php
deleted file mode 100644
index 3fb929ed797..00000000000
--- a/htdocs/admin/pdf_supplierproposal.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'supplierproposal', $langs->trans("supplierproposal"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFSupplierproposalDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/pdf_ticket.php b/htdocs/admin/pdf_ticket.php
deleted file mode 100644
index 5ca775e2447..00000000000
--- a/htdocs/admin/pdf_ticket.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 	Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 	Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 	Regis Houssin        	<regis.houssin@inodbox.com>
- * Copyright (C) 2012-2107 	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019	   	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/admin/pdf.php
- *       \brief      Page to setup PDF options
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products', 'members', 'stocks', 'Trips'));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-}
-
-if ($action == 'update') {
-	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
-
-
-/*
- * View
- */
-
-$wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
-llxHeader('', $langs->trans("Setup"), $wikihelp);
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formadmin = new FormAdmin($db);
-
-print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
-
-$head = pdf_admin_prepare_head();
-
-print dol_get_fiche_head($head, 'ticket', $langs->trans("Ticket"), -1, 'pdf');
-
-print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFTicketDesc"), $s)."</span><br>\n";
-print "<br>\n";
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
-
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-
-print '<tr class="oddeven"><td>'.$langs->trans("").'</td><td>';
-
-print '</td></tr>';
-
-print '</table>';
-print '</div>';
-
-
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 755f292132e..086152a974b 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -49,7 +49,7 @@ function pdf_admin_prepare_head()
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf.php';
-	$head[$h][1] = $langs->trans("Général");
+	$head[$h][1] = $langs->trans("Common");
 	$head[$h][2] = 'general';
 	$h++;
 
@@ -59,105 +59,10 @@ function pdf_admin_prepare_head()
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'pdf_admin');
 
-	if (1 == 2 && !empty($conf->adherent->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_adherent.php';
-		$head[$h][1] = $langs->trans("Adherent");
-		$head[$h][2] = 'adherent';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->projet->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_project.php';
-		$head[$h][1] = $langs->trans("Project");
-		$head[$h][2] = 'project';
-		$h++;
-	}
 	if (!empty($conf->propal->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_proposal.php';
-		$head[$h][1] = $langs->trans("Proposal");
-		$head[$h][2] = 'proposal';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->commande->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_order.php';
-		$head[$h][1] = $langs->trans("Order");
-		$head[$h][2] = 'order';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->facture->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_invoice.php';
-		$head[$h][1] = $langs->trans("Invoice");
-		$head[$h][2] = 'invoice';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->expedition->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_shipment.php';
-		$head[$h][1] = $langs->trans("Sendings");
-		$head[$h][2] = 'shipment';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->reception->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_reception.php';
-		$head[$h][1] = $langs->trans("Reception");
-		$head[$h][2] = 'reception';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->ticket->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_ticket.php';
-		$head[$h][1] = $langs->trans("Ticket");
-		$head[$h][2] = 'ticket';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->ficheinter->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_intervention.php';
-		$head[$h][1] = $langs->trans("Intervention");
-		$head[$h][2] = 'intervention';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->supplier_proposal->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierproposal.php';
-		$head[$h][1] = $langs->trans("SupplierProposal");
-		$head[$h][2] = 'supplierproposal';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->fournisseur->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierorder.php';
-		$head[$h][1] = $langs->trans("SupplierOrder");
-		$head[$h][2] = 'supplierorder';
-		$h++;
-
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_supplierinvoice.php';
-		$head[$h][1] = $langs->trans("SuppliersInvoice");
-		$head[$h][2] = 'supplierinvoice';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->recruitment->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_recruitment.php';
-		$head[$h][1] = $langs->trans("Recruitment");
-		$head[$h][2] = 'recruitment';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->contrat->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_contrat.php';
-		$head[$h][1] = $langs->trans("Contrat");
-		$head[$h][2] = 'contrat';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->stock->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_stock.php';
-		$head[$h][1] = $langs->trans("Stock");
-		$head[$h][2] = 'stock';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->holiday->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_holiday.php';
-		$head[$h][1] = $langs->trans("Holidays");
-		$head[$h][2] = 'holiday';
-		$h++;
-	}
-	if (1 == 2 && !empty($conf->expensereport->enabled)) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_expensereport.php';
-		$head[$h][1] = $langs->trans("Trips");
-		$head[$h][2] = 'expensereport';
+		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_other.php';
+		$head[$h][1] = $langs->trans("Other");
+		$head[$h][2] = 'other';
 		$h++;
 	}
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index ef1573645a2..d803593bc3e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -399,23 +399,7 @@ SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=Global options for PDF generation
-PDFProjectDesc=PDF Option for project
-PDFProposalDesc=PDF Option for proposal
-PDFOrderDesc=PDF Option for order
-PDFInvoiceDesc=PDF Option for invoice
-PDFShipmentDesc=PDF Option for shipment
-PDFReceptionDesc=PDF Option for reception
-PDFTicketDesc=PDF Option for ticket
-PDFInterventionDesc=PDF option for intervention
-PDFSupplierproposalDesc=PDF Option for supplier proposal
-PDFSupplierorderDesc=PDF Option for supplier order
-PDFSupplierinvoiceDesc=PDF Option for supplier invoice
-PDFRecruitmentDesc=PDF Option for recrutment
-PDFContratDesc=PDF Option for contrat
-PDFStockDesc=PDF Option for stock
-PDFHolidaytDesc=PDF Option for holiday
-PDFExpensereportDesc=PDF Option for Expensereport
-PDFAdherentDescPDF Option for Adhrent
+PDFOtherDesc=PDF Option specific to some modules
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT

From 816acaa4c22493e3c6d8a996565c25b3f814a147 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 00:17:47 +0200
Subject: [PATCH 599/928] css

---
 htdocs/admin/pdf.php       | 11 ++++++-----
 htdocs/admin/pdf_other.php |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 01645c6cccc..7d7b5e36a40 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -182,7 +182,7 @@ print load_fiche_titre($langs->trans("DictionaryPaperFormat"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
 $selected = (isset($conf->global->MAIN_PDF_FORMAT) ? $conf->global->MAIN_PDF_FORMAT : '');
 if (empty($selected)) {
@@ -219,7 +219,7 @@ print load_fiche_titre($langs->trans("PDFAddressForging"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
 // Hide VAT Intra on address
 
@@ -266,7 +266,7 @@ $text = '';
 if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2)) {
 	if ($mysoc->useLocalTax(1)) {
 		$locales = $langs->transcountry("LT1", $mysoc->country_code);
-		$text = '<tr class="oddeven"><td>'.$langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT1", $mysoc->country_code)).'</td><td>';
+		$text = '<tr class="oddeven"><td class="titlefieldmiddle">'.$langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT1", $mysoc->country_code)).'</td><td>';
 		if ($conf->use_javascript_ajax) {
 			$text .= ajax_constantonoff('MAIN_PDF_MAIN_HIDE_SECOND_TAX');
 		} else {
@@ -278,7 +278,7 @@ if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2)) {
 	if ($mysoc->useLocalTax(2)) {
 		$locales .= ($locales ? ' & ' : '').$langs->transcountry("LT2", $mysoc->country_code);
 
-		$text .= '<tr class="oddeven"><td>'.$langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT2", $mysoc->country_code)).'</td><td>';
+		$text .= '<tr class="oddeven"><td class="titlefieldmiddle">'.$langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT2", $mysoc->country_code)).'</td><td>';
 		if ($conf->use_javascript_ajax) {
 			$text .= ajax_constantonoff('MAIN_PDF_MAIN_HIDE_THIRD_TAX');
 		} else {
@@ -293,10 +293,11 @@ if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2)) {
 	$title .= ' - '.$langs->trans("PDFLocaltax", $locales);
 }
 
+
 print load_fiche_titre($title, '', '');
 
 print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
 // Hide any information on Sale tax / VAT
 
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 9120e101232..8a757a7d34c 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -89,7 +89,7 @@ print '<input type="hidden" name="action" value="update">';
 
 print '<div class="div-table-responsive-no-min">';
 print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
 print '<tr class="oddeven"><td>'.$langs->trans("MAIN_GENERATE_PROPOSALS_WITH_PICTURE").'</td><td>';
 if ($conf->use_javascript_ajax) {

From da08670a3dd3685ad42d5942dd47f3d190ee78a3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 00:24:32 +0200
Subject: [PATCH 600/928] Update 13.0.0-14.0.0.sql

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 956e0824754..af6c2f48f50 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -449,7 +449,6 @@ ALTER TABLE llx_payment_donation ADD COLUMN ext_payment_id  varchar(128) AFTER n
 -- Rebuild sequence for postgres only after query INSERT INTO llx_salary(rowid, ...
 -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
 
-UPDATE llx_const SET value = 'github' WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
 UPDATE llx_const SET value = 'github' WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
 
 ALTER TABLE llx_facture_fourn_det ADD COLUMN fk_remise_except integer DEFAULT NULL after remise_percent;

From 1d0c0a8d2a7af5d4db370d201497f5a287f9c0fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 00:35:36 +0200
Subject: [PATCH 601/928] Fix phpcs

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

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index cdb490e330c..8e98030b484 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -111,16 +111,16 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->sendtoid = 0;
 			$object->socid = $object->id;
 		} elseif ($action == 'COMPANY_MODIFY') {
-				// Load translation files required by the page
-				$langs->loadLangs(array("agenda", "other", "companies"));
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "companies"));
 
-				if (empty($object->actionmsg2)) {
-					$object->actionmsg2 = $langs->transnoentities("COMPANY_MODIFYInDolibarr", $object->name);
-				}
-				$object->actionmsg = $langs->transnoentities("COMPANY_MODIFYInDolibarr", $object->name);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("COMPANY_MODIFYInDolibarr", $object->name);
+			}
+			$object->actionmsg = $langs->transnoentities("COMPANY_MODIFYInDolibarr", $object->name);
 
-				$object->sendtoid = 0;
-				$object->socid = $object->id;
+			$object->sendtoid = 0;
+			$object->socid = $object->id;
 		} elseif ($action == 'COMPANY_SENTBYMAIL') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));

From 034378a9588da5cb0b29614d7acda402a53e9783 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 00:58:29 +0200
Subject: [PATCH 602/928] Add online substitution keys link in mailing

---
 htdocs/comm/mailing/card.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index c3ef480d2ae..98b3622d5ef 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -222,14 +222,23 @@ if (empty($reshook)) {
 							$onlinepaymentenabled++;
 						}
 						if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+							require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+							$substitutionarray['__ONLINEPAYMENTLINK_MEMBER__'] = getOnlinePaymentUrl(0, 'member', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_DONATION__'] = getOnlinePaymentUrl(0, 'donation', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_ORDER__'] = getOnlinePaymentUrl(0, 'order', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_INVOICE__'] = getOnlinePaymentUrl(0, 'invoice', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = getOnlinePaymentUrl(0, 'contractline', $obj->source_id);
+
 							$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_DONATION__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							} else {
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'member'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_DONATION__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'donation'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'order'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);

From 08dbe74643e93220dbf6fe33418d52b136e194c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 01:10:53 +0200
Subject: [PATCH 603/928] Fix code not reachable

---
 htdocs/user/class/api_users.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 784a61d5fa8..f5f0b73a70f 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -312,7 +312,6 @@ class Users extends DolibarrApi
 			if (in_array($field, array('pass_crypted', 'pass_indatabase', 'pass_indatabase_crypted', 'pass_temp', 'api_key'))) {
 				// This properties can't be set/modified with API
 				throw new RestException(401, 'The property '.$field." can't be set/modified using the APIs");
-				continue;
 			}
 			/*if ($field == 'pass') {
 				if (empty(DolibarrApiAccess::$user->rights->user->user->password)) {
@@ -366,7 +365,6 @@ class Users extends DolibarrApi
 			if (in_array($field, array('pass_crypted', 'pass_indatabase', 'pass_indatabase_crypted', 'pass_temp', 'api_key'))) {
 				// This properties can't be set/modified with API
 				throw new RestException(401, 'The property '.$field." can't be set/modified using the APIs");
-				continue;
 			}
 			if ($field == 'pass') {
 				if ($this->useraccount->id != DolibarrApiAccess::$user->id && empty(DolibarrApiAccess::$user->rights->user->user->password)) {

From 36c6a41b1bd6b86aaaaf81d3bd571a3504210002 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 01:14:44 +0200
Subject: [PATCH 604/928] Fix non traversable case

---
 htdocs/blockedlog/ajax/check_signature.php  | 6 ++++--
 htdocs/blockedlog/class/authority.class.php | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/blockedlog/ajax/check_signature.php b/htdocs/blockedlog/ajax/check_signature.php
index cc91182293e..ba164e3e715 100644
--- a/htdocs/blockedlog/ajax/check_signature.php
+++ b/htdocs/blockedlog/ajax/check_signature.php
@@ -55,8 +55,10 @@ $blocks = $block_static->getLog('just_certified', 0, 0, 'rowid', 'ASC');
 
 $auth->signature = $block_static->getSignature();
 
-foreach ($blocks as &$b) {
-	$auth->blockchain .= $b->signature;
+if (is_array($bocks)) {
+	foreach ($blocks as &$b) {
+		$auth->blockchain .= $b->signature;
+	}
 }
 
 $hash = $auth->getBlockchainHash();
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 2071eb03c47..4ec3fc6d07e 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -71,8 +71,10 @@ class BlockedLogAuthority
 
 		$this->blockchain = '';
 
-		foreach ($blocks as &$b) {
-			$this->blockchain .= $b->signature;
+		if (is_array($bocks)) {
+			foreach ($blocks as &$b) {
+				$this->blockchain .= $b->signature;
+			}
 		}
 
 		return $this->blockchain;

From 9ab7f4ec0194c910a94fd5c4a1e66ddef329d456 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 01:41:32 +0200
Subject: [PATCH 605/928] Add tooltip for new substitution keys

---
 htdocs/core/class/html.formmail.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f56b9f6070e..ff38cdcf282 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1592,15 +1592,23 @@ class FormMail extends Form
 				$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
 				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 					if ($conf->adherent->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember';
 						$tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
 					}
+					if ($conf->donation->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_DONATION__'] = 'OnlinePaymentLinkUniquePerDonation';
+						$tmparray['__SECUREKEYPAYMENT_DONATION__'] = 'SecureKeyPAYMENTUniquePerDonation';
+					}
 					if ($conf->facture->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_INVOICE__'] = 'OnlinePaymentLinkUniquePerInvoice';
 						$tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';
 					}
 					if ($conf->commande->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_ORDER__'] = 'OnlinePaymentLinkUniquePerOrder';
 						$tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
 					}
 					if ($conf->contrat->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = 'OnlinePaymentLinkUniquePerContractLine';
 						$tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 					}
 				}

From 729a5677ad4610e39f0f5e88dbc777cdd9cb67ed Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 01:53:46 +0200
Subject: [PATCH 606/928] Group tooltip by key type

---
 htdocs/core/class/html.formmail.class.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index ff38cdcf282..96f6ee0a741 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1592,25 +1592,37 @@ class FormMail extends Form
 				$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
 				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 					if ($conf->adherent->enabled) {
-						$tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember';
 						$tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
 					}
 					if ($conf->donation->enabled) {
-						$tmparray['__ONLINEPAYMENTLINK_DONATION__'] = 'OnlinePaymentLinkUniquePerDonation';
 						$tmparray['__SECUREKEYPAYMENT_DONATION__'] = 'SecureKeyPAYMENTUniquePerDonation';
 					}
 					if ($conf->facture->enabled) {
-						$tmparray['__ONLINEPAYMENTLINK_INVOICE__'] = 'OnlinePaymentLinkUniquePerInvoice';
 						$tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';
 					}
 					if ($conf->commande->enabled) {
-						$tmparray['__ONLINEPAYMENTLINK_ORDER__'] = 'OnlinePaymentLinkUniquePerOrder';
 						$tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
 					}
 					if ($conf->contrat->enabled) {
-						$tmparray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = 'OnlinePaymentLinkUniquePerContractLine';
 						$tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 					}
+
+					//Online payement link
+					if ($conf->adherent->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember';
+					}
+					if ($conf->donation->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_DONATION__'] = 'OnlinePaymentLinkUniquePerDonation';
+					}
+					if ($conf->facture->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_INVOICE__'] = 'OnlinePaymentLinkUniquePerInvoice';
+					}
+					if ($conf->commande->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_ORDER__'] = 'OnlinePaymentLinkUniquePerOrder';
+					}
+					if ($conf->contrat->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = 'OnlinePaymentLinkUniquePerContractLine';
+					}
 				}
 			} else {
 				/* No need to show into tooltip help, option is not enabled

From ee4288fae31fd2321d7e840902a66eb1ca10c633 Mon Sep 17 00:00:00 2001
From: kastoras <kastoras_1@hotmail.com>
Date: Tue, 4 May 2021 10:48:31 +0300
Subject: [PATCH 607/928] NEW Add pagination at Get Products response

At REST API generate pagination data when getting products list using $pagination_data parameter
---
 htdocs/product/class/api_products.class.php | 24 ++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index fbbf17628ba..e6dbae812bc 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -167,9 +167,10 @@ class Products extends DolibarrApi
 	 * @param  string $sqlfilters 			Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
 	 * @param  bool   $ids_only   			Return only IDs of product instead of all properties (faster, above all if list is long)
 	 * @param  int    $variant_filter   	Use this param to filter list (0 = all, 1=products without variants, 2=parent of variants, 3=variants only)
+	 * @param  bool   $pagination_data   	If this parameter is set to true the response will include pagination data. Default value is false. Page starts from 0
 	 * @return array                		Array of product objects
 	 */
-	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false, $variant_filter = 0)
+	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false, $variant_filter = 0, $pagination_data = false)
 	{
 		global $db, $conf;
 
@@ -221,6 +222,9 @@ class Products extends DolibarrApi
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
+		//this query will return total products with the filters given
+		$sqlTotals =  str_replace('SELECT t.rowid, t.ref, t.ref_ext','SELECT count(t.rowid) as total',$sql);		
+
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
 			if ($page < 0) {
@@ -254,6 +258,24 @@ class Products extends DolibarrApi
 		if (!count($obj_ret)) {
 			throw new RestException(404, 'No product found');
 		}
+
+		//if $pagination_data is true the response will contain element data with all values and element pagination with pagination data(total,page,limit)
+		if($pagination_data){
+			$totalsResult = $this->db->query($sqlTotals);
+			$total = $this->db->fetch_object($totalsResult)->total;
+
+			$tmp = $obj_ret;
+			$obj_ret = [];
+
+			$obj_ret['data'] = $tmp;
+			$obj_ret['pagination'] = [
+				'total' => (int)$total,
+				'page' => $page, //count starts from 0
+				'page_count' => ceil((int)$total/$limit),
+				'limit' => $limit
+			];
+		}		
+
 		return $obj_ret;
 	}
 

From 60fc9f5ecd671ca4ff57a90e2861ee74aafecb02 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 4 May 2021 07:52:53 +0000
Subject: [PATCH 608/928] Fixing style errors.

---
 htdocs/product/class/api_products.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index e6dbae812bc..fc89787deda 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -223,7 +223,7 @@ class Products extends DolibarrApi
 		}
 
 		//this query will return total products with the filters given
-		$sqlTotals =  str_replace('SELECT t.rowid, t.ref, t.ref_ext','SELECT count(t.rowid) as total',$sql);		
+		$sqlTotals =  str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
@@ -260,7 +260,7 @@ class Products extends DolibarrApi
 		}
 
 		//if $pagination_data is true the response will contain element data with all values and element pagination with pagination data(total,page,limit)
-		if($pagination_data){
+		if ($pagination_data) {
 			$totalsResult = $this->db->query($sqlTotals);
 			$total = $this->db->fetch_object($totalsResult)->total;
 
@@ -269,12 +269,12 @@ class Products extends DolibarrApi
 
 			$obj_ret['data'] = $tmp;
 			$obj_ret['pagination'] = [
-				'total' => (int)$total,
+				'total' => (int) $total,
 				'page' => $page, //count starts from 0
-				'page_count' => ceil((int)$total/$limit),
+				'page_count' => ceil((int) $total/$limit),
 				'limit' => $limit
 			];
-		}		
+		}
 
 		return $obj_ret;
 	}

From b14de0bff7d0bd2fe4281dfcf53fab09204dd01a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 10:56:21 +0200
Subject: [PATCH 609/928] NEW Can clone a cron job.

---
 htdocs/cron/card.php                | 55 ++++++++++++++++++++++++-----
 htdocs/cron/class/cronjob.class.php | 11 +++---
 htdocs/langs/en_US/cron.lang        |  2 +-
 3 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 0a042e56e03..1683fadf16a 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -36,10 +36,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/cron.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'cron', 'members'));
 
-if (!$user->rights->cron->create) {
-	accessforbidden();
-}
-
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -49,6 +45,12 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
 $securitykey = GETPOST('securitykey', 'alpha');
 
+$permissiontoadd = $user->rights->cron->create;
+
+if (!$user->rights->cron->create) {
+	accessforbidden();
+}
+
 
 /*
  * Actions
@@ -219,6 +221,30 @@ if ($action == 'inactive') {
 	}
 }
 
+// Action clone object
+if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd)) {
+	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) {
+		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+	} else {
+		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone or if createFromClone modifies the object. We use native clone to keep this->db valid.
+
+		$result = $objectutil->createFromClone($user, (($object->id > 0) ? $object->id : $id));
+		if (is_object($result) || $result > 0) {
+			$newid = 0;
+			if (is_object($result)) {
+				$newid = $result->id;
+			} else {
+				$newid = $result;
+			}
+			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
+			exit;
+		} else {
+			setEventMessages($objectutil->error, $objectutil->errors, 'errors');
+			$action = '';
+		}
+	}
+}
+
 
 
 /*
@@ -230,9 +256,9 @@ $formCron = new FormCron($db);
 
 llxHeader('', $langs->trans("CronTask"));
 
-if ($action == 'edit' || empty($action) || $action == 'delete' || $action == 'execute') {
-	$head = cron_prepare_head($object);
-} elseif ($action == 'create') {
+$head = cron_prepare_head($object);
+
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("CronTask"), '', 'title_setup');
 }
 
@@ -259,17 +285,26 @@ if ($conf->use_javascript_ajax) {
 }
 
 if ($action == 'delete') {
-	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CronDelete"), $langs->trans("CronConfirmDelete"), "confirm_delete", '', '', 1);
+	$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CronDelete"), $langs->trans("CronConfirmDelete"), "confirm_delete", '', '', 1);
 
 	$action = '';
 }
 
 if ($action == 'execute') {
-	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id.'&securitykey='.$securitykey, $langs->trans("CronExecute"), $langs->trans("CronConfirmExecute"), "confirm_execute", '', '', 1);
+	$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id.'&securitykey='.$securitykey, $langs->trans("CronExecute"), $langs->trans("CronConfirmExecute"), "confirm_execute", '', '', 1);
 
 	$action = '';
 }
 
+// Clone confirmation
+if ($action == 'clone') {
+	// Create an array for form
+	$formquestion = array();
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+}
+
+// Print form confirm
+print $formconfirm;
 
 
 /*
@@ -727,6 +762,8 @@ if (($action == "create") || ($action == "edit")) {
 	if (!$user->rights->cron->create) {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").'</a>';
 	} else {
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=clone&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Clone").'</a>';
+
 		if (empty($object->status)) {
 			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=activate&token='.newToken().'&id='.$object->id.'">'.$langs->trans("CronStatusActiveBtn").'</a>';
 		} else {
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index f54f7c40c4c..2ffce20a924 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -859,6 +859,8 @@ class Cronjob extends CommonObject
 	 */
 	public function createFromClone(User $user, $fromid)
 	{
+		global $langs;
+
 		$error = 0;
 
 		$object = new Cronjob($this->db);
@@ -868,10 +870,10 @@ class Cronjob extends CommonObject
 		// Load source object
 		$object->fetch($fromid);
 		$object->id = 0;
-		$object->statut = 0;
 
 		// Clear fields
-		// ...
+		$object->status = self::STATUS_DISABLED;
+		$object->label = $langs->trans("CopyOf").' '.$object->label;
 
 		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
@@ -883,11 +885,6 @@ class Cronjob extends CommonObject
 			$error++;
 		}
 
-		//if (! $error)
-		//{
-
-		//}
-
 		unset($object->context['createfromclone']);
 
 		// End
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 2ebdda1e685..4fd2220dea6 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
 CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
+CronTaskInactive=This job is disabled (not scheduled)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>

From c82317c8afe2e20b25980c219cb1743f19513b56 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 11:06:24 +0200
Subject: [PATCH 610/928] Fix missing include

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 172788c8517..f98b372f149 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4926,6 +4926,7 @@ class Facture extends CommonInvoice
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 		$formmail = new FormMail($this->db);
 
 		$now = dol_now();

From ce869003cf59f70b706bccf5c01e6dc2918cb564 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 11:13:22 +0200
Subject: [PATCH 611/928] Prepare beta v14

---
 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 e479b1430a1..2c7795b9ac8 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '14.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '14.0.0-beta'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From e497e58ebd1ec7f23efd745aecdf274acc843998 Mon Sep 17 00:00:00 2001
From: NextGestion <contact@nextgestion.com>
Date: Tue, 4 May 2021 10:29:31 +0100
Subject: [PATCH 612/928] Conflicts

---
 htdocs/partnership/admin/about.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/partnership/admin/about.php b/htdocs/partnership/admin/about.php
index c8a01516ed6..0d3fb11c4e3 100644
--- a/htdocs/partnership/admin/about.php
+++ b/htdocs/partnership/admin/about.php
@@ -72,8 +72,6 @@ $backtopage = GETPOST('backtopage', 'alpha');
  * Actions
  */
 
-// None
-
 
 /*
  * View

From 526235d0204222012bdc538e45e534b3d705b8e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 13:33:18 +0200
Subject: [PATCH 613/928] Fix substitution of mix html/nohtml Fix send email
 reminder for past due date of invoices More PHPUnit test

---
 htdocs/compta/facture/class/facture.class.php |  28 ++--
 htdocs/core/lib/functions.lib.php             | 158 ++++++++++--------
 htdocs/core/modules/modFacture.class.php      |   2 +-
 htdocs/langs/en_US/bills.lang                 |   1 +
 htdocs/langs/en_US/errors.lang                |   1 +
 htdocs/theme/eldy/global.inc.php              |   7 +-
 test/phpunit/FunctionsLibTest.php             |  59 +++++--
 7 files changed, 156 insertions(+), 100 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index f98b372f149..db3fd2b6837 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4912,8 +4912,9 @@ class Facture extends CommonInvoice
 		$nbMailSend = 0;
 		$errorsMsg = array();
 
+		$langs->load("bills");
+
 		if (empty($conf->facture->enabled)) {	// Should not happen. If module disabled, cron job should not be visible.
-			$langs->load("bills");
 			$this->output .= $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Facture"));
 			return 0;
 		}
@@ -4930,6 +4931,8 @@ class Facture extends CommonInvoice
 		$formmail = new FormMail($this->db);
 
 		$now = dol_now();
+		$tmpidate = dol_get_first_hour(dol_time_plus_duree($now, $nbdays, 'd'), 'gmt');
+
 		$tmpinvoice = new Facture($this->db);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -4942,16 +4945,18 @@ class Facture extends CommonInvoice
 			$sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
 		}
 		$sql .= " WHERE f.paye = 0";
-		$sql .= " AND f.date_lim_reglement = '".$this->db->idate(dol_get_first_hour(dol_time_plus_duree($now, -1 * $nbdays, 'd'), 'gmt'), 'gmt')."'";
+		$sql .= " AND f.date_lim_reglement = '".$this->db->idate($tmpidate, 'gmt')."'";
 		$sql .= " AND f.entity IN (".getEntity('facture').")";
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '".$this->db->escape($paymentmode)."'";
 		}
 		// TODO Add filter to check there is no payment started
 		$sql .= $this->db->order("date_lim_reglement", "ASC");
+
 		$resql = $this->db->query($sql);
-		$tmpidate=$this->db->idate(dol_get_first_hour(dol_time_plus_duree($now, -1 * $nbdays, 'd'), 'gmt'), 'gmt');
-		$this->output .= 'Search unpaid invoices with due date = '.$tmpidate.'<br>';
+
+		$stmpidate = dol_print_date($tmpidate, 'day', 'gmt');
+		$this->output .= $langs->trans("SearchUnpaidInvoicesWithDueDate", $stmpidate).'<br>';
 
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
@@ -4964,6 +4969,7 @@ class Facture extends CommonInvoice
 						$outputlangs = new Translate('', $conf);
 						if ($tmpinvoice->thirdparty->default_lang) {
 							$outputlangs->setDefaultLang($tmpinvoice->thirdparty->default_lang);
+							$outputlangs->loadLangs(array("main", "bills"));
 						} else {
 							$outputlangs = $langs;
 						}
@@ -4971,8 +4977,8 @@ class Facture extends CommonInvoice
 						// Select email template
 						$arraymessage = $formmail->getEMailTemplate($this->db, 'facture_send', $user, $outputlangs, (is_numeric($template) ? $template : 0), 1, (is_numeric($template) ? '' : $template));
 						if (is_numeric($arraymessage) && $arraymessage <= 0) {
-							$langs->load("bills");
-							$this->output .= $langs->trans('FailedToFindEmailTemplate', $template);
+							$langs->load("errors");
+							$this->output .= $langs->trans('ErrorFailedToFindEmailTemplate', $template);
 							return 0;
 						}
 
@@ -4980,15 +4986,17 @@ class Facture extends CommonInvoice
 						$errormesg = '';
 
 						// Make substitution in email content
-						$substitutionarray = getCommonSubstitutionArray($langs, 0, '', $this);
+						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, '', $tmpinvoice);
 
-						complete_substitutions_array($substitutionarray, $langs, $this);
+						complete_substitutions_array($substitutionarray, $outputlangs, $tmpinvoice);
 
 						// Content
-						$sendContent = make_substitutions($langs->trans($arraymessage->content), $substitutionarray);
+						$content = $outputlangs->transnoentitiesnoconv($arraymessage->content);
+
+						$sendContent = make_substitutions($content, $substitutionarray, $outputlangs, 1);
 
 						//Topic
-						$sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : html_entity_decode($langs->trans('EventReminder'));
+						$sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : $outputlangs->transnoentitiesnoconv('InformationMessage');
 
 						// Recipient
 						$res = $tmpinvoice->fetch_thirdparty();
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e5d7acbd250..5eda236d6f0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2369,42 +2369,23 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
  */
 function dol_getdate($timestamp, $fast = false, $forcetimezone = '')
 {
-	global $conf;
-
-	if (empty($conf->global->MAIN_USE_OLD_FUNCTIONS_FOR_GETDATE)) {
-		//$datetimeobj = new DateTime('@'.$timestamp);
-		$datetimeobj = new DateTime();
-		$datetimeobj->setTimestamp($timestamp); // Use local PHP server timezone
-		if ($forcetimezone) {
-			$datetimeobj->setTimezone(new DateTimeZone($forcetimezone == 'gmt' ? 'UTC' : $forcetimezone)); //  (add timezone relative to the date entered)
-		}
-		$arrayinfo = array(
-			'year'=>((int) date_format($datetimeobj, 'Y')),
-			'mon'=>((int) date_format($datetimeobj, 'm')),
-			'mday'=>((int) date_format($datetimeobj, 'd')),
-			'wday'=>((int) date_format($datetimeobj, 'w')),
-			'yday'=>((int) date_format($datetimeobj, 'z')),
-			'hours'=>((int) date_format($datetimeobj, 'H')),
-			'minutes'=>((int) date_format($datetimeobj, 'i')),
-			'seconds'=>((int) date_format($datetimeobj, 's')),
-			'0'=>$timestamp
-		);
-	} else {
-		// PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows
-		$usealternatemethod = false;
-		if ($timestamp <= 0) {
-			$usealternatemethod = true; // <= 1970
-		}
-		if ($timestamp >= 2145913200) {
-			$usealternatemethod = true; // >= 2038
-		}
-
-		if ($usealternatemethod) {
-			$arrayinfo = adodb_getdate($timestamp, $fast);
-		} else {
-			$arrayinfo = getdate($timestamp);
-		}
+	//$datetimeobj = new DateTime('@'.$timestamp);
+	$datetimeobj = new DateTime();
+	$datetimeobj->setTimestamp($timestamp); // Use local PHP server timezone
+	if ($forcetimezone) {
+		$datetimeobj->setTimezone(new DateTimeZone($forcetimezone == 'gmt' ? 'UTC' : $forcetimezone)); //  (add timezone relative to the date entered)
 	}
+	$arrayinfo = array(
+		'year'=>((int) date_format($datetimeobj, 'Y')),
+		'mon'=>((int) date_format($datetimeobj, 'm')),
+		'mday'=>((int) date_format($datetimeobj, 'd')),
+		'wday'=>((int) date_format($datetimeobj, 'w')),
+		'yday'=>((int) date_format($datetimeobj, 'z')),
+		'hours'=>((int) date_format($datetimeobj, 'H')),
+		'minutes'=>((int) date_format($datetimeobj, 'i')),
+		'seconds'=>((int) date_format($datetimeobj, 's')),
+		'0'=>$timestamp
+	);
 
 	return $arrayinfo;
 }
@@ -6664,6 +6645,8 @@ function dol_textishtml($msg, $option = 0)
 			return true;
 		} elseif (preg_match('/<\/textarea/i', $msg)) {
 			return true;
+		} elseif (preg_match('/<(b|em|i|u)>/i', $msg)) {
+			return true;
 		} elseif (preg_match('/<br/i', $msg)) {
 			return true;
 		}
@@ -6681,9 +6664,7 @@ function dol_textishtml($msg, $option = 0)
 			return true;
 		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) {
 			return true;
-		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) {
-			return true;
-		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) {
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/?>/i', $msg)) {
 			return true;
 		} elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {
 			return true; // must accept <img src="http://example.com/aaa.png" />
@@ -7220,13 +7201,15 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
  *  complete_substitutions_array($substitutionarray, $langs, $thirdparty);
  *  $mesg = make_substitutions($mesg, $substitutionarray, $langs);
  *
- *  @param	string		$text	      			Source string in which we must do substitution
- *  @param  array		$substitutionarray		Array with key->val to substitute. Example: array('__MYKEY__' => 'MyVal', ...)
- *  @param	Translate	$outputlangs			Output language
- * 	@return string  		    				Output string after substitutions
+ *  @param	string		$text	      					Source string in which we must do substitution
+ *  @param  array		$substitutionarray				Array with key->val to substitute. Example: array('__MYKEY__' => 'MyVal', ...)
+ *  @param	Translate	$outputlangs					Output language
+ *  @param	int			$converttextinhtmlifnecessary	0=Convert only value into HTML if text is already in HTML
+ *  													1=Will also convert initial $text into HTML if we try to insert one value that is HTML
+ * 	@return string  		    						Output string after substitutions
  *  @see	complete_substitutions_array(), getCommonSubstitutionArray()
  */
-function make_substitutions($text, $substitutionarray, $outputlangs = null)
+function make_substitutions($text, $substitutionarray, $outputlangs = null, $converttextinhtmlifnecessary = 0)
 {
 	global $conf, $langs;
 
@@ -7238,22 +7221,41 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null)
 		$outputlangs = $langs;
 	}
 
+	// Is initial text HTML or simple text ?
+	$msgishtml = 0;
+	if (dol_textishtml($text, 1)) {
+		$msgishtml = 1;
+	}
+
 	// Make substitution for language keys: __(AnyTranslationKey)__ or __(AnyTranslationKey|langfile)__
 	if (is_object($outputlangs)) {
 		$reg = array();
 		while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {
-			$msgishtml = 0;
-			if (dol_textishtml($text, 1)) {
-				$msgishtml = 1;
-			}
-
 			// If key is __(TranslationKey|langfile)__, then force load of langfile.lang
 			$tmp = explode('|', $reg[1]);
 			if (!empty($tmp[1])) {
 				$outputlangs->load($tmp[1]);
 			}
 
-			$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);
+			$value = $outputlangs->transnoentitiesnoconv($reg[1]);
+
+			if (empty($converttextinhtmlifnecessary)) {
+				// convert $newval into HTML is necessary
+				$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ? dol_htmlentitiesbr($value) : $value, $text);
+			} else {
+				if (! $msgishtml) {
+					$valueishtml = dol_textishtml($value, 1);
+
+					if ($valueishtml) {
+						$text = dol_htmlentitiesbr($text);
+						$msgishtml = 1;
+					}
+				} else {
+					$value = dol_nl2br("$value");
+				}
+
+				$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $value, $text);
+			}
 		}
 	}
 
@@ -7261,18 +7263,30 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null)
 	// Must be after the substitution of translation, so if the text of translation contains a string __[xxx]__, it is also converted.
 	$reg = array();
 	while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {
-		$msgishtml = 0;
-		if (dol_textishtml($text, 1)) {
-			$msgishtml = 1;
-		}
-
 		$keyfound = $reg[1];
 		if (isASecretKey($keyfound)) {
-			$newval = '*****forbidden*****';
+			$value = '*****forbidden*****';
 		} else {
-			$newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
+			$value = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
+		}
+
+		if (empty($converttextinhtmlifnecessary)) {
+			// convert $newval into HTML is necessary
+			$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ? dol_htmlentitiesbr($value) : $value, $text);
+		} else {
+			if (! $msgishtml) {
+				$valueishtml = dol_textishtml($value, 1);
+
+				if ($valueishtml) {
+					$text = dol_htmlentitiesbr($text);
+					$msgishtml = 1;
+				}
+			} else {
+				$value = dol_nl2br("$value");
+			}
+
+			$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $value, $text);
 		}
-		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ?dol_htmlentitiesbr($newval) : $newval, $text);
 	}
 
 	// Make substitition for array $substitutionarray
@@ -7285,7 +7299,22 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null)
 			$value = ''; // Protection
 		}
 
-		$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
+		if (empty($converttextinhtmlifnecessary)) {
+			$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
+		} else {
+			if (! $msgishtml) {
+				$valueishtml = dol_textishtml($value, 1);
+
+				if ($valueishtml) {
+					$text = dol_htmlentitiesbr($text);
+					$msgishtml = 1;
+				}
+			} else {
+				$value = dol_nl2br("$value");
+			}
+
+			$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
+		}
 	}
 
 	return $text;
@@ -7309,18 +7338,7 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	// Add a substitution key for each extrafields, using key __EXTRA_XXX__
-	// TODO Remove this. Already available into the getCommonSubstitutionArray used to build the substitution array.
-	/*if (is_object($object) && is_array($object->array_options))
-	{
-		foreach($object->array_options as $key => $val)
-		{
-			$keyshort=preg_replace('/^(options|extra)_/','',$key);
-			$substitutionarray['__EXTRAFIELD_'.$keyshort.'__']=$val;
-			// For backward compatibiliy
-			$substitutionarray['%EXTRA_'.$keyshort.'%']=$val;
-		}
-	}*/
+	// Note: substitution key for each extrafields, using key __EXTRA_XXX__ is already available into the getCommonSubstitutionArray used to build the substitution array.
 
 	// Check if there is external substitution to do, requested by plugins
 	$dirsubstitutions = array_merge(array(), (array) $conf->modules_parts['substitutions']);
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index dccf36b8137..b296fa3b32c 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -121,7 +121,7 @@ class modFacture extends DolibarrModules
 		$datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 		$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, 'priority'=>50, 'status'=>1, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
-			1=>array('label'=>'SendEmailsRemindersOnInvoiceDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsRemindersOnInvoiceDueDate', 'parameters'=>"10,all,EmailTemplateCode", 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days. First param is the offset n of days, second parameter is "all" or a payment mode code, last paramater is the code of email template to use (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority).', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
+			1=>array('label'=>'SendEmailsRemindersOnInvoiceDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsRemindersOnInvoiceDueDate', 'parameters'=>"10,all,EmailTemplateCode", 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days = today. First param is the offset n of days, second parameter is "all" or a payment mode code, last paramater is the code of email template to use (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority).', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
 		);
 
 		// Permissions
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index c55f483873b..940da4e35b4 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -589,3 +589,4 @@ FacParentLine=Invoice Line Parent
 SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
+SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
\ No newline at end of file
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 304853a4123..c4f88a8d5b3 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -262,6 +262,7 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e026b6d5762..a60e81c6cf3 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4421,7 +4421,12 @@ div.backgreypublicpayment { background-color: #f0f0f0; padding: 20px; border-bot
 	opacity: 0.3;
 }
 #dolpaymenttable { min-width: 320px; font-size: 16px; }	/* Width must have min to make stripe input area visible. Lower than 320 makes input area crazy for credit card that need zip code */
-#tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
+#tablepublicpayment {
+	border: 1px solid #CCCCCC !important;
+	width: 100%;
+	padding: 20px;
+	margin-bottom: 25px;
+}
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
 #tablepublicpayment tr.liste_total td { border-top: none; }
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index e43453b26ec..d7855c381d4 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -61,6 +61,11 @@ if (! defined("NOLOGIN")) {
 	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
 }
 
+print "\n".$langs->trans("CurrentTimeZone").' : '.getServerTimeZoneString();
+print "\n".$langs->trans("CurrentHour").' : '.dol_print_date(dol_now('gmt'), 'dayhour', 'tzserver');
+print "\n";
+
+
 /**
  * Class for PHPUnit tests
  *
@@ -1376,16 +1381,16 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 
 		$conf->global->MAIN_START_WEEK = 0;
 
-		$tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
-		$this->assertEquals(5, $tmp['wday']);
+		$tmp=dol_getdate(24*60*60+1, false, 'UTC');		// 2/1/1970 and 1 second = friday
+		$this->assertEquals(5, $tmp['wday'], 'Bad value of day in week');
 
 		$conf->global->MAIN_START_WEEK = 1;
 
-		$tmp=dol_getdate(1);				// 1/1/1970 and 1 second = thirday
-		$this->assertEquals(4, $tmp['wday']);
+		$tmp=dol_getdate(1, false, 'UTC');				// 1/1/1970 and 1 second = thirday
+		$this->assertEquals(4, $tmp['wday'], 'Bad value of day in week');
 
-		$tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
-		$this->assertEquals(5, $tmp['wday']);
+		$tmp=dol_getdate(24*60*60+1, false, 'UTC');		// 2/1/1970 and 1 second = friday
+		$this->assertEquals(5, $tmp['wday'], 'Bad value of day in week');
 
 		$tmp=dol_getdate(1, false, "Europe/Paris");						// 1/1/1970 and 1 second = thirday
 		$this->assertEquals(1970, $tmp['year']);
@@ -1417,38 +1422,36 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$conf->global->MAIN_USE_OLD_FUNCTIONS_FOR_GETDATE = 1;
-
-		$tmp=dol_getdate(1);						// 1/1/1970 and 1 second = thirday
+		$tmp=dol_getdate(1, false, 'UTC');						// 1/1/1970 and 1 second = thirday
 		$this->assertEquals(1970, $tmp['year']);
 		$this->assertEquals(1, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
 		$this->assertEquals(4, $tmp['wday']);
 		$this->assertEquals(0, $tmp['yday']);
 		// We must disable this because on CI, timezone is may be UTC or something else
-		//$this->assertEquals(1, $tmp['hours']);		// We are winter, so we are GMT+1 even during summer
+		//$this->assertEquals(1, $tmp['hours']);	// We are winter, so we are GMT+1 even during summer
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp=dol_getdate(15638401);					// 1/7/1970 and 1 second = wednesday
+		$tmp=dol_getdate(15638401, false, 'UTC');				// 1/7/1970 and 1 second = wednesday
 		$this->assertEquals(1970, $tmp['year']);
 		$this->assertEquals(7, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
 		$this->assertEquals(3, $tmp['wday']);
 		$this->assertEquals(181, $tmp['yday']);
 		// We must disable this because on CI, timezone is may be UTC or something else
-		//$this->assertEquals(1, $tmp['hours']);		// There is no daylight in 1970, so we are GMT+1 even during summer
+		//$this->assertEquals(1, $tmp['hours']);	// There is no daylight in 1970, so we are GMT+1 even during summer
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp=dol_getdate(1593561601);				// 1/7/2020 and 1 second = wednesday
+		$tmp=dol_getdate(1593561601, false, 'UTC');				// 1/7/2020 and 1 second = wednesday
 		$this->assertEquals(2020, $tmp['year']);
 		$this->assertEquals(7, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
 		$this->assertEquals(3, $tmp['wday']);
 		$this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
 		// We must disable this because on CI, timezone is may be UTC or something else
-		//$this->assertEquals(2, $tmp['hours']);		// There is a daylight, so we are GMT+2
+		//$this->assertEquals(2, $tmp['hours']);	// There is a daylight, so we are GMT+2
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
@@ -1463,13 +1466,33 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 	 */
 	public function testMakeSubstitutions()
 	{
-		global $conf, $langs;
+		global $conf, $langs, $mysoc;
 		$langs->load("main");
 
-		$substit=array("AAA"=>'Not used', "BBB"=>'Not used', "CCC"=>"C replaced");
-		$chaine='This is a string with __[MAIN_THEME]__ and __(DIRECTION)__ and __CCC__';
+		// Try simple replacement
+		$substit = array("__AAA__"=>'Not used', "__BBB__"=>'Not used', "__CCC__"=>"C replaced", "DDD"=>"D replaced");
+		$substit += getCommonSubstitutionArray($langs);
+
+		$chaine = 'This is a string with theme constant __[MAIN_THEME]__ and __(DIRECTION)__ and __CCC__ and DDD and __MYCOMPANY_NAME__ and __YEAR__';
 		$newstring = make_substitutions($chaine, $substit);
-		$this->assertEquals($newstring, 'This is a string with eldy and ltr and __C replaced__');
+		print __METHOD__." ".$newstring."\n";
+		$this->assertEquals($newstring, 'This is a string with theme constant eldy and ltr and C replaced and D replaced and '.$mysoc->name.' and '.dol_print_date(dol_now(), '%Y', 'gmt'));
+
+		// Try mix HTML not HTML, no change on initial text
+		$substit = array("__NOHTML__"=>'No html', "__HTML__"=>'<b>HTML</b>');
+
+		$chaine = "This is a text with\nNew line\nThen\n__NOHTML__\nThen\n__HTML__";
+		$newstring = make_substitutions($chaine, $substit, $langs);
+		print __METHOD__." ".$newstring."\n";
+		$this->assertEquals($newstring, "This is a text with\nNew line\nThen\nNo html\nThen\n<b>HTML</b>", 'Test on make_substitutions with conversion of inserted values only');
+
+		// Try mix HTML not HTML, accept to change initial text
+		$substit = array("__NOHTML__"=>'No html', "__HTML__"=>'<b>HTML</b>');
+
+		$chaine = "This is a text with\nNew line\nThen\n__NOHTML__\nThen\n__HTML__";
+		$newstring = make_substitutions($chaine, $substit, $langs, 1);
+		print __METHOD__." ".$newstring."\n";
+		$this->assertEquals($newstring, "This is a text with<br>\nNew line<br>\nThen<br>\nNo html<br>\nThen<br>\n<b>HTML</b>", 'Test on make_substitutions with full conversion of text accepted');
 
 		return true;
 	}

From 457a96bc343428cf357275e8385e666e571c4a34 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 4 May 2021 15:11:30 +0200
Subject: [PATCH 614/928] Fix  #17475 : Add of List-Unsubscribe in mass
 emailing

---
 htdocs/comm/mailing/card.php      | 5 +++--
 htdocs/core/lib/functions.lib.php | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index c3ef480d2ae..a520a44e467 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -265,9 +265,10 @@ if (empty($reshook)) {
 						}
 						//$substitutionisok=true;
 
+						$moreinheader = '';
 						complete_substitutions_array($substitutionarray, $langs);
 						$newsubject = make_substitutions($subject, $substitutionarray);
-						$newmessage = make_substitutions($message, $substitutionarray);
+						$newmessage = make_substitutions($message, $substitutionarray, null, 0, $moreinheader);
 
 						$arr_file = array();
 						$arr_mime = array();
@@ -285,7 +286,7 @@ if (empty($reshook)) {
 
 						// Mail making
 						$trackid = 'emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
-						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
+						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, $moreinheader, 'emailing');
 
 						if ($mail->error) {
 							$res = 0;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5eda236d6f0..b017f9c037b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7206,10 +7206,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
  *  @param	Translate	$outputlangs					Output language
  *  @param	int			$converttextinhtmlifnecessary	0=Convert only value into HTML if text is already in HTML
  *  													1=Will also convert initial $text into HTML if we try to insert one value that is HTML
+ * 	@param  string      $moreinheader					Header for CMailer module
  * 	@return string  		    						Output string after substitutions
  *  @see	complete_substitutions_array(), getCommonSubstitutionArray()
  */
-function make_substitutions($text, $substitutionarray, $outputlangs = null, $converttextinhtmlifnecessary = 0)
+function make_substitutions($text, $substitutionarray, $outputlangs = null, $converttextinhtmlifnecessary = 0, &$moreinheader = null)
 {
 	global $conf, $langs;
 
@@ -7312,9 +7313,12 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 			} else {
 				$value = dol_nl2br("$value");
 			}
-
 			$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
 		}
+		if ($key == '__UNSUBSCRIBE__' && (isset($moreinheader))) {
+			$tmptext = explode('"', $text);
+			$moreinheader = "List-Unsubscribe: <".$tmptext[1].">\n";
+		}
 	}
 
 	return $text;

From f6305bf5512a32580cceb8a359c6279daabbcdaa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 15:46:38 +0200
Subject: [PATCH 615/928] FIX Sql error

---
 htdocs/societe/class/societe.class.php |  9 +++-----
 test/phpunit/SocieteTest.php           | 29 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 46b80e7f77e..defcc71a3e5 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4396,12 +4396,8 @@ class Societe extends CommonObject
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') {
-			$sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		} else {
-			$sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		}
-		$sql .= " WHERE fk_soc = ".$this->id;
+		$sql = "SELECT rowid, total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		$sql .= " WHERE fk_soc = ".((int) $this->id);
 		if (!empty($late)) {
 			$sql .= " AND date_lim_reglement < '".$this->db->idate(dol_now())."'";
 		}
@@ -4453,6 +4449,7 @@ class Societe extends CommonObject
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		} else {
+			dol_syslog("Sql error ".$this->db->lasterror, LOG_ERR);
 			return array();
 		}
 	}
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 177458fb621..9a4f58540e9 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -387,6 +387,35 @@ class SocieteTest extends PHPUnit\Framework\TestCase
 	 * @depends testSocieteOther
 	 * The depends says test is run only if previous is ok
 	 */
+	public function testGetOutstandingBills($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new Societe($this->savdb);
+		$localobject->fetch($id);
+
+		$result=$localobject->getOutstandingBills();
+
+		print __METHOD__." id=".$id." result=".var_export($result, true)."\n";
+		$this->assertLessThan($result, 0);
+
+		return $id;
+	}
+
+
+	/**
+	 * testSocieteDelete
+	 *
+	 * @param   int     $id     Id of company
+	 * @return  int
+	 *
+	 * @depends testGetOutstandingBills
+	 * The depends says test is run only if previous is ok
+	 */
 	public function testSocieteDelete($id)
 	{
 		global $conf,$user,$langs,$db;

From 5ca70b29b2afcce4746f9f20460eaaedb7beb895 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 15:52:38 +0200
Subject: [PATCH 616/928] Fix phpunit

---
 test/phpunit/SocieteTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 9a4f58540e9..7773ddcaf22 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -401,7 +401,7 @@ class SocieteTest extends PHPUnit\Framework\TestCase
 		$result=$localobject->getOutstandingBills();
 
 		print __METHOD__." id=".$id." result=".var_export($result, true)."\n";
-		$this->assertLessThan($result, 0);
+		$this->assertTrue(array_key_exists('opened', $result), 'Result of getOutstandingBills failed');
 
 		return $id;
 	}

From c84fc06e512bb01fedae5126ab2378780af5d305 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 15:53:15 +0200
Subject: [PATCH 617/928] Fix phpunit

---
 test/phpunit/SocieteTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 7773ddcaf22..12f24290413 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -379,7 +379,7 @@ class SocieteTest extends PHPUnit\Framework\TestCase
 
 
 	/**
-	 * testSocieteDelete
+	 * testGetOutstandingBills
 	 *
 	 * @param   int     $id     Id of company
 	 * @return  int

From ef6ebd4793220540d474abc9b54cc7382b2c64e7 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 4 May 2021 16:24:15 +0200
Subject: [PATCH 618/928] FIX: expense report: column last_main_doc forgotten
 in v14 migration script

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index af6c2f48f50..a18bc993441 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -187,6 +187,7 @@ ALTER TABLE llx_mrp_production ADD COLUMN origin_type varchar(10) AFTER origin_i
 
 ALTER TABLE llx_fichinter ADD COLUMN last_main_doc varchar(255) AFTER model_pdf;
 ALTER TABLE llx_projet ADD COLUMN last_main_doc varchar(255) AFTER model_pdf;
+ALTER TABLE llx_expensereport ADD COLUMN last_main_doc varchar(255) DEFAULT NULL AFTER model_pdf;
 
 create table llx_payment_vat
 (

From c4e0d8da42696410089d4dca02f611cb60d6ec33 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 4 May 2021 17:28:20 +0200
Subject: [PATCH 619/928] FIX: merge thirparty also work for bank URL entry

---
 htdocs/compta/bank/class/account.class.php | 22 ++++++++++++++++++++++
 htdocs/societe/card.php                    |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 0002dbcb8ed..c59e768f6dc 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1676,6 +1676,28 @@ class Account extends CommonObject
 		$this->owner_address   = 'Owner address';
 		$this->country_id      = 1;
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB 	$db 			Database handler
+	 * @param int 		$origin_id 		Old thirdparty id
+	 * @param int 		$dest_id 		New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty($db, $origin_id, $dest_id)
+	{
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'bank_url SET url_id = '.$dest_id.' WHERE url_id = '.$origin_id.' AND type=\'company\'';
+
+		if (!$db->query($sql))
+		{
+			//if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+			//$this->errors = $db->lasterror();
+			return false;
+		} else {
+			return true;
+		}
+	}
 }
 
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 66b5f68564e..1fbb1ad6082 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -254,7 +254,8 @@ if (empty($reshook))
 						'Product' => '/product/class/product.class.php',
 						'Project' => '/projet/class/project.class.php',
 						'Ticket' => '/ticket/class/ticket.class.php',
-						'User' => '/user/class/user.class.php'
+						'User' => '/user/class/user.class.php',
+						'Account' => '/compta/bank/class/account.class.php',
 					);
 
 					//First, all core objects must update their tables

From f2e61ff807cc27ede462e6ca18c64acb32299528 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 18:04:09 +0200
Subject: [PATCH 620/928] Fix substitution into topic

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index db3fd2b6837..8827c56e132 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4990,14 +4990,14 @@ class Facture extends CommonInvoice
 
 						complete_substitutions_array($substitutionarray, $outputlangs, $tmpinvoice);
 
+						// Topic
+						$sendTopic = make_substitutions(empty($arraymessage->topic) ? $outputlangs->transnoentitiesnoconv('InformationMessage') : $arraymessage->topic, $substitutionarray, $outputlangs, 1);
+
 						// Content
 						$content = $outputlangs->transnoentitiesnoconv($arraymessage->content);
 
 						$sendContent = make_substitutions($content, $substitutionarray, $outputlangs, 1);
 
-						//Topic
-						$sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : $outputlangs->transnoentitiesnoconv('InformationMessage');
-
 						// Recipient
 						$res = $tmpinvoice->fetch_thirdparty();
 						$recipient = $tmpinvoice->thirdparty;

From 6574e54a41e9f2be5aae55c4478767e15b38236b Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Tue, 4 May 2021 18:09:13 +0200
Subject: [PATCH 621/928] Fix saving template email

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

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 60a15f4899e..f82e67096eb 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -257,7 +257,7 @@ if (empty($reshook))
             $sql = "INSERT INTO ".$tabname[$id]." (";
             // List of fields
             $sql .= $tabfieldinsert[$id];
-            $sql .= ",active)";
+            $sql .= ",active,enabled)";
             $sql .= " VALUES(";
 
             // List of values
@@ -289,7 +289,7 @@ if (empty($reshook))
 
                 $i++;
             }
-            $sql .= ", 1)";
+            $sql .= ", 1, 1)";
 
             dol_syslog("actionadd", LOG_DEBUG);
             $result = $db->query($sql);

From bf52b54db6765f3087a0f964f832db9a75796014 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 May 2021 19:43:33 +0200
Subject: [PATCH 622/928] Add date in error message

---
 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 5eda236d6f0..ddd96bfa675 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4496,7 +4496,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		}
 		$langs->loadLangs(array("main", "errors")); // Reload main because language may have been set only on previous line so we have to reload files we need.
 		// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.
-		print 'This website or feature is currently temporarly not available or failed after a technical error.<br><br>This may be due to a maintenance operation. Current status of operation are on next line...<br><br>'."\n";
+		print 'This website or feature is currently temporarly not available or failed after a technical error.<br><br>This may be due to a maintenance operation. Current status of operation ('.dol_print_date(dol_now(), 'dayhourrfc').') are on next line...<br><br>'."\n";
 		print $langs->trans("DolibarrHasDetectedError").'. ';
 		print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");
 		define("MAIN_CORE_ERROR", 1);

From b04dfcadc77d26e8863413dc4af7d05b6c98cfbe Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 21:55:19 +0200
Subject: [PATCH 623/928] Add function to get html online payment link

---
 htdocs/core/lib/payments.lib.php | 39 ++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 494a92d33e3..90fba70464c 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2013	    Marcos García	        <marcosgdf@gmail.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Abbes Bahfir            <bafbes@gmail.com>
+ * Copyright (C) 2021       Waël Almoman            <info@almoman.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,8 +27,7 @@
  * @param Paiement $object Current payment object
  * @return array Tabs for the payment section
  */
-function payment_prepare_head(Paiement $object)
-{
+function payment_prepare_head(Paiement $object) {
 	global $langs, $conf;
 
 	$h = 0;
@@ -61,8 +61,7 @@ function payment_prepare_head(Paiement $object)
  * @param 	int		$id		ID of bank line
  * @return 	array 			Tabs for the Bankline section
  */
-function bankline_prepare_head($id)
-{
+function bankline_prepare_head($id) {
 	global $langs, $conf;
 
 	$h = 0;
@@ -96,8 +95,7 @@ function bankline_prepare_head($id)
  * @param Paiement $object Current payment object
  * @return array Tabs for the payment section
  */
-function payment_supplier_prepare_head(Paiement $object)
-{
+function payment_supplier_prepare_head(Paiement $object) {
 	global $langs, $conf;
 
 	$h = 0;
@@ -130,8 +128,7 @@ function payment_supplier_prepare_head(Paiement $object)
  * @param	string	$paymentmethod		Filter on this payment method (''=none, 'paypal', ...)
  * @return	array						Array of valid payment method
  */
-function getValidOnlinePaymentMethods($paymentmethod = '')
-{
+function getValidOnlinePaymentMethods($paymentmethod = '') {
 	global $conf, $langs;
 
 	$validpaymentmethod = array();
@@ -155,14 +152,13 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
 }
 
 /**
- * Return string with full Url
+ * Return string with full online payment Url
  *
  * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
  * @param	string	$ref		Ref of object
  * @return	string				Url string
  */
-function showOnlinePaymentUrl($type, $ref)
-{
+function showOnlinePaymentUrl($type, $ref) {
 	global $langs;
 
 	// Load translation files required by the page
@@ -178,6 +174,21 @@ function showOnlinePaymentUrl($type, $ref)
 	return $out;
 }
 
+/**
+ * Return string with HTML link for online payment
+ *
+ * @param	string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
+ * @param	string	$ref		Ref of object
+ * @param	string	$label		Text or HTML tag to display, if empty it display the URL
+ * @return	string			Url string
+ */
+function getHtmlOnlinePaymentLink($type, $ref, $label='') {
+	$url = getOnlinePaymentUrl(0, $type, $ref);
+	$label = $label ? $label : $url;
+	return'<a href="'.$url.'" target="_blank">'.$label.'</a>';
+}
+
+
 /**
  * Return string with full Url
  *
@@ -189,8 +200,7 @@ function showOnlinePaymentUrl($type, $ref)
  * @param   string  $localorexternal  0=Url for browser, 1=Url for external access
  * @return	string				      Url string
  */
-function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0)
-{
+function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0) {
 	global $conf, $dolibarr_main_url_root;
 
 	$ref = str_replace(' ', '', $ref);
@@ -355,8 +365,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
  * @param	Object		$object			Object related to payment
  * @return	void
  */
-function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null)
-{
+function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null) {
 	global $conf;
 
 	// Juridical status

From 866857c111ae2523294b40a0e40d910d43aaf3b6 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 21:57:59 +0200
Subject: [PATCH 624/928] Html link instead of url in substitutionarray

---
 htdocs/comm/mailing/card.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 98b3622d5ef..ce260a44a35 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -223,11 +223,11 @@ if (empty($reshook)) {
 						}
 						if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 							require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-							$substitutionarray['__ONLINEPAYMENTLINK_MEMBER__'] = getOnlinePaymentUrl(0, 'member', $obj->source_id);
-							$substitutionarray['__ONLINEPAYMENTLINK_DONATION__'] = getOnlinePaymentUrl(0, 'donation', $obj->source_id);
-							$substitutionarray['__ONLINEPAYMENTLINK_ORDER__'] = getOnlinePaymentUrl(0, 'order', $obj->source_id);
-							$substitutionarray['__ONLINEPAYMENTLINK_INVOICE__'] = getOnlinePaymentUrl(0, 'invoice', $obj->source_id);
-							$substitutionarray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = getOnlinePaymentUrl(0, 'contractline', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_MEMBER__'] = getHtmlOnlinePaymentLink('member', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_DONATION__'] = getHtmlOnlinePaymentLink('donation', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_ORDER__'] = getHtmlOnlinePaymentLink('order', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_INVOICE__'] = getHtmlOnlinePaymentLink('invoice', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = getHtmlOnlinePaymentLink('contractline', $obj->source_id);
 
 							$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {

From fb3c8e698ed028cad7d5c707e1ea1c70343be14a Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 4 May 2021 20:59:32 +0000
Subject: [PATCH 625/928] Fixing style errors.

---
 htdocs/core/lib/payments.lib.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 90fba70464c..59d9eb4aa4c 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -27,7 +27,8 @@
  * @param Paiement $object Current payment object
  * @return array Tabs for the payment section
  */
-function payment_prepare_head(Paiement $object) {
+function payment_prepare_head(Paiement $object)
+{
 	global $langs, $conf;
 
 	$h = 0;
@@ -61,7 +62,8 @@ function payment_prepare_head(Paiement $object) {
  * @param 	int		$id		ID of bank line
  * @return 	array 			Tabs for the Bankline section
  */
-function bankline_prepare_head($id) {
+function bankline_prepare_head($id)
+{
 	global $langs, $conf;
 
 	$h = 0;
@@ -95,7 +97,8 @@ function bankline_prepare_head($id) {
  * @param Paiement $object Current payment object
  * @return array Tabs for the payment section
  */
-function payment_supplier_prepare_head(Paiement $object) {
+function payment_supplier_prepare_head(Paiement $object)
+{
 	global $langs, $conf;
 
 	$h = 0;
@@ -128,7 +131,8 @@ function payment_supplier_prepare_head(Paiement $object) {
  * @param	string	$paymentmethod		Filter on this payment method (''=none, 'paypal', ...)
  * @return	array						Array of valid payment method
  */
-function getValidOnlinePaymentMethods($paymentmethod = '') {
+function getValidOnlinePaymentMethods($paymentmethod = '')
+{
 	global $conf, $langs;
 
 	$validpaymentmethod = array();
@@ -158,7 +162,8 @@ function getValidOnlinePaymentMethods($paymentmethod = '') {
  * @param	string	$ref		Ref of object
  * @return	string				Url string
  */
-function showOnlinePaymentUrl($type, $ref) {
+function showOnlinePaymentUrl($type, $ref)
+{
 	global $langs;
 
 	// Load translation files required by the page
@@ -182,7 +187,8 @@ function showOnlinePaymentUrl($type, $ref) {
  * @param	string	$label		Text or HTML tag to display, if empty it display the URL
  * @return	string			Url string
  */
-function getHtmlOnlinePaymentLink($type, $ref, $label='') {
+function getHtmlOnlinePaymentLink($type, $ref, $label = '')
+{
 	$url = getOnlinePaymentUrl(0, $type, $ref);
 	$label = $label ? $label : $url;
 	return'<a href="'.$url.'" target="_blank">'.$label.'</a>';
@@ -200,7 +206,8 @@ function getHtmlOnlinePaymentLink($type, $ref, $label='') {
  * @param   string  $localorexternal  0=Url for browser, 1=Url for external access
  * @return	string				      Url string
  */
-function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0) {
+function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0)
+{
 	global $conf, $dolibarr_main_url_root;
 
 	$ref = str_replace(' ', '', $ref);
@@ -365,7 +372,8 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
  * @param	Object		$object			Object related to payment
  * @return	void
  */
-function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null) {
+function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null)
+{
 	global $conf;
 
 	// Juridical status

From d840593ed795acdce1b9cbe2824ee9f982279aa0 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 23:19:19 +0200
Subject: [PATCH 626/928] Fix amnt can be paid for member as membersubscription

---
 htdocs/public/payment/newpayment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 7007455791a..1c0939ea9a8 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1753,7 +1753,7 @@ if ($action != 'dopayment') {
 			print '<br><br><span class="amountpaymentcomplete size15x">'.$langs->trans("DonationPaid").'</span>';
 		} else {
 			// Membership can be paid and we still allow to make renewal
-			if ($source == 'membersubscription' && $object->datefin > dol_now()) {
+			if (($source == 'member' || $source == 'membersubscription') && $object->datefin > dol_now()) {
 				$langs->load("members");
 				print '<br><span class="amountpaymentcomplete size15x">'.$langs->trans("MembershipPaid", dol_print_date($object->datefin, 'day')).'</span><br>';
 				print '<div class="opacitymedium margintoponly">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</div>';

From 3807804acc6babca8d63d6ef4eff8250c9091d95 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 May 2021 00:15:52 +0200
Subject: [PATCH 627/928] Fix option MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE

---
 .../modules/supplier_order/doc/pdf_cornas.modules.php     | 7 +++----
 .../modules/supplier_order/doc/pdf_muscadet.modules.php   | 8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 9ebff653a56..cfe7a476d05 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -218,12 +218,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				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/";
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+					$pdir = get_exdir($objphoto->id, 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).'/';
+					$pdir = get_exdir($objphoto->id, 0, 0, 0, $objphoto, 'product');
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
 
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index be195d923da..e76793db00c 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -233,15 +233,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				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/";
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+					$pdir = get_exdir($objphoto->id, 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).'/';
+					$pdir = get_exdir($objphoto->id, 0, 0, 0, $objphoto, 'product');
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
-
 				$realpath = '';
 				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
 				{

From f37033b1f46961d4ca19f79a619922e97f313c0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 May 2021 00:56:40 +0200
Subject: [PATCH 628/928] CSS

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

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 31ccd1f02c8..fee54b6ce75 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -160,19 +160,15 @@ if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
 
 $tabhelp = array();
 $tabhelp[25] = array(
-	'topic'=>$helpsubstit,
+	'topic'=>'<span class="small">'.$helpsubstit.'</span>',
 	'joinfiles'=>$langs->trans('AttachMainDocByDefault'),
-	'content'=>$helpsubstit,
-	'content_lines'=>$helpsubstitforlines,
+	'content'=>'<span class="small">'.$helpsubstit.'</span>',
+	'content_lines'=>'<span class="small">'.$helpsubstitforlines.'</span>',
 	'type_template'=>$langs->trans("TemplateForElement"),
 	'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"),
 	'position'=>$langs->trans("PositionIntoComboList")
 );
 
-// List of check for fields (NOT USED YET)
-$tabfieldcheck = array();
-$tabfieldcheck[25] = array();
-
 
 $elementList = array();
 

From e1498ca7ef9c92513dc4b08e491e6e88704466c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 May 2021 01:26:06 +0200
Subject: [PATCH 629/928] Clean code

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

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index f5ab2af51e3..2ede168b601 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -36,12 +36,12 @@ if (!$user->admin) {
 
 $id = GETPOST('rowid', 'int');
 $action = GETPOST('action', 'aZ09');
+$optioncss = GETPOST('optionscss', 'aZ09');
 
 $langcode = GETPOST('langcode', 'alphanohtml');
 $transkey = GETPOST('transkey', 'alphanohtml');
 $transvalue = GETPOST('transvalue', 'restricthtml');
 
-
 $mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'searchkey';
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -537,8 +537,8 @@ if ($mode == 'searchkey') {
 				// retrieve rowid
 				$sql = "SELECT rowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
-				$sql .= " WHERE transkey = '".$db->escape($key)."'";
-				$sql .= " AND entity IN (".getEntity('overwrite_trans').")";
+				$sql .= " WHERE entity IN (".getEntity('overwrite_trans').")";
+				$sql .= " AND transkey = '".$db->escape($key)."'";
 				dol_syslog("translation::select from table", LOG_DEBUG);
 				$result = $db->query($sql);
 				if ($result) {

From 786046472466e46acd59b327f18c842eb6adf582 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 May 2021 01:48:21 +0200
Subject: [PATCH 630/928] Sync transifex

---
 htdocs/langs/am_ET/accountancy.lang         |   4 +-
 htdocs/langs/am_ET/admin.lang               |  11 +-
 htdocs/langs/am_ET/banks.lang               |  10 +-
 htdocs/langs/am_ET/bills.lang               |   4 +-
 htdocs/langs/am_ET/boxes.lang               |  10 +-
 htdocs/langs/am_ET/cashdesk.lang            |  14 +-
 htdocs/langs/am_ET/categories.lang          |  20 +-
 htdocs/langs/am_ET/companies.lang           |  18 +-
 htdocs/langs/am_ET/compta.lang              |   2 +-
 htdocs/langs/am_ET/ecm.lang                 |   2 +-
 htdocs/langs/am_ET/errors.lang              |  12 +-
 htdocs/langs/am_ET/eventorganization.lang   | 101 +++
 htdocs/langs/am_ET/knowledgemanagement.lang |  55 ++
 htdocs/langs/am_ET/mails.lang               |   6 +-
 htdocs/langs/am_ET/main.lang                |  19 +-
 htdocs/langs/am_ET/members.lang             |  38 +-
 htdocs/langs/am_ET/modulebuilder.lang       |   2 +-
 htdocs/langs/am_ET/other.lang               |   4 +-
 htdocs/langs/am_ET/partnership.lang         |  56 ++
 htdocs/langs/am_ET/productbatch.lang        |   2 +-
 htdocs/langs/am_ET/products.lang            |  24 +-
 htdocs/langs/am_ET/projects.lang            |   8 +-
 htdocs/langs/am_ET/recruitment.lang         |   2 +-
 htdocs/langs/am_ET/sendings.lang            |   2 +-
 htdocs/langs/am_ET/stocks.lang              |   2 +-
 htdocs/langs/am_ET/users.lang               |   5 +-
 htdocs/langs/am_ET/website.lang             |   6 +-
 htdocs/langs/ar_EG/accountancy.lang         |   2 +
 htdocs/langs/ar_EG/admin.lang               |   1 -
 htdocs/langs/ar_EG/cron.lang                |   2 +
 htdocs/langs/ar_EG/eventorganization.lang   |   2 +
 htdocs/langs/ar_EG/main.lang                |   1 -
 htdocs/langs/ar_EG/partnership.lang         |   4 +
 htdocs/langs/ar_IQ/accountancy.lang         |   4 +-
 htdocs/langs/ar_IQ/admin.lang               |  11 +-
 htdocs/langs/ar_IQ/banks.lang               |  10 +-
 htdocs/langs/ar_IQ/bills.lang               |   4 +-
 htdocs/langs/ar_IQ/boxes.lang               |  10 +-
 htdocs/langs/ar_IQ/cashdesk.lang            |   9 +-
 htdocs/langs/ar_IQ/categories.lang          |  20 +-
 htdocs/langs/ar_IQ/companies.lang           |  18 +-
 htdocs/langs/ar_IQ/compta.lang              |   2 +-
 htdocs/langs/ar_IQ/ecm.lang                 |   2 +-
 htdocs/langs/ar_IQ/errors.lang              |  12 +-
 htdocs/langs/ar_IQ/eventorganization.lang   | 101 +++
 htdocs/langs/ar_IQ/knowledgemanagement.lang |  55 ++
 htdocs/langs/ar_IQ/mails.lang               |   6 +-
 htdocs/langs/ar_IQ/main.lang                |  19 +-
 htdocs/langs/ar_IQ/members.lang             |  38 +-
 htdocs/langs/ar_IQ/modulebuilder.lang       |   2 +-
 htdocs/langs/ar_IQ/other.lang               |   4 +-
 htdocs/langs/ar_IQ/partnership.lang         |  56 ++
 htdocs/langs/ar_IQ/productbatch.lang        |   2 +-
 htdocs/langs/ar_IQ/products.lang            |  24 +-
 htdocs/langs/ar_IQ/projects.lang            |   8 +-
 htdocs/langs/ar_IQ/recruitment.lang         |   2 +-
 htdocs/langs/ar_IQ/sendings.lang            |   2 +-
 htdocs/langs/ar_IQ/stocks.lang              |   2 +-
 htdocs/langs/ar_IQ/users.lang               |   5 +-
 htdocs/langs/ar_IQ/website.lang             |   6 +-
 htdocs/langs/ar_SA/accountancy.lang         |   4 +-
 htdocs/langs/ar_SA/admin.lang               |  97 ++-
 htdocs/langs/ar_SA/banks.lang               |  10 +-
 htdocs/langs/ar_SA/bills.lang               |   4 +-
 htdocs/langs/ar_SA/boxes.lang               |  14 +-
 htdocs/langs/ar_SA/cashdesk.lang            |  14 +-
 htdocs/langs/ar_SA/categories.lang          |  20 +-
 htdocs/langs/ar_SA/companies.lang           |  28 +-
 htdocs/langs/ar_SA/compta.lang              |   2 +-
 htdocs/langs/ar_SA/ecm.lang                 |   2 +-
 htdocs/langs/ar_SA/errors.lang              |  12 +-
 htdocs/langs/ar_SA/eventorganization.lang   | 101 +++
 htdocs/langs/ar_SA/help.lang                |   6 +-
 htdocs/langs/ar_SA/knowledgemanagement.lang |  55 ++
 htdocs/langs/ar_SA/mails.lang               |   6 +-
 htdocs/langs/ar_SA/main.lang                |  69 +-
 htdocs/langs/ar_SA/members.lang             |  38 +-
 htdocs/langs/ar_SA/modulebuilder.lang       |  10 +-
 htdocs/langs/ar_SA/other.lang               |   4 +-
 htdocs/langs/ar_SA/partnership.lang         |  56 ++
 htdocs/langs/ar_SA/productbatch.lang        |   2 +-
 htdocs/langs/ar_SA/products.lang            |  24 +-
 htdocs/langs/ar_SA/projects.lang            |   8 +-
 htdocs/langs/ar_SA/recruitment.lang         |   6 +-
 htdocs/langs/ar_SA/sendings.lang            |   2 +-
 htdocs/langs/ar_SA/sms.lang                 |  48 +-
 htdocs/langs/ar_SA/stocks.lang              |   2 +-
 htdocs/langs/ar_SA/users.lang               |   5 +-
 htdocs/langs/ar_SA/website.lang             |   6 +-
 htdocs/langs/ar_SA/workflow.lang            |   2 +-
 htdocs/langs/ar_SA/zapier.lang              |  12 +-
 htdocs/langs/az_AZ/accountancy.lang         |   4 +-
 htdocs/langs/az_AZ/admin.lang               |  11 +-
 htdocs/langs/az_AZ/banks.lang               |  10 +-
 htdocs/langs/az_AZ/bills.lang               |   4 +-
 htdocs/langs/az_AZ/boxes.lang               |  10 +-
 htdocs/langs/az_AZ/cashdesk.lang            |  14 +-
 htdocs/langs/az_AZ/categories.lang          |  20 +-
 htdocs/langs/az_AZ/companies.lang           |  18 +-
 htdocs/langs/az_AZ/compta.lang              |   2 +-
 htdocs/langs/az_AZ/ecm.lang                 |   2 +-
 htdocs/langs/az_AZ/errors.lang              |  12 +-
 htdocs/langs/az_AZ/eventorganization.lang   | 101 +++
 htdocs/langs/az_AZ/knowledgemanagement.lang |  55 ++
 htdocs/langs/az_AZ/mails.lang               |   6 +-
 htdocs/langs/az_AZ/main.lang                |  19 +-
 htdocs/langs/az_AZ/members.lang             |  38 +-
 htdocs/langs/az_AZ/modulebuilder.lang       |   2 +-
 htdocs/langs/az_AZ/other.lang               |   4 +-
 htdocs/langs/az_AZ/partnership.lang         |  56 ++
 htdocs/langs/az_AZ/productbatch.lang        |   2 +-
 htdocs/langs/az_AZ/products.lang            |  24 +-
 htdocs/langs/az_AZ/projects.lang            |   8 +-
 htdocs/langs/az_AZ/recruitment.lang         |   2 +-
 htdocs/langs/az_AZ/sendings.lang            |   2 +-
 htdocs/langs/az_AZ/stocks.lang              |   2 +-
 htdocs/langs/az_AZ/users.lang               |   5 +-
 htdocs/langs/az_AZ/website.lang             |   6 +-
 htdocs/langs/bg_BG/accountancy.lang         |   4 +-
 htdocs/langs/bg_BG/admin.lang               |  11 +-
 htdocs/langs/bg_BG/banks.lang               |  10 +-
 htdocs/langs/bg_BG/bills.lang               |   4 +-
 htdocs/langs/bg_BG/boxes.lang               |  10 +-
 htdocs/langs/bg_BG/cashdesk.lang            |  14 +-
 htdocs/langs/bg_BG/categories.lang          |  20 +-
 htdocs/langs/bg_BG/companies.lang           |  16 +-
 htdocs/langs/bg_BG/compta.lang              |   2 +-
 htdocs/langs/bg_BG/ecm.lang                 |   2 +-
 htdocs/langs/bg_BG/errors.lang              |  12 +-
 htdocs/langs/bg_BG/eventorganization.lang   | 101 +++
 htdocs/langs/bg_BG/knowledgemanagement.lang |  55 ++
 htdocs/langs/bg_BG/mails.lang               |   6 +-
 htdocs/langs/bg_BG/main.lang                |  19 +-
 htdocs/langs/bg_BG/members.lang             |  38 +-
 htdocs/langs/bg_BG/modulebuilder.lang       |   2 +-
 htdocs/langs/bg_BG/other.lang               |   4 +-
 htdocs/langs/bg_BG/partnership.lang         |  56 ++
 htdocs/langs/bg_BG/productbatch.lang        |   2 +-
 htdocs/langs/bg_BG/products.lang            |  24 +-
 htdocs/langs/bg_BG/projects.lang            |   8 +-
 htdocs/langs/bg_BG/recruitment.lang         |   2 +-
 htdocs/langs/bg_BG/sendings.lang            |   2 +-
 htdocs/langs/bg_BG/stocks.lang              |   2 +-
 htdocs/langs/bg_BG/users.lang               |   5 +-
 htdocs/langs/bg_BG/website.lang             |   6 +-
 htdocs/langs/bn_BD/accountancy.lang         |   4 +-
 htdocs/langs/bn_BD/admin.lang               |  11 +-
 htdocs/langs/bn_BD/banks.lang               |  10 +-
 htdocs/langs/bn_BD/bills.lang               |   4 +-
 htdocs/langs/bn_BD/boxes.lang               |  10 +-
 htdocs/langs/bn_BD/cashdesk.lang            |  14 +-
 htdocs/langs/bn_BD/categories.lang          |  20 +-
 htdocs/langs/bn_BD/companies.lang           |  18 +-
 htdocs/langs/bn_BD/compta.lang              |   2 +-
 htdocs/langs/bn_BD/ecm.lang                 |   2 +-
 htdocs/langs/bn_BD/errors.lang              |  12 +-
 htdocs/langs/bn_BD/eventorganization.lang   | 101 +++
 htdocs/langs/bn_BD/knowledgemanagement.lang |  55 ++
 htdocs/langs/bn_BD/mails.lang               |   6 +-
 htdocs/langs/bn_BD/main.lang                |  19 +-
 htdocs/langs/bn_BD/members.lang             |  38 +-
 htdocs/langs/bn_BD/modulebuilder.lang       |   2 +-
 htdocs/langs/bn_BD/other.lang               |   4 +-
 htdocs/langs/bn_BD/partnership.lang         |  56 ++
 htdocs/langs/bn_BD/productbatch.lang        |   2 +-
 htdocs/langs/bn_BD/products.lang            |  24 +-
 htdocs/langs/bn_BD/projects.lang            |   8 +-
 htdocs/langs/bn_BD/recruitment.lang         |   2 +-
 htdocs/langs/bn_BD/sendings.lang            |   2 +-
 htdocs/langs/bn_BD/stocks.lang              |   2 +-
 htdocs/langs/bn_BD/users.lang               |   5 +-
 htdocs/langs/bn_BD/website.lang             |   6 +-
 htdocs/langs/bn_IN/accountancy.lang         |   4 +-
 htdocs/langs/bn_IN/admin.lang               |  11 +-
 htdocs/langs/bn_IN/banks.lang               |  10 +-
 htdocs/langs/bn_IN/bills.lang               |   4 +-
 htdocs/langs/bn_IN/boxes.lang               |  10 +-
 htdocs/langs/bn_IN/cashdesk.lang            |  14 +-
 htdocs/langs/bn_IN/categories.lang          |  20 +-
 htdocs/langs/bn_IN/companies.lang           |  18 +-
 htdocs/langs/bn_IN/compta.lang              |   2 +-
 htdocs/langs/bn_IN/ecm.lang                 |   2 +-
 htdocs/langs/bn_IN/errors.lang              |  12 +-
 htdocs/langs/bn_IN/eventorganization.lang   | 101 +++
 htdocs/langs/bn_IN/knowledgemanagement.lang |  55 ++
 htdocs/langs/bn_IN/mails.lang               |   6 +-
 htdocs/langs/bn_IN/main.lang                |  19 +-
 htdocs/langs/bn_IN/members.lang             |  38 +-
 htdocs/langs/bn_IN/modulebuilder.lang       |   2 +-
 htdocs/langs/bn_IN/other.lang               |   4 +-
 htdocs/langs/bn_IN/partnership.lang         |  56 ++
 htdocs/langs/bn_IN/productbatch.lang        |   2 +-
 htdocs/langs/bn_IN/products.lang            |  24 +-
 htdocs/langs/bn_IN/projects.lang            |   8 +-
 htdocs/langs/bn_IN/recruitment.lang         |   2 +-
 htdocs/langs/bn_IN/sendings.lang            |   2 +-
 htdocs/langs/bn_IN/stocks.lang              |   2 +-
 htdocs/langs/bn_IN/users.lang               |   5 +-
 htdocs/langs/bn_IN/website.lang             |   6 +-
 htdocs/langs/bs_BA/accountancy.lang         |   4 +-
 htdocs/langs/bs_BA/admin.lang               |  11 +-
 htdocs/langs/bs_BA/banks.lang               |  10 +-
 htdocs/langs/bs_BA/bills.lang               |   4 +-
 htdocs/langs/bs_BA/boxes.lang               |  10 +-
 htdocs/langs/bs_BA/cashdesk.lang            |  14 +-
 htdocs/langs/bs_BA/categories.lang          |  20 +-
 htdocs/langs/bs_BA/companies.lang           |  18 +-
 htdocs/langs/bs_BA/compta.lang              |   2 +-
 htdocs/langs/bs_BA/ecm.lang                 |   2 +-
 htdocs/langs/bs_BA/errors.lang              |  12 +-
 htdocs/langs/bs_BA/eventorganization.lang   | 101 +++
 htdocs/langs/bs_BA/knowledgemanagement.lang |  55 ++
 htdocs/langs/bs_BA/mails.lang               |   6 +-
 htdocs/langs/bs_BA/main.lang                |  19 +-
 htdocs/langs/bs_BA/members.lang             |  38 +-
 htdocs/langs/bs_BA/modulebuilder.lang       |   2 +-
 htdocs/langs/bs_BA/other.lang               |   4 +-
 htdocs/langs/bs_BA/partnership.lang         |  56 ++
 htdocs/langs/bs_BA/productbatch.lang        |   2 +-
 htdocs/langs/bs_BA/products.lang            |  24 +-
 htdocs/langs/bs_BA/projects.lang            |   8 +-
 htdocs/langs/bs_BA/recruitment.lang         |   2 +-
 htdocs/langs/bs_BA/sendings.lang            |   2 +-
 htdocs/langs/bs_BA/stocks.lang              |   2 +-
 htdocs/langs/bs_BA/users.lang               |   5 +-
 htdocs/langs/bs_BA/website.lang             |   6 +-
 htdocs/langs/ca_ES/accountancy.lang         |   6 +-
 htdocs/langs/ca_ES/admin.lang               |  19 +-
 htdocs/langs/ca_ES/banks.lang               |  12 +-
 htdocs/langs/ca_ES/bills.lang               |   4 +-
 htdocs/langs/ca_ES/boxes.lang               |  16 +-
 htdocs/langs/ca_ES/cashdesk.lang            |  18 +-
 htdocs/langs/ca_ES/categories.lang          |  24 +-
 htdocs/langs/ca_ES/commercial.lang          |   5 +-
 htdocs/langs/ca_ES/companies.lang           |  20 +-
 htdocs/langs/ca_ES/compta.lang              |  10 +-
 htdocs/langs/ca_ES/ecm.lang                 |   8 +-
 htdocs/langs/ca_ES/errors.lang              |  12 +-
 htdocs/langs/ca_ES/eventorganization.lang   | 101 +++
 htdocs/langs/ca_ES/externalsite.lang        |   2 +-
 htdocs/langs/ca_ES/holiday.lang             |  36 +-
 htdocs/langs/ca_ES/knowledgemanagement.lang |  55 ++
 htdocs/langs/ca_ES/mails.lang               |  24 +-
 htdocs/langs/ca_ES/main.lang                |  23 +-
 htdocs/langs/ca_ES/members.lang             |  54 +-
 htdocs/langs/ca_ES/modulebuilder.lang       |   8 +-
 htdocs/langs/ca_ES/other.lang               |   4 +-
 htdocs/langs/ca_ES/partnership.lang         |  56 ++
 htdocs/langs/ca_ES/productbatch.lang        |   2 +-
 htdocs/langs/ca_ES/products.lang            |  24 +-
 htdocs/langs/ca_ES/projects.lang            |   8 +-
 htdocs/langs/ca_ES/propal.lang              |   2 +-
 htdocs/langs/ca_ES/recruitment.lang         |   6 +-
 htdocs/langs/ca_ES/salaries.lang            |   5 +-
 htdocs/langs/ca_ES/sendings.lang            |   4 +-
 htdocs/langs/ca_ES/stocks.lang              |  14 +-
 htdocs/langs/ca_ES/ticket.lang              |   2 +-
 htdocs/langs/ca_ES/users.lang               |   5 +-
 htdocs/langs/ca_ES/website.lang             |  12 +-
 htdocs/langs/ca_ES/zapier.lang              |   2 +-
 htdocs/langs/cs_CZ/accountancy.lang         |   4 +-
 htdocs/langs/cs_CZ/admin.lang               |  11 +-
 htdocs/langs/cs_CZ/banks.lang               |  10 +-
 htdocs/langs/cs_CZ/bills.lang               |   4 +-
 htdocs/langs/cs_CZ/boxes.lang               |  10 +-
 htdocs/langs/cs_CZ/cashdesk.lang            |  14 +-
 htdocs/langs/cs_CZ/categories.lang          |  20 +-
 htdocs/langs/cs_CZ/companies.lang           |  18 +-
 htdocs/langs/cs_CZ/compta.lang              |   2 +-
 htdocs/langs/cs_CZ/ecm.lang                 |   2 +-
 htdocs/langs/cs_CZ/errors.lang              |  12 +-
 htdocs/langs/cs_CZ/eventorganization.lang   | 101 +++
 htdocs/langs/cs_CZ/knowledgemanagement.lang |  55 ++
 htdocs/langs/cs_CZ/mails.lang               |   6 +-
 htdocs/langs/cs_CZ/main.lang                |  19 +-
 htdocs/langs/cs_CZ/members.lang             |  38 +-
 htdocs/langs/cs_CZ/modulebuilder.lang       |   2 +-
 htdocs/langs/cs_CZ/other.lang               |   4 +-
 htdocs/langs/cs_CZ/partnership.lang         |  56 ++
 htdocs/langs/cs_CZ/productbatch.lang        |   2 +-
 htdocs/langs/cs_CZ/products.lang            |  24 +-
 htdocs/langs/cs_CZ/projects.lang            |   8 +-
 htdocs/langs/cs_CZ/recruitment.lang         |   2 +-
 htdocs/langs/cs_CZ/sendings.lang            |   2 +-
 htdocs/langs/cs_CZ/stocks.lang              |   2 +-
 htdocs/langs/cs_CZ/users.lang               |   5 +-
 htdocs/langs/cs_CZ/website.lang             |   6 +-
 htdocs/langs/da_DK/accountancy.lang         |   4 +-
 htdocs/langs/da_DK/admin.lang               |  11 +-
 htdocs/langs/da_DK/banks.lang               |  10 +-
 htdocs/langs/da_DK/bills.lang               |   2 +-
 htdocs/langs/da_DK/boxes.lang               |  10 +-
 htdocs/langs/da_DK/cashdesk.lang            |  14 +-
 htdocs/langs/da_DK/categories.lang          |  18 +-
 htdocs/langs/da_DK/companies.lang           |  16 +-
 htdocs/langs/da_DK/compta.lang              |   2 +-
 htdocs/langs/da_DK/ecm.lang                 |   2 +-
 htdocs/langs/da_DK/errors.lang              |  10 +-
 htdocs/langs/da_DK/eventorganization.lang   | 101 +++
 htdocs/langs/da_DK/knowledgemanagement.lang |  55 ++
 htdocs/langs/da_DK/mails.lang               |   4 +-
 htdocs/langs/da_DK/main.lang                |  17 +-
 htdocs/langs/da_DK/members.lang             |  36 +-
 htdocs/langs/da_DK/modulebuilder.lang       |   2 +-
 htdocs/langs/da_DK/other.lang               |   4 +-
 htdocs/langs/da_DK/partnership.lang         |  56 ++
 htdocs/langs/da_DK/productbatch.lang        |   2 +-
 htdocs/langs/da_DK/products.lang            |  20 +-
 htdocs/langs/da_DK/projects.lang            |   8 +-
 htdocs/langs/da_DK/recruitment.lang         |   2 +-
 htdocs/langs/da_DK/sendings.lang            |   2 +-
 htdocs/langs/da_DK/stocks.lang              |   2 +-
 htdocs/langs/da_DK/users.lang               |   3 +-
 htdocs/langs/da_DK/website.lang             |   6 +-
 htdocs/langs/de_AT/accountancy.lang         |   1 +
 htdocs/langs/de_AT/admin.lang               |   2 +-
 htdocs/langs/de_AT/banks.lang               |   1 -
 htdocs/langs/de_AT/cron.lang                |   2 +
 htdocs/langs/de_AT/errors.lang              |   1 -
 htdocs/langs/de_AT/members.lang             |   3 -
 htdocs/langs/de_AT/modulebuilder.lang       |   2 -
 htdocs/langs/de_AT/partnership.lang         |   3 +
 htdocs/langs/de_CH/accountancy.lang         |   1 -
 htdocs/langs/de_CH/banks.lang               |   4 +-
 htdocs/langs/de_CH/boxes.lang               |   5 -
 htdocs/langs/de_CH/categories.lang          |   8 -
 htdocs/langs/de_CH/companies.lang           |   7 -
 htdocs/langs/de_CH/errors.lang              |   3 -
 htdocs/langs/de_CH/mails.lang               |   2 +
 htdocs/langs/de_CH/main.lang                |   4 -
 htdocs/langs/de_CH/members.lang             |   3 -
 htdocs/langs/de_CH/modulebuilder.lang       |   2 -
 htdocs/langs/de_CH/partnership.lang         |   5 +
 htdocs/langs/de_CH/products.lang            |   6 -
 htdocs/langs/de_CH/sendings.lang            |   1 -
 htdocs/langs/de_CH/users.lang               |   1 -
 htdocs/langs/de_DE/accountancy.lang         |  42 +-
 htdocs/langs/de_DE/admin.lang               |  41 +-
 htdocs/langs/de_DE/assets.lang              |   2 +
 htdocs/langs/de_DE/banks.lang               |  12 +-
 htdocs/langs/de_DE/bills.lang               |  24 +-
 htdocs/langs/de_DE/boxes.lang               |  30 +-
 htdocs/langs/de_DE/cashdesk.lang            |  16 +-
 htdocs/langs/de_DE/categories.lang          |  24 +-
 htdocs/langs/de_DE/companies.lang           |  34 +-
 htdocs/langs/de_DE/compta.lang              |  42 +-
 htdocs/langs/de_DE/ecm.lang                 |   2 +-
 htdocs/langs/de_DE/errors.lang              |  26 +-
 htdocs/langs/de_DE/eventorganization.lang   | 101 +++
 htdocs/langs/de_DE/holiday.lang             |  28 +-
 htdocs/langs/de_DE/knowledgemanagement.lang |  55 ++
 htdocs/langs/de_DE/mails.lang               |  14 +-
 htdocs/langs/de_DE/main.lang                |  41 +-
 htdocs/langs/de_DE/members.lang             |  50 +-
 htdocs/langs/de_DE/modulebuilder.lang       |   2 +-
 htdocs/langs/de_DE/mrp.lang                 |  16 +-
 htdocs/langs/de_DE/other.lang               |   4 +-
 htdocs/langs/de_DE/partnership.lang         |  56 ++
 htdocs/langs/de_DE/productbatch.lang        |  16 +-
 htdocs/langs/de_DE/products.lang            |  26 +-
 htdocs/langs/de_DE/projects.lang            |   8 +-
 htdocs/langs/de_DE/recruitment.lang         |   2 +-
 htdocs/langs/de_DE/salaries.lang            |   7 +-
 htdocs/langs/de_DE/sendings.lang            |   2 +-
 htdocs/langs/de_DE/stocks.lang              |  44 +-
 htdocs/langs/de_DE/supplier_proposal.lang   |   4 +
 htdocs/langs/de_DE/ticket.lang              |  10 +-
 htdocs/langs/de_DE/users.lang               |   5 +-
 htdocs/langs/de_DE/website.lang             |  16 +-
 htdocs/langs/de_DE/zapier.lang              |   2 +-
 htdocs/langs/el_CY/accountancy.lang         |   2 +
 htdocs/langs/el_CY/admin.lang               |   1 -
 htdocs/langs/el_CY/cron.lang                |   2 +
 htdocs/langs/el_CY/modulebuilder.lang       |   2 -
 htdocs/langs/el_GR/accountancy.lang         |  16 +-
 htdocs/langs/el_GR/admin.lang               |  11 +-
 htdocs/langs/el_GR/banks.lang               |  12 +-
 htdocs/langs/el_GR/bills.lang               |   4 +-
 htdocs/langs/el_GR/boxes.lang               |  10 +-
 htdocs/langs/el_GR/cashdesk.lang            |  14 +-
 htdocs/langs/el_GR/categories.lang          |  20 +-
 htdocs/langs/el_GR/companies.lang           |  18 +-
 htdocs/langs/el_GR/compta.lang              |   2 +-
 htdocs/langs/el_GR/ecm.lang                 |   2 +-
 htdocs/langs/el_GR/errors.lang              |  12 +-
 htdocs/langs/el_GR/eventorganization.lang   | 101 +++
 htdocs/langs/el_GR/knowledgemanagement.lang |  55 ++
 htdocs/langs/el_GR/mails.lang               |   6 +-
 htdocs/langs/el_GR/main.lang                |  19 +-
 htdocs/langs/el_GR/members.lang             |  38 +-
 htdocs/langs/el_GR/modulebuilder.lang       |   2 +-
 htdocs/langs/el_GR/other.lang               |   4 +-
 htdocs/langs/el_GR/partnership.lang         |  56 ++
 htdocs/langs/el_GR/productbatch.lang        |   2 +-
 htdocs/langs/el_GR/products.lang            |  24 +-
 htdocs/langs/el_GR/projects.lang            |   8 +-
 htdocs/langs/el_GR/recruitment.lang         |   2 +-
 htdocs/langs/el_GR/sendings.lang            |   2 +-
 htdocs/langs/el_GR/stocks.lang              |   2 +-
 htdocs/langs/el_GR/users.lang               |   5 +-
 htdocs/langs/el_GR/website.lang             |   6 +-
 htdocs/langs/en_AU/accountancy.lang         |   2 +
 htdocs/langs/en_AU/admin.lang               |   1 -
 htdocs/langs/en_AU/bills.lang               |   1 -
 htdocs/langs/en_AU/compta.lang              |   1 -
 htdocs/langs/en_AU/cron.lang                |   2 +
 htdocs/langs/en_AU/modulebuilder.lang       |   2 -
 htdocs/langs/en_AU/website.lang             |   3 -
 htdocs/langs/en_CA/accountancy.lang         |   2 +
 htdocs/langs/en_CA/admin.lang               |   1 -
 htdocs/langs/en_CA/cron.lang                |   2 +
 htdocs/langs/en_CA/modulebuilder.lang       |   2 -
 htdocs/langs/en_CA/website.lang             |   3 -
 htdocs/langs/en_GB/accountancy.lang         |   2 +-
 htdocs/langs/en_GB/admin.lang               |   1 -
 htdocs/langs/en_GB/banks.lang               |   3 -
 htdocs/langs/en_GB/bills.lang               |   1 -
 htdocs/langs/en_GB/compta.lang              |   1 -
 htdocs/langs/en_GB/cron.lang                |   2 +
 htdocs/langs/en_GB/modulebuilder.lang       |   2 -
 htdocs/langs/en_GB/partnership.lang         |   2 +
 htdocs/langs/en_GB/users.lang               |   1 -
 htdocs/langs/en_GB/website.lang             |   2 -
 htdocs/langs/en_IN/accountancy.lang         |   2 +
 htdocs/langs/en_IN/admin.lang               |   1 -
 htdocs/langs/en_IN/cron.lang                |   2 +
 htdocs/langs/en_IN/modulebuilder.lang       |   2 -
 htdocs/langs/en_IN/website.lang             |   3 -
 htdocs/langs/en_SG/accountancy.lang         |   2 +
 htdocs/langs/en_SG/admin.lang               |   1 -
 htdocs/langs/en_SG/cron.lang                |   2 +
 htdocs/langs/en_SG/modulebuilder.lang       |   2 -
 htdocs/langs/en_SG/website.lang             |   3 -
 htdocs/langs/es_AR/accountancy.lang         |   1 +
 htdocs/langs/es_AR/admin.lang               |   1 -
 htdocs/langs/es_AR/boxes.lang               |   3 -
 htdocs/langs/es_AR/companies.lang           |   7 -
 htdocs/langs/es_AR/eventorganization.lang   |   2 +
 htdocs/langs/es_AR/mails.lang               |   1 -
 htdocs/langs/es_AR/main.lang                |   6 +-
 htdocs/langs/es_AR/members.lang             |  12 -
 htdocs/langs/es_AR/modulebuilder.lang       |   2 -
 htdocs/langs/es_AR/partnership.lang         |   2 +
 htdocs/langs/es_AR/products.lang            |   1 -
 htdocs/langs/es_AR/sendings.lang            |   1 -
 htdocs/langs/es_AR/users.lang               |   1 -
 htdocs/langs/es_AR/website.lang             |   2 -
 htdocs/langs/es_BO/accountancy.lang         |   2 +
 htdocs/langs/es_BO/admin.lang               |   1 -
 htdocs/langs/es_BO/cron.lang                |   2 +
 htdocs/langs/es_BO/modulebuilder.lang       |   2 -
 htdocs/langs/es_BO/website.lang             |   3 -
 htdocs/langs/es_CL/accountancy.lang         |   1 -
 htdocs/langs/es_CL/admin.lang               |   1 -
 htdocs/langs/es_CL/banks.lang               |   5 +-
 htdocs/langs/es_CL/bills.lang               |   2 -
 htdocs/langs/es_CL/boxes.lang               |   4 -
 htdocs/langs/es_CL/cashdesk.lang            |   2 -
 htdocs/langs/es_CL/categories.lang          |   8 -
 htdocs/langs/es_CL/companies.lang           |   6 -
 htdocs/langs/es_CL/compta.lang              |   1 -
 htdocs/langs/es_CL/errors.lang              |   4 -
 htdocs/langs/es_CL/mails.lang               |   1 -
 htdocs/langs/es_CL/main.lang                |   6 +-
 htdocs/langs/es_CL/members.lang             |  11 -
 htdocs/langs/es_CL/modulebuilder.lang       |   1 -
 htdocs/langs/es_CL/other.lang               |   1 -
 htdocs/langs/es_CL/partnership.lang         |   4 +
 htdocs/langs/es_CL/products.lang            |   6 -
 htdocs/langs/es_CL/projects.lang            |   4 -
 htdocs/langs/es_CL/sendings.lang            |   1 -
 htdocs/langs/es_CL/stocks.lang              |   1 -
 htdocs/langs/es_CL/users.lang               |   1 -
 htdocs/langs/es_CL/website.lang             |   2 -
 htdocs/langs/es_CO/accountancy.lang         |  92 ++-
 htdocs/langs/es_CO/admin.lang               | 539 +++++++++++-
 htdocs/langs/es_CO/assets.lang              |  14 +
 htdocs/langs/es_CO/banks.lang               | 131 ++-
 htdocs/langs/es_CO/bills.lang               | 117 ++-
 htdocs/langs/es_CO/bookmarks.lang           |  11 +
 htdocs/langs/es_CO/companies.lang           | 104 ++-
 htdocs/langs/es_CO/compta.lang              |  12 +-
 htdocs/langs/es_CO/deliveries.lang          |  22 +
 htdocs/langs/es_CO/donations.lang           |  13 +
 htdocs/langs/es_CO/errors.lang              | 234 ++++++
 htdocs/langs/es_CO/externalsite.lang        |   1 +
 htdocs/langs/es_CO/ftp.lang                 |   5 +
 htdocs/langs/es_CO/help.lang                |  21 +
 htdocs/langs/es_CO/hrm.lang                 |   9 +
 htdocs/langs/es_CO/install.lang             |  11 +
 htdocs/langs/es_CO/intracommreport.lang     |   7 +-
 htdocs/langs/es_CO/knowledgemanagement.lang |   9 +
 htdocs/langs/es_CO/ldap.lang                |  15 +
 htdocs/langs/es_CO/link.lang                |   9 +
 htdocs/langs/es_CO/mailmanspip.lang         |  25 +
 htdocs/langs/es_CO/main.lang                |  98 ++-
 htdocs/langs/es_CO/members.lang             | 142 ++++
 htdocs/langs/es_CO/modulebuilder.lang       |   2 -
 htdocs/langs/es_CO/orders.lang              | 141 ++++
 htdocs/langs/es_CO/other.lang               |   1 -
 htdocs/langs/es_CO/partnership.lang         |  12 +
 htdocs/langs/es_CO/paybox.lang              |  22 +
 htdocs/langs/es_CO/productbatch.lang        |   5 +
 htdocs/langs/es_CO/products.lang            |   2 -
 htdocs/langs/es_CO/projects.lang            |   4 -
 htdocs/langs/es_CO/resource.lang            |  19 +
 htdocs/langs/es_CO/salaries.lang            |   8 +
 htdocs/langs/es_CO/stocks.lang              | 164 ++++
 htdocs/langs/es_CO/suppliers.lang           |   1 +
 htdocs/langs/es_CO/ticket.lang              | 151 ++++
 htdocs/langs/es_CO/website.lang             |   3 -
 htdocs/langs/es_CO/withdrawals.lang         | 122 ++-
 htdocs/langs/es_CO/workflow.lang            |   2 +
 htdocs/langs/es_DO/accountancy.lang         |   2 +
 htdocs/langs/es_DO/admin.lang               |   1 -
 htdocs/langs/es_DO/cron.lang                |   2 +
 htdocs/langs/es_DO/modulebuilder.lang       |   2 -
 htdocs/langs/es_DO/website.lang             |   3 -
 htdocs/langs/es_EC/accountancy.lang         |   1 -
 htdocs/langs/es_EC/admin.lang               |   1 -
 htdocs/langs/es_EC/banks.lang               |   5 +-
 htdocs/langs/es_EC/bills.lang               |   2 -
 htdocs/langs/es_EC/boxes.lang               |   2 -
 htdocs/langs/es_EC/cashdesk.lang            |   1 -
 htdocs/langs/es_EC/categories.lang          |   8 -
 htdocs/langs/es_EC/companies.lang           |   7 -
 htdocs/langs/es_EC/compta.lang              |   1 -
 htdocs/langs/es_EC/errors.lang              |   4 -
 htdocs/langs/es_EC/eventorganization.lang   |   2 +
 htdocs/langs/es_EC/mails.lang               |   1 -
 htdocs/langs/es_EC/main.lang                |   3 -
 htdocs/langs/es_EC/members.lang             |  12 -
 htdocs/langs/es_EC/modulebuilder.lang       |   1 -
 htdocs/langs/es_EC/other.lang               |   1 -
 htdocs/langs/es_EC/partnership.lang         |   3 +
 htdocs/langs/es_EC/products.lang            |   7 -
 htdocs/langs/es_EC/projects.lang            |   4 -
 htdocs/langs/es_EC/sendings.lang            |   1 -
 htdocs/langs/es_EC/stocks.lang              |   1 -
 htdocs/langs/es_EC/users.lang               |   1 -
 htdocs/langs/es_EC/website.lang             |   2 -
 htdocs/langs/es_ES/accountancy.lang         |   8 +-
 htdocs/langs/es_ES/admin.lang               |  21 +-
 htdocs/langs/es_ES/banks.lang               |   6 +-
 htdocs/langs/es_ES/bills.lang               |   8 +-
 htdocs/langs/es_ES/boxes.lang               |  10 +-
 htdocs/langs/es_ES/cashdesk.lang            |  14 +-
 htdocs/langs/es_ES/categories.lang          |  24 +-
 htdocs/langs/es_ES/companies.lang           |  16 +-
 htdocs/langs/es_ES/compta.lang              |   4 +-
 htdocs/langs/es_ES/ecm.lang                 |   8 +-
 htdocs/langs/es_ES/errors.lang              |  12 +-
 htdocs/langs/es_ES/eventorganization.lang   | 101 +++
 htdocs/langs/es_ES/knowledgemanagement.lang |  55 ++
 htdocs/langs/es_ES/mails.lang               |   6 +-
 htdocs/langs/es_ES/main.lang                |  13 +-
 htdocs/langs/es_ES/members.lang             |  34 +-
 htdocs/langs/es_ES/modulebuilder.lang       |   2 +-
 htdocs/langs/es_ES/other.lang               |   6 +-
 htdocs/langs/es_ES/partnership.lang         |  56 ++
 htdocs/langs/es_ES/productbatch.lang        |   8 +-
 htdocs/langs/es_ES/products.lang            |  16 +-
 htdocs/langs/es_ES/projects.lang            |  10 +-
 htdocs/langs/es_ES/recruitment.lang         |   2 +-
 htdocs/langs/es_ES/sendings.lang            |   2 +-
 htdocs/langs/es_ES/stocks.lang              |  16 +-
 htdocs/langs/es_ES/users.lang               |   5 +-
 htdocs/langs/es_ES/website.lang             |   6 +-
 htdocs/langs/es_GT/accountancy.lang         |   2 +
 htdocs/langs/es_GT/admin.lang               |   1 -
 htdocs/langs/es_GT/cron.lang                |   2 +
 htdocs/langs/es_GT/modulebuilder.lang       |   2 -
 htdocs/langs/es_GT/website.lang             |   3 -
 htdocs/langs/es_HN/accountancy.lang         |   2 +
 htdocs/langs/es_HN/admin.lang               |   1 -
 htdocs/langs/es_HN/cron.lang                |   2 +
 htdocs/langs/es_HN/modulebuilder.lang       |   2 -
 htdocs/langs/es_HN/website.lang             |   3 -
 htdocs/langs/es_MX/accountancy.lang         |   1 +
 htdocs/langs/es_MX/admin.lang               |   3 +-
 htdocs/langs/es_MX/agenda.lang              |   9 +-
 htdocs/langs/es_MX/banks.lang               |   1 -
 htdocs/langs/es_MX/companies.lang           |   8 -
 htdocs/langs/es_MX/errors.lang              |   1 -
 htdocs/langs/es_MX/eventorganization.lang   |  13 +
 htdocs/langs/es_MX/modulebuilder.lang       |   1 -
 htdocs/langs/es_MX/partnership.lang         |   3 +
 htdocs/langs/es_MX/recruitment.lang         |  23 +
 htdocs/langs/es_MX/website.lang             |   2 -
 htdocs/langs/es_PA/accountancy.lang         |   2 +
 htdocs/langs/es_PA/admin.lang               |   1 -
 htdocs/langs/es_PA/cron.lang                |   2 +
 htdocs/langs/es_PA/modulebuilder.lang       |   2 -
 htdocs/langs/es_PA/website.lang             |   3 -
 htdocs/langs/es_PE/accountancy.lang         |   1 +
 htdocs/langs/es_PE/admin.lang               |   1 -
 htdocs/langs/es_PE/assets.lang              |   3 +
 htdocs/langs/es_PE/intracommreport.lang     |   2 +-
 htdocs/langs/es_PE/knowledgemanagement.lang |   3 +
 htdocs/langs/es_PE/main.lang                |   2 +-
 htdocs/langs/es_PE/modulebuilder.lang       |   2 -
 htdocs/langs/es_PE/stocks.lang              |   1 +
 htdocs/langs/es_PE/ticket.lang              |   1 +
 htdocs/langs/es_PE/website.lang             |   2 -
 htdocs/langs/es_PY/accountancy.lang         |   2 +
 htdocs/langs/es_PY/admin.lang               |   1 -
 htdocs/langs/es_PY/cron.lang                |   2 +
 htdocs/langs/es_PY/modulebuilder.lang       |   2 -
 htdocs/langs/es_PY/website.lang             |   3 -
 htdocs/langs/es_US/accountancy.lang         |   2 +
 htdocs/langs/es_US/admin.lang               |   1 -
 htdocs/langs/es_US/cron.lang                |   2 +
 htdocs/langs/es_US/modulebuilder.lang       |   2 -
 htdocs/langs/es_US/website.lang             |   3 -
 htdocs/langs/es_UY/accountancy.lang         |   2 +
 htdocs/langs/es_UY/admin.lang               |   1 -
 htdocs/langs/es_UY/cron.lang                |   2 +
 htdocs/langs/es_UY/modulebuilder.lang       |   2 -
 htdocs/langs/es_UY/website.lang             |   3 -
 htdocs/langs/es_VE/accountancy.lang         |   2 +
 htdocs/langs/es_VE/admin.lang               |   1 +
 htdocs/langs/es_VE/banks.lang               |   1 +
 htdocs/langs/es_VE/bills.lang               |   1 +
 htdocs/langs/es_VE/eventorganization.lang   |   2 +
 htdocs/langs/es_VE/modulebuilder.lang       |   2 -
 htdocs/langs/es_VE/partnership.lang         |   5 +
 htdocs/langs/es_VE/products.lang            |   5 +-
 htdocs/langs/es_VE/propal.lang              |   1 +
 htdocs/langs/es_VE/website.lang             |   3 -
 htdocs/langs/et_EE/accountancy.lang         |   4 +-
 htdocs/langs/et_EE/admin.lang               |  11 +-
 htdocs/langs/et_EE/banks.lang               |  10 +-
 htdocs/langs/et_EE/bills.lang               |   4 +-
 htdocs/langs/et_EE/boxes.lang               |  10 +-
 htdocs/langs/et_EE/cashdesk.lang            |  14 +-
 htdocs/langs/et_EE/categories.lang          |  20 +-
 htdocs/langs/et_EE/companies.lang           |  18 +-
 htdocs/langs/et_EE/compta.lang              |   2 +-
 htdocs/langs/et_EE/ecm.lang                 |   2 +-
 htdocs/langs/et_EE/errors.lang              |  12 +-
 htdocs/langs/et_EE/eventorganization.lang   | 101 +++
 htdocs/langs/et_EE/knowledgemanagement.lang |  55 ++
 htdocs/langs/et_EE/mails.lang               |   6 +-
 htdocs/langs/et_EE/main.lang                |  19 +-
 htdocs/langs/et_EE/members.lang             |  38 +-
 htdocs/langs/et_EE/modulebuilder.lang       |   2 +-
 htdocs/langs/et_EE/other.lang               |   4 +-
 htdocs/langs/et_EE/partnership.lang         |  56 ++
 htdocs/langs/et_EE/productbatch.lang        |   2 +-
 htdocs/langs/et_EE/products.lang            |  24 +-
 htdocs/langs/et_EE/projects.lang            |   8 +-
 htdocs/langs/et_EE/recruitment.lang         |   2 +-
 htdocs/langs/et_EE/sendings.lang            |   2 +-
 htdocs/langs/et_EE/stocks.lang              |   2 +-
 htdocs/langs/et_EE/users.lang               |   5 +-
 htdocs/langs/et_EE/website.lang             |   6 +-
 htdocs/langs/eu_ES/accountancy.lang         |   4 +-
 htdocs/langs/eu_ES/admin.lang               |  11 +-
 htdocs/langs/eu_ES/banks.lang               |  10 +-
 htdocs/langs/eu_ES/bills.lang               |   4 +-
 htdocs/langs/eu_ES/boxes.lang               |  10 +-
 htdocs/langs/eu_ES/cashdesk.lang            |  14 +-
 htdocs/langs/eu_ES/categories.lang          |  20 +-
 htdocs/langs/eu_ES/companies.lang           |  18 +-
 htdocs/langs/eu_ES/compta.lang              |   2 +-
 htdocs/langs/eu_ES/ecm.lang                 |   2 +-
 htdocs/langs/eu_ES/errors.lang              |  12 +-
 htdocs/langs/eu_ES/eventorganization.lang   | 101 +++
 htdocs/langs/eu_ES/knowledgemanagement.lang |  55 ++
 htdocs/langs/eu_ES/mails.lang               |   6 +-
 htdocs/langs/eu_ES/main.lang                |  19 +-
 htdocs/langs/eu_ES/members.lang             |  38 +-
 htdocs/langs/eu_ES/modulebuilder.lang       |   2 +-
 htdocs/langs/eu_ES/other.lang               |   4 +-
 htdocs/langs/eu_ES/partnership.lang         |  56 ++
 htdocs/langs/eu_ES/productbatch.lang        |   2 +-
 htdocs/langs/eu_ES/products.lang            |  24 +-
 htdocs/langs/eu_ES/projects.lang            |   8 +-
 htdocs/langs/eu_ES/recruitment.lang         |   2 +-
 htdocs/langs/eu_ES/sendings.lang            |   2 +-
 htdocs/langs/eu_ES/stocks.lang              |   2 +-
 htdocs/langs/eu_ES/users.lang               |   5 +-
 htdocs/langs/eu_ES/website.lang             |   6 +-
 htdocs/langs/fa_IR/accountancy.lang         |   4 +-
 htdocs/langs/fa_IR/admin.lang               |  11 +-
 htdocs/langs/fa_IR/banks.lang               |  10 +-
 htdocs/langs/fa_IR/bills.lang               |   4 +-
 htdocs/langs/fa_IR/boxes.lang               |  10 +-
 htdocs/langs/fa_IR/cashdesk.lang            |  14 +-
 htdocs/langs/fa_IR/categories.lang          |  20 +-
 htdocs/langs/fa_IR/companies.lang           |  16 +-
 htdocs/langs/fa_IR/compta.lang              |   2 +-
 htdocs/langs/fa_IR/ecm.lang                 |   2 +-
 htdocs/langs/fa_IR/errors.lang              |  12 +-
 htdocs/langs/fa_IR/eventorganization.lang   | 101 +++
 htdocs/langs/fa_IR/knowledgemanagement.lang |  55 ++
 htdocs/langs/fa_IR/mails.lang               |   6 +-
 htdocs/langs/fa_IR/main.lang                |  19 +-
 htdocs/langs/fa_IR/members.lang             |  38 +-
 htdocs/langs/fa_IR/modulebuilder.lang       |   2 +-
 htdocs/langs/fa_IR/other.lang               |   4 +-
 htdocs/langs/fa_IR/partnership.lang         |  56 ++
 htdocs/langs/fa_IR/productbatch.lang        |   2 +-
 htdocs/langs/fa_IR/products.lang            |  24 +-
 htdocs/langs/fa_IR/projects.lang            |   8 +-
 htdocs/langs/fa_IR/recruitment.lang         |   2 +-
 htdocs/langs/fa_IR/sendings.lang            |   2 +-
 htdocs/langs/fa_IR/stocks.lang              |   2 +-
 htdocs/langs/fa_IR/users.lang               |   5 +-
 htdocs/langs/fa_IR/website.lang             |   6 +-
 htdocs/langs/fi_FI/accountancy.lang         |   4 +-
 htdocs/langs/fi_FI/admin.lang               |  11 +-
 htdocs/langs/fi_FI/banks.lang               |   8 +-
 htdocs/langs/fi_FI/bills.lang               |   4 +-
 htdocs/langs/fi_FI/boxes.lang               |  10 +-
 htdocs/langs/fi_FI/cashdesk.lang            |  14 +-
 htdocs/langs/fi_FI/categories.lang          |  20 +-
 htdocs/langs/fi_FI/companies.lang           |  16 +-
 htdocs/langs/fi_FI/compta.lang              |   2 +-
 htdocs/langs/fi_FI/ecm.lang                 |   2 +-
 htdocs/langs/fi_FI/errors.lang              |  12 +-
 htdocs/langs/fi_FI/eventorganization.lang   | 101 +++
 htdocs/langs/fi_FI/knowledgemanagement.lang |  55 ++
 htdocs/langs/fi_FI/mails.lang               |   6 +-
 htdocs/langs/fi_FI/main.lang                |  19 +-
 htdocs/langs/fi_FI/members.lang             |  38 +-
 htdocs/langs/fi_FI/modulebuilder.lang       |   2 +-
 htdocs/langs/fi_FI/other.lang               |   4 +-
 htdocs/langs/fi_FI/partnership.lang         |  56 ++
 htdocs/langs/fi_FI/productbatch.lang        |   2 +-
 htdocs/langs/fi_FI/products.lang            |  24 +-
 htdocs/langs/fi_FI/projects.lang            |   8 +-
 htdocs/langs/fi_FI/recruitment.lang         |   2 +-
 htdocs/langs/fi_FI/sendings.lang            |   2 +-
 htdocs/langs/fi_FI/stocks.lang              |   2 +-
 htdocs/langs/fi_FI/users.lang               |   5 +-
 htdocs/langs/fi_FI/website.lang             |   6 +-
 htdocs/langs/fr_BE/accountancy.lang         |   1 +
 htdocs/langs/fr_BE/admin.lang               |   1 -
 htdocs/langs/fr_BE/cron.lang                |   2 +
 htdocs/langs/fr_BE/modulebuilder.lang       |   2 -
 htdocs/langs/fr_CA/accountancy.lang         |   1 +
 htdocs/langs/fr_CA/admin.lang               |   1 -
 htdocs/langs/fr_CA/banks.lang               |   2 +-
 htdocs/langs/fr_CA/bills.lang               |   1 -
 htdocs/langs/fr_CA/boxes.lang               |   3 -
 htdocs/langs/fr_CA/categories.lang          |   2 -
 htdocs/langs/fr_CA/companies.lang           |   3 -
 htdocs/langs/fr_CA/errors.lang              |   3 -
 htdocs/langs/fr_CA/main.lang                |   1 -
 htdocs/langs/fr_CA/members.lang             |  12 -
 htdocs/langs/fr_CA/modulebuilder.lang       |   1 -
 htdocs/langs/fr_CA/products.lang            |   1 -
 htdocs/langs/fr_CA/projects.lang            |   2 -
 htdocs/langs/fr_CA/sendings.lang            |   1 -
 htdocs/langs/fr_CH/accountancy.lang         |   2 +
 htdocs/langs/fr_CH/admin.lang               |   1 -
 htdocs/langs/fr_CH/cron.lang                |   2 +
 htdocs/langs/fr_CH/modulebuilder.lang       |   2 -
 htdocs/langs/fr_CI/accountancy.lang         |   2 +
 htdocs/langs/fr_CI/admin.lang               |   1 -
 htdocs/langs/fr_CI/cron.lang                |   2 +
 htdocs/langs/fr_CI/modulebuilder.lang       |   2 -
 htdocs/langs/fr_CM/accountancy.lang         |   2 +
 htdocs/langs/fr_CM/admin.lang               |   1 -
 htdocs/langs/fr_CM/cron.lang                |   2 +
 htdocs/langs/fr_CM/modulebuilder.lang       |   2 -
 htdocs/langs/fr_FR/accountancy.lang         |  44 +-
 htdocs/langs/fr_FR/admin.lang               |  41 +-
 htdocs/langs/fr_FR/banks.lang               |  10 +-
 htdocs/langs/fr_FR/bills.lang               |  16 +-
 htdocs/langs/fr_FR/blockedlog.lang          |   2 +-
 htdocs/langs/fr_FR/boxes.lang               |  26 +-
 htdocs/langs/fr_FR/cashdesk.lang            |   9 +-
 htdocs/langs/fr_FR/categories.lang          |  24 +-
 htdocs/langs/fr_FR/companies.lang           |  22 +-
 htdocs/langs/fr_FR/compta.lang              |   8 +-
 htdocs/langs/fr_FR/ecm.lang                 |   8 +-
 htdocs/langs/fr_FR/errors.lang              |  16 +-
 htdocs/langs/fr_FR/eventorganization.lang   | 101 +++
 htdocs/langs/fr_FR/knowledgemanagement.lang |  46 +-
 htdocs/langs/fr_FR/mails.lang               |   6 +-
 htdocs/langs/fr_FR/main.lang                |  25 +-
 htdocs/langs/fr_FR/members.lang             |  56 +-
 htdocs/langs/fr_FR/modulebuilder.lang       |   6 +-
 htdocs/langs/fr_FR/orders.lang              |   4 +-
 htdocs/langs/fr_FR/other.lang               |   6 +-
 htdocs/langs/fr_FR/partnership.lang         |  56 ++
 htdocs/langs/fr_FR/productbatch.lang        |  17 +-
 htdocs/langs/fr_FR/products.lang            |  26 +-
 htdocs/langs/fr_FR/projects.lang            |  14 +-
 htdocs/langs/fr_FR/propal.lang              |   2 +-
 htdocs/langs/fr_FR/recruitment.lang         |   2 +-
 htdocs/langs/fr_FR/salaries.lang            |   4 +-
 htdocs/langs/fr_FR/sendings.lang            |   2 +-
 htdocs/langs/fr_FR/stocks.lang              |  32 +-
 htdocs/langs/fr_FR/ticket.lang              |  24 +-
 htdocs/langs/fr_FR/users.lang               |   5 +-
 htdocs/langs/fr_FR/website.lang             |  14 +-
 htdocs/langs/fr_FR/zapier.lang              |   4 +-
 htdocs/langs/fr_GA/accountancy.lang         |   2 +
 htdocs/langs/fr_GA/admin.lang               |   1 -
 htdocs/langs/fr_GA/cron.lang                |   2 +
 htdocs/langs/fr_GA/modulebuilder.lang       |   2 -
 htdocs/langs/gl_ES/accountancy.lang         |   4 +-
 htdocs/langs/gl_ES/admin.lang               |  11 +-
 htdocs/langs/gl_ES/banks.lang               |   8 +-
 htdocs/langs/gl_ES/bills.lang               |   4 +-
 htdocs/langs/gl_ES/boxes.lang               |  10 +-
 htdocs/langs/gl_ES/cashdesk.lang            |  14 +-
 htdocs/langs/gl_ES/categories.lang          |  20 +-
 htdocs/langs/gl_ES/companies.lang           |  16 +-
 htdocs/langs/gl_ES/compta.lang              |   2 +-
 htdocs/langs/gl_ES/ecm.lang                 |   2 +-
 htdocs/langs/gl_ES/errors.lang              |  12 +-
 htdocs/langs/gl_ES/eventorganization.lang   | 101 +++
 htdocs/langs/gl_ES/knowledgemanagement.lang |  55 ++
 htdocs/langs/gl_ES/mails.lang               |  14 +-
 htdocs/langs/gl_ES/main.lang                |  19 +-
 htdocs/langs/gl_ES/members.lang             |  34 +-
 htdocs/langs/gl_ES/modulebuilder.lang       |   2 +-
 htdocs/langs/gl_ES/other.lang               |   4 +-
 htdocs/langs/gl_ES/partnership.lang         |  56 ++
 htdocs/langs/gl_ES/productbatch.lang        |   2 +-
 htdocs/langs/gl_ES/products.lang            |  16 +-
 htdocs/langs/gl_ES/projects.lang            |   8 +-
 htdocs/langs/gl_ES/recruitment.lang         |  34 +-
 htdocs/langs/gl_ES/sendings.lang            |   2 +-
 htdocs/langs/gl_ES/stocks.lang              |   2 +-
 htdocs/langs/gl_ES/trips.lang               |   4 +-
 htdocs/langs/gl_ES/users.lang               |   5 +-
 htdocs/langs/gl_ES/website.lang             |   6 +-
 htdocs/langs/he_IL/accountancy.lang         |   4 +-
 htdocs/langs/he_IL/admin.lang               |  11 +-
 htdocs/langs/he_IL/banks.lang               |  10 +-
 htdocs/langs/he_IL/bills.lang               |   4 +-
 htdocs/langs/he_IL/boxes.lang               |  10 +-
 htdocs/langs/he_IL/cashdesk.lang            |  14 +-
 htdocs/langs/he_IL/categories.lang          |  20 +-
 htdocs/langs/he_IL/companies.lang           |  18 +-
 htdocs/langs/he_IL/compta.lang              |   2 +-
 htdocs/langs/he_IL/ecm.lang                 |   2 +-
 htdocs/langs/he_IL/errors.lang              |  12 +-
 htdocs/langs/he_IL/eventorganization.lang   | 101 +++
 htdocs/langs/he_IL/knowledgemanagement.lang |  55 ++
 htdocs/langs/he_IL/mails.lang               |   6 +-
 htdocs/langs/he_IL/main.lang                |  19 +-
 htdocs/langs/he_IL/members.lang             |  38 +-
 htdocs/langs/he_IL/modulebuilder.lang       |   2 +-
 htdocs/langs/he_IL/other.lang               |   4 +-
 htdocs/langs/he_IL/partnership.lang         |  56 ++
 htdocs/langs/he_IL/productbatch.lang        |   2 +-
 htdocs/langs/he_IL/products.lang            |  24 +-
 htdocs/langs/he_IL/projects.lang            |   8 +-
 htdocs/langs/he_IL/recruitment.lang         |   2 +-
 htdocs/langs/he_IL/sendings.lang            |   2 +-
 htdocs/langs/he_IL/stocks.lang              |   2 +-
 htdocs/langs/he_IL/users.lang               |   5 +-
 htdocs/langs/he_IL/website.lang             |   6 +-
 htdocs/langs/hi_IN/accountancy.lang         |   4 +-
 htdocs/langs/hi_IN/admin.lang               |  11 +-
 htdocs/langs/hi_IN/banks.lang               |  10 +-
 htdocs/langs/hi_IN/bills.lang               |   4 +-
 htdocs/langs/hi_IN/boxes.lang               |  10 +-
 htdocs/langs/hi_IN/cashdesk.lang            |  14 +-
 htdocs/langs/hi_IN/categories.lang          |  20 +-
 htdocs/langs/hi_IN/companies.lang           |  18 +-
 htdocs/langs/hi_IN/compta.lang              |   2 +-
 htdocs/langs/hi_IN/ecm.lang                 |   2 +-
 htdocs/langs/hi_IN/errors.lang              |  12 +-
 htdocs/langs/hi_IN/eventorganization.lang   | 101 +++
 htdocs/langs/hi_IN/knowledgemanagement.lang |  55 ++
 htdocs/langs/hi_IN/mails.lang               |   6 +-
 htdocs/langs/hi_IN/main.lang                |  19 +-
 htdocs/langs/hi_IN/members.lang             |  38 +-
 htdocs/langs/hi_IN/modulebuilder.lang       |   2 +-
 htdocs/langs/hi_IN/other.lang               |   4 +-
 htdocs/langs/hi_IN/partnership.lang         |  56 ++
 htdocs/langs/hi_IN/productbatch.lang        |   2 +-
 htdocs/langs/hi_IN/products.lang            |  24 +-
 htdocs/langs/hi_IN/projects.lang            |   8 +-
 htdocs/langs/hi_IN/recruitment.lang         |   2 +-
 htdocs/langs/hi_IN/sendings.lang            |   2 +-
 htdocs/langs/hi_IN/stocks.lang              |   2 +-
 htdocs/langs/hi_IN/users.lang               |   5 +-
 htdocs/langs/hi_IN/website.lang             |   6 +-
 htdocs/langs/hr_HR/accountancy.lang         |   4 +-
 htdocs/langs/hr_HR/admin.lang               |  11 +-
 htdocs/langs/hr_HR/banks.lang               |   8 +-
 htdocs/langs/hr_HR/bills.lang               |   6 +-
 htdocs/langs/hr_HR/boxes.lang               |  10 +-
 htdocs/langs/hr_HR/cashdesk.lang            |  14 +-
 htdocs/langs/hr_HR/categories.lang          |  20 +-
 htdocs/langs/hr_HR/companies.lang           |  18 +-
 htdocs/langs/hr_HR/compta.lang              |   2 +-
 htdocs/langs/hr_HR/ecm.lang                 |   2 +-
 htdocs/langs/hr_HR/errors.lang              |  12 +-
 htdocs/langs/hr_HR/eventorganization.lang   | 101 +++
 htdocs/langs/hr_HR/knowledgemanagement.lang |  55 ++
 htdocs/langs/hr_HR/mails.lang               |   6 +-
 htdocs/langs/hr_HR/main.lang                |  19 +-
 htdocs/langs/hr_HR/members.lang             |  38 +-
 htdocs/langs/hr_HR/modulebuilder.lang       |   2 +-
 htdocs/langs/hr_HR/other.lang               |   4 +-
 htdocs/langs/hr_HR/partnership.lang         |  56 ++
 htdocs/langs/hr_HR/productbatch.lang        |   2 +-
 htdocs/langs/hr_HR/products.lang            |  24 +-
 htdocs/langs/hr_HR/projects.lang            |   8 +-
 htdocs/langs/hr_HR/recruitment.lang         |   2 +-
 htdocs/langs/hr_HR/sendings.lang            |   2 +-
 htdocs/langs/hr_HR/stocks.lang              |   2 +-
 htdocs/langs/hr_HR/users.lang               |   5 +-
 htdocs/langs/hr_HR/website.lang             |   6 +-
 htdocs/langs/hu_HU/accountancy.lang         |   4 +-
 htdocs/langs/hu_HU/admin.lang               |  11 +-
 htdocs/langs/hu_HU/banks.lang               |  10 +-
 htdocs/langs/hu_HU/bills.lang               |   4 +-
 htdocs/langs/hu_HU/boxes.lang               |  10 +-
 htdocs/langs/hu_HU/cashdesk.lang            |  14 +-
 htdocs/langs/hu_HU/categories.lang          |  20 +-
 htdocs/langs/hu_HU/companies.lang           |  16 +-
 htdocs/langs/hu_HU/compta.lang              |   2 +-
 htdocs/langs/hu_HU/ecm.lang                 |   2 +-
 htdocs/langs/hu_HU/errors.lang              |  12 +-
 htdocs/langs/hu_HU/eventorganization.lang   | 101 +++
 htdocs/langs/hu_HU/intracommreport.lang     |  28 +-
 htdocs/langs/hu_HU/knowledgemanagement.lang |  55 ++
 htdocs/langs/hu_HU/mails.lang               |   6 +-
 htdocs/langs/hu_HU/main.lang                |  19 +-
 htdocs/langs/hu_HU/members.lang             |  38 +-
 htdocs/langs/hu_HU/modulebuilder.lang       |   2 +-
 htdocs/langs/hu_HU/other.lang               |   4 +-
 htdocs/langs/hu_HU/partnership.lang         |  56 ++
 htdocs/langs/hu_HU/productbatch.lang        |   2 +-
 htdocs/langs/hu_HU/products.lang            |  38 +-
 htdocs/langs/hu_HU/projects.lang            |   8 +-
 htdocs/langs/hu_HU/recruitment.lang         |   2 +-
 htdocs/langs/hu_HU/sendings.lang            |   2 +-
 htdocs/langs/hu_HU/stocks.lang              |   2 +-
 htdocs/langs/hu_HU/users.lang               |   5 +-
 htdocs/langs/hu_HU/website.lang             |   6 +-
 htdocs/langs/id_ID/accountancy.lang         |   4 +-
 htdocs/langs/id_ID/admin.lang               |  11 +-
 htdocs/langs/id_ID/banks.lang               |  10 +-
 htdocs/langs/id_ID/bills.lang               |   4 +-
 htdocs/langs/id_ID/boxes.lang               |  10 +-
 htdocs/langs/id_ID/cashdesk.lang            |  14 +-
 htdocs/langs/id_ID/categories.lang          |  20 +-
 htdocs/langs/id_ID/companies.lang           |  18 +-
 htdocs/langs/id_ID/compta.lang              |   2 +-
 htdocs/langs/id_ID/ecm.lang                 |   2 +-
 htdocs/langs/id_ID/errors.lang              |  12 +-
 htdocs/langs/id_ID/eventorganization.lang   | 101 +++
 htdocs/langs/id_ID/knowledgemanagement.lang |  55 ++
 htdocs/langs/id_ID/mails.lang               |   6 +-
 htdocs/langs/id_ID/main.lang                |  19 +-
 htdocs/langs/id_ID/members.lang             |  38 +-
 htdocs/langs/id_ID/modulebuilder.lang       |   2 +-
 htdocs/langs/id_ID/other.lang               |   4 +-
 htdocs/langs/id_ID/partnership.lang         |  56 ++
 htdocs/langs/id_ID/productbatch.lang        |   2 +-
 htdocs/langs/id_ID/products.lang            |  24 +-
 htdocs/langs/id_ID/projects.lang            |   8 +-
 htdocs/langs/id_ID/recruitment.lang         |   2 +-
 htdocs/langs/id_ID/sendings.lang            |   2 +-
 htdocs/langs/id_ID/stocks.lang              |   2 +-
 htdocs/langs/id_ID/users.lang               |   5 +-
 htdocs/langs/id_ID/website.lang             |   6 +-
 htdocs/langs/is_IS/accountancy.lang         |   4 +-
 htdocs/langs/is_IS/admin.lang               |  11 +-
 htdocs/langs/is_IS/banks.lang               |   8 +-
 htdocs/langs/is_IS/bills.lang               |   4 +-
 htdocs/langs/is_IS/boxes.lang               |  10 +-
 htdocs/langs/is_IS/cashdesk.lang            |  14 +-
 htdocs/langs/is_IS/categories.lang          |  20 +-
 htdocs/langs/is_IS/companies.lang           |  18 +-
 htdocs/langs/is_IS/compta.lang              |   2 +-
 htdocs/langs/is_IS/ecm.lang                 |   2 +-
 htdocs/langs/is_IS/errors.lang              |  12 +-
 htdocs/langs/is_IS/eventorganization.lang   | 101 +++
 htdocs/langs/is_IS/knowledgemanagement.lang |  55 ++
 htdocs/langs/is_IS/mails.lang               |   6 +-
 htdocs/langs/is_IS/main.lang                |  19 +-
 htdocs/langs/is_IS/members.lang             |  38 +-
 htdocs/langs/is_IS/modulebuilder.lang       |   2 +-
 htdocs/langs/is_IS/other.lang               |   4 +-
 htdocs/langs/is_IS/partnership.lang         |  56 ++
 htdocs/langs/is_IS/productbatch.lang        |   2 +-
 htdocs/langs/is_IS/products.lang            |  24 +-
 htdocs/langs/is_IS/projects.lang            |   8 +-
 htdocs/langs/is_IS/recruitment.lang         |   2 +-
 htdocs/langs/is_IS/sendings.lang            |   2 +-
 htdocs/langs/is_IS/stocks.lang              |   2 +-
 htdocs/langs/is_IS/users.lang               |   5 +-
 htdocs/langs/is_IS/website.lang             |   6 +-
 htdocs/langs/it_CH/accountancy.lang         |   2 +
 htdocs/langs/it_CH/admin.lang               |   1 -
 htdocs/langs/it_CH/cron.lang                |   2 +
 htdocs/langs/it_CH/modulebuilder.lang       |   2 -
 htdocs/langs/it_IT/accountancy.lang         |   4 +-
 htdocs/langs/it_IT/admin.lang               |  13 +-
 htdocs/langs/it_IT/banks.lang               |  10 +-
 htdocs/langs/it_IT/bills.lang               |   4 +-
 htdocs/langs/it_IT/boxes.lang               |  10 +-
 htdocs/langs/it_IT/cashdesk.lang            |  14 +-
 htdocs/langs/it_IT/categories.lang          |  20 +-
 htdocs/langs/it_IT/companies.lang           |  18 +-
 htdocs/langs/it_IT/compta.lang              |   2 +-
 htdocs/langs/it_IT/ecm.lang                 |   2 +-
 htdocs/langs/it_IT/errors.lang              |  12 +-
 htdocs/langs/it_IT/eventorganization.lang   | 101 +++
 htdocs/langs/it_IT/knowledgemanagement.lang |  55 ++
 htdocs/langs/it_IT/mails.lang               |   6 +-
 htdocs/langs/it_IT/main.lang                |  19 +-
 htdocs/langs/it_IT/members.lang             |  38 +-
 htdocs/langs/it_IT/modulebuilder.lang       |   2 +-
 htdocs/langs/it_IT/other.lang               |   4 +-
 htdocs/langs/it_IT/partnership.lang         |  56 ++
 htdocs/langs/it_IT/productbatch.lang        |   2 +-
 htdocs/langs/it_IT/products.lang            |  24 +-
 htdocs/langs/it_IT/projects.lang            |   8 +-
 htdocs/langs/it_IT/recruitment.lang         |   2 +-
 htdocs/langs/it_IT/sendings.lang            |   2 +-
 htdocs/langs/it_IT/stocks.lang              |   2 +-
 htdocs/langs/it_IT/users.lang               |   5 +-
 htdocs/langs/it_IT/website.lang             |   6 +-
 htdocs/langs/ja_JP/accountancy.lang         |   4 +-
 htdocs/langs/ja_JP/admin.lang               |  35 +-
 htdocs/langs/ja_JP/agenda.lang              |  39 +-
 htdocs/langs/ja_JP/banks.lang               |  10 +-
 htdocs/langs/ja_JP/bills.lang               |   4 +-
 htdocs/langs/ja_JP/boxes.lang               |  10 +-
 htdocs/langs/ja_JP/cashdesk.lang            |  14 +-
 htdocs/langs/ja_JP/categories.lang          |  20 +-
 htdocs/langs/ja_JP/companies.lang           |  20 +-
 htdocs/langs/ja_JP/compta.lang              |   2 +-
 htdocs/langs/ja_JP/ecm.lang                 |   2 +-
 htdocs/langs/ja_JP/errors.lang              |  12 +-
 htdocs/langs/ja_JP/eventorganization.lang   | 101 +++
 htdocs/langs/ja_JP/install.lang             |  22 +-
 htdocs/langs/ja_JP/knowledgemanagement.lang |  55 ++
 htdocs/langs/ja_JP/mails.lang               |   6 +-
 htdocs/langs/ja_JP/main.lang                |  23 +-
 htdocs/langs/ja_JP/members.lang             | 246 +++---
 htdocs/langs/ja_JP/modulebuilder.lang       |   2 +-
 htdocs/langs/ja_JP/other.lang               |   4 +-
 htdocs/langs/ja_JP/partnership.lang         |  56 ++
 htdocs/langs/ja_JP/productbatch.lang        |   2 +-
 htdocs/langs/ja_JP/products.lang            |  24 +-
 htdocs/langs/ja_JP/projects.lang            |   8 +-
 htdocs/langs/ja_JP/recruitment.lang         |   4 +-
 htdocs/langs/ja_JP/sendings.lang            |   2 +-
 htdocs/langs/ja_JP/stocks.lang              |   2 +-
 htdocs/langs/ja_JP/users.lang               |   5 +-
 htdocs/langs/ja_JP/website.lang             |   6 +-
 htdocs/langs/ka_GE/accountancy.lang         |   4 +-
 htdocs/langs/ka_GE/admin.lang               |  11 +-
 htdocs/langs/ka_GE/banks.lang               |  10 +-
 htdocs/langs/ka_GE/bills.lang               |   4 +-
 htdocs/langs/ka_GE/boxes.lang               |  10 +-
 htdocs/langs/ka_GE/cashdesk.lang            |  14 +-
 htdocs/langs/ka_GE/categories.lang          |  20 +-
 htdocs/langs/ka_GE/companies.lang           |  18 +-
 htdocs/langs/ka_GE/compta.lang              |   2 +-
 htdocs/langs/ka_GE/ecm.lang                 |   2 +-
 htdocs/langs/ka_GE/errors.lang              |  12 +-
 htdocs/langs/ka_GE/eventorganization.lang   | 101 +++
 htdocs/langs/ka_GE/knowledgemanagement.lang |  55 ++
 htdocs/langs/ka_GE/mails.lang               |   6 +-
 htdocs/langs/ka_GE/main.lang                |  19 +-
 htdocs/langs/ka_GE/members.lang             |  38 +-
 htdocs/langs/ka_GE/modulebuilder.lang       |   2 +-
 htdocs/langs/ka_GE/other.lang               |   4 +-
 htdocs/langs/ka_GE/partnership.lang         |  56 ++
 htdocs/langs/ka_GE/productbatch.lang        |   2 +-
 htdocs/langs/ka_GE/products.lang            |  24 +-
 htdocs/langs/ka_GE/projects.lang            |   8 +-
 htdocs/langs/ka_GE/recruitment.lang         |   2 +-
 htdocs/langs/ka_GE/sendings.lang            |   2 +-
 htdocs/langs/ka_GE/stocks.lang              |   2 +-
 htdocs/langs/ka_GE/users.lang               |   5 +-
 htdocs/langs/ka_GE/website.lang             |   6 +-
 htdocs/langs/km_KH/accountancy.lang         |   4 +-
 htdocs/langs/km_KH/admin.lang               |  11 +-
 htdocs/langs/km_KH/banks.lang               |  10 +-
 htdocs/langs/km_KH/bills.lang               |   4 +-
 htdocs/langs/km_KH/boxes.lang               |  10 +-
 htdocs/langs/km_KH/cashdesk.lang            |  14 +-
 htdocs/langs/km_KH/categories.lang          |  20 +-
 htdocs/langs/km_KH/companies.lang           |  18 +-
 htdocs/langs/km_KH/compta.lang              |   2 +-
 htdocs/langs/km_KH/ecm.lang                 |   2 +-
 htdocs/langs/km_KH/errors.lang              |  12 +-
 htdocs/langs/km_KH/eventorganization.lang   | 101 +++
 htdocs/langs/km_KH/knowledgemanagement.lang |  55 ++
 htdocs/langs/km_KH/mails.lang               |   6 +-
 htdocs/langs/km_KH/main.lang                |  19 +-
 htdocs/langs/km_KH/members.lang             |  38 +-
 htdocs/langs/km_KH/modulebuilder.lang       |   2 +-
 htdocs/langs/km_KH/other.lang               |   4 +-
 htdocs/langs/km_KH/partnership.lang         |  56 ++
 htdocs/langs/km_KH/productbatch.lang        |   2 +-
 htdocs/langs/km_KH/products.lang            |  24 +-
 htdocs/langs/km_KH/projects.lang            |   8 +-
 htdocs/langs/km_KH/recruitment.lang         |   2 +-
 htdocs/langs/km_KH/sendings.lang            |   2 +-
 htdocs/langs/km_KH/stocks.lang              |   2 +-
 htdocs/langs/km_KH/users.lang               |   5 +-
 htdocs/langs/km_KH/website.lang             |   6 +-
 htdocs/langs/kn_IN/accountancy.lang         |   4 +-
 htdocs/langs/kn_IN/admin.lang               |  11 +-
 htdocs/langs/kn_IN/banks.lang               |  10 +-
 htdocs/langs/kn_IN/bills.lang               |   4 +-
 htdocs/langs/kn_IN/boxes.lang               |  10 +-
 htdocs/langs/kn_IN/cashdesk.lang            |  14 +-
 htdocs/langs/kn_IN/categories.lang          |  20 +-
 htdocs/langs/kn_IN/companies.lang           |  18 +-
 htdocs/langs/kn_IN/compta.lang              |   2 +-
 htdocs/langs/kn_IN/ecm.lang                 |   2 +-
 htdocs/langs/kn_IN/errors.lang              |  12 +-
 htdocs/langs/kn_IN/eventorganization.lang   | 101 +++
 htdocs/langs/kn_IN/knowledgemanagement.lang |  55 ++
 htdocs/langs/kn_IN/mails.lang               |   6 +-
 htdocs/langs/kn_IN/main.lang                |  19 +-
 htdocs/langs/kn_IN/members.lang             |  38 +-
 htdocs/langs/kn_IN/modulebuilder.lang       |   2 +-
 htdocs/langs/kn_IN/other.lang               |   4 +-
 htdocs/langs/kn_IN/partnership.lang         |  56 ++
 htdocs/langs/kn_IN/productbatch.lang        |   2 +-
 htdocs/langs/kn_IN/products.lang            |  24 +-
 htdocs/langs/kn_IN/projects.lang            |   8 +-
 htdocs/langs/kn_IN/recruitment.lang         |   2 +-
 htdocs/langs/kn_IN/sendings.lang            |   2 +-
 htdocs/langs/kn_IN/stocks.lang              |   2 +-
 htdocs/langs/kn_IN/users.lang               |   5 +-
 htdocs/langs/kn_IN/website.lang             |   6 +-
 htdocs/langs/ko_KR/accountancy.lang         |   4 +-
 htdocs/langs/ko_KR/admin.lang               |  11 +-
 htdocs/langs/ko_KR/banks.lang               |  10 +-
 htdocs/langs/ko_KR/bills.lang               |   4 +-
 htdocs/langs/ko_KR/boxes.lang               |  10 +-
 htdocs/langs/ko_KR/cashdesk.lang            |  14 +-
 htdocs/langs/ko_KR/categories.lang          |  20 +-
 htdocs/langs/ko_KR/companies.lang           |  18 +-
 htdocs/langs/ko_KR/compta.lang              |   2 +-
 htdocs/langs/ko_KR/ecm.lang                 |   2 +-
 htdocs/langs/ko_KR/errors.lang              |  12 +-
 htdocs/langs/ko_KR/eventorganization.lang   | 101 +++
 htdocs/langs/ko_KR/knowledgemanagement.lang |  55 ++
 htdocs/langs/ko_KR/mails.lang               |   6 +-
 htdocs/langs/ko_KR/main.lang                |  19 +-
 htdocs/langs/ko_KR/members.lang             |  38 +-
 htdocs/langs/ko_KR/modulebuilder.lang       |   2 +-
 htdocs/langs/ko_KR/other.lang               |   4 +-
 htdocs/langs/ko_KR/partnership.lang         |  56 ++
 htdocs/langs/ko_KR/productbatch.lang        |   2 +-
 htdocs/langs/ko_KR/products.lang            |  24 +-
 htdocs/langs/ko_KR/projects.lang            |   8 +-
 htdocs/langs/ko_KR/recruitment.lang         |   2 +-
 htdocs/langs/ko_KR/sendings.lang            |   2 +-
 htdocs/langs/ko_KR/stocks.lang              |   2 +-
 htdocs/langs/ko_KR/users.lang               |   5 +-
 htdocs/langs/ko_KR/website.lang             |   6 +-
 htdocs/langs/lo_LA/accountancy.lang         |   4 +-
 htdocs/langs/lo_LA/admin.lang               |  11 +-
 htdocs/langs/lo_LA/banks.lang               |  10 +-
 htdocs/langs/lo_LA/bills.lang               |   4 +-
 htdocs/langs/lo_LA/boxes.lang               |  10 +-
 htdocs/langs/lo_LA/cashdesk.lang            |  14 +-
 htdocs/langs/lo_LA/categories.lang          |  20 +-
 htdocs/langs/lo_LA/companies.lang           |  18 +-
 htdocs/langs/lo_LA/compta.lang              |   2 +-
 htdocs/langs/lo_LA/ecm.lang                 |   2 +-
 htdocs/langs/lo_LA/errors.lang              |  12 +-
 htdocs/langs/lo_LA/eventorganization.lang   | 101 +++
 htdocs/langs/lo_LA/knowledgemanagement.lang |  55 ++
 htdocs/langs/lo_LA/mails.lang               |   6 +-
 htdocs/langs/lo_LA/main.lang                |  19 +-
 htdocs/langs/lo_LA/members.lang             |  38 +-
 htdocs/langs/lo_LA/modulebuilder.lang       |   2 +-
 htdocs/langs/lo_LA/other.lang               |   4 +-
 htdocs/langs/lo_LA/partnership.lang         |  56 ++
 htdocs/langs/lo_LA/productbatch.lang        |   2 +-
 htdocs/langs/lo_LA/products.lang            |  24 +-
 htdocs/langs/lo_LA/projects.lang            |   8 +-
 htdocs/langs/lo_LA/recruitment.lang         |   2 +-
 htdocs/langs/lo_LA/sendings.lang            |   2 +-
 htdocs/langs/lo_LA/stocks.lang              |   2 +-
 htdocs/langs/lo_LA/users.lang               |   5 +-
 htdocs/langs/lo_LA/website.lang             |   6 +-
 htdocs/langs/lt_LT/accountancy.lang         |   4 +-
 htdocs/langs/lt_LT/admin.lang               |  11 +-
 htdocs/langs/lt_LT/banks.lang               |   8 +-
 htdocs/langs/lt_LT/bills.lang               |   4 +-
 htdocs/langs/lt_LT/boxes.lang               |  10 +-
 htdocs/langs/lt_LT/cashdesk.lang            |  14 +-
 htdocs/langs/lt_LT/categories.lang          |  20 +-
 htdocs/langs/lt_LT/companies.lang           |  18 +-
 htdocs/langs/lt_LT/compta.lang              |   2 +-
 htdocs/langs/lt_LT/ecm.lang                 |   2 +-
 htdocs/langs/lt_LT/errors.lang              |  12 +-
 htdocs/langs/lt_LT/eventorganization.lang   | 101 +++
 htdocs/langs/lt_LT/knowledgemanagement.lang |  55 ++
 htdocs/langs/lt_LT/mails.lang               |   6 +-
 htdocs/langs/lt_LT/main.lang                |  19 +-
 htdocs/langs/lt_LT/members.lang             |  38 +-
 htdocs/langs/lt_LT/modulebuilder.lang       |   2 +-
 htdocs/langs/lt_LT/other.lang               |   4 +-
 htdocs/langs/lt_LT/partnership.lang         |  56 ++
 htdocs/langs/lt_LT/productbatch.lang        |   2 +-
 htdocs/langs/lt_LT/products.lang            |  24 +-
 htdocs/langs/lt_LT/projects.lang            |   8 +-
 htdocs/langs/lt_LT/recruitment.lang         |   2 +-
 htdocs/langs/lt_LT/sendings.lang            |   2 +-
 htdocs/langs/lt_LT/stocks.lang              |   2 +-
 htdocs/langs/lt_LT/users.lang               |   5 +-
 htdocs/langs/lt_LT/website.lang             |   6 +-
 htdocs/langs/lv_LV/accountancy.lang         |   4 +-
 htdocs/langs/lv_LV/admin.lang               |  11 +-
 htdocs/langs/lv_LV/banks.lang               |  10 +-
 htdocs/langs/lv_LV/bills.lang               |   4 +-
 htdocs/langs/lv_LV/boxes.lang               |  10 +-
 htdocs/langs/lv_LV/cashdesk.lang            |  24 +-
 htdocs/langs/lv_LV/categories.lang          |  20 +-
 htdocs/langs/lv_LV/companies.lang           |  16 +-
 htdocs/langs/lv_LV/compta.lang              |   2 +-
 htdocs/langs/lv_LV/ecm.lang                 |   2 +-
 htdocs/langs/lv_LV/errors.lang              |  12 +-
 htdocs/langs/lv_LV/eventorganization.lang   | 101 +++
 htdocs/langs/lv_LV/knowledgemanagement.lang |  55 ++
 htdocs/langs/lv_LV/mails.lang               |  16 +-
 htdocs/langs/lv_LV/main.lang                |  19 +-
 htdocs/langs/lv_LV/members.lang             |  38 +-
 htdocs/langs/lv_LV/modulebuilder.lang       |   2 +-
 htdocs/langs/lv_LV/other.lang               |   4 +-
 htdocs/langs/lv_LV/partnership.lang         |  56 ++
 htdocs/langs/lv_LV/productbatch.lang        |   2 +-
 htdocs/langs/lv_LV/products.lang            |  24 +-
 htdocs/langs/lv_LV/projects.lang            |   8 +-
 htdocs/langs/lv_LV/recruitment.lang         |  34 +-
 htdocs/langs/lv_LV/sendings.lang            |   2 +-
 htdocs/langs/lv_LV/stocks.lang              |   2 +-
 htdocs/langs/lv_LV/users.lang               |   5 +-
 htdocs/langs/lv_LV/website.lang             |   6 +-
 htdocs/langs/mk_MK/accountancy.lang         |   4 +-
 htdocs/langs/mk_MK/admin.lang               |  11 +-
 htdocs/langs/mk_MK/banks.lang               |  10 +-
 htdocs/langs/mk_MK/bills.lang               |   4 +-
 htdocs/langs/mk_MK/boxes.lang               |  10 +-
 htdocs/langs/mk_MK/cashdesk.lang            |  14 +-
 htdocs/langs/mk_MK/categories.lang          |  20 +-
 htdocs/langs/mk_MK/companies.lang           |  18 +-
 htdocs/langs/mk_MK/compta.lang              |   2 +-
 htdocs/langs/mk_MK/ecm.lang                 |   2 +-
 htdocs/langs/mk_MK/errors.lang              |  12 +-
 htdocs/langs/mk_MK/eventorganization.lang   | 101 +++
 htdocs/langs/mk_MK/knowledgemanagement.lang |  55 ++
 htdocs/langs/mk_MK/mails.lang               |   6 +-
 htdocs/langs/mk_MK/main.lang                |  19 +-
 htdocs/langs/mk_MK/members.lang             |  38 +-
 htdocs/langs/mk_MK/modulebuilder.lang       |   2 +-
 htdocs/langs/mk_MK/other.lang               |   4 +-
 htdocs/langs/mk_MK/partnership.lang         |  56 ++
 htdocs/langs/mk_MK/productbatch.lang        |   2 +-
 htdocs/langs/mk_MK/products.lang            |  24 +-
 htdocs/langs/mk_MK/projects.lang            |   8 +-
 htdocs/langs/mk_MK/recruitment.lang         |   2 +-
 htdocs/langs/mk_MK/sendings.lang            |   2 +-
 htdocs/langs/mk_MK/stocks.lang              |   2 +-
 htdocs/langs/mk_MK/users.lang               |   5 +-
 htdocs/langs/mk_MK/website.lang             |   6 +-
 htdocs/langs/mn_MN/accountancy.lang         |   4 +-
 htdocs/langs/mn_MN/admin.lang               |  11 +-
 htdocs/langs/mn_MN/banks.lang               |  10 +-
 htdocs/langs/mn_MN/bills.lang               |   4 +-
 htdocs/langs/mn_MN/boxes.lang               |  10 +-
 htdocs/langs/mn_MN/cashdesk.lang            |  14 +-
 htdocs/langs/mn_MN/categories.lang          |  20 +-
 htdocs/langs/mn_MN/companies.lang           |  18 +-
 htdocs/langs/mn_MN/compta.lang              |   2 +-
 htdocs/langs/mn_MN/ecm.lang                 |   2 +-
 htdocs/langs/mn_MN/errors.lang              |  12 +-
 htdocs/langs/mn_MN/eventorganization.lang   | 101 +++
 htdocs/langs/mn_MN/knowledgemanagement.lang |  55 ++
 htdocs/langs/mn_MN/mails.lang               |   6 +-
 htdocs/langs/mn_MN/main.lang                |  19 +-
 htdocs/langs/mn_MN/members.lang             |  38 +-
 htdocs/langs/mn_MN/modulebuilder.lang       |   2 +-
 htdocs/langs/mn_MN/other.lang               |   4 +-
 htdocs/langs/mn_MN/partnership.lang         |  56 ++
 htdocs/langs/mn_MN/productbatch.lang        |   2 +-
 htdocs/langs/mn_MN/products.lang            |  24 +-
 htdocs/langs/mn_MN/projects.lang            |   8 +-
 htdocs/langs/mn_MN/recruitment.lang         |   2 +-
 htdocs/langs/mn_MN/sendings.lang            |   2 +-
 htdocs/langs/mn_MN/stocks.lang              |   2 +-
 htdocs/langs/mn_MN/users.lang               |   5 +-
 htdocs/langs/mn_MN/website.lang             |   6 +-
 htdocs/langs/nb_NO/accountancy.lang         |  10 +-
 htdocs/langs/nb_NO/admin.lang               |  45 +-
 htdocs/langs/nb_NO/banks.lang               |   8 +-
 htdocs/langs/nb_NO/bills.lang               |  10 +-
 htdocs/langs/nb_NO/boxes.lang               |  12 +-
 htdocs/langs/nb_NO/cashdesk.lang            |  14 +-
 htdocs/langs/nb_NO/categories.lang          |  24 +-
 htdocs/langs/nb_NO/companies.lang           |  16 +-
 htdocs/langs/nb_NO/compta.lang              |   2 +-
 htdocs/langs/nb_NO/dict.lang                |   2 +-
 htdocs/langs/nb_NO/ecm.lang                 |   2 +-
 htdocs/langs/nb_NO/errors.lang              |  18 +-
 htdocs/langs/nb_NO/eventorganization.lang   | 101 +++
 htdocs/langs/nb_NO/externalsite.lang        |   2 +-
 htdocs/langs/nb_NO/holiday.lang             |  30 +-
 htdocs/langs/nb_NO/knowledgemanagement.lang |  55 ++
 htdocs/langs/nb_NO/mails.lang               |   6 +-
 htdocs/langs/nb_NO/main.lang                |  27 +-
 htdocs/langs/nb_NO/members.lang             |  52 +-
 htdocs/langs/nb_NO/modulebuilder.lang       |   4 +-
 htdocs/langs/nb_NO/other.lang               |   6 +-
 htdocs/langs/nb_NO/partnership.lang         |  56 ++
 htdocs/langs/nb_NO/productbatch.lang        |   2 +-
 htdocs/langs/nb_NO/products.lang            |  24 +-
 htdocs/langs/nb_NO/projects.lang            |   8 +-
 htdocs/langs/nb_NO/propal.lang              |   2 +-
 htdocs/langs/nb_NO/recruitment.lang         |   2 +-
 htdocs/langs/nb_NO/salaries.lang            |   4 +-
 htdocs/langs/nb_NO/sendings.lang            |   2 +-
 htdocs/langs/nb_NO/stocks.lang              |  10 +-
 htdocs/langs/nb_NO/ticket.lang              |   4 +-
 htdocs/langs/nb_NO/users.lang               |   5 +-
 htdocs/langs/nb_NO/website.lang             |   6 +-
 htdocs/langs/nb_NO/zapier.lang              |   4 +-
 htdocs/langs/ne_NP/accountancy.lang         |   4 +-
 htdocs/langs/ne_NP/admin.lang               |  11 +-
 htdocs/langs/ne_NP/banks.lang               |  10 +-
 htdocs/langs/ne_NP/bills.lang               |   4 +-
 htdocs/langs/ne_NP/boxes.lang               |  10 +-
 htdocs/langs/ne_NP/cashdesk.lang            |  14 +-
 htdocs/langs/ne_NP/categories.lang          |  20 +-
 htdocs/langs/ne_NP/companies.lang           |  18 +-
 htdocs/langs/ne_NP/compta.lang              |   2 +-
 htdocs/langs/ne_NP/ecm.lang                 |   2 +-
 htdocs/langs/ne_NP/errors.lang              |  12 +-
 htdocs/langs/ne_NP/eventorganization.lang   | 101 +++
 htdocs/langs/ne_NP/knowledgemanagement.lang |  55 ++
 htdocs/langs/ne_NP/mails.lang               |   6 +-
 htdocs/langs/ne_NP/main.lang                |  19 +-
 htdocs/langs/ne_NP/members.lang             |  38 +-
 htdocs/langs/ne_NP/modulebuilder.lang       |   2 +-
 htdocs/langs/ne_NP/other.lang               |   4 +-
 htdocs/langs/ne_NP/partnership.lang         |  56 ++
 htdocs/langs/ne_NP/productbatch.lang        |   2 +-
 htdocs/langs/ne_NP/products.lang            |  24 +-
 htdocs/langs/ne_NP/projects.lang            |   8 +-
 htdocs/langs/ne_NP/recruitment.lang         |   2 +-
 htdocs/langs/ne_NP/sendings.lang            |   2 +-
 htdocs/langs/ne_NP/stocks.lang              |   2 +-
 htdocs/langs/ne_NP/users.lang               |   5 +-
 htdocs/langs/ne_NP/website.lang             |   6 +-
 htdocs/langs/nl_BE/accountancy.lang         |   1 +
 htdocs/langs/nl_BE/admin.lang               |   1 -
 htdocs/langs/nl_BE/banks.lang               |   1 -
 htdocs/langs/nl_BE/bills.lang               |   1 -
 htdocs/langs/nl_BE/boxes.lang               |   3 -
 htdocs/langs/nl_BE/categories.lang          |   6 -
 htdocs/langs/nl_BE/companies.lang           |   4 -
 htdocs/langs/nl_BE/main.lang                |   3 +-
 htdocs/langs/nl_BE/modulebuilder.lang       |   2 -
 htdocs/langs/nl_BE/partnership.lang         |   3 +
 htdocs/langs/nl_BE/projects.lang            |   1 -
 htdocs/langs/nl_BE/zapier.lang              |   2 +
 htdocs/langs/nl_NL/accountancy.lang         |   4 +-
 htdocs/langs/nl_NL/admin.lang               |  11 +-
 htdocs/langs/nl_NL/banks.lang               |   8 +-
 htdocs/langs/nl_NL/bills.lang               |   4 +-
 htdocs/langs/nl_NL/boxes.lang               |  10 +-
 htdocs/langs/nl_NL/cashdesk.lang            |  14 +-
 htdocs/langs/nl_NL/categories.lang          |  20 +-
 htdocs/langs/nl_NL/companies.lang           |  18 +-
 htdocs/langs/nl_NL/compta.lang              |   2 +-
 htdocs/langs/nl_NL/ecm.lang                 |   2 +-
 htdocs/langs/nl_NL/errors.lang              |  12 +-
 htdocs/langs/nl_NL/eventorganization.lang   | 101 +++
 htdocs/langs/nl_NL/knowledgemanagement.lang |  55 ++
 htdocs/langs/nl_NL/mails.lang               |   6 +-
 htdocs/langs/nl_NL/main.lang                |  19 +-
 htdocs/langs/nl_NL/members.lang             |  38 +-
 htdocs/langs/nl_NL/modulebuilder.lang       |   2 +-
 htdocs/langs/nl_NL/other.lang               |   4 +-
 htdocs/langs/nl_NL/partnership.lang         |  56 ++
 htdocs/langs/nl_NL/productbatch.lang        |   2 +-
 htdocs/langs/nl_NL/products.lang            |  24 +-
 htdocs/langs/nl_NL/projects.lang            |   8 +-
 htdocs/langs/nl_NL/recruitment.lang         |   2 +-
 htdocs/langs/nl_NL/sendings.lang            |   2 +-
 htdocs/langs/nl_NL/stocks.lang              |   2 +-
 htdocs/langs/nl_NL/users.lang               |   5 +-
 htdocs/langs/nl_NL/website.lang             |   6 +-
 htdocs/langs/nl_NL/workflow.lang            |   4 +-
 htdocs/langs/nl_NL/zapier.lang              |   6 +-
 htdocs/langs/pl_PL/accountancy.lang         |   4 +-
 htdocs/langs/pl_PL/admin.lang               |  11 +-
 htdocs/langs/pl_PL/banks.lang               |   8 +-
 htdocs/langs/pl_PL/bills.lang               |   4 +-
 htdocs/langs/pl_PL/boxes.lang               |  10 +-
 htdocs/langs/pl_PL/cashdesk.lang            | 172 ++--
 htdocs/langs/pl_PL/categories.lang          |  20 +-
 htdocs/langs/pl_PL/companies.lang           |  16 +-
 htdocs/langs/pl_PL/compta.lang              |   2 +-
 htdocs/langs/pl_PL/ecm.lang                 |   2 +-
 htdocs/langs/pl_PL/errors.lang              |  12 +-
 htdocs/langs/pl_PL/eventorganization.lang   | 101 +++
 htdocs/langs/pl_PL/knowledgemanagement.lang |  55 ++
 htdocs/langs/pl_PL/mails.lang               | 180 ++--
 htdocs/langs/pl_PL/main.lang                |  19 +-
 htdocs/langs/pl_PL/members.lang             |  38 +-
 htdocs/langs/pl_PL/modulebuilder.lang       |   2 +-
 htdocs/langs/pl_PL/other.lang               |   4 +-
 htdocs/langs/pl_PL/partnership.lang         |  56 ++
 htdocs/langs/pl_PL/productbatch.lang        |   2 +-
 htdocs/langs/pl_PL/products.lang            |  24 +-
 htdocs/langs/pl_PL/projects.lang            |   8 +-
 htdocs/langs/pl_PL/recruitment.lang         |  86 +-
 htdocs/langs/pl_PL/sendings.lang            |  38 +-
 htdocs/langs/pl_PL/stocks.lang              |   2 +-
 htdocs/langs/pl_PL/users.lang               |   5 +-
 htdocs/langs/pl_PL/website.lang             |   6 +-
 htdocs/langs/pt_AO/admin.lang               |   2 -
 htdocs/langs/pt_AO/cron.lang                |   2 +
 htdocs/langs/pt_BR/accountancy.lang         |   1 -
 htdocs/langs/pt_BR/admin.lang               |  35 +-
 htdocs/langs/pt_BR/banks.lang               |   3 -
 htdocs/langs/pt_BR/bills.lang               |   2 -
 htdocs/langs/pt_BR/boxes.lang               |   3 -
 htdocs/langs/pt_BR/cashdesk.lang            |  19 +-
 htdocs/langs/pt_BR/categories.lang          |  12 +-
 htdocs/langs/pt_BR/companies.lang           |   8 +-
 htdocs/langs/pt_BR/compta.lang              |   1 -
 htdocs/langs/pt_BR/ecm.lang                 |   3 +
 htdocs/langs/pt_BR/errors.lang              |   4 -
 htdocs/langs/pt_BR/eventorganization.lang   |   7 +
 htdocs/langs/pt_BR/loan.lang                |   3 +
 htdocs/langs/pt_BR/mails.lang               |  19 +-
 htdocs/langs/pt_BR/main.lang                |   6 +-
 htdocs/langs/pt_BR/margins.lang             |   1 +
 htdocs/langs/pt_BR/members.lang             |  11 -
 htdocs/langs/pt_BR/orders.lang              |   2 +
 htdocs/langs/pt_BR/other.lang               |   1 -
 htdocs/langs/pt_BR/partnership.lang         |  14 +
 htdocs/langs/pt_BR/productbatch.lang        |   4 +
 htdocs/langs/pt_BR/products.lang            |   9 -
 htdocs/langs/pt_BR/propal.lang              |   2 +
 htdocs/langs/pt_BR/receiptprinter.lang      |   2 +-
 htdocs/langs/pt_BR/salaries.lang            |   2 +-
 htdocs/langs/pt_BR/sendings.lang            |   2 +-
 htdocs/langs/pt_BR/stocks.lang              |  12 +
 htdocs/langs/pt_BR/users.lang               |   1 -
 htdocs/langs/pt_PT/accountancy.lang         |   4 +-
 htdocs/langs/pt_PT/admin.lang               |  11 +-
 htdocs/langs/pt_PT/banks.lang               |  10 +-
 htdocs/langs/pt_PT/bills.lang               |   4 +-
 htdocs/langs/pt_PT/boxes.lang               |  10 +-
 htdocs/langs/pt_PT/cashdesk.lang            |  14 +-
 htdocs/langs/pt_PT/categories.lang          |  20 +-
 htdocs/langs/pt_PT/companies.lang           |  18 +-
 htdocs/langs/pt_PT/compta.lang              |   2 +-
 htdocs/langs/pt_PT/ecm.lang                 |   2 +-
 htdocs/langs/pt_PT/errors.lang              |  12 +-
 htdocs/langs/pt_PT/eventorganization.lang   | 101 +++
 htdocs/langs/pt_PT/knowledgemanagement.lang |  55 ++
 htdocs/langs/pt_PT/mails.lang               |   6 +-
 htdocs/langs/pt_PT/main.lang                |  19 +-
 htdocs/langs/pt_PT/members.lang             |  38 +-
 htdocs/langs/pt_PT/modulebuilder.lang       |   2 +-
 htdocs/langs/pt_PT/other.lang               |   4 +-
 htdocs/langs/pt_PT/partnership.lang         |  56 ++
 htdocs/langs/pt_PT/productbatch.lang        |   2 +-
 htdocs/langs/pt_PT/products.lang            |  24 +-
 htdocs/langs/pt_PT/projects.lang            |   8 +-
 htdocs/langs/pt_PT/recruitment.lang         |   2 +-
 htdocs/langs/pt_PT/sendings.lang            |   2 +-
 htdocs/langs/pt_PT/stocks.lang              |   2 +-
 htdocs/langs/pt_PT/users.lang               |   5 +-
 htdocs/langs/pt_PT/website.lang             |   6 +-
 htdocs/langs/ro_RO/accountancy.lang         |   4 +-
 htdocs/langs/ro_RO/admin.lang               |  13 +-
 htdocs/langs/ro_RO/banks.lang               |   8 +-
 htdocs/langs/ro_RO/bills.lang               |   4 +-
 htdocs/langs/ro_RO/boxes.lang               |  10 +-
 htdocs/langs/ro_RO/cashdesk.lang            |  46 +-
 htdocs/langs/ro_RO/categories.lang          |  20 +-
 htdocs/langs/ro_RO/companies.lang           |  16 +-
 htdocs/langs/ro_RO/compta.lang              |   8 +-
 htdocs/langs/ro_RO/ecm.lang                 |   2 +-
 htdocs/langs/ro_RO/errors.lang              |   8 +-
 htdocs/langs/ro_RO/eventorganization.lang   | 101 +++
 htdocs/langs/ro_RO/knowledgemanagement.lang |  55 ++
 htdocs/langs/ro_RO/mails.lang               | 258 +++---
 htdocs/langs/ro_RO/main.lang                |  15 +-
 htdocs/langs/ro_RO/members.lang             |  36 +-
 htdocs/langs/ro_RO/modulebuilder.lang       |   2 +-
 htdocs/langs/ro_RO/other.lang               |   4 +-
 htdocs/langs/ro_RO/partnership.lang         |  56 ++
 htdocs/langs/ro_RO/productbatch.lang        |   2 +-
 htdocs/langs/ro_RO/products.lang            |  18 +-
 htdocs/langs/ro_RO/projects.lang            |   8 +-
 htdocs/langs/ro_RO/recruitment.lang         |  12 +-
 htdocs/langs/ro_RO/sendings.lang            |  86 +-
 htdocs/langs/ro_RO/stocks.lang              |   2 +-
 htdocs/langs/ro_RO/users.lang               |   5 +-
 htdocs/langs/ro_RO/website.lang             |   6 +-
 htdocs/langs/ru_RU/accountancy.lang         |  10 +-
 htdocs/langs/ru_RU/admin.lang               |  45 +-
 htdocs/langs/ru_RU/banks.lang               |  10 +-
 htdocs/langs/ru_RU/bills.lang               |   4 +-
 htdocs/langs/ru_RU/bookmarks.lang           |   1 +
 htdocs/langs/ru_RU/boxes.lang               |  10 +-
 htdocs/langs/ru_RU/cashdesk.lang            |  32 +-
 htdocs/langs/ru_RU/categories.lang          |  60 +-
 htdocs/langs/ru_RU/companies.lang           |  16 +-
 htdocs/langs/ru_RU/compta.lang              |   2 +-
 htdocs/langs/ru_RU/ecm.lang                 |   2 +-
 htdocs/langs/ru_RU/errors.lang              |  12 +-
 htdocs/langs/ru_RU/eventorganization.lang   | 101 +++
 htdocs/langs/ru_RU/ftp.lang                 |  20 +-
 htdocs/langs/ru_RU/knowledgemanagement.lang |  55 ++
 htdocs/langs/ru_RU/mails.lang               |   6 +-
 htdocs/langs/ru_RU/main.lang                |  19 +-
 htdocs/langs/ru_RU/members.lang             |  38 +-
 htdocs/langs/ru_RU/modulebuilder.lang       |   4 +-
 htdocs/langs/ru_RU/other.lang               |   4 +-
 htdocs/langs/ru_RU/partnership.lang         |  56 ++
 htdocs/langs/ru_RU/productbatch.lang        |  22 +-
 htdocs/langs/ru_RU/products.lang            |  24 +-
 htdocs/langs/ru_RU/projects.lang            |   8 +-
 htdocs/langs/ru_RU/recruitment.lang         |   2 +-
 htdocs/langs/ru_RU/sendings.lang            |   2 +-
 htdocs/langs/ru_RU/stocks.lang              |   2 +-
 htdocs/langs/ru_RU/supplier_proposal.lang   |  10 +-
 htdocs/langs/ru_RU/users.lang               |   5 +-
 htdocs/langs/ru_RU/website.lang             |   6 +-
 htdocs/langs/ru_UA/admin.lang               |   2 -
 htdocs/langs/ru_UA/cron.lang                |   2 +
 htdocs/langs/sk_SK/accountancy.lang         |   4 +-
 htdocs/langs/sk_SK/admin.lang               |  11 +-
 htdocs/langs/sk_SK/banks.lang               |  10 +-
 htdocs/langs/sk_SK/bills.lang               |   4 +-
 htdocs/langs/sk_SK/boxes.lang               |  10 +-
 htdocs/langs/sk_SK/cashdesk.lang            |  14 +-
 htdocs/langs/sk_SK/categories.lang          |  20 +-
 htdocs/langs/sk_SK/companies.lang           |  18 +-
 htdocs/langs/sk_SK/compta.lang              |   2 +-
 htdocs/langs/sk_SK/ecm.lang                 |   2 +-
 htdocs/langs/sk_SK/errors.lang              |  12 +-
 htdocs/langs/sk_SK/eventorganization.lang   | 101 +++
 htdocs/langs/sk_SK/knowledgemanagement.lang |  55 ++
 htdocs/langs/sk_SK/mails.lang               |   6 +-
 htdocs/langs/sk_SK/main.lang                |  19 +-
 htdocs/langs/sk_SK/members.lang             |  38 +-
 htdocs/langs/sk_SK/modulebuilder.lang       |   2 +-
 htdocs/langs/sk_SK/other.lang               |   4 +-
 htdocs/langs/sk_SK/partnership.lang         |  56 ++
 htdocs/langs/sk_SK/productbatch.lang        |   2 +-
 htdocs/langs/sk_SK/products.lang            |  24 +-
 htdocs/langs/sk_SK/projects.lang            |   8 +-
 htdocs/langs/sk_SK/recruitment.lang         |   2 +-
 htdocs/langs/sk_SK/sendings.lang            |   2 +-
 htdocs/langs/sk_SK/stocks.lang              |   2 +-
 htdocs/langs/sk_SK/users.lang               |   5 +-
 htdocs/langs/sk_SK/website.lang             |   6 +-
 htdocs/langs/sl_SI/accountancy.lang         |   4 +-
 htdocs/langs/sl_SI/admin.lang               |  11 +-
 htdocs/langs/sl_SI/banks.lang               |  10 +-
 htdocs/langs/sl_SI/bills.lang               |   4 +-
 htdocs/langs/sl_SI/boxes.lang               |  10 +-
 htdocs/langs/sl_SI/cashdesk.lang            |  14 +-
 htdocs/langs/sl_SI/categories.lang          |  20 +-
 htdocs/langs/sl_SI/companies.lang           |  18 +-
 htdocs/langs/sl_SI/compta.lang              |   2 +-
 htdocs/langs/sl_SI/ecm.lang                 |   2 +-
 htdocs/langs/sl_SI/errors.lang              |  12 +-
 htdocs/langs/sl_SI/eventorganization.lang   | 101 +++
 htdocs/langs/sl_SI/knowledgemanagement.lang |  55 ++
 htdocs/langs/sl_SI/mails.lang               |   6 +-
 htdocs/langs/sl_SI/main.lang                |  19 +-
 htdocs/langs/sl_SI/members.lang             |  38 +-
 htdocs/langs/sl_SI/modulebuilder.lang       |   2 +-
 htdocs/langs/sl_SI/other.lang               |   4 +-
 htdocs/langs/sl_SI/partnership.lang         |  56 ++
 htdocs/langs/sl_SI/productbatch.lang        |   2 +-
 htdocs/langs/sl_SI/products.lang            |  24 +-
 htdocs/langs/sl_SI/projects.lang            |   8 +-
 htdocs/langs/sl_SI/recruitment.lang         |   2 +-
 htdocs/langs/sl_SI/sendings.lang            |   2 +-
 htdocs/langs/sl_SI/stocks.lang              |   2 +-
 htdocs/langs/sl_SI/users.lang               |   5 +-
 htdocs/langs/sl_SI/website.lang             |   6 +-
 htdocs/langs/sq_AL/accountancy.lang         |   4 +-
 htdocs/langs/sq_AL/admin.lang               |  11 +-
 htdocs/langs/sq_AL/banks.lang               |  10 +-
 htdocs/langs/sq_AL/bills.lang               |   4 +-
 htdocs/langs/sq_AL/boxes.lang               |  10 +-
 htdocs/langs/sq_AL/cashdesk.lang            |  14 +-
 htdocs/langs/sq_AL/categories.lang          |  20 +-
 htdocs/langs/sq_AL/companies.lang           |  18 +-
 htdocs/langs/sq_AL/compta.lang              |   2 +-
 htdocs/langs/sq_AL/ecm.lang                 |   2 +-
 htdocs/langs/sq_AL/errors.lang              |  12 +-
 htdocs/langs/sq_AL/eventorganization.lang   | 101 +++
 htdocs/langs/sq_AL/knowledgemanagement.lang |  55 ++
 htdocs/langs/sq_AL/mails.lang               |   6 +-
 htdocs/langs/sq_AL/main.lang                |  19 +-
 htdocs/langs/sq_AL/members.lang             |  38 +-
 htdocs/langs/sq_AL/modulebuilder.lang       |   2 +-
 htdocs/langs/sq_AL/other.lang               |   4 +-
 htdocs/langs/sq_AL/partnership.lang         |  56 ++
 htdocs/langs/sq_AL/productbatch.lang        |   2 +-
 htdocs/langs/sq_AL/products.lang            |  24 +-
 htdocs/langs/sq_AL/projects.lang            |   8 +-
 htdocs/langs/sq_AL/recruitment.lang         |   2 +-
 htdocs/langs/sq_AL/sendings.lang            |   2 +-
 htdocs/langs/sq_AL/stocks.lang              |   2 +-
 htdocs/langs/sq_AL/users.lang               |   5 +-
 htdocs/langs/sq_AL/website.lang             |   6 +-
 htdocs/langs/sr_RS/accountancy.lang         |   4 +-
 htdocs/langs/sr_RS/admin.lang               |  11 +-
 htdocs/langs/sr_RS/banks.lang               |  10 +-
 htdocs/langs/sr_RS/bills.lang               |   4 +-
 htdocs/langs/sr_RS/boxes.lang               |  10 +-
 htdocs/langs/sr_RS/cashdesk.lang            |  14 +-
 htdocs/langs/sr_RS/categories.lang          |  20 +-
 htdocs/langs/sr_RS/companies.lang           |  18 +-
 htdocs/langs/sr_RS/compta.lang              |   2 +-
 htdocs/langs/sr_RS/ecm.lang                 |   2 +-
 htdocs/langs/sr_RS/errors.lang              |  12 +-
 htdocs/langs/sr_RS/eventorganization.lang   | 101 +++
 htdocs/langs/sr_RS/knowledgemanagement.lang |  55 ++
 htdocs/langs/sr_RS/mails.lang               |   6 +-
 htdocs/langs/sr_RS/main.lang                |  19 +-
 htdocs/langs/sr_RS/members.lang             |  38 +-
 htdocs/langs/sr_RS/modulebuilder.lang       |   2 +-
 htdocs/langs/sr_RS/other.lang               |   4 +-
 htdocs/langs/sr_RS/partnership.lang         |  56 ++
 htdocs/langs/sr_RS/productbatch.lang        |   2 +-
 htdocs/langs/sr_RS/products.lang            |  24 +-
 htdocs/langs/sr_RS/projects.lang            |   8 +-
 htdocs/langs/sr_RS/recruitment.lang         |   2 +-
 htdocs/langs/sr_RS/sendings.lang            |   2 +-
 htdocs/langs/sr_RS/stocks.lang              |   2 +-
 htdocs/langs/sr_RS/users.lang               |   5 +-
 htdocs/langs/sr_RS/website.lang             |   6 +-
 htdocs/langs/sv_SE/accountancy.lang         |   4 +-
 htdocs/langs/sv_SE/admin.lang               |  11 +-
 htdocs/langs/sv_SE/banks.lang               |  10 +-
 htdocs/langs/sv_SE/bills.lang               |   4 +-
 htdocs/langs/sv_SE/boxes.lang               |  10 +-
 htdocs/langs/sv_SE/cashdesk.lang            |  14 +-
 htdocs/langs/sv_SE/categories.lang          |  20 +-
 htdocs/langs/sv_SE/companies.lang           |  18 +-
 htdocs/langs/sv_SE/compta.lang              |   2 +-
 htdocs/langs/sv_SE/ecm.lang                 |   2 +-
 htdocs/langs/sv_SE/errors.lang              |  12 +-
 htdocs/langs/sv_SE/eventorganization.lang   | 101 +++
 htdocs/langs/sv_SE/knowledgemanagement.lang |  55 ++
 htdocs/langs/sv_SE/mails.lang               |   6 +-
 htdocs/langs/sv_SE/main.lang                |  19 +-
 htdocs/langs/sv_SE/members.lang             |  38 +-
 htdocs/langs/sv_SE/modulebuilder.lang       |   2 +-
 htdocs/langs/sv_SE/other.lang               |   4 +-
 htdocs/langs/sv_SE/partnership.lang         |  56 ++
 htdocs/langs/sv_SE/productbatch.lang        |   2 +-
 htdocs/langs/sv_SE/products.lang            |  24 +-
 htdocs/langs/sv_SE/projects.lang            |   8 +-
 htdocs/langs/sv_SE/recruitment.lang         |   2 +-
 htdocs/langs/sv_SE/sendings.lang            |   2 +-
 htdocs/langs/sv_SE/stocks.lang              |   2 +-
 htdocs/langs/sv_SE/users.lang               |   5 +-
 htdocs/langs/sv_SE/website.lang             |   6 +-
 htdocs/langs/sw_SW/accountancy.lang         |   4 +-
 htdocs/langs/sw_SW/admin.lang               |  11 +-
 htdocs/langs/sw_SW/banks.lang               |  10 +-
 htdocs/langs/sw_SW/bills.lang               |   4 +-
 htdocs/langs/sw_SW/boxes.lang               |  10 +-
 htdocs/langs/sw_SW/cashdesk.lang            |  14 +-
 htdocs/langs/sw_SW/categories.lang          |  20 +-
 htdocs/langs/sw_SW/companies.lang           |  18 +-
 htdocs/langs/sw_SW/compta.lang              |   2 +-
 htdocs/langs/sw_SW/ecm.lang                 |   2 +-
 htdocs/langs/sw_SW/errors.lang              |  12 +-
 htdocs/langs/sw_SW/eventorganization.lang   | 101 +++
 htdocs/langs/sw_SW/knowledgemanagement.lang |  55 ++
 htdocs/langs/sw_SW/mails.lang               |   6 +-
 htdocs/langs/sw_SW/main.lang                |  19 +-
 htdocs/langs/sw_SW/members.lang             |  38 +-
 htdocs/langs/sw_SW/modulebuilder.lang       |   2 +-
 htdocs/langs/sw_SW/other.lang               |   4 +-
 htdocs/langs/sw_SW/partnership.lang         |  56 ++
 htdocs/langs/sw_SW/productbatch.lang        |   2 +-
 htdocs/langs/sw_SW/products.lang            |  24 +-
 htdocs/langs/sw_SW/projects.lang            |   8 +-
 htdocs/langs/sw_SW/recruitment.lang         |   2 +-
 htdocs/langs/sw_SW/sendings.lang            |   2 +-
 htdocs/langs/sw_SW/stocks.lang              |   2 +-
 htdocs/langs/sw_SW/users.lang               |   5 +-
 htdocs/langs/sw_SW/website.lang             |   6 +-
 htdocs/langs/th_TH/accountancy.lang         |   4 +-
 htdocs/langs/th_TH/admin.lang               |  11 +-
 htdocs/langs/th_TH/banks.lang               |  10 +-
 htdocs/langs/th_TH/bills.lang               |   4 +-
 htdocs/langs/th_TH/boxes.lang               |  10 +-
 htdocs/langs/th_TH/cashdesk.lang            |  14 +-
 htdocs/langs/th_TH/categories.lang          |  20 +-
 htdocs/langs/th_TH/companies.lang           |  18 +-
 htdocs/langs/th_TH/compta.lang              |   2 +-
 htdocs/langs/th_TH/ecm.lang                 |   2 +-
 htdocs/langs/th_TH/errors.lang              |  12 +-
 htdocs/langs/th_TH/eventorganization.lang   | 101 +++
 htdocs/langs/th_TH/knowledgemanagement.lang |  55 ++
 htdocs/langs/th_TH/mails.lang               |   6 +-
 htdocs/langs/th_TH/main.lang                |  19 +-
 htdocs/langs/th_TH/members.lang             |  38 +-
 htdocs/langs/th_TH/modulebuilder.lang       |   2 +-
 htdocs/langs/th_TH/other.lang               |   4 +-
 htdocs/langs/th_TH/partnership.lang         |  56 ++
 htdocs/langs/th_TH/productbatch.lang        |   2 +-
 htdocs/langs/th_TH/products.lang            |  24 +-
 htdocs/langs/th_TH/projects.lang            |   8 +-
 htdocs/langs/th_TH/recruitment.lang         |   2 +-
 htdocs/langs/th_TH/sendings.lang            |   2 +-
 htdocs/langs/th_TH/stocks.lang              |   2 +-
 htdocs/langs/th_TH/users.lang               |   5 +-
 htdocs/langs/th_TH/website.lang             |   6 +-
 htdocs/langs/tr_TR/accountancy.lang         |   4 +-
 htdocs/langs/tr_TR/admin.lang               | 865 ++++++++++----------
 htdocs/langs/tr_TR/banks.lang               |   8 +-
 htdocs/langs/tr_TR/bills.lang               |   4 +-
 htdocs/langs/tr_TR/boxes.lang               |  10 +-
 htdocs/langs/tr_TR/cashdesk.lang            |  16 +-
 htdocs/langs/tr_TR/categories.lang          |  20 +-
 htdocs/langs/tr_TR/companies.lang           |  16 +-
 htdocs/langs/tr_TR/compta.lang              |   2 +-
 htdocs/langs/tr_TR/ecm.lang                 |   2 +-
 htdocs/langs/tr_TR/errors.lang              |  12 +-
 htdocs/langs/tr_TR/eventorganization.lang   | 101 +++
 htdocs/langs/tr_TR/knowledgemanagement.lang |  55 ++
 htdocs/langs/tr_TR/mails.lang               |   6 +-
 htdocs/langs/tr_TR/main.lang                |  19 +-
 htdocs/langs/tr_TR/members.lang             |  38 +-
 htdocs/langs/tr_TR/modulebuilder.lang       |   2 +-
 htdocs/langs/tr_TR/other.lang               |   4 +-
 htdocs/langs/tr_TR/partnership.lang         |  56 ++
 htdocs/langs/tr_TR/productbatch.lang        |   2 +-
 htdocs/langs/tr_TR/products.lang            |  26 +-
 htdocs/langs/tr_TR/projects.lang            |   8 +-
 htdocs/langs/tr_TR/receptions.lang          |   4 +-
 htdocs/langs/tr_TR/recruitment.lang         |   2 +-
 htdocs/langs/tr_TR/sendings.lang            |   4 +-
 htdocs/langs/tr_TR/stocks.lang              |   2 +-
 htdocs/langs/tr_TR/users.lang               |   5 +-
 htdocs/langs/tr_TR/website.lang             |   6 +-
 htdocs/langs/uk_UA/accountancy.lang         |   4 +-
 htdocs/langs/uk_UA/admin.lang               |  11 +-
 htdocs/langs/uk_UA/banks.lang               |  10 +-
 htdocs/langs/uk_UA/bills.lang               |   4 +-
 htdocs/langs/uk_UA/boxes.lang               |  10 +-
 htdocs/langs/uk_UA/cashdesk.lang            |  14 +-
 htdocs/langs/uk_UA/categories.lang          |  20 +-
 htdocs/langs/uk_UA/companies.lang           |  18 +-
 htdocs/langs/uk_UA/compta.lang              |   2 +-
 htdocs/langs/uk_UA/ecm.lang                 |   2 +-
 htdocs/langs/uk_UA/errors.lang              |  12 +-
 htdocs/langs/uk_UA/eventorganization.lang   | 101 +++
 htdocs/langs/uk_UA/knowledgemanagement.lang |  55 ++
 htdocs/langs/uk_UA/mails.lang               |   6 +-
 htdocs/langs/uk_UA/main.lang                |  19 +-
 htdocs/langs/uk_UA/members.lang             |  38 +-
 htdocs/langs/uk_UA/modulebuilder.lang       |   2 +-
 htdocs/langs/uk_UA/other.lang               |   4 +-
 htdocs/langs/uk_UA/partnership.lang         |  56 ++
 htdocs/langs/uk_UA/productbatch.lang        |   2 +-
 htdocs/langs/uk_UA/products.lang            |  24 +-
 htdocs/langs/uk_UA/projects.lang            |   8 +-
 htdocs/langs/uk_UA/recruitment.lang         |   2 +-
 htdocs/langs/uk_UA/sendings.lang            |   2 +-
 htdocs/langs/uk_UA/stocks.lang              |   2 +-
 htdocs/langs/uk_UA/users.lang               |   5 +-
 htdocs/langs/uk_UA/website.lang             |   6 +-
 htdocs/langs/uz_UZ/accountancy.lang         |   4 +-
 htdocs/langs/uz_UZ/admin.lang               |  11 +-
 htdocs/langs/uz_UZ/banks.lang               |  10 +-
 htdocs/langs/uz_UZ/bills.lang               |   4 +-
 htdocs/langs/uz_UZ/boxes.lang               |  10 +-
 htdocs/langs/uz_UZ/cashdesk.lang            |  14 +-
 htdocs/langs/uz_UZ/categories.lang          |  20 +-
 htdocs/langs/uz_UZ/companies.lang           |  18 +-
 htdocs/langs/uz_UZ/compta.lang              |   2 +-
 htdocs/langs/uz_UZ/ecm.lang                 |   2 +-
 htdocs/langs/uz_UZ/errors.lang              |  12 +-
 htdocs/langs/uz_UZ/eventorganization.lang   | 101 +++
 htdocs/langs/uz_UZ/knowledgemanagement.lang |  55 ++
 htdocs/langs/uz_UZ/mails.lang               |   6 +-
 htdocs/langs/uz_UZ/main.lang                |  19 +-
 htdocs/langs/uz_UZ/members.lang             |  38 +-
 htdocs/langs/uz_UZ/modulebuilder.lang       |   2 +-
 htdocs/langs/uz_UZ/other.lang               |   4 +-
 htdocs/langs/uz_UZ/partnership.lang         |  56 ++
 htdocs/langs/uz_UZ/productbatch.lang        |   2 +-
 htdocs/langs/uz_UZ/products.lang            |  24 +-
 htdocs/langs/uz_UZ/projects.lang            |   8 +-
 htdocs/langs/uz_UZ/recruitment.lang         |   2 +-
 htdocs/langs/uz_UZ/sendings.lang            |   2 +-
 htdocs/langs/uz_UZ/stocks.lang              |   2 +-
 htdocs/langs/uz_UZ/users.lang               |   5 +-
 htdocs/langs/uz_UZ/website.lang             |   6 +-
 htdocs/langs/vi_VN/accountancy.lang         |   4 +-
 htdocs/langs/vi_VN/admin.lang               |  11 +-
 htdocs/langs/vi_VN/banks.lang               |  10 +-
 htdocs/langs/vi_VN/bills.lang               |   4 +-
 htdocs/langs/vi_VN/boxes.lang               |  10 +-
 htdocs/langs/vi_VN/cashdesk.lang            |  14 +-
 htdocs/langs/vi_VN/categories.lang          |  20 +-
 htdocs/langs/vi_VN/companies.lang           |  18 +-
 htdocs/langs/vi_VN/compta.lang              |   2 +-
 htdocs/langs/vi_VN/ecm.lang                 |   2 +-
 htdocs/langs/vi_VN/errors.lang              |  12 +-
 htdocs/langs/vi_VN/eventorganization.lang   | 101 +++
 htdocs/langs/vi_VN/knowledgemanagement.lang |  55 ++
 htdocs/langs/vi_VN/mails.lang               |   6 +-
 htdocs/langs/vi_VN/main.lang                |  19 +-
 htdocs/langs/vi_VN/members.lang             |  38 +-
 htdocs/langs/vi_VN/modulebuilder.lang       |   2 +-
 htdocs/langs/vi_VN/other.lang               |   4 +-
 htdocs/langs/vi_VN/partnership.lang         |  56 ++
 htdocs/langs/vi_VN/productbatch.lang        |   2 +-
 htdocs/langs/vi_VN/products.lang            |  24 +-
 htdocs/langs/vi_VN/projects.lang            |   8 +-
 htdocs/langs/vi_VN/recruitment.lang         |   2 +-
 htdocs/langs/vi_VN/sendings.lang            |   2 +-
 htdocs/langs/vi_VN/stocks.lang              |   2 +-
 htdocs/langs/vi_VN/users.lang               |   5 +-
 htdocs/langs/vi_VN/website.lang             |   6 +-
 htdocs/langs/zh_CN/accountancy.lang         |   4 +-
 htdocs/langs/zh_CN/admin.lang               |  11 +-
 htdocs/langs/zh_CN/banks.lang               |  10 +-
 htdocs/langs/zh_CN/bills.lang               |   4 +-
 htdocs/langs/zh_CN/boxes.lang               |  10 +-
 htdocs/langs/zh_CN/cashdesk.lang            |  14 +-
 htdocs/langs/zh_CN/categories.lang          |  20 +-
 htdocs/langs/zh_CN/companies.lang           |  18 +-
 htdocs/langs/zh_CN/compta.lang              |   2 +-
 htdocs/langs/zh_CN/ecm.lang                 |   2 +-
 htdocs/langs/zh_CN/errors.lang              |  12 +-
 htdocs/langs/zh_CN/eventorganization.lang   | 101 +++
 htdocs/langs/zh_CN/knowledgemanagement.lang |  55 ++
 htdocs/langs/zh_CN/mails.lang               |   6 +-
 htdocs/langs/zh_CN/members.lang             |  38 +-
 htdocs/langs/zh_CN/modulebuilder.lang       |   2 +-
 htdocs/langs/zh_CN/other.lang               |   4 +-
 htdocs/langs/zh_CN/partnership.lang         |  56 ++
 htdocs/langs/zh_CN/productbatch.lang        |   2 +-
 htdocs/langs/zh_CN/products.lang            |  24 +-
 htdocs/langs/zh_CN/projects.lang            |   8 +-
 htdocs/langs/zh_CN/recruitment.lang         |   2 +-
 htdocs/langs/zh_CN/sendings.lang            |   2 +-
 htdocs/langs/zh_CN/stocks.lang              |   2 +-
 htdocs/langs/zh_CN/users.lang               |   5 +-
 htdocs/langs/zh_CN/website.lang             |   6 +-
 htdocs/langs/zh_HK/accountancy.lang         |   4 +-
 htdocs/langs/zh_HK/admin.lang               |  11 +-
 htdocs/langs/zh_HK/banks.lang               |  10 +-
 htdocs/langs/zh_HK/bills.lang               |   4 +-
 htdocs/langs/zh_HK/boxes.lang               |  10 +-
 htdocs/langs/zh_HK/cashdesk.lang            |  14 +-
 htdocs/langs/zh_HK/categories.lang          |  20 +-
 htdocs/langs/zh_HK/companies.lang           |  18 +-
 htdocs/langs/zh_HK/compta.lang              |   2 +-
 htdocs/langs/zh_HK/ecm.lang                 |   2 +-
 htdocs/langs/zh_HK/errors.lang              |  12 +-
 htdocs/langs/zh_HK/eventorganization.lang   | 101 +++
 htdocs/langs/zh_HK/knowledgemanagement.lang |  55 ++
 htdocs/langs/zh_HK/mails.lang               |   6 +-
 htdocs/langs/zh_HK/main.lang                |  19 +-
 htdocs/langs/zh_HK/members.lang             |  38 +-
 htdocs/langs/zh_HK/modulebuilder.lang       |   2 +-
 htdocs/langs/zh_HK/other.lang               |   4 +-
 htdocs/langs/zh_HK/partnership.lang         |  56 ++
 htdocs/langs/zh_HK/productbatch.lang        |   2 +-
 htdocs/langs/zh_HK/products.lang            |  24 +-
 htdocs/langs/zh_HK/projects.lang            |   8 +-
 htdocs/langs/zh_HK/recruitment.lang         |   2 +-
 htdocs/langs/zh_HK/sendings.lang            |   2 +-
 htdocs/langs/zh_HK/stocks.lang              |   2 +-
 htdocs/langs/zh_HK/users.lang               |   5 +-
 htdocs/langs/zh_HK/website.lang             |   6 +-
 htdocs/langs/zh_TW/accountancy.lang         |   4 +-
 htdocs/langs/zh_TW/admin.lang               |  11 +-
 htdocs/langs/zh_TW/banks.lang               |  10 +-
 htdocs/langs/zh_TW/bills.lang               |   4 +-
 htdocs/langs/zh_TW/boxes.lang               |  10 +-
 htdocs/langs/zh_TW/cashdesk.lang            |  16 +-
 htdocs/langs/zh_TW/categories.lang          |  20 +-
 htdocs/langs/zh_TW/companies.lang           |  16 +-
 htdocs/langs/zh_TW/compta.lang              |   2 +-
 htdocs/langs/zh_TW/ecm.lang                 |   2 +-
 htdocs/langs/zh_TW/errors.lang              |  12 +-
 htdocs/langs/zh_TW/eventorganization.lang   | 101 +++
 htdocs/langs/zh_TW/knowledgemanagement.lang |  55 ++
 htdocs/langs/zh_TW/mails.lang               |   6 +-
 htdocs/langs/zh_TW/main.lang                |  19 +-
 htdocs/langs/zh_TW/members.lang             |  38 +-
 htdocs/langs/zh_TW/modulebuilder.lang       |   2 +-
 htdocs/langs/zh_TW/other.lang               |   4 +-
 htdocs/langs/zh_TW/partnership.lang         |  56 ++
 htdocs/langs/zh_TW/productbatch.lang        |   2 +-
 htdocs/langs/zh_TW/products.lang            |  24 +-
 htdocs/langs/zh_TW/projects.lang            |   8 +-
 htdocs/langs/zh_TW/recruitment.lang         |   2 +-
 htdocs/langs/zh_TW/sendings.lang            |   2 +-
 htdocs/langs/zh_TW/stocks.lang              |  12 +-
 htdocs/langs/zh_TW/ticket.lang              |   6 +-
 htdocs/langs/zh_TW/users.lang               |   5 +-
 htdocs/langs/zh_TW/website.lang             |   6 +-
 htdocs/modulebuilder/index.php              |  72 +-
 1923 files changed, 23678 insertions(+), 8363 deletions(-)
 create mode 100644 htdocs/langs/am_ET/eventorganization.lang
 create mode 100644 htdocs/langs/am_ET/knowledgemanagement.lang
 create mode 100644 htdocs/langs/am_ET/partnership.lang
 create mode 100644 htdocs/langs/ar_EG/accountancy.lang
 create mode 100644 htdocs/langs/ar_EG/cron.lang
 create mode 100644 htdocs/langs/ar_EG/eventorganization.lang
 create mode 100644 htdocs/langs/ar_EG/partnership.lang
 create mode 100644 htdocs/langs/ar_IQ/eventorganization.lang
 create mode 100644 htdocs/langs/ar_IQ/knowledgemanagement.lang
 create mode 100644 htdocs/langs/ar_IQ/partnership.lang
 create mode 100644 htdocs/langs/ar_SA/eventorganization.lang
 create mode 100644 htdocs/langs/ar_SA/knowledgemanagement.lang
 create mode 100644 htdocs/langs/ar_SA/partnership.lang
 create mode 100644 htdocs/langs/az_AZ/eventorganization.lang
 create mode 100644 htdocs/langs/az_AZ/knowledgemanagement.lang
 create mode 100644 htdocs/langs/az_AZ/partnership.lang
 create mode 100644 htdocs/langs/bg_BG/eventorganization.lang
 create mode 100644 htdocs/langs/bg_BG/knowledgemanagement.lang
 create mode 100644 htdocs/langs/bg_BG/partnership.lang
 create mode 100644 htdocs/langs/bn_BD/eventorganization.lang
 create mode 100644 htdocs/langs/bn_BD/knowledgemanagement.lang
 create mode 100644 htdocs/langs/bn_BD/partnership.lang
 create mode 100644 htdocs/langs/bn_IN/eventorganization.lang
 create mode 100644 htdocs/langs/bn_IN/knowledgemanagement.lang
 create mode 100644 htdocs/langs/bn_IN/partnership.lang
 create mode 100644 htdocs/langs/bs_BA/eventorganization.lang
 create mode 100644 htdocs/langs/bs_BA/knowledgemanagement.lang
 create mode 100644 htdocs/langs/bs_BA/partnership.lang
 create mode 100644 htdocs/langs/ca_ES/eventorganization.lang
 create mode 100644 htdocs/langs/ca_ES/knowledgemanagement.lang
 create mode 100644 htdocs/langs/ca_ES/partnership.lang
 create mode 100644 htdocs/langs/cs_CZ/eventorganization.lang
 create mode 100644 htdocs/langs/cs_CZ/knowledgemanagement.lang
 create mode 100644 htdocs/langs/cs_CZ/partnership.lang
 create mode 100644 htdocs/langs/da_DK/eventorganization.lang
 create mode 100644 htdocs/langs/da_DK/knowledgemanagement.lang
 create mode 100644 htdocs/langs/da_DK/partnership.lang
 create mode 100644 htdocs/langs/de_AT/cron.lang
 delete mode 100644 htdocs/langs/de_AT/modulebuilder.lang
 create mode 100644 htdocs/langs/de_AT/partnership.lang
 delete mode 100644 htdocs/langs/de_CH/modulebuilder.lang
 create mode 100644 htdocs/langs/de_CH/partnership.lang
 create mode 100644 htdocs/langs/de_DE/eventorganization.lang
 create mode 100644 htdocs/langs/de_DE/knowledgemanagement.lang
 create mode 100644 htdocs/langs/de_DE/partnership.lang
 create mode 100644 htdocs/langs/el_CY/accountancy.lang
 create mode 100644 htdocs/langs/el_CY/cron.lang
 delete mode 100644 htdocs/langs/el_CY/modulebuilder.lang
 create mode 100644 htdocs/langs/el_GR/eventorganization.lang
 create mode 100644 htdocs/langs/el_GR/knowledgemanagement.lang
 create mode 100644 htdocs/langs/el_GR/partnership.lang
 create mode 100644 htdocs/langs/en_AU/accountancy.lang
 create mode 100644 htdocs/langs/en_AU/cron.lang
 delete mode 100644 htdocs/langs/en_AU/modulebuilder.lang
 delete mode 100644 htdocs/langs/en_AU/website.lang
 create mode 100644 htdocs/langs/en_CA/accountancy.lang
 create mode 100644 htdocs/langs/en_CA/cron.lang
 delete mode 100644 htdocs/langs/en_CA/modulebuilder.lang
 delete mode 100644 htdocs/langs/en_CA/website.lang
 create mode 100644 htdocs/langs/en_GB/cron.lang
 delete mode 100644 htdocs/langs/en_GB/modulebuilder.lang
 create mode 100644 htdocs/langs/en_GB/partnership.lang
 create mode 100644 htdocs/langs/en_IN/accountancy.lang
 create mode 100644 htdocs/langs/en_IN/cron.lang
 delete mode 100644 htdocs/langs/en_IN/modulebuilder.lang
 delete mode 100644 htdocs/langs/en_IN/website.lang
 create mode 100644 htdocs/langs/en_SG/accountancy.lang
 create mode 100644 htdocs/langs/en_SG/cron.lang
 delete mode 100644 htdocs/langs/en_SG/modulebuilder.lang
 delete mode 100644 htdocs/langs/en_SG/website.lang
 create mode 100644 htdocs/langs/es_AR/eventorganization.lang
 delete mode 100644 htdocs/langs/es_AR/modulebuilder.lang
 create mode 100644 htdocs/langs/es_AR/partnership.lang
 create mode 100644 htdocs/langs/es_BO/accountancy.lang
 create mode 100644 htdocs/langs/es_BO/cron.lang
 delete mode 100644 htdocs/langs/es_BO/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_BO/website.lang
 create mode 100644 htdocs/langs/es_CL/partnership.lang
 create mode 100644 htdocs/langs/es_CO/assets.lang
 create mode 100644 htdocs/langs/es_CO/bookmarks.lang
 create mode 100644 htdocs/langs/es_CO/errors.lang
 create mode 100644 htdocs/langs/es_CO/ftp.lang
 create mode 100644 htdocs/langs/es_CO/help.lang
 create mode 100644 htdocs/langs/es_CO/hrm.lang
 create mode 100644 htdocs/langs/es_CO/knowledgemanagement.lang
 create mode 100644 htdocs/langs/es_CO/link.lang
 create mode 100644 htdocs/langs/es_CO/mailmanspip.lang
 delete mode 100644 htdocs/langs/es_CO/modulebuilder.lang
 create mode 100644 htdocs/langs/es_CO/partnership.lang
 create mode 100644 htdocs/langs/es_CO/resource.lang
 delete mode 100644 htdocs/langs/es_CO/website.lang
 create mode 100644 htdocs/langs/es_DO/accountancy.lang
 create mode 100644 htdocs/langs/es_DO/cron.lang
 delete mode 100644 htdocs/langs/es_DO/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_DO/website.lang
 create mode 100644 htdocs/langs/es_EC/eventorganization.lang
 create mode 100644 htdocs/langs/es_EC/partnership.lang
 create mode 100644 htdocs/langs/es_ES/eventorganization.lang
 create mode 100644 htdocs/langs/es_ES/knowledgemanagement.lang
 create mode 100644 htdocs/langs/es_ES/partnership.lang
 create mode 100644 htdocs/langs/es_GT/accountancy.lang
 create mode 100644 htdocs/langs/es_GT/cron.lang
 delete mode 100644 htdocs/langs/es_GT/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_GT/website.lang
 create mode 100644 htdocs/langs/es_HN/accountancy.lang
 create mode 100644 htdocs/langs/es_HN/cron.lang
 delete mode 100644 htdocs/langs/es_HN/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_HN/website.lang
 create mode 100644 htdocs/langs/es_MX/eventorganization.lang
 create mode 100644 htdocs/langs/es_MX/partnership.lang
 create mode 100644 htdocs/langs/es_PA/accountancy.lang
 create mode 100644 htdocs/langs/es_PA/cron.lang
 delete mode 100644 htdocs/langs/es_PA/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_PA/website.lang
 create mode 100644 htdocs/langs/es_PE/knowledgemanagement.lang
 delete mode 100644 htdocs/langs/es_PE/modulebuilder.lang
 create mode 100644 htdocs/langs/es_PY/accountancy.lang
 create mode 100644 htdocs/langs/es_PY/cron.lang
 delete mode 100644 htdocs/langs/es_PY/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_PY/website.lang
 create mode 100644 htdocs/langs/es_US/accountancy.lang
 create mode 100644 htdocs/langs/es_US/cron.lang
 delete mode 100644 htdocs/langs/es_US/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_US/website.lang
 create mode 100644 htdocs/langs/es_UY/accountancy.lang
 create mode 100644 htdocs/langs/es_UY/cron.lang
 delete mode 100644 htdocs/langs/es_UY/modulebuilder.lang
 delete mode 100644 htdocs/langs/es_UY/website.lang
 create mode 100644 htdocs/langs/es_VE/accountancy.lang
 create mode 100644 htdocs/langs/es_VE/eventorganization.lang
 delete mode 100644 htdocs/langs/es_VE/modulebuilder.lang
 create mode 100644 htdocs/langs/es_VE/partnership.lang
 delete mode 100644 htdocs/langs/es_VE/website.lang
 create mode 100644 htdocs/langs/et_EE/eventorganization.lang
 create mode 100644 htdocs/langs/et_EE/knowledgemanagement.lang
 create mode 100644 htdocs/langs/et_EE/partnership.lang
 create mode 100644 htdocs/langs/eu_ES/eventorganization.lang
 create mode 100644 htdocs/langs/eu_ES/knowledgemanagement.lang
 create mode 100644 htdocs/langs/eu_ES/partnership.lang
 create mode 100644 htdocs/langs/fa_IR/eventorganization.lang
 create mode 100644 htdocs/langs/fa_IR/knowledgemanagement.lang
 create mode 100644 htdocs/langs/fa_IR/partnership.lang
 create mode 100644 htdocs/langs/fi_FI/eventorganization.lang
 create mode 100644 htdocs/langs/fi_FI/knowledgemanagement.lang
 create mode 100644 htdocs/langs/fi_FI/partnership.lang
 create mode 100644 htdocs/langs/fr_BE/cron.lang
 delete mode 100644 htdocs/langs/fr_BE/modulebuilder.lang
 create mode 100644 htdocs/langs/fr_CH/accountancy.lang
 create mode 100644 htdocs/langs/fr_CH/cron.lang
 delete mode 100644 htdocs/langs/fr_CH/modulebuilder.lang
 create mode 100644 htdocs/langs/fr_CI/accountancy.lang
 create mode 100644 htdocs/langs/fr_CI/cron.lang
 delete mode 100644 htdocs/langs/fr_CI/modulebuilder.lang
 create mode 100644 htdocs/langs/fr_CM/accountancy.lang
 create mode 100644 htdocs/langs/fr_CM/cron.lang
 delete mode 100644 htdocs/langs/fr_CM/modulebuilder.lang
 create mode 100644 htdocs/langs/fr_FR/eventorganization.lang
 create mode 100644 htdocs/langs/fr_FR/partnership.lang
 create mode 100644 htdocs/langs/fr_GA/accountancy.lang
 create mode 100644 htdocs/langs/fr_GA/cron.lang
 delete mode 100644 htdocs/langs/fr_GA/modulebuilder.lang
 create mode 100644 htdocs/langs/gl_ES/eventorganization.lang
 create mode 100644 htdocs/langs/gl_ES/knowledgemanagement.lang
 create mode 100644 htdocs/langs/gl_ES/partnership.lang
 create mode 100644 htdocs/langs/he_IL/eventorganization.lang
 create mode 100644 htdocs/langs/he_IL/knowledgemanagement.lang
 create mode 100644 htdocs/langs/he_IL/partnership.lang
 create mode 100644 htdocs/langs/hi_IN/eventorganization.lang
 create mode 100644 htdocs/langs/hi_IN/knowledgemanagement.lang
 create mode 100644 htdocs/langs/hi_IN/partnership.lang
 create mode 100644 htdocs/langs/hr_HR/eventorganization.lang
 create mode 100644 htdocs/langs/hr_HR/knowledgemanagement.lang
 create mode 100644 htdocs/langs/hr_HR/partnership.lang
 create mode 100644 htdocs/langs/hu_HU/eventorganization.lang
 create mode 100644 htdocs/langs/hu_HU/knowledgemanagement.lang
 create mode 100644 htdocs/langs/hu_HU/partnership.lang
 create mode 100644 htdocs/langs/id_ID/eventorganization.lang
 create mode 100644 htdocs/langs/id_ID/knowledgemanagement.lang
 create mode 100644 htdocs/langs/id_ID/partnership.lang
 create mode 100644 htdocs/langs/is_IS/eventorganization.lang
 create mode 100644 htdocs/langs/is_IS/knowledgemanagement.lang
 create mode 100644 htdocs/langs/is_IS/partnership.lang
 create mode 100644 htdocs/langs/it_CH/accountancy.lang
 create mode 100644 htdocs/langs/it_CH/cron.lang
 delete mode 100644 htdocs/langs/it_CH/modulebuilder.lang
 create mode 100644 htdocs/langs/it_IT/eventorganization.lang
 create mode 100644 htdocs/langs/it_IT/knowledgemanagement.lang
 create mode 100644 htdocs/langs/it_IT/partnership.lang
 create mode 100644 htdocs/langs/ja_JP/eventorganization.lang
 create mode 100644 htdocs/langs/ja_JP/knowledgemanagement.lang
 create mode 100644 htdocs/langs/ja_JP/partnership.lang
 create mode 100644 htdocs/langs/ka_GE/eventorganization.lang
 create mode 100644 htdocs/langs/ka_GE/knowledgemanagement.lang
 create mode 100644 htdocs/langs/ka_GE/partnership.lang
 create mode 100644 htdocs/langs/km_KH/eventorganization.lang
 create mode 100644 htdocs/langs/km_KH/knowledgemanagement.lang
 create mode 100644 htdocs/langs/km_KH/partnership.lang
 create mode 100644 htdocs/langs/kn_IN/eventorganization.lang
 create mode 100644 htdocs/langs/kn_IN/knowledgemanagement.lang
 create mode 100644 htdocs/langs/kn_IN/partnership.lang
 create mode 100644 htdocs/langs/ko_KR/eventorganization.lang
 create mode 100644 htdocs/langs/ko_KR/knowledgemanagement.lang
 create mode 100644 htdocs/langs/ko_KR/partnership.lang
 create mode 100644 htdocs/langs/lo_LA/eventorganization.lang
 create mode 100644 htdocs/langs/lo_LA/knowledgemanagement.lang
 create mode 100644 htdocs/langs/lo_LA/partnership.lang
 create mode 100644 htdocs/langs/lt_LT/eventorganization.lang
 create mode 100644 htdocs/langs/lt_LT/knowledgemanagement.lang
 create mode 100644 htdocs/langs/lt_LT/partnership.lang
 create mode 100644 htdocs/langs/lv_LV/eventorganization.lang
 create mode 100644 htdocs/langs/lv_LV/knowledgemanagement.lang
 create mode 100644 htdocs/langs/lv_LV/partnership.lang
 create mode 100644 htdocs/langs/mk_MK/eventorganization.lang
 create mode 100644 htdocs/langs/mk_MK/knowledgemanagement.lang
 create mode 100644 htdocs/langs/mk_MK/partnership.lang
 create mode 100644 htdocs/langs/mn_MN/eventorganization.lang
 create mode 100644 htdocs/langs/mn_MN/knowledgemanagement.lang
 create mode 100644 htdocs/langs/mn_MN/partnership.lang
 create mode 100644 htdocs/langs/nb_NO/eventorganization.lang
 create mode 100644 htdocs/langs/nb_NO/knowledgemanagement.lang
 create mode 100644 htdocs/langs/nb_NO/partnership.lang
 create mode 100644 htdocs/langs/ne_NP/eventorganization.lang
 create mode 100644 htdocs/langs/ne_NP/knowledgemanagement.lang
 create mode 100644 htdocs/langs/ne_NP/partnership.lang
 delete mode 100644 htdocs/langs/nl_BE/modulebuilder.lang
 create mode 100644 htdocs/langs/nl_BE/partnership.lang
 create mode 100644 htdocs/langs/nl_BE/zapier.lang
 create mode 100644 htdocs/langs/nl_NL/eventorganization.lang
 create mode 100644 htdocs/langs/nl_NL/knowledgemanagement.lang
 create mode 100644 htdocs/langs/nl_NL/partnership.lang
 create mode 100644 htdocs/langs/pl_PL/eventorganization.lang
 create mode 100644 htdocs/langs/pl_PL/knowledgemanagement.lang
 create mode 100644 htdocs/langs/pl_PL/partnership.lang
 delete mode 100644 htdocs/langs/pt_AO/admin.lang
 create mode 100644 htdocs/langs/pt_AO/cron.lang
 create mode 100644 htdocs/langs/pt_BR/eventorganization.lang
 create mode 100644 htdocs/langs/pt_BR/partnership.lang
 create mode 100644 htdocs/langs/pt_PT/eventorganization.lang
 create mode 100644 htdocs/langs/pt_PT/knowledgemanagement.lang
 create mode 100644 htdocs/langs/pt_PT/partnership.lang
 create mode 100644 htdocs/langs/ro_RO/eventorganization.lang
 create mode 100644 htdocs/langs/ro_RO/knowledgemanagement.lang
 create mode 100644 htdocs/langs/ro_RO/partnership.lang
 create mode 100644 htdocs/langs/ru_RU/eventorganization.lang
 create mode 100644 htdocs/langs/ru_RU/knowledgemanagement.lang
 create mode 100644 htdocs/langs/ru_RU/partnership.lang
 delete mode 100644 htdocs/langs/ru_UA/admin.lang
 create mode 100644 htdocs/langs/ru_UA/cron.lang
 create mode 100644 htdocs/langs/sk_SK/eventorganization.lang
 create mode 100644 htdocs/langs/sk_SK/knowledgemanagement.lang
 create mode 100644 htdocs/langs/sk_SK/partnership.lang
 create mode 100644 htdocs/langs/sl_SI/eventorganization.lang
 create mode 100644 htdocs/langs/sl_SI/knowledgemanagement.lang
 create mode 100644 htdocs/langs/sl_SI/partnership.lang
 create mode 100644 htdocs/langs/sq_AL/eventorganization.lang
 create mode 100644 htdocs/langs/sq_AL/knowledgemanagement.lang
 create mode 100644 htdocs/langs/sq_AL/partnership.lang
 create mode 100644 htdocs/langs/sr_RS/eventorganization.lang
 create mode 100644 htdocs/langs/sr_RS/knowledgemanagement.lang
 create mode 100644 htdocs/langs/sr_RS/partnership.lang
 create mode 100644 htdocs/langs/sv_SE/eventorganization.lang
 create mode 100644 htdocs/langs/sv_SE/knowledgemanagement.lang
 create mode 100644 htdocs/langs/sv_SE/partnership.lang
 create mode 100644 htdocs/langs/sw_SW/eventorganization.lang
 create mode 100644 htdocs/langs/sw_SW/knowledgemanagement.lang
 create mode 100644 htdocs/langs/sw_SW/partnership.lang
 create mode 100644 htdocs/langs/th_TH/eventorganization.lang
 create mode 100644 htdocs/langs/th_TH/knowledgemanagement.lang
 create mode 100644 htdocs/langs/th_TH/partnership.lang
 create mode 100644 htdocs/langs/tr_TR/eventorganization.lang
 create mode 100644 htdocs/langs/tr_TR/knowledgemanagement.lang
 create mode 100644 htdocs/langs/tr_TR/partnership.lang
 create mode 100644 htdocs/langs/uk_UA/eventorganization.lang
 create mode 100644 htdocs/langs/uk_UA/knowledgemanagement.lang
 create mode 100644 htdocs/langs/uk_UA/partnership.lang
 create mode 100644 htdocs/langs/uz_UZ/eventorganization.lang
 create mode 100644 htdocs/langs/uz_UZ/knowledgemanagement.lang
 create mode 100644 htdocs/langs/uz_UZ/partnership.lang
 create mode 100644 htdocs/langs/vi_VN/eventorganization.lang
 create mode 100644 htdocs/langs/vi_VN/knowledgemanagement.lang
 create mode 100644 htdocs/langs/vi_VN/partnership.lang
 create mode 100644 htdocs/langs/zh_CN/eventorganization.lang
 create mode 100644 htdocs/langs/zh_CN/knowledgemanagement.lang
 create mode 100644 htdocs/langs/zh_CN/partnership.lang
 create mode 100644 htdocs/langs/zh_HK/eventorganization.lang
 create mode 100644 htdocs/langs/zh_HK/knowledgemanagement.lang
 create mode 100644 htdocs/langs/zh_HK/partnership.lang
 create mode 100644 htdocs/langs/zh_TW/eventorganization.lang
 create mode 100644 htdocs/langs/zh_TW/knowledgemanagement.lang
 create mode 100644 htdocs/langs/zh_TW/partnership.lang

diff --git a/htdocs/langs/am_ET/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/am_ET/banks.lang
+++ b/htdocs/langs/am_ET/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/am_ET/bills.lang b/htdocs/langs/am_ET/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/am_ET/bills.lang
+++ b/htdocs/langs/am_ET/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/am_ET/boxes.lang b/htdocs/langs/am_ET/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/am_ET/boxes.lang
+++ b/htdocs/langs/am_ET/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/am_ET/cashdesk.lang b/htdocs/langs/am_ET/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/am_ET/cashdesk.lang
+++ b/htdocs/langs/am_ET/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/am_ET/categories.lang b/htdocs/langs/am_ET/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/am_ET/categories.lang
+++ b/htdocs/langs/am_ET/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang
index 154400c6536..fbe75f09ab0 100644
--- a/htdocs/langs/am_ET/companies.lang
+++ b/htdocs/langs/am_ET/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/am_ET/compta.lang b/htdocs/langs/am_ET/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/am_ET/compta.lang
+++ b/htdocs/langs/am_ET/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/am_ET/ecm.lang b/htdocs/langs/am_ET/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/am_ET/ecm.lang
+++ b/htdocs/langs/am_ET/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/am_ET/eventorganization.lang b/htdocs/langs/am_ET/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/am_ET/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/am_ET/knowledgemanagement.lang b/htdocs/langs/am_ET/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/am_ET/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/am_ET/mails.lang b/htdocs/langs/am_ET/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/am_ET/mails.lang
+++ b/htdocs/langs/am_ET/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
index dc2a83f2015..13793aad13f 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/am_ET/members.lang b/htdocs/langs/am_ET/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/am_ET/members.lang
+++ b/htdocs/langs/am_ET/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/am_ET/modulebuilder.lang b/htdocs/langs/am_ET/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/am_ET/modulebuilder.lang
+++ b/htdocs/langs/am_ET/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/am_ET/other.lang b/htdocs/langs/am_ET/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/am_ET/other.lang
+++ b/htdocs/langs/am_ET/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/am_ET/partnership.lang b/htdocs/langs/am_ET/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/am_ET/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/am_ET/productbatch.lang b/htdocs/langs/am_ET/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/am_ET/productbatch.lang
+++ b/htdocs/langs/am_ET/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/am_ET/projects.lang b/htdocs/langs/am_ET/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/am_ET/projects.lang
+++ b/htdocs/langs/am_ET/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/am_ET/recruitment.lang b/htdocs/langs/am_ET/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/am_ET/recruitment.lang
+++ b/htdocs/langs/am_ET/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/am_ET/sendings.lang b/htdocs/langs/am_ET/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/am_ET/sendings.lang
+++ b/htdocs/langs/am_ET/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/am_ET/stocks.lang b/htdocs/langs/am_ET/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/am_ET/stocks.lang
+++ b/htdocs/langs/am_ET/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/am_ET/users.lang b/htdocs/langs/am_ET/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/am_ET/users.lang
+++ b/htdocs/langs/am_ET/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/am_ET/website.lang b/htdocs/langs/am_ET/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/am_ET/website.lang
+++ b/htdocs/langs/am_ET/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/ar_EG/accountancy.lang b/htdocs/langs/ar_EG/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/ar_EG/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/ar_EG/admin.lang b/htdocs/langs/ar_EG/admin.lang
index 671975c34bd..f426e787f85 100644
--- a/htdocs/langs/ar_EG/admin.lang
+++ b/htdocs/langs/ar_EG/admin.lang
@@ -46,7 +46,6 @@ Module40Name=موردين
 Module700Name=تبرعات
 Module1780Name=الأوسمة/التصنيفات
 Permission81=قراءة أوامر الشراء
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 MailToSendInvoice=فواتير العميل
 MailToSendSupplierOrder=أوامر الشراء
 MailToSendSupplierInvoice=فواتير المورد
diff --git a/htdocs/langs/ar_EG/cron.lang b/htdocs/langs/ar_EG/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/ar_EG/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/ar_EG/eventorganization.lang b/htdocs/langs/ar_EG/eventorganization.lang
new file mode 100644
index 00000000000..c338d77f1cb
--- /dev/null
+++ b/htdocs/langs/ar_EG/eventorganization.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - eventorganization
+EvntOrgDraft =مسودة
diff --git a/htdocs/langs/ar_EG/main.lang b/htdocs/langs/ar_EG/main.lang
index 91cdd996f11..44cf90cc973 100644
--- a/htdocs/langs/ar_EG/main.lang
+++ b/htdocs/langs/ar_EG/main.lang
@@ -21,7 +21,6 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 Closed2=مقفول
 CloseAs=اضبط الحالة على
-NumberByMonth=الرقم بالشهر
 RefSupplier=المرجع. مورد
 CommercialProposalsShort=عروض تجارية
 Refused=مرفوض
diff --git a/htdocs/langs/ar_EG/partnership.lang b/htdocs/langs/ar_EG/partnership.lang
new file mode 100644
index 00000000000..b617038bda4
--- /dev/null
+++ b/htdocs/langs/ar_EG/partnership.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - partnership
+PartnershipDraft =مسودة
+PartnershipAccepted =مقبول
+PartnershipRefused =مرفوض
diff --git a/htdocs/langs/ar_IQ/accountancy.lang b/htdocs/langs/ar_IQ/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/ar_IQ/accountancy.lang
+++ b/htdocs/langs/ar_IQ/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/ar_IQ/admin.lang b/htdocs/langs/ar_IQ/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/ar_IQ/admin.lang
+++ b/htdocs/langs/ar_IQ/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/ar_IQ/banks.lang b/htdocs/langs/ar_IQ/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/ar_IQ/banks.lang
+++ b/htdocs/langs/ar_IQ/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/ar_IQ/bills.lang b/htdocs/langs/ar_IQ/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/ar_IQ/bills.lang
+++ b/htdocs/langs/ar_IQ/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/ar_IQ/boxes.lang b/htdocs/langs/ar_IQ/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/ar_IQ/boxes.lang
+++ b/htdocs/langs/ar_IQ/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/ar_IQ/cashdesk.lang b/htdocs/langs/ar_IQ/cashdesk.lang
index ce7698c8cd8..240503842f3 100644
--- a/htdocs/langs/ar_IQ/cashdesk.lang
+++ b/htdocs/langs/ar_IQ/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -58,7 +59,7 @@ BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
 TakeposNeedsCategories=TakePOS needs at least one product categorie to work
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Order Notes
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -83,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -93,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
diff --git a/htdocs/langs/ar_IQ/categories.lang b/htdocs/langs/ar_IQ/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/ar_IQ/categories.lang
+++ b/htdocs/langs/ar_IQ/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/ar_IQ/companies.lang b/htdocs/langs/ar_IQ/companies.lang
index 154400c6536..fbe75f09ab0 100644
--- a/htdocs/langs/ar_IQ/companies.lang
+++ b/htdocs/langs/ar_IQ/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/ar_IQ/compta.lang b/htdocs/langs/ar_IQ/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/ar_IQ/compta.lang
+++ b/htdocs/langs/ar_IQ/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/ar_IQ/ecm.lang b/htdocs/langs/ar_IQ/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/ar_IQ/ecm.lang
+++ b/htdocs/langs/ar_IQ/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ar_IQ/errors.lang b/htdocs/langs/ar_IQ/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/ar_IQ/errors.lang
+++ b/htdocs/langs/ar_IQ/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/ar_IQ/eventorganization.lang b/htdocs/langs/ar_IQ/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/ar_IQ/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/ar_IQ/knowledgemanagement.lang b/htdocs/langs/ar_IQ/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/ar_IQ/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/ar_IQ/mails.lang b/htdocs/langs/ar_IQ/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/ar_IQ/mails.lang
+++ b/htdocs/langs/ar_IQ/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/ar_IQ/main.lang b/htdocs/langs/ar_IQ/main.lang
index dc2a83f2015..13793aad13f 100644
--- a/htdocs/langs/ar_IQ/main.lang
+++ b/htdocs/langs/ar_IQ/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/ar_IQ/members.lang b/htdocs/langs/ar_IQ/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/ar_IQ/members.lang
+++ b/htdocs/langs/ar_IQ/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ar_IQ/modulebuilder.lang b/htdocs/langs/ar_IQ/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/ar_IQ/modulebuilder.lang
+++ b/htdocs/langs/ar_IQ/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/ar_IQ/other.lang b/htdocs/langs/ar_IQ/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/ar_IQ/other.lang
+++ b/htdocs/langs/ar_IQ/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/ar_IQ/partnership.lang b/htdocs/langs/ar_IQ/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/ar_IQ/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/ar_IQ/productbatch.lang b/htdocs/langs/ar_IQ/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/ar_IQ/productbatch.lang
+++ b/htdocs/langs/ar_IQ/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/ar_IQ/products.lang b/htdocs/langs/ar_IQ/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/ar_IQ/products.lang
+++ b/htdocs/langs/ar_IQ/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/ar_IQ/projects.lang b/htdocs/langs/ar_IQ/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/ar_IQ/projects.lang
+++ b/htdocs/langs/ar_IQ/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/ar_IQ/recruitment.lang b/htdocs/langs/ar_IQ/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/ar_IQ/recruitment.lang
+++ b/htdocs/langs/ar_IQ/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/ar_IQ/sendings.lang b/htdocs/langs/ar_IQ/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/ar_IQ/sendings.lang
+++ b/htdocs/langs/ar_IQ/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/ar_IQ/stocks.lang b/htdocs/langs/ar_IQ/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/ar_IQ/stocks.lang
+++ b/htdocs/langs/ar_IQ/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/ar_IQ/users.lang b/htdocs/langs/ar_IQ/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/ar_IQ/users.lang
+++ b/htdocs/langs/ar_IQ/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/ar_IQ/website.lang b/htdocs/langs/ar_IQ/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/ar_IQ/website.lang
+++ b/htdocs/langs/ar_IQ/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 0f3e0d79d19..a53fdba50a3 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -202,7 +202,7 @@ Docref=مرجع
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=الاتجاه
-AccountingDirectionHelp=بالنسبة لحساب عميل ، استخدم الائتمان لتسجيل دفعة تلقيتها <br> بالنسبة لحساب مورد ، استخدم الخصم لتسجيل دفعة تقوم بها
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=دفتر اليومية
@@ -297,7 +297,7 @@ NoNewRecordSaved=لا مزيد من التسجيل لليوميات
 ListOfProductsWithoutAccountingAccount=قائمة المنتجات غير مرتبطة بأي حساب
 ChangeBinding=تغيير الربط
 Accounted=حسب في دفتر الأستاذ
-NotYetAccounted=لم يحسب بعد في دفتر الأستاذ
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=عرض البرنامج التعليمي
 NotReconciled=لم يتم تسويتة
 WarningRecordWithoutSubledgerAreExcluded=تحذير ، كل العمليات التي لم يتم تحديد حساب دفتر الأستاذ الفرعي لها تتم تصفيتها واستبعادها من طريقة العرض هذه
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 2dabbd20959..a01a5a8b940 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -32,7 +32,7 @@ PurgeSessions=إزالة الجلسات
 ConfirmPurgeSessions=هل تريد حقًا مسح كل الجلسات؟ سيؤدي هذا إلى قطع اتصال كل المستخدمين (باستثنائك).
 NoSessionListWithThisHandler=لا يسمح معالج حفظ الجلسة الذي تم تكوينه في PHP بسرد جميع الجلسات قيد التشغيل.
 LockNewSessions=إقفال الإتصالات الجديدة
-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.
+ConfirmLockNewSessions=هل أنت متأكد من أنك تريد تقييد أي اتصال جديد الى دوليبار لنفسك. المستخدم <b>%s</b>  هو الوحيد الذي سيتمكن من الإتصال بعد هذه العملية.
 UnlockNewSessions=إزالة قفل الإتصال
 YourSession=الجلسة الخاصة بك
 Sessions=جلسات المستخدمين
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=الإعداد الأمني
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=حدد هنا الخيارات المتعلقة بالأمان حول تحميل الملفات.
 ErrorModuleRequirePHPVersion=خطأ ، هذا النموذج يتطلب نسخة بي إتش بي %s أو أعلى
 ErrorModuleRequireDolibarrVersion=خطأ ، هذا النموذج يتطلب نسخة دوليبار %s أو أعلى
@@ -138,10 +139,10 @@ CurrentHour=PHP خادم ساعة
 CurrentSessionTimeOut=إنتها مدة التصفح الحالية
 YouCanEditPHPTZ=لتعيين منطقة زمنية مختلفة لـ PHP (غير مطلوب) ، يمكنك محاولة إضافة ملف .htaccess مع سطر مثل "SetEnv TZ Europe / Paris"
 HoursOnThisPageAreOnServerTZ=تحذير ، على عكس الشاشات الأخرى ، فإن الساعات على هذه الصفحة ليست بتوقيتك المحلي ، ولكن حسب المنطقة الزمنية للخادم.
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=الحد الأعلى لعدد الأسطر (widgets)
-AllWidgetsWereEnabled=تم تمكين جميع (widgets)المتاحة
+Box=بريمج
+Boxes=بريمجات
+MaxNbOfLinesForBoxes=الحد الأعلى لعدد أسطر البريمجات
+AllWidgetsWereEnabled=جميع البريمجات المتاحة ممكنة
 PositionByDefault=الطلبية الإفتراضية
 Position=الوضع
 MenusDesc=يقوم مديرو القائمة بتعيين محتوى شريطي القائمة (الأفقي والعمودي).
@@ -204,7 +205,7 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=اكتشاف تلقائي (لغة المتصفح)
 FeatureDisabledInDemo=الميزة معلطة في العرض التجريبي
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
+BoxesDesc=البريمجات هي المكونات البرمجية التي تُظهر بعض المعلومات في بعض الصفحات. يمكنك اختيار إظهار أو إخفائها بإختيار الصفحات المطلوبة و الضغط على 'تنشيط', او بالضغط على الزر الآخر لتعطيلها.
 OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">النماذج المفعلة </a> سوف تظهر.
 ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
@@ -230,8 +231,8 @@ WebSiteDesc=External websites for more add-on (non-core) modules...
 DevelopYourModuleDesc=Some solutions to develop your own module...
 URL=العنوان
 RelativeURL=Relative URL
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
+BoxesAvailable=بريمجات متاحة
+BoxesActivated=بريمجات مفعلة
 ActivateOn=على تفعيل
 ActiveOn=على تفعيلها
 ActivatableOn=Activatable on
@@ -245,8 +246,8 @@ DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text)
 MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
 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=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
-ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
+ProtectAndEncryptPdfFiles=حماية صيغة المستندات المتنقلة . غير منصوح به لانه يوقف التوليد الكمي للملفات بصيغة المستندات المتنقلة
+ProtectAndEncryptPdfFilesDesc=حماية الملفات بصيغة المستندات المتنقلة يجعلها متاحة للقراءة والطباعة في اي مستعرض لصيغة المستندات المتنقلة . لكن النسخ والتعديل غير ممكن بعد ذلك. يرجى ملاحظة ان هذه الميزة تجعل ميزة توليد ملفات مدمجة بصيغة المستندات المتنقلة غير ممكن
 Feature=ميزة
 DolibarrLicense=الترخيص
 Developpers=مطوري / المساهمين
@@ -277,21 +278,21 @@ FontSize=Font size
 Content=Content
 NoticePeriod=فترة إشعار
 NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
+Emails=رسائل البريد الإلكترونية
+EMailsSetup=إعدادات رسائل البريد الإلكترونية
 EMailsDesc=This page allows you to set parameters or options for email sending.
-EmailSenderProfiles=Emails sender profiles
-EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+EmailSenderProfiles=ملفات تعريف مرسلي رسائل البريد الإلكترونية
+EMailsSenderProfileDesc=يمكنك ان تبقي هذا القسم فارغاً. اذا ادخلت عناوين بريد إلكتروني هنا سيتم اضافتهم الى قائمة المرسلين المحتملين كخيار عندما تنشئ رسائل بريد إلكترونية جديدة
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
-MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
+MAIN_MAIL_EMAIL_FROM=عنوان بريد المرسل لرسائل البريد الإلكترونية التلقائية (القيمة الاولية في ملف اعدادات لغة بي اتش بي  <b>%s</b> )
+MAIN_MAIL_ERRORS_TO=عنوان رسائل البريد الإلكترونية المرجعي لأخطاء الارسال (الحقل "الاخطاء إلى" ) في البريد المرسل
+MAIN_MAIL_AUTOCOPY_TO= نسخ (نسخة كربونية) كل رسائل البريد الإلكترونية المرسلة الى 
 MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_FORCE_SENDTO=إرسال جميع رسائل البريد الإلكترونية الى (بدلا عن المستلم الحقيقي لاغراض التطوير والتجربة)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=اقتراح عناوين بريد الموظفين الإلكتروني (إذا كان موجودا) في حقل المستلمين عند ارنشاء رسالة بريد جديدة
 MAIN_MAIL_SENDMODE=Email sending method
 MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
@@ -302,9 +303,9 @@ MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
-MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
-MAIN_SMS_SENDMODE=طريقة استخدامه لإرسال الرسائل القصيرة SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
+MAIN_DISABLE_ALL_SMS=تعطيل كافة الرسائل النصية القصيرة (لأغراض التجربة و التطوير)
+MAIN_SMS_SENDMODE=طريقة إرسال الرسائل النصية القصيرة
+MAIN_MAIL_SMS_FROM=رقم هاتف المرسل الاولي لارسال الرسائل النصية القصيرة
 MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
 UserEmail=User email
 CompanyEmail=Company Email
@@ -385,7 +386,7 @@ ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\
 FollowingSubstitutionKeysCanBeUsed=<br> لمعرفة كيفية إنشاء قوالب المستند ODT، قبل تخزينها في تلك الدلائل، وقراءة وثائق ويكي:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=موقف الإسم / اسم
-DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+DescWeather=الصور التالية سيتم عرضها على لوحة المعلومات عندما يصل عدد الاجرائات المتأخرة للقيم التالية:
 KeyForWebServicesAccess=مفتاح لاستخدام خدمات الشبكة العالمية (المعلمة &quot;dolibarrkey&quot; في webservices)
 TestSubmitForm=اختبار شكل مساهمة
 ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
@@ -395,9 +396,9 @@ ResponseTimeout=استجابة مهلة
 SmsTestMessage=رسالة اختبار من __PHONEFROM__ إلى __PHONETO__
 ModuleMustBeEnabledFirst=يجب تمكين <b>وحدة%s</b> أولا إذا كنت تحتاج هذه الميزة.
 SecurityToken=المفتاح لعناوين المواقع الآمنة
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
-PDF=PDF
-PDFDesc=Global options for PDF generation
+NoSmsEngine=لايوجد مدير إرسال الرسائل النصية القصيرة . مدير إرسال الرسائل النصية القصيرة غير مثبت بصورة اولية لانه يعتمد على مورد خارجي ، لكن يمكنك ايجاد واحد هنا %s
+PDF=صيغة المستندات المتنقلة
+PDFDesc=الخيارات العامة لتوليد ملفات صيغة المستندات المتنقلة
 PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
@@ -452,9 +453,9 @@ ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_na
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
-LibraryToBuildPDF=Library used for PDF generation
+LibraryToBuildPDF=المكتبة المستخدمة لتوليد ملفات صيغة المستندات المتنقلة
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
+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)
@@ -1152,14 +1153,14 @@ CompanyCurrency=العملة الرئيسية
 CompanyObject=وجوه من الشركة
 IDCountry=ID country
 Logo=شعار
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoDesc=الشعار الرئيسي للشركة . سوف يستخدم في الملفات المولدة (صيغة المستندات المتنقلة ....)
 LogoSquarred=Logo (squarred)
 LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
 DoNotSuggestPaymentMode=لا توحي
 NoActiveBankAccountDefined=لا يعرف في حساب مصرفي نشط
 OwnerOfBankAccount=صاحب الحساب المصرفي %s
 BankModuleNotActive=الحسابات المصرفية وحدة لا يمكن
-ShowBugTrackLink=مشاهدة الرابط <strong>"%s"</strong>
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=تنبيهات
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=يجب تشغيل هذا الأ
 YourPHPDoesNotHaveSSLSupport=وظائف خدمة تصميم المواقع لا تتوفر في بي الخاص بك
 DownloadMoreSkins=مزيد من جلود بتحميل
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=ترجمة جزئية
@@ -1690,7 +1692,7 @@ AdvancedEditor=محرر متقدم
 ActivateFCKeditor=تفعيل محرر متقدم ل:
 FCKeditorForCompany=WYSIWIG إنشاء / الطبعة شركات ووصف المذكرة
 FCKeditorForProduct=WYSIWIG إنشاء / الطبعة المنتجات / الخدمات ووصف المذكرة
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForProductDetails=إنشاء \\ تعديل  تفاصيل المنتجات على طريقة الطباعة "ما تراه ستحصل عليه" لجميع المستندات (المقترحات،الاوامر،الفواتير،...) <span class="warning"> تحذير: إستخدام هذه الخاصية غير منصوح به بشدة بسبب مشاكل المحارف الخاصة وتنسيق الصفحات وذلك عند توليد ملفات بصيغة المستندات المتنقلة .</span>
 FCKeditorForMailing= WYSIWIG إنشاء / الطبعة بالبريد
 FCKeditorForUserSignature=إنشاء WYSIWIG / طبعة التوقيع المستعمل
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1947,7 +1949,7 @@ AddRemoveTabs=Add or remove tabs
 AddDataTables=Add object tables
 AddDictionaries=Add dictionaries tables
 AddData=Add objects or dictionaries data
-AddBoxes=Add widgets
+AddBoxes=إضافة بريمجات
 AddSheduledJobs=Add scheduled jobs
 AddHooks=Add hooks
 AddTriggers=Add triggers
@@ -1972,11 +1974,11 @@ BaseCurrency=Reference currency of the company (go into setup of company to chan
 WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
 WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
-MAIN_PDF_MARGIN_LEFT=Left margin on PDF
-MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
-MAIN_PDF_MARGIN_TOP=Top margin on PDF
-MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_PDF_MARGIN_LEFT=الهامش الايسر على ملفات صيغة المستندات المتنقلة
+MAIN_PDF_MARGIN_RIGHT=الهامش الايمن لملفات صيغة المستندات المتنقلة
+MAIN_PDF_MARGIN_TOP=الهامش العلوي لصيغة المستندات المتنقلة
+MAIN_PDF_MARGIN_BOTTOM=الهامش العلوي لصيغة المستندات المتنقلة
+MAIN_DOCUMENTS_LOGO_HEIGHT=ارتفاع الشعار على صيغة المستندات المتنقلة
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
@@ -1994,7 +1996,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+SwapSenderAndRecipientOnPDF=إبدال مكان عنوان المرسل والمستقبل على ملفات صيغة المستندات المتنقلة
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
@@ -2031,8 +2033,8 @@ FormatZip=الرمز البريدي
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
+OpeningHours=ساعات الافتتاح
+OpeningHoursDesc=ادخل هنا ساعات الافتتاح لشركتك
 ResourceSetup=Configuration of Resource module
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
 DisabledResourceLinkUser=Disable feature to link a resource to users
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2092,11 +2094,11 @@ EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
 PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+PDF_USE_ALSO_LANGUAGE_CODE=اذا كنت ترغب في تكرار بعض النصوص بلغتين مختلفتين  في ملفاتك المولدة بصيغة المستندات المتنقلة . يجب عليك ان ان تحدد اللغة الثانية هنا حتى يتسنى للملفات المولدة ان تحتوي على لغتين في نفس الصفحة . اللغة المختارة اثناء توليد المستند واللغة المختارة هنا (فقط بعض قوالب صيغة المستندات المتنقلة تدعم هذه الميزة) . ابق الخيار فارغاً للتوليد بلغة واحدة 
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
+RssNote=ملاحظة: كل تعريف لمصدر اخبار مختصرة يوفر بريمج يجب تفعيله ليكون متاحا في لوحة المعلومات
+JumpToBoxes=اذهب الى الاعدادت -> البريمجات
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
 TemplateAdded=Template added
@@ -2111,7 +2113,7 @@ ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
 SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
+SHOW_SUBPRODUCT_REF_IN_PDF=اذا كانت الميزة "%s" من الوحدة <b>%s</b> مستخدمة ، اظهر التفاصيل للمنتجات الفرعية في الملفات بصيغة المستندات المتنقلة
 AskThisIDToYourBank=Contact your bank to get this ID
 AdvancedModeOnly=Permision available in Advanced permission mode only
 ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index dec71e2691c..98a3eedaaf9 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=مدفوعات الضرائب الاجتماعية / 
 BankTransfer=تحويل الرصيد
 BankTransfers=تحويلات الرصيد
 MenuBankInternalTransfer=حوالة داخلية
-TransferDesc=التحويل من حساب إلى آخر ، ستكتب Dolibarr سجلين (خصم في حساب المصدر وائتمان في الحساب الهدف). سيتم استخدام نفس المبلغ (باستثناء العلامة) والملصق والتاريخ لهذه المعاملة)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=من
 TransferTo=إلى
 TransferFromToDone=التحويل من <b>%s</b>إلى <b>%s</b>من <b>%s</b>%s قد تم تسجيلة.
-CheckTransmitter=المرسل
+CheckTransmitter=مرسل
 ValidateCheckReceipt=تأكيد صحة الشيك المستلم؟
-ConfirmValidateCheckReceipt=هل تريد تأكيد هذا الشيك ، لن يكون من الممكن إجراء أي تغيير بعد الانتهاء من ذلك؟
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=حذف هذا الشيك ؟
 ConfirmDeleteCheckReceipt=هل انت متأكد أنك تريد حذف هذا الشيك؟
 BankChecks=الشيكات المصرفية
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=هل تريد بالتأكيد حذف هذه المعا
 ThisWillAlsoDeleteBankRecord=سيؤدي هذا أيضا إلى حذف القيد البنكي الذي تم إنشاؤه
 BankMovements=حركات
 PlannedTransactions=المعاملات المخططة
-Graph=الرسومات
+Graph=Graphs
 ExportDataset_banque_1=القيود البنكية وكشف الحساب
 ExportDataset_banque_2=قسيمة الإيداع
 TransactionOnTheOtherAccount=معاملة على الحساب الآخر
@@ -142,7 +142,7 @@ AllAccounts=جميع الحسابات المصرفية والنقدية
 BackToAccount=عودة إلى الحساب
 ShowAllAccounts=عرض لجميع الحسابات
 FutureTransaction=الصفقة المستقبلية. غير قادر على التسوية.
-SelectChequeTransactionAndGenerate=حدد / تصفية الشيكات لتضمينها في إيصال إيداع الشيك وانقر على "إنشاء".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=اختيار كشف الحساب البنكي ذات الصلة مع التسوية. استخدام قيمة رقمية للفرز: شهر سنة أو يوم شهر سنة
 EventualyAddCategory=في نهاية المطاف، حدد الفئة التي لتصنيف السجلات
 ToConciliate=للتسوية؟
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index a82852b2eaa..4f33681d88c 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=تحويل الفائض المستلم إلى خصم م
 EnterPaymentReceivedFromCustomer=أدخل الدفعة المستلمة من العميل
 EnterPaymentDueToCustomer=انشاء استحقاق دفع للعميل
 DisabledBecauseRemainderToPayIsZero=معطل لأن المتبقي غير المسدد يساوي صفر
-PriceBase=سعر الأساس
+PriceBase=Base price
 BillStatus=حالة الفاتورة
 StatusOfGeneratedInvoices=حالة الفواتير المنشأة
 BillStatusDraft=مسودة (يجب التحقق من صحتها)
@@ -454,7 +454,7 @@ RegulatedOn=وتنظم على
 ChequeNumber=رقم الشيك
 ChequeOrTransferNumber=رقم شيك / تحويل 
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=الشيكات المصرفية
 CheckBank=الشيك
 NetToBePaid=الصافي للدفع
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index a95a4943e9c..bb7d024ab37 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=الإشارات المرجعية: أحدث %s
 BoxOldestExpiredServices=أقدم الخدمات النشطة منتهية الصلاحية
 BoxLastExpiredServices=أحدث %s أقدم جهات اتصال مع خدمات منتهية الصلاحية نشطة
 BoxTitleLastActionsToDo=أحدث إجراءات %s للقيام بها
-BoxTitleLastContracts=أحدث %s عقود معدلة
-BoxTitleLastModifiedDonations=أحدث %s التبرعات المعدلة
-BoxTitleLastModifiedExpenses=أحدث %s تقارير النفقات المعدلة 
-BoxTitleLatestModifiedBoms=أحدث %s BOMs معدلة 
-BoxTitleLatestModifiedMos=أحدث %s أوامر التصنيع المعدلة
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=العملاء الذين تجاوزا الحد الاقصى
 BoxGlobalActivity=النشاط العام  (الفواتير ، العروض ، الطلبات)
 BoxGoodCustomers=عملاء جيدون
@@ -97,8 +97,8 @@ ForCustomersInvoices=فواتير العملاء
 ForCustomersOrders=أوامر العملاء
 ForProposals=عروض
 LastXMonthRolling=آخر %s شهر  متداول
-ChooseBoxToAdd=إضافة widget إلى لوحة القيادة الخاصة بك
-BoxAdded=تمت إضافة widget في لوحة القيادة الخاصة بك
+ChooseBoxToAdd=إضافة بريمج إلى لوحة معلوماتك
+BoxAdded=تمت إضافة البريمج الى لوحة معلوماتك
 BoxTitleUserBirthdaysOfMonth=أعياد الميلاد لهذا الشهر (المستخدمون)
 BoxLastManualEntries=تم إدخال أحدث سجل في المحاسبة يدويًا أو بدون مستند المصدر
 BoxTitleLastManualEntries=%s تم إدخال أحدث سجل يدويًا أو بدون مستند المصدر
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index 0fdc5513233..5a185a25ed9 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=ورود
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=المتصفح
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index 86b8186e362..999806d7f7b 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -3,20 +3,20 @@ Rubrique=العلامة / الفئة
 Rubriques=الكلمات / فئات
 RubriquesTransactions=علامات/ فئات المعاملات
 categories=علامات / فئات
-NoCategoryYet=لم يتم إنشاء علامة / فئة من هذا النوع
+NoCategoryYet=No tag/category of this type has been created
 In=في
 AddIn=اضف الى
 modify=تعديل
 Classify=صنف
 CategoriesArea=منطقة الكلمات / الفئات 
-ProductsCategoriesArea=منطقة المنتجات / الخدمات العلامات / الفئات
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=منطقة علامات / فئات العملاء 
-MembersCategoriesArea=منطقة علامات / فئات الأعضاء 
-ContactsCategoriesArea=منطقة  اتصالات العلامات / الفئات 
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=منطقة علامات / فئات المشاريع
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=قائمة العلامات / الفئات
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index 7be97a35374..ca1bc140766 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=اسم الشركة %s موجود بالفعل. اختر واحد اخر.
 ErrorSetACountryFirst=اضبط البلد أولاً
 SelectThirdParty=حدد طرفًا ثالثًا
-ConfirmDeleteCompany=هل أنت متأكد أنك تريد حذف هذه الشركة وجميع المعلومات الموروثة عنها؟
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=حذف جهة اتصال | عنوان
-ConfirmDeleteContact=هل أنت متأكد أنك تريد حذف جهة الاتصال هذه وجميع المعلومات الموروثة؟
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=طرف ثالث جديد
 MenuNewCustomer=عميل جديد
 MenuNewProspect=فرصة جديدة
@@ -43,10 +43,10 @@ Individual=فرد
 ToCreateContactWithSameName=سيتم إنشاء جهة اتصال | عنوان تلقائيًا بنفس المعلومات مثل الطرف الثالث التابع للطرف الثالث. في معظم الحالات ، حتى لو كان الطرف الثالث شخصًا ماديًا ، يكفي إنشاء طرف ثالث بمفرده.
 ParentCompany=الشركة الأم
 Subsidiaries=الشركات التابعة
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=تقرير لكل شهر
+ReportByCustomers=تقرير لكل عميل
+ReportByThirdparties=تقرير لكل طرف ثالث
+ReportByQuarter=تقرير لكل معدل
 CivilityCode=قواعد السلوك
 RegisteredOffice=مكتب مسجل
 Lastname=اللقب
@@ -69,7 +69,7 @@ PhoneShort=الهاتف
 Skype=سكايب
 Call=مكالمة
 Chat=دردشة
-PhonePro=هاتف العمل
+PhonePro=Bus. phone
 PhonePerso=الهاتف الشخصي
 PhoneMobile=الجوال
 No_Email=رفض الرسائل الإلكترونية الجماعية
@@ -78,7 +78,7 @@ Zip=الرمز البريدي
 Town=مدينة
 Web=الويب
 Poste= المنصب
-DefaultLang=اللغة الافتراضية
+DefaultLang=Default language
 VATIsUsed=تطبق ضريبة المبيعات
 VATIsUsedWhenSelling=يحدد هذا ما إذا كان هذا الطرف الثالث يتضمن ضريبة بيع أم لا عندما يُصدر فاتورة لعملائه
 VATIsNotUsed=لا تطبق ضريبة المبيعات
@@ -331,7 +331,7 @@ CustomerCodeDesc=كود العميل فريد لجميع العملاء
 SupplierCodeDesc=كود المورد ، فريد لجميع الموردين
 RequiredIfCustomer=مطلوب ، إذا كان الطرف الثالث عميلاً أو فرصة
 RequiredIfSupplier=مطلوب إذا كان الطرف الثالث موردا
-ValidityControledByModule=الصلاحية يتحكم بها في الوحدة
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=قواعد هذه الوحدة
 ProspectToContact=فرصة للاتصال
 CompanyDeleted=تم حذف شركة "%s" من قاعدة البيانات.
@@ -439,22 +439,22 @@ ListSuppliersShort=قائمة الموردين
 ListProspectsShort=قائمة الفرص
 ListCustomersShort=قائمة العملاء
 ThirdPartiesArea=الأطراف الثالثة | جهات الاتصال
-LastModifiedThirdParties=آخر %s أطراف ثالثة معدلة
-UniqueThirdParties=إجمالي الأطراف الثالثة
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=فتح
 ActivityCeased=مغلق
 ThirdPartyIsClosed=الطرف الثالث مغلق
-ProductsIntoElements=قائمة المنتجات | الخدمات في %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=فاتورة مستحقة حاليا
 OutstandingBill=الأعلى للفاتورة المستحقة
 OutstandingBillReached=الأعلى لفاتورة مستحقة وصلت
 OrderMinAmount=الحد الأدنى للطلب
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=إنشاء رقم على الصيغة %s yymm-nnnn للعميل و المورد %s  حيث ال yy تمثل رقم السنة وال mm تمثل الشهر وال nnnn تمثل رقم تسلسلي بدون فواصل وبدون العودة للصفر
 LeopardNumRefModelDesc=الكود مجاني. يمكن تعديل هذا الكود في أي وقت.
 ManagingDirectors=اسم المدير (المديرون) (الرئيس التنفيذي ، المدير ، الرئيس)
 MergeOriginThirdparty=طرف ثالث مكرر (الطرف الثالث الذي تريد حذفه)
 MergeThirdparties=دمج أطراف ثالثة
-ConfirmMergeThirdparties=هل أنت متأكد أنك تريد دمج هذا الطرف الثالث في الطرف الحالي؟ سيتم نقل جميع العناصر المرتبطة (الفواتير ، الطلبات) إلى الطرف الثالث الحالي ، ثم سيتم حذف الطرف الثالث.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=تم دمج الأطراف الثالثة
 SaleRepresentativeLogin=تسجيل دخول مندوب مبيعات
 SaleRepresentativeFirstname=الاسم الأول لمندوب المبيعات
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 97365780ddc..ec9245b6d0e 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=خصم جديد
 NewCheckDeposit=تأكد من ايداع جديدة
 NewCheckDepositOn=تهيئة لتلقي الودائع على حساب : ٪ ق
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=استقبال المدخلات تاريخ الشيك
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=دفع ضريبة اجتماعية / مالية
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/ar_SA/ecm.lang b/htdocs/langs/ar_SA/ecm.lang
index 94e1664bd58..294e2392a98 100644
--- a/htdocs/langs/ar_SA/ecm.lang
+++ b/htdocs/langs/ar_SA/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 8ed6de325ed..fdb1bef1b89 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=أي خطأ، ونحن نلزم
 # Errors
 ErrorButCommitIsDone=تم العثور على أخطاء لكننا تحقق على الرغم من هذا
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=عنوان الموقع هو الخطأ %s
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=ادخل ٪ ق موجود بالفعل.
@@ -46,8 +46,8 @@ ErrorWrongDate=تاريخ غير صحيح!
 ErrorFailedToWriteInDir=لم يكتب في دليل ٪ ق
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=العثور على بريد إلكتروني صحيح لتركيب خطوط ق ٪ في ملف (على سبيل المثال خط ٪ ق= ٪ مع البريد الإلكتروني)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=تتطلب بعض المجالات لم تملأ.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=فشل إنشاء دليل. تأكد من أن خادم الويب المستخدم أذونات لكتابة وثائق Dolibarr في الدليل. إذا تم تمكين المعلم <b>safe_mode</b> على هذا PHP ، تحقق من أن ملفات Dolibarr php تملك لخدمة الويب المستخدم (أو مجموعة).
 ErrorNoMailDefinedForThisUser=البريد لا يعرف لهذا المستخدم
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/ar_SA/eventorganization.lang b/htdocs/langs/ar_SA/eventorganization.lang
new file mode 100644
index 00000000000..125a62775f9
--- /dev/null
+++ b/htdocs/langs/ar_SA/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = إعدادات
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = حوالة مصرفية
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = منتهي
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/ar_SA/help.lang b/htdocs/langs/ar_SA/help.lang
index e4944b4b5b5..f7cf58faef5 100644
--- a/htdocs/langs/ar_SA/help.lang
+++ b/htdocs/langs/ar_SA/help.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - help
 CommunitySupport=منتدى / ويكي الدعم
 EMailSupport=دعم رسائل البريد الإلكتروني
-RemoteControlSupport=الوقت الحقيقي عبر الإنترنت / الدعم عن بعد
+RemoteControlSupport=Online real-time / remote support
 OtherSupport=دعم آخر
 ToSeeListOfAvailableRessources=للاتصال / الاطلاع على الموارد المتاحة:
-HelpCenter=مركز المساعدة
+HelpCenter=Help Center
 DolibarrHelpCenter=Dolibarr Help and Support Center
 ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
 TypeOfSupport=Type of support
@@ -17,7 +17,7 @@ TypeHelpOnly=المساعدة فقط
 TypeHelpDev=مساعدة + التنمية
 TypeHelpDevForm=Help+Development+Training
 BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+LinkToGoldMember=يمكنك اختيار احد المدربين المختارين مسبقا بواسطة دوليبار من اجل لغتك (1%s) بالضغط على البريمج الخاص بهم (يتم تحديث الحالة والحد الاعلى للسعر تلقائياً)
 PossibleLanguages=اللغات المدعومة
 SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
 SeeOfficalSupport=للحصول على دعم رسمي من دوليبار بلغتك: <br> <b> <a href="%s" target="_blank"> %s </a></b>
diff --git a/htdocs/langs/ar_SA/knowledgemanagement.lang b/htdocs/langs/ar_SA/knowledgemanagement.lang
new file mode 100644
index 00000000000..1648a9582a8
--- /dev/null
+++ b/htdocs/langs/ar_SA/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = إعدادات
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = حول
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = عنصر
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 384cda2c563..d01d415c937 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=نسخة إلى
 MailToCCUsers=Copy to users(s)
 MailCCC=نسخة إلى نسخة
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=رسالة
 MailFile=الملفات المرفقة
 MailMessage=هيئة البريد الإلكتروني
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=وقد تم تكوين إرسال البريد الإلكتروني الإعداد ل'٪ ق'. هذا الوضع لا يمكن أن تستخدم لإرسال إرساله عبر البريد الإلكتروني الشامل.
 MailSendSetupIs2=يجب عليك أولا الذهاب، مع حساب مشرف، في القائمة٪ sHome - إعداد - رسائل البريد الإلكتروني٪ s إلى تغيير المعلمة <strong>'٪ ق'</strong> لاستخدام وضع '٪ ق'. مع هذا الوضع، يمكنك إدخال الإعداد خادم SMTP المقدمة من قبل موفر خدمة الإنترنت واستخدام قداس ميزة البريد الإلكتروني.
 MailSendSetupIs3=إذا كان لديك أي أسئلة حول كيفية إعداد ملقم SMTP الخاص بك، يمكنك أن تطلب إلى٪ s.
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index bb91885ee64..ce51cd01c65 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -160,7 +160,7 @@ AddToDraft=أضف إلى المسودة
 Update=تحديث
 Close=إغلاق
 CloseAs=ضبط الحالة على
-CloseBox=إزالة القطعة (widget) من لوحة القيادة الخاصة بك
+CloseBox=إزالة بريمج من لوحة معلوماتك
 Confirm=تأكيد
 ConfirmSendCardByMail=هل تريد حقًا إرسال محتوى هذه البطاقة بالبريد إلى <b> %s </b>؟
 Delete=حذف
@@ -180,7 +180,7 @@ SaveAndNew=حفظ وجديد
 TestConnection=اختبار الاتصال
 ToClone=استنساخ
 ConfirmCloneAsk=هل أنت متأكد أنك تريد استنساخ الكائن <b> %s </b>؟
-ConfirmClone=اختر البيانات التي تريد استنساخها:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=لا توجد بيانات لاستنساخ محددة.
 Of=من
 Go=اذهب
@@ -246,7 +246,7 @@ DefaultModel=قالب المستند الافتراضي
 Action=حدث
 About=حول
 Number=عدد
-NumberByMonth=العدد بالشهر
+NumberByMonth=Total reports by month
 AmountByMonth=المبلغ بالشهر
 Numero=عدد
 Limit=الحد
@@ -278,7 +278,7 @@ DateModificationShort=تاريخ التعديل
 IPModification=تعديل IP
 DateLastModification=تاريخ آخر تعديل
 DateValidation=تاريخ الاعتماد
-DateSigning=Signing date
+DateSigning=تاريخ التوقيع
 DateClosing=الموعد النهائي
 DateDue=تاريخ الاستحقاق
 DateValue=تاريخ القيمة
@@ -341,8 +341,8 @@ KiloBytes=كيلو بايت
 MegaBytes=ميغابايت
 GigaBytes=غيغا بايت
 TeraBytes=تيرابايت
-UserAuthor=مستخدم الانشاء
-UserModif=مستخدم آخر تحديث
+UserAuthor=Ceated by
+UserModif=Updated by
 b=بايت
 Kb=كيلوبايت
 Mb=ميغابايت
@@ -362,7 +362,7 @@ UnitPriceHTCurrency=سعر الوحدة (غير شامل) (العملة)
 UnitPriceTTC=سعر الوحدة
 PriceU=سعر الوحدة
 PriceUHT=سعر الوحدة (صافي)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=سعر. الوحدة (الصافي)(العملة)
 PriceUTTC=السعر (شامل الضريبة)
 Amount=المبلغ
 AmountInvoice=مبلغ الفاتورة
@@ -388,8 +388,8 @@ AmountLT1ES=كمية RE
 AmountLT2ES=كمية IRPF
 AmountTotal=المبلغ الإجمالي
 AmountAverage=متوسط المبلغ
-PriceQtyMinHT=Price quantity min. (excl. tax)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PriceQtyMinHT=الحد الادنى لسعر الكمية . (غ.ش.ض)
+PriceQtyMinHTCurrency=الحد الادنى لسعر الكمية . (غ.ش.ض)(العملة)
 PercentOfOriginalObject=النسبة المئوية للكائن الأصلي
 AmountOrPercent=المبلغ أو النسبة المئوية
 Percentage=نسبة مئوية
@@ -503,9 +503,11 @@ By=بواسطة
 From=من
 FromDate=من تاريخ
 FromLocation=من
-at=at
 to=إلى
 To=إلى
+ToDate=إلى
+ToLocation=إلى
+at=على
 and=و
 or=أو
 Other=آخر
@@ -700,7 +702,7 @@ RecordsDeleted=تم حذف %s سجل (سجلات)
 RecordsGenerated=تم إنشاء %s سجل (سجلات) 
 AutomaticCode=كود تلقائي
 FeatureDisabled=ميزة معطلة
-MoveBox=نقل (widget) القطعة
+MoveBox=نقل البريمج
 Offered=معروض
 NotEnoughPermissions=ليس لديك إذن بهذا الإجراء
 SessionName=اسم الجلسة
@@ -727,7 +729,7 @@ MenuMembers=أعضاء
 MenuAgendaGoogle=أجندة غوغل
 MenuTaxesAndSpecialExpenses=الضرائب | مصاريف خاصة
 ThisLimitIsDefinedInSetup=حدود دوليبار (Menu home-setup-security): %s كيلوبايت ، حد PHP: %s كيلوبايت
-NoFileFound=No documents uploaded
+NoFileFound=لم يتم رفع مستند
 CurrentUserLanguage=اللغة الحالية
 CurrentTheme=الواجهة الحالية
 CurrentMenuManager=مدير القائمة الحالي
@@ -824,8 +826,8 @@ ModulesSystemTools=أدوات الوحدات
 Test=اختبار
 Element=العنصر
 NoPhotoYet=لا توجد صور متاحة حتى الآن
-Dashboard=لوحة القيادة
-MyDashboard=لوحة القيادة الخاصة بي
+Dashboard=لوحة المعلومات
+MyDashboard=لوحة معلوماتك
 Deductible=خصم
 from=من
 toward=باتجاه
@@ -843,7 +845,7 @@ XMoreLines=%s بند (بنود) مخفي
 ShowMoreLines=عرض المزيد | أقل من البنود
 PublicUrl=URL العام
 AddBox=إضافة مربع
-SelectElementAndClick=حدد عنصرًا وانقر فوق %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=طباعة الملف %s
 ShowTransaction=عرض الإدخال في الحساب المصرفي
 ShowIntervention=عرض التدخل
@@ -854,8 +856,8 @@ Denied=مرفوض
 ListOf=قائمة %s
 ListOfTemplates=قائمة القوالب
 Gender=جنس
-Genderman=رجل
-Genderwoman=امرأة
+Genderman=Male
+Genderwoman=Female
 Genderother=الآخر
 ViewList=عرض القائمة
 ViewGantt=عرض Gantt
@@ -896,8 +898,8 @@ AllExportedMovementsWereRecordedAsExported=تم تسجيل جميع حركات 
 NotAllExportedMovementsCouldBeRecordedAsExported=لا يمكن تسجيل جميع حركات التصدير على أنها مصدرة
 Miscellaneous=متفرقات
 Calendar=التقويم
-GroupBy=Group by...
-ViewFlatList=View flat list
+GroupBy=تجميع على حسب
+ViewFlatList=عرض قائمة مسطحة
 ViewAccountList=عرض دفتر الأستاذ
 ViewSubAccountList=عرض دفتر الأستاذ الفرعي
 RemoveString=Remove string '%s'
@@ -930,18 +932,18 @@ EMailTemplates=قوالب البريد الإلكتروني
 FileNotShared=الملف غير متاح للجمهور الخارجي
 Project=المشروع
 Projects=مشاريع
-LeadOrProject=Lead | Project
-LeadsOrProjects=Leads | Projects
-Lead=Lead
-Leads=Leads
-ListOpenLeads=List open leads
-ListOpenProjects=List open projects
-NewLeadOrProject=New lead or project
+LeadOrProject=فرصة \\ مشروع
+LeadsOrProjects=الفرص \\ المشروعات
+Lead=فرصة
+Leads=فرص
+ListOpenLeads=قائمة الفرص المفتوحة
+ListOpenProjects=قائمة المشاريع المفتوحة
+NewLeadOrProject=مشروع او فرصة جديدة
 Rights=الصلاحيات
 LineNb=رقم البند
 IncotermLabel=مصطلحات تجارية دولية
-TabLetteringCustomer=Customer lettering
-TabLetteringSupplier=Vendor lettering
+TabLetteringCustomer=مراسلات العملاء
+TabLetteringSupplier=مراسلات الموردين
 Monday=الاثنين
 Tuesday=الثلاثاء
 Wednesday=الأربعاء
@@ -1018,7 +1020,7 @@ SearchIntoContacts=جهات الاتصال
 SearchIntoMembers=أعضاء
 SearchIntoUsers=المستخدمين
 SearchIntoProductsOrServices=المنتجات أو الخدمات
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=الرفوف \\ الارقام التسلسلية
 SearchIntoProjects=مشاريع
 SearchIntoMO=أوامر التصنيع
 SearchIntoTasks=المهام
@@ -1061,7 +1063,7 @@ YouAreCurrentlyInSandboxMode=أنت حاليًا في وضع %s "sandbox"
 Inventory=المخزون
 AnalyticCode=الكود التحليلي
 TMenuMRP=تخطيط موارد التصنيع
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=عرض معلومات الشركة
 ShowMoreInfos=إظهار المزيد من المعلومات
 NoFilesUploadedYet=الرجاء رفع الوثيقة أولا
 SeePrivateNote=مشاهدة ملاحظة خاصة
@@ -1126,6 +1128,7 @@ Civility=Civility
 AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+CategTypeNotFound=لا يوجد ملصق لنوع السجل
+CopiedToClipboard=تم النسخ الى الحافظة
+InformationOnLinkToContract=هذا المبلغ هو مجموع بنود العقد . دون مراعاة قيمة الزمن
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index 343db0da8b5..ecb209b3f8b 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=عضو آخر (الاسم : <b>٪ ق<
 ErrorUserPermissionAllowsToLinksToItselfOnly=لأسباب أمنية ، يجب أن تمنح أذونات لتحرير جميع المستخدمين لتكون قادرة على ربط عضو لمستخدم هذا ليس لك.
 SetLinkToUser=وصلة إلى مستخدم Dolibarr
 SetLinkToThirdParty=وصلة إلى طرف ثالث Dolibarr
-MembersCards=أعضاء طباعة البطاقات
+MembersCards=Business cards for members
 MembersList=قائمة الأعضاء
 MembersListToValid=قائمة مشاريع أعضاء (ينبغي التأكد من صحة)
 MembersListValid=قائمة أعضاء صالحة
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=أعضاء مع اشتراك لتلقي
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=تاريخ الاكتتاب
 DateEndSubscription=تاريخ انتهاء الاكتتاب
-EndSubscription=انتهاء الاكتتاب
+EndSubscription=Subscription Ends
 SubscriptionId=الاكتتاب معرف
 WithoutSubscription=Without subscription
 MemberId=عضو المعرف
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=الاشتراك المطلوب
 DeleteType=حذف
 VoteAllowed=يسمح التصويت
-Physical=المادية
-Moral=الأخلاقية
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=أعضاء إحصاءات حسب البلد
 MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاطعة
 MembersStatisticsByTown=أعضاء إحصاءات بلدة
 MembersStatisticsByRegion=إحصائيات الأعضاء حسب المنطقة
-NbOfMembers=عدد الأعضاء
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=العثور على أي أعضاء التحقق من صحة
-MembersByCountryDesc=هذه الشاشة تظهر لك إحصاءات عن أعضاء من الدول. لكن الرسم يعتمد على خدمة غوغل الرسم البياني على الإنترنت ويتوفر فقط إذا كان على اتصال بالإنترنت ويعمل.
-MembersByStateDesc=هذه الشاشة تظهر لك إحصاءات عن أفراد من قبل الدولة / المحافظات / كانتون.
-MembersByTownDesc=هذه الشاشة تظهر لك إحصاءات عن أفراد من البلدة.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=اختيار الإحصاءات التي ترغب في قراءتها ...
 MenuMembersStats=إحصائيات
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=معلومات علنية
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=وأضاف عضو جديد. تنتظر الموافقة
 NewMemberForm=الأعضاء الجدد في شكل
-SubscriptionsStatistics=إحصاءات عن الاشتراكات
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=عدد الاشتراكات
-AmountOfSubscriptions=حجم الاشتراكات
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=دوران (لشركة) أو الميزانية (على أساس)
 DefaultAmount=المبلغ الافتراضي للاكتتاب
 CanEditAmount=يمكن للزائر اختيار / تحرير كمية من اكتتابها
 MEMBER_NEWFORM_PAYONLINE=القفز على صفحة الدفع عبر الانترنت المتكاملة
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=هذه الشاشة تظهر لك إحصاءات عن أعضاء من الطبيعة.
-MembersByRegion=هذه الشاشة تظهر لك إحصاءات عن أعضاء حسب المنطقة.
 VATToUseForSubscriptions=معدل ضريبة القيمة المضافة لاستخدامه في اشتراكات
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=المنتج يستخدم لخط الاشتراك في فاتورة و:٪ الصورة
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index 19afb9d95ab..a430c605f45 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -19,7 +19,7 @@ ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by
 ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDescwidgets=علامة التبويب هذه مخصصة لبناء\\إدارة البريمجات
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
 EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
 EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
@@ -60,7 +60,7 @@ TriggersFile=File for triggers code
 HooksFile=File for hooks code
 ArrayOfKeyValues=Array of key-val
 ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
+WidgetFile=ملف بريمج
 CSSFile=CSS file
 JSFile=Javascript file
 ReadmeFile=Readme file
@@ -77,7 +77,7 @@ UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asci
 IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
-NoWidget=No widget
+NoWidget=لا يوجد بريمج
 GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
@@ -116,7 +116,7 @@ UseSpecificReadme=Use a specific ReadMe
 ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
 RealPathOfModule=Real path of module
 ContentCantBeEmpty=Content of file can't be empty
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+WidgetDesc=هنا يمكنك توليد وتعديل البريمجات التي ستضمن مع وحدتك البرمجية
 CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
 JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
 CLIDesc=You can generate here some command line scripts you want to provide with your module.
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index ceca65f3dae..7d4928f2519 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>الأستاذ عيد ٪ ق</b> هي المعلومات التي تعتمد على طرف ثالث. <br> على سبيل المثال ، لبلد <b>ق ٪</b> انها رمز <b>٪ ق.</b>
 DolibarrDemo=Dolibarr تخطيط موارد المؤسسات وإدارة علاقات العملاء التجريبي
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/ar_SA/partnership.lang b/htdocs/langs/ar_SA/partnership.lang
new file mode 100644
index 00000000000..e564bce07c2
--- /dev/null
+++ b/htdocs/langs/ar_SA/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = إدارة الشراكة
+PartnershipDescription = وحدة إدارة الشراكة
+PartnershipDescriptionLong= وحدة إدارة الشراكة
+
+#
+# Menu
+#
+NewPartnership = شراكة جديدة
+ListOfPartnerships = قائمة الشراكات
+
+#
+# Admin page
+#
+PartnershipSetup = إعدادات الشراكة
+PartnershipAbout = حول الشراكة
+PartnershipAboutPage = صفحة حول الشراكة 
+
+
+#
+# Object
+#
+DatePartnershipStart=تاريخ البدء
+DatePartnershipEnd=تاريخ الانتهاء
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = حوالة مصرفية
+PartnershipAccepted = قبلت
+PartnershipRefused = رفض
+PartnershipCanceled = ملغي
+
+PartnershipManagedFor=الشركاء هم
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
index e7226260a14..5c01404e42f 100644
--- a/htdocs/langs/ar_SA/productbatch.lang
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 233bd0fef15..9632cb061db 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Services for sale only
 ServicesOnPurchaseOnly=Services for purchase only
 ServicesNotOnSell=خدمات ليست للبيع ولا الشراء
 ServicesOnSellAndOnBuy=خدمات للبيع والشراء
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=المنتج
@@ -73,12 +73,12 @@ SellingPrice=سعر البيع
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=سعر البيع (شامل الضريبية)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=السعر الجديد
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=سعر البيع لا يمكن أن يكون أقل من الحد الأدنى المسموح لهذا المنتج (٪ ق بدون الضرائب)
 ContractStatusClosed=مغلق
@@ -157,11 +157,11 @@ ListServiceByPopularity=قائمة الخدمات بحسب الشهرة
 Finished=المنتجات المصنعة
 RowMaterial=المادة الخام
 ConfirmCloneProduct=هل انت متأكد انك ترغب في استنساخ المنتج/الخدمة <b>%s</b>؟
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=هذا المنتج يتم استخدامة
 NewRefForClone=مرجع. المنتج/ الخدمة الجديدة 
 SellingPrices=أسعار بيع
@@ -170,12 +170,12 @@ CustomerPrices=أسعار العميل
 SuppliersPrices=أسعار المورد
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=بلد المنشأ
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=التسمية قصيرة
 Unit=وحدة
 p=ش.
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index a6f5248b5b0..a2305967521 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=مشروع اتصالات
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=جميع المشاريع
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=هذا الرأي يعرض جميع المشاريع ويسمح لك قراءة.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=يمثل هذا العرض جميع المشاريع والمهام يسمح لك للقراءة.
 ProjectsDesc=ويعرض هذا الرأي جميع المشاريع (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=المشاريع المفتوحة فقط مرئية (المشاريع في مشروع أو وضع مغلقة غير مرئية).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=هذا الرأي يعرض جميع المشاريع والمهام ويسمح لك قراءة.
 TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=مشروع جديد
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=تعيين مهمة بالنسبة لي
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=عين
diff --git a/htdocs/langs/ar_SA/recruitment.lang b/htdocs/langs/ar_SA/recruitment.lang
index 43d1e0fbc55..d7464982228 100644
--- a/htdocs/langs/ar_SA/recruitment.lang
+++ b/htdocs/langs/ar_SA/recruitment.lang
@@ -26,7 +26,7 @@ ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job posi
 # Admin page
 #
 RecruitmentSetup = Recruitment setup
-Settings = Settings
+Settings = إعدادات
 RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
 RecruitmentArea=Recruitement area
 PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
@@ -45,7 +45,7 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job position
+PositionToBeFilled=الوظيفه
 PositionsToBeFilled=Job positions
 ListOfPositionsToBeFilled=List of job positions
 NewPositionToBeFilled=New job positions
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
index b18d5eb4842..e9a5af05463 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Mérou A5 نموذج
 WarningNoQtyLeftToSend=تحذير ، لا تنتظر أن المنتجات المشحونة.
-StatsOnShipmentsOnlyValidated=الإحصاءات التي أجريت على شحنات التحقق من صحة فقط. التاريخ الذي يستخدم هو تاريخ المصادقة على شحنة (تاريخ التسليم مسوى لا يعرف دائما).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=التاريخ المحدد للتسليم
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/ar_SA/sms.lang b/htdocs/langs/ar_SA/sms.lang
index 779fe96fa82..7e116d24879 100644
--- a/htdocs/langs/ar_SA/sms.lang
+++ b/htdocs/langs/ar_SA/sms.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - sms
-Sms=SMS
-SmsSetup=SMS الإعداد
-SmsDesc=هذه الصفحة يسمح لك لتحديد الخيارات غلوبالس على ميزات SMS
-SmsCard=SMS بطاقة
-AllSms=جميع الرسائل القصيرة campains
+Sms=الرسائل النصية القصيرة
+SmsSetup=إعدادات الرسائل النصية القصيرة
+SmsDesc=هذه الصفحة تمكنك من تعريف الخيارات العامة للرسائل النصية القصيرة
+SmsCard=بطاقة الرسائل النصية القصيرة 
+AllSms=جميع حملات الرسائل النصية القصيرة
 SmsTargets=الأهداف
 SmsRecipients=الأهداف
 SmsRecipient=الهدف
@@ -13,20 +13,20 @@ SmsTo=الهدف
 SmsTopic=موضوع الرسائل القصيرة SMS
 SmsText=رسالة
 SmsMessage=رسالة SMS
-ShowSms=عرض الرسائل القصيرة
-ListOfSms=قائمة SMS campains
-NewSms=جديد SMS campain
-EditSms=تحرير الرسائل القصيرة
+ShowSms=Show SMS
+ListOfSms=List SMS campaigns
+NewSms=New SMS campaign
+EditSms=Edit SMS
 ResetSms=جديد إرسال
-DeleteSms=حذف الرسائل القصيرة campain
-DeleteASms=إزالة campain الرسائل القصيرة
-PreviewSms=Previuw الرسائل القصيرة
-PrepareSms=إعداد الرسائل القصيرة
-CreateSms=SMS إنشاء
-SmsResult=نتيجة لإرسال الرسائل القصيرة
-TestSms=اختبار الرسائل القصيرة
-ValidSms=التحقق من صحة الرسائل القصيرة
-ApproveSms=الموافقة على الرسائل القصيرة
+DeleteSms=Delete SMS campaign
+DeleteASms=Remove a SMS campaign
+PreviewSms=Previuw SMS
+PrepareSms=Prepare SMS
+CreateSms=Create SMS
+SmsResult=Result of SMS sending
+TestSms=Test SMS
+ValidSms=Validate SMS
+ApproveSms=Approve SMS
 SmsStatusDraft=مسودة
 SmsStatusValidated=التحقق من صحة
 SmsStatusApproved=وافق
@@ -35,16 +35,16 @@ SmsStatusSentPartialy=أرسلت جزئيا
 SmsStatusSentCompletely=أرسلت تماما
 SmsStatusError=خطأ
 SmsStatusNotSent=لم يرسل
-SmsSuccessfulySent=الرسائل القصيرة المرسلة بشكل صحيح (من %s إلى %s)
+SmsSuccessfulySent=SMS correctly sent (from %s to %s)
 ErrorSmsRecipientIsEmpty=عدد من الهدف فارغة
 WarningNoSmsAdded=لا رقم هاتف جديدا يضاف إلى قائمة المستهدفين
-ConfirmValidSms=Do you confirm validation of this campain?
-NbOfUniqueSms=ملحوظة: أرقام شعبة الشؤون المالية هاتف فريد من نوعه
-NbOfSms=Nbre من أرقام فون
+ConfirmValidSms=Do you confirm validation of this campaign?
+NbOfUniqueSms=No. of unique phone numbers
+NbOfSms=No. of phone numbers
 ThisIsATestMessage=هذه هي رسالة اختبار
 SendSms=ارسال الرسائل القصيرة
-SmsInfoCharRemain=ملحوظة من الأحرف المتبقية
-SmsInfoNumero= (تنسيق دولي أي: +33899701761)
+SmsInfoCharRemain=No. of remaining characters
+SmsInfoNumero= (international format i.e.: +33899701761)
 DelayBeforeSending=تأخير قبل إرسال (دقائق)
 SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
 SmsNoPossibleRecipientFound=لا هدف متاح. تحقق الإعداد من مزود خدمات الرسائل القصيرة.
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 1a09a888ada..6b7e98f782d 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=لا توجد منتجات محددة سلفا ل
 DispatchVerb=إيفاد
 StockLimitShort=الحد الأقصى لتنبيه
 StockLimit=حد الأسهم للتنبيه
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=الحقيقية للاسهم
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index bed6554cf2f..bf5dfb8c425 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=تغيير كلمة السر : ٪ ق
 SubjectNewPassword=Your new password for %s
 GroupRights=مجموعة الاذونات
 UserRights=أذونات المستخدم
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=يعطل
 DisableAUser=تعطيل المستخدم
@@ -105,7 +106,7 @@ UseTypeFieldToChange=استخدام نوع الحقل لتغيير
 OpenIDURL=URL هوية OpenID
 LoginUsingOpenID=استخدام هوية OpenID للدخول
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=اللون المستخدم
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index e68b7898ca8..76471f88558 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/ar_SA/workflow.lang b/htdocs/langs/ar_SA/workflow.lang
index a01d11731e2..d8b35f8cfe8 100644
--- a/htdocs/langs/ar_SA/workflow.lang
+++ b/htdocs/langs/ar_SA/workflow.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=إعداد وحدة تدفق العمل
-WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+WorkflowDesc=هذه الوحدة توفر بعض الاجراءات التلقائية . في البداية يكون تدفق العمل مفتوحاً (يمكنك ان تعمل بالترتيب الذي تريد) لكن هنا يمكنك تفعيل بعض الجراءات التلقائية
 ThereIsNoWorkflowToModify=لا توجد تعديلات على سير العمل متوفرة مع الوحدات النشطة.
 # Autocreate
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
diff --git a/htdocs/langs/ar_SA/zapier.lang b/htdocs/langs/ar_SA/zapier.lang
index b4cc4ccba4a..f6f5cb67207 100644
--- a/htdocs/langs/ar_SA/zapier.lang
+++ b/htdocs/langs/ar_SA/zapier.lang
@@ -13,9 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ModuleZapierForDolibarrName = Zapier for Dolibarr
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
-ZapierDescription=Interface with Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ModuleZapierForDolibarrName = زابيا لدوليبار
+ModuleZapierForDolibarrDesc = وحدة زابيا لدوليبار
+ZapierForDolibarrSetup=إعدادات زابيا لدوليبار
+ZapierDescription=الربط مع زابيا
+ZapierAbout=عن وحدة زابيا
+ZapierSetupPage=لا حاجة للاعدادات من جانب دوليبار لاستخدام زابيا على دوليبار.\nلكن، لابد من إنشاء حزمة على جانب زابيا لاستخدام زابيا على دوليبار. راجع التوثيق <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">على هذه الصفحة</a>
diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/az_AZ/accountancy.lang
+++ b/htdocs/langs/az_AZ/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/az_AZ/banks.lang b/htdocs/langs/az_AZ/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/az_AZ/banks.lang
+++ b/htdocs/langs/az_AZ/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/az_AZ/bills.lang b/htdocs/langs/az_AZ/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/az_AZ/bills.lang
+++ b/htdocs/langs/az_AZ/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/az_AZ/boxes.lang b/htdocs/langs/az_AZ/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/az_AZ/boxes.lang
+++ b/htdocs/langs/az_AZ/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/az_AZ/cashdesk.lang b/htdocs/langs/az_AZ/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/az_AZ/cashdesk.lang
+++ b/htdocs/langs/az_AZ/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/az_AZ/categories.lang b/htdocs/langs/az_AZ/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/az_AZ/categories.lang
+++ b/htdocs/langs/az_AZ/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/az_AZ/companies.lang b/htdocs/langs/az_AZ/companies.lang
index 154400c6536..fbe75f09ab0 100644
--- a/htdocs/langs/az_AZ/companies.lang
+++ b/htdocs/langs/az_AZ/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/az_AZ/compta.lang b/htdocs/langs/az_AZ/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/az_AZ/compta.lang
+++ b/htdocs/langs/az_AZ/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/az_AZ/ecm.lang b/htdocs/langs/az_AZ/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/az_AZ/ecm.lang
+++ b/htdocs/langs/az_AZ/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/az_AZ/errors.lang
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/az_AZ/eventorganization.lang b/htdocs/langs/az_AZ/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/az_AZ/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/az_AZ/knowledgemanagement.lang b/htdocs/langs/az_AZ/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/az_AZ/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/az_AZ/mails.lang b/htdocs/langs/az_AZ/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/az_AZ/mails.lang
+++ b/htdocs/langs/az_AZ/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
index dc2a83f2015..13793aad13f 100644
--- a/htdocs/langs/az_AZ/main.lang
+++ b/htdocs/langs/az_AZ/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/az_AZ/members.lang b/htdocs/langs/az_AZ/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/az_AZ/members.lang
+++ b/htdocs/langs/az_AZ/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/az_AZ/modulebuilder.lang b/htdocs/langs/az_AZ/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/az_AZ/modulebuilder.lang
+++ b/htdocs/langs/az_AZ/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/az_AZ/other.lang b/htdocs/langs/az_AZ/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/az_AZ/other.lang
+++ b/htdocs/langs/az_AZ/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/az_AZ/partnership.lang b/htdocs/langs/az_AZ/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/az_AZ/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/az_AZ/productbatch.lang b/htdocs/langs/az_AZ/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/az_AZ/productbatch.lang
+++ b/htdocs/langs/az_AZ/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/az_AZ/products.lang
+++ b/htdocs/langs/az_AZ/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/az_AZ/projects.lang b/htdocs/langs/az_AZ/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/az_AZ/projects.lang
+++ b/htdocs/langs/az_AZ/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/az_AZ/recruitment.lang b/htdocs/langs/az_AZ/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/az_AZ/recruitment.lang
+++ b/htdocs/langs/az_AZ/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/az_AZ/sendings.lang b/htdocs/langs/az_AZ/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/az_AZ/sendings.lang
+++ b/htdocs/langs/az_AZ/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/az_AZ/stocks.lang b/htdocs/langs/az_AZ/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/az_AZ/stocks.lang
+++ b/htdocs/langs/az_AZ/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/az_AZ/users.lang b/htdocs/langs/az_AZ/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/az_AZ/users.lang
+++ b/htdocs/langs/az_AZ/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/az_AZ/website.lang b/htdocs/langs/az_AZ/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/az_AZ/website.lang
+++ b/htdocs/langs/az_AZ/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index cd10cec3aae..8d5723bf0e8 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Референция
 LabelAccount=Име на сметка
 LabelOperation=Име на операция
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Буквен код
 Lettering=Означение
 Codejournal=Журнал
@@ -297,7 +297,7 @@ NoNewRecordSaved=Няма повече записи за осчетоводяв
 ListOfProductsWithoutAccountingAccount=Списък на продукти, които не са свързани с нито една счетоводна сметка
 ChangeBinding=Промяна на свързване
 Accounted=Осчетоводено в книгата
-NotYetAccounted=Все още не е осчетоводено в книгата
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Показване на урок
 NotReconciled=Не е съгласувано
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 049f85e0287..80fdece280d 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Премахнете / преименувайте файла <b>%s</b
 RestoreLock=Възстановете файла <b>%s</b> с права само за четене, за да забраните по-нататъшното използване на инструмента за инсталиране / актуализиране.
 SecuritySetup=Настройки на сигурността
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Дефинирайте тук параметрите, свързани със сигурността, относно качването на файлове.
 ErrorModuleRequirePHPVersion=Грешка, този модул изисква PHP версия %s или по-висока.
 ErrorModuleRequireDolibarrVersion=Грешка, този модул изисква Dolibarr версия %s или по-висока.
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Да не се предлага
 NoActiveBankAccountDefined=Няма дефинирана активна банкова сметка
 OwnerOfBankAccount=Титуляр на банкова сметка %s
 BankModuleNotActive=Модулът за банкови сметки не е активиран
-ShowBugTrackLink=Показване на връзка "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Сигнали
 DelaysOfToleranceBeforeWarning=Закъснение преди показване на предупредителен сигнал за:
 DelaysOfToleranceDesc=Задаване на закъснение, преди на екрана да се покаже иконата за предупреждение %s за закъснелия елемент.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Трябва да изпълн
 YourPHPDoesNotHaveSSLSupport=SSL функциите не са налични във вашия PHP
 DownloadMoreSkins=Изтегляне на повече теми
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Показване на идентификационни данни в полетата с адреси
 ShowVATIntaInAddress=Скриване на вътрешнообщностния номер по ДДС в полетата с адреси
 TranslationUncomplete=Частичен превод
@@ -2062,7 +2064,7 @@ UseDebugBar=Използване на инструменти за отстран
 DEBUGBAR_LOGS_LINES_NUMBER=Брой последни редове на журнал, които да се пазят в конзолата
 WarningValueHigherSlowsDramaticalyOutput=Внимание, по-високите стойности забавят драматично производителността
 ModuleActivated=Модул %s е активиран и забавя интерфейса
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index f23019f31c0..e6676b540bb 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Плащане на социални / фискалн
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Вътрешен превод
-TransferDesc=При прехвърляне от една сметка в друга, Dolibarr ще направи два записа (дебит от сметката на източника и кредит в целевата сметка). За тази транзакция ще се използва (с изключение на подписа) същата сума, име и дата.
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=От
 TransferTo=За
 TransferFromToDone=Прехвърлянето от <b>%s</b> към <b>%s</b> на <b>%s</b> %s беше записано.
-CheckTransmitter=Наредител
+CheckTransmitter=Подател
 ValidateCheckReceipt=Валидиране на тази чекова разписка?
-ConfirmValidateCheckReceipt=Сигурни ли сте, че искате да валидирате тази чекова разписка, няма да е възможна промяна след като това бъде направено?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Изтриване на тази чекова разписка?
 ConfirmDeleteCheckReceipt=Сигурни ли сте, че искате да изтриете тази чекова разписка?
 BankChecks=Банкови чекове
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Сигурни ли сте, че искате да из
 ThisWillAlsoDeleteBankRecord=Това ще изтрие и генерираната банкова транзакция
 BankMovements=Движения
 PlannedTransactions=Планирани транзакции
-Graph=Графики
+Graph=Graphs
 ExportDataset_banque_1=Банкови транзакции и извлечение по сметка
 ExportDataset_banque_2=Депозитна разписка
 TransactionOnTheOtherAccount=Транзакции по друга сметка
@@ -142,7 +142,7 @@ AllAccounts=Всички банкови и касови сметки
 BackToAccount=Обратно към сметка
 ShowAllAccounts=Показване на всички сметки
 FutureTransaction=Бъдеща транзакция. Не може да се съгласува.
-SelectChequeTransactionAndGenerate=Изберете / Филтрирайте чековете, които да включите в депозитна разписка и кликнете върху "Създаване".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Изберете банковото извлечение, свързано със съгласуването. Използвайте числова стойност, която е във вида: YYYYMM или YYYYMMDD
 EventualyAddCategory=В крайна сметка, определете категория, в която да класифицирате транзакциите
 ToConciliate=Да се съгласува ли?
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index 01cb523006a..2933e5264e4 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Превръщане на платения излишъ
 EnterPaymentReceivedFromCustomer=Въведете плащане, получено от клиент
 EnterPaymentDueToCustomer=Извършване на плащане от клиента
 DisabledBecauseRemainderToPayIsZero=Деактивирано, тъй като остатъка за плащане е нула
-PriceBase=Базова цена
+PriceBase=Base price
 BillStatus=Статус на фактура
 StatusOfGeneratedInvoices=Състояние на генерираните фактури
 BillStatusDraft=Чернова (трябва да се валидира)
@@ -454,7 +454,7 @@ RegulatedOn=Регламентирано на
 ChequeNumber=Чек №
 ChequeOrTransferNumber=Чек / Трансфер №
 ChequeBordereau=Чеково нареждане
-ChequeMaker=Издател на чек / трансфер
+ChequeMaker=Check/Transfer sender
 ChequeBank=Банка - платец
 CheckBank=Чек
 NetToBePaid=Нето за плащане
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index 4b78b60d66e..0d3c7068949 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Отметки: %s последни
 BoxOldestExpiredServices=Най-стари изтекли активни услуги
 BoxLastExpiredServices=Договори: %s най-стари договори с активни изтекли услуги
 BoxTitleLastActionsToDo=Действия: %s последни за извършване
-BoxTitleLastContracts=Договори: %s последно променени
-BoxTitleLastModifiedDonations=Дарения: %s последно променени
-BoxTitleLastModifiedExpenses=Разходни отчети: %s последно променени
-BoxTitleLatestModifiedBoms=Спецификации: %s последно променени
-BoxTitleLatestModifiedMos=Поръчки за производство: %s последно променени
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Глобална дейност (фактури, предложения, поръчки)
 BoxGoodCustomers=Добри клиенти
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index a7d3530d1e3..84872e797c1 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Добавяне на таблица
 Place=Място
 TakeposConnectorNecesary=Изисква се 'TakePOS конектор'
-OrderPrinters=Принтери за поръчки
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Търсене на продукт
 Receipt=Разписка
 Header=Хедър
@@ -56,8 +57,9 @@ Paymentnumpad=Тип Pad за въвеждане на плащане
 Numberspad=Числов Pad
 BillsCoinsPad=Pad за монети и банкноти
 DolistorePosCategory=TakePOS модули и други ПОС решения за Dolibarr
-TakeposNeedsCategories=TakePOS се нуждае от продуктови категории, за да работи
-OrderNotes=Бележки за поръчка
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Сметка по подразбиране, която да се използва за плащания с
 NoPaimementModesDefined=В конфигурацията на TakePOS не е определен тип на плащане
 TicketVatGrouped=Групиране на ДДС по ставка в етикети / разписки
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Фактурата вече е валидирана
 NoLinesToBill=Няма редове за фактуриране
 CustomReceipt=Персонализирана разписка
 ReceiptName=Име на разписка
-ProductSupplements=Продуктови добавки
+ProductSupplements=Manage supplements of products
 SupplementCategory=Категория добавки
 ColorTheme=Цветна тема
 Colorful=Цветно
@@ -92,7 +94,7 @@ Browser=Браузър
 BrowserMethodDescription=Прост и лесен отпечатване на разписки. Само няколко параметъра за конфигуриране на разписката. Отпечатване, чрез браузър.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Метод на отпечатване
-ReceiptPrinterMethodDescription=Мощен метод с много параметри. Пълно персонализиране с шаблони. Не може да отпечатва от облака.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=По терминал
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index 4c3ac637eb4..8ae2951cb4b 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Таг / Категория
 Rubriques=Тагове / Категории
 RubriquesTransactions=Тагове / Категории транзакции
 categories=тагове / категории
-NoCategoryYet=Няма създаден таг / категория от този тип
+NoCategoryYet=No tag/category of this type has been created
 In=в
 AddIn=Добавяне в
 modify=променяне
 Classify=Класифициране
 CategoriesArea=Секция с тагове / категории
-ProductsCategoriesArea=Секция с тагове / категории за продукти / услуги
-SuppliersCategoriesArea=Секция с тагове / категории за доставчици
-CustomersCategoriesArea=Секция с тагове / категории за клиенти
-MembersCategoriesArea=Секция с тагове / категории за членове
-ContactsCategoriesArea=Секция с тагове / категории за контакти
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Секция с тагове / категории за проекти
-UsersCategoriesArea=Секция с тагове / категории за потребители
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Подкатегории
 CatList=Списък с тагове / категории
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Избиране на категория
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Използване или оператор за категории
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 81d317bd321..41acbff3527 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Името на фирмата %s вече съществува. Изберете друго.
 ErrorSetACountryFirst=Първо изберете държава
 SelectThirdParty=Изберете контрагент
-ConfirmDeleteCompany=Сигурни ли сте че искате да изтриете този контрагент и цялата наследена информация?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Изтриване на контакт / адрес
-ConfirmDeleteContact=Сигурни ли сте че искате да изтриете този контакт и цялата наследена информация?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Нов контрагент
 MenuNewCustomer=Нов клиент
 MenuNewProspect=Нов потенциален клиент
@@ -69,7 +69,7 @@ PhoneShort=Тел.
 Skype=Skype
 Call=Позвъни на
 Chat=Чат с
-PhonePro=Сл. телефон
+PhonePro=Bus. phone
 PhonePerso=Дом. телефон
 PhoneMobile=Моб. телефон
 No_Email=Отхвърляне на масови имейли
@@ -331,7 +331,7 @@ CustomerCodeDesc=Код на клиент, уникален за всички к
 SupplierCodeDesc=Код на доставчик, уникален за всички доставчици
 RequiredIfCustomer=Изисква се, ако контрагентът е клиент или потенциален клиент
 RequiredIfSupplier=Изисква се, ако контрагента е доставчик
-ValidityControledByModule=Валидност, контролирана от модул
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Правила за този модул
 ProspectToContact=Потенциален клиент за контакт
 CompanyDeleted=Фирма "%s" е изтрита от базата данни.
@@ -439,12 +439,12 @@ ListSuppliersShort=Списък на доставчици
 ListProspectsShort=Списък на потенциални клиенти
 ListCustomersShort=Списък на клиенти
 ThirdPartiesArea=Секция с контрагенти и контакти
-LastModifiedThirdParties=Контрагенти: %s последно променени
-UniqueThirdParties=Общ брой контрагенти
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Активен
 ActivityCeased=Неактивен
 ThirdPartyIsClosed=Контрагента е деактивиран
-ProductsIntoElements=Списък на продукти / услуги в %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Текуща неизплатена сметка
 OutstandingBill=Максимална неизплатена сметка
 OutstandingBillReached=Достигнат е максимумът за неизплатена сметка
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Кодът е свободен. Този код може
 ManagingDirectors=Име на управител (изпълнителен директор, директор, президент...)
 MergeOriginThirdparty=Дублиращ контрагент (контрагентът, който искате да изтриете)
 MergeThirdparties=Обединяване на контрагенти
-ConfirmMergeThirdparties=Сигурни ли сте, че искате да обедините този контрагент с текущия? Всички свързани обекти (фактури, поръчки, ...) ще бъдат преместени в текущия контрагент, след което контрагента ще бъде изтрит.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Контрагентите са обединени
 SaleRepresentativeLogin=Входна информация за търговски представител
 SaleRepresentativeFirstname=Собствено име на търговския представител
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index b07de8ea9fd..fcb986aed2f 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Нова отстъпка
 NewCheckDeposit=Нов чеков депозит
 NewCheckDepositOn=Създаване на разписка за депозит по сметка: %s
 NoWaitingChecks=Няма чекове, които да очакват депозит.
-DateChequeReceived=Дата на приемане на чек
+DateChequeReceived=Check receiving date
 NbOfCheques=Брой чекове
 PaySocialContribution=Плащане на социален / фискален данък
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/bg_BG/ecm.lang b/htdocs/langs/bg_BG/ecm.lang
index 79ccce411d2..89504a25676 100644
--- a/htdocs/langs/bg_BG/ecm.lang
+++ b/htdocs/langs/bg_BG/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index f70abe8e9ba..183b517323b 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Няма грешка, но се ангажираме.
 # Errors
 ErrorButCommitIsDone=Намерени са грешки, но ние валидираме въпреки това.
-ErrorBadEMail=Имейл %s е грешен
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=URL адрес %s е грешен
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Неправилна стойност за вашия параметър. Обикновено се добавя, когато преводът липсва.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Потребител %s вече съществува.
@@ -46,8 +46,8 @@ ErrorWrongDate=Датата не е правилна!
 ErrorFailedToWriteInDir=Неуспешно записване в директория %s
 ErrorFoundBadEmailInFile=Открит е неправилен имейл синтаксис в %s реда на файла (примерен ред %s с имейл=%s)
 ErrorUserCannotBeDelete=Потребителят не може да бъде изтрит. Може би е свързан с обекти в Dolibarr.
-ErrorFieldsRequired=Някои задължителни полета не са попълнени.
-ErrorSubjectIsRequired=Необходима е тема на имейл
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Неуспешно създаване на директория. Уверете се, че уеб сървър потребител има разрешение да пишат в Dolibarr документи. Ако параметър <b>safe_mode</b> е разрешен в тази PHP, проверете дали Dolibarr PHP файлове притежава за потребителя на уеб сървъра (или група).
 ErrorNoMailDefinedForThisUser=Няма дефиниран имейл за този потребител
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Страницата/контейне
 ErrorDuringChartLoad=Грешка при зареждане на диаграмата на сметките. Ако някои сметки не са заредени, може да ги въведете ръчно.
 ErrorBadSyntaxForParamKeyForContent=Неправилен синтаксис за параметър keyforcontent. Трябва да има стойност, започваща с %s или %s
 ErrorVariableKeyForContentMustBeSet=Грешка, трябва да бъде зададена константа с име %s (с текстово съдържание за показване) или %s (с външен url за показване).
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL адресът %s трябва да започва с http:// или https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Грешка, новата референция вече е използвана
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/bg_BG/eventorganization.lang b/htdocs/langs/bg_BG/eventorganization.lang
new file mode 100644
index 00000000000..2b711234122
--- /dev/null
+++ b/htdocs/langs/bg_BG/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Настройки
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Чернова
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Завършено
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/bg_BG/knowledgemanagement.lang b/htdocs/langs/bg_BG/knowledgemanagement.lang
new file mode 100644
index 00000000000..9bbff8be3b4
--- /dev/null
+++ b/htdocs/langs/bg_BG/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Настройки
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Относно
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Артикул
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 87d5e252581..17867c701c8 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=До потребител (и)
 MailCC=Копие до
 MailToCCUsers=Копие до потребител (и)
 MailCCC=Скрито копие до
-MailTopic=Тема на имейла
+MailTopic=Email subject
 MailText=Съобщение
 MailFile=Прикачени файлове
 MailMessage=Тяло на имейла
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Конфигурацията за изпращане на имейл е настроена на '%s'. Този режим не може да се използва за изпращане на масови имейли.
 MailSendSetupIs2=Трябва първо да отидете с администраторски акаунт в меню %sНачало - Настройка - Имейли%s и да промените параметър <strong>'%s'</strong>, за да използвате режим '%s'. С този режим може да въведете настройки за SMTP сървъра, предоставен от вашия доставчик на интернет услуги и да използвате функцията за изпращане на масови имейли.
 MailSendSetupIs3=Ако имате някакви въпроси как да настроите вашия SMTP сървър, може да се обърнете към %s.
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 6dddb3abc1e..8b8fb5c5add 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Съхраняване и създаване
 TestConnection=Проверяване на връзката
 ToClone=Клониране
 ConfirmCloneAsk=Сигурни ли сте, че искате да клонирате обект <b>%s</b>?
-ConfirmClone=Изберете данни, които искате да клонирате:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Няма определени данни за клониране.
 Of=на
 Go=Давай
@@ -246,7 +246,7 @@ DefaultModel=Шаблон на документ по подразбиране
 Action=Събитие
 About=Относно
 Number=Брой
-NumberByMonth=Брой на месец
+NumberByMonth=Total reports by month
 AmountByMonth=Сума на месец
 Numero=Брой
 Limit=Лимит
@@ -341,8 +341,8 @@ KiloBytes=Килобайта
 MegaBytes=Мегабайта
 GigaBytes=Гигабайта
 TeraBytes=Терабайта
-UserAuthor=Потребител на създаването
-UserModif=Потребител на последната актуализация
+UserAuthor=Ceated by
+UserModif=Updated by
 b=б.
 Kb=Кб
 Mb=Мб
@@ -503,9 +503,11 @@ By=От
 From=От
 FromDate=От
 FromLocation=От
-at=at
 to=за
 To=за
+ToDate=за
+ToLocation=за
+at=at
 and=и
 or=или
 Other=Друг
@@ -843,7 +845,7 @@ XMoreLines=%s ред(а) е(са) скрит(и)
 ShowMoreLines=Показване на повече / по-малко редове
 PublicUrl=Публичен URL
 AddBox=Добавяне на кутия
-SelectElementAndClick=Изберете елемент и кликнете върху %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Печат на файл %s
 ShowTransaction=Показване на запис на банкова сметка
 ShowIntervention=Показване на интервенция
@@ -854,8 +856,8 @@ Denied=Отхвърлено
 ListOf=Списък на %s
 ListOfTemplates=Списък с шаблони
 Gender=Пол
-Genderman=Мъж
-Genderwoman=Жена
+Genderman=Male
+Genderwoman=Female
 Genderother=Други
 ViewList=Списъчен изглед
 ViewGantt=Gantt изглед
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index f74329e9e8d..8b026d2e1e0 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Друг член (име: <b>%s</b>,
 ErrorUserPermissionAllowsToLinksToItselfOnly=От съображения за сигурност трябва да имате права за променяне на всички потребители, за да може да свържете член с потребител, който не сте вие.
 SetLinkToUser=Свързване към Dolibarr потребител
 SetLinkToThirdParty=Свързване към Dolibarr контрагент
-MembersCards=Визитни картички на членове
+MembersCards=Business cards for members
 MembersList=Списък на членове
 MembersListToValid=Списък на чернови членове (за валидиране)
 MembersListValid=Списък на валидирани членове
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Членове с абонамент за по
 MembersWithSubscriptionToReceiveShort=Абонамент за получаване
 DateSubscription=Дата на абонамент
 DateEndSubscription=Крайна дата на абонамент
-EndSubscription=Край на абонамент
+EndSubscription=Subscription Ends
 SubscriptionId=Идентификатор на абонамент
 WithoutSubscription=Without subscription
 MemberId=Идентификатор на член
@@ -83,10 +83,10 @@ WelcomeEMail=Приветстващ имейл
 SubscriptionRequired=Изисква се абонамент
 DeleteType=Изтриване
 VoteAllowed=Може да гласува
-Physical=Реален
-Moral=Морален
-MorAndPhy=Moral and Physical
-Reenable=Повторно активиране
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Деактивиране на член
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Статистика за членове по дъ
 MembersStatisticsByState=Статистика за членове по област
 MembersStatisticsByTown=Статистика за членове по град
 MembersStatisticsByRegion=Статистика за членове по регион
-NbOfMembers=Брой членове
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Не са намерени валидирани членове
-MembersByCountryDesc=Този екран показва статистически данни за членове по държави. Графиката зависи от онлайн услугата за графики на Google и е достъпна само, ако е налична интернет връзка.
-MembersByStateDesc=Този екран показва статистически данни за членове по области.
-MembersByTownDesc=Този екран показва статистически данни за членове по град.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Изберете статистическите данни, които искате да прочетете ...
 MenuMembersStats=Статистика
-LastMemberDate=Дата на последен член
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Последна дата на абонамент
-MemberNature=Произход на член
-MembersNature=Nature of members
-Public=Информацията е публична
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Добавен е нов член. Очаква одобрение.
 NewMemberForm=Формуляр за нов член
-SubscriptionsStatistics=Статистика на абонаменти
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Брой абонаменти
-AmountOfSubscriptions=Сума на абонаменти
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Оборот (за фирма) или бюджет (за организация)
 DefaultAmount=Стойност на абонамент по подразбиране
 CanEditAmount=Посетител може да избере / редактира стойността на абонамента си
 MEMBER_NEWFORM_PAYONLINE=Прехвърляне към интегрираната страница за плащане онлайн
 ByProperties=По произход
 MembersStatisticsByProperties=Статистика за членове по произход
-MembersByNature=Този екран показва статистически данни за членове по произход.
-MembersByRegion=Този екран показва статистически данни за членове по региони.
 VATToUseForSubscriptions=Ставка на ДДС, която да се използва за абонаменти
 NoVatOnSubscription=Без ДДС за абонаменти
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Продукт, използван за абонаментен ред във фактура: %s
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index 8df6a66c938..c9e7b270a44 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Списък на дефинирани права
 SeeExamples=Вижте примери тук
 EnabledDesc=Условие това поле да бъде активно (Примери: 1 или $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Показване в PDF
 IsAMeasureDesc=Може ли стойността в полето да бъде натрупвана, за да се получи обща в списъка? (Пример: 1 или 0)
 SearchAllDesc=Използва ли се полето за извършване на търсене, чрез инструмента за бързо търсене? (Пример: 1 или 0)
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 0e71bbb327f..8085469e87c 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Инсталирайте или активирайте GD б
 ProfIdShortDesc=<b>Идент. %s</b> е информация, която зависи от държавата на контрагента.<br>Например, за държавата <b>%s</b>, това е <b>%s</b>.
 DolibarrDemo=Dolibarr ERP / CRM демо
 StatsByNumberOfUnits=Статистика за общото количество продукти / услуги
-StatsByNumberOfEntities=Статистика за броя на свързаните документи (брой фактури, поръчки...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Брой търговски предложения
 NumberOfCustomerOrders=Брой поръчки за продажба
 NumberOfCustomerInvoices=Брой фактури за продажба
@@ -289,4 +289,4 @@ PopuProp=Продукти / Услуги по популярност в пред
 PopuCom=Продукти / Услуги по популярност в поръчки
 ProductStatistics=Статистика за продукти / услуги
 NbOfQtyInOrders=Количество в поръчки
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/bg_BG/partnership.lang b/htdocs/langs/bg_BG/partnership.lang
new file mode 100644
index 00000000000..6a9bb75cd16
--- /dev/null
+++ b/htdocs/langs/bg_BG/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Начална дата
+DatePartnershipEnd=Крайна дата
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Чернова
+PartnershipAccepted = Прието
+PartnershipRefused = Отхвърлено
+PartnershipCanceled = Анулирана
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang
index 42054467fed..1576ae17bed 100644
--- a/htdocs/langs/bg_BG/productbatch.lang
+++ b/htdocs/langs/bg_BG/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Сериен номер %s е вече използва
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index f74d443e831..0c8cef17666 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Услуги само за продажба
 ServicesOnPurchaseOnly=Услуги само за покупка
 ServicesNotOnSell=Услуги, които не са за продажба, и не са за покупка
 ServicesOnSellAndOnBuy=Услуги за продажба и за покупка
-LastModifiedProductsAndServices=Продукти / Услуги: %s последно променени
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Продукти: %s последно добавени
 LastRecordedServices=Услуги: %s последно добавени
 CardProduct0=Продукт
@@ -73,12 +73,12 @@ SellingPrice=Продажна цена
 SellingPriceHT=Продажна цена (без ДДС)
 SellingPriceTTC=Продажна цена (с ДДС)
 SellingMinPriceTTC=Минимална продажна цена (с ДДС)
-CostPriceDescription=Това ценово поле (без ДДС) може да се използва за съхраняване на усреднената себестойност на продукта/услугата във фирмата. Може да бъде всякаква цена, която сте калкулирали, например от средната цена за покупка плюс средната цена за производство и дистрибуция.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Тази стойност може да се използва за изчисляване на маржа.
 SoldAmount=Стойност на продажбите
 PurchasedAmount=Стойност на покупките
 NewPrice=Нова цена
-MinPrice=Минимална продажна цена
+MinPrice=Min. selling price
 EditSellingPriceLabel=Променяне на етикета с продажна цена
 CantBeLessThanMinPrice=Продажната цена не може да бъде по-ниска от минимално допустимата за този продукт/услуга (%s без ДДС). Това съобщение може да се появи, ако въведете твърде голяма отстъпка.
 ContractStatusClosed=Приключен
@@ -157,11 +157,11 @@ ListServiceByPopularity=Списък на услуги по популярнос
 Finished=Произведен продукт
 RowMaterial=Суровина
 ConfirmCloneProduct=Сигурни ли сте, че искате да клонирате този продукт / услуга с № <b>%s</b>?
-CloneContentProduct=Клониране на цялата основна информация за продукт / услуга
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Клониране на цени
-CloneCategoriesProduct=Клониране на свързани тагове / категории
-CloneCompositionProduct=Клониране на виртуален продукт / услуга
-CloneCombinationsProduct=Клониране на варианти на продукта
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Този продукт се използва
 NewRefForClone=№ на нов продукт / услуга
 SellingPrices=Продажни цени
@@ -170,12 +170,12 @@ CustomerPrices=Клиентски цени
 SuppliersPrices=Доставни цени
 SuppliersPricesOfProductsOrServices=Доставни цени (на продукти / услуги)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Държава на произход
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Произход на продукта (суровина / произведен)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Кратко означение
 Unit=Мярка
 p=е.
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 9a5727ec772..a4f9de78a00 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Участници в проекта
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Всеки проект, който мога да прочета (мой и публичен)
 AllProjects=Всички проекти
-MyProjectsDesc=Този изглед е ограничен до проекти, в които сте определен за контакт
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Този изглед представя всички проекти, които можете да прочетете.
 TasksOnProjectsPublicDesc=Този изглед представя всички задачи по проекти, които можете да прочетете.
 ProjectsPublicTaskDesc=Този изглед представя всички проекти и задачи, които можете да прочетете.
 ProjectsDesc=Този изглед представя всички проекти (вашите потребителски права ви дават разрешение да виждате всичко).
 TasksOnProjectsDesc=Този изглед представя всички задачи за всички проекти (вашите потребителски права ви дават разрешение да виждате всичко).
-MyTasksDesc=Този изглед е ограничен до проекти или задачи, в които сте определен за контакт
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Само активните проекти са видими (чернови или приключени проекти не са видими).
 ClosedProjectsAreHidden=Приключените проекти не са видими.
 TasksPublicDesc=Този страница показва всички проекти и задачи, които може да прочетете.
 TasksDesc=Този страница показва всички проекти и задачи (вашите потребителски права ви дават разрешение да виждате всичко).
 AllTaskVisibleButEditIfYouAreAssigned=Всички задачи за определените проекти са видими, но може да въведете време само за задача, възложена на избрания потребител. Възложете задача, ако е необходимо да въведете отделено време за нея.
-OnlyYourTaskAreVisible=Видими са само задачите, които са ви възложени. Възложете задача на себе си, ако не е видима, а трябва да въведете отделено време за нея.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Задачи по проекти
 ProjectCategories=Тагове / Категории на проекти
 NewProject=Нов проект
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Не е участник в задачата
 NoUserAssignedToTheProject=Няма потребители, назначени за този проект.
 TimeSpentBy=Отделено време от
 TasksAssignedTo=Задачи, възложени на
-AssignTaskToMe=Възлагане на задача към мен
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Възлагане на задача към %s
 SelectTaskToAssign=Изберете задача за възлагане...
 AssignTask=Възлагане
diff --git a/htdocs/langs/bg_BG/recruitment.lang b/htdocs/langs/bg_BG/recruitment.lang
index 14eeb3f6dda..8ae43b3daff 100644
--- a/htdocs/langs/bg_BG/recruitment.lang
+++ b/htdocs/langs/bg_BG/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index cf1a6ec0ef6..444407650e1 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Сигурни ли сте, че искате да вал
 ConfirmCancelSending=Сигурни ли сте, че ли искате да анулирате тази пратка?
 DocumentModelMerou=Шаблон А5 размер
 WarningNoQtyLeftToSend=Внимание, няма продукти чакащи да бъдат изпратени.
-StatsOnShipmentsOnlyValidated=Статистики водени само за валидирани пратки. Използваната дата е дата на валидиране на пратка (планираната дата на доставка не винаги е известна)
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Планирана дата за доставка
 RefDeliveryReceipt=Разписка за доставка №
 StatusReceipt=Статус
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 0a87358401a..c34e94c2699 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Няма предварително определ
 DispatchVerb=Изпращане
 StockLimitShort=Количество за предупреждение
 StockLimit=Минимално количество за предупреждение
-StockLimitDesc=(празно) означава, че няма предупреждение.<br>0 може да се използва за предупреждение веднага след като наличността е изчерпана.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Физическа наличност
 RealStock=Реална наличност
 RealStockDesc=Физическа / реална наличност е наличността, която в момента се намира в складовете.
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index 5312e855960..ae4e7e517ea 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Паролата е променена на: %s
 SubjectNewPassword=Вашата нова парола за %s
 GroupRights=Групови права
 UserRights=Потребителски права
+Credentials=Credentials
 UserGUISetup=Потребителски интерфейс
 DisableUser=Деактивиране
 DisableAUser=Деактивиране на потребител
@@ -105,7 +106,7 @@ UseTypeFieldToChange=използвайте полето 'Тип', за да п
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Използване на OpenID за вход
 WeeklyHours=Отработени часове (седмично)
-ExpectedWorkedHours=Очаквани работни часове за седмица
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Цвят на потребителя
 DisabledInMonoUserMode=Деактивиран в режим на поддръжка
 UserAccountancyCode=Счетоводен код на потребителя
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Дата на назначаване
 DateEmploymentEnd=Дата на освобождаване
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Не можете да забраните собствения си потребителски запис
 ForceUserExpenseValidator=Принудително валидиране на разходни отчети
 ForceUserHolidayValidator=Принудително валидиране на молби за отпуск
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index df36f6d6170..2f341b2b6c9 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index 64b12a758f8..3430961c71b 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index a7a67d55be3..eedbf2893ff 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/bn_BD/boxes.lang
+++ b/htdocs/langs/bn_BD/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang
index cb184028464..18932dd841e 100644
--- a/htdocs/langs/bn_BD/categories.lang
+++ b/htdocs/langs/bn_BD/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index a3f02b38f30..f3e945c0332 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Opened
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/bn_BD/ecm.lang b/htdocs/langs/bn_BD/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/bn_BD/ecm.lang
+++ b/htdocs/langs/bn_BD/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/bn_BD/eventorganization.lang b/htdocs/langs/bn_BD/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/bn_BD/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/bn_BD/knowledgemanagement.lang b/htdocs/langs/bn_BD/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/bn_BD/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 6aba43f602d..59536b0ad17 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/bn_BD/modulebuilder.lang b/htdocs/langs/bn_BD/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/bn_BD/modulebuilder.lang
+++ b/htdocs/langs/bn_BD/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/bn_BD/partnership.lang b/htdocs/langs/bn_BD/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/bn_BD/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/bn_BD/productbatch.lang b/htdocs/langs/bn_BD/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/bn_BD/productbatch.lang
+++ b/htdocs/langs/bn_BD/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/bn_BD/recruitment.lang b/htdocs/langs/bn_BD/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/bn_BD/recruitment.lang
+++ b/htdocs/langs/bn_BD/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/bn_BD/sendings.lang b/htdocs/langs/bn_BD/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/bn_BD/sendings.lang
+++ b/htdocs/langs/bn_BD/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/bn_IN/accountancy.lang
+++ b/htdocs/langs/bn_IN/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/bn_IN/banks.lang
+++ b/htdocs/langs/bn_IN/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/bn_IN/bills.lang b/htdocs/langs/bn_IN/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/bn_IN/bills.lang
+++ b/htdocs/langs/bn_IN/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/bn_IN/boxes.lang b/htdocs/langs/bn_IN/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/bn_IN/boxes.lang
+++ b/htdocs/langs/bn_IN/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/bn_IN/cashdesk.lang b/htdocs/langs/bn_IN/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/bn_IN/cashdesk.lang
+++ b/htdocs/langs/bn_IN/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/bn_IN/categories.lang b/htdocs/langs/bn_IN/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/bn_IN/categories.lang
+++ b/htdocs/langs/bn_IN/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang
index 154400c6536..fbe75f09ab0 100644
--- a/htdocs/langs/bn_IN/companies.lang
+++ b/htdocs/langs/bn_IN/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/bn_IN/compta.lang b/htdocs/langs/bn_IN/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/bn_IN/compta.lang
+++ b/htdocs/langs/bn_IN/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/bn_IN/ecm.lang b/htdocs/langs/bn_IN/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/bn_IN/ecm.lang
+++ b/htdocs/langs/bn_IN/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/bn_IN/eventorganization.lang b/htdocs/langs/bn_IN/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/bn_IN/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/bn_IN/knowledgemanagement.lang b/htdocs/langs/bn_IN/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/bn_IN/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/bn_IN/mails.lang b/htdocs/langs/bn_IN/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/bn_IN/mails.lang
+++ b/htdocs/langs/bn_IN/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
index dc2a83f2015..13793aad13f 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/bn_IN/members.lang b/htdocs/langs/bn_IN/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/bn_IN/members.lang
+++ b/htdocs/langs/bn_IN/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/bn_IN/modulebuilder.lang b/htdocs/langs/bn_IN/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/bn_IN/modulebuilder.lang
+++ b/htdocs/langs/bn_IN/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/bn_IN/other.lang b/htdocs/langs/bn_IN/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/bn_IN/other.lang
+++ b/htdocs/langs/bn_IN/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/bn_IN/partnership.lang b/htdocs/langs/bn_IN/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/bn_IN/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/bn_IN/productbatch.lang b/htdocs/langs/bn_IN/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/bn_IN/productbatch.lang
+++ b/htdocs/langs/bn_IN/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/bn_IN/projects.lang b/htdocs/langs/bn_IN/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/bn_IN/projects.lang
+++ b/htdocs/langs/bn_IN/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/bn_IN/recruitment.lang b/htdocs/langs/bn_IN/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/bn_IN/recruitment.lang
+++ b/htdocs/langs/bn_IN/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/bn_IN/sendings.lang b/htdocs/langs/bn_IN/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/bn_IN/sendings.lang
+++ b/htdocs/langs/bn_IN/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/bn_IN/stocks.lang b/htdocs/langs/bn_IN/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/bn_IN/stocks.lang
+++ b/htdocs/langs/bn_IN/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/bn_IN/users.lang b/htdocs/langs/bn_IN/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/bn_IN/users.lang
+++ b/htdocs/langs/bn_IN/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/bn_IN/website.lang b/htdocs/langs/bn_IN/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/bn_IN/website.lang
+++ b/htdocs/langs/bn_IN/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index ed60d2c2c9f..208b819e9a1 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Nije izmireno
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index d18368eacd5..9fc633b8dd1 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Postavke sigurnosti
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Upozorenja
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index cf38c2f1ddb..978d9be60ec 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Plaćanje socijalnog/fiskalnog poreza
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Interni transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=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
+CheckTransmitter=Od
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Obrišite ovaj izvod čeka?
 ConfirmDeleteCheckReceipt=Da li ste sigurni da želite obrisati ovaj izvod od čeka?
 BankChecks=Bankovni ček
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Da li ste sigurni da želite obrisati ovaj unos?
 ThisWillAlsoDeleteBankRecord=Ovim će se također obrisati i generisana bankovna transakcija
 BankMovements=Promet
 PlannedTransactions=Planirane transakcije
-Graph=Grafika
+Graph=Graphs
 ExportDataset_banque_1=Bankovne transakcije i izvod s računa
 ExportDataset_banque_2=Priznanica depozita
 TransactionOnTheOtherAccount=Transakcija na drugom računu
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Nazad na račun
 ShowAllAccounts=Pokaži za sve račune
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 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=Za izmirenje?
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index f59dc5e273c..a063f16c5e5 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Unesi uplate primljene od kupca
 EnterPaymentDueToCustomer=Unesi rok plaćanja za kupca
 DisabledBecauseRemainderToPayIsZero=Onemogućeno jer je ostatak duga nula
-PriceBase=Osnova cijene
+PriceBase=Base price
 BillStatus=Status fakture
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Uzorak (Potrebna je potvrda)
@@ -454,7 +454,7 @@ RegulatedOn=Uređen na
 ChequeNumber=Ček N°
 ChequeOrTransferNumber=Ček/Prenos N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Banka izdatog čeka
 CheckBank=Provjeri
 NetToBePaid=Neto za plaćanje
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index c886622fda5..a491680b1f7 100644
--- a/htdocs/langs/bs_BA/boxes.lang
+++ b/htdocs/langs/bs_BA/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Najstarije aktivne zastarjele usluge
 BoxLastExpiredServices=Posljednjih %s najstarijih ugovora sa aktivni zastarjelim uslugama
 BoxTitleLastActionsToDo=Posljednjih %s akcija za uraditi
-BoxTitleLastContracts=Posljednjih %s izmijenjenih ugovora
-BoxTitleLastModifiedDonations=Posljednjih %s izmijenjenih donacija
-BoxTitleLastModifiedExpenses=Posljednjih %s izmijenjenih troškovnika
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globalne aktivnosti (fakture, prijedlozi, narudžbe)
 BoxGoodCustomers=Dobar kupac
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index 6ae6a2bda91..6f6da52648e 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Priznanica
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index ad8764f8a38..cfd836f7eb4 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=U
 AddIn=Dodaj u
 modify=izmijeniti
 Classify=Svrstati
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Područje oznaka/kategorija proizvoda/usluga
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index dcb571ec725..f1143165a0d 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=Da li ste sigurni da želite obrisati ovu kompaniju i sve podatke vezane za istu?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Obrisati kontakt/uslugu
-ConfirmDeleteContact=Da li ste sigurni da želite obrisati ovaj kontakt i sve podatke vezane za istog?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skajp
 Call=Pozovi
 Chat=Chat
-PhonePro=Službeni telefon
+PhonePro=Bus. phone
 PhonePerso=Privatni telefon
 PhoneMobile=Mobitel
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Poštanski broj
 Town=Grad
 Web=Web
 Poste= Pozicija
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Porez na promet nije obračunat
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Potrebno ako je subjekt kupac ili mogući klijent
 RequiredIfSupplier=Potrebno ako je subjekt prodavač
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Mogući klijent za kontaktirati
 CompanyDeleted=Kompanija"%s" obrisana iz baze podataka
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Otvori
 ActivityCeased=Zatvoreno
 ThirdPartyIsClosed=Subjekat je zatvoren
-ProductsIntoElements=Spisak proizvoda/usluga u %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Trenutni neplaćeni račun
 OutstandingBill=Max. za neplaćeni račun
 OutstandingBillReached=Dostignut maksimum za neplaćene račune
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Ova šifra je slobodna. Ova šifra se može mijenjati bil
 ManagingDirectors=Ime menadžer(a) (CEO, direktor, predsjednik...)
 MergeOriginThirdparty=Umnoži subjekta (subjekt kojeg želite obrisati)
 MergeThirdparties=Spoji subjekte
-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 third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Treće strane su spojene
 SaleRepresentativeLogin=Pristup za predstavnika prodaje
 SaleRepresentativeFirstname=Ime predstavnika prodaje
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index c61d91db97f..1131f3f0421 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/bs_BA/ecm.lang b/htdocs/langs/bs_BA/ecm.lang
index b6d2a9ba2cc..291dcd2097c 100644
--- a/htdocs/langs/bs_BA/ecm.lang
+++ b/htdocs/langs/bs_BA/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 386a7156fbc..276213d59ef 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s je pogrešan
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prijava %s već postoji.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/bs_BA/eventorganization.lang b/htdocs/langs/bs_BA/eventorganization.lang
new file mode 100644
index 00000000000..3be4026e6d2
--- /dev/null
+++ b/htdocs/langs/bs_BA/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Nacrt
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Završeno
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/bs_BA/knowledgemanagement.lang b/htdocs/langs/bs_BA/knowledgemanagement.lang
new file mode 100644
index 00000000000..58a24a1a8cf
--- /dev/null
+++ b/htdocs/langs/bs_BA/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = O programu
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Proizvod
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index a9adc014ec8..aeb2ddc8ca3 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Kopiraj na
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached kopija na
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Poruka
 MailFile=Priloženi fajlovi
 MailMessage=Tekst emaila
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 86a1539fe0f..371121cd248 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test konekcije
 ToClone=Kloniraj
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Nije definiran podatak za kloniranje.
 Of=od
 Go=Idi
@@ -246,7 +246,7 @@ DefaultModel=Defaultni šablon dokumenta
 Action=Događaj
 About=O programu
 Number=Broj
-NumberByMonth=Broj po mjesecu
+NumberByMonth=Total reports by month
 AmountByMonth=Iznos po mjesecu
 Numero=Broj
 Limit=Ograničenje
@@ -341,8 +341,8 @@ KiloBytes=kilobajta
 MegaBytes=megabajta
 GigaBytes=gigabajta
 TeraBytes=terabajta
-UserAuthor=Korisnik koji je napravio
-UserModif=Korisnik posljednjeg ažuriranja
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Od
 From=Od
 FromDate=Od
 FromLocation=Od
-at=at
 to=za
 To=za
+ToDate=za
+ToLocation=za
+at=at
 and=i
 or=ili
 Other=Ostalo
@@ -843,7 +845,7 @@ XMoreLines=%s red(ova) skriveno
 ShowMoreLines=Pokaži više/manje redova
 PublicUrl=Javni URL
 AddBox=Dodaj kutijicu
-SelectElementAndClick=Odaberite element i kliknite %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Štampa datoteke %s
 ShowTransaction=Pokaži unos u bankovni račun
 ShowIntervention=Prikaži intervenciju
@@ -854,8 +856,8 @@ Denied=Zabranjeno
 ListOf=Spisak %s
 ListOfTemplates=Spisak šablona
 Gender=Spol
-Genderman=Muškarac
-Genderwoman=Žena
+Genderman=Male
+Genderwoman=Female
 Genderother=Ostalo
 ViewList=Lista
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 6434c6ef897..48d7b399068 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Obriši
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistika
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/bs_BA/modulebuilder.lang b/htdocs/langs/bs_BA/modulebuilder.lang
index 5a78e93fe70..616bbfb2511 100644
--- a/htdocs/langs/bs_BA/modulebuilder.lang
+++ b/htdocs/langs/bs_BA/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 84db6e2157b..2d4d2752ed8 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/bs_BA/partnership.lang b/htdocs/langs/bs_BA/partnership.lang
new file mode 100644
index 00000000000..ecaff28a0d1
--- /dev/null
+++ b/htdocs/langs/bs_BA/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Datum početka
+DatePartnershipEnd=Datum završetka
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Nacrt
+PartnershipAccepted = Accepted
+PartnershipRefused = Odbijen
+PartnershipCanceled = Otkazan
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang
index 189eb2830bb..70b54abbca6 100644
--- a/htdocs/langs/bs_BA/productbatch.lang
+++ b/htdocs/langs/bs_BA/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 2f03536a62b..6893f9da7c4 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Proizvod
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Zatvoreno
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Jedinica
 p=u.
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 351f794fe3e..ac43cefc2ea 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Kontakti projekta
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Svi projekti koje mogu gledati (moji + javni)
 AllProjects=Svi projekti
-MyProjectsDesc=Ovaj pregled ograničen je na projekte u kojima ste stavljeni kao kontakt
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Ovaj pregled predstavlja sve projekte koje možete čitati.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete čitati.
 ProjectsDesc=Ovaj pregled predstavlja sve projekte (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete čitati.
 TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Zadaci projekata
 ProjectCategories=Projekt oznake/kategorije
 NewProject=Novi projekat
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/bs_BA/recruitment.lang b/htdocs/langs/bs_BA/recruitment.lang
index a2e64d9e81f..8d71c38689f 100644
--- a/htdocs/langs/bs_BA/recruitment.lang
+++ b/htdocs/langs/bs_BA/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang
index 1fc121104eb..6f4555ec55c 100644
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Model dokumenta Merou A5
 WarningNoQtyLeftToSend=Upozorenje, nema proizvoda na čekanju za slanje
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index c96cb4a268f..794cbcac14f 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Nema predefinisanih proizvoda za ovaj objekat. Dak
 DispatchVerb=Otpremiti
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Stvarna zaliha
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index 70951a32d6f..7b4cd013b64 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Šifra promijenjena na: %s
 SubjectNewPassword=Vaša šifra za %s
 GroupRights=Grupne dozvole
 UserRights=Korisničke dozvole
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Isključi
 DisableAUser=Isključi korisnika
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Koristite polja Tip za promjene
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Koristiti OpenID za login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Boja korisnika
 DisabledInMonoUserMode=Onemogućeno u načinu održavanja
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 396a2939174..265e8e7584a 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 2be34f0069e..ac00e7e054f 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -202,14 +202,14 @@ Docref=Referència
 LabelAccount=Etiqueta de compte
 LabelOperation=Etiqueta de l'operació
 Sens=Direcció
-AccountingDirectionHelp=Per a un compte comptable d'un client, utilitzeu Crèdit per a registrar un pagament que heu rebut <br> Per a un compte comptable d'un proveïdor, utilitzeu Dèbit per a registrar un pagament que feu
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Codi de retolació
 Lettering=Lletres
 Codejournal=Diari
 JournalLabel=Títol de Diari
 NumPiece=Número de peça
 TransactionNumShort=Número de transacció
-AccountingCategory=Custom group
+AccountingCategory=Grup personalitzat
 GroupByAccountAccounting=Agrupa per compte major
 GroupBySubAccountAccounting=Agrupa per subcompte comptable
 AccountingAccountGroupsDesc=Podeu definir aquí alguns grups de comptes comptables. S'utilitzaran per a informes comptables personalitzats.
@@ -297,7 +297,7 @@ NoNewRecordSaved=No hi ha més registres pel diari
 ListOfProductsWithoutAccountingAccount=Llista de productes no comptabilitzats en cap compte comptable
 ChangeBinding=Canvia la comptabilització
 Accounted=Comptabilitzat en el llibre major
-NotYetAccounted=Encara no comptabilitzat en el llibre major
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Mostrar Tutorial
 NotReconciled=No conciliat
 WarningRecordWithoutSubledgerAreExcluded=Advertiment: totes les operacions sense subcompte comptable definit es filtren i s'exclouen d'aquesta vista
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 98d6ee38dd1..b5d0c388795 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -37,7 +37,7 @@ UnlockNewSessions=Eliminar bloqueig de connexions
 YourSession=La seva sessió
 Sessions=Sessions d'usuaris
 WebUserGroup=Servidor web usuari/grup
-PermissionsOnFiles=Permissions on files
+PermissionsOnFiles=Permisos sobre fitxers
 PermissionsOnFilesInWebRoot=Permisos als fitxers del directori arrel web
 PermissionsOnFile=Permisos al fitxer %s
 NoSessionFound=Sembla que el seu PHP no pot llistar les sessions actives. El directori de salvaguardat de sessions (<b>%s</b>) pot estar protegit (per exemple, pels permisos del sistema operatiu o per la directiva open_basedir del seu PHP).
@@ -63,7 +63,8 @@ IfModuleEnabled=Nota: sí només és eficaç si el mòdul <b>%s</b> està activa
 RemoveLock=Elimineu/reanomeneu el fitxer <b> %s </b> si existeix, per a permetre l'ús de l'eina d'actualització/instal·lació.
 RestoreLock=Substituir un arxiu <b>%s</b>, donant-li només drets de lectura a aquest arxiu per tal de prohibir noves actualitzacions.
 SecuritySetup=Configuració de seguretat
-PHPSetup=PHP setup
+PHPSetup=Configuració de PHP
+OSSetup=OS setup
 SecurityFilesDesc=Defineix les opcions relacionades amb la seguretat de càrrega de fitxers.
 ErrorModuleRequirePHPVersion=Error, aquest mòdul requereix una versió %s o superior de PHP
 ErrorModuleRequireDolibarrVersion=Error, aquest mòdul requereix una versió %s o superior de Dolibarr
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=No ho suggereixis
 NoActiveBankAccountDefined=Cap compte bancari actiu definit
 OwnerOfBankAccount=Titular del compte %s
 BankModuleNotActive=Mòdul comptes bancaris no activat
-ShowBugTrackLink=Mostra l'enllaç "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alertes
 DelaysOfToleranceBeforeWarning=Retard abans de mostrar una alerta d'advertència per a:
 DelaysOfToleranceDesc=Establiu el retard abans que es mostri a la pantalla una icona d'alerta %s per a l'element final.
@@ -1184,7 +1185,7 @@ SetupDescription2=Les dues seccions següents són obligatòries (les dues prime
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Paràmetres bàsics utilitzats per a personalitzar el comportament per defecte de la vostra aplicació (per exemple, per a funcions relacionades amb el país).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Aquest programari és un conjunt de molts mòduls / aplicacions. Els mòduls relacionats amb les vostres necessitats s’han d’activar i configurar. Les entrades del menú apareixen amb l’activació d’aquests mòduls.
 SetupDescription5=Altres entrades del menú d'instal·lació gestionen paràmetres opcionals.
-AuditedSecurityEvents=Security events that are audited
+AuditedSecurityEvents=Esdeveniments de seguretat que s’auditen
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Auditoria
 InfoDolibarr=Quant al Dolibarr
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Ha d'executar la comanda des d'
 YourPHPDoesNotHaveSSLSupport=Funcions SSL no disponibles al vostre PHP
 DownloadMoreSkins=Més temes per a descarregar
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Mostra l'identificador professional amb adreces
 ShowVATIntaInAddress=Amaga el número d'IVA intracomunitari amb adreces
 TranslationUncomplete=Traducció parcial
@@ -2062,7 +2064,7 @@ UseDebugBar=Utilitzeu la barra de depuració
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre d’últimes línies de registre que cal mantenir a la consola
 WarningValueHigherSlowsDramaticalyOutput=Advertència, els valors més alts frenen molt la producció
 ModuleActivated=El mòdul %s està activat i alenteix la interfície
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Si esteu en un entorn de producció, s'hauria d'establir aquesta propietat en %s.
 AntivirusEnabledOnUpload=Antivirus activat als fitxers penjats
@@ -2107,7 +2109,7 @@ SwitchThisForABetterSecurity=Es recomana canviar aquest valor a %s per a obtenir
 DictionaryProductNature= Naturalesa del producte
 CountryIfSpecificToOneCountry=País (si és específic d'un país determinat)
 YouMayFindSecurityAdviceHere=Podeu trobar assessorament de seguretat aquí
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=Aquesta extensió PHP pot exposar dades sensibles. Si no la necessiteu, desactiveu-la.
 ModuleActivatedDoNotUseInProduction=S'ha habilitat un mòdul dissenyat per al desenvolupament. No l'activeu en un entorn de producció.
 CombinationsSeparator=Caràcter separador per a combinacions de productes
 SeeLinkToOnlineDocumentation=Vegeu l'enllaç a la documentació en línia al menú superior per a obtenir exemples
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 1b1c9b5c1fc..75647bece01 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Pagament d'impostos varis
 BankTransfer=Transferència bancària
 BankTransfers=Transferències bancàries
 MenuBankInternalTransfer=Transferència interna
-TransferDesc=Traspassa d'un compte a un altre, Dolibarr generarà dos registres (dèbit en compte origen i crèdit en compte destí). Per aquesta transacció s'utilitzarà el mateix import (excepte el signe), l'etiqueta i la data).
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=De
 TransferTo=Cap a
 TransferFromToDone=La transferència de <b>%s</b> cap a <b>%s</b> de <b>%s</b> %s s'ha creat.
-CheckTransmitter=Emissor
+CheckTransmitter=Remitent
 ValidateCheckReceipt=Vols validar aquesta remesa de xec?
-ConfirmValidateCheckReceipt=Vols validar aquesta remesa de xec (no serà possible canviar-ho un cop estigui fet)?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Vols suprimir aquesta remesa de xec?
 ConfirmDeleteCheckReceipt=Vols eliminar aquesta remesa de xec?
 BankChecks=Xec bancari
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Esteu segur que voleu suprimir aquest registre?
 ThisWillAlsoDeleteBankRecord=Açò eliminarà també els registres bancaris generats
 BankMovements=Moviments
 PlannedTransactions=Registres prevists
-Graph=Gràfics
+Graph=Graphs
 ExportDataset_banque_1=Registres bancaris i extractes
 ExportDataset_banque_2=Resguard
 TransactionOnTheOtherAccount=Transacció sobre l'altra compte
@@ -142,7 +142,7 @@ AllAccounts=Tots els comptes bancaris i en efectiu
 BackToAccount=Tornar al compte
 ShowAllAccounts=Mostra per a tots els comptes
 FutureTransaction=Transacció futura. No és possible conciliar.
-SelectChequeTransactionAndGenerate=Selecciona/filtra els xecs a incloure en la remesa de xecs a ingressar i fes clic a "Crea".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Selecciona l'estat del compte bancari relacionat amb la conciliació. Utilitza un valor numèric que es pugui ordenar: AAAAMM o AAAAMMDD
 EventualyAddCategory=Eventualment, indiqui una categoria en la qual classificar els registres
 ToConciliate=A conciliar?
@@ -174,7 +174,7 @@ YourSEPAMandate=La vostra ordre SEPA
 FindYourSEPAMandate=Aquest és el vostre mandat SEPA per a autoritzar la nostra empresa a fer una ordre de domiciliació bancària al vostre banc. Torneu-lo signat (escaneja el document signat) o envieu-lo per correu electrònic a
 AutoReportLastAccountStatement=Ompliu automàticament el camp "nombre d'extracte bancari" amb l'últim número de l'extracte al fer la conciliació
 CashControl=Control de caixa TPV
-NewCashFence=New cash desk opening or closing
+NewCashFence=Obertura o tancament de caixa nou
 BankColorizeMovement=Color de moviments
 BankColorizeMovementDesc=Si aquesta funció està habilitada, podeu triar un color de fons específic per als moviments de dèbit o de crèdit
 BankColorizeMovementName1=Color de fons pel moviment de dèbit
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index bdcd870106f..85e701cdfa3 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Converteix l'excés pagat en descompte disponible
 EnterPaymentReceivedFromCustomer=Afegir cobrament rebut del client
 EnterPaymentDueToCustomer=Fer pagament del client
 DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
-PriceBase=Preu base
+PriceBase=Base price
 BillStatus=Estat de la factura
 StatusOfGeneratedInvoices=Estat de factures generades
 BillStatusDraft=Esborrany (a validar)
@@ -454,7 +454,7 @@ RegulatedOn=Pagar el
 ChequeNumber=Número de xec
 ChequeOrTransferNumber=Núm. de xec/transferència
 ChequeBordereau=Comprova horari
-ChequeMaker=Autor xec/transferència
+ChequeMaker=Check/Transfer sender
 ChequeBank=Banc del xec
 CheckBank=Xec
 NetToBePaid=Net a pagar
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index 4c9e0642afc..239fa73d3dd 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Últimes intervencions
 BoxCurrentAccounts=Balanç de comptes oberts
 BoxTitleMemberNextBirthdays=Aniversaris d'aquest mes (membres)
-BoxTitleMembersByType=Members by type
+BoxTitleMembersByType=Socis per tipus
 BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Últimes %s notícies de %s
 BoxTitleLastProducts=Productes / Serveis: últims %s modificats
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Adreces d'interès: últims %s
 BoxOldestExpiredServices=Serveis antics expirats
 BoxLastExpiredServices=Últims %s contactes amb serveis actius expirats
 BoxTitleLastActionsToDo=Últimes %s accions a fer
-BoxTitleLastContracts=Últims %s contractes modificats
-BoxTitleLastModifiedDonations=Últimes %s donacions modificades
-BoxTitleLastModifiedExpenses=Últimes %s despeses modificades
-BoxTitleLatestModifiedBoms=Últimes %s llistes de material modificades
-BoxTitleLatestModifiedMos=Últimes %s ordres de fabricació modificades
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Clients que han superat el màxim pendent
 BoxGlobalActivity=Activitat global
 BoxGoodCustomers=Bons clients
@@ -114,7 +114,7 @@ BoxCustomersOutstandingBillReached=Clients que superen el límit pendent
 # Pages
 UsersHome=Home users and groups
 MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
+ThirdpartiesHome=Inici Tercers
 TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
+AccountancyHome=Inici Comptabilitat
 ValidatedProjects=Projectes validats
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index 9cfb5122c12..c8ba9314116 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Sala
 AddTable=Afegeix taula
 Place=Lloc
 TakeposConnectorNecesary=Es requereix el 'connector TakePOS'
-OrderPrinters=Impressores de comandes
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Cerca producte
 Receipt=Ordre
 Header=Capçalera
@@ -56,8 +57,9 @@ Paymentnumpad=Tipus de pad per introduir el pagament
 Numberspad=Números Pad
 BillsCoinsPad=Pad de monedes i bitllets
 DolistorePosCategory=Mòduls TakePOS i altres solucions POS per a Dolibarr
-TakeposNeedsCategories=TakePOS necessita que les categories de productes funcionin
-OrderNotes=Notes de comanda
+TakeposNeedsCategories=TakePOS necessita almenys una categoria de productes per a funcionar
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS necessita almenys una categoria a sota de la categoria  <b>%s</b> per funcionar
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Compte predeterminat a utilitzar per als pagaments
 NoPaimementModesDefined=No hi ha cap mode de pagament definit a la configuració de TakePOS
 TicketVatGrouped=Agrupa IVA per tipus als tiquets|rebuts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=La factura ja està validada
 NoLinesToBill=No hi ha línies a facturar
 CustomReceipt=Rebut personalitzat
 ReceiptName=Nom del rebut
-ProductSupplements=Suplements de producte
+ProductSupplements=Manage supplements of products
 SupplementCategory=Categoria de suplement
 ColorTheme=Color del tema
 Colorful=Colorit
@@ -92,7 +94,7 @@ Browser=Navegador
 BrowserMethodDescription=Impressió de rebuts fàcil i senzilla. Només uns quants paràmetres per a configurar el rebut. Imprimeix mitjançant el navegador.
 TakeposConnectorMethodDescription=Mòdul extern amb funcions addicionals. Possibilitat d’imprimir des del núvol.
 PrintMethod=Mètode d'impressió
-ReceiptPrinterMethodDescription=Mètode potent amb molts paràmetres. Completament personalitzable amb plantilles. No es pot imprimir des del núvol.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=Per terminal
 TakeposNumpadUsePaymentIcon=Utilitzeu la icona en lloc del text als botons de pagament del teclat numèric
 CashDeskRefNumberingModules=Mòdul de numeració per a vendes des del TPV (Punt de Venda)
@@ -118,9 +120,11 @@ HideCategoryImages=Amaga les imatges de la categoria
 HideProductImages=Amaga les imatges del producte
 NumberOfLinesToShow=Nombre de línies d'imatges a mostrar
 DefineTablePlan=Definiu el pla de les taules
-GiftReceiptButton=Afegiu un botó "Rebut de regal"
-GiftReceipt=Rebut de regal
+GiftReceiptButton=Afegeix un botó "Tiquet regal"
+GiftReceipt=Tiquet regal
 ModuleReceiptPrinterMustBeEnabled=La impressora de recepció del mòdul deu haver estat habilitada primer
 AllowDelayedPayment=Permet un pagament retardat
 PrintPaymentMethodOnReceipts=Imprimeix el mètode de pagament en els tiquets/rebuts
 WeighingScale=Balança de pesatge
+ShowPriceHT = Mostra el preu sense la columna d'impostos
+ShowPriceHTOnReceipt = Mostra el preu sense la columna d’impostos al rebut
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 5c202697ee7..1e9afb3dc9d 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Etiqueta
 Rubriques=Etiquetes
 RubriquesTransactions=Etiquetes d'assentaments
 categories=etiquetes
-NoCategoryYet=No s'ha creat cap etiqueta d'aquest tipus
+NoCategoryYet=No tag/category of this type has been created
 In=En
 AddIn=Afegeix
 modify=Modifica
 Classify=Classifica
 CategoriesArea=Àrea d'etiquetes
-ProductsCategoriesArea=Àrea d'etiquetes de productes/serveis
-SuppliersCategoriesArea=Àrea d'etiquetes de proveïdors
-CustomersCategoriesArea=Àrea d'etiquetes de clients
-MembersCategoriesArea=Àrea d'etiquetes de socis
-ContactsCategoriesArea=Àrea d'etiquetes de contactes
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Àrea d'etiquetes de projectes
-UsersCategoriesArea=Àrea d'etiquetes d'usuaris
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Subcategories
 CatList=Llistat d'etiquetes
 CatListAll=Llista d'etiquetes (tots els tipus)
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assigna la categoria al proveïdor
 ShowCategory=Mostra etiqueta
 ByDefaultInList=Per defecte en el llistat
 ChooseCategory=Tria la categoria
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
+StocksCategoriesArea=Categories de magatzems
+ActionCommCategoriesArea=Categories d'esdeveniments
 WebsitePagesCategoriesArea=Categories de Pàgines/Contenidors
-UseOrOperatorForCategories=Us o operador per categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
index ce0aee13e4a..4299749d6b0 100644
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -64,10 +64,11 @@ ActionAC_SHIP=Envia expedició per e-mail
 ActionAC_SUP_ORD=Envia la comanda de compra per correu
 ActionAC_SUP_INV=Envieu la factura del proveïdor per correu
 ActionAC_OTH=Altres
-ActionAC_OTH_AUTO=Esdeveniments creats automàticament
+ActionAC_OTH_AUTO=Altres automàtics
 ActionAC_MANUAL=Esdeveniments creats manualment
 ActionAC_AUTO=Esdeveniments creats automàticament
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Altres
+ActionAC_EVENTORGANIZATION=Esdeveniment d’organització d’esdeveniments
 Stats=Estadístiques de venda
 StatusProsp=Estat del pressupost
 DraftPropals=Pressupostos esborrany
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index fd9f867eb34..db2493cb144 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=El nom de l'empresa %s ja existeix. Indica un altre.
 ErrorSetACountryFirst=Indica en primer lloc el país
 SelectThirdParty=Seleccionar un tercer
-ConfirmDeleteCompany=Esteu segur de voler eliminar aquesta empresa i tota la informació dependent?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Eliminar un contacte
-ConfirmDeleteContact=Esteu segur de voler eliminar aquest contacte i tota la seva informació dependent?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Tercer nou
 MenuNewCustomer=Client nou
 MenuNewProspect=Client potencial nou
@@ -43,9 +43,9 @@ Individual=Particular
 ToCreateContactWithSameName=Es crearà un contacte/adreça automàticament amb la mateixa informació que el tercer d'acord amb el propi tercer. En la majoria de casos, fins i tot si el tercer és una persona física, la creació d'un sol tercer ja és suficient.
 ParentCompany=Seu Central
 Subsidiaries=Filials
-ReportByMonth=Report per month
+ReportByMonth=Informe per mes
 ReportByCustomers=Informe per client
-ReportByThirdparties=Report per thirdparty
+ReportByThirdparties=Informe per tercer
 ReportByQuarter=Informe per taxa
 CivilityCode=Codi cortesia
 RegisteredOffice=Domicili social
@@ -69,7 +69,7 @@ PhoneShort=Telèfon
 Skype=Skype
 Call=Trucar
 Chat=Xat
-PhonePro=Tel. treball
+PhonePro=Bus. phone
 PhonePerso=Tel. personal
 PhoneMobile=Mòbil
 No_Email=No enviar e-mailings massius
@@ -331,7 +331,7 @@ CustomerCodeDesc=Codi client, únic per a tots els clients
 SupplierCodeDesc=Codi de proveïdor, únic per a tots els proveïdors
 RequiredIfCustomer=Requerida si el tercer és un client o client potencial
 RequiredIfSupplier=Obligatori si un tercer és proveïdor
-ValidityControledByModule=Validació controlada pel mòdul
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Regles per a aquest mòdul
 ProspectToContact=Client potencial a contactar
 CompanyDeleted=L'empresa "%s" ha estat eliminada
@@ -439,12 +439,12 @@ ListSuppliersShort=Llistat de proveïdors
 ListProspectsShort=Llistat de clients potencials
 ListCustomersShort=Llistat de clients
 ThirdPartiesArea=Àrea de tercers i contactes
-LastModifiedThirdParties=Últims %s tercers modificats
-UniqueThirdParties=Total de Tercers
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Actiu
 ActivityCeased=Tancat
 ThirdPartyIsClosed=Tercer està tancat
-ProductsIntoElements=Llistat de productes/serveis en %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Factura pendent actual
 OutstandingBill=Max. de factures pendents
 OutstandingBillReached=S'ha arribat al màx. de factures pendents
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=El codi és lliure. Aquest codi es pot modificar en quals
 ManagingDirectors=Nom del gerent(s) (CEO, director, president ...)
 MergeOriginThirdparty=Duplicar tercer (tercer que vols eliminar)
 MergeThirdparties=Fusionar tercers
-ConfirmMergeThirdparties=Estàs segur que vols fusionar aquest tercer amb l'actual? Tots els objectes relacionats (factures, comandes, etc.) seran traslladats al tercer actual, i l'anterior duplicat serà esborrat.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=S'han fusionat els tercers
 SaleRepresentativeLogin=Nom d'usuari de l'agent comercial
 SaleRepresentativeFirstname=Nom de l'agent comercial
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 3ae4522a649..26dfb20751e 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -86,7 +86,7 @@ PaymentCustomerInvoice=Cobrament factura a client
 PaymentSupplierInvoice=Pagament de la factura del proveïdor
 PaymentSocialContribution=Pagament d'impost varis
 PaymentVat=Pagament IVA
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Registre automàtic del pagament
 ListPayment=Llistat de pagaments
 ListOfCustomerPayments=Llistat de cobraments de clients
 ListOfSupplierPayments=Llista de pagaments a proveïdors
@@ -135,7 +135,7 @@ NewCheckReceipt=Descompte nou
 NewCheckDeposit=Ingrés nou
 NewCheckDepositOn=Crea remesa per ingressar al compte: %s
 NoWaitingChecks=Sense xecs en espera de l'ingrés.
-DateChequeReceived=Data recepció del xec
+DateChequeReceived=Check receiving date
 NbOfCheques=Nombre de xecs
 PaySocialContribution=Pagar un impost varis
 PayVAT=Paga una declaració d’IVA
@@ -145,10 +145,10 @@ ConfirmPayVAT=Esteu segur que voleu classificar aquesta declaració d'IVA com a
 ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Elimina un pagament d'impost varis
 DeleteVAT=Suprimeix una declaració d’IVA
-DeleteSalary=Delete a salary card
+DeleteSalary=Elimina una fitxa salarial
 ConfirmDeleteSocialContribution=Esteu segur que voleu suprimir aquest pagament d'impostos varis?
 ConfirmDeleteVAT=Esteu segur que voleu suprimir aquesta declaració d'IVA?
-ConfirmDeleteSalary=Are you sure you want to delete this salary?
+ConfirmDeleteSalary=Esteu segur que voleu suprimir aquest sou?
 ExportDataset_tax_1=Impostos varis i pagaments
 CalcModeVATDebt=Mode d'<b>%sIVA sobre comptabilitat de compromís%s </b>.
 CalcModeVATEngagement=Mode d'<b>%sIVA sobre ingressos-despeses%s</b>.
@@ -250,7 +250,7 @@ ACCOUNTING_ACCOUNT_SUPPLIER=Compte de comptabilitat utilitzat per tercers prove
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=El compte comptable dedicat definit a la fitxa de tercers només s'utilitzarà per al Llibre Major. Aquest serà utilitzat pel Llibre Major i com a valor predeterminat del subcompte si no es defineix un compte comptable a la fitxa del tercer.
 ConfirmCloneTax=Confirma el clonat d'un impost social / fiscal
 ConfirmCloneVAT=Confirma la còpia d’una declaració d’IVA
-ConfirmCloneSalary=Confirm the clone of a salary
+ConfirmCloneSalary=Confirmeu el clon d'un salari
 CloneTaxForNextMonth=Clonar-la pel pròxim mes
 SimpleReport=Informe simple
 AddExtraReport=Informes addicionals (afegeix l'informe de clients nacionals i estrangers)
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index c69f252d2af..4afe9c44f65 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -41,7 +41,7 @@ FileNotYetIndexedInDatabase=Fitxer encara no indexat a la base de dades (intente
 ExtraFieldsEcmFiles=Atributs addicionals dels fitxers ECM
 ExtraFieldsEcmDirectories=Atributs addicionals dels directoris ECM
 ECMSetup=Configuració de l'ECM
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
+GenerateImgWebp=Duplica totes les imatges amb una altra versió amb format .webp
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
+ConfirmImgWebpCreation=Confirmeu la duplicació de totes les imatges
+SucessConvertImgWebp=Les imatges s'han duplicat correctament
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index deda3b33027..89922bbc91d 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Sense errors, és vàlid
 # Errors
 ErrorButCommitIsDone=Errors trobats, però és vàlid malgrat tot
-ErrorBadEMail=Correu electrònic %s és incorrecte
-ErrorBadMXDomain=El correu electrònic %s sembla incorrecte (el domini no té cap registre MX vàlid)
-ErrorBadUrl=Url %s invàlida
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Valor incorrecte del paràmetre. Acostuma a passar quan falta la traducció.
 ErrorRefAlreadyExists=La referència <b> %s </b> ja existeix.
 ErrorLoginAlreadyExists=El nom d'usuari %s ja existeix.
@@ -46,8 +46,8 @@ ErrorWrongDate=La data no és correcta.
 ErrorFailedToWriteInDir=No es pot escriure a la carpeta %s
 ErrorFoundBadEmailInFile=S'ha trobat una sintaxi incorrecta del correu electrònic per a les línies %s al fitxer (exemple de la línia %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
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Error en la creació d'una carpeta. Comprovi que l'usuari del servidor web té drets d'escriptura en les carpetes de documents de Dolibarr. Si el paràmetre <b>safe_mode</b> està actiu en aquest PHP, Comproveu que els fitxers php dolibarr pertanyen a l'usuari del servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail no definit per a aquest usuari
 ErrorSetupOfEmailsNotComplete=La configuració dels correus electrònics no s'ha completat
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=La pàgina / contenidor <strong> %s <
 ErrorDuringChartLoad=S'ha produït un error en carregar el gràfic de comptes. Si pocs comptes no s'han carregat, podeu introduir-los manualment.
 ErrorBadSyntaxForParamKeyForContent=Sintaxi incorrecta per a la clau de contingut del paràmetre. Ha de tenir un valor que comenci per %s o %s
 ErrorVariableKeyForContentMustBeSet=Error, s’ha d’establir la constant amb el nom %s (amb el contingut de text a mostrar) o %s (amb una URL externa a mostrar).
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=L'URL %s ha de començar amb http: // o https: //
 ErrorHostMustNotStartWithHttp=El nom d'amfitrió %s NO ha de començar amb http: // o https: //
 ErrorNewRefIsAlreadyUsed=Error, la referència nova ja s’està utilitzant
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Disponible només si s'utilitza una connexi
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/ca_ES/eventorganization.lang b/htdocs/langs/ca_ES/eventorganization.lang
new file mode 100644
index 00000000000..4f0b2546196
--- /dev/null
+++ b/htdocs/langs/ca_ES/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Organització d'esdeveniments
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Esdeveniments organitzats
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Configuració de l'organització d'esdeveniments
+Settings = Configuració
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Etiqueta de tasques per a crear automàticament quan es validi el projecte
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categoria per a afegir a tercers creada automàticament quan suggereixen un estand
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Plantilla de correu electrònic d'acció massiva als assistents
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Plantilla de correu electrònic d'acció massiva als ponents
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Gestiona l'organització d'esdeveniments
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Data de subscripció
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = S'ha rebut la vostra sol·licitud de conferència
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Sol·licitud de conferència
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscripció a estand
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Preu de la inscripció
+PriceOfRegistrationHelp=Preu de la inscripció
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Informació sobre conferències o estands
+Attendees = Assistents
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Esborrany
+EvntOrgSuggested = Suggerit
+EvntOrgConfirmed = Confirmat
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Realitzades
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = Aquest formulari us permet registrar-vos com a nou participant a la conferència
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/ca_ES/externalsite.lang b/htdocs/langs/ca_ES/externalsite.lang
index 3518d8c97ac..4547f3e3c70 100644
--- a/htdocs/langs/ca_ES/externalsite.lang
+++ b/htdocs/langs/ca_ES/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Configuració de l'enllaç a la pàgina web externa
-ExternalSiteURL=External Site URL of HTML iframe content
+ExternalSiteURL=URL del lloc extern del contingut iframe HTML
 ExternalSiteModuleNotComplete=El mòdul Lloc web extern no ha estat configurat correctament.
 ExampleMyMenuEntry=La meva entrada del menú
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index 5a0098d8bdd..de0b9e084a8 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -13,7 +13,7 @@ ToReviewCP=A l'espera d'aprovació
 ApprovedCP=Aprovada
 CancelCP=Anul·lada
 RefuseCP=Rebutjada
-ValidatorCP=Validador
+ValidatorCP=Aprovador
 ListeCP=Llista de dies lliures
 Leave=Sol·licitud de permís
 LeaveId=Identificador de baixa
@@ -39,10 +39,10 @@ TitreRequestCP=Fitxa de dies lliures
 TypeOfLeaveId=Tipus d'identificador de baixa
 TypeOfLeaveCode=Tipus de codi de baixa
 TypeOfLeaveLabel=Tipus d'etiqueta de baixa
-NbUseDaysCP=Nombre de dies lliures consumits
-NbUseDaysCPHelp=El càlcul té en compte els dies festius i les vacances definides al diccionari.
-NbUseDaysCPShort=Dies consumits
-NbUseDaysCPShortInMonth=Dies consumits al mes
+NbUseDaysCP=Nombre de dies de permís utilitzats
+NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Dies de permís
+NbUseDaysCPShortInMonth=Dies de permís al mes
 DayIsANonWorkingDay=%s és un dia no laborable
 DateStartInMonth=Data d'inici al mes
 DateEndInMonth=Data de finalització al mes
@@ -54,8 +54,8 @@ StatutCP=Estat
 TitleDeleteCP=Eliminar la petició de dies lliures
 ConfirmDeleteCP=Estàs segur de voler eliminar aquesta petició de dies lliures?
 ErrorCantDeleteCP=Error, no teniu permisos per a suprimir aquesta sol·licitud de permís.
-CantCreateCP=Note permisos per realitzar peticions de dies lliures
-InvalidValidatorCP=Ha d'indicar un validador per la seva petició de dies lliures
+CantCreateCP=No teniu accés a fer sol·licituds de permís.
+InvalidValidatorCP=Heu de triar l’aprovador per a la vostra sol·licitud de permís.
 NoDateDebut=Ha d'indicar una data d'inici.
 NoDateFin=Ha d'indicar una data de fi.
 ErrorDureeCP=La seva petició de dies lliures no conté cap dia hàbil
@@ -80,14 +80,14 @@ UserCP=Usuari
 ErrorAddEventToUserCP=S'ha produït un error en l'assignació del permís excepcional.
 AddEventToUserOkCP=S'ha afegit el permís excepcional.
 MenuLogCP=Veure registre de canvis
-LogCP=Registre d’actualitzacions dels dies de vacances disponibles
-ActionByCP=Realitzat per
-UserUpdateCP=Per a l'usuari
+LogCP=Registre de totes les actualitzacions realitzades a "Saldo de permisos"
+ActionByCP=Actualitzat per
+UserUpdateCP=Actualitzat per a
 PrevSoldeCP=Saldo anterior
 NewSoldeCP=Saldo nou
 alreadyCPexist=En aquest període ja s’ha fet una sol·licitud de dia lliure.
-FirstDayOfHoliday=Primer dia lliure
-LastDayOfHoliday=Últim dia de vacances
+FirstDayOfHoliday=Primer dia de sol·licitud de permís
+LastDayOfHoliday=Últim del dia de sol·licitud de permís
 BoxTitleLastLeaveRequests=Últimes %s peticions de dies lliures modificades
 HolidaysMonthlyUpdate=Actualització mensual
 ManualUpdate=Actualització manual
@@ -104,8 +104,8 @@ LEAVE_SICK=Baixa per enfermetat
 LEAVE_OTHER=Altres sortides
 LEAVE_PAID_FR=Vacances pagades
 ## Configuration du Module ##
-LastUpdateCP=Última actualització automàtica de reserva de dies lliures
-MonthOfLastMonthlyUpdate=Mes de l'última actualització automàtica de reserva de dies lliures
+LastUpdateCP=Última actualització automàtica de l'assignació de dies de permís
+MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
 UpdateConfCPOK=Actualització efectuada correctament.
 Module27130Name= Gestió de dies lliures
 Module27130Desc= Gestió de dies lliures
@@ -123,10 +123,10 @@ HolidaysRefusedBody=La seva sol·licitud de dies lliures retribuïts des de el %
 HolidaysCanceled=Dies lliures retribuïts cancel·lats
 HolidaysCanceledBody=S'ha cancel·lat la vostra sol·licitud de permís del %s al %s.
 FollowedByACounter=1: Aquest tipus de dia lliure necessita el seguiment d'un comptador. El comptador s'incrementa manualment o automàticament i quan hi ha una petició de dia lliure validada, el comptador es decrementa.<br>0: No seguit per un comptador.
-NoLeaveWithCounterDefined=No s'han definit els tipus de dies lliures que son necessaris per poder seguir-los amb comptador
-GoIntoDictionaryHolidayTypes=Ves a <strong>Inici - Configuració - Diccionaris - Tipus de dies lliures</strong> per a configurar els diferents tipus de dies lliures
-HolidaySetup=Configuració del mòdul Vacances
-HolidaysNumberingModules=Models numerats de sol·licituds de dies lliures
+NoLeaveWithCounterDefined=No hi ha cap tipus de dia lliure definit que hagi de seguir un comptador
+GoIntoDictionaryHolidayTypes=Aneu a <strong> Inici - Configuració - Diccionaris - Tipus de dies lliures </strong> per a configurar els diferents tipus de dies lliures.
+HolidaySetup=Configuració del mòdul Dies de permís
+HolidaysNumberingModules=Models de numeració de sol·licituds de dies de permís
 TemplatePDFHolidays=Plantilla per a sol·licituds de permisos en PDF
 FreeLegalTextOnHolidays=Text gratuït a PDF
 WatermarkOnDraftHolidayCards=Marques d'aigua sobre esborranys de sol·licituds de dies lliures
diff --git a/htdocs/langs/ca_ES/knowledgemanagement.lang b/htdocs/langs/ca_ES/knowledgemanagement.lang
new file mode 100644
index 00000000000..29e628befcc
--- /dev/null
+++ b/htdocs/langs/ca_ES/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Configuració
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Quant a
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index ffcbd2fd725..20115c14e6b 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=A l'usuari(s)
 MailCC=Còpia a
 MailToCCUsers=Còpia l'usuari(s)
 MailCCC=Còpia oculta a
-MailTopic=Tema de correu electrònic
+MailTopic=Email subject
 MailText=Missatge
 MailFile=Fitxers adjunts
 MailMessage=Text utilitzat en el cos del missatge
@@ -43,7 +43,7 @@ MailSuccessfulySent=E-mail acceptat correctament per l'enviament (de %s a %s)
 MailingSuccessfullyValidated=E-mailing validat correctament
 MailUnsubcribe=Desubscriure
 MailingStatusNotContact=No contactar
-MailingStatusReadAndUnsubscribe=Llegeix i dóna de baixa
+MailingStatusReadAndUnsubscribe=Llegeix i dona de baixa
 ErrorMailRecipientIsEmpty=L'adreça del destinatari és buida
 WarningNoEMailsAdded=Cap nou e-mail a afegir a la llista destinataris.
 ConfirmValidMailing=Vols validar aquest E-Mailing?
@@ -55,7 +55,7 @@ TotalNbOfDistinctRecipients=Nombre de destinataris únics
 NoTargetYet=Cap destinatari definit
 NoRecipientEmail=No hi ha cap correu electrònic destinatari per a %s
 RemoveRecipient=Eliminar destinatari
-YouCanAddYourOwnPredefindedListHere=Per crear el seu mòdul de selecció e-mails, mireu htdocs /core/modules/mailings/README.
+YouCanAddYourOwnPredefindedListHere=Per a crear el mòdul de selecció de correu electrònic, consulteu htdocs/core/modules/mailings/README.
 EMailTestSubstitutionReplacedByGenericValues=En mode prova, les variables de substitució són substituïdes per valors genèrics
 MailingAddFile=Adjunta aquest fitxer
 NoAttachedFiles=Sense fitxers adjunts
@@ -68,7 +68,7 @@ DateSending=Data enviament
 SentTo=Enviat a <b>%s</b>
 MailingStatusRead=Llegit
 YourMailUnsubcribeOK=El correu electrònic <b> %s </b> està correctament eliminat de la llista de correu
-ActivateCheckReadKey=Clau utilitzada per xifrar l'URL utilitzat per a la funció "Llegir el rebut" i "Anul·lar la subscripció"
+ActivateCheckReadKey=Clau que s'utilitza per a xifrar l'URL que s'utilitza per a les funcions "Recepció de lectura" i "Cancel·la la subscripció"
 EMailSentToNRecipients=Correu electrònic enviat a destinataris %s.
 EMailSentForNElements=Correu electrònic enviat per elements %s.
 XTargetsAdded=<b>%s</b> destinataris agregats a la llista
@@ -82,7 +82,7 @@ NbSelected=Número seleccionat
 NbIgnored=Número ignorat
 NbSent=Número enviat
 SentXXXmessages=%s missatge(s) enviat(s).
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+ConfirmUnvalidateEmailing=Esteu segur que voleu canviar el correu electrònic <b> %s </b> a l'estat d'esborrany?
 MailingModuleDescContactsWithThirdpartyFilter=Contacte amb filtres de client
 MailingModuleDescContactsByCompanyCategory=Contactes per categoria de tercers
 MailingModuleDescContactsByCategory=Contactes per categories
@@ -106,18 +106,18 @@ MailNoChangePossible=Destinataris d'un E-Mailing validat no modificables
 SearchAMailing=Cercar un E-Mailing
 SendMailing=Envia e-mailing
 SentBy=Enviat por
-MailingNeedCommand=L’enviament de correus electrònics massius es pot realitzar des de la línia de comandes. Demaneu a l'administrador del servidor que iniciï la següent comanda per enviar els correus electrònics a tots els destinataris:
-MailingNeedCommand2=Podeu enviar en línia afegint el paràmetre MAILING_LIMIT_SENDBYWEB amb un valor nombre que indica el màxim nombre d'e-mails enviats per sessió. Per això aneu a Inici - Configuració - Varis
+MailingNeedCommand=L’enviament de correus electrònics massius es pot realitzar des de la línia d'ordres. Demaneu a l'administrador del servidor que iniciï la següent ordre per a enviar els correus electrònics a tots els destinataris:
+MailingNeedCommand2=No obstant això, podeu enviar-los en línia afegint el paràmetre MAILING_LIMIT_SENDBYWEB amb el valor del nombre màxim de correus electrònics que vulgueu enviar per sessió. Per a això, aneu a Inici - Configuració - Altres.
 ConfirmSendingEmailing=Si voleu enviar correus electrònics directament des d'aquesta pantalla, confirmeu que esteu segur que voleu enviar correus electrònics ara des del vostre navegador?
 LimitSendingEmailing=Nota: L'enviament de missatges massius de correu electrònic des de la interfície web es realitza diverses vegades per motius de seguretat i temps d'espera, <b> %s </b> als destinataris de cada sessió d'enviament.
 TargetsReset=Buidar llista
-ToClearAllRecipientsClickHere=Per buidar la llista dels destinataris d'aquest E-Mailing, feu clic al botó
+ToClearAllRecipientsClickHere=Feu clic aquí per a esborrar la llista de destinataris d’aquest correu electrònic
 ToAddRecipientsChooseHere=Afegiu destinataris escollint entre les llistes
 NbOfEMailingsReceived=E-Mailings en massa rebuts
 NbOfEMailingsSend=E-mails massius enviats
 IdRecord=ID registre
 DeliveryReceipt=Justificant de recepció.
-YouCanUseCommaSeparatorForSeveralRecipients=Podeu usar el caràcter de separació <b>coma</b> per especificar múltiples destinataris.
+YouCanUseCommaSeparatorForSeveralRecipients=Podeu utilitzar el separador <b> coma </b> per a especificar diversos destinataris.
 TagCheckMail=Seguiment de l'obertura del email
 TagUnsubscribe=Link de Desubscripció
 TagSignature=Signatura de l'usuari remitent
@@ -131,9 +131,9 @@ NoNotificationsWillBeSent=No hi ha previstes notificacions automàtiques per cor
 ANotificationsWillBeSent=S'enviarà 1 notificació automàtica per correu electrònic
 SomeNotificationsWillBeSent=S'enviaran %s notificacions automàtiques per correu electrònic
 AddNewNotification=Subscriviu-vos a una nova notificació automàtica per correu electrònic (destinatari/esdeveniment)
-ListOfActiveNotifications=Llista totes les subscripcions actives (destinataris/esdeveniments) per a notificacions automàtiques per correu electrònic
-ListOfNotificationsDone=Llista totes les notificacions automàtiques enviades per correu electrònic
-MailSendSetupIs=La configuració d'enviament d'e-mail s'ha ajustat a '%s'. Aquest mètode no es pot utilitzar per enviar e-mails massius.
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
+MailSendSetupIs=La configuració de l'enviament de correu electrònic s'ha configurat a '%s'. Aquest mode no es pot utilitzar per a enviar correus electrònics massius.
 MailSendSetupIs2=Primer heu d’anar, amb un compte d’administrador, al menú %sInici - Configuració - Correus electrònics%s per a canviar el paràmetre <strong>'%s'</strong> per a utilitzar el mode '%s'. Amb aquest mode, podeu introduir la configuració del servidor SMTP proporcionat pel vostre proveïdor de serveis d'Internet i utilitzar la funció de correu electrònic massiu.
 MailSendSetupIs3=Si teniu cap pregunta sobre com configurar el servidor SMTP, podeu demanar-li a %s.
 YouCanAlsoUseSupervisorKeyword=També pot afegir l'etiqueta <strong>__SUPERVISOREMAIL__</strong> per tenir un e-mail enviat pel supervisor a l'usuari (només funciona si un e-mail és definit per aquest supervisor)
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 7553262f78d..8287e64d69d 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Desa i nou
 TestConnection=Provar la connexió
 ToClone=Clona
 ConfirmCloneAsk=Esteu segur que voleu clonar l'objecte <b> %s </b>?
-ConfirmClone=Trieu les dades que voleu clonar:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No s'ha definit cap dada per a clonar.
 Of=de
 Go=Anar
@@ -246,7 +246,7 @@ DefaultModel=Plantilla del document per defecte
 Action=Acció
 About=Quant a
 Number=Número
-NumberByMonth=Nombre per mes
+NumberByMonth=Total reports by month
 AmountByMonth=Import per mes
 Numero=Número
 Limit=Límit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=Usuari de la creació
-UserModif=Usuari de l'última actualització
+UserAuthor=Ceated by
+UserModif=Actualitzat per
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Per
 From=De
 FromDate=De
 FromLocation=De
-at=a
 to=a
 To=a
+ToDate=a
+ToLocation=a
+at=a
 and=i
 or=o
 Other=Altres
@@ -727,7 +729,7 @@ MenuMembers=Socis
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Impostos | Despeses especials
 ThisLimitIsDefinedInSetup=Límit Dolibarr (Menú inici-configuració-seguretat): %s Kb, límit PHP: %s Kb
-NoFileFound=No documents uploaded
+NoFileFound=No s'ha penjat cap document
 CurrentUserLanguage=Idioma actual
 CurrentTheme=Tema actual
 CurrentMenuManager=Gestor menú actual
@@ -843,7 +845,7 @@ XMoreLines=%s línia(es)  oculta(es)
 ShowMoreLines=Mostra més/menys línies
 PublicUrl=URL pública
 AddBox=Afegir quadre
-SelectElementAndClick=Selecciona un element i fes clic a %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=%s arxius a imprimir
 ShowTransaction=Mostra la transacció en el compte bancari
 ShowIntervention=Mostrar intervenció
@@ -854,8 +856,8 @@ Denied=Denegat
 ListOf=Llista de %s
 ListOfTemplates=Llistat de plantilles
 Gender=Sexe
-Genderman=Home
-Genderwoman=Dona
+Genderman=Male
+Genderwoman=Female
 Genderother=Altres
 ViewList=Vista llistat
 ViewGantt=Vista Gantt
@@ -1018,7 +1020,7 @@ SearchIntoContacts=Contactes
 SearchIntoMembers=Socis
 SearchIntoUsers=Usuaris
 SearchIntoProductsOrServices=Productes o serveis
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Lots / sèries
 SearchIntoProjects=Projectes
 SearchIntoMO=Ordres de fabricació
 SearchIntoTasks=Tasques
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Esteu segur que voleu afectar les etiquetes als registr
 CategTypeNotFound=No s'ha trobat cap tipus d'etiqueta per al tipus de registres
 CopiedToClipboard=Copiat al porta-retalls
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index e99d8a53704..9dc9b995352 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -15,24 +15,24 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un altre soci (nom: <b>%s</b>, nom d'
 ErrorUserPermissionAllowsToLinksToItselfOnly=Per motius de seguretat, se us ha de concedir permisos per a editar tots els usuaris per a poder enllaçar un soci a un usuari que no és vostre.
 SetLinkToUser=Vincular a un usuari Dolibarr
 SetLinkToThirdParty=Vincular a un tercer Dolibarr
-MembersCards=Carnets de socis
+MembersCards=Business cards for members
 MembersList=Llistat de socis
 MembersListToValid=Llistat de socis esborrany (per a validar)
 MembersListValid=Llistat de socis validats
 MembersListUpToDate=Llista de socis vàlids amb quotes al dia
 MembersListNotUpToDate=Llista de socis vàlids amb quotes pendents
-MembersListExcluded=List of excluded members
+MembersListExcluded=Llista de socis exclosos
 MembersListResiliated=Llista de socis donats de baixa
 MembersListQualified=Llistat de socis qualificats
 MenuMembersToValidate=Socis esborrany
 MenuMembersValidated=Socis validats
-MenuMembersExcluded=Excluded members
+MenuMembersExcluded=Socis exclosos
 MenuMembersResiliated=Socis donats de baixa
 MembersWithSubscriptionToReceive=Socis amb afiliació per rebre
 MembersWithSubscriptionToReceiveShort=Subscripcions per rebre
 DateSubscription=Data afiliació
 DateEndSubscription=Data final d'afiliació
-EndSubscription=Final d'afiliació
+EndSubscription=Subscription Ends
 SubscriptionId=ID d'afiliació
 WithoutSubscription=Sense afiliació
 MemberId=ID de soci
@@ -49,12 +49,12 @@ MemberStatusActiveLate=Afiliació no al dia
 MemberStatusActiveLateShort=No al dia
 MemberStatusPaid=Afiliacions al dia
 MemberStatusPaidShort=Al dia
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
+MemberStatusExcluded=Soci exclòs
+MemberStatusExcludedShort=Exclòs
 MemberStatusResiliated=Soci donat de baixa
 MemberStatusResiliatedShort=Baixa
 MembersStatusToValid=Socis esborrany
-MembersStatusExcluded=Excluded members
+MembersStatusExcluded=Socis exclosos
 MembersStatusResiliated=Socis donats de baixa
 MemberStatusNoSubscription=Validat (no cal subscripció)
 MemberStatusNoSubscriptionShort=Validat
@@ -83,12 +83,12 @@ WelcomeEMail=Correu electrònic de benvinguda
 SubscriptionRequired=Subjecte a cotització
 DeleteType=Elimina
 VoteAllowed=Vot autoritzat
-Physical=Físic
-Moral=Moral
-MorAndPhy=Moral i físic
-Reenable=Reactivar
-ExcludeMember=Exclude a member
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
+ExcludeMember=Exclou un soci
+ConfirmExcludeMember=Esteu segur que voleu excloure aquest soci?
 ResiliateMember=Dona de baixa un soci
 ConfirmResiliateMember=Vols donar de baixa aquest soci?
 DeleteMember=Elimina un soci
@@ -170,37 +170,37 @@ DocForLabels=Generació d'etiquetes d'adreces (Format de plantilla configurat ac
 SubscriptionPayment=Pagament de quota
 LastSubscriptionDate=Data de l'últim pagament de subscripció
 LastSubscriptionAmount=Import de la subscripció més recent
-LastMemberType=Last Member type
+LastMemberType=Darrer tipus de soci
 MembersStatisticsByCountries=Estadístiques de socis per país
 MembersStatisticsByState=Estadístiques de socis per província
 MembersStatisticsByTown=Estadístiques de socis per població
 MembersStatisticsByRegion=Estadístiques de socis per regió
-NbOfMembers=Nombre de socis
-NbOfActiveMembers=Nombre de socis actius actuals
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No s'ha trobat cap soci validat
-MembersByCountryDesc=Aquesta pantalla presenta una estadística del nombre de socis per país. No obstant això, el gràfic utilitza el servei en línia de gràfics de Google i només és operatiu quan es troba disponible una connexió a Internet.
-MembersByStateDesc=Aquesta pantalla presenta una estadística del nombre de socis per província
-MembersByTownDesc=Aquesta pantalla presenta una estadística del nombre de socis per població.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Tria les estadístiques que vols consultar...
 MenuMembersStats=Estadístiques
-LastMemberDate=Data de l'últim soci
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Data de l'última afiliació
-MemberNature=Naturalesa del membre
-MembersNature=Naturalesa dels socis
-Public=Informació pública
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=S'ha afegit un soci nou. Esperant l'aprovació
 NewMemberForm=Formulari de soci nou
-SubscriptionsStatistics=Estadístiques de cotitzacions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Nombre d'afiliacions
-AmountOfSubscriptions=Import de cotitzacions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Volum de vendes (empresa) o Pressupost (associació o col.lectiu)
 DefaultAmount=Import per defecte cotització
 CanEditAmount=El visitant pot triar/modificar l'import de la seva cotització
 MEMBER_NEWFORM_PAYONLINE=Anar a la pàgina integrada de pagament en línia
 ByProperties=Per naturalesa
 MembersStatisticsByProperties=Estadístiques dels membres per naturalesa
-MembersByNature=Aquesta pantalla mostra estadístiques de socis per caràcter.
-MembersByRegion=Aquesta pantalla mostra les estadístiques de socis per regió.
 VATToUseForSubscriptions=Taxa d'IVA per les afiliacions
 NoVatOnSubscription=Sense IVA per subscripcions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producte utilitzat per la línia de subscripció a la factura: %s
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 797693fc98e..4845f988a0e 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Llista de permisos definits
 SeeExamples=Mira exemples aquí
 EnabledDesc=Condició per a tenir aquest camp actiu (Exemples: 1 ó $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=És visible el camp ? (Exemples: 0=Mai visible, 1=Visible als llistats i als formularis crear/modificar/veure, 2=Visible només als llistats, 3=Visible només als formularis crear/modificar/veure (no als llistats), 4=Visible als llistats i només als formularis modificar/veure (no al de crear), 5=Visible als llistats i només al formulari de veure (però no als formularis de crear i modificar).<br><br>Utilitzant un valor negatiu implicarà que el camp no es mostrarà per defecte als llistats però podrà ser escollit per veure's).<br><br>pot ser una expressió, per exemple:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Mostra aquest camp en documents PDF compatibles. Podeu gestionar la posició amb el camp "Posició". <br/> Actualment, els models PDF compatibles coneguts són: eratosthene (comanda), espadon (enviament), sponge (factures), cyan (propal / pressupost), cornas (comanda del proveïdor) <br/> <br/><strong>Per al document :</strong><br/>0 = no es mostra<br/> 1 = mostra <br/> 2 = només si no està buit <br/> <br/> <strong> Per a les línies de documents: </strong> <br/> 0 = no es veuen les <br/> 1 = mostra en una columna <br/> = 3 = mostra a la columna de descripció de línia després de la descripció <br/> 4 = mostra a la columna de descripció després de la descripció només si no està buida
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Visualització en PDF
 IsAMeasureDesc=Es pot acumular el valor del camp per a obtenir un total a la llista? (Exemples: 1 o 0)
 SearchAllDesc=El camp utilitzat per realitzar una cerca des de l'eina de cerca ràpida? (Exemples: 1 o 0)
@@ -133,9 +133,9 @@ IncludeDocGeneration=Vull generar alguns documents des de l'objecte
 IncludeDocGenerationHelp=Si ho marques, es generarà el codi per afegir una casella "Generar document" al registre.
 ShowOnCombobox=Mostra el valor a la llista desplegable
 KeyForTooltip=Clau per donar més informació
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
+CSSClass=CSS per a editar/crear un formulari
+CSSViewClass=CSS per al formulari de lectura
+CSSListClass=CSS per a llistats
 NotEditable=No editable
 ForeignKey=Clau forana
 TypeOfFieldsHelp=Tipus de camps: <br> varchar(99), double (24,8), real, text, html, datetime, timestamp, integer, integer:ClassName: relativepath/to/classfile.class.php[:1[:filter]] ('1' significa que afegim un botó + després del desplegable per a crear el registre, 'filtre' pot ser 'status=1 AND fk_user=__USER_ID AND entity IN (__SHARED_ENTITIES__)' per exemple)
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 0003ac6205a..19c6ee764e8 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Instal·leu o activeu la biblioteca GD a la instal·lació d
 ProfIdShortDesc=<b>Prof Id %s </b> és una informació que depèn del país del tercer. <br>Per exemple, per al país <b>%s</b>, és el codi <b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
 StatsByNumberOfUnits=Estadístiques de suma de la quantitat de productes/serveis
-StatsByNumberOfEntities=Estadístiques en nombre d'entitats referents (número de factura o ordre ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Nombre de pressupostos
 NumberOfCustomerOrders=Nombre de comandes de venda
 NumberOfCustomerInvoices=Nombre de factures de client
@@ -289,4 +289,4 @@ PopuProp=Productes / Serveis per popularitat als pressupostos
 PopuCom=Productes / Serveis per popularitat a les comandes
 ProductStatistics=Productes / Serveis Estadístiques
 NbOfQtyInOrders=Quantitat en comandes
-SelectTheTypeOfObjectToAnalyze=Seleccioneu el tipus d'objecte a analitzar ...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/ca_ES/partnership.lang b/htdocs/langs/ca_ES/partnership.lang
new file mode 100644
index 00000000000..6ee81ae5692
--- /dev/null
+++ b/htdocs/langs/ca_ES/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Data inicial
+DatePartnershipEnd=Data final
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Esborrany
+PartnershipAccepted = Acceptat
+PartnershipRefused = Rebutjat
+PartnershipCanceled = Cancel·lat
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 3cf6573bf26..2b1ea9d1a1f 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index e0d958054d0..40e9267f8ad 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Serveis només en venda
 ServicesOnPurchaseOnly=Serveis només per compra
 ServicesNotOnSell=Serveis no a la venda i no per a la compra
 ServicesOnSellAndOnBuy=Serveis en venda o de compra
-LastModifiedProductsAndServices=Els %s últims productes/serveis modificats
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Últims %s productes registrats
 LastRecordedServices=Últims %s serveis registrats
 CardProduct0=Producte
@@ -73,12 +73,12 @@ SellingPrice=Preu de venda
 SellingPriceHT=Preu de venda (sense IVA)
 SellingPriceTTC=PVP amb IVA
 SellingMinPriceTTC=Preu mínim de venda (IVA inclòs)
-CostPriceDescription=Aquest camp de preus (sense IVA) es pot utilitzar per emmagatzemar l'import mitjà que aquest producte suposa per a la vostra empresa. Pot ser qualsevol preu que calculeu, per exemple, des del preu mitjà de compra més el cost mitjà de producció i distribució.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Aquest valor pot utilitzar-se per al càlcul de marges
 SoldAmount=Import venut
 PurchasedAmount=Import comprat
 NewPrice=Preu nou
-MinPrice=Min. preu de venda
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edita l'etiqueta de preu de venda
 CantBeLessThanMinPrice=El preu de venda no pot ser inferior al mínim permès per a aquest producte (%s sense IVA). Aquest missatge també pot aparèixer si escriviu un descompte massa gran.
 ContractStatusClosed=Tancat
@@ -157,11 +157,11 @@ ListServiceByPopularity=Llistat de serveis per popularitat
 Finished=Producte fabricat
 RowMaterial=Matèria primera
 ConfirmCloneProduct=Estàs segur que vols clonar el producte o servei <b>%s</b>?
-CloneContentProduct=Clona tota la informació principal del producte/servei
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clonar preus
-CloneCategoriesProduct=Etiquetes i categories de clons enllaçades
-CloneCompositionProduct=Clonar virtualment un producte/servei
-CloneCombinationsProduct=Clonar variants de producte
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Aquest producte és utilitzat
 NewRefForClone=Ref. del producte/servei nou
 SellingPrices=Preus de venda
@@ -170,12 +170,12 @@ CustomerPrices=Preus de client
 SuppliersPrices=Preus del proveïdor
 SuppliersPricesOfProductsOrServices=Preus del venedor (de productes o serveis)
 CustomCode=Duanes | Productes bàsics | Codi HS
-CountryOrigin=País d'origen
-RegionStateOrigin=Regió d'origen
-StateOrigin=Estat | Província d'origen
-Nature=Naturalesa del producte (material/acabat)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Naturalesa del producte
-NatureOfProductDesc=Matèria primera o producte acabat
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Etiqueta curta
 Unit=Unitat
 p=u.
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 3a6db3e2b39..72b37f52286 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Contactes del projecte
 ProjectsImContactFor=Projectes dels qui en soc explícitament un contacte
 AllAllowedProjects=Tots els projectes que puc llegir (meu + públic)
 AllProjects=Tots els projectes
-MyProjectsDesc=Aquesta vista mostra aquells projectes dels quals sou un contacte.
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 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.
 ProjectsPublicTaskDesc=Aquesta vista mostra tots els projectes als que té dret a visualitzar
 ProjectsDesc=Aquesta vista mostra tots els projectes (les seves autoritzacions li ofereixen una visió completa).
 TasksOnProjectsDesc=Aquesta vista mostra totes les tasques en tots els projectes (els teus permisos d'usuari et donen dret a visualitzar-ho tot).
-MyTasksDesc=Aquesta vista es limita als projectes o a les tasques als quals sou un contacte.
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Només visibles els projectes oberts (els projectes en estat d'esborrany o tancats no són visibles)
 ClosedProjectsAreHidden=Els projectes tancats no són visibles.
 TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
 TasksDesc=Aquesta vista presenta tots els projectes i tasques (els permisos d'usuari us concedeixen permís per veure-ho tot).
 AllTaskVisibleButEditIfYouAreAssigned=Totes les tasques per a projectes qualificats són visibles, però podeu ingressar només el temps per a la tasca assignada a l'usuari seleccionat. Assigneu la tasca si necessiteu introduir-hi el temps.
-OnlyYourTaskAreVisible=Només són visibles les tasques que tens assignades. Assigna't tasques si no són visibles i vols afegir-hi les hores.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasques de projectes
 ProjectCategories=Etiquetes de projecte
 NewProject=Projecte nou
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=No assignat a la tasca
 NoUserAssignedToTheProject=No hi ha usuaris assignats a aquest projecte
 TimeSpentBy=Temps gastat per
 TasksAssignedTo=Tasques assignades a
-AssignTaskToMe=Assignar-me una tasca
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assigna una tasca a %s
 SelectTaskToAssign=Selecciona la tasca per a assignar ...
 AssignTask=Assigna
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index 258f0378d23..3055c12af26 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -59,7 +59,7 @@ ConfirmClonePropal=Estàs segur que vols clonar la proposta comercial <b>%s</b>?
 ConfirmReOpenProp=Esteu segur que voleu tornar a obrir el pressupost <b>%s</b>?
 ProposalsAndProposalsLines=Pressupostos a clients i línies de pressupostos
 ProposalLine=Línia de pressupost
-ProposalLines=Proposal lines
+ProposalLines=Línies de pressupost
 AvailabilityPeriod=Temps de lliurament
 SetAvailability=Indica el temps de lliurament
 AfterOrder=després de la comanda
diff --git a/htdocs/langs/ca_ES/recruitment.lang b/htdocs/langs/ca_ES/recruitment.lang
index f9b8ebf2176..6482ee9a72d 100644
--- a/htdocs/langs/ca_ES/recruitment.lang
+++ b/htdocs/langs/ca_ES/recruitment.lang
@@ -35,7 +35,7 @@ EnablePublicRecruitmentPages=Activa les pàgines públiques de treballs actius
 #
 # About page
 #
-About = Sobre
+About = Quant a
 RecruitmentAbout = Quant a la contractació
 RecruitmentAboutPage = Pàgina quant a la contractació
 NbOfEmployeesExpected=Nombre previst d'empleats
@@ -53,7 +53,7 @@ NewPositionToBeFilled=Llocs de treball nous
 JobOfferToBeFilled=Lloc de treball a cobrir
 ThisIsInformationOnJobPosition=Informació del lloc de treball a ocupar
 ContactForRecruitment=Contacte per a la contractació
-EmailRecruiter=El reclutador de correu electrònic
+EmailRecruiter=Correu electrònic del reclutador
 ToUseAGenericEmail=Per a utilitzar un correu electrònic genèric. Si no està definit, s’utilitzarà el correu electrònic del responsable de la contractació
 NewCandidature=Candidatura nova
 ListOfCandidatures=Llista de candidatures
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Gràcies per la teva candidatura. <br> ...
 JobClosedTextCandidateFound=L’oferta de feina està tancada. El lloc s'ha cobert.
 JobClosedTextCanceled=L’oferta de feina està tancada.
 ExtrafieldsJobPosition=Atributs complementaris (llocs de treball)
-ExtrafieldsCandidatures=Atributs complementaris (sol·licituds de feina)
+ExtrafieldsApplication=Atributs complementaris (sol·licituds de feina)
 MakeOffer=Feu una oferta
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index de594952360..50e733b564f 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -2,12 +2,15 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable utilitzat per usuaris tercers
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=El compte comptable dedicat definit a la fitxa d'usuari només s’utilitzarà per a la comptabilitat auxiliar. Aquest s'utilitzarà per al llibre major i com a valor per defecte de la comptabilitat auxiliar si no es defineix un compte comptable d'usuari dedicat.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable per defecte per als pagaments salarials
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Sou
 Salaries=Sous
-NewSalaryPayment=Pagament de salari nou
+NewSalary=Salari nou
+NewSalaryPayment=Fitxa de salari nova
 AddSalaryPayment=Afegeix pagament de sou
 SalaryPayment=Pagament de sous
 SalariesPayments=Pagaments de sous
+SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Veure pagament de sous
 THM=Tarifa per hora mitjana
 TJM=Tarifa mitjana diària
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index a973ace4aee..29da54f2084 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Estàs segur que vols validar aquest enviament amb refer
 ConfirmCancelSending=Esteu segur que voleu cancel·lar aquest enviament?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Alerta, cap producte en espera d'enviament.
-StatsOnShipmentsOnlyValidated=Estadístiques realitzades únicament sobre les expedicions validades
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Data prevista d'entrega
 RefDeliveryReceipt=Referència del rebut de lliurament
 StatusReceipt=Estat del rebut de lliurament
@@ -59,7 +59,7 @@ ProductQtyInCustomersOrdersRunning=Quantitat de producte en comandes de venda ob
 ProductQtyInSuppliersOrdersRunning=Quantitat de producte en comandes de compra obertes
 ProductQtyInShipmentAlreadySent=Quantitat de producte de comandes de vendes obertes ja enviades
 ProductQtyInSuppliersShipmentAlreadyRecevied=Quantitat de producte de comandes de compra obertes ja rebudes
-NoProductToShipFoundIntoStock=No s'ha trobat cap producte per enviar al magatzem <b>%s</b>. Corregiu l'estoc o torneu enrere per triar un altre magatzem.
+NoProductToShipFoundIntoStock=No s'ha trobat cap producte per a enviar al magatzem <b>%s</b>. Corregiu l'estoc o torneu enrere per a triar un altre magatzem.
 WeightVolShort=Pes/Vol.
 ValidateOrderFirstBeforeShipment=S'ha de validar la comanda abans de fer expedicions.
 
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index a21928521d2..8dd9b8ec46b 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -19,8 +19,8 @@ Stock=Estoc
 Stocks=Estocs
 MissingStocks=Estocs que falten
 StockAtDate=Estocs en data
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+StockAtDateInPast=Data en el passat
+StockAtDateInFuture=Data en el futur
 StocksByLotSerial=Estocs per lot/sèrie
 LotSerial=Lots/Sèries
 LotSerialList=Llista de lots/sèries
@@ -37,7 +37,7 @@ AllWarehouses=Tots els magatzems
 IncludeEmptyDesiredStock=Inclou també estoc negatives amb estoc desitjat no definit
 IncludeAlsoDraftOrders=Inclou també projectes d'ordre
 Location=Lloc
-LocationSummary=Short name of location
+LocationSummary=Nom curt de la ubicació
 NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Nombre total de productes
 LastMovement=Últim moviment
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No hi ha productes predefinits en aquest objecte.
 DispatchVerb=Desglossar
 StockLimitShort=Límit per l'alerta
 StockLimit=Estoc límit per les alertes
-StockLimitDesc=(buit) significa cap advertència. <br> 0 es pot utilitzar per a una advertència quan l'estoc sigui buit.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Estoc físic
 RealStock=Estoc real
 RealStockDesc=L'estoc físic o real és l'estoc que tens actualment als teus magatzems/emplaçaments interns.
@@ -156,7 +156,7 @@ StockMustBeEnoughForInvoice=El nivell d'estoc ha de ser suficient per afegir el
 StockMustBeEnoughForOrder=El nivell d'estoc ha de ser suficient per afegir el producte/servei a la comanda (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a la comanda sigui quina sigui la regla del canvi automàtic d'estoc)
 StockMustBeEnoughForShipment= El nivell d'estoc ha de ser suficient per afegir el producte/servei a l'enviament (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a l'enviament sigui quina sigui la regla del canvi automàtic d'estoc)
 MovementLabel=Etiqueta del moviment
-TypeMovement=Direction of movement
+TypeMovement=Direcció de moviment
 DateMovement=Data de moviment
 InventoryCode=Moviments o codi d'inventari
 IsInPackage=Contingut en producte compost
@@ -185,7 +185,7 @@ inventoryCreatePermission=Crea un inventari nou
 inventoryReadPermission=Veure inventaris
 inventoryWritePermission=Actualitza els inventaris
 inventoryValidatePermission=Valida l'inventari
-inventoryDeletePermission=Delete inventory
+inventoryDeletePermission=Suprimeix l'inventari
 inventoryTitle=Inventari
 inventoryListTitle=Inventaris
 inventoryListEmpty=Cap inventari en progrés
@@ -249,7 +249,7 @@ ImportFromCSV=Import CSV list of movement
 ChooseFileToImport=Pengeu un fitxer i feu clic a la icona %s per seleccionar el fitxer com a fitxer d'importació d'origen ...
 SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
-LabelOfInventoryMovemement=Inventory %s
+LabelOfInventoryMovemement=Inventari %s
 ReOpen=Reobrir
 ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
 ObjectNotFound=%s not found
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 953b40e6747..341343b9634 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -70,7 +70,7 @@ Deleted=Esborrat
 # Dict
 Type=Tipus
 Severity=Gravetat
-TicketGroupIsPublic=Group is public
+TicketGroupIsPublic=El grup és públic
 TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index d6c2bba06d7..5694fe70dbd 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Contrasenya modificada en: %s
 SubjectNewPassword=La teva nova paraula de pas per a %s
 GroupRights=Permisos de grup
 UserRights=Permisos usuari
+Credentials=Credentials
 UserGUISetup=Configuració d'entorn d'usuari
 DisableUser=Desactiva
 DisableAUser=Desactiva un usuari
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Modificar el camp Tipus per canviar
 OpenIDURL=URL d'OpenID
 LoginUsingOpenID=Utilitzeu OpenID per a iniciar la sessió
 WeeklyHours=Hores treballades (per setmana)
-ExpectedWorkedHours=Hores treballades setmanals esperades
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color d'usuari
 DisabledInMonoUserMode=Deshabilitat en mode manteniment
 UserAccountancyCode=Codi comptable de l'usuari
@@ -115,7 +116,7 @@ DateOfEmployment=Data de treball
 DateEmployment=Ocupació
 DateEmploymentstart=Data d'inici de l'ocupació
 DateEmploymentEnd=Data de finalització de l'ocupació
-RangeOfLoginValidity=Interval de dates de validesa d'inici de sessió
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=No podeu desactivar el vostre propi registre d'usuari
 ForceUserExpenseValidator=Validador de l'informe de despeses obligatori
 ForceUserHolidayValidator=Forçar validador de sol·licitud d'abandonament
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 11cd6fe85f1..e2a9e6dce71 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -137,11 +137,11 @@ PagesRegenerated=%s pàgina (es) / contenidor (s) regenerada
 RegenerateWebsiteContent=Regenera els fitxers de memòria cau del lloc web
 AllowedInFrames=Es permet en marcs
 DefineListOfAltLanguagesInWebsiteProperties=Definiu la llista de tots els idiomes disponibles a les propietats del lloc web.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+GenerateSitemaps=Genera un fitxer de mapa del lloc del lloc web
+ConfirmGenerateSitemaps=Si ho confirmeu, suprimireu el fitxer de mapa del lloc existent...
+ConfirmSitemapsCreation=Confirmeu la generació del mapa del lloc
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/ca_ES/zapier.lang b/htdocs/langs/ca_ES/zapier.lang
index 339b5833153..c46dbb0a6d8 100644
--- a/htdocs/langs/ca_ES/zapier.lang
+++ b/htdocs/langs/ca_ES/zapier.lang
@@ -17,5 +17,5 @@ ModuleZapierForDolibarrName = Zapier per a Dolibarr
 ModuleZapierForDolibarrDesc = Mòdul Zapier per a Dolibarr
 ZapierForDolibarrSetup=Configuració de Zapier per a Dolibarr
 ZapierDescription=Interfície amb Zapier
-ZapierAbout=About the module Zapier
+ZapierAbout=Quant al mòdul Zapier
 ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 6a8932a1eb4..311edecfc69 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Štítek účtu
 LabelOperation=Operace štítků
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Písmenový kód
 Lettering=Nápis
 Codejournal=Deník
@@ -297,7 +297,7 @@ NoNewRecordSaved=Žádný další záznam, který by se publikoval
 ListOfProductsWithoutAccountingAccount=Seznam výrobků, které nejsou vázány na kterémkoli účetním účtu
 ChangeBinding=Změnit vazby
 Accounted=Účtováno v knize
-NotYetAccounted=Zatím nebyl zaznamenán v knize
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Zobrazit výuku
 NotReconciled=Nesladěno
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 8a372311140..c4e666b6ae5 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Odebrat / přejmenovat soubor <b> %s </b>, pokud existuje, povolit po
 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í
 PHPSetup=PHP setup
+OSSetup=OS setup
 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šší
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Nenavrhujte
 NoActiveBankAccountDefined=Není definován žádný aktivní bankovní účet
 OwnerOfBankAccount=Majitel %s bankovních účtů
 BankModuleNotActive=Modul bankovních účtů není povolen
-ShowBugTrackLink=Zobrazit odkaz "<strong> %s </strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Upozornění
 DelaysOfToleranceBeforeWarning=Zpoždění před zobrazením varovného upozornění:
 DelaysOfToleranceDesc=Nastavte zpoždění před zobrazením ikony výstrahy %s na obrazovce pro pozdní prvek.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Tento příkaz musíte spustit
 YourPHPDoesNotHaveSSLSupport=SSL funkce není k dispozici ve vašem PHP
 DownloadMoreSkins=Další skiny ke stažení
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Zobrazit profesionální id s adresami
 ShowVATIntaInAddress=Skrýt číslo DPH uvnitř Společenství s adresami
 TranslationUncomplete=Částečný překlad
@@ -2062,7 +2064,7 @@ UseDebugBar=Použijte ladicí lištu
 DEBUGBAR_LOGS_LINES_NUMBER=Počet posledních řádků protokolu, které se mají uchovávat v konzole
 WarningValueHigherSlowsDramaticalyOutput=Varování, vyšší hodnoty dramaticky zpomalují výstup
 ModuleActivated=Je aktivován modul %s a zpomaluje rozhraní
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index eae8122c9eb..c252b7c5891 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Převod peněz
 BankTransfers=Kreditní převody
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Převod z jednoho účtu na jiný, Dolibarr zapíše dva záznamy (debet na zdrojovém účtu a kredit na cílový účet). Pro tuto transakci bude použita stejná částka (kromě znaménka), štítek a datum)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Z
 TransferTo=Na
 TransferFromToDone=Převod z <b>%s</b> na <b>%s</b> %s <b>%s</b> byl zaznamenán.
-CheckTransmitter=Převádějící
+CheckTransmitter=Odesílatel
 ValidateCheckReceipt=Ověřit potvrzení o kontrole?
-ConfirmValidateCheckReceipt=Jste si jisti, že chcete ověřit zaškrtnutí tohoto potvrzení? Jakmile ho provedete, nebudete ho již moci změnit.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Chcete smazat potvrzení o kontrole?
 ConfirmDeleteCheckReceipt=Opravdu chcete tuto potvrzení o potvrzení vymazat?
 BankChecks=Bankovní šeky
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Opravdu chcete tuto položku smazat?
 ThisWillAlsoDeleteBankRecord=Toto odstraní vznikající bankovní transakce
 BankMovements=Pohyby
 PlannedTransactions=Plánované záznamy
-Graph=Grafika
+Graph=Graphs
 ExportDataset_banque_1=Bankovní záznamy a výpis z účtu
 ExportDataset_banque_2=Vkladní lístek
 TransactionOnTheOtherAccount=Transakce na jiný účet
@@ -142,7 +142,7 @@ AllAccounts=Všechny bankovní a hotovostní účty
 BackToAccount=Zpět na účet
 ShowAllAccounts=Zobrazit pro všechny účty
 FutureTransaction=Budoucí transakce. Nedá se sladit.
-SelectChequeTransactionAndGenerate=Zvolte / filtrujte kontroly, které chcete zahrnout do potvrzení o vkladové kartě a klikněte na "Vytvořit".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Vyberte si výpis z účtu v souvislosti s porovnáváním. Použijte tříditelnou číselnou hodnotu: YYYYMM nebo YYYYMMDD
 EventualyAddCategory=Eventuelně upřesněte kategorii, ve které chcete klasifikovat záznamy
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 55a14d2395a..672bea2161e 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Převedení přeplatku na dostupnou slevu
 EnterPaymentReceivedFromCustomer=Zadejte platbu obdrženoou od zákazníka
 EnterPaymentDueToCustomer=Provést platbu pro zákazníka
 DisabledBecauseRemainderToPayIsZero=Zakázáno, protože zbývající nezaplacená částka je nula
-PriceBase=Základní cena
+PriceBase=Base price
 BillStatus=Stav faktury
 StatusOfGeneratedInvoices=Status vygenerovaných faktur
 BillStatusDraft=Návrh (musí být ověřeno)
@@ -454,7 +454,7 @@ RegulatedOn=Regulovány
 ChequeNumber=Zkontrolujte N °
 ChequeOrTransferNumber=Kontrola/převod č.
 ChequeBordereau=Kontrola rozvrh
-ChequeMaker=Zkontrolujte převod
+ChequeMaker=Check/Transfer sender
 ChequeBank=Šek z banky
 CheckBank=Kontrola (šek)
 NetToBePaid=Částka má být zaplacena
diff --git a/htdocs/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang
index 62df479df3d..dda43454d4b 100644
--- a/htdocs/langs/cs_CZ/boxes.lang
+++ b/htdocs/langs/cs_CZ/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Záložky: poslední %s
 BoxOldestExpiredServices=Nejstarší aktivní expirované služby
 BoxLastExpiredServices=Nejnovější %s nejstarší kontakty s aktivním vypršením služby
 BoxTitleLastActionsToDo=Poslední %s vykonané akce
-BoxTitleLastContracts=Poslední %s modifikované smlouvy
-BoxTitleLastModifiedDonations=Nejnovější %s upravené dary
-BoxTitleLastModifiedExpenses=Nejnovější %s upravené výkazy výdajů
-BoxTitleLatestModifiedBoms=Poslední %s upravené kusovníky
-BoxTitleLatestModifiedMos=Poslední upravené výrobní zakázky %s
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globální aktivita (faktury, návrhy, objednávky)
 BoxGoodCustomers=Dobří zákazníci
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index 58ca4072acb..fec119b5131 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Podlaha
 AddTable=Přidat tabulku
 Place=Místo
 TakeposConnectorNecesary=Je vyžadován  "TakePOS Connector"
-OrderPrinters=Objednejte tiskárny
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Vyhledat produkt
 Receipt=Příjem
 Header=Záhlaví
@@ -56,8 +57,9 @@ Paymentnumpad=Zadejte Pad pro vložení platby
 Numberspad=Numbers Pad
 BillsCoinsPad=Mince a bankovky Pad
 DolistorePosCategory=Moduly TakePOS a další POS řešení pro Dolibarr
-TakeposNeedsCategories=Firma TakePOS potřebuje k tomu produktové kategorie
-OrderNotes=Objednací poznámky
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Výchozí účet, který se má použít pro platby v účtu
 NoPaimementModesDefined=V konfiguraci TakePOS není definován žádný režim platby
 TicketVatGrouped=Skupinová DPH podle sazeb v vstupenkách |
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Faktura je již ověřena
 NoLinesToBill=Žádné řádky k vyúčtování
 CustomReceipt=Vlastní příjem
 ReceiptName=Jméno příjmu
-ProductSupplements=Doplňky produktu
+ProductSupplements=Manage supplements of products
 SupplementCategory=Doplňková kategorie
 ColorTheme=Barevný motiv
 Colorful=Barvitý
@@ -92,7 +94,7 @@ Browser=Prohlížeč
 BrowserMethodDescription=Jednoduchý a snadný tisk účtenek. Pouze několik parametrů pro konfiguraci příjmu. Tisk přes prohlížeč.
 TakeposConnectorMethodDescription=Externí modul s extra funkcemi. Možnost tisku z cloudu.
 PrintMethod=Metoda tisku
-ReceiptPrinterMethodDescription=Výkonná metoda se spoustou parametrů. Plně přizpůsobitelné pomocí šablon. Nelze tisknout z cloudu.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=Terminálem
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Modul číslování pro prodej POS
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
index f2da2c07ab7..149a54c7f44 100644
--- a/htdocs/langs/cs_CZ/categories.lang
+++ b/htdocs/langs/cs_CZ/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Kategorie
 Rubriques=Tagy/Kategorie
 RubriquesTransactions=Tagy/kategorie transakcí
 categories=tagy/kategorie
-NoCategoryYet=Žádný tag/kategorie tohoto typu nebyla vytvořena
+NoCategoryYet=No tag/category of this type has been created
 In=V
 AddIn=Přidejte
 modify=upravit
 Classify=Třídit
 CategoriesArea=Oblast tagy/kategorie
-ProductsCategoriesArea=Oblast Produkty/Služby tagy/kategorie
-SuppliersCategoriesArea=Oblast značek/kategorií prodejců
-CustomersCategoriesArea=Oblast zákaznické tagy/kategorie
-MembersCategoriesArea=Oblast uživatelské tagy/kategorie
-ContactsCategoriesArea=Oblast tagy/kategorie kontakty
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Oblast projektů značek/kategorií
-UsersCategoriesArea=Kategorie značek/kategorií uživatelů
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Podkategorie
 CatList=Výpis tagů/kategorií
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Vyberte kategorii
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Použití nebo operátor pro kategorie
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 995c7c7d9df..0f6f4a51365 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Společnost %s již existuje. Zadejte jiný název.
 ErrorSetACountryFirst=Nejprve vyberte zemi.
 SelectThirdParty=Vyberte subjekt
-ConfirmDeleteCompany=Opravdu chcete smazat tuto společnost a všechny její zděděné informace?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Smazat kontakt/adresu
-ConfirmDeleteContact=Opravdu chcete smazat tento kontakt a všechny zděděné informace?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Nový subjekt
 MenuNewCustomer=Nový zákazník
 MenuNewProspect=Nový cíl
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Hovor
 Chat=Chat
-PhonePro=Telefon [práce]
+PhonePro=Bus. phone
 PhonePerso=Telefon osobní
 PhoneMobile=Mobil
 No_Email=Odmítnout hromadné e-maily
@@ -78,7 +78,7 @@ Zip=PSČ
 Town=Město
 Web=Web
 Poste= Pozice
-DefaultLang=Výchozí jazyk
+DefaultLang=Základní jazyk
 VATIsUsed=Použitá daň z prodeje
 VATIsUsedWhenSelling=To určuje, zda tento subjekt zahrnuje nebo neplatí daň z prodeje, když fakturu vystavuje svým vlastním zákazníkům
 VATIsNotUsed=Daň z prodeje se nepoužívá
@@ -331,7 +331,7 @@ CustomerCodeDesc=Zákaznický kód, jedinečný pro všechny zákazníky
 SupplierCodeDesc=Dodavatelský kód, jedinečný pro všechny dodavatele
 RequiredIfCustomer=Požadováno, pokud subjekt je zákazník či cíl
 RequiredIfSupplier=Požadováno, pokud je dodavatelem subjekt
-ValidityControledByModule=Platnost řízená modulem
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Pravidla pro tento modul
 ProspectToContact=Cíl ke kontaktování
 CompanyDeleted=Společnost %s odstraněna z databáze.
@@ -439,12 +439,12 @@ ListSuppliersShort=Seznam dodavatelů
 ListProspectsShort=Seznam cílů
 ListCustomersShort=Seznam zákazníků
 ThirdPartiesArea=Kontakty subjektů
-LastModifiedThirdParties=Posledních %s změněných subjektů
-UniqueThirdParties=Celkem subjektů
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Otevřeno
 ActivityCeased=Uzavřeno
 ThirdPartyIsClosed=Subjekt je uzavřen
-ProductsIntoElements=Seznam produktů/služeb do %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Momentální nezaplacený účet
 OutstandingBill=Max. za nezaplacený účet
 OutstandingBillReached=Max. pro dosažení vynikajícího účtu
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Kód je volný. Tento kód lze kdykoli změnit.
 ManagingDirectors=Jméno vedoucího (CEO, ředitel, předseda ...)
 MergeOriginThirdparty=Duplicitní subjekt (subjekt, který chcete smazat)
 MergeThirdparties=Sloučit subjekty
-ConfirmMergeThirdparties=Opravdu chcete tento subjekt sloučit do stávající? Všechny propojené objekty (faktury, objednávky, ...) budou přesunuty na stávající subjekt a výchozí subjekt bude smazán.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Subjekty byly sloučeny
 SaleRepresentativeLogin=Přihlášení obchodního zástupce
 SaleRepresentativeFirstname=Jméno obchodního zástupce
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 03c7be0a85e..7f762cef9a5 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Nová sleva
 NewCheckDeposit=Nová kontrola zálohy
 NewCheckDepositOn=Vytvořte potvrzení o vkladu na účet: %s
 NoWaitingChecks=Žádný šek nečeká na vklad
-DateChequeReceived=Zkontrolujte datum příjmu
+DateChequeReceived=Check receiving date
 NbOfCheques=Počet kontrol
 PaySocialContribution=Platit sociální / fiskální daň
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/cs_CZ/ecm.lang b/htdocs/langs/cs_CZ/ecm.lang
index 491dab5f6c0..b7f5ed2a090 100644
--- a/htdocs/langs/cs_CZ/ecm.lang
+++ b/htdocs/langs/cs_CZ/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 3c541433685..c2f0a89f984 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Žádná chyba, jsme se nedopustili
 # Errors
 ErrorButCommitIsDone=Byly nalezeny chyby, ale přesto jsme provedli ověření. Snad to pojede ....
-ErrorBadEMail=E-mail %s je špatný
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s je špatně
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Špatná hodnota parametru. Připojí se obecně, když chybí překlad.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Přihlášení %s již existuje.
@@ -46,8 +46,8 @@ ErrorWrongDate=Datum není správné!
 ErrorFailedToWriteInDir=Nepodařilo se zapsat do adresáře %s
 ErrorFoundBadEmailInFile=Byla nalezena nesprávná syntaxe e-mailu pro řádky %s v souboru (příkladový řádek %s s e-mailem = %s)
 ErrorUserCannotBeDelete=Uživatele nelze smazat. Možná je spojen s entitami Dolibarr. 
-ErrorFieldsRequired=Některá povinná pole nebyla vyplněna.  Neflákejte to !!
-ErrorSubjectIsRequired=Předmět e-mailu je povinný
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Nepodařilo se vytvořit adresář. Zkontrolujte, zda má uživatel webového serveru oprávnění zapisovat do adresáře dokumentů Dolibarr. Pokud je v tomto PHP aktivován parametr <b> safe_mode</b>, zkontrolujte, zda jsou soubory Dolibarr php vlastní uživateli (nebo skupinou) webového serveru.
 ErrorNoMailDefinedForThisUser=Pro tohoto uživatele není definován žádný e-mail
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Stránka / kontejner <strong> %s</str
 ErrorDuringChartLoad=Při načtení tabulky účtů došlo k chybě. Pokud nebylo načteno několik účtů, můžete je zadat ručně.
 ErrorBadSyntaxForParamKeyForContent=Špatná syntaxe pro parametr keyforfortent. Musí mít hodnotu začínající %s nebo %s
 ErrorVariableKeyForContentMustBeSet=Chyba, musí být nastavena konstanta s názvem %s (s obsahem textu, který se má zobrazit) nebo %s (s externí adresou URL).
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=Adresa URL %s musí začínat http: // nebo https: //
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Chyba, nový odkaz je již použit
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/cs_CZ/eventorganization.lang b/htdocs/langs/cs_CZ/eventorganization.lang
new file mode 100644
index 00000000000..58001532280
--- /dev/null
+++ b/htdocs/langs/cs_CZ/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Nastavení
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Návrh
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Hotový
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/cs_CZ/knowledgemanagement.lang b/htdocs/langs/cs_CZ/knowledgemanagement.lang
new file mode 100644
index 00000000000..96771480aff
--- /dev/null
+++ b/htdocs/langs/cs_CZ/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Nastavení
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = O aplikaci
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Článek
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index ffa9e363aa8..f48a41b0f85 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Uživateli (uživatelům)
 MailCC=Kopírovat do
 MailToCCUsers=Kopírovat uživatele (e)
 MailCCC=Do mezipaměti kopie
-MailTopic=Předmět
+MailTopic=Email subject
 MailText=Zpráva
 MailFile=Přiložené soubory
 MailMessage=Tělo e-mailu
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Konfigurace odesílání e-maiů byla nastavena tak, aby '%s'. Tento režim nelze použít k odesílání hromadných e-mailů.
 MailSendSetupIs2=Nejprve je nutné jít s admin účtem, do nabídky%sHome - Nastavení - e-maily%s pro změnu parametru <strong>"%s"</strong> do režimu použít "%s". V tomto režimu, můžete zadat nastavení serveru SMTP vašeho  poskytovatele služeb internetu a používat hromadnou e-mailovou funkci.
 MailSendSetupIs3=Pokud máte nějaké otázky o tom, jak nastavit SMTP server, můžete se zeptat na%s, nebo si prostudujte dokumentaci vašeho poskytovatele. \nPoznámka: V současné době bohužel většina serverů nasazuje služby pro filtrování nevyžádané pošty a různé způsoby ověřování odesilatele. Bez detailnějších znalostí a nastavení vašeho SMTP serveru se vám bude vracet většina zpráv jako nedoručené.
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index b0431474555..3b6831ed98e 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Uložit a nové
 TestConnection=Vyzkoušejte připojení
 ToClone=Klon
 ConfirmCloneAsk=Opravdu chcete klonovat objekt <b> %s </b>?
-ConfirmClone=Vyberte data, která chcete klonovat:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Nejsou definovány žádné údaje ke klonování.
 Of=z
 Go=Jít
@@ -246,7 +246,7 @@ DefaultModel=Výchozí šablona doc
 Action=Událost
 About=O
 Number=Číslo
-NumberByMonth=Číslo podle měsíce
+NumberByMonth=Total reports by month
 AmountByMonth=Částka podle měsíce
 Numero=Číslo
 Limit=Omezení
@@ -341,8 +341,8 @@ KiloBytes=Kilobajty
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabajtů
-UserAuthor=Uživatel vytváření
-UserModif=Uživatel poslední aktualizace
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Podle
 From=Z
 FromDate=Z
 FromLocation=Z
-at=at
 to=na
 To=na
+ToDate=na
+ToLocation=na
+at=at
 and=a
 or=nebo
 Other=Ostatní
@@ -843,7 +845,7 @@ XMoreLines=%s řádky(ů) skryto
 ShowMoreLines=Zobrazit více/méně řádků
 PublicUrl=Veřejná URL
 AddBox=Přidejte box
-SelectElementAndClick=Vyberte prvek a klepněte na tlačítko %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Tisk souboru %s
 ShowTransaction=Ukázat záznam o bankovním účtu
 ShowIntervention=Zobrazit intervenci
@@ -854,8 +856,8 @@ Denied=Odmítnuto
 ListOf=Seznam %s
 ListOfTemplates=Seznam šablon
 Gender=Pohlaví
-Genderman=Muž
-Genderwoman=Žena
+Genderman=Male
+Genderwoman=Female
 Genderother=Jiný
 ViewList=Zobrazení seznamu
 ViewGantt=Ganttův pohled
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index 0119a066681..a7ea7850e86 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Další člen (jméno: <b> %s</b>, p
 ErrorUserPermissionAllowsToLinksToItselfOnly=Z bezpečnostních důvodů musíte mít oprávnění k úpravě všech uživatelů, abyste mohli člena propojit s uživatelem, který není vaším.
 SetLinkToUser=Odkaz na uživateli Dolibarr
 SetLinkToThirdParty=Odkaz na Dolibarr subjektu
-MembersCards=Vizitky členů
+MembersCards=Business cards for members
 MembersList=Seznam členů
 MembersListToValid=Seznam členů návrhu (bude ověřeno)
 MembersListValid=Seznam platných členů
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Členové s předplatným k přijímání
 MembersWithSubscriptionToReceiveShort=Předplatné k odběru
 DateSubscription=Vstupní data
 DateEndSubscription=Datum ukončení předplatného
-EndSubscription=Konec odběru
+EndSubscription=Subscription Ends
 SubscriptionId=ID předplatného
 WithoutSubscription=Without subscription
 MemberId=ID člena
@@ -83,10 +83,10 @@ WelcomeEMail=Vítejte e-mail
 SubscriptionRequired=Předplatné vyžadovalo
 DeleteType=Vymazat
 VoteAllowed=Hlasování povoleno
-Physical=Fyzický
-Moral=Morální
-MorAndPhy=Moral and Physical
-Reenable=Znovu povolit
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Ukončit člena
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Členové Statistiky podle země
 MembersStatisticsByState=Členové statistika stát / provincie
 MembersStatisticsByTown=Členové statistika podle města
 MembersStatisticsByRegion=Členové statistiky podle krajů
-NbOfMembers=Počet členů
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Nebyli nalezeni validovaní členové
-MembersByCountryDesc=Tato obrazovka vám ukáže statistiku členů jednotlivých zemích. Grafika však závisí na Google on-line služby grafu a je k dispozici pouze v případě, je připojení k internetu funguje.
-MembersByStateDesc=Tato obrazovka vám ukáže statistiku členů podle státu / provincie / Canton.
-MembersByTownDesc=Tato obrazovka zobrazuje statistiky o členech podle města.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Zvolte statistik, které chcete číst ...
 MenuMembersStats=Statistika
-LastMemberDate=Nejnovější datum člena
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Poslední datum přihlášení
-MemberNature=Povaha člena
-MembersNature=Nature of members
-Public=Informace jsou veřejné
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Nový uživatel přidán. Čeká na schválení
 NewMemberForm=Nový formulář člena
-SubscriptionsStatistics=Statistiky o předplatné
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Počet odběrů
-AmountOfSubscriptions=Částka úpisů
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Obrat (pro firmu), nebo rozpočet (pro nadaci)
 DefaultAmount=Výchozí částka předplatného
 CanEditAmount=Návštěvník si může vybrat / upravit výši svého upsaného
 MEMBER_NEWFORM_PAYONLINE=Přejít na integrované on-line platební stránky
 ByProperties=Od přírody
 MembersStatisticsByProperties=Statistika členů podle charakteru
-MembersByNature=Tato obrazovka zobrazuje statistiky o členech podle jejich povahy.
-MembersByRegion=Tato obrazovka zobrazuje statistiky členů podle oblastí.
 VATToUseForSubscriptions=Sazba DPH, která se použije pro předplatné
 NoVatOnSubscription=Bez DPH pro předplatné
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt slouží k odběru linku do faktury: %s
diff --git a/htdocs/langs/cs_CZ/modulebuilder.lang b/htdocs/langs/cs_CZ/modulebuilder.lang
index 0bd2158158e..cf77734a247 100644
--- a/htdocs/langs/cs_CZ/modulebuilder.lang
+++ b/htdocs/langs/cs_CZ/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Seznam definovaných oprávnění
 SeeExamples=Viz příklady zde
 EnabledDesc=Podmínka, aby bylo toto pole aktivní (příklady: 1 nebo $ conf-> global-> MYMODULE_MYOPTION)
 VisibleDesc=Je pole viditelné? (Příklady: 0 = Nikdy neviditelné, 1 = Viditelné v seznamu a vytvářet/aktualizovat/prohlížet formuláře, 2 = Viditelné pouze v seznamu, 3 = Viditelné pouze při vytváření/aktualizaci/zobrazit formulář (není v seznamu), 4 = Viditelné v seznamu a pouze formulář aktualizace/zobrazení (nevytvářet), 5 = viditelné pouze ve formuláři pro prohlížení koncových zobrazení (nevytvářet, neaktualizovat). <br><br>  Použití záporné hodnoty znamená, že pole není ve výchozím nastavení zobrazeno v seznamu, ale může být vybráno pro zobrazení). <br><br>Může to být výraz, například: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Zobrazte toto pole na kompatibilních dokumentech PDF. Polohu můžete spravovat pomocí pole „Poloha“. <br/> V současné době známých modelů compatibles PDF jsou: Eratosthenés z Kyrény (objednávka), Espadon (loď), houba (faktury), cyan (propal / citát), Cornas (dodavatel pořadí) <br/> <br/> <strong> Z dokumentu: </strong> <br/> 0 = nezobrazí <br/> 1 = displej <br/> 2 = zobrazí pouze tehdy, pokud není prázdný <br/> <br/> <strong> pro linky na dokumenty: </strong> <br/> 0 = není zobrazena <br/> 1 = zobrazena v koloně <br/> 3 = zobrazení v popis řádku sloupce po popisu <br/> 4 = zobrazení ve sloupci s popisem po vyrobení popis pouze pokud není prázdný
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Zobrazit v PDF
 IsAMeasureDesc=Může být hodnota pole kumulativní, aby se dostala do seznamu celkem? (Příklady: 1 nebo 0)
 SearchAllDesc=Používá se pole pro vyhledávání pomocí nástroje rychlého vyhledávání? (Příklady: 1 nebo 0)
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index 9685ebcb215..f91dbd2a103 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Nainstalujte nebo povolte GD knihovnu ve vaší PHP pro vyu
 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=Statistiky součtu množství produktů / služeb
-StatsByNumberOfEntities=Statistiky počtu odesílajících subjektů (číslo faktury nebo objednávky ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Počet návrhů
 NumberOfCustomerOrders=Počet objednávek
 NumberOfCustomerInvoices=Počet zákaznických faktur
@@ -289,4 +289,4 @@ PopuProp=Produkty / služby podle oblíbenosti v návrzích
 PopuCom=Produkty / služby podle oblíbenosti v objednávkách
 ProductStatistics=Statistika produktů / služeb
 NbOfQtyInOrders=Množství v objednávkách
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/cs_CZ/partnership.lang b/htdocs/langs/cs_CZ/partnership.lang
new file mode 100644
index 00000000000..0ff8af34c49
--- /dev/null
+++ b/htdocs/langs/cs_CZ/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Datum zahájení
+DatePartnershipEnd=Datum ukončení
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Návrh
+PartnershipAccepted = Přijato
+PartnershipRefused = Odmítnuto
+PartnershipCanceled = Zrušený
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang
index d4609f7b491..a4586e8af00 100644
--- a/htdocs/langs/cs_CZ/productbatch.lang
+++ b/htdocs/langs/cs_CZ/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 037c83e4ea8..839eed4f24b 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Služby pouze pro prodej
 ServicesOnPurchaseOnly=Služby pouze pro nákup
 ServicesNotOnSell=Služby, které nejsou určeny k prodeji a ne k nákupu
 ServicesOnSellAndOnBuy=Služby pro prodej a pro nákup
-LastModifiedProductsAndServices=Nejnovější%s upravené produkty/služby
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Poslední zaznamenané %s produkty
 LastRecordedServices=Poslední zaznamenané %s služby
 CardProduct0=Produkt
@@ -73,12 +73,12 @@ SellingPrice=Prodejní cena
 SellingPriceHT=Prodejní cena (bez daně)
 SellingPriceTTC=Prodejní cena (vč. DPH)
 SellingMinPriceTTC=Minimální prodejní cena (včetně daně)
-CostPriceDescription=Toto cenové pole (bez daně) lze použít k ukládání průměrné částky, kterou tento produkt náklady na vaši společnost. Může se jednat o jakoukoli cenu, kterou si vypočítáte, například z průměrné kupní ceny plus průměrné výrobní a distribuční náklady.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Tato hodnota může být použita pro výpočet marže.
 SoldAmount=Prodat množství
 PurchasedAmount=Zakoupená částka
 NewPrice=Nová cena
-MinPrice=Min. prodejní cena
+MinPrice=Min. selling price
 EditSellingPriceLabel=Upravte štítek prodejní ceny
 CantBeLessThanMinPrice=Prodejní cena nesmí být nižší než minimální povolená pro tento produkt (%s bez daně). Toto hlášení se může také zobrazí, pokud zadáte příliš důležitou slevu.
 ContractStatusClosed=Zavřeno
@@ -157,11 +157,11 @@ ListServiceByPopularity=Seznam služeb podle oblíbenosti
 Finished=Výrobce produktu
 RowMaterial=Surovina
 ConfirmCloneProduct=Jste si jisti, že chcete kopírovat produkt nebo službu <b>%s</b>?
-CloneContentProduct=Klonujte všechny hlavní informace o produktu / službě
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Kopíruje ceny
-CloneCategoriesProduct=Klonovat značky / kategorie spojené
-CloneCompositionProduct=Kopíruje virtuální produkt / službu
-CloneCombinationsProduct=Kopírovat varianty produktu
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Tento produkt se používá
 NewRefForClone=Ref. nového produktu/služby
 SellingPrices=Prodejní ceny
@@ -170,12 +170,12 @@ CustomerPrices=Zákaznické ceny
 SuppliersPrices=Ceny prodejců
 SuppliersPricesOfProductsOrServices=Ceny prodejců (produktů nebo služeb)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Země původu
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Druh produktu (materiál / hotový)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Druh produktu
-NatureOfProductDesc=Surovina nebo hotový produkt
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Krátký štítek
 Unit=Jednotka
 p=u.
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index b57c679ae68..77c780d4c63 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Kontakty projektu
 ProjectsImContactFor=Projekty, pro které jsem výslovně kontakt
 AllAllowedProjects=Celý projekt mohu číst (moje + veřejnost)
 AllProjects=Všechny projekty
-MyProjectsDesc=Tento pohled je omezen na projekty u kterých jste uveden jako kontakt 
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Tento pohled zobrazuje všechny projekty které máte oprávnění číst.
 TasksOnProjectsPublicDesc=Tento pohled představuje všechny úkoly na projektech, které můžete čí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=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 nebo úkoly, pro které jste kontakt
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Pouze otevřené projekty jsou viditelné (projekty v návrhu ani v uzavřeném stavu nejsou viditelné).
 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=Všechny úkoly pro kvalifikované projekty jsou viditelné, ale můžete zadat čas pouze pro úkoly přiřazené vybranému uživateli. Přiřazení úlohy, pokud potřebujete zadat čas.
-OnlyYourTaskAreVisible=Jsou přiřazeny pouze úkoly, které jste přiřadili. Přiřadte úlohu sobě, pokud není vidět a potřebujete zadat čas.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Úkoly projektů
 ProjectCategories=Štítky projektu / kategorie
 NewProject=Nový projekt
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Není přiřazen k úkolu
 NoUserAssignedToTheProject=Na tento projekt nebyli přiděleni žádní uživatelé
 TimeSpentBy=Čas strávený
 TasksAssignedTo=Úkolům, které jsou
-AssignTaskToMe=Přiřadit úkol mně
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Přiřaďte úlohu %s
 SelectTaskToAssign=Vyberte úkol, který chcete přiřadit ...
 AssignTask=Přiřadit
diff --git a/htdocs/langs/cs_CZ/recruitment.lang b/htdocs/langs/cs_CZ/recruitment.lang
index e60db728965..745df2ae9f8 100644
--- a/htdocs/langs/cs_CZ/recruitment.lang
+++ b/htdocs/langs/cs_CZ/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang
index 61d599a95a7..8db2f12844e 100644
--- a/htdocs/langs/cs_CZ/sendings.lang
+++ b/htdocs/langs/cs_CZ/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Opravdu chcete tuto zásilku ověřit odkazem <b> %s</b>?
 ConfirmCancelSending=Opravdu chcete tuto zásilku zrušit?
 DocumentModelMerou=Merou A5 modelu
 WarningNoQtyLeftToSend=Varování: žádné zboží nečeká na dopravu
-StatsOnShipmentsOnlyValidated=Statistiky vedené pouze na ověřené zásilky. Datum použití je datum schválení zásilky (plánované datum dodání není vždy známo).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Plánovaný termín dodání
 RefDeliveryReceipt=Ref. Potvrzení o doručení
 StatusReceipt=Stavové potvrzení o doručení
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index af6fc1f737a..22b0bf30b75 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Žádné předdefinované produkty pro tento objek
 DispatchVerb=Odeslání
 StockLimitShort=Limit pro upozornění
 StockLimit=Skladový limit pro upozornění
-StockLimitDesc=(prázdný) znamená žádné varování. <br> 0 lze použít pro varování, jakmile je zásoba prázdná.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Fyzický sklad
 RealStock=Skutečný sklad
 RealStockDesc=Fyzické / skutečné zásoby jsou zásoby, které jsou v současné době ve skladech.
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index afc98c26645..0c355b7432e 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Heslo změněno na: %s
 SubjectNewPassword=Vaše nové heslo pro %s
 GroupRights=Skupina oprávnění
 UserRights=Uživatelská oprávnění
+Credentials=Credentials
 UserGUISetup=Nastavení uživatelského zobrazení
 DisableUser=Zakázat
 DisableAUser=Zakázat uživatele
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Použijte pole Typ pro změnu
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Použijte OpenID pro přihlášení
 WeeklyHours=Odpracovaných hodin (za týden)
-ExpectedWorkedHours=Předpoklad odpracovaných hodin za týden
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Barva uživatele
 DisabledInMonoUserMode=Zakázán v režimu údržby
 UserAccountancyCode=Účetní kód uživatele
@@ -115,7 +116,7 @@ DateOfEmployment=Datum zaměstnání
 DateEmployment=Zaměstnanost
 DateEmploymentstart=Datum zahájení zaměstnání
 DateEmploymentEnd=Datum ukončení zaměstnání
-RangeOfLoginValidity=Časové období platnosti přihlášení
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Nelze zakázat vlastní uživatelský záznam
 ForceUserExpenseValidator=Validator výkazu výdajů
 ForceUserHolidayValidator=Vynutit validátor žádosti o dovolenou
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index 228a2e197f2..fdd8e7b9a79 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 9e2f21931cc..68b09a3cca3 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Kontonavn
 LabelOperation=Bilagstekst
 Sens=Retning
-AccountingDirectionHelp=For en kundes regnskabskonto skal du bruge kredit til at registrere en betaling, du har modtaget <br>. For en leverandørs regnskabskonto skal du bruge Debet til at registrere en betaling, du foretager
+AccountingDirectionHelp=Brug en kredit til at registrere en betaling, du har modtaget for en kundes regnskabskonto <br>. For en leverandørs regnskabskonto skal du bruge Debet til at registrere en betaling, du har foretaget
 LetteringCode=Bogstaver kode
 Lettering=Skrift
 Codejournal=Kladde
@@ -297,7 +297,7 @@ NoNewRecordSaved=Ikke flere post til bogføre
 ListOfProductsWithoutAccountingAccount=Liste over varer, der ikke er bundet til nogen regnskabskonto
 ChangeBinding=Ret Bogføring
 Accounted=Regnskab i hovedbog
-NotYetAccounted=Endnu ikke indregnet i hovedbog
+NotYetAccounted=Endnu ikke registreret i hovedbogen
 ShowTutorial=Vis selvstudie
 NotReconciled=Ikke afstemt
 WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle handlinger uden underskrevet konto defineret filtreres og udelukkes fra denne visning
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index dfeca29316f..26e47e4ad78 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Fjern/omdøbe fil <b> %s </b> hvis den eksisterer, for at tillade bru
 RestoreLock=Gendan filen <b> %s </b>, kun med tilladelse for "læsning", for at deaktivere yderligere brug af Update/Install-værktøjet.
 SecuritySetup=Sikkerhedsopsætning
 PHPSetup=PHP opsætning
+OSSetup=OS opsætning
 SecurityFilesDesc=Definer her muligheder relateret til sikkerhed om upload af filer.
 ErrorModuleRequirePHPVersion=Fejl, dette modul kræver PHP version %s eller højere
 ErrorModuleRequireDolibarrVersion=Fejl, dette modul kræver Dolibarr version %s eller højere
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Ikke tyder
 NoActiveBankAccountDefined=Ingen aktiv bankkonto defineret
 OwnerOfBankAccount=Ejer af bankkonto %s
 BankModuleNotActive=Bankkonti modul er ikke aktiveret
-ShowBugTrackLink=Vis link "<strong> %s </strong>"
+ShowBugTrackLink=Definer linket "<strong> %s </strong>" (tom for ikke at vise dette link, 'github' for linket til Dolibarr-projektet eller definer direkte en url 'https: // ...')
 Alerts=Indberetninger
 DelaysOfToleranceBeforeWarning=Forsinkelse før du viser en advarselsalarm for:
 DelaysOfToleranceDesc=Indstil forsinkelsen, før et advarselsikon %s vises på skærmen for det sene element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Du skal køre denne kommando fr
 YourPHPDoesNotHaveSSLSupport=SSL-funktioner ikke er tilgængelige i dit PHP
 DownloadMoreSkins=Find flere skind på Dolistore.com
 SimpleNumRefModelDesc=Returnerer referencenummeret i formatet %syymm-nnnn hvor yy er året, mm er måneden og nnnn er et sekventielt auto-stigende nummer uden nulstilling
+SimpleNumRefNoDateModelDesc=Returnerer referencenummeret i formatet %s-nnnn hvor nnnn er et sekventielt automatisk stigende nummer uden nulstilling
 ShowProfIdInAddress=Vis professionelt id med adresser
 ShowVATIntaInAddress=Skjul momsregistreringsnummer i Fællesskabet med adresser
 TranslationUncomplete=Delvis oversættelse
@@ -2062,7 +2064,7 @@ UseDebugBar=Brug fejlfindingslinjen
 DEBUGBAR_LOGS_LINES_NUMBER=Antal sidste loglinjer, der skal holdes i konsollen
 WarningValueHigherSlowsDramaticalyOutput=Advarsel, højere værdier bremser dramatisk output
 ModuleActivated=Modul %s er aktiveret og forsinker grænsefladen
-ModuleActivatedWithTooHighLogLevel=Modul %s er aktiveret med et for højt logningsniveau (prøv at bruge et lavere niveau for bedre præstationer)
+ModuleActivatedWithTooHighLogLevel=Modul %s er aktiveret med et for højt logningsniveau (prøv at bruge et lavere niveau for bedre ydeevne og sikkerhed)
 ModuleSyslogActivatedButLevelNotTooVerbose=Modul %s er aktiveret, og logniveau (%s) er korrekt (ikke for detaljeret)
 IfYouAreOnAProductionSetThis=Hvis du er i et produktionsmiljø, skal du indstille denne egenskab til %s.
 AntivirusEnabledOnUpload=Antivirus aktiveret på uploadede filer
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Bortset fra hvis du har brug for at
 NoWritableFilesFoundIntoRootDir=Ingen skrivbare filer eller mapper til de almindelige programmer blev fundet i din rodkatalog (God)
 RecommendedValueIs=Anbefalet: %s
 ARestrictedPath=En begrænset sti
+CheckForModuleUpdate=Se efter opdateringer til eksterne moduler
+CheckForModuleUpdateHelp=Denne handling opretter forbindelse til redaktører for eksterne moduler for at kontrollere, om en ny version er tilgængelig.
+ModuleUpdateAvailable=En opdatering er tilgængelig
+NoExternalModuleWithUpdate=Ingen opdateringer fundet for eksterne moduler
+SwaggerDescriptionFile=Swagger API beskrivelsesfil (f.eks. Til brug med redoc)
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index 4e7a7706f4b..f40da8a80f3 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social / skattemæssig skat betaling
 BankTransfer=Kreditoverførsel
 BankTransfers=Kreditoverførsler
 MenuBankInternalTransfer=Intern overførsel
-TransferDesc=Overførsel fra en konto til en anden, Dolibarr vil skrive to poster (en debitering på kildekonto og en kredit på målkonto). Det samme beløb (undtagen tegn), etiket og dato vil blive brugt til denne transaktion)
+TransferDesc=Brug intern overførsel til at overføre fra en konto til en anden, applikationen skriver to poster: en debitering på kildekontoen og en kredit på målkontoen. Det samme beløb, etiket og dato vil blive brugt til denne transaktion.
 TransferFrom=Fra
 TransferTo=Til
 TransferFromToDone=En overførsel fra <b> %s </b> til <b> %s </b> af <b> %s </b> %s er blevet optaget.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 ValidateCheckReceipt=Bekræft denne kvitteringskvittering?
-ConfirmValidateCheckReceipt=Er du sikker på at du vil bekræfte denne kvittering for kvittering, vil der ikke blive foretaget nogen ændring, når dette er gjort?
+ConfirmValidateCheckReceipt=Er du sikker på, at du vil indsende denne checkkvittering til validering? Ingen ændringer er mulige, det er gjort.
 DeleteCheckReceipt=Slet denne kvittering for kvittering?
 ConfirmDeleteCheckReceipt=Er du sikker på, at du vil slette denne kvittering for kvittering?
 BankChecks=Bankcheck
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Er du sikker på, at du vil slette denne post?
 ThisWillAlsoDeleteBankRecord=Dette vil også slette genereret bankindtastning
 BankMovements=bevægelser
 PlannedTransactions=Planlagte poster
-Graph=Grafik
+Graph=Grafer
 ExportDataset_banque_1=Bankkonti og kontoudtog
 ExportDataset_banque_2=Depositum
 TransactionOnTheOtherAccount=Transaktion på den anden konto
@@ -142,7 +142,7 @@ AllAccounts=Alle bank- og kontantekonti
 BackToAccount=Tilbage til konto
 ShowAllAccounts=Vis for alle konti
 FutureTransaction=Fremtidig transaktion. Kan ikke forene.
-SelectChequeTransactionAndGenerate=Vælg / filtrer checks for at inkludere i kontokortet og klik på "Opret".
+SelectChequeTransactionAndGenerate=Vælg / filtrer de checks, der skal medtages i checkindbetalingen. Klik derefter på "Opret".
 InputReceiptNumber=Vælg kontoudskrift relateret til forliget. Brug en sorterbar numerisk værdi: ÅÅÅÅMM eller ÅÅÅÅMMDD
 EventualyAddCategory=Til sidst skal du angive en kategori, hvor klasserne skal klassificeres
 ToConciliate=Skal afstemmes?
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 6d0f386fced..e872d359fb4 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -454,7 +454,7 @@ RegulatedOn=Reguleres på
 ChequeNumber=Check N
 ChequeOrTransferNumber=Check / Transfer N
 ChequeBordereau=Tjekliste
-ChequeMaker=Check / Overfør overførelse
+ChequeMaker=Kontroller / overfør afsender
 ChequeBank=Bank Cheque
 CheckBank=Kontrollere
 NetToBePaid=Netto, at betale
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index bc3abe1574c..7d3af76778e 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bogmærker: seneste %s
 BoxOldestExpiredServices=Ældste aktive udløbne tjenester
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Nyeste %s modificerede styklister
-BoxTitleLatestModifiedMos=Seneste %s ændrede produktionsordrer
+BoxTitleLastContracts=Seneste %s kontrakter, der blev ændret
+BoxTitleLastModifiedDonations=Seneste %s donationer, som blev ændret
+BoxTitleLastModifiedExpenses=Seneste %s udgiftsrapporter, der blev ændret
+BoxTitleLatestModifiedBoms=Seneste %s BOM'er, der blev ændret
+BoxTitleLatestModifiedMos=Seneste %s Produktionsordrer, der blev ændret
 BoxTitleLastOutstandingBillReached=Kunder med maksimalt udestående overskredet
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index 9f5abd81617..b98662769f3 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Etage
 AddTable=Tilføj bord
 Place=Placere
 TakeposConnectorNecesary='TakePOS Connector' kræves
-OrderPrinters=Bestil printere
+OrderPrinters=Tilføj en knap for at sende ordren til nogle givne printere uden betaling (for eksempel for at sende en ordre til et køkken)
+NotAvailableWithBrowserPrinter=Ikke tilgængelig, når printer til modtagelse er indstillet til browser:
 SearchProduct=Søg produkt
 Receipt=Modtagelse
 Header=Sidehoved
@@ -56,8 +57,9 @@ Paymentnumpad=numerisk tastatur til at indtaste betaling
 Numberspad=Numerisk tastatur
 BillsCoinsPad=Mønter og sedler kasse
 DolistorePosCategory=TakePOS moduler and andre POS løsninger til Dolibarr
-TakeposNeedsCategories=TakePOS har brug for produkt kategorier for at fungere
-OrderNotes=Ordre Noter
+TakeposNeedsCategories=TakePOS har brug for mindst en produktkategori for at arbejde
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS har brug for mindst 1 produktkategori under kategorien <b> %s </b> for at arbejde
+OrderNotes=Kan tilføje nogle noter til hver bestilte vare
 CashDeskBankAccountFor=Standardkonto, der skal bruges til betalinger i
 NoPaimementModesDefined=Ingen betalings betingelser i TakePOS konfiguration
 TicketVatGrouped=Gruppe moms sats i billetter | kvitteringer
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Fakturaen er allerede valideret
 NoLinesToBill=Ingen linjer til fakturering
 CustomReceipt=Tilpasset kvittering
 ReceiptName=Kvittering Navn
-ProductSupplements=Produkttilskud
+ProductSupplements=Administrer kosttilskud af produkter
 SupplementCategory=Tillægskategori
 ColorTheme=Farvetema
 Colorful=Farverig
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Enkel og nem kvitteringsudskrivning. Kun et par parametre til at konfigurere kvitteringen. Udskriv via browser.
 TakeposConnectorMethodDescription=Eksternt modul med ekstra funktioner. Mulighed for at udskrive fra cloud.
 PrintMethod=Udskrivningsmetode
-ReceiptPrinterMethodDescription=Kraftig metode med en masse parametre. Fuld tilpasning med skabeloner. Kan ikke udskrive fra cloud.
+ReceiptPrinterMethodDescription=Kraftig metode med mange parametre. Fuldt tilpasses med skabeloner. Serveren, der er vært for applikationen, kan ikke være i skyen (skal kunne nå printerne i dit netværk).
 ByTerminal=Med terminal
 TakeposNumpadUsePaymentIcon=Brug ikonet i stedet for tekst på betalingsknapperne på numpad
 CashDeskRefNumberingModules=Nummereringsmodul til POS-salg
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Modul kvitterings printer skal først være ak
 AllowDelayedPayment=Tillad forsinket betaling
 PrintPaymentMethodOnReceipts=Udskriv betalingsmetode på billetter | kvitteringer
 WeighingScale=Vægt skala 
+ShowPriceHT = Vis prisen ekskl. Moms kolonne
+ShowPriceHTOnReceipt = Vis prisen ekskl. Moms kolonne ved modtagelse
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index dd36fa5b4e2..d42630c7687 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Kategori
 Rubriques=Tags/Kategorier
 RubriquesTransactions=Tags/Kategorier af transaktioner
 categories=tags/kategorier
-NoCategoryYet=Ingen tag/Kategorier af denne type oprettet
+NoCategoryYet=Intet mærke / kategori af denne type er oprettet
 In=I
 AddIn=Tilføj i
 modify=rette
 Classify=Klassificere
 CategoriesArea=Tags/Kategorier område
-ProductsCategoriesArea=Produkter/Tjenester tags/kategorier område 
-SuppliersCategoriesArea=Sælgere tags / kategorier område
-CustomersCategoriesArea=Kunder tags/kategorier
-MembersCategoriesArea=Medlemmer tags/kategorier
-ContactsCategoriesArea=Kontakter tags/kategorier område
+ProductsCategoriesArea=Produkt / servicemærker / kategoriområde
+SuppliersCategoriesArea=Leverandørmærker / kategoriområde
+CustomersCategoriesArea=Kundemærker / kategoriområde
+MembersCategoriesArea=Medlemstags / kategorier-område
+ContactsCategoriesArea=Kontakt tags / kategorier område
 AccountsCategoriesArea=Bankkontomærker / kategoriområde
-ProjectsCategoriesArea=Projekter tags/kategorier område
-UsersCategoriesArea=Brugere tags / kategorier område
+ProjectsCategoriesArea=Projekt tags / kategorier område
+UsersCategoriesArea=Bruger tags / kategorier område
 SubCats=Sub-kategorier
 CatList=Liste over tags/kategorier
 CatListAll=Liste over tags / kategorier (alle typer)
@@ -96,4 +96,4 @@ ChooseCategory=Vælg kategori
 StocksCategoriesArea=Lagerkategorier
 ActionCommCategoriesArea=Begivenhedskategorier
 WebsitePagesCategoriesArea=Side-containerkategorier
-UseOrOperatorForCategories=Brug eller operator til kategorier
+UseOrOperatorForCategories=Brug 'ELLER' operator til kategorier
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 411dc19efc9..1c401760a58 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Firmanavn %s eksisterer allerede. Vælg et andet.
 ErrorSetACountryFirst=Indstil land først
 SelectThirdParty=Vælg en tredjepart
-ConfirmDeleteCompany=Er du sikker på, at du vil slette dette firma og alle arvede oplysninger?
+ConfirmDeleteCompany=Er du sikker på, at du vil slette dette firma og alle relaterede oplysninger?
 DeleteContact=Slet en kontakt/adresse
-ConfirmDeleteContact=Er du sikker på, at du vil slette denne kontakt og alle arvede oplysninger?
+ConfirmDeleteContact=Er du sikker på, at du vil slette denne kontakt og alle relaterede oplysninger?
 MenuNewThirdParty=Ny tredjepart
 MenuNewCustomer=Ny kunde
 MenuNewProspect=Ny potentiel kunde
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Ring
 Chat=Chat
-PhonePro=Firmatelefon
+PhonePro=Bus. telefon
 PhonePerso=Pers. telefon
 PhoneMobile=Mobil
 No_Email=Afvis masse Emails
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=By
 Web=Web
 Poste= Position
-DefaultLang=Sprogstandard
+DefaultLang=Standardsprog
 VATIsUsed=Anvendt moms
 VATIsUsedWhenSelling=Dette definerer, om denne tredjepart indeholder en salgsafgift eller ej, når den foretager en faktura til sine egne kunder
 VATIsNotUsed=Salgsmoms anvendes ikke
@@ -331,7 +331,7 @@ CustomerCodeDesc=Kundekode, unik for alle kunder
 SupplierCodeDesc=Leverandørkode, unik for alle leverandører
 RequiredIfCustomer=Påkrævet, hvis tredjepart er kunde eller kunde
 RequiredIfSupplier=Påkrævet, hvis tredjepart er en sælger
-ValidityControledByModule=Gyldighedsstyret af modulet
+ValidityControledByModule=Gyldighed kontrolleret af modulet
 ThisIsModuleRules=Regler for dette modul
 ProspectToContact=Potentiel kunde til kontakt
 CompanyDeleted=Company " %s" slettet fra databasen.
@@ -439,12 +439,12 @@ ListSuppliersShort=Liste over leverandører
 ListProspectsShort=Liste over potentielle kunder
 ListCustomersShort=Liste over kunder
 ThirdPartiesArea=Tredjeparter / Kontakter
-LastModifiedThirdParties=Seneste %s ændrede tredjeparter
+LastModifiedThirdParties=Seneste %s Tredjeparter, som blev ændret
 UniqueThirdParties=Samlet antal tredjeparter
 InActivity=Åben
 ActivityCeased=Lukket
 ThirdPartyIsClosed=Tredjepart er lukket
-ProductsIntoElements=Liste over varer/ydelser i %s
+ProductsIntoElements=Liste over produkter / tjenester tilknyttet %s
 CurrentOutstandingBill=Udestående faktura i øjeblikket
 OutstandingBill=Maks. for udstående faktura
 OutstandingBillReached=Maks. for udestående regning nået
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Kunde / leverandør-koden er ledig. Denne kode kan til en
 ManagingDirectors=Leder(e) navne (CEO, direktør, chef...)
 MergeOriginThirdparty=Duplicate tredjepart (tredjepart, du vil slette)
 MergeThirdparties=Flet tredjeparter
-ConfirmMergeThirdparties=Er du sikker på, at du vil fusionere denne tredjepart i den nuværende? Alle linkede objekter (fakturaer, ordrer, ...) flyttes til den aktuelle tredjepart, og tredjepart vil blive slettet.
+ConfirmMergeThirdparties=Er du sikker på, at du vil flette den valgte tredjepart med den aktuelle? Alle sammenkædede objekter (fakturaer, ordrer, ...) flyttes til den aktuelle tredjepart, hvorefter den valgte tredjepart slettes.
 ThirdpartiesMergeSuccess=Tredjeparter er blevet fusioneret
 SaleRepresentativeLogin=Login af salgsrepræsentant
 SaleRepresentativeFirstname=Fornavn på salgsrepræsentant
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 2c6f3c521b8..7081be57c87 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Ny rabat
 NewCheckDeposit=Ny checkindbetaling
 NewCheckDepositOn=Opret kvittering for indbetaling på konto: %s
 NoWaitingChecks=Ingen checks afventer indbetaling.
-DateChequeReceived=Dato for modtagelse af check
+DateChequeReceived=Tjek modtagelsesdato
 NbOfCheques=Antal checks
 PaySocialContribution=Betal skat/afgift
 PayVAT=Betal en momsangivelse
diff --git a/htdocs/langs/da_DK/ecm.lang b/htdocs/langs/da_DK/ecm.lang
index 2df441a0807..ed1668f660a 100644
--- a/htdocs/langs/da_DK/ecm.lang
+++ b/htdocs/langs/da_DK/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Mapper
 ECMSetup=ECM-opsætning
 GenerateImgWebp=Kopier alle billeder med en anden version med .webp-format
-ConfirmGenerateImgWebp=Hvis du bekræfter, vil du generere et billede i .webp-format for alle billeder i øjeblikket i denne mappe og dens undermappe ...
+ConfirmGenerateImgWebp=Hvis du bekræfter, genererer du et billede i .webp-format for alle billeder i øjeblikket i denne mappe (undermapper er ikke inkluderet) ...
 ConfirmImgWebpCreation=Bekræft duplikering af alle billeder
 SucessConvertImgWebp=Billeder blev duplikeret
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 5f382777db0..f11082e0071 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -4,8 +4,8 @@
 NoErrorCommitIsDone=Ingen fejl, vi begår
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=E-mail%s er forkert
-ErrorBadMXDomain=E-mail %s virker forkert (domæne har ingen gyldig MX-post)
+ErrorBadEMail=E-mail %s er forkert
+ErrorBadMXDomain=E-mail %s synes forkert (domæne har ingen gyldig MX-post)
 ErrorBadUrl=Url %s er forkert
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b> %s </b> findes allerede.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 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=Bruger kan ikke slettes. Måske er det forbundet med Dolibarr enheder.
-ErrorFieldsRequired=Nogle krævede felter ikke var fyldt.
-ErrorSubjectIsRequired=Emne er påkrævet
+ErrorFieldsRequired=Nogle obligatoriske felter er efterladt tomme.
+ErrorSubjectIsRequired=E-mail-emnet er påkrævet
 ErrorFailedToCreateDir=Det lykkedes ikke at oprette en mappe. Kontroller, at web-serveren bruger har tilladelse til at skrive i Dolibarr dokumenter bibliotek. Hvis parameter <b>safe_mode</b> er aktiveret på dette PHP, kontrollere, at Dolibarr php filer ejer til web-serveren bruger (eller gruppe).
 ErrorNoMailDefinedForThisUser=Ingen e-mail defineret for denne bruger
 ErrorSetupOfEmailsNotComplete=Opsætningen af e-mails er ikke afsluttet
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Siden / beholderen <strong> %s </ str
 ErrorDuringChartLoad=Fejl ved indlæsning af kontoplan. Hvis nogle konti ikke blev indlæst, kan du stadig indtaste dem manuelt.
 ErrorBadSyntaxForParamKeyForContent=Dårlig syntaks for parameternøgleindhold. Skal have en værdi, der starter med %s eller %s
 ErrorVariableKeyForContentMustBeSet=Fejl, konstanten med navn %s(med tekstindhold, der skal vises) eller %s(med ekstern url til at vises) skal sættes.
+ErrorURLMustEndWith=URL %s skal slutte %s
 ErrorURLMustStartWithHttp=URL %s skal starte med http: // eller https: //
 ErrorHostMustNotStartWithHttp=Værtsnavn %s må IKKE starte med http: // eller https: //
 ErrorNewRefIsAlreadyUsed=Fejl, den nye reference er allerede brugt
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Kun tilgængelig, hvis du bruger HTTPS-sikre
 WarningModuleXDisabledSoYouMayMissEventHere=Modul %s er ikke aktiveret. Så du går måske glip af en masse begivenheder her.
 ErrorActionCommPropertyUserowneridNotDefined=Brugerens ejer kræves
 ErrorActionCommBadType=Den valgte hændelsestype (id: %n, kode: %s) findes ikke i begivenhedstypeordbogen
+CheckVersionFail=Versionskontrol mislykkedes
diff --git a/htdocs/langs/da_DK/eventorganization.lang b/htdocs/langs/da_DK/eventorganization.lang
new file mode 100644
index 00000000000..6ff7187c82a
--- /dev/null
+++ b/htdocs/langs/da_DK/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Begivenhedsorganisation
+EventOrganizationDescription = Begivenhedsorganisation gennem modulprojekt
+EventOrganizationDescriptionLong= Administrer begivenhedsorganisation til konference, deltagere, højttalere og deltagere med en offentlig abonnementside
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organiserede begivenheder
+EventOrganizationConferenceOrBoothMenuLeft = Konference eller stand
+
+#
+# Admin page
+#
+EventOrganizationSetup = Opsætning af begivenhedsorganisation
+Settings = Indstillinger
+EventOrganizationSetupPage = Konfigurationsside for begivenhedsorganisation
+EVENTORGANIZATION_TASK_LABEL = Etiket over opgaver, der skal oprettes automatisk, når projektet valideres
+EVENTORGANIZATION_TASK_LABELTooltip = Når du validerer en organiseret begivenhed, kan der automatisk oprettes nogle opgaver i projektet <br> <br> For eksempel: <br> Send Call for Conference <br> Send Call for Booth <br> Modtag opkald til konferencer a04 mind om begivenhed til højttalere <br> Send minder om begivenhed til Booth-vært <br> Send påmind om begivenhed til deltagere
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategori, der automatisk tilføjes til tredjeparter, når nogen foreslår en konference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategori, der automatisk tilføjes til tredjeparter, når de foreslår en stand
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Skabelon til e-mail, der skal sendes efter modtagelse af et forslag til en konference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Skabelon til e-mail, der skal sendes efter modtagelse af et forslag til en stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Skabelon til e-mail, der skal sendes, efter at et abonnement på en kabine er betalt.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Skabelon til e-mail, der skal sendes, efter at et abonnement på en begivenhed er betalt.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Skabelon til e-mail med massaktion til attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Skabelon til e-mail med massaktion til højttalere
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrer tredjeparts valgliste i deltagernes oprettelseskort / formular med kategori
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrer tredjeparts valgliste i deltagernes oprettelseskort / formular med kundetype
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Konference eller stand
+ManageOrganizeEvent = Administrer begivenhedsorganisation
+ConferenceOrBooth = Konference eller stand
+ConferenceOrBoothTab = Konference eller stand
+AmountOfSubscriptionPaid = Betalt abonnementsbeløb
+DateSubscription = Dato for abonnement
+ConferenceOrBoothAttendee = Konference eller messedeltager
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Din anmodning om konference blev modtaget
+YourOrganizationEventBoothRequestWasReceived = Din anmodning om stand blev modtaget
+EventOrganizationEmailAskConf = Anmodning om konference
+EventOrganizationEmailAskBooth = Anmodning om stand
+EventOrganizationEmailSubsBooth = Abonnement på stand
+EventOrganizationEmailSubsEvent = Abonnement på en begivenhed
+EventOrganizationMassEmailAttendees = Kommunikation til deltagere
+EventOrganizationMassEmailSpeakers = Kommunikation til taler
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Tillad ukendte personer at foreslå konferencer
+AllowUnknownPeopleSuggestConfHelp=Tillad ukendte personer at foreslå konferencer
+AllowUnknownPeopleSuggestBooth=Tillad ukendte personer at foreslå stand
+AllowUnknownPeopleSuggestBoothHelp=Tillad ukendte personer at foreslå stand
+PriceOfRegistration=Pris for registrering
+PriceOfRegistrationHelp=Pris for registrering
+PriceOfBooth=Abonnementspris for at stå en kabine
+PriceOfBoothHelp=Abonnementspris for at stå en kabine
+EventOrganizationICSLink=Link ICS til begivenheder
+ConferenceOrBoothInformation=Oplysninger om konference eller stand
+Attendees = Deltagere
+EVENTORGANIZATION_SECUREKEY = Sikker nøgle til linket til offentlig registrering til en konference
+#
+# Status
+#
+EvntOrgDraft = Udkast til
+EvntOrgSuggested = Foreslået
+EvntOrgConfirmed = Bekræftet
+EvntOrgNotQualified = Ikke kvalificeret
+EvntOrgDone = Gjort
+EvntOrgCancelled = Annulleret
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Offentlig link til registrering til en konference
+MissingOrBadSecureKey = Sikkerhedsnøglen er ugyldig eller mangler
+EvntOrgWelcomeMessage = Denne formular giver dig mulighed for at registrere dig som en ny deltager i konferencen
+EvntOrgStartDuration = Denne konference starter den
+EvntOrgEndDuration =  og slutter på
diff --git a/htdocs/langs/da_DK/knowledgemanagement.lang b/htdocs/langs/da_DK/knowledgemanagement.lang
new file mode 100644
index 00000000000..418c89381ce
--- /dev/null
+++ b/htdocs/langs/da_DK/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Videnstyringssystem
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Administrer en Knowledge Management (KM) eller Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Opsætning af Knowledge Management System
+Settings = Indstillinger
+KnowledgeManagementSetupPage = Knowledge Management System opsætningsside
+
+
+#
+# About page
+#
+About = Om
+KnowledgeManagementAbout = Om Knowledge Management
+KnowledgeManagementAboutPage = Videnstyring om side
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Videnshåndtering
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Videnbase
+ListOfArticles = Liste over artikler
+NewKnowledgeRecord = Ny artikel
+ValidateReply = Valider løsning
+KnowledgeRecords = Artikler
+KnowledgeRecord = Artikel
+KnowledgeRecordExtraFields = Ekstra felter til artikel
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index e0275f61e0b..3832bf3c5fd 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Til bruger (e)
 MailCC=Kopier til
 MailToCCUsers=Kopier til brugere (e)
 MailCCC=Cachelagrede kopi til
-MailTopic=E-mail emne
+MailTopic=Email emne
 MailText=Besked
 MailFile=Vedhæftede filer
 MailMessage=Email indhold
@@ -132,7 +132,7 @@ ANotificationsWillBeSent=1 automatisk underretning sendes via e-mail
 SomeNotificationsWillBeSent=%s automatiske meddelelser sendes via e-mail
 AddNewNotification=Abonner på en ny automatisk e-mail-underretning (mål / begivenhed)
 ListOfActiveNotifications=Liste over alle aktive abonnementer (mål / begivenheder) til automatisk e-mail-underretning
-ListOfNotificationsDone=Liste over alle sendte automatiske e-mail-meddelelser
+ListOfNotificationsDone=Liste over alle sendte automatiske e-mail-underretninger
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index a19a7a0e0ce..1413f52e528 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -246,7 +246,7 @@ DefaultModel=Standard dokument skabelon
 Action=Begivenhed
 About=Om
 Number=Antal
-NumberByMonth=Antal efter måned
+NumberByMonth=Samlede rapporter pr. Måned
 AmountByMonth=Beløb efter måned
 Numero=Nummer
 Limit=Grænseværdi
@@ -341,8 +341,8 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Oprettet af bruger
-UserModif=Bruger som sidst opdateret
+UserAuthor=Afsluttet af
+UserModif=Opdateret af
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Ved
 From=Fra
 FromDate=Fra
 FromLocation=Fra
-at=på
 to=til
 To=til
+ToDate=til
+ToLocation=til
+at=på
 and=og
 or=eller
 Other=Anden
@@ -843,7 +845,7 @@ XMoreLines=%s linje(r) skjult
 ShowMoreLines=Vis flere/færre linjer
 PublicUrl=Offentlige URL
 AddBox=Tilføj box
-SelectElementAndClick=Vælg et element og klik på %s
+SelectElementAndClick=Vælg et element, og klik på %s
 PrintFile=Print fil %s
 ShowTransaction=Vis indlæg på bankkonto
 ShowIntervention=Vis indgreb
@@ -854,8 +856,8 @@ Denied=Nægtet
 ListOf=Liste over %s
 ListOfTemplates=Liste over skabeloner
 Gender=Køn
-Genderman=Mand
-Genderwoman=Kvinde
+Genderman=Han
+Genderwoman=Hun
 Genderother=Andre
 ViewList=Vis liste
 ViewGantt=Gentt udsigt
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Er du sikker på, at du vil påvirke tags til den %s va
 CategTypeNotFound=Ingen tag-type fundet for typen af poster
 CopiedToClipboard=Kopieret til udklipsholderen
 InformationOnLinkToContract=Dette beløb er kun summen af alle linjer i kontrakten. Der tages ikke hensyn til tid.
+ConfirmCancel=Er du sikker på at du vil annullere
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index b74f1265498..219ed492d1c 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Et andet medlem <b>(navn: %s, login:
 ErrorUserPermissionAllowsToLinksToItselfOnly=Af sikkerhedsmæssige grunde skal du have tilladelser til at redigere alle brugere for at kunne linke en medlem til en bruger, der ikke er din.
 SetLinkToUser=Link til en Dolibarr bruger
 SetLinkToThirdParty=Link til en Dolibarr tredjepart
-MembersCards=Medlemmer udskrive kort
+MembersCards=Visitkort til medlemmer
 MembersList=Liste over medlemmer
 MembersListToValid=Liste over udkast til medlemmer (der skal bekræftes)
 MembersListValid=Liste over gyldige medlemmer
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Medlemmer med abonnement for at modtage
 MembersWithSubscriptionToReceiveShort=Abonnement til at modtage
 DateSubscription=Subscription dato
 DateEndSubscription=Subscription slutdato
-EndSubscription=End abonnement
+EndSubscription=Abonnementet slutter
 SubscriptionId=Abonnements-id
 WithoutSubscription=Uden abonnement
 MemberId=Medlem id
@@ -83,10 +83,10 @@ WelcomeEMail=Velkomst e-mail
 SubscriptionRequired=Kræver abonnement
 DeleteType=Slet
 VoteAllowed=Afstemning tilladt
-Physical=Fysisk
-Moral=Moral
-MorAndPhy=Moralisk og fysisk
-Reenable=Genaktivere
+Physical=Individuel
+Moral=virksomhed
+MorAndPhy=Firma og enkeltperson
+Reenable=Genaktiver
 ExcludeMember=Ekskluder et medlem
 ConfirmExcludeMember=Er du sikker på, at du vil ekskludere dette medlem?
 ResiliateMember=Afslut en medlem
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Medlemmer statistik efter land
 MembersStatisticsByState=Medlemmer statistikker stat / provins
 MembersStatisticsByTown=Medlemmer statistikker byen
 MembersStatisticsByRegion=Medlemsstatistik efter region
-NbOfMembers=Antal medlemmer
-NbOfActiveMembers=Antal nuværende aktive medlemmer
+NbOfMembers=Samlet antal medlemmer
+NbOfActiveMembers=Samlet antal nuværende aktive medlemmer
 NoValidatedMemberYet=Ingen bekræftede medlemmer fundet
-MembersByCountryDesc=Denne skærm viser dig statistikker over medlemmer af lande. Grafisk afhænger dog på Google online-graf service og er kun tilgængelig, hvis en internetforbindelse virker.
-MembersByStateDesc=Denne skærm viser dig statistikker om medlemmer fra staten / provinser / Canton.
-MembersByTownDesc=Denne skærm viser dig statistikker over medlemmer af byen.
+MembersByCountryDesc=Dette skærmbillede viser medlemsstatistikker efter lande. Grafer og diagrammer afhænger af tilgængeligheden af Googles online graftjeneste samt af tilgængeligheden af en fungerende internetforbindelse.
+MembersByStateDesc=Denne skærm viser dig statistikker over medlemmer efter stat / provinser / kantoner.
+MembersByTownDesc=Denne skærm viser statistikker over medlemmer efter by.
+MembersByNature=Denne skærm viser dig statistikker over medlemmer efter natur.
+MembersByRegion=Dette skærmbillede viser statistikker over medlemmer efter region.
 MembersStatisticsDesc=Vælg statistikker, du ønsker at læse ...
 MenuMembersStats=Statistik
-LastMemberDate=Seneste medlem dato
+LastMemberDate=Seneste medlemskabsdato
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Medlemmernes art
+MemberNature=Medlemmets art
 MembersNature=Medlemmernes art
-Public=Information er offentlige
+Public=Oplysninger er offentlige
 NewMemberbyWeb=Nyt medlem tilføjet. Afventer godkendelse
 NewMemberForm=Nyt medlem formular
-SubscriptionsStatistics=Statistikker om abonnementer
+SubscriptionsStatistics=Abonnementsstatistik
 NbOfSubscriptions=Antallet af abonnementer
-AmountOfSubscriptions=Mængden af ​​abonnementer
+AmountOfSubscriptions=Beløb indsamlet fra abonnementer
 TurnoverOrBudget=Omsætning (for et selskab) eller Budget (en fond)
 DefaultAmount=Standard mængden af ​​abonnement
 CanEditAmount=Besøgende kan vælge / redigere størrelsen af ​​sit indskud
 MEMBER_NEWFORM_PAYONLINE=Hop på integreret online betaling side
 ByProperties=Af natur
 MembersStatisticsByProperties=Medlemsstatistik af natur
-MembersByNature=Denne skærm viser dig statistik over medlemmer af natur.
-MembersByRegion=Denne skærm viser statistik over medlemmer efter region.
 VATToUseForSubscriptions=Moms sats at bruge til abonnementer
 NoVatOnSubscription=Ingen moms for abonnementer
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt anvendt til abonnementslinje i faktura: %s
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index 412df544774..71377d17d5f 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Liste over definerede tilladelser
 SeeExamples=Se eksempler her
 EnabledDesc=Tilstand at have dette felt aktivt (Eksempler: 1 eller $ conf-> global-> MYMODULE_MYOPTION)
 VisibleDesc=Er feltet synligt? (Eksempler: 0 = Aldrig synlig, 1 = Synlig på listen og opret / opdater / vis formularer, 2 = Kun synlig på listen, 3 = Synlig kun på oprettelse / opdatering / visningsformular (ikke liste), 4 = Synlig på listen og 3 opdaterings- / visningsformular kun (ikke oprettes), 5 = Synlig på formularen for slut visningsvisning (ikke opretning, ikke opdatering).<br><br> Brug af en negativ værdi betyder felt vises ikke som standard på listen, men kan vælges til visning).<br><br> Det kan være et udtryk, for eksempel:<br>preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1<br> ($ bruger-> rettigheder-> ferie-> definere_ferie? 1: 0)
-DisplayOnPdfDesc=Vis dette felt på kompatible PDF-dokumenter, kan du styre positionen med "Position" field.<br/>Currently, kendte kompatible PDF modeller er: Eratosthenes (rækkefølge), espadon (skib), svamp (fakturaer), cyan (propal / citat), Cornas ( leverandør rækkefølge) <br/><br/><strong>for dokument: </strong><br/>0 = ikke vises <br/>1 = displayet <br/>2 = display, hvis ikke empty<br/><br/><strong>For dokumentlinjer: </strong><br/>0 = ikke vises <br/>1 = vises i en kolonne <br/>3 = display på linje beskrivelse kolonne efter beskrivelse <br/>4 = display i beskrivelsen søjlen efter beskrivelsen kun hvis ikke tom
+DisplayOnPdfDesc=Vis dette felt på kompatible PDF-dokumenter, du kan administrere position med "Position" -feltet. <br> I øjeblikket er kendte kompatible PDF-modeller: eratosthene (ordre), espadon (skib), svamp (fakturaer), cyan (propal / tilbud), cornas (leverandørbestilling) <br> <br> a0e7843947c06f0a0f6a0 = display <br> 2 = vise, hvis ikke tømmes <br> <br> <strong> for dokumentlinjer: </strong> <br> 0 = ikke vises <br> 1 = vises i en kolonne <br> 3 = display på linje beskrivelse søjlen efter beskrivelsen <br> 4 = display i beskrivelsen kolonne efter beskrivelse kun hvis den ikke er tom
 DisplayOnPdf=Vis på PDF
 IsAMeasureDesc=Kan værdien af ​​feltet akkumuleres for at få en samlet liste? (Eksempler: 1 eller 0)
 SearchAllDesc=Er feltet brugt til at foretage en søgning fra hurtigsøgningsværktøjet? (Eksempler: 1 eller 0)
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index ccfdfb8c1ed..c13324952c4 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Installer eller aktiver GD bibliotek på din PHP installatio
 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=Statistikker for summen af ​​produkter / tjenester
-StatsByNumberOfEntities=Statistik i antal henvisende enheder (faktura nummer, eller rækkefølge ...)
+StatsByNumberOfEntities=Statistik for antallet af henvisende enheder (antal fakturaer eller ordrer ...)
 NumberOfProposals=Antal forslag
 NumberOfCustomerOrders=Antal salgsordrer
 NumberOfCustomerInvoices=Antal kundefakturaer
@@ -289,4 +289,4 @@ PopuProp=Produkter/tjenester efter popularitet i forslag
 PopuCom=Produkter/tjenester efter popularitet i ordrer
 ProductStatistics=Produkter / services statistik
 NbOfQtyInOrders=Antal i ordrer
-SelectTheTypeOfObjectToAnalyze=Vælg den type objekt, der skal analyseres ...
+SelectTheTypeOfObjectToAnalyze=Vælg et objekt for at se dets statistik ...
diff --git a/htdocs/langs/da_DK/partnership.lang b/htdocs/langs/da_DK/partnership.lang
new file mode 100644
index 00000000000..89c2f36d572
--- /dev/null
+++ b/htdocs/langs/da_DK/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnerskabsledelse
+PartnershipDescription = Ledelse af modulpartnerskab
+PartnershipDescriptionLong= Ledelse af modulpartnerskab
+
+#
+# Menu
+#
+NewPartnership = Nyt partnerskab
+ListOfPartnerships = Liste over partnerskab
+
+#
+# Admin page
+#
+PartnershipSetup = Partnerskabsopsætning
+PartnershipAbout = Om partnerskab
+PartnershipAboutPage = Partnerskab om side
+
+
+#
+# Object
+#
+DatePartnershipStart=Startdato
+DatePartnershipEnd=Slutdato
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Udkast til
+PartnershipAccepted = Accepteret
+PartnershipRefused = Afvist
+PartnershipCanceled = Aflyst
+
+PartnershipManagedFor=Partnere er
diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang
index 6afb2d2fa0a..70142520648 100644
--- a/htdocs/langs/da_DK/productbatch.lang
+++ b/htdocs/langs/da_DK/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serienummer %s bruges allerede til produkt %s
 TooManyQtyForSerialNumber=Du kan kun have et produkt %s til serienummer %s
 BatchLotNumberingModules=Valgmuligheder til automatisk generering af batchprodukter, der administreres af partier
 BatchSerialNumberingModules=Valgmuligheder til automatisk generering af batchprodukter styret af serienumre
+ManageLotMask=Brugerdefineret maske
 CustomMasks=Tilføjer en mulighed for at definere maske på produktkortet
 LotProductTooltip=Tilføjer en mulighed på produktkortet for at definere en dedikeret batchnummermaske
 SNProductTooltip=Tilføjer en mulighed på produktkortet for at definere en dedikeret serienummermaske
 QtyToAddAfterBarcodeScan=Mængde, der skal tilføjes for hver stregkode / parti / seriel scannet
-
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index cc6c8c9fbbf..03cbc45a71c 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Ydelser kun til salg
 ServicesOnPurchaseOnly=Ydelser kun til indkøb
 ServicesNotOnSell=Ydelse, der ikke er til salg og ikke kan købes
 ServicesOnSellAndOnBuy=Tjenester til salg og til køb
-LastModifiedProductsAndServices=Seneste %s ændrede produkter / tjenester
+LastModifiedProductsAndServices=Seneste %s produkter / tjenester, der blev ændret
 LastRecordedProducts=Seneste %s registrerede varer
 LastRecordedServices=Seneste %s registrerede ydelser
 CardProduct0=Vare
@@ -73,7 +73,7 @@ SellingPrice=Salgspris
 SellingPriceHT=Salgspris (ekskl. moms)
 SellingPriceTTC=Salgspris (inkl. moms)
 SellingMinPriceTTC=Minimumssalgspris (inkl. Skat)
-CostPriceDescription=Dette prisfelt (ekskl. Skat) kan bruges til at gemme det gennemsnitlige beløb, dette produkt koster for din virksomhed. Det kan være enhver pris, du selv beregner, for eksempel ud fra den gennemsnitlige købspris plus gennemsnitlige produktions- og distributionsomkostninger.
+CostPriceDescription=Dette prisfelt (ekskl. Moms) kan bruges til at registrere det gennemsnitlige beløb, som dette produkt koster din virksomhed. Det kan være enhver pris, du selv beregner, f.eks. Ud fra den gennemsnitlige købspris plus den gennemsnitlige produktions- og distributionsomkostning.
 CostPriceUsage=Denne værdi kan bruges til margenberegning.
 SoldAmount=Solgt beløb
 PurchasedAmount=Købt beløb
@@ -157,11 +157,11 @@ ListServiceByPopularity=Liste over tjenesteydelser efter popularitet
 Finished=Fremstillet vare
 RowMaterial=Råvare
 ConfirmCloneProduct=Er du sikker på at du vil klone produktet eller tjenesten <b> %s </b>?
-CloneContentProduct=Klon alle hovedoplysninger af produkt / service
+CloneContentProduct=Klon alle de vigtigste oplysninger om produktet / tjenesten
 ClonePricesProduct=Klonpriser
-CloneCategoriesProduct=Klon tags / kategorier knyttet
-CloneCompositionProduct=Klon virtuelt produkt / service
-CloneCombinationsProduct=Klon produkt varianter
+CloneCategoriesProduct=Klon linkede tags / kategorier
+CloneCompositionProduct=Klon virtuelle produkter / tjenester
+CloneCombinationsProduct=Klon produktvarianterne
 ProductIsUsed=Denne vare er brugt
 NewRefForClone=Ref. for nye vare/ydelse
 SellingPrices=Salgspriser
@@ -171,11 +171,11 @@ SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Sælgerpriser (af produkter eller tjenester)
 CustomCode=Told | Råvare | VITA-kode
 CountryOrigin=Oprindelsesland
-RegionStateOrigin=Region oprindelse
-StateOrigin=Stat | provinsens oprindelse
-Nature=Produktets art (materiale / færdig)
+RegionStateOrigin=Oprindelsesregion
+StateOrigin=Stat | Oprindelsesprovins
+Nature=Produktets art (rå / fremstillet)
 NatureOfProductShort=Produktets art
-NatureOfProductDesc=Råmateriale eller færdigt produkt
+NatureOfProductDesc=Råmateriale eller fremstillet produkt
 ShortLabel=Kort etiket
 Unit=Enhed
 p=u.
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 11372f112e8..cb5a36ace9a 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Projekt kontakter
 ProjectsImContactFor=Projekter, som jeg udtrykkeligt er kontaktperson for
 AllAllowedProjects=Alt projekt jeg kan læse (mine + offentlige)
 AllProjects=Alle projekter
-MyProjectsDesc=Denne oversigt er begrænset til projekter, du er kontakt til
+MyProjectsDesc=Denne opfattelse er begrænset til de projekter, som du er kontaktperson for
 ProjectsPublicDesc=Dette synspunkt præsenterer alle projekter du får lov til at læse.
 TasksOnProjectsPublicDesc=Denne visning præsenterer alle opgaver på projekter, som du må læse.
 ProjectsPublicTaskDesc=Dette synspunkt præsenterer alle projekter og opgaver, som du får lov til at læse.
 ProjectsDesc=Dette synspunkt præsenterer alle projekter (din brugertilladelser give dig tilladelse til at se alt).
 TasksOnProjectsDesc=Denne visning præsenterer alle opgaver på alle projekter (dine brugerrettigheder giver dig tilladelse til at se alt).
-MyTasksDesc=Denne oversigt er begrænset til projekter eller opgaver, som du er kontakt til
+MyTasksDesc=Denne opfattelse er begrænset til de projekter eller opgaver, som du er kontaktperson til
 OnlyOpenedProject=Kun åbne projekter er synlige (projekter i udkast eller lukket status er ikke synlige).
 ClosedProjectsAreHidden=Afsluttede projekter er ikke synlige.
 TasksPublicDesc=Dette synspunkt præsenterer alle projekter og opgaver, som du får lov til at læse.
 TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertilladelser give dig tilladelse til at se alt).
 AllTaskVisibleButEditIfYouAreAssigned=Alle opgaver for kvalificerede projekter er synlige, men du kan kun indtaste tid til opgave tildelt til den valgte bruger. Tildel opgave, hvis du skal indtaste tid på den.
-OnlyYourTaskAreVisible=Kun de opgaver, der er tildelt dig, er synlige. Tildel opgaven til dig selv, hvis den ikke er synlig, og du skal indtaste tid på den.
+OnlyYourTaskAreVisible=Kun opgaver, der er tildelt dig, er synlige. Hvis du har brug for at indtaste tid på en opgave, og hvis opgaven ikke er synlig her, skal du tildele opgaven til dig selv.
 ImportDatasetTasks=Opgaver af projekter
 ProjectCategories=Projektetiketter / kategorier
 NewProject=Nyt projekt
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Ikke tildelt opgaven
 NoUserAssignedToTheProject=Ingen brugere tildelt dette projekt
 TimeSpentBy=Tid brugt af
 TasksAssignedTo=Opgaver tildelt
-AssignTaskToMe=Tildel opgave til mig
+AssignTaskToMe=Tildel opgaven til mig selv
 AssignTaskToUser=Tildel opgave til %s
 SelectTaskToAssign=Vælg opgave for at tildele ...
 AssignTask=Tildel
diff --git a/htdocs/langs/da_DK/recruitment.lang b/htdocs/langs/da_DK/recruitment.lang
index a747076bfdd..39a926ef2f0 100644
--- a/htdocs/langs/da_DK/recruitment.lang
+++ b/htdocs/langs/da_DK/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Tak for din ansøgning. <br> ...
 JobClosedTextCandidateFound=Jobpositionen er lukket. Stillingen er besat.
 JobClosedTextCanceled=Jobpositionen er lukket.
 ExtrafieldsJobPosition=Supplerende attributter (jobstillinger)
-ExtrafieldsCandidatures=Supplerende attributter (jobansøgninger)
+ExtrafieldsApplication=Supplerende attributter (jobansøgninger)
 MakeOffer=Giv et tilbud
diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
index 4d4c7a5a07d..73afd0e084e 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Er du sikker på, at du vil bekræfte denne forsendelse m
 ConfirmCancelSending=Er du sikker på, at du vil annullere denne forsendelse?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Advarsel, ingen varer venter på at blive sendt.
-StatsOnShipmentsOnlyValidated=Statistikker udført på forsendelser kun bekræftet. Den anvendte dato er datoen for bekræftelsen af ​​forsendelsen (planlagt leveringsdato er ikke altid kendt).
+StatsOnShipmentsOnlyValidated=Statistikker gælder kun for validerede forsendelser. Den anvendte dato er datoen for validering af forsendelsen (planlagt leveringsdato er ikke altid kendt)
 DateDeliveryPlanned=Planlagt leveringsdato
 RefDeliveryReceipt=Ref leveringskvittering
 StatusReceipt=Status leveringskvittering
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index c6fecc6ad3c..a37ee2ad5bd 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Ingen foruddefinerede produkter for dette objekt.
 DispatchVerb=Forsendelse
 StockLimitShort=Begræns for advarsel
 StockLimit=Lagergrænse for advarsel
-StockLimitDesc=(tom) betyder ingen advarsel. <br> 0 kan bruges til en advarsel, så snart lageret er tomt.
+StockLimitDesc=(tom) betyder ingen advarsel. <br> 0 kan bruges til at udløse en advarsel, så snart bestanden er tom.
 PhysicalStock=Fysisk materiel
 RealStock=Real Stock
 RealStockDesc=Fysisk / reel materiel er den aktuel lager i lageret.
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index 80587a6b21c..f821ca3f25a 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Adgangskode ændret til: %s
 SubjectNewPassword=Din nye adgangskode for %s
 GroupRights=Gruppetilladelser
 UserRights=Brugertilladelser
+Credentials=Legitimationsoplysninger
 UserGUISetup=Bruger Opsætning af display
 DisableUser=Deaktiver
 DisableAUser=Deaktiver en bruger
@@ -115,7 +116,7 @@ DateOfEmployment=Ansættelsesdato
 DateEmployment=Beskæftigelse
 DateEmploymentstart=Ansættelsesstartdato
 DateEmploymentEnd=Ansættelses slutdato
-RangeOfLoginValidity=Datointerval for login-gyldighed
+RangeOfLoginValidity=Adgang til gyldighedsdatointerval
 CantDisableYourself=Du kan ikke deaktivere din egen brugerpost
 ForceUserExpenseValidator=Tving udgiftsrapportvalidering
 ForceUserHolidayValidator=Tving orlov anmodning validator
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 3b1a9613f32..2d3cc4092de 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Definer liste over alle tilgængelig
 GenerateSitemaps=Generer webstedets sitemapfil
 ConfirmGenerateSitemaps=Hvis du bekræfter, sletter du den eksisterende sitemapfil ...
 ConfirmSitemapsCreation=Bekræft generering af sitemap
-SitemapGenerated=Sitemap genereret
+SitemapGenerated=Sitemap-fil <b> %s </b> genereret
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon skal være png
-ErrorFaviconSize=Favicon skal være i størrelse 32x32
-FaviconTooltip=Upload et billede, der skal være en png på 32x32
+ErrorFaviconSize=Favicon skal have en størrelse på 16x16, 32x32 eller 64x64
+FaviconTooltip=Upload et billede, der skal være et png (16x16, 32x32 eller 64x64)
diff --git a/htdocs/langs/de_AT/accountancy.lang b/htdocs/langs/de_AT/accountancy.lang
index f2d0909a71e..14639999065 100644
--- a/htdocs/langs/de_AT/accountancy.lang
+++ b/htdocs/langs/de_AT/accountancy.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - accountancy
 MenuBankAccounts=Kontonummern
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 07388acbb52..34368689cf1 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -128,7 +128,6 @@ SummaryConst=Liste aller Systemeinstellungen
 Skin=Oberfläche
 DefaultSkin=Standardoberfläche
 CompanyCurrency=Firmenwährung
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungsentwürfen (alle, falls leer)
 WatermarkOnDraftProposal=Wasserzeichen für Angebotsentwürfe (alle, falls leer)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Fragen Sie nach dem Bestimmungsort des Bankkontos der Bestellung
@@ -162,3 +161,4 @@ AtLeastOneDefaultBankAccountMandatory=Es muss mindestens 1 Standardbankkonto def
 RESTRICT_ON_IP=Erlauben Sie nur den Zugriff auf eine Host-IP (Platzhalter nicht zulässig, verwenden Sie Leerzeichen zwischen den Werten). Leer bedeutet, dass jeder Host darauf zugreifen kann.
 FeatureNotAvailableWithReceptionModule=Funktion nicht verfügbar, wenn das Modul Empfang aktiviert ist
 EmailTemplate=Vorlage für E-Mail
+YouShouldDisablePHPFunctions=PHP Funktionen sollten deaktiviert werden
diff --git a/htdocs/langs/de_AT/banks.lang b/htdocs/langs/de_AT/banks.lang
index 6609e442c20..c52d81ff029 100644
--- a/htdocs/langs/de_AT/banks.lang
+++ b/htdocs/langs/de_AT/banks.lang
@@ -25,4 +25,3 @@ BankType2=Kassa
 IncludeClosedAccount=Geschlossene konten miteinbeziehen
 StatusAccountClosed=geschlossen
 ShowCheckReceipt=Zeige überprüfen Einzahlungsbeleg
-Graph=Grafik
diff --git a/htdocs/langs/de_AT/cron.lang b/htdocs/langs/de_AT/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/de_AT/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/de_AT/errors.lang b/htdocs/langs/de_AT/errors.lang
index c20def2a8d4..ededba208c4 100644
--- a/htdocs/langs/de_AT/errors.lang
+++ b/htdocs/langs/de_AT/errors.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - errors
-ErrorBadUrl=Url %s ist ungültig
 ErrorRecordNotFound=Eintrag nicht gefunden.
 ErrorCashAccountAcceptsOnlyCashMoney=Dies ist ein Bargeldkonto (Kassa) und akzeptiert deshalb nur Bargeldtransaktionen.
 ErrorCustomerCodeAlreadyUsed=Diese Kunden Nr. ist bereits vergeben.
diff --git a/htdocs/langs/de_AT/members.lang b/htdocs/langs/de_AT/members.lang
index 071f33fcbff..ec6b12364cc 100644
--- a/htdocs/langs/de_AT/members.lang
+++ b/htdocs/langs/de_AT/members.lang
@@ -3,7 +3,6 @@ SetLinkToUser=Mit Benutzer verknüpfen
 SetLinkToThirdParty=Mit Partner verknüpfen
 DateSubscription=Abonnierungsdatum
 DateEndSubscription=Abonnementauslaufdatum
-EndSubscription=Abonnementende
 SubscriptionId=Abonnement ID
 MemberId=Mitglieds ID
 MemberTypeId=Mitgliedsart ID
@@ -13,7 +12,5 @@ MemberStatusNoSubscriptionShort=Bestätigt
 SubscriptionEndDate=Abonnementauslaufdatum
 SubscriptionLate=Versätet
 NewMemberType=Neues Mitgliedsrt
-Physical=Physisch
-Moral=Rechtlich
 Filehtpasswd=htpasswd-Datei
 HTPasswordExport=htpassword-Dateierstellung
diff --git a/htdocs/langs/de_AT/modulebuilder.lang b/htdocs/langs/de_AT/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/de_AT/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/de_AT/partnership.lang b/htdocs/langs/de_AT/partnership.lang
new file mode 100644
index 00000000000..220377a2df5
--- /dev/null
+++ b/htdocs/langs/de_AT/partnership.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - partnership
+DatePartnershipStart=Start-Datum
+DatePartnershipEnd=End-Datum
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index d98030ee805..dabeea01078 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -196,7 +196,6 @@ NoNewRecordSaved=Es gibt keine weiteren Einträge zu journalisieren.
 ListOfProductsWithoutAccountingAccount=Produkte ohne Verknüpfung zu einem Buchhaltungskonto
 ChangeBinding=Verknüpfung ändern
 Accounted=Im Hauptbuch eingetragen
-NotYetAccounted=Nicht im Hauptbuch eingetragen.
 ShowTutorial=Zeige die Anleitung
 NotReconciled=Nicht ausgeglichen
 ApplyMassCategories=Massenänderung Kategorien
diff --git a/htdocs/langs/de_CH/banks.lang b/htdocs/langs/de_CH/banks.lang
index 68eae87b2c8..1c2e273a50d 100644
--- a/htdocs/langs/de_CH/banks.lang
+++ b/htdocs/langs/de_CH/banks.lang
@@ -47,11 +47,10 @@ BankLineConciliated=Transaktion mit Bankbeleg ausgeglichen
 Reconciled=Ausgeglichen
 SupplierInvoicePayment=Lieferantenzahlung
 MenuBankInternalTransfer=Kontoübertrag
-TransferDesc=Das ist ein interner Transfer zwischen zwei Konten. Dolibarr schreibt zwei Transaktionen über den selben Betrag vom Haben zum Sollkonto. Datum und Bezeichner sind auch gleich.
 TransferFrom=Von
 TransferTo=An
+CheckTransmitter=Absender
 ValidateCheckReceipt=Chequebeleg genehmigen?
-ConfirmValidateCheckReceipt=Bist du sicher, dass du diesen Beleg frei geben willst? Danach kannst du an der Transaktion nichts mehr ändern.
 DeleteCheckReceipt=Chequebeleg löschen?
 ConfirmDeleteCheckReceipt=Bist du sicher, dass du diesen Cheque löschen willst?
 BankChecksToReceipt=Checks die auf Einlösung warten
@@ -64,7 +63,6 @@ PaymentDateUpdateSucceeded=Zahlungsdatum erfolgreich aktualisiert
 BankTransactionLine=Transaktion
 AllAccounts=Alle Bank- und Barkonten
 FutureTransaction=Diese zukünftige Transaktion kann ich nicht ausgleichen
-SelectChequeTransactionAndGenerate=Wähle oder filtere die Cheques, die du in der Scheckeinreichung drin haben willst. Dann klicke auf "Erstellen"
 InputReceiptNumber=Wählen Sie den Kontoauszug  der mit der Zahlungs übereinstimmt. Verwenden Sie einen sortierbaren numerischen Wert: YYYYMM oder YYYYMMDD
 EventualyAddCategory=Wenn möglich Kategorie angeben, worin die Daten eingeordnet werden
 ToConciliate=Auszugleichen ?
diff --git a/htdocs/langs/de_CH/boxes.lang b/htdocs/langs/de_CH/boxes.lang
index 1170e06a180..95018f3b6c2 100644
--- a/htdocs/langs/de_CH/boxes.lang
+++ b/htdocs/langs/de_CH/boxes.lang
@@ -30,11 +30,6 @@ BoxTitleSupplierOrdersAwaitingReception=Ausstehende Lieferanten - Lieferungen
 BoxTitleLastModifiedContacts=%s zuletzt bearbeitete Kontakte/Adressen
 BoxLastExpiredServices=%s älteste Kontakte mit aktiven abgelaufenen Leistungen
 BoxTitleLastActionsToDo=%s neueste Aktionen zu erledigen
-BoxTitleLastContracts=%s neueste Verträge
-BoxTitleLastModifiedDonations=%s zuletzt geänderte Spenden
-BoxTitleLastModifiedExpenses=%s zuletzt bearbeitete Spesenabrechnungen
-BoxTitleLatestModifiedBoms=Die neuesten %s geänderten Materiallisten (BOMs)
-BoxTitleLatestModifiedMos=Die neuesten %s geänderten Fertigungsaufträge
 BoxGoodCustomers=Guter Kunde
 LastRefreshDate=Datum der letzten Aktualisierung
 NoRecordedBookmarks=Keine Lesezeichen gesetzt. Klicken Sie <a href="%s">hier</a>, um ein Lesezeichen zu setzen.
diff --git a/htdocs/langs/de_CH/categories.lang b/htdocs/langs/de_CH/categories.lang
index cebc3c2b78a..6216e7dae10 100644
--- a/htdocs/langs/de_CH/categories.lang
+++ b/htdocs/langs/de_CH/categories.lang
@@ -3,17 +3,9 @@ Rubrique=Schlagwort / Kategorie
 Rubriques=Schlagworte / Kategorien
 RubriquesTransactions=Schlagworte / Kategorien der Transaktionen
 categories=Schlagworte / Kategorien
-NoCategoryYet=Es gibt kein Schlagwort und keine Kategorie dieser Art.
 AddIn=Einfügen in
 Classify=Einstufen
 CategoriesArea=Schlagwörter / Kategorien
-ProductsCategoriesArea=Schlagwörter / Kategorien für Produkte und Dienstleistungen
-SuppliersCategoriesArea=Bereich für Lieferanten-Tags / Kategorien
-CustomersCategoriesArea=Schlagwörter / Kategorien für Kunden
-MembersCategoriesArea=Schlagwörter / Kategorien für Mitglieder
-ContactsCategoriesArea=Schlagwörter / Kategorien für Kontakte
-ProjectsCategoriesArea=Schlagwörter / Kategorien für Projekte
-UsersCategoriesArea=Benutzerschlagworte und -kategorien
 SubCats=Unterkategorien
 CatList=Liste der Schlagwörter / Kategorien
 NewCategory=Neues Schlagwort / Neue Kategorie
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 3bca2038541..da19a47dffb 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorSetACountryFirst=Wähle zuerst das Land
 SelectThirdParty=Wähle einen Geschäftspartner
-ConfirmDeleteCompany=Willst du diesen Geschäftspartner und alle damit verbundenen Informationen wirklich löschen?
-ConfirmDeleteContact=Willst du diesen Kontakt und alle damit verbundenen Informationen wirklich löschen?
 MenuNewThirdParty=Erzeuge Geschäftspartner
 MenuNewCustomer=Erzeuge Kunde
 MenuNewSupplier=Neuer Lieferant
@@ -31,11 +29,9 @@ StateCode=Kanton
 Region-State=Land / Region
 CountryCode=Ländercode
 PhoneShort=Telefon
-PhonePro=Telefon berufl.
 PhonePerso=Telefon privat
 PhoneMobile=Mobiltelefon
 No_Email=E-Mail kampagnen ablehnen
-DefaultLang=Standardsprache
 VATIsUsed=MWST - pflichtig
 VATIsUsedWhenSelling=Gib hier an, ob der Geschäftspartner MWST - Steuerpflichtig ist.
 VATIsNotUsed=Nicht MWST - pflichtig
@@ -127,7 +123,6 @@ CustomerCodeDesc=Kundennummer, eindeutig für jeden Kunden
 SupplierCodeDesc=Lieferantennummer, eindeutig für jeden Lieferanten
 RequiredIfCustomer=Erforderlich falls Geschäftspartner Kunde oder Interessent ist
 RequiredIfSupplier=Erforderlich, wenn der Partner Lieferant ist
-ValidityControledByModule=Durch Modul validiert
 ListOfThirdParties=Liste der Geschäftspartner
 ContactsAllShort=Alle (Kein Filter)
 ContactForOrdersOrShipments=Bestellungs- oder Lieferkontakt
@@ -175,7 +170,6 @@ FiscalMonthStart=Ab Monat des Geschäftsjahres
 YouMustAssignUserMailFirst=Für E-Mail - Benachrichtigung hinterlegst du bitte zuerst eine E-Mail Adresse im Benutzerprofil.
 YouMustCreateContactFirst=Sie müssen erst E-Mail-Kontakte beim Geschäftspartner anlegen, um E-Mail-Benachrichtigungen hinzufügen zu können.
 ListCustomersShort=Kundenliste
-UniqueThirdParties=Anzahl Geschäftspartner
 InActivity=Offen
 ActivityCeased=Inaktiv
 ThirdPartyIsClosed=Der Partner ist inaktiv.
@@ -183,7 +177,6 @@ OutstandingBillReached=Kreditlimit erreicht
 OrderMinAmount=Mindestbestellmenge
 MergeOriginThirdparty=Geschäftspartner duplizieren (Geschäftspartner, den Sie löschen möchten)
 MergeThirdparties=Zusammenführen von Geschäftspartnern
-ConfirmMergeThirdparties=Willst du diesen Partner wirklich mit dem aktuellen Verbinden?\nAlle verknüpften Objekte werden dabei übernommen und dann der gewählte Partner gelöscht.
 ThirdpartiesMergeSuccess=Ich habe die Partner erfolgreich zusammengeführt.
 SaleRepresentativeLogin=Login des Verkaufsmitarbeiters
 SaleRepresentativeFirstname=Vorname des Vertreters
diff --git a/htdocs/langs/de_CH/errors.lang b/htdocs/langs/de_CH/errors.lang
index aa7f34b7ea1..0e1ae0d6668 100644
--- a/htdocs/langs/de_CH/errors.lang
+++ b/htdocs/langs/de_CH/errors.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - errors
-ErrorBadEMail=E-Mail%s ist nicht korrekt.
 ErrorBadValueForParamNotAString=Ungültiger Wert für ihre Parameter. Das passiert normalerweise, wenn die Übersetzung fehlt.
 ErrorFailToCopyDir=Konnte das Verzeichnis <b>'%s'</b> nicht nach <b>'%s'</b> kopieren.
 ErrorFailToRenameFile=Konnte die Datei <b>'%s'</b> nicht in <b>'%s'</b> umzubenennen.
@@ -14,8 +13,6 @@ ErrorSupplierCodeRequired=Lieferanten-Nr. erforderlich
 ErrorSupplierCodeAlreadyUsed=Diese Lieferanten Nr. ist bereits vergeben.
 ErrorBadValueForParameter=Ungültiger Wert '%s' für Parameter '%s'
 ErrorUserCannotBeDelete=Ich kann diesen Benutzer nicht löschen... Vieleicht ist er noch mit anderen Dolibarr - Objekten verknüpft?
-ErrorFieldsRequired=Ein oder mehrere erforderliche Felder wurden nicht ausgefüllt-
-ErrorSubjectIsRequired=Bitte gib einen E-Mail - Betreff an.
 ErrorFileSizeTooLarge=Die Grösse der gewählten Datei übersteigt den zulässigen Maximalwert.
 ErrorSizeTooLongForIntType=Die Grösse überschreitet das Maximum für den Typ 'int' (%s Ziffern maximal)
 ErrorSizeTooLongForVarcharType=Die Grösse überschreitet das Maximum für den Typ 'string' (%s Zeichen maximal)
diff --git a/htdocs/langs/de_CH/mails.lang b/htdocs/langs/de_CH/mails.lang
index b279747d723..27833290138 100644
--- a/htdocs/langs/de_CH/mails.lang
+++ b/htdocs/langs/de_CH/mails.lang
@@ -26,9 +26,11 @@ MailingNeedCommand2=Sie können den Versand jedoch auch online starten, indem Si
 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.
 ToAddRecipientsChooseHere=Fügen Sie Empfänger über die Listenauswahl hinzu
 NbOfEMailingsSend=E-Mail-Kampagne versandt
+TagCheckMail=Öffnen der Mail verfolgen
 TagUnsubscribe=Abmelde Link
 NoEmailSentBadSenderOrRecipientEmail=Kein E-Mail gesendet. Ungültige Absender oder Empfänger Adresse. Benutzerprofil kontrollieren.
 MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sStart - Einstellungen - EMails%s den Parameter <strong>'%s'</strong> auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die E-Mail-Kampagnen-Funktion nutzen.
+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)
 MailAdvTargetRecipients=Empfänger (Erweiterte Selektion)
 AdvTgtSearchIntHelp=Intervall verwenden um den Zahlenwert auszuwählen
 AdvTgtMinVal=Minimalwert
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 0cc93b38bf1..38c206b7ed4 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -87,7 +87,6 @@ Resiliate=Abschliessen
 ValidateAndApprove=Freigeben und bestätigen
 NotValidated=Nicht validiert
 SaveAndStay=Speichern
-ConfirmClone=Wähle die Daten zum Duplizieren aus.
 Hide=Verbergen
 Valid=Freigabe
 Upload=Hochladen
@@ -118,8 +117,6 @@ Morning=Morgen
 Afternoon=Nachmittag
 MinuteShort=min
 CurrencyRate=Wechselkurs
-UserAuthor=Erstellt von
-UserModif=Zuletzt geändert durch
 DefaultValues=Standardwerte
 PriceCurrency=Währung
 UnitPriceHTCurrency=Nettopreis
@@ -270,7 +267,6 @@ SelectTargetUser=Wähle den Benutzer / Mitarbeiter
 SaveUploadedFileWithMask=Datei auf dem Server speichern mit dem Namen "<strong>%s</strong>" (oder "%s")
 OriginFileName=Original Dateiname
 ShowMoreLines=Mehr oder weniger Positionen anzeigen
-SelectElementAndClick=Wähle etwas aus und klicke dann auf %s
 ShowTransaction=Zeige die Transaktion auf dem zugehörigen Bankkonto.
 ShowIntervention=Zeige Kundeneinsatz
 GoIntoSetupToChangeLogo=Gehen Sie zu "Start - Einstellungen - Firma / Organisation" um das Logo zu ändern. Gehen Sie zu "Start -> Einstellungen -> Anzeige" um es zu verstecken.
diff --git a/htdocs/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
index a7d6c581920..bc1bcfb7765 100644
--- a/htdocs/langs/de_CH/members.lang
+++ b/htdocs/langs/de_CH/members.lang
@@ -13,7 +13,6 @@ MembersListToValid=Liste der zu verifizierenden Mitglieder
 MembersListValid=Liste der verifizierten Mitglieder
 DateSubscription=Start des Abonnements
 DateEndSubscription=Ende des Abonnements
-EndSubscription=Abo-Ende
 SubscriptionId=Abo-ID
 MemberId=Mitgliedernummer
 MemberType=Mitgliederart
@@ -70,9 +69,7 @@ MembersStatisticsByRegion=Mitgliederstatistik nach Region
 NoValidatedMemberYet=Keine verifizierten Mitglieder gefunden
 LatestSubscriptionDate=Enddatum des Abonnementes
 NewMemberbyWeb=Neues Mitglied wurde hinzugefügt. Warten auf Genehmigung
-SubscriptionsStatistics=Statistiken zu Abonnements
 NbOfSubscriptions=Anzahl der Abonnements
-AmountOfSubscriptions=Anzahl der Abonnements
 SubscriptionRecorded=Abo erfasst
 SendReminderForExpiredSubscriptionTitle=Erinnerung per E-Mail senden, wenn das Abonnement abgelaufen ist
 SendReminderForExpiredSubscription=Erinnerung per E-Mail an Mitglieder senden, wenn das Abonnement abläuft (Parameter ist die Anzahl der Tage vor dem Ende des Abonnements, um die Erinnerung zu senden. Dies kann eine durch ein Semikolon getrennte Liste von Tagen sein, z. B. '10; 5; 0; -5')
diff --git a/htdocs/langs/de_CH/modulebuilder.lang b/htdocs/langs/de_CH/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/de_CH/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/de_CH/partnership.lang b/htdocs/langs/de_CH/partnership.lang
new file mode 100644
index 00000000000..12da41cb2ac
--- /dev/null
+++ b/htdocs/langs/de_CH/partnership.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - partnership
+DatePartnershipStart=Ferienbeginn
+DatePartnershipEnd=Ferienende
+PartnershipAccepted =Akzeptiert
+PartnershipCanceled =widerrufen
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index fe068de6eeb..dda8a451ab4 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -27,10 +27,8 @@ AppliedPricesFrom=Angelegt von
 SellingPriceHT=Verkaufspreis (exkl. MWST)
 SellingPriceTTC=Verkaufspreis (inkl. MwSt.)
 SellingMinPriceTTC=Mindestverkaufspreis (inkl. MWST)
-CostPriceDescription=In dieses Feld kannst du deinen freien Durchschnittspreis dieses Produktes eintragen.\nZum Beispiel den durchschnittlichen EP plus deine Verarbeitungs und Vertriebskosten.
 CostPriceUsage=Dieser Wert hilft bei der Margenbestimmung
 PurchasedAmount=Eingekaufte Menge
-MinPrice=Mind. VP
 EditSellingPriceLabel=Preisschild anpassen
 CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
 SupplierRef=Verkäufer SKU (Artikelnummer)
@@ -53,11 +51,7 @@ PredefinedProductsAndServicesToSell=Vordefinierte Produkte/Leistungen für Verka
 PredefinedProductsToPurchase=Vordefinierte Einkaufs-Produkte
 PredefinedProductsAndServicesToPurchase=Vordefinierte Produkte / Dienstleistungen für den Einkauf
 ConfirmCloneProduct=Bist du sicher, dass du diese Position <b>%s</b> duplizieren willst?
-CloneContentProduct=Übernehme alle Informationen
 ClonePricesProduct=Übernehme alle Preise
-CloneCategoriesProduct=Übernehme Schlagwörter und Kategorien
-CloneCompositionProduct=Übernehme Pakete
-CloneCombinationsProduct=Übernehme Produktvarianten
 NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen
 SellingPrices=Verkaufspreise
 BuyingPrices=Einkaufspreise
diff --git a/htdocs/langs/de_CH/sendings.lang b/htdocs/langs/de_CH/sendings.lang
index e03dac2f60c..6e6059aa568 100644
--- a/htdocs/langs/de_CH/sendings.lang
+++ b/htdocs/langs/de_CH/sendings.lang
@@ -8,7 +8,6 @@ StatusSendingProcessed=Verarbeitete
 StatusSendingProcessedShort=Fertig
 SendingSheet=Auslieferungen
 WarningNoQtyLeftToSend=Achtung, keine Produkte für den Versand
-StatsOnShipmentsOnlyValidated=Versandstatistik (nur Freigegebene). Das Datum ist das der Freigabe (geplantes Lieferdatum ist nicht immer bekannt).
 ClassifyReception=Lieferung klassifizieren
 ProductQtyInShipmentAlreadySent=Bereits verschickte Artikel dieser Bestellung
 DocumentModelTyphon=Vollständig Dokumentvorlage für die Lieferungscheine (Logo, ...)
diff --git a/htdocs/langs/de_CH/users.lang b/htdocs/langs/de_CH/users.lang
index 9f4f080f55d..02a05cfdc2c 100644
--- a/htdocs/langs/de_CH/users.lang
+++ b/htdocs/langs/de_CH/users.lang
@@ -34,7 +34,6 @@ NameToCreate=Name des neuen Geschäftspartners
 NbOfUsers=Anz. Benutzer
 UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum ändern
 WeeklyHours=Geleistete Stunden pro Woche
-ExpectedWorkedHours=Erwartete Stunden pro Woche
 DisabledInMonoUserMode=Im Wartungsmodus deaktiviert
 UserAccountancyCode=Buchhaltungskonto zum Benutzer
 DateEmploymentstart=Datum der Anstellung
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index a3725e98324..8ea9181e11e 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -202,14 +202,14 @@ Docref=Referenz
 LabelAccount=Konto-Beschriftung
 LabelOperation=Bezeichnung der Operation
 Sens=Richtung
-AccountingDirectionHelp=Verwenden Sie für ein Buchhaltungskonto eines Kunden «Guthaben», um eine Zahlung zu erfassen, die Sie erhalten haben. <br> Verwenden Sie für ein Buchhaltungskonto eines Lieferanten «Debit», um eine von Ihnen geleistete Zahlung zu erfassen
+AccountingDirectionHelp=Verwenden Sie für ein Buchhaltungskonto eines Kunden Guthaben, um eine Zahlung zu erfassen, die Sie erhalten haben. <br> Verwenden Sie für ein Buchhaltungskonto eines Lieferanten Debit, um eine von Ihnen geleistete Zahlung zu erfassen
 LetteringCode=Beschriftungscode
 Lettering=Beschriftung
 Codejournal=Journal
 JournalLabel=Journal-Bezeichnung
 NumPiece=Teilenummer
 TransactionNumShort=Anz. Buchungen
-AccountingCategory=Custom group
+AccountingCategory=Benutzerdefinierte Gruppe
 GroupByAccountAccounting=Gruppieren nach Hauptbuchkonto
 GroupBySubAccountAccounting=Gruppieren nach Nebenbuchkonto
 AccountingAccountGroupsDesc=Hier können Kontengruppen definiert werden. Diese werden für personaliserte Buchhaltungsreports verwendet.
@@ -297,7 +297,7 @@ NoNewRecordSaved=Keine weiteren Einträge zum Übernehmen
 ListOfProductsWithoutAccountingAccount=Liste der Produkte, die nicht an ein Buchhaltungskonto gebunden sind
 ChangeBinding=Ändern der Zuordnung
 Accounted=im Hauptbuch erfasst
-NotYetAccounted=noch nicht im Hauptbuch erfasst
+NotYetAccounted=Noch nicht im Hauptbuch verbucht
 ShowTutorial=Tutorial anzeigen
 NotReconciled=nicht ausgeglichen
 WarningRecordWithoutSubledgerAreExcluded=Achtung, alle Vorgänge ohne definiertes Nebenbuchkonto werden gefiltert und von dieser Ansicht ausgeschlossen
@@ -402,29 +402,29 @@ UseMenuToSetBindindManualy=Zeilen noch nicht zugeordnet, verwende das Menu <a hr
 
 ## Import
 ImportAccountingEntries=Buchaltungseinträge
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
-FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
+ImportAccountingEntriesFECFormat=Buchhaltungseinträge - FEC-Format
+FECFormatJournalCode=Codejournal (JournalCode)
+FECFormatJournalLabel=Label Journal (JournalLib)
+FECFormatEntryNum=Stücknummer (EcritureNum)
+FECFormatEntryDate=Stückdatum (EcritureDate)
+FECFormatGeneralAccountNumber=Allgemeine Kontonummer (CompteNum)
+FECFormatGeneralAccountLabel=Allgemeines Kontolabel (CompteLib)
+FECFormatSubledgerAccountNumber=Nebenbuchkontonummer (CompAuxNum)
+FECFormatSubledgerAccountLabel=Nebenbuchkontonummer (CompAuxLib)
+FECFormatPieceRef=Stück Referenz (PieceRef)
+FECFormatPieceDate=Stück Erstellungsdatum (PieceDate)
 FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatDebit=Lastschrift (Lastschrift)
+FECFormatCredit=Kredit (Kredit)
+FECFormatReconcilableCode=Abgleichbarer Code (EcritureLet)
+FECFormatReconcilableDate=Überbrückbares Datum (DateLet)
 FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+FECFormatMulticurrencyAmount=Mehrwährungs-Betrag (Montantdevise)
+FECFormatMulticurrencyCode=Mehrwährungs-Code (Idevise)
 
 DateExport=Datum Export
 WarningReportNotReliable=Achtung, dieser Bericht basiert nicht auf dem Hauptbuch und enthält keine Transaktionen, die manuell im Hauptbuch geändert wurden. Wenn Ihre Journalisierung aktuell ist, ist die Buchhaltungsansicht genauer.
 ExpenseReportJournal=Spesenabrechnung Journal
 InventoryJournal=Inventarjournal
 
-NAccounts=%s accounts
+NAccounts=%s Konten
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 6256ec62784..168773c75b9 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Sie müssen die Datei <b>%s</b>  entfernen oder umbennen, falls vorha
 RestoreLock=Stellen Sie die Datei <b>%s</b> mit ausschließlicher Leseberechtigung wieder her, um die Benutzung des Installations-/Update-Tools zu deaktivieren.
 SecuritySetup=Sicherheitseinstellungen
 PHPSetup=PHP-Einstellungen
+OSSetup=Betriebssystem-Einstellungen
 SecurityFilesDesc=Sicherheitseinstellungen für Dateiupload festlegen
 ErrorModuleRequirePHPVersion=Fehler: Dieses Modul benötigt die PHP Version %s oder höher
 ErrorModuleRequireDolibarrVersion=Fehler: Dieses Moduls benötigt die Dolibarr Version %s oder höher
@@ -813,8 +814,8 @@ 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 AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Erweitern Sie den Zugriff auf alle Drittanbieter UND deren Objekte (nicht nur auf Drittanbieter, für die der Benutzer ein Verkaufsvertreter ist). <br> Nicht wirksam für externe Benutzer (bei Vorschlägen, Bestellungen, Rechnungen, Verträgen usw. immer auf sich selbst beschränkt). <br> Nicht wirksam für Projekte (nur Regeln zu Projektberechtigungen, Sichtbarkeit und Zuweisung).
+Permission263=Erweitern Sie den Zugriff auf alle Drittanbieter OHNE ihre Objekte (nicht nur auf Drittanbieter, für die der Benutzer ein Verkaufsvertreter ist). <br> Nicht wirksam für externe Benutzer (bei Vorschlägen, Bestellungen, Rechnungen, Verträgen usw. immer auf sich selbst beschränkt). <br> Nicht wirksam für Projekte (nur Regeln zu Projektberechtigungen, Sichtbarkeit und Zuweisung).
 Permission271=Read CA
 Permission272=Rechnungen anzeigen
 Permission273=Ausgabe Rechnungen
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Nicht vorschlagen / anzeigen
 NoActiveBankAccountDefined=Keine aktiven Finanzkonten definiert
 OwnerOfBankAccount=Kontoinhaber %s
 BankModuleNotActive=Finanzkontenmodul nicht aktiv
-ShowBugTrackLink=Zeige Link  <strong>%s</strong>
+ShowBugTrackLink=Definieren Sie den Link "<strong> %s </strong>" (leer, um diesen Link nicht anzuzeigen, 'github' für den Link zum Dolibarr-Projekt oder definieren Sie direkt eine URL 'https: // ...')
 Alerts=Benachrichtigungen
 DelaysOfToleranceBeforeWarning=Verzögerung, bevor eine Warnmeldung angezeigt wird für:
 DelaysOfToleranceDesc=Stellen Sie die Verzögerung ein, bevor ein Warnsymbol %s für das späte Element auf dem Bildschirm angezeigt wird.
@@ -1184,8 +1185,8 @@ SetupDescription2=Die folgenden zwei Punkte sind obligatorisch:
 SetupDescription3=<a href="%s"> %s -> %s </a> <br> <br> Grundlegende Parameter zum Anpassen des Standardverhaltens Ihrer Anwendung (z. B. für länderbezogene Funktionen).
 SetupDescription4=<a href="%s"> %s -> %s </a> <br> <br> Diese Software ist eine Suite vieler Module / Anwendungen. Die auf Ihre Bedürfnisse bezogenen Module müssen aktiviert und konfiguriert sein. Menüeinträge werden mit der Aktivierung dieser Module angezeigt.
 SetupDescription5=Andere Setup-Menüs verwalten optionale Parameter.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
+AuditedSecurityEvents=Sicherheitsereignisse, die überwacht werden
+NoSecurityEventsAreAduited=Es werden keine Sicherheitsereignisse überwacht. Sie können sie über das Menü %s aktivieren
 Audit=Protokoll
 InfoDolibarr=Über Dolibarr
 InfoBrowser=Über Ihren Webbrowser
@@ -1253,7 +1254,8 @@ RunningUpdateProcessMayBeRequired=Eine Systemaktualisierung scheint erforderlich
 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 herunterladen
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefModelDesc=Gibt die Referenznummer im Format %syymm-nnnn zurück, wobei yy das Jahr, mm der Monat und nnnn eine fortlaufende automatisch inkrementierende Nummer ohne Zurücksetzen ist
+SimpleNumRefNoDateModelDesc=Gibt die Referenznummer im Format %s-nnnn zurück, wobei nnnn eine fortlaufende automatisch inkrementierende Nummer ohne Zurücksetzen ist
 ShowProfIdInAddress=Erweiterte Kundendaten im Adressfeld anzeigen
 ShowVATIntaInAddress=Umsatzsteuer-ID im Adressfeld ausblenden
 TranslationUncomplete=Teilweise Übersetzung
@@ -1751,7 +1753,7 @@ CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Lassen Sie das Kontrollkästchen "Zahlung au
 ##### Agenda #####
 AgendaSetup=Aufgaben/Termine-Modul Einstellungen
 PasswordTogetVCalExport=Passwort für den VCal-Export
-SecurityKey = Security Key
+SecurityKey = Sicherheitsschlüssel
 PastDelayVCalExport=Keine Termine exportieren die älter sind als
 AGENDA_USE_EVENT_TYPE=Verwenden Ereignissarten \nEinstellen unter (Start -> Einstellungen -> Wörterbücher -> Ereignissarten) 
 AGENDA_USE_EVENT_TYPE_DEFAULT=Diesen Standardwert automatisch als Ereignistyp im  Ereignis Erstell-Formular verwenden.
@@ -1979,7 +1981,7 @@ MAIN_PDF_MARGIN_BOTTOM=Unterer Rand im PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Höhe des Logos im PDF
 NothingToSetup=Dieses Modul benötigt keine speziellen Einstellungen.
 SetToYesIfGroupIsComputationOfOtherGroups=Setzen Sie dieses Fehld auf Ja, wenn diese Gruppe eine Berechnung von anderen Gruppen ist
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Geben Sie die Berechnungsregel ein, wenn das vorherige Feld auf Ja gesetzt wurde. <br> Zum Beispiel: <br> CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=Mehrere Sprachvarianten gefunden
 RemoveSpecialChars=Sonderzeichen entfernen
 COMPANY_AQUARIUM_CLEAN_REGEX=Regexfilter um die Werte zu Bereinigen (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -2062,11 +2064,11 @@ UseDebugBar=Verwenden Sie die Debug Leiste
 DEBUGBAR_LOGS_LINES_NUMBER=Zahl der letzten Protokollzeilen, die in der Konsole verbleiben sollen
 WarningValueHigherSlowsDramaticalyOutput=Warnung, höhere Werte verlangsamen die Ausgabe erheblich.
 ModuleActivated=Modul %s is aktiviert und verlangsamt die Overfläche
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
+ModuleActivatedWithTooHighLogLevel=Das Modul %s wird mit einer zu hohen Protokollierungsstufe aktiviert (versuchen Sie, eine niedrigere Stufe für bessere Leistung und Sicherheit zu verwenden).
+ModuleSyslogActivatedButLevelNotTooVerbose=Das Modul %s ist aktiviert und die Protokollstufe (%s) ist korrekt (nicht zu ausführlich).
 IfYouAreOnAProductionSetThis=Wenn Sie sich in einer Produktionsumgebung befinden, sollten Sie diese Eigenschaft auf %s setzen.
 AntivirusEnabledOnUpload=Antivirus für hochgeladene Dateien aktiviert
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+SomeFilesOrDirInRootAreWritable=Einige Dateien oder Verzeichnisse sind nicht schreibgeschützt
 EXPORTS_SHARE_MODELS=Exportmodelle sind für jeden zugänglich.
 ExportSetup=Einrichtung Modul Export
 ImportSetup=Einrichtung des Modulimports
@@ -2090,8 +2092,8 @@ MakeAnonymousPing=Einen anonymen Ping '+1' an den Dolibarr-Foundation-Server (ei
 FeatureNotAvailableWithReceptionModule=Funtion nicht verfügbar, wenn Modul Wareneingang aktiviert ist
 EmailTemplate=E-Mail-Vorlage
 EMailsWillHaveMessageID=E-Mails haben ein Schlagwort "Referenzen", das dieser Syntax entspricht
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
+PDF_SHOW_PROJECT=Projekt im Dokument anzeigen
+ShowProjectLabel=Projektbezeichnung
 PDF_USE_ALSO_LANGUAGE_CODE=Wenn Sie möchten, dass einige Texte in Ihrem PDF in 2 verschiedenen Sprachen in demselben generierten PDF dupliziert werden, müssen Sie hier diese zweite Sprache festlegen, damit das generierte PDF zwei verschiedene Sprachen auf derselben Seite enthält, die beim Generieren von PDF ausgewählte und diese (dies wird nur von wenigen PDF-Vorlagen unterstützt). Für 1 Sprache pro PDF leer halten.
 FafaIconSocialNetworksDesc=Gib hier den Code für ein FontAwesome icon ein. Wenn du FontAwesome nicht kennst, kannst du den Standard 'fa-address-book' benutzen.
 FeatureNotAvailableWithReceptionModule=Funtion nicht verfügbar, wenn Modul Wareneingang aktiviert ist
@@ -2118,7 +2120,12 @@ ConfFileIsReadableOrWritableByAnyUsers=Die conf-Datei kann von jedem Benutzer ge
 MailToSendEventOrganization=Organisation von Ereignissen
 AGENDA_EVENT_DEFAULT_STATUS=Standardereignisstatus beim Erstellen eines Ereignisses aus dem Formular
 YouShouldDisablePHPFunctions=Sie sollten PHP-Funktionen deaktivieren
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
+IfCLINotRequiredYouShouldDisablePHPFunctions=Außer wenn Sie Systembefehle ausführen müssen (z.B. für das Modul "Geplanter Job" oder zum Ausführen der externen Befehlszeile "Antivirus"), sollten Sie die PHP-Funktionen deaktivieren
+NoWritableFilesFoundIntoRootDir=In Ihrem Stammverzeichnis wurden keine beschreibbaren Dateien oder Verzeichnisse der gängigen Programme gefunden (gut).
+RecommendedValueIs=Empfohlen: %s
+ARestrictedPath=Ein eingeschränkter Pfad
+CheckForModuleUpdate=Suchen Sie nach Updates für externe Module
+CheckForModuleUpdateHelp=Diese Aktion stellt eine Verbindung zu Editoren externer Module her, um zu überprüfen, ob eine neue Version verfügbar ist.
+ModuleUpdateAvailable=Eine Aktualisierung ist verfügbar
+NoExternalModuleWithUpdate=Für externe Module wurden keine Updates gefunden
+SwaggerDescriptionFile=Swagger API-Beschreibungsdatei (zum Beispiel zur Verwendung mit Redoc)
diff --git a/htdocs/langs/de_DE/assets.lang b/htdocs/langs/de_DE/assets.lang
index cfc0ae0e7a0..a4fc61beb26 100644
--- a/htdocs/langs/de_DE/assets.lang
+++ b/htdocs/langs/de_DE/assets.lang
@@ -61,5 +61,7 @@ MenuListTypeAssets = Liste
 #
 # Module
 #
+Asset=Anlagegut
 NewAssetType=neue Anlagenart
 NewAsset=neue Anlage
+ConfirmDeleteAsset=Möchten Sie dieses Asset wirklich löschen?
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 57256d48132..efad27d2642 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Zahlung von Sozialabgaben/Steuern
 BankTransfer=Überweisung
 BankTransfers=Überweisungen
 MenuBankInternalTransfer=interner Transfer
-TransferDesc=Von einem zum anderen Konto übertragen. Dolibarr wird zwei Buchungen erstellen - Debit in der Quell- und Credit im Zielkonto. (Identischer Betrag (bis auf das Vorzeichen), Beschreibung und Datum werden benutzt)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=von
 TransferTo=bis
 TransferFromToDone=Eine Überweisung <b>von %s nach %s iHv %s %s</b> wurde verbucht.
-CheckTransmitter=Übermittler
+CheckTransmitter=Absenderadresse
 ValidateCheckReceipt=Rechnungseingang gültig?
-ConfirmValidateCheckReceipt=Sind Sie sicher, dass Sie diesen Rechnungseingang für gültig erklären wollen? Dies kann nicht nachträglich geändert werden.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Wollen Sie diesen Rechnungseingang löschen?
 ConfirmDeleteCheckReceipt=Sind Sie sicher, dass Sie diesen Rechnungseingang löschen wollen?
 BankChecks=Bankschecks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Sind Sie sicher, dass Sie diese Transaktion löschen wo
 ThisWillAlsoDeleteBankRecord=Dadurch werden auch erzeugte Kontoauszüge gelöscht
 BankMovements=Bankbewegungen
 PlannedTransactions=Geplante Transaktionen
-Graph=Grafiken
+Graph=Graphs
 ExportDataset_banque_1=Transaktionen und Kontoauszug
 ExportDataset_banque_2=Einzahlungsbeleg
 TransactionOnTheOtherAccount=Transaktion auf dem anderem Konto
@@ -142,7 +142,7 @@ AllAccounts=Alle Finanzkonten
 BackToAccount=Zurück zum Konto
 ShowAllAccounts=Alle Finanzkonten
 FutureTransaction=Zukünftige Transaktion. Ausgleichen nicht möglich.
-SelectChequeTransactionAndGenerate=Wählen Sie Schecks aus, die in den Scheckeinzahlungsbeleg aufgenommen werden sollen, und klicken Sie auf &quot;Erstellen&quot;.
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Wählen Sie den Kontoauszug  der mit der Zahlung übereinstimmt. Verwenden Sie einen sortierbaren numerischen Wert: YYYYMM oder YYYYMMDD
 EventualyAddCategory=Wenn möglich Kategorie angeben, in der die Daten eingeordnet werden
 ToConciliate=auszugleichen ?
@@ -174,7 +174,7 @@ YourSEPAMandate=Ihr SEPA-Mandat
 FindYourSEPAMandate=Dies ist Ihr SEPA-Mandat, um unser Unternehmen zu ermächtigen, Lastschriftaufträge bei Ihrer Bank zu tätigen. Senden Sie es unterschrieben (Scan des unterschriebenen Dokuments) oder per Post an
 AutoReportLastAccountStatement=Füllen Sie das Feld 'Nummer des Kontoauszugs' bei der Abstimmung automatisch mit der Nummer des letzten Kontoauszugs
 CashControl=POS-Kassensteuerung
-NewCashFence=New cash desk opening or closing
+NewCashFence=Neue Kasse öffnet oder schließt
 BankColorizeMovement=Bewegungen färben
 BankColorizeMovementDesc=Wenn diese Funktion aktiviert ist, können Sie eine bestimmte Hintergrundfarbe für Debit- oder Kreditbewegungen auswählen
 BankColorizeMovementName1=Hintergrundfarbe für Debit-Bewegung
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 9afcc86ec5b..6e2b4dad58e 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -55,7 +55,7 @@ CustomerInvoice=Kundenrechnung
 CustomersInvoices=Kundenrechnungen
 SupplierInvoice=Lieferantenrechnung
 SuppliersInvoices=Lieferantenrechnungen
-SupplierInvoiceLines=Vendor invoice lines
+SupplierInvoiceLines=Lieferantenrechnungsposten
 SupplierBill=Lieferantenrechnung
 SupplierBills=Lieferantenrechnungen
 Payment=Zahlung
@@ -82,8 +82,8 @@ PaymentsAlreadyDone=Bereits getätigte Zahlungen
 PaymentsBackAlreadyDone=Rückerstattungen bereits erledigt
 PaymentRule=Zahlungsregel
 PaymentMode=Zahlungsart
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
+DefaultPaymentMode=Standardzahlungsart
+DefaultBankAccount=Standardbankkonto
 PaymentTypeDC=Debit- / Kreditkarte
 PaymentTypePP=PayPal
 IdPaymentMode=Zahlungsart (ID)
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Zuviel bezahlter Betrag in Rabatt umwandeln
 EnterPaymentReceivedFromCustomer=Geben Sie die vom Kunden erhaltene Zahlung ein
 EnterPaymentDueToCustomer=Kundenzahlung fällig stellen
 DisabledBecauseRemainderToPayIsZero=Deaktiviert, da Zahlungserinnerung auf null steht
-PriceBase=Preis
+PriceBase=Grundpreis
 BillStatus=Rechnungsstatus
 StatusOfGeneratedInvoices=Status der erstellten Rechnungen
 BillStatusDraft=Entwurf (freizugeben)
@@ -376,7 +376,7 @@ DateLastGeneration=Datum der letzten Generierung
 DateLastGenerationShort=Datum letzte Generierung
 MaxPeriodNumber=Max. Nummer der Rechnungserstellung
 NbOfGenerationDone=Rechnungslauf für diese Nummer schon durchgeführt
-NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationOfRecordDone=Anzahl der bereits durchgeführten Datensatzgenerierungen
 NbOfGenerationDoneShort=Anzahl Generationen durchgeführt
 MaxGenerationReached=Max. Anzahl Generierungen erreicht
 InvoiceAutoValidate=Rechnungen automatisch freigeben
@@ -417,7 +417,7 @@ PaymentCondition14DENDMONTH=Innerhalb von 14 Tagen nach Monatsende
 FixAmount=Festbetrag - 1 Zeile mit Label '%s'
 VarAmount=Variabler Betrag (%% tot.)
 VarAmountOneLine=Variabler Betrag (%% Total) -1 Position mit Label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+VarAmountAllLines=Variable Menge (%% tot.) - alle Zeilen vom Ursprung
 # PaymentType
 PaymentTypeVIR=Banküberweisung
 PaymentTypeShortVIR=Banküberweisung
@@ -454,7 +454,7 @@ RegulatedOn=gebucht am
 ChequeNumber=Schecknummer
 ChequeOrTransferNumber=Scheck-/Überweisungsnummer
 ChequeBordereau=Scheck Zeitplan
-ChequeMaker=Scheck / Transfer Übermittler
+ChequeMaker=Absender prüfen / übertragen
 ChequeBank=Bankscheck
 CheckBank=Scheck
 NetToBePaid=Netto Zahlbetrag
@@ -498,16 +498,16 @@ Cash=Bar
 Reported=Verzögert
 DisabledBecausePayments=Nicht möglich, da es Zahlungen gibt
 CantRemovePaymentWithOneInvoicePaid=Die Zahlung kann nicht entfernt werden, da es mindestens eine Rechnung gibt, die als bezahlt markiert ist
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=Zahlung kann nicht entfernt werden, da die Umsatzsteuererklärung als bezahlt eingestuft wird
+CantRemovePaymentSalaryPaid=Die Zahlung kann nicht entfernt werden, da das Gehalt als bezahlt eingestuft wird
 ExpectedToPay=Erwartete Zahlung
 CantRemoveConciliatedPayment=Abgeglichene Zahlung kann nicht entfernt werden
 PayedByThisPayment=mit dieser Zahlung beglichen
 ClosePaidInvoicesAutomatically=Kennzeichnen Sie automatisch alle Standard-, Anzahlungs- oder Ersatzrechnungen als "Bezahlt", wenn die Zahlung vollständig erfolgt ist.
 ClosePaidCreditNotesAutomatically=Kennzeichnen Sie automatisch alle Gutschriften als "Bezahlt", wenn die Rückerstattung vollständig erfolgt ist.
 ClosePaidContributionsAutomatically=Kennzeichnen Sie automatisch alle Sozial- oder Steuerbeiträge als "Bezahlt", wenn die Zahlung vollständig erfolgt ist.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Klassifizieren Sie die Umsatzsteuererklärung automatisch als "bezahlt", wenn die Zahlung vollständig erfolgt ist.
+ClosePaidSalaryAutomatically=Klassifizieren Sie das Gehalt automatisch als "bezahlt", wenn die Zahlung vollständig erfolgt ist.
 AllCompletelyPayedInvoiceWillBeClosed=Alle Rechnungen ohne Restzahlung werden automatisch mit dem Status "Bezahlt" geschlossen.
 ToMakePayment=Bezahlen
 ToMakePaymentBack=Rückzahlung
@@ -520,7 +520,7 @@ YouMustCreateStandardInvoiceFirstDesc=Zuerst muss eine Standardrechnung erstellt
 PDFCrabeDescription=Rechnung PDF-Vorlage Crabe. Eine vollständige Rechnungsvorlage (alte Implementierung der Sponge-Vorlage)
 PDFSpongeDescription=Rechnung PDF-Vorlage Sponge. Eine vollständige Rechnungsvorlage
 PDFCrevetteDescription=PDF Rechnungsvorlage Crevette. Vollständige Rechnungsvolage für normale Rechnungen
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Gibt eine Nummer im Format %syymm-nnnn für Standardrechnungen und %syymm-nnnn für Gutschriften zurück, wobei yy das Jahr, mm der Monat und nnnn eine sequenzielle automatisch inkrementierende Nummer ohne Unterbrechung und ohne Zurücksetzen auf 0 ist
 MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=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 in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index 7ed4e4e1077..642ab786f41 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxDolibarrStateBoard=Statistics on main business objects in database
+BoxDolibarrStateBoard=Statistiken zu den wichtigsten Geschäftsobjekten in der Datenbank
 BoxLoginInformation=Anmeldeinformationen
 BoxLastRssInfos=Informationen RSS Feed
 BoxLastProducts=%s zuletzt bearbeitete Produkte/Leistungen
@@ -18,13 +18,13 @@ BoxLastActions=Neuste Aktionen
 BoxLastContracts=Neueste Verträge
 BoxLastContacts=Neueste Kontakte/Adressen
 BoxLastMembers=neueste Mitglieder
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=Neueste geänderte Mitglieder
+BoxLastMembersSubscriptions=Neueste Mitglieder-Abonnements
 BoxFicheInter=Neueste Serviceaufträge
 BoxCurrentAccounts=Saldo offene Konten
 BoxTitleMemberNextBirthdays=Geburtstage in diesem Monat (Mitglieder)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleMembersByType=Mitglieder nach Typ
+BoxTitleMembersSubscriptionsByYear=Mitgliederabonnements nach Jahr
 BoxTitleLastRssInfos=%s neueste Neuigkeiten von %s
 BoxTitleLastProducts=Zuletzt bearbeitete Produkte / Leistungen (maximal %s)
 BoxTitleProductsAlertStock=Lagerbestands-Warnungen
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Meine %s neuesten Lesezeichen
 BoxOldestExpiredServices=Die ältesten abgelaufenen aktiven Dienste
 BoxLastExpiredServices=Letzte %s älteste Kontake mit aktiven abgelaufenen Diensten.
 BoxTitleLastActionsToDo=Anstehende Termine / Aufgaben (maximal %s)
-BoxTitleLastContracts=Zuletzt bearbeitete Verträge (maximal %s)
-BoxTitleLastModifiedDonations=Zuletzt bearbeitete Spenden (maximal %s)
-BoxTitleLastModifiedExpenses=Zuletzt bearbeitete Spesenabrechnungen (maximal %s)
-BoxTitleLatestModifiedBoms=Zuletzt bearbeitete Stücklisten (maximal %s)
-BoxTitleLatestModifiedMos=Zuletzt bearbeitete Produktionsaufträge (maximal %s)
+BoxTitleLastContracts=Letzte %s-Verträge, die geändert wurden
+BoxTitleLastModifiedDonations=Letzte %s Spenden, die geändert wurden
+BoxTitleLastModifiedExpenses=Neueste %s Spesenabrechnungen, die geändert wurden
+BoxTitleLatestModifiedBoms=Neueste %s-Stücklisten, die geändert wurden
+BoxTitleLatestModifiedMos=Neueste %s Fertigungsaufträge, die geändert wurden
 BoxTitleLastOutstandingBillReached=Kunden mit überschrittenen Maximal-Aussenständen
 BoxGlobalActivity=Globale Aktivität (Rechnungen, Angebote, Aufträge)
 BoxGoodCustomers=Gute Kunden
@@ -112,9 +112,9 @@ BoxTitleLastCustomerShipments=Neueste %s Kundensendungen
 NoRecordedShipments=Keine erfasste Kundensendung
 BoxCustomersOutstandingBillReached=Kunden mit erreichtem Aussenständen-Limit
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
+UsersHome=Start Anwender und Gruppen
+MembersHome=Start Mitgliedschaft
+ThirdpartiesHome=Start Drittanbieter
+TicketsHome=Start Tickets
+AccountancyHome=Start Buchhaltung
 ValidatedProjects=Validierte Projekte
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index 342df5e5a55..7dce553f330 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -41,14 +41,15 @@ Floor=Bereich / Etage
 AddTable=Tisch hinzufügen
 Place=Tisch
 TakeposConnectorNecesary='TakePOS Connector' erforderlich
-OrderPrinters=Bondrucker
+OrderPrinters=Fügen Sie eine Schaltfläche hinzu, um die Bestellung ohne Zahlung an bestimmte Drucker zu senden (z.B. um eine Bestellung an eine Küche zu senden).
+NotAvailableWithBrowserPrinter=Nicht verfügbar, wenn der Drucker für den Empfang auf Browser eingestellt ist:
 SearchProduct=Produkt suchen
 Receipt=globale Druckeinstellungen
 Header=Kopfzeile
 Footer=Fußzeile
 AmountAtEndOfPeriod=Betrag am Ende der Periode (Tag, Monat oder Jahr)
 TheoricalAmount=Theoretischer Betrag
-RealAmount=Realer Betrag
+RealAmount=tatsächlicher Betrag
 CashFence=Kassenschluss
 CashFenceDone=Kassenschließung für den Zeitraum durchgeführt
 NbOfInvoices=Anzahl der Rechnungen
@@ -56,8 +57,9 @@ Paymentnumpad=Art des Pads zur Eingabe der Zahlung
 Numberspad=Nummernblock
 BillsCoinsPad=Münzen- und Banknoten-Pad
 DolistorePosCategory=TakePOS-Module und andere POS-Lösungen für Dolibarr
-TakeposNeedsCategories=TakePOS benötigt Produktkategorien, um zu funktionieren
-OrderNotes=Bestellhinweise
+TakeposNeedsCategories=TakePOS benötigt mindestens eine Produktkategorie, um zu funktionieren
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS benötigt mindestens 1 Produktkategorie unter der Kategorie <b> %s </b>, um zu funktionieren
+OrderNotes=Kann jedem bestellten Artikel einige Notizen hinzufügen
 CashDeskBankAccountFor=Standardkonto für Zahlungen in
 NoPaimementModesDefined=In der TakePOS-Konfiguration ist kein Zahlungsmodus definiert
 TicketVatGrouped=Gruppieren Sie die Mehrwertsteuer nach Steuersatz der Tickets/Quittungen
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Rechnung ist bereits geprüft
 NoLinesToBill=Keine Zeilen zu berechnen
 CustomReceipt=Benutzerdefinierte Quittung
 ReceiptName=Belegname
-ProductSupplements=Produktergänzungen
+ProductSupplements=Ergänzungen von Produkten verwalten
 SupplementCategory=Ergänzungskategorie
 ColorTheme=Farbschema
 Colorful=Farbig
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Schneller und einfacher Belegdruck. Nur wenige Parameter zum Konfigurieren der Quittung. Drucken via Browser.
 TakeposConnectorMethodDescription=Externes Modul mit zusätzlichen Funktionen. Möglichkeit zum Drucken aus der Cloud.
 PrintMethod=Druckmethode
-ReceiptPrinterMethodDescription=Leistungsstarke Methode mit vielen Parametern. Vollständig anpassbar mit Vorlagen. Kann nicht aus der Cloud drucken.
+ReceiptPrinterMethodDescription=Leistungsstarke Methode mit vielen Parametern. Vollständig anpassbar mit Vorlagen. Der Server, auf dem sich die Anwendung befindet, kann sich nicht in der Cloud befinden (muss in der Lage sein, die Drucker in Ihrem Netzwerk zu erreichen).
 ByTerminal=über Terminal
 TakeposNumpadUsePaymentIcon=Verwenden Sie das Symbol anstelle des Textes auf den Zahlungsschaltflächen des Nummernblocks
 CashDeskRefNumberingModules=Nummerierungsmodul für POS-Verkäufe
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Das Modul Belegdrucker muss zuerst aktiviert w
 AllowDelayedPayment=Verzögerte Zahlung zulassen
 PrintPaymentMethodOnReceipts=Zahlungsmethode auf Tickets | Quittungen drucken
 WeighingScale=Waage
+ShowPriceHT = Zeigen Sie den Preis ohne Steuerspalte an
+ShowPriceHTOnReceipt = Zeigen Sie den Preis ohne Steuerspalte auf der Quittung an
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index 1ed379ce3f9..428747defd8 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Kategorie
 Rubriques=Kategorien
 RubriquesTransactions=Transaktionenkategorien
 categories=Kategorien
-NoCategoryYet=Sie haben noch keine Kategorie dieser Art erstellt
+NoCategoryYet=Es wurde kein Schlagwort / keine Kategorie dieses Typs erstellt
 In=Übergeordnete Kategorie
 AddIn=Übergeordnete Kategorie
 modify=Ändern
 Classify=zuordnen
 CategoriesArea=Übersicht Kategorien
-ProductsCategoriesArea=Übersicht Produkt- und Leistungskategorien
-SuppliersCategoriesArea=Übersicht Lieferantenkategorien
-CustomersCategoriesArea=Übersicht Kunden-/Interessentenkategorien
-MembersCategoriesArea=Übersicht Mitgliederkategorien
-ContactsCategoriesArea=Übersicht Kontaktkategorien
-AccountsCategoriesArea=Bereich Bankkonten-Tags / -Kategorien
-ProjectsCategoriesArea=Übersicht Projektkategorien
-UsersCategoriesArea=Bereich:  Benutzer Tags/Kategorien
+ProductsCategoriesArea=Bereich Produkt- / Service-Schlagwörter / Kategorien
+SuppliersCategoriesArea=Bereich für Lieferanten-Schlagwörter / Kategorien
+CustomersCategoriesArea=Kunden-Schlagwörter / Kategorienbereich
+MembersCategoriesArea=Bereich für Mitglieder-Schlagwörter / Kategorien
+ContactsCategoriesArea=Bereich für Kontakt-Schlagwörter / Kategorien
+AccountsCategoriesArea=Bereich für Bankkonto-Schlagwörter / -kategorien
+ProjectsCategoriesArea=Bereich Projekt-Schlagwörter / Kategorien
+UsersCategoriesArea=Bereich Benutzer-Schlagwörter / Kategorien
 SubCats=Unterkategorie(n)
 CatList=Liste der Kategorien
 CatListAll=Liste der Schlagwörter / Kategorien (alle Typen)
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Ordnen Sie dem Lieferanten eine Kategorie zu
 ShowCategory=Zeige Kategorie
 ByDefaultInList=Standardwert in Liste
 ChooseCategory=Kategorie auswählen
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
+StocksCategoriesArea=Lagerkategorien
+ActionCommCategoriesArea=Ereigniskategorien
 WebsitePagesCategoriesArea=Seiteninhalte-Kategorien
-UseOrOperatorForCategories=Benutzer oder Operator für Kategorien
+UseOrOperatorForCategories=Verwenden Sie den Operator 'ODER' für Kategorien
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 6af27c65ab0..c768096dfed 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Firmenname %s bereits vorhanden. Bitte wählen Sie einen anderen.
 ErrorSetACountryFirst=Wählen Sie zuerst das Land
 SelectThirdParty=Wähle einen Partner
-ConfirmDeleteCompany=Möchten Sie diesen Partner und alle damit verbundenen Informationen wirklich löschen?
+ConfirmDeleteCompany=Möchten Sie dieses Unternehmen und alle zugehörigen Informationen wirklich löschen?
 DeleteContact=Löschen eines Kontakts/Adresse
-ConfirmDeleteContact=Möchten Sie diesen Partner und alle damit verbundenen Informationen wirklich löschen?
+ConfirmDeleteContact=Möchten Sie diesen Kontakt und alle zugehörigen Informationen wirklich löschen?
 MenuNewThirdParty=neuer Geschäftspartner
 MenuNewCustomer=neuer Kunde
 MenuNewProspect=Neuer Interessent
@@ -43,10 +43,10 @@ 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 Partner eine natürliche Person ist, reicht die Anlage nur eines Partners aus.
 ParentCompany=Muttergesellschaft
 Subsidiaries=Tochtergesellschaften
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Bericht pro Monat
+ReportByCustomers=Bericht pro Kunde
+ReportByThirdparties=Bericht pro Dritter
+ReportByQuarter=Bericht pro Kurs
 CivilityCode=Anrede
 RegisteredOffice=Firmensitz
 Lastname=Nachname
@@ -69,7 +69,7 @@ PhoneShort=Tel.
 Skype=Skype
 Call=Anruf
 Chat=Chat
-PhonePro=Telefon (geschäftlich)
+PhonePro=Telefon geschäftl.
 PhonePerso=Telefon (privat)
 PhoneMobile=Telefon (mobil)
 No_Email=Keine E-Mail-Kampagne senden
@@ -78,7 +78,7 @@ Zip=PLZ
 Town=Stadt
 Web=Internetseite
 Poste= Posten
-DefaultLang=Standard-Sprache
+DefaultLang=Standardsprache
 VATIsUsed=Umsatzsteuerpflichtig
 VATIsUsedWhenSelling=Dies definiert ob dieser Partner Steuern auf der Rechnung an seine eigenen Kunden ausweist oder nicht
 VATIsNotUsed=Umsatzsteuerbefreit
@@ -173,7 +173,7 @@ ProfId1ES=NIF (Frankreich): Numéro d'identification fiscale\nCIF (Spanien): Có
 ProfId2ES=Sozialversicherungsnummer
 ProfId3ES=Klassifikation der Wirtschaftszweige
 ProfId4ES=Stiftungsverzeichnis
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=Prof Id 5 (EORI-Nummer)
 ProfId6ES=-
 ProfId1FR=SIREN (Frankreich): Système d'identification du répertoire des entreprises
 ProfId2FR=SIRET (Frankreich): Système d’identification du répertoire des établissements
@@ -239,7 +239,7 @@ ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof ID 3
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=Prof Id 5 (EORI-Nummer)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -263,7 +263,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId5RO=Prof Id 5 (EORI-Nummer)
 ProfId6RO=-
 ProfId1RU=OGRN
 ProfId2RU=INN
@@ -331,7 +331,7 @@ CustomerCodeDesc=eindeutige Kundennummer
 SupplierCodeDesc=eindeutige Lieferantennummer
 RequiredIfCustomer=Erforderlich falls Partner Kunde oder Interessent ist
 RequiredIfSupplier=Erforderlich falls Partner Lieferant ist
-ValidityControledByModule=Gültigkeit kontrolliert von Modul
+ValidityControledByModule=Vom Modul kontrollierte Gültigkeit
 ThisIsModuleRules=Regeln für dieses Modul
 ProspectToContact=Lead zu kontaktieren
 CompanyDeleted=Firma "%s" aus der Datenbank gelöscht.
@@ -439,22 +439,22 @@ ListSuppliersShort=Liste der Lieferanten
 ListProspectsShort=Liste der Interessenten
 ListCustomersShort=Liste der Kunden
 ThirdPartiesArea=Partner und Kontakte
-LastModifiedThirdParties=Zuletzt bearbeitete Geschäftspartner (maximal %s)
-UniqueThirdParties=Gesamtzahl Partner
+LastModifiedThirdParties=Neueste %s Drittanbieter, die geändert wurden
+UniqueThirdParties=Gesamtzahl der Drittanbieter
 InActivity=aktiv
 ActivityCeased=inaktiv
 ThirdPartyIsClosed=Partner ist geschlossen
-ProductsIntoElements=Liste von Produkten/Leistungen in %s
+ProductsIntoElements=Liste der Produkte / Dienstleistungen, die %s zugeordnet sind
 CurrentOutstandingBill=Aktuell ausstehende Rechnung
 OutstandingBill=Max. für ausstehende Rechnung
 OutstandingBillReached=Kreditlimite erreicht
 OrderMinAmount=Mindestbestellwert
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=Gibt eine Zahl im Format %syymm-nnnn für den Kundencode und %syymm-nnnn für den Herstellercode zurück, wobei yy das Jahr, mm der Monat und nnnn eine sequenzielle automatisch inkrementierende Zahl ohne Unterbrechung und Zurücksetzung zu 0 ist.
 LeopardNumRefModelDesc=Kunden / Lieferanten-Code ist frei. Dieser Code kann jederzeit geändert werden.
 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 Partner zusammenführen? Alle verbundenen Objekte (Rechnungen, Aufträge, ...) werden mit dem aktuellen Partner zusammengeführt, dann wird der Partner gelöscht werden.
+ConfirmMergeThirdparties=Sind Sie sicher, dass Sie den ausgewählten Drittanbieter mit dem aktuellen zusammenführen möchten? Alle verknüpften Objekte (Rechnungen, Bestellungen, ...) werden an den aktuellen Drittanbieter verschoben, wonach der ausgewählte Drittanbieter gelöscht wird.
 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 e499f8e72ec..eddf7ee9a60 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -65,7 +65,7 @@ LT2SupplierIN=SGST Einkäufe
 VATCollected=Erhobene USt.
 StatusToPay=Zu zahlen
 SpecialExpensesArea=Bereich für alle Sonderzahlungen
-VATExpensesArea=Area for all TVA payments
+VATExpensesArea=Bereich für alle TVA-Zahlungen
 SocialContribution=Sozialabgabe oder Steuersatz
 SocialContributions= Steuern- oder Sozialabgaben
 SocialContributionsDeductibles=Abzugsberechtigte Sozialabgaben oder Steuern
@@ -86,7 +86,7 @@ PaymentCustomerInvoice=Zahlung Kundenrechnung
 PaymentSupplierInvoice=Zahlung Lieferantenrechnung
 PaymentSocialContribution=Sozialabgaben-/Steuer Zahlung
 PaymentVat=USt.-Zahlung
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Die Zahlung automatisch aufzeichnen
 ListPayment=Liste der Zahlungen
 ListOfCustomerPayments=Liste der Kundenzahlungen
 ListOfSupplierPayments=Liste der Lieferantenzahlungen
@@ -106,8 +106,8 @@ LT2PaymentES=EKSt. Zahlung
 LT2PaymentsES=EKSt. Zahlungen
 VATPayment=USt. Zahlung
 VATPayments=USt Zahlungen
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
+VATDeclarations=MwSt.-Erklärungen
+VATDeclaration=Umsatzsteuererklärung
 VATRefund=Umsatzsteuer Rückerstattung
 NewVATPayment=Neue Umsatzsteuer Zahlung
 NewLocalTaxPayment=Neue Steuer %s Zahlung
@@ -135,19 +135,19 @@ NewCheckReceipt=Neuen Scheck erhalten
 NewCheckDeposit=Neue Check Hinterlegung
 NewCheckDepositOn=Neue Scheckeinlösung auf Konto: %s
 NoWaitingChecks=Keine Schecks zum Einlösen
-DateChequeReceived=Datum des Scheckerhalts
+DateChequeReceived=Scheck-Empfangsdatum
 NbOfCheques=Anzahl der Schecks
 PaySocialContribution=Zahle eine Sozialabgabe/Steuer
-PayVAT=Pay a VAT declaration
-PaySalary=Pay a salary card
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
-ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
+PayVAT=Eine Mehrwertsteuererklärung bezahlen
+PaySalary=Zahlen Sie eine Gehaltskarte
+ConfirmPaySocialContribution=Sind Sie sicher, dass Sie diese Sozial- oder Fiskussteuer als bezahlt einstufen möchten?
+ConfirmPayVAT=Möchten Sie diese Umsatzsteuererklärung wirklich als bezahlt einstufen?
+ConfirmPaySalary=Sind Sie sicher, dass Sie diese Gehaltskarte als bezahlt einstufen möchten?
 DeleteSocialContribution=Lösche Sozialabgaben-, oder Steuerzahlung
-DeleteVAT=Delete a VAT declaration
-DeleteSalary=Delete a salary card
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
-ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
+DeleteVAT=Löschen Sie eine Umsatzsteuererklärung
+DeleteSalary=Löschen Sie eine Gehaltskarte
+ConfirmDeleteSocialContribution=Möchten Sie diese Sozial- / Fiskussteuerzahlung wirklich löschen?
+ConfirmDeleteVAT=Möchten Sie diese Umsatzsteuererklärung wirklich löschen?
 ConfirmDeleteSalary=Sind Sie sicher, dass Sie dieses Gehalt löschen wollen?
 ExportDataset_tax_1=Steuer- und Sozialabgaben und Zahlungen
 CalcModeVATDebt=Modus <b>%s USt. auf Engagement Rechnungslegung %s</b>.
@@ -175,7 +175,7 @@ RulesResultInOut=- Es sind nur tatsächliche Zahlungen für Rechnungen, Kostenab
 RulesCADue=- Es enthält die fälligen Rechnungen des Kunden, ob diese bezahlt sind oder nicht. <br> - Es basiert auf dem Rechnungsdatum dieser Rechnungen. <br>
 RulesCAIn=- Es umfasst alle effektiven Zahlungen von Rechnungen, die von Kunden erhalten wurden. <br> - Es basiert auf dem Zahlungsdatum dieser Rechnungen. <br>
 RulesCATotalSaleJournal=Es beinhaltet alle Gutschriftspositionen aus dem Verkaufsjournal.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
+RulesSalesTurnoverOfIncomeAccounts=Es umfasst (Gutschrift - Lastschrift) von Zeilen für Produktkonten in der Gruppe EINKOMMEN
 RulesAmountOnInOutBookkeepingRecord=Beinhaltet Datensätze aus dem Hauptbuch mit den Gruppen "Aufwand" oder "Ertrag"
 RulesResultBookkeepingPredefined=Beinhaltet Datensätze aus dem Hauptbuch mit den Gruppen "Aufwand" oder "Ertrag"
 RulesResultBookkeepingPersonalized=Zeigt die Buchungen im Hauptbuch mit Konten <b>gruppiert nach Kontengruppen</b>
@@ -196,7 +196,7 @@ VATReportByThirdParties=Umsatzsteuerauswertung pro Partner
 VATReportByCustomers=Umsatzsteuerauswertung pro Kunde
 VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten USt. nach Kunden 
 VATReportByQuartersInInputOutputMode=Bericht nach Steuersatz für die erhaltene und bezahlte Steuer
-VATReportShowByRateDetails=Show details of this rate
+VATReportShowByRateDetails=Details zu diesem Kurs anzeigen
 LT1ReportByQuarters=Steuer 2 Auswertung pro Steuersatz
 LT2ReportByQuarters=Steuer 3 Auswertung pro Steuersatz
 LT1ReportByQuartersES=Bericht von RE Ratex
@@ -231,7 +231,7 @@ Pcg_subtype=Klasse des Kontos
 InvoiceLinesToDispatch=versandbereite Rechnungspositionen
 ByProductsAndServices=Nach Produkten und Leistungen
 RefExt=Externe Referenz
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=Um eine Vorlagenrechnung zu erstellen, erstellen Sie eine Standardrechnung und klicken Sie dann ohne Validierung auf die Schaltfläche "%s".
 LinkedOrder=Link zur Bestellung
 Mode1=Methode 1
 Mode2=Methode 2
@@ -249,7 +249,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Das beim Parnter definierte spezielle Buchhaltu
 ACCOUNTING_ACCOUNT_SUPPLIER=Buchhaltungskonto für Lieferanten
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Das beim Parnter definierte spezielle Buchhaltungskonto wird nur für die Nebenbuchhaltung verwendet. Dieses wird für das Hauptbuch und als Standardwert der Nebenbuchhaltung verwendet, wenn kein dediziertes Kreditorenbuchhaltungskonto für den Partner definiert ist.\n
 ConfirmCloneTax=Duplizierung der Steuer-/Sozialabgaben bestätigen
-ConfirmCloneVAT=Confirm the clone of a VAT declaration
+ConfirmCloneVAT=Bestätigen Sie den Klon einer Mehrwertsteuererklärung
 ConfirmCloneSalary=Bestätige das Klonen der Gehaltsangabe
 CloneTaxForNextMonth=Für nächsten Monat duplizieren
 SimpleReport=Einfache Berichte
@@ -269,8 +269,8 @@ AccountingAffectation=Kontierung zuweisen
 LastDayTaxIsRelatedTo=Letzter Tag an dem die Steuer relevant ist
 VATDue=Umsatzsteuer beansprucht
 ClaimedForThisPeriod=Beantragt in der Periode
-PaidDuringThisPeriod=Paid for this period
-PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
+PaidDuringThisPeriod=Für diesen Zeitraum bezahlt
+PaidDuringThisPeriodDesc=Dies ist die Summe aller Zahlungen im Zusammenhang mit Mehrwertsteuererklärungen, deren Periodenende im ausgewählten Zeitraum liegt
 ByVatRate=Pro Steuersatz
 TurnoverbyVatrate=Verrechneter Umsatz pro Steuersatz
 TurnoverCollectedbyVatrate=Realisierter Umsatz pro Steuersatz
@@ -281,7 +281,7 @@ PurchaseTurnoverCollected=Kaufumsatz gesammelt
 RulesPurchaseTurnoverDue=- Es enthält die fälligen Rechnungen des Lieferanten, ob diese bezahlt sind oder nicht. <br> - Es basiert auf dem Rechnungsdatum dieser Rechnungen. <br>
 RulesPurchaseTurnoverIn=- Es umfasst alle effektiven Zahlungen von Rechnungen an Lieferanten. <br> - Es basiert auf dem Zahlungsdatum dieser Rechnungen <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Es enthält alle Belastungszeilen aus dem Einkaufsjournal.
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
+RulesPurchaseTurnoverOfExpenseAccounts=Es umfasst (Lastschrift - Gutschrift) von Zeilen für Produktkonten in der Gruppe AUSGABEN
 ReportPurchaseTurnover=Kaufumsatz in Rechnung gestellt
 ReportPurchaseTurnoverCollected=Kaufumsatz gesammelt
 IncludeVarpaysInResults = Nehmen Sie verschiedene Zahlungen in Berichte auf
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index b2d0b83c9e8..9df6d3767fd 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafelder Ecm-Dateien
 ExtraFieldsEcmDirectories=Extrafelder Ecm-Verzeichnisse
 ECMSetup=DMS Einstellungen
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 0e43f38fd83..d9066c6b552 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Kein Fehler, Befehl wurde ausgeführt
 # Errors
 ErrorButCommitIsDone=Fehler aufgetreten, Freigabe erfolgt dennoch
-ErrorBadEMail=Die E-Mail-Adresse %s ist nicht korrekt
-ErrorBadMXDomain=E-Mail %s scheint falsch zu sein (Domain hat keinen gültigen MX-Eintrag)
-ErrorBadUrl=URL %s ist nicht korrekt
+ErrorBadEMail=E-Mail %s ist nicht korrekt
+ErrorBadMXDomain=E-Mail %s scheint nicht korrekt zu sein (Domain hat keinen gültigen MX-Eintrag)
+ErrorBadUrl=Die URL %s ist nicht korrekt
 ErrorBadValueForParamNotAString=Ungültiger Wert für Ihren Parameter. Normalerweise passiert das, wenn die Übersetzung fehlt.
 ErrorRefAlreadyExists=Die Referenz <b> %s </b> ist bereits vorhanden.
 ErrorLoginAlreadyExists=Benutzername %s existiert bereits.
@@ -46,8 +46,8 @@ ErrorWrongDate=Falsches Datum!
 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-Mail-Betreff ist obligatorisch
+ErrorFieldsRequired=Einige erforderliche Felder wurden leer gelassen.
+ErrorSubjectIsRequired=Der Betreff der E-Mail ist erforderlich
 ErrorFailedToCreateDir=Fehler beim Erstellen eines Verzeichnisses. Vergewissern Sie sich, dass der Webserver-Benutzer Schreibberechtigungen für das Dokumentverzeichnis des Systems besitzt. Bei aktiviertem <b>safe_mode</b> sollten die Systemdateien den Webserver-Benutzer oder die -Gruppe als Besitzer haben.
 ErrorNoMailDefinedForThisUser=Für diesen Benutzer ist keine E-Mail-Adresse eingetragen.
 ErrorSetupOfEmailsNotComplete=Das Einrichten von E-Mails ist nicht abgeschlossen
@@ -59,7 +59,7 @@ ErrorDirNotFound=Verzeichnis <b>%s</b> konnte nicht gefunden werden (Ungültiger
 ErrorFunctionNotAvailableInPHP=Die PHP-Funktion <b>%s</b> ist für diese Funktion erforderlich, in dieser PHP-Konfiguration jedoch nicht verfügbar.
 ErrorDirAlreadyExists=Ein Verzeichnis mit diesem Namen existiert bereits.
 ErrorFileAlreadyExists=Eine Datei mit diesem Namen existiert bereits.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorDestinationAlreadyExists=Eine weitere Datei mit dem Namen <b> %s </b> ist bereits vorhanden.
 ErrorPartialFile=Die Datei wurde nicht vollständig zum Server übertragen.
 ErrorNoTmpDir=Das temporäre Verzeichnis %s existiert nicht.
 ErrorUploadBlockedByAddon=Der Upload wurde durch ein PHP Apache-Plugin blockiert.
@@ -226,8 +226,9 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Die Seite/der Container <strong> %s <
 ErrorDuringChartLoad=Fehler beim Laden des Kontenplans. Wenn einige Konten nicht geladen wurden, können Sie sie trotzdem manuell eingeben.
 ErrorBadSyntaxForParamKeyForContent=Fehlerhafte Syntax für param keyforcontent. Muss einen Wert haben, der mit %s oder %s beginnt
 ErrorVariableKeyForContentMustBeSet=Fehler, die Konstante mit dem Namen %s (mit Textinhalt zum Anzeigen) oder %s (mit externer URL zum Anzeigen) muss gesetzt sein.
+ErrorURLMustEndWith=Die URL %s muss mit %s enden
 ErrorURLMustStartWithHttp=Die URL %s muss mit http: // oder https: // beginnen.
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
+ErrorHostMustNotStartWithHttp=Der Hostname %s darf NICHT mit http: // oder https: // beginnen
 ErrorNewRefIsAlreadyUsed=Fehler, die neue Referenz ist bereits in Benutzung
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Fehler, eine zu einer bereits geschlossenen Rechnung gehörende Zahlung kann nicht gelöscht werden.
 ErrorSearchCriteriaTooSmall=Suchkriterium zu klein
@@ -257,10 +258,10 @@ ErrorPublicInterfaceNotEnabled=Öffentliche Schnittstelle wurde nicht aktiviert
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Die Sprache der neuen Seite muss definiert werden, wenn sie als Übersetzung einer anderen Seite festgelegt ist
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Die Sprache der neuen Seite darf nicht die Ausgangssprache sein, wenn sie als Übersetzung einer anderen Seite festgelegt ist
 ErrorAParameterIsRequiredForThisOperation=Für diesen Vorgang ist ein Parameter obligatorisch
-ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorDateIsInFuture=Fehler, das Datum kann nicht in der Zukunft liegen
 ErrorAnAmountWithoutTaxIsRequired=Fehler, Betrag ist notwendig
 ErrorAPercentIsRequired=Fehler, bitte geben Sie den Prozentsatz korrekt ein
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorYouMustFirstSetupYourChartOfAccount=Sie müssen zuerst Ihren Kontenplan einrichten
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
@@ -293,6 +294,7 @@ WarningFailedToAddFileIntoDatabaseIndex=Warnung: Dateieintrag zur ECM-Datenbanki
 WarningTheHiddenOptionIsOn=Achtung, die versteckte Option <b> %s </b> ist aktiviert.
 WarningCreateSubAccounts=Achtung, Sie können kein Unterkonto direkt erstellen. Sie müssen einen Geschäftspartner oder einen Benutzer erstellen und ihm einen Buchungscode zuweisen, um sie in dieser Liste zu finden
 WarningAvailableOnlyForHTTPSServers=Nur verfügbar, wenn eine HTTPS-gesicherte Verbindung verwendet wird.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+WarningModuleXDisabledSoYouMayMissEventHere=Das Modul %s wurde nicht aktiviert. Sie können also eine Menge Veranstaltung hier verpassen.
+ErrorActionCommPropertyUserowneridNotDefined=Der Besitzer des Benutzers ist erforderlich
+ErrorActionCommBadType=Der ausgewählte Ereignistyp (ID: %n, Code: %s) ist im Wörterbuch für den Ereignistyp nicht vorhanden
+CheckVersionFail=Versionsprüfung fehlgeschlagen
diff --git a/htdocs/langs/de_DE/eventorganization.lang b/htdocs/langs/de_DE/eventorganization.lang
new file mode 100644
index 00000000000..758e9e383d5
--- /dev/null
+++ b/htdocs/langs/de_DE/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Organisation von Ereignissen
+EventOrganizationDescription = Organisatio von Ereignissenn durch Projekt-Modul
+EventOrganizationDescriptionLong= Verwalten Sie die Ereignisorganisation für Konferenzen, Teilnehmer, Redner und Teilnehmer mit einer öffentlichen Abonnementseite
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organisierte Veranstaltungen
+EventOrganizationConferenceOrBoothMenuLeft = Konferenz oder Stand
+
+#
+# Admin page
+#
+EventOrganizationSetup = Einstellungen der Ereignisorganisation
+Settings = Einstellungen
+EventOrganizationSetupPage = Einstellungs-Seite für die Ereignisorganisation
+EVENTORGANIZATION_TASK_LABEL = Bezeichnung der Aufgaben, die automatisch erstellt werden sollen, wenn das Projekt bestätigt wird
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategorie, die Drittanbietern hinzugefügt werden soll, wird automatisch erstellt, wenn jemand eine Konferenz vorschlägt
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategorie, die Drittanbietern hinzugefügt werden soll, wird automatisch erstellt, wenn sie einen Stand vorschlagen
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Vorlage einer E-Mail, die nach Erhalt eines Konferenzvorschlags gesendet werden soll.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Vorlage einer E-Mail, die nach Erhalt eines Standvorschlags gesendet werden soll.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Vorlage einer E-Mail, die gesendet werden soll, nachdem ein Abonnement für einen Stand bezahlt wurde.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = E-Mail-Vorlage, die gesendet werden soll, nachdem ein Abonnement für eine Veranstaltung bezahlt wurde.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Vorlage der E-Mail bei Massenaktion an Teilnehmer
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Vorlage der Massenaktion-E-Mail an die Redner
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtern Sie die Auswahlliste des Drittanbieters in der Erstellungskarte / dem Formular des Teilnehmers nach Kategorie
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtern Sie die Auswahlliste des Drittanbieters in der Teilnehmererstellungskarte / dem Formular nach Kundentyp
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Konferenz oder Stand
+ManageOrganizeEvent = Ereignis-Organisation verwalten
+ConferenceOrBooth = Konferenz oder Stand
+ConferenceOrBoothTab = Konferenz oder Stand
+AmountOfSubscriptionPaid = Betrag des bezahlten Abonnements
+DateSubscription = Datum Teilnahme
+ConferenceOrBoothAttendee = Konferenz- oder Standteilnehmer
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Ihre Anfrage für die Konferenz wurde empfangen
+YourOrganizationEventBoothRequestWasReceived = Ihre Anfrage für Stand wurde empfangen
+EventOrganizationEmailAskConf = Anfrage für eine Konferenz
+EventOrganizationEmailAskBooth = Anfrage für Stand
+EventOrganizationEmailSubsBooth = Abonnement für Stand
+EventOrganizationEmailSubsEvent = Abonnement für eine Veranstaltung
+EventOrganizationMassEmailAttendees = Kommunikation mit den Teilnehmern
+EventOrganizationMassEmailSpeakers = Kommunikation mit den Sprechern
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Erlauben Sie unbekannten Personen, Konferenzen vorzuschlagen
+AllowUnknownPeopleSuggestConfHelp=Erlauben Sie unbekannten Personen, Konferenzen vorzuschlagen
+AllowUnknownPeopleSuggestBooth=Erlauben Sie unbekannten Personen, einen Stand vorzuschlagen
+AllowUnknownPeopleSuggestBoothHelp=Erlauben Sie unbekannten Personen, einen Stand vorzuschlagen
+PriceOfRegistration=Preis der Registrierung
+PriceOfRegistrationHelp=Preis der Registrierung
+PriceOfBooth=Abonnementpreis für einen Stand
+PriceOfBoothHelp=Abonnementpreis für einen Stand
+EventOrganizationICSLink=Verknüpfe ICS für Ereignisse
+ConferenceOrBoothInformation=Konferenz- oder Standinformationen
+Attendees = Teilnehmer
+EVENTORGANIZATION_SECUREKEY = Sicherer Schlüssel des öffentlichen Registrierungslinks zu einer Konferenz
+#
+# Status
+#
+EvntOrgDraft = Entwurf
+EvntOrgSuggested = Empfohlen
+EvntOrgConfirmed = Bestätigt
+EvntOrgNotQualified = Nicht qualifiziert
+EvntOrgDone = Erledigt
+EvntOrgCancelled = Abgesagt
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Öffentlicher Link zur Registrierung zu einer Konferenz
+MissingOrBadSecureKey = Der Sicherheitsschlüssel ist ungültig oder fehlt
+EvntOrgWelcomeMessage = Mit diesem Formular können Sie sich als neuer Teilnehmer an der Konferenz registrieren
+EvntOrgStartDuration = Diese Konferenz beginnt am
+EvntOrgEndDuration =  und endet am
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index 297606467e7..37ef44b5879 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -13,11 +13,11 @@ ToReviewCP=wartet auf Genehmigung
 ApprovedCP=genehmigt
 CancelCP=storniert
 RefuseCP=abgelehnt
-ValidatorCP=genehmigt durch
+ValidatorCP=Verantwortlicher
 ListeCP=Urlaubsliste
 Leave=Urlaubsantrag
 LeaveId=Urlaubs-ID
-ReviewedByCP=Wird geprüft von
+ReviewedByCP=Zu genehmigen von
 UserID=Benutzer ID
 UserForApprovalID=Benutzer für die Genehmigungs-ID
 UserForApprovalFirstname=Vorname des Genehmigungsbenutzers
@@ -40,8 +40,8 @@ TypeOfLeaveId=Art der Urlaubs-ID
 TypeOfLeaveCode=Art des Urlaubscodes
 TypeOfLeaveLabel=Art des Urlaubslabels
 NbUseDaysCP=Anzahl genommene Urlaubstage
-NbUseDaysCPHelp=Die Berechnung berücksichtigt die in den Stammdaten definierten arbeitsfreien Tage und Feiertage.
-NbUseDaysCPShort=genommene Tage
+NbUseDaysCPHelp=Die Berechnung berücksichtigt die arbeitsfreien Tage und Feiertage, die im Wörterbuch definiert sind.
+NbUseDaysCPShort=Urlaubstage
 NbUseDaysCPShortInMonth=Urlaubstage im Monat
 DayIsANonWorkingDay=%s ist ein arbeitsfreier Tag
 DateStartInMonth=Startdatum im Monat
@@ -55,7 +55,7 @@ TitleDeleteCP=Urlaubsantrag löschen
 ConfirmDeleteCP=Möchten Sie diesen Urlaubsantrag wirklich löschen?
 ErrorCantDeleteCP=Fehler: Sie haben nicht die Berechtigung, diesen Urlaubsantrag zu löschen.
 CantCreateCP=Sie haben nicht die Berechtigung Urlaub zu beantragen.
-InvalidValidatorCP=Bitte wählen Sie einen Vorgesetzten, der Ihren Urlaubsantrag prüft.
+InvalidValidatorCP=Sie müssen den Genehmigenden für Ihren Urlaubsantrag auswählen.
 NoDateDebut=Bitte wählen Sie ein Datum für den gewünschten Beginn Ihres Urlaubs
 NoDateFin=Bitte wählen Sie ein Datum für das gewünschte Ende Ihres Urlaubs
 ErrorDureeCP=Ihr Urlaubsantrag enthält keine Werktage.
@@ -80,14 +80,14 @@ UserCP=Mitarbeiter
 ErrorAddEventToUserCP=Ein Fehler ist beim Erstellen des Sonderurlaubs aufgetreten.
 AddEventToUserOkCP=Das Hinzufügen des Sonderurlaubs wurde abgeschlossen.
 MenuLogCP=Zeige Änderungsprotokoll
-LogCP=Protokoll über Aktualisierungen von verfügbaren Urlaubstagen
-ActionByCP=Ausgeführt von
-UserUpdateCP=Für den Benutzer
+LogCP=Protokoll aller Aktualisierungen von "Urlaubsübersicht"
+ActionByCP=Geändert von
+UserUpdateCP=Aktualisiert für
 PrevSoldeCP=Vorherige Übersicht
 NewSoldeCP=Neuer Saldo
 alreadyCPexist=Für den gewählten Zeitraum wurde bereits ein Urlaubsantrag erstellt.
-FirstDayOfHoliday=Erster Tag des Urlaubs
-LastDayOfHoliday=Letzter Tag des Urlaubs
+FirstDayOfHoliday=Erster Tag des Urlaubsantrags
+LastDayOfHoliday=Letzter Tag des Urlaubsantrags
 BoxTitleLastLeaveRequests=Zuletzt bearbeitete Urlaubsanträge (maximal %s)
 HolidaysMonthlyUpdate=Monatliches Update
 ManualUpdate=Manuelles Update
@@ -104,8 +104,8 @@ LEAVE_SICK=Krankheit
 LEAVE_OTHER=Andere Gründe
 LEAVE_PAID_FR=bezahlter Urlaub
 ## Configuration du Module ##
-LastUpdateCP=Letzte automatische Aktualisierung der Urlaubszuordnung
-MonthOfLastMonthlyUpdate=Monat der letzten automatischen Aktualisierung der Urlaubszuordnung
+LastUpdateCP=Last automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
 UpdateConfCPOK=Erfolgreich bearbeitet.
 Module27130Name= Verwaltung von Urlaubsanträgen
 Module27130Desc= Verwaltung von Urlaubsanträgen
@@ -125,8 +125,8 @@ HolidaysCanceledBody=Ihr Urlaubsantrag vom %s bis %s wurde storniert.
 FollowedByACounter=0 = Zähler nicht verwenden<br>1 = Zähler verwenden (diese Art von Urlaub wird mit einem Zähler für den mitarbeiterbezogenen Urlaubsanspruch versehen. Der Zähler wird manuell oder automatisch erhöht oder verringert, wenn der Urlaubsantrag genehmigt wurde.)
 NoLeaveWithCounterDefined=Es sind keine Urlaubsarten definiert, die durch einen Zähler überwacht sind.
 GoIntoDictionaryHolidayTypes=Öffnen Sie das Menü <strong>Start - Einstellungen - Stammdaten - Urlaubsarten </strong> um die verschiedenen Urlaubsarten zu konfigurieren.
-HolidaySetup=Einrichtung des Moduls Holiday
-HolidaysNumberingModules=Hinterlegen Sie die Nummerierung der Anforderungsmodelle
+HolidaySetup=Konfiguration des Modul "Urlaubsantrags-Verwaltung"
+HolidaysNumberingModules=Numbering models for leave requests
 TemplatePDFHolidays=Vorlage für Urlaubsanträge PDF
 FreeLegalTextOnHolidays=Freitext als PDF
 WatermarkOnDraftHolidayCards=Wasserzeichen auf Urlaubsantragsentwurf (leerlassen wenn keines benötigt wird)
diff --git a/htdocs/langs/de_DE/knowledgemanagement.lang b/htdocs/langs/de_DE/knowledgemanagement.lang
new file mode 100644
index 00000000000..cee190153a9
--- /dev/null
+++ b/htdocs/langs/de_DE/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Wissensmanagement-System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Verwalten einer Wissensmanagement- (KM) oder Helpdesk-Basis
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Einstellungen des Wissensmanagement-Systems
+Settings = Einstellungen
+KnowledgeManagementSetupPage = Einstellungsseite für das Wissensmanagement-System
+
+
+#
+# About page
+#
+About = Über
+KnowledgeManagementAbout = Über Wissensmanagement
+KnowledgeManagementAboutPage = Über Wissensmanagement Seite
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Wissensmanagement
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Wissensbasis
+ListOfArticles = Liste der Artikel
+NewKnowledgeRecord = Neuer Artikel
+ValidateReply = Lösung bestätigen
+KnowledgeRecords = Artikel
+KnowledgeRecord = Artikel
+KnowledgeRecordExtraFields = Extrafelder für Artikel
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 3c7a87f490e..72eac220a72 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=An Empfänger:
 MailCC=Kopie an
 MailToCCUsers=Kopie an Empfänger
 MailCCC=Blindkopie an
-MailTopic=E-Mail-Betreff
+MailTopic=Email subject
 MailText=Inhalt
 MailFile=Angehängte Dateien
 MailMessage=E-Mail-Text
@@ -118,7 +118,7 @@ NbOfEMailingsSend=E-Mail-Kampagne versendet
 IdRecord=Eintrag-ID
 DeliveryReceipt=Empfangsbestätigung
 YouCanUseCommaSeparatorForSeveralRecipients=Trennen Sie mehrere Empfänger mit einem <b>Komma</b>
-TagCheckMail=Öffnen der Mail verfolgen
+TagCheckMail=Öffnen der E-Mail verfolgen
 TagUnsubscribe="Abmelden"-Link
 TagSignature=Absender Signatur
 EMailRecipient=Empfänger E-Mail
@@ -126,17 +126,17 @@ TagMailtoEmail=Empfänger E-Mail (beinhaltet html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Kein E-Mail gesendet. Ungültige Absender- oder Empfängeradresse. Benutzerprofil kontrollieren.
 # Module Notifications
 Notifications=Benachrichtigungen
-NotificationsAuto=Benachrichtigungen Auto.
+NotificationsAuto=E-Mail-Benachrichtigungen
 NoNotificationsWillBeSent=Für diesen Ereignistyp und dieses Unternehmen sind keine automatischen E-Mail-Benachrichtigungen geplant
 ANotificationsWillBeSent=1 automatische Benachrichtigung wird per E-Mail gesendet
 SomeNotificationsWillBeSent=%s automatische Benachrichtigungen werden per E-Mail gesendet
-AddNewNotification=Abonnieren Sie eine neue automatische E-Mail-Benachrichtigung (Ziel / Ereignis)
-ListOfActiveNotifications=Alle aktiven Abonnements (Ziele / Ereignisse) für die automatische E-Mail-Benachrichtigung auflisten
-ListOfNotificationsDone=Alle automatisch gesendeten E-Mail-Benachrichtigungen auflisten
+AddNewNotification=Abonnieren Sie eine neue automatische E-Mail-Benachrichtigung
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 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)
+YouCanAlsoUseSupervisorKeyword=Sie können auch das Schlüsselwort <strong>__SUPERVISOREMAIL__</strong> eintragen, um E-Mails an den Vorgesetzten eines Benutzers zu senden (funktioniert nur, wenn eine E-Mail-Adresse für den jeweiligen Supervisor hinterlegt wurde)
 NbOfTargetedContacts=Aktuelle Anzahl der E-Mails-Kontakte
 UseFormatFileEmailToTarget=Die importierte Datei muss im folgenden Format vorliegen:<br><strong>E-Mail-Adresse;Nachname;Vorname;Zusatzinformationen</strong>.
 UseFormatInputEmailToTarget=Geben Sie eine Zeichenkette im Format<br><strong>E-Mail-Adresse;Nachname;Vorname;Zusatzinformationen</strong> ein
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 93338d908cf..c4c49e3421a 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Speichern und neu
 TestConnection=Verbindung testen
 ToClone=Duplizieren
 ConfirmCloneAsk=Möchten Sie das Objekt <b> %s </b> sicher klonen?
-ConfirmClone=Wählen Sie die zu duplizierenden Daten:
+ConfirmClone=Wählen Sie die Daten aus, die Sie klonen möchten:
 NoCloneOptionsSpecified=Keine Duplikationsoptionen ausgewählt.
 Of=von
 Go=Weiter
@@ -246,7 +246,7 @@ DefaultModel=Standard Dokumentvorlage
 Action=Ereignis
 About=Über
 Number=Anzahl
-NumberByMonth=Anzahl nach Monat
+NumberByMonth=Gesamtzahl der Berichte pro Monat
 AmountByMonth=Umsatz nach Monat
 Numero=Nummer
 Limit=Limit
@@ -278,7 +278,7 @@ DateModificationShort=Änderungsdatum
 IPModification=Änderungs-IP
 DateLastModification=Datum letzte Änderung
 DateValidation=Freigabedatum
-DateSigning=Signing date
+DateSigning=Unterzeichnungsdatum
 DateClosing=Schließungsdatum
 DateDue=Fälligkeitsdatum
 DateValue=Valutadatum
@@ -341,8 +341,8 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Benutzer der Erstellung
-UserModif=Benutzer des letzten Updates
+UserAuthor=Angelegt von
+UserModif=Geändert von
 b=b.
 Kb=Kb
 Mb=Mb
@@ -362,7 +362,7 @@ UnitPriceHTCurrency=Stückpreis (netto) (Währung)
 UnitPriceTTC=Stückpreis (brutto)
 PriceU=VP
 PriceUHT=VP (netto)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=U.P. (netto) (Währung)
 PriceUTTC=St.-Pr. (inkl. Steuern)
 Amount=Betrag
 AmountInvoice=Rechnungsbetrag
@@ -390,7 +390,7 @@ AmountTotal=Gesamtbetrag
 AmountAverage=Durchschnittsbetrag
 PriceQtyMinHT=Mindestmengenpreis (netto)
 PriceQtyMinHTCurrency=Stückpreis pro Menge (netto) (Währung)
-PercentOfOriginalObject=Percent of original object
+PercentOfOriginalObject=Prozent des ursprünglichen Objekts
 AmountOrPercent=Betrag oder Prozent
 Percentage=Prozentsatz
 Total=Gesamt
@@ -503,9 +503,11 @@ By=Durch
 From=Von
 FromDate=von
 FromLocation=von
-at=beim
 to=An
 To=An
+ToDate=An
+ToLocation=An
+at=beim
 and=und
 or=oder
 Other=Andere
@@ -843,7 +845,7 @@ XMoreLines=%s Zeile(n) versteckt
 ShowMoreLines=Mehr/weniger Zeilen anzeigen
 PublicUrl=Öffentliche URL
 AddBox=Box anfügen
-SelectElementAndClick=Element auswählen und %s anklicken
+SelectElementAndClick=Wählen Sie ein Element aus und klicken Sie auf %s
 PrintFile=Drucke Datei %s
 ShowTransaction=Transaktion auf Bankkonto anzeigen
 ShowIntervention=Zeige Serviceauftrag
@@ -854,8 +856,8 @@ Denied=abgelehnt
 ListOf=Liste von %s
 ListOfTemplates=Liste der Vorlagen
 Gender=Geschlecht
-Genderman=männlich
-Genderwoman=weiblich
+Genderman=Männlich
+Genderwoman=Weiblich
 Genderother=Sonstige
 ViewList=Listenansicht
 ViewGantt=Gantt-Ansicht
@@ -902,10 +904,10 @@ ViewAccountList=Hauptbuch anzeigen
 ViewSubAccountList=Unterkonten-Buch anzeigen
 RemoveString=Entfernen Sie die Zeichenfolge '%s'
 SomeTranslationAreUncomplete=Einige Sprachen sind nur teilweise übersetzt oder enthalten Fehler. Wenn Sie dies feststellen, können Sie die Übersetzungen unter <a href="https://www.transifex.com/dolibarr-association/dolibarr/translate/#de_DE/" target="_blank">https://www.transifex.com/dolibarr-association/dolibarr/translate/#de_DE/</a> verbessern bzw. ergänzen.
-DirectDownloadLink=Public download link
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+DirectDownloadLink=Öffentlicher Download-Link
+PublicDownloadLinkDesc=Zum Herunterladen der Datei ist nur der Link erforderlich
+DirectDownloadInternalLink=Privater Download-Link
+PrivateDownloadLinkDesc=Sie müssen eingeloggt sein und Berechtigungen zum Anzeigen oder Herunterladen der Datei benötigen
 Download=Download
 DownloadDocument=Dokument herunterladen
 ActualizeCurrency=Update-Wechselkurs
@@ -1018,7 +1020,7 @@ SearchIntoContacts=Kontakte
 SearchIntoMembers=Mitglieder
 SearchIntoUsers=Benutzer
 SearchIntoProductsOrServices=Produkte oder Dienstleistungen
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Lote / Serien
 SearchIntoProjects=Projekte
 SearchIntoMO=Fertigungsaufträge
 SearchIntoTasks=Aufgaben
@@ -1055,13 +1057,13 @@ KeyboardShortcut=Tastatur Kürzel
 AssignedTo=Zugewiesen an
 Deletedraft=Entwurf löschen
 ConfirmMassDraftDeletion=Bestätigung Massenlöschung Entwurf
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=Datei mit einem öffentlichen Link geteilt
 SelectAThirdPartyFirst=Wähle zuerst einen Partner...
 YouAreCurrentlyInSandboxMode=Sie befinden sich derzeit im %s "Sandbox"-Modus
 Inventory=Inventur
 AnalyticCode=Analyse-Code
 TMenuMRP=Produktion
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=Firmeninfos anzeigen
 ShowMoreInfos=Zeige mehr Informationen
 NoFilesUploadedYet=Bitte zuerst ein Dokument hochladen
 SeePrivateNote=Private Notizen ansehen
@@ -1128,4 +1130,5 @@ ConfirmAffectTag=Massen-Schlagwort-Affekt
 ConfirmAffectTagQuestion=Sind Sie sicher, dass Sie Tags für die ausgewählten Datensätze von %s beeinflussen möchten?
 CategTypeNotFound=Für den Datensatztyp wurde kein Tag-Typ gefunden
 CopiedToClipboard=In die Zwischenablage kopiert
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+InformationOnLinkToContract=Dieser Betrag ist nur die Summe aller Vertragszeilen. Zeitbegriff wird nicht berücksichtigt.
+ConfirmCancel=Bist du sicher, dass du abbrechen möchtest
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index 5c8947f3a06..57b3887a7aa 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -15,24 +15,24 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Ein anderes Mitglied (Name: <b>%s</b>
 ErrorUserPermissionAllowsToLinksToItselfOnly=Aus Sicherheitsgründen müssen Sie die Berechtigungen zur Mitgliederbearbeitung besitzen, um ein Mitglied mit einem fremden Benutzerkonto (einem anderen als Ihrem eigenen) zu verknüpfen.
 SetLinkToUser=Mit Benutzer verknüpft
 SetLinkToThirdParty=Mit Partner verknüpft
-MembersCards=Visitenkarten der Mitglieder
+MembersCards=Visitenkarten für Mitglieder
 MembersList=Liste der Mitglieder
 MembersListToValid=Liste freizugebender Mitglieder
 MembersListValid=Liste freigegebener Mitglieder
 MembersListUpToDate=Aktuelle Mitgliederliste
 MembersListNotUpToDate=Ehemalige Mitglieder
-MembersListExcluded=List of excluded members
+MembersListExcluded=Liste der ausgeschlossenen Mitglieder
 MembersListResiliated=Liste der deaktivierten Mitglieder
 MembersListQualified=Liste der qualifizierten Mitglieder
 MenuMembersToValidate=Freizugebende
 MenuMembersValidated=Freigegebene Mitglieder
-MenuMembersExcluded=Excluded members
+MenuMembersExcluded=Ausgeschlossene Mitglieder
 MenuMembersResiliated=Deaktivierte Mitglieder
 MembersWithSubscriptionToReceive=Mitglieder mit ausstehendem Beitrag
 MembersWithSubscriptionToReceiveShort=Zu registrierende Mitglieder
 DateSubscription=Beitragsbeginn
 DateEndSubscription=Ablauf Beitragszeitraum
-EndSubscription=Beitragsende
+EndSubscription=Abonnement endet
 SubscriptionId=Beitrag-ID
 WithoutSubscription=Ohne Mitgliedschaft
 MemberId=Mitglied-ID
@@ -49,12 +49,12 @@ MemberStatusActiveLate=Beitragszeitraum abgelaufen
 MemberStatusActiveLateShort=Abgelaufen
 MemberStatusPaid=Mitgliedschaft aktuell
 MemberStatusPaidShort=Aktuelle
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
+MemberStatusExcluded=Ausgeschlossenes Mitglied
+MemberStatusExcludedShort=Ausgeschlossen
 MemberStatusResiliated=Deaktivierte Mitglieder
 MemberStatusResiliatedShort=Deaktiviert
 MembersStatusToValid=Freizugebende
-MembersStatusExcluded=Excluded members
+MembersStatusExcluded=Ausgeschlossene Mitglieder
 MembersStatusResiliated=Deaktivierte Mitglieder
 MemberStatusNoSubscription=Validiert (kein Beitrag erforderlich)
 MemberStatusNoSubscriptionShort=Freigegeben
@@ -83,12 +83,12 @@ WelcomeEMail=Willkommen per E-Mail
 SubscriptionRequired=Beitrag erforderlich
 DeleteType=Löschen
 VoteAllowed=Stimmrecht
-Physical=natürliche Person
-Moral=juristische Person
-MorAndPhy=juristisch und natürlich
-Reenable=Reaktivieren
-ExcludeMember=Exclude a member
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
+Physical=Individuell
+Moral=Konzern
+MorAndPhy=Unternehmen und Einzelperson
+Reenable=Erneut aktivieren
+ExcludeMember=Ein Mitglied ausschließen
+ConfirmExcludeMember=Möchten Sie dieses Mitglied wirklich ausschließen?
 ResiliateMember=Mitglied deaktivieren
 ConfirmResiliateMember=Möchten Sie dieses Mitglied wirklich deaktivieren?
 DeleteMember=Mitglied löschen
@@ -144,7 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Vorlage für eine E-Mail an ein Mi
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Vorlage für eine E-Mail an ein Mitglied wegen der Neuregistrierung
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Vorlage für eine E-Mail zur Erinnerung an die Beitragsfälligkeit
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Vorlage für eine E-Mail an ein Mitglied bei Erlöschen der Mitgliedschaft
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=E-Mail-Vorlage zum Senden von E-Mails an ein Mitglied unter Ausschluss von Mitgliedern
 DescADHERENT_MAIL_FROM=E-Mail-Adresse des Absenders bei automatischen Mails
 DescADHERENT_ETIQUETTE_TYPE=Format der Etikettenseite
 DescADHERENT_ETIQUETTE_TEXT=Text für den Druck auf der Mitglied-Adresskarte
@@ -170,37 +170,37 @@ DocForLabels=Etiketten erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
 SubscriptionPayment=Beitragszahlung 
 LastSubscriptionDate=Datum der letzten Beitragszahlung
 LastSubscriptionAmount=Betrag des letzten Beitrags
-LastMemberType=Last Member type
+LastMemberType=Letzter Mitgliedstyp
 MembersStatisticsByCountries=Mitgliederstatistik nach Staaten
 MembersStatisticsByState=Mitgliederstatistik nach Bundesländern/Provinzen/Kantonen
 MembersStatisticsByTown=Mitgliederstatistik nach Städten
 MembersStatisticsByRegion=Mitgliederstatistik nach Regionen
-NbOfMembers=Anzahl der Mitglieder
-NbOfActiveMembers=Aktuelle Mitgliederzahl
+NbOfMembers=Gesamtzahl der Mitglieder
+NbOfActiveMembers=Gesamtzahl der aktuell aktiven Mitglieder
 NoValidatedMemberYet=Keine freizugebenden Mitglieder gefunden
-MembersByCountryDesc=Anzeige der Mitgliederstatistik nach Staaten. (Die Grafik basiert auf Googles Online-Grafikservice und funktioniert nur, wenn eine Internetverbindung besteht.)
-MembersByStateDesc=Anzeige der Mitgliederstatistik nach Bundesland/Provinz/Kanton.
-MembersByTownDesc=Anzeige der Mitgliederstatistik nach Städten.
+MembersByCountryDesc=Dieser Bildschirm zeigt Ihnen die Statistiken der Mitglieder nach Ländern. Grafiken und Diagramme hängen von der Verfügbarkeit des Google Online-Grafikdienstes sowie von der Verfügbarkeit einer funktionierenden Internetverbindung ab.
+MembersByStateDesc=Dieser Bildschirm zeigt Ihnen Statistiken der Mitglieder nach Bundesland / Provinzen / Kanton.
+MembersByTownDesc=Dieser Bildschirm zeigt Ihnen Statistiken der Mitglieder nach Stadt.
+MembersByNature=Dieser Bildschirm zeigt Ihnen Statistiken der Mitglieder nach Art an.
+MembersByRegion=Dieser Bildschirm zeigt Ihnen Statistiken der Mitglieder nach Region.
 MembersStatisticsDesc=Gewünschte Statistik auswählen ...
 MenuMembersStats=Statistik
-LastMemberDate=Letztes Mitgliedschaftsdatum
+LastMemberDate=Spätestes Mitgliedschaftsdatum
 LatestSubscriptionDate=Letztes Beitragsdatum
 MemberNature=Art des Mitglieds
 MembersNature=Art der Mitglieder
 Public=Informationen sind öffentlich
 NewMemberbyWeb=Neues Mitglied hinzugefügt, wartet auf Genehmigung.
 NewMemberForm=Formular neues Mitglied
-SubscriptionsStatistics=Statistik der Beiträge
+SubscriptionsStatistics=Abonnementstatistik
 NbOfSubscriptions=Anzahl der Beiträge
-AmountOfSubscriptions=Betrag der Beiträge
+AmountOfSubscriptions=Aus Abonnements gesammelter Betrag
 TurnoverOrBudget=Umsatz (Firma) oder Budget (Verein/Stiftung)
 DefaultAmount=Standardhöhe des Mitgliedsbeitrags
 CanEditAmount=Besucher können die Höhe des Mitgliedsbeitrags anpassen
 MEMBER_NEWFORM_PAYONLINE=Zur integrierten Bezahlseite gehen
 ByProperties=Natürlich
 MembersStatisticsByProperties=Natürliche Mitgliederstatistiken
-MembersByNature=Anzeige der Mitgliederstatistiken
-MembersByRegion=Anzeige der Mitgliederstatistiken nach Regionen.
 VATToUseForSubscriptions=Mehrwertsteuersatz für Beitrag
 NoVatOnSubscription=Beitrag ohne Mehrwertsteuer
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Verwendete(s) Produkt / Leistung für den Beitrag in der Rechnungszeile: %s
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index ad5c1c62c2e..8f91793c5f4 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Liste der definierten Berechtigungen
 SeeExamples=Beispiele hier
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Ist das Feld sichtbar? (Beispiele: 0 = Nie sichtbar, 1 = Auf Liste sichtbar und Formulare erstellen / aktualisieren / anzeigen, 2 = Nur auf Liste sichtbar, 3 = Nur auf Formular erstellen / aktualisieren / anzeigen (nicht Liste), 4 = Auf Liste sichtbar und nur sichtbar bei Formular aktualisieren / anzeigen (nicht erstellen), 5 = Nur im Formular für die Listenendansicht sichtbar (nicht erstellen, nicht aktualisieren). <br> <br> Wenn ein negativer Wert verwendet wird, wird das Feld standardmäßig nicht in der Liste angezeigt, kann jedoch zur Anzeige ausgewählt werden.) <br> <br> Es kann sich um einen Ausdruck handeln, z. B.:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Zeigt dieses Feld in kompatiblen PDF-Dokumenten an. Sie können die Position mit dem Feld "Position" verwalten. <br/> Derzeit bekannt compatibles PDF-Modelle sind: eratosthenes (Bestellung), espadon (Lieferung), sponge (Rechnungen), cyan (propal / Offerten), cornas (Lieferanten-Auftrag) <br/> <br/> <strong> Für Dokument: </strong> <br/> 0 = nicht angezeigen <br/> 1 = anzeigen <br/> 2 = nur anzeigen, wenn nicht leer <br/> <br/> <strong> Für Belegzeilen: </strong> <br/> 0 = nicht angezeigt <br/> 1 = in einer Spalte <br/> 3 = Anzeige in Zeile Beschreibung Spalte nach der Beschreibung <br/> 4 = Anzeige in Spalte Beschreibung nach der angezeigten Beschreibung, nur wenn nicht leer
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Anzeige auf PDF
 IsAMeasureDesc=Kann der Wert des Feldes kumuliert werden, um eine Summe in die Liste aufzunehmen? (Beispiele: 1 oder 0)
 SearchAllDesc=Wird das Feld verwendet, um eine Suche über das Schnellsuchwerkzeug durchzuführen? (Beispiele: 1 oder 0)
diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang
index 5efda355faf..7d3f687b6df 100644
--- a/htdocs/langs/de_DE/mrp.lang
+++ b/htdocs/langs/de_DE/mrp.lang
@@ -12,7 +12,7 @@ BillOfMaterials=Stückliste
 BOMsSetup=Stücklisten Modul einrichten
 ListOfBOMs=Stücklisten-Übersicht
 ListOfManufacturingOrders=Liste der Fertigungsaufträge
-NewBOM=neue Stückliste
+NewBOM=Neue Stückliste
 ProductBOMHelp=Produkt, das mit dieser Stückliste erstellt werden soll. <br> Hinweis: Produkte mit der Eigenschaft 'Art des Produkts' = 'Rohmaterial' sind in dieser Liste nicht sichtbar.
 BOMsNumberingModules=Vorlage für die Stücklistennummerierung
 BOMsModelModule=Dokumentvorlagen für Stücklisten
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Freier Text auf dem Stücklisten-Dokument
 WatermarkOnDraftBOMs=Wasserzeichen auf Stücklisten-Entwürfen
 FreeLegalTextOnMOs=Freier Text auf dem Dokument von Fertigungsaufträgen
 WatermarkOnDraftMOs=Wasserzeichen auf Entwurf vom Fertigungsauftrag
-ConfirmCloneBillOfMaterials=Möchten Sie die Stückliste %s wirklich duplizieren?
+ConfirmCloneBillOfMaterials=Sind Sie sicher, dass Sie die Stückliste %s klonen möchten?
 ConfirmCloneMo=Möchten Sie den Fertigungsauftrag %s wirklich duplizieren?
 ManufacturingEfficiency=Produktionseffizienz
 ConsumptionEfficiency=Verbrauchseffizienz
@@ -31,7 +31,7 @@ ValueOfMeansLossForProductProduced=Ein Wert von 0,95 bedeutet im Durchschnitt 5%
 DeleteBillOfMaterials=Stückliste löschen
 DeleteMo=Fertigungsauftrag löschen
 ConfirmDeleteBillOfMaterials=Möchten Sie diese Stückliste wirklich löschen?
-ConfirmDeleteMo=Möchten Sie diesen Fertigungsauftrag wirklich löschen?
+ConfirmDeleteMo=Möchten Sie diese Stückliste wirklich löschen?
 MenuMRP=Fertigungsaufträge
 NewMO=Neuer Fertigungsauftrag
 QtyToProduce=Produktionsmenge
@@ -83,16 +83,14 @@ Workstations=Arbeitsplätze
 WorkstationsDescription=Arbeitsplatzverwaltung
 WorkstationSetup = Arbeitsplatz einrichten
 WorkstationSetupPage = Workstations setup page
-WorkstationAbout = About Workstation
-WorkstationAboutPage = Workstations about page
 WorkstationList=Liste Arbeitsplätze
 WorkstationCreate=neuen Arbeitsplatz hinzufügen
 ConfirmEnableWorkstation=Möchten Sie den Arbeitsplatz <b> %s </b> aktivieren?
 EnableAWorkstation=einen Arbeitsplatz aktivieren
 ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Supprimer
-NbOperatorsRequired=Number of operators required
+DisableAWorkstation=Deaktivieren Sie eine Workstation
+DeleteWorkstation=Löschen
+NbOperatorsRequired=Anzahl der erforderlichen Bediener
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
 WorkstationType=Arbeitsplatztyp
@@ -101,4 +99,4 @@ Machine=Maschine
 HumanMachine=Mensch & Maschine
 WorkstationArea=Workstation area
 Machines=Maschinen
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+THMEstimatedHelp=Dieser Kurs ermöglicht es, prognostizierte Kosten des Artikels zu definieren
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 1da316f5077..1c52689a5fa 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Installiere oder aktiviere die GD Bibliothek in der PHP Inst
 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 zu den Totalstückzahlen Produkte/Dienstleistungen
-StatsByNumberOfEntities=Statistik durch Anzahl verweisender Einträge erstellt (Rechnungs- oder Angebotsnummer...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Anzahl Angebote
 NumberOfCustomerOrders=Anzahl der Kundenbestellungen
 NumberOfCustomerInvoices=Anzahl Kundenrechnungen
@@ -289,4 +289,4 @@ PopuProp=Produkte / Dienstleistungen nach Beliebtheit in Angeboten
 PopuCom=Produkte / Dienstleistungen nach Beliebtheit in Bestellungen
 ProductStatistics=Produkt- / Dienstleistungsstatistik
 NbOfQtyInOrders=Menge in Bestellungen
-SelectTheTypeOfObjectToAnalyze=Wählen Sie den zu analysierenden Objekttyp aus ...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/de_DE/partnership.lang b/htdocs/langs/de_DE/partnership.lang
new file mode 100644
index 00000000000..7af57cdfae5
--- /dev/null
+++ b/htdocs/langs/de_DE/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Startdatum
+DatePartnershipEnd=Ende
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Entwurf
+PartnershipAccepted = Bestätigt
+PartnershipRefused = Abgelehnt
+PartnershipCanceled = storniert
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
index de283a431bb..8c94e861397 100644
--- a/htdocs/langs/de_DE/productbatch.lang
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -25,11 +25,11 @@ ShowCurrentStockOfLot=Warenbestand für diese Chargen-/Seriennummer anzeigen
 ShowLogOfMovementIfLot=Bewegungen für diese Chargen-/Seriennummer anzeigen
 StockDetailPerBatch=Lagerdetail nach Chargen
 SerialNumberAlreadyInUse=Die Seriennummer %s wird bereits für das Produkt %s verwendet
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
-QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
+TooManyQtyForSerialNumber=Sie können nur ein Produkt %s für die Seriennummer %s haben
+BatchLotNumberingModules=Optionen für die automatische Generierung von Chargenprodukten, die über Lose verwaltet werden
+BatchSerialNumberingModules=Optionen für die automatische Generierung von Chargenprodukten, die über Seriennummern verwaltet werden
+ManageLotMask=Benutzerdefinierte Maske
+CustomMasks=Fügt eine Option zum Definieren der Maske in der Produktkarte hinzu
+LotProductTooltip=Fügt der Produktkarte eine Option zum Definieren einer dedizierten Chargennummernmaske hinzu
+SNProductTooltip=Fügt der Produktkarte eine Option zum Definieren einer dedizierten Seriennummernmaske hinzu
+QtyToAddAfterBarcodeScan=Menge, die für jeden gescannten Barcode / jedes Los / jede Serienummer hinzugefügt werden muss
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 1f0dacf0a52..44c45864ae2 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -43,7 +43,7 @@ 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=Zuletzt bearbeitetete Produkte / Leistungen (maximal %s)
+LastModifiedProductsAndServices=Neueste %s Produkte / Dienstleistungen, die geändert wurden
 LastRecordedProducts=Letzte %s erfasste Produkte/Leistungen
 LastRecordedServices=Zuletzt bearbeitete Leistungen (maximal %s)
 CardProduct0=Produkt
@@ -73,12 +73,12 @@ SellingPrice=Verkaufspreis
 SellingPriceHT=Verkaufspreis (ohne Steuern) 
 SellingPriceTTC=Verkaufspreis (inkl. USt.)
 SellingMinPriceTTC=Mindest-Verkaufspreis (inkl. MwSt.)
-CostPriceDescription=In diesem Preisfeld (ohne MwSt.) können Sie den Durchschnittsbetrag speichern, den dieses Produkt Ihr Unternehmen kostet. Dies kann jeder Preis sein, den Sie selbst berechnen, beispielsweise aus dem durchschnittlichen Einkaufspreis zuzüglich der durchschnittlichen Produktions- und Vertriebskosten.
+CostPriceDescription=Dieses Preisfeld (ohne Steuern) kann verwendet werden, um den durchschnittlichen Betrag zu erfassen, den dieses Produkt für Ihr Unternehmen kostet. Dies kann ein beliebiger Preis sein, den Sie selbst berechnen, beispielsweise aus dem durchschnittlichen Kaufpreis zuzüglich der durchschnittlichen Produktions- und Vertriebskosten.
 CostPriceUsage=Dieser Wert könnte für Margenberechnung genutzt werden.
 SoldAmount=Verkaufte Menge
 PurchasedAmount=angeschaffte Menge
 NewPrice=Neuer Preis
-MinPrice=Mindestverkaufspreis 
+MinPrice=Mindest-Verkaufspreis
 EditSellingPriceLabel=Verkaufspreisschild bearbeiten
 CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne USt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
 ContractStatusClosed=Geschlossen
@@ -157,11 +157,11 @@ ListServiceByPopularity=Liste der Leistungen nach Beliebtheit
 Finished=Eigenproduktion
 RowMaterial=Rohmaterial
 ConfirmCloneProduct=Möchten Sie das Produkt / die Leistung <b>%s</b> wirklich duplizieren?
-CloneContentProduct=Allgemeine Informationen des Produkts / der Leistung duplizieren
+CloneContentProduct=Klonen Sie alle wichtigen Informationen des Produkts / der Dienstleistung
 ClonePricesProduct=Preise duplizieren
-CloneCategoriesProduct=Verknüpfte Tags / Kategorien duplizieren
-CloneCompositionProduct=Virtuelles Produkt / Service klonen
-CloneCombinationsProduct=Dupliziere Produkt-Variante
+CloneCategoriesProduct=Klonen Sie verknüpfte Tags / Kategorien
+CloneCompositionProduct=Klonen Sie virtuelle Produkte / Dienstleistungen
+CloneCombinationsProduct=Klonen Sie die Produktvarianten
 ProductIsUsed=Produkt in Verwendung
 NewRefForClone=Artikelnummer neues Produkt / neue Leistung
 SellingPrices=Verkaufspreis
@@ -170,12 +170,12 @@ CustomerPrices=Kundenpreise
 SuppliersPrices=Lieferanten Preise
 SuppliersPricesOfProductsOrServices=Herstellerpreise (von Produkten oder Dienstleistungen)
 CustomCode=Zolltarifnummer
-CountryOrigin=Urspungsland
-RegionStateOrigin=Ursprungsregion
-StateOrigin=Ursprungs- Staat | Provinz
-Nature=Produkttyp  (Material / Fertig)
+CountryOrigin=Herkunftsland
+RegionStateOrigin=Herkunftsregion
+StateOrigin=State|Province of origin
+Nature=Art des Produkts (roh / hergestellt)
 NatureOfProductShort=Art des Produkts
-NatureOfProductDesc=Rohstoff oder Fertigprodukt
+NatureOfProductDesc=Rohmaterial oder hergestelltes Produkt
 ShortLabel=Kurzbezeichnung
 Unit=Einheit
 p=u.
@@ -314,7 +314,7 @@ LastUpdated=Zuletzt aktualisiert
 CorrectlyUpdated=erfolgreich aktualisiert
 PropalMergePdfProductActualFile=verwendete Dateien, um in PDF Azur hinzuzufügen sind / ist
 PropalMergePdfProductChooseFile=Wähle PDF-Dateien
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=Fügen Sie Produkte / Dienstleistungen dem Schlagwort hinzu
 DefaultPriceRealPriceMayDependOnCustomer=Standardpreis, echter Preis kann vom Kunden abhängig sein
 WarningSelectOneDocument=Bitte wählen Sie mindestens ein Dokument aus
 DefaultUnitToShow=Einheit
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 963e12c139b..f1ffc0c7575 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Projektkontakte
 ProjectsImContactFor=Projekte, für die ich ausdrücklich ein Ansprechpartner bin
 AllAllowedProjects=Alle Projekte die ich sehen kann (eigene + öffentliche)
 AllProjects=alle Projekte
-MyProjectsDesc=Ansicht beschränkt auf Projekte mit mir als Ansprechpartner
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 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.
 ProjectsPublicTaskDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen.
 ProjectsDesc=Es werden alle Projekte angezeigt (Ihre Berechtigungen berechtigt Sie alle Projekte zu sehen).
 TasksOnProjectsDesc=Es werden alle Aufgaben angezeigt (Ihre Berechtigungen berechtigt Sie alles zu sehen).
-MyTasksDesc=Diese Ansicht ist beschränkt asuf Projekte oder Aufgaben bei denen Sie als Ansprechspartner eingetragen sind
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Nur offene Projekte sind sichtbar. (Projekte mit dem Status Entwurf oder Geschlossen sind nicht sichtbar)
 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=Alle Aufgaben für qualifizierte Projekte sind sichtbar, Sie können jedoch nur die Zeit für die Aufgabe eingeben, die dem ausgewählten Benutzer zugewiesen ist. Weisen Sie eine Aufgabe zu, wenn Sie Zeiten dafür eingeben müssen.
-OnlyYourTaskAreVisible=Nur Ihnen zugewiesene Aufgaben sind sichtbar. Weisen Sie sich die Aufgabe zu, wenn Sie Zeiten auf der Aufgabe erfassen müssen.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Aufgaben der Projekte
 ProjectCategories=Projektkategorien/Tags
 NewProject=neues Projekt
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=nicht der Aufgabe zugewiesen
 NoUserAssignedToTheProject=Diesem Projekt sind keine Benutzer zugeordnet
 TimeSpentBy=Zeitaufwand durch
 TasksAssignedTo=Aufgabe zugewiesen an
-AssignTaskToMe=Aufgabe mir selbst zuweisen
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Aufgabe an %s zuweisen
 SelectTaskToAssign=Zuzuweisende Aufgabe auswählen...
 AssignTask=Zuweisen
diff --git a/htdocs/langs/de_DE/recruitment.lang b/htdocs/langs/de_DE/recruitment.lang
index db4e52b8cbf..0c3d2aa7189 100644
--- a/htdocs/langs/de_DE/recruitment.lang
+++ b/htdocs/langs/de_DE/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Vielen Dank für Ihre Bewerbung. <br> ...
 JobClosedTextCandidateFound=Die Stelle ist geschlossen. Die Position wurde besetzt.
 JobClosedTextCanceled=Die Stelle ist geschlossen.
 ExtrafieldsJobPosition=Ergänzende Attribute (Stellenangebote)
-ExtrafieldsCandidatures=Ergänzende Attribute (Bewerbungen)
+ExtrafieldsApplication=Ergänzende Attribute (Bewerbungen)
 MakeOffer=Machen Sie ein Angebot
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index e405e235988..412c815f3e1 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -1,13 +1,16 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Standard Buchhaltungskonto für Benutzer Partner
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Standard Buchhaltungskonto für Gehaltszahlungen
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Das in der Benutzerkarte hinterlegte Konto wird nur für die Nebenbücher verwendet. Dieses Konto wird für das Hauptbuch und als Vorgabewert für die Nebenbücher verwendet, wenn beim Benutzer kein Konto hinterlegt ist.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Buchhaltungs-Konto für Löhne
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Lassen Sie beim Erstellen eines Gehalts standardmäßig die Option "Gesamtzahlung automatisch erstellen" leer
 Salary=Lohn
 Salaries=Löhne
-NewSalaryPayment=Neue Lohnzahlung
+NewSalary=Neues Gehalt
+NewSalaryPayment=Neue Gehaltskarte
 AddSalaryPayment=Gehaltszahlung hinzufügen
 SalaryPayment=Lohnzahlung
 SalariesPayments=Lohnzahlungen
+SalariesPaymentsOf=Gehaltszahlungen von %s
 ShowSalaryPayment=Zeige Lohnzahlung
 THM=Durchschnittlicher Stundensatz
 TJM=Durchschnittlicher Tagessatz
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index 482de9a27e7..8fceea20bd4 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Möchten Sie die Lieferung mit der Referenz <b>%s</b> wir
 ConfirmCancelSending=Möchten Sie diese Auslieferung wirklich abbrechen?
 DocumentModelMerou=Merou A5-Modell
 WarningNoQtyLeftToSend=Achtung, keine weiteren Produkte für den Versand.
-StatsOnShipmentsOnlyValidated=Versandstatistik (nur freigegebene). Das Datum ist das der Freigabe (geplantes Lieferdatum ist nicht immer bekannt).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Geplanter Liefertermin
 RefDeliveryReceipt=Lieferschein-Nr.
 StatusReceipt=Der Status des Lieferschein
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 997f17adbf5..810ce4a351d 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -19,8 +19,8 @@ Stock=Warenbestand
 Stocks=Warenbestände
 MissingStocks=Fehlende Bestände
 StockAtDate=Lagerbestände zum Datum
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+StockAtDateInPast=Datum in der Vergangenheit
+StockAtDateInFuture=Datum in der Zukunft
 StocksByLotSerial=Lagerbestand nach Chargen/Serien
 LotSerial=Chargen/Serien
 LotSerialList=Liste der Chargen-/Seriennummern
@@ -37,8 +37,8 @@ AllWarehouses=Alle Warenlager
 IncludeEmptyDesiredStock=Schließe auch negative Bestände mit undefinierten gewünschten Beständen ein
 IncludeAlsoDraftOrders=Fügen Sie auch Auftragsentwürfe hinzu
 Location=Standort
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=Kurzname des Ortes
+NumberOfDifferentProducts=Anzahl einzigartiger Produkte
 NumberOfProducts=Anzahl Produkte
 LastMovement=Letzte Bewegung
 LastMovements=Letzte Bewegungen
@@ -62,7 +62,7 @@ EnhancedValueOfWarehouses=Lagerwert
 UserWarehouseAutoCreate=Automatisch ein Lager erstellen wenn ein neuer Benutzer erstellt wird
 AllowAddLimitStockByWarehouse=Verwalten Sie zusätzlich zum Wert für den Mindest- und den gewünschten Bestand pro Paar (Produktlager) auch den Wert für den Mindest- und den gewünschten Bestand pro Produkt
 RuleForWarehouse=Regel für Lager
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseOnThirparty=Stellen Sie ein Lager auf einem Drittanbieter ein
 WarehouseAskWarehouseDuringPropal=Ein Lager zu dem Angebot einstellen
 WarehouseAskWarehouseDuringOrder=Legen Sie ein Lager für Verkaufsaufträge fest
 UserDefaultWarehouse=Legen Sie ein Lager für Benutzer fest
@@ -91,23 +91,23 @@ NoPredefinedProductToDispatch=Es erfolgt keine Lagerbestandsänderung da keine v
 DispatchVerb=Position(en) verbuchen
 StockLimitShort=Grenzwert für Alarm
 StockLimit=Mindestbestand vor Warnung
-StockLimitDesc=(leer) bedeutet keine Warnung. <br> 0 kann für eine Warnung verwendet werden, sobald der Bestand leer ist.
+StockLimitDesc=(leer) bedeutet keine Warnung. <br> 0 kann verwendet werden, um eine Warnung auszulösen, sobald der Bestand leer ist.
 PhysicalStock=Aktueller Lagerbestand
 RealStock=tatsächlicher Bestand
 RealStockDesc=Der aktuelle Lagerbestand ist die Stückzahl, die aktuell und physikalisch in Ihren Warenlagern vorhanden ist.
 RealStockWillAutomaticallyWhen=Der tatsächliche Bestand wird gemäß dieser Regel geändert (wie im Bestandsmodul definiert):
 VirtualStock=Theoretischer Lagerbestand
 VirtualStockAtDate=Virtueller Bestand zum Datum
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
+VirtualStockAtDateDesc=Virtueller Bestand, sobald alle ausstehenden Bestellungen, deren Bearbeitung vor dem ausgewählten Datum geplant ist, abgeschlossen sind
 VirtualStockDesc=Virtueller Bestand ist der berechnete Bestand, der verfügbar ist, sobald alle offenen / ausstehenden Aktionen (die sich auf den Bestand auswirken) abgeschlossen sind (eingegangene Bestellungen, versendete Kundenaufträge, produzierte Fertigungsaufträge usw.).
-AtDate=At date
+AtDate=Zum Zeitpunkt
 IdWarehouse=Warenlager ID
 DescWareHouse=Beschreibung Warenlager
 LieuWareHouse=Standort Warenlager
 WarehousesAndProducts=Warenlager und Produkte
 WarehousesAndProductsBatchDetail=Warenlager und Produkte (mit Detail per lot / serial)
 AverageUnitPricePMPShort=Gewichteter Warenwert
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=Den eingegebenen durchschnittlichen Stückpreis mussten wir aufwenden, um 1 Produkteinheit in unseren Lagerbestand zu bringen.
 SellPriceMin=Verkaufspreis
 EstimatedStockValueSellShort=Verkaufswert
 EstimatedStockValueSell=Verkaufswert
@@ -147,7 +147,7 @@ Replenishments=Nachbestellung
 NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s)
 NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s)
 MassMovement=Massenbewegung
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+SelectProductInAndOutWareHouse=Wählen Sie ein Quelllager und ein Ziellager, ein Produkt und eine Menge aus und klicken Sie auf "%s". Sobald dies für alle erforderlichen Bewegungen erledigt ist, klicken Sie auf "%s".
 RecordMovement=Umbuchung
 ReceivingForSameOrder=Verbuchungen zu dieser Bestellung
 StockMovementRecorded=Lagerbewegungen aufgezeichnet
@@ -156,7 +156,7 @@ StockMustBeEnoughForInvoice=Ein ausreichender Lagerbestand ist erforderlich, um
 StockMustBeEnoughForOrder=Der Lagerbestand muss ausreichen, um der Bestellung ein Produkt / eine Dienstleistung hinzuzufügen.
 StockMustBeEnoughForShipment= Ein ausreichender Lagerbestand ist erforderlich, um Produkte/Leistungen zum Versand hinzuzufügen. (Die Prüfung gegen den aktuellen tatsächlichen Lagerbestand erfolgt, wenn eine Zeile zum Versand hinzugefügt wird, unabhängig von der Regel zur automatischen Lagerbestandsänderung.) 
 MovementLabel=Titel der Lagerbewegung
-TypeMovement=Direction of movement
+TypeMovement=Bewegungsrichtung
 DateMovement=Datum Lagerbewegung
 InventoryCode=Bewegungs- oder Bestandscode
 IsInPackage=In Paket enthalten
@@ -185,7 +185,7 @@ inventoryCreatePermission=Neue Inventur erstellen
 inventoryReadPermission=Inventar anzeigen
 inventoryWritePermission=Inventar aktualisieren
 inventoryValidatePermission=Inventur freigeben
-inventoryDeletePermission=Delete inventory
+inventoryDeletePermission=Inventar löschen
 inventoryTitle=Inventar
 inventoryListTitle=Inventuren
 inventoryListEmpty=Keine Inventarisierung in Arbeit
@@ -238,20 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Ein Lagerbestand ist erforderlich, um das z
 ForceTo=Erzwingen
 AlwaysShowFullArbo=Anzeige des vollständigen Angebots (Popup des Lager-Links). Warnung: Dies kann die Leistung erheblich beeinträchtigen.
 StockAtDatePastDesc=Du kannst hier den Lagerbestand (Realbestand) zu einem bestimmten Datum in der Vergangenheit anzeigen
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
+StockAtDateFutureDesc=Sie können hier den Bestand (virtueller Bestand) zu einem bestimmten Zeitpunkt in der Zukunft anzeigen
 CurrentStock=Aktueller Lagerbestand
 InventoryRealQtyHelp=Setze den Wert auf 0, um die Menge zurückzusetzen. <br> Feld leer lassen oder Zeile entfernen, um unverändert zu lassen
-UpdateByScaning=Fill real qty by scaning
+UpdateByScaning=Füllen Sie die tatsächliche Menge durch Scannen
 UpdateByScaningProductBarcode=Update per Scan (Produkt-Barcode)
 UpdateByScaningLot=Update per Scan (Charge | serieller Barcode)
 DisableStockChangeOfSubProduct=Deaktivieren Sie den Lagerwechsel für alle Unterprodukte dieses Satzes während dieser Bewegung.
-ImportFromCSV=Import CSV list of movement
+ImportFromCSV=CSV-Bewegungsliste importieren
 ChooseFileToImport=Datei hochladen und dann auf das Symbol %s klicken, um die Datei als Quell-Importdatei auszuwählen ...
-SelectAStockMovementFileToImport=select a stock movement file to import
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
-LabelOfInventoryMovemement=Inventory %s
+SelectAStockMovementFileToImport=Wählen Sie eine zu importierende Bestandsbewegungs-Datei aus
+InfoTemplateImport=Hochgeladene Dateien müssen dieses Format haben (* sind Pflichtfelder): <br> Startlager * | Ziellager * | Produkt * | Menge * | Los- / Seriennummer <br> Das CSV-Zeichentrennzeichen muss "<b> %s </b>" sein.
+LabelOfInventoryMovemement=Inventar %s
 ReOpen=wiedereröffnen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
+ConfirmFinish=Bestätigen Sie den Abschluss des Inventars? Dadurch werden alle Bestandsbewegungen generiert, um Ihren Bestand zu aktualisieren.
+ObjectNotFound=%s nicht gefunden
+MakeMovementsAndClose=Bewegungen erzeugen und schließen
+AutofillWithExpected=Füllen Sie die reale Menge mit der erwarteten Menge
diff --git a/htdocs/langs/de_DE/supplier_proposal.lang b/htdocs/langs/de_DE/supplier_proposal.lang
index 73d6044115f..93994b30256 100644
--- a/htdocs/langs/de_DE/supplier_proposal.lang
+++ b/htdocs/langs/de_DE/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Bereich Lieferantenangebote
 SupplierProposalShort=Lieferanten Angebot
 SupplierProposals=Lieferantenangebote
 SupplierProposalsShort=Lieferantenangebote
+AskPrice=Preisanfrage
 NewAskPrice=neue Preisanfrage
 ShowSupplierProposal=Preisanfrage anzeigen
 AddSupplierProposal=Preisanfrage erstellen
@@ -52,3 +53,6 @@ SupplierProposalsToClose=zu schließende Lieferantenangebote
 SupplierProposalsToProcess=Lieferantenangebote zu Verarbeiten
 LastSupplierProposals=letzte %s Preisanfragen
 AllPriceRequests=Alle Anfragen
+TypeContact_supplier_proposal_external_SHIPPING=Lieferantenkontakt für die Lieferung
+TypeContact_supplier_proposal_external_BILLING=Lieferantenkontakt für die Abrechnung
+TypeContact_supplier_proposal_external_SERVICE=Vertreter für Angebot
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index 87cbe3e8ab8..d11fe870838 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -70,7 +70,7 @@ Deleted=Gelöscht
 # Dict
 Type=Typ
 Severity=Dringlichkeit
-TicketGroupIsPublic=Group is public
+TicketGroupIsPublic=Gruppe ist öffentlich
 TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
@@ -306,11 +306,11 @@ BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Keine zuletzt bearbeiteten Tickets
 BoxTicketType=Number of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
+BoxNoTicketSeverity=Keine Tickets geöffnet
 BoxTicketLastXDays=Number of new tickets by days the last %s days
 BoxTicketLastXDayswidget = Number of new tickets by days the last X days
 BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNumberOfTicketByDay=Anzahl neuer Tickets pro Tag
 BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
+TicketCreatedToday=Ticket heute erstellt
+TicketClosedToday=Ticket heute geschlossen
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 7449ffc83c4..c9f6aae0eb0 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Neues Passwort: %s
 SubjectNewPassword=Ihr neues Passwort für %s
 GroupRights=Gruppenberechtigungen
 UserRights=Benutzerberechtigungen
+Credentials=Credentials
 UserGUISetup=Konfiguration der Benutzeranzeige
 DisableUser=Deaktiviere Benutzer
 DisableAUser=Einen Benutzer deaktivieren
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum Ändern
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Verwende OpenID für Anmeldung
 WeeklyHours=Sollarbeitszeit (Stunden pro Woche)
-ExpectedWorkedHours=Erwartete Wochenarbeitszeit
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Benutzerfarbe
 DisabledInMonoUserMode=Deaktiviert im Wartungsmodus
 UserAccountancyCode=Buchhaltungscode Benutzer
@@ -115,7 +116,7 @@ DateOfEmployment=Anstellungsdatum
 DateEmployment=Mitarbeiter
 DateEmploymentstart=Beschäftigungsbeginn
 DateEmploymentEnd=Beschäftigungsende
-RangeOfLoginValidity=Datumsbereich der Anmeldegültigkeit
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Sie können nicht ihr eigenes Benutzerkonto deaktivieren
 ForceUserExpenseValidator=Überprüfung der Spesenabrechnung erzwingen
 ForceUserHolidayValidator=Gültigkeitsprüfer für Urlaubsanträge erzwingen
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 81cfe83913f..d0d0c79f4b2 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -46,7 +46,7 @@ SetHereVirtualHost= <u> Verwendung mit Apache / NGinx / ... </u> <br> Erstellen
 ExampleToUseInApacheVirtualHostConfig=Beispiel für die Einrichtung eines virtuellen Apache-Hosts:
 YouCanAlsoTestWithPHPS=<u>Verwendung mit eingebettetem PHP-Server</u><br>In der Entwicklungsumgebung können Sie die Site mit dem eingebetteten PHP-Webserver (PHP 5.5 erforderlich) testen, indem Sie <br><strong>php -S 0.0.0.0:8080 -t %s</strong> ausführen.
 YouCanAlsoDeployToAnotherWHP=<u>Betreibe deine Website mit einem anderen Dolibarr Hosting-Anbieter</u><br>Wenn kein Apache oder NGinx Webserver online verfügbar ist, kann deine Website exportiert und importiert werden und zu einer anderen Dolibarr Instanz umziehen, die durch einen anderen Dolibarr Hosting-Anbieter mit kompletter Integration des Webseiten-Moduls bereitgestellt wird. Eine Liste mit Dolibarr Hosting-Anbietern ist hier abufbar <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Überprüfen Sie auch, ob der Benutzer des virtuellen Hosts (z.B. www-daten) über die Berechtigungen <strong> %s </strong> für Dateien in <br> <strong> %s</strong>verfügt
 ReadPerm=Lesen
 WritePerm=Schreiben
 TestDeployOnWeb=Test/Bereitstellung im Web
@@ -137,11 +137,11 @@ PagesRegenerated=%s Seite(n) / Container neu generiert
 RegenerateWebsiteContent=Generieren Sie Website-Cache-Dateien neu
 AllowedInFrames=In Frames erlaubt
 DefineListOfAltLanguagesInWebsiteProperties=Definiere eine Liste aller verfügbaren Sprachen in den Website-Eigenschaften.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap generiert
+GenerateSitemaps=Generieren Sie eine Website-Sitemap-Datei
+ConfirmGenerateSitemaps=Wenn Sie dies bestätigen, löschen Sie die vorhandene Sitemap-Datei ...
+ConfirmSitemapsCreation=Bestätigen Sie die Sitemap-Generierung
+SitemapGenerated=Sitemap-Datei <b> %s </b> generiert
 ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconType=Favicon muss png sein
+ErrorFaviconSize=Favicon muss die Größe 16x16, 32x32 oder 64x64 haben
+FaviconTooltip=Laden Sie ein Bild hoch, das ein PNG sein muss (16x16, 32x32 oder 64x64).
diff --git a/htdocs/langs/de_DE/zapier.lang b/htdocs/langs/de_DE/zapier.lang
index 708a80255dd..f3a7595f87e 100644
--- a/htdocs/langs/de_DE/zapier.lang
+++ b/htdocs/langs/de_DE/zapier.lang
@@ -17,5 +17,5 @@ ModuleZapierForDolibarrName = Zapier für Dolibarr
 ModuleZapierForDolibarrDesc = Modul: Zapier für Dolibarr
 ZapierForDolibarrSetup=Zapier für Dolibarr einrichten
 ZapierDescription=Schnittstelle mit Zapier
-ZapierAbout=About the module Zapier
+ZapierAbout=Über das Modul Zapier
 ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
diff --git a/htdocs/langs/el_CY/accountancy.lang b/htdocs/langs/el_CY/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/el_CY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/el_CY/admin.lang b/htdocs/langs/el_CY/admin.lang
index c5a529c1701..74ee870f906 100644
--- a/htdocs/langs/el_CY/admin.lang
+++ b/htdocs/langs/el_CY/admin.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/el_CY/cron.lang b/htdocs/langs/el_CY/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/el_CY/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/el_CY/modulebuilder.lang b/htdocs/langs/el_CY/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/el_CY/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 20c087472ee..169f7870426 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -16,17 +16,17 @@ ThisService=Αυτή η υπηρεσία
 ThisProduct=Αυτό το προϊόν
 DefaultForService=Προεπιλογή για υπηρεσία
 DefaultForProduct=Προεπιλογή για το προϊόν
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Προϊόν προς τρίτο
+ServiceForThisThirdparty=Υπηρεσία προς τρίτο
 CantSuggest=Δεν μπορώ να προτείνω
 AccountancySetupDoneFromAccountancyMenu=Η μεγαλύτερη ρύθμιση της λογιστικής γίνεται από το μενού %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=Διαμόρφωση της λογιστικής ενότητας (διπλή καταχώριση)
 Journalization=Περιοδικότητα
 Journals=Ημερολόγια
 JournalFinancial=Οικονομικά ημερολόγια
 BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών
 Chartofaccounts=Διάγραμμα λογαριασμών
-ChartOfSubaccounts=Chart of individual accounts
+ChartOfSubaccounts=Διάγραμμα μεμονωμένων λογαριασμών
 ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Τρέχον ειδικό λογαριασμό
 AssignDedicatedAccountingAccount=Νέος λογαριασμός προς ανάθεση
@@ -47,9 +47,9 @@ CountriesInEEC=Χώρες στην ΕΟΚ
 CountriesNotInEEC=Χώρες που δεν βρίσκονται στην ΕΟΚ
 CountriesInEECExceptMe=Χώρες στην ΕΟΚ εκτός από το %s
 CountriesExceptMe=Όλες οι χώρες εκτός από το %s
-AccountantFiles=Export source documents
+AccountantFiles=Εξαγωγή εγγράφων προέλευσης
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
+VueByAccountAccounting=Προβολή κατά λογιστικό λογαριασμό
 VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Κύριος λογαριασμός λογιστικής για πελάτες που δεν έχουν οριστεί στη ρύθμιση
@@ -202,7 +202,7 @@ Docref=Παραπομπή
 LabelAccount=Ετικέτα λογαριασμού
 LabelOperation=Λειτουργία ετικετών
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Κωδικός γράμματος
 Lettering=Γράμματα
 Codejournal=Ημερολόγιο
@@ -297,7 +297,7 @@ NoNewRecordSaved=Δεν υπάρχει πλέον ρεκόρ για να κάν
 ListOfProductsWithoutAccountingAccount=Κατάλογος προϊόντων που δεν δεσμεύονται σε κανένα λογιστικό λογαριασμό
 ChangeBinding=Αλλάξτε τη σύνδεση
 Accounted=Πληρώθηκε σε
-NotYetAccounted=Δεν έχει ακόμη καταλογιστεί στο βιβλίο
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Εμφάνιση εκπαιδευτικού προγράμματος
 NotReconciled=Δεν ταιριάζουν
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 1dcc70267fa..f8d1dab5376 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Αφαιρέστε/μετονομάστε το αρχείο <b>%s</b>
 RestoreLock=Επαναφέρετε το  αρχείο <b>%s</b>, με δικαίωμα ανάγνωσης μόνο, για να απενεργοποιηθεί οποιαδήποτε χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
 SecuritySetup=Διαχείριση Ασφάλειας
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Καθορίστε εδώ τις επιλογές που σχετίζονται με την ασφάλεια σχετικά με τη μεταφόρτωση αρχείων.
 ErrorModuleRequirePHPVersion=Λάθος, αυτή η ενότητα απαιτεί έκδοση PHP %s ή μεγαλύτερη
 ErrorModuleRequireDolibarrVersion=Λάθος, αυτό το module απαιτεί Dolibarr έκδοση %s ή μεγαλύτερη
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Χωρίς πρόταση πληρωμής
 NoActiveBankAccountDefined=Δεν έχει οριστεί ενεργός λογαριασμός τράπεζας
 OwnerOfBankAccount=Ιδιοκτήτης του λογαριασμού τράπεζας %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Εμφάνιση συνδέσμου link <strong>%s</strong>
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Συναγερμοί
 DelaysOfToleranceBeforeWarning=Καθυστέρηση πριν εμφανιστεί μια ειδοποίηση προειδοποίησης για:
 DelaysOfToleranceDesc=Ορίστε την καθυστέρηση πριν εμφανιστεί στην οθόνη το εικονίδιο ειδοποίησης %s στην οθόνη για το καθυστερημένο στοιχείο.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Εμφάνιση επαγγελματικής ταυτότητας με διευθύνσεις
 ShowVATIntaInAddress=Απόκρυψη ενδοκοινοτικού αριθμού ΦΠΑ με διευθύνσεις
 TranslationUncomplete=Ημιτελής μεταγλώττιση
@@ -2062,7 +2064,7 @@ UseDebugBar=Χρησιμοποιήστε τη γραμμή εντοπισμού
 DEBUGBAR_LOGS_LINES_NUMBER=Αριθμός τελευταίων γραμμών καταγραφής που διατηρούνται στην κονσόλα
 WarningValueHigherSlowsDramaticalyOutput=Προειδοποίηση, οι υψηλότερες τιμές επιβραδύνουν την δραματική παραγωγή
 ModuleActivated=Η ενότητα %s ενεργοποιείται και επιβραδύνει τη διεπαφή
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 083d6c75e3c..869392e158b 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -37,7 +37,7 @@ IbanValid=έγκυρο IBAN
 IbanNotValid=Μη έγκυρο IBAN
 StandingOrders=Direct debit orders
 StandingOrder=Παραγγελία άμεσης χρέωσης
-PaymentByDirectDebit=Payment by direct debit
+PaymentByDirectDebit=πληρωμή άμεσης χρέωσης
 PaymentByBankTransfers=Payments by credit transfer
 PaymentByBankTransfer=Payment by credit transfer
 AccountStatement=Κίνηση Λογαριασμού
@@ -109,13 +109,13 @@ SocialContributionPayment=Σίγουρα θέλετε να μαρκάρετε α
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Εσωτερική μεταφορά
-TransferDesc=Μεταφορά από έναν λογαριασμό σε άλλο, ο Dolibarr θα γράψει δύο εγγραφές (μια χρέωση στο λογαριασμό προέλευσης και μια πίστωση στο λογαριασμό-στόχος). Το ίδιο ποσό (εκτός από το σύμβολο), η ετικέτα και η ημερομηνία θα χρησιμοποιηθούν για αυτήν τη συναλλαγή)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Από
 TransferTo=Προς
 TransferFromToDone=Η μεταφορά από <b>%s</b> στον <b>%s</b> του <b>%s</b> %s έχει καταγραφεί.
-CheckTransmitter=Διαβιβαστής
+CheckTransmitter=Αποστολέας
 ValidateCheckReceipt=Επικύρωση αυτής της απόδειξης παραλαβής επιταγής;
-ConfirmValidateCheckReceipt=Είστε σίγουροι πως θέλετε να επικυρώσετε αυτή την απόδειξη παραλαβής επιταγής; Δεν μπορούν να γίνουν αλλαγές αφού γίνει αυτό.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Διαγραφή απόδειξης παραλαβής επιταγής;
 ConfirmDeleteCheckReceipt=Είστε σίγουροι πως θέλετε να διαγράψετε αυτή την απόδειξη παραλαβής επιταγής;
 BankChecks=Τραπεζικές Επιταγές
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Είστε βέβαιοι ότι θέλετε να δι
 ThisWillAlsoDeleteBankRecord=Αυτό θα διαγράψει επίσης την εισερχόμενη είσοδο στην τράπεζα
 BankMovements=Κινήσεις
 PlannedTransactions=Προγραμματισμένες καταχωρήσεις
-Graph=Γραφικά
+Graph=Graphs
 ExportDataset_banque_1=Τραπεζικές εγγραφές και αποδείξεις κατάθεσης
 ExportDataset_banque_2=Απόδειξη κατάθεσης
 TransactionOnTheOtherAccount=Συναλλαγή σε άλλο λογαριασμό
@@ -142,7 +142,7 @@ AllAccounts=Όλοι οι τραπεζικοί και ταμιακοί λογα
 BackToAccount=Επιστροφή στον λογαριασμό
 ShowAllAccounts=Εμφάνιση Όλων των Λογαριασμών
 FutureTransaction=Μελλοντική συναλλαγή. Δεν μπορεί να συμφιλιωθεί.
-SelectChequeTransactionAndGenerate=Επιλέξτε/Φίλτρο ελέγχου για να συμπεριλάβετε στην απόδειξη κατάθεσης και κάντε κλικ "δημιουργία".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή όπως: YYYYMM ή YYYYMMDD
 EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
 ToConciliate=Για να συμφιλιωθώ;
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index c65c89b3990..ae038097718 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Μετατρέψτε το επιπλέον ποσό π
 EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη
 EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή
 DisabledBecauseRemainderToPayIsZero=Ανενεργό λόγο μηδενικού υπολοίπου πληρωμής
-PriceBase=Τιμή βάσης
+PriceBase=Base price
 BillStatus=Κατάσταση τιμολογίου
 StatusOfGeneratedInvoices=Κατάσταση δημιουργηθέντων τιμολογίων
 BillStatusDraft=Πρόχειρο (απαιτείται επικύρωση)
@@ -454,7 +454,7 @@ RegulatedOn=Ρυθμιζόμενη για
 ChequeNumber=Αριθμός Επιταγής
 ChequeOrTransferNumber=Αρ. Επιταγής/Μεταφοράς
 ChequeBordereau=Check schedule
-ChequeMaker=Έλεγχος/Μεταφορά διαβιβαστής
+ChequeMaker=Check/Transfer sender
 ChequeBank=Τράπεζα Επιταγής
 CheckBank=Επιταγή
 NetToBePaid=Φόρος προς πληρωμή
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index 4f0e98e4b5e..500ad99dc8d 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Σελιδοδείκτες: τελευταίες %s
 BoxOldestExpiredServices=Παλαιότερες ενεργές υπηρεσίες που έχουν λήξει
 BoxLastExpiredServices=Τελευταίες %s παλαιότερες επαφές με ενεργές υπηρεσίες λήξαν
 BoxTitleLastActionsToDo=Τελευταίες %s ενέργειες προς πραγμαοποίηση
-BoxTitleLastContracts=Τελευταίες τροποποιημένες συμβάσεις %s
-BoxTitleLastModifiedDonations=Τελευταία %s τροποποίηση δωρεών
-BoxTitleLastModifiedExpenses=Τελευταίες αναφορές τροποποιημένων δαπανών %s
-BoxTitleLatestModifiedBoms=Τα τελευταία %s τροποποιημένα BOMs
-BoxTitleLatestModifiedMos=Οι τελευταίες %s τροποποιημένες παραγγελίες κατασκευής
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Η γενική δραστηριότητα για (τιμολόγια, προσφορές, παραγγελίες)
 BoxGoodCustomers=Καλοί πελάτες
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 52d5e03abb0..e5887eb2a47 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Πάτωμα
 AddTable=Προσθήκη πίνακα
 Place=Θέση
 TakeposConnectorNecesary=Απαιτείται &#39;Connector TakePOS&#39;
-OrderPrinters=Παραγγείλετε εκτυπωτές
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Αναζήτηση προϊόντος
 Receipt=Παραλαβή
 Header=Επί κεφαλής
@@ -56,8 +57,9 @@ Paymentnumpad=Τύπος πλακέτας για να πληκτρολογήσε
 Numberspad=Αριθμητικό Pad
 BillsCoinsPad=Νομίσματα και τραπεζογραμμάτια Pad
 DolistorePosCategory=Δομοστοιχεία TakePOS και άλλες λύσεις POS για Dolibarr
-TakeposNeedsCategories=Το TakePOS χρειάζεται κατηγορίες προϊόντων για εργασία
-OrderNotes=Σημειώσεις Παραγγελίας
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Προεπιλεγμένος λογαριασμός που θα χρησιμοποιηθεί για πληρωμές σε
 NoPaimementModesDefined=Δεν έχει ρυθμιστεί η λειτουργία πρατηρίου που έχει οριστεί στη διαμόρφωση του TakePOS
 TicketVatGrouped=Ομαδικός ΦΠΑ ανά τιμή σε εισιτήρια | αποδείξεις
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Το τιμολόγιο έχει ήδη επικυρω
 NoLinesToBill=Δεν υπάρχουν γραμμές που να χρεώνουν
 CustomReceipt=Προσαρμοσμένη παραλαβή
 ReceiptName=Όνομα παραλαβής
-ProductSupplements=Συμπληρώματα προϊόντων
+ProductSupplements=Manage supplements of products
 SupplementCategory=Συμπλήρωμα κατηγορίας
 ColorTheme=Χρώμα θέματος
 Colorful=Πολύχρωμα
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Απλή και εύκολη εκτύπωση απόδειξης. Μόνο μερικές παράμετροι για τη διαμόρφωση της απόδειξης. Εκτύπωση μέσω προγράμματος περιήγησης.
 TakeposConnectorMethodDescription=Εξωτερική μονάδα με επιπλέον χαρακτηριστικά. Δυνατότητα εκτύπωσης από το σύννεφο.
 PrintMethod=Μέθοδος εκτύπωσης
-ReceiptPrinterMethodDescription=Ισχυρή μέθοδος με πολλές παραμέτρους. Πλήρως προσαρμόσιμο με πρότυπα. Δεν είναι δυνατή η εκτύπωση από το σύννεφο.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=Από τερματικό
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 68d647b9361..daa6bbcad43 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Ετικέτα/Κατηγορία
 Rubriques=Ετικέτες/Κατηγορίες
 RubriquesTransactions=Ετικέτες / Κατηγορίες συναλλαγών
 categories=Ετικέτες/Κατηγορίες
-NoCategoryYet=Δεν έχει δημιουργηθεί τέτοια ετικέτα/κατηγορία
+NoCategoryYet=No tag/category of this type has been created
 In=Μέσα
 AddIn=Προσθήκη σε
 modify=Αλλαγή
 Classify=Ταξινόμηση
 CategoriesArea=Πεδίο Ετικέτες/Κατηγορίες
-ProductsCategoriesArea=Πεδίο Προϊόντα/Υπηρεσίες Ετικέτες/Κατηγορίες
-SuppliersCategoriesArea=Περιοχές ετικετών / κατηγοριών προμηθευτών
-CustomersCategoriesArea=Πεδίο Ετικέτα/Κατηγορία Πελάτη
-MembersCategoriesArea=Πεδίο Ετικέτα/Κατηγορία Μελών
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Περιοχή ετικετών / κατηγοριών χρηστών
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Υποκατηγορίες
 CatList=Λίστα Ετικετών/Κατηγοριών
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Επιλέξτε κατηγορία
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Χρήση ή χειριστής για κατηγορίες
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 8169c283b42..4f0015bba4b 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Το όνομα τις εταιρίας %s υπάρχει ήδη. Επιλέξτε κάποιο άλλο.
 ErrorSetACountryFirst=Πρώτα πρέπει να οριστεί η χώρα
 SelectThirdParty=Επιλέξτε ένα Πελ./Προμ.
-ConfirmDeleteCompany=Είστε σίγουροι ότι θέλετε να διαγράψετε την εταιρία και όλες τις σχετικές πληροφορίες;
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Διαγραφή προσώπου επικοινωνίας
-ConfirmDeleteContact=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την επαφή και όλες τις πληροφορίες της;
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Νέο τρίτο μέρος
 MenuNewCustomer=Νέος πελάτης
 MenuNewProspect=Νέα Προοπτική
@@ -69,7 +69,7 @@ PhoneShort=Τηλέφωνο
 Skype=Skype
 Call=Κλήση
 Chat=Συνομιλία
-PhonePro=Επαγγ. τηλέφωνο
+PhonePro=Bus. phone
 PhonePerso=Προσωπ. τηλέφωνο
 PhoneMobile=Κιν. τηλέφωνο
 No_Email=Απορρίψτε μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου
@@ -78,7 +78,7 @@ Zip=Ταχ. Κώδικας
 Town=Πόλη
 Web=Ιστοσελίδα
 Poste= Θέση
-DefaultLang=Η προεπιλεγμένη γλώσσα
+DefaultLang=Default language
 VATIsUsed=Φόρος πωλήσεων που χρησιμοποιήθηκε
 VATIsUsedWhenSelling=Αυτό ορίζει αν αυτός ο τρίτος περιλαμβάνει φόρο πώλησης ή όχι όταν εκδίδει τιμολόγιο στους δικούς του πελάτες
 VATIsNotUsed=Ο φόρος επί των πωλήσεων δεν χρησιμοποιείται
@@ -331,7 +331,7 @@ CustomerCodeDesc=Κωδικός πελάτη, μοναδικός για κάθε
 SupplierCodeDesc=Κωδικός προμηθευτή, μοναδικό για όλους τους προμηθευτές
 RequiredIfCustomer=Απαιτείται αν το στοιχείο είναι πελάτης ή προοπτική
 RequiredIfSupplier=Απαιτείται αν κάποιος τρίτος είναι πωλητής
-ValidityControledByModule=Η ισχύς ελέγχεται από την ενότητα
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Κανόνες για αυτήν την ενότητα
 ProspectToContact=Προοπτική σε Επαφή
 CompanyDeleted="%s" διαγράφηκε από την βάση δεδομένων
@@ -439,12 +439,12 @@ ListSuppliersShort=Λίστα προμηθευτών
 ListProspectsShort=Κατάλογος προοπτικών
 ListCustomersShort=Κατάλογος πελατών
 ThirdPartiesArea=Τρίτα μέρη / Επαφές
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Σύνολο Τρίτων Μερών
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Ανοίξτε
 ActivityCeased=Κλειστό
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=Κατάλογος των προϊόντων/υπηρεσιών σε %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Τρέχον εκκρεμείς λογαριασμός
 OutstandingBill=Μέγιστο. για εκκρεμείς λογαριασμό
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Customer/supplier code is free. This code can be modified
 ManagingDirectors=Διαχειριστής (ες) ονομασία (CEO, διευθυντής, πρόεδρος ...)
 MergeOriginThirdparty=Διπλότυπο Πελ./Προμ. ( Πελ./Προμ. θέλετε να διαγραφεί)
 MergeThirdparties=Συγχώνευση  Πελ./Προμ.
-ConfirmMergeThirdparties=Είστε βέβαιοι ότι θέλετε να συγχωνεύσετε αυτό το τρίτο μέρος στην τρέχουσα; Όλα τα συνδεδεμένα αντικείμενα (τιμολόγια, παραγγελίες, ...) θα μεταφερθούν στο τρέχον τρίτο μέρος, τότε το τρίτο μέρος θα διαγραφεί.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Τα τρίτα μέρη έχουν συγχωνευθεί
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 7697b910499..79ee056c5dc 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Νέα έκπτωση
 NewCheckDeposit=Νέα κατάθεση επιταγής
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=Δεν υπάρχουν επιταγές που αναμένουν κατάθεση.
-DateChequeReceived=Check reception input date
+DateChequeReceived=Check receiving date
 NbOfCheques=Αριθμός ελέγχων
 PaySocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
index 35a09265da3..45292bcf911 100644
--- a/htdocs/langs/el_GR/ecm.lang
+++ b/htdocs/langs/el_GR/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 9cf45c8c449..6375725cdb3 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Κανένα σφάλμα
 # Errors
 ErrorButCommitIsDone=Σφάλματα που διαπιστώθηκαν αλλά παρόλα αυτά επικυρώνει
-ErrorBadEMail=Το μήνυμα ηλεκτρονικού ταχυδρομείου %s είναι λάθος
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=%s url είναι λάθος
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Είσοδος %s υπάρχει ήδη.
@@ -46,8 +46,8 @@ ErrorWrongDate=Η ημερομηνία δεν είναι σωστή!
 ErrorFailedToWriteInDir=Αποτυχία εγγραφής στον %s φάκελο
 ErrorFoundBadEmailInFile=Βρέθηκε εσφαλμένη σύνταξη e-mail για %s γραμμές στο αρχείο (%s γραμμή παράδειγμα με e-mail = %s)
 ErrorUserCannotBeDelete=Ο χρήστης δεν μπορεί να διαγραφεί. Ίσως σχετίζεται με οντότητες Dolibarr.
-ErrorFieldsRequired=Ορισμένα από τα απαιτούμενα πεδία δεν έχουν συμπληρωθεί.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Αποτυχία δημιουργίας φακέλου. Βεβαιωθείτε ότι ο Web server χρήστης έχει δικαιώματα να γράψει στο φάκελο εγγράφων του Dolibarr. Αν η <b>safe_mode</b> παράμετρος είναι ενεργοποιημένη για την PHP, ελέγξτε ότι τα αρχεία php του Dolibarr ανήκουν στον web server χρήστη (ή ομάδα).
 ErrorNoMailDefinedForThisUser=Δεν έχει οριστεί mail για αυτόν το χρήστη
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Η σελίδα / κοντέινερ
 ErrorDuringChartLoad=Σφάλμα κατά τη φόρτωση του γραφήματος λογαριασμών. Εάν δεν έχουν φορτωθεί μερικοί λογαριασμοί, μπορείτε να τις εισαγάγετε με μη αυτόματο τρόπο.
 ErrorBadSyntaxForParamKeyForContent=Κακή σύνταξη για παράμετρο κλειδί για ικανοποίηση. Πρέπει να έχει μια τιμή ξεκινώντας με %s ή %s
 ErrorVariableKeyForContentMustBeSet=Σφάλμα, πρέπει να οριστεί η σταθερά με το όνομα %s (με περιεχόμενο κειμένου για εμφάνιση) ή %s (με εξωτερική διεύθυνση URL για εμφάνιση).
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=Η διεύθυνση URL %s πρέπει να ξεκινά με http: // ή https: //
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Σφάλμα, η νέα αναφορά χρησιμοποιείται ήδη
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/el_GR/eventorganization.lang b/htdocs/langs/el_GR/eventorganization.lang
new file mode 100644
index 00000000000..82e04f0830e
--- /dev/null
+++ b/htdocs/langs/el_GR/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Ρυθμίσεις
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Πρόχειρο
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Ολοκληρωμένες
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/el_GR/knowledgemanagement.lang b/htdocs/langs/el_GR/knowledgemanagement.lang
new file mode 100644
index 00000000000..21723681aa0
--- /dev/null
+++ b/htdocs/langs/el_GR/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Ρυθμίσεις
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Πληροφορίες
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Πώληση
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 42009943751..feccce11ccf 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Στο χρήστη (ες)
 MailCC=Αντιγραφή σε
 MailToCCUsers=Αντιγραφή σε χρήστες
 MailCCC=Cached copy to
-MailTopic=Θέμα ηλεκτρονικού ταχυδρομείου
+MailTopic=Email subject
 MailText=Μήνυμα
 MailFile=Επισυναπτώμενα Αρχεία
 MailMessage=Κείμενο email
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Διαμόρφωση αποστολή email έχει ρυθμιστεί σε '%s'. Αυτή η λειτουργία δεν μπορεί να χρησιμοποιηθεί για να σταλθούν μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs2=Θα πρέπει πρώτα να πάτε, με έναν λογαριασμό διαχειριστή, στο μενού %s Αρχική - Ρύθμιση - Emails %s για να αλλάξετε την παράμετρο <strong>'%s'</strong> για να χρησιμοποιήσετε τη λειτουργία '%s'. Με αυτόν τον τρόπο, μπορείτε να μεταβείτε στις ρυθμίσεις του διακομιστή SMTP παρέχεται από τον Internet Service Provider και να χρησιμοποιήσετε τη Μαζική αποστολή ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs3=Αν έχετε οποιαδήποτε απορία σχετικά με το πώς να ρυθμίσετε το διακομιστή SMTP σας, μπορείτε να ζητήσετε στο %s.
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 529012bbdec..8b2ee02ce42 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Αποθήκευση και Νέο
 TestConnection=Δοκιμή Σύνδεσης
 ToClone=Κλωνοποίηση
 ConfirmCloneAsk=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε το αντικείμενο <b> %s </b>;
-ConfirmClone=Επιλέξτε τα δεδομένα που θέλετε να κλωνοποιήσετε:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Δεν καθορίστηκαν δεδομένα προς κλωνοποίηση.
 Of=του
 Go=Μετάβαση
@@ -246,7 +246,7 @@ DefaultModel=Προεπιλεγμένο πρότυπο εγγράφου
 Action=Ενέργεια
 About=Πληροφορίες
 Number=Αριθμός
-NumberByMonth=Αριθμός ανά μήνα
+NumberByMonth=Total reports by month
 AmountByMonth=Ποσό ανά μήνα
 Numero=Αριθμός
 Limit=Όριο
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=ΜΒ
 GigaBytes=GB
 TeraBytes=TB
-UserAuthor=Χρήστης της δημιουργίας
-UserModif=Χρήστης της τελευταίας ενημέρωσης
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Από
 From=Από
 FromDate=Από
 FromLocation=Από
-at=at
 to=πρός
 To=πρός
+ToDate=πρός
+ToLocation=πρός
+at=at
 and=και
 or=ή
 Other=Άλλο
@@ -843,7 +845,7 @@ XMoreLines=%s γραμμή (ές) κρυμμένη
 ShowMoreLines=Εμφάνιση περισσότερων / λιγότερων γραμμών
 PublicUrl=Δημόσια URL
 AddBox=Προσθήκη πεδίου
-SelectElementAndClick=Επιλέξτε ένα στοιχείο και κάντε κλικ στο %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Εκτύπωση του αρχείου %s
 ShowTransaction=Εμφάνιση καταχώρισης σε τραπεζικό λογαριασμό
 ShowIntervention=Εμφάνιση παρέμβασης
@@ -854,8 +856,8 @@ Denied=Άρνηση
 ListOf=Λίστα %s
 ListOfTemplates=Κατάλογος των προτύπων
 Gender=Φύλο
-Genderman=Άνδρας
-Genderwoman=Γυναίκα
+Genderman=Male
+Genderwoman=Female
 Genderother=Άλλο
 ViewList=Προβολή λίστας
 ViewGantt=Gantt θέα
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index c207035309f..aae93b47a00 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Σύνδεση σε ένα χρήστη του Dolibarr
 SetLinkToThirdParty=Σύνδεση σε ένα στοιχείο του Dolibarr
-MembersCards=Επιχειρηματικές κάρτες μελών
+MembersCards=Business cards for members
 MembersList=Λίστα μελών
 MembersListToValid=Λίστα πρόχειρων Μελών (προς επικύρωση)
 MembersListValid=Λίστα έγκυρων μελών
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Μέλη αναμένοντα για  λήψη
 MembersWithSubscriptionToReceiveShort=Εγγραφή για λήψη
 DateSubscription=Ημερομηνία συνδρομής
 DateEndSubscription=Ημερομηνία Λήξης Συνδρομής
-EndSubscription=Λήξη συνδρομής
+EndSubscription=Subscription Ends
 SubscriptionId=Κωδ. συνδρομής
 WithoutSubscription=Without subscription
 MemberId=id Μέλους
@@ -83,10 +83,10 @@ WelcomeEMail=Καλώς ήλθατε
 SubscriptionRequired=Απαιτείται Συνδρομή
 DeleteType=Διαγραφή
 VoteAllowed=Δικαίωμα ψήφου
-Physical=Φυσικό
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Επανενεργοποίηση
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Τερματίστε ένα μέλος
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα
 MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία
 MembersStatisticsByTown=Τα μέλη στατιστικών στοιχείων από την πόλη
 MembersStatisticsByRegion=Στατιστικά Μελών ανά περιοχή
-NbOfMembers=Αριθμός μελών
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Δεν επικυρώνονται τα μέλη βρέθηκαν
-MembersByCountryDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από τις χώρες. Graphic εξαρτάται, ωστόσο, στην υπηρεσία της Google online διάγραμμα και είναι διαθέσιμο μόνο αν μια σύνδεση στο Διαδίκτυο είναι λειτουργεί.
-MembersByStateDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από το κράτος / επαρχίες / Canton.
-MembersByTownDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από την πόλη.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Επιλέξτε στατιστικά στοιχεία που θέλετε να διαβάσετε ...
 MenuMembersStats=Στατιστικά
-LastMemberDate=Τελευταία ημερομηνία μέλους
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Φύση του μέλους
-MembersNature=Nature of members
-Public=Δημόσιο
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Νέο μέλος πρόσθεσε. Εν αναμονή έγκρισης
 NewMemberForm=Νέα μορφή μέλος
-SubscriptionsStatistics=Στατιστικά στοιχεία για τις συνδρομές
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Αριθμός συνδρομών
-AmountOfSubscriptions=Ποσό των συνδρομών
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Κύκλος εργασιών (για μια επιχείρηση), ή του προϋπολογισμού (για ένα ίδρυμα)
 DefaultAmount=Προεπιλογή ποσό της συνδρομής
 CanEditAmount=Επισκέπτης μπορεί να επιλέξει / επεξεργαστείτε το ποσό της συνδρομής του
 MEMBER_NEWFORM_PAYONLINE=Μετάβαση στην ολοκληρωμένη ηλεκτρονική σελίδα πληρωμής
 ByProperties=Εκ ΦΥΣΕΩΣ
 MembersStatisticsByProperties=Στατιστικά στοιχεία μελών κατά φύση
-MembersByNature=Αυτή η οθόνη εμφανίζει στατιστικά για τα μέλη του από τη φύση τους.
-MembersByRegion=Αυτή η οθόνη εμφανίζει στατιστικά για τα μέλη κατά περιοχή.
 VATToUseForSubscriptions=Συντελεστή ΦΠΑ που θα χρησιμοποιηθεί για τις συνδρομές
 NoVatOnSubscription=Δεν υπάρχει ΦΠΑ για συνδρομές
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Το προϊόν χρησιμοποιείται για τη γραμμή από συνδρομές στο τιμολόγιο: %s
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index 0bd432819a2..38271e678cc 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Λίστα καθορισμένων δικαιωμάτ
 SeeExamples=Δείτε παραδείγματα εδώ
 EnabledDesc=Προϋπόθεση να είναι ενεργό αυτό το πεδίο (Παραδείγματα: 1 ή $ conf-&gt; global-&gt; MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Εμφανίστε αυτό το πεδίο σε συμβατά έγγραφα PDF, μπορείτε να διαχειριστείτε τη θέση με το πεδίο "Θέση". <br/> Επί του παρόντος, γνωστά μοντέλα συμβατούς PDF είναι: Ερατοσθένης ο Κυρηναίος (σειρά), espadon (πλοίο), σφουγγάρι (τιμολόγια), κυανό (propal / εισαγωγικά), cornas (αύξων προμηθευτή) <br/> <br/> <strong> Για εγγράφου: </strong> <br/> 0 = δεν εμφανίζονται <br/> 1 = οθόνη <br/> 2 = εμφανιστεί μόνο αν δεν αδειάσει <br/> <br/> <strong> Για τις γραμμές εγγράφου: </strong> <br/> 0 = δεν εμφανίζονται <br/> 1 = εμφανίζονται σε μια στήλη <br/> 3 = οθόνη στη στήλη περιγραφή γραμμή μετά την περιγραφή <br/> 4 = οθόνη στη στήλη περιγραφή μετά την περιγραφή μόνο αν δεν είναι άδεια
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Εμφάνιση σε PDF
 IsAMeasureDesc=Μπορεί η τιμή του πεδίου να συσσωρευτεί για να πάρει ένα σύνολο σε λίστα; (Παραδείγματα: 1 ή 0)
 SearchAllDesc=Χρησιμοποιείται το πεδίο για την αναζήτηση από το εργαλείο γρήγορης αναζήτησης; (Παραδείγματα: 1 ή 0)
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 4bb80016fa5..ba4ae37fdda 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Εγκαταστήστε ή ενεργοποιήστε τη
 ProfIdShortDesc=<b>Καθ %s ταυτότητα</b> είναι μια ενημερωτική ανάλογα με τρίτη χώρα μέρος. <br> Για παράδειγμα, για <b>%s</b> χώρα, είναι <b>%s</b> κώδικα.
 DolibarrDemo=Dolibarr ERP / CRM demo
 StatsByNumberOfUnits=Στατιστικά στοιχεία για το σύνολο των ποσοτήτων προϊόντων / υπηρεσιών
-StatsByNumberOfEntities=Στατιστικά στοιχεία σχετικά με τον αριθμό των παραπέμποντων οντοτήτων (αριθμός τιμολογίου ή παραγγελία ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Αριθμός προτάσεων
 NumberOfCustomerOrders=Αριθμός παραγγελιών πωλήσεων
 NumberOfCustomerInvoices=Αριθμός τιμολογίων πελατών
@@ -289,4 +289,4 @@ PopuProp=Προϊόντα / Υπηρεσίες κατά δημοτικότητα
 PopuCom=Προϊόντα / Υπηρεσίες κατά δημοτικότητα στις παραγγελίες
 ProductStatistics=Στατιστικά Προϊόντων / Υπηρεσιών
 NbOfQtyInOrders=Ποσότητα σε παραγγελίες
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/el_GR/partnership.lang b/htdocs/langs/el_GR/partnership.lang
new file mode 100644
index 00000000000..053c669c718
--- /dev/null
+++ b/htdocs/langs/el_GR/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Ημερομηνία έναρξης
+DatePartnershipEnd=Ημερομηνία λήξης
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Πρόχειρο
+PartnershipAccepted = Αποδεκτή
+PartnershipRefused = Απορρίφθηκε
+PartnershipCanceled = Ακυρώθηκε
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index 8032b64030a..8a21232571c 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 4ba5147607a..e6d9bdc533d 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Υπηρεσίες προς πώληση μόνο
 ServicesOnPurchaseOnly=Υπηρεσίες μόνο για αγορά
 ServicesNotOnSell=Υπηρεσίες μη διαθέσιμες για αγορά ή πώληση
 ServicesOnSellAndOnBuy=Υπηρεσίες προς πώληση και για αγορά
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=%s τελευταία εγγεγραμμένα προϊόντα
 LastRecordedServices=%s τελευταία εγγεγραμμένες υπηρεσίες
 CardProduct0=Προϊόν
@@ -73,12 +73,12 @@ SellingPrice=Τιμή Πώλησης
 SellingPriceHT=Τιμή πώλησης (εκτός φόρου)
 SellingPriceTTC=Τιμή Πώλησης (με Φ.Π.Α)
 SellingMinPriceTTC=Ελάχιστη τιμή πώλησης (με φόρο)
-CostPriceDescription=Αυτό το πεδίο τιμών (εκτός φόρου) μπορεί να χρησιμοποιηθεί για την αποθήκευση του μέσου ποσού που το προϊόν αυτό κοστίζει στην εταιρεία σας. Μπορεί να είναι οποιαδήποτε τιμή εσείς υπολογίζετε, για παράδειγμα από τη μέση τιμή αγοράς συν το μέσο κόστος παραγωγής και διανομής.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Αυτή η τιμή θα μπορούσε να χρησιμοποιηθεί για υπολογισμό περιθωρίου.
 SoldAmount=Πωλήθηκε ποσό
 PurchasedAmount=Αγορασμένο ποσό
 NewPrice=Νέα Τιμή
-MinPrice=Ελάχιστη. τιμή πώλησης
+MinPrice=Min. selling price
 EditSellingPriceLabel=Επεξεργασία ετικέτας τιμής πώλησης
 CantBeLessThanMinPrice=Η τιμή πώλησης δεν μπορεί να είναι μικρότερη από την ορισμένη ελάχιστη τιμή πώλησης (%s χωρίς Φ.Π.Α.)
 ContractStatusClosed=Κλειστό
@@ -157,11 +157,11 @@ ListServiceByPopularity=Κατάλογος των υπηρεσιών κατά δ
 Finished=Κατασκευασμένο Προϊόν
 RowMaterial=Πρώτη ύλη
 ConfirmCloneProduct=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε το προϊόν ή την υπηρεσία <b>%s</b> ?
-CloneContentProduct=Κλωνοποιήστε όλες τις κύριες πληροφορίες του προϊόντος / υπηρεσίας
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Τιμές κλωνισμού
-CloneCategoriesProduct=Ετικέτες / κατηγορίες κλωνοποίησης συνδεδεμένες
-CloneCompositionProduct=Κλωνοποίηση εικονικού προϊόντος / υπηρεσίας
-CloneCombinationsProduct=Κλωνίστε τις παραλλαγές του προϊόντος
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Μεταχειρισμένο
 NewRefForClone=Ref. of new product/service
 SellingPrices=Τιμές Πώλησης
@@ -170,12 +170,12 @@ CustomerPrices=Τιμές Πελατών
 SuppliersPrices=Τιμές πωλητών
 SuppliersPricesOfProductsOrServices=Τιμές πωλητών (προϊόντων ή υπηρεσιών)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Χώρα προέλευσης
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Φύση προϊόντος (υλικό / τελικό)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Σύντομη ετικέτα
 Unit=Μονάδα
 p=Μονάδα
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index df429d6a631..eac3f4fcede 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Αντιπρόσωποι του έργου
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Όλα τα έργα που μπορώ να διαβάσω (δικά μου + δημόσια)
 AllProjects=Όλα τα έργα
-MyProjectsDesc=Αυτή η προβολή περιορίζεται στα έργα για τα οποία είστε μια επαφή
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα σας επιτρέπεται να διαβάσετε.
 TasksOnProjectsPublicDesc=Αυτή η προβολή παρουσιάζει όλες τις εργασίες στα έργα που επιτρέπεται να διαβάσετε.
 ProjectsPublicTaskDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να δείτε.
 ProjectsDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
 TasksOnProjectsDesc=Αυτή η προβολή παρουσιάζει όλες τις εργασίες σε όλα τα έργα (οι άδειες χρήστη σας επιτρέπουν να δείτε τα πάντα).
-MyTasksDesc=Αυτή η προβολή περιορίζεται σε έργα ή εργασίες για τα οποία είστε μια επαφή
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Είναι ορατά μόνο τα ανοιχτά έργα (δεν εμφανίζονται έργα σε μορφή πρόχειρης ή κλειστής).
 ClosedProjectsAreHidden=Τα κλειστά έργα δεν είναι ορατά.
 TasksPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να διαβάζουν.
 TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
 AllTaskVisibleButEditIfYouAreAssigned=Όλες οι εργασίες για πιστοποιημένα έργα είναι ορατές, αλλά μπορείτε να εισάγετε χρόνο μόνο για εργασία που έχει εκχωρηθεί σε επιλεγμένο χρήστη. Εκχωρήστε εργασία αν χρειαστεί να εισαγάγετε χρόνο σε αυτήν.
-OnlyYourTaskAreVisible=Μόνο τα καθήκοντα που σας έχουν εκχωρηθεί είναι ορατά. Αντιστοιχίστε την εργασία στον εαυτό σας αν δεν είναι ορατή και πρέπει να εισάγετε χρόνο σε αυτήν.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Καθήκοντα έργων
 ProjectCategories=Ετικέτες / κατηγορίες έργου
 NewProject=Νέο Έργο
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Δεν έχει ανατεθεί στην εργα
 NoUserAssignedToTheProject=Δεν έχουν ανατεθεί χρήστες σε αυτό το έργο
 TimeSpentBy=Χρόνος που πέρασε
 TasksAssignedTo=Οι εργασίες που έχουν εκχωρηθεί στο
-AssignTaskToMe=Ανάθεση εργασίας σε εμένα
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Αναθέστε εργασία σε %s
 SelectTaskToAssign=Επιλέξτε εργασία για εκχώρηση ...
 AssignTask=Ανάθεση
diff --git a/htdocs/langs/el_GR/recruitment.lang b/htdocs/langs/el_GR/recruitment.lang
index 6bd34b116f7..37df4ddae50 100644
--- a/htdocs/langs/el_GR/recruitment.lang
+++ b/htdocs/langs/el_GR/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index d4bf5fdbe92..5d3f3216540 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Είστε βέβαιοι ότι θέλετε να επι
 ConfirmCancelSending=Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτήν την αποστολή;
 DocumentModelMerou=Mérou A5 μοντέλο
 WarningNoQtyLeftToSend=Προσοχή, δεν υπάρχουν είδη που περιμένουν να σταλούν.
-StatsOnShipmentsOnlyValidated=Στατιστικά στοιχεία σχετικά με τις μεταφορές που πραγματοποιούνται μόνο επικυρωμένες. Χρησιμοποιείστε Ημερομηνία είναι η ημερομηνία της επικύρωσης της αποστολής (προγραμματισμένη ημερομηνία παράδοσης δεν είναι πάντα γνωστή).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Προγραμματισμένη ημερομηνία παράδοσης
 RefDeliveryReceipt=Παραλαβή παράδοσης αναφοράς
 StatusReceipt=Κατάσταση παραλαβής κατάστασης
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 81d1ee437c5..b8b4b99272f 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Δεν προκαθορισμένα προϊόντ
 DispatchVerb=Αποστολή
 StockLimitShort=Όριο για ειδοποιήσεις
 StockLimit=Όριο ειδοποιήσεων για το απόθεμα
-StockLimitDesc=(κενό) δεν σημαίνει προειδοποίηση. <br> 0 μπορεί να χρησιμοποιηθεί για μια προειδοποίηση μόλις το απόθεμα είναι άδειο.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Φυσικό απόθεμα
 RealStock=Real Χρηματιστήριο
 RealStockDesc=Το φυσικό / πραγματικό απόθεμα είναι το απόθεμα που βρίσκεται σήμερα στις αποθήκες.
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 75b5ce4c968..2591f46a45a 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Ο κωδικός άλλαξε σε: %s
 SubjectNewPassword=Ο νέος σας κωδικός για %s
 GroupRights=Άδειες ομάδας
 UserRights=Άδειες χρήστη
+Credentials=Credentials
 UserGUISetup=Ρύθμιση εμφάνισης χρήστη
 DisableUser=Απενεργοποίηση
 DisableAUser=Απενεργοποίηση ενός χρήστη
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Χρησιμοποιήστε είδος πεδίου για
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Χρησιμοποιήστε το OpenID για να συνδεθείτε
 WeeklyHours=Ώρες εργασίας (ανά εβδομάδα)
-ExpectedWorkedHours=Αναμενόμενες εργάσιμες ώρες ανά εβδομάδα
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Χρώμα του χρήστη
 DisabledInMonoUserMode=Απενεργοποιημένο σε κατάσταση συντήρησης
 UserAccountancyCode=Κωδικός λογαριασμού χρήστη
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Ημερομηνία λήξης απασχόλησης
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Δεν μπορείτε να απενεργοποιήσετε το δικό σας αρχείο χρήστη
 ForceUserExpenseValidator=Έγκριση έκθεσης εξόδου ισχύος
 ForceUserHolidayValidator=Έγκριση αίτησης για άδεια εξόδου
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index f9e92dbb4e8..616aedcc45e 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/en_AU/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 1897b645ea1..0980facb414 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -2,7 +2,6 @@
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
 DictionaryVAT=GST Rates or Sales Tax Rates
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OptionVatMode=GST due
 LinkColor=Colour of links
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/en_AU/bills.lang b/htdocs/langs/en_AU/bills.lang
index 33a4c6e7faa..b1e452b46c8 100644
--- a/htdocs/langs/en_AU/bills.lang
+++ b/htdocs/langs/en_AU/bills.lang
@@ -4,7 +4,6 @@ PaymentTypeShortCHQ=Cheque
 BankCode=BSB
 ChequeNumber=Cheque N°
 ChequeOrTransferNumber=Cheque/Transfer N°
-ChequeMaker=Cheque/Transfer transmitter
 ChequeBank=Bank of Cheque
 CheckBank=Cheque
 MenuCheques=Cheques
diff --git a/htdocs/langs/en_AU/compta.lang b/htdocs/langs/en_AU/compta.lang
index b5831e1cb0e..4844467ac01 100644
--- a/htdocs/langs/en_AU/compta.lang
+++ b/htdocs/langs/en_AU/compta.lang
@@ -7,7 +7,6 @@ ShowVatPayment=Show GST payment
 CheckReceipt=Cheque deposit
 CheckReceiptShort=Cheque deposit
 NewCheckDeposit=New cheque deposit
-DateChequeReceived=Cheque received date
 RulesResultInOut=- It includes the real payments made on invoices, expenses, GST and salaries. <br>- It is based on the payment dates of the invoices, expenses, GST and salaries. The donation date for donation.
 VATReportByCustomersInInputOutputMode=Report by the customer GST collected and paid
 SeeVATReportInInputOutputMode=See report <b>%sGST encasement%s</b> for a standard calculation
diff --git a/htdocs/langs/en_AU/cron.lang b/htdocs/langs/en_AU/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/en_AU/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/en_AU/modulebuilder.lang b/htdocs/langs/en_AU/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/en_AU/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/en_AU/website.lang b/htdocs/langs/en_AU/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/en_AU/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/en_CA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 95bcbef4e06..62dd510c5e0 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 LocalTax1Management=PST Management
 CompanyZip=Postal code
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 LDAPFieldZip=Postal code
 FormatZip=Postal code
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/en_CA/cron.lang b/htdocs/langs/en_CA/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/en_CA/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/en_CA/modulebuilder.lang b/htdocs/langs/en_CA/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/en_CA/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/en_CA/website.lang b/htdocs/langs/en_CA/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/en_CA/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index cada7ac7c5b..a003a87f629 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -52,6 +52,7 @@ XLineFailedToBeBinded=%s products/services were not linked to any finance accoun
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin sorting the page "Links to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin sorting the page "Links done" by the most recent elements
 ACCOUNTING_LENGTH_GACCOUNT=Length of the General Ledger accounts (If you set value to 6 here, the account '706' will appear as '706000' on screen)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_SELL_JOURNAL=Sales journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
 ACCOUNTING_ACCOUNT_SUSPENSE=Suspense account
@@ -90,7 +91,6 @@ NoNewRecordSaved=No more records to journalise
 ListOfProductsWithoutAccountingAccount=List of products not linked to any finance account
 ChangeBinding=Change the link
 Accounted=Posted in ledger
-NotYetAccounted=Not yet posted in ledger
 ApplyMassCategories=Apply bulk categories
 CategoryDeleted=Category for the finance account has been removed
 AccountingJournals=Finance journals
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 43e80d62c89..0ed13e41f0f 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -42,7 +42,6 @@ FollowingSubstitutionKeysCanBeUsed=<br>To learn how to create your .odt document
 Module50200Name=PayPal
 DictionaryAccountancyJournal=Finance journals
 CompanyZip=Postcode
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 LDAPFieldZip=Postcode
 GenbarcodeLocation=Barcode generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 FormatZip=Postcode
diff --git a/htdocs/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang
index a71bc9ac60c..a4c48f87c89 100644
--- a/htdocs/langs/en_GB/banks.lang
+++ b/htdocs/langs/en_GB/banks.lang
@@ -1,7 +1,5 @@
 # Dolibarr language file - Source file is en_US - banks
-CheckTransmitter=Drawer
 ValidateCheckReceipt=Validate this cheque receipt?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt? No change will be possible once this is done.
 DeleteCheckReceipt=Delete this cheque receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this cheque receipt?
 BankChecks=Bank cheques
@@ -9,7 +7,6 @@ BankChecksToReceipt=Cheques awaiting deposit
 BankChecksToReceiptShort=Cheques awaiting deposit
 ShowCheckReceipt=Show cheque deposit receipt
 NumberOfCheques=No. of cheques
-SelectChequeTransactionAndGenerate=Select/filter cheques to include in the cheque deposit receipt, then click "Create".
 InputReceiptNumber=Identify the bank statement to reconcile. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Specify a category in which to classify the records, if required
 ThenCheckLinesAndConciliate=Select the lines shown on the bank statement and click
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
index 9d5c847a07e..c3ad1ab6f65 100644
--- a/htdocs/langs/en_GB/bills.lang
+++ b/htdocs/langs/en_GB/bills.lang
@@ -13,7 +13,6 @@ PaymentTypeCHQ=Cheque
 PaymentTypeShortCHQ=Cheque
 ChequeNumber=Cheque N°
 ChequeOrTransferNumber=Cheque/Transfer N°
-ChequeMaker=Cheque/Transfer drawer
 ChequeBank=Bank of Cheque
 CheckBank=Cheque
 PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration.
diff --git a/htdocs/langs/en_GB/compta.lang b/htdocs/langs/en_GB/compta.lang
index e6fe573fe69..28171a89614 100644
--- a/htdocs/langs/en_GB/compta.lang
+++ b/htdocs/langs/en_GB/compta.lang
@@ -5,5 +5,4 @@ LastCheckReceiptShort=Last %s cheque receipts
 NewCheckDeposit=New cheque deposit
 NewCheckDepositOn=Create receipt for deposit to account: %s
 NoWaitingChecks=No cheques awaiting deposit.
-DateChequeReceived=Cheque reception date
 NbOfCheques=No. of cheques
diff --git a/htdocs/langs/en_GB/cron.lang b/htdocs/langs/en_GB/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/en_GB/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/en_GB/modulebuilder.lang b/htdocs/langs/en_GB/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/en_GB/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/en_GB/partnership.lang b/htdocs/langs/en_GB/partnership.lang
new file mode 100644
index 00000000000..82279c36553
--- /dev/null
+++ b/htdocs/langs/en_GB/partnership.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - partnership
+PartnershipCanceled =Cancelled
diff --git a/htdocs/langs/en_GB/users.lang b/htdocs/langs/en_GB/users.lang
index 33514bcb0de..a69267a2243 100644
--- a/htdocs/langs/en_GB/users.lang
+++ b/htdocs/langs/en_GB/users.lang
@@ -9,5 +9,4 @@ PermissionInheritedFromAGroup=Permission granted through inherited rights from o
 UserWillBeInternalUser=Created user will be an internal user (because they are not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because they are linked to a particular third party)
 NewUserPassword=Password changed for %s
-ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Colour for the user
diff --git a/htdocs/langs/en_GB/website.lang b/htdocs/langs/en_GB/website.lang
index 2119639ab04..ef8e16da6ad 100644
--- a/htdocs/langs/en_GB/website.lang
+++ b/htdocs/langs/en_GB/website.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - website
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge an SEO URL when the website is run from a Virtual host of a Web server (like Apache, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/en_IN/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index cc547cb0f77..4b3c42b80b1 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -8,7 +8,6 @@ Permission25=Send quotations
 Permission26=Close quotations
 Permission27=Delete quotations
 Permission28=Export quotations
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 PropalSetup=Quotation module setup
 ProposalsNumberingModules=Quotation numbering models
 ProposalsPDFModules=Quotation documents models
diff --git a/htdocs/langs/en_IN/cron.lang b/htdocs/langs/en_IN/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/en_IN/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/en_IN/modulebuilder.lang b/htdocs/langs/en_IN/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/en_IN/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/en_IN/website.lang b/htdocs/langs/en_IN/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/en_IN/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/en_SG/accountancy.lang b/htdocs/langs/en_SG/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/en_SG/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/en_SG/admin.lang b/htdocs/langs/en_SG/admin.lang
index 619ae5f8bd4..c1d306ec390 100644
--- a/htdocs/langs/en_SG/admin.lang
+++ b/htdocs/langs/en_SG/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_SG/cron.lang b/htdocs/langs/en_SG/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/en_SG/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/en_SG/modulebuilder.lang b/htdocs/langs/en_SG/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/en_SG/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/en_SG/website.lang b/htdocs/langs/en_SG/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/en_SG/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
index 96c58aaf400..1c3e22fbde4 100644
--- a/htdocs/langs/es_AR/accountancy.lang
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -16,3 +16,4 @@ Journals=Diarios Contables
 JournalFinancial=Diarios Financieros
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de la factura
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index f71ac440e90..831d264dea4 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -324,7 +324,6 @@ MaxSizeList=Longitud máxima para la lista
 DefaultMaxSizeList=Longitud máxima predeterminada para listas
 CompanyInfo=Empresa / Organización
 CompanyAddress=DIrección
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 DelaysOfToleranceBeforeWarning=Retardo antes de mostrar una alerta de advertencia por:
 MiscellaneousDesc=Todos los demás parámetros relacionados con la seguridad se definen aquí.
 LimitsSetup=Límites / configuración de precisión
diff --git a/htdocs/langs/es_AR/boxes.lang b/htdocs/langs/es_AR/boxes.lang
index 398b7e343ee..162e2d0a367 100644
--- a/htdocs/langs/es_AR/boxes.lang
+++ b/htdocs/langs/es_AR/boxes.lang
@@ -22,9 +22,6 @@ BoxTitleLastModifiedContacts=Contactos/Direcciones: últimos %s modificados
 BoxMyLastBookmarks=Favoritos: últimos %s
 BoxOldestExpiredServices=Servicios activos vencidos más antiguos
 BoxLastExpiredServices=Últimos %s contratos más antiguos con servicios activos vencidos
-BoxTitleLastModifiedDonations=Últimas donaciones modificadas %s
-BoxTitleLatestModifiedBoms=Últimas %s BOMs modificadas
-BoxTitleLatestModifiedMos=Últimas %s órdenes de fabricación modificadas
 BoxGlobalActivity=Actividad global (facturas, presupuestos, órdenes)
 FailedToRefreshDataInfoNotUpToDate=Error al actualizar flujo RSS. Última fecha de actualización exitosa: %s
 LastRefreshDate=Última fecha de actualización
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
index 675b49930b1..773401edc51 100644
--- a/htdocs/langs/es_AR/companies.lang
+++ b/htdocs/langs/es_AR/companies.lang
@@ -1,9 +1,7 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=El nombre de compañía %s ya existe. Elija otro diferente.
 ErrorSetACountryFirst=Establecer primero el país
-ConfirmDeleteCompany=¿Estás seguro que quieres eliminar esta empresa y toda su información vinculada?
 DeleteContact=Eliminar un contacto/dirección
-ConfirmDeleteContact=¿Estás seguro que quieres eliminar este contacto y toda su información vinculada?
 MenuNewThirdParty=Nuevo Tercero
 MenuNewCustomer=Nuevo Cliente
 MenuNewProspect=Nuevo Cliente Potencial
@@ -45,13 +43,11 @@ StateCode=Código postal del Estado/Provincia
 CountryCode=Código de País
 CountryId=ID de País
 Chat=Chate
-PhonePro=Teléfono profesional
 PhonePerso=Teléfono Persona
 PhoneMobile=Celular
 No_Email=Rechazar correos masivos
 Town=Ciudad
 Poste=Posición
-DefaultLang=Lenguaje por defect
 VATIsUsed=Aplica IVA
 VATIsUsedWhenSelling=Define si el tercero incluye impuesto de ventas o no cuando hace una factura a sus clientes
 VATIsNotUsed=No aplica IVA
@@ -182,7 +178,6 @@ CustomerCodeDesc=Código de cliente, único para cada cliente
 SupplierCodeDesc=Código de proveedor, único para cada proveedor
 RequiredIfCustomer=Es requerido si el tercero es un cliente o cliente potencial
 RequiredIfSupplier=Es requerido si el tercero es un proveedor
-ValidityControledByModule=Validez controlada por el módulo
 ThisIsModuleRules=Reglas para este módulo
 CompanyDeleted=Empresa "%s" eliminada de la base de datos
 ListOfContacts=Lista de contactos/direcciones
@@ -250,7 +245,6 @@ ListSuppliersShort=Lista de proveedores
 ListProspectsShort=Lista de Clientes Potenciales
 ListCustomersShort=Lista de clientes
 ThirdPartiesArea=Terceros/Contactos
-UniqueThirdParties=Total de terceros
 InActivity=Abierto
 ThirdPartyIsClosed=El tercero está cerrado.
 CurrentOutstandingBill=Factura pendiente actual
@@ -260,7 +254,6 @@ OrderMinAmount=Monto mínimo por orden
 LeopardNumRefModelDesc=El código es gratis. Este código puede modificarse en cualquier momento.
 ManagingDirectors=Nombre(s) del gerente (CEO, director, presidente...)
 MergeOriginThirdparty=Duplicar el tercero (tercero que quieres eliminar)
-ConfirmMergeThirdparties=¿Estás seguro que quieres fusionar este tercero con el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al tercero actual, luego se eliminará el tercero seleccionado.
 ThirdpartiesMergeSuccess=Los terceros se han fusionado
 SaleRepresentativeLogin=Usuario del vendedor
 SaleRepresentativeFirstname=Nombre del vendedor
diff --git a/htdocs/langs/es_AR/eventorganization.lang b/htdocs/langs/es_AR/eventorganization.lang
new file mode 100644
index 00000000000..e6b8e89584c
--- /dev/null
+++ b/htdocs/langs/es_AR/eventorganization.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - eventorganization
+EvntOrgDone =Hecho
diff --git a/htdocs/langs/es_AR/mails.lang b/htdocs/langs/es_AR/mails.lang
index 13fbbbe92c7..78901f8e358 100644
--- a/htdocs/langs/es_AR/mails.lang
+++ b/htdocs/langs/es_AR/mails.lang
@@ -9,7 +9,6 @@ MailToUsers=Para usuario(s)
 MailCC=Copiar a
 MailToCCUsers=Copiar a usuario(s)
 MailCCC=Colocar en copia a
-MailTopic=Asunto del correo
 MailFile=Archivos adjuntos
 MailMessage=Cuerpo del correo
 SubjectNotIn=Fuera del asunto
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index c34ffb3f0d7..0753aea804f 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -126,7 +126,6 @@ Save=Guardar
 SaveAs=Guarda Como
 TestConnection=Probar conexión
 ToClone=Clonar
-ConfirmClone=Elija datos que quiere clonar:
 NoCloneOptionsSpecified=Datos para clonar sin definir
 Run=Correr
 Show=Mostrar
@@ -187,8 +186,6 @@ HourShort=Hr
 Rate=Tarifa
 CurrencyRate=Tipo de cambio
 UseLocalTax=Incluido impuesto
-UserAuthor=Usuario de creación
-UserModif=Usuario de última actualización
 DefaultValue=Valor predeterminado
 DefaultValues=Valores/filtros/ordenación predeterminados
 UnitPriceHT=Precio unitario (neto)
@@ -290,6 +287,8 @@ Categories=Etiquetas/categorías
 Category=Etiqueta/categoría
 to=para
 To=para
+ToDate=para
+ToLocation=para
 Qty=Ctd
 ChangedBy=Cambiado por
 ResultKo=Falla
@@ -473,7 +472,6 @@ SetBankAccount=Definir Cuenta Bancaria
 AccountCurrency=Moneda de la cuenta
 PublicUrl=URL Público
 AddBox=Agregar casilla
-SelectElementAndClick=Seleccionar un elemento y hacer click en %s
 ShowTransaction=Mostrar entrada en cuenta bancaria
 ShowContract=Mostrar contacto
 GoIntoSetupToChangeLogo=Ir a Inicio - Configuración - Compañía para cambiar el logo o ir a Inicio - Configuración - Mostrar para esconderlo.
diff --git a/htdocs/langs/es_AR/members.lang b/htdocs/langs/es_AR/members.lang
index 1c0210878b3..37c636bf5ac 100644
--- a/htdocs/langs/es_AR/members.lang
+++ b/htdocs/langs/es_AR/members.lang
@@ -9,7 +9,6 @@ FundationMembers=Miembros de la fundación
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, usuario: <b>%s</b>) está vinculado al tercero <b>%s</b>. Debes quitar primero este vínculo pues un tercero no puede estar vinculado a más de un miembro (y viceversa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por motivos de seguridad, debe tener permisos para editar todos los usuarios para poder vincular a un miembro a un usuario que no sea suyo.
 SetLinkToThirdParty=Vincular a un tercedo de Dolibarr
-MembersCards=Cartas de presentación de miembros
 MembersList=Lista de miembros
 MembersListToValid=Lista de miembros en estado borrador (a ser validados)
 MembersListValid=Lista de miembros válidos
@@ -22,7 +21,6 @@ MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
 MembersWithSubscriptionToReceiveShort=Suscripción para recibir
 DateSubscription=Fecha de suscripción
 DateEndSubscription=Fecha de finalización de suscripción
-EndSubscription=Finalizar suscripción
 SubscriptionId=ID de Suscripción
 MemberId=ID Miembro
 MemberTypeId=ID Tipo de Miembro
@@ -123,27 +121,17 @@ LastSubscriptionDate=Fecha del último pago de suscripción
 LastSubscriptionAmount=Monto de la última suscripción
 MembersStatisticsByState=Estadísticas de miembros por estado/provincia
 MembersStatisticsByTown=Estadísticas de miembros por ciudad
-NbOfMembers=Cantidad de miembros
 NoValidatedMemberYet=No se encontraron miembros válidos
-MembersByCountryDesc=Esta pantalla muestra estadísticas de miembros por países. Sin embargo, el gráfico depende del servicio en línea de Google y está disponible solo si se está conectado a Internet.
-MembersByStateDesc=Esta pantalla muestra estadísticas de miembros por estado/provincias/región.
-MembersByTownDesc=Esta pantalla muestra estadísticas de miembros por ciudad.
 MembersStatisticsDesc=Elige las estadísticas que deseas visualizar ...
-LastMemberDate=Fecha de último miembro
 LatestSubscriptionDate=Fecha de última suscripción
-Public=La información es pública.
 NewMemberbyWeb=Nuevo miembro agregado. Esperando aprobación
 NewMemberForm=Formulario de miembro nuevo
-SubscriptionsStatistics=Estadísticas sobre suscripciones
 NbOfSubscriptions=Cantidad de suscripciones
-AmountOfSubscriptions=Monto de suscripciones
 TurnoverOrBudget=Volumen de negocios (para una empresa) o Presupuesto (para una fundación)
 DefaultAmount=Monto de suscripción por defecto
 CanEditAmount=El visitante puede elegir/editar el monto de su suscripción
 MEMBER_NEWFORM_PAYONLINE=Ve a la página de pago en línea
 MembersStatisticsByProperties=Estadísticas de miembros por naturaleza
-MembersByNature=Esta pantalla muestra estadísticas de miembros por naturaleza.
-MembersByRegion=Esta pantalla muestra estadísticas de miembros por región.
 VATToUseForSubscriptions=Tipo de IVA a utilizar para suscripciones
 NoVatOnSubscription=Sin IVA para suscripciones
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto utilizado para la línea de suscripción en la factura: %s
diff --git a/htdocs/langs/es_AR/modulebuilder.lang b/htdocs/langs/es_AR/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_AR/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_AR/partnership.lang b/htdocs/langs/es_AR/partnership.lang
new file mode 100644
index 00000000000..3909de28d26
--- /dev/null
+++ b/htdocs/langs/es_AR/partnership.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - partnership
+PartnershipCanceled =Cancelada
diff --git a/htdocs/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
index a429996096a..c06b4d9f528 100644
--- a/htdocs/langs/es_AR/products.lang
+++ b/htdocs/langs/es_AR/products.lang
@@ -24,7 +24,6 @@ ServicesOnSaleOnly=Servicios que se venden únicamente
 ServicesOnPurchaseOnly=Servicios que se adquieren únicamente
 ServicesNotOnSell=Servicios que no se venden ni se adquieren
 ServicesOnSellAndOnBuy=Servicios que se vender y se adquieren
-LastModifiedProductsAndServices=Últimos %s productos/servicios modificados
 MenuStocks=Inventarios(Stocks)
 Stocks=Inventarios y ubicaciones (almacenes) de productos
 OnSell=Para vender
diff --git a/htdocs/langs/es_AR/sendings.lang b/htdocs/langs/es_AR/sendings.lang
index d573200cc64..f1b78e4835b 100644
--- a/htdocs/langs/es_AR/sendings.lang
+++ b/htdocs/langs/es_AR/sendings.lang
@@ -26,7 +26,6 @@ ConfirmDeleteSending=¿Estás seguro que quieres eliminar este envío?
 ConfirmValidateSending=¿Estás seguro que quiere validar este envío con referencia <b>%s</b>?
 ConfirmCancelSending=¿Estás seguro que quieres cancelar este envío?
 WarningNoQtyLeftToSend=Advertencia, no hay productos esperando para ser enviados.
-StatsOnShipmentsOnlyValidated=Estadísticas realizadas sólo sobre viajes validados. La fecha utilizada es la de validación del viaje (la fecha de entrega prevista no siempre se conoce).
 RefDeliveryReceipt=Ref. comprobante de entrega
 StatusReceipt=Estado del comprobante de entrega
 DateReceived=Fecha de entrega
diff --git a/htdocs/langs/es_AR/users.lang b/htdocs/langs/es_AR/users.lang
index 4c77e324b5b..a558a71df39 100644
--- a/htdocs/langs/es_AR/users.lang
+++ b/htdocs/langs/es_AR/users.lang
@@ -69,7 +69,6 @@ DontDowngradeSuperAdmin=Solo un superadministrador puede degradar a un superadmi
 UseTypeFieldToChange=Use el campo Tipo para cambiar
 OpenIDURL=URL de OpenID
 LoginUsingOpenID=Utilizar OpenID para ingresar
-ExpectedWorkedHours=Horas trabajadas previstas por semana
 ColorUser=Color del usuario
 DisabledInMonoUserMode=Deshabilitado en modo mantenimiento
 UserAccountancyCode=Código contable del usuario
diff --git a/htdocs/langs/es_AR/website.lang b/htdocs/langs/es_AR/website.lang
index eaf6e953faa..ff1df53c2d8 100644
--- a/htdocs/langs/es_AR/website.lang
+++ b/htdocs/langs/es_AR/website.lang
@@ -1,5 +1,3 @@
 # Dolibarr language file - Source file is en_US - website
 ReadPerm=Leído
 WebsiteAccounts=Cuentas de sitio web
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/es_BO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index 619ae5f8bd4..c1d306ec390 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_BO/cron.lang b/htdocs/langs/es_BO/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/es_BO/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_BO/modulebuilder.lang b/htdocs/langs/es_BO/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_BO/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_BO/website.lang b/htdocs/langs/es_BO/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/es_BO/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index f6e63f0bef1..31b6e07ae1a 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -178,7 +178,6 @@ NoNewRecordSaved=No más registro para agendar
 ListOfProductsWithoutAccountingAccount=Lista de productos no vinculados a ninguna cuenta de contabilidad
 ChangeBinding=Cambiar la encuadernación
 Accounted=Contabilizado en el libro mayor
-NotYetAccounted=Aún no contabilizado en el libro mayor
 ShowTutorial=Tutorial de presentación
 ApplyMassCategories=Aplicar categorías de masa
 AddAccountFromBookKeepingWithNoCategories=Cuenta disponible aún no en el grupo personalizado.
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 3c5a1423a66..76c12eb049f 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -788,7 +788,6 @@ DoNotSuggestPaymentMode=No sugiera
 NoActiveBankAccountDefined=No se definió una cuenta bancaria activa
 OwnerOfBankAccount=Propietario de la cuenta bancaria %s
 BankModuleNotActive=Módulo de cuentas bancarias no habilitado
-ShowBugTrackLink=Mostrar  el link "<strong>%s</strong>"
 DelaysOfToleranceDesc=Establezca el retraso antes de que aparezca un icono de alerta %s en la pantalla para el elemento tardío.
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Orden no procesada
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Orden de compra no procesada
diff --git a/htdocs/langs/es_CL/banks.lang b/htdocs/langs/es_CL/banks.lang
index 5c4a24c2f6d..1a0a4af0766 100644
--- a/htdocs/langs/es_CL/banks.lang
+++ b/htdocs/langs/es_CL/banks.lang
@@ -74,12 +74,10 @@ DateConciliating=Fecha de conciliación
 SupplierInvoicePayment=Pago del vendedor
 WithdrawalPayment=Orden de pago de débito
 SocialContributionPayment=Pago de impuestos sociales/fiscales
-TransferDesc=Tras transferir de una cuenta a otra, Dolibarr escribirá dos registros (una cuenta de débito en origen y un crédito en una cuenta de destino). La misma cantidad (excepto el signo), la etiqueta y la fecha se utilizarán para esta transacción)
 TransferTo=A
 TransferFromToDone=Una transferencia de <b>%s</b> a <b>%s</b> de <b>%s</b> %s ha sido grabada.
-CheckTransmitter=Transmisor
+CheckTransmitter=Remitente
 ValidateCheckReceipt=Validar este recibo de cheque?
-ConfirmValidateCheckReceipt=¿Está seguro de que desea validar este recibo de cheque, no será posible realizar ningún cambio una vez que lo haya hecho?
 DeleteCheckReceipt=¿Eliminar este recibo de cheque?
 ConfirmDeleteCheckReceipt=¿Seguro que quieres eliminar este recibo de cheque?
 BankChecks=Cheques bancarios
@@ -102,7 +100,6 @@ Transactions=Actas
 BankTransactionLine=Entrada bancaria
 AllAccounts=Todas las cuentas bancarias y de efectivo
 FutureTransaction=Transacción futura. No se puede reconciliar.
-SelectChequeTransactionAndGenerate=Seleccione / filtrar cheques para incluir en el recibo de depósito de cheques y haga clic en &quot;Crear&quot;.
 InputReceiptNumber=Elija el extracto bancario relacionado con la conciliación. Use un valor numérico ordenable: AAAAMM o AAAAMMDD
 EventualyAddCategory=Eventualmente, especifique una categoría en la cual clasificar los registros
 ToConciliate=¿Para reconciliar?
diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
index 86d0036c381..4632c40cd60 100644
--- a/htdocs/langs/es_CL/bills.lang
+++ b/htdocs/langs/es_CL/bills.lang
@@ -80,7 +80,6 @@ ConvertExcessPaidToReduc=Convierte el exceso pagado en descuento disponible
 EnterPaymentReceivedFromCustomer=Ingrese el pago recibido del cliente
 EnterPaymentDueToCustomer=Hacer el pago debido al cliente
 DisabledBecauseRemainderToPayIsZero=Desactivado porque permanecer sin pagar es cero
-PriceBase=Base de precios
 BillStatusDraft=Borrador (debe ser validado)
 BillStatusPaid=Pagado
 BillStatusPaidBackOrConverted=Reembolso de nota de crédito o marcado como crédito disponible
@@ -329,7 +328,6 @@ RegulatedOn=Regulado en
 ChequeNumber=Verificar N °
 ChequeOrTransferNumber=Verificar / Transferir N °
 ChequeBordereau=Verifique el horario
-ChequeMaker=Portador Cheque/Transferencia
 ChequeBank=Banco de cheque
 CheckBank=Cheque
 PrettyLittleSentence=Acepte la cantidad de pagos adeudados por cheques emitidos a mi nombre como miembro de una asociación contable aprobada por la Administración Fiscal.
diff --git a/htdocs/langs/es_CL/boxes.lang b/htdocs/langs/es_CL/boxes.lang
index f59f9eb19a8..e484b2adb47 100644
--- a/htdocs/langs/es_CL/boxes.lang
+++ b/htdocs/langs/es_CL/boxes.lang
@@ -25,10 +25,6 @@ BoxMyLastBookmarks=Marcadores: el último %s
 BoxOldestExpiredServices=Servicios expirados activos más antiguos
 BoxLastExpiredServices=Últimos %s contactos más antiguos con servicios activos caducados
 BoxTitleLastActionsToDo=Últimas %s acciones para hacer
-BoxTitleLastModifiedDonations=Las últimas %s donaciones modificadas
-BoxTitleLastModifiedExpenses=Últimos informes de gastos modificados %s
-BoxTitleLatestModifiedBoms=Ultimas %s Listas de Materiales modificadas
-BoxTitleLatestModifiedMos=Últimas %s Ordenes de Fabricación modificadas
 BoxGlobalActivity=Actividad global (facturas, propuestas, pedidos)
 BoxTitleGoodCustomers=%s Buenos clientes
 BoxScheduledJobs=Trabajos programados
diff --git a/htdocs/langs/es_CL/cashdesk.lang b/htdocs/langs/es_CL/cashdesk.lang
index c81210b6a0b..a40760cf590 100644
--- a/htdocs/langs/es_CL/cashdesk.lang
+++ b/htdocs/langs/es_CL/cashdesk.lang
@@ -24,14 +24,12 @@ DolibarrReceiptPrinter=Impresora de recibos Dolibarr
 PointOfSale=Punto de venta
 CloseBill=Cerrar bill
 TakeposConnectorNecesary=Se requiere &#39;conector TakePOS&#39;
-OrderPrinters=Encargar impresoras
 Receipt=Recibo
 Header=Encabezamiento
 Footer=Pie de página
 TheoricalAmount=Cantidad teórica
 RealAmount=Cantidad real
 NbOfInvoices=N° de facturas
-OrderNotes=pedidos
 CashDeskBankAccountFor=Cuenta predeterminada para usar para pagos en
 EnableBarOrRestaurantFeatures=Habilitar características para bar o restaurante
 ConfirmDeletionOfThisPOSSale=¿Confirma usted la eliminación de esta venta actual?
diff --git a/htdocs/langs/es_CL/categories.lang b/htdocs/langs/es_CL/categories.lang
index 1d59becb058..e73f4a56a7a 100644
--- a/htdocs/langs/es_CL/categories.lang
+++ b/htdocs/langs/es_CL/categories.lang
@@ -3,17 +3,9 @@ Rubrique=Etiqueta / Categoría
 Rubriques=Etiquetas / Categorías
 RubriquesTransactions=Etiquetas / Categorías de transacciones
 categories=etiquetas / categorías
-NoCategoryYet=No se creó ninguna etiqueta / categoría de este tipo
 AddIn=Añadir
 modify=modificar
 CategoriesArea=Etiquetas / Categorías area
-ProductsCategoriesArea=Productos / Servicios tags / categorías area
-SuppliersCategoriesArea=Etiquetas de proveedores / área de categorías
-CustomersCategoriesArea=Etiquetas de clientes / área de categorías
-MembersCategoriesArea=Etiquetas de los miembros / área de categorías
-ContactsCategoriesArea=Etiquetas de contactos / categorías
-ProjectsCategoriesArea=Área de etiquetas / categorías de proyectos
-UsersCategoriesArea=Etiquetas de usuarios / área de categorías
 CatList=Lista de etiquetas / categorías
 NewCategory=Nueva etiqueta / categoría
 ModifCat=Modificar etiqueta / categoría
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index 5971bf2928e..cc1d9d7eda4 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -2,9 +2,7 @@
 ErrorCompanyNameAlreadyExists=El nombre de la empresa %s ya existe. Elija otro.
 ErrorSetACountryFirst=Establecer primero el país
 SelectThirdParty=Seleccione un tercero
-ConfirmDeleteCompany=¿Está seguro de que desea eliminar esta empresa y toda la información heredada?
 DeleteContact=Eliminar un contacto/dirección
-ConfirmDeleteContact=¿Está seguro de que desea eliminar este contacto y toda la información heredada?
 MenuNewThirdParty=Nueva tercera parte
 MenuNewProspect=Nueva perspectiva
 MenuNewSupplier=Nuevo vendedor
@@ -130,7 +128,6 @@ CustomerCodeDesc=Código de cliente, único para todos los clientes.
 SupplierCodeDesc=Código de proveedor, único para todos los proveedores
 RequiredIfCustomer=Obligatorio si un tercero es un cliente o prospecto
 RequiredIfSupplier=Requerido si un tercero es un vendedor
-ValidityControledByModule=Validez controlada por módulo
 ProspectToContact=Perspectiva de contactar
 CompanyDeleted=La compañía "%s" eliminada de la base de datos.
 ListOfContacts=Lista de contactos/direcciones
@@ -197,10 +194,8 @@ ListSuppliersShort=Lista de vendedores
 ListProspectsShort=Lista de prospectos
 ListCustomersShort=Lista de clientes
 ThirdPartiesArea=Terceros / Contactos
-UniqueThirdParties=Total de Terceros
 InActivity=Abierto
 ThirdPartyIsClosed=Tercero está cerrado
-ProductsIntoElements=Lista de productos / servicios en %s
 CurrentOutstandingBill=Factura pendiente actual
 OutstandingBill=Max. por factura pendiente
 OutstandingBillReached=Max. por la factura pendiente alcanzado
@@ -208,7 +203,6 @@ OrderMinAmount=Monto mínimo para la orden
 LeopardNumRefModelDesc=El código es libre. Este código se puede modificar en cualquier momento.
 ManagingDirectors=Nombre del gerente (CEO, director, presidente ...)
 MergeOriginThirdparty=Tercero duplicado (tercero que desea eliminar)
-ConfirmMergeThirdparties=¿Está seguro de que desea fusionar este tercero con el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al tercero actual, luego se eliminará el tercero.
 ThirdpartiesMergeSuccess=Los terceros se han fusionado
 SaleRepresentativeLogin=Inicio de sesión del representante de ventas
 SaleRepresentativeFirstname=Nombre del representante de ventas
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index b2d4c4a2b91..9cc981391c1 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -107,7 +107,6 @@ NewCheckReceipt=Nuevo descuento
 NewCheckDeposit=Nuevo depósito de cheque
 NewCheckDepositOn=Crear recibo para el depósito en la cuenta: %s
 NoWaitingChecks=No hay cheques pendientes de depósito.
-DateChequeReceived=Verificar fecha de recepción
 NbOfCheques=No. de cheques
 PaySocialContribution=Pagar un impuesto social / fiscal
 DeleteSocialContribution=Eliminar un pago de impuestos sociales o fiscales
diff --git a/htdocs/langs/es_CL/errors.lang b/htdocs/langs/es_CL/errors.lang
index 5eb96141ab7..1f86aa0569b 100644
--- a/htdocs/langs/es_CL/errors.lang
+++ b/htdocs/langs/es_CL/errors.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - errors
 NoErrorCommitIsDone=Sin error, nos comprometemos
 ErrorButCommitIsDone=Errores encontrados pero validamos a pesar de esto
-ErrorBadEMail=Correo electrónico %s es incorrecto
-ErrorBadUrl=Url %s está mal
 ErrorBadValueForParamNotAString=Mal valor para su parámetro En general, se agrega cuando falta la traducción.
 ErrorLoginAlreadyExists=Login %s ya existe.
 ErrorRecordNotFound=Registro no encontrado.
@@ -34,8 +32,6 @@ ErrorBadDateFormat=El valor '%s' tiene formato de fecha incorrecto
 ErrorFailedToWriteInDir=Error al escribir en el directorio %s
 ErrorFoundBadEmailInFile=Se encontró una sintaxis de correo electrónico incorrecta para %s líneas en el archivo (línea de ejemplo %s con correo electrónico = %s)
 ErrorUserCannotBeDelete=El usuario no puede ser eliminado. Tal vez esté asociado a entidades dolibarr.
-ErrorFieldsRequired=Algunos campos requeridos no fueron completados.
-ErrorSubjectIsRequired=El tema del correo electrónico es obligatorio
 ErrorFailedToCreateDir=Error al crear un directorio. Compruebe que el usuario del servidor web tenga permisos para escribir en el directorio de documentos de Dolibarr. Si el parámetro <b> safe_mode </ b> está habilitado en este PHP, verifique que los archivos php de Dolibarr sean propiedad del usuario (o grupo) del servidor web.
 ErrorNoMailDefinedForThisUser=Sin correo definido para este usuario
 ErrorFeatureNeedJavascript=Esta característica necesita javascript para activarse para funcionar. Cambie esto en la configuración - visualización.
diff --git a/htdocs/langs/es_CL/mails.lang b/htdocs/langs/es_CL/mails.lang
index a65acf18f23..8b67f03a848 100644
--- a/htdocs/langs/es_CL/mails.lang
+++ b/htdocs/langs/es_CL/mails.lang
@@ -8,7 +8,6 @@ MailToUsers=Para el usuario(s)
 MailCC=Copiar a
 MailToCCUsers=Copiar a los usuario(s)
 MailCCC=Copia en caché para
-MailTopic=Tema de correo electrónico
 MailFile=Archivos adjuntos
 MailMessage=Cuerpo del correo electronico
 SubjectNotIn=No en asunto
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 71be0dfd838..f67ea6b4eee 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -115,7 +115,6 @@ Save=Guardar
 SaveAs=Guardar como
 TestConnection=Conexión de prueba
 ToClone=Clonar
-ConfirmClone=Elija los datos que desea clonar:
 NoCloneOptionsSpecified=No hay datos para clonar definidos.
 Run=correr
 Show=Mostrar
@@ -139,7 +138,6 @@ DateOfLine=Fecha de la linea
 Model=Plantilla de documento
 DefaultModel=Plantilla de documento predeterminada
 Action=Evento
-NumberByMonth=Cantidad Mensual
 AmountByMonth=Monto por mes
 Logout=Cerrar sesión
 NoLogoutProcessWithAuthMode=Sin función de desconexión aplicativa con modo de autenticación <b>%s</b>
@@ -168,7 +166,6 @@ Tomorrow=mañana
 MinuteShort=Minnesota
 Rate=Tasa
 UseLocalTax=Incluye impuestos
-UserAuthor=Usuario de creación
 b=segundo.
 Mb=megabyte
 Tb=Tuberculosis
@@ -264,6 +261,8 @@ NotYetAvailable=No disponible aún
 Categories=Etiquetas / categorías
 Category=Etiqueta / categoría
 To=para
+ToDate=para
+ToLocation=para
 Qty=Cantidad
 ChangedBy=Cambiado por
 ResultKo=Fracaso
@@ -427,7 +426,6 @@ SetDemandReason=Establecer fuente
 AccountCurrency=Cuenta de dinero
 XMoreLines=%slíneas ocultas
 AddBox=Agregar caja
-SelectElementAndClick=Seleccione un elemento y haga clic en %s
 PrintFile=Imprimir archivo %s
 ShowTransaction=Mostrar entrada en cuenta bancaria
 GoIntoSetupToChangeLogo=Vaya a Inicio - Configuración - Compañía para cambiar el logotipo o vaya a Inicio - Configuración - Mostrar para ocultar.
diff --git a/htdocs/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang
index 64ee25cbe89..3d8c279e275 100644
--- a/htdocs/langs/es_CL/members.lang
+++ b/htdocs/langs/es_CL/members.lang
@@ -10,7 +10,6 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razones de seguridad, debe tener permiso para editar a todos los usuarios para poder vincular a un miembro con un usuario que no es el suyo.
 SetLinkToUser=Enlace a un usuario de Dolibarr
 SetLinkToThirdParty=Enlace a un tercero de Dolibarr
-MembersCards=Tarjetas de socios
 MembersList=Lista de miembros
 MembersListToValid=Lista de miembros del borrador (por validar)
 MembersListValid=Lista de miembros válidos
@@ -21,7 +20,6 @@ MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
 MembersWithSubscriptionToReceiveShort=Suscripción para recibir
 DateSubscription=Fecha de suscripción
 DateEndSubscription=Fecha de finalización de la suscripción
-EndSubscription=Terminar suscripción
 SubscriptionId=Id de suscripción
 MemberId=Identificación de miembro
 MemberTypeId=ID de tipo de miembro
@@ -52,7 +50,6 @@ NoTypeDefinedGoToSetup=Ningún tipo de miembro definido. Ir al menú "Tipos de m
 WelcomeEMail=Correo de bienvenida
 SubscriptionRequired=Suscripción requerida
 VoteAllowed=Voto permitido
-Reenable=Rehabilitar
 ResiliateMember=Terminar un miembro
 ConfirmResiliateMember=¿Estás seguro de que quieres cancelar este miembro?
 ConfirmDeleteMember=¿Seguro que quieres eliminar este miembro (Eliminar un miembro eliminará todas sus suscripciones)?
@@ -117,25 +114,17 @@ LastSubscriptionAmount=Cantidad de la última suscripción
 MembersStatisticsByState=Estadísticas de miembros por estado / provincia
 MembersStatisticsByTown=Estadísticas de miembros por ciudad
 NoValidatedMemberYet=No se encontraron miembros validados
-MembersByCountryDesc=Esta pantalla muestra estadísticas de miembros por países. Sin embargo, el gráfico depende del servicio de gráficos en línea de Google y solo está disponible si funciona una conexión a Internet.
-MembersByStateDesc=Esta pantalla muestra las estadísticas de los miembros por estado / provincias / cantón.
-MembersByTownDesc=Esta pantalla muestra estadísticas de los miembros por ciudad.
 MembersStatisticsDesc=Elija las estadísticas que quiere leer ...
 MenuMembersStats=Estadística
 LatestSubscriptionDate=Última fecha de suscripción
-Public=La información es pública
 NewMemberbyWeb=Nuevo miembro agregado. Esperando aprobacion
 NewMemberForm=Nueva forma de miembro
-SubscriptionsStatistics=Estadísticas sobre suscripciones
 NbOfSubscriptions=Número de suscripciones
-AmountOfSubscriptions=Cantidad de suscripciones
 TurnoverOrBudget=Volumen de ventas (empresa) o Cotización (asociación o colectivo)
 DefaultAmount=Cantidad predeterminada de suscripción
 CanEditAmount=El visitante puede elegir / editar el monto de su suscripción
 MEMBER_NEWFORM_PAYONLINE=Salte en la página integrada de pago en línea
 MembersStatisticsByProperties=Estadísticas de miembros por naturaleza
-MembersByNature=Esta pantalla muestra estadísticas de los miembros por naturaleza.
-MembersByRegion=Esta pantalla muestra estadísticas de los miembros por región.
 VATToUseForSubscriptions=Tipo de IVA para suscripciones
 NoVatOnSubscription=Sin IVA para suscripciones.
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto utilizado para la línea de suscripción en la factura: %s
diff --git a/htdocs/langs/es_CL/modulebuilder.lang b/htdocs/langs/es_CL/modulebuilder.lang
index 079fb308880..062d82e135d 100644
--- a/htdocs/langs/es_CL/modulebuilder.lang
+++ b/htdocs/langs/es_CL/modulebuilder.lang
@@ -64,7 +64,6 @@ ListOfDictionariesEntries=Lista de entradas del diccionario
 ListOfPermissionsDefined=Lista de permisos definidos
 SeeExamples=Ver ejemplos aquí
 EnabledDesc=Condición para tener este campo activo (Ejemplos: 1 o $ conf-> global-> MYMODULE_MYOPTION)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 IsAMeasureDesc=¿Se puede acumular el valor de campo para obtener un total en la lista? (Ejemplos: 1 o 0)
 SearchAllDesc=¿Se utiliza el campo para realizar una búsqueda desde la herramienta de búsqueda rápida? (Ejemplos: 1 o 0)
 LanguageDefDesc=Ingrese en estos archivos, toda la clave y la traducción para cada archivo de idioma.
diff --git a/htdocs/langs/es_CL/other.lang b/htdocs/langs/es_CL/other.lang
index 2ac9c40e6ed..81002f31f7c 100644
--- a/htdocs/langs/es_CL/other.lang
+++ b/htdocs/langs/es_CL/other.lang
@@ -108,7 +108,6 @@ EnableGDLibraryDesc=Instale o habilite la biblioteca de GD en su instalación de
 ProfIdShortDesc=<b>Prof Id %s</b> es una información que depende del país de un tercero. <br> Por ejemplo, para el país <b>%s</b>, es el código<b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP / CRM
 StatsByNumberOfUnits=Estadísticas para suma de cantidad de productos / servicios
-StatsByNumberOfEntities=Estadísticas en número de entidades referidas (nº de factura, o pedido ...)
 NumberOfProposals=Número de propuestas
 NumberOfCustomerOrders=Número de órdenes de venta
 NumberOfCustomerInvoices=Número de facturas de clientes
diff --git a/htdocs/langs/es_CL/partnership.lang b/htdocs/langs/es_CL/partnership.lang
new file mode 100644
index 00000000000..56902c9ba1c
--- /dev/null
+++ b/htdocs/langs/es_CL/partnership.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - partnership
+DatePartnershipStart=Fecha inicial
+DatePartnershipEnd=Fecha final
+PartnershipCanceled =Cancelado
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index 9f3d2555af4..7795586ce04 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -38,11 +38,9 @@ UpdateLevelPrices=Actualizar precios para cada nivel
 SellingPriceHT=Precio de venta (sin IVA)
 SellingPriceTTC=Precio de venta (IVA incluido)
 SellingMinPriceTTC=Precio mínimo de venta (impuestos incluidos)
-CostPriceDescription=Este campo de precio (sin impuestos) se puede usar para almacenar el monto promedio que este producto le cuesta a su empresa. Puede ser cualquier precio que usted mismo calcule, por ejemplo, a partir del precio de compra promedio más el costo promedio de producción y distribución.
 CostPriceUsage=Este valor podría usarse para calcular el margen.
 SoldAmount=Cantidad vendida
 PurchasedAmount=Cantidad comprada
-MinPrice=Min. precio de venta
 EditSellingPriceLabel=Editar etiqueta de precio de venta
 CantBeLessThanMinPrice=El precio de venta no puede ser inferior al mínimo permitido para este producto (%s sin IVA). Este mensaje también puede aparecer si escribe un descuento demasiado importante.
 ErrorProductAlreadyExists=Un producto con referencia %s ya existe.
@@ -90,10 +88,6 @@ ListProductServiceByPopularity=Lista de productos/servicios por popularidad
 ListProductByPopularity=Lista de productos por popularidad
 ListServiceByPopularity=Lista de servicios por popularidad
 ConfirmCloneProduct=¿Está seguro que desea clonar el producto o servicio <b>%s</b>?
-CloneContentProduct=Clona toda la información principal del producto / servicio.
-CloneCategoriesProduct=Clonar etiquetas / categorías vinculadas
-CloneCompositionProduct=Clonar producto / servicio virtual
-CloneCombinationsProduct=Clonar variantes de productos
 ProductIsUsed=Este producto es usado
 NewRefForClone=Referencia de nuevo producto/servicio
 CustomerPrices=Precios de cliente
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index 7ef9525fbda..d456e3c3ba0 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -5,18 +5,15 @@ ProjectsArea=Área de proyectos
 SharedProject=Todos
 PrivateProject=Contactos del proyecto
 AllAllowedProjects=Todo el proyecto que puedo leer (mío + público)
-MyProjectsDesc=Esta vista está limitada a los proyectos para los que es contacto
 ProjectsPublicDesc=Esta vista presenta todos los proyectos que puede leer.
 TasksOnProjectsPublicDesc=Esta vista presenta todas las tareas en proyectos que puede leer.
 ProjectsPublicTaskDesc=Esta vista presenta todos los proyectos y tareas que puede leer.
 ProjectsDesc=Esta vista presenta todos los proyectos (sus permisos de usuario le otorgan permiso para ver todo).
 TasksOnProjectsDesc=Esta vista presenta todas las tareas en todos los proyectos (sus permisos de usuario le otorgan permiso para ver todo).
-MyTasksDesc=Esta vista se limita a proyectos o tareas para los que es contacto
 OnlyOpenedProject=Solo los proyectos abiertos son visibles (los proyectos en borrador o cerrados no son visibles).
 TasksPublicDesc=Esta vista presenta todos los proyectos y tareas que puede leer.
 TasksDesc=Esta vista presenta todos los proyectos y tareas (sus permisos de usuario le otorgan permiso para ver todo).
 AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas para proyectos calificados son visibles, pero puede ingresar la hora solo para la tarea asignada al usuario seleccionado. Asignar tarea si necesita ingresar tiempo en ella.
-OnlyYourTaskAreVisible=Solo las tareas asignadas a ti son visibles. Asigna la tarea a ti mismo si no está visible y si necesitas ingresarle tiempo.
 ProjectCategories=Etiquetas / categorías de proyecto
 ConfirmDeleteAProject=¿Seguro que quieres eliminar este proyecto?
 ConfirmDeleteATask=¿Seguro que quieres eliminar esta tarea?
@@ -128,7 +125,6 @@ ProjectMustBeValidatedFirst=El proyecto debe ser validado primero
 TimeAlreadyRecorded=Este es el tiempo que ya se ha registrado para esta tarea / día y el usuario %s
 NoUserAssignedToTheProject=No hay usuarios asignados a este proyecto.
 TimeSpentBy=Tiempo consumido por
-AssignTaskToMe=Asignarme una tarea
 AssignTaskToUser=Asignar tarea a %s
 SelectTaskToAssign=Seleccionar tarea para asignar ...
 ManageTasks=Usar proyectos para seguir tareas y / o informar el tiempo empleado (hojas de tiempo)
diff --git a/htdocs/langs/es_CL/sendings.lang b/htdocs/langs/es_CL/sendings.lang
index b09b9b53d2d..64b2889e310 100644
--- a/htdocs/langs/es_CL/sendings.lang
+++ b/htdocs/langs/es_CL/sendings.lang
@@ -27,7 +27,6 @@ ConfirmDeleteSending=¿Seguro que quieres eliminar este envío?
 ConfirmValidateSending=¿Estas seguro que quieres validar este envió con referencia <b>%s</b>?
 ConfirmCancelSending=¿Seguro que quieres cancelar este envío?
 WarningNoQtyLeftToSend=Advertencia, no hay productos esperando ser enviados.
-StatsOnShipmentsOnlyValidated=Estadísticas realizadas en envíos solo validadas. La fecha utilizada es la fecha de validación del envío (no siempre se conoce la fecha de entrega planificada).
 DateDeliveryPlanned=Fecha planificada de entrega
 RefDeliveryReceipt=Ref. Recibo de entrega
 StatusReceipt=Recibo de entrega del estado
diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang
index 46fffc7d68d..96a71f2b60e 100644
--- a/htdocs/langs/es_CL/stocks.lang
+++ b/htdocs/langs/es_CL/stocks.lang
@@ -55,7 +55,6 @@ StockDiffPhysicTeoric=Explicación de la diferencia entre stock físico y virtua
 NoPredefinedProductToDispatch=No hay productos predefinidos para este objeto. Por lo tanto, no se requiere envío en stock.
 DispatchVerb=Envío
 StockLimit=Límite de existencias para alerta
-StockLimitDesc=(vacío) significa que no hay advertencia. <br> 0 se puede utilizar como advertencia tan pronto como el stock esté vacío.
 PhysicalStock=Inventario FISICO
 RealStockDesc=El stock físico / real es el stock actualmente en los almacenes.
 RealStockWillAutomaticallyWhen=El stock real se modificará de acuerdo con esta regla (como se define en el módulo de Stock):
diff --git a/htdocs/langs/es_CL/users.lang b/htdocs/langs/es_CL/users.lang
index 71626be966d..fcdfa4649ab 100644
--- a/htdocs/langs/es_CL/users.lang
+++ b/htdocs/langs/es_CL/users.lang
@@ -75,7 +75,6 @@ HierarchicView=Vista Jerárquica
 UseTypeFieldToChange=Use el campo Tipo para cambiar
 OpenIDURL=URL OpenID
 LoginUsingOpenID=Use OpenID para iniciar sesión
-ExpectedWorkedHours=Horas trabajadas esperadas por semana
 ColorUser=Color del usuario
 DisabledInMonoUserMode=Desactivado en modo de mantenimiento
 UserAccountancyCode=Código de contabilidad del usuario
diff --git a/htdocs/langs/es_CL/website.lang b/htdocs/langs/es_CL/website.lang
index 874188e8088..24e649063d2 100644
--- a/htdocs/langs/es_CL/website.lang
+++ b/htdocs/langs/es_CL/website.lang
@@ -69,5 +69,3 @@ EditInLineOnOff=El modo &#39;Editar en línea&#39; es %s
 ShowSubContainersOnOff=El modo para ejecutar &#39;contenido dinámico&#39; es %s
 GlobalCSSorJS=Archivo global CSS / JS / Header del sitio web
 TranslationLinks=Enlaces de Traducción
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
index a1fb58e3305..48a19b88e51 100644
--- a/htdocs/langs/es_CO/accountancy.lang
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -12,17 +12,22 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo para el nombre del archivo.
 DefaultForService=Por defecto para el servicio
 DefaultForProduct=Predeterminado para producto
 CantSuggest=No puedo sugerir
+ConfigAccountingExpert=Configuración de la contabilidad del módulo (doble entrada)
 Journalization=Periodización
+Journals=Revistas
 JournalFinancial=Revistas financieras
 BackToChartofaccounts=Tabla de retorno de cuentas
 Chartofaccounts=Catálogo de cuentas
+ChartOfIndividualAccountsOfSubsidiaryLedger=Plan de cuentas individuales del libro auxiliar subsidiario
 CurrentDedicatedAccountingAccount=Cuenta dedicada actual
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de factura
 OverviewOfAmountOfLinesNotBound=Resumen de la cantidad de líneas no vinculadas a una cuenta contable
 OverviewOfAmountOfLinesBound=Resumen de la cantidad de líneas ya unidas a una cuenta contable
 DeleteCptCategory=Eliminar cuenta contable del grupo
+ConfirmDeleteCptCategory=¿Está seguro de que desea eliminar esta cuenta contable del grupo de cuentas contables?
 JournalizationInLedgerStatus=Estado de la periodización
+AlreadyInGeneralLedger=Ya transferido en diarios contables y libro mayor.
 GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del grupo de contabilidad personalizado
 DetailByAccount=Mostrar detalle por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero.
@@ -31,17 +36,21 @@ MainAccountForCustomersNotDefined=Cuenta contable principal para clientes no def
 MainAccountForSuppliersNotDefined=Cuenta de contabilidad principal para proveedores no definidos en la configuración.
 MainAccountForUsersNotDefined=Cuenta de contabilidad principal para usuarios no definidos en la configuración.
 MainAccountForVatPaymentNotDefined=Cuenta contable principal para el pago del IVA no definido en la configuración
+MainAccountForSubscriptionPaymentNotDefined=Cuenta de contabilidad principal para el pago de la suscripción no definida en la configuración
 AccountancyArea=Area de contabilidad
 AccountancyAreaDescActionOnce=Las siguientes acciones generalmente se ejecutan una sola vez, o una vez al año ...
 AccountancyAreaDescActionOnceBis=Se deben seguir los siguientes pasos para ahorrarle tiempo en el futuro, sugiriéndole la cuenta contable predeterminada correcta al realizar el registro por diario (escribiendo el registro en Revistas y Libro mayor)
 AccountancyAreaDescActionFreq=Las siguientes acciones generalmente se ejecutan cada mes, semana o día para compañías muy grandes ...
 AccountancyAreaDescJournalSetup=PASO %s: cree o verifique el contenido de su lista de revistas desde el menú %s
+AccountancyAreaDescChartModel=PASO %s: Verifique que exista un modelo de plan de cuentas o cree uno desde el menú %s
+AccountancyAreaDescChart=PASO %s: Seleccione y | o complete su plan de cuenta desde el menú %s
 AccountancyAreaDescVat=PASO %s: Defina cuentas contables para cada tasa de IVA. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescDefault=PASO %s: Defina cuentas de contabilidad predeterminadas. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescExpenseReport=PASO %s: Defina cuentas de contabilidad predeterminadas para cada tipo de informe de gastos. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescSal=PASO %s: Defina cuentas contables predeterminadas para el pago de salarios. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescContrib=PASO %s: Defina cuentas de contabilidad predeterminadas para gastos especiales (impuestos diversos). Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescDonation=PASO %s: Defina cuentas de contabilidad predeterminadas para donación. Para ello, utilice la entrada de menú %s.
+AccountancyAreaDescSubscription=PASO %s: Defina cuentas de contabilidad predeterminadas para la suscripción de miembros. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescMisc=PASO %s: Defina cuentas predeterminadas obligatorias y cuentas contables predeterminadas para transacciones misceláneas. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescLoan=PASO %s: Defina cuentas de contabilidad predeterminadas para préstamos. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescBank=PASO %s: Defina cuentas contables y código de diario para cada banco y cuentas financieras. Para ello, utilice la entrada de menú %s.
@@ -50,8 +59,11 @@ AccountancyAreaDescBind=PASO %s: verifique el enlace entre las líneas %s existe
 AccountancyAreaDescWriteRecords=PASO %s: Escriba transacciones en el Libro mayor. Para esto, vaya al menú <strong> %s </strong> y haga clic en el botón <strong> %s </strong>.
 AccountancyAreaDescAnalyze=PASO %s: agregue o edite transacciones existentes y genere informes y exportaciones.
 AccountancyAreaDescClosePeriod=PASO %s: Cierre el período para que no podamos realizar modificaciones en el futuro.
+TheJournalCodeIsNotDefinedOnSomeBankAccount=No se ha completado un paso obligatorio en la configuración (el diario de códigos contables no está definido para todas las cuentas bancarias)
 Selectchartofaccounts=Seleccionar plan de cuentas activo
 ChangeAndLoad=Cambio y carga
+SubledgerAccount=Cuenta de libro mayor auxiliar
+SubledgerAccountLabel=Etiqueta de cuenta del libro mayor auxiliar
 ShowAccountingAccount=Mostrar cuenta contable
 MenuDefaultAccounts=Cuentas por defecto
 MenuBankAccounts=cuentas bancarias
@@ -59,6 +71,9 @@ MenuVatAccounts=Vat cuentas
 MenuExpenseReportAccounts=Cuentas de informe de gastos
 MenuLoanAccounts=Cuentas de prestamo
 MenuProductsAccounts=Cuentas de productos
+MenuClosureAccounts=Cuentas de cierre
+MenuAccountancyClosure=Cierre
+Binding=Vinculante a cuentas
 CustomersVentilation=Encuadernación factura cliente
 SuppliersVentilation=Encuadernación factura de proveedor
 ExpenseReportsVentilation=Informe de gastos vinculante
@@ -67,6 +82,7 @@ UpdateMvts=Modificación de una transacción
 ValidTransaction=Validar transaccion
 Bookkeeping=Libro mayor
 ObjectsRef=Ref. Objeto fuente
+CAHTF=Proveedor de compra total antes de impuestos
 TotalExpenseReport=Informe de gastos totales
 InvoiceLines=Líneas de facturas a unir.
 InvoiceLinesDone=Líneas enlazadas de facturas.
@@ -88,27 +104,48 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la clasificación de la página "
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de productos y servicios en las listas después de x caracteres (Mejor = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar el formulario de descripción de la cuenta de productos y servicios en los listados después de x caracteres (Mejor = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas de contabilidad general (si establece el valor en 6 aquí, la cuenta '706' aparecerá como '706000' en la pantalla)
+ACCOUNTING_LENGTH_AACCOUNT=Longitud de las cuentas de contabilidad de terceros (si establece el valor en 6 aquí, la cuenta '401' aparecerá como '401000' en la pantalla)
+ACCOUNTING_MANAGE_ZERO=Permitir administrar diferentes números de ceros al final de una cuenta contable. Necesitado por algunos países (como Suiza). Si está desactivado (predeterminado), puede configurar los siguientes dos parámetros para pedirle a la aplicación que agregue ceros virtuales.
 BANK_DISABLE_DIRECT_INPUT=Deshabilitar el registro directo de la transacción en la cuenta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar borrador de exportación en la revista
+ACCOUNTANCY_COMBO_FOR_AUX=Habilite la lista combinada para la cuenta subsidiaria (puede ser lento si tiene muchos terceros)
 ACCOUNTING_SELL_JOURNAL=Diario de venta
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compra
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Revista miscelánea
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diario de informe de gastos
 ACCOUNTING_SOCIAL_JOURNAL=Revista social
 ACCOUNTING_HAS_NEW_JOURNAL=Tiene nuevo diario
+ACCOUNTING_RESULT_PROFIT=Cuenta contable de resultado (beneficio)
+ACCOUNTING_RESULT_LOSS=Cuenta contable de resultados (pérdida)
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta contable de transferencia bancaria transitoria
+TransitionalAccount=Cuenta de transferencia bancaria transitoria
 ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta contable de espera.
 DONATION_ACCOUNTINGACCOUNT=Cuenta contable para registrar donaciones.
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cuenta contable para registrar suscripciones
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Cuenta contable por defecto para registrar el depósito del cliente
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable por defecto para los productos comprados (se usa si no está definida en la hoja de producto)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los productos comprados en EEC (se usa si no está definido en la hoja de producto)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los productos comprados e importados fuera de la CEE (se utiliza si no está definido en la ficha del producto)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable por defecto para los productos vendidos (se usa si no se define en la hoja del producto)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cuenta contable por defecto para los productos vendidos en EEC (usado si no está definido en la hoja de producto)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cuenta contable por defecto para los productos vendidos y exportados fuera de la CEE (utilizado si no está definido en la hoja de producto)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta de contabilidad por defecto para los servicios comprados (se usa si no está definido en la hoja de servicio)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los servicios comprados en EEC (se usa si no está definida en la hoja de servicio)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los servicios comprados e importados fuera de EEC (usado si no está definido en la hoja de servicio)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta de contabilidad por defecto para los servicios vendidos (se usa si no se define en la hoja de servicio)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Cuenta de contabilidad por defecto para los servicios vendidos en EEC (usado si no está definido en la hoja de servicio)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Cuenta contable por defecto para los servicios vendidos y exportados fuera de EEC (usado si no está definido en la hoja de servicio)
 LabelAccount=Etiqueta de cuenta
 LabelOperation=Operación de etiquetas
 LetteringCode=Codigo de letras
 Codejournal=diario
+JournalLabel=Etiqueta de diario
 NumPiece=Número de pieza
 TransactionNumShort=Num. transacción
+GroupByAccountAccounting=Agrupar por cuenta del libro mayor
 AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Serán utilizados para informes contables personalizados.
 ByPredefinedAccountGroups=Por grupos predefinidos.
+DelMonth=Mes para eliminar
 DelYear=Año para borrar
 DelJournal=Diario para eliminar
 FinanceJournal=Revista de finanzas
@@ -120,13 +157,25 @@ ProductAccountNotDefined=Cuenta por producto no definido.
 FeeAccountNotDefined=Cuenta por tarifa no definida
 BankAccountNotDefined=Cuenta para banco no definida
 CustomerInvoicePayment=Pago de factura al cliente.
+ThirdPartyAccount=Cuenta de terceros
 NewAccountingMvt=Nueva transaccion
 NumMvts=Numero de transacción
 ListeMvts=Lista de movimientos
 ErrorDebitCredit=Débito y crédito no pueden tener un valor al mismo tiempo
 AddCompteFromBK=Añadir cuentas de contabilidad al grupo.
+ReportThirdParty=Lista de cuentas de terceros
+DescThirdPartyReport=Consulte aquí la lista de clientes y proveedores externos y sus cuentas contables
 ListAccounts=Listado de las cuentas contables.
+UnknownAccountForThirdparty=Cuenta de terceros desconocida. Usaremos %s
+UnknownAccountForThirdpartyBlocking=Cuenta de terceros desconocida. Error de bloqueo
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Cuenta de terceros no definida o desconocida. Usaremos %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Tercero desconocido y libro auxiliar no definido en el pago. Mantendremos vacío el valor de la cuenta del libro mayor auxiliar.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Cuenta de terceros no definida o desconocida. Error de bloqueo.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Cuenta de terceros desconocida y cuenta en espera no definida. Error de bloqueo
 PaymentsNotLinkedToProduct=Pago no vinculado a ningún producto / servicio.
+OpeningBalance=Saldo de apertura
+PcgtypeDesc=Los grupos de cuentas se utilizan como criterios de 'filtro' y 'agrupación' predefinidos para algunos informes contables. Por ejemplo, 'INGRESOS' o 'GASTOS' se utilizan como grupos para las cuentas contables de productos para crear el informe de gastos / ingresos.
+Reconcilable=Conciliable
 TotalVente=Rotación total antes de impuestos
 TotalMarge=Margen total de ventas
 DescVentilCustomer=Consulte aquí la lista de líneas de factura del cliente vinculadas (o no) a una cuenta contable del producto
@@ -134,10 +183,15 @@ DescVentilMore=En la mayoría de los casos, si utiliza productos o servicios pre
 DescVentilDoneCustomer=Consulte aquí la lista de las líneas de facturas de los clientes y su cuenta contable del producto.
 DescVentilTodoCustomer=Enlazar líneas de factura aún no vinculadas con una cuenta contable de producto
 ChangeAccount=Cambie la cuenta de contabilidad de producto / servicio para las líneas seleccionadas con la siguiente cuenta de contabilidad:
+DescVentilSupplier=Consulte aquí la lista de líneas de facturas de proveedores vinculadas o aún no vinculadas a una cuenta de contabilidad de productos (solo están visibles los registros que aún no se han transferido a la contabilidad)
+DescVentilDoneSupplier=Consulte aquí el listado de las líneas de facturas de proveedores y su cuenta contable
 DescVentilTodoExpenseReport=Líneas de informe de gastos de enlace no vinculadas con una cuenta contable de comisiones
 DescVentilExpenseReport=Consulte aquí la lista de líneas de informe de gastos vinculadas (o no) a una cuenta de contabilidad de comisiones.
 DescVentilExpenseReportMore=Si configura una cuenta contable según el tipo de líneas de informe de gastos, la aplicación podrá realizar toda la vinculación entre sus líneas de informe de gastos y la cuenta contable de su plan de cuentas, solo con un clic con el botón <strong> "%s" </strong>. Si la cuenta no se estableció en el diccionario de tarifas o si todavía tiene algunas líneas no vinculadas a ninguna cuenta, deberá realizar un enlace manual desde el menú "<strong> %s </strong>".
 DescVentilDoneExpenseReport=Consulte aquí la lista de líneas de informes de gastos y sus cuentas contables.
+DescClosure=Consulta aquí el número de movimientos por mes que no están validados y años fiscales ya abiertos
+NotAllMovementsCouldBeRecordedAsValidated=No todos los movimientos se pudieron registrar como validados
+DescValidateMovements=Se prohíbe cualquier modificación o eliminación de la escritura, las letras y las eliminaciones. Todas las entradas para un ejercicio deben ser validadas, de lo contrario no será posible cerrar
 AutomaticBindingDone=Encuadernación automática hecha
 ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta de contabilidad porque se usa
 MvtNotCorrectlyBalanced=Movimiento no equilibrado correctamente. Débito = %s | Crédito = %s
@@ -149,33 +203,66 @@ NoNewRecordSaved=No hay más récord para periodizar.
 ListOfProductsWithoutAccountingAccount=Lista de productos no vinculados a ninguna cuenta contable.
 ChangeBinding=Cambiar el enlace
 Accounted=Contabilizado en libro mayor
-NotYetAccounted=Aún no contabilizado en el libro mayor.
+ShowTutorial=Tutorial de presentación
+NotReconciled=No conciliado
+WarningRecordWithoutSubledgerAreExcluded=Advertencia, todas las operaciones sin una cuenta de libro auxiliar definida se filtran y excluyen de esta vista
+BindingOptions=Opciones de encuadernación
 ApplyMassCategories=Aplicar categorías de masa
+AddAccountFromBookKeepingWithNoCategories=Cuenta disponible que aún no está en el grupo personalizado
 CategoryDeleted=Se ha eliminado la categoría de la cuenta contable.
 AccountingJournals=Revistas contables
 AccountingJournal=Diario de contabilidad
 NewAccountingJournal=Nueva revista contable
+NatureOfJournal=Naturaleza de la revista
 AccountingJournalType1=Operaciones misceláneas
 AccountingJournalType5=Informe de gastos
 AccountingJournalType9=Ha-nuevo
 ErrorAccountingJournalIsAlreadyUse=Esta revista ya está en uso.
 AccountingAccountForSalesTaxAreDefinedInto=Nota: la cuenta contable del impuesto sobre las ventas se define en el menú <b> %s </b> - <b> %s </b>
+NumberOfAccountancyMovements=Numero de movimientos
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Deshabilitar la vinculación y la transferencia en la contabilidad de las ventas (las facturas de los clientes no se tendrán en cuenta en la contabilidad)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deshabilite la vinculación y transferencia en contabilidad en compras (las facturas de proveedores no se tendrán en cuenta en la contabilidad)
 ExportDraftJournal=Exportar borrador de revista
 Selectmodelcsv=Selecciona un modelo de exportación.
+Modelcsv_CEGID=Exportación para CEGID Expert Comptabilité
+Modelcsv_COALA=Exportación para Sage Coala
+Modelcsv_bob50=Exportación para Sage BOB 50
+Modelcsv_ciel=Exportación para Sage Ciel Compta o Compta Evolution
+Modelcsv_quadratus=Exportar para Quadratus QuadraCompta
+Modelcsv_ebp=Exportar para EBP
+Modelcsv_cogilog=Exportar para Cogilog
+Modelcsv_agiris=Exportación para Agiris
+Modelcsv_LDCompta=Exportar para LD Compta (v9) (prueba)
+Modelcsv_LDCompta10=Exportar para LD Compta (v10 y superior)
+Modelcsv_openconcerto=Exportar para OpenConcerto (prueba)
 Modelcsv_configurable=Exportar CSV Configurable
+Modelcsv_FEC=Exportar FEC
+Modelcsv_FEC2=Exportar FEC (con escritura de generación de fechas / documento invertido)
+Modelcsv_Sage50_Swiss=Exportación para Sage 50 Suiza
+Modelcsv_winfic=Exportar Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Exportar para Gestinum (v3)
 ChartofaccountsId=ID del plan de cuentas
 InitAccountancy=Contable inicial
 InitAccountancyDesc=Esta página se puede usar para inicializar una cuenta contable en productos y servicios que no tiene una cuenta contable definida para ventas y compras.
 DefaultBindingDesc=Esta página se puede usar para configurar una cuenta predeterminada para vincular el registro de transacciones sobre salarios de pago, donaciones, impuestos y IVA cuando no se haya establecido una cuenta contable específica.
+DefaultClosureDesc=Esta página se puede utilizar para configurar los parámetros utilizados para los cierres contables.
 OptionModeProductSell=Modo de ventas
+OptionModeProductSellIntra=Ventas de modo exportadas en la CEE
+OptionModeProductSellExport=Modo de ventas exportado a otros países
 OptionModeProductBuy=Compras de modo
+OptionModeProductBuyIntra=Compras de modo importadas en la CEE
+OptionModeProductBuyExport=Modo comprado importado de otros países
 OptionModeProductSellDesc=Mostrar todos los productos con cuenta contable para ventas.
+OptionModeProductSellIntraDesc=Mostrar todos los productos con cuenta contable para ventas en EEC.
 OptionModeProductBuyDesc=Mostrar todos los productos con cuenta contable para compras.
+OptionModeProductBuyExportDesc=Mostrar todos los productos con cuenta contable para otras compras extranjeras.
 CleanFixHistory=Eliminar el código de contabilidad de las líneas que no existen en los cuadros de cuenta
 CleanHistory=Restablecer todos los enlaces para el año seleccionado
 PredefinedGroups=Grupos predefinidos
 WithValidAccount=Con cuenta dedicada válida.
 ValueNotIntoChartOfAccount=Este valor de la cuenta contable no existe en el plan de cuentas.
+SaleEECWithVAT=Venta en EEC con IVA no nulo, por lo que suponemos que NO es una venta intracomunitaria y la cuenta sugerida es la cuenta estándar del producto.
+SaleEECWithoutVATNumber=Venta en CEE sin IVA, pero no se define el ID de IVA del tercero. Recurrimos a la cuenta de producto para las ventas estándar. Puede corregir el ID de IVA del tercero o la cuenta del producto si es necesario.
 SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos obligatorios de configuración no se realizaron, por favor complete
 ErrorNoAccountingCategoryForThisCountry=No hay grupo de cuentas contables disponible para el país %s (Consulte Inicio - Configuración - Diccionarios)
 ErrorInvoiceContainsLinesNotYetBounded=Intenta registrar en el diario algunas líneas de la factura <strong> %s </strong>, pero algunas otras líneas aún no están vinculadas a la cuenta contable. La periodización de todas las líneas de factura para esta factura se rechazan.
@@ -187,6 +274,9 @@ Binded=Líneas enlazadas
 ToBind=Líneas para unir
 UseMenuToSetBindindManualy=Líneas aún no enlazadas, use el menú <a href="%s"> %s </a> para hacer el enlace manualmente
 ImportAccountingEntries=Asientos contables
+FECFormatDebit=Débito (Débito)
+FECFormatCredit=Crédito (crédito)
+DateExport=Exportación de fecha
 WarningReportNotReliable=Advertencia, este informe no se basa en el Libro mayor, por lo que no contiene la transacción modificada manualmente en el Libro mayor. Si su publicación está actualizada, la vista de contabilidad es más precisa.
 ExpenseReportJournal=Diario de informe de gastos
 InventoryJournal=Diario de inventario
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index cc43022632d..2646b12f477 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -4,6 +4,8 @@ VersionLastInstall=Versión instalación inicial
 VersionLastUpgrade=Última versión de actualización
 VersionUnknown=Desconocido
 VersionRecommanded=Recomendado
+FileCheck=Comprobaciones de integridad del conjunto de archivos
+FileCheckDesc=Esta herramienta te permite verificar la integridad de los archivos y la configuración de tu aplicación, comparando cada archivo con el oficial. También se puede verificar el valor de algunas constantes de configuración. Puede utilizar esta herramienta para determinar si algún archivo ha sido modificado (por ejemplo, por un hacker).
 FileIntegrityIsOkButFilesWereAdded=La verificación de integridad de los archivos ha pasado, sin embargo, se han agregado algunos archivos nuevos.
 FileIntegritySomeFilesWereRemovedOrModified=La verificación de integridad de archivos ha fallado. Algunos archivos fueron modificados, eliminados o agregados.
 GlobalChecksum=Suma de control global
@@ -13,9 +15,11 @@ RemoteSignature=Firma remota remota (más confiable)
 FilesMissing=Archivos perdidos
 FilesAdded=Archivos Agregados
 FileCheckDolibarr=Comprobar la integridad de los archivos de la aplicación.
+AvailableOnlyOnPackagedVersions=El archivo local para la verificación de integridad solo está disponible cuando la aplicación se instala desde un paquete oficial
 XmlNotFound=Archivo de integridad xml de aplicación no encontrada
 SessionId=ID Sesión
 SessionSaveHandler=Manejador para grabar sesiones
+SessionSavePath=Ubicación para guardar la sesión
 PurgeSessions=Limpiado de sesiones
 ConfirmPurgeSessions=¿Realmente quiere eliminar todas las sesiones? Ésto desconectará todos los usuarios (excepto a usted).
 NoSessionListWithThisHandler=Guardar el controlador de sesión configurado en su PHP no permite enumerar todas las sesiones en ejecución.
@@ -23,8 +27,12 @@ LockNewSessions=Bloquear conexiones nuevas
 ConfirmLockNewSessions=¿Estás seguro de que deseas restringir cualquier nueva conexión de Dolibarr a ti mismo? Solo el usuario <b> %s </b> podrá conectarse después de eso.
 UnlockNewSessions=Eliminar el bloqueo de conexión
 WebUserGroup=Grupo/Usuario del servidor web
+PermissionsOnFilesInWebRoot=Permisos sobre archivos en el directorio raíz web
+PermissionsOnFile=Permisos en el archivo %s
+NoSessionFound=Su configuración de PHP parece no permitir la lista de sesiones activas. El directorio utilizado para guardar sesiones (<b> %s </b>) puede estar protegido (por ejemplo, mediante permisos del sistema operativo o mediante la directiva de PHP open_basedir).
 DBStoringCharset=Conjunto de caracteres de la base de datos para almacenar datos
 DBSortingCharset=Conjunto de caracteres para organizar datos
+HostCharset=Charset de host
 ClientCharset=Charset cliente
 WarningModuleNotActive=El módulo <b>%s</b> debe estar activo
 WarningOnlyPermissionOfActivatedModules=Solo los permisos relacionados a los modulos activos se muestran acá. Puede activar otros modulos en la página Inicio->Configuración->Módulos.
@@ -33,6 +41,8 @@ GUISetup=Mostrar
 UploadNewTemplate=Subir nueva (s) plantilla (s)
 FormToTestFileUploadForm=Formulario para probar la importación de archivos (según configuración)
 IfModuleEnabled=Nota: solo aplica el SI en caso de que el modulo <b>%s</b> esté activo
+RemoveLock=Quite / cambie el nombre del archivo <b> %s </b> si existe, para permitir el uso de la herramienta Actualizar / Instalar.
+RestoreLock=Restaure el archivo <b> %s </b>, solo con permiso de lectura, para deshabilitar cualquier uso posterior de la herramienta Actualizar / Instalar.
 SecuritySetup=Configuración de seguridad
 SecurityFilesDesc=Define aquí las opciones relacionadas con la seguridad sobre la carga de archivos.
 ErrorModuleRequirePHPVersion=Error, éste módulo requiere la versión de PHP %s o superior
@@ -42,9 +52,15 @@ DictionarySetup=Configuración del diccionario
 Dictionary=Los diccionarios
 ErrorReservedTypeSystemSystemAuto=Los valores 'system' y 'systemauto' están reservados para tipo. Puede usar 'user' como valor para agregar su propio registro
 ErrorCodeCantContainZero=El código no puede contener un valor de 0
+DisableJavascript=Deshabilitar las funciones de JavaScript y Ajax
+DisableJavascriptNote=Nota: Para fines de prueba o depuración. Para la optimización para navegadores de texto o personas ciegas, es posible que prefiera utilizar la configuración en el perfil de usuario
 UseSearchToSelectCompanyTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad configurando la constante COMPANY_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará entonces al inicio de la cadena.
 UseSearchToSelectContactTooltip=Además, si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad configurando la constante CONTACT_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otro. La búsqueda se limitará entonces al inicio de la cadena.
 DelaiedFullListToSelectCompany=Espere hasta que se presione una tecla antes de cargar el contenido de la lista de combo de Terceros. Esto puede aumentar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
+DelaiedFullListToSelectContact=Espere hasta que se presione una tecla antes de cargar el contenido de la lista combinada de contactos. <br> Esto puede aumentar el rendimiento si tiene una gran cantidad de contactos, pero es menos conveniente.
+NumberOfKeyToSearch=Número de caracteres para activar la búsqueda: %s
+NumberOfBytes=Número de bytes
+SearchString=Cadena de búsqueda
 NotAvailableWhenAjaxDisabled=No disponible con Ajax desactivado
 AllowToSelectProjectFromOtherCompany=En el documento de un tercero, puede elegir un proyecto vinculado a otro tercero
 JavascriptDisabled=JavaScript desactivado
@@ -60,11 +76,14 @@ NextValueForInvoices=Siguiente valor (facturas)
 NextValueForCreditNotes=Siguiente valor (notas crédito)
 NextValueForDeposit=Siguiente valor (pago inicial)
 NextValueForReplacements=Siguiente valor (reemplazos)
+MustBeLowerThanPHPLimit=Nota: su configuración de PHP actualmente limita el máximo para cargar a <b> %s </b> %s, independientemente del valor de este parámetro
 NoMaxSizeByPHPLimit=Nota: en la configuración de su PHP no está definido un límite
 MaxSizeForUploadedFiles=Tamaño máximo para archivos importados (0 para desactivar cualquier importación)
 UseCaptchaCode=Usar código gráfico (CAPTCHA) en la página de inicio de sesión
 AntiVirusCommand=Ruta completa para el comando del antivirus
+AntiVirusCommandExample=Ejemplo de ClamAv Daemon (requiere clamav-daemon): /usr/bin/clamdscan <br> Ejemplo de ClamWin (muy, muy lento): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam=Más parámetros en la línea de comando
+AntiVirusParamExample=Ejemplo de ClamAv Daemon: --fdpass <br> Ejemplo de ClamWin: --database = "C:\\Archivos de programa (x86)\\ClamWin\\lib"
 ComptaSetup=Configuración del módulo contable
 UserSetup=Configuración de la administración de usuarios
 MultiCurrencySetup=Configuración multi-moneda
@@ -90,14 +109,19 @@ CurrentHour=Hora del PHP (servidor)
 CurrentSessionTimeOut=Tiempo de espera de la sesión actual
 YouCanEditPHPTZ=Para configurar una zona horaria de PHP diferente (no es necesario), puede intentar agregar un archivo .htaccess con una línea como esta "SetEnv TZ Europe / Paris"
 HoursOnThisPageAreOnServerTZ=La advertencia, a diferencia de otras pantallas, las horas en esta página no se encuentran en su zona horaria local, sino de la zona horaria del servidor.
+MaxNbOfLinesForBoxes=Max. número de líneas para widgets
 PositionByDefault=Orden por defecto
 Position=Puesto
 MenusDesc=Los gestores de menú establecen el contenido de las dos barras de menú (horizontal y vertical).
 MenusEditorDesc=El editor de menú le permite definir entradas de menú personalizadas. Utilícelo con cuidado para evitar la inestabilidad y las entradas de menú permanentemente inalcanzables. <br> Algunos módulos agregan entradas de menú (en el menú <b> Todos </b> en su mayoría). Si elimina por error algunas de estas entradas, puede restaurarlas desactivando y volviendo a habilitar el módulo.
 MenuForUsers=Menú para usuarios.
+Language_en_US_es_MX_etc=Idioma (en_US, es_MX, ...)
 SystemInfo=Información del sistema
 SystemToolsArea=Área de herramientas del sistema
+SystemToolsAreaDesc=Esta área proporciona funciones de administración. Utilice el menú para elegir la función requerida.
+PurgeAreaDesc=Esta página le permite eliminar todos los archivos generados o almacenados por Dolibarr (archivos temporales o todos los archivos en el directorio <b> %s </b>). Normalmente, no es necesario utilizar esta función. Se proporciona como una solución para los usuarios cuyo Dolibarr está alojado por un proveedor que no ofrece permisos para eliminar archivos generados por el servidor web.
 PurgeDeleteLogFile=Elimine los archivos de registro, incluido el <b> %s </b> definido para el módulo Syslog (sin riesgo de perder datos)
+PurgeDeleteAllFilesInDocumentsDir=Elimine todos los archivos del directorio: <b> %s </b>. <br> Esto eliminará todos los documentos generados relacionados con elementos (terceros, facturas, etc.), archivos cargados en el módulo ECM, volcados de respaldo (backup dumps) de la base de datos y archivos temporales.
 PurgeRunNow=Purga ahora
 PurgeNothingToDelete=No hay directorio o archivos para eliminar.
 PurgeNDirectoriesDeleted=Se eliminaron los archivos o directorios de <b> %s </b>.
@@ -109,13 +133,16 @@ Restore=Restaurar
 RunCommandSummary=La copia de seguridad se ha iniciado con el siguiente comando
 BackupResult=Resultado de copia de seguridad
 BackupFileSuccessfullyCreated=Archivo de copia de seguridad generado correctamente
+YouCanDownloadBackupFile=El archivo generado ahora se puede descargar
 NoBackupFileAvailable=No hay archivos de copia de seguridad disponibles.
 ToBuildBackupFileClickHere=Para crear un archivo de copia de seguridad, haga clic en <a href="%s"> aquí </a>.
+ImportMySqlDesc=Para importar un archivo de respaldo de MySQL, puede usar phpMyAdmin a través de su alojamiento o usar el comando mysql desde la línea de comandos. <br> Por ejemplo:
 ImportPostgreSqlDesc=Para importar un archivo de copia de seguridad, debe usar el comando pg_restore desde la línea de comandos:
 ImportMySqlCommand=%s %s <mybackupfile.sql
 CommandsToDisableForeignKeysForImport=Comando para deshabilitar claves foráneas en la importación
 CommandsToDisableForeignKeysForImportWarning=Obligatorio si desea poder restaurar su volcado de SQL más tarde
 ExportCompatibility=Compatibilidad del archivo de exportación generado.
+ExportUseMySQLQuickParameter=Utilice el parámetro --quick
 MySqlExportParameters=Parámetros de exportación de MySQL
 PostgreSqlExportParameters=Parámetros de exportación de PostgreSQL
 UseTransactionnalMode=Usa el modo transaccional
@@ -134,16 +161,22 @@ FeatureDisabledInDemo=Función deshabilitada en demo
 FeatureAvailableOnlyOnStable=Característica solo disponible en versiones oficiales estables
 BoxesDesc=Los widgets son componentes que muestran información que puede agregar para personalizar algunas páginas. Puede elegir entre mostrar el widget o no seleccionando la página de destino y haciendo clic en 'Activar', o haciendo clic en la papelera para desactivarla.
 OnlyActiveElementsAreShown=Solo se muestran los elementos de <a href="%s"> módulos habilitados </a>.
+ModulesDesc=Los módulos/aplicaciones determinan qué funciones están disponibles en el software. Algunos módulos requieren que se otorguen permisos a los usuarios después de activar el módulo. Haga clic en el botón de encendido/apagado <span class="small valignmiddle"> %s </span> de cada módulo para habilitar o deshabilitar un módulo/aplicación.
 ModulesDeployDesc=Si los permisos en su sistema de archivos lo permiten, puede usar esta herramienta para implementar un módulo externo. El módulo será visible en la pestaña <strong> %s </strong>.
 ModulesMarketPlaces=Encuentra aplicaciones / módulos externos
 ModulesDevelopYourModule=Desarrolle su propia aplicación / módulos
 ModulesDevelopDesc=También puede desarrollar su propio módulo o encontrar un socio para desarrollar uno para usted.
 DOLISTOREdescriptionLong=En lugar de activar el sitio web <a href="https://www.dolistore.com"> www.dolistore.com </a> para encontrar un módulo externo, puede utilizar esta herramienta integrada que realizará la búsqueda en el Mercado externo para usted (puede ser lento, necesita un acceso a Internet) ...
+NewModule=Nuevo modulo
 SeeInMarkerPlace=Ver en el mercado
+SeeSetupOfModule=Ver configuración del módulo %s
 AchatTelechargement=Comprar / Descargar
+GoModuleSetupArea=Para implementar/instalar un nuevo módulo, vaya al área de configuración del módulo: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, el sitio oficial de mercado para los módulos externos de Dolibarr ERP / CRM
+DoliPartnersDesc=Lista de empresas que ofrecen funciones o módulos desarrollados a medida. <br> Nota: dado que Dolibarr es una aplicación de código abierto, <i> cualquier persona </i> con experiencia en programación PHP debería poder desarrollar un módulo.
 WebSiteDesc=Sitios web externos para más módulos complementarios (no centrales) ...
 DevelopYourModuleDesc=Algunas soluciones para desarrollar tu propio módulo ...
+RelativeURL=URL relativa
 BoxesAvailable=Widgets disponibles
 BoxesActivated=Widgets activados
 ActiveOn=Activado en
@@ -151,11 +184,15 @@ SourceFile=Archivo fuente
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solo si JavaScript no está deshabilitado
 Required=Necesario
 UsedOnlyWithTypeOption=Usado solo por alguna opción de agenda
+DoNotStoreClearPassword=Encripte las contraseñas almacenadas en la base de datos (NO como texto plano). Es obligatorio, por su seguridad, activar esta opción.
+MainDbPasswordFileConfEncrypted=Encripte la contraseña de la base de datos almacenada en conf.php. Es obligatorio, por su seguridad, activar esta opción.
 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 descodificar (borrar) la contraseña en el archivo <b> conf.php </b>, reemplace la línea <br> <b> $ dolibarr_main_db_pass = "crypted: ..."; </b> <br> by < br> <b> $ dolibarr_main_db_pass = "%s"; </b>
+ProtectAndEncryptPdfFiles=Proteja los archivos PDF generados. NO se recomienda ya que interrumpe la generación masiva de PDF.
 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 ya no es posible. Tenga en cuenta que el uso de esta función hace que la creación de un PDF combinado global no funcione.
 Feature=Característica
 Developpers=Desarrolladores / colaboradores
+OfficialWiki=Documentación Dolibarr / Wiki
 OfficialDemo=Demostración online de dolibarr
 OfficialMarketPlace=Mercado oficial para módulos externos / addons
 OfficialWebHostingService=Servicios de alojamiento web referenciados (Cloud hosting)
@@ -169,7 +206,9 @@ SpaceX=Espacio x
 SpaceY=Espacio y
 Emails=Correos electronicos
 EMailsSetup=Configuración de correos electrónicos
+EMailsDesc=Esta página le permite establecer parámetros u opciones para el envío de correo electrónico.
 EmailSenderProfiles=Correos electrónicos remitentes perfiles
+EMailsSenderProfileDesc=Puede mantener esta sección vacía. Si ingresa algunos correos electrónicos aquí, se agregarán a la lista de posibles remitentes en el cuadro combinado cuando escriba un nuevo correo electrónico.
 MAIN_MAIL_SMTP_PORT=Puerto SMTP / SMTPS (valor predeterminado en php.ini: <b> %s </b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (valor predeterminado en php.ini: <b> %s </b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Puerto SMTP / SMTPS (no definido en PHP en sistemas similares a Unix)
@@ -179,11 +218,13 @@ MAIN_MAIL_ERRORS_TO=El correo electrónico utilizado para el error devuelve corr
 MAIN_MAIL_AUTOCOPY_TO=Copiar (Bcc) todos los correos electrónicos enviados a
 MAIN_DISABLE_ALL_MAILS=Deshabilitar todo el envío de correo electrónico (para propósitos de prueba o demostraciones)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, para fines de prueba)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugerir correos electrónicos de empleados (si están definidos) en la lista de destinatarios predefinidos al escribir un nuevo correo electrónico
 MAIN_MAIL_SENDMODE=Método de envío de correo electrónico
 MAIN_MAIL_SMTPS_ID=ID de SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_EMAIL_TLS=Utilizar cifrado TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Usar cifrado TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizar certificados autofirmados
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Usa DKIM para generar firma de correo electrónico
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Dominio de correo electrónico para usar con dkim
 MAIN_DISABLE_ALL_SMS=Deshabilitar todo el envío de SMS (para propósitos de prueba o demostraciones)
@@ -191,28 +232,43 @@ MAIN_SMS_SENDMODE=Método a utilizar para enviar SMS.
 MAIN_MAIL_SMS_FROM=Número de teléfono del remitente predeterminado para el envío de SMS
 MAIN_MAIL_DEFAULT_FROMTYPE=Correo electrónico predeterminado del remitente para envío manual (correo electrónico del usuario o correo electrónico de la empresa)
 UserEmail=Email del usuario
+CompanyEmail=Correo electrónico de la empresa
 FeatureNotAvailableOnLinux=Característica no disponible en Unix como sistemas. Prueba tu programa de sendmail localmente.
+SubmitTranslation=Si la traducción para este idioma no está completa o encuentra errores, puede corregir esto editando los archivos en el directorio <b> langs / %s </b> y envíe su cambio a www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Si la traducción para este idioma no está completa o encuentra errores, puede corregir esto editando los archivos en el directorio <b>langs/%s</b> y envíe los archivos modificados a dolibarr.org/forum o, si es un desarrollador, con un PR en github.com/Dolibarr/dolibarr
 ModulesSetup=Configuración de módulos / aplicaciones
+ModuleFamilyCrm=Gestión de relaciones con el cliente (CRM)
+ModuleFamilySrm=Gestión de relaciones con proveedores (VRM)
 ModuleFamilyHr=Gestión de Recursos Humanos (HR)
 ModuleFamilyProjects=Proyectos / Trabajo colaborativo.
 ModuleFamilyTechnic=Herramientas multimodulos
 ModuleFamilyFinancial=Módulos Financieros (Contabilidad / Tesorería)
 ModuleFamilyECM=Gestión de contenidos electrónicos (ECM)
+ModuleFamilyPortal=Sitios web y otras aplicaciones frontales
 ModuleFamilyInterface=Interfaces con sistemas externos.
 MenuHandlers=Manejadores de menú
 MenuAdmin=Editor de menú
 DoNotUseInProduction=No utilizar en producción.
 ThisIsAlternativeProcessToFollow=Esta es una configuración alternativa para procesar manualmente:
+FindPackageFromWebSite=Busque un paquete que proporcione las funciones que necesita (por ejemplo, en el sitio web oficial %s).
+DownloadPackageFromWebSite=Descargue el paquete (por ejemplo, del sitio web oficial %s).
+UnpackPackageInDolibarrRoot=Desempaquete/descomprima los archivos empaquetados en el directorio de su servidor Dolibarr: <b> %s </b>
 UnpackPackageInModulesRoot=Para implementar / instalar un módulo externo, descomprima / descomprima los archivos empaquetados en el directorio del servidor dedicado a los módulos externos: <br> <b> %s </b>
 SetupIsReadyForUse=El despliegue del módulo ha finalizado. Sin embargo, debe habilitar y configurar el módulo en su aplicación ingresando a los módulos de configuración de la página: <a href="%s"> %s </a>.
 NotExistsDirect=El directorio raíz alternativo no está definido en un directorio existente. <br>
 InfDirAlt=Desde la versión 3, es posible definir un directorio raíz alternativo. Esto le permite almacenar, en un directorio dedicado, complementos y plantillas personalizadas. <br> Simplemente cree un directorio en la raíz de Dolibarr (por ejemplo: personalizado). <br>
 InfDirExample=<br> Luego declara en el archivo <strong> conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/ custom' <br> $ dolibarr_main_document_root_alt = '/ path / of / dolibarr / htdocs / custom' <br> Si estas líneas están comentadas con "#", para habilitarlas, simplemente elimine el comentario eliminando el carácter "#".
+YouCanSubmitFile=Puede cargar el archivo .zip del módulo desde aquí:
 CurrentVersion=Dolibarr versión actual
+CallUpdatePage=Vaya a la página que actualiza la estructura y los datos de la base de datos: %s.
 LastActivationAuthor=Autor de activación más reciente
 LastActivationIP=Última activación de IP
 UpdateServerOffline=Actualizar servidor fuera de línea
 WithCounter=Manejar un contador
+GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, se pueden utilizar las siguientes etiquetas: <br> <b>{000000}</b> corresponde a un número que se incrementará en cada %s. Ingrese tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara.<br> <b>{000000 + 000}</b> igual que el anterior pero se aplica un desplazamiento correspondiente al número a la derecha del signo + comenzando en el primer %s.<br> <b>{000000 @ x}</b> igual que el anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definido en su configuración, o 99 para poner a cero todos los meses). Si se usa esta opción y x es 2 o superior, entonces también se requiere la secuencia {yy} {mm} o {yyyy} {mm}.<br> <b>{dd}</b> día (01 a 31).<br> <b>{mm}</b> mes (01 a 12).<br> <b> {yy} </b>, <b>{yyyy}</b> o <b> {y} </b>año sobre 2, 4 o 1 número.<br>
+GenericMaskCodes2=<b>{cccc}</b> el código de cliente en n caracteres <br> <b>{cccc000}</b> el código de cliente es un código de cliente dedicado a n. Este contador dedicado al cliente se pone a cero al mismo tiempo que el contador global. <br> <b>{tttt}</b> El código del tipo de terceros en n caracteres (ver menú Inicio - Configuración - Diccionario - Tipos de terceros). Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero.<br>
+GenericMaskCodes3=Todos los demás caracteres de la máscara permanecerán intactos. <br> No se permiten espacios. <br>
+GenericMaskCodes3EAN=Todos los demás caracteres de la máscara permanecerán intactos (excepto * o ? En la 13ª posición en EAN13).<br> No se permiten espacios.<br> En EAN13, el último carácter después del último} en la posición 13 debe ser * o ? . Será reemplazado por la clave calculada.<br>
 GenericMaskCodes4a=<u> Ejemplo en la 99a %s de TheCompany de terceros, con fecha 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u> Ejemplo de un tercero creado el 2007-03-01: </u> <br>
 GenericMaskCodes4c=<u> Ejemplo de producto creado el 2007-03-01: </u> <br>
@@ -227,6 +283,7 @@ ErrorCantUseRazIfNoYearInMask=Error, no se puede usar la opción @ para reinicia
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no se puede usar la opción @ si la secuencia {yy} {mm} o {yyyy} {mm} no está en la máscara.
 UMask=Parámetro UMask para archivos nuevos en el sistema de archivos Unix / Linux / BSD / Mac.
 UMaskExplanation=Este parámetro le permite definir los permisos establecidos de forma predeterminada en los archivos creados por Dolibarr en el servidor (durante la carga, por ejemplo). Debe ser el valor octal (por ejemplo, 0666 significa lectura y escritura para todos). El parámetro es inútil en un servidor Windows.
+SeeWikiForAllTeam=Eche un vistazo a la página Wiki para obtener una lista de contribuyentes y su organización.
 UseACacheDelay=Retraso para almacenar en caché la respuesta de exportación en segundos (0 o vacío para no tener caché)
 DisableLinkToHelpCenter=Ocultar el enlace "<b> Necesita ayuda o soporte </b>" en la página de inicio de sesión
 DisableLinkToHelp=Ocultar el enlace a la ayuda en línea "<b> %s </b>"
@@ -237,27 +294,41 @@ LanguageFilesCachedIntoShmopSharedMemory=Archivos .lang cargados en memoria comp
 ListOfDirectories=Lista de directorios de plantillas de OpenDocument
 ListOfDirectoriesForModelGenODT=Lista de directorios que contienen archivos de plantillas con formato OpenDocument. <br> <br> Ruta aquí completa de los directorios. Agregue un retorno de carro entre cada directorio. <br> Para agregar un directorio del módulo GED, agregue aquí <b > DOL_DATA_ROOT / ecm / yourdirectoryname </b>. Los archivos en esos directorios deben terminar con <b> .odt </b> o <b> .ods </b>.
 NumberOfModelFilesFound=Número de archivos de plantilla ODT / ODS encontrados en estos directorios
+ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis: <br> c:\\myapp\\mydocumentdir\\mysubdir<br> /home/myapp/mydocumentdir/mysubdir<br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Para saber cómo crear sus plantillas de documento odt, antes de almacenarlas en esos directorios, lea la documentación de la wiki:
 FirstnameNamePosition=Posición del nombre / apellido
+DescWeather=Las siguientes imágenes se mostrarán en el tablero cuando el número de acciones tardías alcance los siguientes valores:
 KeyForWebServicesAccess=Clave para usar servicios web (parámetro "dolibarrkey" en servicios web)
 TestSubmitForm=Formulario de prueba de entrada
+ThisForceAlsoTheme=El uso de este administrador de menús también usará su propio tema cualquiera que sea la elección del usuario. Además, este administrador de menús especializado para teléfonos inteligentes no funciona en todos los teléfonos inteligentes. Utilice otro administrador de menú si tiene problemas con el suyo.
 ThemeDir=Directorio de skins
 ConnectionTimeout=El tiempo de conexión expiro
 ResponseTimeout=Tiempo de espera de respuesta
 SmsTestMessage=Mensaje de prueba de __PHONEFROM__ a __PHONETO__
 ModuleMustBeEnabledFirst=El módulo <b> %s </b> debe habilitarse primero si necesita esta función.
 SecurityToken=Clave para asegurar las URL
+NoSmsEngine=No hay ningún administrador de remitentes de SMS disponible. Un administrador de remitentes de SMS no está instalado con la distribución predeterminada porque depende de un proveedor externo, pero puede encontrar algunos en %s
+PDFDesc=Opciones globales para la generación de PDF
+PDFAddressForging=Reglas para la sección de direcciones
+HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el impuesto sobre las ventas / IVA
 PDFRulesForSalesTax=Reglas para el impuesto de ventas / IVA
+HideLocalTaxOnPDF=Ocultar la tasa %s en la columna Impuesto sobre las ventas / IVA
+HideDescOnPDF=Ocultar descripción de productos
+HideRefOnPDF=Ocultar la ref. de productos
+HideDetailsOnPDF=Ocultar los detalles de las líneas de productos
 PlaceCustomerAddressToIsoLocation=Utilice la posición estándar francesa (La Poste) para la posición de la dirección del cliente
 Library=Biblioteca
 UrlGenerationParameters=Parámetros para proteger las URL
 SecurityTokenIsUnique=Utilice un parámetro de clave segura único para cada URL
 EnterRefToBuildUrl=Introduzca la referencia para el objeto %s
 GetSecuredUrl=Obtener URL calculada
+ButtonHideUnauthorized=Ocultar botones de acción no autorizados también para usuarios internos (solo en gris de lo contrario)
 OldVATRates=Vieja tasa de IVA
 NewVATRates=Nueva tasa de IVA
 PriceBaseTypeToChange=Modificar en precios con valor de referencia base definido en
+MassConvert=Lanzar conversión masiva
 String=Cuerda
+String1Line=Cadena (1 línea)
 Int=Entero
 Float=Flotador
 Boolean=Booleano (una casilla de verificación)
@@ -269,32 +340,58 @@ ExtrafieldCheckBox=Casillas de verificación
 ExtrafieldCheckBoxFromList=Casillas de verificación de la mesa
 ExtrafieldLink=Enlace a un objeto
 ComputedFormula=Campo computado
+ComputedFormulaDesc=Puede ingresar aquí una fórmula usando otras propiedades del objeto o cualquier codificación PHP para obtener un valor calculado dinámico. Puede utilizar cualquier fórmula compatible con PHP, incluido el "?" operador de condición y el siguiente objeto global: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ADVERTENCIA</strong>: Solo algunas propiedades de $object pueden estar disponibles. Si necesita propiedades no cargadas, simplemente busque el objeto en su fórmula como en el segundo ejemplo.<br> El uso de un campo calculado significa que no puede ingresar ningún valor desde la interfaz. Además, si hay un error de sintaxis, es posible que la fórmula no devuelva nada.<br> <br>Ejemplo de fórmula:<br> $object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2) )<br> <br>Ejemplo para volver a cargar el objeto<br> (($reloadedobj = new Societe($ db)) && ($reloadedobj-> fetchNoCompute($obj->id? $obj-> id: (? $obj-> id?) > rowid: $objetc->id))> 0))? $reloadedobj-> array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br>Otro ejemplo de fórmula para forzar la carga del objeto y su objeto principal:<br> (($new reloadedobjb )) && ($reloadedobj->fetchNoCompute ($object-> id)> 0) && ($secondloadedobj = new Project ($db)) && ($secondloadedobj-> fetchNoCompute($reloadedobj-> fk_project)> 0))? $secondloadedobj-> ref: 'Proyecto principal no encontrado'
+Computedpersistent=Almacenar campo calculado
+ComputedpersistentDesc=Los campos adicionales calculados se almacenarán en la base de datos, sin embargo, el valor solo se volverá a calcular cuando se cambie el objeto de este campo. Si el campo calculado depende de otros objetos o datos globales, ¡este valor puede ser incorrecto!
 ExtrafieldParamHelpPassword=Dejar este campo en blanco significa que este valor se almacenará sin cifrado (el campo solo debe estar oculto con una estrella en la pantalla). <br> Establezca 'auto' para usar la regla de cifrado predeterminada para guardar la contraseña en la base de datos (entonces el valor leído será el hash solo, no hay forma de recuperar el valor original)
+ExtrafieldParamHelpselect=La lista de valores debe ser líneas con clave de formato, valor (donde la clave no puede ser '0') <br> <br> por ejemplo: <br> 1, value1 <br> 2, value2 <br>code3,value3<br>...<br> <br>Para que la lista dependa de otra lista de atributos complementarios: <br>1,value1|options_<i>parent_list_code</i>: parent_key<br>2,value2|options_ <i>parent_list_code</i>:parent_key <br><br>Con el fin de tener la lista en función de otra lista:  <br>1, value1| <i>parent_list_code</i>:parent_key<br> 2, value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=La lista de valores debe ser líneas con formato clave, valor (donde la clave no puede ser '0') <br> <br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=La lista de valores debe ser líneas con formato key,value (donde la clave no puede ser '0') <br> <br> por ejemplo: <br>1,value1<br>2,value2<br>3, value3<br>...
+ExtrafieldParamHelpsellist=La lista de valores proviene de una tabla <br>Syntax: table_name:label_field:id_field::filtersql<br> Ejemplo: c_typent:libelle:id::filtersql<br> <br>- id_field es necesariamente una clave int primaria <br>- filtersql es una condición SQL. Puede ser una prueba simple (ej. active=1)  para mostrar solo el valor activo. <br>  También puede usar $ID$ en el filtro que es el ID actual del objeto actual <br> Para usar un SELECT en el filtro, use la palabra clave $SEL$ para evitar la protección antiinyección. <br>Si desea filtrar en campos extra, use la sintaxis extra.fieldcode=... (donde el código de campo es el código del campo extra)<br> <br>Para que la lista dependa de otra lista de atributos complementarios: <br> c_typent:libelle:id:options_ <i>parent_list_code</i> |parent_column:filter<br><br> Para que la lista dependa de otra lista:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=La lista de valores proviene de una tabla <br> Syntax: table_name:label_field:id_field::filtersql <br> Ejemplo: c_typent:libelle:id::filtersql<br><br>el filtro puede ser una prueba simple (ej. active=1) para mostrar solo el valor activo <br>También puede usar $ID$ en el filtro que es el ID actual del objeto actual<br>Para hacer un SELECT en el filtro, use $SEL$ <br> si desea filtrar en campos extra, use la sintaxis extra.fieldcode=... (donde el código de campo es el código de extrafield) <br> <br> con el fin de tener la lista en función de otra lista de atributos complementarios: <br> c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter<br> <br>Con el fin de tener la lista en función de otra lista:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Los parámetros deben ser ObjectName:Classpath <br> Sintaxis: ObjectName:Classpath
+ExtrafieldParamHelpSeparator=Mantener vacío para un separador simple <br> Establezca esto en 1 para un separador colapsante (abierto de forma predeterminada para una nueva sesión, luego el estado se mantiene para cada sesión de usuario) <br> Establezca esto en 2 para un separador colapsante (colapsado por defecto para una nueva sesión, luego el estado se mantiene antes de cada sesión de usuario)
 LibraryToBuildPDF=Biblioteca utilizada para la generación de PDF.
+LocalTaxDesc=Algunos países pueden aplicar dos o tres impuestos en cada línea de la factura. Si este es el caso, elija el tipo para el segundo y tercer impuesto y su tasa. Los tipos posibles son: <br> 1: el impuesto local se aplica a los productos y servicios sin iva (el impuesto local se calcula sobre el monto sin impuestos) <br> 2: el impuesto local se aplica a los productos y servicios, incluido el iva (el impuesto local se calcula sobre el monto + el impuesto principal) <br> 3: el impuesto local se aplica a los productos sin iva (el impuesto local se calcula sobre la cantidad sin iva) <br> 4: el impuesto local se aplica a los productos que incluyen el iva (el impuesto local se calcula sobre la cantidad + el iva principal) <br> 5: el impuesto local se aplica a los servicios sin iva (se calcula el impuesto local) sobre el monto sin impuestos) <br> 6: el impuesto local se aplica a los servicios que incluyen el iva (el impuesto local se calcula sobre el monto + impuestos)
 LinkToTestClickToDial=Ingrese un número de teléfono al que llamar para mostrar un enlace para probar la url de ClickToDial para el usuario <strong> %s </strong>
 RefreshPhoneLink=Actualizar enlace
 LinkToTest=Enlace seleccionable generado para el usuario <strong> %s </strong> (haga clic en el número de teléfono para realizar la prueba)
 KeepEmptyToUseDefault=Mantener vacío para usar el valor predeterminado
 DefaultLink=Enlace predeterminado
 ValueOverwrittenByUserSetup=Advertencia, este valor puede ser sobrescrito por la configuración específica del usuario (cada usuario puede configurar su propia url de clicktodial)
+BarcodeInitForThirdparties=init para código de barras masivo para terceros
 BarcodeInitForProductsOrServices=Código de barras masivo de inicio o reinicio para productos o servicios.
 CurrentlyNWithoutBarCode=Actualmente, tienes el registro <strong> %s </strong> en <strong> %s </strong> %s sin un código de barras definido.
 InitEmptyBarCode=Valor de inicio para los siguientes registros vacíos %s
 EraseAllCurrentBarCode=Borrar todos los valores de código de barras actuales
 ConfirmEraseAllCurrentBarCode=¿Está seguro de que desea borrar todos los valores de código de barras actuales?
 AllBarcodeReset=Todos los valores de código de barras han sido eliminados
+NoBarcodeNumberingTemplateDefined=No se ha habilitado ninguna plantilla de código de barras de numeración en la configuración del módulo de código de barras.
+ShowDetailsInPDFPageFoot=Agregue más detalles en el pie de página, como la dirección de la empresa o los nombres de los gerentes (además de los identificadores profesionales, el capital de la empresa y el número de IVA).
+NoDetails=No hay detalles adicionales en el pie de página.
 DisplayCompanyManagers=Mostrar nombres de gestor
 DisplayCompanyInfoAndManagers=Mostrar la dirección de la empresa y los nombres de los gerentes
 EnableAndSetupModuleCron=Si desea que esta factura recurrente se genere automáticamente, el módulo * %s * debe estar habilitado y configurado correctamente. De lo contrario, la generación de facturas debe hacerse manualmente desde esta plantilla usando el botón * Crear *. Tenga en cuenta que incluso si habilitó la generación automática, aún puede iniciar la generación manual de forma segura. No es posible generar duplicados para el mismo período.
 ModuleCompanyCodeCustomerAquarium=%s seguido de un código de cliente para un código de contabilidad de cliente
+ModuleCompanyCodeSupplierAquarium=%s seguido del código de proveedor para un código de contabilidad de proveedor
 ModuleCompanyCodePanicum=Devuelva un código de contabilidad vacío.
+ModuleCompanyCodeDigitaria=Devuelve un código de contabilidad compuesto según el nombre del tercero. El código consta de un prefijo que se puede definir en la primera posición seguido del número de caracteres definidos en el código de terceros.
+ModuleCompanyCodeCustomerDigitaria=%s seguido del nombre del cliente truncado por el número de caracteres: %s para el código de contabilidad del cliente.
+ModuleCompanyCodeSupplierDigitaria=%s seguido del nombre del proveedor truncado por el número de caracteres: %s para el código de contabilidad del proveedor.
 Use3StepsApproval=De forma predeterminada, los pedidos de compra deben ser creados y aprobados por 2 usuarios diferentes (un paso / usuario para crear y un paso / usuario para aprobar. Tenga en cuenta que si el usuario tiene permiso para crear y aprobar, un paso / usuario será suficiente) . Puede pedir con esta opción que introduzca un tercer paso / aprobación del usuario, si la cantidad es mayor que un valor dedicado (por lo que serán necesarios 3 pasos: 1 = validación, 2 = primera aprobación y 3 = segunda aprobación si la cantidad es suficiente). <br> Configúrelo en vacío si una aprobación (2 pasos) es suficiente, ajústelo a un valor muy bajo (0.1) si siempre se requiere una segunda aprobación (3 pasos).
 UseDoubleApproval=Utilice una aprobación de 3 pasos cuando la cantidad (sin impuestos) sea superior a ...
+WarningPHPMail=ADVERTENCIA: La configuración para enviar correos electrónicos desde la aplicación utiliza la configuración genérica predeterminada. A menudo, es mejor configurar los correos electrónicos salientes para utilizar el servidor de correo electrónico de su proveedor de servicios de correo electrónico en lugar de la configuración predeterminada por varias razones:
 WarningPHPMail2=Si su proveedor de correo electrónico SMTP necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raro), esta es la dirección IP del agente de usuario de correo (MUA) para su aplicación ERP CRM: <strong> %s </strong>.
+WarningPHPMailSPF=Si el nombre de dominio en la dirección de correo electrónico del remitente está protegido por un registro SPF (pregúntele a su registro de nombre de dominio), debe agregar las siguientes direcciones IP en el registro SPF del DNS de su dominio: <strong> %s </strong>.
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita el módulo (s)
 RequiredBy=Este módulo es requerido por el módulo (s)
 TheKeyIsTheNameOfHtmlField=Este es el nombre del campo HTML. Se requiere conocimiento técnico para leer el contenido de la página HTML para obtener el nombre clave de un campo.
+PageUrlForDefaultValues=Debe ingresar la ruta relativa de la URL de la página. Si incluye parámetros en la URL, los valores predeterminados serán efectivos si todos los parámetros se establecen en el mismo valor.
+PageUrlForDefaultValuesCreate=<br> Ejemplo: <br> Para el formulario para crear un nuevo tercero, es <strong>%s</strong>. <br> Para la URL de los módulos externos instalados en el directorio personalizado, no incluya "custom/", así que use una ruta como <strong> mymodule /mypage.php </strong> y no custom/mymodule/mypage.php. <br> Si desea un valor predeterminado solo si la URL tiene algún parámetro, puede usar <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Ejemplo:<br> Para la página que enumera terceros, es <strong>%s</strong>. <br>Para la URL de los módulos externos instalados en el directorio personalizado, no incluya "custom/", así que use una ruta como <strong>mymodule/mypagelist.php</strong> y no custom/mymodule/mypagelist.php. <br> Si desea un valor predeterminado solo si la URL tiene algún parámetro, puede usar <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=También tenga en cuenta que sobrescribir los valores predeterminados para la creación de formularios solo funciona para las páginas que se diseñaron correctamente (por lo tanto, con el parámetro action=create o presend...)
+EnableDefaultValues=Habilitar la personalización de los valores predeterminados
 EnableOverwriteTranslation=Habilitar el uso de traducción sobrescrita
 GoIntoTranslationMenuToChangeThis=Se ha encontrado una traducción para la clave con este código. Para cambiar este valor, debe editarlo desde Home-Setup-translation.
 WarningSettingSortOrder=Advertencia: establecer un orden de clasificación predeterminado puede generar un error técnico al acceder a la página de la lista si el campo es un campo desconocido. Si experimenta tal error, vuelva a esta página para eliminar el orden de clasificación predeterminado y restaurar el comportamiento predeterminado.
@@ -303,13 +400,25 @@ FreeLegalTextOnExpenseReports=Texto legal gratuito sobre informes de gastos.
 WatermarkOnDraftExpenseReports=Marca de agua en los proyectos de informes de gastos
 AttachMainDocByDefault=Establézcalo en 1 si desea adjuntar el documento principal al correo electrónico de forma predeterminada (si corresponde)
 SendEmailsReminders=Enviar recordatorios de agenda por emails.
+DAV_ALLOW_PRIVATE_DIR=Habilite el directorio privado genérico (directorio dedicado de WebDAV llamado "privado" - es necesario iniciar sesión)
+DAV_ALLOW_PRIVATE_DIRTooltip=El directorio privado genérico es un directorio WebDAV al que cualquiera puede acceder con su nombre de usuario / contraseña de aplicación.
+DAV_ALLOW_PUBLIC_DIR=Habilite el directorio público genérico (directorio dedicado de WebDAV llamado "público", no es necesario iniciar sesión)
+DAV_ALLOW_PUBLIC_DIRTooltip=El directorio público genérico es un directorio WebDAV al que cualquiera puede acceder (en modo lectura y escritura), sin necesidad de autorización (cuenta de inicio de sesión / contraseña).
+DAV_ALLOW_ECM_DIR=Habilite el directorio privado DMS/ECM (directorio raíz del módulo DMS/ECM; se requiere iniciar sesión)
+DAV_ALLOW_ECM_DIRTooltip=El directorio raíz donde todos los archivos se cargan manualmente cuando se usa el módulo DMS/ECM. De manera similar al acceso desde la interfaz web, necesitará un nombre de usuario/contraseña válido con los permisos adecuados para acceder a él.
 Module0Name=Usuarios y Grupos
 Module0Desc=Gestión de usuarios / empleados y grupos.
+Module1Desc=Gestión de empresas y contactos (clientes, prospectos ...)
 Module2Desc=Administración comercial
+Module10Name=Contabilidad (simplificada)
 Module10Desc=Informes contables simples (revistas, facturación) basados ​​en el contenido de la base de datos. No utiliza ninguna tabla de contabilidad.
 Module20Name=Propuestas
 Module20Desc=Gestión comercial de propuestas.
+Module22Name=Correos electrónicos masivos
+Module22Desc=Administrar correos electrónicos masivos
 Module23Desc=Seguimiento del consumo de energías.
+Module25Name=Órdenes de venta
+Module25Desc=Gestión de Ordenes de venta
 Module30Name=Facturas
 Module30Desc=Gestión de facturas y notas de crédito para clientes. Gestión de facturas y notas de crédito para proveedores.
 Module42Desc=Facilidades de registro (archivo, syslog, ...). Dichos registros son para fines técnicos / de depuración.
@@ -317,57 +426,96 @@ Module49Desc=Gestión del editor
 Module51Name=Correos masivos
 Module51Desc=Gestión masiva de correo postal.
 Module52Name=Cepo
+Module52Desc=Gestión de Stocks
 Module54Name=Contratos / Suscripciones
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
 Module55Desc=Gestión de códigos de barras
+Module56Desc=Gestión de pago de proveedores mediante Órdenes de Transferencia de Crédito. Incluye generación de archivo SEPA para países europeos.
+Module57Name=Pagos por Débito Automático
+Module57Desc=Gestión de órdenes de débito automático. Incluye generación de archivo SEPA para países europeos.
 Module58Desc=Integración de un sistema ClickToDial (Asterisco, ...)
+Module60Desc=Gestión de stickers
 Module70Desc=Gestión de la intervención
 Module75Name=Gastos y notas de viaje.
 Module75Desc=Gestión de gastos y notas de viaje.
 Module80Name=Envíos
+Module80Desc=Gestión de envíos y recibos de entrega
+Module85Name=Bancos & Efectivo
 Module85Desc=Gestión de cuentas bancarias o en efectivo.
 Module100Name=Sitio externo
+Module100Desc=Agregue un enlace a un sitio web externo como icono del menú principal. El sitio web se muestra en un marco debajo del menú superior.
 Module105Desc=Mailman o interfaz SPIP para módulo miembro
 Module200Desc=Sincronización de directorios LDAP
 Module210Desc=Integración PostNuke
 Module240Name=Exportación de datos
+Module240Desc=Herramienta para exportar datos Dolibarr (con ayuda)
 Module250Name=Importaciones de datos
+Module250Desc=Herramienta para importar datos a Dolibarr (con ayuda)
 Module310Desc=Gestión de los miembros de la fundación
+Module320Desc=Agregar una fuente RSS a las páginas de Dolibarr
+Module330Name=Marcadores y accesos directos
+Module330Desc=Cree accesos directos, siempre accesibles, a las páginas internas o externas a las que accede con frecuencia.
 Module400Name=Proyectos o Leads
 Module400Desc=Gestión de proyectos, leads / oportunidades y / o tareas. También puede asignar cualquier elemento (factura, pedido, propuesta, intervención, ...) a un proyecto y obtener una vista transversal desde la vista del proyecto.
 Module410Name=Calendario web
 Module410Desc=Integración webcalendar
+Module500Name=Impuestos & Gastos especiales
 Module500Desc=Gestión de otros gastos (impuestos de venta, impuestos sociales o fiscales, dividendos, ...)
 Module510Desc=Registrar y rastrear los pagos de los empleados
 Module520Desc=Gestion de prestamos
+Module600Name=Notificaciones sobre eventos comerciales
+Module600Desc=Envíe notificaciones por correo electrónico desencadenadas por un evento comercial: por usuario (configuración definida en cada usuario), por contactos de terceros (configuración definida en cada tercero) o por correos electrónicos específicos
+Module600Long=Tenga en cuenta que este módulo envía correos electrónicos en tiempo real cuando ocurre un evento empresarial específico. Si está buscando una función para enviar recordatorios por correo electrónico para eventos de la agenda, vaya a la configuración del módulo Agenda.
 Module610Desc=Creación de variantes de producto (color, tamaño, etc.).
+Module770Name=Reporte de gastos
+Module770Desc=Gestionar reclamaciones de informes de gastos (transporte, comida, ...)
+Module1120Name=Propuestas comerciales de proveedores
 Module1120Desc=Solicite propuesta comercial de vendedor y precios.
 Module1200Desc=Integracion de mantis
 Module1520Name=Generación de documentos
+Module1520Desc=Generación masiva de documentos por correo electrónico
 Module1780Name=Etiquetas / Categorías
+Module1780Desc=Crear etiquetas/categoría (productos, clientes, proveedores, contactos o miembros)
+Module2000Desc=Permitir que los campos de texto sean editados / formateados usando CKEditor (html)
+Module2200Desc=Utilice expresiones matemáticas para la generación automática de precios
 Module2300Name=Trabajos programados
 Module2300Desc=Gestión de trabajos programados (alias cron o tabla crono)
 Module2400Name=Eventos / Agenda
+Module2400Desc=Seguimiento de eventos. Registre eventos automáticos con fines de seguimiento o registre eventos o reuniones manuales. Este es el módulo principal para una buena gestión de relaciones con clientes o proveedores.
 Module2500Desc=Sistema de gestión documental / Gestión de contenidos electrónicos. Organización automática de sus documentos generados o almacenados. Compártelos cuando los necesites.
 Module2600Name=API / servicios web (servidor SOAP)
 Module2600Desc=Habilitar el servidor Dolibarr SOAP que proporciona servicios API.
 Module2610Name=API / servicios web (servidor REST)
 Module2610Desc=Habilitar el servidor REST de Dolibarr que proporciona servicios API.
 Module2660Name=Call WebServices (cliente SOAP)
+Module2660Desc=Habilite el cliente de servicios web Dolibarr (se puede usar para enviar datos / solicitudes a servidores externos. Actualmente, solo se admiten pedidos de compra).
 Module2700Desc=Utilice el servicio en línea de Gravatar (www.gravatar.com) para mostrar la foto de los usuarios / miembros (que se encuentra en sus correos electrónicos). Necesita acceso a internet
 Module2900Desc=Capacidades de conversiones de GeoIP Maxmind
 Module3200Desc=Habilitar un registro inalterable de eventos empresariales. Los eventos se archivan en tiempo real. El registro es una tabla de solo lectura de eventos encadenados que se pueden exportar. Este módulo puede ser obligatorio para algunos países.
+Module3400Desc=Habilite los campos de Redes Sociales en terceros y direcciones (skype, twitter, facebook, ...).
 Module4000Desc=Gestión de recursos humanos (gestión de departamento, contratos de empleados y sentimientos).
 Module5000Desc=Le permite gestionar múltiples empresas.
+Module10000Desc=Cree sitios web (públicos) con un editor WYSIWYG. Este es un CMS orientado a webmasters o desarrolladores (es mejor conocer el lenguaje HTML y CSS). Simplemente configure su servidor web (Apache, Nginx, ...) para que apunte al directorio Dolibarr dedicado para tenerlo en línea en Internet con su propio nombre de dominio.
+Module20000Name=Gestión de solicitudes de licencia/permisos
+Module20000Desc=Definir y realizar un seguimiento de las solicitudes de licencia/permisos de los empleados
+Module39000Desc=Lotes, números de serie, gestión de fechas de caducidad/caducidad de productos (eat-by/sell-by date)
 Module40000Name=Multi moneda
 Module40000Desc=Utilizar monedas alternativas en precios y documentos.
 Module50000Name=Caja de pago
+Module50000Desc=Ofrezca a los clientes una página de pago en línea PayBox (tarjetas de crédito / débito). Esto se puede utilizar para permitir que sus clientes realicen pagos ad-hoc o pagos relacionados con un objeto específico de Dolibarr (factura, pedido, etc.)
+Module50150Desc=Módulo de Punto de Venta TakePOS (TPV con pantalla táctil, para tiendas, bares o restaurantes).
+Module50200Desc=Ofrezca a los clientes una página de pago en línea de PayPal (cuenta de PayPal o tarjetas de crédito / débito). Esto se puede utilizar para permitir que sus clientes realicen pagos ad-hoc o pagos relacionados con un objeto específico de Dolibarr (factura, pedido, etc.)
+Module50300Desc=Ofrezca a los clientes una página de pago en línea de Stripe (tarjetas de crédito / débito). Esto se puede utilizar para permitir que sus clientes realicen pagos ad-hoc o pagos relacionados con un objeto específico de Dolibarr (factura, pedido, etc.)
+Module50400Name=Contabilidad (doble entrada)
 Module54000Desc=Impresión directa (sin abrir los documentos) mediante la interfaz IPP de Cups (la impresora debe estar visible desde el servidor y CUPS debe estar instalada en el servidor).
 Module55000Name=Encuesta, encuesta o voto
+Module55000Desc=Cree sondeos, encuestas o votos en línea (como Doodle, Studs, RDVz, etc.)
 Module60000Desc=Módulo para gestionar comisiones.
 Module62000Desc=Añadir características para gestionar Incoterms.
+Module63000Desc=Gestionar recursos (impresoras, coches, salas, ...) para destinarlos a eventos
 Permission11=Lea las facturas de los clientes.
 Permission12=Crear / modificar facturas de clientes.
+Permission13=Invalidar facturas de clientes
 Permission14=Validar facturas de clientes.
 Permission15=Enviar facturas de clientes por correo electrónico.
 Permission16=Crear pagos para las facturas de los clientes.
@@ -389,6 +537,8 @@ Permission45=Proyectos de exportación
 Permission61=Leer intervenciones
 Permission62=Crear / modificar intervenciones.
 Permission67=Intervenciones de exportación
+Permission68=Enviar intervenciones por correo electrónico
+Permission70=Invalidar intervenciones
 Permission71=Leer miembros
 Permission72=Crear / modificar miembros
 Permission75=Configurar tipos de membresía
@@ -405,6 +555,7 @@ Permission95=Leer informes
 Permission101=Leer envios
 Permission102=Crear / modificar envíos.
 Permission104=Validar envíos
+Permission105=Enviar envíos por correo electrónico
 Permission106=Envíos de exportación
 Permission109=Eliminar envíos
 Permission111=Leer cuentas financieras
@@ -413,17 +564,20 @@ Permission113=Configurar cuentas financieras (crear, administrar categorías)
 Permission114=Conciliar transacciones
 Permission115=Transacciones de exportación y estados de cuenta
 Permission116=Transferencias entre cuentas
+Permission117=Gestionar el envío de cheques
 Permission121=Leer terceros vinculados al usuario.
 Permission122=Crear / modificar terceros vinculados al usuario.
 Permission125=Eliminar terceros vinculados al usuario.
 Permission126=Exportar a terceros
+Permission141=Leer todos los proyectos y tareas (también proyectos privados para los que no soy un contacto)
+Permission142=Crear / modificar todos los proyectos y tareas (también proyectos privados para los que no soy un contacto)
 Permission144=Eliminar todos los proyectos y tareas (también proyectos privados para los que no estoy en contacto)
 Permission146=Leer proveedores
 Permission147=Leer estadísticas
-Permission151=Leer órdenes de pago por domiciliación bancaria.
-Permission152=Crear / modificar un pago por domiciliación bancaria.
-Permission153=Enviar / Transmitir órdenes de pago de débito directo
-Permission154=Registro de Créditos / Rechazos de órdenes de pago por domiciliación bancaria.
+Permission151=Leer órdenes de pago por débito automático.
+Permission152=Crear / modificar un pago por débito automático.
+Permission153=Enviar / Transmitir órdenes de pago de débito automático
+Permission154=Registro de Créditos / Rechazos de órdenes de pago por débito automático.
 Permission161=Leer contratos / suscripciones
 Permission162=Crear / modificar contratos / suscripciones.
 Permission163=Activar un servicio / suscripción de un contrato.
@@ -436,6 +590,14 @@ Permission173=Eliminar viajes y gastos.
 Permission174=Leer todos los viajes y gastos.
 Permission178=Viajes y gastos de exportación.
 Permission180=Leer proveedores
+Permission181=Leer órdenes de compra
+Permission182=Crear / modificar órdenes de compra
+Permission183=Validar órdenes de compra
+Permission184=Aprobar órdenes de compra
+Permission185=Ordenar o cancelar órdenes de compra
+Permission186=Recibir órdenes de compra
+Permission187=Cerrar órdenes de compra
+Permission188=Cancelar órdenes de compra
 Permission192=Crear lineas
 Permission193=Cancelar lineas
 Permission194=Lee las líneas de ancho de banda
@@ -466,6 +628,7 @@ Permission253=Crea / modifica otros usuarios, grupos y permisos.
 PermissionAdvanced253=Crear / modificar usuarios internos / externos y permisos.
 Permission254=Crear / modificar usuarios externos solamente
 Permission256=Eliminar o deshabilitar otros usuarios
+Permission262=Ampliar el acceso a todos los terceros Y sus objetos (no solo a los terceros para los que el usuario es un representante de ventas). <br> No efectivo para usuarios externos (siempre limitado a ellos mismos para propuestas, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asuntos de asignación).
 Permission271=Leer CA
 Permission272=Leer facturas
 Permission273=Emitir facturas
@@ -473,6 +636,8 @@ Permission281=Leer contactos
 Permission282=Crear / modificar contactos
 Permission291=Leer tarifas
 Permission292=Establecer permisos sobre las tarifas.
+Permission293=Modificar las tarifas del cliente
+Permission301=Crear / modificar códigos de barras
 Permission311=Servicios de lectura
 Permission312=Asignar servicio / suscripción al contrato
 Permission331=Leer marcadores
@@ -488,8 +653,10 @@ Permission401=Leer descuentos
 Permission402=Crear / modificar descuentos.
 Permission403=Validar descuentos
 Permission404=Eliminar descuentos
+Permission430=Usar la barra de depuración
 Permission512=Crear / modificar pagos de salarios.
 Permission514=Eliminar pagos de salarios.
+Permission519=Salarios de exportación
 Permission520=Leer prestamos
 Permission522=Crear / modificar préstamos.
 Permission524=Borrar prestamos
@@ -499,6 +666,18 @@ Permission531=Servicios de lectura
 Permission532=Crear / modificar servicios.
 Permission536=Ver / administrar servicios ocultos
 Permission538=Servicios de exportación
+Permission562=Crear / modificar orden de pago mediante transferencia bancaria
+Permission563=Enviar / transmitir orden de pago mediante transferencia bancaria
+Permission564=Registro de débitos / rechazos de transferencia de crédito
+Permission601=Leer stickers
+Permission602=Crear / modificar stickers
+Permission609=Eliminar stickers
+Permission650=Leer listas de materiales
+Permission651=Crear / actualizar listas de materiales
+Permission652=Eliminar listas de materiales
+Permission660=Leer orden de fabricación (MO)
+Permission661=Crear / actualizar orden de fabricación (MO)
+Permission662=Eliminar orden de fabricación (MO)
 Permission701=Leer donaciones
 Permission702=Crear / modificar donaciones.
 Permission771=Lea los informes de gastos (el suyo y sus subordinados)
@@ -507,16 +686,45 @@ Permission773=Eliminar informes de gastos
 Permission774=Lea todos los informes de gastos (incluso para usuarios no subordinados)
 Permission775=Aprobar informes de gastos.
 Permission776=Informes de gastos de pago
+Permission778=Crear / modificar informes de gastos de todos
 Permission779=Informes de gastos de exportación
 Permission1001=Leer acciones
 Permission1002=Crear / modificar almacenes.
 Permission1003=Borrar almacenes
 Permission1004=Leer movimientos de stock
 Permission1005=Crear / modificar movimientos de stock.
+Permission1102=Crear / modificar recibos de entrega
+Permission1121=Leer propuestas de proveedores
+Permission1122=Crear / modificar propuestas de proveedores
+Permission1123=Validar propuestas de proveedores
+Permission1124=Enviar propuestas de proveedores
+Permission1125=Eliminar propuestas de proveedores
+Permission1126=Cerrar solicitudes de precios de proveedores
 Permission1181=Leer proveedores
+Permission1182=Leer órdenes de compra
+Permission1183=Crear / modificar órdenes de compra
+Permission1184=Validar órdenes de compra
+Permission1185=Aprobar órdenes de compra
+Permission1186=Ordenar órdenes de compra
+Permission1187=Acuse recibo de órdenes de compra
+Permission1188=Eliminar órdenes de compra
+Permission1190=Aprobar (segunda aprobación) órdenes de compra
+Permission1191=Exportar órdenes de proveedores y sus atributos
 Permission1202=Crear / Modificar una exportación
+Permission1231=Leer facturas de proveedores
+Permission1232=Crear / modificar facturas de proveedores
+Permission1233=Validar facturas de proveedores
+Permission1234=Eliminar facturas de proveedores
+Permission1235=Envíe facturas de proveedores por correo electrónico
+Permission1236=Exportar facturas, atributos y pagos de proveedores
+Permission1237=Exportar órdenes de compra y sus detalles
 Permission1251=Ejecutar importaciones masivas de datos externos en la base de datos (carga de datos)
 Permission1321=Exportación de facturas de clientes, atributos y pagos.
+Permission1421=Exportar órdenes de venta y atributos
+Permission1521=Leer documentos
+Permission2401=Leer acciones (eventos o tareas) vinculadas a su cuenta de usuario (si es el propietario del evento o simplemente se le asignó)
+Permission2402=Crear / modificar acciones (eventos o tareas) vinculadas a su cuenta de usuario (si es propietario del evento)
+Permission2403=Eliminar acciones (eventos o tareas) vinculadas a su cuenta de usuario (si es el propietario del evento)
 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.
@@ -527,36 +735,84 @@ Permission2503=Presentar o borrar documentos
 Permission2515=Configurar directorios de documentos
 Permission2801=Usar el cliente FTP en modo de lectura (solo navegar y descargar)
 Permission2802=Usar el cliente FTP en modo de escritura (eliminar o cargar archivos)
+Permission10001=Leer el contenido del sitio web
+Permission10002=Crear / modificar el contenido del sitio web (contenido html y javascript)
+Permission10003=Crear / modificar el contenido del sitio web (código php dinámico). Peligroso, debe reservarse para desarrolladores restringidos.
+Permission10005=Eliminar el contenido del sitio web
+Permission20001=Leer solicitudes de licencia (su licencia y las de sus subordinados)
+Permission20002=Crear / modificar sus solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20003=Eliminar solicitudes de permiso
 Permission20004=Lea todas las solicitudes de permiso (incluso de usuarios no subordinados)
 Permission20005=Crear / modificar solicitudes de permisos para todos (incluso de usuarios no subordinados)
 Permission20006=Solicitudes de licencia de administrador (configuración y actualización del saldo)
+Permission20007=Aprobar solicitudes de licencia
 Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
 Permission23003=Eliminar trabajo programado
 Permission23004=Ejecutar trabajo programado
+Permission50101=Usar punto de venta (SimplePOS)
 Permission50201=Leer transacciones
 Permission50202=Transacciones de importación
+Permission50330=Leer objetos de Zapier
+Permission50331=Crear / actualizar objetos de Zapier
+Permission50401=Vincular productos y facturas con cuentas contables
+Permission50411=Leer operaciones en el libro mayor
+Permission50412=Escribir / editar operaciones en el libro mayor
+Permission50414=Eliminar operaciones en el libro mayor
+Permission50415=Eliminar todas las operaciones por año y diario en el libro mayor
+Permission50418=Operaciones de exportación del libro mayor
+Permission50420=Reportes y reportes de exportación (facturación, saldo, diarios, libro mayor)
+Permission50430=Definir períodos fiscales. Validar transacciones y cerrar periodos fiscales.
+Permission50440=Gestionar plan de cuentas, configuración de contabilidad.
+Permission51002=Crear / actualizar activos
 Permission54001=Impresión
 Permission55002=Crear / modificar encuestas
 Permission59002=Definir márgenes comerciales.
 Permission59003=Lea el margen de cada usuario
 Permission63002=Crear / modificar recursos.
 Permission63004=Vincular recursos a eventos de agenda
+Permission64001=Permitir la impresión directa
+Permission68001=Leer informe intracomunicador
+Permission68002=Crear / modificar informe intracomm
+Permission68004=Eliminar informe de intracomunicación
+DictionaryCompanyType=Tipos de terceros
+DictionaryCompanyJuridicalType=Entidades legales de terceros
+DictionaryProspectLevel=Nivel de potencial de prospección para empresas
+DictionaryProspectContactLevel=Nivel potencial de prospectos para contactos
+DictionaryCanton=Departamentos
+DictionaryCivility=Títulos honoríficos
 DictionaryActions=Tipos de eventos de agenda
+DictionarySocialContributions=Tipos de impuestos fiscales
 DictionaryVAT=Tasas de IVA o tasas de impuesto de ventas
 DictionaryRevenueStamp=Cantidad de timbres fiscales
+DictionaryPaymentConditions=Términos de pago
+DictionaryTypeContact=Tipos de contacto / dirección
+DictionaryTypeOfContainer=Sitio web - tipo de páginas/contenedores del sitio web
+DictionaryFormatCards=Formatos de tarjeta
 DictionarySendingMethods=Métodos de envío
+DictionaryStaff=Número de empleados
 DictionaryAvailability=Retraso en la entrega
 DictionarySource=Origen de las propuestas / pedidos.
 DictionaryAccountancyCategory=Grupos personalizados para informes.
 DictionaryAccountancysystem=Modelos para el plan de cuentas.
 DictionaryAccountancyJournal=Revistas contables
 DictionaryEMailTemplates=Plantillas de correo electrónico
+DictionaryMeasuringUnits=Unidades de medida
+DictionaryProspectStatus=Estado de prospectos para empresas
+DictionaryProspectContactStatus=Estado de cliente potencial para contactos
 DictionaryHolidayTypes=Tipos de licencia
 DictionaryOpportunityStatus=Principal estado para proyecto / Iniciativa
 DictionaryExpenseTaxRange=Informe de gastos - Gama por categoría de transporte
+DictionaryTransportMode=Informe intracomm - modo de transporte
+BackToModuleList=Volver a la lista de módulos
+BackToDictionaryList=Volver a la lista de diccionarios
 TypeOfRevenueStamp=Tipo de timbre fiscal
+VATManagement=Gestión de impuestos sobre las ventas
+VATIsUsedDesc=De forma predeterminada, al crear prospectos, facturas, pedidos, etc., la tasa del impuesto sobre las ventas sigue la regla estándar activa: <br> Si el vendedor no está sujeto al impuesto sobre las ventas, el impuesto sobre las ventas se establece en 0 como predeterminado. <br> Si el (país del vendedor = país del comprador), el impuesto sobre las ventas por defecto es igual al impuesto sobre las ventas del producto en el país del vendedor. Fin de la regla. <br> Si el vendedor y el comprador están en la Comunidad Europea y las mercancías son productos relacionados con el transporte (transporte, envío, línea aérea), el IVA predeterminado es 0. Esta regla depende del país del vendedor; consulte con su contador. El IVA debe ser pagado por el comprador a la oficina de aduanas de su país y no al vendedor. Fin de la regla. <br> Si el vendedor y el comprador están en la Comunidad Europea y el comprador no es una empresa (con un número de IVA intracomunitario registrado), el IVA se establece de forma predeterminada en el tipo de IVA del país del vendedor. Fin de la regla. <br> Si el vendedor y el comprador están en la Comunidad Europea y el comprador es una empresa (con un número de IVA intracomunitario registrado), el IVA es 0 por defecto. Fin de la regla. <br> En cualquier otro caso, el valor predeterminado propuesto es Impuesto sobre las ventas = 0. Fin de la regla.
+VATIsNotUsedDesc=De forma predeterminada, el impuesto a las ventas propuesto es 0, que se puede utilizar para casos como asociaciones, personas físicas o pequeñas empresas.
+VATIsUsedExampleFR=En Francia, significa empresas u organizaciones que tienen un sistema fiscal real (Real simplificado o real normal). Un sistema en el que se declara el IVA.
+VATIsNotUsedExampleFR=En Francia, significa asociaciones que no están declaradas como impuesto sobre las ventas o empresas, organizaciones o profesiones liberales que han elegido el sistema fiscal de microempresas (impuesto sobre las ventas en franquicia) y han pagado una franquicia. Esta opción mostrará la referencia "Impuesto sobre las ventas no aplicable - art-293B de CGI" en las facturas.
+TypeOfSaleTaxes=Tipo de impuesto a las ventas
 LTRate=Tipo
 LocalTax1IsNotUsed=No usar segundo impuesto
 LocalTax1IsUsedDesc=Use un segundo tipo de impuesto (que no sea el primero)
@@ -576,10 +832,14 @@ LocalTax2IsUsedDescES=La tasa de IRPF por defecto al crear prospectos, facturas,
 LocalTax2IsNotUsedDescES=Por defecto, el IRPF propuesto es 0. Fin de la regla.
 LocalTax2IsUsedExampleES=En España, autónomos y profesionales independientes que prestan servicios y empresas que han optado por el sistema tributario de los módulos.
 LocalTax2IsNotUsedExampleES=En España son empresas no sujetas al régimen fiscal de los módulos.
+RevenueStampDesc=El "timbre fiscal" o "estampillado fiscal" es un impuesto fijo por factura (no depende del monto de la factura). También puede ser un impuesto porcentual, pero utilizar el segundo o tercer tipo de impuesto es mejor para los impuestos porcentuales, ya que las estampillas fiscales no proporcionan ningún informe. Solo unos pocos países utilizan este tipo de impuesto.
+UseRevenueStamp=Utilice un timbre fiscal
+UseRevenueStampExample=El valor del timbre fiscal se define de forma predeterminada en la configuración de los diccionarios (%s - %s - %s)
 CalcLocaltax=Informes sobre impuestos locales
 CalcLocaltax1Desc=Los informes de impuestos locales se calculan con la diferencia entre las ventas de impuestos locales y las compras de impuestos locales
 CalcLocaltax2Desc=Los informes de impuestos locales son el total de las compras de impuestos locales.
 CalcLocaltax3Desc=Los informes de impuestos locales son el total de las ventas de impuestos locales.
+NoLocalTaxXForThisCountry=Según la configuración de impuestos (consulte %s - %s - %s), su país no necesita utilizar ese tipo de impuesto
 LabelUsedByDefault=Etiqueta utilizada de forma predeterminada si no se puede encontrar una traducción para el código
 LabelOnDocuments=Etiqueta en los documentos
 LabelOrTranslationKey=Etiqueta o clave de traducción
@@ -611,29 +871,55 @@ DefaultMaxSizeShortList=Longitud máxima predeterminada para listas cortas (es d
 MessageLogin=Mensaje de la página de inicio de sesión
 LoginPage=Página de inicio de sesión
 PermanentLeftSearchForm=Formulario de búsqueda permanente en el menú de la izquierda.
+EnableMultilangInterface=Habilite el soporte en varios idiomas para las relaciones con clientes o proveedores
+EnableShowLogo=Muestre el logotipo de la empresa en el menú
 CompanyInfo=Empresa / Organización
 CompanyIds=Identidades de la empresa / organización
 CompanyZip=Cremallera
 CompanyTown=Pueblo
 CompanyCurrency=Moneda principal
+IDCountry=ID del País
+LogoSquarredDesc=Debe ser un icono cuadrado (ancho = alto). Este logotipo se utilizará como icono favorito u otra necesidad como para la barra de menú superior (si no está desactivado en la configuración de pantalla).
 OwnerOfBankAccount=Propietario de cuenta bancaria %s
 BankModuleNotActive=Módulo de cuentas bancarias no habilitado
-ShowBugTrackLink=Mostrar enlace "<strong> %s </strong>"
 Alerts=Las alertas
+DelaysOfToleranceDesc=Establezca el retraso antes de que se muestre en pantalla un icono de alerta %s para el elemento tardío.
+Delays_MAIN_DELAY_ACTIONS_TODO=Eventos planificados (eventos de la agenda) no completados
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Orden no procesada
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Orden de compra no procesada
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Propuesta no cerrada
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Propuesta no facturada
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Servicio para activar
+Delays_MAIN_DELAY_RUNNING_SERVICES=Servicio caducado
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Factura de proveedor sin pagar
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Factura de cliente sin pagar
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pendiente de conciliación bancaria
+Delays_MAIN_DELAY_MEMBERS=Cuota de membresía retrasada
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Depósito de cheque no hecho
+Delays_MAIN_DELAY_EXPENSEREPORTS=Informe de gastos para aprobar
+Delays_MAIN_DELAY_HOLIDAYS=Dejar solicitudes para aprobar
 SetupDescription1=Antes de comenzar a utilizar Dolibarr, se deben definir algunos parámetros iniciales y habilitar / configurar los módulos.
+SetupDescription3=<a href="%s"> %s -> %s </a> <br> <br> Parámetros básicos utilizados para personalizar el comportamiento predeterminado de su aplicación (ej., para las funciones relacionadas con el país)
+SetupDescription4=<a href="%s"> %s -> %s </a> <br> <br> Este software es un conjunto de muchos módulos/aplicaciones. Los módulos relacionados con sus necesidades deben estar habilitados y configurados. Las entradas del menú aparecerán con la activación de estos módulos.
+SetupDescription5=Otras entradas del menú de configuración administran parámetros opcionales.
 InfoDolibarr=Sobre Dolibarr
 InfoBrowser=Acerca del navegador
 InfoOS=Sobre el sistema operativo
 InfoWebServer=Sobre el servidor web
 InfoPerf=Sobre actuaciones
+InfoSecurity=Acerca de la seguridad
 BrowserOS=Navegador OS
 ListOfSecurityEvents=Listado de eventos de seguridad de Dolibarr.
+LogEventDesc=Habilite el registro (logging) para eventos de seguridad específicos. Los administradores el registro a través del menú <b> %s - %s </b>. Advertencia, esta función puede generar una gran cantidad de datos en la base de datos.
 AreaForAdminOnly=Los parámetros de configuración solo pueden ser configurados por <b> usuarios administradores </b>.
 SystemInfoDesc=La información del sistema es información técnica diversa que se obtiene en modo de solo lectura y visible solo para administradores.
+SystemAreaForAdminOnly=Esta área solo está disponible para usuarios administradores. Los permisos de usuario de Dolibarr no pueden cambiar esta restricción.
+AccountantDesc=Si tiene un contador/contable externo, puede editar aquí su información.
 AvailableModules=Aplicación / módulos disponibles
 ToActivateModule=Para activar los módulos, vaya al área de configuración (Inicio-> Configuración-> Módulos).
 SessionTimeOut=Tiempo fuera para sesión
 SessionExplanation=Este número garantiza que la sesión nunca caducará antes de este retraso, si el limpiador de sesión se realiza mediante un limpiador de sesión interno de PHP (y nada más). El limpiador interno de sesiones de PHP no garantiza que la sesión caduque después de este retraso. Expirará, después de este retraso, y cuando se ejecute el limpiador de sesiones, por lo que cada acceso <b> %s / %s </b>, pero solo durante el acceso realizado por otras sesiones (si el valor es 0, significa que la eliminación de la sesión es hecho solo por un proceso externo). Nota: en algunos servidores con un mecanismo de limpieza de sesión externo (cron bajo debian, ubuntu ...), las sesiones pueden ser destruidas después de un período definido por una configuración externa, sin importar qué El valor introducido aquí es.
+SessionsPurgedByExternalSystem=Las sesiones en este servidor parecen ser limpiadas por un mecanismo externo (cron en debian, ubuntu ...), probablemente cada <b> %s </b> segundos (= valor del parámetro <b>session.gc_maxlifetime</b>), asi que cambiar el parametro aqui no tiene efecto. Debe pedirle al administrador del servidor que cambie la configuración
 TriggersAvailable=Disparadores disponibles
 TriggersDesc=Los disparadores son archivos que modificarán el comportamiento del flujo de trabajo de Dolibarr una vez que se copien en el directorio <b> htdocs / core / triggers </b>. Realizan nuevas acciones, activadas en eventos Dolibarr (creación de nueva empresa, validación de facturas, ...).
 TriggerDisabledByName=Los disparadores en este archivo están deshabilitados por el sufijo <b> -NORUN </b> en su nombre.
@@ -641,28 +927,57 @@ TriggerDisabledAsModuleDisabled=Los disparadores en este archivo están deshabil
 TriggerAlwaysActive=Los disparadores en este archivo siempre están activos, sean cuales sean los módulos Dolibarr activados.
 TriggerActiveAsModuleActive=Los disparadores en este archivo están activos cuando el módulo <b> %s </b> está habilitado.
 DictionaryDesc=Insertar todos los datos de referencia. Puede agregar sus valores a la predeterminada.
+ConstDesc=Esta página le permite editar (sobre escribir) parámetros que no están disponibles en otras páginas. En su mayoría, estos son parámetros reservados solo para desarrolladores/resolución de problemas avanzada.
 MiscellaneousDesc=Todos los demás parámetros relacionados con la seguridad se definen aquí.
 LimitsSetup=Límites / configuración de precisión
 LimitsDesc=Puede definir límites, precisiones y optimizaciones utilizadas por Dolibarr aquí
+MAIN_MAX_DECIMALS_UNIT=Max. decimales para precios unitarios
+MAIN_MAX_DECIMALS_TOT=Max. decimales para precios totales
+MAIN_MAX_DECIMALS_SHOWN=Max. decimales para los precios <b>que se muestran en la pantalla</b>. Agregue una elipsis <b>...</b> después de este parámetro (ej., "2...") si desea ver "<b>...</b>" con el sufijo del precio truncado.
+MAIN_ROUNDING_RULE_TOT=Paso del rango de redondeo (para países donde el redondeo se realiza en algo diferente a la base 10. Por ejemplo, coloque 0.05 si el redondeo se realiza en pasos de 0.05)
 UnitPriceOfProduct=Precio unitario neto de un producto.
+TotalPriceAfterRounding=Precio total (sin IVA / con IVA) después del redondeo
 ParameterActiveForNextInputOnly=Parámetro efectivo para la siguiente entrada solamente
+NoEventOrNoAuditSetup=No se ha registrado (logged) ningún evento de seguridad. Esto es normal si la auditoría no se ha habilitado en la página "Configuración - Seguridad - Eventos".
 NoEventFoundWithCriteria=No se ha encontrado ningún evento de seguridad para este criterio de búsqueda.
 SeeLocalSendMailSetup=Vea su configuración local de sendmail
+BackupDesc=Una copia de seguridad <b>completa</b> de una instalación Dolibarr requiere dos pasos.
+BackupDesc2=Haga una copia de seguridad del contenido del directorio "documentos" (<b>%s</b>) que contiene todos los archivos cargados y generados. Esto también incluirá todos los archivos de volcado generados en el Paso 1. Esta operación puede durar varios minutos.
+BackupDesc3=Haga una copia de seguridad de la estructura y el contenido de su base de datos (<b>%s</b>) en un archivo de volcado. Para ello, puede utilizar el siguiente asistente.
+BackupDescX=El directorio archivado debe almacenarse en un lugar seguro.
 BackupDescY=El archivo de volcado generado debe almacenarse en un lugar seguro.
 BackupPHPWarning=La copia de seguridad no se puede garantizar con este método. Anterior recomendado.
+RestoreDesc=Para restaurar una copia de seguridad de Dolibarr, se requieren dos pasos.
+RestoreDesc2=Restaure el archivo de respaldo (archivo zip, por ejemplo) del directorio "documentos" en una nueva instalación de Dolibarr o en este directorio de documentos actual (<b>%s</b>).
+RestoreDesc3=Restaure la estructura de la base de datos y los datos de un archivo de volcado de respaldo en la base de datos de la nueva instalación de Dolibarr o en la base de datos de esta instalación actual (<b>%s</b>). Advertencia, una vez que se completa la restauración, debe usar un nombre de usuario / contraseña que existía desde el momento de la copia de seguridad / instalación para conectarse nuevamente. <br>Para restaurar una base de datos de respaldo en esta instalación actual, puede seguir este asistente.
 ForcedToByAModule=Esta regla es forzada a <b> %s </b> por un módulo activado
+PreviousDumpFiles=Archivos de respaldo existentes
+PreviousArchiveFiles=Archivos de almacenamiento existentes
+RunningUpdateProcessMayBeRequired=Parece que es necesario ejecutar el proceso de actualización (la versión del programa %s difiere de la versión de la base de datos %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comandos después de iniciar sesión en un shell con el usuario <b> %s </b> o debe agregar la opción -W al final de la línea de comandos para proporcionar la contraseña de <b> %s </b>.
 YourPHPDoesNotHaveSSLSupport=Funciones SSL no disponibles en tu PHP
 DownloadMoreSkins=Más skins para descargar
+SimpleNumRefModelDesc=Devuelve el número de referencia en el formato %syymm-nnnn donde yy es el año, mm es el mes y nnnn es un número secuencial que se incrementa automáticamente sin reinicio.
+ShowProfIdInAddress=Mostrar identificación profesional con direcciones
+ShowVATIntaInAddress=Ocultar el número de IVA intracomunitario con direcciones
 MeteoStdMod=Modo estandar
 MeteoPercentageModEnabled=Modo porcentual habilitado
 MeteoUseMod=Haga clic para utilizar %s
 TestLoginToAPI=Prueba de inicio de sesión a API
+ProxyDesc=Algunas funciones de Dolibarr requieren acceso a Internet. Defina aquí los parámetros de conexión a Internet, como el acceso a través de un servidor proxy si es necesario.
+ExternalAccess=Acceso externo / Internet
+MAIN_PROXY_USE=Utilice un servidor proxy (de lo contrario, el acceso es directo a Internet)
+MAIN_PROXY_HOST=Servidor proxy: nombre / dirección
+MAIN_PROXY_PORT=Servidor proxy: puerto
+MAIN_PROXY_USER=Servidor proxy: inicio de sesión / usuario
+MAIN_PROXY_PASS=Servidor proxy: contraseña
+DefineHereComplementaryAttributes=Defina cualquier atributo adicional/personalizado que deba agregarse a: %s
 ExtraFields=Atributos complementarios
 ExtraFieldsLines=Atributos complementarios (líneas)
 ExtraFieldsLinesRec=Atributos complementarios (plantillas facturas líneas)
 ExtraFieldsSupplierOrdersLines=Atributos complementarios (líneas de orden)
 ExtraFieldsSupplierInvoicesLines=Atributos complementarios (líneas de factura)
+ExtraFieldsThirdParties=Atributos complementarios (terceros)
 ExtraFieldsContacts=Atributos complementarios (contactos / dirección)
 ExtraFieldsMember=Atributos complementarios (miembro)
 ExtraFieldsMemberType=Atributos complementarios (tipo de miembro)
@@ -672,6 +987,7 @@ ExtraFieldsSupplierOrders=Atributos complementarios (pedidos)
 ExtraFieldsSupplierInvoices=Atributos complementarios (facturas)
 ExtraFieldsProject=Atributos complementarios (proyectos)
 ExtraFieldsProjectTask=Atributos complementarios (tareas)
+ExtraFieldsSalaries=Atributos complementarios (salarios)
 ExtraFieldHasWrongValue=El atributo %s tiene un valor incorrecto.
 AlphaNumOnlyLowerCharsAndNoSpace=Solo caracteres alfanuméricos y minúsculas sin espacio.
 SendmailOptionNotComplete=La advertencia, en algunos sistemas Linux, para enviar correo electrónico desde su correo electrónico, la configuración de ejecución de sendmail debe contener la opción -ba (parámetro mail.force_extra_parameters en su archivo php.ini). Si algunos destinatarios nunca reciben correos electrónicos, intente editar este parámetro de PHP con mail.force_extra_parameters = -ba).
@@ -679,6 +995,7 @@ PathToDocuments=Camino a los documentos
 SendmailOptionMayHurtBuggedMTA=La función para enviar correos electrónicos utilizando el método "PHP mail direct" generará un mensaje de correo que algunos servidores de correo de recepción podrían no analizar correctamente. El resultado es que algunos correos no pueden ser leídos por personas alojadas en esas plataformas con errores. Este es el caso de algunos proveedores de Internet (Ex: Orange en Francia). Esto no es un problema con Dolibarr o PHP, sino con el servidor de correo receptor. Sin embargo, puede agregar una opción MAIN_FIX_FOR_BUGGED_MTA a 1 en Configuración - Otro para modificar Dolibarr para evitar esto. Sin embargo, puede experimentar problemas con otros servidores que usan estrictamente el estándar SMTP. La otra solución (recomendada) es usar el método "biblioteca de sockets SMTP", que no tiene inconvenientes.
 TranslationSetup=Configuración de la traducción
 TranslationOverwriteKey=Sobrescribir una cadena de traducción
+TranslationDesc=Cómo configurar el idioma de la pantalla:<br> * Predeterminado/Todo el sistema: menú <strong> Inicio -> Configuración -> Pantalla </strong> <br> * Por usuario: haga clic en el nombre de usuario en la parte superior de la pantalla y modifique la pestaña de usuario <strong>la configuración de pantalla de usuario</strong>.
 TranslationOverwriteDesc=También puede anular cadenas que llenan la siguiente tabla. Elija su idioma en el menú desplegable "%s", inserte la cadena de clave de traducción en "%s" y su nueva traducción en "%s"
 TranslationOverwriteDesc2=Puede usar la otra pestaña para ayudarlo a saber qué clave de traducción usar
 TranslationString=Cadena de traducción
@@ -690,27 +1007,50 @@ TransKeyWithoutOriginalValue=Has forzado una nueva traducción para la clave de
 YouMustEnableOneModule=Debes habilitar al menos 1 módulo
 ClassNotFoundIntoPathWarning=La clase %s no se encuentra en la ruta de PHP
 YesInSummer=Si en verano
+OnlyFollowingModulesAreOpenedToExternalUsers=Tenga en cuenta que solo los siguientes módulos están disponibles para usuarios externos (independientemente de los permisos de dichos usuarios) y solo si se otorgan permisos: <br>
 SuhosinSessionEncrypt=Almacenamiento de sesión encriptado por Suhosin.
 ConditionIsCurrently=La condición es actualmente %s
+YouUseBestDriver=Utiliza el controlador %s, que es el mejor controlador disponible actualmente.
 YouDoNotUseBestDriver=Utiliza el controlador %s pero se recomienda el controlador %s.
 SearchOptim=Optimización de búsqueda
+YouHaveXObjectUseSearchOptim=Tiene %s %s en la base de datos. Puede agregar la constante %s a 1 en Inicio - Configuración - Otros. Limite la búsqueda al comienzo de las cadenas, lo que hace posible que la base de datos use índices y debería obtener una respuesta inmediata.
+YouHaveXObjectAndSearchOptimOn=Tiene %s %s en la base de datos y la constante %s se establece en 1 en  Inicio - Configuración - Otros.
 BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos el uso de Firefox, Chrome, Opera o Safari.
+PHPModuleLoaded=Se cargó el componente PHP %s
+PreloadOPCode=Preloaded OPCode esta en uso.
+AddRefInList=Mostrar lista de información de referencia del cliente/proveedor (seleccione lista o cuadro combinado) y la mayor parte del hipervínculo. <br> Los terceros aparecerán con el formato de nombre "CC12345 - SC45678 - La Gran Compañia S.A.". en lugar de "La Gran Compañia S.A.".
+AddAdressInList=Mostrar lista de información de dirección de cliente / proveedor (seleccione lista o cuadro combinado) <br> Los terceros aparecerán con un formato de nombre de "La Gran Compañia S.A.. - Calle 21 #2-25 00000 Valle del Cauca - Colombia" en lugar de "La Gran Compañia S.A..
+AddEmailPhoneTownInContactList=Mostrar correo electrónico de contacto (o teléfonos si no está definido) y lista de información de la ciudad (selecciones lista o cuadro combinado) <br> Los contactos aparecerán con un formato de nombre de "Pepito Perez - pepito.perez@email.com - Cali" o "Pepito Perez - 315 000 0000 - Cali" en lugar de "Pepito Perez".
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
 FillThisOnlyIfRequired=Ejemplo: +2 (rellenar solo si se experimentan problemas de compensación de zona horaria)
+NumberingModules=Modelos de numeración
+DocumentModules=Modelos de documentos
 PasswordGenerationNone=No sugiera una contraseña generada. La contraseña debe escribirse manualmente.
 PasswordGenerationPerso=Devuelva una contraseña de acuerdo con su configuración definida personalmente.
 SetupPerso=Según su configuración
 PasswordPatternDesc=Descripción del patrón de contraseña
+RuleForGeneratedPasswords=Reglas para generar y validar contraseñas
+DisableForgetPasswordLinkOnLogonPage=No mostrar el enlace "Contraseña olvidada" en la página de inicio de sesión
 UsersSetup=Configuración del módulo de usuarios
+UserMailRequired=Correo electrónico necesario para crear un nuevo usuario
+UserHideInactive=Ocultar a los usuarios inactivos de todas las listas combinadas de usuarios (no recomendado: esto puede significar que no podrá filtrar o buscar usuarios antiguos en algunas páginas)
 HRMSetup=Configuración del módulo HRM
 CompanySetup=Configuración del módulo de empresas.
+CompanyCodeChecker=Opciones para la generación automática de códigos de cliente / proveedor
+AccountCodeManager=Opciones para la generación automática de códigos contables de clientes / proveedores
+NotificationsDesc=Las notificaciones por correo electrónico se pueden enviar automáticamente para algunos eventos de Dolibarr. <br> Los destinatarios de las notificaciones se pueden definir:
+NotificationsDescUser=* por usuario, un usuario a la vez.
+NotificationsDescGlobal=* o configurando direcciones de correo electrónico globales en esta página de configuración.
 DocumentModelOdt=Genere documentos desde plantillas de OpenDocument (archivos .ODT / .ODS de LibreOffice, OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Marca de agua en el proyecto de documento
 JSOnPaimentBill=Activar función para autocompletar líneas de pago en forma de pago
 CompanyIdProfChecker=Reglas para las identificaciones profesionales
+MustBeMandatory=¿Obligatorio crear terceros (si se define el número de IVA o el tipo de empresa)?
 MustBeInvoiceMandatory=¿Obligatorio validar las facturas?
 TechnicalServicesProvided=Servicios tecnicos prestados
+WebDAVSetupDesc=Este es el enlace para acceder al directorio WebDAV. Contiene un directorio "público" abierto a cualquier usuario que conozca la URL (si se permite el acceso al directorio público) y un directorio "privado" que necesita una cuenta / contraseña de inicio de sesión existente para acceder.
+WebDavServer=URL raíz del servidor %s: %s
 WebCalUrlForVCalExport=Un enlace de exportación a formato <b> %s </b> está disponible en el siguiente enlace: %s
 BillsSetup=Configuración del módulo de facturas.
 BillsNumberingModule=Modelo de numeración de facturas y notas de crédito.
@@ -718,18 +1058,30 @@ BillsPDFModules=Modelos de documentos de facturas.
 BillsPDFModulesAccordindToInvoiceType=La factura documenta los modelos según el tipo de factura.
 PaymentsPDFModules=Modelos de documentos de pago.
 ForceInvoiceDate=Forzar fecha de factura a fecha de validación
+SuggestedPaymentModesIfNotDefinedInInvoice=Modo de pago sugerido en la factura de forma predeterminada si no está definido en la factura
+SuggestPaymentByRIBOnAccount=Sugerir pago por retiro a cuenta
+SuggestPaymentByChequeToAddress=Sugerir pago con cheque a
 FreeLegalTextOnInvoices=Texto libre en las facturas.
 WatermarkOnDraftInvoices=Marca de agua en los proyectos de factura (ninguno si está vacío)
 PaymentsNumberingModule=Modelo de numeración de pagos.
+SuppliersPayment=Pagos a proveedores
 PropalSetup=Configuración del módulo de propuestas comerciales.
 ProposalsNumberingModules=Propuesta de modelos de numeración comercial.
 ProposalsPDFModules=Propuesta comercial de modelos de documentos.
+SuggestedPaymentModesIfNotDefinedInProposal=Modo de pago sugerido a propuesta de forma predeterminada si no está definido en la propuesta
 FreeLegalTextOnProposal=Texto libre sobre propuestas comerciales.
 WatermarkOnDraftProposal=Marca de agua en proyectos de propuestas comerciales (ninguno si está vacío)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Consultar el destino de la cuenta bancaria de la propuesta.
+SupplierProposalSetup=Configuración del módulo de proveedores de solicitudes de precio
+SupplierProposalNumberingModules=Solicitudes de precio modelos de numeración de proveedores
+SupplierProposalPDFModules=Solicitudes de precio modelos de documentos de proveedores
+FreeLegalTextOnSupplierProposal=Texto libre sobre solicitudes de precio proveedores
+WatermarkOnDraftSupplierProposal=Marca de agua en los proveedores de solicitudes de precios preliminares (ninguna si está vacía)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Pregunte por el destino de la cuenta bancaria de la solicitud de precio
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pregunte por la fuente de almacén para el pedido
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pregunte por el destino de la cuenta bancaria de la orden de compra
+SuggestedPaymentModesIfNotDefinedInOrder=Modo de pago sugerido en el pedido de venta por defecto si no está definido en el pedido
+OrdersSetup=Configuración de la gestión de pedidos de venta
 OrdersNumberingModules=Modelos de numeración de pedidos.
 OrdersModelModule=Ordenar documentos modelos
 WatermarkOnDraftOrders=Marca de agua en órdenes de giro (ninguna si está vacía)
@@ -748,7 +1100,9 @@ WatermarkOnDraftContractCards=Marca de agua en los proyectos de contrato (ningun
 MembersSetup=Configuración del módulo de miembros
 MemberMainOptions=Principales opciones
 AdherentLoginRequired=Administrar un inicio de sesión para cada miembro
+AdherentMailRequired=Se requiere correo electrónico para crear un nuevo miembro
 MemberSendInformationByMailByDefault=La casilla de verificación para enviar la confirmación de correo a los miembros (validación o nueva suscripción) está activada de forma predeterminada
+MEMBER_REMINDER_EMAIL=Habilite el recordatorio automático <b> por correo electrónico </b> de suscripciones caducadas. Nota: El módulo <strong> %s </strong> debe estar habilitado y configurado correctamente para enviar recordatorios.
 LDAPSetup=Configuración de LDAP
 LDAPSynchronizeUsers=Organización de usuarios en LDAP.
 LDAPSynchronizeGroups=Organización de grupos en LDAP.
@@ -756,6 +1110,7 @@ LDAPSynchronizeContacts=Organización de contactos en LDAP.
 LDAPSynchronizeMembers=Organización de los miembros de la fundación en LDAP.
 LDAPSynchronizeMembersTypes=Organización de los tipos de miembros de la fundación en LDAP.
 LDAPServerPort=Puerto de servicio
+LDAPServerPortExample=Puerto predeterminado: 389
 LDAPServerUseTLS=Utilizar TLS
 LDAPServerUseTLSExample=Su servidor LDAP utiliza TLS
 LDAPServerDn=DN de servidor
@@ -804,19 +1159,43 @@ LDAPSetupForVersion2=Servidor LDAP configurado para la versión 2
 LDAPDolibarrMapping=Mapeo de Dolibarr
 LDAPLdapMapping=Mapeo LDAP
 LDAPFieldLoginUnix=Login (Unix)
+LDAPFieldLoginExample=Ejemplo: uid
+LDAPFilterConnectionExample=Ejemplo: &(objectClass=inetOrgPerson)
 LDAPFieldLoginSamba=Login (samba, directorio activo)
+LDAPFieldLoginSambaExample=Ejemplo: samaccountname
+LDAPFieldFullnameExample=Ejemplo: cn
 LDAPFieldPasswordNotCrypted=Contraseña no cifrada
+LDAPFieldPasswordExample=Ejemplo: userPassword
+LDAPFieldCommonNameExample=Ejemplo: cn
+LDAPFieldNameExample=Ejemplo: sn
+LDAPFieldFirstNameExample=Ejemplo: givenName
 LDAPFieldMail=Dirección de correo electrónico
+LDAPFieldMailExample=Ejemplo: correo
 LDAPFieldPhone=Numero de telefono profesional
+LDAPFieldPhoneExample=Ejemplo: numerodeteléfono
 LDAPFieldHomePhone=Número de teléfono personal
+LDAPFieldHomePhoneExample=Ejemplo: homephone
 LDAPFieldMobile=Teléfono celular
+LDAPFieldMobileExample=Ejemplo: celular
 LDAPFieldFax=Número de fax
+LDAPFieldFaxExample=Ejemplo: facsimiletelephonenumber
 LDAPFieldAddress=Calle
+LDAPFieldAddressExample=Ejemplo: calle
 LDAPFieldZip=Cremallera
+LDAPFieldZipExample=Ejemplo: codigoPostal
 LDAPFieldTown=Pueblo
+LDAPFieldTownExample=Ejemplo: l
+LDAPFieldDescriptionExample=Ejemplo: descripcion
 LDAPFieldNotePublic=Nota publica
+LDAPFieldNotePublicExample=Ejemplo: notaPublica
+LDAPFieldGroupMembersExample=Ejemplo: miembroUnico
+LDAPFieldCompanyExample=Ejemplo: o
+LDAPFieldSidExample=Ejemplo: objectid
 LDAPFieldEndLastSubscription=Fecha de finalización de la suscripción
 LDAPFieldTitleExample=Ejemplo: titulo
+LDAPFieldGroupid=Identificación del grupo
+LDAPFieldUseridExample=Ejemplo: uidnumber
+LDAPFieldHomedirectoryprefix=Prefijo del directorio de inicio
 LDAPSetupNotComplete=La configuración de LDAP no está completa (vaya a otras pestañas)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No hay administrador o contraseña proporcionada. El acceso LDAP será anónimo y en modo de solo lectura.
 LDAPDescContact=Esta página le permite definir el nombre de los atributos LDAP en el árbol LDAP para cada información encontrada en los contactos de Dolibarr.
@@ -828,6 +1207,9 @@ LDAPDescValues=Los valores de ejemplo están diseñados para <b> OpenLDAP </b> c
 ForANonAnonymousAccess=Para un acceso autenticado (por ejemplo, para un acceso de escritura)
 PerfDolibarr=Configuración de rendimiento / informe de optimización
 YouMayFindPerfAdviceHere=Esta página proporciona algunas verificaciones o consejos relacionados con el rendimiento.
+NotInstalled=No instalado.
+NotSlowedDownByThis=No retrasado por esto.
+NotRiskOfLeakWithThis=No hay riesgo de fugas con esto.
 ApplicativeCache=Caché aplicativo
 MemcachedNotAvailable=No se encontró ningún caché aplicativo. Puede mejorar el rendimiento instalando un servidor de caché Memcached y un módulo capaz de usar este servidor de caché. 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>. Tenga en cuenta que muchos proveedores de alojamiento web no proporcionan dicho servidor de caché.
 MemcachedModuleAvailableButNotSetup=Se encontró el módulo memcached para el caché de aplicación, pero la configuración del módulo no está completa.
@@ -845,6 +1227,8 @@ CacheByClient=Caché por navegador
 CompressionOfResources=Compresión de respuestas HTTP
 CompressionOfResourcesDesc=Por ejemplo, usando la directiva de Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Tal detección automática no es posible con los navegadores actuales
+DefaultValuesDesc=Aquí puede definir el valor predeterminado que desea utilizar al crear un nuevo registro y / o filtros predeterminados o el orden de clasificación cuando enumera registros.
+DefaultCreateForm=Valores predeterminados (para usar en formularios)
 DefaultSearchFilters=Filtros de búsqueda predeterminados
 DefaultSortOrder=Orden de orden predeterminado
 DefaultFocus=Campos de enfoque por defecto
@@ -852,6 +1236,9 @@ DefaultMandatory=Campos de formulario obligatorios
 ProductSetup=Configuración del módulo de productos
 ServiceSetup=Configuración del módulo de servicios
 ProductServiceSetup=Configuración de módulos de productos y servicios.
+NumberOfProductShowInSelect=Número máximo de productos para mostrar en listas de selección combinadas (0 = sin límite)
+ViewProductDescInFormAbility=Mostrar descripciones de productos en formularios (de lo contrario, se muestran en una ventana emergente de información sobre herramientas)
+DoNotAutofillButAutoConcat=No llene automáticamente el campo de entrada con la descripción del producto. La descripción del producto se concatenará a la descripción ingresada automáticamente.
 MergePropalProductCard=Active en la pestaña Archivos adjuntos del producto / servicio una opción para fusionar el documento PDF del producto a la propuesta PDF azur si el producto / servicio está en la propuesta
 UseSearchToSelectProductTooltip=Además, si tiene una gran cantidad de productos (> 100 000), puede aumentar la velocidad configurando la constante PRODUCT_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otros. La búsqueda se limitará entonces al inicio de la cadena.
 UseSearchToSelectProduct=Espere hasta que presione una tecla antes de cargar el contenido de la lista de combo de productos (esto puede aumentar el rendimiento si tiene una gran cantidad de productos, pero es menos conveniente)
@@ -867,6 +1254,7 @@ SyslogFacility=Instalaciones
 SyslogFilename=Nombre de archivo y ruta
 YouCanUseDOL_DATA_ROOT=Puede usar DOL_DATA_ROOT / dolibarr.log para un archivo de registro en el directorio de "documentos" de Dolibarr. Puede establecer una ruta diferente para almacenar este archivo.
 ErrorUnknownSyslogConstant=La constante %s no es una constante de Syslog conocida
+OnlyWindowsLOG_USER=En Windows, solo se admitirá la función LOG_USER
 CompressSyslogs=Compresión y copia de seguridad de los archivos de registro de depuración (generados por el módulo Registro para depuración)
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure la tarea de limpieza programada para establecer la frecuencia de copia de seguridad del registro
 DonationsSetup=Configuración del módulo de donación.
@@ -892,7 +1280,13 @@ NewRSS=Nuevo feed RSS
 RSSUrl=URL de RSS
 RSSUrlExample=Un feed RSS interesante
 MailingSetup=Configuración del módulo de EMailing
+MailingEMailFrom=Correo electrónico del remitente (De) para los correos electrónicos enviados mediante el módulo de correo electrónico
+MailingEMailError=Devolver correo electrónico (errores a) para correos electrónicos con errores
 MailingDelay=Segundos para esperar después de enviar el siguiente mensaje.
+NotificationSetup=Configuración del módulo de notificación por correo electrónico
+NotificationEMailFrom=Correo electrónico del remitente (De) para los correos electrónicos enviados por el módulo de notificaciones
+FixedEmailTarget=Recipiente
+SendingsSetup=Configuración del módulo de envío
 SendingsReceiptModel=Enviando recibo modelo
 SendingsNumberingModules=Módulos de numeración de envíos.
 SendingsAbility=Soporte de hojas de envío para entregas a clientes.
@@ -905,11 +1299,14 @@ FreeLegalTextOnDeliveryReceipts=Texto libre en los recibos de entrega
 ActivateFCKeditor=Activar editor avanzado para:
 FCKeditorForCompany=Creación / edición de WYSIWIG de elementos, descripción y nota (excepto productos / servicios)
 FCKeditorForProduct=WYSIWIG creación / edición de productos / servicios descripción y nota
+FCKeditorForProductDetails=WYSIWIG creación / edición de líneas de detalle de productos para todas las entidades (propuestas, pedidos, facturas, etc ...). <span class="warning">Advertencia: El uso de esta opción para este caso no se recomienda seriamente, ya que puede crear problemas con caracteres especiales y formato de página al crear archivos PDF.</span>
 FCKeditorForMailing=Creación / edición WYSIWIG para eMailings masivos (Herramientas-> eMailing)
 FCKeditorForUserSignature=Creación / edición WYSIWIG de la firma del usuario.
 FCKeditorForMail=Creación / edición WYSIWIG para todo el correo (excepto Herramientas-> eMailing)
+FCKeditorForTicket=Creación / edición WYSIWIG para entradas
 StockSetup=Configuración del módulo de stock
 IfYouUsePointOfSaleCheckModule=Si usa el módulo de Punto de Venta (POS) provisto por defecto o un módulo externo, su configuración puede ser ignorada por su módulo de POS. La mayoría de los módulos POS están diseñados de forma predeterminada para crear una factura inmediatamente y disminuir el stock, independientemente de las opciones aquí. Por lo tanto, si necesita o no una disminución de stock al registrar una venta desde su POS, verifique también la configuración de su módulo POS.
+Menu=Menú
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada del menú superior
 NewMenu=Nuevo menu
 MenuHandler=Manejador de menú
@@ -934,6 +1331,8 @@ TaxSetup=Configuración del módulo de impuestos, impuestos sociales o fiscales
 OptionVatMode=IVA debido
 OptionVATDefault=Base estandar
 OptionVATDebitOption=Base devengada
+OptionVatDefaultDesc=Se adeuda el IVA: <br> - en la entrega de bienes (según la fecha de la factura) <br> - en pagos por servicios
+OptionVatDebitOptionDesc=Se adeuda el IVA: <br> - en la entrega de bienes (según la fecha de la factura) <br> - en la factura (débito) de los servicios
 OptionPaymentForProductAndServices=Base de efectivo para productos y servicios.
 OptionPaymentForProductAndServicesDesc=Se debe el IVA: <br> - en el pago de bienes <br> - en los pagos de servicios
 SummaryOfVatExigibilityUsedByDefault=Tiempo de elegibilidad de IVA por defecto según la opción elegida:
@@ -953,19 +1352,30 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (administrados en el menú Configura
 AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento
 AGENDA_DEFAULT_FILTER_TYPE=Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
+AGENDA_DEFAULT_VIEW=¿Qué vista desea abrir de forma predeterminada al seleccionar el menú Agenda?
+AGENDA_REMINDER_BROWSER=Habilite el recordatorio de eventos <b> en el navegador del usuario </b> (Cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. Cada usuario puede deshabilitar dichas notificaciones desde la configuración de notificaciones del navegador).
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar notificación de sonido
+AGENDA_REMINDER_EMAIL=Habilite el recordatorio de evento <b> por correo electrónico </b> (la opción de recordatorio / retraso se puede definir en cada evento).
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en vista de agenda
 ClickToDialSetup=Haga clic para configurar el módulo de marcado.
 ClickToDialUrlDesc=Url llamado cuando se hace un clic en el teléfono picto. En la URL, puede usar las etiquetas <br> <b> __PHONETO__ </b> que se reemplazarán con el número de teléfono de la persona a la que llamará <br> <b> __PHONEFROM__ </b> que se reemplazará con el número de teléfono de la llamada persona (la suya) <br> <b> __LOGIN__ </b> que será reemplazada por el inicio de sesión de clicktodial (definido en la tarjeta de usuario) <br> <b> __PASS__ </b> que será reemplazada por la contraseña de clicktodial (definida por el usuario tarjeta).
+ClickToDialDesc=Este módulo cambia los números de teléfono, cuando se usa una computadora de escritorio, en enlaces en los que se puede hacer clic. Un clic llamará al número. Esto se puede usar para iniciar la llamada telefónica cuando usa un softphone en su escritorio o cuando usa un sistema CTI basado en el protocolo SIP, por ejemplo. Nota: cuando se usa un teléfono inteligente, siempre se puede hacer clic en los números de teléfono.
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
 ClickToDialUseTelLinkDesc=Use este método si sus usuarios tienen un softphone o una interfaz de software instalada en la misma computadora que el navegador y se le llama cuando hace clic en un enlace en su navegador que comienza con "tel:". Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe configurar esto en "No" y completar el siguiente campo.
+CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
 CashDeskBankAccountForSell=Cuenta predeterminada para usar para recibir pagos en efectivo
+CashDeskBankAccountForCheque=Cuenta predeterminada para usar para recibir pagos con cheque
 CashDeskBankAccountForCB=Cuenta predeterminada a utilizar para recibir pagos con tarjetas de crédito.
+CashDeskBankAccountForSumup=Cuenta bancaria predeterminada para usar para recibir pagos por SumUp
 CashDeskDoNotDecreaseStock=Deshabilite la reducción de existencias cuando se realiza una venta desde el punto de venta (si es "no", la reducción de existencias se realiza para cada venta realizada desde POS, independientemente de la opción establecida en el stock de módulos).
 CashDeskIdWareHouse=Forzar y restringir el almacén para utilizar para la disminución de stock
 StockDecreaseForPointOfSaleDisabled=Disminución de stock desde punto de venta deshabilitado.
+StockDecreaseForPointOfSaleDisabledbyBatch=La disminución de stock en POS no es compatible con el módulo de gestión de serie / lote (actualmente activo), por lo que la disminución de stock está desactivada.
 CashDeskYouDidNotDisableStockDecease=No desactivó la disminución de existencias al realizar una venta desde el punto de venta. Por lo tanto se requiere un almacén.
+CashDeskForceDecreaseStockLabel=Se obligó a reducir las existencias de productos por lotes.
+CashDeskForceDecreaseStockDesc=Disminuya primero por las fechas más antiguas de Eatby y Sellby.
+CashDeskReaderKeyCodeForEnter=Código clave para "Enter" definido en el lector de códigos de barras (Ejemplo: 13)
 BookmarkSetup=Configuración del módulo de marcador
 BookmarkDesc=Este módulo le permite administrar los marcadores. También puede agregar accesos directos a cualquier página de Dolibarr o sitios web externos en su menú de la izquierda.
 NbOfBoomarkToShow=Número máximo de marcadores para mostrar en el menú de la izquierda
@@ -979,9 +1389,18 @@ ApiExporerIs=Puedes explorar y probar las API en la URL
 OnlyActiveElementsAreExposed=Solo se exponen los elementos de los módulos habilitados.
 WarningAPIExplorerDisabled=El explorador de API ha sido deshabilitado. API Explorer no es necesario para proporcionar servicios de API. Es una herramienta para el desarrollador para encontrar / probar API REST. Si necesita esta herramienta, vaya a la configuración del módulo API REST para activarla.
 BankSetupModule=Configuración del módulo bancario
+FreeLegalTextOnChequeReceipts=Texto libre en recibos de cheques
 BankOrderShow=Mostrar el orden de las cuentas bancarias para los países que utilizan "número bancario detallado"
 BankOrderESDesc=Orden de visualización en español
+ChequeReceiptsNumberingModule=Verifique el módulo de numeración de recibos
 MultiCompanySetup=Configuración del módulo multiempresa
+SuppliersSetup=Configuración del módulo de proveedor
+SuppliersCommandModel=Plantilla completa de orden de compra
+SuppliersCommandModelMuscadet=Plantilla completa de orden de compra (implementación antigua de plantilla cornas)
+SuppliersInvoiceModel=Plantilla completa de factura de proveedor
+SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de proveedores
+IfSetToYesDontForgetPermission=Si se establece en un valor no nulo, no olvide proporcionar permisos a los grupos o usuarios autorizados para la segunda aprobación
+PathToGeoIPMaxmindCountryDataFile=Ruta al archivo que contiene la traducción de IP de Maxmind al país. <br> Ejemplos: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Tenga en cuenta que su archivo de datos de IP a país debe estar dentro de un directorio que su PHP pueda leer (Verifique su configuración de PHP open_basedir y los permisos del sistema de archivos).
 YouCanDownloadFreeDatFileTo=Puede descargar una <b> versión demo gratuita </b> del archivo de país de Maxmind GeoIP en %s.
 YouCanDownloadAdvancedDatFileTo=También puede descargar una versión más completa de <b>, con actualizaciones, </b> del archivo de país de Maxmind GeoIP en %s.
@@ -1007,18 +1426,29 @@ NoAmbiCaracAutoGeneration=No utilice caracteres ambiguos ("1", "l", "i", "|", "0
 SalariesSetup=Configuración de los salarios del módulo.
 SortOrder=Orden de clasificación
 Format=Formato
+TypePaymentDesc=0: tipo de pago de cliente, 1: tipo de pago de proveedor, 2: tipo de pago de clientes y proveedores
 IncludePath=Incluir ruta (definida en la variable %s)
 ExpenseReportsSetup=Configuración de los informes de gastos del módulo
 TemplatePDFExpenseReports=Plantillas de documentos para generar documentos de informe de gastos.
 ExpenseReportsRulesSetup=Configuración de los informes de gastos del módulo - Reglas
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos.
 NoModueToManageStockIncrease=No se ha activado ningún módulo capaz de gestionar el aumento automático de stock. El aumento de stock se realizará solo con entrada manual.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Puede encontrar opciones para notificaciones por correo electrónico habilitando y configurando el módulo "Notificación".
+ListOfNotificationsPerUser=Lista de notificaciones automáticas por usuario *
+ListOfNotificationsPerUserOrContact=Lista de posibles notificaciones automáticas (sobre eventos comerciales) disponibles por usuario * o por contacto**
+ListOfFixedNotifications=Lista de notificaciones automáticas fijas
 GoOntoUserCardToAddMore=Vaya a la pestaña "Notificaciones" de un usuario para agregar o eliminar notificaciones para usuarios
+GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un tercero para agregar o eliminar notificaciones de contactos / direcciones
 Threshold=Límite
+BackupDumpWizard=Asistente para crear el archivo de volcado de la base de datos (dump file)
+BackupZipWizard=Asistente para construir el directorio de archivos de documentos
 SomethingMakeInstallFromWebNotPossible=La instalación de un módulo externo no es posible desde la interfaz web por el siguiente motivo:
+SomethingMakeInstallFromWebNotPossible2=Por esta razón, el proceso de actualización que se describe aquí es un proceso manual que solo puede realizar un usuario con privilegios.
 InstallModuleFromWebHasBeenDisabledByFile=Su administrador ha deshabilitado la instalación del módulo externo desde la aplicación. Debe pedirle que elimine el archivo <strong> %s </strong> para permitir esta función.
 ConfFileMustContainCustom=La instalación o creación de un módulo externo desde la aplicación debe guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que Dolibarr procese este directorio, debe configurar su <strong> conf / conf.php </strong> para agregar las 2 líneas directivas: <br> <strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong> < br> <strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Resalta las líneas de la tabla cuando el movimiento del mouse pasa sobre
+HighlightLinesColor=Resalte el color de la línea cuando pase el mouse (use 'ffffff' para no resaltar)
+HighlightLinesChecked=Resalte el color de la línea cuando esté marcada (use 'ffffff' para no resaltar)
 TextTitleColor=Color del texto del título de la página.
 LinkColor=Color de enlaces
 PressF5AfterChangingThis=Presione CTRL + F5 en el teclado o borre la caché de su navegador después de cambiar este valor para que sea efectivo
@@ -1028,15 +1458,20 @@ TopMenuDisableImages=Ocultar imágenes en el menú superior
 LeftMenuBackgroundColor=Color de fondo para el menú de la izquierda.
 BackgroundTableTitleColor=Color de fondo para la línea de título de la tabla
 BackgroundTableTitleTextColor=Color del texto para la línea del título de la tabla.
+BackgroundTableTitleTextlinkColor=Color del texto de la línea de enlace del título de la tabla
 BackgroundTableLineOddColor=Color de fondo para líneas de tablas impares.
 BackgroundTableLineEvenColor=Color de fondo para líneas de mesa uniformes
 MinimumNoticePeriod=Período mínimo de notificación (su solicitud de licencia debe realizarse antes de esta demora)
 NbAddedAutomatically=Número de días agregados a los contadores de usuarios (automáticamente) cada mes
+Enter0or1=Ingrese 0 o 1
 UnicodeCurrency=Ingrese aquí entre llaves, lista de bytes que representan el símbolo de moneda. Por ejemplo: para $, ingrese [36] - para brasil R $ [82,36] - para €, ingrese [8364]
 ColorFormat=El color RGB está en formato HEX, por ejemplo: FF0000
+PictoHelp=Nombre del icono en formato dolibarr ('image.png' si está en el directorio del tema actual, 'image.png@nom_du_module' si está en el directorio /img/ de un módulo)
 PositionIntoComboList=Posición de la línea en las listas de combo
 SellTaxRate=Tasa de impuesto de venta
 RecuperableOnly=Sí, para el IVA "No percibido pero recuperable" dedicado a algún estado de Francia. Mantenga el valor en "No" en todos los demás casos.
+UrlTrackingDesc=Si el proveedor o servicio de transporte ofrece una página o sitio web para verificar el estado de sus envíos, puede ingresarlo aquí. Puede usar la clave {TRACKID} en los parámetros de URL para que el sistema la reemplace con el número de seguimiento que el usuario ingresó en la tarjeta de envío.
+OpportunityPercent=Cuando crea un cliente potencial, definirá una cantidad estimada de proyecto/cliente potencial. Según el estado del cliente potencial, esta cantidad se puede multiplicar por esta tasa para evaluar una cantidad total que pueden generar todos sus clientes potenciales. El valor es un porcentaje (entre 0 y 100).
 TemplateForElement=Este registro de plantilla está dedicado a qué elemento
 TemplateIsVisibleByOwnerOnly=La plantilla es visible solo para el propietario
 VisibleNowhere=Visible en ninguna parte
@@ -1046,6 +1481,7 @@ ExpectedChecksum=Suma de comprobación esperada
 CurrentChecksum=Checksum actual
 ForcedConstants=Valores constantes requeridos
 MailToSendProposal=Propuestas de clientes
+MailToSendOrder=Ordenes de venta
 MailToSendInvoice=Facturas de clientes
 MailToSendSupplierRequestForQuotation=Solicitud de presupuesto
 MailToSendSupplierOrder=Ordenes de compra
@@ -1055,7 +1491,11 @@ ByDefaultInList=Mostrar por defecto en la vista de lista
 YouUseLastStableVersion=Usas la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (siéntase libre de usarlo en sus sitios web)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s está disponible. La versión %s es una versión importante con muchas características nuevas tanto para usuarios como para desarrolladores. Puede descargarlo desde el área de descarga del portal https://www.dolibarr.org (subdirectorio Estable versiones). Puede leer <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> para obtener una lista completa de los cambios.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s está disponible. La versión %s es una versión de mantenimiento, por lo que solo contiene correcciones de errores. Recomendamos a todos los usuarios que actualicen a esta versión. Una versión de mantenimiento no introduce nuevas funciones ni cambios en la base de datos. Puede descargarlo desde el área de descargas del portal https://www.dolibarr.org (subdirectorio Versiones estables). Puede leer el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para ver la lista completa de cambios.
+MultiPriceRuleDesc=Cuando la opción "Varios niveles de precios por producto/servicio" está habilitada, puede definir diferentes precios (uno por nivel de precios) para cada producto. Para ahorrarle tiempo, aquí puede ingresar una regla para calcular automáticamente un precio para cada nivel en función del precio del primer nivel, por lo que solo tendrá que ingresar un precio para el primer nivel para cada producto. Esta página está diseñada para ahorrarle tiempo, pero es útil solo si sus precios para cada nivel son relativos al primer nivel. Puede ignorar esta página en la mayoría de los casos.
 ModelModulesProduct=Plantillas para documentos de productos.
+WarehouseModelModules=Plantillas para documentos de bodegas
+ToGenerateCodeDefineAutomaticRuleFirst=Para poder generar códigos automáticamente, primero debe definir un administrador para que defina automáticamente el número de código de barras.
 SeeSubstitutionVars=Ver * nota para la lista de posibles variables de sustitución
 SeeChangeLog=Ver archivo ChangeLog (solo en inglés)
 AllPublishers=Todos los editores
@@ -1086,23 +1526,108 @@ UserHasNoPermissions=Este usuario no tiene permisos definidos.
 TypeCdr=Use "Ninguno" si la fecha del plazo de pago es la fecha de la factura más un delta en días (delta es el campo "%s"). Utilice "Al final del mes", si, después del delta, la fecha debe aumentarse para alcanzar el final del mes (+ un opcional "%s" en días) <br> Use "Actual / Siguiente" para que la fecha del plazo de pago sea el primer Nth del mes después de delta (delta es el campo "%s", N se almacena en el campo "%s")
 WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016) porque el módulo de Registros no reversibles se activa automáticamente.
 WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor de ese módulo y que está seguro de que este módulo no afecta negativamente el comportamiento de su aplicación y cumple con las leyes de su país (%s). Si el módulo introduce una característica ilegal, usted se hace responsable del uso de software ilegal.
+MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para logo en PDF
+NothingToSetup=No se requiere una configuración específica para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Establézcalo en sí si este grupo es un cálculo de otros grupos
+EnterCalculationRuleIfPreviousFieldIsYes=Ingrese la regla de cálculo si el campo anterior se estableció en Sí. <br>Por ejemplo:<br> CODEGRP1+CODEGRP2
+RemoveSpecialChars=Quitar caracteres especiales
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtro de expresiones regulares para limpiar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=No se permite duplicar
 GDPRContact=Oficial de protección de datos (DPO, privacidad de datos o contacto GDPR)
+GDPRContactDesc=Si almacena datos sobre empresas/ciudadanos europeos, puede nombrar el contacto responsable del Reglamento general de protección de datos aquí
 HelpOnTooltip=Texto de ayuda para mostrar en información sobre herramientas
+HelpOnTooltipDesc=Coloque texto o una clave de traducción aquí para que el texto se muestre en una información sobre herramientas cuando este campo aparezca en un formulario
+YouCanDeleteFileOnServerWith=Puede eliminar este archivo en el servidor con la línea de comandos: <br> %s
 ChartLoaded=Plan de cuenta cargado
+VATIsUsedIsOff=Nota: La opción para usar el impuesto sobre las ventas o el IVA se ha establecido en <strong>Off</strong> en el menú %s - %s, por lo que el impuesto sobre las ventas o el IVA usado siempre será 0 para las ventas.
+SwapSenderAndRecipientOnPDF=Cambiar la posición de la dirección del remitente y del destinatario en documentos PDF
+FeatureSupportedOnTextFieldsOnly=Advertencia, función compatible solo con campos de texto y listas combinadas. También se debe establecer un parámetro de URL action=create o action=edit O el nombre de la página debe terminar con 'new.php' para activar esta función.
 EmailCollector=Recolector de correo electronico
+EmailCollectorDescription=Agregue un trabajo programado y una página de configuración para escanear regularmente los buzones de correo electrónico (usando el protocolo IMAP) y registre los correos electrónicos recibidos en su aplicación, en el lugar correcto y / o cree algunos registros automáticamente (como clientes potenciales).
 NewEmailCollector=Nuevo recolector de email
 EMailHost=Host de correo electrónico del servidor IMAP
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
+EmailcollectorOperationsDesc=Las operaciones se ejecutan de arriba a abajo.
+MaxEmailCollectPerCollect=Número máximo de correos electrónicos recolectados por recolección
+ConfirmCloneEmailCollector=¿Está seguro de que desea duplicar el recolector de correo electrónico %s?
+DateLastCollectResult=Fecha del último intento de recolección
+DateLastcollectResultOk=Fecha del último éxito de recolección
 EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
+EmailCollectorConfirmCollect=¿Quieres ejecutar la recolección de este recolector ahora?
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
+XEmailsDoneYActionsDone=%s correos electrónicos calificados, %s correos electrónicos procesados correctamente (para %s registro/acciones realizadas)
 RecordEvent=Grabar evento de correo electrónico
 CreateLeadAndThirdParty=Crea principal (y tercero de ser necesario)
+CreateTicketAndThirdParty=Crear ticket (y vincular a un tercero si fue cargado por una operación anterior)
+CodeLastResult=Último código de resultado
+NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
+LoadThirdPartyFromName=Cargar búsqueda de terceros en %s (solo cargar)
+LoadThirdPartyFromNameOrCreate=Cargar búsqueda de terceros en %s (crear si no se encuentra)
+WithDolTrackingID=Mensaje de una conversación iniciada por un primer correo electrónico enviado desde Dolibarr
+WithoutDolTrackingID=Mensaje de una conversación iniciada por un primer correo electrónico NO enviado desde Dolibarr
 FormatZip=Cremallera
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+MainMenuCode=Código de entrada de menú (menú principal)
+ECMAutoTree=Mostrar árbol ECM automático
+OperationParamDesc=Defina los valores que se utilizarán para el objeto de la acción o cómo extraer los valores. Por ejemplo: <br> objproperty1 = SET: el valor para establecer <br> objproperty2 = SET: un valor con reemplazo de __objproperty1__ <br> objproperty3 = SETIFEMPTY: valor usado si no se ha definido <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:El nombre de mi compañia es\\s([^\\s]*)<br> <br>Utilice el caracter  ; como separador para extraer o establecer varias propiedades.
+OpeningHours=Horario de oficina
+OpeningHoursDesc=Introduzca aquí el horario habitual de trabajo/servicio de su empresa.
+ResourceSetup=Configuración del módulo de recursos
 DisabledResourceLinkUser=Deshabilitar la función para vincular un recurso a los usuarios
 DisabledResourceLinkContact=Deshabilitar función para vincular un recurso a contactos
+EnableResourceUsedInEventCheck=Habilite la función para verificar si un recurso está en uso en un evento
 ConfirmUnactivation=Confirmar el reinicio del módulo
 OnMobileOnly=Solo en pantalla pequeña (teléfono inteligente)
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplifique la interfaz para personas ciegas
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Habilite esta opción si es una persona ciega o si usa la aplicación desde un navegador de texto como Lynx o Links.
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Habilite esta opción si es una persona daltónica; en algunos casos, la interfaz cambiará la configuración del color para aumentar el contraste.
+ThisValueCanOverwrittenOnUserLevel=Este valor puede ser sobrescrito por cada usuario desde su página de usuario - pestaña '%s'
+DefaultCustomerType=Tipo de tercero predeterminado para el formulario de creación de "Cliente nuevo"
+ABankAccountMustBeDefinedOnPaymentModeSetup=Nota: La cuenta bancaria debe estar definida en el módulo de cada modo de pago (Paypal, Stripe, ...) para que esta característica funcione.
+RootCategoryForProductsToSell=Categoría raíz de productos para vender
+RootCategoryForProductsToSellDesc=Si se define, solo los productos dentro de esta categoría o los niños de esta categoría estarán disponibles en el punto de venta
+DebugBarDesc=Barra de herramientas que viene con una gran cantidad de herramientas para simplificar la depuración (debugging)
+DebugBarSetup=Configuración de DebugBar
+LogsLinesNumber=Número de líneas para mostrar en la pestaña de registros
+UseDebugBar=Usa la barra de depuración
+DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas líneas de registro para mantener en la consola
+WarningValueHigherSlowsDramaticalyOutput=Advertencia, los valores más altos ralentizan drásticamente la salida
+ModuleActivated=El módulo %s está activado y ralentiza la interfaz
+ModuleActivatedWithTooHighLogLevel=El módulo %s está activado con un nivel de registro demasiado alto (intente usar un nivel más bajo para mejorar el rendimiento y la seguridad)
+IfYouAreOnAProductionSetThis=Si se encuentra en un entorno de producción, debe establecer esta propiedad en %s.
+AntivirusEnabledOnUpload=Antivirus habilitado en archivos cargados
+EXPORTS_SHARE_MODELS=Los modelos de exportación se comparten con todos
+ExportSetup=Configuración de la exportación del módulo
+ImportSetup=Configuración de la importación del módulo
+InstanceUniqueID=ID único de la instancia
+WithGMailYouCanCreateADedicatedPassword=Si habilitó la validación de 2 pasos con una cuenta de GMail, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar la contraseña de su propia cuenta de https://myaccount.google.com/.
+EmailCollectorTargetDir=Puede ser un comportamiento deseado mover el correo electrónico a otra etiqueta/directorio cuando se procesó correctamente. Simplemente configure el nombre del directorio aquí para usar esta función (NO use caracteres especiales en el nombre). Tenga en cuenta que también debe utilizar una cuenta de inicio de sesión de lectura/escritura.
+EmailCollectorLoadThirdPartyHelp=Puede utilizar esta acción para utilizar el contenido del correo electrónico para buscar y cargar un tercero existente en su base de datos. El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo necesiten. En el campo de parámetro, puede usar, por ejemplo, 'EXTRACT:BODY:Name:\\s([^\\s]*)' si desea extraer el nombre de la tercera parte de una cadena 'Name: name to find' que se encuentra en el cuerpo.
+EndPointFor=Punto final para %s: %s
+DeleteEmailCollector=Eliminar recopilador de correo electrónico
+ConfirmDeleteEmailCollector=¿Está seguro de que desea eliminar este recopilador de correo electrónico?
+RecipientEmailsWillBeReplacedWithThisValue=Los correos electrónicos de los destinatarios siempre se reemplazarán con este valor
+AtLeastOneDefaultBankAccountMandatory=Se debe definir al menos 1 cuenta bancaria predeterminada
+RESTRICT_ON_IP=Permita el acceso solo a algunas direcciones IP de host (no se permiten comodines (wilcards), use un espacio entre los valores). Vacío significa que todos los hosts pueden acceder.
+MakeAnonymousPing=Hacer un ping anónimo '+1' al servidor de Dolibarr Foundation (hecho 1 vez solo después de la instalación) para permitir que la fundación cuente el número de instalaciones Dolibarr.
+FeatureNotAvailableWithReceptionModule=Característica no disponible cuando la recepción del módulo está habilitada
+EmailTemplate=Plantilla para correo electrónico
+EMailsWillHaveMessageID=Los correos electrónicos tendrán una etiqueta 'Referencias' que coincida con esta sintaxis
+PDF_USE_ALSO_LANGUAGE_CODE=Si desea tener algunos textos en su PDF duplicados en 2 idiomas diferentes en el mismo PDF generado, debe configurar aquí este segundo idioma para que el PDF generado contenga 2 idiomas diferentes en la misma página, el elegido al generar PDF y este ( solo unas pocas plantillas PDF admiten esto). Mantener vacío para 1 idioma por PDF.
+FafaIconSocialNetworksDesc=Introduzca aquí el código de un icono de FontAwesome. Si no sabe qué es FontAwesome, puede usar el valor genérico fa-address-book.
+RssNote=Nota: Cada definición de fuente RSS proporciona un widget que debe habilitar para tenerlo disponible en el tablero.
+JumpToBoxes=Vaya a Configuración -> Widgets
+MeasuringScaleDesc=La escala es el número de lugares en los que tiene que mover la parte decimal para que coincida con la unidad de referencia predeterminada. Para el tipo de unidad de "tiempo", es el número de segundos. Los valores entre 80 y 99 son valores reservados.
+TemplateAdded=Plantilla agregada
+MailToSendEventPush=Correo electrónico de recordatorio de evento
+SwitchThisForABetterSecurity=Se recomienda cambiar este valor a %s para mayor seguridad
+YouMayFindSecurityAdviceHere=Puede encontrar avisos de seguridad aquí
+ModuleActivatedDoNotUseInProduction=Se habilitó un módulo diseñado para el desarrollo. No lo habilite en un entorno de producción.
+CombinationsSeparator=Carácter separador para combinaciones de productos
+SeeLinkToOnlineDocumentation=Consulte el enlace a la documentación en línea en el menú superior para ver ejemplos.
+SHOW_SUBPRODUCT_REF_IN_PDF=Si se utiliza la función "%s" del módulo <b>%s</b>, muestre los detalles de los subproductos de un kit en PDF.
+AskThisIDToYourBank=Comuníquese con su banco para obtener esta ID
+ConfFileIsReadableOrWritableByAnyUsers=El archivo conf. puede ser leido y escrito por cualquier usuario.  Otorgue permiso al usuario y grupo del servidor web únicamente.
+MailToSendEventOrganization=Organización del evento
+YouShouldDisablePHPFunctions=Debería deshabilitar las funciones de PHP
+NoWritableFilesFoundIntoRootDir=No se encontraron archivos o directorios grabables de los programas comunes en su directorio raíz (Perfect!)
+ARestrictedPath=Un camino restringido
diff --git a/htdocs/langs/es_CO/assets.lang b/htdocs/langs/es_CO/assets.lang
new file mode 100644
index 00000000000..48475cfe86b
--- /dev/null
+++ b/htdocs/langs/es_CO/assets.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - assets
+AccountancyCodeDepreciationAsset =Código contable (cuenta de activos de depreciación)
+AccountancyCodeDepreciationExpense =Código contable (cuenta de gastos de depreciación)
+AssetsTypeSetup=Configuración del tipo de activo
+ConfirmDeleteAssetType=¿Está seguro de que desea eliminar este tipo de activo?
+ShowTypeCard=Mostrar tipo '%s'
+ModuleAssetsDesc =Descripción de activos
+AssetsSetup =Configuración de activos
+Settings =Ajustes
+AssetsSetupPage =Página de configuración de activos
+ExtraFieldsAssetsType =Atributos complementarios (tipo de activo)
+AssetsTypeId=ID del tipo de activo
+AssetsTypeLabel=Etiqueta de tipo de activo
+MenuNewAsset =Nuevo activo
diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
index 56fc77c7d64..57fe931f374 100644
--- a/htdocs/langs/es_CO/banks.lang
+++ b/htdocs/langs/es_CO/banks.lang
@@ -1,10 +1,131 @@
 # Dolibarr language file - Source file is en_US - banks
-BankAccounts=cuentas bancarias
-BankBalance=Equilibrar
-StandingOrders=Órdenes de débito directo
-StandingOrder=Orden de domiciliación bancaria
+MenuBankCash=Bancos | Efectivo
+MenuNewVariousPayment=Nuevo pago mixto
+BankAccounts=Cuentas bancarias
+AccountRef=Ref de cuenta financiera
+AccountLabel=Etiqueta de cuenta financiera
+CashAccount=Cuenta de efectivo
+CashAccounts=Cuentas de efectivo
+CurrentAccounts=Cuentas Corrientes
+SavingAccounts=Cuentas de ahorros
+ErrorBankLabelAlreadyExists=La etiqueta de la cuenta financiera ya existe
+BankBalanceBefore=Balance anterior
+BankBalanceAfter=Balance siguiente
+BalanceMinimalAllowed=Saldo mínimo permitido
+InitialBankBalance=Balance inicial
+EndBankBalance=Balance final
+CurrentBalance=Balance Actual
+FutureBalance=Balance futuro
+ShowAllTimeBalance=Mostrar balance desde el inicio
+AllTime=Desde el principio
+RIB=Numero de cuenta
+SwiftValid=BIC / SWIFT válido
+SwiftVNotalid=BIC / SWIFT no válido
+StandingOrders=Órdenes de débito automático
+StandingOrder=Órden de débito automático
+PaymentByDirectDebit=Pago por débito automático
+AccountStatement=Estado de cuenta
+AccountStatementShort=Estado
+AccountStatements=Estados de cuenta
+LastAccountStatements=Últimos estados de cuenta
+IOMonthlyReporting=Informes mensuales
+BankAccountDomiciliation=Dirección del banco
+BankAccountOwner=Nombre del propietario de la cuenta
+BankAccountOwnerAddress=Dirección del propietario de la cuenta
+RIBControlError=La verificación de integridad de los valores falló. Esto significa que la información de este número de cuenta no está completa o es incorrecta (verifique el país, los números y el IBAN).
+MenuNewFinancialAccount=Nueva cuenta financiera
+EditFinancialAccount=Editar cuenta
+LabelBankCashAccount=Etiqueta de banco o efectivo
+BankType0=Cuenta de ahorros
+BankType1=Cuenta Corriente o de tarjeta de crédito
+BankType2=Cuenta de efectivo
+AccountsArea=Área de cuentas
+AccountCard=Tarjeta de cuenta
+DeleteAccount=Eliminar cuenta
+ConfirmDeleteAccount=Esta seguro de querer eliminar esta cuenta?
+BankTransactionByCategories=Entradas bancarias por categorías
+BankTransactionForCategory=Entradas bancarias para la categoría <b> %s </b>
+RemoveFromRubrique=Eliminar link con categoría
+RemoveFromRubriqueConfirm=¿Está seguro de que desea eliminar el vínculo entre la entrada y la categoría?
+ListBankTransactions=Lista de entradas bancarias
+IdTransaction=# de transacción
+BankTransactions=Entradas bancarias
+BankTransaction=Entrada bancaria
+ListTransactions=Entradas de lista
+ListTransactionsByCategory=Lista de entradas / categoría
+TransactionsToConciliate=Entradas a conciliar
+TransactionsToConciliateShort=Para conciliar
+Conciliable=Se puede conciliar
+SaveStatementOnly=Guardar solo estado de cuenta
+OnlyOpenedAccount=Solo cuentas abiertas
+AccountToCredit=Cuenta a acreditar
+AccountToDebit=Cuenta para debitar
+DisableConciliation=Deshabilitar la función de conciliación para esta cuenta
+ConciliationDisabled=Función de conciliación inhabilitada
+LinkedToAConciliatedTransaction=Vinculado a una entrada conciliada
 StatusAccountOpened=Activo
 StatusAccountClosed=Cerrado
+LineRecord=Transacción
+AddBankRecord=Añadir entrada
+AddBankRecordLong=Agregar entrada manualmente
+Conciliated=Conciliado
+DateConciliating=Conciliar fecha
+BankLineConciliated=Entrada conciliada con recibo bancario
+Reconciled=Conciliado
+SupplierInvoicePayment=Pago de proveedor
+WithdrawalPayment=Orden de pago de débito
 SocialContributionPayment=Pago de impuestos sociales / fiscales
 TransferTo=A
-Graph=Graficas
+TransferFromToDone=La transferencia de <b> %s </b> a <b> %s </b> de <b>%s</b> %s ha sido grabada
+CheckTransmitter=Remitente
+ValidateCheckReceipt=¿Validar este recibo de cheque?
+ConfirmValidateCheckReceipt=¿Está seguro de que desea enviar este recibo de cheque para su validación? Despues no es posible realizar cambios.
+DeleteCheckReceipt=¿Eliminar este recibo de cheque?
+ConfirmDeleteCheckReceipt=¿Está seguro de que desea eliminar este recibo de cheque?
+BankChecks=Cheques bancarios
+BankChecksToReceipt=Cheques en espera de ser depositados
+BankChecksToReceiptShort=Cheques en espera de ser depositados
+ShowCheckReceipt=Mostrar recibo de depósito de cheque
+NumberOfCheques=No. de cheque
+DeleteTransaction=Eliminar entrada
+ConfirmDeleteTransaction=¿Está seguro de que desea eliminar esta entrada?
+ThisWillAlsoDeleteBankRecord=Esto también eliminará la entrada bancaria generada
+PlannedTransactions=Entradas planificadas
+ExportDataset_banque_1=Entradas bancarias y estado de cuenta
+ExportDataset_banque_2=Comprobante de depósito
+TransactionOnTheOtherAccount=Transacción en la otra cuenta
+PaymentNumberUpdateFailed=No se pudo actualizar el número de pago
+PaymentDateUpdateFailed=No se pudo actualizar la fecha de pago
+BankTransactionLine=Entrada bancaria
+AllAccounts=Todas las cuentas bancarias y en efectivo
+FutureTransaction=Transacción futura. Incapaz de conciliarse.
+SelectChequeTransactionAndGenerate=Seleccione / filtre los cheques que se incluirán en el recibo de depósito de cheques. Luego, haga clic en "Crear".
+InputReceiptNumber=Elija el extracto bancario relacionado con la conciliación. Utilice un valor numérico ordenable: AAAAMM o AAAAMMDD (YYYYMM or YYYYMMDD)
+EventualyAddCategory=Eventualmente, especifique una categoría en la que clasificar los registros
+ToConciliate=¿Para conciliar?
+ThenCheckLinesAndConciliate=Luego, verifique las líneas presentes en el extracto bancario y haga clic
+DefaultRIB=BAN predeterminado
+AllRIB=Todos los BAN
+LabelRIB=Etiqueta BAN
+NoBANRecord=Sin registro BAN
+DeleteARib=Eliminar registro BAN
+ConfirmDeleteRib=¿Está seguro de que desea eliminar este registro BAN?
+ConfirmRejectCheck=¿Está seguro de que desea marcar este cheque como rechazado?
+RejectCheckDate=Fecha en que se devolvió el cheque
+CheckRejectedAndInvoicesReopened=Cheque devuelto y reapertura de facturas
+BankAccountModelModule=Plantillas de documentos para cuentas bancarias
+DocumentModelSepaMandate=Plantilla de mandato SEPA. Útil para países europeos en EEC únicamente.
+DocumentModelBan=Plantilla para imprimir una página con información BAN.
+NewVariousPayment=Nuevo pago misceláneo
+VariousPayment=Pago misceláneo
+ShowVariousPayment=Mostrar pago misceláneo
+AddVariousPayment=Agregar pago misceláneo
+VariousPaymentId=ID de pago misceláneo
+ConfirmCloneVariousPayment=Confirmar el duplicado de un pago misceláneo
+YourSEPAMandate=Tu mandato SEPA
+FindYourSEPAMandate=Este es su mandato SEPA para autorizar a nuestra empresa a realizar una orden de domiciliación bancaria a su banco. Devuélvalo firmado (escaneado del documento firmado) o envíelo por correo a
+AutoReportLastAccountStatement=Llene automáticamente el campo 'número de extracto bancario' con el último número de extracto al realizar la conciliación
+CashControl=Control de caja POS
+BankColorizeMovementDesc=Si esta función está habilitada, puede elegir un color de fondo específico para los movimientos de débito o crédito
+BankColorizeMovementName2=Color de fondo para movimiento crediticio
+IfYouDontReconcileDisableProperty=Si no realiza las conciliaciones bancarias en algunas cuentas bancarias, desactive la propiedad "%s" para eliminar esta advertencia.
diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang
index 4b9cf5dc637..edc638321f6 100644
--- a/htdocs/langs/es_CO/bills.lang
+++ b/htdocs/langs/es_CO/bills.lang
@@ -4,6 +4,8 @@ BillsCustomer=Factura del cliente
 BillsSuppliers=Facturas de proveedores
 BillsCustomersUnpaid=Facturas impagas a clientes
 BillsCustomersUnpaidForCompany=Facturas impagas de clientes para %s
+BillsSuppliersUnpaid=Facturas de proveedores sin pagar
+BillsSuppliersUnpaidForCompany=Facturas de proveedores sin pagar para %s
 BillsLate=Pagos atrasados
 BillsStatistics=Estadística de facturas de clientes.
 DisabledBecauseDispatchedInBookkeeping=Deshabilitado porque la factura fue enviada a la contabilidad.
@@ -18,8 +20,10 @@ InvoiceProFormaAsk=Factura de proforma
 InvoiceProFormaDesc=<b> Factura proforma </b> es una imagen de una factura real pero no tiene valor contable.
 InvoiceReplacement=Factura de reemplazo
 InvoiceReplacementAsk=Factura de reemplazo para la factura.
+InvoiceReplacementDesc=<b> La factura de reemplazo </b> se utiliza para reemplazar completamente una factura sin pago recibido. <br> <br> Nota: Solo se pueden reemplazar las facturas sin pago. Si la factura que reemplaza aún no está cerrada, se cerrará automáticamente como 'abandonada'.
 InvoiceAvoir=Nota de crédito
 InvoiceAvoirAsk=Nota de crédito para corregir factura
+InvoiceAvoirDesc=La <b>nota de crédito</b> es una factura negativa que se utiliza para corregir el hecho de que una factura muestra una cantidad que difiere de la cantidad realmente pagada (por ejemplo, el cliente pagó demasiado por error o no pagará la cantidad completa porque se devolvieron algunos productos) .
 invoiceAvoirWithLines=Crear nota de crédito con líneas de la factura de origen.
 invoiceAvoirWithPaymentRestAmount=Crear una nota de crédito con la factura pendiente de origen restante
 invoiceAvoirLineWithPaymentRestAmount=Nota de crédito por importe restante pendiente de pago
@@ -30,6 +34,7 @@ ReplacementByInvoice=Sustituido por factura
 CorrectInvoice=Factura correcta %s
 CorrectionInvoice=Factura de correccion
 UsedByInvoice=Se utiliza para pagar la factura %s
+NoReplacableInvoice=Sin facturas reemplazables
 NoInvoiceToCorrect=No hay factura para corregir
 InvoiceHasAvoir=Fue fuente de una o varias notas de crédito.
 CardBill=Tarjeta de factura
@@ -37,28 +42,44 @@ PredefinedInvoices=Facturas predefinidas
 InvoiceCustomer=Factura del cliente
 CustomerInvoice=Factura del cliente
 CustomersInvoices=Facturas de clientes
+SupplierInvoice=Factura del proveedor
 SuppliersInvoices=Facturas de proveedores
+SupplierInvoiceLines=Líneas de factura del proveedor
+SupplierBill=Factura del proveedor
 SupplierBills=Facturas de proveedores
+PaymentBack=Reembolso
+CustomerInvoicePaymentBack=Reembolso
 paymentInInvoiceCurrency=en facturas moneda
 DeletePayment=Eliminar pago
 ConfirmDeletePayment=¿Estás seguro de que quieres eliminar este pago?
+ConfirmConvertToReduc=¿Quieres convertir este %s en un crédito disponible?
+ConfirmConvertToReduc2=El monto se guardará entre todos los descuentos y podría usarse como un descuento para una factura actual o futura para este cliente.
+ConfirmConvertToReducSupplier=¿Quieres convertir este %s en un crédito disponible?
+ConfirmConvertToReducSupplier2=La cantidad se guardará entre todos los descuentos y podría usarse como un descuento para una factura actual o futura para este proveedor.
+SupplierPayments=Pagos a proveedores
 ReceivedCustomersPayments=Pagos recibidos de los clientes.
 ReceivedCustomersPaymentsToValid=Recibimos pagos de clientes para validar.
 PaymentsReportsForYear=Informes de pagos para %s
 PaymentsAlreadyDone=Pagos ya hechos
+PaymentsBackAlreadyDone=Reembolsos ya relizados
 PaymentRule=Regla de pago
 PaymentTypeDC=Tarjeta de crédito débito
+PaymentTerm=Plazo de pago
+PaymentConditions=Términos de pago
+PaymentConditionsShort=Términos de pago
 PaymentHigherThanReminderToPay=Pago más alto que el recordatorio de pago
 HelpPaymentHigherThanReminderToPay=Atención, el monto de pago de una o más facturas es mayor que el monto pendiente de pago. <br> Edite su entrada, de lo contrario confirme y considere crear una nota de crédito por el exceso recibido por cada factura pagada en exceso.
 HelpPaymentHigherThanReminderToPaySupplier=Atención, el monto de pago de una o más facturas es mayor que el monto pendiente de pago. <br> Edite su entrada, de lo contrario confirme y considere crear una nota de crédito por el exceso pagado por cada factura pagada en exceso.
 ClassifyPaid=Clasificar 'pagado'
+ClassifyUnPaid=Marcar 'Sin Pagar'
 ClassifyUnBilled=Clasificar 'sin facturar'
 CreateCreditNote=Crear nota de credito
 AddBill=Crear factura o nota de crédito
-AddToDraftInvoices=Añadir al proyecto de factura
+AddToDraftInvoices=Añadir a la factura en borrador
 DeleteBill=Borrar factura
 SearchACustomerInvoice=Buscar una factura de cliente
 CancelBill=Cancelar una factura
+SendRemindByMail=Enviar recordatorio por correo electrónico
 DoPayment=Introducir pago
 DoPaymentBack=Introducir reembolso
 ConvertToReduc=Marcar como crédito disponible
@@ -90,10 +111,13 @@ BillShortStatusNotRefunded=No reembolsado
 BillShortStatusClosedUnpaid=Cerrado
 BillShortStatusClosedPaidPartially=Pagado (parcialmente)
 ErrorVATIntraNotConfigured=Número de IVA intracomunitario aún no definido
+ErrorNoPaiementModeConfigured=No se ha definido ningún tipo de pago predeterminado. Vaya a la configuración del módulo de Factura para solucionar este problema.
+ErrorCreateBankAccount=Cree una cuenta bancaria, luego vaya al panel Configuración del módulo Factura para definir los tipos de pago
 ErrorBillNotFound=La factura %s no existe
 ErrorInvoiceAlreadyReplaced=Error, intentó validar una factura para reemplazar la factura %s. Pero este ya ha sido reemplazado por la factura %s.
 ErrorDiscountAlreadyUsed=Error, descuento ya utilizado.
 ErrorInvoiceAvoirMustBeNegative=Error, la factura correcta debe tener un importe negativo.
+ErrorInvoiceOfThisTypeMustBePositive=Error, este tipo de factura debe tener un monto sin impuestos positivo (o nulo)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no se puede cancelar una factura que ha sido reemplazada por otra factura que aún está en estado de borrador
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Esta parte u otra ya está en uso, por lo que no se pueden eliminar las series de descuento.
 BillFrom=De
@@ -106,10 +130,13 @@ NotARecurringInvoiceTemplate=No es una factura de plantilla recurrente
 LastBills=Las últimas facturas %s
 LatestTemplateInvoices=Las últimas facturas de la plantilla %s
 LatestCustomerTemplateInvoices=Las últimas facturas de plantilla de cliente %s
+LatestSupplierTemplateInvoices=Últimas facturas de plantilla de proveedor %s
 LastCustomersBills=Las últimas facturas de clientes %s
+LastSuppliersBills=Últimas facturas de proveedores %s
 AllCustomerTemplateInvoices=Todas las facturas de plantilla
-DraftBills=Proyectos de facturas
-CustomersDraftInvoices=Facturas del proyecto al cliente
+DraftBills=Facturas en borrador
+CustomersDraftInvoices=Facturas en borrador del cliente
+SuppliersDraftInvoices=Facturas en borrador del Proveedor
 Unpaid=No pagado
 ConfirmDeleteBill=¿Estás seguro de que quieres borrar esta factura?
 ConfirmValidateBill=¿Está seguro de que desea validar esta factura con la referencia <b> %s </b>?
@@ -118,6 +145,7 @@ ConfirmClassifyPaidBill=¿Está seguro de que desea cambiar la factura <b> %s </
 ConfirmCancelBill=¿Está seguro de que desea cancelar la factura <b> %s </b>?
 ConfirmCancelBillQuestion=¿Por qué quiere clasificar esta factura 'abandonada'?
 ConfirmClassifyPaidPartially=¿Está seguro de que desea cambiar la factura <b> %s </b> al estado pagado?
+ConfirmClassifyPaidPartiallyQuestion=Esta factura no se ha pagado en su totalidad. ¿Cuál es el motivo para cerrar esta factura?
 ConfirmClassifyPaidPartiallyReasonAvoir=El resto no pagado <b> (%s %s) </b> es un descuento otorgado porque el pago se realizó antes del término. Regularizo el IVA con una nota de crédito.
 ConfirmClassifyPaidPartiallyReasonDiscount=El resto no pagado <b> (%s %s) </b> es un descuento otorgado porque el pago se realizó antes del término.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto no pagado <b> (%s %s) </b> es un descuento otorgado porque el pago se realizó antes del término. Acepto perder el IVA en este descuento.
@@ -140,6 +168,17 @@ NumberOfBillsByMonth=Nº de facturas al mes.
 AmountOfBills=Cantidad de facturas
 AmountOfBillsHT=Importe de las facturas (neto de impuestos)
 AmountOfBillsByMonthHT=Monto de facturas por mes (neto de impuestos)
+UseSituationInvoicesCreditNote=Permitir nota de crédito de factura de situación
+RetainedwarrantyOnlyForSituation=Hacer que la "garantía retenida" esté disponible solo para facturas de situación
+RetainedwarrantyOnlyForSituationFinal=En las facturas de situación, la deducción global por "garantía retenida" se aplica solo en la situación final.
+toPayOn=para pagar en %s
+PaymentConditionsShortRetainedWarranty=Condiciones de pago de garantía retenidas
+DefaultPaymentConditionsRetainedWarranty=Condiciones de pago predeterminadas de la garantía retenida
+setPaymentConditionsShortRetainedWarranty=Establecer las condiciones de pago de la garantía retenida
+setretainedwarranty=Establecer garantía retenida
+setretainedwarrantyDateLimit=Establecer límite de fecha de garantía retenida
+RetainedWarrantyDateLimit=Límite de fecha de garantía retenida
+RetainedWarrantyNeed100Percent=La factura de situación debe estar en 100%%  de progreso para mostrarse en PDF
 AlreadyPaidBack=Ya pagado
 AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (sin notas de crédito y pagos iniciales)
 Abandoned=Abandonado
@@ -152,9 +191,9 @@ ExcessPaid=Exceso pagado
 EscompteOffered=Descuento ofrecido (pago antes de plazo)
 SendBillRef=Envío de factura %s
 SendReminderBillRef=Presentación de la factura %s (recordatorio)
-NoDraftBills=No hay proyectos de facturas
-NoOtherDraftBills=No hay otros proyectos de facturas
-NoDraftInvoices=No hay proyectos de facturas
+NoDraftBills=No hay facturas en borrador
+NoOtherDraftBills=No hay otras facturas en borrador
+NoDraftInvoices=No hay facturas en borrador
 RefBill=Factura ref
 ToBill=Cobrar
 RemainderToBill=Resto a facturar
@@ -168,8 +207,11 @@ DateInvoice=Fecha de la factura
 DatePointOfTax=Punto de impuesto
 NoInvoice=Sin factura
 ClassifyBill=Clasificar factura
+SupplierBillsToPay=Facturas de proveedores sin pagar
 CustomerBillsUnpaid=Facturas impagas a clientes
 NonPercuRecuperable=No recuperable
+SetConditions=Establecer condiciones de pago
+SetMode=Establecer tipo de pago
 SetRevenuStamp=Establecer sello de ingresos
 RepeatableInvoice=Factura de plantilla
 RepeatableInvoices=Facturas de plantillas
@@ -180,12 +222,16 @@ CustomersInvoicesAndInvoiceLines=Facturas del cliente y detalles de la factura.
 CustomersInvoicesAndPayments=Facturas y pagos de clientes.
 ExportDataset_invoice_1=Facturas del cliente y detalles de la factura.
 ExportDataset_invoice_2=Facturas y pagos de clientes.
+ReductionShort=Desct.
 Reductions=Reducciones
+ReductionsShort=Desct.
 AddDiscount=Crear descuento
 AddGlobalDiscount=Crear descuento absoluto
 EditGlobalDiscounts=Editar descuentos absolutos
 AddCreditNote=Crear nota de credito
 ShowDiscount=Mostrar descuento
+ShowReduc=Mostrar el descuento
+ShowSourceInvoice=Mostrar la factura de origen
 GlobalDiscount=Descuento global
 CreditNote=Nota de crédito
 CreditNotes=Notas de credito
@@ -216,18 +262,25 @@ InvoiceRef=Factura ref.
 InvoiceDateCreation=Fecha de creación de la factura.
 InvoiceStatus=Estado de la factura
 InvoiceNote=Nota de factura
+InvoicePaidCompletely=Pagado completamente
+InvoicePaidCompletelyHelp=Factura que se paga íntegramente. Esto excluye las facturas que se pagan parcialmente. Para obtener una lista de todas las facturas 'Cerradas' o no 'Cerradas', prefiera utilizar un filtro en el estado de la factura.
+OrderBilled=Orden facturada
 PaymentNumber=Numero de pago
-WatermarkOnDraftBill=Marca de agua en el proyecto de facturas (nada si está vacío)
+WatermarkOnDraftBill=Marca de agua en facturas en borrador (nada si está vacío)
 InvoiceNotChecked=Ninguna factura seleccionada
 ConfirmCloneInvoice=¿Está seguro de que desea clonar esta factura <b> %s </b>?
 DisabledBecauseReplacedInvoice=Acción deshabilitada porque la factura ha sido sustituida.
+DescTaxAndDividendsArea=Esta área presenta un resumen de todos los pagos realizados por gastos especiales. Aquí solo se incluyen los registros con pagos durante el año fijo.
 NbOfPayments=No. de pagos
 SplitDiscount=Descuento dividido en dos
+ConfirmSplitDiscount=¿Está seguro de que desea dividir este descuento de <b> %s </b> %s en dos descuentos más pequeños?
 TypeAmountOfEachNewDiscount=Cantidad de entrada para cada una de dos partes:
+TotalOfTwoDiscountMustEqualsOriginal=El total de los dos nuevos descuentos debe ser igual al monto del descuento original.
 ConfirmRemoveDiscount=¿Estás seguro de que quieres eliminar este descuento?
 RelatedBill=Factura relacionada
 RelatedBills=Facturas relacionadas
 RelatedCustomerInvoices=Facturas de clientes relacionadas
+RelatedSupplierInvoices=Facturas de proveedores relacionadas
 WarningBillExist=Advertencia, una o más facturas ya existen
 MergingPDFTool=Fusionando herramienta PDF
 AmountPaymentDistributedOnInvoice=Importe del pago distribuido en factura.
@@ -246,12 +299,15 @@ NextDateToExecution=Fecha para la próxima generación de facturas.
 NextDateToExecutionShort=Fecha siguiente gen.
 DateLastGeneration=Fecha de última generación.
 DateLastGenerationShort=Fecha ultima gen.
+MaxPeriodNumber=Número máximo de generación de facturas
 NbOfGenerationDone=Número de generación de facturas ya realizada.
+NbOfGenerationOfRecordDone=Número de generación de registros ya realizados
 NbOfGenerationDoneShort=Número de generación realizada
 MaxGenerationReached=Número máximo de generaciones alcanzadas
 GeneratedFromRecurringInvoice=Generado a partir de plantilla factura recurrente %s
 DateIsNotEnough=Fecha no alcanzada todavía
 InvoiceGeneratedFromTemplate=Factura %s generada a partir de la factura recurrente de la plantilla %s
+GeneratedFromTemplate=Generado a partir de la plantilla de factura %s
 WarningInvoiceDateInFuture=Advertencia, la fecha de la factura es mayor que la fecha actual
 WarningInvoiceDateTooFarInFuture=Advertencia, la fecha de la factura está demasiado lejos de la fecha actual
 ViewAvailableGlobalDiscounts=Ver descuentos disponibles
@@ -274,7 +330,9 @@ PaymentConditionShort14D=14 dias
 PaymentCondition14D=14 dias
 PaymentConditionShort14DENDMONTH=14 días de fin de mes
 PaymentCondition14DENDMONTH=Dentro de los 14 días siguientes al final del mes.
+FixAmount=Cantidad fija - 1 línea con etiqueta '%s'
 VarAmount=Cantidad variable (%% tot.)
+VarAmountAllLines=Cantidad variable (%% tot.): Todas las líneas desde el origen
 PaymentTypeVIR=transferencia bancaria
 PaymentTypeShortVIR=transferencia bancaria
 PaymentTypePRE=Orden de pago de domiciliación bancaria
@@ -288,16 +346,23 @@ PaymentTypeShortTIP=TIP Pago
 PaymentTypeTRA=giro bancario
 BankDetails=Cuentas bancarias
 BankCode=codigo bancario
+DeskCode=Código de sucursal
 BankAccountNumber=Número de cuenta
+BankAccountNumberKey=Suma de comprobación
+CustomerIBAN=IBAN de cliente
 BIC=BIC / SWIFT
 ExtraInfos=Infos extra
 RegulatedOn=Regulado en
 ChequeNumber=Compruebe N °
 ChequeOrTransferNumber=Cheque / Transferencia N °
 ChequeBordereau=Consultar horario
-ChequeMaker=Comprobar / transferir transmisor
+ChequeMaker=Verificar / Transferir remitente
 ChequeBank=Banco de cheques
 PrettyLittleSentence=Acepte la cantidad de pagos adeudados por cheques emitidos en mi nombre como Miembro de una asociación contable aprobada por la Administración Fiscal.
+IntracommunityVATNumber=ID de IVA intracomunitario
+PaymentByChequeOrderedTo=Los pagos con cheque (impuestos incluidos) deben pagarse a %s, enviar a
+PaymentByChequeOrderedToShort=Los pagos con cheque (impuestos incluidos) se pagan a
+PaymentByTransferOnThisBankAccount=Pago mediante transferencia a la siguiente cuenta bancaria
 VATIsNotUsedForInvoice=* IVA no aplicable art-293B de CGI
 LawApplicationPart1=Por aplicación de la ley 80.335 de 12/05/80.
 LawApplicationPart2=los bienes siguen siendo propiedad de
@@ -307,10 +372,16 @@ LimitedLiabilityCompanyCapital=SARL con Capital de
 UseDiscount=Usar descuento
 UseCredit=Usar credito
 UseCreditNoteInInvoicePayment=Reducir la cantidad a pagar con este crédito.
+MenuChequeDeposits=Verificar depósitos
 MenuCheques=Cheques
+MenuChequesReceipts=Verificar recibos
 NewChequeDeposit=Nuevo deposito
+ChequesReceipts=Verificar recibos
+ChequesArea=Consultar área de depósitos
+ChequeDeposits=Depósitos de cheques
 DepositId=Depósito de identificación
 CreditNoteConvertedIntoDiscount=Este %s se ha convertido en %s
+UsBillingContactAsIncoiveRecipientIfExist=Utilice el contacto / dirección con el tipo 'contacto de facturación' en lugar de la dirección de un tercero como destinatario de las facturas
 ShowUnpaidAll=Mostrar todas las facturas pendientes de pago
 ShowUnpaidLateOnly=Mostrar solo las facturas atrasadas sin pagar
 PaymentInvoiceRef=Factura de pago %s
@@ -318,21 +389,41 @@ ValidateInvoices=Validar facturas
 Reported=Retrasado
 DisabledBecausePayments=No es posible ya que hay algunos pagos.
 CantRemovePaymentWithOneInvoicePaid=No se puede eliminar el pago ya que hay al menos una factura clasificada pagada
+CantRemovePaymentVATPaid=No se puede eliminar el pago porque la declaración de IVA esta marcada como pagada
+CantRemovePaymentSalaryPaid=No puede eliminar el pago porque el salario esta marcado como pagado
 ExpectedToPay=Pago esperado
 CantRemoveConciliatedPayment=No se puede eliminar el pago reconciliado
 PayedByThisPayment=Pagado por este pago
+ClosePaidInvoicesAutomatically=Marca automáticamente todas las facturas estándar, de anticipo o de reemplazo como "Pagadas" cuando el pago se haya realizado en su totalidad.
+ClosePaidCreditNotesAutomatically=Marca automáticamente todas las notas de crédito como "Pagadas" cuando el reembolso se realiza en su totalidad.
+ClosePaidContributionsAutomatically=Marca automáticamente todas las contribuciones fiscales como "Pagadas" cuando el pago se realiza en su totalidad.
+ClosePaidVATAutomatically=Marca automáticamente la declaración de IVA como "Pagada" cuando el pago se realiza en su totalidad.
+ClosePaidSalaryAutomatically=Marca automáticamente el salario como "Pagado" cuando el pago se realiza en su totalidad.
+AllCompletelyPayedInvoiceWillBeClosed=Todas las facturas sin remanente por pagar se cerrarán automáticamente con el estado "Pagado".
 ToMakePayment=Paga
 ToMakePaymentBack=Pagar
 ListOfYourUnpaidInvoices=Lista de facturas impagadas
 NoteListOfYourUnpaidInvoices=Nota: Esta lista solo contiene facturas para terceros a los que está vinculado como representante de ventas.
+RevenueStamp=Sello de impuestos
+YouMustCreateInvoiceFromThird=Esta opción solo está disponible cuando se crea una factura desde la pestaña "Cliente" de un tercero
+YouMustCreateInvoiceFromSupplierThird=Esta opción solo está disponible cuando se crea una factura desde la pestaña "Proveedor" de un tercero
 YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y convertirla en "plantilla" para crear una nueva factura de plantilla
+PDFCrabeDescription=Factura plantilla PDF Crabe. Una plantilla de factura completa (implementación antigua de la plantilla Sponge)
 PDFSpongeDescription=Factura PDF plantilla de esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Plantilla PDF factura Crevette. Una plantilla de factura completa para facturas de situación.
+TerreNumRefModelDesc1=Devuelve un número con el formato %syymm-nnnn para facturas estándar y %syymm-nnnn para notas de crédito donde yy es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin interrupción ni retorno a 0
+MarsNumRefModelDesc1=Devuelve un número con el formato %syymm-nnnn para facturas estándar, %syymm-nnnn para facturas de reemplazo, %syymm-nnnn para facturas de anticipos y %s yymm-nn para notas de crédito donde yy es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin interrupción ni retorno a 0
 TerreNumRefModelError=Ya existe una factura que comienza con $ syymm y no es compatible con este modelo de secuencia. Quítalo o renómbrelo para activar este módulo.
-TypeContact_facture_internal_SALESREPFOLL=Representante de seguimiento de la factura del cliente.
+CactusNumRefModelDesc1=Devuelve un número con el formato  %syymm-nnnn para facturas estándar, %syymm-nnnn para notas de crédito y %syymm-nnnn para facturas de anticipo donde yy es año, mm es un mes y nnnnn es un número secuencial de incremento automático sin interrupción ni retorno a 0
+EarlyClosingReason=Razón de cierre anticipado
+TypeContact_facture_internal_SALESREPFOLL=Representante en seguimiento de la factura del cliente.
 TypeContact_facture_external_BILLING=Contacto factura cliente
 TypeContact_facture_external_SHIPPING=Contacto de envío del cliente
 TypeContact_facture_external_SERVICE=Contacto de servicio al cliente
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representante en seguimiento de factura de proveedor
+TypeContact_invoice_supplier_external_BILLING=Contacto de facturación del proveedor
+TypeContact_invoice_supplier_external_SHIPPING=Contacto de despacho del proveedor
+TypeContact_invoice_supplier_external_SERVICE=Contacto del proveedor de servicio
 InvoiceFirstSituationAsk=Primera situación factura
 InvoiceFirstSituationDesc=Las <b> facturas de situación </b> están vinculadas a situaciones relacionadas con una progresión, por ejemplo, la progresión de una construcción. Cada situación está vinculada a una factura.
 InvoiceSituation=Factura de situacion
@@ -356,13 +447,17 @@ InvoiceSituationLast=Factura final y general.
 PDFCrevetteSituationNumber=Situación N ° %s
 PDFCrevetteSituationInvoiceLineDecompte=Factura situación - COUNT
 PDFCrevetteSituationInvoiceTitle=Factura de situacion
+PDFCrevetteSituationInvoiceLine=Situación N ° %s: Inv. N ° %s en %s
 TotalSituationInvoice=Situación total
 invoiceLineProgressError=El progreso de la línea de factura no puede ser mayor o igual que la línea de factura siguiente
-ToCreateARecurringInvoice=Para crear una factura recurrente para este contrato, primero cree esta factura borrador, luego conviértala en una plantilla de factura y defina la frecuencia para la generación de facturas futuras.
+updatePriceNextInvoiceErrorUpdateline=Error: actualizar el precio en la línea %s de la factura
+ToCreateARecurringInvoice=Para crear una factura recurrente para este contrato, primero cree esta factura en borrador, luego conviértala en una plantilla de factura y defina la frecuencia para la generación de facturas futuras.
 ToCreateARecurringInvoiceGene=Para generar facturas futuras de forma regular y manual, simplemente vaya al menú <strong> %s - %s - %s </strong>.
+ToCreateARecurringInvoiceGeneAuto=Si necesita que dichas facturas se generen automáticamente, solicite a su administrador que habilite y configure el módulo <strong> %s </strong>. Tenga en cuenta que ambos métodos (manual y automático) se pueden utilizar juntos sin riesgo de duplicación.
 DeleteRepeatableInvoice=Eliminar factura de plantilla
 ConfirmDeleteRepeatableInvoice=¿Está seguro de que desea eliminar la plantilla de factura?
 CreateOneBillByThird=Cree una factura por tercero (de lo contrario, una factura por pedido)
+BillCreated=%s factura(s) generada(s)
 StatusOfGeneratedDocuments=Estado de generación de documentos
 AutogenerateDoc=Auto generar archivo de documento
 AutoFillDateFrom=Establecer fecha de inicio para línea de servicio con fecha de factura
@@ -370,3 +465,5 @@ AutoFillDateFromShort=Establecer fecha de inicio
 AutoFillDateTo=Establecer la fecha de finalización de la línea de servicio con la próxima fecha de factura
 AutoFillDateToShort=Fijar fecha de finalización
 MaxNumberOfGenerationReached=Número máximo de gen. alcanzado
+CustomersInvoicesArea=Área de facturación de clientes
+SituationTotalRayToRest=Restante a pagar sin impuestos
diff --git a/htdocs/langs/es_CO/bookmarks.lang b/htdocs/langs/es_CO/bookmarks.lang
new file mode 100644
index 00000000000..671225fc022
--- /dev/null
+++ b/htdocs/langs/es_CO/bookmarks.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - bookmarks
+AddThisPageToBookmarks=Agregar la página actual a los marcadores
+ListOfBookmarks=Lista de marcadores
+EditBookmarks=Listar / editar marcadores
+ShowBookmark=Mostrar marcador
+ReplaceWindow=Reemplazar pestaña actual
+BehaviourOnClick=Comportamiento cuando se selecciona una URL de marcador
+SetHereATitleForLink=Establecer un nombre para el marcador
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilice un enlace externo/absoluto (https://URL) o un enlace interno/relativo (/DOLIBARR_ROOT/htdocs /...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elija si la página vinculada debe abrirse en la pestaña actual o en una nueva pestaña
+BookmarksMenuShortCut=Ctrl + Mayús + m
diff --git a/htdocs/langs/es_CO/companies.lang b/htdocs/langs/es_CO/companies.lang
index a36f326f311..51c444c4d9b 100644
--- a/htdocs/langs/es_CO/companies.lang
+++ b/htdocs/langs/es_CO/companies.lang
@@ -1,22 +1,124 @@
 # Dolibarr language file - Source file is en_US - companies
-ConfirmDeleteContact=Está seguro de borrar este contacto y todas la información relacionada?
+MenuNewProspect=Nuevo prospecto
 NewCompany=Nueva compañía (prospecto, cliente, vendedor)
 CreateDolibarrThirdPartySupplier=Crear un tercero (vendedor)
+CreateThirdPartyAndContact=Crear un contacto de terceros + un contact vinculado
+ThirdPartyContacts=Contactos de terceros
+ThirdPartyContact=Contacto / dirección de terceros
+AliasNames=Nombre de alias (comercial, marca registrada, ...)
+AliasNameShort=Alias
+CountryIsInEEC=El país está dentro de la Comunidad Económica Europea
+PriceFormatInCurrentLanguage=Formato de visualización de precios en el idioma y la moneda actuales
+ThirdPartyName=Nombre de terceros
+ThirdPartyEmail=Correo electrónico de terceros
+ThirdPartyType=Tipo de terceros
+ToCreateContactWithSameName=Creará automáticamente un contacto/dirección con la misma información que el tercero bajo el tercero. En la mayoría de los casos, incluso si su tercero es una persona física, crear un tercero solo es suficiente.
 ParentCompany=Sede principal
 Subsidiaries=Sucursales
 RegisteredOffice=Domicilio principal
 State=Departamento
+StateCode=Siglas del Departamento
+StateShort=Departamento
+Region-State=Región
+PhonePro=Autobús. teléfono
 PhonePerso=Teléf. personal
+No_Email=Rechazar correos electrónicos masivos
+VATIsUsed=Impuesto sobre las ventas utilizado
+VATIsUsedWhenSelling=Define si este tercero incluye un impuesto a las ventas o no cuando realiza una factura a sus propios clientes.
 VATIsNotUsed=No sujeto a IVA
+CopyAddressFromSoc=Copiar dirección de los datos de un tercero
+ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero (cliente o proveedor), sin objetos de referencia disponibles
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tercero (cliente o proveedor), sin descuentos disponibles
+PaymentBankAccount=Pago cuenta bancaria
 OverAllProposals=Propuestas
+OverAllOrders=Ordenes
+OverAllSupplierProposals=Solicitudes de precio
+LocalTax1IsUsed=Utilice el segundo impuesto
+LocalTax2IsUsed=Utilice el tercer impuesto
+WrongSupplierCode=Código de proveedor no válido
+SupplierCodeModel=Modelo de código de proveedor
 ProfId1AT=Id prof. 1 (USt.-IdNr)
 ProfId2AT=Id prof. 2 (USt.-Nr)
 ProfId3AT=Id prof. 3 (Handelsregister-Nr.)
 ProfId2CO=Identificación (CC, NIT, CE)
 ProfId3CO=CIIU
+ProfId1ShortFR=SIRENA
+ProfId1LU=Identificación. profe. 1 (R.C.S. Luxemburgo)
+ProfId2LU=Identificación. profe. 2 (permiso comercial)
+ProfId2DZ=Arte.
+VATIntra=RUT
+VATIntraShort=RUT
+VATReturn=Devolución de IVA
+SupplierRelativeDiscount=Descuento relativo del proveedor
+HasRelativeDiscountFromSupplier=Tiene un descuento predeterminado de <b> %s%% </b> de este proveedor
+HasNoRelativeDiscountFromSupplier=No tiene ningún descuento relativo predeterminado de este proveedor
+CompanyHasAbsoluteDiscount=Este cliente tiene descuentos disponibles (notas de crédito o anticipos) para <b> %s </b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Este cliente tiene descuentos disponibles (comerciales, anticipos) para <b> %s </b> %s
 CompanyHasCreditNote=Este cliente tiene <b>%s %s</b> anticipos disponibles
+HasNoAbsoluteDiscountFromSupplier=No tiene crédito de descuento disponible de este proveedor
+HasAbsoluteDiscountFromSupplier=Tiene descuentos disponibles (notas de crédito o anticipos) para <b> %s </b> %s de este proveedor
+HasDownPaymentOrCommercialDiscountFromSupplier=Tiene descuentos disponibles (comerciales, anticipos) para <b> %s </b> %s de este proveedor
+HasCreditNoteFromSupplier=Tiene notas de crédito para <b> %s </b> %s de este proveedor
+CustomerAbsoluteDiscountAllUsers=Descuentos absolutos para los clientes (otorgados por todos los usuarios)
+CustomerAbsoluteDiscountMy=Descuentos absolutos para clientes (otorgados por usted mismo)
+SupplierAbsoluteDiscountAllUsers=Descuentos absolutos de proveedores (ingresados por todos los usuarios)
+SupplierAbsoluteDiscountMy=Descuentos absolutos de proveedores (ingresados por usted mismo)
+Contact=Dirección de contacto
+ContactId=ID de contacto
+ContactByDefaultFor=Contacto/dirección predeterminada para
+CustomerCode=Código de cliente
+SupplierCode=Código de proveedor
+CustomerCodeShort=Código de cliente
+SupplierCodeShort=Código de proveedor
+CustomerCodeDesc=Código de cliente, único para todos los clientes
+SupplierCodeDesc=Código de proveedor, único para todos los proveedores
+RequiredIfSupplier=Requerido si el tercero es un proveedor
+ValidityControledByModule=Validez controlada por el módulo
+ThisIsModuleRules=Reglas para este módulo
+ListOfThirdParties=Lista de terceros
+ShowContact=Dirección de contacto
+ContactForOrdersOrShipments=Contacto del pedido o del envío
+NoContactForAnyOrderOrShipments=Este contacto no es un contacto para ningún pedido o envío.
 NoContactForAnyProposal=Este contacto no es contacto de ningúna cotización
+NewContactAddress=Nuevo contacto/dirección
+ThisUserIsNot=Este usuario no es un cliente potencial, cliente o proveedor.
+VATIntraCheckDesc=El número de identificación fiscal debe incluir el prefijo del país. El enlace <b> %s </b> utiliza el servicio de verificación de IVA europeo (VIES) que requiere acceso a Internet desde el servidor Dolibarr.
 VATIntraCheckURL=http://www.rues.org.co/RUES_Web/Consultas#tabs-3
+VATIntraCheckableOnEUSite=Verifique el ID de IVA intracomunitario en el sitio web de la Comisión Europea
+VATIntraManualCheck=También puede consultar manualmente en el sitio web de la Comisión Europea <a href="%s" target="_blank"> %s </a>
+NorProspectNorCustomer=No prospecto, ni cliente
+StatusProspect1=Para ser contactado
+ChangeToContact=Cambiar el estado a 'Para ser contactado'
+ExportDataset_company_1=Terceros (empresas / fundaciones / personas físicas) y sus propiedades
+ImportDataset_company_1=Terceros y sus propiedades
+ImportDataset_company_2=Contactos/direcciones y atributos adicionales de terceros
+ImportDataset_company_4=Representantes de ventas de terceros (asignar representantes de ventas / usuarios a las empresas)
+PriceLevelLabels=Etiquetas de nivel de precio
 ConfirmDeleteFile=¿Está seguro que quiere eliminar este archivo?
+AllocateCommercial=Asignado al representante de ventas
+FiscalYearInformation=Año fiscal
+SocialNetworksYoutubeURL=URL de Youtube
+YouMustAssignUserMailFirst=Debe crear un correo electrónico para este usuario antes de poder agregar una notificación por correo electrónico.
+YouMustCreateContactFirst=Para poder agregar notificaciones por correo electrónico, primero debe definir contactos con correos electrónicos válidos para el tercero
+ListSuppliersShort=Lista de proveedores
+ListProspectsShort=Lista de prospectos
+ListCustomersShort=Lista de clientes
+ThirdPartiesArea=Terceros / Contactos
+ThirdPartyIsClosed=Tercero está cerrado
+OutstandingBillReached=Max. alcanzado por factura pendiente
+OrderMinAmount=Importe mínimo por pedido
+MonkeyNumRefModelDesc=Devuelve un número con el formato %syymm-nnnn para el código de cliente y %syymm-nnnn para el código de proveedor donde yy es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin interrupción y sin retorno a 0.
 ManagingDirectors=Administrador(es) (CEO, gerente, director, presidente, etc.)
+MergeOriginThirdparty=Tercero duplicado (tercero que desea eliminar)
+ConfirmMergeThirdparties=¿Está seguro de que desea fusionar el tercero elegido con el actual? Todos los objetos vinculados (facturas, ordenes, ...) se moverán al tercero actual, después de lo cual se eliminará el tercero elegido.
+ThirdpartiesMergeSuccess=Los terceros se han fusionado
+SaleRepresentativeLogin=Inicio de sesión del representante de ventas
+SaleRepresentativeFirstname=Nombre del representante de ventas
+SaleRepresentativeLastname=Apellido del representante de ventas
+ErrorThirdpartiesMerge=Hubo un error al eliminar a los terceros. Por favor revise el registro. Se han revertido los cambios.
+KeepEmptyIfGenericAddress=Mantenga este campo vacío si esta dirección es una dirección genérica
+PaymentTermsSupplier=Plazo de pago - Proveedor
+PaymentTypeBoth=Tipo de pago - Cliente y proveedor
+MulticurrencyUsed=Usar multidivisa
 MulticurrencyCurrency=Moneda
+CurrentOutstandingBillLate=Factura por pagar: Atrasada
diff --git a/htdocs/langs/es_CO/compta.lang b/htdocs/langs/es_CO/compta.lang
index 0b16bb527cd..6fd29d19db3 100644
--- a/htdocs/langs/es_CO/compta.lang
+++ b/htdocs/langs/es_CO/compta.lang
@@ -52,10 +52,12 @@ LT2CustomerES=Ventas de IRPF
 LT2SupplierES=Compras IRPF
 VATCollected=IVA recaudado
 SpecialExpensesArea=Área para todos los pagos especiales.
+VATExpensesArea=Área para todos los pagos de TVA
 SocialContribution=Impuesto social o fiscal
 SocialContributions=Impuestos sociales o fiscales.
 SocialContributionsDeductibles=Impuestos sociales o fiscales deducibles.
 SocialContributionsNondeductibles=Impuestos sociales o fiscales no deducibles.
+DateOfSocialContribution=Fecha de impuesto fiscal
 LabelContrib=Contribución de la etiqueta
 TypeContrib=Tipo de contribución
 MenuSpecialExpenses=Gastos especiales
@@ -93,6 +95,7 @@ NewLocalTaxPayment=Nuevo pago de impuestos %s
 Refund=Reembolso
 SocialContributionsPayments=Pago de impuestos sociales / fiscales
 ShowVatPayment=Mostrar pago del IVA
+BalanceVisibilityDependsOnSortAndFilters=El saldo es visible en esta lista solo si la tabla está ordenada en %s y filtrada en 1 cuenta bancaria (sin otros filtros)
 CustomerAccountancyCode=Código de contabilidad del cliente
 SupplierAccountancyCode=Código contable del proveedor
 CustomerAccountancyCodeShort=Cust. cuenta. código
@@ -110,10 +113,11 @@ NewCheckReceipt=Nuevo descuento
 NewCheckDeposit=Depósito de cheque nuevo
 NewCheckDepositOn=Crear un recibo para el depósito en cuenta: %s
 NoWaitingChecks=No hay cheques a la espera de depósito.
-DateChequeReceived=Verifique la fecha de recepción
 NbOfCheques=No. de cheques
 PaySocialContribution=Pagar un impuesto social / fiscal
+ConfirmPaySocialContribution=¿Seguro que quiere clasificar este impuesto fiscal como pagado?
 DeleteSocialContribution=Eliminar un pago fiscal social o fiscal.
+ConfirmDeleteSocialContribution=¿Está seguro de que desea eliminar este pago de impuestos fiscales?
 ExportDataset_tax_1=Impuestos y pagos sociales y fiscales.
 CalcModeVATDebt=Modo <b> %sVAT en contabilidad de compromiso%s </b>.
 CalcModeVATEngagement=Modo <b> %sVAT en ingresos-expenses%s </b>.
@@ -130,6 +134,9 @@ AnnualSummaryInputOutputMode=Balance de ingresos y gastos, resumen anual.
 AnnualByCompanies=Saldo de ingresos y gastos, por grupos de cuentas predefinidos.
 AnnualByCompaniesDueDebtMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b> %sClaims-Debts%s </b> dijo <b> Contabilidad de compromisos </b>.
 AnnualByCompaniesInputOutputMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b> %sIncomes-Expenses%s </b>, dijo <b> contabilidad de caja </b>.
+SeeReportInInputOutputMode=Consulte <b> %sanálisis de pagos%s </b> para obtener un cálculo basado en <b> pagos registrados </b> realizados incluso si aún no están contabilizados en el libro mayor
+SeeReportInDueDebtMode=Consulte <b> %sanálisis de documentos registrados%s </b> para obtener un cálculo basado en <b> documentos registrados conocidos </b> incluso si aún no están contabilizados en el libro mayor
+SeeReportInBookkeepingMode=Consulte <b> %sanálisis de la tabla de contabilidad contable%s </b> para obtener un informe basado en <b> Tabla de contabilidad contable </b>
 RulesAmountWithTaxIncluded=- Las cantidades mostradas están con todos los impuestos incluidos.
 RulesResultDue=- Incluye facturas pendientes, gastos, IVA, donaciones ya sean pagadas o no. También incluye salarios pagados. <br> - Se basa en la fecha de facturación de las facturas y en la fecha de vencimiento de los gastos o pagos de impuestos. Para los salarios definidos con el módulo Salario, se utiliza la fecha de pago del valor.
 RulesResultInOut=- Incluye los pagos reales realizados en facturas, gastos, IVA y salarios. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA y salarios. La fecha de donación para la donación.
@@ -148,6 +155,7 @@ LT1ReportByCustomersES=Reporte por parte de terceros RE
 LT2ReportByCustomersES=Reporte por parte de terceros IRPF
 VATReport=Informe de impuestos de venta
 VATReportByPeriods=Informe de impuestos de venta por periodo
+VATReportByMonth=Informe de impuestos sobre las ventas por mes
 VATReportByRates=Informe fiscal de venta por tasas.
 VATReportByThirdParties=Informe fiscal de venta por terceros.
 VATReportByCustomers=Informe fiscal de venta por cliente.
@@ -196,6 +204,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=La cuenta contable dedicada definida en la tarj
 ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable utilizada para terceros proveedores.
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de un tercero se usará solo para la contabilidad del Libro auxiliar. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del libro auxiliar si no se define la cuenta de contabilidad del proveedor dedicada en un tercero.
 ConfirmCloneTax=Confirmar el clon de un impuesto social / fiscal.
+ConfirmCloneVAT=Confirmar el duplicado de una declaración de IVA
+ConfirmCloneSalary=Confirmar el duplicado de un salario
 CloneTaxForNextMonth=Clonala para el mes que viene.
 SimpleReport=Informe simple
 AddExtraReport=Informes adicionales (agregar informe de clientes extranjeros y nacionales)
diff --git a/htdocs/langs/es_CO/deliveries.lang b/htdocs/langs/es_CO/deliveries.lang
index 9e1379e60f9..6c1d382341d 100644
--- a/htdocs/langs/es_CO/deliveries.lang
+++ b/htdocs/langs/es_CO/deliveries.lang
@@ -1,3 +1,25 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Entrega
+DeliveryRef=Ref de entrega
+DeliveryCard=Tarjeta de recibo
+DeliveryOrder=Recibo de entrega
+CreateDeliveryOrder=Generar recibo de entrega
+SetDeliveryDate=Establecer fecha de envío
+ValidateDeliveryReceipt=Validar recibo de entrega
+ValidateDeliveryReceiptConfirm=¿Está seguro de que desea validar este recibo de entrega?
+DeleteDeliveryReceipt=Eliminar recibo de entrega
+DeleteDeliveryReceiptConfirm=¿Está seguro de que desea eliminar el recibo de entrega <b> %s </b>?
+DeliveryMethod=Método de entrega
+TrackingNumber=El número de rastreo
+DeliveryNotValidated=Entrega no validada
 StatusDeliveryCanceled=Cancelado
+NameAndSignature=Nombre y firma:
+ToAndDate=Para___________________________________ el ____ / _____ / __________
+GoodStatusDeclaration=Haber recibido los productos anteriores en buenas condiciones,
+Deliverer=Quien entrega:
+Sender=Remitente
+Recipient=Recipiente
+NonShippable=No se puede enviar
+ShowShippableStatus=Mostrar estado de envío
+ShowReceiving=Mostrar recibo de entrega
+NonExistentOrder=Orden inexistente
diff --git a/htdocs/langs/es_CO/donations.lang b/htdocs/langs/es_CO/donations.lang
index c1000d846ef..10bcd81f206 100644
--- a/htdocs/langs/es_CO/donations.lang
+++ b/htdocs/langs/es_CO/donations.lang
@@ -1,4 +1,17 @@
 # Dolibarr language file - Source file is en_US - donations
+DonationRef=Ref. de Donación
+ConfirmDeleteADonation=¿Estás seguro de que deseas eliminar esta donación?
+DonationStatusPromiseNotValidated=Borrador de promesa
+DonationStatusPaid=Donación recibida
 DonationStatusPromiseNotValidatedShort=Borrador
 DonationStatusPromiseValidatedShort=Validado
 DonationStatusPaidShort=Recibido
+DonationsModels=Modelos de documentos para recibos de donaciones
+LastModifiedDonations=Últimas donaciones modificadas %s
+DonationRecipient=Destinatario de la donación
+IConfirmDonationReception=El destinatario declara haber recibido, como donación, la siguiente cantidad
+MinimumAmount=La cantidad mínima es %s
+FreeTextOnDonations=Texto libre para mostrar en pie de página
+DONATION_ART200=Muestre el artículo 200 de CGI si está preocupado
+DONATION_ART238=Muestre el artículo 238 de CGI si está preocupado
+DONATION_ART885=Muestre el artículo 885 de CGI si está preocupado
diff --git a/htdocs/langs/es_CO/errors.lang b/htdocs/langs/es_CO/errors.lang
new file mode 100644
index 00000000000..de15fc3fbda
--- /dev/null
+++ b/htdocs/langs/es_CO/errors.lang
@@ -0,0 +1,234 @@
+# Dolibarr language file - Source file is en_US - errors
+NoErrorCommitIsDone=Sin error, nos comprometemos
+ErrorButCommitIsDone=Errores encontrados pero validamos a pesar de esto
+ErrorBadValueForParamNotAString=Mal valor para su parámetro. Generalmente se adjunta cuando falta la traducción.
+ErrorRefAlreadyExists=La referencia <b> %s </b> ya existe.
+ErrorLoginAlreadyExists=El inicio de sesión %s ya existe.
+ErrorRecordNotFound=Registro no encontrado.
+ErrorFailToCopyFile=Error al copiar el archivo '<b> %s </b>' en '<b> %s </b>'.
+ErrorFailToCopyDir=Error al copiar el directorio '<b> %s </b>' en '<b> %s </b>'.
+ErrorFailToRenameFile=No se pudo cambiar el nombre del archivo '<b> %s </b>' a '<b> %s </b>'.
+ErrorFailToDeleteFile=Error al eliminar el archivo '<b> %s </b>'.
+ErrorFailToCreateFile=Error al crear el archivo '<b> %s </b>'.
+ErrorFailToRenameDir=No se pudo cambiar el nombre del 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=No se pudo realizar el reemplazo en el archivo '<b> %s </b>'.
+ErrorFailToGenerateFile=Error al generar el archivo '<b> %s </b>'.
+ErrorCashAccountAcceptsOnlyCashMoney=Esta cuenta bancaria es una cuenta de efectivo, por lo que acepta pagos de tipo efectivo únicamente.
+ErrorFromToAccountsMustDiffers=Las cuentas bancarias de origen y destino deben ser diferentes.
+ErrorBadThirdPartyName=Valor incorrecto para el nombre de un tercero
+ErrorBadCustomerCodeSyntax=Sintaxis incorrecta para el código del cliente
+ErrorBadBarCodeSyntax=Sintaxis incorrecta para el código de barras. Puede ser que haya configurado un tipo de código de barras incorrecto o haya definido una máscara de código de barras para la numeración que no coincide con el valor escaneado.
+ErrorCustomerCodeRequired=Se requiere código de cliente
+ErrorBarCodeRequired=Se requiere código de barras
+ErrorBarCodeAlreadyUsed=Código de barras ya utilizado
+ErrorPrefixRequired=Prefijo requerido
+ErrorBadSupplierCodeSyntax=Sintaxis incorrecta para el código de proveedor
+ErrorSupplierCodeRequired=Se requiere el código de proveedor
+ErrorSupplierCodeAlreadyUsed=El código de proveedor ya se usó
+ErrorBadParameters=Malos parámetros
+ErrorWrongParameters=Parámetros incorrectos o faltantes
+ErrorBadValueForParameter=Valor incorrecto '%s' para el parámetro '%s'
+ErrorBadImageFormat=El archivo de imagen no tiene un formato compatible (su PHP no admite funciones para convertir imágenes de este formato)
+ErrorBadDateFormat=El valor '%s' tiene un formato de fecha incorrecto
+ErrorFailedToWriteInDir=No se pudo escribir en el directorio %s
+ErrorFoundBadEmailInFile=Se encontró una sintaxis de correo electrónico incorrecta para las líneas %s en el archivo (línea de ejemplo %s con email = %s)
+ErrorUserCannotBeDelete=No se puede eliminar al usuario. Quizás esté asociado a entidades Dolibarr.
+ErrorFailedToCreateDir=No se pudo crear un directorio. Compruebe que el usuario del servidor web tenga permisos para escribir en el directorio de documentos de Dolibarr. Si el parámetro <b> safe_mode </b> está habilitado en este PHP, verifique que los archivos php de Dolibarr sean propiedad del usuario (o grupo) del servidor web.
+ErrorNoMailDefinedForThisUser=No hay correo definido para este usuario
+ErrorSetupOfEmailsNotComplete=La configuración de los correos electrónicos no está completa
+ErrorFeatureNeedJavascript=Esta característica necesita javascript para estar activada para funcionar. Cambie esto en la configuración - pantalla.
+ErrorTopMenuMustHaveAParentWithId0=Un menú de tipo 'Arriba' no puede tener un menú principal. Ponga 0 en el menú principal o elija un menú de tipo 'Izquierda'.
+ErrorLeftMenuMustHaveAParentId=Un menú de tipo 'Izquierda' debe tener una identificación de padre.
+ErrorFileNotFound=Archivo <b> %s </b> no encontrado (ruta incorrecta, permisos incorrectos o acceso denegado por PHP openbasedir o parámetro safe_mode)
+ErrorDirNotFound=Directorio <b> %s </b> no encontrado (Ruta incorrecta, permisos incorrectos o acceso denegado por PHP openbasedir o parámetro safe_mode)
+ErrorFunctionNotAvailableInPHP=La función <b> %s </b> es necesaria para esta función, pero no está disponible en esta versión / configuración de PHP.
+ErrorDirAlreadyExists=Ya existe un directorio con este nombre.
+ErrorPartialFile=Archivo no recibido completamente por el servidor.
+ErrorNoTmpDir=La directiva temporal %s no existe.
+ErrorUploadBlockedByAddon=Carga bloqueada por un complemento PHP / Apache.
+ErrorFileSizeTooLarge=El tamaño del archivo es demasiado grande.
+ErrorSizeTooLongForIntType=Tamaño demasiado largo para el tipo int (%s dígitos como máximo)
+ErrorSizeTooLongForVarcharType=Tamaño demasiado largo para el tipo de cadena (%s caracteres como máximo)
+ErrorNoValueForSelectType=Por favor complete el valor de la lista de selección
+ErrorNoValueForCheckBoxType=Por favor, complete el valor de la lista de casillas de verificación
+ErrorNoValueForRadioType=Por favor complete el valor de la lista de radio
+ErrorBadFormatValueList=El valor de la lista no puede tener más de una coma: <u> %s </u>, pero necesita al menos una: clave, valor
+ErrorFieldCanNotContainSpecialCharacters=El campo <b> %s </b> no debe contener caracteres especiales.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=El campo <b> %s </b> no debe contener caracteres especiales, ni mayúsculas y no puede contener solo números.
+ErrorNoAccountancyModuleLoaded=Ningún módulo de contabilidad activado
+ErrorExportDuplicateProfil=Este nombre de perfil ya existe para este conjunto de exportación.
+ErrorLDAPSetupNotComplete=La coincidencia Dolibarr-LDAP no está completa.
+ErrorLDAPMakeManualTest=Se ha generado un archivo .ldif en el directorio %s. Intente cargarlo manualmente desde la línea de comandos para tener más información sobre los errores.
+ErrorCantSaveADoneUserWithZeroPercentage=No se puede guardar una acción con "estado no iniciado" si el campo "realizado por" también está lleno.
+ErrorPleaseTypeBankTransactionReportName=Ingrese el nombre del extracto bancario donde se debe informar la entrada (formato AAAAMM o AAAAMMDD)
+ErrorRecordHasChildren=No se pudo borrar el registro porque tiene algunos registros secundarios.
+ErrorRecordHasAtLeastOneChildOfType=El objeto tiene al menos un hijo de tipo %s
+ErrorRecordIsUsedCantDelete=No se puede borrar el registro. Ya está usado o incluido en otro objeto.
+ErrorModuleRequireJavascript=Javascript no debe estar deshabilitado para que esta característica funcione. Para habilitar / deshabilitar Javascript, vaya al menú Inicio-> Configuración-> Pantalla.
+ErrorPasswordsMustMatch=Ambas contraseñas escritas deben coincidir
+ErrorContactEMail=Ocurrió un error técnico. Por favor, comuníquese con el administrador al siguiente correo electrónico <b> %s </b> y proporcione el código de error <b> %s </b> en su mensaje, o agregue una copia de pantalla de esta página.
+ErrorFieldValueNotIn=El campo <b> %s </b>: '<b> %s </b>' no es un valor que se encuentra en el campo <b> %s </b> de <b> %s </b>
+ErrorFileIsInfectedWithAVirus=El programa antivirus no pudo validar el archivo (el archivo podría estar infectado por un virus)
+ErrorSpecialCharNotAllowedForField=No se permiten caracteres especiales para el campo "%s"
+ErrorNumRefModel=Existe una referencia en la base de datos (%s) y no es compatible con esta regla de numeración. Elimine el registro o la referencia renombrada para activar este módulo.
+ErrorQtyTooLowForThisSupplier=Cantidad demasiado baja para este proveedor o ningún precio definido en este producto para este proveedor
+ErrorOrdersNotCreatedQtyTooLow=Algunos pedidos no se han creado debido a cantidades demasiado bajas.
+ErrorModuleSetupNotComplete=La configuración del módulo %s parece incompleta. Vaya a Inicio - Configuración - Módulos para completar.
+ErrorBadMaskFailedToLocatePosOfSequence=Error, máscara sin número de secuencia
+ErrorBadMaskBadRazMonth=Error, valor de reinicio incorrecto
+ErrorCounterMustHaveMoreThan3Digits=El contador debe tener más de 3 dígitos
+ErrorDeleteNotPossibleLineIsConsolidated=No es posible eliminar porque el registro está vinculado a una transacción bancaria que está conciliada
+ErrorProdIdAlreadyExist=%s se asigna a otro tercio
+ErrorFailedToSendPassword=No se pudo enviar la contraseña
+ErrorFailedToLoadRSSFile=No se obtiene la fuente RSS. Intente agregar la constante MAIN_SIMPLEXMLLOAD_DEBUG si los mensajes de error no brindan suficiente información.
+ErrorForbidden=Acceso denegado. <br> Intentas acceder a una página, área o característica de un módulo deshabilitado o sin estar en una sesión autenticada o que no está permitida para tu usuario.
+ErrorForbidden2=El administrador de Dolibarr puede definir el permiso para este inicio de sesión desde el menú %s-> %s.
+ErrorForbidden3=Parece que Dolibarr no se usa a través de una sesión autenticada. Eche un vistazo a la documentación de configuración de Dolibarr para saber cómo administrar las autenticaciones (htaccess, mod_auth u otro ...).
+ErrorNoImagickReadimage=La clase Imagick no se encuentra en este PHP. No puede haber una vista previa disponible. Los administradores pueden desactivar esta pestaña desde el menú Configuración - Pantalla.
+ErrorRecordAlreadyExists=El registro ya existe
+ErrorCantReadFile=Error al leer el archivo '%s'
+ErrorCantReadDir=No se pudo leer el directorio '%s'
+ErrorBadLoginPassword=Valor incorrecto para inicio de sesión o contraseña
+ErrorLoginDisabled=Tu cuenta ha sido inhabilitada
+ErrorFailedToRunExternalCommand=No se pudo ejecutar el comando externo. Compruebe que esté disponible y que su servidor PHP pueda ejecutar. Si PHP <b> Safe Mode </b> está habilitado, verifique que el comando esté dentro de un directorio definido por el parámetro <b> safe_mode_exec_dir </b>.
+ErrorFailedToChangePassword=No se pudo cambiar la contraseña
+ErrorLoginDoesNotExists=No se pudo encontrar el usuario con inicio de sesión <b> %s </b>.
+ErrorLoginHasNoEmail=Este usuario no tiene dirección de correo electrónico. Proceso abortado.
+ErrorBadValueForCode=Mal valor para el código de seguridad. Inténtelo de nuevo con un nuevo valor ...
+ErrorBothFieldCantBeNegative=Los campos %s y %s no pueden ser ambos negativos
+ErrorFieldCantBeNegativeOnInvoice=El campo <strong> %s </strong> no puede ser negativo en este tipo de factura. Si necesita agregar una línea de descuento, simplemente cree el descuento primero (desde el campo '%s' en la tarjeta de terceros) y aplíquelo a la factura.
+ErrorLinesCantBeNegativeForOneVATRate=El total de líneas (neto de impuestos) no puede ser negativo para una tasa de IVA no nula determinada (se encontró un total negativo para la tasa de IVA <b> %s </b> %%).
+ErrorLinesCantBeNegativeOnDeposits=Las líneas no pueden ser negativas en un depósito. Tendrá problemas cuando necesite consumir el depósito en la factura final si lo hace.
+ErrorQtyForCustomerInvoiceCantBeNegative=La cantidad de la línea en las facturas de los clientes no puede ser negativa
+ErrorWebServerUserHasNotPermission=La cuenta de usuario <b> %s </b> utilizada para ejecutar el servidor web no tiene permiso para eso
+ErrorNoActivatedBarcode=Ningún tipo de código de barras activado
+ErrUnzipFails=Error al descomprimir %s con ZipArchive
+ErrNoZipEngine=No hay motor para comprimir / descomprimir el archivo %s en este PHP
+ErrorFileMustBeADolibarrPackage=El archivo %s debe ser un paquete zip Dolibarr
+ErrorModuleFileRequired=Debe seleccionar un archivo de paquete de módulo Dolibarr
+ErrorPhpCurlNotInstalled=El PHP CURL no está instalado, esto es fundamental para hablar con Paypal
+ErrorFailedToAddToMailmanList=No se pudo agregar el registro %s a la lista de Mailman %s o la base SPIP
+ErrorFailedToRemoveToMailmanList=No se pudo eliminar el registro %s a la lista Mailman %s o la base SPIP
+ErrorNewValueCantMatchOldValue=El nuevo valor no puede ser igual al anterior
+ErrorFailedToValidatePasswordReset=No se pudo reiniciar la contraseña. Puede que el reinicio ya se haya realizado (este enlace solo se puede usar una vez). Si no es así, intente reiniciar el proceso de reinicio.
+ErrorToConnectToMysqlCheckInstance=La conexión a la base de datos falla. Verifique que el servidor de la base de datos se esté ejecutando (por ejemplo, con mysql / mariadb, puede iniciarlo desde la línea de comandos con 'sudo service mysql start').
+ErrorFailedToAddContact=No se pudo agregar el contacto
+ErrorDateMustBeBeforeToday=La fecha debe ser menor que la de hoy.
+ErrorDateMustBeInFuture=La fecha debe ser mayor que la de hoy.
+ErrorPaymentModeDefinedToWithoutSetup=Se estableció un modo de pago para escribir %s, pero la configuración del módulo Factura no se completó para definir la información que se mostrará para este modo de pago.
+ErrorPHPNeedModule=Error, su PHP debe tener el módulo <b> %s </b> instalado para usar esta función.
+ErrorOpenIDSetupNotComplete=Configura el archivo de configuración Dolibarr para permitir la autenticación OpenID, pero la URL del servicio OpenID no está definida en la constante %s
+ErrorWarehouseMustDiffers=Los almacenes de origen y destino deben diferir
+ErrorBadFormat=¡Mal formato!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, este miembro aún no está vinculado a ningún tercero. Vincular al miembro a un tercero existente o crear un nuevo tercero antes de crear una suscripción con factura.
+ErrorThereIsSomeDeliveries=Error, hay algunas entregas vinculadas a este envío. Eliminación rechazada.
+ErrorCantDeletePaymentReconciliated=No se puede eliminar un pago que generó una entrada bancaria que se concilió
+ErrorCantDeletePaymentSharedWithPayedInvoice=No se puede eliminar un pago compartido por al menos una factura con estado Pagado
+ErrorPriceExpression3=Variable indefinida '%s' en la definición de función
+ErrorPriceExpression4=Carácter ilegal '%s'
+ErrorPriceExpression5='%s' inesperado
+ErrorPriceExpression6=Número incorrecto de argumentos (%s dado, se esperaba %s)
+ErrorPriceExpression8=Operador inesperado '%s'
+ErrorPriceExpression9=Ocurrió un error inesperado
+ErrorPriceExpression10=El operador '%s' carece de operando
+ErrorPriceExpression11=Esperando '%s'
+ErrorPriceExpression17=Variable indefinida '%s'
+ErrorPriceExpression21=Resultado vacío '%s'
+ErrorPriceExpression22=Resultado negativo '%s'
+ErrorPriceExpression23=Variable desconocida o no definida '%s' en %s
+ErrorSrcAndTargetWarehouseMustDiffers=Los almacenes de origen y destino deben diferir
+ErrorTryToMakeMoveOnProductRequiringBatchData=Error, al intentar realizar un movimiento de stock sin información de lote / serie, en el producto '%s' que requiere información de lote / serie
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Todas las recepciones registradas deben primero ser verificadas (aprobadas o denegadas) antes de que se les permita realizar esta acción.
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Todas las recepciones registradas primero deben ser verificadas (aprobadas) antes de que se les permita realizar esta acción.
+ErrorGlobalVariableUpdater0=La solicitud HTTP falló con el error '%s'
+ErrorGlobalVariableUpdater1=Formato JSON no válido '%s'
+ErrorGlobalVariableUpdater3=Los datos solicitados no se encontraron en el resultado.
+ErrorGlobalVariableUpdater4=El cliente SOAP falló con el error '%s'
+ErrorGlobalVariableUpdater5=No se seleccionó ninguna variable global
+ErrorFieldMustBeANumeric=El campo <b> %s </b> debe ser un valor numérico
+ErrorMandatoryParametersNotProvided=Parámetro (s) obligatorio no proporcionado
+ErrorOppStatusRequiredIfAmount=Establece una cantidad estimada para este cliente potencial. Por lo que también debe ingresar su estado.
+ErrorFailedToLoadModuleDescriptorForXXX=No se pudo cargar la clase de descriptor de módulo para %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definición incorrecta de la matriz de menús en el descriptor del módulo (valor incorrecto para la clave fk_menu)
+ErrorWarehouseRequiredIntoShipmentLine=Se requiere un almacén en la línea para enviar
+ErrorSupplierCountryIsNotDefined=El país de este proveedor no está definido. Corrija esto primero.
+ErrorsThirdpartyMerge=No se pudieron combinar los dos registros. Solicitud cancelada.
+ErrorStockIsNotEnoughToAddProductOnOrder=El stock no es suficiente para que el producto %s lo agregue a un nuevo pedido.
+ErrorStockIsNotEnoughToAddProductOnInvoice=El stock no es suficiente para que el producto %s lo agregue a una nueva factura.
+ErrorStockIsNotEnoughToAddProductOnShipment=El stock no es suficiente para que el producto %s lo agregue a un nuevo envío.
+ErrorStockIsNotEnoughToAddProductOnProposal=El stock no es suficiente para que el producto %s lo agregue a una nueva propuesta.
+ErrorFailedToLoadLoginFileForMode=No se pudo obtener la clave de inicio de sesión para el modo '%s'.
+ErrorModuleNotFound=No se encontró el archivo del módulo.
+ErrorFieldAccountNotDefinedForBankLine=Valor para la cuenta de contabilidad no definido para el ID de línea de origen %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Valor para la cuenta de contabilidad no definido para el ID de factura %s (%s)
+ErrorFieldAccountNotDefinedForLine=Valor de la cuenta de contabilidad no definido para la línea (%s)
+ErrorBankStatementNameMustFollowRegex=Error, el nombre del extracto bancario debe seguir la siguiente regla de sintaxis %s
+ErrorPhpMailDelivery=Compruebe que no utiliza un número demasiado elevado de destinatarios y que el contenido de su correo electrónico no es similar a un correo no deseado. Pídale también a su administrador que verifique los archivos de registro del servidor y del firewall para obtener una información más completa.
+ErrorUserNotAssignedToTask=El usuario debe estar asignado a la tarea para poder ingresar el tiempo consumido.
+ErrorModuleFileSeemsToHaveAWrongFormat=El paquete del módulo parece tener un formato incorrecto.
+ErrorModuleFileSeemsToHaveAWrongFormat2=Debe existir al menos un directorio obligatorio en el zip del módulo: <strong> %s </strong> o <strong> %s </strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=El nombre del paquete del módulo (<strong> %s </strong>) no coincide con la sintaxis del nombre esperado: <strong> %s a0a65d071f6fc9fz0
+ErrorDuplicateTrigger=Error, nombre de disparador duplicado %s. Ya cargado desde %s.
+ErrorNoWarehouseDefined=Error, no hay almacenes definidos.
+ErrorBadLinkSourceSetButBadValueForRef=El enlace que usas no es válido. Se define una 'fuente' para el pago, pero el valor de 'ref' no es válido.
+ErrorTooManyErrorsProcessStopped=Demasiados errores. El proceso se detuvo.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=La validación masiva no es posible cuando la opción para aumentar / disminuir stock está configurada en esta acción (debe validar uno por uno para que pueda definir el almacén para aumentar / disminuir)
+ErrorObjectMustHaveStatusDraftToBeValidated=El objeto %s debe tener el estado 'Borrador' para ser validado.
+ErrorObjectMustHaveLinesToBeValidated=El objeto %s debe tener líneas para ser validado.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Solo se pueden enviar facturas validadas mediante la acción masiva "Enviar por correo electrónico".
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Debes elegir si el artículo es un producto predefinido o no
+ErrorDiscountLargerThanRemainToPaySplitItBefore=El descuento que intenta aplicar es mayor de lo que queda por pagar. Divida el descuento en 2 descuentos más pequeños antes.
+ErrorFileNotFoundWithSharedLink=No se encontró el archivo. Puede ser que la clave compartida se haya modificado o el archivo se haya eliminado recientemente.
+ErrorDescRequiredForFreeProductLines=La descripción es obligatoria para las líneas con producto gratuito
+ErrorAPageWithThisNameOrAliasAlreadyExists=La página / contenedor <strong> %s </strong> tiene el mismo nombre o alias alternativo que el que intentas usar
+ErrorDuringChartLoad=Error al cargar el plan de cuentas. Si no se cargaron pocas cuentas, aún puede ingresarlas manualmente.
+ErrorBadSyntaxForParamKeyForContent=Sintaxis incorrecta para param keyforcontent. Debe tener un valor que comience con %s o %s
+ErrorVariableKeyForContentMustBeSet=Error, se debe establecer la constante con el nombre %s (con contenido de texto para mostrar) o %s (con URL externa para mostrar).
+ErrorURLMustStartWithHttp=La URL %s debe comenzar con http: // o https: //
+ErrorNewRefIsAlreadyUsed=Error, la nueva referencia ya se usa
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, no es posible eliminar el pago vinculado a una factura cerrada.
+ErrorSearchCriteriaTooSmall=Criterios de búsqueda demasiado pequeños.
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Los objetos deben tener el estado 'Borrador' o 'Deshabilitado' para estar habilitados
+ErrorNoFieldWithAttributeShowoncombobox=Ningún campo tiene la propiedad 'showoncombobox' en la definición del objeto '%s'. No hay forma de mostrar la combolista.
+ProblemIsInSetupOfTerminal=El problema está en la configuración del terminal %s.
+ErrorAddAtLeastOneLineFirst=Agregue al menos una línea primero
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, el registro ya se transfirió a la contabilidad, no es posible eliminarlo.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, el idioma de la página traducida es el mismo que éste.
+ErrorBatchNoFoundForProductInWarehouse=No se encontró ningún lote / serie para el producto "%s" en el almacén "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No hay cantidad suficiente para este lote / serie para el producto "%s" en el almacén "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Solo es posible 1 campo para el 'Agrupar por' (los demás se descartan)
+ErrorTooManyDifferentValueForSelectedGroupBy=Se encontraron demasiados valores diferentes (más de <b> %s </b>) para el campo '<b> %s </b>', por lo que no podemos usarlo como un grupo de. Se ha eliminado el campo 'Agrupar por'. ¿Quizás quisiera usarlo como un eje X?
+ErrorProductNeedBatchNumber=Error, el producto '<b> %s </b>' necesita un lote / número de serie
+ErrorProductDoesNotNeedBatchNumber=Error, el producto '<b> %s </b>' no acepta un número de serie / lote
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, el parámetro <b> %s </b> debe habilitarse en <b> conf / conf.php <b> para permitir el uso de la interfaz de línea de comandos por parte del programador de trabajos interno
+ErrorValueLength=La longitud del campo '<b> %s </b>' debe ser mayor que '<b> %s </b>'
+ErrorReservedKeyword=La palabra '<b> %s </b>' es una palabra clave reservada
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=El idioma de la nueva página no debe ser el idioma de origen si está configurado como una traducción de otra página.
+ErrorYouMustFirstSetupYourChartOfAccount=Primero debe configurar su plan de cuenta
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Su parámetro PHP upload_max_filesize (%s) es mayor que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
+WarningPasswordSetWithNoAccount=Se estableció una contraseña para este miembro. Sin embargo, no se creó ninguna cuenta de usuario. Por lo tanto, esta contraseña se almacena pero no se puede utilizar para iniciar sesión en Dolibarr. Puede ser utilizado por un módulo / interfaz externo, pero si no necesita definir ningún nombre de usuario o contraseña para un miembro, puede deshabilitar la opción "Administrar un inicio de sesión para cada miembro" desde la configuración del módulo Miembro. 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: El correo electrónico también se puede utilizar como inicio de sesión si el miembro está vinculado a un usuario.
+WarningEnableYourModulesApplications=Haga clic aquí para habilitar sus módulos y aplicaciones
+WarningSafeModeOnCheckExecDir=Advertencia, la opción PHP <b> safe_mode </b> está activada, por lo que el comando debe almacenarse dentro de un directorio declarado por el parámetro php <b> safe_mode_exec_dir </b>.
+WarningBookmarkAlreadyExists=Ya existe un marcador con este título o este destino (URL).
+WarningPassIsEmpty=Advertencia, la contraseña de la base de datos está vacía. Este es un agujero de seguridad. Debe agregar una contraseña a su base de datos y cambiar su archivo conf.php para reflejar esto.
+WarningConfFileMustBeReadOnly=Advertencia, el servidor web puede sobrescribir su archivo de configuración (<b> htdocs / conf / conf.php </b>). Este es un grave agujero de seguridad. Modifique los permisos en el archivo para que estén en modo de solo lectura para el usuario del sistema operativo utilizado por el servidor web. Si usa Windows y el formato FAT para su disco, debe saber que este sistema de archivos no permite agregar permisos en el archivo, por lo que no puede ser completamente seguro.
+WarningsOnXLines=Advertencias sobre <b> %s </b> registro (s) fuente
+WarningNoDocumentModelActivated=No se ha activado ningún modelo para la generación de documentos. Se elegirá un modelo por defecto hasta que verifique la configuración de su módulo.
+WarningLockFileDoesNotExists=Advertencia: una vez finalizada la instalación, debe deshabilitar las herramientas de instalación / migración agregando un archivo <b> install.lock </b> en el directorio <b> %s </b>. Omitir la creación de este archivo es un riesgo de seguridad grave.
+WarningUntilDirRemoved=Todas las advertencias de seguridad (visibles solo para los usuarios administradores) permanecerán activas mientras la vulnerabilidad esté presente (o si se agrega la constante MAIN_REMOVE_INSTALL_WARNING en Configuración-> Otra configuración).
+WarningCloseAlways=Advertencia, el cierre se realiza incluso si la cantidad difiere entre los elementos de origen y de destino. Habilite esta función con precaución.
+WarningUsingThisBoxSlowDown=Advertencia, el uso de este cuadro ralentiza seriamente todas las páginas que muestran el cuadro.
+WarningClickToDialUserSetupNotComplete=La configuración de la información de ClickToDial para su usuario no está completa (consulte la pestaña ClickToDial en su tarjeta de usuario).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Característica desactivada cuando la configuración de la pantalla está optimizada para personas ciegas o navegadores de texto.
+WarningPaymentDateLowerThanInvoiceDate=La fecha de pago (%s) es anterior a la fecha de la factura (%s) para la factura %s.
+WarningTooManyDataPleaseUseMoreFilters=Demasiados datos (más de %s líneas). Utilice más filtros o establezca la constante %s en un límite superior.
+WarningSomeLinesWithNullHourlyRate=Algunas veces fueron registradas por algunos usuarios mientras que su tarifa por hora no estaba definida. Se utilizó un valor de 0 %s por hora, pero esto puede resultar en una valoración incorrecta del tiempo empleado.
+WarningYourLoginWasModifiedPleaseLogin=Se modificó su inicio de sesión. Por motivos de seguridad, deberá iniciar sesión con su nuevo inicio de sesión antes de la siguiente acción.
+WarningNumberOfRecipientIsRestrictedInMassAction=Advertencia, el número de destinatarios diferentes está limitado a <b> %s </b> cuando se utilizan acciones masivas en listas
+WarningProjectDraft=El proyecto todavía está en modo borrador. No olvides validarlo si planeas usar tareas.
+WarningProjectClosed=Proyecto cerrado. Primero debes volver a abrirlo.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Algunas transacciones bancarias se eliminaron después de que se generó el recibo que las incluía. Por lo tanto, el número de cheques y el total del recibo pueden diferir del número y el total de la lista.
+WarningFailedToAddFileIntoDatabaseIndex=Advertencia, no se pudo agregar la entrada de archivo en la tabla de índice de la base de datos de ECM
+WarningAvailableOnlyForHTTPSServers=Disponible solo si se usa una conexión segura HTTPS.
diff --git a/htdocs/langs/es_CO/externalsite.lang b/htdocs/langs/es_CO/externalsite.lang
index 41f70db06fe..d29b234afae 100644
--- a/htdocs/langs/es_CO/externalsite.lang
+++ b/htdocs/langs/es_CO/externalsite.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteURL=URL del sitio externo del iframe HTML
 ExampleMyMenuEntry=Mi entrada en el menú
diff --git a/htdocs/langs/es_CO/ftp.lang b/htdocs/langs/es_CO/ftp.lang
new file mode 100644
index 00000000000..f021b8f4b8b
--- /dev/null
+++ b/htdocs/langs/es_CO/ftp.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - ftp
+FTPFeatureNotSupportedByYourPHP=Su PHP no es compatible con las funciones FTP o SFTP
+FailedToConnectToFTPServerWithCredentials=No se pudo ingresar al servidor con el usuario/contraseña definidos
+FTPFailedToRemoveFile=No se pudo eliminar el archivo <b> %s </b>.
+FTPFailedToRemoveDir=No se pudo eliminar el directorio <b> %s </b>: verifique los permisos y que el directorio esté vacío.
diff --git a/htdocs/langs/es_CO/help.lang b/htdocs/langs/es_CO/help.lang
new file mode 100644
index 00000000000..fc2607c0f94
--- /dev/null
+++ b/htdocs/langs/es_CO/help.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Soporte de foro / wiki
+EMailSupport=Soporte de correos electrónicos
+RemoteControlSupport=Soporte en línea en tiempo real / remoto
+OtherSupport=Otro apoyo
+ToSeeListOfAvailableRessources=Para contactar / ver recursos disponibles:
+HelpCenter=Centro de ayuda
+DolibarrHelpCenter=Centro de ayuda y soporte técnico de Dolibarr
+ToGoBackToDolibarr=De lo contrario, <a href="%s"> haga clic aquí para continuar usando Dolibarr </a>.
+TypeOfSupport=Tipo de apoyo
+TypeSupportCommunauty=Comunidad (gratis)
+NeedHelpCenter=¿Necesitas ayuda o apoyo?
+Efficiency=Eficiencia
+TypeHelpOnly=Solo ayuda
+TypeHelpDev=Ayuda + Desarrollo
+TypeHelpDevForm=Ayuda + Desarrollo + Formación
+BackToHelpCenter=De lo contrario, <a href="%s"> vuelva a la página de inicio del Centro de ayuda </a>.
+LinkToGoldMember=Puede llamar a uno de los entrenadores preseleccionados por Dolibarr para su idioma (%s) haciendo clic en su Widget (el estado y el precio máximo se actualizan automáticamente):
+PossibleLanguages=Idiomas admitidos
+SubscribeToFoundation=Ayuda al proyecto Dolibarr, suscríbete a la fundación
+SeeOfficalSupport=Para soporte oficial de Dolibarr en su idioma: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
diff --git a/htdocs/langs/es_CO/hrm.lang b/htdocs/langs/es_CO/hrm.lang
new file mode 100644
index 00000000000..e5230a6f0df
--- /dev/null
+++ b/htdocs/langs/es_CO/hrm.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - Source file is en_US - hrm
+HRM_EMAIL_EXTERNAL_SERVICE=Correo electrónico para evitar el servicio externo de HRM
+ConfirmDeleteEstablishment=¿Estás seguro de que deseas eliminar este establecimiento?
+OpenEtablishment=Establecimiento abierto
+CloseEtablishment=Establecimiento cerrado
+DictionaryPublicHolidays=HRM - Días festivos
+DictionaryDepartment=HRM - Lista de departamentos
+DictionaryFunction=HRM - Puestos de trabajo
+ListOfEmployees=Lista de empleados
diff --git a/htdocs/langs/es_CO/install.lang b/htdocs/langs/es_CO/install.lang
index fe8e362f7ef..ecb5e3bc256 100644
--- a/htdocs/langs/es_CO/install.lang
+++ b/htdocs/langs/es_CO/install.lang
@@ -11,13 +11,18 @@ ConfFileReload=Recarga de parámetros desde archivo de configuración.
 PHPSupportPOSTGETOk=Este PHP soporta las variables POST y GET.
 PHPSupportPOSTGETKo=Es posible que su configuración de PHP no admita las variables POST y / o GET. Verifique el parámetro <b> variables_order </b> en php.ini.
 PHPSupportSessions=Este PHP soporta sesiones.
+PHPSupport=Este PHP admite las funciones %s.
 PHPMemoryOK=La memoria de sesión de PHP max está configurada en <b> %s </b>. Esto debería ser suficiente.
 PHPMemoryTooLow=La memoria de sesión de PHP max está configurada en <b> %s </b> bytes. Esto es demasiado bajo. Cambie su <b> php.ini </b> para establecer el parámetro <b> memory_limit </b> en al menos <b> %s </b> bytes.
 Recheck=Haga clic aquí para una prueba más detallada
 ErrorPHPDoesNotSupportSessions=Su instalación de PHP no soporta sesiones. Esta función es necesaria para permitir que Dolibarr funcione. Compruebe su configuración de PHP y permisos del directorio de sesiones.
 ErrorPHPDoesNotSupportGD=Su instalación de PHP no soporta funciones gráficas de GD. No habrá gráficos disponibles.
 ErrorPHPDoesNotSupportCurl=Su instalación de PHP no es compatible con Curl.
+ErrorPHPDoesNotSupportCalendar=Su instalación de PHP no admite extensiones de calendario php.
 ErrorPHPDoesNotSupportUTF8=Su instalación de PHP no es compatible con las funciones UTF8. Dolibarr no puede funcionar correctamente. Resuelve esto antes de instalar Dolibarr.
+ErrorPHPDoesNotSupportIntl=Su instalación de PHP no es compatible con las funciones de Intl.
+ErrorPHPDoesNotSupportxDebug=Su instalación de PHP no admite funciones de depuración extendidas.
+ErrorPHPDoesNotSupport=Su instalación de PHP no es compatible con las funciones %s.
 ErrorDirDoesNotExists=El directorio %s no existe.
 ErrorGoBackAndCorrectParameters=Regresa y revisa / corrige los parámetros.
 ErrorWrongValueForParameter=Es posible que haya escrito un valor incorrecto para el parámetro '%s'.
@@ -68,6 +73,7 @@ GoToDolibarr=Ir a dolibarr
 GoToSetupArea=Ir a Dolibarr (área de configuración)
 GoToUpgradePage=Ir a la página de actualización de nuevo
 WithNoSlashAtTheEnd=Sin la barra "/" al final
+DirectoryRecommendation=<span class="warning"> IMPORTANTE </span>: Debe usar un directorio que esté fuera de las páginas web (por lo tanto, no use un subdirectorio del parámetro anterior).
 AdminLoginAlreadyExists=La cuenta de administrador de Dolibarr '<b> %s </b>' ya existe. Vuelve si quieres crear otro.
 FailedToCreateAdminLogin=Error al crear la cuenta de administrador de Dolibarr.
 WarningRemoveInstallDir=Una advertencia, por razones de seguridad, una vez que se complete la instalación o actualización, debe agregar un archivo llamado <b> install.lock </b> en el directorio de documentos de Dolibarr para evitar nuevamente el uso accidental / malicioso de las herramientas de instalación.
@@ -103,6 +109,7 @@ OpenBaseDir=Parámetro PHP openbasedir
 YouAskToCreateDatabaseSoRootRequired=Has marcado la casilla "Crear base de datos". Para esto, debe proporcionar el nombre de usuario / contraseña del superusuario (parte inferior del formulario).
 YouAskToCreateDatabaseUserSoRootRequired=Has marcado la casilla "Crear propietario de base de datos". Para esto, debe proporcionar el nombre de usuario / contraseña del superusuario (parte inferior del formulario).
 NextStepMightLastALongTime=El paso actual puede tardar varios minutos. Por favor, espere hasta que la siguiente pantalla se muestre completamente antes de continuar.
+MigrationCustomerOrderShipping=Migrar el envío para el almacenamiento de pedidos de ventas
 MigrationShippingDelivery=Actualizar el almacenamiento de envío
 MigrationShippingDelivery2=Actualización de almacenamiento de envío 2
 MigrationFinished=Migración terminada
@@ -162,6 +169,7 @@ MigrationProjectTaskActors=Migración de datos para la tabla llx_projet_task_act
 MigrationProjectUserResp=Campo de migración de datos fk_user_resp de llx_projet a llx_element_contact
 MigrationProjectTaskTime=Tiempo de actualización gastado en segundos
 MigrationActioncommElement=Actualizar datos sobre acciones.
+MigrationPaymentMode=Migración de datos por tipo de pago
 MigrationCategorieAssociation=Migración de categorías
 MigrationEvents=Migración de eventos para agregar el propietario del evento en la tabla de asignación
 MigrationEventsContact=Migración de eventos para agregar contactos de eventos a la tabla de asignación
@@ -169,7 +177,10 @@ MigrationRemiseEntity=Actualizar el valor del campo de entidad de llx_societe_re
 MigrationRemiseExceptEntity=Actualizar el valor del campo de entidad de llx_societe_remise_except
 MigrationUserRightsEntity=Actualizar el valor del campo de entidad de llx_user_rights
 MigrationUserGroupRightsEntity=Actualizar el valor del campo de entidad de llx_usergroup_rights
+MigrationUserPhotoPath=Migración de rutas de fotos para usuarios
+MigrationFieldsSocialNetworks=Migración de campos de usuarios redes sociales (%s)
 MigrationResetBlockedLog=Restablecer módulo BlockedLog para algoritmo v7
 ErrorFoundDuringMigration=Se informaron errores durante el proceso de migración, por lo que el siguiente paso no está disponible. Para ignorar los errores, puede <a href="%s"> hacer clic aquí </a>, pero es posible que la aplicación o algunas funciones no funcionen correctamente hasta que se resuelvan los errores.
 YouTryInstallDisabledByDirLock=La aplicación intentó actualizarse automáticamente, pero las páginas de instalación / actualización se han deshabilitado por seguridad (directorio renombrado con el sufijo .lock). <br>
 YouTryInstallDisabledByFileLock=La aplicación intentó auto actualizarse, pero las páginas de instalación / actualización se han deshabilitado por seguridad (debido a la existencia de un archivo de bloqueo <strong> install.lock </strong> en el directorio de documentos de dolibarr). <br>
+ClickOnLinkOrRemoveManualy=Si hay una actualización en curso, espere. Si no es así, haga clic en el siguiente enlace. Si siempre ve esta misma página, debe eliminar / cambiar el nombre del archivo install.lock en el directorio de documentos.
diff --git a/htdocs/langs/es_CO/intracommreport.lang b/htdocs/langs/es_CO/intracommreport.lang
index 76825d9b4ab..bb978f742ef 100644
--- a/htdocs/langs/es_CO/intracommreport.lang
+++ b/htdocs/langs/es_CO/intracommreport.lang
@@ -1,2 +1,7 @@
 # Dolibarr language file - Source file is en_US - intracommreport
-IntracommReportPeriod=Period of nalysis
+Module68000Desc =Gestión de informes intracomunitarios (soporte para formato francés DEB / DES)
+IntracommReportSetup =Configuración del módulo intracommreport
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Nivel de obligación sobre los envíos
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Categoría de servicio del tipo "Gastos de envío"
+IntracommReportTitle=Elaboración de un archivo XML en formato ProDouane
+IntracommReportNumber=Numero de declaracion
diff --git a/htdocs/langs/es_CO/knowledgemanagement.lang b/htdocs/langs/es_CO/knowledgemanagement.lang
new file mode 100644
index 00000000000..ed6135a5669
--- /dev/null
+++ b/htdocs/langs/es_CO/knowledgemanagement.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - Source file is en_US - knowledgemanagement
+ModuleKnowledgeManagementName =Sistema de gestión del conocimiento
+ModuleKnowledgeManagementDesc=Gestionar una base de Gestión del conocimiento (KM- GC) o Mesa de ayuda
+KnowledgeManagementSetup =Configuración del sistema de gestión del conocimiento
+KnowledgeManagementSetupPage =Página de configuración del sistema de gestión del conocimiento
+KnowledgeManagementAbout =Acerca de la gestión del conocimiento
+KnowledgeManagementAboutPage =Gestión del conocimiento sobre la página
+KnowledgeManagementArea =Conocimiento administrativo
+MenuKnowledgeRecord =Base de conocimientos
diff --git a/htdocs/langs/es_CO/ldap.lang b/htdocs/langs/es_CO/ldap.lang
index 30b7d650292..b4f14135057 100644
--- a/htdocs/langs/es_CO/ldap.lang
+++ b/htdocs/langs/es_CO/ldap.lang
@@ -1,2 +1,17 @@
 # Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=La contraseña para el usuario <b> %s </b> en el dominio <b> %s </b> debe cambiarse.
+UserMustChangePassNextLogon=El usuario debe cambiar la contraseña en el dominio %s
+LDAPInformationsForThisContact=Información en la base de datos LDAP para este contacto
+LDAPInformationsForThisUser=Información en la base de datos LDAP para este usuario
+LDAPInformationsForThisGroup=Información en la base de datos LDAP para este grupo
+LDAPInformationsForThisMember=Información en la base de datos LDAP para este miembro
+LDAPCard=Tarjeta LDAP
 LDAPFieldStatus=Estado
+LDAPFieldFirstSubscriptionDate=Primera fecha de suscripción
+LDAPFieldFirstSubscriptionAmount=Importe de la primera suscripción
+LDAPFieldLastSubscriptionDate=Última fecha de suscripción
+LDAPFieldLastSubscriptionAmount=Último monto de suscripción
+LDAPFieldSkype=Cuenta de Skype
+LDAPFieldSkypeExample=Ejemplo: skypeName
+ErrorFailedToReadLDAP=No se pudo leer la base de datos LDAP. Verifique la configuración del módulo LDAP y la accesibilidad a la base de datos.
+PasswordOfUserInLDAP=Contraseña de usuario en LDAP
diff --git a/htdocs/langs/es_CO/link.lang b/htdocs/langs/es_CO/link.lang
new file mode 100644
index 00000000000..3f1aa9375e2
--- /dev/null
+++ b/htdocs/langs/es_CO/link.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - Source file is en_US - link
+LinkANewFile=Vincular un nuevo archivo / documento
+NoLinkFound=No hay enlaces registrados
+LinkComplete=El archivo se ha vinculado correctamente
+ErrorFileNotLinked=El archivo no se pudo vincular
+LinkRemoved=El enlace %s ha sido eliminado
+ErrorFailedToDeleteLink=Error al eliminar el enlace '<b> %s </b>'
+ErrorFailedToUpdateLink=Error al actualizar el enlace '<b> %s </b>'
+URLToLink=URL para vincular
diff --git a/htdocs/langs/es_CO/mailmanspip.lang b/htdocs/langs/es_CO/mailmanspip.lang
new file mode 100644
index 00000000000..98090117641
--- /dev/null
+++ b/htdocs/langs/es_CO/mailmanspip.lang
@@ -0,0 +1,25 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanTitle=Sistema de lista de correo Mailman
+TestSubscribe=Comprobar la suscripción a las listas de Mailman
+TestUnSubscribe=Comprobar la cancelación de suscripción de las listas de Mailman
+MailmanCreationSuccess=La prueba de suscripción se ejecutó con éxito
+MailmanDeletionSuccess=La prueba de cancelación de suscripción se ejecutó con éxito
+SynchroMailManEnabled=Se realizará una actualización de Mailman
+SynchroSpipEnabled=Se realizará una actualización de Spip
+DescADHERENT_MAILMAN_ADMINPW=Contraseña de administrador de Mailman
+DescADHERENT_MAILMAN_URL=URL de las suscripciones de Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL para darse de baja de Mailman
+DescADHERENT_MAILMAN_LISTS=Lista(s) para la inscripción automática de nuevos miembros (separados por coma)
+SPIPTitle=Sistema de gestión de contenido SPIP
+DescADHERENT_SPIP_DB=Nombre de la base de datos SPIP
+DescADHERENT_SPIP_USER=Inicio de sesión en la base de datos SPIP
+DescADHERENT_SPIP_PASS=Contraseña de la base de datos SPIP
+AddIntoSpip=Agregar a SPIP
+AddIntoSpipConfirmation=¿Está seguro de que desea agregar este miembro a SPIP?
+AddIntoSpipError=No se pudo agregar el usuario en SPIP
+DeleteIntoSpip=Eliminar de SPIP
+DeleteIntoSpipConfirmation=¿Está seguro de que desea eliminar a este miembro de SPIP?
+DeleteIntoSpipError=No se pudo suprimir al usuario de SPIP
+SPIPConnectionFailed=No se pudo conectar a SPIP
+SuccessToAddToMailmanList=%s agregado exitosamente a la lista de mailman %s o base de datos SPIP
+SuccessToRemoveToMailmanList=%s eliminado con éxito de la lista de mailman %s o base de datos SPIP
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index e50d0cad34a..26b4e7b349c 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -22,6 +22,7 @@ FormatDateHourText=%d %B %Y %H:%M
 NoTemplateDefined=No hay plantilla disponible para este tipo de correo electrónico.
 AvailableVariables=Variables de sustitución disponibles
 CurrentTimeZone=Zona horaria de PHP (servidor)
+EmptySearchString=Ingrese criterios de búsqueda
 NoRecordFound=No se encontraron registros
 NoRecordDeleted=Ningún registro eliminado
 Errors=Los errores
@@ -33,7 +34,10 @@ ErrorYourCountryIsNotDefined=Tu país no está definido. Vaya a Inicio-Configura
 ErrorRecordIsUsedByChild=Error al eliminar este registro. Este registro es utilizado por al menos un registro secundario.
 ErrorServiceUnavailableTryLater=Servicio no disponible en este momento. Inténtalo de nuevo más tarde.
 ErrorSomeErrorWereFoundRollbackIsDone=Se encontraron algunos errores. Los cambios se han revertido.
+ErrorConfigParameterNotDefined=El parámetro <b> %s </b> no está definido en el archivo de configuración de Dolibarr <b> conf.php </b>.
 ErrorNoSocialContributionForSellerCountry=Error, no se ha definido ningún tipo de impuesto social / fiscal para el país '%s'.
+ErrorCannotAddThisParentWarehouse=Está intentando agregar un almacén principal que ya es un elemento secundario de un almacén existente.
+MaxNbOfRecordPerPage=Max. número de registros por página
 NotAuthorized=No estás autorizado para hacer eso.
 SeeHere=Ver aquí
 ClickHere=haga clic aquí
@@ -46,10 +50,13 @@ FilesDeleted=Archivo (s) eliminado exitosamente
 FileWasNotUploaded=Un archivo ha sido seleccionado para adjuntarlo, pero aún no se ha subido. Haga clic en "Adjuntar este archivo".
 NbOfEntries=Numero de entradas
 GoToWikiHelpPage=Lea la ayuda en línea (se necesita acceso a Internet)
+HomePage=Pagina de inicio
 DolibarrInHttpAuthenticationSoPasswordUseless=El modo de autenticación de Dolibarr se establece en <b> %s </b> en el archivo de configuración <b> conf.php </b>. <br> Esto significa que la base de datos de contraseñas es externa a Dolibarr, por lo que cambiar este campo puede no tener efecto. .
 PasswordForgotten=¿Contraseña olvidada?
 NoAccount=No cuenta
 SeeAbove=Ver arriba
+LastConnexion=Último acceso
+PreviousConnexion=Inicio de sesión anterior
 PreviousValue=Valor anterior
 AuthenticationMode=Modo de autenticación
 RequestLastAccessInError=Último error de solicitud de acceso a la base de datos
@@ -58,6 +65,8 @@ InformationLastAccessInError=Información para el último error de solicitud de
 YouCanSetOptionDolibarrMainProdToZero=Puede leer el archivo de registro o configurar la opción $ dolibarr_main_prod en '0' en su archivo de configuración para obtener más información.
 InformationToHelpDiagnose=Esta información puede ser útil para fines de diagnóstico (puede configurar la opción $ dolibarr_main_prod en '1' para eliminar dichos avisos)
 TechnicalID=Identificación técnica
+LineID=Identificación de línea
+WarningYouHaveAtLeastOneTaskLate=Advertencia, tiene al menos un elemento que ha excedido el tiempo de tolerancia.
 NotClosed=No se ha cerrado
 Enable=Habilitar
 RemoveLink=Remover enlace
@@ -66,16 +75,26 @@ CloseBox=Eliminar widget de tu panel de control
 ConfirmSendCardByMail=¿Realmente desea enviar el contenido de esta tarjeta por correo a <b> %s </b>?
 Resiliate=Terminar
 ValidateAndApprove=Validar y aprobar
+SaveAndStay=Guardar y quedarse
+ConfirmClone=Elija los datos que desea duplicar:
 Hide=Esconder
+SearchMenuShortCut=Ctrl + Mayús + F
+QuickAdd=Adición rápida
+QuickAddMenuShortCut=Ctrl + Mayús + l
+Upload=Subir
 ResizeOrCrop=Redimensionar o Recortar
 NoUserGroupDefined=No hay grupo de usuario definido
+DescriptionOfLine=Descripción de la línea
 Model=Plantilla doc
 DefaultModel=Plantilla de documento predeterminada
 MenuWarnings=Las alertas
+Deadline=Plazo
 DateToday=El día de hoy
 DateEnd=Fecha final
 DateCreationShort=Crea fecha
+IPCreation=Creación de IP
 DateModificationShort=Fecha modificación
+IPModification=Modificación de IP
 UserCreation=Usuario creacion
 UserModification=Usuario de modificacion
 UserValidation=Usuario de validación
@@ -84,15 +103,27 @@ UserModificationShort=Modif. usuario
 UserValidationShort=Válido. usuario
 MinuteShort=Minnesota
 UseLocalTax=Incluir impuestos
-UserModif=Usuario de la última actualización.
 DefaultValues=Valores predeterminados / filtros / clasificación
+UnitPriceHT=Precio unitario (excl.)
+UnitPriceHTCurrency=Precio unitario (excl.) (Moneda)
+PriceUHTCurrency=U.P (neto) (moneda)
 PriceUTTC=ARRIBA. (inc. impuestos)
+AmountInvoicedTTC=Importe facturado (impuestos inc.)
+AmountHTShort=Importe (excl.)
+AmountHT=Importe (sin impuestos)
 MulticurrencyAlreadyPaid=Ya pagado, moneda original.
 MulticurrencyRemainderToPay=Quedan por pagar, moneda original.
+MulticurrencyAmountHT=Importe (sin impuestos), moneda original
 MulticurrencyAmountTTC=Importe (inc. De impuestos), moneda original
 MulticurrencyAmountVAT=Importe impuesto, moneda original
+PriceQtyMinHT=Precio cantidad min. (sin impuestos)
+PriceQtyMinHTCurrency=Precio cantidad min. (sin impuestos) (moneda)
+TotalHTShortCurrency=Total (excl. En moneda)
+TotalHT=Total (sin impuestos)
+TotalHTforthispage=Total (sin impuestos) para esta página
 Totalforthispage=Total para esta página
 TotalLT1IN=CGST total
+HT=Excl. impuesto
 INCVATONLY=IVA incluido
 INCT=Inc. todos los impuestos
 VATs=Impuestos de ventas
@@ -100,6 +131,7 @@ LT1=Impuesto de ventas 2
 LT1Type=Tipo de impuesto de ventas 2
 LT2=Impuesto de ventas 3
 LT2Type=Tipo de impuesto de ventas 3
+LT1GC=Centavos adicionales
 VATCode=Código de tasa de impuestos
 VATNPR=Tasa de Impuestos NPR
 DefaultTaxRate=Tasa impositiva por defecto
@@ -112,12 +144,20 @@ CommercialProposalsShort=Cotizaciones
 LatestLinkedEvents=Los últimos eventos vinculados %s
 CompanyFoundation=Empresa / Organización
 Accountant=Contador
+ActionsOnCompany=Eventos para este tercero
+ActionsOnContact=Eventos para este contacto / dirección
+ActionsOnContract=Eventos para este contrato
 Completed=Terminado
 RequestAlreadyDone=La solicitud ya ha sido procesada
 FilterOnInto=Los criterios de búsqueda '<strong> %s </strong>' en los campos %s
+DolibarrWorkBoard=Artículos abiertos
+NoOpenedElementToProcess=Ningún elemento abierto para procesar
 Categories=Etiquetas / categorías
 Category=Etiqueta / categoría
+ValidatedToProduce=Validado (Para producir)
+ClosedAll=Cerrado (todo)
 Topic=Tema
+LateDesc=Un elemento se define como Retrasado según la configuración del sistema en el menú Inicio - Configuración - Alertas.
 NoItemLate=Sin artículo atrasado
 DeletePicture=Borrar imagen
 ConfirmDeletePicture=¿Confirmar eliminación de imagen?
@@ -134,20 +174,27 @@ Uncheck=Desmarcar
 SupplierPreview=Vista previa del vendedor
 ShowSupplierPreview=Mostrar vista previa del vendedor
 Currency=Moneda
+SendByMail=Enviar por correo electrónico
 SendAcknowledgementByMail=Enviar correo electrónico de confirmación
 SendMail=Enviar correo electrónico
+AlreadyRead=Leído
 ValueIsNotValid=El valor no es valido
 RecordCreatedSuccessfully=Registro creado exitosamente
 MoveBox=Mover widget
 CompleteOrNoMoreReceptionExpected=Completo o nada más esperado.
+ExpectedQty=Cant. esperada
 YouCanChangeValuesForThisListFromDictionarySetup=Puede cambiar los valores para esta lista desde el menú Configuración - Diccionarios
 YouCanChangeValuesForThisListFrom=Puede cambiar los valores para esta lista desde el menú %s
 YouCanSetDefaultValueInModuleSetup=Puede configurar el valor predeterminado utilizado al crear un nuevo registro en la configuración del módulo
 Layout=Diseño
+RootOfMedias=Raíz de los medios públicos (/ medias)
+FreeLineOfType=Elemento de texto libre, escriba:
 DocumentModelStandardPDF=Plantilla PDF estándar
+WarningYouAreInMaintenanceMode=Advertencia, está en modo de mantenimiento: solo el usuario <b> %s </b> puede utilizar la aplicación en este modo.
 CoreErrorMessage=Disculpe, ocurrió un error. Póngase en contacto con el administrador del sistema para consultar los registros o deshabilite $ dolibarr_main_prod = 1 para obtener más información.
 FieldsWithIsForPublic=Los campos con <b> %s </b> se muestran en la lista pública de miembros. Si no quieres esto, desmarca la casilla "público".
 AccordingToGeoIPDatabase=(De acuerdo a la conversión de GeoIP)
+ValidateBefore=El artículo debe estar validado antes de usar esta función.
 TotalizableDesc=Este campo es totalizable en lista.
 NewAttribute=Nuevo atributo
 AttributeCode=Código atributo
@@ -156,8 +203,12 @@ LinkToProposal=Enlace a propuesta
 LinkToOrder=Enlace a pedido
 LinkToInvoice=Enlace a factura
 LinkToTemplateInvoice=Enlace a la factura de la plantilla
+LinkToSupplierOrder=Enlace a la orden de compra
+LinkToSupplierProposal=Enlace a la propuesta del proveedor
+LinkToSupplierInvoice=Enlace a la factura del proveedor
 LinkToContract=Enlace al contrato
 LinkToIntervention=Enlace a la intervención
+LinkToTicket=Enlace al ticket
 ClickToRefresh=Haga clic para actualizar
 EditHTMLSource=Editar código fuente HTML
 SystemTools=Herramientas de sistema
@@ -175,26 +226,38 @@ Deny=Negar
 Denied=Negado
 ListOfTemplates=Lista de plantillas
 Gender=Género
+Genderman=Masculino
+Genderwoman=Femenino
 ViewList=Vista de la lista
 Sincerely=Sinceramente
+ConfirmDeleteObject=¿Está seguro de que desea eliminar este objeto?
 DeleteLine=Eliminar linea
 ConfirmDeleteLine=¿Estás seguro de que quieres eliminar esta línea?
+ErrorPDFTkOutputFileNotFound=Error: no se generó el archivo. Verifique que el comando 'pdftk' esté instalado en un directorio incluido en la variable de entorno $PATH (solo linux/unix) o comuníquese con el administrador del sistema.
 NoPDFAvailableForDocGenAmongChecked=No hay PDF disponibles para la generación de documentos entre el registro verificado
 TooManyRecordForMassAction=Demasiados registros seleccionados para la acción de masas. La acción está restringida a una lista de registros %s.
 NoRecordSelected=Sin registro seleccionado
 MassFilesArea=Área para archivos construidos por acciones masivas.
 ShowTempMassFilesArea=Mostrar área de archivos construidos por acciones masivas.
+ConfirmMassDeletion=Confirmación de eliminación masiva
+ConfirmMassDeletionQuestion=¿Está seguro de que desea eliminar los registros seleccionados %s?
 ClassifyUnbilled=Clasificar sin facturar
 FrontOffice=Oficina frontal
 Exports=Las exportaciones
 ExportFilteredList=Exportar lista filtrada
 ExportList=Lista de exportación
+ExportOfPiecesAlreadyExportedIsEnable=La exportación de piezas ya exportadas está habilitada.
+ExportOfPiecesAlreadyExportedIsDisable=La exportación de piezas ya exportadas está deshabilitada.
+AllExportedMovementsWereRecordedAsExported=Todos los movimientos exportados se registraron como exportados
+NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos exportados se pueden registrar como exportados
 Miscellaneous=Diverso
 GroupBy=Agrupar por...
 SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar solo parcialmente traducidos o pueden contener errores. Ayude a corregir su idioma registrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ < / a> para añadir tus mejoras.
 DownloadDocument=Descargar documento
 ActualizeCurrency=Tasa de cambio de moneda
+ModuleBuilder=Generador de módulos y aplicaciones
 ClickToShowHelp=Haga clic para mostrar la ayuda de ayuda.
+WebSiteAccounts=Cuentas de sitios web
 ExpenseReport=Informe de gastos
 ExpenseReports=Reporte de gastos
 HR=HORA
@@ -211,6 +274,12 @@ ListOpenLeads=Lista de clientes potenciales abiertos
 ListOpenProjects=Listar proyectos abiertos
 NewLeadOrProject=Nueva Iniciativa o proyecto
 LineNb=Línea no.
+TabLetteringSupplier=Letras de proveedor
+three=Tres
+seven=Siete
+thirteen=tercero
+eighteen=Dieciocho
+billion=mil millones
 SelectMailModel=Seleccione una plantilla de correo electrónico
 Select2ResultFoundUseArrows=Algunos resultados encontrados. Usa las flechas para seleccionar.
 Select2NotFound=No se han encontrado resultados
@@ -222,6 +291,7 @@ Select2LoadingMoreResults=Cargando más resultados ...
 Select2SearchInProgress=Búsqueda en progreso ...
 SearchIntoCustomerInvoices=Facturas de clientes
 SearchIntoSupplierInvoices=Facturas de proveedores
+SearchIntoCustomerOrders=Ordenes de venta
 SearchIntoSupplierOrders=Ordenes de compra
 SearchIntoCustomerProposals=Cotizaciones
 SearchIntoSupplierProposals=Propuestas de proveedores
@@ -229,6 +299,7 @@ SearchIntoContracts=Los contratos
 SearchIntoCustomerShipments=Envios de clientes
 SearchIntoExpenseReports=Reporte de gastos
 SearchIntoLeaves=Salir
+SearchIntoVendorPayments=Pagos a proveedores
 NbComments=Numero de comentarios
 Everybody=Todos
 PayedTo=Pagado para
@@ -237,6 +308,31 @@ Deletedraft=Borrar borrador
 ConfirmMassDraftDeletion=Confirmación de borrado masivo borrador
 SelectAThirdPartyFirst=Seleccione un tercero primero ...
 YouAreCurrentlyInSandboxMode=Actualmente se encuentra en el modo "sandbox" %s
+ShowCompanyInfos=Mostrar info de la empresa
+ShowMoreInfos=Mostrar más info
+NoFilesUploadedYet=Primero cargue un documento
+ValidFrom=Válida desde
+ToClose=Cerrar
+ToProcess=Procesar
+ToApprove=Aprobar
+NoArticlesFoundForTheKeyword=No se ha encontrado ningún artículo para la palabra clave '<strong> %s </strong>'
+NoArticlesFoundForTheCategory=No se ha encontrado ningún artículo para la categoría.
+ToAcceptRefuse=Aceptar | Rechazar
 ContactDefault_agenda=Acción
 ContactDefault_commande=Orden
+ContactDefault_invoice_supplier=Factura del proveedor
+ContactDefault_order_supplier=Orden de compra
 ContactDefault_propal=Propuesta
+ContactDefault_supplier_proposal=Propuesta de proveedor
+ContactAddedAutomatically=Contacto agregado desde roles de terceros de contacto
+DeleteFileHeader=Confirmar la eliminación del archivo
+NotUsedForThisCustomer=No utilizado para este cliente
+AmountMustBePositive=La cantidad debe ser positiva
+ASAP=Lo antes posible
+DefaultMailModel=Modelo de correo predeterminado
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=El token de seguridad ha caducado, por lo que se canceló la acción. Inténtalo de nuevo.
+UpToDate=Al día
+OutOfDate=Vencido
+EventReminder=Recordatorio de evento
+ConfirmAffectTag=Afectar etiqueta en masa
+ConfirmAffectTagQuestion=¿Está seguro de que desea afectar las etiquetas a los registros seleccionados %s?
diff --git a/htdocs/langs/es_CO/members.lang b/htdocs/langs/es_CO/members.lang
index 463ed1141e9..a3f15fb02d8 100644
--- a/htdocs/langs/es_CO/members.lang
+++ b/htdocs/langs/es_CO/members.lang
@@ -1,3 +1,145 @@
 # Dolibarr language file - Source file is en_US - members
+MembersArea=Área de miembros
+MemberCard=Tarjeta de miembro
+SubscriptionCard=Tarjeta de suscripción
+ShowMember=Mostrar tarjeta de miembro
+ThirdpartyNotLinkedToMember=Tercero no vinculado a un miembro
+MembersTickets=Entradas miembros
+FundationMembers=Miembros de la fundación
+ErrorUserPermissionAllowsToLinksToItselfOnly=Por razones de seguridad, se le deben otorgar permisos para editar todos los usuarios para poder vincular un miembro a un usuario que no es suyo.
+SetLinkToUser=Enlace a un usuario de Dolibarr
+SetLinkToThirdParty=Enlace a un tercero de Dolibarr
+MembersList=Lista de miembros
+MembersListToValid=Lista de miembros en borrador (por validar)
+MembersListValid=Lista de miembros válidos
+MembersListUpToDate=Lista de miembros válidos con suscripción actualizada
+MembersListNotUpToDate=Lista de miembros válidos con suscripción desactualizada
+MembersListResiliated=Lista de miembros cesados
+MembersListQualified=Lista de miembros calificados
+MenuMembersToValidate=Borradores de miembros
+MenuMembersResiliated=Miembros terminados
+MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
+MembersWithSubscriptionToReceiveShort=Suscripción para recibir
+DateSubscription=Fecha de suscripción
+DateEndSubscription=Fecha de finalización de la suscripción
+SubscriptionId=ID de suscripción
+MemberId=Identificación de miembro
+MemberTypeId=ID de tipo de miembro
+MemberTypeLabel=Etiqueta de tipo de miembro
 MemberStatusDraft=Borrador (necesita ser validado)
+MemberStatusActive=Validado (suscripción en espera)
+MemberStatusActiveLate=Subscripcion vencida
+MemberStatusActiveLateShort=Caducado
+MemberStatusPaid=Suscripción actualizada
+MemberStatusPaidShort=A hoy
+MemberStatusResiliated=Miembro rescindido
+MemberStatusResiliatedShort=Terminado
+MembersStatusToValid=Borradores de miembros
+MembersStatusResiliated=Miembros terminados
+NewCotisation=Nueva contribución
+PaymentSubscription=Pago de nueva contribución
+SubscriptionEndDate=Fecha de finalización de la suscripción
+MembersTypeSetup=Configuración del tipo de miembros
+ConfirmDeleteMemberType=¿Está seguro de que desea eliminar este tipo de miembro?
+MemberTypeCanNotBeDeleted=El tipo de miembro no se puede eliminar
+NewSubscription=Suscripción nueva
+NewSubscriptionDesc=Este formulario le permite registrar su suscripción como nuevo miembro de la fundación. Si desea renovar su suscripción (si ya es miembro), comuníquese con la junta de la fundación por correo electrónico %s.
+Subscription=Suscripción
+Subscriptions=Suscripciones
 SubscriptionLate=Retraso
+SubscriptionNotReceived=Suscripción nunca recibida
+ListOfSubscriptions=Lista de suscripciones
+SendCardByMail=Enviar tarjeta por correo electrónico
+NoTypeDefinedGoToSetup=No se han definido tipos de miembros. Ir al menú "Tipos de miembros"
+WelcomeEMail=Correo electrónico de bienvenida
+SubscriptionRequired=Se requiere suscripción
+VoteAllowed=Voto permitido
+ResiliateMember=Terminar un miembro
+ConfirmResiliateMember=¿Está seguro de que desea dar de baja a este miembro?
+ConfirmDeleteMember=¿Está seguro de que desea eliminar este miembro (eliminar un miembro eliminará todas sus suscripciones)?
+DeleteSubscription=Eliminar una suscripción
+ConfirmDeleteSubscription=¿Está seguro de que desea eliminar esta suscripción?
+Filehtpasswd=archivo htpasswd
+ConfirmValidateMember=¿Está seguro de que desea validar este miembro?
+FollowingLinksArePublic=Los siguientes enlaces son páginas abiertas no protegidas por ningún permiso de Dolibarr. No son páginas formateadas, proporcionadas como ejemplo para mostrar cómo enumerar la base de datos de miembros.
+PublicMemberList=Lista pública de miembros
+BlankSubscriptionForm=Formulario público de auto-suscripción
+BlankSubscriptionFormDesc=Dolibarr puede proporcionarle una URL / sitio web público para permitir que los visitantes externos soliciten suscribirse a la fundación. Si se habilita un módulo de pago en línea, también se puede proporcionar un formulario de pago automáticamente.
+EnablePublicSubscriptionForm=Habilite el sitio web público con el formulario de auto-suscripción
+ExportDataset_member_1=Miembros y suscripciones
+LastMembersModified=Últimos miembros modificados %s
+LastSubscriptionsModified=Últimas suscripciones modificadas %s
+Text=Texto
+PublicMemberCard=Tarjeta pública de miembro
+SubscriptionNotRecorded=Suscripción no registrada
+AddSubscription=Crear suscripción
+ShowSubscription=Mostrar suscripción
+SendingAnEMailToMember=Envío de correo electrónico de información al miembro
+SendingEmailOnAutoSubscription=Envío de correo electrónico en el registro automático
+SendingEmailOnMemberValidation=Envío de correo electrónico sobre la validación de nuevos miembros
+SendingEmailOnNewSubscription=Envío de correo electrónico con una nueva suscripción
+SendingReminderForExpiredSubscription=Envío de recordatorio de suscripciones caducadas
+SendingEmailOnCancelation=Envío de correo electrónico sobre cancelación
+YourMembershipRequestWasReceived=Se recibió su membresía.
+YourMembershipWasValidated=Tu membresía fue validada
+YourSubscriptionWasRecorded=Se registró su nueva suscripción
+YourMembershipWasCanceled=Tu membresía fue cancelada
+CardContent=Contenido de su tarjeta de miembro
+ThisIsContentOfYourMembershipRequestWasReceived=Queremos informarle que se recibió su solicitud de membresía. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Queremos informarle que su membresía fue validada con la siguiente información: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Queremos informarle que se registró su nueva suscripción. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=Queremos informarle que su suscripción está a punto de caducar o que ya ha caducado (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Esperamos que lo renueve. <br> <br>
+ThisIsContentOfYourCard=Este es un resumen de la información que tenemos sobre usted. Por favor contáctenos si algo es incorrecto. <br> <br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto del correo electrónico de notificación recibido en caso de autoinscripción de un invitado
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Contenido del correo electrónico de notificación recibido en caso de autoinscripción de un invitado
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Plantilla de correo electrónico que se utilizará para enviar un correo electrónico a un miembro con suscripción automática para miembros
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla de correo electrónico que se utilizará para enviar un correo electrónico a un miembro sobre la validación del miembro
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla de correo electrónico que se utilizará para enviar un correo electrónico a un miembro en la grabación de una nueva suscripción
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla de correo electrónico que se utilizará para enviar un recordatorio por correo electrónico cuando la suscripción esté a punto de vencer
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla de correo electrónico que se utilizará para enviar un correo electrónico a un miembro sobre la cancelación de un miembro
+DescADHERENT_MAIL_FROM=Correo electrónico del remitente para correos electrónicos automáticos
+DescADHERENT_ETIQUETTE_TYPE=Formato de la página de etiquetas
+DescADHERENT_ETIQUETTE_TEXT=Texto impreso en hojas de direcciones de miembros
+DescADHERENT_CARD_TYPE=Formato de la página de tarjetas
+DescADHERENT_CARD_HEADER_TEXT=Texto impreso en la parte superior de las tarjetas de miembro
+DescADHERENT_CARD_TEXT=Texto impreso en tarjetas de miembro (alinear a la izquierda)
+DescADHERENT_CARD_TEXT_RIGHT=Texto impreso en tarjetas de miembro (alinear a la derecha)
+DescADHERENT_CARD_FOOTER_TEXT=Texto impreso en la parte inferior de las tarjetas de miembro
+HTPasswordExport=generación de archivo htpassword
+MembersAndSubscriptions=Miembros y suscripciones
+MoreActions=Acción complementaria a la grabación
+MoreActionsOnSubscription=Acción complementaria, sugerida por defecto al registrar una suscripción
+MoreActionBankDirect=Cree una entrada directa en la cuenta bancaria
+MoreActionBankViaInvoice=Crea una factura y un pago en cuenta bancaria
+MoreActionInvoiceOnly=Crea una factura sin pago
+LinkToGeneratedPages=Generar tarjetas de visita
+LinkToGeneratedPagesDesc=Esta pantalla le permite generar archivos PDF con tarjetas de presentación para todos sus miembros o un miembro en particular.
+DocForAllMembersCards=Genere tarjetas de presentación para todos los miembros
+DocForOneMemberCards=Genere tarjetas de presentación para un miembro en particular
+DocForLabels=Generar hojas de direcciones
+SubscriptionPayment=Pago de suscripción
+LastSubscriptionDate=Fecha del último pago de suscripción
+LastSubscriptionAmount=Cantidad de la última suscripción
+MembersStatisticsByState=Estadísticas de miembros por estado / provincia
+MembersStatisticsByTown=Estadísticas de miembros por ciudad
+NoValidatedMemberYet=No se encontraron miembros validados
+MembersStatisticsDesc=Elija las estadísticas que desea leer ...
+LatestSubscriptionDate=Última fecha de suscripción
+NewMemberbyWeb=Nuevo miembro agregado. Esperando aprobacion
+NewMemberForm=Formulario de nuevo miembro
+NbOfSubscriptions=Numero de suscripciones
+TurnoverOrBudget=Facturación (para una empresa) o Presupuesto (para una fundación)
+DefaultAmount=Cantidad predeterminada de suscripción
+CanEditAmount=El visitante puede elegir / editar el monto de su suscripción
+MEMBER_NEWFORM_PAYONLINE=Ir a la página de pago en línea integrada
+MembersStatisticsByProperties=Estadísticas de miembros por naturaleza
+VATToUseForSubscriptions=Tasa de IVA a utilizar para las suscripciones
+NoVatOnSubscription=Sin IVA para suscripciones
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto utilizado para la línea de suscripción en la factura: %s
+SubscriptionRecorded=Suscripción registrada
+NoEmailSentToMember=No se envió ningún correo electrónico al miembro
+EmailSentToMember=Correo electrónico enviado al miembro %s
+SendReminderForExpiredSubscriptionTitle=Envíe un recordatorio por correo electrónico para la suscripción caducada
+SendReminderForExpiredSubscription=Envíe un recordatorio por correo electrónico a los miembros cuando la suscripción esté a punto de caducar (el parámetro es el número de días antes del final de la suscripción para enviar el recordatorio. Puede ser una lista de días separados por un punto y coma, por ejemplo, '10; 5; 0; -5 ')
+YouMayFindYourInvoiceInThisEmail=Puede encontrar su factura adjunta a este correo electrónico
+XMembersClosed=%s miembro (s) cerrado
diff --git a/htdocs/langs/es_CO/modulebuilder.lang b/htdocs/langs/es_CO/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_CO/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_CO/orders.lang b/htdocs/langs/es_CO/orders.lang
index c1a7be94092..2e3d92a6f6c 100644
--- a/htdocs/langs/es_CO/orders.lang
+++ b/htdocs/langs/es_CO/orders.lang
@@ -1,12 +1,153 @@
 # Dolibarr language file - Source file is en_US - orders
+OrdersArea=Área de pedidos de clientes
+SuppliersOrdersArea=Área de órdenes de compra
+OrderCard=Tarjeta de pedido
+OrderId=Solicitar ID
 Order=Orden
 PdfOrderTitle=Orden
+Orders=Ordenes
+OrderLine=Fila para ordenar
+OrderDateShort=Fecha de orden
+OrderToProcess=Orden para procesar
+NewOrder=Nuevo orden
+NewOrderSupplier=Nueva orden de compra
+ToOrder=Realizar orden
+MakeOrder=Realizar orden
+SupplierOrder=Orden de compra
 SuppliersOrders=Ordenes de compra
+SuppliersOrdersRunning=Órdenes de compra actuales
+CustomerOrder=Órdenes de venta
+CustomersOrders=Órdenes de venta
+CustomersOrdersRunning=Órdenes de venta actuales
+CustomersOrdersAndOrdersLines=Órdenes de venta y detalles de la orden
+OrdersDeliveredToBill=Órdenes de venta entregadas a la factura
+OrdersToBill=Órdenes de venta entregadas
+OrdersInProcess=Órdenes de venta en proceso
+OrdersToProcess=Órdenes de venta a procesar
+SuppliersOrdersToProcess=Órdenes de compra a procesar
+SuppliersOrdersAwaitingReception=Órdenes de compra pendientes de recepción
+AwaitingReception=Esperando recepción
 StatusOrderCanceledShort=Cancelado
+StatusOrderSentShort=En proceso
+StatusOrderSent=Envío en proceso
+StatusOrderOnProcessShort=Ordenado
+StatusOrderProcessedShort=Procesada
+StatusOrderDelivered=Entregado
+StatusOrderDeliveredShort=Entregado
+StatusOrderToBillShort=Entregado
+StatusOrderToProcessShort=Procesar
 StatusOrderCanceled=Cancelado
 StatusOrderDraft=Borrador (necesita ser validado)
+StatusOrderOnProcess=Ordenado - recepción en espera
+StatusOrderOnProcessWithValidation=Ordenado - recepción o validación en espera
+StatusOrderProcessed=Procesada
+StatusOrderToBill=Entregado
+ShippingExist=Existe un envío
+QtyOrdered=Cantidad pedida
+ProductQtyInDraft=Cantidad de producto en Ordenes en borrador
+ProductQtyInDraftOrWaitingApproved=Cantidad de producto en borradores o pedidos aprobados, aún no ordenados
+MenuOrdersToBill=Órdenes entregadas
+MenuOrdersToBill2=Órdenes facturables
+CreateOrder=Crear orden
+RefuseOrder=Rechazar orden
+ApproveOrder=Aprobar orden
+Approve2Order=Aprobar orden (segundo nivel)
+ValidateOrder=Validar orden
+UnvalidateOrder=Orden no validada
+DeleteOrder=Eliminar orden
+CancelOrder=Cancelar orden
+OrderReopened=Orden %s re-abrir
+AddOrder=Crear orden
+AddPurchaseOrder=Crear orden de compra
+AddToDraftOrders=Agregar a la orden en borrador
+ShowOrder=Mostrar orden
+OrdersOpened=Órdenes a procesar
+NoDraftOrders=Sin órdenes en borrador
+NoOrder=Sin orden
+LastOrders=Últimas %s órdenes de venta
+LastCustomerOrders=Últimas %s órdenes de venta
+LastSupplierOrders=Últimas %s órdenes de compra
+LastModifiedOrders=Últimas %s órdenes modificadas
+AllOrders=Todas las órdenes
+NbOfOrders=Numero de órdenes
+OrdersStatistics=Estadísticas de órdenes
+OrdersStatisticsSuppliers=Estadísticas de órdenes de compra
+NumberOfOrdersByMonth=Número de órdenes por mes
+AmountOfOrdersByMonthHT=Cantidad de órdenes por mes (sin impuestos)
+ListOfOrders=Listado de órdenes
+CloseOrder=Cerrar orden
+ConfirmCloseOrder=¿Está seguro de que desea configurar esta orden como entregada? Una vez una orden es entregada, se puede facturar.
+ConfirmDeleteOrder=¿Está seguro de que desea eliminar esta orden?
+ConfirmValidateOrder=¿Está seguro de que desea validar esta orden bajo el nombre <b> %s </b>?
+ConfirmUnvalidateOrder=¿Está seguro de que desea restaurar la orden <b> %s </b> al estado de borrador?
+ConfirmCancelOrder=¿Estás seguro de que deseas cancelar esta orden?
+ConfirmMakeOrder=¿Está seguro de que desea confirmar que hizo esta orden en <b> %s </b>?
+GenerateBill=Generar factura
+ClassifyShipped=Marcar como entregado
+DraftOrders=Órdenes en borrador
+DraftSuppliersOrders=Órdenes de compra en borrador
+OnProcessOrders=Órdenes en proceso
+RefOrder=Ref. de orden
+RefCustomerOrder=Ref. de orden de cliente
+RefOrderSupplier=Ref. de orden de proveedor
+RefOrderSupplierShort=Ref. de orden de proveedor
+SendOrderByMail=Enviar orden por correo
+ActionsOnOrder=Eventos en la orden
+NoArticleOfTypeProduct=Ningún artículo de tipo 'producto', por lo que no hay ningún artículo que se pueda enviar para esta orden
+OrderMode=Método para ordenar
+AuthorRequest=Autor de la solicitud
+UserWithApproveOrderGrant=Usuarios con permiso de "aprobar ordenes".
+PaymentOrderRef=Pago de la orden %s
+ConfirmCloneOrder=¿Está seguro de que desea duplicar esta orden <b> %s </b>?
+DispatchSupplierOrder=Recibiendo orden de compra %s
+FirstApprovalAlreadyDone=Primera aprobación ya hecha
+SecondApprovalAlreadyDone=Segunda aprobación ya hecha
+SupplierOrderReceivedInDolibarr=Orden de compra %s recibida %s
+SupplierOrderSubmitedInDolibarr=Orden de compra %s enviada
+SupplierOrderClassifiedBilled=Orden de compra %s conjunto facturado
+OtherOrders=Otras ordenes
+TypeContact_commande_internal_SALESREPFOLL=Representante en seguimiento de orden de venta
+TypeContact_commande_internal_SHIPPING=Representante en seguimiento de envío
 TypeContact_commande_external_BILLING=Contacto factura cliente
 TypeContact_commande_external_SHIPPING=Contacto de envío del cliente
+TypeContact_commande_external_CUSTOMER=Cliente en seguimiento de orden
+TypeContact_order_supplier_internal_SALESREPFOLL=Representante en seguimiento de Orden de compra
+TypeContact_order_supplier_internal_SHIPPING=Representante en seguimiento de envío
+TypeContact_order_supplier_external_BILLING=Contacto de facturación del proveedor
+TypeContact_order_supplier_external_SHIPPING=Contacto de despachos del proveedor
+TypeContact_order_supplier_external_CUSTOMER=Contacto en seguimiento de orden de proveedor
+Error_OrderNotChecked=No se seleccionaron ordenes para facturar
+PDFEinsteinDescription=Un modelo de orden completo (implementación anterior de la plantilla Eratosthene)
+PDFEratostheneDescription=Un modelo de orden completo
+PDFEdisonDescription=Un modelo de orden simple
+PDFProformaDescription=Una plantilla de factura proforma completa
+CreateInvoiceForThisCustomer=Órdenes de facturación
+CreateInvoiceForThisSupplier=Órdenes de facturación
+NoOrdersToInvoice=No hay órdenes facturables
+CloseProcessedOrdersAutomatically=Marcar como "Procesados" todos los pedidos seleccionados.
+OrderCreation=Creación de órdenes
+Ordered=Ordenado
+OrderCreated=Tus órdenes han sido creadas
+OrderFail=Error durante la creación de sus ordenes
+CreateOrders=Crear órdenes
+ToBillSeveralOrderSelectCustomer=Para crear una factura para varias órdenes, primero haga clic en cliente y luego seleccione "%s".
+OptionToSetOrderBilledNotEnabled=La opción del módulo Workflow, para marcar la orden como 'Facturada' automáticamente cuando se valida la factura, no está habilitada, por lo que tendrá cambiar el estado de las órdenes a 'Facturado' manualmente después de que se haya generado la factura.
+IfValidateInvoiceIsNoOrderStayUnbilled=Si la validación de la factura es 'No', la orden permanecerá en el estado de 'No facturado' hasta que se valide la factura.
+CloseReceivedSupplierOrdersAutomatically=Cierre la orden al estado "%s" automáticamente si se reciben todos los productos.
+SetShippingMode=Establecer modo de envío
+WithReceptionFinished=Con recepción terminada
 StatusSupplierOrderCanceledShort=Cancelado
+StatusSupplierOrderSentShort=En proceso
+StatusSupplierOrderSent=Envío en proceso
+StatusSupplierOrderOnProcessShort=Ordenado
+StatusSupplierOrderProcessedShort=Procesada
+StatusSupplierOrderDelivered=Entregado
+StatusSupplierOrderDeliveredShort=Entregado
+StatusSupplierOrderToBillShort=Entregado
+StatusSupplierOrderToProcessShort=Procesar
 StatusSupplierOrderCanceled=Cancelado
 StatusSupplierOrderDraft=Borrador (necesita ser validado)
+StatusSupplierOrderOnProcess=Pedido: recepción en espera
+StatusSupplierOrderOnProcessWithValidation=Pedido: recepción o validación en espera
+StatusSupplierOrderProcessed=Procesada
+StatusSupplierOrderToBill=Entregado
diff --git a/htdocs/langs/es_CO/other.lang b/htdocs/langs/es_CO/other.lang
index e239e7114b3..2d8c44d561e 100644
--- a/htdocs/langs/es_CO/other.lang
+++ b/htdocs/langs/es_CO/other.lang
@@ -95,7 +95,6 @@ EnableGDLibraryDesc=Instale o habilite la biblioteca GD en su instalación de PH
 ProfIdShortDesc=<b> La identificación del profesor %s </b> es una información que depende del país tercero. <br> Por ejemplo, para el país <b> %s </b>, es el código <b> %s </b>.
 DolibarrDemo=Dolibarr ERP / CRM demo
 StatsByNumberOfUnits=Estadísticas por suma de cantidad de productos / servicios.
-StatsByNumberOfEntities=Estadísticas en número de entidades referentes (n. ° de factura, o pedido ...)
 NumberOfProposals=Numero de propuestas
 NumberOfCustomerInvoices=Número de facturas de clientes
 NumberOfUnitsProposals=Número de unidades sobre propuestas.
diff --git a/htdocs/langs/es_CO/partnership.lang b/htdocs/langs/es_CO/partnership.lang
new file mode 100644
index 00000000000..bcb4f9e1365
--- /dev/null
+++ b/htdocs/langs/es_CO/partnership.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - Source file is en_US - partnership
+ModulePartnershipName =Gestión de alianzas
+PartnershipDescription =Módulo de gestión de asociaciones
+PartnershipDescriptionLong=Módulo de gestión de asociaciones
+NewPartnership =Nueva sociedad
+ListOfPartnerships =Lista de asociación
+PartnershipSetup =Configuración de la asociación
+PartnershipAbout =Acerca de la asociación
+PartnershipAboutPage =Página "acerca de" la asociación
+DatePartnershipEnd=Fecha final
+PartnershipCanceled =Cancelado
+PartnershipManagedFor=Socios son
diff --git a/htdocs/langs/es_CO/paybox.lang b/htdocs/langs/es_CO/paybox.lang
index b5e026cdced..f9460c9eb45 100644
--- a/htdocs/langs/es_CO/paybox.lang
+++ b/htdocs/langs/es_CO/paybox.lang
@@ -1,2 +1,24 @@
 # Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=Configuración del módulo PayBox
+PayBoxDesc=Este módulo ofrece páginas para permitir el pago en <a href="http://www.paybox.com" target="_blank"> Paybox </a> por parte de los clientes. Esto se puede utilizar para un pago gratuito o para un pago en un objeto Dolibarr en particular (factura, pedido, ...)
+FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer una página a un cliente para realizar un pago en objetos Dolibarr
+WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago online
+ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a %s.
+ThisIsInformationOnPayment=Esta es la información sobre el pago a realizar
+ToComplete=Completar
+YourEMail=Correo electrónico para recibir la confirmación del pago
+Creditor=Acreedor
+PayBoxDoPayment=Pagar con Paybox
+YouWillBeRedirectedOnPayBox=Será redirigido a la página segura de Paybox para ingresar la información de su tarjeta de crédito
 Continue=Siguiente
+SetupPayBoxToHavePaymentCreatedAutomatically=Configure su Paybox con la URL <b> %s </b> para que el pago se cree automáticamente cuando lo valide Paybox.
+YourPaymentHasBeenRecorded=Esta página confirma que su pago ha sido registrado. Gracias.
+YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
+AccountParameter=Parámetros de cuenta
+InformationToFindParameters=Ayuda para encontrar la información de su cuenta %s
+PAYBOX_CGI_URL_V2=Url del módulo CGI de Paybox para pago
+CSSUrlForPaymentForm=URL de la hoja de estilo CSS para el formulario de pago
+NewPayboxPaymentReceived=Nuevo pago recibido de Paybox
+NewPayboxPaymentFailed=Nuevo pago de Paybox intentado pero fallido
+PAYBOX_PAYONLINE_SENDEMAIL=Notificación por correo electrónico después del intento de pago (éxito o fracaso)
+PAYBOX_PBX_RANG=Valor para PBX Rang
diff --git a/htdocs/langs/es_CO/productbatch.lang b/htdocs/langs/es_CO/productbatch.lang
index c1aaffb3380..6099d17f0a1 100644
--- a/htdocs/langs/es_CO/productbatch.lang
+++ b/htdocs/langs/es_CO/productbatch.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - productbatch
 ManageLotSerial=Use número de lote/serie
+ProductStatusOnBatch=Si (se requiere lote)
+ProductStatusOnSerial=Sí (número de serie único requerido)
 ProductStatusNotOnBatch=No (lote/serie no usado)
 atleast1batchfield=Fecha de consumo o fecha de venta o número de lote/serie
 batch_number=Número de lote/serie
@@ -17,3 +19,6 @@ ProductLotSetup=Configuración de modulo lote/serie
 ShowCurrentStockOfLot=Mostrar valores actuales por pareja producto/lote
 ShowLogOfMovementIfLot=Mostrar registro de movimientos por pareja producto/lote
 StockDetailPerBatch=Valores detallados por lote
+SerialNumberAlreadyInUse=El número de serie %s ya se usa para el producto %s
+BatchLotNumberingModules=Opciones para generación automática en masa de productos gestionados por lotes
+BatchSerialNumberingModules=Opciones para generación automática en masa de productos gestionados por números de serie
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
index fa44c381e34..da4a5bc3613 100644
--- a/htdocs/langs/es_CO/products.lang
+++ b/htdocs/langs/es_CO/products.lang
@@ -79,9 +79,7 @@ ListProductServiceByPopularity=Lista de productos / servicios por popularidad
 ListProductByPopularity=Listado de productos por popularidad.
 ListServiceByPopularity=Listado de servicios por popularidad.
 ConfirmCloneProduct=¿Está seguro de que desea clonar el producto o servicio <b> %s </b>?
-CloneContentProduct=Clona toda la información principal del producto / servicio.
 ClonePricesProduct=Precios de clon
-CloneCombinationsProduct=Variantes de productos clonados.
 ProductIsUsed=Este producto es usado
 NewRefForClone=Árbitro. de nuevo producto / servicio
 CustomerPrices=Precios al cliente
diff --git a/htdocs/langs/es_CO/projects.lang b/htdocs/langs/es_CO/projects.lang
index 9fff1ff1340..ffc9126eff3 100644
--- a/htdocs/langs/es_CO/projects.lang
+++ b/htdocs/langs/es_CO/projects.lang
@@ -7,18 +7,15 @@ ProjectsArea=Area de proyectos
 SharedProject=Todos
 PrivateProject=Contactos del proyecto
 AllAllowedProjects=Todo el proyecto que puedo leer (mío + público)
-MyProjectsDesc=Esta vista se limita a los proyectos para los que es un contacto.
 ProjectsPublicDesc=Esta vista presenta todos los proyectos que se le permite leer.
 TasksOnProjectsPublicDesc=Esta vista presenta todas las tareas en los proyectos que se le permite leer.
 ProjectsPublicTaskDesc=Esta vista presenta todos los proyectos y tareas que puede leer.
 ProjectsDesc=Esta vista presenta todos los proyectos (sus permisos de usuario le otorgan permiso para ver todo).
 TasksOnProjectsDesc=Esta vista presenta todas las tareas en todos los proyectos (sus permisos de usuario le otorgan permiso para ver todo).
-MyTasksDesc=Esta vista se limita a proyectos o tareas para las que es un contacto.
 OnlyOpenedProject=Solo los proyectos abiertos son visibles (los proyectos en estado borrador o cerrado no son visibles).
 TasksPublicDesc=Esta vista presenta todos los proyectos y tareas que puede leer.
 TasksDesc=Esta vista presenta todos los proyectos y tareas (sus permisos de usuario le otorgan permiso para ver todo).
 AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas para proyectos calificados son visibles, pero puede ingresar el tiempo solo para la tarea asignada al usuario seleccionado. Asigne tarea si necesita ingresar tiempo en ella.
-OnlyYourTaskAreVisible=Sólo las tareas asignadas a usted son visibles. Asigne una tarea a usted mismo si no está visible y necesita ingresar tiempo en ella.
 ProjectCategories=Etiquetas / categorías del proyecto
 DeleteAProject=Borrar un proyecto
 ConfirmDeleteAProject=¿Estás seguro de que quieres eliminar este proyecto?
@@ -131,7 +128,6 @@ ResourceNotAssignedToProject=No asignado al proyecto.
 ResourceNotAssignedToTheTask=No asignado a la tarea.
 NoUserAssignedToTheProject=No hay usuarios asignados a este proyecto.
 TimeSpentBy=Tiempo pasado por
-AssignTaskToMe=Asigname tarea
 AssignTaskToUser=Asignar tarea a %s
 SelectTaskToAssign=Seleccionar tarea para asignar ...
 ProjectOverview=Visión general
diff --git a/htdocs/langs/es_CO/resource.lang b/htdocs/langs/es_CO/resource.lang
new file mode 100644
index 00000000000..5c415f2894f
--- /dev/null
+++ b/htdocs/langs/es_CO/resource.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - Source file is en_US - resource
+ConfirmDeleteResourceElement=Confirma la eliminación del recurso para este elemento.
+NoResourceInDatabase=Ningún recurso en la base de datos.
+NoResourceLinked=Ningún recurso vinculado
+ResourcePageIndex=Lista de recursos
+ResourceCard=Tarjeta de recursos
+AddResource=Crea un recurso
+ResourceFormLabel_ref=Nombre del recurso
+ResourceFormLabel_description=Descripción de recurso
+ResourcesLinkedToElement=Recursos vinculados al elemento
+ShowResource=Mostrar recurso
+ResourceElementPage=Recursos de elementos
+ResourceCreatedWithSuccess=Recurso creado con éxito
+RessourceLineSuccessfullyDeleted=Línea de recursos eliminada correctamente
+RessourceLineSuccessfullyUpdated=Línea de recursos actualizada correctamente
+ResourceLinkedWithSuccess=Recurso vinculado con éxito
+ConfirmDeleteResource=Confirmar para eliminar este recurso
+IdResource=Identificación del recurso
+ResourceTypeCode=Código del tipo de recurso
diff --git a/htdocs/langs/es_CO/salaries.lang b/htdocs/langs/es_CO/salaries.lang
index a4085292909..32462fd0221 100644
--- a/htdocs/langs/es_CO/salaries.lang
+++ b/htdocs/langs/es_CO/salaries.lang
@@ -1,3 +1,11 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cuenta contable utilizada para usuarios de terceros
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de usuario se usará solo para la contabilidad del libro auxiliar. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del libro auxiliar si la cuenta de contabilidad del usuario dedicada no está definida.
+NewSalaryPayment=Nueva tarjeta de salario
+AddSalaryPayment=Agregar pago de salario
+THM=Tarifa por hora promedio
+TJM=Tarifa diaria promedio
+THMDescription=Este valor puede usarse para calcular el costo de tiempo consumido en un proyecto ingresado por los usuarios si se usa el módulo proyecto
+TJMDescription=Este valor es actualmente solo para información y no se usa para ningún cálculo.
+LastSalaries=Últimos pagos de salario %s
+AllSalaries=Todos los pagos de salario
diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang
index 28b80e7fa90..e6aa9ec27df 100644
--- a/htdocs/langs/es_CO/stocks.lang
+++ b/htdocs/langs/es_CO/stocks.lang
@@ -1,7 +1,171 @@
 # Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Tarjeta de almacén
+Warehouse=Depósito
+ParentWarehouse=Almacén principal
+NewWarehouse=Nuevo almacén / ubicación de stock
+WarehouseEdit=Modificar almacén
+MenuNewWarehouse=Almacén nuevo
+WarehouseSource=Almacén de origen
+WarehouseSourceNotDefined=Sin almacén definido
+AddOne=Agrega uno
+DefaultWarehouse=Almacén predeterminado
+WarehouseTarget=Almacén de destino
+ValidateSending=Eliminar envío
+CancelSending=Cancelar el envío
+MissingStocks=Existencias faltantes
+StockAtDate=Existencias a la fecha
+StocksByLotSerial=Existencias por lote / serie
+LotSerial=Lotes / Series
+LotSerialList=Lista de lotes / series
+ErrorWarehouseRefRequired=Se requiere el nombre de referencia del almacén
+ListOfWarehouses=Lista de almacenes
+ListOfInventories=Lista de inventarios
+MovementId=ID de movimiento
+StockMovementForId=ID de movimiento %d
+ListMouvementStockProject=Lista de movimientos de stock asociados al proyecto
+StocksArea=Zona de almacenes
+IncludeEmptyDesiredStock=Incluya también stock negativo con stock deseado indefinido
+IncludeAlsoDraftOrders=Incluir también borradores de pedidos
+Location=Localización
+NumberOfProducts=Número total de productos
+StockCorrection=Corrección de stock
+CorrectStock=Stock correcto
+StockTransfer=Transferencia de acciones
+MassStockTransferShort=Transferencia masiva de existencias
+StockMovement=Movimiento de valores
+NumberOfUnit=Número de unidades
 UnitPurchaseValue=Precio unitario de compra
+StockTooLow=Stock demasiado bajo
+StockLowerThanLimit=Stock por debajo del límite de alerta (%s)
 PMPValue=Precio promedio ponderado
+EnhancedValueOfWarehouses=Valor de los almacenes
+UserWarehouseAutoCreate=Cree un almacén de usuarios automáticamente al crear un usuario
+AllowAddLimitStockByWarehouse=Gestionar también el valor del stock mínimo y deseado por emparejamiento (producto-almacén) además del valor del stock mínimo y deseado por producto
+WarehouseAskWarehouseDuringPropal=Establecer un almacén en propuestas comerciales
+WarehouseAskWarehouseDuringOrder=Establecer un almacén en pedidos de venta
+UserDefaultWarehouse=Establecer un almacén en los usuarios
+MainDefaultWarehouse=Almacén predeterminado
+MainDefaultWarehouseUser=Utilice un almacén predeterminado para cada usuario
+MainDefaultWarehouseUserDesc=Al activar esta opción, durante la creación de un producto se definirá en éste el almacén asignado al producto. Si no se define ningún almacén en el usuario, se define el almacén predeterminado.
+IndependantSubProductStock=El stock de productos y el stock de subproductos son independientes
+QtyDispatched=Cantidad enviada
+QtyDispatchedShort=Cantidad enviada
+QtyToDispatchShort=Cantidad a enviar
+OrderDispatch=Recibos de artículos
+RuleForStockManagementDecrease=Elija Regla para la disminución automática de existencias (la disminución manual siempre es posible, incluso si está activada una regla de disminución automática)
+RuleForStockManagementIncrease=Elija Regla para aumento automático de stock (el aumento manual siempre es posible, incluso si está activada una regla de aumento automático)
+DeStockOnBill=Disminuir las existencias reales en la validación de la factura / nota de crédito del cliente
+DeStockOnValidateOrder=Disminuir las existencias reales en la validación de la orden de venta.
+DeStockOnShipment=Disminuir las existencias reales en la validación del envío
+DeStockOnShipmentOnClosing=Disminuir las existencias reales cuando el envío está configurado como cerrado
+ReStockOnBill=Aumente las existencias reales en la validación de la factura / nota de crédito del proveedor
+ReStockOnValidateOrder=Aumentar las existencias reales tras la aprobación de la orden de compra
+ReStockOnDispatchOrder=Aumente las existencias reales en el envío manual al almacén, después de la recepción de la orden de compra de las mercancías
+StockOnReception=Incrementar las existencias reales tras la validación de la recepción.
+StockOnReceptionOnClosing=Aumente las existencias reales cuando la recepción esté configurada como cerrada
+OrderStatusNotReadyToDispatch=El pedido aún no tiene o no tiene un estado que permita el envío de productos en los almacenes de stock.
+StockDiffPhysicTeoric=Explicación de la diferencia entre stock físico y virtual
+NoPredefinedProductToDispatch=No hay productos predefinidos para este objeto. Por lo que no se requiere envío en stock.
+DispatchVerb=Envío
+StockLimitShort=Límite de alerta
+StockLimit=Límite de stock para alerta
+PhysicalStock=Inventario FISICO
+RealStockDesc=El stock físico / real es el stock que se encuentra actualmente en los almacenes.
+RealStockWillAutomaticallyWhen=El stock real se modificará de acuerdo con esta regla (según se define en el módulo Stock):
+VirtualStockAtDate=Stock virtual a la fecha
+VirtualStockDesc=El stock virtual es el stock calculado disponible una vez que se cierran todas las acciones abiertas / pendientes (que afectan a las existencias) (órdenes de compra recibidas, órdenes de venta enviadas, órdenes de fabricación producidas, etc.)
+IdWarehouse=ID de almacén
+LieuWareHouse=Almacén de localización
+WarehousesAndProductsBatchDetail=Almacenes y productos (con detalle por lote / serie)
 AverageUnitPricePMPShort=Precio promedio ponderado
+SellPriceMin=Precio unitario de venta
+EstimatedStockValueShort=Valor de stock de entrada
+EstimatedStockValue=Valor de stock de entrada
+ConfirmDeleteWarehouse=¿Está seguro de que desea eliminar el almacén <b> %s </b>?
+PersonalStock=Acciones personales %s
+SelectWarehouseForStockDecrease=Elija el almacén a utilizar para la disminución de existencias
+SelectWarehouseForStockIncrease=Elija el almacén que desee utilizar para aumentar las existencias
+NoStockAction=Sin acción de stock
+DesiredStockDesc=Esta cantidad de stock será el valor utilizado para llenar el stock mediante la función de reabastecimiento.
+StockToBuy=Ordenar
+Replenishment=Reposición
+ReplenishmentOrders=Órdenes de reabastecimiento
+VirtualDiffersFromPhysical=Según el aumento / disminución de las opciones sobre acciones, el stock físico y el stock virtual (stock físico + órdenes abiertas) pueden diferir
+UseRealStockByDefault=Utilice stock real, en lugar de stock virtual, para la función de reabastecimiento
+UseVirtualStock=Utilizar stock virtual
+UsePhysicalStock=Utilizar stock físico
+CurentlyUsingPhysicalStock=Inventario FISICO
+RuleForStockReplenishment=Regla para la reposición de existencias
+SelectProductWithNotNullQty=Seleccione al menos un producto con una cantidad no nula y un proveedor
+AlertOnly=Solo alertas
+WarehouseForStockDecrease=El almacén <b> %s </b> se utilizará para la disminución de existencias
+WarehouseForStockIncrease=El almacén <b> %s </b> se utilizará para aumentar las existencias
+ReplenishmentStatusDesc=Esta es una lista de todos los productos con un stock inferior al stock deseado (o inferior al valor de alerta si la casilla de verificación "solo alerta" está marcada). Usando la casilla de verificación, puede crear órdenes de compra para cubrir la diferencia.
+ReplenishmentOrdersDesc=Esta es una lista de todas las órdenes de compra abiertas, incluidos los productos predefinidos. Solo pedidos abiertos con productos predefinidos, por lo que los pedidos que pueden afectar a las existencias son visibles aquí.
+Replenishments=Reabastecimientos
+NbOfProductBeforePeriod=Cantidad de producto %s en stock antes del período seleccionado (<%s)
+NbOfProductAfterPeriod=Cantidad de producto %s en stock después del período seleccionado (> %s)
+MassMovement=Movimiento masivo
+RecordMovement=Transferencia de registros
+ReceivingForSameOrder=Recibos de este pedido
+StockMovementRecorded=Movimientos de stock registrados
+RuleForStockAvailability=Normas sobre requisitos de stock
+StockMustBeEnoughForInvoice=El nivel de stock debe ser suficiente para agregar el producto / servicio a la factura (la verificación se realiza en el stock real actual al agregar una línea a la factura, cualquiera que sea la regla para el cambio automático de stock)
+StockMustBeEnoughForOrder=El nivel de stock debe ser suficiente para agregar un producto / servicio al pedido (la verificación se realiza en el stock real actual al agregar una línea al pedido, cualquiera que sea la regla para el cambio automático de stock)
+StockMustBeEnoughForShipment=El nivel de stock debe ser suficiente para agregar producto / servicio al envío (la verificación se realiza en el stock real actual cuando se agrega una línea al envío cualquiera que sea la regla para el cambio automático de stock)
+MovementLabel=Etiqueta de movimiento
+InventoryCode=Código de movimiento o inventario
+IsInPackage=Contenido en paquete
+WarehouseAllowNegativeTransfer=El stock puede ser negativo
+qtyToTranferIsNotEnough=No tiene suficientes existencias de su almacén de origen y su configuración no permite existencias negativas.
+qtyToTranferLotIsNotEnough=No tiene suficientes existencias, para este número de lote, de su almacén de origen y su configuración no permite existencias negativas (Cantidad para el producto '%s' con el lote '%s' es %s en el almacén '%s').
+MovementCorrectStock=Corrección de stock para el producto %s
+MovementTransferStock=Traslado de stock del producto %s a otro almacén
+InventoryCodeShort=Inv./Mov. código
+NoPendingReceptionOnSupplierOrder=No hay recepción pendiente debido a una orden de compra abierta
+OpenAll=Abierto a todas las acciones
+OpenInternal=Abierto solo para acciones internas
+UseDispatchStatus=Utilice un estado de envío (aprobar / rechazar) para las líneas de productos en la recepción de la orden de compra
+OptionMULTIPRICESIsOn=La opción "varios precios por segmento" está activada. Significa que un producto tiene varios precios de venta, por lo que el valor de venta no se puede calcular.
+ProductStockWarehouseCreated=Límite de stock para alerta y stock óptimo deseado creado correctamente
+ProductStockWarehouseUpdated=Límite de stock para alerta y stock óptimo deseado actualizado correctamente
+ProductStockWarehouseDeleted=Límite de stock para alerta y stock óptimo deseado eliminado correctamente
+AddNewProductStockWarehouse=Establecer un nuevo límite de alerta y stock óptimo deseado
+AddStockLocationLine=Disminuya la cantidad y luego haga clic para agregar otro almacén para este producto
+InventoryDate=Fecha de inventario
+inventorySetup =Configuración de inventario
+inventoryListEmpty=No hay inventario en progreso
+inventoryCreateDelete=Crear / eliminar inventario
 inventoryEdit=Editar
+inventoryDraft=Corriendo
+inventorySelectWarehouse=Elección de almacén
+inventoryOfWarehouse=Inventario para almacén: %s
+inventoryErrorQtyAdd=Error: una cantidad es menor que cero
+inventoryWarningProductAlreadyExists=Este producto ya está en la lista
 SelectCategory=Filtro de categoria
+SelectFournisseur=Filtro de proveedor
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Los movimientos de stock tendrán la fecha del inventario (en lugar de la fecha de validación del inventario)
+inventoryChangePMPPermission=Permitir cambiar el valor de PMP de un producto
+ColumnNewPMP=Unidad nueva PMP
+OnlyProdsInStock=No agregue producto sin stock
+TheoricalQty=Cantidad teórica
+TheoricalValue=Cantidad teórica
+RealQty=Cantidad real
+RealValue=Valor real
+RegulatedQty=Cantidad regulada
+AddInventoryProduct=Agregar producto al inventario
+FlushInventory=Limpiar el inventario
+ConfirmFlushInventory=¿Confirmas esta acción?
+InventoryFlushed=Inventario descargado
+ExitEditMode=Edición de salida
 inventoryDeleteLine=Eliminar linea
+RegulateStock=Regular Stock
+StockSupportServices=Servicios de soporte de gestión de stock
+StockSupportServicesDesc=De forma predeterminada, solo puede almacenar productos del tipo "producto". También puede almacenar un producto de tipo "servicio" si tanto el módulo Servicios como esta opción están habilitados.
+StockIncreaseAfterCorrectTransfer=Incrementar por corrección / transferencia
+StockDecreaseAfterCorrectTransfer=Disminuir por corrección / transferencia
+StockIncrease=Aumento de stock
+StockDecrease=Disminución de stock
+AlwaysShowFullArbo=Mostrar el árbol completo del almacén en la ventana emergente de los enlaces del almacén (Advertencia: esto puede disminuir drásticamente el rendimiento)
+ImportFromCSV=Importar lista CSV de movimiento
+InfoTemplateImport=El archivo cargado debe tener este formato (* son campos obligatorios): <br> Source Warehouse * | Almacén de destino * | Producto * | Cantidad * | Lote / número de serie <br> El separador de caracteres CSV debe ser "<b> %s </b>"
diff --git a/htdocs/langs/es_CO/suppliers.lang b/htdocs/langs/es_CO/suppliers.lang
index 004a8c759de..57b85a3e1eb 100644
--- a/htdocs/langs/es_CO/suppliers.lang
+++ b/htdocs/langs/es_CO/suppliers.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - suppliers
 SupplierInvoices=Facturas de proveedores
 NewSupplier=Nuevo vendedor
+SupplierPayment=Pago de proveedor
 RefSupplierShort=Árbitro. vendedor
diff --git a/htdocs/langs/es_CO/ticket.lang b/htdocs/langs/es_CO/ticket.lang
index e0099d503d0..8d0457e7d49 100644
--- a/htdocs/langs/es_CO/ticket.lang
+++ b/htdocs/langs/es_CO/ticket.lang
@@ -1,4 +1,155 @@
 # Dolibarr language file - Source file is en_US - ticket
+Module56000Desc=Sistema de tickets para la gestión de solicitudes o problemas
+Permission56001=Ver entradas
+Permission56004=Gestionar tickets
+Permission56005=Ver tickets de todos los terceros (no efectivo para usuarios externos, siempre se limitará al tercero del que dependen)
+TicketDictType=Ticket - Tipos
+TicketDictCategory=Entrada - Groupes
+TicketDictSeverity=Ticket - Severidades
+TicketTypeShortISSUE=Problema, error o problema
+MenuTicketMyAssign=Mis entradas
+MenuTicketMyAssignNonClosed=Mis entradas abiertas
+MenuListNonClosed=Entradas abiertas
 TypeContact_ticket_internal_CONTRIBUTOR=Contribuyente
+TypeContact_ticket_external_SUPPORTCLI=Contacto con el cliente / seguimiento de incidentes
+TypeContact_ticket_external_CONTRIBUTOR=Colaborador externo
+OriginEmail=Fuente de correo electrónico
+Notify_TICKET_SENTBYMAIL=Enviar mensaje de ticket por correo electrónico
+Read=Leer
+NeedMoreInformation=Esperando información
+Waiting=Esperando
 Type=Tipo
+MailToSendTicketMessage=Para enviar correo electrónico desde el mensaje del ticket
+TicketSetup=Configuración del módulo de tickets
+TicketSettings=Ajustes
+TicketPublicAccess=Una interfaz pública que no requiere identificación está disponible en la siguiente URL
+TicketSetupDictionaries=El tipo de ticket, severidad y códigos analíticos son configurables desde diccionarios
+TicketParamModule=Configuración de variables de módulo
+TicketParamMail=Configuración de correo electrónico
+TicketEmailNotificationFrom=Correo electrónico de notificación de
+TicketEmailNotificationFromHelp=Utilizado en la respuesta del mensaje de ticket por ejemplo
+TicketEmailNotificationTo=Notificaciones por correo electrónico a
+TicketEmailNotificationToHelp=Envíe notificaciones por correo electrónico a esta dirección.
+TicketNewEmailBodyHelp=El texto especificado aquí se insertará en el correo electrónico confirmando la creación de un nuevo ticket desde la interfaz pública. La información sobre la consulta del ticket se agrega automáticamente.
+TicketParamPublicInterface=Configuración de la interfaz pública
+TicketsEmailMustExist=Requerir una dirección de correo electrónico existente para crear un ticket
+TicketsEmailMustExistHelp=En la interfaz pública, la dirección de correo electrónico ya debería estar completa en la base de datos para crear un nuevo ticket.
+PublicInterface=Interfaz pública
+TicketUrlPublicInterfaceLabelAdmin=URL alternativa para la interfaz pública
+TicketUrlPublicInterfaceHelpAdmin=Es posible definir un alias para el servidor web y así poner a disposición la interfaz pública con otra URL (el servidor debe actuar como proxy en esta nueva URL)
+TicketPublicInterfaceTextHome=Puede crear un ticket de soporte o ver el existente desde su ticket de seguimiento de identificador.
+TicketPublicInterfaceTopicLabelAdmin=Título de la interfaz
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Texto de ayuda para la entrada del mensaje
+ExtraFieldsTicket=Atributos extra
+TicketCkEditorEmailNotActivated=El editor HTML no está activado. Coloque el contenido de FCKEDITOR_ENABLE_MAIL en 1 para obtenerlo.
+TicketsDisableEmail=No envíe correos electrónicos para la creación de tickets o la grabación de mensajes
+TicketsDisableEmailHelp=De forma predeterminada, los correos electrónicos se envían cuando se crean nuevos tickets o mensajes. Habilite esta opción para deshabilitar * todas * las notificaciones por correo electrónico
+TicketsLogEnableEmail=Habilitar registro por correo electrónico
+TicketsLogEnableEmailHelp=Con cada cambio, se enviará un correo electrónico ** a cada contacto ** asociado con el ticket.
+TicketsShowModuleLogo=Mostrar el logotipo del módulo en la interfaz pública.
+TicketsShowModuleLogoHelp=Habilite esta opción para ocultar el módulo de logotipo en las páginas de la interfaz pública
+TicketsShowCompanyLogo=Mostrar el logotipo de la empresa en la interfaz pública.
+TicketsShowCompanyLogoHelp=Habilite esta opción para ocultar el logo de la empresa principal en las páginas de la interfaz pública
+TicketsLimitViewAssignedOnly=Restringir la visualización a los tickets asignados al usuario actual (no es efectivo para usuarios externos, siempre se limitará al tercero del que dependen)
+TicketsLimitViewAssignedOnlyHelp=Solo serán visibles los tickets asignados al usuario actual. No se aplica a un usuario con derechos de gestión de tickets.
+TicketsActivatePublicInterface=Activar interfaz pública
+TicketsActivatePublicInterfaceHelp=La interfaz pública permite que cualquier visitante cree entradas.
+TicketsAutoAssignTicket=Asignar automáticamente el usuario que creó el ticket
+TicketsAutoAssignTicketHelp=Al crear un ticket, el usuario puede ser asignado automáticamente al ticket.
+TicketNotifyTiersAtCreation=Notificar a terceros en la creación
+TicketsDisableCustomerEmail=Desactive siempre los correos electrónicos cuando se crea un ticket desde la interfaz pública
+TicketsPublicNotificationNewMessageHelp=Enviar correo electrónico (s) cuando se agrega un nuevo mensaje desde la interfaz pública (al usuario asignado o el correo electrónico de notificaciones a (actualización) y / o el correo electrónico de notificaciones a)
+TicketPublicNotificationNewMessageDefaultEmail=Notificaciones por correo electrónico a (actualización)
+TicketsIndex=Zona de entradas
+TicketList=Lista de tickets
+TicketAssignedToMeInfos=Esta página muestra la lista de tickets creada por o asignada al usuario actual
+NoTicketsFound=No se encontró ningún boleto
+NoUnreadTicketsFound=No se encontró ningún ticket no leído
+TicketViewAllTickets=Ver todas las entradas
+TicketStatByStatus=Entradas por estado
+ShowAsConversation=Mostrar como lista de conversaciones
+MessageListViewType=Mostrar como lista de tablas
+TicketCard=Tarjeta de entrada
+CreateTicket=Crear Ticket
+TicketsManagement=Gestión de entradas
+NewTicket=Ticket nuevo
+SubjectAnswerToTicket=Respuesta al ticket
+SeeTicket=Ver boleto
+TicketReadOn=Sigue leyendo
+TicketHistory=Historial de entradas
+TicketAssigned=El ticket ahora está asignado
+TicketChangeType=Tipo de cambio
+TicketChangeCategory=Cambiar el código analítico
+TicketChangeSeverity=Cambiar la gravedad
+TicketAddMessage=Añade un mensaje
+AddMessage=Añade un mensaje
+MessageSuccessfullyAdded=Ticket agregado
+TicketMessageSuccessfullyAdded=Mensaje agregado exitosamente
+TicketMessagesList=Lista de mensajes
+NoMsgForThisTicket=No hay mensaje para este ticket
+LatestNewTickets=Latest %s entradas más nuevas (no leídas)
+ShowTicket=Ver boleto
+RelatedTickets=Entradas relacionadas
+ConfirmDeleteTicket=Confirma la eliminación del ticket
+SendMessageByEmail=Enviar mensaje por correo electrónico
+ErrorMailRecipientIsEmptyForSendTicketMessage=El destinatario está vacío. No enviar correo electrónico
+TicketGoIntoContactTab=Vaya a la pestaña "Contactos" para seleccionarlos.
+TicketMessageMailIntroHelp=Este texto se agrega solo al comienzo del correo electrónico y no se guardará.
+TicketMessageMailIntroLabelAdmin=Introducción al mensaje al enviar correo electrónico
+TicketMessageMailIntroText=Hola, <br> Se envió una nueva respuesta en un ticket con el que contactas. Aquí está el mensaje: <br>
+TicketMessageMailSignatureHelp=Este texto se agrega solo al final del correo electrónico y no se guardará.
+TicketMessageMailSignatureText=<p> Atentamente, </p> <p> - </p>
+TicketMessageMailSignatureLabelAdmin=Firma del correo electrónico de respuesta
+TicketMessageHelp=Solo este texto se guardará en la lista de mensajes de la tarjeta del ticket.
+TicketTimeToRead=Tiempo transcurrido antes de leer
+TicketContacts=Ticket de contactos
+TicketDocumentsLinked=Documentos vinculados al ticket
+ConfirmReOpenTicket=¿Confirmar reabrir este boleto?
+TicketAssignedEmailBody=Se le ha asignado el ticket # %s por %s
+TicketMessagePrivateHelp=Este mensaje no se mostrará a los usuarios externos.
+TicketEmailOriginIssuer=Emisor en origen de los billetes
+LinkToAContract=Enlace a un contrato
+UnableToCreateInterIfNoSocid=No se puede crear una intervención cuando no se define ningún tercero
+TicketMailExchanges=Intercambios de correo
+TicketChangeStatus=Cambiar Estado
+TicketConfirmChangeStatus=Confirme el cambio de estado: %s?
+TicketNotNotifyTiersAtCreate=No notificar a la empresa al crear
+ErrorTicketRefRequired=Se requiere el nombre de referencia del ticket
+TicketLogPropertyChanged=Ticket %s modificado: clasificación de %s a %s
+TicketLogReopen=Ticket %s reabrir
+ShowListTicketWithTrackId=Mostrar la lista de tickets desde el ID de la pista
+ShowTicketWithTrackId=Mostrar ticket de ID de pista
+TicketPublicDesc=Puede crear un ticket de soporte o verificar a partir de una identificación existente.
+YourTicketSuccessfullySaved=¡El ticket se ha guardado correctamente!
+PleaseRememberThisId=Conserve el número de seguimiento que podríamos pedirle más tarde.
+TicketNewEmailSubject=Confirmación de creación de ticket - Ref %s (ID de ticket público %s)
+TicketNewEmailBody=Este es un correo electrónico automático para confirmar que ha registrado un nuevo ticket.
+TicketNewEmailBodyCustomer=Este es un correo electrónico automático para confirmar que se acaba de crear un nuevo ticket en su cuenta.
+TicketNewEmailBodyInfosTicket=Información para el seguimiento del ticket
+TicketNewEmailBodyInfosTrackUrl=Puede ver el progreso del ticket haciendo clic en el enlace de arriba.
+TicketEmailPleaseDoNotReplyToThisEmail=¡Por favor no responda directamente a este correo! Utilice el enlace para responder a la interfaz.
+TicketPublicInfoCreateTicket=Este formulario le permite registrar un ticket de soporte en nuestro sistema de gestión.
+TicketPublicPleaseBeAccuratelyDescribe=Describe el problema con precisión. Proporcione la mayor cantidad de información posible que nos permita identificar correctamente su solicitud.
+TicketPublicMsgViewLogIn=Ingrese el ID de seguimiento del boleto
+TicketTrackId=ID de seguimiento público
+OneOfTicketTrackId=Uno de sus ID de seguimiento
+ErrorTicketNotFound=¡Ticket con ID de seguimiento %s no encontrado!
 Subject=Tema
+ViewMyTicketList=Ver mi lista de boletos
+ErrorEmailMustExistToCreateTicket=Error: dirección de correo electrónico no encontrada en nuestra base de datos
+TicketNewEmailSubjectAdmin=Nuevo ticket creado - Ref %s (ID de ticket público %s)
+TicketNewEmailBodyAdmin=<p> El ticket se acaba de crear con ID # %s, ver información: </p>
+SeeThisTicketIntomanagementInterface=Ver ticket en la interfaz de gestión
+ErrorEmailOrTrackingInvalid=Valor incorrecto para el ID de seguimiento o el correo electrónico
+NewUser=Nuevo Usuario
+NbOfTickets=Numero de tickets
+TicketNotificationRecipient=Destinatario de la notificación
+TicketNotificationEmailBodyInfosTrackUrlinternal=Ver el ticket en la interfaz
+TicketNotificationNumberEmailSent=Correo electrónico de notificación enviado: %s
+ActionsOnTicket=Eventos en el boleto
+BoxLastTicket=Entradas más recientes creadas
+BoxLastTicketDescription=Últimas entradas creadas %s
+BoxLastTicketNoRecordedTickets=No hay tickets recientes no leídos
+BoxLastModifiedTicketDescription=Últimos tickets modificados %s
+BoxNoTicketSeverity=No se abrieron boletos
+TicketClosedToday=Boleto cerrado hoy
diff --git a/htdocs/langs/es_CO/website.lang b/htdocs/langs/es_CO/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/es_CO/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
index 33ea339dcd8..c1004f1fd1a 100644
--- a/htdocs/langs/es_CO/withdrawals.lang
+++ b/htdocs/langs/es_CO/withdrawals.lang
@@ -1,6 +1,122 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-StandingOrderPayment=Orden de pago de domiciliación bancaria
-WithdrawalsReceipts=Órdenes de débito directo
-WithdrawalReceipt=Orden de domiciliación bancaria
+CustomersStandingOrdersArea=Pagos mediante débito automático
+StandingOrdersPayment=Órdenes de pago por débito automático
+StandingOrderPayment=Orden de pago por débito automático
+NewStandingOrder=Nueva orden de débito automático
+NewPaymentByBankTransfer=Nuevo pago mediante transferencia bancaria
+WithdrawalsReceipts=Órdenes de débito automático
+WithdrawalReceipt=Orden de débito automático
+LatestBankTransferReceipts=Últimas órdenes de transferencia bancaria %s
+LastWithdrawalReceipts=Archivos de débito automático %s más recientes
+WithdrawalsLine=Línea de orden de débito automático
+WithdrawalsLines=Líneas de orden de débito automático
+RequestStandingOrderToTreat=Solicitudes para procesar una orden de pago mediante débito automático
+RequestStandingOrderTreated=Solicitudes de orden de pago mediante débito automático procesadas
+RequestPaymentsByBankTransferToTreat=Solicitudes de transferencia bancaria para procesar
+RequestPaymentsByBankTransferTreated=Solicitudes de transferencia bancaria procesadas
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Aún no es posible. El estado de retiro debe establecerse en 'acreditado' antes de declarar rechazo en líneas específicas.
+NbOfInvoiceToWithdraw=No. de facturas de clientes calificadas con orden de débito automático en espera
+NbOfInvoiceToWithdrawWithInfo=Número de factura de cliente con órdenes de pago mediante débito automático que tienen información de cuenta bancaria definida
+NbOfInvoiceToPayByBankTransfer=No. de facturas de proveedores calificados en espera de un pago mediante transferencia bancaria
+SupplierInvoiceWaitingWithdraw=Factura de proveedor en espera de pago mediante transferencia bancaria
+InvoiceWaitingWithdraw=Factura en espera de débito automático
+AmountToWithdraw=Cantidad a retirar
+NoInvoiceToWithdraw=No hay ninguna factura abierta para '%s' esperando. Vaya a la pestaña '%s' en la tarjeta de factura para realizar una solicitud.
+NoSupplierInvoiceToWithdraw=No se espera ninguna factura de proveedor con 'Solicitudes de débito automático' abiertas. Vaya a la pestaña '%s' en la tarjeta de factura para realizar una solicitud.
+ResponsibleUser=Usuario responsable
+WithdrawalsSetup=Configuración de pago por débito automático
+CreditTransferSetup=Configuración de transferencia bancaria
+WithdrawStatistics=Estadísticas de pagos por débito automático
+CreditTransferStatistics=Estadísticas de transferencia bancaria
+LastWithdrawalReceipt=Últimos recibos de débito automático %s
+MakeWithdrawRequest=Realizar una solicitud de pago mediante débito automático
+WithdrawRequestsDone=%s solicitudes de pago por débito automático registradas
+BankTransferRequestsDone=%s solicitudes de transferencia bancaria registradas
+ThirdPartyBankCode=Código de banco de terceros
+NoInvoiceCouldBeWithdrawed=Ninguna factura se debitó correctamente. Verifique que las facturas sean de compañías con un IBAN válido y que el IBAN tenga un UMR (Referencia de mandato único) con el modo <strong> %s </strong>.
+ClassCredited=Clasificar acreditado
+ClassCreditedConfirm=¿Está seguro de que desea clasificar este recibo de retiro como acreditado en su cuenta bancaria?
+TransData=Fecha de transmisión
+TransMetod=Método de transmisión
+StandingOrderReject=Emitir un rechazo
+WithdrawsRefused=Débito automático rechazado
+WithdrawalRefused=Retiro rechazado
+CreditTransfersRefused=Transferencias de crédito rechazadas
+WithdrawalRefusedConfirm=¿Estás seguro de que deseas ingresar a un rechazo de retiro para la sociedad?
+RefusedData=Fecha de rechazo
+RefusedReason=Motivo del rechazo
+RefusedInvoicing=Facturar el rechazo
+NoInvoiceRefused=No cargues el rechazo
+InvoiceRefused=Factura rechazada (cargue el rechazo al cliente)
+StatusDebitCredit=Estado débito / crédito
+StatusWaiting=Esperando
+StatusTrans=Enviado
+StatusDebited=Debitado
+StatusCredited=Acreditado
 StatusPaid=Pagado
 StatusRefused=Rechazado
+StatusMotif0=Sin especificar
+StatusMotif1=Fondos insuficientes
+StatusMotif2=Solicitud impugnada
+StatusMotif3=Sin orden de pago por débito automático
+StatusMotif4=Órdenes de venta
+StatusMotif5=RIB inutilizable
+StatusMotif8=Otra razon
+CreateForSepaFRST=Crear archivo de débito automático (SEPA FRST)
+CreateForSepaRCUR=Crear archivo de débito automático (SEPA RCUR)
+CreateAll=Crear archivo de débito automático (todos)
+CreateGuichet=Solo oficina
+CreateBanque=Solo banco
+OrderWaiting=Esperando tratamiento
+NotifyTransmision=Registro de transmisión de archivo de orden
+NotifyCredit=Registro de crédito de orden
+NumeroNationalEmetter=Número de transmisor nacional
+WithBankUsingRIB=Para cuentas bancarias que utilizan RIB
+WithBankUsingBANBIC=Para cuentas bancarias que utilizan IBAN / BIC / SWIFT
+BankToReceiveWithdraw=Recibir cuenta bancaria
+BankToPayCreditTransfer=Cuenta bancaria utilizada como fuente de pagos
+CreditDate=Crédito en
+WithdrawalFileNotCapable=No se puede generar el archivo de recibo de retiro para su país %s (Su país no es compatible)
+ShowWithdraw=Mostrar orden de débito automático
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene al menos una orden de pago por débito automático que aún no se ha procesado, no se establecerá como pagada para permitir la gestión previa de retiros.
+DoStandingOrdersBeforePayments=Esta pestaña le permite solicitar una orden de pago mediante débito automático. Una vez hecho esto, acceda al menú Banco->Pago por débito automático para generar y gestionar la orden de débito automático. Cuando se cierra la orden de débito automático, el pago de las facturas se registrará automáticamente y las facturas se cerrarán si el resto a pagar es nulo.
+DoCreditTransferBeforePayments=Esta pestaña le permite solicitar una orden de transferencia bancaria. Una vez hecho esto, vaya al menú Banco-> Pago por transferencia bancaria para generar y administrar la orden de transferencia bancaria. Cuando se cierra la orden de transferencia bancaria, el pago de las facturas se registrará automáticamente y las facturas se cerrarán si el resto a pagar es nulo.
+WithdrawalFile=Archivo de orden de débito
+SetToStatusSent=Establecer en estado "Archivo enviado"
+ThisWillAlsoAddPaymentOnInvoice=Esto también registrará los pagos en las facturas y los clasificará como "Pagados" si el resto por pagar es nulo.
+StatisticsByLineStatus=Estadísticas por estado de líneas
+DateRUM=Fecha de la firma del mandato
+RUMLong=Referencia de mandato única
+RUMWillBeGenerated=Si está vacío, se generará una UMR (referencia de mandato único) una vez que se guarde la información de la cuenta bancaria.
+WithdrawMode=Modo de débito automático (FRST o RECUR)
+WithdrawRequestAmount=Monto de la solicitud de débito automático:
+BankTransferAmount=Monto de la solicitud de transferencia bancaria:
+WithdrawRequestErrorNilAmount=No se puede crear una solicitud de débito automático por un monto vacío.
+SepaMandate=Mandato de débito automático SEPA
+PleaseReturnMandate=Envíe este formulario de mandato por correo electrónico a %s o por correo postal a
+SEPALegalText=Al firmar este formulario de mandato, usted autoriza a (A) %s a enviar instrucciones a su banco para debitar su cuenta y (B) a su banco para debitar su cuenta de acuerdo con las instrucciones de %s. Como parte de sus derechos, tiene derecho a un reembolso de su banco según los términos y condiciones de su acuerdo con su banco. Se debe reclamar un reembolso dentro de las 8 semanas a partir de la fecha en que se debitó su cuenta. Sus derechos con respecto al mandato anterior se explican en una declaración que puede obtener de su banco.
+CreditorIdentifier=Identificador del acreedor (CI)
+CreditorName=Nombre del acreedor
+SEPAFillForm=(B) Por favor complete todos los campos marcados *
+SEPAFormYourBAN=Su nombre de cuenta bancaria (IBAN)
+SEPAFormYourBIC=Su código de identificación bancaria (BIC)
+PleaseCheckOne=Marque solo uno
+CreditTransferOrderCreated=Se ha creado la orden de transferencia bancaria %s
+DirectDebitOrderCreated=Se ha creado la orden de débito automático %s
+AmountRequested=Monto solicitado
+CreateForSepa=Crear archivo de débito automático
+ICS=Identificador de acreedor (IA o CI en inglés) para débito automático
+ICSTransfer=Identificador de acreedor (CI) para transferencia bancaria
+END_TO_END=Etiqueta XML SEPA "EndToEndId": identificación única asignada por transacción
+USTRD=Etiqueta XML SEPA "no estructurada"
+ADDDAYS=Agregar días a la fecha de ejecución
+InfoCreditSubject=Pago de la orden de pago mediante débito automático %s por parte del banco
+InfoCreditMessage=La orden de pago mediante débito automático %s ha sido pagada por el banco <br> Datos de pago: %s
+InfoTransSubject=Transmisión de la orden de pago mediante débito automático %s al banco
+InfoTransMessage=La orden de pago mediante débito automático %s ha sido enviada al banco por %s %s. <br> <br>
+InfoTransData=Cantidad: %s <br> Método: %s <br> Fecha: %s
+InfoRejectSubject=Orden de pago por débito automático rechazada
+InfoRejectMessage=Hola, <br> <br> la orden de pago por débito automático de la factura %s relacionada con la empresa %s, con un monto de %s ha sido rechazada por el banco. <br> <br> - <br> %s
+ModeWarning=La opción para el modo real no se configuró, nos detenemos después de esta simulación.
+ErrorCompanyHasDuplicateDefaultBAN=La empresa con la identificación %s tiene más de una cuenta bancaria predeterminada. No hay forma de saber cuál usar.
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=El monto total de la orden de débito automático difiere de la suma de líneas
diff --git a/htdocs/langs/es_CO/workflow.lang b/htdocs/langs/es_CO/workflow.lang
index ae09b907f97..60f75ed2ff8 100644
--- a/htdocs/langs/es_CO/workflow.lang
+++ b/htdocs/langs/es_CO/workflow.lang
@@ -13,3 +13,5 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de ori
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifique el pedido de ventas de origen vinculado como enviado cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la propuesta del proveedor de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique el pedido de compra de origen vinculado como facturado cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
+descWORKFLOW_BILL_ON_RECEPTION=Clasifique las recepciones como "facturadas" cuando un pedido de proveedor vinculado is validado
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Clasifique el envío de origen vinculado como cerrado cuando se valida la factura del cliente
diff --git a/htdocs/langs/es_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/es_DO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index ceed7fa3336..6dbaf311a2a 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -5,7 +5,6 @@ Permission91=Consultar impuestos e ITBIS
 Permission92=Crear/modificar impuestos e ITBIS
 Permission93=Eliminar impuestos e ITBIS
 DictionaryVAT=Tasa de ITBIS (Impuesto sobre ventas en EEUU)
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
 OptionVatMode=Opción de carga de ITBIS
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/es_DO/cron.lang b/htdocs/langs/es_DO/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/es_DO/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_DO/modulebuilder.lang b/htdocs/langs/es_DO/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_DO/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_DO/website.lang b/htdocs/langs/es_DO/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/es_DO/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
index 262f54e0a6e..5315299f9bc 100644
--- a/htdocs/langs/es_EC/accountancy.lang
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -183,7 +183,6 @@ NoNewRecordSaved=No más registro para calendarizar
 ListOfProductsWithoutAccountingAccount=Lista de productos no vinculados a ninguna cuenta contable
 ChangeBinding=Cambiar la encuadernación
 Accounted=Contabilizado en el libro mayor
-NotYetAccounted=Aún no contabilizado en el libro mayor
 ShowTutorial=Tutorial de presentación
 NotReconciled=No conciliado
 ApplyMassCategories=Aplicar categorías de masas
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index efcb38d1779..d12b5c4f9ee 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -815,7 +815,6 @@ LogoSquarredDesc=Debe ser un icono cuadriculado (ancho = alto). Este logotipo se
 DoNotSuggestPaymentMode=No sugiera
 OwnerOfBankAccount=Dueño de una cuenta bancaria %s
 BankModuleNotActive=Módulo Cuentas bancarias no habilitado.
-ShowBugTrackLink=Mostrar enlace "<strong> %s </strong>"
 DelaysOfToleranceDesc=Establezca el retraso antes de que aparezca un ícono de alerta %s en la pantalla para el elemento tardío.
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Orden no procesada
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Orden de compra no procesada
diff --git a/htdocs/langs/es_EC/banks.lang b/htdocs/langs/es_EC/banks.lang
index 94929d9f3b4..ce6d36a87f0 100644
--- a/htdocs/langs/es_EC/banks.lang
+++ b/htdocs/langs/es_EC/banks.lang
@@ -69,12 +69,10 @@ Reconciled=Conciliado
 SupplierInvoicePayment=Pago del proveedor
 WithdrawalPayment=Orden de pago de débito
 SocialContributionPayment=Pago de impuestos sociales y fiscales
-TransferDesc=Transferencia de una cuenta a otra, Dolibarr escribirá dos registros (un débito en la cuenta de origen y un crédito en la cuenta de destino). Se utilizará la misma cantidad (excepto el signo), la etiqueta y la fecha para esta transacción)
 TransferTo=A
 TransferFromToDone=Se ha registrado una transferencia de <b>%s</b> to <b>%s</b> of <b>%s</b> %s.
-CheckTransmitter=Transmisor
+CheckTransmitter=Remitente
 ValidateCheckReceipt=¿Validar este recibo de cheque?
-ConfirmValidateCheckReceipt=¿Está seguro de que desea validar este recibo de cheque, no se podrá realizar ningún cambio una vez hecho esto?
 DeleteCheckReceipt=¿Eliminar este recibo de cheque?
 ConfirmDeleteCheckReceipt=¿Seguro que desea eliminar este recibo de cheque?
 BankChecks=Cheques bancarios
@@ -95,7 +93,6 @@ BankTransactionLine=Transacción bancaria
 AllAccounts=Todas las cuentas bancarias y de efectivo
 ShowAllAccounts=Mostrar todas las cuentas
 FutureTransaction=Transacción futura Incapaz de conciliar.
-SelectChequeTransactionAndGenerate=Seleccione/filtrar cheques para incluir en el recibo de depósito de cheques y haga clic en "Crear".
 InputReceiptNumber=Elija el estado de cuenta bancario relacionado con la conciliación. Utilice un valor numérico clasificable: MMYYYY o DDMMYYYY
 EventualyAddCategory=Eventualmente, especifique una categoría en la que clasificar los registros
 ToConciliate=¿Para conciliar?
diff --git a/htdocs/langs/es_EC/bills.lang b/htdocs/langs/es_EC/bills.lang
index 0028e2a141b..840bf78cd07 100644
--- a/htdocs/langs/es_EC/bills.lang
+++ b/htdocs/langs/es_EC/bills.lang
@@ -87,7 +87,6 @@ ConvertExcessPaidToReduc=Convierte el exceso pagado en descuento disponible
 EnterPaymentReceivedFromCustomer=Introduzca el pago recibido del cliente
 EnterPaymentDueToCustomer=Realizar el pago debido al cliente
 DisabledBecauseRemainderToPayIsZero=Discapacitados porque el resto del pago es cero
-PriceBase=Base de precios
 BillStatusDraft=Proyecto (necesita ser validado)
 BillStatusPaid=Pagado
 BillStatusPaidBackOrConverted=Reembolso de nota de crédito o marcado como crédito disponible
@@ -338,7 +337,6 @@ RegulatedOn=Regulado en
 ChequeNumber=Verificar N °
 ChequeOrTransferNumber=N ° de cheque/transferencia
 ChequeBordereau=Ver calendario
-ChequeMaker=Comprobar/transferir el transmisor
 ChequeBank=Banco de Cheques
 CheckBank=Comprobar
 PhoneNumber=Teléfono
diff --git a/htdocs/langs/es_EC/boxes.lang b/htdocs/langs/es_EC/boxes.lang
index 6ae463eaff3..e2bea2bccc8 100644
--- a/htdocs/langs/es_EC/boxes.lang
+++ b/htdocs/langs/es_EC/boxes.lang
@@ -30,8 +30,6 @@ BoxMyLastBookmarks=Marcadores: último %s
 BoxOldestExpiredServices=Servicios expirados más antiguos
 BoxLastExpiredServices=Últimos %s contactos más antiguos con servicios activos expirados
 BoxTitleLastActionsToDo=Últimas %s acciones para hacer
-BoxTitleLatestModifiedBoms=Últimas BOMs modificadas %s
-BoxTitleLatestModifiedMos=Últimas órdenes de fabricación modificadas %s
 BoxGlobalActivity=Actividad global (facturas, propuestas, pedidos)
 BoxTitleGoodCustomers=%s Buenos clientes
 BoxScheduledJobs=Trabajos programados
diff --git a/htdocs/langs/es_EC/cashdesk.lang b/htdocs/langs/es_EC/cashdesk.lang
index 91bfc85b052..c519dedfc0a 100644
--- a/htdocs/langs/es_EC/cashdesk.lang
+++ b/htdocs/langs/es_EC/cashdesk.lang
@@ -35,7 +35,6 @@ NbOfInvoices=Nb de facturas
 Paymentnumpad=Tipo de Pad para ingresar el pago
 Numberspad=Pad de números
 BillsCoinsPad=Pad de monedas y billetes
-TakeposNeedsCategories=TakePOS necesita categorías de productos para funcionar
 CashDeskBankAccountFor=Cuenta predeterminada para usar para pagos en
 NoPaimementModesDefined=No hay modo de pavimento definido en la configuración de TakePOS
 TicketVatGrouped=IVA grupal por tasa en tickets recibos
diff --git a/htdocs/langs/es_EC/categories.lang b/htdocs/langs/es_EC/categories.lang
index 4aa11eeaa7d..542df116501 100644
--- a/htdocs/langs/es_EC/categories.lang
+++ b/htdocs/langs/es_EC/categories.lang
@@ -1,15 +1,7 @@
 # Dolibarr language file - Source file is en_US - categories
 Rubriques=Etiquetas/Categorías
-NoCategoryYet=No se ha creado ninguna etiqueta/categoría de este tipo
 AddIn=Añadir
 CategoriesArea=Etiquetas/Categorías área
-ProductsCategoriesArea=Área de etiquetas/categorías de productos/servicios
-SuppliersCategoriesArea=Área de etiquetas / categorías de proveedores
-CustomersCategoriesArea=Categorías de etiquetas/categorías de clientes
-MembersCategoriesArea=Miembros tags/categories area
-ContactsCategoriesArea=Zona de etiquetas/categorías de contactos
-ProjectsCategoriesArea=Área de etiquetas/categorías de proyectos
-UsersCategoriesArea=Etiquetas de usuarios / área de categorías
 CatList=Lista de etiquetas/categorías
 CreateThisCat=Crea esta etiqueta/categoría
 NoSubCat=No subcategoría.
diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
index b55655122e9..175716bb4b7 100644
--- a/htdocs/langs/es_EC/companies.lang
+++ b/htdocs/langs/es_EC/companies.lang
@@ -2,9 +2,7 @@
 ErrorCompanyNameAlreadyExists=El nombre de la empresa %s ya existe. Elija otro.
 ErrorSetACountryFirst=Establecer primero el país
 SelectThirdParty=Seleccione un cliente/proveedor
-ConfirmDeleteCompany=¿Está seguro de que desea eliminar esta empresa y toda la información heredada?
 DeleteContact=Eliminar un contacto / dirección
-ConfirmDeleteContact=¿Está seguro de que desea eliminar este contacto y toda la información heredada?
 MenuNewThirdParty=Nuevo Cliente/Proveedore
 MenuNewProspect=Nuevo prospecto
 NewCompany=Nueva compañía (prospecto, cliente, vendedor)
@@ -48,7 +46,6 @@ Region-State=Región - Provincia
 CountryCode=Código de país
 CountryId=ID del país
 Call=Llamada
-PhonePro=Teléfono Trabajo
 PhonePerso=Teléfono Personal
 PhoneMobile=Celular
 No_Email=Rechazar correos masivos
@@ -178,7 +175,6 @@ CustomerCodeDesc=Código de cliente, único para todos los clientes.
 SupplierCodeDesc=Código de proveedor, único para todos los proveedores
 RequiredIfCustomer=Requerido si un cliente/proveedor es un cliente o un cliente potencial
 RequiredIfSupplier=Requerido si un tercero es un vendedor
-ValidityControledByModule=Validez controlada por módulo
 ProspectToContact=Prospecto para contactar
 CompanyDeleted=Empresa "%s" eliminada de la base de datos.
 ListOfContacts=Lista de contactos / direcciones
@@ -250,10 +246,8 @@ ListSuppliersShort=Lista de proveedores
 ListProspectsShort=Lista de prospectos
 ListCustomersShort=Lista de clientes
 ThirdPartiesArea=Clientes/Proveedores y Contactos
-UniqueThirdParties=Total de clientes/proveedores
 InActivity=Abierto
 ThirdPartyIsClosed=El clientes/proveedores está cerrado
-ProductsIntoElements=Lista de productos / servicios en %s
 CurrentOutstandingBill=Factura actual pendiente
 OutstandingBill=Max. Por factura pendiente
 OutstandingBillReached=Max. Para la factura pendiente alcanzada
@@ -262,7 +256,6 @@ LeopardNumRefModelDesc=El código es gratuito. Este código se puede modificar e
 ManagingDirectors=Nombre del Gerente(s) (CEO, director, presidente ...)
 MergeOriginThirdparty=Duplicar clientes/proveedores (clientes/proveedores que desea eliminar)
 MergeThirdparties=Combinar clientes/proveedores
-ConfirmMergeThirdparties=¿Está seguro de que desea fusionar este cliente/proveedor con el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al cliente/proveedor actual, luego se eliminará el cliente/proveedor.
 ThirdpartiesMergeSuccess=Los clientes/proveedores se han fusionado
 SaleRepresentativeLogin=Inicio de sesión del representante de ventas
 SaleRepresentativeFirstname=Nombre del representante de ventas
diff --git a/htdocs/langs/es_EC/compta.lang b/htdocs/langs/es_EC/compta.lang
index 6b24ea9e09b..9bb2961c42a 100644
--- a/htdocs/langs/es_EC/compta.lang
+++ b/htdocs/langs/es_EC/compta.lang
@@ -110,7 +110,6 @@ NewCheckReceipt=Nuevo descuento
 NewCheckDeposit=Nuevo depósito de cheques
 NewCheckDepositOn=Crear recibo para depósito en cuenta:%s
 NoWaitingChecks=No hay cheques a la espera de depósito.
-DateChequeReceived=Consultar fecha de recepción
 NbOfCheques=No. de cheques
 PaySocialContribution=Pagar un impuesto social/fiscal
 DeleteSocialContribution=Eliminar un pago de impuestos sociales o fiscales
diff --git a/htdocs/langs/es_EC/errors.lang b/htdocs/langs/es_EC/errors.lang
index 50196eff061..07e30cff264 100644
--- a/htdocs/langs/es_EC/errors.lang
+++ b/htdocs/langs/es_EC/errors.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - errors
 NoErrorCommitIsDone=No hay error, nos comprometemos
 ErrorButCommitIsDone=Errores encontrados pero validamos a pesar de esto
-ErrorBadEMail=El correo electrónico %s está mal
-ErrorBadUrl=La URL%s está incorrecta
 ErrorBadValueForParamNotAString=Valor incorrecto para su parámetro. Se anexa generalmente cuando falta la traducción.
 ErrorLoginAlreadyExists=La conexión%s ya existe.
 ErrorGroupAlreadyExists=El grupo%s ya existe.
@@ -30,8 +28,6 @@ ErrorBadDateFormat=El valor '%s' tiene un formato de fecha incorrecto
 ErrorFailedToWriteInDir=Error al escribir en el directorio%s
 ErrorFoundBadEmailInFile=Se encontró una sintaxis de correo electrónico incorrecta para%s líneas en el archivo (ejemplo línea%s con correo electrónico
 ErrorUserCannotBeDelete=El usuario no puede ser eliminado. Tal vez esté asociado a entidades dolibarr.
-ErrorFieldsRequired=Algunos campos requeridos no fueron llenados.
-ErrorSubjectIsRequired=El tema del correo electrónico es obligatorio
 ErrorFailedToCreateDir=Error al crear un directorio. Compruebe que el usuario del servidor Web tiene permisos para escribir en el directorio de documentos de Dolibarr. Si el parámetro <b> safe_mode </ b> está habilitado en este PHP, compruebe que los archivos php de Dolibarr pertenecen al usuario del servidor web (o grupo).
 ErrorNoMailDefinedForThisUser=No hay correo definido para este usuario
 ErrorFeatureNeedJavascript=Esta característica necesita javascript para ser activado para trabajar. Cambie esto en la pantalla de configuración.
diff --git a/htdocs/langs/es_EC/eventorganization.lang b/htdocs/langs/es_EC/eventorganization.lang
new file mode 100644
index 00000000000..e6b8e89584c
--- /dev/null
+++ b/htdocs/langs/es_EC/eventorganization.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - eventorganization
+EvntOrgDone =Hecho
diff --git a/htdocs/langs/es_EC/mails.lang b/htdocs/langs/es_EC/mails.lang
index d726c01c4b9..46ccbb2fdf7 100644
--- a/htdocs/langs/es_EC/mails.lang
+++ b/htdocs/langs/es_EC/mails.lang
@@ -6,7 +6,6 @@ MailToUsers=Para el usuario(s)
 MailCC=Copiar a
 MailToCCUsers=Copiar a los usuario(s)
 MailCCC=Copia en caché a
-MailTopic=Tema de correo electrónico
 MailFile=Archivos adjuntos
 MailMessage=Cuerpo del correo electronico
 SubjectNotIn=No en el tema
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index d3b588e3a6f..bf25355ae9c 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -118,7 +118,6 @@ SaveAs=Guardar como
 SaveAndStay=Salvar y quedarse
 TestConnection=Conexión de prueba
 ToClone=Clon
-ConfirmClone=Elija los datos que desea clonar:
 NoCloneOptionsSpecified=No hay datos definidos para clonar.
 Of=De
 Run=Correr
@@ -145,7 +144,6 @@ DateOfLine=Fecha de línea
 Model=Pantilla de documento
 DefaultModel=Pantilla de documento por defecto
 Action=Evento
-NumberByMonth=Número por meses
 AmountByMonth=Monto por mes
 Limits=límites
 Logout=Cerrar sesión
@@ -457,7 +455,6 @@ SetDemandReason=Establecer origen
 AccountCurrency=Moneda de la cuenta
 XMoreLines=%S línea(s) oculta(s)
 AddBox=Agregar cuadro
-SelectElementAndClick=Seleccione un elemento y haga clic en %s
 PrintFile=Imprimir archivo %s
 ShowTransaction=Mostrar entrada en la cuenta bancaria
 ShowIntervention=Mostrar la intervención
diff --git a/htdocs/langs/es_EC/members.lang b/htdocs/langs/es_EC/members.lang
index 38de273817a..b713cbf4e3c 100644
--- a/htdocs/langs/es_EC/members.lang
+++ b/htdocs/langs/es_EC/members.lang
@@ -10,7 +10,6 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, inic
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razones de seguridad, se le deben otorgar permisos para editar todos los usuarios para poder vincular un miembro a un usuario que no es suyo.
 SetLinkToUser=Enlace a un usuario de Dolibarr
 SetLinkToThirdParty=Enlace a un tercero de Dolibarr
-MembersCards=Tarjetas de visita de los miembros
 MembersList=Lista de miembros
 MembersListToValid=Lista de proyectos de miembros (a validar)
 MembersListValid=Lista de miembros válidos
@@ -22,7 +21,6 @@ MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
 MembersWithSubscriptionToReceiveShort=Suscripción para recibir
 DateSubscription=Fecha de suscripción
 DateEndSubscription=Fecha de finalización de la suscripción
-EndSubscription=Suscripción final
 SubscriptionId=ID de suscripción
 MemberId=Identificación de miembro
 MemberTypeId=ID del tipo de miembro
@@ -56,8 +54,6 @@ NoTypeDefinedGoToSetup=No se han definido tipos de miembros. Ir al menú "Tipos
 WelcomeEMail=Correo electrónico de bienvenida
 SubscriptionRequired=Se requiere suscripción
 VoteAllowed=Voto permitido
-Physical=Natural
-Moral=Juridica
 ResiliateMember=Terminar un miembro
 ConfirmResiliateMember=¿Estás seguro de que quieres terminar este miembro?
 ConfirmDeleteMember=¿Está seguro de que desea eliminar este miembro (la eliminación de un miembro eliminará todas sus suscripciones)?
@@ -126,25 +122,17 @@ MembersStatisticsByState=Estadísticas de los miembros por estado / provincia
 MembersStatisticsByTown=Estadísticas de los miembros por ciudad
 MembersStatisticsByRegion=Estadísticas de los miembros por región
 NoValidatedMemberYet=No se han encontrado miembros validados
-MembersByCountryDesc=Esta pantalla muestra estadísticas de los miembros por países. Gráfico depende sin embargo en el servicio de graficas en línea de Google y está disponible sólo si una conexión a Internet está funcionando.
-MembersByStateDesc=Esta pantalla muestra estadísticas sobre los miembros por estado / provincias / cantón.
-MembersByTownDesc=Esta pantalla muestra estadísticas sobre los miembros por ciudad.
 MembersStatisticsDesc=Elija las estadísticas que desea leer ...
 MenuMembersStats=Estadística
 LatestSubscriptionDate=Última fecha de suscripción
-Public=La información es pública
 NewMemberbyWeb=Nuevo miembro añadido. Esperando aprobacion
 NewMemberForm=Formulario para nuevos miembros
-SubscriptionsStatistics=Estadísticas de suscripciones
 NbOfSubscriptions=Número de suscripciones
-AmountOfSubscriptions=Cantidad de suscripciones
 TurnoverOrBudget=Facturación (para una empresa) o Presupuesto (para una fundación)
 DefaultAmount=Cantidad predeterminada de suscripción
 CanEditAmount=El visitante puede elegir / editar el importe de su suscripción
 MEMBER_NEWFORM_PAYONLINE=Ir a la página de pago en línea integrada
 MembersStatisticsByProperties=Estadísticas de miembros por naturaleza
-MembersByNature=Esta pantalla muestra estadísticas sobre miembros por naturaleza.
-MembersByRegion=Esta pantalla muestra las estadísticas de los miembros por región.
 VATToUseForSubscriptions=Tasa del IVA a utilizar para las suscripciones
 NoVatOnSubscription=Sin IVA para suscripciones
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto utilizado para la línea de suscripción en la factura: %s
diff --git a/htdocs/langs/es_EC/modulebuilder.lang b/htdocs/langs/es_EC/modulebuilder.lang
index 3c61371c2a3..94ea76dc5f4 100644
--- a/htdocs/langs/es_EC/modulebuilder.lang
+++ b/htdocs/langs/es_EC/modulebuilder.lang
@@ -53,7 +53,6 @@ ListOfPermissionsDefined=Lista de permisos definidos
 SeeExamples=Ver ejemplos aquí
 EnabledDesc=Condición para tener este campo activo (Ejemplos:1 o $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=¿Es visible el campo? (Ejemplos: 0=Nunca visible, 1=Visible en la lista y crear / actualizar / ver formularios, 2=Visible solo en la lista, 3=Visible solo en el formulario crear / actualizar / ver (no en la lista), 4=Visible en la lista y actualizar / ver solo el formulario (no crear), 5=Visible solo en el formulario de vista final de la lista (no crear, no actualizar) <br><br>El uso de un valor negativo significa que el campo no se muestra de forma predeterminada en la lista, pero puede seleccionarse para verlo). <br><br>Puede ser una expresión, por ejemplo: <br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Muestre este campo en documentos PDF compatibles, puede administrar la posición con el campo "Posición". <br/> Actualmente, conocidos modelos compatibles PDF son: Eratóstenes (orden), espadon (nave), esponja (facturas), cian (propal / cita), Cornas (orden de proveedor) <br/> <br/> <strong> Para documento: </strong> <br/> 0 = No se ven las <br/> 1 = display <br/> 2 = sólo si no está vacío <br/> <br/> <strong> Para las líneas de documentos: </strong> <br/> 0 = no se ven las <br/> 1 = muestran en una columna <br/> 3 = display en la columna de descripción de línea después de la descripción <br/> 4 = display en la columna de descripción después de la descripción solo si no está vacía
 IsAMeasureDesc=¿Se puede acumular el valor de campo para obtener un total en la lista? (Ejemplos: 1 o 0)
 SearchAllDesc=¿Se utiliza el campo para realizar una búsqueda desde la herramienta de búsqueda rápida? (Ejemplos: 1 o 0)
 SpecDefDesc=Ingrese aquí toda la documentación que desea proporcionar con su módulo que no está definido por otras pestañas. Puede usar .md o mejor, la rica sintaxis .asciidoc.
diff --git a/htdocs/langs/es_EC/other.lang b/htdocs/langs/es_EC/other.lang
index 48461bc5410..7d8c9ca8f16 100644
--- a/htdocs/langs/es_EC/other.lang
+++ b/htdocs/langs/es_EC/other.lang
@@ -114,7 +114,6 @@ EnableGDLibraryDesc=Instale o active la biblioteca GD en su instalación de PHP
 ProfIdShortDesc=</b>Prof Id%s</b> es una información que depende de un tercer país.</b> Por ejemplo, para el país <b>%s</b>, es el código <b>%s</b>.
 DolibarrDemo=Demostración de ERP/CRM de Dolibarr
 StatsByNumberOfUnits=Estadísticas de suma de cantidad de productos/servicios
-StatsByNumberOfEntities=Estadísticas en número de entidades referentes (n.° de factura, o pedido ...)
 NumberOfProposals=Número de propuestas
 NumberOfCustomerOrders=Número de pedidos de ventas
 NumberOfCustomerInvoices=Número de facturas de clientes
diff --git a/htdocs/langs/es_EC/partnership.lang b/htdocs/langs/es_EC/partnership.lang
new file mode 100644
index 00000000000..0e3f1df1b9c
--- /dev/null
+++ b/htdocs/langs/es_EC/partnership.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - partnership
+DatePartnershipEnd=Fecha final
+PartnershipCanceled =Cancelado
diff --git a/htdocs/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
index 150d9069c25..e85678b9e7a 100644
--- a/htdocs/langs/es_EC/products.lang
+++ b/htdocs/langs/es_EC/products.lang
@@ -39,11 +39,9 @@ UpdateDefaultPrice=Actualizar precio predeterminado
 UpdateLevelPrices=Actualizar precios para cada nivel
 SellingPriceHT=Precio de venta (sin impuestos)
 SellingPriceTTC=Precio de venta (impuestos incluidos)
-CostPriceDescription=Este campo de precio (sin impuestos) se puede utilizar para almacenar la cantidad promedio que este producto le cuesta a su empresa. Puede ser cualquier precio que calcule usted mismo, por ejemplo, a partir del precio promedio de compra más el costo promedio de producción y distribución.
 CostPriceUsage=Este valor podría utilizarse para el cálculo del margen.
 SoldAmount=Cantidad vendida
 PurchasedAmount=Cantidad comprada
-MinPrice=Min. precio de venta
 EditSellingPriceLabel=Editar etiqueta de precio de venta
 CantBeLessThanMinPrice=El precio de venta no puede ser inferior al mínimo permitido para este producto (%s sin impuestos). Este mensaje también puede aparecer si escribe un descuento demasiado importante.
 ErrorProductAlreadyExists=Ya existe un producto con la referencia %s.
@@ -93,16 +91,11 @@ ListProductServiceByPopularity=Lista de productos/servicios por popularidad
 ListProductByPopularity=Lista de productos por popularidad
 ListServiceByPopularity=Lista de servicios por popularidad
 ConfirmCloneProduct=¿Está seguro de que desea clonar el producto o servicio <b>%s</b>?
-CloneContentProduct=Clonar toda la información principal del producto/servicio.
-CloneCategoriesProduct=Clonar etiquetas / categorías vinculadas
-CloneCompositionProduct=Clonar producto / servicio virtual
-CloneCombinationsProduct=Variantes del producto clon
 ProductIsUsed=Este producto se utiliza
 NewRefForClone=Árbitro. de nuevo producto/servicio
 CustomerPrices=Precios de los clientes
 SuppliersPrices=Precios del proveedor
 SuppliersPricesOfProductsOrServices=Precios de proveedor (de productos o servicios)
-Nature=Naturaleza del producto (material / acabado)
 g=gramo
 m=metro
 unitD=Dia
diff --git a/htdocs/langs/es_EC/projects.lang b/htdocs/langs/es_EC/projects.lang
index 593d95f821b..bf86ffc8c2f 100644
--- a/htdocs/langs/es_EC/projects.lang
+++ b/htdocs/langs/es_EC/projects.lang
@@ -6,18 +6,15 @@ ProjectsArea=Área de Proyectos
 SharedProject=Todos
 PrivateProject=Contactos del proyecto
 AllAllowedProjects=Todo el proyecto que puedo leer (mio + público)
-MyProjectsDesc=Esta vista está limitada a los proyectos para los que se le asignaron
 ProjectsPublicDesc=Esta vista presenta todos los proyectos que se le permite leer.
 TasksOnProjectsPublicDesc=Esta vista presenta todas las tareas de los proyectos que se le permite leer.
 ProjectsPublicTaskDesc=Esta vista presenta todos los proyectos y tareas que se le permite leer.
 ProjectsDesc=Esta vista presenta todos los proyectos (los permisos de usuario le otorgan permiso para ver todo).
 TasksOnProjectsDesc=Esta vista presenta todas las tareas de todos los proyectos (los permisos de usuario le otorgan permiso para ver todo).
-MyTasksDesc=Esta vista se limita a proyectos o tareas para los que se le asignaron
 OnlyOpenedProject=Sólo los proyectos abiertos son visibles (los proyectos en borrador o estado cerrado no son visibles).
 TasksPublicDesc=Esta vista presenta todos los proyectos y tareas que se le permite leer.
 TasksDesc=Esta vista presenta todos los proyectos y tareas (los permisos de usuario le otorgan permiso para ver todo).
 AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas para proyectos calificados son visibles, pero puede ingresar solo el timepo para la tarea asignada al usuario seleccionado. Si necesita ingresar tiempo en la tarea debe asignarle un usuario.
-OnlyYourTaskAreVisible=Sólo las tareas asignadas a usted son visibles. Asigne la tarea a sí mismo si no está visible y necesita introducir tiempo en ella.
 ImportDatasetTasks=Tareas de los proyectos
 ConfirmDeleteAProject=¿Está seguro de que desea eliminar este proyecto?
 ConfirmDeleteATask=¿Seguro que desea eliminar esta tarea?
@@ -136,7 +133,6 @@ InputDetail=Detalle de entradas
 TimeAlreadyRecorded=Este es el tiempo gastado ya registrado para esta tarea/día y el usuario%s
 NoUserAssignedToTheProject=No hay usuarios asignados a este proyecto.
 TimeSpentBy=Tiempo invertido por
-AssignTaskToMe=Asignar tarea a mí
 AssignTaskToUser=Asignar tarea a%s
 SelectTaskToAssign=Seleccione tarea para asignar ...
 ProjectOverview=Visión de conjunto
diff --git a/htdocs/langs/es_EC/sendings.lang b/htdocs/langs/es_EC/sendings.lang
index db824ebf01e..4822c17a70f 100644
--- a/htdocs/langs/es_EC/sendings.lang
+++ b/htdocs/langs/es_EC/sendings.lang
@@ -28,7 +28,6 @@ ConfirmValidateSending=¿Está seguro de que desea validar este envío con la re
 ConfirmCancelSending=¿Seguro que desea cancelar este envío?
 DocumentModelMerou=Modelo A5 de Merou
 WarningNoQtyLeftToSend=Advertencia, ningunos productos que esperan para ser enviados.
-StatsOnShipmentsOnlyValidated=Las estadísticas realizadas sobre envíos sólo se validan. La fecha utilizada es la fecha de validación del envío (no siempre se conoce la fecha de entrega planeada).
 RefDeliveryReceipt=Recibo de entrega de ref
 StatusReceipt=Recibo de entrega de estado
 DateReceived=Fecha de entrega recibida
diff --git a/htdocs/langs/es_EC/stocks.lang b/htdocs/langs/es_EC/stocks.lang
index 355b8ac0592..8c4ec56e517 100644
--- a/htdocs/langs/es_EC/stocks.lang
+++ b/htdocs/langs/es_EC/stocks.lang
@@ -60,7 +60,6 @@ NoPredefinedProductToDispatch=No hay productos predefinidos para este objeto. Po
 DispatchVerb=Envío
 StockLimitShort=Límite para la alerta
 StockLimit=Límite de Inventario para alerta
-StockLimitDesc=(vacío) significa que no hay advertencia.<br>0 se puede utilizar para una advertencia tan pronto como el inventario esté vacío.
 PhysicalStock=Inventario FISICO
 RealStock=Inventario Real
 RealStockDesc=El stock físico / real es el stock actualmente en los almacenes.
diff --git a/htdocs/langs/es_EC/users.lang b/htdocs/langs/es_EC/users.lang
index 420d41e9997..338829dfa75 100644
--- a/htdocs/langs/es_EC/users.lang
+++ b/htdocs/langs/es_EC/users.lang
@@ -73,7 +73,6 @@ DontDowngradeSuperAdmin=Sólo una superadmin puede degradar una superadmin
 UseTypeFieldToChange=Utilice el campo Tipo para cambiar
 OpenIDURL=URL de OpenID
 LoginUsingOpenID=Utilice OpenID para iniciar sesión
-ExpectedWorkedHours=Horas trabajadas esperadas por semana
 ColorUser=Color del usuario
 DisabledInMonoUserMode=Desactivado en el modo de mantenimiento
 UserAccountancyCode=Código de contabilidad de usuario
diff --git a/htdocs/langs/es_EC/website.lang b/htdocs/langs/es_EC/website.lang
index ca551418689..6aa45d5656f 100644
--- a/htdocs/langs/es_EC/website.lang
+++ b/htdocs/langs/es_EC/website.lang
@@ -61,5 +61,3 @@ EditInLineOnOff=El modo 'Editar en línea' es %s
 ShowSubContainersOnOff=El modo para ejecutar 'contenido dinámico' es %s
 UseManifest=Proporcione un archivo manifest.json
 RSSFeed=RSS
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 9be21f76a86..93faa22f85e 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -202,14 +202,14 @@ Docref=Referencia
 LabelAccount=Descripción
 LabelOperation=Etiqueta operación
 Sens=Dirección
-AccountingDirectionHelp=Para una cuenta contable de un cliente, use Crédito para registrar un pago que recibió <br> Para una cuenta contable de un proveedor, use Débito para registrar un pago que usted realice
+AccountingDirectionHelp=Para una cuenta contable de un cliente, use Crédito para registrar un pago que ha recibido <br> Para una cuenta contable de un proveedor, use Débito para registrar un pago que realizó
 LetteringCode=Cogido de letras
 Lettering=Letras
 Codejournal=Diario
 JournalLabel=Etiqueta del diario
 NumPiece=Apunte
 TransactionNumShort=Núm. transacción
-AccountingCategory=Custom group
+AccountingCategory=Grupo personalizado
 GroupByAccountAccounting=Agrupar por cuenta del Libro Mayor
 GroupBySubAccountAccounting=Agrupar por cuenta de libro mayor auxiliar
 AccountingAccountGroupsDesc=Puedes definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
@@ -297,7 +297,7 @@ NoNewRecordSaved=No hay más registros para el diario
 ListOfProductsWithoutAccountingAccount=Listado de productos sin cuentas contables
 ChangeBinding=Cambiar la unión
 Accounted=Contabilizada en el Libro Mayor
-NotYetAccounted=Aún no contabilizada en el Libro Mayor
+NotYetAccounted=Aún no contabilizado en el libro mayor
 ShowTutorial=Ver Tutorial
 NotReconciled=No reconciliado
 WarningRecordWithoutSubledgerAreExcluded=Advertencia, todas las operaciones sin una cuenta de libro mayor auxiliar definida se filtran y excluyen de esta vista
@@ -427,4 +427,4 @@ WarningReportNotReliable=Advertencia, este informe no se basa en el Libro mayor,
 ExpenseReportJournal=Informe de gastos diario
 InventoryJournal=Inventario
 
-NAccounts=%s accounts
+NAccounts=%s cuentas
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 6f3f04104c8..0c5f9b62812 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Elimine o renombre el archivo <b>%s</b>, si existe, para permitir el
 RestoreLock=Restaure el archivo <b> %s </b>, solo con permiso de lectura, para deshabilitar cualquier uso posterior de la herramienta Actualización/Instalación.
 SecuritySetup=Configuración de la seguridad
 PHPSetup=Configuración de PHP
+OSSetup=Configuración del sistema operativo
 SecurityFilesDesc=Defina aquí las opciones de seguridad relacionadas con la subida de archivos.
 ErrorModuleRequirePHPVersion=Error, este módulo requiere una versión %s o superior de PHP
 ErrorModuleRequireDolibarrVersion=Error, este módulo requiere una versión %s o superior de Dolibarr
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Definir el enlace "<strong> %s </strong>" (vacío para no mostrar este enlace, 'github' para el enlace al proyecto Dolibarr o definir directamente una url 'https: // ...')
 Alerts=Alertas
 DelaysOfToleranceBeforeWarning=Retraso antes de mostrar una alerta de advertencia para:
 DelaysOfToleranceDesc=Esta pantalla permite configura los retrasos antes de que se alerte con el símbolo %s, sobre cada elemento en retraso.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar el comando desde
 YourPHPDoesNotHaveSSLSupport=Funciones SSL no disponibles en su PHP
 DownloadMoreSkins=Más temas para descargar
 SimpleNumRefModelDesc=Devuelve el número de referencia en el formato %syymm-nnnn donde aa es el año, mm es el mes y nnnn es un número secuencial que se incrementa automáticamente sin reinicio.
+SimpleNumRefNoDateModelDesc=Devuelve el número de referencia en el formato %s-nnnn donde nnnn es un número secuencial que se incrementa automáticamente sin reinicio
 ShowProfIdInAddress=Mostrar el identificador profesional en las direcciones
 ShowVATIntaInAddress=Ocultar el identificador IVA Intracomunitario en las direcciones
 TranslationUncomplete=Traducción parcial
@@ -1751,7 +1753,7 @@ CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenga la casilla de verificación "Crear
 ##### Agenda #####
 AgendaSetup=Módulo configuración de acciones y agenda
 PasswordTogetVCalExport=Clave de autorización vcal export link
-SecurityKey = Security Key
+SecurityKey = Clave de seguridad
 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=Establecer automáticamente este valor por defecto para el tipo de evento en la creación de un evento
@@ -2062,11 +2064,11 @@ UseDebugBar=Usa la barra de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas líneas de registro para mantener en la consola.
 WarningValueHigherSlowsDramaticalyOutput=Advertencia, los valores altos ralentizan dramáticamente la salida.
 ModuleActivated=El módulo %s está activado y ralentiza dramáticamente la interfaz
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=El módulo %s está activado con un nivel de registro demasiado alto (intente utilizar un nivel más bajo para mejorar el rendimiento y la seguridad)
 ModuleSyslogActivatedButLevelNotTooVerbose=El módulo %s está activado y el nivel de registro (%s) es correcto (no demasiado detallado)
 IfYouAreOnAProductionSetThis=Si esta en un entorno de produccion, deberia establecer esta propiedad  a %s
 AntivirusEnabledOnUpload=Antivirus habilitado en los ficheros subidos
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+SomeFilesOrDirInRootAreWritable=Algunos archivos o directorios no están en modo de solo lectura
 EXPORTS_SHARE_MODELS=Los modelos de exportación son compartidos con todos.
 ExportSetup=Configuración del módulo de exportación.
 ImportSetup=Configuración del módulo Importar
@@ -2119,6 +2121,11 @@ MailToSendEventOrganization=Organización de evento
 AGENDA_EVENT_DEFAULT_STATUS=Estado de evento predeterminado al crear un evento desde el formulario
 YouShouldDisablePHPFunctions=Deberías deshabilitar las funciones de PHP
 IfCLINotRequiredYouShouldDisablePHPFunctions=Excepto si necesita ejecutar comandos del sistema (para el módulo Trabajo programado o para ejecutar el antivirus de línea de comando externo, por ejemplo), debe deshabilitar las funciones de PHP
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
+NoWritableFilesFoundIntoRootDir=No se encontraron archivos o directorios grabables de los programas comunes en su directorio raíz (Bueno)
+RecommendedValueIs=Recomendado: %s
+ARestrictedPath=Una ruta restringida
+CheckForModuleUpdate=Compruebe si hay actualizaciones de módulos externos
+CheckForModuleUpdateHelp=Esta acción se conectará a los editores de módulos externos para comprobar si hay una nueva versión disponible.
+ModuleUpdateAvailable=Hay una actualización disponible
+NoExternalModuleWithUpdate=No se encontraron actualizaciones para módulos externos
+SwaggerDescriptionFile=Archivo de descripción de la API de Swagger (para usar con redoc, por ejemplo)
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 596be0958d9..337f6d2063d 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Pago impuesto social/fiscal
 BankTransfer=Transferencia bancaria
 BankTransfers=Transferencias bancarias
 MenuBankInternalTransfer=Transferencia interna
-TransferDesc=Al crear una transferencia de una de sus cuentas bancarias hacia otra, Dolibarr crea dos registros contables (uno de débito en una cuenta y otro de crédito, del mismo importe, en la otra cuenta. Se utiliza para los dos registros la misma etiqueta de transferencia y la misma fecha)
+TransferDesc=Utilice la transferencia interna para transferir de una cuenta a otra, la aplicación escribirá dos registros: un débito en la cuenta de origen y un crédito en la cuenta de destino. Se utilizará la misma cantidad, etiqueta y fecha para esta transacción.
 TransferFrom=De
 TransferTo=Hacia
 TransferFromToDone=La transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s se ha creado.
 CheckTransmitter=Emisor
 ValidateCheckReceipt=¿Validar esta remesa?
-ConfirmValidateCheckReceipt=¿Está seguro de querer validar esta remesa (ninguna modificación será posible una vez la remesa esté validada)?
+ConfirmValidateCheckReceipt=¿Está seguro de que desea enviar este recibo de cheque para su validación? No es posible realizar cambios, está hecho.
 DeleteCheckReceipt=¿Eliminar esta remesa?
 ConfirmDeleteCheckReceipt=¿Está seguro de querer eliminar esta remesa?
 BankChecks=Cheques
@@ -142,7 +142,7 @@ AllAccounts=Todas las cuentas bancarias/de caja
 BackToAccount=Volver a la cuenta
 ShowAllAccounts=Mostrar para todas las cuentas
 FutureTransaction=Transacción futura. No es posible conciliar.
-SelectChequeTransactionAndGenerate=Seleccione/filtre los cheques a incluir en la remesa y haga clic en "Crear".
+SelectChequeTransactionAndGenerate=Seleccione/filtre los cheques que se incluirán en el recibo de depósito de cheques. Luego, haga clic en "Crear".
 InputReceiptNumber=Indique el extracto bancario relacionado con la conciliación. Utilice un valor numérico ordenable: YYYYMM o YYYYMMDD
 EventualyAddCategory=Eventualmente, indique una categoría en la que clasificar los registros
 ToConciliate=¿A conciliar?
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index d6ba3c3b0e3..3b5e6f584d0 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -454,7 +454,7 @@ RegulatedOn=Pagar el
 ChequeNumber=Cheque nº
 ChequeOrTransferNumber=Cheque/Transferencia nº
 ChequeBordereau=Comprobar agenda
-ChequeMaker=Transmisor Cheque/Transferencia
+ChequeMaker=Remitente Cheque/Transferencia
 ChequeBank=Banco del cheque
 CheckBank=Verificar
 NetToBePaid=Neto a pagar
@@ -520,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Tiene que crear una factura estandar antes
 PDFCrabeDescription=Factura PDF plantilla Crabe. Una plantilla de factura completa (antigua implementación de la plantilla Sponge)
 PDFSpongeDescription=Modelo de factura Esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Modelo PDF de factura Crevette. Un completo modelo de facturas de situación
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Devuelve el número en el formato %syymm-nnnn para facturas estándar y %syymm-nnnn para notas de crédito donde aa es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin interrupción y sin retorno a 0
+MarsNumRefModelDesc1=Número de devolución en el formato %syymm-nnnn para facturas estándar, %syymm-nnnn para facturas de reemplazo, %syymm-nnnn para facturas de anticipo y %syymm-nnnn para notas de crédito donde yy es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin ruptura y sin retorno a 0
 TerreNumRefModelError=Ya existe una factura con $syymm y no es compatible con este modelo de secuencia. Elimínela o renómbrela para poder activar este módulo
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Número de devolución en el formato %syymm-nnnn para facturas estándar, %syymm-nnnn para notas de crédito y %syymm-nnnn para facturas de pago inicial donde yy es un número de año de retorno y no es un mes de secuencia y nnnnn. 0
 EarlyClosingReason=Motivo de cierre anticipado
 EarlyClosingComment=Nota de cierre anticipado
 ##### Types de contacts #####
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index c4ce2bde6f0..fc3e239692d 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -112,9 +112,9 @@ BoxTitleLastCustomerShipments=Últimos %s envíos a clientes
 NoRecordedShipments=Ningún envío a clientes registrado
 BoxCustomersOutstandingBillReached=Clientes con límite pendiente alcanzado
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
+UsersHome=Usuarios y grupos internos
+MembersHome=Afiliados internos
+ThirdpartiesHome=Terceros internos
+TicketsHome=Tickets internos
+AccountancyHome=Contabilidad interna
 ValidatedProjects=Proyectos validados
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index d9501021ef0..4122e27b7a3 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Piso
 AddTable=Agregar tabla
 Place=Lugar
 TakeposConnectorNecesary='Conector TakePOS' requerido
-OrderPrinters=Impresoras de pedidos
+OrderPrinters=Agregue un botón para enviar el pedido a algunas impresoras determinadas, sin pago (por ejemplo, para enviar un pedido a una cocina)
+NotAvailableWithBrowserPrinter=No disponible cuando la impresora para recibos está configurada en el navegador:
 SearchProduct=Buscar producto
 Receipt=Orden
 Header=Cabecera
@@ -56,8 +57,9 @@ Paymentnumpad=Tipo de Pad para introducir el pago.
 Numberspad=Teclado numérico
 BillsCoinsPad=Monedas y billetes de banco
 DolistorePosCategory=Módulos TakePOS y otras soluciones POS para Dolibarr
-TakeposNeedsCategories=TakePOS necesita categorías de productos para trabajar
-OrderNotes=Pedidos
+TakeposNeedsCategories=TakePOS necesita al menos una categoría de producto para funcionar
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS necesita al menos 1 categoría de producto en la categoría <b> %s </b> para funcionar
+OrderNotes=Puede agregar algunas notas a cada artículo pedido
 CashDeskBankAccountFor=Cuenta por defecto a usar para cobros en
 NoPaimementModesDefined=No hay modo de pago definido en la configuración de TakePOS
 TicketVatGrouped=Agrupar IVA por tipo en tickets/recibos
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=La factura ya está validada
 NoLinesToBill=No hay líneas para facturar
 CustomReceipt=Recibo personalizado
 ReceiptName=Nombre del recibo
-ProductSupplements=Suplementos de producto
+ProductSupplements=Gestionar suplementos de productos
 SupplementCategory=Categoría de suplemento
 ColorTheme=Tema de color
 Colorful=Colorido
@@ -92,7 +94,7 @@ Browser=Navegador
 BrowserMethodDescription=Método de impresión básico. Pocos parámetros de personalización. Impresión con el navegador.
 TakeposConnectorMethodDescription=Módulo externo para impresión directa.
 PrintMethod=Método de impresión
-ReceiptPrinterMethodDescription=Método potente con muchos parámetros. Completamente personalizable con plantillas. No se puede imprimir desde la nube.
+ReceiptPrinterMethodDescription=Método potente con muchos parámetros. Totalmente personalizable con plantillas. El servidor que aloja la aplicación no puede estar en la nube (debe poder llegar a las impresoras de su red).
 ByTerminal=Por terminal
 TakeposNumpadUsePaymentIcon=Usar icono de pago en lugar del texto en los botones de pago del teclado numérico
 CashDeskRefNumberingModules=Módulo de numeración para el TPV
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Debe activarse primero el módulo de impresora
 AllowDelayedPayment=Permitir pago aplazado
 PrintPaymentMethodOnReceipts=Imprimir método de pago en tickets|recibos
 WeighingScale=Balanza
+ShowPriceHT = Mostrar la columna de precio sin impuestos
+ShowPriceHTOnReceipt = Mostrar la columna de precio sin impuestos al recibirla
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 644e01fb868..8c6f510ac6f 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Etiqueta/Categoría
 Rubriques=Etiqueta/Categoría
 RubriquesTransactions=Etiquetas/Categorías de transacciones
 categories=etiquetas/categorías
-NoCategoryYet=Ninguna etiqueta/categoría de este tipo creada
+NoCategoryYet=No se ha creado ninguna etiqueta / categoría de este tipo
 In=En
 AddIn=Añadir en
 modify=Modificar
 Classify=Clasificar
 CategoriesArea=Área Etiquetas/Categorías
-ProductsCategoriesArea=Área etiquetas/categorías Productos/Servicios
-SuppliersCategoriesArea=Área etiquetas/categorías Proveedores
-CustomersCategoriesArea=Área etiquetas/categorías Clientes
-MembersCategoriesArea=Área etiquetas/categorías Miembros
-ContactsCategoriesArea=Área etiquetas/categorías de contactos
-AccountsCategoriesArea=Área de etiquetas / categorías de cuentas bancarias
-ProjectsCategoriesArea=Área etiquetas/categorías Proyectos
-UsersCategoriesArea=Área etiquetas/categorías Usuarios
+ProductsCategoriesArea=Área de etiquetas/categorías de Productos/Servicios
+SuppliersCategoriesArea=Área de etiquetas/categorías de Proveedores
+CustomersCategoriesArea=Área de etiquetas/categorías de Clientes
+MembersCategoriesArea=Área de etiquetas/categorías de Miembros
+ContactsCategoriesArea=Área de etiquetas/categorías de Contactos
+AccountsCategoriesArea=Área de etiquetas/categorías de Cuentas Bancarias
+ProjectsCategoriesArea=Área de etiquetas/categorías del Proyecto
+UsersCategoriesArea=Área de etiquetas/categorías de Usuario
 SubCats=Subcategorías
 CatList=Listado de etiquetas/categorías
 CatListAll=Lista de etiquetas / categorías (todos los tipos)
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Asignar categoría a proveedor
 ShowCategory=Mostrar etiqueta/categoría
 ByDefaultInList=Por defecto en lista
 ChooseCategory=Elija una categoría
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
+StocksCategoriesArea=Categorías de almacén
+ActionCommCategoriesArea=Categorías de eventos
 WebsitePagesCategoriesArea=Categorías de contenedor de página
-UseOrOperatorForCategories=Uso u operador para categorías
+UseOrOperatorForCategories=Utilice el operador 'OR' para las categorías
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 57b67050848..12d42b753de 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=El nombre de la empresa %s ya existe. Indique otro.
 ErrorSetACountryFirst=Defina en primer lugar el país
 SelectThirdParty=Seleccionar un tercero
-ConfirmDeleteCompany=¿Está seguro de querer eliminar esta empresa y toda su información inherente?
+ConfirmDeleteCompany=¿Está seguro de que desea eliminar esta empresa y toda la información relacionada?
 DeleteContact=Eliminar un contacto
-ConfirmDeleteContact=¿Está seguro de querer eliminar este contacto y toda la información dependiente?
+ConfirmDeleteContact=¿Está seguro de que desea eliminar este contacto y toda la información relacionada?
 MenuNewThirdParty=Nuevo tercero
 MenuNewCustomer=Nuevo cliente
 MenuNewProspect=Nuevo cliente potencial
@@ -78,7 +78,7 @@ Zip=Código postal
 Town=Población
 Web=Web
 Poste= Puesto
-DefaultLang=Idioma por defecto
+DefaultLang=Idioma predeterminado
 VATIsUsed=Sujeto a IVA
 VATIsUsedWhenSelling=Esto define si este tercero incluye un impuesto a la venta o no cuando realiza una factura a sus propios clientes
 VATIsNotUsed=IVA no está siendo usado
@@ -439,22 +439,22 @@ ListSuppliersShort=Listado de proveedores
 ListProspectsShort=Listado de clientes potenciales
 ListCustomersShort=Listado de clientes
 ThirdPartiesArea=Área terceros y contactos
-LastModifiedThirdParties=Últimos %s terceros modificados
-UniqueThirdParties=Total de terceros únicos
+LastModifiedThirdParties=Últimos terceros %s que fueron modificados
+UniqueThirdParties=Número total de terceros
 InActivity=Activo
 ActivityCeased=Cerrado
 ThirdPartyIsClosed=El tercero está cerrado
-ProductsIntoElements=Lista de productos/servicios en %s
+ProductsIntoElements=Lista de productos / servicios asignados a %s
 CurrentOutstandingBill=Riesgo alcanzado
 OutstandingBill=Importe máximo para facturas pendientes
 OutstandingBillReached=Importe máximo para facturas pendientes
 OrderMinAmount=Importe mínimo para pedido
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=Devuelve un número con el formato %syymm-nnnn para el código de cliente y %syymm-nnnn para el código de proveedor donde aa es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin interrupción y sin retorno a 0.
 LeopardNumRefModelDesc=Código de cliente/proveedor libre sin verificación. Puede ser modificado en cualquier momento.
 ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.)
 MergeOriginThirdparty=Tercero duplicado (tercero que debe eliminar)
 MergeThirdparties=Fusionar terceros
-ConfirmMergeThirdparties=¿Está seguro de que quiere fusionar este tercero con el actual? Todos los objetos relacionados (facturas, pedidos, etc.) se moverán al tercero actual, y el tercero será eliminado.
+ConfirmMergeThirdparties=¿Está seguro de que desea fusionar el tercero elegido con el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al tercero actual, después de lo cual se eliminará el tercero elegido.
 ThirdpartiesMergeSuccess=Los terceros han sido fusionados
 SaleRepresentativeLogin=Inicio de sesión del comercial
 SaleRepresentativeFirstname=Nombre del comercial
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 55fb7c5857b..eb1f7102c6c 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Nueva remesa
 NewCheckDeposit=Nuevo ingreso
 NewCheckDepositOn=Crear nueva remesa en la cuenta: %s
 NoWaitingChecks=Sin cheques a la espera de depósito
-DateChequeReceived=Fecha recepción del cheque
+DateChequeReceived=Verifique la fecha de recepción
 NbOfCheques=Nº de cheques
 PaySocialContribution=Pagar una tasa social/fiscal
 PayVAT=Pagar una declaración de IVA
@@ -231,7 +231,7 @@ Pcg_subtype=Subtipo de cuenta
 InvoiceLinesToDispatch=Líneas de facturas a contabilizar
 ByProductsAndServices=Por productos y servicios
 RefExt=Ref. externa
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=Para crear una factura modelo, cree una factura estándar, luego, sin validarla, haga clic en el botón "%s".
 LinkedOrder=Enlazar a un pedido
 Mode1=Método 1
 Mode2=Método 2
diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
index 11fadb7ed0c..0758c67aa27 100644
--- a/htdocs/langs/es_ES/ecm.lang
+++ b/htdocs/langs/es_ES/ecm.lang
@@ -41,7 +41,7 @@ FileNotYetIndexedInDatabase=Archivo aún no indexado en la base de datos (intent
 ExtraFieldsEcmFiles=campos adicionales de archivos GED
 ExtraFieldsEcmDirectories=Campos adicionales de Directorios GED
 ECMSetup=Configuración de GED
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
+GenerateImgWebp=Duplica todas las imágenes con otra versión con formato .webp
+ConfirmGenerateImgWebp=Si confirma, generará una imagen en formato .webp para todas las imágenes que se encuentran actualmente en esta carpeta (las subcarpetas no están incluidas) ...
+ConfirmImgWebpCreation=Confirmar la duplicación de todas las imágenes
+SucessConvertImgWebp=Imágenes duplicadas correctamente
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 4ab326b7c28..958e6a8096e 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Sin errores,  es válido
 # Errors
 ErrorButCommitIsDone=Errores encontrados, pero es válido a pesar de todo
-ErrorBadEMail=E-mail %s incorrecto
-ErrorBadMXDomain=El e-mail %s parece incorrecto (el dominio no tiene un registro MX válido)
-ErrorBadUrl=Url %s inválida
+ErrorBadEMail=El correo electrónico %s es incorrecto
+ErrorBadMXDomain=El correo electrónico %s parece incorrecto (el dominio no tiene un registro MX válido)
+ErrorBadUrl=La URL %s es incorrecta
 ErrorBadValueForParamNotAString=Valor incorrecto para su parámetro. Generalmente aparece cuando no existe traducción.
 ErrorRefAlreadyExists=La referencia <b>%s</b> ya existe.
 ErrorLoginAlreadyExists=El login %s ya existe.
@@ -46,8 +46,8 @@ ErrorWrongDate=¡La fecha no es correcta!
 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=El asunto del e-mail es obligatorio
+ErrorFieldsRequired=Algunos campos obligatorios se han dejado en blanco.
+ErrorSubjectIsRequired=El asunto del correo electrónico es obligatorio.
 ErrorFailedToCreateDir=Error en la creación de un directorio. Compruebe que el usuario del servidor Web tiene derechos de escritura en los directorios de documentos de Dolibarr. Si el  parámetro <b>safe_mode</b> está activo en este PHP, Compruebe que los archivos php Dolibarr pertenecen al usuario del servidor Web.
 ErrorNoMailDefinedForThisUser=E-Mail no definido para este usuario
 ErrorSetupOfEmailsNotComplete=La configuración de los e-mailss no está completa
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=La página/contenedor <strong>%s</str
 ErrorDuringChartLoad=Error al cargar plan contable. Si no se cargaron algunas cuentas, aún puede introducirlas manualmente.
 ErrorBadSyntaxForParamKeyForContent=Sintaxis incorrecta para el parámetro keyforcontent. Debe tener un valor que comience con %s o %s
 ErrorVariableKeyForContentMustBeSet=Error, debe configurarse la constante con el nombre %s (con contenido de texto para mostrar) o %s (con url externa para mostrar).
+ErrorURLMustEndWith=La URL %s debe terminar %s
 ErrorURLMustStartWithHttp=La URL %s debe comenzar con http:// o https://
 ErrorHostMustNotStartWithHttp=El nombre de host %s NO debe comenzar con http: // o https: //
 ErrorNewRefIsAlreadyUsed=Error, la nueva referencia ya está en uso
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Disponible solo si usa una conexión segura
 WarningModuleXDisabledSoYouMayMissEventHere=El módulo %s no se ha habilitado. Así que puede perderse muchos eventos aquí.
 ErrorActionCommPropertyUserowneridNotDefined=Se requiere el propietario del usuario
 ErrorActionCommBadType=El tipo de evento seleccionado (id: %n, código: %s) no existe en el diccionario de tipo de evento
+CheckVersionFail=Error de verificación de versión
diff --git a/htdocs/langs/es_ES/eventorganization.lang b/htdocs/langs/es_ES/eventorganization.lang
new file mode 100644
index 00000000000..2ceb85f4861
--- /dev/null
+++ b/htdocs/langs/es_ES/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Organización de evento
+EventOrganizationDescription = Organización de eventos a través del proyecto de módulo
+EventOrganizationDescriptionLong= Administre la organización de eventos para conferencias, asistentes, oradores y asistentes, con una página de suscripción pública
+#
+# Menu
+#
+EventOrganizationMenuLeft = Eventos organizados
+EventOrganizationConferenceOrBoothMenuLeft = Conferencia o cabina
+
+#
+# Admin page
+#
+EventOrganizationSetup = Configuración de organización de eventos
+Settings = Configuraciones
+EventOrganizationSetupPage = Página de configuración de organización de eventos
+EVENTORGANIZATION_TASK_LABEL = Etiqueta de tareas para crear automáticamente cuando se valida el proyecto
+EVENTORGANIZATION_TASK_LABELTooltip = Cuando valida un evento organizado, algunas tareas se pueden crear automáticamente en el proyecto<br><br> Por ejemplo: <br>Enviar llamada para conferencia<br> Enviar llamada para cabina<br> Recibir llamada para conferencias<br> Recibir llamada para cabina<br> Abrir suscripciones a eventos para asistentes<br> Enviar recordatorio del evento a los oradores<br> Enviar recordatorio del evento al anfitrión del stand<br> Enviar recordatorio del evento a los asistentes
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoría para agregar a terceros creada automáticamente cuando alguien sugiere una conferencia
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categoría para agregar a terceros creada automáticamente cuando sugieren un stand
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Plantilla de correo electrónico para enviar después de recibir una sugerencia de conferencia.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Plantilla de correo electrónico para enviar después de recibir sugerencia de stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Plantilla de correo electrónico para enviar después de que se haya pagado una suscripción a un stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Plantilla de correo electrónico para enviar después de que se haya pagado una suscripción a un evento.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Plantilla de correo electrónico de acción masiva a asistentes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Plantilla de correo electrónico de acción masiva a ponentes
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrar la lista de selección de terceros en la tarjeta / formulario de creación de asistentes con categoría
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtre la lista de selección de terceros en la tarjeta / formulario de creación de asistentes con el tipo de cliente
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conferencia o cabina
+ManageOrganizeEvent = Gestionar la organización de eventos
+ConferenceOrBooth = Conferencia o cabina
+ConferenceOrBoothTab = Conferencia o cabina
+AmountOfSubscriptionPaid = Cantidad de suscripción pagada
+DateSubscription = Fecha de suscripción
+ConferenceOrBoothAttendee = Asistente a la conferencia o al stand
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Se recibió su solicitud de conferencia
+YourOrganizationEventBoothRequestWasReceived = Se recibió su solicitud de stand
+EventOrganizationEmailAskConf = Solicitud de conferencia
+EventOrganizationEmailAskBooth = Solicitud de stand
+EventOrganizationEmailSubsBooth = Suscripción para stand
+EventOrganizationEmailSubsEvent = Suscripción a un evento
+EventOrganizationMassEmailAttendees = Comunicación a los asistentes
+EventOrganizationMassEmailSpeakers = Comunicación a los ponentes
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Permitir que personas desconocidas sugieran conferencias
+AllowUnknownPeopleSuggestConfHelp=Permitir que personas desconocidas sugieran conferencias
+AllowUnknownPeopleSuggestBooth=Permitir que personas desconocidas sugieran stand
+AllowUnknownPeopleSuggestBoothHelp=Permitir que personas desconocidas sugieran stand
+PriceOfRegistration=Precio de inscripción
+PriceOfRegistrationHelp=Precio de inscripción
+PriceOfBooth=Precio de suscripción para hacer stand
+PriceOfBoothHelp=Precio de suscripción para hacer stand
+EventOrganizationICSLink=Enlace ICS para eventos
+ConferenceOrBoothInformation=Información sobre conferencias o stands
+Attendees = Asistentes
+EVENTORGANIZATION_SECUREKEY = Secure Key del enlace de registro público a una conferencia
+#
+# Status
+#
+EvntOrgDraft = Borrador
+EvntOrgSuggested = Sugirió
+EvntOrgConfirmed = Confirmado
+EvntOrgNotQualified = No calificado
+EvntOrgDone = Realizadas
+EvntOrgCancelled = Cancelado
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Enlace público de inscripción a una conferencia
+MissingOrBadSecureKey = La clave de seguridad no es válida o falta
+EvntOrgWelcomeMessage = Este formulario le permite registrarse como nuevo participante en la conferencia.
+EvntOrgStartDuration = Esta conferencia comienza el
+EvntOrgEndDuration =  y termina en
diff --git a/htdocs/langs/es_ES/knowledgemanagement.lang b/htdocs/langs/es_ES/knowledgemanagement.lang
new file mode 100644
index 00000000000..4bf312a715f
--- /dev/null
+++ b/htdocs/langs/es_ES/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Sistema de Gestión del Conocimiento
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Gestionar una base de Gestión del Conocimiento (KM) o Mesa de ayuda
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Configuración del Sistema de Gestión del Conocimiento
+Settings = Configuraciones
+KnowledgeManagementSetupPage = Página de configuración del Sistema de Gestión del Conocimiento
+
+
+#
+# About page
+#
+About = Acerca de
+KnowledgeManagementAbout = Acerca de la Gestión del Conocimiento
+KnowledgeManagementAboutPage = Gestión del Conocimiento sobre la página
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Gestión del Conocimiento
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Base de Conocimientos
+ListOfArticles = Lista de articulos
+NewKnowledgeRecord = Articulo nuevo
+ValidateReply = Validar solución
+KnowledgeRecords = Artículos
+KnowledgeRecord = Artículo
+KnowledgeRecordExtraFields = Campos adicionales para el artículo
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index a992897cd19..a1db3b633f8 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=A usuario(s)
 MailCC=Copia a
 MailToCCUsers=Copia a usuario(s)
 MailCCC=Adjuntar copia a
-MailTopic=Asunto del e-mail
+MailTopic=Asunto del email
 MailText=Mensaje
 MailFile=Archivo
 MailMessage=Texto utilizado en el cuerpo del mensaje
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No se planean notificaciones automáticas por e-mail p
 ANotificationsWillBeSent=Se enviará 1 notificación automática por e-mail
 SomeNotificationsWillBeSent=%s se enviarán notificaciones automáticas por e-mail
 AddNewNotification=Suscríbase a una nueva notificación automática por e-mail (destinatario/evento)
-ListOfActiveNotifications=Lista de todas las suscripciones activas (destinatarios/eventos) para la notificación automática por e-mail
-ListOfNotificationsDone=Lista de todas las notificaciones automáticas enviadas por e-mail
+ListOfActiveNotifications=Lista de todas las suscripciones activas (destinatarios/eventos) para notificación automática por correo electrónico
+ListOfNotificationsDone=Lista de todas las notificaciones automáticas por correo electrónico enviadas
 MailSendSetupIs=La configuración de e-mailings está a '%s'. Este modo no puede ser usado para enviar e-mails masivos.
 MailSendSetupIs2=Antes debe, con una cuenta de administrador, en el menú %sInicio - Configuración - E-Mails%s, cambiar el parámetro <strong>'%s'</strong> para usar el modo '%s'. Con este modo puede configurar un servidor SMTP de su proveedor de servicios de internet.
 MailSendSetupIs3=Si tiene preguntas de como configurar su servidor SMTP, puede contactar con %s.
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index ebe06f60a3f..722bdcd9d63 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Guardar y nuevo
 TestConnection=Probar la conexión
 ToClone=Copiar
 ConfirmCloneAsk=¿Está seguro de que quieres clonar el objeto <b>%s</b>?
-ConfirmClone=Seleccione los datos que desea copiar:
+ConfirmClone=Elija los datos que desea clonar:
 NoCloneOptionsSpecified=No hay datos definidos para copiar
 Of=de
 Go=Ir
@@ -246,7 +246,7 @@ DefaultModel=Plantilla por defecto
 Action=Acción
 About=Acerca de
 Number=Número
-NumberByMonth=Número por mes
+NumberByMonth=Total de informes por mes
 AmountByMonth=Importe por mes
 Numero=Número
 Limit=Límite
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=Usuario de la creación
-UserModif=Usuario de la última actualización
+UserAuthor=Creado por
+UserModif=Actualizado por
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Por
 From=De
 FromDate=De
 FromLocation=De
-at=a
 to=a
 To=a
+ToDate=a
+ToLocation=a
+at=a
 and=y
 or=o
 Other=Otro
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=¿Está seguro de que desea asignar las etiquetas a los
 CategTypeNotFound=No se encontró ningún tipo de etiqueta para el tipo de registros
 CopiedToClipboard=Copiado al portapapeles
 InformationOnLinkToContract=Esta cantidad es solo el total de todas las líneas del contrato. No se toma en consideración ninguna noción de tiempo.
+ConfirmCancel=Estas seguro que quieres cancelar
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index 656b756efad..5305d1bf4a8 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razones de seguridad, debe poseer los derechos de modificación de todos los usuarios para poder vincular un miembro a un usuario que no sea usted mismo.
 SetLinkToUser=Vincular a un usuario Dolibarr
 SetLinkToThirdParty=Vincular a un tercero Dolibarr
-MembersCards=Carnés de miembros
+MembersCards=Tarjetas de visita para miembros
 MembersList=Listado de miembros
 MembersListToValid=Listado de miembros borrador (a validar)
 MembersListValid=Listado de miembros validados
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Miembros a la espera de recibir afiliación
 MembersWithSubscriptionToReceiveShort=Suscripción a recibir
 DateSubscription=Fecha afiliación
 DateEndSubscription=Fecha fin afiliación
-EndSubscription=Fin afiliación
+EndSubscription=Finaliza la suscripción
 SubscriptionId=ID afiliación
 WithoutSubscription=Sin suscripción
 MemberId=ID miembro
@@ -83,9 +83,9 @@ WelcomeEMail=Email de bienvenida
 SubscriptionRequired=Sujeto a cotización
 DeleteType=Eliminar
 VoteAllowed=Voto autorizado
-Physical=Físico
-Moral=Jurídico
-MorAndPhy=Moral y Físico
+Physical=Individual
+Moral=Corporación
+MorAndPhy=Corporación e Individuo
 Reenable=Reactivar
 ExcludeMember=Excluir a un miembro
 ConfirmExcludeMember=¿Está seguro de que desea excluir a este miembro?
@@ -144,7 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla del e-mail a enviar a un
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla del e-mail para usar para enviar e-mail a un miembro en un nuevo registro de suscripción
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla del e-mail a enviar cuando una membresía esté a punto de expirar
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla del e-mail a enviar a un miembro cuando un miembro se de de baja
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Plantilla de correo electrónico que se utilizará para enviar un correo electrónico a un miembro sobre la exclusión de miembros
 DescADHERENT_MAIL_FROM=E-mail emisor para los e-mails automáticos
 DescADHERENT_ETIQUETTE_TYPE=Formato páginas etiquetas
 DescADHERENT_ETIQUETTE_TEXT=Texto a imprimir en la dirección de las etiquetas de cada miembro
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Estadísticas de miembros por país
 MembersStatisticsByState=Estadísticas de miembros por departamento/provincia/región
 MembersStatisticsByTown=Estadísticas de miembros por población
 MembersStatisticsByRegion=Estadísticas de miembros por región
-NbOfMembers=Número de miembros
-NbOfActiveMembers=Número de miembros activos actuales
+NbOfMembers=Número total de miembros
+NbOfActiveMembers=Número total de miembros activos actuales
 NoValidatedMemberYet=Ningún miembro validado encontrado
-MembersByCountryDesc=Esta pantalla presenta una estadística del número de miembros por países. Sin embargo, el gráfico utiliza el servicio en línea  de gráficos de Google y sólo es operativo cuando se encuentra disponible una conexión a Internet.
-MembersByStateDesc=Esta pantalla presenta una estadística del número de miembros por departamentos/provincias/regiones
-MembersByTownDesc=Esta pantalla presenta una estadística del número de miembros por población.
+MembersByCountryDesc=Esta pantalla le muestra las estadísticas de miembros por países. Los gráficos y los cuadros dependen de la disponibilidad del servicio de gráficos en línea de Google, así como de la disponibilidad de una conexión a Internet que funcione.
+MembersByStateDesc=Esta pantalla muestra estadísticas de miembros por estado / provincias / cantón.
+MembersByTownDesc=Esta pantalla muestra estadísticas de miembros por ciudad.
+MembersByNature=Esta pantalla le muestra estadísticas de miembros por naturaleza.
+MembersByRegion=Esta pantalla le muestra estadísticas de miembros por región.
 MembersStatisticsDesc=Elija las estadísticas que desea consultar...
 MenuMembersStats=Estadísticas
-LastMemberDate=Última fecha de miembro
+LastMemberDate=Última fecha de membresía
 LatestSubscriptionDate=Fecha de la última cotización
 MemberNature=Naturaleza del miembro
 MembersNature=Naturaleza de los miembros
-Public=Información pública
+Public=La información es pública
 NewMemberbyWeb=Nuevo miembro añadido. En espera de validación
 NewMemberForm=Formulario de inscripción
-SubscriptionsStatistics=Estadísticas de cotizaciones
+SubscriptionsStatistics=Estadísticas de suscripciones
 NbOfSubscriptions=Número de cotizaciones
-AmountOfSubscriptions=Importe de cotizaciones
+AmountOfSubscriptions=Cantidad recaudada de las suscripciones
 TurnoverOrBudget=Volumen de ventas (empresa) o Presupuesto (asociación o colectivo)
 DefaultAmount=Importe por defecto cotización
 CanEditAmount=El visitante puede elegir/modificar el importe de su cotización
 MEMBER_NEWFORM_PAYONLINE=Ir a la página integrada de pago en línea
 ByProperties=Por naturaleza
 MembersStatisticsByProperties=Estadísticas de los miembros por naturaleza
-MembersByNature=Esta pantalla presenta una estadística del número de miembros por naturaleza.
-MembersByRegion=Esta pantalla presenta una estadística del número de miembros por región
 VATToUseForSubscriptions=Tasa de IVA para las afiliaciones
 NoVatOnSubscription=Sin IVA para en las afiliaciones
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto usado para las suscripciones en línea en facturas: %s
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index 0974ccd8292..8d69573e1fb 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Listado de permisos definidos
 SeeExamples=Vea ejemplos aquí
 EnabledDesc=Condición para tener este campo activo (Ejemplos: 1 o $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=¿Es visible el campo? (Ejemplos: 0 = Nunca visible, 1 = Visible en la lista y crear/actualizar/ver formularios, 2 = Visible solo en la lista, 3 = Visible solo en el formulario crear/actualizar/ver (no en la lista), 4 = Visible en la lista y solo actualizar/ver formulario (no crear), 5 = Visible solo en el formulario de vista final de la lista (no crear, no actualizar)<br><br>El uso de un valor negativo significa que el campo no se muestra de forma predeterminada en la lista, pero se puede seleccionar para verlo).<br><br>Puede ser una expresión, por ejemplo:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Muestre este campo en documentos PDF compatibles, puede administrar la posición con el campo "Posición". <br/> Actualmente, conocidos modelos compatibles PDF son: eratosthene (pedidos), espadon (notas de envios), sponge (facturas), cyan (presupuesto), cornas (pedido a proveedor) <br/> <br/> <strong> Para documento: </strong> <br/> 0 = No se ven las <br/> 1 = mostrar <br/> 2 = mostrar sólo si no está vacío <br/> <br/> <strong> Para las líneas de documentos: </strong> <br/> 0 = no mostradas <br/> 1 =  se muestran en una columna <br/> 3 = se muestra en la columna de descripción de línea después de la descripción <br/> 4 = se muestra en la columna de descripción después de la descripción solo si no está vacía
+DisplayOnPdfDesc=Muestre este campo en documentos PDF compatibles, puede administrar la posición con el campo "Posición". <br> Actualmente, los modelos PDF compatibles conocidos son: eratosthene (pedido), espadon (envíos), esponja (facturas), cyan (propal / presupuesto), cornas (pedido del proveedor) <br> <br> <strong>Para el documento :</strong><br> 0= no mostrar <br>1= mostrar<br>  2 = mostrar sólo si no está vacío<br><br><strong>  Para las líneas de documentos: </strong><br>0 = no mostrar <br>1 = mostrar en una columna<br>3 = mostrar en la columna de descripción de línea después de la descripción<br>4 = mostrar en la columna de descripción después de la descripción solo si no está vacía
 DisplayOnPdf=Mostrar en PDF
 IsAMeasureDesc=¿Se puede acumular el valor del campo para obtener un total en el listado? (Ejemplos: 1 o 0)
 SearchAllDesc=¿El campo se usa para realizar una búsqueda desde la herramienta de búsqueda rápida? (Ejemplos: 1 o 0)
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index f02f402b153..e3c446ad3a9 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Instale o active la libreria GD en su PHP para poder usar es
 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 (nº de facturas o pedidos...)
+StatsByNumberOfEntities=Estadísticas por número de entidades referentes (no. De facturas, o pedidos ...)
 NumberOfProposals=Número de pedidos
 NumberOfCustomerOrders=Número de pedidos de clientes
 NumberOfCustomerInvoices=Número de facturas a clientes
@@ -245,7 +245,7 @@ NewKeyIs=Esta es su nueva contraseña para iniciar sesión
 NewKeyWillBe=Su nueva contraseña para iniciar sesión en el software será
 ClickHereToGoTo=Haga click aquí para ir a %s
 YouMustClickToChange=Sin embargo, debe hacer click primero en el siguiente enlace para validar este cambio de contraseña
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Confirmar cambio de contraseña
 ForgetIfNothing=Si usted no ha solicitado este cambio, simplemente ignore este email. Sus credenciales son guardadas de forma segura.
 IfAmountHigherThan=si el importe es mayor que <strong>%s</strong>
 SourcesRepository=Repositorio de los fuentes
@@ -289,4 +289,4 @@ PopuProp=Productos/Servicios por popularidad en Presupuestos
 PopuCom=Productos/Servicios por popularidad en Pedidos
 ProductStatistics=Estadísticas de productos/servicios
 NbOfQtyInOrders=Cantidad en pedidos
-SelectTheTypeOfObjectToAnalyze=Seleccione el tipo de objeto a analizar...
+SelectTheTypeOfObjectToAnalyze=Seleccione un objeto para ver sus estadísticas ...
diff --git a/htdocs/langs/es_ES/partnership.lang b/htdocs/langs/es_ES/partnership.lang
new file mode 100644
index 00000000000..7237b5b330c
--- /dev/null
+++ b/htdocs/langs/es_ES/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Gestión Asociaciones
+PartnershipDescription = Gestión Módulo Asociaciones
+PartnershipDescriptionLong= Gestión Módulo Asociaciones
+
+#
+# Menu
+#
+NewPartnership = Nueva Asociación
+ListOfPartnerships = Listado de Asociaciones
+
+#
+# Admin page
+#
+PartnershipSetup = Configuración Asociaciones
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Acerca de la página de Asociaciones
+
+
+#
+# Object
+#
+DatePartnershipStart=Fecha de inicio
+DatePartnershipEnd=Fecha de fin
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Borrador
+PartnershipAccepted = Aceptado
+PartnershipRefused = Rechazado
+PartnershipCanceled = Anulado
+
+PartnershipManagedFor=Los Partners son
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index 7e9513db440..d1cad5faddf 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=El número de serie %s ya se utiliza para el producto %
 TooManyQtyForSerialNumber=Solo puede tener un producto %s para el número de serie %s
 BatchLotNumberingModules=Opciones para la generación automática de productos por lotes gestionados por lotes
 BatchSerialNumberingModules=Opciones para la generación automática de productos por lotes gestionados por números de serie
-CustomMasks=Adds an option to define mask in the product card
-LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
-SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
+ManageLotMask=Máscara personalizada
+CustomMasks=Agrega una opción para definir la máscara en la ficha del producto.
+LotProductTooltip=Agrega una opción en la tarjeta del producto para definir una máscara de número de lote dedicada
+SNProductTooltip=Agrega una opción en la tarjeta del producto para definir una máscara de número de serie dedicada
 QtyToAddAfterBarcodeScan=Cantidad a agregar para cada código de barras / lote / serie escaneado
-
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 4ee991b8a18..a0007951270 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Servicios solo a la venta
 ServicesOnPurchaseOnly=Servicios solo en compra
 ServicesNotOnSell=Servicios fuera de venta y de compra
 ServicesOnSellAndOnBuy=Servicios a la venta o en compra
-LastModifiedProductsAndServices=Los %s últimos productos/servicios registrados
+LastModifiedProductsAndServices=Últimos productos / servicios %s que fueron modificados
 LastRecordedProducts=Últimos %s productos registrados
 LastRecordedServices=Últimos %s servicios registrados
 CardProduct0=Producto
@@ -73,7 +73,7 @@ SellingPrice=Precio de venta
 SellingPriceHT=PVP sin IVA
 SellingPriceTTC=PVP con IVA
 SellingMinPriceTTC=Precio mínimo de venta (IVA incluido)
-CostPriceDescription=Este precio (sin IVA) se puede utilizar para almacenar la cantidad promedio de este costo del producto para su empresa. Puede ser cualquier precio calculado por usted, por ejemplo, desde el precio medio de compra, más costo promedio de producción y distribución.
+CostPriceDescription=Este campo de precio (sin impuestos) se puede utilizar para capturar el monto promedio que este producto le cuesta a su empresa. Puede ser cualquier precio que calcule usted mismo, por ejemplo, del precio de compra promedio más el costo promedio de producción y distribución.
 CostPriceUsage=Este valor puede usarse para el cálculo de márgenes
 SoldAmount=Importe ventas
 PurchasedAmount=Importe compras
@@ -157,11 +157,11 @@ ListServiceByPopularity=Listado de servicios por popularidad
 Finished=Producto manufacturado
 RowMaterial=Materia prima
 ConfirmCloneProduct=¿Está seguro de querer clonar el producto o servicio <b>%s</b>?
-CloneContentProduct=Clonar solamente la información general del producto/servicio
+CloneContentProduct=Clonar toda la información principal del producto / servicio
 ClonePricesProduct=Clonar precios
 CloneCategoriesProduct=Clonar etiquetas/categorías vinculadas
-CloneCompositionProduct=Clonar producto/servicio virtual
-CloneCombinationsProduct=Clonar variantes de producto
+CloneCompositionProduct=Clonar productos/servicios virtuales
+CloneCombinationsProduct=Clonar las variantes del producto
 ProductIsUsed=Este producto es utilizado
 NewRefForClone=Ref. del nuevo producto/servicio
 SellingPrices=Precios de venta
@@ -172,10 +172,10 @@ SuppliersPricesOfProductsOrServices=Precios de proveedores (productos o servicio
 CustomCode=Aduanas|Producto|Código HS
 CountryOrigin=País de origen
 RegionStateOrigin=Región de origen
-StateOrigin=Estado|Provincia de origen
+StateOrigin=Estado | Provincia de origen
 Nature=Naturaleza del producto (materia prima/producto acabado)
 NatureOfProductShort=Naturaleza del producto
-NatureOfProductDesc=Materia prima o producto terminado
+NatureOfProductDesc=Materia prima o producto manufacturado
 ShortLabel=Etiqueta corta
 Unit=Unidad
 p=u.
@@ -314,7 +314,7 @@ LastUpdated=Última actualización
 CorrectlyUpdated=Actualizado correctamente
 PropalMergePdfProductActualFile=Archivos que se usan para añadir en el PDF Azur son
 PropalMergePdfProductChooseFile=Seleccione los archivos PDF
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=Incluir productos / servicios con etiqueta
 DefaultPriceRealPriceMayDependOnCustomer=Precio por defecto, el precio real puede depender del cliente
 WarningSelectOneDocument=Seleccione al menos un documento
 DefaultUnitToShow=Unidad
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index c3d001e9b7a..7674ee768d2 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -10,19 +10,19 @@ 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 está limitada a aquellos proyectos en los que usted es un contacto
+MyProjectsDesc=Esta vista está limitada a los proyectos para los que es contacto.
 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.
 ProjectsPublicTaskDesc=Esta vista muestra todos los proyectos a los que tiene derecho a visualizar.
 ProjectsDesc=Esta vista muestra todos los proyectos (sus permisos de usuario le permiten tener una visión completa).
 TasksOnProjectsDesc=Esta vista muestra todos los proyectos (sus permisos de usuario le permiten tener una visión completa).
-MyTasksDesc=Esta vista se limita a los proyectos o tareas en los que usted es un contacto
+MyTasksDesc=Esta vista está limitada a los proyectos o tareas para los que es contacto.
 OnlyOpenedProject=Sólo los proyectos abiertos son visibles (los proyectos en estado borrador cerrado no son visibles).
 ClosedProjectsAreHidden=Los proyectos cerrados no son visibles.
 TasksPublicDesc=Esta vista muestra todos los proyectos y tareas en los que usted tiene derecho a tener visibilidad.
 TasksDesc=Esta vista muestra todos los proyectos y tareas (sus permisos de usuario le permiten tener una visión completa).
 AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas de este proyecto son visibles, pero solo puede indicar tiempos en las tareas que tenga asignadas. Asígnese 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.
+OnlyYourTaskAreVisible=Solo las tareas asignadas a usted son visibles. Si necesita ingresar el tiempo en una tarea y si la tarea no está visible aquí, entonces debe asignarse la tarea a usted mismo.
 ImportDatasetTasks=Tareas de proyectos
 ProjectCategories=Etiquetas/categorías de proyectos
 NewProject=Nuevo proyecto
@@ -89,7 +89,7 @@ TimeConsumed=Consumido
 ListOfTasks=Listado de tareas
 GoToListOfTimeConsumed=Ir al listado de tiempos consumidos
 GanttView=Vista de Gantt
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListWarehouseAssociatedProject=Lista de almacenes asociados al proyecto
 ListProposalsAssociatedProject=Listado de presupuestos asociados al proyecto
 ListOrdersAssociatedProject=Listado de pedidos de clientes asociados al proyecto
 ListInvoicesAssociatedProject=Listado de facturas a clientes asociadas al proyecto
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=No asignado a la tarea
 NoUserAssignedToTheProject=Ningún usuario asignado a este proyecto
 TimeSpentBy=Tiempo dedicado por
 TasksAssignedTo=Tareas asignadas a
-AssignTaskToMe=Asignarme tarea
+AssignTaskToMe=Asignarme una tarea a mí mismo
 AssignTaskToUser=Asignar la tarea a %s
 SelectTaskToAssign=Seleccione tarea a asignar...
 AssignTask=Asignar
diff --git a/htdocs/langs/es_ES/recruitment.lang b/htdocs/langs/es_ES/recruitment.lang
index 26cacddf8cc..9d0d7e1e38a 100644
--- a/htdocs/langs/es_ES/recruitment.lang
+++ b/htdocs/langs/es_ES/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Gracias por su aplicación. <br> ...
 JobClosedTextCandidateFound=El puesto de trabajo esta cerrado. El puesto ha sido ocupado.
 JobClosedTextCanceled=El puesto de trabajo esta cerrado
 ExtrafieldsJobPosition=Campos adicionales (puestos de trabajo)
-ExtrafieldsCandidatures=Campos adicionales (solicitudes de empleo)
+ExtrafieldsApplication=Campos adicionales (solicitudes de empleo)
 MakeOffer=Realizar un presupuesto
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index f45396f7142..abe09942b83 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=¿Está seguro de querer validar esta expedición con la
 ConfirmCancelSending=¿Está seguro de querer anular esta expedición?
 DocumentModelMerou=Modelo Merou A5
 WarningNoQtyLeftToSend=Alerta, ningún producto en espera de envío.
-StatsOnShipmentsOnlyValidated=Estadísticas realizadas únicamente sobre las expediciones validadas
+StatsOnShipmentsOnlyValidated=Las estadísticas son solo para envíos validados. La fecha utilizada es la fecha de validación del envío (la fecha de entrega planificada no siempre se conoce)
 DateDeliveryPlanned=Fecha prevista de entrega
 RefDeliveryReceipt=Ref. nota de entrega
 StatusReceipt=Estado nota de entrega
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index aa551813b9c..9a7b3c823da 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Stock faltante
 StockAtDate=Stock a fecha
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+StockAtDateInPast=Fecha en el pasado
+StockAtDateInFuture=Fecha en el futuro
 StocksByLotSerial=Stocks por lotes/serie
 LotSerial=Lotes/Series
 LotSerialList=Listado de lotes/series
@@ -37,8 +37,8 @@ AllWarehouses=Todos los almacenes
 IncludeEmptyDesiredStock=Incluir también stock negativo con stock deseado indefinido
 IncludeAlsoDraftOrders=Incluir también pedidos borrador
 Location=Lugar
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=Nombre corto de la ubicación
+NumberOfDifferentProducts=Número de productos únicos
 NumberOfProducts=Numero total de productos
 LastMovement=Último movimiento
 LastMovements=Últimos movimientos
@@ -91,14 +91,14 @@ NoPredefinedProductToDispatch=No hay productos predefinidos en este objeto. Por
 DispatchVerb=Validar recepción
 StockLimitShort=Límite para alerta
 StockLimit=Stock límite para alertas
-StockLimitDesc=(vacío) significa que no hay advertencia. <br> 0 puede utilizarse para una advertencia tan pronto como el material se acabe.
+StockLimitDesc=(vacío) significa que no hay advertencia. <br> 0 se puede utilizar para activar una advertencia tan pronto como el stock esté vacío.
 PhysicalStock=Stock físico
 RealStock=Stock real
 RealStockDesc=El stock físico o real es la stock que tiene actualmente en sus almacenes.
 RealStockWillAutomaticallyWhen=El stock real cambiará automáticamente de acuerdo con esta regla (según configuración del módulo de stock):
 VirtualStock=Stock virtual
 VirtualStockAtDate=Stock virtual a fecha
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
+VirtualStockAtDateDesc=Stock virtual una vez finalizados todos los pedidos pendientes que están previstos para ser procesados antes de la fecha elegida
 VirtualStockDesc=El stock virtual es el stock que obtendrá una vez que todas las acciones abiertas/pendientes (que afecten al stock) serán cerradas (pedidos a proveedor del proveedor recibidos, pedidos de clientes enviados, ...)
 AtDate=En la fecha
 IdWarehouse=Id. almacén
@@ -147,7 +147,7 @@ Replenishments=Reaprovisionamiento
 NbOfProductBeforePeriod=Cantidad del producto %s en stock antes del periodo seleccionado (< %s)
 NbOfProductAfterPeriod=Cantidad del producto %s en stock después del periodo seleccionado (> %s)
 MassMovement=Movimientos en masa
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+SelectProductInAndOutWareHouse=Seleccione un almacén de origen y un almacén de destino, un producto y una cantidad y luego haga clic en "%s". Una vez hecho esto para todos los movimientos requeridos, haga clic en "%s".
 RecordMovement=Registrar transferencia
 ReceivingForSameOrder=Recepciones de este pedido
 StockMovementRecorded=Movimiento de stock registrado
@@ -238,7 +238,7 @@ StockIsRequiredToChooseWhichLotToUse=Se requiere stock para elegir qué lote usa
 ForceTo=Forzar
 AlwaysShowFullArbo=Mostrar el árbol completo del almacén en la ventana emergente de enlaces del almacén (Advertencia: esto puede disminuir drásticamente el rendimiento)
 StockAtDatePastDesc=Puede ver aquí el stock (stock real) en una fecha determinada en el pasado
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
+StockAtDateFutureDesc=Puede ver aquí el stock (stock virtual) en una fecha determinada en el futuro
 CurrentStock=Stock actual
 InventoryRealQtyHelp=Establezca el valor en 0 para restablecer la cantidad <br> Mantenga el campo vacío o elimine la línea para mantenerlo sin cambios
 UpdateByScaning=Llene la cantidad real escaneando
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index 8e59820c70a..f0727893f02 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Contraseña modificada en: %s
 SubjectNewPassword=Su nueva contraseña para %s
 GroupRights=Permisos de grupo
 UserRights=Permisos usuario
+Credentials=Cartas credenciales
 UserGUISetup=Interfaz usuario
 DisableUser=Desactivar
 DisableAUser=Desactivar un usuario
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Modificar el campo Tipo para cambiar
 OpenIDURL=Dirección OpenID
 LoginUsingOpenID=Usar OpenID para iniciar sesión
 WeeklyHours=Horas trabajadas (por semana)
-ExpectedWorkedHours=Horas previstas por semana
+ExpectedWorkedHours=Horas esperadas trabajadas por semana
 ColorUser=Color para el usuario
 DisabledInMonoUserMode=Desactivado en modo mantenimiento
 UserAccountancyCode=Código contable usuario
@@ -115,7 +116,7 @@ DateOfEmployment=Fecha empleo
 DateEmployment=Empleo
 DateEmploymentstart=Fecha de inicio de empleo
 DateEmploymentEnd=Fecha de finalización de empleo
-RangeOfLoginValidity=Rango de fechas de validez de inicio de sesión
+RangeOfLoginValidity=Intervalo de fechas de validez de acceso
 CantDisableYourself=No puede deshabilitar su propio registro de usuario
 ForceUserExpenseValidator=Forzar validador de informes de gastos
 ForceUserHolidayValidator=Forzar validador de solicitud de días libres
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index 673c7f003f8..b8d6f149b3f 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Defina la lista de todos los idiomas
 GenerateSitemaps=Generar archivo de mapa del sitio del sitio web
 ConfirmGenerateSitemaps=Si confirma, borrará el archivo de mapa del sitio existente ...
 ConfirmSitemapsCreation=Confirmar la generación del mapa del sitio
-SitemapGenerated=Mapa del sitio generado
+SitemapGenerated=Archivo de mapa del sitio <b> %s </b> generado
 ImportFavicon=Favicon
 ErrorFaviconType=El favicon debe ser png
-ErrorFaviconSize=El favicon debe tener un tamaño de 32x32
-FaviconTooltip=Sube una imagen que debe ser un png de 32x32
+ErrorFaviconSize=El favicon debe tener un tamaño de 16x16, 32x32 o 64x64
+FaviconTooltip=Sube una imagen que debe ser png (16x16, 32x32 o 64x64)
diff --git a/htdocs/langs/es_GT/accountancy.lang b/htdocs/langs/es_GT/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/es_GT/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/es_GT/admin.lang b/htdocs/langs/es_GT/admin.lang
index 619ae5f8bd4..c1d306ec390 100644
--- a/htdocs/langs/es_GT/admin.lang
+++ b/htdocs/langs/es_GT/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_GT/cron.lang b/htdocs/langs/es_GT/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/es_GT/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_GT/modulebuilder.lang b/htdocs/langs/es_GT/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_GT/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_GT/website.lang b/htdocs/langs/es_GT/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/es_GT/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_HN/accountancy.lang b/htdocs/langs/es_HN/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/es_HN/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/es_HN/admin.lang b/htdocs/langs/es_HN/admin.lang
index 619ae5f8bd4..c1d306ec390 100644
--- a/htdocs/langs/es_HN/admin.lang
+++ b/htdocs/langs/es_HN/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_HN/cron.lang b/htdocs/langs/es_HN/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/es_HN/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_HN/modulebuilder.lang b/htdocs/langs/es_HN/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_HN/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_HN/website.lang b/htdocs/langs/es_HN/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/es_HN/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index d5919ef1940..ecc278b53f1 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -82,6 +82,7 @@ XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna c
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la ordenación de la página "Enlazar para hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la ordenación de la página "Enlace realizado" por los elementos más recientes
 BANK_DISABLE_DIRECT_INPUT=Deshabilitar el registro directo de la transacción en la cuenta bancaria
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario de varios
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diario de reporte de gastos
 ACCOUNTING_SOCIAL_JOURNAL=Diario Social
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index afc2e0f6850..82b028ae8c2 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -24,6 +24,7 @@ ConfirmLockNewSessions=¿Estás seguro de querer restringir cualquier nueva cone
 UnlockNewSessions=Remover bloqueo de conexión
 YourSession=Tu sesión
 WebUserGroup=Usuario/Grupo del servidor web
+PermissionsOnFiles=Permisos en ficheros
 NoSessionFound=Tu configuración PHP no parece permitir listar sesiones activas. El directorio usado para guardar sesiones (<b>%s</b>) podría estar protegido (Por ejemplo, por permisos del SO o por la directiva PHP open_basedir).
 DBStoringCharset=Charset de la base de datos para almacenar información
 DBSortingCharset=Charset de la base de datos para clasificar información
@@ -227,7 +228,6 @@ Module3400Name=Redes Sociales
 DictionaryAccountancyJournal=Diarios de contabilidad
 DictionarySocialNetworks=Redes Sociales
 Upgrade=Actualizar
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 LDAPFieldFirstName=Nombre(s)
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que este directorio sea procesado por Dolibarr, debe configurar su <strong> conf/conf.php </strong> para agregar las 2 líneas de directiva: <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
@@ -237,3 +237,4 @@ MailToSendSupplierOrder=Ordenes de compra
 MailToSendSupplierInvoice=Facturas de proveedor
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+MailToSendEventOrganization=Organización de Eventos
diff --git a/htdocs/langs/es_MX/agenda.lang b/htdocs/langs/es_MX/agenda.lang
index 285a00342d7..2dda1145955 100644
--- a/htdocs/langs/es_MX/agenda.lang
+++ b/htdocs/langs/es_MX/agenda.lang
@@ -1,20 +1,27 @@
 # Dolibarr language file - Source file is en_US - agenda
+LocalAgenda=Calendario predeterminado
 ActionsOwnedBy=Evento propiedad de
 Event=Evento
 ListOfActions=Lista de eventos
+EventReports=Informes de evento
+ToUserOfGroup=Evento Asignado a cualquier usuario del grupo
 EventOnFullDay=Evento de todo el día(s)
 MenuToDoActions=Todos los eventos incompletos
 MenuDoneActions=Todos los eventos finalizados
 MenuDoneMyActions=Mis eventos finalizados
-ListOfEvents=Lista de eventos (calendario interno)
+ListOfEvents=Lista de eventos (calendario predeterminado)
 ActionsAskedBy=Eventos reportados por
 ActionsDoneBy=Eventos realizado por
 ViewCal=Vista del mes
 ViewDay=Vista de día
 ViewWeek=Vista de la semana
+ViewPerType=Por tipo de vista
 AutoActions=Llenado automático
+AgendaAutoActionDesc=Aquí usted puede definir los eventos que desee que Dolibarr cree automáticamente en la Agenda. Si no se marca nada, solo las acciones manuales serán incluidas en los registros mostrados en la Agenda. El seguimiento automático de acciones comerciales realizadas en los objetos (validación y cambio de estado), serán descartados.
+AgendaSetupOtherDesc=Esta página ofrece opciones para permitir la exportación de sus eventos Dolibarr hacia un calendario externo (Thunderbird,Google Calendar etc...)
 AgendaExtSitesDesc=Esta página permite declarar las fuentes externas de calendarios para ver sus eventos en la agenda de Dolibarr.
 ActionsEvents=Eventos para los que Dolibarr creará una acción en la agenda de forma automática
+EventRemindersByEmailNotEnabled=Los Recordatorios de evento por correo electrónico no se habilitaron en el %s módulo de configuración.
 PropalValidatedInDolibarr=Propuesta %s validada
 InvoiceValidatedInDolibarrFromPos=Factura %s validada desde POS
 InvoiceBackToDraftInDolibarr=Regresar factura %s al estado de borrador
diff --git a/htdocs/langs/es_MX/banks.lang b/htdocs/langs/es_MX/banks.lang
index 7b80764b478..c8862b7df06 100644
--- a/htdocs/langs/es_MX/banks.lang
+++ b/htdocs/langs/es_MX/banks.lang
@@ -48,7 +48,6 @@ DateConciliating=Fecha de conciliación
 SocialContributionPayment=Pago de impuesto social/fiscal
 TransferFromToDone=La transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s ha sido registrada.
 ValidateCheckReceipt=¿Validar este recibo de cheque?
-ConfirmValidateCheckReceipt=¿Está seguro de que desea validar este recibo de cheques, ningún cambio será posible una vez hecho esto?
 DeleteCheckReceipt=¿Eliminar este recibo de cheque?
 BankChecks=Cheques bancarios
 BankChecksToReceipt=Cheques en espera de depósito
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 180ac68ceaf..bfe19515ec7 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -2,9 +2,7 @@
 ErrorCompanyNameAlreadyExists=El nombre de la empresa %s ya existe. Elige uno diferente.
 ErrorSetACountryFirst=Ajusta primero el país
 SelectThirdParty=Selecciona un tercero
-ConfirmDeleteCompany=¿Estás seguro que quieres borrar esta compañía y toda la información relacionada?
 DeleteContact=Eliminar un contacto/dirección
-ConfirmDeleteContact=¿Estás seguro que quieres borrar este contacto y toda la información heredada?
 NewCompany=Nueva compañía (cliente potencial, cliente, proveedor)
 NewThirdParty=Nuevo tercero (cleinte potencial, cliente, proveedor)
 CreateThirdPartyAndContact=Crear un tercero + un contacto hijo
@@ -29,13 +27,11 @@ Firstname=Nombre(s)
 State=Estado/Provincia
 CountryCode=Código de país
 CountryId=ID de país
-PhonePro=Teléfono trabajo
 PhonePerso=Teléfono particular
 PhoneMobile=Celular
 No_Email=Rechazar correos masivos
 Town=Ciudad
 Web=Página de internet
-DefaultLang=Idioma predeterminado
 VATIsUsed=Impuesto a las ventas utilizado
 VATIsUsedWhenSelling=Esto define si este tercero incluye un impuesto de venta o no cuando realiza una factura a sus propios clientes
 VATIsNotUsed=No se utiliza impuesto sobre las ventas
@@ -147,7 +143,6 @@ CustomerCodeDesc=Código de cliente, único para todos los clientes
 SupplierCodeDesc=Código de proveedor, único para todos los proveedores
 RequiredIfCustomer=Requerido si el tercero es un cliente o cliente potencial
 RequiredIfSupplier=Requerido si el tercero es un proveedor
-ValidityControledByModule=Validez controlada por el módulo
 ThisIsModuleRules=Reglas para este módulo
 CompanyDeleted=Empresa "%s" eliminada de la base de datos.
 ListOfContacts=Lista de contactos/direcciones
@@ -207,8 +202,6 @@ ListSuppliersShort=Lista de proveedores
 ListProspectsShort=Lista de clientes potenciales
 ListCustomersShort=Lista de clientes
 ThirdPartiesArea=Terceros/Contactos
-LastModifiedThirdParties=Último %s modificado Terceros
-UniqueThirdParties=Total de terceros
 InActivity=Abierta
 OutstandingBillReached=Max. para la cuenta pendiente alcanzada
 OrderMinAmount=Cantidad mínima por pedido
@@ -216,7 +209,6 @@ LeopardNumRefModelDesc=El código es libre. Este código puede ser modificado en
 ManagingDirectors=Administrador(es) (CEO, Director, Presidente...)
 MergeOriginThirdparty=Tercero duplicado (tercero que deseas eliminar)
 MergeThirdparties=Combinar terceros
-ConfirmMergeThirdparties=¿Seguro que deseas combinar este tercero con el tercero actual? Todos los objetos vinculados (facturas, pedidos, ...) de este tercero serán trasladados al tercero actual y despues se eliminara el tercero.
 ThirdpartiesMergeSuccess=Se han fusionado los terceros
 SaleRepresentativeLogin=Inicio de sesión del representante de ventas
 SaleRepresentativeFirstname=Nombre del representante de ventas
diff --git a/htdocs/langs/es_MX/errors.lang b/htdocs/langs/es_MX/errors.lang
index a1307643505..8ecba476ee2 100644
--- a/htdocs/langs/es_MX/errors.lang
+++ b/htdocs/langs/es_MX/errors.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - errors
-ErrorSubjectIsRequired=El tema del correo electrónico es obligatorio
 ErrorFieldAccountNotDefinedForLine=Valor para la cuenta contable no definido para la línea (%s)
 ErrorTooManyErrorsProcessStopped=Demasiados errores. Se detuvo el proceso.
diff --git a/htdocs/langs/es_MX/eventorganization.lang b/htdocs/langs/es_MX/eventorganization.lang
new file mode 100644
index 00000000000..bcb01e7daa4
--- /dev/null
+++ b/htdocs/langs/es_MX/eventorganization.lang
@@ -0,0 +1,13 @@
+# Dolibarr language file - Source file is en_US - eventorganization
+ModuleEventOrganizationName =Organización de Eventos
+EventOrganizationDescription =Organización de Eventos a través el Módulo de Proyectos
+EventOrganizationDescriptionLong=Administrar organización de evento para conferencias, participantes, presentador, y participantes, con página de suscripción pública
+EventOrganizationConferenceOrBoothMenuLeft =Conferencia o Puesto
+EventOrganizationSetup =Configuración de Organización de Evento
+EventOrganizationSetupPage =Página de organización de evento
+EVENTORGANIZATION_TASK_LABEL =Etiqueta de tareas para crear automáticamente cuando el proyecto sea validado
+EVENTORGANIZATION_TASK_LABELTooltip =Cuando validas un evento organizado, algunas tareas pueden ser creadas automáticamente en el proyecto<br><br>Por ejemplo:<br>
+EventOrganizationConfOrBooth=Conferencia o Puesto
+ConferenceOrBooth =Conferencia o Puesto
+ConferenceOrBoothTab =Conferencia o Puesto
+EvntOrgDone =Hecho
diff --git a/htdocs/langs/es_MX/modulebuilder.lang b/htdocs/langs/es_MX/modulebuilder.lang
index 82299e4a90a..4805c2fa2c0 100644
--- a/htdocs/langs/es_MX/modulebuilder.lang
+++ b/htdocs/langs/es_MX/modulebuilder.lang
@@ -9,4 +9,3 @@ PageForList=Página PHP para la lista de registro
 PathToModulePackage=Ruta del módulo/aplicación zip
 SpaceOrSpecialCharAreNotAllowed=No se permiten espacios ni caracteres especiales.
 FileNotYetGenerated=Archivo aún no generado
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_MX/partnership.lang b/htdocs/langs/es_MX/partnership.lang
new file mode 100644
index 00000000000..e5a790d439e
--- /dev/null
+++ b/htdocs/langs/es_MX/partnership.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - partnership
+DatePartnershipEnd=Fecha de finalización
+PartnershipCanceled =Cancelado
diff --git a/htdocs/langs/es_MX/recruitment.lang b/htdocs/langs/es_MX/recruitment.lang
index fdb6a07d8e8..633d82bdb93 100644
--- a/htdocs/langs/es_MX/recruitment.lang
+++ b/htdocs/langs/es_MX/recruitment.lang
@@ -2,9 +2,32 @@
 ModuleRecruitmentName =Reclutamiento
 ModuleRecruitmentDesc =Gestione y de seguimiento a campañas de reclutamiento para nuevos puestos de trabajo.
 RecruitmentSetup =Configuración de reclutamiento
+RecruitmentSetupPage =Ingrese aquí la configuración de las principales opciones para el módulo de reclutamiento
 RecruitmentArea=Área de reclutamiento
+PublicInterfaceRecruitmentDesc=Las páginas públicas de trabajos son URL públicas para mostrar y responder a vacantes. Hay un enlace diferente para cada vacante, que se encuentra en cada registro de trabajo.
+EnablePublicRecruitmentPages=Habilitar paginas publicas de vacantes abiertas
 RecruitmentAbout =Sobre el reclutamiento
 RecruitmentAboutPage =Página acerca de reclutamiento
 NbOfEmployeesExpected=Número esperado de empleados
 ResponsibleOfRecruitement=Responsable de reclutamiento
 IfJobIsLocatedAtAPartner=Si el trabajo se encuentra en un el lugar de un asociado
+ListOfPositionsToBeFilled=Lista de puestos de trabajo
+JobOfferToBeFilled=Puesto de trabajo a cubrir
+ContactForRecruitment=Contacto para contratación
+EmailRecruiter=Correo electrónico de Reclutador
+ToUseAGenericEmail=Utilizar un correo electrónico genérico. Si no se define, se utilizará el correo electrónico del responsable de contratación.
+NewCandidature=Nueva solicitud
+ListOfCandidatures=Lista de solicitudes
+RequestedRemuneration=Sueldo solicitado
+ProposedRemuneration=Sueldo propuesto
+RecruitmentCandidature=Solicitud
+RecruitmentCandidatures=Solicitudes
+InterviewToDo=Entrevista para hacer
+AnswerCandidature=Respuesta a la solicitud
+YourCandidature=Tu solicitud
+YourCandidatureAnswerMessage=Gracias por su solicitud. <br>...
+JobClosedTextCandidateFound=La vacante esta cerrada. Este puesto ya fue cubierto.
+JobClosedTextCanceled=La vacante esta cerrada.
+ExtrafieldsJobPosition=Atributos complementarios (puestos de trabajo)
+ExtrafieldsApplication=Atributos complementarios (solicitudes de empleo)
+MakeOffer=Hacer una oferta
diff --git a/htdocs/langs/es_MX/website.lang b/htdocs/langs/es_MX/website.lang
index 92219c9ce78..ff12c0bdb52 100644
--- a/htdocs/langs/es_MX/website.lang
+++ b/htdocs/langs/es_MX/website.lang
@@ -1,5 +1,3 @@
 # Dolibarr language file - Source file is en_US - website
 NoPageYet=Sin páginas aun
 GrabImagesInto=Insertar también las imágenes encontradas en CSS y página.
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_PA/accountancy.lang b/htdocs/langs/es_PA/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/es_PA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index b6ade31f4f5..f0c05a924c9 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionUnknown=Desconocido
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PA/cron.lang b/htdocs/langs/es_PA/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/es_PA/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_PA/modulebuilder.lang b/htdocs/langs/es_PA/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_PA/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_PA/website.lang b/htdocs/langs/es_PA/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/es_PA/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index cf9e532ffbf..f41b76f9342 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -32,6 +32,7 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comienza la clasificación de la página "
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de los productos y servicios en los listados después de los caracteres x (mejor = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar el formulario de descripción de la cuenta de producto y servicios en los listados después de los caracteres x (mejor = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas de contabilidad general (si establece el valor a 6 aquí, la cuenta '706' aparecerá como '706000' en la pantalla)
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_SELL_JOURNAL=Diario de Venta
 ACCOUNTING_PURCHASE_JOURNAL=Diario de Compra
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario diverso
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index c5149bbb2de..6ab8ad59b97 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -6,7 +6,6 @@ Permission91=Consultar impuestos e IGV
 Permission92=Crear/modificar impuestos e IGV
 Permission93=Eliminar impuestos e IGV
 DictionaryVAT=Tasa de IGV o tasa de impuesto a las ventas
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
 OptionVatMode=IGV adeudado
 MailToSendInvoice=Facturas de Clientes
diff --git a/htdocs/langs/es_PE/assets.lang b/htdocs/langs/es_PE/assets.lang
index 7eee01f4abb..401ea0f53af 100644
--- a/htdocs/langs/es_PE/assets.lang
+++ b/htdocs/langs/es_PE/assets.lang
@@ -1,2 +1,5 @@
 # Dolibarr language file - Source file is en_US - assets
 DeleteType=Borrar
+Settings =Configuración
+MenuListAssets =Lista
+MenuListTypeAssets =Lista
diff --git a/htdocs/langs/es_PE/intracommreport.lang b/htdocs/langs/es_PE/intracommreport.lang
index 76825d9b4ab..8bfe2e7c4a4 100644
--- a/htdocs/langs/es_PE/intracommreport.lang
+++ b/htdocs/langs/es_PE/intracommreport.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - intracommreport
-IntracommReportPeriod=Period of nalysis
+MenuIntracommReportList=Lista
diff --git a/htdocs/langs/es_PE/knowledgemanagement.lang b/htdocs/langs/es_PE/knowledgemanagement.lang
new file mode 100644
index 00000000000..b6f2a0b04a7
--- /dev/null
+++ b/htdocs/langs/es_PE/knowledgemanagement.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - knowledgemanagement
+KnowledgeManagementAbout =Acerca de Gestión del Conocimiento
+KnowledgeManagementAboutPage =Sobre la página de Gestión del Conocimiento
diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
index 256d3198c63..4740d8aa1c4 100644
--- a/htdocs/langs/es_PE/main.lang
+++ b/htdocs/langs/es_PE/main.lang
@@ -44,7 +44,6 @@ Save=Guardar
 SaveAs=Guardar Como
 TestConnection=Prueba de conexión
 ToClone=Duplicar
-ConfirmClone=Seleccione los datos que desea duplicar:
 NoCloneOptionsSpecified=No ha definido los datos a duplicar.
 Run=Ejecutar
 Show=Mostrar
@@ -64,6 +63,7 @@ LT2=Impuesto 3
 LT2Type=Tipo de impuesto 3
 VATRate=Tasa Impuesto
 VATCode=Código de la Tasa del Impuesto
+List=Lista
 Opened=Abrir
 SearchIntoMO=Órdenes de Fabricación
 SearchIntoCustomerInvoices=Facturas de Clientes
diff --git a/htdocs/langs/es_PE/modulebuilder.lang b/htdocs/langs/es_PE/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_PE/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_PE/stocks.lang b/htdocs/langs/es_PE/stocks.lang
index 1a973f55756..517409f5632 100644
--- a/htdocs/langs/es_PE/stocks.lang
+++ b/htdocs/langs/es_PE/stocks.lang
@@ -9,4 +9,5 @@ MovementLabel=Etiqueta de movimiento
 MovementCorrectStock=Corrección de stock del producto %s
 inventoryEdit=Editar
 AddProduct=Agregar
+ListInventory=Lista
 DisableStockChangeOfSubProduct=Desactiva el cambio de stock para todos los productos de este Kit durante este movimiento.
diff --git a/htdocs/langs/es_PE/ticket.lang b/htdocs/langs/es_PE/ticket.lang
index 9b8429210d8..1f39a627933 100644
--- a/htdocs/langs/es_PE/ticket.lang
+++ b/htdocs/langs/es_PE/ticket.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - ticket
 Read=Leer
 Type=Tipo
+TicketSettings=Configuración
 TicketNewEmailBodyInfosTrackUrl=Puedes ver la progresión del ticket haciendo click sobre el seguimiento del ticket.
diff --git a/htdocs/langs/es_PE/website.lang b/htdocs/langs/es_PE/website.lang
index 344f2e6ae70..85fd95deb49 100644
--- a/htdocs/langs/es_PE/website.lang
+++ b/htdocs/langs/es_PE/website.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - website
 ReadPerm=Leer
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/es_PY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index 619ae5f8bd4..c1d306ec390 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PY/cron.lang b/htdocs/langs/es_PY/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/es_PY/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_PY/modulebuilder.lang b/htdocs/langs/es_PY/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_PY/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_PY/website.lang b/htdocs/langs/es_PY/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/es_PY/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_US/accountancy.lang b/htdocs/langs/es_US/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/es_US/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/es_US/admin.lang b/htdocs/langs/es_US/admin.lang
index 619ae5f8bd4..c1d306ec390 100644
--- a/htdocs/langs/es_US/admin.lang
+++ b/htdocs/langs/es_US/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_US/cron.lang b/htdocs/langs/es_US/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/es_US/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_US/modulebuilder.lang b/htdocs/langs/es_US/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_US/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_US/website.lang b/htdocs/langs/es_US/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/es_US/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_UY/accountancy.lang b/htdocs/langs/es_UY/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/es_UY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/es_UY/admin.lang b/htdocs/langs/es_UY/admin.lang
index 619ae5f8bd4..c1d306ec390 100644
--- a/htdocs/langs/es_UY/admin.lang
+++ b/htdocs/langs/es_UY/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_UY/cron.lang b/htdocs/langs/es_UY/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/es_UY/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/es_UY/modulebuilder.lang b/htdocs/langs/es_UY/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_UY/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_UY/website.lang b/htdocs/langs/es_UY/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/es_UY/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/es_VE/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 74b465f966a..271cb2be3a5 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -4,6 +4,7 @@ VersionLastUpgrade=Última actualización de la versión
 ConfirmPurgeSessions=¿De verdad quieres purgar todas las sesiones? Esto desconectará a todos los usuarios (excepto a usted).
 SetupArea=Parametrizaje
 NotConfigured=Módulo / Aplicación no configurada
+Module1780Desc=Crear etiquetas/Categoría (Productos, clientes, proveedores, contactos y miembros)
 Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
 Permission256=Consultar sus permisos
diff --git a/htdocs/langs/es_VE/banks.lang b/htdocs/langs/es_VE/banks.lang
index 7037335c8cc..035657a53cd 100644
--- a/htdocs/langs/es_VE/banks.lang
+++ b/htdocs/langs/es_VE/banks.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - banks
 OnlyOpenedAccount=Sólo cuentas abiertas
 StatusAccountOpened=Abierta
+CheckTransmitter=Origen
diff --git a/htdocs/langs/es_VE/bills.lang b/htdocs/langs/es_VE/bills.lang
index 4e32a0119fd..2081ddfdaee 100644
--- a/htdocs/langs/es_VE/bills.lang
+++ b/htdocs/langs/es_VE/bills.lang
@@ -2,6 +2,7 @@
 BillsCustomersUnpaid=Facturas a clientes pendientes de cobro
 CreateCreditNote=Crear factura de abono
 BillShortStatusConverted=Pagada
+ConfirmClassifyPaidPartiallyReasonProductReturned=Productos parcialmente devueltos
 CustomerBillsUnpaid=Facturas a clientes pendientes de cobro
 Statut=Estatuto
 PaymentConditionShortPT_ORDER=Pedido
diff --git a/htdocs/langs/es_VE/eventorganization.lang b/htdocs/langs/es_VE/eventorganization.lang
new file mode 100644
index 00000000000..bde5dca9705
--- /dev/null
+++ b/htdocs/langs/es_VE/eventorganization.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - eventorganization
+EvntOrgDraft =A validar
diff --git a/htdocs/langs/es_VE/modulebuilder.lang b/htdocs/langs/es_VE/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/es_VE/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/es_VE/partnership.lang b/htdocs/langs/es_VE/partnership.lang
new file mode 100644
index 00000000000..c1937e30555
--- /dev/null
+++ b/htdocs/langs/es_VE/partnership.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - partnership
+DatePartnershipEnd=Fecha finalización
+PartnershipDraft =A validar
+PartnershipAccepted =Aceptada
+PartnershipRefused =Devuelta
diff --git a/htdocs/langs/es_VE/products.lang b/htdocs/langs/es_VE/products.lang
index 7c5fda8bea0..890163bca26 100644
--- a/htdocs/langs/es_VE/products.lang
+++ b/htdocs/langs/es_VE/products.lang
@@ -1,4 +1,7 @@
 # Dolibarr language file - Source file is en_US - products
-TMenuProducts=Productos y servicios
+ProductsOnSaleOnly=Productos solo a para venta
+ProductsOnPurchaseOnly=Productos solo para compra
 ProductStatusNotOnBuyShort=Fuera compra
+ExportDataset_produit_1=Productos
 PriceExpressionEditorHelp2=Puede acceder a los atributos adicionales con variables como <b>#extrafield_myextrafieldkey#</b> y variables globales con <b>#global_mycode#</b>
+NbProducts=Numero de productos
diff --git a/htdocs/langs/es_VE/propal.lang b/htdocs/langs/es_VE/propal.lang
index f3e7695176c..e7be445d8d5 100644
--- a/htdocs/langs/es_VE/propal.lang
+++ b/htdocs/langs/es_VE/propal.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - propal
 PropalsOpened=Abierta
+CreateEmptyPropal=Crear propuesta comercial vacía o desde la lista de productos/servicios\n
diff --git a/htdocs/langs/es_VE/website.lang b/htdocs/langs/es_VE/website.lang
deleted file mode 100644
index eb66189bb95..00000000000
--- a/htdocs/langs/es_VE/website.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 1e7d1a312f3..5d28519c9ab 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Viide
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index d3320e12ec5..b0a402fe689 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Turvaseaded
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Viga: see moodul nõuab PHP versiooni %s või uuemat.
 ErrorModuleRequireDolibarrVersion=Viga: see moodul nõuab Dolibarri versiooni %s või uuemat.
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Ära soovita
 NoActiveBankAccountDefined=Aktiivset pangakontot pole määratletud
 OwnerOfBankAccount=Pangakonto %s omani
 BankModuleNotActive=Pangakontode moodul pole sisse lülitatud
-ShowBugTrackLink=Show link "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Häired
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Antud käsu peab käivitama kä
 YourPHPDoesNotHaveSSLSupport=Antud PHP ei võimalda SSL funktsioone
 DownloadMoreSkins=Veel alla laetavaid kujundusi
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Osaline tõlge
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 81e77744f0e..b3b113ab55c 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Kust
 TransferTo=Kuhu
 TransferFromToDone=Kanne kontolt <b>%s</b> kontole <b>%s</b> väärtuses <b>%s</b> %s on registreeritud.
-CheckTransmitter=Ülekandja
+CheckTransmitter=Saatja
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Pangatšekid
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Liikumised
 PlannedTransactions=Planned entries
-Graph=Graafika
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Tehing teise kontoga
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Tagasi konto juurde
 ShowAllAccounts=Näita kõigil kontodel
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Lõpuks vali kategooria, mille alla kanded klassifitseerida
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index aa1b3d111a5..89861b7e743 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Sisesta kliendilt saadud makse
 EnterPaymentDueToCustomer=Soorita kliendile makse
 DisabledBecauseRemainderToPayIsZero=Keelatud, sest järele jäänud maksmata on null
-PriceBase=Baashind
+PriceBase=Base price
 BillStatus=Arve staatus
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Mustand (kinnitada)
@@ -454,7 +454,7 @@ RegulatedOn=Reguleeritud üksusel
 ChequeNumber=Tšeki nr
 ChequeOrTransferNumber=Tšeki/ülekande nr
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Tšeki pank
 CheckBank=Tšekk
 NetToBePaid=Makstav netosumma
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index 4fca825fabb..d86d56d95db 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Vanimad aktiivsed aegunud teenused
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Üldine tegevus (arved, pakkumised, tellimused)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index 0f87e95779e..414b751c9d6 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Kviitung
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Veebilehitseja
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index f7eeeaf60b3..21d14e0352d 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Silt/Kategooria
 Rubriques=Sildid/Kategooriad
 RubriquesTransactions=Tags/Categories of transactions
 categories=sildid/kategooriad
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=Kategoorias
 AddIn=Lisa kategooriasse
 modify=muuda
 Classify=Liigita
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 004a976937a..e48fcd4655b 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Ettevõte nimega %s on juba olemas. Vali mõni muu.
 ErrorSetACountryFirst=Esmalt vali riik
 SelectThirdParty=Vali kolmas isik
-ConfirmDeleteCompany=Kas soovite kindlasti selle ettevõtte ja kogu päritud teabe kustutada?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Kustuta kontakt/aadress
-ConfirmDeleteContact=Kas soovite kindlasti selle kontakti ja kogu päritud teabe kustutada?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Uus kolmas osapool
 MenuNewCustomer=Uus klient
 MenuNewProspect=Uus huviline
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Helista
 Chat=Vestle
-PhonePro=Ametitelefon
+PhonePro=Bus. phone
 PhonePerso=Isiklik telefon
 PhoneMobile=Mobiiltelefon
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Postiindeks
 Town=Linn
 Web=Veeb
 Poste= Ametikoht
-DefaultLang=Keele vaikeseade
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Käibemaksu ei kasutata
@@ -331,7 +331,7 @@ CustomerCodeDesc=Kliendi kood, unikaalne igal kliendil
 SupplierCodeDesc=Tarnija kood, unikaalne igal kliendil
 RequiredIfCustomer=Nõutud, kui kolmas isik on klient või huviline
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Selle mooduli reeglid
 ProspectToContact=Huviline, kellega ühendust võtta
 CompanyDeleted=Ettevõte &quot;%s&quot; on andmebaasist kustutatud.
@@ -439,12 +439,12 @@ ListSuppliersShort=Tarnijate nimekiri
 ListProspectsShort=Huviliste nimekiri
 ListCustomersShort=Klientide nimekiri
 ThirdPartiesArea=Kolmandad isikud/Kontaktid
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Kolmandaid isikuid kokku
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Ava
 ActivityCeased=Suletud
 ThirdPartyIsClosed=Kolmas osapool on suletud
-ProductsIntoElements=Toodete / teenuste loetelu %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Hetkel maksmata summa
 OutstandingBill=Suurim võimalik maksmata arve
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Kood on vaba, seda saab igal ajal muuta.
 ManagingDirectors=Haldaja(te) nimi (CEO, direktor, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Kolmandate osapoolte ühendamine
-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 third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index a23b73cef69..77d6b6c4d74 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Uus allahindlus
 NewCheckDeposit=Uus tšeki deponeerimine
 NewCheckDepositOn=Loo kviitung kontole deponeerimise eest: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Tšeki vastuvõtmise kuupäev
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/et_EE/ecm.lang b/htdocs/langs/et_EE/ecm.lang
index c3b54ff39b5..1c3d3c74e1d 100644
--- a/htdocs/langs/et_EE/ecm.lang
+++ b/htdocs/langs/et_EE/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 81de1b5c8c9..1a16bdc7807 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Ühtegi viga ei ole, teostame
 # Errors
 ErrorButCommitIsDone=Esines vigu, kuid kinnitame sellest hoolimata
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=URL %s on vale
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Kasutajanimi %s on juba olemas.
@@ -46,8 +46,8 @@ ErrorWrongDate=Kuupäev pole korrektne!
 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. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Mõned nõutud väljad on täitmata.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Kausta loomine ebaõnnestus. Kontrolli, et veebiserveri kasutajal on piisavalt õigusi Dolibarri dokumentide kausta kirjutamiseks. Kui PHP <b>safe_mode</b> parameeter on sisse lülitatud, siis kontrolli, et veebiserveri kasutaja (või grupp) on Dolibarri PHP failide omanik.
 ErrorNoMailDefinedForThisUser=Antud kasutaja e-posti aadressi pole määratletud
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/et_EE/eventorganization.lang b/htdocs/langs/et_EE/eventorganization.lang
new file mode 100644
index 00000000000..a5d54dbe67c
--- /dev/null
+++ b/htdocs/langs/et_EE/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Seaded
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Mustand
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Tehtud
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/et_EE/knowledgemanagement.lang b/htdocs/langs/et_EE/knowledgemanagement.lang
new file mode 100644
index 00000000000..2ad488984cd
--- /dev/null
+++ b/htdocs/langs/et_EE/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Seaded
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Dolibarri kohta
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Artikkel
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index 45d64d5f642..791a17b9305 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Koopia
 MailToCCUsers=Copy to users(s)
 MailCCC=Puhverdatud koopia
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Sõnum
 MailFile=Manustatud failid
 MailMessage=E-kirja sisu
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 86a6e3aae9b..2f7fbb0902b 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Kontrolli ühendust
 ToClone=Klooni
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Kloonitavad andmed pole määratletud.
 Of=/
 Go=Mine
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Tegevus
 About=Dolibarri kohta
 Number=Arv
-NumberByMonth=Arv kuus
+NumberByMonth=Total reports by month
 AmountByMonth=Kogus kuus
 Numero=Arv
 Limit=Piir
@@ -341,8 +341,8 @@ KiloBytes=Kilobaiti
 MegaBytes=Megabaiti
 GigaBytes=Gigabaiti
 TeraBytes=Terabaiti
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Isik
 From=Kellelt
 FromDate=Kellelt
 FromLocation=Kellelt
-at=at
 to=kellele
 To=kellele
+ToDate=kellele
+ToLocation=kellele
+at=at
 and=ja
 or=või
 Other=Muu
@@ -843,7 +845,7 @@ XMoreLines=%s joon(t) varjatud
 ShowMoreLines=Show more/less lines
 PublicUrl=Avalik link
 AddBox=Lisa kast
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Prindi fail %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Näita sekkumist
@@ -854,8 +856,8 @@ Denied=Tagasi lükatud
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Muu
 ViewList=Nimekirja vaade
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index fcf4718f143..0168761f010 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Mõni muu liige (nimi: <b>%s</b>, kas
 ErrorUserPermissionAllowsToLinksToItselfOnly=Turvalisuse huvides peavad sul olema õigused muuta kõiki kasutajaid enne seda, kui oled võimeline liiget siduma kasutajaga, kes ei ole sina.
 SetLinkToUser=Seosta Dolibarri kasutajaga
 SetLinkToThirdParty=Seosta Dolibarri kolmanda isikuga
-MembersCards=Liikmete visiitkaardid
+MembersCards=Business cards for members
 MembersList=Liikmete nimekiri
 MembersListToValid=Mustandi staatuses olevate liikmete nimekiri (vajab kinnitamist)
 MembersListValid=Kinnitatud liikmete nimekiri
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Kasutajad, kelle liikmemaks on saada
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Liikmemaksu kuupäev
 DateEndSubscription=Liikmemaksu  lõppkuupäev
-EndSubscription=Lõpeta liikmemaks
+EndSubscription=Subscription Ends
 SubscriptionId=Liikemaksu ID
 WithoutSubscription=Without subscription
 MemberId=Liikme ID
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Liikmemaks nõutud
 DeleteType=Kustuta
 VoteAllowed=Hääletamine lubatud
-Physical=Füüsiline
-Moral=Moraalne
-MorAndPhy=Moral and Physical
-Reenable=Luba uuesti
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Liikmete statistika riigi alusel
 MembersStatisticsByState=Liikmete statistika osariigi/provintsi alusel
 MembersStatisticsByTown=Liikmete statistika linna alusel
 MembersStatisticsByRegion=Liikmete statistika piirkonna järgi
-NbOfMembers=Liikmeid
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Ei leinud ühtki kinnitatud liiget
-MembersByCountryDesc=See kuva näitab liikmete statistikat riikide alusel. Graafika töötamiseks peab olema ligipääs Google online graafikute teenusele ja see on kättesaadav vaid töötava internetiühendusega.
-MembersByStateDesc=See riik näitab liikmete statistikat osariigi/provintsi/kantoni alusel.
-MembersByTownDesc=See ekraan näitab liikmete statistikat linna alusel.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Vali soovitud statistika...
 MenuMembersStats=Statistika
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Informatsioon on avalik
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Uus liige lisatud, ootab heaks kiitmist
 NewMemberForm=Uue liikme vorm
-SubscriptionsStatistics=Liikmelisuse statistika
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Liikmelisuste arv
-AmountOfSubscriptions=Liikmelisuste kogusumma
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Käive (ettevõttel) või eelarve maht (ühendusel)
 DefaultAmount=Vaikimisi liikmemaks
 CanEditAmount=Külastaja saab oma liikmemaksu valida/summat muuta
 MEMBER_NEWFORM_PAYONLINE=Hüppa integreeritud online-makse lehele
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Liikmemaksude jaoks kasutatav KM määr
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/et_EE/modulebuilder.lang b/htdocs/langs/et_EE/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/et_EE/modulebuilder.lang
+++ b/htdocs/langs/et_EE/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index ba2ede545ba..8fa1b02ba3e 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 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=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/et_EE/partnership.lang b/htdocs/langs/et_EE/partnership.lang
new file mode 100644
index 00000000000..8e932fb6449
--- /dev/null
+++ b/htdocs/langs/et_EE/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Alguskuupäev
+DatePartnershipEnd=Lõppkuupäev
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Mustand
+PartnershipAccepted = Accepted
+PartnershipRefused = Keeldutud
+PartnershipCanceled = Tühistatud
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang
index c3e0711af7c..c6e4fd4eee9 100644
--- a/htdocs/langs/et_EE/productbatch.lang
+++ b/htdocs/langs/et_EE/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index d8abbac338d..cb10804e9aa 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Toode
@@ -73,12 +73,12 @@ SellingPrice=Müügihind
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Müügihinna (km-ga)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Uus hind
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Müügihind ei saa olla madalam kui selle toote minimaalne lubatud hind (%s km-ta). Antud sõnumit näidatakse ka siis, kui sisestad liiga suure allahindluse.
 ContractStatusClosed=Suletud
@@ -157,11 +157,11 @@ ListServiceByPopularity=Teenuste nimekiri populaarsuse järgi
 Finished=Valmistatud toode
 RowMaterial=Toormaterjal
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Seda toodet kasutatakse
 NewRefForClone=Uue toote/teenuse viide
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Päritolumaa
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Ühik
 p=u.
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 9f5ee9b09d3..4d222514a55 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Projekti kontaktid
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Kõik projektid
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 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.
 ProjectsPublicTaskDesc=See vaade esitab kõik projektid ja ülesanded, mida sul on lubatud vaadata.
 ProjectsDesc=See vaade näitab kõiki projekte (sinu kasutajaõigused annavad ligipääsu kõigele)
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=See vaade esitab kõik projektid ja ülesanded, mida sul on lubatud vaadata.
 TasksDesc=See vaade näitab kõiki projekte ja ülesandeid (sinu kasutajaõigused annavad ligipääsu kõigele)
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=Uus projekt
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/et_EE/recruitment.lang b/htdocs/langs/et_EE/recruitment.lang
index 1f6dab3f416..f5373d88475 100644
--- a/htdocs/langs/et_EE/recruitment.lang
+++ b/htdocs/langs/et_EE/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
index 92c76b98f03..387687f8fb3 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 mudel
 WarningNoQtyLeftToSend=Hoiatus: pole ühtki lähetamise ootel kaupa.
-StatsOnShipmentsOnlyValidated=Statistika põhineb vaid kinnitatud saadetistel. Kasutatavaks kuupäevaks on saadetise kinnitamise kuupäev (plaanitav kohaletoimetamise aeg ei ole alati teada).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 0fa5f181ced..51a1fe08e26 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Selle objektiga ei ole seotud ettemääratud toote
 DispatchVerb=Saada
 StockLimitShort=Hoiatuse piir
 StockLimit=Koguse piir hoiatuseks
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Reaalne laojääk
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index 1facf9d2742..9898bac8b6d 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Salasõna muudetud: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Grupi õigused
 UserRights=Kasutaja õigused
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Keela
 DisableAUser=Keela kasutaja
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Kasuta muutmiseks 'Liik' välja
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Kasuta sisselogimiseks OpenIDd
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index 119edcd437d..ba5d90f597c 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 081ca0887ca..8efd4589d74 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Segurtasunaren konfigurazioa
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Errorea, modulu honek PHP-ren %s bertsioa -edo handiagoa- behar du
 ErrorModuleRequireDolibarrVersion=Errorea, modulu honek Dolibarr-en %s bertsioa -edo handiagoa- behar du
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index 0f6fba01760..222600a6f21 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 4d23de8e6d0..d82411ce066 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
index acce860d953..1b6d9981dcb 100644
--- a/htdocs/langs/eu_ES/boxes.lang
+++ b/htdocs/langs/eu_ES/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index e108028d9cb..934753b0f69 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 1ab18739b29..ae332d0b61f 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Telefonoa
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Posizioa
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 1e19182ea3a..5e4891d5aea 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/eu_ES/ecm.lang b/htdocs/langs/eu_ES/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/eu_ES/ecm.lang
+++ b/htdocs/langs/eu_ES/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/eu_ES/eventorganization.lang b/htdocs/langs/eu_ES/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/eu_ES/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/eu_ES/knowledgemanagement.lang b/htdocs/langs/eu_ES/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/eu_ES/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index b124f83e85d..f7f81a91e0e 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Mezua
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 02604cf919e..cd91c1318f8 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Zenbakia
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Zenbakia
 Limit=Limitea
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Besteak
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Besteak
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index ea607afb344..823645abd57 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Ezabatu
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/eu_ES/modulebuilder.lang b/htdocs/langs/eu_ES/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/eu_ES/modulebuilder.lang
+++ b/htdocs/langs/eu_ES/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 0601f3818ea..eb9d25ffc25 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/eu_ES/partnership.lang b/htdocs/langs/eu_ES/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/eu_ES/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang
index ba538918c69..c474b98db75 100644
--- a/htdocs/langs/eu_ES/productbatch.lang
+++ b/htdocs/langs/eu_ES/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 09b267fccb6..af5fe0436a5 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 645cb61ef75..189df5d6821 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/eu_ES/recruitment.lang b/htdocs/langs/eu_ES/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/eu_ES/recruitment.lang
+++ b/htdocs/langs/eu_ES/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang
index 079b2533513..daeb881009c 100644
--- a/htdocs/langs/eu_ES/sendings.lang
+++ b/htdocs/langs/eu_ES/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index 3a9406782cc..412cca892b5 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
index d9063bea80e..c9a8003ee87 100644
--- a/htdocs/langs/eu_ES/users.lang
+++ b/htdocs/langs/eu_ES/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index 48ec32f15d5..5a23a52885b 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index a83717e547a..214dc754086 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -202,7 +202,7 @@ Docref=مرجع
 LabelAccount=برچسب حساب
 LabelOperation=عملیات برچسب
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=کد حروف‌بندی
 Lettering=حروف‌بندی
 Codejournal=دفتر
@@ -297,7 +297,7 @@ NoNewRecordSaved=ردیف دیگری برای دفترنویسی وجود ندا
 ListOfProductsWithoutAccountingAccount=فهرست محصولاتی که به هیچ حساب حساب‌داری بند نشده‌اند
 ChangeBinding=تغییر بند‌شدن‌ها
 Accounted=در دفترکل حساب‌شده است
-NotYetAccounted=هنوز در دفترکل حساب نشده‌است
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=وفق داده نشده
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 6665602a932..a1448d0785c 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=فایل <b>%s</b> را در صورت موجود بودن تغییر
 RestoreLock=فایل <b>%s</b> را با مجوز فقط خواندنی بازیابی کنید تا امکان استفاده از ابزار نصب/روزآمدسازی را غیرفعال کنید.
 SecuritySetup=برپاسازی امنیتی
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=در این قسمت گزینه‌های مربوط به امنیت بارگذاری فایل را تعریف کنید
 ErrorModuleRequirePHPVersion=خطا! این واحد نیازمند PHP نسخۀ %s یا بالاتر دارد
 ErrorModuleRequireDolibarrVersion=خطا! این واحد نیاز به Dolibarr  نسخۀ %s یا بالاتر را دارد
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=عدم ارائۀ پیشنهاد
 NoActiveBankAccountDefined=حساب بانکی فعالی تائید نشده است
 OwnerOfBankAccount=صاحب حساب بانکی %s
 BankModuleNotActive=واحد حساب‌های بانکی فعال نشده است
-ShowBugTrackLink=نمایش پیوند "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=هشدارها
 DelaysOfToleranceBeforeWarning=مکث قبل از نمایش یک پیام هشدار برای:
 DelaysOfToleranceDesc=تنظیم مکث قبل از پیام هشدار با نمادک %s برای آخرین عنصر بر روی صفحه نمایش داده می‌شود.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=شما باید این سطر 
 YourPHPDoesNotHaveSSLSupport=توابع SSL در PHP شما موجود نیست
 DownloadMoreSkins=پوسته‌های بیشتر برای دریافت
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=نمایش شناسۀ حرفه‌ای و نشانی 
 ShowVATIntaInAddress=پنهان کردن شمارۀ م‌ب‌اا داخل‌جامعه‌ای-اروپا به‌همراه نشانی‌ها
 TranslationUncomplete=ترجمه جزئی
@@ -2062,7 +2064,7 @@ UseDebugBar=استفاده از نوار اشکال‌یابی
 DEBUGBAR_LOGS_LINES_NUMBER=تعداد آخرین سطور گزارش‌کار برای حفظ در کنسول
 WarningValueHigherSlowsDramaticalyOutput=هشدار! مقادیر بزرگ خروجی را به‌شدت کند می‌کند
 ModuleActivated=واحد %s فعال شده و باعث کاهش سرعت رابط کاربری می‌شود
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index 4f30cc9681d..29ea11ddce1 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=پرداخت مالیات اجتماعی/سیاست م
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=انتقال داخلی
-TransferDesc=انتقال از یک حساب به حساب دیگر، Dolibarr دو ردیف خواهد نوشت (یک بدهکار در حساب بانکی منبع و یک بستانکار در حساب مقصد). حساب مشابه (منهای امضا)، برچسب، تاریخ برای این تراکنش استفاده خواهد شد)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=از
 TransferTo=به
 TransferFromToDone=یک انتقال از <b>%s</b> به <b>%s</b> مربوط به <b>%s</b>%s ثبت شد.
-CheckTransmitter=منتقل کننده
+CheckTransmitter=فرستنده
 ValidateCheckReceipt=اعتباردهی به این رسید چک؟
-ConfirmValidateCheckReceipt=آیا مطمئنید می‌خواهید این رسید چک را تائید کنید؟ پس از انجام این‌کار امکان تغییر وجود ندارد.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=حذف این رسید چک
 ConfirmDeleteCheckReceipt=آیا مطمئنید می‌خواهید این رسیدچک را حذف کنید؟
 BankChecks=چک‌های بانکی
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=مطمئنید می‌خواهید این ورودی ر
 ThisWillAlsoDeleteBankRecord=این همچنین باعث حذف ورودی تولید شدۀ بانک خواهد شد
 BankMovements=جابجائی‌ها
 PlannedTransactions=ورودی‌های برنامه‌ریزی شده
-Graph=گرافیک
+Graph=Graphs
 ExportDataset_banque_1=ورودی‌های بانکی‌ و شرح‌کار حساب
 ExportDataset_banque_2=برگۀ به‌حساب‌گذاشتن
 TransactionOnTheOtherAccount=تراکنش روی حساب دیگر
@@ -142,7 +142,7 @@ AllAccounts=همۀ حساب‌های بانکی و نقد
 BackToAccount=برگشت به حساب
 ShowAllAccounts=نمایش برای همه حساب ها
 FutureTransaction=تراکنش در آینده، عدم امکان وفق‌دادن
-SelectChequeTransactionAndGenerate=چک‌ها را برای دربرداشتن رسید به‌حساب‌گذاشتن چک انتخاب/گزینش کنید و بر روی "ساخت" کلیک نمائید.
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=شرح‌کار بانک مربوط به وفق‌دادن را انتخاب نمائید. مقدار عددی قابل ترتیب‌دهی را انتخاب نمائید: YYYYMM  یا YYYYMMDD
 EventualyAddCategory=درنهایت، دسته‌ای را که ردیف‌ها را طبقه‌بندی می‌کند، انتخاب کنید
 ToConciliate=برای وفق‌دادن؟
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 9f20ff13d72..93c04e5034f 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=تبدیل مبلغ اضافۀ پرداختی به‌ع
 EnterPaymentReceivedFromCustomer=پول‌هائی که از مشتری وارد شده را وارد کنید
 EnterPaymentDueToCustomer=پرداخت با توجه به مشتری
 DisabledBecauseRemainderToPayIsZero=غیرفعال، زیرا مبلغ باقی‌ماندۀ پرداخت نشده، برابر با صفر است
-PriceBase=پایۀ قیم
+PriceBase=Base price
 BillStatus=وضعیت صورت‌حساب
 StatusOfGeneratedInvoices=وضعیت صورت‌حساب‌های تولیدشده
 BillStatusDraft=پیش‌نویس (نیازمند تائید)
@@ -454,7 +454,7 @@ RegulatedOn=تنظیم در
 ChequeNumber=N° چک
 ChequeOrTransferNumber=چک/انتقال N°
 ChequeBordereau=زمان‌بندی چک
-ChequeMaker=انتقال‌دهندۀ چک/انتقال
+ChequeMaker=Check/Transfer sender
 ChequeBank=بانک چک
 CheckBank=چک
 NetToBePaid=خالص قابل پرداخت
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index f0348d2040c..96776de5b0b 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=نشانه‌ها: آخرین %s
 BoxOldestExpiredServices=قدیمی تر خدمات منقضی فعال
 BoxLastExpiredServices=آخرین %s طرف‌تماس قدیمی با خدمات فعال منقضی‌شده
 BoxTitleLastActionsToDo=آخرین %s کار برای انجام
-BoxTitleLastContracts=آخرین %s قرارداد تغییریافته
-BoxTitleLastModifiedDonations=آخرین %s کمکِ تغییریافته
-BoxTitleLastModifiedExpenses=آخرین %s گزارش هزینۀ تغییریافته
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=فعالیت‌های سراسری (صورت‌حساب‌ها،  پیشنهادها، سفارشات)
 BoxGoodCustomers=مشتریان خوب
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index 2c4889740bb..fe17fae84a5 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=طبقه
 AddTable=ایجاد میز
 Place=محل
 TakeposConnectorNecesary=نیاز به "وصل‌کنندۀ TakePOS"
-OrderPrinters=مرتب‌کردن چاپ‌گرها
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=جستجوی محصول
 Receipt=دریافت
 Header=سربرگ
@@ -56,8 +57,9 @@ Paymentnumpad=نوع بخش‌کناری
 Numberspad=بخش‌کناری عددی
 BillsCoinsPad=بخش‌کناری سکه‌ها و اسکناس‌ها
 DolistorePosCategory=واحدهای TakePOS و سایر واحدهای صندوق برای Dolibarr
-TakeposNeedsCategories=TakePOS نیازمند کار با دسته‌بندی محصولات است
-OrderNotes=مرتب کردن یادداشت‌ها
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=حساب پیش‌فرض برای ذخیرۀ پرداخت‌ها 
 NoPaimementModesDefined=در پیکربندی TakePOS هیچ حالت پرداختی تعریف نشده است
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=مرورگر
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index b815c3aa17f..e967440c7d5 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -3,20 +3,20 @@ Rubrique=کلیدواژه/دسته‌بندی
 Rubriques=برچسب‌ها/دسته‌بندی‌ها
 RubriquesTransactions=کلیدواژه/دسته‌بندی‌های تراکنش‌ها
 categories=کلیدواژه‌ها/دسته‌بندی‌ها
-NoCategoryYet=از این نوع هیچ کلیدواژه/دسته‌بندی ساخته نشده است
+NoCategoryYet=No tag/category of this type has been created
 In=به
 AddIn=اضافه کردن در
 modify=تغییر دادن
 Classify=دسته بندی کردن
 CategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌ها
-ProductsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های محصولات/خدمات
-SuppliersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های فروشندگان
-CustomersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های مشتریان
-MembersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های اعضا
-ContactsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های طرف‌های تماس
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های طرح‌ها
-UsersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های کاربران
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=زیردسته‌ها
 CatList=فهرست کلیدواژه‌ها/دسته‌بندی‌ها
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=انتخاب دسته‌بندی
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index d29507f145e..0dd60d79348 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=نام شرکت %s از قبل، وجود داشته است. لطفا نام دیگری برگزینید.
 ErrorSetACountryFirst=ابتدا کشور را تعیین کنید
 SelectThirdParty=انتخاب شخص‌سوم
-ConfirmDeleteCompany=آیا مطمئن هستید که می‌خواهید این شرکت و همۀ اطلاعات مربوطه را حذف کنید؟
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=حذف یک طرف‌تماس/نشانی
-ConfirmDeleteContact=آیا مطمئن هستید که می‌خواهید این طرف‌تماس و همۀ اطلاعات مربوطه را حذف کنید؟
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=شخص‌سوم جدید
 MenuNewCustomer=مشتری جدید
 MenuNewProspect=مشتری‌احتمالی جدید
@@ -69,7 +69,7 @@ PhoneShort=تلفن
 Skype=اسکایپ
 Call=تماس
 Chat=گفتگوی اینترنتی
-PhonePro=تلفن کاری
+PhonePro=Bus. phone
 PhonePerso=تلفن شخصی
 PhoneMobile=تلفن همراه
 No_Email=عدم تمایل به دریافت رایانامه‌های جمعی
@@ -331,7 +331,7 @@ CustomerCodeDesc=کد مشتری، منحصربه‌فرد برای همۀ مش
 SupplierCodeDesc=کد فروشنده، منحصر‌به‌فرد برای همۀ فروشندگان
 RequiredIfCustomer=در صورتی‌که شخص‌سوم یک مشتری یا مشتری‌احتمالی است، الزامی است
 RequiredIfSupplier=در صورتی که شخص‌سوم، فروشنده است، الزامی است
-ValidityControledByModule=اعتبار توسط واحد مربوطه مورد بررسی قرار می‌گیرد
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=مقررات این واحد
 ProspectToContact=مشتری‌احتمالی به طرف‌تماس
 CompanyDeleted= شرکت "%s" از پایگاه داده حذف شد.
@@ -439,12 +439,12 @@ ListSuppliersShort=فهرست فروشندگان
 ListProspectsShort=فهرست مشتریان احتمالی
 ListCustomersShort=فهرست مشتریان
 ThirdPartiesArea=شخص‌های سوم/طرف‌های تماس
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=تعداد کل شخص‌سوم‌ها
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=باز
 ActivityCeased=بسته
 ThirdPartyIsClosed=شخص‌سوم بسته شده است
-ProductsIntoElements=فهرست محصولات/خدمات به %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=صورت‌حساب‌های درانتظار کنونی
 OutstandingBill=حداکثر تعداد صورت‌حساب‌های درانتظار
 OutstandingBillReached=حداکثر تعداد رسیدن به صورت‌حساب‌های درانتظار
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=این کد آزاد است و می‌تواند در ه
 ManagingDirectors=نام مدیر (مدیرعامل، مدیر، رئیس...)()
 MergeOriginThirdparty=نسخه‌برداری از شخص سوم (شخص‌سومی که می‌خواهید حذف کنید)
 MergeThirdparties=ادغام شخص‌سوم‌ها
-ConfirmMergeThirdparties=آیا مطمئن هستید می‌خواهید این شخص سوم را با مورد موجود ادغام کنید؟ همۀ اشیاء پیوند شده (صورت‌حساب، سفارش، ...) به شخص سوم کنونی منتقل خواهد شد و سپس این شخص سوم حذف خواهد شد
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=شخص‌سوم‌ها با هم ادغام شدند
 SaleRepresentativeLogin=مشخصات‌ورود نماینده فروش
 SaleRepresentativeFirstname=نام نمایندۀ فروش
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index b8b215c8b96..b54f4d2e99c 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=تخفیف جدید
 NewCheckDeposit=به‌حساب‌گذاشتن جدید چک 
 NewCheckDepositOn=ساختن رسید برای به‌حساب‌گذاری چک در حساب: %s
 NoWaitingChecks=هیچ چکی در انتظار وصول شدن نیست
-DateChequeReceived=تاریخ دریافت چک
+DateChequeReceived=Check receiving date
 NbOfCheques=تعداد چک‌ها
 PaySocialContribution=پرداخت مالیات اجتماعی/ساختاری
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/fa_IR/ecm.lang b/htdocs/langs/fa_IR/ecm.lang
index c8b1c8e7b2f..d33d24d8762 100644
--- a/htdocs/langs/fa_IR/ecm.lang
+++ b/htdocs/langs/fa_IR/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 80e7a42b99d..fc2504e5758 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=خطائی نیست، حرکت می‌کنیم
 # Errors
 ErrorButCommitIsDone=علیرغم وجود خطا، تائید می‌شود
-ErrorBadEMail=رایانامۀ %s غلط است
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=نشانی‌اینترنتی %s اشتباه است
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=برای مؤلفۀ موردنظر مقدار خطائی وارد شده است. عموما در هنگام فقدان ترجمه، الحاق می‌شود.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=نام‌کاربری %s قبلا وجود داشته است.
@@ -46,8 +46,8 @@ ErrorWrongDate=تاریخ، صحیح نمی‌باشد!
 ErrorFailedToWriteInDir=امکان نوشتن در پوشۀ %s وجود ندارد
 ErrorFoundBadEmailInFile=برای %s سطر در فایل روش‌اشتباه درج رایانامه پیدا شد (مثلا سطر %s با email=%s)
 ErrorUserCannotBeDelete=امکان حذف کاربر وجود ندارد. ممکن است با سایر اجزای Dolibarr در ارتباط باشد.
-ErrorFieldsRequired=برخی از بخش‌های الزامی، پر نشده‌اند.
-ErrorSubjectIsRequired=موضوع رایانامه الزامی است.
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=ایجاد یک پوشه با شکست مواجه شد. بررسی کنید، کاربر سرور وب، دارای مجوزهای نوشتاری بر روی پوشۀ documents مربوط به Dolibarr باشد در صورتی که مؤلفۀ <b>safe_mode</b> روی این نسخه از PHP فعال باشد، بررسی کنید فایل‌های PHP مربوط به Dolibarr متعلق به کاربر سرور وب (یا گروه مربوطه) باشد.
 ErrorNoMailDefinedForThisUser=نشانی رایانامه برای این کاربر تعریف نشده است
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=صفحه/دربردارندۀ <strong
 ErrorDuringChartLoad=خطا در هنگام بارگذاری نمودار حساب‌ها. در صورتی برخی حساب‌ها بارگذاری نشوند، همچنان می‌توانید به طور دستی آن‌ها را وارد کنید
 ErrorBadSyntaxForParamKeyForContent=برای مؤلفۀ keyforcontent نگارش بدی وارد شده است. باید مقداری داشته باشد که با %s یا %s آغاز شود.
 ErrorVariableKeyForContentMustBeSet=خطا، مقدارثابت با نام %s (با محتوای متنی قابل نمایش) یا %s (با نشانی بیرونی قابل نمایش) باید تنظیم شده باشد.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=نشانی اینترنتی %s باید با http://  یا  https:// آغاز گرد
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=خطا، ارجاع جدید قبلا استفاده شده است
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/fa_IR/eventorganization.lang b/htdocs/langs/fa_IR/eventorganization.lang
new file mode 100644
index 00000000000..1439649134f
--- /dev/null
+++ b/htdocs/langs/fa_IR/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = تنظیمات
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = پیش‌نویس
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = انجام شده
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/fa_IR/knowledgemanagement.lang b/htdocs/langs/fa_IR/knowledgemanagement.lang
new file mode 100644
index 00000000000..6e066229e76
--- /dev/null
+++ b/htdocs/langs/fa_IR/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = تنظیمات
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = درباره
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = مقاله
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 159d2a5d314..e6213e7d7c5 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=به کاربر(ان)
 MailCC=کپی کنید به
 MailToCCUsers=یک نسخه به کاربر(ان)
 MailCCC=نسخه های کش شده به
-MailTopic=عنوان رایانامه
+MailTopic=Email subject
 MailText=پیام
 MailFile=فایل های پیوست شده
 MailMessage=بدن ایمیل
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 9cd002fb039..1583dced000 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=آزمایش اتصال
 ToClone=نسخه‌برداری
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=تاریخی که برای نسخه‌برداری مد نظر دارید:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=هیچ داده‌ای برای نسخه‌برداری پیدا نشد
 Of=از
 Go=رفتن
@@ -246,7 +246,7 @@ DefaultModel=قابل پیش‌فرض برای سن
 Action=رویداد
 About=درباره
 Number=شماره
-NumberByMonth=شماره ماه
+NumberByMonth=Total reports by month
 AmountByMonth=مقدار در ماه
 Numero=شماره
 Limit=محدودیت
@@ -341,8 +341,8 @@ KiloBytes=کیلوبایت
 MegaBytes=مگابایت
 GigaBytes=گیگابایت
 TeraBytes=ترابایت
-UserAuthor=کاربر سازنده
-UserModif=کاربر آخرین به‌روز‌رسانی
+UserAuthor=Ceated by
+UserModif=Updated by
 b=ب.
 Kb=کیلوبایت
 Mb=مگابایت
@@ -503,9 +503,11 @@ By=توسط
 From=از
 FromDate=از
 FromLocation=از
-at=at
 to=به
 To=به
+ToDate=به
+ToLocation=به
+at=at
 and=و
 or=یا
 Other=دیگر
@@ -843,7 +845,7 @@ XMoreLines=(%s) سطر پنهان است
 ShowMoreLines=نمایش سطور بیشتر/کمتر
 PublicUrl=نشانی عمومی
 AddBox=ایجاد کادر
-SelectElementAndClick=یک عنصر را انتخاب کرده و بر %s کلیک کنید
+SelectElementAndClick=Select an element and click on %s
 PrintFile=پرینت فایل %s 
 ShowTransaction=نمایش ورودی در حساب بانکی
 ShowIntervention=نمایش واسطه‌گری
@@ -854,8 +856,8 @@ Denied=رد شد
 ListOf=فهرست %s
 ListOfTemplates=فهرست قالب‌ها
 Gender=جنسیت
-Genderman=مرد
-Genderwoman=زن
+Genderman=Male
+Genderwoman=Female
 Genderother=سایر
 ViewList=نمای فهرستی
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index bd42466f112..0d2d87c60c7 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=یکی دیگر از عضو (نام 
 ErrorUserPermissionAllowsToLinksToItselfOnly=به دلایل امنیتی، شما باید مجوز اعطا شده به ویرایش تمام کاربران قادر به پیوند عضو به یک کاربر است که مال شما نیست.
 SetLinkToUser=پیوند به یک کاربر Dolibarr
 SetLinkToThirdParty=لینک به شخص ثالث Dolibarr
-MembersCards=کاربران کارت های کسب و کار
+MembersCards=Business cards for members
 MembersList=فهرست کاربران
 MembersListToValid=لیست اعضای پیش نویس (به اعتبار شود)
 MembersListValid=لیست اعضای معتبر
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=کاربران با اشتراک برای در
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=تاریخ ثبت نام
 DateEndSubscription=تاریخ پایان ثبت نام
-EndSubscription=اشتراک پایان
+EndSubscription=Subscription Ends
 SubscriptionId=شناسه اشتراک
 WithoutSubscription=Without subscription
 MemberId=نام کاربری
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=اشتراک مورد نیاز
 DeleteType=حذف کردن
 VoteAllowed=رای اجازه
-Physical=فیزیکی
-Moral=اخلاقی
-MorAndPhy=Moral and Physical
-Reenable=را دوباره فعال کنید
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=آمار کاربران بر اساس کشور
 MembersStatisticsByState=آمار کاربران توسط ایالت / استان
 MembersStatisticsByTown=آمار کاربران توسط شهر
 MembersStatisticsByRegion=آمار کاربران بر اساس منطقه
-NbOfMembers=تعداد اعضا
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=هیچ اعتبار یافت
-MembersByCountryDesc=این صفحه آمار در اعضا را با کشورهای به شما نشان دهد. گرافیک در گوگل خدمات گراف آنلاین بستگی دارد با این حال و در دسترس است تنها در صورت اتصال به اینترنت در حال کار است.
-MembersByStateDesc=این صفحه آمار در عضو های دولتی / استان / کانتون شما نشان می دهد.
-MembersByTownDesc=این صفحه آمار در عضو های شهر شما نشان می دهد.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=را انتخاب کنید آمار شما می خواهید به عنوان خوانده شده ...
 MenuMembersStats=ارقام
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=آخرین تاریخ عضویت
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=اطلاعات عمومی
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=عضو جدید اضافه شده است. در انتظار تایید
 NewMemberForm=فرم عضو جدید
-SubscriptionsStatistics=آمار اشتراک
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=تعداد اشتراک
-AmountOfSubscriptions=میزان اشتراک ها
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=گردش مالی (برای یک شرکت) و یا بودجه (برای پایه)
 DefaultAmount=مقدار پیش فرض از اشتراک
 CanEditAmount=بازدید کنندگان می توانند / ویرایش میزان اشتراک خود را انتخاب کنید
 MEMBER_NEWFORM_PAYONLINE=پرش در یکپارچه صفحه پرداخت آنلاین
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=نرخ مالیات بر ارزش افزوده برای استفاده از اشتراک ها
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/fa_IR/modulebuilder.lang b/htdocs/langs/fa_IR/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/fa_IR/modulebuilder.lang
+++ b/htdocs/langs/fa_IR/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index a7339c81ea6..70fc1ee3134 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>پروفسور کد از٪ s</b> اطلاعات بسته به کشور های شخص ثالث است. <br> به عنوان مثال، برای <b>کشور٪، این کد٪ بازدید کنندگان</b> است.
 DolibarrDemo=Dolibarr ERP / CRM نسخه ی نمایشی
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/fa_IR/partnership.lang b/htdocs/langs/fa_IR/partnership.lang
new file mode 100644
index 00000000000..60baadb7d69
--- /dev/null
+++ b/htdocs/langs/fa_IR/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=تاریخ شروع
+DatePartnershipEnd=تاریخ پایان
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = پیش‌نویس
+PartnershipAccepted = قبول‌شده
+PartnershipRefused = رد شده
+PartnershipCanceled = لغو ظده
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang
index 6542fcb3563..df9e306b199 100644
--- a/htdocs/langs/fa_IR/productbatch.lang
+++ b/htdocs/langs/fa_IR/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 61db4341804..c4630f85a19 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=خدمات فقط برای فروش
 ServicesOnPurchaseOnly=خدمات فقط برای خرید
 ServicesNotOnSell=خدمات نه برای خرید و نه برای فروش
 ServicesOnSellAndOnBuy=خدمات هم برای خرید و هم برای فروش
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=آخرین %s محصول ثبت شده
 LastRecordedServices=آخرین %s خدمات ثبت شده
 CardProduct0=محصول
@@ -73,12 +73,12 @@ SellingPrice=قیمت فروش
 SellingPriceHT=قیمت فروش (منهای مالیات)
 SellingPriceTTC=قیمت فروش (با مالیات)
 SellingMinPriceTTC=حداقل قیمت فروش (با مالیات)
-CostPriceDescription=این بخش قیمت(بدون مالیات) است که می‌تواند برای ذخیرۀ مبلغ متوسطی که این محصول برای شرکت شما هزینه وارد می‌کند استفاده شود. این می‌تواند هر قیمتی که شما محاسبه‌کنید باشد، برای مثال از جمع متوسط قیمت خرید و هزینه تولید و توزیع.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=این مقدار برای محاسبۀ حاشیه قابل استفاده است.
 SoldAmount=مبلغ فروخته‌شده
 PurchasedAmount=مبلغ خریده شده
 NewPrice=قیمت جدید
-MinPrice=حداقل قیمت فروش
+MinPrice=Min. selling price
 EditSellingPriceLabel=ویرایش برچسب قیمت فروش
 CantBeLessThanMinPrice=قیمت فروش نمی تواند کمتر از حداقل مجاز برای این محصول (%s بدون مالیات) باشد. این پیام همچنین در موقعی ظاهر می‌شود که شما یک تخفیف بسیار جدی داده باشید.
 ContractStatusClosed=بسته
@@ -157,11 +157,11 @@ ListServiceByPopularity=فهرست خدمات بر حسب محبوبیت
 Finished=محصول تولیدشده
 RowMaterial=مواد اولیه
 ConfirmCloneProduct=آیا مطمئنید می‌خواهید از خدمات یا محصولات <b>%s</b> نسخه‌برداری کنید؟
-CloneContentProduct=نسخه‌برداری از از همۀ اطلاعات اصلی محصول/خدما
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=نسخه‌برداری از قیمت‌ها
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=نسخه‌برداری از محصول/خدمات مجازی
-CloneCombinationsProduct=نسخه‌برداری از انواع مختلف محصول
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=این محصول، دست‌دوم است
 NewRefForClone=ارجاع محصول/خدمات جدید
 SellingPrices=قیمت‌های فروش
@@ -170,12 +170,12 @@ CustomerPrices=قیمت‌های مشتری
 SuppliersPrices=قیمت‌های فروشنده
 SuppliersPricesOfProductsOrServices=قیمت‌های فروشنده (مربوط به محصولات و خدمات)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=کشور مبدا
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=برچسب کوتاه
 Unit=واحد
 p=واحد
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 51af354f7d8..1e04ba74bf6 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=طرف‌های تماس طرح
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=همۀ طرح‌هائی که قابل مطالعۀ من است (مربوط به من + عمومی)
 AllProjects=همۀ طرح‌ها
-MyProjectsDesc=این نما محدود به طرح‌هائی است که شما در آن طرف تماس هستید
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=این نما نمایان‌گر همۀ طرح‌هائی است که خواندن آن‌ها برای شما مجاز است
 TasksOnProjectsPublicDesc=این نما نمایان‌گر همۀ وظایفی است که شما مجاز به خواندن آن هستید..
 ProjectsPublicTaskDesc=این نما نمایانگر همۀ طرح‌هائی است که شما مجاز به خواندن آن هستید
 ProjectsDesc=این نما نمایانگر همۀ طرح‌هاست ( مجوزهای کاربری شما به شما امکان می‌دهد شما همۀ طرح‌ها را مشاهده کنید).
 TasksOnProjectsDesc=این نما نمایانگر همۀ وظایف مربوط به همۀ طرح‌ها هست ( مجوزهای کاربری شما امکان نمایش همه چیز را می‌دهد).
-MyTasksDesc=این نما، محدود به طرح‌ها و وظایفی است که شما برای آن طرف‌تماس هستید
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=تنها طرح‌های باز نمایش داده می‌شوند ( طرح‌هائی که در وضعیت پیش‌نویس یا بسته هستند، مشاهده نمی‌شوند).
 ClosedProjectsAreHidden=طرح‌های بسته شده نمایش داده نمی‌شوند
 TasksPublicDesc=این نما نمایان‌گر همۀ طرح‌ها و وظایفی است که شما مجاز به دیدن آن هستید.
 TasksDesc=این نما نمایانگر همۀ طرح‌ها و وظایف است ( مجوزهای کاربری شما امکان نمایش همه‌چیز را به شما می‌دهد).
 AllTaskVisibleButEditIfYouAreAssigned=همۀ وظایف مربوط برای طرح‌های واجد شرایط نمایش داده می‌شوند، اما شما می‌توانید تنها زمان را برای وظایف نسبت دده شده به کاربر انتخابی وارد کنید. وظیفه را در صورتی انتخاب کنید که نیاز داشته باشید زمان در آن زمان وارد کنید.
-OnlyYourTaskAreVisible=تنها وظایفی که به شما نسبت داده شده‌اند، نمایش داده می‌شوند. وظیفه را فقط هنگامی به خودتان نسبت بدهید که برای شما قابل نمایش نیست و شما نیاز دارید روی آن زمان وارد کنید.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=وظایف مربوط به طرح‌ها
 ProjectCategories=برچسب‌ها/دسته‌بندی‌های طرح
 NewProject=طرح جدید
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=به این طرح نسبت داده نشده
 NoUserAssignedToTheProject=هیچ کاربری به این طرح نسبت داده نشده است
 TimeSpentBy=زمان نسبت شده توسط
 TasksAssignedTo=وظایف نسبت داده شده به
-AssignTaskToMe=نسبت دادن وظیفه به من
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=نسبت دادن وظیفه به %s
 SelectTaskToAssign=انتخاب وظیفه برای محول کردن
 AssignTask=نسبت‌دادن/محول کردن
diff --git a/htdocs/langs/fa_IR/recruitment.lang b/htdocs/langs/fa_IR/recruitment.lang
index 3647b8204d5..4b4afa90442 100644
--- a/htdocs/langs/fa_IR/recruitment.lang
+++ b/htdocs/langs/fa_IR/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang
index a042ba09638..8f0c059e941 100644
--- a/htdocs/langs/fa_IR/sendings.lang
+++ b/htdocs/langs/fa_IR/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=مدل Merou A5
 WarningNoQtyLeftToSend=اخطار، محصولات در حال انتظار برای حمل شود.
-StatsOnShipmentsOnlyValidated=آمار انجام شده بر روی محموله تنها به اعتبار. تاریخ استفاده از تاریخ اعتبار از حمل و نقل (تاریخ تحویل برنامه ریزی همیشه شناخته نشده است) است.
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 8a946698488..b812bb6998c 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=محصول از پیش تعریف‌شده‌ای
 DispatchVerb=اعزام-ارسال
 StockLimitShort=حداقل برای هشدار
 StockLimit=حداقل‌موجودی برای هشدار
-StockLimitDesc=(خالی) به معنای عدم هشدار است. <br> از مقدار 0 برای هشدار در هنگام تمام شدن موجودی استفاده نمائید.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=موجودی فیزیکی
 RealStock=موجودی واقعی
 RealStockDesc=موجودی فیزیکی/واقعی موجودی‌هائی هستند که اکنون در انبارها وجود دارند.
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index 2140aa7a6f4..3c3e52aaea5 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=گذرواژه تغییر کرد به: %s
 SubjectNewPassword=گذرواژه جدید شما برای %s
 GroupRights=مجوزهای گروه
 UserRights=مجوزهای کاربر
+Credentials=Credentials
 UserGUISetup=برپاسازی طرزنمایش برای‌کاربر
 DisableUser=ناپویا کردن
 DisableAUser=ناپویا کردن یک کاربر
@@ -105,7 +106,7 @@ UseTypeFieldToChange=استفاده از نوع‌بخش-فیلد برای تغ
 OpenIDURL=URL OpenID
 LoginUsingOpenID=استفاده از OpenID برای ورو
 WeeklyHours=ساعت‌کاری (در هفته)
-ExpectedWorkedHours=ساعت‌کاری مورد انتظار در هفته
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=رنگ کاربر
 DisabledInMonoUserMode=غیرفعال در حالت نگهداری‌و‌تعمیرا
 UserAccountancyCode=کد حساب‌داری کاربر
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=تاریخ شروع استخدام
 DateEmploymentEnd=تاریخ پایان استخدام
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=شما نمی‌توانید ردیف کاربری خود را غیرفعال کنید
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 74d725122d7..373034849ee 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 6d5d6b0a422..baf2006db44 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Viite
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Päiväkirja
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Kirjattu pääkirjanpitoon
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Täsmäyttämätön
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 75c9a3b2f22..8d44d22a22d 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Mahdollistaaksesi Päivitys-/Asennustyökalun käytön, poista/nimeä
 RestoreLock=Palauta tiedosto <b>%s</b> vain lukuoikeuksin. Tämä estää myöhemmän Päivitys-/Asennustyökalun käytön
 SecuritySetup=Turvallisuusasetukset
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Määritä tänne tiedostojen siirtämiseen palvelimelle liittyvät turvallisuusasetukset
 ErrorModuleRequirePHPVersion=Virhe, tämä moduuli vaatii PHP version %s tai uudemman
 ErrorModuleRequireDolibarrVersion=Virhe, tämä moduuli vaatii Dolibarr: in version %s tai uudemman
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Eivät viittaa siihen,
 NoActiveBankAccountDefined=Ei aktiivisia pankkitilille määritelty
 OwnerOfBankAccount=Omistajan pankkitilille %s
 BankModuleNotActive=Pankkitilit moduuli ei ole käytössä
-ShowBugTrackLink=Näytä linkki "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Hälytykset
 DelaysOfToleranceBeforeWarning=Viive ennen kuin hälytys aktivoituu:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Sinun on suoritettava tämä ko
 YourPHPDoesNotHaveSSLSupport=SSL toimintoja ei saatavilla PHP
 DownloadMoreSkins=Lisää nahat ladata
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Osittainen käännös
@@ -2062,7 +2064,7 @@ UseDebugBar=Käytä virheenkorjauspalkkia
 DEBUGBAR_LOGS_LINES_NUMBER=Konsolissa pidettävien lokirivien määrä
 WarningValueHigherSlowsDramaticalyOutput=Varoitus, suuremmat arvot hidastavat merkittävästi ohjelmaa
 ModuleActivated=Moduuli %son aktiivinen ja hidastaa ohjelmaa
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Jos olet tuotantoympäristössä, määritä tämän ominaisuuden arvoksi %s.
 AntivirusEnabledOnUpload=Virustorjunta käytössä ladatuissa tiedostoissa
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index 3d6580bde09..79be56e9bb7 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal veron maksu
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Sisäinen siirto
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Mistä
 TransferTo=mihin
 TransferFromToDone=A <b>siirtää %s %s %s%</b> s on tallennettu.
 CheckTransmitter=Lähettäjä
 ValidateCheckReceipt=Vahvista tämä sekkikuitti?
-ConfirmValidateCheckReceipt=Oletko varma, että haluat vahvistaa tämän? Muutokset eivät ole enää mahdollisia, vahvistamisen jälkeen?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Poista tämä shekkikuitti?
 ConfirmDeleteCheckReceipt=Haluatko varmasti poistaa tämän sekkikuitin?
 BankChecks=Pankkisekit
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Haluatko varmasti poistaa tämän merkinnän?
 ThisWillAlsoDeleteBankRecord=Tämä poistaa myös luodun pankkimerkinnän
 BankMovements=Siirrot
 PlannedTransactions=Suunnitellut merkinnät
-Graph=Grafiikka
+Graph=Graphs
 ExportDataset_banque_1=Pankkimerkinnät ja tiliotteet
 ExportDataset_banque_2=Talletuslomake
 TransactionOnTheOtherAccount=Tapahtuma toisella tilillä
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Takaisin tiliin
 ShowAllAccounts=Näytä kaikki tilit
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Valitse tämän täsmäytyksen tiliote. Käytä lajiteltavaa numeroarvoa: YYYYMM tai YYYYMMDD
 EventualyAddCategory=Määritä luokka johon tiedot luokitellaan
 ToConciliate=Täsmäytä?
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 9ac2ed704b1..24f5c55b2d0 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Kirjoita maksun saanut asiakas
 EnterPaymentDueToCustomer=Tee maksun asiakkaan
 DisabledBecauseRemainderToPayIsZero=Suljettu, koska maksettavaa ei ole jäljellä
-PriceBase=Perushinta
+PriceBase=Base price
 BillStatus=Laskun tila
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Luonnos (on vahvistettu)
@@ -454,7 +454,7 @@ RegulatedOn=Säännellään
 ChequeNumber=Cheque N
 ChequeOrTransferNumber=Cheque / Transfer N
 ChequeBordereau=Tarkasta aikataulu
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Pankki sekki
 CheckBank=Shekki
 NetToBePaid=Maksettava nettosumma
diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
index 9fa1c9f36ed..a42893fc247 100644
--- a/htdocs/langs/fi_FI/boxes.lang
+++ b/htdocs/langs/fi_FI/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Vanhimat aktiiviset päättyneet palvelut
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Viimeisimmät %s muokatut matka- ja kuluraportit
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Yleisaktiviteetit (laskut, ehdotukset, tilaukset)
 BoxGoodCustomers=Hyvät asiakkaat
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index a00a6ea22e5..e04e7aa113f 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Kuitti
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Selain
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index c98bca84e12..8c037ce650d 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Merkit/Kategoriat
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=Sisällä
 AddIn=Lisää
 modify=muuttaa
 Classify=Luokittele
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 5be2288c86c..5a302b3e193 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Yrityksen nimi %s on jo olemassa. Valitse toinen.
 ErrorSetACountryFirst=Aseta ensin maa
 SelectThirdParty=Valitse sidosryhmä
-ConfirmDeleteCompany=Haluatko varmasti poistaa tämän yrityksen ja kaikki siitä johdetut tiedot?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Poista yhteystieto
-ConfirmDeleteContact=Haluatko varmasti poistaa tämän yhteystiedon ja kaikki siitä johdetut tiedot?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Uusi sidosryhmä
 MenuNewCustomer=Uusi asiakas
 MenuNewProspect=Uusi mahd. asiakas
@@ -69,7 +69,7 @@ PhoneShort=Puhelin
 Skype=Skype
 Call=Puhelu
 Chat=Chat
-PhonePro=Työpuhelin
+PhonePro=Bus. phone
 PhonePerso=Henkilökohtainen puhelin
 PhoneMobile=Matkapuhelin
 No_Email=Hylkää massasähköpostit
@@ -331,7 +331,7 @@ CustomerCodeDesc=Asiakaskohtainen koodi, uniikki jokaiselle asiakkaalle
 SupplierCodeDesc=Toimittajakohtainen koodi, uniikki jokaiselle toimittajalle
 RequiredIfCustomer=Vaaditaan, jos sidosryhmä on asiakas tai mahdollinen asiakas
 RequiredIfSupplier=Vaadittu jos sidosryhmä on toimittaja
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Esitetilaus yhteyttä
 CompanyDeleted=Yritys " %s" poistettu tietokannasta.
@@ -439,12 +439,12 @@ ListSuppliersShort=Toimittajaluettelo
 ListProspectsShort=Luettelo mahdollisista asiakkaista
 ListCustomersShort=Asiakasluettelo
 ThirdPartiesArea=Sidosryhmät/yhteystiedot
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Yhteensä sidosryhmiä
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Avoinna
 ActivityCeased=Kiinni
 ThirdPartyIsClosed=Sidosryhmä on suljettu
-ProductsIntoElements=Tuotteiden/palveluiden luettelo %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Avoin lasku
 OutstandingBill=Avointen laskujen enimmäismäärä
 OutstandingBillReached=Avointen laskujen enimmäismäärä saavutettu
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Asiakas / toimittaja-koodi on maksuton. Tämä koodi void
 ManagingDirectors=Johtajien nimet (TJ, johtaja, päällikkö...)
 MergeOriginThirdparty=Monista sidosryhmä (sidosryhmä jonka haluat poistaa)
 MergeThirdparties=Yhdistä sidosryhmät
-ConfirmMergeThirdparties=Oletko varma, että haluat liittää valitun sidosryhmän nykyiseen? Kaikki linkitetyt tiedot (laskut, tilaukset,...) liitetään nykyiseen sidosryhmään ja valittu ryhmä poistetaan
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Osapuolet yhdistyneet
 SaleRepresentativeLogin=Myyntiedustajan kirjautuminen
 SaleRepresentativeFirstname=Myyntiedustajan etunimi
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index d8680739af0..9ea8491fb18 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Uusi edullisista
 NewCheckDeposit=Uusi tarkistaa talletus
 NewCheckDepositOn=Uusi tarkistaa talletuksen huomioon: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Cheque vastaanotto panos päivämäärä
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/fi_FI/ecm.lang b/htdocs/langs/fi_FI/ecm.lang
index 3adcc59a368..ebde0c0f517 100644
--- a/htdocs/langs/fi_FI/ecm.lang
+++ b/htdocs/langs/fi_FI/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index feec6b25b64..1d8a26f28b0 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s on väärä
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Kirjaudu %s on jo olemassa.
@@ -46,8 +46,8 @@ ErrorWrongDate=Päivämäärä ei ole oikein!
 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. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Jotkin vaaditut kentät eivät ole täytetty.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Luominen epäonnistui hakemiston. Tarkista, että Web-palvelin käyttäjällä on oikeudet kirjoittaa Dolibarr asiakirjat hakemistoon. Jos parametri <b>safe_mode</b> on käytössä tämän PHP, tarkista, että Dolibarr php tiedostot omistaa web-palvelimen käyttäjä (tai ryhmä).
 ErrorNoMailDefinedForThisUser=Ei postia määritelty tälle käyttäjälle
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/fi_FI/eventorganization.lang b/htdocs/langs/fi_FI/eventorganization.lang
new file mode 100644
index 00000000000..7d9658f4cd8
--- /dev/null
+++ b/htdocs/langs/fi_FI/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Asetukset
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Luonnos
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Valmis
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/fi_FI/knowledgemanagement.lang b/htdocs/langs/fi_FI/knowledgemanagement.lang
new file mode 100644
index 00000000000..156fe17e65c
--- /dev/null
+++ b/htdocs/langs/fi_FI/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Asetukset
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Yleisesti
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Artikkeli
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index d0a460d3df8..9623e923f65 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Kopioi
 MailToCCUsers=Copy to users(s)
 MailCCC=Välimuistissa jäljennös
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Viesti
 MailFile=Liitetyt tiedostot
 MailMessage=Sähköpostiviesti
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Sähköpostin lähettämisen määritys on asetettu "%s": ksi. Tätä tilaa ei voi käyttää massapostitusten lähettämiseen.
 MailSendSetupIs2=Sinun on ensin siirryttävä admin-tilillä valikkoon %sHome - Setup - EMails%s parametrin <strong> '%s' </strong> muuttamiseksi käytettäväksi tilassa "%s". Tässä tilassa voit syöttää Internet-palveluntarjoajan antaman SMTP-palvelimen vaatimat asetukset ja käyttää Massa-sähköpostitoimintoa.
 MailSendSetupIs3=Jos sinulla on kysyttävää SMTP-palvelimen määrittämisestä, voit kysyä osoitteesta %s.
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 0e6d21e4a82..9a6f1f0a878 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Tallenna ja luo uusi
 TestConnection=Testaa yhteys
 ToClone=Klooni
 ConfirmCloneAsk=Haluatko varmasti kloonata objektin <b> %s </b>?
-ConfirmClone=Valitse kloonattavat tiedot:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Ei tietoja kloonata määritelty.
 Of=ja
 Go=Mene
@@ -246,7 +246,7 @@ DefaultModel=Oletus doc-pohja
 Action=Tapahtuma
 About=Tietoa
 Number=Numero
-NumberByMonth=Numeroa kuukausittain
+NumberByMonth=Total reports by month
 AmountByMonth=Määrä kuukausittain
 Numero=Numero
 Limit=Raja
@@ -341,8 +341,8 @@ KiloBytes=Kilotavua
 MegaBytes=Megatavua
 GigaBytes=Gigatavua
 TeraBytes=Teratavua
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Mennessä
 From=Mistä
 FromDate=Laskuttaja
 FromLocation=Laskuttaja
-at=at
 to=on
 To=on
+ToDate=on
+ToLocation=on
+at=at
 and=ja
 or=tai
 Other=Muu
@@ -843,7 +845,7 @@ XMoreLines=%s rivi(ä) piilossa
 ShowMoreLines=Näytä enemmän/vähemmän rivejä
 PublicUrl=Julkinen URL
 AddBox=Lisää laatikko
-SelectElementAndClick=Valitse elementti ja klikkaa %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Tulosta tiedostoon %s
 ShowTransaction=Näytä pankkitilin kirjaus
 ShowIntervention=Näytä interventio
@@ -854,8 +856,8 @@ Denied=Kielletty
 ListOf=Luettelo %s
 ListOfTemplates=Luettelo Pohjista
 Gender=Sukupuoli
-Genderman=Mies
-Genderwoman=Nainen
+Genderman=Male
+Genderwoman=Female
 Genderother=Muu
 ViewList=Näytä lista
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index ee9821fd4f7..1677ab2adab 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Toinen jäsen <b>(nimi: %s, kirjautum
 ErrorUserPermissionAllowsToLinksToItselfOnly=Turvallisuussyistä sinun täytyy myöntää oikeudet muokata kaikki käyttäjät pystyvät linkki jäsenen käyttäjä, joka ei ole sinun.
 SetLinkToUser=Linkki on Dolibarr käyttäjä
 SetLinkToThirdParty=Linkki on Dolibarr kolmannen osapuolen
-MembersCards=Jäsenet tulostaa kortit
+MembersCards=Business cards for members
 MembersList=Luettelo jäsenistä
 MembersListToValid=Luettelo luonnoksen jäsenten (jotka on vahvistettu)
 MembersListValid=Luettelo voimassa jäseniä
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Jäsenet Merkintäoikeuksien vastaanottaa
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Tilaus päivämäärän
 DateEndSubscription=Tilaus lopetuspäivämäärää
-EndSubscription=Lopeta tilaus
+EndSubscription=Subscription Ends
 SubscriptionId=Tilaus id
 WithoutSubscription=Without subscription
 MemberId=Jäsen id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Vaatii tilauksen
 DeleteType=Poistaa
 VoteAllowed=Äänestys sallittua
-Physical=Fyysinen
-Moral=Moraalinen
-MorAndPhy=Moral and Physical
-Reenable=Ottaa ne uudelleen
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Jäsenten tilastot maittain
 MembersStatisticsByState=Jäsenten tilastot valtio / lääni
 MembersStatisticsByTown=Jäsenten tilastot kaupunki
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Jäsenmäärä
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Ei validoitu jäsenet pitivät
-MembersByCountryDesc=Tämä ruutu näyttää tilastoja jäseniä maittain. Graphic riippuu kuitenkin Googlen online-käyrä palvelu ja on käytettävissä vain, jos internet-yhteys toimii.
-MembersByStateDesc=Tämä ruutu näyttää tilastoja jäsenistä valtion / maakuntien / kantonissa.
-MembersByTownDesc=Tämä ruutu näyttää tilastoja jäsenille kaupungin.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Valitse tilastot haluat lukea ...
 MenuMembersStats=Tilasto
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Tiedot ovat julkisia
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Uusi jäsen. Odottaa hyväksyntää
 NewMemberForm=Uusi jäsen lomake
-SubscriptionsStatistics=Tilastot tilauksista
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Kappaletta
-AmountOfSubscriptions=Määrä liittymää
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Liikevaihto (yritykselle) tai budjetti (ja säätiö)
 DefaultAmount=Oletus määrä tilauksen
 CanEditAmount=Matkailija voi valita / muokata määrä merkitsemästään
 MEMBER_NEWFORM_PAYONLINE=Hyppää integroitu verkossa maksusivulla
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/fi_FI/modulebuilder.lang b/htdocs/langs/fi_FI/modulebuilder.lang
index 23fe1bd694b..13dfee730b5 100644
--- a/htdocs/langs/fi_FI/modulebuilder.lang
+++ b/htdocs/langs/fi_FI/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index e56b76868d9..d5d81d8306a 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 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 for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/fi_FI/partnership.lang b/htdocs/langs/fi_FI/partnership.lang
new file mode 100644
index 00000000000..1d3a9bab390
--- /dev/null
+++ b/htdocs/langs/fi_FI/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Aloituspäivämäärä
+DatePartnershipEnd=Lopetuspäivä
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Luonnos
+PartnershipAccepted = Accepted
+PartnershipRefused = Hylätty
+PartnershipCanceled = Peruttu
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang
index 1b0614a2c73..e256a46afde 100644
--- a/htdocs/langs/fi_FI/productbatch.lang
+++ b/htdocs/langs/fi_FI/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 9ea5a554395..78ce167092c 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Palvelut vain myynti
 ServicesOnPurchaseOnly=Palvelut vain osto
 ServicesNotOnSell=Palvelut eivät ole myynnissä ja ostossa
 ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Viimeksi %s tallennetut tuotteet
 LastRecordedServices=Viimeksi %s tallennetut palvelut
 CardProduct0=Tuote
@@ -73,12 +73,12 @@ SellingPrice=Myyntihinta
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Myyntihinta (sis. alv)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Tätä arvoi voidaan käyttää katteen laskennassa
 SoldAmount=Myyty määrä
 PurchasedAmount=Ostettu määrä
 NewPrice=Uusi hinta
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Myyntihinta ei saa olla pienempi kuin pienin sallittu tämän tuotteen hinta ( %s ilman veroja)
 ContractStatusClosed=Suljettu
@@ -157,11 +157,11 @@ ListServiceByPopularity=Luettelo palvelujen suosio
 Finished=Valmistettua tuotetta
 RowMaterial=Ensimmäinen aineisto
 ConfirmCloneProduct=Oletko varma että haluat kopioida tuotteen tai palvelun <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Kopioi hinnat
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Tämä tuote on käytetty
 NewRefForClone=Ref. uuden tuotteen tai palvelun
 SellingPrices=Myyntihinnat
@@ -170,12 +170,12 @@ CustomerPrices=Asiakas hinnat
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Alkuperämaa
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Yksikkö
 p=u.
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 1f49da052b2..3697cb848f0 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Hankkeen yhteystiedot
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Omat ja muiden projektit 
 AllProjects=Kaikki hankkeet
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Tässä näkymässä esitetään kaikki hankkeet joita sinulla on oikaus katsoa.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Tässä näkymässä esitetään kaikki tehtävät joita sinulla on oikaus katsoa.
 ProjectsDesc=Tämä näkemys esitetään kaikki hankkeet (käyttäjäoikeuksien antaa sinulle luvan katsella kaikkea).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Suljetut projektit eivät ole nähtävissä.
 TasksPublicDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät sinulla voi lukea.
 TasksDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät (käyttäjäoikeuksien antaa sinulle luvan katsella kaikkea).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Projektien tehtävät
 ProjectCategories=Projektien/Tehtävien kategoriat
 NewProject=Uusi projekti
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/fi_FI/recruitment.lang b/htdocs/langs/fi_FI/recruitment.lang
index 9702bc62631..048bd27da9b 100644
--- a/htdocs/langs/fi_FI/recruitment.lang
+++ b/htdocs/langs/fi_FI/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index 7c6e6c9e98e..0bd5b5ada75 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 malli
 WarningNoQtyLeftToSend=Varoitus, ei tuotteet odottavat lähettämistä.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Suunniteltu toimituspäivä
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 60d143e3df2..b50200fab75 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Ei ennalta tuotteet tämän objektin. Joten ei lä
 DispatchVerb=Lähettäminen
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Varastossa
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index 97f20b34cf5..45c8c06dfb0 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Salasana muutettu: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Ryhmän käyttöoikeudet
 UserRights=Käyttöluvat
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Poista käytöstä
 DisableAUser=Poista käyttäjä käytöstä
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 4bd6e9e73de..49d16596839 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 11b91eb3db3..d3858cde9ce 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - accountancy
 Processing=Exécution
 Lineofinvoice=Lignes de facture
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 Doctype=Type de document
 ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps
 TotalMarge=Marge de ventes totale
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 4b1e1bad526..5d24a311ccd 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -16,7 +16,6 @@ FormToTestFileUploadForm=Formulaire pour tester l'upload de fichiers (selon la c
 IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
 Module20Name=Propales
 Module30Name=Factures
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 Target=Objectif
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_BE/cron.lang b/htdocs/langs/fr_BE/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/fr_BE/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/fr_BE/modulebuilder.lang b/htdocs/langs/fr_BE/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/fr_BE/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index ef78367de7a..c44802ed2f4 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -93,6 +93,7 @@ ACCOUNTING_LENGTH_DESCRIPTION=Tronquer la description des produits et services d
 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)
 BANK_DISABLE_DIRECT_INPUT=Désactiver l'enregistrement direct de la transaction dans le compte bancaire
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Note de frais
 DONATION_ACCOUNTINGACCOUNT=Compte comptable pour enregistrer des dons
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (utilisé si non défini dans la fiche de service)
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 4cd705f4634..61a863bf5a2 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -123,7 +123,6 @@ SetupNotSaved=Le programme d'installation n'a pas été enregistré
 CurrentNext=Actuel / Suivant
 DefaultMaxSizeList=Longueur maximale des listes
 CompanyObject=Objet de la compagnie
-ShowBugTrackLink=Afficher le lien "Signaler un défaut"
 InfoDolibarr=À propos de Dolibarr
 InfoBrowser=À propos du navigateur
 InfoWebServer=À propos du serveur Web
diff --git a/htdocs/langs/fr_CA/banks.lang b/htdocs/langs/fr_CA/banks.lang
index 1a6bfe95807..75a031fba60 100644
--- a/htdocs/langs/fr_CA/banks.lang
+++ b/htdocs/langs/fr_CA/banks.lang
@@ -24,8 +24,8 @@ AddBankRecordLong=Ajouter une entrée manuellement
 Reconciled=Réconcilié
 SocialContributionPayment=Règlement charge sociale
 MenuBankInternalTransfer=Transfert interne
+CheckTransmitter=Expéditeur
 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
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index a08d3fbe9b5..a10b60e502a 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -75,7 +75,6 @@ PaymentTypeTIP=CONSEIL (Documents contre paiement)
 PaymentTypeShortTIP=PAIEMENT Paiement
 PaymentTypeTRA=Procédure bancaire
 PaymentTypeShortTRA=Brouillon
-ChequeMaker=Émetteur du chèque/transfert
 DepositId=Identifiant de dépot
 CreditNoteConvertedIntoDiscount=Ce %s a été converti en %s
 YouMustCreateStandardInvoiceFirstDesc=Vous devez d'abord créer une facture standard et la convertir en «modèle» pour créer une nouvelle facture modèle
diff --git a/htdocs/langs/fr_CA/boxes.lang b/htdocs/langs/fr_CA/boxes.lang
index 360f6ed215b..cd98094f2e4 100644
--- a/htdocs/langs/fr_CA/boxes.lang
+++ b/htdocs/langs/fr_CA/boxes.lang
@@ -13,9 +13,6 @@ BoxTitleLastModifiedMembers=%s derniers membres
 BoxTitleLastFicheInter=%s dernières interventions modifiées
 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
 LastRefreshDate=Dernière date de rafraîchissement
 NoRecordedInvoices=Aucune facture de client enregistrée
diff --git a/htdocs/langs/fr_CA/categories.lang b/htdocs/langs/fr_CA/categories.lang
index 482ef9dfa42..6357b823f41 100644
--- a/htdocs/langs/fr_CA/categories.lang
+++ b/htdocs/langs/fr_CA/categories.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - categories
 Rubriques=Tags/Catégories
 RubriquesTransactions=Tags / Catégories de transactions
-MembersCategoriesArea=Espace tags/catégories de membres
-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
diff --git a/htdocs/langs/fr_CA/companies.lang b/htdocs/langs/fr_CA/companies.lang
index 55f15ff7270..9651cc0af4c 100644
--- a/htdocs/langs/fr_CA/companies.lang
+++ b/htdocs/langs/fr_CA/companies.lang
@@ -1,6 +1,4 @@
 # 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, ... )
 PostOrFunction=Poste
@@ -30,7 +28,6 @@ AllocateCommercial=Attribué au représentant des ventes
 YouMustCreateContactFirst=Pour pouvoir ajouter des notifications par courrier électronique, vous devez d'abord définir des contacts avec des courriels valides pour le tiers
 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
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index be3f8df0eb9..809a2d2f220 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - errors
 NoErrorCommitIsDone=Aucune erreur, nous nous engageons
 ErrorButCommitIsDone=Erreurs trouvées, mais nous validons malgré cela
-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>'.
@@ -27,8 +26,6 @@ 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)
-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.
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index c65ead929f9..61ed834131a 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -102,7 +102,6 @@ CoreErrorMessage=Désolé, une erreur s'est produite. Contactez votre administra
 LinkToProposal=Lier à une proposition
 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=Êtes-vous sûr de vouloir supprimer cette ligne?
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
index 6734cb9fec0..7d32d37f0d7 100644
--- a/htdocs/langs/fr_CA/members.lang
+++ b/htdocs/langs/fr_CA/members.lang
@@ -14,7 +14,6 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre membre (nom: <b> %s</b>, con
 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.
 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
@@ -26,7 +25,6 @@ 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
@@ -58,7 +56,6 @@ ListOfSubscriptions=Liste des abonnements
 AddMember=Créer un membre
 NoTypeDefinedGoToSetup=Aucun type de membre n'est défini. Aller au menu "Types de membres"
 SubscriptionRequired=Abonnement requis
-Reenable=Reignable
 ResiliateMember=Terminer un membre
 ConfirmResiliateMember=Êtes-vous sûr de vouloir mettre fin à ce membre?
 DeleteMember=Supprimer un membre
@@ -101,23 +98,14 @@ DocForLabels=Générer des feuilles d'adresses
 SubscriptionPayment=Paiement 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
 LatestSubscriptionDate=La dernière date d'abonnement
-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
-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
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produit utilisé pour la ligne d'abonnement en facture: %s
diff --git a/htdocs/langs/fr_CA/modulebuilder.lang b/htdocs/langs/fr_CA/modulebuilder.lang
index a482f9657e2..2c9957b48a1 100644
--- a/htdocs/langs/fr_CA/modulebuilder.lang
+++ b/htdocs/langs/fr_CA/modulebuilder.lang
@@ -6,4 +6,3 @@ ModuleBuilderDeschooks=Cet onglet est dédié aux crochets.
 ModuleBuilderDescwidgets=Cet onglet est dédié à la gestion / création de widgets.
 DangerZone=Zone dangereuse
 DescriptionLong=Longue description
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
index 897ca360dc9..947742b3356 100644
--- a/htdocs/langs/fr_CA/products.lang
+++ b/htdocs/langs/fr_CA/products.lang
@@ -75,7 +75,6 @@ ServiceNb=Service # %s
 ListProductServiceByPopularity=Liste des produits / services par popularité
 Finished=Produit fabriqué
 ConfirmCloneProduct=Êtes-vous sûr de vouloir cloner un produit ou un service <b>%s</b>?
-CloneCombinationsProduct=Variantes de produit de clonage
 NewRefForClone=Réf. De nouveau produit / service
 SellingPrices=Prix ​​de vente
 BuyingPrices=Prix ​​d'achat
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index edb3ebdf924..2dcbd564066 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -15,7 +15,6 @@ OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets en ébauc
 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).
-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?
@@ -92,7 +91,6 @@ TimeAlreadyRecorded=Il s'agit du temps passé déjà enregistré pour cette tâc
 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
diff --git a/htdocs/langs/fr_CA/sendings.lang b/htdocs/langs/fr_CA/sendings.lang
index 9cf4c3906c4..1be6cc0153c 100644
--- a/htdocs/langs/fr_CA/sendings.lang
+++ b/htdocs/langs/fr_CA/sendings.lang
@@ -28,7 +28,6 @@ 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
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/fr_CH/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index 619ae5f8bd4..c1d306ec390 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CH/cron.lang b/htdocs/langs/fr_CH/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/fr_CH/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/fr_CH/modulebuilder.lang b/htdocs/langs/fr_CH/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/fr_CH/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/fr_CI/accountancy.lang b/htdocs/langs/fr_CI/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/fr_CI/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/fr_CI/admin.lang b/htdocs/langs/fr_CI/admin.lang
index 619ae5f8bd4..c1d306ec390 100644
--- a/htdocs/langs/fr_CI/admin.lang
+++ b/htdocs/langs/fr_CI/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CI/cron.lang b/htdocs/langs/fr_CI/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/fr_CI/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/fr_CI/modulebuilder.lang b/htdocs/langs/fr_CI/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/fr_CI/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/fr_CM/accountancy.lang b/htdocs/langs/fr_CM/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/fr_CM/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/fr_CM/admin.lang b/htdocs/langs/fr_CM/admin.lang
index 619ae5f8bd4..c1d306ec390 100644
--- a/htdocs/langs/fr_CM/admin.lang
+++ b/htdocs/langs/fr_CM/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CM/cron.lang b/htdocs/langs/fr_CM/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/fr_CM/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/fr_CM/modulebuilder.lang b/htdocs/langs/fr_CM/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/fr_CM/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 68c6f4841c5..e01b49a1e37 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -202,14 +202,14 @@ Docref=Référence
 LabelAccount=Libellé du compte
 LabelOperation=Libellé opération
 Sens=Sens
-AccountingDirectionHelp=Pour le compte comptable d'un client, utilisez Crédit pour enregistrer un règlement reçu.<br>Pour le compte comptable d'un fournisseur, utilisez Débit pour enregistrer un règlement reçu.
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Code de lettrage
 Lettering=Lettrage
 Codejournal=Journal
 JournalLabel=Libellé journal
 NumPiece=Numéro de pièce
 TransactionNumShort=Num. transaction
-AccountingCategory=Custom group
+AccountingCategory=Groupe personnalisé
 GroupByAccountAccounting=Affichage par compte comptable
 GroupBySubAccountAccounting=Affichage par compte auxiliaire
 AccountingAccountGroupsDesc=Vous pouvez définir ici des groupes de comptes comptable. Il seront utilisés pour les reporting comptables personnalisés
@@ -297,7 +297,7 @@ NoNewRecordSaved=Plus d'enregistrements à journaliser
 ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte comptable
 ChangeBinding=Changer les liens
 Accounted=En comptabilité
-NotYetAccounted=Pas encore en comptabilité
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Afficher le tutoriel
 NotReconciled=Non rapproché
 WarningRecordWithoutSubledgerAreExcluded=Attention : toutes les opérations sans compte auxiliaire défini sont filtrées et exclues de cet écran
@@ -402,29 +402,29 @@ UseMenuToSetBindindManualy=Lignes non encore liées, utilisez le menu <a href="%
 
 ## Import
 ImportAccountingEntries=Écritures comptables
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+ImportAccountingEntriesFECFormat=Écritures comptables - format FEC
 FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
-FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+FECFormatJournalLabel=Libellé du journal (JournalLib)
+FECFormatEntryNum=Numéro de la pièce (EcritureNum)
+FECFormatEntryDate=Date de la pièce (EcritureDate)
+FECFormatGeneralAccountNumber=Numéro du compte général (CompteNum)
+FECFormatGeneralAccountLabel=Libellé du compte général (CompteLib)
+FECFormatSubledgerAccountNumber=Numéro de compte du grand livre auxiliaire (CompAuxNum)
+FECFormatSubledgerAccountLabel=Libellé de compte du grand livre auxiliaire (CompAuxLib)
+FECFormatPieceRef=Référence de la pièce (PieceRef)
+FECFormatPieceDate=Date de création de la pièce (PieceDate)
+FECFormatLabelOperation=Libellé de l'opération (EcritureLib)
+FECFormatDebit=Débit (Debit)
+FECFormatCredit=Crédit (Credit)
+FECFormatReconcilableCode=Code de réconciliation (EcritureLet)
+FECFormatReconcilableDate=Date de réconciliation (DateLet)
+FECFormatValidateDate=Date de validation de la pièce (ValidDate)
+FECFormatMulticurrencyAmount=Montant multidevise (Montantdevise)
+FECFormatMulticurrencyCode=Code multidevise (Idevise)
 
 DateExport=Date d'export
 WarningReportNotReliable=Attention : ce rapport n'est pas basé sur le grand livre et ne contient donc pas les écritures manuelles qui lui ont été ajoutées. Si votre journalisation est à jour, la vue depuis le grand livre sera plus précise.
 ExpenseReportJournal=Journal des notes de frais
 InventoryJournal=Journal d'inventaire
 
-NAccounts=%s accounts
+NAccounts=%s comptes
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 5d46f36ab0f..44e4aba52ed 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -63,7 +63,8 @@ IfModuleEnabled=Rem: oui est effectif uniquement si le module <b>%s</b> est acti
 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é
-PHPSetup=PHP setup
+PHPSetup=Configuration PHP
+OSSetup=OS setup
 SecurityFilesDesc=Définissez ici les options de sécurité des téléchargements de fichiers
 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
@@ -1159,7 +1160,7 @@ 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 lien <strong>"%s"</strong>
+ShowBugTrackLink=Définir le lien "<strong>%s</strong>" (vide pour ne pas afficher ce lien, 'github' pour le lien vers le projet Dolibarr ou définir directement une url 'https:/...')
 Alerts=Alertes
 DelaysOfToleranceBeforeWarning=Délais avant affichage de l'avertissement alerte retard
 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.
@@ -1184,8 +1185,8 @@ SetupDescription2=Les deux étapes obligatoires sont les deux premières entrée
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Paramètres basiques pour personnaliser le comportement par défaut du logiciel (comportement lié au pays par exemple).
 SetupDescription4=<a href="%s"> %s -> %s </a><br> <br>Ce logiciel est un ensemble de plusieurs modules/applications. Les fonctionnalités en rapport avec vos besoins doivent être activées et configurées. Les entrées menus seront ajoutées avec l'activation de ces modules.
 SetupDescription5=Les autres entrées de configuration gèrent des paramètres facultatifs.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
+AuditedSecurityEvents=Événements de sécurité audités
+NoSecurityEventsAreAduited=Aucun événement de sécurité n'est audité. Vous pouvez les activer à partir du menu %s
 Audit=Audit de sécurité
 InfoDolibarr=Infos Dolibarr
 InfoBrowser=Infos navigateur
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Vous devez exécuter la command
 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.
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Afficher l'identifiant professionnel dans les adresses sur les documents
 ShowVATIntaInAddress=Cacher le numéro de TVA Intracommunautaire dans les adresses sur les documents.
 TranslationUncomplete=Traduction partielle
@@ -1751,7 +1753,7 @@ CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Laissez la case à cocher "Créer automatiqu
 ##### Agenda #####
 AgendaSetup=Configuration du module actions et agenda
 PasswordTogetVCalExport=Clé pour autoriser le lien d'exportation
-SecurityKey = Security Key
+SecurityKey = Clé de sécurité
 PastDelayVCalExport=Ne pas exporter les événements de plus de
 AGENDA_USE_EVENT_TYPE=Utiliser les types d'événements (gérés dans le menu Configuration -> Dictionnaires -> Type d'événements de l'agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Configurez automatiquement cette valeur par défaut pour le type d'événement dans le formulaire de création d'événement.
@@ -1995,7 +1997,7 @@ SocialNetworkSetup=Configuration du module Réseaux Sociaux
 EnableFeatureFor=Activer les fonctionnalités pour <strong> %s </strong>
 VATIsUsedIsOff=Remarque: l'option d'utilisation de la taxe de vente ou de la TVA a été définie sur <strong> Désactivée </strong> dans le menu %s - %s, aussi la taxe de vente ou la TVA utilisée sera toujours égale à 0 pour les ventes.
 SwapSenderAndRecipientOnPDF=Inverser la position des adresses expéditeurs et destinataires sur les documents PDF
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Attention, fonctionnalité prise en charge sur les champs de texte et les listes déroulantes uniquement. De plus, un paramètre d'URL action=create ou action=edit doit être défini OU le nom de la page doit se terminer par 'new.php' pour déclencher cette fonctionnalité.
 EmailCollector=Collecteur de courrier électronique
 EmailCollectorDescription=Ajoute un travail planifié et une page de configuration pour analyser régulièrement les boîtes aux lettres (à l'aide du protocole IMAP) et enregistrer les courriers électroniques reçus dans votre application, au bon endroit et/ou créer automatiquement certains enregistrements (comme des opportunités).
 NewEmailCollector=Nouveau collecteur d'email
@@ -2062,11 +2064,11 @@ UseDebugBar=Utilisez la barre de débogage
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre de dernières lignes de logs à conserver dans la console
 WarningValueHigherSlowsDramaticalyOutput=Attention, les valeurs élevées ralentissent considérablement les affichages
 ModuleActivated=Le module %s est activé et ralentit l'interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
+ModuleSyslogActivatedButLevelNotTooVerbose=Le module %s est activé et le niveau de journalisation (%s) est correct (pas trop verbeux)
 IfYouAreOnAProductionSetThis=Sur un environnement de production, vous devriez régler ce paramètre sur %s.
 AntivirusEnabledOnUpload=Antivirus activé sur le téléversement des fichiers
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+SomeFilesOrDirInRootAreWritable=Certains fichiers ou répertoires ne sont pas en mode lecture seule
 EXPORTS_SHARE_MODELS=Les modèles d'exportation sont partagés avec tout le monde
 ExportSetup=Configuration du module Export
 ImportSetup=Configuration du module Import
@@ -2090,8 +2092,8 @@ MakeAnonymousPing=Effectuez un ping «+1» anonyme sur le serveur de la fondatio
 FeatureNotAvailableWithReceptionModule=Fonction non disponible lorsque le module Réception est activée
 EmailTemplate=Modèle d'e-mail
 EMailsWillHaveMessageID=Les e-mails auront une étiquette 'References' correspondant à cette syntaxe
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
+PDF_SHOW_PROJECT=Afficher le projet sur le document
+ShowProjectLabel=Libellé du projet
 PDF_USE_ALSO_LANGUAGE_CODE=Si vous souhaitez que certains textes de votre PDF soient dupliqués dans 2 langues différentes dans le même PDF généré, vous devez définir ici cette deuxième langue pour que le PDF généré contienne 2 langues différentes dans la même page, celle choisie lors de la génération du PDF et celle-ci (seuls quelques modèles PDF prennent en charge cette fonction). Gardez vide pour 1 langue par PDF.
 FafaIconSocialNetworksDesc=Entrez ici le code d'une icône FontAwesome. Si vous ne savez pas ce qu'est FontAwesome, vous pouvez utiliser la valeur générique fa-address-book.
 FeatureNotAvailableWithReceptionModule=Fonction non disponible lorsque le module Réception est activée
@@ -2116,9 +2118,14 @@ AskThisIDToYourBank=Contacter votre établissement bancaire pour obtenir ce code
 AdvancedModeOnly=Autorisation disponible en mode Autorisations avancées uniquement
 ConfFileIsReadableOrWritableByAnyUsers=Le fichier conf est lisible ou inscriptible par tous les utilisateurs. Donnez l'autorisation à l'utilisateur et au groupe du serveur Web uniquement.
 MailToSendEventOrganization=Organisation d'événements
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
+AGENDA_EVENT_DEFAULT_STATUS=État de l’événement par défaut lors de la création d’un événement à partir du formulaire
+YouShouldDisablePHPFunctions=Vous devriez désactiver les fonctions PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Sauf si vous avez besoin d’exécuter des commandes système (pour le module Tâche planifiée, ou pour exécuter l'Anti-virus externe en ligne de commande par exemple), vous devriez désactiver les fonctions PHP
+NoWritableFilesFoundIntoRootDir=Aucun fichier ou répertoire des programmes courants n’a été trouvé en écriture dans votre répertoire racine (Bon)
+RecommendedValueIs=Recommandé : %s
+ARestrictedPath=Un chemin restreint
+CheckForModuleUpdate=Vérifier les mises à jour des modules externes
+CheckForModuleUpdateHelp=Cette action se connecte aux éditeurs des modules externes pour vérifier si une nouvelle version est disponible.
+ModuleUpdateAvailable=Une mise à jour est disponible
+NoExternalModuleWithUpdate=Aucune mise à jour trouvée pour les modules externes
+SwaggerDescriptionFile=Fichier de description de l’API Swagger (à utiliser avec redoc par exemple)
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index e97c2480b1c..e6085517629 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Paiement de charge fiscale/sociale
 BankTransfer=Virement bancaire
 BankTransfers=Virements bancaire
 MenuBankInternalTransfer=Virement interne
-TransferDesc=Transférer d'un compte bancaire à un autre, Dolibarr ajoutera deux lignes d'écritures (une ligne de débit dans le compte source et une ligne de crédit dans le compte de destination. le même montant (excepté le signe), le libellé et la date seront utilisés pour la transaction).
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=De
 TransferTo=Vers
 TransferFromToDone=Le virement depuis <b>%s</b> vers <b>%s</b> de <b>%s</b> %s a été créé.
-CheckTransmitter=Emetteur
+CheckTransmitter=Émetteur
 ValidateCheckReceipt=Valider ce bordereau de remise de chèques ?
-ConfirmValidateCheckReceipt=Êtes-vous sûr de vouloir valider ce bordereau, aucune modification n'est possible une fois le bordereau validé ?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Supprimer ce bordereau de remise ?
 ConfirmDeleteCheckReceipt=Êtes-vous sûr de vouloir supprimer ce bordereau ?
 BankChecks=Chèques
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Êtes-vous sûr de vouloir supprimer cette écriture ?
 ThisWillAlsoDeleteBankRecord=Ceci supprimera aussi les écritures bancaires générées
 BankMovements=Mouvements
 PlannedTransactions=Écritures prévues
-Graph=Graphiques
+Graph=Graphs
 ExportDataset_banque_1=Écritures bancaires et relevés
 ExportDataset_banque_2=Bordereaux de remises de chèques
 TransactionOnTheOtherAccount=Écriture sur l'autre compte
@@ -142,7 +142,7 @@ AllAccounts=Tous les comptes bancaires et caisses
 BackToAccount=Retour au compte
 ShowAllAccounts=Afficher pour tous les comptes
 FutureTransaction=Transaction future. Pas moyen de rapprocher.
-SelectChequeTransactionAndGenerate=Sélectionner/filtrer les chèques à inclure dans le bordereau de remise et cliquer sur "Créer".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choisissez le relevé bancaire liés au rapprochement. Utilisez une valeur numérique triable: AAAAMM ou AAAAMMJJ
 EventualyAddCategory=Eventuellement, saisissez une catégorie dans laquelle classer les écritures
 ToConciliate=A rapprocher ?
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 4b321bd3464..6fd0827698c 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -82,8 +82,8 @@ PaymentsAlreadyDone=Versements déjà effectués
 PaymentsBackAlreadyDone=Remboursements déjà effectués
 PaymentRule=Mode de paiement
 PaymentMode=Mode de règlement
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
+DefaultPaymentMode=Type de paiement par défaut
+DefaultBankAccount=Compte bancaire par défaut
 PaymentTypeDC=Carte débit/crédit
 PaymentTypePP=PayPal
 IdPaymentMode=Type de paiement (id)
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convertir le trop-payé en crédit disponible
 EnterPaymentReceivedFromCustomer=Saisie d'un règlement reçu du client
 EnterPaymentDueToCustomer=Saisie d'un remboursement d'un avoir client
 DisabledBecauseRemainderToPayIsZero=Désactivé car reste à payer est nul
-PriceBase=Base du prix
+PriceBase=Base price
 BillStatus=État de la facture
 StatusOfGeneratedInvoices=Statut des factures générées
 BillStatusDraft=Brouillon (à valider)
@@ -376,7 +376,7 @@ DateLastGeneration=Date de la dernière génération
 DateLastGenerationShort=Date de dernière génération
 MaxPeriodNumber=Nombre maximum de génération
 NbOfGenerationDone=Nombre de génération de facture déjà réalisées
-NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationOfRecordDone=Nombre d’enregistrements déjà générés
 NbOfGenerationDoneShort=Nb de générations réalisée
 MaxGenerationReached=Nombre maximum de générations atteint
 InvoiceAutoValidate=Valider les factures automatiquement
@@ -454,7 +454,7 @@ RegulatedOn=Réglé le
 ChequeNumber=Chèque N°
 ChequeOrTransferNumber=Chèque/Virement N°
 ChequeBordereau=Vérifier
-ChequeMaker=Emetteur du chèque/virement
+ChequeMaker=Check/Transfer sender
 ChequeBank=Banque du chèque
 CheckBank=Chèque
 NetToBePaid=Net à payer
@@ -520,10 +520,10 @@ YouMustCreateStandardInvoiceFirstDesc=Pour créer une facture modèle, vous deve
 PDFCrabeDescription=Modèle de facture PDF Crabe. Un modèle de facture complet (ancienne implémentation du modèle Sponge)
 PDFSpongeDescription=Modèle de facture PDF Sponge. Un modèle de facture complet
 PDFCrevetteDescription=Modèle de facture PDF Crevette (modèle complet pour les factures de situation)
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Renvoie une numérotation au format %syymm-nnnn pour les factures standard et %syymm-nnnn pour les avoirs où yy es l'année, mm le mois et nnnn est un compteur sans rupture ni retour à zéro
+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 avoirs où yy est l'année, mm le mois et nnnn un compteur sans rupture ni retour à 0.
 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=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Renvoie une numérotation au format %syymm-nnnn pour les factures standards, %syymm-nnnn pour les avoirs et %syymm-nnnn pour les factures d'acompte où yy est l'année, mm le mois et nnnn un compteur sans rupture ni retour à 0.
 EarlyClosingReason=Raison de la clôture anticipée
 EarlyClosingComment=Note de clôture anticipée
 ##### Types de contacts #####
diff --git a/htdocs/langs/fr_FR/blockedlog.lang b/htdocs/langs/fr_FR/blockedlog.lang
index be1cefc6ef7..5ef44ec366c 100644
--- a/htdocs/langs/fr_FR/blockedlog.lang
+++ b/htdocs/langs/fr_FR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Logs inaltérables
 ShowAllFingerPrintsMightBeTooLong=Afficher tous les journaux archivés (peut être long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Afficher tous les journaux d'archives non valides (peut être long)
 DownloadBlockChain=Télécharger les empreintes
-KoCheckFingerprintValidity=Le journal archivé n'est pas valide. Cela signifie que quelqu'un (un pirate informatique ?) a modifié certaines données de ce journal archivé après son enregistrement ou a effacé l'enregistrement archivé précédent (vérifiez que la ligne avec le numéro précédent existe).
+KoCheckFingerprintValidity=L'entrée du journal archivé n'est pas valide. Cela signifie que quelqu'un (un hacker ?) a modifié certaines données de cet enregistrement après qu'il ait été enregistré, ou a effacé l'enregistrement archivé précédent (vérifiez que la ligne avec le # précédent existe) ou a modifié la somme de contrôle de l'enregistrement précédent.
 OkCheckFingerprintValidity=Le journal archivé est valide. Les données de cette ligne n'ont pas été modifiées et l'enregistrement suit le précédent.
 OkCheckFingerprintValidityButChainIsKo=Le journal archivé semble valide par rapport au précédent mais la chaîne était corrompue auparavant.
 AddedByAuthority=Stocké dans une autorité distante
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index e54f69e69bf..a70ab75ca55 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -18,13 +18,13 @@ BoxLastActions=Derniers évènements
 BoxLastContracts=Derniers contrats
 BoxLastContacts=Derniers contacts/adresses
 BoxLastMembers=Derniers adhérents
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=Derniers adhérents modifiés
+BoxLastMembersSubscriptions=Dernières cotisations d'adhérents
 BoxFicheInter=Dernières interventions
 BoxCurrentAccounts=Balance des comptes ouverts
 BoxTitleMemberNextBirthdays=Anniversaires de ce mois (adhérents)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleMembersByType=Adhérents par type
+BoxTitleMembersSubscriptionsByYear=Cotisations des adhérents par année
 BoxTitleLastRssInfos=Les %s dernières informations de %s
 BoxTitleLastProducts=Les %s derniers produits/services modifiés
 BoxTitleProductsAlertStock=Produits en alerte stock
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Mes %s derniers marque-pages
 BoxOldestExpiredServices=Plus anciens services expirés
 BoxLastExpiredServices=Les %s plus anciens contrats avec services actifs expirés
 BoxTitleLastActionsToDo=Les %s derniers événements à réaliser
-BoxTitleLastContracts=Les %s derniers contrats modifiés
-BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
-BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
-BoxTitleLatestModifiedBoms=Les %s dernières nomenclatures modifiées
-BoxTitleLatestModifiedMos=Les %s dernières Ordres de Fabrication modifiées
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Clients dont l'en-cours autorisé est dépassé
 BoxGlobalActivity=Activité globale (factures, propositions, commandes)
 BoxGoodCustomers=Bons clients
@@ -112,9 +112,9 @@ BoxTitleLastCustomerShipments=Les %s dernières expéditions clients
 NoRecordedShipments=Aucune expédition client
 BoxCustomersOutstandingBillReached=Clients dont l'en-cours de facturation est dépassé
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
+UsersHome=Accueil utilisateurs et groupes
+MembersHome=Accueil adhésion
+ThirdpartiesHome=Accueil tiers
+TicketsHome=Accueil tickets
 AccountancyHome=Espace Comptabilité
 ValidatedProjects=Projets validés
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 9e3d3fcbf62..93005f5a583 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Etage
 AddTable=Ajouter une table
 Place=Emplacement
 TakeposConnectorNecesary='Connecteur TakePOS' requis
-OrderPrinters=Commande imprimantes
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Rechercher un produit
 Receipt=Reçu
 Header=Entête
@@ -58,7 +59,7 @@ BillsCoinsPad=Pavé avec montant des Pièces et Billets
 DolistorePosCategory=Modules TakePOS et autres solutions de PDV pour Dolibarr
 TakeposNeedsCategories=TakePOS a besoin d'au moins une catégorie de produits pour fonctionner
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS a besoin d'au moins 1 catégorie de produits dans la catégorie <b> %s </b> pour fonctionner
-OrderNotes=Notes de commande
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Compte par défaut à utiliser pour les paiements en
 NoPaimementModesDefined=Aucun mode de paiement défini dans la configuration de TakePOS
 TicketVatGrouped=Grouper la TVA par taux sur les tickets / reçus
@@ -83,7 +84,7 @@ InvoiceIsAlreadyValidated=La facture est déjà validée
 NoLinesToBill=Aucune ligne à facturer
 CustomReceipt=Reçu personnalisé
 ReceiptName=Nom du reçu
-ProductSupplements=Suppléments de produit
+ProductSupplements=Manage supplements of products
 SupplementCategory=Catégorie des suppléments
 ColorTheme=Couleur du thème
 Colorful=Coloré
@@ -93,7 +94,7 @@ Browser=Navigateur
 BrowserMethodDescription=Impression simple et facile des reçus. Seuls quelques paramètres pour configurer le reçu. Impression via le navigateur.
 TakeposConnectorMethodDescription=Module externe avec fonctionnalités supplémentaires. Possibilité d'imprimer depuis le cloud.
 PrintMethod=Méthode d'impression
-ReceiptPrinterMethodDescription=Méthode puissante avec beaucoup de paramètres. Entièrement personnalisable avec des modèles. Impossible d'imprimer à partir du cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=Par terminal
 TakeposNumpadUsePaymentIcon=Utilisez un icône au lieu du texte sur les boutons de paiement du pavé numérique
 CashDeskRefNumberingModules=Module de numérotation pour le POS
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 872d04cfa1b..f428f5a2aa6 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Catégorie
 Rubriques=Tags/catégories
 RubriquesTransactions=Tags/catégories des transactions
 categories=tags/catégories
-NoCategoryYet=Aucun tag/catégorie de ce type n'a été créé
+NoCategoryYet=No tag/category of this type has been created
 In=Dans
 AddIn=Ajouter dans
 modify=modifier
 Classify=Classer
 CategoriesArea=Espace tags/catégories
-ProductsCategoriesArea=Espace tags/catégories de produits/services
-SuppliersCategoriesArea=Espace tags/catégories de fournisseurs
-CustomersCategoriesArea=Espace tags/catégories de clients
-MembersCategoriesArea=Espace tags/catégories adhérents
-ContactsCategoriesArea=Espace tags/catégories de contacts
-AccountsCategoriesArea=Espace des tags/categories de comptes bancaires
-ProjectsCategoriesArea=Zone des tags/catégories des projets
-UsersCategoriesArea=Espace tags/catégories des utlisateurs
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sous-catégories
 CatList=Liste des tags/catégories
 CatListAll=Liste de toutes les catégories (de tous types)
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Assigner cette catégorie au fournisseur
 ShowCategory=Afficher tag/catégorie
 ByDefaultInList=Par défaut dans la liste
 ChooseCategory=Choisissez une catégorie
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
+StocksCategoriesArea=Catégories d’entrepôt
+ActionCommCategoriesArea=Catégories d’événements
 WebsitePagesCategoriesArea=Catégories des pages-conteneurs
-UseOrOperatorForCategories=Utiliser l'opérateur 'ou' pour les catégories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index d4a26e93344..97b878e59fc 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Le nom de société %s existe déjà. Veuillez en choisir un autre.
 ErrorSetACountryFirst=Définissez d'abord le pays
 SelectThirdParty=Sélectionner un tiers
-ConfirmDeleteCompany=Êtes-vous sûr de vouloir supprimer cette société et toutes les informations qui en dépendent ?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Supprimer un contact
-ConfirmDeleteContact=Êtes-vous sûr de vouloir supprimer ce contact et toutes les informations qui en dépendent ?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Nouveau tiers
 MenuNewCustomer=Nouveau client
 MenuNewProspect=Nouveau prospect
@@ -45,7 +45,7 @@ ParentCompany=Maison mère
 Subsidiaries=Filiales
 ReportByMonth=Rapport par mois
 ReportByCustomers=Rapport par client
-ReportByThirdparties=Report per thirdparty
+ReportByThirdparties=Rapport par tiers
 ReportByQuarter=Rapport par taux
 CivilityCode=Code civilité
 RegisteredOffice=Siège social
@@ -69,7 +69,7 @@ PhoneShort=Tél.
 Skype=Skype
 Call=Appeler
 Chat=Tchat
-PhonePro=Tél pro.
+PhonePro=Bus. phone
 PhonePerso=Tél perso.
 PhoneMobile=Tél portable
 No_Email=Refuse les emailings
@@ -179,7 +179,7 @@ ProfId1FR=Id. prof. 1 (SIREN)
 ProfId2FR=Id. prof. 2 (SIRET)
 ProfId3FR=Id. prof. 3 (NAF-APE)
 ProfId4FR=Id. prof. 4 (RCS/RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=Id. prof. 5 (numéro EORI)
 ProfId6FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
@@ -331,7 +331,7 @@ CustomerCodeDesc=Code client unique pour chaque client
 SupplierCodeDesc=Code fournisseur unique pour chaque fournisseur
 RequiredIfCustomer=Requis si le tiers est un client ou un prospect
 RequiredIfSupplier=Requis si un tiers est un fournisseur
-ValidityControledByModule=Validité contrôlée par le module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Voici les règles de ce module
 ProspectToContact=Prospect à contacter
 CompanyDeleted=La société "%s" a été supprimée de la base.
@@ -439,22 +439,22 @@ ListSuppliersShort=Liste des fournisseurs
 ListProspectsShort=Liste des prospects
 ListCustomersShort=Liste des clients
 ThirdPartiesArea=Tiers / Contacts
-LastModifiedThirdParties=Les %s derniers tiers modifiés
-UniqueThirdParties=Total de tiers uniques
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Ouvert
 ActivityCeased=Clos
 ThirdPartyIsClosed=Le tiers est clôturé
-ProductsIntoElements=Liste des produits/services dans %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Montant encours
 OutstandingBill=Montant encours autorisé
 OutstandingBillReached=Montant encours autorisé dépassé
 OrderMinAmount=Montant minimum pour la commande
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=Renvoie une numérotation au format %syymm-nnnn pour le code client et %syymm-nnnn pour le code fournisseur où yy es l'année, mm le mois et nnnn est un compteur sans rupture ni retour à 0.
 LeopardNumRefModelDesc=Code libre sans vérification. Peut être modifié à tout moment.
 ManagingDirectors=Nom du(des) gestionnaire(s) (PDG, directeur, président...)
 MergeOriginThirdparty=Tiers en doublon (le tiers que vous voulez supprimer)
 MergeThirdparties=Fusionner tiers
-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.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=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 38574580e7b..6510a520a3a 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Nouvelle remise
 NewCheckDeposit=Nouveau dépôt
 NewCheckDepositOn=Créer bordereau de dépôt sur compte: %s
 NoWaitingChecks=Pas de chèques en attente de remise
-DateChequeReceived=Date réception chèque
+DateChequeReceived=Check receiving date
 NbOfCheques=Nb de chèques
 PaySocialContribution=Payer une charge sociale/fiscale
 PayVAT=Payer une déclaration de TVA
@@ -175,7 +175,7 @@ RulesResultInOut=- Il comprend les paiements réels effectués sur les factures,
 RulesCADue=- Il inclut les factures clients dues, qu'elles soient payées ou non.<br>- Il se base sur la date de facturation de ces factures.<br>
 RulesCAIn=- Il inclut les règlements effectivement reçus des factures clients.<br>- Il se base sur la date de règlement de ces factures<br>
 RulesCATotalSaleJournal=Il comprend toutes les lignes du journal de vente.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
+RulesSalesTurnoverOfIncomeAccounts=Comprend (débit - crédit) des lignes pour les comptes produits dans le groupe INCOME
 RulesAmountOnInOutBookkeepingRecord=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité qui ont le groupe "EXPENSE" ou "INCOME"
 RulesResultBookkeepingPredefined=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité qui ont le groupe "EXPENSE" ou "INCOME"
 RulesResultBookkeepingPersonalized=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité <b>regroupés par les groupes personnalisés</b>
@@ -196,7 +196,7 @@ VATReportByThirdParties=Rapport TVA par Tiers
 VATReportByCustomers=Rapport par client
 VATReportByCustomersInInputOutputMode=Rapport par client des TVA collectées et payées
 VATReportByQuartersInInputOutputMode=Rapport par taux des TVA collectées et payées
-VATReportShowByRateDetails=Show details of this rate
+VATReportShowByRateDetails=Afficher les détails de ce taux
 LT1ReportByQuarters=Rapport Tax 2 par Taux
 LT2ReportByQuarters=Rapport Tax 3 par Taux
 LT1ReportByQuartersES=Rapport par taux de RE
@@ -231,7 +231,7 @@ Pcg_subtype=Sous classe de compte
 InvoiceLinesToDispatch=Lignes de factures à ventiler
 ByProductsAndServices=Par produit et service
 RefExt=Référence externe
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=Pour créer un modèle de facture, créez une facture standard puis, sans la valider, cliquez sur le bouton "%s".
 LinkedOrder=Lier à une commande
 Mode1=Mode 1
 Mode2=Mode 2
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index 3e6e3e37bad..23ac6fd869b 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -41,7 +41,7 @@ FileNotYetIndexedInDatabase=Fichier non indexé dans la base de données. Télé
 ExtraFieldsEcmFiles=Attributs supplémentaires des fichiers de la GED
 ExtraFieldsEcmDirectories=Attributs supplémentaires des dossiers de la GED
 ECMSetup=Configuration du module de gestion de documents (GED)
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
+GenerateImgWebp=Dupliquer toutes les images avec une autre version au format .webp
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
+ConfirmImgWebpCreation=Confirmer la duplication de toutes les images
+SucessConvertImgWebp=Images dupliquées avec succès
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 072653e95b5..598bd091ae3 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Pas d'erreur, on valide
 # Errors
 ErrorButCommitIsDone=Erreurs trouvées mais on valide malgré tout
-ErrorBadEMail=email %s invalide
-ErrorBadMXDomain=L'adresse e-mail %s ne semble pas correcte (le domaine n'a pas d'enregistrement MX valide)
-ErrorBadUrl=Url %s invalide
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Mauvaise valeur de paramètre. Ceci arrive lors d'une tentative de traduction d'une clé non renseignée.
 ErrorRefAlreadyExists=Le référence <b>%s</b> existe déjà.
 ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
@@ -46,8 +46,8 @@ ErrorWrongDate=La date est incorrecte
 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=Le sujet du mail est obligatoire
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject 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
 ErrorSetupOfEmailsNotComplete=La configuration de l'envoi des e-mails n'est pas terminée
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=La page / container <strong> %s </str
 ErrorDuringChartLoad=Erreur lors du chargement du tableau de compte. Si certains comptes n'ont pas été chargés, vous pouvez toujours les entrer manuellement.
 ErrorBadSyntaxForParamKeyForContent=Mauvaise syntaxe pour le paramètre keyforcontent. La valeur doit commencer par %s ou %s
 ErrorVariableKeyForContentMustBeSet=Erreur, la constante nommée %s (avec le contenu de texte à afficher) ou %s (avec l'adresse externe à afficher) doit être fixée.
+ErrorURLMustEndWith=L'URL %s doit se terminer par %s
 ErrorURLMustStartWithHttp=L'URL %s doit commencer par http:// ou https://
 ErrorHostMustNotStartWithHttp=L'URL %s ne doit PAS commencer par http:// ou https://
 ErrorNewRefIsAlreadyUsed=Erreur, la nouvelle référence est déjà utilisée
@@ -260,7 +261,7 @@ ErrorAParameterIsRequiredForThisOperation=Un paramètre est obligatoire pour cet
 ErrorDateIsInFuture=Erreur, la date ne peut pas être dans le futur.
 ErrorAnAmountWithoutTaxIsRequired=Erreur, le montant est obligatoire
 ErrorAPercentIsRequired=Erreur, le pourcentage doit être indiqué correctement.
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorYouMustFirstSetupYourChartOfAccount=Vous devez d’abord configurer votre plan comptable.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
@@ -293,6 +294,7 @@ WarningFailedToAddFileIntoDatabaseIndex=Avertissement, échec de l’ajout d’u
 WarningTheHiddenOptionIsOn=Attention, l'option cachée <b>%s</b> est activée
 WarningCreateSubAccounts=Attention, vous ne pouvez pas créer directement un compte auxiliaire, vous devez créer un tiers ou un utilisateur et leur attribuer un code comptable pour les retrouver dans cette liste
 WarningAvailableOnlyForHTTPSServers=Disponible uniquement si une connexion sécurisée HTTPS est utilisée
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
+WarningModuleXDisabledSoYouMayMissEventHere=Le module %s n’a pas été activé. Par conséquent, il se peut que vous manquiez beaucoup d’événements ici.
 ErrorActionCommPropertyUserowneridNotDefined=Le propriétaire de l'utilisateur est requis
 ErrorActionCommBadType=Le type d'événement sélectionné (id: %n, code: %s) n'existe pas dans le dictionnaire des types d'événement
+CheckVersionFail=Échec de la vérification de version
diff --git a/htdocs/langs/fr_FR/eventorganization.lang b/htdocs/langs/fr_FR/eventorganization.lang
new file mode 100644
index 00000000000..f311d553874
--- /dev/null
+++ b/htdocs/langs/fr_FR/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Organisation d'événements
+EventOrganizationDescription = Organisation de l’événement par le biais du module projet
+EventOrganizationDescriptionLong= Gérer l’organisation d'événements pour les conférences, les participants et les conférenciers, avec une page d'inscription publique
+#
+# Menu
+#
+EventOrganizationMenuLeft = Événements organisés
+EventOrganizationConferenceOrBoothMenuLeft = Conférence ou stand
+
+#
+# Admin page
+#
+EventOrganizationSetup = Configuration de l’organisation de l’événement
+Settings = Paramètres
+EventOrganizationSetupPage = Page de configuration de l’organisation de l’événement
+EVENTORGANIZATION_TASK_LABEL = Libellé des tâches à créer automatiquement lors de la validation du projet
+EVENTORGANIZATION_TASK_LABELTooltip = Lorsque vous validez un événement organisé, certaines tâches peuvent être automatiquement créées dans le projet<br><br>Par exemple : <br>Envoyer un appel de conférence<br>Envoyer un appel pour le stand<br>Recevoir un appel de conférences<br>Recevoir un appel de stand<br>Ouvrir les inscriptions aux événements pour les participants<br>Envoyer un rappel de l’événement aux conférenciers<br>Envoyer un rappel de l’événement à l’animateur du stand<br>Envoyer un rappel de l’événement aux participants
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Catégorie à ajouter à des tiers automatiquement créée lorsque quelqu’un suggère une conférence
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Catégorie à ajouter à des tiers automatiquement créée lorsque quelqu’un suggère un stand
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Modèle de courriel à envoyer après avoir reçu une suggestion de conférence.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Modèle de courriel à envoyer après avoir reçu une suggestion d'un stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Modèle de courriel à envoyer après paiement d'une inscription à un stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Modèle de courriel à envoyer après paiement d'une inscription à un événement.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Modèle de courriel pour action de masse aux participants
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Modèle de courriel pour action de masse aux intervenants
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrer la liste de sélection des tiers dans la fiche/le formulaire de création des participants avec/selon la catégorie
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrer la liste de sélection des tiers dans la fiche/le formulaire de création des participants avec le type de client
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conférence ou stand
+ManageOrganizeEvent = Gestion d'organisation d'événements
+ConferenceOrBooth = Conférence ou stand
+ConferenceOrBoothTab = Conférence ou stand
+AmountOfSubscriptionPaid = Montant de l'inscription payée
+DateSubscription = Date de l'inscription
+ConferenceOrBoothAttendee = Participant à la conférence ou au stand
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Votre demande de conférence a été transmise.
+YourOrganizationEventBoothRequestWasReceived = Votre demande de stand a été transmise
+EventOrganizationEmailAskConf = Demande de conférence
+EventOrganizationEmailAskBooth = Demande de stand
+EventOrganizationEmailSubsBooth = Inscription au stand
+EventOrganizationEmailSubsEvent = Inscription à un événement
+EventOrganizationMassEmailAttendees = Communication aux participants
+EventOrganizationMassEmailSpeakers = Communication aux conférenciers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Autoriser des personnes inconnues à suggérer des conférences
+AllowUnknownPeopleSuggestConfHelp=Autoriser des personnes inconnues à suggérer des conférences
+AllowUnknownPeopleSuggestBooth=Autoriser des personnes inconnues à suggérer un stand
+AllowUnknownPeopleSuggestBoothHelp=Autoriser des personnes inconnues à suggérer un stand
+PriceOfRegistration=Prix de l'inscription
+PriceOfRegistrationHelp=Prix de l'inscription
+PriceOfBooth=Prix d’inscription pour un stand
+PriceOfBoothHelp=Prix d’inscription pour un stand
+EventOrganizationICSLink=Lien ICS des événements
+ConferenceOrBoothInformation=Renseignements sur la conférence ou le stand
+Attendees = Participants
+EVENTORGANIZATION_SECUREKEY = Clé sécurisée pour le lien d’inscription public à une conférence
+#
+# Status
+#
+EvntOrgDraft = Brouillon
+EvntOrgSuggested = Suggéré
+EvntOrgConfirmed = Confirmé
+EvntOrgNotQualified = Non qualifié
+EvntOrgDone = Effectuées
+EvntOrgCancelled = Annulé
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Lien d’inscription public à une conférence
+MissingOrBadSecureKey = La clé de sécurité est invalide ou manquante
+EvntOrgWelcomeMessage = Ce formulaire vous permet de vous enregistrer en tant que participant à la conférence
+EvntOrgStartDuration = Cette conférence débute à
+EvntOrgEndDuration =  et se termine à
diff --git a/htdocs/langs/fr_FR/knowledgemanagement.lang b/htdocs/langs/fr_FR/knowledgemanagement.lang
index 5159492c013..f928e48432e 100644
--- a/htdocs/langs/fr_FR/knowledgemanagement.lang
+++ b/htdocs/langs/fr_FR/knowledgemanagement.lang
@@ -14,46 +14,42 @@
 # along with this program.  If not, see .
 
 #
-# Générique
+# Generic
 #
 
-# Module label 'Module Base de connaissance'
-ModuleKnowledgeManagementName = Base de connaissance
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc = Base de connaissance
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
 
 #
-# Page d'administration
+# Admin page
 #
-KnowledgeManagementSetup = Configuration du module Base de connaissance
-Settings = Réglages
-KnowledgeManagementSetupPage = Page de configuration du module Base de connaissance
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Paramètres
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
 
 #
-# Page À propos
+# About page
 #
 About = À propos
-KnowledgeManagementAbout = À propos de la Base de connaissance
-KnowledgeManagementAboutPage = Page à propos de la Base de connaissance
+KnowledgeManagementAbout = A propos de la base de connaissances
+KnowledgeManagementAboutPage = A propos de la base de connaissances
 
 #
-# Page d'exemple
+# Sample page
 #
-MyPageName = Nom de ma page
+KnowledgeManagementArea = Base de connaissances
 
-#
-# Box d'exemple
-#
-MyWidget = Mon widget
-MyWidgetDescription = Description de mon widget
 
 #
 # Menu
 #
-MenuKnowledgeRecord = Registres de connaissances
-ListKnowledgeRecord = Liste
-NewKnowledgeRecord = Nouveau registre de connaissance
-Reply = Répondre
-KnowledgeRecords = registres de connaissances
-KnowledgeRecord = registre de connaissances
-KnowledgeRecordExtraFields = Attributs supplémentaires pour les registres de connaissance
\ No newline at end of file
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 5408ca6e4c7..c0f5c00808e 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Aux utilisateurs
 MailCC=Copie à
 MailToCCUsers=Copie aux utilisateurs
 MailCCC=Copie cachée à
-MailTopic=Sujet du mail
+MailTopic=Email subject
 MailText=Message
 MailFile=Fichiers joints
 MailMessage=Corps du message
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=Aucune notification automatique prévue pour ce type d
 ANotificationsWillBeSent=1 notification automatique sera envoyée par e-mail
 SomeNotificationsWillBeSent=%s notification(s) automatique(s) sera(seront) envoyée(s) par e-mail
 AddNewNotification=Souscrire à une nouvelle notification automatique (cible/évènement)
-ListOfActiveNotifications=Liste de toutes les souscriptions (cibles/évènements) pour des notifications emails automatiques
-ListOfNotificationsDone=Liste des toutes les notifications automatiques envoyées par e-mail
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=La configuration d'envoi d'emails a été définir sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des e-mailing en masse.
 MailSendSetupIs2=Vous devez d'abord aller, avec un compte d'administrateur, dans le menu %sAccueil - Configuration - EMails%s pour changer le paramètre <strong>'%s'</strong> pour utiliser le mode '%s'. Avec ce mode, vous pouvez entrer le paramétrage du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonction d'envoi d'email en masse.
 MailSendSetupIs3=Si vous avez des questions sur la façon de configurer votre serveur SMTP, vous pouvez demander à %s.
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 32ee14fb0c7..5bba9b2b897 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Enregistrer et nouveau
 TestConnection=Tester la connexion
 ToClone=Cloner
 ConfirmCloneAsk=Voulez-vous vraiment cloner l'objet <b> %s </b>?
-ConfirmClone=Veuillez choisir votre option de clonage :
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Aucun option de clonage n'a été spécifiée.
 Of=du
 Go=Aller
@@ -246,7 +246,7 @@ DefaultModel=Modèle de document par défaut
 Action=Action
 About=À propos
 Number=Nombre
-NumberByMonth=Nombre par mois
+NumberByMonth=Total reports by month
 AmountByMonth=Montant par mois
 Numero=Numéro
 Limit=Limite
@@ -341,8 +341,8 @@ KiloBytes=Kilooctets
 MegaBytes=Mégaoctets
 GigaBytes=Gigaoctets
 TeraBytes=Teraoctets
-UserAuthor=Utilisateur de création
-UserModif=Utilisateur de dernière mise à jour
+UserAuthor=Ceated by
+UserModif=Réalisée par
 b=o.
 Kb=Ko
 Mb=Mo
@@ -503,9 +503,11 @@ By=Par
 From=Du
 FromDate=A partir du
 FromLocation=A partir du
-at=à
 to=au
 To=au
+ToDate=au
+ToLocation=au
+at=à
 and=et
 or=ou
 Other=Autre
@@ -843,7 +845,7 @@ XMoreLines=%s ligne(s) cachées
 ShowMoreLines=Afficher plus/moins de lignes
 PublicUrl=URL publique
 AddBox=Ajouter boite
-SelectElementAndClick=Sélectionnez un élément et cliquez %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Imprimer fichier %s
 ShowTransaction=Afficher l'écriture sur le compte bancaire
 ShowIntervention=Afficher intervention
@@ -854,8 +856,8 @@ Denied=Refusé
 ListOf=Liste de %s
 ListOfTemplates=Liste des modèles
 Gender=Genre
-Genderman=Homme
-Genderwoman=Femme
+Genderman=Male
+Genderwoman=Female
 Genderother=Autre
 ViewList=Vue liste
 ViewGantt=Vue Gantt
@@ -905,7 +907,7 @@ SomeTranslationAreUncomplete=Certaines des langues proposées peuvent n'être tr
 DirectDownloadLink=Lien de téléchargement public
 PublicDownloadLinkDesc=Seul le lien est nécessaire pour télécharger le fichier
 DirectDownloadInternalLink=Lien de téléchargement privé
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+PrivateDownloadLinkDesc=Vous devez être connecté et vous avez besoin d’autorisations pour afficher ou télécharger le fichier
 Download=Téléchargement
 DownloadDocument=Télécharger le document
 ActualizeCurrency=Mettre à jour le taux de devise
@@ -1018,7 +1020,7 @@ SearchIntoContacts=Contacts
 SearchIntoMembers=Adhérents
 SearchIntoUsers=Utilisateurs
 SearchIntoProductsOrServices=Produits ou services
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Lots / Séries
 SearchIntoProjects=Projets
 SearchIntoMO=Ordres de fabrication
 SearchIntoTasks=Tâches
@@ -1128,4 +1130,5 @@ ConfirmAffectTag=Affecter les tags en masse
 ConfirmAffectTagQuestion=Êtes-vous sur de vouloir affecter ces catégories aux %s lignes sélectionnées ?
 CategTypeNotFound=Aucun type de tag trouvé pour ce type d'enregistrements
 CopiedToClipboard=Copié dans le presse-papier
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+InformationOnLinkToContract=Ce montant n’est que le total de toutes les lignes du contrat. Aucune notion de temps n’est prise en considération.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index dff2f9c885b..9126589281e 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -15,24 +15,24 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre adhérent (nom: <b>%s</b>, i
 ErrorUserPermissionAllowsToLinksToItselfOnly=Pour des raisons de sécurité, il faut posséder les droits de modification de tous les utilisateurs pour pouvoir lier un adhérent à un utilisateur autre que vous même.
 SetLinkToUser=Lier à un utilisateur Dolibarr
 SetLinkToThirdParty=Lier à un tiers Dolibarr
-MembersCards=Cartes d'adhérent
+MembersCards=Business cards for members
 MembersList=Liste des adhérents
 MembersListToValid=Liste des adhérents brouillons (à valider)
 MembersListValid=Liste des adhérents valides
 MembersListUpToDate=Liste des adhérents validés avec une adhésion à jour
 MembersListNotUpToDate=Liste des adhérents validés avec une adhésion expirée
-MembersListExcluded=List of excluded members
+MembersListExcluded=Liste des adhérents exclus
 MembersListResiliated=Liste des adhérents résiliés
 MembersListQualified=Liste des adhérents qualifiés
 MenuMembersToValidate=Adhérents brouillons
 MenuMembersValidated=Adhérents validés
-MenuMembersExcluded=Excluded members
+MenuMembersExcluded=Adhérents exclus
 MenuMembersResiliated=Adhérents résiliés
 MembersWithSubscriptionToReceive=Adhérents avec cotisation à recevoir
 MembersWithSubscriptionToReceiveShort=Cotisations à recevoir
 DateSubscription=Date adhésion
 DateEndSubscription=Date fin adhésion
-EndSubscription=Fin adhésion
+EndSubscription=Subscription Ends
 SubscriptionId=Id adhésion
 WithoutSubscription=Sans adhésion
 MemberId=Id adhérent
@@ -49,12 +49,12 @@ MemberStatusActiveLate=Adhésion/cotisation expirée
 MemberStatusActiveLateShort=Expiré
 MemberStatusPaid=Adhésions à jour
 MemberStatusPaidShort=A jour
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
+MemberStatusExcluded=Adhérent exclu
+MemberStatusExcludedShort=Exclu
 MemberStatusResiliated=Adhérent résilié
 MemberStatusResiliatedShort=Résilié
 MembersStatusToValid=Adhérents brouillons
-MembersStatusExcluded=Excluded members
+MembersStatusExcluded=Adhérents exclus
 MembersStatusResiliated=Adhérents résiliés
 MemberStatusNoSubscription=Validé (pas de cotisation nécessaire)
 MemberStatusNoSubscriptionShort=Validé
@@ -83,12 +83,12 @@ WelcomeEMail=Email de bienvenue
 SubscriptionRequired=Soumis à cotisation
 DeleteType=Supprimer
 VoteAllowed=Vote autorisé
-Physical=Physique
-Moral=Morale
-MorAndPhy=Morales et physiques
-Reenable=Réactiver
-ExcludeMember=Exclude a member
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
+ExcludeMember=Exclure un adhérent
+ConfirmExcludeMember=Êtes-vous sûr de vouloir exclure cet adhérent ?
 ResiliateMember=Résilier un adhérent
 ConfirmResiliateMember=Êtes-vous sûr de vouloir résilier cet adhérent ?
 DeleteMember=Effacer un membre
@@ -144,7 +144,7 @@ DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modèle d'email à utiliser pour e
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modèle d'email électronique à utiliser pour envoyer un courrier électronique à un membre lors de l'enregistrement d'une nouvelle cotisation
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modèle d'email électronique à utiliser pour envoyer un rappel par courrier électronique lorsque l'adhésion est sur le point d'expirer
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modèle d'email utilisé pour envoyer un email à un adhérent lors de l'annulation d'adhésion
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Modèle de courriel à utiliser pour envoyer un courriel à un adhérent en cas d’exclusion de l'adhérent
 DescADHERENT_MAIL_FROM=Email émetteur pour les mails automatiques
 DescADHERENT_ETIQUETTE_TYPE=Format pages étiquettes
 DescADHERENT_ETIQUETTE_TEXT=Texte imprimé sur les planches d'adresses adhérent
@@ -170,37 +170,37 @@ DocForLabels=Génération d'étiquettes d'adresses
 SubscriptionPayment=Paiement cotisation
 LastSubscriptionDate=Date de dernière adhésion
 LastSubscriptionAmount=Montant dernière adhésion
-LastMemberType=Last Member type
+LastMemberType=Dernier type d'adhérent
 MembersStatisticsByCountries=Statistiques des membres par pays
 MembersStatisticsByState=Statistiques des membres par département/province/canton
 MembersStatisticsByTown=Statistiques des membres par ville
 MembersStatisticsByRegion=Statistiques des membres par région
-NbOfMembers=Nombre de membres
-NbOfActiveMembers=Nombre d'adhérents actifs en cours
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Aucun membre validé trouvé
-MembersByCountryDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par pays. Le graphique utilise toutefois le service en ligne de graphique de Google et n'est opérationnel uniquement que si une connexion internet est disponible.
-MembersByStateDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par département/province/canton.
-MembersByTownDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par ville.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choisissez les statistiques que vous désirez consulter...
 MenuMembersStats=Statistiques
-LastMemberDate=Date dernier adhérent
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Date de dernière adhésion
-MemberNature=Nature d'adhérent
-MembersNature=Nature des adhérents
-Public=Informations publiques
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Nouvel adhérent ajouté. En attente de validation
 NewMemberForm=Nouvel Adhérent form
-SubscriptionsStatistics=Statistiques sur les cotisations
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Nombre de cotisations
-AmountOfSubscriptions=Montant de cotisations
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Chiffre affaire (pour société) ou Budget (asso ou collectivité)
 DefaultAmount=Montant par défaut de la cotisation
 CanEditAmount=Le visiteur peut modifier/choisir le montant de sa cotisation
 MEMBER_NEWFORM_PAYONLINE=Rediriger sur la page intégrée de paiement en ligne
 ByProperties=Par nature
 MembersStatisticsByProperties=Statistiques des adhérents par nature
-MembersByNature=Cet écran vous montre les statistiques sur les membres par nature.
-MembersByRegion=Cet écran vous montre les statistiques sur les membres par région.
 VATToUseForSubscriptions=Taux de TVA pour les adhésions
 NoVatOnSubscription=Pas de TVA sur les adhésions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produit/Service utilisé pour la ligne de cotisation dans la facture: %s
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index d2ed35e1282..1bd6f76c06f 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Liste des permissions
 SeeExamples=Voir des exemples ici
 EnabledDesc=Condition pour que ce champ soit actif (Exemples: 1 ou $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Le champ est-il visible ? (Exemples: 0 = Jamais visible, 1 = Visible sur les listes et formulaires de création/mise à jour/visualisation, 2 = Visible uniquement sur la liste, 3 = Visible uniquement sur le formulaire de création/mise à jour/affichage (pas les listes), 4=Visible sur les listes et formulaire de mise à jour et affichage uniquement (pas en création), 5=Visible sur les listes et formulaire en lecture (pas en création ni modification).<br><br>Utiliser une valeur négative signifie que le champ n'est pas affiché par défaut sur la liste mais peut être sélectionné pour l'affichage).<br><br>Il peut s'agir d'une expression, par exemple :<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Affichez ce champ sur les documents PDF compatibles, vous pouvez gérer la position avec le champ "Position". <br/> Actuellement, les modèles compatibles PDF connus sont: Eratostene (ordre), Espadon (navire), une éponge (factures), cyan (Propal / citation), Cornas (commande fournisseur) <br/> <br/> <strong> Pour le document: </strong> <br/> 0 = non affiché <br/> 1 = affiché <br/> 2 = affiché uniquement si non vide <br/> <br/> <strong> Pour les lignes de document: </strong> <br/> 0 = non affiché <br/> 1 = affiché dans une colonne <br/> 3 = affiché dans la colonne de description de ligne après la description <br/> 4 = affiché dans la colonne de description après le description uniquement si non vide
+DisplayOnPdfDesc=Afficher ce champ sur les documents PDF compatibles, vous pouvez gérer la position avec le champ "Position.<br>Actuellement, les modèles compatibles PDF connus sont: eratostene (commande), espadon (expédition), sponge (factures), cyan (devis/propositions commerciales), cornas (commande fournisseur)<br><br><strong>Pour le document :</strong><br>0 = non affiché <br>1 = affiché<br>2 = affiché uniquement si non vide<br><br><strong>Pour les lignes de document :</strong><br>0 = non affiché <br>1 =  0 = non affiché 1 = affiché dans une colonne<br>3 = affiché dans la colonne description après la description<br>4 = affiché dans la colonne description après la description uniquement si non vide
 DisplayOnPdf=Afficher sur PDF
 IsAMeasureDesc=Peut-on cumuler la valeur du champ pour obtenir un total dans les listes ? (Exemples: 1 ou 0)
 SearchAllDesc=Le champ doit-il être utilisé pour effectuer une recherche à partir de l'outil de recherche rapide ? (Exemples: 1 ou 0)
@@ -134,8 +134,8 @@ IncludeDocGenerationHelp=Si vous cochez cette case, du code sera généré pour
 ShowOnCombobox=Afficher la valeur dans la liste déroulante
 KeyForTooltip=Clé pour l'info-bulle
 CSSClass=CSS pour le formulaire d'édition / création
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
+CSSViewClass=CSS pour le formulaire de lecture
+CSSListClass=CSS pour la liste
 NotEditable=Non éditable
 ForeignKey=Clé étrangère
 TypeOfFieldsHelp=Type de champs: <br> varchar (99), double (24,8), réel, texte, html, datetime, timestamp, integer, integer:NomClasse:cheminrelatif/vers/classfile.class.php [:1[:filtre]] ('1' signifie nous ajoutons un bouton + après le combo pour créer l'enregistrement, 'filter' peut être 'status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' par exemple)
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 5b49fcf64bd..0732013a49b 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -16,8 +16,8 @@ ToOrder=Passer commande
 MakeOrder=Passer commande
 SupplierOrder=Commande fournisseur
 SuppliersOrders=Commandes fournisseurs
-SaleOrderLines=Sale order lines
-PurchaseOrderLines=Puchase order lines
+SaleOrderLines=Lignes de commande de vente
+PurchaseOrderLines=Lignes de bons de commande
 SuppliersOrdersRunning=Commandes fournisseurs en cours
 CustomerOrder=Commande client
 CustomersOrders=Commandes
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 433f72df63d..dff5915fa6b 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Vous devez activer ou installer la librairie GD avec votre P
 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 de quantités de produits/services
-StatsByNumberOfEntities=Statistiques en nombre d'entités référantes (nb de factures, ou commandes...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Nombre de propositions commerciales
 NumberOfCustomerOrders=Nombre de commandes clients
 NumberOfCustomerInvoices=Nombre de factures clients
@@ -245,7 +245,7 @@ NewKeyIs=Voici vos nouveaux identifiants pour vous connecter
 NewKeyWillBe=Vos nouveaux identifiants pour vous connecter à l'application seront
 ClickHereToGoTo=Cliquez ici pour aller sur %s
 YouMustClickToChange=Vous devez toutefois auparavant cliquer sur le lien suivant, afin de valider ce changement de mot de passe
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Confirmer la modification du mot de passe
 ForgetIfNothing=Si vous n'êtes pas à l'origine de cette demande, ignorez simplement ce message. Vos identifiants restent sécurisés.
 IfAmountHigherThan=Si le montant est supérieur à <strong>%s</strong>
 SourcesRepository=Répertoire pour les sources
@@ -289,4 +289,4 @@ PopuProp=Produits / services par popularité dans les propositions
 PopuCom=Produits/services par popularité dans les commandes
 ProductStatistics=Statistiques sur les produits / services
 NbOfQtyInOrders=Qté en commandes
-SelectTheTypeOfObjectToAnalyze=Sélectionnez le type d'objet à analyser ...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/fr_FR/partnership.lang b/htdocs/langs/fr_FR/partnership.lang
new file mode 100644
index 00000000000..4200ee5dfc9
--- /dev/null
+++ b/htdocs/langs/fr_FR/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Gestion des partenariats
+PartnershipDescription = Module de gestion des partenariats
+PartnershipDescriptionLong= Module de gestion des partenariats
+
+#
+# Menu
+#
+NewPartnership = Nouveau partenariat
+ListOfPartnerships = Listes des partenariats
+
+#
+# Admin page
+#
+PartnershipSetup = Page de configuration du module Partenariat
+PartnershipAbout = À propos de Partenariat
+PartnershipAboutPage = Page d'informations du module Partenariat
+
+
+#
+# Object
+#
+DatePartnershipStart=Date de début
+DatePartnershipEnd=Date de fin
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Brouillon
+PartnershipAccepted = Accepté
+PartnershipRefused = Refusé
+PartnershipCanceled = Annulé
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 5a1ddd19ae8..89c7ab9d347 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -1,10 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Utiliser les numéros de lots/série
-ProductStatusOnBatch=Lot (requis)
-ProductStatusOnSerial=Numéro de série (doit être unique pour chaque équipement)
+ProductStatusOnBatch=Oui (Lot/Série requis)
+ProductStatusOnSerial=Oui (numéro de série unique requis)
 ProductStatusNotOnBatch=Non (Lot/Série non utilisé)
 ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=N°série
+ProductStatusOnSerialShort=Numéro Série
 ProductStatusNotOnBatchShort=Non
 Batch=Lot/Série
 atleast1batchfield=Date limite utilisation optimale, de consommation ou numéro de lot/série
@@ -25,10 +25,11 @@ ShowCurrentStockOfLot=Afficher le stock actuel pour le couple produit / lot
 ShowLogOfMovementIfLot=Afficher l'historique des mouvements de couple produit / lot
 StockDetailPerBatch=Stock détaillé par lot
 SerialNumberAlreadyInUse=Le numéro de série %s est déjà utilisé pour le produit %s
-TooManyQtyForSerialNumber=Vous ne pouvez avoir qu'un produit %s avec le numéro de série %s
-BatchLotNumberingModules=Modèle de génération et contrôle des numéros de lot
-BatchSerialNumberingModules=Modèle de génération et contrôle des numéros de série
+TooManyQtyForSerialNumber=Vous ne pouvez avoir qu'un seul produit %s pour le numéro de série %s
+BatchLotNumberingModules=Options pour la génération automatique de produits en lots gérés par lots
+BatchSerialNumberingModules=Options pour la génération automatique de produits en lots gérés par numéros de série
 ManageLotMask=Masque personnalisé
 CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
-LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
-SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
+LotProductTooltip=Ajoute une option dans la fiche produit pour définir un masque de numéro de lot dédié
+SNProductTooltip=Ajoute une option dans la fiche produit pour définir un masque de numéro de série dédié
+QtyToAddAfterBarcodeScan=Quantité à ajouter pour chaque code à barres/lot/série scanné
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 4d4e2ce6fac..9501fc6022b 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Services en vente uniquement
 ServicesOnPurchaseOnly=Services en achat uniquement
 ServicesNotOnSell=Services hors vente et hors achat
 ServicesOnSellAndOnBuy=Services en vente et en achat
-LastModifiedProductsAndServices=Les %s derniers produits/services modifiés
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Les %s derniers produits enregistrés
 LastRecordedServices=Les %s derniers services enregistrés
 CardProduct0=Produit
@@ -73,12 +73,12 @@ SellingPrice=Prix de vente
 SellingPriceHT=Prix de vente HT
 SellingPriceTTC=Prix de vente TTC
 SellingMinPriceTTC=Prix de vente min. (TTC)
-CostPriceDescription=Ce prix (net de taxe) peut être utilisé pour stocker le montant moyen du coût de ce produit pour votre entreprise. Il peut être calculé par exemple à partir du prix d'achat moyen majoré des coûts moyens de production et de distribution.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Cette valeur peut être utilisée dans le calcul des marges.
 SoldAmount=Solde
 PurchasedAmount=Montant des achats
 NewPrice=Nouveau prix
-MinPrice=Prix de vente min.
+MinPrice=Min. selling price
 EditSellingPriceLabel=Modifier le libellé du prix de vente
 CantBeLessThanMinPrice=Le prix de vente ne doit pas être inférieur au minimum pour ce produit (%s HT). Ce message peut aussi être provoqué par une remise trop importante.
 ContractStatusClosed=Clôturé
@@ -157,11 +157,11 @@ ListServiceByPopularity=Liste des services par popularité
 Finished=Produit manufacturé
 RowMaterial=Matière première
 ConfirmCloneProduct=Êtes-vous sûr de vouloir cloner le produit ou service <b>%s</b> ?
-CloneContentProduct=Cloner les informations générales du produit/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Cloner les prix
-CloneCategoriesProduct=Cloner les tags/catégories liées
-CloneCompositionProduct=Cloner les produits virtuels
-CloneCombinationsProduct=Cloner les variantes
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Ce produit est utilisé
 NewRefForClone=Réf. du nouveau produit/service
 SellingPrices=Prix de vente
@@ -170,12 +170,12 @@ CustomerPrices=Prix clients
 SuppliersPrices=Prix fournisseurs
 SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services)
 CustomCode=Nomenclature douanière ou Code SH
-CountryOrigin=Pays d'origine
-RegionStateOrigin=Région d'origine
-StateOrigin=Département d'origine
-Nature=Nature du produit (matière première / produit fini)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature de produit
-NatureOfProductDesc=Matière première ou produit fini
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Libellé court
 Unit=Unité
 p=u.
@@ -314,7 +314,7 @@ LastUpdated=Dernière mise à jour
 CorrectlyUpdated=Mise à jour avec succès
 PropalMergePdfProductActualFile=Fichiers utilisés pour l'ajout au PDF Azur sont
 PropalMergePdfProductChooseFile=Sélectionnez les fichiers PDF
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=Inclure les produits/services avec tag/catégorie
 DefaultPriceRealPriceMayDependOnCustomer=Prix ​​par défaut, le prix réel peut dépendre du client
 WarningSelectOneDocument=Sélectionnez au moins un document
 DefaultUnitToShow=Unité
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 9599f880936..d7ab95ff424 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -10,19 +10,19 @@ 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 est limitée aux projets pour lesquels vous êtres un contact affecté
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 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 ou tâches pour lesquels vous êtes un contact affecté.
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 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 des projets sont visibles mais il n'est possible de saisir du temps passé que sur celles assignées à l'utilisateur sélectionné.\nAssignez la tâche si elle ne l'est pas déjà pour pouvoir saisir du temps dessus.
-OnlyYourTaskAreVisible=Seules les tâches qui vous sont assignées sont visibles. Assignez vous une tâche pour la voir et saisir du temps.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tâches des projets
 ProjectCategories=Catégories/tags de projet
 NewProject=Nouveau projet
@@ -89,7 +89,7 @@ TimeConsumed=Consommé
 ListOfTasks=Liste de tâches
 GoToListOfTimeConsumed=Aller à la liste des temps consommés
 GanttView=Vue Gantt
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListWarehouseAssociatedProject=Liste des entrepôts associés au projet
 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
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Non assigné à la tache
 NoUserAssignedToTheProject=Aucun utilisateur assigné à ce projet
 TimeSpentBy=Temps consommé par
 TasksAssignedTo=Tâches assignées à
-AssignTaskToMe=M'assigner la tâche
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assigner tâche à %s
 SelectTaskToAssign=Sélectionnez la tâche à assigner
 AssignTask=Assigner
@@ -271,5 +271,5 @@ RefTaskParent=Réf. Tâche parent
 ProfitIsCalculatedWith=Le bénéfice est calculé sur la base de
 AddPersonToTask=Ajouter également aux tâches
 UsageOrganizeEvent=Utilisation: Organisation d'événements
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classer le projet comme étant clos lorsque toutes ses tâches sont terminées (progression 100%%)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Remarque : les projets existants avec toutes les tâches terminées à 100 %% ne seront pas affectés : vous devrez les fermer manuellement. Cette option n’affecte que les projets ouverts.
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index 6727ad21a8a..b019b275e6e 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -59,7 +59,7 @@ ConfirmClonePropal=Êtes-vous sûr de vouloir cloner la proposition commerciale
 ConfirmReOpenProp=Êtes-vous sûr de vouloir réouvrir la proposition commerciale <b>%s</b> ?
 ProposalsAndProposalsLines=Propositions commerciales clients et lignes de propositions
 ProposalLine=Ligne de proposition
-ProposalLines=Proposal lines
+ProposalLines=Ligne de proposition
 AvailabilityPeriod=Délai de livraison
 SetAvailability=Définir le délai de livraison
 AfterOrder=après commande
diff --git a/htdocs/langs/fr_FR/recruitment.lang b/htdocs/langs/fr_FR/recruitment.lang
index c3fcd8fece3..f2d8df78aa3 100644
--- a/htdocs/langs/fr_FR/recruitment.lang
+++ b/htdocs/langs/fr_FR/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Merci de votre candidature.<br>...
 JobClosedTextCandidateFound=Le poste n'est plus ouvert. Le poste a été pourvu.
 JobClosedTextCanceled=Le poste n'est plus ouvert.
 ExtrafieldsJobPosition=Attributs complémentaires (postes)
-ExtrafieldsCandidatures=Attributs complémentaires (candidature)
+ExtrafieldsApplication=Attributs complémentaires (candidature)
 MakeOffer=Faire un offre
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 4005859617f..848ec9b039d 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -2,7 +2,7 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable utilisé pour les utilisateurs
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte comptable défini sur la fiche utilisateur sera utilisé uniquement pour la comptabilité auxiliaire. Celui-ci sera utilisé pour le grand livre et comme valeur par défaut de la comptabilité auxiliaire si le compte dédié de l'utilisateur n'est pas défini.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable par défaut pour les paiements de salaires
-CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Par défaut, laissez vide l’option "Créer automatiquement un paiement complet" lors de la création d’un salaire
 Salary=Salaire
 Salaries=Salaires
 NewSalary=Nouveau salaire
@@ -10,7 +10,7 @@ NewSalaryPayment=Nouveau salaire
 AddSalaryPayment=Ajouter paiement de salaire
 SalaryPayment=Règlement salaire
 SalariesPayments=Règlements des salaires
-SalariesPaymentsOf=Salaries payments of %s
+SalariesPaymentsOf=Paiements des salaires de %s
 ShowSalaryPayment=Afficher règlement de salaire
 THM=Tarif horaire moyen
 TJM=Tarif journalier moyen
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index d2b56dfe677..cd4c3d1d94d 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Êtes-vous sûr de vouloir valider cette expédition sous
 ConfirmCancelSending=Êtes-vous sûr de vouloir annuler cette expédition ?
 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).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Date prévue de livraison
 RefDeliveryReceipt=Ref bon de réception
 StatusReceipt=Status du bon de réception
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 811f64f0d84..c0cd183c506 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -19,8 +19,8 @@ Stock=Stock
 Stocks=Stocks
 MissingStocks=Stocks manquants
 StockAtDate=Stock à date
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+StockAtDateInPast=Date dans le passé
+StockAtDateInFuture=Date dans le futur
 StocksByLotSerial=Stocks par lot/série
 LotSerial=Lots/séries
 LotSerialList=Liste des numéros de lots/séries
@@ -37,8 +37,8 @@ AllWarehouses=Tous les entrepôts
 IncludeEmptyDesiredStock=Inclure aussi les stocks négatifs quand le stock désiré optimal n'est pas défini
 IncludeAlsoDraftOrders=Inclure également les commandes brouillons
 Location=Lieu
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=Nom court du lieu
+NumberOfDifferentProducts=Nombre de produits uniques
 NumberOfProducts=Nombre total de produits
 LastMovement=Dernier mouvement
 LastMovements=Derniers mouvements
@@ -62,7 +62,7 @@ EnhancedValueOfWarehouses=Valorisation des stocks
 UserWarehouseAutoCreate=Créer automatiquement un stock/entrepôt propre à l'utilisateur lors de sa création
 AllowAddLimitStockByWarehouse=Gérez également les valeurs des stocks minimums et souhaités par paire (produit-entrepôt) en plus des valeurs de minimums et souhaités par produit
 RuleForWarehouse=Règle pour les entrepôts
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseOnThirparty=Définir un entrepôt sur un tiers
 WarehouseAskWarehouseDuringPropal=Définir un entrepôt sur les propositions commerciales
 WarehouseAskWarehouseDuringOrder=Définir un entrepôt sur les commandes
 UserDefaultWarehouse=Définir un entrepôt sur les utilisateurs
@@ -91,14 +91,14 @@ NoPredefinedProductToDispatch=Pas de produits prédéfinis dans cet objet. Aucun
 DispatchVerb=Ventiler
 StockLimitShort=Limite pour alerte
 StockLimit=Limite stock pour alerte
-StockLimitDesc=(vide) n'affichera aucune icone d'alerte. <br>0 peut être saisi pour afficher une alerte en cas de stock nul.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Stock physique
 RealStock=Stock réel
 RealStockDesc=Le stock physique ou réel est le stock présent dans les entrepôts.
 RealStockWillAutomaticallyWhen=Le stock réel sera modifié selon ces règles (voir la configuration du module Stock) :
 VirtualStock=Stock virtuel
 VirtualStockAtDate=Stock virtuel à date
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
+VirtualStockAtDateDesc=Stock virtuel une fois que tous les ordres en attente, prévus d'être traités avant la date choisie, soient terminés
 VirtualStockDesc=Le stock virtuel est la quantité de produit en stock après que les opérations en cours (et qui affectent les stocks) soient terminées (réceptions de commandes fournisseurs, expéditions de commandes clients, production des ordres de fabrications, etc)
 AtDate=À date
 IdWarehouse=Identifiant entrepôt
@@ -107,7 +107,7 @@ LieuWareHouse=Lieu entrepôt
 WarehousesAndProducts=Entrepôts et produits
 WarehousesAndProductsBatchDetail=Entrepôts et produits (avec détail par lot/série)
 AverageUnitPricePMPShort=Prix moyen pondéré (PMP)
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=Le prix unitaire moyen que nous avons dû dépenser pour obtenir 1 unité de produit dans notre stock.
 SellPriceMin=Prix de vente unitaire
 EstimatedStockValueSellShort=Valeur à la vente
 EstimatedStockValueSell=Valeur vente
@@ -147,7 +147,7 @@ Replenishments=Réapprovisionnement
 NbOfProductBeforePeriod=Quantité du produit <b>%s</b> en stock avant la période sélectionnée (< <b>%s</b>)
 NbOfProductAfterPeriod=Quantité du produit <b>%s</b> en stock après la période sélectionnée (> <b>%s</b>)
 MassMovement=Mouvement en masse
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+SelectProductInAndOutWareHouse=Sélectionnez un entrepôt source et un entrepôt cible, un produit et une quantité puis cliquez sur "%s". Une fois ceci fait pour tous les mouvements requis, cliquez sur "%s".
 RecordMovement=Enregistrer transfert
 ReceivingForSameOrder=Réceptions pour cette commande
 StockMovementRecorded=Mouvement de stocks enregistré
@@ -238,20 +238,20 @@ StockIsRequiredToChooseWhichLotToUse=Le module Stock est requis pour choisir une
 ForceTo=Forcer à
 AlwaysShowFullArbo=Afficher l'arborescence complète de l'entrepôt sur la popup du lien entrepôt (Avertissement: cela peut réduire considérablement les performances)
 StockAtDatePastDesc=Vous pouvez voir ici le stock (stock réel) à une date donnée dans le passé
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
+StockAtDateFutureDesc=Vous pouvez voir ici le stock (stock virtuel) à une date donnée dans le futur
 CurrentStock=Stock actuel
 InventoryRealQtyHelp=Définissez la valeur sur 0 pour réinitialiser la quantité <br> Gardez le champ vide ou supprimez la ligne pour qu'elle reste inchangé
 UpdateByScaning=Remplir la quantité réelle en scannant
 UpdateByScaningProductBarcode=Mettre à jour par scan (code-barres produit)
 UpdateByScaningLot=Mise à jour par scan (code barres lot/série)
 DisableStockChangeOfSubProduct=Désactiver les mouvements de stock des composants pour ce mouvement de stock.
-ImportFromCSV=Import CSV list of movement
+ImportFromCSV=Importer une liste CSV des mouvements
 ChooseFileToImport=Ajoutez le fichier à importer puis cliquez sur le pictogramme %s pour le sélectionner comme fichier source d'import…
 SelectAStockMovementFileToImport=sélectionnez un fichier de mouvement de stock à importer
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
+InfoTemplateImport=Le fichier téléchargé doit avoir ce format (* champs obligatoires):<br>Entrepôt source* | Entrepôt cible* | Produit* | Quantité* | Numéro de lot/série<br>Le caractère de séparation CSV doit être "<b>%s</b>"
 LabelOfInventoryMovemement=Inventaire %s
 ReOpen=Réouvrir
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
+ConfirmFinish=Confirmez-vous la clôture de l’inventaire? Ceci générera tous les mouvements de stock pour mettre à jour votre stock.
+ObjectNotFound=%s introuvable
+MakeMovementsAndClose=Générer les mouvements et fermer
+AutofillWithExpected=Remplir la quantité réelle avec la quantité prévue
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index f97eeb7c35c..9a62c443c56 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -70,8 +70,8 @@ Deleted=Supprimé
 # Dict
 Type=Type
 Severity=Sévérité
-TicketGroupIsPublic=Group is public
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+TicketGroupIsPublic=Le groupe est public
+TicketGroupIsPublicDesc=Si un groupe de tickets est public, il sera visible dans le formulaire lors de la création d’un ticket à partir de l’interface publique
 
 # Email templates
 MailToSendTicketMessage=Pour envoyer un e-mail depuis un ticket
@@ -304,13 +304,13 @@ BoxLastModifiedTicket=Derniers tickets modifiés
 BoxLastModifiedTicketDescription=Les %s derniers tickets modifiés
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Pas de tickets modifiés récemment
-BoxTicketType=Number of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
+BoxTicketType=Nombre de tickets ouverts par type
+BoxTicketSeverity=Nombre de tickets ouverts par sévérité
+BoxNoTicketSeverity=Aucun ticket ouvert
+BoxTicketLastXDays=Nombre de nouveaux tickets par jour ces %s derniers jours
+BoxTicketLastXDayswidget = Nombre de nouveaux tickets par jour ces X derniers jours
+BoxNoTicketLastXDays=Aucun nouveau ticket ces %s derniers jours
+BoxNumberOfTicketByDay=Nombre de nouveaux tickets par jour
+BoxNewTicketVSClose=Nombre de nouveaux tickets aujourd’hui par rapport aux tickets fermés aujourd’hui
+TicketCreatedToday=Ticket créé aujourd'hui
+TicketClosedToday=Ticket fermé aujourd'hui
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index a3085eb5d56..d730ca167ed 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Mot de passe modifié en: %s
 SubjectNewPassword=Votre mot de passe pour %s
 GroupRights=Permissions groupe
 UserRights=Permissions utilisateur
+Credentials=Credentials
 UserGUISetup=Interface utilisateur
 DisableUser=Désactiver
 DisableAUser=Désactiver un utilisateur
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Modifier le champ Type pour changer
 OpenIDURL=URL OpenID
 LoginUsingOpenID=Se connecter par OpenID
 WeeklyHours=Heures de travail (par semaine)
-ExpectedWorkedHours=Heures de travail prévues par semaine
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Couleur de l'utilisateur
 DisabledInMonoUserMode=Désactivé en mode maintenance
 UserAccountancyCode=Code comptable de l'utilisateur
@@ -115,7 +116,7 @@ DateOfEmployment=Date d'embauche
 DateEmployment=Emploi
 DateEmploymentstart=Date d'embauche
 DateEmploymentEnd=Date de fin d'emploi
-RangeOfLoginValidity=Période de validité de l'identifiant
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Vous ne pouvez pas désactiver votre propre compte utilisateur
 ForceUserExpenseValidator=Forcer le valideur des notes de frais
 ForceUserHolidayValidator=Forcer le valideur des congés
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 3af0b44c17c..9704067d76c 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -137,11 +137,11 @@ PagesRegenerated=%s page(s)/conteneur(s) régénéré(s)
 RegenerateWebsiteContent=Régénérer les fichiers de cache du site Web
 AllowedInFrames=Autorisé dans les Frames
 DefineListOfAltLanguagesInWebsiteProperties=Définir la liste des langues disponibles dans les propriétés du site web.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+GenerateSitemaps=Générer un fichier de plan du site
+ConfirmGenerateSitemaps=Si vous confirmez, vous effacerez le fichier de plan du site existant...
+ConfirmSitemapsCreation=Confirmer la génération du plan du site
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconType=Le Favicon doit être en png
+ErrorFaviconSize=Le Favicon doit être de taille 16x16, 32x32 ou 64x64
+FaviconTooltip=Téléverser une image qui doit être au format png (16x16, 32x32 ou 64x64)
diff --git a/htdocs/langs/fr_FR/zapier.lang b/htdocs/langs/fr_FR/zapier.lang
index c8f0d311f1f..d3e0c2a8799 100644
--- a/htdocs/langs/fr_FR/zapier.lang
+++ b/htdocs/langs/fr_FR/zapier.lang
@@ -17,5 +17,5 @@ ModuleZapierForDolibarrName = Zapier pour Dolibarr
 ModuleZapierForDolibarrDesc = Module Zapier pour Dolibarr
 ZapierForDolibarrSetup=Configuration de Zapier pour Dolibarr
 ZapierDescription=Interface avec Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ZapierAbout=À propos du module Zapier
+ZapierSetupPage=Il n’y a pas besoin de configuration du côté de Dolibarr pour utiliser Zapier. Cependant, vous devez générer et publier un paquet sur zapier afin de pouvoir utiliser Zapier avec Dolibarr. Voir la documentation sur <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">cette page wiki</a>.
diff --git a/htdocs/langs/fr_GA/accountancy.lang b/htdocs/langs/fr_GA/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/fr_GA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/fr_GA/admin.lang b/htdocs/langs/fr_GA/admin.lang
index 140767493ca..8c6135dc874 100644
--- a/htdocs/langs/fr_GA/admin.lang
+++ b/htdocs/langs/fr_GA/admin.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 Module20Name=Devis
 Module30Name=Factures
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_GA/cron.lang b/htdocs/langs/fr_GA/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/fr_GA/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/fr_GA/modulebuilder.lang b/htdocs/langs/fr_GA/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/fr_GA/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index 9a9114c4fdc..474e593baca 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Referencia
 LabelAccount=Etiqueta conta
 LabelOperation=Etiqueta operación
 Sens=Sentido
-AccountingDirectionHelp=Para unha conta contable dun cliente, use o crédito para rexistrar o pago recibido. <br>. Para unha conta contable dun provedor, use Débito para rexistrar o pago realizado
+AccountingDirectionHelp=Para unha conta contable dun cliente, use o Crédito para rexistrar un pagamento que recibiu<br> Para unha conta contable dun provedor, use Débito para rexistrar un pago que vostede realizou 
 LetteringCode=Codigo de letras
 Lettering=Letras
 Codejournal=Diario
@@ -297,7 +297,7 @@ NoNewRecordSaved=Non hai mais rexistros para o diario
 ListOfProductsWithoutAccountingAccount=Listaxe de produtos sen contas contables
 ChangeBinding=Cambiar a unión
 Accounted=Contabilizada no Libro Maior
-NotYetAccounted=Aínda non contabilizada no Libro Maior
+NotYetAccounted=Non contabilizado no Libro Maior aínda
 ShowTutorial=Amosar Tutorial
 NotReconciled=Non reconciliado
 WarningRecordWithoutSubledgerAreExcluded=Aviso: todas as operacións sen subcontas contables defininidas están filtradas e excluídas desta vista
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index 6a53c55d19c..6e35ac3d197 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Elimine o ficheiro <b>%s</b>, se existe, para permitir a utilidade de
 RestoreLock=Substituir un ficheiro <b>%s</b>, dándolle só dereitos de lectura a este ficheiro con el fin de prohibir nuevas actualizaciones.
 SecuritySetup=Configuración da seguridade
 PHPSetup=Configuración PHP
+OSSetup=Configuración do SO
 SecurityFilesDesc=Defina aquí as opcións de seguridade relacionadas coa subida de ficheiros.
 ErrorModuleRequirePHPVersion=Erro, este módulo require unha versión %s ou superior de PHP
 ErrorModuleRequireDolibarrVersion=Erro, este módulo require unha versión %s ou superior de Dolibarr
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Non suxerir
 NoActiveBankAccountDefined=Ningunha conta bancaria activa definida
 OwnerOfBankAccount=Titular da conta %s
 BankModuleNotActive=Módulo contas bancarias non activado
-ShowBugTrackLink=Amosar ligazón "<strong>%s</strong>"
+ShowBugTrackLink=Defina a ligazón "<strong>%s</strong>" (baleiro para non amosarr esta ligazón, 'github' para a ligazón ao proxecto Dolibarr ou defina directamente unha URL 'https: // ...') 
 Alerts=Alertas
 DelaysOfToleranceBeforeWarning=Atraso antes da amosar unha alerta
 DelaysOfToleranceDesc=Esta pantalla permite configurar os prazos de tolerancia antes da alerta co icono %s, sobre cada elemento en atraso.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Debe executar esta orde dende u
 YourPHPDoesNotHaveSSLSupport=Funcións SSL non dispoñibles no seu PHP
 DownloadMoreSkins=Mais temas para descargar
 SimpleNumRefModelDesc=Devolve o número de referencia no formato %s yymm-nnnn onde yy é o ano, mm é o mes e nnnn é un número secuencial de incremento automático sen restablecer
+SimpleNumRefNoDateModelDesc=Devolve o número de referencia no formato %s-nnnn onde nnnn é un número con incremento automático secuencial sen restablecemento
 ShowProfIdInAddress=Amosa o identificador profisional nos enderezos dos documentos
 ShowVATIntaInAddress=Ocultar o CIF intracomunitario nos enderezos dos documentos
 TranslationUncomplete=Tradución parcial
@@ -2062,7 +2064,7 @@ UseDebugBar=Use a barra de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas liñas de rexistro para manter na consola.
 WarningValueHigherSlowsDramaticalyOutput=Advertencia, os valores altos ralentizan enormemente a saída.
 ModuleActivated=O módulo %s está activado e ralentiza a interface
-ModuleActivatedWithTooHighLogLevel=O módulo %s está activado cun nivel de rexistro demasiado alto (tente usar un nivel inferior para mellor rendemento)
+ModuleActivatedWithTooHighLogLevel=O módulo %s está activado cun nivel de rexistro demasiado alto (tente usar un nivel inferior para mellor rendemento e seguridade)
 ModuleSyslogActivatedButLevelNotTooVerbose=O módulo %s está activado e o nivel de log (%s) é correcto (non moi detallado)
 IfYouAreOnAProductionSetThis=Se está nun entorno de produción, debe establecer esta propiedade en %s..
 AntivirusEnabledOnUpload=Antivirus activado nos ficheiros actualizados
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Agás se precisa executar comandos
 NoWritableFilesFoundIntoRootDir=Non se atoparon ficheiros ou directorios con permisos de escritura dos programas comúns no directorio raíz (Bo)
 RecommendedValueIs=Recomendado %s
 ARestrictedPath=Un path restrinxido
+CheckForModuleUpdate=Comprobar actualizacións para os módulos externos
+CheckForModuleUpdateHelp=Esta acción conectara cos editores de módulos externos para comprobar se hai unha nova versión dispoñible. 
+ModuleUpdateAvailable=Unha actualización está dispoñible
+NoExternalModuleWithUpdate=Non foron atopadas actualizacións para módulos externos
+SwaggerDescriptionFile=Ficheiro de descrición da API Swagger (para uso con redoc por exemplo)
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index c262df8c706..bd694fdd8a6 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Pagamento de imposto social/fiscal
 BankTransfer=Transferencia bancaria
 BankTransfers=Transferencias bancarias
 MenuBankInternalTransfer=Transferencia interna
-TransferDesc=Ao transferir dunha conta a outra, Dolibarr crea dous rexistros contables (un de débito na conta orixe e un de crédito na conta destino). Do mesmo importe (salvo o signo), a etiqueta e a data serán usadas para esta transacción.
+TransferDesc=Escolla transferencia interna se transfire dunha conta a outra, a aplicación escribirá dous rexistros: un débito na conta de orixe e un crédito na conta de destino. A mesma cantidade, etiqueta e data utilizaranse para esta transacción. 
 TransferFrom=De
 TransferTo=A
 TransferFromToDone=A transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s foi rexistrada.
-CheckTransmitter=Emisor
+CheckTransmitter=Orixe
 ValidateCheckReceipt=¿Validar este talón recibido?
-ConfirmValidateCheckReceipt=¿Está certo de querer validar esta remesa? (ningunha modificación será posible unha vez sexa aprobada)
+ConfirmValidateCheckReceipt=Está certo de querer enviar este xustificante de talón para validalo? Non e posible cambialo despois
 DeleteCheckReceipt=¿Eliminar esta remesa?
 ConfirmDeleteCheckReceipt=¿Está certo de querer eliminar esta remesa?
 BankChecks=Talóns bancarios
@@ -142,7 +142,7 @@ AllAccounts=Todas as contas bancarias e de caixa
 BackToAccount=Voltar á conta
 ShowAllAccounts=Amosar para todas as contas
 FutureTransaction=Transacción futura. Non é posible a reconciliación.
-SelectChequeTransactionAndGenerate=Seleccione/filtre talóns a engadir na remesa de cheches e facga click en "Crear".
+SelectChequeTransactionAndGenerate=Seleccione/filtre os talóns que se incluirán no xustificante do depósito de cheques. A continuación, prema en "Crear". 
 InputReceiptNumber=Escolla o extracto relacionado coa conciliación. Use o valor númerico ordenable: YYMM or YYYYMMDD
 EventualyAddCategory=Eventualmente, especifique a categoría na que quere clasificar os rexistros
 ToConciliate=A reconciliar?
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index 32a35a392fd..70df765f795 100644
--- a/htdocs/langs/gl_ES/bills.lang
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convertir o recibido en exceso en desconto disponible
 EnterPaymentReceivedFromCustomer=Engadir pagamento recibido de cliente
 EnterPaymentDueToCustomer=Realizar pagamento de abonos ao cliente
 DisabledBecauseRemainderToPayIsZero=Desactivado xa que o resto a pagar é 0
-PriceBase=Prezo base
+PriceBase=Base do prezo
 BillStatus=Estado da factura
 StatusOfGeneratedInvoices=Estado das facturas xeradas
 BillStatusDraft=Borrador (a validar)
@@ -454,7 +454,7 @@ RegulatedOn=Pagar o
 ChequeNumber=Talón nº
 ChequeOrTransferNumber=Talón/Transferencia nº
 ChequeBordereau=Comprobar axenda
-ChequeMaker=Transmisor Talón/Transferencia
+ChequeMaker=Comprobar/Transferir remitente
 ChequeBank=Banco do talón
 CheckBank=Verificar
 NetToBePaid=Neto a pagar
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
index 9ac7e2e7401..341c78a4a22 100644
--- a/htdocs/langs/gl_ES/boxes.lang
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Últimos %s marcadores
 BoxOldestExpiredServices=Servizos antigos expirados
 BoxLastExpiredServices=Últimos %s contratos mais antigos con servizos expirados
 BoxTitleLastActionsToDo=Últimas %s accións a realizar
-BoxTitleLastContracts=Últimos %s contratos modificados
-BoxTitleLastModifiedDonations=Últimas %s doacións/subvencións modificadas
-BoxTitleLastModifiedExpenses=Últimos %s informes de gastos modificados
-BoxTitleLatestModifiedBoms=Últimos %s MRP modificados
-BoxTitleLatestModifiedMos=Últimos %s ordes de fabricación modificadas
+BoxTitleLastContracts=Últimos %s contratos que foron modificados 
+BoxTitleLastModifiedDonations=Últimas %s subvencións/doazóns que foron modificadas 
+BoxTitleLastModifiedExpenses=Últimos %s informes de gastos que foron modificados
+BoxTitleLatestModifiedBoms=Últimos %s BOMs que foron modificados
+BoxTitleLatestModifiedMos=Últimas %s Ordes de Fabricación que foron modificadas
 BoxTitleLastOutstandingBillReached=Clientes con máximo pendente superado
 BoxGlobalActivity=Actividade global (facturas, orzamentos, ordes)
 BoxGoodCustomers=Bos clientes
diff --git a/htdocs/langs/gl_ES/cashdesk.lang b/htdocs/langs/gl_ES/cashdesk.lang
index 318445e1d3d..22fe23ddffa 100644
--- a/htdocs/langs/gl_ES/cashdesk.lang
+++ b/htdocs/langs/gl_ES/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Piso
 AddTable=Agregar tabla
 Place=Lugar
 TakeposConnectorNecesary='Conector TakePOS' requerido
-OrderPrinters=Impresoras de pedimentos
+OrderPrinters=Engade un botón para enviar o pedimento a algunhas impresoras configuradas, sen pago (por exemplo, para enviar un pedido a unha cociña) 
+NotAvailableWithBrowserPrinter=Non dispoñible cando a impresora para recepción está configurada como navegador: 
 SearchProduct=Procurar producto
 Receipt=Orde
 Header=Cabeceira
@@ -56,8 +57,9 @@ Paymentnumpad=Tipo de Pad para introducir o pago.
 Numberspad=Teclado numérico
 BillsCoinsPad=Moedas e billetes de banco
 DolistorePosCategory=Módulos TakePOS e outras solucións POS para Dolibarr
-TakeposNeedsCategories=TakePOS precisa categorías de produtos para traballar
-OrderNotes=Pedimentos
+TakeposNeedsCategories=TakePOS precisa polo menos unha categoría de produto para funcionar 
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS precisa polo menos 1 categoría de produto da categoría <b>%s</b> para funcionar 
+OrderNotes=Pode engadir algunhas notas a cada elemento pedido
 CashDeskBankAccountFor=Conta por defecto a usar para cobros en
 NoPaimementModesDefined=Non existe modo de pago definido na configuración de TakePOS
 TicketVatGrouped=Agrupar por tipo de IVE nos tickets
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=A factura xa foi validada
 NoLinesToBill=Sen liñas a facturar
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Xestionar suplementos de produtos
 SupplementCategory=Supplement category
 ColorTheme=Cor do tema
 Colorful=Colorido
@@ -92,7 +94,7 @@ Browser=Navegador
 BrowserMethodDescription=Impresión de recibos sinxela e doada. Só algúns parámetros para configurar o recibo. Imprimir mediante navegador.
 TakeposConnectorMethodDescription=Módulo externo con funcións adicionais. Posibilidade de imprimir desde a nube.
 PrintMethod=Método de impresión
-ReceiptPrinterMethodDescription=Método potente con moitos parámetros. Completamente personalizable con modelos. Non se pode imprimir desde a nube.
+ReceiptPrinterMethodDescription=Método potente con moitos parámetros. Completamente personalizable con modelos. O servidor que aloxa a aplicación non pode estar na Nube (debe poder alcanzar ás impresoras da súa rede). 
 ByTerminal=Por terminal
 TakeposNumpadUsePaymentIcon=Usar a icona no canto do texto, nos botóns de pago do teclado numérico
 CashDeskRefNumberingModules=Módulo de numeración para vendas de TPV
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=A impresora de recibos do módulo debe estar h
 AllowDelayedPayment=Permitir o pago en débeda
 PrintPaymentMethodOnReceipts=Imprimir método de pago en tickets/recibos
 WeighingScale=Pesaxe
+ShowPriceHT = Amosar o prezo sen a columna de impostos
+ShowPriceHTOnReceipt = Amosar o prezo sen a columna de impostos no recibo
diff --git a/htdocs/langs/gl_ES/categories.lang b/htdocs/langs/gl_ES/categories.lang
index 7abe3fbe746..223db61d3ac 100644
--- a/htdocs/langs/gl_ES/categories.lang
+++ b/htdocs/langs/gl_ES/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Etiqueta/Categoría
 Rubriques=Etiquetas/Categorías
 RubriquesTransactions=Etiquetas/Categorías de transaccións
 categories=etiquetas/categorías
-NoCategoryYet=Ningunha etiqueta/categoría deste tipo creada
+NoCategoryYet=Non foi creada ningunha etiqueta/categoría deste tipo
 In=En
 AddIn=Engadir en
 modify=modificar
 Classify=Clasificar
 CategoriesArea=Área Etiquetas/Categorías
-ProductsCategoriesArea=Área etiquetas/categorías Produtos/Servizos
-SuppliersCategoriesArea=Área etiquetas/categorías Provedores
-CustomersCategoriesArea=Área etiquetas/categorías Clientes
-MembersCategoriesArea=Área etiquetas/categorías Membros
-ContactsCategoriesArea=Área etiquetas/categorías de Contactos
-AccountsCategoriesArea=Etiquetas cuentas bancarias/Área categorías
-ProjectsCategoriesArea=Área etiquetas/categorías Proxectos
-UsersCategoriesArea=Área etiquetas/categorías Usuarios
+ProductsCategoriesArea=Área de etiquetas/categorías de Produto/Servizo
+SuppliersCategoriesArea=Área de etiquetas/categorías de Provedor
+CustomersCategoriesArea=Área de etiquetas/categorías de Cliente
+MembersCategoriesArea=Área de etiquetas/categorías de Membros
+ContactsCategoriesArea=Área de etiquetas/categorías de Contactos
+AccountsCategoriesArea=Área de etiquetas/categorías de Contas Bancarias
+ProjectsCategoriesArea=Área de etiquetas/categorías de Proxectos
+UsersCategoriesArea=Área de etiquetas/categorias de Usuarios
 SubCats=Subcategorías
 CatList=Listaxe de etiquetas/categorías
 CatListAll=Listaxe de etiquetas/categorías (todos os tipos)
@@ -96,4 +96,4 @@ ChooseCategory=Escoller categoría
 StocksCategoriesArea=Categorías de almacén
 ActionCommCategoriesArea=Categorías de evento
 WebsitePagesCategoriesArea=Categorías de contedores de páxina
-UseOrOperatorForCategories=Uso ou operador para categorías
+UseOrOperatorForCategories=Use o operador "OR" para as categorías
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
index 1e6ce90501d..a172066fa20 100644
--- a/htdocs/langs/gl_ES/companies.lang
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=O nome da empresa %s xa existe. Escolla outro.
 ErrorSetACountryFirst=Defina en primeiro lugar o país
 SelectThirdParty=Seleccionar un terceiro
-ConfirmDeleteCompany=¿Está certo de querer eliminar esta empresa e toda a súa información inmanente?
+ConfirmDeleteCompany=Está certo de querer eliminar esta empresa e toda a información relacionada?
 DeleteContact=Eliminar un contacto/enderezo
-ConfirmDeleteContact=¿Está certo de querer eliminar este contacto e toda a información inmanente?
+ConfirmDeleteContact=Está certo de querer eliminar este contacto e toda a información relacionada?
 MenuNewThirdParty=Novo terceiro
 MenuNewCustomer=Novo cliente
 MenuNewProspect=Novo cliente potencial
@@ -69,7 +69,7 @@ PhoneShort=Teléfono
 Skype=Skype
 Call=Chamar
 Chat=Chat
-PhonePro=Teléf. traballo
+PhonePro=Autobús. Teléfono
 PhonePerso=Teléf. particular
 PhoneMobile=Móbil
 No_Email=Rexeitar e-mails masivos
@@ -331,7 +331,7 @@ CustomerCodeDesc=Código cliente, único para todos os clientes
 SupplierCodeDesc=Código provedor, único para todos os provedores
 RequiredIfCustomer=Requerido se o terceiro é un cliente ou cliente potencial
 RequiredIfSupplier=Requerido se o terceiro é un provedor
-ValidityControledByModule=Validación controlada polo módulo
+ValidityControledByModule=Validez controlada polo módulo
 ThisIsModuleRules=Regras para este módulo.
 ProspectToContact=Cliente potencial a contactar
 CompanyDeleted=A empresa "%s" foi eliminada
@@ -439,12 +439,12 @@ ListSuppliersShort=Listaxe de provedores
 ListProspectsShort=Listaxe de clientes potenciais
 ListCustomersShort=Listaxe de clientes
 ThirdPartiesArea=Área de Terceiros/Contactos
-LastModifiedThirdParties=Últimos %s terceiros modificados
-UniqueThirdParties=Total de terceiros únicos
+LastModifiedThirdParties=Últimos %s Terceiros que foron modificados
+UniqueThirdParties=Número total de Terceiros
 InActivity=Activo
 ActivityCeased=Pechada
 ThirdPartyIsClosed=O terceiro está pechado
-ProductsIntoElements=Listaxe de produtos/servizos en %s
+ProductsIntoElements=Listaxe de produtos/servizos mapeados a %s
 CurrentOutstandingBill=Risco alcanzado
 OutstandingBill=Importe máximo para facturas pendentes
 OutstandingBillReached=Importe máximo para facturas pendentes
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Código libre. Pode ser modificado en calquera momento.
 ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.)
 MergeOriginThirdparty=Terceiro duplicado (terceiro a eliminar)
 MergeThirdparties=Fusionar terceiros
-ConfirmMergeThirdparties=¿Está certo de querer fusionar este terceiro co actual? Todos os obxectos relacionados (facturas, pedimentos, ..) moveranse ao terceiro actual, e o terceiro será eliminado.
+ConfirmMergeThirdparties=Está certo de querer combinar o terceiro escollido co terceiro actual? Todos os obxectos ligados (facturas, pedimentos, ...) serán movidos ao terceiro actual, despois de eliminar o terceiro escollido.
 ThirdpartiesMergeSuccess=Os terceiros foron fusionados
 SaleRepresentativeLogin=Inicio de sesión do comercial
 SaleRepresentativeFirstname=Nome do comercial
diff --git a/htdocs/langs/gl_ES/compta.lang b/htdocs/langs/gl_ES/compta.lang
index ae6b5e0ca8b..bd368ec635d 100644
--- a/htdocs/langs/gl_ES/compta.lang
+++ b/htdocs/langs/gl_ES/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Nova remesa
 NewCheckDeposit=Novo ingreso
 NewCheckDepositOn=Crear nova remesa na conta: %s
 NoWaitingChecks=Sen talóns agardando depósito
-DateChequeReceived=Data recepción do talón
+DateChequeReceived=Comprobe a data de recepción
 NbOfCheques=Nº de talóns
 PaySocialContribution=Pagar unha taxa social/fiscal
 PayVAT=Pagar liquidación de IVE
diff --git a/htdocs/langs/gl_ES/ecm.lang b/htdocs/langs/gl_ES/ecm.lang
index c85c97b756f..a7edfa1bfba 100644
--- a/htdocs/langs/gl_ES/ecm.lang
+++ b/htdocs/langs/gl_ES/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields en ficheiros ECM
 ExtraFieldsEcmDirectories=Extrafields en directorios ECM
 ECMSetup=Configuración ECM
 GenerateImgWebp=Duplica todas as imaxes con outra versión con formato .webp 
-ConfirmGenerateImgWebp=Se confirma, xerará unha imaxe en formato .webp para todas as imaxes incluídas neste cartafol e no cartafol fillo ... 
+ConfirmGenerateImgWebp=Se confirma, xerará unha imaxe en formato .webp para todas as imaxes actuais deste cartafol (as subcarpetas non están incluídas) ...
 ConfirmImgWebpCreation=Confirmar a duplicación de todas as imaxes
 SucessConvertImgWebp=Imaxes duplicadas correctamente
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 604b367d989..324b3a4bfb3 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Sen erro,  é válido
 # Errors
 ErrorButCommitIsDone=Atopáronse erros pero validamos a pesar diso
-ErrorBadEMail=Correo electrónico %s incorrecto
-ErrorBadMXDomain=Correo electrónico %s parece incorrecto (o dominio non ten un rexistro MX válido)
-ErrorBadUrl=Url %s incorrecta
+ErrorBadEMail=O correo electrónico %s é incorrecto
+ErrorBadMXDomain=O correo electrónico %s parece incorrecto (O dominio non ten un rexistro MX válido)
+ErrorBadUrl=URL %s é incorrecta
 ErrorBadValueForParamNotAString=Valor incorrecto para o seu parámetro. Xeralmente aparece cando falta a tradución
 ErrorRefAlreadyExists=A referencia <b>%s</b> xa existe
 ErrorLoginAlreadyExists=O login %s xa existe.
@@ -46,8 +46,8 @@ ErrorWrongDate=A data non correcta!
 ErrorFailedToWriteInDir=Erro ao escribir no directorio %s
 ErrorFoundBadEmailInFile=Atopouse unha sintaxe de correo electrónico incorrecta para  %s liñas no ficheiro (exemplo liña %s con correo electrónico=%s)
 ErrorUserCannotBeDelete=Non pode eliminarse o usuario. É posible que esté asociado a entidades do Dolibarr
-ErrorFieldsRequired=Non se completaron algúns campos obrigatorios
-ErrorSubjectIsRequired=O asunto do correo electrónico é  obligatorio
+ErrorFieldsRequired=Algúns campos obrigatorios están baleiros
+ErrorSubjectIsRequired=O asunto do correo electrónico é obrigatorio
 ErrorFailedToCreateDir=Fallou a creación dun directorio. Comprobe que o usuario do servidor web ten permisos para escribir no directorio de documentos Dolibarr. Se o parámetro <b>safe_mode</b> está activado neste PHP, comprobe que os ficheiros php Dolibarr son propiedade do usuario (ou grupo) do servidor web.
 ErrorNoMailDefinedForThisUser=Non existe enderezo de correo electrónico asignado a este usuario
 ErrorSetupOfEmailsNotComplete=A configuración do correo electrónico non está rematada
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=A páxina/contedor <strong>%s</strong
 ErrorDuringChartLoad=Erro ao cargar o plan de contabilidade. Se non se cargaron algunhas contas, aínda pode introducilas manualmente.
 ErrorBadSyntaxForParamKeyForContent=Sintaxe incorrecta para o parémetro keyforcontent. Debe ter un valor que comece por %s ou %s
 ErrorVariableKeyForContentMustBeSet=Erro, debe establecerse a constante co nome %s (con contido de texto para amosar) ou %s (con URL externo para amosar).
+ErrorURLMustEndWith=URL %s debe rematar %s
 ErrorURLMustStartWithHttp=O URL %s debe comezar con http:// ou https://
 ErrorHostMustNotStartWithHttp=O nome do host %s NON debe comezar con http:// ou https://
 ErrorNewRefIsAlreadyUsed=Erro, a nova referencia xa está empregada
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Dispoñible só se usa conexión segura HTTP
 WarningModuleXDisabledSoYouMayMissEventHere=Non foi activado o módulo %s . Pode que perda moitos eventos aquí
 ErrorActionCommPropertyUserowneridNotDefined=É preciso o supervisor do usuario
 ErrorActionCommBadType=O tipo de evento seleccionado (id: %n, código: %s) non existe no diccionario Tipo de Evento
+CheckVersionFail=Fallou a comprobación da versión
diff --git a/htdocs/langs/gl_ES/eventorganization.lang b/htdocs/langs/gl_ES/eventorganization.lang
new file mode 100644
index 00000000000..9e51029fd03
--- /dev/null
+++ b/htdocs/langs/gl_ES/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Organización de eventos
+EventOrganizationDescription = Organización de eventos mediante o Módulo de Proxectos
+EventOrganizationDescriptionLong= Xestionar a organización de Eventos para conferencias, asistentes, relatores e asistentes, cunha páxina de subscrición pública
+#
+# Menu
+#
+EventOrganizationMenuLeft = Eventos organizados
+EventOrganizationConferenceOrBoothMenuLeft = Conferencia ou Stand
+
+#
+# Admin page
+#
+EventOrganizationSetup = Configuración da Organización de Eventos
+Settings = Configuracións
+EventOrganizationSetupPage = Páxina de configuración da Organización de Eventos
+EVENTORGANIZATION_TASK_LABEL = Etiqueta de tarefas para crear automaticamente cando o proxecto é validado 
+EVENTORGANIZATION_TASK_LABELTooltip = Cando valida un evento organizado, pódense crear automaticamente algunhas tarefas no proxecto<br><br>Por exemplo<br>Enviar Chamada a Conferencia<br>Enviar Chamada a Stand<br>Recibir Chamadas para Conferencias<br>Recibir chamada a Stand<br>Abrir subscricións a eventos para os participantes<br>Enviar recordatorio do evento aos relatores<br>Enviar recordatorio do evento ao anfitrión do stand<br>Enviar recordatorio do evento aos asistentes
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoría para engadir a terceiros creada automaticamente cando alguén suxire unha conferencia 
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categoría para engadir a terceiros creada automaticamente cando suxiren un stand 
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Modelo de correo electrónico para enviar despois de recibir unha suxestión dunha conferencia.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Modelo de correo electrónico para enviar despois de recibir a suxestión dun stand. 
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Modelo de correo electrónico para enviar despois de pagar unha subscrición a un stand. 
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Modelo de correo electrónico para enviar despois de pagar unha subscrición a un evento. 
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Modelo de correo electrónico de acción masiva para os asistentes 
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Modelo de correo electrónico de acción masiva para os relatores
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtra a listaxe de selección de terceiros na tarxeta/formulario de creación de asistentes coa categoría 
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtra a listaxe de selección de terceiros na tarxeta/formulario de creación de asistentes co tipo de cliente 
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conferencia ou Stand
+ManageOrganizeEvent = Xestionar a organización de eventos
+ConferenceOrBooth = Conferencia ou Stand
+ConferenceOrBoothTab = Conferencia ou Stand
+AmountOfSubscriptionPaid = Importe da subscrición paga
+DateSubscription = Data de subscrición 
+ConferenceOrBoothAttendee = Asistente á conferencia ou stand 
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = A súa solicitude para a conferencia foi recibida
+YourOrganizationEventBoothRequestWasReceived = A súa solicitude para a stand foi recibida
+EventOrganizationEmailAskConf = Solicitude de conferencia 
+EventOrganizationEmailAskBooth = Solicitude de stand 
+EventOrganizationEmailSubsBooth = Subscrición para stand
+EventOrganizationEmailSubsEvent = Subscrición a un evento 
+EventOrganizationMassEmailAttendees = Comunicación aos asistentes 
+EventOrganizationMassEmailSpeakers = Comunicación aos relatores
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Permitir que persoas descoñecidas suxiran conferencias 
+AllowUnknownPeopleSuggestConfHelp=Permitir que persoas descoñecidas suxiran conferencias 
+AllowUnknownPeopleSuggestBooth=Permitir que persoas descoñecidas suxiran stand
+AllowUnknownPeopleSuggestBoothHelp=Permitir que persoas descoñecidas suxiran stand
+PriceOfRegistration=Prezo da inscrición 
+PriceOfRegistrationHelp=Prezo da inscrición 
+PriceOfBooth=Prezo da subscrición para estar nun stand
+PriceOfBoothHelp=Prezo da subscrición para estar nun stand
+EventOrganizationICSLink=Ligazón ICS para eventos 
+ConferenceOrBoothInformation=Información sobre conferencia ou stand
+Attendees = Asistentes 
+EVENTORGANIZATION_SECUREKEY = Clave segura da ligazón de rexistro público a unha conferencia 
+#
+# Status
+#
+EvntOrgDraft = Non validada
+EvntOrgSuggested = Suxerido 
+EvntOrgConfirmed = Confirmado 
+EvntOrgNotQualified = Non cualificado 
+EvntOrgDone = Realizados
+EvntOrgCancelled = Cancelado 
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Ligazón pública de rexistro a unha conferencia 
+MissingOrBadSecureKey = A clave de seguridade non é válida ou inexistente
+EvntOrgWelcomeMessage = Este formulario permítelle rexistrarse como novo participante na conferencia 
+EvntOrgStartDuration = Esta conferencia comeza en
+EvntOrgEndDuration =  e remata en
diff --git a/htdocs/langs/gl_ES/knowledgemanagement.lang b/htdocs/langs/gl_ES/knowledgemanagement.lang
new file mode 100644
index 00000000000..3bab515906a
--- /dev/null
+++ b/htdocs/langs/gl_ES/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Sistema de xestión do coñecemento 
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Xestionar a Xestión do Coñecemento (XC) ou  Help_Desk
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Configuración do Sistema de Xestión do Coñecemento
+Settings = Configuracións
+KnowledgeManagementSetupPage = Páxina de configuración do Sistema de Xestión do Coñecemento
+
+
+#
+# About page
+#
+About = Acerca de
+KnowledgeManagementAbout = Sobre a Xestión do Coñécemento
+KnowledgeManagementAboutPage = Páxina sobre a Xestión do Coñecemento
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Xestión do Coñecemento
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Base de Coñecemento
+ListOfArticles = Listaxe de artígos
+NewKnowledgeRecord = Novo artigo
+ValidateReply = Validar a solución
+KnowledgeRecords = Artigos
+KnowledgeRecord = Artigo
+KnowledgeRecordExtraFields = Campos extras para Artigos
diff --git a/htdocs/langs/gl_ES/mails.lang b/htdocs/langs/gl_ES/mails.lang
index fa304de11c3..bcf8acd99eb 100644
--- a/htdocs/langs/gl_ES/mails.lang
+++ b/htdocs/langs/gl_ES/mails.lang
@@ -14,8 +14,8 @@ MailTo=Destinatario(s)
 MailToUsers=A usuario(s)
 MailCC=Copia a
 MailToCCUsers=Copia a usuario(s)
-MailCCC=Axuntar copia a
-MailTopic=Asunto do correo
+MailCCC=Axuntar copia oculta a
+MailTopic=Asunto do correo electrónico
 MailText=Mensaxe
 MailFile=Ficheiro
 MailMessage=Texto utilizado no corpo da mensaxe
@@ -113,8 +113,8 @@ LimitSendingEmailing=Nota: o envío de mensaxes de correo electrónico desde a i
 TargetsReset=Vaciar listaxe
 ToClearAllRecipientsClickHere=Para vaciar a listaxe dos destinatarios deste mailing, faga click no botón
 ToAddRecipientsChooseHere=Para engadir destinatarios, escolla os que figuran nas listaxes a continuación
-NbOfEMailingsReceived=ailings en masa recibidos
-NbOfEMailingsSend=Milings masivos enviados
+NbOfEMailingsReceived=Mailings masivos recibidos
+NbOfEMailingsSend=Mailings masivos enviados
 IdRecord=ID rexistro
 DeliveryReceipt=Acuse de recibo.
 YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o carácter de separación <b>coma </b> para especificar múltiples destinatarios.
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=Non hai previstas notificacións automáticas por corr
 ANotificationsWillBeSent=Enviarase 1 notificación automática por correo electrónico
 SomeNotificationsWillBeSent=As notificacións automáticas de %s enviaranse por correo electrónico
 AddNewNotification=Subscribirse a unha nova notificación automática por correo electrónico (destino/evento)
-ListOfActiveNotifications=Lista todas as subscricións activas (obxectivos/eventos) para a notificación automática por correo electrónico
-ListOfNotificationsDone=Lista todas as notificacións automáticas enviadas por correo electrónico
+ListOfActiveNotifications=Listaxe de todas as subscricións activas (obxectivos/eventos) para a notificación automática por correo electrónico 
+ListOfNotificationsDone=Listaxe de todas as notificacións automáticas enviadas por correo electrónico
 MailSendSetupIs=A configuración de mailings está a '%s'. Este modo non pode ser usado para enviar mails masivos.
 MailSendSetupIs2=Antes debe, cunha conta de administrador, no menú %sInicio - Configuración - E-Mails%s, cambiar o parámetro <strong>'%s'</strong> para usar o modo '%s'. Con este modo pode configurar un servidor SMTP do seu provedor de servizos de internet.
 MailSendSetupIs3=Se ten algunha dúbida sobre como configurar o seu servidor SMTP, pode preguntar a %s.
@@ -167,7 +167,7 @@ NoContactLinkedToThirdpartieWithCategoryFound=Non atopáronse contactos/enderezo
 OutGoingEmailSetup=Configuración de correos electrónicos saíntes
 InGoingEmailSetup=Configuración de correos electrónicos entrantes
 OutGoingEmailSetupForEmailing=Configuración do correos electrónicos saíntes (para o módulo %s)
-DefaultOutgoingEmailSetup=A mesma configuración que a configuración de correos electrónicsoos saíntes predeterminados
+DefaultOutgoingEmailSetup=A mesma configuración que a configuración de correos electrónicos saíntes predeterminados
 Information=Información
 ContactsWithThirdpartyFilter=Contactos con filtro de terceiros.
 Unanswered=Sen resposta
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index 8e9b9d817ff..483c9c19896 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Gardar e novo
 TestConnection=Probar a conexión
 ToClone=Copiar
 ConfirmCloneAsk=Estás certo de querer clonar o obxecto <b>%s</b>?
-ConfirmClone=Escolla os datos que desexa copiar:
+ConfirmClone=Escolla os datos que quere clonar
 NoCloneOptionsSpecified=Non hai datos definidos para copiar
 Of=de
 Go=Ir
@@ -246,7 +246,7 @@ DefaultModel=Prantilla por defecto do documento
 Action=Acción
 About=Acerca de
 Number=Número
-NumberByMonth=Número por mes
+NumberByMonth=Total de informes por mes
 AmountByMonth=Importe por mes
 Numero=Número
 Limit=Límite
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=Usuario da creación
-UserModif=Usuario da última actualización
+UserAuthor=Creado por
+UserModif=Actualizado por 
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Por
 From=De
 FromDate=De
 FromLocation=De
-at=a
 to=a
 To=a
+ToDate=a
+ToLocation=a
+at=a
 and=e
 or=ou
 Other=Outro
@@ -843,7 +845,7 @@ XMoreLines=%s líña(s) ocultas
 ShowMoreLines=Amosar mais/menos liñas
 PublicUrl=URL pública
 AddBox=Engadir caixa
-SelectElementAndClick=Seleccione un elemento e prema %s
+SelectElementAndClick=Seleccione un elemento e prema en %s
 PrintFile=Imprimir Ficheiro %s
 ShowTransaction=Amosar rexistro na conta bancaria
 ShowIntervention=Amosar intervención
@@ -854,8 +856,8 @@ Denied=Denegada
 ListOf=Lista de %s
 ListOfTemplates=Listaxe de prantillas
 Gender=Sexo
-Genderman=Home
-Genderwoman=Muller
+Genderman=Masculino
+Genderwoman=Feminino
 Genderother=Outro
 ViewList=Vista de listaxe
 ViewGantt=Vista de Gantt
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Está certo de que quere poñer ás etiquetas dos rexis
 CategTypeNotFound=Non se atopou ningún tipo de etiqueta para o tipo de rexistros
 CopiedToClipboard=Copiado a portapapeis
 InformationOnLinkToContract=Este importe é só o total de todas as liñas do contrato. Non se ten en conta ningunha noción de tempo.
+ConfirmCancel=Está certo de querer cancelar
diff --git a/htdocs/langs/gl_ES/members.lang b/htdocs/langs/gl_ES/members.lang
index a3cda215b7f..b788c8fa48a 100644
--- a/htdocs/langs/gl_ES/members.lang
+++ b/htdocs/langs/gl_ES/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro (nome: <b>%s</b>, login:
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razóns de seguridade, debe posuir os dereitos de modificación de todos os usuarios para poder ligar un membro a un usuario que non sexa vostede mesmo mesmo.
 SetLinkToUser=Ligar a un usuario Dolibarr
 SetLinkToThirdParty=Ligar a un terceiro Dolibarr
-MembersCards=Carnés de membros
+MembersCards=Tarxetas de visita para membros
 MembersList=Listaxe de membros
 MembersListToValid=Listaxe de membros borrador (a validar)
 MembersListValid=Listaxe de membros validados
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Membros agardando recibir afiliación
 MembersWithSubscriptionToReceiveShort=Agardando afiliación
 DateSubscription=Data afiliación
 DateEndSubscription=Data fin afiliación
-EndSubscription=Fin afiliación
+EndSubscription=A subscripción remata
 SubscriptionId=ID afiliación
 WithoutSubscription=Sen subscrición
 MemberId=ID membro
@@ -83,10 +83,10 @@ WelcomeEMail=E-mail
 SubscriptionRequired=Precisa afiliación
 DeleteType=Eliminar
 VoteAllowed=Voto autorizado
-Physical=Físico
-Moral=Xurídico
-MorAndPhy=Xurídico e Físico
-Reenable=Reactivar
+Physical=Individual
+Moral=Corporación
+MorAndPhy=Corporación e Individual
+Reenable=Voltar a habilitar
 ExcludeMember=Excluír un membro
 ConfirmExcludeMember=Está certo de querer excluír a este membro?
 ResiliateMember=Dar de baixa a un membro
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Estatísticas de membros por país
 MembersStatisticsByState=Estatísticas de membros por provincia/pais
 MembersStatisticsByTown=Estatísticas de membros por poboación
 MembersStatisticsByRegion=Estatísticas de membros por rexión
-NbOfMembers=Número de membros
-NbOfActiveMembers=Número de membros activos actuais
+NbOfMembers=Número total de membros
+NbOfActiveMembers=Número total de membros activos
 NoValidatedMemberYet=Ningún membro validado atopado
-MembersByCountryDesc=Esta pantalla presenta unha estatística do número de membros por países. Porén, a gráfica utiliza o servizo en líña  de gráficas de Google e só é operativo cando ten operativa unha conexión a Internet.
-MembersByStateDesc=Esta pantalla presenta unha estatística do número de membros por paises/provincias/comunidades
-MembersByTownDesc=Esta pantalla presenta unha estatística do número de membros por poboación.
+MembersByCountryDesc=Esta pantalla amosa as estatísticas dos membros por países. As gráficas e os gráficos dependen da dispoñibilidade do servizo de gráficos en liña de Google, así como da dispoñibilidade dunha conexión a Internet habilitada. 
+MembersByStateDesc=Esta pantalla amosa estatísticas de membros por estado/provincias/comunidades. 
+MembersByTownDesc=Esta pantalla amosa as estatísticas dos membros por cidade. 
+MembersByNature=Esta pantalla amosa as estatísticas dos membros por natureza. 
+MembersByRegion=Esta pantalla amosa as estatísticas dos membros por rexión. 
 MembersStatisticsDesc=Escolla as estatísticas que desexa consultar...
 MenuMembersStats=Estatísticas
-LastMemberDate=Última data de membro
+LastMemberDate=Última data de adhesión
 LatestSubscriptionDate=Data da última cotización
 MemberNature=Natureza do membro
 MembersNature=Natureza dos membros
-Public=Información pública
+Public=A información é pública
 NewMemberbyWeb=Novo membro engadido. Agardando validación
 NewMemberForm=Novo formulario de membro
-SubscriptionsStatistics=Estatísticas de cotizacións
+SubscriptionsStatistics=Estatísticas de subscrición
 NbOfSubscriptions=Número de cotizacións
-AmountOfSubscriptions=Importe de cotizacións
+AmountOfSubscriptions=Importe recollido coas subscricións
 TurnoverOrBudget=Volumen de vendas (para empresa) ou Orzamento (para Fundación)
 DefaultAmount=Importe por defecto da afiliación
 CanEditAmount=O visitante pode escoller/modificar o importe da súa cotización
 MEMBER_NEWFORM_PAYONLINE=Ir á páxina integrada de pagamento en liña
 ByProperties=Por natureza
 MembersStatisticsByProperties=Estatísticas dos membros por natureza
-MembersByNature=Esta pantalla presenta unha estatística do número de membros por natureza.
-MembersByRegion=Esta pantalla presenta unha estatística do número de membros por rexión
 VATToUseForSubscriptions=Tasa de IVE para as afiliacións
 NoVatOnSubscription=Sen IVE para nas afiliacións
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produto usado para as afiliacións en liña nas facturas: %s
diff --git a/htdocs/langs/gl_ES/modulebuilder.lang b/htdocs/langs/gl_ES/modulebuilder.lang
index ffc915782df..4ecc68c127b 100644
--- a/htdocs/langs/gl_ES/modulebuilder.lang
+++ b/htdocs/langs/gl_ES/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Listaxe de permisos definidos
 SeeExamples=Ver exemplos aquí
 EnabledDesc=Condición para ter activo este campo (Exemplos: 1 ou $ conf-> global-> MYMODULE_MYOPTION)
 VisibleDesc=¿É visible o campo? (Exemplos: 0= Nunca visible, 1= Visible na lista e crear/actualizar/ver formularios, 2= Visible só na lista, 3= Visible só na forma de crear/actualizar/ver (non lista), 4= Visible na lista e actualizar/ver formulario só (non crear), 5= Visible só no formulario de visualización final da lista (non crear, non actualizar). <br> <br> Usar un valor negativo significa que o campo non se amosa por defecto na lista, pero pódese seleccionar para ver). <br> <br> Pode ser unha expresión, por exemplo: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])?0:1 <br> ($ usuario-> dereitos->vacacións->definir_ vacacións?1:0)
-DisplayOnPdfDesc=Amosar este campo en documentos PDF compatibles, pode xestionar a posición co campo "Posición". <br/> Actualmente, os modelos de PDF compatibles coñecidos son: eratosthene (pedimento), espadon (envío), sponge (facturas), cian ( orzamento), cornas (pedimento a provedor) <br/> <br/> <strong> Para documento: </strong> <br/> 0= non amosado <br/> 1= visualización <br/> 2= visualización só se non está baleiro <br/> <br/> <strong> Para liñas de documento: </strong> <br/> 0= non amosado <br/> 1= amosado nunha columna <br/> 3= amosado en liña columna de descrición despois da descrición <br/> 4= amosar na columna de descrición despois da descrición só se non está baleira
+DisplayOnPdfDesc=Amosar este campo en documentos PDF compatibles, pode xestionar a posición co campo "Posición". <br>Actualmente, os modelos PDF compatibles coñecidos son: eratosteno (pedimento), espadón (envío), sponge (facturas), cian (orzamentos), cornas (pedimento a provedor)<br><br><strong> Paara o documento:</strong><br> 0= non amosado<br> 1=amosar <br>2= amosar só se non está baleiro<br><br><strong> Para as liñas do documento</strong><br>0= non amosado<br>1=amosar nunha columna<br>3=amosar na liña da columna de descrición despois da descrición<br>4= amosar na columna de descrición só despois da descrición se non está baleira
 DisplayOnPdf=Amosar en PDF
 IsAMeasureDesc=¿Pódese acumular o valor do campo para obter un total na lista? (Exemplos: 1 ou 0)
 SearchAllDesc=¿O campo utilízase para facer unha procura desde a ferramenta de busca rápida? (Exemplos: 1 ou 0)
diff --git a/htdocs/langs/gl_ES/other.lang b/htdocs/langs/gl_ES/other.lang
index 295fc5bd4ba..37ad4e8992b 100644
--- a/htdocs/langs/gl_ES/other.lang
+++ b/htdocs/langs/gl_ES/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Instalar ou habilitar a biblioteca GD na súa instalación d
 ProfIdShortDesc=<b> Id. Profesional% s </b> é unha información que depende dun país de terceiros. <br> Por exemplo, para o país <b>% s </b>, é o código <b>% s </ b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
 StatsByNumberOfUnits=Estatísticas para suma de unidades de produto/servizo
-StatsByNumberOfEntities=Estatísticas en número de identidades referentes (nº de facturas o pedimentos...)
+StatsByNumberOfEntities=Estatísticas do número de entidades de referencia (num de facturas, ou pedimentos ...)
 NumberOfProposals=Número de pedimentos
 NumberOfCustomerOrders=Número de pedimentos de clientes
 NumberOfCustomerInvoices=Número de facturas a clientes
@@ -289,4 +289,4 @@ PopuProp=Produtos/Servizos por popularidade en Orzamentos
 PopuCom=Produtos/Servizos por popularidade e Pedimentos
 ProductStatistics=Estatísticas de Produtos/Servizos
 NbOfQtyInOrders=Cantidade en pedimentos
-SelectTheTypeOfObjectToAnalyze=Seleccione o tipo de obxecto a nalizar...
+SelectTheTypeOfObjectToAnalyze=Seleccione un obxecto para ver as súas estatísticas ...
diff --git a/htdocs/langs/gl_ES/partnership.lang b/htdocs/langs/gl_ES/partnership.lang
new file mode 100644
index 00000000000..7aab0c8c018
--- /dev/null
+++ b/htdocs/langs/gl_ES/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Xestión de Asociacións
+PartnershipDescription = Módulo de xestión de Asociacións
+PartnershipDescriptionLong= Módulo de xestión de Asociacións
+
+#
+# Menu
+#
+NewPartnership = Nova Asociación
+ListOfPartnerships = Listaxe de Asociacións
+
+#
+# Admin page
+#
+PartnershipSetup = Configuración de Asociación
+PartnershipAbout = Sobre Asociación
+PartnershipAboutPage = Sobre a páxina de Asociación
+
+
+#
+# Object
+#
+DatePartnershipStart=Data inicio
+DatePartnershipEnd=Data finalización
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Non validada
+PartnershipAccepted = Aceptado
+PartnershipRefused = Rexeitado
+PartnershipCanceled = Anulado
+
+PartnershipManagedFor=Os socios son
diff --git a/htdocs/langs/gl_ES/productbatch.lang b/htdocs/langs/gl_ES/productbatch.lang
index 73b91172fde..a3a113330c9 100644
--- a/htdocs/langs/gl_ES/productbatch.lang
+++ b/htdocs/langs/gl_ES/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=O número de serie %s xa é usado para o produto %s
 TooManyQtyForSerialNumber=Só pode ter un produto %s para o número de serie %s
 BatchLotNumberingModules=Opcións para a xeración automática de lotes de produtos  xestionados por lotes
 BatchSerialNumberingModules=Opcións para a xeración automática de lotes de produtos xestionados por números de serie 
+ManageLotMask=Máscara personalizada
 CustomMasks=Engada unha opción para definir a máscara na tarxeta do produto 
 LotProductTooltip=Engada unha opción na tarxeta do produto para definir unha máscara de número de lote dedicada 
 SNProductTooltip=Engada unha opción na tarxeta do produto para definir unha máscara de número de serie dedicada 
 QtyToAddAfterBarcodeScan=Cant. a engadir por cada código de barras/lote/serie escaneado
-
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index daae06a5d63..eaad382a5cc 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Servizos só á venda
 ServicesOnPurchaseOnly=Servizos só en compra
 ServicesNotOnSell=Servizos fora de venda e de compra
 ServicesOnSellAndOnBuy=Servizos á venda mais en compra
-LastModifiedProductsAndServices=Últimos %s produtos/servizos modificados
+LastModifiedProductsAndServices=Listaxe %s de produtos/servizos que foron modificados
 LastRecordedProducts=Últimos %s produtos rexistrados
 LastRecordedServices=Últimos %s servizos rexistrados
 CardProduct0=Ficha produto
@@ -73,12 +73,12 @@ SellingPrice=Prezo de venda
 SellingPriceHT=Prezo de venda sen IVE
 SellingPriceTTC=Prezo de venda con IVE
 SellingMinPriceTTC=Prezo mínimo de venda (IVE incluido)
-CostPriceDescription=Este campo de prezo (sen impostos) pode usarse para almacenar o importe medio que este produto custa á súa empresa. Pode ser calquera prezo que calcule vostede mesmo, por exemplo a partir do prezo medio de compra máis o custo medio de produción e distribución.
+CostPriceDescription=Este campo de prezo (sen impostos) pode usarse para capturar o importe medio de custo deste produto para a súa empresa. Pode ser calquera prezo que calcule vostede mesmo, por exemplo, a partir do prezo medio de compra máis o custo medio de produción e distribución. 
 CostPriceUsage=Este valor podería usarse para o cálculo de marxes
 SoldAmount=Importe vendas
 PurchasedAmount=Importe compras
 NewPrice=Novo prezo
-MinPrice=Prezo de venda mín.
+MinPrice=Prezo de venda mímino
 EditSellingPriceLabel=Editar etiqueta prezo de venda
 CantBeLessThanMinPrice=O prezo de venda non pode ser inferior ao mínimo permitido para este produto (%s sen impostos). Esta mensaxe tamén pode aparecer se escribe un desconto demasiado alto.
 ContractStatusClosed=Pechado
@@ -157,11 +157,11 @@ ListServiceByPopularity=Listaxe de servizos por popularidade
 Finished=Produto manufacturado
 RowMaterial=Materia prima
 ConfirmCloneProduct=¿Está certo de querer clonar o produto ou servizo <b>%s</b>?
-CloneContentProduct=Clonar a información principal do produto/servizo
+CloneContentProduct=Clonar toda a información principal de produtos/servizos
 ClonePricesProduct=Clonar prezos
 CloneCategoriesProduct=Clonar etiquetas/categorías ligadas
-CloneCompositionProduct=Clonar produto/servizo virtual
-CloneCombinationsProduct=Clonar variantes de produto
+CloneCompositionProduct=Clonar produtos/servizos virtuais
+CloneCombinationsProduct=Clonar as variantes de produtos
 ProductIsUsed=Este produto é utilizado
 NewRefForClone=Ref. do novo produto/servizo
 SellingPrices=Prezos de venda
@@ -172,8 +172,8 @@ SuppliersPricesOfProductsOrServices=Prezos de provedores (de produtos ou servizo
 CustomCode=Aduana/Mercadoría/Código HS
 CountryOrigin=País de orixe
 RegionStateOrigin=Rexión de orixe
-StateOrigin=Estado|Provincia de orixe
-Nature=Natureza do produto (material/manufacturado)
+StateOrigin=Estado/Provincia de orixe
+Nature=Natureza do produto (materia prima/manufacturado)
 NatureOfProductShort=Natureza do produto
 NatureOfProductDesc=Materia prima ou produto manufacturado
 ShortLabel=Etiqueta curta
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
index 3a9604e685c..46f8fe51657 100644
--- a/htdocs/langs/gl_ES/projects.lang
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Contactos proxecto
 ProjectsImContactFor=Proxectos dos que son contacto explícito
 AllAllowedProjects=Todos os proxectos que podo ler (meus + públicos)
 AllProjects=Todos os proxectos
-MyProjectsDesc=Esta vista está limitada a aqueles proxectos dos que é un contacto
+MyProjectsDesc=Esta vista está limitada a proxectos dos que é contacto
 ProjectsPublicDesc=Esta vista amosa todos os proxectos dos que ten dereito a visualizar.
 TasksOnProjectsPublicDesc=Esta vista amosa todos os proxectos dos que ten dereito a visualizar.
 ProjectsPublicTaskDesc=Esta vista amosa todos os proxectos e tarefas dos que ten dereito a visualizar.
 ProjectsDesc=Esta vista amosa todos os proxectos (os seus permisos de usuario permítenlle ter unha visión completa).
 TasksOnProjectsDesc=Esta vista amosa todos as tarefas (os seus permisos de usuario permítenlle ter unha visión completa).
-MyTasksDesc=Esta vista limítase aos proxectos ou tarefas nos que vostede é un contacto nelas
+MyTasksDesc=Esta vista está limitada a proxectos ou tarefas dos que é contacto
 OnlyOpenedProject=Só os proxectos abertos son visibles (os proxectos en estado borrador ou pechado non son visibles).
 ClosedProjectsAreHidden=Os proxectos pechados non son visibles.
 TasksPublicDesc=Esta vista amosa todos os proxectos e tarefas nos que vostede ten dereito a visualizar.
 TasksDesc=Esta vista amosa todos os proxectos e tarefas (os seus permisos de usuario permítenlle ter unha visión completa).
 AllTaskVisibleButEditIfYouAreAssigned=Todas as tarefas deste proxecto son visibles, pero só pode indicar tempos nas tarefas que teña asignadas. Asígnese tarefas se desexa indicar tempos nelas.
-OnlyYourTaskAreVisible=Só as tarefas que ten asignadas son visibles. Asignese tarefas se non son visibles e desexa indicar tempos nelas.
+OnlyYourTaskAreVisible=Só son visibles as tarefas asignadas a vostede. Se precisa introducir tempo nunha tarefa e se a tarefa non é visible aquí, entón debe asignar a tarefa a si mesmo. 
 ImportDatasetTasks=Tarefas de proxectos
 ProjectCategories=Etiquetas/categorías de proxectos
 NewProject=Novo proxecto
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Non asignado á tarefa
 NoUserAssignedToTheProject=Ningún usuario asignado a este proxecto
 TimeSpentBy=Tempo empregado por
 TasksAssignedTo=Tarefas asignadas a
-AssignTaskToMe=Asignarme a tarefa
+AssignTaskToMe=Asignar a tarefa a si mesmo
 AssignTaskToUser=Asignar a tarefa a %s
 SelectTaskToAssign=Escolla tarefa a asignar...
 AssignTask=Asignar
diff --git a/htdocs/langs/gl_ES/recruitment.lang b/htdocs/langs/gl_ES/recruitment.lang
index f247bc5bd29..3d078bf5aab 100644
--- a/htdocs/langs/gl_ES/recruitment.lang
+++ b/htdocs/langs/gl_ES/recruitment.lang
@@ -29,25 +29,25 @@ RecruitmentSetup = Configuración da contratación
 Settings = Configuracións
 RecruitmentSetupPage = Introduza aquí a configuración das principais opcións para o módulo de contratación
 RecruitmentArea=Área de contratación
-PublicInterfaceRecruitmentDesc=As páxinas públicas dos traballos son URL públicas para mostrar e responder aos traballos dispoñibles. Hai un enlace diferente para cada traballo dispoñible, que se atopa en cada rexistro de traballo.
+PublicInterfaceRecruitmentDesc=As páxinas públicas dos postos de traballo son URL públicas para mostrar e responder aos traballos dispoñibles. Hai un enlace diferente para cada traballo dispoñible, que se atopa en cada rexistro de traballo.
 EnablePublicRecruitmentPages=Activar páxinas públicas de traballos dispoñibles
 
 #
 # About page
 #
-About = page
+About = Acerca de
 RecruitmentAbout = Acerca de contratación
 RecruitmentAboutPage = Páxina acerca de contratación
-NbOfEmployeesExpected=Número esperado de empregados
+NbOfEmployeesExpected=Número solicitado de empregados
 JobLabel=Etiqueta de posto de traballo
 WorkPlace=Lugar de traballo
-DateExpected=Data agardado
-FutureManager=Xestor de futuro
+DateExpected=Data agardada
+FutureManager=Futuro xestor
 ResponsibleOfRecruitement=Responsable da contratación
-IfJobIsLocatedAtAPartner=Se o traballo está situado nun lugar asociado
+IfJobIsLocatedAtAPartner=Se o traballo está situado no emplazamento dun asociado
 PositionToBeFilled=Posto de traballo
-PositionsToBeFilled=Listaxe de postos de traballo
-ListOfPositionsToBeFilled=List of job positions
+PositionsToBeFilled=Postos de traballo
+ListOfPositionsToBeFilled=Listaxe de postos de traballo
 NewPositionToBeFilled=Novos postos de traballo
 
 JobOfferToBeFilled=Posto de traballo a ocupar
@@ -55,22 +55,22 @@ ThisIsInformationOnJobPosition=Información do posto de traballo a ocupar
 ContactForRecruitment=Contacto para a contratación
 EmailRecruiter=Correo electrónico do responsable de contratación
 ToUseAGenericEmail=Para usar un correo electrónico xenérico. Se non se define, utilizarase o correo electrónico do responsable de contratación
-NewCandidature=Nova aplicación
-ListOfCandidatures=Listaxe de aplicacións
+NewCandidature=Nova candidatura
+ListOfCandidatures=Listaxe de candidaturas
 RequestedRemuneration=Remuneración solicitada
 ProposedRemuneration=Proposta de remuneración
-ContractProposed=Poroposta de contrato
+ContractProposed=Proposta de contrato
 ContractSigned=Contrato asinado
 ContractRefused=Rexeitouse o contrato
-RecruitmentCandidature=Solicitude
+RecruitmentCandidature=Candidatura
 JobPositions=Postos de traballo
-RecruitmentCandidatures=Solicitudes
+RecruitmentCandidatures=Candidaturas
 InterviewToDo=Entrevista a realizar
 AnswerCandidature=Resposta da solicitude
-YourCandidature=A súa solicitude
-YourCandidatureAnswerMessage=Grazas pola túa solicitude.<br>...
-JobClosedTextCandidateFound=O posto de traballo está pechado. O posto foi cuberto.
+YourCandidature=A súa candidatura
+YourCandidatureAnswerMessage=Grazas pola súa candidatura.<br>...
+JobClosedTextCandidateFound=O posto de traballo está pechado, xa foi cuberto.
 JobClosedTextCanceled=O posto de traballo está pechado
 ExtrafieldsJobPosition=Atributos complementarios (postos de traballo)
-ExtrafieldsCandidatures=Atributos complementarios (solicitudes de traballo)
+ExtrafieldsApplication=Atributos complementarios (candidaturas)
 MakeOffer=Facer unha oferta
diff --git a/htdocs/langs/gl_ES/sendings.lang b/htdocs/langs/gl_ES/sendings.lang
index 99d7be5b352..e292877fd5d 100644
--- a/htdocs/langs/gl_ES/sendings.lang
+++ b/htdocs/langs/gl_ES/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=¿Está certo de querer validar esta expedición coa refe
 ConfirmCancelSending=¿Está certo de querer anular esta expedición?
 DocumentModelMerou=Modelo Merou A5
 WarningNoQtyLeftToSend=Alerta, ningún produto agardando para ser enviado.
-StatsOnShipmentsOnlyValidated=Estatísticas realizadas únicamente sobre as expedicións validadas
+StatsOnShipmentsOnlyValidated=As estatísticas son só para envíos validados. A data utilizada é a data de validación do envío (non sempre é coñecida a data de entrega prevista) 
 DateDeliveryPlanned=Data prevista de entrega
 RefDeliveryReceipt=Ref. nota de entrega
 StatusReceipt=Estado nota de entrega
diff --git a/htdocs/langs/gl_ES/stocks.lang b/htdocs/langs/gl_ES/stocks.lang
index bde18dd1aa5..419b706614f 100644
--- a/htdocs/langs/gl_ES/stocks.lang
+++ b/htdocs/langs/gl_ES/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Non hai produtos predefinidos para este obxecto. P
 DispatchVerb=Enviado
 StockLimitShort=Límite para alerta
 StockLimit=Stock límite para alertas
-StockLimitDesc=(baleiro) significa que non hai aviso.<br> 0 pode usarse como aviso en canto o stock estexa baleiro.
+StockLimitDesc=(baleiro) sgnifica que non hai aviso de alerta.<br>0 pode usarse para activar un aviso no momento que o stock estea baleiro.
 PhysicalStock=Stock físico
 RealStock=Stock real
 RealStockDesc=O stock físico/real é o stock actualmente existente nos almacéns
diff --git a/htdocs/langs/gl_ES/trips.lang b/htdocs/langs/gl_ES/trips.lang
index 98087e25679..0cc9aa1f4b9 100644
--- a/htdocs/langs/gl_ES/trips.lang
+++ b/htdocs/langs/gl_ES/trips.lang
@@ -21,7 +21,7 @@ ListToApprove=Agardando aprobación
 ExpensesArea=Área de informe de gastos
 ClassifyRefunded=Clasificar 'Reembolsado'
 ExpenseReportWaitingForApproval=Foi enviado un novo informe de gasto para ser aprobado
-ExpenseReportWaitingForApprovalMessage=Foi enviado un novo ginforme de asto e está agardando para ser aprobado.<br>- Usuario: %s<br>- Periodo. %s<br>Faga clic aquí para validalo: %s
+ExpenseReportWaitingForApprovalMessage=Foi enviado un novo informe de gasto e está agardando para ser aprobado.<br>- Usuario: %s<br>- Periodo. %s<br>Faga clic aquí para validalo: %s
 ExpenseReportWaitingForReApproval=Foi enviado un novo informe de gasto para aprobalo de novo
 ExpenseReportWaitingForReApprovalMessage=Foi enviado un novo informe de gasto e está agardando para ser aprobado de novo.<br>O %s, rexeitou a súa aprobación por esta razón: %s<br>Foi proposta unha nova versión e agarda a súa aprobación.<br>- Usuario: %s<br>- Periodo. %s<br>Faga clic aquí para validalo: %s
 ExpenseReportApproved=Un novo informe de gasto foi aprobado
@@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=O informe de gasto %s foi cancelado.<br>- Usuario:
 ExpenseReportPaid=Un informe de gasto foi pagado
 ExpenseReportPaidMessage=O informe de gasto %s foi pagado.<br>- Usuario: %s<br>- Pagado por: %s<br>Faga clic aquí ver o gasto: %s
 TripId=Id de informe de gasto
-AnyOtherInThisListCanValidate=Persoa a informar para a validación
+AnyOtherInThisListCanValidate=Persoa que será informada para validar a solicitude.
 TripSociete=Información da empresa
 TripNDF=Información do informe de gasto
 PDFStandardExpenseReports=Prantilla estandard para xerar un documento de informe de gasto
diff --git a/htdocs/langs/gl_ES/users.lang b/htdocs/langs/gl_ES/users.lang
index 908619e45e0..e36d65af255 100644
--- a/htdocs/langs/gl_ES/users.lang
+++ b/htdocs/langs/gl_ES/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Contrasinal modificado para: %s
 SubjectNewPassword=O seu novo contrasinal para %s
 GroupRights=Permisos de grupo
 UserRights=Permisos usuario
+Credentials=Credenciais
 UserGUISetup=Interfaz usuario
 DisableUser=Desactivar
 DisableAUser=Desactivar un usuario
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Modificar o campo Tipo para cambiar
 OpenIDURL=URL OpenID
 LoginUsingOpenID=Usar OpenID para iniciar sesión
 WeeklyHours=Horas traballadas (por semana)
-ExpectedWorkedHours=Horas previstas por semana
+ExpectedWorkedHours=Horas previstas traballadas á semana
 ColorUser=Cor para o usuario
 DisabledInMonoUserMode=Desactivado en modo mantemento
 UserAccountancyCode=Código contable usuario
@@ -115,7 +116,7 @@ DateOfEmployment=Data de contratación empregado
 DateEmployment=Contratación empregado
 DateEmploymentstart=Data de comezo da contratación do empregado
 DateEmploymentEnd=Data de baixa do empregado
-RangeOfLoginValidity=Rango de data de validez do inicio de sesión
+RangeOfLoginValidity=Intervalo de datas de validez no acceso
 CantDisableYourself=Pode desactivar o seu propio rexistro de usuario
 ForceUserExpenseValidator=Forzar validación do informe de gasto
 ForceUserHolidayValidator=Forzar validación do rexeitamento do gasto
diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang
index 6c78521e7b5..c93e34b7057 100644
--- a/htdocs/langs/gl_ES/website.lang
+++ b/htdocs/langs/gl_ES/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define a listaxe de todos os idiomas
 GenerateSitemaps=Xera un ficheiro de mapa do sitio web 
 ConfirmGenerateSitemaps=Se confirmas, borrará o ficheiro de mapa do sitio existente ... 
 ConfirmSitemapsCreation=Confirma a xeración do mapa do sitio 
-SitemapGenerated=Mapa do sitio xerado
+SitemapGenerated=Ficheiro co Mapa do Sitio <b>%s</b> xerado
 ImportFavicon=Favicon
 ErrorFaviconType=A favicon debe estar no formato png
-ErrorFaviconSize=A favicon debe ter o tamaño 32x32
-FaviconTooltip=Cargue unha imaxe en formato png de 32x32
+ErrorFaviconSize=O favicon ten que ser dun tamaño de 16x16, 32x32 ou 64x64
+FaviconTooltip=Carga unha imaxe que precisa ser png (16x16, 32x32 ou 64x64)
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 32374680393..35a72174d39 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=הגדרת אבטחה
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=שגיאה, מודול זה דורש %s PHP גירסה ומעלה
 ErrorModuleRequireDolibarrVersion=שגיאה, מודול זה דורש %s Dolibarr גרסה ומעלה
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=לא מציע
 NoActiveBankAccountDefined=אין לך חשבון בנק פעיל מוגדר
 OwnerOfBankAccount=הבעלים של %s חשבון הבנק
 BankModuleNotActive=חשבונות בנק המודול לא מופעל
-ShowBugTrackLink=Show link "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=התראות
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=עליך להפעיל את הפ
 YourPHPDoesNotHaveSSLSupport=פונקציות שאינן זמינות ב-SSL-PHP
 DownloadMoreSkins=עוד סקינים להורדה
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=תרגום חלקי
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 7652c9c8301..6eda2980f9d 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
index 7c4f6c06dc8..2b95bd27634 100644
--- a/htdocs/langs/he_IL/boxes.lang
+++ b/htdocs/langs/he_IL/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index ddc13c48ea3..cac3bd4a977 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index a5d458690e2..0205705276c 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 67d1824c77c..02965ab00fa 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 11fdc1b46fc..e139d48ecff 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/he_IL/ecm.lang b/htdocs/langs/he_IL/ecm.lang
index f7c6c005d5b..363f84f5cd1 100644
--- a/htdocs/langs/he_IL/ecm.lang
+++ b/htdocs/langs/he_IL/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/he_IL/eventorganization.lang b/htdocs/langs/he_IL/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/he_IL/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/he_IL/knowledgemanagement.lang b/htdocs/langs/he_IL/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/he_IL/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 8e5376e51f9..ae443d41524 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index fad1276c2e6..059b7dff74b 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=אחר
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=אחר
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index bd46c1c1a51..ee6e7eb56e9 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/he_IL/modulebuilder.lang b/htdocs/langs/he_IL/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/he_IL/modulebuilder.lang
+++ b/htdocs/langs/he_IL/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 6928a0fc65e..00bb942376f 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/he_IL/partnership.lang b/htdocs/langs/he_IL/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/he_IL/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang
index 4f0e21fcc0e..dee07e65a9f 100644
--- a/htdocs/langs/he_IL/productbatch.lang
+++ b/htdocs/langs/he_IL/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index f399b0e7852..943d53a253c 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index c0cc539e828..d513bf8c6a8 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/he_IL/recruitment.lang b/htdocs/langs/he_IL/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/he_IL/recruitment.lang
+++ b/htdocs/langs/he_IL/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang
index 17d8f937b82..e58be92fb38 100644
--- a/htdocs/langs/he_IL/sendings.lang
+++ b/htdocs/langs/he_IL/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 3c1991530bf..ff391169159 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index a313f6fb6c9..9507cb1b919 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index 934d7bdb850..62a37b65b60 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/hi_IN/accountancy.lang b/htdocs/langs/hi_IN/accountancy.lang
index fd8d8a31ba6..a1f495e3e97 100644
--- a/htdocs/langs/hi_IN/accountancy.lang
+++ b/htdocs/langs/hi_IN/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
index 51e5e387403..04e6488ded4 100644
--- a/htdocs/langs/hi_IN/admin.lang
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/hi_IN/banks.lang b/htdocs/langs/hi_IN/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/hi_IN/banks.lang
+++ b/htdocs/langs/hi_IN/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/hi_IN/bills.lang b/htdocs/langs/hi_IN/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/hi_IN/bills.lang
+++ b/htdocs/langs/hi_IN/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/hi_IN/boxes.lang b/htdocs/langs/hi_IN/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/hi_IN/boxes.lang
+++ b/htdocs/langs/hi_IN/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/hi_IN/cashdesk.lang b/htdocs/langs/hi_IN/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/hi_IN/cashdesk.lang
+++ b/htdocs/langs/hi_IN/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/hi_IN/categories.lang b/htdocs/langs/hi_IN/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/hi_IN/categories.lang
+++ b/htdocs/langs/hi_IN/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/hi_IN/companies.lang b/htdocs/langs/hi_IN/companies.lang
index eb559cc5f9e..2c0bf33d319 100644
--- a/htdocs/langs/hi_IN/companies.lang
+++ b/htdocs/langs/hi_IN/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/hi_IN/compta.lang b/htdocs/langs/hi_IN/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/hi_IN/compta.lang
+++ b/htdocs/langs/hi_IN/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/hi_IN/ecm.lang b/htdocs/langs/hi_IN/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/hi_IN/ecm.lang
+++ b/htdocs/langs/hi_IN/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/hi_IN/errors.lang b/htdocs/langs/hi_IN/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/hi_IN/errors.lang
+++ b/htdocs/langs/hi_IN/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/hi_IN/eventorganization.lang b/htdocs/langs/hi_IN/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/hi_IN/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/hi_IN/knowledgemanagement.lang b/htdocs/langs/hi_IN/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/hi_IN/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/hi_IN/mails.lang b/htdocs/langs/hi_IN/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/hi_IN/mails.lang
+++ b/htdocs/langs/hi_IN/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/hi_IN/main.lang b/htdocs/langs/hi_IN/main.lang
index 295f37e2c16..e9de548ea2c 100644
--- a/htdocs/langs/hi_IN/main.lang
+++ b/htdocs/langs/hi_IN/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/hi_IN/members.lang b/htdocs/langs/hi_IN/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/hi_IN/members.lang
+++ b/htdocs/langs/hi_IN/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/hi_IN/modulebuilder.lang b/htdocs/langs/hi_IN/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/hi_IN/modulebuilder.lang
+++ b/htdocs/langs/hi_IN/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/hi_IN/other.lang b/htdocs/langs/hi_IN/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/hi_IN/other.lang
+++ b/htdocs/langs/hi_IN/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/hi_IN/partnership.lang b/htdocs/langs/hi_IN/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/hi_IN/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/hi_IN/productbatch.lang b/htdocs/langs/hi_IN/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/hi_IN/productbatch.lang
+++ b/htdocs/langs/hi_IN/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/hi_IN/products.lang b/htdocs/langs/hi_IN/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/hi_IN/products.lang
+++ b/htdocs/langs/hi_IN/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/hi_IN/projects.lang b/htdocs/langs/hi_IN/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/hi_IN/projects.lang
+++ b/htdocs/langs/hi_IN/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/hi_IN/recruitment.lang b/htdocs/langs/hi_IN/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/hi_IN/recruitment.lang
+++ b/htdocs/langs/hi_IN/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/hi_IN/sendings.lang b/htdocs/langs/hi_IN/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/hi_IN/sendings.lang
+++ b/htdocs/langs/hi_IN/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/hi_IN/stocks.lang b/htdocs/langs/hi_IN/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/hi_IN/stocks.lang
+++ b/htdocs/langs/hi_IN/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/hi_IN/users.lang b/htdocs/langs/hi_IN/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/hi_IN/users.lang
+++ b/htdocs/langs/hi_IN/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/hi_IN/website.lang b/htdocs/langs/hi_IN/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/hi_IN/website.lang
+++ b/htdocs/langs/hi_IN/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 7d4d1ccfde6..32e9993478e 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Oznaka računa
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 9ca8d8e1a08..90d6cb47353 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Postavke sigurnosti
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Ovdje definirajte opcije vezane za sigurnost kod uploada datoteka.
 ErrorModuleRequirePHPVersion=Greška, ovaj modul zahtjeva PHP verziju %s ili višu
 ErrorModuleRequireDolibarrVersion=Greška, ovaj modul zahtjeva Dolibarr verzije %s ili više
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Nije za preporuku
 NoActiveBankAccountDefined=Nije postavljen aktivni bankovni račun
 OwnerOfBankAccount=Vlasnik bankovnog računa %s
 BankModuleNotActive=Modul bankovnih računa nije omogućen
-ShowBugTrackLink=Prikaži poveznicu "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Obavijesti
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL funkcije nisu dostupne u vašem PHP
 DownloadMoreSkins=Više skinova za skinuti
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Parcijalni prijevod
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 71f59ee02c2..385eba1a7d7 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Plaćanje društveni/fiskalni porez
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Interni prijenos
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Od
 TransferTo=Za
 TransferFromToDone=Prijenos sa <b>%s</b> na <b>%s</b> od <b>%s</b> %s je pohranjen.
 CheckTransmitter=Pošiljatelj
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bankovni čekovi
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Promjene
 PlannedTransactions=Planned entries
-Graph=Grafovi
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Potvrda pologa
 TransactionOnTheOtherAccount=Transakcije na drugom računu
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Povratak na račun
 ShowAllAccounts=Prikaži za sve račune
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Odaberite bankovni izvod povezan s usklađenjem. Koristite numeričke vrijednosti: YYYYMM ili YYYYMMDD radi sortiranja
 EventualyAddCategory=Konačno, odredite kategoriju u koju želite svrstati podatke
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 96218a407d9..d0d3b388678 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -79,7 +79,7 @@ ReceivedCustomersPaymentsToValid=Uplate kupaca za ovjeru
 PaymentsReportsForYear=Izvještaji plaćanja za %s
 PaymentsReports=Izvještaji plaćanja
 PaymentsAlreadyDone=Izvršena plaćanja
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=Izvršeni povrati
 PaymentRule=Način plaćanja
 PaymentMode=Način plaćanja
 DefaultPaymentMode=Default Payment Type
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Unesi uplatu od kupca
 EnterPaymentDueToCustomer=Napravi 
 DisabledBecauseRemainderToPayIsZero=Isključeno jer preostalo dugovanje je nula.
-PriceBase=Osnovica
+PriceBase=Base price
 BillStatus=Stanje računa
 StatusOfGeneratedInvoices=Status generiranih računa
 BillStatusDraft=Skica (potrebno potvrditi)
@@ -454,7 +454,7 @@ RegulatedOn=Regulirano od
 ChequeNumber=Ček broj
 ChequeOrTransferNumber=broj čeka/prijenosa
 ChequeBordereau=Provjera zadanog
-ChequeMaker=Čekovni/transakcijski pošiljatelj
+ChequeMaker=Check/Transfer sender
 ChequeBank=Banka
 CheckBank=Ček
 NetToBePaid=Netto za platiti
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index ae67f203a6a..9f1f6135994 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Najstarije aktivne istekle usluge
 BoxLastExpiredServices=Zadnja %s najstarija kontakta s aktivnim isteklim uslugama
 BoxTitleLastActionsToDo=Zadnja %s radnje za napraviti
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Zadnjih %s izmjenjenih donacija
-BoxTitleLastModifiedExpenses=Zadnjih %s izmjenjenih izvještaja troškova
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globalna aktivnost (računi, prijedlozi, nalozi)
 BoxGoodCustomers=Dobar kupac
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index ac1d97cc447..d84d6f6da9b 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Preglednik
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index a4eb2e7ac20..0bac79b0a4d 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Kategorija
 Rubriques=Kategorije
 RubriquesTransactions=Tags/Categories of transactions
 categories=kategorije
-NoCategoryYet=Skupina ove vrste nije izrađena
+NoCategoryYet=No tag/category of this type has been created
 In=U
 AddIn=Dodaj u
 modify=promjeni
 Classify=Označi
 CategoriesArea=Sučelje Kategorija
-ProductsCategoriesArea=Sučelje kategorije Proizvoda/Usluga
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Sučelje kategorija kupaca
-MembersCategoriesArea=Sučelje kategorija članova
-ContactsCategoriesArea=Sučelje kategorija kontakta
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Sučelje kategorija projekata
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=Popis kategorija
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index b78643dfe85..90948e895c0 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Ime tvrtke %s već postoji. Odaberite drugo.
 ErrorSetACountryFirst=Prvo odaberite državu
 SelectThirdParty=Odaberi treću osobu
-ConfirmDeleteCompany=Jeste li sigurni da želite obrisati ovu tvrtku i sve podatke vezane na nju?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Izbriši kontakt/adresu.
-ConfirmDeleteContact=Jeste li sigurni da želite obrisati ovaj kontakt i sve podatke vezane na njega?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Nova Treća Osoba
 MenuNewCustomer=Novi Kupac
 MenuNewProspect=Novi mogući kupac
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Poziv
 Chat=Chat
-PhonePro=Prof. telefon
+PhonePro=Bus. phone
 PhonePerso=Osob. telefon
 PhoneMobile=Mobitel
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Poštanski broj
 Town=Grad
 Web=Mreža
 Poste= Pozicija
-DefaultLang=Osnovni jezik
+DefaultLang=Default language
 VATIsUsed=Porez se primjenjuje
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Porez se ne primjenjuje
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Obavezno ako je komitent kupac ili potencijalni kupac
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Potencijalni kupac u kontakt
 CompanyDeleted=Tvrtka "%s" izbrisana iz baze.
@@ -439,12 +439,12 @@ ListSuppliersShort=Popis dobavljača
 ListProspectsShort=Popis mogućih kupaca
 ListCustomersShort=Popis kupaca
 ThirdPartiesArea=Treće osobe/Kontakti
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Ukupno trećih osoba
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Otvori
 ActivityCeased=Zatvoren
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=Popis proizvoda/usluga u %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Trenutno otvoreni računi
 OutstandingBill=Maksimalno za otvorene račune
 OutstandingBillReached=Dosegnut maksimum neplaćenih računa
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Ova šifra je besplatne. Ova šifra se može modificirati
 ManagingDirectors=Ime vlasnika(ce) ( CEO, direktor, predsjednik uprave...)
 MergeOriginThirdparty=Dupliciran komitent (komitent koji želite obrisati)
 MergeThirdparties=Združi treće osobe
-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 third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Treće osobe združene
 SaleRepresentativeLogin=Korisničko ime predstavnika
 SaleRepresentativeFirstname=Ime prodajnog predstavnika
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 673feed340f..cd27ba82fbc 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Novi rabat
 NewCheckDeposit=Novi depozit čeka
 NewCheckDepositOn=Izradi račun za depozit na računu: %s
 NoWaitingChecks=Nema čekova koji čekaju depozit.
-DateChequeReceived=Datum zaprimanja čeka
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Plati društveni/fiskalni porez
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/hr_HR/ecm.lang b/htdocs/langs/hr_HR/ecm.lang
index b7f918045e2..3731057f4d0 100644
--- a/htdocs/langs/hr_HR/ecm.lang
+++ b/htdocs/langs/hr_HR/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 7a646f39d3f..5c177ae7c46 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/hr_HR/eventorganization.lang b/htdocs/langs/hr_HR/eventorganization.lang
new file mode 100644
index 00000000000..769b3d35ca1
--- /dev/null
+++ b/htdocs/langs/hr_HR/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Postavke
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Skica
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Učinjeno
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/hr_HR/knowledgemanagement.lang b/htdocs/langs/hr_HR/knowledgemanagement.lang
new file mode 100644
index 00000000000..3baf7df3c67
--- /dev/null
+++ b/htdocs/langs/hr_HR/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Postavke
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = O programu
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Stavka
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 2b7ce391248..e6639943cbd 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Korisnicima
 MailCC=Kopirajte u
 MailToCCUsers=Kopirajte korisniku(cima)
 MailCCC=Predmemorirana kopija u
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Poruka
 MailFile=Attached files
 MailMessage=Tijelo e-pošte
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index da1d8d59dd1..73b652c481a 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Spremi i novi
 TestConnection=Provjera veze
 ToClone=Kloniraj
 ConfirmCloneAsk=Jeste li sigurni da želite kolinirati predmet <b>%s</b>?
-ConfirmClone=Izaberite podatke koje želite klonirati:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Podaci za kloniranje nisu izabrani.
 Of=od
 Go=Idi
@@ -246,7 +246,7 @@ DefaultModel=Osnovni doc predložak
 Action=Događaj
 About=O programu
 Number=Broj
-NumberByMonth=Broj po mjesecima
+NumberByMonth=Total reports by month
 AmountByMonth=Iznos po mjesecima
 Numero=Broj
 Limit=Granična vrijednost
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=Izradio korisnik
-UserModif=Korisnik na zadnjoj izmjeni
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Od
 From=Od
 FromDate=Od
 FromLocation=Od
-at=at
 to=za
 To=za
+ToDate=za
+ToLocation=za
+at=at
 and=i
 or=ili
 Other=Ostalo
@@ -843,7 +845,7 @@ XMoreLines=%s stavaka(e) skriveno
 ShowMoreLines=Prikaži više/manje redaka
 PublicUrl=Javni URL
 AddBox=Dodaj blok
-SelectElementAndClick=Izaberi sastavnicu i klikni %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Ispis datoteke %s
 ShowTransaction=Prikaži upis na bankovni račun
 ShowIntervention=Prikaži zahvat
@@ -854,8 +856,8 @@ Denied=Odbijeno
 ListOf=Popis od %s
 ListOfTemplates=Popis predložaka
 Gender=Spol
-Genderman=Muško
-Genderwoman=Žensko
+Genderman=Male
+Genderwoman=Female
 Genderother=Ostalo
 ViewList=Pregled popisa
 ViewGantt="Gantt" prikaz
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 38526538e24..5d9d29bbdc4 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Drugi član (ime: <b>%s</b>, login: <
 ErrorUserPermissionAllowsToLinksToItselfOnly=Iz sigurnosnih razloga, morate dodjeliti dozvole svim korisnicima da mogu povezivati članove s korisnicima koji nisu vaši.
 SetLinkToUser=Poveži s Dolibarr korisnikom
 SetLinkToThirdParty=Veza na Dolibarr komitenta
-MembersCards=Članske vizit kartice
+MembersCards=Business cards for members
 MembersList=Popis članova
 MembersListToValid=Popis članova u skicama ( za ovjeru )
 MembersListValid=Popis valjanih članova
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Članovi koji primaju pretplatu
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Datum pretplate
 DateEndSubscription=Datum kraja pretplate
-EndSubscription=Kraj pretplate
+EndSubscription=Subscription Ends
 SubscriptionId=Pretplata ID
 WithoutSubscription=Without subscription
 MemberId=Član ID
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Potrebna pretplata
 DeleteType=Obriši
 VoteAllowed=Glasanje dozvoljeno
-Physical=Fizički
-Moral=Moralno
-MorAndPhy=Moral and Physical
-Reenable=Ponovo omogući
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Statistika članova po zemlji
 MembersStatisticsByState=Statistika članova po regiji/provinciji
 MembersStatisticsByTown=Statistika članova po gradu
 MembersStatisticsByRegion=Statistika članova po regiji
-NbOfMembers=Broj članova
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Nisu pronađeni valjani članovi
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Odaberite statistiku koju želite vidjeti...
 MenuMembersStats=Statistika
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Informacije su javne
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Novi član je dodan. Čeka odobrenje
 NewMemberForm=Obrazac novog člana
-SubscriptionsStatistics=Statistika o pretplatama
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Broj pretplata
-AmountOfSubscriptions=Iznos pretplata
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Promet (za tvrtke) ili proračun (za zaklade) 
 DefaultAmount=Zadani iznos pretplate
 CanEditAmount=Posjetitelj može odabrati/mjenjati iznos svoje pretplate
 MEMBER_NEWFORM_PAYONLINE=Idi na integriranu stranicu online plaćanja
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=Ovaj ekran prikazuje statistiku članova po vrsti.
-MembersByRegion=Ovaj ekran prikazuje statistiku članova po regiji.
 VATToUseForSubscriptions=PDV stopa za pretplate
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod koji se koristi za stavku pretplate na računu: %s
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 9f094795773..1c88c9f43d4 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 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 for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Broj narudžbenica
 NumberOfCustomerInvoices=Broj izlaznih računa
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/hr_HR/partnership.lang b/htdocs/langs/hr_HR/partnership.lang
new file mode 100644
index 00000000000..5c2f7bd82b9
--- /dev/null
+++ b/htdocs/langs/hr_HR/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Datum početka
+DatePartnershipEnd=Datum završetka
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Skica
+PartnershipAccepted = Prihvaćeno
+PartnershipRefused = Odbijeno
+PartnershipCanceled = Poništeno
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang
index 6a93cae8f4f..a29844d360d 100644
--- a/htdocs/langs/hr_HR/productbatch.lang
+++ b/htdocs/langs/hr_HR/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 13595eda6c3..5f356fa177f 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Services for sale only
 ServicesOnPurchaseOnly=Services for purchase only
 ServicesNotOnSell=Usluge ni na prodaju ni za kupovinu
 ServicesOnSellAndOnBuy=Usluga za prodaju i za nabavu
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Zadnja %s pohranjena proizvoda
 LastRecordedServices=Zadnje %s pohranjene usluge
 CardProduct0=Proizvod
@@ -73,12 +73,12 @@ SellingPrice=Prodajna cijena
 SellingPriceHT=Prodajna cijena (bez PDV-a)
 SellingPriceTTC=Prodajna cijena (sa PDV-om)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Prodani iznos
 PurchasedAmount=Nabavni iznos
 NewPrice=Nova cijena
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Prodajna cijena za ovaj proizvod (%s bez PDV-a) ne može biti manja od najmanje dozvoljene. Ova poruka može se pojaviti i kada ste upisali bitan popust.
 ContractStatusClosed=Zatvoreno
@@ -157,11 +157,11 @@ ListServiceByPopularity=Popis usluga poredanih po popularnosti
 Finished=Proizveden proizvod
 RowMaterial=Materijal
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Ovaj proizvod je korišten
 NewRefForClone=Ref. novog proizvoda/usluge
 SellingPrices=Prodajne cijene
@@ -170,12 +170,12 @@ CustomerPrices=Cijene kupaca
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Zemlja porijekla
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Kratka oznaka
 Unit=Jedinica
 p=j.
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 04e1fbc2c24..a7555ee89e2 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Kontakti projekta
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Svi projekti koje mogu pročitati (vlastiti + javni)
 AllProjects=Svi projekti
-MyProjectsDesc=Ovaj je prikaz ograničen na projekte u koje ste uključeni
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Ovaj popis predstavlja sve projekte za koje imate dozvolu.
 TasksOnProjectsPublicDesc=Ovaj popis predstavlja sve zadatke na projektima za koje imate dozvolu.
 ProjectsPublicTaskDesc=Ovaj popis predstavlja sve projekte i zadatke za koje imate dozvolu.
 ProjectsDesc=Ovaj popis predstavlja sve projekte (vaše korisničke dozvole odobravaju vam da vidite sve).
 TasksOnProjectsDesc=Ovaj popis predstavlja sve zadatke na svim projektima (vaše korisničke dozvole odobravaju vam da vidite sve).
-MyTasksDesc=Ovaj je prikaz ograničen na projekte ili zadatke u koje ste uključeni
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Samo otvoreni projekti su vidljivi (projekti u skicama ili zatvorenog statusa nisu vidljivi).
 ClosedProjectsAreHidden=Zatvoreni projekti nisu vidljivi.
 TasksPublicDesc=Ovaj popis predstavlja sve projekte i zadatke za koje imate dozvolu.
 TasksDesc=Ovaj popis predstavlja sve projekte i zadatke (vaše korisničke dozvole odobravaju vam da vidite sve).
 AllTaskVisibleButEditIfYouAreAssigned=Svi zadaci kvalificiranih projekata su vidljivi, ali možete unijeti vrijeme samo za zadatak dodijeljen odabranom korisniku. Dodijelite zadatak ako na njemu trebate unijeti vrijeme.
-OnlyYourTaskAreVisible=Vidljivi su samo zadaci koji su vam dodijeljeni. Dodijelite si zadatak ako nije vidljiv i na njemu trebate unijeti vrijeme.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Zadaci projekta
 ProjectCategories=Projektne oznake / kategorije
 NewProject=Novi projekt
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Nije dodjeljen zadatku
 NoUserAssignedToTheProject=Nema korisnika dodijeljenih ovom projektu
 TimeSpentBy=Vrijeme utrošeno do
 TasksAssignedTo=Zadaci dodijeljeni
-AssignTaskToMe=Dodjeli zadatak meni
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Dodijeli zadatak %s
 SelectTaskToAssign=Odaberite zadatak za dodjelu...
 AssignTask=Dodjeli
diff --git a/htdocs/langs/hr_HR/recruitment.lang b/htdocs/langs/hr_HR/recruitment.lang
index 519a3ae434e..6fad69b8e0f 100644
--- a/htdocs/langs/hr_HR/recruitment.lang
+++ b/htdocs/langs/hr_HR/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index 220a0004a70..1cb500f7ab4 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Jeste li sigurni da želite ovjeriti ovu isporuku pod ozn
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Upozorenje, nema prozvoda za isporuku.
-StatsOnShipmentsOnlyValidated=Statistika se vodi po otpremnicama koje su ovjerene. Korišteni datum je datum ovjere otpremnice (planirani datum isporuke nije uvjek poznat).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planirani datum isporuke
 RefDeliveryReceipt=Broj otpremnice
 StatusReceipt=Stanje otpremnice
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 2cf9bf1d206..7ea3ed77d6b 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Nema predefiniranih proizvoda za ovaj objekt. Potr
 DispatchVerb=Otpremi
 StockLimitShort=Razina za obavijest
 StockLimit=Stanje zaliha za obavjest
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Stvarna zaliha
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index e0e20643d90..e3922741024 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Lozinka promjenjena u: %s
 SubjectNewPassword=Vaša nova zaporka za %s
 GroupRights=Grupna dopuštenja
 UserRights=Korisnička dopuštenja
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Onemogući
 DisableAUser=Onemogući korisnika
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Koristi polje Vrsta za promjenu
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Koristi OpenID za prijavu
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Boja korisnika
 DisabledInMonoUserMode=Onemogućeno u načinu održavanja
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 02ecf7128ff..9be434c3c81 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 16c6008d9e7..acd1a8d2154 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Hivatkozás
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 92e6e5d9fb9..17c7effaee9 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Távolítsa el / nevezze át a(z) <b>%s</b> fájlt, ha létezik, hogy
 RestoreLock=Állítsa vissza az <b>%s</b> fájlt, csak olvasási jogokat engedélyezzen, hogy le lehessen tiltani a Frissítés / Telepítés eszköz további használatát.
 SecuritySetup=Biztonsági beállítások
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Határozza meg a fájlok feltöltésének biztonságával kapcsolatos lehetőségeket.
 ErrorModuleRequirePHPVersion=Hiba történt, ez a modul a Dolibarr %s, vagy újabb verzióját igényli
 ErrorModuleRequireDolibarrVersion=Hiba történt, ez a modul a Dolibarr %s, vagy újabb verzióját igényli
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Ne azt
 NoActiveBankAccountDefined=Nincs aktív bankszámla definiált
 OwnerOfBankAccount=Tulajdonosa bankszámla %s
 BankModuleNotActive=Bankszámlák modul nincs engedélyezve
-ShowBugTrackLink=Link mutatása "<strong> %s </strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Figyelmeztetések
 DelaysOfToleranceBeforeWarning=Késleltetés a következő figyelmeztető riasztás megjelenése előtt:
 DelaysOfToleranceDesc=Állítsa be a késleltetést, mielőtt az %s riasztási ikon megjelenik a képernyőn a késésben lévő elemnél.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Kell futtatni ezt a parancsot a
 YourPHPDoesNotHaveSSLSupport=SSL funkció nem áll rendelkezésre a PHP
 DownloadMoreSkins=További bőrök letöltése
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Részleges fordítás
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index 70e8abcf1be..b9ec7356a11 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Szociális/költségvetési adó fizetés
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Belső átutalás
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Feladó
 TransferTo=Címzett
 TransferFromToDone=A transzfer <b>%s</b> a <b>%s</b> a <b>%s</b> %s lett felvéve.
-CheckTransmitter=Átutaló
+CheckTransmitter=Küldő
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Banki csekkek
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Pénzmozgások
 PlannedTransactions=Planned entries
-Graph=Grafika
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Letéti irat
 TransactionOnTheOtherAccount=Tranzakció a másik számlára
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Visszalép a számlához
 ShowAllAccounts=Mutasd az összes fióknál
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Határozza meg az egyeztetéssel összefüggő bank kivonatot. Használjon egy rövidíthető szám értéket: ÉÉÉÉHH or ÉÉÉÉHHNN
 EventualyAddCategory=Végezetül, határozzon meg egy kategóriát, melybe beosztályozza a könyvelési belyegyzéseket
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index fb9b77eecf9..60a53dbffb7 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Írja be a vásárlótól kapott a fizetést
 EnterPaymentDueToCustomer=Legyen esedékes a vásárló fizetése
 DisabledBecauseRemainderToPayIsZero=Letiltva, mivel a maradék egyenleg 0.
-PriceBase=Alap ár
+PriceBase=Base price
 BillStatus=Számla állapota
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Tervezet (érvényesítés szükséges)
@@ -454,7 +454,7 @@ RegulatedOn=Szabályozni
 ChequeNumber=Csekk N °
 ChequeOrTransferNumber=Csekk /  Transzfer N °
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Csekk bankja
 CheckBank=Csekk
 NetToBePaid=Fizetendő nettó
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index 5c57fdeffb2..3a23f75e080 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Legrégebbi aktív lejárt szolgáltatások
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index 3215e0e3839..4dc1b0d8aad 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Bizonylat
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Böngésző
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index 33c8f09ef3a..48acb14b520 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Címkék/kategóriák
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=módosítás
 Classify=Osztályozás
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index dcb4a078cde..f08a2abba45 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Cégnév %s már létezik. Válasszon egy másikat.
 ErrorSetACountryFirst=Először állítsa be az országot
 SelectThirdParty=Válasszon egy partnert
-ConfirmDeleteCompany=Biztos benne, hogy törli a vállalatot és az összes öröklött információt?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Kapcsolat/címek törlése
-ConfirmDeleteContact=Biztosan törölni akarja ezt a kapcsolatot és az összes örökölt információt?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Új partner
 MenuNewCustomer=Új vásárló
 MenuNewProspect=Új lehetséges ügyfél
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Hívás
 Chat=Chat
-PhonePro=Hivatali telefon
+PhonePro=Bus. phone
 PhonePerso=Szem. telefon
 PhoneMobile=Mobil
 No_Email=Tömeges levelezés letiltása
@@ -331,7 +331,7 @@ CustomerCodeDesc=Ügyfélkód, minden vásárló számára egyedi
 SupplierCodeDesc=Eladói kód, minden eladó számára egyedi
 RequiredIfCustomer=Kötelező, ha a partner vevő vagy jelentkező
 RequiredIfSupplier=Szükséges, ha a partner eladó
-ValidityControledByModule=Az érvényességet modul vezérli
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=A modul szabályai
 ProspectToContact=Jelentkező a kapcsolat felvételre
 CompanyDeleted="%s" cég törölve az adatbázisból.
@@ -439,12 +439,12 @@ ListSuppliersShort=Eladók listája
 ListProspectsShort=A lehetséges partnerek listája
 ListCustomersShort=Ügyfelek listája
 ThirdPartiesArea=Partnerek / kapcsolattartók
-LastModifiedThirdParties=Az utolojára módosított %s Harmadik Felek
-UniqueThirdParties=Partnerek összesen
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Nyitott
 ActivityCeased=Lezárt
 ThirdPartyIsClosed=Harmadik fél lezárva
-ProductsIntoElements=Termékek / szolgáltatások listálya ide %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Jelenlegi kintlévőség
 OutstandingBill=Maximális kintlévőség
 OutstandingBillReached=Max. a kintlévőség elért
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=A kód szabad. Ez a kód bármikor módosítható.
 ManagingDirectors=Vezető(k) neve (ügyvezető, elnök, igazgató)
 MergeOriginThirdparty=Duplikált partner (a partnert törlésre kerül)
 MergeThirdparties=Partnerek egyesítése
-ConfirmMergeThirdparties=Biztos benne, hogy egyesíti ezt a partnert a jelenlegihez? Az összes összekapcsolt objektum (számlák, megrendelések, ...) az aktuális partnerhez kerül, majd az egyesített partner törlődik.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=A partnereket egyesítve
 SaleRepresentativeLogin=Kereskedelmi képviselő bejelentkezés
 SaleRepresentativeFirstname=Az értékesítési képviselő vezetékneve
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index d18b2a6e017..3f2846904ee 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Új kedvezmény
 NewCheckDeposit=Új ellenőrizze betéti
 NewCheckDepositOn=Készítsen nyugtát letét számla: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Ellenőrizze a fogadás dátumát
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/hu_HU/ecm.lang b/htdocs/langs/hu_HU/ecm.lang
index 97b5acbda3b..d3ab7d52d24 100644
--- a/htdocs/langs/hu_HU/ecm.lang
+++ b/htdocs/langs/hu_HU/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index a9d1fcea36b..d0a29f81991 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s rossz
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=A %s felhasználói név már létezik.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 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. Maybe 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
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Nem sikerült létrehozni egy könyvtárat. Ellenőrizze, hogy a Web szerver felhasználó engedélyekkel rendelkezik, hogy ültesse át Dolibarr dokumentumok könyvtárba. Ha a paraméter <b>safe_mode</b> engedélyezve van ez a PHP-t, ellenőrizze, hogy Dolibarr PHP fájlok tulajdonosa a webszerver felhasználó (vagy csoport).
 ErrorNoMailDefinedForThisUser=Nincs megadva a felhasználó email címe
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/hu_HU/eventorganization.lang b/htdocs/langs/hu_HU/eventorganization.lang
new file mode 100644
index 00000000000..ec363794b35
--- /dev/null
+++ b/htdocs/langs/hu_HU/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Beállítások
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Piszkozat
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Kész
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/hu_HU/intracommreport.lang b/htdocs/langs/hu_HU/intracommreport.lang
index 8b6713062c8..212c3b855c9 100644
--- a/htdocs/langs/hu_HU/intracommreport.lang
+++ b/htdocs/langs/hu_HU/intracommreport.lang
@@ -15,26 +15,26 @@ INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
 
 # Menu
 MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
+MenuIntracommReportNew=Új bevallás
 MenuIntracommReportList=Lista
 
 # View
-NewDeclaration=New declaration
-Declaration=Declaration
-AnalysisPeriod=Analysis period
-TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
-DES=Services exchange declaration (DES)
+NewDeclaration=Új bevallás
+Declaration=Bevallás
+AnalysisPeriod=Vizsgált időszak
+TypeOfDeclaration=Bevallás típusa
+DEB=Termékek forgalmának bevallása (DEB)
+DES=Szolgáltatások forgalmának bevallása (DES)
 
 # Export page
-IntracommReportTitle=Preparation of an XML file in ProDouane format
+IntracommReportTitle=XML fájl készítése ProDouane formátumban
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
-IntracommReportTypeDeclaration=Type of declaration
-IntracommReportDownload=download XML file
+IntracommReportList=A generált bevallások listája
+IntracommReportNumber=Bevallás azonosítója
+IntracommReportPeriod=Vizsgálat időszaka
+IntracommReportTypeDeclaration=Bevallás típusa
+IntracommReportDownload=XML fájl letöltése
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=Szállítás módja
diff --git a/htdocs/langs/hu_HU/knowledgemanagement.lang b/htdocs/langs/hu_HU/knowledgemanagement.lang
new file mode 100644
index 00000000000..983d7605cd6
--- /dev/null
+++ b/htdocs/langs/hu_HU/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Beállítások
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Névjegy
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Árucikk
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index 97cce391084..c9726d44b9b 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Másolat ide
 MailToCCUsers=Copy to users(s)
 MailCCC=Eltárol másolat ide
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Üzenet
 MailFile=Csatolt fájlok
 MailMessage=Email tartalma
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 0e272c3cc49..53bac5b2e65 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Mentés és új
 TestConnection=Kapcsolat tesztelése
 ToClone=Klónozás
 ConfirmCloneAsk=Biztosan klónozza az <b>%s</b> objektumot?
-ConfirmClone=Válassza ki a klónozni kívánt adatokat:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Nincs klónozandó adat meghatározva.
 Of=birtokában
 Go=Indít
@@ -246,7 +246,7 @@ DefaultModel=Alapértelmezett dokumentum sablon
 Action=Cselekvés
 About=Névjegy
 Number=Szám
-NumberByMonth=Szám hónap szerint
+NumberByMonth=Total reports by month
 AmountByMonth=Összeg havonta
 Numero=Szám
 Limit=Határ
@@ -341,8 +341,8 @@ KiloBytes=Kilobyte-ok
 MegaBytes=Megabyte-ok
 GigaBytes=Gigabyte-ok
 TeraBytes=TB
-UserAuthor=Létrehozó felhasználó
-UserModif=Utolsó módosítást végetzte
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=által
 From=Kitől?
 FromDate=Feladó
 FromLocation=Feladó
-at=at
 to=kinek
 To=kinek
+ToDate=kinek
+ToLocation=kinek
+at=at
 and=és
 or=vagy
 Other=Más
@@ -843,7 +845,7 @@ XMoreLines=%s sor rejtve maradt
 ShowMoreLines=Több / kevesebb sor megjelenítése
 PublicUrl=Nyílvános URL
 AddBox=Doboz hozzáadása
-SelectElementAndClick=Jelöljön ki egy elemet, majd kattintson az %s elemre
+SelectElementAndClick=Select an element and click on %s
 PrintFile=%s fájl nyomtatása
 ShowTransaction=Bejegyzés megjelenítése a bankszámlán
 ShowIntervention=Mutasd beavatkozás
@@ -854,8 +856,8 @@ Denied=Elutasítva
 ListOf=A következők listája: %s
 ListOfTemplates=Sablonok listája
 Gender=Nem
-Genderman=Férfi
-Genderwoman=Nő
+Genderman=Male
+Genderwoman=Female
 Genderother=Egyéb
 ViewList=Lista megtekintése
 ViewGantt=Gantt-nézet
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index 22c84e6b1d0..3eb2d96dea9 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Egy másik tag (név: <b>%s,</b> beje
 ErrorUserPermissionAllowsToLinksToItselfOnly=Biztonsági okokból, meg kell szerkeszteni engedéllyel rendelkezik a minden felhasználó számára, hogy képes összekapcsolni egy tag a felhasználó, hogy nem a tiéd.
 SetLinkToUser=Link a Dolibarr felhasználó
 SetLinkToThirdParty=Link egy harmadik fél Dolibarr
-MembersCards=Tagok névjegykártyák
+MembersCards=Business cards for members
 MembersList=A tagok listája
 MembersListToValid=Tagok listája tervezet (érvényesíteni kell)
 MembersListValid=Érvényes tagok listája
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Tagok előfizetés kapni
 MembersWithSubscriptionToReceiveShort=Előfizetés a fogadáshoz
 DateSubscription=Előfizetés dátum
 DateEndSubscription=Előfizetés záró dátum
-EndSubscription=Vége előfizetés
+EndSubscription=Subscription Ends
 SubscriptionId=Előfizetés azonosító
 WithoutSubscription=Without subscription
 MemberId=Tag azonosító
@@ -83,10 +83,10 @@ WelcomeEMail=Üdvözlő e-mail
 SubscriptionRequired=Előfizetés szükséges
 DeleteType=Törlés
 VoteAllowed=Szavazz megengedett
-Physical=Fizikai
-Moral=Erkölcsi
-MorAndPhy=Moral and Physical
-Reenable=Újra bekapcsolja
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Tag kiléptetése
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Országonkénti tagstatisztika.
 MembersStatisticsByState=Tartományonkénti tagstatisztika.
 MembersStatisticsByTown=Városonkénti tagstatisztika.
 MembersStatisticsByRegion=Földrajzi régiónkénti tagstatisztika.
-NbOfMembers=Tagok száma
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Nemérvényesített tag található
-MembersByCountryDesc=Ez a képernyő megmutatja statisztikát tagok országokban. Grafikus függ azonban a Google online grafikon szolgáltatást és csak akkor elérhető, ha az internet kapcsolat működik.
-MembersByStateDesc=Ez a képernyő a tagok statisztikát mutatja állam / tartomány / kanton szerint.
-MembersByTownDesc=Ez a képernyő megmutatja statisztikát tagok városban.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Válassza ki a kívánt statisztikákat olvasni ...
 MenuMembersStats=Statisztika
-LastMemberDate=Legutóbbi tag dátum
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Utolsó feliratkozási dátum
-MemberNature=A tag jellege
-MembersNature=Nature of members
-Public=Információ nyilvánosak
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Új tag hozzáadása megtörtént. Várakozás jóváhagyásra.
 NewMemberForm=Új tag ürlap
-SubscriptionsStatistics=Előfizetési statisztika
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Előfizetések száma
-AmountOfSubscriptions=Összege előfizetések
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Forgalom (a cég) vagy Költségvetés (egy alapítvány)
 DefaultAmount=Alapértelmezett mennyiségű előfizetés
 CanEditAmount=Látogató lehet választani / szerkeszteni összegénél előfizetés
 MEMBER_NEWFORM_PAYONLINE=Ugrás az integrált online fizetési oldalra
 ByProperties=Jelleg szerint
 MembersStatisticsByProperties=Jelleg szerinti tag statisztika
-MembersByNature=Ez a képernyő a jelleg szerinti tag statisztikát jeleníti meg.
-MembersByRegion=Ez a képernyő a földrajzi elhelyezkedés szerinti tag statisztikát jeleníti meg.
 VATToUseForSubscriptions=Az előfizetéshez használatos Áfa érték 
 NoVatOnSubscription=Nincs Áfa az előfizetéshez
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=A %s számla előfizetési sorában szerepeltetett termék.
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index 9192d12ec83..ade65249c96 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 1ae365c60f9..a390b96dd40 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Telepítse vagy engedélyezze a GD könyvtárat a PHP beáll
 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=A termékek/szolgáltatások mennyiségének statisztikája
-StatsByNumberOfEntities=A hivatkozó egységek statisztikája (számla vagy megrendelés száma ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=A javaslatok száma
 NumberOfCustomerOrders=Az értékesítési megrendelések száma
 NumberOfCustomerInvoices=Ügyfélszámlák száma
@@ -289,4 +289,4 @@ PopuProp=Termékek/szolgáltatások népszerűsége a javaslatokban
 PopuCom=Termékek/szolgáltatások népszerűsége a megrendelésekben
 ProductStatistics=Termékek/szolgáltatások statisztikája
 NbOfQtyInOrders=Mennyiség a megrendelésekben
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/hu_HU/partnership.lang b/htdocs/langs/hu_HU/partnership.lang
new file mode 100644
index 00000000000..e7739eb8af6
--- /dev/null
+++ b/htdocs/langs/hu_HU/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Kezdet dátuma
+DatePartnershipEnd=Befejezés dátuma
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Piszkozat
+PartnershipAccepted = Accepted
+PartnershipRefused = Visszautasított
+PartnershipCanceled = Visszavonva
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang
index a5e5e3c4906..ba6dc689fc1 100644
--- a/htdocs/langs/hu_HU/productbatch.lang
+++ b/htdocs/langs/hu_HU/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index ddf05f19e41..e33c49faa9e 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -22,8 +22,8 @@ ProductVatMassChangeDesc=Ez az eszköz frissíti <b><u>MINDEN</u></b> termékre
 MassBarcodeInit=Tömeges vonalkód létrehozás
 MassBarcodeInitDesc=Ezen az oldalon lehet vonalkódot létrehozni azon objektumoknak, amelyeknél még nincs meghatározva vonalkód. Ellenőrizze a beállításokat, mielőtt a barcode modul befejeződik.
 ProductAccountancyBuyCode=Számviteli kód (vásárlás)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancyBuyIntraCode=Számviteli kód (EU vásárlás)
+ProductAccountancyBuyExportCode=Számviteli kód (import vásárlás)
 ProductAccountancySellCode=Számviteli kód (eladás)
 ProductAccountancySellIntraCode=Számviteli kód (Közösségen belüli eladás)
 ProductAccountancySellExportCode=Számviteli kód (export eladás)
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Kizárólag eladó szolgáltatások
 ServicesOnPurchaseOnly=Kizárólag megvásárolható szolgáltatások
 ServicesNotOnSell=Nem eladó és nem vásárolható szolgáltatások
 ServicesOnSellAndOnBuy=Eladó és vásárolható szolgáltatások
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=A legújabb %s rögzített termékek
 LastRecordedServices=A legújabb %s rögzített szolgáltatás
 CardProduct0=Termék
@@ -73,12 +73,12 @@ SellingPrice=Eladási ár
 SellingPriceHT=Eladási ár (adó nélkül)
 SellingPriceTTC=Eladási ár (bruttó)
 SellingMinPriceTTC=Minimális eladási ár (adóval)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Ezt az értéket fel lehet használni a különbözet (árrés) kiszámításához.
 SoldAmount=Eladott mennyiség
 PurchasedAmount=Vásárolt mennyiség
 NewPrice=Új ár
-MinPrice=Min. eladási ár
+MinPrice=Min. selling price
 EditSellingPriceLabel=Az eladási árcímke szerkesztése
 CantBeLessThanMinPrice=Az eladási ár nem lehet kisebb a minimum árnál (nettó %s)
 ContractStatusClosed=Lezárva
@@ -157,11 +157,11 @@ ListServiceByPopularity=Szolgáltatások listája népszerűség szerint
 Finished=Gyártott termék
 RowMaterial=Nyersanyag
 ConfirmCloneProduct=Biztos benne, hogy klónozni szeretne egy terméket vagy szolgáltatást <b>%s</b>?
-CloneContentProduct=A termékkel / szolgáltatással kapcsolatos összes fő információ klónozása
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Árak klónozása
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Virtuális termék / szolgáltatás klónozása
-CloneCombinationsProduct=Termékváltozatok klónozása
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Ez a termék használatban van
 NewRefForClone=Új termék/szolgáltatás ref#.
 SellingPrices=Eladási árak
@@ -170,12 +170,12 @@ CustomerPrices=Végfelhasználói árak
 SuppliersPrices=Eladási árak
 SuppliersPricesOfProductsOrServices=Eladási árak (termékek vagy szolgáltatások)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Származási ország
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Rövid címke
 Unit=Egység
 p=db.
@@ -291,15 +291,15 @@ PriceExpressionEditorHelp5=Elérhető globális értékek:
 PriceMode=Ár mód
 PriceNumeric=Szám
 DefaultPrice=Alapár
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Korábban megadott alapárak visszatekintése
 ComposedProductIncDecStock=Növelje/csökkentse a készletet a szülő termék változásakor
 ComposedProduct=Gyermek termékek
 MinSupplierPrice=Minimális vételár
 MinCustomerPrice=Minimális eladási ár
 DynamicPriceConfiguration=Dinamikus árkonfiguráció
 DynamicPriceDesc=Megadhat matematikai képleteket a vevői vagy a szállítói árak kiszámításához. Az ilyen képletek felhasználhatják az összes matematikai operátort, néhány állandót és változót. Itt meghatározhatja azokat a változókat, amelyeket használni kíván. Ha a változónak automatikus frissítésre van szüksége, megadhatja a külső URL-t, hogy a Dolibarr automatikusan frissítse az értéket.
-AddVariable=Add Variable
-AddUpdater=Add Updater
+AddVariable=Változó hozzáadása
+AddUpdater=Frissítő hozzáadása
 GlobalVariables=Globális változók
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=A változók külső frissítései
@@ -315,7 +315,7 @@ CorrectlyUpdated=Rendben frissítve
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=PDF fájlok kiválasztása
 IncludingProductWithTag=Include products/services with tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
+DefaultPriceRealPriceMayDependOnCustomer=Alapár, a valós ár vevőnként eltérhet
 WarningSelectOneDocument=Kérjük, válasszon legalább egy dokumentumot
 DefaultUnitToShow=Egység
 NbOfQtyInProposals=Mennyiség a javaslatokban
@@ -376,7 +376,7 @@ NewProductAttribute=Új attribútum
 NewProductAttributeValue=Új attribútumérték
 ErrorCreatingProductAttributeValue=Hiba történt az attribútumérték létrehozása során. Lehetséges, hogy már van egy létező érték ezzel a hivatkozással
 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.
+TooMuchCombinationsWarning=Túl sok variáció létrehozása nagy processzor terhelést és memória-használatot eredményezhet és a Dolibarr hibára futhat. A "%s" opció bekapcsolásával csökkentheti a túlzott memória foglalást.
 DoNotRemovePreviousCombinations=Ne távolítsa el a korábbi változatokat
 UsePercentageVariations=Százalékos variációk használata
 PercentageVariation=Százalékos variáció
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 0a5f58045ef..d69968ffa21 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Projekt kapcsolatok
 ProjectsImContactFor=Olyan projektek, amelyekkel kifejezetten kapcsolatban állok
 AllAllowedProjects=Az összes projekt, amit el tudok olvasni (az enyém + nyilvános)
 AllProjects=Minden projekt
-MyProjectsDesc=Ez a nézet azokra a projektekre korlátozódik, amelyekhez Ön kapcsolattartó
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
 TasksOnProjectsPublicDesc=Ez a nézet azokat a projekteket mutatja be, amelyeket elolvashat.
 ProjectsPublicTaskDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
 ProjectsDesc=Ez a nézet minden projektet tartalmaz.
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
 TasksDesc=Ez a nézet minden projektet tartalmaz.
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=Új projekt
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Nincs hozzárendelve a feladathoz
 NoUserAssignedToTheProject=Nincs felhasználó hozzárendelve ehhez a projekthez
 TimeSpentBy=Által töltött idő
 TasksAssignedTo=Hozzárendelt feladatok
-AssignTaskToMe=Rendeljen nekem feladatot
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Hozzárendelje a feladatot az %s fájlhoz
 SelectTaskToAssign=Válassza ki a hozzárendelni kívánt feladatot ...
 AssignTask=Hozzárendelni
diff --git a/htdocs/langs/hu_HU/recruitment.lang b/htdocs/langs/hu_HU/recruitment.lang
index 590a003a8f0..5e8a31df381 100644
--- a/htdocs/langs/hu_HU/recruitment.lang
+++ b/htdocs/langs/hu_HU/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index aba9cc8f51b..21d948c9f7e 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 modell
 WarningNoQtyLeftToSend=Figyelem, nincs szállításra váró termék.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index 983d4c646dd..48d4ddc9f27 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Nincs előredefiniált termék ehhez az objektumho
 DispatchVerb=Kiküldés
 StockLimitShort=Figyelmeztetés küszöbértéke
 StockLimit=A készlet figyelmeztetési határértéke
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Igazi készlet
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index 9e9179eeb7c..1c115aac06a 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=A jelszó erre változott: %s
 SubjectNewPassword=Az új jelszava %s-hoz
 GroupRights=Csoport engedélyek
 UserRights=Felhasználói engedélyek
+Credentials=Credentials
 UserGUISetup=Megjelenítési beállítások
 DisableUser=Letiltás
 DisableAUser=Felhasználó letiltása
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Hansználd a mezőt a módosításhoz
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Használd az OpenID-t a belépéshez
 WeeklyHours=Munkaidő (hetente)
-ExpectedWorkedHours=Várható heti munkaidő
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=A felhasználó színe
 DisabledInMonoUserMode=Karbantartási módban kikapcsolt
 UserAccountancyCode=Felhasználói számviteli kód
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=A foglalkoztatás kezdő dátuma
 DateEmploymentEnd=A foglalkoztatás befejezési dátuma
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Saját felhasználói rekordját nem tilthatja le
 ForceUserExpenseValidator=A költségjelentés érvényesítésének kényszerítése
 ForceUserHolidayValidator=A szabadságkérelem érvényesítése
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index df9bc9385e8..0d0b576b87e 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 8f2c1104d2a..5ee50624603 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Referensi
 LabelAccount=Label Akun
 LabelOperation=Operasi label
 Sens=Arah
-AccountingDirectionHelp=Untuk akun akuntansi pelanggan, gunakan Kredit untuk mencatat pembayaran yang Anda terima <br> Untuk akun akuntansi pemasok, gunakan Debit untuk mencatat pembayaran yang Anda lakukan
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Kode huruf
 Lettering=Tulisan
 Codejournal=Jurnal
@@ -297,7 +297,7 @@ NoNewRecordSaved=Tidak ada lagi catatan untuk dijurnal
 ListOfProductsWithoutAccountingAccount=Daftar produk yang tidak terikat ke akun akuntansi apa pun
 ChangeBinding=Ubah ikatannya
 Accounted=Disumbang dalam buku besar
-NotYetAccounted=Belum diperhitungkan dalam buku besar
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Perlihatkan Tutorial
 NotReconciled=Tidak didamaikan
 WarningRecordWithoutSubledgerAreExcluded=Peringatan, semua operasi tanpa akun subledger ditentukan disaring dan dikecualikan dari tampilan ini
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 91c88376980..299e5a8b016 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Hapus / ganti nama berkas <b>%s</b> jika sudah ada, untuk memperboleh
 RestoreLock=Pulihkan berkas <b>%s</b>, dengan izin baca saja, untuk menonaktifkan pemakaian alat Pembaruan / Instal lebih lanjut.
 SecuritySetup=Pengaturan Keamanan
 PHPSetup=Pengaturan PHP
+OSSetup=OS setup
 SecurityFilesDesc=Tetapkan di sini untuk opsi yang terkait dengan keamanan tentang mengunggah berkas.
 ErrorModuleRequirePHPVersion=Kesalahan, modul ini membutuhkan versi PHP %s atau lebih tinggi
 ErrorModuleRequireDolibarrVersion=Kesalahan, modul ini membutuhkan versi Dolibarr %s atau lebih tinggi
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Jangan menyarankan
 NoActiveBankAccountDefined=Tidak ada rekening bank aktif yang ditentukan
 OwnerOfBankAccount=Pemilik rekening bank %s
 BankModuleNotActive=Modul rekening bank tidak diaktifkan
-ShowBugTrackLink=Tampilkan tautan "<strong> %s </strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Lansiran
 DelaysOfToleranceBeforeWarning=Tunda sebelum menampilkan peringatan untuk:
 DelaysOfToleranceDesc=Atur penundaan sebelum ikon peringatan %s ditampilkan di layar untuk elemen yang terakhir.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Anda harus menjalankan perintah
 YourPHPDoesNotHaveSSLSupport=Fungsi SSL tidak tersedia di PHP Anda
 DownloadMoreSkins=Lebih banyak skin untuk diunduh
 SimpleNumRefModelDesc=Mengembalikan nomor referensi dalam format %syymm-nnnn di mana yy adalah tahun, mm adalah bulan dan nnnn adalah nomor auto-incrementing berurutan tanpa reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Tampilkan id profesional dengan alamat
 ShowVATIntaInAddress=Sembunyikan nomor PPN intra-Komunitas dengan alamat
 TranslationUncomplete=Terjemahan sebagian
@@ -2062,7 +2064,7 @@ UseDebugBar=Gunakan bilah debug
 DEBUGBAR_LOGS_LINES_NUMBER=Jumlah baris log terakhir untuk disimpan di konsol
 WarningValueHigherSlowsDramaticalyOutput=Peringatan, nilai yang lebih tinggi memperlambat output yang dramatis
 ModuleActivated=Modul %s diaktifkan dan memperlambat antarmuka
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Jika Anda berada di lingkungan produksi, Anda harus menyetel properti ini ke %s.
 AntivirusEnabledOnUpload=Antivirus diaktifkan pada file yang diunggah
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index cdb2c57e5cf..84e3aecbc0f 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Pembayaran pajak sosial / fiskal
 BankTransfer=Transfer Kredit
 BankTransfers=Transfer Kredit
 MenuBankInternalTransfer=Transfer internal
-TransferDesc=Transfer dari satu akun ke akun lainnya, Dolibarr akan menulis dua catatan (satu akun debit di sumber dan satu kredit di akun target). Jumlah yang sama (kecuali tanda), label dan tanggal akan digunakan untuk transaksi ini)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Dari
 TransferTo=Kepada
 TransferFromToDone=Transfer dari <b>%s</b> ke <b>%s</b> dari <b>%s</b> %s telah dicatat.
-CheckTransmitter=Pemancar
+CheckTransmitter=Sender
 ValidateCheckReceipt=Validasi tanda terima cek ini?
-ConfirmValidateCheckReceipt=Yakin ingin memvalidasi tanda terima cek ini, tidak ada perubahan yang mungkin terjadi setelah ini dilakukan?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Hapus tanda terima cek ini?
 ConfirmDeleteCheckReceipt=Anda yakin ingin menghapus tanda terima cek ini?
 BankChecks=Cek bank
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Apakah Anda yakin ingin menghapus entri ini?
 ThisWillAlsoDeleteBankRecord=Ini juga akan menghapus entri bank yang dihasilkan
 BankMovements=Pergerakan
 PlannedTransactions=Entri yang direncanakan
-Graph=Grafik
+Graph=Graphs
 ExportDataset_banque_1=Entri bank dan laporan rekening
 ExportDataset_banque_2=Slip penyetoran
 TransactionOnTheOtherAccount=Transaksi di akun lain
@@ -142,7 +142,7 @@ AllAccounts=Semua rekening bank dan kas
 BackToAccount=Kembali ke akun
 ShowAllAccounts=Tampilkan untuk semua akun
 FutureTransaction=Transaksi di masa depan. Tidak dapat melakukan rekonsiliasi.
-SelectChequeTransactionAndGenerate=Pilih / saring cek untuk dimasukkan dalam tanda terima setoran cek dan klik "Buat".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Pilih laporan bank yang terkait dengan konsiliasi. Gunakan nilai numerik yang dapat diurutkan: YYYYMM atau YYYYMMDD
 EventualyAddCategory=Akhirnya, tentukan kategori untuk mengklasifikasikan catatan
 ToConciliate=Untuk berdamai?
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 69108eb724c..91d13c95fd0 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Ubah kelebihan bayar menjadi diskon yang tersedia
 EnterPaymentReceivedFromCustomer=Masukkan pembayaran yang diterima dari pelanggan
 EnterPaymentDueToCustomer=Buat tempo pembayaran ke pelanggan
 DisabledBecauseRemainderToPayIsZero=Dinonaktifkan karena sisa yang belum dibayar adalah nol
-PriceBase=Harga dasar
+PriceBase=Base price
 BillStatus=Status tagihan
 StatusOfGeneratedInvoices=Status faktur yang dihasilkan
 BillStatusDraft=Konsep (harus di validasi)
@@ -454,7 +454,7 @@ RegulatedOn=Diatur pada
 ChequeNumber=Periksa N °
 ChequeOrTransferNumber=Periksa / Transfer N °
 ChequeBordereau=Periksa jadwal
-ChequeMaker=Periksa / Transfer pemancar
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank Cek
 CheckBank=Periksa
 NetToBePaid=Bersih harus dibayar
diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
index 0106417ec18..849a43fd146 100644
--- a/htdocs/langs/id_ID/boxes.lang
+++ b/htdocs/langs/id_ID/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmark: %s terbaru
 BoxOldestExpiredServices=Layanan kedaluwarsa aktif terlama
 BoxLastExpiredServices=Kontak tertua %s terbaru dengan layanan kedaluwarsa aktif
 BoxTitleLastActionsToDo=Tindakan %s terbaru yang harus dilakukan
-BoxTitleLastContracts=Kontrak modifikasi %s terbaru
-BoxTitleLastModifiedDonations=Donasi terbaru %s yang dimodifikasi
-BoxTitleLastModifiedExpenses=Laporan pengeluaran termodifikasi %s terbaru
-BoxTitleLatestModifiedBoms=BOM dimodifikasi %s terbaru
-BoxTitleLatestModifiedMos=Modifikasi Pesanan Manufaktur %s terbaru
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Aktivitas global (faktur, proposal, pesanan)
 BoxGoodCustomers=Pelanggan yang baik
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index b18ea4ad4a5..d81264ec43d 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Lantai
 AddTable=Tambahkan tabel
 Place=Penempatan
 TakeposConnectorNecesary=Diperlukan 'TakePOS Connector'
-OrderPrinters=Printer pesanan
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Cari produk
 Receipt=Resi
 Header=Tajuk
@@ -56,8 +57,9 @@ Paymentnumpad=Jenis Pad untuk memasukkan pembayaran
 Numberspad=Angka pad
 BillsCoinsPad=Koin dan Pad uang kertas
 DolistorePosCategory=Modul TakePOS dan solusi POS lainnya untuk Dolibarr
-TakeposNeedsCategories=TakePOS membutuhkan kategori produk agar berfungsi
-OrderNotes=Catatan Pemesanan
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Akun default untuk digunakan untuk pembayaran dalam
 NoPaimementModesDefined=Tidak ada mode paiment yang ditentukan dalam konfigurasi TakePOS
 TicketVatGrouped=Kelompokkan PPN berdasarkan tarif dalam tiket | kwitansi
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Faktur sudah divalidasi
 NoLinesToBill=Tidak ada garis untuk ditagih
 CustomReceipt=Tanda Terima Kustom
 ReceiptName=Nama Penerimaan
-ProductSupplements=Suplemen Produk
+ProductSupplements=Manage supplements of products
 SupplementCategory=Kategori suplemen
 ColorTheme=Tema warna
 Colorful=Penuh warna
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Pencetakan resi yang sederhana dan mudah. Hanya beberapa parameter untuk mengkonfigurasi tanda terima. Cetak melalui browser.
 TakeposConnectorMethodDescription=Modul eksternal dengan fitur tambahan. Dapat memungkinkan untuk mencetak dari cloud.
 PrintMethod=Metode cetak
-ReceiptPrinterMethodDescription=Metode yang kuat dengan banyak parameter. Penuh dapat disesuaikan dengan templat. Tidak dapat mencetak dari cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=Dengan terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Modul penomoran untuk penjualan POS
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index 502485f4aca..96b9cb69a30 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Label/Kategori
 Rubriques=Label/Kategori
 RubriquesTransactions=Label/Kategori Transaksi
 categories=Label/Kategori
-NoCategoryYet=Tidak ada label/kategori untuk jenis ini yang dibuat
+NoCategoryYet=No tag/category of this type has been created
 In=Pada
 AddIn=Tambahan
 modify=Modifikasi
 Classify=Klasifikasikan
 CategoriesArea=Area Label/Kategori
-ProductsCategoriesArea=Area label/kategori Produk/Layanan
-SuppliersCategoriesArea=Area label/kategori Vendor
-CustomersCategoriesArea=Area label/kategori Pelanggan
-MembersCategoriesArea=Area label/kategori Anggota
-ContactsCategoriesArea=Area label/kategori Kontak
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Area label/kategori Proyek
-UsersCategoriesArea=Area label/kategori Pengguna
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-kategori
 CatList=Daftar label/kategori
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Pilih Kategori
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Gunakan atau operator untuk kategori
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index adf0a9abd4a..0db74b127bb 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Nama Perusahaan %s telah terdaftar. Silahkan masukan nama lain.
 ErrorSetACountryFirst=Set Negara dulu
 SelectThirdParty=Pilih Pihak Ketiga
-ConfirmDeleteCompany=Apakah Anda yakin ingin menghapus perusahaan ini dan semua informasi yang diwarisi?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Hapus kontak/alamat
-ConfirmDeleteContact=Apakah Anda yakin ingin menghapus kontak ini dan semua informasi yang diwarisi?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Pihak Ketiga Baru
 MenuNewCustomer=Pelanggan baru
 MenuNewProspect=Prospek Baru
@@ -69,7 +69,7 @@ PhoneShort=Telepon
 Skype=Skype
 Call=Panggilan
 Chat=Obrolan
-PhonePro=Telepon Prof.
+PhonePro=Bus. phone
 PhonePerso=Pers. telepon
 PhoneMobile=Mobile
 No_Email=Tolak email massal
@@ -78,7 +78,7 @@ Zip=Kode Pos
 Town=Kota
 Web=Web
 Poste= Posisi
-DefaultLang=Default bahasa
+DefaultLang=Default language
 VATIsUsed=Pajak penjualan digunakan
 VATIsUsedWhenSelling=Ini menentukan apakah pihak ketiga ini termasuk pajak penjualan atau tidak ketika membuat faktur kepada pelanggannya sendiri
 VATIsNotUsed=Pajak penjualan tidak digunakan
@@ -331,7 +331,7 @@ CustomerCodeDesc=Kode Pelanggan, unik untuk semua pelanggan
 SupplierCodeDesc=Kode Vendor, unik untuk semua vendor
 RequiredIfCustomer=Diperlukan jika pihak ketiga adalah pelanggan atau prospek
 RequiredIfSupplier=Diperlukan jika pihak ketiga adalah vendor
-ValidityControledByModule=Validitas dikendalikan oleh modul
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Aturan untuk modul ini
 ProspectToContact=Prospek untuk dihubungi
 CompanyDeleted=Perusahaan "%s" dihapus dari basis data.
@@ -439,12 +439,12 @@ ListSuppliersShort=Daftar Vendor
 ListProspectsShort=Daftar Prospek
 ListCustomersShort=Daftar Pelanggan
 ThirdPartiesArea=Pihak Ketiga/Kontak
-LastModifiedThirdParties=%s dimodifikasi Pihak Ketiga terbaru
-UniqueThirdParties=Total Pihak Ketiga
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Buka
 ActivityCeased=Ditutup
 ThirdPartyIsClosed=Pihak ketiga ditutup
-ProductsIntoElements=Daftar produk/layanan ke %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Tagihan terutang saat ini
 OutstandingBill=Maks. untuk tagihan luar biasa
 OutstandingBillReached=Maks. untuk tagihan luar biasa tercapai
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Kode ini gratis. Kode ini dapat dimodifikasi kapan saja.
 ManagingDirectors=Nama manajer (CEO, direktur, presiden ...)
 MergeOriginThirdparty=Duplikat pihak ketiga (pihak ketiga yang ingin Anda hapus)
 MergeThirdparties=Gabungkan pihak ketiga
-ConfirmMergeThirdparties=Anda yakin ingin menggabungkan pihak ketiga ini menjadi yang sekarang? Semua objek yang ditautkan (faktur, pesanan, ...) akan dipindahkan ke pihak ketiga saat ini, maka pihak ketiga akan dihapus.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Pihak ketiga telah bergabung
 SaleRepresentativeLogin=Login perwakilan penjualan
 SaleRepresentativeFirstname=Nama depan perwakilan penjualan
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 1d7b8a7b043..37c855feba5 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Diskon baru
 NewCheckDeposit=Setoran cek baru
 NewCheckDepositOn=Buat tanda terima untuk setoran pada akun: %s
 NoWaitingChecks=Tidak ada cek yang menunggu setoran.
-DateChequeReceived=Periksa tanggal penerimaan
+DateChequeReceived=Check receiving date
 NbOfCheques=Jumlah cek
 PaySocialContribution=Membayar pajak sosial / fiskal
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/id_ID/ecm.lang b/htdocs/langs/id_ID/ecm.lang
index 22be2855e7b..5f79acf805d 100644
--- a/htdocs/langs/id_ID/ecm.lang
+++ b/htdocs/langs/id_ID/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 17842a411a5..f65b4dd8a4c 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Tidak ada kesalahan, kami berkomitmen
 # Errors
 ErrorButCommitIsDone=Kesalahan ditemukan tetapi kami memvalidasinya
-ErrorBadEMail=Email %s salah
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s salah
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Nilai buruk untuk parameter Anda. Biasanya ditambahkan ketika terjemahan tidak ada.
 ErrorRefAlreadyExists=Referensi <b> %s </b> sudah ada.
 ErrorLoginAlreadyExists=Login %s sudah ada.
@@ -46,8 +46,8 @@ ErrorWrongDate=Tanggal tidak benar!
 ErrorFailedToWriteInDir=Gagal menulis dalam direktori %s
 ErrorFoundBadEmailInFile=Ditemukan sintaks email yang salah untuk baris %s dalam file (contoh baris %s dengan email = %s)
 ErrorUserCannotBeDelete=Pengguna tidak dapat dihapus. Mungkin itu terkait dengan entitas Dolibarr.
-ErrorFieldsRequired=Beberapa bidang wajib diisi tidak terisi.
-ErrorSubjectIsRequired=Diperlukan topik email
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Gagal membuat direktori. Periksa apakah pengguna server Web memiliki izin untuk menulis ke direktori dokumen Dolibarr. Jika parameter<b>safe_mode</b>diaktifkan pada PHP ini, periksa apakah file-file Dolibarr php milik pengguna web server (atau grup).
 ErrorNoMailDefinedForThisUser=Tidak ada surat yang ditentukan untuk pengguna ini
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Halaman / wadah<strong>%s </strong> m
 ErrorDuringChartLoad=Kesalahan saat memuat bagan akun. Jika beberapa akun tidak dimuat, Anda masih dapat memasukkannya secara manual.
 ErrorBadSyntaxForParamKeyForContent=Sintaks buruk untuk parameter keyforcontent Harus memiliki nilai yang dimulai dengan %s atau %s
 ErrorVariableKeyForContentMustBeSet=Kesalahan, konstanta dengan nama %s (dengan konten teks untuk ditampilkan) atau %s (dengan url eksternal untuk ditampilkan) harus disetel.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s harus dimulai dengan http: // atau https: //
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Kesalahan, referensi baru sudah digunakan
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/id_ID/eventorganization.lang b/htdocs/langs/id_ID/eventorganization.lang
new file mode 100644
index 00000000000..743b1f59013
--- /dev/null
+++ b/htdocs/langs/id_ID/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Pengaturan
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Konsep
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/id_ID/knowledgemanagement.lang b/htdocs/langs/id_ID/knowledgemanagement.lang
new file mode 100644
index 00000000000..d968e8e9fd4
--- /dev/null
+++ b/htdocs/langs/id_ID/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Pengaturan
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index ed918cac7a5..2978429333e 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Kepada pengguna(banyak)
 MailCC=Salin ke
 MailToCCUsers=Salin ke pengguna(banyak)
 MailCCC=Cadangkan cache salinan ke
-MailTopic=Topik email
+MailTopic=Email subject
 MailText=Pesan
 MailFile=File-file terlampir
 MailMessage=Badan email
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=Tidak ada pemberitahuan email otomatis yang direncanak
 ANotificationsWillBeSent=1 notifikasi otomatis akan dikirim melalui email
 SomeNotificationsWillBeSent=%s notifikasi otomatis akan dikirim melalui email
 AddNewNotification=Berlangganan pemberitahuan email otomatis baru (target / acara)
-ListOfActiveNotifications=Buat daftar semua langganan aktif (target / acara) untuk pemberitahuan email otomatis
-ListOfNotificationsDone=Cantumkan semua pemberitahuan email otomatis yang dikirim
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Konfigurasi pengiriman email telah diatur ke '%s'. Mode ini tidak dapat digunakan untuk mengirim email masal.
 MailSendSetupIs2=Anda pertama-tama harus pergi, dengan akun admin, ke dalam menu %sHome - Setup - EMails%s untuk mengubah parameter<strong>'%s' </strong> untuk menggunakan mode ' %s'. Dengan mode ini, Anda dapat masuk ke pengaturan server SMTP yang disediakan oleh Penyedia Layanan Internet Anda dan menggunakan fitur kirim email dengan skala besar.
 MailSendSetupIs3=Jika Anda memiliki pertanyaan tentang cara mengatur server SMTP Anda, Anda dapat bertanya ke %s.
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index fd738bd65fa..00db3c9d24e 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Simpan dan baru
 TestConnection=Tes koneksi
 ToClone=Gandakan
 ConfirmCloneAsk=Apakah Anda yakin ingin mengkloning objek<b>%s </b>?
-ConfirmClone=Pilih data yang ingin Anda klon:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Tidak ada data untuk dikloning yang ditentukan.
 Of=dari
 Go=Pergilah
@@ -246,7 +246,7 @@ DefaultModel=Template dokumen default
 Action=Peristiwa
 About=Tentang
 Number=Jumlah
-NumberByMonth=Jumlah berdasarkan bulan
+NumberByMonth=Total reports by month
 AmountByMonth=Jumlah menurut bulan
 Numero=Jumlah
 Limit=Membatasi
@@ -341,8 +341,8 @@ KiloBytes=Kilobyte
 MegaBytes=Megabita
 GigaBytes=Gigabytes
 TeraBytes=Terabyte
-UserAuthor=Pengguna ciptaan
-UserModif=Pengguna pembaruan terakhir
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Oleh
 From=Dari
 FromDate=Dari
 FromLocation=Dari
-at=di
 to=untuk
 To=untuk
+ToDate=to
+ToLocation=to
+at=di
 and=dan
 or=atau
 Other=Lainnya
@@ -843,7 +845,7 @@ XMoreLines=%s baris tersembunyi
 ShowMoreLines=Tampilkan lebih banyak / lebih sedikit garis
 PublicUrl=URL publik
 AddBox=Tambahkan kotak
-SelectElementAndClick=Pilih elemen dan klik %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Cetak File %s
 ShowTransaction=Tampilkan entri di rekening bank
 ShowIntervention=Tampilkan intervensi
@@ -854,8 +856,8 @@ Denied=Ditolak
 ListOf=Daftar %s
 ListOfTemplates=Daftar templat
 Gender=Jenis kelamin
-Genderman=Pria
-Genderwoman=Wanita
+Genderman=Male
+Genderwoman=Female
 Genderother=Lainnya
 ViewList=Tampilan daftar
 ViewGantt=Lihat saja
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Yakin ingin memengaruhi tag ke %s rekaman yang dipilih(
 CategTypeNotFound=Tidak ada jenis tag yang ditemukan untuk jenis rekaman
 CopiedToClipboard=Disalin ke papan klip
 InformationOnLinkToContract=Jumlah ini hanyalah total dari semua garis kontrak. Tidak ada gagasan tentang waktu yang dipertimbangkan.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 39cec55bfa0..b7c15c1e19d 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=anggota lain (nama:<b>%s </b>, login:
 ErrorUserPermissionAllowsToLinksToItselfOnly=Demi alasan keamanan, Anda harus diberikan izin untuk mengedit semua pengguna agar dapat menautkan anggota ke pengguna yang bukan milik Anda.
 SetLinkToUser=Tautan ke pengguna Dolibarr
 SetLinkToThirdParty=Tautan ke pihak ketiga Dolibarr
-MembersCards=Kartu nama anggota
+MembersCards=Business cards for members
 MembersList=Daftar anggota
 MembersListToValid=Daftar anggota konsep (akan divalidasi)
 MembersListValid=Daftar anggota yang valid
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Anggota dengan berlangganan untuk menerima
 MembersWithSubscriptionToReceiveShort=Berlangganan untuk menerima
 DateSubscription=Tanggal berlangganan
 DateEndSubscription=Tanggal akhir berlangganan
-EndSubscription=Akhiri berlangganan
+EndSubscription=Subscription Ends
 SubscriptionId=ID berlangganan
 WithoutSubscription=Without subscription
 MemberId=Tanda Anggota
@@ -83,10 +83,10 @@ WelcomeEMail=Selamat datang email
 SubscriptionRequired=Dibutuhkan berlangganan
 DeleteType=Hapus
 VoteAllowed=Vote diizinkan
-Physical=Fisik
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Diaktifkan kembali
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Hentikan anggota
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Statistik anggota menurut negara
 MembersStatisticsByState=Statistik anggota menurut negara bagian / provinsi
 MembersStatisticsByTown=Statistik anggota menurut kota
 MembersStatisticsByRegion=Statistik anggota berdasarkan wilayah
-NbOfMembers=Jumlah anggota
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Tidak ada anggota yang divalidasi yang ditemukan
-MembersByCountryDesc=Layar ini menunjukkan statistik anggota berdasarkan negara. Grafik tergantung pada layanan grafik online Google dan hanya tersedia jika koneksi internet berfungsi.
-MembersByStateDesc=Layar ini menunjukkan statistik anggota berdasarkan negara bagian / provinsi / kanton.
-MembersByTownDesc=Layar ini menunjukkan statistik anggota berdasarkan kota.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Pilih statistik yang ingin Anda baca ...
 MenuMembersStats=Statistik
-LastMemberDate=Tanggal anggota terbaru
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Tanggal berlangganan terbaru
-MemberNature=Sifat anggota
-MembersNature=Nature of members
-Public=Informasi bersifat publik
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Anggota baru ditambahkan. Menunggu persetujuan
 NewMemberForm=Formulir anggota baru
-SubscriptionsStatistics=Statistik tentang langganan
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Jumlah langganan
-AmountOfSubscriptions=Jumlah langganan
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Omset (untuk perusahaan) atau Anggaran (untuk yayasan)
 DefaultAmount=Jumlah langganan default
 CanEditAmount=Pengunjung dapat memilih / mengedit jumlah langganannya
 MEMBER_NEWFORM_PAYONLINE=Langsung ke halaman pembayaran online terintegrasi
 ByProperties=Secara alami
 MembersStatisticsByProperties=Statistik anggota secara alami
-MembersByNature=Layar ini menunjukkan statistik tentang anggota.
-MembersByRegion=Layar ini menampilkan statistik anggota berdasarkan wilayah.
 VATToUseForSubscriptions=Tarif PPN yang digunakan untuk langganan
 NoVatOnSubscription=Tidak ada PPN untuk langganan
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produk yang digunakan untuk jalur berlangganan menjadi faktur: %s
diff --git a/htdocs/langs/id_ID/modulebuilder.lang b/htdocs/langs/id_ID/modulebuilder.lang
index e573b8011ba..2f41574e85c 100644
--- a/htdocs/langs/id_ID/modulebuilder.lang
+++ b/htdocs/langs/id_ID/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Daftar izin yang ditentukan
 SeeExamples=Lihat contoh di sini
 EnabledDesc=Ketentuan untuk mengaktifkan bidang ini (Contoh: 1 atau $ conf-> global-> MYMODULE_MYOPTION)
 VisibleDesc=Apakah bidangnya terlihat? (Contoh: 0 = Tidak pernah terlihat, 1 = Terlihat pada daftar dan membuat / memperbarui / melihat formulir, 2 = Terlihat hanya pada daftar, 3 = Hanya terlihat pada formulir buat / perbarui / lihat (bukan daftar), 4 = Terlihat pada daftar dan perbarui / lihat saja form (bukan buat), 5 = Terlihat hanya pada form tampilan akhir daftar (bukan buat, bukan perbarui). <br> <br> Menggunakan nilai negatif berarti bidang tidak ditampilkan secara default pada daftar tetapi dapat dipilih untuk dilihat). <br> <br> Ini bisa berupa ekspresi, misalnya: <br> preg_match ('/ publik /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> (hak liburan-> mendefinisikan liburan-> hak):
-DisplayOnPdfDesc=Tampilkan bidang ini pada dokumen PDF yang kompatibel, Anda dapat mengelola posisi dengan bidang "Posisi". <br/> Saat ini, dikenal model kompatibel PDF adalah: Eratosthenes (order), espadon (kapal), spons (faktur), cyan (propal / kutip), Cornas (order pemasok) <br/> <br/><strong>Untuk dokumen: </strong> <br/> 0 = tidak ditampilkan <br/> 1 = display <br/> 2 = menampilkan hanya jika tidak kosong <br/> <br/><strong>Untuk lini dokumen: </strong> <br/> 0 = tidak ditampilkan <br/> 1 = ditampilkan dalam kolom <br/> 3 = display di kolom deskripsi baris setelah deskripsi <br/> 4 = display di kolom deskripsi setelah deskripsi hanya jika tidak kosong
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Tampilan di PDF
 IsAMeasureDesc=Bisakah nilai bidang diakumulasikan untuk mendapatkan total ke dalam daftar? (Contoh: 1 atau 0)
 SearchAllDesc=Apakah bidang yang digunakan untuk melakukan pencarian dari alat pencarian cepat? (Contoh: 1 atau 0)
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 9e98004abe1..7b5bd50c7db 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Instal atau aktifkan pustaka GD pada instalasi PHP Anda untu
 ProfIdShortDesc=<b>Prof Id %s</b>adalah informasi tergantung pada negara pihak ketiga. <br> Misalnya, untuk negara<b>%s </b>, itu kode<b>%s a09a4b739f17f8z
 DolibarrDemo=Demo Dolibarr ERP / CRM
 StatsByNumberOfUnits=Statistik untuk jumlah jumlah produk / layanan
-StatsByNumberOfEntities=Statistik dalam jumlah entitas pengarah (no. Faktur, atau pesanan ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Jumlah proposal
 NumberOfCustomerOrders=Jumlah pesanan penjualan
 NumberOfCustomerInvoices=Jumlah faktur pelanggan
@@ -289,4 +289,4 @@ PopuProp=Produk / Layanan berdasarkan popularitas dalam Proposal
 PopuCom=Produk / Layanan berdasarkan popularitas dalam Pesanan
 ProductStatistics=Statistik Produk / Layanan
 NbOfQtyInOrders=Jumlah pesanan
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/id_ID/partnership.lang b/htdocs/langs/id_ID/partnership.lang
new file mode 100644
index 00000000000..a1e47473966
--- /dev/null
+++ b/htdocs/langs/id_ID/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Tanggal mulai
+DatePartnershipEnd=Tanggal Akhir
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Konsep
+PartnershipAccepted = Accepted
+PartnershipRefused = Ditolak
+PartnershipCanceled = Dibatalkan
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang
index bd5348169ac..2ee8f9d3c63 100644
--- a/htdocs/langs/id_ID/productbatch.lang
+++ b/htdocs/langs/id_ID/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 86fe0893b1e..1c2a44525f5 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Layanan untuk dijual saja
 ServicesOnPurchaseOnly=Layanan untuk pembelian saja
 ServicesNotOnSell=Layanan tidak untuk dijual dan tidak untuk pembelian
 ServicesOnSellAndOnBuy=Layanan untuk dijual dan untuk pembelian
-LastModifiedProductsAndServices=Produk / layanan modifikasi %s terbaru
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Produk terekam %s terbaru
 LastRecordedServices=Layanan terekam %s terbaru
 CardProduct0=Produk
@@ -73,12 +73,12 @@ SellingPrice=Harga penjualan
 SellingPriceHT=Harga jual (tidak termasuk pajak)
 SellingPriceTTC=Harga jual (termasuk pajak)
 SellingMinPriceTTC=Harga Jual Minimum (termasuk pajak)
-CostPriceDescription=Bidang harga ini (tidak termasuk pajak) dapat digunakan untuk menyimpan jumlah rata-rata biaya produk ini untuk perusahaan Anda. Ini bisa berupa harga yang Anda hitung sendiri, misalnya dari harga beli rata-rata ditambah biaya produksi dan distribusi rata-rata.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Nilai ini dapat digunakan untuk perhitungan margin.
 SoldAmount=Jumlah yang dijual
 PurchasedAmount=Jumlah yang dibeli
 NewPrice=Harga baru
-MinPrice=Min. harga jual
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit label harga jual
 CantBeLessThanMinPrice=Harga jual tidak boleh lebih rendah dari minimum yang diizinkan untuk produk ini (%s tanpa pajak). Pesan ini juga dapat muncul jika Anda mengetikkan diskon yang terlalu penting.
 ContractStatusClosed=Ditutup
@@ -157,11 +157,11 @@ ListServiceByPopularity=Daftar layanan berdasarkan popularitas
 Finished=Produk yang diproduksi
 RowMaterial=Bahan baku
 ConfirmCloneProduct=Yakin ingin mengkloning produk atau layanan<b>%s </b>?
-CloneContentProduct=Mengkloning semua informasi utama produk / layanan
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Harga klon
-CloneCategoriesProduct=Tag / kategori kloning tertaut
-CloneCompositionProduct=Klon produk / layanan virtual
-CloneCombinationsProduct=Variasi produk klon
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Produk ini digunakan
 NewRefForClone=Ref. produk / layanan baru
 SellingPrices=Harga jual
@@ -170,12 +170,12 @@ CustomerPrices=Harga pelanggan
 SuppliersPrices=Harga penjual
 SuppliersPricesOfProductsOrServices=Harga vendor (produk atau layanan)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Negara Asal
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Sifat produk (bahan / selesai)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Sifat produk
-NatureOfProductDesc=Bahan baku mentah atau produk jadi
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Label pendek
 Unit=Satuan
 p=kamu
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index bf2e4cbb771..50729228dab 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Kontak proyek
 ProjectsImContactFor=Proyek yang secara eksplisit saya hubungi
 AllAllowedProjects=Semua proyek yang dapat saya baca (milik saya + publik)
 AllProjects=Semua proyek
-MyProjectsDesc=Pandangan ini terbatas pada proyek tempat Anda dihubungi
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Tampilan ini menyajikan semua proyek yang boleh Anda baca.
 TasksOnProjectsPublicDesc=Tampilan ini menyajikan semua tugas pada proyek yang diizinkan Anda baca.
 ProjectsPublicTaskDesc=Tampilan ini menyajikan semua proyek dan tugas yang boleh Anda baca.
 ProjectsDesc=Tampilan ini menyajikan semua proyek (izin pengguna Anda memberi Anda izin untuk melihat semuanya).
 TasksOnProjectsDesc=Tampilan ini menyajikan semua tugas pada semua proyek (izin pengguna Anda memberi Anda izin untuk melihat semuanya).
-MyTasksDesc=Pandangan ini terbatas pada proyek atau tugas yang harus Anda hubungi
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Hanya proyek terbuka yang terlihat (proyek dalam konsep atau status tertutup tidak terlihat).
 ClosedProjectsAreHidden=Proyek yang ditutup tidak terlihat.
 TasksPublicDesc=Tampilan ini menyajikan semua proyek dan tugas yang boleh Anda baca.
 TasksDesc=Tampilan ini menyajikan semua proyek dan tugas (izin pengguna Anda memberi Anda izin untuk melihat semuanya).
 AllTaskVisibleButEditIfYouAreAssigned=Semua tugas untuk proyek yang memenuhi syarat terlihat, tetapi Anda dapat memasukkan waktu hanya untuk tugas yang diberikan kepada pengguna yang dipilih. Tetapkan tugas jika Anda perlu memasukkan waktu untuk itu.
-OnlyYourTaskAreVisible=Hanya tugas yang diberikan kepada Anda yang terlihat. Tetapkan tugas untuk diri sendiri jika tidak terlihat dan Anda harus memasukkan waktu untuk itu.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tugas proyek
 ProjectCategories=Tag / kategori proyek
 NewProject=Proyek baru
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Tidak ditugaskan untuk tugas itu
 NoUserAssignedToTheProject=Tidak ada pengguna yang ditugaskan untuk proyek ini
 TimeSpentBy=Waktu yang dihabiskan oleh
 TasksAssignedTo=Tugas yang ditugaskan untuk
-AssignTaskToMe=Tetapkan tugas untuk saya
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Tetapkan tugas ke %s
 SelectTaskToAssign=Pilih tugas untuk ditetapkan ...
 AssignTask=Menetapkan
diff --git a/htdocs/langs/id_ID/recruitment.lang b/htdocs/langs/id_ID/recruitment.lang
index 5609f1d4027..0d786757f5c 100644
--- a/htdocs/langs/id_ID/recruitment.lang
+++ b/htdocs/langs/id_ID/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Terima kasih atas lamaran Anda. <br> ...
 JobClosedTextCandidateFound=Posisi pekerjaan ditutup. Posisi sudah terisi.
 JobClosedTextCanceled=Posisi pekerjaan ditutup.
 ExtrafieldsJobPosition=Atribut pelengkap (posisi pekerjaan)
-ExtrafieldsCandidatures=Atribut pelengkap (lamaran pekerjaan)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Buat sebuah penawaran
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index cb5514d96ea..7c9420900b6 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Apakah Anda yakin ingin memvalidasi pengiriman ini dengan
 ConfirmCancelSending=Anda yakin ingin membatalkan pengiriman ini?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Peringatan, tidak ada produk yang menunggu untuk dikirim.
-StatsOnShipmentsOnlyValidated=Statistik yang dilakukan pada pengiriman hanya divalidasi. Tanggal yang digunakan adalah tanggal validasi pengiriman (tanggal pengiriman yang direncanakan tidak selalu diketahui).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Tanggal pengiriman yang direncanakan
 RefDeliveryReceipt=Kwitansi pengiriman Ref
 StatusReceipt=Tanda terima pengiriman status
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 3c974a5f2eb..3eac8b2c158 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Tidak ada produk yang telah ditentukan untuk objek
 DispatchVerb=Pengiriman
 StockLimitShort=Batas untuk waspada
 StockLimit=Batas stok untuk waspada
-StockLimitDesc=(kosong) berarti tidak ada peringatan. <br> 0 dapat digunakan untuk peringatan segera setelah stok kosong.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Stok fisik
 RealStock=Stok nyata
 RealStockDesc=Stok fisik/nyata adalah stok saat ini di gudang.
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index 0a72eb0f88b..fe2487f1754 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Kata sandi diubah menjadi: %s
 SubjectNewPassword=Kata sandi baru Anda untuk %s
 GroupRights=Izin grup
 UserRights=Izin pengguna
+Credentials=Credentials
 UserGUISetup=Pengaturan Tampilan Pengguna
 DisableUser=Nonaktifkan
 DisableAUser=Nonaktifkan pengguna
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Gunakan bidang Jenis untuk berubah
 OpenIDURL=URL OpenID
 LoginUsingOpenID=Gunakan OpenID untuk masuk
 WeeklyHours=Jam kerja (per minggu)
-ExpectedWorkedHours=Diharapkan jam kerja per minggu
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Warna pengguna
 DisabledInMonoUserMode=Dinonaktifkan dalam mode pemeliharaan
 UserAccountancyCode=Kode akuntansi pengguna
@@ -115,7 +116,7 @@ DateOfEmployment=Tanggal masuk kerja
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Tanggal Akhir Pekerjaan
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Anda tidak dapat menonaktifkan catatan pengguna Anda sendiri
 ForceUserExpenseValidator=Paksa validator laporan pengeluaran
 ForceUserHolidayValidator=Validator permintaan cuti paksa
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index 76842810881..dc29ed1ccc1 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index c88d86a406c..2dbde8a4dba 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index a7fdf70d5f1..57384ba959c 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Öryggi skipulag
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Villa, þessa einingu þarf PHP útgáfa %s  eða hærri
 ErrorModuleRequireDolibarrVersion=Villa, þessa einingu þarf Dolibarr útgáfu %s  eða hærri
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Ekki benda ekki til
 NoActiveBankAccountDefined=Engin virk bankareikning skilgreind
 OwnerOfBankAccount=Eigandi bankareikning %s
 BankModuleNotActive=Bankareikninga mát ekki virkt
-ShowBugTrackLink=Show link "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Þú verður að keyra þessa s
 YourPHPDoesNotHaveSSLSupport=SSL virka ekki í boði í PHP þinn
 DownloadMoreSkins=Fleiri skinn til að sækja
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Algjör þýðing
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index 040391c6a6f..90e03269443 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Frá
 TransferTo=Til að
 TransferFromToDone=A flytja <b>úr %s  í %s  af %s %</b> s hefur verið skráð.
 CheckTransmitter=Sendandi
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank eftirlit
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Hreyfing
 PlannedTransactions=Planned entries
-Graph=Grafík
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Færsla á annan reikning
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Til baka á reikning
 ShowAllAccounts=Sýna allra reikninga
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index a7a13d7f07e..4006e0841ab 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Sláðu inn greiðslu frá viðskiptavini
 EnterPaymentDueToCustomer=Greiða vegna viðskiptavina
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Verð stöð
+PriceBase=Base price
 BillStatus=Invoice stöðu
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Víxill (þarf að vera staðfest)
@@ -454,7 +454,7 @@ RegulatedOn=Skipulegra á
 ChequeNumber=Athugaðu n °
 ChequeOrTransferNumber=Athuga / Flytja n °
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Seðlabanka Athuga
 CheckBank=Athuga
 NetToBePaid=Net til að greiða
diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
index a4b8ba5261f..6b4abf9314a 100644
--- a/htdocs/langs/is_IS/boxes.lang
+++ b/htdocs/langs/is_IS/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Elsta virkir útrunnin þjónustu
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index 244a0b22645..08c287a11a2 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Kvittun
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index d86daa422be..72b0e511780 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=Í
 AddIn=Bæta við í
 modify=breyta
 Classify=Flokka
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 6e0b43dedfa..d009f58a6a2 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s  er þegar til. Veldu annað.
 ErrorSetACountryFirst=Setja í landinu fyrst
 SelectThirdParty=Veldu þriðja aðila
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Eyða tengilið
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Sími
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prófessor í síma
+PhonePro=Bus. phone
 PhonePerso=Pers. Síminn
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Staða
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Áskilið ef þriðji aðili sem viðskiptavinur eða horfur
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect samband
 CompanyDeleted=Fyrirtæki " %s " eytt úr gagnagrunninum.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Opnaðu
 ActivityCeased=Lokað
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Viðskiptavinur / birgir númerið er ókeypis. Þessi k
 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, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index ea24fde663b..8acf657f7c8 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New afsláttur
 NewCheckDeposit=New stöðva afhendingu
 NewCheckDepositOn=Búa til kvittun fyrir innborgun á reikning: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Athugaðu móttöku inntak dagsetningu
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/is_IS/ecm.lang b/htdocs/langs/is_IS/ecm.lang
index e228a4b76d9..a5a8af2bfbd 100644
--- a/htdocs/langs/is_IS/ecm.lang
+++ b/htdocs/langs/is_IS/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 953b11adbb4..f9e154dea41 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s  er rangt
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Innskráning %s  er þegar til.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 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. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Sumir Nauðsynlegir reitir voru ekki fylltir.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Ekki tókst að búa til möppu. Athugaðu að vefþjóninn notandi hefur réttindi til að skrifa inn Dolibarr skjöl skrá. Ef viðfang <b>safe_mode</b> er virkt á þessu PHP, athuga hvort Dolibarr PHP skrár á nú á netþjóninn notandi (eða hóp).
 ErrorNoMailDefinedForThisUser=Nei póstur er skilgreind fyrir þennan notanda
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/is_IS/eventorganization.lang b/htdocs/langs/is_IS/eventorganization.lang
new file mode 100644
index 00000000000..82e905537d8
--- /dev/null
+++ b/htdocs/langs/is_IS/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Drög
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Lokið
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/is_IS/knowledgemanagement.lang b/htdocs/langs/is_IS/knowledgemanagement.lang
new file mode 100644
index 00000000000..17ec9854a75
--- /dev/null
+++ b/htdocs/langs/is_IS/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Um
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Gr
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index 6f2c1d0b683..2bf24e4def1 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Afrita á
 MailToCCUsers=Copy to users(s)
 MailCCC=Geymd afrit til
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Meðfylgjandi skrá
 MailMessage=Email líkami
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index de34867d736..d9c69fa687c 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Próf tengingu
 ToClone=Klóna
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Engin gögn til að afrita skilgreind.
 Of=á
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Action
 About=Um
 Number=Fjöldi
-NumberByMonth=Fjöldi eftir mánuði
+NumberByMonth=Total reports by month
 AmountByMonth=Upphæð eftir mánuði
 Numero=Fjöldi
 Limit=Takmörk
@@ -341,8 +341,8 @@ KiloBytes=Kílóbæti
 MegaBytes=Megabæti
 GigaBytes=Gígabæta
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Með því að
 From=Frá
 FromDate=Frá
 FromLocation=Frá
-at=at
 to=til
 To=til
+ToDate=til
+ToLocation=til
+at=at
 and=og
 or=eða
 Other=Önnur
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Sýna afskipti
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Önnur
 ViewList=Skoða lista
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index c883a16219c..0ebb6eab3a1 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Annar aðili <b>(nafn: %s , tenging:
 ErrorUserPermissionAllowsToLinksToItselfOnly=Af öryggisástæðum verður þú að vera veitt leyfi til að breyta öllum notendum að vera fær um að tengja félagi til notanda sem er ekki þinn.
 SetLinkToUser=Tengill á Dolibarr notanda
 SetLinkToThirdParty=Tengill á Dolibarr þriðja aðila
-MembersCards=Members prenta kort
+MembersCards=Business cards for members
 MembersList=Listi yfir meðlimi
 MembersListToValid=Listi yfir meðlimi drög (verður staðfest)
 MembersListValid=Listi yfir gildar meðlimir
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Meðlimir með áskrift að fá
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Áskrift dagsetningu
 DateEndSubscription=Áskrift lokadagur
-EndSubscription=End áskrift
+EndSubscription=Subscription Ends
 SubscriptionId=Áskrift persónuskilríki
 WithoutSubscription=Without subscription
 MemberId=Aðildarríkin persónuskilríki
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Áskrift krafist
 DeleteType=Eyða
 VoteAllowed=Vote leyfðar
-Physical=Líkamleg
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Notendur tölfræði eftir landi
 MembersStatisticsByState=Notendur tölfræði eftir fylki / hérað
 MembersStatisticsByTown=Notendur tölfræði eftir bænum
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Fjöldi félaga
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Engar fullgiltar meðlimir fundust
-MembersByCountryDesc=Þessi skjár sýnir þér tölfræði á meðlimum með löndum. Grafísk veltur þó á Google netinu línurit þjónustu og er aðeins í boði ef nettengingin er er að vinna.
-MembersByStateDesc=Þessi skjár sýnir þér tölfræði á meðlimum ríkis / héruðum / Canton.
-MembersByTownDesc=Þessi skjár sýnir þér tölfræði á meðlimum með bænum.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Veldu tölfræði sem þú vilt lesa ...
 MenuMembersStats=Tölfræði
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Upplýsingar eru almenningi
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Nýr meðlimur bætt. Beðið eftir samþykki
 NewMemberForm=Nýr meðlimur mynd
-SubscriptionsStatistics=Tölur um áskrift
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Fjöldi áskrifta
-AmountOfSubscriptions=Magn áskrift
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Velta (fyrir fyrirtæki) eða fjárhagsáætlun (um stofnun)
 DefaultAmount=Sjálfgefin magn af áskrift
 CanEditAmount=Gestur geta valið / breyta upphæð áskrift sína
 MEMBER_NEWFORM_PAYONLINE=Stökkva á samþætt netinu greiðslu síðu
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/is_IS/modulebuilder.lang b/htdocs/langs/is_IS/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/is_IS/modulebuilder.lang
+++ b/htdocs/langs/is_IS/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 30613bdb7e5..6c9955da615 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 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=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/is_IS/partnership.lang b/htdocs/langs/is_IS/partnership.lang
new file mode 100644
index 00000000000..7601c9eef1b
--- /dev/null
+++ b/htdocs/langs/is_IS/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Upphafsdagur
+DatePartnershipEnd=Lokadagur
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Drög
+PartnershipAccepted = Accepted
+PartnershipRefused = Neitaði
+PartnershipCanceled = Hætt við
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang
index 6217af6114c..76027ce838f 100644
--- a/htdocs/langs/is_IS/productbatch.lang
+++ b/htdocs/langs/is_IS/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 9edc7be7038..b827b88b299 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Vara
@@ -73,12 +73,12 @@ SellingPrice=Söluverð
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Söluverð (Inc skatt)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Ný verð
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Söluverð er ekki vera lægra en lágmarks leyfð fyrir þessa vöru ( %s  án skatta)
 ContractStatusClosed=Loka
@@ -157,11 +157,11 @@ ListServiceByPopularity=Listi yfir þjónustu við vinsældir
 Finished=Framleiðsla vöru
 RowMaterial=First efni
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Þessi vara er notuð
 NewRefForClone=Tilv. nýrra vara / þjónusta
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Uppruni land
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 72e7c2c3466..11e10b08977 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project tengiliðir
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Öll verkefni
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 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.
 ProjectsPublicTaskDesc=Þetta sýnir öll verkefni og verkefni sem þú ert að fá að lesa.
 ProjectsDesc=Þetta sýnir öll verkefni (notandi heimildir veita þér leyfi til að skoða allt).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Þetta sýnir öll verkefni og verkefni sem þú ert að fá að lesa.
 TasksDesc=Þetta sýnir öll verkefni og verkefni (notandi heimildir veita þér leyfi til að skoða allt).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=Ný verkefni
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/is_IS/recruitment.lang b/htdocs/langs/is_IS/recruitment.lang
index 411fc152c09..6384b03ad8f 100644
--- a/htdocs/langs/is_IS/recruitment.lang
+++ b/htdocs/langs/is_IS/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang
index 9bb3e783a22..17499644ca0 100644
--- a/htdocs/langs/is_IS/sendings.lang
+++ b/htdocs/langs/is_IS/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 líkan
 WarningNoQtyLeftToSend=Aðvörun, að engar vörur sem bíður sendar.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index 7f6f5d25511..101a5559a60 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Engar fyrirfram skilgreindum vörum fyrir þennan
 DispatchVerb=Senda
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real lager
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index 4106e08f75c..ae276fcf4a9 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Lykilorð breytt í: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group heimildir
 UserRights=Notandi heimildir
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Slökkva
 DisableAUser=Slökkva notanda
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index 9b1431a77d8..a1dbad88c58 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/it_CH/accountancy.lang b/htdocs/langs/it_CH/accountancy.lang
new file mode 100644
index 00000000000..4dbdd035d6e
--- /dev/null
+++ b/htdocs/langs/it_CH/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
diff --git a/htdocs/langs/it_CH/admin.lang b/htdocs/langs/it_CH/admin.lang
index 619ae5f8bd4..c1d306ec390 100644
--- a/htdocs/langs/it_CH/admin.lang
+++ b/htdocs/langs/it_CH/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/it_CH/cron.lang b/htdocs/langs/it_CH/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/it_CH/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/it_CH/modulebuilder.lang b/htdocs/langs/it_CH/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/it_CH/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index a15261e9558..c7140344a32 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Riferimento
 LabelAccount=Etichetta conto
 LabelOperation=Etichetta operazione
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Codice impressioni
 Lettering=Impressioni
 Codejournal=Giornale
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=Lista di prodotti non collegati a nessun piano dei conti
 ChangeBinding=Cambia il piano dei conti
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Mostra tutorial
 NotReconciled=Non conciliata
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 0c18bd7788e..6ca4c40f1ca 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Impostazioni per la sicurezza
 PHPSetup=PHP setup
+OSSetup=OS setup
 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
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Non suggerire
 NoActiveBankAccountDefined=Nessun conto bancario attivo definito
 OwnerOfBankAccount=Titolare del conto bancario %s
 BankModuleNotActive=Modulo conti bancari non attivato
-ShowBugTrackLink=Mostra link "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Avvisi e segnalazioni
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=È necessario eseguire questo c
 YourPHPDoesNotHaveSSLSupport=Il PHP del server non supporta SSL
 DownloadMoreSkins=Scarica altre skin
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Nei documenti mostra identità professionale completa di:
 ShowVATIntaInAddress=Nascondi il numero di partita IVA intracomunitaria negli indirizzi
 TranslationUncomplete=Traduzione incompleta
@@ -2033,7 +2035,7 @@ ECMAutoTree=Show automatic ECM tree
 OperationParamDesc=Definire i valori da utilizzare per l'oggetto dell'azione o come estrarre i valori. Ad esempio: <br> objproperty1=SET: il valore per impostare <br> objproperty2=SET: un valore con la sostituzione di __objproperty1__ <br> objproperty3=SETIFEMPTY: valore usato se objproperty3 non è già pronto <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY: Il nome della mia azienda è\\s([^\\s]*)Usa il carattere ; come separatore per estrarre o impostare diverse proprietà.
 OpeningHours=Orari di apertura
 OpeningHoursDesc=Inserisci gli orari di apertura regolare della tua azienda.
-ResourceSetup=Configuration of Resource module
+ResourceSetup=Configurazione del modulo Risorse
 UseSearchToSelectResource=Utilizza il form di ricerca per scegliere una risorsa (invece della lista a tendina)
 DisabledResourceLinkUser=Disattiva funzionalità per collegare una risorsa agli utenti
 DisabledResourceLinkContact=Disattiva funzionalità per collegare una risorsa ai contatti
@@ -2062,7 +2064,7 @@ UseDebugBar=Usa la barra di debug
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index b665c67accb..5be72019d50 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Pagamento delle imposte sociali/fiscali
 BankTransfer=Bonifico bancario
 BankTransfers=Bonifici
 MenuBankInternalTransfer=Trasferimento interno
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Da
 TransferTo=A
 TransferFromToDone=È stato registrato un trasferimento da <b> %s </b> a <b> %s </b> di <b> %s </b> %s.
-CheckTransmitter=Ordinante
+CheckTransmitter=Mittente
 ValidateCheckReceipt=Convalidare questa ricevuta ?
-ConfirmValidateCheckReceipt=Vuoi davvero convalidare questa ricevuta? Non sarà possibile fare cambiamenti una volta convalidata.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Eliminare questa ricevuta?
 ConfirmDeleteCheckReceipt=Vuoi davvero eliminare questa ricevuta?
 BankChecks=Assegni bancari
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Vuoi davvero eliminare questa transazione?
 ThisWillAlsoDeleteBankRecord=Questa operazione elimina anche le transazioni bancarie generate
 BankMovements=Movimenti
 PlannedTransactions=Transazioni pianificate
-Graph=Grafico
+Graph=Graphs
 ExportDataset_banque_1=Movimenti bancari e di cassa e loro rilevazioni
 ExportDataset_banque_2=Modulo di versamento
 TransactionOnTheOtherAccount=Transazione sull'altro conto
@@ -142,7 +142,7 @@ AllAccounts=Tutte le banche e le casse
 BackToAccount=Torna al conto
 ShowAllAccounts=Mostra per tutti gli account
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Seleziona gli assegni da includere nella ricevuta di versamento e clicca su "Crea".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Scegliere l'estratto conto collegato alla conciliazione. Utilizzare un valore numerico ordinabile: AAAAMM o AAAAMMGG
 EventualyAddCategory=Infine, specificare una categoria in cui classificare i record
 ToConciliate=Da conciliare?
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index f4e57625340..63f6ef3b167 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Inserisci il pagamento ricevuto dal cliente
 EnterPaymentDueToCustomer=Emettere il pagamento dovuto al cliente
 DisabledBecauseRemainderToPayIsZero=Disabilitato perché il restante da pagare vale zero
-PriceBase=Prezzo base
+PriceBase=Base price
 BillStatus=Stato fattura
 StatusOfGeneratedInvoices=Stato delle fatture generate
 BillStatusDraft=Bozza (deve essere convalidata)
@@ -454,7 +454,7 @@ RegulatedOn=Regolamentato su
 ChequeNumber=Assegno N°
 ChequeOrTransferNumber=Assegno/Bonifico N°
 ChequeBordereau=Controlla programma
-ChequeMaker=Traente dell'assegno
+ChequeMaker=Check/Transfer sender
 ChequeBank=Banca emittente
 CheckBank=Controllo
 NetToBePaid=Netto a pagare
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index 111b2988d7b..7ebe2e30d74 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Segnalibri: ultimi %s modificati
 BoxOldestExpiredServices=Servizi scaduti da più tempo ancora attivi
 BoxLastExpiredServices=Ultimi %s contatti con servizi scaduti ancora attivi
 BoxTitleLastActionsToDo=Ultime %s azioni da fare
-BoxTitleLastContracts=Ultimi %s contratti modificati
-BoxTitleLastModifiedDonations=Ultime %s donazioni modificate
-BoxTitleLastModifiedExpenses=Ultime %s note spese modificate
-BoxTitleLatestModifiedBoms=Ultime %s distinte componenti modificate
-BoxTitleLatestModifiedMos=Ultimi %s ordini di produzione modificati
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Clienti con il massimo in sospeso superato
 BoxGlobalActivity=Attività generale (fatture, proposte, ordini)
 BoxGoodCustomers=Buoni clienti
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index b8069c4f189..fd00a01dd8c 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Ricevuta
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Raggruppa l'IVA per aliquota in biglietti / ricevute
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=La fattura è già stata convalidata
 NoLinesToBill=No lines to bill
 CustomReceipt=Ricevuta personalizzata
 ReceiptName=Nome ricevuta
-ProductSupplements=Prodotti di supplemento
+ProductSupplements=Manage supplements of products
 SupplementCategory=Categorie di supplemento
 ColorTheme=Colore del tema
 Colorful=Colorato
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Stampa di ricevute semplice e facile. Solo pochi parametri per configurare la ricevuta. Stampa tramite browser.
 TakeposConnectorMethodDescription=Modulo esterno con funzionalità extra. Possibilità di stampare dal cloud.
 PrintMethod=Metodo di stampa
-ReceiptPrinterMethodDescription=Metodo potente con molti parametri. Completamente personalizzabile con modelli. Impossibile stampare dal cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=Da terminale
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Modulo di numerazione per vendite POS
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index f3d7cf290e0..a0264b7d450 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Categoria
 Rubriques=Tag/Categorie
 RubriquesTransactions=Tag / Categorie di operazioni
 categories=tag/categorie
-NoCategoryYet=Nessuna tag/categoria di questo tipo creata
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Aggiungi a
 modify=modifica
 Classify=Classifica
 CategoriesArea=Area tag/categorie
-ProductsCategoriesArea=Area categorie/tag prodotti/servizi
-SuppliersCategoriesArea=Area tag/categorie fornitori
-CustomersCategoriesArea=Area tag/categorie clienti
-MembersCategoriesArea=Area tag/categorie membri
-ContactsCategoriesArea=Area tag/categorie contatti
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Area tag/categorie progetti
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categorie
 CatList=Lista delle tag/categorie
 CatListAll=Elenco di tag / categorie (tutti i tipi)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Pagina-Contenitore delle Categorie
-UseOrOperatorForCategories=Uso o operatore per le categorie
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 8bbcf4e6bab..a444f3b217b 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=La società %s esiste già. Scegli un altro nome.
 ErrorSetACountryFirst=Imposta prima il paese
 SelectThirdParty=Seleziona un soggetto terzo
-ConfirmDeleteCompany=Vuoi davvero cancellare questa società e tutte le informazioni relative?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Elimina un contatto/indirizzo
-ConfirmDeleteContact=Vuoi davvero eliminare questo contatto e tutte le informazioni connesse?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Nuovo soggetto terzo
 MenuNewCustomer=Nuovo cliente
 MenuNewProspect=Nuovo cliente potenziale
@@ -69,7 +69,7 @@ PhoneShort=Telefono
 Skype=Skype
 Call=Chiamata
 Chat=Chat
-PhonePro=Telefono uff.
+PhonePro=Bus. phone
 PhonePerso=Telefono pers.
 PhoneMobile=Cellulare
 No_Email=Rifiuta email di massa
@@ -78,7 +78,7 @@ Zip=CAP
 Town=Città
 Web=Sito web
 Poste= Posizione
-DefaultLang=Lingua predefinita
+DefaultLang=Lingua predefinita (codice lingua)
 VATIsUsed=Utilizza imposte sulle vendite
 VATIsUsedWhenSelling=Questo definisce se questa terza parte include una imposta di vendita o meno quando emette una fattura ai propri clienti
 VATIsNotUsed=L'imposta sulle vendite non viene utilizzata
@@ -331,7 +331,7 @@ CustomerCodeDesc=Codice cliente, univoco
 SupplierCodeDesc=Codice fornitore, unico per tutti i fornitori
 RequiredIfCustomer=Obbligatorio se il soggetto terzo è un cliente o un cliente potenziale
 RequiredIfSupplier=Obbligatorio se il soggetto terzo è un fornitore
-ValidityControledByModule=Validità controllata dal modulo
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Regole per questo modulo
 ProspectToContact=Cliente potenziale da contattare
 CompanyDeleted=Società %s cancellata dal database.
@@ -439,12 +439,12 @@ ListSuppliersShort=Elenco fornitori
 ListProspectsShort=Elenco dei clienti potenziali
 ListCustomersShort=Elenco dei clienti
 ThirdPartiesArea=Anagrafiche soggetti terzi e contatti
-LastModifiedThirdParties=Ultimi %s Soggetti Terzi modificati
-UniqueThirdParties=Totale soggetti terzi
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=In attività
 ActivityCeased=Cessata attività
 ThirdPartyIsClosed=Chiuso
-ProductsIntoElements=Elenco dei prodotti/servizi in %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Fatture scadute
 OutstandingBill=Max. fattura in sospeso
 OutstandingBillReached=Raggiunto il massimo numero di fatture scadute
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Codice cliente/fornitore libero. Questo codice può esser
 ManagingDirectors=Nome Manager(s) (CEO, direttore, presidente...)
 MergeOriginThirdparty=Duplica soggetto terzo (soggetto terzo che stai eliminando)
 MergeThirdparties=Unisci soggetti terzi
-ConfirmMergeThirdparties=Sei sicuro che vuoi unire questo soggetto terzo in quello corrente? Tutti gli oggetti collegati (fatture, ordini, ...) saranno spostati al soggetto terzo corrente, poi il soggetto terzo verrà eliminato.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Terze parti sono state unite
 SaleRepresentativeLogin=Login del rappresentante commerciale
 SaleRepresentativeFirstname=Nome del commerciale
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 0ef1e6a1a0c..83a9dd57b4e 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Nuovo sconto
 NewCheckDeposit=Nuovo deposito
 NewCheckDepositOn=Nuovo deposito sul conto: %s
 NoWaitingChecks=Nessun assegno in attesa di deposito.
-DateChequeReceived=Data di ricezione assegno
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Paga tassa/contributo
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
index d08a079e0d9..25d10f0b925 100644
--- a/htdocs/langs/it_IT/ecm.lang
+++ b/htdocs/langs/it_IT/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=File Ecm campi extra
 ExtraFieldsEcmDirectories=Directory Ecm campi extra
 ECMSetup=Configurazione ECM
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 9841a0c1b03..af3f97876fa 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Nessun errore, committiamo
 # Errors
 ErrorButCommitIsDone=Sono stati trovati errori ma si convalida ugualmente
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=L'URL %s è sbagliato
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=L'utente %s esiste già.
@@ -46,8 +46,8 @@ ErrorWrongDate=La data non è corretta!
 ErrorFailedToWriteInDir=Impossibile scrivere nella directory %s
 ErrorFoundBadEmailInFile=Sintassi email errata nelle righe %s del file (ad esempio alla riga %s con email = %s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Mancano alcuni campi obbligatori.
-ErrorSubjectIsRequired=Il titolo della email è obbligatorio
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject 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
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/it_IT/eventorganization.lang b/htdocs/langs/it_IT/eventorganization.lang
new file mode 100644
index 00000000000..a7de633650b
--- /dev/null
+++ b/htdocs/langs/it_IT/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Impostazioni
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Assegno circolare
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Fatte
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/it_IT/knowledgemanagement.lang b/htdocs/langs/it_IT/knowledgemanagement.lang
new file mode 100644
index 00000000000..1f9666b329a
--- /dev/null
+++ b/htdocs/langs/it_IT/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Impostazioni
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Info
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Articolo
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index f6a0cc2c0a4..16a6fb13e21 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copia carbone (CC)
 MailToCCUsers=In copia gli utenti
 MailCCC=Copia carbone cache (CCC)
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Testo
 MailFile=Allegati
 MailMessage=Testo dell'email
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=Non sono previste notifiche e-mail automatiche per que
 ANotificationsWillBeSent=Verrà inviata una notifica tramite email
 SomeNotificationsWillBeSent=le %s notifiche automatiche verranno inviate tramite e-mail
 AddNewNotification=Iscriviti a una nuova notifica e-mail automatica (target / evento)
-ListOfActiveNotifications=Elenca tutti gli abbonamenti attivi (obiettivi / eventi) per la notifica e-mail automatica
-ListOfNotificationsDone=Elenco delle notifiche email automatiche inviate
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=La configurazione della posta elettronica di invio è stata impostata alla modalità '%s'. Questa modalità non può essere utilizzata per inviare mail di massa.
 MailSendSetupIs2=Con un account da amministratore è necessario cliccare su %sHome -> Setup -> EMails%s e modificare il parametro <strong>'%s'</strong> per usare la modalità '%s'. Con questa modalità è possibile inserire i dati del server SMTP di elezione e usare Il "Mass Emailing"
 MailSendSetupIs3=Se hai domande su come configurare il tuo server SMTP chiedi a %s.
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 839b58d9f6c..c81f5fa21a9 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Salva e nuovo
 TestConnection=Test connessione
 ToClone=Clonare
 ConfirmCloneAsk=Sei sicuro di voler clonare l'oggetto <b> %s </b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Dati da clonare non definiti
 Of=di
 Go=Vai
@@ -246,7 +246,7 @@ DefaultModel=Modello predefinito
 Action=Azione
 About=About
 Number=Numero
-NumberByMonth=Numero per mese
+NumberByMonth=Total reports by month
 AmountByMonth=Importo per mese
 Numero=Numero
 Limit=Limite
@@ -341,8 +341,8 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Utente della creazione
-UserModif=Utente dell'ultimo aggiornamento
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Per
 From=Da
 FromDate=Da
 FromLocation=A partire dal
-at=at
 to=a
 To=a
+ToDate=a
+ToLocation=a
+at=at
 and=e
 or=o
 Other=Altro
@@ -843,7 +845,7 @@ XMoreLines=%s linea(e) nascoste
 ShowMoreLines=Mostra più/meno righe
 PublicUrl=URL pubblico
 AddBox=Aggiungi box
-SelectElementAndClick=Seleziona un elemento e clicca %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Stampa il file %s
 ShowTransaction=Mostra entrate conto bancario
 ShowIntervention=Mostra intervento
@@ -854,8 +856,8 @@ Denied=Rifiutata
 ListOf=Lista di %s
 ListOfTemplates=Elenco dei modelli
 Gender=Genere
-Genderman=Uomo
-Genderwoman=Donna
+Genderman=Male
+Genderwoman=Female
 Genderother=Altro
 ViewList=Vista elenco
 ViewGantt=Visualizzazione Gantt
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index a4e6d97dacb..28779a99cf2 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un altro membro (nome: <b>%s</b>, log
 ErrorUserPermissionAllowsToLinksToItselfOnly=Per motivi di sicurezza, è necessario possedere permessi di modifica di tutti gli utenti per poter modificare un membro diverso da sé stessi.
 SetLinkToUser=Link a un utente Dolibarr
 SetLinkToThirdParty=Link ad un soggetto terzo
-MembersCards=Schede membri
+MembersCards=Business cards for members
 MembersList=Elenco dei membri
 MembersListToValid=Elenco dei membri del progetto (da convalidare)
 MembersListValid=Elenco dei membri validi
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Membri con adesione da riscuotere
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Data di adesione
 DateEndSubscription=Data fine adesione
-EndSubscription=Scadenza adesione
+EndSubscription=Subscription Ends
 SubscriptionId=Id adesione
 WithoutSubscription=Without subscription
 MemberId=ID
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=E' richiesta l'adesione
 DeleteType=Elimina
 VoteAllowed=E' permesso il voto
-Physical=Fisica
-Moral=Giuridica
-MorAndPhy=Moral and Physical
-Reenable=Riattivare
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Statistiche per paese
 MembersStatisticsByState=Statistiche per stato/provincia
 MembersStatisticsByTown=Statistiche per città
 MembersStatisticsByRegion=Statistiche membri per regioni
-NbOfMembers=Numero di membri
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Nessun membro convalidato trovato
-MembersByCountryDesc=Questa schermata mostra le statistiche dei membri per paese. Il grafico dipende da servizi online di Google ed è disponibile solo se il server può connettersi ad internet.
-MembersByStateDesc=Questa schermata mostra le statistiche sui membri per stato/provincia/cantone.
-MembersByTownDesc=Questa schermata mostra le statistiche sui membri per città.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Scegli quali statistiche visualizzare...
 MenuMembersStats=Statistiche
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Data della sottoscrizione più recente
-MemberNature=Natura del membro
-MembersNature=Nature of members
-Public=Pubblico
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Nuovo membro aggiunto. In attesa di approvazione
 NewMemberForm=Nuova modulo membri
-SubscriptionsStatistics=Statistiche adesioni
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Numero di adesioni
-AmountOfSubscriptions=Importo delle affiliazioni
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Giro d'affari (aziende) o Budget (fondazione)
 DefaultAmount=Quota di adesione predefinita
 CanEditAmount=I visitatori possono scegliere/modificare l'ammontare della propria quota
 MEMBER_NEWFORM_PAYONLINE=Saltate sulla integrato pagina di pagamento online
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=Questa schermata mostra le statistiche dei membri per natura
-MembersByRegion=Questa schermata mostra le statistiche dei membri per regione
 VATToUseForSubscriptions=Aliquota IVA in uso per le sottoscrizioni
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Prodotto utilizzato per la riga dell'abbonamento in fattura: %s
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index 1dfd74bba94..e3d7681659e 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=Vedi esempi qui
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Il campo è visibile? (Esempi: 0 = Mai visibile, 1 = Visibile su elenco e crea / aggiorna / visualizza moduli, 2 = Visibile solo su elenco, 3 = Visibile solo su crea / aggiorna / visualizza modulo (non elenco), 4 = Visibile su elenco e aggiorna / visualizza solo modulo (non crea), 5 = Visibile solo sul modulo di visualizzazione fine elenco (non crea, non aggiorna). <br> <br> L'uso di un valore negativo significa che il campo non è mostrato per impostazione predefinita nell'elenco ma può essere selezionato per la visualizzazione). <br> <br> Può essere un'espressione, ad esempio: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Visualizza questo campo sui documenti PDF compatibili, puoi gestire la posizione con il campo "Posizione". <br/> Attualmente, noti modelli compatibili PDF sono: Eratostene (ordine), espadon (nave), spugna (fatture), ciano (PROPAL / citazione), cornas (ordine a fornitore) <br/> <br/> <strong> per il documento: </strong> <br/> 0 = non visualizzato <br/> 1 = visualizza <br/> 2 = visualizza solo se non vuota <br/> <br/> <strong> Per linee documenti: </strong> <br/> 0 = non visualizzato <br/> 1 = visualizzati in colonna <br/> 3 = visualizzazione nella descrizione di linea di colonna dopo la descrizione <br/> 4 = visualizzazione nella descrizione di colonna dopo la descrizione solo se non vuota
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Mostra sul PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Il campo è utilizzato per effettuare una ricerca dallo strumento di ricerca rapida? (Esempi: 1 o 0)
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index de5e093c618..e15078b0543 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Per usare questa opzione bisogna installare o abilitare la l
 ProfIdShortDesc=<b>Prof ID %s</b> è un dato dipendente dal paese terzo.<br/> Ad esempio, per il <b>paese %s,</b> è il <b>codice %s.</b>
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistiche per somma della quantità di prodotti / servizi
-StatsByNumberOfEntities=Statistiche in numero di entità referenti (n. di fatture o ordini ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Numero di preventivi
 NumberOfCustomerOrders=Numero di ordini cliente
 NumberOfCustomerInvoices=Numero di ordini fornitore
@@ -289,4 +289,4 @@ PopuProp=Prodotti / servizi per popolarità nelle proposte
 PopuCom=Prodotti / servizi per popolarità negli ordini
 ProductStatistics=Statistiche sui prodotti / servizi
 NbOfQtyInOrders=Qtà in ordini
-SelectTheTypeOfObjectToAnalyze=Seleziona il tipo di oggetto da analizzare...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/it_IT/partnership.lang b/htdocs/langs/it_IT/partnership.lang
new file mode 100644
index 00000000000..a9a2846284c
--- /dev/null
+++ b/htdocs/langs/it_IT/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Data di inizio
+DatePartnershipEnd=Data di fine
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Assegno circolare
+PartnershipAccepted = Accettata
+PartnershipRefused = Rifiutato
+PartnershipCanceled = Annullata
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
index 805186c19ab..cbb3183e28a 100644
--- a/htdocs/langs/it_IT/productbatch.lang
+++ b/htdocs/langs/it_IT/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 3a648b2422a..b65ba7eccbd 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Servizi solo vendibili
 ServicesOnPurchaseOnly=Servizi solo acquistabili
 ServicesNotOnSell=Servizi non vendibili nè acquistabili
 ServicesOnSellAndOnBuy=Servizi vendibili ed acquistabili
-LastModifiedProductsAndServices=Ultimi %s prodotti / servizi modificati 
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Ultimi %s prodotti registrati
 LastRecordedServices=Ultimi %s servizi registrati
 CardProduct0=Prodotto
@@ -73,12 +73,12 @@ SellingPrice=Prezzo di vendita
 SellingPriceHT=Prezzo di vendita (al netto delle imposte)
 SellingPriceTTC=Prezzo di vendita (inclusa IVA)
 SellingMinPriceTTC=Prezzo minimo di vendita (tasse incluse)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Questo valore può essere utilizzato per il calcolo del margine.
 SoldAmount=Quantità venduta
 PurchasedAmount=Quantità acquistata
 NewPrice=Nuovo prezzo
-MinPrice=Prezzo minimo di vendita
+MinPrice=Min. selling price
 EditSellingPriceLabel=Modifica l'etichetta del prezzo di vendita
 CantBeLessThanMinPrice=Il prezzo di vendita non può essere inferiore al minimo consentito per questo prodotto ( %s IVA esclusa)
 ContractStatusClosed=Chiuso
@@ -157,11 +157,11 @@ ListServiceByPopularity=Elenco dei servizi per popolarità
 Finished=Prodotto creato
 RowMaterial=Materia prima
 ConfirmCloneProduct=Vuoi davvero clonare il prodotto / servizio <b> %s </b>?
-CloneContentProduct=Clona tutte le principali informazioni del prodotto/servizio
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clona prezzi
-CloneCategoriesProduct=Clona tag / categorie collegate
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clona varianti di prodotto
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Questo prodotto è in uso
 NewRefForClone=Rif. del nuovo prodotto/servizio
 SellingPrices=Prezzi di vendita
@@ -170,12 +170,12 @@ CustomerPrices=Prezzi di vendita
 SuppliersPrices=Prezzi fornitore
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=codice Customs|Commodity|HS
-CountryOrigin=Paese di origine
-RegionStateOrigin=Origine della regione
-StateOrigin=Stato | Provincia provenienza 
-Nature=Natura del prodotto (materiale / finito)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Natura del prodotto
-NatureOfProductDesc=Materia prima o prodotto finito
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Etichetta breve
 Unit=Unità
 p=u.
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 315dbd04e4a..1a62a42e4b9 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Contatti del progetto
 ProjectsImContactFor=Progetti per i quali sono esplicitamente un contatto
 AllAllowedProjects=Tutti i progetti che posso vedere (miei + pubblici)
 AllProjects=Tutti i progetti
-MyProjectsDesc=La vista è limitata ai progetti di cui tu sei un contatto.
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Questa visualizzazione mostra tutti i progetti che sei autorizzato a vedere.
 TasksOnProjectsPublicDesc=Questa vista presenta tutte le attività nei progetti su cui tu sei abilitato a leggere.
 ProjectsPublicTaskDesc=Questa prospettiva presenta tutti i progetti e le attività a cui è permesso accedere.
 ProjectsDesc=Questa visualizzazione mostra tutti i progetti (hai i privilegi per vedere tutto).
 TasksOnProjectsDesc=Questa visualizzazione mostra tutti i compiti di ogni progetto (hai i privilegi per vedere tutto).
-MyTasksDesc=Questa visualizzazione è limitata ai progetti o alle attività di cui tu sei un contatto
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Sono visibili solamente i progetti aperti (i progetti con stato di bozza o chiusi non sono visibili).
 ClosedProjectsAreHidden=I progetti chiusi non sono visibili.
 TasksPublicDesc=Questa visualizzazione mostra tutti i progetti e i compiti che hai il permesso di vedere.
 TasksDesc=Questa visualizzazione mostra tutti i progetti e i compiti (hai i privilegi per vedere tutto).
 AllTaskVisibleButEditIfYouAreAssigned=Tutte le attività dei progetti validati sono visibili, ma puoi inserire le ore solo nelle attività assegnate all'utente selezionato. Assegna delle attività se hai bisogno di inserirci all'interno delle ore.
-OnlyYourTaskAreVisible=Solo i compiti assegnati a te sono visibili. Assegna a te stesso il compito se vuoi allocarvi tempo lavorato.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Compiti dei progetti
 ProjectCategories=Tag/Categorie Progetti
 NewProject=Nuovo progetto
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Risorsa non assegnata all'attività
 NoUserAssignedToTheProject=Nessun utente assegnato a questo progetto
 TimeSpentBy=Tempo impiegato da
 TasksAssignedTo=Attività assegnata a
-AssignTaskToMe=Assegnare un compito a me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assegnata attività a %s
 SelectTaskToAssign=Seleziona attività da a assegnare...
 AssignTask=Assegnare
diff --git a/htdocs/langs/it_IT/recruitment.lang b/htdocs/langs/it_IT/recruitment.lang
index b8e37753ea4..83194566a93 100644
--- a/htdocs/langs/it_IT/recruitment.lang
+++ b/htdocs/langs/it_IT/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index d902ac9d0f6..4b93f8cf9dc 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Sei sicuro di voler convalidare questa spedizioni con il
 ConfirmCancelSending=Sei sicuro di voler eliminar questa spedizione?
 DocumentModelMerou=Merou modello A5
 WarningNoQtyLeftToSend=Attenzione, non sono rimasti prodotti per la spedizione.
-StatsOnShipmentsOnlyValidated=Statistiche calcolate solo sulle spedizioni convalidate. La data è quella di conferma spedizione (la data di consegna prevista non è sempre conosciuta).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Data prevista di consegna
 RefDeliveryReceipt=Rif. ricevuta di consegna
 StatusReceipt=Stato ricevuta di consegna
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 161a6eea248..9a7054eef8a 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti predefiniti. Qu
 DispatchVerb=Ricezione
 StockLimitShort=Limite per segnalazioni
 StockLimit=Limite minimo scorte (per gli avvisi)
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Scorte fisiche
 RealStock=Scorte reali
 RealStockDesc=Scorte fisiche/reali è la giacenza attualmente nei magazzini.\n
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index cc86bc427f5..4bf6fa34a41 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password cambiata a: %s
 SubjectNewPassword=La tua nuova password per %s
 GroupRights=Autorizzazioni del gruppo
 UserRights=Autorizzazioni utente
+Credentials=Credentials
 UserGUISetup=Impostazioni grafiche 
 DisableUser=Disattiva
 DisableAUser=Disattiva un utente
@@ -105,7 +106,7 @@ UseTypeFieldToChange=cambia usando il campo Tipo
 OpenIDURL=URL OpenID
 LoginUsingOpenID=URL OpenID per il login
 WeeklyHours=Ore lavorate (per settimana)
-ExpectedWorkedHours=Ore lavorative ideali per settimana
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Colore dell'utente
 DisabledInMonoUserMode=Disabilitato in modalità manutenzione
 UserAccountancyCode=Codice contabile utente
@@ -115,7 +116,7 @@ DateOfEmployment=Data di assunzione
 DateEmployment=Dipendente
 DateEmploymentstart=Data di assunzione
 DateEmploymentEnd=Data di fine rapporto lavorativo
-RangeOfLoginValidity=Intervallo di date di validità dell'accesso
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Forza validatore rapporto spese
 ForceUserHolidayValidator=Convalida richiesta di congedo forzato
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index b6762895710..ac41f055411 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Definisce l'elenco di tutte le lingu
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 3a11fa8d804..027dd200717 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -202,7 +202,7 @@ Docref=参照
 LabelAccount=ラベル科目
 LabelOperation=ラベル操作
 Sens=方向
-AccountingDirectionHelp=顧客の会計科目の場合、貸方を使用して受け取った支払いを記録する。<br>仕入先の会計科目の場合、借方を使用して支払いを記録する。
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=レタリングコード
 Lettering=レタリング
 Codejournal=仕訳帳
@@ -297,7 +297,7 @@ NoNewRecordSaved=仕訳帳化するレコードはもうない
 ListOfProductsWithoutAccountingAccount=会計科目にバインドされていない製品のリスト
 ChangeBinding=紐付を変更する
 Accounted=元帳に計上
-NotYetAccounted=元帳にはまだ計上されていない
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=チュートリアルを表示
 NotReconciled=調整されていない
 WarningRecordWithoutSubledgerAreExcluded=警告、補助元帳アカウントが定義されていないすべての操作はフィルタリングされ、このビューから除外される
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 0cfbdae5f0d..d2db717850b 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -30,7 +30,7 @@ SessionSaveHandler=セッションを保存するためのハンドラ
 SessionSavePath=セッション保存位置
 PurgeSessions=セッションのパージ
 ConfirmPurgeSessions=本当にすべてのセッションを削除するか？これにより、すべてのユーザ ( 自分を除く ) が切断される。
-NoSessionListWithThisHandler=PHPで構成された保存セッションハンドラーでは、すべての実行中セッションを一覧表示できない。
+NoSessionListWithThisHandler=PHPで構成された保存セッションハンドラでは、すべての実行中セッションを一覧表示できない。
 LockNewSessions=新規接続をロック
 ConfirmLockNewSessions=新規Dolibarr接続を自分自身に制限してもよいか？ユーザ<b> %s</b>のみが接続できることになる。
 UnlockNewSessions=接続ロックを解除する
@@ -59,11 +59,12 @@ UploadNewTemplate=新規テンプレート(s)をアップロード
 FormToTestFileUploadForm=ファイルのアップロードをテストするために形成する ( 設定に応じて ) 
 ModuleMustBeEnabled=モジュール/アプリケーション<b>%s</b>を有効にする必要がある
 ModuleIsEnabled=モジュール/アプリケーション<b>%s</b>が有効になった
-IfModuleEnabled=注：【はい】は、モジュールの<b>%sが</b>有効<b>になっ</b>ている場合にのみ有効 
+IfModuleEnabled=注：【はい】が利用可能なのは、モジュール<b>%s</b>の有効時のみ 
 RemoveLock=ファイル<b>%s </b>が存在する場合、それを削除/改名することで、更新/インストール のツールが使用可能になる。
 RestoreLock=ファイル<b>%s </b>を読取権限のみで復元すると、これ以上の更新/インストール のツール使用が不可になる。
 SecuritySetup=セキュリティの設定
 PHPSetup=PHPのセットアップ
+OSSetup=OS setup
 SecurityFilesDesc=ファイルのアップロードに関するセキュリティ関連オプションをここで定義。
 ErrorModuleRequirePHPVersion=エラー、このモジュールは、PHPのバージョン%s以上が必要 
 ErrorModuleRequireDolibarrVersion=エラー、このモジュールはDolibarrバージョン%s以上が必要 
@@ -81,7 +82,7 @@ DelaiedFullListToSelectContact= キーが押されるまで待ち、取引先コ
 NumberOfKeyToSearch=検索をトリガーする文字数：%s
 NumberOfBytes=バイト数
 SearchString=検索文字列
-NotAvailableWhenAjaxDisabled=Ajaxが無効になったときには使用できない
+NotAvailableWhenAjaxDisabled=Ajax無効時には使用不可
 AllowToSelectProjectFromOtherCompany=取引先のドキュメントで、別の取引先にリンクされているプロジェクトを選択できる
 JavascriptDisabled=JavaScript無効
 UsePreviewTabs=プレビュータブを使用
@@ -98,7 +99,7 @@ Index=インデックス
 Mask=マスク
 NextValue=次の値
 NextValueForInvoices=次の値 ( 請求書 ) 
-NextValueForCreditNotes=次の値 ( クレジットメモ ) 
+NextValueForCreditNotes=次の値 ( 貸方票 ) 
 NextValueForDeposit=次の値 ( 頭金 ) 
 NextValueForReplacements=次の値 ( 置換 ) 
 MustBeLowerThanPHPLimit=注：現在、PHP構成では、このパラメーターの値に関係なく、アップロードの最大ファイルサイズが<b> %s </b>%sに制限されている。
@@ -540,7 +541,7 @@ Module23Desc=エネルギーの消費量を監視する
 Module25Name=受注
 Module25Desc=受注管理
 Module30Name=請求書
-Module30Desc=顧客の請求書とクレジットノートの管理。サプライヤーの請求書とクレジットノートの管理
+Module30Desc=顧客の請求書と貸方票の管理。サプライヤーの請求書と貸方票の管理
 Module40Name=仕入先s
 Module40Desc=仕入先と購入管理 ( 発注書とサプライヤーの請求書の請求 ) 
 Module42Name=デバッグログ
@@ -650,7 +651,7 @@ Module3400Desc=ソーシャルネットワークフィールドを取引先と
 Module4000Name=HRM
 Module4000Desc=人事管理 ( 部門の管理、従業員の契約と感情 ) 
 Module5000Name=マルチ法人
-Module5000Desc=あなたが複数の企業を管理することができる
+Module5000Desc=複数の企業を管理できます
 Module6000Name=モジュール間ワークフロー
 Module6000Desc=異なるモジュール間のワークフロー管理（オブジェクトの自動作成および/または自動ステータス変更）
 Module10000Name=ウェブサイト
@@ -685,21 +686,21 @@ Module62000Name=インコタームズ
 Module62000Desc=インコタームズを管理する機能を追加する
 Module63000Name=資源
 Module63000Desc=イベントに割り当てるためのリソース ( プリンター、車、部屋など ) を管理する
-Permission11=顧客の請求書をお読みください
+Permission11=顧客の請求書を読み取る
 Permission12=顧客の請求書を作成/変更
 Permission13=顧客の請求書を無効にする
 Permission14=顧客の請求書を検証する
 Permission15=電子メールで顧客の請求書を送る
 Permission16=顧客の請求書の支払いを作成する。
 Permission19=顧客の請求書を削除する。
-Permission21=商業的な提案を読む
+Permission21=商業的な提案を読み取る
 Permission22=商業的な提案を作成/変更
 Permission24=商業的な提案を検証する
 Permission25=商業的な提案を送る
 Permission26=商業的な提案を閉じる
 Permission27=商業的な提案を削除する。
 Permission28=売買提案書をエクスポート
-Permission31=製品をお読みください
+Permission31=製品を読み取る
 Permission32=製品を作成/変更
 Permission34=製品を削除する。
 Permission36=隠された製品を参照すること/管理
@@ -716,7 +717,7 @@ Permission67=出張をエクスポート
 Permission68=電子メールで出張を送信する
 Permission69=出張を検証する
 Permission70=出張を無効にする
-Permission71=メンバを読み取る
+Permission71=メンバーを読み取る
 Permission72=メンバーを作成/変更
 Permission74=メンバーを削除する
 Permission75=メンバーシップの種類を設定する
@@ -727,7 +728,7 @@ Permission81=お客様の注文を読み取る
 Permission82=作成/変更、顧客の注文
 Permission84=お客様の注文を検証
 Permission86=お客様の注文を送る
-Permission87=閉じるお客さまの注文
+Permission87=顧客の注文を閉じる
 Permission88=お客様の注文を取り消す
 Permission89=お客様の注文を削除する
 Permission91=社会税または財政税と付加価値税を読む
@@ -1044,7 +1045,7 @@ DictionaryExpenseTaxCat=経費報告書-輸送カテゴリ
 DictionaryExpenseTaxRange=経費報告書-輸送カテゴリ別の範囲
 DictionaryTransportMode=Intracom レポート-トランスポートモード
 TypeOfUnit=ユニットの種類
-SetupSaved=設定は、保存された
+SetupSaved=設定が保存されました
 SetupNotSaved=設定が保存されていない
 BackToModuleList=モジュールリストに戻る
 BackToDictionaryList=辞書リストに戻る
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=示唆していない
 NoActiveBankAccountDefined=定義された有効な銀行口座なし
 OwnerOfBankAccount=銀行口座 %sの所有者
 BankModuleNotActive=銀行口座モジュールは無効
-ShowBugTrackLink=リンクを表示 "<strong> %s </strong>"
+ShowBugTrackLink=リンク "<strong> %s </strong>"を定義する（このリンクを表示しない場合は空、Dolibarrプロジェクトへのリンクの場合は 'github'、または直接 URL 'https://... ' を定義）
 Alerts=アラート
 DelaysOfToleranceBeforeWarning=次の警告アラートを表示する前に遅延する。
 DelaysOfToleranceDesc=後期要素のアラートアイコン%sが画面に表示されるまでの遅延を設定する。
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=あなたは、ユーザ<b>%s
 YourPHPDoesNotHaveSSLSupport=あなたのPHPでのSSLの機能は使用できない
 DownloadMoreSkins=ダウンロードするには多くのスキン
 SimpleNumRefModelDesc=参照番号を%syymm-nnnnの形式で返す。ここで、yyは年、mmは月、nnnnはリセットなしの順次自動インクリメント番号。
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=住所とともにプロのIDを表示する
 ShowVATIntaInAddress=コミュニティ内のVAT番号を住所で非表示にする
 TranslationUncomplete=部分的な翻訳
@@ -2062,7 +2064,7 @@ UseDebugBar=デバッグバーを使用する
 DEBUGBAR_LOGS_LINES_NUMBER=コンソールに保持する最後のログ行の数
 WarningValueHigherSlowsDramaticalyOutput=警告、値を大きくすると出力が劇的に遅くなる
 ModuleActivated=モジュール%sがアクティブ化され、インターフェイスの速度が低下する
-ModuleActivatedWithTooHighLogLevel=モジュール%sが高すぎるログレベルでアクティブ化されている（パフォーマンスの向上のため、より低いレベルの使用を試すべき）
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=モジュール%sがアクティブ化され、ログレベル（%s）が正しい（冗長すぎない）
 IfYouAreOnAProductionSetThis=実稼働環境を使用している場合は、このプロパティを%sに設定する必要がある。
 AntivirusEnabledOnUpload=アップロードされたファイルでウイルス対策が有効になっている
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=システムコマンドを実行
 NoWritableFilesFoundIntoRootDir=共通プログラムの書き込み可能なファイルまたはディレクトリがルートディレクトリに見つからない（良好）
 RecommendedValueIs=推奨：%s
 ARestrictedPath=制限されたパス
+CheckForModuleUpdate=外部モジュールの更新を確認する
+CheckForModuleUpdateHelp=このアクションは、外部モジュールのエディターに接続して、新しいバージョンが利用可能かどうかを確認する。
+ModuleUpdateAvailable=アップデートが利用可能
+NoExternalModuleWithUpdate=外部モジュールの更新が見つからない
+SwaggerDescriptionFile=Swagger API記述ファイル（たとえば、redocで使用するため）
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index e6c0411be42..28de5134a6f 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -3,8 +3,8 @@ IdAgenda=IDイベント
 Actions=イベント
 Agenda=議題
 TMenuAgenda=議題
-Agendas=議題s
-LocalAgenda=内部カレンダー
+Agendas=議題
+LocalAgenda=デフォルトのカレンダ
 ActionsOwnedBy=が所有するイベント
 ActionsOwnedByShort=所有者
 AffectedTo=影響を受ける
@@ -20,7 +20,7 @@ MenuToDoActions=すべての不完全なイベント
 MenuDoneActions=すべての終了イベント
 MenuToDoMyActions=私の不完全なイベント
 MenuDoneMyActions=私の終了イベント
-ListOfEvents=イベント一覧(内部カレンダー)
+ListOfEvents=イベントのリスト（デフォルトのカレンダ）
 ActionsAskedBy=によって報告されたイベント
 ActionsToDoBy=イベントへの影響を受けた
 ActionsDoneBy=によって行われたイベント
@@ -37,24 +37,24 @@ AgendaExtSitesDesc=このページでは、Dolibarrの議題にそれらのイ
 ActionsEvents=Dolibarrが自動的に議題でアクションを作成する対象のイベント
 EventRemindersByEmailNotEnabled=電子メールによるイベントリマインダーは、%sモジュールセットアップで有効になっていなかった。
 ##### Agenda event labels #####
-NewCompanyToDolibarr=取引先%sは作成済
-COMPANY_DELETEInDolibarr=取引先%sは削除済
-ContractValidatedInDolibarr=契約%sは検証済
-CONTRACT_DELETEInDolibarr=契約%sは削除済
+NewCompanyToDolibarr=取引先%sが作成されました
+COMPANY_DELETEInDolibarr=取引先%sが削除されました
+ContractValidatedInDolibarr=契約%sが承認されました
+CONTRACT_DELETEInDolibarr=契約%sが削除されました
 PropalClosedSignedInDolibarr=提案%sが署名された
 PropalClosedRefusedInDolibarr=提案%sは拒否された
-PropalValidatedInDolibarr=提案%sは、検証
+PropalValidatedInDolibarr=提案%sが承認されました
 PropalClassifiedBilledInDolibarr=提案%s分類請求済
-InvoiceValidatedInDolibarr=請求書%sは検証済
-InvoiceValidatedInDolibarrFromPos=POSから検証された請求書%s
-InvoiceBackToDraftInDolibarr=請求書%sはドラフトの状態に戻って
-InvoiceDeleteDolibarr=請求書%sは削除済
-InvoicePaidInDolibarr=請求書%sが有料に変更された
-InvoiceCanceledInDolibarr=請求書%sは取消済
-MemberValidatedInDolibarr=メンバー%sは検証済
-MemberModifiedInDolibarr=メンバー%sは変更済
-MemberResiliatedInDolibarr=メンバー%sが終了した
-MemberDeletedInDolibarr=メンバー%sは削除済
+InvoiceValidatedInDolibarr=請求書%sが承認されました
+InvoiceValidatedInDolibarrFromPos=請求書%sがPOSから承認されました
+InvoiceBackToDraftInDolibarr=請求書%sが下書きに差し戻されました
+InvoiceDeleteDolibarr=請求書%sが削除されました
+InvoicePaidInDolibarr=請求書%sが入金済みに変更されました
+InvoiceCanceledInDolibarr=請求書%sが取り消されました
+MemberValidatedInDolibarr=メンバー%sが承認されました
+MemberModifiedInDolibarr=メンバー%sが修正されました
+MemberResiliatedInDolibarr=メンバー%sが解除されました
+MemberDeletedInDolibarr=メンバー%sが削除されました
 MemberSubscriptionAddedInDolibarr=メンバー%sのサブスクリプション%sは追加済
 MemberSubscriptionModifiedInDolibarr=メンバー%sのサブスクリプション%sは変更済
 MemberSubscriptionDeletedInDolibarr=メンバー%sのサブスクリプション%sは削除済
@@ -119,6 +119,7 @@ MRP_MO_UNVALIDATEInDolibarr=MOがドラフトステータスに設定
 MRP_MO_PRODUCEDInDolibarr=MOプロデュース
 MRP_MO_DELETEInDolibarr=MOは削除済
 MRP_MO_CANCELInDolibarr=MOは取消済
+PAIDInDolibarr=%s有料
 ##### End agenda events #####
 AgendaModelModule=イベントのドキュメントテンプレート
 DateActionStart=開始日
@@ -130,7 +131,7 @@ AgendaUrlOptions4= <b> logint = %s </b>は、出力をユーザー<b> %s </b>(
 AgendaUrlOptionsProject= <b> project = __ PROJECT_ID__ </b>は、出力をプロジェクト<b> __PROJECT_ID__</b>にリンクされたアクションに制限する。
 AgendaUrlOptionsNotAutoEvent= 自動イベントを除外するには、<b> notactiontype = systemauto</b>。
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b>は、休日のイベントを含む。
-AgendaShowBirthdayEvents=連絡先の誕生日を表示する
+AgendaShowBirthdayEvents=連絡先の誕生日
 AgendaHideBirthdayEvents=連絡先の誕生日を非表示にする
 Busy=忙しい
 ExportDataset_event1=議題イベントのリスト
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 45874c79be1..0030003d981 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=社会/財政税の支払
 BankTransfer=銀行口座振替
 BankTransfers=クレジット転送
 MenuBankInternalTransfer=内部転送
-TransferDesc=ある口座から別の口座に転送すると、Dolibarrは2つのレコード(ソース口座の借方とターゲット口座の貸方)を書込む。同じ金額(記号を除く)、ラベル、日付がこの取引に使用される)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=期初
 TransferTo=期末
 TransferFromToDone=<b>%s %s</b> %sからの<b>%s</b>への転送が記録されている。
-CheckTransmitter=振込
+CheckTransmitter=差出人
 ValidateCheckReceipt=この小切手領収書を検証するか？
-ConfirmValidateCheckReceipt=この小切手領収書を検証してもよいか？一度検証すると変更できなくなる。
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=この小切手領収書を削除か？
 ConfirmDeleteCheckReceipt=この小切手領収書を削除してもよいか？
 BankChecks=銀行小切手
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=この入力を削除してもよいか？
 ThisWillAlsoDeleteBankRecord=これにより、生成された銀行入力も削除される
 BankMovements=動作
 PlannedTransactions=予定入力
-Graph=グラフィックス
+Graph=Graphs
 ExportDataset_banque_1=銀行入力と口座明細書
 ExportDataset_banque_2=預金伝票
 TransactionOnTheOtherAccount=他の口座でのトランザクション
@@ -142,7 +142,7 @@ AllAccounts=すべての銀行口座と現金口座
 BackToAccount=口座へ戻る
 ShowAllAccounts=すべての口座に表示
 FutureTransaction=先物取引。照合できません。
-SelectChequeTransactionAndGenerate=小切手預金の領収書に含める小切手を選択/フィルタリングし、"作成"をクリックする。
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=調停に関連する銀行取引明細書を選択する。ソート可能な数値を使用する：YYYYMMまたはYYYYMMDD
 EventualyAddCategory=最終的に、レコードを分類するカテゴリを指定する
 ToConciliate=照合するには？
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 6dcd35ad561..10e553423b9 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=支払った超過分を利用可能な割引に変換
 EnterPaymentReceivedFromCustomer=顧客から受け取った支払を入力。
 EnterPaymentDueToCustomer=顧客ために支払をする
 DisabledBecauseRemainderToPayIsZero=未払残りがゼロであるため無効
-PriceBase=価格ベース
+PriceBase=Base price
 BillStatus=請求書の状況
 StatusOfGeneratedInvoices=生成された請求書のステータス
 BillStatusDraft=下書き(検証する必要がある)
@@ -454,7 +454,7 @@ RegulatedOn=に規制
 ChequeNumber=Nを確認して°
 ChequeOrTransferNumber=転送チェック/ N°
 ChequeBordereau=スケジュールを確認する
-ChequeMaker=送信機の確認/転送
+ChequeMaker=Check/Transfer sender
 ChequeBank=チェックの銀行
 CheckBank=チェック
 NetToBePaid=支払われるネット
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 62533b2e742..7d79722f9cf 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=ブックマーク：最新の%s
 BoxOldestExpiredServices=最も古いアクティブな期限切れのサービス
 BoxLastExpiredServices=アクティブな期限切れのサービスを持つ最新の%s最も古い連絡先
 BoxTitleLastActionsToDo=実行する最新の%sアクション
-BoxTitleLastContracts=最新の%s変更された契約
-BoxTitleLastModifiedDonations=最新の%s変更された寄付
-BoxTitleLastModifiedExpenses=最新の%s変更された経費報告書
-BoxTitleLatestModifiedBoms=最新の%s変更されたBOM
-BoxTitleLatestModifiedMos=最新の%s変更された製造オーダー
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=最大未払い額を超えた顧客
 BoxGlobalActivity=グローバルアクティビティ(請求書、提案、注文)
 BoxGoodCustomers=良い顧客
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index e3dac47b1ba..51f97f98bab 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=床
 AddTable=テーブルを追加
 Place=場所
 TakeposConnectorNecesary=「TakePOSコネクタ」が必要
-OrderPrinters=プリンターを注文する
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=製品を検索する
 Receipt=領収書
 Header=ヘッダ
@@ -56,8 +57,9 @@ Paymentnumpad=支払いを入力するパッドのタイプ
 Numberspad=ナンバーズパッド
 BillsCoinsPad=硬貨と紙幣パッド
 DolistorePosCategory=Dolibarr用のTakePOSモジュールおよびその他のPOSソリューション
-TakeposNeedsCategories=TakePOSが機能するには製品カテゴリが必要です
-OrderNotes=注文メモ
+TakeposNeedsCategories=TakePOSが機能するには、少なくとも1つの製品カテゴリが必要
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOSが機能するには、カテゴリ<b> %s</b>の下に少なくとも1つの製品カテゴリが必要。
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=での支払いに使用するデフォルトのアカウント
 NoPaimementModesDefined=TakePOS構成で定義された支払いモードはあらない
 TicketVatGrouped=チケットのレートでVATをグループ化|領収書
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=請求書はすでに検証されている
 NoLinesToBill=請求する行がない
 CustomReceipt=カスタム領収書
 ReceiptName=領収書名
-ProductSupplements=製品サプリメント
+ProductSupplements=Manage supplements of products
 SupplementCategory=サプリメントカテゴリー
 ColorTheme=カラーテーマ
 Colorful=カラフル
@@ -92,7 +94,7 @@ Browser=ブラウザ
 BrowserMethodDescription=シンプルで簡単なレシート印刷。レシートを構成するためのいくつかのパラメーターのみ。ブラウザ経由で印刷。
 TakeposConnectorMethodDescription=追加機能を備えた外部モジュール。クラウドから印刷する可能性。
 PrintMethod=印刷方法
-ReceiptPrinterMethodDescription=たくさんのパラメータを持つ強力な方法。テンプレートで完全にカスタマイズ可能。クラウドから印刷できない。
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=ターミナルで
 TakeposNumpadUsePaymentIcon=テンキーの支払いボタンのテキストの代わりにアイコンを使用する
 CashDeskRefNumberingModules=POS販売用の番号付けモジュール
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=モジュールレシートプリンターを
 AllowDelayedPayment=支払いの遅延を許可する
 PrintPaymentMethodOnReceipts=チケットに支払い方法を印刷する|領収書
 WeighingScale=体重計
+ShowPriceHT = 税抜きの価格を表示する列
+ShowPriceHTOnReceipt = 領収書に税抜きの価格を表示する
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index 6d0c80849a4..80b2eb17656 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -3,20 +3,20 @@ Rubrique=タグ/カテゴリ
 Rubriques=タグ/カテゴリ
 RubriquesTransactions=タグ/トランザクションのカテゴリ
 categories=タグ/カテゴリ
-NoCategoryYet=このタイプのタグ/カテゴリは作成されていない
+NoCategoryYet=No tag/category of this type has been created
 In=で
 AddIn=加える
 modify=修正する
 Classify=分類する
 CategoriesArea=タグ/カテゴリエリア
-ProductsCategoriesArea=製品/サービスタグ/カテゴリ領域
-SuppliersCategoriesArea=ベンダーのタグ/カテゴリ領域
-CustomersCategoriesArea=顧客タグ/カテゴリ領域
-MembersCategoriesArea=メンバータグ/カテゴリエリア
-ContactsCategoriesArea=連絡先タグ/カテゴリ領域
-AccountsCategoriesArea=銀行口座のタグ/カテゴリ領域
-ProjectsCategoriesArea=プロジェクトタグ/カテゴリ領域
-UsersCategoriesArea=ユーザータグ/カテゴリ領域
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=サブカテゴリ
 CatList=タグ/カテゴリのリスト
 CatListAll=タグ/カテゴリのリスト(すべての種別)
@@ -96,4 +96,4 @@ ChooseCategory=カテゴリを選択
 StocksCategoriesArea=倉庫カテゴリ
 ActionCommCategoriesArea=イベントカテゴリ
 WebsitePagesCategoriesArea=ページ-コンテナカテゴリ
-UseOrOperatorForCategories=カテゴリの使用または演算子
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index b82d69f57e3..0ae62e2ebc3 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=法人名 %s は既存です。別のを選択してください。
 ErrorSetACountryFirst=始めに国を設定する
 SelectThirdParty=取引先を選択します
-ConfirmDeleteCompany=この法人と継承されたすべての情報を削除してもよろしいですか？
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=連絡先/住所を削除
-ConfirmDeleteContact=この連絡先と継承されたすべての情報を削除してもよろしいですか？
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=新規取引先
 MenuNewCustomer=新規顧客
 MenuNewProspect=新規見込客
@@ -69,7 +69,7 @@ PhoneShort=電話
 Skype=Skype
 Call=電話
 Chat=チャット
-PhonePro=職場電話
+PhonePro=Bus. phone
 PhonePerso=個人電話
 PhoneMobile=携帯電話
 No_Email=大量メールを拒否
@@ -78,7 +78,7 @@ Zip=郵便番号
 Town=区市町村
 Web=ウェブ
 Poste= 位置
-DefaultLang=言語デフォルト
+DefaultLang=Default language
 VATIsUsed=消費税項目使用中
 VATIsUsedWhenSelling=この定義は、取引先が顧客に請求を作る時の消費 税込/税抜 を指定するもの
 VATIsNotUsed=消費税項目不使用
@@ -293,7 +293,7 @@ HasRelativeDiscountFromSupplier=この仕入先からのデフォルトでの割
 HasNoRelativeDiscountFromSupplier=この仕入先からのデフォルトでの相対割引は無し
 CompanyHasAbsoluteDiscount=この顧客への割引可能額(返金確認 または 頭金充当)は <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=この顧客への割引可能額(値引取引 または 頭金充当)は <b>%s</b> %s
-CompanyHasCreditNote=この顧客はまだ<b>%s %s</b>のためにクレジットノートを持っている
+CompanyHasCreditNote=この顧客はまだ<b>%s %s</b>のために貸方票を持っている
 HasNoAbsoluteDiscountFromSupplier=この仕入先から利用できる割引割戻は無し
 HasAbsoluteDiscountFromSupplier=この仕入先から、<b>%s</b> %s 相当の割引が可能 (返金確約または頭金充当)
 HasDownPaymentOrCommercialDiscountFromSupplier=この仕入先から、 <b>%s</b> %s 相当の割引が可能 (現金値引、頭金充当)
@@ -331,7 +331,7 @@ CustomerCodeDesc=顧客コード、全顧客でユニーク
 SupplierCodeDesc=仕入先コード、全仕入先でユニーク
 RequiredIfCustomer=取引先が顧客または見込客である場合は必須
 RequiredIfSupplier=取引先が仕入先である場合は必須
-ValidityControledByModule=検証はモジュールで制御
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=このモジュールのルールs
 ProspectToContact=連絡する見込客
 CompanyDeleted=法人 "%s" はデータベースから削除。
@@ -439,12 +439,12 @@ ListSuppliersShort=仕入先の一覧
 ListProspectsShort=見込客の一覧
 ListCustomersShort=顧客の一覧
 ThirdPartiesArea=取引先s/連絡先s
-LastModifiedThirdParties=最新%s 以内に更新された仕入先
-UniqueThirdParties=仕入先sの合計
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=開く
 ActivityCeased=閉じる
 ThirdPartyIsClosed=閉鎖した取引先
-ProductsIntoElements=%s に対する製品/サービスの一覧
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=現在の未払い勘定
 OutstandingBill=未払い勘定での最大値
 OutstandingBillReached=受領済未払い勘定での最大値
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=顧客/サプライヤーコードは無料です。こ
 ManagingDirectors=管理職(s)名称 (CEO, 部長, 社長...)
 MergeOriginThirdparty=重複する取引先 (削除したい取引先)
 MergeThirdparties=仕入先sを集約
-ConfirmMergeThirdparties=この取引先を現在の取引先に融合したいのね、いいよね？リンクされたすべてのオブジェクト(請求書、注文など...)は現在の取引先に移動され、この取引先には削除されるよ。
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=仕入先sは集約済
 SaleRepresentativeLogin=販売担当者のログイン
 SaleRepresentativeFirstname=販売担当者の姓名の名
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index f5d31e8c3c9..355fa23d9d0 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=新規割引
 NewCheckDeposit=新規チェック預金
 NewCheckDepositOn=%s：科目上で預金の領収書を作成する
 NoWaitingChecks=入金待ちの小切手はない。
-DateChequeReceived=受付の日付を確認すること
+DateChequeReceived=Check receiving date
 NbOfCheques=小切手の数
 PaySocialContribution=社会税/財政税を支払う
 PayVAT=VAT申告を支払う
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index bbec3ce2d28..b622ef8aee2 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=ExtrafieldsEcmファイル
 ExtraFieldsEcmDirectories=ExtrafieldsEcmディレクトリ
 ECMSetup=ECMセットアップ
 GenerateImgWebp=すべての画像を.webp形式の別のバージョンで複製する
-ConfirmGenerateImgWebp=確認すると、現在このフォルダとそのサブフォルダ...にあるすべての画像に対して .webp形式の画像が生成される
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=すべての画像の重複を確認する
 SucessConvertImgWebp=画像が正常に複製された
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index bf03fa63a87..6f682279738 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=エラーなし、コミットする
 # Errors
 ErrorButCommitIsDone=エラーが見つかったが、これにもかかわらず検証する
-ErrorBadEMail=メール%sが間違っている
-ErrorBadMXDomain=メール%sが間違っているようだ(ドメインに有効なMXレコードがない)
-ErrorBadUrl=URLの%sが間違っている
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=パラメータ の値が正しくない。通常、翻訳が欠落している場合に追加される。
 ErrorRefAlreadyExists=参照<b>%s</b>はすでに存在する。
 ErrorLoginAlreadyExists=ログイン%sはすでに存在している。
@@ -46,8 +46,8 @@ ErrorWrongDate=日付が正しくない！
 ErrorFailedToWriteInDir=ディレクトリ%sの書き込みに失敗した
 ErrorFoundBadEmailInFile=ファイル内の%s線の発見誤った電子メールのシンタックス(電子メール= %sを使用したサンプルライン%s)
 ErrorUserCannotBeDelete=ユーザーを削除することはできない。多分それはDolibarrエンティティに関連付けられている。
-ErrorFieldsRequired=いくつかの必須フィールドが満たされていなかった。
-ErrorSubjectIsRequired=メールトピックが必要だ
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=ディレクトリの作成に失敗した。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認すること。パラメータ の<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザー(またはグループ)に所有していることを確認すること。
 ErrorNoMailDefinedForThisUser=このユーザーに定義されたメールはない
 ErrorSetupOfEmailsNotComplete=メールの設定が完了していない
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=ページ/コンテナ<strong>%s </st
 ErrorDuringChartLoad=勘定科目表の読み込み中にエラーが発生した。ロードされていないアカウントが少ない場合でも、手動で入力できる。
 ErrorBadSyntaxForParamKeyForContent=paramkeyforcontentの構文が正しくない。 %sまたは%sで始まる値が必要だ
 ErrorVariableKeyForContentMustBeSet=エラー、名前%s(表示するテキストコンテンツ付き)または%s(表示する外部URL付き)の定数を設定する必要がある。
+ErrorURLMustEndWith=URL%sは%sで終了する必要がある
 ErrorURLMustStartWithHttp=URL %sは http:// または https:// で始まる必要がある
 ErrorHostMustNotStartWithHttp=ホスト名%sは、http:// または https:// で始まらないこと
 ErrorNewRefIsAlreadyUsed=エラー、新規参照はすでに使用されている
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=HTTPSで保護された接続を使用して
 WarningModuleXDisabledSoYouMayMissEventHere=モジュール%sが有効になっていない。そのため、ここでは多くのイベントを見逃す可能性がある。
 ErrorActionCommPropertyUserowneridNotDefined=ユーザの所有者が必要
 ErrorActionCommBadType=選択したイベント種別 (id: %n, code: %s) がイベント種別辞書に存在しない
+CheckVersionFail=バージョンチェックに失敗する
diff --git a/htdocs/langs/ja_JP/eventorganization.lang b/htdocs/langs/ja_JP/eventorganization.lang
new file mode 100644
index 00000000000..b37d528374d
--- /dev/null
+++ b/htdocs/langs/ja_JP/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = イベント組織
+EventOrganizationDescription = モジュールプロジェクトによるイベント編成
+EventOrganizationDescriptionLong= 公開サブスクリプションページを使用して、会議、出席者、講演者、および出席者のイベント組織を管理する
+#
+# Menu
+#
+EventOrganizationMenuLeft = 開催済イベント
+EventOrganizationConferenceOrBoothMenuLeft = 会議またはブース
+
+#
+# Admin page
+#
+EventOrganizationSetup = イベント組織の設定
+Settings = 設定
+EventOrganizationSetupPage = イベント組織設定ページ
+EVENTORGANIZATION_TASK_LABEL = プロジェクトが検証されたときに自動的に作成するタスクのラベル
+EVENTORGANIZATION_TASK_LABELTooltip = 組織化されたイベントを検証すると、プロジェクトにいくつかのタスクが自動的に作成される。<br><br>例：<br>会議の呼び出しを送信<br>ブースの呼び出しを送信 <br>会議の呼出を受信 <br>ブースの呼出を受信 <br>参加者にイベントへのサブスクリプションを公開 <br> 話者にイベントのリマインダーを送信<br>ブースの主催者にイベントのリマインダーを送信<br>出席者にイベントのリマインダーを送信
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = 誰かが会議を提案したときに自動的に作成される取引先に追加するカテゴリ
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = ブースを提案したときに自動的に作成される取引先に追加するカテゴリ
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = 会議の提案を受け取った後に送信する電子メールのテンプレート。
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = ブースの提案を受けて送信するメールのテンプレート。
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = ブースのサブスクリプションが支払われた後に送信する電子メールのテンプレート。
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = イベントのサブスクリプションが支払われた後に送信する電子メールのテンプレート。
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = 出席する大虐殺の電子メールのテンプレート
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = 話者への虐待の電子メールのテンプレート
+EVENTORGANIZATION_FILTERATTENDEES_CAT = 参加者作成カード/フォームで取引先の選択リストをカテゴリでフィルタリングする
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = 顧客タイプを使用して、出席者作成カード/フォームで取引先の選択リストをフィルタリングする
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= 会議またはブース
+ManageOrganizeEvent = イベント組織を管理する
+ConferenceOrBooth = 会議またはブース
+ConferenceOrBoothTab = 会議またはブース
+AmountOfSubscriptionPaid = 支払われたサブスクリプションの金額
+DateSubscription = サブスクリプションの日付
+ConferenceOrBoothAttendee = 会議またはブースの参加者
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = 会議リクエストは受信済
+YourOrganizationEventBoothRequestWasReceived = ブースの要望は受信済み
+EventOrganizationEmailAskConf = 会議のリクエスト
+EventOrganizationEmailAskBooth = ブースのご要望
+EventOrganizationEmailSubsBooth = ブースのサブスクリプション
+EventOrganizationEmailSubsEvent = イベントのサブスクリプション
+EventOrganizationMassEmailAttendees = 出席者へのコミュニケーション
+EventOrganizationMassEmailSpeakers = 話者とのコミュニケーション
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=未知の人からの会議提案を許可
+AllowUnknownPeopleSuggestConfHelp=未知の人からの会議提案を許可
+AllowUnknownPeopleSuggestBooth=未知の人からのブース提案を許可
+AllowUnknownPeopleSuggestBoothHelp=未知の人からのブース提案を許可
+PriceOfRegistration=登録価格
+PriceOfRegistrationHelp=登録価格
+PriceOfBooth=ブース立ちのサブスクリプション価格
+PriceOfBoothHelp=ブース出展用サブスクリプション価格
+EventOrganizationICSLink=イベントのICSをリンクする
+ConferenceOrBoothInformation=会議またはブース情報
+Attendees = 参加者
+EVENTORGANIZATION_SECUREKEY = 会議への公開登録リンクのセキュアキー
+#
+# Status
+#
+EvntOrgDraft = 下書き
+EvntOrgSuggested = 提案済
+EvntOrgConfirmed = 確認済み
+EvntOrgNotQualified = 資格なし
+EvntOrgDone = 済
+EvntOrgCancelled = キャンセル
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = 会議登録への公開リンク
+MissingOrBadSecureKey = セキュリティキーが無効であるか欠落している
+EvntOrgWelcomeMessage = このフォームを使用すると、会議の新規参加者として登録でる
+EvntOrgStartDuration = この会議の開始は
+EvntOrgEndDuration =  で終わる
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 79ddd3fbe8f..99f3b9e23c4 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -12,7 +12,7 @@ PHPSupportPOSTGETOk=このPHPは、変数POSTとGETをサポートする。
 PHPSupportPOSTGETKo=PHP設定が変数POSTやGETをサポートしない可能性がある。 php.iniのパラメーター<b>variables_order</b>を確認すること。
 PHPSupportSessions=このPHPは、セッションをサポートする。
 PHPSupport=このPHPは%s関数をサポートする。
-PHPMemoryOK=あなたのPHPの最大のセッションメモリは<b>%s</b>に設定されている。これは十分なはずだ。
+PHPMemoryOK=PHPの最大のセッションメモリは<b>%s</b>に設定されています。この数値なら十分です。
 PHPMemoryTooLow=PHPの最大セッションメモリは<b>%s</b>バイトに設定されている。これは低すぎる。 <b> php.ini </b>を変更して、<b> memory_limit</b>パラメーターを少なくとも<b>%s</b>バイトに設定する。
 Recheck=より詳細なテストについては、ここをクリックすること
 ErrorPHPDoesNotSupportSessions=PHPインストールはセッションをサポートしない。この機能は、Dolibarrを機能させるために必要。 PHPの設定とセッションディレクトリの権限を確認すること。
@@ -38,11 +38,11 @@ WarningBrowserTooOld=ブラウザのバージョンが古すぎる。ブラウ
 PHPVersion=PHPのバージョン
 License=ライセンスを使用して
 ConfigurationFile=設定ファイル
-WebPagesDirectory=ウェブページが保存されているディレクトリ
+WebPagesDirectory=ウェブページを保存するディレクトリ
 DocumentsDirectory=アップロードされたドキュメントや生成されたドキュメントを格納するディレクトリ
 URLRoot=URLのルート
 ForceHttps=セキュアな接続(HTTPS)を強制する
-CheckToForceHttps=セキュアな接続(https)を強制的にこのオプションをチェックすること。 <br>これは、WebサーバがSSL証明書を使用して構成されている必要がある。
+CheckToForceHttps= セキュアな接続(https)を強制する場合はこのオプションにチェックを入れて下さい。<br>このオプションにはSSL認証されたサーバーが必要です。
 DolibarrDatabase=Dolibarrデータベース
 DatabaseType=データベース種別
 DriverType=ドライバ種別
@@ -51,8 +51,8 @@ ServerAddressDescription=データベースサーバーの名前またはIP住
 ServerPortDescription=データベース・サーバーのポート。不明な場合は空欄のままにしてください。
 DatabaseServer=データベース·サーバー
 DatabaseName=データベース名
-DatabasePrefix=データベーステーブルプレフィックス
-DatabasePrefixDescription=データベーステーブルプレフィックス。空の場合、デフォルトはllx_。
+DatabasePrefix=データベースのテーブル接頭辞
+DatabasePrefixDescription=データベースのテーブル接頭辞。空欄にするとデフォルトの「llx_」が設定されます。
 AdminLogin=Dolibarrデータベース所有者のユーザアカウント。
 PasswordAgain=パスワード確認の再入力
 AdminPassword=Dolibarrデータベースの所有者のパスワード。
@@ -60,7 +60,7 @@ CreateDatabase=データベースを作成する。
 CreateUser=Dolibarrデータベースでユーザアカウントを作成するか、ユーザアカウントのアクセス許可を付与する
 DatabaseSuperUserAccess=データベースサーバ - スーパーユーザのアクセス
 CheckToCreateDatabase=データベースがまだ存在しないため、作成する必要がある場合は、チェックボックスをオンにする。 <br>この場合、このページの下部にスーパーユーザアカウントのユーザ名とパスワードも入力する必要がある。
-CheckToCreateUser=次の場合にチェックボックスをオンにする。<br>データベースユーザアカウントがまだ存在しないため作成する必要がある場合、またはユーザアカウントは存在するがデータベースが存在せず、アクセス許可を付与する必要がある場合は<br>。 <br>この場合、このページの下部にユーザアカウントとパスワードを入力する必要があり、<b>も</b>スーパーユーザアカウント名とパスワードを入力する必要がある。このボックスがオフの場合、データベースの所有者とパスワードがすでに存在する必要がある。
+CheckToCreateUser=データベースのユーザーアカウントがまだ存在しないため作成する必要がある場合、または<br>ユーザーアカウントは存在するがデータベースが存在しておらず、アクセス権限を付与する必要がある場合<br>はチェックを入れて下さい。 <br>この場合、ページ下部のフォームに上位管理者アカウントのユーザー名とパスワード<b>も</b>入力する必要があります。このボックスがチェックされていない場合、データベースの所有者とパスワードがすでに存在していることが必須です。
 DatabaseRootLoginDescription=スーパーユーザアカウント名(新規データベースまたは新規ユーザを作成するため)。データベースまたはその所有者がまだ存在しない場合は必須。
 KeepEmptyIfNoPassword=スーパーユーザにパスワードがない場合は空のままにする(非推奨)
 SaveConfigurationFile=パラメータをに保存する
@@ -80,7 +80,7 @@ PasswordsMismatch=パスワードが異なる。もう一度お試しくださ
 SetupEnd=設定の終了
 SystemIsInstalled=インストールが完了しました。
 SystemIsUpgraded=Dolibarrが正常にアップグレードされました。
-YouNeedToPersonalizeSetup=あなたのニーズに合わせてDolibarrを設定する必要がある(外観、機能、...).これを行うには、下記のリンクをクリックすること。
+YouNeedToPersonalizeSetup=Dolibarrをご自身のニーズに合わせて設定する必要があります（外観、機能など）。設定を実行するには以下のリンクをクリックして下さい。
 AdminLoginCreatedSuccessfuly=Dolibarr 管理者ログイン '<b>%s</b>' の作成が成功した。
 GoToDolibarr=Dolibarrに行く
 GoToSetupArea=Dolibarr(設定の領域)に移動する
@@ -89,10 +89,10 @@ GoToUpgradePage=アップグレードページへ再度行く
 WithNoSlashAtTheEnd=末尾のスラッシュ"/"なし
 DirectoryRecommendation= <span class="warning">重要</span>：Webページの外部にあるディレクトリを使用する必要がある(したがって、前のパラメータのサブディレクトリは使用しないこと)。
 LoginAlreadyExists=すでに存在する
-DolibarrAdminLogin=Dolibarr adminログイン
+DolibarrAdminLogin=Dolibarr 管理者ログイン
 AdminLoginAlreadyExists=Dolibarr管理者アカウント '<b> %s</b>'は既に存在する。別のものを作成したい場合は戻ってください。
 FailedToCreateAdminLogin=Dolibarr管理者アカウントの作成に失敗した。
-WarningRemoveInstallDir=警告、セキュリティ上の理由から、インストールまたはアップグレードが完了したら、インストールツールの偶発的/悪用を防ぐために、<b> install.lock</b>というファイルをDolibarrドキュメントディレクトリに追加する必要がある。
+WarningRemoveInstallDir=警告：セキュリティ上の理由から、インストールツールの不意または悪意ある再使用を防ぐため、インストールまたはアップグレードの完了後に<b> install.lock</b>というファイルをドキュメントディレクトリにアップロードしてください。
 FunctionNotAvailableInThisPHP=このPHPでは使用できない
 ChoosedMigrateScript=移行スクリプトを選択する。
 DataMigration=データベースの移行(データ)
@@ -103,7 +103,7 @@ FreshInstall=新規インストール
 FreshInstallDesc=これが初めてのインストールである場合は、このモードを使用すること。そうでない場合、このモードは不完全な以前のインストールを修復できる。バージョンをアップグレードする場合は、「アップグレード」モードを選択すること。
 Upgrade=アップグレード
 UpgradeDesc=あなたが新規バージョンのファイルが古いDolibarrファイルを交換した場合、このモードを使用する。これにより、データベースとデータをアップグレードする。
-Start=開始
+Start=スタート
 InstallNotAllowed=設定では<b>、conf.php</b>の権限で許可されていない
 YouMustCreateWithPermission=あなたは、ファイル%sを作成し、インストールプロセス中にWebサーバのためにそれへの書き込み権限を設定する必要がある。
 CorrectProblemAndReloadPage=問題を修正し、F5キーを押してページをリロードすること。
@@ -133,7 +133,7 @@ MigrationCustomerOrderShipping=販売受注保管庫のための出荷を移行
 MigrationShippingDelivery=出荷の保管庫をアップグレード
 MigrationShippingDelivery2=出荷 2 の保管庫をアップグレード
 MigrationFinished=マイグレーションが終了した
-LastStepDesc= <strong>最後のステップ</strong>：Dolibarrへの接続に使用するログインとパスワードをここで定義する。 <b>他のすべての/追加のユーザアカウントを管理するためのマスターアカウントであるため、これをなくさないでください。 </b>
+LastStepDesc= <strong>最後のステップ</strong>：Dolibarrへの接続に使用するログインとパスワードを設定します。 <b>他のすべてのユーザアカウント・追加のユーザアカウントを管理するためのマスターアカウントであるため、紛失しないようにして下さい。 </b>
 ActivateModule=モジュール%sをアクティブにする
 ShowEditTechnicalParameters=高度なパラメータを表示/編集するには、ここをクリックすること (エキスパートモード)
 WarningUpgrade=警告：\n最初にデータベースバックアップを実行したか？\nこれを強くお勧めする。このプロセス中にデータが失われる可能性があるため(たとえば、mysqlバージョン5.5.40 / 41/42/43のバグが原因)、移行を開始する前にデータベースの完全なダンプを取得することが不可欠。\n\n "OK" をクリックして移行プロセスを開始する...
diff --git a/htdocs/langs/ja_JP/knowledgemanagement.lang b/htdocs/langs/ja_JP/knowledgemanagement.lang
new file mode 100644
index 00000000000..888ec8903a0
--- /dev/null
+++ b/htdocs/langs/ja_JP/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = 設定
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = 約
+KnowledgeManagementAbout = 知識管理について
+KnowledgeManagementAboutPage = 知識管理に関するページ
+
+#
+# Sample page
+#
+KnowledgeManagementArea = 知識管理
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = 記事
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index ac80df8e0b0..d3122d4a20e 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=ユーザ(s)へ
 MailCC=にコピー
 MailToCCUsers=ユーザs(s)にコピーする
 MailCCC=にキャッシュされたコピー
-MailTopic=メールトピック
+MailTopic=Email subject
 MailText=メッセージ
 MailFile=添付ファイル
 MailMessage=電子メールの本文
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=このイベントタイプと法人では、自動電
 ANotificationsWillBeSent=1つの自動通知が電子メールで送信される
 SomeNotificationsWillBeSent=%s自動通知は電子メールで送信される
 AddNewNotification=新規自動電子メール通知を購読する(ターゲット/イベント)
-ListOfActiveNotifications=自動電子メール通知のすべてのアクティブなサブスクリプション(ターゲット/イベント)を一覧表示する
-ListOfNotificationsDone=送信されたすべての自動電子メール通知を一覧表示する
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=電子メール送信の構成は「%s」に設定されている。このモードは、大量の電子メールを送信するために使用することはできない。
 MailSendSetupIs2=モード'%s'を使うには、まず、管理者アカウントを使用して、メニュー%sホーム - 設定 - メール %sに移動し、パラメーター<strong>'%s '</strong>を変更する。このモードでは、インターネットサービスプロバイダーが提供するSMTPサーバーの設定に入り、大量電子メールの機能を使用できる。
 MailSendSetupIs3=SMTPサーバーの設定方法について質問がある場合は、%sに問い合わせることができる。
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 9a56b5c791e..0cb3870bce3 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -115,7 +115,7 @@ InformationLastAccessInError=最新のデータベースアクセス要求エラ
 DolibarrHasDetectedError=Dolibarrで技術的なエラーを検出
 YouCanSetOptionDolibarrMainProdToZero=詳細については、ログファイルを読み取るか、構成ファイルでオプション$ dolibarr_main_prodを「0」に設定してください。
 InformationToHelpDiagnose=この情報は診断目的に役立ちます(オプション$ dolibarr_main_prodを「1」に設定してそのような通知を削除できます)
-MoreInformation=もっと知りたい
+MoreInformation=詳しい情報
 TechnicalInformation=技術的情報
 TechnicalID=技術ID
 LineID=行ID
@@ -180,7 +180,7 @@ SaveAndNew=保存して新規
 TestConnection=試験用接続
 ToClone=クローン
 ConfirmCloneAsk=オブジェクト<b>%s </b>のクローンを作成してもよろしいですか？
-ConfirmClone=クローンを作成するデータを選択します。
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=定義されているクローンを作成するデータがありません。
 Of=の
 Go=行く
@@ -246,7 +246,7 @@ DefaultModel=デフォルトのドキュメントテンプレート
 Action=イベント
 About=約
 Number=数
-NumberByMonth=月ごとに数
+NumberByMonth=Total reports by month
 AmountByMonth=月別量
 Numero=数
 Limit=制限
@@ -341,8 +341,8 @@ KiloBytes=キロバイト
 MegaBytes=メガバイト
 GigaBytes=ギガバイト
 TeraBytes=テラバイト
-UserAuthor=作成のユーザー
-UserModif=最終更新のユーザー
+UserAuthor=Ceated by
+UserModif=更新済の原因
 b=B。
 Kb=KB
 Mb=MB
@@ -503,9 +503,11 @@ By=によって
 From=から
 FromDate=から
 FromLocation=から
-at=で
 to=へ
 To=へ
+ToDate=へ
+ToLocation=へ
+at=で
 and=と
 or=または
 Other=その他
@@ -776,7 +778,7 @@ Visibility=可視性
 Totalizable=合計可能
 TotalizableDesc=このフィールドはリストで合計可能です
 Private=プライベート
-Hidden=隠された
+Hidden=非表示
 Resources=資源
 Source=ソース
 Prefix=接頭辞
@@ -843,7 +845,7 @@ XMoreLines=%s行が非表示
 ShowMoreLines=より多くの/より少ない行を表示する
 PublicUrl=パブリックURL
 AddBox=ボックスを追加
-SelectElementAndClick=要素を選択し、%sをクリックします
+SelectElementAndClick=Select an element and click on %s
 PrintFile=印刷ファイル%s
 ShowTransaction=銀行口座にエントリを表示する
 ShowIntervention=介入を示す
@@ -854,8 +856,8 @@ Denied=拒否されました
 ListOf=%sのリスト
 ListOfTemplates=テンプレートのリスト
 Gender=性別
-Genderman=男
-Genderwoman=女
+Genderman=Male
+Genderwoman=Female
 Genderother=その他
 ViewList=リストビュー
 ViewGantt=ガントビュー
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=選択した%sレコード(s)のタグに影響を与
 CategTypeNotFound=レコードのタイプのタグタイプが見つからない
 CopiedToClipboard=クリップボードにコピー
 InformationOnLinkToContract=この金額は、契約のすべての行の合計にすぎません。時間の概念は考慮されていない。
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index 417d21d59b5..3da10a79543 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -1,73 +1,73 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=メンバエリア
-MemberCard=メンバカード
+MembersArea=メンバー部門
+MemberCard=メンバーカード
 SubscriptionCard=サブスクリプション·カード
-Member=メンバ
-Members=メンバ
-ShowMember=メンバカードを提示
-UserNotLinkedToMember=ユーザーがメンバにリンクされていない
-ThirdpartyNotLinkedToMember=メンバにリンクされていない取引先
-MembersTickets=メンバチケット
-FundationMembers=Foundationのメンバ
-ListOfValidatedPublicMembers=検証済のパブリックメンバのリスト
-ErrorThisMemberIsNotPublic=このメンバは、パブリックではない
-ErrorMemberIsAlreadyLinkedToThisThirdParty=別のメンバ(名前<b>：%s、</b>ログイン<b>：%s)</b>は既に取引先製の<b>%s</b>にリンクされている。第三者が唯一のメンバ(およびその逆)にリンクすることはできないので、最初にこのリンクを削除する。
+Member=メンバー
+Members=メンバー
+ShowMember=メンバーカードを表示
+UserNotLinkedToMember=メンバーにリンクされていないユーザー
+ThirdpartyNotLinkedToMember=メンバーにリンクされていない取引先
+MembersTickets=メンバーチケット
+FundationMembers=Foundationのメンバー
+ListOfValidatedPublicMembers=認証済みの公開メンバーのリスト
+ErrorThisMemberIsNotPublic=このメンバーは非公開です
+ErrorMemberIsAlreadyLinkedToThisThirdParty=別のメンバー（名前：<b>%s</b>、ログイン：<b>%s</b>）がすでに取引先<b>%s</b>にリンクされています。取引先は1人のメンバーにしかリンクできないため(逆も同様)、まずこのリンクを削除して下さい。
 ErrorUserPermissionAllowsToLinksToItselfOnly=セキュリティ上の理由から、あなたはすべてのユーザーが自分のものでないユーザーにメンバをリンクすることができるように編集する権限を付与する必要がある。
 SetLinkToUser=Dolibarrユーザーへのリンク
-SetLinkToThirdParty=Dolibarr第三者へのリンク
-MembersCards=メンバの名刺
-MembersList=メンバのリスト
-MembersListToValid=ドラフトのメンバのリスト(検証する)
-MembersListValid=有効なメンバのリスト
-MembersListUpToDate=最新のサブスクリプションを持つ有効なメンバのリスト
-MembersListNotUpToDate=サブスクリプションが古くなっている有効なメンバのリスト
-MembersListExcluded=除外されたメンバのリスト
-MembersListResiliated=終了したメンバのリスト
-MembersListQualified=修飾されたメンバのリスト
-MenuMembersToValidate=ドラフトのメンバ
-MenuMembersValidated=検証メンバ
-MenuMembersExcluded=除外されたメンバ
-MenuMembersResiliated=終了したメンバ
-MembersWithSubscriptionToReceive=受け取るために、サブスクリプションを持つメンバ
-MembersWithSubscriptionToReceiveShort=受け取るサブスクリプション
+SetLinkToThirdParty=Dolibarrの取引先にリンクする
+MembersCards=Business cards for members
+MembersList=メンバーのリスト
+MembersListToValid=下書きのメンバーのリスト（要承認）
+MembersListValid=有効なメンバーのリスト
+MembersListUpToDate=最新のサブスクリプションを持つ有効なメンバーのリスト
+MembersListNotUpToDate=サブスクリプションが古くなっている有効なメンバーのリスト
+MembersListExcluded=除外されたメンバーのリスト
+MembersListResiliated=解除されたメンバーのリスト
+MembersListQualified=修正されたメンバーのリスト
+MenuMembersToValidate=下書きのメンバー
+MenuMembersValidated=承認済みのメンバー
+MenuMembersExcluded=除外されたメンバー
+MenuMembersResiliated=解除されたメンバー
+MembersWithSubscriptionToReceive=受け取るべきサブスクリプションのあるメンバー
+MembersWithSubscriptionToReceiveShort=受け取るべきサブスクリプション
 DateSubscription=サブスクリプションの日付
 DateEndSubscription=サブスクリプションの終了日
-EndSubscription=エンドサブスクリプション
+EndSubscription=Subscription Ends
 SubscriptionId=サブスクリプションID
 WithoutSubscription=サブスクリプションなし
-MemberId=メンバID
-NewMember=新メンバ
-MemberType=メンバ型
-MemberTypeId=メンバの種別ID
-MemberTypeLabel=メンバの種別ラベル
-MembersTypes=メンバの種類
-MemberStatusDraft=ドラフト(検証する必要がある)
-MemberStatusDraftShort=ドラフト
-MemberStatusActive=検証(サブスクリプションを待っている)
-MemberStatusActiveShort=検証
+MemberId=メンバーID
+NewMember=新メンバー
+MemberType=メンバー種別
+MemberTypeId=メンバー種別ID
+MemberTypeLabel=メンバー種別ラベル
+MembersTypes=メンバー種別
+MemberStatusDraft=下書き（要承認）
+MemberStatusDraftShort=下書き
+MemberStatusActive=承認済み（サブスクリプション待ち）
+MemberStatusActiveShort=承認
 MemberStatusActiveLate=サブスクリプションの有効期限が切れた
-MemberStatusActiveLateShort=期限切れの
+MemberStatusActiveLateShort=期限切れ
 MemberStatusPaid=最新のサブスクリプション
 MemberStatusPaidShort=最新の
 MemberStatusExcluded=除外されたメンバ
-MemberStatusExcludedShort=除外
-MemberStatusResiliated=終了メンバ
-MemberStatusResiliatedShort=終了しました
-MembersStatusToValid=ドラフトのメンバ
-MembersStatusExcluded=除外されたメンバ
-MembersStatusResiliated=終了したメンバ
+MemberStatusExcludedShort=除外されました
+MemberStatusResiliated=解除されたメンバー
+MemberStatusResiliatedShort=解除されました
+MembersStatusToValid=下書きのメンバー
+MembersStatusExcluded=除外されたメンバー
+MembersStatusResiliated=解除されたメンバー
 MemberStatusNoSubscription=検証済(サブスクリプションは不要)
 MemberStatusNoSubscriptionShort=検証
 SubscriptionNotNeeded=サブスクリプションは必要ない
 NewCotisation=新規貢献
 PaymentSubscription=新規貢献の支払い
 SubscriptionEndDate=サブスクリプションの終了日
-MembersTypeSetup=メンバ·種別の設定
-MemberTypeModified=メンバ種別が変更された
-DeleteAMemberType=メンバ種別を削除する
-ConfirmDeleteMemberType=このメンバ種別を削除してもよいか？
-MemberTypeDeleted=メンバ種別が削除された
-MemberTypeCanNotBeDeleted=メンバ種別は削除できない
+MembersTypeSetup=メンバー種別の設定
+MemberTypeModified=メンバー種別が変更されました
+DeleteAMemberType=メンバー種別の削除
+ConfirmDeleteMemberType=このメンバー種別を削除してもよろしいですか？
+MemberTypeDeleted=メンバー種別が削除されました
+MemberTypeCanNotBeDeleted=メンバー種別が削除できません
 NewSubscription=新規サブスクリプション
 NewSubscriptionDesc=このフォームで、財団の新規メンバとして、サブスクリプションを記録することができる。あなたが(既にメンバであり)、サブスクリプションを更新したい場合は、電子メール%sではなく財団理事会に連絡すること。
 Subscription=サブスクリプション
@@ -76,140 +76,140 @@ SubscriptionLate=遅い
 SubscriptionNotReceived=サブスクリプションは、受信したことはない
 ListOfSubscriptions=サブスクリプションのリスト
 SendCardByMail=カードをメールで送信
-AddMember=メンバを作成する
-NoTypeDefinedGoToSetup=メンバの種別が定義されていない。メニュー "メンバ種別" に行く
-NewMemberType=新規メンバの種別
+AddMember=メンバーの作成
+NoTypeDefinedGoToSetup=メンバー種別が定義されていません。メニューの「メンバー種別」にアクセスして下さい。
+NewMemberType=新規メンバー種別
 WelcomeEMail=ウェルカムメール
 SubscriptionRequired=サブスクリプションが必要
 DeleteType=削除する
 VoteAllowed=許可される投票
-Physical=物理的な
-Moral=道徳
-MorAndPhy=道徳的および物理的
-Reenable=再度有効にする
-ExcludeMember=メンバを除外する
-ConfirmExcludeMember=このメンバを除外してもよろしいですか？
-ResiliateMember=メンバを終了する
-ConfirmResiliateMember=このメンバを終了してもよいか？
-DeleteMember=メンバを削除する
-ConfirmDeleteMember=このメンバを削除してもよいか(メンバを削除すると、すべてのサブスクリプションが削除される)。
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
+ExcludeMember=メンバーを除外する
+ConfirmExcludeMember=このメンバーを除外してもよろしいですか？
+ResiliateMember=メンバーを解除する
+ConfirmResiliateMember=このメンバーを解除してもよろしいですか？
+DeleteMember=メンバーを削除
+ConfirmDeleteMember=このメンバーを削除してもよろしいですか？（メンバーを削除すると、そのメンバーの全てのサブスクリプションが削除されます）
 DeleteSubscription=サブスクリプションを削除する
 ConfirmDeleteSubscription=このサブスクリプションを削除してもよいか？
 Filehtpasswd=htpasswdファイル
-ValidateMember=メンバを検証する
-ConfirmValidateMember=このメンバを検証してもよいか？
-FollowingLinksArePublic=次のリンクは、Dolibarrの許可によって保護されていない開いているページです。これらはフォーマットされたページではなく、メンバデータベースを一覧表示する方法を示す例として提供されている。
+ValidateMember=メンバーを承認する
+ConfirmValidateMember=このメンバーを承認してよろしいですか？
+FollowingLinksArePublic=以下のリンクはDolibarrの権限によって保護されていない公開ページです。これはフォーマットされたページではなく、メンバーをデータベースに載せる方法の例として提示されています。
 PublicMemberList=公共のメンバリスト
 BlankSubscriptionForm=パブリックセルフサブスクリプションフォーム
 BlankSubscriptionFormDesc=Dolibarrは、外部の訪問者が財団への登録を依頼できるように、公開URL /ウェブサイトを提供できる。オンライン支払いモジュールが有効になっている場合、支払いフォームも自動的に提供される場合がある。
 EnablePublicSubscriptionForm=セルフサブスクリプションフォームで公開ウェブサイトを有効にする
-ForceMemberType=メンバ種別を強制する
-ExportDataset_member_1=メンバとサブスクリプション
-ImportDataset_member_1=メンバ
-LastMembersModified=最新%sの変更メンバ
-LastSubscriptionsModified=最新%sの変更されたサブスクリプション
+ForceMemberType=メンバー種別を強制する
+ExportDataset_member_1=メンバーとサブスクリプション
+ImportDataset_member_1=メンバー
+LastMembersModified=最近更新されたメンバー%s件
+LastSubscriptionsModified=最近更新されたサブスクリプション%s件
 String=文字列
 Text=テキスト
 Int=int型
 DateAndTime=日時
-PublicMemberCard=メンバパブリックカード
+PublicMemberCard=メンバー公開カード
 SubscriptionNotRecorded=サブスクリプションは記録されていない
 AddSubscription=サブスクリプションを作成する
 ShowSubscription=サブスクリプションを表示する
 # Label of email templates
-SendingAnEMailToMember=メンバに情報メールを送信する
+SendingAnEMailToMember=メンバーに情報メールを送信する
 SendingEmailOnAutoSubscription=自動登録に関するメールの送信
-SendingEmailOnMemberValidation=新規メンバの検証に関するメールの送信
+SendingEmailOnMemberValidation=新規メンバーの承認に関するメールの送信
 SendingEmailOnNewSubscription=新規サブスクリプションでメールを送信する
 SendingReminderForExpiredSubscription=期限切れのサブスクリプションのリマインダーを送信する
 SendingEmailOnCancelation=キャンセル時にメールを送信する
 SendingReminderActionComm=議題イベントのリマインダーを送信する
 # Topic of email templates
-YourMembershipRequestWasReceived=メンバシップを受け取りました。
-YourMembershipWasValidated=メンバシップが検証された
+YourMembershipRequestWasReceived=メンバーシップを受け取りました。
+YourMembershipWasValidated=メンバーシップが承認されました。
 YourSubscriptionWasRecorded=新規サブスクリプションが記録された
 SubscriptionReminderEmail=サブスクリプションリマインダー
-YourMembershipWasCanceled=メンバシップがキャンセルされた
+YourMembershipWasCanceled=メンバーシップがキャンセルされました。
 CardContent=あなたの会員カードの内容
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=メンバシップリクエストを受信したことをお知らせする。 <br> <br>
-ThisIsContentOfYourMembershipWasValidated=メンバシップが次の情報で検証されたことをお知らせする：<br> <br>
+ThisIsContentOfYourMembershipRequestWasReceived=メンバーシップのリクエストを受領したことをお知らせします。 <br> <br>
+ThisIsContentOfYourMembershipWasValidated=メンバーシップが下記の情報で承認されたことをお知らせします：<br> <br>
 ThisIsContentOfYourSubscriptionWasRecorded=新規サブスクリプションが記録されたことをお知らせする。 <br> <br>
 ThisIsContentOfSubscriptionReminderEmail=サブスクリプションの有効期限が近づいているか、すでに有効期限が切れていることをお知らせする(__MEMBER_LAST_SUBSCRIPTION_DATE_END__)。更新していただければ幸いです。 <br> <br>
-ThisIsContentOfYourCard=これは私たちがあなたについて持っている情報の要約です。何かが不正確であれば連絡すること。 <br> <br>
+ThisIsContentOfYourCard=私共の持っているあなたについて情報の概要です。何か相違があればご連絡ください。 <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=ゲストの自動登録の場合に受信する通知メールの件名
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=ゲストの自動登録の場合に受信する通知メールの内容
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=メンバの自動サブスクリプションでメンバに電子メールを送信するために使用する電子メールテンプレート
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=メンバの検証時にメンバに電子メールを送信するために使用する電子メールテンプレート
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=新規サブスクリプションの記録でメンバに電子メールを送信するために使用する電子メールテンプレート
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=メンバーに対してメンバーの自動サブスクリプションについての電子メールを送信する際使用するテンプレート
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=メンバーに対してメンバーの承認についての電子メールを送信する際使用するテンプレート
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=メンバーに対して新規サブスクリプションの記録についての電子メールを送信する際使用するテンプレート
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=サブスクリプションの有効期限が近づいたときにメールリマインダーを送信するために使用するメールテンプレート
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=メンバのキャンセル時にメンバに電子メールを送信するために使用する電子メールテンプレート
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=メンバーに対してメンバーのキャンセルについての電子メールを送信する際使用するテンプレート
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=メンバーの除外時にメンバーに電子メールを送信するために使用する電子メールテンプレート
 DescADHERENT_MAIL_FROM=自動メールの送信者メール
 DescADHERENT_ETIQUETTE_TYPE=ラベルページのフォーマット
-DescADHERENT_ETIQUETTE_TEXT=メンバのアドレスシートに印刷されたテキスト
+DescADHERENT_ETIQUETTE_TEXT=メンバーのアドレスシートに印刷されたテキスト
 DescADHERENT_CARD_TYPE=カードのページのフォーマット
-DescADHERENT_CARD_HEADER_TEXT=メンバカードの上に印刷されたテキスト
-DescADHERENT_CARD_TEXT=テキストは、(左揃え)メンバカードに印刷
-DescADHERENT_CARD_TEXT_RIGHT=テキストは(右揃え)のメンバカードに印刷
-DescADHERENT_CARD_FOOTER_TEXT=メンバカードの下部に印刷されたテキスト
+DescADHERENT_CARD_HEADER_TEXT=メンバーカードの上に印刷されたテキスト
+DescADHERENT_CARD_TEXT=メンバーカードに印刷されたテキスト（左寄せ）
+DescADHERENT_CARD_TEXT_RIGHT=メンバーカードに印刷されたテキスト（右寄せ）
+DescADHERENT_CARD_FOOTER_TEXT=メンバーカードの下部に印刷されたテキスト
 ShowTypeCard=種別 &quot;%s&quot;を表示
 HTPasswordExport=htpasswordファイルの生成
-NoThirdPartyAssociatedToMember=このメンバに関連付けられている取引先ません
-MembersAndSubscriptions= メンバとSubscriptions
+NoThirdPartyAssociatedToMember=このメンバーには取引先が関連付けられていません
+MembersAndSubscriptions= メンバーとサブスクリプション
 MoreActions=記録上の相補的なアクション
 MoreActionsOnSubscription=サブスクリプションを記録するときにデフォルトで提案される補完的なアクション
 MoreActionBankDirect=銀行口座に直接エントリを作成する
 MoreActionBankViaInvoice=請求書と銀行口座での支払いを作成する
 MoreActionInvoiceOnly=なし支払いで請求書を作成する。
 LinkToGeneratedPages=訪問カードを生成
-LinkToGeneratedPagesDesc=この画面では、すべてのメンバまたは特定のメンバのためのビジネスカードを持つPDFファイルを生成することができる。
-DocForAllMembersCards=すべてのメンバ<b>(：%s</b>フォーマット出力の実際の設定)のためのビジネスカードを生成
-DocForOneMemberCards=特定のメンバの名刺を<b>(：%s</b>出力実際に設定するためのフォーマット)を生成
-DocForLabels=アドレスシート<b>(：%s</b>出力の形式は実際の設定)を生成
+LinkToGeneratedPagesDesc=この画面では全てのメンバーもしくは特定のメンバーの名刺のPDFファイルを生成できます。
+DocForAllMembersCards=全てのメンバーの名刺を生成する
+DocForOneMemberCards=特定のメンバーの名刺を生成する
+DocForLabels=アドレスシートを生成
 SubscriptionPayment=サブスクリプション費用の支払い
 LastSubscriptionDate=最新のサブスクリプション支払いの日付
 LastSubscriptionAmount=最新のサブスクリプションの量
 LastMemberType=前回のメンバー種別
-MembersStatisticsByCountries=国別メンバ統計
-MembersStatisticsByState=都道府県/州によってメンバの統計
-MembersStatisticsByTown=町によってメンバの統計
-MembersStatisticsByRegion=地域別の会員統計
-NbOfMembers=会員数
-NbOfActiveMembers=現在アクティブなメンバの数
-NoValidatedMemberYet=いいえ検証メンバが見つからなかった
-MembersByCountryDesc=この画面には、国によるメンバの統計情報を表示する。グラフィックは、Googleのオンライングラフサービスに依存するが、インターネット接続が機能している場合にのみ使用できる。
-MembersByStateDesc=この画面では、州/地方/州によってメンバにあなたの統計を示している。
-MembersByTownDesc=この画面には、町でメンバの統計情報を表示する。
+MembersStatisticsByCountries=国別メンバー統計
+MembersStatisticsByState=州・都道府県別メンバー統計
+MembersStatisticsByTown=市区町村別メンバー統計
+MembersStatisticsByRegion=地域別メンバー統計
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
+NoValidatedMemberYet=承認済みのメンバーが見つかりませんでした
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=読みたい統計を選択...
 MenuMembersStats=統計
-LastMemberDate=最新の会員日
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=最後のサブスクリプションの日付
-MemberNature=メンバの性質
-MembersNature=メンバの性質
-Public=情報が公開されている
-NewMemberbyWeb=新規メンバが追加された。承認を待っている
-NewMemberForm=新規メンバフォーム
-SubscriptionsStatistics=サブスクリプションの統計
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
+NewMemberbyWeb=新規メンバーが追加されました。承認待ちです。
+NewMemberForm=新規メンバーフォーム
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=サブスクリプションの数
-AmountOfSubscriptions=サブスクリプションの量
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=売上高(法人の場合)または予算(基礎用)
 DefaultAmount=サブスクリプションのデフォルトの量
 CanEditAmount=訪問者は、そのサブスクリプションの量を選択/編集することができる
 MEMBER_NEWFORM_PAYONLINE=統合されたオンライン決済のページにジャンプ
 ByProperties=本質的に
-MembersStatisticsByProperties=本質的にメンバの統計
-MembersByNature=この画面には、メンバの性質に関する統計が表示される。
-MembersByRegion=この画面には、地域ごとのメンバの統計が表示される。
+MembersStatisticsByProperties=性質別メンバー統計
 VATToUseForSubscriptions=サブスクリプションに使用するVAT率
 NoVatOnSubscription=サブスクリプションのVATなし
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=請求書へのサブスクリプションラインに使用される製品：%s
 NameOrCompany=名前または法人
 SubscriptionRecorded=サブスクリプションが記録された
-NoEmailSentToMember=メンバにメールが送信されません
-EmailSentToMember=%sでメンバに送信された電子メール
+NoEmailSentToMember=メンバーにメールが送信されていません
+EmailSentToMember=%sででメンバーに送信された電子メール
 SendReminderForExpiredSubscriptionTitle=期限切れのサブスクリプションについてメールでリマインダーを送信する
-SendReminderForExpiredSubscription=サブスクリプションの有効期限が近づいたときに、メンバにメールでリマインダーを送信する(パラメーターは、リマインダーを送信するサブスクリプションの終了までの日数。セミコロンで区切った日数のリストにすることができる。 例：'10; 5; 0; -5')
-MembershipPaid=現在の期間に支払われたメンバシップ(%sまで)
+SendReminderForExpiredSubscription=サブスクリプションの期限切れが近づいた時にメンバーに電子メールでリマインダーを送る（パラメーターはサブスクリプションの終了何日前にリマインダーを送るかという数値です。セミコロンを使用して複数指定することもできます。例：「10;5;0;-5」）
+MembershipPaid=現在の期間に支払われたメンバーシップ(%sまで)
 YouMayFindYourInvoiceInThisEmail=このメールに請求書が添付されている場合がある
-XMembersClosed=%sメンバ(s)がクローズした
+XMembersClosed=メンバー%s件がクローズしました
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index 0c1e7ea97fb..0f3a688c10d 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=定義された権限のリスト
 SeeExamples=こちらの例をご覧ください
 EnabledDesc=このフィールドをアクティブにする条件(例：1または$ conf-> global-> MYMODULE_MYOPTION)
 VisibleDesc=フィールドは表示されているか？ (例：0 =表示されない、1 =リストおよび作成/更新/表示フォームで表示、2 =リストでのみ表示、3 =作成/更新/表示フォームでのみ表示(リストではない)、4 =リストおよび更新/表示フォームでのみ表示(作成しない)、5 =リストおよび表示フォームでのみ表示(作成しない、更新しない)<br> <br>負の値を使用すると、フィールドはデフォルトでリストに表示されないが、表示用に選択できる)。 <br> <br>これは、次のような式にできる。例: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=互換性のあるPDFドキュメントでこのフィールドを表示する。「位置」フィールドで位置を管理できる。<br/>現在、既知の互換性のあるPDFモデルは次のとおり  : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>ドキュメントに対して :</strong><br/>0 = 非表示 <br/>1 = 表示<br/>2 = 空でない場合のみ表示<br/><br/><strong>ドキュメント行に対して :</strong><br/>0 = 非表示 <br/>1 = カラム内で表示<br/>3 = 説明欄の後の行説明カラムの中で表示<br/>4 = 空でない場合のみ、説明欄の後の行説明カラムの中で表示
+DisplayOnPdfDesc=互換性のあるPDFドキュメントにこのフィールドを表示する。 "Position" フィールドで位置を管理できる。<br>現在、既知の互換性のあるPDFモデルは次のとおり : eratosthene (注文), espadon (発送), sponge (請求), cyan (提案/見積), cornas (仕入発注)<br><br><strong>ドキュメントの場合:</strong><br>0 = 非表示 <br>1 = 表示<br>2 = 空でない場合のみ表示<br><br><strong>ドキュメント行の場合 :</strong><br>0 = 非表示 <br>1 = カラムに表示<br>3 = 説明の後の説明カラムに表示<br>4 = 空でない場合のみ、説明の後の説明カラムに表示
 DisplayOnPdf=PDFで表示
 IsAMeasureDesc=フィールドの値を累積して、合計をリストに入れることはできるか？ (例：1または0)
 SearchAllDesc=クイック検索ツールから検索するためにフィールドが使用されているか？ (例：1または0)
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 4656b0420d0..2ff627924ac 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=このオプションを使用するには、PHPインスト
 ProfIdShortDesc=<b>教授イド%sは、</b>サードパーティの国に応じて情報 。 <br>たとえば、国<b>%s</b>のために、それはコード<b>%s</b> 。
 DolibarrDemo=Dolibarr ERP / CRMデモ
 StatsByNumberOfUnits=製品/サービスの数量の合計の統計
-StatsByNumberOfEntities=参照エンティティの数の統計(請求書の数、または注文...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=提案数
 NumberOfCustomerOrders=受注数
 NumberOfCustomerInvoices=顧客の請求書の数
@@ -289,4 +289,4 @@ PopuProp=提案の人気による製品/サービス
 PopuCom=注文の人気別の製品/サービス
 ProductStatistics=製品/サービス統計
 NbOfQtyInOrders=注文数量
-SelectTheTypeOfObjectToAnalyze=分析するオブジェクトのタイプを選択する...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/ja_JP/partnership.lang b/htdocs/langs/ja_JP/partnership.lang
new file mode 100644
index 00000000000..7f747dd3139
--- /dev/null
+++ b/htdocs/langs/ja_JP/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = パートナーシップ管理
+PartnershipDescription = モジュールパートナーシップ管理
+PartnershipDescriptionLong= モジュールパートナーシップ管理
+
+#
+# Menu
+#
+NewPartnership = 新規パートナーシップ
+ListOfPartnerships = パートナーシップのリスト
+
+#
+# Admin page
+#
+PartnershipSetup = パートナーシップの設定
+PartnershipAbout = パートナーシップについて
+PartnershipAboutPage = ページについてのパートナーシップ
+
+
+#
+# Object
+#
+DatePartnershipStart=開始日
+DatePartnershipEnd=終了日
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = 下書き
+PartnershipAccepted = 承認済
+PartnershipRefused = 拒否
+PartnershipCanceled = キャンセル
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
index 88985c01ebe..8dc3de69bbc 100644
--- a/htdocs/langs/ja_JP/productbatch.lang
+++ b/htdocs/langs/ja_JP/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=シリアル番号%sはすでに製品%sに使用され
 TooManyQtyForSerialNumber=シリアル番号%sに対して使用できる製品%sは1つだけ。
 BatchLotNumberingModules=ロット管理のバッチ製品の自動生成のオプション
 BatchSerialNumberingModules=シリアル番号で管理されるバッチ製品の自動生成のオプション
+ManageLotMask=カスタムマスク
 CustomMasks=製品カードにマスクを定義するオプションを追加する
 LotProductTooltip=製品カードにオプションを追加して、専用のバッチ番号マスクを定義する
 SNProductTooltip=製品カードに専用のシリアル番号マスクを定義するオプションを追加する
 QtyToAddAfterBarcodeScan=スキャンされたバーコード/ロット/シリアルごとに追加する数量
-
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index d09196cc603..36b6f07b785 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=販売のみのサービス
 ServicesOnPurchaseOnly=購入のみのサービス
 ServicesNotOnSell=非売品および非購入のサービス
 ServicesOnSellAndOnBuy=販売および購入のためのサービス
-LastModifiedProductsAndServices=最新の%s変更された製品/サービス
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=最新の%s記録された製品
 LastRecordedServices=最新の%s記録されたサービス
 CardProduct0=製品
@@ -73,12 +73,12 @@ SellingPrice=販売価格
 SellingPriceHT=販売価格(税込)
 SellingPriceTTC=販売価格(税込)
 SellingMinPriceTTC=最低販売価格(税込)
-CostPriceDescription=この価格フィールド(税抜き)を使用して、この製品の法人への平均コストを保存できる。たとえば、平均購入価格に平均生産および流通コストを加えたものから、自分で計算した任意の価格にすることができる。
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=この値は、マージンの計算に使用できる。
 SoldAmount=販売額
 PurchasedAmount=購入金額
 NewPrice=新価格
-MinPrice=最小販売価格
+MinPrice=Min. selling price
 EditSellingPriceLabel=販売価格ラベルを編集する
 CantBeLessThanMinPrice=販売価格は、本製品(税抜き%s)に許可される最小値より小さくなることはない。あなたはあまりにも重要な割引を入力した場合にも、このメッセージが表示される。
 ContractStatusClosed=閉じた
@@ -157,11 +157,11 @@ ListServiceByPopularity=人気によるサービスのリスト
 Finished=工業製品
 RowMaterial=最初の材料
 ConfirmCloneProduct=製品またはサービスの複製を作成してもよいか<b>%s </b>？
-CloneContentProduct=製品/サービスのすべての主要な情報を複製する
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=価格の複製
-CloneCategoriesProduct=リンクされたタグ/カテゴリの複製
-CloneCompositionProduct=仮想製品/サービスの複製
-CloneCombinationsProduct=製品バリアントの複製
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=本製品が使用される
 NewRefForClone=REF。新製品/サービスの
 SellingPrices=販売価格
@@ -170,12 +170,12 @@ CustomerPrices=顧客価格
 SuppliersPrices=仕入先価格
 SuppliersPricesOfProductsOrServices=(製品またはサービスの)仕入先価格
 CustomCode=税関|商品| HSコード
-CountryOrigin=原産国
-RegionStateOrigin=地域 原産地
-StateOrigin=州|県 原産地
-Nature=製品の性質(素材/完成品)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=製品の性質
-NatureOfProductDesc=原材料または完成品
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=短縮ラベル
 Unit=単位
 p=u.
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 4921c3bdd8d..e9b62cee0ab 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=プロジェクトの連絡先
 ProjectsImContactFor=私が明示的に連絡を取っているプロジェクト
 AllAllowedProjects=私が読むことができるすべてのプロジェクト(私の+公開)
 AllProjects=すべてのプロジェクト
-MyProjectsDesc=このビューは、連絡先のプロジェクトに限定される
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトを紹介します。
 TasksOnProjectsPublicDesc=このビューには、読み取りが許可されているプロジェクトのすべてのタスクが表示される。
 ProjectsPublicTaskDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
 ProjectsDesc=このビューはすべてのプロジェクトを(あなたのユーザー権限はあなたに全てを表示する権限を付与)を提示します。
 TasksOnProjectsDesc=このビューには、すべてのプロジェクトのすべてのタスクが表示される(ユーザー権限により、すべてを表示する権限が付与される)。
-MyTasksDesc=このビューは、連絡先のプロジェクトまたはタスクに限定される
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=開いているプロジェクトのみが表示される(ドラフトまたはクローズステータスのプロジェクトは表示されない)。
 ClosedProjectsAreHidden=閉じたプロジェクトは表示されない。
 TasksPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
 TasksDesc=このビューは、すべてのプロジェクトとタスク(あなたのユーザー権限はあなたに全てを表示する権限を付与)を提示します。
 AllTaskVisibleButEditIfYouAreAssigned=資格のあるプロジェクトのすべてのタスクが表示されるが、選択したユーザーに割り当てられたタスクの時間のみを入力できる。時間を入力する必要がある場合は、タスクを割り当てる。
-OnlyYourTaskAreVisible=自分に割り当てられたタスクのみが表示される。タスクが表示されておらず、時間を入力する必要がある場合は、自分にタスクを割り当てる。
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=プロジェクトのタスク
 ProjectCategories=プロジェクトタグ/カテゴリ
 NewProject=新規プロジェクト
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=タスクに割り当てられていない
 NoUserAssignedToTheProject=このプロジェクトに割り当てられているユーザーはない
 TimeSpentBy=によって費やされた時間
 TasksAssignedTo=に割り当てられたタスク
-AssignTaskToMe=私にタスクを割り当てる
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=タスクを%sに割り当てる
 SelectTaskToAssign=割り当てるタスクを選択すること...
 AssignTask=割当
diff --git a/htdocs/langs/ja_JP/recruitment.lang b/htdocs/langs/ja_JP/recruitment.lang
index bb2081baa02..3b0751d47d9 100644
--- a/htdocs/langs/ja_JP/recruitment.lang
+++ b/htdocs/langs/ja_JP/recruitment.lang
@@ -68,9 +68,9 @@ RecruitmentCandidatures=アプリケーション
 InterviewToDo=する面接
 AnswerCandidature=アプリケーションの回答
 YourCandidature=あなたの申請
-YourCandidatureAnswerMessage=お申し込みいただきありがとうございます。 <br>..。
+YourCandidatureAnswerMessage=お申し込みいただきありがとうございる。 <br>..。
 JobClosedTextCandidateFound=求人はクローズされている。ポジションが埋まった。
 JobClosedTextCanceled=求人はクローズされている。
 ExtrafieldsJobPosition=補完的な属性(職位)
-ExtrafieldsCandidatures=補完的な属性(求人応募)
+ExtrafieldsApplication=補完的な属性(求人応募)
 MakeOffer=申し出する
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index 0a58d6837b3..310d3eff816 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=この出荷を参照<b>%s </b>で検査してもよい
 ConfirmCancelSending=この出荷をキャンセルしてもよいか？
 DocumentModelMerou=メロウA5モデル
 WarningNoQtyLeftToSend=警告、出荷待ちの製品はない。
-StatsOnShipmentsOnlyValidated=出荷に関して実施された統計は検査済みです。使用日は出荷の検査日です(飛行機の配達日は常にわかっているわけではない)。
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=配達予定日
 RefDeliveryReceipt=参照納品書
 StatusReceipt=ステータス納品書
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 869a0a87d34..5c123dda1c0 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=このオブジェクト用に事前定義され
 DispatchVerb=派遣
 StockLimitShort=アラートの制限
 StockLimit=アラートの在庫制限
-StockLimitDesc=(空)は警告がないことを意味する。 <br> 0は、在庫が空になるとすぐに警告として使用される。
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=現物在庫
 RealStock=実在庫
 RealStockDesc=現物/実在庫は、現在倉庫にある在庫 。
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index 63ad09b98ed..9df51f63327 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=%s：パスワードに変更
 SubjectNewPassword=%sの新規パスワード
 GroupRights=グループのパーミッション
 UserRights=ユーザ権限
+Credentials=Credentials
 UserGUISetup=ユーザディスプレイの設定
 DisableUser=無効にする
 DisableAUser=ユーザを無効にする
@@ -105,7 +106,7 @@ UseTypeFieldToChange=フィールドタイプを使用して変更
 OpenIDURL=OpenID URL
 LoginUsingOpenID=OpenIDを使用してログインする
 WeeklyHours=労働時間(週あたり)
-ExpectedWorkedHours=週あたりの予想労働時間
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=ユーザの色
 DisabledInMonoUserMode=メンテナンスモードでは無効
 UserAccountancyCode=ユーザアカウンティングコード
@@ -115,7 +116,7 @@ DateOfEmployment=雇用日
 DateEmployment=雇用
 DateEmploymentstart=雇用開始日
 DateEmploymentEnd=雇用終了日
-RangeOfLoginValidity=ログイン有効期間
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=自分のユーザレコードを無効にすることはできません
 ForceUserExpenseValidator=経費報告書検証ツールを強制する
 ForceUserHolidayValidator=強制休暇リクエストバリデーター
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index dc0e8a6e15f..27a0ef7bef6 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=使用可能なすべての言語の
 GenerateSitemaps=ウェブサイトサイトマップファイルを生成する
 ConfirmGenerateSitemaps=確定すると、既存のサイトマップファイルが消去される...
 ConfirmSitemapsCreation=サイトマップの生成を確認する
-SitemapGenerated=生成されたサイトマップ
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=ファビコン
 ErrorFaviconType=ファビコンはpngを必要とする
-ErrorFaviconSize=ファビコンのサイズは32x32を必要とする
-FaviconTooltip=32x32のpngを必要とする画像をアップロードする
+ErrorFaviconSize=ファビコンのサイズは16x16、32x32、または64x64であること
+FaviconTooltip=画像をアップロードする、画像はpng  (16x16, 32x32 or 64x64) であること
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/ka_GE/boxes.lang
+++ b/htdocs/langs/ka_GE/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/ka_GE/categories.lang
+++ b/htdocs/langs/ka_GE/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 154400c6536..fbe75f09ab0 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/ka_GE/ecm.lang b/htdocs/langs/ka_GE/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/ka_GE/ecm.lang
+++ b/htdocs/langs/ka_GE/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/ka_GE/eventorganization.lang b/htdocs/langs/ka_GE/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/ka_GE/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/ka_GE/knowledgemanagement.lang b/htdocs/langs/ka_GE/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/ka_GE/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index dc2a83f2015..13793aad13f 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ka_GE/modulebuilder.lang b/htdocs/langs/ka_GE/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/ka_GE/modulebuilder.lang
+++ b/htdocs/langs/ka_GE/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/ka_GE/partnership.lang b/htdocs/langs/ka_GE/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/ka_GE/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/ka_GE/productbatch.lang
+++ b/htdocs/langs/ka_GE/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/ka_GE/recruitment.lang b/htdocs/langs/ka_GE/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/ka_GE/recruitment.lang
+++ b/htdocs/langs/ka_GE/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/ka_GE/sendings.lang b/htdocs/langs/ka_GE/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/ka_GE/sendings.lang
+++ b/htdocs/langs/ka_GE/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/ka_GE/users.lang b/htdocs/langs/ka_GE/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/ka_GE/users.lang
+++ b/htdocs/langs/ka_GE/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/km_KH/accountancy.lang
+++ b/htdocs/langs/km_KH/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/km_KH/banks.lang
+++ b/htdocs/langs/km_KH/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/km_KH/bills.lang b/htdocs/langs/km_KH/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/km_KH/bills.lang
+++ b/htdocs/langs/km_KH/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/km_KH/boxes.lang b/htdocs/langs/km_KH/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/km_KH/boxes.lang
+++ b/htdocs/langs/km_KH/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/km_KH/cashdesk.lang b/htdocs/langs/km_KH/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/km_KH/cashdesk.lang
+++ b/htdocs/langs/km_KH/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/km_KH/categories.lang b/htdocs/langs/km_KH/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/km_KH/categories.lang
+++ b/htdocs/langs/km_KH/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang
index 154400c6536..fbe75f09ab0 100644
--- a/htdocs/langs/km_KH/companies.lang
+++ b/htdocs/langs/km_KH/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/km_KH/compta.lang
+++ b/htdocs/langs/km_KH/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/km_KH/ecm.lang b/htdocs/langs/km_KH/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/km_KH/ecm.lang
+++ b/htdocs/langs/km_KH/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/km_KH/eventorganization.lang b/htdocs/langs/km_KH/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/km_KH/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/km_KH/knowledgemanagement.lang b/htdocs/langs/km_KH/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/km_KH/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/km_KH/mails.lang b/htdocs/langs/km_KH/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/km_KH/mails.lang
+++ b/htdocs/langs/km_KH/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 3a8d17ec853..8732bfe917c 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/km_KH/members.lang b/htdocs/langs/km_KH/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/km_KH/members.lang
+++ b/htdocs/langs/km_KH/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/km_KH/modulebuilder.lang b/htdocs/langs/km_KH/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/km_KH/modulebuilder.lang
+++ b/htdocs/langs/km_KH/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/km_KH/other.lang
+++ b/htdocs/langs/km_KH/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/km_KH/partnership.lang b/htdocs/langs/km_KH/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/km_KH/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/km_KH/productbatch.lang b/htdocs/langs/km_KH/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/km_KH/productbatch.lang
+++ b/htdocs/langs/km_KH/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/km_KH/products.lang
+++ b/htdocs/langs/km_KH/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/km_KH/projects.lang
+++ b/htdocs/langs/km_KH/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/km_KH/recruitment.lang b/htdocs/langs/km_KH/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/km_KH/recruitment.lang
+++ b/htdocs/langs/km_KH/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/km_KH/sendings.lang b/htdocs/langs/km_KH/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/km_KH/sendings.lang
+++ b/htdocs/langs/km_KH/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/km_KH/stocks.lang
+++ b/htdocs/langs/km_KH/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/km_KH/users.lang b/htdocs/langs/km_KH/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/km_KH/users.lang
+++ b/htdocs/langs/km_KH/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/km_KH/website.lang b/htdocs/langs/km_KH/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/km_KH/website.lang
+++ b/htdocs/langs/km_KH/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index f0d117c5ea5..0c10c3d755f 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index 10b886178a1..26a8b041e45 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index a1be5f9460b..2477701eef5 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=ಪರಿಶೀಲಿಸಿ
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/kn_IN/boxes.lang
+++ b/htdocs/langs/kn_IN/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index a70407c989f..1553c32c5a6 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/kn_IN/categories.lang
+++ b/htdocs/langs/kn_IN/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 02ffb5f7a43..842bd4ac027 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=ಸಂಸ್ಥೆ ಹೆಸರು %s ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ಮತ್ತೊಂದನ್ನು ಆಯ್ದುಕೊಳ್ಳಿರಿ.
 ErrorSetACountryFirst=ಮೊದಲು ದೇಶವನ್ನು ಹೊಂದಿಸಿ.
 SelectThirdParty=ಮೂರನೇ ವ್ಯಕ್ತಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿರಿ.
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=ಸಂಪರ್ಕ / ವಿಳಾಸವೊಂದನ್ನು ಅಳಿಸಿ.
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=ದೂರವಾಣಿ
 Skype=ಸ್ಕೈಪ್
 Call=ಕರೆ
 Chat=ಚಾಟ್
-PhonePro=ವೃತ್ತಿಪರ ದೂರವಾಣಿ
+PhonePro=Bus. phone
 PhonePerso=ವೈಯಿಕ್ತಿಕ ದೂರವಾಣಿ
 PhoneMobile=ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=ಪಿನ್ ಕೋಡ್
 Town=ನಗರ
 Web=ವೆಬ್
 Poste= ಸ್ಥಾನ
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=ತೃತೀಯ ಪಾರ್ಟಿಯು ಗ್ರಾಹಕ ಅಥವಾ ನಿರೀಕ್ಷಿತರಾಗಿದ್ದ ವೇಳೆ ಅಗತ್ಯ
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact='ನಿರೀಕ್ಷಿತ'ದಿಂದ 'ಸಂಪರ್ಕ'ಕ್ಕೆ
 CompanyDeleted="%s" ಸಂಸ್ಥೆಯನ್ನು ಡೇಟಾಬೇಸ್-ನಿಂದ ತೆಗೆಯಲಾಗಿದೆ.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=ತೆರೆಯಲಾಗಿದೆ
 ActivityCeased=ಮುಚ್ಚಲಾಗಿದೆ
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=ಪ್ರಸ್ತುತ ಬಾಕಿ ಉಳಿದಿರುವ ಬಿಲ್
 OutstandingBill=ಗರಿಷ್ಟ ಬಾಕಿ ಉಳಿದಿರುವ ಬಿಲ್ ಮೊತ್ತ
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=ಕೋಡ್ ಉಚಿತ. ಈ ಕೋಡ್ 
 ManagingDirectors=ಮ್ಯಾನೇಜರ್ (ಗಳು) ಹೆಸರು (ಸಿಇಒ, ನಿರ್ದೇಶಕ, ಅಧ್ಯಕ್ಷ ...)
 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, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/kn_IN/ecm.lang b/htdocs/langs/kn_IN/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/kn_IN/ecm.lang
+++ b/htdocs/langs/kn_IN/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/kn_IN/eventorganization.lang b/htdocs/langs/kn_IN/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/kn_IN/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/kn_IN/knowledgemanagement.lang b/htdocs/langs/kn_IN/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/kn_IN/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index c486eab476a..bdd823a6664 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=ಇತರ
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=ಇತರ
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/kn_IN/modulebuilder.lang b/htdocs/langs/kn_IN/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/kn_IN/modulebuilder.lang
+++ b/htdocs/langs/kn_IN/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 65ae9f5a554..a4e928da2d2 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/kn_IN/partnership.lang b/htdocs/langs/kn_IN/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/kn_IN/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/kn_IN/productbatch.lang b/htdocs/langs/kn_IN/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/kn_IN/productbatch.lang
+++ b/htdocs/langs/kn_IN/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 8981b3b6729..a84efa5fa7c 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=ಮುಚ್ಚಲಾಗಿದೆ
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/kn_IN/recruitment.lang b/htdocs/langs/kn_IN/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/kn_IN/recruitment.lang
+++ b/htdocs/langs/kn_IN/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/kn_IN/sendings.lang b/htdocs/langs/kn_IN/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/kn_IN/sendings.lang
+++ b/htdocs/langs/kn_IN/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang
index 56b77126d93..effac97d337 100644
--- a/htdocs/langs/kn_IN/users.lang
+++ b/htdocs/langs/kn_IN/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 55af80d01e8..53aeba6a47d 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 0a4eaa689a5..1a54ad1c182 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=알리미
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index e50fd22f1f0..76102f7a731 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=부터
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 9c4c8589dfe..4eee15767e7 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=검사
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
index d26b6fe49f9..a65fcc0e16b 100644
--- a/htdocs/langs/ko_KR/boxes.lang
+++ b/htdocs/langs/ko_KR/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=가장 오래된 활성 만료 된 서비스
 BoxLastExpiredServices=만료 된 최신 서비스 %s의 가장 오래된 연락처
 BoxTitleLastActionsToDo=최근 %s 할 일
-BoxTitleLastContracts=최근 %s 수정 된 계약
-BoxTitleLastModifiedDonations=최근 %s 수정 된 기부
-BoxTitleLastModifiedExpenses=최근 %s 수정 된 비용 보고서
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=글로벌 활동 (송장, 제안서, 주문)
 BoxGoodCustomers=좋은 고객
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index 16169671a2d..ccf4c12504b 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=브라우저
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index 7c956eef157..7c90040acea 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -3,20 +3,20 @@ Rubrique=분류/범주
 Rubriques=분류/범주
 RubriquesTransactions=Tags/Categories of transactions
 categories=분류/범주
-NoCategoryYet=해당 분류/범주가 없습니다. 
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 4ad4fe599ff..5f65e1952d8 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=회사 이름 %s이 (가) 이미 있습니다. 다른 것을 선택하십시오.
 ErrorSetACountryFirst=먼저 국가를 설정하십시오.
 SelectThirdParty=협력업체 선택
-ConfirmDeleteCompany=이 회사와 관련된 모든 정보를 삭제 하시겠습니까?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=연락처 / 주소 삭제
-ConfirmDeleteContact=이 연락처와 관련된 모든 정보를 삭제 하시겠습니까?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=전화
 Skype=Skype
 Call=호출
 Chat=채팅
-PhonePro=프로필 전화
+PhonePro=Bus. phone
 PhonePerso=개인 전화
 PhoneMobile=모바일
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=우편 번호
 Town=시
 Web=웹
 Poste= 직위
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=협력업체가 고객 또는 잠재 고객 인 경우 필요
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=잠재거래처 연락처
 CompanyDeleted=회사 "%s"이 (가) 데이터베이스에서 삭제되었습니다.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=열기
 ActivityCeased=닫음
 ThirdPartyIsClosed=협력업체 폐쇄 됨
-ProductsIntoElements=제품 / 서비스 목록 %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=현재 미결제 금액
 OutstandingBill=미결 한도
 OutstandingBillReached=미결 한도 금액 도달
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=코드는 무료입니다. 이 코드는 언제든지 수
 ManagingDirectors=관리자 이름 (CEO, 이사, 사장 ...)
 MergeOriginThirdparty=중복 된 협력업체 (삭제하려는 협력업체)
 MergeThirdparties=협력업체 병합
-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 third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=영업 담당자 로그인
 SaleRepresentativeFirstname=영업 담당자의 이름
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 320af6ec40b..91bceb5e350 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/ko_KR/ecm.lang b/htdocs/langs/ko_KR/ecm.lang
index 2773e8f3a74..cdcffb04b61 100644
--- a/htdocs/langs/ko_KR/ecm.lang
+++ b/htdocs/langs/ko_KR/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/ko_KR/eventorganization.lang b/htdocs/langs/ko_KR/eventorganization.lang
new file mode 100644
index 00000000000..159c452242a
--- /dev/null
+++ b/htdocs/langs/ko_KR/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = 작성
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = 끝냄
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/ko_KR/knowledgemanagement.lang b/htdocs/langs/ko_KR/knowledgemanagement.lang
new file mode 100644
index 00000000000..bf81f127258
--- /dev/null
+++ b/htdocs/langs/ko_KR/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = 개략
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index 2d8bd79cbf8..d4a00dd719e 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 82fe0c19c0b..3e4f76343ab 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=연결 테스트
 ToClone=클론
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=복제 할 데이터가 없습니다.
 Of=의
 Go=바로 가기
@@ -246,7 +246,7 @@ DefaultModel=기본 문서 템플릿
 Action=이벤트
 About=개략
 Number=수
-NumberByMonth=월별 수
+NumberByMonth=Total reports by month
 AmountByMonth=월별 금액
 Numero=번호
 Limit=한도
@@ -341,8 +341,8 @@ KiloBytes=킬로바이트
 MegaBytes=메가 바이트
 GigaBytes=기가 바이트
 TeraBytes=테라 바이트
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=별
 From=부터
 FromDate=부터
 FromLocation=부터
-at=at
 to=까지
 To=까지
+ToDate=까지
+ToLocation=까지
+at=at
 and=그리고
 or=또는
 Other=기타
@@ -843,7 +845,7 @@ XMoreLines=%s 행 숨김
 ShowMoreLines=Show more/less lines
 PublicUrl=공개 URL
 AddBox=상자 추가
-SelectElementAndClick=요소를 선택하고 %s을 클릭하십시오.
+SelectElementAndClick=Select an element and click on %s
 PrintFile=인쇄 파일 %s
 ShowTransaction=은행 계좌의 항목 표시
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=기각됨
 ListOf=%s 목록
 ListOfTemplates=템플릿 목록
 Gender=성별
-Genderman=남자
-Genderwoman=여자
+Genderman=Male
+Genderwoman=Female
 Genderother=기타
 ViewList=목록 보기
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index a3729c68600..f1eda130c94 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=지우다
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=통계
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ko_KR/modulebuilder.lang b/htdocs/langs/ko_KR/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/ko_KR/modulebuilder.lang
+++ b/htdocs/langs/ko_KR/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index bd2b6719256..479d5c3915e 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/ko_KR/partnership.lang b/htdocs/langs/ko_KR/partnership.lang
new file mode 100644
index 00000000000..76f29213307
--- /dev/null
+++ b/htdocs/langs/ko_KR/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=시작날짜
+DatePartnershipEnd=종료날짜
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = 작성
+PartnershipAccepted = Accepted
+PartnershipRefused = 거절됨
+PartnershipCanceled = 취소 됨
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang
index 27e4cbad761..54e34241620 100644
--- a/htdocs/langs/ko_KR/productbatch.lang
+++ b/htdocs/langs/ko_KR/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 556f1558ac9..7d3974c3ce1 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=닫은
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 15df7bd0c3a..f96d108ce0a 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/ko_KR/recruitment.lang b/htdocs/langs/ko_KR/recruitment.lang
index 7514f8319ca..b2d698c37bb 100644
--- a/htdocs/langs/ko_KR/recruitment.lang
+++ b/htdocs/langs/ko_KR/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang
index 50cc2143119..daa935ebaa5 100644
--- a/htdocs/langs/ko_KR/sendings.lang
+++ b/htdocs/langs/ko_KR/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 3cbf0afc509..062257db139 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index 8b54361b072..34e93843c41 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=사용 안함
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index 59cc6587e4c..c5fbd107065 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 9298e3177e4..31b3bae5003 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 83482cae80f..74c124e3051 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index 65fcec00a0c..3884496ab64 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/lo_LA/boxes.lang
+++ b/htdocs/langs/lo_LA/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/lo_LA/categories.lang
+++ b/htdocs/langs/lo_LA/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 99a4a7485f1..87bbde5d805 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index efb8593aa8f..1f9c7124db6 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/lo_LA/ecm.lang b/htdocs/langs/lo_LA/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/lo_LA/ecm.lang
+++ b/htdocs/langs/lo_LA/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/lo_LA/eventorganization.lang b/htdocs/langs/lo_LA/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/lo_LA/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/lo_LA/knowledgemanagement.lang b/htdocs/langs/lo_LA/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/lo_LA/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 454f69f07e5..85f622e4796 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index 6786011e692..304c76e63aa 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=ລຶບ
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 9b6ee4c9d19..adb85986033 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/lo_LA/partnership.lang b/htdocs/langs/lo_LA/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/lo_LA/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/lo_LA/productbatch.lang b/htdocs/langs/lo_LA/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/lo_LA/productbatch.lang
+++ b/htdocs/langs/lo_LA/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 610f1575d84..da4cf4d7302 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 1926aed46c7..50e0af1b278 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/lo_LA/recruitment.lang b/htdocs/langs/lo_LA/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/lo_LA/recruitment.lang
+++ b/htdocs/langs/lo_LA/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/lo_LA/sendings.lang b/htdocs/langs/lo_LA/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/lo_LA/sendings.lang
+++ b/htdocs/langs/lo_LA/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 85e2246d09a..ebc2fc967da 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index 519378d65cf..dd400e54715 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=ປິດການນຳໃຊ້
 DisableAUser=ປິດຜູ້ນຳໃຊ້
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index c36e8e20b73..2fc1172e648 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Nuoroda
 LabelAccount=Sąskaitos etiketė
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Žurnalas
@@ -297,7 +297,7 @@ NoNewRecordSaved=Daugiau žurnalo įrašų nėra
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 42dfa614740..605cfb3ab80 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Apsaugos paruošimas
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Klaida, šis modulis reikalauja PHP versijos %s ar aukštesnės
 ErrorModuleRequireDolibarrVersion=Klaida, šiam moduliui reikalinga Dolibarr versija %s arba aukštesnė
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Nesiūlyti
 NoActiveBankAccountDefined=Nenustatyta aktyvi banko sąskaita
 OwnerOfBankAccount=Banko sąskaitos %s savininkas
 BankModuleNotActive=Banko sąskaitos modulis neįjungtas
-ShowBugTrackLink=Show link "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Įspėjimai
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Jūs turite paleisti šią koma
 YourPHPDoesNotHaveSSLSupport=SSL funkcijos negalimos Jūsų PHP
 DownloadMoreSkins=Parsisiųsti daugiau grafinių vaizdų (skins)
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Dalinis vertimas
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 2e254c32eba..a48924c160f 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Socialinio / fiskalinio mokesčio mokėjimas
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Iš
 TransferTo=Į
 TransferFromToDone=Pervedimas <b>%s</b> iš <b>%s</b> į <b>%s</b> užregistruotas.
 CheckTransmitter=Siuntėjas
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Banko čekiai
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Judėjimai
 PlannedTransactions=Planned entries
-Graph=Grafika
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Įmokos kvitas
 TransactionOnTheOtherAccount=Operacijos kitoje sąskaitoje
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Atgal į sąskaitą
 ShowAllAccounts=Rodyti visas sąskaitas
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Pasirinkti banko ataskaitą, susijusią su taikymu. Naudokite rūšiuojamą skaitmeninę reikšmę: YYYYMM arba YYYYMMDD
 EventualyAddCategory=Nurodyti kategoriją, kurioje klasifikuoti įrašus
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 598541d0fa3..441d539ec70 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Perskaičiuoti permokėtą sumą į turimą nuolaidą
 EnterPaymentReceivedFromCustomer=Įveskite gautą iš kliento mokėjimą
 EnterPaymentDueToCustomer=Atlikti mokėjimą klientui
 DisabledBecauseRemainderToPayIsZero=Neleidžiama, nes neapmokėtas likutis yra nulinis
-PriceBase=Kainos bazė
+PriceBase=Base price
 BillStatus=Sąskaitos-faktūros būklė
 StatusOfGeneratedInvoices=Sugeneruotų sąskaitų faktūrų būsena
 BillStatusDraft=Projektas (turi būti pripažintas galiojančiu)
@@ -454,7 +454,7 @@ RegulatedOn=Reguliuojama
 ChequeNumber=Čekio N°
 ChequeOrTransferNumber=Čekio/Pervedimo N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Čekio bankas
 CheckBank=Čekis
 NetToBePaid=Mokėjimas grynaisiais
diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
index 32ff1f94d93..eba996dc6ec 100644
--- a/htdocs/langs/lt_LT/boxes.lang
+++ b/htdocs/langs/lt_LT/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Seniausios aktyvios pasibaigusios paslaugos
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Visuminė veikla (sąskaitos-faktūros, pasiūlymai, užsakymai)
 BoxGoodCustomers=Geri klientai
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index d9b9c68951e..e01655aeb97 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Kvitas
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Naršyklė
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index 0b13dfb377a..1a96d6e4be0 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Žymės / Kategorijos
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=Į
 AddIn=Įtraukti
 modify=Pakeisti
 Classify=Priskirti
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index b562188197b..4834a822aa3 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Įmonės pavadinimas %s jau egzistuoja. Pasirinkite kitą.
 ErrorSetACountryFirst=Pirmiau nustatykite šalį
 SelectThirdParty=Pasirinkite trečiają šalį
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Ištrinti adresatą/adresą
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Telefonas
 Skype=Skype
 Call=Kvietimas
 Chat=Kalbėtis
-PhonePro=Darbo telefonas
+PhonePro=Bus. phone
 PhonePerso=Asmeninis telefonas
 PhoneMobile=Mobilus telefonas
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Pašto kodas
 Town=Miestas
 Web=WEB
 Poste= Pozicija
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=PVM nenaudojamas
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Būtina, jei trečioji šalis yra klientas arba kandidatas
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Numatomas klientas susisiekti
 CompanyDeleted=Įmonė "%s" ištrinta iš duomenų bazės.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Atidaryta
 ActivityCeased=Uždarytas
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=Produktų/paslaugų sąrašas %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Dabartinė neapmokėta sąskaita-faktūra
 OutstandingBill=Neapmokėtų sąskaitų-faktūrų maksimumas
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Kodas yra nemokamas. Šis kodas gali būti modifikuotas b
 ManagingDirectors=Vadovo (-ų) pareigos (Vykdantysis direktorius (CEO), direktorius, prezidentas ...)
 MergeOriginThirdparty=Dubliuoti trečiąją šalį (trečiąją šalį, kurią norite ištrinti)
 MergeThirdparties=Sujungti trečiąsias šalis
-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 third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index 04c4a15acc0..f818e3cec01 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Nauja nuolaida
 NewCheckDeposit=Naujas čekio depozitas
 NewCheckDepositOn=Sukurti sąskaitos %s depozito kvitą
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Čekio gavimo data
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/lt_LT/ecm.lang b/htdocs/langs/lt_LT/ecm.lang
index 6fe852b4340..4403a178561 100644
--- a/htdocs/langs/lt_LT/ecm.lang
+++ b/htdocs/langs/lt_LT/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 81019d9a6b0..964c82e93f7 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Nėra klaidos, mes įsipareigojame
 # Errors
 ErrorButCommitIsDone=Aptiktos klaidos, bet mes patvirtiname nepaisant to
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=URL %s yra neteisingas
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prisijungimas %s jau egzistuoja
@@ -46,8 +46,8 @@ ErrorWrongDate=Data yra neteisinga !
 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. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Kai kurie privalomi laukai nėra užpildyti.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Nepavyko sukurti aplanko. Įsitikinkite, kad web serverio vartotojas turi teisę rašyti į Dolibarr dokumentų aplanką. Jei parametras <b>safe_mode</b> yra įjungtas šio PHP, patikrinkite, ar Dolibarr PHP failai priklauso web serverio vartotojui (ar jų grupei).
 ErrorNoMailDefinedForThisUser=Šiam klientui neapibrėžtas paštas
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/lt_LT/eventorganization.lang b/htdocs/langs/lt_LT/eventorganization.lang
new file mode 100644
index 00000000000..e6caa842e88
--- /dev/null
+++ b/htdocs/langs/lt_LT/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Projektas
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Atliktas
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/lt_LT/knowledgemanagement.lang b/htdocs/langs/lt_LT/knowledgemanagement.lang
new file mode 100644
index 00000000000..6463a204d54
--- /dev/null
+++ b/htdocs/langs/lt_LT/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Apie
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Prekė
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 6028b9b5dac..c8e8a40977f 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Kopijuoti į
 MailToCCUsers=Copy to users(s)
 MailCCC=Sparčiosios tarpinės atminties (cache) kopija į
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Pranešimas
 MailFile=Prikabinti failai
 MailMessage=E-laiško pagrindinė dalis
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 3c1ea88cadb..45ab0a48f14 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Bandyti sujungimą
 ToClone=Klonuoti
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Nėra apibrėžtų duomenų klonavimui.
 Of=iš
 Go=Eiti
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Įvykis
 About=Apie
 Number=Numeris
-NumberByMonth=Numeris pagal mėnesį
+NumberByMonth=Total reports by month
 AmountByMonth=Suma pagal mėnesį
 Numero=Numeris
 Limit=Riba
@@ -341,8 +341,8 @@ KiloBytes=Kilobaitų
 MegaBytes=Megabaitų
 GigaBytes=Gigabaitų
 TeraBytes=Terabaitų
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Pagal
 From=Nuo
 FromDate=Pardavėjas
 FromLocation=Pardavėjas
-at=at
 to=į
 To=į
+ToDate=į
+ToLocation=į
+at=at
 and=ir
 or=arba
 Other=Kitas
@@ -843,7 +845,7 @@ XMoreLines=%s paslėptos eilutės
 ShowMoreLines=Show more/less lines
 PublicUrl=Viešas URL
 AddBox=Pridėti langelį
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Spausdinti failą %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Rodyti intervenciją
@@ -854,8 +856,8 @@ Denied=Atmestas
 ListOf=List of %s
 ListOfTemplates=Šablonų sąrašas
 Gender=Gender
-Genderman=Vyras
-Genderwoman=Moteris
+Genderman=Male
+Genderwoman=Female
 Genderother=Kiti
 ViewList=Sąrašo vaizdas
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index bcf36c5bced..914e30a27e4 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Kitas narys (pavadinimas/vardas: <b>%
 ErrorUserPermissionAllowsToLinksToItselfOnly=Saugumo sumetimais, Jums turi būti suteikti leidimai redaguoti visus vartotojus, kad galėtumėte susieti narį su vartotoju, kuris yra ne Jūsų.
 SetLinkToUser=Saitas su Dolibarr vartotoju
 SetLinkToThirdParty=Saitas su Dolibarr trečiąja šalimi
-MembersCards=Narių vizitinės kortelės
+MembersCards=Business cards for members
 MembersList=Narių sąrašas
 MembersListToValid=Numatomų narių sąrašas (tvirtinimui)
 MembersListValid=Patvirtintų galiojančių narių sąrašas
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Nariai, kurių pasirašymą reikia gauti
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Pasirašymo data
 DateEndSubscription=Pasirašymo pabaigos data
-EndSubscription=Pasirašymo pabaiga
+EndSubscription=Subscription Ends
 SubscriptionId=Pasirašymo ID
 WithoutSubscription=Without subscription
 MemberId=Nario ID
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Reikalingas pasirašymas
 DeleteType=Ištrinti
 VoteAllowed=Balsuoti leidžiama
-Physical=Fizinis
-Moral=Moralinis
-MorAndPhy=Moral and Physical
-Reenable=Įjungti vėl
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Narių statistiniai duomenys pagal šalį
 MembersStatisticsByState=Narių statistiniai duomenys pagal valstybę/regioną
 MembersStatisticsByTown=Narių statistiniai duomenys pagal miestus
 MembersStatisticsByRegion=Narių statistika pagal regionus
-NbOfMembers=Narių skaičius
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Patvirtintų narių nerasta
-MembersByCountryDesc=Šis ekranas rodo narių statistiką pagal šalis. Grafika priklauso nuo Google interneto grafikos ir yra prieinamas tik tada, kai interneto ryšys veikia.
-MembersByStateDesc=Šis ekranas rodo narių statistiką pagal valstybes/regionus
-MembersByTownDesc=Šis ekranas rodo narių statistiką pagal miestus
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Pasirinkite statistiką, kurią norite skaityti
 MenuMembersStats=Statistika
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Informacija yra vieša
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Naujas narys pridėtas. Laukiama patvirtinimo
 NewMemberForm=Naujo nario forma
-SubscriptionsStatistics=Pasirašymų statistika
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Pasirašymų skaičius
-AmountOfSubscriptions=Pasirašymų apimtis
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Apyvarta (įmonės) arba Biudžeto (organizacijos)
 DefaultAmount=Pasirašymo apimtis (pagal nutylėjimą)
 CanEditAmount=Lankytojas gali pasirinkti/redaguoti savo pasirašymo apimtį
 MEMBER_NEWFORM_PAYONLINE=Peršokti į integruotą interneto mokėjimo puslapį
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=Šis ekranas rodo Jums statistinius duomenis apie narius pagal jų tipą.
-MembersByRegion=Šis ekranas rodo Jums statistinius duomenis apie narius pagal regionus.
 VATToUseForSubscriptions=Pasirašymams naudojamas PVM tarifas
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Prekė naudojama abonementinei eilutei sąskaitoje-faktūroje: %s
diff --git a/htdocs/langs/lt_LT/modulebuilder.lang b/htdocs/langs/lt_LT/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/lt_LT/modulebuilder.lang
+++ b/htdocs/langs/lt_LT/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 2e84175f9bf..b49798b53f9 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 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=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/lt_LT/partnership.lang b/htdocs/langs/lt_LT/partnership.lang
new file mode 100644
index 00000000000..5b782eae4fc
--- /dev/null
+++ b/htdocs/langs/lt_LT/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Pradžios data
+DatePartnershipEnd=Pabaigos data
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Projektas
+PartnershipAccepted = Accepted
+PartnershipRefused = Atmestas
+PartnershipCanceled = Atšauktas
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang
index 9f5b8e2cef9..45c0d71128d 100644
--- a/htdocs/langs/lt_LT/productbatch.lang
+++ b/htdocs/langs/lt_LT/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index f0af4d4c6d4..8a2fa3cca66 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Produktas
@@ -73,12 +73,12 @@ SellingPrice=Pardavimo kaina
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Pardavimo kaina (įskaitant mokesčius)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nauja kaina
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Pardavimo kaina negali būti mažesnė už minimalią leidžiamą šiam produktui (%s be mokesčių). Šis pranešimas taip pat gali pasirodyti, jei įvedate per labai didelę nuolaidą.
 ContractStatusClosed=Uždarytas
@@ -157,11 +157,11 @@ ListServiceByPopularity=Paslaugų sąrašas pagal populiarumą
 Finished=Pagamintas produktas
 RowMaterial=Žaliava
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Šis produktas naudojamas
 NewRefForClone=Naujo produkto/paslaugos nuoroda
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Kilmės šalis
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Vienetas
 p=u.
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 935c29a1b8a..e6617ff3b88 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Projekto kontaktai
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Visi projektai
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 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.
 ProjectsPublicTaskDesc=Čia rodomi visi projektai ir užduotys, kuriuos Jums leidžiama skaityti.
 ProjectsDesc=Šis vaizdas rodo visus projektus (Jūsų vartotojo teisės leidžia matyti viską).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Matomi tik atidaryti projektai (projektai juodraščiai ar uždaryti projektai nematomi).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Šis vaizdas rodo visus projektus ir užduotis, kuriuos Jums leidžiama skaityti.
 TasksDesc=Šis vaizdas rodo visus projektus ir užduotis (Jūsų vartotojo teisės leidžia matyti viską).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=Naujas projektas
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/lt_LT/recruitment.lang b/htdocs/langs/lt_LT/recruitment.lang
index c67390a9865..ed93a7680cc 100644
--- a/htdocs/langs/lt_LT/recruitment.lang
+++ b/htdocs/langs/lt_LT/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang
index 085e7a6c2db..bc2e89fdb87 100644
--- a/htdocs/langs/lt_LT/sendings.lang
+++ b/htdocs/langs/lt_LT/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 modelis
 WarningNoQtyLeftToSend=Įspėjimas, nėra produktų, laukiančių išsiuntimo
-StatsOnShipmentsOnlyValidated=Tik patvirtintas siuntas parodanti statistika. Naudojama data yra siuntos patvirtinimo data (suplanuota pristatymo data yra ne visada žinoma).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index c2efa5da6da..23397cfe047 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Nėra iš anksto nustatytų produktų šiam objekt
 DispatchVerb=Išsiuntimas
 StockLimitShort=Riba perspėjimui
 StockLimit=Sandėlio riba perspėjimui
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Realios atsargos
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index 1fd600809a0..3365d6e7c05 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Slaptažodis pakeistas į %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Grupės leidimai
 UserRights=Vartotojo leidimai
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Išjungti
 DisableAUser=Išjungti vartotoją
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Pakeitimui naudoti laukelio tipą
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Prisijungimui naudoti OpenID
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Vartotojo spalva
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index 123ffa6cf1e..6b8c389ace1 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index b2c5a7029ea..3202d3c02c7 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Atsauce
 LabelAccount=Konta nosaukums
 LabelOperation=Etiķetes darbība
 Sens=Virziens
-AccountingDirectionHelp=Klienta grāmatvedības kontā izmantojiet kredītu, lai reģistrētu saņemto maksājumu <br> Piegādātāja grāmatvedības kontā izmantojiet Debets, lai reģistrētu veikto maksājumu
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Burtu kods
 Lettering=Burti
 Codejournal=Žurnāls
@@ -297,7 +297,7 @@ NoNewRecordSaved=Neviens ieraksts žurnālistikai nav
 ListOfProductsWithoutAccountingAccount=Produktu saraksts, uz kuriem nav saistīta kāds grāmatvedības konts
 ChangeBinding=Mainiet saites
 Accounted=Uzskaitīts virsgrāmatā
-NotYetAccounted=Vēl nav uzskaitīti virsgrāmatā
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Rādīt apmācību
 NotReconciled=Nesaskaņots
 WarningRecordWithoutSubledgerAreExcluded=Brīdinājums: visas darbības, kurās nav definēts apakškārtas konts, tiek filtrētas un izslēgtas no šī skata
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index dd60ceda643..33f82b742af 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Ja ir, noņemiet/pārdēvējiet failu <b>%s</b>, lai varētu izmantot
 RestoreLock=Atjaunojiet failu <b>%s</b> tikai ar lasīšanas atļauju, lai atspējotu jebkādu turpmāku atjaunināšanas/instalēšanas rīka izmantošanu.
 SecuritySetup=Drošības iestatījumi
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Šeit definējiet ar drošību saistītās iespējas failu augšupielādei.
 ErrorModuleRequirePHPVersion=Kļūda, šim modulim ir nepieciešama PHP versija %s vai augstāka
 ErrorModuleRequireDolibarrVersion=Kļūda, šim modulim nepieciešama Dolibarr versija %s vai augstāka
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Neieteikt
 NoActiveBankAccountDefined=Nav definēts aktīvs bankas konts
 OwnerOfBankAccount=Bankas konta īpašnieks %s
 BankModuleNotActive=Bankas kontu modulis nav ieslēgts
-ShowBugTrackLink=Rādīt saiti "<strong> %s </strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Brīdinājumi
 DelaysOfToleranceBeforeWarning=Kavēšanās, pirms tiek parādīts brīdinājuma brīdinājums par:
 DelaysOfToleranceDesc=Iestatiet aizkavi pirms brīdinājuma ikonas %s parādīšanas ekrānā par novēloto elementu.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Jums ir palaist šo komandu no
 YourPHPDoesNotHaveSSLSupport=SSL funkcijas, kas nav pieejama jūsu PHP
 DownloadMoreSkins=Vairāki izskati lejupielādei
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Rādīt profesionālo ID ar adresēm
 ShowVATIntaInAddress=Slēpt Kopienas iekšējo PVN numuru ar adresēm
 TranslationUncomplete=Daļējs tulkojums
@@ -2062,7 +2064,7 @@ UseDebugBar=Izmantojiet atkļūdošanas joslu
 DEBUGBAR_LOGS_LINES_NUMBER=Pēdējo žurnālu rindu skaits, kas jāsaglabā konsolē
 WarningValueHigherSlowsDramaticalyOutput=Brīdinājums, augstākas vērtības palēnina dramatisko izeju
 ModuleActivated=Modulis %s ir aktivizēts un palēnina saskarni
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Ja izmantojat ražošanas vidi, šim rekvizītam ir jāiestata kā %s.
 AntivirusEnabledOnUpload=Augšupielādētajos failos ir iespējota antivīruss
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index 584af7af25e..7fefb3ed206 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Sociālā/fiskālā nodokļa samaksa
 BankTransfer=Kredīta pārvedums
 BankTransfers=Kredīta pārvedumi
 MenuBankInternalTransfer=Iekšējā pārsūtīšana
-TransferDesc=Pārsūtīšana no viena konta uz citu, Dolibarr rakstīs divus ierakstus (debeta avota kontā un kredītu mērķa kontā). Šim darījumam tiks izmantota tāda pati summa (izņemot zīmi), etiķete un datums.
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=No
 TransferTo=Kam
 TransferFromToDone=No <b>%s</b> nodošana <b>%s</b> par <b>%s</b> %s ir ierakstīta.
-CheckTransmitter=Raidītājs
+CheckTransmitter=Nosūtītājs
 ValidateCheckReceipt=Vai apstiprināt šo čeku?
-ConfirmValidateCheckReceipt=Vai tiešām vēlaties apstiprināt šo čeka kvīti, ja vien tas nenotiks, izmaiņas nebūs iespējamas?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Dzēst šo čeku?
 ConfirmDeleteCheckReceipt=Vai tiešām vēlaties dzēst šo čeka kvīti?
 BankChecks=Bankas čeki
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Vai tiešām vēlaties dzēst šo ierakstu?
 ThisWillAlsoDeleteBankRecord=Tas arī izdzēš izveidotos bankas darījumus
 BankMovements=Kustība
 PlannedTransactions=Plānotie darījumi
-Graph=Grafiks
+Graph=Graphs
 ExportDataset_banque_1=Banku darījumi un konta izraksts
 ExportDataset_banque_2=Depozīta kvīts
 TransactionOnTheOtherAccount=Pārskaitījums uz otru kontu
@@ -142,7 +142,7 @@ AllAccounts=Visi bankas un naudas konti
 BackToAccount=Atpakaļ uz kontu
 ShowAllAccounts=Parādīt visiem kontiem
 FutureTransaction=Nākotnes darījums. Nevar saskaņot.
-SelectChequeTransactionAndGenerate=Atlasiet / filtru pārbaudes, lai iekļautu čeku depozīta kvīti, un noklikšķiniet uz "Izveidot".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Galu galā, norādiet kategoriju, kurā klasificēt ierakstus
 ToConciliate=Saskaņot?
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index d3144af8df2..d814b040d56 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Konvertēt pārsniegto summu par atlaidi
 EnterPaymentReceivedFromCustomer=Ievadiet no klienta saņemto naudas summu
 EnterPaymentDueToCustomer=Veikt maksājumu dēļ klientam
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Bāzes cena
+PriceBase=Base price
 BillStatus=Rēķina statuss
 StatusOfGeneratedInvoices=Izveidoto rēķinu statuss
 BillStatusDraft=Melnraksts (jāapstiprina)
@@ -454,7 +454,7 @@ RegulatedOn=Regulēta uz
 ChequeNumber=Pārbaudiet N °
 ChequeOrTransferNumber=Pārbaudiet / Transfer N °
 ChequeBordereau=Pārbaudīt grafiku
-ChequeMaker=Pārbaudiet / pārsūtiet raidītāju
+ChequeMaker=Check/Transfer sender
 ChequeBank=Čeka izsniegšanas banka
 CheckBank=Čeks
 NetToBePaid=Neto jāmaksā
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index 803487a2bbe..e861854a92e 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Grāmatzīmes: jaunākās %s
 BoxOldestExpiredServices=Vecākais aktīvais beidzies pakalpojums
 BoxLastExpiredServices=Jaunākie %s vecākie kontakti ar aktīviem derīguma termiņa beigām
 BoxTitleLastActionsToDo=Jaunākās %s darbības, ko darīt
-BoxTitleLastContracts=Jaunākie %s labotie līgumi
-BoxTitleLastModifiedDonations=Jaunākie %s labotie ziedojumi
-BoxTitleLastModifiedExpenses=Jaunākie %s modificētie izdevumu pārskati
-BoxTitleLatestModifiedBoms=Jaunākās %s modificētās BOM
-BoxTitleLatestModifiedMos=Jaunākie %s modificētie ražošanas pasūtījumi
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Pārsniegti klienti ar maksimālo nesamaksāto summu
 BoxGlobalActivity=Global darbība (pavadzīmes, priekšlikumi, rīkojumi)
 BoxGoodCustomers=Labi klienti
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index fddd50d2bac..ea9c84562e2 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Stāvs
 AddTable=Pievienot tabulu
 Place=Vieta
 TakeposConnectorNecesary=Ir nepieciešams "TakePOS Connector"
-OrderPrinters=Pasūtīt printerus
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Meklēt produktu
 Receipt=Saņemšana
 Header=Galvene
@@ -49,15 +50,16 @@ Footer=Kājene
 AmountAtEndOfPeriod=Summa perioda beigās (diena, mēnesis vai gads)
 TheoricalAmount=Teorētiskā summa
 RealAmount=Reālā summa
-CashFence=Cash desk closing
-CashFenceDone=Cash desk closing done for the period
+CashFence=Kases slēgšana
+CashFenceDone=Perioda kases slēgšana
 NbOfInvoices=Rēķinu skaits
 Paymentnumpad=Padeves veids maksājuma ievadīšanai
 Numberspad=Numbers Pad
 BillsCoinsPad=Monētas un banknotes
 DolistorePosCategory=TakePOS moduļi un citi POS risinājumi Dolibarr
-TakeposNeedsCategories=TakePOS ir nepieciešama produktu kategorija
-OrderNotes=Pasūtījuma piezīmes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Noklusējuma konts, ko izmantot maksājumiem
 NoPaimementModesDefined=TakePOS konfigurācijā nav definēts paiment režīms
 TicketVatGrouped=Grupējiet PVN pēc likmes biļetēs | kvītis
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Rēķins jau ir apstiprināts
 NoLinesToBill=Nav rēķinu
 CustomReceipt=Pielāgota kvīts
 ReceiptName=Kvīts nosaukums
-ProductSupplements=Produktu piedevas
+ProductSupplements=Manage supplements of products
 SupplementCategory=Papildinājuma kategorija
 ColorTheme=Krāsu tēma
 Colorful=Krāsains
@@ -92,16 +94,16 @@ Browser=Pārlūkprogramma
 BrowserMethodDescription=Vienkārša un ērta kvīts drukāšana. Tikai daži parametri, lai konfigurētu kvīti. Drukājiet, izmantojot pārlūku.
 TakeposConnectorMethodDescription=Ārējs modulis ar papildu funkcijām. Iespēja drukāt no mākoņa.
 PrintMethod=Drukas metode
-ReceiptPrinterMethodDescription=Jaudīga metode ar daudziem parametriem. Pilnībā pielāgojams ar veidnēm. Nevar izdrukāt no mākoņa.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=Ar termināli
 TakeposNumpadUsePaymentIcon=Izmantojiet ikonu, nevis tekstu uz numpad numura maksāšanas pogām
 CashDeskRefNumberingModules=Numerācijas modulis tirdzniecības vietu tirdzniecībai
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> tagu izmanto, lai pievienotu termināļa numuru
 TakeposGroupSameProduct=Grupējiet tās pašas produktu līnijas
 StartAParallelSale=Sāciet jaunu paralēlu izpārdošanu
-SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
-CloseCashFence=Close cash desk control
+SaleStartedAt=Pārdošana sākās vietnē %s
+ControlCashOpening=Kontrolējiet naudas uznirstošo punktu, atverot POS
+CloseCashFence=Aizveriet kases kontroli
 CashReport=Skaidras naudas pārskats
 MainPrinterToUse=Galvenais izmantojamais printeris
 OrderPrinterToUse=Pasūtiet printeri izmantošanai
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Vispirms jābūt iespējotam moduļa saņemša
 AllowDelayedPayment=Atļaut kavētu maksājumu
 PrintPaymentMethodOnReceipts=Izdrukājiet maksājuma veidu uz biļetēm |
 WeighingScale=Svari
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index de310bd04c0..9be0e84b700 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Etiķete/Sadaļa
 Rubriques=Etiķetes/Sadaļas
 RubriquesTransactions=Tags/Categories of transactions
 categories=etiķetes/sadaļas
-NoCategoryYet=Nav šī veida etiķetes/sadaļas izveidotas
+NoCategoryYet=No tag/category of this type has been created
 In=Uz
 AddIn=Pievienot
 modify=modificēt
 Classify=Klasificēt
 CategoriesArea=Etiķešu/Sadaļu sadaļa
-ProductsCategoriesArea=Preču/Pakalpojumu etiķešu /sadaļa
-SuppliersCategoriesArea=Pārdevēju atzīmes / kategorijas
-CustomersCategoriesArea=Klientu atslēgvārdi/sadaļu apgabals
-MembersCategoriesArea=Dalībnieku atslēgvārdi/sadaļu apgabals
-ContactsCategoriesArea=Kontaktu tagi / sadaļu apgabals
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projektu tagi / kategoriju apgabals
-UsersCategoriesArea=Lietotāju tagu / kategoriju apgabals
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Apakšsadaļas
 CatList=Atslēgvārdu/sadaļu saraksts
 CatListAll=Tagu / kategoriju saraksts (visi veidi)
@@ -96,4 +96,4 @@ ChooseCategory=Izvēlies sadaļu
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Lapu konteineru kategorijas
-UseOrOperatorForCategories=Izmantojiet vai operatoru kategorijām
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 3cb2ec3dd62..f9471964586 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Uzņēmuma nosaukums %s jau pastāv. Izvēlieties citu.
 ErrorSetACountryFirst=Izvēlieties vispirms valsti
 SelectThirdParty=Izvēlieties trešo pusi
-ConfirmDeleteCompany=Vai tiešām vēlaties dzēst šo uzņēmumu un visu informāciju, kas saistīta ar to?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Izdzēst kontaktu / adresi
-ConfirmDeleteContact=Vai tiešām vēlaties dzēst šo kontaktu un visu informāciju par šo kontaktu?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Jauna trešā persona
 MenuNewCustomer=Jauns klients
 MenuNewProspect=Jauns prospekts
@@ -69,7 +69,7 @@ PhoneShort=Telefons
 Skype=Skype
 Call=Zvanīt
 Chat=Čats
-PhonePro=Darba tālrunis
+PhonePro=Bus. phone
 PhonePerso=Pers. telefons
 PhoneMobile=Mobilais
 No_Email=Atteikties no lielapjoma pasta sūtījumiem
@@ -331,7 +331,7 @@ CustomerCodeDesc=Klienta kods, unikāls visiem klientiem
 SupplierCodeDesc=Pārdevēja kods, unikāls visiem pārdevējiem
 RequiredIfCustomer=Nepieciešams, ja trešā puse ir klients vai perspektīva
 RequiredIfSupplier=Nepieciešams, ja trešā puse ir pārdevējs
-ValidityControledByModule=Derīguma termiņš, ko kontrolē modulis
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Noteikumi šim modulim
 ProspectToContact=Perspektīva ar ko sazināties
 CompanyDeleted=Kompānija "%s" dzēsta no datubāzes.
@@ -439,12 +439,12 @@ ListSuppliersShort=Pārdevēju saraksts
 ListProspectsShort=Perspektīvu saraksts
 ListCustomersShort=Klientu saraksts
 ThirdPartiesArea=Trešās puses/Kontakti
-LastModifiedThirdParties=Jaunākās %s labiotās Trešās puses
-UniqueThirdParties=Trešo personu kopskaits
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Atvērts
 ActivityCeased=Slēgts
 ThirdPartyIsClosed=Trešā persona ir slēgta
-ProductsIntoElements=Produktu/pakalpojumu saraksts %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Maks. par izcilu rēķinu
 OutstandingBillReached=Maks. par izcilu rēķinu
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Kods ir bez maksas. Šo kodu var mainīt jebkurā laikā.
 ManagingDirectors=Menedžera(u) vārds (CEO, direktors, prezidents...) 
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Apvienot trešās puses
-ConfirmMergeThirdparties=Vai tiešām vēlaties apvienot šo trešo personu ar pašreizējo? Visi saistītie objekti (rēķini, pasūtījumi, ...) tiks pārvietoti uz pašreizējo trešo pusi, tad trešā puse tiks dzēsta.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Trešās puses ir apvienotas
 SaleRepresentativeLogin=Tirdzniecības pārstāvja pieteikšanās
 SaleRepresentativeFirstname=Tirdzniecības pārstāvja vārds
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 7fddc3b40e3..f3413c399d7 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Jauna atlaide
 NewCheckDeposit=Jauns pārbaude depozīts
 NewCheckDepositOn=Izveidot kvīti par depozīta kontā: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Pārbaudiet uzņemšanas datumu
+DateChequeReceived=Check receiving date
 NbOfCheques=Pārbaužu skaits
 PaySocialContribution=Maksāt sociālo/fiskālo nodokli
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
index d2c5fd13c9d..459119bffcd 100644
--- a/htdocs/langs/lv_LV/ecm.lang
+++ b/htdocs/langs/lv_LV/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm failus
 ExtraFieldsEcmDirectories=Extrafields Ecm direktoriji
 ECMSetup=ECM iestatīšana
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index e04c4e58a21..08d6f347a7c 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Nav kļūda, mēs apstiprinam
 # Errors
 ErrorButCommitIsDone=Kļūdas atrasta, bet mēs apstiprinājām neskatoties uz to
-ErrorBadEMail=E-pasts %s ir nepareizs
-ErrorBadMXDomain=E-pasts %s nepareizs (domēnam nav derīga MX ieraksta)
-ErrorBadUrl=Url %s ir nepareizs
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Jūsu parametra nepareiza vērtība. Tas parasti parādās, ja trūkst tulkojuma.
 ErrorRefAlreadyExists=Atsauce <b> %s </b> jau pastāv.
 ErrorLoginAlreadyExists=Lietotājs %s jau pastāv.
@@ -46,8 +46,8 @@ ErrorWrongDate=Datums nav pareizs
 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=Lietotāju nevar izdzēst. Varbūt tas ir saistīts ar Dolibarr vienībām.
-ErrorFieldsRequired=Daži nepieciešamie lauki netika aizpildīti.
-ErrorSubjectIsRequired=E-pasta tēma ir nepieciešama
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject 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
 ErrorSetupOfEmailsNotComplete=E-pastu iestatīšana nav pabeigta
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Lapā / konteinerā <strong> %s </str
 ErrorDuringChartLoad=Kļūda, ielādējot kontu diagrammu. Ja daži konti netika ielādēti, tos joprojām varat ievadīt manuāli.
 ErrorBadSyntaxForParamKeyForContent=Slikta sintakse param keyforcontent. Jābūt vērtībai, kas sākas ar %s vai %s
 ErrorVariableKeyForContentMustBeSet=Kļūda, ir jāiestata konstants ar nosaukumu %s (ar teksta saturu, kas jāparāda) vai %s (ar ārējo URL).
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s jāsāk ar http: // vai https: //
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Kļūda, jaunā atsauce jau ir izmantota
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Pieejams tikai tad, ja tiek izmantots HTTPS
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/lv_LV/eventorganization.lang b/htdocs/langs/lv_LV/eventorganization.lang
new file mode 100644
index 00000000000..b70d65eb304
--- /dev/null
+++ b/htdocs/langs/lv_LV/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Iestatījumi
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Melnraksts
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Darīts
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/lv_LV/knowledgemanagement.lang b/htdocs/langs/lv_LV/knowledgemanagement.lang
new file mode 100644
index 00000000000..28f420cebd5
--- /dev/null
+++ b/htdocs/langs/lv_LV/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Iestatījumi
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Par
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Raksts
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 0b05dd5c665..a959d345f2b 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Lietotājam (-iem)
 MailCC=Kopēt
 MailToCCUsers=Kopēt lietotājiem (-iem)
 MailCCC=Kešatmiņas kopija
-MailTopic=E-pasta tēma
+MailTopic=Email subject
 MailText=Ziņa
 MailFile=Pievienotie faili
 MailMessage=E-pasta saturs
@@ -92,7 +92,7 @@ MailingModuleDescEmailsFromUser=Lietotāja ievadītie e-pasti
 MailingModuleDescDolibarrUsers=Lietotāji ar e-pastu
 MailingModuleDescThirdPartiesByCategories=Trešās personas (pēc sadaļām)
 SendingFromWebInterfaceIsNotAllowed=Sūtīšana no tīmekļa saskarnes nav atļauta.
-EmailCollectorFilterDesc=All filters must match to have an email being collected
+EmailCollectorFilterDesc=Lai e-pasts tiktu apkopots, visiem filtriem ir jāatbilst
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Līnija %s failā
@@ -130,9 +130,9 @@ NotificationsAuto=Paziņojumi Automātiski.
 NoNotificationsWillBeSent=Šim notikuma veidam un uzņēmumam nav plānoti automātiski e-pasta paziņojumi
 ANotificationsWillBeSent=1 automātisks paziņojums tiks nosūtīts pa e-pastu
 SomeNotificationsWillBeSent=%s automātiskie paziņojumi tiks nosūtīti pa e-pastu
-AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=Uzskaitiet visus nosūtītos automātiskos e-pasta paziņojumus
+AddNewNotification=Abonējiet jaunu automātisku e-pasta paziņojumu (mērķis / notikums)
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -142,7 +142,7 @@ UseFormatFileEmailToTarget=Importētajam failam jābūt formatētam <strong>e-pa
 UseFormatInputEmailToTarget=Ievadiet virkni ar formātu <strong>e-pasts;nosaukums;vārds;cits</strong>
 MailAdvTargetRecipients=Saņēmēji (papildu izvēle)
 AdvTgtTitle=Aizpildiet ievades laukus, lai iepriekš atlasītu mērķauditoriju trešajām personām vai kontaktpersonām / adresēm
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+AdvTgtSearchTextHelp=Izmantojiet %% kā aizstājējzīmes. Piemēram, lai atrastu visus vienumus, piemēram, <b> jean, joe, jim </b>, varat ievadīt <b> j%% </b>, varat arī izmantot; kā vērtības atdalītāju un izmantojiet! izņemot šo vērtību. Piemēram, <b> jean; joe; jim%%;! Jimo;! Jima%% </b> mērķēs visu jean, joe, sāciet ar jim, bet ne jimo un ne visu, kas sākas ar jima
 AdvTgtSearchIntHelp=Izmantojiet intervālu, lai izvēlētos int vai float vērtību
 AdvTgtMinVal=Minimālā vērtība
 AdvTgtMaxVal=Maksimālā vērtība
@@ -175,5 +175,5 @@ Answered=Atbildēts
 IsNotAnAnswer=Nav atbildes (sākotnējais e-pasts)
 IsAnAnswer=Vai ir atbilde uz sākotnējo e-pastu
 RecordCreatedByEmailCollector=Ierakstu izveidojis e-pasta savācējs %s no e-pasta %s
-DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
-DefaultStatusEmptyMandatory=Empty but mandatory
+DefaultBlacklistMailingStatus=Noklusējuma kontakta statuss atteikšanai no lielapjoma e-pasta ziņojumiem
+DefaultStatusEmptyMandatory=Tukšs, bet obligāts
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 0c7cf3ecaf8..4a9ca45aefb 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Saglabāt un jaunu
 TestConnection=Savienojuma pārbaude
 ToClone=Klonēt
 ConfirmCloneAsk=Vai tiešām vēlaties klonēt objektu <b> %s </b>?
-ConfirmClone=Izvēlieties datus, kurus vēlaties klonēt:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Nav datu klons noteikts.
 Of=no
 Go=Iet
@@ -246,7 +246,7 @@ DefaultModel=Noklusējuma doc veidne
 Action=Notikums
 About=Par
 Number=Numurs
-NumberByMonth=Numurus škirots pēc mēneša nosaukuma
+NumberByMonth=Total reports by month
 AmountByMonth=Summa šķirota pēc mēneša nosaukuma
 Numero=Numurs
 Limit=Ierobežot
@@ -341,8 +341,8 @@ KiloBytes=Kilobaiti
 MegaBytes=Megabaiti
 GigaBytes=Gigabaiti
 TeraBytes=Terabaiti
-UserAuthor=Radīšanas lietotājs
-UserModif=Pēdējā atjauninājuma lietotājs
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Līdz
 From=No
 FromDate=No
 FromLocation=No
-at=plkst
 to=līdz
 To=līdz
+ToDate=līdz
+ToLocation=līdz
+at=plkst
 and=un
 or=vai
 Other=Cits
@@ -843,7 +845,7 @@ XMoreLines=%s līnija(as) slēptas
 ShowMoreLines=Parādīt vairāk / mazāk rindas
 PublicUrl=Publiskā saite
 AddBox=Pievienot info logu
-SelectElementAndClick=Izvēlieties elementu un noklikšķiniet %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Drukāt failu %s
 ShowTransaction=Rādīt ierakstu bankas kontā
 ShowIntervention=Rādīt iejaukšanās
@@ -854,8 +856,8 @@ Denied=Aizliegts
 ListOf=%s saraksts
 ListOfTemplates=Saraksts ar veidnēm
 Gender=Dzimums
-Genderman=Vīrietis
-Genderwoman=Sieviete
+Genderman=Male
+Genderwoman=Female
 Genderother=Cits
 ViewList=Saraksta skats
 ViewGantt=Ganta skats
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Vai tiešām vēlaties ietekmēt atlasītā (-o) ieraks
 CategTypeNotFound=Ierakstu veidam nav atrasts neviens tagu tips
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index f8c18b6e851..32f15a94dec 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Vēl viens dalībnieks (nosaukums: <b
 ErrorUserPermissionAllowsToLinksToItselfOnly=Drošības apsvērumu dēļ, jums ir jāpiešķir atļaujas, lai rediģētu visi lietotāji varētu saistīt locekli, lai lietotājam, kas nav jūsu.
 SetLinkToUser=Saite uz Dolibarr lietotāju
 SetLinkToThirdParty=Saite uz Dolibarr trešo personu
-MembersCards=Dalībnieku vizītkartes
+MembersCards=Business cards for members
 MembersList=Dalībnieku saraksts
 MembersListToValid=Saraksts projektu dalībnieki (tiks apstiprināts)
 MembersListValid=Derīgo dalībnieku saraksts
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Dalībniekiem ar abonementu, lai saņemtu
 MembersWithSubscriptionToReceiveShort=Abonēšana saņemt
 DateSubscription=Abonēšanas datums
 DateEndSubscription=Abonēšanas beigu datums
-EndSubscription=Beigt abonementu
+EndSubscription=Subscription Ends
 SubscriptionId=Abonēšana id
 WithoutSubscription=Bez abonēšanas
 MemberId=Dalībnieka id
@@ -83,10 +83,10 @@ WelcomeEMail=Laipni lūdzam pasts
 SubscriptionRequired=Abonēšana nepieciešama
 DeleteType=Dzēst
 VoteAllowed=Balsot atļauts
-Physical=Fizisks
-Moral=Morāls
-MorAndPhy=Morāls un fizisks
-Reenable=Atkārtoti ieslēdzams
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Izslēgt dalībnieku
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Dalībnieku statistika pa valstīm
 MembersStatisticsByState=Dalībnieku statistika pēc štatiem/provincēm
 MembersStatisticsByTown=Dalībnieku statistika pa pilsētām
 MembersStatisticsByRegion=Dalībnieku statistika pa reģioniem
-NbOfMembers=Biedru skaits
-NbOfActiveMembers=Pašreizējo aktīvo dalībnieku skaits
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Nav apstiprinātas locekļi atrasti
-MembersByCountryDesc=Šis ekrāns parādīs statistiku par biedriem pa valstīm. Grafiskais tomēr ir atkarīga Google tiešsaistes grafiku pakalpojums un ir pieejama tikai tad, ja interneta pieslēgums darbojas.
-MembersByStateDesc=Šis ekrāns parādīs statistiku par dalībniekiem, valsts / provinces / Canton.
-MembersByTownDesc=Šis ekrāns parādīs statistiku par biedriem ar pilsētu.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Izvēlieties statistiku kuru vēlaties izlasīt ...
 MenuMembersStats=Statistika
-LastMemberDate=Pēdējā biedra datums
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Jaunākais piereģistrēšanās datums
-MemberNature=Dalībnieka raksturs
-MembersNature=Locekļu raksturs
-Public=Informācija ir publiska
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Jauns dalībnieks pievienots. Gaida apstiprinājumu
 NewMemberForm=Jauna dalībnieka forma
-SubscriptionsStatistics=Statistika par abonementu
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Abonementu skaits
-AmountOfSubscriptions=Abonementu daudzums
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Apgrozījums (uzņēmumam) vai budžets (par pamatu)
 DefaultAmount=Noklusējuma abonēšanas summa
 CanEditAmount=Apmeklētājs var izvēlēties / rediģēt summu no tās parakstītā
 MEMBER_NEWFORM_PAYONLINE=Pārlēkt uz integrētu tiešsaistes maksājumu lapā
 ByProperties=Pēc būtības
 MembersStatisticsByProperties=Dalībnieku statistika pēc būtības
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=PVN likme kuru izmantot abonementiem
 NoVatOnSubscription=Nav PVN abonementiem
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 223e15e547e..0fae52ce845 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Noteikto atļauju saraksts
 SeeExamples=Skatiet piemērus šeit
 EnabledDesc=Nosacījums, lai šis lauks būtu aktīvs (piemēri: 1 vai $ conf-> globāla-> MYMODULE_MYOPTION)
 VisibleDesc=Vai lauks ir redzams? (Piemēri: 0 = nekad nav redzams, 1 = redzams sarakstā un izveidojiet / atjauniniet / skatiet veidlapas, 2 = ir redzams tikai sarakstā, 3 = ir redzams tikai izveides / atjaunināšanas / skata formā (nav sarakstā), 4 = ir redzams sarakstā un tikai atjaunināt / skatīt formu (neveidot), 5 = redzama tikai saraksta beigu skata formā (neveidot, ne atjaunināt). <br> <br> Negatīvas vērtības līdzekļu izmantošana lauka pēc noklusējuma netiek parādīta, bet to var atlasīt apskatei). <br> <br> Tas var būt izteiciens, piemēram: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> ($ user-> rights-> rights-
-DisplayOnPdfDesc=Parādiet šo lauku saderīgos PDF dokumentos. Varat pārvaldīt pozīciju ar lauku "Position". <br/> Pašlaik zināms savietojamie PDF modeļi ir: Eratostens (rīkojums), Espadon (kuģis), sūkli (rēķini), ciāna (propal / citāts), Cornas (piegādātājs rīkojums) <br/> <br/> <strong> Par dokumenta: </strong> <br/> 0 = nav redzams <br/> 1 = displejs <br/> 2 = parādīt tikai tad, ja nav iztukšot <br/> <br/> <strong> dokumentu līnijas: </strong> <br/> 0 = nav redzama <br/> 1 = parādīti kolonnā <br/> 3 = displeja līnija apraksta slejā pēc apraksta <br/> 4 = displeja apraksta ailē pēc tam, kad apraksts tikai tad, ja nav tukšs
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Displejs PDF formātā
 IsAMeasureDesc=Vai lauka vērtību var uzkrāties, lai kopsumma tiktu iekļauta sarakstā? (Piemēri: 1 vai 0)
 SearchAllDesc=Vai laukums tiek izmantots, lai veiktu meklēšanu no ātrās meklēšanas rīka? (Piemēri: 1 vai 0)
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 2a1d6e280fb..95b3dae7746 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Instalējiet vai iespējojiet GD bibliotēku savā PHP insta
 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=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Pārskatu subjektu skaita statistika (rēķina numurs vai pasūtījums ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Priekšlikumu skaits
 NumberOfCustomerOrders=Pārdošanas pasūtījumu skaits
 NumberOfCustomerInvoices=Klientu rēķinu skaits
@@ -289,4 +289,4 @@ PopuProp=Produkti / pakalpojumi pēc popularitātes priekšlikumos
 PopuCom=Produkti / pakalpojumi pēc popularitātes pasūtījumos
 ProductStatistics=Produktu/pakalpojumu statistika
 NbOfQtyInOrders=Daudzums pasūtījumos
-SelectTheTypeOfObjectToAnalyze=Atlasiet analizējamā objekta veidu ...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/lv_LV/partnership.lang b/htdocs/langs/lv_LV/partnership.lang
new file mode 100644
index 00000000000..69fb543a784
--- /dev/null
+++ b/htdocs/langs/lv_LV/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Sākuma datums
+DatePartnershipEnd=Beigu datums
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Melnraksts
+PartnershipAccepted = Pieņemts
+PartnershipRefused = Atteikts
+PartnershipCanceled = Atcelts
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
index 56a27a10ebc..996bdaa8249 100644
--- a/htdocs/langs/lv_LV/productbatch.lang
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 9341d32b295..2b525b5760b 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Pakalpojumi pārdošanai
 ServicesOnPurchaseOnly=Pakalpojumi tikai pirkšanai
 ServicesNotOnSell=Pakalpojumi, kas nav paredzēti pārdošanai un nav paredzēti pirkšanai
 ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Jaunākie labotie produkti %s
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Jaunākie ieraksti %s
 LastRecordedServices=Jaunākie %s reģistrētie pakalpojumi
 CardProduct0=Produkts
@@ -73,12 +73,12 @@ SellingPrice=Pārdošanas cena
 SellingPriceHT=Pārdošanas cena (bez nodokļa)
 SellingPriceTTC=Pārdošanas cena (ar PVN)
 SellingMinPriceTTC=Minimālā pārdošanas cena (ieskaitot nodokli)
-CostPriceDescription=Šo cenu laukumu (izņemot nodokli) var izmantot, lai saglabātu vidējo summu, ko šī produkcija sedz jūsu uzņēmumam. Var būt jebkura cena, ko aprēķināt, piemēram, no vidējās iepirkuma cenas plus vidējās ražošanas un izplatīšanas izmaksas.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Šo vērtību var izmantot, lai aprēķinātu peļņu.
 SoldAmount=Pārdošanas apjoms
 PurchasedAmount=Iegādātā summa
 NewPrice=Jaunā cena
-MinPrice=Min. pārdošanas cena
+MinPrice=Min. selling price
 EditSellingPriceLabel=Labot pārdošanas cenas nosaukumu
 CantBeLessThanMinPrice=Pārdošanas cena nevar būt zemāka par minimālo pieļaujamo šī produkta (%s bez PVN). Šis ziņojums var būt arī parādās, ja esat ievadījis pārāk lielu atlaidi.
 ContractStatusClosed=Slēgts
@@ -157,11 +157,11 @@ ListServiceByPopularity=Pakalpojumu saraksts pēc pārdošanas popularitātes
 Finished=Ražota prece
 RowMaterial=Izejviela
 ConfirmCloneProduct=Vai jūs tiešām vēlaties klonēt šo produktu vai pakalpojumu <b>%s?</b>
-CloneContentProduct=Clone visu galveno informāciju par produktu / pakalpojumu
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Klonēt cenas
-CloneCategoriesProduct=Klonu tagi / kategorijas ir saistītas
-CloneCompositionProduct=Klonēt virtuālo produktu / pakalpojumu
-CloneCombinationsProduct=Klonu produktu varianti
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Šis produkts tiek izmantots
 NewRefForClone=Ref. jaunu produktu / pakalpojumu
 SellingPrices=Pārdošanas cenas
@@ -170,12 +170,12 @@ CustomerPrices=Klienta cenas
 SuppliersPrices=Pārdevēja cenas
 SuppliersPricesOfProductsOrServices=Pārdevēja cenas (produktiem vai pakalpojumiem)
 CustomCode=Muita | prece | HS kods
-CountryOrigin=Izcelsmes valsts
-RegionStateOrigin=Reģiona izcelsme
-StateOrigin=Valsts | Provinces izcelsme
-Nature=Produkta veids (materiāls / gatavs)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Produkta veids
-NatureOfProductDesc=Izejviela vai gatavais produkts
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Īsais nosaukums
 Unit=Vienība
 p=u.
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index ca93cb7043e..b2be4c78ce4 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Projekta kontakti
 ProjectsImContactFor=Projekti, par kuriem tieši esmu kontaktpersona
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Visi projekti
-MyProjectsDesc=Šis skats attiecas tikai uz projektiem, ar kuriem jūs sazināties
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 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.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=Šo viedokli iepazīstina visus projektus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu).
 TasksOnProjectsDesc=Šis skats atspoguļo visus uzdevumus visos projektos (jūsu lietotāja atļaujas piešķir jums atļauju apskatī visu).
-MyTasksDesc=Šis skats attiecas tikai uz projektiem vai uzdevumiem, par kuriem esat kontaktpersona
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Slēgtie projekti nav redzami.
 TasksPublicDesc=Šo viedokli iepazīstina visus projektus un uzdevumus, jums ir atļauts lasīt.
 TasksDesc=Šo viedokli iepazīstina visus projektus un uzdevumus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu).
 AllTaskVisibleButEditIfYouAreAssigned=Visi uzdevumi kvalificētiem projektiem ir redzami, taču jūs varat ievadīt laiku tikai tam uzdevumam, kas piešķirts izvēlētajam lietotājam. Piešķirt uzdevumu, ja uz to ir jāievada laiks.
-OnlyYourTaskAreVisible=Ir redzami tikai jums uzdotie uzdevumi. Piešķiriet uzdevumu sev, ja tas nav redzams, un tam ir jāievada laiks.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Projektu uzdevumi
 ProjectCategories=Projekta tagi / sadaļas
 NewProject=Jauns projekts
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Uzdevumam nav piešķirts
 NoUserAssignedToTheProject=Neviens lietotājs nav piešķirts šim projektam
 TimeSpentBy=Pavadītais laiks
 TasksAssignedTo=Uzdevumi, kas piešķirti
-AssignTaskToMe=Uzdot uzdevumu man
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Piešķirt uzdevumu %s
 SelectTaskToAssign=Atlasiet uzdevumu, lai piešķirtu ...
 AssignTask=Piešķirt
diff --git a/htdocs/langs/lv_LV/recruitment.lang b/htdocs/langs/lv_LV/recruitment.lang
index dc5848592fc..40957c1b2df 100644
--- a/htdocs/langs/lv_LV/recruitment.lang
+++ b/htdocs/langs/lv_LV/recruitment.lang
@@ -46,31 +46,31 @@ FutureManager=Topošais vadītājs
 ResponsibleOfRecruitement=Atbildīgais par darbā pieņemšanu
 IfJobIsLocatedAtAPartner=Ja darbs atrodas partnera vietā
 PositionToBeFilled=Ieņemamais amats
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+PositionsToBeFilled=Darba vietas
+ListOfPositionsToBeFilled=Darba vietu saraksts
+NewPositionToBeFilled=Jaunas darba vietas
 
-JobOfferToBeFilled=Job position to be filled
+JobOfferToBeFilled=Aizpildāmā amata vieta
 ThisIsInformationOnJobPosition=Informācija par aizpildāmo darba vietu
 ContactForRecruitment=Kontaktpersona personāla atlasei
 EmailRecruiter=E-pasta vervētājs
 ToUseAGenericEmail=Lai izmantotu vispārīgu e-pastu. Ja tas nav noteikts, tiks izmantots e-pasts, kas atbildīgs par personāla atlasi
-NewCandidature=New application
-ListOfCandidatures=List of applications
+NewCandidature=Jauna lietojumprogramma
+ListOfCandidatures=Lietojumprogrammu saraksts
 RequestedRemuneration=Pieprasītā atlīdzība
 ProposedRemuneration=Piedāvātā atlīdzība
 ContractProposed=Piedāvātais līgums
 ContractSigned=Parakstīts līgums
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
+ContractRefused=Līgums atteikts
+RecruitmentCandidature=Pieteikums
 JobPositions=Darba pozīcijas
-RecruitmentCandidatures=Applications
+RecruitmentCandidatures=Pieteikumi
 InterviewToDo=Intervija, kas jādara
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
-MakeOffer=Make an offer
+AnswerCandidature=Pieteikuma atbilde
+YourCandidature=Jūsu pieteikums
+YourCandidatureAnswerMessage=Paldies par jūsu pieteikumu. <br> ...
+JobClosedTextCandidateFound=Darba vieta ir slēgta. Amats ir aizpildīts.
+JobClosedTextCanceled=Darba vieta ir slēgta.
+ExtrafieldsJobPosition=Papildu atribūti (amata vietas)
+ExtrafieldsApplication=Complementary attributes (job applications)
+MakeOffer=Uztaisīt piedāvājumu
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index 4822bca650a..ae1c4042f5d 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Vai jūs tiešām vēlaties apstiprināt šo sūtījumu a
 ConfirmCancelSending=Vai esat pārliecināts, ka vēlaties atcelt šo sūtījumu?
 DocumentModelMerou=Merou A5 modelis
 WarningNoQtyLeftToSend=Uzmanību, nav produktu kuri gaida nosūtīšanu.
-StatsOnShipmentsOnlyValidated=Statistika veikti uz sūtījumiem tikai apstiprinātiem. Lietots datums ir datums apstiprināšanu sūtījuma (ēvelēti piegādes datums ir ne vienmēr ir zināms).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Plānotais piegādes datums
 RefDeliveryReceipt=Ref piegādes kvīts
 StatusReceipt=Piegādes kvīts statuss
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 2f36be754a0..2b3f5058ec2 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Nav iepriekš produktu šo objektu. Līdz ar to na
 DispatchVerb=Nosūtīšana
 StockLimitShort=Brīdinājuma limits
 StockLimit=Krājumu brīdinājuma limits
-StockLimitDesc=(tukšs) nozīmē, ka nav brīdinājuma. <br> 0 var izmantot brīdinājumam, tiklīdz krājums ir tukšs.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Fiziskais krājums
 RealStock=Rālie krājumi
 RealStockDesc=Fiziskā / reālā krājumi ir krājumi, kas pašlaik atrodas noliktavās.
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index a654848e06a..9a902874c9c 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Parole mainīts: %s
 SubjectNewPassword=Jūsu jaunā parole %s
 GroupRights=Grupas atļaujas
 UserRights=Lietotāja atļaujas
+Credentials=Credentials
 UserGUISetup=Lietotāja displeja iestatīšana
 DisableUser=Bloķēt
 DisableAUser=Bloķēt lietotāju
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Izmantojiet lauka veids, lai mainītu
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Izmantojiet OpenID, lai pieteiktos
 WeeklyHours=Nostrādātais laiks (nedēļā)
-ExpectedWorkedHours=Paredzamais darba laiks nedēļā
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Lietotāja krāsa
 DisabledInMonoUserMode=Atspējots uzturēšanas režīmā
 UserAccountancyCode=Lietotāja grāmatvedības kods
@@ -115,7 +116,7 @@ DateOfEmployment=Nodarbināšanas datums
 DateEmployment=Nodarbinātība
 DateEmploymentstart=Nodarbinātības sākuma datums
 DateEmploymentEnd=Nodarbinātības beigu datums
-RangeOfLoginValidity=Pieteikšanās derīguma datumu diapazons
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Jūs nevarat atspējot savu lietotāja ierakstu
 ForceUserExpenseValidator=Spēka izdevumu pārskata apstiprinātājs
 ForceUserHolidayValidator=Piespiedu atvaļinājuma pieprasījuma validētājs
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index af85a06422d..6fe5bbf285a 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Vietņu rekvizītos definējiet visu
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index ea5914defc9..68a261785cc 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 95637c0e773..7c03add0eaf 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 8763554c1a2..6fafa0aeeb0 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index 998873668db..fec7bfce851 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Предлози (треба да се потврдат)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
index 00aa55643c7..e409bf6180a 100644
--- a/htdocs/langs/mk_MK/boxes.lang
+++ b/htdocs/langs/mk_MK/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Најстари активни истечени услуги
 BoxLastExpiredServices=Најнови %s најстари контакти со активни истечени услуги
 BoxTitleLastActionsToDo=Најнови %s активности што треба да се направат
-BoxTitleLastContracts=Најнови %s изменети договори
-BoxTitleLastModifiedDonations=Најнови %s изменети донации
-BoxTitleLastModifiedExpenses=Најнови %s изменети извештаи за трошоци
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Глобална активност (фактури, понуди, нарачки)
 BoxGoodCustomers=Добри клиенти
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index cb184028464..18932dd841e 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 08beacc3f25..ac5916d3675 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Затворено
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/mk_MK/ecm.lang b/htdocs/langs/mk_MK/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/mk_MK/ecm.lang
+++ b/htdocs/langs/mk_MK/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/mk_MK/eventorganization.lang b/htdocs/langs/mk_MK/eventorganization.lang
new file mode 100644
index 00000000000..1c27dd55a21
--- /dev/null
+++ b/htdocs/langs/mk_MK/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Подесувања
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Нацрт
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/mk_MK/knowledgemanagement.lang b/htdocs/langs/mk_MK/knowledgemanagement.lang
new file mode 100644
index 00000000000..5267df31200
--- /dev/null
+++ b/htdocs/langs/mk_MK/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Подесувања
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index 3d72192f7ce..170e41b5384 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 4eeeea5c4d3..cfa487979f0 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Настан
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index e83f0e44759..20f18a2cf0d 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Друг член (име: <b>%s</b>
 ErrorUserPermissionAllowsToLinksToItselfOnly=Од безбедносни причини, мора да ги имате привилегија за едитирање на сите корисници за тие да можат да линкуваат член до корисник што не е ваш.
 SetLinkToUser=Врска до корисник на Долибар
 SetLinkToThirdParty=Врска до трета страна на Долибар
-MembersCards=Бизнис картички на членови
+MembersCards=Business cards for members
 MembersList=Листа на членови
 MembersListToValid=Список на предлог-членови (што треба да се верификуваат)
 MembersListValid=Листа на валидни членови
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Датум на претплата
 DateEndSubscription=Датум на завршување на претплатата
-EndSubscription=Крај на претплата
+EndSubscription=Subscription Ends
 SubscriptionId=ИД за претплата
 WithoutSubscription=Without subscription
 MemberId=ИД на член
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/mk_MK/modulebuilder.lang b/htdocs/langs/mk_MK/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/mk_MK/modulebuilder.lang
+++ b/htdocs/langs/mk_MK/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/mk_MK/partnership.lang b/htdocs/langs/mk_MK/partnership.lang
new file mode 100644
index 00000000000..79ef0961c57
--- /dev/null
+++ b/htdocs/langs/mk_MK/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Почетен датум
+DatePartnershipEnd=Краен датум
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Нацрт
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/mk_MK/productbatch.lang
+++ b/htdocs/langs/mk_MK/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 9b980716330..b8be8edd70b 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Затворено
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/mk_MK/recruitment.lang b/htdocs/langs/mk_MK/recruitment.lang
index c8838fc60b3..5e3f22fe352 100644
--- a/htdocs/langs/mk_MK/recruitment.lang
+++ b/htdocs/langs/mk_MK/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang
index e21b52f73f1..efc4e791a46 100644
--- a/htdocs/langs/mk_MK/sendings.lang
+++ b/htdocs/langs/mk_MK/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index d5de0203ece..00619fd3310 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/mk_MK/users.lang
+++ b/htdocs/langs/mk_MK/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/mn_MN/boxes.lang b/htdocs/langs/mn_MN/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/mn_MN/boxes.lang
+++ b/htdocs/langs/mn_MN/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/mn_MN/categories.lang b/htdocs/langs/mn_MN/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/mn_MN/categories.lang
+++ b/htdocs/langs/mn_MN/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index 154400c6536..fbe75f09ab0 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/mn_MN/ecm.lang b/htdocs/langs/mn_MN/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/mn_MN/ecm.lang
+++ b/htdocs/langs/mn_MN/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/mn_MN/eventorganization.lang b/htdocs/langs/mn_MN/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/mn_MN/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/mn_MN/knowledgemanagement.lang b/htdocs/langs/mn_MN/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/mn_MN/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/mn_MN/mails.lang
+++ b/htdocs/langs/mn_MN/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index 888daf47649..02d765a15e5 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/mn_MN/modulebuilder.lang b/htdocs/langs/mn_MN/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/mn_MN/modulebuilder.lang
+++ b/htdocs/langs/mn_MN/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/mn_MN/partnership.lang b/htdocs/langs/mn_MN/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/mn_MN/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/mn_MN/productbatch.lang b/htdocs/langs/mn_MN/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/mn_MN/productbatch.lang
+++ b/htdocs/langs/mn_MN/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/mn_MN/recruitment.lang b/htdocs/langs/mn_MN/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/mn_MN/recruitment.lang
+++ b/htdocs/langs/mn_MN/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/mn_MN/sendings.lang b/htdocs/langs/mn_MN/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/mn_MN/sendings.lang
+++ b/htdocs/langs/mn_MN/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/mn_MN/users.lang b/htdocs/langs/mn_MN/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/mn_MN/users.lang
+++ b/htdocs/langs/mn_MN/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index df6bcaaf778..59889975fdb 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Referanse
 LabelAccount=Kontoetikett
 LabelOperation=Etikettoperasjon
 Sens=Retning
-AccountingDirectionHelp=For en regnskapskonto til en kunde, bruk Kreditt for å registrere en betaling du mottok <br> For en regnskapskonto for en leverandør, bruk Debet for å registrere en betaling du foretar
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Korrespondansekode
 Lettering=Korrespondanse
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=Ingen flere poster å journalisere
 ListOfProductsWithoutAccountingAccount=Liste over varer som ikke bundet til en regnskapskonto
 ChangeBinding=Endre bindingen
 Accounted=Regnskapsført i hovedbok
-NotYetAccounted=Ikke regnskapsført i hovedboken enda
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Vis veiledning
 NotReconciled=Ikke sammenslått
 WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle operasjoner uten definert sub-hovedbokskonto er filtrert og ekskludert fra denne visningen
@@ -407,15 +407,15 @@ FECFormatJournalCode=Kodejournal (JournalCode)
 FECFormatJournalLabel=Etikettjournal (JournalLib)
 FECFormatEntryNum=Piece number (EcritureNum)
 FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountNumber=Generelt kontonummer (CompteNum)
 FECFormatGeneralAccountLabel=General account label (CompteLib)
 FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
 FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
 FECFormatPieceRef=Piece ref (PieceRef)
 FECFormatPieceDate=Piece date creation (PieceDate)
 FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
+FECFormatDebit=Debet (debet)
+FECFormatCredit=Kreditt (kreditt)
 FECFormatReconcilableCode=Reconcilable code (EcritureLet)
 FECFormatReconcilableDate=Reconcilable date (DateLet)
 FECFormatValidateDate=Piece date validated (ValidDate)
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 61da8abc721..1e2103f89f8 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -37,7 +37,7 @@ UnlockNewSessions=Fjern forbindelseslås
 YourSession=Din økt
 Sessions=Brukers økter
 WebUserGroup=Webserver bruker/gruppe
-PermissionsOnFiles=Permissions on files
+PermissionsOnFiles=Filtillatelser
 PermissionsOnFilesInWebRoot=Tillatelser for filer i rotkatalogen på web
 PermissionsOnFile=Tillatelser på fil %s
 NoSessionFound=Din PHP-konfigurasjon ser ut til å ikke tillate oppføring av aktive økter. Mappen som brukes til å lagre økter (<b> %s </b>) kan være beskyttet (for eksempel av operativsystemer eller ved hjelp av PHP-direktivet open_basedir).
@@ -63,7 +63,8 @@ IfModuleEnabled=Merk: Ja er bare effektiv hvis modulen <b>%s</b> er aktivert
 RemoveLock=Fjern/endre navn på filen <b>%s</b> hvis den eksisterer, for å tillate bruk av oppdaterings-/installeringsverktøyet.
 RestoreLock=Gjenopprett filen <b>%s</b> med kun leserettigheter, for å deaktivere bruk av oppdateringsverktøyet.
 SecuritySetup=Sikkerhetsinnstillinger
-PHPSetup=PHP setup
+PHPSetup=PHP-oppsett
+OSSetup=OS setup
 SecurityFilesDesc=Her defineres valg relatert til sikkerhet ved opplasting av filer.
 ErrorModuleRequirePHPVersion=Feil: Denne modulen krever PHP versjon %s eller høyere
 ErrorModuleRequireDolibarrVersion=Feil: Denne modulen krever Dolibarr versjon %s eller høyere
@@ -350,8 +351,8 @@ LastActivationAuthor=Siste aktiveringsforfatter
 LastActivationIP=Siste aktivering IP
 UpdateServerOffline=Oppdater serveren offline
 WithCounter=Administrer en teller
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=Her kan du legge inn nummereringsmal. I malen kan du bruke følgende tagger:<br><b>{000000}</b> tilsvarer et tall som økes ved hver %s. Angi så mange nuller som du ønsker at lengden på telleren skal være. Telleren vil ha ledende nuller i henhold til malens lengde. <br><b>{000000+000}</b> samme som forrige, men med en forskyvning til høyre for + tegnet, starter fra første %s. <br><b>{000000@x}</b> samme som forrige, men telleren starter fra null når måned x nås (x mellom 1 og 12, eller 0 for de første månedene i året, eller 99 for nullstilling hver måned). Hvis dette valget brukes og x er 2 eller mer kreves også sekvensen {yy}{mm} eller {yyyy}{mm} kreves også. <br><b>{dd}</b> dag (01 til 31).<br><b>{mm}</b> måned (01 til 12).<br><b>{yy}</b>, <b>{yyyy}</b> eller <b>{y}</b> årstall over 2, 4 eller 1 siffer. <br>
+GenericMaskCodes2=<b> {cccc} </b> klientkoden på n tegn <br> <b> {cccc000} </b> klientkoden på n tegn etterfølges av en teller dedikert for 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>
 GenericMaskCodes3EAN=Alle andre tegn i masken forblir intakte (unntatt * eller ? I 13. posisjon i EAN13). <br> Mellomrom er ikke tillatt. <br> I EAN13 skal det siste tegnet etter det siste} i 13. posisjon være * eller? . Den vil bli erstattet av den beregnede nøkkelen. <br>
 GenericMaskCodes4a=<u>Eksempel på 99. %s fra tredjepart TheCompany, med dato 2007-01-31: </u> <br>
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Ikke foreslå
 NoActiveBankAccountDefined=Ingen aktive bankkonti definert
 OwnerOfBankAccount=Eier av bankkonto  %s
 BankModuleNotActive=Bankkontomodul ikke slått på
-ShowBugTrackLink=Vis lenken "<strong>%s</strong>"
+ShowBugTrackLink=Definer lenken "<strong> %s </strong>" (tom for å ikke vise denne lenken, 'github' for lenken til Dolibarr-prosjektet eller definer direkte en url 'https: // ...')
 Alerts=Varsler
 DelaysOfToleranceBeforeWarning=Forsinkelse før du viser en advarsel for:
 DelaysOfToleranceDesc=Angi forsinkelsen før et advarselsikon %s vises på skjermen for det forsinkede elementet.
@@ -1184,8 +1185,8 @@ SetupDescription2=Følgende to seksjoner er obligatoriske (de to første oppfør
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Grunnleggende parametere som brukes til å tilpasse standardoppførselen til applikasjonen din (for eksempel landrelaterte funksjoner).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br> Denne programvaren er en serie med mange moduler/applikasjoner. Modulene relatert til dine behov må være aktivert og konfigurert. Menyoppføringer vises ved aktivering av disse modulene.
 SetupDescription5=Annet oppsett menyoppføringer styrer valgfrie parametere.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
+AuditedSecurityEvents=Sikkerhetshendelser som blir revidert
+NoSecurityEventsAreAduited=Ingen sikkerhetshendelser blir revidert. Du kan aktivere dem fra meny %s
 Audit=Revisjon
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om nettleser
@@ -1253,7 +1254,8 @@ RunningUpdateProcessMayBeRequired=Kjøring av oppgraderingen ser ut til å være
 YouMustRunCommandFromCommandLineAfterLoginToUser=Du må kjøre denne kommandoen fra kommandolinjen etter innlogging til et skall med brukeren <b>%s.</b>
 YourPHPDoesNotHaveSSLSupport=SSL funksjoner ikke tilgjengelige i din PHP
 DownloadMoreSkins=Flere skins å laste ned
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefModelDesc=Returnerer referansenummeret i formatet %syymm-nnnn der yy er året, mm er måneden og nnnn er et sekvensielt automatisk økende nummer uten nullstilling
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Vis Profesjonell ID med adresser
 ShowVATIntaInAddress=Skjul intra-Community MVA-numre med adresse
 TranslationUncomplete=Delvis oversettelse
@@ -1271,7 +1273,7 @@ MAIN_PROXY_HOST=Proxy-server: Navn/adresse
 MAIN_PROXY_PORT=Proxy-server: Port
 MAIN_PROXY_USER=Proxy-server: Log-in/bruker
 MAIN_PROXY_PASS=Proxy-server: Passord
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=Definer eventuelle tilleggs/egendefinerte attributter som må legges til: %s
 ExtraFields=Komplementære attributter
 ExtraFieldsLines=Utfyllende attributter (linjer)
 ExtraFieldsLinesRec=Komplementære attributter (fakturalinjermaler )
@@ -1515,7 +1517,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Eksempel: uid
 LDAPFilterConnection=Søkefilter
 LDAPFilterConnectionExample=Eksempel : &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=Eksempel: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Eksempel : samaccountname
 LDAPFieldFullname=Fullt navn
@@ -1751,7 +1753,7 @@ CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Hold avkrysningsboksen "Opprett automatisk b
 ##### Agenda #####
 AgendaSetup=Innstillinger for modulen hendelser og agenda
 PasswordTogetVCalExport=Nøkkel for å autorisere eksportlenke
-SecurityKey = Security Key
+SecurityKey = Sikkerhetsnøkkel
 PastDelayVCalExport=Ikke eksporter hendelser eldre enn
 AGENDA_USE_EVENT_TYPE=Bruk hendelsestyper (administrert i menyoppsett -> Ordbøker -> Type agendahendelser)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Angi denne standardverdien automatisk for type hendelse i skjema for hendelsesoppretting
@@ -1979,7 +1981,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bunnmarg på PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Høyde for logo på PDF
 NothingToSetup=Det er ikke noe spesifikt oppsett som kreves for denne modulen.
 SetToYesIfGroupIsComputationOfOtherGroups=Sett til ja hvis denne gruppen er en beregning av andre grupper
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Angi beregningsregelen hvis forrige felt ble satt til Ja. <br> For eksempel: <br> CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Flere språkvarianter funnet
 RemoveSpecialChars=Fjern spesialtegn
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter til ren verdi (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -2062,7 +2064,7 @@ UseDebugBar=Bruk feilsøkingsfeltet
 DEBUGBAR_LOGS_LINES_NUMBER=Nummer på siste logglinjer å beholde i konsollen
 WarningValueHigherSlowsDramaticalyOutput=Advarsel, høyere verdier reduserer resultatet dramatisk
 ModuleActivated=Modul %s er aktivert og bremser grensesnittet
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Hvis du er i et produksjonsmiljø, bør du sette denne egenskapen til %s.
 AntivirusEnabledOnUpload=Antivirus aktivert på opplastede filer
@@ -2091,7 +2093,7 @@ FeatureNotAvailableWithReceptionModule=Funksjonen er ikke tilgjengelig når modu
 EmailTemplate=Mal for e-post
 EMailsWillHaveMessageID=E-postmeldinger vil være merket 'Referanser' som samsvarer med denne syntaksen
 PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
+ShowProjectLabel=Prosjektetikett
 PDF_USE_ALSO_LANGUAGE_CODE=Hvis du vil at tekst i PDF-en din skal dupliseres på 2 forskjellige språk i samme genererte PDF, må du angi dette andre språket, slik at generert PDF vil inneholde 2 forskjellige språk på samme side, det som er valgt når du genererer PDF og dette ( bare få PDF-maler støtter dette). Hold tom for ett språk per PDF.
 FafaIconSocialNetworksDesc=Skriv inn koden til et FontAwesome-ikon. Hvis du ikke vet hva som er FontAwesome, kan du bruke den generelle verdien fa-adresseboken.
 FeatureNotAvailableWithReceptionModule=Funksjonen er ikke tilgjengelig når modulen Mottak er aktivert
@@ -2117,8 +2119,13 @@ AdvancedModeOnly=Tillatelse bare tilgjengelig i avansert tillatelsesmodus
 ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
 MailToSendEventOrganization=Hendelse organisasjon
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
+YouShouldDisablePHPFunctions=Du bør deaktivere PHP-funksjoner
+IfCLINotRequiredYouShouldDisablePHPFunctions=Bortsett fra hvis du trenger å kjøre systemkommandoer (for modulen Planlagt jobb, eller for å kjøre den eksterne kommandolinjen Anti-virus for eksempel), må du deaktivere PHP-funksjoner
+NoWritableFilesFoundIntoRootDir=Ingen skrivbare filer eller kataloger for de vanlige programmene ble funnet i rotkatalogen din (Bra)
+RecommendedValueIs=Anbefalt: %s
+ARestrictedPath=En begrenset sti
+CheckForModuleUpdate=Se etter oppdateringer for eksterne moduler
+CheckForModuleUpdateHelp=Denne handlingen kobles til editorer for eksterne moduler for å sjekke om en ny versjon er tilgjengelig.
+ModuleUpdateAvailable=En oppdatering er tilgjengelig
+NoExternalModuleWithUpdate=Ingen oppdateringer funnet for eksterne moduler
+SwaggerDescriptionFile=Swagger API-beskrivelsesfil (for bruk med f.eks redoc)
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 0de8696fb38..029b2ec2c07 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Betaling av skatter og avgifter
 BankTransfer=Kredittoverføring
 BankTransfers=Kredittoverføringer
 MenuBankInternalTransfer=Intern overførsel
-TransferDesc=Overføring fra en konto til en annen, vil Dolibarr skrive to poster (en debet i kildekonto og en kreditt i målkontoen). Det samme beløpet (unntatt tegn), etikett og dato vil bli brukt til denne transaksjonen)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Fra
 TransferTo=Til
 TransferFromToDone=En overføring fra <b>%s</b> til <b>%s</b> på <b>%s</b> %s er registrert.
 CheckTransmitter=Avsender
 ValidateCheckReceipt=Valider sjekkvittering?
-ConfirmValidateCheckReceipt=Er du sikker på at du vil validere denne sjekkvitteringen? Ingen endringer kan utføres etter at dette er gjort.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Slett denne sjekkvitteringen?
 ConfirmDeleteCheckReceipt=Er du sikker på at du vil slette denne sjekkvitteringen?
 BankChecks=Banksjekker
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Er du sikker på at du vil slette denne oppføringen?
 ThisWillAlsoDeleteBankRecord=Dette vil også slette generert bankoppføring
 BankMovements=Bevegelser
 PlannedTransactions=Planlagte oppføringer
-Graph=Grafikk
+Graph=Graphs
 ExportDataset_banque_1=Bankoppføringer og kontoutskrifter
 ExportDataset_banque_2=Kvittering
 TransactionOnTheOtherAccount=Transaksjonen på den andre kontoen
@@ -142,7 +142,7 @@ AllAccounts=Alle bank- og kontantkontoer
 BackToAccount=Tilbake til kontoen
 ShowAllAccounts=Vis for alle kontoer
 FutureTransaction=Fremtidig transaksjon. Kan ikke avstemme.
-SelectChequeTransactionAndGenerate=Velg/filter sjekker for å inkludere sjekk-innskuddskvitteringen og klikk på "Opprett"
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Velg kontoutskriften som hører til avstemmingen. Bruke en sorterbar numerisk verdi: YYYYMM eller YYYYMMDD
 EventualyAddCategory=Til slutt, velg en kategori for å klassifisere postene
 ToConciliate=Slå sammen?
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 5ad3d1ac255..4d412179aa1 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -82,8 +82,8 @@ PaymentsAlreadyDone=Betalinger allerede utført
 PaymentsBackAlreadyDone=Refusjon allerede gjort
 PaymentRule=Betalingsregel
 PaymentMode=Betalingstype
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
+DefaultPaymentMode=Standard betalingstype
+DefaultBankAccount=Standard bankkonto
 PaymentTypeDC=Debet/kredit-kort
 PaymentTypePP=PayPal
 IdPaymentMode=Betalingstype (ID)
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Konverter overskudd betalt til tilgjengelig rabatt
 EnterPaymentReceivedFromCustomer=Legg inn betaling mottatt fra kunde
 EnterPaymentDueToCustomer=Lag purring til kunde
 DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null
-PriceBase=Prisgrunnlag
+PriceBase=Base price
 BillStatus=Fakturastatus
 StatusOfGeneratedInvoices=Status for genererte fakturaer
 BillStatusDraft=Kladd (må valideres)
@@ -376,7 +376,7 @@ DateLastGeneration=Dato for siste generering
 DateLastGenerationShort=Dato siste generering
 MaxPeriodNumber=Maks antall fakturagenereringer
 NbOfGenerationDone=Antall fakturagenereringer allerede gjort
-NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationOfRecordDone=Antall postgenereringer allerede utført
 NbOfGenerationDoneShort=Antall genereringer gjort
 MaxGenerationReached=Maks antall genereringer nådd
 InvoiceAutoValidate=Valider fakturaer automatisk
@@ -454,7 +454,7 @@ RegulatedOn=Regulert den
 ChequeNumber=Sjekk nummer
 ChequeOrTransferNumber=Sjekk/overføringsnummer
 ChequeBordereau=Sjekk timeplan
-ChequeMaker=Sjekk/overføring sender
+ChequeMaker=Check/Transfer sender
 ChequeBank=Sjekkutsteders bank
 CheckBank=Sjekk
 NetToBePaid=Netto til betaling
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index e16bdcc4fdb..603a4696a2a 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Siste intervensjoner
 BoxCurrentAccounts=Åpne kontobalanse
 BoxTitleMemberNextBirthdays=Fødselsdager denne måneden (medlemmer)
-BoxTitleMembersByType=Members by type
+BoxTitleMembersByType=Medlemmer etter type
 BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Siste %s nyheter fra %s
 BoxTitleLastProducts=Varer/Tjenester: siste %s endret
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bokmerker: siste %s
 BoxOldestExpiredServices=Eldste aktive utløpte tjenester
 BoxLastExpiredServices=Siste %s eldste kontakter med aktive, utgåtte tjenseter
 BoxTitleLastActionsToDo=Siste %s handlinger å utføre
-BoxTitleLastContracts=Siste %s endrede kontrakter
-BoxTitleLastModifiedDonations=Siste %s endrede donasjoner
-BoxTitleLastModifiedExpenses=Siste %s endrede utgiftsrapporter
-BoxTitleLatestModifiedBoms=Siste %s modifiserte BOM-er
-BoxTitleLatestModifiedMos=Siste %s endrede produksjonsordre
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Kunder med maksimalt utestående overskredet
 BoxGlobalActivity=Global aktivitet (fakturaer, tilbud, ordrer)
 BoxGoodCustomers=Gode kunder
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index 3ec944ed126..ec22d834076 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Etasje
 AddTable=Legg til tabell
 Place=Sted
 TakeposConnectorNecesary='TakePOS Connector' kreves
-OrderPrinters=Ordreskrivere
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Søk produkt
 Receipt=Kvittering
 Header=Overskrift
@@ -56,8 +57,9 @@ Paymentnumpad=Tastaturtype for å legge inn betaling
 Numberspad=Nummertastatur
 BillsCoinsPad=Mynter og pengesedler Pad
 DolistorePosCategory=TakePOS-moduler og andre POS-løsninger for Dolibarr
-TakeposNeedsCategories=TakePOS trenger varekategorier for å fungere
-OrderNotes=Ordrenotater
+TakeposNeedsCategories=TakePOS trenger minst en produktkategori for å fungere
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS trenger minst en produktkategori under kategorien <b>%s</b> for å fungere
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Standardkonto for bruk for betalinger i
 NoPaimementModesDefined=Ingen betalingsmodus definert i TakePOS-konfigurasjonen
 TicketVatGrouped=Grupper mva etter pris i billetter|kvitteringer
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Faktura er allerede validert
 NoLinesToBill=Ingen linjer å fakturere
 CustomReceipt=Tilpasset kvittering
 ReceiptName=Kvitteringsnavn
-ProductSupplements=Produkttillegg
+ProductSupplements=Manage supplements of products
 SupplementCategory=Tilleggskategori
 ColorTheme=Fargetema
 Colorful=Fargerik
@@ -92,7 +94,7 @@ Browser=Nettleser
 BrowserMethodDescription=Enkel kvitteringsutskrift. Kun noen få parametere for å konfigurere kvitteringen. Skriv ut via nettleser.
 TakeposConnectorMethodDescription=Ekstern modul med ekstra funksjoner. Mulighet for å skrive ut fra skyen.
 PrintMethod=Utskriftsmetode
-ReceiptPrinterMethodDescription=Metode med mange parametere. Full tilpassbar med maler. Kan ikke skrive ut fra skyen.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=Med terminal
 TakeposNumpadUsePaymentIcon=Bruk ikon i stedet for tekst på betalingsknappene på nummertastaturet
 CashDeskRefNumberingModules=Nummereringsmodul for POS-salg
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Modulen Kvitteringsskriver må ha blitt aktive
 AllowDelayedPayment=Tillat forsinket betaling
 PrintPaymentMethodOnReceipts=Skriv ut betalingsmåte på billetter/kvitteringer
 WeighingScale=Vektskala
+ShowPriceHT = Vis prisen uten avgiftskolonne
+ShowPriceHTOnReceipt = Vis prisen uten avgiftskolonne på kvittering
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index e9d51fae4d2..4495f4ab79e 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Merke/Kategori
 Rubriques=Merker/Kategorier
 RubriquesTransactions=Etiketter/Kategorier av transaksjoner
 categories=merker/kategorier
-NoCategoryYet=Ingen merker/kategorier av denne typen er opprettet
+NoCategoryYet=No tag/category of this type has been created
 In=I
 AddIn=Legg til i
 modify=endre
 Classify=Klassifiser
 CategoriesArea=Merker/Kategorier-område
-ProductsCategoriesArea=Område for varer/tjenester, merker/kategorier
-SuppliersCategoriesArea=Område for leverandørkoder/-kategorier
-CustomersCategoriesArea=Område for kunde-merker/kategorier
-MembersCategoriesArea=Område for medlems-merker/kategorier
-ContactsCategoriesArea=Område for kontakters merker/kategorier
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Prosjekters merker/kategori-område
-UsersCategoriesArea=Område for brukertagger/-kategorier
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Underkategorier
 CatList=Liste over merker/kategorier
 CatListAll=Liste over etiketter/kategorier (alle typer)
@@ -93,7 +93,7 @@ AddSupplierIntoCategory=Tilordne kategori til leverandør
 ShowCategory=Vis merke/kategori
 ByDefaultInList=Som standard i liste
 ChooseCategory=Velg kategori
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
+StocksCategoriesArea=Varehuskategorier
+ActionCommCategoriesArea=Arrangementskategorier
 WebsitePagesCategoriesArea=Side-Container Kategorier
-UseOrOperatorForCategories=Bruker eller operatør for kategorier
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index ebb5306c4a0..bc0cfa70a8f 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Firmanavnet %s finnes allerede. Velg et annet!
 ErrorSetACountryFirst=Angi land først
 SelectThirdParty=Velg en tredjepart
-ConfirmDeleteCompany=Er du sikker på at du vil slette dette firmaet og all tilhørende informasjon?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Slett kontaktperson
-ConfirmDeleteContact=Er du sikker på at du vil slette denne kontakten og all tilhørende informasjon?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Ny tredje part
 MenuNewCustomer=Ny kunde
 MenuNewProspect=Nytt prospekt
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Ring
 Chat=Chat
-PhonePro=Tlf. arbeid
+PhonePro=Bus. phone
 PhonePerso=Tlf. privat
 PhoneMobile=Tlf. mobil
 No_Email=Avvis masse-e-post
@@ -331,7 +331,7 @@ CustomerCodeDesc=Kundekode, unikt for alle kunder
 SupplierCodeDesc=Leverandørkode, unikt for alle leverandører
 RequiredIfCustomer=Påkrevet hvis tredjeparten er kunde eller prospekt
 RequiredIfSupplier=Påkrevd hvis tredjepart er en leverandør
-ValidityControledByModule=Gyldighet kontrollert av modulen
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Regler for denne modulen
 ProspectToContact=Prospekt til kontakt
 CompanyDeleted=Firma "%s" er slettet fra databasen.
@@ -439,12 +439,12 @@ ListSuppliersShort=Liste over leverandører
 ListProspectsShort=Liste over prospekter
 ListCustomersShort=Liste over kunder
 ThirdPartiesArea=Tredjeparter / Kontakter
-LastModifiedThirdParties=Siste %s endrede tredjeparter
-UniqueThirdParties=Totalt antall tredjeparter
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Åpent
 ActivityCeased=Stengt
 ThirdPartyIsClosed=Tredjepart er stengt
-ProductsIntoElements=Liste over varer/tjenester i %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Gjeldende utestående regning
 OutstandingBill=Max. utestående beløp
 OutstandingBillReached=Maksimun utestående beløp nådd
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Fri kode. Denne koden kan endres når som helst.
 ManagingDirectors=(E) navn (CEO, direktør, president ...)
 MergeOriginThirdparty=Dupliser tredjepart (tredjepart du vil slette)
 MergeThirdparties=Flett tredjeparter
-ConfirmMergeThirdparties=Er du sikker på at du vil slå sammen denne tredjeparten med den nåværende? Alle koblede objekter (fakturaer, ordre, ...) blir flyttet til nåværende tredjepart, og tredjeparten blir slettet.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Tredjeparter har blitt flettet
 SaleRepresentativeLogin=Innlogging for salgsrepresentant
 SaleRepresentativeFirstname=Selgers fornavn
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 9739b3a0a96..378bd42cc51 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Ny rabatt
 NewCheckDeposit=Nytt sjekkinnskudd
 NewCheckDepositOn=Lag kvittering for innskudd på konto: %s
 NoWaitingChecks=Ingen sjekker venter på å bli satt inn.
-DateChequeReceived=Dato for sjekkmottak
+DateChequeReceived=Check receiving date
 NbOfCheques=Antall sjekker
 PaySocialContribution=Betal skatt/avgift
 PayVAT=Betal en MVA-deklarasjon
diff --git a/htdocs/langs/nb_NO/dict.lang b/htdocs/langs/nb_NO/dict.lang
index 712106fd943..68218bb0ba4 100644
--- a/htdocs/langs/nb_NO/dict.lang
+++ b/htdocs/langs/nb_NO/dict.lang
@@ -290,7 +290,7 @@ CurrencyXOF=CFA franc BCEAO
 CurrencySingXOF=CFA franc BCEAO
 CurrencyXPF=CFP franc
 CurrencySingXPF=CFP franc
-CurrencyCentEUR=cents
+CurrencyCentEUR=cent
 CurrencyCentSingEUR=cent
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
diff --git a/htdocs/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
index 4d538a9eb7d..c9b7c92e785 100644
--- a/htdocs/langs/nb_NO/ecm.lang
+++ b/htdocs/langs/nb_NO/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Ekstrafelt Ecm Filer
 ExtraFieldsEcmDirectories=Ekstrafelt Ecm-mapper
 ECMSetup=ECM-oppsett
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 2c5e1915bc7..5127205840e 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Ingen feil
 # Errors
 ErrorButCommitIsDone=Valider selv om feil ble funnet
-ErrorBadEMail=E-post %s er feil
-ErrorBadMXDomain=E-post %s virker feil (domenet har ingen gyldig MX-post)
-ErrorBadUrl=Url %s er feil
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Feil parameterverdi. Dette skjer vanligvis når en oversettelse mangler.
 ErrorRefAlreadyExists=Referanse <b> %s </b> eksisterer allerede.
 ErrorLoginAlreadyExists=brukernavnet %s eksisterer allerede.
@@ -46,8 +46,8 @@ ErrorWrongDate=Dato er feil!
 ErrorFailedToWriteInDir=Kan ikke skrive til mappen %s
 ErrorFoundBadEmailInFile=Feil e-postsyntaks for %s linjer i filen (for eksempel linje %s med e-post=%s)
 ErrorUserCannotBeDelete=Brukeren kan ikke slettes. Kanskje det er knyttet til Dolibarr-enheter.
-ErrorFieldsRequired=Noen påkrevde felt er ikke fylt ut.
-ErrorSubjectIsRequired=Epost-emnet er påkrevd
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Kunne ikke opprette mappen. Kontroller at webserverbrukeren har skriverettigheter i dokumentmappen i Dolibarr. Hvis <b>safe_mode</b> er akivert i PHP, sjekk at webserveren eier eller er med i gruppen(eller bruker) for Dolibarr php-filer.
 ErrorNoMailDefinedForThisUser=Ingen e-post angitt for denne brukeren.
 ErrorSetupOfEmailsNotComplete=Installasjonen av e-post er ikke fullført
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Siden/containeren <strong> %s </stron
 ErrorDuringChartLoad=Feil ved lasting av kart over kontoer. Hvis noen kontoer ikke ble lastet, kan du fremdeles angi dem manuelt.
 ErrorBadSyntaxForParamKeyForContent=Feil syntaks for parameter keyforcontent. Må ha en verdi som starter med %s eller %s
 ErrorVariableKeyForContentMustBeSet=Feil, konstanten med navn %s (med tekstinnhold som skal vises) eller %s (med ekstern url til visning) må settes.
+ErrorURLMustEndWith=URL %s må avslutte med %s
 ErrorURLMustStartWithHttp=URL %s må starte med http:// eller https://
 ErrorHostMustNotStartWithHttp=Vertsnavnet %s må IKKE starte med http:// eller https://
 ErrorNewRefIsAlreadyUsed=Feil, den nye referansen er allerede brukt
@@ -260,7 +261,7 @@ ErrorAParameterIsRequiredForThisOperation=En parameter er obligatorisk for denne
 ErrorDateIsInFuture=Feil, datoen kan ikke settes frem i tid
 ErrorAnAmountWithoutTaxIsRequired=Feil, beløp er obligatorisk
 ErrorAPercentIsRequired=Feil, fyll ut prosentandelen riktig
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
+ErrorYouMustFirstSetupYourChartOfAccount=Du må først konfigurere kontoplanen din
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
@@ -293,6 +294,7 @@ WarningFailedToAddFileIntoDatabaseIndex=Advarsel, kunne ikke legge til filoppfø
 WarningTheHiddenOptionIsOn=Advarsel, det skjulte alternativet <b> %s </b> er på.
 WarningCreateSubAccounts=Advarsel, du kan ikke opprette en underkonto direkte, du må opprette en tredjepart eller en bruker og tildele dem en regnskapskode for å finne dem i denne listen
 WarningAvailableOnlyForHTTPSServers=Bare tilgjengelig hvis du bruker HTTPS-sikret tilkobling.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+WarningModuleXDisabledSoYouMayMissEventHere=Modul %s er ikke aktivert, så du kan gå glipp av mange hendelser her.
+ErrorActionCommPropertyUserowneridNotDefined=Brukerens eier kreves
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Versjonskontroll mislyktes
diff --git a/htdocs/langs/nb_NO/eventorganization.lang b/htdocs/langs/nb_NO/eventorganization.lang
new file mode 100644
index 00000000000..fb6677b6739
--- /dev/null
+++ b/htdocs/langs/nb_NO/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Arrangementorganisasjon
+EventOrganizationDescription = Arrangementsorganisasjon gjennom Prosjektmodul
+EventOrganizationDescriptionLong= Administrer organisering av arrangementer for konferanser, deltakere, foredragsholdere og deltakere, med offentlig abonnementside
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organiserte arrangementer
+EventOrganizationConferenceOrBoothMenuLeft = Konferanse eller messe
+
+#
+# Admin page
+#
+EventOrganizationSetup = Oppsett av arrangementorganisasjon
+Settings = Innstillinger
+EventOrganizationSetupPage = Konfigurasjonsside for arrangementsorganisasjon
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Konferanse eller messe
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Konferanse eller messe
+ConferenceOrBoothTab = Konferanse eller messe
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Kladd
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Utført
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/nb_NO/externalsite.lang b/htdocs/langs/nb_NO/externalsite.lang
index f7f6bf1e47a..33870ea4a45 100644
--- a/htdocs/langs/nb_NO/externalsite.lang
+++ b/htdocs/langs/nb_NO/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Oppsett av lenke til ekstern nettside
-ExternalSiteURL=External Site URL of HTML iframe content
+ExternalSiteURL=URL for eksternt nettsted for HTML iframe-innhold
 ExternalSiteModuleNotComplete=Modulen Ekstern Side ble ikke riktig konfigurert.
 ExampleMyMenuEntry=Meny overskrift
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index 5d9d9c2137b..47fbcaca76e 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -39,11 +39,11 @@ TitreRequestCP=Feriesøknad
 TypeOfLeaveId=Type ferie - ID
 TypeOfLeaveCode=Type feriekode
 TypeOfLeaveLabel=Ferietype-merke
-NbUseDaysCP=Antall brukte feriedager
-NbUseDaysCPHelp=Beregningen tar hensyn til ikke-arbeidsdager og fridager definert i ordboken.
-NbUseDaysCPShort=Dager brukt
-NbUseDaysCPShortInMonth=Dager brukt i måneden
-DayIsANonWorkingDay=%s er en ikke arbeidsdag
+NbUseDaysCP=Antall permisjonsdager brukt 
+NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days of leave
+NbUseDaysCPShortInMonth=Days of leave in month
+DayIsANonWorkingDay=%s er ikke en arbeidsdag
 DateStartInMonth=Startdato i måned
 DateEndInMonth=Sluttdato i måned
 EditCP=Rediger
@@ -55,7 +55,7 @@ TitleDeleteCP=Slett en feriesøknad
 ConfirmDeleteCP=Bekrefte sletting av denne feriesøknaden?
 ErrorCantDeleteCP=Feil! Du har ikke lov til å slette denne feriesøknaden
 CantCreateCP=Du har ikke lov til å opprette feriesøknader.
-InvalidValidatorCP=Du må velge en godkjenner for din feriesøknad.
+InvalidValidatorCP=You must choose the approver for your leave request.
 NoDateDebut=Du må velge en startdato.
 NoDateFin=Du må velge en sluttdato.
 ErrorDureeCP=Perioden du søker for inneholder ikke arbeidsdager
@@ -80,14 +80,14 @@ UserCP=Bruker
 ErrorAddEventToUserCP=En feil oppsto ved opprettelse av ekstraordinær ferie
 AddEventToUserOkCP=Opprettelse av ekstraordinær ferie er utført
 MenuLogCP=Vis endringslogger
-LogCP=Logg over oppdateringer av tilgjengelige feriedager
-ActionByCP=Utført av
-UserUpdateCP=For bruker
+LogCP=Log of all updates made to "Balance of Leave"
+ActionByCP=Oppdatert av
+UserUpdateCP=Oppdatert for
 PrevSoldeCP=Forrige balanse
 NewSoldeCP=Ny balanse
 alreadyCPexist=En feriesøknad er allerede utført for denne perioden
-FirstDayOfHoliday=Første feriedag
-LastDayOfHoliday=Siste feriedag
+FirstDayOfHoliday=Første dag for permisjon
+LastDayOfHoliday=Siste dag for permisjon
 BoxTitleLastLeaveRequests=Siste %s endrede ferieforespørsler
 HolidaysMonthlyUpdate=Månedlig oppdatering
 ManualUpdate=Manuell oppdatering
@@ -104,8 +104,8 @@ LEAVE_SICK=Sykefravær
 LEAVE_OTHER=Annen ferie
 LEAVE_PAID_FR=Betalt ferie
 ## Configuration du Module ##
-LastUpdateCP=Siste automatisk oppdatering av permisjon
-MonthOfLastMonthlyUpdate=Måned for siste automatiske oppdatering av permisjon
+LastUpdateCP=Last automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
 UpdateConfCPOK=Vellykket oppdatering.
 Module27130Name= Håndtering av feriesøknader
 Module27130Desc= Håndtering av feriesøknader
@@ -125,8 +125,8 @@ HolidaysCanceledBody=Feriesøknaden din for perioden %s til %s er blitt kanselle
 FollowedByACounter=1: Denne typen ferie må være etterfulgt av en teller. Telleren økes automatisk eller manuelt, og når ferieforespørselen blir validert, blir den redusert. <br>0: Ikke etterfulgt av en teller
 NoLeaveWithCounterDefined=Det er ikke definert noen ferietyper som trenger en teller
 GoIntoDictionaryHolidayTypes=Gå til <strong> Hjem - Oppsett - Ordbøker - Type permisjon </strong> for å sette opp forskjellige permisjonstyper.
-HolidaySetup=Oppsett av modulen Ferie
-HolidaysNumberingModules=Nummereringsmodeller for permisjonsforespørsler
+HolidaySetup=Setup of module Leave
+HolidaysNumberingModules=Numbering models for leave requests
 TemplatePDFHolidays=PDF-mal for permisjonsforespørsler 
 FreeLegalTextOnHolidays=Fritekst på PDF
 WatermarkOnDraftHolidayCards=Vannmerke på permisjonsutkast 
diff --git a/htdocs/langs/nb_NO/knowledgemanagement.lang b/htdocs/langs/nb_NO/knowledgemanagement.lang
new file mode 100644
index 00000000000..5d0f27b32f4
--- /dev/null
+++ b/htdocs/langs/nb_NO/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Innstillinger
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Om
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Artikkel
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 9251f3d2386..2b55b8f39ed 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Til bruker(e)
 MailCC=Kopi til
 MailToCCUsers=Kopier til brukere(e)
 MailCCC=Cached kopi til
-MailTopic=E-post tema
+MailTopic=Email subject
 MailText=Meldingstekst
 MailFile=Filvedlegg
 MailMessage=E-mail meldingstekst
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=Ingen automatiske e-postvarsler er planlagt for denne
 ANotificationsWillBeSent=Én automatisk varsling vil bli sendt via e-post
 SomeNotificationsWillBeSent=%s automatiske varsler vil bli sendt via e-post
 AddNewNotification=Abonner på et nytt automatisk e-postvarsel (mål/hendelse)
-ListOfActiveNotifications=Liste opp alle aktive abonnementer (mål/hendelser) for automatisk e-postvarsling
-ListOfNotificationsDone=Liste over alle automatiske e-postvarsler som er sendt
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 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
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 511b46ca210..840f8895d37 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Lagre og ny
 TestConnection=Test tilkobling
 ToClone=Klon
 ConfirmCloneAsk=Er du sikker på at du vil klone objektet <b>%s</b>?
-ConfirmClone=Velg hvilke data du vil klone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Det er ikke valgt noen data å klone.
 Of=av
 Go=Gå
@@ -246,7 +246,7 @@ DefaultModel=Standard dokumentmal
 Action=Handling
 About=Om
 Number=Antall
-NumberByMonth=Antall etter måned
+NumberByMonth=Total reports by month
 AmountByMonth=Beløp etter måned
 Numero=Nummer
 Limit=Grense
@@ -278,7 +278,7 @@ DateModificationShort=Mod. dato
 IPModification=Modifikasjons-IP
 DateLastModification=Siste endringsdato
 DateValidation=Validert den
-DateSigning=Signing date
+DateSigning=Signaturdato
 DateClosing=Lukket den
 DateDue=Forfallsdato
 DateValue=Verdi dato
@@ -341,8 +341,8 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Bruker ved opprettelse
-UserModif=Bruker ved siste oppdatering
+UserAuthor=Ceated by
+UserModif=Oppdatert av
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Av
 From=Fra
 FromDate=Fra
 FromLocation=Fra
-at=på
 to=til
 To=til
+ToDate=til
+ToLocation=til
+at=på
 and=og
 or=eller
 Other=Annen
@@ -727,7 +729,7 @@ MenuMembers=Medlemmer
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Avgifter | Spesielle utgifter
 ThisLimitIsDefinedInSetup=Dolibarr grense (Menu home-setup-security): %s Kb, PHP grense: %s Kb
-NoFileFound=No documents uploaded
+NoFileFound=Ingen dokumenter lastet opp
 CurrentUserLanguage=Gjeldende språk
 CurrentTheme=Gjeldende tema
 CurrentMenuManager=Nåværende menymanager
@@ -843,7 +845,7 @@ XMoreLines=%s linje(r) skjult
 ShowMoreLines=Vis flere/færre linjer
 PublicUrl=Offentlig URL
 AddBox=Legg til boks
-SelectElementAndClick=Velg et element og klikk %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Skriv fil %s
 ShowTransaction=Vis oppføring på bankkonto
 ShowIntervention=Vis intervensjon
@@ -854,8 +856,8 @@ Denied=Avvist
 ListOf=Liste over %s
 ListOfTemplates=Liste over maler
 Gender=Kjønn
-Genderman=Mann
-Genderwoman=Kvinne
+Genderman=Male
+Genderwoman=Female
 Genderother=Annet
 ViewList=Listevisning
 ViewGantt=Gantt-visning
@@ -1018,7 +1020,7 @@ SearchIntoContacts=Kontakter
 SearchIntoMembers=Medlemmer
 SearchIntoUsers=Brukere
 SearchIntoProductsOrServices=Varer eller tjenester
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Lot/serienummer
 SearchIntoProjects=Prosjekter
 SearchIntoMO=Produksjonsordrer
 SearchIntoTasks=Oppgaver
@@ -1061,7 +1063,7 @@ YouAreCurrentlyInSandboxMode=Du er for øyeblikket i %s "sandbox" -modus
 Inventory=Varetelling
 AnalyticCode=Analytisk kode
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=Vis bedriftsinformasjon
 ShowMoreInfos=Vis mer info
 NoFilesUploadedYet=Vennligst last opp et dokument først
 SeePrivateNote=Se privat notat
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Er du sikker på at du vil påvirke merker til valgte %
 CategTypeNotFound=Ingen merketype funnet for denne post-typen
 CopiedToClipboard=Kopiert til utklippstavlen
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index cff5ad25764..d204c4ebd56 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -15,24 +15,24 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Et annet medlem (navn: <b>%s</b>, inn
 ErrorUserPermissionAllowsToLinksToItselfOnly=Av sikkerhetsgrunner må du ha tilgang til å redigere alle brukere for å kunne knytte et medlem til en bruker som ikke er ditt.
 SetLinkToUser=Lenke til en Dolibarr bruker
 SetLinkToThirdParty=Lenke til en Dolibarr tredjepart
-MembersCards=Medlemmers visittkort
+MembersCards=Business cards for members
 MembersList=Liste over medlemmer
 MembersListToValid=Liste over medlems-utkast (må valideres)
 MembersListValid=Liste over gyldige medlemmer
 MembersListUpToDate=Liste over gyldige medlemmer med oppdatert abonnement
 MembersListNotUpToDate=Liste over gyldige medlemmer med utdatert abonnement
-MembersListExcluded=List of excluded members
+MembersListExcluded=Liste over ekskluderte medlemmer
 MembersListResiliated=Liste over terminerte medlemmer
 MembersListQualified=Liste over kvalifiserte medlemmer
 MenuMembersToValidate=Utkast medlemmer
 MenuMembersValidated=Validerte medlemmer
-MenuMembersExcluded=Excluded members
+MenuMembersExcluded=Ekskluderte medlemmer
 MenuMembersResiliated=Terminerte medlemmer
 MembersWithSubscriptionToReceive=Medlemmer som venter på abonnement
 MembersWithSubscriptionToReceiveShort=Abonnement på å motta
 DateSubscription=Abonnement dato
 DateEndSubscription=Abonnement sluttdato
-EndSubscription=Avslutt abonnement
+EndSubscription=Subscription Ends
 SubscriptionId=Abonnement-ID
 WithoutSubscription=Uten abonnement
 MemberId=Medlems-ID
@@ -49,12 +49,12 @@ MemberStatusActiveLate=Abonnement utgått
 MemberStatusActiveLateShort=Utløpt
 MemberStatusPaid=Abonnement oppdatert
 MemberStatusPaidShort=Oppdatert
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
+MemberStatusExcluded=Ekskludert medlem
+MemberStatusExcludedShort=Ekskludert
 MemberStatusResiliated=Terminert medlem
 MemberStatusResiliatedShort=Terminert
 MembersStatusToValid=Utkast medlemmer
-MembersStatusExcluded=Excluded members
+MembersStatusExcluded=Ekskluderte medlemmer
 MembersStatusResiliated=Terminerte medlemmer
 MemberStatusNoSubscription=Validert (ingen abonnement nødvendig)
 MemberStatusNoSubscriptionShort=Validert
@@ -83,12 +83,12 @@ WelcomeEMail=Velkomst e-post
 SubscriptionRequired=Abonnement kreves
 DeleteType=Slett
 VoteAllowed=Stemming tillatt
-Physical=Fysisk
-Moral=Moralsk
-MorAndPhy=Moralsk og fysisk
-Reenable=Reaktiverer
-ExcludeMember=Exclude a member
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
+ExcludeMember=Ekskluder et medlem
+ConfirmExcludeMember=Er du sikker på at du vil ekskludere dette medlemmet?
 ResiliateMember=Terminer et medlem
 ConfirmResiliateMember=Er du sikker på at du vil terminere dette medlemmet?
 DeleteMember=Slette et medlem
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Medlemsstatistikk etter land
 MembersStatisticsByState=Medlemsstatistikk etter delstat/provins
 MembersStatisticsByTown=Medlemsstatistikk etter by
 MembersStatisticsByRegion=Medlem statistikk etter region
-NbOfMembers=Antall medlemmer
-NbOfActiveMembers=Antall nåværende aktive medlemmer
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Ingen validerte medlemmer funnet
-MembersByCountryDesc=Denne skjermen viser deg statistikk over medlemmer etter land. Grafikk avhenger av Googles elektroniske graf-service og er bare tilgjengelig med internett-tilkobling.
-MembersByStateDesc=Denne skjermen viser deg statistikk over medlemmer etter områder/fylker.
-MembersByTownDesc=Denne skjermen viser deg statistikk over medlemmer etter by.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Velg statistikk du ønsker å lese ...
 MenuMembersStats=Statistikk
-LastMemberDate=Siste medlemsdato
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Siste abonnementsdato
-MemberNature=Medlemskapets art
-MembersNature=Medlemmenes art
-Public=Informasjon er offentlig
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Nytt medlem lagt til. Venter på godkjenning
 NewMemberForm=Skjema for nytt medlem 
-SubscriptionsStatistics=Abonnementstatistikk
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Antall abonnement
-AmountOfSubscriptions=Antall abonnement
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Omsetning (for et selskap) eller Budsjett (for en organisasjon)
 DefaultAmount=Standardbeløp for abonnement
 CanEditAmount=Besøkende kan velge/endre beløpet på abonnementet sitt
 MEMBER_NEWFORM_PAYONLINE=Gå til online betalingsside
 ByProperties=Etter egenskap
 MembersStatisticsByProperties=Medlemsstatistikk etter egenskap
-MembersByNature=Dette skjermbildet viser statistikk over medlemmer etter type.
-MembersByRegion=Dette skjermbildet viser statistikk over medlemmer etter region.
 VATToUseForSubscriptions=Mva-sats som skal brukes for abonnementer
 NoVatOnSubscription=Ingen MVA for abonnementer
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Vare brukt for abonnementslinje i faktura: %s
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index 90e1fcf7f63..cdad609a939 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Liste over definerte tillatelser
 SeeExamples=Se eksempler her
 EnabledDesc=Betingelse for å ha dette feltet aktivt (Eksempler: 1 eller $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Er feltet synlig? (Eksempler: 0=Aldri synlig, 1=Synlig på liste og opprett/oppdater/vis skjemaer, 2=Synlig bare på liste, 3=Synlig bare på opprett/oppdater/vis skjema (ikke liste), 4=Synlig bare på liste og oppdaterings-/visningsskjema  (ikke opprett), 5=Synlig på listens sluttformular (ikke opprett, ikke oppdatering). <br><br>Bruk av negativ verdi betyr at feltet ikke vises som standard på listen, men kan velges for visning). <br><br>Det kan være et uttrykk, for eksempel:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Vis dette feltet på kompatible PDF-dokumenter, du kan administrere posisjon med "Posisjon" -feltet.<br/>Kjente kompatible PDF-modeller er: Eratosthenes (Ordre), espadon (Forsendelse), sponge (Fakturaer), cyan (Tilbud), cornas (Leverandørordre)<br/><br/><strong>For dokument:</strong><br/>0 = Vises ikke <br/> 1 = Vises<br/> 2 = Vises bare hvis ikke tom<br/><br/><strong>For dokumentlinjer:</strong><br/>0 = Vises ikke <br/> 1 = Vises i en kolonne <br/> 3 = vises i linje etter beskrivelsen <br/> 4 = vises etter beskrivelse hvis ikke tom
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Vis på PDF
 IsAMeasureDesc=Kan verdien av feltet bli kumulert for å få en total i listen? (Eksempler: 1 eller 0)
 SearchAllDesc=Er feltet brukt til å søke fra hurtigsøkingsverktøyet? (Eksempler: 1 eller 0)
@@ -133,7 +133,7 @@ IncludeDocGeneration=Jeg vil generere noen dokumenter fra objektet
 IncludeDocGenerationHelp=Hvis du krysser av for dette, genereres det kode for å legge til en "Generer dokument" -boksen på posten.
 ShowOnCombobox=Vis verdi i kombinasjonsboks
 KeyForTooltip=Nøkkel for verktøytips
-CSSClass=CSS for edit/create form
+CSSClass=CSS for å redigere/opprette skjema
 CSSViewClass=CSS for read form
 CSSListClass=CSS for list
 NotEditable=Ikke redigerbar
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 5e6c9f56243..b18c25e644b 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -114,7 +114,7 @@ DemoCompanyAll=Firma med mange aktiviteter (alle hovedmoduler)
 CreatedBy=Laget av %s
 ModifiedBy=Endret av %s
 ValidatedBy=Validert av %s
-SignedBy=Signed by %s
+SignedBy=Signert av %s
 ClosedBy=Lukket av %s
 CreatedById=Bruker-ID som opprettet
 ModifiedById=Bruker-ID som gjorde siste endring
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Installer eller aktiver GD-bibliotek i din PHP-installasjon
 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 over summen av produkter/tjenester
-StatsByNumberOfEntities=Statistikk over antall henvisende enheter (antall fakturaer, eller ordre ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Antall tilbud
 NumberOfCustomerOrders=Antall salgsordre
 NumberOfCustomerInvoices=Antall kundefakturaer
@@ -289,4 +289,4 @@ PopuProp=Varer/tjenester etter popularitet i tilbud
 PopuCom=Varer/tjenester etter popularitet i ordre
 ProductStatistics=Varer/Tjenestestatistikk
 NbOfQtyInOrders=Antall i ordre
-SelectTheTypeOfObjectToAnalyze=Velg typen objekt som skal analyseres ...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/nb_NO/partnership.lang b/htdocs/langs/nb_NO/partnership.lang
new file mode 100644
index 00000000000..06ee242e61a
--- /dev/null
+++ b/htdocs/langs/nb_NO/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Startdato
+DatePartnershipEnd=Sluttdato
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Kladd
+PartnershipAccepted = Akseptert
+PartnershipRefused = Avvist
+PartnershipCanceled = Kansellert
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
index 31167037a32..a2741e7f58e 100644
--- a/htdocs/langs/nb_NO/productbatch.lang
+++ b/htdocs/langs/nb_NO/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index ebefd4f4d91..ffcd988e7ce 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -43,7 +43,7 @@ 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 modifiserte varer/tjenester
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Siste %s registrerte varer
 LastRecordedServices=Siste %s registrerte tjenester
 CardProduct0=Vare
@@ -73,12 +73,12 @@ SellingPrice=Salgspris
 SellingPriceHT=Utsalgspris (ekskl. MVA)
 SellingPriceTTC=Salgspris (inkl. MVA)
 SellingMinPriceTTC=Minimum utsalgspris (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.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Denne verdien kan brukes for kalkulering av marginer
 SoldAmount=Mengde solgt
 PurchasedAmount=Mengde kjøpt
 NewPrice=Ny pris
-MinPrice=Min. salgspris
+MinPrice=Min. selling price
 EditSellingPriceLabel=Rediger salgsprisetikett
 CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere enn minste tillatte for denne varen (%s uten avgifter)
 ContractStatusClosed=Lukket
@@ -157,11 +157,11 @@ ListServiceByPopularity=Liste av tjenester etter popularitet
 Finished=Ferdigvare
 RowMaterial=Råvare
 ConfirmCloneProduct=Er du sikker på at du vil klone vare eller tjeneste <b>%s</b>?
-CloneContentProduct=Klon all hovedinformasjon av vare/tjeneste
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Klon priser
-CloneCategoriesProduct=Klon koblede etiketter/kategorier
-CloneCompositionProduct=Klon virtuelt vare/tjeneste
-CloneCombinationsProduct=Klon produktvarianter
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Denne varen brukes
 NewRefForClone=Ref. av nye vare/tjeneste
 SellingPrices=Utsalgspris
@@ -170,12 +170,12 @@ CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Leverandørpriser (av varer eller tjenester)
 CustomCode=Toll | Råvare | HS-kode
-CountryOrigin=Opprinnelsesland
-RegionStateOrigin=Region opprinnelse
-StateOrigin=Stat | Provins opprinnelse
-Nature=Produktets art (materiale/ferdig)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Varens art
-NatureOfProductDesc=Råvare eller ferdig vare
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Kort etikett
 Unit=Enhet
 p= stk
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index c71833daf26..206488d41bc 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Prosjektkontakter
 ProjectsImContactFor=Prosjekter som jeg eksplisitt er en kontakt for
 AllAllowedProjects=Alt prosjekter jeg kan lese (min + offentlig)
 AllProjects=Alle prosjekter
-MyProjectsDesc=Denne visningen er begrenset til prosjekter du er en kontakt for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Denne visningen presenterer alle prosjektene du har lov til å lese.
 TasksOnProjectsPublicDesc=Her vises alle prosjektoppgaver du har lov til å se
 ProjectsPublicTaskDesc=Denne visningen presenterer alle prosjekter og oppgaver du har lov til å lese.
 ProjectsDesc=Denne visningen presenterer alle prosjekter (dine brukertillatelser gir deg tillatelse til å vise alt).
 TasksOnProjectsDesc=Her vises alle prosjektoppgaver (dine brukerrettigheter gir deg adgang til å vise alt).
-MyTasksDesc=Denne visningen er begrenset til prosjekter eller oppgaver du er en kontakt for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Kun åpne prosjekter er synlige (prosjektkladder og lukkede prosjekter er ikke synlige).
 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=Alle oppgaver for kvalifiserte prosjekter er synlige, men du kan bare angi tid for oppgave som er tildelt til valgt bruker. Tilordne oppgave hvis du trenger å skrive inn tid på den.
-OnlyYourTaskAreVisible=Bare oppgaver til deg er synlig. Tildel oppgaven til deg selv om den ikke er synlig, og du må angi tid på den.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Oppgaver fra prosjekter
 ProjectCategories=Prosjekt etiketter/kategorier
 NewProject=Nytt prosjekt
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Ikke tildelt oppgaven
 NoUserAssignedToTheProject=Ingen brukere tilordnet dette prosjektet
 TimeSpentBy=Tid brukt av
 TasksAssignedTo=Oppgaver tildelt
-AssignTaskToMe=Tildel oppgaven til meg
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Tildel oppgave til %s
 SelectTaskToAssign=Velg oppgave å tildele...
 AssignTask=Tildel
diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
index 296889c4a3c..3dac5fa87c2 100644
--- a/htdocs/langs/nb_NO/propal.lang
+++ b/htdocs/langs/nb_NO/propal.lang
@@ -59,7 +59,7 @@ ConfirmClonePropal=Er du sikker på at du vil klone tilbudet <b>%s</b>?
 ConfirmReOpenProp=Er du sikker på at du vil gjenåpne tilbudet <b>%s</b>?
 ProposalsAndProposalsLines=Tilbud og linjer
 ProposalLine=Tilbudslinje
-ProposalLines=Proposal lines
+ProposalLines=Tilbudslinjer
 AvailabilityPeriod=Tilgjengelig forsinkelse
 SetAvailability=Sett tilgjengelig forsinkelse
 AfterOrder=etter bestilling
diff --git a/htdocs/langs/nb_NO/recruitment.lang b/htdocs/langs/nb_NO/recruitment.lang
index a74389d13ff..2f771eba131 100644
--- a/htdocs/langs/nb_NO/recruitment.lang
+++ b/htdocs/langs/nb_NO/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Takk for søknaden. <br> ...
 JobClosedTextCandidateFound=Stillingen er stengt. Stillingen er besatt.
 JobClosedTextCanceled=Stillingen er stengt.
 ExtrafieldsJobPosition=Utfyllende attributter (stillinger)
-ExtrafieldsCandidatures=Utfyllende attributter (jobbsøknader)
+ExtrafieldsApplication=Utfyllende attributter (jobbsøknader)
 MakeOffer=Gi et tilbud
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index ce3cfe76d66..3a41649eaa7 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -5,12 +5,12 @@ SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Regnskapskonto som standard for lønnsutbetal
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Lønn
 Salaries=Lønn
-NewSalary=New salary
+NewSalary=Ny lønn
 NewSalaryPayment=Nytt lønnskort
 AddSalaryPayment=Legg til lønnsutbetaling
 SalaryPayment=Lønnsutbetaling
 SalariesPayments=Lønnsutbetalinger
-SalariesPaymentsOf=Salaries payments of %s
+SalariesPaymentsOf=Lønnsutbetalinger på %s
 ShowSalaryPayment=Vis lønnsutbetaling
 THM=Gjennomsnittlig timepris
 TJM=Gjennomsnittlig dagspris
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index 166b31d739a..50bc021e293 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Er du sikker på at du vil validere denne forsendelsen me
 ConfirmCancelSending=Er du sikker på at du vil kansellere denne forsendelsen?
 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).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planlagt leveringsdato
 RefDeliveryReceipt=Ref. leveringskvittering
 StatusReceipt=Status leveringskvittering
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index 831423ab16a..e9398f1528d 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -19,8 +19,8 @@ Stock=Lagerbeholdning
 Stocks=Lagerbeholdning
 MissingStocks=Manglende varer
 StockAtDate=Varebeholdning på dato
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+StockAtDateInPast=Dato i fortid
+StockAtDateInFuture=Fremtidig dato
 StocksByLotSerial=Lager etter LOT/serienummer
 LotSerial=Lot/serienummer
 LotSerialList=Liste over lot/serienummer
@@ -38,7 +38,7 @@ IncludeEmptyDesiredStock=Inkluder også negativ beholdning med udefinert ønsket
 IncludeAlsoDraftOrders=Inkluder også ordrekladd
 Location=Lokasjon
 LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+NumberOfDifferentProducts=Antall unike produkter
 NumberOfProducts=Totalt antall varer
 LastMovement=Siste bevegelse
 LastMovements=Siste bevegelser
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Ingen forhåndsdefinerte varer for dette objektet.
 DispatchVerb=Send ut
 StockLimitShort=Varslingsgrense
 StockLimit=Varslingsgrense for lagerbeholdning
-StockLimitDesc=(tom) betyr ingen advarsel. <br> 0 kan brukes til advarsel så snart lageret er tomt.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Fysisk lagerbeholdning
 RealStock=Virkelig beholdning
 RealStockDesc=Fysisk/reelt lager er beholdningen du for øyeblikket har i dine interne lagre.
@@ -245,7 +245,7 @@ UpdateByScaning=Fill real qty by scaning
 UpdateByScaningProductBarcode=Oppdater ved skanning (varestrekkode)
 UpdateByScaningLot=Oppdater ved skanning (LOT/seriell strekkode)
 DisableStockChangeOfSubProduct=Deaktiver lagerendringen for alle delvaren til dette settet under denne bevegelsen.
-ImportFromCSV=Import CSV list of movement
+ImportFromCSV=Importer CSV-liste over bevegelser
 ChooseFileToImport=Last opp fil og klikk deretter på %s ikonet for å velge fil som kilde-importfil ...
 SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
diff --git a/htdocs/langs/nb_NO/ticket.lang b/htdocs/langs/nb_NO/ticket.lang
index 0b207326a40..5a72cb11605 100644
--- a/htdocs/langs/nb_NO/ticket.lang
+++ b/htdocs/langs/nb_NO/ticket.lang
@@ -70,7 +70,7 @@ Deleted=Slettede
 # Dict
 Type=Type
 Severity=Alvorlighetsgrad
-TicketGroupIsPublic=Group is public
+TicketGroupIsPublic=Gruppen er offentlig
 TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
 
 # Email templates
@@ -312,5 +312,5 @@ BoxTicketLastXDayswidget = Number of new tickets by days the last X days
 BoxNoTicketLastXDays=No new tickets the last %s days
 BoxNumberOfTicketByDay=Number of new tickets by day
 BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
-TicketCreatedToday=Ticket created today
+TicketCreatedToday=Billett opprettet i dag
 TicketClosedToday=Ticket closed today
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index b1ac5feb529..8ecf4d171cc 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Passordet er endret til : %s
 SubjectNewPassword=Ditt nye passord til %s
 GroupRights=Grupperettigheter
 UserRights=Brukerrettigheter
+Credentials=Credentials
 UserGUISetup=Brukerens visningsoppsett
 DisableUser=Deaktiver
 DisableAUser=Deaktiver en bruker
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Bruk feltet Type til endring
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Bruk OpenID til å logge inn
 WeeklyHours=Timer arbeidet (per uke)
-ExpectedWorkedHours=Forventet arbeidstid pr. uke
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Farge på bruker
 DisabledInMonoUserMode=Deaktivert i vedlikeholds-modus
 UserAccountancyCode=Bruker regnskapskode
@@ -115,7 +116,7 @@ DateOfEmployment=Ansettelsesdato
 DateEmployment=Arbeid
 DateEmploymentstart=Ansettelse startdato
 DateEmploymentEnd=Ansettelse sluttdato
-RangeOfLoginValidity=Datoperiode for innloggingsgyldighet
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Du kan ikke deaktivere din egen brukeroppføring
 ForceUserExpenseValidator=Tvunget utgiftsrapport-validator
 ForceUserHolidayValidator=Tvunget friforespørsel-validator
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index 314d7173fc5..ab69847b14d 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Definer liste over alle tilgjengelig
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/nb_NO/zapier.lang b/htdocs/langs/nb_NO/zapier.lang
index 9a5e822d3c5..7d022844c29 100644
--- a/htdocs/langs/nb_NO/zapier.lang
+++ b/htdocs/langs/nb_NO/zapier.lang
@@ -17,5 +17,5 @@ ModuleZapierForDolibarrName = Zapier for Dolibarr
 ModuleZapierForDolibarrDesc = Zapier for Dolibarr-modul
 ZapierForDolibarrSetup=Oppsett av Zapier for Dolibarr
 ZapierDescription=Grensesnitt med Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ZapierAbout=Om modulen Zapier
+ZapierSetupPage=Det er ikke behov for et oppsett på Dolibarr-siden for å bruke Zapier. Du må imidlertid generere og publisere en pakke på Zapier for å kunne bruke Zapier med Dolibarr. Se dokumentasjon på <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> denne wiki-siden </a>.
diff --git a/htdocs/langs/ne_NP/accountancy.lang b/htdocs/langs/ne_NP/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/ne_NP/accountancy.lang
+++ b/htdocs/langs/ne_NP/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/ne_NP/admin.lang
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/ne_NP/banks.lang b/htdocs/langs/ne_NP/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/ne_NP/banks.lang
+++ b/htdocs/langs/ne_NP/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/ne_NP/bills.lang b/htdocs/langs/ne_NP/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/ne_NP/bills.lang
+++ b/htdocs/langs/ne_NP/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/ne_NP/boxes.lang b/htdocs/langs/ne_NP/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/ne_NP/boxes.lang
+++ b/htdocs/langs/ne_NP/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/ne_NP/cashdesk.lang b/htdocs/langs/ne_NP/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/ne_NP/cashdesk.lang
+++ b/htdocs/langs/ne_NP/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/ne_NP/categories.lang b/htdocs/langs/ne_NP/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/ne_NP/categories.lang
+++ b/htdocs/langs/ne_NP/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/ne_NP/companies.lang b/htdocs/langs/ne_NP/companies.lang
index 154400c6536..fbe75f09ab0 100644
--- a/htdocs/langs/ne_NP/companies.lang
+++ b/htdocs/langs/ne_NP/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/ne_NP/compta.lang b/htdocs/langs/ne_NP/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/ne_NP/compta.lang
+++ b/htdocs/langs/ne_NP/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/ne_NP/ecm.lang b/htdocs/langs/ne_NP/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/ne_NP/ecm.lang
+++ b/htdocs/langs/ne_NP/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ne_NP/errors.lang b/htdocs/langs/ne_NP/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/ne_NP/errors.lang
+++ b/htdocs/langs/ne_NP/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/ne_NP/eventorganization.lang b/htdocs/langs/ne_NP/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/ne_NP/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/ne_NP/knowledgemanagement.lang b/htdocs/langs/ne_NP/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/ne_NP/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/ne_NP/mails.lang b/htdocs/langs/ne_NP/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/ne_NP/mails.lang
+++ b/htdocs/langs/ne_NP/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/ne_NP/main.lang b/htdocs/langs/ne_NP/main.lang
index dc2a83f2015..13793aad13f 100644
--- a/htdocs/langs/ne_NP/main.lang
+++ b/htdocs/langs/ne_NP/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/ne_NP/members.lang b/htdocs/langs/ne_NP/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/ne_NP/members.lang
+++ b/htdocs/langs/ne_NP/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ne_NP/modulebuilder.lang b/htdocs/langs/ne_NP/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/ne_NP/modulebuilder.lang
+++ b/htdocs/langs/ne_NP/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/ne_NP/other.lang b/htdocs/langs/ne_NP/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/ne_NP/other.lang
+++ b/htdocs/langs/ne_NP/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/ne_NP/partnership.lang b/htdocs/langs/ne_NP/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/ne_NP/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/ne_NP/productbatch.lang b/htdocs/langs/ne_NP/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/ne_NP/productbatch.lang
+++ b/htdocs/langs/ne_NP/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/ne_NP/products.lang b/htdocs/langs/ne_NP/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/ne_NP/products.lang
+++ b/htdocs/langs/ne_NP/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/ne_NP/projects.lang b/htdocs/langs/ne_NP/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/ne_NP/projects.lang
+++ b/htdocs/langs/ne_NP/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/ne_NP/recruitment.lang b/htdocs/langs/ne_NP/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/ne_NP/recruitment.lang
+++ b/htdocs/langs/ne_NP/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/ne_NP/sendings.lang b/htdocs/langs/ne_NP/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/ne_NP/sendings.lang
+++ b/htdocs/langs/ne_NP/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/ne_NP/stocks.lang b/htdocs/langs/ne_NP/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/ne_NP/stocks.lang
+++ b/htdocs/langs/ne_NP/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/ne_NP/users.lang b/htdocs/langs/ne_NP/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/ne_NP/users.lang
+++ b/htdocs/langs/ne_NP/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/ne_NP/website.lang b/htdocs/langs/ne_NP/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/ne_NP/website.lang
+++ b/htdocs/langs/ne_NP/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index 080da3b8334..f3c0725063f 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -20,6 +20,7 @@ UpdateMvts=Wijzigen van een transactie
 Processing=Verwerken
 EndProcessing=Verwerking beëindigd
 Lineofinvoice=Factuur lijn
+ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
 Docdate=Datum
 Docref=Artikelcode
 TotalVente=Totaal omzet voor belastingen
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index c28e7e34745..d13852849fd 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -225,7 +225,6 @@ DatabasePassword=Databasewachwoord
 Skin=Uiterlijksthema
 DefaultSkin=Standaard uiterlijksthema
 CompanyCurrency=Belangrijkste valuta
-ShowBugTrackLink=Show link "<strong>%s</strong>"
 InfoWebServer=Over webserver
 InfoDatabase=Over de database
 AccountantFileNumber=Code voor boekhouder
diff --git a/htdocs/langs/nl_BE/banks.lang b/htdocs/langs/nl_BE/banks.lang
index 6a27c2a6715..9cf8126ebb2 100644
--- a/htdocs/langs/nl_BE/banks.lang
+++ b/htdocs/langs/nl_BE/banks.lang
@@ -2,7 +2,6 @@
 ShowAllTimeBalance=Toon saldo sinds begin
 LabelBankCashAccount=label van bank of kas
 TransferTo=Aan
-CheckTransmitter=Overboeker
 BankChecksToReceipt=Te innen cheques
 BankChecksToReceiptShort=Te innen cheques
 InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbaar numerieke waarde: YYYYMM of YYYYMMDD
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index ecf29a418a7..487d36219fd 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -35,7 +35,6 @@ PaymentCondition60DENDMONTH=Binnen 60 dagen volgend op einde maand
 PaymentTypeVIR=Bank overboeking
 PaymentTypeShortVIR=Bank overboeking
 PaymentTypeTRA=Bank cheque
-ChequeMaker=Cheque / Transfer uitvoerder
 DepositId=Id storting
 ShowUnpaidAll=Bekijk alle onbetaalde facturen
 TypeContact_facture_external_BILLING=Klant contact
diff --git a/htdocs/langs/nl_BE/boxes.lang b/htdocs/langs/nl_BE/boxes.lang
index ec54c5aa572..3d89b5ee45c 100644
--- a/htdocs/langs/nl_BE/boxes.lang
+++ b/htdocs/langs/nl_BE/boxes.lang
@@ -13,9 +13,6 @@ BoxTitleLastSuppliers=Laatste %s geregistreerde leveranciers
 BoxTitleLastFicheInter=Laatste %s gemodificeerde interventies
 BoxLastExpiredServices=Laatste %s oudste contacten met actieve verlopen services
 BoxTitleLastActionsToDo=Laatste %s acties om te doen
-BoxTitleLastContracts=Laatste %s gewijzigde contracten
-BoxTitleLastModifiedDonations=Laatste %s gewijzigde donaties
-BoxTitleLastModifiedExpenses=Laatste gewijzigde %s onkostenmeldingen
 LastRefreshDate=Laatste vernieuwingsdatum
 NoActionsToDo=Geen acties te doen
 NoRecordedInvoices=Geen geregistreerde klantfacturen
diff --git a/htdocs/langs/nl_BE/categories.lang b/htdocs/langs/nl_BE/categories.lang
index 9f02159c12d..012ee9c5375 100644
--- a/htdocs/langs/nl_BE/categories.lang
+++ b/htdocs/langs/nl_BE/categories.lang
@@ -3,14 +3,8 @@ Rubrique=Tag/Categorie
 Rubriques=Tags/Categorieën
 RubriquesTransactions=Tags/Categorieën van transacties
 categories=tags/categorieën
-NoCategoryYet=Geen tag/categorie van dit type gemaakt
 AddIn=Toevoegen in
 CategoriesArea=Tags/Categorieën omgeving
-ProductsCategoriesArea=Producten/Diensten  tags/categorieën omgeving
-CustomersCategoriesArea=Klanten tags/categorieën omgeving
-MembersCategoriesArea=Leden tags/categorieën omgeving
-ContactsCategoriesArea=Contacten tags/categorieën omgeving
-ProjectsCategoriesArea=Projecten tags/categorieën omgeving
 CatList=Lijst van tags/categorieën
 NewCategory=Nieuwe tag/categorie
 ModifCat=Tag/categorie wijzigen
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index 3c215ffb8f4..24271d03d81 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - companies
-ConfirmDeleteCompany=Weet u zeker dat u dit bedrijf en alle geërfde gegevens wilt verwijderen?
-ConfirmDeleteContact=Weet u zeker dat u deze contactpersoon en alle geërfde gegevens wilt verwijderen ?
 MenuNewThirdParty=Nieuwe derde partij
 MenuNewProspect=Nieuwe Prospect
 MenuNewSupplier=Nieuwe verkoper
@@ -19,7 +17,6 @@ NatureOfThirdParty=Aard van derden
 StateShort=Staat
 PhoneShort=Telefoonnummer
 No_Email=Weiger bulk e-mailings
-DefaultLang=Standaardtaal
 VATIsUsedWhenSelling=Dit bepaalt of deze derde een BTW omvat of niet wanneer hij een factuur aan zijn eigen klanten maakt
 CopyAddressFromSoc=Adres kopiëren van gegevens van derden
 ThirdpartyNotCustomerNotSupplierSoNoRef=Derden noch klant, noch verkoper, geen beschikbare verwijzende objecten
@@ -88,7 +85,6 @@ ListProspectsShort=Lijst met Prospecten
 ListCustomersShort=Lijst met klanten
 ThirdPartiesArea=Derden / contacten
 ThirdPartyIsClosed=Derde partij is gesloten
-ProductsIntoElements=Lijst van producten/diensten in %s
 OutstandingBillReached=Maximum bereikt voor openstaande rekening
 OrderMinAmount=Minimumbedrag voor bestelling
 MergeOriginThirdparty=Kopieer derde partij (derde partij die je wil verwijderen)
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 0e84429bb41..f6dafa47772 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -61,7 +61,6 @@ UserCreationShort=Creat. gebruiker
 UserModificationShort=Modif. gebruiker
 UserValidationShort=Geldig. gebruiker
 CurrencyRate=Wisselkoers van valuta
-UserModif=Gebruiker van laatste update
 Amount=Hoeveelheid
 MulticurrencyRemainderToPay=Blijf betalen, oorspronkelijke valuta
 MulticurrencyAmountHT=Bedrag (excl. Btw), oorspronkelijke valuta
@@ -75,6 +74,8 @@ Categories=Tags / categorieën
 Category=Tag / categorie
 to=aan
 To=aan
+ToDate=aan
+ToLocation=aan
 ApprovedBy2=Goedgekeurd door (tweede goedkeuring)
 NotRead=Ongelezen
 Offered=Beschikbaar
diff --git a/htdocs/langs/nl_BE/modulebuilder.lang b/htdocs/langs/nl_BE/modulebuilder.lang
deleted file mode 100644
index fe17c59910b..00000000000
--- a/htdocs/langs/nl_BE/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
diff --git a/htdocs/langs/nl_BE/partnership.lang b/htdocs/langs/nl_BE/partnership.lang
new file mode 100644
index 00000000000..acb65205c28
--- /dev/null
+++ b/htdocs/langs/nl_BE/partnership.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - partnership
+DatePartnershipStart=Start datum
+DatePartnershipEnd=Eind datum
diff --git a/htdocs/langs/nl_BE/projects.lang b/htdocs/langs/nl_BE/projects.lang
index bad8b15e9d1..4a0241c7762 100644
--- a/htdocs/langs/nl_BE/projects.lang
+++ b/htdocs/langs/nl_BE/projects.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
 ProjectsArea=Project Omgeving
 AllAllowedProjects=Alle projecten die ik kan lezen (mijn + openbaar)
-MyProjectsDesc=Deze weergave is beperkt tot projecten waarvoor u een contactpersoon bent
 TasksOnProjectsPublicDesc=Deze weergave geeft alle taken weer van projecten die u mag lezen.
 TasksOnProjectsDesc=In deze weergave worden alle taken voor alle projecten weergegeven (uw gebruikersrechten geven u toestemming om alles te bekijken).
 ImportDatasetTasks=Taken van projecten
diff --git a/htdocs/langs/nl_BE/zapier.lang b/htdocs/langs/nl_BE/zapier.lang
new file mode 100644
index 00000000000..390622375f3
--- /dev/null
+++ b/htdocs/langs/nl_BE/zapier.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - zapier
+ModuleZapierForDolibarrDesc =Zapier voor Dolibarr-module
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index bcbe3e6525d..ca264b10109 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Werking label
 Sens=Richting
-AccountingDirectionHelp=Voor een tegenrekening van een klant, gebruik Credit om een betaling vast te leggen die u hebt ontvangen <br> Gebruik een tegenrekening van een leverancier Debet om een betaling vast te leggen die u hebt gedaan
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Aflettercode
 Lettering=Afletteren
 Codejournal=Journaal
@@ -297,7 +297,7 @@ NoNewRecordSaved=Geen posten door te boeken
 ListOfProductsWithoutAccountingAccount=Overzicht van producten welke nog niet zijn gekoppeld aan een grootboekrekening
 ChangeBinding=Wijzig koppeling
 Accounted=Geboekt in grootboek
-NotYetAccounted=Nog niet doorgeboekt in boekhouding
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Handleiding weergeven
 NotReconciled=Niet afgestemd
 WarningRecordWithoutSubledgerAreExcluded=Pas op, alle bewerkingen zonder gedefinieerde subgrootboekrekening worden gefilterd en uitgesloten van deze weergave
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 226316eaa51..bce871a5a72 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Verwijder / hernoem het bestand <b>%s</b> als het bestaat, om het geb
 RestoreLock=Herstel het bestand <b>%s</b> , met alleen leesrechten, om verder gebruik van de update / installatie-tool uit te schakelen.
 SecuritySetup=Beveiligingsinstellingen
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Definieer hier de opties met betrekking tot beveiliging bij het uploaden van bestanden.
 ErrorModuleRequirePHPVersion=Fout, deze module vereist PHP versie %s of hoger.
 ErrorModuleRequireDolibarrVersion=Fout, deze module vereist Dolibarr versie %s of hoger.
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Geen betalingswijze voorstellen
 NoActiveBankAccountDefined=Geen actieve bankrekening ingesteld
 OwnerOfBankAccount=Eigenaar van bankrekening %s
 BankModuleNotActive=Bankrekeningen module niet ingeschakeld
-ShowBugTrackLink=Toon de link "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Kennisgevingen
 DelaysOfToleranceBeforeWarning=Vertraging voordat een waarschuwing wordt weergegeven voor:
 DelaysOfToleranceDesc=Stel de vertraging in voordat een waarschuwingspictogram %s op het scherm wordt weergegeven voor het late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=U dient dit commando vanaf de o
 YourPHPDoesNotHaveSSLSupport=SSL functies niet beschikbaar in uw PHP installatie
 DownloadMoreSkins=Meer uiterlijkthema's om te downloaden
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Toon professionele id met adressen
 ShowVATIntaInAddress=Verberg intracommunautair btw-nummer met adressen
 TranslationUncomplete=Onvolledige vertaling
@@ -2062,7 +2064,7 @@ UseDebugBar=Gebruik de foutopsporingsbalk
 DEBUGBAR_LOGS_LINES_NUMBER=Aantal laatste logboekregels dat in de console moet worden bewaard
 WarningValueHigherSlowsDramaticalyOutput=Waarschuwing, hogere waarden vertragen de uitvoer dramatisch
 ModuleActivated=Module %s is geactiveerd en vertraagt de interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=Als u zich in een productieomgeving bevindt, moet u deze eigenschap instellen op %s.
 AntivirusEnabledOnUpload=Antivirus ingeschakeld op geüploade bestanden
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index b96756964f8..a3d751c5dab 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Sociale/fiscale belastingbetaling
 BankTransfer=Overschrijving
 BankTransfers=Overschrijvingen
 MenuBankInternalTransfer=Interne overboeking
-TransferDesc=Overdracht van de ene rekening naar de andere. Dolibarr zal twee records schrijven (een debet in de bronaccount en een tegoed in het doelaccount). Hetzelfde bedrag (behalve aanduiding), label en datum worden gebruikt voor deze transactie)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Van
 TransferTo=T/m
 TransferFromToDone=Een overboeking van <b>%s</b> naar <b>%s</b> van <b>%s</b> is geregistreerd.
 CheckTransmitter=Verzender
 ValidateCheckReceipt=Betaling met cheque goedkeuren?
-ConfirmValidateCheckReceipt=Weet u zeker dat u deze cheque wilt valideren? Hierna is het niet meer mogelijk dit te wijzigen.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Deze cheque ontvangst verwijderen?
 ConfirmDeleteCheckReceipt=Weet u zeker dat u deze betaling via cheque wilt verwijderen?
 BankChecks=Bankcheque
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Weet u zeker dat u deze boeking wilt verwijderen?
 ThisWillAlsoDeleteBankRecord=Hiermee wordt ook de boeking in de bank verwijderd
 BankMovements=Mutaties
 PlannedTransactions=Nog te verwerken
-Graph=Grafiek
+Graph=Graphs
 ExportDataset_banque_1=Bankboekingen en rekeningafschriften
 ExportDataset_banque_2=Stortingsbewijs
 TransactionOnTheOtherAccount=Overboeking op de andere rekening
@@ -142,7 +142,7 @@ AllAccounts=Alle kas- en bankrekeningen
 BackToAccount=Terug naar rekening
 ShowAllAccounts=Toon alle rekeningen
 FutureTransaction=Toekomstige transactie. Nog niet mogelijk af te stemmen
-SelectChequeTransactionAndGenerate=Selecteer/ filter cheques om op te nemen in de chequebetaling en klik op "Aanmaken"
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbare numerieke waarde: YYYYMM of YYYYMMDD
 EventualyAddCategory=Geef tenslotte een categorie op waarin de gegevens bewaard kunnen worden
 ToConciliate=Afstemmen?
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 67c2d0e00a5..9c40fd8f317 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Omzetten teveel betaald in beschikbare korting
 EnterPaymentReceivedFromCustomer=Voer een ontvangen betaling van afnemer in
 EnterPaymentDueToCustomer=Voer een betaling te doen aan afnemer in
 DisabledBecauseRemainderToPayIsZero=Uitgeschakeld omdat restant te betalen gelijk is aan nul
-PriceBase=Basisprijs
+PriceBase=Base price
 BillStatus=Factuurstatus
 StatusOfGeneratedInvoices=Status van gegenereerde facturen
 BillStatusDraft=Concept (moet worden gevalideerd)
@@ -454,7 +454,7 @@ RegulatedOn=Geregeld op
 ChequeNumber=Chequenummer
 ChequeOrTransferNumber=Cheque / Transfernummer
 ChequeBordereau=Controleer rooster
-ChequeMaker=Cheque / Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank van cheque
 CheckBank=Controleer
 NetToBePaid=Netto te betalen
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index c6f5429c714..c7e50655b47 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bladwijzers: laatste %s
 BoxOldestExpiredServices=Oudste actief verlopen diensten
 BoxLastExpiredServices=Laatste %s oudste contactpersonen met actieve verlopen diensten
 BoxTitleLastActionsToDo=Laatste %s acties om uit te voeren
-BoxTitleLastContracts=Laatste %s gewijzigde contractpersonen
-BoxTitleLastModifiedDonations=Laatste %s aangepaste donaties
-BoxTitleLastModifiedExpenses=Laatste gewijzigde %s onkostendeclaraties
-BoxTitleLatestModifiedBoms=Laatste %s gemodificeerde stuklijsten
-BoxTitleLatestModifiedMos=Laatste %s gewijzigde productieorders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Klanten met meer dan maximaal toegestaan krediet
 BoxGlobalActivity=Globale activiteit (facturen, offertes, bestellingen)
 BoxGoodCustomers=Goede klanten
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index 24bff1481e4..614fc1431dc 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Vloer
 AddTable=Tafel toevoegen
 Place=Plaats
 TakeposConnectorNecesary='TakePOS Connector' vereist
-OrderPrinters=Bestel printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Zoek product
 Receipt=Bon
 Header=Hoofd
@@ -56,8 +57,9 @@ Paymentnumpad=Soort betaling om de betaling in te voeren
 Numberspad=Cijferblok
 BillsCoinsPad=Munten en bankbiljetten blok
 DolistorePosCategory=TakePOS-modules en andere POS-oplossingen voor Dolibarr
-TakeposNeedsCategories=TakePOS heeft product-categorieën nodig om te werken
-OrderNotes=Verkoop notities
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Standaardrekening voor betalingen
 NoPaimementModesDefined=Geen betaalmethode gedefinieerd in TakePOS-configuratie
 TicketVatGrouped=Groep BTW op tarief in tickets | kwitanties
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Factuur is al gevalideerd
 NoLinesToBill=Geen regels om te factureren
 CustomReceipt=Aangepaste kwitantie
 ReceiptName=Naam ontvangstbewijs
-ProductSupplements=Product toevoegingen
+ProductSupplements=Manage supplements of products
 SupplementCategory=Toevoeging categorie
 ColorTheme=Kleur thema
 Colorful=Kleurrijk
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Eenvoudig en gemakkelijk afdrukken van bonnen. Slechts een paar parameters om de bon te configureren. Afdrukken via browser.
 TakeposConnectorMethodDescription=Externe module met extra functies. Mogelijkheid om vanuit de cloud af te drukken.
 PrintMethod=Afdrukmethode
-ReceiptPrinterMethodDescription=Krachtige methode met veel parameters. Volledig aanpasbaar met sjablonen. Kan niet afdrukken vanuit de cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=Per terminal
 TakeposNumpadUsePaymentIcon=Gebruik pictogram in plaats van tekst op betalingsknoppen van numpad
 CashDeskRefNumberingModules=Nummeringsmodule voor POS-verkoop
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Bonprinter moet eerst zijn ingeschakeld
 AllowDelayedPayment=Laat uitgestelde betaling toe
 PrintPaymentMethodOnReceipts=Betaalmethode afdrukken op tickets | bonnen
 WeighingScale=Weegschaal
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 41621088c83..31bb7f2c0ed 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Label/Categorie
 Rubriques=Kenmerken / Categorieën
 RubriquesTransactions=Labels/categorieën transacties
 categories=kenmerken / categorieën
-NoCategoryYet=Geen label/categorie van dit type gemaakt
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Invoegen in categorie
 modify=wijzigen
 Classify=Classificeren
 CategoriesArea=Kenmerk / Categorieën omgeving
-ProductsCategoriesArea=Producten/Diensten kenmerk/categorieën omgeving
-SuppliersCategoriesArea=Gebied met tags / categorieën voor leveranciers
-CustomersCategoriesArea=Klanten kenmerken/categorieën omgeving
-MembersCategoriesArea=Leden kenmerken/categorieën omgeving
-ContactsCategoriesArea=Contacten labels/categorieën omgeving
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Labels/categorieën projecten
-UsersCategoriesArea=Gebruikers tags / categorieën gebied
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categorieën
 CatList=Lijst van kenmerken/categorieën
 CatListAll=Lijst met groepen /categorieën (alle typen)
@@ -96,4 +96,4 @@ ChooseCategory=Kies categorie
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea= Categorieën voor Page-Container
-UseOrOperatorForCategories=Gebruik of operator voor categorieën
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 87945631845..896e5bf9e83 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=De bedrijfsnaam %s bestaat al. kies een andere.
 ErrorSetACountryFirst=Stel eerst het land in
 SelectThirdParty=Selecteer een derde
-ConfirmDeleteCompany=Weet u zeker dat u dit bedrijf en alle overgenomen informatie wilt verwijderen?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Contactpersoon verwijderen
-ConfirmDeleteContact=Weet u zeker dat u deze contactpersoon en alle overgenomen informatie wilt verwijderen?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Nieuwe relatie
 MenuNewCustomer=Nieuwe klant
 MenuNewProspect=Nieuwe prospect
@@ -69,7 +69,7 @@ PhoneShort=Telefoon
 Skype=Skype
 Call=Bel
 Chat=Chat
-PhonePro=Telefoonnummer zakelijk
+PhonePro=Bus. phone
 PhonePerso=Telefoonnummer privé
 PhoneMobile=Telefoonnummer mobiel
 No_Email=Weigeren bulk e-mailings
@@ -78,7 +78,7 @@ Zip=Postcode
 Town=Plaats
 Web=Internetadres
 Poste= Functie
-DefaultLang=Standaard taal
+DefaultLang=Default language
 VATIsUsed=Gebruikte BTW
 VATIsUsedWhenSelling=Dit bepaalt of deze derde een verkoopbelasting omvat of niet wanneer hij een factuur aan zijn eigen klanten maakt
 VATIsNotUsed=BTW wordt niet gebruikt
@@ -331,7 +331,7 @@ CustomerCodeDesc=Klant code, uniek voor alle klanten
 SupplierCodeDesc=Leverancierscode, uniek voor alle leveranciers
 RequiredIfCustomer=Vereist als relatie een afnemer of prospect is
 RequiredIfSupplier=Vereist als relatie een leverancier is
-ValidityControledByModule=Geldigheid gecontroleerd door module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Regels voor deze module
 ProspectToContact=Prospect om contact mee op te nemen
 CompanyDeleted=Bedrijf '%s' verwijderd uit de database.
@@ -439,12 +439,12 @@ ListSuppliersShort=Leverancierslijst
 ListProspectsShort=Prospectslijst
 ListCustomersShort=Klantenlijst
 ThirdPartiesArea=Relaties/Contacten
-LastModifiedThirdParties=Laatste %s gewijzigde relaties
-UniqueThirdParties=Totaal van derde partijen
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Gesloten
 ThirdPartyIsClosed=Relatie is gesloten
-ProductsIntoElements=Lijst producten/diensten in %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Huidige openstaande rekening
 OutstandingBill=Max. voor openstaande rekening
 OutstandingBillReached=Max. krediet voor openstaande facturen is bereikt
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Afnemers- / leverancierscode is vrij. Deze code kan te al
 ManagingDirectors=Manager(s) Naam (CEO, directeur, voorzitter ...)
 MergeOriginThirdparty=Dupliceren third party (third party die u wilt verwijderen)
 MergeThirdparties=Samenvoegen third parties
-ConfirmMergeThirdparties=Weet u zeker dat u deze derde partij wilt samenvoegen met de huidige? Alle gekoppelde objecten (facturen, bestellingen, ...) worden verplaatst naar de huidige derde partij en vervolgens wordt de derde partij verwijderd.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Relaties zijn samengevoegd
 SaleRepresentativeLogin=Login vertegenwoordiger
 SaleRepresentativeFirstname=Vertegenwoordiger voornaam
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 36e512303e3..f93194796fe 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Nieuwe korting
 NewCheckDeposit=Nieuwe chequestorting
 NewCheckDepositOn=Creeer een kwitantie voor de storting op rekening: %s
 NoWaitingChecks=Geen cheques om af te storten.
-DateChequeReceived=Ontvangstdatum cheque
+DateChequeReceived=Check receiving date
 NbOfCheques=Aantal cheques
 PaySocialContribution=Betaal een sociale/fiscale vordering
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index 4fbc753042e..70f70db9a55 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm-bestanden
 ExtraFieldsEcmDirectories=Extrafields Ecm-mappen
 ECMSetup=ECM-instellingen
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 754f7955bb9..027c4fed658 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Geen fout, wij bevestigen
 # Errors
 ErrorButCommitIsDone=Fouten gevonden maar we valideren toch
-ErrorBadEMail=E-mail %s is verkeerd
-ErrorBadMXDomain=E-mail %s lijkt verkeerd (domein heeft geen geldige MX-record)
-ErrorBadUrl=Ongeldige Url %s
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Slechte parameterwaarde. Wordt over het algemeen gegenereerd als de vertaling ontbreekt.
 ErrorRefAlreadyExists=Referentie <b>%s</b> bestaat al.
 ErrorLoginAlreadyExists=Inlog %s bestaat reeds.
@@ -46,8 +46,8 @@ ErrorWrongDate=Datum is niet correct!
 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=Gebruiker kan niet worden verwijderd. Misschien is het geassocieerd met Dolibarr-entiteiten.
-ErrorFieldsRequired=Enkele verplichte velden zijn niet ingevuld.
-ErrorSubjectIsRequired=Het e-mail onderwerp is verplicht
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject 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
 ErrorSetupOfEmailsNotComplete=Het instellen van e-mails is niet voltooid
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=De pagina / container <strong>%s</str
 ErrorDuringChartLoad=Fout bij het laden van een rekeningschema. Als enkele accounts niet werden geladen, kunt u ze nog steeds handmatig invoeren.
 ErrorBadSyntaxForParamKeyForContent=Onjuiste syntaxis voor param keyforcontent. Moet een waarde hebben die begint met %s of %s
 ErrorVariableKeyForContentMustBeSet=Fout, de constante met de naam %s (met tekstinhoud om te tonen) of %s (met externe URL om te tonen) moet worden ingesteld.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s moet beginnen met http: // of https: //
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Fout, de nieuwe referentie is al gebruikt
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Alleen beschikbaar als u een beveiligde HTTP
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/nl_NL/eventorganization.lang b/htdocs/langs/nl_NL/eventorganization.lang
new file mode 100644
index 00000000000..7dce772b270
--- /dev/null
+++ b/htdocs/langs/nl_NL/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Instellingen
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Ontwerp
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Uitgevoerd
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/nl_NL/knowledgemanagement.lang b/htdocs/langs/nl_NL/knowledgemanagement.lang
new file mode 100644
index 00000000000..21c29de7faf
--- /dev/null
+++ b/htdocs/langs/nl_NL/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Instellingen
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Over
+KnowledgeManagementAbout = Over Kennis Management
+KnowledgeManagementAboutPage = Over Kennis Management pagina
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Kennis Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Artikel
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 84dbbc2a4a2..0e423abdd91 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Aan gebruiker(s)
 MailCC=Kopieën aan (cc)
 MailToCCUsers=Kopiëren naar gebruiker(s)
 MailCCC=Blinde kopie aan (bcc)
-MailTopic=E-mail onderwerp
+MailTopic=Email subject
 MailText=Bericht
 MailFile=Bijgevoegde bestanden
 MailMessage=E-mail inhoud
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=Er staan geen e-mail kennisgevingen gepland voor dit t
 ANotificationsWillBeSent=1 automatische notificatie zal worden verstuurd per e-mail
 SomeNotificationsWillBeSent=%s automatische notificatie zal per e-mail worden verstuurd
 AddNewNotification=Abonneer u op een nieuwe automatische e-mailmelding (doel/gebeurtenis)
-ListOfActiveNotifications=Lijst van alle actieve abonnementen (doelen/evenementen) voor automatische e-mailmelding
-ListOfNotificationsDone=Lijst met alle automatisch verstuurde e-mail kennisgevingen
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuratie van e-mailverzending is ingesteld op '%s'. Deze modus kan niet worden gebruikt om bulk e-mails te verzenden.
 MailSendSetupIs2=Ga eerst met een beheerdersaccount naar menu %s Home - Set-up - E-mails%s om de parameter <strong>'%s'</strong> te wijzigen om de modus '%s' te gebruiken. Met deze modus kunt u de installatie van de SMTP-server van uw internetprovider openen en de functie Bulk e-mails gebruiken.
 MailSendSetupIs3=Indien u vragen heeft inzake de SMTP server, went u zich dan tot %s.
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index a74a1521259..0a42f7f79c5 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Opslaan en nieuw
 TestConnection=Test verbinding
 ToClone=Klonen
 ConfirmCloneAsk=Weet u zeker dat u het object <b> %s </b> wilt klonen?
-ConfirmClone=Kies gegevens die u wilt klonen:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Geen gegevens om te klonen gedefinieerd.
 Of=van
 Go=Ga
@@ -246,7 +246,7 @@ DefaultModel=Standaard document sjabloon
 Action=Actie
 About=Over
 Number=Aantal
-NumberByMonth=Aantal per maand
+NumberByMonth=Total reports by month
 AmountByMonth=Bedrag per maand
 Numero=Nummer
 Limit=Limiet
@@ -341,8 +341,8 @@ KiloBytes=KiloBytes
 MegaBytes=MegaBytes
 GigaBytes=GigaBytes
 TeraBytes=Terabytes
-UserAuthor=Gebruiker van creatie
-UserModif=Gebruiker van de laatste update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Door
 From=Van
 FromDate=Van
 FromLocation=Van
-at=Bij
 to=t/m
 To=t/m
+ToDate=t/m
+ToLocation=t/m
+at=Bij
 and=en
 or=of
 Other=Overig
@@ -843,7 +845,7 @@ XMoreLines=%s regel(s) verborgen
 ShowMoreLines=Laat meer/minder regels zien
 PublicUrl=Openbare URL
 AddBox=Box toevoegen
-SelectElementAndClick=Selecteer een element en klik op %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Bestand afdrukken %s
 ShowTransaction=Toon bankmutatie
 ShowIntervention=Tonen tussenkomst
@@ -854,8 +856,8 @@ Denied=Gewijgerd
 ListOf=Lijst van %s
 ListOfTemplates=Lijst van templates
 Gender=Geslacht
-Genderman=Man
-Genderwoman=Vrouw
+Genderman=Male
+Genderwoman=Female
 Genderother=Overig
 ViewList=Bekijk lijst
 ViewGantt=Gantt-weergave
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Weet u zeker dat u tags wilt beïnvloeden voor de %s ge
 CategTypeNotFound=Geen tag-soort gevonden voor type records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 4a98f54c8d8..5260e6da794 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Een ander lid <b>(naam: %s, login: %s
 ErrorUserPermissionAllowsToLinksToItselfOnly=Om veiligheidsredenen, moeten aan u rechten worden verleend voor het bewerken van alle gebruikers om in staat te zijn een lid te koppelen aan een gebruiker die niet van u is.
 SetLinkToUser=Link naar een Dolibarr gebruiker
 SetLinkToThirdParty=Link naar een derde partij in Dolibarr
-MembersCards=Visitekaarten van leden
+MembersCards=Business cards for members
 MembersList=Ledenlijst
 MembersListToValid=Lijst van conceptleden (te valideren)
 MembersListValid=Lijst van geldige leden
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Leden die abonnement moeten ontvangen
 MembersWithSubscriptionToReceiveShort=Abonnement ontvangen
 DateSubscription=Inschrijvingsdatum
 DateEndSubscription=Einddatum abonnement
-EndSubscription=Einde abonnement
+EndSubscription=Subscription Ends
 SubscriptionId=Inschrijvings-ID
 WithoutSubscription=Zonder abonnement
 MemberId=Lid ID
@@ -83,10 +83,10 @@ WelcomeEMail=Welkomst e-mail
 SubscriptionRequired=Abonnement vereist
 DeleteType=Verwijderen
 VoteAllowed=Stemming toegestaan
-Physical=Fysiek
-Moral=Moreel
-MorAndPhy=Moreel en fysiek
-Reenable=Opnieuw inschakelen
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Verwijder een lid
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Leden statistieken per land
 MembersStatisticsByState=Leden statistieken per staat / provincie
 MembersStatisticsByTown=Leden van de statistieken per gemeente
 MembersStatisticsByRegion=Leden statistieken per regio
-NbOfMembers=Aantal leden
-NbOfActiveMembers=Aantal huidige actieve leden
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Geen gevalideerde leden gevonden
-MembersByCountryDesc=Dit scherm tonen statistieken over de leden door de landen. Grafisch is echter afhankelijk van Google online grafiek service en is alleen beschikbaar als een internet verbinding is werkt.
-MembersByStateDesc=Dit scherm tonen statistieken over de leden door de staat / provincies / kanton.
-MembersByTownDesc=Dit scherm tonen statistieken over de leden per gemeente.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Kies de statistieken die u wilt lezen ...
 MenuMembersStats=Statistiek
-LastMemberDate=Laatste liddatum
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Laatste abonnementsdatum
-MemberNature=Aard van het lid
-MembersNature=Aard van de leden
-Public=Informatie zijn openbaar (no = prive)
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Nieuw lid toegevoegd. In afwachting van goedkeuring
 NewMemberForm=Nieuw lid formulier
-SubscriptionsStatistics=Statistieken over abonnementen
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Aantal abonnementen
-AmountOfSubscriptions=Hoeveelheid van abonnementen
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Omzet (voor een bedrijf) of Budget (voor een stichting)
 DefaultAmount=Standaard hoeveelheid van het abonnement
 CanEditAmount=Bezoeker kan kiezen / wijzigen bedrag van zijn inschrijving
 MEMBER_NEWFORM_PAYONLINE=Spring op geïntegreerde online betaalpagina
 ByProperties=Van nature
 MembersStatisticsByProperties=Ledenstatistieken per aard
-MembersByNature=Dit scherm toont statistieken over de leden per aard.
-MembersByRegion=Dit scherm tonen statistieken over de leden per streek.
 VATToUseForSubscriptions=BTW tarief voor inschrijvingen
 NoVatOnSubscription=Geen btw voor abonnementen
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product gebruikt voor abbonement regel in factuur: %s
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index 8d622f598cf..b70329e7b48 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Lijst met gedefinieerde machtigingen
 SeeExamples=Zie hier voorbeelden
 EnabledDesc=Voorwaarde om dit veld actief te hebben (voorbeelden: 1 of $ conf-&gt; global-&gt; MYMODULE_MYOPTION)
 VisibleDesc=Is het veld zichtbaar? (Voorbeelden: 0 = nooit zichtbaar, 1 = zichtbaar op lijst en formulieren maken / bijwerken / bekijken, 2 = alleen zichtbaar op lijst, 3 = alleen zichtbaar op formulier maken / bijwerken / bekijken (geen lijst), 4 = zichtbaar op lijst en update / view form only (not create), 5 = Alleen zichtbaar op lijst eindweergave formulier (niet create, not update). <br> <br> Het gebruik van een negatieve waarde betekent dat het veld niet standaard wordt weergegeven op de lijst, maar kan worden geselecteerd voor weergave). <br> <br> Het kan een uitdrukking zijn, bijvoorbeeld: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> ($ user-> rechten-> vakantie-> vakantie-> vakantie-> vakantie->)
-DisplayOnPdfDesc=Toon dit veld op compatibele PDF-documenten, u kunt de positie beheren met het veld "Positie". <br/> Momenteel bekend compatible PDF modellen zijn: Eratosthenes (order), espadon (schip), spons (facturen), cyaan (Propal / offerte), Cornas (leverancier volgorde) <br/> <br/> <strong> Voor document: </strong> <br/> 0 = niet weergegeven <br/> 1 = weergave <br/> 2 = alleen weergegeven als niet leeg <br/> <br/> <strong> Voor documentregels: </strong> <br/> 0 = niet weergegeven <br/> 1 = weergegeven in een kolom <br/> 3 = weergave in regel kolomomschrijving na de beschrijving <br/> 4 = weergave in de beschrijving positie daarachter beschrijving alleen indien niet leeg
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Weergeven in PDF
 IsAMeasureDesc=Kan de waarde van het veld worden gecumuleerd om een totaal in de lijst te krijgen? (Voorbeelden: 1 of 0)
 SearchAllDesc=Wordt het veld gebruikt om een zoekopdracht uit het snelzoekprogramma te doen? (Voorbeelden: 1 of 0)
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 15ae208dd41..be3a21b260a 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Installeer of schakel GD-bibliotheek op uw PHP-installatie i
 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 voor som van aantal producten / diensten
-StatsByNumberOfEntities=Statistieken in aantal verwijzende entiteiten (factuurnummer of bestelling ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Aantal voorstellen
 NumberOfCustomerOrders=Aantal verkooporders
 NumberOfCustomerInvoices=Aantal klant facturen
@@ -289,4 +289,4 @@ PopuProp=Producten / diensten op populariteit in voorstellen
 PopuCom=Producten / services op populariteit in Orders
 ProductStatistics=Producten / diensten Statistieken
 NbOfQtyInOrders=Aantal in bestellingen
-SelectTheTypeOfObjectToAnalyze=Selecteer het type object dat u wilt analyseren ...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/nl_NL/partnership.lang b/htdocs/langs/nl_NL/partnership.lang
new file mode 100644
index 00000000000..e50519a767c
--- /dev/null
+++ b/htdocs/langs/nl_NL/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnerschap beheer
+PartnershipDescription = Module Partnerschap beheer
+PartnershipDescriptionLong= Module Partnerschap beheer
+
+#
+# Menu
+#
+NewPartnership = Nieuw partnerschap
+ListOfPartnerships = Overzicht van partnerschappen
+
+#
+# Admin page
+#
+PartnershipSetup = Partnerschap instellingen
+PartnershipAbout = Over module partnerschap
+PartnershipAboutPage = Over module Partnerschap page
+
+
+#
+# Object
+#
+DatePartnershipStart=Begindatum
+DatePartnershipEnd=Einddatum
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Ontwerp
+PartnershipAccepted = Geaccepteerd
+PartnershipRefused = Geweigerd
+PartnershipCanceled = Geannuleerd
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
index 8f65a606600..a5f8646b2cc 100644
--- a/htdocs/langs/nl_NL/productbatch.lang
+++ b/htdocs/langs/nl_NL/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 50675925d5f..339c112b36a 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Diensten alleen voor verkoop
 ServicesOnPurchaseOnly=Diensten alleen voor aankoop
 ServicesNotOnSell=Diensten niet voor aan- en verkoop
 ServicesOnSellAndOnBuy=Diensten voor verkoop en aankoop
-LastModifiedProductsAndServices=Nieuwste %s gewijzigde producten / diensten
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Laatste %s geregistreerde producten
 LastRecordedServices=Laatste %s geregistreerde diensten
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Verkoopprijs
 SellingPriceHT=Verkoopprijs (excl. BTW)
 SellingPriceTTC=Verkoopprijs (inclusief belastingen)
 SellingMinPriceTTC=Minimale verkoopprijs (incl. BTW)
-CostPriceDescription=Dit prijsveld (excl. BTW) kan worden gebruikt om het gemiddelde bedrag op te slaan dat dit product voor uw bedrijf kost. Het kan elke prijs zijn die u zelf berekent, bijvoorbeeld op basis van de gemiddelde inkoopprijs plus gemiddelde productie- en distributiekosten.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Deze waarde kan worden gebruik voor marge berekening.
 SoldAmount=Aantal verkocht
 PurchasedAmount=Aantal ingekocht
 NewPrice=Nieuwe prijs
-MinPrice=Min. verkoopprijs
+MinPrice=Min. selling price
 EditSellingPriceLabel=Bewerk het label met de verkoopprijs
 CantBeLessThanMinPrice=De verkoopprijs kan niet lager zijn dan de minimumprijs voor dit product ( %s zonder belasting)
 ContractStatusClosed=Gesloten
@@ -157,11 +157,11 @@ ListServiceByPopularity=Lijst met diensten naar populariteit
 Finished=Gereed product
 RowMaterial=Ruw materiaal
 ConfirmCloneProduct=Weet u zeker dat u dit product of deze dienst <b>%s</b> wilt klonen?
-CloneContentProduct=Kloon alle hoofdinformatie van product / dienst
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Prijzen klonen
-CloneCategoriesProduct=Dupliceer gelinkte tags/categorieën
-CloneCompositionProduct=Dupliceer virtueel product/service
-CloneCombinationsProduct=Kloon productvarianten
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Dit product wordt gebruikt
 NewRefForClone=Referentie naar nieuw produkt / dienst
 SellingPrices=Verkoop prijzen
@@ -170,12 +170,12 @@ CustomerPrices=Consumenten prijzen
 SuppliersPrices=Prijzen van leveranciers
 SuppliersPricesOfProductsOrServices=Leverancierprijzen (van producten of services)
 CustomCode=Douane | Goederen | HS-code
-CountryOrigin=Land van herkomst
-RegionStateOrigin=Regio oorsprong
-StateOrigin=Staat | Provincie oorsprong
-Nature=Aard van het product (materiaal / afgewerkt)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Aard van het product
-NatureOfProductDesc=Grondstof of afgewerkt product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Kort label
 Unit=Eenheid
 p=u.
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 16fa0f84f88..e6dc26a72c0 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Projectcontacten
 ProjectsImContactFor=Projecten waarvoor ik expliciet contactpersoon ben
 AllAllowedProjects=Alle projecten die ik kan lezen (mine + public)
 AllProjects=Alle projecten
-MyProjectsDesc=Deze weergave is beperkt tot projecten waarvan u een contactpersoon bent
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Deze weergave toont alle projecten waarvoor u gerechtigd bent deze in te zien.
 TasksOnProjectsPublicDesc=Dit overzicht laat alle taken zien van projecten waarvoor u gemachtigd bent.
 ProjectsPublicTaskDesc=Deze weergave toont alle projecten en taken die je mag lezen.
 ProjectsDesc=Deze weergave toont alle projecten (Uw gebruikersrechten staan het u toe alles in te zien).
 TasksOnProjectsDesc=Dit overzicht laat alle projecten en alle taken zien (uw gebruikers-rechten geven u hiervoor toestemming).
-MyTasksDesc=Deze weergave is beperkt tot projecten of taken waarvoor u een contactpersoon bent
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Alleen projecten in bewerking zijn zichtbaar (projecten in concept of gesloten status zijn niet zichtbaar).
 ClosedProjectsAreHidden=Gesloten projecten zijn niet zichtbaar.
 TasksPublicDesc=Deze weergave toont alle projecten en taken die u mag inzien.
 TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staan het u toe alles in te zien).
 AllTaskVisibleButEditIfYouAreAssigned=Alle taken voor gekwalificeerde projecten zijn zichtbaar, maar u kunt alleen tijd invoeren voor de taak die aan de geselecteerde gebruiker is toegewezen. Wijs een taak toe als u er tijd op wilt invoeren.
-OnlyYourTaskAreVisible=Alleen taken die aan u zijn toegewezen, zijn zichtbaar. Wijs een taak aan uzelf toe als deze niet zichtbaar is en u er tijd in wilt invoeren.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Taken bij projecten
 ProjectCategories=Labels/categorieën projecten
 NewProject=Nieuw project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Niet toegewezen aan de taak
 NoUserAssignedToTheProject=Geen gebruikers toegewezen aan dit project
 TimeSpentBy=Tijd doorgebracht door
 TasksAssignedTo=Taken toegekend aan
-AssignTaskToMe=Taak aan mij toewijzen
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Ken taak toe aan %s
 SelectTaskToAssign=Selecteer taak om toe te wijzen ...
 AssignTask=Toewijzen
diff --git a/htdocs/langs/nl_NL/recruitment.lang b/htdocs/langs/nl_NL/recruitment.lang
index 4ad441ecff0..297d3335457 100644
--- a/htdocs/langs/nl_NL/recruitment.lang
+++ b/htdocs/langs/nl_NL/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Bedankt voor je aanmelding. <br> ...
 JobClosedTextCandidateFound=De vacature is gesloten. De functie is vervuld.
 JobClosedTextCanceled=De vacature is gesloten.
 ExtrafieldsJobPosition=Complementaire attributen (functieposities)
-ExtrafieldsCandidatures=Aanvullende attributen (sollicitaties)
+ExtrafieldsApplication=Aanvullende attributen (sollicitaties)
 MakeOffer=Doe een aanbod
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index b16b9726c7d..ec3734cae7b 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Weet u zeker dat u deze zending wilt valideren met als re
 ConfirmCancelSending=Weet u zeker dat u deze verzending wilt annuleren?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Waarschuwing, geen producten die op verzending wachten.
-StatsOnShipmentsOnlyValidated=Statistiek op verzendingen die bevestigd zijn.  Datum is de datum van bevestiging van de verzending (geplande leverdatum is niet altijd bekend).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Verwachte leverdatum
 RefDeliveryReceipt=Ref-ontvangstbewijs
 StatusReceipt=Status ontvangstbevestiging
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index bdbeef3b7d2..5ff151d9fd7 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Geen vooraf ingestelde producten voor dit object.
 DispatchVerb=Verzending
 StockLimitShort=Alarm limiet
 StockLimit=Alarm voorraadlimiet
-StockLimitDesc=Geen melding bij geen voorraad. <br>0 kan worden gebruikt om te waarschuwen zodra er geen voorraad meer is.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Fysieke voorraad
 RealStock=Werkelijke voorraad
 RealStockDesc=Fysieke/echte voorraad is de voorraad die momenteel in de magazijnen aanwezig is.
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index 3866d958572..4dbce720f65 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Wachtwoord gewijzigd in: %s
 SubjectNewPassword=Uw nieuw wachtwoord voor %s
 GroupRights=Groepsrechten
 UserRights=Gebruikersrechten
+Credentials=Credentials
 UserGUISetup=Gebruikersweergave instellen
 DisableUser=Uitschakelen
 DisableAUser=Schakel de gebruikertoegang uit
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Gebruik het veld Type om te veranderen
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Gebruik OpenID om in te loggen
 WeeklyHours=Gewerkte uren (per week)
-ExpectedWorkedHours=Verwachte gewerkte uren per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Kleur van de gebruiker
 DisabledInMonoUserMode=Uitgeschakeld in onderhoudsmodus
 UserAccountancyCode=Gebruiker accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Datum indiensttreding
 DateEmployment=Werkgelegenheid
 DateEmploymentstart=Startdatum dienstverband
 DateEmploymentEnd=Einddatum dienstverband
-RangeOfLoginValidity=Datumbereik van inloggeldigheid
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=U kunt uw eigen gebruikersrecord niet uitschakelen
 ForceUserExpenseValidator=Validatierapport valideren
 ForceUserHolidayValidator=Forceer verlofaanvraag validator
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 8dc5e4b9675..f75e622fc9b 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Definieer een lijst van alle beschik
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/nl_NL/workflow.lang b/htdocs/langs/nl_NL/workflow.lang
index 5aaea7ee12d..d5d7ffe6155 100644
--- a/htdocs/langs/nl_NL/workflow.lang
+++ b/htdocs/langs/nl_NL/workflow.lang
@@ -16,10 +16,10 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classificeer gekoppelde bronverkoop
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classificeer het gekoppelde bronvoorstel als gefactureerd wanneer de leveranciersfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van het gekoppelde voorstel)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classificeer gekoppelde inkooporder als gefactureerd wanneer leveranciersfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde order)
-descWORKFLOW_BILL_ON_RECEPTION=Classificeer ontvangsten als "gefactureerd" wanneer een gekoppelde leveranciersorder wordt gevalideerd
+descWORKFLOW_BILL_ON_RECEPTION=Classificeer ontvangsten als "gefactureerd" wanneer een gekoppelde inkooporder wordt gevalideerd
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Sluit alle interventies die aan het ticket zijn gekoppeld wanneer een ticket is gesloten
 AutomaticCreation=Automatisch aanmaken
 AutomaticClassification=Automatisch classificeren
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classificeer gekoppelde bronzending als gesloten wanneer de klant factuur wordt gevalideerd
diff --git a/htdocs/langs/nl_NL/zapier.lang b/htdocs/langs/nl_NL/zapier.lang
index f36e42cd18a..8d428e4c0dc 100644
--- a/htdocs/langs/nl_NL/zapier.lang
+++ b/htdocs/langs/nl_NL/zapier.lang
@@ -14,8 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ModuleZapierForDolibarrName = Zapier voor Dolibarr
-ModuleZapierForDolibarrDesc = Zapier voor Dolibarr-module
+ModuleZapierForDolibarrDesc = Zapier voor Dolibarr module
 ZapierForDolibarrSetup=Installatie van Zapier voor Dolibarr
 ZapierDescription=Interface met Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ZapierAbout=Over de module Zapier
+ZapierSetupPage=Het is niet nodig om een setup uit te voeren in Dolibarr om Zapier te gebruiken. Echter, je moet een package genereren en publiceren op zapier om in staat te zijn om Zapier met Dolibarr te gebruiken. Zie ook de documentatie op <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">deze wiki pagina</a>.
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index dab89cc501b..be7022e275e 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Odniesienie
 LabelAccount=Etykieta konta
 LabelOperation=Operacja na etykiecie
 Sens=Kierunek
-AccountingDirectionHelp=W przypadku konta księgowego klienta użyj opcji Kredyt, aby zarejestrować otrzymaną płatność <br> W przypadku konta księgowego dostawcy użyj polecenia Debet, aby zarejestrować dokonaną płatność
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Kod literowy
 Lettering=Literowanie
 Codejournal=Dziennik
@@ -297,7 +297,7 @@ NoNewRecordSaved=Koniec z zapisem do dziennika
 ListOfProductsWithoutAccountingAccount=Lista produktów nie dowiązanych do żadnego konta księgowego
 ChangeBinding=Zmień dowiązanie
 Accounted=Rozliczone w księdze
-NotYetAccounted=Jeszcze nie uwzględnione w księdze
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Pokaż Poradnik
 NotReconciled=Nie pogodzono się
 WarningRecordWithoutSubledgerAreExcluded=Ostrzeżenie, wszystkie operacje bez zdefiniowanego konta księgi podrzędnej są filtrowane i wykluczane z tego widoku
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index d3f0e57c684..3a5510ec118 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Usuń/zmień nazwę pliku <b>%s</b> o ile istnieje, aby umożliwić k
 RestoreLock=Przywróć plik <b>%s</b> o uprawnieniach tylko do odczytu, aby wyłączyć dalsze korzystanie z narzędzia Aktualizuj/Instaluj.
 SecuritySetup=Ustawienia bezpieczeństwa
 PHPSetup=Ustawienia PHP
+OSSetup=OS setup
 SecurityFilesDesc=Zdefiniuj tutaj opcje związane z bezpieczeństwem przesyłania plików.
 ErrorModuleRequirePHPVersion=Błąd ten moduł wymaga PHP w wersji %s lub większej
 ErrorModuleRequireDolibarrVersion=Błąd ten moduł wymaga Dolibarr wersji %s lub większej
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Nie proponuj
 NoActiveBankAccountDefined=Brak zdefiniowanego aktywnego konta bankowego
 OwnerOfBankAccount=Właściciel konta bankowego %s
 BankModuleNotActive=Moduł Rachunków bankowych jest nie aktywny
-ShowBugTrackLink=Show link "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alarmy
 DelaysOfToleranceBeforeWarning=Opóźnienie przed wyświetleniem ostrzeżenia dotyczącego:
 DelaysOfToleranceDesc=Ustaw opóźnienie, zanim ikona alertu %s zostanie wyświetlona na ekranie dla późnego elementu.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Należy uruchomić to polecenie
 YourPHPDoesNotHaveSSLSupport=funkcji SSL nie są dostępne w PHP
 DownloadMoreSkins=Więcej skórek do pobrania
 SimpleNumRefModelDesc=Zwraca numer referencyjny w formacie %syymm-nnnn, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba automatycznie zwiększająca się bez resetowania
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Pokaż identyfikator zawodowy z adresami
 ShowVATIntaInAddress=Ukryj wewnątrzwspólnotowy numer VAT wraz z adresami
 TranslationUncomplete=Częściowe tłumaczenie
@@ -2062,7 +2064,7 @@ UseDebugBar=Użyj paska debugowania
 DEBUGBAR_LOGS_LINES_NUMBER=Liczba ostatnich wierszy dziennika do zachowania w konsoli
 WarningValueHigherSlowsDramaticalyOutput=Ostrzeżenie, wyższe wartości dramatycznie spowalniają produkcję
 ModuleActivated=Moduł %s jest aktywowany i spowalnia interfejs
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=W środowisku produkcyjnym należy ustawić tę właściwość na %s.
 AntivirusEnabledOnUpload=Antywirus włączony na przesyłanych plikach
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index c7266ccdbbc..033e4f2f9e5 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Płatność za ZUS/podatek
 BankTransfer=Transfer kredytowy
 BankTransfers=Polecenia przelewu
 MenuBankInternalTransfer=Przelew wewnętrzny
-TransferDesc=Przelew z jednego konta na drugie, Dolibarr zapisze dwa rekordy (obciążenie na koncie źródłowym i kredyt na koncie docelowym). Ta sama kwota (oprócz znaku), etykieta i data zostaną użyte dla tej transakcji)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Od
 TransferTo=Do
 TransferFromToDone=Transfer z <b>%s</b> do <b>%s</b> <b>%s</b> %s został zapisany.
 CheckTransmitter=Nadawca
 ValidateCheckReceipt=Potwierdzić potwierdzenie tego czeku?
-ConfirmValidateCheckReceipt=Czy na pewno chcesz potwierdzić to pokwitowanie czeku? Gdy to zrobisz, żadna zmiana nie będzie możliwa?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Usunąć to pokwitowanie czeku?
 ConfirmDeleteCheckReceipt=Czy na pewno chcesz usunąć to pokwitowanie czeku?
 BankChecks=Czeki bankowe
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Czy jesteś pewien, że chcesz usunąć te wpis?
 ThisWillAlsoDeleteBankRecord=To usunie wygenerowany wpis bankowy
 BankMovements=Ruchy
 PlannedTransactions=Zaplanowane wpisy
-Graph=Grafika
+Graph=Graphs
 ExportDataset_banque_1=Wpisy bankowe i stan konta
 ExportDataset_banque_2=Odcinek wpłaty
 TransactionOnTheOtherAccount=Transakcja na inne konta
@@ -142,7 +142,7 @@ AllAccounts=Wszystkie rachunki bankowe i gotówkowe
 BackToAccount=Powrót do konta
 ShowAllAccounts=Pokaż wszystkie konta
 FutureTransaction=Przyszła transakcja. Nie można się pogodzić.
-SelectChequeTransactionAndGenerate=Wybierz / filtruj czeki, które mają zostać uwzględnione w potwierdzeniu wpłaty czeku, i kliknij „Utwórz”.
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Wybierz wyciąg bankowy związany z postępowania pojednawczego. Użyj schematu: RRRRMM lub RRRRMMDD
 EventualyAddCategory=Ostatecznie, określić kategorię, w której sklasyfikować rekordy
 ToConciliate=Do zaksięgowania?
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 9bd60005f52..8929f1a8b29 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Zamień zapłaconą nadwyżkę na dostępny rabat
 EnterPaymentReceivedFromCustomer=Wprowadź płatność otrzymaną od klienta
 EnterPaymentDueToCustomer=Dokonaj płatności dla klienta
 DisabledBecauseRemainderToPayIsZero=Nieaktywne, ponieważ upływająca nieopłacona kwota wynosi zero
-PriceBase=Cena podstawowa
+PriceBase=Base price
 BillStatus=Status faktury
 StatusOfGeneratedInvoices=Status generowanych faktur
 BillStatusDraft=Projekt (musi zostać zatwierdzone)
@@ -454,7 +454,7 @@ RegulatedOn=Regulowane
 ChequeNumber=Czek N
 ChequeOrTransferNumber=Cheque / Transferu N
 ChequeBordereau=Sprawdź harmonogram
-ChequeMaker=Sprawdź nadajnik / transferu
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank czek
 CheckBank=Sprawdź
 NetToBePaid=Netto do wypłaty
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index f7873c1874d..890e5e1e4b3 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Zakładki: najnowsze %s
 BoxOldestExpiredServices=Najstarsze aktywne przeterminowane usługi
 BoxLastExpiredServices=Ostanich %s najstarszych kontaktów z aktywnymi upływającymi usługami
 BoxTitleLastActionsToDo=Ostatnich %s zadań do zrobienia
-BoxTitleLastContracts=Ostatnich %s zmodyfikowanych kontaktów
-BoxTitleLastModifiedDonations=Ostatnich %s zmodyfikowanych dotacji
-BoxTitleLastModifiedExpenses=Ostatnich %s zmodyfikowanych raportów kosztów
-BoxTitleLatestModifiedBoms=Najnowsze zmodyfikowane zestawienia komponentów %s
-BoxTitleLatestModifiedMos=Najnowsze %s zmodyfikowane zamówienia produkcyjne
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Klienci z maksymalną zaległością przekroczeni
 BoxGlobalActivity=Globalna aktywność (faktury, wnioski, zamówienia)
 BoxGoodCustomers=Dobrzy klienci
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index f420c946b3c..6cbc7926e15 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -16,7 +16,7 @@ AddThisArticle=Dodaj ten artykuł
 RestartSelling=Wróć na sprzedaż
 SellFinished=Sprzedaż zakończona
 PrintTicket=Bilet do druku
-SendTicket=Send ticket
+SendTicket=Wyślij bilet
 NoProductFound=Artykuł nie znaleziony
 ProductFound=Znaleziono produkt
 NoArticle=Brak artykułu
@@ -31,96 +31,100 @@ ShowCompany=Pokaż firmę
 ShowStock=Pokaż magazyn
 DeleteArticle=Kliknij, aby usunąć ten artykuł
 FilterRefOrLabelOrBC=Szukaj (Ref / Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=Prosisz o zmniejszenie zapasów przy tworzeniu faktury, więc użytkownik korzystający z POS musi mieć uprawnienia do edycji zapasów.
 DolibarrReceiptPrinter=Drukarka fiskalna Dolibarr
-PointOfSale=Point of Sale
+PointOfSale=Punkt sprzedaży
 PointOfSaleShort=POS
-CloseBill=Close Bill
-Floors=Floors
-Floor=Floor
-AddTable=Add table
-Place=Place
-TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
-SearchProduct=Search product
+CloseBill=Zamknij Bill
+Floors=Podłogi
+Floor=Podłoga
+AddTable=Dodaj tabelę
+Place=Miejsce
+TakeposConnectorNecesary=Wymagane jest „złącze TakePOS”
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+SearchProduct=Wyszukaj produkt
 Receipt=Odbiór
-Header=Header
-Footer=Footer
-AmountAtEndOfPeriod=Amount at end of period (day, month or year)
-TheoricalAmount=Theorical amount
-RealAmount=Real amount
-CashFence=Cash desk closing
-CashFenceDone=Cash desk closing done for the period
+Header=nagłówek
+Footer=Stopka
+AmountAtEndOfPeriod=Kwota na koniec okresu (dzień, miesiąc lub rok)
+TheoricalAmount=Kwota teoretyczna
+RealAmount=Prawdziwa kwota
+CashFence=Zamknięcie kasy
+CashFenceDone=Zamknięcie kasy wykonane na okres
 NbOfInvoices=Ilość faktur
-Paymentnumpad=Type of Pad to enter payment
+Paymentnumpad=Typ podkładki do wprowadzenia płatności
 Numberspad=Numbers Pad
-BillsCoinsPad=Coins and banknotes Pad
-DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
-CashDeskBankAccountFor=Default account to use for payments in
-NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
-PrintCustomerOnReceipts=Print customer on tickets|receipts
-EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
-ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
-ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+BillsCoinsPad=Monety i banknoty Pad
+DolistorePosCategory=Moduły TakePOS i inne rozwiązania POS dla Dolibarr
+TakeposNeedsCategories=TakePOS potrzebuje co najmniej jednej kategorii produktów do działania
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS potrzebuje co najmniej 1 kategorii produktów z kategorii <b> %s </b> do działania
+OrderNotes=Can add some notes to each ordered items
+CashDeskBankAccountFor=Domyślne konto używane do płatności w
+NoPaimementModesDefined=W konfiguracji TakePOS nie zdefiniowano trybu płatności
+TicketVatGrouped=Grupowy podatek VAT według stawki w biletach | paragonach
+AutoPrintTickets=Automatycznie drukuj bilety | paragony
+PrintCustomerOnReceipts=Wydrukuj klienta na biletach | paragonach
+EnableBarOrRestaurantFeatures=Włącz funkcje baru lub restauracji
+ConfirmDeletionOfThisPOSSale=Czy potwierdzasz usunięcie bieżącej sprzedaży?
+ConfirmDiscardOfThisPOSSale=Czy chcesz odrzucić tę bieżącą sprzedaż?
 History=Historia
-ValidateAndClose=Validate and close
+ValidateAndClose=Zatwierdź i zamknij
 Terminal=Terminal
-NumberOfTerminals=Number of Terminals
-TerminalSelect=Select terminal you want to use:
-POSTicket=POS Ticket
-POSTerminal=POS Terminal
-POSModule=POS Module
-BasicPhoneLayout=Use basic layout for phones
-SetupOfTerminalNotComplete=Setup of terminal %s is not complete
-DirectPayment=Direct payment
-DirectPaymentButton=Add a "Direct cash payment" button
-InvoiceIsAlreadyValidated=Invoice is already validated
-NoLinesToBill=No lines to bill
-CustomReceipt=Custom Receipt
-ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
-SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
+NumberOfTerminals=Liczba terminali
+TerminalSelect=Wybierz terminal, którego chcesz użyć:
+POSTicket=Bilet POS
+POSTerminal=Terminal POS
+POSModule=Moduł POS
+BasicPhoneLayout=Użyj podstawowego układu dla telefonów
+SetupOfTerminalNotComplete=Konfiguracja terminala %s nie została zakończona
+DirectPayment=Płatność bezpośrednia
+DirectPaymentButton=Dodaj przycisk „Bezpośrednia płatność gotówkowa”
+InvoiceIsAlreadyValidated=Faktura jest już zweryfikowana
+NoLinesToBill=Brak linii do rozliczenia
+CustomReceipt=Odbiór niestandardowy
+ReceiptName=Nazwa paragonu
+ProductSupplements=Manage supplements of products
+SupplementCategory=Kategoria suplementu
+ColorTheme=Motyw kolorystyczny
+Colorful=Kolorowy
 HeadBar=Head Bar
-SortProductField=Field for sorting products
+SortProductField=Pole do sortowania produktów
 Browser=Przeglądarka
-BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
-ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
-TakeposGroupSameProduct=Group same products lines
-StartAParallelSale=Start a new parallel sale
-SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
-CloseCashFence=Close cash desk control
-CashReport=Cash report
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
-BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
+BrowserMethodDescription=Proste i łatwe drukowanie paragonów. Tylko kilka parametrów do skonfigurowania paragonu. Drukuj przez przeglądarkę.
+TakeposConnectorMethodDescription=Moduł zewnętrzny z dodatkowymi funkcjami. Możliwość drukowania z chmury.
+PrintMethod=Metoda drukowania
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
+ByTerminal=Terminalem
+TakeposNumpadUsePaymentIcon=Użyj ikony zamiast tekstu na przyciskach płatności na klawiaturze numerycznej
+CashDeskRefNumberingModules=Moduł numeracji dla sprzedaży POS
+CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> służy do dodania numeru terminala
+TakeposGroupSameProduct=Grupuj te same linie produktów
+StartAParallelSale=Rozpocznij nową sprzedaż równoległą
+SaleStartedAt=Sprzedaż rozpoczęła się od %s
+ControlCashOpening=Kontroluj wyskakujące okienko gotówki przy otwieraniu punktu sprzedaży
+CloseCashFence=Zamknij kontrolę kasową
+CashReport=Raport kasowy
+MainPrinterToUse=Główna drukarka do użycia
+OrderPrinterToUse=Zamów drukarkę do użytku
+MainTemplateToUse=Główny szablon do użycia
+OrderTemplateToUse=Zamów szablon do użycia
+BarRestaurant=Bar Restauracja
+AutoOrder=Zamów przez samego klienta
 RestaurantMenu=Menu
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
-WeighingScale=Weighing scale
+CustomerMenu=Menu klienta
+ScanToMenu=Zeskanuj kod QR, aby zobaczyć menu
+ScanToOrder=Zeskanuj kod QR, aby zamówić
+Appearance=Wygląd
+HideCategoryImages=Ukryj obrazy kategorii
+HideProductImages=Ukryj zdjęcia produktów
+NumberOfLinesToShow=Liczba wierszy obrazów do pokazania
+DefineTablePlan=Zdefiniuj plan tabel
+GiftReceiptButton=Dodaj przycisk „Potwierdzenie prezentu”
+GiftReceipt=Odbiór prezentu
+ModuleReceiptPrinterMustBeEnabled=Najpierw musi być włączona drukarka pokwitowań modułu
+AllowDelayedPayment=Zezwalaj na opóźnioną płatność
+PrintPaymentMethodOnReceipts=Wydrukuj metodę płatności na biletach | paragonach
+WeighingScale=Skalę ważenia
+ShowPriceHT = Wyświetl cenę bez podatku
+ShowPriceHTOnReceipt = Wyświetl cenę bez podatku na paragonie
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index 61f1d5332cd..c81bbd8dd60 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag / Kategoria
 Rubriques=Tagi / Kategorie
 RubriquesTransactions=Tagi / kategorie transakcji
 categories=tagi/kategorie
-NoCategoryYet=Dla tego typu nie utworzono tagu/kategorii
+NoCategoryYet=No tag/category of this type has been created
 In=W
 AddIn=Dodaj w
 modify=modyfikować
 Classify=Klasyfikacja
 CategoriesArea=Tagi / obszar Kategorie
-ProductsCategoriesArea=Produkty / Usługi tagi / obszar kategorie
-SuppliersCategoriesArea=Obszar tagów / kategorii dostawców
-CustomersCategoriesArea=Klienci tagi / obszar kategorie
-MembersCategoriesArea=Użytkownicy tagi / obszar kategorie
-ContactsCategoriesArea=Kontakt tagi / obszar kategorie
-AccountsCategoriesArea=Obszar tagów / kategorii rachunków bankowych
-ProjectsCategoriesArea=Obszar tagów / kategorii projektów
-UsersCategoriesArea=Obszar znaczników/kategorii użytkowników
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Podkategorie
 CatList=Lista tagów / kategorii
 CatListAll=Lista tagów / kategorii (wszystkie typy)
@@ -96,4 +96,4 @@ ChooseCategory=Wybrane kategorie
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Kategorie kontenerów stron
-UseOrOperatorForCategories=Użyj lub operator dla kategorii
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 23ec198bec8..230a3becdd6 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Nazwa firmy %s już istnieje. Wybierz inną.
 ErrorSetACountryFirst=Najpierw wybierz kraj
 SelectThirdParty=Wybierz kontrahenta
-ConfirmDeleteCompany=Czy jesteś pewien, ze chcesz usunąć tą firmę i wszystkie zawarte informacje?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Usuń kontakt/adres
-ConfirmDeleteContact=Czy jesteś pewien, ze chcesz usunąć ten kontakt i wszystkie zawarte informacje?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Nowy kontrahent
 MenuNewCustomer=Nowy klient
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Zadzwoń
 Chat=Czat
-PhonePro=Telefonu służbowy
+PhonePro=Bus. phone
 PhonePerso=Telefon prywatny
 PhoneMobile=Telefon komórkowy
 No_Email=Odrzuć masowe wysyłanie e-maili
@@ -331,7 +331,7 @@ CustomerCodeDesc=Kod klienta, unikalny dla wszystkich klientów
 SupplierCodeDesc=Kod dostawcy, unikalny dla wszystkich dostawców
 RequiredIfCustomer=Wymagane, jeżeli Kontrahent jest klientem lub potencjalnym klientem
 RequiredIfSupplier=Wymagane jeżeli kontrahent jest dostawcą
-ValidityControledByModule=Ważność kontrolowana przez moduł
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Zasady dla tego modułu
 ProspectToContact=Potencjalny Klient do kontaktu
 CompanyDeleted=Firma " %s" usunięta z bazy danych.
@@ -439,12 +439,12 @@ ListSuppliersShort=Lista sprzedawców
 ListProspectsShort=Lista perspektyw
 ListCustomersShort=Lista klientów
 ThirdPartiesArea=Osoby trzecie / kontakty
-LastModifiedThirdParties=Najnowsze %s zmodyfikowane strony trzecie
-UniqueThirdParties=Łączna liczba stron trzecich
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Otwarte
 ActivityCeased=Zamknięte
 ThirdPartyIsClosed=Kontrahent jest zamknięty
-ProductsIntoElements=Lista produktów/usług w %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Biężący, niezapłacony rachunek
 OutstandingBill=Maksymalna kwota niezapłaconego rachunku
 OutstandingBillReached=Maksymalna kwota dla niespłaconych rachunków osiągnięta
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Dowolny kod Klienta / Dostawcy. Ten kod może być modyfi
 ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...)
 MergeOriginThirdparty=Duplikuj kontrahenta (kontrahenta, którego chcesz usunąć)
 MergeThirdparties=Scal kontrahentów
-ConfirmMergeThirdparties=Czy na pewno chcesz scalić tę firmę zewnętrzną z obecną? Wszystkie połączone obiekty (faktury, zamówienia, ...) zostaną przeniesione do bieżącej strony trzeciej, a następnie strona trzecia zostanie usunięta.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Strony trzecie zostały połączone
 SaleRepresentativeLogin=Login przedstawiciela handlowego
 SaleRepresentativeFirstname=Imię przedstawiciela handlowego
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index b71f9c0776d..bd6d36178ed 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Nowe zniżki
 NewCheckDeposit=Nowe sprawdzić depozytu
 NewCheckDepositOn=Nowe sprawdzić depozytu na konto: %s
 NoWaitingChecks=Brak czeków oczekujących na wpłatę.
-DateChequeReceived=Data rejestracji czeku
+DateChequeReceived=Check receiving date
 NbOfCheques=Liczba czeków
 PaySocialContribution=Zapłać ZUS/podatek
 PayVAT=Zapłać deklarację VAT
diff --git a/htdocs/langs/pl_PL/ecm.lang b/htdocs/langs/pl_PL/ecm.lang
index b39489425ce..d82c3efa109 100644
--- a/htdocs/langs/pl_PL/ecm.lang
+++ b/htdocs/langs/pl_PL/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Pliki Extrafields Ecm
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=Konfiguracja ECM
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 826b8bb629f..5f372102c73 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Nie ma błędu, zobowiązujemy
 # Errors
 ErrorButCommitIsDone=Znalezione błędy, ale mimo to możemy potwierdzić
-ErrorBadEMail=E-mail %s jest nieprawidłowy
-ErrorBadMXDomain=E-mail %s wydaje się nieprawidłowy (domena nie ma prawidłowego rekordu MX)
-ErrorBadUrl=Url %s jest błędny
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Zła wartość parametru. Zazwyczaj dołącza się, gdy brakuje tłumaczenia.
 ErrorRefAlreadyExists=Odniesienie <b> %s </b> już istnieje.
 ErrorLoginAlreadyExists=Zaloguj %s już istnieje.
@@ -46,8 +46,8 @@ ErrorWrongDate=Data nie jest poprawna!
 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=Nie można usunąć użytkownika. Może jest to związane z podmiotami Dolibarr.
-ErrorFieldsRequired=Niektóre pola wymagane nie były uzupełnione.
-ErrorSubjectIsRequired=Temat wiadomości jest wymagany
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject 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
 ErrorSetupOfEmailsNotComplete=Konfiguracja e-maili nie została zakończona
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Strona/kontener <strong> %s </strong>
 ErrorDuringChartLoad=Błąd podczas ładowania planu kont. Jeśli kilka kont nie zostało załadowanych, nadal możesz wprowadzić je ręcznie.
 ErrorBadSyntaxForParamKeyForContent=Zła składnia parametru keyforcontent. Musi mieć wartość zaczynającą się od %s lub %s
 ErrorVariableKeyForContentMustBeSet=Błąd, należy ustawić stałą o nazwie %s (z treścią tekstową do wyświetlenia) lub %s (z zewnętrznym adresem URL do wyświetlenia).
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s musi zaczynać się od http: // lub https: //
 ErrorHostMustNotStartWithHttp=Nazwa hosta %s NIE może zaczynać się od http: // lub https: //
 ErrorNewRefIsAlreadyUsed=Błąd, nowe odniesienie jest już używane
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Dostępne tylko w przypadku korzystania z be
 WarningModuleXDisabledSoYouMayMissEventHere=Moduł %s nie został włączony. Możesz więc przegapić wiele wydarzeń tutaj.
 ErrorActionCommPropertyUserowneridNotDefined=Właściciel użytkownika jest wymagany
 ErrorActionCommBadType=Wybrany typ zdarzenia (id: %n, kod: %s) nie istnieje w słowniku typów zdarzeń
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/pl_PL/eventorganization.lang b/htdocs/langs/pl_PL/eventorganization.lang
new file mode 100644
index 00000000000..0f40e7ef18c
--- /dev/null
+++ b/htdocs/langs/pl_PL/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Ustawienia
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Szkic
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Zrobione
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/pl_PL/knowledgemanagement.lang b/htdocs/langs/pl_PL/knowledgemanagement.lang
new file mode 100644
index 00000000000..00220dab02a
--- /dev/null
+++ b/htdocs/langs/pl_PL/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Ustawienia
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = O
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Artykuł
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 54209fa28ee..2185ec0745c 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -11,16 +11,16 @@ MailFrom=Nadawca
 MailErrorsTo=Błędów do
 MailReply=Odpowiedz do
 MailTo=Odbiorca(y)
-MailToUsers=To user(s)
+MailToUsers=Do użytkownika (ów)
 MailCC=Kopiuj do
-MailToCCUsers=Copy to users(s)
+MailToCCUsers=Kopiuj dla użytkowników
 MailCCC=Kopi w pamięci do
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Wiadomość
 MailFile=Dołączone pliki
 MailMessage=Zawartość emaila 
-SubjectNotIn=Not in Subject
-BodyNotIn=Not in Body
+SubjectNotIn=Nie w temacie
+BodyNotIn=Nie w ciele
 ShowEMailing=Pokaż mailingi
 ListOfEMailings=Lista mailingów
 NewMailing=Nowy mailing
@@ -39,76 +39,76 @@ MailingStatusSentPartialy=Wyślij częściowo
 MailingStatusSentCompletely=Wysłane całkowicie
 MailingStatusError=Błąd
 MailingStatusNotSent=Nie wysłano
-MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailSuccessfulySent=E-mail (od %s do %s) został pomyślnie zaakceptowany do dostarczenia
 MailingSuccessfullyValidated=Mailing pomyślnie zweryfikowany
 MailUnsubcribe=Wypisz
 MailingStatusNotContact=Nie kontaktuj się więcej
 MailingStatusReadAndUnsubscribe=Przeczytaj i wypisz się z subskrybcji
 ErrorMailRecipientIsEmpty=Odbiorca maila jest pusty
 WarningNoEMailsAdded=Brak nowych wiadomości mail, aby dodać adres do listy.
-ConfirmValidMailing=Are you sure you want to validate this emailing?
-ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
-ConfirmDeleteMailing=Are you sure you want to delete this emailing?
-NbOfUniqueEMails=No. of unique emails
-NbOfEMails=No. of EMails
+ConfirmValidMailing=Czy na pewno chcesz zweryfikować tę wiadomość e-mail?
+ConfirmResetMailing=Uwaga, ponownie inicjując wysyłanie wiadomości e-mail <b> %s </b>, zezwolisz na ponowne wysłanie tej wiadomości e-mail w wysyłce zbiorczej. Czy na pewno chcesz to zrobić?
+ConfirmDeleteMailing=Czy na pewno chcesz usunąć tę wiadomość e-mail?
+NbOfUniqueEMails=Liczba unikalnych e-maili
+NbOfEMails=Liczba e-maili
 TotalNbOfDistinctRecipients=Liczba różnych odbiorców
 NoTargetYet=Nie określono jeszcze odbiorców (Przejdź na kartę "Odbiorcy")
-NoRecipientEmail=No recipient email for %s
+NoRecipientEmail=Brak adresu e-mail odbiorcy %s
 RemoveRecipient=Usuń odbiorcę
 YouCanAddYourOwnPredefindedListHere=Aby utworzyć swój mail wyboru modułu, patrz htdocs/core/modules/mailings/README.
 EMailTestSubstitutionReplacedByGenericValues=Podczas korzystania z trybu testowego, podstawienia zmiennych zastępują wartości generycznych
 MailingAddFile=Dołącz ten plik
 NoAttachedFiles=Nie załączono plików
-BadEMail=Bad value for Email
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+BadEMail=Zła wartość dla e-maila
+ConfirmCloneEMailing=Czy na pewno chcesz sklonować tę wiadomość e-mail?
 CloneContent=Kopia wiadomości
 CloneReceivers=Skopiuj odbiorców
-DateLastSend=Date of latest sending
+DateLastSend=Data ostatniego wysłania
 DateSending=Data wysłania
 SentTo=Wysłane do <b>%s</b>
 MailingStatusRead=Czytać
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
-EMailSentToNRecipients=Email sent to %s recipients.
-EMailSentForNElements=Email sent for %s elements.
+YourMailUnsubcribeOK=E-mail <b> %s </b> jest poprawnie wypisany z listy mailingowej
+ActivateCheckReadKey=Klucz używany do szyfrowania adresu URL używany do funkcji „Potwierdzenie odczytu” i „Anuluj subskrypcję”
+EMailSentToNRecipients=E-mail wysłany do %s odbiorców.
+EMailSentForNElements=Wiadomość e-mail wysłana dla elementów %s.
 XTargetsAdded=<b>% s</b> dodany do listy odbiorców docelowych
-OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
-AllRecipientSelected=The recipients of the %s record selected (if their email is known).
-GroupEmails=Group emails
-OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
-ResultOfMailSending=Result of mass Email sending
-NbSelected=Number selected
-NbIgnored=Number ignored
-NbSent=Number sent
-SentXXXmessages=%s message(s) sent.
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
-MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
-MailingModuleDescEmailsFromFile=Emails from file
-MailingModuleDescEmailsFromUser=Emails input by user
-MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
-SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
-EmailCollectorFilterDesc=All filters must match to have an email being collected
+OnlyPDFattachmentSupported=Jeśli dokumenty PDF zostały już wygenerowane dla obiektów do wysłania, zostaną załączone do wiadomości e-mail. Jeśli nie, żadna wiadomość e-mail nie zostanie wysłana (należy również pamiętać, że w tej wersji obsługiwane są tylko dokumenty PDF jako załączniki w masowej wysyłce).
+AllRecipientSelected=Odbiorcy wybranego rekordu %s (jeśli ich adres e-mail jest znany).
+GroupEmails=Grupowe e-maile
+OneEmailPerRecipient=Jeden e-mail na odbiorcę (domyślnie jeden e-mail na wybrany rekord)
+WarningIfYouCheckOneRecipientPerEmail=Uwaga, jeśli zaznaczysz to pole, oznacza to, że tylko jeden e-mail zostanie wysłany dla kilku różnych wybranych rekordów, więc jeśli twoja wiadomość zawiera zmienne zastępcze, które odnoszą się do danych rekordu, nie będzie można ich zastąpić.
+ResultOfMailSending=Wynik masowego wysłania wiadomości e-mail
+NbSelected=Wybrano numer
+NbIgnored=Liczba zignorowana
+NbSent=Numer wysłany
+SentXXXmessages=Wysłano wiadomości %s.
+ConfirmUnvalidateEmailing=Czy na pewno chcesz zmienić e-mail <b> %s </b> na status wersji roboczej?
+MailingModuleDescContactsWithThirdpartyFilter=Kontakt z filtrami klienta
+MailingModuleDescContactsByCompanyCategory=Kontakty według kategorii osób trzecich
+MailingModuleDescContactsByCategory=Kontakty według kategorii
+MailingModuleDescContactsByFunction=Kontakty według pozycji
+MailingModuleDescEmailsFromFile=E-maile z pliku
+MailingModuleDescEmailsFromUser=E-maile wprowadzone przez użytkownika
+MailingModuleDescDolibarrUsers=Użytkownicy z e-mailami
+MailingModuleDescThirdPartiesByCategories=Strony trzecie (według kategorii)
+SendingFromWebInterfaceIsNotAllowed=Wysyłanie z interfejsu internetowego jest niedozwolone.
+EmailCollectorFilterDesc=Aby odebrać e-mail, wszystkie filtry muszą być zgodne
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linia w pliku %s
 RecipientSelectionModules=Definiowane wnioski dla wybranych odbiorców
 MailSelectedRecipients=Wybrani odbiorcy
 MailingArea=Obszar mailingów
-LastMailings=Latest %s emailings
+LastMailings=Najnowsze wiadomości e-mail %s
 TargetsStatistics=Celów statystycznych
 NbOfCompaniesContacts=Unikalne kontakty firm
 MailNoChangePossible=Odbiorcy dla potwierdzonych mailingów nie mogą być zmienieni
 SearchAMailing=Szukaj mailingu
 SendMailing=Wyślij mailing
 SentBy=Wysłane przez
-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=Wysyłanie wiadomości e-mail można wykonać z wiersza poleceń. Poproś administratora serwera o uruchomienie następującego polecenia, aby wysłać wiadomość e-mail do wszystkich odbiorców:
 MailingNeedCommand2=Możesz jednak wysłać je w sieci poprzez dodanie parametru MAILING_LIMIT_SENDBYWEB o wartości max liczba wiadomości e-mail, który chcesz wysłać przez sesji.
-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=Jeśli chcesz wysyłać e-maile bezpośrednio z tego ekranu, potwierdź, że na pewno chcesz teraz wysyłać e-maile z przeglądarki?
 LimitSendingEmailing=Uwaga: Wysyłanie Emailings z interfejsu WWW jest wykonywana w kilku czasach ze względów bezpieczeństwa oraz limitu <b>czasu,% s</b> odbiorców jednocześnie dla każdej sesji wysyłającego.
 TargetsReset=Wyczyść listę
 ToClearAllRecipientsClickHere=Aby wyczyścić odbiorców tego e-maila na listę, kliknij przycisk
@@ -116,64 +116,64 @@ ToAddRecipientsChooseHere=Aby dodać odbiorców, wybierz w tych wykazach
 NbOfEMailingsReceived=Masowe mailingi otrzymane
 NbOfEMailingsSend=Masowe mailingi wysłane
 IdRecord=ID rekordu
-DeliveryReceipt=Delivery Ack.
+DeliveryReceipt=Potwierdzenie dostawy.
 YouCanUseCommaSeparatorForSeveralRecipients=Możesz używać <b>przecinka</b> aby określić kilku odbiorców.
 TagCheckMail=Obserwuj otwarcie maila
 TagUnsubscribe=Link do wypisania
-TagSignature=Signature of sending user
-EMailRecipient=Recipient Email
-TagMailtoEmail=Recipient Email (including html "mailto:" link)
+TagSignature=Podpis użytkownika wysyłającego
+EMailRecipient=Email odbiorcy
+TagMailtoEmail=Adres e-mail odbiorcy (w tym link html „mailto:”)
 NoEmailSentBadSenderOrRecipientEmail=Nie wysłano wiadomości email. Zły email nadawcy lub odbiorcy. Sprawdź profil użytkownika.
 # Module Notifications
 Notifications=Powiadomienia
-NotificationsAuto=Notifications Auto.
-NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
-ANotificationsWillBeSent=1 automatic notification will be sent by email
-SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
-AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+NotificationsAuto=Powiadomienia Auto.
+NoNotificationsWillBeSent=Dla tego typu wydarzeń i firmy nie są planowane żadne automatyczne powiadomienia e-mail
+ANotificationsWillBeSent=1 automatyczne powiadomienie zostanie wysłane e-mailem
+SomeNotificationsWillBeSent=%s automatyczne powiadomienia będą wysyłane pocztą elektroniczną
+AddNewNotification=Zasubskrybuj nowe automatyczne powiadomienie e-mail (cel / wydarzenie)
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Konfiguracja poczty e-mail wysyłającego musi być połączone z '% s'. Tryb ten może być wykorzystywany do wysyłania masowego wysyłania.
 MailSendSetupIs2=Najpierw trzeba przejść, z konta administratora, w menu% sHome - Ustawienia - e-maile% s, aby zmienić parametr <strong>'% s'</strong> na tryb '% s' używać. W tym trybie można wprowadzić ustawienia serwera SMTP dostarczonych przez usługodawcę internetowego i używać funkcji e-maila Mszę św.
 MailSendSetupIs3=Jeśli masz jakieś pytania na temat konfiguracji serwera SMTP, możesz zapytać %s.
 YouCanAlsoUseSupervisorKeyword=Możesz również dodać <strong>__SUPERVISOREMAIL__</strong> słów kluczowych posiadania e-mail są wysyłane do opiekuna użytkownika (działa tylko wtedy, gdy e-mail jest określona w tym przełożonego)
 NbOfTargetedContacts=Aktualna liczba ukierunkowanych maili kontaktowych
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
-MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
-AdvTgtSearchIntHelp=Use interval to select int or float value
-AdvTgtMinVal=Minimum value
-AdvTgtMaxVal=Maximum value
-AdvTgtSearchDtHelp=Use interval to select date value
-AdvTgtStartDt=Start dt.
-AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
-AdvTgtTypeOfIncude=Type of targeted email
-AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+UseFormatFileEmailToTarget=Zaimportowany plik musi mieć format <strong> email; imię; imię; inny </strong>
+UseFormatInputEmailToTarget=Wpisz ciąg w formacie <strong> email; imię; imię; inny </strong>
+MailAdvTargetRecipients=Odbiorcy (wybór zaawansowany)
+AdvTgtTitle=Wypełnij pola wejściowe, aby wstępnie wybrać strony trzecie lub kontakty / adresy docelowe
+AdvTgtSearchTextHelp=Użyj %% jako symboli wieloznacznych. Na przykład, aby znaleźć wszystkie elementy, takie jak <b> jean, joe, jim </b>, możesz wprowadzić <b> j%% </b>, możesz również użyć; jako separator wartości i użyj! z wyjątkiem tej wartości. Na przykład <b> jean; joe; jim%%;! Jimo;! Jima%% </b> będzie kierowany do wszystkich jean, joe, zacznij od jima, ale nie jimo i nie wszystkiego, co zaczyna się od jimy
+AdvTgtSearchIntHelp=Użyj interwału, aby wybrać wartość int lub float
+AdvTgtMinVal=Minimalna wartość
+AdvTgtMaxVal=Maksymalna wartość
+AdvTgtSearchDtHelp=Użyj interwału, aby wybrać wartość daty
+AdvTgtStartDt=Rozpocznij dt.
+AdvTgtEndDt=Koniec dt.
+AdvTgtTypeOfIncudeHelp=Docelowy adres e-mail strony trzeciej i adres e-mail kontaktu z osobą trzecią lub po prostu adres e-mail strony trzeciej lub po prostu adres e-mail kontaktowy
+AdvTgtTypeOfIncude=Rodzaj docelowej wiadomości e-mail
+AdvTgtContactHelp=Używaj tylko wtedy, gdy kierujesz kontakt na „Typ docelowej wiadomości e-mail”
 AddAll=Dodaj wszystkie
 RemoveAll=Usuń wszystkie
-ItemsCount=Item(s)
-AdvTgtNameTemplate=Filter name
-AdvTgtAddContact=Add emails according to criteria
-AdvTgtLoadFilter=Load filter
-AdvTgtDeleteFilter=Delete filter
-AdvTgtSaveFilter=Save filter
-AdvTgtCreateFilter=Create filter
-AdvTgtOrCreateNewFilter=Name of new filter
-NoContactWithCategoryFound=No contact/address with a category found
-NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing emails
-InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
-DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
+ItemsCount=Przedmiotów)
+AdvTgtNameTemplate=Nazwa filtra
+AdvTgtAddContact=Dodaj e-maile zgodnie z kryteriami
+AdvTgtLoadFilter=Wczytaj filtr
+AdvTgtDeleteFilter=Usuń filtr
+AdvTgtSaveFilter=Zapisz filtr
+AdvTgtCreateFilter=Utwórz filtr
+AdvTgtOrCreateNewFilter=Nazwa nowego filtra
+NoContactWithCategoryFound=Nie znaleziono kontaktu / adresu z kategorią
+NoContactLinkedToThirdpartieWithCategoryFound=Nie znaleziono kontaktu / adresu z kategorią
+OutGoingEmailSetup=Wychodzące e-maile
+InGoingEmailSetup=Przychodzące e-maile
+OutGoingEmailSetupForEmailing=Wychodzące wiadomości e-mail (dla modułu %s)
+DefaultOutgoingEmailSetup=Taka sama konfiguracja jak w przypadku globalnej konfiguracji poczty wychodzącej
 Information=Informacja
-ContactsWithThirdpartyFilter=Contacts with third-party filter
-Unanswered=Unanswered
-Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
-DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
-DefaultStatusEmptyMandatory=Empty but mandatory
+ContactsWithThirdpartyFilter=Kontakty z filtrem innej firmy
+Unanswered=Bez odpowiedzi
+Answered=Odpowiedział
+IsNotAnAnswer=Brak odpowiedzi (pierwszy e-mail)
+IsAnAnswer=To odpowiedź na pierwszą wiadomość e-mail
+RecordCreatedByEmailCollector=Rekord utworzony przez moduł zbierający wiadomości e-mail %s z wiadomości e-mail %s
+DefaultBlacklistMailingStatus=Domyślny status kontaktu dla odrzucenia zbiorczego wysyłania e-maili
+DefaultStatusEmptyMandatory=Puste, ale obowiązkowe
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 582ec9ed214..703c144addc 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Zapisz i nowe
 TestConnection=Test połączenia
 ToClone=Duplikuj
 ConfirmCloneAsk=Czy jesteś pewny, chcesz sklonować objekt<b>%s</b>?
-ConfirmClone=Wybierz datę którą chcesz sklonować:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Brak zdefiniowanych danych do zduplikowania.
 Of=z
 Go=Idź
@@ -246,7 +246,7 @@ DefaultModel=Domyślny szablon dokumentu
 Action=Działanie
 About=O
 Number=Liczba
-NumberByMonth=Ilość na miesiąc
+NumberByMonth=Total reports by month
 AmountByMonth=Kwota na miesiąc
 Numero=Numer
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobajtów
 MegaBytes=MB
 GigaBytes=GB
 TeraBytes=Terabajtów
-UserAuthor=Utworzył
-UserModif=Ostatnio modyfikował
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Przez
 From=Od
 FromDate=Z
 FromLocation=Z
-at=w
 to=do
 To=do
+ToDate=do
+ToLocation=do
+at=w
 and=i
 or=lub
 Other=Inny
@@ -843,7 +845,7 @@ XMoreLines=%s lini(e) ukryte
 ShowMoreLines=Pokaż więcej / mniej linii
 PublicUrl=Publiczny URL
 AddBox=Dodaj skrzynke
-SelectElementAndClick=Wybierz element i kliknij %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Wydrukuj plik %s
 ShowTransaction=Pokaż wpisy na koncie bankowym
 ShowIntervention=Pokaż interwencję
@@ -854,8 +856,8 @@ Denied=Zabroniony
 ListOf=Lista %s
 ListOfTemplates=Lista szablonów
 Gender=Płeć
-Genderman=Mężczyzna
-Genderwoman=Kobieta
+Genderman=Male
+Genderwoman=Female
 Genderother=Inne
 ViewList=Widok listy
 ViewGantt=Widok Gantta
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Czy na pewno chcesz wpłynąć na tagi %s wybranych rek
 CategTypeNotFound=Nie znaleziono typu tagu dla typu rekordów
 CopiedToClipboard=Skopiowane do schowka
 InformationOnLinkToContract=Kwota ta to tylko suma wszystkich pozycji zamówienia. Nie bierze się pod uwagę żadnego pojęcia czasu.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 2089442f991..017167beee0 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Inny członek <b>(nazwa: %s,</b> zalo
 ErrorUserPermissionAllowsToLinksToItselfOnly=Ze względów bezpieczeństwa, musisz być przyznane uprawnienia do edycji wszystkich użytkowników, aby można było powiązać członka do użytkownika, który nie jest twoje.
 SetLinkToUser=Link do użytkownika Dolibarr
 SetLinkToThirdParty=Link do Dolibarr trzeciej
-MembersCards=Członkowie wydruku karty
+MembersCards=Business cards for members
 MembersList=Lista członków
 MembersListToValid=Lista szkiców członków (do zatwierdzenia)
 MembersListValid=Wykaz ważnych członków
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Użytkownicy z subskrypcji otrzymują
 MembersWithSubscriptionToReceiveShort=Subskrypcja do odbioru
 DateSubscription=Data subskrypcji
 DateEndSubscription=Data końca subskrypcji
-EndSubscription=Koniec subskrypcji
+EndSubscription=Subscription Ends
 SubscriptionId=ID subskrypcji
 WithoutSubscription=Bez abonamentu
 MemberId=ID członka
@@ -83,10 +83,10 @@ WelcomeEMail=Powitalny e-mail
 SubscriptionRequired=Subskrypcja wymagana
 DeleteType=Usuń
 VoteAllowed=Głosowanie dozwolone
-Physical=Fizyczne
-Moral=Moralny
-MorAndPhy=Moralne i fizyczne
-Reenable=Ponownym włączeniu
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Wyklucz członka
 ConfirmExcludeMember=Czy na pewno chcesz wykluczyć tego członka?
 ResiliateMember=Zakończ członka
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Użytkownicy statystyki według kraju
 MembersStatisticsByState=Użytkownicy statystyki na State / Province
 MembersStatisticsByTown=Użytkownicy statystyki na miasto
 MembersStatisticsByRegion=Użytkownicy statystyki regionu
-NbOfMembers=Liczba członków
-NbOfActiveMembers=Liczba obecnych aktywnych członków
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Żadna potwierdzona znaleziono użytkowników
-MembersByCountryDesc=Ten ekran pokaże statystyki członków przez poszczególne kraje. Graficzny zależy jednak na Google usługi online grafów i jest dostępna tylko wtedy, gdy połączenie internetowe działa.
-MembersByStateDesc=Ten ekran pokazać Wam statystyki członkom przez stan / prowincje / Kanton.
-MembersByTownDesc=Ten ekran pokaże statystyki członkom przez miasto.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Wybierz statystyki chcesz czytać ...
 MenuMembersStats=Statystyka
-LastMemberDate=Ostatnia data członka
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Data ostatniej subskrypcji
-MemberNature=Charakter członka
-MembersNature=Charakter członków
-Public=Informacje są publiczne
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Nowy członek dodaje. Oczekuje na zatwierdzenie
 NewMemberForm=Nowa forma członkiem
-SubscriptionsStatistics=Statystyki dotyczące subskrypcji
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Liczba abonamentów
-AmountOfSubscriptions=Kwota abonamentu
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Obrót (dla firmy) lub Budżet (na fundamencie)
 DefaultAmount=Domyślną kwotę abonamentu
 CanEditAmount=Użytkownik może wybrać / edytować kwotę swojej subskrypcji
 MEMBER_NEWFORM_PAYONLINE=Przejdź na zintegrowanej stronie płatności online
 ByProperties=Przez naturę
 MembersStatisticsByProperties=Statystyki członków według natury
-MembersByNature=Ten ekran wyświetli statystyki dotyczące członków przez naturę.
-MembersByRegion=Ten ekran wyświetli statystyki dotyczące członków w regionie.
 VATToUseForSubscriptions=Stawka VAT użyć do subskrypcji
 NoVatOnSubscription=Brak podatku VAT w przypadku subskrypcji
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt stosowany do linii subskrypcji do faktury:% s
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index 4df3891247e..70b1bea9bee 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Lista zdefiniowanych uprawnień
 SeeExamples=Zobacz przykłady tutaj
 EnabledDesc=Warunek, aby to pole było aktywne (Przykłady: 1 lub $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Czy pole jest widoczne? (Przykłady: 0 = niewidoczne, 1 = widoczne na liście i utwórz / zaktualizuj / wyświetl formularze, 2 = widoczne tylko na liście, 3 = widoczne tylko w formularzu tworzenia / aktualizacji / przeglądania (nie na liście), 4 = widoczne na liście i tylko aktualizuj / wyświetl formularz (nie twórz), 5 = widoczne tylko w formularzu widoku końca listy (nie tworzy, nie aktualizuje). <br> <br> Użycie wartości ujemnej oznacza, że pole nie jest domyślnie wyświetlane na liście, ale można je wybrać do przeglądania). <br> <br> Może to być wyrażenie, na przykład: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br> ($ user- 1 holiday?
-DisplayOnPdfDesc=Wyświetlaj to pole w kompatybilnych dokumentach PDF, możesz zarządzać pozycją za pomocą pola "Pozycja". <br/> Obecnie znane modele kompatybilne PDF są: Eratostenes (kolejność), Espadon (statek), gąbka (faktury), cyjan (PROPAL / cytat), Cornas (kolejność dostawca) <br/> <br/> <strong> Dla dokumentu: nie </strong> <br/> 0 = Wyświetlane <br/> 1 = wskazanie <br/> 2 = wskazanie tylko jeśli nie jest pusta <br/> <br/> <strong> dla linii dokument: </strong> <br/> 0 = nie wyświetlany <br/> 1 = wyświetlane w kolumnie <br/> 3 = wyświetlacza w opisie linii kolumny po opisie <br/> 4 = wyświetlacza w opisie kolumnie za opis tylko wtedy, gdy nie jest pusty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Wyświetl na dokumencie PDF
 IsAMeasureDesc=Czy wartość pola można skumulować, aby uzyskać sumę na liście? (Przykłady: 1 lub 0)
 SearchAllDesc=Czy to pole jest używane do wyszukiwania za pomocą narzędzia szybkiego wyszukiwania? (Przykłady: 1 lub 0)
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index 382cac1dde8..bb578a28841 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Zainstaluj lub włącz bibliotekę GD w instalacji PHP, aby
 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=Demo Dolibarr ERP/CRM
 StatsByNumberOfUnits=Statystyki dla sum ilości produktów / usług
-StatsByNumberOfEntities=Statystyki dotyczące liczby podmiotów polecających (nr faktury lub zamówienia ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Liczba propozycji
 NumberOfCustomerOrders=Liczba zamówień sprzedaży
 NumberOfCustomerInvoices=Ilość faktur klientów
@@ -289,4 +289,4 @@ PopuProp=Produkty / usługi według popularności w propozycjach
 PopuCom=Produkty / usługi według popularności w Zamówieniach
 ProductStatistics=Statystyki produktów / usług
 NbOfQtyInOrders=Ilość w zamówieniach
-SelectTheTypeOfObjectToAnalyze=Wybierz typ obiektu do analizy ...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/pl_PL/partnership.lang b/htdocs/langs/pl_PL/partnership.lang
new file mode 100644
index 00000000000..6b35205dbda
--- /dev/null
+++ b/htdocs/langs/pl_PL/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Data rozpoczęcia
+DatePartnershipEnd=Data zakończenia
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Szkic
+PartnershipAccepted = Zaakceptowane
+PartnershipRefused = Odrzucony
+PartnershipCanceled = Anulowany
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
index 8fd61acd09e..710b09cf60b 100644
--- a/htdocs/langs/pl_PL/productbatch.lang
+++ b/htdocs/langs/pl_PL/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Numer seryjny %s jest już używany dla produktu %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Opcje automatycznego generowania produktów wsadowych zarządzanych partiami
 BatchSerialNumberingModules=Opcje automatycznego generowania produktów wsadowych zarządzanych według numerów seryjnych
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 7abe05286d0..b6a183b57f2 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Usługi tylko na sprzedaż
 ServicesOnPurchaseOnly=Usługi tylko do zakupu
 ServicesNotOnSell=Usługi nie na sprzedaż i nie do zakupu
 ServicesOnSellAndOnBuy=Usługi na sprzedaż i do zakupu
-LastModifiedProductsAndServices=Najnowsze zmodyfikowane produkty / usługi %s
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Ostatnie %s zarejestrowanych produktów
 LastRecordedServices=Ostatnie %s zarejestrowanych usług
 CardProduct0=Produkt
@@ -73,12 +73,12 @@ SellingPrice=Cena sprzedaży
 SellingPriceHT=Cena sprzedaży (Bez VAT)
 SellingPriceTTC=Cena sprzedaży (z podatkiem)
 SellingMinPriceTTC=Minimalna cena sprzedaży (z podatkiem)
-CostPriceDescription=To pole ceny (bez podatku) może służyć do przechowywania średniej kwoty, jaką ten produkt kosztuje dla Twojej firmy. Może to być każda cena, którą sam obliczysz, na przykład ze średniej ceny zakupu plus średni koszt produkcji i dystrybucji.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Wartość tę można wykorzystać do obliczenia depozytu zabezpieczającego.
 SoldAmount=Sprzedana ilość
 PurchasedAmount=Zakupiona ilość
 NewPrice=Nowa cena
-MinPrice=Min. Cena sprzedaży
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edytuj etykietę ceny sprzedaży
 CantBeLessThanMinPrice=Cena sprzedaży nie może być niższa niż minimalna dopuszczalna dla tego produktu (%s bez podatku). Ten komunikat może się również pojawić po wpisaniu zbyt wysokiego rabatu.
 ContractStatusClosed=Zamknięte
@@ -157,11 +157,11 @@ ListServiceByPopularity=Wykaz usług ze względu na popularność
 Finished=Produkty wytwarzane
 RowMaterial=Surowiec
 ConfirmCloneProduct=Czy na pewno chcesz powielić produkt lub usługę <b>%s</b>?
-CloneContentProduct=Sklonuj wszystkie główne informacje o produkcie / usłudze
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Powiel ceny
-CloneCategoriesProduct=Klonuj tagi / kategorie połączone
-CloneCompositionProduct=Sklonuj wirtualny produkt / usługę
-CloneCombinationsProduct=Powiel warianty produktu
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Ten produkt jest używany
 NewRefForClone=Referencja nowego produktu/usługi
 SellingPrices=Cena sprzedaży
@@ -170,12 +170,12 @@ CustomerPrices=Ceny klienta
 SuppliersPrices=Ceny dostawców
 SuppliersPricesOfProductsOrServices=Ceny dostawców (produktów lub usług)
 CustomCode=Cła | Towar | Kod HS
-CountryOrigin=Kraj pochodzenia
-RegionStateOrigin=Region pochodzenia
-StateOrigin=Stan | prowincja
-Nature=Charakter produktu (materiał / wykończenie)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Charakter produktu
-NatureOfProductDesc=Surowiec lub gotowy produkt
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Krótka etykieta
 Unit=Jednostka
 p=jedn.
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 2ad158c5d84..35a50d977a1 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Kontakty projektu
 ProjectsImContactFor=Projekty, dla których jestem jawnym kontaktem
 AllAllowedProjects=Cały projekt, który mogę przeczytać (mój + publiczny)
 AllProjects=Wszystkie projekty
-MyProjectsDesc=Ten widok jest ograniczony do projektów, w których jesteś osobą kontaktową
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Ten widok przedstawia wszystkie projekty, które możesz przeczytać.
 TasksOnProjectsPublicDesc=Ten widok przedstawia wszystkie zadania w projektach, które możesz czytać.
 ProjectsPublicTaskDesc=Ten widok przedstawia wszystkie projekty i zadania, które są dozwolone do czytania.
 ProjectsDesc=Ten widok przedstawia wszystkie projekty (twoje uprawnienia użytkownika pozwalają wyświetlać wszystko).
 TasksOnProjectsDesc=Ten widok przedstawia wszystkie zadania we wszystkich projektach (Twoje uprawnienia użytkownika dają Ci uprawnienia do przeglądania wszystkiego).
-MyTasksDesc=Ten widok jest ograniczony do projektów lub zadań, w sprawie których jesteś osobą kontaktową
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Tylko otwarte projekty są widoczne (szkice projektów lub zamknięte projekty są niewidoczne)
 ClosedProjectsAreHidden=Zamknięte projekty nie są widoczne.
 TasksPublicDesc=Ten widok przedstawia wszystkie projekty i zadania, które możesz przeczytać.
 TasksDesc=Ten widok przedstawia wszystkie projekty i zadania (twoje uprawnienia mają dostępu do wglądu we wszystko).
 AllTaskVisibleButEditIfYouAreAssigned=Wszystkie zadania dla zakwalifikowanych projektów są widoczne, ale możesz wprowadzić czas tylko dla zadania przypisanego do wybranego użytkownika. Przypisz zadanie, jeśli chcesz wprowadzić na nim czas.
-OnlyYourTaskAreVisible=Widoczne są tylko zadania przypisane do Ciebie. Przydziel sobie zadanie, jeśli nie jest widoczne i musisz wpisać na nim czas.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Zadania projektów
 ProjectCategories=Tagi / kategorie projektów
 NewProject=Nowy projekt
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Nie dopisane do zadania
 NoUserAssignedToTheProject=Brak użytkowników przypisanych do tego projektu
 TimeSpentBy=Czas spędzony przez
 TasksAssignedTo=Zadania przypisane do
-AssignTaskToMe=Przypisz zadanie do mnie
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Przypisz zadanie do %s
 SelectTaskToAssign=Wybierz zadanie do przypisania ...
 AssignTask=Przydzielać
diff --git a/htdocs/langs/pl_PL/recruitment.lang b/htdocs/langs/pl_PL/recruitment.lang
index d1f573b8bf9..3dedf38eb1d 100644
--- a/htdocs/langs/pl_PL/recruitment.lang
+++ b/htdocs/langs/pl_PL/recruitment.lang
@@ -18,59 +18,59 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = Rekrutacja
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Zarządzaj i śledź kampanie rekrutacyjne na nowe stanowiska pracy
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
+RecruitmentSetup = Konfiguracja rekrutacji
 Settings = Ustawienia
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetupPage = Wpisz tutaj ustawienia głównych opcji modułu rekrutacyjnego
+RecruitmentArea=Obszar rekrutacji
+PublicInterfaceRecruitmentDesc=Publiczne strony ofert pracy to publiczne adresy URL służące do wyświetlania otwartych ofert pracy i odpowiadania na nie. Dla każdego otwartego stanowiska istnieje jeden link, znajdujący się w każdym rekordzie pracy.
+EnablePublicRecruitmentPages=Włącz publiczne strony otwartych ofert pracy
 
 #
 # About page
 #
 About = O
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
+RecruitmentAbout = O rekrutacji
+RecruitmentAboutPage = Rekrutacja o stronie
+NbOfEmployeesExpected=Oczekiwana liczba pracowników
+JobLabel=Etykieta stanowiska pracy
+WorkPlace=Miejsce pracy
+DateExpected=Oczekiwana data
+FutureManager=Przyszły menedżer
+ResponsibleOfRecruitement=Odpowiedzialny za rekrutację
+IfJobIsLocatedAtAPartner=Jeśli praca jest zlokalizowana w miejscu partnerskim
 PositionToBeFilled=Stanowisko
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+PositionsToBeFilled=Stanowiska pracy
+ListOfPositionsToBeFilled=Lista stanowisk pracy
+NewPositionToBeFilled=Nowe stanowiska pracy
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
-JobPositions=Job positions
-RecruitmentCandidatures=Applications
-InterviewToDo=Interview to do
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
-MakeOffer=Make an offer
+JobOfferToBeFilled=Stanowisko do obsadzenia
+ThisIsInformationOnJobPosition=Informacje o stanowisku do obsadzenia
+ContactForRecruitment=Kontakt w sprawie rekrutacji
+EmailRecruiter=Rekruter e-mailowy
+ToUseAGenericEmail=Aby użyć ogólnej wiadomości e-mail. Jeśli nie zostanie zdefiniowany, zostanie użyty adres e-mail osoby odpowiedzialnej za rekrutację
+NewCandidature=Nowa aplikacja
+ListOfCandidatures=Lista aplikacji
+RequestedRemuneration=Żądane wynagrodzenie
+ProposedRemuneration=Proponowane wynagrodzenie
+ContractProposed=Proponowana umowa
+ContractSigned=Umowa podpisana
+ContractRefused=Umowa została odrzucona
+RecruitmentCandidature=Podanie
+JobPositions=Stanowiska pracy
+RecruitmentCandidatures=Aplikacje
+InterviewToDo=Wywiad do zrobienia
+AnswerCandidature=Odpowiedź aplikacji
+YourCandidature=Twoje zgłoszenie
+YourCandidatureAnswerMessage=Dziękuję za zgłoszenie. <br> ...
+JobClosedTextCandidateFound=Stanowisko jest zamknięte. Stanowisko zostało obsadzone.
+JobClosedTextCanceled=Stanowisko jest zamknięte.
+ExtrafieldsJobPosition=Atrybuty uzupełniające (stanowiska pracy)
+ExtrafieldsApplication=Complementary attributes (job applications)
+MakeOffer=Złożyć ofertę
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index 1b1f4fc5baf..0b019a76f32 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -6,7 +6,7 @@ AllSendings=Wszystkie wysyłki
 Shipment=Transport
 Shipments=Transporty
 ShowSending=Pokaż przesyłki
-Receivings=Delivery Receipts
+Receivings=Potwierdzenia dostaw
 SendingsArea=Obszar wysyłek
 ListOfSendings=Lista wysyłek
 SendingMethod=Sposób wysyłki
@@ -18,16 +18,16 @@ SendingCard=Karta przesyłki
 NewSending=Nowy transport
 CreateShipment=Utwórz transport
 QtyShipped=Wysłana ilość
-QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
+QtyShippedShort=Ilość statków.
+QtyPreparedOrShipped=Ilość przygotowana lub wysłana
 QtyToShip=Ilość do wysłania
-QtyToReceive=Qty to receive
+QtyToReceive=Ilość do odbioru
 QtyReceived=Ilość otrzymanych
-QtyInOtherShipments=Qty in other shipments
+QtyInOtherShipments=Ilość w innych przesyłkach
 KeepToShip=Pozostają do wysyłki
-KeepToShipShort=Remain
+KeepToShipShort=Pozostawać
 OtherSendingsForSameOrder=Inne wysyłki do tego zamówienia
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsAndReceivingForSameOrder=Przesyłki i pokwitowania dotyczące tego zamówienia
 SendingsToValidate=Transporty do zatwierdzenia
 StatusSendingCanceled=Anulowany
 StatusSendingCanceledShort=Anulowany
@@ -43,34 +43,34 @@ ConfirmValidateSending=Czy potwierdzić tą wysyłkę z numerem referencyjnym <b
 ConfirmCancelSending=Czy anulować tą wysyłkę?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Ostrzeżenie nie produktów oczekujących na wysłanie.
-StatsOnShipmentsOnlyValidated=Statystyki prowadzone w sprawie przesyłania tylko potwierdzone. Data używany jest data uprawomocnienia przesyłki (planowanym terminem dostawy nie zawsze jest znana).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planowana data dostawy
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
+RefDeliveryReceipt=Zwróć potwierdzenie dostawy
+StatusReceipt=Potwierdzenie statusu dostawy
 DateReceived=Data otrzymania dostawy
-ClassifyReception=Classify reception
-SendShippingByEMail=Send shipment by email
+ClassifyReception=Klasyfikuj odbiór
+SendShippingByEMail=Wyślij przesyłkę e-mailem
 SendShippingRef=Złożenie przesyłki% s
 ActionsOnShipping=Zdarzenia na wysyłce
 LinkToTrackYourPackage=Link do strony śledzenia twojej paczki
 ShipmentCreationIsDoneFromOrder=Na ta chwilę, tworzenie nowej wysyłki jest możliwe z karty zamówienia.
 ShipmentLine=Linia Przesyłka
-ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
-ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
-ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
-NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+ProductQtyInCustomersOrdersRunning=Ilość produktów z otwartych zamówień sprzedaży
+ProductQtyInSuppliersOrdersRunning=Ilość produktów z otwartych zamówień zakupu
+ProductQtyInShipmentAlreadySent=Ilość produktu z otwartego zamówienia sprzedaży już wysłanego
+ProductQtyInSuppliersShipmentAlreadyRecevied=Ilość produktów z otwartych zamówień już otrzymanych
+NoProductToShipFoundIntoStock=W magazynie nie znaleziono produktu do wysłania <b> %s </b>. Popraw zapasy lub wróć, aby wybrać inny magazyn.
 WeightVolShort=Waga/Volumen
 ValidateOrderFirstBeforeShipment=W pierwszej kolejności musisz zatwierdzić zamówienie, aby mieć możliwość utworzenia wysyłki.
 
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Więcej kompletny dokument model dostawy wpływy (logo. ..)
-DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
+DocumentModelStorm=Bardziej kompletny model dokumentów potwierdzających dostawę i kompatybilność pól zewnętrznych (logo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Stała EXPEDITION_ADDON_NUMBER nie zdefiniowano
 SumOfProductVolumes=Suma wolumenów
 SumOfProductWeights=Suma wag produktów
 
 # warehouse details
 DetailWarehouseNumber= Szczegóły magazynu
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseFormat= W: %s (ilość: %d)
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 09b5be9369f..6ad6f2f915e 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Nie gotowych produktów dla tego obiektu. Więc ni
 DispatchVerb=Wysyłka
 StockLimitShort=Limit zapasu przy którym wystąpi alarm
 StockLimit=Limit zapasu przy którym wystąpi alarm
-StockLimitDesc=(pusty) oznacza brak ostrzeżenia. <br> 0 może służyć jako ostrzeżenie, gdy tylko zapasy się wyczerpią.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Zapas fizyczny
 RealStock=Realny magazyn
 RealStockDesc=Fizyczne / rzeczywiste zapasy to stany znajdujące się obecnie w magazynach.
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index e473f26d540..680bd38b03e 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Hasło zmieniono na: %s
 SubjectNewPassword=Twoje nowe hasło dla %s
 GroupRights=Uprawnienia grupy
 UserRights=Uprawnienia użytkownika
+Credentials=Credentials
 UserGUISetup=Ustawienia Wyświetlacza Użytkownika
 DisableUser=Wyłączone
 DisableAUser=Wyłącz użytkownika
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Użyj pola do zmiany Rodzaj
 OpenIDURL=Adres URL OpenID
 LoginUsingOpenID=Użyj do logowania OpenID
 WeeklyHours=Przepracowane godziny (w tygodniu)
-ExpectedWorkedHours=Oczekiwana ilość godzin przepracowanych w tygodniu
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Kolor użytkownika
 DisabledInMonoUserMode=Wyłączone w trybie konserwacji
 UserAccountancyCode=Kod księgowy użytkownika
@@ -115,7 +116,7 @@ DateOfEmployment=Data zatrudnienia
 DateEmployment=Zatrudnienie
 DateEmploymentstart=Data rozpoczęcia zatrudnienia
 DateEmploymentEnd=Data zakończenia zatrudnienia
-RangeOfLoginValidity=Zakres dat ważności logowania
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Nie możesz wyłączyć własnego rekordu użytkownika
 ForceUserExpenseValidator=Wymuś walidator raportu z wydatków
 ForceUserHolidayValidator=Wymuś walidator prośby o opuszczenie
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 28d79383aad..7548613224f 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Zdefiniuj listę wszystkich dostępn
 GenerateSitemaps=Wygeneruj plik mapy witryny internetowej
 ConfirmGenerateSitemaps=Jeśli potwierdzisz, usuniesz istniejący plik mapy witryny ...
 ConfirmSitemapsCreation=Potwierdź wygenerowanie mapy witryny
-SitemapGenerated=Wygenerowano mapę witryny
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/pt_AO/admin.lang b/htdocs/langs/pt_AO/admin.lang
deleted file mode 100644
index cac0d063f48..00000000000
--- a/htdocs/langs/pt_AO/admin.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
diff --git a/htdocs/langs/pt_AO/cron.lang b/htdocs/langs/pt_AO/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/pt_AO/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index b169f140496..27f15f2e164 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -181,7 +181,6 @@ NoNewRecordSaved=Não há mais registro para lançar
 ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualquer conta da Contabilidade
 ChangeBinding=Alterar a vinculação
 Accounted=Contas no livro de contas
-NotYetAccounted=Ainda não contabilizado no Livro de Registro
 ShowTutorial=Mostrar tutorial
 NotReconciled=Não conciliada
 AddAccountFromBookKeepingWithNoCategories=Conta disponível porém ainda não no grupo personalizado
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index eb7f48d64ed..90187accd2c 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -181,6 +181,7 @@ SeeInMarkerPlace=Ver na Loja Virtual
 SeeSetupOfModule=Veja configuração do módulo %s
 GoModuleSetupArea=Para implantar/instalar um novo módulo, vá para a área de configuração do módulo: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, o site oficial para baixar módulos externos.
+DoliPartnersDesc=Lista de empresas que fornecem módulos ou recursos desenvolvidos de maneira personalizada. <br>Nota: como Dolibarr é um aplicativo de código aberto, <i>qualquer pessoa </i>com experiência em programação PHP deve ser capaz de desenvolver um módulo.
 DevelopYourModuleDesc=Algumas soluções para o desenvolvimento do seu próprio módulo...
 RelativeURL=URL relativo
 BoxesAvailable=Widgets disponíveis
@@ -327,6 +328,7 @@ ComputedpersistentDesc=Campos extra computados serão armazenados no banco de da
 ExtrafieldParamHelpselect=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> código3, valor3 <br>...<br><br> Para que a lista dependa de outra lista de atributos complementares: <br> 1, valor1 | <i>opções_ pai_list_code</i> : parent_key <br> 2, valor2 | <i>opções_ pai_list_code</i> : parent_key <br><br> Para ter a lista dependendo de outra lista: <br> 1, valor1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
+ExtrafieldParamHelplink=Os parâmetros devem ser ObjectName: Classpath<br>Syntax: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Mantenha em branco para um separador simples<br>Defina como 1 para um separador de recolhimento (aberto por padrão para nova sessão e, em seguida, o status é mantido para cada sessão do usuário)<br> Defina como 2 para um separador de recolhimento (recolhido por padrão para nova sessão e, em seguida, o status é mantido antes de cada sessão do usuário)
 LibraryToBuildPDF=Biblioteca usada para a geração de PDF
 LocalTaxDesc=Alguns países podem aplicar dois ou três impostos em cada linha da fatura. Se este for o caso, escolha o tipo para o segundo e terceiro imposto e sua taxa. Tipo possível são: <br> 1: imposto local aplicável a produtos e serviços sem IVA (a taxa local é calculada sobre o valor sem impostos) <br> 2: imposto local aplicável a produtos e serviços, incluindo IVA (a taxa local  é calculada no montante + imposto principal) <br> 3: imposto local aplicável a produtos sem IVA (a taxa local é calculada sobre o valor sem impostos) <br> 4: imposto local aplicável a produtos, incluindo IVA (a taxa local é calculada sobre o valor + IVA principal) <br> 5: imposto local aplicável a serviços sem IVA (a taxa local é calculado sobre o valor sem impostos) <br> 6: imposto local aplicável a serviços, incluindo IVA (a taxa local  é calculada sobre o valor + imposto)
@@ -361,7 +363,13 @@ ModuleCompanyCodeCustomerDigitaria=%s seguido pelo nome do cliente truncado pelo
 ModuleCompanyCodeSupplierDigitaria=%s seguido pelo nome do fornecedor truncado pelo número de caracteres: %s para o código contábil do fornecedor.
 Use3StepsApproval=Por padrão, os Pedidos de Compra necessitam ser criados e aprovados por 2 usuários diferentes (uma etapa para a criação e a outra etapa para a aprovação. Note que se o usuário possui ambas permissões para criar e aprovar, uma única etapa por usuário será suficiente). Você pode pedir, com esta opção, para introduzir uma terceira etapa para aprovação por outro usuário, se o montante for superior a um determinado valor (assim 3 etapas serão necessárias : 1=validação, 2=primeira aprovação e 3=segunda aprovação se o montante for suficiente). <br>Defina como vazio se uma aprovação (2 etapas) é suficiente, defina com um valor muito baixo (0.1) se uma segunda aprovação (3 etapas) é sempre exigida.
 UseDoubleApproval=Usar uma aprovação de 3 etapas quando o valor (sem taxa) é maior do que ...
+WarningPHPMail=AVISO: A configuração para enviar e-mails do aplicativo está usando a configuração genérica padrão. Muitas vezes, é melhor configurar e-mails de saída para usar o servidor de e-mail do seu provedor de serviços de e-mail em vez da configuração padrão:
+WarningPHPMailA=- Usar o servidor do provedor de serviços de e-mail aumenta a confiabilidade do seu e-mail, por isso aumenta a entregabilidade sem ser sinalizado como SPAM
+WarningPHPMailB=- Alguns provedores de serviço de e-mail (como o Yahoo) não permitem que você envie um e-mail de outro servidor que não seja o seu próprio. Sua configuração atual usa o servidor do aplicativo para enviar e-mail e não o servidor de seu provedor de e-mail, portanto, alguns destinatários (aquele compatível com o protocolo DMARC restritivo) perguntarão ao seu provedor de e-mail se podem aceitar seu e-mail e alguns provedores de e-mail (como o Yahoo) pode responder "não" porque o servidor não é deles, então poucos de seus e-mails enviados podem não ser aceitos para entrega (tome cuidado também com a cota de envio de seu provedor de e-mail).
+WarningPHPMailC=- Usar o servidor SMTP do seu próprio provedor de serviços de e-mail para enviar e-mails também é interessante, portanto, todos os e-mails enviados do aplicativo também serão salvos no diretório "Enviados" da sua caixa de correio.
+WarningPHPMailD=Se o método 'PHP Mail' é realmente o método que deseja usar, você pode remover este aviso adicionando a constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP a 1 em Home - Configuração - Outro.
 WarningPHPMail2=Se o seu provedor SMTP de e-mail precisar restringir o cliente de e-mail a alguns endereços IP (muito raro), esse é o endereço IP do agente de usuário de e-mail (MUA) para seu aplicativo ERP CRM: <strong>%s</strong>.
+WarningPHPMailSPF=Se o nome de domínio em seu endereço de e-mail do remetente estiver protegido por um registro SPF (pergunte a você o nome de domínio registrar), você deve adicionar os seguintes IPs no registro SPF do DNS de seu domínio: <strong>%s</strong>.
 ClickToShowDescription=Clique para exibir a descrição
 RequiredBy=Este módulo é exigido por módulo(s)
 PageUrlForDefaultValues=Você deve inserir o caminho relativo do URL da página. Se você incluir parâmetros na URL, os valores padrão serão efetivos se todos os parâmetros estiverem definidos com o mesmo valor.
@@ -396,6 +404,7 @@ Module40Desc=Fornecedores e gerenciamento de compras (pedidos e cobrança de fat
 Module42Name=Notas de depuração
 Module42Desc=Recursos de registro (arquivo, syslog, ...). Tais registros são para propósitos técnicos/debug.
 Module43Name=Barra de depuração
+Module43Desc=Ferramenta para o desenvolvedor adicionar uma barra de depuração em seu navegador.
 Module49Desc=Gestor de Editores
 Module51Name=Cartas Massivos
 Module51Desc=Gestão de correspondência do massa
@@ -458,10 +467,13 @@ Module2660Desc=Ativar o cliente de serviços da Web Dolibarr (pode ser usado par
 Module2700Desc=Use o serviço online Gravatar (www.gravatar.com) para mostrar fotos de usuários/membros (encontrados com seus e-mails). Precisa de acesso à Internet
 Module2900Desc=Capacidade de conversão com o GeoIP Maxmind
 Module3400Name=Redes Sociais
+Module3400Desc=Habilite campos de Redes Sociais em terceiros e endereços (skype, twitter, facebook, ...).
 Module4000Name=RH
 Module4000Desc=Gerenciamento de recursos humanos (gerenciamento do departamento, contratos dos funcionários e benefícios)
 Module5000Name=Multi-Empresas
 Module5000Desc=Permite gerenciar várias empresas
+Module6000Name=Fluxo de trabalho entre módulos
+Module6000Desc=Gerenciamento de fluxo de trabalho entre diferentes módulos (criação automática de objeto e / ou mudança automática de status)
 Module10000Desc=Crie sites (públicos) com um editor WYSIWYG. Este é um CMS orientado a webmasters ou desenvolvedores (é melhor conhecer a linguagem HTML e CSS). Basta configurar seu servidor da Web (Apache, Nginx, ...) para apontar para o diretório Dolibarr dedicado para colocá-lo online na Internet com seu próprio nome de domínio.
 Module20000Name=Deixar o gerenciamento de solicitações
 Module20000Desc=Definir e rastrear solicitações de saída de funcionários
@@ -473,9 +485,11 @@ Module50150Desc=Módulo de ponto de vendas TakePOS (POS com tela de toque, para
 Module50200Desc=Oferecer aos clientes uma página de pagamento online do PayPal (conta do PayPal ou cartões de crédito/débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido, etc.)
 Module50300Desc=Ofereça aos clientes uma página de pagamento on-line do Stripe (cartões de crédito / débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido, etc.)
 Module50400Name=Contabilidade (entrada dupla)
+Module50400Desc=Gestão contábil (partidas dobradas, suporte para Razões Gerais e Subsidiárias). Exportar livro razão em outros formatos de software contábil.
 Module54000Name=ImprimirIPP
 Module55000Name=Pesquisa Aberta
 Module55000Desc=Criar pesquisas, enquetes ou votos on-line (como Doodle, Studs, RDVz etc ...)
+Module59000Desc=Módulo para seguir margens
 Module60000Desc=Módulo para gerenciar comissão
 Module63000Desc=Gerenciar recursos (impressoras, carros, salas, ...) para alocar eventos
 Permission11=Ler Faturas de Clientes
@@ -496,10 +510,14 @@ Permission32=Criar/Modificar Produtos
 Permission34=Deletar Produtos
 Permission36=Ver/Gerenciar Produtos Ocultos
 Permission38=Exportar Produtos
+Permission39=Ignorar preço mínimo
 Permission61=Ler Intervenções
 Permission62=Criar/Modificar Intervenções
 Permission64=Deletar Intervenções
 Permission67=Exportar Intervenções
+Permission68=Envie intervenções por e-mail
+Permission69=Validar intervenções
+Permission70=Invalidar intervenções
 Permission71=Ler Membros
 Permission72=Criar/Modificar Membros
 Permission74=Deletar Membros
@@ -521,6 +539,7 @@ Permission95=Ler Relátorios
 Permission101=Ler Envios
 Permission102=Criar/Modificar Envios
 Permission104=Validar Envios
+Permission105=Enviar envios por e-mail
 Permission106=Exportar Envios
 Permission109=Deletar Envios
 Permission111=Ler Contas Financeiras
@@ -589,6 +608,8 @@ 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=Estender acesso a todos os terceiros E seus objetos (não apenas terceiros para os quais o usuário é um representante de vendas). <br>Não eficaz para usuários externos (sempre limitado a eles próprios para propostas, pedidos, faturas, contratos, etc.). <br>Não eficaz para projetos (apenas regras sobre permissões de projeto, visibilidade e questões de atribuição).
+Permission263=Estender acesso a todos os terceiros SEM seus objetos (não apenas terceiros para os quais o usuário é um representante de vendas). <br>Não eficaz para usuários externos (sempre limitado a eles mesmos para propostas, pedidos, faturas, contratos, etc.). <br>Não eficaz para projetos (apenas regras sobre permissões de projeto, visibilidade e questões de atribuição).
 Permission271=Ler CA
 Permission272=Ler Faturas
 Permission273=Emitir Fatura
@@ -818,6 +839,7 @@ 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.
 RevenueStampDesc=O "carimbo de imposto" ou "carimbo de receita" é um imposto fixo por fatura (não depende do valor da fatura). Também pode ser um imposto percentual, mas o uso do segundo ou terceiro tipo de imposto é melhor para impostos percentuais, pois os selos fiscais não fornecem nenhum relatório. Apenas alguns países usam esse tipo de imposto.
 UseRevenueStamp=Use um carimbo de imposto
+UseRevenueStampExample=Valor do selo fiscal é definido por padrão na configuração de dicionários (%s - %s - %s)
 CalcLocaltax=Relatórios sobre os impostos locais
 CalcLocaltax1Desc=Relatorios de taxas locais são calculados pela differença entre taxas locais de venda e taxas locais de compra
 CalcLocaltax2Desc=Relatorio de taxas locais e o total de taxas locais nas compras
@@ -872,7 +894,6 @@ LogoSquarred=Logotipo (quadrado)
 LogoSquarredDesc=Deve ser um ícone quadrado (largura = altura). Este logotipo será usado como o ícone favorito ou outra necessidade da barra de menus superior (se não estiver desativado na configuração do monitor).
 NoActiveBankAccountDefined=Nenhuma conta bancária ativa está definida
 BankModuleNotActive=O módulo de contas bancárias não está habilitado
-ShowBugTrackLink=Mostrar link "<strong>%s</strong>"
 DelaysOfToleranceBeforeWarning=Atraso antes de exibir um alerta de aviso para:
 DelaysOfToleranceDesc=Defina o atraso antes de um ícone de alerta %s ser mostrado na tela para o elemento final.
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projeto não fechado a tempo
@@ -1157,6 +1178,7 @@ LDAPDescValues=Exemplos de valores são projetados pelo <b>OpenLDAP</b> seguido
 ForANonAnonymousAccess=Para um acesso autenticado (para um acesso de escrita por exemplo)
 PerfDolibarr=Configurações/otimizações de relatório de performance
 NotInstalled=Não instalado.
+NotSlowedDownByThis=Velocidade não pôde ser diminuída
 NotRiskOfLeakWithThis=Não há risco de vazamento desta forma.
 ApplicativeCache=cache de aplicativo
 MemcachedNotAvailable=Nenhum cache de aplicativo foi encontrado. Você pode aumentar a performance instalando um servidor de cache Memcached e o módulo será capaz de usar esse servidor de cache. Mais informações aqui http://wiki.dolibarr.org/index.php/Module_MemCached_EN. Note que vários provedores de host web não dispõem de tal servidor de cache.
@@ -1279,6 +1301,7 @@ AccountancyCodeBuy=Código de contas de compras
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenha a caixa de seleção “Criar automaticamente o pagamento” vazia por padrão ao criar um novo imposto
 AgendaSetup=Configurações do módulo de eventos e agenda
 PasswordTogetVCalExport=Chave para autorizar exportação do link
+SecurityKey =Chave de segurança
 PastDelayVCalExport=Não exportar eventos antigos de
 AGENDA_DEFAULT_VIEW=Qual visualização você deseja abrir por padrão ao selecionar o menu Agenda
 AGENDA_REMINDER_BROWSER=Habilitar o lembrete de evento no <b>navegador do usuário</b> (quando a data do lembrete é atingida, um pop-up é mostrado pelo navegador. Cada usuário pode desabilitar tais notificações na configuração de notificação do navegador).
@@ -1506,6 +1529,7 @@ ModuleActivated=O módulo %s é ativado e torna a interface mais lenta
 ModuleSyslogActivatedButLevelNotTooVerbose=O módulo %s está ativado e o nível de registro (%s) está correto (pouco detalhado)
 IfYouAreOnAProductionSetThis=Se você estiver em um ambiente de produção, deve definir esta propriedade como %s.
 AntivirusEnabledOnUpload=Antivírus habilitado em arquivos carregados
+SomeFilesOrDirInRootAreWritable=Alguns arquivos ou diretórios não estão em modo somente leitura
 EXPORTS_SHARE_MODELS=Modelos de exportação são compartilhar com todos
 ExportSetup=Configuração do módulo Export
 ImportSetup=Configuração do módulo Importar
@@ -1549,6 +1573,7 @@ ModuleActivatedMayExposeInformation=Esta extensão PHP pode expor dados confiden
 ModuleActivatedDoNotUseInProduction=Um módulo projetado para o desenvolvimento foi habilitado. Não o habilite em um ambiente de produção.
 CombinationsSeparator=Caractere separador para combinações de produtos
 SeeLinkToOnlineDocumentation=Veja o link para a documentação online no menu superior para exemplos
+SHOW_SUBPRODUCT_REF_IN_PDF=Se o recurso "%s" do módulo <b>%s</b> for usado, mostre detalhes dos subprodutos de um kit em PDF.
 AskThisIDToYourBank=Entre em contato com seu banco para obter este ID
 AdvancedModeOnly=Permissão disponível apenas no modo de permissão Avançada
 ConfFileIsReadableOrWritableByAnyUsers=O arquivo conf pode ser lido ou gravado por qualquer usuário. Dê permissão apenas ao usuário e grupo do servidor da web.
@@ -1556,3 +1581,11 @@ MailToSendEventOrganization=Organização do Evento
 AGENDA_EVENT_DEFAULT_STATUS=Status de evento padrão ao criar um evento a partir do formulário
 YouShouldDisablePHPFunctions=Você deve desabilitar funções PHP
 IfCLINotRequiredYouShouldDisablePHPFunctions=Exceto se você precisar executar comandos do sistema (para o módulo Trabalho agendado ou para executar o antivírus da linha de comando externa, por exemplo), você deve desabilitar as funções do PHP
+NoWritableFilesFoundIntoRootDir=Nenhum arquivo gravável ou diretório de programas comuns foi encontrado em seu diretório raiz (bom)
+RecommendedValueIs=Recomendado: %s
+ARestrictedPath=Caminho restrito
+CheckForModuleUpdate=Verificar se há atualizações para módulos externos
+CheckForModuleUpdateHelp=Esta ação se conectará a editores de módulos externos para verificar se uma nova versão está disponível.
+ModuleUpdateAvailable=Uma atualização está disponível
+NoExternalModuleWithUpdate=Nenhuma atualização encontrada para módulos externos
+SwaggerDescriptionFile=Arquivo de descrição da API Swagger (para uso com redoc, por exemplo)
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index eb3c644c1e0..4f1ed6e84a7 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -86,10 +86,8 @@ Reconciled=Conciliada
 SupplierInvoicePayment=Pagamento do fornecedores
 WithdrawalPayment=Pedido com pagamento por débito
 SocialContributionPayment=Pagamento de contribuição social
-TransferDesc=Transferência de uma conta para outra, o Dolibarr vai escrever dois registros (um débito na conta de origem e um crédito na conta de destino). A mesma quantia (exceto sinal), rótulo e data serão usados para esta transação)
 TransferFromToDone=Uma transferência de <b>%s</b> para <b>%s</b> de <b>%s</b> %s foi registrado.
 ValidateCheckReceipt=Validar este comprovante de cheque?
-ConfirmValidateCheckReceipt=Você tem certeza que deseja validar este comprovante de cheque, mesmo sabendo que nenhuma mudança poderá ser feita depois?
 DeleteCheckReceipt=Excluir este recibo de cheque?
 ConfirmDeleteCheckReceipt=Você tem certeza que deseja excluir este comprovante de cheque?
 BankChecks=Cheques do banco
@@ -113,7 +111,6 @@ AllAccounts=Todas as contas Banco e Caixa
 BackToAccount=Voltar para conta
 ShowAllAccounts=Mostrar todas as contas
 FutureTransaction=Transação no futuro. Impossível reconciliar
-SelectChequeTransactionAndGenerate=Selecione / filtrar cheques para incluir no recibo do cheque caução e clique em "Criar".
 InputReceiptNumber=Escolha um estrato bancário relacionado com conciliação. Use um valor numérico classificável (tal como, YYYYMM)
 EventualyAddCategory=Eventualmente, especifique a categoria na qual os registros será classificado
 ToConciliate=Conciliar?
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 9601e9f7915..03c626761a4 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -80,7 +80,6 @@ DoPaymentBack=Insira o reembolso
 EnterPaymentReceivedFromCustomer=Entrar pagamento recebido de cliente
 EnterPaymentDueToCustomer=Realizar pagamento devido para cliente
 DisabledBecauseRemainderToPayIsZero=Desabilitado porque o restante a pagar é zero
-PriceBase=Preço de base
 BillStatus=Status de fatura
 StatusOfGeneratedInvoices=Situação das faturas geradas
 BillStatusDraft=Rascunho (precisa ser validada)
@@ -293,7 +292,6 @@ RegulatedOn=Regulamentado em
 ChequeNumber=Nº do Cheque
 ChequeOrTransferNumber=Nº do cheque/transferência
 ChequeBordereau=Verificar agendamento
-ChequeMaker=Cheque/transmissor de Transferência
 NetToBePaid=Líquido a ser pago
 PhoneNumber=Telefone
 FullPhoneNumber=Telefone
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index 665ab325650..754400bc9cb 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -36,9 +36,6 @@ BoxTitleLastModifiedContacts=Contatos/Endereços: último %s modificado
 BoxMyLastBookmarks=Marcadores: mais recente %s
 BoxOldestExpiredServices=Mais antigos serviços ativos expirados
 BoxLastExpiredServices=Ultimo %s dos contatos com serviço vencido ativo
-BoxTitleLastModifiedDonations=Últimas %s doações modificadas
-BoxTitleLatestModifiedBoms=%s BOMs modificadas recentemente
-BoxTitleLatestModifiedMos=%s ordens de fabricação modificadas recentemente
 BoxTitleLastOutstandingBillReached=Clientes com máximo pendente excedido
 BoxGlobalActivity=Atividade global (faturas, propostas, pedidos)
 BoxScheduledJobs=Tarefas agendadas
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
index 3a5201ded49..7acdecd580a 100644
--- a/htdocs/langs/pt_BR/cashdesk.lang
+++ b/htdocs/langs/pt_BR/cashdesk.lang
@@ -25,13 +25,15 @@ Footer=Rodapé
 AmountAtEndOfPeriod=Montante no final do período (dia, mês ou ano)
 TheoricalAmount=Quantidade teórica
 RealAmount=Quantidade real
+CashFence=Fechamento de caixa
+CashFenceDone=Fechamento de caixa feito para o período
 NbOfInvoices=Núm. de faturas
 Paymentnumpad=Tipo de Pad para inserir pagamento
 Numberspad=Números de Pad
 BillsCoinsPad=Almofada de moedas e notas
 DolistorePosCategory=Módulos TakePOS e outras soluções de PDV para Dolibarr
-TakeposNeedsCategories=TakePOS precisa de categorias de produtos para funcionar
-OrderNotes=Notas de pedidos
+TakeposNeedsCategories=TakePOS precisa de pelo menos uma categoria de produto para funcionar
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS precisa de pelo menos 1 categoria de produto na categoria <b> %s </b> para funcionar
 CashDeskBankAccountFor=Conta padrão a ser usada para pagamentos em
 NoPaimementModesDefined=Nenhum modo de embalagem definido na configuração do TakePOS
 TicketVatGrouped=Agrupar IVA por taxa em tickets | recibos
@@ -49,11 +51,11 @@ POSModule=Módulo PDV
 BasicPhoneLayout=Usar layout básico para telefones
 SetupOfTerminalNotComplete=A configuração do terminal 1%s não está concluída
 DirectPayment=Pagamento direto
+DirectPaymentButton=Adicionar um botão "Pagamento direto em dinheiro"
 InvoiceIsAlreadyValidated=A fatura já está validada
 NoLinesToBill=Nenhuma linha para cobrança
 CustomReceipt=Recibo personalizado
 ReceiptName=Nome do recibo
-ProductSupplements=Suplementos ao produto
 SupplementCategory=Categoria de suplemento
 ColorTheme=Tema de cores
 Colorful=Colorido
@@ -62,12 +64,15 @@ SortProductField=Campo para classificação de produtos
 BrowserMethodDescription=Impressão de recibo simples e fácil. Apenas alguns parâmetros para configurar o recebimento. \nImprimir via navegador.
 TakeposConnectorMethodDescription=Módulo externo com recursos extras. Possibilidade de imprimir a partir da nuvem.
 PrintMethod=Método de impressão
-ReceiptPrinterMethodDescription=Método poderoso com muitos parâmetros. Completamente personalizável com modelos. Não é possível imprimir a partir da nuvem.
 ByTerminal=Pelo terminal
+TakeposNumpadUsePaymentIcon=Use o ícone em vez do texto nos botões de pagamento do teclado numérico
 CashDeskRefNumberingModules=Módulo de numeração para vendas PDV
 CashDeskGenericMaskCodes6 =<br>A tag {TN} é usada para adicionar o número do terminal
 TakeposGroupSameProduct=Agrupe as mesmas linhas de produtos
 StartAParallelSale=Iniciar uma nova venda paralela
+SaleStartedAt=Venda iniciada às %s
+ControlCashOpening=Controle da caixa pop-up na abertura do PDV
+CloseCashFence=Fechar controle de caixa
 CashReport=Relatório de caixa
 MainPrinterToUse=Impressora principal a ser usada
 OrderPrinterToUse=Solicite impressora a ser usada
@@ -83,5 +88,11 @@ HideCategoryImages=Ocultar imagens da categoria
 HideProductImages=Ocultar imagens do produto
 NumberOfLinesToShow=Número de linhas de imagens a mostrar
 DefineTablePlan=Definir plano de tabelas
+GiftReceiptButton=Adicionar um botão "Recibo para presente"
 GiftReceipt=Recibo de presente
 ModuleReceiptPrinterMustBeEnabled=A impressora de recibos do módulo deve ter sido habilitada primeiro
+AllowDelayedPayment=Permitir pagamento atrasado
+PrintPaymentMethodOnReceipts=Imprimir forma de pagamento em tickets | recibos
+WeighingScale=Balança
+ShowPriceHT =Exibir coluna de preço sem impostos
+ShowPriceHTOnReceipt =Exibir coluna de preço sem impostos no recibo
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index 1b369de1186..96b507918ae 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -3,17 +3,8 @@ Rubrique=Tag/Categoria
 Rubriques=Tags/Categorias
 RubriquesTransactions=Tags/Categorias de transações
 categories=tags/categorias
-NoCategoryYet=Nenhuma tag/categoria deste tipo foi criada
 In=Em
 CategoriesArea=Área Tags / Categorias
-ProductsCategoriesArea=Área tags / categorias de Produtos / Serviços
-SuppliersCategoriesArea=Área tags / categorias de fornecedores
-CustomersCategoriesArea=Área tags / categorias de Clientes
-MembersCategoriesArea=Área tags / categorias de Membros
-ContactsCategoriesArea=Área tags / categorias de Contatos
-AccountsCategoriesArea=Área tags / categorias de contas bancárias
-ProjectsCategoriesArea=Projetos area de tags/categorias
-UsersCategoriesArea=Área de tags / categorias de usuários
 CatList=Lista de tags/categorias
 CatListAll=Lista tags / categorias (todos os tipos)
 NewCategory=Nova tag/categoria
@@ -82,5 +73,6 @@ AddCustomerIntoCategory=Atribuir categoria ao cliente
 AddSupplierIntoCategory=Atribuir categoria ao fornecedor
 ShowCategory=Mostrar tag / categoria
 ChooseCategory=Escolher categoria
+StocksCategoriesArea=Categorias de Armazém
+ActionCommCategoriesArea=Categorias de Eventos
 WebsitePagesCategoriesArea=Categorias de contêiner de página
-UseOrOperatorForCategories=Use operador para categorias
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index a2e555301a3..6f0f7830869 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -1,9 +1,7 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Já existe uma empresa com o nome %s. Escolha um outro.
 ErrorSetACountryFirst=Defina o país primeiro
-ConfirmDeleteCompany=Você tem certeza que deseja excluir esta empresa e toda a informação associada?
 DeleteContact=Excluir um contato/endereço
-ConfirmDeleteContact=Você tem certeza que deseja excluir este contato e toda a informação associada?
 MenuNewProspect=Novo Prospecto
 MenuNewPrivateIndividual=Novo particular
 NewCompany=Nova Empresa (prospecto, cliente, fornecedor)
@@ -44,14 +42,13 @@ Region-State=Região - Estado
 CountryCode=Código do país
 CountryId=ID do país
 Call=Chamar
-PhonePro=Tel. comercial
 PhonePerso=Tel. particular
 PhoneMobile=Celular
 No_Email=Recusar e-mails em massa
 Zip=CEP
 Town=Município
 Web=Website
-DefaultLang=Padrão do idioma
+DefaultLang=Idioma padrão
 VATIsUsed=Imposto usado sobre vendas
 VATIsNotUsed=O imposto sobre vendas não é usado
 CopyAddressFromSoc=Copie o endereço  do terceiro
@@ -227,10 +224,8 @@ SocialNetworksGithubURL=URL GitHub
 YouMustAssignUserMailFirst=Você deve criar um e-mail para este usuário antes de poder adicionar uma notificação por e-mail.
 YouMustCreateContactFirst=Para estar apto a adicionar notificações por e-mail, você deve primeiramente definir contatos com e-mails válidos para o terceiro
 ListSuppliersShort=Lista de fornecedores
-LastModifiedThirdParties=Últimos %s alterados por terceiros recentemente
 ActivityCeased=Inativo
 ThirdPartyIsClosed=O terceiro está fechado
-ProductsIntoElements=Lista de produtos/serviços em %s
 CurrentOutstandingBill=Notas aberta correntes
 OutstandingBill=Conta excelente
 OutstandingBillReached=Máx. para dívida a ser alcançado
@@ -238,7 +233,6 @@ LeopardNumRefModelDesc=O código é livre. Esse código pode ser modificado a qu
 ManagingDirectors=Nome do Representante(CEO,Diretor,Presidente...)
 MergeOriginThirdparty=Duplicar terceiros (terceiros que deseja excluir)
 MergeThirdparties=Mesclar terceiros
-ConfirmMergeThirdparties=Tem certeza de que deseja mesclar este terceiro no atual? Todos os objetos vinculados (faturas, pedidos, ...) serão movidos para o terceiro atual e, em seguida, o terceiro será excluído.
 ThirdpartiesMergeSuccess=Terceiros foram mesclados
 SaleRepresentativeLogin=Login para o representante de vendas
 SaleRepresentativeLastname=Sobrenome do representante de vendas
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index fe65cc7a47c..7af19e55eb8 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -100,7 +100,6 @@ CheckReceipt=Depósito de cheque
 CheckReceiptShort=Depósito de cheque
 LastCheckReceiptShort=Últimos %s recibos de cheque
 NoWaitingChecks=Sem cheques a depositar.
-DateChequeReceived=Data introdução de dados de recepção cheque
 NbOfCheques=Nº. de cheques
 PaySocialContribution=Quitar um encargo fiscal/social
 DeleteSocialContribution=Excluir um pagamento taxa social ou fiscal
diff --git a/htdocs/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang
index ec2187e9913..3c7bb7eddf3 100644
--- a/htdocs/langs/pt_BR/ecm.lang
+++ b/htdocs/langs/pt_BR/ecm.lang
@@ -32,3 +32,6 @@ FileNotYetIndexedInDatabase=Arquivo ainda não indexado no banco de dados (tente
 ExtraFieldsEcmFiles=Campos extras Arquivos Ecm
 ExtraFieldsEcmDirectories=Campos extras Diretórios Ecm
 ECMSetup=Configuração ECM
+GenerateImgWebp=Duplique todas as imagens com outra versão em formato .webp
+ConfirmImgWebpCreation=Confirmar duplicação de todas as imagens
+SucessConvertImgWebp=Imagens duplicadas com sucesso
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 971fb3d2fe0..83748da8ee5 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - errors
 NoErrorCommitIsDone=Sem erros, garantimos
 ErrorButCommitIsDone=Erros foram encontrados mas, apesar disso, validamos
-ErrorBadEMail=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.
 ErrorRecordNotFound=Registro não encontrado.
 ErrorFailToCopyFile=Houve uma falha ao copiar o arquivo '<b>%s</b>' para '<b>%s</b>'.
@@ -33,8 +31,6 @@ ErrorBadDateFormat=O valor '%s' tem o formato de data errada
 ErrorWrongDate=A data não está correta!
 ErrorFailedToWriteInDir=Houve uma falha ao escrever no diretório %s
 ErrorFoundBadEmailInFile=Encontrado uma sintaxe de e-mail incorreta para as linhas %s no arquivo (por exemplo, linha %s com e-mail = %s)
-ErrorFieldsRequired=Alguns campos obrigatórios não foram preenchidos.
-ErrorSubjectIsRequired=O campo do e-mail é obrigatório
 ErrorFailedToCreateDir=Error na creação de uma carpeta. Compruebe que 0 usuario del servidor Web tiene derechos de escritura en las carpetas de documentos de Dolibarr. Si 0  parámetro <b>safe_mode</b> está ativo en este PHP, Compruebe que los archivos php dolibarr pertencen ao usuario del servidor Web.
 ErrorNoMailDefinedForThisUser=Nenhum e-mail definido para este usuário
 ErrorFeatureNeedJavascript=Esta funcionalidade requer que o javascript seja ativado para funcionar. Altere isto em Configuração >> Aparência.
diff --git a/htdocs/langs/pt_BR/eventorganization.lang b/htdocs/langs/pt_BR/eventorganization.lang
new file mode 100644
index 00000000000..1046596e57e
--- /dev/null
+++ b/htdocs/langs/pt_BR/eventorganization.lang
@@ -0,0 +1,7 @@
+# Dolibarr language file - Source file is en_US - eventorganization
+ModuleEventOrganizationName =Organização do Evento
+EventOrganizationDescription =Organização do Evento atraves do modulo Projetos
+EventOrganizationMenuLeft =Eventos organizados
+EventOrganizationSetup =Configuracao de Organização do Evento
+EventOrganizationSetupPage =Organização do Eventos pagina de configuracao
+EvntOrgDraft =Minuta
diff --git a/htdocs/langs/pt_BR/loan.lang b/htdocs/langs/pt_BR/loan.lang
index a80c1b95f0d..c3d86606ecb 100644
--- a/htdocs/langs/pt_BR/loan.lang
+++ b/htdocs/langs/pt_BR/loan.lang
@@ -16,6 +16,9 @@ LoanPaid=Empréstimo pago
 ListLoanAssociatedProject=Lista de empréstimos associados ao projeto
 InterestAmount=Juro
 CapitalRemain=Capital permanecem
+TermPaidAllreadyPaid =Este termo já está pago
+CantUseScheduleWithLoanStartedToPaid =Não é possível usar programador para empréstimo com o pagamento iniciado
+CantModifyInterestIfScheduleIsUsed =Você não pode alterar o interesse se usar o programador
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Capital contabilístico por padrão
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Interesse contabilístico por padrão
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Seguro contabilístico por padrão
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index 54faf80d28a..2059a57d9fb 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -9,7 +9,6 @@ MailTo=Destinatário(s)
 MailToUsers=Para usuário (s)
 MailCC=Copiar para
 MailToCCUsers=Copiar para o (s) usuário (s)
-MailTopic=Tópico de e-mail
 MailFile=Arquivos anexados
 SubjectNotIn=Não no assunto
 BodyNotIn=Não no corpo
@@ -51,6 +50,7 @@ NbSelected=Número selecionado
 NbIgnored=Número ignorado
 NbSent=Número enviado
 MailingModuleDescContactsByCompanyCategory=Contatos por categoria de terceiros
+EmailCollectorFilterDesc=Todos os filtros devem corresponder para que um e-mail seja coletado
 LineInFile=Linha %s em arquivo
 RecipientSelectionModules=Módulos de seleção dos destinatários
 MailSelectedRecipients=Destinatários selecionados
@@ -71,6 +71,11 @@ TagUnsubscribe=Atalho para se desenscrever
 EMailRecipient=E-mail do destinatário
 TagMailtoEmail=E-mail do destinatário (incluindo o link "mailto:" em html)
 NoEmailSentBadSenderOrRecipientEmail=Nenhum e-mail enviado. Bad remetente ou destinatário de e-mail. Verifique perfil de usuário.
+NotificationsAuto=Notificações automáticas.
+NoNotificationsWillBeSent=Nenhuma notificação automática por e-mail está planejada para este tipo de evento e empresa
+ANotificationsWillBeSent=01 notificação automática será enviada por e-mail
+SomeNotificationsWillBeSent=%s notificações automáticas serão enviadas por e-mail
+AddNewNotification=Inscreva-se para receber uma nova notificação automática por e-mail (destino / evento)
 MailSendSetupIs=Configuração do envio de e-mails foi configurado a '%s'. Este modo não pode ser usado para envios de massa de e-mails.
 MailSendSetupIs2=Voçê precisa primeiramente acessar com uma conta de Administrador o menu %sInicio - Configurações - E-mails%s para mudar o parâmetro <strong>'%s'</strong> para usar o modo '%s'. Neste modo você pode entrar a configuração do servidor SMTP fornecido pelo seu Provedor de Acesso a Internet e usar a funcionalidade de envios de massa de e-mails.
 MailSendSetupIs3=Se tiver perguntas sobre como configurar o seu servidor SMTP voçê pode perguntar %s.
@@ -78,6 +83,7 @@ YouCanAlsoUseSupervisorKeyword=Você também pode adicionar a palavra-chave <str
 NbOfTargetedContacts=Número atual de e-mails de contatos direcionados
 UseFormatFileEmailToTarget=O arquivo importado deve ter formato <strong>email; nome; nome; outro</strong>
 UseFormatInputEmailToTarget=Digite uma string com o formato <strong>email; nome; nome; outro</strong>
+AdvTgtSearchTextHelp=Use %% como curingas. Por exemplo, para encontrar todos os itens como <b>jean, joe, jim</b>, você pode inserir <b>j %%</b>, você também pode usar; como separador de valor e use! para exceto este valor. Por exemplo, <b>jean; joe; jim %% ;! jimo;! Jima %%</b> terá como alvo todos os jean, joe, começar com jim, mas não jimo e nem tudo que começa com jima
 AdvTgtSearchIntHelp=Use o intervalo para selecionar o valor int ou flutuante
 AdvTgtSearchDtHelp=Use o intervalo para selecionar o valor da data
 AdvTgtStartDt=Data in.
@@ -91,4 +97,15 @@ AdvTgtDeleteFilter=Excluir filtro
 AdvTgtSaveFilter=Salvar filtro
 NoContactWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com uma categoria
 NoContactLinkedToThirdpartieWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com uma categoria
+OutGoingEmailSetup=Emails de saída
+InGoingEmailSetup=Recebendo e-mails
+OutGoingEmailSetupForEmailing=Emails de saída (para o módulo %s)
+DefaultOutgoingEmailSetup=Mesma configuração que a configuração global de envio de e-mail
 ContactsWithThirdpartyFilter=Contatos com filtro de terceiros
+Unanswered=Sem resposta
+Answered=Respondidos
+IsNotAnAnswer=Não é resposta (e-mail inicial)
+IsAnAnswer=Resposta de um e-mail inicial
+RecordCreatedByEmailCollector=Registro criado pelo coletor de e-mail %s a partir do e-mail %s
+DefaultBlacklistMailingStatus=Status de contato padrão para recusar envio de e-mail em massa
+DefaultStatusEmptyMandatory=Vazio mas obrigatório
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index c4a455b03d6..be491366987 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -115,7 +115,6 @@ SaveAndStay=Salvar e permanecer
 SaveAndNew=Salvar e novo
 TestConnection=Teste a login
 ToClone=Cópiar
-ConfirmClone=Escolha o dado que voce quer clonar
 NoCloneOptionsSpecified=Não existem dados definidos para copiar
 Go=Ir
 Run=Attivo
@@ -144,7 +143,6 @@ Model=Template doc
 DefaultModel=Modelo de documento padrão
 Action=Ação
 About=Acerca de
-NumberByMonth=Numero por mes
 Limit=Límite
 Logout=Sair
 NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação
@@ -180,8 +178,6 @@ Morning=Manha
 Quadri=Trimistre
 CurrencyRate=Taxa de conversão moeda
 UseLocalTax=Incluindo taxa
-UserAuthor=Usuário da criação
-UserModif=Usuário da última atualização
 Default=Padrao
 DefaultValue=Valor por default
 DefaultValues=Valores / filtros / classificação padrão
@@ -279,6 +275,8 @@ Categories=Tags / categorias
 Category=Tag / categoria
 to=para
 To=para
+ToDate=para
+ToLocation=para
 OtherInformations=Outra informação
 ApprovedBy2=Aprovado pelo (segunda aprovação)
 ClosedAll=Fechados(Todos)
diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang
index 36c8bb59d1d..256120dc74e 100644
--- a/htdocs/langs/pt_BR/margins.lang
+++ b/htdocs/langs/pt_BR/margins.lang
@@ -12,6 +12,7 @@ ContactOfInvoice=Contato da fatura
 UserMargins=Margens do usuário
 ProductService=Produto ou serviço
 ForceBuyingPriceIfNull=Compra Força preço / custo para o preço de venda se não definido
+ForceBuyingPriceIfNullDetails=Se o preço de compra / custo não for fornecido quando adicionar uma nova linha, e esta opção estiver "ON", a margem será 0 na nova linha (preço de compra / custo = preço de venda). Se esta opção estiver "OFF" (recomendado), a margem será igual ao valor sugerido por padrão (e pode ser 100% se nenhum valor padrão for encontrado).
 MARGIN_METHODE_FOR_DISCOUNT=Metodologia de margem para descontos globais
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global e tratado como o produto, serviço, ou somente sob o sub-total na margem.
 MARGIN_TYPE=Compra / Preço de custo sugerido por padrão para cálculo da margem de
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index a85d5fdddf2..e5c1dfd70e5 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -11,13 +11,11 @@ FundationMembers=Membros da fundação
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro  já está vinculado a um terceiro. Remover este link em primeiro lugar porque um terceiro não pode ser ligado a apenas um membro (e vice-versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razões de segurança, você deve ter permissões para editar todos os usuários sejam capazes de ligar um membro a um usuário que não é seu.
 SetLinkToThirdParty=Link para um fornecedor Dolibarr
-MembersCards=Cartões de Membros
 MembersListResiliated=Lista de membros encerrados
 MenuMembersResiliated=Membros encerrados
 MembersWithSubscriptionToReceiveShort=Assinatura a receber
 DateSubscription=data filiação
 DateEndSubscription=data final filiação
-EndSubscription=fim filiação
 SubscriptionId=Id adesão
 MemberId=Id adesão
 MemberStatusDraft=Minuta (requer confirmação)
@@ -41,8 +39,6 @@ ListOfSubscriptions=Lista de Filiações
 SendCardByMail=Enviar cartão por e-mail
 NoTypeDefinedGoToSetup=nenhum tipo de membro definido. ir a configuração -> Tipos de Membros
 WelcomeEMail=Bem-vindo e-mail
-Physical=Físico
-Reenable=Reativar
 ResiliateMember=Encerrar um membro
 ConfirmResiliateMember=Você tem certeza que deseja encerrar este membro?
 ConfirmDeleteMember=Você tem certeza que deseja excluir este membro (a exclusão de um membro excluirá todas as suas assinaturas)?
@@ -91,22 +87,15 @@ LastSubscriptionAmount=Quantidade da última assinatura
 MembersStatisticsByTown=Membros estatísticas por cidade
 MembersStatisticsByRegion=Membros por região estatísticas
 NoValidatedMemberYet=Nenhum membro validados encontrado
-MembersByCountryDesc=Esta tela mostrará estatísticas sobre usuários por países. Gráfico depende, contudo, do Google serviço gráfico on-line e está disponível apenas se uma conexão à Internet é está funcionando.
-MembersByStateDesc=Esta tela mostrará estatísticas sobre usuários por estado / província / cantão.
-MembersByTownDesc=Esta tela mostrará estatísticas sobre usuários por cidade.
 MembersStatisticsDesc=Escolha as estatísticas que você quer ler ...
 MenuMembersStats=Estatísticas
 LatestSubscriptionDate=Data da última adesão
-MemberNature=Natureza do membro
-Public=Informações são públicas
 NewMemberbyWeb=Novo membro adicionado. Aguardando aprovação
 NewMemberForm=Formulário para novo membro
 NbOfSubscriptions=Número de inscrições
 TurnoverOrBudget=Volume de negócios (para uma empresa) ou de orçamento (para uma fundação)
 CanEditAmount=Visitante pode escolher/editar quantidade da sua subscrição
 MEMBER_NEWFORM_PAYONLINE=Ir na página de pagamento online integrado
-MembersByNature=Esta tela mostrará estatísticas por natureza de usuários.
-MembersByRegion=Esta tela mostrará estatísticas sobre usuários por região.
 VATToUseForSubscriptions=Taxa de VAT para utilizar as assinaturas
 NoVatOnSubscription=Nenhum IVA para assinaturas
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produto utilizado para a linha de assinatura em nota fiscal: %s
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index f6d903c07da..fcfe59e46b1 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -13,6 +13,8 @@ NewOrder=Novo Pedido
 NewOrderSupplier=Novo Pedido de Compra
 ToOrder=Realizar Pedido
 MakeOrder=Realizar Pedido
+SaleOrderLines=Linhas do pedido de venda
+PurchaseOrderLines=Linhas do pedido de compra
 SuppliersOrdersRunning=Pedidos de compra atuais
 CustomerOrder=Pedido de venda
 CustomersOrders=Ordens de venda
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 3bb86856d85..e6a654c328d 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -102,7 +102,6 @@ AuthenticationDoesNotAllowSendNewPassword=o modo de autentificação de Dolibarr
 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>.
 StatsByNumberOfUnits=Estatisticas para soma das quantidades nos produtos/servicos
-StatsByNumberOfEntities=Estatísticas em número de entidades de referência (nº. de faturas ou ordens ...)
 NumberOfProposals=Numero de propostas
 NumberOfCustomerOrders=Número de pedidos de vendas
 NumberOfCustomerInvoices=Numero de faturas de clientes
diff --git a/htdocs/langs/pt_BR/partnership.lang b/htdocs/langs/pt_BR/partnership.lang
new file mode 100644
index 00000000000..f7f9aa53929
--- /dev/null
+++ b/htdocs/langs/pt_BR/partnership.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - partnership
+ModulePartnershipName =Configuracoes de Parcerias
+PartnershipDescription =Módulo gerenciamento de parcerias
+PartnershipDescriptionLong=Módulo gerenciamento de parcerias
+NewPartnership =Nova parceria
+ListOfPartnerships =Lista de parcerias
+PartnershipSetup =Configuracao de parcerias
+PartnershipAbout =Sobre parcerias
+PartnershipAboutPage =Pagina sobre parcerias
+DatePartnershipStart=Data de início
+DatePartnershipEnd=Data de término
+PartnershipDraft =Rascunho
+PartnershipAccepted =Aceita
+PartnershipCanceled =Cancelada
diff --git a/htdocs/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang
index 214042acf7e..45766536b7e 100644
--- a/htdocs/langs/pt_BR/productbatch.lang
+++ b/htdocs/langs/pt_BR/productbatch.lang
@@ -24,4 +24,8 @@ SerialNumberAlreadyInUse=O número de série %s já é usado para o produto %s
 TooManyQtyForSerialNumber=Você só pode ter um produto %s para o número de série %s
 BatchLotNumberingModules=Opções para geração automática de produtos em lote gerenciados por lotes
 BatchSerialNumberingModules=Opções para geração automática de produtos em lote gerenciados por números de série
+ManageLotMask=Máscara personalizada
+CustomMasks=Adiciona uma opção para definir máscara no cartão do produto
+LotProductTooltip=Adiciona opção ao cartão do produto para definir uma máscara de número de lote dedicado
+SNProductTooltip=Adiciona opção ao cartão do produto para definir uma máscara de número de série dedicada
 QtyToAddAfterBarcodeScan=Quantidade a adicionar para cada código de barras / lote / série digitalizada
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index a6538a7a297..ae31027f0ab 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -28,7 +28,6 @@ ServicesOnPurchase=Serviços para compra
 ServicesOnPurchaseOnly=Serviços somente para compra
 ServicesNotOnSell=Serviços não para venda e não para compra
 ServicesOnSellAndOnBuy=Serviços para venda e compra
-LastModifiedProductsAndServices=Últimos %s produtos | serviços alterados recentemente
 LastRecordedProducts=Últimos %s produtos gravados
 LastRecordedServices=Últimos %s serviços gravados
 Stock=Estoque
@@ -49,10 +48,8 @@ AppliedPricesFrom=Aplicado a partir de
 SellingPriceHT=Preço de venda (sem impostos)
 SellingPriceTTC=Preço de venda (incl. taxas)
 SellingMinPriceTTC=Preço mínimo de venda (incl. taxas)
-CostPriceDescription=Este campo de preço (livre de impostos) pode ser usado para armazenar a quantidade média do custo do produto para sua empresa. Pode ser qualquer preço a se calcular, por exemplo, a partir do preço médio de compra mais o custo médio de produção e distribuição.
 SoldAmount=Total vendido
 PurchasedAmount=Total comprado
-MinPrice=Preço mínimo de venda
 CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS)
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto
 ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço.
@@ -91,19 +88,13 @@ Finished=Produto manufaturado
 RowMaterial=Materia prima
 ConfirmCloneProduct=Você tem certeza que deseja clonar o produto ou serviço <b>%s</b>?
 ClonePricesProduct=Clonar preços
-CloneCategoriesProduct=Clonar tags / categorias vinculadas
-CloneCompositionProduct=Clonar produto/serviço virtual
-CloneCombinationsProduct=Clonar variantes do produto
 ProductIsUsed=Este produto é usado
 SellingPrices=Preços para Venda
 BuyingPrices=Preços para Compra
 CustomerPrices=Preços de cliente
 SuppliersPrices=Preços de fornecedores
 SuppliersPricesOfProductsOrServices=Preços do fornecedor (produtos ou serviços)
-CountryOrigin=Pais de origem
-Nature=Natureza do produto (material / finalizado)
 NatureOfProductShort=Natureza do produto
-NatureOfProductDesc=Matéria-prima ou produto acabado
 ShortLabel=Etiqueta curta
 set=conjunto
 se=conjunto
diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
index 3e2b3ad68cb..77f43b79c1e 100644
--- a/htdocs/langs/pt_BR/propal.lang
+++ b/htdocs/langs/pt_BR/propal.lang
@@ -66,3 +66,5 @@ CaseFollowedBy=Caso seguido por
 SignedOnly=Apenas assinado
 IdProposal=ID da proposta
 IdProduct=ID do produto
+PrParentLine=Linha principal da proposta
+LineBuyPriceHT=Comprar com valor do preço líquido de impostos para a linha
diff --git a/htdocs/langs/pt_BR/receiptprinter.lang b/htdocs/langs/pt_BR/receiptprinter.lang
index fcf16791aac..0df22f16fcc 100644
--- a/htdocs/langs/pt_BR/receiptprinter.lang
+++ b/htdocs/langs/pt_BR/receiptprinter.lang
@@ -43,7 +43,7 @@ DOL_DOUBLE_WIDTH=Tamanho duplo para largura
 DOL_DEFAULT_HEIGHT_WIDTH=Tamanho padrão para altura e largura
 DOL_UNDERLINE=Habilitar sublinhado
 DOL_UNDERLINE_DISABLED=Desabilitar sublinhado
-DOL_BEEP=Som Beep
+DOL_BEEP=Sinal sonoro
 DOL_VALUE_MONTH_LETTERS=Ano da fatura
 DOL_VALUE_MONTH=Ano da fatura
 DOL_VALUE_DAY_LETTERS=Data da fatura em letras
diff --git a/htdocs/langs/pt_BR/salaries.lang b/htdocs/langs/pt_BR/salaries.lang
index f89fa23a5d5..28c7dfdb337 100644
--- a/htdocs/langs/pt_BR/salaries.lang
+++ b/htdocs/langs/pt_BR/salaries.lang
@@ -2,7 +2,7 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Conta contábil usada para terceiros usuários
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=A conta contábil dedicada definida no cartão de usuário será usada somente para a contabilidade da Subconta. Este será usado para Contabilidade Geral e como valor padrão da contabilidade do Contador, se a conta contábil do usuário dedicada no usuário não estiver definida.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta da Contabilidade padrão para pagamentos de salário
-NewSalaryPayment=Novo pagamento de salário
+NewSalaryPayment=Novo cartão de salário
 AddSalaryPayment=Adicionar pagamento de salário
 SalaryPayment=Pagamento de salário
 SalariesPayments=Pagamentos de salários
diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang
index 88024602add..a3384bcf3ab 100644
--- a/htdocs/langs/pt_BR/sendings.lang
+++ b/htdocs/langs/pt_BR/sendings.lang
@@ -25,7 +25,6 @@ ConfirmValidateSending=Tem certeza que quer validar o envio com referencia <b>%s
 ConfirmCancelSending=Tem certeza que quer cancelar este envio?
 DocumentModelMerou=Modelo A5 Merou
 WarningNoQtyLeftToSend=Atenção, nenhum produto à espera de ser enviado.
-StatsOnShipmentsOnlyValidated=Estatisticas referentes os envios , mas somente validados. Data usada e data da validacao do envio ( a data planejada da entrega nao e sempre conhecida).
 DateDeliveryPlanned=Data prevista para o fornecimento
 RefDeliveryReceipt=Recibo de entrega
 StatusReceipt=Recibo de entrega de status
@@ -45,6 +44,7 @@ NoProductToShipFoundIntoStock=Nenhum produto para enviar encontrado no armazém
 WeightVolShort=Peso/Vol.
 ValidateOrderFirstBeforeShipment=Você deve primeiro, antes de fazer as remessas, confirmar o pedido.
 DocumentModelTyphon=Modelo de Documento Typhon
+DocumentModelStorm=Modelo de documento mais completo para comprovantes de entrega e compatibilidade com extracampos (logo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER nao definida
 SumOfProductVolumes=Soma do volume dos pedidos
 SumOfProductWeights=Soma do peso dos produtos
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index 80ddaec846f..3848837d4e1 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -10,6 +10,8 @@ CancelSending=Cancelar envio
 DeleteSending=Apagar envio
 MissingStocks=Estoques ausentes
 StockAtDate=Estoques por data
+StockAtDateInPast=Data no passado
+StockAtDateInFuture=Data no futuro
 StocksByLotSerial=Estoques por lote/nº de série
 LotSerial=Lotes/Series
 LotSerialList=Listagem de lotes/series
@@ -21,6 +23,8 @@ StocksArea=Setor de armazenagem
 AllWarehouses=Todos os armazéns
 IncludeEmptyDesiredStock=Inclui também estoque negativo com estoque desejado indefinido
 IncludeAlsoDraftOrders=Incluir também projetos de pedidos
+LocationSummary=Nome curto do lugar
+NumberOfDifferentProducts=Numero de produtos unicos
 NumberOfProducts=Número total de produtos
 LastMovement=Último movimento
 CorrectStock=Corrigir estoque
@@ -33,6 +37,7 @@ StockTooLow=Estoque muito baixo
 EnhancedValueOfWarehouses=Valor de estoques
 AllowAddLimitStockByWarehouse=Gerenciar também o valor do estoque mínimo e desejado por emparelhamento (armazém de produtos), além do valor do estoque mínimo e desejado por produto
 RuleForWarehouse=Regra para armazéns
+WarehouseAskWarehouseOnThirparty=Inserir estoque no terceiro
 WarehouseAskWarehouseDuringPropal=Definir um armazém em propostas comerciais
 WarehouseAskWarehouseDuringOrder=Definir um armazém em Pedidos de venda
 UserDefaultWarehouse=Definir um armazém em Usuários
@@ -120,6 +125,7 @@ ProductStockWarehouseCreated=Limite de estoque para alerta e estoque ótimo dese
 ProductStockWarehouseUpdated=Limite de estoque para alerta e estoque ótimo desejado corretamente atualizados
 ProductStockWarehouseDeleted=Limite de estoque para alerta e estoque ótimo desejado corretamente excluídos
 AddNewProductStockWarehouse=Definir novo limite para alerta e estoque ótimo desejado
+inventoryDeletePermission=Remover inventario
 inventoryDraft=Em vigência
 inventoryOfWarehouse=Inventário para depósito: %s
 inventoryErrorQtyAdd=Erro: a quantidade é menor que zero
@@ -137,6 +143,12 @@ AlwaysShowFullArbo=Exibir a árvore completa do armazém no pop-up dos links do
 StockAtDatePastDesc=Você pode ver aqui o estoque (estoque real) em uma determinada data no passado
 CurrentStock=Estoque atual
 InventoryRealQtyHelp=Defina o valor como 0 para redefinir o campo qty <br> Keep vazio ou remova a linha para mantê-lo inalterado
+UpdateByScaning=Preencher quantidade real com escaneamento
 UpdateByScaningProductBarcode=Atualização por digitalização (código de barras do produto)
 UpdateByScaningLot=Atualizar por varredura (lote | código de barras serial)
 DisableStockChangeOfSubProduct=Desative a mudança de estoque para todos os subprodutos deste Kit durante esta movimentação.
+ImportFromCSV=Importar lista de movimentos em CSV
+LabelOfInventoryMovemement=Inventario 1%s
+ObjectNotFound=1%s nao encontrado
+MakeMovementsAndClose=Gerar movimentos e fechar
+AutofillWithExpected=Inserir quantidade real com quantidade esperada
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index aff26cf4ed4..2c5afbce683 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -88,7 +88,6 @@ UseTypeFieldToChange=Use campo Tipo para mudar
 OpenIDURL=URL do OpenID
 LoginUsingOpenID=Usar o OpenID para efetuar o login
 WeeklyHours=Horas trabalhadas (por semana)
-ExpectedWorkedHours=Horas trabalhadas esperadas por semana
 ColorUser=Cor do usuario
 UserAccountancyCode=Código de contabilidade do usuário
 UserLogoff=Usuário desconetado
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 9c2a8102eac..ee7e7a6310f 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Referência
 LabelAccount=Etiqueta de conta
 LabelOperation=Operação de etiqueta
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Código de rotulação
 Lettering=Lettering
 Codejournal=Diário
@@ -297,7 +297,7 @@ NoNewRecordSaved=Não há mais registros para journalize
 ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualquer conta contabilística
 ChangeBinding=Alterar vinculação
 Accounted=Contabilizado no ledger
-NotYetAccounted=Ainda não contabilizado no razão
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index b5400f7bcac..42b4c51e694 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remova / renomeie o arquivo <b> %s </b> se existir, para permitir o u
 RestoreLock=Restaure o arquivo <b> %s </b>, apenas com permissão de leitura, para desativar qualquer uso posterior da ferramenta Atualizar / Instalar.
 SecuritySetup=Configuração de segurança
 PHPSetup=PHP setup
+OSSetup=OS setup
 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
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Não sugerir
 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alertas
 DelaysOfToleranceBeforeWarning=Atrase antes de exibir um alerta de aviso para:
 DelaysOfToleranceDesc=Defina o atraso antes que um ícone de alerta %s seja mostrado na tela para o elemento atrasado.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Deve executar este comando a pa
 YourPHPDoesNotHaveSSLSupport=Funções SSL não estão disponíveis no seu PHP
 DownloadMoreSkins=Mais temas para descarregar
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Mostrar id profissional com endereços
 ShowVATIntaInAddress=Ocultar número de IVA intracomunitário com endereços
 TranslationUncomplete=Tradução parcial
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 71855ac6da8..85603fd0468 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Pagamento da taxa social/fiscal
 BankTransfer=Transferência de crédito
 BankTransfers=Transferências de crédito
 MenuBankInternalTransfer=Transferência interna
-TransferDesc=Transferência de uma conta para outra, Dolibarr escreverá dois registros (um débito na conta de origem e um crédito na conta de destino). O mesmo valor (exceto sinal), rótulo e data serão usados para esta transação)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=De
 TransferTo=Para
 TransferFromToDone=A transferência de <b>%s</b> para <b>%s</b> de <b>%s</b> %s foi criado.
-CheckTransmitter=Emissor
+CheckTransmitter=Remetente
 ValidateCheckReceipt=Validar este recibo do cheque?
-ConfirmValidateCheckReceipt=Tem a certeza que deseja validar este recibo do cheque (não será possível alterar depois de validado)?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Eliminar este recibo do cheque?
 ConfirmDeleteCheckReceipt=Tem a certeza que deseja eliminar este recibo do cheque?
 BankChecks=Cheques
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Tem a certeza que deseja eliminar esta entrada?
 ThisWillAlsoDeleteBankRecord=Isto também eliminará a entrada bancária gerada
 BankMovements=Movimentos
 PlannedTransactions=Entradas previstas
-Graph=Gráficos
+Graph=Graphs
 ExportDataset_banque_1=Entradas bancárias e extrato de conta
 ExportDataset_banque_2=Comprovativo de depósito
 TransactionOnTheOtherAccount=Transacção sobre outra Conta
@@ -142,7 +142,7 @@ AllAccounts=Todas as contas bancárias e de caixa
 BackToAccount=Voltar à Conta
 ShowAllAccounts=Mostrar para todas as Contas
 FutureTransaction=Transação futura. Incapaz de reconciliar.
-SelectChequeTransactionAndGenerate=Selecione / filtrar cheques para incluir no recibo do cheque e clique em "Criar".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Escolha o extrato bancário relacionado com a conciliação. Use um valor numérico classificável: YYYYMM ou YYYYMMDD
 EventualyAddCategory=Eventualmente, especifique uma categoria que deseja classificar os movimentos
 ToConciliate=Para reconciliar?
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 7ad76c2e3ea..a439d38632e 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Converter o excesso pago em desconto disponível
 EnterPaymentReceivedFromCustomer=Adicionar pagamento recebido de cliente
 EnterPaymentDueToCustomer=Realizar pagamento de recibos à cliente
 DisabledBecauseRemainderToPayIsZero=Desativado porque o restante não pago é zero
-PriceBase=preço base
+PriceBase=Base price
 BillStatus=Estado da fatura
 StatusOfGeneratedInvoices=Estado das faturas geradas
 BillStatusDraft=Rascunho (precisa de ser validado)
@@ -454,7 +454,7 @@ RegulatedOn=Regulado em
 ChequeNumber=Cheque nº
 ChequeOrTransferNumber=Cheque/Transferência nº
 ChequeBordereau=Verifique o horário
-ChequeMaker=Transmissor do Cheque/Transferência
+ChequeMaker=Check/Transfer sender
 ChequeBank=Banco do cheque
 CheckBank=Verificar
 NetToBePaid=Quantia líquida a pagar
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 0573f7e4001..ee2cd22129a 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Marcadores: último %s
 BoxOldestExpiredServices=Mais antigos ativos de serviços vencidos
 BoxLastExpiredServices=Últimos %s contactos mais antigos com serviços ativos expirados
 BoxTitleLastActionsToDo=Últimas %s ações a fazer
-BoxTitleLastContracts=Últimos %s contratos modificados
-BoxTitleLastModifiedDonations=Últimos %s donativos modificados
-BoxTitleLastModifiedExpenses=Últimos %s relatórios de despesas modificados
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Atividade global (faturas, orçamentos, encomendas)
 BoxGoodCustomers=Bons clientes
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index 4c30714cba3..cf648b5eb8a 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Chão
 AddTable=Adicionar mesa
 Place=Lugar, colocar
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Encomendar impressoras
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Pesquisar produto
 Receipt=Ordem
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Navegador
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index fdc8741b851..8f2ef0077b4 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Etiqueta/Categoria
 Rubriques=Etiquetas/Categorias
 RubriquesTransactions=Etiquetas/Categorias de transações
 categories=etiquetas/categorias
-NoCategoryYet=Nenhuma etiqueta/categoria deste tipo foi criada
+NoCategoryYet=No tag/category of this type has been created
 In=em
 AddIn=Adicionar em
 modify=Modificar
 Classify=Classificar
 CategoriesArea=Área de etiquetas/categorias
-ProductsCategoriesArea=Área de etiquetas/categorias de produtos/serviços
-SuppliersCategoriesArea=Área de tags / categorias de fornecedores
-CustomersCategoriesArea=Área de etiquetas/categorias de clientes
-MembersCategoriesArea=Área de etiquetas/categorias de membros
-ContactsCategoriesArea=Área de etiquetas/categorias de contactos
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Área de etiquetas/categorias de projetos
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Subcategorias
 CatList=Lista de etiquetas/categorias
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Escolha a categoria
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 4ee185ca7d9..cdcce005410 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=O nome da empresa %s já existe. Escolha outro.
 ErrorSetACountryFirst=Defina primeiro o país
 SelectThirdParty=Selecione um terceiro
-ConfirmDeleteCompany=Deseja eliminar esta empresa e toda a sua informação?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Eliminar um contacto/morada
-ConfirmDeleteContact=Deseja eliminar este contacto e toda a sua informação?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Novo Terceiro
 MenuNewCustomer=Novo Cliente
 MenuNewProspect=Novo Potencial Cliente
@@ -69,7 +69,7 @@ PhoneShort=Telefone
 Skype=Skype
 Call=Chamada
 Chat=Chat
-PhonePro=Telef. Profissional
+PhonePro=Bus. phone
 PhonePerso=Telef. particular
 PhoneMobile=Telemovel
 No_Email=Recusar emails em massa
@@ -78,7 +78,7 @@ Zip=Código postal
 Town=Localidade
 Web=Web
 Poste= Posição
-DefaultLang=Idioma predefinido
+DefaultLang=Default language
 VATIsUsed=Imposto sobre vendas usado
 VATIsUsedWhenSelling=Isso define se esse terceiro inclui um imposto de venda ou não quando faz uma fatura para seus próprios clientes
 VATIsNotUsed=Não sujeito a IVA
@@ -331,7 +331,7 @@ CustomerCodeDesc=Código do cliente, exclusivo para todos os clientes
 SupplierCodeDesc=Código de Fornecedor, exclusivo para todos os fornecedores
 RequiredIfCustomer=Requerida se o Terceiro for Cliente ou Cliente Potencial
 RequiredIfSupplier=Obrigatório se os terceiros forem fornecedores
-ValidityControledByModule=Validade controlada pelo módulo
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Regras para este módulo
 ProspectToContact=Cliente Potencial a Contactar
 CompanyDeleted=A Empresa "%s" foi Eliminada
@@ -439,12 +439,12 @@ ListSuppliersShort=Lista de Fornecedores
 ListProspectsShort=Lista de Perspectivas
 ListCustomersShort=Lista de Clientes
 ThirdPartiesArea=Terceiros / Contatos
-LastModifiedThirdParties=Últimos %s terceiros modificados
-UniqueThirdParties=Total de Terceiros
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Aberto
 ActivityCeased=Fechado
 ThirdPartyIsClosed=O terceiro encontra-se fechado
-ProductsIntoElements=Lista de produto /serviços em %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Risco alcançado
 OutstandingBill=Montante máximo para faturas pendentes
 OutstandingBillReached=Montante máximo para faturas pendente foi alcançado
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Código de cliente/fornecedor livre sem verificação. po
 ManagingDirectors=Nome Diretor(es) (DE, diretor, presidente ...)
 MergeOriginThirdparty=Terceiro duplicado (terceiro que deseja eliminar)
 MergeThirdparties=Gerir terceiros
-ConfirmMergeThirdparties=Tem certeza de que deseja mesclar esse terceiro no atual? Todos os objetos vinculados (faturas, pedidos, ...) serão movidos para o terceiro atual e, em seguida, o terceiro será excluído.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Os terceiros foram fundidos
 SaleRepresentativeLogin=Nome de utilizador do representante de vendas
 SaleRepresentativeFirstname=Primeiro nome do representante de vendas
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 516a0aaed54..089e1acc3fc 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Novo desconto
 NewCheckDeposit=Novo depósito de cheque
 NewCheckDepositOn=Criar Novo deposito na conta: %s
 NoWaitingChecks=Nenhum cheque aguarda depósito.
-DateChequeReceived=Data da receção do cheque
+DateChequeReceived=Check receiving date
 NbOfCheques=Nº de cheques
 PaySocialContribution=Pagar um imposto social/fiscal
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/pt_PT/ecm.lang b/htdocs/langs/pt_PT/ecm.lang
index 05e460b49ed..7710e5cd003 100644
--- a/htdocs/langs/pt_PT/ecm.lang
+++ b/htdocs/langs/pt_PT/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 60c54d79eb1..f483a6abc58 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Nenhum erro
 # Errors
 ErrorButCommitIsDone=Erros encontrados, mas a validação foi efetuada apesar disso
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=O url %s está errado
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Valor ruim para o seu parâmetro. Acrescenta geralmente quando falta a tradução.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=O login %s já existe.
@@ -46,8 +46,8 @@ ErrorWrongDate=A data não está correcta!
 ErrorFailedToWriteInDir=Impossivel escrever na pasta %s
 ErrorFoundBadEmailInFile=Encontrada sintaxis incorrecta em email em %s linhas em Ficheiro (Exemplo linha %s com email=%s)
 ErrorUserCannotBeDelete=O usuário não pode ser excluído. Talvez esteja associado a entidades do Dolibarr.
-ErrorFieldsRequired=Não se indicaram alguns campos obrigatórios
-ErrorSubjectIsRequired=O tópico do email é obrigatório
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject 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
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=A página / container <strong> %s </
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/pt_PT/eventorganization.lang b/htdocs/langs/pt_PT/eventorganization.lang
new file mode 100644
index 00000000000..b15ebc7ff3f
--- /dev/null
+++ b/htdocs/langs/pt_PT/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Definições
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Esboço, projeto
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Realizadas
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/pt_PT/knowledgemanagement.lang b/htdocs/langs/pt_PT/knowledgemanagement.lang
new file mode 100644
index 00000000000..d73f86f5340
--- /dev/null
+++ b/htdocs/langs/pt_PT/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Definições
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Sobre
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Artigo
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index df6212dc07b..ab74458e321 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Para utilizador(es)
 MailCC=Cópia a
 MailToCCUsers=Copiar para utilizador(es)
 MailCCC=Adicionar Cópia a
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Mensagem
 MailFile=Ficheiro
 MailMessage=Texto utilizado no corpo da mensagem
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=A configuração do envio de email foi configurada para '%s'. Este modo não pode ser usado para enviar e-mails em massa.
 MailSendSetupIs2=Você deve primeiro ir, com uma conta admin, no menu %sHome - Setup - EMails%s para alterar o parâmetro <strong> '%s' </ strong> para usar o modo '%s'. Com esse modo, você pode inserir a configuração do servidor SMTP fornecido pelo seu provedor de serviços de Internet e usar o recurso de envio de email em massa.
 MailSendSetupIs3=Se você tiver alguma dúvida sobre como configurar seu servidor SMTP, você pode perguntar para %s.
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index c5cecedc64b..64814d5926e 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Salvar e criar novo
 TestConnection=Testar conexão
 ToClone=Clonar
 ConfirmCloneAsk=De certeza que quer clonar o objecto <b>%s</b>?
-ConfirmClone=Escolha a data que quer clonar:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Não existem dados definidos para clonar.
 Of=de
 Go=Avançar
@@ -246,7 +246,7 @@ DefaultModel=Modelo de documento predefinido
 Action=Evento
 About=Sobre
 Number=Número
-NumberByMonth=Número por mês
+NumberByMonth=Total reports by month
 AmountByMonth=Valor por mês
 Numero=Número
 Limit=Limite
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=Utilizador que criou
-UserModif=Utilizador que efetuou a última modificação
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Por
 From=De
 FromDate=De
 FromLocation=De
-at=em
 to=Para
 To=Para
+ToDate=Para
+ToLocation=Para
+at=em
 and=e
 or=ou
 Other=Outro
@@ -843,7 +845,7 @@ XMoreLines=%s linhas(s) ocultas
 ShowMoreLines=Mostrar mais/menos linhas
 PublicUrl=URL público
 AddBox=Adicionar Caixa
-SelectElementAndClick=Selecione um elemento e clique em %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Imprimir Ficheiro %s
 ShowTransaction=Mostrar transação
 ShowIntervention=Mostrar intervenção
@@ -854,8 +856,8 @@ Denied=Negada
 ListOf=Lista de %s
 ListOfTemplates=Lista de modelos
 Gender=Género
-Genderman=Homem
-Genderwoman=Mulher
+Genderman=Male
+Genderwoman=Female
 Genderother=Outro
 ViewList=Ver Lista
 ViewGantt=Vista de Gantt
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index d69590f69c2..6bbaed3730c 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro <b>(nome: %s, login: %s)
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por motivos de segurança, você deve ser concedido permissões para editar todos os usuários para poder ligar um membro de um usuário que não é seu.
 SetLinkToUser=Link para um usuário Dolibarr
 SetLinkToThirdParty=Link para uma Dolibarr terceiro
-MembersCards=Cartões de negócio dos membros
+MembersCards=Business cards for members
 MembersList=Lista de Membros
 MembersListToValid=Lista de Membros rascunho (a Confirmar)
 MembersListValid=Lista de Membros validados
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Membros com assinatura para receber
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Data filiação
 DateEndSubscription=Data fim filiação
-EndSubscription=Fim filiação
+EndSubscription=Subscription Ends
 SubscriptionId=Assinaturas id
 WithoutSubscription=Without subscription
 MemberId=Estados-id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Sujeito a cotação
 DeleteType=Apagar
 VoteAllowed=Voto autorizado
-Physical=Pessoa Singular
-Moral=Pessoa Coletiva
-MorAndPhy=Moral and Physical
-Reenable=Reactivar
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminar um membro
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Membros estatísticas por país
 MembersStatisticsByState=Membros estatísticas por estado / província
 MembersStatisticsByTown=Membros estatísticas por localidade
 MembersStatisticsByRegion=Estatísticas do membros por região
-NbOfMembers=Número de membros
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Nenhum membro validado encontrado
-MembersByCountryDesc=Esta tela mostrará estatísticas sobre membros dos países. Gráfico depende, contudo, no serviço gráfico online da Google e apenas está disponível se existir uma conexão à Internet a funcionar.
-MembersByStateDesc=Esta tela mostrar-lhe as estatísticas sobre os membros por estado / província .
-MembersByTownDesc=Esta tela mostrará estatísticas sobre membros por localidade.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Escolha as estatísticas que você deseja ler ...
 MenuMembersStats=Estatística
-LastMemberDate=Última data do membro
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Data da última subscrição
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=As informações são públicas
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Novo membro acrescentou. Aguardando aprovação
 NewMemberForm=Forma novo membro
-SubscriptionsStatistics=Estatísticas sobre assinaturas
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Número de assinaturas
-AmountOfSubscriptions=Quantidade de assinaturas
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Volume de negócios (para uma empresa) ou do Orçamento (para uma fundação)
 DefaultAmount=Quantidade padrão de assinatura
 CanEditAmount=Visitante pode escolher / editar montante da sua subscrição
 MEMBER_NEWFORM_PAYONLINE=Ir a página de pagamento online integrado
 ByProperties=Por natureza
 MembersStatisticsByProperties=Estatísticas dos membros por natureza
-MembersByNature=Esta tela mostra estatísticas sobre membros por natureza.
-MembersByRegion=Esta tela mostra estatísticas sobre membros por região.
 VATToUseForSubscriptions=Taxa de IVA a utilizar para assinaturas
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produto utilizado para assinatura na fatura: %s
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index 4a04d50e4db..9d3997269fb 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Lista de permissões definidas
 SeeExamples=Veja exemplos aqui
 EnabledDesc=Condição para ter este campo ativo (Exemplos: 1 ou $ conf-> global-> MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=O valor do campo pode ser acumulado para obter um total na lista? (Exemplos: 1 ou 0)
 SearchAllDesc=O campo é usado para fazer uma pesquisa a partir da ferramenta de pesquisa rápida? (Exemplos: 1 ou 0)
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 965d7efd03d..19ea1b73c8c 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Instale ou ative a biblioteca GD na instalação do PHP para
 ProfIdShortDesc=<b>ID Prof. %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 para o somatório da quantidade de produtos/serviços
-StatsByNumberOfEntities=Estatísticas em número de entidades de referência (nº de fatura ou ordem ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Número de orçamentos
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Número de faturas a clientes
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/pt_PT/partnership.lang b/htdocs/langs/pt_PT/partnership.lang
new file mode 100644
index 00000000000..b2bfd88cccb
--- /dev/null
+++ b/htdocs/langs/pt_PT/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Data de inicio
+DatePartnershipEnd=Data de finalização
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Esboço, projeto
+PartnershipAccepted = Aceite
+PartnershipRefused = Recusada
+PartnershipCanceled = Cancelado
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
index b06edfcf759..93a0b6c782d 100644
--- a/htdocs/langs/pt_PT/productbatch.lang
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index a80fdcabe16..90df059d129 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Serviços apenas para venda
 ServicesOnPurchaseOnly=Serviços apenas para compra
 ServicesNotOnSell=Serviços não à venda e não disponíveis para compra
 ServicesOnSellAndOnBuy=Serviços para compra e venda
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Os últimos %s produtos registados
 LastRecordedServices=Os últimos %s serviços registados
 CardProduct0=Produto
@@ -73,12 +73,12 @@ SellingPrice=Preço de venda
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Preço de venda (inc. IVA)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Este valor pode ser usado para o cálculo da margem.
 SoldAmount=Quantidade vendida
 PurchasedAmount=Quantidade comprada
 NewPrice=Novo preço
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Editar etiqueta de preço de venda
 CantBeLessThanMinPrice=O preço de venda não pode ser inferior ao mínimo permitido para este produto ( %s sem impostos)
 ContractStatusClosed=Fechado
@@ -157,11 +157,11 @@ ListServiceByPopularity=Lista de serviços de popularidade
 Finished=Produto fabricado
 RowMaterial=Matéria Prima
 ConfirmCloneProduct=Tem certeza de que deseja clonar este produto ou serviço <b>%s</b>?
-CloneContentProduct=Clone todas as informações principais do produto / serviço
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone preços
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clonar variantes de produto
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Este produto é utilizado
 NewRefForClone=Ref. do novo produto/serviço
 SellingPrices=Preços de venda
@@ -170,12 +170,12 @@ CustomerPrices=Preços aos clientes
 SuppliersPrices=Preços de fornecedor
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=País de origem
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Rótulo curto
 Unit=Unidade
 p=você.
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index e7f30944323..b94c97c4627 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Contactos do Projeto
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Todos os projetos que eu posso ler (meus + público)
 AllProjects=Todos os Projetos
-MyProjectsDesc=Essa visão é limitada a projetos para os quais você é um contato
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Esta visualização apresenta todos os projetos que está autorizado a ler.
 TasksOnProjectsPublicDesc=Esta visão apresenta todas as tarefas em projetos que você pode ler.
 ProjectsPublicTaskDesc=Esta visualização apresenta todos os projetos e tarefas que está autorizado a ler.
 ProjectsDesc=Esta visualização apresenta todos os projetos (as suas permissões de utilizador concedem-lhe a permissão para ver tudo).
 TasksOnProjectsDesc=Esta visão apresenta todas as tarefas em todos os projetos (suas permissões de usuário permitem que você veja tudo).
-MyTasksDesc=Esta visão é limitada a projetos ou tarefas para as quais você é um contato.
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Apenas os projetos abertos estão visíveis (projetos em estado rascunho ou fechado não estão visíveis).
 ClosedProjectsAreHidden=Projetos fechados não são visíveis.
 TasksPublicDesc=Esta visualização apresenta todos os projetos e tarefas que está autorizado a ler.
 TasksDesc=Esta visualização apresenta todos os projetos e tarefas (as suas permissões de utilizador concedem-lhe permissão para ver tudo).
 AllTaskVisibleButEditIfYouAreAssigned=Todas as tarefas para projetos qualificados são visíveis, mas você pode inserir o tempo apenas para a tarefa atribuída ao usuário selecionado. Atribuir tarefa se você precisar inserir tempo nela.
-OnlyYourTaskAreVisible=Somente tarefas atribuídas a você estão visíveis. Atribua tarefas a si mesmo se não estiver visível e você precisar inserir tempo nela.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tarefas dos projetos
 ProjectCategories=Etiquetas/categorias de projeto
 NewProject=Novo projeto
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Não atribuído à tarefa
 NoUserAssignedToTheProject=Nenhum usuário atribuído a este projeto
 TimeSpentBy=Tempo gasto por
 TasksAssignedTo=Tarefas atribuídas a
-AssignTaskToMe=Atribuir tarefa para mim
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Atribuir tarefa a %s
 SelectTaskToAssign=Selecione a tarefa para atribuir ...
 AssignTask=Atribuir 
diff --git a/htdocs/langs/pt_PT/recruitment.lang b/htdocs/langs/pt_PT/recruitment.lang
index eb48df47240..a0adb2ce697 100644
--- a/htdocs/langs/pt_PT/recruitment.lang
+++ b/htdocs/langs/pt_PT/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index f66f4fbc0fe..c74059b2b48 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Tem a certeza de que deseja validar esta expedição com
 ConfirmCancelSending=Tem a certeza que deseja cancelar esta expedição?
 DocumentModelMerou=Mérou modelo A5
 WarningNoQtyLeftToSend=Atenção, não existe qualquer produto à espera de ser enviado.
-StatsOnShipmentsOnlyValidated=Estatísticas efetuadas sobre expedições validadas. A data usada é a data de validação da expedição (a data de entrega prevista nem sempre é conhecida).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Data prevista de entrega
 RefDeliveryReceipt=Ref. do recibo de entrega
 StatusReceipt=Estado do recibo de entrega
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index f8d8e1811d9..3d43ddfc367 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Nenhum produto predefinido para este objeto. Porta
 DispatchVerb=Expedição
 StockLimitShort=Limite para alerta
 StockLimit=Limite de estoque para alerta
-StockLimitDesc=(vazio) significa que não há aviso. <br> 0 pode ser usado para um aviso assim que o estoque estiver vazio.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Stock real
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index a97e339f1cd..89ff0bb9258 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Palavra-passe alterada em: %s
 SubjectNewPassword=A sua nova palavra-passa para %s
 GroupRights=Permissões de Grupo
 UserRights=Permissões de Utilizador
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Desativar
 DisableAUser=Desativar um Utilizador
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Utilize o Tipo de Campo para alterar
 OpenIDURL=URL de OpenID
 LoginUsingOpenID=Utilizar OpenID para iniciar a sessão
 WeeklyHours=Horas de trabalho (por semana)
-ExpectedWorkedHours=Horas de trabalho esperadas por semana
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Cor do utilizador
 DisabledInMonoUserMode=Desativado no modo de manutenção
 UserAccountancyCode=Código de contabilidade do utilizador
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 0242ca83fae..9666ec3700a 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 345f7a993a9..cd32c4486e2 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Referinţă
 LabelAccount=Etichetă cont
 LabelOperation=Etichetă operaţie
 Sens=Direcţie
-AccountingDirectionHelp=Pentru un cont contabil al unui client, utilizați Credit pentru a înregistra o plată pe care ați primit-o <br> Pentru un cont contabil al unui furnizor, utilizați Debit pentru a înregistra o plată pe care o efectuați
+AccountingDirectionHelp=Pentru un cont contabil de client, utilizează Credit pentru a înregistra o plată pe care ai primit-o<br> Pentru un cont contabil de furnizor, utilizează Debit pentru a înregistra o plată efectuată 
 LetteringCode=Codul de numerotare
 Lettering=Numerotare
 Codejournal=Jurnal
@@ -297,7 +297,7 @@ NoNewRecordSaved=Nu se mai înregistrează nicio intrare în jurnal.
 ListOfProductsWithoutAccountingAccount=Lista produselor care nu sunt asociate unui cont contabil
 ChangeBinding=Schimbați asocierea
 Accounted=Contabilizat în jurnal - Cartea Mare
-NotYetAccounted=Nu a fost încă înregistrată în jurnalul Cartea Mare
+NotYetAccounted=Nu este încă înregistrat în jurnalul contabil 
 ShowTutorial=Arată tutorial
 NotReconciled=Nu este decontat
 WarningRecordWithoutSubledgerAreExcluded=Atenție, toate operațiunile fără cont de subregistru definit sunt filtrate și excluse din această vizualizare
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 8d2e5b49903..18f013674a6 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Eliminați/redenumiți fișierul <b> %s </b> dacă există, pentru a
 RestoreLock=Restaurați fișierul <b>%s</b>, numai cu permisiunea de citire, pentru a dezactiva orice viitoare utilizare a instrumentului Actualizare/Instalare.
 SecuritySetup=Setări securitate
 PHPSetup=Configuraţie PHP
+OSSetup=Configuraţie sistem de operare
 SecurityFilesDesc=Definiți aici opțiunile legate de securitatea încărcării fișierelor.
 ErrorModuleRequirePHPVersion=Eroare, acest modul necesită versiunea PHP  %s sau mai nouă
 ErrorModuleRequireDolibarrVersion=Eroare, acest modul necesită versiunea Dolibarr %s sau mai nouă
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Nu sugera
 NoActiveBankAccountDefined=Niciun cont bancar activ definit
 OwnerOfBankAccount=Titularul contului bancar %s
 BankModuleNotActive=Modulul Conturi bancare nu este activat
-ShowBugTrackLink=Arată link-ul "<strong>%s</strong>"
+ShowBugTrackLink=Defineşte link-ul "<strong>%s</strong>" (gol pentru a nu afișa acest link, 'github' pentru link-ul către proiectul Dolibarr sau definiți direct o adresă URL 'https: // ...')
 Alerts=Alerte
 DelaysOfToleranceBeforeWarning=Durată înainte de afișarea unei alerte pentru:
 DelaysOfToleranceDesc=Setați întârzierea înainte ca o pictogramă de alertă %s să apară pe ecran pentru ultimul element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Trebuie să rulaţi această co
 YourPHPDoesNotHaveSSLSupport=Funcţiile SSL funcţii nu sunt disponibile în PHP.
 DownloadMoreSkins=Mai multe teme de descărcat
 SimpleNumRefModelDesc=Returnează numărul de referință în formatul %s yymm-nnnn unde yy este anul, mm este luna și nnnn este un număr secvențial cu incrementare automată fără resetare
+SimpleNumRefNoDateModelDesc=Returnează numărul de referință în formatul %s-nnnn unde nnnn este un număr de incrementare automată secvențial fără resetare
 ShowProfIdInAddress=Afișare id profesional cu adrese
 ShowVATIntaInAddress=Ascunde cota de TVA intracomunitar cu adrese
 TranslationUncomplete=Traducere parţială
@@ -1675,7 +1677,7 @@ NotificationEMailFrom=Email expeditor (De la) pentru email-urile trimise de modu
 FixedEmailTarget=Destinatar
 ##### Sendings #####
 SendingsSetup=Configurare modul Livrări
-SendingsReceiptModel=Trimiterea primirea model
+SendingsReceiptModel=Şablon notă de livrare
 SendingsNumberingModules=Modele de numerotare livrări
 SendingsAbility=Suport avize de expediţie pentru livrările către clienți.
 NoNeedForDeliveryReceipts=În majoritatea cazurilor, avizele de expediţie sunt utilizate atât pentru livrările către clienți (lista produselor care trebuie expediate), cât și pentru confirmarea şi semnarea de către client. Prin urmare, nota de confirmare a livrărilor de produse este o caracteristică duplicată și este rar activată.
@@ -2062,7 +2064,7 @@ UseDebugBar=Utilizează bara de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Numărul celor mai recente linii din jurnal care se vor păstra în consolă
 WarningValueHigherSlowsDramaticalyOutput=Avertizare, valorile foarte mari încetinesc dramatic viteza de afişare
 ModuleActivated=Modulul %s este activat şi încetineşte interfaţa
-ModuleActivatedWithTooHighLogLevel=Modulul %s este activat cu un nivel de jurnalizare prea ridicat (încearcă să utilizezi un nivel inferior pentru performanțe mai bune)
+ModuleActivatedWithTooHighLogLevel=Modulul %s este activat cu un nivel de jurnalizare prea ridicat (încearcă să utilizezi un nivel inferior pentru performanțe și securitate mai bune)
 ModuleSyslogActivatedButLevelNotTooVerbose=Modulul %s este activat și nivelul jurnalului (%s) este corect (nu prea detaliat) 
 IfYouAreOnAProductionSetThis=Dacă eşti într-un mediu de producţie, ar trebui să setezi această proprietate la %s.
 AntivirusEnabledOnUpload=Antivirusul este activat pentru fişierele încărcate
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Cu excepția cazului în care trebu
 NoWritableFilesFoundIntoRootDir=Nu au fost găsite în directorul rădăcină fișiere sau directoare scriptibile ale programelor comune (OK) 
 RecommendedValueIs=Recomandat: %s
 ARestrictedPath=O cale restricţionată
+CheckForModuleUpdate=Verificare actualizări module externe
+CheckForModuleUpdateHelp=Această acțiune se va conecta la editori de module externe pentru a verifica dacă este disponibilă o nouă versiune.
+ModuleUpdateAvailable=O actualizare este disponibilă
+NoExternalModuleWithUpdate=Nu au fost găsite actualizări pentru modulele externe
+SwaggerDescriptionFile=Fişier descriptor Swagger API (pentru utilizare redoc de exemplu)
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index e923a31fa89..ff671586d88 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Plată taxe sociale/fiscale și TVA
 BankTransfer=Transfer credit
 BankTransfers=Transferuri credit
 MenuBankInternalTransfer=Transfer intern
-TransferDesc=La un transfer de la un cont la altul, sistemul va scrie două înregistrări (un debit în contul sursă și un credit în contul destinaţie). Aceeași sumă (cu excepția semnului), eticheta și data va fi utilizată pentru această tranzacție)
+TransferDesc=Utilizează transferul intern pentru a transfera dintr-un cont în altul, aplicația va scrie două înregistrări: un debit în contul sursă și un credit în contul țintă. Aceeași sumă, etichetă și dată vor fi utilizate pentru această tranzacție.
 TransferFrom=De la
 TransferTo=La
 TransferFromToDone=Un transfer de la  <b>%s</b> la <b> %s </b>  de<b>%s</b> %s a fost înregistrat.
-CheckTransmitter=Emiţător
+CheckTransmitter=Expeditor
 ValidateCheckReceipt=Validați această chitanță cec?
-ConfirmValidateCheckReceipt=Sigur doriți să validați această chitanță cec, nu va mai  fi posibilă nicio modificare după ce aceasta va fi efectuată?
+ConfirmValidateCheckReceipt=Sigur vrei să trimiteți spre validare această filă cec? Nu sunt posibile modificări ulterioare.
 DeleteCheckReceipt=Ștergeți această chitanță cec? 
 ConfirmDeleteCheckReceipt=Sigur stergeți această chitanță cec?
 BankChecks=Cecuri bancare
@@ -142,7 +142,7 @@ AllAccounts=Toate conturile bancare și de numerar
 BackToAccount=Înapoi la cont
 ShowAllAccounts=Arată pentru toate conturile
 FutureTransaction=Tranzacție viitoare. Imposibil de reconciliat.
-SelectChequeTransactionAndGenerate=Selectează/filtrează cecurile de inclus în chitanța de depozit de cec și fă clic pe "Creare"
+SelectChequeTransactionAndGenerate=Acest ecran vă arată statistici ale membrilor în funcție de regiune.
 InputReceiptNumber=Alegeți extrasul de cont privitor la conciliere. Folosiţi o valoare numerică sortabilă : YYYYMM sau YYYYMMDD
 EventualyAddCategory=În cele din urmă, specifică o categorie în care să clasezi înregistrările
 ToConciliate=Să se deconteze?
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index c06f7e92184..f8bc43cf61c 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Converteşte excendentul plătit în reducere disponibi
 EnterPaymentReceivedFromCustomer=Introduceţi o încasare de la client
 EnterPaymentDueToCustomer=Introduceţi o plată restituire pentru client
 DisabledBecauseRemainderToPayIsZero=Dezactivată  pentru că restul de plată este zero
-PriceBase=Preţul de bază
+PriceBase=Preţ de bază
 BillStatus=Status factură
 StatusOfGeneratedInvoices=Status factură generată
 BillStatusDraft=Schiţă (de validat)
@@ -454,7 +454,7 @@ RegulatedOn=Plătite pe
 ChequeNumber=Cec Nr
 ChequeOrTransferNumber=Cec / Transfer Nr
 ChequeBordereau=Borderou cec
-ChequeMaker=Verificare / transmițător Transfer
+ChequeMaker=Emitent cec/transfer
 ChequeBank=Banca Cec
 CheckBank=Verifică
 NetToBePaid=Net de plată
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index c755a8664f6..b487e847d65 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmark-uri : ultimile %s
 BoxOldestExpiredServices=Cele mai vechi servicii active expirate
 BoxLastExpiredServices=Cele mai vechi %s contacte cu servicii active expirate
 BoxTitleLastActionsToDo=Ultimele %s acţiuni de realizat
-BoxTitleLastContracts=Ultimele %s contracte modificate 
-BoxTitleLastModifiedDonations=Ultimele %s donaţii modificate 
-BoxTitleLastModifiedExpenses=Ultimele %s deconturi modificare 
-BoxTitleLatestModifiedBoms=Ultimile %s bonuri de consum modificate 
-BoxTitleLatestModifiedMos=Ultimile %s comenzi de producţie modificate
+BoxTitleLastContracts=Ultimele %s contracte modificate
+BoxTitleLastModifiedDonations=Utimele %s donaţii modificate
+BoxTitleLastModifiedExpenses=Ultimele %s rapoarte de cheltuieli modificate
+BoxTitleLatestModifiedBoms=Ultimele %s bonuri de consum modificate
+BoxTitleLatestModifiedMos=Ultimele %s comenzi de producţie modificate
 BoxTitleLastOutstandingBillReached=Clienţii cu restanţe mai mari decât limita de credit acceptată
 BoxGlobalActivity=Activitate globală (facturi, oferte, comenzi)
 BoxGoodCustomers=Clienţi buni
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index d8622b9d3ee..ca9d3d6a26f 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -9,15 +9,15 @@ CashdeskShowServices=Servicii disponibile
 CashDeskProducts=Produse
 CashDeskStock=Stoc
 CashDeskOn=pe
-CashDeskThirdParty=Terţ
-ShoppingCart=Cosul de cumparaturi
+CashDeskThirdParty=Terţi
+ShoppingCart=Coş de cumpărături
 NewSell=Vânzare nouă
-AddThisArticle=Adauga acest articol
-RestartSelling=Du-te inapoi la vânzare
-SellFinished=Vanzare completa
-PrintTicket=Print bon
+AddThisArticle=Adaugă acest articol
+RestartSelling=Înapoi la vânzare
+SellFinished=Vânzare finalizată
+PrintTicket=Tipărire bon
 SendTicket=Trimite tichet
-NoProductFound=Niciun articol gasit
+NoProductFound=Niciun articol găsit
 ProductFound=produs găsit
 NoArticle=Niciun articol
 Identification=Identificare
@@ -29,19 +29,20 @@ Change=Primit în plus
 BankToPay=Contul de plată
 ShowCompany=Afişare companie
 ShowStock=Arată depozit
-DeleteArticle=Faceţi clic pentru a elimina acest articol
+DeleteArticle=Clic pentru a elimina acest articol
 FilterRefOrLabelOrBC=Caută (Ref/Etichetă)
-UserNeedPermissionToEditStockToUsePos=Cereți să scadă stocul la crearea facturii, astfel încât utilizatorul care utilizează POS trebuie să aibă permisiunea de a edita stocul.
+UserNeedPermissionToEditStockToUsePos=Aţi cerut să se scadă stocul la crearea facturii, deci utilizatorul care foloseşte POS trebuie să aibă permisiunea de a edita stocul.
 DolibarrReceiptPrinter=Printer încasare
 PointOfSale=Punct de vânzare
 PointOfSaleShort=POS
-CloseBill=Închideți factura
+CloseBill=Închide factura
 Floors=Etaje
 Floor=Etaj
 AddTable=Adăugați un tabel
 Place=Loc
 TakeposConnectorNecesary='Connectorul TakePOS' este necesar
-OrderPrinters=Comandați imprimante
+OrderPrinters=Adaugă un buton pentru a trimite comanda unor imprimante specificate, fără plată (de exemplu pentru a trimite o comandă în bucătărie)
+NotAvailableWithBrowserPrinter=Indisponibil când imprimanta pentru bonuri este setată la browser:
 SearchProduct=Căutați produs
 Receipt=Chitanţă
 Header=Antet
@@ -51,20 +52,21 @@ TheoricalAmount=Valoare teoretică
 RealAmount=Sumă reală
 CashFence=Închidere casierie
 CashFenceDone=Închiderea casei de marcat efectuată pentru perioada respectivă
-NbOfInvoices=Nr  facturi
+NbOfInvoices=Nr. facturi
 Paymentnumpad=Tipul de pad utilizat pentru introducerea plăţii
-Numberspad=Suport de numere
+Numberspad=Pad numeric
 BillsCoinsPad=Pad Monede şi bancnote
-DolistorePosCategory=Modulele TakePOS și alte soluții POS pentru Dolibarr
-TakeposNeedsCategories=TakePOS are nevoie de categorii de produse pentru a lucra
-OrderNotes=Note de comandă
+DolistorePosCategory=Modulele TakePOS și alte soluții POS pentru sistem
+TakeposNeedsCategories=TakePOS are nevoie de cel puțin o categorie de produse pentru a funcționa
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS are nevoie de cel puțin 1 categorie de produse din categoria <b>%s</b> pentru a funcționa
+OrderNotes=Poate adăuga note la fiecare articol comandat
 CashDeskBankAccountFor=Cont implicit utilizat pentru plăți
 NoPaimementModesDefined=Nici un mod de plată definit în configurația TakePOS
 TicketVatGrouped=Grupează TVA după cotă pe tichete|bonuri
 AutoPrintTickets=Tipăreşte automat tichete|bonuri
 PrintCustomerOnReceipts=Tipăreşte clientul pe tichete|bonuri
 EnableBarOrRestaurantFeatures=Activați funcțiile pentru Bar sau Restaurant
-ConfirmDeletionOfThisPOSSale=Confirmă ștergerea acestei vânzări curente?
+ConfirmDeletionOfThisPOSSale=Confirmi ștergerea acestei vânzări curente?
 ConfirmDiscardOfThisPOSSale=Vrei să elimini această vânzare curentă?
 History=Istoric
 ValidateAndClose=Validați și închideți
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Factura este deja validată
 NoLinesToBill=Nici o linie de facturat
 CustomReceipt=Bon personalizat
 ReceiptName=Denumire bon
-ProductSupplements=Suplimente produs
+ProductSupplements=Gestionare suplimente de produse
 SupplementCategory=Categorie suplimente
 ColorTheme=Tema de culoare
 Colorful=Colorat
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Tipărirea simplă și ușoară a chitanței. Doar câțiva parametri pentru a configura chitanța. Tipăriți prin browser.
 TakeposConnectorMethodDescription=Modul extern cu funcții suplimentare. Posibilitatea de a imprima din cloud.
 PrintMethod=Metoda de tipărire
-ReceiptPrinterMethodDescription=Metodă eficientă cu o mulțime de parametri. Personalizabilă cu șabloane. Nu se poate imprima din cloud.
+ReceiptPrinterMethodDescription=Metodă strong, cu o mulțime de parametri. Complet personalizabil cu șabloane. Serverul care găzduiește aplicația nu poate fi în cloud (trebuie să poată ajunge la imprimantele din rețeaua ta).
 ByTerminal=După terminal
 TakeposNumpadUsePaymentIcon=Utilizați pictograme în loc de text pe butoanele de plată de pe numpad
 CashDeskRefNumberingModules=Modul de numerotare pentru vânzările POS
@@ -106,7 +108,7 @@ CashReport=Raport numerar
 MainPrinterToUse=Imprimantă principală de utilizat
 OrderPrinterToUse=Imprimantă utilizată pentru comenzi
 MainTemplateToUse=Şablon principal de utilizat
-OrderTemplateToUse=Şablon comandă utilizat
+OrderTemplateToUse=Şablon comandă de utilizat
 BarRestaurant=Bar Restaurant
 AutoOrder=Comandă făcută de client
 RestaurantMenu=Meniu
@@ -120,7 +122,9 @@ NumberOfLinesToShow= Numărul de linii de imagini de afișat
 DefineTablePlan=Definire plan de mese
 GiftReceiptButton=Adaugă un buton "Bon cadou"
 GiftReceipt=Bon cadou 
-ModuleReceiptPrinterMustBeEnabled= \nModulul Imprimanta bonuri trebuie să fi fost activat mai întâi
+ModuleReceiptPrinterMustBeEnabled=Modulul Imprimanta bonuri trebuie să fi fost activat mai întâi
 AllowDelayedPayment= Permite plata cu întârziere
 PrintPaymentMethodOnReceipts=Tipăriți metoda de plată pe bonuri|chitanțe 
 WeighingScale=Cântar
+ShowPriceHT = Afișați coloana de preț fără taxe
+ShowPriceHTOnReceipt = Afișați coloana de preţ fără taxe pe bon/chitanţă
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index efbd177ea76..5c047e6b922 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Categorie
 Rubriques=Tag-uri/Categorii
 RubriquesTransactions=Tag-uri/categorii tranzacții
 categories=tag-uri/categorii
-NoCategoryYet=Niciun tag/categorie de acest tip creat
+NoCategoryYet=Nu a fost creată niciun tag/categorie de acest tip
 In=În
 AddIn=Adaugă în
 modify=modifică
 Classify=Clasifică
 CategoriesArea=Tag-uri/Categorii
-ProductsCategoriesArea=Tag-uri/categorii Produse/Servicii
-SuppliersCategoriesArea=Tag-uri/categorii furnizori
-CustomersCategoriesArea=Tag-uri/categorii clienți
-MembersCategoriesArea=Tag-uri/categorii membri
-ContactsCategoriesArea=Tag-uri/categorii contacte
-AccountsCategoriesArea=Tag-uri/categorii conturi bancare
-ProjectsCategoriesArea=Tag-uri/categorii proiecte
-UsersCategoriesArea=Tag-uri/categorii utilizatori
+ProductsCategoriesArea=Tag-uri/categorii produs/serviciu
+SuppliersCategoriesArea=Tag-uri/categorii furnizor
+CustomersCategoriesArea=Tag-uri/categorii client
+MembersCategoriesArea=Tag-uri/categorii membru
+ContactsCategoriesArea=Tag-uri/categorii contact
+AccountsCategoriesArea=Tag-uri/categorii cont bancar
+ProjectsCategoriesArea=Tag-uri/categorii proiect
+UsersCategoriesArea=Tag-uri/categorii utilizator
 SubCats=Subcategorii
 CatList=Listă tag-uri/categorii
 CatListAll=Listă tag-uri/categorii (toate tipurile)
@@ -96,4 +96,4 @@ ChooseCategory=Alegeți categoria
 StocksCategoriesArea=Categorii depozite
 ActionCommCategoriesArea=Categorii evenimente
 WebsitePagesCategoriesArea=Categorii Pagină-Container
-UseOrOperatorForCategories=Utilizează operatorul SAU pentru categorii
+UseOrOperatorForCategories=Foloseşte operatorul 'SAU' pentru categorii
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 3b606f937a1..6a2b8632bec 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Numele societăţii %s există deja. Alegeţi un altul.
 ErrorSetACountryFirst=Setaţi mai întâi ţara
 SelectThirdParty=Selectaţi un terţ
-ConfirmDeleteCompany=Sigur doriți să ștergeți această companie și toate informațiile moștenite?
+ConfirmDeleteCompany=Sigur vrei să ştergi această companie cu toate informaţiile aferente?
 DeleteContact=Şterge un contact/adresă
-ConfirmDeleteContact=Sigur doriți să ștergeți acest contact și toate informațiile moștenite?
+ConfirmDeleteContact=Sigur vrei să ştergi acest contact cu toate informaţiile aferente?
 MenuNewThirdParty=Terț nou
 MenuNewCustomer=Client nou
 MenuNewProspect=Prospect nou
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Apel telefonic
 Chat=Chat
-PhonePro=Telefon prof.
+PhonePro=Telefon serviciu
 PhonePerso=Telefon pers.
 PhoneMobile=Telefon mobil
 No_Email=Refuză newslettere
@@ -331,7 +331,7 @@ CustomerCodeDesc=Cod client, unic pentru toți clienți
 SupplierCodeDesc=Cod furnizor, unic pentru toți furnizorii
 RequiredIfCustomer=Obligatoriu, dacă un terţ este un client sau prospect
 RequiredIfSupplier=Obligatoriu dacă terțul este un furnizor
-ValidityControledByModule=Validitate controlată de modul
+ValidityControledByModule=Validitate controlată de modul 
 ThisIsModuleRules=Reguli pentru acest modul
 ProspectToContact=Prospect de contactat
 CompanyDeleted=Societatea "%s" a fost ştearsă din baza de date.
@@ -439,12 +439,12 @@ ListSuppliersShort=Listă furnizori
 ListProspectsShort=Listă prospecţi
 ListCustomersShort=Listă clienți
 ThirdPartiesArea=Terți/Contacte
-LastModifiedThirdParties=Ultimii %s Terţi modificaţi
-UniqueThirdParties=Total terţi
+LastModifiedThirdParties=Ultimii %s terţi modificaţi
+UniqueThirdParties=Număr total de terţi
 InActivity=Deschis
 ActivityCeased=Închis
 ThirdPartyIsClosed=Terțul este închis
-ProductsIntoElements=Ultimele produse/servicii în %s
+ProductsIntoElements=Lista produselor/serviciilor mapate la %s
 CurrentOutstandingBill=Facturi neachitate curente
 OutstandingBill=Max. limită credit
 OutstandingBillReached=Limită credit depăsită 
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Codul este liber fără verificare. Acest cod poate fi mo
 ManagingDirectors=Nume manager(i) (CEO, director, preşedinte...)
 MergeOriginThirdparty=Terț duplicat (terțul dorit a fi șters)
 MergeThirdparties=Îmbinare terţi
-ConfirmMergeThirdparties=Sunteți sigur că doriți să fuzionați aceast terț cu cel curent? Toate obiectele legate (facturi, comenzi, ...) vor fi mutate la un terț curent, iar terțul va fi șters.
+ConfirmMergeThirdparties=Sigur vrei să îmbinii terțul ales cu cel actual? Toate obiectele asociate (facturi, comenzi, ...) vor fi mutate la terțul curent, după care terțul ales va fi șters.
 ThirdpartiesMergeSuccess=Terții au fost unificaţi
 SaleRepresentativeLogin=Autentificare reprezentant vânzări
 SaleRepresentativeFirstname=Numele reprezentantului vânzări
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index d4ae7a6a2b7..774cbbf85d4 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -132,10 +132,10 @@ CheckReceipt=Borderou de cecuri remise
 CheckReceiptShort=Borderou încasări cecuri
 LastCheckReceiptShort=Ultimele %s cecuri remise
 NewCheckReceipt=Discount nou
-NewCheckDeposit=New verifica depozit
-NewCheckDepositOn=New verifica depozit în contul: %s
+NewCheckDeposit=Borderou cec nou
+NewCheckDepositOn=Crează chitanţă de depozit pe contul: %s
 NoWaitingChecks=CEC-uri spre încasare
-DateChequeReceived=Dată primire Cec
+DateChequeReceived=Dată primire cec
 NbOfCheques=Nr. cecuri
 PaySocialContribution=Plăteşte o taxă socială/fiscală
 PayVAT=Plătește o declarație de TVA
@@ -245,7 +245,7 @@ ACCOUNTING_VAT_SOLD_ACCOUNT=Contul contabil implicit pentru TVA la vânzări (ut
 ACCOUNTING_VAT_BUY_ACCOUNT=Contul contabil implicit pentru TVA la achiziții (utilizat dacă nu este definit în setarea dicționarului TVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Contul contabil implicit pentru plata TVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Contul contabil utilizat pentru terți clienţi
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Contul contabil dedicat definit pe fişa terțului va fi utilizat numai pentru subregistrul contabilitate . Aceasta va fi utilizat pentru registrul general și ca valoare implicită pentru subregistru contabill dacă nu este definit contul contabil dedicat clienților de la terți.
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Contul contabil dedicat definit pe fişa terțului va fi utilizat numai pentru subregistrul contabilitate . Aceasta va fi utilizat pentru registrul general și ca valoare implicită pentru subregistru contabilldacă nu este definit contul contabil dedicat clienților de la terți.
 ACCOUNTING_ACCOUNT_SUPPLIER=Contul contabil utilizat pentru terți furnizori
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Contul contabil dedicat definit pe fişa terțului va fi utilizat numai pentru subregistrul contabil. Acesta va fi utilizat pentru Registrul general și ca valoare implicită a contabilității din subregistru dacă nu este definit contul contabil de vânzare asociat la un terț.
 ConfirmCloneTax=Confirmare clonare taxă socială/fiscală
diff --git a/htdocs/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
index d987ac9d0f1..6c692da973d 100644
--- a/htdocs/langs/ro_RO/ecm.lang
+++ b/htdocs/langs/ro_RO/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extracâmpuri Fişiere ECM
 ExtraFieldsEcmDirectories=Extracâmpuri Directoare ECM
 ECMSetup=Configurare ECM
 GenerateImgWebp=Duplică toate imaginile cu o altă versiune în format .webp
-ConfirmGenerateImgWebp=Dacă confirmi, vei genera o imagine în format .webp pentru toate imaginile aflate în prezent în acest folder și subfolderul său...
+ConfirmGenerateImgWebp=Dacă confirmi, vei genera o imagine în format .webp pentru toate imaginile aflate în prezent în acest folder (subfolderele nu sunt incluse)... 
 ConfirmImgWebpCreation=Confirmă duplicarea tuturor imaginilor
 SucessConvertImgWebp=Imaginile au fost duplicate cu succes
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index d31612d2443..19900e6c931 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Nicio eroare, dăm commit
 # Errors
 ErrorButCommitIsDone=Erori constatate dar încă nevalidate
-ErrorBadEMail=Emailul %s este greșit
-ErrorBadMXDomain=Email-ul %s pare greșit (domeniul nu are nicio înregistrare MX validă)
-ErrorBadUrl=Url-ul %s este greşit
+ErrorBadEMail=Adresa de email %s este incorectă
+ErrorBadMXDomain=Adresa de email %s pare incorectă (domeniul nu are o înregistrare MX validă)
+ErrorBadUrl=Url-ul %s este incorect
 ErrorBadValueForParamNotAString=Valoare greșită pentru parametru. Se adaugă,  în general, atunci când traducerea lipsește.
 ErrorRefAlreadyExists=Referinţa <b>%s</b> există deja.
 ErrorLoginAlreadyExists=Login-ul %s există deja.
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Pagina/containerul <strong>%s</strong
 ErrorDuringChartLoad=Eroare la încărcarea schemei de conturi. În cazul în care câteva conturi nu au fost încărcate, le puteți introduce în continuare manual.
 ErrorBadSyntaxForParamKeyForContent=Sintaxă greşită pentru parametru keyforcontent. Trebuie să aibă o valoare începând cu %s sau %s
 ErrorVariableKeyForContentMustBeSet=Eroare, trebuie să fie setată constanta cu numele %s (cu conținut de text care trebuie afișat) sau %s (cu adresa URL externă de afișat).
+ErrorURLMustEndWith=URL-ul %s trebuie să se termine cu %s
 ErrorURLMustStartWithHttp=URL-ul %s trebuie să înceapă cu http:// sau https://
 ErrorHostMustNotStartWithHttp=Numele gazdei %s NU trebuie să înceapă cu http:// sau https://
 ErrorNewRefIsAlreadyUsed=Eroare, noua referintă este deja utilizată
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Disponibil numai dacă se utilizează conexi
 WarningModuleXDisabledSoYouMayMissEventHere=Modulul %s nu a fost activat. Este posibil să pierdeți o mulțime de evenimente aici. 
 ErrorActionCommPropertyUserowneridNotDefined=Utilizatorul deţinător este obligatoriu
 ErrorActionCommBadType=Tipul evenimentului selectat (id: %n, cod: %s) nu există în dicţionarul Tipuri evenimente
+CheckVersionFail=Verificarea versiunii a eşuat
diff --git a/htdocs/langs/ro_RO/eventorganization.lang b/htdocs/langs/ro_RO/eventorganization.lang
new file mode 100644
index 00000000000..f1306c2da54
--- /dev/null
+++ b/htdocs/langs/ro_RO/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Organizare evenimente
+EventOrganizationDescription = Organizare evenimente utilizând modulul Proiecte
+EventOrganizationDescriptionLong= Gestionare organizare de evenimente conferințe, participanți, vorbitori și participanți, şi paginini publice de însciere
+#
+# Menu
+#
+EventOrganizationMenuLeft = Evenimente organizate
+EventOrganizationConferenceOrBoothMenuLeft = Conferinţă sau Stand
+
+#
+# Admin page
+#
+EventOrganizationSetup = Configurare Organizare evenimente
+Settings = Configurări
+EventOrganizationSetupPage = Pagină de configurare Organizare evenimente
+EVENTORGANIZATION_TASK_LABEL = Etichetă task-uri de creat automat atunci când proiectul este validat 
+EVENTORGANIZATION_TASK_LABELTooltip = Când validezi un eveniment organizat, unele task-uri pot fi create automat în proiect<br><br> De exemplu: <br>Apel telefonic pentru conferință <br>Apel telefonic pentru Stand <br>Primire apel telefonic pentru conferințe<br> Primire apel telefonic pentru Stand<br> Deschidere înscrieri la evenimente pentru participanți<br> Trimitere remindere eveniment către speaker-i<br>Trimitere reminder eveniment către gazdă stand<br> Trimitere reminder eveniment către participanți
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categorie de adăugat terților creaţi automat atunci când cineva sugerează o conferință
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categorie de adăugat terților creaţi automat atunci când propun un stand
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Șablon email de trimis după primirea unei sugestii de conferință.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Șablon email de trimis după primirea unei propuneri de stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Șablon email de trimis după ce a fost plătită o înscriere la un stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Șablon email de trimis după ce a fost plătită o înscriere la un eveniment.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Șablon email newsletter către participanţi
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Șablon email newsletter către speaker-i
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrează lista de selecție a terților în formularul/fişa de creare a participanților după tipul de client
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrează lista de selecție a terților în formularul/fişa de creare a participanților după tipul de client
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conferinţă sau Stand
+ManageOrganizeEvent = Management organizare evenimente
+ConferenceOrBooth = Conferinţă sau Stand
+ConferenceOrBoothTab = Conferinţă sau Stand
+AmountOfSubscriptionPaid = Valoare abonament plătită
+DateSubscription = Dată înscriere
+ConferenceOrBoothAttendee = Participant la Conferinţă sau Stand
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Solicitarea pentru conferinţă a fost recepţionată
+YourOrganizationEventBoothRequestWasReceived = Solicitarea ta pentru stand a fost primită
+EventOrganizationEmailAskConf = Solicitare conferinţă
+EventOrganizationEmailAskBooth = Solicitare stand
+EventOrganizationEmailSubsBooth = Înscriere la stand
+EventOrganizationEmailSubsEvent = Înscriere pentru un eveniment
+EventOrganizationMassEmailAttendees = Comunicare către participanţi
+EventOrganizationMassEmailSpeakers = Comunicare către speaker-i
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Permite persoanelor necunoscute să sugereze conferințe
+AllowUnknownPeopleSuggestConfHelp=Permite persoanelor necunoscute să sugereze conferințe
+AllowUnknownPeopleSuggestBooth=Permite persoanelor necunoscute să propună stand-uri
+AllowUnknownPeopleSuggestBoothHelp=Permite persoanelor necunoscute să propună stand-uri
+PriceOfRegistration=Preţ înregistrare
+PriceOfRegistrationHelp=Preţ înregistrare
+PriceOfBooth=Preț înscriere pentru stand
+PriceOfBoothHelp=Preț înscriere pentru stand
+EventOrganizationICSLink=Asociere calendar ICS pentru evenimente
+ConferenceOrBoothInformation=Informaţii Conferinţă sau Stand
+Attendees = Participanți
+EVENTORGANIZATION_SECUREKEY = Cheie securizată link public de înregistrare la o conferință
+#
+# Status
+#
+EvntOrgDraft = Schiţă
+EvntOrgSuggested = Sugerat
+EvntOrgConfirmed = Confirmat
+EvntOrgNotQualified = Ne-calificat
+EvntOrgDone = Efectuat
+EvntOrgCancelled = Anulat
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Link public de înscriere la conferinţă
+MissingOrBadSecureKey = Cheia de securitate lipseşte sau este invalidă
+EvntOrgWelcomeMessage = Acest formular îţi permite să te înregistrezi ca nou participant la conferință 
+EvntOrgStartDuration = Această conferinţă începe la 
+EvntOrgEndDuration =  şi se termină la
diff --git a/htdocs/langs/ro_RO/knowledgemanagement.lang b/htdocs/langs/ro_RO/knowledgemanagement.lang
new file mode 100644
index 00000000000..d5329400c6c
--- /dev/null
+++ b/htdocs/langs/ro_RO/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Sistem de management al bazei de cunoştinţe
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Gestiunea unei Baze de cunoştinţe(KB) sau a unei baze de suport Help-Desk
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Configurare Sistem de management al bazei de cunoştinţe
+Settings = Configurări
+KnowledgeManagementSetupPage = Pagină configurare Sistem de management al bazei de cunoştinţe
+
+
+#
+# About page
+#
+About = Despre
+KnowledgeManagementAbout = Despre modulul Bază de cunoştinţe
+KnowledgeManagementAboutPage = Pagină despre Managementul bazei de cunoştinţe
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Managementul bazei de cunoştinţe
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Bază de cunoştinţe
+ListOfArticles = Listă articole
+NewKnowledgeRecord = Articol nou
+ValidateReply = Validare soluţie
+KnowledgeRecords = Articole
+KnowledgeRecord = Articol
+KnowledgeRecordExtraFields = Extracâmpuri articole
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index ae1db7a2f66..a7d226c0e36 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -1,179 +1,179 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=Email-uri
-EMailing=Email-uri
-EMailings=EMailings
-AllEMailings=Toate eMailings
-MailCard=Fisă email-uri
+Mailing=Newsletter
+EMailing=Newsletter
+EMailings=Newslettere
+AllEMailings=Toate newsletterele
+MailCard=Fişă newsletter
 MailRecipients=Destinatari
-MailRecipient=Recipient
-MailTitle=Titlu
+MailRecipient=Destinatar
+MailTitle=Titlu descriere
 MailFrom=Expeditor
 MailErrorsTo=Erori la
-MailReply=Răspundeţi
-MailTo=Receiver (e)
+MailReply=Răspunde la
+MailTo=Destinatar(i)
 MailToUsers=Pentru utilizator(i)
-MailCC=Copiere în
-MailToCCUsers=Copiați la utilizator(i)
+MailCC=Copie la
+MailToCCUsers=CC la utilizator(i)
 MailCCC=Copie în cache a
-MailTopic=Temă pentru e-mail
+MailTopic=Subiect email
 MailText=Mesaj
 MailFile=Fişiere ataşate
-MailMessage=Continut Email
+MailMessage=Conţinut email
 SubjectNotIn=Nu în subiect
-BodyNotIn=Nu în corpul email-ului
-ShowEMailing=Arata email-uri
-ListOfEMailings=Lista de emailings
-NewMailing=Nou email-uri
-EditMailing=Editaţi email-uri
-ResetMailing=Retrimiteţi email-uri
-DeleteMailing=Ştergere email-uri
-DeleteAMailing=A şterge un email-uri
-PreviewMailing=Previzualizare email-uri
-CreateMailing=Creaţi-email-uri
-TestMailing=Test de email-uri
-ValidMailing=Valid email-uri
+BodyNotIn=Nu în corpul emailului
+ShowEMailing=Arată newsletter
+ListOfEMailings=Listă newslettere
+NewMailing=Newsletter nou
+EditMailing=Editare newsletter
+ResetMailing=Retrimitere newsletter
+DeleteMailing=Ştergere newsletter
+DeleteAMailing=Şterge un newsletter
+PreviewMailing=Previzualizare newsletter
+CreateMailing=Creare newsletter
+TestMailing=Test email
+ValidMailing=Validare emailuri
 MailingStatusDraft=Schiţă
 MailingStatusValidated=Validat
 MailingStatusSent=Trimis
 MailingStatusSentPartialy=Trimis parţial
 MailingStatusSentCompletely=Trimis complet
 MailingStatusError=Eroare
-MailingStatusNotSent=Nu trimis
-MailSuccessfulySent=E-mail (de la %s la %s) acceptat cu succes pentru livrare
-MailingSuccessfullyValidated=EMail validat cu succes
+MailingStatusNotSent=Netrimis
+MailSuccessfulySent=Emailul (de la %s la %s) acceptat cu succes pentru trimitere
+MailingSuccessfullyValidated=Newsletter validat cu succes
 MailUnsubcribe=Dezabonare
 MailingStatusNotContact=Nu mă mai contacta
-MailingStatusReadAndUnsubscribe=Citiți și dezabonați
-ErrorMailRecipientIsEmpty=Email destinatar este gol
-WarningNoEMailsAdded=Nu nou e-mail pentru a adăuga şi a destinatarului, listă.
-ConfirmValidMailing=Sigur doriți să confirmați această trimitere prin email?
-ConfirmResetMailing=Atenție, prin reinitializarea trimiterii prin email <b> %s </b>, veți permite retrimiterea acestui email într-o corespondență în masă. Sigur vrei să faci asta?
-ConfirmDeleteMailing=Sigur doriți să ștergeți acest email?
-NbOfUniqueEMails=Nr. de emailuri unice
-NbOfEMails=Nr. de emaluri
-TotalNbOfDistinctRecipients=Numărul de distincte destinatari
-NoTargetYet=Nu destinatari definit încă (Du-te la tab-ul 'Recipients')
-NoRecipientEmail=Nu există destinatar al emailului pentru %s
-RemoveRecipient=Eliminaţi destinatar
-YouCanAddYourOwnPredefindedListHere=Pentru a crea dvs. de e-mail selectorul de module, a se vedea htdocs / includes / modules / mesaje / README.
-EMailTestSubstitutionReplacedByGenericValues=Când utilizaţi modul de testare, substituţiilor variabile sunt înlocuite de valorile generic
+MailingStatusReadAndUnsubscribe=Citire și dezabonare
+ErrorMailRecipientIsEmpty=Adresa de email destinatar este goală
+WarningNoEMailsAdded=Niciun email nou de adăugat în lista de destinatari.
+ConfirmValidMailing=Sigur confirmați această trimitere?
+ConfirmResetMailing=Atenție, prin reiniţializarea newsletter-ului <b>%s</b>, vei permite retrimiterea acestuia. Sigur vrei să faci asta?
+ConfirmDeleteMailing=Sigur doriți să ștergeți acest newsletter?
+NbOfUniqueEMails=Nr. emailuri unice
+NbOfEMails=Nr. emaluri
+TotalNbOfDistinctRecipients=Număr destinatari distincţi
+NoTargetYet=Nu s-au definit destinatari (Du-te în tab-ul 'Destinatari')
+NoRecipientEmail=Nu există adresă de email destinatar pentru %s
+RemoveRecipient=Înlăturare destinatar
+YouCanAddYourOwnPredefindedListHere=Pentru a crea un modul de selectare a adreselor de email, consultă htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=Când utilizezi modul de testare, variabilele de substituţie sunt înlocuite cu valori generice
 MailingAddFile=Ataşaţi acest fisier
-NoAttachedFiles=Nu fişiere ataşate
-BadEMail=Valoare greşită pentru email
-ConfirmCloneEMailing=Sigur doriți să clonați această adresă de email?
-CloneContent=Clone mesaj
-CloneReceivers=Cloner destinatari
+NoAttachedFiles=Fără fişiere ataşate
+BadEMail=Valoare eronată pentru email
+ConfirmCloneEMailing=Sigur doriți să clonați acest newsletter?
+CloneContent=Clonare mesaj
+CloneReceivers=Clonare destinatari
 DateLastSend=Data ultimei trimiteri
-DateSending=Data trimiterea
+DateSending=Data trimiterii
 SentTo=Trimis la <b>%s</b>
 MailingStatusRead=Citit
-YourMailUnsubcribeOK=Emailul <b> %s </b> este dezabonat corect din lista de mailuri
-ActivateCheckReadKey=Cheia folosită pentru criptarea adresei URL folosită pentru funcția "Recepție citire" și "Dezabonare"
-EMailSentToNRecipients=Emailul trimis la destinatarii %s.
-EMailSentForNElements=E-mailul trimis pentru elementele %s.
-XTargetsAdded=<b>%s</b> destinatari adăugaţi în lista target
-OnlyPDFattachmentSupported=Dacă documentele PDF au fost deja generate pentru obiectele de trimis, acestea vor fi atașate la email. Dacă nu, nu va fi trimis nici un email (de asemenea, rețineți că numai documentele PDF sunt acceptate ca atașamente la trimiterea în masă în această versiune).
-AllRecipientSelected=Destinatarii înregistrării %s selectați (dacă emailul lor este cunoscut).
-GroupEmails=Grup de emailuri
-OneEmailPerRecipient=Un email pentru fiecare destinatar (în mod implicit, un email selectat pentru fiecare înregistrare )
-WarningIfYouCheckOneRecipientPerEmail=Atenție, dacă bifați această casetă, înseamnă că va fi trimis un singur email pentru mai multe înregistrări sectate, deci dacă mesajul dvs. conține variabile de substituție care se referă la datele unei înregistrări, nu este posibil să le înlocuiți.
-ResultOfMailSending=Rezultatul trimiterii de email în masă
-NbSelected=Număr selectate
-NbIgnored=Număr ignorate
-NbSent=Număr trimise
-SentXXXmessages= %s Mesaj(e) trimise.
-ConfirmUnvalidateEmailing=Sigur doriți să schimbați emailul <b> %s </b> la starea de schiţă?
-MailingModuleDescContactsWithThirdpartyFilter=Contactați filtrele clienților
-MailingModuleDescContactsByCompanyCategory=Contacte după categorii terți
+YourMailUnsubcribeOK=Adresa de email <b>%s</b> a fost dezabonată corect din listă.
+ActivateCheckReadKey=Cheia folosită pentru criptarea adresei URL folosită pentru funcția "Confirmare citire" și "Dezabonare"
+EMailSentToNRecipients=Emailul a fost trimis la destinatarii %s.
+EMailSentForNElements=Email trimis pentru %s elemente.
+XTargetsAdded=<b>%s</b> destinatari adăugaţi în lista de trimitere
+OnlyPDFattachmentSupported=Dacă documentele PDF au fost deja generate pentru obiectele de trimis, acestea vor fi atașate la email. Dacă nu, nu va fi trimis niciun email (de asemenea, rețineți că numai documentele PDF sunt acceptate ca atașamente la trimiterea de newslettere în această versiune).
+AllRecipientSelected=Destinatarii înregistrării %s au fost selectaţi (dacă au adresă de email definită).
+GroupEmails=Grup emailuri
+OneEmailPerRecipient=Un email pentru fiecare destinatar (în mod implicit, un email selectat pentru fiecare înregistrare)
+WarningIfYouCheckOneRecipientPerEmail=Atenție, dacă bifați această casetă, înseamnă că va fi trimis un singur email pentru mai multe înregistrări selectate, deci dacă mesajul tău conține variabile de substituție care se referă la datele unei înregistrări, nu este posibil să le înlocuiți.
+ResultOfMailSending=Rezultatul trimiterii newsletter-ului
+NbSelected=Număr adrese email selectate
+NbIgnored=Număr adrese email ignorate
+NbSent=Număr adrese email trimise
+SentXXXmessages= %s mesaj(e) trimise.
+ConfirmUnvalidateEmailing=Sigur doriți să schimbați newsletter-ul <b> %s </b> la starea de schiţă?
+MailingModuleDescContactsWithThirdpartyFilter=Contacte după filtre personalizate
+MailingModuleDescContactsByCompanyCategory=Contacte după categorie terți
 MailingModuleDescContactsByCategory=Contacte pe categorii
-MailingModuleDescContactsByFunction=Contacte după poziție
-MailingModuleDescEmailsFromFile=Emailuri din fișier
-MailingModuleDescEmailsFromUser=Emailuri introduse de utilizator
-MailingModuleDescDolibarrUsers=Utilizatorii cu emailuri
+MailingModuleDescContactsByFunction=Contacte după funcţie
+MailingModuleDescEmailsFromFile=Adrese email din fișier
+MailingModuleDescEmailsFromUser=Adrese de email introduse de utilizator
+MailingModuleDescDolibarrUsers=Utilizatori cu adrese de email
 MailingModuleDescThirdPartiesByCategories=Terți (pe categorii)
 SendingFromWebInterfaceIsNotAllowed=Trimiterea de pe interfața web nu este permisă.
 EmailCollectorFilterDesc=Toate filtrele trebuie să se potrivească pentru ca un email să fie colectat
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linia %s în fişierul
-RecipientSelectionModules=Definit pentru cererile beneficiarilor de selecţie
-MailSelectedRecipients=Selectat destinatarii
-MailingArea=EMailings 
-LastMailings=Ultimele emailuri %s
-TargetsStatistics=Ţinte statistici
-NbOfCompaniesContacts=Unic de contact din companii
-MailNoChangePossible=Destinatari validate de email-uri nu poate fi schimbat
-SearchAMailing=Căutare de e-mail
-SendMailing=Trimite email-uri
+RecipientSelectionModules=Solicitări definite pentru destinatarii selectaţi
+MailSelectedRecipients=Destinatari selectaţi
+MailingArea=Newslettere
+LastMailings=Ultimele %s newslettere
+TargetsStatistics=Statistici Destinatari
+NbOfCompaniesContacts=Contacte/adrese unice
+MailNoChangePossible=Destinatarii validaţi pentru trimiterea newsletter-ului nu pot fi  modificaţi
+SearchAMailing=Căutare newsletter
+SendMailing=Trimitere newsletter
 SentBy=Trimis de
-MailingNeedCommand=Trimiterea unui email poate fi efectuată din linia de comandă. Cereți administratorului  serverului să lanseze următoarea comandă pentru a trimite emailul tuturor destinatarilor:
-MailingNeedCommand2=Puteţi, totuşi, trimite-le on-line, prin adăugarea parametrului MAILING_LIMIT_SENDBYWEB cu valoare de numărul maxim de mesaje de poştă electronică pe care doriţi să o trimiteţi prin sesiuni.
-ConfirmSendingEmailing=Dacă doriți să trimiteți emailuri direct de pe acest ecran, vă rugăm să confirmați că sunteți sigur că doriți să trimiteți acum emailuri din browserul dvs.?
-LimitSendingEmailing=Notă: Trimiterea de emailurilor din interfata web se face de mai multe ori din motive de securitate și pauze, <b>%s</b> beneficiari la un moment dat pentru fiecare sesiune trimitere.
-TargetsReset=Cer senin lista
-ToClearAllRecipientsClickHere=Pentru a goli beneficiarilor lista pentru acest email-uri, faceţi clic pe butonul
+MailingNeedCommand=Trimiterea unui newsletter poate fi efectuată din linia de comandă. Cere administratorului serverului să lanseze următoarea comandă pentru a trimite newsletter-ul tuturor destinatarilor:
+MailingNeedCommand2=Totuşi, îl poţi trimite online, prin adăugarea parametrului MAILING_LIMIT_SENDBYWEB cu valoarea maximă de email-uri de trimis per sesiune.
+ConfirmSendingEmailing=Dacă doreşti să trimiți newsletter-ul direct de pe acest ecran, confirmă că eşti  sigur că doreşti să trimiți acum newsletter-ul din browserul tău?
+LimitSendingEmailing=Notă: Trimiterea de emailurilor din interfata web se face în mai multe etape din motive de securitate și timing, <b>%s</b> destinatari la un moment dat pentru fiecare sesiune trimitere.
+TargetsReset=Şterge listă
+ToClearAllRecipientsClickHere=Pentru a goli lista de destinatari pentru acest newsletter, fă clic
 ToAddRecipientsChooseHere=Pentru a adăuga destinatari, alegeţi din aceste liste
-NbOfEMailingsReceived=Mass emailings primit
-NbOfEMailingsSend=Trimitere emailuri in masa
-IdRecord=ID-ul de înregistrare
-DeliveryReceipt=Livrare Ack.
-YouCanUseCommaSeparatorForSeveralRecipients=Aveţi posibilitatea de a utiliza <b>comma</b> separator pentru a specifica mai mulţi destinatari.
+NbOfEMailingsReceived=Newslettere primite
+NbOfEMailingsSend=Newslettere trimise
+IdRecord=ID înregistrare
+DeliveryReceipt=Confirmare livrare.
+YouCanUseCommaSeparatorForSeveralRecipients=Aveţi posibilitatea de a utiliza <b>virgula</b> ca separator pentru a specifica mai mulţi destinatari.
 TagCheckMail=Urmăreşte deschiderea emailului
-TagUnsubscribe=Link Dezabonare
-TagSignature=Semnătura utilizatorului trimiterii
-EMailRecipient=Email destinatar
-TagMailtoEmail=Email destinatar (inclusiv linkul html "mailto:")
-NoEmailSentBadSenderOrRecipientEmail=Nu a fost trimis niciun email.  Expeditor sau destinatar email greșit . Verificați profilul utilizatorului.
+TagUnsubscribe=Link dezabonare
+TagSignature=Semnătura utilizatorului care trimite
+EMailRecipient=Adresă de email destinatar
+TagMailtoEmail=Email destinatar (include linkul html "mailto:")
+NoEmailSentBadSenderOrRecipientEmail=Nu a fost trimis niciun email. Adresa de email a expeditorului sau a destinatarului este greșită. Verificați profilul utilizatorului.
 # Module Notifications
-Notifications=Anunturi
+Notifications=Notificări
 NotificationsAuto=Notificări automate
-NoNotificationsWillBeSent=Nu sunt planificate notificări automate prin e-mail pentru acest tip de eveniment și companie
+NoNotificationsWillBeSent=Nu sunt planificate notificări automate prin email pentru acest tip de eveniment și companie
 ANotificationsWillBeSent=1 notificare automată va fi transmisă pe email
 SomeNotificationsWillBeSent=%s notificări automate vor fi transmise pe email
 AddNewNotification=Abonare la o nouă notificare automată prin email (țintă/eveniment)
-ListOfActiveNotifications=Enumerați toate abonamentele active (ținte/evenimente) pentru notificări automate prin email
-ListOfNotificationsDone=Afişaţi toate notificările automate trimise prin email 
-MailSendSetupIs=Configurarea trimiterii  e-mail a fost de configurat la '%s'.  Acest mod nu poate fi utilizat pentru a trimite email-uri în masă.
-MailSendSetupIs2=Trebuie mai întâi să mergi, cu un cont de administrator, în meniu%sHome - Setup - EMails%s  pentru a schimba parametrul  <strong>'%s'</strong> de utilizare în modul '%s'.  Cu acest mod, puteți introduce configurarea serverului SMTP furnizat de furnizorul de servicii Internet și de a folosi facilitatea Mass email .
-MailSendSetupIs3=Daca aveti intrebari cu privire la modul de configurare al serverului SMTP, puteți cere la %s.
-YouCanAlsoUseSupervisorKeyword=De asemenea, puteți adăuga cuvântul cheie <strong> __SUPERVISOREMAIL__ </strong> pentru a trimite un email către supraveghetorul utilizatorului (funcționează numai dacă un email este definit pentru acest supervizor)
-NbOfTargetedContacts=Număr curent de emailuri de contact direcționate
-UseFormatFileEmailToTarget=Fișierul importat trebuie să aibă format <strong> e-mail; nume; prenume; altul </strong>
-UseFormatInputEmailToTarget=Introduceți un șir cu formatul de email <strong>; nume; prenume; altul </strong>
+ListOfActiveNotifications=Lista tuturor abonamentelor active (destinatari/evenimente) pentru notificări automate prin email
+ListOfNotificationsDone=Lista tuturor notificărilor automate trimise prin email 
+MailSendSetupIs=Configurarea trimiterii de email a fost setată la '%s'.  Acest mod nu poate fi utilizat pentru a trimite newslettere.
+MailSendSetupIs2=Trebuie mai întâi să mergi, cu un cont de administrator, în meniul %sAcasă - Setări - Emailuri%s  pentru a schimba parametrul  <strong>'%s'</strong> de utilizare în modul '%s'.  Cu acest mod, puteți introduce configurarea serverului SMTP al furnizorul de servicii Internet și de a folosi facilitatea Newslettere.
+MailSendSetupIs3=Dacă ai întrebări cu privire la modul de configurare al serverului SMTP, poţi cere informaţii la %s.
+YouCanAlsoUseSupervisorKeyword=De asemenea, poţi adăuga cuvântul cheie <strong>__SUPERVISOREMAIL__</strong> pentru a trimite un email către supervizorul utilizatorului (funcționează doar dacă supervizorul are o adresă de email definită)
+NbOfTargetedContacts=Număr curent de emailuri contacte destinatar
+UseFormatFileEmailToTarget=Fișierul importat trebuie să aibă formatul <strong>email;nume;prenume;altul</strong>
+UseFormatInputEmailToTarget=Introduceți un șir cu formatul <strong>email;nume;prenume;altul</strong>
 MailAdvTargetRecipients=Destinatari (selecție avansată)
-AdvTgtTitle=Completați câmpurile de introducere pentru a preselecta terții sau contactele/adresele vizate
+AdvTgtTitle=Completează câmpurile pentru a preselecta terții sau contactele/adresele vizate
 AdvTgtSearchTextHelp= Se utilizează %% ca metacaracter. De exemplu, pentru a găsi toate articolele cum ar fi j<b>ean, joe, jim</b>, puteți introduce <b>j%%</b>, puteți utiliza și; ca separator pentru valoare și folosiți ! pentru exceptarea acestei valori. De exemplu <b>jean; joe; jim%%;!Jimo;!Jima%%</b> va viza toate jean, joe, cele care încep cu jim dar nu jimo și tot ce nu începe cu jima
-AdvTgtSearchIntHelp=Utilizați intervalul pentru a selecta valoarea int sau float
-AdvTgtMinVal=Valoare minima
-AdvTgtMaxVal=Valoare maxima
-AdvTgtSearchDtHelp=Foloseste interval pentru selectare valoare data
-AdvTgtStartDt=Start dt.
-AdvTgtEndDt=Final dt.
-AdvTgtTypeOfIncudeHelp=Email-ul țintă al unei părți terțe și adresa de email a persoanei de contact a terței părți sau doar adresa de email terță parte sau doar adresa de email de contact
+AdvTgtSearchIntHelp=Utilizează interval de selecţie cu valoare întreagă sau zecimală
+AdvTgtMinVal=Valoare minimă
+AdvTgtMaxVal=Valoare maximă
+AdvTgtSearchDtHelp=Utilizează interval de selecţie cu valoare dată calendaristică
+AdvTgtStartDt=Dată start.
+AdvTgtEndDt=Dată final.
+AdvTgtTypeOfIncudeHelp=Adresa de email destinatar a unui terț și adresa de email a persoanei de contact a unui terţ sau doar adresa de email a terţului sau doar adresa de email a persoanei de contact
 AdvTgtTypeOfIncude=Tipul de email vizat
-AdvTgtContactHelp=Utilizați numai dacă vizați persoana de contact în "Tip de email direcționat"
-AddAll=Add tot
+AdvTgtContactHelp=Utilizează numai dacă vizezi persoana de contact din "Tip de email destinatar"
+AddAll=Adaugă tot
 RemoveAll=Elimină tot
 ItemsCount=Element(e)
-AdvTgtNameTemplate=Nume Filtru
-AdvTgtAddContact=Adăugați emailuri conform criteriului
-AdvTgtLoadFilter=Încărcați filtrul
+AdvTgtNameTemplate=Nume filtru
+AdvTgtAddContact=Adăugare email-uri conform criteriului
+AdvTgtLoadFilter=Încărcare filtru
 AdvTgtDeleteFilter=Ştergere filtru
 AdvTgtSaveFilter=Salvare filtru
 AdvTgtCreateFilter=Creare filtru
 AdvTgtOrCreateNewFilter=Numele noului filtru
-NoContactWithCategoryFound=Nu s-a găsit niciun contact / adresă cu o categorie 
-NoContactLinkedToThirdpartieWithCategoryFound=Nu s-a găsit niciun contact / adresă cu o categorie 
-OutGoingEmailSetup= Email-uri trimise
-InGoingEmailSetup=Email-uri primite
+NoContactWithCategoryFound=Nu s-a găsit niciun contact/adresă cu o categorie 
+NoContactLinkedToThirdpartieWithCategoryFound=Nu s-a găsit niciun contact/adresă cu categorie 
+OutGoingEmailSetup= Emailuri trimise
+InGoingEmailSetup=Emailuri primite
 OutGoingEmailSetupForEmailing=Email-uri trimise (pentru modulul %s)
 DefaultOutgoingEmailSetup=Aceeași configurație ca şi configurarea globală de trimitere email
-Information=Informatie
-ContactsWithThirdpartyFilter=Contacte cu filtrul terț
+Information=Informaţii
+ContactsWithThirdpartyFilter=Contacte cu filtrare după terț
 Unanswered=Fără răspuns
 Answered=Răspuns
-IsNotAnAnswer=Nu răspunde (e-mail inițial)
+IsNotAnAnswer=Nu răspunde (email inițial)
 IsAnAnswer= Este un răspuns al unui email inițial
-RecordCreatedByEmailCollector=Înregistrare creată de colectorul de email %sdin adresa %s
-DefaultBlacklistMailingStatus=Stare implicită a contactului care refuză primirea de email-uri bulk
-DefaultStatusEmptyMandatory= Necompletat, dar obligatoriu 
+RecordCreatedByEmailCollector=Înregistrare creată de colectorul de email %s din adresa %s
+DefaultBlacklistMailingStatus=Stare implicită a contactului care refuză primirea de newslettere
+DefaultStatusEmptyMandatory= Necompletat, dar obligatoriu
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index ae771d583c1..30cb1f67a0c 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Salvează şi mergi la pagină nouă
 TestConnection=Test conexiune
 ToClone=Clonare
 ConfirmCloneAsk=Eşti sigur că vrei să clonezi obiectul <b>%s</b>?
-ConfirmClone=Alegeți datele pe care doriți să le clonați:
+ConfirmClone=Alege datele pe care vrei să le clonezi:
 NoCloneOptionsSpecified=Nu există date definite pentru a clona .
 Of=de
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Șablonul implicit document
 Action=Eveniment
 About=Despre
 Number=Număr
-NumberByMonth=Număr pe luni
+NumberByMonth=Total pe lună
 AmountByMonth=Valoare pe luni
 Numero=Număr
 Limit=Limită
@@ -341,8 +341,8 @@ KiloBytes=Kiloocteţi
 MegaBytes=Megaocteţi
 GigaBytes=Gigaocteţi
 TeraBytes=Teraocteţi
-UserAuthor=Utilizatorul creator
-UserModif=Utilizatorul ultimei actualizări
+UserAuthor=Creat de
+UserModif=Actualizat de
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Pe
 From=De la
 FromDate=De la
 FromLocation=De la
-at=la
 to=până la
 To=la
+ToDate=până la
+ToLocation=către
+at=la
 and=şi
 or=sau
 Other=Alt
@@ -843,7 +845,7 @@ XMoreLines=%s linii(e) ascunse
 ShowMoreLines=Afișează mai multe/mai puține linii
 PublicUrl=URL Public
 AddBox=Adaugă box
-SelectElementAndClick=Selectați un element și faceți clic pe %s
+SelectElementAndClick=Selectează un element şi dă clic pe %s
 PrintFile=Tipăreşte fişierul %s
 ShowTransaction=Afișați intrarea în contul bancar
 ShowIntervention=Afişează intervenţie
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Sigur doriți să afectați etichetele înregistrărilo
 CategTypeNotFound=Nu s-a găsit niciun tip de etichetă pentru tipul de înregistrări
 CopiedToClipboard=Copiat în clipboard
 InformationOnLinkToContract=Această sumă este doar totalul tuturor liniilor contractului. Nici o noțiune de timp nu este luată în considerare.
+ConfirmCancel=Eşti sigur că vrei să anulezi
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index ffbf1906aaa..74a686f0539 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un alt membru <b>(nume:<b>%s</b>, log
 ErrorUserPermissionAllowsToLinksToItselfOnly=Din motive de securitate, trebuie să aveţi drepturi de a modifica toţi utilizatorii pentru a putea asocia un membru unui utilizator altul decât tine.
 SetLinkToUser=Asociere utilizator sistem
 SetLinkToThirdParty=Asociere terţ din sistem
-MembersCards=Carţi de vizită membri
+MembersCards=Cărţi de vizită pentru membri
 MembersList=Listă de membri
 MembersListToValid=Listă membri schiţă (de validat)
 MembersListValid=Lista de membri validaţi
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Membri cu cotizaţia de încasat
 MembersWithSubscriptionToReceiveShort=Cotizaţie de încasat
 DateSubscription=Dată adeziune
 DateEndSubscription=Dată sfârşit adeziune
-EndSubscription=Sfârşit Adeziune
+EndSubscription=Terminare abonament/adeziune
 SubscriptionId=ID Adeziune
 WithoutSubscription=Fără cotizaţie
 MemberId=ID membru
@@ -83,10 +83,10 @@ WelcomeEMail=Email de bun venit
 SubscriptionRequired=Necesită Cotizaţie
 DeleteType=Şterge
 VoteAllowed=Drept de vot
-Physical=Fizică
-Moral=Juridică
-MorAndPhy=Persoană fizică şi Juridică
-Reenable=Reactivare
+Physical=Persoană fizică
+Moral=Persoană juridică
+MorAndPhy=Persoană juridică sau persoană fizică
+Reenable=Re-activare
 ExcludeMember=Exclude membru
 ConfirmExcludeMember=Eşti sigur că vrei să excluzi acest membru?
 ResiliateMember=Desfiinţare membru
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Statistici Membri după ţară
 MembersStatisticsByState=Statistici Membri după judeţ/regiune
 MembersStatisticsByTown=Statistici Membri după oraş
 MembersStatisticsByRegion=Statistici Membri după regiune
-NbOfMembers=Număr membri
-NbOfActiveMembers=Numărul curent de membri activi
+NbOfMembers=Număr total de membri
+NbOfActiveMembers=Numărul total de membri activi
 NoValidatedMemberYet=Niciun membru validat găsit
-MembersByCountryDesc=Acest ecran îţi arată statistici cu privire la membri după ţări. Graficul depinde serviciul on-line Google grafic şi este disponibil numai în cazul în care conexiunea la internet este activă.
-MembersByStateDesc=Acest ecran îţi arată statistici cu privire la membri după regiuni/judeţe.
-MembersByTownDesc=Acest ecran îţi afişează statistici cu privire la membri după oraş.
+MembersByCountryDesc=Acest ecran vă arată statisticile membrilor pe țări. Graficele și hărţile depind de disponibilitatea serviciului de hărţi online Google, precum și de disponibilitatea unei conexiuni la internet funcționale.
+MembersByStateDesc=Acest ecran vă arată statistici ale membrilor în funcție de judeţe/uat-uri/localităţi.
+MembersByTownDesc=Acest ecran vă arată statisticile membrilor după oraș.
+MembersByNature=Acest ecran vă arată statisticile membrilor după natură.
+MembersByRegion=Acest ecran vă arată statistici ale membrilor în funcție de regiune.
 MembersStatisticsDesc=Alege statisticile pe care doreşti să le citeşti...
 MenuMembersStats=Statistici
-LastMemberDate=Data ultimului membru
+LastMemberDate=Data ultimei adeziuni
 LatestSubscriptionDate=Ultima dată a abonamentului/cotizaţiei
-MemberNature=Natură membru
+MemberNature=Natura membrului
 MembersNature=Natura membrilor
-Public=Profil public
+Public=Informaţiile sunt publice
 NewMemberbyWeb=Membru nou adăugat. În aşteptarea validării
 NewMemberForm=Formular Membru nou
-SubscriptionsStatistics=Statistici privind cotizaţiile/abonamentele
+SubscriptionsStatistics=Statistici abonamente/adeziuni
 NbOfSubscriptions=Număr cotizaţii
-AmountOfSubscriptions=Valoarea cotizaţiilor
+AmountOfSubscriptions=Sumă colectată din abonamente
 TurnoverOrBudget=Cifra de afaceri (pentru o companie), sau Bugetul (pentru o fundaţie)
 DefaultAmount=Valoarea implicită a cotizaţiei/abonamentului
 CanEditAmount=Vizitatorul poate alege/modifica valoarea cotizaţiei sale
 MEMBER_NEWFORM_PAYONLINE=Mergi la pagina integrată de plată online
 ByProperties=După natură
 MembersStatisticsByProperties=Statistici membri după natură
-MembersByNature=Acest ecran afişează statistici membri după forma juridică
-MembersByRegion=Acest ecran afişează statistici membri după regiune.
 VATToUseForSubscriptions=Cota TVA utilizată pentru înscrieri
 NoVatOnSubscription=Fără TVA pentru cotizaţii
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produs folosit pentru linia de abonament/cotizaţie  în factura:  %s
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index f2f79082872..a9a43243114 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Lista permisiunilor definite
 SeeExamples=Vedeți aici exemple
 EnabledDesc=Condiție de activare a acestui câmp (Exemple: 1 sau $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Este vizibil câmpul? (Exemple: 0 = Invizibil întotdeauna, 1 = Vizibil în liste și în formularele de creare/actualizare/vizualizare, 2 = Vizibil doar în liste, 3 = Vizibil numai în formularele de creare/actualizare/vizualizare (nu în liste), 4 = Vizibil în liste și în formularele de actualizare/vizualizare (nu în cele de creare), 5 = Vizibil numai pe formularul de vizualizare finală a listei (nu pe cele de creare sau actualizare).<br><br> Utilizarea unei valori negative înseamnă că  câmp nu este afișat implicit în listă, dar poate fi selectat pentru vizualizare).<br><br>Poate  fi o expresie, de exemplu: <br>preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br>($ user-> rights-> holiday-> define_holiday? 1: 0)
-DisplayOnPdfDesc=Afișați acest câmp pe documente PDF compatibile, puteți gestiona poziția cu câmpul „Poziție”.<br/> În prezent, modelele PDF compatibile cunoscute sunt: ​​eratosten (comandă), espadon (livrare), sponge (facturi), cyan (propunere/ofertă), cornas (comandă achiziţie)<br/><br/><strong> Pentru documente: </strong><br/>0 = nu se afișează <br/>1 = se afișează <br/>2 = se afișează dacă este completat <br/><br/><strong>Pentru linii de document: </strong><br/>0 = nu se afişează <br/>1 = se afișează într-o coloană <br/>3 = se afișează în coloana descriere după descriere <br/>4 = se afișează în coloana descriere după descriere dacă este completat 
+DisplayOnPdfDesc=Afișează acest câmp pe documente PDF compatibile, poți gestiona poziția cu câmpul „Poziție”.<br> În prezent, modelele PDF compatibile cunoscute sunt: ​​eratostene (comandă), espadon (livrări), sponge (facturi), cyan (propunere/ofertă), cornas (comandă furnizor)<br><br><strong> Pentru document:</strong><br> 0 = nu este afișat <br>1 = afișare <br>2 = afișare numai dacă nu este gol<br><br><strong>Pentru liniile documentului:</strong><br> 0 = nu este afișat<br> 1 = afișat într-o coloană<br>3 = afișare în coloana de descriere a liniei după descriere<br>4 = afișare în coloana de descriere numai după descriere dacă nu este gol
 DisplayOnPdf=Afişare în PDF
 IsAMeasureDesc=Poate fi cumulată valoarea câmpului pentru a obține un total în listă? (Exemple: 1 sau 0)
 SearchAllDesc=Este folosit câmpul pentru a face o căutare cu instrumentul de căutare rapidă? (Exemple: 1 sau 0)
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 318effe7aa2..0db2335cdb0 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Instalați sau activați biblioteca GD în configuraţia PHP
 ProfIdShortDesc=<b>Prof Id %s</b> este identificator profesional alocat în funcţie de ţara terţului.<br> De exemplu, pentru <b> %s</b> este codul <b>%s</b>.
 DolibarrDemo=Demo Dolibarr ERP/CRM
 StatsByNumberOfUnits=Statistici pentru suma cantităţilor produselor/serviciilor
-StatsByNumberOfEntities=Statistici cantitative privind entitățile referite (numărul de facturi sau de comenzi ...)
+StatsByNumberOfEntities=Statistici pentru numărul entităților referite (nr. facturi sau comenzi...)
 NumberOfProposals=Număr de oferte comerciale
 NumberOfCustomerOrders=Număr de comenzi de vânzare
 NumberOfCustomerInvoices=Număr de facturi client
@@ -289,4 +289,4 @@ PopuProp=Produse/servicii după popularitate pe ofertele comerciale
 PopuCom=Produse/servicii după popularitate pe comenzile de vânzare
 ProductStatistics=Statistici produse/servicii
 NbOfQtyInOrders=Cantitate în comenzi 
-SelectTheTypeOfObjectToAnalyze=Selectează tipul obiectului de analizat...
+SelectTheTypeOfObjectToAnalyze=Selectează un obiect pentru a-i vedea statisticile...
diff --git a/htdocs/langs/ro_RO/partnership.lang b/htdocs/langs/ro_RO/partnership.lang
new file mode 100644
index 00000000000..8431c0344e3
--- /dev/null
+++ b/htdocs/langs/ro_RO/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Managementul parteneriatelor
+PartnershipDescription = Modul Management parteneriate
+PartnershipDescriptionLong= Modul Management parteneriate
+
+#
+# Menu
+#
+NewPartnership = Parteneriat nou
+ListOfPartnerships = Listă parteneriate
+
+#
+# Admin page
+#
+PartnershipSetup = Setare parteneriat
+PartnershipAbout = Despre modulul Parteneriate
+PartnershipAboutPage = Pagină despre modulul Parteneriate
+
+
+#
+# Object
+#
+DatePartnershipStart=Dată începere
+DatePartnershipEnd=Dată încetare
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Schiţă
+PartnershipAccepted = Acceptat
+PartnershipRefused = Refuzat
+PartnershipCanceled = Anulat
+
+PartnershipManagedFor=Partenerii sunt
diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang
index c3703344839..9492b27ef33 100644
--- a/htdocs/langs/ro_RO/productbatch.lang
+++ b/htdocs/langs/ro_RO/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Seria %s este deja utilizată pentru produsul %s
 TooManyQtyForSerialNumber=Poți avea un singur produs %s pentru numărul de serie %s
 BatchLotNumberingModules=Opțiuni pentru generarea automată de produse lot gestionate pe loturi
 BatchSerialNumberingModules=Opțiuni pentru generarea automată de produse lot gestionate prin numere de serie
+ManageLotMask=Mască personalizată
 CustomMasks=Adaugă o opţiune pentru definire mască în fişa produsului
 LotProductTooltip=Adaugă o opțiune în fişa de produs pentru a defini o mască dedicată numărului de lot
 SNProductTooltip=Adaugă o opțiune în fişa de produs pentru a defini o mască dedicată numărului de serie
 QtyToAddAfterBarcodeScan=Cantitate de adăugat pentru fiecare cod de bare/lot/serie scanată
-
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 1e5f07f0e12..7623c896304 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Servicii doar de vânzare
 ServicesOnPurchaseOnly=Servicii doar de achiziţionat
 ServicesNotOnSell=Servicii care nu sunt nici de vânzare și nici de achiziţionat
 ServicesOnSellAndOnBuy=Servicii de vânzare sau de achiziţionat
-LastModifiedProductsAndServices=Ultimile %s produse/servicii modificate
+LastModifiedProductsAndServices=Ultimele %s produse/servicii modificate
 LastRecordedProducts=Ultimele %s produse înregistrate
 LastRecordedServices=Ultimele %s servicii înregistrate 
 CardProduct0=Produs
@@ -73,12 +73,12 @@ SellingPrice=Preţ de vânzare
 SellingPriceHT=Preț de vânzare (fără taxe)
 SellingPriceTTC=Preţ de vânzare (cu taxe)
 SellingMinPriceTTC=Preț minim de vânzare (cu taxe)
-CostPriceDescription=Acest câmp de preț (fără taxe) poate fi utilizat pentru a stoca preţul de cost mediu pentru compania ta. Poate fi orice preț pe care îl calculați, de exemplu din prețul mediu de achiziție plus costul mediu de producție și distribuție.
+CostPriceDescription=Acest câmp de preț (fără taxe) poate fi utilizat pentru a capta costul mediu pentru acest produs. Poate fi orice preț pe care îl poţi calcula singur, de exemplu, din prețul mediu de achiziţie plus costul mediu de producție și distribuție.
 CostPriceUsage=Această valoare ar putea fi utilizată pentru calcularea marjei.
 SoldAmount=Cantitate vândută
 PurchasedAmount=Cantitate achiziționată
 NewPrice=Preţ nou
-MinPrice=Preț minim de vânzare
+MinPrice=Preţ min. de vânzare
 EditSellingPriceLabel=Editare etichetă preț vânzare
 CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (%s fără taxe). Acest mesaj poate apărea, de asemenea, dacă aplicați o reducere prea mare.
 ContractStatusClosed=Închis
@@ -157,10 +157,10 @@ ListServiceByPopularity=Listă servicii după popularitate
 Finished=Produs fabricat
 RowMaterial=Materie primă
 ConfirmCloneProduct=Sunteți sigur că doriți să clonați produsul sau serviciul <b>%s</b>?
-CloneContentProduct=Clonați toate informațiile principale ale produsului/serviciului
+CloneContentProduct=Clonează toate informațiile principale despre produs/serviciu
 ClonePricesProduct=Clonare preţuri
 CloneCategoriesProduct=Clonare tag-uri/categorii asociate
-CloneCompositionProduct=Clonare produs/serviciu virtual
+CloneCompositionProduct=Clonare produse/servicii virtuale
 CloneCombinationsProduct=Clonare variante de produs
 ProductIsUsed=Acest produs este utilizat
 NewRefForClone=Ref. noului produs/serviciu
@@ -171,11 +171,11 @@ SuppliersPrices=Prețuri furnizor
 SuppliersPricesOfProductsOrServices=Prețuri furnizori (pentru produse sau servicii)
 CustomCode=Cod vamal/Marfă/Cod HS
 CountryOrigin=Ţara de origine
-RegionStateOrigin=Regiune de origine
-StateOrigin=Ţară|Regiune de origine
-Nature=Natură produs(materie primă/produs finit)
+RegionStateOrigin=Regiunea de origine
+StateOrigin=Judeţul/UAT-ul de origine
+Nature=Natură produs (materie primă/produs fabricat)
 NatureOfProductShort=Natură produs
-NatureOfProductDesc=Materie primă sau produs finit
+NatureOfProductDesc=Materie primă sau produs fabricat
 ShortLabel=Etichetă scurtă
 Unit=Unitate
 p=u.
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 41389259f5d..b0e5d46b2c6 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Contacte proiect
 ProjectsImContactFor=Proiecte pentru care sunt persoană de contact în mod explicit 
 AllAllowedProjects=Toate proiectele pe care le pot citi (ale mele + cele publice)
 AllProjects=Toate proiectele
-MyProjectsDesc=Această vizualizare este limitată la proiectele pentru care sunteți contactat
+MyProjectsDesc=Această vizualizare este limitată la proiectele pentru care eşti persoană de contact
 ProjectsPublicDesc=Această vedere prezintă toate proiectele la care aveţi permisiunea de citire.
 TasksOnProjectsPublicDesc=Această vizualizare prezintă toate task-urile pe care aveți permisiunea să le citiți.
 ProjectsPublicTaskDesc=Această vedere prezintă toate proiectele şi task-urile care sunt permise să le citiţi.
 ProjectsDesc=Această vedere prezintă toate proiectele (permisiuni acordate pentru a vizualiza tot).
 TasksOnProjectsDesc=Această vizualizare prezintă toate task-urile din toate proiectele (permisiuni acordate pentru a vizualiza tot).
-MyTasksDesc=Această vizualizare este limitată la proiectele sau task-urile pentru care sunteți contact
+MyTasksDesc=Această vizualizare este limitată la proiectele sau task-urile pentru care eşti persoană de contact
 OnlyOpenedProject=Sunt vizibile numai proiectele deschise (proiectele schiţă sau închise nu sunt vizibile).
 ClosedProjectsAreHidden=Proiectele închise nu sunt vizibile.
 TasksPublicDesc=Această vedere prezintă toate proiectele şi task-urile pentru care aveţi permisiunea de a le citi.
 TasksDesc=Această vedere prezintă toate proiectele şi task-urile (drepturile îţi permit să vezi totul).
 AllTaskVisibleButEditIfYouAreAssigned=Toate task-urile pentru proiectele calificate sunt vizibile, însă puteți introduce timp consumat doar pe task-ul atribuit utilizatorului selectat. Atribuiți task-ul dacă trebuie să introduceți timp consumat pe el.
-OnlyYourTaskAreVisible=Numai task-urile atribuite ţie sunt vizibile. Atribuiți-vă task-ul dacă nu este vizibil și trebuie să îţi aloci timp pe el.
+OnlyYourTaskAreVisible=Sunt vizibile doar task-urile atribuite ție. Dacă trebuie să introduci timpul pentru un task și dacă task-ul nu este vizibil aici, atunci trebuie să-ţi atribui task-ul. 
 ImportDatasetTasks=Task-uri proiecte
 ProjectCategories=Etichete/categorii proiecte
 NewProject=Proiect nou
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Nu este atribuit task-ului
 NoUserAssignedToTheProject=Nu au fost alocat niciun utilizator acestui proiect
 TimeSpentBy=Timpul consumat de
 TasksAssignedTo=Task-uri atribuite lui
-AssignTaskToMe=Acordă-mi task-ul
+AssignTaskToMe=Alocă-mi task-ul mie
 AssignTaskToUser=Atribuie task-ul lui %s
 SelectTaskToAssign=Selectați task-ul de atribuit...
 AssignTask=Atribuie
diff --git a/htdocs/langs/ro_RO/recruitment.lang b/htdocs/langs/ro_RO/recruitment.lang
index b09ecb6b976..56ec5509ec2 100644
--- a/htdocs/langs/ro_RO/recruitment.lang
+++ b/htdocs/langs/ro_RO/recruitment.lang
@@ -25,7 +25,7 @@ ModuleRecruitmentDesc =  Gestionează și urmărește campaniile de recrutare pe
 #
 # Admin page
 #
-RecruitmentSetup = Configurare modul Recrutare
+RecruitmentSetup = Configurare modul Recrutare personal
 Settings = Configurări
 RecruitmentSetupPage = Introdu aici setările pentru opţiunile principale ale modulului Recrutare personal
 RecruitmentArea=Recrutare personal
@@ -51,7 +51,7 @@ ListOfPositionsToBeFilled=Lista posturilor disponibile
 NewPositionToBeFilled=Posturi disponibile noi
 
 JobOfferToBeFilled=Posturi rămase neocupate
-ThisIsInformationOnJobPosition=Informaţii despre oferta job
+ThisIsInformationOnJobPosition=Informaţii despre oferta de job
 ContactForRecruitment=Contact pentru recrutare
 EmailRecruiter=Email recrutor
 ToUseAGenericEmail=Utilizare email generic. Dacă nu este definit, se va utiliza emailul responsabilului de recrutare
@@ -65,12 +65,12 @@ ContractRefused=Contract refuzat
 RecruitmentCandidature=Aplicare la job
 JobPositions=Joburi disponibile
 RecruitmentCandidatures=Aplicări la job
-InterviewToDo=Interviu de făcut
+InterviewToDo=Interviu de realizat
 AnswerCandidature=Răspuns aplicare
 YourCandidature=Aplicarea ta
 YourCandidatureAnswerMessage=Îţi mulţumim pentru aplicarea ta la job.<br>...
-JobClosedTextCandidateFound=Oferta de job este închisă. Postul a fost ocupat.
+JobClosedTextCandidateFound=Oferta de job nu mai este disponibilă. Postul a fost ocupat.
 JobClosedTextCanceled=Oferta de job este închisă.
 ExtrafieldsJobPosition=Atribute complementare (oferte job)
-ExtrafieldsCandidatures=Atribute complementare (aplicări job)
-MakeOffer=Fă o ofertă
+ExtrafieldsApplication=Atribute complementare (aplicări job)
+MakeOffer=Fă o ofertă de job
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index 8e18a146120..443081c635d 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -1,76 +1,76 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. Livrare
+RefSending=Ref. livrare
 Sending=Livrare
-Sendings=Livrari
-AllSendings=Toate expedițiile
+Sendings=Livrări
+AllSendings=Toate livrările
 Shipment=Livrare
-Shipments=Livrari
-ShowSending=Arata Livrări
+Shipments=Livrări
+ShowSending=Arată Livrări
 Receivings=Documente de livrare 
-SendingsArea=Livrari
-ListOfSendings=Lista Livrari
-SendingMethod=Metodă Livrare
-LastSendings=Ultimele %stransporturi 
-StatisticsOfSendings=Statistici Livrari
-NbOfSendings=Număr Livrari
-NumberOfShipmentsByMonth=Număr livrări pe lună
-SendingCard=Fisa Livrare
+SendingsArea=Livrări
+ListOfSendings=Listă livrări
+SendingMethod=Metodă de livrare
+LastSendings=Ultimele %s livrări
+StatisticsOfSendings=Statistici livrări
+NbOfSendings=Număr livrări
+NumberOfShipmentsByMonth=Număr de livrări pe lună
+SendingCard=Fişă livrare
 NewSending=Livrare nouă
-CreateShipment=Crează Livrare
-QtyShipped=Cant.  livrată
-QtyShippedShort=Cantitate de livrări
-QtyPreparedOrShipped=Cantitate pregătită sau expediată
-QtyToShip=Cant.  de livrat
+CreateShipment=Creare livrare
+QtyShipped=Cant. livrată
+QtyShippedShort=Cantitate de livrat
+QtyPreparedOrShipped=Cantitate pregătită sau livrată
+QtyToShip=Cant. de livrat
 QtyToReceive=Cant. de recepţionat
-QtyReceived=Cant.  primită
-QtyInOtherShipments=Cantitate în alte expedieri
-KeepToShip=Rămas de expediat
+QtyReceived=Cant. primită
+QtyInOtherShipments=Cantitate în alte livrări
+KeepToShip=Rămas de livrat
 KeepToShipShort=Rămâne
 OtherSendingsForSameOrder=Alte livrări pentru această comandă
-SendingsAndReceivingForSameOrder=Expedieri și documente pentru această comandă
+SendingsAndReceivingForSameOrder=Livrări și documente pentru această comandă
 SendingsToValidate=Livrări de validat
 StatusSendingCanceled=Anulată
-StatusSendingCanceledShort=Anulata
+StatusSendingCanceledShort=Anulată
 StatusSendingDraft=Schiţă
-StatusSendingValidated=Validată (produse  de livrat sau deja livrate)
+StatusSendingValidated=Validată (produse de livrat sau deja livrate)
 StatusSendingProcessed=Procesată
 StatusSendingDraftShort=Schiţă
 StatusSendingValidatedShort=Validată
 StatusSendingProcessedShort=Procesată
-SendingSheet=Aviz expediere
-ConfirmDeleteSending=Sigur doriți să ștergeți această expediere?
-ConfirmValidateSending=Sigur doriți să validați această expediere cu referința <b> %s </b>?
-ConfirmCancelSending=Sigur doriți să anulați expedierea?
+SendingSheet=Aviz de expediţie
+ConfirmDeleteSending=Sigur doriți să ștergeți această livrare?
+ConfirmValidateSending=Sigur doriți să validați această livrare cu referința <b>%s</b>?
+ConfirmCancelSending=Sigur doriți să anulați livrarea?
 DocumentModelMerou=Model Merou A5
-WarningNoQtyLeftToSend=Atenţie,  nu sunt produse care aşteaptă să fie expediate.
-StatsOnShipmentsOnlyValidated=Statisticil ectuate privind numai livrările validate. Data folosită este data validării livrării (data de livrare planificată nu este întotdeauna cunoscută).
-DateDeliveryPlanned=Data planificată a livrarii
+WarningNoQtyLeftToSend=Atenţie, nu sunt produse care aşteaptă să fie livrate.
+StatsOnShipmentsOnlyValidated=Statisticile sunt numai pentru livrările validate. Data utilizată este data validării (data de livrare planificată nu este întotdeauna cunoscută)
+DateDeliveryPlanned=Data planificată a livrării
 RefDeliveryReceipt=Ref. document de livrare
 StatusReceipt=Stare document de livrare
 DateReceived=Data de livrare reală
-ClassifyReception=Clasifică în recepţionat
-SendShippingByEMail=Trimiteți o expediție prin email
+ClassifyReception=Clasifică ca recepţionat
+SendShippingByEMail=Trimitere livrare pe email
 SendShippingRef=Transmitere livrare %s
 ActionsOnShipping=Evenimente pe livrare
-LinkToTrackYourPackage=Link pentru a urmări pachetul dvs
+LinkToTrackYourPackage=Link pentru urmărirea coletului
 ShipmentCreationIsDoneFromOrder=Pentru moment, crearea unei noi livrări se face din fişa comenzii.
 ShipmentLine=Linie de livrare
 ProductQtyInCustomersOrdersRunning=Cantitatea de produs din comenzile de vânzare deschise
-ProductQtyInSuppliersOrdersRunning=Cantitatea de produs din comenzile de cumpărare deschise 
-ProductQtyInShipmentAlreadySent=Cantitatea de produse din comanda deschisă deja trimisă
+ProductQtyInSuppliersOrdersRunning=Cantitatea de produs din comenzile de achiziţie deschise 
+ProductQtyInShipmentAlreadySent=Cantitatea de produse din comanda de vânzare deschisă a fost deja trimisă
 ProductQtyInSuppliersShipmentAlreadyRecevied=Cantitatea de produs care a fost recepţionată din comenzile de achiziție deschise
-NoProductToShipFoundIntoStock=Nu există niciun produs de expediat găsit în depozit <b> %s </b>. Corectați stocul sau reveniți pentru a alege un alt depozit.
-WeightVolShort=Greutate / vol.
-ValidateOrderFirstBeforeShipment=Mai întâi trebuie să validezi comanda înainte de a putea efectua expedieri.
+NoProductToShipFoundIntoStock=Nu există niciun produs de livrat în depozitul <b>%s</b>. Corectați stocul sau reveniți pentru a alege un alt depozit.
+WeightVolShort=Greutate/Volum.
+ValidateOrderFirstBeforeShipment=Mai întâi trebuie să validezi comanda de vânzare înainte de a putea face livrări.
 
 # Sending methods
 # ModelDocument
-DocumentModelTyphon=Model complet pentru dispoziţie de livrare  (logo. ..)
-DocumentModelStorm=Modele de documente mult mai complete pentru chitanțe de livrare și compatibilitate cu câmpurile suplimentare(sigla ...)
+DocumentModelTyphon=Model complet pentru aviz de expediţie (logo. ..)
+DocumentModelStorm=Modele de documente mult mai complete pentru avize de expediţie și compatibilitate cu câmpurile suplimentare(sigla ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constanta EXPEDITION_ADDON_NUMBER nu este definită
 SumOfProductVolumes=Volumul total al produselor
 SumOfProductWeights=Greutatea totală a produselor
 
 # warehouse details
-DetailWarehouseNumber= Detalii Depozit
-DetailWarehouseFormat= Greutate : %s (Cantitate: %d)
+DetailWarehouseNumber= Detalii depozit
+DetailWarehouseFormat= Greutate: %s (Cantitate: %d)
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index e13759c966b..66edf3c4761 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Nu sunt produse predefinite pentru acest obiect. D
 DispatchVerb=Expediere
 StockLimitShort=Limită de alertă
 StockLimit=Stoc limită de alertă
-StockLimitDesc=(gol) înseamnă nici un avertisment. <br> 0 poate fi folosit pentru un avertisment imediat ce stocul s-a epuizat.
+StockLimitDesc=(gol) înseamnă că nu există avertisment.<br>0 poate fi utilizat pentru a declanșa un avertisment imediat ce nu mai există stoc
 PhysicalStock=Stoc fizic
 RealStock=Stoc real
 RealStockDesc=Stocul fizic/real este stocul aflat în prezent în depozite.
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index e908a92e7fc..de16abf5ceb 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Parola schimbată la: %s
 SubjectNewPassword=Noua ta parolă pentru %s
 GroupRights=Grup de permisiuni
 UserRights=Permisiuni utilizator
+Credentials=Credenţiale
 UserGUISetup=Configurare afișare utilizator
 DisableUser=Dezactivare
 DisableAUser=Dezactivaţi un utilizator
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Foloseşte câmpul Tip pentru a modifica
 OpenIDURL=URL OpenID
 LoginUsingOpenID=Utilizați OpenID pentru autentificare
 WeeklyHours=Ore lucrate(pe săptămână)
-ExpectedWorkedHours=Numărul estimat de ore lucrate săptămânal
+ExpectedWorkedHours=Nr. ore de lucru estimate pe săptămână
 ColorUser=Culoare utilizator
 DisabledInMonoUserMode=Dezactivat în modulul mentenanţă
 UserAccountancyCode=Cod contabil utilizator
@@ -115,7 +116,7 @@ DateOfEmployment=Data angajării
 DateEmployment=Loc de muncă, ocupaţie
 DateEmploymentstart=Data începerii angajării
 DateEmploymentEnd=Data încetării angajării
-RangeOfLoginValidity=Intervalul temporal pentru care autentificarea în sistem este valabilă
+RangeOfLoginValidity=Interval de valabilitate al accesului
 CantDisableYourself=Nu vă puteți dezactiva propria înregistrare de utilizator 
 ForceUserExpenseValidator=Persoana care are dreptul de a valida raportul de cheltuieli
 ForceUserHolidayValidator=Persoana care are dreptul de a valida cererea de concediu
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index c5e4eb67f7a..e90a63aee32 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Definiți lista tuturor limbilor dis
 GenerateSitemaps=Generează fişierul sitemap pentru website
 ConfirmGenerateSitemaps=Dacă confirmi, vei şterge fişierul sitemap existent...
 ConfirmSitemapsCreation=Confirmare generare sitemap
-SitemapGenerated=Sitemap generat
+SitemapGenerated=Fişierul sitemap <b>%s</b> a fost generat
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon-ul trebuie să fie png
-ErrorFaviconSize=Favicon-ul trebuie să fie de dimensiunea 32x32
-FaviconTooltip=Încarcă o imagine care este png de 32x32
+ErrorFaviconSize=Favicon-ul tredimensionat la 16x16, 32x32 sau 64x64
+FaviconTooltip=Încarcă o imagine png (16x16, 32x32 sau 64x64)
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 626f22f3a36..bd4f1b960cd 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -12,8 +12,8 @@ Selectformat=Выберите формат для файла
 ACCOUNTING_EXPORT_FORMAT=Select the format for the file
 ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Укажите префикс для имени файла
-ThisService=This service
-ThisProduct=This product
+ThisService=Эта услуга
+ThisProduct=Этот продукт
 DefaultForService=По умолчанию для услуги
 DefaultForProduct=По умолчанию для товара
 ProductForThisThirdparty=Product for this thirdparty
@@ -92,7 +92,7 @@ ChangeAndLoad=Change and load
 Addanaccount=Добавить бухгалтерский счёт
 AccountAccounting=Бухгалтерский счёт
 AccountAccountingShort=Бухгалтерский счёт
-SubledgerAccount=Subledger account
+SubledgerAccount=Вспомогательный счёт
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
@@ -202,7 +202,7 @@ Docref=Ссылка
 LabelAccount=Метка бухгалтерского счёта
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Журнал
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Не согласовано
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 8ec9e3b6d0f..527924590a8 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -37,9 +37,9 @@ UnlockNewSessions=Удалить блокировку подключений
 YourSession=Ваша сессия
 Sessions=Пользовательские сессии
 WebUserGroup=Пользователь / группа Web-сервера
-PermissionsOnFiles=Permissions on files
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFiles=Права доступа к файлам
+PermissionsOnFilesInWebRoot=Права доступа к файлам в корневом веб-каталоге
+PermissionsOnFile=Право доступа к файлу %s
 NoSessionFound=Кажется, ваша конфигурация PHP не позволяет отображать активные сеансы. Каталог, используемый для сохранения сеансов ( <b>%s</b> ), может быть защищен (например, разрешениями ОС или директивой PHP open_basedir).
 DBStoringCharset=Кодировка базы данных для хранения данных
 DBSortingCharset=Кодировка базы данных для сортировки данных
@@ -57,13 +57,14 @@ GUISetup=Внешний вид
 SetupArea=Настройка
 UploadNewTemplate=Загрузить новый шаблон(ы)
 FormToTestFileUploadForm=Форма для проверки загрузки файлов (в зависимости от настройки)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=Модуль/приложение<b>%s</b> должно быть включено
+ModuleIsEnabled=Модуль/приложение <b>%s</b> было включено
 IfModuleEnabled=Примечание: "Да" влияет только тогда, когда модуль <b>%s</b> включен
 RemoveLock=Удалите/переименуйте файл <b>%s</b>, если он существует, чтобы разрешить использование инструмента обновления/установки.
 RestoreLock=Восстановите файл <b>%s</b> с разрешением только для чтение, чтобы отключить дальнейшее использование инструмента обновления/установки.
 SecuritySetup=Настройка безопасности
-PHPSetup=PHP setup
+PHPSetup=Настройка PHP
+OSSetup=OS setup
 SecurityFilesDesc=Определите здесь параметры, связанные с безопасностью загрузки файлов.
 ErrorModuleRequirePHPVersion=Ошибка, этот модуль требует PHP версии %s или выше
 ErrorModuleRequireDolibarrVersion=Ошибка, этот модуль требует Dolibarr версии %s или выше
@@ -86,7 +87,7 @@ AllowToSelectProjectFromOtherCompany=В документе контрагент
 JavascriptDisabled=JavaScript отключен
 UsePreviewTabs=Использовать вкладки предпросмотра
 ShowPreview=Предварительный просмотр
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Показать-Скрыть детали
 PreviewNotAvailable=Предварительный просмотр не доступен
 ThemeCurrentlyActive=Текущая тема
 MySQLTimeZone=Часовой пояс БД (MySQL)
@@ -101,7 +102,7 @@ NextValueForInvoices=Следующее значение (счета-факту
 NextValueForCreditNotes=Следующее значение (кредитные авизо)
 NextValueForDeposit=Следующее значение (первоначальный взнос)
 NextValueForReplacements=Следующее значение (замены)
-MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+MustBeLowerThanPHPLimit=Примечание: ваша конфигурация PHP в настоящее время ограничивает максимальный размер файлов для загрузки до<b>%s</b>%s , независимо от значения этого параметра.
 NoMaxSizeByPHPLimit=Примечание: в вашей конфигурации PHP установлено <b>no limit</b>
 MaxSizeForUploadedFiles=Максимальный размер загружаемых файлов (0 для запрещения каких-либо загрузок)
 UseCaptchaCode=Использовать графический код (CAPTCHA) на странице входа
@@ -157,7 +158,7 @@ Purge=Очистить
 PurgeAreaDesc=Эта страница позволяет вам удалить все файлы, созданные или сохраненные Dolibarr (временные файлы или все файлы в каталоге <b> %s</b> ). Использование этой функции обычно не требуется. Он предоставляется в качестве обходного пути для пользователей, чей Dolibarr размещен поставщиком, который не предлагает разрешения на удаление файлов, созданных веб-сервером.
 PurgeDeleteLogFile=Удаление файлов журналов, включая <b>%s</b> определенный для модуля Syslog (без риска потери данных)
 PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files
+PurgeDeleteTemporaryFilesShort=Удалите журнал и временные файлы
 PurgeDeleteAllFilesInDocumentsDir=Удалить все файлы в каталоге: <b>%s</b> . <br> Это удалит все сгенерированные документы, связанные с элементами (контрагенты, счета и т.д.), файлы, загруженные в модуль ECM, резервные копии базы данных и временные файлы.
 PurgeRunNow=Очистить сейчас
 PurgeNothingToDelete=Нет директории или файла для удаления.
@@ -185,8 +186,8 @@ Compression=Сжатие
 CommandsToDisableForeignKeysForImport=Команда отключения внешних ключей при импорте
 CommandsToDisableForeignKeysForImportWarning=Обязательно, если вы хотите иметь возможность для последующего восстановления sql dump
 ExportCompatibility=Совместимость генерируемого файла экспорта
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+ExportUseMySQLQuickParameter=Используйте параметр --quick
+ExportUseMySQLQuickParameterHelp=Параметр '--quick' помогает ограничить потребление оперативной памяти для больших таблиц.
 MySqlExportParameters=MySQL - параметры экспорта
 PostgreSqlExportParameters= PostgreSQL - параметры экспорта
 UseTransactionnalMode=Использовать режим транзакций
@@ -213,7 +214,7 @@ ModulesMarketPlaces=Поиск внешних приложений/модуле
 ModulesDevelopYourModule=Разработка собственного приложения/модулей
 ModulesDevelopDesc=Вы также можете разработать свой собственный модуль или найти партнера для его разработки.
 DOLISTOREdescriptionLong=Вместо того чтобы переключаться на сайт <a href="https://www.dolistore.com">www.dolistore.com</a> для поиска внешнего модуля, вы можете использовать этот встроенный инструмент, который будет выполнять поиск для вас (может быть медленным, нужен доступ в Интернет) ...
-NewModule=New module
+NewModule=Новый модуль
 FreeModule=Свободно
 CompatibleUpTo=Совместимость с версией %s
 NotCompatible=Этот модуль не совместим с вашим Dolibarr%s (Min%s - Max%s).
@@ -229,12 +230,12 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=Внешние веб-сайты для дополнительных модулей (неосновных) ...
 DevelopYourModuleDesc=Некоторые решения для разработки собственного модуля ...
 URL=URL
-RelativeURL=Relative URL
+RelativeURL=Относительный URL
 BoxesAvailable=Доступные виджеты
 BoxesActivated=Включенные виджеты
 ActivateOn=Активировать
 ActiveOn=Активирован
-ActivatableOn=Activatable on
+ActivatableOn=Активируется
 SourceFile=Исходный файл
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Доступно, только если JavaScript не отключен
 Required=Обязательный
@@ -260,7 +261,7 @@ ReferencedPreferredPartners=Предпочитаемые партнёры
 OtherResources=Другие источники
 ExternalResources=Внешние Ресурсы
 SocialNetworks=Социальные сети
-SocialNetworkId=Social Network ID
+SocialNetworkId=Идентификатор социальной сети
 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.
@@ -1043,7 +1044,7 @@ DictionaryOpportunityStatus=Правовой статус  проекта/сде
 DictionaryExpenseTaxCat=Отчет о расходах - Категории транспорта
 DictionaryExpenseTaxRange=Отчет о расходах - Диапазон по транспортной категории
 DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+TypeOfUnit=Тип единицы
 SetupSaved=Настройки сохранены
 SetupNotSaved=Установки не сохранены
 BackToModuleList=Вернуться к списку модулей
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Не рекомендуем
 NoActiveBankAccountDefined=Не определен активный банковский счет
 OwnerOfBankAccount=Владелец банковского счета %s
 BankModuleNotActive=Модуль Банковских счетов не активирован
-ShowBugTrackLink=Показать ссылку "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Предупреждения
 DelaysOfToleranceBeforeWarning=Задержка перед отображением предупреждения о:
 DelaysOfToleranceDesc=Установите задержку до того, как значок предупреждения %s будет отображаться на экране для последнего элемента.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Вы должны запуст
 YourPHPDoesNotHaveSSLSupport=SSL функций, не доступных в PHP
 DownloadMoreSkins=Дополнительные шкуры для загрузки
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Показать профессиональный идентификатор с адресами
 ShowVATIntaInAddress=Скрыть номер НДС внутри Сообщества с адресами
 TranslationUncomplete=Частичный перевод
@@ -1770,7 +1772,7 @@ ClickToDialDesc=This module change phone numbers, when using a desktop computer,
 ClickToDialUseTelLink=Используйте только ссылку «tel:» на номера телефонов
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
+CashDesk=Торговая точка
 CashDeskSetup=Настройка модуля «Точка продаж»
 CashDeskThirdPartyForSell=Default generic third party to use for sales
 CashDeskBankAccountForSell=Денежные счета, используемого для продает
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index c1c19cf04e0..e7f809a0376 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Социальный/налоговый сбор
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Внутренний трансфер
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=От
 TransferTo=К
 TransferFromToDone=<b>Передача%</b> от <b>S в% х %s%</b> S был записан.
-CheckTransmitter=Передатчик
+CheckTransmitter=Отправитель
 ValidateCheckReceipt=Подтвердить получение чека?
-ConfirmValidateCheckReceipt=Вы уверены, что хотите подтвердить получение чека, никакие изменения не будут возможны после того, как это будет сделано?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Удалить эту квитанцию?
 ConfirmDeleteCheckReceipt=Вы действительно хотите удалить эту квитанцию?
 BankChecks=Банковские чеки
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Вы действительно хотите удали
 ThisWillAlsoDeleteBankRecord=Это также приведет к удалению сгенерированной записи банка
 BankMovements=Перевозкой
 PlannedTransactions=Запланированные записи
-Graph=Графика
+Graph=Graphs
 ExportDataset_banque_1=Банковские записи и выписка по счету
 ExportDataset_banque_2=Бланк депозита
 TransactionOnTheOtherAccount=Сделка с другой учетной записи
@@ -142,7 +142,7 @@ AllAccounts=Все банковские и кассовые счета
 BackToAccount=Перейти к ответу
 ShowAllAccounts=Шоу для всех учетных записей
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Выберите банковскую выписку, связанную с согласительной процедурой. Используйте сортируемое числовое значение: ГГГГММ или ГГГГММДД
 EventualyAddCategory=Укажите категорию для классификации записей
 ToConciliate=Согласовать?
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 1dc31d36f5f..06d2f006bcd 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Ввести платеж, полученный от покупателя
 EnterPaymentDueToCustomer=Произвести платеж за счет Покупателя
 DisabledBecauseRemainderToPayIsZero=Отключено, потому что оставшаяся оплата нулевая
-PriceBase=Ценовая база
+PriceBase=Base price
 BillStatus=Статус счета-фактуры
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Проект (должен быть подтвержден)
@@ -454,7 +454,7 @@ RegulatedOn=Регулируемый по
 ChequeNumber=Чек N
 ChequeOrTransferNumber=Чек/Перевод N
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Банк чека
 CheckBank=Проверить
 NetToBePaid=Чистыми к оплате
diff --git a/htdocs/langs/ru_RU/bookmarks.lang b/htdocs/langs/ru_RU/bookmarks.lang
index 701f235600f..478a48f09a4 100644
--- a/htdocs/langs/ru_RU/bookmarks.lang
+++ b/htdocs/langs/ru_RU/bookmarks.lang
@@ -18,3 +18,4 @@ SetHereATitleForLink=Задать имя закладки
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Использовать внешнюю/абсолютную ссылку (https://URL) или внутреннюю/относительную ссылку (/DOLIBARR_ROOT/ htdocs /...)
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Выберите, должна ли связанная страница открываться в текущей вкладке или в новой вкладке
 BookmarksManagement=Управление закладками
+BookmarksMenuShortCut=Ctrl + Shift + M
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index afe6542def5..6b028a8b64f 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Закладки: последние %s
 BoxOldestExpiredServices=Старейшие активных истек услуги
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Последние  %sизмененные пожертвования
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Глобальная активность (фактуры, предложения, заказы)
 BoxGoodCustomers=Хорошие клиенты
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 4a435be4e06..c5d713f5b34 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -16,7 +16,7 @@ AddThisArticle=Добавить эту статью
 RestartSelling=Вернитесь на продажу
 SellFinished=Продажа завершена
 PrintTicket=Печать билетов
-SendTicket=Send ticket
+SendTicket=Отправить запрос
 NoProductFound=Ни одна статья найдены
 ProductFound=продукт найден
 NoArticle=Ни одна статья
@@ -31,17 +31,18 @@ ShowCompany=Показать компании
 ShowStock=Показать склад
 DeleteArticle=Нажмите, чтобы удалить эту статью
 FilterRefOrLabelOrBC=Поиск (ссылке/метке)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=Вы просите уменьшить запас при создании счета-фактуры, поэтому пользователю, который использует POS, необходимо разрешение на редактирование запасов. 
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
-PointOfSale=Point of Sale
+PointOfSale=Торговая точка
 PointOfSaleShort=POS
-CloseBill=Close Bill
-Floors=Floors
-Floor=Floor
+CloseBill=Закрыть счет
+Floors=Этажи
+Floor=Этаж
 AddTable=Добавить таблицу
-Place=Place
-TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+Place=Место
+TakeposConnectorNecesary=Требуется 'Принять POS-коннектор'
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Поиск товара
 Receipt=Квитанция
 Header=Заголовок
@@ -49,15 +50,16 @@ Footer=Нижний колонтитул
 AmountAtEndOfPeriod=Сумма на конец периода (день, месяц или год)
 TheoricalAmount=Теоретическая сумма
 RealAmount=Действительная сумма
-CashFence=Cash desk closing
+CashFence=Закрытие кассы
 CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Кол-во счетов-фактур
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Браузер
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index f70d36de5f5..b5155d8684e 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -3,23 +3,23 @@ Rubrique=Тег/Категория
 Rubriques=Теги/Категории
 RubriquesTransactions=Теги/Категории транзакций
 categories=теги/категории
-NoCategoryYet=Нет созданных тегов/категорий данного типа
+NoCategoryYet=No tag/category of this type has been created
 In=В
 AddIn=Добавить в
 modify=изменить
 Classify=Классифицировать
 CategoriesArea=Раздел тегов/категорий 
-ProductsCategoriesArea=Раздел тегов/категорий  товаров/услуг
-SuppliersCategoriesArea=Раздел тегов/категорий поставщиков
-CustomersCategoriesArea=Раздел тегов/категорий клиентов
-MembersCategoriesArea=Раздел тегов/категорий участников
-ContactsCategoriesArea=Раздел тегов/категорий контактов
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Раздел тегов/категорий проектов
-UsersCategoriesArea=Раздел тегов/категорий пользователей
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Подкатегории
 CatList=Список тегов/категорий
-CatListAll=List of tags/categories (all types)
+CatListAll=Список тегов/категорий (все типы)
 NewCategory=Новый тег/категория
 ModifCat=Изменить тег/категорию
 CatCreated=Тег/категория созданы
@@ -60,40 +60,40 @@ CustomersProspectsCategoriesShort=Теги/категории Клиентов/
 ProductsCategoriesShort=Теги/категории  товаров
 MembersCategoriesShort=Теги/категории участников
 ContactCategoriesShort=Теги/категории контактов
-AccountsCategoriesShort=Accounts tags/categories
+AccountsCategoriesShort=Теги/категории счетов
 ProjectsCategoriesShort=Теги/категории Проектов
 UsersCategoriesShort=Теги/категории пользователей
-StockCategoriesShort=Warehouse tags/categories
-ThisCategoryHasNoItems=This category does not contain any items.
+StockCategoriesShort=Теги/категории склада
+ThisCategoryHasNoItems=Эта категория не содержит никаких элементов.
 CategId=ID тега/категории
-ParentCategory=Parent tag/category
-ParentCategoryLabel=Label of parent tag/category
-CatSupList=List of vendors tags/categories
-CatCusList=List of customers/prospects tags/categories
+ParentCategory=Родительский тег/категория
+ParentCategoryLabel=Метка родительского тега/категории
+CatSupList=Список тегов/категорий поставщиков
+CatCusList=Список клиентов/потенциальных клиентов  тегов/категорий 
 CatProdList=Список тегов/категорий товаров
 CatMemberList=Список тегов/категорий участников
-CatContactList=List of contacts tags/categories
-CatProjectsList=List of projects tags/categories
-CatUsersList=List of users tags/categories
-CatSupLinks=Links between vendors and tags/categories
+CatContactList=Список тегов/категорий контактов
+CatProjectsList=Список тегов/категорий проектов
+CatUsersList=Список тегов/категорий пользователей
+CatSupLinks=Связи между продавцами и тегами/категориями
 CatCusLinks=Связи между клиентами/потенц. клиентами  и  тегами/категориями
-CatContactsLinks=Links between contacts/addresses and tags/categories
+CatContactsLinks=Связи между контактами/адресами и тегами/категориями
 CatProdLinks=Связи между продуктами/услугами  и  тегами/категориями
 CatMembersLinks=Связи между участниками  и  тегами/категориями
 CatProjectsLinks=Связи между проектами и тегами/категориями
-CatUsersLinks=Links between users and tags/categories
+CatUsersLinks=Связи между пользователями и тегами/категориями
 DeleteFromCat=Удалить из тега/категории
 ExtraFieldsCategories=Дополнительные атрибуты
 CategoriesSetup=Настройка тегов/категорий
 CategorieRecursiv=Автоматическая ссылка на родительский тег/категорию
 CategorieRecursivHelp=Если опция включена, то при добавлении товара в подкатегорию товар также будет добавлен в родительскую категорию.
 AddProductServiceIntoCategory=Добавить следующий товар/услугу
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Назначить категорию клиенту 
+AddSupplierIntoCategory=Присвоить категорию поставщику
 ShowCategory=Показать тег/категорию
-ByDefaultInList=By default in list
+ByDefaultInList=По умолчанию в списке
 ChooseCategory=Выберите категорию
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
-WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+StocksCategoriesArea=Складские категории
+ActionCommCategoriesArea=Категории событий
+WebsitePagesCategoriesArea=Категории страниц-контейнеров
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index b38a6ba0a2f..d2c7a153875 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Название компании %s уже существует. Выберите другое.
 ErrorSetACountryFirst=Сначала установите страну
 SelectThirdParty=Выберите контрагента
-ConfirmDeleteCompany=Вы хотите удалить компанию и всю связанную с ней информацию?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Удалить контакт
-ConfirmDeleteContact=Удалить этот контакт и всю связанную с ним информацию?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Новый контрагент
 MenuNewCustomer=Новый Клиент
 MenuNewProspect=Новый Потенциальный клиент
@@ -69,7 +69,7 @@ PhoneShort=Телефон
 Skype=Скайп
 Call=Звонок
 Chat=Чат
-PhonePro=Раб. телефон
+PhonePro=Bus. phone
 PhonePerso=Личн. телефон
 PhoneMobile=Мобильный
 No_Email=Отказаться от массовых рассылок
@@ -331,7 +331,7 @@ CustomerCodeDesc=Код Клиента, уникальный для каждог
 SupplierCodeDesc=Код Поставщика, уникальный для каждого поставщика
 RequiredIfCustomer=Требуется, если контрагент является покупателем или потенциальным клиентом
 RequiredIfSupplier=Требуется, если контрагент является поставщиком
-ValidityControledByModule=Актуальность контролируется модулем
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Правила для этого модуля
 ProspectToContact=Потенциальный клиент для связи
 CompanyDeleted=Компания " %s" удалена из базы данных.
@@ -439,12 +439,12 @@ ListSuppliersShort=Список Поставщиков
 ListProspectsShort=Список Потенциальных клиентов
 ListCustomersShort=Список Клиентов
 ThirdPartiesArea=Контрагенты/Контакты
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Всего контрагентов
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Открытые
 ActivityCeased=Закрыто
 ThirdPartyIsClosed=Закрывшиеся контрагенты
-ProductsIntoElements=Список товаров/услуг в %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Валюта неуплаченного счёта
 OutstandingBill=Максимальный неуплаченный счёт
 OutstandingBillReached=Достигнут максимум не оплаченных счетов
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Код покупателю/поставщику не п
 ManagingDirectors=Имя управляющего или управляющих (Коммерческого директора, директора, президента...)
 MergeOriginThirdparty=Копия контрагента (контрагент которого вы хотите удалить)
 MergeThirdparties=Объединить контрагентов
-ConfirmMergeThirdparties=Вы уверены, что хотите объединить этого контрагента с текущим? Все связанные объекты (счета, заказы, ...) будут перемещены в текущего контрагента, а этот контрагент будет удален.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Третьи стороны были объединены
 SaleRepresentativeLogin=Логин торгового представителя
 SaleRepresentativeFirstname=Имя торгового представителя
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 75ed2fffd16..c10dc6bd112 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Новые скидки
 NewCheckDeposit=Новая проверка депозит
 NewCheckDepositOn=Новый депозит проверить на счету: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Чек при ввода даты
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
index fc73bb1c472..1ab6f4d4688 100644
--- a/htdocs/langs/ru_RU/ecm.lang
+++ b/htdocs/langs/ru_RU/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 57d20e606ad..07a0be72000 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Нет ошибок, мы принимаем
 # Errors
 ErrorButCommitIsDone=Обнаружены ошибки, но мы подтвердиле несмотря на это
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s неправильно
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Логин %s уже существует.
@@ -46,8 +46,8 @@ ErrorWrongDate=Дата некорректна!
 ErrorFailedToWriteInDir=Не удалось записать в директорию %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=Найдено неверный электронный синтаксис% с линии в файл (например, строка %s с электронной почтой= %s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Некоторые обязательные поля не были заполнены.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Не удалось создать каталог. Убедитесь, что веб-сервер пользователь имеет разрешения на запись в каталог Dolibarr документы. Если параметр <b>safe_mode</b> включен по этому PHP, проверьте, что Dolibarr PHP файлы принадлежат к веб-серверу пользователей (или группы).
 ErrorNoMailDefinedForThisUser=Нет определена почта для этого пользователя
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/ru_RU/eventorganization.lang b/htdocs/langs/ru_RU/eventorganization.lang
new file mode 100644
index 00000000000..4d15915a606
--- /dev/null
+++ b/htdocs/langs/ru_RU/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Настройки
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Проект
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Завершены
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/ru_RU/ftp.lang b/htdocs/langs/ru_RU/ftp.lang
index 0aa248a7634..799634cebbf 100644
--- a/htdocs/langs/ru_RU/ftp.lang
+++ b/htdocs/langs/ru_RU/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Настройка модуля FTP-клиента
-NewFTPClient=Настройка нового соединения FTP
-FTPArea=Раздел FTP
-FTPAreaDesc=На этом экране вам показано представление содержимого FTP-сервера
-SetupOfFTPClientModuleNotComplete=Настройка модуля FTP-клиента, по-видимому, не завершена
-FTPFeatureNotSupportedByYourPHP=Ваша версия PHP не поддерживает функции FTP
-FailedToConnectToFTPServer=Не удалось подключиться к FTP-серверу (сервер %s, порт %s)
-FailedToConnectToFTPServerWithCredentials=Не удалось войти на FTP-сервер с указанными логином и паролем
+FTPClientSetup=Настройка модуля FTP или SFTP-клиента
+NewFTPClient=Настройка нового соединения FTP / FTPS
+FTPArea=Область FTP/FTPS 
+FTPAreaDesc=This screen shows a view of an FTP et SFTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP or SFTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP or SFTP functions
+FailedToConnectToFTPServer=Failed to connect to server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to server with defined login/password
 FTPFailedToRemoveFile=Не удалось удалить файл <b>%s</b>.
-FTPFailedToRemoveDir=Не удалось удалить каталог <b>%s</b> (Проверьте права доступа и убедитесь, что каталог пуст).
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
 FTPPassiveMode=Пассивный режим
-ChooseAFTPEntryIntoMenu=Выберите в меню пункт "FTP"
+ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
 FailedToGetFile=Не удалось получить файлы %s
diff --git a/htdocs/langs/ru_RU/knowledgemanagement.lang b/htdocs/langs/ru_RU/knowledgemanagement.lang
new file mode 100644
index 00000000000..b9eba6c3a10
--- /dev/null
+++ b/htdocs/langs/ru_RU/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Настройки
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = О
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Статья
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 6470dc1dddc..b7aaf5a94cb 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Копия
 MailToCCUsers=Copy to users(s)
 MailCCC=Сохраненная копия
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Сообщение
 MailFile=Присоединенные файлы
 MailMessage=Текст Email
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 6d10082dbb5..87b13c7d185 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Проверка подключения
 ToClone=Дублировать
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Выберите данные для клонирования:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Данные для дублирования не определены.
 Of=из
 Go=Выполнить
@@ -246,7 +246,7 @@ DefaultModel=Шаблон документа по-умолчанию
 Action=Действие
 About=О
 Number=Номер
-NumberByMonth=Кол-во в месяц
+NumberByMonth=Total reports by month
 AmountByMonth=Сумма за месяц
 Numero=Номер
 Limit=Лимит
@@ -341,8 +341,8 @@ KiloBytes=Килобайт
 MegaBytes=Мегабайт
 GigaBytes=Гигабайт
 TeraBytes=Терабайт
-UserAuthor=Пользователь создан
-UserModif=Последнее обновление пользователя
+UserAuthor=Ceated by
+UserModif=Updated by
 b=б.
 Kb=Кб
 Mb=Мб
@@ -503,9 +503,11 @@ By=Автор
 From=От
 FromDate=От
 FromLocation=От
-at=at
 to=к
 To=к
+ToDate=к
+ToLocation=к
+at=at
 and=и
 or=или
 Other=Другой
@@ -843,7 +845,7 @@ XMoreLines=%s строк(и) скрыто
 ShowMoreLines=Показать больше/меньше строк
 PublicUrl=Публичная ссылка
 AddBox=Добавить бокс
-SelectElementAndClick=Выберите элемент и нажмите %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Печать файл %s
 ShowTransaction=Показать транзакцию на банковском счете
 ShowIntervention=Показать посредничества
@@ -854,8 +856,8 @@ Denied=Запрещено
 ListOf=Список %s
 ListOfTemplates=Список шаблонов
 Gender=Пол
-Genderman=Мужчина
-Genderwoman=Женщина
+Genderman=Male
+Genderwoman=Female
 Genderother=Другое
 ViewList=Посмотреть список
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 2e01c0c009d..1dd21a7fcb0 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Еще один член (имя и <
 ErrorUserPermissionAllowsToLinksToItselfOnly=По соображениям безопасности, вы должны получить разрешение, чтобы изменить все пользователи должны иметь доступ к ссылке члена к пользователю, что это не твое.
 SetLinkToUser=Ссылка на Dolibarr пользователя
 SetLinkToThirdParty=Ссылка на Dolibarr третья сторона
-MembersCards=Члены печати карт
+MembersCards=Business cards for members
 MembersList=Список участников
 MembersListToValid=Список кандидатов в участники (на утверждении)
 MembersListValid=Список действительных участников
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Члены с подпиской на полу
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Дата подписки
 DateEndSubscription=Дата окончания подписки
-EndSubscription=Конец подписке
+EndSubscription=Subscription Ends
 SubscriptionId=ID подписки
 WithoutSubscription=Without subscription
 MemberId=ID участника
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Подписка требуется
 DeleteType=Удалить
 VoteAllowed=Голосовать разрешается
-Physical=Физическая
-Moral=Моральные
-MorAndPhy=Moral and Physical
-Reenable=Снова
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Члены статистику по странам
 MembersStatisticsByState=Члены статистики штата / провинции
 MembersStatisticsByTown=Члены статистики города
 MembersStatisticsByRegion=Статистика участников по регионам
-NbOfMembers=Количество членов
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Нет проверки члены найдены
-MembersByCountryDesc=Этот экран покажет вам статистику членов странами. Графический зависит однако от Google сервис график онлайн и доступна, только если подключение к Интернету работает.
-MembersByStateDesc=Этот экран покажет вам статистику пользователей, штата / провинции / кантона.
-MembersByTownDesc=Этот экран покажет вам статистику пользователей, город.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Выберите статистику вы хотите прочитать ...
 MenuMembersStats=Статистика
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Информационные общественности (нет = частных)
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Новый участник добавил. В ожидании утверждения
 NewMemberForm=Новая форма члена
-SubscriptionsStatistics=Статистика по подписке
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Количество подписок
-AmountOfSubscriptions=Сумма подписки
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Оборот (за компанию) или бюджета (за основу)
 DefaultAmount=По умолчанию количество подписки
 CanEditAmount=Посетитель может выбрать / изменить размер его подписке
 MEMBER_NEWFORM_PAYONLINE=Перейти по комплексному интернет страницу оплаты
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Значение НДС, для ипользования в подписках
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Товар, который будет использован, чтобы включить подписку в счёт: %s
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index 19afb9d95ab..b8dc90822dc 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -5,7 +5,7 @@ EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use upp
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
 ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
+NewModule=Новый модуль
 NewObjectInModulebuilder=New object
 ModuleKey=Module key
 ObjectKey=Object key
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 1a1f99c8c45..948470dcd3b 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Проф Id %s</b> является информация в зависимости от сторонних страны. <br> Например, для страны <b>с%,</b> то <b>с кодом%.</b>
 DolibarrDemo=Dolibarr ERP / CRM демо
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/ru_RU/partnership.lang b/htdocs/langs/ru_RU/partnership.lang
new file mode 100644
index 00000000000..4192ed27776
--- /dev/null
+++ b/htdocs/langs/ru_RU/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = Новое партнерство
+ListOfPartnerships = Список партнеров
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Дата начала
+DatePartnershipEnd=Дата окончания
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Проект
+PartnershipAccepted = Принято
+PartnershipRefused = Отклонено
+PartnershipCanceled = Отменена
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
index befbae44568..45500b8f86d 100644
--- a/htdocs/langs/ru_RU/productbatch.lang
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -1,10 +1,10 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Использовать номер партии/серийный номер
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusOnBatch=Да (требуется лот) 
+ProductStatusOnSerial=Да (требуется уникальный серийный номер)
 ProductStatusNotOnBatch=Нет (серийный номер/номер партии не используется)
-ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
+ProductStatusOnBatchShort=Лот
+ProductStatusOnSerialShort=Серийный
 ProductStatusNotOnBatchShort=Нет
 Batch=Партии/серийный номер
 atleast1batchfield=Дата уплаты или дата продажи или Лот / Серийный номер
@@ -24,12 +24,12 @@ ProductLotSetup=Настройка лота / серийного модуля
 ShowCurrentStockOfLot=Показать текущий запас для пары товара / лота
 ShowLogOfMovementIfLot=Показать журнал движений для пары product / lot
 StockDetailPerBatch=Детальная информация о лоте
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
-BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
-CustomMasks=Adds an option to define mask in the product card
+SerialNumberAlreadyInUse=Серийный номер %s уже используется для продукта %s
+TooManyQtyForSerialNumber=У вас может быть только один продукт %s для серийного номера %s
+BatchLotNumberingModules=Опции для автоматического создания серийной продукции по партиям 
+BatchSerialNumberingModules=Опции для автоматического создания серийной продукции по серийным номерам 
+ManageLotMask=Пользовательская маска
+CustomMasks=Добавляет возможность определения маски в карточке товара
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
-QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
+QtyToAddAfterBarcodeScan=Кол-во для добавления для каждого отсканированного штрих-кода / партии / серийного номера 
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index fca1501a90e..25425e698b6 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Услуги только для продажи
 ServicesOnPurchaseOnly=Услуги только для покупки
 ServicesNotOnSell=Услуги не для продажи, а не для покупки
 ServicesOnSellAndOnBuy=Услуга для продажи и покупки
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Последние %sзарегистрированные продукты
 LastRecordedServices=Последние  %sзарегистрированные услуги
 CardProduct0=Товар
@@ -73,12 +73,12 @@ SellingPrice=Продажная цена
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Продажная цена (вкл. налоги)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Это значение может использоваться для расчета маржи.
 SoldAmount=Сумма продажи
 PurchasedAmount=Сумма покупки
 NewPrice=Новая цена
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Изменить ярлык цены продажи
 CantBeLessThanMinPrice=Продажная цена не может быть ниже минимальной для этого товара (%s без налогов). Это сообщение также возникает, если вы задаёте слишком большую скидку.
 ContractStatusClosed=Закрытые
@@ -157,11 +157,11 @@ ListServiceByPopularity=Перечень услуг по популярност
 Finished=Произведено продукции
 RowMaterial=Первый материал
 ConfirmCloneProduct=Вы действительно хотите клонировать продукт или услугу <b> %s </b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Клонирование цен
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Клонирование вариантов продукта
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Этот продукт используется
 NewRefForClone=Ссылка нового продукта / услуги
 SellingPrices=Цены на продажу
@@ -170,12 +170,12 @@ CustomerPrices=Цены клиентов
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Страна происхождения
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Короткая метка
 Unit=Единица
 p=u.
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 2ae71da669f..1c0ea89c8c7 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Проект контакты
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Все проекты
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Эта точка зрения представлены все проекты, которые Вы позволили читать.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Это представление всех проектов и задач, к которым у вас есть доступ.
 ProjectsDesc=Эта точка зрения представляет все проекты (разрешений пользователей предоставить вам разрешение для просмотра всего).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Эта точка зрения представляет всех проектов и задач, которые могут читать.
 TasksDesc=Эта точка зрения представляет всех проектов и задач (разрешений пользователей предоставить вам разрешение для просмотра всего).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=Новый проект
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/ru_RU/recruitment.lang b/htdocs/langs/ru_RU/recruitment.lang
index 71fa83a3e38..29b7874b6ee 100644
--- a/htdocs/langs/ru_RU/recruitment.lang
+++ b/htdocs/langs/ru_RU/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index 8f423ba15d8..568dcf4572f 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Модель A5
 WarningNoQtyLeftToSend=Внимание, нет товаров ожидающих отправки.
-StatsOnShipmentsOnlyValidated=Статистика собирается только на утверждённые поставки. Используемая дата - дата утверждения поставки (планируемая дата доставки не всегда известна)
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Планируемая дата доставки
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 5b0fc6b9aaf..b117c151467 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Нет предопределенного прод
 DispatchVerb=Отправка
 StockLimitShort=Граница предупреждения
 StockLimit=Граница предупреждения о запасе на складе
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real фондовая
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/ru_RU/supplier_proposal.lang b/htdocs/langs/ru_RU/supplier_proposal.lang
index 89ebd3de317..84cacfa5c08 100644
--- a/htdocs/langs/ru_RU/supplier_proposal.lang
+++ b/htdocs/langs/ru_RU/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Vendor proposals area
 SupplierProposalShort=Vendor proposal
 SupplierProposals=Предложения поставщиков
 SupplierProposalsShort=Предложения поставщиков
+AskPrice=Price request
 NewAskPrice= Новый запрос цены
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
@@ -25,14 +26,14 @@ ValidateAsk=Validate request
 SupplierProposalStatusDraft=Проект (должно быть подтверждено)
 SupplierProposalStatusValidated=Validated (request is open)
 SupplierProposalStatusClosed=Закрыты
-SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusSigned=Принято
 SupplierProposalStatusNotSigned=Отклонено
 SupplierProposalStatusDraftShort=Проект
 SupplierProposalStatusValidatedShort=Утверждена
 SupplierProposalStatusClosedShort=Закрыты
-SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusSignedShort=Принято
 SupplierProposalStatusNotSignedShort=Отклонено
-CopyAskFrom=Create price request by copying existing a request
+CopyAskFrom=Create a price request by copying an existing request
 CreateEmptyAsk=Create blank request
 ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
 ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
@@ -52,3 +53,6 @@ SupplierProposalsToClose=Vendor proposals to close
 SupplierProposalsToProcess=Vendor proposals to process
 LastSupplierProposals=Latest %s price requests
 AllPriceRequests=All requests
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=Представитель следующие меры предложение
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index b4072589ddc..b638815e56a 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Пароль изменен на: %s
 SubjectNewPassword=Ваш новый пароль для %s
 GroupRights=Права доступа группы
 UserRights=Права доступа пользователя
+Credentials=Credentials
 UserGUISetup=Внешний вид (для пользователя)
 DisableUser=Выключать
 DisableAUser=Отключить пользователя
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Использьзуйте поле Тип для изме
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Использовать OpenID для входа
 WeeklyHours=Отработанные часы (в неделю)
-ExpectedWorkedHours=Ожидаемое отработанное время за неделю
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Цвет пользователя
 DisabledInMonoUserMode=Отключено в режиме обслуживания
 UserAccountancyCode=Код учета пользователя
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Дата начала трудоустройства
 DateEmploymentEnd=Дата окончания занятости
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Вы не можете отключить свою собственную запись пользователя
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 8637448b60d..4e0840138f3 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/ru_UA/admin.lang b/htdocs/langs/ru_UA/admin.lang
deleted file mode 100644
index cac0d063f48..00000000000
--- a/htdocs/langs/ru_UA/admin.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - admin
-ShowBugTrackLink=Show link "<strong>%s</strong>"
diff --git a/htdocs/langs/ru_UA/cron.lang b/htdocs/langs/ru_UA/cron.lang
new file mode 100644
index 00000000000..67ecfc77567
--- /dev/null
+++ b/htdocs/langs/ru_UA/cron.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cron
+CronTaskInactive=This job is disabled
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index fb708cba3c6..49176f22261 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -202,7 +202,7 @@ Docref=referencie
 LabelAccount=Značkový účet
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=časopis
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=Zoznam produktov, ktoré nie sú viazané na žiadny účtovný účet
 ChangeBinding=Zmeňte väzbu
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Nezlúčené
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 9a671606ef1..238bebf040b 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Bezpečnostné nastavenia
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Chyba, tento modul vyžaduje PHP verzia %s alebo vyššia
 ErrorModuleRequireDolibarrVersion=Chyba, tento modul vyžaduje Dolibarr verzie %s alebo vyššia
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Nenaznačujú
 NoActiveBankAccountDefined=Žiadny aktívny bankový účet definovaný
 OwnerOfBankAccount=Majiteľ %s bankových účtov
 BankModuleNotActive=Účty v bankách modul nie je povolený,
-ShowBugTrackLink=Zobraziť odkaz "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Upozornenie
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Je nutné spustiť tento príka
 YourPHPDoesNotHaveSSLSupport=SSL funkcia nie je k dispozícii vo vašom PHP
 DownloadMoreSkins=Ďalšie skiny k stiahnutiu
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Čiastočný preklad
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 0cea1cfce0f..dcc321b5360 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Platba sociálnej/fiškálnej dane
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Interný prevod
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Z
 TransferTo=Na
 TransferFromToDone=Transfer z <b>%s</b> na <b>%s</b> %s <b>%s</b> zo bol zaznamenaný.
-CheckTransmitter=Vysielač
+CheckTransmitter=Odosielateľ
 ValidateCheckReceipt=Overiť túto potvrdenku ?
-ConfirmValidateCheckReceipt=Určite chcete overiť túto potvrdenku  ? Po tejto akcií nebudu ďalšie zmeny možné.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Zmazať túto potvrdenku ?
 ConfirmDeleteCheckReceipt=Určite chcete zmazať túto potvrdenku ?
 BankChecks=Bankové šeky
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Pohyby
 PlannedTransactions=Planned entries
-Graph=Grafika
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Doklad o vklade
 TransactionOnTheOtherAccount=Transakcie na iný účet
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Späť na účte
 ShowAllAccounts=Zobraziť pre všetky účty
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Zvoľte výpis z účtu  potrebný pre náhľad. Zoraďťe podľa číselnej hodnoty YYYYMM alebo YYYYMMDD
 EventualyAddCategory=Nakoniec určiť kategóriu, v ktorej chcete klasifikovať záznamy
 ToConciliate=Na zlúčenie ?
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 34636cf7302..15c80cbb0ce 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Zadajte platby, ktoré obdržal od zákazníka
 EnterPaymentDueToCustomer=Vykonať platbu zo strany zákazníka
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Cena základnej
+PriceBase=Base price
 BillStatus=Stav faktúry
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Návrh (musí byť overená)
@@ -454,7 +454,7 @@ RegulatedOn=Regulované
 ChequeNumber=Skontrolujte N °
 ChequeOrTransferNumber=Skontrolujte / Prenos č
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Kontrola
 NetToBePaid=Net má byť zaplatená
diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
index 9d0739d199a..dc27e1a08ea 100644
--- a/htdocs/langs/sk_SK/boxes.lang
+++ b/htdocs/langs/sk_SK/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Najstarší aktívny vypršala služby
 BoxLastExpiredServices=Najnovšie %s najstaršie zmluvy s aktívnym expirovaním služby
 BoxTitleLastActionsToDo=Najnovšie %s úlohy na dokončenie
-BoxTitleLastContracts=Najnovšie %s upravené zmluvy
-BoxTitleLastModifiedDonations=Najnovšie %s upravené príspevky
-BoxTitleLastModifiedExpenses=Najnovšie %s upravené správy o výdavkoch
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globálna aktivita (faktúry, návrhy, objednávky)
 BoxGoodCustomers=Top zákazníci
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index 0c85aa44b53..3f6316410ff 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Príjem
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Prehliadač
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index 3fcf110da7f..4af13ecc0f3 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Štítky / Kategórie
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=V
 AddIn=Pridajte
 modify=upraviť
 Classify=Klasifikovať
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 513a5cb3ce9..a87c62bdf3e 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Názov spoločnosti %s už existuje. Vyberte si inú.
 ErrorSetACountryFirst=Nastavenie krajiny prvý
 SelectThirdParty=Vyberte tretiu stranu
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Odstránenie kontaktu / adresa
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Telefón
 Skype=Skype
 Call=Volanie
 Chat=Chat
-PhonePro=Prof telefón
+PhonePro=Bus. phone
 PhonePerso=Os. telefón
 PhoneMobile=Mobilné
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Poštové smerovacie číslo
 Town=Mesto
 Web=Web
 Poste= Pozícia
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Požadované, ak tretia osoba zákazníka alebo perspektíva
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect kontaktovať
 CompanyDeleted=Spoločnosť &quot;%s&quot; vymazaný z databázy.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Otvorení
 ActivityCeased=Zatvorené
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. za vynikajúce účet
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Kód je zadarmo. Tento kód je možné kedykoľvek zmeni
 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, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index c9e2fc18a94..c8df634a8d6 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Nová zľava
 NewCheckDeposit=Nová kontrola záloha
 NewCheckDepositOn=Vytvorte potvrdenie o vklade na účet: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Skontrolujte dátum príjmu
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/sk_SK/ecm.lang b/htdocs/langs/sk_SK/ecm.lang
index 690a626db44..42fca8f3efa 100644
--- a/htdocs/langs/sk_SK/ecm.lang
+++ b/htdocs/langs/sk_SK/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 2cd5196ebaf..ca0536031e6 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Žiadna chyba sa zaväzujeme
 # Errors
 ErrorButCommitIsDone=Boli nájdené chyby, ale my overiť aj cez to
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s je zle
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prihlásenie %s už existuje.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 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. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Niektoré požadované pole sa nevypĺňa.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Nepodarilo sa vytvoriť adresár. Uistite sa, že webový server má užívateľ oprávnenie na zápis do adresára dokumentov Dolibarr. Ak je parameter <b>safe_mode</b> je povolené na tomto PHP, skontrolujte, či Dolibarr php súbory, vlastné pre užívateľa webového servera (alebo skupina).
 ErrorNoMailDefinedForThisUser=Žiadna pošta definované pre tohto používateľa
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/sk_SK/eventorganization.lang b/htdocs/langs/sk_SK/eventorganization.lang
new file mode 100644
index 00000000000..0a54214ab36
--- /dev/null
+++ b/htdocs/langs/sk_SK/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Návrh
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Hotový
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/sk_SK/knowledgemanagement.lang b/htdocs/langs/sk_SK/knowledgemanagement.lang
new file mode 100644
index 00000000000..78652570279
--- /dev/null
+++ b/htdocs/langs/sk_SK/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = O
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Článok
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index 5ee7e05f1ca..b310258f2de 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Kopírovať do
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached kópiu
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Správa
 MailFile=Priložené súbory
 MailMessage=E-mail telo
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index d5521db463a..f56b3a0104c 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Skúšobné pripojenie
 ToClone=Klon
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Žiadne údaje nie sú k klonovať definovaný.
 Of=z
 Go=Ísť
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Udalosť
 About=O
 Number=Číslo
-NumberByMonth=Číslo podľa mesiaca
+NumberByMonth=Total reports by month
 AmountByMonth=Suma podľa mesiaca
 Numero=Číslo
 Limit=Obmedzenie
@@ -341,8 +341,8 @@ KiloBytes=Kilobajty
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabajtov
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Podľa
 From=Z
 FromDate=Z
 FromLocation=Z
-at=at
 to=na
 To=na
+ToDate=na
+ToLocation=na
+at=at
 and=a
 or=alebo
 Other=Ostatné
@@ -843,7 +845,7 @@ XMoreLines=%s riadk(y/ov) skrytých
 ShowMoreLines=Show more/less lines
 PublicUrl=Verejné URL
 AddBox=Pridať box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Vytlačiť súbor %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Zobraziť zásah
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Ostatné
 ViewList=Zobrazenie zoznamu
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index 30d4aeab7e3..c427849d17d 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Ďalší člen (meno: <b>%s,</b> logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=Z bezpečnostných dôvodov musí byť udelené povolenie na úpravu, aby všetci užívatelia mohli spojiť člena užívateľa, ktorá nie je vaša.
 SetLinkToUser=Odkaz na užívateľovi Dolibarr
 SetLinkToThirdParty=Odkaz na Dolibarr tretej osobe
-MembersCards=Členovia vizitky
+MembersCards=Business cards for members
 MembersList=Zoznam členov
 MembersListToValid=Zoznam návrhov členov (má byť overený)
 MembersListValid=Zoznam platných členov
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Členovia s predplatným dostávať
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Vstupné dáta
 DateEndSubscription=Zasielanie noviniek dátum ukončenia
-EndSubscription=Koniec predplatné
+EndSubscription=Subscription Ends
 SubscriptionId=ID predplatného
 WithoutSubscription=Without subscription
 MemberId=ID člena
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Predplatné vyžadovalo
 DeleteType=Odstrániť
 VoteAllowed=Hlasovať povolená
-Physical=Fyzikálne
-Moral=Morálna
-MorAndPhy=Moral and Physical
-Reenable=Znovu povoliť
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Členovia Štatistiky podľa krajiny
 MembersStatisticsByState=Členovia štatistika štát / provincia
 MembersStatisticsByTown=Členovia štatistika podľa mesta
 MembersStatisticsByRegion=Štatistiky užívateľov podľa regiónu
-NbOfMembers=Počet členov
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Žiadne overené členmi nájdených
-MembersByCountryDesc=Táto obrazovka vám ukáže štatistiku členov jednotlivých krajinách. Grafika však závisí od Google on-line služby grafu a je k dispozícii iba v prípade, je pripojenie k internetu funguje.
-MembersByStateDesc=Táto obrazovka vám ukáže štatistiku členov podľa štátu / provincie / Canton.
-MembersByTownDesc=Táto obrazovka vám ukáže štatistiku členom mesta.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Zvoľte štatistík, ktoré chcete čítať ...
 MenuMembersStats=Štatistika
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Informácie sú verejné
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Nový užívateľ pridaný. Čaká na schválenie
 NewMemberForm=Nový člen forma
-SubscriptionsStatistics=Štatistiky o predplatné
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Počet odberov
-AmountOfSubscriptions=Suma úpisov
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Obrat (pre firmu), alebo rozpočet (pre nadáciu)
 DefaultAmount=Východisková suma predplatného
 CanEditAmount=Návštevník si môže vybrať / upraviť výšku svojho upísaného
 MEMBER_NEWFORM_PAYONLINE=Prejsť na integrované on-line platobné stránky
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=Tento pohľad zobrazuje štatistiky používateľov podľa krajiny
-MembersByRegion=Tento pohľad zobrazuje štatistiky používateľov podľa regiónu
 VATToUseForSubscriptions=Sadzba DPH sa má použiť pre predplatné
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt použitý pre riadok predplatného vo faktúre %s
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index 98646eb50a8..03ba1f168c7 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 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=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/sk_SK/partnership.lang b/htdocs/langs/sk_SK/partnership.lang
new file mode 100644
index 00000000000..46da9502212
--- /dev/null
+++ b/htdocs/langs/sk_SK/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Dátum začatia
+DatePartnershipEnd=Dátum ukončenia
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Návrh
+PartnershipAccepted = Akceptované
+PartnershipRefused = Odmietol
+PartnershipCanceled = Zrušený
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang
index c2af074a693..adf023644b1 100644
--- a/htdocs/langs/sk_SK/productbatch.lang
+++ b/htdocs/langs/sk_SK/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index d4db52e208b..0e8c49a9b28 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Services for sale only
 ServicesOnPurchaseOnly=Services for purchase only
 ServicesNotOnSell=Services not for sale and not for purchase
 ServicesOnSellAndOnBuy=Služba na predaj a kúpu
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Naposledy %s uložené produkty
 LastRecordedServices=Naposledy %s uložené služby
 CardProduct0=Produkt
@@ -73,12 +73,12 @@ SellingPrice=Predajná cena
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Predajná cena (s DPH)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Predané množstvo
 PurchasedAmount=Kúpené množstvo
 NewPrice=Nová cena
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Predajná cena nesmie byť nižšia ako minimálna povolená pre tento produkt (%s bez dane). Toto hlásenie sa môže tiež zobrazí, ak zadáte príliš dôležitú zľavu.
 ContractStatusClosed=Zatvorené
@@ -157,11 +157,11 @@ ListServiceByPopularity=Zoznam služieb podľa obľúbenosti
 Finished=Výrobca produktu
 RowMaterial=Surovina
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Tento produkt sa používa
 NewRefForClone=Ref nového produktu / služby
 SellingPrices=Predajné ceny
@@ -170,12 +170,12 @@ CustomerPrices=Zákaznícka cena
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Krajina pôvodu
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Krátky názov
 Unit=Jednotka
 p=u.
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 112e55c7285..b37e00ee7eb 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Projekt kontakty
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Všetky projekty
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 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.
 ProjectsPublicTaskDesc=Tento názor predstavuje všetky projekty a úlohy, ktoré sú prístupné pre čítanie.
 ProjectsDesc=Tento názor predstavuje všetky projekty (užívateľského oprávnenia udeliť oprávnenie k nahliadnutiu všetko).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Tento názor predstavuje všetky projekty a úlohy, ktoré sú prístupné pre čítanie.
 TasksDesc=Tento názor predstavuje všetky projekty a úlohy (vaše užívateľské oprávnenia udeliť oprávnenie k nahliadnutiu všetko).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=Nový projekt
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/sk_SK/recruitment.lang b/htdocs/langs/sk_SK/recruitment.lang
index 321f949aa39..1d3931dc484 100644
--- a/htdocs/langs/sk_SK/recruitment.lang
+++ b/htdocs/langs/sk_SK/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index 76606f60e53..42c34680fc0 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Určite chcete overiť túto zásielku s odkazom <b>%s</b
 ConfirmCancelSending=Určite chcete zrušiť túto zásielku ?
 DocumentModelMerou=Mero A5 modelu
 WarningNoQtyLeftToSend=Varovanie: žiadny tovar majú byť dodané.
-StatsOnShipmentsOnlyValidated=Štatistiky vykonaná na zásielky iba overených. Dátum použité je dátum schválenia zásielky (plánovaný dátum dodania nie je vždy známe).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Plánovaný dátum doručenia
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 24456ee31a7..ecf0fa38063 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Žiadne preddefinované produkty pre tento objekt.
 DispatchVerb=Odoslanie
 StockLimitShort=Limit pre výstrahu
 StockLimit=Limit zásob pre výstrahu
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Skutočné Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
index 4a3baedf95d..77cc52980da 100644
--- a/htdocs/langs/sk_SK/users.lang
+++ b/htdocs/langs/sk_SK/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Heslo bolo zmenené na: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Skupinové oprávnenia
 UserRights=Užívateľské oprávnenia
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Zakázať
 DisableAUser=Zakázať užívateľa
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Použite pole Typ pre zmenu
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Použiť OpenID pre prihlásenie
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Farba priradená užívateľovi
 DisabledInMonoUserMode=Vypnuté v údržbovom móde
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index e962c91d16e..8612aecf711 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 7e9490abb5e..5d8ff3b552b 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Račun Label
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Revija
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 801722cc765..c131906e958 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Varnostne nastavitve
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Napaka, ta modul zahteva PHP različico %s ali višjo
 ErrorModuleRequireDolibarrVersion=Napaka, Ta modul zahteva Dolibarr različico %s ali višjo
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Ne predlagaj
 NoActiveBankAccountDefined=Ni definiran aktivni bančni račun
 OwnerOfBankAccount=Lastnik bančnega računa %s
 BankModuleNotActive=Modul za bančne račune ni omogočen
-ShowBugTrackLink=Prikaži povezavo "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Opozorila
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Ta ukaz morate pognati iz ukazn
 YourPHPDoesNotHaveSSLSupport=SSL funkcije niso na voljo v vašem PHP
 DownloadMoreSkins=Prenos dodatnih preoblek
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Delni prevod
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index 7a25b6f14c3..6bf993564d0 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Plačilo socialnega/fiskalnega davka
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Od
 TransferTo=Na
 TransferFromToDone=Zabeležen je bil transfer od <b>%s</b> na <b>%s</b> v znesku <b>%s</b> %s.
-CheckTransmitter=Oddajnik
+CheckTransmitter=Od
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bančni čeki
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Prenosi
 PlannedTransactions=Planned entries
-Graph=Grafika
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Potrdilo o avansu
 TransactionOnTheOtherAccount=Transakcija na drug račun
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Nazaj na račun
 ShowAllAccounts=Prikaži vse račune
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Izberi bančni izpisek, povezan s posredovanjem. Uporabi numerično vrednost, ki se lahko sortira: YYYYMM ali YYYYMMDD
 EventualyAddCategory=Eventuelno določi kategorijo, v katero se razvrsti zapis
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index f2991ee9dc1..72715833296 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Pretvori presežek plačila v razpoložljiv popust
 EnterPaymentReceivedFromCustomer=Vnesi prejem plačila kupca
 EnterPaymentDueToCustomer=Vnesi rok plačila za kupca
 DisabledBecauseRemainderToPayIsZero=Onemogočeno, ker je neplačan znesek enak nič
-PriceBase=Osnova cene
+PriceBase=Base price
 BillStatus=Stanje fakture
 StatusOfGeneratedInvoices=Stanja ustvarjenih faktur
 BillStatusDraft=Osnutek (potrebna potrditev)
@@ -454,7 +454,7 @@ RegulatedOn=Urejen dne
 ChequeNumber=Ček N°
 ChequeOrTransferNumber=Ček/Prenos N°
 ChequeBordereau=Check schedule
-ChequeMaker=Oddajnik čekov/prenosov
+ChequeMaker=Check/Transfer sender
 ChequeBank=Banka izdajalka čeka
 CheckBank=Ček
 NetToBePaid=Neto za plačilo
diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
index f0d05cd02f3..2b07e2fe81f 100644
--- a/htdocs/langs/sl_SI/boxes.lang
+++ b/htdocs/langs/sl_SI/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Najstarejši dejavni potekla storitve
 BoxLastExpiredServices=Zadnji %s najstarejših stikov z aktivnimi zapadlimi storitvami
 BoxTitleLastActionsToDo=Zadnja %s odprta opravila
-BoxTitleLastContracts=Zadnje %s spremenjene pogodbe
-BoxTitleLastModifiedDonations=Zadnje %s spremenjene donacije
-BoxTitleLastModifiedExpenses=Zadnja %s poročila o stroških
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globalna aktivnost (računi, ponudbe, naročila)
 BoxGoodCustomers=Dobri kupci
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index 90b364f16d4..f298b47be4d 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Potrdilo
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Iskalnik
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 34c34fcd4f2..3a6604f4407 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Značka/kategorija
 Rubriques=Značke/kategorije
 RubriquesTransactions=Tags/Categories of transactions
 categories=značke/kategorije
-NoCategoryYet=Ni kreirana nobena značka/kategorija te vrste
+NoCategoryYet=No tag/category of this type has been created
 In=V
 AddIn=Dodaj v
 modify=spremeni
 Classify=Razvrsti
 CategoriesArea=Področje značk/kategorij
-ProductsCategoriesArea=Področje značk/kategorij proizvodov/storitev
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Področje značk/kategorij kupcev
-MembersCategoriesArea=Področje značk/kategorij članov
-ContactsCategoriesArea=Področje značk/kategorij kontaktov
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=Seznam značk/kategorij
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 0bfae25b4a8..b8d1576d7d7 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Ime podjetja %s že obstaja. Izberite drugačno ime.
 ErrorSetACountryFirst=Najprej izberite državo
 SelectThirdParty=Izberite partnerja
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Izbrišite kontakt
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Kliči
 Chat=Klepetaj
-PhonePro=Službeni telefon
+PhonePro=Bus. phone
 PhonePerso=Osebni telefon
 PhoneMobile=Mobilni telefon
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Poštna številka
 Town=Mesto
 Web=Spletna stran
 Poste= Položaj
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Obvezno, če je partner kupec ali možna stranka
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Možna stranka v kontakt
 CompanyDeleted=Podjetje "%s" izbrisano iz baze.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Odprt
 ActivityCeased=Neaktiven
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=Seznam proizvodov/storitev v %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Trenutni neplačan račun
 OutstandingBill=Max. za neplačan račun
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Koda kupca / dobavitelja po želji. Lahko jo kadarkoli sp
 ManagingDirectors=Ime direktorja(ev) (CEO, direktor, predsednik...)
 MergeOriginThirdparty=Podvojen partner (partner, ki ga želite zbrisati)
 MergeThirdparties=Združi partnerje
-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 third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 41861379acc..2e0fc02ef29 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Nov popust
 NewCheckDeposit=Nova kontrola depozita
 NewCheckDepositOn=Nova kontrola depozita na račun: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Vnos datuma prejema čeka
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/sl_SI/ecm.lang b/htdocs/langs/sl_SI/ecm.lang
index 36cc2a6fce7..27b9058d148 100644
--- a/htdocs/langs/sl_SI/ecm.lang
+++ b/htdocs/langs/sl_SI/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index a212d74fcf3..5e8037ba1ed 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s je napačen
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Uporabniško ime %s že obstaja.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 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. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Nekatera zahtevana polja niso izpolnjena.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Kreiranje mape ni uspelo. Preverite, če ima uporabnik internetne strani dovoljenje za pisanje v mapo z Dolibarr dokumenti. Če je parameter <b>safe_mode</b> v tem PHP omogočen, preverite če je lastnik Dolibarr php datotek uporabnik web strežnika (ali skupina).
 ErrorNoMailDefinedForThisUser=Ta uporabnik nima določenega Email naslova
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/sl_SI/eventorganization.lang b/htdocs/langs/sl_SI/eventorganization.lang
new file mode 100644
index 00000000000..cb865b8c92e
--- /dev/null
+++ b/htdocs/langs/sl_SI/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Osnutek
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Izvršene
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/sl_SI/knowledgemanagement.lang b/htdocs/langs/sl_SI/knowledgemanagement.lang
new file mode 100644
index 00000000000..3d95eaacf2c
--- /dev/null
+++ b/htdocs/langs/sl_SI/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = O programu
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Artikel
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index e87e6b2b66a..80d2dd4ac02 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Kopija
 MailToCCUsers=Copy to users(s)
 MailCCC=Skrita kopija
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Sporočilo
 MailFile=Priloge
 MailMessage=Vsebina Email-a
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Konfiguracij pošiljanja e-pošte je bila nastavljena na '%s'. Ta način ne more biti uporabljen za masovno pošiljanje.
 MailSendSetupIs2=Najprej morate kot administrator preko menija %sDomov - Nastavitve - E-pošta%s spremeniti parameter <strong>'%s'</strong> za uporabo načina '%s'. V tem načinu lahko odprete nastavitve SMTP strežnika, ki vam jih omogoča vaš spletni oprerater in uporabite masovno pošiljanje.
 MailSendSetupIs3=Če imate vprašanja o nastavitvi SMTP strežnika, lahko vprašate %s.
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 696fca76795..93dfbe3cf76 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test povezave
 ToClone=Kloniraj
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Ni definiranih podatkov za kloniranje.
 Of=od
 Go=Pojdi
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Aktivnost
 About=O programu
 Number=Številka
-NumberByMonth=Številka po mesecih
+NumberByMonth=Total reports by month
 AmountByMonth=Znesek po mesecih
 Numero=Številka
 Limit=Omejitev
@@ -341,8 +341,8 @@ KiloBytes=Kilobyti
 MegaBytes=Megabyti
 GigaBytes=Gigabyti
 TeraBytes=Terabyti
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Z
 From=Od
 FromDate=Izdajatelj
 FromLocation=Izdajatelj
-at=at
 to=do
 To=do
+ToDate=do
+ToLocation=do
+at=at
 and=in
 or=ali
 Other=ostalo
@@ -843,7 +845,7 @@ XMoreLines=%s zasenčena(ih) vrstic
 ShowMoreLines=Show more/less lines
 PublicUrl=Javni URL
 AddBox=Dodaj okvir
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Natisni datoteko %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Prikaži intervencijo
@@ -854,8 +856,8 @@ Denied=Zavrnjen
 ListOf=List of %s
 ListOfTemplates=Seznam predlog
 Gender=Spol
-Genderman=Moški
-Genderwoman=Ženska
+Genderman=Male
+Genderwoman=Female
 Genderother=Ostalo
 ViewList=Glej seznam
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index f98d2483e3c..7e9544e82f1 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Drug član (ime: <b>%s</b>, uporabni
 ErrorUserPermissionAllowsToLinksToItselfOnly=Zaradi varnostnih razlogov, morate imeti dovoljenje za urejanje vseh uporabnikov, če želite povezati člana z uporabnikom, ki ni vaš.
 SetLinkToUser=Povezava z Dolibarr uporabnikom
 SetLinkToThirdParty=Povezava z Dolibarr partnerjem
-MembersCards=Tiskane kartice članov
+MembersCards=Business cards for members
 MembersList=Seznam članov
 MembersListToValid=Seznam predlaganih članov (potrebna potrditev)
 MembersListValid=Seznam potrjenih članov
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Člani, ki morajo plačati članarino
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Datum vpisa
 DateEndSubscription=Datum zadnje članarine
-EndSubscription=Veljavnost članarine
+EndSubscription=Subscription Ends
 SubscriptionId=ID članarine
 WithoutSubscription=Without subscription
 MemberId=ID člana
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Zahtevana včlanitev
 DeleteType=Izbriši
 VoteAllowed=Dovoljeno glasovanje
-Physical=Fizično
-Moral=Moralno
-MorAndPhy=Moral and Physical
-Reenable=Ponovno omogoči
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Statistika članov po državah
 MembersStatisticsByState=Statistika članov po deželah
 MembersStatisticsByTown=Statistika članov po mestih
 MembersStatisticsByRegion=Statistika članov po regijah
-NbOfMembers=Število članov
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Najdeni so nepotrjeni člani
-MembersByCountryDesc=Na tem zaslonu je prikazana statistika članov po državah. Grafika je odvisna od Google storitve in je na voljo samo pri delujoči internetni povezavi.
-MembersByStateDesc=Na tem zaslonu je prikazana statistika članov po državah/deželah/kantonih.
-MembersByTownDesc=Na tem zaslonu je prikazana statistika članov po mestih.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Izberite statistiko, ki jo želite prebrati...
 MenuMembersStats=Statistika
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Informacija je javna (ne=zasebno)
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Dodan je nov član. Čaka potrditev.
 NewMemberForm=Obrazec za nove člane
-SubscriptionsStatistics=Statistika članarin
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Število članarin
-AmountOfSubscriptions=Znesek članarin
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Obseg prodaje (za podjetje) ali proračun (za fundacijo)
 DefaultAmount=Privzeti znesek za članarine
 CanEditAmount=Obiskovalec lahko izbere/ureja znesek svoje članarine
 MEMBER_NEWFORM_PAYONLINE=Skoči na integrirano stran za online plačila
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=Na tem zaslonu je prikazana statistika članov po lastnostih.
-MembersByRegion=Na tem zaslonu je prikazana statistika članov po regijah.
 VATToUseForSubscriptions=Stopnja DDV za naročnine
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod uporabljen za naročniško vrstico v računu: %s
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 1ead2e7ba58..cb3cc1b03b3 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 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=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/sl_SI/partnership.lang b/htdocs/langs/sl_SI/partnership.lang
new file mode 100644
index 00000000000..48ce3b3b779
--- /dev/null
+++ b/htdocs/langs/sl_SI/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Začetni datum
+DatePartnershipEnd=Končni datum
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Osnutek
+PartnershipAccepted = Accepted
+PartnershipRefused = Zavrnjeno
+PartnershipCanceled = Preklicano
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
index 5f2d0d4391a..051f10a5a9f 100644
--- a/htdocs/langs/sl_SI/productbatch.lang
+++ b/htdocs/langs/sl_SI/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 80844772fa8..0aecf1c0922 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Services for sale only
 ServicesOnPurchaseOnly=Services for purchase only
 ServicesNotOnSell=Services not for sale and not for purchase
 ServicesOnSellAndOnBuy=Storitve za prodajo ali za nabavo
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Proizvod
@@ -73,12 +73,12 @@ SellingPrice=Prodajna cena
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Prodajne cene (z DDV)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nova cena
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Prodajna cena ne more biti nižja od minimalne za ta proizvod (%s brez DDV). To sporočilo se pojavi lahko tudi, če vnesete prevelik popust
 ContractStatusClosed=Zaprta
@@ -157,11 +157,11 @@ ListServiceByPopularity=Seznam storitev po priljubljenosti
 Finished=Končni izdelek
 RowMaterial=Osnovni material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Ta proizvod je rabljen
 NewRefForClone=Ref. novega proizvoda/storitve
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Cene za kupce
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Država porekla
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Kratek naziv
 Unit=Enota
 p=e.
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 369419c4bd9..42d248f93e8 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Kontakti za projekt
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Vsi projekti
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 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.
 ProjectsPublicTaskDesc=Ta pogled predstavlja vse projekte in naloge, za katere imate dovoljenje za branje.
 ProjectsDesc=Ta pogled predstavlja vse projekte (vaše uporabniško dovoljenje vam omogoča ogled vseh).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Ta pogled predstavlja vse projekte in naloge, za katere imate dovoljenje za branje.
 TasksDesc=Ta pogled predstavlja vse projekte in naloge (vaše uporabniško dovoljenje vam omogoča ogled vseh).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=Nov projekt
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/sl_SI/recruitment.lang b/htdocs/langs/sl_SI/recruitment.lang
index 9c84e4c01d8..fab155f38a6 100644
--- a/htdocs/langs/sl_SI/recruitment.lang
+++ b/htdocs/langs/sl_SI/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
index 928c2e0f03c..d3d9e563977 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Vzorec dokumenta Merou A5
 WarningNoQtyLeftToSend=Pozor, noben proizvod ne čaka na pošiljanje.
-StatsOnShipmentsOnlyValidated=Statistika na osnovi potrjenih pošiljk. Uporabljen je datum potrditve pošiljanja (planiran datum dobave ni vedno znan)
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 5ba283a55d1..b8357c5ed52 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Za ta objekt ni preddefiniranih proizvodov. Zato n
 DispatchVerb=Odprema
 StockLimitShort=Omejitev za opozorilo
 StockLimit=Omejitev zaloge za opozorilo
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Dejanska zaloga
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index c972ea9c230..e911348ef47 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Geslo spremenjeno v: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Dovoljenja skupine
 UserRights=Dovoljenja uporabnika
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Onemogoči
 DisableAUser=Onemogoči
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Uporabi polje "Vnos" za spremembo
 OpenIDURL=Spletni naslov OpenID
 LoginUsingOpenID=Uporabi OpenID za prijavo
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Barve uporabnika
 DisabledInMonoUserMode=Izklopljeno v načinu vzdrževanja
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index 73e092221d8..9d3d0faab74 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index cf63cf33a99..5a1fba1c58e 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index ce7acbd1055..a2945323299 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Konfigurimet e sigurisё
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Gabim, ky modul kërkon PHP version %s ose më të lartë
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index 550abf21df5..dd5f1ca63b1 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Dërguesi
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 8445a107298..35e97554290 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index ac4d7487c63..ce0cd6dc236 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Blerës të mirë
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index 1c7c73155f2..1cdcbe50666 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index a5d69cc6d3c..16fb4d619ee 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=Modifiko
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 067cf0318cf..299604640b2 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Fshij një kontakt/adresë
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Celular
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Kodi postar
 Town=Qyteti
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Hapur
 ActivityCeased=Mbyllur
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 2a67833777f..85982e65958 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/sq_AL/ecm.lang b/htdocs/langs/sq_AL/ecm.lang
index 29f3fa1f5bf..a9e073c8991 100644
--- a/htdocs/langs/sq_AL/ecm.lang
+++ b/htdocs/langs/sq_AL/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/sq_AL/eventorganization.lang b/htdocs/langs/sq_AL/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/sq_AL/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/sq_AL/knowledgemanagement.lang b/htdocs/langs/sq_AL/knowledgemanagement.lang
new file mode 100644
index 00000000000..0d309f02677
--- /dev/null
+++ b/htdocs/langs/sq_AL/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Artikull
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index a79dff4badb..bdf92f0b2e9 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 7dab8226cc8..c8c0a25e494 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Tjetër
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gjinia
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Tjetër
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index a6d98ca17c5..e10f9fa14c4 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Fshi
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index afd043c5f78..1975223f19c 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/sq_AL/partnership.lang b/htdocs/langs/sq_AL/partnership.lang
new file mode 100644
index 00000000000..89c29157803
--- /dev/null
+++ b/htdocs/langs/sq_AL/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refuzuar
+PartnershipCanceled = Anulluar
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/sq_AL/productbatch.lang
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 807f8af9cd0..ff733168095 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Mbyllur
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 87655a4d973..495ef8c0330 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/sq_AL/recruitment.lang b/htdocs/langs/sq_AL/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/sq_AL/recruitment.lang
+++ b/htdocs/langs/sq_AL/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index cea753bf79b..64806d1c467 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 87aa4916cc9..64b66cea86f 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index 736243e4ee5..f0310710974 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Çaktivizo
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index c95be506b7a..a80c056d536 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Referenca
 LabelAccount=Oznaka računa
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Izveštaj
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 8e44e169e68..47438a037f4 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index 9d4798fc10e..e1d59217844 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Uplate poreza/doprinosa
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Od
 TransferTo=Za
 TransferFromToDone=Prenos od  <b>%s</b> to <b>%s</b> of <b>%s</b> %s je zabeležen.
-CheckTransmitter=Otpremnik
+CheckTransmitter=Pošiljalac
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bankovni ček
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Promene
 PlannedTransactions=Planned entries
-Graph=Grafike
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Depozitni isečak
 TransactionOnTheOtherAccount=Transakcije na drugom računu
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Nazad na račun
 ShowAllAccounts=Prikaži za sve račune
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Odaberi izvod iz banke povezan sa poravnanjem. Upotrebi sledeću numeričku vrednost: YYYYMM or YYYYMMDD
 EventualyAddCategory=Na kraju, definišite kategoriju u koju želite da klasifikujete izveštaje
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 495c4c104d7..df00b3c8612 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Unesi prijem uplate kupca
 EnterPaymentDueToCustomer=Uplatiti zbog kupca
 DisabledBecauseRemainderToPayIsZero=Onemogući jer je preostali iznos nula
-PriceBase=Osnovna cena
+PriceBase=Base price
 BillStatus=Status računa
 StatusOfGeneratedInvoices=Status generisanih računa
 BillStatusDraft=Nacrt (treba da se potvrdi)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Proveri raspored
-ChequeMaker=Izdavač čeka/transfera
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/sr_RS/boxes.lang b/htdocs/langs/sr_RS/boxes.lang
index 9970ca505c7..e593f6e30fc 100644
--- a/htdocs/langs/sr_RS/boxes.lang
+++ b/htdocs/langs/sr_RS/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Najstarije aktivne istekle usluge
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Opšta aktivnost (fakture, ponude, narudžbine)
 BoxGoodCustomers=Dobri kupci
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index 75b0acd39a2..31e585226cf 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Prijemnica
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/sr_RS/categories.lang b/htdocs/langs/sr_RS/categories.lang
index 1799529dde1..eb103af3374 100644
--- a/htdocs/langs/sr_RS/categories.lang
+++ b/htdocs/langs/sr_RS/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Naziv/Kategorija
 Rubriques=Naziv/Kategorije
 RubriquesTransactions=Tags/Categories of transactions
 categories=nazivi/kategorije
-NoCategoryYet=Naziv/kategorija nije kreirana za ovaj tip
+NoCategoryYet=No tag/category of this type has been created
 In=U
 AddIn=Dodaj u
 modify=izmeni
 Classify=Klasifikuj
 CategoriesArea=Oblast naziva/kategorije
-ProductsCategoriesArea=Oblast naziva/kategorije proizvoda/usluge
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Oblast naziva/kategorije dobavljača
-MembersCategoriesArea=Oblast naziva/kategorije članova
-ContactsCategoriesArea=Oblast naziva/kategorija kontakata
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=Lista naziva/kategorija
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 4a1049a918d..7834550d3c4 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Ime kompanije %s već postoji. Izaberite drugo ime.
 ErrorSetACountryFirst=Prvo izaberi državu
 SelectThirdParty=Izaberi subjekat
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Obriši kontakt/adresu
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Poziv
 Chat=Chat
-PhonePro=Poslovni telefon
+PhonePro=Bus. phone
 PhonePerso=Lični telefon
 PhoneMobile=Mobilni
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Poštanski broj
 Town=Grad
 Web=Web
 Poste= Pozicija
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Obavezno ako je subjekt klijent ili kandidat
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Kandidat za kontaktiranje
 CompanyDeleted=Kompanija "%s" je obrisana iz baze.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Otvoreno
 ActivityCeased=Zatvoreno
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=Lista proizvoda/usluga u %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Ime menadžera (CEO, direktor, predsednik...)
 MergeOriginThirdparty=Duplirani subjekt (subjekt kojeg želite obrisati)
 MergeThirdparties=Spoji subjekte
-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 third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 64e0a53d9d9..7af3218a6ab 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Novi popust
 NewCheckDeposit=Novi unovčen ček
 NewCheckDepositOn=Kreiraj račun za uplatu : %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Datum prijema čeka
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Uplati porez/doprinose
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/sr_RS/ecm.lang b/htdocs/langs/sr_RS/ecm.lang
index 7ced4e58d7f..2a5ad209408 100644
--- a/htdocs/langs/sr_RS/ecm.lang
+++ b/htdocs/langs/sr_RS/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index b52a21dbc85..b8cac5689b3 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Nema greške, commit.
 # Errors
 ErrorButCommitIsDone=Bilo je grešaka, ali potvrđujemo uprkos tome
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=URL %s je pogrešan
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s već postoji
@@ -46,8 +46,8 @@ ErrorWrongDate=Datum nije ispravan!
 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. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Neka obavezna polja nisu popunjena
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Greška prilikom kreacije foldera. Proverite da li Web server nalog ima prava da piše u Dolibarr documents folderu. Ako je parametar <b>safe_mode</b> aktivan u PHP-u, proverite da li Dolibarr php fajlovi pripadaju korisniku (ili grupi) Web server naloga.
 ErrorNoMailDefinedForThisUser=Mail nije definisan za ovog korisnika
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/sr_RS/eventorganization.lang b/htdocs/langs/sr_RS/eventorganization.lang
new file mode 100644
index 00000000000..3be4026e6d2
--- /dev/null
+++ b/htdocs/langs/sr_RS/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Nacrt
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Završeno
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/sr_RS/knowledgemanagement.lang b/htdocs/langs/sr_RS/knowledgemanagement.lang
new file mode 100644
index 00000000000..d24fee49c0a
--- /dev/null
+++ b/htdocs/langs/sr_RS/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = O
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Artikal
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index a37342806c3..9c20f761fc1 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=CC
 MailToCCUsers=Copy to users(s)
 MailCCC=BCC
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Poruka
 MailFile=Prilozi
 MailMessage=Sadržaj maila
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Konfiguracija slanja mailova je podešena na "%s". Ovaj mod ne može slati masovne mailove.
 MailSendSetupIs2=Prvo morate sa admin nalogom otvoriti meni %sHome - Setup - EMails%s da biste promenili parametar <strong>'%s'</strong> i prešli u mod '%s'. U ovom modu, možete uneti podešavanja SMTP servera Vašeg provajdera i koristiti funkcionalnost masovnog emailinga.
 MailSendSetupIs3=Ukoliko imate pitanja oko podešavanja SMTP servera, možete pitati %s.
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 76649f882eb..1ae893b7059 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Testiraj konekciju
 ToClone=Kloniraj
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Podaci za dupliranje nisu definisani:
 Of=od
 Go=Kreni
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Događaj
 About=O
 Number=Broj
-NumberByMonth=Broj po mesecu
+NumberByMonth=Total reports by month
 AmountByMonth=Svota po mesecu
 Numero=Broj
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Do
 From=Od
 FromDate=Od
 FromLocation=Od
-at=at
 to=do
 To=do
+ToDate=do
+ToLocation=do
+at=at
 and=i
 or=ili
 Other=Drugo
@@ -843,7 +845,7 @@ XMoreLines=%s linija skrivena(o)
 ShowMoreLines=Show more/less lines
 PublicUrl=Javni UR
 AddBox=Dodaj box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Štampaj fajl %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Prikaži intervenciju
@@ -854,8 +856,8 @@ Denied=Odbijeno
 ListOf=List of %s
 ListOfTemplates=Lista templejtova
 Gender=Pol
-Genderman=Muško
-Genderwoman=Žensko
+Genderman=Male
+Genderwoman=Female
 Genderother=Drugo
 ViewList=Prikaz liste
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index 9999a186486..9e2876f3fa8 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Drugi član (ime: <b>%s</b>, login: <
 ErrorUserPermissionAllowsToLinksToItselfOnly=Iz sigurnosnih razloga, morate imati dozvole za izmenu svih korisnika kako biste mogli da povežete člana sa korisnikom koji nije Vaš.
 SetLinkToUser=Link sa Dolibarr korisnikom
 SetLinkToThirdParty=Link sa Dolibarr subjektom
-MembersCards=Članske poslovne kartice
+MembersCards=Business cards for members
 MembersList=Lista članova
 MembersListToValid=Lista draft članova (za potvrdu)
 MembersListValid=Lista potvrđenih članova
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Članovi koji treba da prime pretplatu
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Datum pretplate
 DateEndSubscription=Kraj pretplate
-EndSubscription=Kraj pretplate
+EndSubscription=Subscription Ends
 SubscriptionId=ID pretplate
 WithoutSubscription=Without subscription
 MemberId=ID člana
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Potrebna pretplata
 DeleteType=Obriši
 VoteAllowed=Glasanje dozvoljeno
-Physical=Fizičko
-Moral=Pravno
-MorAndPhy=Moral and Physical
-Reenable=Ponovo aktiviraj
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Statistike članova po zemlji
 MembersStatisticsByState=Statistike članova po regionu
 MembersStatisticsByTown=Statistike članova po gradu
 MembersStatisticsByRegion=Statistike članova po regionu
-NbOfMembers=Broj članova
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Nema potvrđenih članova
-MembersByCountryDesc=Ovaj ekran pokazuje statistike članove po zemljama. Koristi se Google online graph service koji je dostupan samo ukoliko imate aktivnu internet konekciju.
-MembersByStateDesc=Ovaj ekran pokazuje statistike članova po regionu.
-MembersByTownDesc=Ovaj ekran pokazuje statistike članova po gradu.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Izaberite statistike koje želite da konsultujete...
 MenuMembersStats=Statistike
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Datum najnovije pretplate
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Javne informacije
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Novi član je dodat. Čeka se odobrenje.
 NewMemberForm=Forma za nove članove
-SubscriptionsStatistics=Statistike pretplata
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Broj pretplata
-AmountOfSubscriptions=Iznos pretplata
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Obrt (za kompaniju) ili budžet (za fondaciju)
 DefaultAmount=Default iznos pretplate
 CanEditAmount=Posetilac može da izabere/izmeni iznos svoje pretplate
 MEMBER_NEWFORM_PAYONLINE=Pređi na integrisanu online stranicu uplate
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=Ovaj ekran prikazuje statistike članova po prirodi.
-MembersByRegion=Ovaj ekran prikazuje statistike članova po regionu.
 VATToUseForSubscriptions=PDV stopa za pretplate
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod korišćen za liniju pretplate u fakturi: %s
diff --git a/htdocs/langs/sr_RS/modulebuilder.lang b/htdocs/langs/sr_RS/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/sr_RS/modulebuilder.lang
+++ b/htdocs/langs/sr_RS/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index f3d16baa5b7..a2023128b0b 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 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=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/sr_RS/partnership.lang b/htdocs/langs/sr_RS/partnership.lang
new file mode 100644
index 00000000000..82c90ae3244
--- /dev/null
+++ b/htdocs/langs/sr_RS/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Datum početka
+DatePartnershipEnd=Datum završetka
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Nacrt
+PartnershipAccepted = Prihvaćen
+PartnershipRefused = Odbijen
+PartnershipCanceled = Poništeno
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sr_RS/productbatch.lang b/htdocs/langs/sr_RS/productbatch.lang
index 01d589671dc..7aa007fe4c4 100644
--- a/htdocs/langs/sr_RS/productbatch.lang
+++ b/htdocs/langs/sr_RS/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index a55e635e9d7..5b59d29e0c4 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Services for sale only
 ServicesOnPurchaseOnly=Services for purchase only
 ServicesNotOnSell=Services not for sale and not for purchase
 ServicesOnSellAndOnBuy=Usluge za prodaju i nabavku
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Proizvod
@@ -73,12 +73,12 @@ SellingPrice=Prodajna cena
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Prodajna cena (sa PDV-om)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nova cena
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Prodajna cena ne može biti niža od dozvoljenog minimuma za ovaj proizvod (%s neto). Ova poruka se takođe može pojaviti ukoliko ste uneli preveliki popust.
 ContractStatusClosed=Zatvoren
@@ -157,11 +157,11 @@ ListServiceByPopularity=Lista usluga po popularnosti
 Finished=Proizvedeni proizvod
 RowMaterial=Sirovina
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Ovaj proizvod je u upotrebi
 NewRefForClone=Ref. novog proizvoda/usluge
 SellingPrices=Prodajne cene
@@ -170,12 +170,12 @@ CustomerPrices=Cene klijenta
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Zemlja porekla
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Kratak naziv
 Unit=Jedinica
 p=j.
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index e50f21a77c8..f29a10b6685 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Kontakti projekta
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Svi projekti
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Ovaj ekran prikazuje sve projekte za koje imate pravo pregleda.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=Ovaj ekran prikazuje sve projekte ili zadatke za koje imate pravo pregleda.
 ProjectsDesc=Ovaj ekran prikazuje sve projekte (Vaš korisnik ima pravo pregleda svih informacija)
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Vidljivi su samo otvoreni projekti (draft i zatvoreni projekti nisu vidljivi)
 ClosedProjectsAreHidden=Zatvoreni projekti nisu vidljivi
 TasksPublicDesc=Ovaj ekran prikazuje sve projekte ili zadatke za koje imate pravo pregleda.
 TasksDesc=Ovaj ekran prikazuje sve projekte i zadatke (Vaš korisnik ima pravo pregleda svih informacija)
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=Novi projekat
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Nije dodeljen zadatku
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Dodeli zadatak meni
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Dodeli
diff --git a/htdocs/langs/sr_RS/recruitment.lang b/htdocs/langs/sr_RS/recruitment.lang
index ae1eb5feb23..4a53daa7854 100644
--- a/htdocs/langs/sr_RS/recruitment.lang
+++ b/htdocs/langs/sr_RS/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/sr_RS/sendings.lang b/htdocs/langs/sr_RS/sendings.lang
index 25672b23d46..8248b852787 100644
--- a/htdocs/langs/sr_RS/sendings.lang
+++ b/htdocs/langs/sr_RS/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Upozorenje, nema proizvoda koji čekaju na isporuku.
-StatsOnShipmentsOnlyValidated=Statistike se vrše samo na potvrđenim isporukama. Datum koji se koristi je datum potvrde isporuke (planirani datum isporuke nije uvek poznat)
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planirani datum isporuke
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index c5c04628b64..0a9085093f9 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Nema predefinisanih proizvoda za ovaj objekat. Sto
 DispatchVerb=Raspodela
 StockLimitShort=Limit za alertiranje
 StockLimit=Limit zalihe za alertiranje
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Realna zaliha
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/sr_RS/users.lang b/htdocs/langs/sr_RS/users.lang
index e68094fa8e9..3f49f99fdb0 100644
--- a/htdocs/langs/sr_RS/users.lang
+++ b/htdocs/langs/sr_RS/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Lozinka izmenjena u: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Prava grupe
 UserRights=Prava korisnika
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Deaktiviraj
 DisableAUser=Deaktiviraj korisnika
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Koristi polje tip za promenu
 OpenIDURL=OpenID UR
 LoginUsingOpenID=Uloguj se sa OpenID-em
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Boja korisnika
 DisabledInMonoUserMode=Onemogućeno u modu održavanja
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sr_RS/website.lang b/htdocs/langs/sr_RS/website.lang
index 95a950372c2..a51d5cffc41 100644
--- a/htdocs/langs/sr_RS/website.lang
+++ b/htdocs/langs/sr_RS/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 38747956cd0..5fbb22248bf 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Referens
 LabelAccount=Etikett konto
 LabelOperation=Etikettoperation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Brevkod
 Lettering=Lettering
 Codejournal=Loggbok
@@ -297,7 +297,7 @@ NoNewRecordSaved=Inga flera linjer att bokföra
 ListOfProductsWithoutAccountingAccount=Förteckning över produkter som inte är kopplade till något kontokonto
 ChangeBinding=Ändra bindningen
 Accounted=Redovisas i huvudbok
-NotYetAccounted=Ännu inte redovisad i huvudbok
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Inte avstämd
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 75f460ddcd6..358b96c76ad 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Ta bort / byt namn på filen <b> %s </b> om den existerar, för att t
 RestoreLock=Återställ fil <b> %s </b>, endast med läsbehörighet, för att inaktivera ytterligare användning av Update / Install-verktyget.
 SecuritySetup=Säkerhets inställning
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Definiera här alternativ relaterade till säkerhet om uppladdning av filer.
 ErrorModuleRequirePHPVersion=Fel, kräver denna modul PHP version %s eller högre
 ErrorModuleRequireDolibarrVersion=Fel, kräver denna modul Dolibarr version %s eller högre
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Pekar inte
 NoActiveBankAccountDefined=Inga aktiva bankkonto definierade
 OwnerOfBankAccount=Ägare till %s bankkonto
 BankModuleNotActive=Bankkonton modulen inte aktiverad
-ShowBugTrackLink=Visa länken <strong>"%s"</strong>
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Varningar
 DelaysOfToleranceBeforeWarning=Fördröjning innan du visar en varningsvarsel för:
 DelaysOfToleranceDesc=Ställ in fördröjningen innan en varningsikon %s visas på skärmen för det sena elementet.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Du måste köra det här komman
 YourPHPDoesNotHaveSSLSupport=SSL-funktioner inte är tillgängliga i din PHP
 DownloadMoreSkins=Mer skinn att ladda ner
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Visa professionellt id med adresser
 ShowVATIntaInAddress=Dölj momsnumret inom gemenskapen med adresser
 TranslationUncomplete=Partiell översättning
@@ -2062,7 +2064,7 @@ UseDebugBar=Använd felsökningsfältet
 DEBUGBAR_LOGS_LINES_NUMBER=Antal sista logglinjer för att hålla i konsolen
 WarningValueHigherSlowsDramaticalyOutput=Varning, högre värden sänker dramaticaly-utgången
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index 3252d7fcc2e..d77b1f8f068 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Sociala och skattemässiga betalningar
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Intern överföring
-TransferDesc=Överföring från ett konto till ett annat, Dolibarr kommer att skriva två poster (en debit i källkonto och en kredit i målkontot). Samma mängd (förutom tecken), etikett och datum kommer att användas för denna transaktion)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Från
 TransferTo=För att
 TransferFromToDone=En överföring från <b>%s</b> till <b>%s</b> av <b>%s</b> %s har registrerats.
-CheckTransmitter=Sändare
+CheckTransmitter=Avsändare
 ValidateCheckReceipt=Bekräfta detta check-kvitto?
-ConfirmValidateCheckReceipt=Är du säker på att du vill bekräfta detta kvitto, kommer ingen ändring att vara möjlig när det här är gjort?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Ta bort detta kvitto?
 ConfirmDeleteCheckReceipt=Är du säker på att du vill radera detta kvitto?
 BankChecks=Bankcheckar
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Är du säker på att du vill radera den här posten?
 ThisWillAlsoDeleteBankRecord=Detta kommer även att ta bort genererad bankpost
 BankMovements=Rörelser
 PlannedTransactions=Planerade poster
-Graph=Grafiken
+Graph=Graphs
 ExportDataset_banque_1=Bankposter och kontoutdrag
 ExportDataset_banque_2=Insättningsblankett
 TransactionOnTheOtherAccount=Transaktionen på det andra kontot
@@ -142,7 +142,7 @@ AllAccounts=Alla bank- och kontonkonton
 BackToAccount=Tillbaka till konto
 ShowAllAccounts=Visa för alla konton
 FutureTransaction=Framtida transaktion. Det gick inte att förena.
-SelectChequeTransactionAndGenerate=Välj / filtrera kontroller för att inkludera i kontokortet och klicka på "Skapa".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Välj kontoutdrag relaterat till förlikningen. Använd ett sorterbart numeriskt värde: YYYYMM or YYYYMMDD
 EventualyAddCategory=Så småningom, ange en kategori då för att märka posterna
 ToConciliate=Att avstämma?
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 0059f11c2af..e6936e23379 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Konvertera överskott betalt till ledig rabatt
 EnterPaymentReceivedFromCustomer=Skriv in avgifter från kunderna
 EnterPaymentDueToCustomer=Gör betalning till kunden
 DisabledBecauseRemainderToPayIsZero=Inaktiverad pga återstående obetalt är noll
-PriceBase=Prisbasbelopp
+PriceBase=Base price
 BillStatus=Faktura status
 StatusOfGeneratedInvoices=Status för genererade fakturor
 BillStatusDraft=Utkast (måste bekräftas)
@@ -454,7 +454,7 @@ RegulatedOn=Regleras
 ChequeNumber=Kontrollera nr
 ChequeOrTransferNumber=Kontrollera / Transfer nr
 ChequeBordereau=Kontrollera schema
-ChequeMaker=Kontrollera / överför sändare
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank av Check
 CheckBank=Check
 NetToBePaid=Netto som skall betalas
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index db762d25692..69369c2cd7f 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bokmärken: senaste %s
 BoxOldestExpiredServices=Äldsta aktiva passerat tjänster
 BoxLastExpiredServices=Senaste %s äldsta kontakterna med aktiva utgåttjänster
 BoxTitleLastActionsToDo=Senaste %s åtgärderna att göra
-BoxTitleLastContracts=Senaste %s modifierade kontrakten
-BoxTitleLastModifiedDonations=Senast %s ändrade donationer
-BoxTitleLastModifiedExpenses=Senaste %s modifierade kostnadsrapporterna
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global aktivitet (fakturor, förslag, order)
 BoxGoodCustomers=Bra kunder
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index 96ea227c941..30700e123e5 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Golv
 AddTable=Lägg till tabell
 Place=Plats
 TakeposConnectorNecesary='TakePOS Connector' krävs
-OrderPrinters=Beställ skrivare
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Sök produkt
 Receipt=Kvitto
 Header=Rubrik
@@ -56,8 +57,9 @@ Paymentnumpad=Typ av kudde för att komma in i betalningen
 Numberspad=Numbers Pad
 BillsCoinsPad=Mynt och sedlar Pad
 DolistorePosCategory=TakePOS-moduler och andra POS-lösningar för Dolibarr
-TakeposNeedsCategories=TakePOS behöver produktkategorier för att fungera
-OrderNotes=Beställ anteckningar
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Standardkonto som ska användas för betalningar i
 NoPaimementModesDefined=Inget paimentläge definierat i TakePOS-konfiguration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Webbläsare
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index c890dddefa5..b4d7278f0e6 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag / Kategori
 Rubriques=Taggar/Kategorier
 RubriquesTransactions=Taggar / Kategorier av transaktioner
 categories=taggar / kategorier
-NoCategoryYet=Ingen tagg / kategori av denna typ skapad
+NoCategoryYet=No tag/category of this type has been created
 In=I
 AddIn=Lägg till i
 modify=modifiera
 Classify=Märk
 CategoriesArea=Taggar / kategorier område
-ProductsCategoriesArea=Produkter / Tjänster taggar / kategorier område
-SuppliersCategoriesArea=Leverantörer tags / kategorier område
-CustomersCategoriesArea=Kunder taggar / kategorier område
-MembersCategoriesArea=Medlemmar taggar / kategorier område
-ContactsCategoriesArea=Kontakter taggar / kategorier område
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projektets taggar / kategorier område
-UsersCategoriesArea=Användare taggar / kategorier område
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Underkategorier
 CatList=Lista med taggar / kategorier
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Välj kategori
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 2dc085dac75..7e32ab3ac3c 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Företagets namn %s finns redan. Välj en annan en.
 ErrorSetACountryFirst=Välj land först
 SelectThirdParty=Välj en tredje part
-ConfirmDeleteCompany=Är du säker på att du vill radera detta företag och all ärftlig information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Radera en kontakt
-ConfirmDeleteContact=Är du säker på att du vill radera den här kontakten och all ärftlig information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Ny tredjepart
 MenuNewCustomer=Ny kund
 MenuNewProspect=Nytt perspektiv
@@ -69,7 +69,7 @@ PhoneShort=Telefonen
 Skype=Skype
 Call=Ring upp
 Chat=Chat
-PhonePro=Prof. telefon
+PhonePro=Bus. phone
 PhonePerso=Pers. telefon
 PhoneMobile=Mobil
 No_Email=Avvisa bulk emailings
@@ -78,7 +78,7 @@ Zip=Postnummer
 Town=Stad
 Web=Webb
 Poste= Position
-DefaultLang=Språk standard
+DefaultLang=Default language
 VATIsUsed=Försäljningsskatt används
 VATIsUsedWhenSelling=Detta definierar om den här tredjeparten inkluderar en försäljningsskatt eller inte när den fakturerar sina egna kunder
 VATIsNotUsed=Försäljningsskatt används inte
@@ -331,7 +331,7 @@ CustomerCodeDesc=Kundkod, unik för alla kunder
 SupplierCodeDesc=Leverantörskod, unik för alla leverantörer
 RequiredIfCustomer=Krävs om tredje part är en kund eller möjlig kund
 RequiredIfSupplier=Krävs om tredjepart är en leverantör
-ValidityControledByModule=Giltighetskontrollerad av modulen
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Regler för denna modul
 ProspectToContact=Möjlig kund att kontakta
 CompanyDeleted=Företaget "%s" raderad från databasen.
@@ -439,12 +439,12 @@ ListSuppliersShort=Förteckning över leverantörer
 ListProspectsShort=Förteckning över utsikter
 ListCustomersShort=Förteckning över kunder
 ThirdPartiesArea=Tredjeparter / Kontakter
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Summa tredjeparter
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Öppen
 ActivityCeased=Stängt
 ThirdPartyIsClosed=Tredjepart är stängd
-ProductsIntoElements=Lista över produkter / tjänster i %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Obetalda fakturor
 OutstandingBill=Max för obetald faktura
 OutstandingBillReached=Max. för enastående räkning uppnådd
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Kund / leverantör-nummer är ledig. Denna kod kan ändra
 ManagingDirectors=Företagledares namn (vd, direktör, ordförande ...)
 MergeOriginThirdparty=Duplicera tredjepart (tredjepart du vill ta bort)
 MergeThirdparties=Sammanfoga tredjepart
-ConfirmMergeThirdparties=Är du säker på att du vill slå samman den här tredjeparten till den nuvarande? Alla länkade objekt (fakturor, order, ...) kommer att flyttas till aktuell tredjepart, så kommer tredjeparten att raderas.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Tredjepart har blivit fusionerad
 SaleRepresentativeLogin=Inloggning av försäljare
 SaleRepresentativeFirstname=Förnamn på försäljningsrepresentant
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 2b141e51eb7..b7fc9b2eb22 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Ny rabatt
 NewCheckDeposit=Nya kontrollera insättning
 NewCheckDepositOn=Skapa kvitto för insättning på konto: %s
 NoWaitingChecks=Inga kontroller väntar på insättning.
-DateChequeReceived=Kontrollera datum mottagning ingång
+DateChequeReceived=Check receiving date
 NbOfCheques=Antal kontroller
 PaySocialContribution=Betala en social / skattemässig skatt
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
index 795137d4020..3882a163842 100644
--- a/htdocs/langs/sv_SE/ecm.lang
+++ b/htdocs/langs/sv_SE/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 21a4bc7c8f0..15b18a8e5ba 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Inget fel
 # Errors
 ErrorButCommitIsDone=Fel hittades men vi bekräfta trots detta
-ErrorBadEMail=E-post %s är fel
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s är fel
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Dåligt värde för din parameter. Det lägger till i allmänhet när översättning saknas.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Logga %s finns redan.
@@ -46,8 +46,8 @@ ErrorWrongDate=Datum är inte korrekt!
 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=Användaren kan inte raderas. Kanske är det associerat med Dolibarr-enheter.
-ErrorFieldsRequired=Vissa obligatoriska fält inte fylls.
-ErrorSubjectIsRequired=E-postämnet krävs
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject 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
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Sidan / behållaren <strong> %s </str
 ErrorDuringChartLoad=Fel vid inmatning av kontoplan. Om några konton inte laddades, kan du fortfarande skriva in dem manuellt.
 ErrorBadSyntaxForParamKeyForContent=Dålig syntax för param keyforcontent. Måste ha ett värde som börjar med %s eller %s
 ErrorVariableKeyForContentMustBeSet=Fel, konstanten med namnet %s (med textinnehåll som ska visas) eller %s (med extern webbadress för att visa) måste ställas in.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s måste börja med http: // eller https: //
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Fel, den nya referensen används redan
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/sv_SE/eventorganization.lang b/htdocs/langs/sv_SE/eventorganization.lang
new file mode 100644
index 00000000000..2ae2187c61a
--- /dev/null
+++ b/htdocs/langs/sv_SE/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = inställningar
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Utkast
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Klar
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/sv_SE/knowledgemanagement.lang b/htdocs/langs/sv_SE/knowledgemanagement.lang
new file mode 100644
index 00000000000..89be844c39f
--- /dev/null
+++ b/htdocs/langs/sv_SE/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = inställningar
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Om
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Artikel
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index d7d01c9a7eb..0dd05d68d23 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Till användare
 MailCC=Kopiera till
 MailToCCUsers=Kopiera till användare (er)
 MailCCC=Cachad kopia till
-MailTopic=E-postämne
+MailTopic=Email subject
 MailText=Meddelande
 MailFile=Bifogade filer
 MailMessage=E-organ
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Konfiguration av e-post att skicka har ställts in till "% s". Detta läge kan inte användas för att skicka massutskick.
 MailSendSetupIs2=Du måste först gå, med ett administratörskonto, i meny% Shome - Setup - e-post% s för att ändra parameter <strong>'% s'</strong> för att använda läget "% s". Med det här läget kan du ange inställningar för SMTP-servern från din internetleverantör och använda Mass mejla funktionen.
 MailSendSetupIs3=Om du har några frågor om hur man ställer in din SMTP-server, kan du be att% s.
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 3753cd93d14..5f21b6ef52b 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Testa anslutning
 ToClone=Klon
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Välj data du vill klona:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Inga uppgifter att klona definierade.
 Of=av
 Go=Gå
@@ -246,7 +246,7 @@ DefaultModel=Standard doksmall
 Action=Händelse
 About=Om
 Number=Antal
-NumberByMonth=Antal per månad
+NumberByMonth=Total reports by month
 AmountByMonth=Belopp per månad
 Numero=Antal
 Limit=Gräns
@@ -341,8 +341,8 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Användare av skapandet
-UserModif=Användare av senaste uppdateringen
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Genom att
 From=Från
 FromDate=Från
 FromLocation=Från
-at=at
 to=till
 To=till
+ToDate=till
+ToLocation=till
+at=at
 and=och
 or=eller
 Other=Andra
@@ -843,7 +845,7 @@ XMoreLines=%s rader osynliga
 ShowMoreLines=Visa fler / mindre rader
 PublicUrl=Offentlig webbadress
 AddBox=Lägg till låda
-SelectElementAndClick=Markera ett element och klicka %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Skriv ut fil %s
 ShowTransaction=Visa post på bankkonto
 ShowIntervention=Visar ingripande
@@ -854,8 +856,8 @@ Denied=Nekad
 ListOf=Lista över %s
 ListOfTemplates=Lista över mallar
 Gender=Kön
-Genderman=Man
-Genderwoman=Kvinna
+Genderman=Male
+Genderwoman=Female
 Genderother=Andra
 ViewList=Visa lista
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 6e0adfe91f2..07cf2cf7249 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=En annan ledamot (namn: <b>%s,</b> lo
 ErrorUserPermissionAllowsToLinksToItselfOnly=Av säkerhetsskäl måste du beviljas behörighet att redigera alla användare att kunna koppla en medlem till en användare som inte är din.
 SetLinkToUser=Koppla till en Dolibarr användare
 SetLinkToThirdParty=Koppla till en Dolibarr tredje part
-MembersCards=Medlemmars visitkort
+MembersCards=Business cards for members
 MembersList=Förteckning över medlemmar
 MembersListToValid=Förteckning över förslag till medlemmar (att bekräftas)
 MembersListValid=Förteckning över giltiga medlemmar
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Medlemmar med abonnemang för att ta emot
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Teckningsdag
 DateEndSubscription=Prenumeration slutdatum
-EndSubscription=Avsluta prenumeration
+EndSubscription=Subscription Ends
 SubscriptionId=Prenumeration id
 WithoutSubscription=Utan prenumeration
 MemberId=Medlem id
@@ -83,10 +83,10 @@ WelcomeEMail=Välkommen e-post
 SubscriptionRequired=Prenumeration krävs
 DeleteType=Ta bort
 VoteAllowed=Röstning tillåten
-Physical=Fysisk
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Återaktivera
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Avsluta en medlem
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Medlemmar statistik per land
 MembersStatisticsByState=Medlemmar statistik från stat / provins
 MembersStatisticsByTown=Medlemmar statistik per kommun
 MembersStatisticsByRegion=Medlemsstatistik på region
-NbOfMembers=Antal medlemmar
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Inga bekräftada medlemmar hittades
-MembersByCountryDesc=Denna skärm visar statistik om medlemmar med länder. Grafisk beror dock på Google online grafen service och är tillgänglig endast om en Internet-anslutning fungerar.
-MembersByStateDesc=Denna skärm visar dig statistik över ledamöter av stat / län / Canton.
-MembersByTownDesc=Denna skärm visar statistik om medlemmar med stan.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Välj statistik du vill läsa ...
 MenuMembersStats=Statistik
-LastMemberDate=Senaste medlemsdatum
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Senaste prenumerationsdatum
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information är offentliga
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Ny ledamot till. Väntar på godkännande
 NewMemberForm=Ny medlem formen
-SubscriptionsStatistics=Statistik om prenumerationer
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Antal prenumerationer
-AmountOfSubscriptions=Mängd prenumeration
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Omsättning (för ett företag) eller Budget (för en stiftelse)
 DefaultAmount=Standard mängd av abonnemang
 CanEditAmount=Besökare kan välja / redigera del av sin teckning
 MEMBER_NEWFORM_PAYONLINE=Hoppa på integrerad online-betalning sidan
 ByProperties=Efter egenskaper
 MembersStatisticsByProperties=Medlemsstatistik efter egenskaper
-MembersByNature=Denna skärm visar statistik om medlemmar av natur.
-MembersByRegion=Denna skärm visar statistik om medlemmar efter region.
 VATToUseForSubscriptions=Moms-sats för prenumeration
 NoVatOnSubscription=Ingen moms för prenumerationer
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt som används för abonnemangslinjen till faktura: %s
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index 5a6e5f84a0e..4c303356c41 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Lista över definierade behörigheter
 SeeExamples=Se exempel här
 EnabledDesc=Villkor att ha detta fält aktivt (Exempel: 1 eller $ conf-> global-> MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Kan värdet av fält ackumuleras för att få en total i listan? (Exempel: 1 eller 0)
 SearchAllDesc=Är fältet används för att göra en sökning från snabbsökningsverktyget? (Exempel: 1 eller 0)
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index b62c35eb549..0b01a9faaee 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Installera eller aktivera GD-biblioteket på din PHP-install
 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 för summan av produkter / tjänster
-StatsByNumberOfEntities=Statistik i antal hänvisande enheter (faktura nummer, eller order ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Antal förslag
 NumberOfCustomerOrders=Antal försäljningsorder
 NumberOfCustomerInvoices=Antal kundfakturor
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/sv_SE/partnership.lang b/htdocs/langs/sv_SE/partnership.lang
new file mode 100644
index 00000000000..250df79034a
--- /dev/null
+++ b/htdocs/langs/sv_SE/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Startdatum
+DatePartnershipEnd=Slutdatum
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Utkast
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Annullerad
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang
index f0af71b91fd..926e1126664 100644
--- a/htdocs/langs/sv_SE/productbatch.lang
+++ b/htdocs/langs/sv_SE/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 2d55fe3f896..c495fd0ed3f 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Endast tjänster till salu
 ServicesOnPurchaseOnly=Endast tjänster för inköp
 ServicesNotOnSell=Tjänster som inte är till salu och inte för köp
 ServicesOnSellAndOnBuy=Tjänster till försäljning och inköp
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Senaste %s inspelade produkterna
 LastRecordedServices=Senaste %s inspelade tjänsterna
 CardProduct0=Produkt
@@ -73,12 +73,12 @@ SellingPrice=Försäljningspris
 SellingPriceHT=Försäljningspris (exkl. Moms)
 SellingPriceTTC=Försäljningspris (inkl. moms)
 SellingMinPriceTTC=Minsta försäljningspris (inkl. Skatt)
-CostPriceDescription=Detta prisfält (exkl. Moms) kan användas för att lagra det genomsnittliga beloppet denna produkt kostar för ditt företag. Det kan vara vilket pris du beräknar dig, till exempel från det genomsnittliga köpeskillingen plus genomsnittlig produktion och distributionskostnad.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Detta värde kan användas för marginalberäkning.
 SoldAmount=Sålt belopp
 PurchasedAmount=Inköpt antal
 NewPrice=Nytt pris
-MinPrice=Min. försäljningspris
+MinPrice=Min. selling price
 EditSellingPriceLabel=Redigera försäljningsprisetikett
 CantBeLessThanMinPrice=Försäljningspriset kan inte vara lägre än lägsta tillåtna för denna bok (%s utan skatt)
 ContractStatusClosed=Stängt
@@ -157,11 +157,11 @@ ListServiceByPopularity=Lista över tjänster efter popularitet
 Finished=Tillverkade produkten
 RowMaterial=Första material
 ConfirmCloneProduct=Är du säker på att du vill klona produkten eller tjänsten <b> %s </b>?
-CloneContentProduct=Klona all viktig information om produkt / tjänst
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Klonpriser
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtuell produkt / tjänst
-CloneCombinationsProduct=Klonproduktvarianter
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Denna produkt används
 NewRefForClone=Ref. av ny produkt / tjänst
 SellingPrices=Försäljningspriser
@@ -170,12 +170,12 @@ CustomerPrices=Kundpriser
 SuppliersPrices=Leverantörspriser
 SuppliersPricesOfProductsOrServices=Leverantörspriser (av produkter eller tjänster)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Ursprungsland
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Kort etikett
 Unit=Enhet
 p=u.
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index b7710e22be7..0ffdf7a0821 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Projekt kontakter
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Allt projekt jag kan läsa (min + offentliga)
 AllProjects=Alla projekt
-MyProjectsDesc=Denna vy är begränsad till projekt du är kontakt med
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Denna uppfattning presenterar alla projekt du har rätt att läsa.
 TasksOnProjectsPublicDesc=Denna vy presenterar alla uppgifter på projekt som du får läsa.
 ProjectsPublicTaskDesc=Denna uppfattning presenterar alla projekt och uppgifter som du får läsa.
 ProjectsDesc=Denna uppfattning presenterar alla projekt (din användarbehörighet tillåta dig att visa allt).
 TasksOnProjectsDesc=Denna vy presenterar alla uppgifter på alla projekt (dina användarbehörigheter ger dig tillstånd att se allt).
-MyTasksDesc=Denna åsikt är begränsad till projekt eller uppgifter som du är kontakt med
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Endast öppna projekt är synliga (projekt i utkast eller stängt status är inte synliga).
 ClosedProjectsAreHidden=Avslutade projekt är inte synliga.
 TasksPublicDesc=Denna uppfattning presenterar alla projekt och uppgifter som du får läsa.
 TasksDesc=Denna uppfattning presenterar alla projekt och uppgifter (din användarbehörighet tillåta dig att visa allt).
 AllTaskVisibleButEditIfYouAreAssigned=Alla uppgifter för kvalificerade projekt är synliga, men du kan bara ange tid för uppgift som är tilldelad till vald användare. Tilldela uppgiften om du behöver ange tid på den.
-OnlyYourTaskAreVisible=Endast uppgifter som tilldelats dig är synliga. Tilldela uppgiften själv om den inte är synlig och du måste ange tid på den.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Uppgifter av projekt
 ProjectCategories=Projektetiketter / kategorier
 NewProject=Nytt projekt
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Ej tilldelad uppgiften
 NoUserAssignedToTheProject=Inga användare tilldelade detta projekt
 TimeSpentBy=Tid spenderad av
 TasksAssignedTo=Uppgifter som är tilldelade till
-AssignTaskToMe=Tilldela uppgift åt mig
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Tilldela uppgiften till %s
 SelectTaskToAssign=Välj uppgift att tilldela ...
 AssignTask=Tilldela
diff --git a/htdocs/langs/sv_SE/recruitment.lang b/htdocs/langs/sv_SE/recruitment.lang
index cc983d2e347..5e9b7a83e0e 100644
--- a/htdocs/langs/sv_SE/recruitment.lang
+++ b/htdocs/langs/sv_SE/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index c11320eba55..4f0b467d2ab 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Är du säker på att du vill validera denna försändels
 ConfirmCancelSending=Är du säker på att du vill avbryta denna leverans?
 DocumentModelMerou=Merou A5-modellen
 WarningNoQtyLeftToSend=Varning, att inga produkter väntar sändas.
-StatsOnShipmentsOnlyValidated=Statistik utförda på försändelser endast bekräftas. Datum som används är datum för bekräftandet av leveransen (planerat leveransdatum är inte alltid känt).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planerat leveransdatum
 RefDeliveryReceipt=Ref leverans kvitto
 StatusReceipt=Status leverans kvitto
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 6ecacfe6a99..f35ce300791 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Inga fördefinierade produkter för det här objek
 DispatchVerb=Sändning
 StockLimitShort=Gräns ​​för varning
 StockLimit=Stock gräns för larm
-StockLimitDesc=(tom) betyder ingen varning. <br> 0 kan användas för varning så fort lagret är tomt.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Fysikaliskt lager
 RealStock=Real Stock
 RealStockDesc=Fysisk / reell lager är beståndet för närvarande i lagerlokalerna.
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 6b883607b99..f15100a9f65 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Lösenord ändras till: %s
 SubjectNewPassword=Ditt nya lösenord för %s
 GroupRights=Gruppbehörigheter
 UserRights=Användarbehörighet
+Credentials=Credentials
 UserGUISetup=Användarskärmsinställning
 DisableUser=Inaktivera
 DisableAUser=Inaktivera en användare
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Använd fält Typ för att ändra
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Logga in med OpenID
 WeeklyHours=Timmar arbetade (per vecka)
-ExpectedWorkedHours=Förväntad arbetstid per vecka
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Färg på användaren
 DisabledInMonoUserMode=Inaktiverad i underhållsläge
 UserAccountancyCode=Användarkonto
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Anställningens slutdatum
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Du kan inte inaktivera din egen användarrekord
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index b3c08a3f786..713f5c37332 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 154400c6536..fbe75f09ab0 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/sw_SW/ecm.lang b/htdocs/langs/sw_SW/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/sw_SW/ecm.lang
+++ b/htdocs/langs/sw_SW/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/sw_SW/eventorganization.lang b/htdocs/langs/sw_SW/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/sw_SW/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/sw_SW/knowledgemanagement.lang b/htdocs/langs/sw_SW/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/sw_SW/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index dc2a83f2015..13793aad13f 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/sw_SW/modulebuilder.lang b/htdocs/langs/sw_SW/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/sw_SW/modulebuilder.lang
+++ b/htdocs/langs/sw_SW/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/sw_SW/partnership.lang b/htdocs/langs/sw_SW/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/sw_SW/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/sw_SW/productbatch.lang
+++ b/htdocs/langs/sw_SW/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/sw_SW/recruitment.lang b/htdocs/langs/sw_SW/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/sw_SW/recruitment.lang
+++ b/htdocs/langs/sw_SW/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/sw_SW/sendings.lang b/htdocs/langs/sw_SW/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/sw_SW/sendings.lang
+++ b/htdocs/langs/sw_SW/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/sw_SW/users.lang
+++ b/htdocs/langs/sw_SW/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/sw_SW/website.lang b/htdocs/langs/sw_SW/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/sw_SW/website.lang
+++ b/htdocs/langs/sw_SW/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 19154161e69..b1831be4744 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -202,7 +202,7 @@ Docref=การอ้างอิง
 LabelAccount=บัญชีฉลาก
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=วารสาร
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 90629c0f393..7718a6b1db0 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=การตั้งค่าการรักษาความปลอดภัย
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=ข้อผิดพลาดนี้ต้องใช้โมดูล PHP รุ่น% s หรือสูงกว่า
 ErrorModuleRequireDolibarrVersion=ข้อผิดพลาดในโมดูลนี้ต้อง s Dolibarr รุ่น% หรือสูงกว่า
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=ไม่แนะนำ
 NoActiveBankAccountDefined=ไม่มีบัญชีธนาคารที่ใช้งานที่กำหนดไว้
 OwnerOfBankAccount=เจ้าของบัญชีธนาคารของ% s
 BankModuleNotActive=โมดูลบัญชีธนาคารไม่ได้เปิดใช้
-ShowBugTrackLink=แสดงการเชื่อมโยง <strong>"% s"</strong>
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=การแจ้งเตือน
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=<b>คุณต้องเร
 YourPHPDoesNotHaveSSLSupport=ฟังก์ชั่น SSL ไม่สามารถใช้ได้ใน PHP ของคุณ
 DownloadMoreSkins=กินมากขึ้นในการดาวน์โหลด
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=แปลบางส่วน
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index ec66bfbaf1b..9cc2fcbf33a 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=สังคม / ชำระภาษีการค
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=จาก
 TransferTo=ไปยัง
 TransferFromToDone=<b>การถ่ายโอนจาก% s% s% s%</b> s ได้รับการบันทึก
-CheckTransmitter=เครื่องส่ง
+CheckTransmitter=ผู้ส่ง
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=เช็คธนาคาร
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=การเคลื่อนไหว
 PlannedTransactions=Planned entries
-Graph=กราฟิก
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=ใบนำฝากเงิน
 TransactionOnTheOtherAccount=การทำธุรกรรมในบัญชีอื่น ๆ
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=กลับไปที่บัญชี
 ShowAllAccounts=แสดงสำหรับบัญชีทั้งหมด
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=เลือกบัญชีธนาคารที่เกี่ยวข้องกับการเจรจาต่อรอง ใช้ค่าตัวเลขจัดเรียง: YYYYMM หรือ YYYYMMDD
 EventualyAddCategory=ในที่สุดระบุหมวดหมู่ในการที่จะจำแนกบันทึก
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 5976d3100e4..583cd85d1ef 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=ป้อนการชำระเงินที่ได้รับจากลูกค้า
 EnterPaymentDueToCustomer=ชำระเงินเนื่องจากลูกค้า
 DisabledBecauseRemainderToPayIsZero=ปิดใช้งานเนื่องจากค้างชำระที่เหลือเป็นศูนย์
-PriceBase=ฐานราคา
+PriceBase=Base price
 BillStatus=สถานะใบแจ้งหนี้
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
@@ -454,7 +454,7 @@ RegulatedOn=ในการควบคุม
 ChequeNumber=ตรวจสอบไม่มี°
 ChequeOrTransferNumber=ตรวจสอบ / โอนไม่มี°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=ธนาคารแห่งตรวจสอบ
 CheckBank=ตรวจสอบ
 NetToBePaid=สุทธิที่จะต้องจ่าย
diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
index 304e06b4448..cb54d2fbf5d 100644
--- a/htdocs/langs/th_TH/boxes.lang
+++ b/htdocs/langs/th_TH/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=ที่เก่าแก่ที่สุดที่หมดอายุการใช้งานบริการ
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=กิจกรรมทั่วโลก (ใบแจ้งหนี้, ข้อเสนอ, การสั่งซื้อ)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index 7dee305ab80..6ec140d41ce 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=ใบเสร็จรับเงิน
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=เบราว์เซอร์
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index d03372dacbc..d945058995d 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag / หมวดหมู่
 Rubriques=แท็ก / หมวดหมู่
 RubriquesTransactions=Tags/Categories of transactions
 categories=แท็ก / ประเภท
-NoCategoryYet=ไม่มีแท็ก / หมวดหมู่ของประเภทนี้สร้างขึ้น
+NoCategoryYet=No tag/category of this type has been created
 In=ใน
 AddIn=เพิ่มใน
 modify=แก้ไข
 Classify=แยกประเภท
 CategoriesArea=แท็ก / พื้นที่หมวดหมู่
-ProductsCategoriesArea=สินค้า / บริการแท็ก / พื้นที่ประเภท
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=ลูกค้าแท็ก / พื้นที่ประเภท
-MembersCategoriesArea=แท็กสมาชิก / พื้นที่ประเภท
-ContactsCategoriesArea=แท็กติดต่อ / พื้นที่ประเภท
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=รายการของแท็ก / ประเภท
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 27b693be2e4..e263ca788ec 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=ชื่อ% s บริษัท มีอยู่แล้ว ให้เลือกอีกหนึ่ง
 ErrorSetACountryFirst=ตั้งประเทศเป็นครั้งแรก
 SelectThirdParty=เลือกบุคคลที่สาม
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=ลบรายชื่อ / ที่อยู่
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=โทรศัพท์
 Skype=Skype
 Call=โทรศัพท์
 Chat=พูดคุย
-PhonePro=โทรศัพท์ศ.
+PhonePro=Bus. phone
 PhonePerso=Pers โทรศัพท์
 PhoneMobile=มือถือ
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=รหัสไปรษณีย์
 Town=เมือง
 Web=เว็บ
 Poste= ตำแหน่ง
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=จำเป็นต้องใช้ถ้าบุคคลที่สามเป็นลูกค้าหรือโอกาส
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect ที่จะติดต่อ
 CompanyDeleted=บริษัท "% s" ลบออกจากฐานข้อมูล
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=เปิด
 ActivityCeased=ปิด
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=การเรียกเก็บเงินในปัจจุบันที่โดดเด่น
 OutstandingBill=แม็กซ์ สำหรับการเรียกเก็บเงินที่โดดเด่น
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=รหัสที่เป็นอิสระ รห
 ManagingDirectors=ผู้จัดการ (s) ชื่อ (ซีอีโอผู้อำนวยการประธาน ... )
 MergeOriginThirdparty=ซ้ำของบุคคลที่สาม (บุคคลที่สามต้องการลบ)
 MergeThirdparties=ผสานบุคคลที่สาม
-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 third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index e6f46facdf1..80f555eef67 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=ใหม่ส่วนลด
 NewCheckDeposit=ฝากเช็คใหม่
 NewCheckDepositOn=สร้างใบเสร็จรับเงินสำหรับการฝากเงินในบัญชี:% s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=ตรวจสอบวันที่แผนกต้อนรับส่วนหน้า
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=จ่ายทางสังคม / ภาษีการคลัง
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/th_TH/ecm.lang b/htdocs/langs/th_TH/ecm.lang
index 9e0495720b4..08855af3eec 100644
--- a/htdocs/langs/th_TH/ecm.lang
+++ b/htdocs/langs/th_TH/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 7803f91686e..a6a8cadcfef 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=ไม่มีข้อผิดพลาดที่เรากระทำ
 # Errors
 ErrorButCommitIsDone=พบข้อผิดพลาด แต่เราตรวจสอบอย่างไรก็ตามเรื่องนี้
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=% s url ที่ไม่ถูกต้อง
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=เข้าสู่ระบบ% s อยู่แล้ว
@@ -46,8 +46,8 @@ ErrorWrongDate=วันที่ไม่ถูกต้อง!
 ErrorFailedToWriteInDir=ไม่สามารถเขียนในไดเรกทอรี% s
 ErrorFoundBadEmailInFile=พบไวยากรณ์อีเมลไม่ถูกต้องสำหรับ% s บรรทัดในไฟล์ (เช่นสาย% s ด้วยอีเมล =% s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=ฟิลด์ที่จำเป็นบางคนไม่เต็ม
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=ล้มเหลวในการสร้างไดเรกทอรี ตรวจสอบการใช้เว็บเซิร์ฟเวอร์ที่มีสิทธิ์ในการเขียนลงในไดเรกทอรีเอกสาร Dolibarr หาก <b>safe_mode</b> พารามิเตอร์เปิดใช้งานบน PHP นี้ตรวจสอบว่า php ไฟล์ Dolibarr เป็นเจ้าของให้กับผู้ใช้เว็บเซิร์ฟเวอร์ (หรือกลุ่ม)
 ErrorNoMailDefinedForThisUser=จดหมายไม่มีกำหนดไว้สำหรับผู้ใช้นี้
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/th_TH/eventorganization.lang b/htdocs/langs/th_TH/eventorganization.lang
new file mode 100644
index 00000000000..a98071ac8a9
--- /dev/null
+++ b/htdocs/langs/th_TH/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = ร่าง
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = เสร็จสิ้น
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/th_TH/knowledgemanagement.lang b/htdocs/langs/th_TH/knowledgemanagement.lang
new file mode 100644
index 00000000000..7a13161b2b9
--- /dev/null
+++ b/htdocs/langs/th_TH/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = เกี่ยวกับ
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = บทความ
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index ae8e8b52f85..16ab255fce2 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=คัดลอกไป
 MailToCCUsers=Copy to users(s)
 MailCCC=คัดลอกเก็บไว้เพื่อ
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=ข่าวสาร
 MailFile=ไฟล์ที่แนบมา
 MailMessage=ร่างกายอีเมล์
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=การกำหนดค่าของการส่งอีเมล์ที่ได้รับการติดตั้งเพื่อ '% s' โหมดนี้ไม่สามารถใช้ในการส่งการส่งอีเมลมวล
 MailSendSetupIs2=ก่อนอื่นคุณต้องไปกับบัญชีผู้ดูแลระบบลงไปในเมนู% sHome - การติดตั้ง - อีเมล์% s จะเปลี่ยนพารามิเตอร์ <strong>'% s'</strong> เพื่อใช้โหมด '% s' ด้วยโหมดนี้คุณสามารถเข้าสู่การตั้งค่าของเซิร์ฟเวอร์ที่ให้บริการโดยผู้ให้บริการอินเทอร์เน็ตของคุณและใช้คุณลักษณะการส่งอีเมลมวล
 MailSendSetupIs3=หากคุณมีคำถามใด ๆ เกี่ยวกับวิธีการติดตั้งเซิร์ฟเวอร์ของคุณคุณสามารถขอให้% s
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 6934a6e98eb..0da49f6d444 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=ทดสอบการเชื่อมต่อ
 ToClone=โคลน
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=ไม่มีข้อมูลที่จะโคลนที่กำหนดไว้
 Of=ของ
 Go=ไป
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=เหตุการณ์
 About=เกี่ยวกับ
 Number=จำนวน
-NumberByMonth=จำนวนเดือน
+NumberByMonth=Total reports by month
 AmountByMonth=จํานวนเงินตามเดือน
 Numero=จำนวน
 Limit=จำกัด
@@ -341,8 +341,8 @@ KiloBytes=กิโลไบต์
 MegaBytes=เมกะไบต์
 GigaBytes=กิกะไบต์
 TeraBytes=เทราไบต์
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=ข
 Kb=กิโลไบต์
 Mb=Mb
@@ -503,9 +503,11 @@ By=โดย
 From=จาก
 FromDate=จาก
 FromLocation=จาก
-at=at
 to=ไปยัง
 To=ไปยัง
+ToDate=ไปยัง
+ToLocation=ไปยัง
+at=at
 and=และ
 or=หรือ
 Other=อื่น ๆ
@@ -843,7 +845,7 @@ XMoreLines=% s สาย (s) ซ่อน
 ShowMoreLines=Show more/less lines
 PublicUrl=URL ที่สาธารณะ
 AddBox=เพิ่มกล่อง
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=พิมพ์ไฟล์% s
 ShowTransaction=Show entry on bank account
 ShowIntervention=การแทรกแซงการแสดง
@@ -854,8 +856,8 @@ Denied=ปฏิเสธ
 ListOf=List of %s
 ListOfTemplates=รายชื่อของแม่แบบ
 Gender=Gender
-Genderman=คน
-Genderwoman=หญิง
+Genderman=Male
+Genderwoman=Female
 Genderother=อื่น ๆ
 ViewList=มุมมองรายการ
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index cb702593656..6615ab0d20c 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=สมาชิกอีกคนห
 ErrorUserPermissionAllowsToLinksToItselfOnly=ด้วยเหตุผลด้านความปลอดภัยคุณต้องได้รับสิทธิ์ในการแก้ไขผู้ใช้ทุกคนที่จะสามารถที่จะเชื่อมโยงสมาชิกให้กับผู้ใช้ที่ไม่ได้เป็นของคุณ
 SetLinkToUser=เชื่อมโยงไปยังผู้ใช้ Dolibarr
 SetLinkToThirdParty=เชื่อมโยงไปยัง Dolibarr ของบุคคลที่สาม
-MembersCards=สมาชิกบัตรธุรกิจ
+MembersCards=Business cards for members
 MembersList=รายชื่อสมาชิก
 MembersListToValid=รายชื่อสมาชิกร่าง (ที่จะถูกตรวจสอบ)
 MembersListValid=รายชื่อสมาชิกที่ถูกต้อง
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=สมาชิกที่มีการส
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=วันที่สมัครสมาชิก
 DateEndSubscription=วันที่สิ้นสุดการสมัครสมาชิก
-EndSubscription=สมัครสมาชิก End
+EndSubscription=Subscription Ends
 SubscriptionId=รหัสการจองซื้อ
 WithoutSubscription=Without subscription
 MemberId=รหัสสมาชิก
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=ต้องสมัครสมาชิก
 DeleteType=ลบ
 VoteAllowed=โหวตที่ได้รับอนุญาต
-Physical=กายภาพ
-Moral=ศีลธรรม
-MorAndPhy=Moral and Physical
-Reenable=reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=สถิติสมาชิกตามประ
 MembersStatisticsByState=สถิติสมาชิกโดยรัฐ / จังหวัด
 MembersStatisticsByTown=สถิติสมาชิกโดยเมือง
 MembersStatisticsByRegion=สถิติสมาชิกตามภูมิภาค
-NbOfMembers=จำนวนสมาชิก
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=ไม่มีสมาชิกตรวจสอบพบว่า
-MembersByCountryDesc=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับประเทศสมาชิก กราฟฟิค แต่ขึ้นอยู่กับบริการของ Google กราฟออนไลน์และสามารถใช้ได้เฉพาะในกรณีที่การเชื่อมต่ออินเทอร์เน็ตจะเป็นคนที่ทำงาน
-MembersByStateDesc=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกโดยรัฐ / จังหวัด / ตำบล
-MembersByTownDesc=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกเมือง
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=เลือกสถิติที่คุณต้องการอ่าน ...
 MenuMembersStats=สถิติ
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=ข้อมูลเป็นสาธารณะ
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=สมาชิกใหม่ที่เพิ่ม รอการอนุมัติ
 NewMemberForm=แบบฟอร์มการสมัครสมาชิกใหม่
-SubscriptionsStatistics=สถิติเกี่ยวกับการสมัครสมาชิก
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=จำนวนการสมัครสมาชิก
-AmountOfSubscriptions=จำนวนเงินของการสมัคร
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=มูลค่าการซื้อขาย (สำหรับ บริษัท ) หรืองบประมาณ (มูลนิธิ)
 DefaultAmount=จำนวนเงินที่เริ่มต้นของการสมัครสมาชิก
 CanEditAmount=ผู้เข้าชมสามารถเลือก / แก้ไขจำนวนเงินของการสมัครสมาชิก
 MEMBER_NEWFORM_PAYONLINE=กระโดดขึ้นไปบนหน้าการชำระเงินออนไลน์แบบบูรณาการ
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกโดยธรรมชาติ
-MembersByRegion=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกตามภูมิภาค
 VATToUseForSubscriptions=อัตราภาษีมูลค่าเพิ่มที่จะใช้สำหรับการสมัครสมาชิก
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=ผลิตภัณฑ์ที่ใช้สำหรับสายการสมัครสมาชิกเข้าไปในใบแจ้งหนี้:% s
diff --git a/htdocs/langs/th_TH/modulebuilder.lang b/htdocs/langs/th_TH/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/th_TH/modulebuilder.lang
+++ b/htdocs/langs/th_TH/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index aa3544a88b1..b4170631c63 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>ศ Id% s</b> ข้อมูลขึ้นอยู่กับประเทศของบุคคลที่สาม <br> <b>ตัวอย่างเช่นสำหรับประเทศ% s ก็รหัส%</b> s
 DolibarrDemo=Dolibarr ERP / CRM สาธิต
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/th_TH/partnership.lang b/htdocs/langs/th_TH/partnership.lang
new file mode 100644
index 00000000000..35ad7a84d83
--- /dev/null
+++ b/htdocs/langs/th_TH/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=วันที่เริ่มต้น
+DatePartnershipEnd=วันที่สิ้นสุด
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = ร่าง
+PartnershipAccepted = Accepted
+PartnershipRefused = ปฏิเสธ
+PartnershipCanceled = ยกเลิก
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang
index 72ff7f7a24f..cf0ca364246 100644
--- a/htdocs/langs/th_TH/productbatch.lang
+++ b/htdocs/langs/th_TH/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 0884e8e05aa..cb46ebae258 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Services for sale only
 ServicesOnPurchaseOnly=Services for purchase only
 ServicesNotOnSell=Services not for sale and not for purchase
 ServicesOnSellAndOnBuy=บริการสำหรับการขายและการซื้อ
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=สินค้า
@@ -73,12 +73,12 @@ SellingPrice=ราคาขาย
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=ราคาขาย (รวมภาษี).
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=ราคาใหม่
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=ราคาขายไม่สามารถจะต่ำกว่าขั้นต่ำที่ได้รับอนุญาตสำหรับสินค้านี้ (% s โดยไม่มีภาษี) ข้อความนี้ยังสามารถปรากฏขึ้นถ้าคุณพิมพ์ส่วนลดสำคัญมากเกินไป
 ContractStatusClosed=ปิด
@@ -157,11 +157,11 @@ ListServiceByPopularity=รายการของการบริการ
 Finished=ผลิตภัณฑ์ที่ผลิต
 RowMaterial=วัตถุดิบ
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=ผลิตภัณฑ์นี้ถูกนำมาใช้
 NewRefForClone=อ้าง ของผลิตภัณฑ์ / บริการใหม่
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=ราคาของลูกค้า
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=ประเทศแหล่งกำเนิดสินค้า
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=ป้ายสั้น
 Unit=หน่วย
 p=ยู
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 80f1d602be7..3b133a68f69 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=รายชื่อโครงการ
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=ทุกโครงการ
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=มุมมองนี้จะนำเสนอโครงการทั้งหมดที่คุณได้รับอนุญาตให้อ่าน
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=มุมมองนี้นำเสนอทุกโครงการและงานที่คุณได้รับอนุญาตในการอ่าน
 ProjectsDesc=มุมมองนี้นำเสนอทุกโครงการ (สิทธิ์ผู้ใช้ของคุณอนุญาตให้คุณสามารถดูทุกอย่าง)
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=เฉพาะโครงการที่เปิดจะมองเห็นได้ (โครงการในร่างหรือสถานะปิดจะมองไม่เห็น)
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=มุมมองนี้นำเสนอทุกโครงการและงานที่คุณได้รับอนุญาตในการอ่าน
 TasksDesc=มุมมองนี้นำเสนอทุกโครงการและงาน (สิทธิ์ผู้ใช้ของคุณอนุญาตให้คุณสามารถดูทุกอย่าง)
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=โครงการใหม่
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=มอบหมายงานให้ฉัน
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=กำหนด
diff --git a/htdocs/langs/th_TH/recruitment.lang b/htdocs/langs/th_TH/recruitment.lang
index fafd8a9a580..844a3bd49c3 100644
--- a/htdocs/langs/th_TH/recruitment.lang
+++ b/htdocs/langs/th_TH/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index f5e201c2f33..c7a2b68bdec 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 รูปแบบ
 WarningNoQtyLeftToSend=คำเตือนผลิตภัณฑ์ไม่มีการรอคอยที่จะส่ง
-StatsOnShipmentsOnlyValidated=สถิติดำเนินการในการตรวจสอบการจัดส่งเท่านั้น วันที่นำมาใช้คือวันของการตรวจสอบการจัดส่งของ (วันที่ส่งมอบวางแผนไม่เป็นที่รู้จักเสมอ)
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=วันที่มีการวางแผนในการส่งสินค้า
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 15a6bdae356..c2d4b2e180a 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=ไม่มีสินค้าที่กำ
 DispatchVerb=ฆ่า
 StockLimitShort=จำกัด สำหรับการแจ้งเตือน
 StockLimit=ขีด จำกัด ของสต็อกสำหรับการแจ้งเตือน
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=หุ้นจริง
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index 68e1691f8bf..d67563b1b1c 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=เปลี่ยนรหัสผ่านในการ:%
 SubjectNewPassword=รหัสผ่านใหม่ของคุณ %s
 GroupRights=สิทธิ์ของกลุ่ม
 UserRights=สิทธิ์ของผู้ใช้
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=ปิดการใช้งาน
 DisableAUser=ปิดการใช้งานของผู้ใช้
@@ -105,7 +106,7 @@ UseTypeFieldToChange=ใช้ประเภทเพื่อเปลี่
 OpenIDURL=URL OpenID
 LoginUsingOpenID=ใช้ OpenID เข้าสู่ระบบ
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=สีของผู้ใช้
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index 0110af84a4b..a33a6c95dca 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 5568b64c0fa..b04d8c3dd4c 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Referans
 LabelAccount=Hesap etiketi
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Günlük
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Bağlamayı değiştir
 Accounted=Accounted in ledger
-NotYetAccounted=Büyük defterde henüz muhasebeleştirilmemiş
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Uzlaştırılmadı
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 0486dee99fc..1ae5be5bfa3 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -37,9 +37,9 @@ UnlockNewSessions=Bağlantı kilidini kaldır
 YourSession=Oturumunuz
 Sessions=Kullanıcı Oturumları
 WebUserGroup=Web sunucusu kullanıcısı/grubu
-PermissionsOnFiles=Permissions on files
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFiles=Dosyalarla ilgili izinler
+PermissionsOnFilesInWebRoot=Web kök dizinindeki dosyalar üzerindeki izinler
+PermissionsOnFile=%s dosyasındaki izinler
 NoSessionFound=PHP yapılandırmanız aktif oturumların listelenmesine izin vermiyor gibi görünüyor. Oturumları kaydetmek için kullanılan dizin (<b>%s</b>) korunuyor olabilir (örneğin, İşletim Sistemi izinleri veya open_basedir PHP direkti tarafından).
 DBStoringCharset=Veri depolamak için veri tabanı karakter seti
 DBSortingCharset=Veri sıralamak için veri tabanı karakter seti
@@ -57,13 +57,14 @@ GUISetup=Ekran
 SetupArea=Ayarlar
 UploadNewTemplate=Yeni şablon(lar) yükleyin
 FormToTestFileUploadForm=Dosya yükleme deneme formu (ayarlara göre)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=<b>%s</b> uygulaması/modülü etkinleştirilmelidir
+ModuleIsEnabled=b>%s</b> uygulaması/modülü etkinleştirildi
 IfModuleEnabled=Not: yalnızca <b>%s</b> modülü etkinleştirildiğinde evet etkilidir.
 RemoveLock=<b>%s</b> dosyası mevcutsa, Güncelleme/Yükleme aracının kullanımına izin vermek için kaldırın veya yeniden adlandırın.
 RestoreLock=Güncelleme/Yükleme aracının daha sonraki kullanımlarına engel olmak için <b>%s</b> dosyasını, sadece okuma iznine sahip olacak şekilde geri yükleyin.
 SecuritySetup=Güvenlik ayarları
-PHPSetup=PHP setup
+PHPSetup=PHP kurulumu
+OSSetup=OS setup
 SecurityFilesDesc=Burada dosya yükleme konusunda güvenlikle ilgili seçenekleri tanımlayın.
 ErrorModuleRequirePHPVersion=Hata, bu modül %s veya daha yüksek PHP sürümü gerektirir
 ErrorModuleRequireDolibarrVersion=Hata, bu modül %s veya daha yüksek Dolibarr sürümü gerektirir
@@ -77,7 +78,7 @@ DisableJavascriptNote=Not: Test veya hata ayıklama amaçlıdır. Görme engelli
 UseSearchToSelectCompanyTooltip=Ayrıca çok fazla sayıda üçüncü partiye sahipseniz (>100.000), Ayarlar->Diğer Ayarlar menüsünden COMPANY_DONOTSEARCH_ANYWHERE sabitini 1 olarak ayarlayarak hızı arttırabilirsiniz. Bu durumda, arama dizenin başlangıcıyla sınırlı olacaktır.
 UseSearchToSelectContactTooltip=Ayrıca çok fazla sayıda üçüncü partiye sahipseniz (>100.000), Ayarlar->Diğer Ayarlar menüsünden CONTACT_DONOTSEARCH_ANYWHERE sabitini 1 olarak ayarlayarak hızı arttırabilirsiniz. Bu durumda, arama dizenin başlangıcıyla sınırlı olacaktır.
 DelaiedFullListToSelectCompany=Aşağı açılır listeden Üçüncü Parti içeriği listelemeden önce bir tuşa basarak arama yapmanızı bekler.<br>Çok sayıda üçüncü parti mevcutsa bu performansı artırabilir, fakat daha az kullanışlıdır
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+DelaiedFullListToSelectContact=Kişi listesi içeriğini yüklemeden önce bir tuşa basılıncaya kadar bekleyin.<br>Bu, çok sayıda kişiniz varsa performansı artırabilir, ancak daha az kullanışlıdır.
 NumberOfKeyToSearch=Aramayı tetikleyecek karakter sayısı: %s
 NumberOfBytes=Bayt Sayısı
 SearchString=Arama dizisi
@@ -86,7 +87,7 @@ AllowToSelectProjectFromOtherCompany=Bir üçüncü parti belgesinde, başka bir
 JavascriptDisabled=JavaScript devre dışı
 UsePreviewTabs=Önizleme sekmelerini kullan
 ShowPreview=Önizleme göster
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Ayrıntıları Göster-Gizle
 PreviewNotAvailable=Önizleme yok
 ThemeCurrentlyActive=Geçerli etkin tema
 MySQLTimeZone=MySql Saat Dilimi (veritabanı)
@@ -106,9 +107,9 @@ NoMaxSizeByPHPLimit=Not: PHP yapılandırmanızda hiç sınır ayarlanmamış
 MaxSizeForUploadedFiles=Yüklenen dosyalar için maksimum boyut (herhangi bir yüklemeye izin vermemek için 0 olarak ayarlayın)
 UseCaptchaCode=Oturum açma sayfasında grafiksel kod (CAPTCHA) kullan
 AntiVirusCommand=Antivirüs komutu tam yolu
-AntiVirusCommandExample=ClamAv Daemon örneği (clamav-daemon gerektirir): / usr / bin / clamdscan <br> ClamWin örneği (çok çok yavaş): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
+AntiVirusCommandExample=ClamAv Daemon örneği (clamav-daemon gerektirir):/usr/bin/clamdscan<br>ClamWin örneği (çok çok yavaş): c:\\Progra ~ 1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Komut satırında daha çok parametre
-AntiVirusParamExample=ClamAv Daemon örneği: --fdpass <br> ClamWin örneği: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
+AntiVirusParamExample=ClamAv Daemon örneği: --fdpass<br>ClamWin örneği: --database = "C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Muhasebe modülü ayarları
 UserSetup=Kullanıcı yönetimi ayarları
 MultiCurrencySetup=Çoklu para birimi ayarları
@@ -156,8 +157,8 @@ SystemToolsAreaDesc=Bu alan yönetim işlevlerini sunar. İstenilen özelliği s
 Purge=Temizleme
 PurgeAreaDesc=Bu sayfa Dolibarr tarafından oluşturulan veya depolanan tüm dosyaları silmenizi sağlar (<b>%s</b> dizinindeki geçici veya tüm dosyalar). Bu özelliğin kullanılması normalde gerekli değildir. Bu araç, Dolibarr yazılımı web sunucusu tarafından oluşturulan dosyaların silinmesine izin vermeyen bir sağlayıcı tarafından barındırılan kullanıcılar için geçici bir çözüm olarak sunulur.
 PurgeDeleteLogFile=Syslog modülü için tanımlı <b>%s</b> dosyası da dahil olmak üzere günlük dosyalarını sil (veri kaybetme riskiniz yoktur)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files
+PurgeDeleteTemporaryFiles=Tüm günlük ve geçici dosyaları silin (veri kaybı riski yoktur). Parametre 'tempfilesold', 'logfiles' veya her ikisi 'tempfilesold + logfiles' olabilir. Not: Geçici dosyaların silinmesi yalnızca temp dizini 24 saatten daha uzun süre önce oluşturulmuşsa yapılır.
+PurgeDeleteTemporaryFilesShort=Günlüğü(log) ve geçici dosyaları silin
 PurgeDeleteAllFilesInDocumentsDir=<b>%s</b> dizinindeki bütün dosyaları sil.<br>Bu işlem, öğelerle (üçüncü partiler, faturalar, v.s.) ilgili oluşturulan tüm dosyaları, ECM modülüne yüklenen dosyaları, veritabanı yedekleme dökümlerini ve geçici dosyaları silecektir.
 PurgeRunNow=Şimdi temizle
 PurgeNothingToDelete=Silinecek dizin ya da dosya yok.
@@ -215,14 +216,14 @@ ModulesDevelopDesc=Ayrıca kendi modülünüzü geliştirebilir veya sizin için
 DOLISTOREdescriptionLong=Harici bir modül bulmak için <a href="https://www.dolistore.com"> www.dolistore.com </a> web sitesini açmak yerine, dış pazarda sizin için arama yapacak bu gömülü aracı kullanabilirsiniz (yavaş olabilir, internet erişimine ihtiyacınız olabilir) ...
 NewModule=Yeni modül
 FreeModule=Serbest
-CompatibleUpTo=%ssürümü ile uyumlu 
+CompatibleUpTo=%ssürümü ile uyumlu
 NotCompatible=Bu modül Dolibarr'ınızla uyumlu görünmüyor %s (Min %s - Maks %s).
 CompatibleAfterUpdate=Bu modül, Dolibarr %s (Min %s - Maks %s) için bir güncelleme gerektirir.
 SeeInMarkerPlace=Market place alanına bakın
 SeeSetupOfModule=%s modülü kurulumuna bak
 Updated=Güncellendi
 Nouveauté=Yenilik
-AchatTelechargement=Satın Al / Yükle
+AchatTelechargement=Satın Al/Yükle
 GoModuleSetupArea=Yeni bir modül almak/yüklemek için, <a href="%s">%s</a> Modül ayar alanına gidin.
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri
 DoliPartnersDesc=İstek üzerine modüller veya özellikler geliştiren firmaların listesi.<br>Not: Dolibarr açık kaynaklı bir uygulama olduğu için PHP programlamada deneyimli <i>herhangi biri</i> bir modül geliştirebilir.
@@ -234,7 +235,7 @@ BoxesAvailable=Mevcut ekran etiketleri
 BoxesActivated=Etkin ekran etiketleri
 ActivateOn=Etkinleştirme açık
 ActiveOn=Etkinlik açık
-ActivatableOn=Activatable on
+ActivatableOn=Etkinleştirilebilir
 SourceFile=Kaynak dosyası
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Yalnızca JavaScript ve Ajax devre dışı değilse vardır
 Required=Gerekli
@@ -246,13 +247,13 @@ MainDbPasswordFileConfEncrypted=conf.php içinde depolanan veritabanı parolası
 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ı koruyun. Toplu PDF oluşturulmasını bozduğu için bu ÖNERİLMEZ.
-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.
+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 imkansı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
 OfficialWebSite=Dolibarr resmi web sitesi
 OfficialWebSiteLocal=Yerel web sitesi (%s)
-OfficialWiki=Dolibarr dokümantasyonu / Wiki
+OfficialWiki=Dolibarr dokümantasyonu/Wiki
 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)
@@ -260,7 +261,7 @@ ReferencedPreferredPartners=Tercihli Ortaklar
 OtherResources=Diğer kaynaklar
 ExternalResources=Dış Kaynaklar
 SocialNetworks=Sosyal Ağlar
-SocialNetworkId=Social Network ID
+SocialNetworkId=Sosyal Ağ Kimliği
 ForDocumentationSeeWiki=Kullanıcıların ve geliştiricilerin belgeleri (Doc, FAQs…), <br>Dolibarr Wiki ye bir göz atın:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Herhangi bir başka soru/yardım için Dolibarr forumunu kullanabilirsiniz:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Burada Dolibar ile ilgili yardım ve destek almak için bazı kaynaklar bulabilirsiniz.
@@ -279,13 +280,13 @@ NoticePeriod=Bildirim dönemi
 NewByMonth=Aya göre yeni
 Emails=E-postalar
 EMailsSetup=E-posta kurulumları
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=Bu sayfa, e-posta gönderimi için parametreleri veya seçenekleri belirlemenize imkan tanır.
 EmailSenderProfiles=E-posta gönderici profilleri
 EMailsSenderProfileDesc=Bu bölümü boş bırakabilirsiniz. Buraya gireceğiniz e-posta adresleri, yeni bir e-posta adresi yazdığınızda comboboxtaki olası gönderenler listesine eklenecekler.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Portu (php.ini içinde varsayılan değer: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Sunucusu (php.ini içinde varsayılan değer: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Portu (Unix benzeri sistemlerdeki PHP'de tanımlanmamış)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Sunucusu (Unix benzeri sistemlerdeki PHP'de tanımlanmamış)
+MAIN_MAIL_SMTP_PORT=SMTP Portu (php.ini içinde varsayılan değer: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP Sunucusu (php.ini içinde varsayılan değer: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP Portu (Unix benzeri sistemlerdeki PHP'de tanımlanmamış)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP Sunucusu (Unix benzeri sistemlerdeki PHP'de tanımlanmamış)
 MAIN_MAIL_EMAIL_FROM=Otomatik e-postalar için gönderen E-Posta adresi (php.ini içindeki varsayılan değer: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Geri dönen hatalı mailler için kullanılacak e-posta adresi (gönderilen maillerdeki 'Hatalar-buraya' alanı)
 MAIN_MAIL_AUTOCOPY_TO= Gönderilen tüm maillerin kopyasının (Bcc) gönderileceği e-posta adresi
@@ -297,7 +298,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (gönderme sunucusu kimlik doğrulama gerektiriyorsa)
 MAIN_MAIL_SMTPS_PW=SMTP Şifresi (gönderme sunucusu kimlik doğrulama gerektiriyorsa)
 MAIN_MAIL_EMAIL_TLS=TLS (SSL) şifreleme kullan
 MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) şifreleme kullan
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Sertifika otomatik imzalarını yetkilendirin
 MAIN_MAIL_EMAIL_DKIM_ENABLED=E-posta imzası oluşturmak için DKIM kullan
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Dkim ile kullanım için Eposta Alan adı
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Dkim seçicinin adı
@@ -315,9 +316,9 @@ SubmitTranslationENUS=Bu dil için çeviri tamamlanmamışsa ya da hatalar buluy
 ModuleSetup=Modül kurulumu
 ModulesSetup=Modül/Uygulama kurulumu
 ModuleFamilyBase=Sistem
-ModuleFamilyCrm=Müşteri İlişkileri Yönetimi (CRM)
-ModuleFamilySrm=Tedarikçi İlişkileri Yönetimi (SRM)
-ModuleFamilyProducts=Ürün Yönetimi (PM)
+ModuleFamilyCrm=Müşteri İlişkileri Yönetimi (MİY)
+ModuleFamilySrm=Tedarikçi İlişkileri Yönetimi (TİY)
+ModuleFamilyProducts=Ürün Yönetimi (ÜY)
 ModuleFamilyHr=İnsan Kaynakları Yönetimi (İK)
 ModuleFamilyProjects=Projeler/Ortak çalışma
 ModuleFamilyOther=Diğer
@@ -350,10 +351,10 @@ LastActivationAuthor=En son aktivasyon yazarı
 LastActivationIP=En son aktivasyon IP'si
 UpdateServerOffline=Güncelleme sunucusu çevrimdışı
 WithCounter=Bir sayacı yönet
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes=Herhangi bir numaralandırma maskesi girebilirsiniz. Bu maskede, aşağıdaki etiketler kullanılabilir:<br><b> {000000} </b>, her %s'de artırılacak bir sayıya karşılık gelir. Sayacın istenen uzunluğu kadar sıfır girin. Sayaç, maske kadar sıfıra sahip olmak için soldan sıfırlarla tamamlanacaktır.<br><b> {000000 + 000} </b> öncekiyle aynı, ancak + işaretinin sağındaki sayıya karşılık gelen ofset ilk %s'den başlayarak uygulandı.<br><b> {000000 @ x} </b> öncekiyle aynı ancak x ayına ulaşıldığında sayaç sıfırlanır (x 1 ile 12 arasında veya tanımlanan mali yılın ilk aylarını kullanmak için 0) yapılandırmanızda veya her ay sıfıra sıfırlamak için 99). Bu seçenek kullanılırsa ve x 2 veya daha yüksekse, {yy} {aa} veya {yyyy} {aa} dizisi de gereklidir.<br><b> {gg} </b> gün (01 - 31).<br><b> {aa} </b> ay (01 - 12).<br><b> {yy} </b>, <b> {yyyy} </b> veya <b> {y} </b> 2, 4 veya 1 sayıdan fazla. <br>
+GenericMaskCodes2=<b> {cccc} </b> n karakterli müşteri kodu<br><b> {cccc000} </b> n karakterdeki müşteri kodunu müşteriye ayrılmış bir sayaç takip ediyor. Müşteriye ayrılan bu sayaç, genel sayaçla aynı anda sıfırlanır.<br><b> {tttt} </b> N karakterdeki cari türünün kodu (Giriş - Ayarlar - Tanımlar - Cari türleri menüsüne bakın ). Bu etiketi eklerseniz, sayaç her cari türü için farklı olacaktır. <br>
 GenericMaskCodes3=Maskede diğer tüm karakterler olduğu gibi kalır.<br>Boşluklara izin verilmez.<br>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
+GenericMaskCodes3EAN=Maskedeki diğer tüm karakterler bozulmadan kalacaktır (EAN13'te 13. konumda * veya? Dışında).<br>Boşluklara izin verilmez.<br>EAN13'te, 13. konumdaki son} 'dan sonraki son karakter * veya? . Hesaplanan anahtarla değiştirilecektir. <br>
 GenericMaskCodes4a= <u> Üçüncü parti TheCompany'nin 2007-01-31 tarihli 99. %s örneği: </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>
@@ -380,8 +381,8 @@ LanguageFile=Dil dosyası
 ExamplesWithCurrentSetup=Tanımladığınız mevcut yapılandırma için örnekler
 ListOfDirectories=OpenDocument (AçıkBelge) temaları dizin listesi
 ListOfDirectoriesForModelGenODT=OpenDocument biçimli şablon dosyalarını içeren dizinler listesi.<br><br>Buraya tam yol dizinlerini koyun.<br>Her dizin arasına satır başı ekleyin.<br>GED modülü dizinini eklemek için buraya ekleyin<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>O dizinlerdeki dosyaların bitiş şekli böyle omalıdır <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Bu dizinlerde bulunana ODT/ODS şablon dosyalarının sayısı 
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
+NumberOfModelFilesFound=Bu dizinlerde bulunana ODT/ODS şablon dosyalarının sayısı
+ExampleOfDirectoriesForModelGen=Sözdizimi örnekleri:<br>c: \\ myapp \\ mydocumentdir \\ mysubdir<br>/ home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Odt belge şablonlarının nasıl oluşturulacağını öğrenmek için o dizinlere kaydetmeden önce, wiki belgelerini okuyun:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Ad/Soyad konumu
@@ -399,10 +400,10 @@ NoSmsEngine=Sitemde hiç bir SMS gönderme yöneticisi mevcut değil. Standart D
 PDF=PDF
 PDFDesc=PDF oluşturma için global seçenekler
 PDFAddressForging=Adres bölümü kuralları
-HideAnyVATInformationOnPDF=Satış Vergisi / KDV ile ilgili tüm bilgileri gizle
-PDFRulesForSalesTax=Satış Vergisi / KDV için Kurallar
-PDFLocaltax=%siçin kurallar 
-HideLocalTaxOnPDF=Satış Vergisi / KDV sütununda %s oranını gizle
+HideAnyVATInformationOnPDF=Satış Vergisi/KDV ile ilgili tüm bilgileri gizle
+PDFRulesForSalesTax=Satış Vergisi/KDV için Kurallar
+PDFLocaltax=%siçin kurallar
+HideLocalTaxOnPDF=Satış Vergisi/KDV sütununda %s oranını gizle
 HideDescOnPDF=Ürün açıklamasını gizle
 HideRefOnPDF=Ürün Referans No'sunu gizle
 HideDetailsOnPDF=Ürün satır detaylarını gizle
@@ -412,16 +413,16 @@ UrlGenerationParameters=URL güvenliği için parametreler
 SecurityTokenIsUnique=Her URL için benzersiz bir güvenlik anahtarı kullan
 EnterRefToBuildUrl=Nesen %s için hata referansı
 GetSecuredUrl=Hesaplanan URL al
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=Yetkisiz işlem düğmelerini dahili kullanıcılar için de gizleyin (aksi takdirde gri renklidir)
 OldVATRates=Eski KDV oranı
 NewVATRates=Yeni KDV oranı
 PriceBaseTypeToChange=Buna göre tanımlanan temel referans değerli fiyatları değiştir
 MassConvert=Toplu dönüştürmeyi başlat
 PriceFormatInCurrentLanguage=Geçerli Dilde Fiyat Formatı
 String=Dizi
-String1Line=String (1 line)
+String1Line=Dizi (1 satır)
 TextLong=Uzun metin
-TextLongNLines=Long text (n lines)
+TextLongNLines=Uzun metin (n satır)
 HtmlText=HTML metni
 Int=Tam sayı
 Float=Kayan
@@ -441,19 +442,19 @@ ExtrafieldCheckBox=Onay kutuları
 ExtrafieldCheckBoxFromList=Tablodan onay kutuları
 ExtrafieldLink=Bir nesneye bağlantı
 ComputedFormula=Hesaplanmış alan
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Dinamik hesaplanmış bir değer elde etmek için nesnenin diğer özelliklerini veya herhangi bir PHP kodlamasını kullanarak buraya bir formül girebilirsiniz. "?" Dahil herhangi bir PHP uyumlu formülü kullanabilirsiniz. koşul operatörü ve aşağıdaki genel nesne: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>. <br><strong>UYARI</strong>: $object öğesinin yalnızca bazı özellikleri mevcut olabilir. Yüklenmemiş bir özelliğe ihtiyacınız varsa, ikinci örnekte olduğu gibi kendinize nesneyi formülünüze getirin. <br>Hesaplanan bir alan kullanmak, arayüzden kendinize herhangi bir değer giremeyeceğiniz anlamına gelir. Ayrıca, bir sözdizimi hatası varsa, formül hiçbir şey döndürmeyebilir. <br><br>Formül örneği:<br>$object-> id <10 ? round($object->id/2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2) <br><br>Nesneyi yeniden yükleme örneği<br>(($reloadedobj = new Societe($ db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital/5: '-1'<br><br>Nesnenin ve onun üst nesnesinin yüklenmesini zorlamak için başka bir formül örneği:<br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project ) > 0))? $secondloadedobj->ref: 'Ana proje bulunamadı'
 Computedpersistent=Hesaplanan alanı sakla
-ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
+ComputedpersistentDesc=Hesaplanan fazladan alanlar veritabanında saklanacaktır, ancak değer yalnızca bu alanın nesnesi değiştirildiğinde yeniden hesaplanacaktır. Hesaplanan alan diğer nesnelere veya genel verilere bağlıysa, bu değer yanlış olabilir !!
+ExtrafieldParamHelpPassword=Bu alanı boş bırakmak, bu değerin şifreleme olmadan saklanacağı anlamına gelir (alan yalnızca ekranda yıldızla gizlenmelidir).<br>Parolayı veritabanına kaydetmek için varsayılan şifreleme kuralını kullanmak için 'otomatik'i ayarlayın (daha sonra okunan değer, hash olacaktır yalnızca, orijinal değeri almanın yolu yoktur)
+ExtrafieldParamHelpselect=Değerlerin listesi, biçim anahtarı ve değeri olan satırlar olmalıdır (burada anahtar '0' olamaz)<br><br>örneğin: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>Listenin başka bir tamamlayıcı öznitelik listesine bağlı olması için: <br>1, değer1|options_<i>parent_list_code</i>:parent_key<br>2, value2|options_<i>parent_list_code</i>:parent_key<br><br>Listenin başka bir listeye bağlı olması için:<br>1, value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=Değerler listesi, biçim anahtarı ve değeri olan satırlar olmalıdır (burada anahtar '0' olamaz)<br><br>örneğin: <br>1, değer1<br>2,değer2<br>3,değer3<br>...
+ExtrafieldParamHelpradio=Değerler listesi, biçim anahtarı ve değeri olan satırlar olmalıdır (burada anahtar '0' olamaz)<br><br>örneğin: <br>1,değer1<br>2,değer2<br>3,değer3<br>...
+ExtrafieldParamHelpsellist=Değerlerin listesi bir tablodan gelir<br>Sözdizimi: table_name: label_field: id_field :: filtersql<br>Örnek: c_typent: libelle: id :: filtersql<br><br> - id_field zorunlu olarak bir birincil int anahtarıdır<br>- filtersql bir SQL koşuludur. Sadece aktif değeri görüntülemek için basit bir test olabilir (örn. active=1)<br>Filtrede mevcut nesnenin geçerli kimliği olan $ ID $ da kullanabilirsiniz<br>Filtreye bir SELECT kullanmak için anahtar kelimeyi kullanın Enjeksiyon önleme korumasını atlamak için $SEL$.<br>dış alanlara filtre uygulamak istiyorsanız, extra.fieldcode=... sözdizimini kullanın (burada alan kodu, extrafield kodudur)<br><br> başka bir tamamlayıcı öznitelik listesine bağlı olarak liste:<br>c_typent:libelle:id:options_<i> parent_list_code</i>|parent_column: filter<br><br> Listenin başka bir listeye bağlı olması için:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Değerlerin listesi bir tablodan gelir<br>Sözdizimi: table_name: label_field: id_field :: filtersql<br>Örnek: c_typent: libelle: id :: filtersql<br><br> filtre basit bir test olabilir (ör. active=1) sadece aktif değeri görüntülemek için<br>Ayrıca filtre adı içinde $ID$ kullanabilirsiniz, geçerli nesnenin geçerli kimliğidir<br>Filtrede SELECT yapmak için, extrafields'da filtrelemek istiyorsanız $SEL$<br>kullanın sözdizimi extra.fieldcode=... (burada alan kodu extrafield kodudur)<br><br> Listenin başka bir tamamlayıcı nitelik listesine bağlı olması için:<br>c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter<br><br> Listenin başka bir listeye bağlı olması için:<br>c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelplink=Parametreler NesneAdı olmalıdır: Sınıfyolu<br>Sözdizimi:NesneAdı:Sınıfyolu ObjectName:Classpath
+ExtrafieldParamHelpSeparator=Basit bir ayırıcı için boş tut<br>Daraltılan ayırıcı için bunu 1 olarak ayarlayın (yeni oturum için varsayılan olarak açılır, ardından her kullanıcı oturumu için durum tutulur)<br>Daraltılan ayırıcı için bunu 2 olarak ayarlayın (varsayılan olarak daraltıldı yeni oturum, ardından durum her kullanıcı oturumu için tutulur)
 LibraryToBuildPDF=PDF oluşturmada kullanılan kütüphane
-LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Bazı ülkeler, her fatura satırına iki veya üç vergi uygulayabilir. Bu durumda, ikinci ve üçüncü vergi türünü ve oranını seçin. Olası türler şunlardır:<br>1: kdv'siz ürün ve hizmetlere yerel vergi uygulanır (yerel vergi, vergisiz tutara göre hesaplanır)<br>2: kdv dahil ürün ve hizmetlere yerel vergi uygulanır (yerel vergi tutar + ana vergi üzerinden hesaplanır )<br>3: kdv'siz ürünlere yerel vergi uygulanır (yerel vergi, vergisiz tutar üzerinden hesaplanır)<br>4: kdv dahil ürünlere yerel vergi uygulanır (yerel vergi tutar + ana kdv üzerinden hesaplanır)<br>5: yerel kdv'siz hizmetler için vergi uygulanır (yerel vergi, vergisiz tutar üzerinden hesaplanır)<br>6: kdv dahil hizmetlere yerel vergi uygulanır (yerel vergi tutar + vergi üzerinden hesaplanır)
 SMS=SMS
 LinkToTestClickToDial=Kullanıcı <strong>%s</strong> için ClickTodial url denemesi yapmak üzere gösterilecek bağlantıyı aramak için bir telefon numarası gir
 RefreshPhoneLink=Bağlantıyı yenile
@@ -465,7 +466,7 @@ SetAsDefault=Varsayılan olarak ayarla
 ValueOverwrittenByUserSetup=Uyarı, bu değer kullanıcıya özel kurulum ile üzerine yazılabilir (her kullanıcı kendine ait clicktodial url ayarlayabilir)
 ExternalModule=Dış modül
 InstalledInto=%s dizinine yüklendi
-BarcodeInitForThirdparties=Üçüncü partiler için toplu barkod girişi
+BarcodeInitForThirdparties=Cariler için toplu barkod girişi
 BarcodeInitForProductsOrServices=Ürünler ve hizmetler için toplu barkod başlatma ve sıfırlama
 CurrentlyNWithoutBarCode=Şu anda, bazı <strong>%s</strong> kayıtlarınızda <strong>%s</strong> %s tanımlı barkod bulunmamaktadır.
 InitEmptyBarCode=Sonraki %s boş kayıt için ilk değer
@@ -479,29 +480,29 @@ NoDetails=Sayfa altığında ilave bilgi yok
 DisplayCompanyInfo=Firma adresini göster
 DisplayCompanyManagers=Yönetici isimlerini göster
 DisplayCompanyInfoAndManagers=Firma adresini ve yönetici isimlerini göster
-EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
+EnableAndSetupModuleCron=Bu yinelenen faturanın otomatik olarak oluşturulmasını istiyorsanız, *%s* modülü etkinleştirilmeli ve doğru şekilde ayarlanmalıdır. Aksi takdirde, fatura oluşturma işlemi bu şablondan *Oluştur* düğmesi kullanılarak manuel olarak yapılmalıdır. Otomatik oluşturmayı etkinleştirmiş olsanız bile, manuel oluşturmayı yine de güvenli bir şekilde başlatabileceğinizi unutmayın. Aynı dönem için kopyaların oluşturulması mümkün değildir.
 ModuleCompanyCodeCustomerAquarium=%s ardından bir müşteri muhasebe kodu için gelen müşteri kodu
 ModuleCompanyCodeSupplierAquarium=%s ardından bir satıcı muhasebe kodu için gelen satıcı kodu
 ModuleCompanyCodePanicum=Boş bir muhasebe kodu getirir.
-ModuleCompanyCodeDigitaria=Üçüncü parti adına göre bileşik bir muhasebe kodu getirir. Kod, birinci konumda tanımlanabilen bir önek ve ardından üçüncü taraf kodunda tanımlanan karakter sayısından oluşur.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
+ModuleCompanyCodeDigitaria=Cari adına göre bileşik bir muhasebe kodu getirir. Kod, birinci konumda tanımlanabilen bir önek ve ardından cari kodunda tanımlanan karakter sayısından oluşur.
+ModuleCompanyCodeCustomerDigitaria=%s ve ardından karakter sayısı ile kesilmiş müşteri adı: Müşteri muhasebe kodu için %s.
+ModuleCompanyCodeSupplierDigitaria=%s ve ardından karakter sayısı ile kesilmiş tedarikçi adı:%s tedarikçi muhasebe kodu için.
 Use3StepsApproval=Varsayılan olarak, Tedarikçi Siparişlerinin 2 farklı kullanıcı tarafından oluşturulması ve onaylanması gerekir (bir adım/kullanıcı oluşturacak ve bir adım/kullanıcı onaylayacak. Kullanıcının hem oluşturma hem de onaylama izni varsa, bir adım/kullanıcı yeterli olacaktır). Miktar belirli bir değerin üzerindeyse bu seçenekle üçüncü bir adım/kullanıcı onayı vermeyi isteyebilirsiniz (böylece 3 adım zorunlu olacaktır: 1=doğrulama, 2=ilk onay ve 3=miktar yeterli ise ikinci onay).<br>Tek onay (2 adım) yeterli ise bunu boş olarak ayarlayın, ikinci bir onay (3 adım) her zaman gerekiyorsa çok düşük bir değere ayarlayın (0.1).
 UseDoubleApproval=Tutar (vergi öncesi) bu tutardan yüksekse 3 aşamalı bir onaylama kullanın...
-WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMail=UYARI: Uygulamadan e-posta gönderme kurulumu, varsayılan genel kurulumu kullanıyor. Giden e-postaları birkaç nedenden ötürü varsayılan kurulum yerine E-posta Hizmet Sağlayıcınızın e-posta sunucusunu kullanmak üzere ayarlamak genellikle daha iyidir:
+WarningPHPMailA=E-posta Hizmet Sağlayıcısının sunucusunu kullanmak, e-postanızın güvenilirliğini artırır, böylece SPAM olarak işaretlenmeden teslim edilebilirliği artırır.
+WarningPHPMailB=- Bazı E-posta Servis Sağlayıcıları kendi sunucularından başka bir sunucudan e-posta göndermenize izin vermez. Mevcut kurulumunuz e-posta göndermek için uygulama sunucusunu kullanıyor, e-posta sağlayıcınızın sunucusunu değil, bu nedenle bazı alıcılar (kısıtlayıcı DMARC protokolüyle uyumlu olan) e-posta sağlayıcınıza e-postanızı ve bazı e-posta sağlayıcılarını kabul edip edemeyeceklerini soracaktır. (Yahoo gibi), sunucu kendilerine ait olmadığı için "hayır" yanıtını verebilir, bu nedenle, gönderdiğiniz E-postaların çok azı teslim için kabul edilmeyebilir (e-posta sağlayıcınızın gönderme kotasına da dikkat edin).
+WarningPHPMailC=- E-posta göndermek için kendi E-posta Servis Sağlayıcınızın SMTP sunucusunu kullanmak da ilginçtir, bu nedenle uygulamadan gönderilen tüm e-postalar ayrıca posta kutunuzun "Gönderilen" dizinine kaydedilecektir.
+WarningPHPMailD='PHP Mail' yöntemi gerçekten kullanmak istediğiniz yöntemse, bu uyarıyı MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP sabitini Ana Sayfa - Kurulum - Diğer bölümünde 1'e ekleyerek kaldırabilirsiniz.
+WarningPHPMail2=E-posta SMTP sağlayıcınızın e-posta istemcisini bazı IP adresleriyle kısıtlaması gerekiyorsa (çok nadir), bu, ERP CRM uygulamanız için posta kullanıcı aracısının (MUA) IP adresidir: <strong>%s</strong>.
+WarningPHPMailSPF=Gönderen e-posta adresinizdeki alan adı bir SPF kaydı ile korunuyorsa (alan adı kayıt görevlisine sorun), alan adınızın DNS'sinin SPF kaydına şu IP'leri eklemelisiniz: <strong>%s </strong>.
 ClickToShowDescription=Açıklamayı görmek için tıkla
-DependsOn=Bu modülün gerektirdiği modül (ler)
-RequiredBy=Bu modül, modül (ler) için zorunludur
+DependsOn=Bu modülün gerektirdiği modül(ler)
+RequiredBy=Bu modül, modül(ler) için zorunludur
 TheKeyIsTheNameOfHtmlField=Bu, HTML alanının adıdır. Bir alanın anahtar adını almak için HTML sayfasının içeriğini okumada teknik bilgiye ihtiyaç vardır.
 PageUrlForDefaultValues=Sayfa URL’sinin göreceli yolunu girmelisiniz. Parametreleri URL'ye dahil ederseniz, tüm parametrelerin aynı değere ayarlanması durumunda varsayılan değerler etkili olacaktır.
-PageUrlForDefaultValuesCreate=<br>Örnek:<br>Yeni bir üçüncü parti oluşturma formu kullanacaksak bu değer <strong>%s</strong> şeklindedir.<br>Özel dizinde kurulmuş olan harici modüllerin URL'ne "custom/" eklemeyin,  yani custom/mymodule/mypage.php yerine <strong>mymodule/mypage.php</strong> gibi bir yol kullanın.<br>Url bazı parametreler içeriyorsa ve sadece varsayılan değeri istiyorsanız <strong>%s</strong> kullanabilirsiniz.
-PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesCreate=<br>Örnek:<br>Yeni bir cari oluşturma formu kullanacaksak bu değer <strong>%s</strong> şeklindedir.<br>Özel dizinde kurulmuş olan harici modüllerin URL'ne "custom/" eklemeyin,  yani custom/mymodule/mypage.php yerine <strong>mymodule/mypage.php</strong> gibi bir yol kullanın.<br>Url bazı parametreler içeriyorsa ve sadece varsayılan değeri istiyorsanız <strong>%s</strong> kullanabilirsiniz.
+PageUrlForDefaultValuesList=<br> Örnek:<br>Carileri listeleyen sayfa için, bu <strong>%s</strong>.<br>Özel dizine yüklenmiş harici modüllerin URL'si için, "custom/" custom/mymodule /mypagelist.php yerine <strong>mymodule/mypagelist.php</strong> gibi bir yol kullanın.<br>Varsayılan değeri yalnızca url'de bir parametre varsa istiyorsanız, <strong>%s</strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=Form oluşturmak için varsayılan değerlerin üzerine yazma işleminin sadece doğru bir şekilde tasarlanmış sayfalarda çalışacağını unutmayın (action=create veya presend... parametresi ile)
 EnableDefaultValues=Varsayılan değerlerin kişiselleştirilmesini etkinleştir
 EnableOverwriteTranslation=Üzerine yazılabilir çeviri kullanımını etkinleştir
@@ -516,16 +517,16 @@ FilesAttachedToEmail=Dosya ekle
 SendEmailsReminders=Gündem hatırlatıcılarını e-posta ile gönder
 davDescription=Bir WebDAV sunucusu kurun
 DAVSetup=DAV modülü kurulumu
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+DAV_ALLOW_PRIVATE_DIR=Genel özel dizini etkinleştirin ("private" adlı WebDAV'a ayrılmış dizin - oturum açma gerekli)
+DAV_ALLOW_PRIVATE_DIRTooltip=Jenerik özel dizin, uygulamanın oturum açma/şifresiyle herkesin erişebileceği bir WebDAV dizinidir.
+DAV_ALLOW_PUBLIC_DIR=Genel genel dizini etkinleştirin ("public" adlı WebDAV'a ayrılmış dizin - oturum açma gerekmez)
+DAV_ALLOW_PUBLIC_DIRTooltip=Genel genel dizin, yetkilendirme gerektirmeden (oturum açma/parola hesabı) herkesin erişebileceği (okuma ve yazma modunda) bir WebDAV dizinidir.
+DAV_ALLOW_ECM_DIR=DMS/ECM özel dizinini etkinleştirin (DMS/ECM modülünün kök dizini - oturum açma gerekli)
+DAV_ALLOW_ECM_DIRTooltip=DMS/ECM modülü kullanılırken tüm dosyaların manuel olarak yüklendiği kök dizin. Benzer şekilde, web arayüzünden erişimde olduğu gibi, erişmek için yeterli izinlere sahip geçerli bir giriş/şifreye ihtiyacınız olacaktır.
 # Modules
 Module0Name=Kullanıcılar ve Gruplar
 Module0Desc=Kullanıcı / Çalışan ve Grup Yönetimi
-Module1Name=Üçüncü Partiler
+Module1Name=Cariler
 Module1Desc=Şirket ve kişilerin yönetimi (müşteriler, adaylar)
 Module2Name=Ticaret
 Module2Desc=Ticaret yönetimi
@@ -546,7 +547,7 @@ Module40Desc=Satıcılar ve satın alma yönetimi (satınalma siparişleri ve te
 Module42Name=Hata Ayıklama Günlükleri
 Module42Desc=Günlükleme araçları (dosya, syslog, ...). Bu gibi günlükler teknik/hata ayıklama amaçları içindir.
 Module43Name=Hata Ayıklama Çubuğu
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module43Desc=Tarayıcınıza bir hata ayıklama çubuğu ekleyen geliştiriciye yönelik bir araç.
 Module49Name=Düzenleyiciler
 Module49Desc=Düzenleyici yönetimi
 Module50Name=Ürünler
@@ -562,9 +563,9 @@ Module54Desc=Sözleşmelerin yönetimi (hizmetler veya yinelenen abonelikler)
 Module55Name=Barkodlar
 Module55Desc=Barkod yönetimi
 Module56Name=Kredi transferiyle ödeme
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module56Desc=Kredi Transferi siparişleri ile tedarikçilerin ödemelerinin yönetimi. Avrupa ülkeleri için SEPA dosyası oluşturmayı içerir.
+Module57Name=Otomatik Ödeme ile Ödemeler
+Module57Desc=Otomatik Ödeme emirlerinin yönetimi. Avrupa ülkeleri için SEPA dosyası oluşturmayı içerir.
 Module58Name=TıklaAra
 Module58Desc=TıklaAra entegrasyonu
 Module60Name=Çıkartmalar
@@ -607,7 +608,7 @@ Module520Name=Krediler
 Module520Desc=Borçların yönetimi
 Module600Name=İş etkinliğine ilişkin bildirimler
 Module600Desc=Bir iş etkinliği tarafından tetiklenen e-posta bildirimleri gönderin: her kullanıcı için (her bir kullanıcı için tanımlanmış kurulum), her üçüncü parti kişisi için (her bir üçüncü parti için tanımlanmış kurulum) veya belirli e-postalara göre.
-Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
+Module600Long=Bu modülün, belirli bir iş olayı gerçekleştiğinde gerçek zamanlı olarak e-posta gönderdiğini unutmayın. Gündem etkinlikleri için e-posta hatırlatıcıları göndermek için bir özellik arıyorsanız, Ajanda modülünün kurulumuna gidin.
 Module610Name=Ürün Değişkenleri
 Module610Desc=Ürün değişkenlerinin oluşturulması (renk, ebat v.b.)
 Module700Name=Bağışlar
@@ -630,14 +631,14 @@ Module2300Name=Planlı İşler
 Module2300Desc=Zamanlanmış iş yönetimi (alias cron veya chrono tablosu)
 Module2400Name=Etkinlik/Gündem
 Module2400Desc=Etkinlikleri takip edin. İzleme amacıyla otomatik etkinlikleri günlüğe geçirin veya manuel etkinlikleri ya da toplantıları kaydedin. Bu, iyi bir Müşteri veya Tedarikçi İlişkileri Yönetimi için temel modüldür.
-Module2500Name=DMS / ECM
-Module2500Desc=Belge Yönetim Sistemi / Elektronik İçerik Yönetimi. Oluşturulan veya saklanan belgelerinizin otomatik organizasyonu. İhtiyacınız olduğunda paylaşın.
+Module2500Name=DMS/ECM
+Module2500Desc=Belge Yönetim Sistemi/Elektronik İçerik Yönetimi. Oluşturulan veya saklanan belgelerinizin otomatik organizasyonu. İhtiyacınız olduğunda paylaşın.
 Module2600Name=API/Web hizmetleri (SOAP sunucusu)
 Module2600Desc=API hizmetlerini sağlayan Dolibarr SOAP sunucusunu etkinleştir
 Module2610Name=API/Web hizmetleri (REST sunucusu)
 Module2610Desc=API hizmetlerini sağlayan Dolibarr REST sunucusunu etkinleştir
 Module2660Name=Çağrı Web hizmetleri (SOAP istemcisi)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2660Desc=Dolibarr web hizmetleri istemcisini etkinleştirin (Dış sunuculara veri/istek göndermek için kullanılabilir. Şu anda yalnızca Satın alma siparişleri desteklenmektedir.)
 Module2700Name=Gravatar
 Module2700Desc=Kullanıcıların/üyelerin fotoğrafını göstermek için çevrimiçi Gravatar hizmetini (www.gravatar.com) kullanın (e-postalarıyla bulunur). İnternet erişimi gerekiyor.
 Module2800Desc=FTP İstemcisi
@@ -646,15 +647,15 @@ Module2900Desc=GeoIP Maxmind dönüştürme becerileri
 Module3200Name=Değiştirilemez Arşivler
 Module3200Desc=Değiştirilemeyen bir iş etkinlikleri günlüğü etkinleştirin. Etkinlikler gerçek zamanlı olarak arşivlenir. Günlük, dışa aktarılabilen zincirlenmiş etkinliklerin salt okunur bir tablosudur. Bu modül bazı ülkeler için zorunlu olabilir.
 Module3400Name=Sosyal Ağlar
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module3400Desc=Sosyal Ağ alanlarını Carilere ve adreslere (skype, twitter, facebook, ...) etkinleştirin.
 Module4000Name=IK
 Module4000Desc=İnsan kaynakları yönetimi (departman, çalışan sözleşmeleri ve duygu yönetimi)
 Module5000Name=Çoklu-firma
 Module5000Desc=Birden çok firmayı yönetmenizi sağlar
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=Modüller arası İş Akışı
+Module6000Desc=Farklı modüller arasında iş akışı yönetimi (otomatik nesne oluşturma ve/veya otomatik durum değişikliği)
 Module10000Name=Websiteleri
-Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module10000Desc=Bir WYSIWYG düzenleyiciyle web siteleri oluşturun. Bu, web yöneticisi veya geliştirici odaklı bir CMS'dir (HTML ve CSS dilini bilmek daha iyidir). Web sunucunuzu (Apache, Nginx, ...) kendi alan adınızla internette çevrimiçi olması için özel Dolibarr dizinine yönlendirecek şekilde ayarlayın.
 Module20000Name=İzin İstekleri Yönetimi
 Module20000Desc=Çalışan izni isteklerini tanımlayın ve takip edin
 Module39000Name=Ürün Lotları
@@ -662,23 +663,23 @@ Module39000Desc=Ürünler için lot numarası, seri numarası, son tüketim ve s
 Module40000Name=Çoklu para birimi
 Module40000Desc=Fiyat ve belgelerde alternatif para birimlerini kullanın
 Module50000Name=PayBox
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50000Desc=Müşterilere bir PayBox çevrimiçi ödeme sayfası (kredi/banka kartları) sunun. Bu, müşterilerinizin belirli bir Dolibarr nesnesiyle (fatura, sipariş vb.) İlgili geçici ödemeler veya ödemeler yapmasına izin vermek için kullanılabilir.
 Module50100Name=POS BasitPOS
 Module50100Desc=Satış Noktası modülü BasitPOS (basit POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Satış Noktası Modülü TakePOS (mağazalar veya restoranlar için dokunmatik ekranlı POS).
 Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50200Desc=Müşterilere bir PayPal çevrimiçi ödeme sayfası (PayPal hesabı veya kredi/banka kartları) sunun. Bu, müşterilerinizin belirli bir Dolibarr nesnesiyle (fatura, sipariş vb.) İlgili geçici ödemeler veya ödemeler yapmasına izin vermek için kullanılabilir.
 Module50300Name=Stripe
-Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Desc=Müşterilere Stripe çevrimiçi ödeme sayfası (kredi/banka kartları) sunun. Bu, müşterilerinizin belirli bir Dolibarr nesnesiyle (fatura, sipariş vb.) İlgili geçici ödemeler veya ödemeler yapmasına izin vermek için kullanılabilir.
 Module50400Name=Muhasebe (çift giriş)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Muhasebe yönetimi (çift giriş, Genel ve Muavin Defterleri destekler). Defteri diğer birçok muhasebe yazılımı biçiminde dışa aktarın.
 Module54000Name=IPP Yazdır
 Module54000Desc=Cups IPP arabirimini kullanarak belgeleri açmadan doğrudan yazdırma (Yazıcının sunucudan görünür olması ve CUPS'un sunucuda yüklü olması gerekir).
 Module55000Name=Anket, Araştırma ya da Oylama
 Module55000Desc=Çevrimiçi anketler, yoklamalar veya oylamalar oluşturun (Doodle, Studs, RDVz vs. gibi)
 Module59000Name=Kar Oranları
-Module59000Desc=Module to follow margins
+Module59000Desc=Kenar boşluklarını takip etmek için modül
 Module60000Name=Komisyonlar
 Module60000Desc=Komisyon yönetimi modülü
 Module62000Name=Uluslararası Ticaret Terimleri
@@ -687,7 +688,7 @@ Module63000Name=Kaynaklar
 Module63000Desc=Etkinliklere tahsis etmek için kaynakları (yazıcılar, arabalar, odalar, ...) yönetin
 Permission11=Müşteri faturalarını oku
 Permission12=Müşteri faturaları oluştur/düzenle
-Permission13=Invalidate customer invoices
+Permission13=Müşteri faturalarını geçersiz kılın
 Permission14=Müşteri faturalarını doğrula
 Permission15=Müşteri faturalarını e-posta ile gönder
 Permission16=Müşteri fatura ödemeleri oluşturun
@@ -704,18 +705,18 @@ Permission32=Ürün oluştur/düzenle
 Permission34=Ürün sil
 Permission36=Gizli ürünleri gör/yönet
 Permission38=Ürünleri dışa aktar
-Permission39=Ignore minimum price
-Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
+Permission39=Minimum fiyatı göz ardı et
+Permission41=Projeleri ve görevleri okuyun (iletişim kurduğum paylaşılan proje ve projeler). Ayrıca, atanan görevlerde benim veya hiyerarşim için tüketilen zamanı da girebilir (Zaman Çizelgesi)
+Permission42=Projeler oluşturun/değiştirin (paylaşılan proje ve iletişim kurduğum projeler). Ayrıca görevler oluşturabilir ve kullanıcıları projeye ve görevlere atayabilir
 Permission44=Proje sil (paylaşılan proje ve iletişim kurduğum projeler)
 Permission45=Projeleri dışa aktar
 Permission61=Müdahale oku
 Permission62=Müdahale oluştur/düzenle
 Permission64=Müdahale sil
 Permission67=Müdahaleleri dışa aktar
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=Müdahaleleri e-posta ile gönderin
+Permission69=Müdahaleleri doğrulayın
+Permission70=Müdahaleleri geçersiz kılın
 Permission71=Üye oku
 Permission72=Üye oluştur/düzenle
 Permission74=Üye sil
@@ -738,7 +739,7 @@ Permission95=Rapor oku
 Permission101=Gönderilenleri oku
 Permission102=Gönderilenleri oluştur/düzenle
 Permission104=Gönderilenleri doğrula
-Permission105=Send sendings by email
+Permission105=Gönderimleri e-posta ile gönderin
 Permission106=Gönderilenleri dışa aktar
 Permission109=Gönderilenleri sil
 Permission111=Finansal tabloları oku
@@ -813,8 +814,8 @@ PermissionAdvanced253=İç/dış kullanıcı ve izinlerini oluştur/değiştir
 Permission254=Yalnızca dış kullanıcıları oluştur/değiştir
 Permission255=Diğer kullanıcıların şifrelerini değiştir
 Permission256=Diğer kullanıcıları sil ya da engelle
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Tüm Cari hesaplara ve nesnelerine erişimi genişletin (yalnızca kullanıcının satış temsilcisi olduğu carilere değil).<br>Harici kullanıcılar için etkili değildir (teklifler, siparişler, faturalar, sözleşmeler vb. İçin her zaman kendileriyle sınırlıdır).<br>Projeler için etkili değil (yalnızca proje izinleri, görünürlük ve atama konularıyla ilgili kurallar).
+Permission263=Nesneleri OLMADAN tüm Cari erişimi genişletin (yalnızca kullanıcının satış temsilcisi olduğu cariler değil).<br>Harici kullanıcılar için etkili değildir (teklifler, siparişler, faturalar, sözleşmeler vb. İçin her zaman kendileriyle sınırlıdır).<br>Projeler için etkili değildir (yalnızca proje izinleri, görünürlük ve atama konularıyla ilgili kurallar).
 Permission271=CA oku
 Permission272=Fatura oku
 Permission273=Fatura dağıt
@@ -846,11 +847,11 @@ Permission401=İndirim oku
 Permission402=İndirim oluştur/değiştir
 Permission403=İndirim doğrula
 Permission404=İndirim sil
-Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
+Permission430=Hata Ayıklama Çubuğunu Kullan
+Permission511=Maaş ödemelerini okuyun (sizinki ve elemanlarınız)
 Permission512=Maaş ödemeleri oluşturun/değiştirin
 Permission514=Maaş ödemelerini silin
-Permission517=Read payments of salaries of everybody
+Permission517=Herkesin maaş ödemelerini okuyun
 Permission519=Ücretleri çıkart
 Permission520=Borçları oku
 Permission522=Borç oluştur/değiştir
@@ -862,19 +863,19 @@ Permission532=Hizmet oluştur/değiştir
 Permission534=Hizmet sil
 Permission536=Gizli hizmetleri gör/yönet
 Permission538=Hizmetleri dışa aktar
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
+Permission561=Kredi transferiyle ödeme talimatlarını okuyun
+Permission562=Kredi transferiyle ödeme emri oluşturun/değiştirin
+Permission563=Kredi transferiyle ödeme emrini gönder/ilet
+Permission564=Borçları Kaydet/Kredi transferinin Reddi
+Permission601=Etiketleri okuyun
+Permission602=Çıkartma oluştur/değiştir
+Permission609=Çıkartmaları sil
 Permission650=Gereç Cetvelleri Oku
 Permission651=Gereç Cetvelleri Oluştur/Güncelle
 Permission652=Gereç Cetvelleri Sil
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Üretim Siparişini (MO) Okuyun
+Permission661=Üretim Siparişi Oluşturma/Güncelleme (MO)
+Permission662=Üretim Siparişini (MO) Sil
 Permission701=Bağış oluştur/değiştir
 Permission702=Bağış sil
 Permission703=Bağış sil
@@ -884,8 +885,8 @@ Permission773=Gider raporu sil
 Permission774=Bütün gider raporlarını oku (emrinde olmayanlarınkini de)
 Permission775=Gider raporu onayla
 Permission776=Ödeme gider raporu
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Herkesin gider raporlarını okuyun
+Permission778=Herkesin gider raporlarını oluşturun/değiştirin
 Permission779=Gider raporlarını dışa aktar
 Permission1001=Stok oku
 Permission1002=Depo oluştur/değiştir
@@ -896,12 +897,12 @@ Permission1101=Teslimat makbuzlarını oku
 Permission1102=Teslimat makbuzları oluştur/değiştirme
 Permission1104=Teslimat makbuzlarını doğrula
 Permission1109=Teslimat makbuzlarını sil
-Permission1121=Read supplier proposals
-Permission1122=Create/modify supplier proposals
-Permission1123=Validate supplier proposals
+Permission1121=Tedarikçi tekliflerini okuyun
+Permission1122=Tedarikçi teklifleri oluşturun/değiştirin
+Permission1123=Tedarikçi tekliflerini doğrulayın
 Permission1124=Tedarikçi tekliflerini gönder
-Permission1125=Delete supplier proposals
-Permission1126=Close supplier price requests
+Permission1125=Tedarikçi tekliflerini silin
+Permission1126=Tedarikçi fiyat taleplerini kapat
 Permission1181=Tedarikçi oku
 Permission1182=Tedarikçi siparişlerini oku
 Permission1183=Tedarikçi siparişleri oluştur/değiştir
@@ -910,9 +911,9 @@ Permission1185=Tedarikçi siparişlerini onayla
 Permission1186=Tedarikçi siparişlerini sipariş et
 Permission1187=Tedarikçi siparişlerinin onay makbuzu
 Permission1188=Tedarikçi siparişlerini sil
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Bir satın alma siparişi alımını kontrol edin/işaretini kaldırın
 Permission1190=Tedarikçi siparişlerini onayla (ikinci onay)
-Permission1191=Export supplier orders and their attributes
+Permission1191=Tedarikçi siparişlerini ve özelliklerini dışa aktarın
 Permission1201=Bir dışa aktarma sonucu al
 Permission1202=Dışa aktarma Oluştur/Değiştir
 Permission1231=Tedarikçi faturalarını oku
@@ -926,8 +927,8 @@ Permission1251=Dış verilerin veritabanına toplu olarak alınmasını çalış
 Permission1321=Müşteri faturalarını, özniteliklerini ve ödemelerini dışa aktar
 Permission1322=Ödenmiş bir faturayı yeniden aç
 Permission1421=Müşteri siparişleri ve niteliklerini dışa aktar
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=Belgeleri okuyun
+Permission1522=Belgeleri sil
 Permission2401=Kullanıcı hesabıyla bağlantılı eylemleri (olaylar veya görevler) oku (etkinliğin sahibi veya yeni atanmışsa)
 Permission2402=Kullanıcı hesabına (etkinliğin sahibi ise) bağlı eylemleri (etkinlikler veya görevler) oluştur/değiştir
 Permission2403=Kullanıcı hesabına (etkinliğin sahibi ise) bağlı işlemleri (etkinlikleri veya görevleri) sil
@@ -941,47 +942,47 @@ Permission2503=Belge gönder ya da sil
 Permission2515=Belge dizinlerini kur
 Permission2801=Okuma modunda FTP istemcisi kullan (yalnızca tara ve indir)
 Permission2802=Yazma modunda FTP istemcisi kullan (sil ya da dosya yükle)
-Permission3200=Read archived events and fingerprints
-Permission3301=Generate new modules
+Permission3200=Arşivlenmiş olayları ve parmak izlerini okuyun
+Permission3301=Yeni modüller oluşturun
 Permission4001=Çalışanları gör
 Permission4002=Çalışan oluştur
 Permission4003=Çalışan sil
 Permission4004=Çalışanları dışa aktar
-Permission10001=Read website content
-Permission10002=Create/modify website content (html and javascript content)
-Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
-Permission10005=Delete website content
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission10001=Web sitesi içeriğini okuyun
+Permission10002=Web sitesi içeriği oluşturun/değiştirin (HTML ve Javascript içeriği)
+Permission10003=Web sitesi içeriği oluşturun/değiştirin (dinamik php kodu). Tehlikeli, kısıtlı geliştiricilere ayrılmalıdır.
+Permission10005=Web sitesi içeriğini silin
+Permission20001=İzin taleplerini okuyun (izniniz ve astlarınızın izinleri)
+Permission20002=İzin isteklerinizi oluşturun/değiştirin (izinleriniz ve astlarınızın izinleri)
 Permission20003=İzin isteği sil
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20004=Tüm izin isteklerini okuyun (ast olmayan kullanıcıların bile)
+Permission20005=Herkes için izin istekleri oluşturun/değiştirin (ast olmayan kullanıcılar için bile)
 Permission20006=Yönetici izin istekleri (ayarla ve bakiye güncelle)
-Permission20007=Approve leave requests
+Permission20007=İzin isteklerini onaylayın
 Permission23001=Planlı iş oku
 Permission23002=Planlı iş oluştur/güncelle
 Permission23003=Planlı iş sil
 Permission23004=Planlı iş yürüt
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50101=Satış Noktası Kullanımı (SimplePOS)
+Permission50151=Satış Noktası Kullanımı (TakePOS)
 Permission50201=Işlemleri oku
 Permission50202=İçe aktarma işlemleri
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
-Permission50401=Bind products and invoices with accounting accounts
-Permission50411=Read operations in ledger
-Permission50412=Write/Edit operations in ledger
-Permission50414=Delete operations in ledger
-Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Export operations of the ledger
-Permission50420=Report and export reports (turnover, balance, journals, ledger)
-Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
-Permission50440=Manage chart of accounts, setup of accountancy
-Permission51001=Read assets
-Permission51002=Create/Update assets
-Permission51003=Delete assets
-Permission51005=Setup types of asset
+Permission50330=Zapier nesnelerini okuyun
+Permission50331=Zapier nesnelerini oluşturun/güncelleyin
+Permission50332=Zapier nesnelerini sil
+Permission50401=Ürünleri ve faturaları muhasebe hesaplarıyla bağlayın
+Permission50411=Defterdeki işlemleri okuyun
+Permission50412=Defterde yazma/düzenleme işlemleri
+Permission50414=Defterdeki işlemleri sil
+Permission50415=Defterdeki tüm işlemleri yıl ve yevmiye olarak sil
+Permission50418=Defterin ihracat işlemleri
+Permission50420=Rapor ve ihracat raporları (ciro, bakiye, günlükler, defterler)
+Permission50430=Mali dönemleri tanımlayın. İşlemleri doğrulayın ve mali dönemleri kapatın.
+Permission50440=Hesap planını yönetin, muhasebe kurulumu
+Permission51001=Varlıkları okuyun
+Permission51002=Varlıkları Oluşturun/Güncelleyin
+Permission51003=Varlıkları silin
+Permission51005=Varlık türlerini ayarla
 Permission54001=Yazdır
 Permission55001=Anket oku
 Permission55002=Anket oluştur/düzenle
@@ -992,26 +993,26 @@ Permission63001=Kaynak oku
 Permission63002=Kaynak oluştur/düzenle
 Permission63003=Kaynak sil
 Permission63004=Gündem etkinliklerine kaynak bağlantıla
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
-DictionaryCompanyType=Üçüncü parti türleri
-DictionaryCompanyJuridicalType=Üçüncü partilerin yasal formları
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+Permission64001=Doğrudan yazdırmaya izin ver
+Permission67000=Makbuzların yazdırılmasına izin ver
+Permission68001=Şirket içi raporu okuyun
+Permission68002=Şirket içi rapor oluştur/değiştir
+Permission68004=Topluluk içi raporu sil
+Permission941601=Makbuzları oku
+Permission941602=Makbuz oluşturma ve değiştirme
+Permission941603=Makbuzları doğrula
+Permission941604=Makbuzları e-posta ile gönderin
+Permission941605=Makbuzları dışa aktar
+Permission941606=Makbuzları sil
+DictionaryCompanyType=Cari türleri
+DictionaryCompanyJuridicalType=Carilerin yasal formları
+DictionaryProspectLevel=Şirketler için potansiyel potansiyel seviyesi
+DictionaryProspectContactLevel=Kişiler için potansiyel potansiyel seviyesi
 DictionaryCanton=İller Listesi
 DictionaryRegion=Bölgeler
 DictionaryCountry=Ülkeler
 DictionaryCurrency=Para birimleri
-DictionaryCivility=Honorific titles
+DictionaryCivility=Onursal unvanlar
 DictionaryActions=Gündem etkinlik türleri
 DictionarySocialContributions=Sosyal veya mali vergi türleri
 DictionaryVAT=KDV Oranları veya Satış Vergisi Oranları
@@ -1036,26 +1037,26 @@ DictionaryEMailTemplates=E-posta Şablonları
 DictionaryUnits=Birimler
 DictionaryMeasuringUnits=Ölçü Birimleri
 DictionarySocialNetworks=Sosyal Ağlar
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryProspectStatus=Şirketler için olasılık durumu
+DictionaryProspectContactStatus=Kişiler için olasılık durumu
 DictionaryHolidayTypes=İzin türleri
-DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryOpportunityStatus=Proje/potansiyel müşteri için potansiyel müşteri durumu
 DictionaryExpenseTaxCat=Gider raporu - Ulaşım kategorileri
 DictionaryExpenseTaxRange=Gider raporu - Ulaşım kategorisine göre menzil
-DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+DictionaryTransportMode=Intracomm raporu - Taşıma modu
+TypeOfUnit=Ünite türü
 SetupSaved=Kurulum kaydedildi
 SetupNotSaved=Kurulum kaydedilmedi
 BackToModuleList=Modül listesine dön
-BackToDictionaryList=Sözlük listesine dön
+BackToDictionaryList=Tanımlar listesine dön
 TypeOfRevenueStamp=Damga vergisi türü
 VATManagement=Satış Vergisi Yönetimi
 VATIsUsedDesc=Potansiyel müşteriler, faturalar, siparişler vb. oluştururken KDV oranı varsayılan olarak aktif standart kuralı izler:<br>Eğer satıcı taraf vergiye tabi değilse KDV oranı 0 olacaktır. Kuralın sonu.<br>Eğer satıcı ve alıcının ülkesi aynı ise (satıcı ülkesi=alıcı ülkesi), KDV oranı varsayılan olarak ürünün satıcı ülkesindeki KDV oranına eşittir. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve mallar taşımayla ilgili (taşıma, nakliye, havayolu) ürünler ise varsayılan KDV 0 olacaktır. Bu kural satıcının ülkesine bağlıdır - lütfen muhasebecinize danışın. KDV alıcı tarafından satıcıya değil, ülkesindeki gümrük idaresine ödenmelidir. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve alıcı taraf bir şirket değil ise (kayıtlı bir Topluluk içi Vergi numarasına sahip), KDV oranı varsayılan olarak satıcının ülkesinin KDV oranına eşit olacaktır. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve alıcı taraf bir şirketse (kayıtlı bir Topluluk içi Vergi numarasına sahip), KDV oranı varsayılan olarak 0 olacaktır. Kuralın sonu.<br>Bunların dışındaki durumlarda KDV oranı için önerilen varsayılan değer 0'dır. Kuralın sonu.
 VATIsNotUsedDesc=Dernekler, şahıslar veya küçük şirketler söz konusu olduğunda varsayılan olarak önerilen KDV oranı 0 olacaktır.
 VATIsUsedExampleFR=Fransa'da gerçek mali sisteme sahip şirketler veya kuruluşlar (Basitleştirilmiş gerçek veya normal gerçek) anlamına gelir. KDV'nin beyan edildiği bir sistem.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+VATIsNotUsedExampleFR=Fransa'da bu, Satış vergisi beyan edilmeyen dernekler veya mikro işletme mali sistemini seçen (franchise satış vergisi) ve herhangi bir Satış vergisi beyannamesi olmaksızın bir franchise Satış vergisi ödeyen şirketler, kuruluşlar veya serbest meslekler anlamına gelir. Bu seçim, faturalarda "Geçerli olmayan Satış vergisi - art-293B CGI" referansını gösterecektir.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Satış vergisi türü
 LTRate=Oran
 LocalTax1IsNotUsed=İkinci vergiyi kullanma
 LocalTax1IsUsedDesc=İkinci bir vergi türü kullanın (birinci dışında)
@@ -1070,18 +1071,18 @@ LocalTax2Management=Üçüncü vergi türü
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=RE Yönetimi
-LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
+LocalTax1IsUsedDescES=Potansiyel müşteriler, faturalar, siparişler vb. Oluştururken varsayılan olarak RE oranı, aktif standart kuralı takip eder:<br>Alıcı RE'ye tabi değilse, varsayılan olarak RE oranı = 0. Kural sonu.<br>Alıcı RE'ye tabi ise, varsayılan olarak RE'ye tabidir. Kuralın sonu. <br>
 LocalTax1IsNotUsedDescES=Varsayılan olarak önerilen RE 0 dır. Kural sonu.
 LocalTax1IsUsedExampleES=İspanya’da İspanyol IAE nin bazı özel bölümlerine tabi profesyoneller vardır.
 LocalTax1IsNotUsedExampleES=İspanya’da onlar uzman ile derneklerdir ve İspanyol IAE nin belirli bölümlerine tabiidir.
 LocalTax2ManagementES=IRPF Yönetimi
-LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2IsUsedDescES=Potansiyel müşteriler, faturalar, siparişler vb. Oluştururken varsayılan olarak IRPF oranı, aktif standart kuralı takip eder:<br>Satıcı IRPF'ye tabi değilse, varsayılan olarak IRPF = 0. Kural sonu.<br>Satıcı IRPF'ye tabi ise, varsayılan olarak IRPF'dir. Kuralın sonu. <br>
 LocalTax2IsNotUsedDescES=Varsayılan olarak önerilen IRPF 0. Kural sonu.
 LocalTax2IsUsedExampleES=İspanya'da, hizmet işleri yapan serbest meslek sahipleri ve bağımsız uzmanlar ile bu vergi sistemini seçen firmalardır.
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+LocalTax2IsNotUsedExampleES=İspanya'da bunlar, modüllerin vergi sistemine tabi olmayan işletmelerdir.
+RevenueStampDesc="Vergi pulu" veya "gelir pulu", fatura başına sabit bir vergidir (Fatura miktarına bağlı değildir). Yüzde vergi de olabilir, ancak ikinci veya üçüncü vergi türünü kullanmak yüzde vergiler için daha iyidir çünkü vergi pulları herhangi bir raporlama sağlamaz. Yalnızca birkaç ülke bu tür vergileri kullanır.
+UseRevenueStamp=Vergi damgası kullanın
+UseRevenueStampExample=Vergi damgasının değeri varsayılan olarak sözlük ayarlarında tanımlanır (%s - %s - %s)
 CalcLocaltax=Yerel vergi raporları
 CalcLocaltax1=Satışlar - Alışlar
 CalcLocaltax1Desc=Yerel Vergi raporları, yerel satış vergileri ile yerel alış vergileri farkı olarak hesaplanır
@@ -1089,12 +1090,12 @@ CalcLocaltax2=Alışlar
 CalcLocaltax2Desc=Yerel Vergi raporları alımların yerel vergileri toplamıdır
 CalcLocaltax3=Satışlar
 CalcLocaltax3Desc=Yerel Vergi raporları satışların yerel vergileri toplamıdır
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Vergi ayarlarına göre (Bkz. %s - %s - %s), ülkenizin bu tür bir vergi kullanmasına gerek yoktur
 LabelUsedByDefault=Hiçbir çeviri kodu bulunmuyorsa varsayılan olarak kullanılan etiket
 LabelOnDocuments=Belgeler üzerindeki etiket
 LabelOrTranslationKey=Etiket veya çeviri anahtarı
-ValueOfConstantKey=Value of a configuration constant
-ConstantIsOn=Option %s is on
+ValueOfConstantKey=Bir konfigürasyon sabitinin değeri
+ConstantIsOn=%s seçeneği açık
 NbOfDays=Gün sayısı
 AtEndOfMonth=Ay sonunda
 CurrentNext=Güncel/Sonraki
@@ -1139,7 +1140,7 @@ LoginPage=Oturum açma sayfası
 BackgroundImageLogin=Arka plan görüntüsü
 PermanentLeftSearchForm=Sol menüdeki sabit arama formu
 DefaultLanguage=Varsayılan dil
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Müşteri veya satıcı ilişkileri için çoklu dil desteğini etkinleştirin
 EnableShowLogo=Firma logosunu menüde göster
 CompanyInfo=Firma/Kuruluş
 CompanyIds=Firma/Kuruluş kimlik bilgileri
@@ -1150,11 +1151,11 @@ CompanyTown=İlçesi
 CompanyCountry=Ülkesi
 CompanyCurrency=Ana para birimi
 CompanyObject=Firmanın amacı
-IDCountry=ID country
+IDCountry=Ülke kimliği
 Logo=Logo
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
+LogoDesc=Şirketin ana logosu. PDF belgelerde kullanılacaktır
 LogoSquarred=Logo (kare)
-LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+LogoSquarredDesc=Kare şeklinde bir simge olmalıdır (genişlik = yükseklik). Bu logo, sık kullanılan simge olarak veya üst menü çubuğu gibi diğer ihtiyaçlar olarak kullanılacaktır (ekran kurulumunda devre dışı bırakılmamışsa).
 DoNotSuggestPaymentMode=Önerme
 NoActiveBankAccountDefined=Tanımlı etkin banka hesabı yok
 OwnerOfBankAccount=Banka hesabı sahibi %s
@@ -1179,13 +1180,13 @@ Delays_MAIN_DELAY_MEMBERS=Gecikmiş üyelik ücreti
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Yapılmayan çek ödemesi
 Delays_MAIN_DELAY_EXPENSEREPORTS=Onaylanacak gider raporu
 Delays_MAIN_DELAY_HOLIDAYS=Onaylanacak izin istekleri
-SetupDescription1=Dolibarr yazılımını kullanmaya başlamadan önce bazı başlangıç parametreleri tanımlanmalı, gerekli modüller etkinleştirilip/yapılandırılmalıdır. 
+SetupDescription1=Dolibarr yazılımını kullanmaya başlamadan önce bazı başlangıç parametreleri tanımlanmalı, gerekli modüller etkinleştirilip/yapılandırılmalıdır.
 SetupDescription2=Aşağıdaki iki bölümün kurulumu zorunludur (Ayarlar menüsündeki ilk iki kayıt)
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription3=<a href="%s">%s -> %s</a><br><br> Uygulamanızın varsayılan davranışını özelleştirmek için kullanılan temel parametreler (ör. ülkeyle ilgili özellikler için).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Bu yazılım birçok modül/uygulama paketidir. Gereksinimlerinizle ilgili modüller etkinleştirilmeli ve yapılandırılmalıdır. Bu modüllerin etkinleştirilmesiyle menü girişleri görünecektir.
 SetupDescription5=Ayarlar menüsündeki diğer girişler isteğe bağlı parametreleri yönetmenizi sağlar.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
+AuditedSecurityEvents=Denetlenen güvenlik olayları
+NoSecurityEventsAreAduited=Hiçbir güvenlik olayı denetlenmez. Bunları %s menüsünden etkinleştirebilirsiniz
 Audit=Denetim
 InfoDolibarr=Dolibarr Bilgileri
 InfoBrowser=Tarayıcı Bilgileri
@@ -1194,7 +1195,7 @@ InfoWebServer=Web Sunucusu Bilgileri
 InfoDatabase=Veritabanı Bilgileri
 InfoPHP=PHP Bilgileri
 InfoPerf=Performans Bilgileri
-InfoSecurity=About Security
+InfoSecurity=Güvenlik Hakkında
 BrowserName=Tarayıcı adı
 BrowserOS=Tarayıcı OS
 ListOfSecurityEvents=Dolibarr güvenlik etkinlikleri listesi
@@ -1210,8 +1211,8 @@ DisplayDesc=Dolibarr'ın görünümünü ve davranışını etkileyen parametrel
 AvailableModules=Mevcut uygulamalar/modüller
 ToActivateModule=Modülleri etkinleştirmek için, ayarlar alanına gidin (Giriş->Ayarlar>Modüller).
 SessionTimeOut=Oturum için zaman aşımı
-SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+SessionExplanation=Bu sayı, oturum temizleyici Dahili PHP oturum temizleyicisi tarafından yapılırsa (ve başka hiçbir şey yapılmazsa), oturumun bu gecikmeden önce asla sona ermeyeceğini garanti eder. Dahili PHP oturum temizleyicisi, oturumun bu gecikmeden sonra sona ereceğini garanti etmez. Bu gecikmeden sonra ve oturum temizleyici çalıştırıldığında süresi sona erecektir, bu nedenle her <b>%s /%s </b> erişimi, ancak yalnızca diğer oturumlar tarafından yapılan erişim sırasında (değer 0 ise, oturum yalnızca harici bir işlem tarafından yapılır).<br>Not: harici oturum temizleme mekanizmasına sahip bazı sunucularda (cron under debian, ubuntu ...), oturumlar harici bir kurulumla tanımlanan bir süre sonunda yok edilebilir, hayır buraya girilen değer ne olursa olsun.
+SessionsPurgedByExternalSystem=Bu sunucudaki oturumlar, muhtemelen her <b>%s </b> saniyede bir (= <b> session.gc_maxlifetime </b> parametresinin değeri) harici bir mekanizma (debian ve ubuntu altında cron) tarafından temizleniyor gibi görünüyor ), yani buradaki değeri değiştirmenin hiçbir etkisi yoktur. Sunucu yöneticisinden oturum gecikmesini değiştirmesini istemelisiniz.
 TriggersAvailable=Mevcut tetikleyiciler
 TriggersDesc=Tetikleyiciler, <b>htdocs/core/triggers</b> dizinine kopyalandığında Dolibarr iş akışının davranışını değiştirecek dosyalardır. Bu dosyalar, Dolibarr etkinliklerinde aktifleştirilmiş yeni eylemler (yeni firma oluşturma, fatura doğrulama, ...) gerçekleştirir.
 TriggerDisabledByName=Bu dosyadaki tetikleyiciler adlarındaki <b>-NORUN</b> soneki tarafından devre dışı bırakılır.
@@ -1235,7 +1236,7 @@ NoEventOrNoAuditSetup=Hiçbir güvenlik etkinliği kaydedilmedi. Eğer "Ayarlar
 NoEventFoundWithCriteria=Bu arama kriterleri için hiçbir güvenlik etkinliği bulunamadı
 SeeLocalSendMailSetup=Yerel postagönder kurulumunuza bakın
 BackupDesc=Bir Dolibarr kurulumunun <b>komple</b> yedeklenmesi iki adım gerektirir.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc2=Yüklenen ve oluşturulan tüm dosyaları içeren "belgeler" dizininin (<b>%s</b>) içeriğini yedekleyin. Bu aynı zamanda 1. Adımda oluşturulan tüm döküm dosyalarını da içerecektir. Bu işlem birkaç dakika sürebilir.
 BackupDesc3=Veri tabanınızın yapısını ve içeriğini (<b>%s</b>) bir döküm dosyasına yedekleyin.  Bunun için aşağıdaki asistanı kullanabilirsiniz.
 BackupDescX=Arşivlenen dizin güvenli bir yerde saklanmalıdır.
 BackupDescY=Üretilen bilgi döküm dosyası güvenli bir yerde korunmalıdır.
@@ -1245,15 +1246,16 @@ RestoreDesc2="documents" dizininin yedekleme dosyasını (örneğin zip dosyası
 RestoreDesc3=Yedeklenmiş bir döküm dosyasındaki veritabanı yapısını ve verileri, yeni Dolibarr kurulumunun veri tabanına veya mevcut olan bu kurulumun veri tabanına (<b>%s</b>) geri yükleyin. Uyarı: Geri yükleme tamamlandıktan sonra tekrar giriş yapabilmek için yedeklenmiş kurulumdaki mevcut olan bir kullanıcı adı/parola kullanmalısınız.<br>Yedeklenmiş veri tabanını mevcut olan bu kuruluma geri yüklemek için bu asistanı takip edebilirsiniz.
 RestoreMySQL=MySQL içeaktar
 ForcedToByAModule=Bu kural bir aktif modül tarafından <b>s</b> ye zorlanır
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Bu değer sistem tarafından zorunlu kılınmaktadır. Onu değiştiremezsin.
 PreviousDumpFiles=Mevcut yedekleme dosyaları
-PreviousArchiveFiles=Existing archive files
+PreviousArchiveFiles=Mevcut arşiv dosyaları
 WeekStartOnDay=Haftanın ilk günü
 RunningUpdateProcessMayBeRequired=Yükseltme işlemini gerçekleştirmek gerekli gibi görünüyor (%s olan program sürümü %s olan Veri tabanı sürümünden farklı görünüyor)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Bu komutu <b>%s</b> kullanıcısı ile bir kabuğa giriş yaptıktan sonra komut satırından çalıştırabilir ya da parolayı <b>%s</b> elde etmek için komut satırının sonuna –W seçeneğini ekleyebilirsiniz.
 YourPHPDoesNotHaveSSLSupport=SSL fonksiyonları PHP nizde mevcut değildir
 DownloadMoreSkins=Daha fazla kaplama indirin
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefModelDesc=Referans numarasını% yyyyaa-nnnn biçiminde döndürür; burada yy yıl, aa ay ve nnnn sıfırlama olmadan sıralı otomatik artan bir sayıdır
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Adreslerle profesyonel kimliği göster
 ShowVATIntaInAddress=Adreslerde Vergi numarasını gizle
 TranslationUncomplete=Kısmi çeviri
@@ -1271,29 +1273,29 @@ MAIN_PROXY_HOST=Proxy sunucusu: Ad/Adres
 MAIN_PROXY_PORT=Proxy sunucusu: Bağlantı noktası
 MAIN_PROXY_USER=Proxy sunucusu: Oturum açma/Kullanıcı
 MAIN_PROXY_PASS=Proxy sunucusu: Şifre
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=%s için eklenmesi gereken tüm ek özellikleri tanımlayın
 ExtraFields=Tamamlayıcı öznitelikler
 ExtraFieldsLines=Tamamlayıcı öznitelikler (satırlar)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsLinesRec=Tamamlayıcı özellikler (şablon fatura satırları)
 ExtraFieldsSupplierOrdersLines=Tamamlayıcı öznitelikler (sipariş satırları)
 ExtraFieldsSupplierInvoicesLines=Tamamlayıcı öznitelikler (fatura satırları)
-ExtraFieldsThirdParties=Tamamlayıcı nitelikler (üçüncü taraf)
+ExtraFieldsThirdParties=Tamamlayıcı nitelikler (cari)
 ExtraFieldsContacts=Tamamlayıcı nitelikler (kişi/adres)
 ExtraFieldsMember=Tamamlayıcı öznitelikler (üye)
 ExtraFieldsMemberType=Tamamlayıcı öznitelikler (üye türü)
 ExtraFieldsCustomerInvoices=Tamamlayıcı öznitelikler (faturalar)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsCustomerInvoicesRec=Tamamlayıcı özellikler (şablon faturalar)
 ExtraFieldsSupplierOrders=Tamamlayıcı öznitelikler (siparişler)
 ExtraFieldsSupplierInvoices=Tamamlayıcı öznitelikler (faturalar)
 ExtraFieldsProject=Tamamlayıcı öznitelikler (projeler)
 ExtraFieldsProjectTask=Tamamlayıcı öznitelikler (görevler)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=Tamamlayıcı özellikler (maaşlar)
 ExtraFieldHasWrongValue=Öznitelik %s için hatalı değer.
 AlphaNumOnlyLowerCharsAndNoSpace=yalnızca boşluksuz olarak alfasayısal ve küçük harfli karakterler
 SendmailOptionNotComplete=Uyarı: Bazı Linux sistemlerinde, e-posta adresinizden mail göndermek için sendmail yürütme kurulumu -ba seçeneğini içermelidir (php.ini dosyanızın içindeki parameter mail.force_extra_parameters). Eğer bazı alıcılar hiç e-posta alamazsa, bu PHP parametresini mail.force_extra_parameters = -ba ile düzenlemeye çalışın.
 PathToDocuments=Belgelerin yolu
 PathDirectory=Dizin
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+SendmailOptionMayHurtBuggedMTA="Doğrudan PHP postası" yöntemini kullanarak postaları gönderme özelliği, bazı posta sunucuları tarafından doğru şekilde ayrıştırılamayan bir posta iletisi oluşturur. Sonuç, bazı postaların bu dinleme platformları tarafından barındırılan kişiler tarafından okunamamasıdır. Bu, bazı İnternet sağlayıcıları için geçerlidir.  Bu Dolibarr veya PHP ile değil, alıcı posta sunucusuyla ilgili bir problemdir. Bununla birlikte, bunu önlemek için Dolibarr'ı değiştirmek için Kurulum - Diğer'de MAIN_FIX_FOR_BUGGED_MTA seçeneğini 1'e ekleyebilirsiniz. Ancak, kesinlikle SMTP standardını kullanan diğer sunucularla sorunlar yaşayabilirsiniz. Diğer çözüm (önerilen), hiçbir dezavantajı olmayan "SMTP soket kitaplığı" yöntemini kullanmaktır.
 TranslationSetup=Çeviri ayarları
 TranslationKeySearch=Çeviri anahtarı veya dizesi ara
 TranslationOverwriteKey=Çeviri dizesinin üzerine yaz
@@ -1306,35 +1308,35 @@ WarningAtLeastKeyOrTranslationRequired=En azından anahtar veya çeviri dizesi i
 NewTranslationStringToShow=Gösterilecek yeni çeviri dizesi
 OriginalValueWas=Orijinal çevirinin üzerine yazılır. Orijinal değerler şu şekildeydi: <br><br>%s
 TransKeyWithoutOriginalValue=Herhangi bir dil dosyasında mevcut olmayan '<strong>%s</strong>' çeviri anahtarı için yeni bir çeviri zorlaması gerçekleştirdiniz.
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Aktif modüller
+TotalNumberOfActivatedModules=Etkin modüller: <b>%s</b>/<b>%s</b>
 YouMustEnableOneModule=Enaz 1 modül etkinleştirmelisiniz
-ClassNotFoundIntoPathWarning=Class %s PHP yolunda bulunamadı
+ClassNotFoundIntoPathWarning=%s sınıfı PHP yolunda bulunamadı
 YesInSummer=Yazın evet
 OnlyFollowingModulesAreOpenedToExternalUsers=Not: İzinler verildiği takdirde yalnızca şu modüller dış kullanıcılar tarafından kullanılabilir (bu tür kullanıcıların izinleri ne olursa olsun):<br>
 SuhosinSessionEncrypt=Oturum depolaması Suhosin tarafından şifrelendi
 ConditionIsCurrently=Koşul şu anda %s durumunda
 YouUseBestDriver=Kullandığınız %s sürücüsü şu anda mevcut olan en iyi sürücüdür.
 YouDoNotUseBestDriver=%s sürücüsünü kullanıyorsunuz fakat %s sürücüsü önerilir.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=Veritabanında yalnızca %s %s var. Bu, herhangi bir özel optimizasyon gerektirmez.
 SearchOptim=Optimizasyon ara
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptim=Veritabanında %s %s var. %s sabitini Giriş-Ayarlar-Diğer ayarlar'da 1'e ekleyebilirsiniz. Aramayı, veritabanının dizinleri kullanmasını mümkün kılan dizelerin başlangıcıyla sınırlandırın ve anında yanıt almalısınız.
+YouHaveXObjectAndSearchOptimOn=Veritabanında %s %s var ve Giriş-Ayarlar-Diğer ayarlar'da %s sabiti 1 olarak ayarlandı.
 BrowserIsOK=%s web tarayıcısını kullanıyorsunuz. Bu tarayıcı güvenlik ve performans açısından uygundur.
-BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
-AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
-AskForPreferredShippingMethod=Üçüncü Partiler için tercih edilen gönderme yöntemini isteyin.
+BrowserIsKO=%s web tarayıcısını kullanıyorsunuz. Bu tarayıcının güvenlik, performans ve güvenilirlik açısından kötü bir seçim olduğu bilinmektedir. Firefox, Chrome, Opera veya Safari kullanmanızı öneririz.
+PHPModuleLoaded=%s PHP bileşeni yüklendi
+PreloadOPCode=Önceden yüklenmiş OPCode kullanılır
+AddRefInList=Müşteri/Satıcı referans bilgi listesi ve hiperlinklerin çoğu.<br>Cariler "Şirket adımız A.Ş." yerine "CC12345 - SC45678 - Şirket adımız A.Ş." şeklinde görünecektir.
+AddAdressInList=Müşteri/Satıcı adres bilgisi listesini görüntüleyin <br>Cariler, "Şirket adımız A.Ş." yerine "Şirket adımız A.Ş. - Esentepe Cad. Mecidiyeköy - İstanbul - Türkiye" şeklinde görünecektir.
+AddEmailPhoneTownInContactList=İletişim e-postasını (veya tanımlanmamışsa telefonları) ve şehir bilgi listesini görüntüleyin <br>Kişiler "Ali Koç - ali.koc@email.com - Istanbul" veya "Ali Koç - ad biçiminde görünecektir.
+AskForPreferredShippingMethod=Cariler için tercih edilen gönderme yöntemini isteyin.
 FieldEdition=%s Alanının düzenlenmesi
 FillThisOnlyIfRequired=Örnek: +2 (saat dilimi farkını yalnız zaman farkı sorunları yaşıyorsanız kullanın)
 GetBarCode=Barkovizyon al
-NumberingModules=Numbering models
-DocumentModules=Document models
+NumberingModules=Numaralandırma modelleri
+DocumentModules=Belge modelleri
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Dahili Dolibarr algoritmasına göre oluşturulmuş bir parola döndür: paylaşılan sayılar ve küçük harfli karakterler içeren %s karakter.
 PasswordGenerationNone=Oluşturulan bir parola önerme. Parola manuel olarak yazılmalıdır.
 PasswordGenerationPerso=Kişisel tanımlanmış yapılandırmanıza göre bir parola girin.
 SetupPerso=Yapılandırmanıza göre
@@ -1344,9 +1346,9 @@ RuleForGeneratedPasswords=Parola oluşturma ve doğrulama kuralları
 DisableForgetPasswordLinkOnLogonPage=Oturum açma sayfasında “Parolanızı mı unuttunuz?” bağlantısını gösterme
 UsersSetup=Kullanıcılar modülü kurulumu
 UserMailRequired=Yeni bir kullanıcı oluşturmak için e-posta gerekli
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Etkin olmayan kullanıcıları tüm kullanıcı listelerinden gizleyin (Önerilmez: Bu, bazı sayfalarda eski kullanıcıları filtreleyemeyeceğiniz veya bunlarda arama yapamayacağınız anlamına gelebilir)
+UsersDocModules=Kullanıcı kaydından oluşturulan belgeler için belge şablonları
+GroupsDocModules=Grup kaydından oluşturulan belgeler için belge şablonları
 ##### HRM setup #####
 HRMSetup=İK modülü ayarları
 ##### Company setup #####
@@ -1355,10 +1357,10 @@ CompanyCodeChecker=Müşteri/tedarikçi kodlarının otomatik olarak üretilmesi
 AccountCodeManager=Müşteri/tedarikçi muhasebe kodlarının otomatik olarak üretilmesi için seçenekler
 NotificationsDesc=Bazı Dolibar etkinlikleri için e-posta bildirimleri otomatik olarak gönderilebilir. <br>Bildirimlerin alıcıları şu şekilde tanımlanabilir:
 NotificationsDescUser=* kullanıcı başına, her seferde bir kullanıcı.
-NotificationsDescContact=* üçüncü parti kişisi başına (müşteri veya tedarikçiler), her seferinde bir üçüncü parti kişisi.
+NotificationsDescContact=* cari kişisi başına (müşteri veya tedarikçiler), her seferinde bir cari kişisi.
 NotificationsDescGlobal=* veya bu kurulum sayfasında genel e-posta adreslerini ayarlayarak.
 ModelModules=Belge Şablonları
-DocumentModelOdt=OpenDocument şablonlarından belgeler oluşturun (LibreOffice, OpenOffice, KOffice, TextEdit,.... yazılımlarından ODT / .ODS dosyaları)
+DocumentModelOdt=OpenDocument şablonlarından belgeler oluşturun (LibreOffice, OpenOffice, KOffice, TextEdit,.... yazılımlarından ODT/.ODS dosyaları)
 WatermarkOnDraft=Taslak belge üzerinde filigran
 JSOnPaimentBill=Ödeme formunda ödeme satırlarını otomatik doldurma özelliğini etkinleştir
 CompanyIdProfChecker=Profesyonel Kimlikler için Kurallar
@@ -1367,7 +1369,7 @@ MustBeMandatory=Üçüncü parti oluşturmak için zorunlu mu (Vergi numarası v
 MustBeInvoiceMandatory=Faturaları doğrulamak zorunludur ?
 TechnicalServicesProvided=Sağlanan teknik hizmetler
 #####DAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDAVSetupDesc=Bu, WebDAV dizinine erişim bağlantısıdır. URL'yi bilen herhangi bir kullanıcıya açık bir "genel" dizin (genel dizin erişimine izin veriliyorsa) ve erişim için mevcut bir oturum açma hesabına/parolasına ihtiyaç duyan "özel" bir dizin içerir.
 WebDavServer=%s sunucusunun kök URL'si: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>%s</b> biçimine göndermek için gerekli bağlantıyı aşağıdaki bağlantıdan bulabilirsiniz:%s
@@ -1390,7 +1392,7 @@ SupplierPaymentSetup=Tedarikçi ödemesi ayarları
 PropalSetup=Teklif modülü kurulumu
 ProposalsNumberingModules=Teklif numaralandırma modülü
 ProposalsPDFModules=Teklif belge modelleri
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Teklifte tanımlanmamışsa varsayılan olarak teklifte önerilen ödemeler modu
 FreeLegalTextOnProposal=Teklifler üzerinde serbest metin
 WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste
@@ -1403,9 +1405,9 @@ WatermarkOnDraftSupplierProposal=Taslak tedarikçiden fiyat istekleri üzerinde
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Fiyat isteği için hedef banka hesabı iste
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Sipariş için Kaynak Depo iste
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Satın alma siparişinin banka hesabı hedefini isteyin
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Siparişte tanımlanmamışsa, varsayılan olarak satış siparişinde önerilen ödemeler modu
 OrdersSetup=Müşteri Siparişleri yönetim ayarları
 OrdersNumberingModules=Sipariş numaralandırma modülü
 OrdersModelModule=Sipariş belgesi modelleri
@@ -1433,7 +1435,7 @@ AdherentMailRequired=Yeni bir üye oluşturmak için e-posta gereklidir
 MemberSendInformationByMailByDefault=Üyelere onay epostası (doğrulama ya da yeni abonelik) göndermek için onay kutusu varsayılan olarak açıktır
 VisitorCanChooseItsPaymentMode=Ziyaretçi kişi mevcut ödeme türlerinden birini seçebilir
 MEMBER_REMINDER_EMAIL=Süresi dolmuş abonelikler için <b>mail yoluyla</b> otomatik hatırlatıcıyı etkinleştir. Not: Hatırlatıcıyı gönderebilmek için <strong>%s</strong> modülü etkinleştirilmiş ve doğru bir şekilde yapılandırılmış olmalıdır.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Üye kaydından oluşturulan belgeler için belge şablonları
 ##### LDAP setup #####
 LDAPSetup=LDAP Kurulumu
 LDAPGlobalParameters=Genel parametreler
@@ -1451,7 +1453,7 @@ LDAPSynchronizeUsers=LDAP ta kullanıcılarını organizasyonu
 LDAPSynchronizeGroups=LDAp ta grupların düzenlenmesi
 LDAPSynchronizeContacts=LDAP ta kişilerin organizasyonu
 LDAPSynchronizeMembers=LDAP ta dernek üyelerinin organizasyonu
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPSynchronizeMembersTypes=LDAP'de vakıf üye türlerinin organizasyonu
 LDAPPrimaryServer=Birincil sunucu
 LDAPSecondaryServer=İkincil sunucu
 LDAPServerPort=Sunucusu bağlantı noktası
@@ -1483,8 +1485,8 @@ LDAPMemberDn=Dolibarr üyelerinin DN si
 LDAPMemberDnExample=Komple DN (örn: ou = üye, dc = toplum, DC = com)
 LDAPMemberObjectClassList=ObjectClass Listesi
 LDAPMemberObjectClassListExample=Active Directory için objectClass tanımlayarak kayıt öznitelikler listesi (örn: InetOrgPerson, üst veya üst, kullanıcı)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeDn=Dolibarr üyeleri DN türleri
+LDAPMemberTypepDnExample=Tam DN (ör: ou=üye türleri, dc=örnek, dc=com)
 LDAPMemberTypeObjectClassList=ObjectClass Listesi
 LDAPMemberTypeObjectClassListExample=ObjectClass tanımlayarak kayıt özellikleri (örn: üst, groupOfUniqueNames) listesi
 LDAPUserObjectClassList=ObjectClass Listesi
@@ -1502,11 +1504,11 @@ LDAPTestSynchroMemberType=Test üyesi türü senkronizasyonu
 LDAPTestSearch= LDAP arama testi
 LDAPSynchroOK=Senkronizasyon testi başarılı
 LDAPSynchroKO=Başarısız senkronizasyon testi
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPSynchroKOMayBePermissions=Başarısız senkronizasyon testi. Sunucuyla olan bağlantının doğru şekilde yapılandırıldığını ve LDAP güncellemelerine izin verdiğini kontrol edin
 LDAPTCPConnectOK=LDAP sunucusu için TCP bağlantı başarılı (Sunucu =%s, Port =%s)
 LDAPTCPConnectKO=LDAP sunucusuna TCP bağlantısı başarısız (Server =%s başarısız, Port =% s)
-LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=LDAP sunucusuna bağlanma/kimlik doğrulama başarılı (Sunucu=%s, Bağlantı Noktası=%s, Yönetici=%s, Parola=%s)
+LDAPBindKO=LDAP sunucusuna bağlanma/kimlik doğrulama başarısız oldu (Sunucu=%s, Bağlantı Noktası=%s, Yönetici=%s, Parola=%s)
 LDAPSetupForVersion3=LDAP sunucusu sürüm 3 için yapılandırılmış
 LDAPSetupForVersion2=LDAP sunucusu sürüm 2 için yapılandırılmış
 LDAPDolibarrMapping=Dolibarr Eşleme
@@ -1515,7 +1517,7 @@ LDAPFieldLoginUnix=Oturum aç (Unix)
 LDAPFieldLoginExample=Örnek: uid
 LDAPFilterConnection=Arama süzgeçi
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=Örnek: &(objectClass = groupOfUsers)
 LDAPFieldLoginSamba=Oturum aç (samba, activedirectory)
 LDAPFieldLoginSambaExample=Örnek: samaccountname
 LDAPFieldFullname=Tam Adı
@@ -1559,43 +1561,43 @@ LDAPFieldSidExample=Örnek: objectsid
 LDAPFieldEndLastSubscription=Abonelik tarihi sonu
 LDAPFieldTitle=İş pozisyonu
 LDAPFieldTitleExample=Örnek: unvan
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPFieldGroupid=Grup kimliği
+LDAPFieldGroupidExample=Örnek: gknumarası
+LDAPFieldUserid=Kullanıcı kimliği
+LDAPFieldUseridExample=Örnek: kknumarası
+LDAPFieldHomedirectory=Ana dizin
+LDAPFieldHomedirectoryExample=Örnek: ana dizin
+LDAPFieldHomedirectoryprefix=Giriş dizini öneki
 LDAPSetupNotComplete=LDAP kurulumu tamamlanmamış (diğer sekmelere git)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Hiçbir yönetici veya parola verilmiştir. LDAP erişimi anonim ve salt okunur modunda olacaktır.
 LDAPDescContact=Bu sayfa Dolibarr kişileri üzerinde bulunan her bir veri için LDAP ağacındaki LDAP öznitelikleri adını tanımlamanızı sağlar.
 LDAPDescUsers=Bu sayfa Dolibarr kullanıcıları üzerinde bulunan her bir veri için LDAP ağacındaki LDAP öznitelikleri adını tanımlamanızı sağlar.
 LDAPDescGroups=Bu sayfa Dolibarr grupları üzerinde bulunan her bir veri için LDAP ağacındaki LDAP öznitelikleri adını tanımlamanızı sağlar.
 LDAPDescMembers=Bu sayfa Dolibarr üyeleri üzerinde bulunan her bir veri için LDAP ağacındaki LDAP öznitelikleri adını tanımlamanızı sağlar.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescMembersTypes=Bu sayfa, Dolibarr üye türlerinde bulunan her veri için LDAP ağacında LDAP özniteliklerinin adını tanımlamanıza olanak tanır.
 LDAPDescValues=Örnek değerler aşağıdaki yüklü şemalarla <b> OpenLDAP </ b> için tasarlanmıştır: <b> core.schema, cosine.schema, inetorgperson.schema </ b>). Eğer o değerleri ve OpenLDAP kullanıyorsanız, LDAP yapılandırma dosyasını <b> slapd.conf </ b> tüm o yüklü şemaları alacak şekilde değiştirmelisiniz.
 ForANonAnonymousAccess=Bir kimlik doğrulamalı giriş için (örneğin bir yazma girişi)
 PerfDolibarr=Performans ayar/optimizasyon raporu
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+YouMayFindPerfAdviceHere=Bu sayfa, performansla ilgili bazı kontroller veya tavsiyeler sağlar.
+NotInstalled=Yüklü değil.
+NotSlowedDownByThis=Bununla yavaşlamaz.
+NotRiskOfLeakWithThis=Bununla sızıntı riski yok.
 ApplicativeCache=\t\nUygulamalı önbellek
 MemcachedNotAvailable=Uygulanabilir önbellek bulunamadı. Performansı Memcached önbellek sunucusu ve bu önbellek sunucusunu kullanabilecek bir modül kurarak arttırabilirsiniz.<br>Daha fazla bilgiyi buradan <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>bulabilirsiniz. Bu tür önbellek sunucusunu çok fazla web barındırıcısının sağlamadığını unutmayın.
 MemcachedModuleAvailableButNotSetup=Uygulamalı önbellek için memcached modülü bulundu ama modülün kurulumu tamamlanmamış.
 MemcachedAvailableAndSetup=Memcached modülü etkinleştirilmiş memcached sunucusunu kullanmak içindir.
 OPCodeCache=OPCode önbelleği
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+NoOPCodeCacheFound=OPCode önbelleği bulunamadı. Belki XCache veya eAccelerator (iyi) dışında bir OPCode önbelleği kullanıyorsunuz veya belki de OPCode önbelleğiniz yok (çok kötü).
 HTTPCacheStaticResources=Statik kaynaklar (css, img, javascript) için HTTP önbelleği
 FilesOfTypeCached=%s türündeki dosyalar HTTP sunucusu tarafından önbelleğe alınır
 FilesOfTypeNotCached=%s türündeki dosyalar HTTP sunucusu tarafından önbelleğe alınmaz
 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 example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByServerDesc=Örneğin Apache yönergesi "ExpiresByType image/gif A2592000" kullanılarak
 CacheByClient=Tarayıcı önbelleği
 CompressionOfResources=HTTP yanıtlarının sıkıştırılması
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+CompressionOfResourcesDesc=Örneğin Apache yönergesi "AddOutputFilterByType DEFLATE" kullanılarak
 TestNotPossibleWithCurrentBrowsers=Böyle bir otomatik algılama mevcut tarayıcılar için olası değildir
 DefaultValuesDesc=Burada, yeni bir kayıt oluştururken kullanmak istediğiniz varsayılan değeri ve/veya kayıtlarınızı listelediğinizde varsayılan filtreleme veya sıralama düzenini tanımlayabilirsiniz.
 DefaultCreateForm=Varsayılan değerler (formlarda kullanmak için)
@@ -1609,13 +1611,13 @@ ServiceSetup=Hizmetler modülü kurulumu
 ProductServiceSetup=Ürünler ve Hizmetler modüllerinin kurulumu
 NumberOfProductShowInSelect=Aşağı açılan seçim listelerinde gösterilecek maksimum ürün sayısı (0=limit yok)
 ViewProductDescInFormAbility=Ürün açıklamalarını formlarda göster (aksi takdirde araç ipucu penceresinde gösterilir)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
+DoNotAddProductDescAtAddLines=Formlara ekleme satırlarına ürün açıklaması eklemeyin (ürün kartından)
+OnProductSelectAddProductDesc=Bir belgenin satırı olarak bir ürün eklerken ürünlerin açıklaması nasıl kullanılır
+AutoFillFormFieldBeforeSubmit=Açıklama giriş alanını otomatik olarak ürün açıklamasıyla doldurun
+DoNotAutofillButAutoConcat=Giriş alanını ürün açıklamasıyla otomatik olarak doldurmayın. Ürün açıklaması, girilen açıklamaya otomatik olarak eklenecektir.
+DoNotUseDescriptionOfProdut=Ürün açıklaması asla belge satırlarının açıklamasına dahil edilmeyecektir
 MergePropalProductCard=Eğer ürün/hizmet teklifte varsa Ekli Dosyalar sekmesinde ürün/hizmet seçeneğini etkinleştirin, böylece ürün PDF belgesini PDF azur teklifine birleştirirsiniz
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ViewProductDescInThirdpartyLanguageAbility=Ürün açıklamalarını cari dilinde (aksi takdirde kullanıcının dilinde) formlarda görüntüleyin
 UseSearchToSelectProductTooltip=Ayrıca çok fazla sayıda ürüne sahipseniz (>100.000), Ayarlar->Diğer Ayarlar menüsünden PRODUCT_DONOTSEARCH_ANYWHERE sabitini 1 olarak ayarlayarak hızı arttırabilirsiniz. Bu durumda, arama dizenin başlangıcıyla sınırlı olacaktır.
 UseSearchToSelectProduct=Aşağı açılır listeden ürün içeriği listelemeden önce bir tuşa basarak arama yapmanızı bekler (Çok sayıda ürününüz varsa bu performansı artırabilir, fakat daha az kullanışlıdır)
 SetDefaultBarcodeTypeProducts=Ürünler için kullanılacak varsayılan barkod türü
@@ -1632,10 +1634,10 @@ SyslogLevel=Düzey
 SyslogFilename=Dosya adı ve yolu
 YouCanUseDOL_DATA_ROOT=Dolibarr’daki “belgeler” dizinindeki bir log (günlük) dosyası için DOL_DATA_ROOT/dolibarr.log u kullanabilirsiniz. Bu dosyayı saklamak için farklı bir yol (path) kullanabilirsiniz.
 ErrorUnknownSyslogConstant=%s Değişmezi bilinen bir Syslog değişmezi değildir
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
-CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Number of backup logs to keep
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+OnlyWindowsLOG_USER=Windows'ta yalnızca LOG_USER tesisi desteklenecektir
+CompressSyslogs=Hata ayıklama günlük dosyalarının sıkıştırılması ve yedeklenmesi (hata ayıklama için günlüğü modülü tarafından oluşturulur)
+SyslogFileNumberOfSaves=Saklanacak yedek günlük sayısı
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Günlük yedekleme sıklığını ayarlamak için temizlik programlı işini yapılandırın
 ##### Donations #####
 DonationsSetup=Bağış modülü kurulumu
 DonationsReceiptModel=Bağış makbuzu şablonu
@@ -1678,7 +1680,7 @@ SendingsSetup=Sevkiyat modülü ayarları
 SendingsReceiptModel=Makbuz gönderme modeli
 SendingsNumberingModules=Gönderi numaralandırma modülü
 SendingsAbility=Müşteri teslimatlarında sevkiyat tablolarını destekler
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=Çoğu durumda, gönderi formları hem müşteri teslimatları (gönderilecek ürünlerin listesi) hem de müşteri tarafından alınan ve imzalanan sayfalar olarak kullanılır. Bu nedenle, ürün teslimatı fişi yinelenen bir özelliktir ve nadiren etkinleştirilir.
 FreeLegalTextOnShippings=Sevkiyatlarda serbest metin
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Ürün teslimat fişlerinde numaralandırma modülü
@@ -1690,24 +1692,24 @@ AdvancedEditor=Gelişmiş editör
 ActivateFCKeditor=Gelişmiş düzenleyiciyi şunun için etkinleştir:
 FCKeditorForCompany=Öğe açıklamaları ve notları için WYSIWIG oluşturma/düzenleme (ürünler/hizmetler hariç)
 FCKeditorForProduct=Ürünlerin/hizmetlerin açıklamaları ve notlar için WYSIWIG oluşturma/düzenleme
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForProductDetails=Tüm varlıklar (teklifler, siparişler, faturalar, vb.) İçin ürün ayrıntı satırlarının WYSIWIG oluşturulması/baskısı. <span class = "warning"> Uyarı: Bu durumda bu seçeneğin kullanılması, PDF dosyalarını oluştururken özel karakterler ve sayfa biçimlendirmeyle ilgili sorunlar yaratabileceğinden, kesinlikle önerilmez. </span>
 FCKeditorForMailing= Toplu e-postalar için WYSIWIG oluşturma/düzenleme (Araçlar->E-postalamalar)
 FCKeditorForUserSignature=Kullanıcı imzasının WYSIWIG olarak oluşturulması/düzenlenmesi
 FCKeditorForMail=Tüm mailler için WYSIWIG oluşturma/düzenleme (Araçlar->E-postalamalar hariç)
 FCKeditorForTicket=Destek bildirimleri için WYSIWIG oluşturma/düzenleme
 ##### Stock #####
 StockSetup=Stok modülü kurulumu
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+IfYouUsePointOfSaleCheckModule=Varsayılan olarak sağlanan Satış Noktası modülünü (POS) veya harici bir modülü kullanırsanız, bu kurulum POS modülünüz tarafından göz ardı edilebilir. Çoğu POS modülü, varsayılan olarak, hemen bir fatura oluşturmak ve buradaki seçeneklerden bağımsız olarak stoğu azaltmak için tasarlanmıştır. Bu nedenle, POS'unuzdan satış kaydederken bir stok düşüşüne ihtiyacınız varsa veya olmamak istiyorsanız, POS modülü kurulumunuzu da kontrol edin.
 ##### Menu #####
 MenuDeleted=Menü silindi
-Menu=Menu
+Menu=Menü
 Menus=Menüler
 TreeMenuPersonalized=Kişiselleştirilmiş menüler
 NotTopTreeMenuPersonalized=Özelleştirilmiş menüler bir üst menüye bağlantılı değildir
 NewMenu=Yeni menü
 MenuHandler=Menü işleyicisi
 MenuModule=Kaynak modül
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=Yetkisiz menüleri dahili kullanıcılar için de gizleyin (aksi takdirde gri renklidir)
 DetailId=Kimlik menüsü
 DetailMenuHandler=Yeni menü göstermek için menü işleyicisi
 DetailMenuModule=Eğer menü girişi bir modülden geliyorsa modül adı
@@ -1730,10 +1732,10 @@ TaxSetup=Vergiler, sosyal ya da mali vergiler ve kar payları modül ayarları
 OptionVatMode=KDV nedeniyle
 OptionVATDefault=Standart temel
 OptionVATDebitOption=Tahakkuk temelli
-OptionVatDefaultDesc=KDV nin gerçekleşmesi: <br> - malların tesliminde (fatura tarihine göre) <br> - hizmet ödemelerinde
-OptionVatDebitOptionDesc=KDV nin gerçeklşmesi: <br> - malların teslimi (fatura tarihine göre) <br> - hizmetler için faturada (borç)
-OptionPaymentForProductAndServices=Cash basis for products and services
-OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+OptionVatDefaultDesc=KDV nin gerçekleşmesi:<br>- malların tesliminde (fatura tarihine göre)<br>- hizmet ödemelerinde
+OptionVatDebitOptionDesc=KDV nin gerçeklşmesi:<br>- malların teslimi (fatura tarihine göre)<br>- hizmetler için faturada (borç)
+OptionPaymentForProductAndServices=Ürün ve hizmetler için nakit temeli
+OptionPaymentForProductAndServicesDesc=KDV'nin ödenmesi gereken tarih: <br>- mallar için ödenen <br>- hizmetler için ödemeler
 SummaryOfVatExigibilityUsedByDefault=Seçilen seçeneğe göre varsayılan olarak KDV uygunluk süresi:
 OnDelivery=Teslimatta
 OnPayment=Ödemede
@@ -1747,47 +1749,47 @@ YourCompanyDoesNotUseVAT=Firmanız KDV kullanmayacak şekilde tanımlanmış (Gi
 AccountancyCode=Muhasebe Kodu
 AccountancyCodeSell=Satış hesap. kodu
 AccountancyCodeBuy=Alış hesap. kodu
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Yeni bir vergi oluştururken "Ödemeyi otomatik olarak oluştur" onay kutusunu varsayılan olarak boş bırakın
 ##### Agenda #####
 AgendaSetup=Etkinlik ve gündem modülü kurulumu
 PasswordTogetVCalExport=Dışa aktarma bağlantısını yetkilendirme anahtarı
-SecurityKey = Security Key
+SecurityKey = Güvenlik anahtarı
 PastDelayVCalExport=Bundan daha eski etkinliği dışa aktarma
 AGENDA_USE_EVENT_TYPE=Etkinlik türleri kullanın (Ayarlar -> Sözlükler -> Gündem etkinlik türleri menüsünden yönetilir)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_USE_EVENT_TYPE_DEFAULT=Olay oluşturma formundaki olay türü için varsayılan değeri otomatik olarak ayarlayın
+AGENDA_DEFAULT_FILTER_TYPE=Ajanda görünümünün arama filtresinde bu tür etkinlikleri otomatik olarak ayarlayın
+AGENDA_DEFAULT_FILTER_STATUS=Ajanda görünümünün arama filtresindeki etkinlikler için bu durumu otomatik olarak ayarla
+AGENDA_DEFAULT_VIEW=Ajanda menüsünü seçerken varsayılan olarak hangi görünümü açmak istiyorsunuz?
+AGENDA_REMINDER_BROWSER=Etkinlik hatırlatıcıyı <b> kullanıcının tarayıcısında </b> etkinleştirin (Hatırlatma tarihine ulaşıldığında, tarayıcı tarafından bir açılır pencere gösterilir. Her kullanıcı, bu tür bildirimleri kendi tarayıcı bildirim ayarlarından devre dışı bırakabilir).
 AGENDA_REMINDER_BROWSER_SOUND=Sesli bildirimi etkinleştir
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Etkinlik hatırlatıcıyı <b> e-postalarla </b> etkinleştirin (hatırlatma seçeneği/gecikme her olayda tanımlanabilir).
+AGENDA_REMINDER_EMAIL_NOTE=Not:%s görevinin sıklığı, hatırlatmanın doğru zamanda gönderildiğinden emin olmak için yeterli olmalıdır.
 AGENDA_SHOW_LINKED_OBJECT=Bağlantılı nesneyi gündem görünümünde göster
 ##### Clicktodial #####
 ClickToDialSetup=TıklaAra modülü kurulumu
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialUrlDesc=Telefon picto tıklandığında URL aranır. URL’de, aranacak kişinin telefon numarasıyla değiştirilecek<br><b>__PHONETO__</b> etiketleri kullanabilirsiniz<br><b>__PHONEFROM__</b> bu aramanın telefon numarasıyla değiştirilir kişi (sizinki)<br><b>__LOGIN__</b> tuşla arama ile değiştirilecek (kullanıcı kartında tanımlı)<br><b>__PASS__</b> tıklama-çevirme şifresiyle değiştirilecek (kullanıcıda tanımlı kartı).
+ClickToDialDesc=Bu modül, bir masaüstü bilgisayar kullanırken telefon numaralarını tıklanabilir bağlantılara dönüştürür. Bir tıklama numarayı arayacaktır. Bu, masaüstünüzde yazılım telefonu kullanırken veya SIP protokolüne dayalı bir CTI sistemi kullanırken telefon görüşmesini başlatmak için kullanılabilir. Not: Akıllı telefon kullanırken telefon numaraları her zaman tıklanabilir.
 ClickToDialUseTelLink=Telefon numaraları üzerinde yalnızca bir "tel:" linki kullan
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Kullanıcılarınızın tarayıcıyla aynı bilgisayarda bir yazılım telefonu veya yazılım arayüzü kuruluysa ve tarayıcınızda "tel:" ile başlayan bir bağlantıya tıkladığınızda arandığında bu yöntemi kullanın. Tam bir sunucu çözümüne ihtiyacınız varsa (yerel yazılım kurulumuna gerek yoktur), bunu "Hayır" olarak ayarlamanız ve sonraki alanı doldurmanız gerekir.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Satış Noktası
 CashDeskSetup=Satış Noktası modülü kurulumu
-CashDeskThirdPartyForSell=Satışlar için kullanılacak varsayılan genel üçüncü parti
+CashDeskThirdPartyForSell=Satışlar için kullanılacak varsayılan genel cari
 CashDeskBankAccountForSell=Nakit ödemeleri almak için kullanılan varsayılan hesap
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCheque=Çekle ödeme almak için kullanılacak varsayılan hesap
 CashDeskBankAccountForCB=Nakit ödemeleri kredi kartıyla almak için kullanılan varsayılan hesap
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskBankAccountForSumup=SumUp ile ödeme almak için kullanılacak varsayılan banka hesabı
+CashDeskDoNotDecreaseStock=Satış Noktasından satış yapıldığında stok düşüşünü devre dışı bırakın ("hayır" ise, stok modülündeki opsiyon setine bakılmaksızın POS'tan yapılan her satış için stok azalması yapılır).
 CashDeskIdWareHouse=Depoyu stok azaltmada kullanmak için zorla ve sınırla
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
-CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+StockDecreaseForPointOfSaleDisabled=Satış Noktasından stok düşüşü devre dışı bırakıldı
+StockDecreaseForPointOfSaleDisabledbyBatch=POS'taki stok düşüşü Seri/Lot yönetimi modülü ile uyumlu değildir (şu anda aktif) bu nedenle stok düşüşü devre dışı bırakılmıştır.
+CashDeskYouDidNotDisableStockDecease=Satış Noktasından satış yaparken stok düşüşünü devre dışı bırakmadınız. Bu nedenle bir depo gereklidir.
+CashDeskForceDecreaseStockLabel=Toplu ürünler için stok azalması zorlandı.
+CashDeskForceDecreaseStockDesc=Önce en eski yemek kadar azaltın ve tarihlere göre satış yapın.
+CashDeskReaderKeyCodeForEnter=Barkod okuyucusunda tanımlanan "Enter" anahtar kodu (Örnek: 13)
 ##### Bookmark #####
 BookmarkSetup=Yerimi modülü kurulumu
-BookmarkDesc=Bu modül yer imlerini yönetmenize olanak sağlar. Ayrıca, sol taraftaki menünüzde herhangi bir Dolibarr sayfasına veya harici web sitelerine kısayollar ekleyebilirsiniz.
+BookmarkDesc=Bu modül yer imlerini yönetmenize imkan sağlar. Ayrıca, sol taraftaki menünüzde herhangi bir Dolibarr sayfasına veya harici web sitelerine kısayollar ekleyebilirsiniz.
 NbOfBoomarkToShow=Sol menüde gösterilecek ençok yerimi sayısı
 ##### WebServices #####
 WebServicesSetup=WebHizmetleri modülü kurulumu
@@ -1801,7 +1803,7 @@ ApiProductionMode=Üretim modunu etkinleştirin (bu hizmetlerin yönetimi için
 ApiExporerIs=API'ları URL'de keşfedebilir ve test edebilirsiniz.
 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.
+WarningAPIExplorerDisabled=API gezgini devre dışı bırakıldı. API hizmetlerini sağlamak için API gezgini gerekli değildir. Geliştiricinin REST API'lerini bulması/test etmesi için bir araçtır. Bu araca ihtiyacınız varsa, etkinleştirmek için API REST modülünün kurulumuna gidin.
 ##### Bank #####
 BankSetupModule=Banka modülü kurulumu
 FreeLegalTextOnChequeReceipts=Çek makbuzlarının üzerindeki serbest metin
@@ -1816,13 +1818,13 @@ MultiCompanySetup=Çoklu firma modülü kurulumu
 ##### Suppliers #####
 SuppliersSetup=Tedarikçi modülü ayarları
 SuppliersCommandModel=Satınalma Siparişinin tam şablonu
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
+SuppliersCommandModelMuscadet=Satın Alma Siparişinin eksiksiz şablonu (cornas şablonunun eski uygulaması)
 SuppliersInvoiceModel=Satıcı Faturasının tam şablonu
 SuppliersInvoiceNumberingModel=Tedarikçi faturaları numaralandırma modelleri
-IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+IfSetToYesDontForgetPermission=f boş olmayan bir değere ayarlanırsa, ikinci onay için izin verilen gruplara veya kullanıcılara izinler vermeyi unutmayın
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modülü kurulumu
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+PathToGeoIPMaxmindCountryDataFile=Maxmind ip'den ülkeye çeviriyi içeren dosya yolu.<br>Örnekler: <br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Ülkenizin ip veri dosyasının PHP nizin okuyabileceği bir dizin içinde olmasına dikkat edin (PHP nizin ope_basdir kurulumunu ve filesystem izinlerini denetleyin)
 YouCanDownloadFreeDatFileTo=Maxmind GeoIP ülke dosyasının bir <b> ücretsiz demo sürümünü </ b> %s konumundan indirebilirsiniz.
 YouCanDownloadAdvancedDatFileTo=Ayrıca Maxmind GeoIP ülke dosyasına daha çok dosyayı %s konumundan  indirebilirsiniz, <b>güncellemeleri ile birlikte tam sürümünü,<b>
@@ -1854,26 +1856,26 @@ NoAmbiCaracAutoGeneration=Otomatik oluşturma için belirsiz karakter ("1","l","
 SalariesSetup=Ücret modülü kurulumu
 SortOrder=Sıralama düzeni
 Format=Biçim
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0: Müşteri ödeme türü, 1:Satıcı ödeme türü, 2:Hem müşteriler hem de tedarikçiler ödeme türü
 IncludePath=Yolu içerir (%s değişlende tanımlanır)
 ExpenseReportsSetup=Gider Raporları modülü kurulumu
 TemplatePDFExpenseReports=Gider raporu belgesi oluşturmak için belge şablonları
 ExpenseReportsRulesSetup=Gider Raporları modülü kurulumu - Kurallar
 ExpenseReportNumberingModules=Gider raporları numaralandırma modülü
 NoModueToManageStockIncrease=Otomatik stok arttırılması yapabilecek hiçbir modül etkinleştirilmemiş. Stok arttırılması yalnızca elle girişle yapılacaktır.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
+YouMayFindNotificationsFeaturesIntoModuleNotification="Bildirim" modülünü etkinleştirip yapılandırarak e-posta bildirimleri için seçenekler bulabilirsiniz.
+ListOfNotificationsPerUser=Kullanıcı başına otomatik bildirimlerin listesi *
+ListOfNotificationsPerUserOrContact=Kullanıcı başına * veya kişi başına ** mevcut olan olası otomatik bildirimlerin listesi (iş etkinliğinde)
+ListOfFixedNotifications=Otomatik sabit bildirimlerin listesi
 GoOntoUserCardToAddMore=Kullanıcılar için bildirim eklemek veya silmek için kullanıcının "Bildirimler" sekmesine gidin
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Kişiler/adresler için bildirim eklemek veya kaldırmak üzere carinin "Bildirimler" sekmesine gidin
 Threshold=Sınır
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
+BackupDumpWizard=Veritabanı döküm dosyasını oluşturma sihirbazı
+BackupZipWizard=Belgeler dizini arşivini oluşturma sihirbazı
 SomethingMakeInstallFromWebNotPossible=Web arayüzünden dış modül kurulumu aşağıdaki nedenden ötürü olanaksızdır:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+SomethingMakeInstallFromWebNotPossible2=Bu nedenle, burada açıklanan yükseltme işlemi, yalnızca ayrıcalıklı bir kullanıcının gerçekleştirebileceği manuel bir işlemdir.
 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.
-ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMustContainCustom=Uygulamadan harici bir modül kurmak veya oluşturmak, modül dosyalarını <strong>%s</strong> dizinine kaydetmelidir. Bu dizinin Dolibarr tarafından işlenmesi için, <strong>conf/conf.php</strong> dosyanızı 2 yönerge satırını ekleyecek şekilde ayarlamalısınız: <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt ='%s/özel';</strong>
 HighlightLinesOnMouseHover=Tablo satırlarını fare üzerine geldiğinde vurgula
 HighlightLinesColor=Fare üzerinden geçerken satırı vurgulama rengi (vurgulama rengi istemiyorsanız 'ffffff' kullanın)
 HighlightLinesChecked=Bir satır işaretlendiğinde bu satırı vurgulama rengi (vurgulama rengi istemiyorsanız 'ffffff' kullanın)
@@ -1887,21 +1889,21 @@ TopMenuDisableImages=Üst menüdeki görüntüleri gizle
 LeftMenuBackgroundColor=Sol menü için arka plan rengi
 BackgroundTableTitleColor=Tablo satırı başlığı için arka plan rengi
 BackgroundTableTitleTextColor=Tablo satırı başlığı için metin rengi
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=Tablo başlığı bağlantı satırı için metin rengi
 BackgroundTableLineOddColor=Tabloda tek satırlar için arka plan rengi
 BackgroundTableLineEvenColor=Tabloda çift satırlar için arka plan rengi
 MinimumNoticePeriod=Enaz bildirim süresi (İzin isteğiniz bu süreden önce yapılmalı)
 NbAddedAutomatically=Her ay (otomatik olarak) bu kullanıcının sayacına eklenen gün sayısı 
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
-Enter0or1=Enter 0 or 1
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+EnterAnyCode=Bu alan, çizgiyi tanımlamak için bir referans içerir. Seçtiğiniz herhangi bir değeri, ancak özel karakterler olmadan girin.
+Enter0or1=0 veya 1 girin
+UnicodeCurrency=Buraya parantezlerin arasına para birimi sembolünü temsil eden bayt numaralarının listesini girin. Örneğin: $ için [36] girin - Türk Lirası TL [84,76] - € için [8364] girin
 ColorFormat=RGB rengi HEX formatındadır, örn: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Dolibarr biçimindeki simge adı (mevcut tema dizinindeyse 'image.png', bir modülün /img/ dizinindeyse 'image.png@nom_du_module')
 PositionIntoComboList=Satırın kombo listesindeki konumu
 SellTaxRate=Satış vergisi oranı
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
-OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
+RecuperableOnly=Evet, Fransa'daki bazı eyaletler için adanmış "Algılanmayan Ama Geri Kazanılır" KDV için. Diğer tüm durumlarda değeri "Hayır" olarak tutun.
+UrlTrackingDesc=Sağlayıcı veya nakliye hizmeti, gönderilerinizin durumunu kontrol etmek için bir sayfa veya web sitesi sunuyorsa, buraya girebilirsiniz. Sistemin, kullanıcının gönderi kartına girdiği takip numarası ile değiştirmesi için URL parametrelerinde {TRACKID} anahtarını kullanabilirsiniz.
+OpportunityPercent=Bir müşteri adayı oluşturduğunuzda, tahmini bir proje/müşteri adayı miktarı tanımlayacaksınız. Potansiyel müşterinin durumuna göre, tüm potansiyel müşterilerinizin oluşturabileceği toplam miktarı değerlendirmek için bu miktar bu oranla çarpılabilir. Değer bir yüzdedir (0 ile 100 arasında).
 TemplateForElement=Bu şablon kaydının ayrıldığı öğe
 TypeOfTemplate=Şablon türü
 TemplateIsVisibleByOwnerOnly=Şablon yalnızca sahibi tarafından görülebilir
@@ -1911,8 +1913,8 @@ FixTZ=Saat Dilimi Farkı
 FillFixTZOnlyIfRequired=Örnek: +2 (yalnızca sorun yaşanmışsa doldurun)
 ExpectedChecksum=Beklenen Sağlama
 CurrentChecksum=Geçerli Sağlama
-ExpectedSize=Expected size
-CurrentSize=Current size
+ExpectedSize=Beklenen boyut
+CurrentSize=Şu anki boyutu
 ForcedConstants=Gerekli sabit değerler
 MailToSendProposal=Müşteri teklifleri
 MailToSendOrder=Müşteri siparişleri
@@ -1923,8 +1925,8 @@ MailToSendSupplierRequestForQuotation=Teklif talebi
 MailToSendSupplierOrder=Tedarikçi siparişleri
 MailToSendSupplierInvoice=Tedarikçi faturaları
 MailToSendContract=Sözleşmeler
-MailToSendReception=Receptions
-MailToThirdparty=Üçüncü partiler
+MailToSendReception=Resepsiyonlar
+MailToThirdparty=Cariler
 MailToMember=Üyeler
 MailToUser=Kullanıcılar
 MailToProject=Projeler
@@ -1934,19 +1936,19 @@ YouUseLastStableVersion=En son kararlı sürümü kullanıyorsunuz
 TitleExampleForMajorRelease=Bu ana sürümü duyurmak için kullanabileceğiniz mesaj örneği (web sitenizde rahatça kullanabilirsiniz)
 TitleExampleForMaintenanceRelease=Bu bakım sürümü duyurmak için kullanabileceğiniz mesaj örneği (web sitenizde rahatça kullanabilirsiniz)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s kullanıma hazır. Versiyon %s, hem kullanıcılar hem de geliştiriciler için bir çok yeni özelliğe sahip majör bir sürümdür. Bu sürümü https://www.dolibarr.org portalının indirme alanından indirebilirsiniz (alt dizin Kararlı sürümler). Değişikliklerin tam listesini <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> bölümünde inceleyebilirsiniz.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s mevcuttur. %s sürümü bir bakım sürümüdür, bu nedenle yalnızca hata düzeltmelerini içerir. Tüm kullanıcıların bu sürüme yükseltmelerini tavsiye ederiz. Bir bakım sürümü, veritabanına yeni özellikler veya değişiklikler getirmez. Https://www.dolibarr.org portalının (alt dizin Stable sürümleri) indirme alanından indirebilirsiniz. Değişikliklerin tam listesi için <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog</a>’u okuyabilirsiniz.
+MultiPriceRuleDesc="Ürün/hizmet başına birkaç fiyat düzeyi" seçeneği etkinleştirildiğinde, her ürün için farklı fiyatlar (fiyat düzeyi başına bir) tanımlayabilirsiniz. Size zaman kazandırmak için, ilk seviyenin fiyatına dayalı olarak her seviye için bir fiyatı otomatik hesaplamak üzere buraya bir kural girebilirsiniz, böylece her ürün için yalnızca ilk seviye için bir fiyat girmeniz gerekecektir. Bu sayfa size zaman kazandırmak için tasarlanmıştır, ancak yalnızca her seviye için fiyatlarınız birinci seviyeye göre ise kullanışlıdır. Çoğu durumda bu sayfayı göz ardı edebilirsiniz.
 ModelModulesProduct=Ürün belgeleri için şablonlar
-WarehouseModelModules=Templates for documents of warehouses
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+WarehouseModelModules=Depo belgeleri için şablonlar
+ToGenerateCodeDefineAutomaticRuleFirst=Kodları otomatik olarak oluşturabilmek için, önce barkod numarasını otomatik olarak tanımlayan bir yönetici tanımlamalısınız.
 SeeSubstitutionVars=Olası yedek değişkenlerin lstesi için * notuna bakın
 SeeChangeLog=ChangeLog dosyasına bakın (sadece ingilizce)
 AllPublishers=Bütün yayıncılar
 UnknownPublishers=Bilinmeyen yayıncılar
 AddRemoveTabs=Sekme ekle ya da sil
 AddDataTables=Nesne tabloları ekle
-AddDictionaries=Sözlük tabloları ekleyin
-AddData=Nesne veya sözlük verileri ekle
+AddDictionaries=Tanım tabloları ekleyin
+AddData=Nesne veya tanım verileri ekle
 AddBoxes=Ekran etiketi ekle
 AddSheduledJobs=Planlı görev ekle
 AddHooks=Kanca ekle
@@ -1959,78 +1961,78 @@ AddOtherPagesOrServices=Başka sayfa ya da hizmet ekle
 AddModels=belge ya da numaralandırma şablonu ekle
 AddSubstitutions=Yedek anahtar ekle
 DetectionNotPossible=Algılama olası değil
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+UrlToGetKeyToUseAPIs=API'yi kullanmak için jeton alınacak URL (jeton alındığında, veritabanı kullanıcı tablosuna kaydedilir ve her API çağrısında sağlanmalıdır)
 ListOfAvailableAPIs=Mevcut API listesi
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+activateModuleDependNotSatisfied="%s" modülü eksik olan "%s" modülüne bağlıdır, bu nedenle "%1$s" modülü düzgün çalışmayabilir. Herhangi bir sürprizden korunmak istiyorsanız lütfen "%2$s" modülünü yükleyin veya "%1$s" modülünü devre dışı bırakın
+CommandIsNotInsideAllowedCommands=Çalıştırmaya çalıştığınız komut, <strong>conf.php</strong> dosyasındaki <strong>$dolibarr_main_restrict_os_commands</strong> parametresinde tanımlanan izin verilen komutlar listesinde değil.
 LandingPage=Açılış sayfası
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
+SamePriceAlsoForSharedCompanies="Tek fiyat" seçeneğiyle çok şirketli bir modül kullanıyorsanız, ürünler ortamlar arasında paylaşılıyorsa fiyat tüm şirketler için aynı olacaktır.
+ModuleEnabledAdminMustCheckRights=Modül etkinleştirildi. Etkinleştirilen modüllerin izinleri yalnızca yönetici kullanıcılara verildi. Gerekirse diğer kullanıcılara veya gruplara manuel olarak izin vermeniz gerekebilir.
 UserHasNoPermissions=Bu kullanıcının tanımlanmış bir izni yok
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
+TypeCdr=Ödeme süresi tarihi faturanın tarihi artı gün cinsinden bir delta ise "Hiçbiri" seçeneğini kullanın (delta, "%s" alanıdır)<br>Deltadan sonra tarihin şu değere yükseltilmesi gerekiyorsa "Ay sonunda" seçeneğini kullanın ayın sonuna ulaşın (+ gün olarak isteğe bağlı "%s")<br>Ödeme vade tarihinin deltadan sonraki ayın ilk N'si olması için "Geçerli/Sonraki" seçeneğini kullanın (delta "%s" alanıdır, N şu şekildedir: "%s" alanına kaydedilir)
 BaseCurrency=Firmanın referans para birimi (bunu değiştirmek için firmanın ayarlarına gidin)
 WarningNoteModuleInvoiceForFrenchLaw=Bu modul %s Fransız yasalarına uygun (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+WarningNoteModulePOSForFrenchLaw=Bu %s modülü Fransız yasalarına (Loi Finance 2016) uygundur çünkü Geri Döndürülebilir Olmayan Günlükler modülü otomatik olarak etkinleştirilir.
+WarningInstallationMayBecomeNotCompliantWithLaw=Harici bir modül olan %s modülünü kurmaya çalışıyorsunuz. Harici bir modülün etkinleştirilmesi, o modülün yayıncısına güvendiğiniz ve bu modülün uygulamanızın davranışını olumsuz yönde etkilemeyeceğinden ve ülkenizin yasalarına (%s) uygun olduğundan emin olduğunuz anlamına gelir. Modül yasadışı bir özellik ortaya koyarsa, yasadışı yazılımın kullanımından sorumlu olursunuz.
 MAIN_PDF_MARGIN_LEFT=PDF'deki sol boşluk
 MAIN_PDF_MARGIN_RIGHT=PDF'deki sağ boşluk
 MAIN_PDF_MARGIN_TOP=PDF'deki üst boşluk
 MAIN_PDF_MARGIN_BOTTOM=PDF'deki alt kenar boşluğu
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=PDF'deki logo için yükseklik
 NothingToSetup=Bu modül için gerekli özel bir kurulum yok.
 SetToYesIfGroupIsComputationOfOtherGroups=Eğer bu grup diğer grupların bir hesaplaması ise bunu evet olarak ayarlayın
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Önceki alan Evet olarak ayarlanmışsa hesaplama kuralını girin. <br> Örneğin: <br> CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Birçok dil varyantı bulundu
 RemoveSpecialChars=Özel karakterleri kaldır
-COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+COMPANY_AQUARIUM_CLEAN_REGEX=Değeri temizlemek için normal ifade filtresi (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Değeri temizlemek için normal ifade filtresi (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Yinelemeye izin verilmiyor
 GDPRContact=Veri Koruma Görevlisi (DPO, Veri Gizliliği veya GDPR kişisi)
 GDPRContactDesc=Avrupalı şirketler veya vatandaşlar hakkında veri depoluyorsanız Genel Veri Koruma Yönetmeliği'nden (GDPR) sorumlu kişiyi burada adlandırabilirsiniz
 HelpOnTooltip=Araç ipucunda gösterilecek yardım metni
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
+HelpOnTooltipDesc=Bu alan bir formda göründüğünde metnin bir araç ipucunda gösterilmesi için buraya metin veya çeviri anahtarı koyun
+YouCanDeleteFileOnServerWith=Bu dosyayı sunucudaki Komut Satırı ile silebilirsiniz: <br>%s
+ChartLoaded=Hesap planı yüklendi
 SocialNetworkSetup=Sosyal Ağlar modülünün kurulumu
 EnableFeatureFor=<strong>%s</strong> için özellikleri etkinleştir
-VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
+VATIsUsedIsOff=Not: KDV kullanma seçeneği %s - %s menüsünde <strong> Kapalı </strong> olarak ayarlandı, bu nedenle kullanılan KDV, satışlar için her zaman 0 olacaktır.
 SwapSenderAndRecipientOnPDF=PDF üzerindeki gönderen ve alıcı adreslerinin yerini birbiriyle değiştir
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
-MaxEmailCollectPerCollect=Max number of emails collected per collect
+FeatureSupportedOnTextFieldsOnly=Uyarı, özellik yalnızca metin alanlarında ve birleşik listelerde desteklenir. Ayrıca bir URL parametresi action=create veya action=edit ayarlanmalıdır VEYA sayfa adı bu özelliği tetiklemek için 'new.php' ile bitmelidir.
+EmailCollector=E-posta toplayıcı
+EmailCollectorDescription=Düzenli olarak e-posta kutularını taramak (IMAP protokolünü kullanarak) ve uygulamanıza alınan e-postaları doğru yerde kaydetmek ve/veya bazı kayıtları otomatik olarak (potansiyel müşteriler gibi) oluşturmak için planlanmış bir iş ve bir kurulum sayfası ekleyin.
+NewEmailCollector=Yeni E-posta Toplayıcı
+EMailHost=E-posta IMAP sunucusu ana bilgisayarı
+MailboxSourceDirectory=Posta kutusu kaynak dizini
+MailboxTargetDirectory=Posta kutusu hedef dizini
+EmailcollectorOperations=Toplayıcı tarafından yapılacak işlemler
+EmailcollectorOperationsDesc=İşlemler yukarıdan aşağıya doğru yapılır
+MaxEmailCollectPerCollect=Toplama başına toplanan maksimum e-posta sayısı
 CollectNow=Şimdi topla
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
+ConfirmCloneEmailCollector=E-posta toplayıcısını %s klonlamak istediğinizden emin misiniz?
+DateLastCollectResult=En son deneme toplama tarihi
+DateLastcollectResultOk=En son başarılı toplama tarihi
 LastResult=En son sonuç
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
+EmailCollectorConfirmCollectTitle=E-posta toplama onayı
+EmailCollectorConfirmCollect=Bu koleksiyoncu için koleksiyonu şimdi çalıştırmak istiyor musunuz?
+NoNewEmailToProcess=İşlenecek yeni e-posta (eşleşen filtreler) yok
 NothingProcessed=Hiçbir şey yapılmadı
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Aday oluştur (ve gerekirse üçüncü parti)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+XEmailsDoneYActionsDone=%s e-postası uygun, %s e-postası başarıyla işlendi (%s kaydı/yapılan eylem için)
+RecordEvent=E-posta olayını kaydet
+CreateLeadAndThirdParty=Aday oluştur (ve gerekirse cari)
+CreateTicketAndThirdParty=Bilet oluşturun (ve önceki bir işlemle yüklenmişse cariye bağlantı verin)
 CodeLastResult=En son sonuç kodu
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create job application
+NbOfEmailsInInbox=Kaynak dizindeki e-postaların sayısı
+LoadThirdPartyFromName=%s üzerinde cari aramasını yükle (yalnızca yükle)
+LoadThirdPartyFromNameOrCreate=%s üzerinde cari aramasını yükle (bulunamazsa oluşturun)
+WithDolTrackingID=Dolibarr'dan gönderilen ilk e-postayla başlatılan bir görüşmeden gelen mesaj
+WithoutDolTrackingID=Dolibarr'dan GÖNDERİLMEYEN ilk e-posta ile başlatılan bir görüşmeden gelen mesaj
+WithDolTrackingIDInMsgId=Dolibarr'dan gönderilen mesaj
+WithoutDolTrackingIDInMsgId=Dolibarr'dan mesaj gönderilmedi
+CreateCandidature=İş başvurusu oluştur
 FormatZip=Posta Kodu
-MainMenuCode=Menu entry code (mainmenu)
+MainMenuCode=Menü giriş kodu (ana menü)
 ECMAutoTree=Otomatik ECM ağacını göster
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Eylemin nesnesi için kullanılacak değerleri veya değerlerin nasıl çıkarılacağını tanımlayın. Örneğin:<br>objproperty1=SET: ayarlanacak değer <br>objproperty2=SET:__objproperty1__ yerine geçen bir değer <br>objproperty3=SETIFEMPTY:objproperty3 önceden tanımlanmamışsa kullanılan değer <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br> object.objproperty5=EXTRACT:BODY:Şirket adı\\s([^\\s]*)<br><br> a kullanın; Birkaç özelliği ayıklamak veya ayarlamak için ayırıcı olarak karakter.
 OpeningHours=Açılış saatleri
 OpeningHoursDesc=Buraya firmanızın normal çalışma saatlerini girin.
 ResourceSetup=Kaynak modülünün yapılandırılması
@@ -2040,19 +2042,19 @@ DisabledResourceLinkContact=Bir kaynağı kişilere bağlama özelliğini devre
 EnableResourceUsedInEventCheck=Bir etkinlikte kaynağın kullanılıp kullanılmadığını kontrol etme özelliğini etkinleştir
 ConfirmUnactivation=Modül sıfırlamayı onayla
 OnMobileOnly=Sadece küçük ekranda (akıllı telefon)
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
+DisableProspectCustomerType="Olasılık + Müşteri" cari türünü devre dışı bırakın (bu nedenle cari "Olasılık" veya "Müşteri" olmalıdır, ancak ikisi birden olamaz)
 MAIN_OPTIMIZEFORTEXTBROWSER=Görme engelli insanlar için arayüzü basitleştir
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Kör biriyseniz veya uygulamayı Lynx veya Links gibi bir metin tarayıcısından kullanıyorsanız bu seçeneği etkinleştirin.
+MAIN_OPTIMIZEFORCOLORBLIND=Renk körü için arayüz rengini değiştirin
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Renk körü bir kişiyseniz bu seçeneği etkinleştirin, bazı durumlarda arayüz kontrastı artırmak için renk ayarını değiştirir.
 Protanopia=Kırmızı körlüğü
 Deuteranopes=Renk körü
 Tritanopes=Renk körlüğü
-ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType="Yeni müşteri" oluşturma formunda varsayılan üçüncü parti türü
-ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
+ThisValueCanOverwrittenOnUserLevel=Bu değer, kullanıcı sayfasından her kullanıcı tarafından üzerine yazılabilir - sekme '%s'
+DefaultCustomerType="Yeni müşteri" oluşturma formunda varsayılan cari türü
+ABankAccountMustBeDefinedOnPaymentModeSetup=Not: Bu özelliğin çalışması için banka hesabı her ödeme modunun (Paypal, Stripe, ...) modülünde tanımlanmalıdır.
 RootCategoryForProductsToSell=Satılacak ürünlerin kök kategorisi
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
+RootCategoryForProductsToSellDesc=Tanımlanırsa, yalnızca bu kategorideki ürünler veya bu kategorinin alt öğeleri Satış Noktasında bulunacaktır.
 DebugBar=Hata Ayıklama Çubuğu
 DebugBarDesc=Hata ayıklamayı basitleştirmek için bir çok araç ile gelen araç çubuğu
 DebugBarSetup=Hata Ayıklama Çubuğu Kurulumu
@@ -2062,63 +2064,68 @@ UseDebugBar=Hata ayıklama çubuğunu kullan
 DEBUGBAR_LOGS_LINES_NUMBER=Konsolda saklanacak son günlük satırı sayısı
 WarningValueHigherSlowsDramaticalyOutput=Uyarı, yüksek değerler çıktıyı önemli ölçüde yavaşlatır
 ModuleActivated=Modül 1 %s etkinleştirilmiştir ve arayüzü yavaşlatıyor.
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
+ModuleSyslogActivatedButLevelNotTooVerbose=%s modülü etkinleştirildi ve günlük düzeyi (%s) doğru (çok ayrıntılı değil)
+IfYouAreOnAProductionSetThis=Bir üretim ortamındaysanız, bu özelliği %s olarak ayarlamalısınız.
+AntivirusEnabledOnUpload=Yüklenen dosyalarda antivirüs etkin
+SomeFilesOrDirInRootAreWritable=Bazı dosyalar veya dizinler salt okunur modda değil
 EXPORTS_SHARE_MODELS=Dışa aktarma modelleri herkesle paylaşılır
 ExportSetup=Dışa aktarma modülünün kurulumu
 ImportSetup=İçe aktarım modülünün kurulumu
-InstanceUniqueID=Unique ID of the instance
+InstanceUniqueID=Örneğin benzersiz kimliği
 SmallerThan=Şundan daha küçük
 LargerThan=Şundan daha büyük
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
-WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+IfTrackingIDFoundEventWillBeLinked=Bir nesnenin izleme kimliği e-postada bulunursa veya e-posta bir e-postanın hemen toplanan ve bir nesneye bağlanan bir cevabıysa, oluşturulan olayın otomatik olarak bilinen ilgili nesneye bağlanacağını unutmayın.
+WithGMailYouCanCreateADedicatedPassword=Bir GMail hesabıyla, 2 adımlı doğrulamayı etkinleştirdiyseniz, https://myaccount.google.com/ adresinden kendi hesap şifrenizi kullanmak yerine uygulama için özel bir ikinci şifre oluşturmanız önerilir.
+EmailCollectorTargetDir=Başarıyla işlendiğinde e-postayı başka bir etikete/dizine taşımak istenen bir davranış olabilir. Bu özelliği kullanmak için burada dizinin adını ayarlamanız yeterlidir (isimde özel karakterler KULLANMAYIN). Ayrıca bir okuma/yazma oturum açma hesabı kullanmanız gerektiğini unutmayın.
+EmailCollectorLoadThirdPartyHelp=Veritabanınızdaki mevcut bir cari bulmak ve yüklemek için e-posta içeriğini kullanmak için bu eylemi kullanabilirsiniz. Bulunan (veya oluşturulan) cari, ihtiyaç duyan aşağıdaki eylemler için kullanılacaktır. Parametre alanında, örneğin 'EXTRACT: BODY: Name: \\s([^\\s]*)' kullanabilirsiniz, eğer cari adını gövdeden çıkarmak istiyorsanız 'Ad: bulunacak ad' yapınız.
 EndPointFor=%s için bitiş noktası: %s
 DeleteEmailCollector=E-posta toplayıcıyı sil
 ConfirmDeleteEmailCollector=Bu e-posta toplayıcıyı silmek istediğinizden emin misiniz?
 RecipientEmailsWillBeReplacedWithThisValue=Alıcı e-postaları her zaman bu değerle değiştirilecektir
 AtLeastOneDefaultBankAccountMandatory=En az 1 varsayılan banka hesabı tanımlanmalıdır
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+RESTRICT_ON_IP=Yalnızca bazı ana bilgisayar IP'lerine erişime izin verin (joker karaktere izin verilmez, değerler arasında boşluk kullanın). Boş, her ana bilgisayarın erişebileceği anlamına gelir.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Based on the library SabreDAV version
+BaseOnSabeDavVersion=Kütüphane SabreDAV versiyonuna göre
 NotAPublicIp=Herkese açık bir IP değil
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+MakeAnonymousPing=Vakfın Dolibarr kurulumunu saymasına izin vermek için Dolibarr vakıf sunucusuna anonim bir Ping '+1' yapın (kurulumdan sonra sadece 1 kez yapılır).
 FeatureNotAvailableWithReceptionModule=Alış modül etkinleştirildiğinde özellik kullanılamaz
 EmailTemplate=E-posta şablonu
 EMailsWillHaveMessageID=E-postalarda bu sözdizimiyle eşleşen bir 'Referanslar' etiketi bulunacak
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
+PDF_SHOW_PROJECT=Belgede projeyi göster
+ShowProjectLabel=Proje Etiketi
+PDF_USE_ALSO_LANGUAGE_CODE=PDF'nizdeki bazı metinlerin aynı oluşturulan PDF'de 2 farklı dilde çoğaltılmasını istiyorsanız, burada bu ikinci dili ayarlamanız gerekir, böylece oluşturulan PDF aynı sayfada 2 farklı dil içerir, biri PDF oluşturulurken seçilir ve bu ( yalnızca birkaç PDF şablonu bunu destekler). PDF başına 1 dil için boş bırakın.
+FafaIconSocialNetworksDesc=Buraya FontAwesome simgesinin kodunu girin. FontAwesome'ın ne olduğunu bilmiyorsanız, fa-address-book genel değerini kullanabilirsiniz.
 FeatureNotAvailableWithReceptionModule=Alış modül etkinleştirildiğinde özellik kullanılamaz
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
-MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
+RssNote=Not: Her RSS akışı tanımı, gösterge tablosunda mevcut olması için etkinleştirmeniz gereken bir pencere öğesi sağlar.
+JumpToBoxes=Kuruluma Atla -> Widget'lar
+MeasuringUnitTypeDesc=Burada "beden", "yüzey", "hacim", "ağırlık", "zaman" gibi bir değer kullanın
+MeasuringScaleDesc=Ölçek, varsayılan referans birimiyle eşleşmesi için ondalık bölümü hareket ettirmeniz gereken yer sayısıdır. "Zaman" birimi türü için saniye sayısıdır. 80 ile 99 arasındaki değerler ayrılmış değerlerdir.
+TemplateAdded=Şablon eklendi
+TemplateUpdated=Şablon güncellendi
+TemplateDeleted=Şablon silindi
+MailToSendEventPush=Etkinlik hatırlatma e-postası
+SwitchThisForABetterSecurity=Daha fazla güvenlik için bu değerin% s olarak değiştirilmesi önerilir
+DictionaryProductNature= Ürünün doğası
+CountryIfSpecificToOneCountry=Ülke (belirli bir ülkeye özgü ise)
+YouMayFindSecurityAdviceHere=Güvenlik danışmanlığını burada bulabilirsiniz
+ModuleActivatedMayExposeInformation=Bu PHP uzantısı hassas verileri açığa çıkarabilir. İhtiyacınız yoksa devre dışı bırakın.
+ModuleActivatedDoNotUseInProduction=Geliştirme için tasarlanmış bir modül etkinleştirildi. Bunu bir üretim ortamında etkinleştirmeyin.
+CombinationsSeparator=Ürün kombinasyonları için ayırıcı karakter
+SeeLinkToOnlineDocumentation=Örnekler için üst menüdeki çevrimiçi belgelere bağlantıya bakın
+SHOW_SUBPRODUCT_REF_IN_PDF=<b>%s</b> modülünün "%s" özelliği kullanılıyorsa, bir kitin alt ürünlerinin ayrıntılarını PDF'de gösterin.
+AskThisIDToYourBank=Bu kimliği almak için bankanızla iletişime geçin
+AdvancedModeOnly=İzin yalnızca Gelişmiş izin modunda mevcuttur
+ConfFileIsReadableOrWritableByAnyUsers=Conf dosyası herhangi bir kullanıcı tarafından okunabilir veya yazılabilir. Yalnızca web sunucusu kullanıcısına ve grubuna izin verin.
+MailToSendEventOrganization=Etkinlik organizasyonu
+AGENDA_EVENT_DEFAULT_STATUS=Formdan bir olay oluştururken varsayılan olay durumu
+YouShouldDisablePHPFunctions=PHP işlevlerini devre dışı bırakmalısınız
+IfCLINotRequiredYouShouldDisablePHPFunctions=Sistem komutlarını çalıştırmanız gerekmesi dışında (örneğin Planlanmış iş modülü için veya harici komut satırı Anti-virüs'ü çalıştırmak için), PHP işlevlerini devre dışı bırakmalısınız.
+NoWritableFilesFoundIntoRootDir=Kök dizininizde ortak programların yazılabilir dosyaları veya dizinleri bulunamadı (İyi)
+RecommendedValueIs=Önerilen: %s
+ARestrictedPath=Kısıtlı bir yol
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index d94de5e03ac..33392145699 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Sosyal/mali vergi ödemesi
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=İç transfer
-TransferDesc=Bir hesaptan başka bir hesaba transfer sırasında Dolibarr iki kayıt yazacaktır (kaynak hesaba borç ve hedef hesaba kredi). Bu işlem için aynı tutar (işaret hariç), etiket ve tarih kullanılacaktır.
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Kimden
 TransferTo=Kime
 TransferFromToDone=<b>%s</b> den <b>%s</b> nin <b>%s</b> %s ne bir transfer kaydedildi.
 CheckTransmitter=Gönderen
 ValidateCheckReceipt=Bu çek makbuzu doğrulansın mı?
-ConfirmValidateCheckReceipt=Bu çek makbuzunu doğrulamak istediğinizden emin misiniz? Bu işlem onayından sonra değişiklik yapılamaz.
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Bu çek makbuzu silinsin mi?
 ConfirmDeleteCheckReceipt=Bu çek makbuzunu silmek istediğinizden emin misiniz?
 BankChecks=Banka çekleri
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Bu kaydı silmek istediğinizden emin misiniz?
 ThisWillAlsoDeleteBankRecord=Bu, oluşturulan banka kaydını da silecektir
 BankMovements=Hareketler
 PlannedTransactions=Planlanmış girişler
-Graph=Grafikler
+Graph=Graphs
 ExportDataset_banque_1=Banka kayıtları ve hesap ekstresi
 ExportDataset_banque_2=Banka cüzdanı
 TransactionOnTheOtherAccount=Diğer hesaptaki işlemler
@@ -142,7 +142,7 @@ AllAccounts=Tüm banka ve kasa hesapları
 BackToAccount=Hesaba geri dön
 ShowAllAccounts=Tüm hesaplar için göster
 FutureTransaction=Gelecekteki işlem. Uzlaştırılamıyor.
-SelectChequeTransactionAndGenerate=Çek mevduat makbuzuna dahil etmek için çekleri seç/filtrele ve "Oluştur" butonuna tıkla.
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Uzlaştırma ile ilişkili banka ekstresini seç. Sıralanabilir bir sayısal değer kullan: YYYYMM ya da YYYYMMDD
 EventualyAddCategory=Sonunda, kayıtları sınıflandırmak için bir kategori belirtin
 ToConciliate=Uzlaştırılsın mı?
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index f15d588ae96..0be1e15c206 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Fazla ödenen miktarı mevcut indirime dönüştürün
 EnterPaymentReceivedFromCustomer=Müşteriden alınan ödeme girin
 EnterPaymentDueToCustomer=Müşteri nedeniyle ödeme yap
 DisabledBecauseRemainderToPayIsZero=Ödenmemiş kalan sıfır olduğundan devre dışı
-PriceBase=Temel fiyat
+PriceBase=Base price
 BillStatus=Fatura durumu
 StatusOfGeneratedInvoices=Oluşturulan faturaların durumu
 BillStatusDraft=Taslak (doğrulanma gerektirir)
@@ -454,7 +454,7 @@ RegulatedOn=Buna göre düzenlenmiş
 ChequeNumber=Çek No
 ChequeOrTransferNumber=Çek/Havale No
 ChequeBordereau=Programı denetle
-ChequeMaker=Çek/Havale gönderen
+ChequeMaker=Check/Transfer sender
 ChequeBank=Çekin Bankası
 CheckBank=Çek
 NetToBePaid=Net ödenecek
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index 3a5990ccd75..54f28af256e 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Yer imleri: en son %s
 BoxOldestExpiredServices=Süresi dolmuş en eski etkin hizmetler
 BoxLastExpiredServices=Etkin hizmet süresi dolmuş son %s kişi
 BoxTitleLastActionsToDo=Yapılacak son %s eylem
-BoxTitleLastContracts=Değiştirilen son %s sözleşme
-BoxTitleLastModifiedDonations=Değiştirilen son %s bağış
-BoxTitleLastModifiedExpenses=Değiştirilen son %s gider raporu
-BoxTitleLatestModifiedBoms=Değiştirilen son %s BOM
-BoxTitleLatestModifiedMos=Değiştirilen son %s Üretim Siparişleri
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Genel etkinlik (faturalar, teklifler, siparişler)
 BoxGoodCustomers=İyi müşteriler
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index f9c0a22ebd4..a7ce8a3f6d6 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Tablo ekle
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Sipariş yazıcıları
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Ürün ara
 Receipt=Makbuz
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Sipariş Notları
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Tarayıcı
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -109,7 +111,7 @@ MainTemplateToUse=Main template to use
 OrderTemplateToUse=Order template to use
 BarRestaurant=Bar Restaurant
 AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
+RestaurantMenu=Menü
 CustomerMenu=Customer menu
 ScanToMenu=Scan QR code to see the menu
 ScanToOrder=Scan QR code to order
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index 620b2cd832a..b1f660492f9 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Etiket/Kategori
 Rubriques=Etiketler/Kategoriler
 RubriquesTransactions=İşlem Etiketleri/Kategorileri
 categories=etiketler/kategoriler
-NoCategoryYet=Bu türde oluşturulmuş etiket/kategori yok
+NoCategoryYet=No tag/category of this type has been created
 In=İçinde
 AddIn=Eklenti
 modify=değiştir
 Classify=Sınıflandır
 CategoriesArea=Etiketler/Kategoriler alanı
-ProductsCategoriesArea=Ürün/Hizmet etiketleri/kategorileri alanı
-SuppliersCategoriesArea=Tedarikçi etiketleri/kategorileri alanı
-CustomersCategoriesArea=Müşteri etiketleri/kategorileri alanı
-MembersCategoriesArea=Üyeler etiketleri/kategorileri alanı
-ContactsCategoriesArea=Kişi etiketleri/kategorileri alanı
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Proje etiket/kategori alanı
-UsersCategoriesArea=Kullanıcı Etiketleri/Kategorileri Alanı
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Alt kategoriler
 CatList= Etiketler/kategoriler listesi
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Kategori seç
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Kategoriler için veya operatör kullanın
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 6eda04aac99..e6a17f6f705 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Firma adı zaten %s var. Başka bir tane seçin.
 ErrorSetACountryFirst=Önce ülkeyi ayarla.
 SelectThirdParty=Bir üçüncü parti seç
-ConfirmDeleteCompany=Bu firmayı ve devralınan tüm bilgilerini silmek istediğinizden emin misiniz?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Bir kişi/adres sil
-ConfirmDeleteContact=Bu kişiyi ve devralınan tüm bilgilerini silmek istediğinizden emin misiniz?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Yeni Üçüncü Parti
 MenuNewCustomer=Yeni Müşteri
 MenuNewProspect=Yeni Aday
@@ -69,7 +69,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Ara
 Chat=Sohbet
-PhonePro=Telefon
+PhonePro=Bus. phone
 PhonePerso=Dahili numarası
 PhoneMobile=Cep telefonu
 No_Email=Toplu e-postaları reddet
@@ -331,7 +331,7 @@ CustomerCodeDesc=Müşteri Kodu, tüm müşteriler için benzersiz
 SupplierCodeDesc=Tedarikçi Kodu, tüm tedarikçiler için benzersiz
 RequiredIfCustomer=Eğer üçüncü parti bir müşteri ya da aday ise gereklidir
 RequiredIfSupplier=Eğer üçünü parti tedarikçi ise gereklidir
-ValidityControledByModule=Modül tarafından kontrol edilen geçerlilik
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Bu modül için kurallar
 ProspectToContact=İletişime geçilecek aday
 CompanyDeleted="%s" Firması veritabanından silindi.
@@ -439,12 +439,12 @@ ListSuppliersShort=Tedarikçi Listesi
 ListProspectsShort=Aday Listesi
 ListCustomersShort=Müşteri Listesi
 ThirdPartiesArea=Üçüncü Partiler/Kişiler
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Üçüncü Partilerin Toplamı
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Açık
 ActivityCeased=Kapalı
 ThirdPartyIsClosed=Üçüncü taraf kapalı
-ProductsIntoElements=Şu öğeler içindeki ürün/hizmet listesi %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Geçerli bekleyen fatura
 OutstandingBill=Ödenmemiş fatura için ençok tutar
 OutstandingBillReached=Ödenmemiş fatura için ulaşılan ençok tutar
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Müşteri/tedarikçi kodu serbesttir. Bu kod herhangi bir
 ManagingDirectors=Yönetici(lerin) adı (CEO, müdür, başkan...)
 MergeOriginThirdparty=Çifte üçüncü parti (silmek istediğiniz üçüncü parti)
 MergeThirdparties=Üçüncü partileri birleştir
-ConfirmMergeThirdparties=Bu üçüncü partiyi mevcut olanla birleştirmek istediğinizden emin misiniz? Tüm bağlantılı nesneler (teklifler, siparişler ...) mevcut üçüncü partiye taşınacak ve daha sonra taşınan üçüncü parti silinecektir.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Üçüncü partiler birleştirildi
 SaleRepresentativeLogin=Satış temsilcisinin kullanıcı adı
 SaleRepresentativeFirstname=Satış temsilcisinin adı
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index d3b33a4b579..ccf30c58ba9 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Yeni indirim
 NewCheckDeposit=Yeni çek hesabı
 NewCheckDepositOn=Bu hesap için makbuz oluştur: %s
 NoWaitingChecks=Para yatırılmayı bekleyen çek yok.
-DateChequeReceived=Çek giriş tarihi
+DateChequeReceived=Check receiving date
 NbOfCheques=Çek sayısı
 PaySocialContribution=Bir sosyal/mali vergi öde
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
index 380ce8a5ab3..6364caa7e23 100644
--- a/htdocs/langs/tr_TR/ecm.lang
+++ b/htdocs/langs/tr_TR/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index b2f7a452de6..12a16261cab 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Hata yok, taahüt ediyoruz
 # Errors
 ErrorButCommitIsDone=Hatalar bulundu, buna rağmen doğruluyoruz
-ErrorBadEMail=%s e-postası hatalı
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=URL %s yanlış
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Parametreniz için hatalı değer. Genellikle çeviri eksik olduğunda eklenir.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=%s kullanıcı adı zaten var.
@@ -46,8 +46,8 @@ ErrorWrongDate=Tarih doğru değil!
 ErrorFailedToWriteInDir=%s dizinine yazılamadı
 ErrorFoundBadEmailInFile=Dosyadaki %s satırları için hatalı e-posta sözdizimi bulundu (örneğin e-posta=%s ile satır %s)
 ErrorUserCannotBeDelete=Kullanıcı silinemiyor. Dolibarr varlıklarıyla ilişkili olabilir.
-ErrorFieldsRequired=Bazı gerekli alanlar doldurulmamış.
-ErrorSubjectIsRequired=E-posta konusu zorunludur
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject 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
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/tr_TR/eventorganization.lang b/htdocs/langs/tr_TR/eventorganization.lang
new file mode 100644
index 00000000000..60890a736ac
--- /dev/null
+++ b/htdocs/langs/tr_TR/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Etkinlik organizasyonu
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Ayarlar
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Ödeme emri
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Yapıldı
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/tr_TR/knowledgemanagement.lang b/htdocs/langs/tr_TR/knowledgemanagement.lang
new file mode 100644
index 00000000000..f9f264370c1
--- /dev/null
+++ b/htdocs/langs/tr_TR/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Ayarlar
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Hakkında
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Mal
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 8d33ac213fb..75bde1b544b 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Kopyala
 MailToCCUsers=Copy to users(s)
 MailCCC=Önbelleğe kopyala
-MailTopic=E-posta konusu
+MailTopic=Email subject
 MailText=Mesaj
 MailFile=Ekli dosyalar
 MailMessage=E-posta gövdesi
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=E-posta gönderme yapılandırması '%s'ye ayarlandı. Bu mod toplu e-postalama için kullanılamaz.
 MailSendSetupIs2='%s' Modunu kullanmak için <strong>'%s'</strong> parametresini değiştirecekseniz, önce yönetici hesabı ile %sGiriş - Ayarlar - E-postalar%s menüsüne gitmelisiniz. Bu mod ile İnternet Servis Sağlayıcınız tarafından sağlanan SMTP sunucusu ayarlarını girebilir ve Toplu e-posta özelliğini kullanabilirsiniz.
 MailSendSetupIs3=SMTP sunucusunun nasıl yapılandırılacağı konusunda sorunuz varsa, %s e sorabilirsiniz.
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index d0e3f166a85..d62855ddf72 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Deneme bağlantısı
 ToClone=Kopyasını oluştur
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Kopyasını oluşturmak istediğiniz verileri seçin:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Kopyası oluşturulacak hiçbir veri tanımlanmamış.
 Of=ile ilgili
 Go=Git
@@ -246,7 +246,7 @@ DefaultModel=Varsayılan doküman şablonu
 Action=Etkinlik
 About=Hakkında
 Number=Sayı
-NumberByMonth=Aya göre sayı
+NumberByMonth=Total reports by month
 AmountByMonth=Aylık Tutarı
 Numero=Sayı
 Limit=Sınır
@@ -341,8 +341,8 @@ KiloBytes=Kilobayt
 MegaBytes=Megabayt
 GigaBytes=Gigabayt
 TeraBytes=Terabayt
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=bayt
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Tarafından
 From=Başlama
 FromDate=Gönderen
 FromLocation=Gönderen
-at=at
 to=Bitiş
 To=Bitiş
+ToDate=Bitiş
+ToLocation=Bitiş
+at=at
 and=ve
 or=veya
 Other=Diğer
@@ -843,7 +845,7 @@ XMoreLines=%s gizli satır
 ShowMoreLines=Daha fazla/az satır göster
 PublicUrl=Genel URL
 AddBox=Kutu ekle
-SelectElementAndClick=Bir öğe seçin ve %s butonuna tıklayın
+SelectElementAndClick=Select an element and click on %s
 PrintFile=%s Dosyasını Yazdır
 ShowTransaction=Girişi banka hesabında göster
 ShowIntervention=Müdahale göster
@@ -854,8 +856,8 @@ Denied=Reddedildi
 ListOf=%s listesi
 ListOfTemplates=Şablon listesi
 Gender=Cinsiyet
-Genderman=Adam
-Genderwoman=Kadın
+Genderman=Male
+Genderwoman=Female
 Genderother=Diğer
 ViewList=Liste görünümü
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 39f105a72eb..b3807ddbc10 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Başka bir üye  (adı: <b>%s</b>, ku
 ErrorUserPermissionAllowsToLinksToItselfOnly=Güvenlik nedeniyle, bir üyenin kendinizin dışında bir kullanıcıya bağlı olabilmesi için tüm kullanıcıları düzenleme iznine sahip olmanız gerekir.
 SetLinkToUser=Bir Dolibarr kullanıcısına bağlantı
 SetLinkToThirdParty=Bir Dolibarr üçüncü partisine bağlantı
-MembersCards=Üye kartvizitleri
+MembersCards=Business cards for members
 MembersList=Üyelerin listesi
 MembersListToValid=Taslak üye listesi (doğrulanacak)
 MembersListValid=Geçerli üye listesi
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Abonelik alacal üyeler
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Abonelik tarihi
 DateEndSubscription=Abonelik bitiş tarihi
-EndSubscription=Abonelik bitir
+EndSubscription=Subscription Ends
 SubscriptionId=Abonelik kimliği
 WithoutSubscription=Without subscription
 MemberId=Üye kimliği
@@ -83,10 +83,10 @@ WelcomeEMail=Hoşgeldin e-postası
 SubscriptionRequired=Abonelik gerekli
 DeleteType=Sil
 VoteAllowed=Oylamaya izin verildi
-Physical=Fiziksel
-Moral=Ahlaki
-MorAndPhy=Moral and Physical
-Reenable=Yeniden etkinleştirilebilir
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Bir üyeyi sonlandır
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Ülkeye göre üye istatistikleri
 MembersStatisticsByState=Eyalete/ile göre üyelik istatistikleri
 MembersStatisticsByTown=İlçelere göre üyelik istatistikleri
 MembersStatisticsByRegion=Bölgeye göre üye istatistikleri
-NbOfMembers=Üye sayısı
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Doğrulanmamış üye bulunmadı
-MembersByCountryDesc=Bu ekran ülkelere göre üyelik istatisklerini görüntüler. Grafik eğer internet hizmeti çalışıyor ise sadece  google çevrimiçi grafik hizmetince sağlanır.
-MembersByStateDesc=Bu ekran eyaletlere/illere/bölgelere göre üyelik istatiskleri görüntüler.
-MembersByTownDesc=Bu ekran ilçelere göre üyelik istatistikleri görüntüler.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Görmek istediğiniz istatistikleri seçin...
 MenuMembersStats=İstatistikler
-LastMemberDate=Son üye tarihi
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Son abonelik tarihi
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Bilgiler geneldir
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Yeni üye eklendi. Onay bekliyor
 NewMemberForm=Yeni üyelik formu
-SubscriptionsStatistics=Abonelik istatistikleri
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Abonelik sayısı
-AmountOfSubscriptions=Abonelik tutarı
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Ciro (bir firma için) veya Bütçe (bir dernek için)
 DefaultAmount=Varsayılan abonelik tutarı
 CanEditAmount=Ziyaretçi kendi abonelik tutarını seçebeilir/düzenleyebilir
 MEMBER_NEWFORM_PAYONLINE=Entegre çevrimiçi ödeme sayfasına atla
 ByProperties=By nature
 MembersStatisticsByProperties=Yapısına göre üye istatistikleri
-MembersByNature=Bu ekran doğaya göre üye istatistiklerini gösterir.
-MembersByRegion=Bu ekran bölgeye göre üye istatistiklerini gösterir.
 VATToUseForSubscriptions=Abonelikler için kullanılacak KDV oranı
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Faturada abonelik kalemi olarak kullanılan ürün: %s
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index ae0d37ed1c7..7ca6700d744 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Tanımlanan izinlerin listesi
 SeeExamples=Burada örneklere bakın
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 0fde88b5ca5..61054fab29e 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Bu seçeneği kullanmak için PHP nizdeki GD kütüphanesini
 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=Ürün/hizmet miktarının toplamı için istatistikler
-StatsByNumberOfEntities=Bahsedilen varlıkların sayısındaki istatistikler (Fatura, sipariş, ... sayısı)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Teklif sayısı
 NumberOfCustomerOrders=Müşteri siparişlerinin sayısı
 NumberOfCustomerInvoices=Müşteri faturalarının sayısı
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/tr_TR/partnership.lang b/htdocs/langs/tr_TR/partnership.lang
new file mode 100644
index 00000000000..e35e657629e
--- /dev/null
+++ b/htdocs/langs/tr_TR/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Başlangıç tarihi
+DatePartnershipEnd=Bitiş tarihi
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Ödeme emri
+PartnershipAccepted = Kabul edildi
+PartnershipRefused = Reddedildi
+PartnershipCanceled = İptal edildi
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
index d64adff52ad..d74092c0f1a 100644
--- a/htdocs/langs/tr_TR/productbatch.lang
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 66e8c6516fc..fa96dffea66 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Sadece satılabilir hizmetler
 ServicesOnPurchaseOnly=Sadece satın alınabilir hizmetler
 ServicesNotOnSell=Satılık olmayan ve satın alınabilir olmayan hizmetler
 ServicesOnSellAndOnBuy=Satılır ve alınır hizmetler
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Kaydedilen son %s ürün
 LastRecordedServices=Kaydedilen son %s hizmet
 CardProduct0=Ürün
@@ -73,12 +73,12 @@ SellingPrice=Satış fiyatı
 SellingPriceHT=Satış fiyatı (KDV hariç)
 SellingPriceTTC=Satış Fiyatı (vergi dahil)
 SellingMinPriceTTC=Minimum Satış fiyatı (KDV dahil)
-CostPriceDescription=Bu fiyat alanı (KDV hariç), bu ürünün firmanıza ortalama olarak ne kadara mal olduğunu kaydetmek için kullanılabilir. Örneğin, ortalama alış fiyatı artı ortalama üretim ve dağıtım maliyeti şeklinde kendi kendinize hesapladığınız bir fiyat olabilir.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Bu değer margin hesaplama için kullanılabilir.
 SoldAmount=Satılan tutar
 PurchasedAmount=Satınalınan tutar
 NewPrice=Yeni fiyat
-MinPrice=Minimum satış fiyatı
+MinPrice=Min. selling price
 EditSellingPriceLabel=Satış fiyatı etiketini düzenle
 CantBeLessThanMinPrice=Satış fiyatı bu ürün için izin verilen en düşük fiyattan az olamaz (%s vergi hariç). Bu mesaj, çok fazla indirim yaparsanız da belirir.
 ContractStatusClosed=Kapalı
@@ -157,11 +157,11 @@ ListServiceByPopularity=Popülerliğine göre hizmetler listesi
 Finished=Bitmiş ürün
 RowMaterial=Ham madde
 ConfirmCloneProduct=<b>%s</b> ürünü ve siparişinin kopyasını oluşturmak istediğinizden emin misiniz?
-CloneContentProduct=Ürün/hizmet ile ilgili tüm temel bilgilerin kopyasını oluştur
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Fiyatların kopyasını oluştur
-CloneCategoriesProduct=Bağlı etiketleri/kategorileri kopyala
-CloneCompositionProduct=Sanal ürünü/hizmetin kopyasını oluştur
-CloneCombinationsProduct=Ürün değişkenlerinin kopyasını oluştur
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Bu ürün kullanılır.
 NewRefForClone=Yeni ürün/hizmet ref.
 SellingPrices=Satış fiyatları
@@ -170,12 +170,12 @@ CustomerPrices=Müşteri fiyatları
 SuppliersPrices=Tedarikçi fiyatları
 SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürün veya hizmetlerin)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Menşei ülke
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
+NatureOfProductShort=Ürünün doğası
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Kısa etiket
 Unit=Birim
 p=Adet
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 40ada56b53b..be261f882c6 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Proje ilgilileri
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Tüm projeler
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 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.
 ProjectsPublicTaskDesc=Bu görünüm, okumanıza izin verilen tüm proje ve görevleri sunar.
 ProjectsDesc=Bu görünüm tüm projeleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
 TasksOnProjectsDesc=Bu görünüm tüm projelerdeki tüm görevleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Yalnızca açık projeler görünür (taslak ya da kapalı durumdaki projeler görünmez)
 ClosedProjectsAreHidden=Kapalı projeler görünmez.
 TasksPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri ve görevleri içerir.
 TasksDesc=Bu görünüm tüm projeleri ve görevleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=Yeni proje
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Bu göreve atanmamış
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Görevi bana ata
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Görevi %s kullanıcısına ata
 SelectTaskToAssign=Atanacak görevi seçin...
 AssignTask=Ata
diff --git a/htdocs/langs/tr_TR/receptions.lang b/htdocs/langs/tr_TR/receptions.lang
index e163d998a1a..d6755f4e8db 100644
--- a/htdocs/langs/tr_TR/receptions.lang
+++ b/htdocs/langs/tr_TR/receptions.lang
@@ -2,10 +2,10 @@
 ReceptionsSetup=Product Reception setup
 RefReception=Ref. reception
 Reception=Kabul
-Receptions=Receptions
+Receptions=Resepsiyonlar
 AllReceptions=All Receptions
 Reception=Kabul
-Receptions=Receptions
+Receptions=Resepsiyonlar
 ShowReception=Show Receptions
 ReceptionsArea=Receptions area
 ListOfReceptions=List of receptions
diff --git a/htdocs/langs/tr_TR/recruitment.lang b/htdocs/langs/tr_TR/recruitment.lang
index caede8f42a0..b95dda73832 100644
--- a/htdocs/langs/tr_TR/recruitment.lang
+++ b/htdocs/langs/tr_TR/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index cdbc562d1ac..88d52576ed5 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=<b>%s</b> referanslı bu gönderiyi doğrulamak istediği
 ConfirmCancelSending=Bu gönderiyi iptal etmek istediğinizden emin misiniz?
 DocumentModelMerou=Merou A5 modeli
 WarningNoQtyLeftToSend=Uyarı, sevkiyat için bekleyen herhangi bir ürün yok.
-StatsOnShipmentsOnlyValidated=İstatistikler yalnızca doğrulanmış sevkiyatlarda yapılmıştır. Kullanılan tarih sevkiyat doğrulama tarihidir (planlanan teslim tarihi her zaman bilinemez)
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Teslimat için planlanan tarih
 RefDeliveryReceipt=Teslimat makbuzu referansı
 StatusReceipt=Status delivery receipt
@@ -55,7 +55,7 @@ ActionsOnShipping=Sevkiyattaki etkinlikler
 LinkToTrackYourPackage=Paketinizi izleyeceğiniz bağlantı
 ShipmentCreationIsDoneFromOrder=Şu an için, yeni bir sevkiyatın oluşturulması sipariş kartından yapılmıştır.
 ShipmentLine=Sevkiyat kalemi
-ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
+ProductQtyInCustomersOrdersRunning=Açık müşteri siparişlerindeki ürün miktarı
 ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
 ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 373096f7b99..ed5884d3da8 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Bu nesne için önceden tanımlanmış ürünlenyo
 DispatchVerb=Dağıtım
 StockLimitShort=Uyarı sınırı
 StockLimit=Stok sınırı uyarısı
-StockLimitDesc=Boş bırakılması uyarı olmadığı anlamına gelir.<br>0 girilmesi ise stok tükenir tükenmez bir uyarı oluşturmak için kullanılabilir.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Fiziki Stok
 RealStock=Gerçek Stok
 RealStockDesc=Fiziksel/gerçek stok, şu anda depolardaki mevcut olan stoktur.
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 36b671a893b..c7f0e909b21 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Şifre buna değiştirildi: %s
 SubjectNewPassword=%s için yeni parolanız
 GroupRights=Grup izinleri
 UserRights=Kullanıcı izinleri
+Credentials=Credentials
 UserGUISetup=Kullanıcı Ekranı Ayarları
 DisableUser=Engelle
 DisableAUser=Bir kullanıcıyı engelle
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Değiştirmek için Alan türünü kullan
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Oturum açmak için OpenID kullan
 WeeklyHours=Çalışma saati (haftalık toplam)
-ExpectedWorkedHours=Haftalık beklenen çalışma saatleri
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Kullanıcı rengi
 DisabledInMonoUserMode=Bakım modunda devre dışıdır
 UserAccountancyCode=Kullanıcı muhasebe kodu
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=İşe Başlama Tarihi
 DateEmploymentEnd=İşi Bırakma Tarihi
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Kendi kullanıcı kaydınızı devre dışı bırakamazsınız
 ForceUserExpenseValidator=Gider raporu doğrulayıcısını zorla
 ForceUserHolidayValidator=İzin isteği doğrulayıcısını zorla
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index e779f477ce1..91241e7e615 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index fb5f2043d8e..ef34f444156 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index bd5556dd25b..9f38545d660 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Видаліть або перейменуйте файл <b> %s </b>
 RestoreLock=Відновіть файл <b> %s </b>, лише з дозволом для читання, щоб відключити подальше використання інструменту "Оновити / Встановити".
 SecuritySetup=Налаштування безпеки
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Встановлені тут параметри пов’язані з безпекою щодо завантаження файлів.
 ErrorModuleRequirePHPVersion=Помилка, для цього модуля потрібна версія PHP %s або вище
 ErrorModuleRequireDolibarrVersion=Помилка, для цього модуля потрібна версія Dolibarr %s або вище
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 05707f6bc28..40801051935 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Продавець
 TransferTo=Покупець
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Відправник
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 65df9d227a1..a6760dfe02e 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Ввести платіж, отриманий від покупця
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Відключено, тому що оплата, що залишилася є нульовою
-PriceBase=Цінова база
+PriceBase=Base price
 BillStatus=Статус рахунку-фактури
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Проект (має бути підтверджений)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Чек №
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Банк чека
 CheckBank=Перевірити
 NetToBePaid=Чистими до сплати
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index 3aa0b1dcb95..d61c1c309f0 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index a7372bb3b86..94e3e33ff42 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index ebe9d66cafa..f482461f4f5 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Компанія з назвою %s уже існує. Виберіть іншу.
 ErrorSetACountryFirst=Спершу оберіть країну
 SelectThirdParty=Оберіть контрагента
-ConfirmDeleteCompany=Ви впевнені що дійсно хочете видалити цю компанію та всю її інформацію?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Видалити контакт/адресу
-ConfirmDeleteContact=Ви впевнені що дійсно хочете видалити цей контакт та всю зв'язану з ним інформацію?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Новий контрагент
 MenuNewCustomer=Новий замовник
 MenuNewProspect=Новий потенційний клієнт
@@ -69,7 +69,7 @@ PhoneShort=Телефон
 Skype=Skype
 Call=Call
 Chat=Чат
-PhonePro=Робочий телефон
+PhonePro=Bus. phone
 PhonePerso=Особистий телефон
 PhoneMobile=Мобільний телефон
 No_Email=Скасувати автоматичну розсилку
@@ -78,7 +78,7 @@ Zip=Індекс
 Town=Місто
 Web=Вебсайт
 Poste= Позиція
-DefaultLang=Мова по замовчуванню
+DefaultLang=Default language
 VATIsUsed=Податок з продажу
 VATIsUsedWhenSelling=Визначає, чи включати для цього контрагента податок з продажу чи ні, коли він виставляє рахунок власним клієнтам
 VATIsNotUsed=Податок не використовується
@@ -331,7 +331,7 @@ CustomerCodeDesc=Код клієнта, унікальний для всіх к
 SupplierCodeDesc=Код постачальника, унікальний для всіх постачальників
 RequiredIfCustomer=Обов'язково, якщо контрагент є потенційним, або покупцем
 RequiredIfSupplier=Обов'язково, якщо контрагент є постачальником
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Зачинено
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 5b193a6084a..f7e2340b7c2 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/uk_UA/ecm.lang b/htdocs/langs/uk_UA/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/uk_UA/ecm.lang
+++ b/htdocs/langs/uk_UA/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/uk_UA/eventorganization.lang b/htdocs/langs/uk_UA/eventorganization.lang
new file mode 100644
index 00000000000..87a5de3d484
--- /dev/null
+++ b/htdocs/langs/uk_UA/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Налаштування
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Проект
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/uk_UA/knowledgemanagement.lang b/htdocs/langs/uk_UA/knowledgemanagement.lang
new file mode 100644
index 00000000000..b0a14cb4840
--- /dev/null
+++ b/htdocs/langs/uk_UA/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Налаштування
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index f6e418263bd..1deee89618c 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 169682a2c9f..70578c88f31 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=Продавець
 FromDate=Продавець
 FromLocation=Продавець
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Інший
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Інший
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index 93aff32cf53..fede3a71083 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index 1c7e0bbb9bf..b9019a9a9d3 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index b6ca500c280..54e294264bf 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/uk_UA/partnership.lang b/htdocs/langs/uk_UA/partnership.lang
new file mode 100644
index 00000000000..c5aab446cd3
--- /dev/null
+++ b/htdocs/langs/uk_UA/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Проект
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
index 15aefb27d54..ade9324a883 100644
--- a/htdocs/langs/uk_UA/productbatch.lang
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 095e1fbc0c9..e87414f9e76 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Зачинено
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 5fcfeff9270..4a360315952 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/uk_UA/recruitment.lang b/htdocs/langs/uk_UA/recruitment.lang
index 04e0a8bb779..09d505fb44e 100644
--- a/htdocs/langs/uk_UA/recruitment.lang
+++ b/htdocs/langs/uk_UA/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index 364df1eb8c9..158adef36d5 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index e37edb28c2a..c1f5129c375 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index c72450499b7..0a4004b0e10 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index d63041a9380..bfd4eccde1e 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 154400c6536..fbe75f09ab0 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/uz_UZ/ecm.lang b/htdocs/langs/uz_UZ/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/uz_UZ/ecm.lang
+++ b/htdocs/langs/uz_UZ/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/uz_UZ/eventorganization.lang b/htdocs/langs/uz_UZ/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/uz_UZ/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/uz_UZ/knowledgemanagement.lang b/htdocs/langs/uz_UZ/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/uz_UZ/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 642fa95de04..e9441bb392e 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/uz_UZ/modulebuilder.lang b/htdocs/langs/uz_UZ/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/uz_UZ/modulebuilder.lang
+++ b/htdocs/langs/uz_UZ/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/uz_UZ/partnership.lang b/htdocs/langs/uz_UZ/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/uz_UZ/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/uz_UZ/productbatch.lang
+++ b/htdocs/langs/uz_UZ/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/uz_UZ/recruitment.lang b/htdocs/langs/uz_UZ/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/uz_UZ/recruitment.lang
+++ b/htdocs/langs/uz_UZ/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/uz_UZ/website.lang
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 78ba39b6a06..6b1f50bfdb1 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Tham chiếu
 LabelAccount=Nhãn tài khoản
 LabelOperation=Nhãn hoạt động
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Mã sắp đặt chữ
 Lettering=Sắp đặt chữ
 Codejournal=Nhật ký
@@ -297,7 +297,7 @@ NoNewRecordSaved=Không có thêm hồ sơ để ghi nhật ký
 ListOfProductsWithoutAccountingAccount=Danh sách các sản phẩm không ràng buộc với bất kỳ tài khoản kế toán
 ChangeBinding=Thay đổi ràng buộc
 Accounted=Tài khoản trên Sổ cái
-NotYetAccounted=Chưa hạch toán vào Sổ cái
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Chương trình hướng dẫn
 NotReconciled=Chưa đối chiếu
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 8ff7409cfac..fa276b338cb 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Xóa / đổi tên tệp <b>%s</b> nếu nó tồn tại, để cho p
 RestoreLock=Khôi phục tệp <b>%s</b> , chỉ với quyền đọc, để vô hiệu hóa bất kỳ việc sử dụng thêm công cụ Cập nhật / Cài đặt nào.
 SecuritySetup=Thiết lập an ninh
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Xác định các tùy chọn ở đây liên quan đến bảo mật về việc tải lên các tệp.
 ErrorModuleRequirePHPVersion=Lỗi, module này yêu cầu phiên bản PHP %s hoặc mới hơn
 ErrorModuleRequireDolibarrVersion=Lỗi, module này yêu cầu Dolibarr phiên bản %s hoặc mới hơn
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=Không đề nghị
 NoActiveBankAccountDefined=Không có tài khoản ngân hàng hoạt động được xác định
 OwnerOfBankAccount=Chủ sở hữu của tài khoản ngân hàng %s
 BankModuleNotActive=Module tài khoản ngân hàng chưa được mở
-ShowBugTrackLink=Hiển thị liên kết " <strong>%s</strong> "
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Cảnh báo
 DelaysOfToleranceBeforeWarning=Trì hoãn trước khi hiển thị cảnh báo cho:
 DelaysOfToleranceDesc=Đặt độ trễ trước khi biểu tượng cảnh báo %s được hiển thị trên màn hình cho thành phần trễ.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=Chức năng SSL không có sẵn trong chương trình PHP
 DownloadMoreSkins=Nhiều giao diện để tải về
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Hiển thị id chuyên nghiệp với địa chỉ
 ShowVATIntaInAddress=Ẩn số VAT Cộng Đồng nội bộ với địa chỉ
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Sử dụng thanh gỡ lỗi
 DEBUGBAR_LOGS_LINES_NUMBER=Số dòng nhật ký cuối cùng cần giữ trong bảng điều khiển
 WarningValueHigherSlowsDramaticalyOutput=Cảnh báo, giá trị cao hơn làm chậm đáng kể ở đầu ra
 ModuleActivated=Mô-đun %s được kích hoạt và làm chậm giao diện
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 2aa8dc26f32..49d8b63b362 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Thanh toán phí/thuế khác
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Chuyển tiền nội bộ
-TransferDesc=Chuyển từ tài khoản này sang tài khoản khác, Dolibarr sẽ viết hai bản ghi (ghi nợ trong tài khoản nguồn và ghi có tài khoản nhận). Cùng số tiền (ngoại trừ ký hiệu), nhãn và ngày sẽ được sử dụng cho giao dịch này
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=Từ
 TransferTo=Đến
 TransferFromToDone=Một chuyển khoản từ <b>%s</b> đến <b>%s</b> của <b>%s</b> %s đã được ghi lại.
-CheckTransmitter=Đơn vị phát hành
+CheckTransmitter=Người gửi
 ValidateCheckReceipt=Kiểm tra chứng từ séc này?
-ConfirmValidateCheckReceipt=Bạn có chắc chắn muốn thông qua biên nhận séc này, bạn không thể thay đổi nếu đã hoàn thành
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Xóa biên nhận séc này?
 ConfirmDeleteCheckReceipt=Bạn có muốn xóa biên nhận séc này?
 BankChecks=Séc ngân hàng
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Bạn có muốn xóa kê khai này?
 ThisWillAlsoDeleteBankRecord=Đồng thời còn xóa kê khai ngân hàng đã tạo
 BankMovements=Biến động
 PlannedTransactions=Kê khai theo kế hoạch
-Graph=Đồ họa
+Graph=Graphs
 ExportDataset_banque_1=Kê khai ngân hàng và bảng kê tài khoản
 ExportDataset_banque_2=Phiếu nộp tiền
 TransactionOnTheOtherAccount=Giao dịch trên tài khoản khác
@@ -142,7 +142,7 @@ AllAccounts=Tất cả tài khoản ngân hàng và tiền mặt
 BackToAccount=Trở lại tài khoản
 ShowAllAccounts=Hiển thị tất cả tài khoản
 FutureTransaction=Giao dịch trong tương lai. Không thể đối chiếu
-SelectChequeTransactionAndGenerate=Lựa chọn/ lọc kiểm tra để có biên lai thu séc và nhấp vào "Tạo".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Chọn bảng kê ngân hàng có quan hệ với việc đối chiếu. Sử dụng giá trị số có thể sắp xếp: YYYYMM hoặc YYYYMMDD
 EventualyAddCategory=Cuối cùng, chỉ định một danh mục trong đó để phân loại các hồ sơ
 ToConciliate=Cần đối soát?
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index ddc3663bdc4..1797521d9b3 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Chuyển đổi thanh toán vượt mức thành giảm
 EnterPaymentReceivedFromCustomer=Nhập thanh toán đã nhận được từ khách hàng
 EnterPaymentDueToCustomer=Thực hiện thanh toán do khách hàng
 DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa bởi vì phần chưa thanh toán còn lại là bằng 0
-PriceBase=Giá cơ sở
+PriceBase=Base price
 BillStatus=Trạng thái hóa đơn
 StatusOfGeneratedInvoices=Tình trạng hóa đơn được tạo
 BillStatusDraft=Dự thảo (cần được xác nhận)
@@ -454,7 +454,7 @@ RegulatedOn=Quy định trên
 ChequeNumber=Kiểm tra N°
 ChequeOrTransferNumber=Kiểm tra/Chuyển N°
 ChequeBordereau=Ghi Séc
-ChequeMaker=Séc/ Điện chuyển tiền
+ChequeMaker=Check/Transfer sender
 ChequeBank=Ngân hàng của Séc
 CheckBank=Séc
 NetToBePaid=Số tiền chưa thuế được trả
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index e002c44df14..8a9692b7254 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Dấu trang: mới nhất %s
 BoxOldestExpiredServices=Dịch vụ đã hết hạn hoạt động cũ nhất
 BoxLastExpiredServices=Các liên lạc cũ nhất với các dịch vụ đã hết hạn hoạt động mới nhất %s  
 BoxTitleLastActionsToDo=Các hành động cần làm mới nhất %s 
-BoxTitleLastContracts=Hợp đồng sửa đổi mới nhất %s 
-BoxTitleLastModifiedDonations=Đóng góp sửa đổi mới nhất %s 
-BoxTitleLastModifiedExpenses=Báo cáo chi phí sửa đổi mới nhất %s 
-BoxTitleLatestModifiedBoms=BOMs sửa đổi mới nhất %s 
-BoxTitleLatestModifiedMos=Đơn đặt hàng sản xuất sửa đổi mới nhất %s 
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Hoạt động toàn cầu (hoá đơn, đề xuất, đơn đặt hàng)
 BoxGoodCustomers=Khách hàng thân thiết
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index e988007469f..7197ca2dbce 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Sàn
 AddTable=Thêm bảng
 Place=Địa điểm
 TakeposConnectorNecesary=Yêu cầu 'Trình kết nối TakePOS'
-OrderPrinters=Yêu cầu máy in
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Tìm kiếm sản phẩm
 Receipt=Bên nhận
 Header=Tiêu đề
@@ -56,8 +57,9 @@ Paymentnumpad=Loại Bảng để nhập thanh toán
 Numberspad=Bảng số
 BillsCoinsPad=Bảng tiền xu và tiền giấy
 DolistorePosCategory=Các mô-đun TakePOS và các giải pháp POS khác cho Dolibarr
-TakeposNeedsCategories=TakePOS cần các danh mục sản phẩm để hoạt động
-OrderNotes=Ghi chú đơn hàng
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Tài khoản mặc định được sử dụng để thanh toán trong
 NoPaimementModesDefined=Không có chế độ thanh toán được xác định trong cấu hình TakePOS
 TicketVatGrouped=VAT nhóm theo tỷ lệ trong vé | biên lai
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Hóa đơn đã được xác nhận
 NoLinesToBill=Không có dòng hóa đơn
 CustomReceipt=Biên nhận tùy chỉnh
 ReceiptName=Tên biên nhận
-ProductSupplements=Sản phẩm bổ sung
+ProductSupplements=Manage supplements of products
 SupplementCategory=Danh mục bổ sung
 ColorTheme=Màu giao diện
 Colorful=Màu sắc
@@ -92,7 +94,7 @@ Browser=Trình duyệt
 BrowserMethodDescription=In hóa đơn đơn giản và dễ dàng. Chỉ có một vài tham số để cấu hình hóa đơn. In qua trình duyệt.
 TakeposConnectorMethodDescription=Module ngoài với các tính năng bổ sung. Khả năng in từ đám mây.
 PrintMethod=Phương pháp in
-ReceiptPrinterMethodDescription=Phương pháp mạnh mẽ với rất nhiều thông số. Hoàn toàn tùy biến với các mẫu. Không thể in từ đám mây.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=Bởi cổng
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index 45dff33ca44..8f4d91ccfe4 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Thẻ/ Danh mục
 Rubriques=Thẻ/ Danh mục
 RubriquesTransactions=Thẻ/ Danh mục của giao dịch
 categories=thẻ/danh mục
-NoCategoryYet=Chưa tạo thẻ/ danh mục của loại này
+NoCategoryYet=No tag/category of this type has been created
 In=Trong
 AddIn=Thêm vào
 modify=sửa đổi
 Classify=Phân loại
 CategoriesArea=Khu vực thẻ/danh mục
-ProductsCategoriesArea=Khu vực thẻ/danh mục cho sản phẩm/dịch vụ
-SuppliersCategoriesArea=Khu vực thẻ/ danh mục nhà cung cấp
-CustomersCategoriesArea=Khu vực thẻ/danh mục khách hàng
-MembersCategoriesArea=Khu vực thẻ/danh mục thành viên
-ContactsCategoriesArea=Khu vực thẻ/ danh mục liên lạc
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Khu vực thẻ/ danh mục dự án
-UsersCategoriesArea=Khu vực thẻ/ danh mục người dùng
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Danh mục con
 CatList=Danh sách thẻ/danh mục
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Chọn danh mục
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Sử dụng hoặc điều hành các danh mục
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index a35ab2ab2b0..dd2cc674f90 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Tên công ty %s đã tồn tại. Chọn tên khác khác.
 ErrorSetACountryFirst=Thiết lập quốc gia trước
 SelectThirdParty=Chọn một bên thứ ba
-ConfirmDeleteCompany=Bạn có chắc chắn muốn xóa công ty này và tất cả thông tin được kế thừa?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Xóa một liên lạc/địa chỉ
-ConfirmDeleteContact=Bạn có chắc chắn muốn xóa liên lạc này và tất cả thông tin được kế thừa?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=Bên thứ ba mới
 MenuNewCustomer=Khách hàng mới
 MenuNewProspect=Triển vọng mới
@@ -69,7 +69,7 @@ PhoneShort=Tel
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Từ chối gửi email hàng loạt
@@ -78,7 +78,7 @@ Zip=Mã Zip
 Town=Thành phố
 Web=Web
 Poste= Chức vụ
-DefaultLang=Ngôn ngữ mặc định
+DefaultLang=Default language
 VATIsUsed=Thuế bán hàng được sử dụng
 VATIsUsedWhenSelling=Định nghĩa này nếu bên thứ ba này có bao gồm thuế bán hàng hay không khi họ tạo hóa đơn cho khách hàng của mình
 VATIsNotUsed=Thuế kinh doanh không được dùng
@@ -331,7 +331,7 @@ CustomerCodeDesc=Mã khách hàng, duy nhất cho tất cả khách hàng
 SupplierCodeDesc=Mã nhà cung cấp, duy nhất cho tất cả các nhà cung cấp
 RequiredIfCustomer=Yêu cầu nếu bên thứ ba là một khách hàng hoặc KH tiềm năng
 RequiredIfSupplier=Buộc phải nhập nếu bên thứ ba là nhà cung cấp
-ValidityControledByModule=Hiệu lực được kiểm soát bởi mô-đun
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Quy tắc cho mô-đun này
 ProspectToContact=KH tiềm năng để liên lạc
 CompanyDeleted=Công ty "%s" đã xóa khỏi cơ sở dữ liệu.
@@ -439,12 +439,12 @@ ListSuppliersShort=Danh sách nhà cung cấp
 ListProspectsShort=Danh sách các triển vọng
 ListCustomersShort=Danh sách khách hàng
 ThirdPartiesArea=Bên thứ ba/ Liên lạc
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Tổng số bên thứ ba
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Mở
 ActivityCeased=Đóng
 ThirdPartyIsClosed=Bên thứ ba bị đóng
-ProductsIntoElements=Danh sách sản phẩm/ dịch vụ vào %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Công nợ hiện tại
 OutstandingBill=Công nợ tối đa
 OutstandingBillReached=Tối đa cho hóa đơn chưa thanh toán
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=Mã này tự do. Mã này có thể được sửa đổ
 ManagingDirectors=Tên quản lý (CEO, giám đốc, chủ tịch...)
 MergeOriginThirdparty=Sao y bên thứ ba (bên thứ ba bạn muốn xóa)
 MergeThirdparties=Hợp nhất bên thứ ba
-ConfirmMergeThirdparties=Bạn có chắc chắn muốn hợp nhất bên thứ ba này vào bên hiện tại không? Tất cả các đối tượng được liên kết (hóa đơn, đơn đặt hàng, ...) sẽ được chuyển sang bên thứ ba hiện tại, sau đó bên thứ ba sẽ bị xóa.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Các bên thứ ba đã được sáp nhập
 SaleRepresentativeLogin=Đăng nhập của đại diện bán hàng
 SaleRepresentativeFirstname=Tên đại diện bán hàng
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index ea724951735..e55aee4b875 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=Giảm giá mới
 NewCheckDeposit=Tiền gửi kiểm tra mới
 NewCheckDepositOn=Tạo nhận đối với tiền gửi trên tài khoản: %s
 NoWaitingChecks=Không có séc chờ đặt cọc
-DateChequeReceived=Kiểm tra ngày tiếp nhận
+DateChequeReceived=Check receiving date
 NbOfCheques=Số lượng séc
 PaySocialContribution=Nộp thuế xã hội / tài chính
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang
index 10952377cc4..4e78a6ed156 100644
--- a/htdocs/langs/vi_VN/ecm.lang
+++ b/htdocs/langs/vi_VN/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 872a1d3b568..eec57671b9e 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=Không có lỗi, chúng tôi cam kết
 # Errors
 ErrorButCommitIsDone=Lỗi được tìm thấy nhưng chúng tôi xác nhận mặc dù điều này
-ErrorBadEMail=Email %s là sai
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url% s là sai
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Giá trị xấu cho tham số của bạn. Nói chung khi dịch bị thiếu.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Đăng nhập% s đã tồn tại.
@@ -46,8 +46,8 @@ ErrorWrongDate=Ngày là không đúng!
 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=Người dùng không thể bị xóa. Có lẽ nó được liên kết với các thực thể Dolibarr.
-ErrorFieldsRequired=Một số trường yêu cầu không được lấp đầy.
-ErrorSubjectIsRequired=Chủ đề email là bắt buộc
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject 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
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=Trang/ khung chứa <strong>%s</stron
 ErrorDuringChartLoad=Lỗi khi tải hệ thống tài khoản. Nếu một vài tài khoản chưa được tải, bạn vẫn có thể nhập chúng theo cách thủ công.
 ErrorBadSyntaxForParamKeyForContent=Cú pháp sai cho thông số keycontcontent. Phải có giá trị bắt đầu bằng %s hoặc %s
 ErrorVariableKeyForContentMustBeSet=Lỗi, hằng số có tên %s (có nội dung văn bản sẽ hiển thị) hoặc %s (có url bên ngoài để hiển thị) phải được đặt.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s phải bắt đầu bằng http: // hoặc https: //
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Lỗi, tham chiếu mới đã được sử dụng
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/vi_VN/eventorganization.lang b/htdocs/langs/vi_VN/eventorganization.lang
new file mode 100644
index 00000000000..13b14f0c1e5
--- /dev/null
+++ b/htdocs/langs/vi_VN/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Cài đặt
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Dự thảo
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Đã hoàn thành
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/vi_VN/knowledgemanagement.lang b/htdocs/langs/vi_VN/knowledgemanagement.lang
new file mode 100644
index 00000000000..0de9c4ff2c6
--- /dev/null
+++ b/htdocs/langs/vi_VN/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Cài đặt
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = Về
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Điều
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 59190543259..2b9f6f9bd28 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=(những) Người dùng
 MailCC=Sao chép vào
 MailToCCUsers=Sao chép cho (những) người dùng
 MailCCC=Bản cache để
-MailTopic=Đề mục Email
+MailTopic=Email subject
 MailText=Tin nhắn
 MailFile=File đính kèm
 MailMessage=Nội dung Email
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Cấu hình gửi email đã được thiết lập thành '%s'. Chế độ này không thể được sử dụng để gửi email hàng loạt.
 MailSendSetupIs2=Trước tiên, bạn phải đi, với tài khoản quản trị viên, vào menu %sNhà - Cài đặt - EMails %s để thay đổi tham số <strong>'%s'</strong> để sử dụng chế độ '%s' . Với chế độ này, bạn có thể nhập thiết lập máy chủ SMTP do Nhà cung cấp dịch vụ Internet của bạn cung cấp và sử dụng tính năng gửi email hàng loạt.
 MailSendSetupIs3=Nếu bạn có bất kỳ câu hỏi nào về cách thiết lập máy chủ SMTP của mình, bạn có thể hỏi %s.
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index b8bef1f3bf1..d6b2960b446 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Lưu và tạo mới
 TestConnection=Kiểm tra kết nối
 ToClone=Nhân bản
 ConfirmCloneAsk=Có chắc bạn muốn sao chép <b>%s </b>không?
-ConfirmClone=Chọn dữ liệu bạn muốn sao chép:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=Không có dữ liệu nhân bản được xác định.
 Of=của
 Go=Tới
@@ -246,7 +246,7 @@ DefaultModel=Mẫu tài liệu mặc định
 Action=Sự kiện
 About=Về
 Number=Số
-NumberByMonth=Số theo tháng
+NumberByMonth=Total reports by month
 AmountByMonth=Số tiền theo tháng
 Numero=Số
 Limit=Giới hạn
@@ -341,8 +341,8 @@ KiloBytes=Kilobyte
 MegaBytes=MB
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Người dùng để tạo
-UserModif=Người dùng để cập nhật mới nhất
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=Theo
 From=Từ
 FromDate=Từ
 FromLocation=Từ
-at=at
 to=đến
 To=đến
+ToDate=đến
+ToLocation=đến
+at=at
 and=và
 or=hoặc
 Other=Khác
@@ -843,7 +845,7 @@ XMoreLines=%s dòng ẩn
 ShowMoreLines=Hiển thị thêm hơn/ ít dòng
 PublicUrl=URL công khai
 AddBox=Thêm hộp
-SelectElementAndClick=Chọn một yếu tố và nhấp vào %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=In tập tin %s
 ShowTransaction=Hiển thị mục trên tài khoản ngân hàng
 ShowIntervention=Hiện can thiệp
@@ -854,8 +856,8 @@ Denied=Đã từ chối
 ListOf=Danh sách %s
 ListOfTemplates=Danh sách các mẫu
 Gender=Giới tính
-Genderman=Nam
-Genderwoman=Nữ
+Genderman=Male
+Genderwoman=Female
 Genderother=Khác
 ViewList=Danh sách xem
 ViewGantt=Xem dạng Gantt
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 5f510070f92..c2df22f839f 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Một thành viên khác (tên: <b>%s
 ErrorUserPermissionAllowsToLinksToItselfOnly=Vì lý do bảo mật, bạn phải được cấp quyền chỉnh sửa tất cả người dùng để có thể liên kết thành viên với người dùng không phải của bạn.
 SetLinkToUser=Liên kết với người dùng Dolibarr
 SetLinkToThirdParty=Liên kết với bên thứ ba Dolibarr
-MembersCards=Danh thiếp thành viên
+MembersCards=Business cards for members
 MembersList=Danh sách thành viên
 MembersListToValid=Danh sách thành viên dự thảo (sẽ được xác nhận)
 MembersListValid=Danh sách thành viên hợp lệ
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Thành viên có đăng ký để nhận
 MembersWithSubscriptionToReceiveShort=Đăng ký để nhận
 DateSubscription=Ngày đăng ký
 DateEndSubscription=Ngày kết thúc đăng ký
-EndSubscription=Kết thúc đăng ký
+EndSubscription=Subscription Ends
 SubscriptionId=Id đăng ký
 WithoutSubscription=Without subscription
 MemberId=ID Thành viên
@@ -83,10 +83,10 @@ WelcomeEMail=Email chào mừng
 SubscriptionRequired=Yêu cầu đăng ký
 DeleteType=Xóa
 VoteAllowed=Bình chọn cho phép
-Physical=Vật lý
-Moral=Đạo đức
-MorAndPhy=Moral and Physical
-Reenable=Bật lại
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Chấm dứt thành viên
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Thống kê thành viên theo quốc gia
 MembersStatisticsByState=Thống kê thành viên theo tiểu bang / tỉnh
 MembersStatisticsByTown=Thống kê thành viên theo thị trấn
 MembersStatisticsByRegion=Thống kê thành viên theo khu vực
-NbOfMembers=Số lượng thành viên
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=Không có thành viên đã xác nhận tìm thấy
-MembersByCountryDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên của các quốc gia. Tuy nhiên, đồ họa phụ thuộc vào dịch vụ đồ thị trực tuyến của Google và chỉ khả dụng nếu kết nối internet đang hoạt động.
-MembersByStateDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên theo tiểu bang / tỉnh / bang.
-MembersByTownDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên theo thị trấn.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Chọn thống kê mà bạn muốn đọc ...
 MenuMembersStats=Thống kê
-LastMemberDate=Ngày thành viên mới nhất
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Ngày đăng ký mới nhất
-MemberNature=Bản chất của thành viên
-MembersNature=Nature of members
-Public=Thông tin là công khai
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=Thành viên mới được thêm vào. Chờ phê duyệt
 NewMemberForm=Hình thức thành viên mới
-SubscriptionsStatistics=Thống kê về đăng ký
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Số lượng đăng ký
-AmountOfSubscriptions=Số tiền đăng ký
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Doanh thu (cho một công ty) hoặc Ngân sách (cho một tổ chức)
 DefaultAmount=Số tiền đăng ký mặc định
 CanEditAmount=Khách truy cập có thể chọn / chỉnh sửa số tiền đăng ký của họ
 MEMBER_NEWFORM_PAYONLINE=Nhảy vào trang thanh toán trực tuyến được tích hợp
 ByProperties=Theo bản chất tự nhiên
 MembersStatisticsByProperties=Thống kê thành viên theo bản chất
-MembersByNature=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên theo bản chất.
-MembersByRegion=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên theo khu vực.
 VATToUseForSubscriptions=Thuế suất VAT được sử dụng để đăng ký
 NoVatOnSubscription=Không có VAT cho đăng ký
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Sản phẩm được sử dụng cho dòng đăng ký vào hóa đơn: %s
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index 99ce316be1e..6a1addc2a0d 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=Danh sách các quyền được định nghĩa
 SeeExamples=Xem ví dụ ở đây
 EnabledDesc=Điều kiện để có trường này hoạt động (Ví dụ: 1 hoặc $conf-> golobal->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Hiển thị trên file PDF
 IsAMeasureDesc=Giá trị của trường có thể được tích lũy để có được tổng số vào danh sách không? (Ví dụ: 1 hoặc 0)
 SearchAllDesc=Là trường được sử dụng để thực hiện tìm kiếm từ công cụ tìm kiếm nhanh? (Ví dụ: 1 hoặc 0)
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index c92b2668971..0a96b0891f0 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Cài đặt hoặc kích hoạt thư viện GD trên bản c
 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ê tổng số lượng sản phẩm / dịch vụ
-StatsByNumberOfEntities=Thống kê về số lượng thực thể tham chiếu (số hóa đơn hoặc đơn đặt hàng ...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Số lượng đề xuất
 NumberOfCustomerOrders=Số lượng đơn đặt hàng bán
 NumberOfCustomerInvoices=Số lượng hóa đơn khách hàng
@@ -289,4 +289,4 @@ PopuProp=Sản phẩm/Dịch vụ phổ biến trong Đơn đề xuất
 PopuCom=Sản phẩm/dịch vụ phổ biến trong Đơn hàng
 ProductStatistics=Thống kê sản phẩm/dịch vụ
 NbOfQtyInOrders=Số lượng đã đặt hàng
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/vi_VN/partnership.lang b/htdocs/langs/vi_VN/partnership.lang
new file mode 100644
index 00000000000..0a690c176b4
--- /dev/null
+++ b/htdocs/langs/vi_VN/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Ngày bắt đầu
+DatePartnershipEnd=Ngày kết thúc
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Dự thảo
+PartnershipAccepted = Đã được chấp nhận
+PartnershipRefused = Bị từ chối
+PartnershipCanceled = Đã hủy
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
index d6942190bd5..664b919a209 100644
--- a/htdocs/langs/vi_VN/productbatch.lang
+++ b/htdocs/langs/vi_VN/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 9727502004b..de924f3ac3a 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Dịch vụ chỉ để bán
 ServicesOnPurchaseOnly=Dịch vụ chỉ để mua
 ServicesNotOnSell=Dịch vụ không để bán, không mua
 ServicesOnSellAndOnBuy=Dịch vụ để bán và mua
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=%s sản phẩm mới được ghi lại
 LastRecordedServices=%s dịch vụ mới được ghi lại
 CardProduct0=Sản phẩm
@@ -73,12 +73,12 @@ SellingPrice=Giá bán
 SellingPriceHT=Giá bán (chưa thuế)
 SellingPriceTTC=Giá bán (đã có thuế.)
 SellingMinPriceTTC=Giá bán tối thiểu (gồm thuế)
-CostPriceDescription=Trường giá này (chưa bao gồm thuế) có thể được sử dụng để lưu số tiền trung bình chi phí của sản phẩm cho công ty của bạn. Nó có thể là bất kỳ giá nào bạn tự tính toán, ví dụ từ giá mua trung bình cộng với chi phí sản xuất và phân phối trung bình.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=Giá trị này sẽ được sử dụng cho tính toán biên độ lợi nhuận
 SoldAmount=Tổng bán
 PurchasedAmount=Tổng mua
 NewPrice=Giá mới
-MinPrice=Giá bán tối thiểu
+MinPrice=Min. selling price
 EditSellingPriceLabel=Sửa đổi nhãn giá bán
 CantBeLessThanMinPrice=Giá bán không thấp hơn mức tối thiểu được cho phép của sản phẩm này (%s chưa thuế). Thông điệp này chỉ xuất hiện khi bạn nhập giảm giá quá lớn.
 ContractStatusClosed=Đã đóng
@@ -157,11 +157,11 @@ ListServiceByPopularity=Danh sách các dịch vụ phổ biến
 Finished=Thành phẩm
 RowMaterial=Nguyên liệu
 ConfirmCloneProduct=Bạn có chắc muốn sao chép sản phẩm này <b>%s</b> ?
-CloneContentProduct=Sao chép tất cả thông tin chính của sản phẩm/ dịch vụ
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Sao chép giá
-CloneCategoriesProduct=Sao chép thẻ/ danh mục được liên kết
-CloneCompositionProduct=Sao chép sản phẩm/ dịch vụ ảo
-CloneCombinationsProduct=Sao chép các biến thể của sản phẩm
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Sản phẩm này đã được dùng
 NewRefForClone=Tham chiếu sản phẩm/dịch vụ mới
 SellingPrices=Giá bán
@@ -170,12 +170,12 @@ CustomerPrices=Giá khách hàng
 SuppliersPrices=Giá nhà cung cấp
 SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (của sản phẩm hoặc dịch vụ)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Nước xuất xứ
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Loại sản phẩm  (nguyên liệu / thành phẩm)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Nhãn ngắn
 Unit=Đơn vị
 p=u.
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index e87f7bf0ced..5736bb007fe 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Đàu mối dự án
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Tất cả dự án tôi có thể đọc (của tôi + công khai)
 AllProjects=Tất cả dự án
-MyProjectsDesc=Chế độ xem này được giới hạn cho các dự án mà bạn là người liên lạc
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=Phần xem này hiển thị tất cả các dự án mà bạn được phép đọc.
 TasksOnProjectsPublicDesc=Chế độ xem này trình bày tất cả các nhiệm vụ trên các dự án bạn được phép đọc.
 ProjectsPublicTaskDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép đọc.
 ProjectsDesc=Phần xem này hiển thị tất cả các dự án (quyền người dùng cấp cho bạn được phép xem mọi thứ).
 TasksOnProjectsDesc=Phần xem này thể hiện tất cả các nhiệm vụ trên tất cả các dự án (quyền người dùng của bạn cấp cho bạn quyền xem mọi thứ).
-MyTasksDesc=Chế độ xem này được giới hạn trong các dự án hoặc nhiệm vụ mà bạn là người liên lạc
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Chỉ các dự án mở được hiển thị (các dự án ở trạng thái dự thảo hoặc đóng không hiển thị).
 ClosedProjectsAreHidden=Các dự án đóng không nhìn thấy được.
 TasksPublicDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép đọc.
 TasksDesc=Phần xem này hiển thị tất cả các dự án và tác vụ (quyền người dùng của bạn hiện đang cho phép bạn xem tất cả thông tin).
 AllTaskVisibleButEditIfYouAreAssigned=Tất cả các nhiệm vụ cho các dự án đủ điều kiện đều hiển thị, nhưng bạn chỉ có thể nhập thời gian cho nhiệm vụ được giao cho người dùng đã chọn. Phân công nhiệm vụ nếu bạn cần nhập thời gian vào nó.
-OnlyYourTaskAreVisible=Chỉ có nhiệm vụ được giao cho bạn là có thể nhìn thấy. Giao nhiệm vụ cho chính bạn nếu nó không hiển thị và bạn cần nhập thời gian vào nó.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Nhiệm vụ của dự án
 ProjectCategories=Thẻ dự án/ danh mục
 NewProject=Dự án mới
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Không được giao nhiệm vụ
 NoUserAssignedToTheProject=Không có người dùng nào được chỉ định cho dự án này
 TimeSpentBy=Thời gian đã qua bởi
 TasksAssignedTo=Nhiệm vụ được giao
-AssignTaskToMe=Giao việc cho tôi
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Giao nhiệm vụ cho %s
 SelectTaskToAssign=Chọn nhiệm vụ để giao...
 AssignTask=Phân công
diff --git a/htdocs/langs/vi_VN/recruitment.lang b/htdocs/langs/vi_VN/recruitment.lang
index c62da50ed0c..c1d145f9b0a 100644
--- a/htdocs/langs/vi_VN/recruitment.lang
+++ b/htdocs/langs/vi_VN/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index 0311215ed2a..cdfa18ad8f3 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Bạn có chắc chắn muốn xác nhận lô hàng này
 ConfirmCancelSending=Bạn có chắc chắn muốn hủy lô hàng này?
 DocumentModelMerou=Mô hình Merou A5
 WarningNoQtyLeftToSend=Cảnh báo, không có sản phẩm chờ đợi để được vận chuyển.
-StatsOnShipmentsOnlyValidated=Thống kê tiến hành với các chuyến hàng chỉ xác nhận. Ngày sử dụng là ngày xác nhận giao hàng (dự ngày giao hàng không phải luôn luôn được biết đến).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Ngày giao hàng theo kế hoạch
 RefDeliveryReceipt=Tham chiếu biên nhận giao hàng
 StatusReceipt=Trạng thái biên nhận giao hàng
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 1a90a0e49ff..6ca53c6ae44 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=Không có sản phẩm được xác định trư
 DispatchVerb=Công văn
 StockLimitShort=Hạn cảnh báo
 StockLimit=Hạn tồn kho cho cảnh báo
-StockLimitDesc=(trống) có nghĩa là không có cảnh báo. <br> 0 có thể được sử dụng để cảnh báo ngay khi tồn kho trống.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Tồn kho vật lý
 RealStock=Tồn kho thực
 RealStockDesc=Vật lý/ tồn kho thực là tồn kho hiện tại trong kho.
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index 019f7aeb3af..73fbed5392e 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Mật khẩu đã đổi sang: %s
 SubjectNewPassword=Mật khẩu mới của bạn cho %s
 GroupRights=Quyền Nhóm
 UserRights=Quyền người dùng
+Credentials=Credentials
 UserGUISetup=Cài đặt hiển thị người dùng
 DisableUser=Vô hiệu hoá
 DisableAUser=Vô hiệu hóa người dùng
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Dùng trường Loại để thay đổi
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Sử dụng OpenID để đăng nhập
 WeeklyHours=Giờ đã làm (theo tuần)
-ExpectedWorkedHours=Dự kiến giờ làm việc mỗi tuần
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Màu của người dùng
 DisabledInMonoUserMode=Vô hiệu hóa trong chế độ bảo trì
 UserAccountancyCode=Mã kế toán của người dùng
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Ngày bắt đầu làm việc
 DateEmploymentEnd=Ngày kết thúc việc làm
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Bạn không thể vô hiệu hóa hồ sơ người dùng của bạn
 ForceUserExpenseValidator=Thúc phê duyệt báo cáo chi phí
 ForceUserHolidayValidator=Thúc phê duyệt báo cáo chi phí
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 9696a7d6d44..c88a35daf86 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 1079a11bcfe..6d6fdd5baa6 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -202,7 +202,7 @@ Docref=参考
 LabelAccount=标签帐户
 LabelOperation=标签操作
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=刻字代码
 Lettering=Lettering
 Codejournal=日记帐
@@ -297,7 +297,7 @@ NoNewRecordSaved=没有更多的记录记录
 ListOfProductsWithoutAccountingAccount=未绑定到任何会计科目的产品列表
 ChangeBinding=更改绑定
 Accounted=占总账
-NotYetAccounted=尚未计入分类帐
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=未调解
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 20c23406c24..0ddf580c5f6 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=删除/重命名文件<b> %s </b>（如果存在），以允许使用
 RestoreLock=恢复文件<b> %s </b>的只读权限，以禁止升级工具的使用。
 SecuritySetup=安全设置
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=在此定义与上载文件的安全性相关的选项。
 ErrorModuleRequirePHPVersion=错误，此模块要求 PHP 版本 %s 或更高
 ErrorModuleRequireDolibarrVersion=错误，此模块要求 Dolibarr 版本 %s 或更高
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=不提示
 NoActiveBankAccountDefined=没有定义有效的银行帐户
 OwnerOfBankAccount=银行帐户 %s 的户主
 BankModuleNotActive=银行账户模块没有启用
-ShowBugTrackLink=显示链接 "<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=警告
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=您必须以 <b>%s</b> 用户
 YourPHPDoesNotHaveSSLSupport=SSL 在您的 PHP 中不可用
 DownloadMoreSkins=下载更多外观主题
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=部分翻译
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index 96a4fe4a833..958757ffeda 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=支付社保/财政税
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=内部转移
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=从
 TransferTo=至
 TransferFromToDone=从<b>%s</b>向<b>%s</b>转帐<b>%s</b>已被记录。
-CheckTransmitter=发射机
+CheckTransmitter=发送方
 ValidateCheckReceipt=验证此支票收据？
-ConfirmValidateCheckReceipt=您确定要验证此支票收据，一旦完成，是否可以进行更改？
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=删除此支票收据？
 ConfirmDeleteCheckReceipt=您确定要删除此支票收据吗？
 BankChecks=银行支票
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=您确定要删除此条目吗？
 ThisWillAlsoDeleteBankRecord=这也将删除生成的银行条目
 BankMovements=移动
 PlannedTransactions=计划的条目
-Graph=图表
+Graph=Graphs
 ExportDataset_banque_1=银行条目和帐户对帐单
 ExportDataset_banque_2=存款单
 TransactionOnTheOtherAccount=交易的其他帐户
@@ -142,7 +142,7 @@ AllAccounts=所有银行和现金账户
 BackToAccount=回到帐户
 ShowAllAccounts=显示所有帐户
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=选择/过滤支票以包括在支票存款收据中，然后单击“创建”。
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=选择与税率有关的银行声明。 使用一个合适的数值: YYYYMM 或 YYYYMMDD
 EventualyAddCategory=最后，指定一个范畴对其中的记录进行分类
 ToConciliate=调节？
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 114560a8b53..270e7c8f78a 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=将超额付款转换为可用折扣
 EnterPaymentReceivedFromCustomer=输入从客户收到的付款
 EnterPaymentDueToCustomer=为客户创建付款延迟
 DisabledBecauseRemainderToPayIsZero=禁用，因为未支付金额为0
-PriceBase=价格基准
+PriceBase=Base price
 BillStatus=发票状态
 StatusOfGeneratedInvoices=生成的发票的状态
 BillStatusDraft=草案(需要确认)
@@ -454,7 +454,7 @@ RegulatedOn=规范了
 ChequeNumber=Check N°
 ChequeOrTransferNumber=支票/转账 N°
 ChequeBordereau=检查计划任务
-ChequeMaker=查看/追踪物流
+ChequeMaker=Check/Transfer sender
 ChequeBank=银行支票
 CheckBank=支票
 NetToBePaid=需要净支出
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index 864117c4789..0f72cb46cb6 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=执行中的逾期时间最长的服务
 BoxLastExpiredServices=最近 %s 老联系人激活过期服务
 BoxTitleLastActionsToDo=最近的 %s 个动作
-BoxTitleLastContracts=最新的%s修改后的合同
-BoxTitleLastModifiedDonations=最近变更的 %s 份捐款
-BoxTitleLastModifiedExpenses=最近变更的 %s 份费用报表
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=全局活动(账单,报价,订单)
 BoxGoodCustomers=优质客户
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index bcaf0780474..3d9202d5443 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=地板
 AddTable=添加表格
 Place=地点
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=订购打印机
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=搜索产品
 Receipt=收据
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=浏览器
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index d9f0d4cf96f..e6d0e6211da 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -3,20 +3,20 @@ Rubrique=标签/分类
 Rubriques=标签/分类
 RubriquesTransactions=交易的标签/类别
 categories=标签/分类
-NoCategoryYet=创建的类型无标签/分类
+NoCategoryYet=No tag/category of this type has been created
 In=在
 AddIn=加入
 modify=变更
 Classify=分类
 CategoriesArea=标签/分类区
-ProductsCategoriesArea=产品/服务 标签/分类区
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=客户标签/类别区
-MembersCategoriesArea=会员标签/分类区
-ContactsCategoriesArea=联系人标签/分类信息区
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=项目标签/分类区
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=子类别
 CatList=标签/分类列表
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=选择类别
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 0575152ba7d..71264d4f3d8 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=公司名称%s已经存在。请使用其它名称。
 ErrorSetACountryFirst=请先设置国家
 SelectThirdParty=选择合伙人
-ConfirmDeleteCompany=你确定要删除本公司及所有关联信息？
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=删除联络人
-ConfirmDeleteContact=你确定要删除这个联系人和所有关联信息？
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=电话
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=工作电话
+PhonePro=Bus. phone
 PhonePerso=私人电话
 PhoneMobile=手机
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=邮政编码
 Town=城市
 Web=网站
 Poste= 位置
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=不含增值税
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=要求合伙人为客户或是准客户
 RequiredIfSupplier=如果合伙人是供应商，则必需
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=准客户到联系人
 CompanyDeleted=公司“%的”从数据库中删除。
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=打开
 ActivityCeased=禁用
 ThirdPartyIsClosed=合伙人已关闭
-ProductsIntoElements= %s 的中产品/服务列表
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=当前优质账单
 OutstandingBill=优质账单最大值
 OutstandingBillReached=已达到最大优质账单值
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=客户/供应商代码是免费的。此代码可以随
 ManagingDirectors=公司高管(s)称呼 (CEO, 董事长, 总裁...)
 MergeOriginThirdparty=重复合伙人(合伙人要删除)
 MergeThirdparties=合并合伙人
-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 third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=第三方已合并
 SaleRepresentativeLogin=销售代表登陆
 SaleRepresentativeFirstname=销售代表的名字
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index cb4815b8ab6..ddafa9046fd 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=新优惠
 NewCheckDeposit=新的支票存款
 NewCheckDepositOn=创建于账户上的存款收据：%s的
 NoWaitingChecks=空空如也——没有等待支票存款
-DateChequeReceived=支票接收日期
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=支付社会/财政税
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/zh_CN/ecm.lang b/htdocs/langs/zh_CN/ecm.lang
index 5ac4ee9542f..6239da16498 100644
--- a/htdocs/langs/zh_CN/ecm.lang
+++ b/htdocs/langs/zh_CN/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 0fbfa09aab9..f3840ee22b4 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=没有错误，我们承诺
 # Errors
 ErrorButCommitIsDone=发现错误我们将进行验证
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=网址 %s 有误
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=参数值不正确。它通常在缺少翻译时附加。
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=登陆%s已经存在。
@@ -46,8 +46,8 @@ ErrorWrongDate=日期不正确！
 ErrorFailedToWriteInDir=无法写在目录%s
 ErrorFoundBadEmailInFile=找到%S的语法不正确的电子邮件文件中的行（例如行%的电子邮件s =%s）的
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=一些必要的栏位都没有填补。
-ErrorSubjectIsRequired=电子邮件主题是必需的
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=无法创建一个目录。检查Web服务器的用户有权限写入Dolibarr文件目录。如果参数<b>safe_mode设置</b>为启用这个PHP，检查Dolibarr php文件到Web服务器的用户拥有（或组）。
 ErrorNoMailDefinedForThisUser=没有邮件定义该用户
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/zh_CN/eventorganization.lang b/htdocs/langs/zh_CN/eventorganization.lang
new file mode 100644
index 00000000000..90ded2ddd49
--- /dev/null
+++ b/htdocs/langs/zh_CN/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = 设置
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = 草稿
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = 完成
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/zh_CN/knowledgemanagement.lang b/htdocs/langs/zh_CN/knowledgemanagement.lang
new file mode 100644
index 00000000000..bd0b2f939c5
--- /dev/null
+++ b/htdocs/langs/zh_CN/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = 设置
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = 关于
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = 项目
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 948f4d6d845..57d3caf2bc0 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=给用户
 MailCC=抄送
 MailToCCUsers=复制给用户
 MailCCC=缓存副本
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=内容
 MailFile=附件
 MailMessage=电子邮件正文
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Email电子邮箱配置设定 '%s'. 这个模式无法用于邮件群发。
 MailSendSetupIs2=首先您得这么地, 得先有个管理员账号吧 admin , 进入菜单 %s主页 - 设置 - EMails%s 修改参数 <strong>'%s'</strong> 用 '%s'模式。 在此模式下， 您才可输入一个 SMTP 服务器地址 来供您收发邮件。
 MailSendSetupIs3=如果你对 SMTP 服务器的配置方面有疑问, 你可到这里询问 %s.
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index b9dfc7beb43..2c4186f315b 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名成员 (名称： <b>%s</b>
 ErrorUserPermissionAllowsToLinksToItselfOnly=出于安全原因，您必须被授予权限编辑所有用户能够连接到用户的成员是不是你的。
 SetLinkToUser=用户链接到Dolibarr
 SetLinkToThirdParty=链接到Dolibarr合作方
-MembersCards=会员名片
+MembersCards=Business cards for members
 MembersList=会员列表
 MembersListToValid=准会员 (待验证)列表
 MembersListValid=有效人员名录
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=接受订阅会员
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=认购日期
 DateEndSubscription=认购结束日期
-EndSubscription=最终订阅
+EndSubscription=Subscription Ends
 SubscriptionId=认购编号
 WithoutSubscription=Without subscription
 MemberId=会员ID
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=是否订阅
 DeleteType=删除
 VoteAllowed=是否允许投票
-Physical=普通会员
-Moral=荣誉会员
-MorAndPhy=Moral and Physical
-Reenable=重新启用
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=终止会员
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=按国别统计人员
 MembersStatisticsByState=成员由州/省的统计信息
 MembersStatisticsByTown=按村镇统计人员
 MembersStatisticsByRegion=各地区会员统计
-NbOfMembers=人员数量
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=空空如也——未发现已经验证的成员
-MembersByCountryDesc=这个界面显示按国别统计人员的数据。图形依赖于谷歌在线图形服务，因此当然需要连网才能正常工作。
-MembersByStateDesc=此界面显示按省/市/村镇统计人员的数据。
-MembersByTownDesc=此界面显示按村镇统计人员的数据。
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=选择你想读的统计...
 MenuMembersStats=统计
-LastMemberDate=最新成员日期
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=最新订阅日期
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=信息是否公开
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=增加了新成员。等待批准中
 NewMemberForm=新成员申请表
-SubscriptionsStatistics=统计数据上的订阅
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=订阅数
-AmountOfSubscriptions=订阅金额
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=营业额（公司）或财政预算案（基础）
 DefaultAmount=默认订阅数
 CanEditAmount=访客是否允许编辑/选择订阅数
 MEMBER_NEWFORM_PAYONLINE=集成在线支付页面跳转
 ByProperties=自然地
 MembersStatisticsByProperties=成员统计数据
-MembersByNature=此屏幕显示成员的性质统计数据。
-MembersByRegion=此屏幕显示按地区划分的成员统计信息。
 VATToUseForSubscriptions=增值税率，用于订阅
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=产品使用发票明细订阅列表: %s
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index d89035568f3..e9af897fbef 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=已定义权限的列表
 SeeExamples=见这里的例子
 EnabledDesc=激活此字段的条件（示例：1 或 $conf->global->MYMODULE_MYOPTION）
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 4169d86762f..e62ec686b2c 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=这个选项安装或启用PHP的GD支持库。
 ProfIdShortDesc=<b>Prof Id %s</b> 取决于合作方的国别。 <br>例如，对于<b>%s</b>, 它的代码是<b>%s</b>.。
 DolibarrDemo=Dolibarr的ERP / CRM的演示
 StatsByNumberOfUnits=产品/服务数量总和的统计
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=提案数量
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=客户发票数量
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/zh_CN/partnership.lang b/htdocs/langs/zh_CN/partnership.lang
new file mode 100644
index 00000000000..7c93d028f53
--- /dev/null
+++ b/htdocs/langs/zh_CN/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=开始日期
+DatePartnershipEnd=结束日期
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = 草稿
+PartnershipAccepted = 接受
+PartnershipRefused = 已被拒绝
+PartnershipCanceled = 已取消
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
index 76c192781be..1fbb1699543 100644
--- a/htdocs/langs/zh_CN/productbatch.lang
+++ b/htdocs/langs/zh_CN/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index e6f7f593ce6..4e7397d4a13 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=服务（仅销售）
 ServicesOnPurchaseOnly=服务（仅采购）
 ServicesNotOnSell=服务（非出售也非采购）
 ServicesOnSellAndOnBuy=可销售的服务与可采购的服务
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=最近登记的 %s 产品
 LastRecordedServices=最后 %s 已记录服务
 CardProduct0=产品
@@ -73,12 +73,12 @@ SellingPrice=售价
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=售价(税后)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=该值可用于保证金计算。
 SoldAmount=销售总额
 PurchasedAmount=采购总额
 NewPrice=新增价格
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=编辑销售价格标签
 CantBeLessThanMinPrice=售价不能低于此产品的最低价格 (%s 税前)。此消息也可能在您输入折扣巨大时出现
 ContractStatusClosed=已禁用
@@ -157,11 +157,11 @@ ListServiceByPopularity=服务列表(按人气)
 Finished=成品
 RowMaterial=原料
 ConfirmCloneProduct=您确定要克隆产品或服务<b> %s </b>吗？
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=克隆价格
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=复制产品变体
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=此产品已使用
 NewRefForClone=新产品/服务的编号
 SellingPrices=售价
@@ -170,12 +170,12 @@ CustomerPrices=客户价格
 SuppliersPrices=供应商价格
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=产地国
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=标签别名
 Unit=单位
 p=u.
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index d29983a9419..4589082f6b9 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=项目联系人
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=我能阅读的所有项目（我的+公共）
 AllProjects=所有项目
-MyProjectsDesc=此视图仅限于您作为联系人的项目
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=这种观点提出了所有你被允许阅读的项目。
 TasksOnProjectsPublicDesc=此视图显示允许您阅读的项目的所有任务。
 ProjectsPublicTaskDesc=这种观点提出的所有项目，您可阅读任务。
 ProjectsDesc=这种观点提出的所有项目（你的用户权限批准你认为一切）。
 TasksOnProjectsDesc=此视图显示所有项目的所有任务（您的用户权限授予您查看所有项目的权限）。
-MyTasksDesc=此视图仅限于您作为联系人的项目或任务
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=只能看到打开的项目（草稿或关闭状态的项目不可见）。
 ClosedProjectsAreHidden=已关闭的项目是不可见的。
 TasksPublicDesc=这种观点提出的所有项目，您可阅读任务。
 TasksDesc=这种观点提出的所有项目和任务（您的用户权限批准你认为一切）。
 AllTaskVisibleButEditIfYouAreAssigned=合格项目的所有任务都是可见的，但您只能为分配给所选用户的任务输入时间。如果需要在其上输入时间，请分配任务。
-OnlyYourTaskAreVisible=只有分配给您的任务才可见。如果任务不可见并且您需要在其上输入时间，则将任务分配给您自己。
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=项目任务
 ProjectCategories=项目标签/类别
 NewProject=新建项目
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=未分配给任务
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=花费的时间
 TasksAssignedTo=分配给的任务
-AssignTaskToMe=分配任务给自己
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=将任务分配给%s
 SelectTaskToAssign=选择要分配的任务...
 AssignTask=分配
diff --git a/htdocs/langs/zh_CN/recruitment.lang b/htdocs/langs/zh_CN/recruitment.lang
index 02e8dce6590..275b1a7c633 100644
--- a/htdocs/langs/zh_CN/recruitment.lang
+++ b/htdocs/langs/zh_CN/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index 3abc9d1f869..589c33a5cb7 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=您确定要参考<b> %s </b>验证此货件吗？
 ConfirmCancelSending=您确定要取消此货件吗？
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=警告，没有产品等待装运。
-StatsOnShipmentsOnlyValidated=对运输进行统计验证。使用的数据的验证的装运日期(计划交货日期并不总是已知)。
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=计划运输日期
 RefDeliveryReceipt=参考送货收据
 StatusReceipt=状态交货收据
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 979d0a66d28..a9af10ccd53 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=此对象没有预定义的产品。因此，没
 DispatchVerb=派遣
 StockLimitShort=最小预警值
 StockLimit=最小库存预警
-StockLimitDesc=（空）表示没有警告。只要库存为空，可以使用0来发出警告。
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=实际库存
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index eac36116632..849601aab96 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=密码更改为：%s
 SubjectNewPassword=您的新密码为%s
 GroupRights=组权限
 UserRights=用户权限
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=禁用
 DisableAUser=禁用用户
@@ -105,7 +106,7 @@ UseTypeFieldToChange=改变用户字段类型
 OpenIDURL=OpenID URL
 LoginUsingOpenID=使用 OpenID 登陆
 WeeklyHours=工作小时数（每周）
-ExpectedWorkedHours=每周预计的工作时间
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=用户颜色
 DisabledInMonoUserMode=在维护模式下禁用
 UserAccountancyCode=用户科目代码
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index 30e49125fe1..b5b6277ab25 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/zh_HK/accountancy.lang b/htdocs/langs/zh_HK/accountancy.lang
index 786f0194010..354cddb62c2 100644
--- a/htdocs/langs/zh_HK/accountancy.lang
+++ b/htdocs/langs/zh_HK/accountancy.lang
@@ -202,7 +202,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -297,7 +297,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index 8f4508ada53..fb4513a09b4 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Upda
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=Security setup
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
@@ -1159,7 +1160,7 @@ 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>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
 DownloadMoreSkins=More skins to download
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=Show professional id with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
 TranslationUncomplete=Partial translation
@@ -2062,7 +2064,7 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
 AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/zh_HK/banks.lang b/htdocs/langs/zh_HK/banks.lang
index 8e2d828c12a..df7192bee25 100644
--- a/htdocs/langs/zh_HK/banks.lang
+++ b/htdocs/langs/zh_HK/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Credit transfer
 BankTransfers=Credit transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
+CheckTransmitter=Sender
 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?
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
 PlannedTransactions=Planned entries
-Graph=Graphics
+Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Transaction on the other account
@@ -142,7 +142,7 @@ AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
 FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/zh_HK/bills.lang b/htdocs/langs/zh_HK/bills.lang
index c0eb886a987..c55f483873b 100644
--- a/htdocs/langs/zh_HK/bills.lang
+++ b/htdocs/langs/zh_HK/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
+PriceBase=Base price
 BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
@@ -454,7 +454,7 @@ RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Check/Transfer sender
 ChequeBank=Bank of Check
 CheckBank=Check
 NetToBePaid=Net to be paid
diff --git a/htdocs/langs/zh_HK/boxes.lang b/htdocs/langs/zh_HK/boxes.lang
index 4d7ee938c91..0c9ea302fb8 100644
--- a/htdocs/langs/zh_HK/boxes.lang
+++ b/htdocs/langs/zh_HK/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
diff --git a/htdocs/langs/zh_HK/cashdesk.lang b/htdocs/langs/zh_HK/cashdesk.lang
index 3fef645d99d..240503842f3 100644
--- a/htdocs/langs/zh_HK/cashdesk.lang
+++ b/htdocs/langs/zh_HK/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=Floor
 AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -56,8 +57,9 @@ Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
 BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
+ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
 ColorTheme=Color theme
 Colorful=Colorful
@@ -92,7 +94,7 @@ Browser=Browser
 BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
 TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/zh_HK/categories.lang b/htdocs/langs/zh_HK/categories.lang
index 9520ef65a83..29e08f66541 100644
--- a/htdocs/langs/zh_HK/categories.lang
+++ b/htdocs/langs/zh_HK/categories.lang
@@ -3,20 +3,20 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+NoCategoryYet=No tag/category of this type has been created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=Sub-categories
 CatList=List of tags/categories
 CatListAll=List of tags/categories (all types)
@@ -96,4 +96,4 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/zh_HK/companies.lang b/htdocs/langs/zh_HK/companies.lang
index 154400c6536..fbe75f09ab0 100644
--- a/htdocs/langs/zh_HK/companies.lang
+++ b/htdocs/langs/zh_HK/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -69,7 +69,7 @@ PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Prof. phone
+PhonePro=Bus. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Refuse bulk emailings
@@ -78,7 +78,7 @@ Zip=Zip Code
 Town=City
 Web=Web
 Poste= Position
-DefaultLang=Language default
+DefaultLang=Default language
 VATIsUsed=Sales tax used
 VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
@@ -331,7 +331,7 @@ CustomerCodeDesc=Customer Code, unique for all customers
 SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by module
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
@@ -439,12 +439,12 @@ ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
 ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=Open
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/langs/zh_HK/compta.lang b/htdocs/langs/zh_HK/compta.lang
index 926cda53c9f..7cae82e6ac7 100644
--- a/htdocs/langs/zh_HK/compta.lang
+++ b/htdocs/langs/zh_HK/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=New discount
 NewCheckDeposit=New check deposit
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
+DateChequeReceived=Check receiving date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
 PayVAT=Pay a VAT declaration
diff --git a/htdocs/langs/zh_HK/ecm.lang b/htdocs/langs/zh_HK/ecm.lang
index c4ea8018111..bc18bed4a29 100644
--- a/htdocs/langs/zh_HK/ecm.lang
+++ b/htdocs/langs/zh_HK/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM Setup
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index e71c805d506..9b14b5ad1d2 100644
--- a/htdocs/langs/zh_HK/errors.lang
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=Url %s is wrong
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
@@ -46,8 +46,8 @@ ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorSubjectIsRequired=The email topic is required
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/zh_HK/eventorganization.lang b/htdocs/langs/zh_HK/eventorganization.lang
new file mode 100644
index 00000000000..75b798fbc3a
--- /dev/null
+++ b/htdocs/langs/zh_HK/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = Settings
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = Draft
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = Done
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/zh_HK/knowledgemanagement.lang b/htdocs/langs/zh_HK/knowledgemanagement.lang
new file mode 100644
index 00000000000..269007e60f8
--- /dev/null
+++ b/htdocs/langs/zh_HK/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = Article
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/zh_HK/mails.lang b/htdocs/langs/zh_HK/mails.lang
index 2d02c5ddcf9..24c86cc885a 100644
--- a/htdocs/langs/zh_HK/mails.lang
+++ b/htdocs/langs/zh_HK/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Email subject
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List all automatic email notifications sent
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang
index dc2a83f2015..13793aad13f 100644
--- a/htdocs/langs/zh_HK/main.lang
+++ b/htdocs/langs/zh_HK/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=Save and new
 TestConnection=Test connection
 ToClone=Clone
 ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -246,7 +246,7 @@ DefaultModel=Default doc template
 Action=Event
 About=About
 Number=Number
-NumberByMonth=Number by month
+NumberByMonth=Total reports by month
 AmountByMonth=Amount by month
 Numero=Number
 Limit=Limit
@@ -341,8 +341,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
-at=at
 to=to
 To=to
+ToDate=to
+ToLocation=to
+at=at
 and=and
 or=or
 Other=Other
@@ -843,7 +845,7 @@ XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClick=Select an element and click %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
@@ -854,8 +856,8 @@ Denied=Denied
 ListOf=List of %s
 ListOfTemplates=List of templates
 Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Genderman=Male
+Genderwoman=Female
 Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/zh_HK/members.lang b/htdocs/langs/zh_HK/members.lang
index 44b583a0041..042b85598c0 100644
--- a/htdocs/langs/zh_HK/members.lang
+++ b/htdocs/langs/zh_HK/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
+MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
-EndSubscription=End subscription
+EndSubscription=Subscription Ends
 SubscriptionId=Subscription id
 WithoutSubscription=Without subscription
 MemberId=Member id
@@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
 SubscriptionRequired=Subscription required
 DeleteType=Delete
 VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorAndPhy=Moral and Physical
-Reenable=Reenable
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NbOfActiveMembers=Number of current active members
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Latest member date
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-MembersNature=Nature of members
-Public=Information are public
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No VAT for subscriptions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/zh_HK/modulebuilder.lang b/htdocs/langs/zh_HK/modulebuilder.lang
index 19afb9d95ab..9fdaa1a533a 100644
--- a/htdocs/langs/zh_HK/modulebuilder.lang
+++ b/htdocs/langs/zh_HK/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/zh_HK/other.lang b/htdocs/langs/zh_HK/other.lang
index 0e76e493b5a..95297a98859 100644
--- a/htdocs/langs/zh_HK/other.lang
+++ b/htdocs/langs/zh_HK/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
 NumberOfCustomerInvoices=Number of customer invoices
@@ -289,4 +289,4 @@ PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/zh_HK/partnership.lang b/htdocs/langs/zh_HK/partnership.lang
new file mode 100644
index 00000000000..09059995a8d
--- /dev/null
+++ b/htdocs/langs/zh_HK/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=Start date
+DatePartnershipEnd=End date
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = Draft
+PartnershipAccepted = Accepted
+PartnershipRefused = Refused
+PartnershipCanceled = Canceled
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/zh_HK/productbatch.lang b/htdocs/langs/zh_HK/productbatch.lang
index 4414b6ad8d8..ad2db658e2e 100644
--- a/htdocs/langs/zh_HK/productbatch.lang
+++ b/htdocs/langs/zh_HK/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index 28853762424..0875be0dc07 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -43,7 +43,7 @@ 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
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product
@@ -73,12 +73,12 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
-MinPrice=Min. sell price
+MinPrice=Min. selling price
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
@@ -157,11 +157,11 @@ ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
 RowMaterial=Raw Material
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of product/service
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
-CloneCombinationsProduct=Clone product variants
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -170,12 +170,12 @@ CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs|Commodity|HS code
-CountryOrigin=Origin country
-RegionStateOrigin=Region origin
-StateOrigin=State|Province origin
-Nature=Nature of product (material/finished)
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/zh_HK/projects.lang b/htdocs/langs/zh_HK/projects.lang
index d14e52d14e8..79c974f6e24 100644
--- a/htdocs/langs/zh_HK/projects.lang
+++ b/htdocs/langs/zh_HK/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Project contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=New project
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=Not assigned to the task
 NoUserAssignedToTheProject=No users assigned to this project
 TimeSpentBy=Time spent by
 TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to me
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
diff --git a/htdocs/langs/zh_HK/recruitment.lang b/htdocs/langs/zh_HK/recruitment.lang
index 437445f25dc..6b0e8117254 100644
--- a/htdocs/langs/zh_HK/recruitment.lang
+++ b/htdocs/langs/zh_HK/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/zh_HK/sendings.lang b/htdocs/langs/zh_HK/sendings.lang
index 73bd9aebd42..b94891d79c5 100644
--- a/htdocs/langs/zh_HK/sendings.lang
+++ b/htdocs/langs/zh_HK/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with refe
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
diff --git a/htdocs/langs/zh_HK/stocks.lang b/htdocs/langs/zh_HK/stocks.lang
index 9a14fb38eb1..9ec523427b1 100644
--- a/htdocs/langs/zh_HK/stocks.lang
+++ b/htdocs/langs/zh_HK/stocks.lang
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=No predefined products for this object. So no disp
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=Physical Stock
 RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
diff --git a/htdocs/langs/zh_HK/users.lang b/htdocs/langs/zh_HK/users.lang
index bbfa16450b0..372090ea5ad 100644
--- a/htdocs/langs/zh_HK/users.lang
+++ b/htdocs/langs/zh_HK/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Group permissions
 UserRights=User permissions
+Credentials=Credentials
 UserGUISetup=User Display Setup
 DisableUser=Disable
 DisableAUser=Disable a user
@@ -105,7 +106,7 @@ UseTypeFieldToChange=Use field Type to change
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/langs/zh_HK/website.lang b/htdocs/langs/zh_HK/website.lang
index 7d624915ef0..1e727415ec2 100644
--- a/htdocs/langs/zh_HK/website.lang
+++ b/htdocs/langs/zh_HK/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index dea0a0036fa..b7e0039de20 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -202,7 +202,7 @@ Docref=參考
 LabelAccount=標籤帳戶
 LabelOperation=標籤操作
 Sens=方向
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
 LetteringCode=字元編碼
 Lettering=字元
 Codejournal=日記帳
@@ -297,7 +297,7 @@ NoNewRecordSaved=沒有交易可記錄
 ListOfProductsWithoutAccountingAccount=清單中的產品沒有指定任何會計項目
 ChangeBinding=修改關聯性
 Accounted=計入總帳
-NotYetAccounted=尚未記入總帳
+NotYetAccounted=Not yet accounted in the ledger
 ShowTutorial=顯示教程
 NotReconciled=未對帳
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 83ad22dd2f6..f8ad1094586 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -64,6 +64,7 @@ RemoveLock=如果存在<b>%s</b>檔案,刪除/重新命名文件以允許使用
 RestoreLock=還原檔案唯讀權限檔案<b>%s</b> ，以禁止使用更新/安裝工具。
 SecuritySetup=安全設定
 PHPSetup=PHP setup
+OSSetup=OS setup
 SecurityFilesDesc=在此定義上傳檔案相關的安全設定。
 ErrorModuleRequirePHPVersion=錯誤，這個模組需要的PHP版本是 %s 或更高版本
 ErrorModuleRequireDolibarrVersion=錯誤，這個模組需要 Dolibarr 版本 %s 或更高版本
@@ -1159,7 +1160,7 @@ DoNotSuggestPaymentMode=不建議
 NoActiveBankAccountDefined=沒有定義有效的銀行帳戶
 OwnerOfBankAccount=銀行帳戶擁有者%s
 BankModuleNotActive=銀行帳戶模組沒有啟用
-ShowBugTrackLink=顯示連結"<strong>%s</strong>"
+ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
 Alerts=警告
 DelaysOfToleranceBeforeWarning=顯示警告警報之前的延遲時間：
 DelaysOfToleranceDesc=設定延遲時間，以在螢幕上顯示延遲元件的警告圖案%s。
@@ -1254,6 +1255,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=用戶<b>%s</b>在登入終端
 YourPHPDoesNotHaveSSLSupport=您的PHP中無法使用SSL功能
 DownloadMoreSkins=更多佈景主題下載
 SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
 ShowProfIdInAddress=顯示帶有地址的專業ID
 ShowVATIntaInAddress=隱藏帶有地址的歐盟營業稅號
 TranslationUncomplete=部分翻譯
@@ -2062,7 +2064,7 @@ UseDebugBar=使用debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=控制台中可保留的日誌行數
 WarningValueHigherSlowsDramaticalyOutput=警告，較高的值會嚴重降低輸出速度
 ModuleActivated=模組%s已啟動並顯示於界面上
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances)
+ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
 ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
 IfYouAreOnAProductionSetThis=如果您在生產環境中，則應將此屬性設定為%s。
 AntivirusEnabledOnUpload=在上傳的檔案已啟用了防病毒功能
@@ -2122,3 +2124,8 @@ IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system co
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+ModuleUpdateAvailable=An update is available
+NoExternalModuleWithUpdate=No updates found for external modules
+SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 3026ef1770b..6465e10a452 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -109,13 +109,13 @@ SocialContributionPayment=社會/財務稅負繳款單
 BankTransfer=銀行轉帳
 BankTransfers=銀行轉帳
 MenuBankInternalTransfer=內部轉帳
-TransferDesc=從一個帳戶轉移到另一個帳戶，Dolibarr將寫入兩個記錄（來源帳戶中的借款方和目標帳戶中的貸款方）。此交易將使用相同的金額（簽名,標籤和日期除外）
+TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
 TransferFrom=從
 TransferTo=至
 TransferFromToDone=從<b>%s</b>到<b>%s</b>的<b>%s</b>%s轉帳已記錄。
-CheckTransmitter=傳送器
+CheckTransmitter=寄件人
 ValidateCheckReceipt=驗證此支票收據
-ConfirmValidateCheckReceipt=您確定要驗證這張支票收據嗎？一旦完成，不會有任何改變嗎？
+ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes are possible it's done.
 DeleteCheckReceipt=刪除支票收據？
 ConfirmDeleteCheckReceipt=您確認定您要刪除此張支票收據？
 BankChecks=銀行支票
@@ -128,7 +128,7 @@ ConfirmDeleteTransaction=您確定要刪除此筆條目
 ThisWillAlsoDeleteBankRecord=同樣也會刪除已產生的銀行條目
 BankMovements=動作
 PlannedTransactions=已計畫的條目
-Graph=圖形
+Graph=Graphs
 ExportDataset_banque_1=銀行條目和帳戶對帳單
 ExportDataset_banque_2=存款單
 TransactionOnTheOtherAccount=在其他帳戶的交易
@@ -142,7 +142,7 @@ AllAccounts=所有銀行及現金帳戶
 BackToAccount=回到帳戶
 ShowAllAccounts=顯示所有帳戶
 FutureTransaction=未來交易。無法調節。
-SelectChequeTransactionAndGenerate=選擇/過濾要包括在支票存款收據中的支票，然後單擊“建立”。
+SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=選擇與調節相關的銀行對帳單。使用可排序的數值：YYYYMM或YYYYMMDD
 EventualyAddCategory=最後，指定要對記錄進行分類的類別
 ToConciliate=對帳嗎？
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index af50c6b9267..4640ce19133 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -120,7 +120,7 @@ ConvertExcessPaidToReduc=將超額付款轉換為可用折扣
 EnterPaymentReceivedFromCustomer=輸入從客戶收到的付款
 EnterPaymentDueToCustomer=應付客戶款項
 DisabledBecauseRemainderToPayIsZero=已關閉,因為剩餘的未付餘額為零
-PriceBase=價格基準
+PriceBase=Base price
 BillStatus=發票狀態
 StatusOfGeneratedInvoices=已產生發票的狀態
 BillStatusDraft=草稿（等待驗證）
@@ -454,7 +454,7 @@ RegulatedOn=規範於
 ChequeNumber=支票編號
 ChequeOrTransferNumber=支票/轉移編號
 ChequeBordereau=支票行事曆
-ChequeMaker=支票/轉移傳送器
+ChequeMaker=Check/Transfer sender
 ChequeBank=支票銀行
 CheckBank=支票
 NetToBePaid=要支付的淨額
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index 2a6b283482d..d093fea93e2 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=書籤：最新%s筆
 BoxOldestExpiredServices=最舊的活動已過期服務
 BoxLastExpiredServices=具有活動已過期服務的最新%s位最早聯絡人
 BoxTitleLastActionsToDo=最新%s次動作
-BoxTitleLastContracts=最新%s筆已修改合約
-BoxTitleLastModifiedDonations=最新%s筆已修改捐贈
-BoxTitleLastModifiedExpenses=最新%s份已修改費用報告
-BoxTitleLatestModifiedBoms=最新%s筆已修改BOM
-BoxTitleLatestModifiedMos=最新%s筆已修改製造訂單
+BoxTitleLastContracts=Latest %s contracts which were modified
+BoxTitleLastModifiedDonations=Latest %s donations which were modified
+BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
+BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=超過最大未償還額的客戶
 BoxGlobalActivity=全球活動(發票、提案/建議書、訂單)
 BoxGoodCustomers=好客戶
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index e0d7525a4d7..e8f9444c07f 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -41,7 +41,8 @@ Floor=樓
 AddTable=新增表格
 Place=地點
 TakeposConnectorNecesary=需要“ TakePOS連接器”
-OrderPrinters=訂購印表機
+OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
 SearchProduct=搜尋商品
 Receipt=收據
 Header=頁首
@@ -56,8 +57,9 @@ Paymentnumpad=輸入付款的便籤類型
 Numberspad=號碼便籤
 BillsCoinsPad=硬幣和紙幣便籤
 DolistorePosCategory=用於Dolibarr的TakePOS模組與其他POS解決方案
-TakeposNeedsCategories=TakePOS 需要產品類別才能使用
-OrderNotes=訂購須知
+TakeposNeedsCategories=TakePOS needs at least one product categorie to work
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
+OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=用於付款的預設帳戶
 NoPaimementModesDefined=在 TakePOS 設定中未定義付款方式
 TicketVatGrouped=按銷售單中的費率合計營業稅
@@ -82,7 +84,7 @@ InvoiceIsAlreadyValidated=發票已通過驗證
 NoLinesToBill=無計費項目
 CustomReceipt=自訂收據
 ReceiptName=收據名稱
-ProductSupplements=產品補充
+ProductSupplements=Manage supplements of products
 SupplementCategory=補充品類別
 ColorTheme=顏色主題
 Colorful=彩色
@@ -92,7 +94,7 @@ Browser=瀏覽器
 BrowserMethodDescription=簡易列印收據。僅需幾個參數即可設定收據。通過瀏覽器列印。
 TakeposConnectorMethodDescription=具有附加功能的外部模組。可以從雲端列印。
 PrintMethod=列印方式
-ReceiptPrinterMethodDescription=具有很多參數的強大方法。完全可定制的模板。無法從雲端列印。
+ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=依照站台
 TakeposNumpadUsePaymentIcon=在小鍵盤的付款按鈕上使用圖示而不是文字
 CashDeskRefNumberingModules=POS銷售編號模組
@@ -113,7 +115,7 @@ RestaurantMenu=選單
 CustomerMenu=客戶選單
 ScanToMenu=掃描QR Code顯示選單
 ScanToOrder=掃描QR Code訂購
-Appearance=出現
+Appearance=顯示
 HideCategoryImages=隱藏類別圖片
 HideProductImages=隱藏產品圖片
 NumberOfLinesToShow=要顯示的圖片行數
@@ -124,3 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=必須先啟用收據印表機模組
 AllowDelayedPayment=允許延遲付款
 PrintPaymentMethodOnReceipts=在收據上列印付款方式
 WeighingScale=秤重
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index f0c1333e1c7..fbbf4dbc51b 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -3,20 +3,20 @@ Rubrique=標籤/分類
 Rubriques=標籤/分類
 RubriquesTransactions=交易標籤/分類
 categories=標籤/分類
-NoCategoryYet=此類型沒有已建立的標籤/分類
+NoCategoryYet=No tag/category of this type has been created
 In=在
 AddIn=加入
 modify=修改
 Classify=分類
 CategoriesArea=標籤/類別區域
-ProductsCategoriesArea=產品/服務標籤/類別區域
-SuppliersCategoriesArea=供應商標籤/類別區域
-CustomersCategoriesArea=客戶標籤/類別區域
-MembersCategoriesArea=會員標籤/類別區域
-ContactsCategoriesArea=聯絡人標籤/類別區域
-AccountsCategoriesArea=Bank accounts tags/categories area
-ProjectsCategoriesArea=專案標籤/類別區域
-UsersCategoriesArea=用戶標籤/類別區域
+ProductsCategoriesArea=Product/Service tags/categories area
+SuppliersCategoriesArea=Vendor tags/categories area
+CustomersCategoriesArea=Customer tags/categories area
+MembersCategoriesArea=Member tags/categories area
+ContactsCategoriesArea=Contact tags/categories area
+AccountsCategoriesArea=Bank account tags/categories area
+ProjectsCategoriesArea=Project tags/categories area
+UsersCategoriesArea=User tags/categories area
 SubCats=子類別
 CatList=標籤/類別清單
 CatListAll=標籤/分類清單（所有類型）
@@ -96,4 +96,4 @@ ChooseCategory=選擇類別
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=頁面容器類別
-UseOrOperatorForCategories=類別的使用或運算
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 1f51cecff77..42bc3707cd9 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=公司名稱%s已經存在。請選擇另一個。
 ErrorSetACountryFirst=請先設定國家
 SelectThirdParty=選擇一個合作方
-ConfirmDeleteCompany=您確定要刪除此公司和所有關聯的資訊嗎？
+ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=刪除連絡人/地址
-ConfirmDeleteContact=您確定要刪除這個連絡人和所有關聯資訊？
+ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
 MenuNewThirdParty=新合作方
 MenuNewCustomer=新客戶
 MenuNewProspect=新潛在方
@@ -69,7 +69,7 @@ PhoneShort=電話
 Skype=Skype
 Call=通話
 Chat=對話
-PhonePro=公司電話號碼
+PhonePro=Bus. phone
 PhonePerso=個人電話號碼
 PhoneMobile=手機號碼
 No_Email=拒絕批次發送電子郵件
@@ -331,7 +331,7 @@ CustomerCodeDesc=客戶代碼,每個客戶都有一個號碼
 SupplierCodeDesc=供應商代碼，每個供應商都有一個號碼
 RequiredIfCustomer=若合作方屬於客戶或潛在方，則必需填入
 RequiredIfSupplier=若合作方是供應商，則必需填入
-ValidityControledByModule=有效性由模組控制
+ValidityControledByModule=Validity controlled by the module
 ThisIsModuleRules=此模組的規則
 ProspectToContact=需聯絡的潛在方
 CompanyDeleted=已從資料庫中刪除“%s”公司。
@@ -439,12 +439,12 @@ ListSuppliersShort=供應商清單
 ListProspectsShort=潛在方清單
 ListCustomersShort=客戶清單
 ThirdPartiesArea=合作方/通訊錄
-LastModifiedThirdParties=最新%s筆修改的合作方
-UniqueThirdParties=全部合作方
+LastModifiedThirdParties=Latest %s Third Parties which were modified
+UniqueThirdParties=Total number of Third Parties
 InActivity=開放
 ActivityCeased=關閉
 ThirdPartyIsClosed=合作方已關閉
-ProductsIntoElements=產品/服務清單於 %s
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=目前未付款帳單
 OutstandingBill=未付款帳單的最大金額
 OutstandingBillReached=已達最大金額的未付款帳單
@@ -454,7 +454,7 @@ LeopardNumRefModelDesc=客戶/供應商編號規則不受限制，此編碼可
 ManagingDirectors=主管(們)姓名 (執行長, 部門主管, 總裁...)
 MergeOriginThirdparty=重複的客戶/供應商 (你想刪除的客戶/供應商)
 MergeThirdparties=合併客戶/供應商
-ConfirmMergeThirdparties=您確定要合併此合作方到目前的資料？所有已連結的物件( 發票、訂單...)將會移到目前的合作方，並刪除被合併的合作方。
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=合作方已合併
 SaleRepresentativeLogin=業務代表的登入
 SaleRepresentativeFirstname=業務代表的名字
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 32228a05a2f..7ea8019f6d0 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -135,7 +135,7 @@ NewCheckReceipt=新折扣
 NewCheckDeposit=新的支票存款
 NewCheckDepositOn=建立帳戶存款收據：%s
 NoWaitingChecks=沒有支票等待存入。
-DateChequeReceived=支票接收日期
+DateChequeReceived=Check receiving date
 NbOfCheques=支票數量
 PaySocialContribution=支付社會/財政稅
 PayVAT=支付稅金申報
diff --git a/htdocs/langs/zh_TW/ecm.lang b/htdocs/langs/zh_TW/ecm.lang
index 8f90c198407..575ed2de2b3 100644
--- a/htdocs/langs/zh_TW/ecm.lang
+++ b/htdocs/langs/zh_TW/ecm.lang
@@ -42,6 +42,6 @@ ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
 ECMSetup=ECM設定
 GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder and its subfolder...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 9cf8fe438b5..c91ab496622 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -4,9 +4,9 @@
 NoErrorCommitIsDone=我們保證沒有錯誤
 # Errors
 ErrorButCommitIsDone=發現錯誤，但儘管如此我們仍進行驗證
-ErrorBadEMail=電子郵件%s錯誤
-ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
-ErrorBadUrl=網址%s錯誤
+ErrorBadEMail=Email %s is incorrect
+ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
+ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=您的參數值錯誤。一般在轉譯遺失時產生。
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=登入者%s已經存在。
@@ -46,8 +46,8 @@ ErrorWrongDate=日期不正確！
 ErrorFailedToWriteInDir=無法寫入資料夾%s
 ErrorFoundBadEmailInFile=找到電子郵件文件中的%s行語法不正確（例如電子郵件%s行 =%s）
 ErrorUserCannotBeDelete=無法刪除用戶。也許它與Dolibarr實體相關。
-ErrorFieldsRequired=一些必要的欄位都沒有填入。
-ErrorSubjectIsRequired=電子郵件主題為必填
+ErrorFieldsRequired=Some required fields have been left blank.
+ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=無法建立資料夾。檢查網頁伺服器中的用戶有權限寫入Dolibarr檔案資料夾。如果PHP使用了參數<b>safe_mode</b>，檢查網頁伺服器的用戶（或群組）擁有Dolibarr php檔案。
 ErrorNoMailDefinedForThisUser=沒有此用戶的定義郵件
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
@@ -226,6 +226,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=此頁面/容器<strong>%s</strong>
 ErrorDuringChartLoad=載入會計科目表時出錯。如果幾個帳戶沒有被載入，您仍然可以手動輸入。
 ErrorBadSyntaxForParamKeyForContent=參數keyforcontent的語法錯誤。必須具有以%s或%s開頭的值
 ErrorVariableKeyForContentMustBeSet=錯誤，必須設定名稱為%s（帶有文字內容）或%s（帶有外部網址）的常數。
+ErrorURLMustEndWith=URL %s must end %s
 ErrorURLMustStartWithHttp=網址 %s 必須以 http://或https://開始
 ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
 ErrorNewRefIsAlreadyUsed=錯誤，新參考已被使用
@@ -296,3 +297,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/langs/zh_TW/eventorganization.lang b/htdocs/langs/zh_TW/eventorganization.lang
new file mode 100644
index 00000000000..27e902102f9
--- /dev/null
+++ b/htdocs/langs/zh_TW/eventorganization.lang
@@ -0,0 +1,101 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Event Organization
+EventOrganizationDescription = Event Organization through Module Project
+EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+#
+# Admin page
+#
+EventOrganizationSetup = Event Organization setup
+Settings = 設定
+EventOrganizationSetupPage = Event Organization setup page
+EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Conference Or Booth
+ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
+AmountOfSubscriptionPaid = Amount of subscription paid
+DateSubscription = Date of subscription
+ConferenceOrBoothAttendee = Conference Or Booth Attendee
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
+EventOrganizationEmailAskConf = Request for conference
+EventOrganizationEmailAskBooth = Request for booth
+EventOrganizationEmailSubsBooth = Subscription for booth
+EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Subscription price to stand a booth
+PriceOfBoothHelp=Subscription price to stand a booth
+EventOrganizationICSLink=Link ICS for events
+ConferenceOrBoothInformation=Conference Or Booth informations
+Attendees = Attendees
+EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+#
+# Status
+#
+EvntOrgDraft = 草稿
+EvntOrgSuggested = Suggested
+EvntOrgConfirmed = Confirmed
+EvntOrgNotQualified = Not Qualified
+EvntOrgDone = 完成
+EvntOrgCancelled = Cancelled
+#
+# Public page
+#
+PublicAttendeeSubscriptionPage = Public link of registration to a conference
+MissingOrBadSecureKey = The security key is invalid or missing
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
+EvntOrgStartDuration = This conference starts on
+EvntOrgEndDuration =  and ends on
diff --git a/htdocs/langs/zh_TW/knowledgemanagement.lang b/htdocs/langs/zh_TW/knowledgemanagement.lang
new file mode 100644
index 00000000000..0e4462985f9
--- /dev/null
+++ b/htdocs/langs/zh_TW/knowledgemanagement.lang
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = 設定
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = 關於
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+#
+# Sample page
+#
+KnowledgeManagementArea = Knowledge Management
+
+
+#
+# Menu
+#
+MenuKnowledgeRecord = Knowledge base
+ListOfArticles = List of articles
+NewKnowledgeRecord = New article
+ValidateReply = Validate solution
+KnowledgeRecords = Articles
+KnowledgeRecord = 物品
+KnowledgeRecordExtraFields = Extrafields for Article
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 2e602c47207..c1f07ef0a6e 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=發送給用戶
 MailCC=副本
 MailToCCUsers=CC
 MailCCC=CCC
-MailTopic=電子郵件主題
+MailTopic=Email subject
 MailText=郵件內容
 MailFile=附加檔案
 MailMessage=電子郵件內容
@@ -131,8 +131,8 @@ NoNotificationsWillBeSent=沒有為此類型事件和公司計畫的自動電子
 ANotificationsWillBeSent=1條自動通知將以電子郵件寄送
 SomeNotificationsWillBeSent=%s的自動通知將以電子郵件寄送
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=列出所有已寄送的自動電子郵件通知
+ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List of all automatic email notifications sent
 MailSendSetupIs=電子郵件發送的設定已設定為“ %s”。此模式不能用於發送批次電子郵件。
 MailSendSetupIs2=您必須先使用管理員帳戶進入選單%s首頁-設定-EMails%s以將參數<strong>'%s'</strong>更改為使用模式 '%s'。使用此模式 ，您可以輸入Internet服務供應商提供的SMTP伺服器的設定，並使用批次電子郵件功能。
 MailSendSetupIs3=如果對如何設定SMTP伺服器有任何疑問，可以詢問%s。
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 4cdffe835d3..ee97d8fc01c 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -180,7 +180,7 @@ SaveAndNew=儲存並新增
 TestConnection=測試連線
 ToClone=複製
 ConfirmCloneAsk=您確定要複製物件 <b>%s</b>?
-ConfirmClone=選擇您要複製的數據：
+ConfirmClone=Choose the data you want to clone:
 NoCloneOptionsSpecified=沒有已定義要複製的資料。
 Of=的
 Go=前往
@@ -246,7 +246,7 @@ DefaultModel=預設文件範本
 Action=事件
 About=關於
 Number=數量
-NumberByMonth=每月數量
+NumberByMonth=Total reports by month
 AmountByMonth=每月金額
 Numero=數量
 Limit=限制
@@ -341,8 +341,8 @@ KiloBytes=KB
 MegaBytes=MB
 GigaBytes=GB
 TeraBytes=TB
-UserAuthor=建立的用戶
-UserModif=最後一次更新的用戶
+UserAuthor=Ceated by
+UserModif=Updated by
 b=b.
 Kb=Kb
 Mb=Mb
@@ -503,9 +503,11 @@ By=由
 From=從
 FromDate=從
 FromLocation=從
-at=在
 to=至
 To=至
+ToDate=至
+ToLocation=至
+at=在
 and=和
 or=或
 Other=其他
@@ -843,7 +845,7 @@ XMoreLines=%s 行(數)被隱藏
 ShowMoreLines=顯示更多/更少行數
 PublicUrl=公開網址
 AddBox=增加盒子
-SelectElementAndClick=選擇元件及點選 %s
+SelectElementAndClick=Select an element and click on %s
 PrintFile=列印檔案 %s
 ShowTransaction=在銀行帳戶中顯示交易
 ShowIntervention=顯示干預
@@ -854,8 +856,8 @@ Denied=已拒絕
 ListOf=%s 清單
 ListOfTemplates=範本清單
 Gender=性別
-Genderman=男
-Genderwoman=女
+Genderman=Male
+Genderwoman=Female
 Genderother=其他
 ViewList=檢視清單
 ViewGantt=甘特圖
@@ -1129,3 +1131,4 @@ ConfirmAffectTagQuestion=您確定要影響對%s所選記錄的標籤嗎？
 CategTypeNotFound=找不到記錄類型的標籤類型
 CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
+ConfirmCancel=Are you sure you want to cancel
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 14c60c9ba39..9bfb8a79af4 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名會員（名稱<b>：%s</b>
 ErrorUserPermissionAllowsToLinksToItselfOnly=出於安全原因，必須授予您編輯所有用戶的權限，以便能夠將會員連結到其他用戶。
 SetLinkToUser=連結Dolibarr用戶
 SetLinkToThirdParty=連接到Dolibarr合作方
-MembersCards=會員名片
+MembersCards=Business cards for members
 MembersList=會員清單
 MembersListToValid=草案會員清單（待確認）
 MembersListValid=有效會員清單
@@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=可接收訂閱會員
 MembersWithSubscriptionToReceiveShort=接收訂閱
 DateSubscription=訂閱日期
 DateEndSubscription=訂閱結束日期
-EndSubscription=結束訂閱
+EndSubscription=Subscription Ends
 SubscriptionId=訂閱編號
 WithoutSubscription=沒有訂閱
 MemberId=會員編號
@@ -83,10 +83,10 @@ WelcomeEMail=歡迎電子郵件
 SubscriptionRequired=需要訂閱
 DeleteType=刪除
 VoteAllowed=允許投票
-Physical=自然人
-Moral=法人
-MorAndPhy=法人與自然人
-Reenable=重新啟用
+Physical=Individual
+Moral=Corporation
+MorAndPhy=Corporation and Individual
+Reenable=Re-Enable
 ExcludeMember=Exclude a member
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=終止會員
@@ -175,32 +175,32 @@ MembersStatisticsByCountries=會員統計(國家/城市)
 MembersStatisticsByState=會員統計(州/省)
 MembersStatisticsByTown=會員統計(城鎮)
 MembersStatisticsByRegion=會員統計(地區)
-NbOfMembers=會員數
-NbOfActiveMembers=目前活躍會員數
+NbOfMembers=Total number of members
+NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=無已驗證的會員
-MembersByCountryDesc=此畫面顯示依國家/地區劃分的會員統計訊息。圖形取決於Google線上圖形服務，並且僅在網路連接正常時可用。
-MembersByStateDesc=此畫面依州/省顯示有關會員的統計訊息。
-MembersByTownDesc=此畫面顯示依城鎮劃分的會員統計訊息。
+MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
+MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics of members by town.
+MembersByNature=This screen show you statistics of members by nature.
+MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=選擇要讀取的統計訊息...
 MenuMembersStats=統計
-LastMemberDate=最新會員日期
+LastMemberDate=Latest membership date
 LatestSubscriptionDate=最新訂閱日期
-MemberNature=會員性質
-MembersNature=會員性質
-Public=資訊是公開的
+MemberNature=Nature of the member
+MembersNature=Nature of the members
+Public=Information is public
 NewMemberbyWeb=增加了新會員。等待核准
 NewMemberForm=新會員表格
-SubscriptionsStatistics=訂閱統計
+SubscriptionsStatistics=Subscriptions statistics
 NbOfSubscriptions=訂閱數
-AmountOfSubscriptions=訂閱金額
+AmountOfSubscriptions=Amount collected from subscriptions
 TurnoverOrBudget=營業額（對於公司）或預算（對於財團）
 DefaultAmount=預設訂閱金額
 CanEditAmount=訪客可以選擇/編輯其訂閱金額
 MEMBER_NEWFORM_PAYONLINE=跳至綜合線上支付頁面
 ByProperties=依照性質
 MembersStatisticsByProperties=會員性質統計
-MembersByNature=此畫面依性質顯示有關會員的統計訊息。
-MembersByRegion=此畫面依區域顯示有關會員的統計訊息。
 VATToUseForSubscriptions=訂閱使用的營業稅率
 NoVatOnSubscription=訂閱無營業稅
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=用於發票的訂閱欄的產品：%s
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index 3e33eeafd60..04eb61a2a70 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=已定義權限清單
 SeeExamples=在這裡查看範例
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=以PDF顯示
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index e424cc39c42..364d1de3f2d 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -183,7 +183,7 @@ EnableGDLibraryDesc=在PHP安裝上安裝或啟用GD程式庫以使用此選項
 ProfIdShortDesc=<b>Prof Id %s</b>的資訊取決於合作方國家/地區。 <br>例如，對於國家<b>%s</b> ，其代碼為<b>%s</b> 。
 DolibarrDemo=Dolibarr的ERP / CRM的DEMO
 StatsByNumberOfUnits=產品/服務數量統計
-StatsByNumberOfEntities=參考實際數量的統計（發票或訂單的數量...）
+StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
 NumberOfProposals=提案/建議書的數量
 NumberOfCustomerOrders=銷售訂單數量
 NumberOfCustomerInvoices=客戶發票數量
@@ -289,4 +289,4 @@ PopuProp=依照在提案中受歡迎程度列出的產品/服務
 PopuCom=依照在訂單中受歡迎程度列出的產品/服務
 ProductStatistics=產品/服務統計
 NbOfQtyInOrders=訂單數量
-SelectTheTypeOfObjectToAnalyze=選擇要分析的項目類型...
+SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
diff --git a/htdocs/langs/zh_TW/partnership.lang b/htdocs/langs/zh_TW/partnership.lang
new file mode 100644
index 00000000000..6563edeeac8
--- /dev/null
+++ b/htdocs/langs/zh_TW/partnership.lang
@@ -0,0 +1,56 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+ModulePartnershipName = Partnership management
+PartnershipDescription = Module Partnership management
+PartnershipDescriptionLong= Module Partnership management
+
+#
+# Menu
+#
+NewPartnership = New Partnership
+ListOfPartnerships = List of partnership
+
+#
+# Admin page
+#
+PartnershipSetup = Partnership setup
+PartnershipAbout = About Partnership
+PartnershipAboutPage = Partnership about page
+
+
+#
+# Object
+#
+DatePartnershipStart=開始日期
+DatePartnershipEnd=結束日期
+
+#
+# Template Mail
+#
+
+
+#
+# Status
+#
+PartnershipDraft = 草稿
+PartnershipAccepted = 已接受
+PartnershipRefused = 已拒絕
+PartnershipCanceled = 已取消
+
+PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index 72db592eb05..d88de961d99 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -28,8 +28,8 @@ SerialNumberAlreadyInUse=Serial number %s is already used for product %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
 BatchLotNumberingModules=Options for automatic generation of batch products managed by lots
 BatchSerialNumberingModules=Options for automatic generation of batch products managed by serial numbers
+ManageLotMask=Custom mask
 CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 7e05d098a4a..b603120fada 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=僅供銷售服務
 ServicesOnPurchaseOnly=僅供採購服務
 ServicesNotOnSell=無法銷售與採購之服務
 ServicesOnSellAndOnBuy=可供銷售與購買之服務
-LastModifiedProductsAndServices=最新%s筆已修改的產品/服務
+LastModifiedProductsAndServices=Latest %s products/services which were modified
 LastRecordedProducts=最新 %s 紀錄的產品
 LastRecordedServices=最新%s 紀錄的服務
 CardProduct0=產品
@@ -73,12 +73,12 @@ SellingPrice=售價
 SellingPriceHT=售價（不含稅）
 SellingPriceTTC=售價（含稅）
 SellingMinPriceTTC=最低售價（含稅）
-CostPriceDescription=此價格欄位（不含稅）可用於存儲該產品給貴公司的平均價格。它可以是您自己計算的任何價格，例如，根據平均購買價格加上平均生產和分銷成本得出的價格。
+CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=此值可用於利潤計算。
 SoldAmount=銷售數量
 PurchasedAmount=購買數量
 NewPrice=新價格
-MinPrice=最低賣價
+MinPrice=Min. selling price
 EditSellingPriceLabel=修改售價標籤
 CantBeLessThanMinPrice=售價不能低於該產品的最低售價(%s 不含稅)。如果你輸入的折扣過高也會出現此訊息。
 ContractStatusClosed=已關閉
@@ -157,11 +157,11 @@ ListServiceByPopularity=熱門服務列表
 Finished=成品
 RowMaterial=原材料
 ConfirmCloneProduct=您確定要複製產品或服務<b>%s</b>嗎？
-CloneContentProduct=複製產品/服務的所有主要信息
+CloneContentProduct=Clone all main information of the product/service
 ClonePricesProduct=複製價格
-CloneCategoriesProduct=複製已連結標籤/類別
-CloneCompositionProduct=複製虛擬產品/服務
-CloneCombinationsProduct=複製產品差異
+CloneCategoriesProduct=Clone linked tags/categories
+CloneCompositionProduct=Clone virtual products/services
+CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=該產品是用於
 NewRefForClone=新的產品/服務參考
 SellingPrices=銷售價格
@@ -170,12 +170,12 @@ CustomerPrices=客戶價格
 SuppliersPrices=供應商價格
 SuppliersPricesOfProductsOrServices=供應商價格（產品或服務）
 CustomCode=海關|商品| HS碼
-CountryOrigin=原產地
-RegionStateOrigin=原始產地
-StateOrigin=州|省份
-Nature=產品性質（材料/成品）
+CountryOrigin=Country of origin
+RegionStateOrigin=Region of origin
+StateOrigin=State|Province of origin
+Nature=Nature of product (raw/manufactured)
 NatureOfProductShort=產品性質
-NatureOfProductDesc=產品原料或成品
+NatureOfProductDesc=Raw material or manufactured product
 ShortLabel=短標籤
 Unit=單位
 p=u.
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 2dafa3a1e88..6223ae8f6e8 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=專案聯絡人
 ProjectsImContactFor=我是聯絡人的專案
 AllAllowedProjects=我可以讀取的所有專案（我的+公共項目）
 AllProjects=所有專案
-MyProjectsDesc=此檢視僅顯示您為聯絡人之專案
+MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=此檢視顯示您被允許讀取的所有專案。
 TasksOnProjectsPublicDesc=此檢視顯示您可讀取之專案的所有任務。
 ProjectsPublicTaskDesc=此檢視顯示所有您可以讀取之專案與任務。
 ProjectsDesc=此檢視顯示全部專案(您的用戶權限授予您檢視所有內容)。
 TasksOnProjectsDesc=此檢視顯示所有專案上的所有任務（您的用戶權限授予您檢視所有內容）。
-MyTasksDesc=此檢視僅為您是聯絡人之專案或任務
+MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
 OnlyOpenedProject=僅顯示開放專案(不顯示草案或是已關閉狀態之專案)
 ClosedProjectsAreHidden=不顯示已關閉專案
 TasksPublicDesc=此檢視顯示您可讀取之所有專案及任務。
 TasksDesc=此檢視顯示所有專案及任務(您的用戶權限授予您查看所有內容)。
 AllTaskVisibleButEditIfYouAreAssigned=合格專案的所有任務都可見，但是您只能輸入分配給所選用戶之任務的時間。如果需要輸入時間，請分配任務。
-OnlyYourTaskAreVisible=僅顯示分配給您的任務。如果任務不可見，則將任務分配給自己，並且您需要輸入時間。
+OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
 ImportDatasetTasks=專案任務
 ProjectCategories=專案標籤/類別
 NewProject=新專案
@@ -202,7 +202,7 @@ ResourceNotAssignedToTheTask=未分配給任務
 NoUserAssignedToTheProject=沒有分配給此專案的用戶
 TimeSpentBy=花費時間者
 TasksAssignedTo=任務分配給
-AssignTaskToMe=分配任務給我
+AssignTaskToMe=Assign task to myself
 AssignTaskToUser=將任務分配給%s
 SelectTaskToAssign=選擇要分配的任務...
 AssignTask=分配
diff --git a/htdocs/langs/zh_TW/recruitment.lang b/htdocs/langs/zh_TW/recruitment.lang
index 71b646c556d..f1f347585b2 100644
--- a/htdocs/langs/zh_TW/recruitment.lang
+++ b/htdocs/langs/zh_TW/recruitment.lang
@@ -72,5 +72,5 @@ YourCandidatureAnswerMessage=Thanks you for your application.<br>...
 JobClosedTextCandidateFound=The job position is closed. The position has been filled.
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 0a422561415..ef3e9fc3a8d 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=您確定要使用參考<b>%s</b>驗證此出貨嗎？
 ConfirmCancelSending=您確定要取消此出貨嗎？
 DocumentModelMerou=Merou A5 範本
 WarningNoQtyLeftToSend=警告，沒有等待出貨的產品。
-StatsOnShipmentsOnlyValidated=出貨統計已被驗證。使用的日期是出貨確認日期（計劃的交貨日期並非總是已知的）。
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=預計交貨日期
 RefDeliveryReceipt=參考交貨收據
 StatusReceipt=交貨收據狀態
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index db37cf3b2c5..73c7afa1e00 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -19,8 +19,8 @@ Stock=庫存
 Stocks=庫存
 MissingStocks=缺少庫存
 StockAtDate=歷史庫存
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+StockAtDateInPast=過去的日期
+StockAtDateInFuture=未來的日期
 StocksByLotSerial=依批次/序號的庫存
 LotSerial=批次/序號
 LotSerialList=批次/序號清單
@@ -34,11 +34,11 @@ StockMovementForId=移轉編號 %d
 ListMouvementStockProject=與項目相關的庫存變動清單
 StocksArea=庫存區域
 AllWarehouses=所有倉庫
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=包括有未定義預期庫存的負數庫存
 IncludeAlsoDraftOrders=包括草稿訂單
 Location=位置
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=地點的簡稱
+NumberOfDifferentProducts=獨特產品數量
 NumberOfProducts=產品總數
 LastMovement=最新變動
 LastMovements=最新變動(s)
@@ -91,7 +91,7 @@ NoPredefinedProductToDispatch=沒有此專案的預定義產品。因此無需
 DispatchVerb=調度
 StockLimitShort=警報限制
 StockLimit=庫存限制的警報
-StockLimitDesc=（空白）表示沒有警告。 可將<br>0用作庫存警告。
+StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
 PhysicalStock=實體庫存
 RealStock=實際庫存
 RealStockDesc=實體/實際庫存是目前倉庫中的庫存。
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index 1776b33f613..b1ce38cce62 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -249,8 +249,8 @@ TicketLogReopen=服務單%s已重新打開
 # Public pages
 #
 TicketSystem=服務單系統
-ShowListTicketWithTrackId=從追蹤編號顯示服務單清單
-ShowTicketWithTrackId=從追蹤編號顯示服務單
+ShowListTicketWithTrackId=以追蹤編號顯示服務單清單
+ShowTicketWithTrackId=以追蹤編號查詢服務單
 TicketPublicDesc=您可以從現有編號建立支援服務單或進行檢查。
 YourTicketSuccessfullySaved=服務單已成功儲存！
 MesgInfosPublicTicketCreatedWithTrackId=已建立一個新的服務單，其ID為%s和參考%s。
@@ -267,7 +267,7 @@ TicketEmailPleaseDoNotReplyToThisEmail=請不要直接回覆此電子郵件！
 TicketPublicInfoCreateTicket=此表格使您可以在我們的管理系統中記錄支援服務單。
 TicketPublicPleaseBeAccuratelyDescribe=請準確描述問題。提供盡可能多的訊息使我們能夠正確辨別您的要求。
 TicketPublicMsgViewLogIn=請輸入服務單追蹤編號
-TicketTrackId=公開追踪編號
+TicketTrackId=公用追踪編號
 OneOfTicketTrackId=您的追蹤編號之一
 ErrorTicketNotFound=無法找到追蹤編號%s的服務單!
 Subject=主題
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 26b9aacbd38..4a17d9da51b 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=密碼更改為：%s
 SubjectNewPassword=您新的密碼是 %s
 GroupRights=群組權限
 UserRights=用戶權限
+Credentials=Credentials
 UserGUISetup=用戶顯示設定
 DisableUser=停用用戶
 DisableAUser=停用一位用戶
@@ -105,7 +106,7 @@ UseTypeFieldToChange=使用欄位類型進行更改
 OpenIDURL=OpenID URL
 LoginUsingOpenID=使用OpenID登入
 WeeklyHours=工作小時數（每週）
-ExpectedWorkedHours=預計每週工作時間
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=用戶顏色
 DisabledInMonoUserMode=在維護模式下已關閉
 UserAccountancyCode=用戶帳號
@@ -115,7 +116,7 @@ DateOfEmployment=到職日期
 DateEmployment=雇傭期間
 DateEmploymentstart=入職日期
 DateEmploymentEnd=離職日期
-RangeOfLoginValidity=登入的有效日期範圍
+RangeOfLoginValidity=Access validity date range
 CantDisableYourself=您不能關閉自己的用戶記錄
 ForceUserExpenseValidator=強制使用費用報告表驗證
 ForceUserHolidayValidator=強制使用休假請求驗證
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 7a2ba12877b..cb7499b7303 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -140,8 +140,8 @@ DefineListOfAltLanguagesInWebsiteProperties=在網站屬性中定義所有可用
 GenerateSitemaps=Generate website sitemap file
 ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
 ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap Generated
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 35e5e5b81b0..fc4e53cbd61 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2689,7 +2689,7 @@ if ($module == 'initmodule') {
 							print '<th class="center">'.$langs->trans("CSSClass").'</th>';
 							print '<th class="center">'.$langs->trans("CSSViewClass").'</th>';
 							print '<th class="center">'.$langs->trans("CSSListClass").'</th>';
-							print '<th class="center">'.$langs->trans("KeyForTooltip").'</th>';
+							print '<th>'.$langs->trans("KeyForTooltip").'</th>';
 							print '<th class="center">'.$langs->trans("ShowOnCombobox").'</th>';
 							//print '<th class="center">'.$langs->trans("Disabled").'</th>';
 							print '<th>'.$langs->trans("Comment").'</th>';
@@ -2704,26 +2704,26 @@ if ($module == 'initmodule') {
 							if (!empty($properties)) {
 								// Line to add a property
 								print '<tr>';
-								print '<td><input class="text maxwidth75" name="propname" value="'.dol_escape_htmltag(GETPOST('propname', 'alpha')).'"></td>';
-								print '<td><input class="text maxwidth75" name="proplabel" value="'.dol_escape_htmltag(GETPOST('proplabel', 'alpha')).'"></td>';
-								print '<td><input class="text maxwidth75" name="proptype" value="'.dol_escape_htmltag(GETPOST('proptype', 'alpha')).'"></td>';
-								print '<td><input class="text maxwidth75" name="proparrayofkeyval" value="'.dol_escape_htmltag(GETPOST('proparrayofkeyval', 'restricthtml')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propnotnull" value="'.dol_escape_htmltag(GETPOST('propnotnull', 'alpha')).'"></td>';
-								print '<td><input class="text maxwidth50" name="propdefault" value="'.dol_escape_htmltag(GETPOST('propdefault', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propindex" value="'.dol_escape_htmltag(GETPOST('propindex', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propforeignkey" value="'.dol_escape_htmltag(GETPOST('propforeignkey', 'alpha')).'"></td>';
-								print '<td class="right"><input class="text right" size="2" name="propposition" value="'.dol_escape_htmltag(GETPOST('propposition', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propenabled" value="'.dol_escape_htmltag(GETPOST('propenabled', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propvisible" value="'.dol_escape_htmltag(GETPOST('propvisible', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propnoteditable" value="'.dol_escape_htmltag(GETPOST('propnoteditable', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propsearchall" value="'.dol_escape_htmltag(GETPOST('propsearchall', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propisameasure" value="'.dol_escape_htmltag(GETPOST('propisameasure', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propcss" value="'.dol_escape_htmltag(GETPOST('propcss', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propcssview" value="'.dol_escape_htmltag(GETPOST('propcssview', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propcsslist" value="'.dol_escape_htmltag(GETPOST('propcsslist', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="prophelp" value="'.dol_escape_htmltag(GETPOST('prophelp', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propshowoncombobox" value="'.dol_escape_htmltag(GETPOST('propshowoncombobox', 'alpha')).'"></td>';
-								//print '<td class="center"><input class="text" size="2" name="propdisabled" value="'.dol_escape_htmltag(GETPOST('propdisabled', 'alpha')).'"></td>';
+								print '<td><input type="text" class="maxwidth75" name="propname" value="'.dol_escape_htmltag(GETPOST('propname', 'alpha')).'"></td>';
+								print '<td><input type="text" class="maxwidth75" name="proplabel" value="'.dol_escape_htmltag(GETPOST('proplabel', 'alpha')).'"></td>';
+								print '<td><input type="text" class="maxwidth75" name="proptype" value="'.dol_escape_htmltag(GETPOST('proptype', 'alpha')).'"></td>';
+								print '<td><input type="text" class="maxwidth75" name="proparrayofkeyval" value="'.dol_escape_htmltag(GETPOST('proparrayofkeyval', 'restricthtml')).'"></td>';
+								print '<td class="center"><input type="text" class="center maxwidth50" name="propnotnull" value="'.dol_escape_htmltag(GETPOST('propnotnull', 'alpha')).'"></td>';
+								print '<td><input type="text" class="center maxwidth50" name="propdefault" value="'.dol_escape_htmltag(GETPOST('propdefault', 'alpha')).'"></td>';
+								print '<td class="center"><input type="text" class="center maxwidth50" name="propindex" value="'.dol_escape_htmltag(GETPOST('propindex', 'alpha')).'"></td>';
+								print '<td class="center"><input type="text" class="maxwidth100" name="propforeignkey" value="'.dol_escape_htmltag(GETPOST('propforeignkey', 'alpha')).'"></td>';
+								print '<td class="right"><input type="text" class="right" size="2" name="propposition" value="'.dol_escape_htmltag(GETPOST('propposition', 'alpha')).'"></td>';
+								print '<td class="center"><input type="text" class="center maxwidth50" name="propenabled" value="'.dol_escape_htmltag(GETPOST('propenabled', 'alpha')).'"></td>';
+								print '<td class="center"><input type="text" class="center maxwidth50" name="propvisible" value="'.dol_escape_htmltag(GETPOST('propvisible', 'alpha')).'"></td>';
+								print '<td class="center"><input type="text" class="center maxwidth50" name="propnoteditable" value="'.dol_escape_htmltag(GETPOST('propnoteditable', 'alpha')).'"></td>';
+								print '<td class="center"><input type="text" class="center maxwidth50" name="propsearchall" value="'.dol_escape_htmltag(GETPOST('propsearchall', 'alpha')).'"></td>';
+								print '<td class="center"><input type="text" class="center maxwidth50" name="propisameasure" value="'.dol_escape_htmltag(GETPOST('propisameasure', 'alpha')).'"></td>';
+								print '<td class="center"><input type="text" class="maxwidth50" name="propcss" value="'.dol_escape_htmltag(GETPOST('propcss', 'alpha')).'"></td>';
+								print '<td class="center"><input type="text" class="maxwidth50" name="propcssview" value="'.dol_escape_htmltag(GETPOST('propcssview', 'alpha')).'"></td>';
+								print '<td class="center"><input type="text" class="maxwidth50" name="propcsslist" value="'.dol_escape_htmltag(GETPOST('propcsslist', 'alpha')).'"></td>';
+								print '<td><input type="text" size="2" name="prophelp" value="'.dol_escape_htmltag(GETPOST('prophelp', 'alpha')).'"></td>';
+								print '<td class="center"><input type="text" class="center maxwidth50" name="propshowoncombobox" value="'.dol_escape_htmltag(GETPOST('propshowoncombobox', 'alpha')).'"></td>';
+								//print '<td class="center"><input type="text" size="2" name="propdisabled" value="'.dol_escape_htmltag(GETPOST('propdisabled', 'alpha')).'"></td>';
 								print '<td><input class="text maxwidth100" name="propcomment" value="'.dol_escape_htmltag(GETPOST('propcomment', 'alpha')).'"></td>';
 								print '<td class="center">';
 								print '<input class="button" type="submit" name="add" value="'.$langs->trans("Add").'">';
@@ -2782,23 +2782,27 @@ if ($module == 'initmodule') {
 										print '<input name="proptype" value="'.dol_escape_htmltag($proptype).'"></input>';
 										print '</td>';
 										print '<td class="tdoverflowmax200">';
-										print '<input name="proparrayofkeyval" value="'.dol_escape_htmltag(json_encode($proparrayofkeyval)).'">';
+										print '<input name="proparrayofkeyval" value="';
+										if (isset($proparrayofkeyval)) {
+											print dol_escape_htmltag(json_encode($proparrayofkeyval));
+										}
+										print '">';
 										print '</input>';
 										print '</td>';
 										print '<td>';
-										print '<input class="center" name="propnotnull" size="2" value="'.dol_escape_htmltag($propnotnull).'">';
+										print '<input class="center width50" name="propnotnull" value="'.dol_escape_htmltag($propnotnull).'">';
 										print '</td>';
 										print '<td>';
-										print '<input class="center" name="propdefault" value="'.dol_escape_htmltag($propdefault).'">';
+										print '<input class="maxwidth50" name="propdefault" value="'.dol_escape_htmltag($propdefault).'">';
 										print '</td>';
-										print '<td>';
-										print '<input class="center" name="propindex" size="2" value="'.dol_escape_htmltag($propindex).'">';
+										print '<td class="center">';
+										print '<input class="center maxwidth50" name="propindex" value="'.dol_escape_htmltag($propindex).'">';
 										print '</td>';
 										print '<td>';
 										print '<input class="center" name="propforeignkey" value="'.dol_escape_htmltag($propforeignkey).'">';
 										print '</td>';
 										print '<td>';
-										print '<input class="right" name="propposition" value="'.dol_escape_htmltag($propposition).'">';
+										print '<input class="right width50" name="propposition" value="'.dol_escape_htmltag($propposition).'">';
 										print '</td>';
 										print '<td>';
 										print '<input class="center" name="propenabled" size="2" value="'.dol_escape_htmltag($propenabled).'">';
@@ -2807,7 +2811,7 @@ if ($module == 'initmodule') {
 										print '<input class="center" name="propvisible" size="2" value="'.dol_escape_htmltag($propvisible).'">';
 										print '</td>';
 										print '<td>';
-										print '<input class="center" name="propnotable" size="2" value="'.dol_escape_htmltag($propnotable).'">';
+										print '<input class="center" name="propnoeditable" size="2" value="'.dol_escape_htmltag($propnoteditable).'">';
 										print '</td>';
 										print '<td>';
 										print '<input class="center" name="propsearchall" size="2" value="'.dol_escape_htmltag($propsearchall).'">';
@@ -2816,22 +2820,22 @@ if ($module == 'initmodule') {
 										print '<input class="center" name="propisameasure" size="2" value="'.dol_escape_htmltag($propisameasure).'">';
 										print '</td>';
 										print '<td>';
-										print '<input class="center" name="propcss" value="'.dol_escape_htmltag($propcss).'">';
+										print '<input class="center maxwidth50" name="propcss" value="'.dol_escape_htmltag($propcss).'">';
 										print '</td>';
 										print '<td>';
-										print '<input class="center" name="propcssview" value="'.dol_escape_htmltag($propcssview).'">';
+										print '<input class="center maxwidth50" name="propcssview" value="'.dol_escape_htmltag($propcssview).'">';
 										print '</td>';
 										print '<td>';
-										print '<input class="center" name="propcsslist" value="'.dol_escape_htmltag($propcsslist).'">';
+										print '<input class="center maxwidth50" name="propcsslist" value="'.dol_escape_htmltag($propcsslist).'">';
 										print '</td>';
 										print '<td>';
-										print '<input class="center" name="prophelp" value="'.dol_escape_htmltag($prophelp).'">';
+										print '<input class="maxwidth100" name="prophelp" value="'.dol_escape_htmltag($prophelp).'">';
 										print '</td>';
 										print '<td>';
-										print '<input class="center" name="propshowoncombobox" size="2" value="'.dol_escape_htmltag($propshowoncombobox).'">';
+										print '<input class="center maxwidth50" name="propshowoncombobox" value="'.dol_escape_htmltag($propshowoncombobox).'">';
 										print '</td>';
 										print '<td>';
-										print '<input name="propcomment" value="'.dol_escape_htmltag($propcomment).'">';
+										print '<input class="maxwidth100" name="propcomment" value="'.dol_escape_htmltag($propcomment).'">';
 										print '</td>';
 										print '<td class="center">';
 										print '<input class="button smallpaddingimp" type="submit" name="edit" value="'.$langs->trans("Save").'">';

From 17a8c73fada40229c3a74535a84d83ae95ecf162 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 May 2021 03:08:34 +0200
Subject: [PATCH 631/928] CSS

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

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index fc4e53cbd61..a1e3b8070a5 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2500,7 +2500,7 @@ if ($module == 'initmodule') {
 						$urloflist = $dirread.'/'.$pathtolist;
 						$urlofcard = $dirread.'/'.$pathtocard;
 
-						print '<div class="fichehalfleft">';
+						print '<div class="fichehalfleft small">';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("ClassFile").' : <strong>'.($realpathtoclass ? '' : '<strike>').$pathtoclass.($realpathtoclass ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtoclass).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
@@ -2580,7 +2580,7 @@ if ($module == 'initmodule') {
 						print '<br>';
 						print '</div>';
 
-						print '<div class="fichehalfleft">';
+						print '<div class="fichehalfleft small">';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForList").' : <strong><a href="'.$urloflist.'" target="_test">'.($realpathtolist ? '' : '<strike>').$pathtolist.($realpathtolist ? '' : '</strike>').'</a></strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtolist).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
@@ -2666,7 +2666,7 @@ if ($module == 'initmodule') {
 
 							print '<!-- Table with properties of object -->'."\n";
 							print '<div class="div-table-responsive">';
-							print '<table class="noborder">';
+							print '<table class="noborder small">';
 							print '<tr class="liste_titre">';
 							print '<th>'.$langs->trans("Property");
 							print ' (<a class="" href="https://wiki.dolibarr.org/index.php/Language_and_development_rules#Table_and_fields_structures" target="_blank">'.$langs->trans("SeeExamples").'</a>)';

From b739e7ba22773e7bf5a706dffc1a49b58e71df57 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 5 May 2021 11:26:15 +0200
Subject: [PATCH 632/928] Fix #17491 : date extrafield filter works well now

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

diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 1e62bd0a9d5..0f12ad52756 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -23,7 +23,11 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
 		{
-			$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
+			if($typ == 'date'){
+				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = DATE('".$db->idate($crit)."')";
+			}else{
+				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
+			}
 		} elseif (in_array($typ, array('boolean')))
 		{
 			if ($crit !== '-1' && $crit !== '') {

From 95be7e8a63aff8bfe9de15527f3fafd221bd5e9d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 5 May 2021 09:29:52 +0000
Subject: [PATCH 633/928] Fixing style errors.

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

diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 0f12ad52756..4445d34f63f 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -23,9 +23,9 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
 		{
-			if($typ == 'date'){
+			if ($typ == 'date'){
 				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = DATE('".$db->idate($crit)."')";
-			}else{
+			}else {
 				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
 			}
 		} elseif (in_array($typ, array('boolean')))

From 209682e7102155684cc5f6fa4835ed16fe163a54 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 5 May 2021 11:30:13 +0200
Subject: [PATCH 634/928] Fix #17361 : changes into mysql/tables of
 export_model

---
 htdocs/install/mysql/tables/llx_export_model.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql
index 53952430c14..7e68eab4ad5 100644
--- a/htdocs/install/mysql/tables/llx_export_model.sql
+++ b/htdocs/install/mysql/tables/llx_export_model.sql
@@ -24,7 +24,7 @@ create table llx_export_model
   	rowid		integer AUTO_INCREMENT PRIMARY KEY,
 	fk_user		integer DEFAULT 0 NOT NULL,
   	label		varchar(50) NOT NULL,
-  	type		varchar(20) NOT NULL,
+  	type		varchar(64) NOT NULL,
   	field		text NOT NULL,
   	filter		text
   	

From 139ae3db0025ce86d1898739f3df4e6e7a24ec0a Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Wed, 5 May 2021 11:49:11 +0200
Subject: [PATCH 635/928] FIX: pgsql: prevent 'WHERE 1'

---
 build/exe/doliwamp/config.inc.php.install | 2 +-
 htdocs/core/lib/functions.lib.php         | 2 +-
 htdocs/user/class/user.class.php          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/exe/doliwamp/config.inc.php.install b/build/exe/doliwamp/config.inc.php.install
index 19a3d36a45e..6ad04752766 100644
--- a/build/exe/doliwamp/config.inc.php.install
+++ b/build/exe/doliwamp/config.inc.php.install
@@ -542,7 +542,7 @@ $cfg['ThemePerServer']      = FALSE;         // allow diferent theme for each co
  * %f will be replaced by a list of field names.
  * (%t and %f only applies to DefaultQueryTable)
  */
-$cfg['DefaultQueryTable']    = 'SELECT * FROM %t WHERE 1';
+$cfg['DefaultQueryTable']    = 'SELECT * FROM %t WHERE 1 = 1';
 $cfg['DefaultQueryDatabase'] = '';
 
 /**
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index fccb019a730..4148d385716 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8123,7 +8123,7 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield
 	if (!isset($dictvalues[$tablename]))
 	{
 		$dictvalues[$tablename] = array();
-		$sql = 'SELECT * FROM '.$tablename.' WHERE 1'; // Here select * is allowed as it is generic code and we don't have list of fields
+		$sql = 'SELECT * FROM '.$tablename.' WHERE 1 = 1'; // Here select * is allowed as it is generic code and we don't have list of fields
 		if ($checkentity) $sql .= ' AND entity IN (0,'.getEntity($tablename).')';
 
 		$resql = $db->query($sql);
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index cc405571990..89995a4584e 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3320,7 +3320,7 @@ class User extends CommonObject
 		}
 		else
 		{
-			$sql .= " WHERE 1";
+			$sql .= " WHERE 1 = 1";
 		}
 
 		// Manage filter

From ed26e75c0b6cb4428cf32ba2f91465a44ae58c4f Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Wed, 5 May 2021 11:54:16 +0200
Subject: [PATCH 636/928] init

---
 htdocs/install/mysql/data/llx_c_action_trigger.sql | 6 ++++--
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql   | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 34cef4c94d4..45503449492 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -35,6 +35,7 @@
 delete from llx_c_action_trigger;
 -- actions enabled by default (constant created for that) when we enable module agenda
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_MODIFY','Third party update','Executed when you update third party','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2);
@@ -129,8 +130,9 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','mrp',662);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','mrp',663);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact address record','contact',51);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact address record','contact',52);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',53);
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index af6c2f48f50..84c305240d4 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -482,3 +482,9 @@ create table llx_knowledgemanagement_knowledgerecord_extrafields
 
 -- add default amount by member type
 ALTER TABLE llx_adherent_type ADD COLUMN amount DOUBLE(24,8) NULL DEFAULT NULL AFTER subscription;
+
+-- add action trigger
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) VALUES ('COMPANY_MODIFY','Third party update','Executed when you update third party','societe',1);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) VALUES ('CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51);
+
+

From 6f66efacb8f7047c3cea9e3f54fcade9234721e2 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Wed, 5 May 2021 13:47:43 +0200
Subject: [PATCH 637/928] New: Add import on BOM

---
 htdocs/core/modules/modBom.class.php | 137 +++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)

diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index 6b69c6b7af0..18f46fda70f 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2018	   Nicolas ZABOURI 	<info@inovea-conseil.com>
  * Copyright (C) 2019 Maxime Kohlhaas <maxime@atm-consulting.fr>
+ * Copyright (C) 2021 Ferran Marcet <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -315,6 +316,142 @@ class modBom extends DolibarrModules
 		$this->export_sql_end[$r] .= ' AND t.entity IN ('.getEntity('bom').')';
 		$r++;
 		/* END MODULEBUILDER EXPORT BILLOFMATERIALS */
+
+		// Imports
+		//--------
+		$r = 0;
+		//Import BOM Header
+
+		$r++;
+		$this->import_code[$r] = 'bom_'.$r;
+		$this->import_label[$r] = 'BillOfMaterials';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['b' => MAIN_DB_PREFIX.'bom_bom', 'extra' => MAIN_DB_PREFIX.'bom_bom_extrafields'];
+		$this->import_tables_creator_array[$r] = ['b' => 'fk_user_creat']; // Fields to store import user id
+		$this->import_fields_array[$r] = [
+			'b.ref'               => 'Document Ref*',
+			'b.label'             => 'BomLabel*',
+			'b.fk_product'        => 'ProductRef*',
+			'b.description'       => 'Description',
+			'b.note_public'       => 'Note',
+			'b.note_private'      => 'NotePrivate',
+			'b.fk_warehouse'      => 'WarehouseRef',
+			'b.qty'               => 'Qty',
+			'b.efficiency'        => 'Efficiency',
+			'b.duration'          => 'Duration',
+			'b.date_creation'     => 'DateCreation',
+			'b.date_valid'        => 'DateValid',
+			'b.fk_user_modif'     => 'ModifiedById',
+			'b.fk_user_valid'     => 'ValidatedById',
+			'b.model_pdf'         => 'Model',
+			'b.status'         	  => 'Status*',
+			'b.bomtype'       	  => 'BomType*'
+
+		];
+
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'bom_bom' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'bom_bom'];
+		$this->import_regex_array[$r] = [
+			'b.ref' => '(CPV\d{4}-\d{4}|BOM\d{4}-\d{4}|PROV.{1,32}$)'
+		];
+
+		$this->import_updatekeys_array[$r] = ['b.ref' => 'Ref'];
+		$this->import_convertvalue_array[$r] = [
+			'b.fk_product' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/product/class/product.class.php',
+				'class'   => 'Product',
+				'method'  => 'fetch',
+				'element' => 'Product'
+			],
+			'b.fk_warehouse' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/product/stock/class/entrepot.class.php',
+				'class'   => 'Entrepot',
+				'method'  => 'fetch',
+				'element' => 'Warehouse'
+			],
+			'b.fk_user_valid' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/user/class/user.class.php',
+				'class'   => 'User',
+				'method'  => 'fetch',
+				'element' => 'user'
+			],
+			'b.fk_user_modif' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/user/class/user.class.php',
+				'class'   => 'User',
+				'method'  => 'fetch',
+				'element' => 'user'
+			],
+		];
+
+		//Import BOM Lines
+		$r++;
+		$this->import_code[$r] = 'bom_lines_'.$r;
+		$this->import_label[$r] = 'BillOfMaterialsLine';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['bd' => MAIN_DB_PREFIX.'bom_bomline', 'extra' => MAIN_DB_PREFIX.'bom_bomline_extrafields'];
+		$this->import_fields_array[$r] = [
+			'bd.fk_bom'         => 'Document Ref*',
+			'bd.fk_product'     => 'ProductRef',
+			'bd.fk_bom_child'   => 'BOMChild',
+			'bd.description'    => 'Description',
+			'bd.qty'            => 'LineQty',
+			'bd.qty_frozen'      => 'LineIsFrozen',
+			'bd.disable_stock_change' => 'Disable Stock Change',
+			'bd.efficiency'     => 'Efficiency',
+			'bd.position'       => 'LinePosition'
+		];
+
+		// Add extra fields
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'bom_bomline' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'bom_bomline'];
+		$this->import_regex_array[$r] = [];
+		$this->import_updatekeys_array[$r] = ['bd.fk_bom' => 'BOM Id'];
+		$this->import_convertvalue_array[$r] = [
+			'bd.fk_bom' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/bom/class/bom.class.php',
+				'class'   => 'BOM',
+				'method'  => 'fetch',
+				'element' => 'bom'
+			],
+			'bd.fk_product' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/product/class/product.class.php',
+				'class'   => 'Product',
+				'method'  => 'fetch',
+				'element' => 'Product'
+			],
+		];
 	}
 
 	/**

From ed59a8851f3e7b243f89fde128f16db2a543aec2 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 5 May 2021 16:48:04 +0200
Subject: [PATCH 638/928] Fix #17501 : Undownloable attached file

---
 htdocs/core/actions_linkedfiles.inc.php | 4 ++++
 htdocs/langs/en_US/errors.lang          | 1 +
 2 files changed, 5 insertions(+)

diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index af60583118d..482f4cf1dea 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -44,6 +44,10 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 				}
 			}
+			if (preg_match('/__.*__/', $_FILES['userfile']['name'][$key])) {
+				$error++;
+				setEventMessages($langs->trans('ErrorWrongFileName'), null, 'errors');
+			}
 		}
 
 		if (!$error) {
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 6df5438de8f..cbf7214245a 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -298,3 +298,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
\ No newline at end of file

From 020ad5aebe41a22ba9bf6d4c18967d3c688103b0 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 5 May 2021 16:49:51 +0200
Subject: [PATCH 639/928] Add endofline in errors.lang

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

diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 55ae87b4613..a1155b0f57c 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -299,4 +299,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
-ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
\ No newline at end of file
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it

From 94e485aa061808ad0d6712f3522847893b668a36 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Wed, 5 May 2021 16:56:25 +0200
Subject: [PATCH 640/928] qc_frequency in days and qcstatus elsewhere

---
 htdocs/langs/en_US/productbatch.lang     |  2 +-
 htdocs/langs/fr_FR/productbatch.lang     |  2 +-
 htdocs/product/stock/productlot_card.php | 29 +-----------------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 6d9b9844382..50be94a859d 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -38,6 +38,6 @@ EndOfLife=End of life
 ManufacturingDate=Manufacturing date
 DestructionDate=Destruction date
 FirstUseDate=First use date
-QCFrequency=Quality control frequency
+QCFrequency=Quality control frequency (in days)
 InWorkingOrder=In working order
 OutOfOrder=Out of order
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 86fbd5ed4f0..ce448998094 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -37,6 +37,6 @@ EndOfLife=Date de fin de vie
 ManufacturingDate=Date de fabrication
 DestructionDate=Date de mise au rebut
 FirstUseDate=Date de mise en service
-QCFrequency=Periodicité de contrôle
+QCFrequency=Periodicité de contrôle (en jours)
 InWorkingOrder=En état de marche
 OutOfOrder=Hors d’usage
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 06bce2a4f9d..ef8dde76896 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -31,7 +31,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('stocks', 'other', 'productbatch'));
@@ -216,16 +215,6 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setfk_qcstatus' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
-		$result = $object->setValueFrom('fk_qcstatus', GETPOST('fk_qcstatus') ? GETPOST('fk_qcstatus') : null, '', null, 'text', '', $user, 'PRODUCT_MODIFY');
-		if ($result < 0) {
-			setEventMessages($object->error, null, 'errors');
-			$action == 'editfk_qcstatus';
-		} else {
-			$action = 'view';
-		}
-	}
-
 	$triggermodname = 'PRODUCT_LOT_MODIFY'; // Name of trigger action code to execute when we modify record
 
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
@@ -374,7 +363,6 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-$formproduct = new FormProduct($db);
 
 $title = $langs->trans("ProductLot");
 $help_url = '';
@@ -510,23 +498,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<td>'.$form->editfieldval($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
 		print '<tr><td>'.$form->editfieldkey($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer).'</td>';
-		print '<td>'.$form->editfieldval($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'string').'</td>';
+		print '<td>'.$form->editfieldval($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'numeric').'</td>';
 		print '</tr>';
-		/* print '<tr>';
-		print '<td class="maxwidthonsmartphone">';
-		print $form->editfieldkey("Status", 'fk_qcstatus', $object->fk_qcstatus, $object, $user->rights->stock->creer);
-		print '</td>';
-		print '<td class="valuefield">';
-		if ($action != 'editfk_qcstatus') {
-			$formproduct->load_cache_productbatch_qcstatus();
-			print $formproduct->cache_productbatch_qcstatus[$object->fk_qcstatus];
-		} else {
-		if (empty($fk_qcstatus)) {
-			$fk_qcstatus = $object->fk_qcstatus;
-		}
-		print $formproduct->select_productbatch_qcstatus($fk_qcstatus,'?id='.$object->id);
-		}
-		print '</td></tr>'; */
 	}
 
 	// Other attributes

From 7857da4db755937deb9d7d6c3691ae0c2a9b525c Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 5 May 2021 17:05:51 +0200
Subject: [PATCH 641/928] fix missing token

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 0ca49a49ff2..3adb6265564 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1870,7 +1870,7 @@ class FormFile
 				print '<td class="center">'.dol_print_date($link->datea, "dayhour", "tzuser").'</td>';
 				print '<td class="center"></td>';
 				print '<td class="right">';
-				print '<a href="'.$_SERVER['PHP_SELF'].'?action=update&linkid='.$link->id.$param.'" class="editfilelink editfielda reposition" >'.img_edit().'</a>'; // id= is included into $param
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=update&linkid='.$link->id.$param.'&token='.newToken().'" class="editfilelink editfielda reposition" >'.img_edit().'</a>'; // id= is included into $param
 				if ($permissiontodelete) {
 					print ' &nbsp; <a class="deletefilelink" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&linkid='.$link->id.$param.'">'.img_delete().'</a>'; // id= is included into $param
 				} else {

From adc862050692184a4feb2c5b5157174e9ae155e6 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 5 May 2021 17:14:58 +0200
Subject: [PATCH 642/928] fix: allow webdavs link type

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

diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index b0671bbf555..73b80a47973 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -68,7 +68,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 	$link = GETPOST('link', 'alpha');
 	if ($link)
 	{
-		if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://') {
+		if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://' && substr($link, 0, 7) != 'davs://') {
 			$link = 'http://'.$link;
 		}
 		dol_add_file_process($upload_dir, 0, 1, 'userfile', null, $link, '', 0);

From 9108651a7aace0c48b2de1a0cc1a8f5358dc4008 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 5 May 2021 17:25:12 +0200
Subject: [PATCH 643/928] FIX : if dom is added with ajax, selector need to
 keep working

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

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index d04379210a6..9bf67ee7e58 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -87,7 +87,7 @@ if (!defined('JS_JQUERY_DISABLE_DROPDOWN'))
 				  var lastopendropdown = null;
 
                   // Click onto the link "link to" or "hamburger", toggle dropdown
-				  $(".dropdown dt a").on(\'click\', function () {
+				  $(document).on(\'click\', \'.dropdown dt a\', function () {
                   	  console.log("toggle dropdown dt a");
 
                       //$(this).parent().parent().find(\'dd ul\').slideToggle(\'fast\');

From b1a4031bde7721511918a76a58ac45b1abdda792 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Wed, 5 May 2021 17:47:01 +0200
Subject: [PATCH 644/928] no qcstatus in productlot class

---
 htdocs/product/stock/class/productlot.class.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 0d891e8eb76..09c21a1eaa7 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -96,7 +96,6 @@ class Productlot extends CommonObject
 		'scrapping_date'        => array('type'=>'date', 'label'=>'DestructionDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>90),
 		'commissionning_date'        => array('type'=>'date', 'label'=>'FirstUseDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>100),
 		'qc_frequency'        => array('type'=>'varchar(6)', 'label'=>'QCFrequency', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>110),
-		// 'fk_qcstatus'        => array('type'=>'varchar(6)', 'label'=>'Status', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>120),
 		'eatby'         => array('type'=>'date', 'label'=>'EatByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_EATBY)?1:0', 'visible'=>5, 'position'=>62),
 		'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
 		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
@@ -123,7 +122,6 @@ class Productlot extends CommonObject
 	public $scrapping_date = '';
 	public $commissionning_date = '';
 	public $qc_frequency = '';
-	// public $fk_qcstatus = '';
 	public $datec = '';
 	public $tms = '';
 
@@ -203,7 +201,6 @@ class Productlot extends CommonObject
 		$sql .= 'scrapping_date,';
 		$sql .= 'commissionning_date,';
 		$sql .= 'qc_frequency,';
-		// $sql .= 'fk_qcstatus,';
 		$sql .= 'datec,';
 		$sql .= 'fk_user_creat,';
 		$sql .= 'fk_user_modif,';
@@ -219,7 +216,6 @@ class Productlot extends CommonObject
 		$sql .= ' '.(!isset($this->scrapping_date) || dol_strlen($this->scrapping_date) == 0 ? 'NULL' : "'".$this->db->idate($this->scrapping_date)."'").',';
 		$sql .= ' '.(!isset($this->commissionning_date) || dol_strlen($this->commissionning_date) == 0 ? 'NULL' : "'".$this->db->idate($this->commissionning_date)."'").',';
 		$sql .= ' '.(!isset($this->qc_frequency) ? 'NULL' : $this->qc_frequency).',';
-		// $sql .= ' '.(!isset($this->fk_qcstatus) || dol_strlen($this->fk_qcstatus) == 0 ? 'NULL' : $this->fk_qcstatus).',';
 
 		$sql .= ' '."'".$this->db->idate(dol_now())."'".',';
 		$sql .= ' '.(!isset($this->fk_user_creat) ? 'NULL' : $this->fk_user_creat).',';
@@ -298,7 +294,6 @@ class Productlot extends CommonObject
 		$sql .= " t.scrapping_date,";
 		$sql .= " t.commissionning_date,";
 		$sql .= " t.qc_frequency,";
-		// $sql .= " t.fk_qcstatus,";
 		$sql .= " t.datec,";
 		$sql .= " t.tms,";
 		$sql .= " t.fk_user_creat,";
@@ -332,7 +327,6 @@ class Productlot extends CommonObject
 				$this->scrapping_date = $this->db->jdate($obj->scrapping_date);
 				$this->commissionning_date = $this->db->jdate($obj->commissionning_date);
 				$this->qc_frequency = $obj->qc_frequency;
-				// $this->fk_qcstatus = $obj->fk_qcstatus;
 
 				$this->datec = $this->db->jdate($obj->datec);
 				$this->tms = $this->db->jdate($obj->tms);
@@ -415,7 +409,6 @@ class Productlot extends CommonObject
 		$sql .= ' scrapping_date = '.(!isset($this->destruction_date) || dol_strlen($this->destruction_date) != 0 ? "'".$this->db->idate($this->destruction_date)."'" : 'null').',';
 		$sql .= ' commissionning_date = '.(!isset($this->first_use_date) || dol_strlen($this->first_use_date) != 0 ? "'".$this->db->idate($this->first_use_date)."'" : 'null').',';
 		$sql .= ' qc_frequency = '.(!isset($this->qc_frequency) || dol_strlen($this->qc_frequency) != 0 ? "'".$this->db->escape($this->qc_frequency)."'" : 'null').',';
-		// $sql .= ' fk_qcstatus = '.(!isset($this->fk_qcstatus) || dol_strlen($this->fk_qcstatus) != 0 ? "'".$this->db->escape($this->fk_qcstatus)."'" : 'null').',';
 		$sql .= ' datec = '.(!isset($this->datec) || dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').',';
 		$sql .= ' tms = '.(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'").',';
 		$sql .= ' fk_user_creat = '.(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").',';

From 5be2bdd123024aca095e555598ff8b7a6f861051 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Wed, 5 May 2021 18:01:47 +0200
Subject: [PATCH 645/928] qcstatus is not for this branch

---
 htdocs/product/stock/tpl/stockcorrection.tpl.php | 5 +----
 htdocs/product/stock/tpl/stocktransfer.tpl.php   | 6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index f0175942511..6e2ab53dd0e 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -115,12 +115,9 @@ if (!empty($conf->productbatch->enabled) &&
 || ($object->element == 'stock'))
 ) {
 	print '<tr>';
-	print '<td'.($object->element == 'stock' ? '' : ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td>';
+	print '<td'.($object->element == 'stock' ? '' : ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td colspan="3">';
 	print '<input type="text" name="batch_number" size="40" value="'.GETPOST("batch_number").'">';
 	print '</td>';
-	print '<td>'.$langs->trans("StatusChangeIfNeeded").'</td>';
-	$formproduct->load_cache_productbatch_qcstatus();
-	print '<td class="valuefield">'.$formproduct->selectProductbatchQcstatus($object->fk_qcstatus, 'fk_qcstatus').'</td></tr>';
 	print '</tr>';
 	print '<tr>';
 	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 32a197b7857..d09d584aa8e 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -89,10 +89,8 @@ if ($object->element == 'stock') {
 print '<td class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td>';
 print img_picto('', 'stock').$formproduct->selectWarehouses(GETPOST('id_entrepot_destination'), 'id_entrepot_destination', 'warehouseopen,warehouseinternal', 1);
 print '</td></tr>';
-print '<tr><td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td><input type="text" name="nbpiece" size="10" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
-print '<td>'.$langs->trans("StatusChangeIfNeeded").'</td>';
-$formproduct->load_cache_productbatch_qcstatus();
-print '<td class="valuefield">'.$formproduct->selectProductbatchQcstatus('0','fk_qcstatus').'</td></tr>';
+print '<tr><td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td colspan="3"><input type="text" name="nbpiece" size="10" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
+print '<td></tr>';
 
 // Serial / Eat-by date
 if (!empty($conf->productbatch->enabled) &&

From 63292255ccbc7ad08270bb6820f033f2bc7ed0ff Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 5 May 2021 18:45:23 +0200
Subject: [PATCH 646/928] Fix search accented words in product description

---
 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 cd82533fc88..420282c4cef 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -309,7 +309,7 @@ if (!empty($sql_select))
 	if ($sref) $sql.= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
 	if ($sprod_fulldescr)
 	{
-	    $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
+	    $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%' OR d.description LIKE '%".$db->escape(dol_htmlentities($sprod_fulldescr))."%'";
 	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
 	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
 	    $sql.=")";

From 19f78b2e8f5844ba91a549bd50c3c3c25a7d84cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 May 2021 19:13:40 +0200
Subject: [PATCH 647/928] More compact gui

---
 htdocs/core/lib/functions.lib.php |  4 +-
 htdocs/modulebuilder/index.php    | 80 +++++++++++++------------------
 htdocs/theme/eldy/global.inc.php  |  2 +
 3 files changed, 38 insertions(+), 48 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ddd96bfa675..2085c3f2320 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3496,7 +3496,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
 				'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
-				'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
+				'generate', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
 				'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'knowledgemanagement',
 				'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
@@ -3534,7 +3534,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
 				'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
 				'accounting'=>'search-dollar', 'category'=>'tag', 'dollyrevert'=>'dolly',
-				'hrm'=>'user-tie', 'incoterm'=>'truck-loading',
+				'generate'=>'plus-square', 'hrm'=>'user-tie', 'incoterm'=>'truck-loading',
 				'margin'=>'calculator', 'members'=>'user-friends', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
 				'email'=>'at', 'establishment'=>'building',
 				'edit'=>'pencil-alt', 'graph'=>'chart-line', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index a1e3b8070a5..9cb22f735e6 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2149,7 +2149,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="tab" value="'.$tab.'">';
 				print '<input type="hidden" name="module" value="'.$module.'">';
 				print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'newlangcode', 0, 0, 1, 0, 0, 'minwidth300', 1);
-				print '<input type="submit" name="addlanguage" class="button" value="'.dol_escape_htmltag($langs->trans("AddLanguageFile")).'"><br>';
+				print '<input type="submit" name="addlanguage" class="button smallpaddingimp" value="'.dol_escape_htmltag($langs->trans("AddLanguageFile")).'"><br>';
 				print '</form>';
 
 				print '<br>';
@@ -2408,7 +2408,7 @@ if ($module == 'initmodule') {
 				print '<input type="text" name="objectname" maxlength="64" value="'.dol_escape_htmltag(GETPOST('objectname', 'alpha') ? GETPOST('objectname', 'alpha') : $modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'"><br>';
 				print '<input type="checkbox" name="includerefgeneration" value="includerefgeneration"> '.$form->textwithpicto($langs->trans("IncludeRefGeneration"), $langs->trans("IncludeRefGenerationHelp")).'<br>';
 				print '<input type="checkbox" name="includedocgeneration" value="includedocgeneration"> '.$form->textwithpicto($langs->trans("IncludeDocGeneration"), $langs->trans("IncludeDocGenerationHelp")).'<br>';
-				print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
+				print '<input type="submit" class="button smallpaddingimp" name="create" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 				print '<br>';
 				print '<br>';
 				print '<br>';
@@ -2418,7 +2418,7 @@ if ($module == 'initmodule') {
 				//print '<input type="checkbox" name="initfromtablecheck"> ';
 				print $langs->trans("InitStructureFromExistingTable");
 				print '<input type="text" name="initfromtablename" value="" placeholder="'.$langs->trans("TableName").'">';
-				print '<input type="submit" class="button" name="createtablearray" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
+				print '<input type="submit" class="button smallpaddingimp" name="createtablearray" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 				print '<br>';
 
 				print '</form>';
@@ -2472,7 +2472,6 @@ if ($module == 'initmodule') {
 						$pathtolib      = strtolower($module).'/lib/'.strtolower($module).'.lib.php';
 						$pathtoobjlib   = strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($tabobj).'.lib.php';
 						$pathtopicto    = strtolower($module).'/img/object_'.strtolower($tabobj).'.png';
-						$pathtoscript   = strtolower($module).'/scripts/'.strtolower($tabobj).'.php';
 
 						//var_dump($pathtoclass); var_dump($dirread);
 						$realpathtoclass    = $dirread.'/'.$pathtoclass;
@@ -2491,7 +2490,6 @@ if ($module == 'initmodule') {
 						$realpathtolib      = $dirread.'/'.$pathtolib;
 						$realpathtoobjlib   = $dirread.'/'.$pathtoobjlib;
 						$realpathtopicto    = $dirread.'/'.$pathtopicto;
-						$realpathtoscript   = $dirread.'/'.$pathtoscript;
 
 						if (empty($realpathtoapi)) { 	// For compatibility with some old modules
 							$pathtoapi = strtolower($module).'/class/api_'.strtolower($module).'s.class.php';
@@ -2500,11 +2498,11 @@ if ($module == 'initmodule') {
 						$urloflist = $dirread.'/'.$pathtolist;
 						$urlofcard = $dirread.'/'.$pathtocard;
 
-						print '<div class="fichehalfleft small">';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("ClassFile").' : <strong>'.($realpathtoclass ? '' : '<strike>').$pathtoclass.($realpathtoclass ? '' : '</strike>').'</strong>';
+						print '<div class="fichehalfleft smallxxx">';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("ClassFile").' : <strong>'.($realpathtoclass ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoclass).($realpathtoclass ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtoclass).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("ApiClassFile").' : <strong>'.($realpathtoapi ? '' : '<strike>').$pathtoapi.($realpathtoapi ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("ApiClassFile").' : <strong>'.($realpathtoapi ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoapi).($realpathtoapi ? '' : '</strike>').'</strong>';
 						if (dol_is_file($realpathtoapi)) {
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
@@ -2517,44 +2515,44 @@ if ($module == 'initmodule') {
 							}
 						} else {
 							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
-							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initapi&format=php&file='.urlencode($pathtoapi).'"><input type="button" class="button smallpaddingimp" value="'.$langs->trans("Generate").'"></a>';
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initapi&format=php&file='.urlencode($pathtoapi).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
 						// PHPUnit
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("TestClassFile").' : <strong>'.($realpathtophpunit ? '' : '<strike>').$pathtophpunit.($realpathtophpunit ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("TestClassFile").' : <strong>'.($realpathtophpunit ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtophpunit).($realpathtophpunit ? '' : '</strike>').'</strong>';
 						if (dol_is_file($realpathtophpunit)) {
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						} else {
 							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
-							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initphpunit&format=php&file='.urlencode($pathtophpunit).'"><input type="button" class="button smallpaddingimp" value="'.$langs->trans("Generate").'"></a>';
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initphpunit&format=php&file='.urlencode($pathtophpunit).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
 						print '<br>';
 
 						print '<br>';
 
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForLib").' : <strong>'.($realpathtolib ? '' : '<strike>').$pathtolib.($realpathtolib ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForLib").' : <strong>'.($realpathtolib ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtolib).($realpathtolib ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtolib).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForObjLib").' : <strong>'.($realpathtoobjlib ? '' : '<strike>').$pathtoobjlib.($realpathtoobjlib ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForObjLib").' : <strong>'.($realpathtoobjlib ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoobjlib).($realpathtoobjlib ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtoobjlib).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-image-o"></span> '.$langs->trans("Image").' : <strong>'.($realpathtopicto ? '' : '<strike>').$pathtopicto.($realpathtopicto ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-image-o"></span> '.$langs->trans("Image").' : <strong>'.($realpathtopicto ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtopicto).($realpathtopicto ? '' : '</strike>').'</strong>';
 						//print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtopicto).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
 
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFile").' : <strong>'.($realpathtosql ? '' : '<strike>').$pathtosql.($realpathtosql ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFile").' : <strong>'.($realpathtosql ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtosql).($realpathtosql ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=sql&file='.urlencode($pathtosql).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=droptable">'.$langs->trans("DropTableIfEmpty").'</a>';
 						//print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileKey").' : <strong>'.($realpathtosqlkey ? '' : '<strike>').$pathtosqlkey.($realpathtosqlkey ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileKey").' : <strong>'.($realpathtosqlkey ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlkey).($realpathtosqlkey ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=sql&file='.urlencode($pathtosqlkey).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						//print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileExtraFields").' : <strong>'.($realpathtosqlextra ? '' : '<strike>').$pathtosqlextra.($realpathtosqlextra ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileExtraFields").' : <strong>'.($realpathtosqlextra ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlextra).($realpathtosqlextra ? '' : '</strike>').'</strong>';
 						if (dol_is_file($realpathtosqlextra) && dol_is_file($realpathtosqlextrakey)) {
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&file='.urlencode($pathtosqlextra).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
@@ -2562,66 +2560,56 @@ if ($module == 'initmodule') {
 							print ' &nbsp; ';
 							print '<a class="reposition editfielda" href="'.$_SERVER["PHP_SELF"].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=droptableextrafields">'.$langs->trans("DropTableIfEmpty").'</a>';
 						} else {
-							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initsqlextrafields&format=sql&file='.urlencode($pathtosqlextra).'"><input type="button" class="button smallpaddingimp" value="'.$langs->trans("Generate").'"></a>';
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initsqlextrafields&format=sql&file='.urlencode($pathtosqlextra).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
 						//print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileKeyExtraFields").' : <strong>'.($realpathtosqlextrakey ? '' : '<strike>').$pathtosqlextrakey.($realpathtosqlextrakey ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileKeyExtraFields").' : <strong>'.($realpathtosqlextrakey ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlextrakey).($realpathtosqlextrakey ? '' : '</strike>').'</strong>';
 						if (dol_is_file($realpathtosqlextra) && dol_is_file($realpathtosqlextrakey)) {
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=sql&file='.urlencode($pathtosqlextrakey).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtosqlextrakey).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						} else {
-							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initsqlextrafields&format=sql&file='.urlencode($pathtosqlextra).'"><input type="button" class="button smallpaddingimp" value="'.$langs->trans("Generate").'"></a>';
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initsqlextrafields&format=sql&file='.urlencode($pathtosqlextra).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
-						//print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
-						print '<br>';
-
 						print '<br>';
 						print '</div>';
 
-						print '<div class="fichehalfleft small">';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForList").' : <strong><a href="'.$urloflist.'" target="_test">'.($realpathtolist ? '' : '<strike>').$pathtolist.($realpathtolist ? '' : '</strike>').'</a></strong>';
+						print '<div class="fichehalfleft smallxxxx">';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForList").' : <strong><a href="'.$urloflist.'" target="_test">'.($realpathtolist ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtolist).($realpathtolist ? '' : '</strike>').'</a></strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtolist).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForCreateEditView").' : <strong><a href="'.$urlofcard.'?action=create" target="_test">'.($realpathtocard ? '' : '<strike>').$pathtocard.($realpathtocard ? '' : '</strike>').'?action=create</a></strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForCreateEditView").' : <strong><a href="'.$urlofcard.'?action=create" target="_test">'.($realpathtocard ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtocard).($realpathtocard ? '' : '</strike>').'?action=create</a></strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtocard).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForContactTab").' : <strong>'.($realpathtocontact ? '' : '<strike>').$pathtocontact.($realpathtocontact ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForContactTab").' : <strong>'.($realpathtocontact ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtocontact).($realpathtocontact ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtocontact).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						if (dol_is_file($realpathtocontact)) {
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtocontact).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						}
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForDocumentTab").' : <strong>'.($realpathtodocument ? '' : '<strike>').$pathtodocument.($realpathtodocument ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForDocumentTab").' : <strong>'.($realpathtodocument ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtodocument).($realpathtodocument ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtodocument).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						if (dol_is_file($realpathtodocument)) {
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtodocument).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						}
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForNoteTab").' : <strong>'.($realpathtonote ? '' : '<strike>').$pathtonote.($realpathtonote ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForNoteTab").' : <strong>'.($realpathtonote ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtonote).($realpathtonote ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtonote).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						if (dol_is_file($realpathtonote)) {
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtonote).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						}
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForAgendaTab").' : <strong>'.($realpathtoagenda ? '' : '<strike>').$pathtoagenda.($realpathtoagenda ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForAgendaTab").' : <strong>'.($realpathtoagenda ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoagenda).($realpathtoagenda ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtoagenda).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						if (dol_is_file($realpathtoagenda)) {
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtoagenda).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						}
 						print '<br>';
-
-						/* This is already on Tab CLI
-						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("ScriptFile").' : <strong>'.($realpathtoscript?'':'<strike>').$pathtoscript.($realpathtoscript?'':'</strike>').'</strong>';
-						print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtoscript).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
-						print '<br>';*/
-
 						print '<br>';
 
 						print '</div>';
@@ -3255,7 +3243,7 @@ if ($module == 'initmodule') {
 					print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
-					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inithook&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button smallpaddingimp" value="'.$langs->trans("Generate").'"></a></td>';
+					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inithook&format=php&file='.urlencode($pathtohook).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</td>';
 					print '<td></td>';
 				}
 				print '</tr>';
@@ -3317,7 +3305,7 @@ if ($module == 'initmodule') {
 				} else {
 					print '<tr><td>';
 					print '<span class="fa fa-file-o"></span> '.$langs->trans("NoTrigger");
-					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inittrigger&format=php"><input type="button" class="button smallpaddingimp" value="'.$langs->trans("Generate").'"></a></td>';
+					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inittrigger&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a></td>';
 					print '<td></td>';
 					print '</tr>';
 				}
@@ -3365,7 +3353,7 @@ if ($module == 'initmodule') {
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcss&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button smallpaddingimp" value="'.$langs->trans("Generate").'"></a></td>';
+					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcss&format=php&file='.urlencode($pathtohook).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a></td>';
 				}
 				print '</tr>';
 			} else {
@@ -3410,7 +3398,7 @@ if ($module == 'initmodule') {
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initjs&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button smallpaddingimp" value="'.$langs->trans("Generate").'"></a></td>';
+					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initjs&format=php&file='.urlencode($pathtohook).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a></td>';
 				}
 				print '</tr>';
 			} else {
@@ -3460,7 +3448,7 @@ if ($module == 'initmodule') {
 					}
 				} else {
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("NoWidget");
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initwidget&format=php"><input type="button" class="button smallpaddingimp" value="'.$langs->trans("Generate").'"></a>';
+					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initwidget&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 					print '</td></tr>';
 				}
 				print '</table>';
@@ -3576,8 +3564,8 @@ if ($module == 'initmodule') {
 						print '</tr>';
 					}
 				} else {
-					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("NoCLIFile");
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcli&format=php"><input type="button" class="button smallpaddingimp" value="'.$langs->trans("Generate").'"></a>';
+					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("CLIFile").' : <span class="opacitymedium">'.$langs->trans("FileNotYetGenerated");'</span>';
+					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcli&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 					print '</td></tr>';
 				}
 				print '</table>';
@@ -3751,8 +3739,8 @@ if ($module == 'initmodule') {
 					}
 				} else {
 					print '<tr><td>';
-					print '<span class="fa fa-file-o"></span> '.$langs->trans("FileNotYetGenerated");
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initdoc&format=php"><input type="button" class="button smallpaddingimp" value="'.$langs->trans("Generate").'"></a></td>';
+					print '<span class="fa fa-file-o"></span> '.$langs->trans("SpecificationFile").' : <span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
+					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initdoc&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a></td>';
 					print '</tr>';
 				}
 				print '</table>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index a60e81c6cf3..01ed6b127dd 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3217,6 +3217,8 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 
 .smallpaddingimp {
 	padding: 4px !important;
+	padding-left: 7px !important;
+	padding-right: 7px !important;
 }
 input.button[name="upload"] {
 	padding: 4px !important;

From 6b89b99dfddb82bf6cceba40399d7fa721b4953d Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 5 May 2021 23:07:52 +0200
Subject: [PATCH 648/928] Update llx_00_c_country.sql

---
 htdocs/install/mysql/data/llx_00_c_country.sql | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index 88df2349391..fa2b4339983 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -6,6 +6,7 @@
 -- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
 -- Copyright (C) 2014 	   Alexandre Spangaro   <aspangaro@open-dsi.fr>
+-- Copyright (C) 2021 	   Udo Tamm             <dev@dolibit.de>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -50,7 +51,7 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (19
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (20,'SE','SWE','Sweden',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (21,'CI','CIV','Côte d''Ivoire',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (22,'SN','SEN','Senegal',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (23,'AR','ARG','Argentine',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (23,'AR','ARG','Argentina',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (24,'CM','CMR','Cameroun',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (25,'PT','PRT','Portugal',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (26,'SA','SAU','Saudi Arabia',1,0);
@@ -59,21 +60,21 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (28
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (29,'SG','SGP','Singapour',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (30,'AF','AFG','Afghanistan',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (31,'AX','ALA','Iles Aland',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (32,'AL','ALB','Albanie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (32,'AL','ALB','Albania',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (33,'AS','ASM','Samoa américaines',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (34,'AD','AND','Andorre',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (34,'AD','AND','Andorra',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (35,'AO','AGO','Angola',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (36,'AI','AIA','Anguilla',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (37,'AQ','ATA','Antarctique',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (38,'AG','ATG','Antigua-et-Barbuda',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (39,'AM','ARM','Arménie',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (41,'AT','AUT','Autriche',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (39,'AM','ARM','Armenia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (41,'AT','AUT','Austria',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (42,'AZ','AZE','Azerbaïdjan',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (43,'BS','BHS','Bahamas',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (44,'BH','BHR','Bahreïn',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (45,'BD','BGD','Bangladesh',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (46,'BB','BRB','Barbade',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (47,'BY','BLR','Biélorussie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (47,'BY','BLR','Belarus',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (48,'BZ','BLZ','Belize',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (49,'BJ','BEN','Bénin',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (50,'BM','BMU','Bermudes',1,0);

From d55309c84793bfee371e4688f866e852415cbd8b Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 6 May 2021 09:46:54 +0200
Subject: [PATCH 649/928] fix rename file

---
 htdocs/core/actions_linkedfiles.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 482f4cf1dea..2a610cb3bf6 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -176,8 +176,11 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes') {
 		// We apply dol_string_nohtmltag also to clean file names (this remove duplicate spaces) because
 		// this function is also applied when we upload and when we make try to download file (by the GETPOST(filename, 'alphanohtml') call).
 		$filenameto = dol_string_nohtmltag($filenameto);
-
-		if ($filenamefrom != $filenameto) {
+		if (preg_match('/__.*__/', $filenameto)) {
+			$error++;
+			setEventMessages($langs->trans('ErrorWrongFileName'), null, 'errors');
+		}
+		if (!$error && $filenamefrom != $filenameto) {
 			// 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.

From 8a108ae5e8bc108e8535f97664fdb19d128ff2bb Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 6 May 2021 09:59:33 +0200
Subject: [PATCH 650/928] qcstatus out of formproduct and corrections in syntax

---
 htdocs/product/card.php                       |   8 +-
 .../product/class/html.formproduct.class.php  | 110 ------------------
 2 files changed, 4 insertions(+), 114 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index f0bfd090eaa..a11f6b8ca8a 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1607,10 +1607,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$tooltip .= $langs->trans("GenericMaskCodes5");
 						print '<td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
 						if ($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
-							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
+							$mask = ! empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
 						}
 						if ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
-							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
+							$mask = ! empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
 						}
 						$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
 						$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
@@ -1802,7 +1802,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Traceability
-			if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+			if ( empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
 				print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth100onsmartphone" value="'.$object->lifetime.'"></td></tr>';
 				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth100onsmartphone" value="'.$object->qc_frequency.'"></td></tr>';
 			}
@@ -2285,7 +2285,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Traceability
-			if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+			if ( empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
 				print '<tr><td>'.$langs->trans("LifeTime").'</td><td colspan="2">'.$object->lifetime.' ';
 				!empty($object->lifetime) ? print $langs->trans('Days') : print '';
 				print '</td></tr>';
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index ace2cfa0008..718acef6970 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -672,114 +672,4 @@ class FormProduct
 			}
 		}
 	}
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return select list of productbatch status
-     *
-     *  @param	string	$selected       		Id or Code of preselected incoterm
-     *  @param  string	$htmlname       		Name of html select object
-     *  @param  string	$htmloption     		Options html on select object
-     *  @param	array	$events					Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
-     *  @return string           				HTML string with select and input
-     */
-    public function selectProductbatchQcstatus($selected = '', $htmlname = 'fk_qcstatus', $htmloption = '', $forcecombo = 0, $events = array())
-    {
-        // phpcs:enable
-        global $conf, $langs, $user;
-
-        $langs->load("dict");
-
-        $out = '';
-        $statusArray = array();
-
-        $sql = "SELECT code, label";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_qcstatus";
-        $sql .= " WHERE active > 0";
-        $sql .= " ORDER BY code ASC";
-
-        dol_syslog(get_class($this)."::select_productbatch_qcstatus", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            if ($conf->use_javascript_ajax && !$forcecombo) {
-                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-                $out .= ajax_combobox($htmlname, $events);
-            }
-
-            $out .= '<select id="'.$htmlname.'" class="flat selectfkstatus minwidth100imp noenlargeonsmartphone" name="'.$htmlname.'" '.$htmloption.'>';
-            $out .= '<option value="0">&nbsp;</option>';
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            if ($num) {
-                while ($i < $num) {
-                    $obj = $this->db->fetch_object($resql);
-                    $statusArray[$i]['code'] = $obj->code;
-                    $statusArray[$i]['label'] = $obj->label;
-                    $i++;
-                }
-                foreach ($statusArray as $row) {
-                    if ($selected && ($selected == $row['code'] || $selected == $row['label'])) {
-                        $out .= '<option value="'.$row['code'].'" selected>';
-                    } else {
-                        $out .= '<option value="'.$row['code'].'">';
-                    }
-
-                    if ($row['label']) {
-                        $out .= $langs->trans($row['label']);
-                    }
-
-                    $out .= '</option>';
-                }
-            }
-            $out .= '</select>';
-
-			if ($user->admin) {
-				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-			}
-        } else {
-            dol_print_error($this->db);
-        }
-
-        return $out;
-    }
-		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Load into the cache productbatch status
-	 *
-	 *  @return	int							Nb of loaded lines, 0 if already loaded, <0 if KO
-	 */
-	public function load_cache_productbatch_qcstatus()
-	{
-		// phpcs:enable
-		global $langs;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = "SELECT s.rowid, s.code, s.label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_qcstatus as s";
-		$sql .= " WHERE s.active > 0";
-		$sql .= " ORDER BY s.code ASC";
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-
-			while ($i < $num) {
-				$obj = $this->db->fetch_object($resql);
-
-				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-				$label = ($obj->code != $langs->trans($obj->code) ? $langs->trans($obj->code) : $langs->trans($obj->label));
-				$this->cache_productbatch_qcstatus[$obj->code] = $label;
-				$i++;
-			}
-
-			asort($this->cache_productbatch_qcstatus);
-
-			return $num;
-		} else {
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
 }

From 435cbcd16c8a91459d5d0738c89b7f7d6084fdde Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 6 May 2021 10:01:53 +0200
Subject: [PATCH 651/928] spaces after !

---
 htdocs/product/stock/productlot_card.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index ef8dde76896..2c3d0ebee08 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -139,7 +139,7 @@ if (empty($reshook)) {
 
 	$backurlforlist = dol_buildpath('/product/stock/productlot_list.php', 1);
 
-	if ($action == 'seteatby' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+	if ($action == 'seteatby' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
 		$result = $object->setValueFrom('eatby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -150,7 +150,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setsellby' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+	if ($action == 'setsellby' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
 		$result = $object->setValueFrom('sellby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -161,7 +161,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'seteol_date' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+	if ($action == 'seteol_date' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('eol_datemonth', 'int'), GETPOST('eol_dateday', 'int'), GETPOST('eol_dateyear', 'int'));
 		$result = $object->setValueFrom('eol_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -172,7 +172,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setmanufacturing_date' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+	if ($action == 'setmanufacturing_date' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('manufacturing_datemonth', 'int'), GETPOST('manufacturing_dateday', 'int'), GETPOST('manufacturing_dateyear', 'int'));
 		$result = $object->setValueFrom('manufacturing_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -183,7 +183,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setscrapping_date' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+	if ($action == 'setscrapping_date' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('scrapping_datemonth', 'int'), GETPOST('scrapping_dateday', 'int'), GETPOST('scrapping_dateyear', 'int'));
 		$result = $object->setValueFrom('scrapping_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -194,7 +194,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setcommissionning_date' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+	if ($action == 'setcommissionning_date' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('commissionning_datemonth', 'int'), GETPOST('commissionning_dateday', 'int'), GETPOST('commissionning_dateyear', 'int'));
 		$result = $object->setValueFrom('commissionning_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -205,7 +205,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setqc_frequency' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
+	if ($action == 'setqc_frequency' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
 		$result = $object->setValueFrom('qc_frequency', GETPOST('qc_frequency'), '', null, 'int', '', $user, 'PRODUCT_MODIFY');
 		if ($result < 0) { // Prévoir un test de format de durée
 			setEventMessages($object->error, null, 'errors');

From cce132b8daa2a34b988b855573847114ffe3c817 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 6 May 2021 10:04:54 +0200
Subject: [PATCH 652/928] one more space

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index a11f6b8ca8a..03b9a0c0552 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1299,7 +1299,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</tr>';
 		}
 		// Traceability
-		if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+		if ( empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
 			print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth100onsmartphone" value="'.GETPOST('lifetime').'"></td></tr>';
 			print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth100onsmartphone" value="'.GETPOST('qc_frequency').'"></td></tr>';
 		}

From 7c53e2bb1822f90f2d72cd52bba286149d9dc9fc Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 6 May 2021 11:16:22 +0200
Subject: [PATCH 653/928] too much td

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

diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index d09d584aa8e..dcd19be4ad6 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -90,7 +90,7 @@ print '<td class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td>';
 print img_picto('', 'stock').$formproduct->selectWarehouses(GETPOST('id_entrepot_destination'), 'id_entrepot_destination', 'warehouseopen,warehouseinternal', 1);
 print '</td></tr>';
 print '<tr><td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td colspan="3"><input type="text" name="nbpiece" size="10" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
-print '<td></tr>';
+print '</tr>';
 
 // Serial / Eat-by date
 if (!empty($conf->productbatch->enabled) &&

From 644079ff004b8617a783c46d83af0d603c485929 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 11:18:35 +0200
Subject: [PATCH 654/928] Fix sql

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index fe05c551945..72a9ce36ce4 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -405,7 +405,7 @@ if ($catid == -2) {
 	$sql .= " AND cu.fk_categorie IS NULL";
 }
 if ($search_categ > 0) {
-	$sql .= " AND cu.fk_categorie = ".$db->escape($search_categ);
+	$sql .= " AND cu.fk_categorie = ".((int) $search_categ);
 }
 if ($search_categ == -2) {
 	$sql .= " AND cu.fk_categorie IS NULL";

From 6f4e151b9145ba90c356d140177c3e4b70ca3c0c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 11:25:46 +0200
Subject: [PATCH 655/928] Fix permissions

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 72a9ce36ce4..afe08969e45 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -181,8 +181,15 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 
 $error = 0;
 
-if (!$user->rights->user->user->lire && !$user->admin) {
-	accessforbidden();
+// Permission to list
+if ($mode == 'employee') {
+	if (empty($user->rights->salaries->read)) {
+		accessforbidden();
+	}
+} else {
+	if (!$user->rights->user->user->lire && !$user->admin) {
+		accessforbidden();
+	}
 }
 
 $childids = $user->getAllChildIds(1);
@@ -411,7 +418,7 @@ if ($search_categ == -2) {
 	$sql .= " AND cu.fk_categorie IS NULL";
 }
 if ($mode == 'employee' && empty($user->rights->salaries->readall)) {
-	$sql .= " AND u.fk_user IN (".$db->sanitize(join(',', $childids)).")";
+	$sql .= " AND u.rowid IN (".$db->sanitize(join(',', $childids)).")";
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';

From 2bdea3732dac0212bc06e528afbec2232ad01207 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 6 May 2021 14:52:48 +0200
Subject: [PATCH 656/928] days in lifetime trans

---
 htdocs/langs/en_US/productbatch.lang | 2 +-
 htdocs/langs/fr_FR/productbatch.lang | 2 +-
 htdocs/product/card.php              | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 50be94a859d..e7105c544ed 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -33,7 +33,7 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-LifeTime=Life span
+LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
 DestructionDate=Destruction date
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index ce448998094..2cce7c91e8d 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -32,7 +32,7 @@ ManageLotMask=Masque personnalisé
 CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
 LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
 SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
-LifeTime=Durée de vie
+LifeTime=Durée de vie (en jours)
 EndOfLife=Date de fin de vie
 ManufacturingDate=Date de fabrication
 DestructionDate=Date de mise au rebut
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 03b9a0c0552..038af02808b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2286,12 +2286,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Traceability
 			if ( empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
-				print '<tr><td>'.$langs->trans("LifeTime").'</td><td colspan="2">'.$object->lifetime.' ';
-				!empty($object->lifetime) ? print $langs->trans('Days') : print '';
-				print '</td></tr>';
-				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td colspan="2">'.$object->qc_frequency.' ';
-				!empty($object->qc_frequency) ? print $langs->trans('Days') : print '';
-				print '</td></tr>';
+				print '<tr><td>'.$langs->trans("LifeTime").'</td><td colspan="2">'.$object->lifetime.'</td></tr>';
+				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td colspan="2">'.$object->qc_frequency.'</td></tr>';
 			}
 
 			// Other attributes

From b979fad85938286e4a37e3a53e86db2c6f7fee02 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 6 May 2021 15:19:29 +0200
Subject: [PATCH 657/928] reconcile before PR

---
 htdocs/langs/fr_FR/productbatch.lang | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 2cce7c91e8d..e2309cb91da 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -30,8 +30,9 @@ BatchLotNumberingModules=Modèle de génération et contrôle des numéros de lo
 BatchSerialNumberingModules=Modèle de génération et contrôle des numéros de série
 ManageLotMask=Masque personnalisé
 CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
-LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
-SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
+LotProductTooltip=Ajoute une option dans la fiche produit pour définir un masque de numéro de lot dédié
+SNProductTooltip=Ajoute une option dans la fiche produit pour définir un masque de numéro de série dédié
+QtyToAddAfterBarcodeScan=Quantité à ajouter pour chaque code à barres/lot/série scanné
 LifeTime=Durée de vie (en jours)
 EndOfLife=Date de fin de vie
 ManufacturingDate=Date de fabrication

From c1b5d26ca04c22085c4c6508bbf46f6ca4e5bf43 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 6 May 2021 15:20:49 +0200
Subject: [PATCH 658/928] reconcile before PR - second take

---
 htdocs/langs/fr_FR/productbatch.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index e2309cb91da..464443e1355 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -41,3 +41,4 @@ FirstUseDate=Date de mise en service
 QCFrequency=Periodicité de contrôle (en jours)
 InWorkingOrder=En état de marche
 OutOfOrder=Hors d’usage
+

From 2615a1f1529cc88851411f3cf6b5e30a18b03c48 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 6 May 2021 15:34:45 +0200
Subject: [PATCH 659/928] Update list.php

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index fe05c551945..6d0fecb6210 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -126,6 +126,7 @@ $arrayfields = array(
 	'u.email'=>array('label'=>"EMail", 'checked'=>1, 'position'=>35),
 	'u.api_key'=>array('label'=>"ApiKey", 'checked'=>0, 'position'=>40, "enabled"=>($conf->api->enabled && $user->admin)),
 	'u.fk_soc'=>array('label'=>"Company", 'checked'=>($contextpage == 'employeelist' ? 0 : 1), 'position'=>45),
+	'u.fk_warehouse'=>array('label'=>"Company", 'checked'=>($contextpage == 'employeelist' ? 0 : 1), 'position'=>45),
 	'u.salary'=>array('label'=>"Salary", 'checked'=>1, 'position'=>80, 'enabled'=>($conf->salaries->enabled && !empty($user->rights->salaries->readall))),
 	'u.datelastlogin'=>array('label'=>"LastConnexion", 'checked'=>1, 'position'=>100),
 	'u.datepreviouslogin'=>array('label'=>"PreviousConnexion", 'checked'=>0, 'position'=>110),
@@ -154,6 +155,7 @@ $search_email = GETPOST('search_email', 'alpha');
 $search_api_key = GETPOST('search_api_key', 'alphanohtml');
 $search_statut = GETPOST('search_statut', 'intcomma');
 $search_thirdparty = GETPOST('search_thirdparty', 'alpha');
+$search_warehouse = GETPOST('search_warehouse', 'alpha');
 $search_supervisor = GETPOST('search_supervisor', 'intcomma');
 $optioncss = GETPOST('optioncss', 'alpha');
 $search_categ = GETPOST("search_categ", 'int');
@@ -223,6 +225,7 @@ if (empty($reshook)) {
 		$search_email = "";
 		$search_statut = "";
 		$search_thirdparty = "";
+		$search_warehouse = "";
 		$search_supervisor = "";
 		$search_api_key = "";
 		$search_datelastlogin = "";
@@ -362,6 +365,9 @@ if ($search_supervisor > 0) {
 if ($search_thirdparty != '') {
 	$sql .= natural_search(array('s.nom'), $search_thirdparty);
 }
+if ($search_warehouse != '') {
+	$sql .= natural_search(array('u.fk_warehouse'), $search_warehouse);
+}
 if ($search_login != '') {
 	$sql .= natural_search("u.login", $search_login);
 }

From 9cd78e6ecf0dcdcb2cc387e8aac0ffa5c01ffae5 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 6 May 2021 16:00:49 +0200
Subject: [PATCH 660/928] Update modules_member.class.php

---
 htdocs/core/modules/member/modules_member.class.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/core/modules/member/modules_member.class.php b/htdocs/core/modules/member/modules_member.class.php
index 1ff1ffc3d30..3a1b4edcc1d 100644
--- a/htdocs/core/modules/member/modules_member.class.php
+++ b/htdocs/core/modules/member/modules_member.class.php
@@ -20,10 +20,6 @@
  */
 
 
-/**
- *	    \class      ModeleProductCode
- *		\brief  	Parent class for product code generators
- */
 
 /**
  *  \file       htdocs/core/modules/member/modules_member.class.php

From 7386a223e80572284bf833b170d85974c9592564 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 16:38:34 +0200
Subject: [PATCH 661/928] Update account.class.php

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index c59e768f6dc..75738abc3d4 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1687,7 +1687,7 @@ class Account extends CommonObject
 	 */
 	public static function replaceThirdparty($db, $origin_id, $dest_id)
 	{
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'bank_url SET url_id = '.$dest_id.' WHERE url_id = '.$origin_id.' AND type=\'company\'';
+		$sql = "UPDATE ".MAIN_DB_PREFIX."bank_url SET url_id = ".((int) $dest_id)." WHERE url_id = ".((int) $origin_id)." AND type='company'";
 
 		if (!$db->query($sql))
 		{

From 98a4f603f2af21052b331937c28c1d20ef21d0b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 16:41:06 +0200
Subject: [PATCH 662/928] Complete merge of thirdparty into API

---
 htdocs/societe/class/api_thirdparties.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index af9122cba9d..39773b7b637 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -445,7 +445,8 @@ class Thirdparties extends DolibarrApi
 				'Product' => '/product/class/product.class.php',
 				'Project' => '/projet/class/project.class.php',
 				'Ticket' => '/ticket/class/ticket.class.php',
-				'User' => '/user/class/user.class.php'
+				'User' => '/user/class/user.class.php',
+				'Account' => '/compta/bank/class/account.class.php'
 			);
 
 			//First, all core objects must update their tables

From 0daab6a55ae87d7bfa5abb2036877aac31e71c2b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 16:50:22 +0200
Subject: [PATCH 663/928] Code comment

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 642ce0cb98d..8eacab54fa8 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -59,11 +59,11 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, active, position)
 
 UPDATE llx_c_country SET eec = 1 WHERE code IN ('AT','BE','BG','CY','CZ','DE','DK','EE','ES','FI','FR','GR','HR','NL','HU','IE','IM','IT','LT','LU','LV','MC','MT','PL','PT','RO','SE','SK','SI');
 
+ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
+
 
 -- For v14
 
-ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
-
 create table llx_accounting_groups_account
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,

From d5c737ddb6b069fd655caa3f3332df0d0c8cecfa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 17:19:28 +0200
Subject: [PATCH 664/928] Update modTakePos.class.php

---
 htdocs/core/modules/modTakePos.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 84810e80a53..5cb7a7f0c38 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -198,21 +198,21 @@ class modTakePos extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 50151;
-		$this->rights[$r][1] = 'Use Point Of Sale';
+		$this->rights[$r][1] = 'Use Point Of Sale (record a sale, add products, record payment)';
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'run';
 
 		$r++;
 		$this->rights[$r][0] = 50152;
-		$this->rights[$r][1] = 'Edit sales lines';
+		$this->rights[$r][1] = 'Can modify added sales lines (prices, discount)';
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'editlines';
 
 		$r++;
 		$this->rights[$r][0] = 50153;
-		$this->rights[$r][1] = 'Edit ordered sales lines';
+		$this->rights[$r][1] = 'Edit ordered sales lines (useful only when option "Order printers" has been enabled). Allow to edit sales lines even after the order has been printed';
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'editorderedlines';

From 6b825cbc3b125096e3051a13e94022f2f194965f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 18:06:19 +0200
Subject: [PATCH 665/928] Clean code

---
 htdocs/admin/dict.php         | 16 +++++++++---
 htdocs/core/lib/admin.lib.php | 49 ++++++++++++++++++++++++++---------
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 5bba24a6a59..220c0e88678 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -517,7 +517,7 @@ $tabcond[39] = (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_
 $tabcond[40] = (!empty($conf->societe->enabled) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
 $tabcond[41] = !empty($conf->intracommreport->enabled);
 $tabcond[42] = !empty($conf->product->enabled);
-$tabcond[43] = !empty($conf->product->enabled && !empty($conf->productbatch->enabled));
+$tabcond[43] = !empty($conf->product->enabled) && !empty($conf->productbatch->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 2;
 
 // List of help for fields
 $tabhelp = array();
@@ -611,9 +611,11 @@ $tabfieldcheck[41] = array();
 $tabfieldcheck[42] = array();
 $tabfieldcheck[43] = array();
 
-// Complete all arrays with entries found into modules
-complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck);
+// Table to store complete informations (will replace all other table). Key is table name.
+$tabcomplete = array();
 
+// Complete all arrays with entries found into modules
+complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck, $tabcomplete);
 
 // Defaut sortorder
 if (empty($sortfield)) {
@@ -2156,7 +2158,13 @@ if ($id) {
 			$value = $tabname[$i];
 			print '<tr class="oddeven"><td width="50%">';
 			if (!empty($tabcond[$i])) {
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
+				$tabnamenoprefix = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabname[$i]);
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">';
+				if (!empty($tabcomplete[$tabnamenoprefix]['picto'])) {
+					print img_picto('', $tabcomplete[$tabnamenoprefix]['picto'], 'class="pictofixedwidth paddingrightonly"');
+				}
+				print $langs->trans($tablib[$i]);
+				print '</a>';
 			} else {
 				print $langs->trans($tablib[$i]);
 			}
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 66ceae8a198..185858fd9c2 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1190,9 +1190,10 @@ function unActivateModule($value, $requiredby = 1)
  * 	@param		array		$tabcond			Tabcond
  * 	@param		array		$tabhelp			Tabhelp
  *  @param		array		$tabfieldcheck		Tabfieldcheck
+ *  @param		array		$tabcomplete   		Tab complete (will replace all other in future). Key is table name.
  * 	@return		int			1
  */
-function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabfieldcheck)
+function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabfieldcheck, &$tabcomplete)
 {
 	global $db, $modules, $conf, $langs;
 
@@ -1255,53 +1256,77 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 							if (!empty($objMod->dictionaries)) {
 								//var_dump($objMod->dictionaries['tabname']);
 								$nbtabname = $nbtablib = $nbtabsql = $nbtabsqlsort = $nbtabfield = $nbtabfieldvalue = $nbtabfieldinsert = $nbtabrowid = $nbtabcond = $nbtabfieldcheck = $nbtabhelp = 0;
-								foreach ($objMod->dictionaries['tabname'] as $val) {
+								$tabnamerelwithkey = array();
+								foreach ($objMod->dictionaries['tabname'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $val);
 									$nbtabname++;
 									$taborder[] = max($taborder) + 1;
 									$tabname[] = $val;
+									$tabnamerelwithkey[$key] = $val;
+									$tabcomplete[$tmptablename]['picto'] = $objMod->picto;
 								}		// Position
-								foreach ($objMod->dictionaries['tablib'] as $val) {
+								foreach ($objMod->dictionaries['tablib'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtablib++;
 									$tablib[] = $val;
+									$tabcomplete[$tmptablename]['lib'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabsql'] as $val) {
+								foreach ($objMod->dictionaries['tabsql'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabsql++;
 									$tabsql[] = $val;
+									$tabcomplete[$tmptablename]['sql'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabsqlsort'] as $val) {
+								foreach ($objMod->dictionaries['tabsqlsort'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabsqlsort++;
 									$tabsqlsort[] = $val;
+									$tabcomplete[$tmptablename]['sqlsort'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabfield'] as $val) {
+								foreach ($objMod->dictionaries['tabfield'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabfield++;
 									$tabfield[] = $val;
+									$tabcomplete[$tmptablename]['field'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabfieldvalue'] as $val) {
+								foreach ($objMod->dictionaries['tabfieldvalue'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabfieldvalue++;
 									$tabfieldvalue[] = $val;
+									$tabcomplete[$tmptablename]['value'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabfieldinsert'] as $val) {
+								foreach ($objMod->dictionaries['tabfieldinsert'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabfieldinsert++;
 									$tabfieldinsert[] = $val;
+									$tabcomplete[$tmptablename]['fieldinsert'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabrowid'] as $val) {
+								foreach ($objMod->dictionaries['tabrowid'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabrowid++;
 									$tabrowid[] = $val;
+									$tabcomplete[$tmptablename]['rowid'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabcond'] as $val) {
+								foreach ($objMod->dictionaries['tabcond'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabcond++;
 									$tabcond[] = $val;
+									$tabcomplete[$tmptablename]['rowid'] = $val;
 								}
 								if (!empty($objMod->dictionaries['tabhelp'])) {
-									foreach ($objMod->dictionaries['tabhelp'] as $val) {
+									foreach ($objMod->dictionaries['tabhelp'] as $key => $val) {
+										$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 										$nbtabhelp++;
 										$tabhelp[] = $val;
+										$tabcomplete[$tmptablename]['help'] = $val;
 									}
 								}
 								if (!empty($objMod->dictionaries['tabfieldcheck'])) {
-									foreach ($objMod->dictionaries['tabfieldcheck'] as $val) {
+									foreach ($objMod->dictionaries['tabfieldcheck'] as $key => $val) {
+										$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 										$nbtabfieldcheck++;
 										$tabfieldcheck[] = $val;
+										$tabcomplete[$tmptablename]['fieldcheck'] = $val;
 									}
 								}
 

From 6159321bedb955bc613d068fa40929d2323d9e00 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 18:31:36 +0200
Subject: [PATCH 666/928] NEW Show picto of module into the list of
 dictionaries

---
 htdocs/admin/dict.php             | 97 +++++++++++++++----------------
 htdocs/core/lib/admin.lib.php     |  4 +-
 htdocs/core/lib/functions.lib.php |  2 +-
 3 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 220c0e88678..72c33db2a0d 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -100,7 +100,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0, 43, 0);
+$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0, 43, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
@@ -565,57 +565,56 @@ $tabhelp[41] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[42] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[43] = array('code'=>$langs->trans("EnterAnyCode"));
 
-// List of check for fields (NOT USED YET)
-$tabfieldcheck = array();
-$tabfieldcheck[1]  = array();
-$tabfieldcheck[2]  = array();
-$tabfieldcheck[3]  = array();
-$tabfieldcheck[4]  = array();
-$tabfieldcheck[5]  = array();
-$tabfieldcheck[6]  = array();
-$tabfieldcheck[7]  = array();
-$tabfieldcheck[8]  = array();
-$tabfieldcheck[9]  = array();
-$tabfieldcheck[10] = array();
-$tabfieldcheck[11] = array();
-$tabfieldcheck[12] = array();
-$tabfieldcheck[13] = array();
-$tabfieldcheck[14] = array();
-$tabfieldcheck[15] = array();
-$tabfieldcheck[16] = array();
-$tabfieldcheck[17] = array();
-$tabfieldcheck[18] = array();
-$tabfieldcheck[19] = array();
-$tabfieldcheck[20] = array();
-$tabfieldcheck[21] = array();
-$tabfieldcheck[22] = array();
-$tabfieldcheck[23] = array();
-$tabfieldcheck[24] = array();
-$tabfieldcheck[25] = array();
-//$tabfieldcheck[26] = array();
-$tabfieldcheck[27] = array();
-$tabfieldcheck[28] = array();
-$tabfieldcheck[29] = array();
-$tabfieldcheck[30] = array();
-//$tabfieldcheck[31] = array();
-$tabfieldcheck[32] = array();
-$tabfieldcheck[33] = array();
-$tabfieldcheck[34] = array();
-$tabfieldcheck[35] = array();
-$tabfieldcheck[36] = array();
-$tabfieldcheck[37] = array();
-$tabfieldcheck[38] = array();
-$tabfieldcheck[39] = array();
-$tabfieldcheck[40] = array();
-$tabfieldcheck[41] = array();
-$tabfieldcheck[42] = array();
-$tabfieldcheck[43] = array();
-
 // Table to store complete informations (will replace all other table). Key is table name.
-$tabcomplete = array();
+$tabcomplete = array(
+	'c_forme_juridique'=>array('picto'=>'company'),
+	'c_departements'=>array('picto'=>'country'),
+	'c_regions'=>array('picto'=>'country'),
+	'c_country'=>array('picto'=>'country'),
+	'c_civility'=>array('picto'=>'contact'),
+	'c_actioncomm'=>array('picto'=>'action'),
+	'c_chargesociales'=>array('picto'=>'bill'),
+	'c_typent'=>array('picto'=>'company'),
+	'c_currencies'=>array('picto'=>'multicurrency'),
+	'c_tva'=>array('picto'=>'bill'),
+	'c_type_contact'=>array('picto'=>'contact'),
+	'c_payment_term'=>array('picto'=>'bill'),
+	'c_paiement'=>array('picto'=>'bill'),
+	'c_ecotaxe'=>array('picto'=>'bill'),
+	'c_paper_format'=>array('picto'=>'generic'),
+	'c_prospectlevel'=>array('picto'=>'company'),
+	'c_type_fees'=>array('picto'=>'trip'),
+	'c_effectif'=>array('picto'=>'company'),
+	'c_input_method'=>array('picto'=>'order'),
+	'c_input_reason'=>array('picto'=>'order'),
+	'c_availability'=>array('picto'=>'shipment'),
+	'c_shipment_mode'=>array('picto'=>'shipment'),
+	'c_revenuestamp'=>array('picto'=>'bill'),
+	'c_type_resource'=>array('picto'=>'resource'),
+	'c_type_container'=>array('picto'=>'website'),
+	'c_stcomm'=>array('picto'=>'company'),
+	'c_holiday_types'=>array('picto'=>'holiday'),
+	'c_lead_status'=>array('picto'=>'project'),
+	'c_format_cards'=>array('picto'=>'generic'),
+	'c_hrm_public_holiday'=>array('picto'=>'holiday'),
+	'c_hrm_department'=>array('picto'=>'hrm'),
+	'c_hrm_function'=>array('picto'=>'hrm'),
+	'c_exp_tax_cat'=>array('picto'=>'expensereport'),
+	'c_exp_tax_range'=>array('picto'=>'expensereport'),
+	'c_units'=>array('picto'=>'product'),
+	'c_socialnetworks'=>array('picto'=>'share-alt'),
+	'c_product_nature'=>array('picto'=>'product'),
+	'c_transport_mode'=>array('picto'=>'incoterm'),
+	'c_prospectcontactlevel'=>array('picto'=>'company'),
+	'c_stcommcontact'=>array('picto'=>'company'),
+	'c_product_nature'=>array('picto'=>'product'),
+	'c_productbatch_qcstatus'=>array('picto'=>'batch'),
+
+);
+
 
 // Complete all arrays with entries found into modules
-complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck, $tabcomplete);
+complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabcomplete);
 
 // Defaut sortorder
 if (empty($sortfield)) {
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 185858fd9c2..513b73658f7 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1189,11 +1189,10 @@ function unActivateModule($value, $requiredby = 1)
  * 	@param		array		$tabrowid			Tabrowid
  * 	@param		array		$tabcond			Tabcond
  * 	@param		array		$tabhelp			Tabhelp
- *  @param		array		$tabfieldcheck		Tabfieldcheck
  *  @param		array		$tabcomplete   		Tab complete (will replace all other in future). Key is table name.
  * 	@return		int			1
  */
-function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabfieldcheck, &$tabcomplete)
+function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabcomplete)
 {
 	global $db, $modules, $conf, $langs;
 
@@ -1325,7 +1324,6 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 									foreach ($objMod->dictionaries['tabfieldcheck'] as $key => $val) {
 										$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 										$nbtabfieldcheck++;
-										$tabfieldcheck[] = $val;
 										$tabcomplete[$tmptablename]['fieldcheck'] = $val;
 									}
 								}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index cf8f247d54e..1e97b424b8f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3492,7 +3492,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
 				'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'bug', 'building',
-				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'cron', 'cubes',
+				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'cron', 'cubes', 'multicurrency',
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
 				'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',

From 3e345570666c97558c8a67a7e2faae6d950cde4f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 18:36:02 +0200
Subject: [PATCH 667/928] Clean code

---
 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 72c33db2a0d..ef379a7b059 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2138,7 +2138,7 @@ if ($id) {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
-	print '<td>'.$langs->trans("Table").'</td>';
+	print '<td></td>';
 	print '</tr>';
 
 	$showemptyline = '';
@@ -2167,6 +2167,7 @@ if ($id) {
 			} else {
 				print $langs->trans($tablib[$i]);
 			}
+			print $form->textwithpicto('', $langs->trans("Table").': '.$tabname[$i]);
 			print '</td>';
 			print '<td>';
 			/*if (empty($tabcond[$i]))
@@ -2174,7 +2175,9 @@ if ($id) {
 			 print info_admin($langs->trans("DictionaryDisabledSinceNoModuleNeedIt"),1);
 			 }*/
 			print '</td>';
-			print '<td>'.$tabname[$i].'</td></tr>';
+			print '<td class="right">';
+			print '</td>';
+			print '</tr>';
 			$lastlineisempty = false;
 		} else {
 			if (!$lastlineisempty) {

From b8b6919cb00bece2f604294b84b93a52d1c625b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 18:41:27 +0200
Subject: [PATCH 668/928] Fix label of dictionaries

---
 htdocs/admin/dict.php         | 2 +-
 htdocs/langs/en_US/admin.lang | 2 +-
 htdocs/langs/en_US/hrm.lang   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ef379a7b059..174abe5a2c0 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -100,7 +100,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0, 43, 0);
+$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 6, 0, 29, 0, 33, 34, 32, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0, 43, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a69bf9e9ca2..34852c2ca61 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1042,7 +1042,7 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/en_US/hrm.lang
+++ b/htdocs/langs/en_US/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module

From 457050f1c52042757187602fa564e2597fdae611 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 18:45:20 +0200
Subject: [PATCH 669/928] Add pen to edit dictionary

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 174abe5a2c0..f8a782a54e5 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2167,15 +2167,14 @@ if ($id) {
 			} else {
 				print $langs->trans($tablib[$i]);
 			}
-			print $form->textwithpicto('', $langs->trans("Table").': '.$tabname[$i]);
 			print '</td>';
 			print '<td>';
-			/*if (empty($tabcond[$i]))
-			 {
-			 print info_admin($langs->trans("DictionaryDisabledSinceNoModuleNeedIt"),1);
-			 }*/
+			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">';
+			print img_picto('Edit', 'edit', '');
+			print '</a>';
 			print '</td>';
 			print '<td class="right">';
+			print $form->textwithpicto('', $langs->trans("Table").': '.$tabname[$i]);
 			print '</td>';
 			print '</tr>';
 			$lastlineisempty = false;

From 7b8d4c26566e0d557f4de0d46f6d85e982637d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 May 2021 20:32:41 +0200
Subject: [PATCH 670/928] phpcs

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

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 68e579697d3..c2a54e31a3a 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -339,7 +339,7 @@ if (empty($reshook)) {
 			$sql = "INSERT INTO ".$tabname[$id]." (";
 			// List of fields
 			$sql .= $tabfieldinsert[$id];
-            $sql .= ", active, enabled)";
+			$sql .= ", active, enabled)";
 			$sql .= " VALUES(";
 
 			// List of values

From 7897469963fd897a12c592c67318a90f0b8e8cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 May 2021 20:34:45 +0200
Subject: [PATCH 671/928] Update account.class.php

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 0a094a8ab7b..8c29a9ffc36 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1693,8 +1693,7 @@ class Account extends CommonObject
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank_url SET url_id = ".((int) $dest_id)." WHERE url_id = ".((int) $origin_id)." AND type='company'";
 
-		if (!$db->query($sql))
-		{
+		if (!$db->query($sql)) {
 			//if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
 			//$this->errors = $db->lasterror();
 			return false;

From 4ef53234f12bfeeeb2b83e1e79fb0badb74ae4b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 May 2021 20:39:36 +0200
Subject: [PATCH 672/928] Update partnership.class.php

---
 htdocs/partnership/class/partnership.class.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index a42e12fd412..8b3c9b8240a 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -119,6 +119,10 @@ class Partnership extends CommonObject
 	public $date_partnership_end;
 	public $count_last_url_check_error;
 	public $last_check_backlink;
+
+	/**
+	 * @var string reason_decline_or_cancel
+	 */
 	public $reason_decline_or_cancel;
 	// END MODULEBUILDER PROPERTIES
 
@@ -848,9 +852,10 @@ class Partnership extends CommonObject
 	/**
 	 *	Set refused status
 	 *
-	 *	@param	User	$user			Object user that modify
-	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
-	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 *	@param	User	$user			    Object user that modify
+	 *  @param  string  $reasondeclinenote  Reason decline
+	 *  @param	int		$notrigger		    1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						    <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function refused($user, $reasondeclinenote = '', $notrigger = 0)
 	{

From f377b8129aa2337c6316524911a971e3811707d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 May 2021 21:06:25 +0200
Subject: [PATCH 673/928] remove declaration already in commonobject

---
 htdocs/partnership/class/partnership.class.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index a42e12fd412..9c2a6153c74 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -101,18 +101,20 @@ class Partnership extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields=array();
+
+	/**
+	 * @var int rowid
+	 * @deprecated
+	 * @see id
+	 */
 	public $rowid;
-	public $ref;
+
 	public $fk_soc;
-	public $note_public;
-	public $note_private;
-	public $date_creation;
+
 	public $tms;
 	public $fk_user_creat;
 	public $fk_user_modif;
-	public $last_main_doc;
-	public $import_key;
-	public $model_pdf;
+
 	public $status;
 	public $fk_member;
 	public $date_partnership_start;

From f655cab5eb7a285875a73260a7ffdbef6b40763e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 21:11:39 +0200
Subject: [PATCH 674/928] Clean code

---
 htdocs/bom/bom_list.php                         | 10 +++++-----
 htdocs/bom/class/bom.class.php                  |  2 +-
 htdocs/modulebuilder/template/myobject_list.php |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index be0a79075f8..2fa59d8d6ef 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -495,20 +495,20 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth150', 1);
 		} elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
@@ -543,7 +543,7 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -601,7 +601,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status' && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
 		if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) {
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index b6ca36b6b42..9fe0543c4cf 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -97,7 +97,7 @@ class BOM extends CommonObject
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>5),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'noteditable'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of BOM", 'showoncombobox'=>'1',),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
-		'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth150', 'csslist'=>'minwidth150'),
+		'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth150', 'csslist'=>'minwidth150 center'),
 		//'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'position'=>32, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing')),
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'picto'=>'product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp', 'css'=>'maxwidth500'),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 07a5cf4fa03..05cce2ba934 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -502,14 +502,14 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -557,7 +557,7 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -615,7 +615,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';

From a7649a5bc241c52c3fb2cc44b9ce8e1d955b290f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 21:15:20 +0200
Subject: [PATCH 675/928] Trans

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

diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index fceeb1a15f1..3ec0398d59b 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -13,7 +13,7 @@ BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
 NewBOM=New bill of materials
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)

From 36d50c940a4c9117d1439b74cdef0747e77823c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 21:21:11 +0200
Subject: [PATCH 676/928] Clean code

---
 htdocs/bom/bom_card.php                         | 14 +++++++-------
 htdocs/modulebuilder/template/myobject_card.php | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index ebc2045aca3..fbd219a298b 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -610,7 +610,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Back to draft
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=setdraft&token='.newToken().'">'.$langs->trans("SetToDraft").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=setdraft&token='.newToken().'">'.$langs->trans("SetToDraft").'</a>'."\n";
 				}
 			}
 
@@ -627,34 +627,34 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($object->status == $object::STATUS_DRAFT) {
 				if ($permissiontoadd) {
 					if (is_array($object->lines) && count($object->lines) > 0) {
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate&amp;token='.newToken().'">'.$langs->trans("Validate").'</a>';
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate&amp;token='.newToken().'">'.$langs->trans("Validate").'</a>'."\n";
 					} else {
 						$langs->load("errors");
-						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>'."\n";
 					}
 				}
 			}
 
 			// Re-open
 			if ($permissiontoadd && $object->status == $object::STATUS_CANCELED) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen">'.$langs->trans("ReOpen").'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen">'.$langs->trans("ReOpen").'</a>'."\n";
 			}
 
 			// Create MO
 			if ($conf->mrp->enabled) {
 				if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write)) {
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>'."\n";
 				}
 			}
 
 			// Clone
 			if ($permissiontoadd) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&object=bom">'.$langs->trans("ToClone").'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&object=bom">'.$langs->trans("ToClone").'</a>'."\n";
 			}
 
 			// Close / Cancel
 			if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED) {
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close">'.$langs->trans("Disable").'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close">'.$langs->trans("Disable").'</a>'."\n";
 			}
 
 			/*
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 31bb4fd36ab..1f9da9c80ae 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -506,7 +506,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				} else {
 					$langs->load("errors");
 					//print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', 0);
-					print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+					print '<a class="butActionRefused" href="" title="'.dol_escape_htmltag($langs->trans("ErrorAddAtLeastOneLineFirst")).'">'.$langs->trans("Validate").'</a>';
 				}
 			}
 
@@ -516,16 +516,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			/*
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ENABLED) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
+					print dolGetButtonAction($langs->trans('Disable'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable&token='.newToken(), '', $permissiontoadd);
 				} else {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
+					print dolGetButtonAction($langs->trans('Enable'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable&token='.newToken(), '', $permissiontoadd);
 				}
 			}
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_VALIDATED) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
+					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
 				} else {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Re-Open").'</a>'."\n";
+					print dolGetButtonAction($langs->trans('Re-Open'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken(), '', $permissiontoadd);
 				}
 			}
 			*/

From e791f9b86394856de2b8e1b1eda0a7d5c61778b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 21:34:59 +0200
Subject: [PATCH 677/928] Debug MRP feature

---
 htdocs/langs/en_US/mrp.lang   |  1 +
 htdocs/mrp/class/mo.class.php |  8 +++++++-
 htdocs/mrp/mo_production.php  | 17 ++++++++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 3ec0398d59b..f47354958eb 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -63,6 +63,7 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index ea37715b4e5..d48d4959fd1 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1280,7 +1280,13 @@ class Mo extends CommonObject
 
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans('Ref').'</td>';
-		print '<td class="right">'.$langs->trans('Qty').' <span class="opacitymedium">('.$langs->trans("ForAQuantityOf", $this->bom->qty).')</span></td>';
+		print '<td class="right">'.$langs->trans('Qty');
+		if ($this->bom->bomtype == 0) {
+			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityOf", $this->bom->qty).')</span>';
+		} else {
+			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityToConsumeOf", $this->bom->qty).')</span>';
+		}
+		print '</td>';
 		print '<td class="center">'.$langs->trans('QtyFrozen').'</td>';
 		print '<td class="center">'.$langs->trans('DisableStockChange').'</td>';
 		//print '<td class="right">'.$langs->trans('Efficiency').'</td>';
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 6f35f1f1a25..65d4da3c908 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -707,16 +707,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Product").'</td>';
+		// Qty
 		print '<td class="right">'.$langs->trans("Qty").'</td>';
+		// Cost price
 		if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 			print '<td class="right">'.$langs->trans("UnitCost").'</td>';
 		}
+		// Qty already consumed
 		print '<td class="right">'.$langs->trans("QtyAlreadyConsumed").'</td>';
+		// Warehouse
 		print '<td>';
 		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 			print $langs->trans("Warehouse");
 		}
 		print '</td>';
+		// Lot - serial
 		if ($conf->productbatch->enabled) {
 			print '<td>';
 			if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
@@ -724,6 +729,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 			print '</td>';
 		}
+		// Action
 		if ($permissiontodelete) {
 			print '<td></td>';
 		}
@@ -735,17 +741,26 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<td>';
 			print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
 			print '</td>';
+			// Qty
 			print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
+			// Cost price
 			if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 				print '<td></td>';
 			}
-			print '<td class="right"></td>';
+			// Qty already consumed
+			print '<td></td>';
+			// Warehouse
 			print '<td>';
 			print '<input type="submit" class="button buttongen" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
 			print '</td>';
+			// Lot - serial
 			if ($conf->productbatch->enabled) {
 				print '<td></td>';
 			}
+			// Action
+			if ($permissiontodelete) {
+				print '<td></td>';
+			}
 			print '</tr>';
 		}
 

From 842268df106edcb7b2c2db51cbeee811207b2a90 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 6 May 2021 22:11:41 +0200
Subject: [PATCH 678/928] Update list.php

---
 htdocs/user/list.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 6d0fecb6210..337d02ec8a2 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -126,7 +126,6 @@ $arrayfields = array(
 	'u.email'=>array('label'=>"EMail", 'checked'=>1, 'position'=>35),
 	'u.api_key'=>array('label'=>"ApiKey", 'checked'=>0, 'position'=>40, "enabled"=>($conf->api->enabled && $user->admin)),
 	'u.fk_soc'=>array('label'=>"Company", 'checked'=>($contextpage == 'employeelist' ? 0 : 1), 'position'=>45),
-	'u.fk_warehouse'=>array('label'=>"Company", 'checked'=>($contextpage == 'employeelist' ? 0 : 1), 'position'=>45),
 	'u.salary'=>array('label'=>"Salary", 'checked'=>1, 'position'=>80, 'enabled'=>($conf->salaries->enabled && !empty($user->rights->salaries->readall))),
 	'u.datelastlogin'=>array('label'=>"LastConnexion", 'checked'=>1, 'position'=>100),
 	'u.datepreviouslogin'=>array('label'=>"PreviousConnexion", 'checked'=>0, 'position'=>110),
@@ -416,6 +415,9 @@ if ($search_categ > 0) {
 if ($search_categ == -2) {
 	$sql .= " AND cu.fk_categorie IS NULL";
 }
+if ($search_warehouse > 0) {
+	$sql .= " AND u.fk_warehouse = ".$db->escape($search_warehouse);
+}
 if ($mode == 'employee' && empty($user->rights->salaries->readall)) {
 	$sql .= " AND u.fk_user IN (".$db->sanitize(join(',', $childids)).")";
 }
@@ -523,7 +525,10 @@ if ($mode != '') {
 	$param .= '&amp;mode='.urlencode($mode);
 }
 if ($search_categ > 0) {
-	$param .= "&amp;search_categ=".urlencode($search_categ);
+	$param .= '&amp;search_categ='.urlencode($search_categ);
+}
+if ($search_warehouse > 0) {
+	$param .= '&amp;search_warehouse='.urlencode($search_warehouse);
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -601,8 +606,16 @@ $moreforfilter = '';
 // Filter on categories
 if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= img_picto($langs->trans("Category"), 'category', 'class="paddingright"');
-	$moreforfilter .= $formother->select_categories(Categorie::TYPE_USER, $search_categ, 'search_categ', 1);
+	$tmptitle = $langs->trans('Category');
+	$moreforfilter .= img_picto($langs->trans("Category"), 'category', 'class="pictofixedwidth"').$formother->select_categories(Categorie::TYPE_USER, $search_categ, 'search_categ', 1, $tmptitle);
+	$moreforfilter .= '</div>';
+}
+if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+	require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+	$formproduct = new FormProduct($db);
+	$moreforfilter .= '<div class="divsearchfield">';
+	$tmptitle = $langs->trans('Warehouse');
+	$moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', $tmptitle, 0, 0, $tmptitle);
 	$moreforfilter .= '</div>';
 }
 

From 7b0d0805f2f76daa82ea1517b33f0d5d624d2f89 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 6 May 2021 22:14:45 +0200
Subject: [PATCH 679/928] Update list.php

---
 htdocs/user/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 337d02ec8a2..debe3e35d12 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -610,6 +610,7 @@ if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 	$moreforfilter .= img_picto($langs->trans("Category"), 'category', 'class="pictofixedwidth"').$formother->select_categories(Categorie::TYPE_USER, $search_categ, 'search_categ', 1, $tmptitle);
 	$moreforfilter .= '</div>';
 }
+// Filter on warehouse
 if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 	$formproduct = new FormProduct($db);

From a56dc4ff65839a71036df8e247f643da4d2e77e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 May 2021 22:28:03 +0200
Subject: [PATCH 680/928] fix mulitple module using completeTabsHead

complete $template['head'] in module and return 0 to not replace instead return $head and replace
---
 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 1e97b424b8f..9ce3948efdf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8385,12 +8385,12 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 
 	// No need to make a return $head. Var is modified as a reference
 	if (!empty($hookmanager)) {
-		$parameters = array('object' => $object, 'mode' => $mode, 'head' => $head);
+		$parameters = array('object' => $object, 'mode' => $mode, 'head' => &$head);
 		$reshook = $hookmanager->executeHooks('completeTabsHead', $parameters);
 		if ($reshook > 0) {
 			$head = $hookmanager->resArray;
-			$h = count($head);
 		}
+		$h = count($head);
 	}
 }
 

From d84b0bae9dea1e922d1eef436d553922e0dbe1c6 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 6 May 2021 23:23:50 +0200
Subject: [PATCH 681/928] init

---
 htdocs/comm/propal/list.php | 2 +-
 htdocs/commande/list.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 3c150e2aec8..43c83117457 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -929,7 +929,7 @@ if ($resql) {
 		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->expedition->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
+	if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$moreforfilter .= '<div class="divsearchfield">';
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index df1c3e096e2..1eeff442008 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -975,7 +975,7 @@ if ($resql) {
 		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->expedition->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+	if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$moreforfilter .= '<div class="divsearchfield">';

From 82bf9cd3e970b305ca581c48c33ae214305c5798 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 00:13:49 +0200
Subject: [PATCH 682/928] Fix public new member form use adh type amount

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

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 233bc483d06..9bf8cfdb18e 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -543,6 +543,10 @@ jQuery(document).ready(function () {
            document.newmember.action.value="create";
            document.newmember.submit();
         });
+        jQuery("#typeid").change(function() {
+           document.newmember.action.value="create";
+           document.newmember.submit();
+        });
     });
 });
 </script>';
@@ -561,7 +565,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
 		$isempty = 0;
 	}
 	print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
-	print $form->selectarray("typeid", $adht->liste_array(), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
+	print $form->selectarray("typeid", $adht->liste_array(1), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
 	print '</td></tr>'."\n";
 } else {
 	$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
@@ -704,7 +708,8 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 	// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
 
 	// Set amount for the subscription
-	$amount = isset($amount) ? $amount : 0;
+	$amountbytype = adht->amountByType(1);
+	$amount = !empty($amountbytype[GETPOST('typeid',int)]) ? $amountbytype[GETPOST('typeid',int)] : (isset ($amount) ? $amount : 0);
 
 	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
@@ -713,6 +718,9 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 	if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
 		$amount = $amount ? $amount : (GETPOST('amount') ? GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT);
 	}
+
+	$amount = price2num($amount);
+
 	// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
 	print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
 	if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {

From 2e2b6af98ea80217d4602e01406e25a43e3c219e Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 00:23:46 +0200
Subject: [PATCH 683/928] Update new.php

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 9bf8cfdb18e..1b4fc6283b1 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -708,7 +708,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 	// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
 
 	// Set amount for the subscription
-	$amountbytype = adht->amountByType(1);
+	$amountbytype = $adht->amountByType(1);
 	$amount = !empty($amountbytype[GETPOST('typeid',int)]) ? $amountbytype[GETPOST('typeid',int)] : (isset ($amount) ? $amount : 0);
 
 	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {

From 9af05f3c6eff76e6106bf26687b3ebc24e29c1c4 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 00:25:38 +0200
Subject: [PATCH 684/928] Update new.php

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 1b4fc6283b1..33af176a169 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -709,7 +709,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 
 	// Set amount for the subscription
 	$amountbytype = $adht->amountByType(1);
-	$amount = !empty($amountbytype[GETPOST('typeid',int)]) ? $amountbytype[GETPOST('typeid',int)] : (isset ($amount) ? $amount : 0);
+	$amount = !empty($amountbytype[GETPOST('typeid', 'int')]) ? $amountbytype[GETPOST('typeid',int)] : (isset ($amount) ? $amount : 0);
 
 	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;

From 912995a5588511a11409d534ee959052ee052243 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 00:28:03 +0200
Subject: [PATCH 685/928] Create new.php

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 33af176a169..aaa504bc54d 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -709,7 +709,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 
 	// Set amount for the subscription
 	$amountbytype = $adht->amountByType(1);
-	$amount = !empty($amountbytype[GETPOST('typeid', 'int')]) ? $amountbytype[GETPOST('typeid',int)] : (isset ($amount) ? $amount : 0);
+	$amount = !empty($amountbytype[GETPOST('typeid', 'int')]) ? $amountbytype[GETPOST('typeid', 'int')] : (isset ($amount) ? $amount : 0);
 
 	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;

From 949e797390437fd3a03c68f5eb6df6a482d29174 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 6 May 2021 22:31:41 +0000
Subject: [PATCH 686/928] Fixing style errors.

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index aaa504bc54d..bbd1661ad94 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -709,7 +709,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 
 	// Set amount for the subscription
 	$amountbytype = $adht->amountByType(1);
-	$amount = !empty($amountbytype[GETPOST('typeid', 'int')]) ? $amountbytype[GETPOST('typeid', 'int')] : (isset ($amount) ? $amount : 0);
+	$amount = !empty($amountbytype[GETPOST('typeid', 'int')]) ? $amountbytype[GETPOST('typeid', 'int')] : (isset($amount) ? $amount : 0);
 
 	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;

From 6504f961887f5e442071a71ed57aa437d9d49ce4 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 00:43:01 +0200
Subject: [PATCH 687/928] Copyright

---
 htdocs/public/members/new.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index bbd1661ad94..71446b58779 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2021       Waël Almoman            <info@almoman.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 5dfa18758c64dc7d69747da7a875c973952b4163 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 01:36:59 +0200
Subject: [PATCH 688/928] CSS

---
 htdocs/theme/eldy/global.inc.php | 5 ++++-
 htdocs/website/index.php         | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 01ed6b127dd..b1c08e194b3 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4790,7 +4790,6 @@ span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled im
 }
 
 
-
 /* ============================================================================== */
 /*  Module agenda                                                                 */
 /* ============================================================================== */
@@ -6991,6 +6990,10 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 	input#addedfile {
 		width: 95%;
 	}
+
+	#divbodywebsite {
+		word-break: break-all;
+	}
 }
 
 @media only screen and (max-width: 320px)
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 1a71a162cb6..da1244b567c 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2745,7 +2745,7 @@ if (!GETPOST('hide_websitemenu')) {
 
 	if (in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm'))) {
 		if ($action == 'editcss') {
-			print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+			print '<input type="submit" id="savefileandstay" class="button buttonforacesave hideonsmartphone" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
 		}
 		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
 			print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
@@ -3075,7 +3075,7 @@ if (!GETPOST('hide_websitemenu')) {
 		}
 		if (!in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm', 'createsite', 'createcontainer', 'createfromclone', 'createpagefromclone', 'deletesite'))) {
 			if ($action == 'editsource' || $action == 'editmeta') {
-				print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+				print '<input type="submit" id="savefileandstay" class="button buttonforacesave hideonsmartphone" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
 			}
 			if (preg_match('/^create/', $action)) {
 				print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';

From 0f2ce8687d8a14252e16dc5c240e639f26ecf1fc Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 7 May 2021 09:19:44 +0200
Subject: [PATCH 689/928] Fix #17475 : Update of previous fix

---
 htdocs/comm/mailing/card.php       | 10 ++++++++--
 htdocs/core/lib/functions.lib.php  |  6 +-----
 scripts/emailings/mailing-send.php |  9 ++++++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index a520a44e467..7f6f7f88cc3 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -265,10 +265,16 @@ if (empty($reshook)) {
 						}
 						//$substitutionisok=true;
 
-						$moreinheader = '';
 						complete_substitutions_array($substitutionarray, $langs);
 						$newsubject = make_substitutions($subject, $substitutionarray);
-						$newmessage = make_substitutions($message, $substitutionarray, null, 0, $moreinheader);
+						$newmessage = make_substitutions($message, $substitutionarray, null, 0);
+
+						$moreinheader = '';
+						if (preg_match('/__UNSUBSCRIBE__/', $message)) {
+							$moreinheader = make_substitutions('__UNSUBSCRIBE__', $substitutionarray);
+							$moreinheader = explode('"', $moreinheader);
+							$moreinheader = "List-Unsubscribe: <".$moreinheader[1].">\n";
+						}
 
 						$arr_file = array();
 						$arr_mime = array();
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d058111973a..222dea0ead7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7212,7 +7212,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
  * 	@return string  		    						Output string after substitutions
  *  @see	complete_substitutions_array(), getCommonSubstitutionArray()
  */
-function make_substitutions($text, $substitutionarray, $outputlangs = null, $converttextinhtmlifnecessary = 0, &$moreinheader = null)
+function make_substitutions($text, $substitutionarray, $outputlangs = null, $converttextinhtmlifnecessary = 0)
 {
 	global $conf, $langs;
 
@@ -7317,10 +7317,6 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 			}
 			$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
 		}
-		if ($key == '__UNSUBSCRIBE__' && (isset($moreinheader))) {
-			$tmptext = explode('"', $text);
-			$moreinheader = "List-Unsubscribe: <".$tmptext[1].">\n";
-		}
 	}
 
 	return $text;
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 44b8ade0c62..b0975c93397 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -268,6 +268,13 @@ if ($resql) {
 
 						$substitutionisok = true;
 
+						$moreinheader = '';
+						if (preg_match('/__UNSUBSCRIBE__/', $message)) {
+							$moreinheader = make_substitutions('__UNSUBSCRIBE__', $substitutionarray);
+							$moreinheader = explode('"', $moreinheader);
+							$moreinheader = "List-Unsubscribe: <".$moreinheader[1].">\n";
+						}
+
 						$arr_file = array();
 						$arr_mime = array();
 						$arr_name = array();
@@ -284,7 +291,7 @@ if ($resql) {
 						}
 						// Fabrication du mail
 						$trackid = 'emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
-						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
+						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, $moreinheader, 'emailing');
 
 						if ($mail->error) {
 							$res = 0;

From f4291dc985385a4bb40bd1cb2e3695fca5bf0b05 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 7 May 2021 09:20:18 +0200
Subject: [PATCH 690/928] commit missing file

---
 htdocs/core/lib/functions.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 222dea0ead7..3004a28dae7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7208,7 +7208,6 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
  *  @param	Translate	$outputlangs					Output language
  *  @param	int			$converttextinhtmlifnecessary	0=Convert only value into HTML if text is already in HTML
  *  													1=Will also convert initial $text into HTML if we try to insert one value that is HTML
- * 	@param  string      $moreinheader					Header for CMailer module
  * 	@return string  		    						Output string after substitutions
  *  @see	complete_substitutions_array(), getCommonSubstitutionArray()
  */

From c39dbd81b34e31e9abc2a8912fd6d785fc94207d Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 7 May 2021 09:47:15 +0200
Subject: [PATCH 691/928] Fix #17491 : Update of fix date extrafield filter

---
 htdocs/core/tpl/extrafields_list_search_sql.tpl.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 4445d34f63f..e846390c7c5 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -23,9 +23,11 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
 		{
-			if ($typ == 'date'){
-				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = DATE('".$db->idate($crit)."')";
-			}else {
+			if($typ == 'date'){
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+				$crit = dol_get_first_hour($crit);
+				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
+			}else{
 				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
 			}
 		} elseif (in_array($typ, array('boolean')))

From d108496c677d106d30a0e8b10bf695e7f8eb5f06 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 7 May 2021 07:47:49 +0000
Subject: [PATCH 692/928] Fixing style errors.

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

diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index e846390c7c5..ffd89bbc992 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -23,11 +23,11 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
 		{
-			if($typ == 'date'){
+			if ($typ == 'date'){
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 				$crit = dol_get_first_hour($crit);
 				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
-			}else{
+			}else {
 				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
 			}
 		} elseif (in_array($typ, array('boolean')))

From cc79fc6eeedf8aeffaf78a4402a811ddab01e0c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 11:30:27 +0200
Subject: [PATCH 693/928] Lang

---
 htdocs/langs/en_US/cashdesk.lang | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 47bf937a90e..aba05d67fc8 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)

From 671633fe867ef1f04c76d7a32023cf7f71aad35c Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 7 May 2021 11:48:14 +0200
Subject: [PATCH 694/928] Fix : Bug included in develop branch and 13.0

---
 test/phpunit/CodingPhpTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index b3250b9e265..37fc7eee703 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -219,7 +219,8 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 					'multicurrency.class.php',
 					'productbatch.class.php',
 					'reception.class.php',
-					'societe.class.php'
+					'societe.class.php' ,
+					'account.class.php'
 				))) {
 					// Must must not found $db->
 					$ok=true;

From 25bf82b7bbc9ddd8972a86732132a72a74657847 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 12:03:43 +0200
Subject: [PATCH 695/928] Prepare 14.0

---
 ChangeLog | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 142 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f37db92cc3..9b5cb0288f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,14 +12,151 @@ NEW: Several security issues after a second private bug bounty campaign.
 NEW: Add a security center page with all information and advices related to the security of your instance 
 NEW: Add a performance center page with all information and advices related to the performance of your instance 
 NEW: A lot of fix into english text after a small proofreading campaign (still not perfect, but really better)
-
+NEW: All main menu entries are using the picto of the module
+NEW: Accountancy - Add closure menu
+NEW: Accountancy - Add FEC import
+NEW: Accountancy - Add formconfirm with options on export
+NEW: Accountancy - Add select date from/to in already bind customer and supplier list
+NEW: Accountancy - Format FEC - Add new field DateLimitReglmt
+NEW: Accountancy - In ledger & journals, show link on bank transaction
+NEW: Accountancy - Possibility to filter on journals in balance
+NEW: Accountancy - Add a page to list subledger accounts on product/company
+NEW: add the Channel column into the list of orders
+NEW: Add a check to avoid an invoice date in the future
+NEW: Add some color and picto for the direction of movement
+NEW: Add the column "alias" of company in the list of proposal, order, invoice
+NEW: Add the column "Office phone" and  "User mobile" in user list
+NEW: Add the column "Price level"in thirdparty list
+NEW: Add some company information in the dropdown login menu
+NEW: Add constant MAIN_BUGTRACK_URL to set url to redirect to on link "declare a bug"
+NEW: Add contact tag and bulk email status on the thirparty+contact create form
+NEW: Add db fields note_public note_private for ECM module
+NEW: Manage deposit on supplier invoice (& somes ajustments)
+NEW: Add edit/delete action icons on categories list pages
+NEW: Add hidden option to auto load input line extrafield into new lines
+NEW: Add import profile to import BOM
+NEW: Add last date of modification for website pages in the list of pages
+NEW: Add link picto to the stock movement on the detail of production
+NEW: Add mass action "Set tag" for product/service, user, thirdparty, warehouse, project, bank account, members
+NEW: Add Mass action order validate and set to billed
+NEW: add massActions to set a commercial proposal to status "Refused"
+NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD and SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
+NEW: Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP
+NEW: Add option SOCIETE_DISABLE_WORKFORCE to hide staff field
+NEW: Add pagination at Get Products response
+NEW: Add new permission "Export website"
+NEW: Add possibility to exports userGroups fields on user exports
+NEW: Add price min and price min including tax into product export
+NEW: Can search on lots or serials into the quick search bar
+NEW: Add support for Friday as a non working day
+NEW: Add a total in agent margin & uniformize code
+NEW: add total margin in invoice list
+NEW: Can set a Warehouse on Thirparty
+NEW: auto notification with module Notification can use templated emails
+NEW: Bank Entries : add verif fk_user addPaymentToBank Social Contribution
+NEW: Bank Entries : display user linked to a salary or a taxes
+NEW: better date_valid on invoice
+NEW: Can ask the warehouse in proposal
+NEW: Can clone a cron job.
+NEW: Can create a lot from list
+NEW: Can edit object in module builder
+NEW: Can filter files in GED on status Shared/Not shared
+NEW: Can filter on extrafields date on lists
+NEW: Can filter on rowid in list of blocked logs.
+NEW: Can hide columns "time consumed" on timesheet per week.
+NEW: Can set a label as placeholder for combo lists.
+NEW: Can set an employee on each social contribution
+NEW: Can set a percentage when creating an invoice from another object
+NEW: Can set a target image in dolcropresize function.
+NEW: Can set if a ticket group is visible on public interface or not.
+NEW: Can set order of execution of hooks
+NEW: Can show the holidays on the agenda view.
+NEW: Can show the project ref or label into PDF documents
+NEW: Can toggle FCKeditor on public/private notes
+NEW: Can use captcha on public page to create ticket
+NEW: Check update for externals modules using button on module page
+NEW: choose lines while creating intervention card from origin
+NEW: Column shippement method, payment mode, payment term in propal and order list
+NEW: Conf for default actiomm status when created from card
+NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
+NEW: customer price customer ref: push back to v14
+NEW: customer ref for product customer prices
+NEW: date and user signature on proposal (Issue 16062)
+NEW: TAKEPOS delayed payment in TakePOS
+NEW: Dev default date filter module builder
+NEW: Dictionary for availability - Add column position
+NEW: TAKEPOS display date range if exist in TakePOS
+NEW: TAKEPOS display resiliate status in TakePOS for member                ->  NEW: TakePOS display resiliate status for members
+NEW: TAKEPOS Edit sales lines rights in TakePOS
+NEW: Extrafields of documents lines are inside the lines, not any more on separate TR
+NEW: Can set a user related to a social contribution
+NEW: ICS Direct debit can be set with a different value for each bank account
+NEW: LDAP: usergroup search can be filtered
+NEW: Make public bookmarks editable by admin users only
+NEW: If no logo defined, can use the squarred logo on login page
+NEW: The manifest file can use the squared image if available
+NEW: Add buld actions for Bank Transfer
+NEW: Enhance the multicurrency rate editor
+NEW: migration script
+NEW: More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
+NEW: Multiselect ledger account code filter on book keeping list
+NEW: Normalyse Type company field with ajax combobox
+NEW: TAKEPOS: option for Takepos to show the total price without tax
+NEW: option to automatically close an open project when all its tasks are done (=progress 100%)
+NEW: option to select membership type on the online payment page for membership subscription or renewal
+NEW: preload product description on selection for customer propal/order/invoice
+NEW: Add a ref in product customer price
+NEW: Save old page with .old extension on disk when editing a website page
+NEW: Search usergroups & resources
+NEW: Set status of all variant when setting status of parent
+NEW: Setup Page for module create with module builder enhancement #FoundationFunding
+NEW: Show picto of module into the list of dictionaries
+NEW: Show the total of payment on the payment confirm page
+NEW: Stock movement list - Add more complete date field
+NEW: Support color for types of event
+NEW: The setup for Mandatory field can now be done on combo list too.
+NEW: translate in "en_US" to complete PR 16980
+NEW: unit selection on object edit line
+NEW: Update the list of taxes available by default for France
+NEW: Add captcha on public page to create a ticket
+NEW: Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
+NEW: VAT payment request and VAT payment are now 2 different steps in workflow on VAT payment recording
+NEW: VAT report - Optimisation & collapse by rate
+NEW: When we add contacts/users to Project, ask to also affect them on project tasks
+NEW: When a doc file is shared, link is visible from the main page of doc.
+NEW: Workflow to set a shipment as closed.
+NEW: Option to automatically create a login/user when a new subscription of a member is done online
+NEW: #16378 More E-Mail Contact substitution Values for better salutation
+NEW: #13739 #17390 Product API route added to get product stock and product with or without variants
+NEW: option to leave the "Automatically create a total payment" checkbox empty on the tax creation page
+NEW: #17113 Can upload a favicon in website module
+NEW: #17292 default subscription amount by adherent type
 
 For developers:
 ---------------
-* start new module Event Organization Management
-* start new module Partnership Management
-* start new module Knowledge Management
-
+NEW: start new module Event Organization Management
+NEW: start new module Partnership Management
+NEW: start new module Knowledge Management
+NEW: start new module Workstations management
+NEW: hook printFieldListTitle for cabyprodserv.php
+NEW: Hook to allow external modules to add their own shortlist of recent objects
+NEW: SQL-altering hooks in the turnover by product report
+NEW: Add data-eec=1 for EEC countries on select for js interaction
+NEW: Add experimental repair script to switch to dynamic row format and utf8mb4 encoding
+NEW: add form confirm hook on company card
+NEW: Add function showValueWithClipboardCPButton() to add a copy/paste
+NEW: Add function showValueWithCopyAndPasteButton() to add a copy/paste
+NEW: Add hook addSectionECMAuto method to add custom diretory into ECM auto files
+NEW: Add native compression in rest apis
+NEW: Product Variants API, add variant stock to response by parameter
+NEW: Upgrade Stripe PHP lib to 7.67.0
+NEW: Add link to OpenAPI specifications xml file in REST API module setup: swagger.json file can be included into external tools like redoc
+NEW: Support sepa_debit in stripe paymentmethods list
+NEW: Update doleditor.class.php for easily activate SCAYT
+NEW: Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
+NEW: Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
+NEW: API Add option $includeifobjectisused to get a product
+NEW: API Get the list of product ids only
 
 
 WARNING:

From 55d5f1e86a3adbfe1d7efd48e6222a3b5fbc9744 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 13:08:29 +0200
Subject: [PATCH 696/928] ChangeLog

---
 ChangeLog | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b5cb0288f5..069fb617ec8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,16 +64,14 @@ NEW: Can filter files in GED on status Shared/Not shared
 NEW: Can filter on extrafields date on lists
 NEW: Can filter on rowid in list of blocked logs.
 NEW: Can hide columns "time consumed" on timesheet per week.
-NEW: Can set a label as placeholder for combo lists.
 NEW: Can set an employee on each social contribution
 NEW: Can set a percentage when creating an invoice from another object
-NEW: Can set a target image in dolcropresize function.
 NEW: Can set if a ticket group is visible on public interface or not.
 NEW: Can set order of execution of hooks
 NEW: Can show the holidays on the agenda view.
 NEW: Can show the project ref or label into PDF documents
 NEW: Can toggle FCKeditor on public/private notes
-NEW: Can use captcha on public page to create ticket
+NEW: Can use captcha on public page to create a ticket
 NEW: Check update for externals modules using button on module page
 NEW: choose lines while creating intervention card from origin
 NEW: Column shippement method, payment mode, payment term in propal and order list
@@ -82,11 +80,10 @@ NEW: Conf for default actiomm status when created from card (and DefaultValues C
 NEW: customer price customer ref: push back to v14
 NEW: customer ref for product customer prices
 NEW: date and user signature on proposal (Issue 16062)
-NEW: TAKEPOS delayed payment in TakePOS
-NEW: Dev default date filter module builder
 NEW: Dictionary for availability - Add column position
+NEW: TAKEPOS delayed payment in TakePOS
 NEW: TAKEPOS display date range if exist in TakePOS
-NEW: TAKEPOS display resiliate status in TakePOS for member                ->  NEW: TakePOS display resiliate status for members
+NEW: TAKEPOS display resiliate status in TakePOS for member
 NEW: TAKEPOS Edit sales lines rights in TakePOS
 NEW: Extrafields of documents lines are inside the lines, not any more on separate TR
 NEW: Can set a user related to a social contribution
@@ -157,6 +154,8 @@ NEW: Add triggers in the function add_object_linked(), updateObjectLinked() and
 NEW: Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
 NEW: API Add option $includeifobjectisused to get a product
 NEW: API Get the list of product ids only
+NEW: Can set a target image in dolcropresize function.
+NEW: Can set a label as placeholder for combo lists.
 
 
 WARNING:

From 078f586299983e33ba9788ba9bae6ffec2df0977 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 13:15:22 +0200
Subject: [PATCH 697/928]  @daraelmin Add enabled module color in var

---
 htdocs/theme/eldy/global.inc.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index d6bf65947dd..31356ad229f 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -43,6 +43,7 @@
 	--amountremaintopaycolor:#880000;
 	--amountpaymentcomplete:#008800;
 	--amountremaintopaybackcolor:none;
+	--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
 }
 
 <?php
@@ -87,6 +88,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 	            --amountremaintopaycolor:rgb(252,84,91);
 	            --amountpaymentcomplete:rgb(101,184,77);
 	            --amountremaintopaybackcolor:rbg(245,130,46);
+				--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #000, #000, #000, #274231);
 	      }\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
 		print "}\n";

From cb793cb762c72099fd88905bc802000e7b48c011 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 13:19:02 +0200
Subject: [PATCH 698/928]  Fix #17114 dark display for enabled module in dark
 mode

---
 htdocs/theme/eldy/info-box.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index d582260ca63..47d8e0fd387 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -183,8 +183,8 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
     margin-left: 80px;
 }
 .info-box-sm .info-box-module-enabled {
-    /* background: linear-gradient(0.35turn, #fff, #fff, #f6faf8, #e4efe8) */
-    background: linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
+    /* background: linear-gradient(0.35turn, #fff, #fff, #f6faf8, #e4efe8) */ 
+	background: var(--infoboxmoduleenabledbgcolor);
 }
 .info-box-content-warning span.font-status4 {
 	color: #bc9526 !important;

From 2a33d5e269fe80271916c1742e5f2cfdbe051ae8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 13:43:18 +0200
Subject: [PATCH 699/928] Update .ico

---
 doc/images/appicon_128.png      | Bin 2522 -> 6398 bytes
 doc/images/appicon_14.png       | Bin 443 -> 0 bytes
 doc/images/appicon_16.ico       | Bin 1406 -> 1406 bytes
 doc/images/appicon_16.png       | Bin 412 -> 2147 bytes
 doc/images/appicon_32.ico       | Bin 0 -> 2238 bytes
 doc/images/appicon_32.png       | Bin 693 -> 2835 bytes
 doc/images/appicon_48.ico       | Bin 7358 -> 3774 bytes
 doc/images/appicon_64.png       | Bin 1296 -> 4913 bytes
 doc/images/dolibarr_favicon.ico | Bin 2238 -> 2238 bytes
 9 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 doc/images/appicon_14.png
 create mode 100644 doc/images/appicon_32.ico

diff --git a/doc/images/appicon_128.png b/doc/images/appicon_128.png
index 60b82198bbd20df8eae8c8dfac1c40bfe36f58bb..b1f4e0bc9b240550cea9c3d807f43aa9963cee82 100644
GIT binary patch
literal 6398
zcmb7H)ms$Y*PWqe=%ECp8)*bd$sq=$L%O>prIDdqU;t^5?i7^np*vJcIwVD4X!v|D
zzCYmioW0h5&U((p+57B^vtl&V6!CGM;{X5vd?lEi*1rt@4`8f++%IV{1^^J~`|Id?
zX<7KtyLq_UIyl?Vd-=K9(A)Sr*a85)ORJd%9#pCX;cJJap5aTH@2TgX@e5~cO+~%a
z`fj_}_!JdG<nl^h$Vmn*Gp2C)>E_D)X_Ia5z=UVkv2Ni!CE!HUZ}$FSu5PV&@9^sK
zJTR_%t>eV>S9C{eOX;2Z%+SN=;m(${MMuzT^N@Ih1eSlt88zSHcrx4JC8M9juezvv
zit^JtrDIi7-uDA{Vsyf$Z~X3EiN9Ob-*G>B*O?8=roOc(B;8VDxH<G`KUG3WG4B}G
zuJr{mu;lHLu3pZ1zQNd@K;`M3nt}FJlk%rl?)JN12aw;FC;pgg*Z-~<@B8;RRY4%_
zJ?B6js~Rt7?CG!ajV*85rzwNuoS;)RPnN>VWX)d^MOOJ6gEGT&mkp!PYcpS-A4TW(
zrVki@cgpBq+wL=jj=D2MkqPG1*B#=eu<W)lWeiZTNiRC#$NT4uxQ(K~Y{~}?C0L&X
z-hl$)SB;<CCYI}NZ0*N8(7p}!n1>|ZUu<;wpNkXvOg2F<*Gw&uZG|Q5V|?33!ahKl
z2;s^o+4|lVusb+Ss+a@(iE}&wzmo0>QWQ?tn#Pkuaz$3_gN?~{$PZw!Jn6HPMFW~a
zIYNw+C|EEye*$0zek!5_5OB!=lF>@7LV>M8K0A8~)^d`-^4*@dUlpLKrHUpb@xpw^
zc$jV^fqE99%u_PYSkgKh_g%-6yZLQ}f(M6EBWVTWY;oMzc@NGSA%~jFQVA3W=#y#t
z#rFWc1hq^U<(pPBKbwJM1zMYVhN1*XFNCDP)XT%vMce$gO=a9H{r4k|RlKXcE*X}4
zCf=)!%O^&Jt=_XEWjX%aO>>D|pHb46{aaM!5g^Ai+0l~}@_FBdnAcHY1vVrfdP4?!
zbR2`UtYZK8w<J%&Z9IWBCV5T9IIhS9qh1JlUk8+nt;75Zy>+c`A`NBKf;3~;!)psh
z69swEx!++l+lUGC4xDf_W!%bL=FSTWmAO}EJdf`;bG${_>0Nz8zgH)~h#TDUFa@j<
zEvKQxNE}v`S`O?zi;%4}?9yYRe8UbBxvPC*Wu9~hV%@PL_tpiJanK3bC=MRv;V1w3
ziv#HP5f?io_?2!Xyk0HZ<CA*7X~Y$>_Dc&fD^6qoJajjh;&j0t@UUoqr9YQu7Jt#s
z={Z&M;MLJ=b!%-?lTZ06k4q7y(z{6Yo*!3_@rSpI;yusyL%hzEsnZp6k=79+Fn8mq
zXcf!ED4^h{4|Uh)CYJ3REY(Wz=Rqt!Gb%@M&a{`zdG71sC1JN&pI4xD(DYH|IsB<#
zj!5EEm_if3RvK6orZ$T`IO@)woHJxwVpM3VNm&6~YS-+;)arpcMwl^s74&^E<&5h#
z@hhvIi{4>SP%4{%qw-BGlatfy6CJqT?C^eV)=NPjN+@|RxHBQ<qsJg07g2hlaY{kv
zS$0}Gyr!0!OMqYFq%V+*E3@wzy~?;@PXZAyj@9mFQ0y~e>k!hHJz_h3WlkS!oz@_+
zyjz-<1gBJYv63~q7xj=zI?jtfjP1*^Db}}*2NjVfkaG`TjyGlEDyOSblMGL!an70h
z>c@X<j7gMgQ}eM)ef55eIT3OZ1S50~2H?-HO3p_E-`>VIpfbFuUf{*AjR%DbZYq#_
z`IK3Tay!s6ioBg-`PyJ>#4;o#fj~qdwfhyS9jn8*rjD!z8(}*$`ZAQOC9g_e9&Xk)
zhmIJiTc?y7h}%NO%0#-jbd~yzKT~Si4|8DDI_Lj*o{eyKr(ex_>*VL<$Sh^fDcrcf
zALL@Tom7%^cSn7&P<t{*?e8;zXwuuBafQp0U5S*F8`xk9|21fxtBVkr-&G0_Ttdh%
z;kPwwuLE&twK)s)t?jxw?CmAbmOd|<scNQ<<kVLQy6sWXfdZmJMEZJ(84hagIMp{f
z_^;GX5XYpu3@<w9`^z6KPfABDo;RVkPd!w3&IX>2vdlyArD&T12<_u*s8!&c0m<9$
z792C-O`55m3ix)LAhlz5u^8NK6_CX*i>k|4<;eR;qgPrSZke{DaVwHDU{6bob=c!f
z08U2&3%m$Xfw-xaA@NWnAiqSMtWr+9AqJ6M=UNC-ZHm~2&3MwBy1_G@r5K85+KuJ2
zvx6$l#=@U$SViU<vI(Hxu$+AyLq(-YQHnalPh7*PG{pMZ;u>+^-c36jxGhyEKVGeW
zIBH(^VLoNWM1y@m5N1^8id|!z(9IW|R%ymV24N07z7d;j<M{KIN-xI_wiU=qPA2t}
z63gYCZ{nL7_llC@pk$Z~@C^3($`g{}QqkxhukA$9%2%cFuig?9d*!W;;mz7|{A_+E
z>_Bbv5uG7P(zB6mE?OgNzMqt>UCnV$Ls=-;MR}B+oGe_|2OK|+vL^adsFFG9j2TIZ
zXq=282t_|s|43EUBdG@rRlC#Okf`eusyndtI9TrF{o}wKWHTo4UUO62uWm&i8JUJn
zN^mb+0%-J^8h2$a{W0|JP~)B@Y~0griReAvs6Y<p!7FzqPAk@)VXcCiql*irO87<b
zvWc}pdl^FoTY*S@(0%|tj7$mJiWcWv&p0{`u6ZJ#IaZF^XhYeGa3gx(#<X>l$}Wd(
zpjUfpSjSbYLP@ee*?m@1*YRh&EP1sIV!g|CX$ZJyv`iHldMLM)K}0N!j^MC3KU`l`
z{OK)i{je*Exlq-KS9|~|;)yHqX&qbAdnjl&VXr20D%@^N4p_oGD~wH|Tq%7y_9CR%
z%848?FZEYut<kZYf)AolC}#>Q`2Obe@1=-&T-yXJCx*+4bX|%>nxmWP$L*)o>Ab+*
z$JA-GEtNZ!A>~b$6$2j>1v%+0i9e08SN&@wBmKS5l?~KWmjtOZJ<<eiJh79so{s(c
z2(HaU^Oe-Am(Ona8)7&bVVPFn474TzbIg~1w@8b;E(7MXytaNZ>??_F6n4!eXpP2s
z3p5%hOkT1U!-F^TyS{Ox($RV2UcSiA9}!x`et{oe!VlySaG3M&&PAo7{k54PXq1bI
zOFbm4STHB@TC4a|hqDq?*4NG9c9o0sRN1pi#r8TW(Dl+vDWm{|fH|1|O`NfAp<e5)
zt+6p4$A7zB<`%VVZ!iF=uO`S7+TZh?V0KR5Nf%2h>EgEJj$p|h*HYxrgGEy3+N1<L
zswk5}33b_31+Hc?dLA+=`C`V!oATCMy5$eCKiye1p%&aar8n~QkG`I^p9CDKw(seg
zo9N?basMFTPV}H!ueN@elbLPwx@RPq%ECG<#GZYb;m<Zi$O_Jex0Z3FvBqqMGAORb
z{&w*bQm$Xh^`gU{h$=%YlGiD_>o~Kaeyw1IC#Hi(pdhO)q%ikDhg2w0_~(jsi<?ky
z;o<dOJXi3wN8_$zlIgR!w>`b0V$N-SxN+5y=8$`vPRt9(v=j9V!JO*pK(W$hz87js
zljdMr!xEz;7k_lS`M7n#>81O?Y`^>$>%Yj4=F~!$!h&m_2T$~zNMHuIGIQ<at&gU~
zSy4TNs%H)kf1EN*1TI9dq?2{h+*;1sBkkoi4E@2z(|Y~y$4bT?y|Nx{hK_%r1hty1
zvlxf`-ZSl_zTiJEP{25h4WTT1QBI>k>bg9=?e?4{k*O*aDqfy1K;Fid`;kU+S|9^o
zxA!F>dbPGrGEn$ivSsX{>=3{6&^@{d)(C8N=&Q+S%^ihA>ty9uN*s?~{}O+u`TT_M
zRaLppDu!v&G`%)IN7iS1NwfS+V(tfUtaN_UjSv_bl}!GQZIU*`Kd1}j;<*(I-dmx^
zXT`uGX$w7$i%ui;*YWCN;|Q6WhAQuz%DYCWS5jb^9x|V$d1vvgk0ko-<=u4|-RI=4
zT&-^I9c}-bO-WXlg`NjN`}%VC96d6}dlJ;G+*pR@#9PK*J3ICm-l+;msHBDw-SO37
zj0?;j_AlZhVTT+~t%reBz$-CkQpScWrbRu0yX_UL9Lg51&z4c-8)9Z%lPw&%6o{nX
zDU|uIv)CCrS;W4ktQFYJbKWwwS1$QLv^>AYCbY42LYW%)sRk7n$xSX)y$hu;<3tVk
zz@Mm;aYI0I_s+OpA`2gfSiRHUMbK`T2Av)Eham12uv2m`%oJ7fX$kIO;H&ICbUn$N
ze0p1WD=&m8_?`F+ty6#%T7LZBbrL&Omej(tO%kk&&a1$g82&q5P{m<(3gUTvu=E$%
zMkbo2=H^`eH%X-xB&xs~w0PCGn<Q=?B4^z3dEegWbY`3C)2aE4(qy<)_hBvBY_F+`
z@;`4XC%Q^%bm60IhJxB06w*5_)ZW=@c_}S77O6CNtNXvsMSW!jac=uos-wub5BZ#M
zSm$qa5{e`JQr=$@+qeDA1ZpumhCXl46{YEAkXPKzaQ<}jIpTgehY~Aj5WRs^60zJ~
z6>uf1KW!HNh=sH%BZ2baV$&+bJ!AFRaAZ5whX_VK@?Av~pND1f|8RdFU&dC&R7fw8
zEdRl0-}ZAc(ULY^#14_ifVADs8})kPKV8tHTJ(cEi8~=lV*%q+L(~4Q2H8~@S*M=}
zlTUIYdfQ%fx45}D<WJs(Me6Z@EOoTSr*$mDB*!m;2g!U%>FkJU4s)qvYbg2G7_UWN
z+&^6z%(JbQ!W>2u$wICt`_X25F6?E~{0Aso*{E+MGO@<Js)!rhhQ8e72tsk!Zo=7f
z=WlP4;;WF+(eEiyWYVXll?!Up$9LrcRM<U*_{d*CXY=1bZR}RvF4k+m=p2oy9Qi^r
z{i4gBA}}WTW+EGrD<WE|4F=lP-)jd~Lz|Dh56U1bUH1l_O$*uEM~-VTn)1%8zLd+w
zSE8cq$OVmqs1Fz4CB<2No(8TIo}$o!dOlB>>ywg^OOks!001!D0SeVnf<ph_WBzlN
zIYG%1uzqQ3q?z^`c}@avi2Lxgm;r=rMzu;K9H->1{X*~dEU*1+QgMq2PAw)#>RA;5
z&t#ie3r^@dC^|bkr7$k_y1RIqaWHJ_Lr42nO8^L*fTKN8%P+ma#grQzx42SC5hxFk
zxnPW?jLEz;=12?QyKak0tn=Z|+X*_Enkm~>#k!W;G$^Hdc7}B}Us~e%i;dt5q8O4-
zlK9+9W>c|tjHlb3M~v&wczv?c6iHMJ(h@XAGp-z|{91`xQzzkXMD-ZX9`~eU$)MrY
zHZR^zbDB-<9JK;koW3j$qxHOo0_HQzCdc9o*xZMeeyQzi?QO(}E*8@eTBQbq=!ZX2
z*Q+%K85BM#vhMVMESKpt>059G55GPHIWJF;^gQ7iJGcZl166_%rmjxOOrL|PT3X&Y
z{iStlMaPr;jbIQ(<d<r&15WKOR7K6#pY0oX1~?sWT>ytQ^hT)G*C7-yv`}qB?d{?L
zcULM^-E>Kb9$zBcI`jTne=N&4igEz||5j1DQ1d?p+YM&m2>^%_{0HFp*MhKrBFIZg
zRUWj13Bu*TXcu*h1^~e6N^&wfzDvisP8vFUltWJesJ=F?BM&2eX&xX@Ch0lifZf3|
zC8l(OS*_?dQix<?JFL|U;Q&1@&MZwAZ1B!eVpDyoHa9S7&+53vVrs8BL?qusvGRE{
zlnZ>)IA&^Yv3Mu?upUps>VmO&ezJIZGw~-R!Y_ZXW6vk=yld~sFR|JZ=?@&B!BsSo
zMuRW|Wd0XQzGg4SrC>;5_|gWxZIms){H;;03n_dp+x6m_`kjcX9+8{>Vj1$lX~Xq?
zlWlmuY^df56A+lH$oxEFjc#B&mF`0@KwJAmeA}SgO(of`6G1rB48^GrC63;Arf*%(
zIcj#F_J+>?5G?Zf7Lufd6^-ZtKk>Rqo4)&6OsJK&w?UZ?_gRS}iX!<@<DGGb<#ugN
zt}qn%<(+y;nIe*~3s=>9w?=+LWIq;H<4&8YI+qns$Y=Hi{01Jqm6TQheH%$o!gB8V
z;jt<m^Cykk1)(uCy#f^QF(>5m*^XF^2uSzvtxSdHRITN(C@EKsqH^1_-BmWk9;uth
zl+cJCJd-#^VaAoR@22+My{9YgZKTQEW9_Vi#?^S1E7y%c?~+AdPqKF<06`@>wo}f|
zD<kiRo#z|)ipT7Ce{T_6gH<pmhK%%$)zyUG9y+|if@nn#YvY)X0m#f5Ci`(IOL_jg
z&gSn+r$0(>INLnFSZe2q5+FHGd($64zr~~(&BrHXl%Osu%PO41P)Cbr*hye8KyArN
zDq^gHn+Zq^Oq2qsvs0gYzrs4>fNw^AljHgmAzRo~HCrlM{UAq1|7i}IM{ZX;IkHch
z1TH7rRH?jn%fNtPT%6BCw)F9RJD8;z`P2)f6L`3Hk3SL`D#7InW-`d<P=&n^>b-#f
zw!iG*4Dw`OP}JlT>rf(MdQFXy9pB2v*Q_p>Lu`CMR~Q_-nBia@s>X&B&TlEM-!8JR
zXvi=3LHo8z_SGDm|EA$3pWxjg_9I~Y?xTfe508HyGaNQ--E;6)D|LVNOjDirs5jGu
z1#d~g-Q5)ztrnZr4*_8O!pDZ&JvI(^82I=$o2K*(8{Bs>)+Sa$oDj*y#W_ASohErd
ze);0dJq*B#4kf_HR1hSkAc~gb+a;uj#7IxN!*nZ>3e-YWytjz8eyzrxbq<PAi`iHr
zsPNG!i{7#)rI*SpMbe(X|2>>j*426rgr|(uTRd!y|5bVp{P$*jq>qF7ZX$o1|8mMZ
zKI7@>AFKRL%17ml(tKTy+M#@Kja81hccvMQ#bf6j4ddqp$)BHV>SPcW%>W{dY4?D|
zcvAkBud<eTk^z<wya<a1v41h+;qA{x^|I-DqbNbY!3(>x>X~#!ygE6zfpHjh(1D9Y
zqMO}Epry_tO`cLm=N9<8%Pmvh%FpmmBxOW65t*)P%CR_9KP2R=;JzL+mP4L(opE*_
z9*r{YxW>15JHO>&B%vLzhWR>gIoZDxMGBsnlpv=|DwO~)dd|^I10RBpq~`lh1V3w8
z9y5)>058r)v*`-YJ7NqvZspUM;q&&l4*?WZcAho=W}J~&+R@m@zv1-D6JLzY@CYlg
zc=#(JLC;|>sf1eA+pt(hbZq)pXa(R&vwd6Q!(Yf9W;m(n+%F`vT5Sj|K^imYV=#ef
zaal-d0(#?1CAd-lBTv3vA7NR5%7sXq7dJM&ZeWV!j1{}CGO@J(&=Wo@1(=@v3?--w
z7bPZ8luPV&r~Y?lU`158Dm!}3k`cHYtx)t#LP7933$Qp=NSDb!9u}U5pUNecdwoa;
zLYE<yj-BUbH`f9xtZx0gi{G`lk3h_pN5H>AXaCg5t8D7mF2Vp6nyFPoeU%<FTi{Um
zTSEqGRtcog3NF=mdifG!iH~CvSarP8Xt0>9S>xB&JszwL&P)WF%WS}RVL!6-B5d=r
zl(@!RxcFqyqKCgvP-z%xk8qjZ?X5Dyb$qLSzj%E+tZaK$dJjC3I*Tahw-1S?Ov=xV
z<nCS!5BN0yGQsKOIPu1490p%ZRm{ZWm3RoMHu>_L(%pAwb#W56aEKoG2x1w;bN2Nh
zJ8``i^1wgyn@L-v>jAYVCIh(mY)iHZcHWm8H34+VY}mQ;2qPG~;^d6?yW-u6_MVh@
zrF9#Cyb|pw&ivsXcWRMVYUKzt!y2rA?QSyUzF_3~^IA{x*YY^C+ANOw@b|69yH70E
zC%clkA9HNar?FMhS%xQ9qZaYKD%wksX{NZ|H1C*zw(6VR_Z-i6&L&YN&Sh<0<4RH5
zc48S^_=;#SNO}NX-Mbsmc?&aKPWfs1^aK*5+Ee_DK3NfvPb2X$G0}T~MMxJeVs&sL
zGiOAH<d(#SC`LxQ_&)wv-fV-v!iKOZ<i6`@xtXdD2y~wa!-z&#O9xGL|7GRD7un3i
z#qOb4jz-V^aKq+xX~>dHxJqCPTU(InsQ2T%b)g;EE`~+EDUac!baoMs+B1FNL@S6c
z{#%Gc|1!iJEbbi?+kO84XFg{F$`!A9;0OO~qbXB;KujcKK!9thbWdW_@xqT^K^+5T
zT4}G*V4w4$1$=7x5>eczM{?Z@xsX)_GWutGH_{Ln8ng9I!YgH4e?>Gt^Xpr%;qs)#
z-DE!nEsgrH3q8;l$P1?Ek__eLMXgVF8@X2(v2A>d!DvC6Po7X9r|a=o)BWB5=!3Z4
z>S?(!2>{3Sxc~SL80q^BY~-NYefpxtB!bNDq|_#5SW`mw{Nxxl!<mRM&}7188GPAT
z`7M2Ve|r>lR*_4Dp~8I^j*OFZtFIfRhi-FmSMeBuU}8A^|3WadN8EVNxj*74a^Zi!
P7J!nxnp~}{dFcNEgPsf~

literal 2522
zcmV<02_^Q4P)<h;3K|Lk000e1NJLTq004jh004jp0ssI2OkDPy000T0Nkl<ZcmeF#
z0SyBI6vEJQLE22s(nRtngCxgGRaBqvkLhv36j@@5%!TQ35ItjY^vuIiY&kTIMd%q5
z(K9|B)AKM@CQOk}VR{T=dQ6V#@rl`rcyER<Jq9s7&K=WZ(KLoXd*=WqOO{086E|-b
zo^2ar+qT!X`Dtw1wr%U#w)z<}ZI|+%&9zyP)!8-sf9IhceWD@~7pY0U5I7<_<d6Rd
zAio7heoMP<K@Lg;0e^Ycz7vM@LSzsK0#|S@n-5yE`Ic<Ht|?pBl&NZH{iL>eM@`e_
z$_5cw&xC3(El8jQ>4x^{I&oNUln{b{^D9)=x2)b$y=rsy(hZdh*L_mooK5<kXH0Bc
z5Ye9b`xj8}t{p-hIB_t3M^!`1w5407F5Nt3$tD24HDx<7iy<IlMz1a%PT7C-sRxV!
zFk|_aSEjH2V8I68Ga~Z;iCHD$PhRgge&GHS1_jPNJ88wE?=G%s%(Qty=w1o4U1Y*D
z<_m{U4E6D%jkmruYio6*-*!iAOQ(1cM*HH>U4|UC>(KY-Rb2JdwANffASgKoLM^q^
z)^yaKBR;tPD`y`%p*5F>u*A~68%hxE5fZ;RbKhq#II~kKK@vpCWORRAJ4FN`BL{SU
z=bA6=H-1n)a3%7eFc1gmsGVm4B0}=U9~|?Y6L!z!@_>t6;tVKyDw7k|@0_^DHQzZh
zlMO(LT85yW%7>%(9C`Q8Pt4{E1S6G!CIkfK!am~%-u9E@Gr2;$8WS!r4wyLjif<l~
z$rhqK3xZQqIVRzReMf)u_}vOYK)5Jm0MS!<@{`l|-D!9qK%$UQE`V}`<UPMQ*%N`I
zx{PW85ao!7Bz*7c?;Mpa6x3_LI6zSZQKlTc%g}>%9!kKe%7}AnB0)i!Lh|x&9+A!E
z#W_V8h^VQo5s|JPQ(rrFcLIv08AmD#Aj%h#KRR`vTp>_&%nD-4yw%%0BltT+;9Hxp
zrc1|EuP$k0Oo@-i=NvlmrKu}KBz6<C1e%<4$uphP$$vij50Zgn=*Y0X-A459zWbN~
zdygG3Zb)wcBt;~mBKYPBdp!BUk`5_9b`!H42|avktd;*H*ITOULrq$|A#4sElm4-L
zkN(OryN(*zGm12bNWUJPcOBJt)#fT_U<9His3O0W{O2+vDc=T;Z_ZkM+WAj@@v`UE
zY^?@B63XzbLnb;$71InrRq4Y2P3fdvv$g8<^PjxxiAf@&odY>(|FPkSjf!JNb2Na;
z-L}Yh(n<gMNz2Z>=&8Vw%I(qHWkf#}(~R<vJgGX#g+)pP8+X*6cK+k)b#Tb8!%2+_
zKx`30iS5;mKe_ca-2?JI;|Asn0gA@ZK}YI$f;0n@j~1+-v~ay*5$ri;KsHw>IyTjb
zS-SocP>e0<dzU}<v0@R3NdI1)H6~`o7ebXCwT;u4Zd5FSaf5rst_5jA&}qu|ycZ@f
zS1f{oy}K44m4!G($8`ONIH)pdQH5fB1ABEQoJcvZ6Bek_)S3&=i2C>JtP)zUt{t4C
z=b7RX;2gBjJq(j@PJKDbh8?v!2>`lxN;~JgA}hd&#Pgs@z==Q=<H@$F1}M>~Loy(}
z;)1k7BCabmgoG;QcU=fdB&-Lr$RG`r(NCu?nQR_PSkDw6qjjp@Q?~^{83L)44<!nL
zLvcYGkvO*?s<$BL*hxD9#RN&xAhr<d1kMfU*#$~8G-r&&tOX(7EvOK<A^o~TiQ1-C
zh&U9573ZLZBNQRUIjEAbW?(O!3Lscn*X#+34AMdbS_qU8fhzls8w4c;vc0-NijL3{
z@jVYxjSWG-lMkApI8|cvr*(vj(eCMV+Lr-Npa^-|ffFInV$J5N;v=*WLJJ`TdQdSo
z65lv+F9;L~N1HpQ6DST7=k;OKQ_}Z-{rN*lXt84Br=F+ao`r)Jbf9tzf(os<{DT*t
zt$R?PziO-Rd2onX3qtH#P$pZr^1H|FJ#H{mnY^gN7=?=;OUCy~toYbkv-xX&aN=2q
z?F?<EEUqwO;<aZSsXZhK7IoXFL-P5{zA|oTAE-id-l{G6f=l|Mk^o(Zwk8Oi^~}%D
zIrzJ$>_-yXh{)^HS0sG{4Qvb?Q@E-lm@l||Avkd7VP_n+^BITi{3o*z0ndN52oPvs
z9UPP(ovQ!t_pu2iY~>>O6J#hl62Rcz-Np>*Jz-eiaL3pKb{-b>{-7k^oxM6A1fFNK
zH*Qrxpo#oGwp_k2>GmJCWO4uqSYr~tm-KCqE**U9{iQV`f`}23J71n|Jr7D)#P&3Z
z{H*|zgZp&*Ppm=2kPNTCmaN^DPWn(leLR4Xj0cd22_kakqwlAZzWa=9UoVIeBp0vS
zK5fZ{w8H6UR1>ot2sP;7TzpDEM1FPKE9r!yWBL=bMALtWlNjv)^6;B;Hhxm)c?Ke}
zeWEs@2?dP9#U07Irq;_JdC#{-Js1lYTmK2y_WqL;kuO~InC}_5&(ee32%)sO{}7Q&
z9(<=_TeUF;0(C6t^eodIlXPI)m%y7dRy_E|taL)bsOZ-RP@qg3m%!3>+kbTZ^XY_-
z$gqs-L72Z4(Pq1Fal`i7GtPS`k?;t%k9|X_>lNE_8_bQ{YmfQGT>^m7%0LkcqJSmu
zJQdrI{MnrXfiBTc%yQZzlCJbE=<Qi6zklsB3EvW~BnhAhbfEr0KuUbRf9>NR-1hvG
zbkYX_2qK2cSHgrgEZM!FaLniP7e2DAVtYDiOV;%SuvGR-e^Laaf8oC}dC4ztd)XK<
zo*_zz^297cpoja@fIx)S@2F|~!L`pWSiLo2Jvfve3yJY6G11S!pR5m;OJ4H8TTi_=
zuR|)4@CC~Dm%&PT0U%LWzpbkN#-~1d=7agEgde)!wqrlmIcg8$>fl@`0&t{??*Lwz
zvgD!HXU<-}DfB(*`y@z~)3YQAJp>d{cyZP>w!AZY<=Zn>yf=HLwVw4%5p&A*vARvW
zgWe)g@_#%F4Hqx2*<87B^_B%|woG4K5$;WpPWqlPVZ%WP5i4Z)nHNC`fi!1wLEu!H
zb=OX5f&l2a&xB#Ar0tkWc1$J099!!p!attm3$9QI8e1~qh*ecxbJ*OsRMv&>v7YB!
zPYmLZ?!+vF2B|-+S&YnGxe5OnN&h$P*@0<5Q53?^+=u&*tnCoLNWnv95J3IL|M5sx
zF_|e(&`0L`Px$YR!qGDivWf{aMaoe$0@E|X$Mh%{rspwL!c37kGd*&S>Cq9U=P^}s
km?9l!dIZPx$PUx<1HOr*m29vTD*ylh07*qoM6N<$g5iR^O#lD@

diff --git a/doc/images/appicon_14.png b/doc/images/appicon_14.png
deleted file mode 100644
index 6d41a440d25e717487242182f979b324c103fdbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 443
zcmV;s0Yv_ZP)<h;3K|Lk000e1NJLTq000gE000gM0ssI2kSe-{0004kNkl<ZcmZN`
zDhD)1&fs!IK>(hEHDcSUVt46cqi>QbXv4k=+BC7t*tTuw+3PbinRT4^?_SOQzdPCw
zt-})H?@=U{vsR##DyvA28QMquV+MB%c&#Y%7)xeqn-lLV8tR%7)@V?9)j1^Y-md+c
z`Qw9r4-{#Rr*Ay}vh(!A7awbk*pdVh30=lvER~UGxk;v++(d%jX`}irpE0^i+hF!J
zV&SWVsF=k#eDTS_^G^ak&x$$YCXMJlVR+A>z1n}SZqTGOp(D%?Ifg8aEs2knbx+?_
zY&&uda`fmJHNc`-=Nu6u5<pfaW_0pI3Mj9lkV|ce5J^DDp%}V%3`YX~RST!)Bk#V|
zCQ@mmRk>DX5WF6}cf+zs(4Y4%J$U=*^%p{v92N!2W)I~i<@1=5clOT9Ee9`stf;ld
zNK)(2G4s1G)tj~-i-!CUUVnZ6wMG(ssHl7PzVd5LqpTpGQuUp)4ssNB$gGWK;tZlh
l^v{b$_=RFbvLTnl-vJ&!_>niik9q(A002ovPDHLkV1mcN&QkyY

diff --git a/doc/images/appicon_16.ico b/doc/images/appicon_16.ico
index 5d4a155baa053ddc4694203452a517c792abcf01..22b04f213aaf2d548dd81a9d681c100bde85db0b 100644
GIT binary patch
literal 1406
zcmZQzU<5(|0R|w+!H~hqz#zuJz@P!dKp_SNAO?x!0#TL<3{jSf4ADRwWuwLr4a6}Z
z?4ZLC2gC_3MhwXwW(+A_Rt%{=whWnpdJLH%?hJ)7#tb=Oo(x5CCJglj84MlOr3@2W
z8yF_GH84zSYh>8FJ&xhv?gWOd>(?;s-a41z%<)YOXHOmn;u8$#fcX5GQw*2SpJTXs
z=>o&!hesJ+JbTLU>ctC&S1(^MyawWrAKo*3`uLII=g*%EzkmH=`2G7g!yh32`}a4)
zzkmN2{{R1v%S)r;qaiRF0z`%YGhrYkEG#H2!Uk8UqNgXXr>7~$3ld>rVS(`V^wju)
z90*@VSwl}xPXW%CU}2Zm)6?RB$xE=XZ~+yFBJnwZd=UhnTUJj`n-j)YSJu_jQIrC6
uLH2=wqPVyK3kxeNt16hQBq=V&1LU!?G6B8L2&DNST(B5Ug2-UPsSE&j4rnw0

literal 1406
zcmeH^Nla5w6o!9PkUABoVig{*r6VoWQh@@3AcF%ULxG+YB4|)CK#V40Z6X>#3J3{c
z6i}H`#KfHmMv$e61A`l?c3~WFh%7KFChn;BxopD9g&V$`@810X*_{jcu@e*ob_b%u
zACLghFj)njDfCO>$O^`V>=0bc4a2284z+pg&6nY_MUHxl40VMH)D<aE&vaVlXtai-
ziRmO28cB@?(&DO3i58m*PMa33#VWKEYtUS*MO%pm&XOp!9nqtsREzdfJvz%G&|GFh
z`_U*|I~Iw~awA&H&FDIA#Pt)==w{wHX~NA4=BZfpR>q>gDh7R3ap<jzM@MBU2CC!G
zSDk?V(}@^hy3QoQbyhGL!{<^kd_J9-fqV8e+_h(7(2;{XwH7?+s=;V?4IcK`F?P#=
z@xcb>6^y%@Fg?<Psgc{5938@ou_3r0-^ZJ&M|d~$1n=EX@xlEJvoD#ip5x=|34HQQ
z;In5Evz}?py`90r{1^P3pTokpulW7zJM#y;i;M7jy-TfrxnJJEf8T(g4=a2K2=Lz)
z8XBaRVO4;DNVGDSD3yrP1J{T|BC&Y&exekX$+B527E2`S4iN1r5{k?X5{Xp0=^#<!
z+VvT%*eaEBTyPdq631<1IiBNqe#arAWS-x`astmQm0{ULyF<38u^g^cs@3wtM1=)J
zR@$dft93e64x0$%N9lArgF%z`Hx=xS*l92rOs41<v)LRQsWqAecKHzJ!@qvOA0Vi?
A?*IS*

diff --git a/doc/images/appicon_16.png b/doc/images/appicon_16.png
index 0657833a8e756def4117caafcb8b7a479f6aa5d8..a199f94a07f97580603867ea749e4f42eab98cf2 100644
GIT binary patch
delta 2145
zcmV-n2%h(x1LF{o8Gi-<001BJ|6u?C1p0bZSaechcOY<bZ)Rz1Wgv8UaAhE6cxh$;
z0C?KvS6h-RCk*{(6<Gq3c!=fjtjZ3u{2U(b@z|cZo|}B6DrUN&K?re<BpB2G`g52+
z@M98doR1n(2o^t=T;hy|+WkxGP1ddV`LI{xQ@^<lFuDY_?0?Ugk9<bI|Cn&CLFIG5
z(KEt&6kVE+LYXTw8tvXl^z-f~cNC?*8zE`DH?{Dt>k(Y0oJS+Iqihf1+uV1!2$Y(~
zLc-hy5U#gw8JQ1BM(x)-LXJexb^v>I>9GWWeA?a(Kzk3+Cy=j}c|`x#dH|pE>6ZsA
z!@&rRmjmQqgMYsuzFSys7V+l+sy04t=R9LH9i#8vWfy>GI38uqh0dG<!2-x-O$#Uy
zk4HPMl2FuUTS0lV)fSXWiKb%@Lyj6{8q`-^slr6Zoxuq+R}eM(6dWb4GI?^d(BLRZ
znkcxe+zse+!Z%xJt((?*l@u#Cf+!P|5vF`u%y)x7DSu{+Iw2yfH>_Y6PZxz5lezhZ
z6bPYlc=HS3s~r06o&Ug9!JuC-D>j&I*(!>s58sl-vp~+H-XTOLwxa+LVQmj%NWg#%
zB%T7<$Q+4)qk^Ce%UK*3FhJgOgOTh+0-MOnb8XCtv}D<H;MtAb1R}fyiQpzl23gK|
z_)l~SAAibTyz|}%AH5o%d=3&^@F9d4W|GTMqKiI;7^B7%vx++P8Z@eE(wsO6a-dHk
z#iS{voY`b7l%Xp_KBK2_k>ZLkp~Rvkm0aOI)m2|Zja6%^xp9+*G|@tfO<QWYlj+D5
z-F4qXk6nA}dBE3(3^)7;BMu#D<Qr>;)u-|U)_>@*#*3*b7jLYg*Ti_KpqWnm<P40l
zBQPE(18``boLMF3crrIRvxyNDo?)b)+?Ym_F;M6_u^)8f?t{6vcr#w#;*EdBoSD@9
z8_XF{_srW1*4jMh>SAn1;l$JmqHl<1R+G6j7DdLvSDxqF@73m?D){dy3Z5MPs&Twq
z)_*?MWmdQ*NMCc1hx3|kuUbM_Bk-`AO<Ur^wT?BOwYhh#8ToJo;!H2%^A}4#nLt}I
zfacZU;^CEfZed=uJawye3sdSo?mflaLu^wBF|mZ_Mt99mix}x;w@V$8YYXcG=h3_S
z>l-PPo9iOF=OY#dlJW%sZY)bH^^9;@rhj<cj6NH8YID~STiDH*dh{u89+>p-NG_Zu
z&d|Im9em+O?XZ1;M76JpKBuZd_At3v``D`>S-r5yJRA9rZQXCJ0a>ZzHn3R>@TZ`g
zpOiu@W4CLLxM7rSpS?K;%jFH-<qd7A-FQx0(mDOg$1gjE-y*)p)I!)xI1R^-uz!<u
z{3R1db-Ud%QthSU1Vds)Zrbf`CF_STn8UR7+sJ^7Uh9r7IDM+`hKWI()K_65wQP0G
zCS0VB6%7$_sVEz7NAUkJ%qGXC_QYva*@zUJOX(olLX?*nns>qc7R$uTkESdn(#<#*
z!}c8ak;}DTprn%n`k0a5PUIMV8GkuHan8C-GjJf5cqKtO;e;c-eWjTFHp1edN;l(7
zvcHiJU+`=|v|dRT*w7<3kM+rLI39=a#bn@M=<tw|{Y8X)Pp-LVm&UdGek@8Kn9>d0
z6W_qLUIb<_xDIW6o2&ZMLv1+Tk(He3%I(qdg1fDGApNjRhs2YXUA?>uw|{2yCNRIO
z{|Acj{|~Nje*=9m*+7m4Td@ED0fcEoLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~lP
zMJo<=5OK)RI$01E(M_vRgbJlrXw|{w(l2PzkfgXc3a$kQKNhPFF3!3-xC(;c2Z)=S
zlcI~1_`jskBF2N`e!RQ)xPN;G2#pF;&8{&()hr{Oh>O|Wsu+Al073L3iW!NS`dliN
zgy;CWhmWs!F`ngp?$6Pu<V^<nMB-Vd8y4{f@zkcJbKWNovy!9`pA(N7bV1@ruFEdJ
zaV|P6@XWB0NzW69iN#_E%N@*0hDtn198pw_@`bF+3g<1(YNf_n_kZLs4CS?zWv<g4
zMgogiLJA^e)KEqR7Gkt&q?kz4e%!-9<oHwMlF3yDBgX=&P$4;f@IUz7ty!2DcauVK
zAn;<_A5kE<3pDGt{e5iP%@e@?3|wh#f3*Qjf0ABrYmp<Me;c^CZfo)$aJd5vKIxJn
zIg+2IP$&TJXY@@uV1M8i=vi}nYwhFo0mx8S$s6F{5Ev;^_PWQryE}XP_e`t5ACQl7
zvxd68o&W#<24YJ`L;!jKdH{N(mo~Kk000SaNLh0L06Pu<06Pu=%(kI}00007bV*G`
z2jv9^3n&V1w?7R400CM_L_t(I%e|AmOG053#(%HgUbK=v@PDI3qA46g8loXY=Nf8h
zh-eI=wzi_7r8SC{pufQ(w<rioC`w8xA_!`<Boec)OZTP?!L^%~hR_4=a1QTz&c}0(
z=n9S(r~wvgg!0wU-U}2c79@Z=YcYqT(}nh|qTW50Cpg$x!Q*z8WJ%qm*-V@flajoy
zlU$D&Bo-)Oet)I#wtMh*`#%E|1?jLG|COJ5%jF(<eN}P0od_Z5^LYWdPo>$vPFEh{
z_D+n@$PD43Ne+(^C>9I-9X<wnduVR7Rj)!i`@;16YH?_amBCQpZ!+4Xxl@6to<J&A
zmKLTATi11>J16C3{0g79jlIY+EiFw*DGmSm#U)RwR$7@rN{PqgGWoI(Ip!AEzOVA{
zI{=_*I`QKqqZ6}Sr81_y5naJCBXT$#prPIl!0lazHdiYMh-}4q)AN;YA-a3||JV2d
X<LzuKnjg@900000NkvXXu0mjfA6g3W

delta 397
zcmV;80doH15S#;$8Gix*005AYXf^-<0b@x-K~#7Fl#w&IT~QQ-XCKG5%__ESwqY6D
zcKR4ioHQ}2*tV@_`)ypTb1tj<m-8*ouz|}@BM}TCcw!Aw2mlJOO<iM*RHal-L5Wn#
zF^zy0zoC@N-LprvZ&DKxBxmNGyZ7nv)t82@0g6P{efA*$C4XG(oj<ZutGbBee@5P<
z^=FiF8#EC_3Zc9i+4)8O+1_oaQ?>m1seOt|N~zKik^|sEz?-r4=*^1{J}IRZP3}2!
zWJdslJ2qR6YeGtTI?$km3@tTuW*Y$5&J#DN0YH=5mB0N<r>7-t@aiF@B#}lCoO2Rg
zTcxCv+=je@LVpIfVa5=6eEgYg=z7>z5%F}zvexrM^DCBf;Bo%WTPXrxMr`0BbN~Y)
zt5Y&^m+!g2ps3PyNl4*OnkoV*c^td;Wc{HlV2pyJ4Kh%~Fn#ke(+JcS6qR0k@UF19
r^!xt|$MUDFAp+KD+#26#n_2;tCE31uY&F#Y0000<MFvhpu0mjfgjKoK

diff --git a/doc/images/appicon_32.ico b/doc/images/appicon_32.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b0cba0f6af95fb2e270d955b116292e5df8dd3e3
GIT binary patch
literal 2238
zcmeH{SxggA7=;gmOWpUnYgHT(+yytlVnuNmVbDYfmPBHT(FbcKfyzT;h>c16KofZY
z4T&Zas4E7l56X+t6tQRkqef$*C^kmQ4${_p=TaQ0<yB1hC+EL6=R5zM$$c0gh&&1f
zNSEP;43Gl|B_bALiKri_Qlmm}G@3^WQ7X}i1QkvS@zAD4;H)|l+GEMkr5{07Mhf(r
zG-PYk$jMAc-Z>@mvXnS~>Ns*mWx#MI6PI#TxS%@?vmp+~Y%PpAI#@0qhRL8Oo*o4z
zBdphwam8Z7RiYw`ne5FdzMPNig#{=nF2v&pYE(U>(%@cM3CgXdD8E^X`?t#Qq)La1
zJ62Q@+3w!PBU=T@SCXs^4tqWv)fT+4KP7sG+UIuE)>Pw_qXu;^9eC4FM^uluRIlst
zPE-Rvet3_sjh~1<qv=Z{oZp)8-RXp@`3G8D%|tG=wz$yV)`pIbc64{OqN}qLJw4s%
z?fnV2+YOJ$1Fx6L8|bQs{oxxJayJn4U(~EHT8ar_%flCs|H~Jz6lg^)5SN{+M+}Vo
z!3AOWy#4?uRv%v|&Xaa1l=;5ScyvD(5*PW9WIpCM7xs>n2H1Se%uQS368qk<&Yy3k
zmMoG5b_L)Zw~+;=NdoMAah~HQGrlAc=Muy~ctCz|a6XouAL2K!WX=Z0XZZ10>P+3t
z@E!@~*!Le$ZQl{kXp*qTpEE@I{s?}>>_PZ?p44bbfSvD~PokKYi#%AYRX)VlWt2~1
lXdvIWZS9olOL>021P70q%WBRzi1sM?L@6G^`+xmI`UM*J73}~3

literal 0
HcmV?d00001

diff --git a/doc/images/appicon_32.png b/doc/images/appicon_32.png
index 8e456bb15e1a1e554fded09fcf00ca5f1125d7cd..2eb74873d8f6dc0b5223553ecb39658cc728f24c 100644
GIT binary patch
literal 2835
zcmV+u3+(iXP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000K6dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+T~YUk}RhV{AU$j0+JAd<?s*@cL!d+6RM`C=XK7E
zuRk2&u9<?SC?S-oL>>Ik|E=%`KAbd#q*ijxIpULQs@%{i@%q$rr<l(DeE5EZ?{CJ#
z;{jtx(8~4I+C9HvTwh;!S%do9@lft3Ty8`6gBOFcSKh15XD2bv*EpryQ1z>mYq4in
z`|awuCmvVs|6(+6W7i{m56=V15T&VDNSIwn;<=Y=j_iMuhE~trFposgPr?BWNxeNm
zK;CTcrH%19KyQNl(hKjS|LDC7KDT>Z-o-NCF+%6l2c(|||AhEyVR?AOZy)4Wgg*p%
zty$LcYj-VWL^R)wis2<X`yEW|2)UfsGA_fvqHpJ_xJqns0P-0}?6?M1VxY1DC7RS|
zk)L+ZfQyNpfeAAY0JX;oFseLc<COMAi%qIbDZp~D2fzpL9=_07x1RL|6|6i7Q<-3l
z@XD80_|?OoTw$%TLqxGWVg<i=QxtA&<n|r200^xcH$4G<xo-I56MsNeAgCwI1siO!
zUnaWJE4Sp}ESRTguN0zS^EQAGVQqyoBtRf$5~WPhn2iW=EC8s%bC$#%2#_jIILS#Q
zb1*Kv*Ty?WXD%ye-owx)0HKn_fK8PKuo5&ZBPR<u)KoO7YF5({v}((eQ`Vfb<t=i}
z#FD9HGb>iD6)CA`$;C=3wY17rpn+O*wOVSet#N2rsKHjl{DzUvU3%);bGKf4?QMWQ
zBMlvS*eIipHhIc~Ow2rOmRV<W3J#_4<m%bYi&t+8TwAiz(v_F3vg&FN)NWKiTt7gK
zZq)c7wddIbHH-$c7ZbGQL^ozYj1vKI+X#TryfKS~QsRx=#w=DwQYgbo-PnXl8!<qb
zoLCn<uzN-BTet-+-@=W5hg{gu{S(LqK=%>1Pf(ltoErzRD+_l_qagd1l*T1A?vtfJ
zaqz9}^X>1o;r})8uQY_P_7=E}I#ajAGa+vI#4MMlK7o(<SYtd5%WSJg>#{_~1js8@
zSX?=DPxN+nrwj^IAjlSR2sf~@=C1siH?y}no0<fws_;jO!A$e!DVH=_NvoFYg`ANa
zioacYeA$N6u|Cuqs9eju+Qrgl+|x)=KD1*qer(%BKAd2KgdICsNwI}F;;J33t^|{n
zrlrYM-K~PYHu~sGs2)c^^5Ucw8D{V(B3m&surj!AOlgYD@~f@!2hU{A;C+hsG5EBF
zk*n=`j>G*MvAJ6H0NwGv)XlU{vfQg%7O%)Q#v*Gaq02L`GVI|4&~)-{+@qIdEv(ce
z_j1CT#w@=h;4(u%k;Xt^w;mD6TsWNPm2OKBKq*|5hDA3VBSU%6SM(bx$n^}_f;hr@
zn&iQ%7TdeqFf?dTBe$7GG?{(+8iInTI*zUZT1=?7n<S{pTn%bE$QWPN2*7*!6$9M9
zn_(X}7_J?@+aL`PbPNKW);yhwGq=@(ZQoq5L^VQ;s}7x{g6yA2h|z{kUWZD<1O}=a
z(zt<x8H(CSJVSm@csfr1r$8ypm4<U|6-UPx_abOu)QtzQyy;Zx*BSEQqlfSC(FB`B
z8Dmq{)k!mY%RsT+`H0Ftr&oUBP(Z1Og9{D;5gbtBAOPcnkd)~CgEOOWADMfAn)Cq?
zYOO2<27TVp%rSn#&hUnwe;2$<kK*azR8`^4P6Cdr;gnx{^I)bv(f(S%71@c34!WT(
z6(LE%-Yk&)DP&)?*85gJ$W_tP##FqA`@QsfL^?v}z<xDo-tKs9grs3a;firb^<S=z
z0tFwE8Wd6#F+g3BI|%1^qEeBp3%}?1+LWR?iO<{9{d;WZR^L*;Nm#-z3qU`$AJOk4
z`@$#mL#lY%V$zS^wUp|vZ<HYc9Z^uQ44S51krC;RUHDWt@zxw$>nF_MHw!8ni2u+l
zLLH^c2Y17d{Qtsztm~oFC;xlCgIj+=f?cP%LK2YWRCXBl@e~xluK-USIL=J&6wK*8
z2fu2`9j5Bi;K<?K8T9GdDkvbAbWkXrb~2|95xz(_MthkUPG^8(5i*7fc0eS`oEg+H
zW8I1e4nf&Z9%*74&=2I&P2hgl7U2h_&`R8VApT%mgTOM*Lx^dvo~(xk!Nm!VgLpxF
zGWmqWEJUBL7jS&z@V1^%R?Lh#0qhr?7EKchnv@(6VZ$1%9PLIPk72i!y!W#hReN2X
zAU4;kNcnL<z`hI0gY14`i640szI(d=uKf=fGW<xW;V+A4t7O@Ct<V4f0fcEoLr_UW
zLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~lPMJo<=5OK)RI$01E(M_vRgbJlrXw|{w(l2Pz
zkfgXc3a$kQKNhPFF3!3-xC(;c2Z)=SlcI~1_`jskBF2N`e!RQ)xO)c(jS5rEt}#H>
zEF+zWi`m?&7<@$lLG&Vu8Ht(tTq>1>=lHsZkFR$zp5=Y+&(WvkO$PWx;#sB}7V!r0
z)TX6#-X{*TlB5uy6OS5nLE=ZQ%PzlhE;=mm%&?J3&l87<#bO7`9n4CGN<2v%QB;lc
zg{;d8=Pk}^rN&zK<Sz{6wUuSA(;P+ui&#PmB4pH1Mg<mPv}&Z7NYj4Y!$0KsQ{<A#
zRR$x+0;*6UIezdz_}#5pm>74HLUADQV%r~4Ah-)O>$d%UY}?Hf!2b+fX>EVC0Zf0A
zUT<rWBcOj9xVUa>@*Z%x0}MXtk|8;gpQcbK0Pkn?O*vrT7U)@Xdu#3E^a03FSIHaT
z;1C!oQueyXySqDk`}a(%zaNl~a<hiIy`BI700v@9M??U60D1s=qn9?d00009a7bBm
z0027<0027<0nE0cg8%>k2XskIMF-^t2Ma0{(TPxc00077Nkl<ZSi|jCO-~b16g@K?
z##Blv32gyQL&0J&IL+9)KpR*X0~<eL(1>9{qKQ#ST=)arx^lrr{J^*}Xd1fkBQDTH
z5{gy`+9oxqlwztw<AD8;w%E{dfhIPcshv8do1W!8@4k2DzVmYL5N(bD0c8Y<GNU4(
z>;fn$g0(clVs6TlD&RA>3b!{1lE`JXEk@{e?L_)V5}eyFU%;v3hj8L(PeEUiNG1^u
zf5V55i*P=Afk0giOpg5kv8l|!?8dthmplP-uwAW&x!DABvk5(iyK!-163M^#YGXYb
z5AFds<rfnmNS3%52td~1e^6De7Tr^E6A}Pyy4sw0H1K8XUcunrcG&ASMd;}&BxZex
ze&UqzKq|G4mG2P{04PcYnx>(v)n={HY@>0>W`*#(BF|Fmxcqop83Dni5RRR@nicD2
zTXEs+NwC(Aoa+F91D$pNca*sTF>Ah@Tfpg|Yw*mx70uDsXwci)u9OF)U&rvRF-eZ;
zu$10}Z{COSGo2RYbXv{UyaJMxx22*2y4V&_DwQb5uS7~O;QU~pB<J-nl&%+8TN`j?
zXaM$oj3^(C#WCTTS4e;W9O+`v-`5L@qF~V1qrs>LK@gHDuRU|}+i^bZXfnXYG6k(&
zTT9^j&4)^wu<$M^2m)^3dw|8|h;kJu^!Q9B1E=dLZj3$u*GN`O-_M^Di^VZAdLN_X
zlf}=3#enBmF*QAd;k)Aq@$vr~N?&=r$ZTxn#6w@h@c9F9x}E?6K#&BuWgfHMdANN+
l`2$Rw<4on(tRkSS_yzCqt`3ls>C^xK002ovPDHLkV1gB_S+M{B

delta 680
zcmV;Z0$2T$7PSSC8Gix*008_L?V|ty0(?nCK~#7FVsx%p#Xw8I0-&uNfbNQcD4gW7
zwr$%T)wXSWjM}zs+a1)lZQFdvZd2bTnfLn|XV2yf5g~>X0LE+rh<SpTPJk$ViWAFD
z9M45nizLY5{pWA5K72J8vrWb*4LboS1XYS;>RqpR=&*aw-hUmv`gqgf>vx{Mb1Wlb
z1VJ8lrDaT+P#jIm<~eu!dA|jF-hTQ<h@OTaf^tNlUlquleB1D*g|nvQoa?NBA%J{D
zBmt!q5vTU7nlDo_5vv|dSN^aQs5xf!sUe<KHw^(%2tIuF9lUV=@WuPbuReP4{GB$3
zVXz)`igV5-H-Akdt6%OuebZ^eX3<*^2?vPd*xl<EZ&j&~Bx_PO?}+95Vmr3?qn<!5
zq51Q$7<ElU6m$Hl!}GVFl2igBPln`b8-Q}CZGiZ{#xThAO~;6`WlfV<a$~4$L~Udw
zh#<*6fAxL*;**34<2aH`GZ$&QDF8}J&cQMbNyZhKZht*M)Bqqyq~4Dy62)<CQ&PTo
z`%yA90WfR=BqGYI{N@i1ZC^<Ry>jolkcB~j8Un%2{Q<zAGgb10aYuHpTBCF>N%rZB
z@5aLyf-8*4PB)S<OX|c!I#i~VrcaS5W#V{5w=Ldv%C%)f6T;WXabwvfa%Ye}dP4$1
zK6TweN`EOJhSkV`8Uw@-?!vd_(B;2$VK4f6C&Uo$-NvpxbL|mhR277;o1&lst@YcF
zUt0}XcJ0A)MyZBU+fCJl)-svOb^XDM#XC+c-F4Ent)KO(N2HnS50XA5O%NwtibP)h
z=Wo96d-3*@wVo0y3(L>nzn{PPbmi`|@4tS7j3Fij7!`x+hIz|w)CT~Pi+&cL>Uo_2
O0000<MNUMnLSTZ{;7W@C

diff --git a/doc/images/appicon_48.ico b/doc/images/appicon_48.ico
index 0be300a91a6b509d892a74bad5073c1f3e96bf02..5acfa77ea75b62c85e767d6793cd271c18b535aa 100644
GIT binary patch
literal 3774
zcmeH}c~FdD9LK+IoBO`6E}KMDi0#^hw3HCq_R3WhBFT~7F|LtgtZN)$<PYN<hMDAU
z8X;5))hLxPnB@2?)8Tn{_IaLGyZy_Iemmd&ec$i%`91T#&%S>w(1LuNok70a<6LK;
zHvlOSiJ&DCb4#Uk9|q+lYa$yWJ1Aw=2$R`BMWmG3Ayj5hx;@G4q4Karn1>W<Pdg%#
zc}k)3bb#7xI5Y-Hq45^w0IevW5k!tq`#3=>cZ5zp5;|W|PSE%|6ODn+&jsOA#~~uf
z2a&;kST=hKRxTKe=n#LbR=Hq}+7)YcZirC^A|YxacE)=nF(wj8336<WU5>qiFLouw
zVRvFYj_sR{6Z->@tXE+F)<o#H3()V_f&-#<Zb8b?K%6}mgu_YOa3pCvVRz%Weh-ol
z?7_){`*8ZO9;c7!aWUl(&YwAn3n`~?H&ugsqHbz%KTU%Nx3tK(8;$FiFW?4I>eWj`
zmyvqy3ev7$Mf#mIvVI$x>G$zCBOO_p8OY9hjGU)Wh_aCTEDJBPpAkJro~WGXc$u4n
zH-$IwIxiOm`FSXOm5<`00-{1xls!a6c_!YMKSF8o8<dt5qwKAy5|S6;U0EqURFo4{
z;M2zssQOxh$}gW$RauGe->UHQ$9Gg$|HQBAYSh%!pjK3EE$T$o)uFz=-qNeloc{+W
z(7w6;jT3NE(`xChR;e{1Gsh2Z>dqzzv|0ok-G;?JmM1vhn(}09jfbTP&bMj63&Ol1
zCKD1`oNsHw3oC3WV$wO^!IT$P4Ko3a7nXTpLDPJvKlT>{Uo!)I|IUs0xUP){8t`KR
zXNBnE=+7bcsZH_S42!MCF5wf)o8r6E#W`#s!J1~Q^ZV&RvvyHzz>8+AbG|3b<ctqy
z88w{mMI*`3&2(Ts%c$XeZyHG?@s!u{%;-4Zhp(-pyoP6u_`Ynd%SOsKekJ(+{Tc5`
zabY&gsNwto8cCKielp9b;ru{j)M_rn6YVL+I_C!&vVQVa3>Tsq#ti4fLPM1cS8w37
zAWUHxGn{V-3c~tj;Sno4GK?7ueC!N`Lg7D(Va%B4*NeD9F?~4Ws4>q+8gPZem13-$
z=fjP>jB-}A+)W?Tcokvf-6+PoSw6;ZnqeTofpOIQ$!}V_D9F*uYNS6I2ymtp@3s>g
d)VR?jU|h0undB<vShM@PC-5Kq#rvlp@i$t=d>a4&

literal 7358
zcmeI1`BPI@6vxwlqSd+}vdX@cDhLIkRSN_VC`-a71O%aB-^0E}_COF45)$@+QmM5p
zidbc=1*8rzG8J){E;zMQhbfh&KxnT7-$3%tEl!=z`=Q|z=DhEF=YGGOo4jNO8tpCg
zV`fG}zxU9(_S0x@(`Yn(^h6RZ1U+Bs&?C)tAEijA@240C(&-c;)BPZ&;J9m0iYyNe
zN|EiUNhxwXH9^iC%A~&wk$vV+mivJWmp$pu?;tV|u6sH3ec2ud!38m1uTJH99fl}k
z7+!72{Gu^Soj!gVH`rX1?lsomGC3@JaI1G>sAEJ{eW{XN6={b;qNvcacs<`+3!*aI
z`Y+(IwkmH-a_JZ4k)B^!Ub@>Stc^ZV<fotKr3tN1u79GP4^S0hv%a=U>L`ElTSKBt
ze^V~$SwfusW=NXD;JEIEEY$S^A8m;0bGST$WL%z&jSXe0RrwzigKha<nvjc%UgWC_
zQ4?v4nU5fuJ^<_&F&|VYgUyUyy%20x=%WL95qhzo9t1B6mq(aF9}ttjezxZ!>e+h(
z$O!pDcK@jJqU<p9X-aV$6z3Cmn1a~5hj*{#d1~N&OBwnQb?0$;L}_k=&AZB@jEYjB
zzwSy+T#3IP<cM@G^9Te##vU^tahm&$mSUB$Y`ut8)NO~0kEbd_Eg(m{j?J?y;dn_o
z-lLcKqnB&P`=#>_zFL*95Tn=@LA8{XvPv0xkabz0Aw>PB4)A=I+j4xl482l+T||kW
zPO-06vCrY|(y*TwW;YZH)ezf`zkfJ}u7pg>gNz^=*e7s#a{bBz4R-Vf8lr?{0S4n=
zN>C)?WxOrRR$0TcM3?R8eHEi3$Oxj5?Fi;sS#HnuuLv|G?JW;9csf6=9s?=LkbS(k
zGKL;$Z)J!HL}Q#2E>E6+MX(WRZ&|>R9&Q-nt{!acnuzPKL)u#vVgezEb5g7WpI<A>
zo%xK)U}LDaoS~;4gHYziuXFvhNqei$nm`ESar5aaU{;41L%n4Touy|#5CK$*AHTbQ
z!C#BCmltLRAxiiVvtP18W=*Im)LRjt`|IMoN(|y~@zJ;C3~iv-oEJupDDfj~o`B6f
z<h|t#9pZLG#2|`=sXOINT~gm#mN|qt=_DpkcTr$1%Z#*_7i!v)PAA;ei|JcERYCfs
zz5H-Xh~}hIP@X?mmV1hV>R9F^y)28G5aYSAA@vwYQNG`AN(*=)MkKxAmh}-J(&W>a
zJeP`t_~8~R?R+$`P~+PjT!mtt^nR!mCCR7wEOV9Kt;2Jc^#Ib;)6n~Ub3V+vFq1l#
z=_V#9MoqAOXO8#6)NK@obT~@!`A_q_vxbmqL!=c%OX|n#!2Jh(pPwG-{<^pJ9^$jQ
z$${p_6GJbSeo;D-PKHQ$L&T{Mw}4C=quz&TO>>6!i&*@1i|30^#PRl!Bhm#hZErLW
z8k%B#ZA6+Yh_b?%3Zsufv}d@!k@*nY_hfSTVuYD6`Y7ax^rje)j!aj@+S=>x2z342
zSpQ3}=%W}%bV?Ls4bhoN|Cf2tWR%01x!Ea+cYutx>&<K%h%OGwL;m>=4MC|ZGoTt3
z^52*4v=s^>&BbhM$Y_Tid%PJymgNTBf5`G|je<D!Y++{N^ZL#V=ccIlAPaR}5_=q?
zJKKX;e3!-gs{HAr`{R9ey+wZQsVAY8F?vh99YkBQ<FFuUSeSz6dSl{1ZS<8ACc0j9
z-clTGC1G1j<7}a2@p@~59YjmKt%QAS7g$SU5jN<0<OQv^YyE@P1PalfWKStNk{qZ-
fvO@=z=t^~@6tYxDO3|I>L@A*Ei~X<vHxu|9GesB<

diff --git a/doc/images/appicon_64.png b/doc/images/appicon_64.png
index 220e09e97f582aa9c252dd75a5ecbf16a344e6c3..a08d91a0cb711639a9f00f93865cb32076e853fd 100644
GIT binary patch
literal 4913
zcmV-16VB|3P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000cvdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U1#9a`ZS3gx`6JIRZ&=Jr381xxpO2KTxW2dHc8S
zhmIImxFkyy1tNh&f;Q`a|J~+4`~+9L2{D&cQ?mSo8me!c6np*D^X+Un-{&XXxA^<r
zb@RO8xg;Fr`ZKqCeB*k2d*Ja7*WX_^<-X&~J<)yRF`?+2Jty<kNUr<qy1OkgbzLW^
zmi%gJ_t$YeOfGM~CA)b~cHQD{^Lim<yfh;(67QEdvFE#7V?=+QG>-9nXT~`Z&Vx9^
zLC#QjIpp2)9!G0m9rVu0k2CYp`_Hov&iC!UE+2fEZXa>-<qa3VcK&hk%Zue{k$-;!
zckNHhxqtVbW$$&Zu7!k0(;ZRPJiMdNFtFotIgceincv8HKA*~`*k%WiPdjYqGhB5Z
zRJL)!P1oFZ>l}w0m>B%>VB)<W0HxOo7*#(+aSHlz+h?gVrGVw|%Ya!B|Fp%O_tx{i
z;R<h_j-lQ$nd6afKjud_f9GTN9_k`z%hOlb<uybxLy^;OMgfT1H*WDb`0=^nw=eNS
zsDfZTZZ0ga*?vvYqkD@jIXDaBBF8I*oXPW^02lG@h%rt;z$PcrC1<nu**W}J0H|TP
zm*6`HxETG!NFPL!H`y1j@8+58&R8FP@_HF=0*EL{GT2mUfE7X{esU<pP>T{nj4{O=
zi-|S1Bq^krQp!n5u4Ty~$DDG`CD+`Flu%+xC6`iaY1LPO17l4!*HUY3&6~!H8gn(q
zH?DNwrH3AS>baL*dmDt$2qTU(@+hN@HvN<dP0Td&EVItGoLMl%3M;O(@+zyYwu!YZ
zJM6gA&b#co+Y_}L)lZ+_K+WB#`Gb^>%TLs}YI1%|;gn9IVg_P9I1tZ@00He4Gh18;
zUXfGGZ1p5X^cWcx8#A3E283ZbAGdpA_lDdr;bvm_CEWbakTVM1KY^S9y3e?Mf!fqM
zHx6P~7OGFJkbPT9^TjmZr<Vfb@K@9N_Gd@)cPIE)PK4LJm{9hbaZAUqD*|=LzXI@5
zcXo@=n0woj__9;<doKu^;~K5S0eY^?5KW(DMNnUjiJaA^ET{UwDCfah<9YDRrgP~e
zIu|qX-cZ2R2l$BTa+L3eQpidWUQ*BGTNCb_r5MgE*#|Yn{HZNvr|S5tx<N+AX#(l(
z9kYbT8>?lu?pvvScwFYNrXPEHicFZB%oc*M9?hhfN@RqoJ9#3RVR_>4g{w*1k!0?<
zx)e8N^qDLm0|$-`(S`92v)HM9-K;rR%9~0)W(7ez)&Xp%Hj7)f41LKMLEihPtrUHm
zw)8G3`>0|xRB(2(y&RBRTFlN`YKqL<<5=CVIkG56)xm3RnQD=*H60VtlIC&p-7&Y7
zhh0otFmrY&bIs5&7*3A6xC0W3jUhcBtY)i`*o-5_zA!g{Qwf(hM(Ot0fVlZ|gm$2j
zU3nF562~N|sRvhT3n-(ysRGFC8HOS5EAhVD%(l0d(I{JFz%T{C#JB@&)e#xn;_4gn
z^iY>{TSt^RcFj9>9HS$X?5Y7VSI)JwQk{Q}WQ3~}-bl0$sm;S+vRKrrP7RrgBgEF>
zL4g4wvF#z_Fn2-m63(^dNKl$AV~x~z$`16R*K!g%o@VMrRe{aBYhVvsSK0jp!A@!2
zky5TmsW4=Lv(X6|x-a@x1-dq<IP~T54`H!J-hz3AY-eqqkeE?qmJ)hhG7y7CK^Fgk
zX~XwXfIpvc04~o+Fn1^b+Q}x3gl8P&--rYAIWWA`n2%F=Tg1^)W~L13`iN>mWlvW3
z$jOa|X{8LnItoz|o0e}8FD&cIJ}V-5)Ze<cuy}<)C#rFg+rT=Ne&CQ%X6nmyf@Fh%
zm(5D#z~L`A600AjrQBUeKu=>>;&Ga5_ldQSqxo>bEvU!B;7f@_1Mv86_elLC8Ai;@
z;>a;FW9B?$mm0Od$4Ix8w(2DbN|nb|-M>SUyx<4=AZNVBL0ucqpBycLFk7Y`zS-WN
zxhVs*n5xp_0AvylVh!s&P#uRhwUj%*ln?S@)j_W9X;2P{9*%59v0~#QFZLYkq)xsj
zZ+rUJY^QcWy2^yR^VLbzVWi?&9zrgy(wt^$LuAy-)jS)&rH>PQp@KT<VjR?oyR{)c
z&GP6vkquFhsh-4-b4N0-t~edBLh!(kEQLIYJ?tKIIUr09VGUA_keD$K?DE+xrRakX
zu4CmrW=f|`zK@y-1ccUBHkgMzB8;$gxQC4Jz|O5{7?J%jI9jg^Xp=f!+6jX=Z7M$_
z;rD51e$K{UkntBuXkM~Vn9;G4q0v4bg{Sc%-?d_Ycdwy4hZ)1S9quTk&D0wO${fkz
z7lBZBv%B`CY^l+dpeT1$JA90P(5eViYCn2&LW4;bIcXaLodBQe_5(p6FA9BUQgcRH
zL<^I5k0|QXVk<1jyNoQdnR0pj0LXjVd>+*LP!sfiKwVtZ>e?!tm{Ho(aycY~zy*&f
zubCX}3^2nYl}Jw5mHI#gD;G4aE<mIO7a6oMq?5}Uu<%Ch2Ec0FLo`~c*l?H!{SAe~
zZU~M>ZMcA@Z~uY*Gv{QJqCbFp`TiqnDXZsUFr3On^}Ci@-BT81=9Eh@Ww@anfdv9I
zvsnw@`+Mf?W`I4Y-xzQQbq=mR8IZs7a-_40u&%_=%a%Np0wB3;kfak@*LWBj4>&Tx
z(1RSDs#as_Km?U5YF(h2IzMGkF7*9$DiB56S|lo1qm(I%GYjQ|--v{}WHEg@)}%v#
zFagi_-sz2oJz}(OcbOlX^S>;XK9@=JE=T{MOg<9SJhM<?eaTSFc+Jt5yC+9KrRZBP
zQdJH4iFRLhl1G{^OH~6kj|mkVIr%~w>RJG#Eg@|bDi8S&Je;#qx2J<-(hc2yD)97=
z!edv>Nk_)3P{9FcGaO7gqPQe#0$oCfOldZm=Xh#qk3&IA)8j!E__F-HnBc>QG%=s@
z<`2`wyynZ_Nf-0=&F|ACO*CMmT|v?T?t(<arn;CTdzbQ_tOe^;NtKAD9MZ`R5T|G^
zH*-1Vxm#twPOFrU+eLHY5U`2Lz-U)eD<KAKQE`iDo@^k5!qg|^oOf~+EDn=ua!%KJ
zMPG!KrZbLS%B2}^zmyNsC*`H39!0+Ka^?*3?kbGO;mgH28XRY92bC|4m6a-^YJmh+
zlw6;K)?ApIE=cz$9O{gpTks_R5^d(o{z6Fp4|+=L7<x+O6fyg`%`vC4E}@rpU0SNz
zPad37h>t}QjJpica8-$!ubKt`H5W@wV4?y;&J!QuE<qXyr(5qG)uA?|FDI!X4}bMB
zrK`~DSKidsQ;|-zRLT+EY7-S~{eX)K!~D?iLLHOWT|+tw?P+|9nt?{Q1?=gYJ3R;5
zagljMP#`6_PHWSTdP>TmqYK}W)+2;T^Ps&3ElnuNneR9;ss%3PL-xdRKm&-%FI5Ah
z2Ni9dcDqmbcpZz@fCyA$QCqRmB@Gf~>O8O!U5}b*okSq=)rp$L?&N}7Llr<oRCUvP
zty8zS@XnQ0$&K}UB1=QT{1YNeDcn3cJbx*qeAz`ePQ+cnCoM_DYx@{k=If|<4GQKR
zW2s7q%GPB9H1j<};-#*AOhC*)bRx=z#5|r==1Erj>C;B8!vz<Su<!{56hon{lM2#t
zI9w*%Iid5%D3!$6UE*P`b#^HrKKc-p&Q7{XMJOB%+#M<68%f<g)7(rF{P%kW-{-b@
z-z>c*_t)JkMeB2ZC*2tTF2P?hI0$GZ0|P|>aigkt`*j4Xste6Eh-);6`D&U*)R-#Q
zb{vf=vdE@Hc_{T#2A2{3eQOX+6?&k#-+G{Y_dxmTfhf?}+vt~e)7{{$+a)N~r5bB%
zN2J5bHi^E37KI*ik@zxnbFQ8!Qf`b(cj?H+Tq8b&zR!+C++CRqLs8aR?FBv}Ayd)5
zDhqvj2nD_vG>*=y_LeoYd4Tx6jH`=c26xm%f2i+E)gn{GMW;m!J@Fv+_Nlo4<ft^F
zdqH*Sf1*mjwfZK?ZtB{*X){mbhpa&mp4LIzySWLKbnRVY++Hnen{}IvQdKq!F-XfU
z!8k4Yqy)20TXH{fkUNj?Ku|sg+>M6Br_lbD+mX=GEka~fpu635LEiH@_`_KDGm9X;
zhR@_oBTFMW>N;f{ekj#z?!`+*(PW+MGo)tG{3BgT%J75k6(a;79O~4Xq`q3CeUk1V
z4dfVM+H_aHrRE&X3SpDUwfZX___+h%Yy_4Trg25~u5uOt7evTK1zJ@FPp#`(6Q*3-
z3dt$6y!pZCbWB(^>5(gP>7C&3z+JiuVmBXEAzB{@adZWRFU@sV32~oxYySB7e=yOZ
zKJym<Da98EuK^PP00D$)LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#OGPUVb`WvM
z&^lQV712$rP=pGlR%q41<kBx_(vYOMI0~)>2R|084ld5RI=Bjg;0K7Co0Fo8l=#1-
z&?3fz<9@um_qclp2#pF;&8{&()hr{Oh>O|Wsu+Al073L3iW!NS`dliNgy;CWhmWs!
zF`ngp?$6Pu<V^<nMB-Vd8y4{f@zkcJbKWNovy!9`pA(N7bV1@ruFEdJaV|P6@XWB0
zNzW69iN#_E%N@*0hDtn198pw_@`bF+3g<1(YNf_n_v9}O<+YV%uG1Vw0*hEe3L<3G
zP(}q7Vzg?cm`Kxp+`~WQ_*3MP$yEj;#{#NQAvu2VKlt6PS(q4ilR|MI@M7B^Q6RVr
zH0!qgeQev!6TtrrTxo58wE;|jl3s6Xkt3jg8@RY`Yw{j&xdRM7>5?HilAoqfC;;zg
z^i4Tn;1=jvb9-y;<MaW@P*=$t;NTD#DN^>j$Gf{bd;9lHtG^$Rk8-nyy1kwN000JJ
zOGiWidH{L=dZU*%wEzGB32;bRa{vH44gdf<4gt)zp@RSb00(qQO+^Rg1qTZ$Co*$V
zIRF3zOG!jQRCwC$n{7;6RT#(r=l1rNmX~&=wjJw4h+_$w2xKk`*+MK^)Iny9W+rUe
zhkfvaep%uNGv^nR8Dq$zCK{Z^pb5q$5)|L2EK_hW$e6qcj8QizTgQMxp>LGl-WNa2
zXcpbdDQ#^p_xXJO&vVZ2ocrA8IlU!iyAR9Qz{X&Mn+iY$paM_<r~p&|DgYJ0hBcN}
zAOmQ4dM9+8HsPSMEFmU{h^+DmhE~u$JcV$ChlU|>wR)=&jy)B~E3$#nY9Ope;h*y0
zX6F#Z2v0p1LfZ?7l8k{LPop3|H>o=j2!`PI2XNDK8xz;2(9wAr0~5FI8e`kJ9VPp!
z!La|{H$D``)z)(eO?$Hwz<-%%W)}UIhtYiIEM{{!l)tbaM04+_mJh99sOd`xD}3r6
zfpnUq$PUK=JL;Zt;#AKixJ2>3<GDNowmPdY^<AH`k|1F<xGqU+8f$vUL7N2S1kzx7
zEga<`%4>_u=HyV#F)L1hj%6XOajYZ=%ButPS{4<?{56dY&3csw008PsisK$^NfhC^
zFrZ8T+bm`rDZMuYS&}gQOCQ3we9A3_ou$P%QTZqyGZy@v6Bt6^v|3;tb>Vi;Sn5mR
z|NSHsnsKbqj7UsCR1lD><Dg|2{9(}J>#u$V$wUCIYm;zKd+rXb(SYMPm`q04Z5CJx
z&D4oeul;BG+a4~#bG4OdJ3p9t07kF4aJ;eQzLiB)SrHCC<Ak%O8YW{wLUEq0ucZc%
zo*WP-eG>qKt{EI}Y(ZVaE9k!1pHP@b%C}ROX&ILU7XlF+ef2&3+;x#!n`_YH`Mp)y
z{}vzsj=gajvvXc*?T*TFWxNKXF%cc-FHq|?+a6F(9nkgzJpi+LlX3uzx#!^z1gSIy
z`FY9#zz~9Hl<uC75TYCai7bd3awadH7bO@BdMb?==h`f*0Mt~JB9{`tvOl040QLK-
zsWm>|vN8Y|4IG}Rp$FiZnNtRU#@Am&q1i;O>mMA;ZU8#122CelLd~9C)Y@PujP|aP
z?7R@sX*GEH(33b&w-=l3)&$$`39t;wL;!c1)Y`|(@Zc6J2w}kKIM^(kV6m9t*kVUX
z@mA>dIqQn@?b%Lh4V%8@1BVapNA<29DTy)ZzJb<r1E8&&6!U#R%b9PGNYSVW0KW~6
z;PdbM64GWpfTd+WUVHOHW%dGbdj&p*w@!To_nbe&0i@suWkC?|?g!0i?;Kv2A2u6z
zeswj9ciwNtr|sSA_Lau(1CnzL=DmwJ+1P}iddHLEFKbSKC`st<xr7sMe*&+6C24*$
z9)Kjt7`-xqk3VZgN8fnT{bwwIx%mYQ{XT{-+B(oX;!ar{Y5)X)&$k4gk5YAM0I=*2
zVqwwummdNdGDJ~AEEdC}ZwU*FOSnFH16{pC=pXkW#n*v%=25o0LH*N|3P1&*0#E^{
j08{`f02P1=U<2BprQ~g=09Q>k00000NkvXXu0mjfH-$SR

delta 1288
zcmV+j1^4=~CXfn{8Gix*001Qm=7|6R1lLJKK~#7F?OFq{G)W9jdS=%9+qP}nwoy9U
zw(p8(+qSLWw)Jek)pTypn5s9qo8EghRr}SHv#DhAC7rKlapIM)f}5cOkh>F*5^5Fc
z3IIuWCqUqK3Q4y&G1M~BP3(d>nx>Fx(u98Pd>#$hkVNr>jDN%urB%_w((0_j@|bBF
znr3JMP;CMPwur?O7cU&rppG9LpsXso|778gqq*z$X6`tW>+|SBC`biIoc}b~Argy!
ze8-B$^#Y&>@r3!_`a{ouzAGcY++%1&4l01a=>k$atPEXSFsfVf*?chTu9ts2m0zX{
zOkoofL5eW2bAR*Ku3z-(*L&}Ib)Cl$l%kWEQkDTC0>F}SJ;wBDv*ymXDkAZJTWJ9-
z5TqDQ>jyu$eMOUc!T&%Z=M_*>3SAR#+^~4|buSf{M@a2DO}q@8=O6^UeC?tsmpu!}
zPe7_<kn<es1ibg0G3EUGKl19DODJT)=ss;n_G-Ope}5*aYGUFgsVaFQx?#<@sz_X&
zpdsQ^|MM+JzS(j7PuH3V2fWQ1ggUouIJjHOUn4_Aj;qG?f)o0;U$^%ZkUfQ@DheIS
zEc|HWL2K>_QzoA=ecGKne`wEkO*m-~(TYiZzTR=n(1q<P!6XsO%IXafJi16en-63x
zz3JHEaeuvTSUbTs2Sgm&y_GHy?VFg0vl|01gPOg0J^I_<?@N;Vt}~_r1H*f^PO|9#
z8>2*E>rDWDu<pQu(LIKAZ)HoQ{+*itxcejmI@ZM8Nx~|W*U%n%XT#7Qt-%hRS~X1k
zB7>Zs16CV{mh1PO1O}Qn2q#RbX~MCnCt}WT=6@9d5}e8_ZQZ0U)QI|FpOms@pMuM7
zr9gzz$_RsOI!RI>Xsk94EhT}W3x*jHkhI%INg;)pmZoVoYY+xIlvl;@7r%}b8UOy2
zXPI0%>jr&bhl0`yL>r$v0aFz-@&w{}gPFs7aO!z7w?q?2AXRLmr0l$_j>gYlG?IvH
zSAV*FC-O9b3O+HB1g1o?^%jlAZ#{ilqq;2ZyJ_DkDb?IgOJ<>J^hS|b;;yr1E*#sN
z_bzDL!OVcqqaXnyE`==K$TTT#nm&)Qa9r<;myE3&@-YY6yFcvl8X5rEQb?+klq99>
z(XMINHcb%0(6xFYU#lkddUt5vrFCN)KYx}6c<RGVh+rF@4ot9nc*@`|r_UV@zu+G#
z3=x^Hf8X)korkmhUW0S3qE6Hk5dA3$tU>c%|22<(<oB>*(<OjH3Msikdgr^{JC9}?
z%xe{t>hu6{PCT0zP+U=c+5PW&gkT)%d{GZXOa?i)i2t=)=3eo*5NM6cSrhX^B7bla
z{mjcA%PX#^z3X*iH-W`}!jv;Fee`&C5vJq=2M_|KjzUK=3l?AVbY&#Q{jq~Fs$RR@
z_5A1ez4o1T<nw!gr-=zUX1{_%cK~?)lTCL%`+0RN?)PezF!&VW#!tK{Y7_J?JLZYE
zzS;H4=UWLtAhK1EgJn+F@QL@<g@62Bs1Y0Yo&cbI$8tW|urIkqdJSC&jK&fr<<;4R
zrAM<0cOA~!dN4yEcnlp8P{pSQ?6B}gPzou@l=3$w5g>v<6q*o-kOE-4`8R-@p(D8c
y-zo&PjPxI#z~vNjeFYqrAWfk(g$P`Yp8#a2te0klO|k$0002ovPDHLkU;%=}7<6?2

diff --git a/doc/images/dolibarr_favicon.ico b/doc/images/dolibarr_favicon.ico
index b93a86747d647ddc80784e7d0e0313a9eb5393e6..b0cba0f6af95fb2e270d955b116292e5df8dd3e3 100644
GIT binary patch
literal 2238
zcmeH{SxggA7=;gmOWpUnYgHT(+yytlVnuNmVbDYfmPBHT(FbcKfyzT;h>c16KofZY
z4T&Zas4E7l56X+t6tQRkqef$*C^kmQ4${_p=TaQ0<yB1hC+EL6=R5zM$$c0gh&&1f
zNSEP;43Gl|B_bALiKri_Qlmm}G@3^WQ7X}i1QkvS@zAD4;H)|l+GEMkr5{07Mhf(r
zG-PYk$jMAc-Z>@mvXnS~>Ns*mWx#MI6PI#TxS%@?vmp+~Y%PpAI#@0qhRL8Oo*o4z
zBdphwam8Z7RiYw`ne5FdzMPNig#{=nF2v&pYE(U>(%@cM3CgXdD8E^X`?t#Qq)La1
zJ62Q@+3w!PBU=T@SCXs^4tqWv)fT+4KP7sG+UIuE)>Pw_qXu;^9eC4FM^uluRIlst
zPE-Rvet3_sjh~1<qv=Z{oZp)8-RXp@`3G8D%|tG=wz$yV)`pIbc64{OqN}qLJw4s%
z?fnV2+YOJ$1Fx6L8|bQs{oxxJayJn4U(~EHT8ar_%flCs|H~Jz6lg^)5SN{+M+}Vo
z!3AOWy#4?uRv%v|&Xaa1l=;5ScyvD(5*PW9WIpCM7xs>n2H1Se%uQS368qk<&Yy3k
zmMoG5b_L)Zw~+;=NdoMAah~HQGrlAc=Muy~ctCz|a6XouAL2K!WX=Z0XZZ10>P+3t
z@E!@~*!Le$ZQl{kXp*qTpEE@I{s?}>>_PZ?p44bbfSvD~PokKYi#%AYRX)VlWt2~1
lXdvIWZS9olOL>021P70q%WBRzi1sM?L@6G^`+xmI`UM*J73}~3

literal 2238
zcmeH{X;9Q<9LK+A2VG>DR+_rF92*d*T)HS;g%%<L?s8v(%B370ENdvRuqPm_paQ%5
z2N77Ap;2p8veXnyrwNZSI%FmsB6#CCT27h<J^OpynS9~w%X-mg=lA^n-|y#nwez1p
zFoFF<BCyj5RwrO800|pbVF?>s|0EQvrejC=G$_Mopky_Bj+lv(H6rYcazSbIY&K$)
zuN9+GCPKMPj0%}6)N&W7<ZjT!us+5e`dBe^v98d@xv_DFI?e+cHhT7~jhCP*f!#^)
zfG$CT>O=|jiJmYdc|nupi<)FlR403*E=7Xc6fe}Jdcv6Mjha*+7}LB^o92r>X+Ee=
zXE}Wi4C?|>pTW9}xoBAL2jhky?Az$a#vl7L1K0$@oIMW>SyHzB(UctsQ%(??bLK<H
z4S;#m0$4UnA+Tx53r1^xFb)(fLPP!vv=xS+u^<%9g`sHQx)_aH!qB;GDXc}y(6l`Q
zU5e#sX1hbd?i5A9tcZk35e2JqB`n2}=un2iR2&UK8HJV-IXZXA@UcpUZj~H|)p0ni
zu}wUz`b>1`vvA0ejU!bV=-!=&W5!$@HRj{!UIluZigDajiWBBi95<J-U4|Z^44<`>
z<7A5ppSM=vivyK7)mDkqZEBo8sKyyKU$$#;rd@}#9a^00)S=g^!+EP7UmY^w>#izX
z?5;&`cRjxO)P%mCR$MuG5Z6w1;M%z(=s*7n2CtmO;MHCXes=*w{TFbf|00Hd_!dJy
z_TiVG`Y=p$3B%Vf;n(YzF*?BZz-5fE86LQb(ZTO=YvgC#8ohx#H%D;y_D$UT{Wk91
zy~E}=Jh=Y{9{hP9e?5GNv9U3XkB>j;wfw*TkNg8qIpAprJmY|89q=6Cy><;_*{qbb
zqz|1Y@Q$C)6Pbby<0@KvGA8oYb~+OqNN88nvIzTDyvTcJ=Sjpy61oUlf?yGnU*clY
z6e5fJs7Ib%kaIERO(L6wUS{`##Wa<h8AJ~E?^SB{+OK>xoy<%kms-OsuTOq?PC38P
z^a2?dViR>$Z`i_XW&FbXWZa3(R8>!-5XgNx1qqQyRn6NJUTvn7Pr-{Q;9f-Gtwu^)
zDfkeD)YOW3q9ClN;7e?ws?N<8-YMZehRi%-8&x&4-}UtH-^sPvm5d*;ox1(13Uvdw
zg0O2YnfXMKy|r(PS;~!+P}uuN+ajcLAzermKkhBUx&>S;3?Y<{``yutcpnn7nAq_T
rUtby*#9Q0Bl!#1BAmU@g1A>?Ej-SgN5bA)H4*0+UVGj7WKQn&=2N5!r


From bd35b9aad24228e4a212fd584140159ba0531e29 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 13:54:53 +0200
Subject: [PATCH 700/928] Fix missing FORCEMORPHY in new member form setup

---
 htdocs/adherents/admin/website.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 4df95e06e52..ba812876a38 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -182,6 +182,16 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, count($listofval) > 1 ? 1 : 0);
 	print "</td></tr>\n";
 
+	// Force nature of member (mor/phy)
+	$morphys["phy"] = $langs->trans("Physical");
+	$morphys["mor"] = $langs->trans("Moral");
+	print '<tr class="oddeven drag" id="trforcenature"><td>';
+	print $langs->trans("ForceMemberNature");
+	print '</td><td class="right">';
+	$forcenature = empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY) ? 0 : $conf->global->MEMBER_NEWFORM_FORCEMORPHY;	
+	print $form->selectarray("MEMBER_NEWFORM_FORCEMORPHY", $morphys, $forcenature, 1);
+	print "</td></tr>\n";
+
 	// Amount
 	print '<tr class="oddeven" id="tramount"><td>';
 	print $langs->trans("DefaultAmount");

From cbac815c66a9832db9d010617d577cd56ae27413 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 7 May 2021 11:56:20 +0000
Subject: [PATCH 701/928] Fixing style errors.

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

diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index ba812876a38..f4d4983e25b 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -188,7 +188,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '<tr class="oddeven drag" id="trforcenature"><td>';
 	print $langs->trans("ForceMemberNature");
 	print '</td><td class="right">';
-	$forcenature = empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY) ? 0 : $conf->global->MEMBER_NEWFORM_FORCEMORPHY;	
+	$forcenature = empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY) ? 0 : $conf->global->MEMBER_NEWFORM_FORCEMORPHY;
 	print $form->selectarray("MEMBER_NEWFORM_FORCEMORPHY", $morphys, $forcenature, 1);
 	print "</td></tr>\n";
 

From c61383baf7ffec2044b16344a00742e947380f5d Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 14:04:55 +0200
Subject: [PATCH 702/928] Update members.lang

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

diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 6f5e47591f3..2c4409caa88 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -214,3 +214,4 @@ MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
 XExternalUserCreated=%s external user(s) created
+ForceMemberNature=Force member nature (Individual or Corporation)

From ff14d2817dc79f662a9150c85f8e8f1f4c054d3f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 14:08:39 +0200
Subject: [PATCH 703/928] css

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

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index fca55ac7c44..0ac40741ab3 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -403,7 +403,7 @@ print '</tr>';
 
 // Show bugtrack link
 print '<tr class="oddeven"><td>'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
-print '<input type="text" name="MAIN_BUGTRACK_ENABLELINK" size="32" value="'.(isset($conf->global->MAIN_BUGTRACK_ENABLELINK) ? $conf->global->MAIN_BUGTRACK_ENABLELINK : '').'">';
+print '<input type="text" name="MAIN_BUGTRACK_ENABLELINK" value="'.(empty($conf->global->MAIN_BUGTRACK_ENABLELINK) ? '' : $conf->global->MAIN_BUGTRACK_ENABLELINK).'">';
 print '</td>';
 print '<td width="20">&nbsp;</td>';
 print '</tr>';

From 61786d328f8489fcb68beeedad61b2f869bff570 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 14:09:35 +0200
Subject: [PATCH 704/928] Update members.lang

---
 htdocs/langs/fr_FR/members.lang | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 9126589281e..8cd437794d7 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -83,10 +83,10 @@ WelcomeEMail=Email de bienvenue
 SubscriptionRequired=Soumis à cotisation
 DeleteType=Supprimer
 VoteAllowed=Vote autorisé
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
+Physical=Personne physique
+Moral=Personne morale
+MorAndPhy=Personne physique et personne morale
+Reenable=Réactivé
 ExcludeMember=Exclure un adhérent
 ConfirmExcludeMember=Êtes-vous sûr de vouloir exclure cet adhérent ?
 ResiliateMember=Résilier un adhérent
@@ -213,3 +213,4 @@ SendReminderForExpiredSubscription=Envoyer un rappel par e-mail aux membres lors
 MembershipPaid=Adhésion payée pour la période en cours (jusqu'au %s)
 YouMayFindYourInvoiceInThisEmail=Vous pouvez trouver votre facture jointe à cet email
 XMembersClosed=%s adhérent(s) résilié(s)
+ForceMemberNature=Forcer la nature du membre (Personne physique ou personne morale)

From 1cf46f9ae94293f603a3b56d5716fdc4dd2bcb58 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 15:11:28 +0200
Subject: [PATCH 705/928] cast int

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9b224200060..011dd3dcce5 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1518,7 +1518,7 @@ class Societe extends CommonObject
 
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
 		if ($rowid) {
-			$sql .= ' AND s.rowid = '.$rowid;
+			$sql .= ' AND s.rowid = '.((int) $rowid);
 		}
 		if ($ref) {
 			$sql .= " AND s.nom = '".$this->db->escape($ref)."'";

From fa73fde312cd7b4fae03882e608cc2afe3f1689d Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Fri, 7 May 2021 15:12:23 +0200
Subject: [PATCH 706/928] phone_head_document

---
 htdocs/comm/propal/card.php    | 1 +
 htdocs/commande/card.php       | 1 +
 htdocs/compta/facture/card.php | 1 +
 htdocs/projet/card.php         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 229303849f0..8039e3361ec 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1991,6 +1991,7 @@ if ($action == 'create') {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
+		$morehtmlref .= '<br>'.$langs->trans("Phone").' : '.dol_print_phone($object->thirdparty->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone');
 	}
 	// Project
 	if (!empty($conf->projet->enabled)) {
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f63b02c035e..01ad66a0af6 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2020,6 +2020,7 @@ if ($action == 'create' && $usercancreate) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
 		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
+			$morehtmlref .= '<br>'.$langs->trans("Phone").' : '.dol_print_phone($object->thirdparty->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone');
 		}
 		// Project
 		if (!empty($conf->projet->enabled)) {
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 252b8ac65a2..b4126f1434c 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4157,6 +4157,7 @@ if ($action == 'create') {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		$morehtmlref .= '<br>'.$langs->trans("Phone").' : '.dol_print_phone($object->thirdparty->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone');
 	}
 	// Project
 	if (!empty($conf->projet->enabled)) {
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 3c2d5b02829..c6fb5d5963b 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -992,6 +992,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : ';
 		if ($object->thirdparty->id > 0) {
 			$morehtmlref .= $object->thirdparty->getNomUrl(1, 'project');
+			$morehtmlref .= '<br>'.$langs->trans("Phone").' : '.dol_print_phone($object->thirdparty->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone');
 		}
 		$morehtmlref .= '</div>';
 

From 8e61fc44faf3cec69ad1bce7c273c65bb5677656 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Fri, 7 May 2021 15:34:11 +0200
Subject: [PATCH 707/928] =?UTF-8?q?traceability=20must=20be=20a=20choice?=
 =?UTF-8?q?=20and=20we=E2=80=99ll=20see=20later=20about=20commisioning=20d?=
 =?UTF-8?q?ate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/product/card.php                  | 6 +++---
 htdocs/product/stock/productlot_card.php | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 352a66e42cc..4839f26772f 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1299,7 +1299,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</tr>';
 		}
 		// Traceability
-		if ( empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+		if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
 			print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth100onsmartphone" value="'.GETPOST('lifetime').'"></td></tr>';
 			print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth100onsmartphone" value="'.GETPOST('qc_frequency').'"></td></tr>';
 		}
@@ -1802,7 +1802,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Traceability
-			if ( empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+			if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
 				print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth100onsmartphone" value="'.$object->lifetime.'"></td></tr>';
 				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth100onsmartphone" value="'.$object->qc_frequency.'"></td></tr>';
 			}
@@ -2285,7 +2285,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Traceability
-			if ( empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+			if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
 				print '<tr><td>'.$langs->trans("LifeTime").'</td><td colspan="2">'.$object->lifetime.'</td></tr>';
 				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td colspan="2">'.$object->qc_frequency.'</td></tr>';
 			}
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 2c3d0ebee08..8e311c185bb 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -484,7 +484,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Traceability info
-	if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+	if (!empty($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY)) {
 		print '<tr><td>'.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
@@ -494,9 +494,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<tr><td>'.$form->editfieldkey($langs->trans('DestructionDate'), 'scrapping_date', $object->scrapping_date, $object, $user->rights->stock->creer).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('DestructionDate'), 'scrapping_date', $object->scrapping_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
-		print '<tr><td>'.$form->editfieldkey($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer).'</td>';
-		print '<td>'.$form->editfieldval($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
-		print '</tr>';
+		// print '<tr><td>'.$form->editfieldkey($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer).'</td>';
+		// print '<td>'.$form->editfieldval($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
+		// print '</tr>';
 		print '<tr><td>'.$form->editfieldkey($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'numeric').'</td>';
 		print '</tr>';

From 6d92eb2e84435ae63b30c607fd1c0b0f6a87c62b Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Fri, 7 May 2021 15:38:46 +0200
Subject: [PATCH 708/928] little correction

---
 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 8e311c185bb..a468a302698 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -484,7 +484,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Traceability info
-	if (!empty($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY)) {
+	if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
 		print '<tr><td>'.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';

From 61f8a03df636d9cc0d68565b444a33d44824e597 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Fri, 7 May 2021 15:41:48 +0200
Subject: [PATCH 709/928] commisionning_date out, we said

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

diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index a468a302698..909782bdbc5 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -194,7 +194,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setcommissionning_date' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
+	/* if ($action == 'setcommissionning_date' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('commissionning_datemonth', 'int'), GETPOST('commissionning_dateday', 'int'), GETPOST('commissionning_dateyear', 'int'));
 		$result = $object->setValueFrom('commissionning_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -203,7 +203,7 @@ if (empty($reshook)) {
 		} else {
 			$action = 'view';
 		}
-	}
+	} */
 
 	if ($action == 'setqc_frequency' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
 		$result = $object->setValueFrom('qc_frequency', GETPOST('qc_frequency'), '', null, 'int', '', $user, 'PRODUCT_MODIFY');

From 0466704dc73b56c1121d129cf25e8d4aca71a084 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 7 May 2021 15:49:49 +0200
Subject: [PATCH 710/928] Fix #17477 : Sql error in invoices cards

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 625e8e23d57..39a7a247e18 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7693,7 +7693,7 @@ class Form
 				'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'contrat'=>array('enabled'=>$conf->contrat->enabled, 'perms'=>1, 'label'=>'LinkToContract',
-								'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').')'),
+								'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY t.rowid'),
 				'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('intervention').')'),
 				'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled, 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('supplier_proposal').')'),
 				'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled, 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('commande_fournisseur').')'),

From 97ca6895d867d1c8d98b471dbdb4ebe262fa897d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 15:50:07 +0200
Subject: [PATCH 711/928] Missing profid1 and 2 in get API

---
 htdocs/webservices/server_thirdparty.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index c81b6bc6f63..1d8446f1659 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -210,7 +210,7 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 $server->register(
 	'getThirdParty',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string', 'barcode'=>'xsd:string', 'profid1'=>'xsd:string', 'profid2'=>'xsd:string'),
 	// Exit values
 	array('result'=>'tns:result', 'thirdparty'=>'tns:thirdparty'),
 	$ns,
@@ -286,13 +286,16 @@ $server->register(
  * @param	string		$id		    		internal id
  * @param	string		$ref		    	internal reference
  * @param	string		$ref_ext	   		external reference
+ * @param	string		$barcode	   		barcode
+ * @param	string		$profid1	   		profid1
+ * @param	string		$profid2	   		profid2
  * @return	array							Array result
  */
-function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
+function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '', $barcode = '', $profid1 = '', $profid2 = '')
 {
 	global $db, $conf;
 
-	dol_syslog("Function: getThirdParty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+	dol_syslog("Function: getThirdParty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext." barcode=".$barcode." profid1=".$profid1." profid2=".$profid2);
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
@@ -317,7 +320,7 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 		if ($fuser->rights->societe->lire)
 		{
 			$thirdparty = new Societe($db);
-			$result = $thirdparty->fetch($id, $ref, $ref_ext);
+			$result = $thirdparty->fetch($id, $ref, $ref_ext, $barcode, $profid1, $profid2);
 			if ($result > 0) {
 				$thirdparty_result_fields = array(
 						'id' => $thirdparty->id,

From f05416903634a9fa08c23861a0aa3008bd0fa077 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 7 May 2021 15:56:33 +0200
Subject: [PATCH 712/928] revert of last push error of branch

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 39a7a247e18..625e8e23d57 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7693,7 +7693,7 @@ class Form
 				'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'contrat'=>array('enabled'=>$conf->contrat->enabled, 'perms'=>1, 'label'=>'LinkToContract',
-								'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY t.rowid'),
+								'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').')'),
 				'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('intervention').')'),
 				'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled, 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('supplier_proposal').')'),
 				'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled, 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('commande_fournisseur').')'),

From 4db618cb6d8ed8673f3a8f680f23165184c95deb Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 7 May 2021 15:58:50 +0200
Subject: [PATCH 713/928]  Fix Dolibarr#17477 : Sql error in invoices cards

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 625e8e23d57..39a7a247e18 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7693,7 +7693,7 @@ class Form
 				'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'contrat'=>array('enabled'=>$conf->contrat->enabled, 'perms'=>1, 'label'=>'LinkToContract',
-								'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').')'),
+								'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY t.rowid'),
 				'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('intervention').')'),
 				'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled, 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('supplier_proposal').')'),
 				'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled, 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('commande_fournisseur').')'),

From c068470bca5f41307ebae6c1db42806e7a310b0e Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 7 May 2021 16:04:39 +0200
Subject: [PATCH 714/928]  Fix Dolibarr#17477 : Sql error in invoices cards 2

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 39a7a247e18..27bb5c5c8e5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7693,7 +7693,7 @@ class Form
 				'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'contrat'=>array('enabled'=>$conf->contrat->enabled, 'perms'=>1, 'label'=>'LinkToContract',
-								'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY t.rowid'),
+				'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY t.rowid'),
 				'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('intervention').')'),
 				'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled, 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('supplier_proposal').')'),
 				'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled, 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('commande_fournisseur').')'),

From 2c8da5703f65748fa446eb9180859afcd3aebade Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 16:52:44 +0200
Subject: [PATCH 715/928] Fix Wrong test for permission in adherent car

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

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 1bf575aeb8a..0d1c22c4e60 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1891,7 +1891,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}*/
 
 				// Modify
-				if (!$user->rights->adherent->creer) {
+				if ($user->rights->adherent->creer) {
 					print '<a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
 				} else {
 					print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</span>'."\n";

From 0173d8db5f9e3f1162303d0424c430ec59ca0296 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 17:09:59 +0200
Subject: [PATCH 716/928] Add substitution key for membernewform url in mailing

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index ce260a44a35..7c1d0542334 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -244,6 +244,9 @@ if (empty($reshook)) {
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
 							}
 						}
+						if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
+							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM___'] = '<a target="_blank" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php">'.$langs->trans('BlankSubscriptionForm').'</a>';
+						}
 						/* For backward compatibility, deprecated */
 						if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) {
 							$substitutionarray['__SECUREKEYPAYPAL__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);

From a75d6e905082651f76390cf34079f88a9be82fac Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 17:14:33 +0200
Subject: [PATCH 717/928] Add tooltip

---
 htdocs/core/class/html.formmail.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 96f6ee0a741..16c17f5a386 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1633,6 +1633,9 @@ class FormMail extends Form
 				$vars['__SECUREKEYPAYMENT_CONTRACTLINE__']='';
 				*/
 			}
+			if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
+				$substitutionarray['__PUBLICLINK_NEWMEMBERFORM___'] = 'BlankSubscriptionForm';
+			}
 		}
 
 		foreach ($tmparray as $key => $val) {

From bfac47c84e4ac79baa969fd62c3217fb1b1303a9 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 17:16:58 +0200
Subject: [PATCH 718/928] Too much underscore

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 16c17f5a386..a9da488907d 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1634,7 +1634,7 @@ class FormMail extends Form
 				*/
 			}
 			if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
-				$substitutionarray['__PUBLICLINK_NEWMEMBERFORM___'] = 'BlankSubscriptionForm';
+				$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = 'BlankSubscriptionForm';
 			}
 		}
 

From 7c27e9f931266557ced81b3255f3499ece51b15a Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 17:19:33 +0200
Subject: [PATCH 719/928] too much underscore

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 7c1d0542334..afbff9a770b 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -245,7 +245,7 @@ if (empty($reshook)) {
 							}
 						}
 						if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
-							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM___'] = '<a target="_blank" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php">'.$langs->trans('BlankSubscriptionForm').'</a>';
+							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php">'.$langs->trans('BlankSubscriptionForm').'</a>';
 						}
 						/* For backward compatibility, deprecated */
 						if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) {

From 907ea1a8bdd253b5f5aa93e981246aee9cab9aed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 18:21:11 +0200
Subject: [PATCH 720/928] Fix sql error

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 75738abc3d4..a35fa9e0f14 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1689,8 +1689,7 @@ class Account extends CommonObject
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank_url SET url_id = ".((int) $dest_id)." WHERE url_id = ".((int) $origin_id)." AND type='company'";
 
-		if (!$db->query($sql))
-		{
+		if (! $db->query($sql)) {
 			//if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
 			//$this->errors = $db->lasterror();
 			return false;

From f5e1cd5fccd7a3bc0602c36de1383141d446da39 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 18:22:18 +0200
Subject: [PATCH 721/928] Fix phpunit

---
 test/phpunit/CodingPhpTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index c18987b8931..847021620bf 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -191,7 +191,8 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             		'multicurrency.class.php',
             		'productbatch.class.php',
             		'reception.class.php',
-            		'societe.class.php'
+            		'societe.class.php',
+            		'account.class.php'
             	))) {
 	            	// Must must not found $db->
 	            	$ok=true;

From 35c8bb6b299519fc89ad8f92c4190b4572242091 Mon Sep 17 00:00:00 2001
From: antonin_tdj <50403308+ibuiv@users.noreply.github.com>
Date: Fri, 7 May 2021 18:28:30 +0200
Subject: [PATCH 722/928] fix bug PMP per entity

wrong alias in SQL query
---
 htdocs/product/class/product.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5d622c05c29..29e97aaf4f9 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2208,7 +2208,7 @@ class Product extends CommonObject
 			$sql .= " p.stock,";
 		}
 		if ($separatedEntityPMP) {
-			$sql .= " pa.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
+			$sql .= " ppe.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		} else {
 			$sql .= " p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		}

From 1d38dc11c6c376b46b89bb0b0eb77c3d0d695fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 7 May 2021 21:28:35 +0200
Subject: [PATCH 723/928] uniformize supplier cards

---
 htdocs/compta/facture/prelevement.php | 16 +++++-----------
 htdocs/fourn/facture/card.php         | 12 +++---------
 htdocs/fourn/facture/contact.php      | 27 ++++++++++++---------------
 htdocs/fourn/facture/document.php     | 26 +++++++++++---------------
 htdocs/fourn/facture/note.php         | 21 +++++++++------------
 5 files changed, 40 insertions(+), 62 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 719c92ca6f0..a7262b7c398 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -315,23 +315,17 @@ if ($object->id > 0) {
 
 	$facidavoir = $object->getListIdAvoirFromInvoice();
 	if (count($facidavoir) > 0) {
-		print ' ('.$langs->transnoentities("InvoiceHasAvoir");
-		$i = 0;
-		foreach ($facidavoir as $id) {
-			if ($i == 0) {
-				print ' ';
-			} else {
-				print ',';
-			}
+		$invoicecredits = array();
+		foreach ($facidavoir as $facid) {
 			if ($type == 'bank-transfer') {
 				$facavoir = new FactureFournisseur($db);
 			} else {
 				$facavoir = new Facture($db);
 			}
-			$facavoir->fetch($id);
-			print $facavoir->getNomUrl(1);
+			$facavoir->fetch($facid);
+			$invoicecredits[] = $facavoir->getNomUrl(1);
 		}
-		print ')';
+		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
 	}
 	/*
 	if ($facidnext > 0)
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index fc18bbc5501..7a09e9393bb 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2695,19 +2695,13 @@ if ($action == 'create') {
 
 		$facidavoir = $object->getListIdAvoirFromInvoice();
 		if (count($facidavoir) > 0) {
-			print ' ('.$langs->transnoentities("InvoiceHasAvoir");
-			$i = 0;
+			$invoicecredits = array();
 			foreach ($facidavoir as $id) {
-				if ($i == 0) {
-					print ' ';
-				} else {
-					print ',';
-				}
 				$facavoir = new FactureFournisseur($db);
 				$facavoir->fetch($id);
-				print $facavoir->getNomUrl(1);
+				$invoicecredits[] = $facavoir->getNomUrl(1);
 			}
-			print ')';
+			print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
 		}
 		if (isset($facidnext) && $facidnext > 0) {
 			$facthatreplace = new FactureFournisseur($db);
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 236c3cd6948..65471cd59ff 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2005		Patrick Rouillon	<patrick@rouillon.net>
- * Copyright (C) 2005-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
+/* Copyright (C) 2005		Patrick Rouillon		<patrick@rouillon.net>
+ * Copyright (C) 2005-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2017		Ferran Marcet       	<fmarcet@2byte.es>
+ * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -180,7 +181,9 @@ if ($id > 0 || !empty($ref)) {
 
 		// Type
 		print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td colspan="4">';
+		print '<span class="badgeneutral">';
 		print $object->getLibType();
+		print '</span>';
 		if ($object->type == FactureFournisseur::TYPE_REPLACEMENT) {
 			$facreplaced = new FactureFournisseur($db);
 			$facreplaced->fetch($object->fk_facture_source);
@@ -194,19 +197,13 @@ if ($id > 0 || !empty($ref)) {
 
 		$facidavoir = $object->getListIdAvoirFromInvoice();
 		if (count($facidavoir) > 0) {
-			print ' ('.$langs->transnoentities("InvoiceHasAvoir");
-			$i = 0;
-			foreach ($facidavoir as $fid) {
-				if ($i == 0) {
-					print ' ';
-				} else {
-					print ',';
-				}
+			$invoicecredits = array();
+			foreach ($facidavoir as $facid) {
 				$facavoir = new FactureFournisseur($db);
-				$facavoir->fetch($fid);
-				print $facavoir->getNomUrl(1);
+				$facavoir->fetch($facid);
+				$invoicecredits[] = $facavoir->getNomUrl(1);
 			}
-			print ')';
+			print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
 		}
 		if ($facidnext > 0) {
 			$facthatreplace = new FactureFournisseur($db);
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index f75a8bd8ef3..237285d036a 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -5,7 +5,8 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
  * Copyright (C) 2016		Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
+ * Copyright (C) 2017		Ferran Marcet       	<fmarcet@2byte.es>
+ * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -170,7 +171,9 @@ if ($object->id > 0) {
 
 	// Type
 	print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
+	print '<span class="badgeneutral">';
 	print $object->getLibType();
+	print '</span>';
 	if ($object->type == FactureFournisseur::TYPE_REPLACEMENT) {
 		$facreplaced = new FactureFournisseur($db);
 		$facreplaced->fetch($object->fk_facture_source);
@@ -184,24 +187,17 @@ if ($object->id > 0) {
 
 	$facidavoir = $object->getListIdAvoirFromInvoice();
 	if (count($facidavoir) > 0) {
-		print ' ('.$langs->transnoentities("InvoiceHasAvoir");
-		$i = 0;
-		foreach ($facidavoir as $id) {
-			if ($i == 0) {
-				print ' ';
-			} else {
-				print ',';
-			}
+		$invoicecredits = array();
+		foreach ($facidavoir as $facid) {
 			$facavoir = new FactureFournisseur($db);
-			$facavoir->fetch($id);
-			print $facavoir->getNomUrl(1);
+			$facavoir->fetch($facid);
+			$invoicecredits[] = $facavoir->getNomUrl(1);
 		}
-		print ')';
+		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
 	}
 	/*
-	if ($facidnext > 0)
-	{
-		$facthatreplace=new FactureFournisseur($db);
+	if ($facidnext > 0) {
+		$facthatreplace = new FactureFournisseur($db);
 		$facthatreplace->fetch($facidnext);
 		print ' ('.$langs->transnoentities("ReplacedByInvoice",$facthatreplace->getNomUrl(1)).')';
 	}
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 2f749af54f7..5bbf1fdcba6 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -3,7 +3,8 @@
  * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
+ * Copyright (C) 2017      	Ferran Marcet       	<fmarcet@2byte.es>
+ * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -144,7 +145,9 @@ if ($object->id > 0) {
 
 	// Type
 	print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
+	print '<span class="badgeneutral">';
 	print $object->getLibType();
+	print '</span>';
 	if ($object->type == FactureFournisseur::TYPE_REPLACEMENT) {
 		$facreplaced = new FactureFournisseur($db);
 		$facreplaced->fetch($object->fk_facture_source);
@@ -158,19 +161,13 @@ if ($object->id > 0) {
 
 	$facidavoir = $object->getListIdAvoirFromInvoice();
 	if (count($facidavoir) > 0) {
-		print ' ('.$langs->transnoentities("InvoiceHasAvoir");
-		$i = 0;
-		foreach ($facidavoir as $fid) {
-			if ($i == 0) {
-				print ' ';
-			} else {
-				print ',';
-			}
+		$invoicecredits = array();
+		foreach ($facidavoir as $facid) {
 			$facavoir = new FactureFournisseur($db);
-			$facavoir->fetch($fid);
-			print $facavoir->getNomUrl(1);
+			$facavoir->fetch($facid);
+			$invoicecredits[] = $facavoir->getNomUrl(1);
 		}
-		print ')';
+		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
 	}
 	if ($facidnext > 0) {
 		$facthatreplace = new FactureFournisseur($db);

From d04c741a3b40bf6c994930f837bab17f5fd0ba20 Mon Sep 17 00:00:00 2001
From: Alexis LAURIER <a.laurier@kreactive.com>
Date: Sat, 8 May 2021 09:12:17 +0200
Subject: [PATCH 724/928] add payment_fourn delete proper check into
 security.lib

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index a9c6435348e..1607f8df28c 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -372,6 +372,9 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 			} elseif ($feature == 'salaries')
 			{
 				if (!$user->rights->salaries->delete) $deleteok = 0;
+			} elseif ($feature == 'payment_supplier')
+			{
+				if (!$user->rights->fournisseur->facture->creer) { $deleteok = 0; }
 			} elseif (!empty($feature2))							// This is for permissions on 2 levels
 			{
 				foreach ($feature2 as $subfeature)

From 33d68db9a14d3a55a15f5d95481245b14aee0db0 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 8 May 2021 09:18:41 +0200
Subject: [PATCH 725/928] add entity in new subst publiclink_newmemberform

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index afbff9a770b..e843d54f6e8 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -245,7 +245,7 @@ if (empty($reshook)) {
 							}
 						}
 						if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
-							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php">'.$langs->trans('BlankSubscriptionForm').'</a>';
+							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((!empty($conf->multicompany->enabled)) ? = '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm'). '</a>';
 						}
 						/* For backward compatibility, deprecated */
 						if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) {

From 2e1158934bebf9e8b798b76e458ab648bef9c6f1 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 8 May 2021 09:20:59 +0200
Subject: [PATCH 726/928] Copyright

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index e843d54f6e8..eedf2fdd5d9 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2005-2019	Laurent Destailleur		<eldy@uers.sourceforge.net>
  * Copyright (C) 2005-2016	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2021		Waël Almoman            <info@almoman.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 22d9c4c1662b608165d7d7e1b3b37d12d58dfd89 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sat, 8 May 2021 09:35:41 +0200
Subject: [PATCH 727/928] Update card.php

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index eedf2fdd5d9..42bac2af7e5 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -246,7 +246,7 @@ if (empty($reshook)) {
 							}
 						}
 						if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
-							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((!empty($conf->multicompany->enabled)) ? = '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm'). '</a>';
+							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((!empty($conf->multicompany->enabled)) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm'). '</a>';
 						}
 						/* For backward compatibility, deprecated */
 						if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) {

From e4a430f638046be74b430ef8e591bb7f16a14528 Mon Sep 17 00:00:00 2001
From: Alexis LAURIER <a.laurier@kreactive.com>
Date: Sat, 8 May 2021 10:24:08 +0200
Subject: [PATCH 728/928] add entity check on verif_dispo
 mod_codeclient_elephant

---
 htdocs/core/modules/societe/mod_codeclient_elephant.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 18947732b16..ed1cf31216b 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -330,6 +330,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		if ($type == 1) $sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
 		else $sql .= " WHERE code_client = '".$db->escape($code)."'";
 		if ($soc->id > 0) $sql .= " AND rowid <> ".$soc->id;
+		$sql .= " AND entity IN (".getEntity('societe').")";
 
 		$resql = $db->query($sql);
 		if ($resql)

From f527d5e103c05262d041cf002a88f461194d44f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 May 2021 10:38:11 +0200
Subject: [PATCH 729/928] typo

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

diff --git a/ChangeLog b/ChangeLog
index 069fb617ec8..4b4b799db3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,7 @@ English Dolibarr ChangeLog
 For users:
 ----------
 NEW: Feature to make inventories
-NEW: Several security issues after a second private bug bounty campaign. 
+NEW: Several security issues after a second private bug hunting campaign. 
 NEW: Add a security center page with all information and advices related to the security of your instance 
 NEW: Add a performance center page with all information and advices related to the performance of your instance 
 NEW: A lot of fix into english text after a small proofreading campaign (still not perfect, but really better)

From bb1f9fc86d3cf2d7097e740670d91f9d84c3beef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 May 2021 10:40:01 +0200
Subject: [PATCH 730/928] typo

---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b4b799db3a..a23cd2523df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,12 +15,12 @@ NEW: A lot of fix into english text after a small proofreading campaign (still n
 NEW: All main menu entries are using the picto of the module
 NEW: Accountancy - Add closure menu
 NEW: Accountancy - Add FEC import
-NEW: Accountancy - Add formconfirm with options on export
+NEW: Accountancy - Add a confirmation form with options on export
 NEW: Accountancy - Add select date from/to in already bind customer and supplier list
 NEW: Accountancy - Format FEC - Add new field DateLimitReglmt
 NEW: Accountancy - In ledger & journals, show link on bank transaction
 NEW: Accountancy - Possibility to filter on journals in balance
-NEW: Accountancy - Add a page to list subledger accounts on product/company
+NEW: Accountancy - Add a page to list subledger accounts
 NEW: add the Channel column into the list of orders
 NEW: Add a check to avoid an invoice date in the future
 NEW: Add some color and picto for the direction of movement

From b7535d26b20a50fe73e8d9e3c2060d98a1dfbde5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 May 2021 11:07:38 +0200
Subject: [PATCH 731/928] Update doc

---
 ChangeLog | 76 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 36 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a23cd2523df..be122b15105 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,9 +28,9 @@ NEW: Add the column "alias" of company in the list of proposal, order, invoice
 NEW: Add the column "Office phone" and  "User mobile" in user list
 NEW: Add the column "Price level"in thirdparty list
 NEW: Add some company information in the dropdown login menu
-NEW: Add constant MAIN_BUGTRACK_URL to set url to redirect to on link "declare a bug"
+NEW: Add constant MAIN_BUGTRACK_URL to set a custom url to redirect to when clicking on link "declare a bug"
 NEW: Add contact tag and bulk email status on the thirparty+contact create form
-NEW: Add db fields note_public note_private for ECM module
+NEW: Add db fields note_public and note_private for ECM module
 NEW: Manage deposit on supplier invoice (& somes ajustments)
 NEW: Add edit/delete action icons on categories list pages
 NEW: Add hidden option to auto load input line extrafield into new lines
@@ -38,28 +38,24 @@ NEW: Add import profile to import BOM
 NEW: Add last date of modification for website pages in the list of pages
 NEW: Add link picto to the stock movement on the detail of production
 NEW: Add mass action "Set tag" for product/service, user, thirdparty, warehouse, project, bank account, members
-NEW: Add Mass action order validate and set to billed
-NEW: add massActions to set a commercial proposal to status "Refused"
-NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD and SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
-NEW: Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP
+NEW: Add bulk action Validate and Set to billed on order list.
+NEW: add bulk action to set a commercial proposal to status "Refused"
+NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD and SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD to make generated doc automatically shared.
+NEW: Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP to define list of IPs that are local IPs
 NEW: Add option SOCIETE_DISABLE_WORKFORCE to hide staff field
-NEW: Add pagination at Get Products response
-NEW: Add new permission "Export website"
+NEW: Add a new permission "Export website"
 NEW: Add possibility to exports userGroups fields on user exports
 NEW: Add price min and price min including tax into product export
 NEW: Can search on lots or serials into the quick search bar
 NEW: Add support for Friday as a non working day
-NEW: Add a total in agent margin & uniformize code
-NEW: add total margin in invoice list
-NEW: Can set a Warehouse on Thirparty
+NEW: Add a total in page of margin by user
+NEW: Add the total of margin in invoice list
+NEW: Can set a Warehouse on a Thirparty
 NEW: auto notification with module Notification can use templated emails
-NEW: Bank Entries : add verif fk_user addPaymentToBank Social Contribution
 NEW: Bank Entries : display user linked to a salary or a taxes
-NEW: better date_valid on invoice
-NEW: Can ask the warehouse in proposal
+NEW: Can set a warehouse in a proposal
 NEW: Can clone a cron job.
-NEW: Can create a lot from list
-NEW: Can edit object in module builder
+NEW: Can create a lot from the list view (Look and feel standardization).
 NEW: Can filter files in GED on status Shared/Not shared
 NEW: Can filter on extrafields date on lists
 NEW: Can filter on rowid in list of blocked logs.
@@ -68,64 +64,58 @@ NEW: Can set an employee on each social contribution
 NEW: Can set a percentage when creating an invoice from another object
 NEW: Can set if a ticket group is visible on public interface or not.
 NEW: Can set order of execution of hooks
-NEW: Can show the holidays on the agenda view.
-NEW: Can show the project ref or label into PDF documents
+NEW: Can show the leave dates/holidays on the agenda view.
+NEW: Can show the project ref into PDF documents
 NEW: Can toggle FCKeditor on public/private notes
 NEW: Can use captcha on public page to create a ticket
-NEW: Check update for externals modules using button on module page
-NEW: choose lines while creating intervention card from origin
-NEW: Column shippement method, payment mode, payment term in propal and order list
-NEW: Conf for default actiomm status when created from card
-NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
-NEW: customer price customer ref: push back to v14
+NEW: Check update availability for externals modules using a button on module page
+NEW: Choose lines to use while creating intervention card from origin
+NEW: Column shippement method, payment mode, payment term in proposal and order list
+NEW: Conf for default actiomm status
 NEW: customer ref for product customer prices
 NEW: date and user signature on proposal (Issue 16062)
-NEW: Dictionary for availability - Add column position
+NEW: Dictionary for availability - Add a column position
 NEW: TAKEPOS delayed payment in TakePOS
 NEW: TAKEPOS display date range if exist in TakePOS
 NEW: TAKEPOS display resiliate status in TakePOS for member
 NEW: TAKEPOS Edit sales lines rights in TakePOS
-NEW: Extrafields of documents lines are inside the lines, not any more on separate TR
+NEW: TAKEPOS Option for Takepos to show the total price without tax
+NEW: TAKEPOS More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
 NEW: Can set a user related to a social contribution
 NEW: ICS Direct debit can be set with a different value for each bank account
 NEW: LDAP: usergroup search can be filtered
 NEW: Make public bookmarks editable by admin users only
-NEW: If no logo defined, can use the squarred logo on login page
+NEW: If main logo not defined, can use the squarred logo on login page
 NEW: The manifest file can use the squared image if available
-NEW: Add buld actions for Bank Transfer
+NEW: Add bulk actions for Bank Transfer
 NEW: Enhance the multicurrency rate editor
-NEW: migration script
-NEW: More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
 NEW: Multiselect ledger account code filter on book keeping list
 NEW: Normalyse Type company field with ajax combobox
-NEW: TAKEPOS: option for Takepos to show the total price without tax
 NEW: option to automatically close an open project when all its tasks are done (=progress 100%)
 NEW: option to select membership type on the online payment page for membership subscription or renewal
 NEW: preload product description on selection for customer propal/order/invoice
 NEW: Add a ref in product customer price
 NEW: Save old page with .old extension on disk when editing a website page
 NEW: Search usergroups & resources
-NEW: Set status of all variant when setting status of parent
-NEW: Setup Page for module create with module builder enhancement #FoundationFunding
+NEW: Set status of all variants when changing status of parent
+NEW: Setup Page for module creation with module builder enhancement #FoundationFunding
 NEW: Show picto of module into the list of dictionaries
-NEW: Show the total of payment on the payment confirm page
+NEW: Show the total of payment on the payment confirmation page
 NEW: Stock movement list - Add more complete date field
 NEW: Support color for types of event
-NEW: The setup for Mandatory field can now be done on combo list too.
+NEW: The global setup for Mandatory fields can now be done on combo list too.
 NEW: translate in "en_US" to complete PR 16980
-NEW: unit selection on object edit line
 NEW: Update the list of taxes available by default for France
 NEW: Add captcha on public page to create a ticket
 NEW: Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 NEW: VAT payment request and VAT payment are now 2 different steps in workflow on VAT payment recording
 NEW: VAT report - Optimisation & collapse by rate
-NEW: When we add contacts/users to Project, ask to also affect them on project tasks
+NEW: When we add contacts/users to a project, ask to also affect them on tasks.
 NEW: When a doc file is shared, link is visible from the main page of doc.
-NEW: Workflow to set a shipment as closed.
+NEW: Add option in Workflow module to set a shipment as closed.
 NEW: Option to automatically create a login/user when a new subscription of a member is done online
 NEW: #16378 More E-Mail Contact substitution Values for better salutation
-NEW: #13739 #17390 Product API route added to get product stock and product with or without variants
-NEW: option to leave the "Automatically create a total payment" checkbox empty on the tax creation page
+NEW: option to keep the "Automatically create a total payment" checkbox empty on the tax creation page
 NEW: #17113 Can upload a favicon in website module
 NEW: #17292 default subscription amount by adherent type
 
@@ -135,6 +125,7 @@ NEW: start new module Event Organization Management
 NEW: start new module Partnership Management
 NEW: start new module Knowledge Management
 NEW: start new module Workstations management
+NEW: Can edit an object property in module builder
 NEW: hook printFieldListTitle for cabyprodserv.php
 NEW: Hook to allow external modules to add their own shortlist of recent objects
 NEW: SQL-altering hooks in the turnover by product report
@@ -156,6 +147,11 @@ NEW: API Add option $includeifobjectisused to get a product
 NEW: API Get the list of product ids only
 NEW: Can set a target image in dolcropresize function.
 NEW: Can set a label as placeholder for combo lists.
+NEW: Add pagination on Get Products response API
+NEW: Add the DefaultValues CRUD class
+NEW: Extrafields of documents lines are inside the lines, not any more on separate TR
+NEW: unit selection on object edit line
+NEW: #13739 #17390 Product API route added to get product stock and product with or without variants
 
 
 WARNING:

From 0271645d8efd5815bbb2d8750c76e8b27ee974be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 May 2021 11:08:28 +0200
Subject: [PATCH 732/928] Typo

---
 ChangeLog | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index be122b15105..7a2cf7c2c45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -118,13 +118,14 @@ NEW: #16378 More E-Mail Contact substitution Values for better salutation
 NEW: option to keep the "Automatically create a total payment" checkbox empty on the tax creation page
 NEW: #17113 Can upload a favicon in website module
 NEW: #17292 default subscription amount by adherent type
+NEW: start new experimental module Event Organization Management
+NEW: start new experimental module Partnership Management
+NEW: start new experimental module Knowledge Management
+NEW: start new experimental module Workstations management
+
 
 For developers:
 ---------------
-NEW: start new module Event Organization Management
-NEW: start new module Partnership Management
-NEW: start new module Knowledge Management
-NEW: start new module Workstations management
 NEW: Can edit an object property in module builder
 NEW: hook printFieldListTitle for cabyprodserv.php
 NEW: Hook to allow external modules to add their own shortlist of recent objects

From a6267a8ade4b30a6ace5b91d5fdbe6c6c052fa4a Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Sat, 8 May 2021 11:43:46 +0200
Subject: [PATCH 733/928] add (hooks) init hooks on all tabs for supplier order

---
 htdocs/fourn/commande/contact.php      | 1 +
 htdocs/fourn/commande/document.php     | 1 +
 htdocs/fourn/commande/info.php         | 1 +
 htdocs/fourn/commande/note.php         | 2 ++
 htdocs/product/class/product.class.php | 2 +-
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index f52aa20d494..4e5e6849cb2 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -45,6 +45,7 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
+$hookmanager->initHooks(array('ordersuppliercardcontact'));
 
 $object = new CommandeFournisseur($db);
 
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index f3dc1d26496..219c215143e 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -70,6 +70,7 @@ if (!$sortfield) {
 	$sortfield = "name";
 }
 
+$hookmanager->initHooks(array('ordersuppliercarddocument'));
 
 $object = new CommandeFournisseur($db);
 if ($object->fetch($id, $ref) < 0) {
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 9260dab0b42..f35455f11d9 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -78,6 +78,7 @@ if (!$user->rights->fournisseur->commande->lire) {
 	accessforbidden();
 }
 
+$hookmanager->initHooks(array('ordersuppliercardinfo'));
 
 
 
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index c4cc134fee7..b272b94eddf 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -48,6 +48,8 @@ $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'com
 $object = new CommandeFournisseur($db);
 $object->fetch($id, $ref);
 
+$hookmanager->initHooks(array('ordersuppliercardnote'));
+
 $permissionnote = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer); // Used by the include of actions_setnotes.inc.php
 
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5d622c05c29..29e97aaf4f9 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2208,7 +2208,7 @@ class Product extends CommonObject
 			$sql .= " p.stock,";
 		}
 		if ($separatedEntityPMP) {
-			$sql .= " pa.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
+			$sql .= " ppe.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		} else {
 			$sql .= " p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		}

From 6b55b9fb28bce93b4951e59b780d620a6d962407 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Sat, 8 May 2021 11:45:07 +0200
Subject: [PATCH 734/928] add (hooks) init hooks on all tabs for supplier order

---
 htdocs/fourn/commande/contact.php  | 1 +
 htdocs/fourn/commande/document.php | 1 +
 htdocs/fourn/commande/info.php     | 1 +
 htdocs/fourn/commande/note.php     | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index f52aa20d494..4e5e6849cb2 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -45,6 +45,7 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
+$hookmanager->initHooks(array('ordersuppliercardcontact'));
 
 $object = new CommandeFournisseur($db);
 
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index f3dc1d26496..219c215143e 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -70,6 +70,7 @@ if (!$sortfield) {
 	$sortfield = "name";
 }
 
+$hookmanager->initHooks(array('ordersuppliercarddocument'));
 
 $object = new CommandeFournisseur($db);
 if ($object->fetch($id, $ref) < 0) {
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 9260dab0b42..f35455f11d9 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -78,6 +78,7 @@ if (!$user->rights->fournisseur->commande->lire) {
 	accessforbidden();
 }
 
+$hookmanager->initHooks(array('ordersuppliercardinfo'));
 
 
 
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index c4cc134fee7..b272b94eddf 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -48,6 +48,8 @@ $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'com
 $object = new CommandeFournisseur($db);
 $object->fetch($id, $ref);
 
+$hookmanager->initHooks(array('ordersuppliercardnote'));
+
 $permissionnote = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer); // Used by the include of actions_setnotes.inc.php
 
 

From 44e49e7161a3c1e5c410042f0c25bde322fa6474 Mon Sep 17 00:00:00 2001
From: Antonin MARCHAL <antonin@letempledujeu.fr>
Date: Sat, 8 May 2021 11:46:32 +0200
Subject: [PATCH 735/928] git commit duplication

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 29e97aaf4f9..5d622c05c29 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2208,7 +2208,7 @@ class Product extends CommonObject
 			$sql .= " p.stock,";
 		}
 		if ($separatedEntityPMP) {
-			$sql .= " ppe.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
+			$sql .= " pa.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		} else {
 			$sql .= " p.pmp, p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.batch_mask, p.fk_unit,";
 		}

From 7101c2445d87f9bd25a12d99decd266b69a59f85 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sat, 8 May 2021 12:42:58 +0200
Subject: [PATCH 736/928] Fix dispatch, only edit received lines on draft
 reception. No stock movement on reception.

---
 htdocs/fourn/commande/dispatch.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index b183092972e..4c279dd7c97 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -410,7 +410,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fourn
 		$error++;
 	} else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
-		if ($entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+		if ($entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) && empty($supplierorderdispatch->fk_reception)) {
 			$mouv = new MouvementStock($db);
 			if ($product > 0) {
 				$mouv->origin = &$object;
@@ -1287,19 +1287,22 @@ if ($id > 0 || !empty($ref)) {
 					}
 					print '</td>';
 				}
-
 				if ($action != 'editline' || $lineid != $objp->dispatchlineid) {
-					print '<td class="linecoledit center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$objp->dispatchlineid.'#line_'.$objp->dispatchlineid.'">';
-					print img_edit();
-					print '</a>';
-					print '</td>';
+					if (empty($reception->id) || ($reception->statut == Reception::STATUS_DRAFT)) { // only allow edit on draft reception
+						print '<td class="linecoledit center">';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$objp->dispatchlineid.'#line_'.$objp->dispatchlineid.'">';
+						print img_edit();
+						print '</a>';
+						print '</td>';
 
-					print '<td class="linecoldelete center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;lineid='.$objp->dispatchlineid.'#dispatch_received_products">';
-					print img_delete();
-					print '</a>';
-					print '</td>';
+						print '<td class="linecoldelete center">';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;lineid='.$objp->dispatchlineid.'#dispatch_received_products">';
+						print img_delete();
+						print '</a>';
+						print '</td>';
+					} else {
+						print '<td></td><td></td>';
+					}
 				} else {
 					print '<td class="center valignmiddle">';
 					print '<input type="submit" class="button button-save" id="savelinebutton" name="save" value="'.$langs->trans("Save").'" />';

From 2fda3b1b46af161950b5e2a5e62553fcec4e475a Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Sat, 8 May 2021 13:53:20 +0200
Subject: [PATCH 737/928] FIX ; var case

On this page $datePrint is not used but $dateprint yes
---
 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 420282c4cef..aad5b004f9b 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -218,7 +218,7 @@ if ($type_element == 'propal')
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
 	$where.= " AND d.fk_propal = c.rowid";
 	$where.= " AND c.entity = ".$conf->entity;
-	$datePrint = 'c.datep';
+	$dateprint = 'c.datep';
 	$doc_number='c.ref';
 	$thirdTypeSelect='customer';
 }

From c64fec53e2cfc93a2977b72c76ce986f80ac26df Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 8 May 2021 15:26:52 +0200
Subject: [PATCH 738/928] Update llx_20_c_departements.sql

so now fixed
---
 .../mysql/data/llx_20_c_departements.sql      | 198 ------------------
 1 file changed, 198 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 31c2dc3e8b5..7436c123100 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -1720,204 +1720,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VE-S', 23209, '', 0, 'VE-S', 'Táchira', 1);
 
 
--- Provinces Peru (id country=181)
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0101', 18101, '', 0, '', 'Chachapoyas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0102', 18101, '', 0, '', 'Bagua');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0103', 18101, '', 0, '', 'Bongará');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0104', 18101, '', 0, '', 'Condorcanqui');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0105', 18101, '', 0, '', 'Luya');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0106', 18101, '', 0, '', 'Rodríguez de Mendoza');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0107', 18101, '', 0, '', 'Utcubamba');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0201', 18102, '', 0, '', 'Huaraz');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0202', 18102, '', 0, '', 'Aija');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0203', 18102, '', 0, '', 'Antonio Raymondi');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0204', 18102, '', 0, '', 'Asunción');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0205', 18102, '', 0, '', 'Bolognesi');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0206', 18102, '', 0, '', 'Carhuaz');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0207', 18102, '', 0, '', 'Carlos Fermín Fitzcarrald');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0208', 18102, '', 0, '', 'Casma');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0209', 18102, '', 0, '', 'Corongo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0210', 18102, '', 0, '', 'Huari');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0211', 18102, '', 0, '', 'Huarmey');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0212', 18102, '', 0, '', 'Huaylas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0213', 18102, '', 0, '', 'Mariscal Luzuriaga');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0214', 18102, '', 0, '', 'Ocros');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0215', 18102, '', 0, '', 'Pallasca');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0216', 18102, '', 0, '', 'Pomabamba');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0217', 18102, '', 0, '', 'Recuay');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0218', 18102, '', 0, '', 'Papá');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0219', 18102, '', 0, '', 'Sihuas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0220', 18102, '', 0, '', 'Yungay');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0301', 18103, '', 0, '', 'Abancay');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0302', 18103, '', 0, '', 'Andahuaylas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0303', 18103, '', 0, '', 'Antabamba');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0304', 18103, '', 0, '', 'Aymaraes');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0305', 18103, '', 0, '', 'Cotabambas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0306', 18103, '', 0, '', 'Chincheros');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0307', 18103, '', 0, '', 'Grau');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0401', 18104, '', 0, '', 'Arequipa');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0402', 18104, '', 0, '', 'Camaná');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0403', 18104, '', 0, '', 'Caravelí');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0404', 18104, '', 0, '', 'Castilla');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0405', 18104, '', 0, '', 'Caylloma');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0406', 18104, '', 0, '', 'Condesuyos');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0407', 18104, '', 0, '', 'Islay');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0408', 18104, '', 0, '', 'La Unión');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0501', 18105, '', 0, '', 'Huamanga');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0502', 18105, '', 0, '', 'Cangallo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0503', 18105, '', 0, '', 'Huanca Sancos');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0504', 18105, '', 0, '', 'Huanta');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0505', 18105, '', 0, '', 'La Mar');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0506', 18105, '', 0, '', 'Lucanas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0507', 18105, '', 0, '', 'Parinacochas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0508', 18105, '', 0, '', 'Páucar del Sara Sara');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0509', 18105, '', 0, '', 'Sucre');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0510', 18105, '', 0, '', 'Víctor Fajardo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0511', 18105, '', 0, '', 'Vilcas Huamán');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0601', 18106, '', 0, '', 'Cajamarca');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0602', 18106, '', 0, '', 'Cajabamba');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0603', 18106, '', 0, '', 'Celendín');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0604', 18106, '', 0, '', 'Chota');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0605', 18106, '', 0, '', 'Contumazá');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0606', 18106, '', 0, '', 'Cutervo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0607', 18106, '', 0, '', 'Hualgayoc');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0608', 18106, '', 0, '', 'Jaén');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0609', 18106, '', 0, '', 'San Ignacio');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0610', 18106, '', 0, '', 'San Marcos');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0611', 18106, '', 0, '', 'San Miguel');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0612', 18106, '', 0, '', 'San Pablo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0613', 18106, '', 0, '', 'Santa Cruz');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0701', 18107, '', 0, '', 'Callao');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0801', 18108, '', 0, '', 'Cusco');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0802', 18108, '', 0, '', 'Acomayo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0803', 18108, '', 0, '', 'Anta');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0804', 18108, '', 0, '', 'Calca');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0805', 18108, '', 0, '', 'Canas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0806', 18108, '', 0, '', 'Canchis');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0807', 18108, '', 0, '', 'Chumbivilcas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0808', 18108, '', 0, '', 'Espinar');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0809', 18108, '', 0, '', 'La Convención');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0810', 18108, '', 0, '', 'Paruro');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0811', 18108, '', 0, '', 'Paucartambo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0812', 18108, '', 0, '', 'Quispicanchi');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0813', 18108, '', 0, '', 'Urubamba');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0901', 18109, '', 0, '', 'Huancavelica');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0902', 18109, '', 0, '', 'Acobamba');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0903', 18109, '', 0, '', 'Angaraes');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0904', 18109, '', 0, '', 'Castrovirreyna');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0905', 18109, '', 0, '', 'Churcampa');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0906', 18109, '', 0, '', 'Huaytará');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('0907', 18109, '', 0, '', 'Tayacaja');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1001', 18110, '', 0, '', 'Huánuco');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1002', 18110, '', 0, '', 'Ambón');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1003', 18110, '', 0, '', 'Dos de Mayo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1004', 18110, '', 0, '', 'Huacaybamba');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1005', 18110, '', 0, '', 'Huamalíes');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1006', 18110, '', 0, '', 'Leoncio Prado');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1007', 18110, '', 0, '', 'Marañón');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1008', 18110, '', 0, '', 'Pachitea');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1009', 18110, '', 0, '', 'Puerto Inca');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1010', 18110, '', 0, '', 'Lauricocha');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1011', 18110, '', 0, '', 'Yarowilca');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1101', 18111, '', 0, '', 'Ica');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1102', 18111, '', 0, '', 'Chincha');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1103', 18111, '', 0, '', 'Nazca');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1104', 18111, '', 0, '', 'Palpa');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1105', 18111, '', 0, '', 'Pisco');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1201', 18112, '', 0, '', 'Huancayo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1202', 18112, '', 0, '', 'Concepción');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1203', 18112, '', 0, '', 'Chanchamayo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1204', 18112, '', 0, '', 'Jauja');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1205', 18112, '', 0, '', 'Junín');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1206', 18112, '', 0, '', 'Satipo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1207', 18112, '', 0, '', 'Tarma');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1208', 18112, '', 0, '', 'Yauli');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1209', 18112, '', 0, '', 'Chupaca');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1301', 18113, '', 0, '', 'Trujillo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1302', 18113, '', 0, '', 'Ascope');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1303', 18113, '', 0, '', 'Bolívar');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1304', 18113, '', 0, '', 'Chepén');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1305', 18113, '', 0, '', 'Julcán');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1306', 18113, '', 0, '', 'Otuzco');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1307', 18113, '', 0, '', 'Pacasmayo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1308', 18113, '', 0, '', 'Pataz');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1309', 18113, '', 0, '', 'Sánchez Carrión');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1310', 18113, '', 0, '', 'Santiago de Chuco');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1311', 18113, '', 0, '', 'Gran Chimú');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1312', 18113, '', 0, '', 'Virú');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1401', 18114, '', 0, '', 'Chiclayo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1402', 18114, '', 0, '', 'Ferreñafe');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1403', 18114, '', 0, '', 'Lambayeque');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1501', 18115, '', 0, '', 'Lima');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1502', 18116, '', 0, '', 'Huaura');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1503', 18116, '', 0, '', 'Barranca');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1504', 18116, '', 0, '', 'Cajatambo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1505', 18116, '', 0, '', 'Canta');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1506', 18116, '', 0, '', 'Cañete');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1507', 18116, '', 0, '', 'Huaral');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1508', 18116, '', 0, '', 'Huarochirí');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1509', 18116, '', 0, '', 'Oyón');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1510', 18116, '', 0, '', 'Yauyos');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1601', 18117, '', 0, '', 'Maynas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1602', 18117, '', 0, '', 'Alto Amazonas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1603', 18117, '', 0, '', 'Loreto');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1604', 18117, '', 0, '', 'Mariscal Ramón Castilla');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1605', 18117, '', 0, '', 'Requena');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1606', 18117, '', 0, '', 'Ucayali');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1607', 18117, '', 0, '', 'Datem del Marañón');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1701', 18118, '', 0, '', 'Tambopata');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1702', 18118, '', 0, '', 'Manú');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1703', 18118, '', 0, '', 'Tahuamanu');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1801', 18119, '', 0, '', 'Mariscal Nieto');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1802', 18119, '', 0, '', 'General Sánchez Cerro');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1803', 18119, '', 0, '', 'Ilo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1901', 18120, '', 0, '', 'Pasco');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1902', 18120, '', 0, '', 'Daniel Alcides Carrión');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('1903', 18120, '', 0, '', 'Oxapampa');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2001', 18121, '', 0, '', 'Piura');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2002', 18121, '', 0, '', 'Ayabaca');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2003', 18121, '', 0, '', 'Huancabamba');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2004', 18121, '', 0, '', 'Morropón');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2005', 18121, '', 0, '', 'Paita');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2006', 18121, '', 0, '', 'Sullana');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2007', 18121, '', 0, '', 'Talara');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2008', 18121, '', 0, '', 'Sechura');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2101', 18122, '', 0, '', 'Puno');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2102', 18122, '', 0, '', 'Azángaro');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2103', 18122, '', 0, '', 'Carabaya');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2104', 18122, '', 0, '', 'Chucuito');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2105', 18122, '', 0, '', 'El Collao');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2106', 18122, '', 0, '', 'Huancané');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2107', 18122, '', 0, '', 'Lampa');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2108', 18122, '', 0, '', 'Melgar');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2109', 18122, '', 0, '', 'Moho');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2110', 18122, '', 0, '', 'San Antonio de Putina');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2111', 18122, '', 0, '', 'San Román');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2112', 18122, '', 0, '', 'Sandia');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2113', 18122, '', 0, '', 'Yunguyo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2201', 18123, '', 0, '', 'Moyobamba');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2202', 18123, '', 0, '', 'Bellavista');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2203', 18123, '', 0, '', 'El Dorado');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2204', 18123, '', 0, '', 'Huallaga');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2205', 18123, '', 0, '', 'Lamas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2206', 18123, '', 0, '', 'Mariscal Cáceres');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2207', 18123, '', 0, '', 'Picota');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2208', 18123, '', 0, '', 'La Rioja');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2209', 18123, '', 0, '', 'San Martín');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2210', 18123, '', 0, '', 'Tocache');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2301', 18124, '', 0, '', 'Tacna');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2302', 18124, '', 0, '', 'Candarave');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2303', 18124, '', 0, '', 'Jorge Basadre');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2304', 18124, '', 0, '', 'Tarata');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2401', 18125, '', 0, '', 'Tumbes');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2402', 18125, '', 0, '', 'Contralmirante Villar');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2403', 18125, '', 0, '', 'Zarumilla');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2501', 18126, '', 0, '', 'Coronel Portillo');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2502', 18126, '', 0, '', 'Atalaya');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2503', 18126, '', 0, '', 'Padre Abad');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('2504', 18126, '', 0, '', 'Purús');
-
-
 -- Provinces United Arab Emirates (id country=227)
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-1', 22701, '', 0, '', 'Abu Dhabi');
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-2', 22701, '', 0, '', 'Dubai');

From 6fa85efd0f2e854850ffcb498b2ea3d5acd801d0 Mon Sep 17 00:00:00 2001
From: kastoras <kastoras_1@hotmail.com>
Date: Sat, 8 May 2021 23:03:08 +0300
Subject: [PATCH 739/928] Fix/FIX #17545 get documents, false data problem

Fix on getting wrong data for products comparing with like operator
---
 htdocs/ecm/class/ecmfiles.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 485551cbe13..8ed2cac7691 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -529,7 +529,12 @@ class EcmFiles extends CommonObject
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				if($key == 't.src_object_id'){
+					$sqlwhere [] = $key.' = '.$this->db->escape($value);
+				}
+				else{
+					$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
 			}
 		}
 		$sql .= ' WHERE 1 = 1';

From db9c4237940d374a3c445039852ca04ada53d1af Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 8 May 2021 20:07:12 +0000
Subject: [PATCH 740/928] Fixing style errors.

---
 htdocs/ecm/class/ecmfiles.class.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 8ed2cac7691..b69d7557aed 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -529,10 +529,9 @@ class EcmFiles extends CommonObject
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				if($key == 't.src_object_id'){
+				if ($key == 't.src_object_id') {
 					$sqlwhere [] = $key.' = '.$this->db->escape($value);
-				}
-				else{
+				} else {
 					$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}

From c81b4f8c31815354d030ee2273e1d2e2d6c3c938 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 08:31:36 +0200
Subject: [PATCH 741/928] FIX Migration script

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 51643a92a01..1aa8b282ab8 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -460,14 +460,14 @@ ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_closing integer DEFAULT NULL af
 
 ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity; -- project associated to warehouse if any
 
--- Add external payement suport for donation
+-- Add external payment support for donation
 ALTER TABLE llx_payment_donation ADD COLUMN ext_payment_site  varchar(128) AFTER note;
 ALTER TABLE llx_payment_donation ADD COLUMN ext_payment_id  varchar(128) AFTER note;
 
 -- Rebuild sequence for postgres only after query INSERT INTO llx_salary(rowid, ...
 -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
 
-UPDATE llx_const SET value = 'github' WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
+UPDATE llx_const SET type = __ENCRYPT('chaine')__, value = __ENCRYPT('github')__ WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
 
 ALTER TABLE llx_facture_fourn_det ADD COLUMN fk_remise_except integer DEFAULT NULL after remise_percent;
 ALTER TABLE llx_facture_fourn_det ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except, fk_facture_fourn);

From a848fb65b6cbaf3c08835f0927b3a7de9c9996e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 9 May 2021 09:02:01 +0200
Subject: [PATCH 742/928] Delete COPYING

---
 htdocs/partnership/COPYING | 621 -------------------------------------
 1 file changed, 621 deletions(-)
 delete mode 100644 htdocs/partnership/COPYING

diff --git a/htdocs/partnership/COPYING b/htdocs/partnership/COPYING
deleted file mode 100644
index 94a04532226..00000000000
--- a/htdocs/partnership/COPYING
+++ /dev/null
@@ -1,621 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS

From 20cbc9a36f1ac6e9121de2def1511ab51f3bfb7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 9 May 2021 09:02:45 +0200
Subject: [PATCH 743/928] Delete ChangeLog.md

---
 htdocs/partnership/ChangeLog.md | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 htdocs/partnership/ChangeLog.md

diff --git a/htdocs/partnership/ChangeLog.md b/htdocs/partnership/ChangeLog.md
deleted file mode 100644
index 4adee6d504c..00000000000
--- a/htdocs/partnership/ChangeLog.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# CHANGELOG PARTNERSHIP FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
-
-## 1.0
-
-Initial version

From 8cc100012d46282799fb19f735a53b7101569377 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 May 2021 12:50:46 +0200
Subject: [PATCH 744/928] Fix vulnerabiity: External users can set a public
 note

---
 htdocs/core/actions_setnotes.inc.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
index f2426f6523f..91e7f4a8aca 100644
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@@ -67,16 +67,18 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 			}
 		}
 	}
-} elseif ($action == 'setnote_private' && !empty($permissionnote) && !GETPOST('cancel', 'alpha')) {
-	// Set public note
-	if (empty($action) || !is_object($object) || empty($id)) {
-		dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
-	}
-	if (empty($object->id)) {
-		$object->fetch($id); // Fetch may not be already done
-	}
-	$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5), '_private');
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
+} elseif ($action == 'setnote_private' && !empty($permissionnote) && !GETPOST('cancel', 'alpha')) {	// Set public note
+	if (empty($user->socid)) {
+		// Private notes (always hidden to external users)
+		if (empty($action) || !is_object($object) || empty($id)) {
+			dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
+		}
+		if (empty($object->id)) {
+			$object->fetch($id); // Fetch may not be already done
+		}
+		$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5), '_private');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 }

From 1e844a78a61f743725f3d500cffd42837ca7982b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 9 May 2021 16:46:38 +0200
Subject: [PATCH 745/928] comment translation

---
 htdocs/adherents/admin/member.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index fa2062be7c1..925f2c9094d 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -72,12 +72,12 @@ if ($action == 'set_default') {
 } elseif ($action == 'setdoc') {
 	// Set default model
 	if (dolibarr_set_const($db, "MEMBER_ADDON_PDF_ODT", $value, 'chaine', 0, '', $conf->entity)) {
-		// La constante qui a ete lue en avant du nouveau set
-		// on passe donc par une variable pour avoir un affichage coherent
+		// The constant that was read ahead of the new set
+		// we therefore go through a variable to have a consistent display
 		$conf->global->MEMBER_ADDON_PDF_ODT = $value;
 	}
 
-	// On active le modele
+	// We activate the model
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
@@ -317,7 +317,7 @@ $helptext .= '__YEAR__, __MONTH__, __DAY__';
 form_constantes($constantes, 0, $helptext);
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
-// Defini tableau def des modeles
+// Defined model definition table
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";

From 3ad8827c8a3e0d94cef6f098fe3b52a414cbb7fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 May 2021 20:17:17 +0200
Subject: [PATCH 746/928] Clean code

---
 .../commande/doc/pdf_einstein.modules.php     |  4 +-
 .../commande/doc/pdf_eratosthene.modules.php  |  4 +-
 .../delivery/doc/pdf_storm.modules.php        |  4 +-
 .../delivery/doc/pdf_typhon.modules.php       |  4 +-
 .../expedition/doc/pdf_espadon.modules.php    |  4 +-
 .../expedition/doc/pdf_rouget.modules.php     |  4 +-
 .../doc/pdf_standard.modules.php              |  2 +-
 .../modules/facture/doc/pdf_crabe.modules.php | 54 ++++++++++++++-----
 .../facture/doc/pdf_sponge.modules.php        | 19 ++++---
 .../fichinter/doc/pdf_soleil.modules.php      |  2 +-
 .../movement/doc/pdf_standard.modules.php     |  2 +-
 .../product/doc/pdf_standard.modules.php      |  2 +-
 .../modules/propale/doc/pdf_azur.modules.php  |  4 +-
 .../modules/propale/doc/pdf_cyan.modules.php  |  4 +-
 .../reception/doc/pdf_squille.modules.php     |  4 +-
 .../doc/pdf_canelle.modules.php               |  4 +-
 .../supplier_order/doc/pdf_cornas.modules.php |  4 +-
 .../doc/pdf_muscadet.modules.php              |  4 +-
 .../doc/pdf_standard.modules.php              |  4 +-
 .../doc/pdf_aurore.modules.php                |  4 +-
 20 files changed, 84 insertions(+), 53 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index b759711ac49..79bf9de2e8d 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1408,7 +1408,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -1462,7 +1462,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 2c7171fed8a..edb1080fff1 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -1594,7 +1594,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
@@ -1647,7 +1647,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 057310a9976..a1c01002d2e 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -823,7 +823,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -849,7 +849,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("DeliveryAddress").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("DeliveryAddress"), 0, 'L');
 
 			// If SHIPPING contact defined on order, we use it
 			$usecontact = false;
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index 66f232653ac..4656784f50d 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -822,7 +822,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -848,7 +848,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("DeliveryAddress").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("DeliveryAddress"), 0, 'L');
 
 			// If SHIPPING contact defined on order, we use it
 			$usecontact = false;
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 97777adc4cd..42999248026 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -1090,7 +1090,7 @@ class pdf_espadon extends ModelePdfExpedition
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("Sender").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Sender"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
@@ -1143,7 +1143,7 @@ class pdf_espadon extends ModelePdfExpedition
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Recipient").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Recipient"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index c41fd92f524..79ceb166eed 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -1039,7 +1039,7 @@ class pdf_rouget extends ModelePdfExpedition
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("Sender").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Sender"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
@@ -1092,7 +1092,7 @@ class pdf_rouget extends ModelePdfExpedition
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Recipient").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Recipient"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index d1f959f5460..1815321ab18 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -796,7 +796,7 @@ class pdf_standard extends ModeleExpenseReport
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("TripSociete")." :", '', 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("TripSociete"), '', 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index e60f272caf5..a01fab1dacf 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1607,12 +1607,16 @@ class pdf_crabe extends ModelePDFFactures
 	 *  @param  Facture		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *  @return	void
 	 */
-	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
 	{
 		global $conf, $langs;
 
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
 
@@ -1621,7 +1625,7 @@ class pdf_crabe extends ModelePDFFactures
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
 			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
 		}
 
@@ -1658,7 +1662,7 @@ class pdf_crabe extends ModelePDFFactures
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 			}
 		}
 
@@ -1681,6 +1685,23 @@ class pdf_crabe extends ModelePDFFactures
 		if ($this->situationinvoice) {
 			$title = $outputlangs->transnoentities("PDFInvoiceSituation");
 		}
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			$title .= ' - ';
+			if ($object->type == 0) {
+				if ($this->situationinvoice) {
+					$title .= $outputlangsbis->transnoentities("PDFInvoiceSituation");
+				}
+				$title .= $outputlangsbis->transnoentities("PdfInvoiceTitle");
+			} elseif ($object->type == 1) {
+				$title .= $outputlangsbis->transnoentities("InvoiceReplacement");
+			} elseif ($object->type == 2) {
+				$title .= $outputlangsbis->transnoentities("InvoiceAvoir");
+			} elseif ($object->type == 3) {
+				$title .= $outputlangsbis->transnoentities("InvoiceDeposit");
+			} elseif ($object->type == 4) {
+				$title .= $outputlangsbis->transnoentities("InvoiceProForma");
+			}
+		}
 		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
@@ -1689,7 +1710,7 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == Facture::STATUS_DRAFT) {
+		if ($object->statut == $object::STATUS_DRAFT) {
 			$pdf->SetTextColor(128, 0, 0);
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
 		}
@@ -1758,7 +1779,11 @@ class pdf_crabe extends ModelePDFFactures
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : ".dol_print_date($object->date, "day", false, $outputlangs), '', 'R');
+		$title = $outputlangs->transnoentities("DateInvoice");
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			$title .= ' - '.$outputlangsbis->transnoentities("DateInvoice");
+		}
+		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
 		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
 			$posy += 4;
@@ -1771,7 +1796,11 @@ class pdf_crabe extends ModelePDFFactures
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateDue")." : ".dol_print_date($object->date_lim_reglement, "day", false, $outputlangs, true), '', 'R');
+			$title = $outputlangs->transnoentities("DateDue");
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+				$title .= ' - '.$outputlangsbis->transnoentities("DateDue");
+			}
+			$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date_lim_reglement, "day", false, $outputlangs, true), '', 'R');
 		}
 
 		if ($object->thirdparty->code_client) {
@@ -1824,7 +1853,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
@@ -1833,14 +1862,13 @@ class pdf_crabe extends ModelePDFFactures
 			// Show sender name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
 			$posy = $pdf->getY();
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
 			$pdf->SetFont('', '', $default_font_size - 1);
-			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
-
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, $ltrdirection);
 
 
 			// If BILLING contact defined on invoice, we use it
@@ -1879,20 +1907,20 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 2, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_client, 0, $ltrdirection);
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 6ffc043eb5e..ad793d3d6b8 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1851,6 +1851,9 @@ class pdf_sponge extends ModelePDFFactures
 	{
 		global $conf, $langs;
 
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
 
@@ -1896,7 +1899,7 @@ class pdf_sponge extends ModelePDFFactures
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 			}
 		}
 
@@ -2088,7 +2091,7 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
@@ -2097,15 +2100,15 @@ class pdf_sponge extends ModelePDFFactures
 			// Show sender name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
 			$posy = $pdf->getY();
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
 			$pdf->SetFont('', '', $default_font_size - 1);
-			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, $ltrdirection);
 
-			// If BILLING contact defined, we use it
+			// If BILLING contact defined on invoice, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'BILLING');
 			if (count($arrayidcontact) > 0) {
@@ -2141,20 +2144,20 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 2, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_client, 0, $ltrdirection);
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index ac0cb1fac80..08d57587625 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -528,7 +528,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 		if (empty($hidebottom)) {
 			$pdf->SetXY(20, 230);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("NameAndSignatureOfInternalContact"), 0, 'L', 0);
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("NameAndSignatureOfInternalContact"), 0, 'L', 0);
 
 			$pdf->SetXY(20, 235);
 			$pdf->MultiCell(80, 25, '', 1);
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index d818ab24f9e..82d930a1aac 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -1158,7 +1158,7 @@ class pdf_stdandard extends ModelePDFMovement
 			$pdf->SetTextColor(0,0,0);
 			$pdf->SetFont('','', $default_font_size - 2);
 			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetFillColor(230,230,230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 72eaae364a5..99b6ff69236 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -815,7 +815,7 @@ class pdf_standard extends ModelePDFProduct
 			$pdf->SetTextColor(0,0,0);
 			$pdf->SetFont('','', $default_font_size - 2);
 			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetFillColor(230,230,230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 15de98e9a58..270a314a009 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1575,7 +1575,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -1628,7 +1628,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index b7e44c6c4d5..ca5e0526b5f 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1690,7 +1690,7 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
@@ -1744,7 +1744,7 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index c9a2b397e17..4400cce2937 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -934,7 +934,7 @@ class pdf_squille extends ModelePdfReception
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("Sender").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Sender"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
@@ -988,7 +988,7 @@ class pdf_squille extends ModelePdfReception
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Recipient").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Recipient"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index b9c40645544..8f6d12df1d0 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -1211,7 +1211,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -1264,7 +1264,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 1806453dc57..4cb80e0a81e 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1369,7 +1369,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom", 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -1422,7 +1422,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index a16e1db2b01..65d2a97f634 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -1277,7 +1277,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -1329,7 +1329,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index a0191a3dd08..b6da2d4c294 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -757,7 +757,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("PayedBy").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("PayedBy"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -798,7 +798,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("PayedTo").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("PayedTo"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
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 356c3550100..c6cc6e8d1b1 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -1383,7 +1383,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -1439,7 +1439,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name

From 1fb5b0f681455c82b7949cd52cca40a96cc7dcfa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 May 2021 20:25:57 +0200
Subject: [PATCH 747/928] Fix rtl languages

---
 .../commande/doc/pdf_einstein.modules.php       | 15 +++++++++------
 .../commande/doc/pdf_eratosthene.modules.php    | 15 +++++++++------
 .../modules/propale/doc/pdf_azur.modules.php    | 17 ++++++++++-------
 .../modules/propale/doc/pdf_cyan.modules.php    | 17 ++++++++++-------
 4 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 79bf9de2e8d..bd6caafd15a 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1255,6 +1255,9 @@ class pdf_einstein extends ModelePDFCommandes
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
 
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "propal", "orders", "companies"));
 
@@ -1300,7 +1303,7 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 			}
 		}
 
@@ -1408,7 +1411,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -1417,7 +1420,7 @@ class pdf_einstein extends ModelePDFCommandes
 			// Show sender name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
 			$posy = $pdf->getY();
 
 			// Show sender information
@@ -1462,20 +1465,20 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index edb1080fff1..1dc8ce74db0 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -1422,6 +1422,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
 
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "propal", "orders", "companies"));
 
@@ -1594,7 +1597,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
@@ -1603,13 +1606,13 @@ class pdf_eratosthene extends ModelePDFCommandes
 			// Show sender name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
 			$posy = $pdf->getY();
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
 			$pdf->SetFont('', '', $default_font_size - 1);
-			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, $ltrdirection);
 
 			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
@@ -1647,20 +1650,20 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 270a314a009..df1a625fdc8 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1419,6 +1419,9 @@ class pdf_azur extends ModelePDFPropales
 	{
 		global $conf, $langs;
 
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
 
@@ -1462,7 +1465,7 @@ class pdf_azur extends ModelePDFPropales
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 			}
 		}
 
@@ -1575,7 +1578,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -1584,13 +1587,13 @@ class pdf_azur extends ModelePDFPropales
 			// Show sender name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
 			$posy = $pdf->getY();
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
 			$pdf->SetFont('', '', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, $ltrdirection);
 
 
 			// If CUSTOMER contact defined, we use it
@@ -1628,20 +1631,20 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index ca5e0526b5f..0aed96df0e5 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1519,6 +1519,9 @@ class pdf_cyan extends ModelePDFPropales
 	{
 		global $conf, $langs;
 
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
 
@@ -1564,7 +1567,7 @@ class pdf_cyan extends ModelePDFPropales
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 			}
 		}
 
@@ -1690,7 +1693,7 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
@@ -1699,13 +1702,13 @@ class pdf_cyan extends ModelePDFPropales
 			// Show sender name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
 			$posy = $pdf->getY();
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
 			$pdf->SetFont('', '', $default_font_size - 1);
-			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, $ltrdirection);
 
 
 			// If CUSTOMER contact defined, we use it
@@ -1744,20 +1747,20 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
 		$pdf->SetTextColor(0, 0, 0);

From a349f6c6e7e050aff2cadee23fe91447c35024b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 May 2021 20:30:42 +0200
Subject: [PATCH 748/928] Fix hide a non ready feature

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

diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 8a757a7d34c..acf1dfe707e 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -100,6 +100,7 @@ if ($conf->use_javascript_ajax) {
 }
 print '</td></tr>';
 
+/*
 print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING").'</td><td>';
 if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING');
@@ -108,6 +109,7 @@ if ($conf->use_javascript_ajax) {
 	print $form->selectarray("MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING", $arrval, $conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING);
 }
 print '</td></tr>';
+*/
 
 print '</table>';
 print '</div>';

From 3b13c4a2691da3c90dbab0d5758c1d3e2a43b0e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 9 May 2021 21:03:39 +0200
Subject: [PATCH 749/928] fix syntax error

---
 htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 4cb80e0a81e..6e89c6f00ad 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1369,7 +1369,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);

From 2dc2256545b3e2188d1eb5c290fcbe54af65c20a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 21:08:55 +0200
Subject: [PATCH 750/928] Fix Title customer proposal card

---
 htdocs/comm/propal/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 229303849f0..29310aa831b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1445,8 +1445,9 @@ if (!empty($conf->projet->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
+$title = $langs->trans('Proposal')." - ".$langs->trans('Card');
 $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos|DE:Modul_Angebote';
-llxHeader('', $langs->trans('Proposal'), $help_url);
+llxHeader('', $title, $help_url);
 
 $now = dol_now();
 

From dd76ff0f24e929d3a8af0be707b5d00faa85baba Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 21:11:14 +0200
Subject: [PATCH 751/928] Fix Title customer proposal contact card

---
 htdocs/comm/propal/contact.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 09aa9fddb6c..80468894483 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -118,8 +118,9 @@ elseif ($action == 'setaddress' && $user->rights->propale->creer)
 /*
  * View
  */
-
-llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
+$title = $langs->trans('Proposal')." - ".$langs->trans('ContactsAddresses');
+$helpurl = "EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos";
+llxHeader('', $title, $helpurl);
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);

From dbccb75294e2672587bd74af2d4e9b7f5e8d0779 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 21:13:29 +0200
Subject: [PATCH 752/928] Fix Title customer proposal notes card

---
 htdocs/comm/propal/contact.php | 4 ++--
 htdocs/comm/propal/note.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 80468894483..61a14ab62d8 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -119,8 +119,8 @@ elseif ($action == 'setaddress' && $user->rights->propale->creer)
  * View
  */
 $title = $langs->trans('Proposal')." - ".$langs->trans('ContactsAddresses');
-$helpurl = "EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos";
-llxHeader('', $title, $helpurl);
+$help_url = "EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos";
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 0d880219bef..6dd62a9990d 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -71,9 +71,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
 
 $form = new Form($db);
 
+$title = $langs->trans('Proposal')." - ".$langs->trans('Notes');
 $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
-
-llxHeader('', $langs->trans('Proposal'), $help_url);
+llxHeader('', $title, $help_url);
 
 if ($object->id > 0) {
 	if ($object->fetch_thirdparty() > 0) {

From 9cec7e5936f9ead5c67cb2e956990e454130c32f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 21:15:54 +0200
Subject: [PATCH 753/928] Fix Title customer proposal documents card

---
 htdocs/comm/propal/document.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 1a71d4ffaba..d9416dfe339 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -102,8 +102,9 @@ if ($object->id > 0) {
 /*
  * View
  */
-
-llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
+$title = $langs->trans('Proposal')." - ".$langs->trans('Documents');
+$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 

From c2319c0a20c4adb8bc672208c6263907e5ae0442 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 21:19:13 +0200
Subject: [PATCH 754/928] Fix Title customer proposal info card

---
 htdocs/comm/propal/document.php | 2 +-
 htdocs/comm/propal/info.php     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index d9416dfe339..4e592c8371e 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -37,7 +37,7 @@ if (!empty($conf->projet->enabled)) {
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array('compta', 'other', 'companies'));
+$langs->loadLangs(array('propal', 'compta', 'other', 'companies'));
 
 $action = GETPOST('action', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index 72e4f887496..798dc87bcfd 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -59,7 +59,9 @@ restrictedArea($user, 'propal', $object->id);
 
 $form = new Form($db);
 
-llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
+$title = $langs->trans('Proposal')." - ".$langs->trans('Info');
+$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
+llxHeader('', $title, $help_url);
 
 $object->fetch_thirdparty();
 

From 7bd5306ae5fccd1c6cbef5c43467ad32adfc115e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 22:04:53 +0200
Subject: [PATCH 755/928] Fix Title company contact card

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

diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 570d8531efc..a09c9751f1f 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -144,7 +144,7 @@ if ($socid > 0 && empty($object->id)) {
 
 $title = $langs->trans("ThirdParty");
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
-	$title = $object->name." - ".$langs->trans('Card');
+	$title = $object->name." - ".$langs->trans('ContactsAddresses');
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);

From 6e9597cd90546587ddad34680604888de19d689b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 22:06:05 +0200
Subject: [PATCH 756/928] Fix Title company customer card

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

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 14f58cf2384..589559ea426 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -298,9 +298,9 @@ $userstatic = new User($db);
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 
-$title = $langs->trans("CustomerCard");
+$title = $langs->trans("ThirdParty")." - ".$langs->trans('Customer');
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
-	$title = $object->name;
+	$title = $object->name." - ".$langs->trans('Customer');
 }
 
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Geschäftspartner';

From 19bae333c90fb566ca96070df3a5aca3f4896e7c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 May 2021 22:07:08 +0200
Subject: [PATCH 757/928] Add option MAIN_SHOW_PASSWORD_INTO_LOG

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9ce3948efdf..77f0df8379b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1386,7 +1386,9 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 			return;
 		}
 
-		$message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log
+		if (empty($conf->global->MAIN_SHOW_PASSWORD_INTO_LOG)) {
+			$message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log
+		}
 
 		// If adding log inside HTML page is required
 		if ((!empty($_REQUEST['logtohtml']) && !empty($conf->global->MAIN_ENABLE_LOG_TO_HTML))

From 09674359d524161d6c2d19f3fee54cd8ffc1d67d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 22:23:15 +0200
Subject: [PATCH 758/928] Fix Title company payment information card

---
 htdocs/societe/paymentmodes.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index dc8d95ef42f..ed392c0c0a1 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -677,6 +677,11 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 
+$title = $langs->trans("ThirdParty");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->name." - ".$langs->trans('PaymentInformation');
+}
+
 llxHeader();
 
 $head = societe_prepare_head($object);

From c8e30203f89f6cae4839036d02de4ba22cd64c40 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 22:31:33 +0200
Subject: [PATCH 759/928] Fix Title customer order card

---
 htdocs/commande/card.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f63b02c035e..e2b2be197e8 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1392,8 +1392,9 @@ if (empty($reshook)) {
 /*
  *	View
  */
-
-llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge');
+$title = $langs->trans('Order')." - ".$langs->trans('Card');
+$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 $formfile = new FormFile($db);

From 222c1d9b89eafb3722dfbdb57ed1238b3d70ae59 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 22:31:46 +0200
Subject: [PATCH 760/928] Fix Title customer order contact card

---
 htdocs/commande/contact.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 3160c8e289a..0a44d87f4ae 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -103,8 +103,9 @@ elseif ($action == 'setaddress' && $user->rights->commande->creer)
 /*
  * View
  */
-
-llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
+$title = $langs->trans('Order')." - ".$langs->trans('ContactsAddresses');
+$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);

From a908d302b2941adb4d7c029b94dfb23e97bd2ba8 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 22:33:37 +0200
Subject: [PATCH 761/928] Fix Title customer order note card

---
 htdocs/commande/note.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 0805bb8d1d9..6872990a3ec 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -67,8 +67,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
 /*
  * View
  */
-
-llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
+$title = $langs->trans('Order')." - ".$langs->trans('Notes');
+$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 

From 7ad4f13036802f1b6b1555c163f36064335653a3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 22:36:02 +0200
Subject: [PATCH 762/928] Fix Title customer order documents card

---
 htdocs/commande/document.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index c61f7c63542..b4dddc9a1bf 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -37,7 +37,7 @@ if (!empty($conf->projet->enabled)) {
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array('companies', 'other', 'bills'));
+$langs->loadLangs(array('companies', 'other', 'bills', 'orders'));
 
 $action		= GETPOST('action', 'aZ09');
 $confirm	= GETPOST('confirm');
@@ -94,8 +94,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 /*
  * View
  */
-
-llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
+$title = $langs->trans('Order')." - ".$langs->trans('Documents');
+$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 

From 5a5811a716b044146421a170efd193df30e8ab14 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 9 May 2021 22:37:00 +0200
Subject: [PATCH 763/928] NEW DOL_VALUE_PLACE tag in TakePOS template

Very important in restaurant orders
---
 htdocs/core/class/dolreceiptprinter.class.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 6933cf2c597..112f6f324d4 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -224,6 +224,7 @@ class dolReceiptPrinter extends Printer
 			'dol_value_vendor_lastname' => 'VendorLastname',
 			'dol_value_vendor_firstname' => 'VendorFirstname',
 			'dol_value_vendor_mail' => 'VendorEmail',
+			'dol_value_place' => 'DOL_VALUE_PLACE',
 		);
 	}
 
@@ -564,7 +565,7 @@ class dolReceiptPrinter extends Printer
 	 */
 	public function sendToPrinter($object, $templateid, $printerid)
 	{
-		global $conf, $mysoc, $langs, $user;
+		global $conf, $mysoc, $langs, $user, $db;
 		$error = 0;
 		$ret = $this->loadTemplate($templateid);
 
@@ -827,6 +828,14 @@ class dolReceiptPrinter extends Printer
 							}
 						}
 						break;
+					case 'DOL_VALUE_PLACE':
++							$sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $object->ref)));
++							$resql = $db->query($sql);
++							$obj = $db->fetch_object($resql);
++							if ($obj) {
++								$this->printer->text($obj->label);
++							}
++						break;
 					default:
 						$this->printer->text($vals[$tplline]['tag']);
 						$this->printer->text($vals[$tplline]['value']);

From e5d0999073924aaa761df16ec43aacaca52fbf8f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 22:37:05 +0200
Subject: [PATCH 764/928] Fix Title customer order info card

---
 htdocs/commande/info.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 5dd9a64a8a6..2e5f0b696ff 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -62,7 +62,9 @@ if (!$object->fetch($id, $ref) > 0) {
 
 $form = new Form($db);
 
-llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
+$title = $langs->trans('Order')." - ".$langs->trans('Info');
+$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
+llxHeader('', $title, $help_url);
 
 $object->fetch_thirdparty();
 $object->info($object->id);

From 14d743db1ec3ad536dd5d521df764f4818af5633 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 May 2021 22:41:52 +0200
Subject: [PATCH 765/928] Fix Title customer order sendings card

---
 htdocs/expedition/shipment.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 80dbaf698ef..1231f0b513e 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -48,7 +48,7 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array('orders', "companies", "bills", 'propal', 'deliveries', 'stocks', "productbatch", 'incoterm', 'other'));
+$langs->loadLangs(array('orders', 'sendings', 'companies', 'bills', 'propal', 'deliveries', 'stocks', 'productbatch', 'incoterm', 'other'));
 
 $id     = GETPOST('id', 'int'); // id of order
 $ref    = GETPOST('ref', 'alpha');
@@ -232,7 +232,9 @@ if (!empty($conf->projet->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
-llxHeader('', $langs->trans('OrderCard'), '');
+$title = $langs->trans('Order')." - ".$langs->trans('Shipments');
+$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
+llxHeader('', $title, $help_url);
 
 
 if ($id > 0 || !empty($ref)) {

From 8aa8c143233e13292501c8c632ff711d3e8ba9fb Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sun, 9 May 2021 22:53:05 +0200
Subject: [PATCH 766/928] Fix

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

diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 112f6f324d4..aaf9e60aec5 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -829,13 +829,13 @@ class dolReceiptPrinter extends Printer
 						}
 						break;
 					case 'DOL_VALUE_PLACE':
-+							$sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $object->ref)));
-+							$resql = $db->query($sql);
-+							$obj = $db->fetch_object($resql);
-+							if ($obj) {
-+								$this->printer->text($obj->label);
-+							}
-+						break;
+							$sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $object->ref)));
+							$resql = $db->query($sql);
+							$obj = $db->fetch_object($resql);
+							if ($obj) {
+								$this->printer->text($obj->label);
+							}
+						break;
 					default:
 						$this->printer->text($vals[$tplline]['tag']);
 						$this->printer->text($vals[$tplline]['value']);

From 3ee26fc881f746e3f2305d088ce6ba6e4f1199af Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 9 May 2021 21:37:58 +0000
Subject: [PATCH 767/928] Fixing style errors.

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

diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index aaf9e60aec5..205ee1eafe8 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -832,9 +832,9 @@ class dolReceiptPrinter extends Printer
 							$sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $object->ref)));
 							$resql = $db->query($sql);
 							$obj = $db->fetch_object($resql);
-							if ($obj) {
-								$this->printer->text($obj->label);
-							}
+						if ($obj) {
+							$this->printer->text($obj->label);
+						}
 						break;
 					default:
 						$this->printer->text($vals[$tplline]['tag']);

From b720e4cd78b1c5b4ea5fb51463c9665649dea894 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 06:19:08 +0200
Subject: [PATCH 768/928] Fix Travis

---
 htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 4cb80e0a81e..6e89c6f00ad 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1369,7 +1369,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);

From 7e44494a98ed74a4e517dc63cac2146b7965d23c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 06:24:30 +0200
Subject: [PATCH 769/928] Fix Title supplier proposal card

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

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 809e84b29a8..65b3addf9d1 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1035,10 +1035,9 @@ if (empty($reshook)) {
 /*
  * View
  */
-
+$title = $langs->trans('CommRequests')." - ".$langs->trans('Card');
 $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
-
-llxHeader('', $langs->trans('CommRequests'), $help_url);
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 $formother = new FormOther($db);

From c0062e2d414c1fd5e59c267f2d2090afe5249817 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 06:26:58 +0200
Subject: [PATCH 770/928] Move title to v14 ergonomy

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

diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php
index a7720bd9ef4..4361bbe3ae7 100644
--- a/htdocs/core/lib/supplier_proposal.lib.php
+++ b/htdocs/core/lib/supplier_proposal.lib.php
@@ -40,7 +40,7 @@ function supplier_proposal_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('SupplierProposalCard');
+	$head[$h][1] = $langs->trans('SupplierProposal');
 	$head[$h][2] = 'comm';
 	$h++;
 

From 100b0f297e897e055a146c71bc9e9d19f35734b2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 06:32:28 +0200
Subject: [PATCH 771/928] Fix Title supplier proposal contact card

---
 htdocs/core/lib/supplier_proposal.lib.php | 2 +-
 htdocs/supplier_proposal/contact.php      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php
index 4361bbe3ae7..e5c0ed7dbf9 100644
--- a/htdocs/core/lib/supplier_proposal.lib.php
+++ b/htdocs/core/lib/supplier_proposal.lib.php
@@ -40,7 +40,7 @@ function supplier_proposal_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('SupplierProposal');
+	$head[$h][1] = $langs->trans('CommRequests');
 	$head[$h][2] = 'comm';
 	$h++;
 
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 0ba4485361d..de2ac359321 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("propal", "facture", "orders", "sendings", "companies"));
+$langs->loadLangs(array("propal", "supplier_proposal", "facture", "orders", "sendings", "companies"));
 
 $id		= GETPOST('id', 'int');
 $ref	= GETPOST('ref', 'alpha');
@@ -98,7 +98,9 @@ if ($action == 'addcontact' && $permissiontoedit) {
 /*
  * View
  */
-
+$title = $langs->trans('CommRequests')." - ".$langs->trans('ContactsAddresses');
+$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+llxHeader('', $title, $help_url);
 $help_url = '';
 llxHeader('', $langs->trans("SupplierProposals"), $help_url);
 

From d66d38a8461e9419a44ae6713d28490635a1a5b4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 06:36:22 +0200
Subject: [PATCH 772/928] Fix Title supplier proposal note card

---
 htdocs/supplier_proposal/card.php    | 2 +-
 htdocs/supplier_proposal/contact.php | 4 +---
 htdocs/supplier_proposal/note.php    | 5 +++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 65b3addf9d1..cad41f905ef 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1035,7 +1035,7 @@ if (empty($reshook)) {
 /*
  * View
  */
-$title = $langs->trans('CommRequests')." - ".$langs->trans('Card');
+$title = $langs->trans('CommRequest')." - ".$langs->trans('Card');
 $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
 llxHeader('', $title, $help_url);
 
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index de2ac359321..02a4fc51966 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -98,11 +98,9 @@ if ($action == 'addcontact' && $permissiontoedit) {
 /*
  * View
  */
-$title = $langs->trans('CommRequests')." - ".$langs->trans('ContactsAddresses');
+$title = $langs->trans('CommRequest')." - ".$langs->trans('ContactsAddresses');
 $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
 llxHeader('', $title, $help_url);
-$help_url = '';
-llxHeader('', $langs->trans("SupplierProposals"), $help_url);
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index 372b6b6d20b..d16bc90033e 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -61,8 +61,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
 /*
  * View
  */
-
-llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');
+$title = $langs->trans('CommRequest')." - ".$langs->trans('Notes');
+$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 

From 7a105a054aea226d5f07355951f89f40409e5feb Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 06:40:01 +0200
Subject: [PATCH 773/928] Fix Title supplier proposal info card

---
 htdocs/supplier_proposal/info.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index 77268671275..80c67871e91 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -51,7 +51,9 @@ $result = restrictedArea($user, 'supplier_proposal', $id);
 
 $form = new Form($db);
 
-llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');
+$title = $langs->trans('CommRequest')." - ".$langs->trans('Info');
+$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+llxHeader('', $title, $help_url);
 
 $object = new SupplierProposal($db);
 $object->fetch($id);

From 6089332a2b8516ea1abe0013a291838ef0d3c112 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 06:40:14 +0200
Subject: [PATCH 774/928] Fix Title supplier proposal document card

---
 htdocs/supplier_proposal/document.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 1a61ba5620e..eaf02981966 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -36,7 +36,7 @@ if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 // Load translation files required by the page
-$langs->loadLangs(array('compta', 'other'));
+$langs->loadLangs(array('compta', 'supplier_proposal', 'other'));
 
 $action		= GETPOST('action', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
@@ -80,8 +80,9 @@ if ($object->id > 0) {
 /*
  * View
  */
-
-llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');
+$title = $langs->trans('CommRequest')." - ".$langs->trans('Documents');
+$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 

From 1f00689831467716fffcdb80be16ea748f285be1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 06:46:07 +0200
Subject: [PATCH 775/928] Fix Title supplier order card

---
 htdocs/fourn/commande/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index cc2cdc9fb86..bb0ad661c82 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1464,8 +1464,9 @@ if (!empty($conf->projet->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
+$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Card');
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
-llxHeader('', $langs->trans("Order"), $help_url);
+llxHeader('', $title, $help_url);
 
 $now = dol_now();
 

From 9f0cdb0153a18b18b400ebe18ade70aceb963c45 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 06:48:27 +0200
Subject: [PATCH 776/928] Fix Title supplier order contact card

---
 htdocs/fourn/commande/contact.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index f52aa20d494..d3618c2fe99 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -98,8 +98,9 @@ if ($action == 'addcontact' && ($user->rights->fournisseur->commande->creer || $
 /*
  * View
  */
+$title = $langs->trans('SupplierOrder')." - ".$langs->trans('ContactsAddresses');
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
-llxHeader('', $langs->trans("Order"), $help_url);
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);

From db50f8c27b8ae37430f6d8fdeb68a8c1f4f162a4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 06:49:49 +0200
Subject: [PATCH 777/928] Fix Title supplier order note card

---
 htdocs/fourn/commande/note.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index c4cc134fee7..cc39e589663 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -61,8 +61,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
 /*
  * View
  */
+$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Notes');
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
-llxHeader('', $langs->trans("Order"), $help_url);
+llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 

From eccd883156a977d9637feb517c1f68cc32d2d4d6 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 06:54:17 +0200
Subject: [PATCH 778/928] Fix Title supplier order document card

---
 htdocs/fourn/commande/document.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index f3dc1d26496..31e59342860 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -94,9 +94,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 $form = new	Form($db);
 
+$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Documents');
+$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
+llxHeader('', $title, $help_url);
+
 if ($object->id > 0) {
-	$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
-	llxHeader('', $langs->trans("Order"), $help_url);
 
 	$object->fetch_thirdparty();
 

From 7993e4634ac1da519a2dbc1278cd7a4ba288d8b1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 10 May 2021 07:01:24 +0200
Subject: [PATCH 779/928] Fix Title supplier order info card

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

diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 9260dab0b42..32af16d7dde 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -112,7 +112,7 @@ if ($id > 0 || !empty($ref)) {
 	$object->info($object->id);
 }
 
-$title = $langs->trans("SupplierOrder").' - '.$object->ref.' '.$object->name;
+$title = $langs->trans("SupplierOrder").' - '.$langs->trans('Info').' - '.$object->ref.' '.$object->name;
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
 }

From cd8c71497da8a6e1f6c7866b3ddda89144145fc8 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 10 May 2021 10:10:30 +0200
Subject: [PATCH 780/928] replace deprecated warehouse 'libelle'

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

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 4c279dd7c97..92d7c11e5ac 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -1235,7 +1235,7 @@ if ($id > 0 || !empty($ref)) {
 					}
 				} else {
 					$warehouse_static->id = $objp->warehouse_id;
-					$warehouse_static->libelle = $objp->entrepot;
+					$warehouse_static->label = $objp->entrepot;
 					print $warehouse_static->getNomUrl(1);
 				}
 				print '</td>';

From ed18045807bae1edcd874f9e738ace3db796ce75 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 11:30:37 +0200
Subject: [PATCH 781/928] FIX The comment of a reception was not correctly
 managed

---
 htdocs/fourn/commande/dispatch.php |  2 +-
 htdocs/reception/card.php          | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index b183092972e..ea061b157ce 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -397,7 +397,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fourn
 		$qty = $supplierorderdispatch->qty;
 		$entrepot = $supplierorderdispatch->fk_entrepot;
 		$product = $supplierorderdispatch->fk_product;
-		$price = GETPOST('price');
+		$price = price2num(GETPOST('price', 'alpha'), 'MU');
 		$comment = $supplierorderdispatch->comment;
 		$eatby = $supplierorderdispatch->eatby;
 		$sellby = $supplierorderdispatch->sellby;
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 607efb9606b..07ddf19805c 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -328,8 +328,6 @@ if (empty($reshook)) {
 				$sellby = "dluo".$i;
 				$batch = "batch".$i;
 
-				$timeFormat = '%d/%m/%Y';
-
 				if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && $conf->global->RECEPTION_GETS_ALL_ORDER_PRODUCTS)) {
 					$ent = "entl".$i;
 
@@ -354,7 +352,6 @@ if (empty($reshook)) {
 					$eatbydate = str_replace('/', '-', $eatby);
 					$sellbydate = str_replace('/', '-', $sellby);
 
-
 					$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate), strtotime($sellbydate), GETPOST($batch, 'alpha'));
 					if ($ret < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -958,6 +955,7 @@ if ($action == 'create') {
 			if ($numAsked) {
 				print '<tr class="liste_titre">';
 				print '<td>'.$langs->trans("Description").'</td>';
+				print '<td>'.$langs->trans("Comment").'</td>';
 				print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
 				print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
 				print '<td class="center">'.$langs->trans("QtyToReceive");
@@ -1056,18 +1054,22 @@ if ($action == 'create') {
 					print "</td>\n";
 				}
 
+				// Comment
+				//$defaultcomment = 'Line create from order line id '.$line->id;
+				$defaultcomment = '';
+				print '<td>';
+				print '<input type="text" class="maxwidth100" name="comment'.$indiceAsked.'" value="'.$defaultcomment.'">';
+				print '</td>';
+
 				// Qty
 				print '<td class="center">'.$line->qty;
-				print '<input type="hidden" name="fk_commandefournisseurdet'.$indiceAsked.'" value=\''.$line->id.'\' />';
-				print '<textarea style="display:none;"  name="comment'.$indiceAsked.'" >'.$line->desc.'</textarea>';
+				print '<input type="hidden" name="fk_commandefournisseurdet'.$indiceAsked.'" value="'.$line->id.'">';
 				print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
 				print '</td>';
 				$qtyProdCom = $line->qty;
 
 				// Qty already received
 				print '<td class="center">';
-
-
 				$quantityDelivered = $object->receptions[$line->id];
 				print $quantityDelivered;
 				print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
@@ -1137,8 +1139,8 @@ if ($action == 'create') {
 							print '<td colspan="3"></td>';
 						}
 					}
-					print "</tr>\n";
 				}
+				print "</tr>\n";
 
 				//Display lines extrafields
 				if (is_array($extralabelslines) && count($extralabelslines) > 0) {
@@ -1584,7 +1586,7 @@ if ($action == 'create') {
 		// Product/Service
 		print '<td>'.$langs->trans("Products").'</td>';
 		// Comment
-		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td>'.$langs->trans("Comment").'</td>';
 		// Qty
 		print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
 		if ($origin && $origin_id > 0) {
@@ -1747,9 +1749,9 @@ if ($action == 'create') {
 			}
 
 			if ($action == 'editline' && $lines[$i]->id == $line_id) {
-				print '<td><textarea name="comment'.$line_id.'" id="comment'.$line_id.'" /> '.$lines[$i]->comment.'</textarea></td>';
+				print '<td><input name="comment'.$line_id.'" id="comment'.$line_id.'" value="'.dol_escape_htmltag($lines[$i]->comment).'"></td>';
 			} else {
-				print '<td style="white-space: pre-wrap;max-width: 200px;" >'.$lines[$i]->comment.'</td>';
+				print '<td style="white-space: pre-wrap; max-width: 200px;">'.dol_escape_htmltag($lines[$i]->comment).'</td>';
 			}
 
 
@@ -1778,7 +1780,7 @@ if ($action == 'create') {
 							$htmltext = $langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($receptionline_var['date_valid'], 'dayhour'));
 							if (!empty($conf->stock->enabled) && $receptionline_var['warehouse'] > 0) {
 								$warehousestatic->fetch($receptionline_var['warehouse']);
-								$htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
+								$htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1, '', 0, 1);
 							}
 							print ' '.$form->textwithpicto('', $htmltext, 1);
 						}

From a2cd181435f52ff5d7062bee83019b1ab5738681 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 11:53:19 +0200
Subject: [PATCH 782/928] FIX Debug reception module

---
 htdocs/core/lib/pdf.lib.php                          |  2 +-
 .../modules/reception/doc/pdf_squille.modules.php    | 12 ++++++++++++
 htdocs/reception/class/reception.class.php           |  9 ++++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 086152a974b..d1c793c621c 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1233,7 +1233,7 @@ function pdf_writeLinkedObjects(&$pdf, $object, $outputlangs, $posx, $posy, $w,
 /**
  *	Output line description into PDF
  *
- *  @param  TCPDF				$pdf               PDF object
+ *  @param  TCPDF			$pdf               	PDF object
  *	@param	Object			$object				Object
  *	@param	int				$i					Current line number
  *  @param  Translate		$outputlangs		Object lang for output
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 4400cce2937..0e4474b6b8c 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -388,6 +388,18 @@ class pdf_squille extends ModelePdfReception
 					// Description of product line
 					$curX = $this->posxdesc - 1;
 
+					// The desc of line is not store into reception, so we force it to the value of product.
+					/*
+					if (empty($object->lines[0]->desc)) {
+						// TODO We must get value from fk_commendefourndet
+						$sqldesc = 'SELECT description FROM '.MAIN_DB_PREFIX.' WHERE rowid = '.((int) $object->lines[0]->fk_commandefourndet);
+						$resqldesc = $this->db->query($sqldesc);
+						if ($resqldesc) {
+							$objdesc = $this->db->fetch_object($resqldesc);
+							$object->lines[0]->desc = $objdesc->description;
+						}
+					}*/
+
 					$pdf->startTransaction();
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 946990f0c7b..33034f290d1 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -1043,13 +1043,15 @@ class Reception extends CommonObject
 				$line = new CommandeFournisseurDispatch($this->db);
 				$line->fetch($obj->rowid);
 				$line->fetch_product();
-				$sql_commfourndet = 'SELECT qty, ref,  label, tva_tx, vat_src_code, subprice, multicurrency_subprice, remise_percent FROM llx_commande_fournisseurdet WHERE rowid='.$line->fk_commandefourndet;
+				$sql_commfourndet = 'SELECT qty, ref,  label, description, tva_tx, vat_src_code, subprice, multicurrency_subprice, remise_percent';
+				$sql_commfourndet .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet';
+				$sql_commfourndet .= ' WHERE rowid = '.((int) $line->fk_commandefourndet);
 				$resql_commfourndet = $this->db->query($sql_commfourndet);
 				if (!empty($resql_commfourndet)) {
 					$obj = $this->db->fetch_object($resql_commfourndet);
 					$line->qty_asked = $obj->qty;
-					$line->description = $line->comment;
-					$line->desc = $line->comment;
+					$line->description = $obj->description;
+					$line->desc = $obj->description;
 					$line->tva_tx = $obj->tva_tx;
 					$line->vat_src_code = $obj->vat_src_code;
 					$line->subprice = $obj->subprice;
@@ -1060,6 +1062,7 @@ class Reception extends CommonObject
 				} else {
 					$line->qty_asked = 0;
 					$line->description = '';
+					$line->desc = '';
 					$line->label = $obj->label;
 				}
 

From dfe0ccee4547615a09b1caa54b0f02a52d673958 Mon Sep 17 00:00:00 2001
From: oscim <aurelien@oscim.fr>
Date: Mon, 10 May 2021 14:10:54 +0200
Subject: [PATCH 783/928] Update card.php

Add hook for block boxstats in fourn card
---
 htdocs/fourn/card.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 66de187bfe7..92c3d47b7fd 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -481,6 +481,13 @@ if ($object->id > 0) {
 		}
 	}
 
+	
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreBoxStatsSupplier', $parameters, $object, $action);
+	if (empty($reshook)) {
+		$boxstat .= $hookmanager->resPrint;
+	}
+	
 	$boxstat .= '</td></tr>';
 	$boxstat .= '</table>';
 	$boxstat .= '</div>';

From b9bdd9ed8a49012802d85e425bf8962379346f84 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 10 May 2021 12:13:50 +0000
Subject: [PATCH 784/928] Fixing style errors.

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

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 92c3d47b7fd..90934062910 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -481,13 +481,13 @@ if ($object->id > 0) {
 		}
 	}
 
-	
+
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreBoxStatsSupplier', $parameters, $object, $action);
 	if (empty($reshook)) {
 		$boxstat .= $hookmanager->resPrint;
 	}
-	
+
 	$boxstat .= '</td></tr>';
 	$boxstat .= '</table>';
 	$boxstat .= '</div>';

From 0d3afb573a0697dfbaa8bfa29d72596ca4334fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 10 May 2021 14:33:26 +0200
Subject: [PATCH 785/928] align check code

---
 build/generate_filelist_xml.php      | 5 +++--
 htdocs/admin/system/filecheck.php    | 6 +++---
 htdocs/api/class/api_setup.class.php | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 63562f1f4f3..f5d9f64e518 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -157,8 +157,9 @@ $iterator1 = new RecursiveIteratorIterator($dir_iterator1);
 // Need to ignore document custom etc. Note: this also ignore natively symbolic links.
 $files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 */
-$regextoinclude='\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+// Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php)
+$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
+$regextoexclude = '('.($includecustom?'':'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 
 $dir='';
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index b506231a59b..530860dee71 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -226,9 +226,9 @@ if (!$error && $xml) {
 		//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
 		$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
 
-		// Defined qualified files (must be same than into generate_filelist_xml.php)
-		$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-		$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
+		// Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php)
+		$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
+		$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
 		$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
 
 		// Fill file_list with files in signature, new files, modified files
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index acd39361842..15d31140874 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1744,9 +1744,9 @@ class Setup extends DolibarrApi
 			if (is_object($xml->dolibarr_htdocs_dir[0])) {
 				$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
 
-				// Defined qualified files (must be same than into generate_filelist_xml.php)
+				// Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php)
 				$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-				$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
+				$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
 				$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
 
 				// Fill file_list with files in signature, new files, modified files

From 81008fa0dabb2d4301abba8c580e84779b12d585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 10 May 2021 14:39:40 +0200
Subject: [PATCH 786/928] greenlight

---
 htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 4cb80e0a81e..6e89c6f00ad 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1369,7 +1369,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);

From ed36db2b0fbae7e0d6c9dc047c28d60947b9f8f2 Mon Sep 17 00:00:00 2001
From: "M.Afzalzadeh Torfeh" <mafzalzadeh@yahoo.com>
Date: Mon, 10 May 2021 17:25:14 +0430
Subject: [PATCH 787/928] fix syntax error on #a2cd181

---
 htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 4cb80e0a81e..8d860a3fcda 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1369,7 +1369,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom", 0, 'L'));
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);

From 2dd3148e3f2eb7e026a98977b46ce1db7d8e758d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 15:24:07 +0200
Subject: [PATCH 788/928] Fix look and feel v14

---
 htdocs/admin/commande_fournisseur_dispatch_extrafields.php | 2 +-
 htdocs/admin/reception_extrafields.php                     | 2 +-
 htdocs/admin/reception_setup.php                           | 2 +-
 htdocs/core/lib/functions.lib.php                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
index d0c7c85463e..ac8f4fced4d 100644
--- a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
+++ b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
@@ -84,7 +84,7 @@ print "<br>\n";
 
 $head = reception_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'attributeslines_reception', $langs->trans("Receptions"), -1, 'sending');
+print dol_get_fiche_head($head, 'attributeslines_reception', $langs->trans("Receptions"), -1, 'reception');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/reception_extrafields.php b/htdocs/admin/reception_extrafields.php
index ab7d18b1331..8e4205a7bdc 100644
--- a/htdocs/admin/reception_extrafields.php
+++ b/htdocs/admin/reception_extrafields.php
@@ -84,7 +84,7 @@ print "<br>\n";
 
 $head = reception_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'attributes_reception', $langs->trans("Receptions"), -1, 'sending');
+print dol_get_fiche_head($head, 'attributes_reception', $langs->trans("Receptions"), -1, 'reception');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 734c953a092..6ea6d195040 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -172,7 +172,7 @@ print load_fiche_titre($langs->trans("ReceptionsSetup"), $linkback, 'title_setup
 print '<br>';
 $head = reception_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'reception', $langs->trans("Receptions"), -1, 'sending');
+print dol_get_fiche_head($head, 'reception', $langs->trans("Receptions"), -1, 'reception');
 
 // Reception numbering model
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 77f0df8379b..9316b871a08 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3511,7 +3511,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
 				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'refresh', 'salary', 'shipment', 'supplier_invoice', 'technic', 'ticket',
 				'error', 'warning',
-				'recruitmentcandidature', 'recruitmentjobposition', 'resource',
+				'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource',
 				'shapes', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
 				'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
 				'uncheck', 'user-cog', 'website', 'workstation',

From 64992706193d51c4aa630aded01a87c91a98e6c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 15:29:23 +0200
Subject: [PATCH 789/928] v14

---
 htdocs/core/lib/functions.lib.php      | 2 +-
 htdocs/core/modules/modAsset.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9316b871a08..727bfaee5b8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3598,7 +3598,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			if (in_array($pictowithouttext, array('conferenceorbooth', 'collab', 'eventorganization', 'holiday', 'info', 'project', 'workstation'))) {
 				$morecss = 'em088';
 			}
-			if (in_array($pictowithouttext, array('intervention', 'payment', 'loan', 'partnership', 'stock', 'technic'))) {
+			if (in_array($pictowithouttext, array('asset', 'intervention', 'payment', 'loan', 'partnership', 'stock', 'technic'))) {
 				$morecss = 'em080';
 			}
 
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index 12b58bfcc38..3a51a366970 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -69,7 +69,7 @@ class modAsset extends DolibarrModules
 		// 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 = 'accounting';
+		$this->picto = 'asset';
 
 		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
 		// for default path (eg: /asset/core/xxxxx) (0=disable, 1=enable)

From 107374748ea4ef674914fe2f776e52da7cc465ed Mon Sep 17 00:00:00 2001
From: ksar <35605507+ksar-ksar@users.noreply.github.com>
Date: Mon, 10 May 2021 15:42:24 +0200
Subject: [PATCH 790/928] FIX #13955

---
 htdocs/accountancy/customer/lines.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index a5c603c2504..e084bdcfc5b 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -197,7 +197,7 @@ $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.")";
 } 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.")";
 }
 // Add search filter like
 if ($search_societe) {

From 73f63509e38e40f5afa689ccee04b1e4ef127614 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 19:12:03 +0200
Subject: [PATCH 791/928] Fix permissions

---
 htdocs/reception/card.php    | 41 +++++++++++++++++++++++-------------
 htdocs/reception/contact.php | 12 +++--------
 htdocs/reception/note.php    | 11 +++++-----
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 07ddf19805c..4c8aeac030b 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -117,6 +117,26 @@ $permissiondellink = $user->rights->reception->creer; // Used by the include of
 
 $date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
 
+$object = new Reception($db);
+if ($id > 0 || !empty($ref)) {
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
+
+	if (!empty($object->origin)) {
+		$origin = $object->origin;
+
+		$object->fetch_origin();
+		$typeobject = $object->origin;
+	}
+
+	// Linked documents
+	if ($origin == 'order_supplier' && $object->$typeobject->id && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled))) {
+		$origin_id = $object->$typeobject->id;
+		$objectsrc = new CommandeFournisseur($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
+}
+
 // Security check
 $socid = '';
 if ($user->socid) {
@@ -124,13 +144,10 @@ if ($user->socid) {
 }
 
 if ($origin == 'reception') {
-	$result = restrictedArea($user, $origin, $id);
+	$result = restrictedArea($user, 'reception', $id);
 } else {
-	$result = restrictedArea($user, 'reception');
-	if ($origin == 'supplierorder') {
-		if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) {
-			accessforbidden();
-		}
+	if ($origin == 'supplierorder' || $origin == 'order_supplier') {
+		$result = restrictedArea($user, 'fournisseur', $origin_id, 'commande_fournisseur', 'commande');
 	} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
 		accessforbidden();
 	}
@@ -150,14 +167,12 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	if ($cancel) {
 		$action = '';
-		$object->fetch($id); // show reception also after canceling modification
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
 	// Reopen
 	if ($action == 'reopen' && $user->rights->reception->creer) {
-		$object->fetch($id);
 		$result = $object->reOpen();
 	}
 
@@ -192,7 +207,6 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'setref_supplier') {
-		$result = $object->fetch($id);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -528,14 +542,12 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 		}
 	} elseif ($action == 'classifybilled') {
-		$object->fetch($id);
 		$result = $object->setBilled();
 		if ($result >= 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		}
 	} elseif ($action == 'classifyclosed') {
-		$object->fetch($id);
 		$result = $object->setClosed();
 		if ($result >= 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
@@ -543,7 +555,6 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'deleteline' && !empty($line_id)) {
 		// delete a line
-		$object->fetch($id);
 		$lines = $object->lines;
 		$line = new CommandeFournisseurDispatch($db);
 
@@ -1331,7 +1342,7 @@ if ($action == 'create') {
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border centpercent">';
+		print '<table class="border centpercent tableforfield">';
 
 		// Linked documents
 		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
@@ -1495,11 +1506,11 @@ if ($action == 'create') {
 		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border centpercent">';
+		print '<table class="border centpercent tableforfield">';
 
 		// Reception method
 		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('ReceptionMethod');
 		print '</td>';
 
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index c99b44074eb..7e293f3b67c 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -35,9 +35,7 @@ if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
-$langs->load("orders");
-$langs->load("receptions");
-$langs->load("companies");
+$langs->loadLangs(array("orders", "receptions", "companies"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -62,7 +60,6 @@ if ($id > 0 || !empty($ref)) {
 	}
 }
 
-
 // Security check
 if ($user->socid > 0) {
 	$socid = $user->socid;
@@ -70,11 +67,8 @@ if ($user->socid > 0) {
 if ($origin == 'reception') {
 	$result = restrictedArea($user, $origin, $object->id);
 } else {
-	$result = restrictedArea($user, 'reception');
-	if ($origin == 'supplierorder') {
-		if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) {
-			accessforbidden();
-		}
+	if ($origin == 'supplierorder' || $origin == 'order_supplier') {
+		$result = restrictedArea($user, 'fournisseur', $origin_id, 'commande_fournisseur', 'commande');
 	} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
 		accessforbidden();
 	}
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index a3a2b31589c..d23aebd28b7 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -70,13 +70,14 @@ if ($user->socid > 0) {
 if ($origin == 'reception') {
 	$result = restrictedArea($user, $origin, $object->id);
 } else {
-	$result = restrictedArea($user, 'reception');
-	if ($origin == 'supplierorder') {
-		if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) {
+	if ($origin == 'reception') {
+		$result = restrictedArea($user, $origin, $object->id);
+	} else {
+		if ($origin == 'supplierorder' || $origin == 'order_supplier') {
+			$result = restrictedArea($user, 'fournisseur', $origin_id, 'commande_fournisseur', 'commande');
+		} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
 			accessforbidden();
 		}
-	} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
-		accessforbidden();
 	}
 }
 

From 23d19a8af3ae7807dcdb37ea1f323b99dfa25f13 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 19:20:17 +0200
Subject: [PATCH 792/928] Fix permissions

---
 htdocs/expedition/card.php    | 27 +++++++++------------------
 htdocs/expedition/contact.php |  7 -------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index c204afcef72..0c7d51edcfe 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -82,21 +82,6 @@ if (empty($origin_id)) {
 $ref = GETPOST('ref', 'alpha');
 $line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
 
-// Security check
-$socid = '';
-if ($user->socid) {
-	$socid = $user->socid;
-}
-
-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');
 $cancel = GETPOST('cancel', 'alpha');
@@ -121,18 +106,24 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('expeditioncard', 'globalcard'));
 
-$permissiondellink = $user->rights->expedition->delivery->creer; // Used by the include of actions_dellink.inc.php
-//var_dump($object->lines[0]->detail_batch);
-
 $date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
 
+if ($id > 0 || !empty($ref)) {
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
+}
+
 // Security check
+$socid = '';
 if ($user->socid) {
 	$socid = $user->socid;
 }
 
 $result = restrictedArea($user, 'expedition', $object->id, '');
 
+$permissiondellink = $user->rights->expedition->delivery->creer; // Used by the include of actions_dellink.inc.php
+//var_dump($object->lines[0]->detail_batch);
+
 
 /*
  * Actions
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index cd9febc685d..f6f6fb7e1c7 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -108,13 +108,6 @@ if ($action == 'addcontact' && $user->rights->expedition->creer) {
 		dol_print_error($db);
 	}
 }
-/*
-elseif ($action == 'setaddress' && $user->rights->expedition->creer)
-{
-	$object->fetch($id);
-	$result=$object->setDeliveryAddress($_POST['fk_address']);
-	if ($result < 0) dol_print_error($db,$object->error);
-}*/
 
 
 /*

From 1ca73e609c768f6ce591105e93c600d373545911 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 19:26:47 +0200
Subject: [PATCH 793/928] Clean code

---
 htdocs/reception/card.php    |  1 -
 htdocs/reception/contact.php | 14 +-------------
 htdocs/reception/note.php    |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 4c8aeac030b..75f5401d401 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1334,7 +1334,6 @@ if ($action == 'create') {
 		}
 		$morehtmlref .= '</div>';
 
-		$object->picto = 'sending';
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 7e293f3b67c..609cb0d12b7 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -113,13 +113,6 @@ if ($action == 'addcontact' && $user->rights->reception->creer) {
 		dol_print_error($db);
 	}
 }
-/*
-elseif ($action == 'setaddress' && $user->rights->reception->creer)
-{
-	$object->fetch($id);
-	$result=$object->setDeliveryAddress($_POST['fk_address']);
-	if ($result < 0) dol_print_error($db,$object->error);
-}*/
 
 
 /*
@@ -135,11 +128,7 @@ $contactstatic = new Contact($db);
 $userstatic = new User($db);
 
 
-/* *************************************************************************** */
-/*                                                                             */
-/* Mode vue et edition                                                         */
-/*                                                                             */
-/* *************************************************************************** */
+// View mode
 
 if ($id > 0 || !empty($ref)) {
 	$langs->trans("OrderCard");
@@ -193,7 +182,6 @@ if ($id > 0 || !empty($ref)) {
 	}
 	$morehtmlref .= '</div>';
 
-	$object->picto = 'sending';
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index d23aebd28b7..f343e56e14d 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -148,7 +148,6 @@ if ($id > 0 || !empty($ref)) {
 	}
 	$morehtmlref .= '</div>';
 
-	$object->picto = 'sending';
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 

From f8581a1a011a0ccdc58237501f36e2d299201ebc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 19:33:45 +0200
Subject: [PATCH 794/928] Look and feel v14

---
 htdocs/expedition/card.php     | 2 +-
 htdocs/expedition/contact.php  | 2 +-
 htdocs/expedition/document.php | 2 +-
 htdocs/expedition/note.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 0c7d51edcfe..cc441d9f50f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1516,7 +1516,7 @@ if ($action == 'create') {
 		$res = $object->fetch_optionals();
 
 		$head = shipping_prepare_head($object);
-		print dol_get_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, 'sending');
+		print dol_get_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, $object->picto);
 
 		$formconfirm = '';
 
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index f6f6fb7e1c7..164935a1437 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -136,7 +136,7 @@ if ($id > 0 || !empty($ref)) {
 	$langs->trans("OrderCard");
 
 	$head = shipping_prepare_head($object);
-	print dol_get_fiche_head($head, 'contact', $langs->trans("Shipment"), -1, 'sending');
+	print dol_get_fiche_head($head, 'contact', $langs->trans("Shipment"), -1, $object->picto);
 
 
 	// Shipment card
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index c5e13967abc..c392187d607 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -99,7 +99,7 @@ if ($id > 0 || !empty($ref)) {
 		$upload_dir = $conf->expedition->dir_output.'/sending/'.dol_sanitizeFileName($object->ref);
 
 		$head = shipping_prepare_head($object);
-		print dol_get_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending');
+		print dol_get_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, $object->picto);
 
 
 		// Build file list
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index db28e409309..a9076162015 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -89,7 +89,7 @@ $form = new Form($db);
 
 if ($id > 0 || !empty($ref)) {
 	$head = shipping_prepare_head($object);
-	print dol_get_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Shipment"), -1, $object->picto);
 
 
 	// Shipment card

From d7a5e342ab1dba46c09e6b276bda7fcdbbdceab7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 20:16:51 +0200
Subject: [PATCH 795/928] Optimize some widgets

---
 htdocs/core/boxes/box_factures_fourn.php         | 7 ++++---
 htdocs/core/boxes/box_factures_fourn_imp.php     | 7 ++++---
 htdocs/core/boxes/box_factures_imp.php           | 2 ++
 htdocs/fourn/class/fournisseur.facture.class.php | 9 ++++-----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 3bf3bcb07c2..a2ce199faee 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -142,6 +142,10 @@ class box_factures_fourn extends ModeleBoxes
 					$facturestatic->status = $objp->status;
 					$facturestatic->ref_supplier = $objp->ref_supplier;
 
+					$alreadypaid = $facturestatic->getSommePaiement();
+
+					$facturestatic->alreadypaid = $alreadypaid ? $alreadypaid : 0;
+
 					$thirdpartystatic->id = $objp->socid;
 					$thirdpartystatic->name = $objp->name;
 					$thirdpartystatic->name_alias = $objp->name_alias;
@@ -188,9 +192,6 @@ class box_factures_fourn extends ModeleBoxes
 						'text' => dol_print_date($date, 'day'),
 					);
 
-					$fac = new FactureFournisseur($this->db);
-					$fac->fetch($objp->facid);
-					$alreadypaid = $fac->getSommePaiement();
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right" width="18"',
 						'text' => $facturestatic->LibStatut($objp->paye, $objp->status, 3, $alreadypaid, $objp->type),
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 826c89cf2de..aea07802fdf 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -134,6 +134,10 @@ class box_factures_fourn_imp extends ModeleBoxes
 					$facturestatic->statut = $objp->status;
 					$facturestatic->status = $objp->status;
 
+					$alreadypaid = $facturestatic->getSommePaiement();
+
+					$facturestatic->alreadypaid = $alreadypaid ? $alreadypaid : 0;
+
 					$thirdpartystatic->id = $objp->socid;
 					$thirdpartystatic->name = $objp->name;
 					$thirdpartystatic->name_alias = $objp->name_alias;
@@ -174,9 +178,6 @@ class box_factures_fourn_imp extends ModeleBoxes
 						'text' => dol_print_date($datelimite, 'day'),
 					);
 
-					$fac = new FactureFournisseur($this->db);
-					$fac->fetch($objp->facid);
-					$alreadypaid = $fac->getSommePaiement();
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right" width="18"',
 						'text' => $facturestatic->LibStatut($objp->paye, $objp->status, 3, $alreadypaid, $objp->type),
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 54d3a950a79..1830dcd5c7a 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -132,7 +132,9 @@ class box_factures_imp extends ModeleBoxes
 
 				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
+
 					$datelimite = $this->db->jdate($objp->datelimite);
+
 					$facturestatic->id = $objp->facid;
 					$facturestatic->ref = $objp->ref;
 					$facturestatic->type = $objp->type;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index dd1ea179553..78925c74b9f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2501,6 +2501,10 @@ class FactureFournisseur extends CommonInvoice
 		}
 		if (isset($this->status)) {
 			$alreadypaid = -1;
+			if (isset($this->alreadypaid)) {
+				$alreadypaid = $this->alreadypaid;
+			}
+
 			$label .= ' '.$this->getLibStatut(5, $alreadypaid);
 		}
 		if (!empty($this->ref)) {
@@ -2527,9 +2531,6 @@ class FactureFournisseur extends CommonInvoice
 		if ($moretitle) {
 			$label .= ' - '.$moretitle;
 		}
-		if (isset($this->statut) && isset($this->alreadypaid)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
-		}
 
 		$ref = $this->ref;
 		if (empty($ref)) {
@@ -2567,8 +2568,6 @@ class FactureFournisseur extends CommonInvoice
 				$result .= '<a href="'.DOL_URL_ROOT.'/fourn/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
 				$result .= img_picto('', 'note');
 				$result .= '</a>';
-				//$result.=img_picto($langs->trans("ViewNote"),'object_generic');
-				//$result.='</a>';
 				$result .= '</span>';
 			}
 		}

From 4417792b2f778f725d818eec9612dd44c80866e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 21:04:38 +0200
Subject: [PATCH 796/928] Prepare 13.0.3

---
 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 7a68d2c3099..e6c0ef4a176 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', '13.0.2'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (!defined('DOL_VERSION')) define('DOL_VERSION', '13.0.3'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (!defined('EURO')) define('EURO', chr(128));
 

From 837c828b1dd78c2829e89b0a366e02d4fa1bdf2b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 21:04:38 +0200
Subject: [PATCH 797/928] Prepare 13.0.3

---
 ChangeLog               | 57 +++++++++++++++++++++++++++++++++++++++++
 htdocs/filefunc.inc.php |  2 +-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e685669f01d..972a27bc896 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,63 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+***** ChangeLog for 13.0.3 compared to 13.0.2 *****
+
+FIX: 13.0 warning - missing quotes around 'label'
+FIX: #16143 Old PG requires "()" on DROP FUNCTION
+FIX: #16843
+FIX: #17060
+FIX: #17192 - With tz < 0, event is show in bad day on calendar views
+FIX: #17363
+FIX: #17476 releve.php: Fix SQL statement
+FIX: Accountancy - Import in general ledger
+FIX: Accountancy - Quadra export - wrong data on credit
+FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries
+FIX: Add function price2num for rounding values in productAlertStock box
+FIX: Add parameter to function price2num()
+FIX: Cannot delete a batch material from item receipts
+FIX: cast int
+FIX: Change parameters MF to MS for price2num() function
+FIX: create event from contact card preselect contact correctly
+FIX: create sociales : keep values error form
+FIX: dol_print_date for %a and %b with some timezone
+FIX: email is not case sensitive
+FIX: error for duplicate thirdparty found correctly returned by ws
+FIX: Espadon PDF shippment model with long public note now wroking
+FIX: esupplier order: error 500 when using packaging with product where it is not defined
+FIX: Filter on debit/credit
+FIX: Filter on supplier payment list
+FIX: fix checkbox displayed according to module project setup parameters - work in progress
+FIX: inconsistency in margin recording with option "Force to sale price"
+FIX: invoice PDF generation after payment
+FIX: mask selector fournisseur if module not activate
+FIX: merge thirparty also work for bank URL entry
+FIX: Missing extrafields into export of agenda record
+FIX: missing parameter in select for POP
+FIX: missing return edit if update error
+FIX: missing token on dolGetButtonAction for action delete
+FIX: payment creation: re-generate invoice PDF with correct display options
+FIX: payment validation: invoices PDF were no re-generated, make it with correct display options
+FIX: Periodicity by default on fiscal year, according to the now date, we have plus 1 year added
+FIX: pgsql: prevent 'WHERE 1'
+FIX: PHP version requirement in composer.json
+FIX: project visibility field with two option
+FIX: saving template email
+FIX: search accented words in product description (consumption page)
+FIX: Search on date in accountancy
+FIX: selection of project for reception must use
+FIX: shhhhhh ! There is nothing here...
+FIX: Show input field checkbox selection
+FIX: Show Ref.Supplier in LinkToObjectBlock
+FIX: SQL Error show_contacts : socialnetworks
+FIX: Start hour on ACCOUNTING_DATE_START_BINDING
+FIX: supplier order: error 500 when using packaging with product where it is not defined
+FIX: test must be === and not ==
+FIX: test on link type
+FIX: type link extrafield case for advanced target emailing
+FIX: Write right on document
+
+
 ***** ChangeLog for 13.0.2 compared to 13.0.1 *****
 
 FIX: 11.0 - $this->socid injected in query without checking for empty value
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 7a68d2c3099..e6c0ef4a176 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', '13.0.2'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (!defined('DOL_VERSION')) define('DOL_VERSION', '13.0.3'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (!defined('EURO')) define('EURO', chr(128));
 

From b01e7957232a99ac9ec449a337efa2e253c63ada Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 May 2021 21:28:11 +0200
Subject: [PATCH 798/928] Fix of build package

---
 htdocs/modulebuilder/index.php | 56 +++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 9cb22f735e6..f8ca876eafc 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1521,7 +1521,7 @@ if ($dirins && $action == 'generatepackage') {
 
 	$arrayversion = explode('.', $moduleobj->version, 3);
 	if (count($arrayversion)) {
-		$FILENAMEZIP = "module_".$modulelowercase.'-'.$arrayversion[0].($arrayversion[1] ? '.'.$arrayversion[1] : '').($arrayversion[2] ? '.'.$arrayversion[2] : '').'.zip';
+		$FILENAMEZIP = "module_".$modulelowercase.'-'.$arrayversion[0].(empty($arrayversion[1]) ? '.0' : '.'.$arrayversion[1]).($arrayversion[2] ? '.'.$arrayversion[2] : '').'.zip';
 
 		$dirofmodule = dol_buildpath($modulelowercase, 0).'/bin';
 		$outputfilezip = $dirofmodule.'/'.$FILENAMEZIP;
@@ -3022,7 +3022,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="tabobj" value="'.dol_escape_htmltag($tabobj).'">';
 
 				print '<div class="div-table-responsive">';
-				print '<table class="noborder">';
+				print '<table class="noborder small">';
 
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("Type", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
@@ -3044,51 +3044,51 @@ if ($module == 'initmodule') {
 						print '<tr class="oddeven">';
 
 						print '<td>';
-						print $menu['type'];
+						print dol_escape_htmltag($menu['type']);
 						print '</td>';
 
 						print '<td>';
-						print $menu['fk_menu'];
+						print dol_escape_htmltag($menu['fk_menu']);
 						print '</td>';
 
 						print '<td>';
-						print $menu['titre'];
+						print dol_escape_htmltag($menu['titre']);
 						print '</td>';
 
 						print '<td>';
-						print $menu['mainmenu'];
+						print dol_escape_htmltag($menu['mainmenu']);
 						print '</td>';
 
 						print '<td>';
-						print $menu['leftmenu'];
+						print dol_escape_htmltag($menu['leftmenu']);
+						print '</td>';
+
+						print '<td class="tdoverflowmax300" title="'.dol_escape_htmltag($menu['url']).'">';
+						print dol_escape_htmltag($menu['url']);
 						print '</td>';
 
 						print '<td>';
-						print $menu['url'];
+						print dol_escape_htmltag($menu['langs']);
 						print '</td>';
 
 						print '<td>';
-						print $menu['langs'];
+						print dol_escape_htmltag($menu['position']);
+						print '</td>';
+
+						print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($menu['enabled']).'">';
+						print dol_escape_htmltag($menu['enabled']);
+						print '</td>';
+
+						print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($menu['perms']).'">';
+						print dol_escape_htmltag($menu['perms']);
 						print '</td>';
 
 						print '<td>';
-						print $menu['position'];
-						print '</td>';
-
-						print '<td>';
-						print $menu['enabled'];
-						print '</td>';
-
-						print '<td>';
-						print $menu['perms'];
-						print '</td>';
-
-						print '<td>';
-						print $menu['target'];
+						print dol_escape_htmltag($menu['target']);
 						print '</td>';
 
 						print '<td class="right">';
-						print $menu['user'];
+						print dol_escape_htmltag($menu['user']);
 						print '</td>';
 
 						print '</tr>';
@@ -3447,7 +3447,7 @@ if ($module == 'initmodule') {
 						print '</tr>';
 					}
 				} else {
-					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("NoWidget");
+					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("WidgetFile").' : <span class="opacitymedium">'.$langs->trans("NoWidget").'</span>';
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initwidget&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 					print '</td></tr>';
 				}
@@ -3792,7 +3792,7 @@ if ($module == 'initmodule') {
 				print $outputfiledoc;
 				print '</a>';
 				print '</strong>';
-				print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledoc), 'dayhour').')';
+				print ' <span class="opacitymedium">('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledoc), 'dayhour').')</span>';
 			}
 			print '</strong><br>';
 
@@ -3806,7 +3806,7 @@ if ($module == 'initmodule') {
 				print $outputfiledocpdf;
 				print '</a>';
 				print '</strong>';
-				print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledocpdf), 'dayhour').')';
+				print ' <span class="opacitymedium">('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledocpdf), 'dayhour').')</span>';
 			}
 			print '</strong><br>';
 
@@ -3860,7 +3860,7 @@ if ($module == 'initmodule') {
 
 			$arrayversion = explode('.', $moduleobj->version, 3);
 			if (count($arrayversion)) {
-				$FILENAMEZIP = "module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2] ? ".".$arrayversion[2] : "").".zip";
+				$FILENAMEZIP = "module_".$modulelowercase.'-'.$arrayversion[0].(empty($arrayversion[1]) ? '.0' : '.'.$arrayversion[1]).($arrayversion[2] ? ".".$arrayversion[2] : '').".zip";
 				$outputfilezip = dol_buildpath($modulelowercase, 0).'/bin/'.$FILENAMEZIP;
 			}
 
@@ -3872,7 +3872,7 @@ if ($module == 'initmodule') {
 			} else {
 				$relativepath = $modulelowercase.'/bin/'.$FILENAMEZIP;
 				print '<strong><a href="'.DOL_URL_ROOT.'/document.php?modulepart=packages&file='.urlencode($relativepath).'">'.$outputfilezip.'</a></strong>';
-				print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfilezip), 'dayhour').')';
+				print ' <span class="opacitymedium">('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfilezip), 'dayhour').')</span>';
 			}
 			print '</strong><br>';
 

From 20724efd44641698ee42d4691c0397f90579ca3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 00:04:11 +0200
Subject: [PATCH 799/928] fix $mysoc not defined (php8 warning)

---
 htdocs/main.inc.php | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4231160b64f..0c3679adac5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1960,7 +1960,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
  */
 function top_menu_user($hideloginname = 0, $urllogout = '')
 {
-	global $langs, $conf, $db, $hookmanager, $user;
+	global $langs, $conf, $db, $hookmanager, $user, $mysoc;
 	global $dolibarr_main_authentication, $dolibarr_main_demo;
 	global $menumanager;
 
@@ -1985,13 +1985,27 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	$dropdownBody .= '<span id="topmenulogincompanyinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowCompanyInfos").'</span>';
 	$dropdownBody .= '<div id="topmenulogincompanyinfo" >';
 
-	if (!empty($conf->global->MAIN_INFO_SIREN))      $dropdownBody .= '<br><b>'.$langs->transcountry("ProfId1Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_SIREN).'</span>';
-	if (!empty($conf->global->MAIN_INFO_SIRET))      $dropdownBody .= '<br><b>'.$langs->transcountry("ProfId2Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_SIRET).'</span>';
-	if (!empty($conf->global->MAIN_INFO_APE))        $dropdownBody .= '<br><b>'.$langs->transcountry("ProfId3Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_APE).'</span>';
-	if (!empty($conf->global->MAIN_INFO_RCS))        $dropdownBody .= '<br><b>'.$langs->transcountry("ProfId4Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_RCS).'</span>';
-	if (!empty($conf->global->MAIN_INFO_PROFID5))    $dropdownBody .= '<br><b>'.$langs->transcountry("ProfId5Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_PROFID5).'</span>';
-	if (!empty($conf->global->MAIN_INFO_PROFID6))    $dropdownBody .= '<br><b>'.$langs->transcountry("ProfId6Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_PROFID6).'</span>';
-	if (!empty($conf->global->MAIN_INFO_TVAINTRA))   $dropdownBody .= '<br><b>'.$langs->trans("VATIntraShort").'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_TVAINTRA).'</span>';
+	if (!empty($conf->global->MAIN_INFO_SIREN)) {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId1Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_SIREN).'</span>';
+	}
+	if (!empty($conf->global->MAIN_INFO_SIRET)) {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId2Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_SIRET).'</span>';
+	}
+	if (!empty($conf->global->MAIN_INFO_APE)) {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId3Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_APE).'</span>';
+	}
+	if (!empty($conf->global->MAIN_INFO_RCS)) {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId4Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_RCS).'</span>';
+	}
+	if (!empty($conf->global->MAIN_INFO_PROFID5)) {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId5Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_PROFID5).'</span>';
+	}
+	if (!empty($conf->global->MAIN_INFO_PROFID6)) {
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId6Short", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_PROFID6).'</span>';
+	}
+	if (!empty($conf->global->MAIN_INFO_TVAINTRA)) {
+		$dropdownBody .= '<br><b>'.$langs->trans("VATIntraShort").'</b>: <span>'.showValueWithClipboardCPButton($conf->global->MAIN_INFO_TVAINTRA).'</span>';
+	}
 
 	$dropdownBody .= '</div>';
 

From 7b764486fdff3d788aadb8f3d482b91d245488c5 Mon Sep 17 00:00:00 2001
From: "M.Afzalzadeh Torfeh" <mafzalzadeh@yahoo.com>
Date: Tue, 11 May 2021 09:59:26 +0430
Subject: [PATCH 800/928] fix integration testing error

---
 htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 8d860a3fcda..6e89c6f00ad 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1369,7 +1369,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom", 0, 'L'));
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);

From c2de343b4e4661a81e3df92942e7a26b59843ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 08:01:13 +0200
Subject: [PATCH 801/928] fix php8 warning

---
 htdocs/ticket/card.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index e6f3f21050c..ae79bcb2db2 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2016 Jean-François FERRY <hello@librethic.io>
  * Copyright (C) 2016      Christophe Battarel <christophe@altairis.fr>
  * Copyright (C) 2018      Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021		Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -751,7 +752,7 @@ if ($action == 'create' || $action == 'presend') {
 	|| $action == 'editsubject' || $action == 'edit_extras' || $action == 'update_extras' || $action == 'edit_extrafields' || $action == 'set_extrafields' || $action == 'classify' || $action == 'sel_contract' || $action == 'edit_message_init' || $action == 'set_status' || $action == 'dellink') {
 	if ($res > 0) {
 		// or for unauthorized internals users
-		if (!$user->socid && ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
+		if (!$user->socid && (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
 			accessforbidden('', 0, 1);
 		}
 
@@ -853,7 +854,7 @@ if ($action == 'create' || $action == 'presend') {
 			print dol_get_fiche_end();
 		}
 
-		if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
+		if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
 			$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
 		} elseif ($user->socid > 0) {
 			$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
@@ -1030,7 +1031,7 @@ if ($action == 'create' || $action == 'presend') {
 		print '</tr>';
 
 		// Timing (Duration sum of linked fichinter)
-		if ($conf->fichinter->enabled) {
+		if ($conf->ficheinter->enabled) {
 			$object->fetchObjectLinked();
 			$num = count($object->linkedObjects);
 			$timing = 0;

From 9725c8f3090cee35345e11bbc85bc993463dafdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 08:05:30 +0200
Subject: [PATCH 802/928] fix php8 warning

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

diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 9c15a71f43c..3b826b2ead5 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2014	Maxime Kohlhaas		<support@atm-consulting.fr>
  * Copyright (C) 2014	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2021		Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,7 +60,7 @@ if ($reshook < 0) {
 
 
 //var_dump($extrafields->attributes[$object->table_element]);
-if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label'])) {
+if (empty($reshook) && isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label'])) {
 	$lastseparatorkeyfound = '';
 	$extrafields_collapse_num = '';
 	$extrafields_collapse_num_old = '';

From 3c52636c22b22ceee91d9af4e458eb9e04f5ac2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 08:09:56 +0200
Subject: [PATCH 803/928] fix php8 warnings

---
 htdocs/ticket/document.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 740061f99ba..5e4d80cd8be 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -37,6 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 $langs->loadLangs(array("companies", "other", "ticket", "mails"));
 
 $id       = GETPOST('id', 'int');
+$socid = GETPOST('socid', 'int');
 $ref      = GETPOST('ref', 'alpha');
 $track_id = GETPOST('track_id', 'alpha');
 $action   = GETPOST('action', 'alpha');
@@ -104,7 +105,7 @@ if ($object->id) {
 		print dol_get_fiche_end();
 	}
 
-	if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
+	if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
 		$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
 	} elseif ($user->socid > 0) {
 		$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";

From edad8cdf8f95bf67d99a37508258f3c2153f8206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 08:13:40 +0200
Subject: [PATCH 804/928] Update card.php

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index ae79bcb2db2..4b4b8e594d4 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -212,14 +212,14 @@ if (empty($reshook)) {
 				}
 
 				// Auto assign user
-				if ($conf->global->TICKET_AUTO_ASSIGN_USER_CREATE) {
+				if (!empty($conf->global->TICKET_AUTO_ASSIGN_USER_CREATE)) {
 					$result = $object->assignUser($user, $user->id, 1);
 					$object->add_contact($user->id, "SUPPORTTEC", 'internal');
 				}
 
 				// Auto assign contrat
 				$contractid = 0;
-				if ($conf->global->TICKET_AUTO_ASSIGN_CONTRACT_CREATE) {
+				if (!empty($conf->global->TICKET_AUTO_ASSIGN_CONTRACT_CREATE)) {
 					$contrat = new Contrat($db);
 					$contrat->socid = $object->fk_soc;
 					$list = $contrat->getListOfContracts();
@@ -234,7 +234,7 @@ if (empty($reshook)) {
 				}
 
 				// Auto create fiche intervention
-				if ($conf->global->TICKET_AUTO_CREATE_FICHINTER_CREATE) {
+				if (!empty($conf->global->TICKET_AUTO_CREATE_FICHINTER_CREATE)) {
 					$fichinter = new Fichinter($db);
 					$fichinter->socid = $object->fk_soc;
 					$fichinter->fk_project = $projectid;

From da7f5e462608e81e8595637c94b5ca4142178bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 08:15:44 +0200
Subject: [PATCH 805/928] fix php8 warning

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

diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 527b28c8fac..c3e70def7da 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -91,7 +91,7 @@ if ($user->socid > 0 && ($object->fk_soc != $user->socid)) {
 	accessforbidden();
 }
 // or for unauthorized internals users
-if (!$user->socid && ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
+if (!$user->socid && (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
 	accessforbidden();
 }
 
@@ -146,7 +146,7 @@ if ($socid > 0) {
 	print dol_get_fiche_end();
 }
 
-if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
+if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
 	$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
 } elseif ($user->socid > 0) {
 	$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";

From 0c8b74b54cd4817002697cb15e5475e74bc505d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 08:20:31 +0200
Subject: [PATCH 806/928] fix php8 warning

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

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 19b352ee936..45a11a9daef 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -118,7 +118,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -340,7 +340,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/, $/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";

From 7e1ed0791033b0fdc144e5921bdacf1cb5e8dbe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 08:26:03 +0200
Subject: [PATCH 807/928] fix php8 warning

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

diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 16cd41ce564..9b7cbfc2fe6 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2012-2018  Charlene BENKE 	<charlie@patas-monkey.com>
- * Copyright (C) 2015-2020  Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2021  Frederic France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -150,7 +150,7 @@ class box_task extends ModeleBoxes
 			}
 
 			$sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
-			$sql .= ", p.rowid project_id, p.ref project_ref, p.title project_title";
+			$sql .= ", p.rowid project_id, p.ref project_ref, p.title project_title, p.fk_statut";
 
 			$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
 			$sql .= " JOIN ".MAIN_DB_PREFIX."projet as p ON (pt.fk_projet = p.rowid)";

From eccfa4039631daef85f4e78beb0ef28ad13ed52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 08:28:35 +0200
Subject: [PATCH 808/928] fix php8 warning

remove variables not used
---
 htdocs/core/boxes/box_last_modified_ticket.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php
index 7cc20bd1b89..320a23f745b 100644
--- a/htdocs/core/boxes/box_last_modified_ticket.php
+++ b/htdocs/core/boxes/box_last_modified_ticket.php
@@ -2,7 +2,7 @@
 /* Module descriptor for ticket system
  * Copyright (C) 2013-2016  Jean-François FERRY     <hello@librethic.io>
  *               2016       Christophe Battarel     <christophe@altairis.fr>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -113,9 +113,6 @@ class box_last_modified_ticket extends ModeleBoxes
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($resql);
 					$datec = $this->db->jdate($objp->datec);
-					$dateterm = $this->db->jdate($objp->fin_validite);
-					$dateclose = $this->db->jdate($objp->date_cloture);
-					$late = '';
 
 					$ticket = new Ticket($this->db);
 					$ticket->id = $objp->id;
@@ -162,7 +159,6 @@ class box_last_modified_ticket extends ModeleBoxes
 					);
 					$r++;
 
-
 					// Date creation
 					$this->info_box_contents[$i][$r] = array(
 						'td' => 'class="right"',

From 73972bcbd06cf5be82e1d41d44209402ba6c8858 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 10:30:46 +0200
Subject: [PATCH 809/928] More complete log

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 8827c56e132..549862c53cc 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4956,7 +4956,11 @@ class Facture extends CommonInvoice
 		$resql = $this->db->query($sql);
 
 		$stmpidate = dol_print_date($tmpidate, 'day', 'gmt');
-		$this->output .= $langs->trans("SearchUnpaidInvoicesWithDueDate", $stmpidate).'<br>';
+		$this->output .= $langs->transnoentitiesnoconv("SearchUnpaidInvoicesWithDueDate", $stmpidate);
+		if (!empty($paymentmode) && $paymentmode != 'all') {
+			$this->output .= ' ('.$langs->transnoentitiesnoconv("PaymentMode").' '.$paymentmode.')';
+		}
+		$this->output .= '<br>';
 
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {

From 64cf65c47fbf4dae88eb028279181a2eff71c87a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 10:32:12 +0200
Subject: [PATCH 810/928] Doc

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

diff --git a/ChangeLog b/ChangeLog
index 7a2cf7c2c45..ab0111dc073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ NEW: Add a security center page with all information and advices related to the
 NEW: Add a performance center page with all information and advices related to the performance of your instance 
 NEW: A lot of fix into english text after a small proofreading campaign (still not perfect, but really better)
 NEW: All main menu entries are using the picto of the module
+NEW: Add an example of scheduled job to send email reminder for unpayed invoices 
 NEW: Accountancy - Add closure menu
 NEW: Accountancy - Add FEC import
 NEW: Accountancy - Add a confirmation form with options on export

From 200c36836b34c1eea7fd616d64c76f48f3dabea1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 10:44:53 +0200
Subject: [PATCH 811/928] v14

---
 htdocs/commande/class/commande.class.php |  2 +-
 htdocs/commande/list.php                 | 39 +++++++++++++-----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index faf10596d8c..c0851dfee1d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -344,8 +344,8 @@ class Commande extends CommonOrder
 		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>-1, 'position'=>270),
 		'module_source' =>array('type'=>'varchar(32)', 'label'=>'POSModule', 'enabled'=>1, 'visible'=>-1, 'position'=>275),
 		'pos_source' =>array('type'=>'varchar(32)', 'label'=>'POSTerminal', 'enabled'=>1, 'visible'=>-1, 'position'=>280),
+		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>400),
 		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
 	);
 	// END MODULEBUILDER PROPERTIES
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index df1c3e096e2..b8c3ad28039 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -163,21 +163,21 @@ $checkedtypetiers = 0;
 $arrayfields = array(
 	'c.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>5),
 	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>-1, 'position'=>10),
-	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>20),
+	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>-1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>20),
 	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>25),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1, 'position'=>31),
-	's.town'=>array('label'=>"Town", 'checked'=>1, 'position'=>35),
-	's.zip'=>array('label'=>"Zip", 'checked'=>1, 'position'=>40),
+	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1, 'position'=>31),
+	's.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>35),
+	's.zip'=>array('label'=>"Zip", 'checked'=>-1, 'position'=>40),
 	'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>45),
 	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>50),
 	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
 	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60),
 	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE), 'position'=>65),
-	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'position'=>66 , 'enabled'=>!empty($conf->expedition->enabled)),
-	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0, 'position'=>67),
-	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0, 'position'=>68),
-	'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>0, 'position'=>69),
+	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>!empty($conf->expedition->enabled)),
+	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67),
+	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68),
+	'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>-1, 'position'=>69),
 	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75),
 	'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>80),
 	'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85),
@@ -186,15 +186,15 @@ $arrayfields = array(
 	'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>100),
 	'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>105),
 	'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>110),
-	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10, 'position'=>115),
-	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500, 'position'=>120),
-	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500, 'position'=>125),
-	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500, 'position'=>130),
-	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES)), 'position'=>135),
-	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>140),
-	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>990, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)), 'position'=>145),
-	'shippable'=>array('label'=>"Shippable", 'checked'=>1, 'position'=>995, 'enabled'=>(!empty($conf->expedition->enabled)), 'position'=>150),
-	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000, 'position'=>155)
+	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>115),
+	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>120),
+	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>125),
+	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130),
+	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES)), 'position'=>135),
+	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>140),
+	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(!empty($conf->expedition->enabled)), 'position'=>990),
+	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)), 'position'=>995),
+	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -1115,7 +1115,7 @@ if ($resql) {
 	// Channel
 	if (!empty($arrayfields['c.fk_input_reason']['checked'])) {
 		print '<td class="liste_titre">';
-		$form->selectInputReason($search_fk_input_reason, 'search_fk_input_reason', '', 1);
+		$form->selectInputReason($search_fk_input_reason, 'search_fk_input_reason', '', 1, '', 1);
 		print '</td>';
 	}
 	if (!empty($arrayfields['c.total_ht']['checked'])) {
@@ -1838,6 +1838,9 @@ if ($resql) {
 				}
 			}
 			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Billed

From 8fb474c6873cd23c9361febee6d1d7e56a8dce97 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 11 May 2021 11:35:54 +0200
Subject: [PATCH 812/928] Add Hook Extrafields Update - init extrafieldssdao

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index d657c519650..f37d2e1932c 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -603,6 +603,8 @@ class ExtraFields
 	 */
 	public function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
 	{
+		global $hookmanager;
+
 		if ($elementtype == 'thirdparty') $elementtype = 'societe';
 		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
@@ -643,6 +645,18 @@ class ExtraFields
 			}
 			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required ? 'NOT NULL' : 'NULL'), 'default'=>$default);
 
+			if (is_object($hookmanager))
+			{
+				$hookmanager->initHooks(array('extrafieldsdao'));
+				$parameters = array('field_desc'=>&$field_desc, 'table'=>$table, 'attr_name'=>$attrname, 'label'=>$label, 'type'=>$type, 'length'=>$length, 'unique'=>$unique, 'required'=>$required, 'pos'=>$pos, 'param'=>$param, 'alwayseditable'=>$alwayseditable, 'perms'=>$perms, 'list'=>$list, 'help'=>$help, 'default'=>$default, 'computed'=>$computed, 'entity'=>$entity, 'langfile'=>$langfile, 'enabled'=>$enabled, 'totalizable'=>$totalizable, 'printable'=>$printable);
+				$reshook = $hookmanager->executeHooks('updateExtrafields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				if ($reshook < 0) {
+					$this->error = $this->db->lasterror();
+					return -1;
+				}
+			}
+
 			if ($type != 'separate') // No table update when separate type
 			{
 				$result = $this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);

From c37ccc10b1bfce92757110b56149c5e3a87378dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 14:50:04 +0200
Subject: [PATCH 813/928] Debug v14

---
 ChangeLog                                     |   1 -
 htdocs/core/actions_setmoduleoptions.inc.php  |   1 +
 htdocs/core/lib/functions.lib.php             |   7 +-
 htdocs/cron/card.php                          |   4 +-
 htdocs/datapolicy/admin/setup.php             |  80 ++++---
 .../datapolicy/class/datapolicycron.class.php | 212 ++++++++----------
 htdocs/langs/en_US/admin.lang                 |   2 +-
 7 files changed, 157 insertions(+), 150 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab0111dc073..b81719cafd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,6 @@ NEW: Add a performance center page with all information and advices related to t
 NEW: A lot of fix into english text after a small proofreading campaign (still not perfect, but really better)
 NEW: All main menu entries are using the picto of the module
 NEW: Add an example of scheduled job to send email reminder for unpayed invoices 
-NEW: Accountancy - Add closure menu
 NEW: Accountancy - Add FEC import
 NEW: Accountancy - Add a confirmation form with options on export
 NEW: Accountancy - Add select date from/to in already bind customer and supplier list
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 797bb8e4cb7..7bd84e318d6 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -31,6 +31,7 @@ if ($action == 'update' && is_array($arrayofparameters)) {
 	$db->begin();
 
 	foreach ($arrayofparameters as $key => $val) {
+var_dump($key);
 		// Modify constant only if key was posted (avoid resetting key to the null value)
 		if (GETPOSTISSET($key)) {
 			if (preg_match('/category:/', $val['type'])) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 727bfaee5b8..0d4b8b177b9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3512,7 +3512,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'refresh', 'salary', 'shipment', 'supplier_invoice', 'technic', 'ticket',
 				'error', 'warning',
 				'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource',
-				'shapes', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
+				'shapes', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
 				'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
 				'uncheck', 'user-cog', 'website', 'workstation',
 				'conferenceorbooth', 'eventorganization'
@@ -3556,7 +3556,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'reception'=>'dolly', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
 				'refresh'=>'redo', 'resource'=>'laptop-house',
-				'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
+				'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',
+				'supplier'=>'building', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 				'timespent'=>'clock', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 				'title_agenda'=>'calendar-alt',
 				'uncheck'=>'times', 'uparrow'=>'share', 'vcard'=>'address-card',
@@ -3634,7 +3635,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'reception'=>'flip', 'recruitmentjobposition'=>'infobox-adherent', 'recruitmentcandidature'=>'infobox-adherent',
 				'resource'=>'infobox-action',
 				'salary'=>'infobox-bank_account', 'shipment'=>'infobox-commande', 'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier',
-				'supplier_order'=>'infobox-order_supplier', 'supplier_proposal'=>'infobox-supplier_proposal',
+				'supplier'=>'infobox-order_supplier', 'supplier_order'=>'infobox-order_supplier', 'supplier_proposal'=>'infobox-supplier_proposal',
 				'ticket'=>'infobox-contrat', 'title_accountancy'=>'infobox-bank_account', 'title_hrm'=>'infobox-holiday', 'expensereport'=>'infobox-expensereport', 'trip'=>'infobox-expensereport', 'title_agenda'=>'infobox-action',
 				//'title_setup'=>'infobox-action', 'tools'=>'infobox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 1683fadf16a..fb8699b911e 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -352,7 +352,7 @@ if (($action == "create") || ($action == "edit")) {
 
 	print '<tr class="blockmethod"><td>';
 	print $langs->trans('CronModule')."</td><td>";
-	print "<input type=\"text\" size=\"20\" name=\"module_name\" value=\"".$object->module_name."\" /> ";
+	print "<input type=\"text\" class=\"width200\" name=\"module_name\" value=\"".$object->module_name."\" /> ";
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('', $langs->trans("CronModuleHelp"), 1, 'help');
@@ -370,7 +370,7 @@ if (($action == "create") || ($action == "edit")) {
 
 	print '<tr class="blockmethod"><td>';
 	print $langs->trans('CronObject')."</td><td>";
-	print "<input type=\"text\" size=\"20\" name=\"objectname\" value=\"".$object->objectname."\" /> ";
+	print "<input type=\"text\" class=\"width200\" name=\"objectname\" value=\"".$object->objectname."\" /> ";
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('', $langs->trans("CronObjectHelp"), 1, 'help');
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index a334b36929e..dde8644571e 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -27,15 +27,7 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once '../lib/datapolicy.lib.php';
 
 // Translations
-$langs->load('admin');
-$langs->load('companies');
-$langs->load('members');
-$langs->load('datapolicy@datapolicy');
-
-// Access control
-if (!$user->admin) {
-	accessforbidden();
-}
+$langs->loadLangs(array('admin', 'companies', 'members', 'datapolicy@datapolicy'));
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -43,35 +35,27 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters = array();
 $arrayofparameters['ThirdParty'] = array(
-	'DATAPOLICY_TIERS_CLIENT'=>array('css'=>'minwidth200'),
-	'DATAPOLICY_TIERS_PROSPECT'=>array('css'=>'minwidth200'),
-	'DATAPOLICY_TIERS_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
-	'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
-	'DATAPOLICY_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200'),
+	'DATAPOLICY_TIERS_CLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'company', 'class="pictofixedwidth"')),
+	'DATAPOLICY_TIERS_PROSPECT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'company', 'class="pictofixedwidth"')),
+	'DATAPOLICY_TIERS_PROSPECT_CLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'company', 'class="pictofixedwidth"')),
+	'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'company', 'class="pictofixedwidth"')),
+	'DATAPOLICY_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'supplier', 'class="pictofixedwidth"')),
 );
 if (!empty($conf->global->DATAPOLICY_USE_SPECIFIC_DELAY_FOR_CONTACT)) {
 	$arrayofparameters['Contact'] = array(
-		'DATAPOLICY_CONTACT_CLIENT'=>array('css'=>'minwidth200'),
-		'DATAPOLICY_CONTACT_PROSPECT'=>array('css'=>'minwidth200'),
-		'DATAPOLICY_CONTACT_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
-		'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
-		'DATAPOLICY_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200'),
+		'DATAPOLICY_CONTACT_CLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
+		'DATAPOLICY_CONTACT_PROSPECT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
+		'DATAPOLICY_CONTACT_PROSPECT_CLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
+		'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
+		'DATAPOLICY_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
 	);
 }
 if (!empty($conf->adherent->enabled)) {
 	$arrayofparameters['Member'] = array(
-		'DATAPOLICY_ADHERENT'=>array('css'=>'minwidth200'),
+		'DATAPOLICY_ADHERENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'member', 'class="pictofixedwidth"')),
 	);
 }
 
-
-
-/*
- * Actions
- */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
-
 $valTab = array(
 	'' => $langs->trans('Never'),
 	'6' => $langs->trans('NB_MONTHS', 6),
@@ -85,6 +69,40 @@ $valTab = array(
 	'240' => $langs->trans('NB_YEARS', 20),
 );
 
+// Access control
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+foreach ($arrayofparameters as $title => $tab) {
+	foreach ($tab as $key => $val) {
+		// Modify constant only if key was posted (avoid resetting key to the null value)
+		if (GETPOSTISSET($key)) {
+			if (preg_match('/category:/', $val['type'])) {
+				if (GETPOST($key, 'int') == '-1') {
+					$val_const = '';
+				} else {
+					$val_const = GETPOST($key, 'int');
+				}
+			} else {
+				$val_const = GETPOST($key, 'alpha');
+			}
+
+			$result = dolibarr_set_const($db, $key, $val_const, 'chaine', 0, '', $conf->entity);
+			if ($result < 0) {
+				$error++;
+				break;
+			}
+		}
+	}
+}
+
+
 
 /*
  * View
@@ -96,11 +114,11 @@ llxHeader('', $langs->trans($page_name));
 // Subheader
 $linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_generic');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'generic');
 
 // Configuration header
 $head = datapolicyAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', '', -1, "datapolicy@datapolicy");
+print dol_get_fiche_head($head, 'settings', '', -1, '');
 
 // Setup page goes here
 echo '<span class="opacitymedium">'.$langs->trans("datapolicySetupPage").'</span><br><br>';
@@ -118,6 +136,7 @@ if ($action == 'edit') {
 		print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
 		foreach ($tab as $key => $val) {
 			print '<tr class="oddeven"><td>';
+			print $val['picto'];
 			print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
 			print '</td><td>';
 			print '<select name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'">';
@@ -147,6 +166,7 @@ if ($action == 'edit') {
 		print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
 		foreach ($tab as $key => $val) {
 			print '<tr class="oddeven"><td>';
+			print $val['picto'];
 			print $form->textwithpicto($langs->trans($key), $langs->trans('DATAPOLICY_Tooltip_SETUP'));
 			print '</td><td>'.($conf->global->$key == '' ? $langs->trans('None') : $valTab[$conf->global->$key]).'</td></tr>';
 		}
diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 28a713fb733..965d93754f7 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -54,27 +54,26 @@ class DataPolicyCron
 		$errormsg = '';
 		$nbupdated = $nbdeleted = 0;
 
-		// FIXME Removed hardcoded values of id
+		// FIXME Exclude data from the selection if there is at least 1 invoice.
 		$arrayofparameters = array(
 			'DATAPOLICIES_TIERS_CLIENT' => array(
 				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
-                    WHERE (s.fk_forme_juridique IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
-                    AND s.entity = %d
+                    WHERE s.entity = %d
                     AND s.client = 1
                     AND s.fournisseur = 0
                     AND s.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
-                    AND s.rowid NOT IN (
-                        SELECT DISTINCT a.fk_soc
-                        FROM ".MAIN_DB_PREFIX."actioncomm as a
-                        WHERE a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
-                        AND a.fk_soc IS NOT NULL
+					AND NOT EXISTS (
+                        SELECT id FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
+                    )
+					AND NOT EXISTS (
+                        SELECT rowid FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.rowid
                     )
                 ",
 				"class" => "Societe",
 				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'fields_anonym' => array(
-					'name' => $langs->trans('ANONYME'),
+					'name' => 'MAKEANONYMOUS',
 					'name_bis' => '',
 					'name_alias' => '',
 					'address' => '',
@@ -87,29 +86,28 @@ class DataPolicyCron
 					'state' => '',
 					'country' => '',
 					'state_id' => '',
-					'skype' => '',
+					'socialnetworks' => '',
 					'country_id' => '',
 				)
 			),
 			'DATAPOLICIES_TIERS_PROSPECT' => array(
 				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
-                    WHERE (s.fk_forme_juridique IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
-                    AND s.entity = %d
+                    WHERE s.entity = %d
                     AND s.client = 2
                     AND s.fournisseur = 0
                     AND s.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
-                    AND s.rowid NOT IN (
-                        SELECT DISTINCT a.fk_soc
-                        FROM ".MAIN_DB_PREFIX."actioncomm as a
-                        WHERE a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
-                        AND a.fk_soc IS NOT NULL
+					AND NOT EXISTS (
+                        SELECT id FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
+                    )
+					AND NOT EXISTS (
+                        SELECT rowid FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.rowid
                     )
                 ",
 				"class" => "Societe",
 				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'fields_anonym' => array(
-					'name' => $langs->trans('ANONYME'),
+					'name' => 'MAKEANONYMOUS',
 					'name_bis' => '',
 					'name_alias' => '',
 					'address' => '',
@@ -122,29 +120,28 @@ class DataPolicyCron
 					'state' => '',
 					'country' => '',
 					'state_id' => '',
-					'skype' => '',
+					'socialnetworks' => '',
 					'country_id' => '',
 				)
 			),
 			'DATAPOLICIES_TIERS_PROSPECT_CLIENT' => array(
 				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
-                    WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
-                    AND s.entity = %d
+                    WHERE s.entity = %d
                     AND s.client = 3
                     AND s.fournisseur = 0
                     AND s.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
-                    AND s.rowid NOT IN (
-                        SELECT DISTINCT a.fk_soc
-                        FROM ".MAIN_DB_PREFIX."actioncomm as a
-                        WHERE a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
-                        AND a.fk_soc IS NOT NULL
+					AND NOT EXISTS (
+                        SELECT id FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
+                    )
+					AND NOT EXISTS (
+                        SELECT rowid FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.rowid
                     )
                 ",
 				"class" => "Societe",
 				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'fields_anonym' => array(
-					'name' => $langs->trans('ANONYME'),
+					'name' => 'MAKEANONYMOUS',
 					'name_bis' => '',
 					'name_alias' => '',
 					'address' => '',
@@ -157,29 +154,28 @@ class DataPolicyCron
 					'state' => '',
 					'country' => '',
 					'state_id' => '',
-					'skype' => '',
+					'socialnetworks' => '',
 					'country_id' => '',
 				)
 			),
 			'DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT' => array(
 				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
-                    WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
-                    AND s.entity = %d
+                    WHERE s.entity = %d
                     AND s.client = 0
                     AND s.fournisseur = 0
                     AND s.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
-                    AND s.rowid NOT IN (
-                        SELECT DISTINCT a.fk_soc
-                        FROM ".MAIN_DB_PREFIX."actioncomm as a
-                        WHERE a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
-                        AND a.fk_soc IS NOT NULL
+					AND NOT EXISTS (
+                        SELECT id FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
+                    )
+					AND NOT EXISTS (
+                        SELECT rowid FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.rowid
                     )
                 ",
 				"class" => "Societe",
 				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'fields_anonym' => array(
-					'name' => $langs->trans('ANONYME'),
+					'name' => 'MAKEANONYMOUS',
 					'name_bis' => '',
 					'name_alias' => '',
 					'address' => '',
@@ -192,28 +188,27 @@ class DataPolicyCron
 					'state' => '',
 					'country' => '',
 					'state_id' => '',
-					'skype' => '',
+					'socialnetworks' => '',
 					'country_id' => '',
 				)
 			),
 			'DATAPOLICIES_TIERS_FOURNISSEUR' => array(
 				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
-                    WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
-                    AND s.entity = %d
+                    WHERE s.entity = %d
                     AND s.fournisseur = 1
                     AND s.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
-                    AND s.rowid NOT IN (
-                        SELECT DISTINCT a.fk_soc
-                        FROM ".MAIN_DB_PREFIX."actioncomm as a
-                        WHERE a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
-                        AND a.fk_contact IS NOT NULL
+					AND NOT EXISTS (
+                        SELECT id FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
+                    )
+					AND NOT EXISTS (
+                        SELECT rowid FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.rowid
                     )
                 ",
 				"class" => "Societe",
 				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'fields_anonym' => array(
-					'name' => $langs->trans('ANONYME'),
+					'name' => 'MAKEANONYMOUS',
 					'name_bis' => '',
 					'name_alias' => '',
 					'address' => '',
@@ -226,7 +221,7 @@ class DataPolicyCron
 					'state' => '',
 					'country' => '',
 					'state_id' => '',
-					'skype' => '',
+					'socialnetworks' => '',
 					'country_id' => '',
 				)
 			),
@@ -238,17 +233,17 @@ class DataPolicyCron
                     AND c.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
                     AND s.client = 1
                     AND s.fournisseur = 0
-                    AND c.rowid NOT IN (
-                        SELECT DISTINCT a.fk_contact
-                        FROM ".MAIN_DB_PREFIX."actioncomm as a
-                        WHERE a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
-                        AND a.fk_contact IS NOT NULL
+					AND NOT EXISTS (
+                        SELECT id FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
+                    )
+					AND NOT EXISTS (
+                        SELECT rowid FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.rowid
                     )
                 ",
 				"class" => "Contact",
 				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'fields_anonym' => array(
-					'lastname' => $langs->trans('ANONYME'),
+					'lastname' => 'MAKEANONYMOUS',
 					'firstname' => '',
 					'civility_id' => '',
 					'poste' => '',
@@ -264,8 +259,7 @@ class DataPolicyCron
 					'state' => '',
 					'country' => '',
 					'state_id' => '',
-					'skype' => '',
-					'jabberid' => '',
+					'socialnetworks' => '',
 					'country_id' => '',
 				)
 			),
@@ -277,17 +271,17 @@ class DataPolicyCron
                     AND c.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
                     AND s.client = 2
                     AND s.fournisseur = 0
-                    AND c.rowid NOT IN (
-                        SELECT DISTINCT a.fk_contact
-                        FROM ".MAIN_DB_PREFIX."actioncomm as a
-                        WHERE a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
-                        AND a.fk_contact IS NOT NULL
+					AND NOT EXISTS (
+                        SELECT id FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
+                    )
+					AND NOT EXISTS (
+                        SELECT rowid FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.rowid
                     )
                 ",
 				"class" => "Contact",
 				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'fields_anonym' => array(
-					'lastname' => $langs->trans('ANONYME'),
+					'lastname' => 'MAKEANONYMOUS',
 					'firstname' => '',
 					'civility_id' => '',
 					'poste' => '',
@@ -303,8 +297,7 @@ class DataPolicyCron
 					'state' => '',
 					'country' => '',
 					'state_id' => '',
-					'skype' => '',
-					'jabberid' => '',
+					'socialnetworks' => '',
 					'country_id' => '',
 				)
 			),
@@ -316,17 +309,17 @@ class DataPolicyCron
                     AND c.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
                     AND s.client = 3
                     AND s.fournisseur = 0
-                    AND c.rowid NOT IN (
-                        SELECT DISTINCT a.fk_contact
-                        FROM ".MAIN_DB_PREFIX."actioncomm as a
-                        WHERE a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
-                        AND a.fk_contact IS NOT NULL
+					AND NOT EXISTS (
+                        SELECT id FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
+                    )
+					AND NOT EXISTS (
+                        SELECT rowid FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.rowid
                     )
                 ",
 				"class" => "Contact",
 				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'fields_anonym' => array(
-					'lastname' => $langs->trans('ANONYME'),
+					'lastname' => 'MAKEANONYMOUS',
 					'firstname' => '',
 					'civility_id' => '',
 					'poste' => '',
@@ -342,8 +335,7 @@ class DataPolicyCron
 					'state' => '',
 					'country' => '',
 					'state_id' => '',
-					'skype' => '',
-					'jabberid' => '',
+					'socialnetworks' => '',
 					'country_id' => '',
 				)
 			),
@@ -355,17 +347,17 @@ class DataPolicyCron
                     AND c.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
                     AND s.client = 0
                     AND s.fournisseur = 0
-                    AND c.rowid NOT IN (
-                        SELECT DISTINCT a.fk_contact
-                        FROM ".MAIN_DB_PREFIX."actioncomm as a
-                        WHERE a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
-                        AND a.fk_contact IS NOT NULL
+					AND NOT EXISTS (
+                        SELECT id FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
+                    )
+					AND NOT EXISTS (
+                        SELECT rowid FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.rowid
                     )
                 ",
 				"class" => "Contact",
 				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'fields_anonym' => array(
-					'lastname' => $langs->trans('ANONYME'),
+					'lastname' => 'MAKEANONYMOUS',
 					'firstname' => '',
 					'civility_id' => '',
 					'poste' => '',
@@ -381,8 +373,7 @@ class DataPolicyCron
 					'state' => '',
 					'country' => '',
 					'state_id' => '',
-					'skype' => '',
-					'jabberid' => '',
+					'socialnetworks' => '',
 					'country_id' => '',
 				)
 			),
@@ -393,17 +384,17 @@ class DataPolicyCron
                     WHERE c.entity = %d
                     AND c.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
                     AND s.fournisseur = 1
-                    AND c.rowid NOT IN (
-                        SELECT DISTINCT a.fk_contact
-                        FROM ".MAIN_DB_PREFIX."actioncomm as a
-                        WHERE a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
-                        AND a.fk_contact IS NOT NULL
+					AND NOT EXISTS (
+                        SELECT id FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
+                    )
+					AND NOT EXISTS (
+                        SELECT rowid FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.rowid
                     )
                 ",
 				"class" => "Contact",
 				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'fields_anonym' => array(
-					'lastname' => $langs->trans('ANONYME'),
+					'lastname' => 'MAKEANONYMOUS',
 					'firstname' => '',
 					'civility_id' => '',
 					'poste' => '',
@@ -419,8 +410,7 @@ class DataPolicyCron
 					'state' => '',
 					'country' => '',
 					'state_id' => '',
-					'skype' => '',
-					'jabberid' => '',
+					'socialnetworks' => '',
 					'country_id' => '',
 				)
 			),
@@ -429,19 +419,15 @@ class DataPolicyCron
                     SELECT a.rowid FROM ".MAIN_DB_PREFIX."adherent as a
                     WHERE a.entity = %d
                     AND a.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
-                    AND a.rowid NOT IN (
-                        SELECT DISTINCT a.fk_element
-                        FROM ".MAIN_DB_PREFIX."actioncomm as a
-                        WHERE a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH)
-                        AND a.elementtype LIKE 'member'
-                        AND a.fk_element IS NOT NULL
+					AND NOT EXISTS (
+                        SELECT id FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_element = a.rowid AND a.tms > DATE_SUB(NOW(), INTERVAL %d MONTH) AND a.elementtype LIKE 'member'
                     )
                 ",
 				"class" => "Adherent",
 				"file" => DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php',
 				'fields_anonym' => array(
-					'lastname' => $langs->trans('ANONYME'),
-					'firstname' => $langs->trans('ANONYME'),
+					'lastname' => 'MAKEANONYMOUS',
+					'firstname' => 'MAKEANONYMOUS',
 					'civility_id' => '',
 					'societe' => '',
 					'address' => '',
@@ -456,7 +442,7 @@ class DataPolicyCron
 					'state' => '',
 					'country' => '',
 					'state_id' => '',
-					'skype' => '',
+					'socialnetworks' => '',
 					'country_id' => '',
 				)
 			),
@@ -483,27 +469,27 @@ class DataPolicyCron
 						$object->fetch($obj->rowid);
 						$object->id = $obj->rowid;
 
-						if ($object->isObjectUsed($obj->rowid) > 0) {			// If object to clean is used
-							foreach ($params['fields_anonym'] as $fields => $val) {
-								$object->$fields = $val;
-							}
-							$result = $object->update($obj->rowid, $user);
-							if ($result > 0) {
-								if ($params['class'] == 'Societe') {
-									// We delete contacts of thirdparty
-									$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$obj->rowid;
-									$result = $this->db->query($sql);
-									if ($result < 0) {
-										$errormsg = $this->db->lasterror();
-										$error++;
+						$action = 'anonymize';	// TODO Offer also action "delete" in setup of module
+
+						if ($action == 'anonymize') {
+							if ($object->isObjectUsed($obj->rowid) == 0) {			// If object to clean is used
+								foreach ($params['fields_anonym'] as $fields => $val) {
+									if ($val == 'MAKEANONYMOUS') {
+										$object->$fields = $fields.'-anonymous-'.$obj->rowid;
+									} else {
+										$object->$fields = $val;
 									}
 								}
-							} else {
-								$errormsg = $object->error;
-								$error++;
+								$result = $object->update($obj->rowid, $user);
+								if ($result > 0) {
+									$errormsg = $object->error;
+									$error++;
+								}
+								$nbupdated++;
 							}
-							$nbupdated++;
-						} else {											// If object to clean is not used
+						}
+
+						if ($action == 'delete') {									// If object to clean is not used
 							if ($object->element == 'adherent') {
 								$result = $object->delete($obj->rowid, $user);
 							} else {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 34852c2ca61..9f4bcfcfbd4 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1768,7 +1768,7 @@ AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting men
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup

From 5496cc6c9919edcf60d1a41c807e177df3e38a29 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 15:25:42 +0200
Subject: [PATCH 814/928] Changlog

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

diff --git a/ChangeLog b/ChangeLog
index b81719cafd3..df46607b91b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,8 @@ English Dolibarr ChangeLog
 
 For users:
 ----------
-NEW: Feature to make inventories
+NEW: Module Recruitement to follow application to job positions is now stable.
+NEW: Feature to make Stock Inventories
 NEW: Several security issues after a second private bug hunting campaign. 
 NEW: Add a security center page with all information and advices related to the security of your instance 
 NEW: Add a performance center page with all information and advices related to the performance of your instance 

From d8cbb735a308bec9b29f3041086251ee73c66971 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 17:58:00 +0200
Subject: [PATCH 815/928] Fix rtl language for pdf

---
 .../supplier_order/doc/pdf_cornas.modules.php   | 17 ++++++++++-------
 .../supplier_order/doc/pdf_muscadet.modules.php | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 4cb80e0a81e..c60f82e9c4a 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1211,6 +1211,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	{
 		global $langs, $conf, $mysoc;
 
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings"));
 
@@ -1248,7 +1251,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			}
 		} else {
 			$text = $this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 		}
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -1369,7 +1372,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom", 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -1378,13 +1381,13 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			// Show sender name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
 			$posy = $pdf->getY();
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
 			$pdf->SetFont('', '', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, $ltrdirection);
 
 
 
@@ -1422,20 +1425,20 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
 		return $top_shift;
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index 65d2a97f634..c6d9cf8da14 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -1119,6 +1119,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	{
 		global $langs, $conf, $mysoc;
 
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings"));
 
@@ -1156,7 +1159,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			}
 		} else {
 			$text = $this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 		}
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -1277,7 +1280,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -1286,13 +1289,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			// Show sender name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
 			$posy = $pdf->getY();
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
 			$pdf->SetFont('', '', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, $ltrdirection);
 
 
 			// If CUSTOMER contact defined on order, we use it. Note: Even if this is a supplier object, the code for external contat that follow order is 'CUSTOMER'
@@ -1329,20 +1332,20 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, 'L');
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
 		return $top_shift;

From 23858f0ab1cd1390e3a0abcb3025604adbd8eac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 18:25:20 +0200
Subject: [PATCH 816/928] fix php8 warning

---
 htdocs/compta/bank/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 384d0ef6963..df23b111aa2 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -503,6 +503,7 @@ print "</tr>\n";
 
 
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 $found = 0;
 $i = 0;
 $lastcurrencycode = '';

From e0cc6a4981a3eb3d5579cc874a4ba3a8cf4df6a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 18:34:43 +0200
Subject: [PATCH 817/928] fix $db in class

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

diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 205ee1eafe8..c109bc65733 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2015-2019  Frédéric France     <frederic.france@netlogic.fr>
+/* Copyright (C) 2015-2021  Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Andreu Bisquerra    <jove@bisquerra.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -565,7 +565,7 @@ class dolReceiptPrinter extends Printer
 	 */
 	public function sendToPrinter($object, $templateid, $printerid)
 	{
-		global $conf, $mysoc, $langs, $user, $db;
+		global $conf, $mysoc, $langs, $user;
 		$error = 0;
 		$ret = $this->loadTemplate($templateid);
 
@@ -830,8 +830,8 @@ class dolReceiptPrinter extends Printer
 						break;
 					case 'DOL_VALUE_PLACE':
 							$sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $object->ref)));
-							$resql = $db->query($sql);
-							$obj = $db->fetch_object($resql);
+							$resql = $this->db->query($sql);
+							$obj = $this->db->fetch_object($resql);
 						if ($obj) {
 							$this->printer->text($obj->label);
 						}

From dc901035264e74ef884a2b7d2cce4e64166cfe08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 18:36:27 +0200
Subject: [PATCH 818/928] Update document.php

---
 htdocs/fourn/commande/document.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 31e59342860..6f9d69c7587 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -99,7 +99,6 @@ $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedido
 llxHeader('', $title, $help_url);
 
 if ($object->id > 0) {
-
 	$object->fetch_thirdparty();
 
 	$author = new User($db);

From c37588025fc9f98616bcfcfdca9389775b4bf735 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 18:50:02 +0200
Subject: [PATCH 819/928] Update 13.0.0-14.0.0.sql

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 1aa8b282ab8..92e2c3cf757 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -467,7 +467,7 @@ ALTER TABLE llx_payment_donation ADD COLUMN ext_payment_id  varchar(128) AFTER n
 -- Rebuild sequence for postgres only after query INSERT INTO llx_salary(rowid, ...
 -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
 
-UPDATE llx_const SET type = __ENCRYPT('chaine')__, value = __ENCRYPT('github')__ WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
+UPDATE llx_const SET type = 'chaine', value = __ENCRYPT('github')__ WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;
 
 ALTER TABLE llx_facture_fourn_det ADD COLUMN fk_remise_except integer DEFAULT NULL after remise_percent;
 ALTER TABLE llx_facture_fourn_det ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except, fk_facture_fourn);

From 3aac68d65b4fd70f868fd3b60c5f1dece35d698b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 18:52:49 +0200
Subject: [PATCH 820/928] Update ecmfiles.class.php

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

diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index b69d7557aed..b292dd33429 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -530,9 +530,9 @@ class EcmFiles extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.src_object_id') {
-					$sqlwhere [] = $key.' = '.$this->db->escape($value);
+					$sqlwhere[] = $key.' = '.((int) $value);
 				} else {
-					$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
 		}

From 0ff473aba7a62ef5e223ce9e565a29e0a84466fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 19:15:30 +0200
Subject: [PATCH 821/928] Update card.php

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

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 0d1c22c4e60..49a3cc74182 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1891,7 +1891,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}*/
 
 				// Modify
-				if ($user->rights->adherent->creer) {
+				if (!empty($user->rights->adherent->creer)) {
 					print '<a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
 				} else {
 					print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</span>'."\n";

From bccd1b9a41196b2cc00f0ce83e325d393d2525da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 19:21:08 +0200
Subject: [PATCH 822/928] Update prelevement.php

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

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index a7262b7c398..f5ac0f19509 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -325,7 +325,7 @@ if ($object->id > 0) {
 			$facavoir->fetch($facid);
 			$invoicecredits[] = $facavoir->getNomUrl(1);
 		}
-		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
+		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
 	}
 	/*
 	if ($facidnext > 0)

From 1c477d21313ab2b8bd7126dd595d8cc5ff4b6909 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 19:21:38 +0200
Subject: [PATCH 823/928] Update 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 7a09e9393bb..30c37bb4d88 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2701,7 +2701,7 @@ if ($action == 'create') {
 				$facavoir->fetch($id);
 				$invoicecredits[] = $facavoir->getNomUrl(1);
 			}
-			print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
+			print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
 		}
 		if (isset($facidnext) && $facidnext > 0) {
 			$facthatreplace = new FactureFournisseur($db);

From 70451050aebab0ffa3c1c086cf0295ed0caf7d2b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 19:22:46 +0200
Subject: [PATCH 824/928] Update contact.php

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

diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 65471cd59ff..3ee6fe10d14 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -203,7 +203,7 @@ if ($id > 0 || !empty($ref)) {
 				$facavoir->fetch($facid);
 				$invoicecredits[] = $facavoir->getNomUrl(1);
 			}
-			print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
+			print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
 		}
 		if ($facidnext > 0) {
 			$facthatreplace = new FactureFournisseur($db);

From 6bec5d7e3cb46918aa6558f9eeb8ca115d5cb4f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 19:23:46 +0200
Subject: [PATCH 825/928] Update document.php

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

diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 237285d036a..d7c11045f03 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -193,7 +193,7 @@ if ($object->id > 0) {
 			$facavoir->fetch($facid);
 			$invoicecredits[] = $facavoir->getNomUrl(1);
 		}
-		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
+		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
 	}
 	/*
 	if ($facidnext > 0) {

From 63db00486d210e91722c1f1e16bb6eaca29c90ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 19:57:20 +0200
Subject: [PATCH 826/928] Fix setup

---
 htdocs/adherents/admin/website.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index f4d4983e25b..06796ef193c 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -39,6 +39,8 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
+$error = 0;
+
 
 /*
  * Actions
@@ -57,7 +59,8 @@ if ($action == 'update') {
 	$amount = GETPOST('MEMBER_NEWFORM_AMOUNT');
 	$editamount = GETPOST('MEMBER_NEWFORM_EDITAMOUNT');
 	$payonline = GETPOST('MEMBER_NEWFORM_PAYONLINE');
-	$forcetype = GETPOST('MEMBER_NEWFORM_FORCETYPE');
+	$forcetype = GETPOST('MEMBER_NEWFORM_FORCETYPE', 'int');
+	$forcemorphy = GETPOST('MEMBER_NEWFORM_FORCEMORPHY', 'aZ09');
 
 	$res = dolibarr_set_const($db, "MEMBER_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "MEMBER_NEWFORM_AMOUNT", $amount, 'chaine', 0, '', $conf->entity);
@@ -68,6 +71,11 @@ if ($action == 'update') {
 	} else {
 		$res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE", $forcetype, 'chaine', 0, '', $conf->entity);
 	}
+	if ($forcemorphy == '-1') {
+		$res = dolibarr_del_const($db, "MEMBER_NEWFORM_FORCEMORPHY", $conf->entity);
+	} else {
+		$res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCEMORPHY", $forcemorphy, 'chaine', 0, '', $conf->entity);
+	}
 
 	if (!($res > 0)) {
 		$error++;

From 92c6a616a42bf7882297619f6e5dda5fdacaacb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 20:03:12 +0200
Subject: [PATCH 827/928] remove debug

---
 htdocs/core/actions_setmoduleoptions.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 7bd84e318d6..797bb8e4cb7 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -31,7 +31,6 @@ if ($action == 'update' && is_array($arrayofparameters)) {
 	$db->begin();
 
 	foreach ($arrayofparameters as $key => $val) {
-var_dump($key);
 		// Modify constant only if key was posted (avoid resetting key to the null value)
 		if (GETPOSTISSET($key)) {
 			if (preg_match('/category:/', $val['type'])) {

From 971d611eb6795345cb6877ec6f8d2fee0e8c687a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 20:12:25 +0200
Subject: [PATCH 828/928] Fix phpcs

---
 htdocs/core/actions_setmoduleoptions.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 7bd84e318d6..797bb8e4cb7 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -31,7 +31,6 @@ if ($action == 'update' && is_array($arrayofparameters)) {
 	$db->begin();
 
 	foreach ($arrayofparameters as $key => $val) {
-var_dump($key);
 		// Modify constant only if key was posted (avoid resetting key to the null value)
 		if (GETPOSTISSET($key)) {
 			if (preg_match('/category:/', $val['type'])) {

From c2fa19a0b4c4ed66d671c947d02f630644ecfa63 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 20:15:20 +0200
Subject: [PATCH 829/928] fix phpcs

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1002216b7cb..dff10e73049 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ jobs:
   include:
     - if: type = push
       php: '5.5'
-      env: DB=postgresql
+      env: DB=mysql
     - if: type = pull_request OR type = push
       php: '7.4'
       env: DB=mysql

From 91312f041104966c7bc69698173399488f7e89e8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 21:13:52 +0200
Subject: [PATCH 830/928] Fix url for emailing unsubscribe

---
 htdocs/comm/mailing/card.php            |  4 ++--
 htdocs/core/actions_massactions.inc.php |  2 +-
 htdocs/core/actions_sendmails.inc.php   |  2 +-
 htdocs/core/tpl/card_presend.tpl.php    |  2 +-
 htdocs/core/tpl/massactions_pre.tpl.php |  2 +-
 scripts/emailings/mailing-send.php      | 11 ++++++-----
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 61e4f7b4bb6..654dea6d697 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -330,7 +330,7 @@ if (empty($reshook)) {
 								//if cheack read is use then update prospect contact status
 								if (strpos($message, '__CHECK_READ__') !== false) {
 									//Update status communication of thirdparty prospect
-									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
+									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".((int) $obj->rowid).")";
 									dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
 									$resql2 = $db->query($sql);
 									if (!$resql2) {
@@ -338,7 +338,7 @@ if (empty($reshook)) {
 									}
 
 									//Update status communication of contact prospect
-									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
+									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".((int) $obj->rowid)." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 									dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
 
 									$resql2 = $db->query($sql);
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 75844b77d4c..85725b16547 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -419,7 +419,7 @@ if (!$error && $massaction == 'confirm_presend') {
 					$substitutionarray['__ID__']    = ($oneemailperrecipient ? join(', ', array_keys($listofqualifiedobj)) : $objecttmp->id);
 					$substitutionarray['__REF__']   = ($oneemailperrecipient ? join(', ', $listofqualifiedref) : $objecttmp->ref);
 					$substitutionarray['__EMAIL__'] = $thirdparty->email;
-					$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+					$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($thirdparty->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 
 					$parameters = array('mode'=>'formemail');
 
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index d05985b1aa3..b4e583387c9 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -337,7 +337,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			// Make substitution in email content
 			$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 			$substitutionarray['__EMAIL__'] = $sendto;
-			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($object->thirdparty->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
 
 			$parameters = array('mode'=>'formemail');
 			complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 62aafc2fdb5..bca1386c82e 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -208,7 +208,7 @@ if ($action == 'presend') {
 
 	// Make substitution in email content
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
-	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($object->thirdparty->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
 	$substitutionarray['__PERSONALIZED__'] = ''; // deprecated
 	$substitutionarray['__CONTACTCIVNAME__'] = '';
 	$parameters = array(
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 2848bd3d48c..21150d19936 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -165,7 +165,7 @@ if ($massaction == 'presend') {
 	$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 
 	$substitutionarray['__EMAIL__'] = $sendto;
-	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($object->thirdparty->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
 	$substitutionarray['__PERSONALIZED__'] = ''; // deprecated
 	$substitutionarray['__CONTACTCIVNAME__'] = '';
 
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 44b8ade0c62..d3c8e152c6b 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -206,8 +206,9 @@ if ($resql) {
 						$substitutionarray['__OTHER5__'] = $other5;
 						$substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
 						$substitutionarray['__SIGNATURE__'] = $signature; // For backward compatibility
-						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
+						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
+						$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid;
 
 						$onlinepaymentenabled = 0;
 						if (!empty($conf->paypal->enabled)) {
@@ -324,7 +325,7 @@ if ($resql) {
 							 */
 
 							$sqlok = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-							$sqlok .= " SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
+							$sqlok .= " SET statut = 1, date_envoi = '".$db->idate($now)."' WHERE rowid = ".((int) $obj->rowid);
 							$resqlok = $db->query($sqlok);
 							if (!$resqlok) {
 								dol_print_error($db);
@@ -333,7 +334,7 @@ if ($resql) {
 								// if cheack read is use then update prospect contact status
 								if (strpos($message, '__CHECK_READ__') !== false) {
 									// Update status communication of thirdparty prospect
-									$sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
+									$sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".((int) $obj->rowid).")";
 									dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
 									$resqlx = $db->query($sqlx);
 									if (!$resqlx) {
@@ -342,7 +343,7 @@ if ($resql) {
 									}
 
 									// Update status communication of contact prospect
-									$sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
+									$sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".((int) $obj->rowid)." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 									dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
 
 									$resqlx = $db->query($sqlx);

From b5a43c8d1d2be9df9a772799791048c2ff598a88 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 21:31:43 +0200
Subject: [PATCH 831/928] FIX #17502

---
 htdocs/compta/facture/card.php    | 11 ++++-------
 htdocs/core/lib/functions.lib.php |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 252b8ac65a2..48b7c505264 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2955,12 +2955,12 @@ if ($action == 'create') {
 
 	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
 	if (empty($cond_reglement_id)) {
-		$cond_reglement_id = GETPOST("cond_reglement_id");
+		$cond_reglement_id = GETPOST("cond_reglement_id", 'int');
 	}
 
 	// when payment mode is empty (means not override by payment mode form a other object, like third-party), try to use default value
 	if (empty($mode_reglement_id)) {
-		$mode_reglement_id = GETPOST("mode_reglement_id");
+		$mode_reglement_id = GETPOST("mode_reglement_id", 'int');
 	}
 
 	if (!empty($soc->id)) {
@@ -3563,12 +3563,9 @@ if ($action == 'create') {
 
 	// Bank Account
 	if (!empty($conf->banque->enabled)) {
-		if (GETPOSTISSET('fk_account')) {
-			$fk_account = GETPOST('fk_account', 'int');
-		}
-
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
-		print img_picto('', 'bank_account', 'class="paddingrightonly"').$form->select_comptes($fk_account, 'fk_account', 0, '', 1, '', 0, '', 1);
+		$fk_account = GETPOST('fk_account', 'int');
+		print img_picto('', 'bank_account', 'class="paddingrightonly"').$form->select_comptes(($fk_account < 0 ? '' : $fk_account), 'fk_account', 0, '', 1, '', 0, '', 1);
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0d4b8b177b9..ba953282d2d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -294,7 +294,7 @@ function dol_shutdown()
 }
 
 /**
- * Return true if we are in a context of submitting the parameter $paramname
+ * Return true if we are in a context of submitting the parameter $paramname from a POST of a form.
  *
  * @param 	string	$paramname		Name or parameter to test
  * @return 	boolean					True if we have just submit a POST or GET request with the parameter provided (even if param is empty)

From 670b604d24c43d6bc59b16c84c0f06ce97478928 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 21:45:37 +0200
Subject: [PATCH 832/928] Clean code

---
 htdocs/product/card.php                  | 13 +++++++------
 htdocs/product/stock/productlot_card.php | 13 ++++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 4839f26772f..98fb4132bb8 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1298,8 +1298,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			print '</tr>';
 		}
-		// Traceability
-		if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
+
+		// Quality control
+		if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
 			print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth100onsmartphone" value="'.GETPOST('lifetime').'"></td></tr>';
 			print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth100onsmartphone" value="'.GETPOST('qc_frequency').'"></td></tr>';
 		}
@@ -1801,8 +1802,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</tr>';
 			}
 
-			// Traceability
-			if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
+			// Quality control
+			if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
 				print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth100onsmartphone" value="'.$object->lifetime.'"></td></tr>';
 				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth100onsmartphone" value="'.$object->qc_frequency.'"></td></tr>';
 			}
@@ -2284,8 +2285,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td>';
 			}
 
-			// Traceability
-			if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
+			// Quality Control
+			if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
 				print '<tr><td>'.$langs->trans("LifeTime").'</td><td colspan="2">'.$object->lifetime.'</td></tr>';
 				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td colspan="2">'.$object->qc_frequency.'</td></tr>';
 			}
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 909782bdbc5..1f60e880442 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -483,17 +483,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</tr>';
 	}
 
-	// Traceability info
-	if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
-		print '<tr><td>'.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer).'</td>';
-		print '<td>'.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
-		print '</tr>';
+	if (!empty($conf->global->PRODUCT_LOT_ENABLE_TRACEABOLITY)) {
 		print '<tr><td>'.$form->editfieldkey($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
 		print '<tr><td>'.$form->editfieldkey($langs->trans('DestructionDate'), 'scrapping_date', $object->scrapping_date, $object, $user->rights->stock->creer).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('DestructionDate'), 'scrapping_date', $object->scrapping_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
+	}
+
+	// Quality control
+	if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
+		print '<tr><td>'.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer).'</td>';
+		print '<td>'.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
+		print '</tr>';
 		// print '<tr><td>'.$form->editfieldkey($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer).'</td>';
 		// print '<td>'.$form->editfieldval($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		// print '</tr>';

From 3b0f79c3e2b968f822005788de92baab34c876d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 21:46:19 +0200
Subject: [PATCH 833/928] Clean code

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

diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 1f60e880442..d8ac85d004d 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -487,6 +487,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<tr><td>'.$form->editfieldkey($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
+		// print '<tr><td>'.$form->editfieldkey($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer).'</td>';
+		// print '<td>'.$form->editfieldval($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
+		// print '</tr>';
 		print '<tr><td>'.$form->editfieldkey($langs->trans('DestructionDate'), 'scrapping_date', $object->scrapping_date, $object, $user->rights->stock->creer).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('DestructionDate'), 'scrapping_date', $object->scrapping_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
@@ -497,9 +500,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<tr><td>'.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
 		print '</tr>';
-		// print '<tr><td>'.$form->editfieldkey($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer).'</td>';
-		// print '<td>'.$form->editfieldval($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
-		// print '</tr>';
 		print '<tr><td>'.$form->editfieldkey($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'numeric').'</td>';
 		print '</tr>';

From 4a735ccc4d769901de30485b488c0b3d6765b48e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 22:09:45 +0200
Subject: [PATCH 834/928] fix phpcs

---
 htdocs/theme/eldy/info-box.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index fdfb7fcab4c..3fe2552c86a 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -189,7 +189,7 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	margin-left: 80px;
 }
 .info-box-sm .info-box-module-enabled {
-    /* background: linear-gradient(0.35turn, #fff, #fff, #f6faf8, #e4efe8) */
+	/* background: linear-gradient(0.35turn, #fff, #fff, #f6faf8, #e4efe8) */
 	background: var(--infoboxmoduleenabledbgcolor);
 }
 .info-box-content-warning span.font-status4 {

From 60dd26f21d37b2031096b4646833af2696284a44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 22:10:40 +0200
Subject: [PATCH 835/928] Fix do not lose selection if error

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

diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index f9cec9d11c1..bdf9b75998b 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -167,10 +167,10 @@ if ($socid > 0) {
 		// Discount type
 		print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td><td>';
 		if ($isCustomer) {
-			print '<input type="radio" name="discount_type" id="discount_type_0" checked value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
+			print '<input type="radio" name="discount_type" id="discount_type_0" '.(GETPOSTISSET('discount_type') ? (GETPOST('discount_type', 'int') == 0 ? ' checked' : '') : ' checked').' value="0"> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
 		}
 		if ($isSupplier) {
-			print ' <input type="radio" name="discount_type" id="discount_type_1"'.($isCustomer ? '' : ' checked').' value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
+			print ' <input type="radio" name="discount_type" id="discount_type_1"'.(GETPOSTISSET('discount_type') ? (GETPOST('discount_type', 'int') ? ' checked' : '') : ($isCustomer ? '' : ' checked')).' value="1"> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
 		}
 		print '</td></tr>';
 	}

From a948fc4ed8a082fb9b93c51274dba0a5a5999e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 11 May 2021 22:12:15 +0200
Subject: [PATCH 836/928] Update extrafields.class.php

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 89119b035d1..dc3726f2634 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015       Charles-Fr BENKE        <charles.fr@benke.fr>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2017       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -676,8 +676,7 @@ class ExtraFields
 			}
 			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required ? 'NOT NULL' : 'NULL'), 'default'=>$default);
 
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$hookmanager->initHooks(array('extrafieldsdao'));
 				$parameters = array('field_desc'=>&$field_desc, 'table'=>$table, 'attr_name'=>$attrname, 'label'=>$label, 'type'=>$type, 'length'=>$length, 'unique'=>$unique, 'required'=>$required, 'pos'=>$pos, 'param'=>$param, 'alwayseditable'=>$alwayseditable, 'perms'=>$perms, 'list'=>$list, 'help'=>$help, 'default'=>$default, 'computed'=>$computed, 'entity'=>$entity, 'langfile'=>$langfile, 'enabled'=>$enabled, 'totalizable'=>$totalizable, 'printable'=>$printable);
 				$reshook = $hookmanager->executeHooks('updateExtrafields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

From 8a4fd56b23995768d3828e34b4a08429f679bb0d Mon Sep 17 00:00:00 2001
From: Aisuko Hakumei <zakaria.djebloune@outlook.com>
Date: Tue, 11 May 2021 22:54:26 +0200
Subject: [PATCH 837/928] Fix SQL error for Panama Provinces

---
 .../mysql/data/llx_20_c_departements.sql      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 7436c123100..5e739f07b72 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -765,16 +765,16 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 
 
 -- Panama - 10 Provinces (id country=178)
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-1', '', 0, '', 'Bocas del Toro');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-2', '', 0, '', 'Coclé');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-3', '', 0, '', 'Colón');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-4', '', 0, '', 'Chiriquí');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-5', '', 0, '', 'Darién');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-6', '', 0, '', 'Herrera');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-7', '', 0, '', 'Los Santos');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-8', '', 0, '', 'Panamá');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-9', '', 0, '', 'Veraguas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-13', '', 0, '', 'Panamá Oeste');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-1', 17801, '', 0, '', 'Bocas del Toro');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-2', 17801, '', 0, '', 'Coclé');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-3', 17801, '', 0, '', 'Colón');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-4', 17801, '', 0, '', 'Chiriquí');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-5', 17801, '', 0, '', 'Darién');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-6', 17801, '', 0, '', 'Herrera');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-7', 17801, '', 0, '', 'Los Santos');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-8', 17801, '', 0, '', 'Panamá');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-9', 17801, '', 0, '', 'Veraguas');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-13', 17801, '', 0, '', 'Panamá Oeste');
 
 
 -- Provinces Peru (id country=181)

From f84817f0f6e1dd382970eac111803e247a2510c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 May 2021 23:49:33 +0200
Subject: [PATCH 838/928] FIX rss module on servers with allow_url_fopen=0

---
 htdocs/core/class/rssparser.class.php | 350 +++++++++++++-------------
 1 file changed, 176 insertions(+), 174 deletions(-)

diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 578e180edff..5f5676601a0 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -1,19 +1,19 @@
 <?php
 /* Copyright (C) 2011-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
 
 /**
  *      \file       htdocs/core/class/rssparser.class.php
@@ -181,7 +181,7 @@ class RssParser
 	 * 	@param	string	$urlRSS		Url to parse
 	 * 	@param	int		$maxNb		Max nb of records to get (0 for no limit)
 	 * 	@param	int		$cachedelay	0=No cache, nb of seconds we accept cache files (cachedir must also be defined)
-	 * 	@param	string	$cachedir	Directory where to save cache file
+	 * 	@param	string	$cachedir	Directory where to save cache file (For example $conf->externalrss->dir_temp)
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
 	public function parser($urlRSS, $maxNb = 0, $cachedelay = 60, $cachedir = '')
@@ -189,13 +189,13 @@ class RssParser
 		global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
 		$rss = '';
 		$str = ''; // This will contain content of feed
 
 		// Check parameters
-		if (!dol_is_url($urlRSS))
-		{
+		if (!dol_is_url($urlRSS)) {
 			$this->error = "ErrorBadUrl";
 			return -1;
 		}
@@ -209,11 +209,9 @@ class RssParser
 
 		// Search into cache
 		$foundintocache = 0;
-		if ($cachedelay > 0 && $cachedir)
-		{
+		if ($cachedelay > 0 && $cachedir) {
 			$filedate = dol_filemtime($newpathofdestfile);
-			if ($filedate >= ($nowgmt - $cachedelay))
-			{
+			if ($filedate >= ($nowgmt - $cachedelay)) {
 				//dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
 				$foundintocache = 1;
 
@@ -224,32 +222,22 @@ class RssParser
 		}
 
 		// Load file into $str
-		if ($foundintocache)    // Cache file found and is not too old
-		{
+		if ($foundintocache) {    // Cache file found and is not too old
 			$str = file_get_contents($newpathofdestfile);
 		} else {
 			try {
-				ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
-				ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
-				ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
-
-				$opts = array('http'=>array('method'=>"GET"));
-				if (!empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout'] = $conf->global->MAIN_USE_CONNECT_TIMEOUT;
-				if (!empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy'] = 'tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
-				//var_dump($opts);exit;
-				$context = stream_context_create($opts);
-
-				$str = file_get_contents($this->_urlRSS, false, $context);
+				$result = getURLContent($this->_urlRSS, 'GET', '', 1, array(), array('http', 'https'), 0);
+				if (!empty($result['content'])) {
+					$str = $result['content'];
+				}
 			} catch (Exception $e) {
 				print 'Error retrieving URL '.$this->_urlRSS.' - '.$e->getMessage();
 			}
 		}
 
-		if ($str !== false)
-		{
+		if ($str !== false) {
 			// Convert $str into xml
-			if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-			{
+			if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
 				//print 'xx'.LIBXML_NOCDATA;
 				libxml_use_internal_errors(false);
 				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
@@ -276,19 +264,20 @@ class RssParser
 		}
 
 		// If $rss loaded
-		if ($rss)
-		{
+		if ($rss) {
 			// Save file into cache
-			if (empty($foundintocache) && $cachedir)
-			{
+			if (empty($foundintocache) && $cachedir) {
 				dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-				if (!dol_is_dir($cachedir)) dol_mkdir($cachedir);
+				if (!dol_is_dir($cachedir)) {
+					dol_mkdir($cachedir);
+				}
 				$fp = fopen($newpathofdestfile, 'w');
-				if ($fp)
-				{
+				if ($fp) {
 					fwrite($fp, $str);
 					fclose($fp);
-					if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
+					if (!empty($conf->global->MAIN_UMASK)) {
+						$newmask = $conf->global->MAIN_UMASK;
+					}
 					@chmod($newpathofdestfile, octdec($newmask));
 
 					$this->_lastfetchdate = $nowgmt;
@@ -299,10 +288,11 @@ class RssParser
 
 			unset($str); // Free memory
 
-			if (empty($rss->_format))    // If format not detected automatically
-			{
+			if (empty($rss->_format)) {    // If format not detected automatically
 				$rss->_format = 'rss';
-				if (empty($rss->channel)) $rss->_format = 'atom';
+				if (empty($rss->channel)) {
+					$rss->_format = 'atom';
+				}
 			}
 
 			$items = array();
@@ -311,46 +301,98 @@ class RssParser
 			if ($rss->_format == 'rss') {
 				//var_dump($rss);
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
-					if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
-					if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
-					if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;
-					if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
-					if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
-					if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
-					if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
-					if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
+					if (!empty($rss->channel->language)) {
+						$this->_language = (string) $rss->channel->language;
+					}
+					if (!empty($rss->channel->generator)) {
+						$this->_generator = (string) $rss->channel->generator;
+					}
+					if (!empty($rss->channel->copyright)) {
+						$this->_copyright = (string) $rss->channel->copyright;
+					}
+					if (!empty($rss->channel->lastbuilddate)) {
+						$this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
+					}
+					if (!empty($rss->channel->image->url[0])) {
+						$this->_imageurl = (string) $rss->channel->image->url[0];
+					}
+					if (!empty($rss->channel->link)) {
+						$this->_link = (string) $rss->channel->link;
+					}
+					if (!empty($rss->channel->title)) {
+						$this->_title = (string) $rss->channel->title;
+					}
+					if (!empty($rss->channel->description)) {
+						$this->_description = (string) $rss->channel->description;
+					}
 				} else {
 					//var_dump($rss->channel);
-					if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
-					if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
-					if (!empty($rss->channel['copyright']))     $this->_copyright = (string) $rss->channel['copyright'];
-					if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
-					if (!empty($rss->image['url']))             $this->_imageurl = (string) $rss->image['url'];
-					if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-					if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
-					if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
+					if (!empty($rss->channel['language'])) {
+						$this->_language = (string) $rss->channel['language'];
+					}
+					if (!empty($rss->channel['generator'])) {
+						$this->_generator = (string) $rss->channel['generator'];
+					}
+					if (!empty($rss->channel['copyright'])) {
+						$this->_copyright = (string) $rss->channel['copyright'];
+					}
+					if (!empty($rss->channel['lastbuilddate'])) {
+						$this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
+					}
+					if (!empty($rss->image['url'])) {
+						$this->_imageurl = (string) $rss->image['url'];
+					}
+					if (!empty($rss->channel['link'])) {
+						$this->_link = (string) $rss->channel['link'];
+					}
+					if (!empty($rss->channel['title'])) {
+						$this->_title = (string) $rss->channel['title'];
+					}
+					if (!empty($rss->channel['description'])) {
+						$this->_description = (string) $rss->channel['description'];
+					}
 				}
 
-				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
-				else $items = $rss->items; // With xmlparse
+				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+					$items = $rss->channel->item; // With simplexml
+				} else {
+					$items = $rss->items; // With xmlparse
+				}
 				//var_dump($items);exit;
 			} elseif ($rss->_format == 'atom') {
 				//var_dump($rss);
-				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-				{
-					if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
-					if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
-					if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
-					if (!empty($rss->title))         $this->_title = (string) $rss->title;
-					if (!empty($rss->description))	 $this->_description = (string) $rss->description;
+				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+					if (!empty($rss->generator)) {
+						$this->_generator = (string) $rss->generator;
+					}
+					if (!empty($rss->lastbuilddate)) {
+						$this->_lastbuilddate = (string) $rss->modified;
+					}
+					if (!empty($rss->link->href)) {
+						$this->_link = (string) $rss->link->href;
+					}
+					if (!empty($rss->title)) {
+						$this->_title = (string) $rss->title;
+					}
+					if (!empty($rss->description)) {
+						$this->_description = (string) $rss->description;
+					}
 				} else {
 					//if (!empty($rss->channel['rss_language']))	$this->_language = (string) $rss->channel['rss_language'];
-					if (!empty($rss->channel['generator']))			$this->_generator = (string) $rss->channel['generator'];
+					if (!empty($rss->channel['generator'])) {
+						$this->_generator = (string) $rss->channel['generator'];
+					}
 					//if (!empty($rss->channel['rss_copyright']))	$this->_copyright = (string) $rss->channel['rss_copyright'];
-					if (!empty($rss->channel['modified']))			$this->_lastbuilddate = (string) $rss->channel['modified'];
+					if (!empty($rss->channel['modified'])) {
+						$this->_lastbuilddate = (string) $rss->channel['modified'];
+					}
 					//if (!empty($rss->image['rss_url']))			$this->_imageurl = (string) $rss->image['rss_url'];
-					if (!empty($rss->channel['link']))				$this->_link = (string) $rss->channel['link'];
-					if (!empty($rss->channel['title']))				$this->_title = (string) $rss->channel['title'];
+					if (!empty($rss->channel['link'])) {
+						$this->_link = (string) $rss->channel['link'];
+					}
+					if (!empty($rss->channel['title'])) {
+						$this->_title = (string) $rss->channel['title'];
+					}
 					//if (!empty($rss->channel['rss_description']))	$this->_description = (string) $rss->channel['rss_description'];
 
 					if (!empty($rss->channel)) {
@@ -358,9 +400,12 @@ class RssParser
 					}
 				}
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
-					$tmprss = xml2php($rss); $items = $tmprss['entry'];
-				} // With simplexml
-				else $items = $rss->items; // With xmlparse
+					$tmprss = xml2php($rss);
+					$items = $tmprss['entry'];
+				} else {
+					// With simplexml
+					$items = $rss->items; // With xmlparse
+				}
 				//var_dump($items);exit;
 			}
 
@@ -436,7 +481,9 @@ class RssParser
 
 					$i++;
 
-					if ($i > $maxNb)    break; // We get all records we want
+					if ($i > $maxNb) {
+						break; // We get all records we want
+					}
 				}
 			}
 
@@ -466,18 +513,15 @@ class RssParser
 
 		// check for a namespace, and split if found
 		$ns = false;
-		if (strpos($element, ':'))
-		{
+		if (strpos($element, ':')) {
 			list($ns, $el) = explode(':', $element, 2);
 		}
-		if ($ns and $ns != 'rdf')
-		{
+		if ($ns and $ns != 'rdf') {
 			$this->current_namespace = $ns;
 		}
 
 		// if feed type isn't set, then this is first element of feed identify feed from root element
-		if (empty($this->_format))
-		{
+		if (empty($this->_format)) {
 			if ($el == 'rdf') {
 				$this->_format = 'rss';
 				$this->feed_version = '1.0';
@@ -492,75 +536,54 @@ class RssParser
 			return;
 		}
 
-		if ($el == 'channel')
-		{
+		if ($el == 'channel') {
 			$this->inchannel = true;
-		} elseif ($el == 'item' or $el == 'entry')
-		{
+		} elseif ($el == 'item' or $el == 'entry') {
 			$this->initem = true;
 			if (isset($attrs['rdf:about'])) {
 				$this->current_item['about'] = $attrs['rdf:about'];
 			}
-		}
-
-		// if we're in the default namespace of an RSS feed,
-		//  record textinput or image fields
-		elseif (
-		$this->_format == 'rss' and
-		$this->current_namespace == '' and
-		$el == 'textinput' )
-		{
-			$this->intextinput = true;
-		} elseif (
-		$this->_format == 'rss' and
-		$this->current_namespace == '' and
-		$el == 'image' )
-		{
-			$this->inimage = true;
-		}
-
-		// handle atom content constructs
-		elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
-		{
+		} elseif ($this->_format == 'rss' and
+			$this->current_namespace == '' and
+			$el == 'textinput') {
+				// if we're in the default namespace of an RSS feed,
+				//  record textinput or image fields
+				$this->intextinput = true;
+		} elseif ($this->_format == 'rss' and
+			$this->current_namespace == '' and
+			$el == 'image') {
+				$this->inimage = true;
+		} elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS)) {
+			// handle atom content constructs
 			// avoid clashing w/ RSS mod_content
 			if ($el == 'content') {
 				$el = 'atom_content';
 			}
 
 			$this->incontent = $el;
-		}
-
-		// if inside an Atom content construct (e.g. content or summary) field treat tags as text
-		elseif ($this->_format == 'atom' and $this->incontent)
-		{
+		} elseif ($this->_format == 'atom' and $this->incontent) {
+			// if inside an Atom content construct (e.g. content or summary) field treat tags as text
 			// if tags are inlined, then flatten
 			$attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
 
 			$this->append_content("<$element $attrs_str>");
 
 			array_unshift($this->stack, $el);
-		}
-
-		// Atom support many links per containging element.
-		// Magpie treats link elements of type rel='alternate'
-		// as being equivalent to RSS's simple link element.
-		//
-		elseif ($this->_format == 'atom' and $el == 'link')
-		{
-			if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
-			{
+		} elseif ($this->_format == 'atom' and $el == 'link') {
+			// Atom support many links per containging element.
+			// Magpie treats link elements of type rel='alternate'
+			// as being equivalent to RSS's simple link element.
+			if (isset($attrs['rel']) && $attrs['rel'] == 'alternate') {
 				$link_el = 'link';
-			} elseif (!isset($attrs['rel']))
-			{
+			} elseif (!isset($attrs['rel'])) {
 				$link_el = 'link';
 			} else {
 				$link_el = 'link_'.$attrs['rel'];
 			}
 
 			$this->append($link_el, $attrs['href']);
-		}
-		// set stack[0] to current element
-		else {
+		} else {
+			// set stack[0] to current element
 			array_unshift($this->stack, $el);
 		}
 	}
@@ -577,8 +600,7 @@ class RssParser
 	public function feed_cdata($p, $text)
 	{
 		// phpcs:enable
-		if ($this->_format == 'atom' and $this->incontent)
-		{
+		if ($this->_format == 'atom' and $this->incontent) {
 			$this->append_content($text);
 		} else {
 			$current_el = join('_', array_reverse($this->stack));
@@ -599,28 +621,22 @@ class RssParser
 		// phpcs:enable
 		$el = strtolower($el);
 
-		if ($el == 'item' or $el == 'entry')
-		{
+		if ($el == 'item' or $el == 'entry') {
 			$this->items[] = $this->current_item;
 			$this->current_item = array();
 			$this->initem = false;
-		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
-		{
+		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput') {
 			$this->intextinput = false;
-		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
-		{
+		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image') {
 			$this->inimage = false;
-		} elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
-		{
+		} elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS)) {
 			$this->incontent = false;
-		} elseif ($el == 'channel' or $el == 'feed')
-		{
+		} elseif ($el == 'channel' or $el == 'feed') {
 			$this->inchannel = false;
 		} elseif ($this->_format == 'atom' and $this->incontent) {
 			// balance tags properly
 			// note:  i don't think this is actually neccessary
-			if ($this->stack[0] == $el)
-			{
+			if ($this->stack[0] == $el) {
 				$this->append_content("</$el>");
 			} else {
 				$this->append_content("<$el />");
@@ -679,8 +695,7 @@ class RssParser
 		if (!$el) {
 			return;
 		}
-		if ($this->current_namespace)
-		{
+		if ($this->current_namespace) {
 			if ($this->initem) {
 				$this->concat($this->current_item[$this->current_namespace][$el], $text);
 			} elseif ($this->inchannel) {
@@ -714,11 +729,9 @@ class RssParser
 	{
 		$result = "";
 
-		if (isset($item['summary']))
-		{
+		if (isset($item['summary'])) {
 			$result = $item['summary'];
-		} elseif (isset($item['atom_content']))
-		{
+		} elseif (isset($item['atom_content'])) {
 			$result = $item['atom_content'];
 		}
 
@@ -728,8 +741,7 @@ class RssParser
 
 		$result = str_replace("\n", "", $result);
 
-		if (strlen($result) > $maxlength)
-		{
+		if (strlen($result) > $maxlength) {
 			$result = substr($result, 0, $maxlength);
 			$result .= "...";
 		}
@@ -745,28 +757,23 @@ class RssParser
 	 */
 	private function getAtomImageUrl(array $feed)
 	{
-		if (isset($feed['icon']))
-		{
+		if (isset($feed['icon'])) {
 			return $feed['logo'];
 		}
 
-		if (isset($feed['icon']))
-		{
+		if (isset($feed['icon'])) {
 			return $feed['logo'];
 		}
 
-		if (isset($feed['webfeeds:logo']))
-		{
+		if (isset($feed['webfeeds:logo'])) {
 			return $feed['webfeeds:logo'];
 		}
 
-		if (isset($feed['webfeeds:icon']))
-		{
+		if (isset($feed['webfeeds:icon'])) {
 			return $feed['webfeeds:icon'];
 		}
 
-		if (isset($feed['webfeeds:wordmark']))
-		{
+		if (isset($feed['webfeeds:wordmark'])) {
 			return $feed['webfeeds:wordmark'];
 		}
 
@@ -786,27 +793,23 @@ function xml2php($xml)
 	$fils = 0;
 	$tab = false;
 	$array = array();
-	foreach ($xml->children() as $key => $value)
-	{
+	foreach ($xml->children() as $key => $value) {
 		$child = xml2php($value);
 
 		//To deal with the attributes
-		foreach ($value->attributes() as $ak=>$av)
-		{
+		foreach ($value->attributes() as $ak => $av) {
 			$child[$ak] = (string) $av;
 		}
 
 		//Let see if the new child is not in the array
-		if ($tab === false && in_array($key, array_keys($array)))
-		{
+		if ($tab === false && in_array($key, array_keys($array))) {
 			//If this element is already in the array we will create an indexed array
 			$tmp = $array[$key];
 			$array[$key] = null;
 			$array[$key][] = $tmp;
 			$array[$key][] = $child;
 			$tab = true;
-		} elseif ($tab === true)
-		{
+		} elseif ($tab === true) {
 			//Add an element in an existing array
 			$array[$key][] = $child;
 		} else {
@@ -818,8 +821,7 @@ function xml2php($xml)
 	}
 
 
-	if ($fils == 0)
-	{
+	if ($fils == 0) {
 		return (string) $xml;
 	}
 

From 49f7f8576251bbcbc331224405b79e40dde111f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 00:00:51 +0200
Subject: [PATCH 839/928] Fix example

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 39773b7b637..253a35e710c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -124,8 +124,8 @@ class Thirdparties extends DolibarrApi
 	 *                              Set to 2 to show only prospects
 	 *                              Set to 3 to show only those are not customer neither prospect
 	 *								Set to 4 to show only suppliers
-	 * @param  int    $category   Use this param to filter list by category
-	 * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.nom:like:'TheCompany%') and (t.date_creation:<:'20160101')"
+	 * @param  	int    	$category   Use this param to filter list by category
+	 * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "((t.nom:like:'TheCompany%') or (t.name_alias:like:'TheCompany%')) and (t.datec:<:'20160101')"
 	 * @return  array               Array of thirdparty objects
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '')

From 4da5aeedf42fac063afcc82fedb73ffd0c90ca96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 08:42:33 +0200
Subject: [PATCH 840/928] Fix bad test

---
 test/phpunit/ActionCommTest.php          |  2 +-
 test/phpunit/AdherentTest.php            |  6 +++---
 test/phpunit/BuildDocTest.php            | 14 +++++++-------
 test/phpunit/CommandeFournisseurTest.php |  2 +-
 test/phpunit/CommandeTest.php            |  2 +-
 test/phpunit/DateLibTzFranceTest.php     |  2 +-
 test/phpunit/EntrepotTest.php            |  2 +-
 test/phpunit/FactureTest.php             |  4 ++--
 test/phpunit/MouvementStockTest.php      |  2 +-
 test/phpunit/PaypalTest.php              |  2 +-
 test/phpunit/PdfDocTest.php              |  2 +-
 test/phpunit/ProductTest.php             |  2 +-
 test/phpunit/RestAPIUserTest.php         |  2 +-
 test/phpunit/SocieteTest.php             |  6 +++---
 test/phpunit/StripeTest.php              |  2 +-
 test/phpunit/SupplierProposalTest.php    |  2 +-
 test/phpunit/UserTest.php                |  2 +-
 17 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/test/phpunit/ActionCommTest.php b/test/phpunit/ActionCommTest.php
index cb908416535..b739b387a74 100644
--- a/test/phpunit/ActionCommTest.php
+++ b/test/phpunit/ActionCommTest.php
@@ -84,7 +84,7 @@ class ActionCommTest extends PHPUnit\Framework\TestCase
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (empty($conf->agenda->enabled)) {
-			print __METHOD__." module agenda must be enabled.\n"; die();
+			print __METHOD__." module agenda must be enabled.\n"; die(1);
 		}
 
 		print __METHOD__."\n";
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 63b55dd37aa..0e4956e3a12 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -87,13 +87,13 @@ class AdherentTest extends PHPUnit\Framework\TestCase
 
 		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();
+			die(1);
 		}
 		if (! empty($conf->global->MAIN_MODULE_LDAP)) {
-			print "\n".__METHOD__." module LDAP must be disabled.\n"; die();
+			print "\n".__METHOD__." module LDAP must be disabled.\n"; die(1);
 		}
 		if (! empty($conf->global->MAIN_MODULE_MAILMANSPIP)) {
-			print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die();
+			print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(1);
 		}
 
 		print __METHOD__."\n";
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index 455f2ce513a..18a737ec50b 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -113,25 +113,25 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (! $conf->facture->enabled) {
-			print __METHOD__." invoice module not enabled\n"; die();
+			print __METHOD__." invoice module not enabled\n"; die(1);
 		}
 		if (! $conf->commande->enabled) {
-			print __METHOD__." order module not enabled\n"; die();
+			print __METHOD__." order module not enabled\n"; die(1);
 		}
 		if (! $conf->propal->enabled) {
-			print __METHOD__." propal module not enabled\n"; die();
+			print __METHOD__." propal module not enabled\n"; die(1);
 		}
 		if (! $conf->projet->enabled) {
-			print __METHOD__." project module not enabled\n"; die();
+			print __METHOD__." project module not enabled\n"; die(1);
 		}
 		if (! $conf->expedition->enabled) {
-			print __METHOD__." shipment module not enabled\n"; die();
+			print __METHOD__." shipment module not enabled\n"; die(1);
 		}
 		if (! $conf->ficheinter->enabled) {
-			print __METHOD__." intervention module not enabled\n"; die();
+			print __METHOD__." intervention module not enabled\n"; die(1);
 		}
 		if (! $conf->expensereport->enabled) {
-			print __METHOD__." expensereport module not enabled\n"; die();
+			print __METHOD__." expensereport module not enabled\n"; die(1);
 		}
 
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index b050005bcf1..bf5922460a2 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -147,7 +147,7 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
 		$product=new ProductFournisseur($db);
 		$product->fetch(0, 'PIDRESS');
 		if ($product->id <= 0) {
-			print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die();
+			print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(1);
 		}
 
 		$quantity=10;
diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
index 4ab81d63524..064c205c0e9 100644
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -84,7 +84,7 @@ class CommandeTest extends PHPUnit\Framework\TestCase
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (empty($conf->commande->enabled)) {
-			print __METHOD__." module customer order must be enabled.\n"; die();
+			print __METHOD__." module customer order must be enabled.\n"; die(1);
 		}
 
 		print __METHOD__."\n";
diff --git a/test/phpunit/DateLibTzFranceTest.php b/test/phpunit/DateLibTzFranceTest.php
index 63eadc1a98f..4b63450c332 100644
--- a/test/phpunit/DateLibTzFranceTest.php
+++ b/test/phpunit/DateLibTzFranceTest.php
@@ -83,7 +83,7 @@ class DateLibTzFranceTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (getServerTimeZoneString() != 'Europe/Paris' && getServerTimeZoneString() != 'Europe/Berlin') {
-			print "\n".__METHOD__." This PHPUnit test can be launched manually only onto a server with PHP timezone set to TZ=Europe/Paris, not a TZ=".getServerTimeZoneString().".\n"; die();
+			print "\n".__METHOD__." This PHPUnit test can be launched manually only onto a server with PHP timezone set to TZ=Europe/Paris, not a TZ=".getServerTimeZoneString().".\n"; die(1);
 		}
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php
index 6be9b5ba349..691b3039744 100644
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@@ -83,7 +83,7 @@ class EntrepotTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (empty($conf->stock->enabled)) {
-			print __METHOD__." Module Stock must be enabled.\n"; die();
+			print __METHOD__." Module Stock must be enabled.\n"; die(1);
 		}
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index ddb895d1b96..efa7d43a269 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -84,10 +84,10 @@ class FactureTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (empty($conf->facture->enabled)) {
-			print __METHOD__." module customer invoice must be enabled.\n"; die();
+			print __METHOD__." module customer invoice must be enabled.\n"; die(1);
 		}
 		if (! empty($conf->ecotaxdeee->enabled)) {
-			print __METHOD__." ecotaxdeee module must not be enabled.\n"; die();
+			print __METHOD__." ecotaxdeee module must not be enabled.\n"; die(1);
 		}
 
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/MouvementStockTest.php b/test/phpunit/MouvementStockTest.php
index b68a8c90d0a..749f94ab20f 100644
--- a/test/phpunit/MouvementStockTest.php
+++ b/test/phpunit/MouvementStockTest.php
@@ -115,7 +115,7 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
 		$db=$this->savdb;
 
 		if (empty($conf->productbatch->enabled)) {
-			print "\n".__METHOD__." module Lot/Serial must be enabled.\n"; die();
+			print "\n".__METHOD__." module Lot/Serial must be enabled.\n"; die(1);
 		}
 
 		print __METHOD__."\n";
diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php
index 3177e5555ed..61027d02710 100644
--- a/test/phpunit/PaypalTest.php
+++ b/test/phpunit/PaypalTest.php
@@ -84,7 +84,7 @@ class PaypalTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (empty($conf->paypal->enabled)) {
-			print __METHOD__." Module Paypal must be enabled.\n"; die();
+			print __METHOD__." Module Paypal must be enabled.\n"; die(1);
 		}
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index 4c07f970c24..039bbe69288 100644
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -144,7 +144,7 @@ class PdfDocTest extends PHPUnit\Framework\TestCase
 		$localproduct->fetch(0, 'PIDRESS');
 		$product_id=$localproduct->id;
 		if ($product_id <= 0) {
-			print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die();
+			print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(1);
 		}
 
 		$localobject=new Facture($this->savdb);
diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index a7267251ed0..7eb6de57c02 100644
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -83,7 +83,7 @@ class ProductTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (empty($conf->produit->enabled)) {
-			print __METHOD__." Module Product must be enabled.\n"; die();
+			print __METHOD__." Module Product must be enabled.\n"; die(1);
 		}
 
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index a534c5f5910..c908b631df8 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -74,7 +74,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 		$this->savdb=$db;
 
 		if (empty($conf->api->enabled)) {
-			print __METHOD__." module api must be enabled.\n"; die();
+			print __METHOD__." module api must be enabled.\n"; die(1);
 		}
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 12f24290413..73363140acd 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -84,15 +84,15 @@ class SocieteTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') {
-			print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die();
+			print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die(1);
 		}
 
 		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
-			print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die();
+			print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die(1);
 		}
 
 		if ($langs->defaultlang != 'en_US') {
-			print "\n".__METHOD__." default language of company must be set to autodetect.\n"; die();
+			print "\n".__METHOD__." default language of company must be set to autodetect.\n"; die(1);
 		}
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/StripeTest.php b/test/phpunit/StripeTest.php
index 9425cc47aa0..bb769e83e80 100644
--- a/test/phpunit/StripeTest.php
+++ b/test/phpunit/StripeTest.php
@@ -84,7 +84,7 @@ class StripeTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (empty($conf->stripe->enabled)) {
-			print __METHOD__." Module Stripe must be enabled.\n"; die();
+			print __METHOD__." Module Stripe must be enabled.\n"; die(1);
 		}
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/SupplierProposalTest.php b/test/phpunit/SupplierProposalTest.php
index bc9263f410c..ebcf30c29e6 100644
--- a/test/phpunit/SupplierProposalTest.php
+++ b/test/phpunit/SupplierProposalTest.php
@@ -87,7 +87,7 @@ class SupplierProposalTest extends PHPUnit\Framework\TestCase
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
 		if (empty($conf->global->MAIN_MODULE_SUPPLIERPROPOSAL)) {
-			print "\n".__METHOD__." module Supplier proposal must be enabled.\n"; die();
+			print "\n".__METHOD__." module Supplier proposal must be enabled.\n"; die(1);
 		}
 
 		print __METHOD__."\n";
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index ca889fdbc96..5a09e4c9864 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -83,7 +83,7 @@ class UserTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (! empty($conf->global->MAIN_MODULE_LDAP)) {
-			print "\n".__METHOD__." module LDAP must be disabled.\n"; die();
+			print "\n".__METHOD__." module LDAP must be disabled.\n"; die(1);
 		}
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.

From 3ea6cd1c66a75d3fc38c870cfa759578414d4fec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 08:53:29 +0200
Subject: [PATCH 841/928] Fix missing columns

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 ++
 htdocs/install/mysql/tables/llx_product.sql      | 2 ++
 htdocs/product/inventory/inventory.php           | 6 +++---
 test/phpunit/PdfDocTest.php                      | 7 +++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 92e2c3cf757..37719c015c5 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -403,6 +403,8 @@ UPDATE llx_propal SET date_signature = date_cloture WHERE date_signature IS NULL
 
 
 ALTER TABLE llx_product ADD COLUMN batch_mask VARCHAR(32) NULL;
+ALTER TABLE llx_product ADD COLUMN lifetime INTEGER NULL;
+ALTER TABLE llx_product ADD COLUMN qc_frequency INTEGER NULL;
 
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (210, 'conferenceorbooth', 'internal', 'MANAGER',  'Conference or Booth manager', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (211, 'conferenceorbooth', 'external', 'SPEAKER',   'Conference Speaker', 1);
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index da8c2ff693c..73b4473a5a4 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -94,6 +94,8 @@ create table llx_product
   fk_default_warehouse          integer      DEFAULT NULL,
   canvas                        varchar(32)  DEFAULT NULL,
   finished                      tinyint      DEFAULT NULL,          -- see dictionnary c_product_nature
+  lifetime                      integer      DEFAULT NULL,
+  qc_frequency 					integer 	 DEFAULT NULL,
   hidden                        tinyint      DEFAULT 0,             -- Not used. Deprecated.
   import_key                    varchar(14),                        -- Import key
   model_pdf                     varchar(255),                       -- model save dodument used
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index ecad54a4a73..331dcb997c7 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -609,7 +609,7 @@ if ($object->id > 0) {
 		print '</tr>';
 	}
 
-	// Request to show lines of inventory (prefilled during creation)
+	// Request to show lines of inventory (prefilled after start/validate step)
 	$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
 	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
@@ -641,8 +641,8 @@ if ($object->id > 0) {
 				$product_static = $cacheOfProducts[$obj->fk_product];
 			} else {
 				$product_static = new Product($db);
-				$product_static->fetch($obj->fk_product);
-
+				$result = $product_static->fetch($obj->fk_product, '', '', '', 1, 1, 1);
+var_dump($result);
 				$option = 'nobatch';
 				$option .= ',novirtual';
 				$product_static->load_stock($option); // Load stock_reel + stock_warehouse. This can also call load_virtual_stock()
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index 039bbe69288..e744aef3c2f 100644
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -141,8 +141,11 @@ class PdfDocTest extends PHPUnit\Framework\TestCase
 		$db=$this->savdb;
 
 		$localproduct=new Product($this->savdb);
-		$localproduct->fetch(0, 'PIDRESS');
-		$product_id=$localproduct->id;
+		$result = $localproduct->fetch(0, 'PIDRESS');
+		if ($result < 0) {
+			print "\n".__METHOD__." Failed to make the fetch of product PIDRESS. ".$localproduct->error; die(1);
+		}
+		$product_id = $localproduct->id;
 		if ($product_id <= 0) {
 			print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(1);
 		}

From fac32ee9136e1ba0fbf00d00f79a16bf8f7a53f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 08:54:36 +0200
Subject: [PATCH 842/928] Better performance

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

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 331dcb997c7..b2cf491d901 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -642,7 +642,7 @@ if ($object->id > 0) {
 			} else {
 				$product_static = new Product($db);
 				$result = $product_static->fetch($obj->fk_product, '', '', '', 1, 1, 1);
-var_dump($result);
+
 				$option = 'nobatch';
 				$option .= ',novirtual';
 				$product_static->load_stock($option); // Load stock_reel + stock_warehouse. This can also call load_virtual_stock()

From dd00feae006e9c80354a89309fcc507af6d03f82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 08:57:06 +0200
Subject: [PATCH 843/928] Clean code

---
 .../accountancy/bookkeeping/thirdparty_lettering_customer.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 0064e8c4715..8669cae7c2f 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -281,7 +281,7 @@ if ($resql) {
 		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
 		print '<td class="center">'.$journaltoshow.'</td>';
 
-		if (empty($obj->lettering_code)) {
+		if (empty($obj->lettering_code) && empty($obj->date_validated)) {
 			print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
 			print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
 			print img_edit();

From b8254186ce7d5742c3898250bc43915306ecf2ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 09:07:36 +0200
Subject: [PATCH 844/928] Clean code

---
 htdocs/core/class/html.formother.class.php | 46 ++++++++++++++++++++++
 htdocs/product/inventory/inventory.php     | 32 ++-------------
 2 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 4fb0a44b06b..fa825bcb84d 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -56,6 +56,52 @@ class FormOther
 		$this->db = $db;
 	}
 
+	/**
+	 * Return HTML code for scanner tool
+	 *
+	 * @param	string	$jstoexecuteonadd		Name of javascript function to call
+	 * @return	string						HTML component
+	 */
+	public function getHTMLScannerForm($jstoexecuteonadd = 'barcodscannerjs')
+	{
+		global $langs;
+
+		$out = '';
+
+		$out .= '<form name="barcodescanner" method="POST">';
+		$out .= '<!-- Popup for mass barcode scanning -->'."\n";
+		$out .= '<div class="div-for-modal-topright" style="padding: 15px">';
+		$out .= '<center><strong>Barcode scanner tool...</strong></center><br>';
+
+		$out .= '<input type="checkbox" name="barcodeforautodetect" checked="checked"> Autodetect if we scan a product barcode or a lot/serial barcode<br>';
+		$out .= '<input type="checkbox" name="barcodeforproduct"> Scan a product barcode<br>';
+		$out .= '<input type="checkbox" name="barcodeforlotserial"> Scan a product lot or serial number<br>';
+
+		$out .= $langs->trans("QtyToAddAfterBarcodeScan").' <input type="text" name="barcodeproductqty" class="width50 right" value="1"><br>';
+		$out .= '<textarea type="text" name="barcodelist" class="centpercent" autofocus rows="'.ROWS_3.'"></textarea>';
+
+		/*print '<br>'.$langs->trans("or").'<br>';
+
+		print '<br>';
+
+		print '<input type="text" name="barcodelotserial" class="width200"> &nbsp; &nbsp; Qty <input type="text" name="barcodelotserialqty" class="width50 right" value="1"><br>';
+		*/
+		$out .= '<br>';
+		$out .= '<center>';
+		$out .= '<input type="submit" class="button paddingleftonly paddingrightonly" name="addscan" value="'.$langs->trans("Add").'">';
+		$out .= '<input type="submit" class="button paddingleftonly paddingrightonly" name="cancel" value="'.$langs->trans("Cancel").'">';
+		$out .= '<br>';
+
+		$out .= '<span class="opacitymedium">'.$langs->trans("FeatureNotYetAvailable").'</span>';
+
+		// TODO Add call of javascript $jstoexecuteonadd so each scan will add qty into the inventory page + an ajax save.
+
+		$out .= '</center>';
+		$out .= '</div>';
+		$out .= '</form>';
+
+		return $out;
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index b2cf491d901..6af61126fe6 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -524,35 +524,9 @@ if ($object->id > 0) {
 
 	// Popup for mass barcode scanning
 	if ($action == 'updatebyscaning') {
-		print '<form name="barcodescanner" method="POST">';
-		print '<!-- Popup for mass barcode scanning -->'."\n";
-		print '<div class="div-for-modal-topright" style="padding: 15px">';
-		print '<center><strong>Barcode scanner tool...</strong></center><br>';
-
-		print '<input type="checkbox" name="barcodeforautodetect" checked="checked"> Autodetect if we scan a product barcode or a lot/serial barcode<br>';
-		print '<input type="checkbox" name="barcodeforproduct"> Scan a product barcode<br>';
-		print '<input type="checkbox" name="barcodeforlotserial"> Scan a product lot or serial number<br>';
-
-		print $langs->trans("QtyToAddAfterBarcodeScan").' <input type="text" name="barcodeproductqty" class="width50 right" value="1"><br>';
-		print '<textarea type="text" name="barcodelist" class="centpercent" autofocus rows="'.ROWS_3.'"></textarea>';
-
-		/*print '<br>'.$langs->trans("or").'<br>';
-
-		print '<br>';
-
-		print '<input type="text" name="barcodelotserial" class="width200"> &nbsp; &nbsp; Qty <input type="text" name="barcodelotserialqty" class="width50 right" value="1"><br>';
-		*/
-		print '<br>';
-		print '<center>';
-		print '<input type="submit" class="button" value="'.$langs->trans("Add").'"><br>';
-
-		print '<span class="opacitymedium">'.$langs->trans("FeatureNotYetAvailable").'</span>';
-
-		// TODO Add javascript so each scan will add qty into the inventory page + an ajax save.
-
-		print '</center>';
-		print '</div>';
-		print '</form>';
+		include DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+		$formother = new FormOther($db);
+		print $formother->getHTMLScannerForm();
 	}
 
 

From 06c181793082b0ddad5bd007666a0daa07785ace Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 12 May 2021 09:21:28 +0200
Subject: [PATCH 845/928] Update mailing-send script and mailling card

---
 htdocs/comm/mailing/card.php       | 5 ++---
 scripts/emailings/mailing-send.php | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index b26bf5812e9..86aff8a36e0 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -285,9 +285,8 @@ if (empty($reshook)) {
 
 						$moreinheader = '';
 						if (preg_match('/__UNSUBSCRIBE__/', $message)) {
-							$moreinheader = make_substitutions('__UNSUBSCRIBE__', $substitutionarray);
-							$moreinheader = explode('"', $moreinheader);
-							$moreinheader = "List-Unsubscribe: <".$moreinheader[1].">\n";
+							$moreinheader = "List-Unsubscribe: <__UNSUBSCRIBE_URL__>\n";
+							$moreinheader = make_substitutions($moreinheader, $substitutionarray);
 						}
 
 						$arr_file = array();
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 8d9d98aa3d3..0d59a1b5db5 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -271,9 +271,8 @@ if ($resql) {
 
 						$moreinheader = '';
 						if (preg_match('/__UNSUBSCRIBE__/', $message)) {
-							$moreinheader = make_substitutions('__UNSUBSCRIBE__', $substitutionarray);
-							$moreinheader = explode('"', $moreinheader);
-							$moreinheader = "List-Unsubscribe: <".$moreinheader[1].">\n";
+							$moreinheader = "List-Unsubscribe: <__UNSUBSCRIBE_URL__>\n";
+							$moreinheader = make_substitutions($moreinheader, $substitutionarray);
 						}
 
 						$arr_file = array();

From f334f2a255d347c1aeb1e32f8cf3a7f2a88b3831 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 09:22:49 +0200
Subject: [PATCH 846/928] Fix inventory

---
 htdocs/product/inventory/inventory.php | 32 ++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 6af61126fe6..970676c34b6 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -103,7 +103,7 @@ if ($action == 'cancel_record' && $permissiontoadd) {
 	$object->setCanceled($user);
 }
 
-if ($action == 'update' && $user->rights->stock->mouvement->creer) {
+if ($action == 'update' && !empty($user->rights->stock->mouvement->creer)) {
 	$stockmovment = new MouvementStock($db);
 	$stockmovment->origin = $object;
 
@@ -160,7 +160,7 @@ if ($action == 'update' && $user->rights->stock->mouvement->creer) {
 	}
 }
 
-if (($action == 'record' || $action =='updateinventorylines') && $permissiontoadd) {
+if ($action =='updateinventorylines' && $permissiontoadd) {
 	$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
 	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
@@ -301,16 +301,19 @@ llxHeader('', $langs->trans('Inventory'), $help_url);
 
 // Disable button Generate movement if data were not saved
 print '<script type="text/javascript" language="javascript">
+function disablebuttonmakemovementandclose() {
+	console.log("Disable button idbuttonmakemovementandclose until we save");
+	jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
+	jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
+};
+
 jQuery(document).ready(function() {
+
 	jQuery(".realqty").keyup(function() {
-		console.log("Disable button idbuttonmakemovementandclose until we save");
-		jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
-		jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
+		disablebuttonmakemovementandclose();
 	});
 	jQuery(".realqty").change(function() {
-		console.log("Disable button idbuttonmakemovementandclose until we save");
-		jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
-		jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
+		disablebuttonmakemovementandclose();
 	});
 });
 </script>';
@@ -466,7 +469,7 @@ if ($object->id > 0) {
 			// Save
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" id="idbuttonmakemovementandclose" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=record&token='.newToken().'">'.$langs->trans("MakeMovementsAndClose").'</a>'."\n";
+					print '<a class="butAction" id="idbuttonmakemovementandclose" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=record&token='.newToken().'" title="'.dol_escape_htmltag("SaveQtyFirst").'">'.$langs->trans("MakeMovementsAndClose").'</a>'."\n";
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('MakeMovementsAndClose').'</a>'."\n";
 				}
@@ -598,6 +601,7 @@ if ($object->id > 0) {
 		$num = $db->num_rows($resql);
 
 		$i = 0;
+		$totalfound = 0;
 		$totalarray = array();
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
@@ -647,6 +651,7 @@ if ($object->id > 0) {
 			print '<td class="center">';
 			if ($object->status == $object::STATUS_VALIDATED) {
 				$qty_view = GETPOST("id_".$obj->rowid) ? GETPOST("id_".$obj->rowid) : $obj->qty_view;
+				$totalfound += price2num($qty_view, 'MS');
 				print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
 				print '</td>';
 				print '<td class="right">';
@@ -654,6 +659,7 @@ if ($object->id > 0) {
 				print '</td>';
 			} else {
 				print $obj->qty_view;
+				$totalfound += $obj->qty_view;
 				print '</td>';
 			}
 			print '</tr>';
@@ -674,6 +680,14 @@ if ($object->id > 0) {
 
 	print '</div>';
 
+	// Call method to disable the button if no qty entered yet for inventory
+	if ($object->status != $object::STATUS_VALIDATED || $totalfound == 0) {
+		print '<script type="text/javascript" language="javascript">
+					jQuery(document).ready(function() {
+						disablebuttonmakemovementandclose();
+					});
+				</script>';
+	}
 	print '</form>';
 }
 

From cfded75d114da064cc90abf5d23c2daa58759e36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 09:27:04 +0200
Subject: [PATCH 847/928] Debug v14

---
 htdocs/core/class/html.formother.class.php | 5 ++---
 htdocs/product/inventory/inventory.php     | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index fa825bcb84d..ba3ff77d394 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -57,7 +57,8 @@ class FormOther
 	}
 
 	/**
-	 * Return HTML code for scanner tool
+	 * Return HTML code for scanner tool.
+	 * This must be called into an existing <form>
 	 *
 	 * @param	string	$jstoexecuteonadd		Name of javascript function to call
 	 * @return	string						HTML component
@@ -68,7 +69,6 @@ class FormOther
 
 		$out = '';
 
-		$out .= '<form name="barcodescanner" method="POST">';
 		$out .= '<!-- Popup for mass barcode scanning -->'."\n";
 		$out .= '<div class="div-for-modal-topright" style="padding: 15px">';
 		$out .= '<center><strong>Barcode scanner tool...</strong></center><br>';
@@ -98,7 +98,6 @@ class FormOther
 
 		$out .= '</center>';
 		$out .= '</div>';
-		$out .= '</form>';
 
 		return $out;
 	}
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 970676c34b6..2abc830eb7c 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -99,6 +99,10 @@ $now = dol_now();
  * Actions
  */
 
+if ($cancel) {
+	$action = '';
+}
+
 if ($action == 'cancel_record' && $permissiontoadd) {
 	$object->setCanceled($user);
 }

From ce8c60613237b0c35c137875a5820b5daf32a108 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 11:04:22 +0200
Subject: [PATCH 848/928] Clean APIs

---
 htdocs/api/class/api.class.php              | 25 +++++++--
 htdocs/product/class/api_products.class.php | 60 +++++++++++++++++----
 htdocs/product/class/product.class.php      | 12 +----
 htdocs/user/card.php                        | 12 +++--
 4 files changed, 80 insertions(+), 29 deletions(-)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 7a9dd908a59..0a84de7b7c1 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -124,6 +124,16 @@ class DolibarrApi
 		unset($object->ref_previous);
 		unset($object->ref_next);
 		unset($object->ref_int);
+		unset($object->imgWidth);
+		unset($object->imgHeight);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+
+		unset($object->mode_reglement);		// We use mode_reglement_id now
+		unset($object->cond_reglement);		// We use cond_reglement_id now
+		unset($object->note);				// We use note_public or note_private now
+		unset($object->contact);			// We use contact_id now
+		unset($object->thirdparty);			// We use thirdparty_id or fk_soc or socid now
 
 		unset($object->projet); // Should be fk_project
 		unset($object->project); // Should be fk_project
@@ -137,6 +147,12 @@ class DolibarrApi
 		unset($object->timespent_fk_user);
 		unset($object->timespent_note);
 		unset($object->fk_delivery_address);
+		unset($object->modelpdf);
+		unset($object->sendtoid);
+		unset($object->name_bis);
+		unset($object->newref);
+		unset($object->alreadypaid);
+		unset($object->openid);
 
 		unset($object->statuts);
 		unset($object->statuts_short);
@@ -169,16 +185,17 @@ class DolibarrApi
 
 		unset($object->region);
 		unset($object->region_code);
+		unset($object->country);
+		unset($object->state);
+		unset($object->state_code);
+		unset($object->departement);
+		unset($object->departement_code);
 
 		unset($object->libelle_statut);
 		unset($object->libelle_paiement);
 
 		unset($object->prefix_comm);
 
-		unset($object->sendtoid);
-		unset($object->name_bis);
-		unset($object->newref);
-
 		if (!isset($object->table_element) || $object->table_element != 'ticket') {
 			unset($object->comments);
 		}
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index fc89787deda..b4e860a1069 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -73,15 +73,16 @@ class Products extends DolibarrApi
 	 * @param  int    $includestockdata    Load also information about stock (slower)
 	 * @param  bool   $includesubproducts  Load information about subproducts
 	 * @param  bool   $includeparentid     Load also ID of parent product (if product is a variant of a parent product)
+	 * @param  bool   $includetrans		   Load also the translations of product label and description
 	 * @return array|mixed                 Data without useless information
 	 *
 	 * @throws RestException 401
 	 * @throws RestException 403
 	 * @throws RestException 404
 	 */
-	public function get($id, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	public function get($id, $includestockdata = 0, $includesubproducts = false, $includeparentid = false, $includetrans = false)
 	{
-		return $this->_fetch($id, '', '', '', $includestockdata, $includesubproducts, $includeparentid);
+		return $this->_fetch($id, '', '', '', $includestockdata, $includesubproducts, $includeparentid, false, $includetrans);
 	}
 
 	/**
@@ -93,6 +94,7 @@ class Products extends DolibarrApi
 	 * @param  int    $includestockdata   Load also information about stock (slower)
 	 * @param  bool   $includesubproducts Load information about subproducts
 	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
+	 * @param  bool   $includetrans		  Load also the translations of product label and description
 	 *
 	 * @return array|mixed                 Data without useless information
 	 *
@@ -102,9 +104,9 @@ class Products extends DolibarrApi
 	 * @throws RestException 403
 	 * @throws RestException 404
 	 */
-	public function getByRef($ref, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	public function getByRef($ref, $includestockdata = 0, $includesubproducts = false, $includeparentid = false, $includetrans = false)
 	{
-		return $this->_fetch('', $ref, '', '', $includestockdata, $includesubproducts, $includeparentid);
+		return $this->_fetch('', $ref, '', '', $includestockdata, $includesubproducts, $includeparentid, false, $includetrans);
 	}
 
 	/**
@@ -116,6 +118,7 @@ class Products extends DolibarrApi
 	 * @param  int    $includestockdata   Load also information about stock (slower)
 	 * @param  bool   $includesubproducts Load information about subproducts
 	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
+	 * @param  bool   $includetrans		  Load also the translations of product label and description
 	 *
 	 * @return array|mixed Data without useless information
 	 *
@@ -125,9 +128,9 @@ class Products extends DolibarrApi
 	 * @throws RestException 403
 	 * @throws RestException 404
 	 */
-	public function getByRefExt($ref_ext, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	public function getByRefExt($ref_ext, $includestockdata = 0, $includesubproducts = false, $includeparentid = false, $includetrans = false)
 	{
-		return $this->_fetch('', '', $ref_ext, '', $includestockdata, $includesubproducts, $includeparentid);
+		return $this->_fetch('', '', $ref_ext, '', $includestockdata, $includesubproducts, $includeparentid, false, $includetrans);
 	}
 
 	/**
@@ -139,6 +142,7 @@ class Products extends DolibarrApi
 	 * @param  int    $includestockdata   Load also information about stock (slower)
 	 * @param  bool   $includesubproducts Load information about subproducts
 	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
+	 * @param  bool   $includetrans		  Load also the translations of product label and description
 	 *
 	 * @return array|mixed Data without useless information
 	 *
@@ -148,9 +152,9 @@ class Products extends DolibarrApi
 	 * @throws RestException 403
 	 * @throws RestException 404
 	 */
-	public function getByBarcode($barcode, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	public function getByBarcode($barcode, $includestockdata = 0, $includesubproducts = false, $includeparentid = false, $includetrans = false)
 	{
-		return $this->_fetch('', '', '', $barcode, $includestockdata, $includesubproducts, $includeparentid);
+		return $this->_fetch('', '', '', $barcode, $includestockdata, $includesubproducts, $includeparentid, false, $includetrans);
 	}
 
 	/**
@@ -1895,6 +1899,8 @@ class Products extends DolibarrApi
 		// phpcs:enable
 		$object = parent::_cleanObjectDatas($object);
 
+		unset($object->statut);
+
 		unset($object->regeximgext);
 		unset($object->price_by_qty);
 		unset($object->prices_by_qty_id);
@@ -1906,8 +1912,39 @@ class Products extends DolibarrApi
 		unset($object->firstname);
 		unset($object->lastname);
 		unset($object->civility_id);
+		unset($object->contact);
+		unset($object->contact_id);
+		unset($object->thirdparty);
+		unset($object->user);
+		unset($object->origin);
+		unset($object->origin_id);
+		unset($object->fourn_pu);
+		unset($object->fourn_price_base_type);
+		unset($object->fourn_socid);
+		unset($object->ref_fourn);
+		unset($object->ref_supplier);
+		unset($object->product_fourn_id);
+		unset($object->fk_project);
 
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
+		unset($object->demand_reason_id);
+		unset($object->transport_mode_id);
+		unset($object->cond_reglement);
+		unset($object->shipping_method_id);
+		unset($object->model_pdf);
+		unset($object->note);
+
+		unset($object->nbphoto);
 		unset($object->recuperableonly);
+		unset($object->multiprices_recuperableonly);
+		unset($object->tva_npr);
+		unset($object->lines);
+		unset($object->fk_bank);
+		unset($object->fk_account);
+
+		unset($object->supplierprices);	// Mut use another API to get them
+
 
 		return $object;
 	}
@@ -1942,14 +1979,15 @@ class Products extends DolibarrApi
 	 * @param  int    $includestockdata   		Load also information about stock (slower)
 	 * @param  bool   $includesubproducts 		Load information about subproducts (if product is a virtual product)
 	 * @param  bool   $includeparentid    		Load also ID of parent product (if product is a variant of a parent product)
-	 * @param  bool   $includeifobjectisused	Check if product object is used and set is_object_used with result.
+	 * @param  bool   $includeifobjectisused	Check if product object is used and set property 'is_object_used' with result.
+	 * @param  bool   $includetrans				Load also the translations of product label and description
 	 * @return array|mixed                		Data without useless information
 	 *
 	 * @throws RestException 401
 	 * @throws RestException 403
 	 * @throws RestException 404
 	 */
-	private function _fetch($id, $ref = '', $ref_ext = '', $barcode = '', $includestockdata = 0, $includesubproducts = false, $includeparentid = false, $includeifobjectisused = false)
+	private function _fetch($id, $ref = '', $ref_ext = '', $barcode = '', $includestockdata = 0, $includesubproducts = false, $includeparentid = false, $includeifobjectisused = false, $includetrans = false)
 	{
 		if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
 			throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
@@ -1961,7 +1999,7 @@ class Products extends DolibarrApi
 			throw new RestException(403);
 		}
 
-		$result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
+		$result = $this->product->fetch($id, $ref, $ref_ext, $barcode, 0, 0, ($includetrans ? 0 : 1));
 		if (!$result) {
 			throw new RestException(404, 'Product not found');
 		}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index b359d7629b7..22e28001743 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -330,13 +330,6 @@ class Product extends CommonObject
 	 */
 	public $barcode_type_code;
 
-	/**
-	 * Additional barcodes (Some products have different barcodes according to the country of origin of manufacture)
-	 *
-	 * @var array
-	 */
-	public $barcodes_extra = array();
-
 	public $stats_propale = array();
 	public $stats_commande = array();
 	public $stats_contrat = array();
@@ -2237,7 +2230,7 @@ class Product extends CommonObject
 		if ($separatedStock) {
 			$sql .= " AND sp.fk_entrepot IN (
 				SELECT rowid
-				FROM ".MAIN_DB_PREFIX."entrepot	WHERE entity IN (" . $this->db->sanitize($visibleWarehousesEntities)	."))";
+				FROM ".MAIN_DB_PREFIX."entrepot	WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
 		}
 
 
@@ -2336,11 +2329,10 @@ class Product extends CommonObject
 
 				$this->db->free($resql);
 
-				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
-				// multilangs
+				// Multilangs
 				if (!empty($conf->global->MAIN_MULTILANGS) && empty($ignore_lang_load)) {
 					$this->getMultiLangs();
 				}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index b1a9a229827..8b31f8b544b 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -240,10 +240,12 @@ if (empty($reshook)) {
 			//$object->twitter = GETPOST("twitter", 'alphanohtml');
 			//$object->facebook = GETPOST("facebook", 'alphanohtml');
 			//$object->linkedin = GETPOST("linkedin", 'alphanohtml');
-			$object->socialnetworks = array();
 			if (!empty($conf->socialnetworks->enabled)) {
+				$object->socialnetworks = array();
 				foreach ($socialnetworks as $key => $value) {
-					$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+					if (GETPOST($key, 'alphanohtml')) {
+						$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+					}
 				}
 			}
 
@@ -400,10 +402,12 @@ if (empty($reshook)) {
 				//$object->twitter = GETPOST("twitter", 'alphanohtml');
 				//$object->facebook = GETPOST("facebook", 'alphanohtml');
 				//$object->linkedin = GETPOST("linkedin", 'alphanohtml');
-				$object->socialnetworks = array();
 				if (!empty($conf->socialnetworks->enabled)) {
+					$object->socialnetworks = array();
 					foreach ($socialnetworks as $key => $value) {
-						$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+						if (GETPOST($key, 'alphanohtml')) {
+							$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+						}
 					}
 				}
 				$object->email = preg_replace('/\s+/', '', GETPOST("email", 'alphanohtml'));

From a665ff5bdacc55e52434d830e5d37d8c57abf81d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 11:51:39 +0200
Subject: [PATCH 849/928] Copy-Paste works also for hidden fields

---
 htdocs/core/lib/functions.lib.php | 22 ++++++++++++-------
 htdocs/theme/eldy/global.inc.php  | 10 +++++++--
 htdocs/theme/md/style.css.php     | 17 ++++++++++++++-
 htdocs/user/card.php              | 36 +++++++++++++++++--------------
 4 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ba953282d2d..970ec73e373 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3505,7 +3505,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
 				'off', 'on', 'order',
 				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip',
-				'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
+				'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
@@ -3556,7 +3556,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'reception'=>'dolly', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
 				'refresh'=>'redo', 'resource'=>'laptop-house',
-				'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',
+				'security'=>'key', 'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',
 				'supplier'=>'building', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 				'timespent'=>'clock', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 				'title_agenda'=>'calendar-alt',
@@ -3656,7 +3656,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'other'=>'#ddd',
 				'partnership'=>'#6c6aa8', 'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'reception'=>'#a69944', 'resize'=>'#444', 'rss'=>'#cba',
 				//'shipment'=>'#a69944',
-				'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
+				'security'=>'#999', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
 				'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa',
 				'website'=>'#304', 'workstation'=>'#a69944'
 			);
@@ -10232,14 +10232,20 @@ function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
 }
 
 /**
- * Create a button to copy $valuetoprint in the clipboard
+ * Create a button to copy $valuetocopy in the clipboard
  *
- * @param 	string 	$valuetoprint 		The value to print
- * @param	int		$showonlyonhover	Show the copypaste button only on hover
+ * @param 	string 	$valuetocopy 		The value to print
+ * @param	int		$showonlyonhover	Show the copy-paste button only on hover
+ * @param	string	$texttoshow			Replace the value to show with this text
  * @return 	string 						The string to print for the button
  */
-function showValueWithClipboardCPButton($valuetoprint, $showonlyonhover = 1)
+function showValueWithClipboardCPButton($valuetocopy, $showonlyonhover = 1, $texttoshow = '')
 {
-	$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><span class="clipboardCPValue">'.$valuetoprint.'</span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText opacitymedium"></span></span>';
+	if ($texttoshow) {
+		$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><span class="clipboardCPValue hidewithsize">'.$valuetocopy.'</span><span class="clipboardCPValueToPrint">'.$texttoshow.'</span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText opacitymedium"></span></span>';
+	} else {
+		$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><span class="clipboardCPValue">'.$valuetocopy.'</span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText opacitymedium"></span></span>';
+	}
+
 	return $result;
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e9a646d751f..912cf21a1de 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4674,7 +4674,7 @@ table.dp {
 
 
 /* ============================================================================== */
-/*  Afficher/cacher                                                               */
+/*  Show/Hide                                                                     */
 /* ============================================================================== */
 
 div.visible {
@@ -6763,9 +6763,15 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 
 
 /* ============================================================================== */
-/* For copypaste feature                                                          */
+/* For copy-paste feature                                                         */
 /* ============================================================================== */
 
+span.clipboardCPValue.hidewithsize {
+    width: 0 !important;
+    display: inline-block;
+    color: transparent;
+}
+
 .clipboardCPShowOnHover .clipboardCPButton {
 	display: none;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 0b09b141258..8152e56e945 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4583,7 +4583,7 @@ table.dp {
 
 
 /* ============================================================================== */
-/*  Afficher/cacher                                                               */
+/*  Show/Hide                                                                     */
 /* ============================================================================== */
 
 div.visible {
@@ -6606,6 +6606,21 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 }
 
 
+/* ============================================================================== */
+/* For copy-paste feature                                                         */
+/* ============================================================================== */
+
+span.clipboardCPValue.hidewithsize {
+    width: 0 !important;
+    display: inline-block;
+    color: transparent;
+}
+
+.clipboardCPShowOnHover .clipboardCPButton {
+	display: none;
+}
+
+
 /* ============================================================================== */
 /* CSS style used for small screen                                                */
 /* ============================================================================== */
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8b31f8b544b..332c98f56da 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1573,7 +1573,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Color user
 			if (!empty($conf->agenda->enabled)) {
-				print '<tr><td>'.$langs->trans("ColorUser").'</td>';
+				print '<tr><td class="titlefield">'.$langs->trans("ColorUser").'</td>';
 				print '<td>';
 				print $formother->showColor($object->color, '');
 				print '</td>';
@@ -1582,7 +1582,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Categories
 			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
-				print '<tr><td>'.$langs->trans("Categories").'</td>';
+				print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td>';
 				print '<td colspan="3">';
 				print $form->showCategories($object->id, Categorie::TYPE_USER, 1);
 				print '</td></tr>';
@@ -1591,7 +1591,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// Default language
 			if (!empty($conf->global->MAIN_MULTILANGS)) {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
+				print '<tr><td class="titlefield">'.$langs->trans("DefaultLang").'</td><td>';
 				//$s=picto_from_langcode($object->default_lang);
 				//print ($s?$s.' ':'');
 				$langs->load("languages");
@@ -1606,14 +1606,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 				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";
-
 			// Multicompany
 			if (!empty($conf->multicompany->enabled) && is_object($mc)) {
 				// This is now done with hook formObjectOptions. Keep this code for backward compatibility with old multicompany module
@@ -1698,13 +1690,13 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			print "</table>\n";
 
-
+			// Credentials
 			print '<div class="div-table-responsive-no-min">';
-			print '<table class="border tableforfield centpercent">';
+			print '<table class="border tableforfield margintable centpercent">';
 			print '<tr class="liste_titre"><td class="liste_titre">';
-			print $langs->trans("Credentials");
+			print img_picto('', 'security', 'class="paddingleft pictofixedwidth"').$langs->trans("Credentials");
 			print '</td>';
-			print '<td></td>';
+			print '<td class="liste_titre"></td>';
 			print '</tr>';
 
 			// Date login validity
@@ -1779,13 +1771,25 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
 				print '<td>';
 				if (!empty($object->api_key)) {
-					print '<span class="opacitymedium">'.preg_replace('/./', '*', $object->api_key).'</span>';
+					print '<span class="opacitymedium">';
+					print showValueWithClipboardCPButton($object->api_key, 1, $langs->trans("Hidden"));
+					print '</span>';
 				}
 				if ($user->admin || $user->id == $object->id) {
 					// TODO Add a feature to reveal the hash
 				}
 				print '</td></tr>';
 			}
+
+			print '<tr><td class="titlefield">'.$langs->trans("LastConnexion").'</td>';
+			print '<td>';
+			if ($object->datepreviouslogin) {
+				print dol_print_date($object->datepreviouslogin, "dayhour").' <span class="opacitymedium">('.$langs->trans("Previous").')</span>, ';
+			}
+			print dol_print_date($object->datelastlogin, "dayhour").' <span class="opacitymedium">('.$langs->trans("Current").')</span>';
+			print '</td>';
+			print "</tr>\n";
+
 			print '</table></div>';
 
 			print '</div>';

From a5ad604fe23e59ff99d107a5d756ed6f275b9be1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 11:52:57 +0200
Subject: [PATCH 850/928] changelog

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

diff --git a/ChangeLog b/ChangeLog
index a618b8a14fe..bb44e0fa0be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ NEW: Add a security center page with all information and advices related to the
 NEW: Add a performance center page with all information and advices related to the performance of your instance 
 NEW: A lot of fix into english text after a small proofreading campaign (still not perfect, but really better)
 NEW: All main menu entries are using the picto of the module
+NEW: Add a copy to clipboard button on some fields 
 NEW: Add an example of scheduled job to send email reminder for unpayed invoices 
 NEW: Accountancy - Add FEC import
 NEW: Accountancy - Add a confirmation form with options on export
@@ -135,7 +136,6 @@ NEW: Add data-eec=1 for EEC countries on select for js interaction
 NEW: Add experimental repair script to switch to dynamic row format and utf8mb4 encoding
 NEW: add form confirm hook on company card
 NEW: Add function showValueWithClipboardCPButton() to add a copy/paste
-NEW: Add function showValueWithCopyAndPasteButton() to add a copy/paste
 NEW: Add hook addSectionECMAuto method to add custom diretory into ECM auto files
 NEW: Add native compression in rest apis
 NEW: Product Variants API, add variant stock to response by parameter

From 394d43543d3a8a163ce8702c2621a383bc9498d1 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 12 May 2021 12:04:50 +0200
Subject: [PATCH 851/928] fix: when only supplier module is ON top menu should
 be displayed

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

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index e35d9d4490c..14060d894b3 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -227,6 +227,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	$tmpentry = array(
 		'enabled'=>(!empty($conf->propal->enabled)
 			|| !empty($conf->commande->enabled)
+			|| !empty($conf->fournisseur->enabled)
 			|| !empty($conf->supplier_proposal->enabled)
 			|| !empty($conf->supplier_order->enabled)
 			|| !empty($conf->contrat->enabled)
@@ -234,10 +235,13 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		) ? 1 : 0,
 		'perms'=>(!empty($user->rights->propal->lire)
 			|| !empty($user->rights->commande->lire)
+			|| !empty($user->rights->fournisseur->lire)
 			|| !empty($user->rights->supplier_proposal->lire)
 			|| !empty($user->rights->supplier_order->lire)
 			|| !empty($user->rights->contrat->lire)
 			|| !empty($user->rights->ficheinter->lire)
+			|| !empty($user->rights->supplier_order->lire)
+			|| !empty($user->rights->fournisseur->commande->lire)
 		),
 		'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
 	);

From f34d6366d96e84463253a6076ffb34822163eb30 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 12 May 2021 13:19:23 +0200
Subject: [PATCH 852/928] Sql error in invoices cards 3 end

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 27bb5c5c8e5..acf1dc675ad 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7693,7 +7693,7 @@ class Form
 				'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'contrat'=>array('enabled'=>$conf->contrat->enabled, 'perms'=>1, 'label'=>'LinkToContract',
-				'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY t.rowid'),
+				'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY t.rowid,s.rowid,s.nom,s.client,t.ref,t.ref_supplier,t.ref_customer'),
 				'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('intervention').')'),
 				'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled, 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('supplier_proposal').')'),
 				'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled, 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('commande_fournisseur').')'),

From 9ed041f31a929ce2493f865e524b1aee22d424e9 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 12 May 2021 13:22:31 +0200
Subject: [PATCH 853/928] fixing style errors

---
 htdocs/core/class/html.form.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index acf1dc675ad..378a75f7f9c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7693,7 +7693,8 @@ class Form
 				'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'contrat'=>array('enabled'=>$conf->contrat->enabled, 'perms'=>1, 'label'=>'LinkToContract',
-				'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY t.rowid,s.rowid,s.nom,s.client,t.ref,t.ref_supplier,t.ref_customer'),
+				'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') 
+						GROUP BY t.rowid,s.rowid,s.nom,s.client,t.ref,t.ref_supplier,t.ref_customer'),
 				'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('intervention').')'),
 				'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled, 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('supplier_proposal').')'),
 				'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled, 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('commande_fournisseur').')'),

From 866c9d012fa08a66e39d004b9988e0cc96c40b7a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 14:19:12 +0200
Subject: [PATCH 854/928] Fix fetch for customer and vendor relative discount

---
 htdocs/societe/class/societe.class.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index defcc71a3e5..946ceeb42f3 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -480,6 +480,7 @@ class Societe extends CommonObject
 
 	public $remise_percent;
 	public $remise_supplier_percent;
+
 	public $mode_reglement_supplier_id;
 	public $cond_reglement_supplier_id;
 	public $transport_mode_supplier_id;
@@ -1636,14 +1637,14 @@ class Societe extends CommonObject
 		$sql .= ', s.fk_typent as typent_id';
 		$sql .= ', s.fk_effectif as effectif_id';
 		$sql .= ', s.fk_forme_juridique as forme_juridique_code';
-		$sql .= ', s.webservices_url, s.webservices_key';
+		$sql .= ', s.webservices_url, s.webservices_key, s.model_pdf';
 		if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
 			$sql .= ', s.accountancy_code_buy, s.accountancy_code_sell';
 		} else {
 			$sql .= ', spe.accountancy_code_buy, spe.accountancy_code_sell';
 		}
 		$sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
-		$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.transport_mode';
+		$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.mode_reglement, s.cond_reglement, s.transport_mode';
 		$sql .= ', s.fk_account, s.tva_assuj';
 		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.transport_mode_supplier';
 		$sql .= ', s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo, s.logo_squarred';
@@ -1659,7 +1660,11 @@ class Societe extends CommonObject
 		$sql .= ', st.libelle as stcomm, st.picto as stcomm_picto';
 		$sql .= ', te.code as typent_code';
 		$sql .= ', i.libelle as label_incoterms';
-		$sql .= ', sr.remise_client, model_pdf';
+		if (empty($conf->multicompany->enabled)) {
+			$sql .= ', s.remise_client, s.remise_supplier';
+		} else {
+			$sql .= ', sr.remise_client, sr2.remise_supplier';
+		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
 			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
@@ -1672,8 +1677,12 @@ class Societe extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_regions as r ON d.fk_region = r.code_region ';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise as sr ON sr.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise WHERE fk_soc = s.rowid AND entity IN ('.getEntity('discount').'))';
-
+		// With default setup, llx_societe_remise is a history table in default setup and current value is in llx_societe.
+		// We use it for real value when multicompany is on. A better place would be into llx_societe_perentity.
+		if (!empty($conf->multicompany->enabled)) {
+			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise as sr ON sr.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise WHERE fk_soc = s.rowid AND entity IN ('.getEntity('discount').'))';
+			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise_supplier as sr2 ON sr2.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise_supplier WHERE fk_soc = s.rowid AND entity IN ('.getEntity('discount').'))';
+		}
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
 		if ($rowid) {
 			$sql .= ' AND s.rowid = '.((int) $rowid);
@@ -1809,6 +1818,7 @@ class Societe extends CommonObject
 
 				$this->remise_percent = $obj->remise_client ? price2num($obj->remise_client) : 0; // 0.000000 must be 0
 				$this->remise_supplier_percent = $obj->remise_supplier;
+
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;
 				$this->transport_mode_id 	= $obj->transport_mode;

From 75bd4405915dadb8eb0aa8314b7590570dbcf2ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 18:29:02 +0200
Subject: [PATCH 855/928] Trans

---
 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 5960f900cca..ddb94c70279 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -249,7 +249,7 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
\ No newline at end of file

From 23fe7d1b6302c22b7bd1e1a471cfd445873c0104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 12 May 2021 18:29:56 +0200
Subject: [PATCH 856/928] add sample completeTabHead

---
 .../template/class/actions_mymodule.class.php | 51 +++++++++++++++++++
 htdocs/theme/eldy/global.inc.php              |  6 +--
 htdocs/theme/md/style.css.php                 |  6 +--
 3 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 8559411a3d4..24be0243b8d 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -303,5 +303,56 @@ class ActionsMyModule
 		return 0;
 	}
 
+	/**
+	 * Execute action completeTabsHead
+	 *
+	 * @param   array           $parameters     Array of parameters
+	 * @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         'add', 'update', 'view'
+	 * @param   Hookmanager     $hookmanager    hookmanager
+	 * @return  int                             <0 if KO,
+	 *                                          =0 if OK but we want to process standard actions too,
+	 *                                          >0 if OK and we want to replace standard actions.
+	 */
+	public function completeTabsHead(&$parameters, &$object, &$action, $hookmanager)
+	{
+		global $langs, $conf, $user;
+
+		if (!isset($parameters['object']->element)) {
+			return 0;
+		}
+		if ($parameters['mode'] == 'remove') {
+			// utilisé si on veut faire disparaitre des onglets.
+			return 0;
+		} elseif ($parameters['mode'] == 'add') {
+			$langs->load('mymodule@mymodule');
+			// utilisé si on veut ajouter des onglets.
+			$counter = count($parameters['head']);
+			$element = $parameters['object']->element;
+			$id = $parameters['object']->id;
+			// verifier le type d'onglet comme member_stats où ça ne doit pas apparaitre
+			// if (in_array($element, ['societe', 'member', 'contrat', 'fichinter', 'project', 'propal', 'commande', 'facture', 'order_supplier', 'invoice_supplier'])) {
+			if (in_array($element, ['context1', 'context2'])) {
+				$datacount = 0;
+
+				$parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1) . '?id=' . $id . '&amp;module='.$element;
+				$parameters['head'][$counter][1] = $langs->trans('MyModuleTab');
+				if ($datacount > 0) {
+					$parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">' . $datacount . '</span>';
+				}
+				$parameters['head'][$counter][2] = 'mymoduleemails';
+				$counter++;
+			}
+			if ($counter > 0 && (int) DOL_VERSION < 14) {
+				$this->results = $parameters['head'];
+				// return 1 to replace standard code
+				return 1;
+			} else {
+				// en V14 et + $parameters['head'] est modifiable par référence
+				return 0;
+			}
+		}
+	}
+
 	/* Add here any other hooked methods... */
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 912cf21a1de..3518518a5ef 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6767,9 +6767,9 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 /* ============================================================================== */
 
 span.clipboardCPValue.hidewithsize {
-    width: 0 !important;
-    display: inline-block;
-    color: transparent;
+	width: 0 !important;
+	display: inline-block;
+	color: transparent;
 }
 
 .clipboardCPShowOnHover .clipboardCPButton {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8152e56e945..4a6c3899d93 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6611,9 +6611,9 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 /* ============================================================================== */
 
 span.clipboardCPValue.hidewithsize {
-    width: 0 !important;
-    display: inline-block;
-    color: transparent;
+	width: 0 !important;
+	display: inline-block;
+	color: transparent;
 }
 
 .clipboardCPShowOnHover .clipboardCPButton {

From aa2d85276ec285cfa03a344b68166800d4d0ccc1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 18:38:22 +0200
Subject: [PATCH 857/928] Debug v14

---
 htdocs/core/class/html.formother.class.php | 4 ++--
 htdocs/install/fileconf.php                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index ba3ff77d394..46858191c7b 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -88,8 +88,8 @@ class FormOther
 		*/
 		$out .= '<br>';
 		$out .= '<center>';
-		$out .= '<input type="submit" class="button paddingleftonly paddingrightonly" name="addscan" value="'.$langs->trans("Add").'">';
-		$out .= '<input type="submit" class="button paddingleftonly paddingrightonly" name="cancel" value="'.$langs->trans("Cancel").'">';
+		$out .= '<input type="submit" class="button marginleftonly marginrightonly" name="addscan" value="'.$langs->trans("Add").'">';
+		$out .= '<input type="submit" class="button marginleftonly marginrightonly" name="cancel" value="'.$langs->trans("Cancel").'">';
 		$out .= '<br>';
 
 		$out .= '<span class="opacitymedium">'.$langs->trans("FeatureNotYetAvailable").'</span>';
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 3f2e714640a..42c8d3459fe 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -33,7 +33,7 @@ global $langs;
 
 $err = 0;
 
-$setuplang = GETPOST("selectlang", '', 3) ? GETPOST("selectlang", '', 3) : (GETPOST('lang', 'alpha', 1) ? GETPOST('lang', 'alpha', 1) : 'auto');
+$setuplang = GETPOST("selectlang", 'alpha', 3) ? GETPOST("selectlang", 'alpha', 3) : (GETPOST('lang', 'alpha', 1) ? GETPOST('lang', 'alpha', 1) : 'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->loadLangs(array("install", "errors"));

From f504cbcec4865106017066ea0c7038f84d5ca1c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 19:18:51 +0200
Subject: [PATCH 858/928] Fix log

---
 htdocs/core/class/utils.class.php | 2 +-
 htdocs/langs/en_US/errors.lang    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 9534970a856..d2987e8fc63 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -354,7 +354,7 @@ class Utils
 					$execmethod = 1;
 				}
 
-				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG);
+				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_INFO);
 
 				// TODO Replace with executeCLI function
 				if ($execmethod == 1) {
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index a1155b0f57c..f2d9106107b 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -117,7 +117,7 @@ ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
+ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.

From 9eda9c1e21e61363461dc23c967e855f86dacc3e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 19:55:16 +0200
Subject: [PATCH 859/928] Enhance setup

---
 htdocs/admin/system/security.php | 33 +++++++++++++++++++++++++++++++-
 htdocs/langs/en_US/admin.lang    |  4 +++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index d8dd21719fd..36f08309e02 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -40,6 +40,8 @@ if (GETPOST('action', 'aZ09') == 'donothing') {
 	exit;
 }
 
+$execmethod = empty($conf->global->MAIN_EXEC_USE_POPEN) ? 1 : $conf->global->MAIN_EXEC_USE_POPEN;
+
 
 /*
  * View
@@ -74,7 +76,13 @@ print "<strong>PHP allow_url_include</strong> = ".(ini_get('allow_url_include')
 print "<strong>PHP disable_functions</strong> = ";
 $arrayoffunctionsdisabled = explode(',', ini_get('disable_functions'));
 $arrayoffunctionstodisable = explode(',', 'pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals');
-$arrayoffunctionstodisable2 = explode(',', 'exec,passthru,shell_exec,system,proc_open,popen');
+if ($execmethod == 1) {
+	$arrayoffunctionstodisable2 = explode(',', 'passthru,shell_exec,system,proc_open,popen');
+	$functiontokeep = 'exec';
+} else {
+	$arrayoffunctionstodisable2 = explode(',', 'exec,passthru,shell_exec,system,proc_open');
+	$functiontokeep = 'popen';
+}
 $i = 0;
 foreach ($arrayoffunctionsdisabled as $functionkey) {
 	if ($i > 0) {
@@ -115,6 +123,13 @@ if ($todisabletext) {
 	print '<br>';
 }
 
+print $langs->trans("PHPFunctionsRequiredForCLI").': ';
+if (in_array($functiontokeep, $arrayoffunctionsdisabled)) {
+	print img_picto($langs->trans("PHPFunctionsRequiredForCLI"), 'warning');
+}
+print '<span class="opacitymedium">'.$functiontokeep.'</span>';
+print '<br>';
+
 print '<br>';
 
 // XDebug
@@ -245,6 +260,22 @@ print '<strong>MAIN_SECURITY_ANTI_SSRF_SERVER_IP</strong> = '.(empty($conf->glob
 print '<br>';
 
 
+print '<strong>MAIN_EXEC_USE_POPEN</strong> = ';
+if (empty($conf->global->MAIN_EXEC_USE_POPEN)) {
+	print '<span class="opacitymedium">'.$langs->trans("Undefined").'</span> &nbsp; ';
+} else {
+	print $conf->global->MAIN_EXEC_USE_POPEN.' &nbsp; ';
+}
+if ($execmethod == 1) {
+	print ' --> "exec" PHP method will be used for shell commands.';
+}
+if ($execmethod == 2) {
+	print ' --> "popen" PHP method will be used for shell commands.';
+}
+print "<br>";
+print '<br>';
+
+
 print '<strong>'.$langs->trans("AntivirusEnabledOnUpload").'</strong>: ';
 print empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? '' : img_picto('', 'tick').' ';
 print yn($conf->global->MAIN_ANTIVIRUS_COMMAND ? 1 : 0);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9f4bcfcfbd4..467fba89199 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2127,7 +2127,8 @@ ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by
 MailToSendEventOrganization=Event Organization
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
 NotRecommended=Not recommanded
@@ -2137,3 +2138,4 @@ CheckForModuleUpdateHelp=This action will connect to editors of external modules
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead. 
\ No newline at end of file

From 95a5e480a1945d51784530e282840fb2a42751e1 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 12 May 2021 21:55:31 +0200
Subject: [PATCH 860/928] Update llx_00_c_country.sql

---
 htdocs/install/mysql/data/llx_00_c_country.sql | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index fa2b4339983..296b6d0e412 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -117,13 +117,13 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (86
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (87,'GQ','GNQ','Guinée Equatoriale',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (88,'ER','ERI','Erythrée',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (89,'EE','EST','Estonia',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (90,'ET','ETH','Ethiopie',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (91,'FK','FLK','Iles Falkland',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (92,'FO','FRO','Iles Féroé',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (93,'FJ','FJI','Iles Fidji',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (94,'FI','FIN','Finlande',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (95,'GF','GUF','Guyane française',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (96,'PF','PYF','Polynésie française',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (90,'ET','ETH','Ethiopia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (91,'FK','FLK','Falkland Islands',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (92,'FO','FRO','Faroe Islands',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (93,'FJ','FJI','Fidji Islands',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (94,'FI','FIN','Finland',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (95,'GF','GUF','French Guiana',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (96,'PF','PYF','French Polynesia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (97,'TF','ATF','Terres australes françaises',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (98,'GM','GMB','Gambie',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (99,'GE','GEO','Georgia',1,0);

From 19a203bd401599fca0523803dd7a9e4e44698dd6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 22:09:06 +0200
Subject: [PATCH 861/928] Fix amount of memberships

---
 .../adherents/class/adherent_type.class.php   |  2 +-
 htdocs/adherents/stats/index.php              |  4 +--
 htdocs/adherents/type.php                     | 29 ++++++++++---------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 2ffc1e2c9fd..0104f8f36e8 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -366,7 +366,7 @@ class AdherentType extends CommonObject
 		$sql .= "libelle = '".$this->db->escape($this->label)."',";
 		$sql .= "morphy = '".$this->db->escape($this->morphy)."',";
 		$sql .= "subscription = '".$this->db->escape($this->subscription)."',";
-		$sql .= "amount = '".$this->db->escape($this->amount)."',";
+		$sql .= "amount = ".((empty($this->amount) && $this->amount == '') ? 'null' : ((float) $this->amount)).",";
 		$sql .= "duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."',";
 		$sql .= "note = '".$this->db->escape($this->note)."',";
 		$sql .= "vote = ".(integer) $this->db->escape($this->vote).",";
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 11c0025dcc5..e820d0a0d23 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -198,8 +198,8 @@ foreach ($data as $val) {
 	//print '</a>';
 	print '</td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
-	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
+	print '<td class="right"><span class="amount">'.price(price2num($val['total'], 'MT'), 1).'</span></td>';
+	print '<td class="right"><span class="amount">'.price(price2num($val['avg'], 'MT'), 1).'</span></td>';
 	print '</tr>';
 	$oldyear = $year;
 }
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 6c4f63725e1..033592a9afc 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -71,7 +71,7 @@ $label = GETPOST("label", "alpha");
 $morphy = GETPOST("morphy", "alpha");
 $status = GETPOST("status", "int");
 $subscription = GETPOST("subscription", "int");
-$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
+$amount = GETPOST('amount', 'alpha');
 $duration_value = GETPOST('duration_value', 'int');
 $duration_unit = GETPOST('duration_unit', 'alpha');
 $vote = GETPOST("vote", "int");
@@ -119,7 +119,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 	$object->morphy = trim($morphy);
 	$object->status = (int) $status;
 	$object->subscription = (int) $subscription;
-	$object->amount = $amount;
+	$object->amount = ($amount == '' ? '' : price2num($amount, 'MT'));
 	$object->duration_value = $duration_value;
 	$object->duration_unit = $duration_unit;
 	$object->note = trim($comment);
@@ -166,12 +166,11 @@ if ($action == 'update' && $user->rights->adherent->configurer) {
 	$object->fetch($rowid);
 
 	$object->oldcopy = clone $object;
-
 	$object->label= trim($label);
 	$object->morphy	= trim($morphy);
 	$object->status	= (int) $status;
 	$object->subscription = (int) $subscription;
-	$object->amount = $amount;
+	$object->amount = ($amount == '' ? '' : price2num($amount, 'MT'));;
 	$object->duration_value = $duration_value;
 	$object->duration_unit = $duration_unit;
 	$object->note = trim($comment);
@@ -306,7 +305,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			}
 			print '</td>';
 			print '<td class="center">'.yn($objp->subscription).'</td>';
-			print '<td class="center">'.price($objp->amount).'</td>';
+			print '<td class="center"><span class="amount">'.(is_null($objp->amount) || $objp->amount === '' ? '' : price($objp->amount)).'</span></td>';
 			print '<td class="center">'.yn($objp->vote).'</td>';
 			print '<td class="center">'.$membertype->getLibStatut(5).'</td>';
 			if ($user->rights->adherent->configurer) {
@@ -446,7 +445,7 @@ if ($rowid > 0) {
 		print '</tr>';
 
 		print '<tr><td class="titlefield">'.$langs->trans("Amount").'</td><td>';
-		print price($object->amount);
+		print ((is_null($object->amount) || $object->amount === '') ? '' : price($object->amount));
 		print '</tr>';
 
 		print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
@@ -594,24 +593,24 @@ if ($rowid > 0) {
 				$titre .= " (".$membertype->label.")";
 			}
 
-			$param = "&rowid=".$object->id;
+			$param = "&rowid=".urlencode($object->id);
 			if (!empty($status)) {
-				$param .= "&status=".$status;
+				$param .= "&status=".urlencode($status);
 			}
 			if (!empty($search_lastname)) {
-				$param .= "&search_lastname=".$search_lastname;
+				$param .= "&search_lastname=".urlencode($search_lastname);
 			}
 			if (!empty($search_firstname)) {
-				$param .= "&search_firstname=".$search_firstname;
+				$param .= "&search_firstname=".urlencode($search_firstname);
 			}
 			if (!empty($search_login)) {
-				$param .= "&search_login=".$search_login;
+				$param .= "&search_login=".urlencode($search_login);
 			}
 			if (!empty($search_email)) {
-				$param .= "&search_email=".$search_email;
+				$param .= "&search_email=".urlencode($search_email);
 			}
 			if (!empty($filter)) {
-				$param .= "&filter=".$filter;
+				$param .= "&filter=".urlencode($filter);
 			}
 
 			if ($sall) {
@@ -797,7 +796,9 @@ if ($rowid > 0) {
 		print '</td></tr>';
 
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
-		print '<input name="amount" size="5" value="'.price($object->amount).'">';
+		print '<input name="amount" size="5" value="';
+		print ((is_null($object->amount) || $object->amount === '') ? '' : price($object->amount));
+		print '">';
 		print '</td></tr>';
 
 		print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';

From 12c2838d91465ba753ec1538b790e5be17531165 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 12 May 2021 22:18:40 +0200
Subject: [PATCH 862/928] Update countries_iso-3166_en.txt

---
 dev/resources/iso-normes/countries_iso-3166_en.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev/resources/iso-normes/countries_iso-3166_en.txt b/dev/resources/iso-normes/countries_iso-3166_en.txt
index b953435d1c9..d6624026963 100644
--- a/dev/resources/iso-normes/countries_iso-3166_en.txt
+++ b/dev/resources/iso-normes/countries_iso-3166_en.txt
@@ -3,11 +3,12 @@
 # The list is updated whenever a change to the official code list in ISO 3166-1 is effected by the ISO 3166/MA.
 # It lists 240 official short names and code elements. One line of text contains one entry.
 # A country name and its code element are separated by a semicolon (;).
-# http://www.iso.org/iso/fr/iso3166_en_code_lists.txt
+# https://www.iso.org/iso-3166-country-codes.html 
 
-# ISO-3166:         http://en.wikipedia.org/wiki/ISO_3166-1
-# ISO-3166 alpha 2: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-# ISO-3166 alpha 3: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-3
+# https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
+# ISO-3166:         https://en.wikipedia.org/wiki/ISO_3166-1
+# ISO-3166 alpha 2: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+# ISO-3166 alpha 3: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3
 
 AFGHANISTAN;AF
 ÅLAND ISLANDS;AX
@@ -254,4 +255,4 @@ WALLIS AND FUTUNA;WF
 WESTERN SAHARA;EH
 YEMEN;YE
 ZAMBIA;ZM
-ZIMBABWE;ZW
\ No newline at end of file
+ZIMBABWE;ZW

From ba6e675273cc72259dbfa2a76e7a9dc83ffd1727 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 22:21:20 +0200
Subject: [PATCH 863/928] css

---
 htdocs/compta/bank/various_payment/list.php | 13 ++++++-------
 htdocs/salaries/stats/index.php             |  8 ++++----
 htdocs/theme/md/style.css.php               |  5 ++++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 5e6d199db0a..f78e004f571 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -338,14 +338,13 @@ if ($result) {
 	if ($search_accountancy_subledger > 0) {
 		$param .= '&search_accountancy_subledger='.urlencode($search_accountancy_subledger);
 	}
-
 	if ($optioncss != '') {
-		$param .= '&amp;optioncss='.urlencode($optioncss);
+		$param .= '&optioncss='.urlencode($optioncss);
 	}
 
 	$url = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create';
 	if (!empty($socid)) {
-		$url .= '&socid='.$socid;
+		$url .= '&socid='.urlencode($socid);
 	}
 	$newcardbutton = dolGetButtonTitle($langs->trans('MenuNewVariousPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->modifier);
 
@@ -423,7 +422,7 @@ if ($result) {
 
 	// Payment type
 	if ($arrayfields['type']['checked']) {
-		print '<td class="liste_titre left">';
+		print '<td class="liste_titre center">';
 		$form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16, 1, 'maxwidth100');
 		print '</td>';
 	}
@@ -498,7 +497,7 @@ if ($result) {
 		print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], 'v.rowid', '', $param, '', $sortfield, $sortorder);
 	}
 	if ($arrayfields['label']['checked']) {
-		print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], 'v.label', '', $param, '', $sortfield, $sortorder, 'left ');
+		print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], 'v.label', '', $param, '', $sortfield, $sortorder);
 	}
 	if ($arrayfields['datep']['checked']) {
 		print_liste_field_titre($arrayfields['datep']['label'], $_SERVER["PHP_SELF"], 'v.datep,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
@@ -507,7 +506,7 @@ if ($result) {
 		print_liste_field_titre($arrayfields['datev']['label'], $_SERVER["PHP_SELF"], 'v.datev,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
 	}
 	if ($arrayfields['type']['checked']) {
-		print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], 'type', '', $param, '', $sortfield, $sortorder, 'left ');
+		print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], 'type', '', $param, '', $sortfield, $sortorder, 'center ');
 	}
 	if ($arrayfields['project']['checked']) {
 		print_liste_field_titre($arrayfields['project']['label'], $_SERVER["PHP_SELF"], 'fk_project', '', $param, '', $sortfield, $sortorder);
@@ -590,7 +589,7 @@ if ($result) {
 
 		// Type
 		if ($arrayfields['type']['checked']) {
-			print '<td>';
+			print '<td class="center">';
 			if ($obj->payment_code) {
 				print $langs->trans("PaymentTypeShort".$obj->payment_code);
 				print ' ';
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index 1fe914d38c2..1a7f2de6d39 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -238,16 +238,16 @@ foreach ($data as $val) {
 		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'">'.$oldyear.'</a></td>';
 		print '<td class="right">0</td>';
-		print '<td class="right">0</td>';
-		print '<td class="right">0</td>';
+		print '<td class="right"><span class="amount">0</span></td>';
+		print '<td class="right"><span class="amount">0</span></td>';
 		print '</tr>';
 	}
 
 	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
-	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
+	print '<td class="right"><span class="amount">'.price(price2num($val['total'], 'MT'), 1).'</span></td>';
+	print '<td class="right"><span class="amount">'.price(price2num($val['avg'], 'MT'), 1).'</span></td>';
 	print '</tr>';
 	$oldyear = $year;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8152e56e945..06e05a542ee 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -369,7 +369,7 @@ select.vmenusearchselectcombo {
 	background-color: unset;
 }
 
-textarea:focus, button:focus {
+textarea:focus {
 	/* v6 box-shadow: 0 0 4px #8091BF; */
 	border: 1px solid #aaa !important;
 }
@@ -738,6 +738,9 @@ div.floatright
 .largenumber {
 	font-size: 1.4em;
 }
+button:focus {
+	outline: none;
+}
 
 th .button {
 	-webkit-box-shadow: none !important;

From 0dd999c1f06080c148e532fd7f68a8b050d1b1be Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 12 May 2021 22:25:08 +0200
Subject: [PATCH 864/928] Update vat_number_names.txt

---
 dev/resources/iso-normes/vat_number_names.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev/resources/iso-normes/vat_number_names.txt b/dev/resources/iso-normes/vat_number_names.txt
index 23fce59ed3b..b1e8d469ec8 100644
--- a/dev/resources/iso-normes/vat_number_names.txt
+++ b/dev/resources/iso-normes/vat_number_names.txt
@@ -1 +1,7 @@
-http://en.wikipedia.org/wiki/VAT_identification_number
\ No newline at end of file
+https://en.wikipedia.org/wiki/VAT_identification_number
+
+terms
+(en) VAT = Value Added Tax
+(fr) TVA = Taxe sur la Valeur Ajouté
+(es) NIF / CIF
+(de) USt / MwSt

From 396f3d0fabdd9d84f54c5f88488b9c405b0ed185 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 12 May 2021 22:29:02 +0200
Subject: [PATCH 865/928] Update world_tax_rates.txt

delete http://www.taxrates.cc/index.html  because now leads to a risky website without appropriate information
---
 dev/resources/iso-normes/world_tax_rates.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/resources/iso-normes/world_tax_rates.txt b/dev/resources/iso-normes/world_tax_rates.txt
index 740062288dc..c007474e5fd 100644
--- a/dev/resources/iso-normes/world_tax_rates.txt
+++ b/dev/resources/iso-normes/world_tax_rates.txt
@@ -1,4 +1,5 @@
 http://www.taxrates.cc/index.html
+https://en.wikipedia.org/wiki/List_of_countries_by_tax_rates
 
 For India: VAT=IGST/CGST=Localtax1/SGST=Localtax2:  https://cleartax.in/s/what-is-sgst-cgst-igst
 

From a11ed88f6f8ea6983d5e10ca31f6f3f8a14a0f21 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 12 May 2021 22:34:58 +0200
Subject: [PATCH 866/928] Update code_nace.txt

---
 dev/resources/iso-normes/code_nace.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev/resources/iso-normes/code_nace.txt b/dev/resources/iso-normes/code_nace.txt
index 0c490bd4bf1..a07e3a76b31 100644
--- a/dev/resources/iso-normes/code_nace.txt
+++ b/dev/resources/iso-normes/code_nace.txt
@@ -1 +1,5 @@
-http://ec.europa.eu/eurostat/ramon/nomenclatures/index.cfm?TargetUrl=LST_CLS_DLD&StrNom=NACE_REV2&StrLanguageCode=FR&StrLayoutCode=#
\ No newline at end of file
+NACE 
+
+https://ec.europa.eu/eurostat/ramon/nomenclatures/index.cfm?TargetUrl=LST_CLS_DLD&StrNom=NACE_REV2&StrLanguageCode=EN&StrLayoutCode=
+
+https://en.wikipedia.org/wiki/Statistical_Classification_of_Economic_Activities_in_the_European_Community

From 5e0f2f9781dab1facea07442917a73bf8b4745f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 22:35:21 +0200
Subject: [PATCH 867/928] Debug v14. Fix regression.

---
 .../install/mysql/migration/13.0.0-14.0.0.sql |  4 ++
 .../install/mysql/tables/llx_product_lot.sql  |  3 ++
 .../product/stock/class/productlot.class.php  | 38 +++++++++----------
 htdocs/theme/md/style.css.php                 |  2 +-
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 37719c015c5..da2cd34fa00 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -64,6 +64,10 @@ ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
 
 -- For v14
 
+ALTER TABLE llx_product_lot ADD COLUMN eol_date datetime NULL;
+ALTER TABLE llx_product_lot ADD COLUMN manufacturing_date datetime NULL;
+ALTER TABLE llx_product_lot ADD COLUMN scrapping_date datetime NULL;
+
 create table llx_accounting_groups_account
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/tables/llx_product_lot.sql b/htdocs/install/mysql/tables/llx_product_lot.sql
index 86cca7d0f04..f8d02f19ccb 100644
--- a/htdocs/install/mysql/tables/llx_product_lot.sql
+++ b/htdocs/install/mysql/tables/llx_product_lot.sql
@@ -24,6 +24,9 @@ CREATE TABLE llx_product_lot (
   batch           varchar(128) DEFAULT NULL,	-- Lot or serial number
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
+  eol_date      datetime NULL,
+  manufacturing_date datetime NULL,
+  scrapping_date datetime NULL,
   datec         datetime,
   tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index f05a4ae3d39..2a3b3cf2e20 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -91,11 +91,11 @@ class Productlot extends CommonObject
 		'batch'         => array('type'=>'varchar(30)', 'label'=>'Batch', 'enabled'=>1, 'visible'=>1, 'notnull'=>0, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'comment'=>'Batch', 'searchall'=>1),
 		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
 		'sellby'        => array('type'=>'date', 'label'=>'SellByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_SELLBY)?1:0', 'visible'=>5, 'position'=>60),
-		'eol_date'        => array('type'=>'date', 'label'=>'EndOfLife', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>70),
-		'manufacturing_date'        => array('type'=>'date', 'label'=>'ManufacturingDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>80),
-		'scrapping_date'        => array('type'=>'date', 'label'=>'DestructionDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>90),
-		'commissionning_date'        => array('type'=>'date', 'label'=>'FirstUseDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>100),
-		'qc_frequency'        => array('type'=>'varchar(6)', 'label'=>'QCFrequency', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)?1:0', 'visible'=>5, 'position'=>110),
+		'eol_date'        => array('type'=>'date', 'label'=>'EndOfLife', 'enabled'=>'empty($conf->global->PRODUCT_ENABLE_TRACEABILITY)?0:1', 'visible'=>5, 'position'=>70),
+		'manufacturing_date' => array('type'=>'date', 'label'=>'ManufacturingDate', 'enabled'=>'empty($conf->global->PRODUCT_ENABLE_TRACEABILITY)?0:1', 'visible'=>5, 'position'=>80),
+		'scrapping_date'     => array('type'=>'date', 'label'=>'DestructionDate', 'enabled'=>'empty($conf->global->PRODUCT_ENABLE_TRACEABILITY)?0:1', 'visible'=>5, 'position'=>90),
+		//'commissionning_date'        => array('type'=>'date', 'label'=>'FirstUseDate', 'enabled'=>'empty($conf->global->PRODUCT_ENABLE_TRACEABILITY)?0:1', 'visible'=>5, 'position'=>100),
+		//'qc_frequency'        => array('type'=>'varchar(6)', 'label'=>'QCFrequency', 'enabled'=>'empty($conf->global->PRODUCT_ENABLE_QUALITYCONTROL)?1:0', 'visible'=>5, 'position'=>110),
 		'eatby'         => array('type'=>'date', 'label'=>'EatByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_EATBY)?1:0', 'visible'=>5, 'position'=>62),
 		'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
 		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
@@ -120,8 +120,8 @@ class Productlot extends CommonObject
 	public $eol_date = '';
 	public $manufacturing_date = '';
 	public $scrapping_date = '';
-	public $commissionning_date = '';
-	public $qc_frequency = '';
+	//public $commissionning_date = '';
+	//public $qc_frequency = '';
 	public $datec = '';
 	public $tms = '';
 
@@ -184,8 +184,6 @@ class Productlot extends CommonObject
 			 $this->import_key = trim($this->import_key);
 		}
 
-
-
 		// Check parameters
 		// Put here code to add control on parameters values
 
@@ -199,8 +197,8 @@ class Productlot extends CommonObject
 		$sql .= 'eol_date,';
 		$sql .= 'manufacturing_date,';
 		$sql .= 'scrapping_date,';
-		$sql .= 'commissionning_date,';
-		$sql .= 'qc_frequency,';
+		//$sql .= 'commissionning_date,';
+		//$sql .= 'qc_frequency,';
 		$sql .= 'datec,';
 		$sql .= 'fk_user_creat,';
 		$sql .= 'fk_user_modif,';
@@ -214,9 +212,8 @@ class Productlot extends CommonObject
 		$sql .= ' '.(!isset($this->eol_date) || dol_strlen($this->eol_date) == 0 ? 'NULL' : "'".$this->db->idate($this->eol_date)."'").',';
 		$sql .= ' '.(!isset($this->manufacturing_date) || dol_strlen($this->manufacturing_date) == 0 ? 'NULL' : "'".$this->db->idate($this->manufacturing_date)."'").',';
 		$sql .= ' '.(!isset($this->scrapping_date) || dol_strlen($this->scrapping_date) == 0 ? 'NULL' : "'".$this->db->idate($this->scrapping_date)."'").',';
-		$sql .= ' '.(!isset($this->commissionning_date) || dol_strlen($this->commissionning_date) == 0 ? 'NULL' : "'".$this->db->idate($this->commissionning_date)."'").',';
-		$sql .= ' '.(!isset($this->qc_frequency) ? 'NULL' : $this->qc_frequency).',';
-
+		//$sql .= ' '.(!isset($this->commissionning_date) || dol_strlen($this->commissionning_date) == 0 ? 'NULL' : "'".$this->db->idate($this->commissionning_date)."'").',';
+		//$sql .= ' '.(!isset($this->qc_frequency) ? 'NULL' : $this->qc_frequency).',';
 		$sql .= ' '."'".$this->db->idate(dol_now())."'".',';
 		$sql .= ' '.(!isset($this->fk_user_creat) ? 'NULL' : $this->fk_user_creat).',';
 		$sql .= ' '.(!isset($this->fk_user_modif) ? 'NULL' : $this->fk_user_modif).',';
@@ -292,8 +289,8 @@ class Productlot extends CommonObject
 		$sql .= " t.eol_date,";
 		$sql .= " t.manufacturing_date,";
 		$sql .= " t.scrapping_date,";
-		$sql .= " t.commissionning_date,";
-		$sql .= " t.qc_frequency,";
+		//$sql .= " t.commissionning_date,";
+		//$sql .= " t.qc_frequency,";
 		$sql .= " t.datec,";
 		$sql .= " t.tms,";
 		$sql .= " t.fk_user_creat,";
@@ -322,11 +319,10 @@ class Productlot extends CommonObject
 				$this->eatby = $this->db->jdate($obj->eatby);
 				$this->sellby = $this->db->jdate($obj->sellby);
 				$this->eol_date = $this->db->jdate($obj->eol_date);
-
 				$this->manufacturing_date = $this->db->jdate($obj->manufacturing_date);
 				$this->scrapping_date = $this->db->jdate($obj->scrapping_date);
-				$this->commissionning_date = $this->db->jdate($obj->commissionning_date);
-				$this->qc_frequency = $obj->qc_frequency;
+				//$this->commissionning_date = $this->db->jdate($obj->commissionning_date);
+				//$this->qc_frequency = $obj->qc_frequency;
 
 				$this->datec = $this->db->jdate($obj->datec);
 				$this->tms = $this->db->jdate($obj->tms);
@@ -407,8 +403,8 @@ class Productlot extends CommonObject
 		$sql .= ' eol_date = '.(!isset($this->eol_date) || dol_strlen($this->eol_date) != 0 ? "'".$this->db->idate($this->eol_date)."'" : 'null').',';
 		$sql .= ' manufacturing_date = '.(!isset($this->manufacturing_date) || dol_strlen($this->manufacturing_date) != 0 ? "'".$this->db->idate($this->manufacturing_date)."'" : 'null').',';
 		$sql .= ' scrapping_date = '.(!isset($this->destruction_date) || dol_strlen($this->destruction_date) != 0 ? "'".$this->db->idate($this->destruction_date)."'" : 'null').',';
-		$sql .= ' commissionning_date = '.(!isset($this->first_use_date) || dol_strlen($this->first_use_date) != 0 ? "'".$this->db->idate($this->first_use_date)."'" : 'null').',';
-		$sql .= ' qc_frequency = '.(!isset($this->qc_frequency) || dol_strlen($this->qc_frequency) != 0 ? "'".$this->db->escape($this->qc_frequency)."'" : 'null').',';
+		//$sql .= ' commissionning_date = '.(!isset($this->first_use_date) || dol_strlen($this->first_use_date) != 0 ? "'".$this->db->idate($this->first_use_date)."'" : 'null').',';
+		//$sql .= ' qc_frequency = '.(!isset($this->qc_frequency) || dol_strlen($this->qc_frequency) != 0 ? "'".$this->db->escape($this->qc_frequency)."'" : 'null').',';
 		$sql .= ' datec = '.(!isset($this->datec) || dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').',';
 		$sql .= ' tms = '.(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'").',';
 		$sql .= ' fk_user_creat = '.(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").',';
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 06e05a542ee..5735837d665 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3836,7 +3836,7 @@ tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre
 	font-family: <?php print $fontlist ?>;
 	font-weight: normal;
 	border-bottom: 1px solid #FDFFFF;
-	text-decoration: underline;
+	/* text-decoration: underline; */
 }
 input.liste_titre {
 	background: transparent;

From 850ed5eb252d04a3b9273823c360b5ffb969331a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 12 May 2021 22:41:33 +0200
Subject: [PATCH 868/928] Update countries_iso-3166_fr.txt

---
 dev/resources/iso-normes/countries_iso-3166_fr.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev/resources/iso-normes/countries_iso-3166_fr.txt b/dev/resources/iso-normes/countries_iso-3166_fr.txt
index 578c0f0effe..532b73ef47e 100644
--- a/dev/resources/iso-normes/countries_iso-3166_fr.txt
+++ b/dev/resources/iso-normes/countries_iso-3166_fr.txt
@@ -3,11 +3,12 @@
 # The list is updated whenever a change to the official code list in ISO 3166-1 is effected by the ISO 3166/MA.
 # It lists 240 official short names and code elements. One line of text contains one entry.
 # A country name and its code element are separated by a semicolon (;).
-# http://www.iso.org/iso/fr/iso3166_fr_code_lists.txt
+# https://www.iso.org/fr/iso-3166-country-codes.html
 
-# ISO-3166:         http://en.wikipedia.org/wiki/ISO_3166-1
-# ISO-3166 alpha 2: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-# ISO-3166 alpha 3: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-3
+# https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
+# ISO-3166:         https://fr.wikipedia.org/wiki/ISO_3166-1
+# ISO-3166 alpha 2: https://fr.wikipedia.org/wiki/ISO_3166-1_alpha-2
+# ISO-3166 alpha 3: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3
 
 AFGHANISTAN;AF
 AFRIQUE DU SUD;ZA
@@ -254,4 +255,4 @@ VIET NAM;VN
 WALLIS ET FUTUNA;WF
 YÉMEN;YE
 ZAMBIE;ZM
-ZIMBABWE;ZW
\ No newline at end of file
+ZIMBABWE;ZW

From 488f242e25bd7b87c05724b85704b96f710189c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 22:42:10 +0200
Subject: [PATCH 869/928] css

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 073643fe235..eb3fc71d53a 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -586,7 +586,8 @@ if ($resql) {
 		$paramsCat .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
 	}
 
-	llxHeader('', $title, $helpurl, '', 0, 0, array(), array(), $paramsCat, 'classforhorizontalscrolloftabs');
+	//llxHeader('', $title, $helpurl, '', 0, 0, array(), array(), $paramsCat, 'classforhorizontalscrolloftabs');
+	llxHeader('', $title, $helpurl, '', 0, 0, array(), array(), $paramsCat, '');
 
 	// Displays product removal confirmation
 	if (GETPOST('delprod')) {

From 097f493315a798ef5ca210955bfe1ce0122bd542 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 22:43:47 +0200
Subject: [PATCH 870/928] css

---
 htdocs/theme/md/style.css.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5735837d665..5d6bcf13a59 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -793,10 +793,19 @@ textarea.centpercent {
 	color: #777;
 }
 
+.flip {
+	transform: scaleX(-1) translate(2px, 0);
+}
+.rotate90 {
+	transform: rotate(90deg) translate(0, 2px);
+}
 .center {
 	text-align: center;
 	margin: 0px auto;
 }
+.alignstart {
+	text-align: start;
+}
 .left {
 	text-align: <?php print $left; ?>;
 }

From 65c8eda5c18985ded5f270071ee6bd720464d347 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 12 May 2021 22:47:57 +0200
Subject: [PATCH 871/928] Update address_format.txt

---
 dev/resources/iso-normes/address_format.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/resources/iso-normes/address_format.txt b/dev/resources/iso-normes/address_format.txt
index cc3b23285c8..d87e90e79b5 100644
--- a/dev/resources/iso-normes/address_format.txt
+++ b/dev/resources/iso-normes/address_format.txt
@@ -1 +1,4 @@
-http://bitboost.com/ref/international-address-formats.html#Formats
\ No newline at end of file
+https://bitboost.com/ref/international-address-formats.html#Formats
+
+https://www.upu.int/en/Postal-Solutions/Programmes-Services/Addressing-Solutions
+

From e47118108906ab9b6049a2dfda2d9167ae56ba9f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 22:52:50 +0200
Subject: [PATCH 872/928] css

---
 htdocs/theme/md/style.css.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5d6bcf13a59..25df9b941ef 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4290,10 +4290,10 @@ div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a
 .photowithborder {
 	border: 1px solid #f0f0f0;
 }
-.photointoolitp {
+.photointooltip {
 	margin-top: 8px;
 	margin-bottom: 6px;
-	text-align: center;
+	text-align: center !important;
 }
 .photodelete {
 	margin-top: 6px !important;

From cd28664b2a4d7924ef0b4beb698db322a3251a57 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 12 May 2021 22:56:50 +0200
Subject: [PATCH 873/928] Update locales.txt

---
 dev/resources/iso-normes/locales.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/resources/iso-normes/locales.txt b/dev/resources/iso-normes/locales.txt
index cb39e45ec0d..67ea5280342 100644
--- a/dev/resources/iso-normes/locales.txt
+++ b/dev/resources/iso-normes/locales.txt
@@ -1,9 +1,9 @@
 
 For languages:
-http://demo.icu-project.org/icu-bin/locexp?d_=fr
+https://icu4c-demos.unicode.org/icu-bin/icudemos - Locale Explorer -> Error 404
 
 For format number:
-http://en.wikipedia.org/wiki/Decimal_mark
+https://en.wikipedia.org/wiki/Decimal_mark
 
 For date format:
-http://en.wikipedia.org/wiki/Date_format_by_country
\ No newline at end of file
+https://en.wikipedia.org/wiki/Date_format_by_country

From 8bbd915009e67a21770d9a5234f0e57a794cf436 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 12 May 2021 23:03:43 +0200
Subject: [PATCH 874/928] Update text.txt

---
 dev/resources/sepa/text.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/resources/sepa/text.txt b/dev/resources/sepa/text.txt
index dbcfeded5a4..dfa55834e58 100644
--- a/dev/resources/sepa/text.txt
+++ b/dev/resources/sepa/text.txt
@@ -1,3 +1,7 @@
+https://en.wikipedia.org/wiki/Single_Euro_Payments_Area
+https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html
+https://www.europeanpaymentscouncil.eu/about-sepa
+
 Spec for credit transfer: 
 https://docs.oracle.com/cd/E39124_01/doc.91/e60210/fields_sepa_pay_file_appx.htm#EOAEL00515
 

From 5917a9f73eca3681d0ea48258afc229ee899bc53 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 May 2021 23:08:52 +0200
Subject: [PATCH 875/928] Fix phpcs

---
 dev/setup/codesniffer/README  | 5 +++++
 htdocs/theme/md/style.css.php | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev/setup/codesniffer/README b/dev/setup/codesniffer/README
index 087fb318f6f..2fdc66b9d1f 100644
--- a/dev/setup/codesniffer/README
+++ b/dev/setup/codesniffer/README
@@ -10,6 +10,11 @@ To run phpcs:
 > cd dolibarrgitrepo
 > phpcs --standard=dev/setup/codesniffer/ruleset.xml --extensions=php --parallel=8 .
 
+To fix with phpcbf:
+> cd dolibarrgitrepo
+> phpcbf --standard=dev/setup/codesniffer/ruleset.xml --extensions=php --parallel=8 .
+
+
 Note with Eclipse: You must setup the PTI plugin of Eclipse into PHPCodeSniffer menu with:
 * tab value to 4
 * path of code sniffer standard to dev/codesniffer 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 25df9b941ef..70a2ce1303e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6623,9 +6623,9 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 /* ============================================================================== */
 
 span.clipboardCPValue.hidewithsize {
-    width: 0 !important;
-    display: inline-block;
-    color: transparent;
+	width: 0 !important;
+	display: inline-block;
+	color: transparent;
 }
 
 .clipboardCPShowOnHover .clipboardCPButton {

From 8d035f5ec28cb31fbc7dfb5b87e301df9374d532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bagnol?= <fbagnol@tec6.fr>
Date: Thu, 13 May 2021 00:40:56 +0200
Subject: [PATCH 876/928] Add soc in categories contacts list

---
 htdocs/categories/viewcat.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 817c750a571..d1f15d4997c 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -754,6 +754,7 @@ if ($type == Categorie::TYPE_CONTACT) {
 		$num = count($contacts);
 		$nbtotalofrecords = '';
 		$newcardbutton = '';
+		$objsoc = new Societe($db);
 		print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contact', 0, $newcardbutton, '', $limit);
 
 		print '<table class="noborder centpercent">'."\n";
@@ -767,9 +768,15 @@ if ($type == Categorie::TYPE_CONTACT) {
 					break;
 				}
 
+				$objsoc->fetch($contact->socid);
+				
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $contact->getNomUrl(1, 'category');
+				if ($objsoc->id > 0) {
+					print ' - ';
+					print $objsoc->getNomUrl(1, 'contact');
+				}
 				print "</td>\n";
 				// Link to delete from category
 				print '<td class="right">';

From 79b51baa3de47e9f4dd633dd6a05811d21fd8b5e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 12 May 2021 22:46:09 +0000
Subject: [PATCH 877/928] Fixing style errors.

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

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index d1f15d4997c..b62bc3bcb0f 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -769,7 +769,7 @@ if ($type == Categorie::TYPE_CONTACT) {
 				}
 
 				$objsoc->fetch($contact->socid);
-				
+
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $contact->getNomUrl(1, 'category');

From d37e66629e61be3487a036633cb80e499d8bbaa9 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Thu, 13 May 2021 02:23:35 +0000
Subject: [PATCH 878/928] fix: dev/examples/zapier/package.json to reduce
 vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-LODASH-1018905
- https://snyk.io/vuln/SNYK-JS-LODASH-1040724
---
 dev/examples/zapier/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/examples/zapier/package.json b/dev/examples/zapier/package.json
index 4266a6f00b1..cc0768a27ef 100644
--- a/dev/examples/zapier/package.json
+++ b/dev/examples/zapier/package.json
@@ -15,7 +15,7 @@
     "npm": ">=5.6.0"
   },
   "dependencies": {
-    "zapier-platform-core": "10.1.2"
+    "zapier-platform-core": "11.0.0"
   },
   "devDependencies": {
     "mocha": "^5.2.0",

From b9336570ff65d161c434302110576520310e9956 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Thu, 13 May 2021 10:26:09 +0200
Subject: [PATCH 879/928] NEW report contact/adresses on credit note from
 invoice

keep same contact/adresses from source invoice (ir: usefull for correct notifications)
---
 htdocs/compta/facture/card.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 48b7c505264..6dd4d050b8b 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1093,6 +1093,19 @@ if (empty($reshook)) {
 					}
 				}
 				$id = $object->create($user);
+        if ($id < 0) {
+			$error++;
+		} else {
+			// copy internal contacts
+			if ($object->copy_linked_contact($facture_source, 'internal') < 0) {
+				$error++;
+			} elseif ($facture_source->socid == $object->socid) {
+				// copy external contacts if same company
+				if ($object->copy_linked_contact($facture_source, 'external') < 0) {
+					$error++;
+				}
+			}
+		}
 
 				// NOTE: Pb with situation invoice
 				// NOTE: fields total on situation invoice are stored as cumulative values on total of lines (bad) but delta on invoice total

From 05ea8761a1156f342afb7743fe48e260cffc384f Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 13 May 2021 08:28:14 +0000
Subject: [PATCH 880/928] Fixing style errors.

---
 htdocs/compta/facture/card.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6dd4d050b8b..e5b4b2d2398 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1093,19 +1093,19 @@ if (empty($reshook)) {
 					}
 				}
 				$id = $object->create($user);
-        if ($id < 0) {
-			$error++;
-		} else {
-			// copy internal contacts
-			if ($object->copy_linked_contact($facture_source, 'internal') < 0) {
-				$error++;
-			} elseif ($facture_source->socid == $object->socid) {
-				// copy external contacts if same company
-				if ($object->copy_linked_contact($facture_source, 'external') < 0) {
+				if ($id < 0) {
 					$error++;
+				} else {
+					// copy internal contacts
+					if ($object->copy_linked_contact($facture_source, 'internal') < 0) {
+						$error++;
+					} elseif ($facture_source->socid == $object->socid) {
+						// copy external contacts if same company
+						if ($object->copy_linked_contact($facture_source, 'external') < 0) {
+							$error++;
+						}
+					}
 				}
-			}
-		}
 
 				// NOTE: Pb with situation invoice
 				// NOTE: fields total on situation invoice are stored as cumulative values on total of lines (bad) but delta on invoice total

From d1f36ec20cf530d0f93ae10cea2275669dcc0f6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 May 2021 15:45:47 +0200
Subject: [PATCH 881/928] Fix phpcs

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 912cf21a1de..3518518a5ef 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6767,9 +6767,9 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 /* ============================================================================== */
 
 span.clipboardCPValue.hidewithsize {
-    width: 0 !important;
-    display: inline-block;
-    color: transparent;
+	width: 0 !important;
+	display: inline-block;
+	color: transparent;
 }
 
 .clipboardCPShowOnHover .clipboardCPButton {

From a9ddf2a5ad51be91b2769fdbcf6595fa8db5457b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 May 2021 19:07:47 +0200
Subject: [PATCH 882/928] Fix phpcs

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 22e28001743..16c72297e10 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -190,6 +190,10 @@ class Product extends CommonObject
 	public $localtax1_type;
 	public $localtax2_type;
 
+	public $lifetime;
+
+	public $qc_frequency;
+
 	/**
 	 * Stock real
 	 *

From 009588e04d69ddfe8caae2197e4c26b9a656857b Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 14 May 2021 11:02:55 +0200
Subject: [PATCH 883/928] fix implode on string for formproduct loadwarehouse

---
 htdocs/product/class/html.formproduct.class.php | 14 +++++---------
 htdocs/product/stock/stockatdate.php            |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index a5f28c50ee8..69429677c27 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -66,13 +66,13 @@ class FormProduct
 	 *                      				    'warehouseclosed' = select products from closed warehouses,
 	 *                      				    'warehouseinternal' = select products from warehouses for internal correct/transfer only
 	 * @param	boolean	    $sumStock		    sum total stock of a warehouse, default true
-	 * @param	string      $exclude            warehouses ids to exclude
+	 * @param	array       $exclude            warehouses ids to exclude
 	 * @param   bool|int    $stockMin           [=false] Value of minimum stock to filter or false not not filter by minimum stock
 	 * @param   string      $orderBy            [='e.ref'] Order by
 	 * @return  int                             Nb of loaded lines, 0 if already loaded, <0 if KO
 	 * @throws  Exception
 	 */
-	public function loadWarehouses($fk_product = 0, $batch = '', $status = '', $sumStock = true, $exclude = '', $stockMin = false, $orderBy = 'e.ref')
+	public function loadWarehouses($fk_product = 0, $batch = '', $status = '', $sumStock = true, $exclude = array(), $stockMin = false, $orderBy = 'e.ref')
 	{
 		global $conf, $langs;
 
@@ -80,10 +80,6 @@ class FormProduct
 			return 0; // Cache already loaded and we do not want a list with information specific to a product
 		}
 
-		if (is_array($exclude)) {
-			$excludeGroups = implode("','", $exclude);
-		}
-
 		$warehouseStatus = array();
 
 		if (preg_match('/warehouseclosed/', $status)) {
@@ -121,7 +117,7 @@ class FormProduct
 			$sql .= " AND e.statut = 1";
 		}
 
-		if (!empty($exclude)) {
+		if (is_array($exclude) && !empty($exclude)) {
 			$sql .= ' AND e.rowid NOT IN('.$this->db->sanitize(implode(',', $exclude)).')';
 		}
 
@@ -220,7 +216,7 @@ class FormProduct
 	 *  @param	int	    	$forcecombo		    1=Force combo iso ajax select2
 	 *  @param	array	    $events			            Events to add to select2
 	 *  @param  string      $morecss                    Add more css classes to HTML select
-	 *  @param	string	    $exclude            Warehouses ids to exclude
+	 *  @param	array	    $exclude            Warehouses ids to exclude
 	 *  @param  int         $showfullpath       1=Show full path of name (parent ref into label), 0=Show only ref of current warehouse
 	 *  @param  bool|int    $stockMin           [=false] Value of minimum stock to filter or false not not filter by minimum stock
 	 *  @param  string      $orderBy            [='e.ref'] Order by
@@ -228,7 +224,7 @@ class FormProduct
 	 *
 	 *  @throws Exception
 	 */
-	public function selectWarehouses($selected = '', $htmlname = 'idwarehouse', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $empty_label = '', $showstock = 0, $forcecombo = 0, $events = array(), $morecss = 'minwidth200', $exclude = '', $showfullpath = 1, $stockMin = false, $orderBy = 'e.ref')
+	public function selectWarehouses($selected = '', $htmlname = 'idwarehouse', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $empty_label = '', $showstock = 0, $forcecombo = 0, $events = array(), $morecss = 'minwidth200', $exclude = array(), $showfullpath = 1, $stockMin = false, $orderBy = 'e.ref')
 	{
 		global $conf, $langs, $user, $hookmanager;
 
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 788c75f1141..b36d530d624 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -363,7 +363,7 @@ print $form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, ar
 print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddingrightonly">&nbsp;</span> ';
 print img_picto('', 'stock').' ';
 print $langs->trans('Warehouse').'</span> ';
-print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifone'), 'fk_warehouse', '', 1, 0, 0, '', 0, 0, null, '', '', 1, false, 'e.ref');
+print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifone'), 'fk_warehouse', '', 1, 0, 0, '', 0, 0, null, '', null, 1, false, 'e.ref');
 print '</div>';
 
 $parameters = array();

From ce6df0ee4acb165cc685091e37f7419d462b232f Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Fri, 14 May 2021 13:50:12 +0200
Subject: [PATCH 884/928] FIX: Filter of the dates in the lists is lost

---
 htdocs/comm/propal/list.php    | 14 +++++++-------
 htdocs/commande/list.php       | 12 +++++-------
 htdocs/compta/facture/list.php | 14 +++++++-------
 htdocs/expedition/list.php     | 14 +++++++-------
 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 5190adb379a..8060bc94698 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2012      Christophe Battarel		<christophe.battarel@altairis.fr>
  * Copyright (C) 2013      Cédric Salvador			<csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Jean-François Ferry		<jfefe@aternatik.fr>
- * Copyright (C) 2016-2018 Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2016-2021 Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2017-2018 Charlene Benke			<charlie@patas-monkey.com>
  * Copyright (C) 2018	   Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2019	   Alexandre Spangaro		<aspangaro@open-dsi.fr>
@@ -504,12 +504,12 @@ 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 ($search_date_start)				$param .= '&search_date_start='.urlencode($search_date_start);
-	if ($search_date_end)				$param .= '&search_date_end='.urlencode($search_date_end);
-	if ($search_dateend_start)			$param .= '&search_dateend_start='.urlencode($search_dateend_start);
-	if ($search_dateend_end)			$param .= '&search_dateend_end='.urlencode($search_dateend_end);
-	if ($search_datedelivery_start)		$param .= '&search_datedelivery_start='.urlencode($search_datedelivery_start);
-	if ($search_datedelivery_end)		$param .= '&search_datedelivery_end='.urlencode($search_datedelivery_end);
+	if ($search_date_start)				$param .= '&search_date_startday='.urlencode(dol_print_date($search_date_start,'%d')).'&search_date_startmonth='.urlencode(dol_print_date($search_date_start,'%m')).'&search_date_startyear='.urlencode(dol_print_date($search_date_start,'%Y'));
+	if ($search_date_end)				$param .= '&search_date_endday='.urlencode(dol_print_date($search_date_end,'%d')).'&search_date_endmonth='.urlencode(dol_print_date($search_date_end,'%m')).'&search_date_endyear='.urlencode(dol_print_date($search_date_end,'%Y'));
+	if ($search_dateend_start)			$param .= '&search_dateend_startday='.urlencode(dol_print_date($search_dateend_start,'%d')).'&search_dateend_startmonth='.urlencode(dol_print_date($search_dateend_start,'%m')).'&search_dateend_startyear='.urlencode(dol_print_date($search_dateend_start,'%Y'));
+	if ($search_dateend_end)			$param .= '&search_dateend_endday='.urlencode(dol_print_date($search_dateend_end,'%d')).'&search_dateend_endmonth='.urlencode(dol_print_date($search_dateend_end,'%m')).'&search_dateend_endyear='.urlencode(dol_print_date($search_dateend_end,'%Y'));
+	if ($search_datedelivery_start)		$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start,'%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start,'%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start,'%Y'));
+	if ($search_datedelivery_end)		$param .= '&search_datedelivery_endday='.urlencode(dol_print_date($search_datedelivery_end,'%d')).'&search_datedelivery_endmonth='.urlencode(dol_print_date($search_datedelivery_end,'%m')).'&search_datedelivery_endyear='.urlencode(dol_print_date($search_datedelivery_end,'%Y'));
 	if ($search_ref)         			$param .= '&search_ref='.urlencode($search_ref);
 	if ($search_refcustomer) 			$param .= '&search_refcustomer='.urlencode($search_refcustomer);
 	if ($search_refproject)  			$param .= '&search_refproject='.urlencode($search_refproject);
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3efa8f534a4..9b3e865e459 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015-2018  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2016-2021  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018       Charlene Benke	        <charlie@patas-monkey.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -55,10 +55,8 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'orderlist';
 
-$search_datecloture_start = GETPOST('search_datecloture_start', 'int');
-if (empty($search_datecloture_start)) $search_datecloture_start = dol_mktime(0, 0, 0, GETPOST('search_datecloture_startmonth', 'int'), GETPOST('search_datecloture_startday', 'int'), GETPOST('search_datecloture_startyear', 'int'));
-$search_datecloture_end = GETPOST('search_datecloture_end', 'int');
-if (empty($search_datecloture_end)) $search_datecloture_end = dol_mktime(23, 59, 59, GETPOST('search_datecloture_endmonth', 'int'), GETPOST('search_datecloture_endday', 'int'), GETPOST('search_datecloture_endyear', 'int'));
+$search_datecloture_start = dol_mktime(0, 0, 0, GETPOST('search_datecloture_startmonth', 'int'), GETPOST('search_datecloture_startday', 'int'), GETPOST('search_datecloture_startyear', 'int'));
+$search_datecloture_end = dol_mktime(23, 59, 59, GETPOST('search_datecloture_endmonth', 'int'), GETPOST('search_datecloture_endday', 'int'), GETPOST('search_datecloture_endyear', 'int'));
 $search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_start_month', 'int'), GETPOST('search_dateorder_start_day', 'int'), GETPOST('search_dateorder_start_year', 'int'));
 $search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_month', 'int'), GETPOST('search_dateorder_end_day', 'int'), GETPOST('search_dateorder_end_year', 'int'));
 $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));
@@ -446,8 +444,8 @@ if ($resql)
 	if ($sall)						$param .= '&sall='.urlencode($sall);
 	if ($socid > 0)					$param .= '&socid='.urlencode($socid);
 	if ($search_status != '')		$param .= '&search_status='.urlencode($search_status);
-	if ($search_datecloture_start)  $param .= '&search_datecloture_start='.urlencode($search_datecloture_start);
-	if ($search_datecloture_end)    $param .= '&search_datecloture_end='.urlencode($search_datecloture_end);
+	if ($search_datecloture_start)  $param .= '&search_datecloture_startday='.dol_print_date($search_datecloture_start, '%d').'&search_datecloture_startmonth='.dol_print_date($search_datecloture_start, '%m').'&search_datecloture_startyear='.dol_print_date($search_datecloture_start, '%Y');
+	if ($search_datecloture_end)    $param .= '&search_datecloture_endday='.dol_print_date($search_datecloture_end, '%d').'&search_datecloture_endmonth='.dol_print_date($search_datecloture_end, '%m').'&search_datecloture_endyear='.dol_print_date($search_datecloture_end, '%Y');
 	if ($search_dateorder_start) 	$param .= '&search_dateorder_start_day='.dol_print_date($search_dateorder_start, '%d').'&search_dateorder_start_month='.dol_print_date($search_dateorder_start, '%m').'&search_dateorder_start_year='.dol_print_date($search_dateorder_start, '%Y');
 	if ($search_dateorder_end) 		$param .= '&search_dateorder_end_day='.dol_print_date($search_dateorder_end, '%d').'&search_dateorder_end_month='.dol_print_date($search_dateorder_end, '%m').'&search_dateorder_end_year='.dol_print_date($search_dateorder_end, '%Y');
 	if ($search_datedelivery_start) $param .= '&search_datedelivery_start_day='.dol_print_date($search_datedelivery_start, '%d').'&search_datedelivery_start_month='.dol_print_date($search_datedelivery_start, '%m').'&search_datedelivery_start_year='.dol_print_date($search_datedelivery_start, '%Y');
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index f427466c560..78cee038107 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2013      Florian Henry         <florian.henry@open-concept.pro>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Jean-François Ferry   <jfefe@aternatik.fr>
- * Copyright (C) 2015-2016 Ferran Marcet         <fmarcet@2byte.es>
+ * Copyright (C) 2015-2021 Ferran Marcet         <fmarcet@2byte.es>
  * Copyright (C) 2017      Josep Lluís Amador    <joseplluis@lliuretic.cat>
  * Copyright (C) 2018      Charlene Benke        <charlie@patas-monkey.com>
  * Copyright (C) 2019	   Alexandre Spangaro	 <aspangaro@open-dsi.fr>
@@ -616,12 +616,12 @@ 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 ($search_date_start)				$param .= '&search_date_start='.urlencode($search_date_start);
-	if ($search_date_end)				$param .= '&search_date_end='.urlencode($search_date_end);
-	if ($search_date_valid_start)		$param .= '&search_date_valid_start='.urlencode($search_date_valid_start);
-	if ($search_date_valid_end)			$param .= '&search_date_valid_end='.urlencode($search_date_valid_end);
-	if ($search_datelimit_start)		$param .= '&search_datelimit_start='.urlencode($search_datelimit_start);
-	if ($search_datelimit_end)			$param .= '&search_datelimit_end='.urlencode($search_datelimit_end);
+	if ($search_date_start)				$param .= '&search_date_startday='.urlencode(dol_print_date($search_date_start,'%d')).'&search_date_startmonth='.urlencode(dol_print_date($search_date_start,'%m')).'&search_date_startyear='.urlencode(dol_print_date($search_date_start,'%Y'));
+	if ($search_date_end)				$param .= '&search_date_endday='.urlencode(dol_print_date($search_date_end,'%d')).'&search_date_endmonth='.urlencode(dol_print_date($search_date_end,'%m')).'&search_date_endyear='.urlencode(dol_print_date($search_date_end,'%Y'));
+	if ($search_date_valid_start)		$param .= '&search_date_valid_startday='.urlencode(dol_print_date($search_date_valid_start,'%d')).'&search_date_valid_startmonth='.urlencode(dol_print_date($search_date_valid_start,'%m')).'&search_date_valid_startyear='.urlencode(dol_print_date($search_date_valid_start,'%Y'));
+	if ($search_date_valid_end)			$param .= '&search_date_valid_endday='.urlencode(dol_print_date($search_date_valid_end,'%d')).'&search_date_valid_endmonth='.urlencode(dol_print_date($search_date_valid_end,'%m')).'&search_date_valid_endyear='.urlencode(dol_print_date($search_date_valid_end,'%Y'));
+	if ($search_datelimit_start)		$param .= '&search_datelimit_startday='.urlencode(dol_print_date($search_datelimit_start,'%d')).'&search_datelimit_startmonth='.urlencode(dol_print_date($search_datelimit_start,'%m')).'&search_datelimit_startyear='.urlencode(dol_print_date($search_datelimit_start,'%Y'));
+	if ($search_datelimit_end)			$param .= '&search_datelimit_endday='.urlencode(dol_print_date($search_datelimit_end,'%d')).'&search_datelimit_endmonth='.urlencode(dol_print_date($search_datelimit_end,'%m')).'&search_datelimit_endyear='.urlencode(dol_print_date($search_datelimit_end,'%Y'));
 	if ($search_ref)         $param .= '&search_ref='.urlencode($search_ref);
 	if ($search_refcustomer) $param .= '&search_refcustomer='.urlencode($search_refcustomer);
 	if ($search_project_ref) $param .= '&search_project_ref='.urlencode($search_project_ref);
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 20bb6f298cb..2de5a755b72 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2016-2018 Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2016-2021 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  * Copyright (C) 2020      Thibault FOUCART     <support@ptibogxiv.net>
  *
@@ -340,10 +340,10 @@ if ($resql)
 	if ($search_town)      $param .= '&search_town='.urlencode($search_town);
 	if ($search_zip)       $param .= '&search_zip='.urlencode($search_zip);
 
-	if ($search_datedelivery_start)	$param .= '&search_datedelivery_start='.urlencode($search_datedelivery_start);
-	if ($search_datedelivery_end)	$param .= '&search_datedelivery_end='.urlencode($search_datedelivery_end);
-	if ($search_datereceipt_start)	$param .= '&search_datereceipt_start='.urlencode($search_datereceipt_start);
-	if ($search_datereceipt_end)	$param .= '&search_datereceipt_end='.urlencode($search_datereceipt_end);
+	if ($search_datedelivery_start)	$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start,'%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start,'%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start,'%Y'));
+	if ($search_datedelivery_end)	$param .= '&search_datedelivery_endday='.urlencode(dol_print_date($search_datedelivery_end,'%d')).'&search_datedelivery_endmonth='.urlencode(dol_print_date($search_datedelivery_end,'%m')).'&search_datedelivery_endyear='.urlencode(dol_print_date($search_datedelivery_end,'%Y'));
+	if ($search_datereceipt_start)	$param .= '&search_datereceipt_startday='.urlencode(dol_print_date($search_datereceipt_start,'%d')).'&search_datereceipt_startmonth='.urlencode(dol_print_date($search_datereceipt_start,'%m')).'&search_datereceipt_startyear='.urlencode(dol_print_date($search_datereceipt_start,'%Y'));
+	if ($search_datereceipt_end)	$param .= '&search_datereceipt_endday='.urlencode(dol_print_date($search_datereceipt_end,'%d')).'&search_datereceipt_endmonth='.urlencode(dol_print_date($search_datereceipt_end,'%m')).'&search_datereceipt_endyear='.urlencode(dol_print_date($search_datereceipt_end,'%Y'));
 
 	if ($search_product_category != '') $param .= '&search_product_category='.urlencode($search_product_category);
 	if ($search_categ_cus > 0)      $param .= '&search_categ_cus='.urlencode($search_categ_cus);
@@ -506,11 +506,11 @@ if ($resql)
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		print $langs->trans('From').' ';
-		print $form->selectDate($search_delivery_start ? $search_delivery_start : -1, 'search_delivery_start', 0, 0, 1);
+		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1);
 		print '</div>';
 		print '<div class="nowrap">';
 		print $langs->trans('to').' ';
-		print $form->selectDate($search_delivery_end ? $search_delivery_end : -1, 'search_delivery_end', 0, 0, 1);
+		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1);
 		print '</div>';
 		print '</td>';
 	}

From 50d4d28c140f8f92c360c8eb6f8b5cfda8651d60 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 14 May 2021 11:54:50 +0000
Subject: [PATCH 885/928] Fixing style errors.

---
 htdocs/comm/propal/list.php    | 12 ++++++------
 htdocs/compta/facture/list.php | 12 ++++++------
 htdocs/expedition/list.php     |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 8060bc94698..8f5e8d9818e 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -504,12 +504,12 @@ 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 ($search_date_start)				$param .= '&search_date_startday='.urlencode(dol_print_date($search_date_start,'%d')).'&search_date_startmonth='.urlencode(dol_print_date($search_date_start,'%m')).'&search_date_startyear='.urlencode(dol_print_date($search_date_start,'%Y'));
-	if ($search_date_end)				$param .= '&search_date_endday='.urlencode(dol_print_date($search_date_end,'%d')).'&search_date_endmonth='.urlencode(dol_print_date($search_date_end,'%m')).'&search_date_endyear='.urlencode(dol_print_date($search_date_end,'%Y'));
-	if ($search_dateend_start)			$param .= '&search_dateend_startday='.urlencode(dol_print_date($search_dateend_start,'%d')).'&search_dateend_startmonth='.urlencode(dol_print_date($search_dateend_start,'%m')).'&search_dateend_startyear='.urlencode(dol_print_date($search_dateend_start,'%Y'));
-	if ($search_dateend_end)			$param .= '&search_dateend_endday='.urlencode(dol_print_date($search_dateend_end,'%d')).'&search_dateend_endmonth='.urlencode(dol_print_date($search_dateend_end,'%m')).'&search_dateend_endyear='.urlencode(dol_print_date($search_dateend_end,'%Y'));
-	if ($search_datedelivery_start)		$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start,'%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start,'%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start,'%Y'));
-	if ($search_datedelivery_end)		$param .= '&search_datedelivery_endday='.urlencode(dol_print_date($search_datedelivery_end,'%d')).'&search_datedelivery_endmonth='.urlencode(dol_print_date($search_datedelivery_end,'%m')).'&search_datedelivery_endyear='.urlencode(dol_print_date($search_datedelivery_end,'%Y'));
+	if ($search_date_start)				$param .= '&search_date_startday='.urlencode(dol_print_date($search_date_start, '%d')).'&search_date_startmonth='.urlencode(dol_print_date($search_date_start, '%m')).'&search_date_startyear='.urlencode(dol_print_date($search_date_start, '%Y'));
+	if ($search_date_end)				$param .= '&search_date_endday='.urlencode(dol_print_date($search_date_end, '%d')).'&search_date_endmonth='.urlencode(dol_print_date($search_date_end, '%m')).'&search_date_endyear='.urlencode(dol_print_date($search_date_end, '%Y'));
+	if ($search_dateend_start)			$param .= '&search_dateend_startday='.urlencode(dol_print_date($search_dateend_start, '%d')).'&search_dateend_startmonth='.urlencode(dol_print_date($search_dateend_start, '%m')).'&search_dateend_startyear='.urlencode(dol_print_date($search_dateend_start, '%Y'));
+	if ($search_dateend_end)			$param .= '&search_dateend_endday='.urlencode(dol_print_date($search_dateend_end, '%d')).'&search_dateend_endmonth='.urlencode(dol_print_date($search_dateend_end, '%m')).'&search_dateend_endyear='.urlencode(dol_print_date($search_dateend_end, '%Y'));
+	if ($search_datedelivery_start)		$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start, '%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start, '%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start, '%Y'));
+	if ($search_datedelivery_end)		$param .= '&search_datedelivery_endday='.urlencode(dol_print_date($search_datedelivery_end, '%d')).'&search_datedelivery_endmonth='.urlencode(dol_print_date($search_datedelivery_end, '%m')).'&search_datedelivery_endyear='.urlencode(dol_print_date($search_datedelivery_end, '%Y'));
 	if ($search_ref)         			$param .= '&search_ref='.urlencode($search_ref);
 	if ($search_refcustomer) 			$param .= '&search_refcustomer='.urlencode($search_refcustomer);
 	if ($search_refproject)  			$param .= '&search_refproject='.urlencode($search_refproject);
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 78cee038107..6d4af64902d 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -616,12 +616,12 @@ 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 ($search_date_start)				$param .= '&search_date_startday='.urlencode(dol_print_date($search_date_start,'%d')).'&search_date_startmonth='.urlencode(dol_print_date($search_date_start,'%m')).'&search_date_startyear='.urlencode(dol_print_date($search_date_start,'%Y'));
-	if ($search_date_end)				$param .= '&search_date_endday='.urlencode(dol_print_date($search_date_end,'%d')).'&search_date_endmonth='.urlencode(dol_print_date($search_date_end,'%m')).'&search_date_endyear='.urlencode(dol_print_date($search_date_end,'%Y'));
-	if ($search_date_valid_start)		$param .= '&search_date_valid_startday='.urlencode(dol_print_date($search_date_valid_start,'%d')).'&search_date_valid_startmonth='.urlencode(dol_print_date($search_date_valid_start,'%m')).'&search_date_valid_startyear='.urlencode(dol_print_date($search_date_valid_start,'%Y'));
-	if ($search_date_valid_end)			$param .= '&search_date_valid_endday='.urlencode(dol_print_date($search_date_valid_end,'%d')).'&search_date_valid_endmonth='.urlencode(dol_print_date($search_date_valid_end,'%m')).'&search_date_valid_endyear='.urlencode(dol_print_date($search_date_valid_end,'%Y'));
-	if ($search_datelimit_start)		$param .= '&search_datelimit_startday='.urlencode(dol_print_date($search_datelimit_start,'%d')).'&search_datelimit_startmonth='.urlencode(dol_print_date($search_datelimit_start,'%m')).'&search_datelimit_startyear='.urlencode(dol_print_date($search_datelimit_start,'%Y'));
-	if ($search_datelimit_end)			$param .= '&search_datelimit_endday='.urlencode(dol_print_date($search_datelimit_end,'%d')).'&search_datelimit_endmonth='.urlencode(dol_print_date($search_datelimit_end,'%m')).'&search_datelimit_endyear='.urlencode(dol_print_date($search_datelimit_end,'%Y'));
+	if ($search_date_start)				$param .= '&search_date_startday='.urlencode(dol_print_date($search_date_start, '%d')).'&search_date_startmonth='.urlencode(dol_print_date($search_date_start, '%m')).'&search_date_startyear='.urlencode(dol_print_date($search_date_start, '%Y'));
+	if ($search_date_end)				$param .= '&search_date_endday='.urlencode(dol_print_date($search_date_end, '%d')).'&search_date_endmonth='.urlencode(dol_print_date($search_date_end, '%m')).'&search_date_endyear='.urlencode(dol_print_date($search_date_end, '%Y'));
+	if ($search_date_valid_start)		$param .= '&search_date_valid_startday='.urlencode(dol_print_date($search_date_valid_start, '%d')).'&search_date_valid_startmonth='.urlencode(dol_print_date($search_date_valid_start, '%m')).'&search_date_valid_startyear='.urlencode(dol_print_date($search_date_valid_start, '%Y'));
+	if ($search_date_valid_end)			$param .= '&search_date_valid_endday='.urlencode(dol_print_date($search_date_valid_end, '%d')).'&search_date_valid_endmonth='.urlencode(dol_print_date($search_date_valid_end, '%m')).'&search_date_valid_endyear='.urlencode(dol_print_date($search_date_valid_end, '%Y'));
+	if ($search_datelimit_start)		$param .= '&search_datelimit_startday='.urlencode(dol_print_date($search_datelimit_start, '%d')).'&search_datelimit_startmonth='.urlencode(dol_print_date($search_datelimit_start, '%m')).'&search_datelimit_startyear='.urlencode(dol_print_date($search_datelimit_start, '%Y'));
+	if ($search_datelimit_end)			$param .= '&search_datelimit_endday='.urlencode(dol_print_date($search_datelimit_end, '%d')).'&search_datelimit_endmonth='.urlencode(dol_print_date($search_datelimit_end, '%m')).'&search_datelimit_endyear='.urlencode(dol_print_date($search_datelimit_end, '%Y'));
 	if ($search_ref)         $param .= '&search_ref='.urlencode($search_ref);
 	if ($search_refcustomer) $param .= '&search_refcustomer='.urlencode($search_refcustomer);
 	if ($search_project_ref) $param .= '&search_project_ref='.urlencode($search_project_ref);
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 2de5a755b72..c4a3666937e 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -340,10 +340,10 @@ if ($resql)
 	if ($search_town)      $param .= '&search_town='.urlencode($search_town);
 	if ($search_zip)       $param .= '&search_zip='.urlencode($search_zip);
 
-	if ($search_datedelivery_start)	$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start,'%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start,'%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start,'%Y'));
-	if ($search_datedelivery_end)	$param .= '&search_datedelivery_endday='.urlencode(dol_print_date($search_datedelivery_end,'%d')).'&search_datedelivery_endmonth='.urlencode(dol_print_date($search_datedelivery_end,'%m')).'&search_datedelivery_endyear='.urlencode(dol_print_date($search_datedelivery_end,'%Y'));
-	if ($search_datereceipt_start)	$param .= '&search_datereceipt_startday='.urlencode(dol_print_date($search_datereceipt_start,'%d')).'&search_datereceipt_startmonth='.urlencode(dol_print_date($search_datereceipt_start,'%m')).'&search_datereceipt_startyear='.urlencode(dol_print_date($search_datereceipt_start,'%Y'));
-	if ($search_datereceipt_end)	$param .= '&search_datereceipt_endday='.urlencode(dol_print_date($search_datereceipt_end,'%d')).'&search_datereceipt_endmonth='.urlencode(dol_print_date($search_datereceipt_end,'%m')).'&search_datereceipt_endyear='.urlencode(dol_print_date($search_datereceipt_end,'%Y'));
+	if ($search_datedelivery_start)	$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start, '%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start, '%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start, '%Y'));
+	if ($search_datedelivery_end)	$param .= '&search_datedelivery_endday='.urlencode(dol_print_date($search_datedelivery_end, '%d')).'&search_datedelivery_endmonth='.urlencode(dol_print_date($search_datedelivery_end, '%m')).'&search_datedelivery_endyear='.urlencode(dol_print_date($search_datedelivery_end, '%Y'));
+	if ($search_datereceipt_start)	$param .= '&search_datereceipt_startday='.urlencode(dol_print_date($search_datereceipt_start, '%d')).'&search_datereceipt_startmonth='.urlencode(dol_print_date($search_datereceipt_start, '%m')).'&search_datereceipt_startyear='.urlencode(dol_print_date($search_datereceipt_start, '%Y'));
+	if ($search_datereceipt_end)	$param .= '&search_datereceipt_endday='.urlencode(dol_print_date($search_datereceipt_end, '%d')).'&search_datereceipt_endmonth='.urlencode(dol_print_date($search_datereceipt_end, '%m')).'&search_datereceipt_endyear='.urlencode(dol_print_date($search_datereceipt_end, '%Y'));
 
 	if ($search_product_category != '') $param .= '&search_product_category='.urlencode($search_product_category);
 	if ($search_categ_cus > 0)      $param .= '&search_categ_cus='.urlencode($search_categ_cus);

From cff0b69ce052258f1bbc3a4870c1ad32ba2f4a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 14 May 2021 18:30:56 +0200
Subject: [PATCH 886/928] avoid sql error with sql_mode=only_full_group_by

SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM llx_societe as s, llx_contrat as t, llx_contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (2) AND t.entity IN (1)[DB_ERROR_1140] In aggregated query without GROUP BY, expression #4 of SELECT list contains nonaggregated column 'dolibarrdev.t.rowid'; this is incompatible with sql_mode=only_full_group_by
---
 htdocs/core/class/html.form.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 625e8e23d57..a0846b2b3ed 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7692,8 +7692,12 @@ class Form
 				'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('commande').')'),
 				'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
-				'contrat'=>array('enabled'=>$conf->contrat->enabled, 'perms'=>1, 'label'=>'LinkToContract',
-								'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').')'),
+				'contrat'=>array(
+					'enabled'=>$conf->contrat->enabled,
+					'perms'=>1,
+					'label'=>'LinkToContract',
+					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY t.rowid'
+				),
 				'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('intervention').')'),
 				'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled, 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('supplier_proposal').')'),
 				'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled, 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('commande_fournisseur').')'),

From 8f49c68aa502835cb621b9535b116c38d5290492 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sat, 15 May 2021 01:14:28 +0200
Subject: [PATCH 887/928] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 371c8be2f5e..6ccdb28f67d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,4 @@ yarn.lock
 package-lock.json
 
 doc/install.lock
+desktop.ini

From 1d7765ce125eec6ba462d4dd8e468074e98803c3 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sat, 15 May 2021 02:29:15 +0200
Subject: [PATCH 888/928] update phone and address in popup

---
 htdocs/comm/propal/card.php            |  1 -
 htdocs/commande/card.php               |  1 -
 htdocs/compta/facture/card.php         |  1 -
 htdocs/societe/class/societe.class.php | 12 ++++++++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 8039e3361ec..229303849f0 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1991,7 +1991,6 @@ if ($action == 'create') {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
-		$morehtmlref .= '<br>'.$langs->trans("Phone").' : '.dol_print_phone($object->thirdparty->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone');
 	}
 	// Project
 	if (!empty($conf->projet->enabled)) {
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 01ad66a0af6..f63b02c035e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2020,7 +2020,6 @@ if ($action == 'create' && $usercancreate) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
 		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
-			$morehtmlref .= '<br>'.$langs->trans("Phone").' : '.dol_print_phone($object->thirdparty->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone');
 		}
 		// Project
 		if (!empty($conf->projet->enabled)) {
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index b4126f1434c..252b8ac65a2 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4157,7 +4157,6 @@ if ($action == 'create') {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
-		$morehtmlref .= '<br>'.$langs->trans("Phone").' : '.dol_print_phone($object->thirdparty->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone');
 	}
 	// Project
 	if (!empty($conf->projet->enabled)) {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index defcc71a3e5..d207c690a69 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2560,8 +2560,16 @@ class Societe extends CommonObject
 			}
 		}
 		$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
-		if (!empty($this->country_code)) {
-			$label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
+		$phonelist = array();
+		if ($this->phone) {
+			$phonelist[] = dol_print_phone($this->phone, $this->country_code, $this->id, 0, '', '&nbsp', 'phone');
+		}
+		if ($this->fax) {
+			$phonelist[] = dol_print_phone($this->fax, $this->country_code, $this->id, 0, '', '&nbsp', 'fax');
+		}
+		$label .= '<br><b>'.$langs->trans('Phone').':</b> '.implode('&nbsp;', $phonelist);
+		if (!empty($this->address)) {
+			$label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);
 		}
 		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false)) {
 			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);

From 3cccdea20b5b89b2dab8e6d97d4c615ccc0217f3 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sat, 15 May 2021 02:31:08 +0200
Subject: [PATCH 889/928] Update .gitignore

---
 .gitignore | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6ccdb28f67d..db04b277351 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,9 +50,3 @@ node_modules/
 
 #yarn
 yarn.lock
-
-#package-lock
-package-lock.json
-
-doc/install.lock
-desktop.ini

From 5deff6676a9cc0eede19b840f6c8e7ec98ee85fe Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sat, 15 May 2021 02:31:33 +0200
Subject: [PATCH 890/928] Update .gitignore

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index db04b277351..7b3fc6cb353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,3 @@ htdocs/.well-known/apple-developer-merchantid-domain-association
 build/yarn-error.log
 build/node_modules/
 node_modules/
-
-#yarn
-yarn.lock

From dc8c746057ad3b2ef62173bab17285a4e6696213 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sat, 15 May 2021 02:32:07 +0200
Subject: [PATCH 891/928] Update .gitignore

---
 .gitignore | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7b3fc6cb353..eab591c9904 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,13 @@ htdocs/includes/squizlabs/
 htdocs/includes/webmozart/
 htdocs/.well-known/apple-developer-merchantid-domain-association
 
+#yarn
+yarn.lock
+
+#package-lock
+package-lock.json
+
+doc/install.lock
 # Node Modules
 build/yarn-error.log
 build/node_modules/

From b3358046805a62e2a95410687289e228704db3e9 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sat, 15 May 2021 02:32:47 +0200
Subject: [PATCH 892/928] Update .gitignore

---
 .gitignore | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index eab591c9904..371c8be2f5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,11 @@ htdocs/includes/squizlabs/
 htdocs/includes/webmozart/
 htdocs/.well-known/apple-developer-merchantid-domain-association
 
+# Node Modules
+build/yarn-error.log
+build/node_modules/
+node_modules/
+
 #yarn
 yarn.lock
 
@@ -50,7 +55,3 @@ yarn.lock
 package-lock.json
 
 doc/install.lock
-# Node Modules
-build/yarn-error.log
-build/node_modules/
-node_modules/

From 334f37052c4a02984ab922360b2a2c7ad054fd35 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Sat, 15 May 2021 02:36:56 +0200
Subject: [PATCH 893/928] Update card.php

---
 htdocs/projet/card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index c6fb5d5963b..3c2d5b02829 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -992,7 +992,6 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : ';
 		if ($object->thirdparty->id > 0) {
 			$morehtmlref .= $object->thirdparty->getNomUrl(1, 'project');
-			$morehtmlref .= '<br>'.$langs->trans("Phone").' : '.dol_print_phone($object->thirdparty->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone');
 		}
 		$morehtmlref .= '</div>';
 

From db32f882e8f03eb833dc59cd6cd45d8e32d88f27 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 15 May 2021 07:45:04 +0200
Subject: [PATCH 894/928] Fix use of DatePropal instead of Date

---
 htdocs/comm/propal/card.php                          | 6 +++---
 htdocs/comm/propal/list.php                          | 2 +-
 htdocs/core/modules/propale/doc/pdf_azur.modules.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 32994e816de..ada520c293b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -325,7 +325,7 @@ if (empty($reshook))
 		$duration = GETPOST('duree_validite', 'int');
 
 		if (empty($datep)) {
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePropal")), null, 'errors');
 			$action = 'create';
 			$error++;
 		}
@@ -1614,7 +1614,7 @@ if ($action == 'create')
 	}
 
 	// Date
-	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('DatePropal').'</td><td>';
 	print $form->selectDate('', '', '', '', '', "addprop", 1, 1);
 	print '</td></tr>';
 
@@ -2044,7 +2044,7 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('Date');
+	print $langs->trans('DatePropal');
 	print '</td>';
 	if ($action != 'editdate' && $object->statut == Propal::STATUS_DRAFT && $usercancreate)
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 522e8f5eaa3..f8481997051 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -157,7 +157,7 @@ $arrayfields = array(
 	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
 	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
 	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),
-	'p.date'=>array('label'=>"Date", 'checked'=>1),
+	'p.date'=>array('label'=>"DatePropal", 'checked'=>1),
 	'p.fin_validite'=>array('label'=>"DateEnd", 'checked'=>1),
 	'p.date_livraison'=>array('label'=>"DeliveryDate", 'checked'=>0),
 	'ava.rowid'=>array('label'=>"AvailabilityPeriod", 'checked'=>0),
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 1235a312006..44192cf6067 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1533,7 +1533,7 @@ class pdf_azur extends ModelePDFPropales
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DatePropal")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);

From 014b34acc69175916d62bf4b4943136b1d052b66 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Sat, 15 May 2021 16:44:46 +0200
Subject: [PATCH 895/928] Fix default gid 65534 for User in LDAP

posixAccount objectclass (intended to be used with the uid/gid/homedir fields) requires a gid.
Always set a gid in LDAP for the User class even if the user does not belong to any group.
By default 65534 which corresponds to the nobody group on major distributions (incl. Debian).
---
 htdocs/user/class/user.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 89995a4584e..6c0645e82b7 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2678,10 +2678,10 @@ class User extends CommonObject
 		}
 
         if (!empty($conf->global->LDAP_FIELD_USERID))$info[$conf->global->LDAP_FIELD_USERID] = $this->id;
-        if (!empty($info[$conf->global->LDAP_FIELD_GROUPID])) {
+        if (!empty($conf->global->LDAP_FIELD_GROUPID)) {
             $usergroup = new UserGroup($this->db);
             $groupslist = $usergroup->listGroupsForUser($this->id);
-            $info[$conf->global->LDAP_FIELD_GROUPID] = '1';
+            $info[$conf->global->LDAP_FIELD_GROUPID] = '65534';
             if (!empty($groupslist)) {
                 foreach ($groupslist as $groupforuser) {
                     $info[$conf->global->LDAP_FIELD_GROUPID] = $groupforuser->id; //Select first group in list

From beff175de130c3ff3ac736c8ed89d0346df568a9 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Sat, 15 May 2021 16:48:43 +0200
Subject: [PATCH 896/928] Fix use login for User homedir in LDAP

posixAccount objectclass (intended to be used with the uid/gid/homedir fields) requires a homedir.
Always set a homedir in LDAP for the User class even if user does not have a firstname by using the login instead.
Additionally on Linux the login is typically used for the home directory rather than the first name.
It also avoids having accentuated or other special characters (commonly found in names) in the home directory path.
---
 htdocs/user/class/user.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6c0645e82b7..2d5a09659db 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2689,7 +2689,7 @@ class User extends CommonObject
                 }
             }
         }
-        if (!empty($this->firstname) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORY) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX)) $info[$conf->global->LDAP_FIELD_HOMEDIRECTORY] = "{$conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX}/$this->firstname";
+        if (!empty($conf->global->LDAP_FIELD_HOMEDIRECTORY) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX)) $info[$conf->global->LDAP_FIELD_HOMEDIRECTORY] = "{$conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX}/$this->login";
 
         return $info;
     }

From 1cbe0e3f2d2be8373950fe06daab4d23a1d47abc Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Sat, 15 May 2021 18:01:34 +0200
Subject: [PATCH 897/928] Fix: properly set gid for Group LDAP synchro

Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
---
 .../core/triggers/interface_50_modLdap_Ldapsynchro.class.php  | 4 ++--
 htdocs/user/class/usergroup.class.php                         | 2 +-
 htdocs/user/group/ldap.php                                    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index ec6d23e2f01..17efdca41c5 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -282,8 +282,8 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$info=$object->_load_ldap_info();
 					$dn=$object->_load_ldap_dn($info);
 
-					// Get a gid number for objectclass PosixGroup
-					if (in_array('posixGroup', $info['objectclass'])) {
+					// Get a gid number for objectclass PosixGroup if none was provided
+					if (empty($info[$conf->global->LDAP_GROUP_FIELD_GROUPID]) && in_array('posixGroup', $info['objectclass'])) {
 						$info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_GROUPS');
 					}
 
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index aa4a6b3f8b6..e1e003267b0 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -983,7 +983,7 @@ class UserGroup extends CommonObject
 			}
 			$info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield)?$valueofldapfield:'');
         }
-        if(!empty($info[$conf->global->LDAP_GROUP_FIELD_GROUPID])){
+        if(!empty($conf->global->LDAP_GROUP_FIELD_GROUPID)){
             $info[$conf->global->LDAP_GROUP_FIELD_GROUPID]=$this->id;
         }
 		return $info;
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index eca923f68be..f28ca81c42a 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -69,8 +69,8 @@ if ($action == 'dolibarr2ldap')
 	{
 		$info=$object->_load_ldap_info();
 
-		// Get a gid number for objectclass PosixGroup
-		if (in_array('posixGroup', $info['objectclass'])) {
+		// Get a gid number for objectclass PosixGroup if none was provided
+		if (empty($info[$conf->global->LDAP_GROUP_FIELD_GROUPID]) && in_array('posixGroup', $info['objectclass'])) {
 			$info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_GROUPS');
 		}
 

From e5e317bae3bfe331d86e21ba4998a892a022ce20 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 09:58:34 +0200
Subject: [PATCH 898/928] Fix entity was set to 0 on group creation

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

diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 33921544b45..21f53c64c68 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -138,7 +138,7 @@ if (empty($reshook)) {
 				if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 					$object->entity = 0;
 				} else {
-					$object->entity = GETPOST("entity");
+					$object->entity = GETPOSTISSET("entity") ? GETPOST("entity") : $conf->entity;
 				}
 
 				$db->begin();

From 3859e7f00ee6b90dd864b78443f9033b0841b8df Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 10:49:00 +0200
Subject: [PATCH 899/928] Fix translations on expensereport list

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

diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index e83899d28d1..ce1dc4e3c09 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -138,8 +138,8 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 $fieldstosearchall = array(
 	'd.ref'=>'Ref',
 	'd.note_public'=>"NotePublic",
-	'u.lastname'=>'Lastname',
-	'u.firstname'=>"Firstname",
+	'u.lastname'=>'EmployeeLastname',
+	'u.firstname'=>"EmployeeFirstname",
 	'u.login'=>"Login",
 );
 if (empty($user->socid)) {

From baf0dda19cd31911348d28a6acbcbb1b16301e22 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 10:52:51 +0200
Subject: [PATCH 900/928] Fix missing load langs for my company info in user
 block

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 0c3679adac5..244ef483db5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1964,6 +1964,8 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	global $dolibarr_main_authentication, $dolibarr_main_demo;
 	global $menumanager;
 
+	$langs->loadLangs(array('companies'));
+
 	$userImage = $userDropDownImage = '';
 	if (!empty($user->photo)) {
 		$userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);

From 3c3613a71a9100e63d02db2832322a0afc76a861 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 11:06:49 +0200
Subject: [PATCH 901/928] Fix missing quick create holiday and expense report

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 244ef483db5..09da7fdd80e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2354,6 +2354,28 @@ function top_menu_quickadd()
                 ';
 	}
 
+	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->creer) {
+		$langs->load("trips");
+		$dropDownQuickAddHtml .= '
+                <!-- Expense report link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/expensereport/card.php?action=create&fk_user_author='.$user->id.'" title="'.$langs->trans("AddTrip").'">
+                    '. img_picto('', 'object_trip') .'<br>'. $langs->trans("ExpenseReport") .'</a>
+                </div>
+                ';
+	}
+
+	if (!empty($conf->holiday->enabled) && $user->rights->holiday->write) {
+		$langs->load("holiday");
+		$dropDownQuickAddHtml .= '
+                <!-- Holiday link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/holiday/card.php?action=create&fuserid='.$user->id.'" title="'.$langs->trans("AddCP").'">
+                    '. img_picto('', 'object_holiday') .'<br>'. $langs->trans("Holidays") .'</a>
+                </div>
+                ';
+	}
+
 	// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
 	$parameters = array();
 	$result = $hookmanager->executeHooks('printQuickAddBlock', $parameters); // Note that $action and $object may have been modified by some hooks

From c8b725165e24199833877dffd7fa534da9409ffe Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 11:16:07 +0200
Subject: [PATCH 902/928] Fix use img_picto in quick create dropdown

---
 htdocs/main.inc.php | 44 +++++++++++---------------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 09da7fdd80e..3fb1a1aa0da 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2217,9 +2217,7 @@ function top_menu_quickadd()
                 <!-- Thirdparty link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/societe/card.php?action=create" title="'.$langs->trans("MenuNewThirdParty").'">
-                        <i class="fa fa-building"></i><br>
-                        '.$langs->trans("ThirdParty").'
-                    </a>
+                    '. img_picto('', 'object_company') .'<br>'. $langs->trans("ThirdParty") .'</a>
                 </div>
                 ';
 	}
@@ -2230,9 +2228,7 @@ function top_menu_quickadd()
                 <!-- Contact link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/contact/card.php?action=create" title="'.$langs->trans("NewContactAddress").'">
-                        <i class="fa fa-address-book"></i><br>
-                        '.$langs->trans("Contact").'
-                    </a>
+                    '. img_picto('', 'object_contact') .'<br>'. $langs->trans("Contact") .'</a>
                 </div>
                 ';
 	}
@@ -2243,9 +2239,7 @@ function top_menu_quickadd()
                 <!-- Propal link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create" title="'.$langs->trans("NewPropal").'">
-                        <i class="fa fa-suitcase"></i><br>
-                        '.$langs->trans("Proposal").'
-                    </a>
+                    '. img_picto('', 'object_propal') .'<br>'. $langs->trans("Proposal") .'</a>
                 </div>
                 ';
 	}
@@ -2256,9 +2250,7 @@ function top_menu_quickadd()
                 <!-- Order link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/commande/card.php?action=create" title="'.$langs->trans("NewOrder").'">
-                        <i class="fa fa-file-alt"></i><br>
-                        '.$langs->trans("Order").'
-                    </a>
+                    '. img_picto('', 'object_order') .'<br>'. $langs->trans("Order") .'</a>
                 </div>
                 ';
 	}
@@ -2269,9 +2261,7 @@ function top_menu_quickadd()
                 <!-- Invoice link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create" title="'.$langs->trans("NewBill").'">
-                        <i class="fa fa-coins"></i><br>
-                        '.$langs->trans("Bill").'
-                    </a>
+                    '. img_picto('', 'object_bill') .'<br>'. $langs->trans("Bill") .'</a>
                 </div>
                 ';
 	}
@@ -2282,9 +2272,7 @@ function top_menu_quickadd()
                 <!-- Contract link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create" title="'.$langs->trans("NewContractSubscription").'">
-                        <i class="fa fa-file-contract"></i><br>
-                        '.$langs->trans("Contract").'
-                    </a>
+                    '. img_picto('', 'object_contract') .'<br>'. $langs->trans("Contract") .'</a>
                 </div>
                 ';
 	}
@@ -2295,9 +2283,7 @@ function top_menu_quickadd()
                 <!-- Supplier proposal link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create" title="'.$langs->trans("NewAskPrice").'">
-                        <i class="fa fa-suitcase"></i><br>
-                        '.$langs->trans("AskPrice").'
-                    </a>
+                    '. img_picto('', 'object_propal') .'<br>'. $langs->trans("AskPrice") .'</a>
                 </div>
                 ';
 	}
@@ -2308,9 +2294,7 @@ function top_menu_quickadd()
                 <!-- Supplier order link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create" title="'.$langs->trans("NewOrder").'">
-                        <i class="fa fa-file-alt"></i><br>
-                        '.$langs->trans("SupplierOrder").'
-                    </a>
+                    '. img_picto('', 'object_order') .'<br>'. $langs->trans("SupplierOrder") .'</a>
                 </div>
                 ';
 	}
@@ -2321,9 +2305,7 @@ function top_menu_quickadd()
                 <!-- Supplier invoice link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create" title="'.$langs->trans("NewBill").'">
-                        <i class="fa fa-coins"></i><br>
-                        '.$langs->trans("SupplierBill").'
-                    </a>
+                    '. img_picto('', 'object_bill') .'<br>'. $langs->trans("SupplierBill") .'</a>
                 </div>
                 ';
 	}
@@ -2334,9 +2316,7 @@ function top_menu_quickadd()
                 <!-- Product link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=0" title="'.$langs->trans("NewProduct").'">
-                        <i class="fa fa-cube"></i><br>
-                        '.$langs->trans("Product").'
-                    </a>
+                    '. img_picto('', 'object_product') .'<br>'. $langs->trans("Product") .'</a>
                 </div>
                 ';
 	}
@@ -2347,9 +2327,7 @@ function top_menu_quickadd()
                 <!-- Service link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=1" title="'.$langs->trans("NewService").'">
-                        <i class="fa fa-concierge-bell"></i><br>
-                        '.$langs->trans("Service").'
-                    </a>
+                    '. img_picto('', 'object_service') .'<br>'. $langs->trans("Service") .'</a>
                 </div>
                 ';
 	}

From 7af0bda3a532554cbdb728c72058112a7fce13ab Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 11:33:07 +0200
Subject: [PATCH 903/928] Update admin_extrafields_view.tpl.php

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

diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 96620da28d9..79f852f49a9 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -120,7 +120,7 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 }
 else
 {
-	$colspan = 13;
+	$colspan = 14;
 	if (!empty($conf->multicompany->enabled))  $colspan++;
 
 	print '<tr class="oddeven">';

From c820231363a75f0d528d7332b7a103e41f6f3e8f Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 12:24:27 +0200
Subject: [PATCH 904/928] Fix id of expense report must be before object fetch

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

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index a4c565bc1be..cb6dcfc94b8 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -55,6 +55,7 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 
+$id = GETPOST('id', 'int');
 $date_start = dol_mktime(0, 0, 0, GETPOST('date_debutmonth', 'int'), GETPOST('date_debutday', 'int'), GETPOST('date_debutyear', 'int'));
 $date_end = dol_mktime(0, 0, 0, GETPOST('date_finmonth', 'int'), GETPOST('date_finday', 'int'), GETPOST('date_finyear', 'int'));
 $date = dol_mktime(0, 0, 0, GETPOST('datemonth', 'int'), GETPOST('dateday', 'int'), GETPOST('dateyear', 'int'));
@@ -120,7 +121,6 @@ if ($object->id > 0) {
 }
 
 // Security check
-$id = GETPOST("id", 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }

From 240137b768e4993406c2fe0037f1090438d4790d Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 16:04:19 +0200
Subject: [PATCH 905/928] Fix HRM homepage

---
 htdocs/hrm/index.php | 60 ++++++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 09485357956..af9518d4622 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -40,8 +40,13 @@ if ($conf->deplacement->enabled) {
 if ($conf->expensereport->enabled) {
 	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 }
-require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+if ($conf->recruitment->enabled) {
+	require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
+}
+if ($conf->holiday->enabled) {
+	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+}
 
 $hookmanager = new HookManager($db);
 $hookmanager->initHooks('hrmindex');
@@ -60,10 +65,6 @@ if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INF
 	$setupcompanynotcomplete = 1;
 }
 
-$holiday = new Holiday($db);
-$holidaystatic = new Holiday($db);
-$staticrecruitmentcandidature = new RecruitmentCandidature($db);
-
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 
@@ -73,7 +74,8 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 // Update sold
 if (!empty($conf->holiday->enabled) && !empty($setupcompanynotcomplete)) {
-	$result = $holiday->updateBalance();
+	$holidaystatic = new Holiday($db);
+	$result = $holidaystatic->updateBalance();
 }
 
 
@@ -144,6 +146,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is usel
 
 if (!empty($conf->holiday->enabled)) {
 	if (empty($conf->global->HOLIDAY_HIDE_BALANCE)) {
+		$holidaystatic = new Holiday($db);
 		$user_id = $user->id;
 
 		print '<div class="div-table-responsive-no-min">';
@@ -154,9 +157,9 @@ if (!empty($conf->holiday->enabled)) {
 
 		$out = '';
 		$nb_holiday = 0;
-		$typeleaves = $holiday->getTypes(1, 1);
+		$typeleaves = $holidaystatic->getTypes(1, 1);
 		foreach ($typeleaves as $key => $val) {
-			$nb_type = $holiday->getCPforUser($user->id, $val['rowid']);
+			$nb_type = $holidaystatic->getCPforUser($user->id, $val['rowid']);
 			$nb_holiday += $nb_type;
 			$out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': <strong>'.($nb_type ? price2num($nb_type) : 0).'</strong><br>';
 		}
@@ -179,7 +182,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Latest leave requests
 if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.photo, u.statut as user_status,";
-	$sql .= " x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
+	$sql .= " x.rowid, x.ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
 	$sql .= " WHERE u.rowid = x.fk_user";
 	$sql .= " AND x.entity = ".$conf->entity;
@@ -236,8 +239,8 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
 				$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
 				$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
 
-				print '<td>'.dol_print_date($db->jdate($obj->date_start), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
-				print '<td>'.dol_print_date($db->jdate($obj->date_end), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
+				print '<td>'.dol_print_date($db->jdate($obj->date_start), 'day').'<br><span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
+				print '<td>'.dol_print_date($db->jdate($obj->date_end), 'day').'<br><span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
 				print '<td class="right nowrap" width="16">'.$holidaystatic->LibStatut($obj->status, 3).'</td>';
 				print '</tr>';
@@ -330,20 +333,23 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 
 // Last modified job position
 if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitmentjobposition->read) {
-	$sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status";
+	$staticrecruitmentcandidature = new RecruitmentCandidature($db);
+	$staticrecruitmentjobposition = new RecruitmentJobPosition($db);
+	$sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status,";
+	$sql.= " rp.rowid as jobid, rp.ref as jobref, rp.label";
 	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s ON rc.fk_recruitmentjobposition = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as rp ON rc.fk_recruitmentjobposition = rp.rowid";
+	if ($conf->societe->enabled && !$user->rights->societe->client->voir && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
-	$sql .= " WHERE rc.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " WHERE rc.entity IN (".getEntity($staticrecruitmentcandidature->element).")";
+	if ($conf->societe->enabled && !$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND rp.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
-		$sql .= " AND s.fk_soc = $socid";
+		$sql .= " AND rp.fk_soc = $socid";
 	}
-	$sql .= " ORDER BY rc.tms DESC";
+	$sql .= $db->order("rc.tms", "DESC");
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);
@@ -354,8 +360,8 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print '<th colspan="2">';
-		print $langs->trans("BoxTitleLatestModifiedCandidatures", $max);
+		print '<th colspan="3">';
+		print $langs->trans("BoxTitleLatestModifiedCandidatures", min($max, $num));
 		print '</th>';
 		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/recruitment/recruitmentcandidature_list.php?sortfield=t.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
 		print '</tr>';
@@ -370,11 +376,15 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 				$staticrecruitmentcandidature->firstname = $objp->firstname;
 				$staticrecruitmentcandidature->lastname = $objp->lastname;
 
+				$staticrecruitmentjobposition->id = $objp->jobid;
+				$staticrecruitmentjobposition->ref = $objp->jobref;
+				$staticrecruitmentjobposition->label = $objp->label;
+
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">'.$staticrecruitmentcandidature->getNomUrl(1, '').'</td>';
-				print '<td class="right nowrap">';
-				print "</td>";
-				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
+				print '<td class="tdoverflowmax150">'.$staticrecruitmentcandidature->getFullName($langs).'</td>';
+				print '<td class="nowrap">'.$staticrecruitmentjobposition->getNomUrl(1).'</td>';
+				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day').'</td>';
 				print '<td class="right nowrap" width="16">';
 				print $staticrecruitmentcandidature->getLibStatut(3);
 				print "</td>";

From 78633ccb2ba3a09d5b0a4aaa6850824e04b99664 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 16:20:46 +0200
Subject: [PATCH 906/928] Fix expensereport and recruitment homepages

---
 htdocs/expensereport/index.php          |  9 ---------
 htdocs/recruitment/recruitmentindex.php | 12 ++++++------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index be8c735edc1..8198883e58f 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -171,9 +171,6 @@ $langs->load("boxes");
 $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut as user_status, u.photo, u.email, u.admin,";
 $sql .= " d.rowid, d.ref, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."user as u";
-if (!$user->rights->societe->client->voir && !$user->socid) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
 $sql .= " WHERE u.rowid = d.fk_user_author";
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
@@ -183,12 +180,6 @@ if (empty($user->rights->expensereport->readall) && empty($user->rights->expense
 	$sql .= " AND d.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
 }
 $sql .= ' AND d.entity IN ('.getEntity('expensereport').')';
-if (!$user->rights->societe->client->voir && !$user->socid) {
-	$sql .= " AND d.fk_user_author = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-}
-if ($socid) {
-	$sql .= " AND d.fk_user_author = ".$socid;
-}
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($max, 0);
 
diff --git a/htdocs/recruitment/recruitmentindex.php b/htdocs/recruitment/recruitmentindex.php
index 3b6ff756b3c..7e369fe6bb2 100644
--- a/htdocs/recruitment/recruitmentindex.php
+++ b/htdocs/recruitment/recruitmentindex.php
@@ -331,18 +331,18 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status, COUNT(rc.rowid) as nbapplications";
 	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc ON rc.fk_recruitmentjobposition = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if ($conf->societe->enabled && !$user->rights->societe->client->voir && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if ($conf->societe->enabled && !$user->rights->societe->client->voir && !$socid) {
 		$sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
 		$sql .= " AND s.fk_soc = $socid";
 	}
 	$sql .= " GROUP BY s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status";
-	$sql .= " ORDER BY s.tms DESC";
+	$sql .= $db->order('s.tms', 'DESC');
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);
@@ -402,17 +402,17 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 	$sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s ON rc.fk_recruitmentjobposition = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if ($conf->societe->enabled && !$user->rights->societe->client->voir && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE rc.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if ($conf->societe->enabled && !$user->rights->societe->client->voir && !$socid) {
 		$sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 	}
 	if ($socid) {
 		$sql .= " AND s.fk_soc = $socid";
 	}
-	$sql .= " ORDER BY rc.tms DESC";
+	$sql .= $db->order('rc.tms', 'DESC');
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);

From d4aa0ae4225f37569bf41a241b79d1e0a3cfcb42 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 18:26:26 +0200
Subject: [PATCH 907/928] Update box_dolibarr_state_board.php

Global stats box is always enabled
---
 htdocs/core/boxes/box_dolibarr_state_board.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index d26dd2cb075..348ffeda4cd 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -60,13 +60,6 @@ class box_dolibarr_state_board extends ModeleBoxes
 		global $conf, $user;
 
 		$this->db = $db;
-
-		// disable box for such cases
-		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-			$this->enabled = 0; // disabled by this option
-		}
-
-		$this->hidden = !(!empty($user->rights->societe->lire) && empty($user->socid));
 	}
 
 	/**

From d3ff549b21417c314ced1c2a9d01acd821612e1e Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 May 2021 18:48:18 +0200
Subject: [PATCH 908/928] Fix ticket when module societe not enabled

---
 htdocs/core/class/html.formticket.class.php | 4 +++-
 htdocs/core/lib/ticket.lib.php              | 5 +++--
 htdocs/ticket/class/ticket.class.php        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 7d012077700..3cec6c19789 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -103,11 +103,13 @@ class FormTicket
 	 */
 	public function __construct($db)
 	{
+		global $conf;
+
 		$this->db = $db;
 
 		$this->action = 'add';
 
-		$this->withcompany = 1;
+		$this->withcompany = $conf->societe->enabled ? 1 : 0;
 		$this->withfromsocid = 0;
 		$this->withfromcontactid = 0;
 		//$this->withthreadid=0;
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index e2e06487de8..4d9d4bb2fa2 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -84,7 +84,7 @@ function ticket_prepare_head($object)
 	$head[$h][2] = 'tabTicket';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid)) {
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid) && $conf->societe->enabled) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
@@ -157,7 +157,8 @@ function showDirectPublicLink($object)
 
 	$out = '';
 	if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
-		$out .= '<span class="opacitymedium">'.$langs->trans("PublicInterfaceNotEnabled").'</span>';
+		$langs->load('errors');
+		$out .= '<span class="opacitymedium">'.$langs->trans("ErrorPublicInterfaceNotEnabled").'</span>';
 	} else {
 		$out .= img_picto('', 'object_globe.png').' <span class="opacitymedium">'.$langs->trans("TicketPublicAccess").'</span><br>';
 		if ($url) {
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 6c883be6b1a..5180abe6140 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2917,7 +2917,7 @@ class Ticket extends CommonObject
 
 		$sql = "SELECT p.rowid, p.ref, p.datec as datec";
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as p";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if ($conf->societe->enabled && !$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = " AND";

From 9a8bd2c24b8f67e4dc48e8a1795955b6fc11b384 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 06:13:26 +0200
Subject: [PATCH 909/928] Add missing field Fix duplicate / in url

---
 htdocs/core/lib/website.lib.php                             | 2 +-
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql            | 6 +++++-
 htdocs/install/mysql/tables/llx_c_ticket_category.sql       | 2 +-
 htdocs/install/mysql/tables/llx_c_ticket_type.sql           | 2 +-
 .../tables/llx_knowledgemanagement_knowledgerecord.sql      | 3 ++-
 htdocs/knowledgemanagement/class/knowledgerecord.class.php  | 4 ++--
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 4fa0f053236..8f6b484a733 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -618,7 +618,7 @@ function getStructuredData($type, $data = array())
 
 			$pageurl = str_replace('__WEBSITE_KEY__', $website->ref, $pageurl);
 			$title = str_replace('__WEBSITE_KEY__', $website->ref, $title);
-			$image = '/medias/'.str_replace('__WEBSITE_KEY__', $website->ref, $image);
+			$image = '/medias'.(preg_match('/^\//', $image) ? '' : '/').str_replace('__WEBSITE_KEY__', $website->ref, $image);
 			$companyname = str_replace('__WEBSITE_KEY__', $website->ref, $companyname);
 			$description = str_replace('__WEBSITE_KEY__', $website->ref, $description);
 
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index da2cd34fa00..cf5da55d719 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -491,11 +491,15 @@ CREATE TABLE llx_knowledgemanagement_knowledgerecord(
 	import_key varchar(14), 
 	model_pdf varchar(255), 
 	question text NOT NULL, 
-	answer text, 
+	answer text,
+	fk_ticket integer,
 	status integer NOT NULL
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;
 
+ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN fk_ticket integer;
+
+
 create table llx_knowledgemanagement_knowledgerecord_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_category.sql b/htdocs/install/mysql/tables/llx_c_ticket_category.sql
index 10d16331a06..57bd15f2c23 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_category.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_category.sql
@@ -15,7 +15,7 @@
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 --
--- Table with the categories of a ticket
+-- Table with the custom category tree for the category of a ticket
 -- 
 
 create table llx_c_ticket_category
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_type.sql b/htdocs/install/mysql/tables/llx_c_ticket_type.sql
index d480036d5d5..462d1a71535 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_type.sql
@@ -13,7 +13,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
---
+-- Type of ticket. For example: COM, ISSUE, REQUEST, PROJECT, OTHER, ...
 
 create table llx_c_ticket_type
 (
diff --git a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
index 9c2866980ec..5c9e4cf199f 100644
--- a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
+++ b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
@@ -27,7 +27,8 @@ CREATE TABLE llx_knowledgemanagement_knowledgerecord(
 	import_key varchar(14), 
 	model_pdf varchar(255), 
 	question text NOT NULL, 
-	answer text, 
+	answer text,
+	fk_ticket integer,
 	status integer NOT NULL
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 2dba1581d9e..4d46794aaf8 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -110,8 +110,8 @@ class KnowledgeRecord extends CommonObject
 		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>'1', 'position'=>512, 'notnull'=>0, 'visible'=>-2,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1,),
-		'answer' => array('type'=>'html', 'label'=>'Solution', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
+		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'csslist'=>'tdoverflow300'),
+		'answer' => array('type'=>'html', 'label'=>'Solution', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>3, 'csslist'=>'tdoverflow300'),
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Valid'),),
 	);
 	public $rowid;

From d1ff2e3590ef59a80f1aff48342cbe59ca9b185b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 06:18:47 +0200
Subject: [PATCH 910/928] Add comment

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

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 8f6b484a733..44265e33ea5 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -666,6 +666,8 @@ function getStructuredData($type, $data = array())
 			$ret .= '"description": "'.dol_escape_json($description).'"';
 			$ret .= "\n".'}'."\n";
 			$ret .= '</script>'."\n";
+		} else {
+			$ret .= '<!-- no structured data inserted inline inside blogpost because no author_alias defined -->'."\n";
 		}
 	} elseif ($type == 'product') {
 		$ret = '<!-- Add structured data for product -->'."\n";

From 78b38f75a1bf846e0fecb47fa9c84a6f292e2fd0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 06:39:18 +0200
Subject: [PATCH 911/928] Minor fixes

---
 htdocs/core/lib/website.lib.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 44265e33ea5..89fd777cd20 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -502,7 +502,7 @@ function includeContainer($containerref)
 	}
 	$includehtmlcontentopened++;
 	if ($includehtmlcontentopened > $MAXLEVEL) {
-		print 'ERROR: RECURSIVE CONTENT LEVEL. Depth of recursive call is more than the limit of '.$MAXLEVEL.".\n";
+		print 'ERROR: RECURSIVE CONTENT LEVEL. Depth of recursive call is more than the limit of '.((int) $MAXLEVEL).".\n";
 		return;
 	}
 
@@ -549,20 +549,20 @@ function getStructuredData($type, $data = array())
 			"@type": "SoftwareApplication",
 			"name": "'.dol_escape_json($data['name']).'",
 			"operatingSystem": "'.dol_escape_json($data['os']).'",
-			"applicationCategory": "https://schema.org/'.$data['applicationCategory'].'",';
+			"applicationCategory": "https://schema.org/'.dol_escape_json($data['applicationCategory']).'",';
 		if (!empty($data['ratingcount'])) {
 			$ret .= '
 				"aggregateRating": {
 					"@type": "AggregateRating",
-					"ratingValue": "'.$data['ratingvalue'].'",
-					"ratingCount": "'.$data['ratingcount'].'"
+					"ratingValue": "'.dol_escape_json($data['ratingvalue']).'",
+					"ratingCount": "'.dol_escape_json($data['ratingcount']).'"
 				},';
 		}
 		$ret .= '
 			"offers": {
 				"@type": "Offer",
-				"price": "'.$data['price'].'",
-				"priceCurrency": "'.($data['currency'] ? $data['currency'] : $conf->currency).'"
+				"price": "'.dol_escape_json($data['price']).'",
+				"priceCurrency": "'.dol_escape_json($data['currency'] ? $data['currency'] : $conf->currency).'"
 			}
 		}'."\n";
 		$ret .= '</script>'."\n";
@@ -693,8 +693,8 @@ function getStructuredData($type, $data = array())
 				"offers": {
 					"@type": "Offer",
 					"url": "https://example.com/anvil",
-					"priceCurrency": "'.($data['currency'] ? $data['currency'] : $conf->currency).'",
-					"price": "'.$data['price'].'",
+					"priceCurrency": "'.dol_escape_json($data['currency'] ? $data['currency'] : $conf->currency).'",
+					"price": "'.dol_escape_json($data['price']).'",
 					"itemCondition": "https://schema.org/UsedCondition",
 					"availability": "https://schema.org/InStock",
 					"seller": {

From 90d6f70bce24b23af94e39aae964035114f6680c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 06:54:39 +0200
Subject: [PATCH 912/928] Comment

---
 htdocs/website/index.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index da1244b567c..7247427363a 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2390,6 +2390,18 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 					}
 				}
 
+				// Now add sitempas extension for news
+				// TODO When adding and when not ?
+				/*<news:news>
+				   <news:publication>
+				     <news:name>The Example Times</news:name>
+				     <news:language>en</news:language>
+				   </news:publication>
+				   <news:publication_date>2008-12-23</news:publication_date>
+				     <news:title>Companies A, B in Merger Talks</news:title>
+				    </news:news>
+				*/
+
 				$root->appendChild($url);
 				$i++;
 			}

From ea5d374f233e0162838aeb0df4606e1d8458b8bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 06:57:21 +0200
Subject: [PATCH 913/928] Update index.php

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

diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index af9518d4622..50fd4c3f521 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -239,8 +239,8 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
 				$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
 				$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
 
-				print '<td>'.dol_print_date($db->jdate($obj->date_start), 'day').'<br><span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
-				print '<td>'.dol_print_date($db->jdate($obj->date_end), 'day').'<br><span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
+				print '<td>'.dol_print_date($db->jdate($obj->date_start), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
+				print '<td>'.dol_print_date($db->jdate($obj->date_end), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
 				print '<td class="right nowrap" width="16">'.$holidaystatic->LibStatut($obj->status, 3).'</td>';
 				print '</tr>';

From 7d0fa95d8134cf44f09bcf78e674d285c1b23d3c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 07:08:45 +0200
Subject: [PATCH 914/928] Update card.php

---
 htdocs/user/group/card.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 21f53c64c68..19b78cf06e9 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -138,7 +138,11 @@ if (empty($reshook)) {
 				if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 					$object->entity = 0;
 				} else {
-					$object->entity = GETPOSTISSET("entity") ? GETPOST("entity") : $conf->entity;
+					if ($conf->entity == 1 && $user->admin && !$user->entity) {		// Same permissions test than the one used to show the combo of entities into the form
+						$object->entity = GETPOSTISSET("entity") ? GETPOST("entity") : $conf->entity;
+					} else {
+						$object->entity = $conf->entity;
+					}
 				}
 
 				$db->begin();

From ad64b43e3080412ec089585b653fa8a8c5276d66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 07:11:41 +0200
Subject: [PATCH 915/928] Update html.form.class.php

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a0846b2b3ed..9b90ed0b30a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7696,7 +7696,7 @@ class Form
 					'enabled'=>$conf->contrat->enabled,
 					'perms'=>1,
 					'label'=>'LinkToContract',
-					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY t.rowid'
+					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_DB_PREFIX."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY s.rowid, s.nom, s.client, t.rowid, t.ref, t.ref_customer, t.ref_supplier'
 				),
 				'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('intervention').')'),
 				'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled, 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('supplier_proposal').')'),

From 6bf66adff04eb5c8aa431b14c75e3c10dd995ec5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 07:27:02 +0200
Subject: [PATCH 916/928] Fix remove some $_REQUEST

---
 htdocs/admin/security_file.php         |  2 +-
 htdocs/commande/list.php               |  1 -
 htdocs/compta/bank/card.php            |  2 +-
 htdocs/compta/paiement/cheque/card.php | 12 ++++++------
 htdocs/core/lib/sendings.lib.php       |  4 ++--
 htdocs/core/tpl/card_presend.tpl.php   |  4 ++--
 htdocs/delivery/card.php               |  4 ++--
 htdocs/expedition/shipment.php         |  4 ++--
 htdocs/ticket/card.php                 |  4 ++--
 9 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index 2b6a4e81fb4..12c90cf3c21 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -66,7 +66,7 @@ if ($action == 'updateform') {
 } elseif ($action == 'delete') {
 	// Delete file
 	$langs->load("other");
-	$file = $conf->admin->dir_temp.'/'.GETPOST('urlfile', 'alpha'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+	$file = $conf->admin->dir_temp.'/'.GETPOST('urlfile', 'alpha');
 	$ret = dol_delete_file($file);
 	if ($ret) {
 		setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile', 'alpha')), null, 'mesgs');
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3747b2107b2..2c08bb8684a 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -887,7 +887,6 @@ if ($resql) {
 	}
 
 	if ($massaction == 'createbills') {
-		//var_dump($_REQUEST);
 		print '<input type="hidden" name="massaction" value="confirm_createbills">';
 
 		print '<table class="noborder" width="100%" >';
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index bf30b1831f9..30aa32a8d58 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -829,7 +829,7 @@ if ($action == 'create') {
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post" name="formsoc">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="update">';
-		print '<input type="hidden" name="id" value="'.$_REQUEST["id"].'">'."\n\n";
+		print '<input type="hidden" name="id" value="'.GETPOST("id", 'int').'">'."\n\n";
 
 		print dol_get_fiche_head(array(), 0, '', 0);
 
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 39b5ded892b..04eee81ced0 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -126,8 +126,8 @@ if ($action == 'create' && GETPOST("accountid", "int") > 0 && $user->rights->ban
 				// 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) && GETPOST('lang_id', 'aZ09')) {
+					$newlang = GETPOST('lang_id', 'aZ09');
 				}
 				//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
 				if (!empty($newlang)) {
@@ -177,8 +177,8 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->banque-
 		// 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) && GETPOST('lang_id', 'aZ09')) {
+			$newlang = GETPOST('lang_id', 'aZ09');
 		}
 		//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
 		if (!empty($newlang)) {
@@ -219,8 +219,8 @@ if ($action == 'builddoc' && $user->rights->banque->cheque) {
 
 	$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) && GETPOST('lang_id', 'aZ09')) {
+		$newlang = GETPOST('lang_id', 'aZ09');
 	}
 	//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
 	if (!empty($newlang)) {
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 15e7286ab08..880019d7b97 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -316,8 +316,8 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 
 						$outputlangs = $langs;
 						$newlang = '';
-						if (empty($newlang) && !empty($_REQUEST['lang_id'])) {
-							$newlang = $_REQUEST['lang_id'];
+						if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+							$newlang = GETPOST('lang_id', 'aZ09');
 						}
 						if (empty($newlang)) {
 							$newlang = $object->thirdparty->default_lang;
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index bca1386c82e..9c1387d7d58 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -58,8 +58,8 @@ if ($action == 'presend') {
 	// 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) && GETPOST('lang_id', 'aZ09')) {
+		$newlang = GETPOST('lang_id', 'aZ09');
 	}
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 		$newlang = $object->thirdparty->default_lang;
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 2c6415f17b7..4855c9c1e49 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -542,8 +542,8 @@ if ($action == 'create') {    // Create. Seems to no be used
 						if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 							$outputlangs = $langs;
 							$newlang = '';
-							if (empty($newlang) && !empty($_REQUEST['lang_id'])) {
-								$newlang = $_REQUEST['lang_id'];
+							if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+								$newlang = GETPOST('lang_id', 'aZ09');
 							}
 							if (empty($newlang)) {
 								$newlang = $object->thirdparty->default_lang;
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 1231f0b513e..8f5903dd988 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -687,8 +687,8 @@ if ($id > 0 || !empty($ref)) {
 
 							$outputlangs = $langs;
 							$newlang = '';
-							if (empty($newlang) && !empty($_REQUEST['lang_id'])) {
-								$newlang = $_REQUEST['lang_id'];
+							if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+								$newlang = GETPOST('lang_id', 'aZ09');
 							}
 							if (empty($newlang)) {
 								$newlang = $object->thirdparty->default_lang;
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 4b4b8e594d4..e04e3c51ce3 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1364,8 +1364,8 @@ if ($action == 'create' || $action == 'presend') {
 			// 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) && GETPOST('lang_id', 'aZ09')) {
+				$newlang = GETPOST('lang_id', 'aZ09');
 			}
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 				$newlang = $object->default_lang;

From 6308c17c5fd22898006d6ad56437b5122f1a4294 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 08:30:12 +0200
Subject: [PATCH 917/928] Update main.inc.php

---
 htdocs/main.inc.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 3fb1a1aa0da..6110be38c86 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1964,8 +1964,6 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	global $dolibarr_main_authentication, $dolibarr_main_demo;
 	global $menumanager;
 
-	$langs->loadLangs(array('companies'));
-
 	$userImage = $userDropDownImage = '';
 	if (!empty($user->photo)) {
 		$userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);
@@ -2203,6 +2201,7 @@ function top_menu_quickadd()
 {
 	global $langs, $conf, $db, $hookmanager, $user;
 	global $menumanager;
+	
 	$html = '';
 	// Define $dropDownQuickAddHtml
 	$dropDownQuickAddHtml = '<div class="dropdown-header bookmark-header center">';

From 67fc5bce5f78ec9242ca53c4b235c4f55797f651 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 17 May 2021 06:30:30 +0000
Subject: [PATCH 918/928] Fixing style errors.

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6110be38c86..c9a7dd21ccc 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2201,7 +2201,7 @@ function top_menu_quickadd()
 {
 	global $langs, $conf, $db, $hookmanager, $user;
 	global $menumanager;
-	
+
 	$html = '';
 	// Define $dropDownQuickAddHtml
 	$dropDownQuickAddHtml = '<div class="dropdown-header bookmark-header center">';

From ac95302fa7f470627b87c65a6b324d7b7c628c3a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 08:48:02 +0200
Subject: [PATCH 919/928] Clean comment

---
 .../interface_99_modZapier_ZapierTriggers.class.php    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index f2d77553827..4e808d5bf15 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -111,13 +111,9 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 			//case 'USER_NEW_PASSWORD':
 			//case 'USER_ENABLEDISABLE':
 			//case 'USER_DELETE':
-			//case 'USER_SETINGROUP':
-			//case 'USER_REMOVEFROMGROUP':
-			// case 'USER_LOGIN':
-			// case 'USER_LOGIN_FAILED':
-			// case 'USER_LOGOUT':
-			// Warning: To increase performances, this action is triggered only if constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
-			// // case 'USER_UPDATE_SESSION':
+			//case 'USER_LOGIN':
+			//case 'USER_LOGIN_FAILED':
+			//case 'USER_LOGOUT':
 
 			// Actions
 			case 'ACTION_MODIFY':

From 8dc6241aee1e3a085eef7b142b20f381e881b9bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 08:49:31 +0200
Subject: [PATCH 920/928] Clean dead code

---
 .../core/triggers/interface_50_modLdap_Ldapsynchro.class.php  | 4 ++--
 .../interface_99_modMyModule_MyModuleTriggers.class.php       | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 37956897cb1..d6209ba1694 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -183,7 +183,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		} elseif ($action == 'USER_SETINGROUP') {
+		/*} elseif ($action == 'USER_SETINGROUP') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
@@ -250,7 +250,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 				if ($result < 0) {
 					$this->error = "ErrorLDAP ".$ldap->error;
 				}
-			}
+			} */
 		} elseif ($action == 'USERGROUP_CREATE') {
 			// Groupes
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index 28868add880..e29057c5423 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -119,8 +119,6 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			//case 'USER_NEW_PASSWORD':
 			//case 'USER_ENABLEDISABLE':
 			//case 'USER_DELETE':
-			//case 'USER_SETINGROUP':
-			//case 'USER_REMOVEFROMGROUP':
 
 			// Actions
 			//case 'ACTION_MODIFY':

From f95f0748e3acca203bb92faafc44c8207580f4ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 09:54:04 +0200
Subject: [PATCH 921/928] Update viewcat.php

---
 htdocs/categories/viewcat.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index b62bc3bcb0f..eeca990ef28 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -768,12 +768,11 @@ if ($type == Categorie::TYPE_CONTACT) {
 					break;
 				}
 
-				$objsoc->fetch($contact->socid);
-
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $contact->getNomUrl(1, 'category');
-				if ($objsoc->id > 0) {
+				if ($contact->socid > 0) {
+					$objsoc->fetch($contact->socid);
 					print ' - ';
 					print $objsoc->getNomUrl(1, 'contact');
 				}

From 1093e66d26183beee9ddc8e75fee6d9aedfa1f4f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 10:14:14 +0200
Subject: [PATCH 922/928] Update societe.class.php

---
 htdocs/societe/class/societe.class.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index d207c690a69..91059c7ecc1 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2560,14 +2560,16 @@ class Societe extends CommonObject
 			}
 		}
 		$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
-		$phonelist = array();
-		if ($this->phone) {
-			$phonelist[] = dol_print_phone($this->phone, $this->country_code, $this->id, 0, '', '&nbsp', 'phone');
+		if (!empty($this->phone) || !empty($this->fax)) {
+			$phonelist = array();
+			if ($this->phone) {
+				$phonelist[] = dol_print_phone($this->phone, $this->country_code, $this->id, 0, '', '&nbsp', 'phone');
+			}
+			if ($this->fax) {
+				$phonelist[] = dol_print_phone($this->fax, $this->country_code, $this->id, 0, '', '&nbsp', 'fax');
+			}
+			$label .= '<br><b>'.$langs->trans('Phone').':</b> '.implode('&nbsp;', $phonelist);
 		}
-		if ($this->fax) {
-			$phonelist[] = dol_print_phone($this->fax, $this->country_code, $this->id, 0, '', '&nbsp', 'fax');
-		}
-		$label .= '<br><b>'.$langs->trans('Phone').':</b> '.implode('&nbsp;', $phonelist);
 		if (!empty($this->address)) {
 			$label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);
 		}

From 261414cb7f7b64bc062d3ce6f97998774134b0d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 10:16:33 +0200
Subject: [PATCH 923/928] Update societe.class.php

---
 htdocs/societe/class/societe.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 91059c7ecc1..66974c7e5e9 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2571,7 +2571,9 @@ class Societe extends CommonObject
 			$label .= '<br><b>'.$langs->trans('Phone').':</b> '.implode('&nbsp;', $phonelist);
 		}
 		if (!empty($this->address)) {
-			$label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);
+			$label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);	// Address + country
+		} elseif (!empty($this->country_code)) {
+			$label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
 		}
 		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false)) {
 			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);

From 082ae2e62761cdd3a775ec6ec5daf39fa3236741 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 11:11:17 +0200
Subject: [PATCH 924/928] Fix trans

---
 htdocs/core/class/dolgraph.class.php |  2 +-
 htdocs/langs/en_US/compta.lang       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 7eecea00ff6..b1819e24ab0 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1259,7 +1259,7 @@ class DolGraph
 				if ($i > 0) {
 					$this->stringtoshow .= ', ';
 				}
-				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 22)) . "'";
+				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 25)) . "'";	// Lower than 25 make some important label (that we can't shorten) to be truncated
 				$i++;
 			}
 
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 405689a57e5..8329346c163 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -286,9 +286,9 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
-InvoiceLate30Days = Invoices late 30 days
-InvoiceLate15Days = Invoices late 15 days
+InvoiceLate30Days = Invoices late > 30 days
+InvoiceLate15Days = Invoices late > 15 days
 InvoiceLateMinus15Days = Invoices late
-InvoiceNotLate = To pay < 15 days
-InvoiceNotLate15Days = To pay > 15 days
-InvoiceNotLate30Days = To pay in > 30 days
+InvoiceNotLate = To be collected < 15 days
+InvoiceNotLate15Days = To be collected in 15 days
+InvoiceNotLate30Days = To be collected in 30 days

From 6402ef949650e650eeed24d19fdda773b7126f94 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 11:26:31 +0200
Subject: [PATCH 925/928] Fix colors

---
 htdocs/core/lib/invoice.lib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 6862b6d59e9..16891214ca5 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -482,9 +482,9 @@ function getNumberInvoicesPieChart($mode)
 		$sql = "SELECT sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub30, 'Y-m-d')."'", 1, 0).") as nblate30";
 		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub15, 'Y-m-d')."'", 1, 0).") as nblate15";
 		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($now, 'Y-m-d')."'", 1, 0).") as nblatenow";
-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd30, 'Y-m-d')."'", 1, 0).") as nbnotlate30";
-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd15, 'Y-m-d')."'", 1, 0).") as nbnotlate15";
 		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement >= '".date_format($now, 'Y-m-d')."'", 1, 0).") as nbnotlatenow";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd15, 'Y-m-d')."'", 1, 0).") as nbnotlate15";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd30, 'Y-m-d')."'", 1, 0).") as nbnotlate30";
 		if ($mode == 'customers') {
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 		} elseif ($mode == 'fourn') {
@@ -513,7 +513,8 @@ function getNumberInvoicesPieChart($mode)
 			foreach ($dataseries as $key=>$value) {
 				$total+=$value[1];
 			}
-			$colorseries = array($badgeStatus8, $badgeStatus1, $badgeStatus3, $badgeStatus2, $badgeStatus4, $badgeStatus11);
+
+			$colorseries = array($badgeStatus8, $badgeStatus1, $badgeStatus3, $badgeStatus4, $badgeStatus11, '-'.$badgeStatus11);
 			if ($conf->use_javascript_ajax) {
 				$result = '<div class="div-table-responsive-no-min">';
 				$result .= '<table class="noborder nohover centpercent">';

From 1b25c4daa0234109f30f4a0f12defb8bbb571589 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 11:29:51 +0200
Subject: [PATCH 926/928] Fix phpcs

---
 htdocs/core/tpl/extrafields_list_search_sql.tpl.php       | 2 +-
 .../triggers/interface_50_modLdap_Ldapsynchro.class.php   | 4 ++--
 htdocs/user/class/usergroup.class.php                     | 8 ++++----
 htdocs/website/index.php                                  | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 6fee9958fd1..f1b62676887 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -26,7 +26,7 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp'))) {
 			if (is_numeric($crit)) {
-				if ($typ == 'date'){
+				if ($typ == 'date') {
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 					$crit = dol_get_first_hour($crit);
 				}
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index d6209ba1694..28565114a21 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -183,7 +183,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		/*} elseif ($action == 'USER_SETINGROUP') {
+			/*} elseif ($action == 'USER_SETINGROUP') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
@@ -217,7 +217,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		} elseif ($action == 'USER_REMOVEFROMGROUP') {
+			} elseif ($action == 'USER_REMOVEFROMGROUP') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
 				$ldap = new Ldap();
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index b393d8ae261..cacaeb54fc1 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -855,10 +855,10 @@ class UserGroup extends CommonObject
 				$valueofldapfield[] = $muser->_load_ldap_dn($info2);
 			}
 			$info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield) ? $valueofldapfield : '');
-        }
-        if (!empty($conf->global->LDAP_GROUP_FIELD_GROUPID)) {
-            $info[$conf->global->LDAP_GROUP_FIELD_GROUPID] = $this->id;
-        }
+		}
+		if (!empty($conf->global->LDAP_GROUP_FIELD_GROUPID)) {
+			$info[$conf->global->LDAP_GROUP_FIELD_GROUPID] = $this->id;
+		}
 		return $info;
 	}
 
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 7247427363a..69ff8127e6c 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2394,12 +2394,12 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 				// TODO When adding and when not ?
 				/*<news:news>
 				   <news:publication>
-				     <news:name>The Example Times</news:name>
-				     <news:language>en</news:language>
+					 <news:name>The Example Times</news:name>
+					 <news:language>en</news:language>
 				   </news:publication>
 				   <news:publication_date>2008-12-23</news:publication_date>
-				     <news:title>Companies A, B in Merger Talks</news:title>
-				    </news:news>
+					 <news:title>Companies A, B in Merger Talks</news:title>
+					</news:news>
 				*/
 
 				$root->appendChild($url);

From c3bea1b46e89f108fee7175ad47c7efcb61f35f5 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 17 May 2021 12:00:56 +0200
Subject: [PATCH 927/928] Fix: Add test to delete supplier order if reception
 exist

---
 .../fourn/class/fournisseur.commande.class.php | 12 ++++++++++++
 htdocs/fourn/commande/card.php                 | 18 +++++++++++++++---
 htdocs/langs/en_US/receptions.lang             |  2 +-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 331e211e5ac..83251c93499 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2070,6 +2070,18 @@ class CommandeFournisseur extends CommonOrder
 			// End call triggers
 		}
 
+		// Test we can delete
+		$this->fetchObjectLinked(null, 'order_supplier');
+		if (!empty($this->linkedObjects)) {
+			foreach ($this->linkedObjects['reception'] as $element) {
+				if ($element->statut >= 0) {
+					$this->errors[] = $langs->trans('ReceptionExist');
+					$error++;
+					break;
+				}
+			}
+		}
+
 		$main = MAIN_DB_PREFIX.'commande_fournisseurdet';
 		$ef = $main."_extrafields";
 		$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_commande = ".$this->id.")";
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index bb0ad661c82..9c201497566 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2325,7 +2325,7 @@ if ($action == 'create') {
 	print dol_get_fiche_end();
 
 	/**
-	 * Boutons actions
+	 * Buttons for actions
 	 */
 
 	if ($user->socid == 0 && $action != 'editline' && $action != 'delete') {
@@ -2433,11 +2433,19 @@ if ($action == 'create') {
 			}
 
 			// Ship
-
+			$hasreception = 0;
 			if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
 				$labelofbutton = $langs->trans('ReceiveProducts');
 				if ($conf->reception->enabled) {
 					$labelofbutton = $langs->trans("CreateReception");
+					if (!empty($object->linkedObjects)) {
+						foreach ($object->linkedObjects['reception'] as $element) {
+							if ($element->statut >= 0) {
+								$hasreception = 1;
+								break;
+							}
+						}
+					}
 				}
 
 				if (in_array($object->statut, array(3, 4, 5))) {
@@ -2508,7 +2516,11 @@ if ($action == 'create') {
 
 			// Delete
 			if (!empty($usercandelete) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && !empty($usercancreate))) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
+				if ($hasreception) {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ReceptionExist").'">'.$langs->trans("Delete").'</a>';
+				} else {
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
+				}
 			}
 		}
 
diff --git a/htdocs/langs/en_US/receptions.lang b/htdocs/langs/en_US/receptions.lang
index 760ff884fa0..338602e722e 100644
--- a/htdocs/langs/en_US/receptions.lang
+++ b/htdocs/langs/en_US/receptions.lang
@@ -44,4 +44,4 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-
+ReceptionExist=A reception exists

From 4a488ad60a4c3df824b29ef5f7f62051227afb75 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 13:47:48 +0200
Subject: [PATCH 928/928] Update eldy.lib.php

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

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 14060d894b3..74c66e899f4 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -235,13 +235,12 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		) ? 1 : 0,
 		'perms'=>(!empty($user->rights->propal->lire)
 			|| !empty($user->rights->commande->lire)
-			|| !empty($user->rights->fournisseur->lire)
 			|| !empty($user->rights->supplier_proposal->lire)
+			|| !empty($user->rights->fournisseur->lire)
+			|| !empty($user->rights->fournisseur->commande->lire)
 			|| !empty($user->rights->supplier_order->lire)
 			|| !empty($user->rights->contrat->lire)
 			|| !empty($user->rights->ficheinter->lire)
-			|| !empty($user->rights->supplier_order->lire)
-			|| !empty($user->rights->fournisseur->commande->lire)
 		),
 		'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
 	);